From 635894cf10bf2435371de8c78b475e8fdec62469 Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Thu, 20 Apr 2017 14:51:36 +0200
Subject: [PATCH 001/438] Update code using new css class

---
 htdocs/admin/agenda.php       |  3 +--
 htdocs/admin/agenda_other.php |  3 +--
 htdocs/admin/bank.php         |  4 +---
 htdocs/admin/company.php      | 33 ++++++++++++---------------------
 htdocs/admin/compta.php       | 10 ++++------
 htdocs/admin/events.php       |  2 +-
 htdocs/admin/fichinter.php    |  8 ++------
 7 files changed, 22 insertions(+), 41 deletions(-)

diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index d076fcf7e26..051179d61ca 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -150,7 +150,6 @@ print $langs->trans("AgendaAutoActionDesc")."<br>\n";
 print $langs->trans("OnlyActiveElementsAreShown").'<br>';
 print "<br>\n";
 
-$var=true;
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td colspan="2">'.$langs->trans("ActionsEvents").'</td>';
@@ -180,7 +179,7 @@ if (! empty($triggers))
 			print '<td align="right" width="40">';
 			$key='MAIN_AGENDA_ACTIONAUTO_'.$trigger['code'];
 			$value=$conf->global->$key;
-			print '<input '.$bc[$var].' type="checkbox" name="'.$key.'" value="1"'.((($action=='selectall'||$value) && $action!="selectnone")?' checked':'').'>';
+			print '<input class="oddeven" type="checkbox" name="'.$key.'" value="1"'.((($action=='selectall'||$value) && $action!="selectnone")?' checked':'').'>';
 			print '</td></tr>'."\n";
 		}
 	}
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 6e0a62610aa..1e2247514d9 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -245,7 +245,6 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
     
     clearstatcache();
     
-    $var=true;
     foreach ($dirmodels as $reldir)
     {
     	$dir = dol_buildpath($reldir."core/modules/action/doc/");
@@ -266,7 +265,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
             			$module = new $classname($db, new ActionComm($db));
             			
             			
-            			print "<tr ".$bc[$var].">\n";
+            			print '<tr class="oddeven">\n';
             			print "<td>";
             			print (empty($module->name)?$name:$module->name);
             			print "</td>\n";
diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php
index 98cecb2f44b..8ed1e3cd9ac 100644
--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@@ -273,7 +273,6 @@ print "</tr>\n";
 
 clearstatcache();
 
-$var = true;
 foreach ($dirmodels as $reldir) 
 {
     foreach (array('', '/doc') as $valdir) {
@@ -305,8 +304,7 @@ foreach ($dirmodels as $reldir)
                                 $modulequalified = 0;
                             
                             if ($modulequalified) {
-                                $var = ! $var;
-                                print '<tr ' . $bc[$var] . '><td width="100">';
+                                print '<tr class="oddeven"><td width="100">';
                                 print(empty($module->name) ? $name : $module->name);
                                 print "</td><td>\n";
                                 if (method_exists($module, 'info'))
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 8c29fe67a1c..94cc66fd755 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -545,7 +545,6 @@ if ($action == 'edit' || $action == 'updateedit')
 	print '<tr class="liste_titre">';
 	print '<td class="titlefield">'.$langs->trans("FiscalYearInformation").'</td><td>'.$langs->trans("Value").'</td>';
 	print "</tr>\n";
-	$var=true;
 
 	
 	print '<tr class="oddeven"><td><label for="fiscalmonthstart">'.$langs->trans("FiscalMonthStart").'</label></td><td>';
@@ -561,10 +560,9 @@ if ($action == 'edit' || $action == 'updateedit')
 	print '<td class="titlefield">'.$langs->trans("VATManagement").'</td><td>'.$langs->trans("Description").'</td>';
 	print '<td align="right">&nbsp;</td>';
 	print "</tr>\n";
-	$var=true;
 
 	
-	print "<tr ".$bc[$var]."><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" id=\"use_vat\" value=\"1\"".(empty($conf->global->FACTURE_TVAOPTION)?"":" checked")."> ".$langs->trans("VATIsUsed")."</label></td>";
+	print "<tr class=\"oddeven\"><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" id=\"use_vat\" value=\"1\"".(empty($conf->global->FACTURE_TVAOPTION)?"":" checked")."> ".$langs->trans("VATIsUsed")."</label></td>";
 	print '<td colspan="2">';
 	print "<table>";
 	print "<tr><td><label for=\"use_vat\">".$langs->trans("VATIsUsedDesc")."</label></td></tr>";
@@ -573,7 +571,7 @@ if ($action == 'edit' || $action == 'updateedit')
 	print "</td></tr>\n";
 
 	
-	print "<tr ".$bc[$var]."><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" id=\"no_vat\" value=\"0\"".(empty($conf->global->FACTURE_TVAOPTION)?" checked":"")."> ".$langs->trans("VATIsNotUsed")."</label></td>";
+	print "<tr class=\"oddeven\"><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" id=\"no_vat\" value=\"0\"".(empty($conf->global->FACTURE_TVAOPTION)?" checked":"")."> ".$langs->trans("VATIsNotUsed")."</label></td>";
 	print '<td colspan="2">';
 	print "<table>";
 	print "<tr><td><label for=\"no_vat\">".$langs->trans("VATIsNotUsedDesc")."</label></td></tr>";
@@ -595,10 +593,9 @@ if ($action == 'edit' || $action == 'updateedit')
 		print '<td>'.$langs->transcountry("LocalTax1Management",$mysoc->country_code).'</td><td>'.$langs->trans("Description").'</td>';
 		print '<td align="right">&nbsp;</td>';
 		print "</tr>\n";
-		$var=true;
 		
 		// Note: When option is not set, it must not appears as set on on, because there is no default value for this option
-		print "<tr ".$bc[$var]."><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax1\" id=\"lt1\" value=\"localtax1on\"".(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)."</td>";
+		print "<tr class=\"oddeven\"><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax1\" id=\"lt1\" value=\"localtax1on\"".(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
 		print '<table class="nobordernopadding">';
 		print "<tr><td><label for=\"lt1\">".$langs->transcountry("LocalTax1IsUsedDesc",$mysoc->country_code)."</label></td></tr>";
@@ -620,7 +617,7 @@ if ($action == 'edit' || $action == 'updateedit')
 		print "</td></tr>\n";
 
 		
-		print "<tr ".$bc[$var]."><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax1\" id=\"nolt1\" value=\"localtax1off\"".((empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off")?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed",$mysoc->country_code)."</td>";
+		print "<tr class=\"oddeven\"><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax1\" id=\"nolt1\" value=\"localtax1off\"".((empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off")?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
 		print "<table>";
 		print "<tr><td><label for=\"nolt1\">".$langs->transcountry("LocalTax1IsNotUsedDesc",$mysoc->country_code)."</label></td></tr>";
@@ -639,11 +636,10 @@ if ($action == 'edit' || $action == 'updateedit')
 		print '<td>'.$langs->transcountry("LocalTax2Management",$mysoc->country_code).'</td><td>'.$langs->trans("Description").'</td>';
 		print '<td align="right">&nbsp;</td>';
 		print "</tr>\n";
-		$var=true;
 
 		
 		// Note: When option is not set, it must not appears as set on on, because there is no default value for this option
-		print "<tr ".$bc[$var]."><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax2\" id=\"lt2\" value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)."</td>";
+		print "<tr class=\"oddeven\"><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax2\" id=\"lt2\" value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
 		print '<table class="nobordernopadding">';
 		print "<tr><td><label for=\"lt2\">".$langs->transcountry("LocalTax2IsUsedDesc",$mysoc->country_code)."</label></td></tr>";
@@ -662,7 +658,7 @@ if ($action == 'edit' || $action == 'updateedit')
 		print "</td></tr>\n";
 
 		
-		print "<tr ".$bc[$var]."><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax2\" id=\"nolt2\" value=\"localtax2off\"".((empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off")?" checked":"")."> ".$langs->transcountry("LocalTax2IsNotUsed",$mysoc->country_code)."</td>";
+		print "<tr class=\"oddeven\"><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax2\" id=\"nolt2\" value=\"localtax2off\"".((empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off")?" checked":"")."> ".$langs->transcountry("LocalTax2IsNotUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
 		print "<table>";
 		print "<tr><td><label for=\"nolt2\">".$langs->transcountry("LocalTax2IsNotUsedDesc",$mysoc->country_code)."</label></td></tr>";
@@ -696,7 +692,6 @@ else
 
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre"><td>'.$langs->trans("CompanyInfo").'</td><td>'.$langs->trans("Value").'</td></tr>';
-	$var=true;
 
 	
 	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("CompanyName").'</td><td>';
@@ -965,7 +960,6 @@ else
 	print '<tr class="liste_titre">';
 	print '<td class="titlefield">'.$langs->trans("FiscalYearInformation").'</td><td>'.$langs->trans("Value").'</td>';
 	print "</tr>\n";
-	$var=true;
 
 	
 	print '<tr class="oddeven"><td>'.$langs->trans("FiscalMonthStart").'</td><td>';
@@ -983,10 +977,9 @@ else
 	print '<td>'.$langs->trans("VATManagement").'</td><td>'.$langs->trans("Description").'</td>';
 	print '<td align="right">&nbsp;</td>';
 	print "</tr>\n";
-	$var=true;
 
 	
-	print "<tr ".$bc[$var]."><td width=\"160\"><input ".$bc[$var]." type=\"radio\" name=\"optiontva\" id=\"use_vat\" disabled value=\"1\"".(empty($conf->global->FACTURE_TVAOPTION)?"":" checked")."> ".$langs->trans("VATIsUsed")."</td>";
+	print "<tr class=\"oddeven\"><td width=\"160\"><input class=\"oddeven\" type=\"radio\" name=\"optiontva\" id=\"use_vat\" disabled value=\"1\"".(empty($conf->global->FACTURE_TVAOPTION)?"":" checked")."> ".$langs->trans("VATIsUsed")."</td>";
 	print '<td colspan="2">';
 	print "<table>";
 	print "<tr><td><label for=\"use_vat\">".$langs->trans("VATIsUsedDesc")."</label></td></tr>";
@@ -995,7 +988,7 @@ else
 	print "</td></tr>\n";
 
 	
-	print "<tr ".$bc[$var]."><td width=\"160\"><input ".$bc[$var]." type=\"radio\" name=\"optiontva\" id=\"no_vat\" disabled value=\"0\"".(empty($conf->global->FACTURE_TVAOPTION)?" checked":"")."> ".$langs->trans("VATIsNotUsed")."</td>";
+	print "<tr class=\"oddeven\"><td width=\"160\"><input class=\"oddeven\" type=\"radio\" name=\"optiontva\" id=\"no_vat\" disabled value=\"0\"".(empty($conf->global->FACTURE_TVAOPTION)?" checked":"")."> ".$langs->trans("VATIsNotUsed")."</td>";
 	print '<td colspan="2">';
 	print "<table>";
 	print "<tr><td><label=\"no_vat\">".$langs->trans("VATIsNotUsedDesc")."</label></td></tr>";
@@ -1018,10 +1011,9 @@ else
 		print '<td>'.$langs->transcountry("LocalTax1Management",$mysoc->country_code).'</td><td>'.$langs->trans("Description").'</td>';
 		print '<td align="right">&nbsp;</td>';
 		print "</tr>\n";
-		$var=true;
 
 		
-		print "<tr ".$bc[$var]."><td width=\"160\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax1\" id=\"lt1\" disabled value=\"localtax1on\"".(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)."</td>";
+		print "<tr class=\"oddeven\"><td width=\"160\"><input class=\"oddeven\" type=\"radio\" name=\"optionlocaltax1\" id=\"lt1\" disabled value=\"localtax1on\"".(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
 		print "<table>";
 		print "<tr><td></label for=\"lt1\">".$langs->transcountry("LocalTax1IsUsedDesc",$mysoc->country_code)."</label></td></tr>";
@@ -1049,7 +1041,7 @@ else
 		print "</td></tr>\n";
 
 		
-		print "<tr ".$bc[$var]."><td width=\"160\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax1\" id=\"nolt1\" disabled value=\"localtax1off\"".((empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off")?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed",$mysoc->country_code)."</td>";
+		print "<tr class=\"oddeven\"><td width=\"160\"><input class=\"oddeven\" type=\"radio\" name=\"optionlocaltax1\" id=\"nolt1\" disabled value=\"localtax1off\"".((empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off")?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
 		print "<table>";
 		print "<tr><td><label for=\"no_lt1\">".$langs->transcountry("LocalTax1IsNotUsedDesc",$mysoc->country_code)."</label></td></tr>";
@@ -1069,10 +1061,9 @@ else
 		print '<td>'.$langs->transcountry("LocalTax2Management",$mysoc->country_code).'</td><td>'.$langs->trans("Description").'</td>';
 		print '<td align="right">&nbsp;</td>';
 		print "</tr>\n";
-		$var=true;
 
 		
-		print "<tr ".$bc[$var]."><td width=\"160\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax2\" id=\"lt2\" disabled value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)."</td>";
+		print "<tr class=\"oddeven\"><td width=\"160\"><input class=\"oddeven\" type=\"radio\" name=\"optionlocaltax2\" id=\"lt2\" disabled value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
 		print "<table>";
 		print "<tr><td><label for=\"lt2\">".$langs->transcountry("LocalTax2IsUsedDesc",$mysoc->country_code)."</label></td></tr>";
@@ -1101,7 +1092,7 @@ else
 		print "</td></tr>\n";
 
 		
-		print "<tr ".$bc[$var]."><td width=\"160\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax2\" id=\"nolt2\" disabled value=\"localtax2off\"".((empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off")?" checked":"")."> ".$langs->transcountry("LocalTax2IsNotUsed",$mysoc->country_code)."</td>";
+		print "<tr class=\"oddeven\"><td width=\"160\"><input class=\"oddeven\" type=\"radio\" name=\"optionlocaltax2\" id=\"nolt2\" disabled value=\"localtax2off\"".((empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off")?" checked":"")."> ".$langs->transcountry("LocalTax2IsNotUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
 		print "<table>";
 		print "<tr><td><label for=\"nolt2\">".$langs->transcountry("LocalTax2IsNotUsedDesc",$mysoc->country_code)."</label></td></tr>";
diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index c097b9f39b1..4c289ee25c7 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2011-2013 Juanjo Menent	    <jmenent@2byte.es>
- * Copyright (C) 2013-2016 Philippe Grand	    <philippe.grand@atoo-net.com>
+ * Copyright (C) 2013-2017 Philippe Grand	    <philippe.grand@atoo-net.com>
  * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -119,7 +119,7 @@ print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans('OptionMode').'</td><td>'.$langs->trans('Description').'</td>';
 print "</tr>\n";
-print '<tr '.$bc[false].'><td width="200"><input type="radio" name="accounting_mode" value="RECETTES-DEPENSES"'.($accounting_mode != 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeTrue').'</td>';
+print '<tr class=\"oddeven\"><td width="200"><input type="radio" name="accounting_mode" value="RECETTES-DEPENSES"'.($accounting_mode != 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeTrue').'</td>';
 print '<td colspan="2">'.nl2br($langs->trans('OptionModeTrueDesc'));
 // Write info on way to count VAT
 //if (! empty($conf->global->MAIN_MODULE_COMPTABILITE))
@@ -133,7 +133,7 @@ print '<td colspan="2">'.nl2br($langs->trans('OptionModeTrueDesc'));
 //	//	print nl2br($langs->trans('OptionModeTrueInfoExpert'));
 //}
 print "</td></tr>\n";
-print '<tr '.$bc[true].'><td width="200"><input type="radio" name="accounting_mode" value="CREANCES-DETTES"'.($accounting_mode == 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeVirtual').'</td>';
+print '<tr class=\"oddeven\"><td width="200"><input type="radio" name="accounting_mode" value="CREANCES-DETTES"'.($accounting_mode == 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeVirtual').'</td>';
 print '<td colspan="2">'.nl2br($langs->trans('OptionModeVirtualDesc'))."</td></tr>\n";
 
 print "</table>\n";
@@ -148,9 +148,7 @@ print "</tr>\n";
 
 foreach ($list as $key)
 {
-	
-
-	print '<tr '.$bc[$var].' class="value">';
+	print '<tr class="oddeven value">';
 
 	// Param
 	$libelle = $langs->trans($key);
diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php
index 161b1aac45d..74525a6855b 100644
--- a/htdocs/admin/events.php
+++ b/htdocs/admin/events.php
@@ -105,7 +105,7 @@ foreach ($eventstolog as $key => $arr)
 		print '<td>';
 		$key='MAIN_LOGEVENTS_'.$arr['id'];
 		$value=$conf->global->$key;
-		print '<input '.$bc[$var].' type="checkbox" name="'.$key.'" value="1"'.($value?' checked':'').'>';
+		print '<input class="oddeven" type="checkbox" name="'.$key.'" value="1"'.($value?' checked':'').'>';
 		print '</td></tr>'."\n";
 	}
 }
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 6c73afcf8f5..fce15178cdb 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2005-2014 Regis Houssin                <regis.houssin@capnetworks.com>
  * Copyright (C) 2008      Raphael Bertrand (Resultic)  <raphael.bertrand@resultic.fr>
  * Copyright (C) 2011-2013 Juanjo Menent			    <jmenent@2byte.es>
- * Copyright (C) 2011-2015 Philippe Grand			    <philippe.grand@atoo-net.com>
+ * Copyright (C) 2011-2017 Philippe Grand			    <philippe.grand@atoo-net.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -410,7 +410,6 @@ print "</tr>\n";
 
 clearstatcache();
 
-$var=true;
 foreach ($dirmodels as $reldir)
 {
 	$dir = dol_buildpath($reldir."core/modules/fichinter/doc/");
@@ -532,9 +531,7 @@ print '<td>'.$langs->trans("Parameter").'</td>';
 print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
 print "<td>&nbsp;</td>\n";
 print "</tr>\n";
-$var=true;
 
-$var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="set_FICHINTER_FREE_TEXT">';
@@ -583,11 +580,10 @@ print '</td><td align="right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 print "</td></tr>\n";
 // Use services duration
-$var = !$var;
 print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">';
 print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 print '<input type="hidden" name="action" value="set_FICHINTER_USE_SERVICE_DURATION">';
-print '<tr ' . $bc[$var] . '>';
+print '<tr class="oddeven">';
 print '<td>';
 print $langs->trans("UseServicesDurationOnFichinter");
 print '</td>';

From 4c2f3aeeac45ffb13ca937bc6d95a07bcc4f7282 Mon Sep 17 00:00:00 2001
From: Philippe Grand <philippe.grand@atoo-net.com>
Date: Thu, 4 May 2017 13:46:25 +0200
Subject: [PATCH 002/438] Update compta.php

---
 htdocs/admin/compta.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index 4c289ee25c7..70bf15d03f3 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -119,7 +119,7 @@ print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans('OptionMode').'</td><td>'.$langs->trans('Description').'</td>';
 print "</tr>\n";
-print '<tr class=\"oddeven\"><td width="200"><input type="radio" name="accounting_mode" value="RECETTES-DEPENSES"'.($accounting_mode != 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeTrue').'</td>';
+print '<tr class="oddeven"><td width="200"><input type="radio" name="accounting_mode" value="RECETTES-DEPENSES"'.($accounting_mode != 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeTrue').'</td>';
 print '<td colspan="2">'.nl2br($langs->trans('OptionModeTrueDesc'));
 // Write info on way to count VAT
 //if (! empty($conf->global->MAIN_MODULE_COMPTABILITE))
@@ -133,7 +133,7 @@ print '<td colspan="2">'.nl2br($langs->trans('OptionModeTrueDesc'));
 //	//	print nl2br($langs->trans('OptionModeTrueInfoExpert'));
 //}
 print "</td></tr>\n";
-print '<tr class=\"oddeven\"><td width="200"><input type="radio" name="accounting_mode" value="CREANCES-DETTES"'.($accounting_mode == 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeVirtual').'</td>';
+print '<tr class="oddeven"><td width="200"><input type="radio" name="accounting_mode" value="CREANCES-DETTES"'.($accounting_mode == 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeVirtual').'</td>';
 print '<td colspan="2">'.nl2br($langs->trans('OptionModeVirtualDesc'))."</td></tr>\n";
 
 print "</table>\n";

From e4f7f2a0b2e7ac05d6917781eb8e0e14ffeee444 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Fri, 26 May 2017 12:39:49 +0200
Subject: [PATCH 003/438] $resaction need in 5.0.x too

---
 htdocs/core/class/hookmanager.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 24ba86c7115..89a9b834482 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -233,7 +233,7 @@ class HookManager
                     	if (is_array($parameters) && ! empty($parameters['special_code']) && $parameters['special_code'] > 3 && $parameters['special_code'] != $actionclassinstance->module_number) continue;
 
                     	//dol_syslog("Call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", hooktype=".$hooktype, LOG_DEBUG);
-                    	$result = $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
+                    	$resaction = $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
 
                     	if (! empty($actionclassinstance->results) && is_array($actionclassinstance->results)) $this->resArray =array_merge($this->resArray, $actionclassinstance->results);
                     	if (! empty($actionclassinstance->resprints)) $this->resPrint.=$actionclassinstance->resprints;

From c4f09b889414a59cb8b116bc1d59d1aaed6c9721 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 28 May 2017 14:43:17 +0200
Subject: [PATCH 004/438] Work on modulebuilder

---
 dev/translation/sanity_check_en_langfiles.php |   2 +
 htdocs/admin/triggers.php                     |   1 -
 htdocs/core/class/interfaces.class.php        |  11 +-
 htdocs/core/lib/files.lib.php                 |  65 ++--
 htdocs/langs/en_US/modulebuilder.lang         |  10 +-
 htdocs/modulebuilder/index.php                | 287 ++++++++++++++----
 .../{skeletons => oldskeletons}/.gitignore    |   0
 .../{skeletons => oldskeletons}/README        |   0
 .../build_api_class.php                       |   0
 .../build_class_from_table.php                |   0
 .../build_webservice_from_class.php           |   0
 .../modMyModule.class.php                     |   0
 .../skeleton_api_class.class.php              |   0
 .../skeleton_card.php                         |   0
 .../skeleton_class.class.php                  |   0
 .../skeleton_list.php                         |   0
 .../skeleton_script.php                       |   0
 .../skeleton_webservice_server.php            |   0
 .../core/modules/modMyModule.class.php        |  29 +-
 ...99_modMyModule_MyModuleTriggers.class.php} |   4 +-
 .../modulebuilder/template/modulebuilder.txt  |   2 +-
 .../modulebuilder/template/myobject_card.php  |   2 +-
 .../modulebuilder/template/myobject_list.php  |   2 +-
 23 files changed, 306 insertions(+), 109 deletions(-)
 rename htdocs/modulebuilder/{skeletons => oldskeletons}/.gitignore (100%)
 rename htdocs/modulebuilder/{skeletons => oldskeletons}/README (100%)
 rename htdocs/modulebuilder/{skeletons => oldskeletons}/build_api_class.php (100%)
 rename htdocs/modulebuilder/{skeletons => oldskeletons}/build_class_from_table.php (100%)
 rename htdocs/modulebuilder/{skeletons => oldskeletons}/build_webservice_from_class.php (100%)
 rename htdocs/modulebuilder/{skeletons => oldskeletons}/modMyModule.class.php (100%)
 rename htdocs/modulebuilder/{skeletons => oldskeletons}/skeleton_api_class.class.php (100%)
 rename htdocs/modulebuilder/{skeletons => oldskeletons}/skeleton_card.php (100%)
 rename htdocs/modulebuilder/{skeletons => oldskeletons}/skeleton_class.class.php (100%)
 rename htdocs/modulebuilder/{skeletons => oldskeletons}/skeleton_list.php (100%)
 rename htdocs/modulebuilder/{skeletons => oldskeletons}/skeleton_script.php (100%)
 rename htdocs/modulebuilder/{skeletons => oldskeletons}/skeleton_webservice_server.php (100%)
 rename htdocs/modulebuilder/template/core/triggers/{interface_99_modMyModule_Triggers.class.php => interface_99_modMyModule_MyModuleTriggers.class.php} (99%)

diff --git a/dev/translation/sanity_check_en_langfiles.php b/dev/translation/sanity_check_en_langfiles.php
index bb3430eb22c..9136c192739 100755
--- a/dev/translation/sanity_check_en_langfiles.php
+++ b/dev/translation/sanity_check_en_langfiles.php
@@ -310,6 +310,8 @@ if ((! empty($_REQUEST['unused']) && $_REQUEST['unused'] == 'true') || (isset($a
 	    if (preg_match('/^.*Bytes$/', $value)) $qualifiedforclean=0;
 	    if (preg_match('/^NoteSomeFeaturesAreDisabled/', $value)) $qualifiedforclean=0;
 	    if (preg_match('/^(DoTest|Under|Limits|Cards|CurrentValue|DateLimit|DateAndHour|NbOfLines|NbOfObjects|NbOfReferes|TotalTTCShort|VATs)/', $value)) $qualifiedforclean=0;
+		// modulebuilder
+		if (preg_match('/^ModuleBuilderDesc/', $value)) $qualifiedforclean=0;
 	    // orders
 	    if (preg_match('/^OrderSource/', $value)) $qualifiedforclean=0;
 	    if (preg_match('/^TypeContact_/', $value)) $qualifiedforclean=0;
diff --git a/htdocs/admin/triggers.php b/htdocs/admin/triggers.php
index 0aae9c6915e..0dddfb3c4af 100644
--- a/htdocs/admin/triggers.php
+++ b/htdocs/admin/triggers.php
@@ -47,7 +47,6 @@ print load_fiche_titre($langs->trans("TriggersAvailable"),'','title_setup');
 print $langs->trans("TriggersDesc")."<br>";
 print "<br>\n";
 
-$template_dir = DOL_DOCUMENT_ROOT.'/core/tpl/';
 
 $interfaces = new Interfaces($db);
 $triggers = $interfaces->getTriggersList();
diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php
index 87ae81db856..cd4a56f4174 100644
--- a/htdocs/core/class/interfaces.class.php
+++ b/htdocs/core/class/interfaces.class.php
@@ -226,9 +226,10 @@ class Interfaces
      *  Return list of triggers. Function used by admin page htdoc/admin/triggers.
      *  List is sorted by trigger filename so by priority to run.
      *
-     * 	@return	array					Array list of triggers
+     *	@param	array		$forcedirtriggers		null=All default directories. This parameter is used by modulebuilder module only.
+     * 	@return	array								Array list of triggers
      */
-    function getTriggersList()
+    function getTriggersList($forcedirtriggers=null)
     {
         global $conf, $langs;
 
@@ -241,11 +242,15 @@ class Interfaces
         $i = 0;
 
         $dirtriggers=array_merge(array('/core/triggers/'),$conf->modules_parts['triggers']);
+        if (is_array($forcedirtriggers))
+        {
+        	$dirtriggers=$forcedirtriggers;
+        }
+        	
         foreach($dirtriggers as $reldir)
         {
             $dir=dol_buildpath($reldir,0);
             $newdir=dol_osencode($dir);
-            //print "xx".$dir;exit;
 
             // Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php at each call)
             if (! is_dir($newdir)) continue;
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 2d5b8d2f6db..ad800708522 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -448,14 +448,15 @@ function dol_filemtime($pathoffile)
  * @param	array	$arrayreplacement	Array with strings to replace
  * @param	string	$destfile			Destination file (can't be a directory). If empty, will be same than source file.
  * @param	int		$newmask			Mask for new file (0 by default means $conf->global->MAIN_UMASK). Example: '0666'
+ * @param	int		$indexdatabase		Index new file into database.
  * @return	int							<0 if error, 0 if nothing done (dest file already exists), >0 if OK
  * @see		dolCopyr
  */
-function dolReplaceInFile($srcfile, $arrayreplacement, $destfile='', $newmask=0)
+function dolReplaceInFile($srcfile, $arrayreplacement, $destfile='', $newmask=0, $indexdatabase=0)
 {
     global $conf;
 
-    dol_syslog("files.lib.php::dolReplaceInFile srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask);
+    dol_syslog("files.lib.php::dolReplaceInFile srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." indexdatabase=".$indexdatabase);
 
     if (empty($srcfile)) return -1;
     if (empty($destfile)) $destfile=$srcfile;
@@ -484,12 +485,15 @@ function dolReplaceInFile($srcfile, $arrayreplacement, $destfile='', $newmask=0)
     dol_delete_file($tmpdestfile);
     
     // Create $newpathoftmpdestfile from $newpathofsrcfile
+    $content=file_get_contents($newpathofsrcfile, 'r');
     
+    $content = make_substitutions($content, $arrayreplacement, null);
     
-    
+    file_put_contents($newpathoftmpdestfile, $content);
+    @chmod($newpathoftmpdestfile, octdec($newmask));
     
     // Rename
-    $result=dol_move($newpathoftmpdestfile, $newpathofdestfile, $newmask, (($destfile == $srcfile)?1:0));
+    $result=dol_move($newpathoftmpdestfile, $newpathofdestfile, $newmask, (($destfile == $srcfile)?1:0), 0, $indexdatabase);
     if (! $result)
     {
         dol_syslog("files.lib.php::dolReplaceInFile failed to move tmp file to final dest", LOG_WARNING);
@@ -569,10 +573,11 @@ function dol_copy($srcfile, $destfile, $newmask=0, $overwriteifexists=1)
  * @param	string	$destfile			Destination file (a directory)
  * @param	int		$newmask			Mask for new file (0 by default means $conf->global->MAIN_UMASK). Example: '0666'
  * @param 	int		$overwriteifexists	Overwrite file if exists (1 by default)
- * @return	int							<0 if error, 0 if nothing done (dest dir already exists and overwriteifexists=0), >0 if OK
+ * @param	array	$arrayreplacement	Array to use to replace filenames with another one during the copy (works only on file names, not on directory names).
+ * @return	int							<0 if error, 0 if nothing done (all files already exists and overwriteifexists=0), >0 if OK
  * @see		dol_copy
  */
-function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists)
+function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayreplacement=null)
 {
 	global $conf;
 
@@ -583,7 +588,7 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists)
 	if (empty($srcfile) || empty($destfile)) return -1;
 
 	$destexists=dol_is_dir($destfile);
-	if (! $overwriteifexists && $destexists) return 0;
+	//if (! $overwriteifexists && $destexists) return 0;	// The overwriteifexists is for files only, so propaated to dol_copy only.
     
     if (! $destexists)
     {
@@ -592,37 +597,37 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists)
         $dirmaskdec=octdec($newmask);
         if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $dirmaskdec=octdec($conf->global->MAIN_UMASK);
         $dirmaskdec |= octdec('0200');  // Set w bit required to be able to create content for recursive subdirs files
-        dol_mkdir($destfile."/".$file, '', decoct($dirmaskdec));
+        dol_mkdir($destfile, '', decoct($dirmaskdec));
     }
     
-	$srcfile=dol_osencode($srcfile);
-	$destfile=dol_osencode($destfile);
+	$ossrcfile=dol_osencode($srcfile);
+	$osdestfile=dol_osencode($destfile);
 
-    // recursive function to copy
-    // all subdirectories and contents:
-	if (is_dir($srcfile))
+    // Recursive function to copy all subdirectories and contents:
+	if (is_dir($ossrcfile))
 	{
-        $dir_handle=opendir($srcfile);
+        $dir_handle=opendir($ossrcfile);
         while ($file=readdir($dir_handle))
         {
             if ($file!="." && $file!="..")
             {
-                if (is_dir($srcfile."/".$file))
+                if (is_dir($ossrcfile."/".$file))
                 {
-                    if (!is_dir($destfile."/".$file))
-                    {
-                        // We must set mask just before creating dir, becaause it can be set differently by dol_copy
-                    	umask(0);
-						$dirmaskdec=octdec($newmask);
-						if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $dirmaskdec=octdec($conf->global->MAIN_UMASK);
-						$dirmaskdec |= octdec('0200');  // Set w bit required to be able to create content for recursive subdirs files
-                    	dol_mkdir($destfile."/".$file, '', decoct($dirmaskdec));
-                    }
-                    $tmpresult=dolCopyDir($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists);
+                    //var_dump("xxx dolCopyDir $srcfile/$file, $destfile/$file, $newmask, $overwriteifexists");
+                    $tmpresult=dolCopyDir($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists, $arrayreplacement);
                 }
                 else
 				{
-                    $tmpresult=dol_copy($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists);
+					$newfile = $file;
+					// Replace destination filename with a new one
+					if (is_array($arrayreplacement))
+					{
+						foreach($arrayreplacement as $key => $val)
+						{
+							$newfile = str_replace($key, $val, $newfile);
+						}
+					}
+                    $tmpresult=dol_copy($srcfile."/".$file, $destfile."/".$newfile, $newmask, $overwriteifexists);
                 }
                 // Set result
                 if ($result > 0 && $tmpresult >= 0)
@@ -641,7 +646,8 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists)
     }
     else
 	{
-        $result=dol_copy($srcfile, $destfile, $newmask, $overwriteifexists);
+		// Source directory does not exists
+        $result = -2;
     }
 
     return $result;
@@ -660,10 +666,11 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists)
  * @param   integer	$newmask            Mask in octal string for new file (0 by default means $conf->global->MAIN_UMASK)
  * @param   int		$overwriteifexists  Overwrite file if exists (1 by default)
  * @param   int     $testvirus          Do an antivirus test. Move is canceled if a virus is found.
+ * @param	int		$indexdatabase		Index new file into database.
  * @return  boolean 		            True if OK, false if KO
  * @see dol_move_uploaded_file
  */
-function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1, $testvirus=0)
+function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1, $testvirus=0, $indexdatabase=1)
 {
     global $user, $db, $conf;
     $result=false;
@@ -709,7 +716,7 @@ function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1, $testvi
         }
 
         // Move ok
-        if ($result)
+        if ($result && $indexdatabase)
         {
             // Rename entry into ecm database
             $rel_filetorenamebefore = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $srcfile);
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index de0c2fc216a..7336a020fa6 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -6,4 +6,12 @@ ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong> (they a
 NewModule=New module
 ModuleKey=Key for new module
 ModuleInitialized=Module initialized
-
+ModuleBuilderDescdescription=Enter here all general information that describe your module
+ModuleBuilderDescobjects=Define here the new objects you want to manage with our module. A page to list them and a page to create/edit/view a card will be generated.
+ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
+ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with our module.
+ModuleBuilderDesctriggers=This is the view of triggers provided by your module. To include code executed when a triggered business event is launched, just edit this file with your IDE.
+ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module. Just click on button to get your module package file.
+BuildPackage=Build package
+ModuleIsNotActive=This module was not activated yet (go into Home-Setup-Module to make it live)
+ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
\ No newline at end of file
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index a033bd1be23..e11ff31a303 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -29,9 +29,10 @@ $langs->load("admin");
 $langs->load("modulebuilder");
 $langs->load("other");
 
-$action=GETPOST('action','alpha');
+$action=GETPOST('action','aZ09');
 $confirm=GETPOST('confirm','alpha');
-$module=GETPOST('module');
+$module=GETPOST('module','alpha');
+$tab=GETPOST('tab','aZ09');
 if (empty($module)) $module='initmodule';
 if (empty($tab)) $tab='description';
 
@@ -56,30 +57,36 @@ $FILEFLAG='modulebuilder.txt';
 if ($dircustom && $action == 'initmodule' && $modulename)
 {
     $srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
-    $destdir = $dircustom.'/'.$modulename;
+    $destdir = $dircustom.'/'.strtolower($modulename);
 
     $arrayreplacement=array(
         'mymodule'=>strtolower($modulename),
      	'MyModule'=>$modulename
     );
     
-    $result = dolCopyDir($srcdir, $destdir, 0, 0);
+    $result = dolCopyDir($srcdir, $destdir, 0, 0, $arrayreplacement);
     //dol_mkdir($destfile);
     if ($result <= 0)
     {
-        $error++;
-        $langs->load("errors");
-        setEventMessages($langs->trans("ErrorFailToCopyDir", $srcdir, $destdir), null, 'errors');
+    	if ($result < 0)
+    	{
+        	$error++;
+        	$langs->load("errors");
+        	setEventMessages($langs->trans("ErrorFailToCopyDir", $srcdir, $destdir), null, 'errors');
+    	}
+    	else	// $result == 0
+    	{
+        	setEventMessages($langs->trans("AllFilesDidAlreadyExist", $srcdir, $destdir), null, 'warnings');
+    	}
     }
 
     // Edit PHP files
     if (! $error)
     {
-	    $listofphpfilestoedit = dol_dir_list($destdir, 'files', 1, '\.php$', '', 'fullname', SORT_ASC, 0, 1);
+	    $listofphpfilestoedit = dol_dir_list($destdir, 'files', 1, '\.(php|MD|js)$', '', 'fullname', SORT_ASC, 0, 1);
 	    foreach($listofphpfilestoedit as $phpfileval)
 	    {
-	        var_dump($phpfileval['fullname']);
-	    	
+	        //var_dump($phpfileval['fullname']);
 	    	$arrayreplacement=array(
 	            'mymodule'=>strtolower($modulename),
 	        	'MyModule'=>$modulename,
@@ -106,6 +113,12 @@ if ($dircustom && $action == 'initmodule' && $modulename)
     }
 }
 
+if ($dircustom && $action == 'generatepackage')
+{
+    $dir = $dircustom.'/'.$modulename;
+	
+
+}
 
 
 /*
@@ -138,7 +151,16 @@ if (!empty($conf->modulebuilder->enabled) && $mainmenu == 'modulebuilder')	// En
                     $fullname = $dircustomcursor['fullname'];
                     if (dol_is_file($fullname.'/'.$FILEFLAG))
                     {
-                        $listofmodules[$dircustomcursor['name']]=$fullname;
+                    	// Get real name of module (MyModule instead of mymodule)
+                    	$descriptorfiles = dol_dir_list($fullname.'/core/modules/', 'files', 0, 'mod.*\.class\.php');
+                    	$modulenamewithcase='';
+                    	foreach($descriptorfiles as $descriptorcursor)
+                    	{
+                    		$modulenamewithcase=preg_replace('/^mod/', '', $descriptorcursor['name']);
+                    		$modulenamewithcase=preg_replace('/\.class\.php$/', '', $modulenamewithcase);
+                    	}
+                    	if ($modulenamewithcase) $listofmodules[$dircustomcursor['name']]=$modulenamewithcase;
+                    	//var_dump($listofmodules);
                     }
                 }
             }
@@ -154,11 +176,44 @@ if (!empty($conf->modulebuilder->enabled) && $mainmenu == 'modulebuilder')	// En
 print $langs->trans("ModuleBuilderDesc").'<br>';
 print $langs->trans("ModuleBuilderDesc2", 'conf/conf.php', $dircustom).'<br>';
 print $langs->trans("ModuleBuilderDesc3", count($listofmodules), $FILEFLAG).'<br>';
-print '<br>';
-            
-            
+//print '<br>';
+
+
+// Load module descriptor
+$error=0;
+$moduleobj = null;
+
+if (! empty($module) && $module != 'initmodule')
+{
+	$modulelowercase=strtolower($module);
+	
+    // Load module
+    dol_include_once($modulelowercase.'/core/modules/mod'.$module.'.class.php');
+    $class='mod'.$module;
+
+    if (class_exists($class))
+    {
+        try {
+            $moduleobj = new $class($db);
+        }
+        catch(Exception $e)
+        {
+            $error++;
+            print $e->getMessage();
+        }
+    }
+    else
+    {
+        $error++;
+        $langs->load("errors");
+        print img_warning('').' '.$langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module);
+    }
+}
+
 print '<br>';            
 
+
+// Tabs for all modules
 $head = array();
 $h=0;
 
@@ -167,11 +222,11 @@ $head[$h][1] = $langs->trans("NewModule");
 $head[$h][2] = 'initmodule';
 $h++;
     
-foreach($listofmodules as $tmpmodule => $fullname)
+foreach($listofmodules as $tmpmodule => $tmpmodulewithcase)
 {
-    $head[$h][0] = $_SERVER["PHP_SELF"].'?module='.$tmpmodule;
-    $head[$h][1] = $tmpmodule;
-    $head[$h][2] = $tmpmodule;
+    $head[$h][0] = $_SERVER["PHP_SELF"].'?module='.$tmpmodulewithcase;
+    $head[$h][1] = $tmpmodulewithcase;
+    $head[$h][2] = $tmpmodulewithcase;
     $h++;
 }
 
@@ -195,73 +250,197 @@ if ($module == 'initmodule')
 }
 elseif (! empty($module))
 {
-    $error=0;
-    
-    // Load module
-    dol_include_once($module.'/core/modules/mod'.ucfirst($module).'.class.php');
-    $class='mod'.ucfirst($module);
-    if (class_exists($class))
-    {
-        try {
-            $moduleobj = new $class($db);
-        }
-        catch(Exception $e)
-        {
-            $error++;
-            print $e->getMessage();
-        }
-    }
-    else
-    {
-        $error++;
-        $langs->load("errors");
-        print img_warning('').' '.$langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module);
-    }
-    
-    // Button to delete module
-    
-    
     // Tabs for module
     if (! $error)
     {
         $head2 = array();
         $h=0;
-        
-        foreach($listofmodules as $tmpmodule => $fullname)
+
+       	$modulestatusinfo=img_info('').' '.$langs->trans("ModuleIsNotActive");
+        if (! empty($conf->$module->enabled))
         {
-            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=description';
+        	$modulestatusinfo=img_warning().' '.$langs->trans("ModuleIsLive");	
+        }
+        
+        foreach($listofmodules as $tmpmodule => $tmpmodulewithcase)
+        {
+            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=description&module='.$tmpmodulewithcase;
             $head2[$h][1] = $langs->trans("Description");
             $head2[$h][2] = 'description';
             $h++;
             
-            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=objects';
+            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=objects&module='.$tmpmodulewithcase;
             $head2[$h][1] = $langs->trans("Objects");
             $head2[$h][2] = 'objects';
             $h++;        
         
-            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab='.$tmpmodule;
+            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=menus&module='.$tmpmodulewithcase;
             $head2[$h][1] = $langs->trans("Menus");
             $head2[$h][2] = 'menus';
             $h++;
             
-            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab='.$tmpmodule;
+            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=permissions&module='.$tmpmodulewithcase;
             $head2[$h][1] = $langs->trans("Permissions");
             $head2[$h][2] = 'permissions';
             $h++;        
     
-            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab='.$tmpmodule;
+            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=triggers&module='.$tmpmodulewithcase;
             $head2[$h][1] = $langs->trans("Triggers");
             $head2[$h][2] = 'triggers';
             $h++;        
+
+            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=buildpackage&module='.$tmpmodulewithcase;
+            $head2[$h][1] = $langs->trans("BuildPackage");
+            $head2[$h][2] = 'buildpackage';
+            $h++;        
+        }
+
+        print $modulestatusinfo.'<br><br>';
+       
+        dol_fiche_head($head2, $tab, '', -1, '');
+
+        print $langs->trans("ModuleBuilderDesc".$tab).'<br><br>';
+        
+        if ($tab == 'description')
+        {
+        	print '<div class="underbanner clearboth"></div>';
+        	print '<div class="fichecenter">';
+        	
+        	print '<table class="border centpercent">';
+        	print '<tr class="liste_titre"><td class="titlefield">';
+        	print $langs->trans("Parameter");
+        	print '</td><td>';
+        	print $langs->trans("Value");
+        	print '</td></tr>';
+
+        	print '<tr><td>';
+        	print $langs->trans("Numero");
+        	print '</td><td>';
+        	print $moduleobj->numero;
+        	print '</td></tr>';
+        	
+        	print '<tr><td>';
+        	print $langs->trans("Name");
+        	print '</td><td>';
+        	print $moduleobj->getName();
+        	print '</td></tr>';
+        	
+        	print '<tr><td>';
+        	print $langs->trans("Version");
+        	print '</td><td>';
+        	print $moduleobj->getVersion();
+        	print '</td></tr>';
+        	
+        	print '<tr><td>';
+        	print $langs->trans("Family");
+        	print "<br>'crm','financial','hr','projects','products','ecm','technic','interface','other'";
+        	print '</td><td>';
+        	print $moduleobj->family;
+        	print '</td></tr>';
+        	
+        	print '<tr><td>';
+        	print $langs->trans("EditorName");
+        	print '</td><td>';
+        	print $moduleobj->editor_name;
+        	print '</td></tr>';
+        	
+        	print '<tr><td>';
+        	print $langs->trans("EditorUrl");
+        	print '</td><td>';
+        	print $moduleobj->editor_url;
+        	print '</td></tr>';
+        	
+        	print '<tr><td>';
+        	print $langs->trans("Description");
+        	print '</td><td>';
+        	print $moduleobj->getDesc();
+        	print '</td></tr>';
+        	
+        	print '<tr><td>';
+        	print $langs->trans("LongDescription");
+        	print '</td><td>';
+        	print $moduleobj->getDescLong();
+        	print '</td></tr>';
+        	
+        	print '</table>';
+    		
+        	print '</div>';
+    		
+        	print '<br><br>';
+        	print '<form name="delete">';
+        	print '<input type="hidden" name="action" value="confirm_delete">';
+        	print '<input type="hidden" name="tab" value="'.dol_escape_htmltag($tab).'">';
+        	print '<input type="hidden" name="module" value="'.dol_escape_htmltag($module).'">';
+        	print '<input type="submit" class="buttonDelete" value="'.$langs->trans("Delete").'">';		
+        	print '</form>';
         }
         
-        dol_fiche_head($head2, $tab, '', -1, '');
+        if ($tab == 'objects')
+        {
+    		print $langs->trans("FeatureNotYetAvailable");
+        	
         
-        print $moduleobj->getDescLong();
-    
+        }
         
+        if ($tab == 'menus')
+        {
+    		print $langs->trans("FeatureNotYetAvailable");
+        	
         
+        }
         
+        if ($tab == 'permissions')
+        {
+    		print $langs->trans("FeatureNotYetAvailable");
+        
+        }
+        
+        if ($tab == 'triggers')
+        {
+        	require_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
+        	
+			$interfaces = new Interfaces($db);
+			$triggers = $interfaces->getTriggersList(array('/'.strtolower($module).'/core/triggers'));
+			
+			print '<div class="div-table-responsive-no-min">';
+			print '<table class="noborder">
+			<tr class="liste_titre">
+			<td colspan="2">'.$langs->trans("File").'</td>
+			<td align="center">'.$langs->trans("Active").'</td>
+			<td align="center">&nbsp;</td>
+			</tr>
+			';
+			
+			$var=True;
+			foreach ($triggers as $trigger)
+			{
+				
+				print '<tr class="oddeven">';
+				print '<td valign="top" width="14" align="center">'.$trigger['picto'].'</td>';
+				print '<td class="tdtop">'.$trigger['file'].'</td>';
+				print '<td valign="top" align="center">'.$trigger['status'].'</td>';
+				print '<td class="tdtop">';
+				$text=$trigger['info'];
+				$text.="<br>\n<strong>".$langs->trans("File")."</strong>:<br>\n".$trigger['relpath'];
+				//$text.="\n".$langs->trans("ExternalModule",$trigger['isocreorexternal']);
+				print $form->textwithpicto('', $text);
+				print '</td>';
+				print '</tr>';
+			}
+			
+			print '</table>';
+			print '</div>';
+        }
+
+        if ($tab == 'buildpackage')
+        {
+        	print '<form name="generatepackage">';
+        	print '<input type="hidden" name="action" value="generatepackage">';
+        	print '<input type="hidden" name="tab" value="'.dol_escape_htmltag($tab).'">';
+        	print '<input type="hidden" name="module" value="'.dol_escape_htmltag($module).'">';
+        	print '<input type="submit" class="button" value="'.$langs->trans("Generate").'">';		
+        	print '</form>';
+        }
         
         dol_fiche_end();
     }
diff --git a/htdocs/modulebuilder/skeletons/.gitignore b/htdocs/modulebuilder/oldskeletons/.gitignore
similarity index 100%
rename from htdocs/modulebuilder/skeletons/.gitignore
rename to htdocs/modulebuilder/oldskeletons/.gitignore
diff --git a/htdocs/modulebuilder/skeletons/README b/htdocs/modulebuilder/oldskeletons/README
similarity index 100%
rename from htdocs/modulebuilder/skeletons/README
rename to htdocs/modulebuilder/oldskeletons/README
diff --git a/htdocs/modulebuilder/skeletons/build_api_class.php b/htdocs/modulebuilder/oldskeletons/build_api_class.php
similarity index 100%
rename from htdocs/modulebuilder/skeletons/build_api_class.php
rename to htdocs/modulebuilder/oldskeletons/build_api_class.php
diff --git a/htdocs/modulebuilder/skeletons/build_class_from_table.php b/htdocs/modulebuilder/oldskeletons/build_class_from_table.php
similarity index 100%
rename from htdocs/modulebuilder/skeletons/build_class_from_table.php
rename to htdocs/modulebuilder/oldskeletons/build_class_from_table.php
diff --git a/htdocs/modulebuilder/skeletons/build_webservice_from_class.php b/htdocs/modulebuilder/oldskeletons/build_webservice_from_class.php
similarity index 100%
rename from htdocs/modulebuilder/skeletons/build_webservice_from_class.php
rename to htdocs/modulebuilder/oldskeletons/build_webservice_from_class.php
diff --git a/htdocs/modulebuilder/skeletons/modMyModule.class.php b/htdocs/modulebuilder/oldskeletons/modMyModule.class.php
similarity index 100%
rename from htdocs/modulebuilder/skeletons/modMyModule.class.php
rename to htdocs/modulebuilder/oldskeletons/modMyModule.class.php
diff --git a/htdocs/modulebuilder/skeletons/skeleton_api_class.class.php b/htdocs/modulebuilder/oldskeletons/skeleton_api_class.class.php
similarity index 100%
rename from htdocs/modulebuilder/skeletons/skeleton_api_class.class.php
rename to htdocs/modulebuilder/oldskeletons/skeleton_api_class.class.php
diff --git a/htdocs/modulebuilder/skeletons/skeleton_card.php b/htdocs/modulebuilder/oldskeletons/skeleton_card.php
similarity index 100%
rename from htdocs/modulebuilder/skeletons/skeleton_card.php
rename to htdocs/modulebuilder/oldskeletons/skeleton_card.php
diff --git a/htdocs/modulebuilder/skeletons/skeleton_class.class.php b/htdocs/modulebuilder/oldskeletons/skeleton_class.class.php
similarity index 100%
rename from htdocs/modulebuilder/skeletons/skeleton_class.class.php
rename to htdocs/modulebuilder/oldskeletons/skeleton_class.class.php
diff --git a/htdocs/modulebuilder/skeletons/skeleton_list.php b/htdocs/modulebuilder/oldskeletons/skeleton_list.php
similarity index 100%
rename from htdocs/modulebuilder/skeletons/skeleton_list.php
rename to htdocs/modulebuilder/oldskeletons/skeleton_list.php
diff --git a/htdocs/modulebuilder/skeletons/skeleton_script.php b/htdocs/modulebuilder/oldskeletons/skeleton_script.php
similarity index 100%
rename from htdocs/modulebuilder/skeletons/skeleton_script.php
rename to htdocs/modulebuilder/oldskeletons/skeleton_script.php
diff --git a/htdocs/modulebuilder/skeletons/skeleton_webservice_server.php b/htdocs/modulebuilder/oldskeletons/skeleton_webservice_server.php
similarity index 100%
rename from htdocs/modulebuilder/skeletons/skeleton_webservice_server.php
rename to htdocs/modulebuilder/oldskeletons/skeleton_webservice_server.php
diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
index 71948b0e1be..5799d5bbab7 100644
--- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
+++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
@@ -83,22 +83,19 @@ class modMyModule extends DolibarrModules
 		// for default path (eg: /mymodule/core/xxxxx) (0=disable, 1=enable)
 		// for specific path of parts (eg: /mymodule/core/modules/barcode)
 		// for specific css file (eg: /mymodule/css/mymodule.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 directory (core/login)
-		//							'substitutions' => 0,                            	// Set this to 1 if module has its own substitution function file (core/substitutions)
-		//							'menus' => 0,                                    	// Set this to 1 if module has its own menus handler directory (core/menus)
-		//							'theme' => 0,                                    	// Set this to 1 if module has its own theme directory (theme)
-		//                        	'tpl' => 0,                                      	// Set this to 1 if module overwrite template dir (core/tpl)
-		//							'barcode' => 0,                                  	// Set this to 1 if module has its own barcode directory (core/modules/barcode)
-		//							'models' => 0,                                   	// Set this to 1 if module has its own models directory (core/modules/xxx)
-		//							'css' => array('/mymodule/css/mymodule.css.php'),	// Set this to relative path of css file if module has its own css file
-	 	//							'js' => array('/mymodule/js/mymodule.js'),          // Set this to relative path of js file if module must load a js on all pages
-		//							'hooks' => array('hookcontext1','hookcontext2',...) // Set here all hooks context managed by module. You can also set hook context 'all'
-		//							'dir' => array('output' => 'othermodulename'),      // To force the default directories names
-		//							'workflow' => array('WORKFLOW_MODULE1_YOURACTIONTYPE_MODULE2'=>array('enabled'=>'! empty($conf->module1->enabled) && ! empty($conf->module2->enabled)', 'picto'=>'yourpicto@mymodule')) // Set here all workflow context managed by module
-		//                        );
-		$this->module_parts = array();
+		$this->module_parts = array(
+		                        	'triggers' => 1,                                 	// 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 directory (core/login)
+									'substitutions' => 0,                            	// Set this to 1 if module has its own substitution function file (core/substitutions)
+									'menus' => 0,                                    	// Set this to 1 if module has its own menus handler directory (core/menus)
+									'theme' => 0,                                    	// Set this to 1 if module has its own theme directory (theme)
+		                        	'tpl' => 0,                                      	// Set this to 1 if module overwrite template dir (core/tpl)
+									'barcode' => 0,                                  	// Set this to 1 if module has its own barcode directory (core/modules/barcode)
+									'models' => 0,                                   	// Set this to 1 if module has its own models directory (core/modules/xxx)
+									'css' => array('/mymodule/css/mymodule.css.php'),	// Set this to relative path of css file if module has its own css file
+	 								'js' => array('/mymodule/js/mymodule.js'),          // Set this to relative path of js file if module must load a js on all pages
+									'hooks' => array('hookcontext1','hookcontext2') 	// Set here all hooks context managed by module. You can also set hook context 'all'
+		                        );
 
 		// Data directories to create when module is enabled.
 		// Example: this->dirs = array("/mymodule/temp");
diff --git a/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_Triggers.class.php b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
similarity index 99%
rename from htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_Triggers.class.php
rename to htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
index 56f00ab8b02..0140e1cc2b9 100644
--- a/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_Triggers.class.php
+++ b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * \file    core/triggers/interface_99_modMyModule_Triggers.class.php
+ * \file    core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
  * \ingroup mymodule
  * \brief   Example trigger.
  *
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
 /**
  *  Class of triggers for MyModule module
  */
-class InterfaceMyModuleTrigger extends DolibarrTriggers
+class InterfaceMyModuleTriggers extends DolibarrTriggers
 {
 	/**
 	 * @var DoliDB Database handler
diff --git a/htdocs/modulebuilder/template/modulebuilder.txt b/htdocs/modulebuilder/template/modulebuilder.txt
index 4c726c35394..5cdb6c6e6e8 100644
--- a/htdocs/modulebuilder/template/modulebuilder.txt
+++ b/htdocs/modulebuilder/template/modulebuilder.txt
@@ -1,2 +1,2 @@
-File to flag module build using official module template.
+File to flag module built using official module template.
 When this file is present into a module directory, you can edit it with the module builder tool.
\ No newline at end of file
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 6db376ff9b1..1d22c464212 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -44,7 +44,7 @@ if (! $res && file_exists("../../../../dolibarr/htdocs/main.inc.php")) $res=@inc
 if (! $res) die("Include of main fails");
 // Change this following line to use the correct relative path from htdocs
 include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
-dol_include_once('/mymodule/class/myobject_class.class.php');
+dol_include_once('/mymodule/class/myobject.class.php');
 
 // Load traductions files requiredby by page
 $langs->load("mymodule");
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index ad105480901..a935b87bd58 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -46,7 +46,7 @@ if (! $res) die("Include of main fails");
 require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-dol_include_once('/mymodule/class/skeleton_class.class.php');
+dol_include_once('/mymodule/class/myobject.class.php');
 
 // Load traductions files requiredby by page
 $langs->load("mymodule");

From 18799c3a7f1bddfbe7a2f3c27994e290a2de4d0e Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Mon, 29 May 2017 11:00:08 +0200
Subject: [PATCH 005/438] Changes Done

question
need to change $actionclassinstance->results in $actionclassinstance->resactionss ???
---
 htdocs/core/class/hookmanager.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 89a9b834482..0c78e89fa9e 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -238,10 +238,10 @@ class HookManager
                     	if (! empty($actionclassinstance->results) && is_array($actionclassinstance->results)) $this->resArray =array_merge($this->resArray, $actionclassinstance->results);
                     	if (! empty($actionclassinstance->resprints)) $this->resPrint.=$actionclassinstance->resprints;
                     	// TODO dead code to remove (do not enable this, but fix hook instead): result must not be a string. we must use $actionclassinstance->resprints to return a string
-                    	if (! is_array($result) && ! is_numeric($result))
+                    	if (! is_array($resaction) && ! is_numeric($resaction))
                     	{
                     		dol_syslog('Error: Bug into hook '.$method.' of module class '.get_class($actionclassinstance).'. Method must not return a string but an int (0=OK, 1=Replace, -1=KO) and set string into ->resprints', LOG_ERR);
-                    		if (empty($actionclassinstance->resprints)) { $this->resPrint.=$result; $result=0; }
+                    		if (empty($actionclassinstance->resprints)) { $this->resPrint.=$resaction; $resaction=0; }
                     	}
                     }
 

From 3402718425cc8ba7cff570c8201cc2cdb9685a81 Mon Sep 17 00:00:00 2001
From: KHELIFA <kkhelifa@open-dsi.fr>
Date: Mon, 29 May 2017 11:58:16 +0200
Subject: [PATCH 006/438] Core Holiday: Add triggers for create, update and
 delete a holiday Fix the user parameter in the call of the create, update and
 delete functions of the class Holiday

---
 htdocs/holiday/card.php                | 12 ++++++------
 htdocs/holiday/class/holiday.class.php | 24 ++++++++++++++++++++++--
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index ba4f210793e..e4c09546e6e 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -248,7 +248,7 @@ if ($action == 'update')
 			$object->halfday = $halfday;
 
 			// Update
-			$verif = $object->update($user->id);
+			$verif = $object->update($user);
             if ($verif > 0)
             {
                 header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
@@ -285,7 +285,7 @@ if ($action == 'confirm_delete' && GETPOST('confirm') == 'yes' && $user->rights-
 		// Si l'utilisateur à le droit de lire cette demande, il peut la supprimer
 		if ($canedit)
 		{
-			$result=$object->delete($object->id);
+			$result=$object->delete($user);
 		}
 		else
 		{
@@ -318,7 +318,7 @@ if ($action == 'confirm_send')
     {
         $object->statut = 2;
 
-        $verif = $object->update($user->id);
+        $verif = $object->update($user);
 
         // Si pas d'erreur SQL on redirige vers la fiche de la demande
         if ($verif > 0)
@@ -419,7 +419,7 @@ if ($action == 'confirm_valid')
         $object->fk_user_valid = $user->id;
         $object->statut = 3;
 
-        $verif = $object->update($user->id);
+        $verif = $object->update($user);
 
         // Si pas d'erreur SQL on redirige vers la fiche de la demande
         if ($verif > 0)
@@ -506,7 +506,7 @@ if ($action == 'confirm_refuse')
             $object->statut = 5;
             $object->detail_refuse = $_POST['detail_refuse'];
 
-            $verif = $object->update($user->id);
+            $verif = $object->update($user);
 
             // Si pas d'erreur SQL on redirige vers la fiche de la demande
             if ($verif > 0)
@@ -586,7 +586,7 @@ if ($action == 'confirm_cancel' && GETPOST('confirm') == 'yes')
         $object->fk_user_cancel = $user->id;
         $object->statut = 4;
 
-        $result = $object->update($user->id);
+        $result = $object->update($user);
 
         if ($result >= 0 && $oldstatus == 3)	// holiday was already validated, status 3, so we must increase back sold
         {
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 5f244dcb9bf..ba36d911971 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -167,6 +167,14 @@ class Holiday extends CommonObject
         if (! $error)
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."holiday");
+
+            if (! $notrigger)
+            {
+                // Call trigger
+                $result=$this->call_trigger('HOLIDAY_CREATE',$user);
+                if ($result < 0) { $error++; }
+                // End call triggers
+            }
         }
 
         // Commit or rollback
@@ -603,7 +611,13 @@ class Holiday extends CommonObject
 
         if (! $error)
         {
-
+            if (! $notrigger)
+            {
+                // Call trigger
+                $result=$this->call_trigger('HOLIDAY_MODIFY',$user);
+                if ($result < 0) { $error++; }
+                // End call triggers
+            }
         }
 
         // Commit or rollback
@@ -650,7 +664,13 @@ class Holiday extends CommonObject
 
         if (! $error)
         {
-
+            if (! $notrigger)
+            {
+                // Call trigger
+                $result=$this->call_trigger('HOLIDAY_DELETE',$user);
+                if ($result < 0) { $error++; }
+                // End call triggers
+            }
         }
 
         // Commit or rollback

From 19b8918caf5ec68a00fe94af99d6bebeb3748570 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 May 2017 13:35:51 +0200
Subject: [PATCH 007/438] FIX #6881

---
 htdocs/install/upgrade2.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 09aa85d48c3..42c8f50632e 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -453,11 +453,11 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
         $db->close();
 
 
-        // Actions for all version (not in database)
+        // Actions for all versions (not in database)
         migrate_delete_old_files($db, $langs, $conf);
-
         migrate_delete_old_dir($db, $langs, $conf);
         
+        
         dol_mkdir(DOL_DATA_ROOT.'/bank');
         migrate_directories($db, $langs, $conf, '/banque/bordereau', '/bank/checkdeposits');
     }
@@ -3926,7 +3926,11 @@ function migrate_delete_old_files($db,$langs,$conf)
     DOL_DOCUMENT_ROOT.'/core/modules/mailings/poire.modules.php',
     DOL_DOCUMENT_ROOT.'/core/modules/mailings/kiwi.modules.php',
     DOL_DOCUMENT_ROOT.'/core/modules/facture/pdf_crabe.modules.php',
-    DOL_DOCUMENT_ROOT.'/core/modules/facture/pdf_oursin.modules.php'
+    DOL_DOCUMENT_ROOT.'/core/modules/facture/pdf_oursin.modules.php',
+    
+    DOL_DOCUMENT_ROOT.'/compta/facture/class/api_invoice.class.php',
+    DOL_DOCUMENT_ROOT.'/commande/class/api_commande.class.php',
+    DOL_DOCUMENT_ROOT.'/user/class/api_user.class.php'
     );
 
     foreach ($filetodeletearray as $filetodelete)

From d2813eabbcad08127c92d07534b7554b33c43d77 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 May 2017 13:39:07 +0200
Subject: [PATCH 008/438] FIX #6877

Conflicts:
	htdocs/install/mysql/migration/5.0.0-6.0.0.sql
---
 htdocs/install/mysql/migration/4.0.0-5.0.0.sql | 1 +
 htdocs/install/mysql/tables/llx_projet.sql     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
index fa185f2864b..b5978efac99 100644
--- a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
+++ b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
@@ -45,6 +45,7 @@ ALTER TABLE llx_facture_fourn_det ADD INDEX idx_facture_fourn_det_fk_product (fk
 
 ALTER TABLE llx_facture_rec ADD COLUMN fk_user_modif integer;
 ALTER TABLE llx_expedition ADD COLUMN fk_user_modif integer;
+ALTER TABLE llx_projet ADD COLUMN fk_user_modif integer;
 
 ALTER TABLE llx_adherent ADD COLUMN model_pdf varchar(255);
 
diff --git a/htdocs/install/mysql/tables/llx_projet.sql b/htdocs/install/mysql/tables/llx_projet.sql
index d50547b711b..8ca404d3a0e 100644
--- a/htdocs/install/mysql/tables/llx_projet.sql
+++ b/htdocs/install/mysql/tables/llx_projet.sql
@@ -30,6 +30,7 @@ create table llx_projet
   title            varchar(255) NOT NULL,
   description      text,
   fk_user_creat    integer NOT NULL,			-- createur du projet
+  fk_user_modif    integer,
   public           integer,						-- project is public or not
   fk_statut        integer DEFAULT 0 NOT NULL,	-- open or close
   fk_opp_status    integer DEFAULT NULL,	        -- if project is used to manage opportunities

From 96b8339d21eab4bc275d365b9ba51c24108feda7 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Fri, 26 May 2017 17:38:57 +0200
Subject: [PATCH 009/438] Fix: [Restler] Delete the cache file otherwise it
 does not update

---
 htdocs/api/admin/index.php | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/htdocs/api/admin/index.php b/htdocs/api/admin/index.php
index 8142b564c1e..8ea22cee1d3 100644
--- a/htdocs/api/admin/index.php
+++ b/htdocs/api/admin/index.php
@@ -43,12 +43,29 @@ if ($action == 'setproductionmode')
 
 	if (dolibarr_set_const($db, 'API_PRODUCTION_MODE', $status, 'chaine', 0, '', $conf->entity) > 0)
 	{
-	    $result = dol_mkdir($conf->api->dir_temp);
-	    if ($result < 0)
-	    {
-	        setEventMessages($langs->trans("ErrorFaildToCreateDir", $conf->api->dir_temp), null, 'errors');
-	    }
-	    else
+		$error=0;
+
+		if ($status == 1)
+		{
+			$result = dol_mkdir($conf->api->dir_temp);
+			if ($result < 0)
+			{
+				setEventMessages($langs->trans("ErrorFailedToCreateDir", $conf->api->dir_temp), null, 'errors');
+				$error++;
+			}
+		}
+		else
+		{
+			// Delete the cache file otherwise it does not update
+			$result = dol_delete_file($conf->api->dir_temp.'/routes.php');
+			if ($result < 0)
+			{
+				setEventMessages($langs->trans("ErrorFailedToDeleteFile", $conf->api->dir_temp.'/routes.php'), null, 'errors');
+				$error++;
+			}
+		}
+
+	    if (!$error)
 	    {
     		header("Location: ".$_SERVER["PHP_SELF"]);
 	   	    exit;

From d8c5ec2aefb9d6e1abf4a313b287c0167a535e54 Mon Sep 17 00:00:00 2001
From: David <dvasseur@users.noreply.github.com>
Date: Tue, 23 May 2017 18:27:41 +0200
Subject: [PATCH 010/438] FIX: REST API not possible to add agendaevents

---
 htdocs/comm/action/class/api_agendaevents.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index 5eeca63a4aa..b1014b9171a 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -289,7 +289,7 @@ class AgendaEvents extends DolibarrApi
     function _validate($data)
     {
         $event = array();
-        foreach (Events::$FIELDS as $field) {
+        foreach (AgendaEvents::$FIELDS as $field) {
             if (!isset($data[$field]))
                 throw new RestException(400, "$field field missing");
             $event[$field] = $data[$field];

From ad656e6d35a20daa658b966c9a526acdd7aeaced Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 May 2017 15:34:00 +0200
Subject: [PATCH 011/438] Look and feel v6

---
 htdocs/margin/admin/margin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/margin/admin/margin.php b/htdocs/margin/admin/margin.php
index 8f39f695952..1918a9aa137 100644
--- a/htdocs/margin/admin/margin.php
+++ b/htdocs/margin/admin/margin.php
@@ -119,7 +119,7 @@ print load_fiche_titre($langs->trans("margesSetup"),$linkback,'title_setup');
 
 $head = marges_admin_prepare_head();
 
-dol_fiche_head($head, 'parameters', $langs->trans("Margins"), 0, 'margin');
+dol_fiche_head($head, 'parameters', $langs->trans("Margins"), -1, 'margin');
 
 print load_fiche_titre($langs->trans("MemberMainOptions"),'','');
 print '<table class="noborder" width="100%">';

From df729d8889196cb7c30fd5efea1755342438e348 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 May 2017 19:28:43 +0200
Subject: [PATCH 012/438] Fix travis

---
 htdocs/core/class/html.form.class.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 640c784436a..cf6ae18f568 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5017,16 +5017,10 @@ class Form
      *  @param	string			$sort			'ASC' or 'DESC' = Sort on label, '' or 'NONE' or 'POS' = Do not sort, we keep original order
      *  @param	string			$morecss		Add more class to css styles
      *  @param	int				$addjscombo		    Add js combo
-<<<<<<< HEAD
      *  @param  string          $moreparamonempty   Add more param on the empty option line. Not used if show_empty not set
      *  @param  int             $disablebademail    Check if an email is found into value and if not disable and colorize entry
      *  @param  int             $nohtmlescape       No html escaping.
-     * 	@return	string							    HTML select string
-=======
-     *  @param  string          $moreparamonempty   Add more param on the empty option line. Not used if show_empty not set.
-     *  @param  int             $disablebademail    Check if an email is found into value and if not disable and colorize entry.
      * 	@return	string							    HTML select string.
->>>>>>> branch '5.0' of git@github.com:Dolibarr/dolibarr.git
      *  @see multiselectarray
      */
     static function selectarray($htmlname, $array, $id='', $show_empty=0, $key_in_label=0, $value_as_key=0, $moreparam='', $translate=0, $maxlen=0, $disabled=0, $sort='', $morecss='', $addjscombo=0, $moreparamonempty='',$disablebademail=0, $nohtmlescape=0)

From f21ec76bc040638768dcd572e388ac020d2274ba Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 May 2017 21:16:37 +0200
Subject: [PATCH 013/438] Exclude dir

---
 build/makepack-dolibarr.pl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index c06d8f0730f..1dbd6f6fd5e 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -518,6 +518,7 @@ if ($nboftargetok) {
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/dolimed*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/dolimod*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/factory*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/forceproject*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/lead*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/management*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/multicompany*`;

From eea6461369088e27ab0208d7c3313865ed6e2cac Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 May 2017 21:27:22 +0200
Subject: [PATCH 014/438] Update ChangeLog for 4.0.6

---
 ChangeLog | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 5fe3c741499..e69b2a9d203 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,29 @@ Upgrading to any other version or any other database system is abolutely require
 make a Dolibarr upgrade.
 
 
+***** ChangeLog for 4.0.6 to 4.0.5 *****
+FIX: #6613 Default subject for Supplier proposal emails is filled with a non-existing key
+FIX: #6623 User card shows "Return to list" link even if the user has no rights to list users
+FIX: #6636 Complete fix
+FIX: #6669 User with no permission to edit customer invoices can see a edit button in project entry
+FIX: #6671 Cannot remove thirdparty type with "#" in its name
+FIX: #6673 Missing "nature" table header in thirdparty list
+FIX: #6675 Restricted user with no agenda permissions can see a button to create appointment in thirdparty contact list
+FIX: #6677 Expired contracts dashboard box does not show the name of the thirdparty
+FIX: #6679 User with restricted supplier invoice permissions can edit project, payment conditions, payment mode
+FIX: #6680 User with restricted supplier invoice permissions sees "reopen" button even if he has no permission to do it
+FIX: #6813
+FIX: Correction with author and validator user on orders
+FIX: doactions hook missing in invoice model page
+FIX: dont get empty "Incoterms : - " string if no incoterm
+FIX: dont lose supplier ref if no supplier price in database
+FIX: forgotten parameter for right multicompany use
+FIX: global $dateSelector isn't the good one, then date selector on objectline_create tpl was hidden
+FIX: limit+1 dosn't show Total line
+FIX: supplier order line were always created with rang = 0
+FIX: All known CVE at the date 31th of may.
+
+
 ***** ChangeLog for 4.0.5 to 4.0.4 *****
 FIX: #6234
 FIX: #6259

From 8edce66c08679e79634d7a22c510317aeb3c2d68 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 May 2017 21:27:22 +0200
Subject: [PATCH 015/438] Update ChangeLog for 4.0.6

---
 ChangeLog | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 5fe3c741499..e4c07380aae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,28 @@ Upgrading to any other version or any other database system is abolutely require
 make a Dolibarr upgrade.
 
 
+***** ChangeLog for 4.0.6 to 4.0.5 *****
+FIX: #6613 Default subject for Supplier proposal emails is filled with a non-existing key
+FIX: #6623 User card shows "Return to list" link even if the user has no rights to list users
+FIX: #6636 Complete fix
+FIX: #6669 User with no permission to edit customer invoices can see a edit button in project entry
+FIX: #6671 Cannot remove thirdparty type with "#" in its name
+FIX: #6673 Missing "nature" table header in thirdparty list
+FIX: #6675 Restricted user with no agenda permissions can see a button to create appointment in thirdparty contact list
+FIX: #6677 Expired contracts dashboard box does not show the name of the thirdparty
+FIX: #6679 User with restricted supplier invoice permissions can edit project, payment conditions, payment mode
+FIX: #6680 User with restricted supplier invoice permissions sees "reopen" button even if he has no permission to do it
+FIX: #6813
+FIX: Correction with author and validator user on orders
+FIX: doactions hook missing in invoice model page
+FIX: dont get empty "Incoterms : - " string if no incoterm
+FIX: dont lose supplier ref if no supplier price in database
+FIX: forgotten parameter for right multicompany use
+FIX: global $dateSelector isn't the good one, then date selector on objectline_create tpl was hidden
+FIX: limit+1 dosn't show Total line
+FIX: supplier order line were always created with rang = 0
+
+
 ***** ChangeLog for 4.0.5 to 4.0.4 *****
 FIX: #6234
 FIX: #6259

From bd891ea56ab2de44ce7fc3f5ffe538d51ba7e9bc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 30 May 2017 00:26:02 +0200
Subject: [PATCH 016/438] Deploy to server works even when cloudflare is
 active.

---
 build/makepack-dolibarr.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index 1dbd6f6fd5e..20dfc2579aa 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -19,7 +19,7 @@ use Cwd;
 # Change this to defined target for option 98 and 99
 $PROJECT="dolibarr";
 $PUBLISHSTABLE="eldy,dolibarr\@frs.sourceforge.net:/home/frs/project/dolibarr";
-$PUBLISHBETARC="ldestailleur\@asso.dolibarr.org:/home/dolibarr/dolibarr.org/httpdocs/files";
+$PUBLISHBETARC="ldestailleur\@vmprod.dolibarr.org:/home/dolibarr/dolibarr.org/httpdocs/files";
 
 
 #@LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","APS","EXEDOLIWAMP","SNAPSHOT");   # Possible packages

From fa6bc037656281e5293ee26bcce82f9f8a96c73f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 30 May 2017 01:32:36 +0200
Subject: [PATCH 017/438] Fix typo

---
 htdocs/admin/modules.php              | 17 ++++++++++-------
 htdocs/core/lib/files.lib.php         |  2 +-
 htdocs/langs/en_US/modulebuilder.lang |  4 ++--
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 5c4291ff3f3..fe735cb2499 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -430,7 +430,6 @@ print "<br>\n";
 
 if ($mode == 'common')
 {
-    
     print '<form method="GET" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -763,13 +762,20 @@ if ($mode == 'common')
         }
 
         print "</tr>\n";
-
     }
     
-    print "</table>\n";
-    print '</div>';
+    if ($oldfamily)
+    {
+        print "</table>\n";
+        print '</div>';
+    }
     
     dol_fiche_end();
+    
+    // Show warning about external users
+    print info_admin(showModulesExludedForExternal($modules))."\n";
+    
+    print '</form>';
 }
 
 if ($mode == 'marketplace')
@@ -909,9 +915,6 @@ if ($mode == 'deploy')
 }
 
 
-// Show warning about external users
-if ($mode == 'common') print info_admin(showModulesExludedForExternal($modules))."\n";
-
 
 llxFooter();
 
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index ad800708522..e52f8bf98ec 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -588,7 +588,7 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayrep
 	if (empty($srcfile) || empty($destfile)) return -1;
 
 	$destexists=dol_is_dir($destfile);
-	//if (! $overwriteifexists && $destexists) return 0;	// The overwriteifexists is for files only, so propaated to dol_copy only.
+	//if (! $overwriteifexists && $destexists) return 0;	// The overwriteifexists is for files only, so propagated to dol_copy only.
     
     if (! $destexists)
     {
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index 7336a020fa6..b717bafc57c 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -7,9 +7,9 @@ NewModule=New module
 ModuleKey=Key for new module
 ModuleInitialized=Module initialized
 ModuleBuilderDescdescription=Enter here all general information that describe your module
-ModuleBuilderDescobjects=Define here the new objects you want to manage with our module. A page to list them and a page to create/edit/view a card will be generated.
+ModuleBuilderDescobjects=Define here the new objects you want to manage with your module. A page to list them and a page to create/edit/view a card will be generated.
 ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
-ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with our module.
+ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with your module.
 ModuleBuilderDesctriggers=This is the view of triggers provided by your module. To include code executed when a triggered business event is launched, just edit this file with your IDE.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module. Just click on button to get your module package file.
 BuildPackage=Build package

From a0de94ae0963d672145d3273e2552dc99c77d169 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Tue, 30 May 2017 06:28:19 +0200
Subject: [PATCH 018/438] Fix : Correct donation when we write operation in
 general ledger

---
 htdocs/accountancy/journal/bankjournal.php | 37 ++++++++++++++++++----
 1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index ea98d678671..6aa900f3a89 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -40,6 +40,7 @@ require_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT . '/compta/sociales/class/chargesociales.class.php';
 require_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
+require_once DOL_DOCUMENT_ROOT . '/don/class/don.class.php';
 require_once DOL_DOCUMENT_ROOT . '/don/class/paymentdonation.class.php';
 require_once DOL_DOCUMENT_ROOT . '/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT . '/compta/salaries/class/paymentsalary.class.php';
@@ -222,7 +223,7 @@ if ($result) {
 		    // Now loop on each link of record in bank.
 			foreach ( $links as $key => $val ) {
 
-			    if (in_array($links[$key]['type'], array('sc', 'payment_sc', 'payment', 'payment_supplier', 'payment_vat', 'payment_expensereport', 'banktransfert')))     // So we excluded 'company' here
+			    if (in_array($links[$key]['type'], array('sc', 'payment_sc', 'payment', 'payment_supplier', 'payment_vat', 'payment_expensereport', 'banktransfert', 'payment_donation')))     // So we excluded 'company' here
 			    {
 			        // We save tabtype for a future use, to remember what kind of payment it is 
 			        $tabtype[$obj->rowid] = $links[$key]['type'];
@@ -278,7 +279,8 @@ if ($result) {
 				} else if ($links[$key]['type'] == 'payment_donation') {
 					$paymentdonstatic->id = $links[$key]['url_id'];
 					$paymentdonstatic->fk_donation = $links[$key]['url_id'];
-					$tabpay[$obj->rowid]["lib"] .= ' ' . $langs->trans("PaymentDonation");
+					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentdonstatic->getNomUrl(2);
+					$tabpay[$obj->rowid]["paymentdonationid"] = $paymentdonstatic->id;
 					$tabtp[$obj->rowid][$account_pay_donation] += $obj->amount;
 				} else if ($links[$key]['type'] == 'payment_vat') {
 					$paymentvatstatic->id = $links[$key]['url_id'];
@@ -415,6 +417,9 @@ if (! $error && $action == 'writebookkeeping') {
         					$objmid = $db->fetch_object($resultmid);
         					$bookkeeping->doc_ref = $objmid->ref; // Ref of expensereport
         				}
+        			} else if ($tabtype[$key] == 'payment_donation') {
+						$bookkeeping->code_tiers = '';
+						$bookkeeping->doc_ref = $langs->trans("Donation") . ' (' . $val["paymentdonationid"] . ')'; // Rowid of donation
         			}
         
         			$result = $bookkeeping->create($user);
@@ -435,7 +440,7 @@ if (! $error && $action == 'writebookkeeping') {
     			}
     		}
 		}
-		
+
 		// Third party
 		if (! $errorforline)
 		{
@@ -475,7 +480,6 @@ if (! $error && $action == 'writebookkeeping') {
         				$bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
         				$bookkeeping->numero_compte = $k;
         			} else if ($tabtype[$key] == 'payment_supplier') {           // If payment is payment of supplier invoice, we get ref of invoice
-        
         				$sqlmid = 'SELECT facf.ref_supplier,facf.ref';
         				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf ";
         				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON  payfacf.fk_facturefourn=facf.rowid";
@@ -489,6 +493,10 @@ if (! $error && $action == 'writebookkeeping') {
         				}
                         $bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
         				$bookkeeping->numero_compte = $k;
+        			} else if ($tabtype[$key] == 'payment_donation') {
+						$bookkeeping->code_tiers = '';
+						$bookkeeping->numero_compte = $k;
+						$bookkeeping->doc_ref = $langs->trans("Donation") . ' (' . $val["paymentdonationid"] . ')'; // Rowid of donation
         			} else if ($tabtype[$key] == 'banktransfert') {
 						$bookkeeping->code_tiers = '';
         				$bookkeeping->numero_compte = $k;
@@ -724,6 +732,7 @@ if (empty($action) || $action == 'view') {
 	$invoicestatic = new Facture($db);
 	$invoicesupplierstatic = new FactureFournisseur($db);
 	$expensereportstatic = new ExpenseReport($db);
+	$donationstatic = new Don($db);
 
 	llxHeader('', $langs->trans("FinanceJournal"));
 
@@ -793,7 +802,7 @@ if (empty($action) || $action == 'view') {
 		}
 		if ($reflabel == '(CustomerInvoicePayment)') {
 			$reflabel = $langs->trans('Customer');
-		}		
+		}
 		if ($reflabel == '(SocialContributionPayment)') {
 			$reflabel = $langs->trans('SocialContribution');
 		}
@@ -806,7 +815,7 @@ if (empty($action) || $action == 'view') {
 		if ($reflabel == '(ExpenseReportPayment)') {
 			$reflabel = $langs->trans('Employee');
 		}
-		
+
 		$ref=$reflabel;
 		if ($tabtype[$key] == 'payment')
 		{
@@ -850,6 +859,20 @@ if (empty($action) || $action == 'view') {
 		    }
 		    else dol_print_error($db);
 		}
+		elseif ($tabtype[$key] == 'payment_donation')
+		{
+		    $sqlmid = 'SELECT payd.fk_donation as id';
+		    $sqlmid .= " FROM " . MAIN_DB_PREFIX . "payment_donation as payd";
+		    $sqlmid .= " WHERE payd.fk_donation=" . $val["paymentdonationid"];
+		    dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
+		    $resultmid = $db->query($sqlmid);
+		    if ($resultmid) {
+		        $objmid = $db->fetch_object($resultmid);
+		        $donationstatic->fetch($objmid->id);
+		        $ref=$langs->trans("Donation").' '.$donationstatic->getNomUrl(1);
+		    }
+		    else dol_print_error($db);
+		}
 
 
 		/*$invoicestatic->id = $key;
@@ -871,7 +894,7 @@ if (empty($action) || $action == 'view') {
 			else print $accountoshow;
 			print "</td>";
 			if ($val['soclib'] == '') {
-				print "<td>" . $bankstatic->label . " - " . $val["ref"] . "</td>";
+				print "<td>" . $bankstatic->label . " - " . $reflabel . "</td>";
 			} else {
 				print "<td>" . $bankstatic->label . " - " . $val['soclib'] . "</td>";
 			}

From c66695bd56e86f506fa78de2e18cd1f9021e4daf Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Tue, 30 May 2017 15:35:51 +0200
Subject: [PATCH 019/438] FIX : origin & originid on supplierproposal

---
 .../class/supplier_proposal.class.php                | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 572735384e4..aa845169475 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -356,11 +356,13 @@ class SupplierProposal extends CommonObject
      *      @param		array		$array_option		extrafields array
 	 * 		@param		string		$ref_fourn			Supplier price reference
 	 * 		@param		int			$fk_unit			Id of the unit to use.
+	 * 		@param		string		$origin				'order', 'supplier_proposal', ...
+	 * 		@param		int			$origin_id			Id of origin line
      *    	@return    	int         	    			>0 if OK, <0 if KO
      *
      *    	@see       	add_product
      */
-	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $price_base_type='HT', $pu_ttc=0, $info_bits=0, $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=0, $pa_ht=0, $label='',$array_option=0, $ref_fourn='', $fk_unit='')
+    function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $price_base_type='HT', $pu_ttc=0, $info_bits=0, $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=0, $pa_ht=0, $label='',$array_option=0, $ref_fourn='', $fk_unit='', $origin, $origin_id)
     {
     	global $mysoc;
 
@@ -462,7 +464,8 @@ class SupplierProposal extends CommonObject
             $this->line->special_code=$special_code;
             $this->line->fk_parent_line=$fk_parent_line;
             $this->line->fk_unit=$fk_unit;
-
+            $this->line->origin=$origin;
+            $this->line->origin_id=$origin_id;
 			$this->line->ref_fourn = $this->db->escape($ref_fourn);
 
 			// infos marge
@@ -880,7 +883,10 @@ class SupplierProposal extends CommonObject
 							$this->lines[$i]->pa_ht,
 							$this->lines[$i]->label,
 							$this->lines[$i]->array_options,
-							$this->lines[$i]->ref_fourn
+							$this->lines[$i]->ref_fourn,
+							$this->lines[$i]->fk_unit,
+							'supplier_proposal',
+							$this->lines[$i]->rowid
 						);
 
                         if ($result < 0)

From 6b7c4cbbe198063ee403792e542cbeb6182da0a5 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Tue, 30 May 2017 16:00:21 +0200
Subject: [PATCH 020/438] FIX : default param

---
 htdocs/supplier_proposal/class/supplier_proposal.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index aa845169475..23c8257a4f5 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -362,7 +362,7 @@ class SupplierProposal extends CommonObject
      *
      *    	@see       	add_product
      */
-    function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $price_base_type='HT', $pu_ttc=0, $info_bits=0, $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=0, $pa_ht=0, $label='',$array_option=0, $ref_fourn='', $fk_unit='', $origin, $origin_id)
+    function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $price_base_type='HT', $pu_ttc=0, $info_bits=0, $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=0, $pa_ht=0, $label='',$array_option=0, $ref_fourn='', $fk_unit='', $origin='', $origin_id=0)
     {
     	global $mysoc;
 

From 200f4010d89deb5487364b5ff74c2e396d6e1a55 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Tue, 30 May 2017 16:00:39 +0200
Subject: [PATCH 021/438] Fix special char and size limit in SEPA XML

---
 htdocs/compta/prelevement/class/bonprelevement.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index f007fa41d21..814bece5bd1 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -1574,10 +1574,10 @@ class BonPrelevement extends CommonObject
 		$XML_DEBITOR .='					</FinInstnId>'.$CrLf;
 		$XML_DEBITOR .='				</DbtrAgt>'.$CrLf;
 		$XML_DEBITOR .='				<Dbtr>'.$CrLf;
-		$XML_DEBITOR .='					<Nm>'.strtoupper(dol_string_unaccent($row_nom)).'</Nm>'.$CrLf;
+		$XML_DEBITOR .='					<Nm>'.strtoupper(dol_string_unaccent(dolEscapeXML($row_nom))).'</Nm>'.$CrLf;
 		$XML_DEBITOR .='					<PstlAdr>'.$CrLf;
 		$XML_DEBITOR .='						<Ctry>'.$row_country_code.'</Ctry>'.$CrLf;
-		$XML_DEBITOR .='						<AdrLine>'.dol_string_unaccent(strtr($row_address, array(CHR(13) => ", ", CHR(10) => ""))).'</AdrLine>'.$CrLf;
+		$XML_DEBITOR .='						<AdrLine>'.dol_trunc(dol_string_unaccent(strtr($row_address, array(CHR(13) => ", ", CHR(10) => ""))),70,'right','UTF-8',true).'</AdrLine>'.$CrLf;
 		$XML_DEBITOR .='						<AdrLine>'.dol_string_unaccent($row_zip.' '.$row_town).'</AdrLine>'.$CrLf;
 		$XML_DEBITOR .='					</PstlAdr>'.$CrLf;
 		$XML_DEBITOR .='				</Dbtr>'.$CrLf;

From 510b1aedcf12d2ce16780bb0fd185bbdbb9cdd68 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Tue, 30 May 2017 16:13:49 +0200
Subject: [PATCH 022/438] Fix xml SEPA $ListOfFactures not used and was listing
 all invoices in each XML line

---
 .../prelevement/class/bonprelevement.class.php     | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 814bece5bd1..2bfed9b0696 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -1265,18 +1265,6 @@ class BonPrelevement extends CommonObject
 			 * section Debiteur (sepa Debiteurs bloc lines)
 			 */
 
-			$tmp_invoices = array();
-
-			$sql = "SELECT f.facnumber as fac FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl, ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."prelevement_facture as pf, ".MAIN_DB_PREFIX."societe as soc, ".MAIN_DB_PREFIX."c_country as p, ".MAIN_DB_PREFIX."societe_rib as rib WHERE pl.fk_prelevement_bons = ".$this->id." AND pl.rowid = pf.fk_prelevement_lignes AND pf.fk_facture = f.rowid AND soc.fk_pays = p.rowid AND soc.rowid = f.fk_soc AND rib.fk_soc = f.fk_soc AND rib.default_rib = 1";
-			$resql=$this->db->query($sql);
-			if ($resql) {
-				while ($objfac = $this->db->fetch_object($resql)) {
-					$tmp_invoices[] = $objfac->fac;
-				}
-			}
-
-	        $ListOfFactures = implode($tmp_invoices);
-
 			$sql = "SELECT soc.code_client as code, soc.address, soc.zip, soc.town, c.code as country_code,";
 			$sql.= " pl.client_nom as nom, pl.code_banque as cb, pl.code_guichet as cg, pl.number as cc, pl.amount as somme,";
 			$sql.= " f.facnumber as fac, pf.fk_facture as idfac, rib.datec, rib.iban_prefix as iban, rib.bic as bic, rib.rowid as drum";
@@ -1303,7 +1291,7 @@ class BonPrelevement extends CommonObject
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object($resql);
-					$fileDebiteurSection .= $this->EnregDestinataireSEPA($obj->code, $obj->nom, $obj->address, $obj->zip, $obj->town, $obj->country_code, $obj->cb, $obj->cg, $obj->cc, $obj->somme, $ListOfFactures, $obj->idfac, $obj->iban, $obj->bic, $this->db->jdate($obj->datec), $obj->drum);
+					$fileDebiteurSection .= $this->EnregDestinataireSEPA($obj->code, $obj->nom, $obj->address, $obj->zip, $obj->town, $obj->country_code, $obj->cb, $obj->cg, $obj->cc, $obj->somme, $obj->fac, $obj->idfac, $obj->iban, $obj->bic, $this->db->jdate($obj->datec), $obj->drum);
 					$this->total = $this->total + $obj->somme;
 					$i++;
 				}

From 5c5663c5ae9a9b02f9a994d10cfaa310ed2bbdfb Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Tue, 30 May 2017 18:50:54 +0200
Subject: [PATCH 023/438] New: getEntity function use true $shared value by
 default

---
 ChangeLog                                     |  2 +
 htdocs/accountancy/admin/productaccount.php   |  2 +-
 .../accountancy/class/bookkeeping.class.php   | 32 ++++++++--------
 htdocs/accountancy/customer/card.php          |  2 +-
 htdocs/accountancy/customer/index.php         | 12 +++---
 htdocs/accountancy/customer/lines.php         |  4 +-
 htdocs/accountancy/customer/list.php          |  2 +-
 htdocs/accountancy/expensereport/card.php     |  2 +-
 htdocs/accountancy/expensereport/index.php    |  8 ++--
 htdocs/accountancy/expensereport/lines.php    |  2 +-
 htdocs/accountancy/expensereport/list.php     |  2 +-
 .../journal/expensereportsjournal.php         |  2 +-
 .../accountancy/journal/purchasesjournal.php  |  2 +-
 htdocs/accountancy/supplier/card.php          |  2 +-
 htdocs/accountancy/supplier/index.php         |  8 ++--
 htdocs/accountancy/supplier/lines.php         |  2 +-
 htdocs/accountancy/supplier/list.php          |  2 +-
 htdocs/adherents/class/adherent.class.php     |  4 +-
 .../adherents/class/adherentstats.class.php   |  2 +-
 htdocs/adherents/class/api_members.class.php  |  2 +-
 .../class/api_memberstypes.class.php          |  2 +-
 htdocs/adherents/list.php                     |  2 +-
 htdocs/adherents/subscription/list.php        |  2 +-
 htdocs/admin/dict.php                         |  2 +-
 htdocs/admin/facture.php                      |  4 +-
 htdocs/admin/mails_templates.php              |  2 +-
 htdocs/admin/tools/listevents.php             |  2 +-
 htdocs/asterisk/cidlookup.php                 |  2 +-
 htdocs/asterisk/wrapper.php                   |  2 +-
 htdocs/bookmarks/bookmarks.lib.php            |  2 +-
 htdocs/cashdesk/facturation.php               |  4 +-
 htdocs/cashdesk/facturation_dhtml.php         |  2 +-
 htdocs/cashdesk/facturation_verif.php         |  2 +-
 .../categories/class/api_categories.class.php |  4 +-
 .../class/api_deprecated_category.class.php   |  4 +-
 htdocs/categories/class/categorie.class.php   | 10 ++---
 htdocs/comm/action/class/actioncomm.class.php |  6 +--
 .../action/class/api_agendaevents.class.php   |  2 +-
 htdocs/comm/action/index.php                  |  4 +-
 htdocs/comm/action/listactions.php            |  2 +-
 htdocs/comm/action/pertype.php                |  2 +-
 htdocs/comm/action/peruser.php                |  4 +-
 htdocs/comm/action/rapport/index.php          |  2 +-
 htdocs/comm/card.php                          |  2 +-
 htdocs/comm/contact.php                       |  2 +-
 htdocs/comm/index.php                         | 14 +++----
 .../mailing/class/advtargetemailing.class.php |  4 +-
 htdocs/comm/propal/card.php                   |  2 +-
 .../comm/propal/class/api_proposals.class.php |  2 +-
 htdocs/comm/propal/class/propal.class.php     | 10 ++---
 .../comm/propal/class/propalestats.class.php  |  2 +-
 htdocs/comm/propal/index.php                  |  8 ++--
 htdocs/comm/propal/list.php                   |  2 +-
 htdocs/comm/prospect/index.php                |  4 +-
 .../class/api_deprecated_commande.class.php   |  2 +-
 htdocs/commande/class/api_orders.class.php    |  2 +-
 htdocs/commande/class/commande.class.php      | 10 ++---
 htdocs/commande/class/commandestats.class.php |  2 +-
 htdocs/commande/customer.php                  |  2 +-
 htdocs/commande/index.php                     | 10 ++---
 htdocs/commande/list.php                      |  2 +-
 htdocs/commande/orderstoinvoice.php           |  2 +-
 htdocs/compta/bank/annuel.php                 | 12 +++---
 htdocs/compta/bank/bankentries.php            |  4 +-
 htdocs/compta/bank/class/account.class.php    |  6 +--
 .../bank/class/api_bankaccounts.class.php     |  2 +-
 htdocs/compta/bank/graph.php                  | 20 +++++-----
 htdocs/compta/bank/index.php                  |  2 +-
 htdocs/compta/charges/index.php               |  2 +-
 htdocs/compta/clients.php                     |  2 +-
 .../deplacement/class/deplacement.class.php   |  2 +-
 .../class/api_deprecated_invoice.class.php    |  2 +-
 .../facture/class/api_invoices.class.php      |  2 +-
 .../facture/class/facture-rec.class.php       |  2 +-
 htdocs/compta/facture/class/facture.class.php |  4 +-
 htdocs/compta/facture/list.php                |  2 +-
 htdocs/compta/paiement/cheque/card.php        |  4 +-
 .../cheque/class/remisecheque.class.php       |  2 +-
 htdocs/compta/paiement/cheque/index.php       |  2 +-
 htdocs/compta/resultat/clientfourn.php        |  8 ++--
 htdocs/compta/resultat/index.php              |  8 ++--
 htdocs/compta/sociales/payments.php           |  2 +-
 htdocs/compta/stats/cabyuser.php              |  2 +-
 htdocs/compta/stats/casoc.php                 |  2 +-
 htdocs/compta/stats/index.php                 |  2 +-
 htdocs/contact/list.php                       |  2 +-
 htdocs/contrat/class/contrat.class.php        |  4 +-
 htdocs/contrat/index.php                      | 14 +++----
 htdocs/contrat/list.php                       |  2 +-
 htdocs/core/boxes/box_clients.php             |  2 +-
 htdocs/core/boxes/box_contacts.php            |  2 +-
 htdocs/core/boxes/box_fournisseurs.php        |  2 +-
 htdocs/core/boxes/box_goodcustomers.php       |  2 +-
 htdocs/core/boxes/box_project.php             |  4 +-
 htdocs/core/boxes/box_prospect.php            |  2 +-
 htdocs/core/class/commonobject.class.php      |  2 +-
 htdocs/core/class/html.form.class.php         | 32 ++++++++--------
 .../core/class/html.formaccounting.class.php  |  8 ++--
 htdocs/core/class/html.formcompany.class.php  |  2 +-
 htdocs/core/class/html.formmail.class.php     |  6 +--
 htdocs/core/class/html.formprojet.class.php   |  4 +-
 htdocs/core/class/notify.class.php            |  4 +-
 htdocs/core/lib/company.lib.php               |  4 +-
 htdocs/core/lib/files.lib.php                 |  8 ++--
 htdocs/core/lib/functions.lib.php             |  4 +-
 htdocs/core/lib/sendings.lib.php              |  2 +-
 .../core/modules/facture/mod_facture_mars.php |  4 +-
 .../modules/facture/mod_facture_terre.php     |  4 +-
 .../mailings/advthirdparties.modules.php      |  6 +--
 .../modules/mailings/contacts1.modules.php    |  6 +--
 .../modules/mailings/contacts2.modules.php    |  8 ++--
 .../modules/mailings/contacts3.modules.php    | 10 ++---
 .../modules/mailings/contacts4.modules.php    | 10 ++---
 .../modules/mailings/thirdparties.modules.php |  8 ++--
 .../thirdparties_services_expired.modules.php |  6 +--
 htdocs/core/modules/modAccounting.class.php   |  2 +-
 htdocs/core/modules/modAdherent.class.php     |  2 +-
 htdocs/core/modules/modAgenda.class.php       |  2 +-
 htdocs/core/modules/modBanque.class.php       |  4 +-
 htdocs/core/modules/modCategorie.class.php    | 10 ++---
 htdocs/core/modules/modCommande.class.php     |  2 +-
 htdocs/core/modules/modContrat.class.php      |  2 +-
 htdocs/core/modules/modDeplacement.class.php  |  2 +-
 htdocs/core/modules/modExpedition.class.php   |  2 +-
 .../core/modules/modExpenseReport.class.php   |  2 +-
 htdocs/core/modules/modFacture.class.php      |  4 +-
 htdocs/core/modules/modFicheinter.class.php   |  2 +-
 htdocs/core/modules/modFournisseur.class.php  |  6 +--
 htdocs/core/modules/modProduct.class.php      |  6 +--
 htdocs/core/modules/modProjet.class.php       |  2 +-
 htdocs/core/modules/modPropale.class.php      |  2 +-
 htdocs/core/modules/modResource.class.php     |  2 +-
 htdocs/core/modules/modSalaries.class.php     |  2 +-
 htdocs/core/modules/modService.class.php      |  4 +-
 htdocs/core/modules/modSociete.class.php      |  6 +--
 htdocs/core/modules/modStock.class.php        |  4 +-
 htdocs/core/modules/modTax.class.php          |  2 +-
 htdocs/core/modules/modUser.class.php         |  2 +-
 .../modules/societe/mod_codeclient_monkey.php |  4 +-
 htdocs/don/class/don.class.php                |  2 +-
 htdocs/ecm/class/ecmfiles.class.php           |  4 +-
 htdocs/expedition/card.php                    |  2 +-
 htdocs/expedition/class/expedition.class.php  |  4 +-
 htdocs/expedition/index.php                   |  4 +-
 htdocs/expedition/list.php                    |  2 +-
 .../class/api_expensereports.class.php        |  2 +-
 .../class/expensereport.class.php             |  4 +-
 .../class/expensereportstats.class.php        |  2 +-
 htdocs/expensereport/export_csv.php           |  2 +-
 htdocs/expensereport/index.php                |  4 +-
 htdocs/expensereport/list.php                 |  2 +-
 htdocs/expensereport/payment/card.php         |  2 +-
 htdocs/expensereport/payment/payment.php      |  2 +-
 htdocs/fichinter/index.php                    |  8 ++--
 htdocs/fourn/card.php                         |  2 +-
 .../class/api_supplier_invoices.class.php     |  2 +-
 htdocs/fourn/class/fournisseur.class.php      |  4 +-
 .../class/fournisseur.commande.class.php      |  2 +-
 .../fourn/class/fournisseur.facture.class.php |  2 +-
 .../fourn/class/fournisseur.product.class.php |  4 +-
 htdocs/fourn/commande/list.php                |  2 +-
 htdocs/fourn/contact.php                      |  2 +-
 htdocs/fourn/facture/list.php                 |  2 +-
 htdocs/fourn/index.php                        |  2 +-
 htdocs/fourn/product/list.php                 |  2 +-
 htdocs/holiday/class/holiday.class.php        |  4 +-
 htdocs/livraison/class/livraison.class.php    |  2 +-
 htdocs/margin/agentMargins.php                |  4 +-
 htdocs/margin/checkMargins.php                |  2 +-
 htdocs/margin/customerMargins.php             |  2 +-
 htdocs/margin/productMargins.php              |  2 +-
 .../oldskeletons/skeleton_api_class.class.php |  2 +-
 .../oldskeletons/skeleton_class.class.php     |  4 +-
 .../oldskeletons/skeleton_list.php            |  2 +-
 .../template/class/myobject.class.php         |  4 +-
 .../class/myobject_api_class.class.php        |  2 +-
 .../modulebuilder/template/myobject_list.php  |  2 +-
 .../class/multicurrency.class.php             |  2 +-
 htdocs/opensurvey/list.php                    |  2 +-
 htdocs/product/admin/product_tools.php        |  4 +-
 htdocs/product/ajax/products.php              |  2 +-
 .../product/actions_card_product.class.php    |  2 +-
 .../service/actions_card_service.class.php    |  2 +-
 .../class/api_deprecated_product.class.php    |  4 +-
 htdocs/product/class/api_products.class.php   |  2 +-
 .../product/class/html.formproduct.class.php  |  2 +-
 htdocs/product/class/product.class.php        | 38 +++++++++----------
 .../class/productcustomerprice.class.php      |  6 +--
 htdocs/product/composition/card.php           |  2 +-
 htdocs/product/index.php                      |  2 +-
 .../inventory/class/inventory.class.php       |  2 +-
 htdocs/product/list-with-listview.php         |  2 +-
 htdocs/product/list.php                       |  2 +-
 htdocs/product/popuprop.php                   |  2 +-
 htdocs/product/price.php                      |  2 +-
 htdocs/product/reassort.php                   |  2 +-
 htdocs/product/reassortlot.php                |  2 +-
 htdocs/product/stats/commande.php             |  2 +-
 htdocs/product/stats/contrat.php              |  2 +-
 htdocs/product/stats/facture.php              |  2 +-
 htdocs/product/stats/facture_fournisseur.php  |  2 +-
 htdocs/product/stats/propal.php               |  2 +-
 .../stock/class/api_stockmovements.class.php  |  2 +-
 .../stock/class/api_warehouses.class.php      |  2 +-
 htdocs/product/stock/class/entrepot.class.php |  2 +-
 htdocs/product/stock/index.php                |  4 +-
 htdocs/product/stock/list.php                 |  2 +-
 htdocs/product/stock/mouvement.php            |  2 +-
 htdocs/product/stock/product.php              |  2 +-
 htdocs/product/stock/productlot_list.php      |  2 +-
 htdocs/product/stock/replenish.php            | 10 ++---
 htdocs/product/stock/valo.php                 |  2 +-
 htdocs/projet/class/api_projects.class.php    |  2 +-
 htdocs/projet/class/api_tasks.class.php       |  2 +-
 htdocs/projet/class/project.class.php         |  8 ++--
 htdocs/projet/class/task.class.php            |  6 +--
 htdocs/projet/list.php                        |  2 +-
 htdocs/projet/tasks/list.php                  |  2 +-
 htdocs/resource/class/dolresource.class.php   |  6 +--
 htdocs/societe/ajaxcompanies.php              |  2 +-
 htdocs/societe/class/api_contacts.class.php   |  2 +-
 .../class/api_deprecated_contact.class.php    |  2 +-
 .../class/api_deprecated_thirdparty.class.php |  2 +-
 .../societe/class/api_thirdparties.class.php  |  2 +-
 htdocs/societe/class/societe.class.php        |  4 +-
 htdocs/societe/index.php                      |  6 +--
 htdocs/societe/list.php                       |  2 +-
 htdocs/societe/notify/index.php               |  2 +-
 .../class/supplier_proposal.class.php         |  2 +-
 htdocs/supplier_proposal/list.php             |  2 +-
 htdocs/user/class/api_users.class.php         |  2 +-
 htdocs/user/class/user.class.php              |  6 +--
 htdocs/user/index.php                         |  2 +-
 .../variants/class/ProductAttribute.class.php |  6 +--
 .../class/ProductAttributeValue.class.php     |  2 +-
 .../class/ProductCombination.class.php        |  8 ++--
 htdocs/websites/class/websitepage.class.php   |  2 +-
 237 files changed, 456 insertions(+), 454 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c76617b2f8a..a0470fee04a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ English Dolibarr ChangeLog
 
 For developers:
 NEW: Add a lot of API REST: dictionaryevents, memberstypes, ...
+NEW: getEntity function use true $shared value by default
 
 WARNING: 
 
@@ -21,6 +22,7 @@ Following changes may create regression for some external modules, but were nece
 * Removed Societe::set_commnucation_level (was deprecated in 4.0). Was not used.
 * Removed the trigger file of PAYPAL module that stored data that was not used by Dolibarr. The trigger event still
   exists, but if an external module need action on it, it must provides itself its trigger file.
+* Use getEntity('xxx') instead getEntity('xxx', 1) and use getEntity('xxx', false) instead getEntity('xxx') or getEntity('xxx', 0)
 
 ***** ChangeLog for 5.0.2 compared to 5.0.1 *****
 FIX: #6468 + Fix missing translation
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index fcb44c6f858..504d91a8f91 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -218,7 +218,7 @@ else
 {
     $sql.=" p.accountancy_code_sell = aa.account_number AND aa.fk_pcg_version = '" . $pcgvercode . "'";
 }
-$sql.= ' WHERE p.entity IN ('.getEntity('product', 1).')';
+$sql.= ' WHERE p.entity IN ('.getEntity('product').')';
 if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
     if (strlen(trim($search_current_account))) {
         $sql .= natural_search("p.accountancy_code_buy",$search_current_account);
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 5d9e7a9910a..8ba8d185ede 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -189,7 +189,7 @@ class BookKeeping extends CommonObject
 		$sql .= " AND fk_doc = " . $this->fk_doc;
 		$sql .= " AND fk_docdet = " . $this->fk_docdet;                   // This field can be 0 is record is for several lines 
 		$sql .= " AND numero_compte = '" . $this->db->escape($this->numero_compte) . "'";
-		$sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
+		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
 
 		$resql = $this->db->query($sql);
 
@@ -203,7 +203,7 @@ class BookKeeping extends CommonObject
 				$sqlnum .= " WHERE doc_type = '" . $this->db->escape($this->doc_type) . "'";		// For example doc_type = 'bank' 
 				$sqlnum .= " AND fk_docdet = " . $this->db->escape($this->fk_docdet);       		// fk_docdet is rowid into llx_bank or llx_facturedet or llx_facturefourndet, or ...
 				$sqlnum .= " AND doc_ref = '" . $this->db->escape($this->doc_ref) . "'";			// ref of source object
-				$sqlnum .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
+				$sqlnum .= " AND entity IN (" . getEntity('accountancy') . ")";
 
 				dol_syslog(get_class($this) . ":: create sqlnum=" . $sqlnum, LOG_DEBUG);
 				$resqlnum = $this->db->query($sqlnum);
@@ -215,7 +215,7 @@ class BookKeeping extends CommonObject
 				if (empty($this->piece_num)) {
 					$sqlnum = "SELECT MAX(piece_num)+1 as maxpiecenum";
 					$sqlnum .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
-					$sqlnum .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
+					$sqlnum .= " WHERE entity IN (" . getEntity('accountancy') . ")";
 
 					dol_syslog(get_class($this) . ":: create sqlnum=" . $sqlnum, LOG_DEBUG);
 					$resqlnum = $this->db->query($sqlnum);
@@ -500,7 +500,7 @@ class BookKeeping extends CommonObject
 		$sql .= " t.piece_num";
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
 		$sql .= ' WHERE 1 = 1';
-	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
+	    $sql .= " AND entity IN (" . getEntity('accountancy') . ")";
 		if (null !== $ref) {
 			$sql .= ' AND t.ref = ' . '\'' . $ref . '\'';
 		} else {
@@ -605,7 +605,7 @@ class BookKeeping extends CommonObject
 		}
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
 		$sql .= ' WHERE 1 = 1';
-	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
+	    $sql .= " AND entity IN (" . getEntity('accountancy') . ")";
 		if (count($sqlwhere) > 0) {
 			$sql .= ' AND ' . implode(' ' . $filtermode . ' ', $sqlwhere);
 		}
@@ -715,7 +715,7 @@ class BookKeeping extends CommonObject
 			}
 		}
 		$sql.= ' WHERE 1 = 1';
-	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
+	    $sql .= " AND entity IN (" . getEntity('accountancy') . ")";
 		if (count($sqlwhere) > 0) {
 			$sql .= ' AND ' . implode(' ' . $filtermode . ' ', $sqlwhere);
 		}
@@ -809,7 +809,7 @@ class BookKeeping extends CommonObject
 			}
 		}
 		$sql.= ' WHERE 1 = 1';
-	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
+	    $sql .= " AND entity IN (" . getEntity('accountancy') . ")";
 		if (count($sqlwhere) > 0) {
 			$sql .= ' AND ' . implode(' ' . $filtermode . ' ', $sqlwhere);
 		}
@@ -1062,7 +1062,7 @@ class BookKeeping extends CommonObject
 		$sql.= " WHERE 1 = 1";
 		if (! empty($delyear)) $sql.= " AND YEAR(doc_date) = " . $delyear;         // FIXME Must use between
 		if (! empty($journal)) $sql.= " AND code_journal = '".$journal."'";
-		$sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
+		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
 		$resql = $this->db->query($sql);
 
 		if (! $resql) {
@@ -1094,7 +1094,7 @@ class BookKeeping extends CommonObject
 		$sql = "DELETE";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql .= " WHERE piece_num = " . $piecenum;
-		$sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
+		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
 
 		$resql = $this->db->query($sql);
 
@@ -1200,7 +1200,7 @@ class BookKeeping extends CommonObject
 		$sql = "SELECT piece_num,doc_date,code_journal,doc_ref,doc_type";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql .= " WHERE piece_num = " . $piecenum;
-		$sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
+		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
 
 		dol_syslog(get_class($this) . "::" . __METHOD__, LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -1231,7 +1231,7 @@ class BookKeeping extends CommonObject
 		global $conf;
 
 		$sql = "SELECT MAX(piece_num)+1 as max FROM " . MAIN_DB_PREFIX . $this->table_element;
-	    $sql .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
+	    $sql .= " WHERE entity IN (" . getEntity('accountancy') . ")";
 
 		dol_syslog(get_class($this) . "getNextNumMvt sql=" . $sql, LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -1263,7 +1263,7 @@ class BookKeeping extends CommonObject
 		$sql .= " montant, sens, fk_user_author, import_key, code_journal, piece_num";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql .= " WHERE piece_num = " . $piecenum;
-		$sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
+		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
 
 		dol_syslog(get_class($this) . "::" . __METHOD__, LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -1315,7 +1315,7 @@ class BookKeeping extends CommonObject
 		$sql .= " numero_compte, label_compte, debit, credit,";
 		$sql .= " montant, sens, fk_user_author, import_key, code_journal, piece_num";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
-		$sql .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
+		$sql .= " WHERE entity IN (" . getEntity('accountancy') . ")";
 
 		dol_syslog(get_class($this) . "::export_bookkeping", LOG_DEBUG);
 
@@ -1384,7 +1384,7 @@ class BookKeeping extends CommonObject
         $sql .= " AND aa.active = 1";
         $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
         $sql .= " AND asy.rowid = " . $pcgver;
-	    $sql .= " AND ab.entity IN (" . getEntity("accountancy", 1) . ")";
+	    $sql .= " AND ab.entity IN (" . getEntity('accountancy') . ")";
         $sql .= " ORDER BY account_number ASC";
         
         dol_syslog(get_class($this) . "::select_account", LOG_DEBUG);
@@ -1449,7 +1449,7 @@ class BookKeeping extends CommonObject
         $sql .= " WHERE aa.account_number = '" . $account . "'";  
         $sql .= " AND parent.active = 1";
         $sql .= " AND root.active = 1";
-        $sql .= " AND aa.entity IN (" . getEntity("accountancy", 1) . ")";
+        $sql .= " AND aa.entity IN (" . getEntity('accountancy') . ")";
 
 		dol_syslog(get_class($this) . "::select_account sql=" . $sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -1488,7 +1488,7 @@ class BookKeeping extends CommonObject
 		$sql .= " AND asy.rowid = " . $pcgver;
 		$sql .= " AND aa.active = 1";
 		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_accounting_category as cat ON aa.fk_accounting_category = cat.rowid";
-	    $sql .= " WHERE aa.entity IN (" . getEntity("accountancy", 1) . ")";
+	    $sql .= " WHERE aa.entity IN (" . getEntity('accountancy') . ")";
 
 		dol_syslog(get_class($this) . "::select_account sql=" . $sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
diff --git a/htdocs/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php
index eca3be1d477..b32486038af 100644
--- a/htdocs/accountancy/customer/card.php
+++ b/htdocs/accountancy/customer/card.php
@@ -93,7 +93,7 @@ if (! empty($id)) {
 	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON l.fk_code_ventilation = aa.rowid";
 	$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = l.fk_facture";
 	$sql .= " WHERE f.fk_statut > 0 AND l.rowid = " . $id;
-	$sql .= " AND f.entity IN (" . getEntity("facture", 0) . ")"; // We don't share object for accountancy
+	$sql .= " AND f.entity IN (" . getEntity('facture', false) . ")"; // We don't share object for accountancy
 
 	dol_syslog("/accounting/customer/card.php sql=" . $sql, LOG_DEBUG);
 	$result = $db->query($sql);
diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index 82a406d4a0b..ab10efde376 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -141,7 +141,7 @@ if ($action == 'validatehistory') {
 	$sql1.= " WHERE fd.fk_facture IN ( SELECT f.rowid FROM " . MAIN_DB_PREFIX . "facture as f";
 	$sql1.= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($year_current, 1, false)) . "'";
 	$sql1.= " AND f.datef <= '" . $db->idate(dol_get_last_day($year_current, 12, false)) . "'";
-	$sql1.= " AND f.entity IN (" . getEntity("accountancy", 1) . ")";
+	$sql1.= " AND f.entity IN (" . getEntity('accountancy') . ")";
 	$sql1.=")";
 	
 	dol_syslog("htdocs/accountancy/customer/index.php fixaccountancycode", LOG_DEBUG);
@@ -187,7 +187,7 @@ if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 } else {
 	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
 }
-$sql .= " AND f.entity IN (" . getEntity("facture", 0) . ")";    // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity('facture', false) . ")";    // We don't share object for accountancy
 
 dol_syslog("htdocs/accountancy/customer/index.php sql=" . $sql, LOG_DEBUG);
 $result = $db->query($sql);
@@ -228,7 +228,7 @@ $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_factu
 $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
 $sql .= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
 $sql .= "  AND f.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
-$sql .= " AND f.entity IN (" . getEntity("facture", 0) . ")";   // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity('facture', false) . ")";   // We don't share object for accountancy
 $sql .= " AND aa.account_number IS NULL";
 if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
@@ -284,7 +284,7 @@ $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_factu
 $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
 $sql .= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
 $sql .= "  AND f.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
-$sql .= " AND f.entity IN (" . getEntity("facture", 0) . ")";   // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity('facture', false) . ")";   // We don't share object for accountancy
 if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
 } else {
@@ -341,7 +341,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
     $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_facture";
     $sql .= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
     $sql .= "  AND f.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
-    $sql .= " AND f.entity IN (" . getEntity("facture", 0) . ")"; // We don't share object for accountancy
+    $sql .= " AND f.entity IN (" . getEntity('facture', false) . ")"; // We don't share object for accountancy
     if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
         $sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
     } else {
@@ -387,7 +387,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
     	$sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_facture";
     	$sql .= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
     	$sql .= "  AND f.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
-    	$sql .= " AND f.entity IN (" . getEntity("facture", 0) . ")";   // We don't share object for accountancy
+    	$sql .= " AND f.entity IN (" . getEntity('facture', false) . ")";   // We don't share object for accountancy
     	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
     	    $sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
     	} else {
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index f3763dd9ca0..f5e8881e51b 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -164,7 +164,7 @@ $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_factu
 $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_country as co ON co.rowid = s.fk_pays ";
 $sql .= " WHERE fd.fk_code_ventilation > 0 ";
-$sql .= " AND f.entity IN (" . getEntity("facture", 0) . ")";   // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity('facture', false) . ")";   // We don't share object for accountancy
 $sql .= " AND f.fk_statut > 0";
 if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
@@ -201,7 +201,7 @@ if (strlen(trim($search_country))) {
 if (strlen(trim($search_tvaintra))) {
 	$sql .= natural_search("s.tva_intra", $search_tva_intra);
 }
-$sql .= " AND f.entity IN (" . getEntity("facture", 0) . ")";    // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity('facture', false) . ")";    // We don't share object for accountancy
 $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 8af289f2c99..cc2495a0f9e 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -220,7 +220,7 @@ if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 } else {
 	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_STANDARD . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
 }
-$sql .= " AND f.entity IN (" . getEntity("facture", 0) . ")";    // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity('facture', false) . ")";    // We don't share object for accountancy
 
 $sql .= $db->order($sortfield, $sortorder);
 
diff --git a/htdocs/accountancy/expensereport/card.php b/htdocs/accountancy/expensereport/card.php
index e37b35f1003..201e61e97ab 100644
--- a/htdocs/accountancy/expensereport/card.php
+++ b/htdocs/accountancy/expensereport/card.php
@@ -96,7 +96,7 @@ if (! empty($id)) {
 	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON erd.fk_code_ventilation = aa.rowid";
 	$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "expensereport as er ON er.rowid = erd.fk_expensereport";
 	$sql .= " WHERE er.fk_statut > 0 AND erd.rowid = " . $id;
-	$sql .= " AND er.entity IN (" . getEntity("expensereport", 0) . ")";     // We don't share object for accountancy
+	$sql .= " AND er.entity IN (" . getEntity('expensereport', false) . ")";     // We don't share object for accountancy
 
 	dol_syslog("/accounting/expensereport/card.php sql=" . $sql, LOG_DEBUG);
 	$result = $db->query($sql);
diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
index c062d4e09c2..933cd6c3303 100644
--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -134,7 +134,7 @@ if ($action == 'validatehistory') {
 	$sql1.= " WHERE erd.fk_expensereport IN ( SELECT er.rowid FROM " . MAIN_DB_PREFIX . "expensereport as er";
 	$sql1.= " WHERE er.date_debut >= '" . $db->idate(dol_get_first_day($year_current, 1, false)) . "'";
 	$sql1.= " AND er.date_debut <= '" . $db->idate(dol_get_last_day($year_current, 12, false)) . "'";
-	$sql1.= " AND er.entity IN (" . getEntity("accountancy", 1) . ")";
+	$sql1.= " AND er.entity IN (" . getEntity('accountancy') . ")";
 	$sql1.=")";
 	
 	dol_syslog("htdocs/accountancy/customer/index.php fixaccountancycode", LOG_DEBUG);
@@ -206,7 +206,7 @@ $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid =
 $sql .= " WHERE er.date_debut >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
 $sql .= " AND er.date_debut <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
 $sql .= " AND er.fk_statut > 0 ";
-$sql .= " AND er.entity IN (" . getEntity("expensereport", 0) . ")";     // We don't share object for accountancy
+$sql .= " AND er.entity IN (" . getEntity('expensereport', false) . ")";     // We don't share object for accountancy
 $sql .= " AND aa.account_number IS NULL";
 $sql .= " GROUP BY erd.fk_code_ventilation,aa.account_number,aa.label";
 
@@ -259,7 +259,7 @@ $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid =
 $sql .= " WHERE er.date_debut >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
 $sql .= " AND er.date_debut <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
 $sql .= " AND er.fk_statut > 0 ";
-$sql .= " AND er.entity IN (" . getEntity("expensereport", 0) . ")";     // We don't share object for accountancy
+$sql .= " AND er.entity IN (" . getEntity('expensereport', false) . ")";     // We don't share object for accountancy
 $sql .= " AND aa.account_number IS NOT NULL";
 $sql .= " GROUP BY erd.fk_code_ventilation,aa.account_number,aa.label";
 
@@ -313,7 +313,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
     $sql .= " WHERE er.date_debut >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
     $sql .= " AND er.date_debut <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
     $sql .= " AND er.fk_statut > 0 ";
-    $sql .= " AND er.entity IN (" . getEntity("expensereport", 0) . ")";     // We don't share object for accountancy
+    $sql .= " AND er.entity IN (" . getEntity('expensereport', false) . ")";     // We don't share object for accountancy
     
     dol_syslog('/accountancy/expensereport/index.php:: sql=' . $sql);
     $resql = $db->query($sql);
diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
index b3936bbf1a6..c678795bf2d 100644
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -173,7 +173,7 @@ if (strlen(trim($search_account))) {
 if (strlen(trim($search_vat))) {
 	$sql .= " AND (erd.tva_tx like '" . $search_vat . "%')";
 }
-$sql .= " AND er.entity IN (" . getEntity("expensereport", 0) . ")";  // We don't share object for accountancy
+$sql .= " AND er.entity IN (" . getEntity('expensereport', false) . ")";  // We don't share object for accountancy
 
 $sql .= $db->order($sortfield, $sortorder);
 
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index b1a86c96838..4b0a379faf3 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -203,7 +203,7 @@ if (strlen(trim($search_account))) {
 if (strlen(trim($search_vat))) {
     $sql .= natural_search("erd.tva_tx",$search_vat,1);
 }
-$sql .= " AND er.entity IN (" . getEntity("expensereport", 0) . ")";  // We don't share object for accountancy
+$sql .= " AND er.entity IN (" . getEntity('expensereport', false) . ")";  // We don't share object for accountancy
 
 $sql .= $db->order($sortfield, $sortorder);
 
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index f67224e3996..f1f0ac4b0de 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -97,7 +97,7 @@ $sql .= " JOIN " . MAIN_DB_PREFIX . "expensereport as er ON er.rowid = erd.fk_ex
 $sql .= " JOIN " . MAIN_DB_PREFIX . "user as u ON u.rowid = er.fk_user_author";
 $sql .= " WHERE er.fk_statut > 0 ";
 $sql .= " AND erd.fk_code_ventilation > 0 ";
-$sql .= " AND er.entity IN (" . getEntity("expensereport", 0) . ")";  // We don't share object for accountancy
+$sql .= " AND er.entity IN (" . getEntity('expensereport', false) . ")";  // We don't share object for accountancy
 if ($date_start && $date_end)
 	$sql .= " AND er.date_debut >= '" . $db->idate($date_start) . "' AND er.date_debut <= '" . $db->idate($date_end) . "'";
 $sql .= " ORDER BY er.date_debut";
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index f9cd162b6a0..e7f887547d3 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -96,7 +96,7 @@ $sql .= " JOIN " . MAIN_DB_PREFIX . "facture_fourn as f ON f.rowid = fd.fk_factu
 $sql .= " JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
 $sql .= " WHERE f.fk_statut > 0 ";
 $sql .= " AND fd.fk_code_ventilation > 0 ";
-$sql .= " AND f.entity IN (" . getEntity("facture_fourn", 0) . ")";  // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity('facture_fourn', false) . ")";  // We don't share object for accountancy
 if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
 	$sql .= " AND f.type IN (0,1,2)";
 else
diff --git a/htdocs/accountancy/supplier/card.php b/htdocs/accountancy/supplier/card.php
index 47a99c88496..863c68c5746 100644
--- a/htdocs/accountancy/supplier/card.php
+++ b/htdocs/accountancy/supplier/card.php
@@ -96,7 +96,7 @@ if (! empty($id)) {
 	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON l.fk_code_ventilation = aa.rowid";
 	$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facture_fourn as f ON f.rowid = l.fk_facture_fourn ";
 	$sql .= " WHERE f.fk_statut > 0 AND l.rowid = " . $id;
-	$sql .= " AND f.entity IN (" . getEntity("facture_fourn", 0) . ")";     // We don't share object for accountancy
+	$sql .= " AND f.entity IN (" . getEntity('facture_fourn', false) . ")";     // We don't share object for accountancy
 	
 	dol_syslog("/accounting/supplier/card.php sql=" . $sql, LOG_DEBUG);
 	$result = $db->query($sql);
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index 2d36399c9b5..fdaa70e22ca 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -134,7 +134,7 @@ if ($action == 'validatehistory') {
 	$sql1.= " WHERE fd.fk_facture_fourn IN ( SELECT f.rowid FROM " . MAIN_DB_PREFIX . "facture_fourn as f";
 	$sql1.= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($year_current, 1, false)) . "'";
 	$sql1.= " AND f.datef <= '" . $db->idate(dol_get_last_day($year_current, 12, false)) . "'";
-	$sql1.= " AND f.entity IN (" . getEntity("accountancy", 1) . ")";
+	$sql1.= " AND f.entity IN (" . getEntity('accountancy') . ")";
 	$sql1.= ")";
 	
 	dol_syslog("htdocs/accountancy/customer/index.php fixaccountancycode", LOG_DEBUG);
@@ -204,7 +204,7 @@ $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid
 $sql .= " WHERE ff.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
 $sql .= "  AND ff.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
 $sql .= "  AND ff.fk_statut > 0 ";
-$sql .= " AND ff.entity IN (" . getEntity("facture_fourn", 0) . ")";     // We don't share object for accountancy
+$sql .= " AND ff.entity IN (" . getEntity('facture_fourn', false) . ")";     // We don't share object for accountancy
 $sql .= " AND aa.account_number IS NULL";
 $sql .= " GROUP BY ffd.fk_code_ventilation,aa.account_number,aa.label";
 
@@ -258,7 +258,7 @@ $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid
 $sql .= " WHERE ff.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
 $sql .= "  AND ff.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
 $sql .= "  AND ff.fk_statut > 0 ";
-$sql .= " AND ff.entity IN (" . getEntity("facture_fourn", 0) . ")";     // We don't share object for accountancy
+$sql .= " AND ff.entity IN (" . getEntity('facture_fourn', false) . ")";     // We don't share object for accountancy
 $sql .= " AND aa.account_number IS NOT NULL";
 $sql .= " GROUP BY ffd.fk_code_ventilation,aa.account_number,aa.label";
 
@@ -312,7 +312,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
     $sql .= " WHERE ff.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
     $sql .= "  AND ff.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
     $sql .= "  AND ff.fk_statut > 0 ";
-    $sql .= " AND ff.entity IN (" . getEntity("facture_fourn", 0) . ")";     // We don't share object for accountancy
+    $sql .= " AND ff.entity IN (" . getEntity('facture_fourn', false) . ")";     // We don't share object for accountancy
     
     dol_syslog('/accountancy/supplier/index.php:: sql=' . $sql);
     $resql = $db->query($sql);
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 2757b6d8aec..22982a6f087 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -182,7 +182,7 @@ if (strlen(trim($search_account))) {
 if (strlen(trim($search_vat))) {
 	$sql .= natural_search("l.tva_tx", $search_vat, 1);
 }
-$sql .= " AND f.entity IN (" . getEntity("facture_fourn", 0) . ")";  // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity('facture_fourn', false) . ")";  // We don't share object for accountancy
 
 $sql .= $db->order($sortfield, $sortorder);
 
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 9c822425a1c..30a42410d8b 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -217,7 +217,7 @@ if (strlen(trim($search_account))) {
 if (strlen(trim($search_vat))) {
     $sql .= natural_search("l.tva_tx",$search_vat,1);
 }
-$sql .= " AND f.entity IN (" . getEntity("facture_fourn", 0) . ")";  // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity('facture_fourn', false) . ")";  // We don't share object for accountancy
 
 $sql .= $db->order($sortfield, $sortorder);
 
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 92449005d1f..20f5fa671c9 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1780,7 +1780,7 @@ class Adherent extends CommonObject
         $sql = "SELECT count(a.rowid) as nb";
         $sql.= " FROM ".MAIN_DB_PREFIX."adherent as a";
         $sql.= " WHERE a.statut > 0";
-        $sql.= " AND a.entity IN (".getEntity('adherent', 1).")";
+        $sql.= " AND a.entity IN (".getEntity('adherent').")";
 
         $resql=$this->db->query($sql);
         if ($resql)
@@ -1818,7 +1818,7 @@ class Adherent extends CommonObject
         $sql = "SELECT a.rowid, a.datefin, a.statut";
         $sql.= " FROM ".MAIN_DB_PREFIX."adherent as a";
         $sql.= " WHERE a.statut = 1";
-        $sql.= " AND a.entity IN (".getEntity('adherent', 1).")";
+        $sql.= " AND a.entity IN (".getEntity('adherent').")";
         $sql.= " AND (a.datefin IS NULL or a.datefin < '".$this->db->idate($now)."')";
 
         $resql=$this->db->query($sql);
diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php
index 97a4c8201a7..7fabd2c0ddf 100644
--- a/htdocs/adherents/class/adherentstats.class.php
+++ b/htdocs/adherents/class/adherentstats.class.php
@@ -65,7 +65,7 @@ class AdherentStats extends Stats
 		$this->field='subscription';
 
 		$this->where.= " m.statut != 0";
-		$this->where.= " AND p.fk_adherent = m.rowid AND m.entity IN (".getEntity('adherent', 1).")";
+		$this->where.= " AND p.fk_adherent = m.rowid AND m.entity IN (".getEntity('adherent').")";
 		//if (!$user->rights->societe->client->voir && !$user->societe_id) $this->where .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if($this->memberid)
 		{
diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php
index 3b1bda41250..3defcabd059 100644
--- a/htdocs/adherents/class/api_members.class.php
+++ b/htdocs/adherents/class/api_members.class.php
@@ -100,7 +100,7 @@ class Members extends DolibarrApi
 
         $sql = "SELECT t.rowid";
         $sql.= " FROM ".MAIN_DB_PREFIX."adherent as t";
-        $sql.= ' WHERE t.entity IN ('.getEntity('adherent', 1).')';
+        $sql.= ' WHERE t.entity IN ('.getEntity('adherent').')';
         if (!empty($typeid))
         {
             $sql.= ' AND t.fk_adherent_type='.$typeid;
diff --git a/htdocs/adherents/class/api_memberstypes.class.php b/htdocs/adherents/class/api_memberstypes.class.php
index 18c828eb9e5..9457b910c5d 100644
--- a/htdocs/adherents/class/api_memberstypes.class.php
+++ b/htdocs/adherents/class/api_memberstypes.class.php
@@ -97,7 +97,7 @@ class MembersTypes extends DolibarrApi
 
         $sql = "SELECT t.rowid";
         $sql.= " FROM ".MAIN_DB_PREFIX."adherent_type as t";
-        $sql.= ' WHERE t.entity IN ('.getEntity('adherent', 1).')';
+        $sql.= ' WHERE t.entity IN ('.getEntity('adherent').')';
 
         // Add sql filters
         if ($sqlfilters)
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 1b059d8616d..0f2cd40d076 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -210,7 +210,7 @@ if ($catid > 0)    $sql.= " AND cm.fk_categorie = ".$db->escape($catid);
 if ($catid == -2)  $sql.= " AND cm.fk_categorie IS NULL";
 if ($search_categ > 0)   $sql.= " AND cm.fk_categorie = ".$db->escape($search_categ);
 if ($search_categ == -2) $sql.= " AND cm.fk_categorie IS NULL";
-$sql.= " AND d.entity IN (".getEntity('adherent', 1).")";
+$sql.= " AND d.entity IN (".getEntity('adherent').")";
 if ($sall) $sql.=natural_search(array_keys($fieldstosearchall), $sall);
 if ($type > 0) $sql.=" AND t.rowid=".$db->escape($type);
 if ($statut != '') $sql.=" AND d.statut in (".$db->escape($statut).")";     // Peut valoir un nombre ou liste de nombre separes par virgules
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index 55b832e327c..633c872e607 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -123,7 +123,7 @@ $sql.= " b.fk_account";
 $sql.= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."subscription as c";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON c.fk_bank=b.rowid";
 $sql.= " WHERE d.rowid = c.fk_adherent";
-$sql.= " AND d.entity IN (".getEntity('adherent', 1).")";
+$sql.= " AND d.entity IN (".getEntity('adherent').")";
 if (isset($date_select) && $date_select != '')
 {
     $sql.= " AND c.dateadh LIKE '".$date_select."%'";
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 913fcf75de6..85694a5c88b 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -189,7 +189,7 @@ $tabsql[21]= "SELECT c.rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX
 $tabsql[22]= "SELECT rowid   as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_input_reason";
 $tabsql[23]= "SELECT t.rowid as rowid, t.taux, c.label as country, c.code as country_code, t.fk_pays as country_id, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_revenuestamp as t, ".MAIN_DB_PREFIX."c_country as c WHERE t.fk_pays=c.rowid";
 $tabsql[24]= "SELECT rowid   as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_type_resource";
-//$tabsql[25]= "SELECT rowid   as rowid, label, type_template, private, position, topic, content_lines, content, active FROM ".MAIN_DB_PREFIX."c_email_templates WHERE entity IN (".getEntity('email_template',1).")";
+//$tabsql[25]= "SELECT rowid   as rowid, label, type_template, private, position, topic, content_lines, content, active FROM ".MAIN_DB_PREFIX."c_email_templates WHERE entity IN (".getEntity('email_template').")";
 $tabsql[26]= "SELECT rowid   as rowid, code, label, short_label, active FROM ".MAIN_DB_PREFIX."c_units";
 $tabsql[27]= "SELECT id      as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_stcomm";
 $tabsql[28]= "SELECT h.rowid as rowid, h.code, h.label, h.affect, h.delay, h.newbymonth, h.fk_country as country_id, c.code as country_code, c.label as country, h.active FROM ".MAIN_DB_PREFIX."c_holiday_types as h LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON h.fk_country=c.rowid";
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 77230dc3f68..8a57a62b144 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -639,7 +639,7 @@ if (! empty($conf->banque->enabled))
     $sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
     $sql.= " WHERE clos = 0";
     $sql.= " AND courant = 1";
-    $sql.= " AND entity IN (".getEntity('bank_account', 1).")";
+    $sql.= " AND entity IN (".getEntity('bank_account').")";
     $resql=$db->query($sql);
     if ($resql)
     {
@@ -684,7 +684,7 @@ $sql = "SELECT rowid, label";
 $sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
 $sql.= " WHERE clos = 0";
 $sql.= " AND courant = 1";
-$sql.= " AND entity IN (".getEntity('bank_account', 1).")";
+$sql.= " AND entity IN (".getEntity('bank_account').")";
 $var=True;
 $resql=$db->query($sql);
 if ($resql)
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index caea3bef9f7..6f060ca136f 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -80,7 +80,7 @@ $tabname[25]= MAIN_DB_PREFIX."c_email_templates";
 
 // Requests to extract data
 $tabsql=array();
-$tabsql[25]= "SELECT rowid   as rowid, label, type_template, private, position, topic, content_lines, content, active FROM ".MAIN_DB_PREFIX."c_email_templates WHERE entity IN (".getEntity('email_template',1).")";
+$tabsql[25]= "SELECT rowid   as rowid, label, type_template, private, position, topic, content_lines, content, active FROM ".MAIN_DB_PREFIX."c_email_templates WHERE entity IN (".getEntity('email_template').")";
 
 // Criteria to sort dictionaries
 $tabsqlsort=array();
diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index 47f4af17dcf..40ebcd69dc6 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -165,7 +165,7 @@ $sql.= " e.fk_user, e.description,";
 $sql.= " u.login";
 $sql.= " FROM ".MAIN_DB_PREFIX."events as e";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = e.fk_user";
-$sql.= " WHERE e.entity IN (".getEntity('event', 1).")";
+$sql.= " WHERE e.entity IN (".getEntity('event').")";
 if ($date_start > 0) $sql.= " AND e.dateevent >= '".$db->idate($date_start)."'";
 if ($date_end > 0)   $sql.= " AND e.dateevent <= '".$db->idate($date_end)."'";
 if ($search_code) { $usefilter++; $sql.=natural_search("e.type", $search_code, 0); }
diff --git a/htdocs/asterisk/cidlookup.php b/htdocs/asterisk/cidlookup.php
index e50a1a74a1b..e6b4985f6b8 100644
--- a/htdocs/asterisk/cidlookup.php
+++ b/htdocs/asterisk/cidlookup.php
@@ -48,7 +48,7 @@ if (empty($phone))
 
 $sql = "SELECT s.nom as name FROM ".MAIN_DB_PREFIX."societe as s";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON sp.fk_soc = s.rowid";
-$sql.= " WHERE s.entity IN (".getEntity('societe', 1).")";
+$sql.= " WHERE s.entity IN (".getEntity('societe').")";
 $sql.= " AND (s.phone='".$db->escape($phone)."'";
 $sql.= " OR sp.phone='".$db->escape($phone)."'";
 $sql.= " OR sp.phone_perso='".$db->escape($phone)."'";
diff --git a/htdocs/asterisk/wrapper.php b/htdocs/asterisk/wrapper.php
index 381750546ce..69a9a96f032 100644
--- a/htdocs/asterisk/wrapper.php
+++ b/htdocs/asterisk/wrapper.php
@@ -117,7 +117,7 @@ llxHeader();
 
 $sql = "SELECT s.nom as name FROM ".MAIN_DB_PREFIX."societe as s";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON sp.fk_soc = s.rowid";
-$sql.= " WHERE s.entity IN (".getEntity('societe', 1).")";
+$sql.= " WHERE s.entity IN (".getEntity('societe').")";
 $sql.= " AND (s.phone='".$db->escape($called)."'";
 $sql.= " OR sp.phone='".$db->escape($called)."'";
 $sql.= " OR sp.phone_perso='".$db->escape($called)."'";
diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index 4df9b56979d..05bd454eeea 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -63,7 +63,7 @@ function printBookmarksList($aDb, $aLangs)
 	{
 		$sql = "SELECT rowid, title, url, target FROM ".MAIN_DB_PREFIX."bookmark";
 		$sql.= " WHERE (fk_user = ".$user->id." OR fk_user is NULL OR fk_user = 0)";
-        $sql.= " AND entity IN (".getEntity('bookmarks',1).")";
+        $sql.= " AND entity IN (".getEntity('bookmarks').")";
 		$sql.= " ORDER BY position";
 		if ($resql = $db->query($sql) )
 		{
diff --git a/htdocs/cashdesk/facturation.php b/htdocs/cashdesk/facturation.php
index dd722805eb6..5a7a56e333e 100644
--- a/htdocs/cashdesk/facturation.php
+++ b/htdocs/cashdesk/facturation.php
@@ -44,7 +44,7 @@ if ( GETPOST('filtre') ) {
 	if (! empty($conf->stock->enabled) && !empty($conf_fkentrepot)) $sql.= ", ps.reel";
 	$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
 	if (! empty($conf->stock->enabled) && !empty($conf_fkentrepot)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON p.rowid = ps.fk_product AND ps.fk_entrepot = '".$conf_fkentrepot."'";
-	$sql.= " WHERE p.entity IN (".getEntity('product', 1).")";
+	$sql.= " WHERE p.entity IN (".getEntity('product').")";
 	$sql.= " AND p.tosell = 1";
 	if(!$conf->global->CASHDESK_SERVICES) $sql.= " AND p.fk_product_type = 0";
 	$sql.= " AND (p.ref LIKE '%".$db->escape(GETPOST('filtre'))."%' OR p.label LIKE '%".$db->escape(GETPOST('filtre'))."%'";
@@ -96,7 +96,7 @@ if ( GETPOST('filtre') ) {
 	if (! empty($conf->stock->enabled) && !empty($conf_fkentrepot)) $sql.= ", ps.reel";
 	$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
 	if (! empty($conf->stock->enabled) && !empty($conf_fkentrepot)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON p.rowid = ps.fk_product AND ps.fk_entrepot = '".$conf_fkentrepot."'";
-	$sql.= " WHERE p.entity IN (".getEntity('product', 1).")";
+	$sql.= " WHERE p.entity IN (".getEntity('product').")";
 	$sql.= " AND p.tosell = 1";
 	if(!$conf->global->CASHDESK_SERVICES) $sql.= " AND p.fk_product_type = 0";
 	$sql.= " ORDER BY p.label";
diff --git a/htdocs/cashdesk/facturation_dhtml.php b/htdocs/cashdesk/facturation_dhtml.php
index 3046644c35e..72fbd509535 100644
--- a/htdocs/cashdesk/facturation_dhtml.php
+++ b/htdocs/cashdesk/facturation_dhtml.php
@@ -50,7 +50,7 @@ if (dol_strlen($search) >= 0)	// If search criteria is on char length at least
 	if (! empty($conf->stock->enabled) && !empty($conf_fkentrepot)) $sql.= ", ps.reel";
 	$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
 	if (! empty($conf->stock->enabled) && !empty($conf_fkentrepot)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON p.rowid = ps.fk_product AND ps.fk_entrepot = '".$conf_fkentrepot."'";
-	$sql.= " WHERE p.entity IN (".getEntity('product', 1).")";
+	$sql.= " WHERE p.entity IN (".getEntity('product').")";
 	$sql.= " AND p.tosell = 1";
 	$sql.= " AND p.fk_product_type = 0";
 	// Add criteria on ref/label
diff --git a/htdocs/cashdesk/facturation_verif.php b/htdocs/cashdesk/facturation_verif.php
index d4bf53e01c5..96742ddfebf 100644
--- a/htdocs/cashdesk/facturation_verif.php
+++ b/htdocs/cashdesk/facturation_verif.php
@@ -43,7 +43,7 @@ switch($action)
 			if (! empty($conf->stock->enabled) && !empty($conf_fkentrepot)) $sql.= ", ps.reel";
 			$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
 			if (! empty($conf->stock->enabled) && !empty($conf_fkentrepot)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON p.rowid = ps.fk_product AND ps.fk_entrepot = ".$conf_fkentrepot;
-			$sql.= " WHERE p.entity IN (".getEntity('product', 1).")";
+			$sql.= " WHERE p.entity IN (".getEntity('product').")";
 
 			// Recuperation des donnees en fonction de la source (liste deroulante ou champ texte) ...
 			if ( $_POST['hdnSource'] == 'LISTE' )
diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index fc7aca368f4..ed10e337f7b 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -114,7 +114,7 @@ class Categories extends DolibarrApi
         
         $sql = "SELECT t.rowid";
         $sql.= " FROM ".MAIN_DB_PREFIX."categorie as t";
-        $sql.= ' WHERE t.entity IN ('.getEntity('category', 1).')';
+        $sql.= ' WHERE t.entity IN ('.getEntity('category').')';
         if (!empty($type))
         {
             $sql.= ' AND t.type='.array_search($type,Categories::$TYPES);
@@ -205,7 +205,7 @@ class Categories extends DolibarrApi
         $sql = "SELECT s.rowid";
         $sql.= " FROM ".MAIN_DB_PREFIX."categorie as s";
         $sql.= " , ".MAIN_DB_PREFIX."categorie_".$sub_type." as sub ";
-        $sql.= ' WHERE s.entity IN ('.getEntity('category', 1).')';
+        $sql.= ' WHERE s.entity IN ('.getEntity('category').')';
         $sql.= ' AND s.type='.array_search($type,Categories::$TYPES);
         $sql.= ' AND s.rowid = sub.fk_categorie';
         $sql.= ' AND sub.'.$subcol_name.' = '.$item;
diff --git a/htdocs/categories/class/api_deprecated_category.class.php b/htdocs/categories/class/api_deprecated_category.class.php
index efbcac82124..392005b71fe 100644
--- a/htdocs/categories/class/api_deprecated_category.class.php
+++ b/htdocs/categories/class/api_deprecated_category.class.php
@@ -121,7 +121,7 @@ class CategoryApi extends DolibarrApi
         
         $sql = "SELECT s.rowid";
         $sql.= " FROM ".MAIN_DB_PREFIX."categorie as s";
-        $sql.= ' WHERE s.entity IN ('.getEntity('category', 1).')';
+        $sql.= ' WHERE s.entity IN ('.getEntity('category').')';
         $sql.= ' AND s.type='.array_search($type,CategoryApi::$TYPES);
 
         $nbtotalofrecords = '';
@@ -201,7 +201,7 @@ class CategoryApi extends DolibarrApi
         $sql = "SELECT s.rowid";
         $sql.= " FROM ".MAIN_DB_PREFIX."categorie as s";
         $sql.= " , ".MAIN_DB_PREFIX."categorie_".$sub_type." as sub ";
-        $sql.= ' WHERE s.entity IN ('.getEntity('category', 1).')';
+        $sql.= ' WHERE s.entity IN ('.getEntity('category').')';
         $sql.= ' AND s.type='.array_search($type,CategoryApi::$TYPES);
         $sql.= ' AND s.rowid = sub.fk_categorie';
         $sql.= ' AND sub.'.$subcol_name.' = '.$item;
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 142cc22fe75..cfe4f3ad169 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -195,7 +195,7 @@ class Categorie extends CommonObject
 		}
 		else
 		{
-			$sql.= " WHERE label = '".$this->db->escape($label)."' AND entity IN (".getEntity('category',1).")";
+			$sql.= " WHERE label = '".$this->db->escape($label)."' AND entity IN (".getEntity('category').")";
 			if ($type) $sql.= " AND type = '".$this->db->escape($type)."'";
 		}
 
@@ -903,7 +903,7 @@ class Categorie extends CommonObject
 		$sql = "SELECT fk_parent as id_parent, rowid as id_son";
 		$sql.= " FROM ".MAIN_DB_PREFIX."categorie";
 		$sql.= " WHERE fk_parent != 0";
-		$sql.= " AND entity IN (".getEntity('category',1).")";
+		$sql.= " AND entity IN (".getEntity('category').")";
 
 		dol_syslog(get_class($this)."::load_motherof", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -1094,7 +1094,7 @@ class Categorie extends CommonObject
 	function get_all_categories($type=null, $parent=false)
 	{
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."categorie";
-		$sql.= " WHERE entity IN (".getEntity('category',1).")";
+		$sql.= " WHERE entity IN (".getEntity('category').")";
 		if (! is_null($type))
 			$sql.= " AND type = ".$type;
 		if ($parent)
@@ -1129,7 +1129,7 @@ class Categorie extends CommonObject
 	{
 		$sql = "SELECT count(rowid)";
 		$sql.= " FROM ".MAIN_DB_PREFIX."categorie";
-		$sql.= " WHERE entity IN (".getEntity('category',1).")";
+		$sql.= " WHERE entity IN (".getEntity('category').")";
 		$res = $this->db->query($sql);
 		if ($res)
 		{
@@ -1155,7 +1155,7 @@ class Categorie extends CommonObject
 		 */
 		$sql = "SELECT c.rowid";
 		$sql.= " FROM ".MAIN_DB_PREFIX."categorie as c ";
-		$sql.= " WHERE c.entity IN (".getEntity('category',1).")";
+		$sql.= " WHERE c.entity IN (".getEntity('category').")";
 		$sql.= " AND c.type = ".$this->type;
 		$sql.= " AND c.fk_parent = ".$this->fk_parent;
 		$sql.= " AND c.label = '".$this->db->escape($this->label)."'";
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index a9695abcb35..8243268574c 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -870,7 +870,7 @@ class ActionComm extends CommonObject
 
         $sql = "SELECT a.id";
         $sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
-        $sql.= " WHERE a.entity IN (".getEntity('agenda', 1).")";
+        $sql.= " WHERE a.entity IN (".getEntity('agenda').")";
         if (! empty($socid)) $sql.= " AND a.fk_soc = ".$socid;
         if (! empty($elementtype))
         {
@@ -921,7 +921,7 @@ class ActionComm extends CommonObject
         if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
         $sql.= " WHERE a.percent >= 0 AND a.percent < 100";
-        $sql.= " AND a.entity IN (".getEntity('agenda', 1).")";
+        $sql.= " AND a.entity IN (".getEntity('agenda').")";
         if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " AND (a.fk_soc IS NULL OR sc.fk_user = " .$user->id . ")";
         if ($user->societe_id) $sql.=" AND a.fk_soc = ".$user->societe_id;
         if (! $user->rights->agenda->allactions->read) $sql.= " AND (a.fk_user_author = ".$user->id . " OR a.fk_user_action = ".$user->id . " OR a.fk_user_done = ".$user->id . ")";
@@ -1281,7 +1281,7 @@ class ActionComm extends CommonObject
 			// We must filter on assignement table
 			if ($filters['logint'] || $filters['login']) $sql.=", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
 			$sql.= " WHERE a.fk_action=c.id";
-            $sql.= " AND a.entity IN (".getEntity('agenda', 1).")";
+            $sql.= " AND a.entity IN (".getEntity('agenda').")";
             foreach ($filters as $key => $value)
             {
                 if ($key == 'notolderthan' && $value != '') $sql.=" AND a.datep >= '".$this->db->idate($now-($value*24*60*60))."'";
diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index dccd98ebe96..f32c721a826 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -112,7 +112,7 @@ class AgendaEvents extends DolibarrApi
 
         $sql = "SELECT t.id as rowid";
         $sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as t";
-        $sql.= ' WHERE t.entity IN ('.getEntity('agenda', 1).')';
+        $sql.= ' WHERE t.entity IN ('.getEntity('agenda').')';
         if ($user_ids) $sql.=" AND t.fk_user_action IN (".$user_ids.")";
         if ($socid > 0) $sql.= " AND t.fk_soc = ".$socid;
         // Insert sale filter
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 307d6417285..7c256e95837 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -456,7 +456,7 @@ if ($resourceid > 0) $sql.=", ".MAIN_DB_PREFIX."element_resources as r";
 if ($filtert > 0 || $usergroup > 0) $sql.=", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
 if ($usergroup > 0) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_user = ar.fk_element";
 $sql.= ' WHERE a.fk_action = ca.id';
-$sql.= ' AND a.entity IN ('.getEntity('agenda', 1).')';
+$sql.= ' AND a.entity IN ('.getEntity('agenda').')';
 // Condition on actioncode
 if (! empty($actioncode))
 {
@@ -648,7 +648,7 @@ if ($showbirthday)
     $sql = 'SELECT sp.rowid, sp.lastname, sp.firstname, sp.birthday';
     $sql.= ' FROM '.MAIN_DB_PREFIX.'socpeople as sp';
     $sql.= ' WHERE (priv=0 OR (priv=1 AND fk_user_creat='.$user->id.'))';
-    $sql.= " AND sp.entity IN (".getEntity('societe', 1).")";
+    $sql.= " AND sp.entity IN (".getEntity('societe').")";
     if ($action == 'show_day')
     {
         $sql.= ' AND MONTH(birthday) = '.$month;
diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index 6ed846c0ebe..400b882d143 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -197,7 +197,7 @@ if ($resourceid > 0) $sql.=", ".MAIN_DB_PREFIX."element_resources as r";
 if ($filtert > 0 || $usergroup > 0) $sql.=", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
 if ($usergroup > 0) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_user = ar.fk_element";
 $sql.= " WHERE c.id = a.fk_action";
-$sql.= ' AND a.entity IN ('.getEntity('agenda', 1).')';
+$sql.= ' AND a.entity IN ('.getEntity('agenda').')';
 // Condition on actioncode
 if (! empty($actioncode))
 {
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index 544da904cdc..01cc4db5303 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -364,7 +364,7 @@ if ($resourceid > 0) $sql.=", ".MAIN_DB_PREFIX."element_resources as r";
 if ($filtert > 0 || $usergroup > 0) $sql.=", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
 if ($usergroup > 0) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_user = ar.fk_element";
 $sql.= ' WHERE a.fk_action = ca.id';
-$sql.= ' AND a.entity IN ('.getEntity('agenda', 1).')';
+$sql.= ' AND a.entity IN ('.getEntity('agenda').')';
 // Condition on actioncode
 if (! empty($actioncode))
 {
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 2a707cd2d8f..e6444f26ad3 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -371,7 +371,7 @@ if ($resourceid > 0) $sql.=", ".MAIN_DB_PREFIX."element_resources as r";
 if ($filtert > 0 || $usergroup > 0) $sql.=", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
 if ($usergroup > 0) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_user = ar.fk_element";
 $sql.= ' WHERE a.fk_action = ca.id';
-$sql.= ' AND a.entity IN ('.getEntity('agenda', 1).')';
+$sql.= ' AND a.entity IN ('.getEntity('agenda').')';
 // Condition on actioncode
 if (! empty($actioncode))
 {
@@ -661,7 +661,7 @@ else
 	$sql = "SELECT u.rowid, u.lastname as lastname, u.firstname, u.statut, u.login, u.admin, u.entity";
 	$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
 	if ($usergroup > 0)	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug ON u.rowid = ug.fk_user";
-	$sql.= " WHERE u.statut = 1 AND u.entity IN (".getEntity('user',1).")";
+	$sql.= " WHERE u.statut = 1 AND u.entity IN (".getEntity('user').")";
 	if ($usergroup > 0)	$sql.= " AND ug.fk_usergroup = ".$usergroup;
 	//print $sql;
 	$resql=$db->query($sql);
diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index 125355a3386..f6d01b18ca1 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -80,7 +80,7 @@ $sql.= " date_format(a.datep, '%Y') as year";
 $sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a,";
 $sql.= " ".MAIN_DB_PREFIX."user as u";
 $sql.= " WHERE a.fk_user_author = u.rowid";
-$sql.= ' AND a.entity IN ('.getEntity('agenda', 1).')';
+$sql.= ' AND a.entity IN ('.getEntity('agenda').')';
 //$sql.= " AND percent = 100";
 $sql.= " GROUP BY year, month, df";
 $sql.= " ORDER BY year DESC, month DESC, df DESC";
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 7599cce4cfd..921b9eddb2f 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -762,7 +762,7 @@ if ($id > 0)
         $sql.= ', s.rowid as socid';
         $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."expedition as e";
         $sql.= " WHERE e.fk_soc = s.rowid AND s.rowid = ".$object->id;
-        $sql.= " AND e.entity IN (".getEntity('expedition', 1).")";
+        $sql.= " AND e.entity IN (".getEntity('expedition').")";
         $sql.= ' GROUP BY e.rowid';
         $sql.= ', e.ref';
         $sql.= ', e.date_creation';
diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php
index fe66e3ac243..a13ffe61c76 100644
--- a/htdocs/comm/contact.php
+++ b/htdocs/comm/contact.php
@@ -78,7 +78,7 @@ if (! $user->rights->societe->client->voir && ! $socid) $sql .= " ".MAIN_DB_PREF
 $sql.= " ".MAIN_DB_PREFIX."socpeople as p";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = p.fk_soc";
 $sql.= " WHERE s.fk_stcomm = st.id";
-$sql.= " AND p.entity IN (".getEntity('societe', 1).")";
+$sql.= " AND p.entity IN (".getEntity('societe').")";
 if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($type == "c") $sql.= " AND s.client IN (1, 3)";
 if ($type == "p") $sql.= " AND s.client IN (2, 3)";
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 24bccbf9c9c..885be0dd37c 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -146,7 +146,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
 	if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE p.fk_statut = 0";
 	$sql.= " AND p.fk_soc = s.rowid";
-	$sql.= " AND p.entity IN (".getEntity('propal', 1).")";
+	$sql.= " AND p.entity IN (".getEntity('propal').")";
 	if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 	if ($socid)	$sql.= " AND s.rowid = ".$socid;
 
@@ -227,7 +227,7 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos
     if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
     $sql.= " WHERE p.fk_statut = 0";
     $sql.= " AND p.fk_soc = s.rowid";
-    $sql.= " AND p.entity IN (".getEntity('propal', 1).")";
+    $sql.= " AND p.entity IN (".getEntity('propal').")";
     if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
     if ($socid)	$sql.= " AND s.rowid = ".$socid;
 
@@ -306,7 +306,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
 	if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE c.fk_soc = s.rowid";
 	$sql.= " AND c.fk_statut = 0";
-	$sql.= " AND c.entity IN (".getEntity('commande', 1).")";
+	$sql.= " AND c.entity IN (".getEntity('commande').")";
 	if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 	if ($socid)	$sql.= " AND c.fk_soc = ".$socid;
 
@@ -387,7 +387,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande
     if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
     $sql.= " WHERE cf.fk_soc = s.rowid";
     $sql.= " AND cf.fk_statut = 0";
-    $sql.= " AND cf.entity IN (".getEntity('supplier_order', 1).")";
+    $sql.= " AND cf.entity IN (".getEntity('supplier_order').")";
     if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
     if ($socid)	$sql.= " AND cf.fk_soc = ".$socid;
 
@@ -611,7 +611,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire && 0) // TO
 	$sql.= ", ".MAIN_DB_PREFIX."product as p";
 	if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE c.fk_soc = s.rowid";
-	$sql.= " AND c.entity IN (".getEntity('contract', 1).")";
+	$sql.= " AND c.entity IN (".getEntity('contract').")";
 	$sql.= " AND c.fk_product = p.rowid";
 	if (! $user->rights->societe->client->voir && ! $socid)	$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 	if ($socid) $sql.= " AND s.rowid = ".$socid;
@@ -669,7 +669,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
 	$sql.= ", ".MAIN_DB_PREFIX."propal as p";
 	if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE p.fk_soc = s.rowid";
-	$sql.= " AND p.entity IN (".getEntity('propal', 1).")";
+	$sql.= " AND p.entity IN (".getEntity('propal').")";
 	$sql.= " AND p.fk_statut = 1";
 	if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 	if ($socid) $sql.= " AND s.rowid = ".$socid;
@@ -766,7 +766,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
 	$sql.= ", ".MAIN_DB_PREFIX."commande as c";
 	if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE c.fk_soc = s.rowid";
-	$sql.= " AND c.entity IN (".getEntity('commande', 1).")";
+	$sql.= " AND c.entity IN (".getEntity('commande').")";
 	$sql.= " AND c.fk_statut = 1";
 	if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 	if ($socid) $sql.= " AND s.rowid = ".$socid;
diff --git a/htdocs/comm/mailing/class/advtargetemailing.class.php b/htdocs/comm/mailing/class/advtargetemailing.class.php
index 453d1f75319..a36077f94db 100644
--- a/htdocs/comm/mailing/class/advtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/advtargetemailing.class.php
@@ -466,7 +466,7 @@ class AdvanceTargetingMailing extends CommonObject
 
 		$sqlwhere=array();
 
-		$sqlwhere[]= 't.entity IN ('.getEntity('societe',1).')';
+		$sqlwhere[]= 't.entity IN ('.getEntity('societe').')';
 
 		if (count($arrayquery)>0) {
 
@@ -625,7 +625,7 @@ class AdvanceTargetingMailing extends CommonObject
 
 		$sqlwhere=array();
 
-		$sqlwhere[]= 't.entity IN ('.getEntity('socpeople',1).')';
+		$sqlwhere[]= 't.entity IN ('.getEntity('socpeople').')';
 
 		if (count($arrayquery)>0) {
 
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index df86464281a..61fa4ee5789 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1618,7 +1618,7 @@ if ($action == 'create')
 		$sql .= " FROM " . MAIN_DB_PREFIX . "propal p";
 		$sql .= ", " . MAIN_DB_PREFIX . "societe s";
 		$sql .= " WHERE s.rowid = p.fk_soc";
-		$sql .= " AND p.entity IN (".getEntity('propal', 1).")";
+		$sql .= " AND p.entity IN (".getEntity('propal').")";
 		$sql .= " AND p.fk_statut <> 0";
 		$sql .= " ORDER BY Id";
 
diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index 190f6cdca87..2f067f46b18 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -112,7 +112,7 @@ class Proposals extends DolibarrApi
         
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
 
-        $sql.= ' WHERE t.entity IN ('.getEntity('propal', 1).')';
+        $sql.= ' WHERE t.entity IN ('.getEntity('propal').')';
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
         if ($socids) $sql.= " AND t.fk_soc IN (".$socids.")";
         if ($search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 224cb77eee1..fb1ac46cd91 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1276,7 +1276,7 @@ class Propal extends CommonObject
         $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_input_reason as dr ON p.fk_input_reason = dr.rowid';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON p.fk_incoterms = i.rowid';
         $sql.= " WHERE p.fk_statut = c.id";
-        $sql.= " AND p.entity IN (".getEntity('propal', 1).")";
+        $sql.= " AND p.entity IN (".getEntity('propal').")";
         if ($ref) $sql.= " AND p.ref='".$ref."'";
         else $sql.= " AND p.rowid=".$rowid;
 
@@ -2499,7 +2499,7 @@ class Propal extends CommonObject
         if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user";
         $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."c_propalst as c";
 		if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql.= " WHERE p.entity IN (".getEntity('propal', 1).")";
+        $sql.= " WHERE p.entity IN (".getEntity('propal').")";
         $sql.= " AND p.fk_soc = s.rowid";
         $sql.= " AND p.fk_statut = c.id";
         if (! $user->rights->societe->client->voir && ! $socid) //restriction
@@ -3025,7 +3025,7 @@ class Propal extends CommonObject
             $sql.= " WHERE sc.fk_user = " .$user->id;
             $clause = " AND";
         }
-        $sql.= $clause." p.entity IN (".getEntity('propal', 1).")";
+        $sql.= $clause." p.entity IN (".getEntity('propal').")";
         if ($mode == 'opened') $sql.= " AND p.fk_statut = ".self::STATUS_VALIDATED;
         if ($mode == 'signed') $sql.= " AND p.fk_statut = ".self::STATUS_SIGNED;
         if ($user->societe_id) $sql.= " AND p.fk_soc = ".$user->societe_id;
@@ -3096,7 +3096,7 @@ class Propal extends CommonObject
         $prodids = array();
         $sql = "SELECT rowid";
         $sql.= " FROM ".MAIN_DB_PREFIX."product";
-        $sql.= " WHERE entity IN (".getEntity('product', 1).")";
+        $sql.= " WHERE entity IN (".getEntity('product').")";
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -3194,7 +3194,7 @@ class Propal extends CommonObject
             $sql.= " WHERE sc.fk_user = " .$user->id;
             $clause = "AND";
         }
-        $sql.= " ".$clause." p.entity IN (".getEntity('propal', 1).")";
+        $sql.= " ".$clause." p.entity IN (".getEntity('propal').")";
 
         $resql=$this->db->query($sql);
         if ($resql)
diff --git a/htdocs/comm/propal/class/propalestats.class.php b/htdocs/comm/propal/class/propalestats.class.php
index e38297a3377..39ef49991b6 100644
--- a/htdocs/comm/propal/class/propalestats.class.php
+++ b/htdocs/comm/propal/class/propalestats.class.php
@@ -86,7 +86,7 @@ class PropaleStats extends Stats
     		$this->where.= " p.fk_statut > 0";    // Validated, accepted, refused and closed
         }        
 		//$this->where.= " AND p.fk_soc = s.rowid AND p.entity = ".$conf->entity;
-		$this->where.= " AND p.entity IN (".getEntity('propal', 1).")";
+		$this->where.= " AND p.entity IN (".getEntity('propal').")";
 		if (!$user->rights->societe->client->voir && !$this->socid) $this->where .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if($this->socid)
 		{
diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index 145d1891be3..a54ceb32f0b 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -81,7 +81,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql.= ", ".MAIN_DB_PREFIX."propal as p";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE p.fk_soc = s.rowid";
-$sql.= " AND p.entity IN (".getEntity('propal', 1).")";
+$sql.= " AND p.entity IN (".getEntity('propal').")";
 if ($user->societe_id) $sql.=' AND p.fk_soc = '.$user->societe_id;
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 $sql.= " AND p.fk_statut IN (0,1,2,3,4)";
@@ -157,7 +157,7 @@ if (! empty($conf->propal->enabled))
 	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE c.fk_soc = s.rowid";
-	$sql.= " AND c.entity IN (".getEntity('propal', 1).")";
+	$sql.= " AND c.entity IN (".getEntity('propal').")";
 	$sql.= " AND c.fk_statut = 0";
 	if ($socid) $sql.= " AND c.fk_soc = ".$socid;
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
@@ -215,7 +215,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."propal as c";
 $sql.= ", ".MAIN_DB_PREFIX."societe as s";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE c.fk_soc = s.rowid";
-$sql.= " AND c.entity IN (".getEntity('propal', 1).")";
+$sql.= " AND c.entity IN (".getEntity('propal').")";
 //$sql.= " AND c.fk_statut > 2";
 if ($socid) $sql .= " AND c.fk_soc = ".$socid;
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
@@ -294,7 +294,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
 	$sql.= ", ".MAIN_DB_PREFIX."propal as p";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE p.fk_soc = s.rowid";
-	$sql.= " AND p.entity IN (".getEntity('propal', 1).")";
+	$sql.= " AND p.entity IN (".getEntity('propal').")";
 	$sql.= " AND p.fk_statut = 1";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 	if ($socid) $sql.= " AND s.rowid = ".$socid;
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index d2a6c6e926f..6f14d918f4f 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -269,7 +269,7 @@ if ($search_user > 0)
     $sql.=", ".MAIN_DB_PREFIX."c_type_contact as tc";
 }
 $sql.= ' WHERE p.fk_soc = s.rowid';
-$sql.= ' AND p.entity IN ('.getEntity('propal', 1).')';
+$sql.= ' AND p.entity IN ('.getEntity('propal').')';
 if (! $user->rights->societe->client->voir && ! $socid) //restriction
 {
 	$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php
index 2364672ccf9..0ec6f20ae46 100644
--- a/htdocs/comm/prospect/index.php
+++ b/htdocs/comm/prospect/index.php
@@ -120,7 +120,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
 	if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE p.fk_statut = 0";
 	$sql.= " AND p.fk_soc = s.rowid";
-	$sql.= " AND p.entity IN (".getEntity('propal', 1).")";
+	$sql.= " AND p.entity IN (".getEntity('propal').")";
 	if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 
 	$resql=$db->query($sql);
@@ -183,7 +183,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
 	$sql.= " WHERE p.fk_soc = s.rowid";
 	$sql.= " AND p.fk_statut = c.id";
 	$sql.= " AND p.fk_statut = 1";
-	$sql.= " AND p.entity IN (".getEntity('propal', 1).")";
+	$sql.= " AND p.entity IN (".getEntity('propal').")";
 	if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 	if ($socid) $sql.= " AND s.rowid = ".$socid;
 	$sql.= " ORDER BY p.rowid DESC";
diff --git a/htdocs/commande/class/api_deprecated_commande.class.php b/htdocs/commande/class/api_deprecated_commande.class.php
index c0b3a634825..11d3fe7260a 100644
--- a/htdocs/commande/class/api_deprecated_commande.class.php
+++ b/htdocs/commande/class/api_deprecated_commande.class.php
@@ -128,7 +128,7 @@ class CommandeApi extends DolibarrApi
         //if ($mode == 1) $sql.= " AND s.client IN (1, 3)";
         //if ($mode == 2) $sql.= " AND s.client IN (2, 3)";
 
-        $sql.= ' WHERE s.entity IN ('.getEntity('commande', 1).')';
+        $sql.= ' WHERE s.entity IN ('.getEntity('commande').')';
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND s.fk_soc = sc.fk_soc";
         if ($socid) $sql.= " AND s.fk_soc = ".$socid;
         if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index 1bd4e44a877..a1330a7be04 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -115,7 +115,7 @@ class Orders extends DolibarrApi
 
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
 
-        $sql.= ' WHERE t.entity IN ('.getEntity('commande', 1).')';
+        $sql.= ' WHERE t.entity IN ('.getEntity('commande').')';
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
         if ($socids) $sql.= " AND t.fk_soc IN (".$socids.")";
         if ($search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index fea30eda589..93df2f1aa0b 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1564,7 +1564,7 @@ class Commande extends CommonOrder
         $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_availability as ca ON (c.fk_availability = ca.rowid)';
         $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_input_reason as dr ON (c.fk_input_reason = ca.rowid)';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON c.fk_incoterms = i.rowid';
-        $sql.= " WHERE c.entity IN (".getEntity('commande', 1).")";
+        $sql.= " WHERE c.entity IN (".getEntity('commande').")";
         if ($id)   	  $sql.= " AND c.rowid=".$id;
         if ($ref)     $sql.= " AND c.ref='".$this->db->escape($ref)."'";
         if ($ref_ext) $sql.= " AND c.ref_ext='".$this->db->escape($ref_ext)."'";
@@ -2369,7 +2369,7 @@ class Commande extends CommonOrder
         if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user";
         $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c";
 		if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql.= " WHERE c.entity IN (".getEntity('commande', 1).")";
+        $sql.= " WHERE c.entity IN (".getEntity('commande').")";
         $sql.= " AND c.fk_soc = s.rowid";
         if (! $user->rights->societe->client->voir && ! $socid) //restriction
         {
@@ -3222,7 +3222,7 @@ class Commande extends CommonOrder
             $sql.= " WHERE sc.fk_user = " .$user->id;
             $clause = " AND";
         }
-        $sql.= $clause." c.entity IN (".getEntity('commande', 1).")";
+        $sql.= $clause." c.entity IN (".getEntity('commande').")";
         //$sql.= " AND c.fk_statut IN (1,2,3) AND c.facture = 0";
         $sql.= " AND ((c.fk_statut IN (".self::STATUS_VALIDATED.",".self::STATUS_ACCEPTED.")) OR (c.fk_statut = ".self::STATUS_CLOSED." AND c.facture = 0))";    // If status is 2 and facture=1, it must be selected
         if ($user->societe_id) $sql.=" AND c.fk_soc = ".$user->societe_id;
@@ -3506,7 +3506,7 @@ class Commande extends CommonOrder
         $prodids = array();
         $sql = "SELECT rowid";
         $sql.= " FROM ".MAIN_DB_PREFIX."product";
-        $sql.= " WHERE entity IN (".getEntity('product', 1).")";
+        $sql.= " WHERE entity IN (".getEntity('product').")";
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -3598,7 +3598,7 @@ class Commande extends CommonOrder
             $sql.= " WHERE sc.fk_user = " .$user->id;
             $clause = "AND";
         }
-        $sql.= " ".$clause." co.entity IN (".getEntity('commande', 1).")";
+        $sql.= " ".$clause." co.entity IN (".getEntity('commande').")";
 
         $resql=$this->db->query($sql);
         if ($resql)
diff --git a/htdocs/commande/class/commandestats.class.php b/htdocs/commande/class/commandestats.class.php
index 81488bdb1d6..b0c63625bb9 100644
--- a/htdocs/commande/class/commandestats.class.php
+++ b/htdocs/commande/class/commandestats.class.php
@@ -81,7 +81,7 @@ class CommandeStats extends Stats
 			$this->where.= " c.fk_statut > 2";    // Only approved & ordered
 		}
 		//$this->where.= " AND c.fk_soc = s.rowid AND c.entity = ".$conf->entity;
-		$this->where.= ' AND c.entity IN ('.getEntity('commande', 1).')';
+		$this->where.= ' AND c.entity IN ('.getEntity('commande').')';
 		
 		if (!$user->rights->societe->client->voir && !$this->socid) $this->where .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($this->socid)
diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php
index 431a54b9f76..65d92f2a12c 100644
--- a/htdocs/commande/customer.php
+++ b/htdocs/commande/customer.php
@@ -75,7 +75,7 @@ if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st, ".MAIN_DB_PREFIX."commande as c";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE s.fk_stcomm = st.id AND c.fk_soc = s.rowid";
-$sql.= " AND s.entity IN (".getEntity('societe', 1).")";
+$sql.= " AND s.entity IN (".getEntity('societe').")";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if (dol_strlen($stcomm))
 {
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index 9f7f36f78ca..fee8e5314d1 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -85,7 +85,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql.= ", ".MAIN_DB_PREFIX."commande as c";
 if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE c.fk_soc = s.rowid";
-$sql.= " AND c.entity IN (".getEntity('societe', 1).")";
+$sql.= " AND c.entity IN (".getEntity('societe').")";
 if ($user->societe_id) $sql.=' AND c.fk_soc = '.$user->societe_id;
 if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 $sql.= " GROUP BY c.fk_statut, c.facture";
@@ -177,7 +177,7 @@ if (! empty($conf->commande->enabled))
 	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE c.fk_soc = s.rowid";
-	$sql.= " AND c.entity IN (".getEntity('commande', 1).")";
+	$sql.= " AND c.entity IN (".getEntity('commande').")";
 	$sql.= " AND c.fk_statut = 0";
 	if ($socid) $sql.= " AND c.fk_soc = ".$socid;
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
@@ -247,7 +247,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."commande as c,";
 $sql.= " ".MAIN_DB_PREFIX."societe as s";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE c.fk_soc = s.rowid";
-$sql.= " AND c.entity IN (".getEntity('commande', 1).")";
+$sql.= " AND c.entity IN (".getEntity('commande').")";
 //$sql.= " AND c.fk_statut > 2";
 if ($socid) $sql .= " AND c.fk_soc = ".$socid;
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
@@ -328,7 +328,7 @@ if (! empty($conf->commande->enabled))
 	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE c.fk_soc = s.rowid";
-	$sql.= " AND c.entity IN (".getEntity('commande', 1).")";
+	$sql.= " AND c.entity IN (".getEntity('commande').")";
 	$sql.= " AND c.fk_statut = 1";
 	if ($socid) $sql.= " AND c.fk_soc = ".$socid;
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
@@ -410,7 +410,7 @@ if (! empty($conf->commande->enabled))
 	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE c.fk_soc = s.rowid";
-	$sql.= " AND c.entity IN (".getEntity('commande', 1).")";
+	$sql.= " AND c.entity IN (".getEntity('commande').")";
 	$sql.= " AND c.fk_statut = 2 ";
 	if ($socid) $sql.= " AND c.fk_soc = ".$socid;
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index b9102e78ddc..daabf6357af 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -468,7 +468,7 @@ if ($search_user > 0)
     $sql.=", ".MAIN_DB_PREFIX."c_type_contact as tc";
 }
 $sql.= ' WHERE c.fk_soc = s.rowid';
-$sql.= ' AND c.entity IN ('.getEntity('commande', 1).')';
+$sql.= ' AND c.entity IN ('.getEntity('commande').')';
 if ($search_product_category > 0) $sql.=" AND cp.fk_categorie = ".$search_product_category;
 if ($socid > 0) $sql.= ' AND s.rowid = '.$socid;
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php
index b05b6658ca7..9c79b030456 100644
--- a/htdocs/commande/orderstoinvoice.php
+++ b/htdocs/commande/orderstoinvoice.php
@@ -549,7 +549,7 @@ if (($action != 'create' && $action != 'add') || ($action == 'create' && $error)
 	$sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
 	$sql.= ', '.MAIN_DB_PREFIX.'commande as c';
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql.= ' WHERE c.entity IN ('.getEntity('commande', 1).')';
+	$sql.= ' WHERE c.entity IN ('.getEntity('commande').')';
 	$sql.= ' AND c.fk_soc = s.rowid';
 
 	// Show orders with status validated, shipping started and delivered (well any order we can bill)
diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php
index cb10fd8c3c7..eb14db2d3ac 100644
--- a/htdocs/compta/bank/annuel.php
+++ b/htdocs/compta/bank/annuel.php
@@ -90,7 +90,7 @@ $sql.= ", date_format(b.dateo,'%Y-%m') as dm";
 $sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
 $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
 $sql.= " WHERE b.fk_account = ba.rowid";
-$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 $sql.= " AND b.amount >= 0";
 if (! empty($id))
 	$sql .= " AND b.fk_account IN (".$db->escape($id).")";
@@ -118,7 +118,7 @@ $sql.= ", date_format(b.dateo,'%Y-%m') as dm";
 $sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
 $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
 $sql.= " WHERE b.fk_account = ba.rowid";
-$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 $sql.= " AND b.amount <= 0";
 if (! empty($id))
 	$sql .= " AND b.fk_account IN (".$db->escape($id).")";
@@ -250,7 +250,7 @@ $sql = "SELECT SUM(b.amount) as total";
 $sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
 $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
 $sql.= " WHERE b.fk_account = ba.rowid";
-$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 if (! empty($id))
 	$sql.= " AND b.fk_account IN (".$db->escape($id).")";
 
@@ -290,7 +290,7 @@ else
 	$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
 	$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
 	$sql.= " WHERE b.fk_account = ba.rowid";
-	$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+	$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 	if ($id && $_GET["option"]!='all') $sql.= " AND b.fk_account IN (".$id.")";
 
 	$resql = $db->query($sql);
@@ -321,7 +321,7 @@ else
 		$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
 		$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql.= " WHERE b.fk_account = ba.rowid";
-		$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+		$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 		$sql.= " AND b.datev >= '".($year-$annee)."-01-01 00:00:00'";
 		$sql.= " AND b.datev <= '".($year-$annee)."-12-31 23:59:59'";
 		$sql.= " AND b.amount > 0";
@@ -410,7 +410,7 @@ else
 		$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
 		$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql.= " WHERE b.fk_account = ba.rowid";
-		$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+		$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 		$sql.= " AND b.datev >= '".($year-$annee)."-01-01 00:00:00'";
 		$sql.= " AND b.datev <= '".($year-$annee)."-12-31 23:59:59'";
 		$sql.= " AND b.amount < 0";
diff --git a/htdocs/compta/bank/bankentries.php b/htdocs/compta/bank/bankentries.php
index f98c48b1aba..da89c662438 100644
--- a/htdocs/compta/bank/bankentries.php
+++ b/htdocs/compta/bank/bankentries.php
@@ -463,7 +463,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu ON bu.fk_bank = b.rowid AND type = 'company'";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON bu.url_id = s.rowid";
 $sql.= " WHERE b.fk_account = ba.rowid";
-$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 if ($account > 0) $sql.=" AND b.fk_account = ".$account;
 // Search period criteria
 if (dol_strlen($search_dt_start)>0) $sql .= " AND b.dateo >= '" . $db->idate($search_dt_start) . "'";
@@ -861,7 +861,7 @@ if ($resql)
             $sqlforbalance.= " ".MAIN_DB_PREFIX."bank_account as ba,";
             $sqlforbalance.= " ".MAIN_DB_PREFIX."bank as b";
             $sqlforbalance.= " WHERE b.fk_account = ba.rowid";
-            $sqlforbalance.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+            $sqlforbalance.= " AND ba.entity IN (".getEntity('bank_account').")";
             $sqlforbalance.= " AND b.fk_account = ".$account;
             $sqlforbalance.= " AND b.datev < '" . $db->idate($db->jdate($objp->dv)) . "'";
             $resqlforbalance = $db->query($sqlforbalance);
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index b77ed4db1a5..b544c99dd4c 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1167,7 +1167,7 @@ class Account extends CommonObject
         $sql.= " ".MAIN_DB_PREFIX."bank_account as ba";
         $sql.= " WHERE b.rappro=0";
         $sql.= " AND b.fk_account = ba.rowid";
-        $sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+        $sql.= " AND ba.entity IN (".getEntity('bank_account').")";
         $sql.= " AND (ba.rappro = 1 AND ba.courant != 2)";	// Compte rapprochable
         $sql.= " AND clos = 0";
         if ($filteraccountid) $sql.=" AND ba.rowid = ".$filteraccountid;
@@ -1224,7 +1224,7 @@ class Account extends CommonObject
         $sql = "SELECT COUNT(ba.rowid) as nb";
         $sql.= " FROM ".MAIN_DB_PREFIX."bank_account as ba";
         $sql.= " WHERE ba.rappro > 0 and ba.clos = 0";
-        $sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+        $sql.= " AND ba.entity IN (".getEntity('bank_account').")";
         if (empty($conf->global->BANK_CAN_RECONCILIATE_CASHACCOUNT)) $sql.= " AND ba.courant != 2";
         $resql=$db->query($sql);
         if ($resql)
@@ -1615,7 +1615,7 @@ class AccountLine extends CommonObject
         $sql.= " FROM ".MAIN_DB_PREFIX."bank as b,";
         $sql.= " ".MAIN_DB_PREFIX."bank_account as ba";
         $sql.= " WHERE b.fk_account = ba.rowid";
-        $sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+        $sql.= " AND ba.entity IN (".getEntity('bank_account').")";
         if ($num) $sql.= " AND b.num_chq='".$this->db->escape($num)."'";
         else if ($ref) $sql.= " AND b.rowid='".$this->db->escape($ref)."'";
         else $sql.= " AND b.rowid=".$rowid;
diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
index 98ee2672d3b..869b86238ff 100644
--- a/htdocs/compta/bank/class/api_bankaccounts.class.php
+++ b/htdocs/compta/bank/class/api_bankaccounts.class.php
@@ -70,7 +70,7 @@ class BankAccounts extends DolibarrApi
         }
 
         $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."bank_account as t";
-        $sql.= ' WHERE t.entity IN ('.getEntity('bank_account', 1).')';
+        $sql.= ' WHERE t.entity IN ('.getEntity('bank_account').')';
         // Add sql filters
         if ($sqlfilters) 
         {
diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php
index 91b6cb38ec2..12cfeda7b15 100644
--- a/htdocs/compta/bank/graph.php
+++ b/htdocs/compta/bank/graph.php
@@ -92,7 +92,7 @@ else
 	$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
 	$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
 	$sql.= " WHERE b.fk_account = ba.rowid";
-	$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+	$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 	if ($account && $_GET["option"]!='all') $sql.= " AND b.fk_account IN (".$account.")";
 
 	$resql = $db->query($sql);
@@ -133,7 +133,7 @@ else
 		$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
 		$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql.= " WHERE b.fk_account = ba.rowid";
-		$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+		$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 		$sql.= " AND b.datev >= '".$year."-".$month."-01 00:00:00'";
 		$sql.= " AND b.datev < '".$yearnext."-".$monthnext."-01 00:00:00'";
 		if ($account && $_GET["option"]!='all') $sql.= " AND b.fk_account IN (".$account.")";
@@ -164,7 +164,7 @@ else
 		$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
 		$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql.= " WHERE b.fk_account = ba.rowid";
-		$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+		$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 		$sql.= " AND b.datev < '".$year."-".sprintf("%02s",$month)."-01'";
 		if ($account && $_GET["option"]!='all') $sql.= " AND b.fk_account IN (".$account.")";
 
@@ -276,7 +276,7 @@ else
 		$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
 		$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql.= " WHERE b.fk_account = ba.rowid";
-		$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+		$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 		$sql.= " AND b.datev >= '".$year."-01-01 00:00:00'";
 		$sql.= " AND b.datev <= '".$year."-12-31 23:59:59'";
 		if ($account && $_GET["option"]!='all') $sql.= " AND b.fk_account IN (".$account.")";
@@ -307,7 +307,7 @@ else
 		$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
 		$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql.= " WHERE b.fk_account = ba.rowid";
-		$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+		$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 		$sql.= " AND b.datev < '".$year."-01-01'";
 		if ($account && $_GET["option"]!='all') $sql.= " AND b.fk_account IN (".$account.")";
 
@@ -415,7 +415,7 @@ else
 		$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
 		$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql.= " WHERE b.fk_account = ba.rowid";
-		$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+		$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 		if ($account && $_GET["option"]!='all') $sql.= " AND b.fk_account IN (".$account.")";
 		$sql.= " GROUP BY date_format(b.datev,'%Y%m%d')";
 
@@ -538,7 +538,7 @@ else
 		$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
 		$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql.= " WHERE b.fk_account = ba.rowid";
-		$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+		$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 		$sql.= " AND b.datev >= '".$year."-".$month."-01 00:00:00'";
 		$sql.= " AND b.datev < '".$yearnext."-".$monthnext."-01 00:00:00'";
 		$sql.= " AND b.amount > 0";
@@ -576,7 +576,7 @@ else
 		$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
 		$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql.= " WHERE b.fk_account = ba.rowid";
-		$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+		$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 		$sql.= " AND b.datev >= '".$year."-".$month."-01 00:00:00'";
 		$sql.= " AND b.datev < '".$yearnext."-".$monthnext."-01 00:00:00'";
 		$sql.= " AND b.amount < 0";
@@ -656,7 +656,7 @@ else
 		$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
 		$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql.= " WHERE b.fk_account = ba.rowid";
-		$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+		$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 		$sql.= " AND b.datev >= '".$year."-01-01 00:00:00'";
 		$sql.= " AND b.datev <= '".$year."-12-31 23:59:59'";
 		$sql.= " AND b.amount > 0";
@@ -685,7 +685,7 @@ else
 		$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
 		$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql.= " WHERE b.fk_account = ba.rowid";
-		$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+		$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 		$sql.= " AND b.datev >= '".$year."-01-01 00:00:00'";
 		$sql.= " AND b.datev <= '".$year."-12-31 23:59:59'";
 		$sql.= " AND b.amount < 0";
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index 8ff5f1964fc..b3e07d81b36 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -152,7 +152,7 @@ $reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // N
 $sql.=$hookmanager->resPrint;
 $sql.= " FROM ".MAIN_DB_PREFIX."bank_account as b";
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bankcacount_extrafields as ef on (c.rowid = ef.fk_object)";
-$sql.= " WHERE entity IN (".getEntity('bank_account', 1).")";
+$sql.= " WHERE entity IN (".getEntity('bank_account').")";
 if ($statut == 'opened')  $sql.= " AND clos = 0";
 if ($statut == 'closed')  $sql.= " AND clos = 1";
 if ($search_ref != '')    $sql.=natural_search('b.ref', $search_ref);
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index a690478a53e..52864e52627 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -476,7 +476,7 @@ if (! empty($conf->salaries->enabled) && $user->rights->salaries->read)
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pct ON s.fk_typepayment = pct.id";
 		$sql.= " , ".MAIN_DB_PREFIX."user as u";
-        $sql.= " WHERE s.entity IN (".getEntity('user',1).")";
+        $sql.= " WHERE s.entity IN (".getEntity('user').")";
         $sql.= " AND u.rowid = s.fk_user";
         if ($year > 0)
         {
diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php
index 59fb3af2f00..c305603c82c 100644
--- a/htdocs/compta/clients.php
+++ b/htdocs/compta/clients.php
@@ -93,7 +93,7 @@ if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE s.fk_stcomm = st.id AND s.client in (1, 3)";
-$sql.= " AND s.entity IN (".getEntity('societe', 1).")";
+$sql.= " AND s.entity IN (".getEntity('societe').")";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if (dol_strlen($stcomm))
 {
diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php
index fa8911cecf7..2cfed45c9d4 100644
--- a/htdocs/compta/deplacement/class/deplacement.class.php
+++ b/htdocs/compta/deplacement/class/deplacement.class.php
@@ -223,7 +223,7 @@ class Deplacement extends CommonObject
 	{
 		$sql = "SELECT rowid, fk_user, type, fk_statut, km, fk_soc, dated, note_private, note_public, fk_projet, extraparams";
 		$sql.= " FROM ".MAIN_DB_PREFIX."deplacement";
-		$sql.= " WHERE entity IN (".getEntity('deplacement').")";
+		$sql.= " WHERE entity IN (".getEntity('deplacement', false)")";
 		if ($ref) $sql.= " AND ref ='".$this->db->escape($ref)."'";
 		else $sql.= " AND rowid = ".$id;
 
diff --git a/htdocs/compta/facture/class/api_deprecated_invoice.class.php b/htdocs/compta/facture/class/api_deprecated_invoice.class.php
index 36aa232de9e..360c065a5f2 100644
--- a/htdocs/compta/facture/class/api_deprecated_invoice.class.php
+++ b/htdocs/compta/facture/class/api_deprecated_invoice.class.php
@@ -120,7 +120,7 @@ class InvoiceApi extends DolibarrApi
         
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
 
-        $sql.= ' WHERE s.entity IN ('.getEntity('facture', 1).')';
+        $sql.= ' WHERE s.entity IN ('.getEntity('facture').')';
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND s.fk_soc = sc.fk_soc";
         if ($socid) $sql.= " AND s.fk_soc = ".$socid;
         if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index e2842df0530..55304136ed6 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -112,7 +112,7 @@ class Invoices extends DolibarrApi
         
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
 
-        $sql.= ' WHERE t.entity IN ('.getEntity('facture', 1).')';
+        $sql.= ' WHERE t.entity IN ('.getEntity('facture').')';
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
         if ($socids) $sql.= " AND t.fk_soc IN (".$socids.")";
 
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 927be3fa25e..6bc88e47490 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -955,7 +955,7 @@ class FactureRec extends CommonInvoice
 		
 		$sql = "SELECT rowid";
 		$sql.= " FROM ".MAIN_DB_PREFIX."product";
-		$sql.= " WHERE entity IN (".getEntity('product', 1).")";
+		$sql.= " WHERE entity IN (".getEntity('product').")";
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index e46b5718d22..36d59c36c9a 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -3756,7 +3756,7 @@ class Facture extends CommonInvoice
 		$prodids = array();
 		$sql = "SELECT rowid";
 		$sql.= " FROM ".MAIN_DB_PREFIX."product";
-		$sql.= " WHERE entity IN (".getEntity('product', 1).")";
+		$sql.= " WHERE entity IN (".getEntity('product').")";
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -3964,7 +3964,7 @@ class Facture extends CommonInvoice
 	function newCycle()
 	{
 		$sql = 'SELECT max(situation_cycle_ref) FROM ' . MAIN_DB_PREFIX . 'facture as f';
-		$sql.= " WHERE f.entity in (".getEntity('facture').")";
+		$sql.= " WHERE f.entity in (".getEntity('facture', false)")";
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			if ($resql->num_rows > 0)
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 1ab17765d8f..d772d53aba7 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -384,7 +384,7 @@ if ($search_user > 0)
     $sql.=", ".MAIN_DB_PREFIX."c_type_contact as tc";
 }
 $sql.= ' WHERE f.fk_soc = s.rowid';
-$sql.= ' AND f.entity IN ('.getEntity('facture', 1).')';
+$sql.= ' AND f.entity IN ('.getEntity('facture').')';
 if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($search_product_category > 0) $sql.=" AND cp.fk_categorie = ".$search_product_category;
 if ($socid > 0) $sql.= ' AND s.rowid = '.$socid;
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index eed3a79335c..b5767a6f0bc 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -416,7 +416,7 @@ if ($action == 'new')
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement as p ON p.fk_bank = b.rowid";
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON (b.fk_account = ba.rowid)";
 	$sql.= " WHERE b.fk_type = 'CHQ'";
-	$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+	$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 	$sql.= " AND b.fk_bordereau = 0";
 	$sql.= " AND b.amount > 0";
 	if ($filterdate)          $sql.=" AND b.dateo = '".$db->idate($filterdate)."'";
@@ -656,7 +656,7 @@ else
 	$sql.= " FROM ".MAIN_DB_PREFIX."bank_account as ba";
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON (b.fk_account = ba.rowid)";
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement as p ON p.fk_bank = b.rowid";
-	$sql.= " WHERE ba.entity IN (".getEntity('bank_account', 1).")";
+	$sql.= " WHERE ba.entity IN (".getEntity('bank_account').")";
 	$sql.= " AND b.fk_type= 'CHQ'";
 	$sql.= " AND b.fk_bordereau = ".$object->id;
 	$sql.= $db->order($sortfield, $sortorder);
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index 4889693857b..20afa14e0ca 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -496,7 +496,7 @@ class RemiseCheque extends CommonObject
 		$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
 		$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql.= " WHERE b.fk_account = ba.rowid";
-		$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+		$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 		$sql.= " AND b.fk_type = 'CHQ'";
 		$sql.= " AND b.fk_bordereau = 0";
 		$sql.= " AND b.amount > 0";
diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php
index 97dc3c1674f..e9f887e37f4 100644
--- a/htdocs/compta/paiement/cheque/index.php
+++ b/htdocs/compta/paiement/cheque/index.php
@@ -56,7 +56,7 @@ $sql = "SELECT count(b.rowid)";
 $sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
 $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
 $sql.= " WHERE ba.rowid = b.fk_account";
-$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 $sql.= " AND b.fk_type = 'CHQ'";
 $sql.= " AND b.fk_bordereau = 0";
 $sql.= " AND b.amount > 0";
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 1b5a232b812..4fa13f3e842 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -263,7 +263,7 @@ if ($modecompta != 'CREANCES-DETTES')
     $sql.= " WHERE pf.rowid IS NULL";
     $sql.= " AND p.fk_bank = b.rowid";
     $sql.= " AND b.fk_account = ba.rowid";
-    $sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+    $sql.= " AND ba.entity IN (".getEntity('bank_account').")";
     if (! empty($date_start) && ! empty($date_end))
     	$sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
     $sql.= " GROUP BY name, idp";
@@ -654,7 +654,7 @@ if (! empty($conf->expensereport->enabled))
 		$sql = "SELECT p.rowid, p.ref, u.rowid as userid, u.firstname, u.lastname, date_format(date_valid,'%Y-%m') as dm, sum(p.total_ht) as amount_ht,sum(p.total_ttc) as amount_ttc";
 		$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as p";
 		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user_author";
-		$sql.= " WHERE p.entity = ".getEntity('expensereport',1);
+		$sql.= " WHERE p.entity = ".getEntity('expensereport');
 		$sql.= " AND p.fk_statut>=5";
 
 		$column='p.date_valid';
@@ -664,7 +664,7 @@ if (! empty($conf->expensereport->enabled))
 		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user_author";
 		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."payment_expensereport as pe ON pe.fk_expensereport = p.rowid";
 		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id";
-		$sql.= " WHERE p.entity = ".getEntity('expensereport',1);
+		$sql.= " WHERE p.entity = ".getEntity('expensereport');
 		$sql.= " AND p.fk_statut>=5";
 
 		$column='pe.datep';
@@ -745,7 +745,7 @@ if (! empty($conf->don->enabled))
 	    $sql.= " FROM ".MAIN_DB_PREFIX."don as p";
 	    $sql.= " INNER JOIN ".MAIN_DB_PREFIX."payment_donation as pe ON pe.fk_donation = p.rowid";
 	    $sql.= " INNER JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id";
-	    $sql.= " WHERE p.entity = ".getEntity('donation',1);
+	    $sql.= " WHERE p.entity = ".getEntity('donation');
 	    $sql.= " AND fk_statut >= 2";	 
 	}
 	if (! empty($date_start) && ! empty($date_end))
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index fe64bb7b999..45cbbfe3a46 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -164,7 +164,7 @@ if ($modecompta != 'CREANCES-DETTES')
 	$sql.= " WHERE pf.rowid IS NULL";
 	$sql.= " AND p.fk_bank = b.rowid";
 	$sql.= " AND b.fk_account = ba.rowid";
-	$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+	$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 	$sql.= " GROUP BY dm";
 	$sql.= " ORDER BY dm";
 
@@ -536,7 +536,7 @@ if (! empty($conf->expensereport->enabled))
 		$sql = "SELECT date_format(date_valid,'%Y-%m') as dm, sum(p.total_ht) as amount_ht,sum(p.total_ttc) as amount_ttc";
 		$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as p";
 		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user_author";
-		$sql.= " WHERE p.entity = ".getEntity('expensereport',1);
+		$sql.= " WHERE p.entity = ".getEntity('expensereport');
 		$sql.= " AND p.fk_statut>=5";
 
 		$column='p.date_valid';
@@ -547,7 +547,7 @@ if (! empty($conf->expensereport->enabled))
 		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user_author";
 		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."payment_expensereport as pe ON pe.fk_expensereport = p.rowid";
 		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id";
-		$sql.= " WHERE p.entity = ".getEntity('expensereport',1);
+		$sql.= " WHERE p.entity = ".getEntity('expensereport');
 		$sql.= " AND p.fk_statut>=5";
 
 		$column='pe.datep';
@@ -600,7 +600,7 @@ if (! empty($conf->don->enabled))
         $sql.= " FROM ".MAIN_DB_PREFIX."don as p";
 		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."payment_donation as pe ON pe.fk_donation = p.rowid";
 		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id";
-		$sql.= " WHERE p.entity = ".getEntity('donation',1);
+		$sql.= " WHERE p.entity = ".getEntity('donation');
    	    $sql.= " AND fk_statut >= 2";
     }
     $sql.= " GROUP BY p.societe, p.firstname, p.lastname, dm";
diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php
index ae7240c204a..824185c52aa 100644
--- a/htdocs/compta/sociales/payments.php
+++ b/htdocs/compta/sociales/payments.php
@@ -413,7 +413,7 @@ if (! empty($conf->salaries->enabled) && $user->rights->salaries->read)
 
         $sql = "SELECT s.rowid, s.amount, s.label, s.datep as datep, s.datev as datev, s.datesp, s.dateep, s.salary, u.salary as current_salary";
         $sql.= " FROM ".MAIN_DB_PREFIX."payment_salary as s, ".MAIN_DB_PREFIX."user as u";
-        $sql.= " WHERE s.entity IN (".getEntity('user',1).")";
+        $sql.= " WHERE s.entity IN (".getEntity('user').")";
         $sql.= " AND u.rowid = s.fk_user";
         if ($year > 0)
         {
diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php
index fff94c898c2..ad9a8fbd346 100644
--- a/htdocs/compta/stats/cabyuser.php
+++ b/htdocs/compta/stats/cabyuser.php
@@ -237,7 +237,7 @@ if ($modecompta != 'CREANCES-DETTES') {
     $sql.= " WHERE pf.rowid IS NULL";
     $sql.= " AND p.fk_bank = b.rowid";
     $sql.= " AND b.fk_account = ba.rowid";
-    $sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+    $sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 	if ($date_start && $date_end) {
 	    $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 	}
diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index 548809f4317..b9fcf6b7aa3 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -306,7 +306,7 @@ if ($modecompta != 'CREANCES-DETTES') {
 	$sql.= " WHERE pf.rowid IS NULL";
 	$sql.= " AND p.fk_bank = b.rowid";
 	$sql.= " AND b.fk_account = ba.rowid";
-	$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+	$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 	if ($date_start && $date_end) $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 	$sql.= " GROUP BY socid, name";
 	$sql.= " ORDER BY name";
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index 2bb9a7d50a0..19c106a44dc 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -151,7 +151,7 @@ if ($modecompta != 'CREANCES-DETTES')
 	$sql.= " WHERE pf.rowid IS NULL";
 	$sql.= " AND p.fk_bank = b.rowid";
 	$sql.= " AND b.fk_account = ba.rowid";
-	$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+	$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 	$sql.= " GROUP BY dm";
 	$sql.= " ORDER BY dm";
 
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 9bcfee7ccae..2d46b91f922 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -247,7 +247,7 @@ if (! empty($search_categ)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_conta
 if (! empty($search_categ_thirdparty)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";       // We need this table joined to the select in order to filter by categ
 if (! empty($search_categ_supplier)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_fournisseur as cs2 ON s.rowid = cs2.fk_soc";       // We need this table joined to the select in order to filter by categ
 if (!$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
-$sql.= ' WHERE p.entity IN ('.getEntity('societe', 1).')';
+$sql.= ' WHERE p.entity IN ('.getEntity('societe').')';
 if (!$user->rights->societe->client->voir && !$socid) //restriction
 {
 	$sql .= " AND (sc.fk_user = " .$user->id." OR p.fk_soc IS NULL)";
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index db6464edb6a..762a22889c6 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -504,7 +504,7 @@ class Contrat extends CommonObject
 		if ($ref)
 		{
 			$sql.= " WHERE ref='".$this->db->escape($ref)."'";
-			$sql.= " AND entity IN (".getEntity('contract').")";
+			$sql.= " AND entity IN (".getEntity('contract', false)")";
 		}
 		else $sql.= " WHERE rowid=".$id;
 
@@ -2180,7 +2180,7 @@ class Contrat extends CommonObject
 		$prodids = array();
 		$sql = "SELECT rowid";
 		$sql.= " FROM ".MAIN_DB_PREFIX."product";
-		$sql.= " WHERE entity IN (".getEntity('product', 1).")";
+		$sql.= " WHERE entity IN (".getEntity('product').")";
 		$sql.= " AND tosell = 1";
 		$resql = $this->db->query($sql);
 		if ($resql)
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 924958319a4..3cff590bc4b 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -107,7 +107,7 @@ $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."contrat as c";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE cd.fk_contrat = c.rowid AND c.fk_soc = s.rowid";
 $sql.= " AND (cd.statut != 4 OR (cd.statut = 4 AND (cd.date_fin_validite is null or cd.date_fin_validite >= '".$db->idate($now)."')))";
-$sql.= " AND c.entity IN (".getEntity('contract').")";
+$sql.= " AND c.entity IN (".getEntity('contract', false)")";
 if ($user->societe_id) $sql.=' AND c.fk_soc = '.$user->societe_id;
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 $sql.= " GROUP BY cd.statut";
@@ -144,7 +144,7 @@ $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."contrat as c";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE cd.fk_contrat = c.rowid AND c.fk_soc = s.rowid";
 $sql.= " AND (cd.statut = 4 AND cd.date_fin_validite < '".$db->idate($now)."')";
-$sql.= " AND c.entity IN (".getEntity('contract').")";
+$sql.= " AND c.entity IN (".getEntity('contract', false)")";
 if ($user->societe_id) $sql.=' AND c.fk_soc = '.$user->societe_id;
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 $sql.= " GROUP BY cd.statut";
@@ -230,7 +230,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
 	$sql .= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE s.rowid = c.fk_soc";
-	$sql.= " AND c.entity IN (".getEntity('contract').")";
+	$sql.= " AND c.entity IN (".getEntity('contract', false)")";
 	$sql.= " AND c.statut = 0";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 	if ($socid) $sql.= " AND c.fk_soc = ".$socid;
@@ -302,7 +302,7 @@ if (!$user->rights->societe->client->voir && !$socid) $sql.= " ".MAIN_DB_PREFIX.
 $sql.= " ".MAIN_DB_PREFIX."contrat as c";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."contratdet as cd ON c.rowid = cd.fk_contrat";
 $sql.= " WHERE c.fk_soc = s.rowid";
-$sql.= " AND c.entity IN (".getEntity('contract').")";
+$sql.= " AND c.entity IN (".getEntity('contract', false)")";
 $sql.= " AND c.statut > 0";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($socid) $sql.= " AND s.rowid = ".$socid;
@@ -372,7 +372,7 @@ $sql.= ", ".MAIN_DB_PREFIX."societe as s";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd";
 $sql.= ") LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
-$sql.= " WHERE c.entity IN (".getEntity('contract').")";
+$sql.= " WHERE c.entity IN (".getEntity('contract', false)")";
 $sql.= " AND cd.fk_contrat = c.rowid";
 $sql.= " AND c.fk_soc = s.rowid";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
@@ -450,7 +450,7 @@ $sql.= ", ".MAIN_DB_PREFIX."societe as s";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd";
 $sql.= " ) LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
-$sql.= " WHERE c.entity IN (".getEntity('contract').")";
+$sql.= " WHERE c.entity IN (".getEntity('contract', false)")";
 $sql.= " AND c.statut = 1";
 $sql.= " AND cd.statut = 0";
 $sql.= " AND cd.fk_contrat = c.rowid";
@@ -529,7 +529,7 @@ $sql.= ", ".MAIN_DB_PREFIX."societe as s";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd";
 $sql.= " ) LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
-$sql.= " WHERE c.entity IN (".getEntity('contract').")";
+$sql.= " WHERE c.entity IN (".getEntity('contract', false)")";
 $sql.= " AND c.statut = 1";
 $sql.= " AND cd.statut = 4";
 $sql.= " AND cd.date_fin_validite < '".$db->idate($now)."'";
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 43cce90bd1c..e0711f63704 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -222,7 +222,7 @@ if ($search_user > 0)
     $sql.=", ".MAIN_DB_PREFIX."c_type_contact as tc";
 }
 $sql.= " WHERE c.fk_soc = s.rowid ";
-$sql.= ' AND c.entity IN ('.getEntity('contract', 1).')';
+$sql.= ' AND c.entity IN ('.getEntity('contract').')';
 if ($search_product_category > 0) $sql.=" AND cp.fk_categorie = ".$search_product_category;
 if ($socid) $sql.= " AND s.rowid = ".$db->escape($socid);
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php
index 0649d43a049..51e4a22d756 100644
--- a/htdocs/core/boxes/box_clients.php
+++ b/htdocs/core/boxes/box_clients.php
@@ -90,7 +90,7 @@ class box_clients extends ModeleBoxes
 			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			$sql.= " WHERE s.client IN (1, 3)";
-			$sql.= " AND s.entity IN (".getEntity('societe', 1).")";
+			$sql.= " AND s.entity IN (".getEntity('societe').")";
 			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 			if ($user->societe_id) $sql.= " AND s.rowid = $user->societe_id";
 			$sql.= " ORDER BY s.tms DESC";
diff --git a/htdocs/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php
index d6c38a9fce8..c6aaf1ec24a 100644
--- a/htdocs/core/boxes/box_contacts.php
+++ b/htdocs/core/boxes/box_contacts.php
@@ -69,7 +69,7 @@ class box_contacts extends ModeleBoxes
 			$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
 			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON sp.fk_soc = s.rowid";
 			if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-			$sql.= " WHERE sp.entity IN (".getEntity('societe', 1).")";
+			$sql.= " WHERE sp.entity IN (".getEntity('societe').")";
 			if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " AND sp.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 			if ($user->societe_id) $sql.= " AND sp.fk_soc = ".$user->societe_id;
 			$sql.= " ORDER BY sp.tms DESC";
diff --git a/htdocs/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php
index 432d34897d0..530a99c8224 100644
--- a/htdocs/core/boxes/box_fournisseurs.php
+++ b/htdocs/core/boxes/box_fournisseurs.php
@@ -71,7 +71,7 @@ class box_fournisseurs extends ModeleBoxes
             $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
             if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
             $sql.= " WHERE s.fournisseur = 1";
-            $sql.= " AND s.entity IN (".getEntity('societe', 1).")";
+            $sql.= " AND s.entity IN (".getEntity('societe').")";
             if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
             if ($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
             $sql.= " ORDER BY s.tms DESC ";
diff --git a/htdocs/core/boxes/box_goodcustomers.php b/htdocs/core/boxes/box_goodcustomers.php
index 73208b1423a..6c19b46e468 100644
--- a/htdocs/core/boxes/box_goodcustomers.php
+++ b/htdocs/core/boxes/box_goodcustomers.php
@@ -86,7 +86,7 @@ class box_goodcustomers extends ModeleBoxes
 			$sql = "SELECT s.rowid, s.nom as name, s.logo, s.code_client, s.code_fournisseur, s.client, s.fournisseur, s.tms as datem, s.status as status,";
 			$sql.= " count(*) as nbfact, sum(". $db->ifsql('f.paye=1','1','0').") as nbfactpaye";
 			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as f";
-			$sql.= ' WHERE s.entity IN ('.getEntity('societe', 1).')';
+			$sql.= ' WHERE s.entity IN ('.getEntity('societe').')';
 			$sql.= ' AND s.rowid = f.fk_soc';
 			$sql.= " GROUP BY s.rowid, s.nom, s.logo, s.code_client, s.code_fournisseur, s.client, s.fournisseur, s.tms, s.status";
 			$sql.= $db->order("nbfact","DESC");
diff --git a/htdocs/core/boxes/box_project.php b/htdocs/core/boxes/box_project.php
index 4c4e8085592..80c7b24249b 100644
--- a/htdocs/core/boxes/box_project.php
+++ b/htdocs/core/boxes/box_project.php
@@ -90,7 +90,7 @@ class box_project extends ModeleBoxes
 		    $sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut, p.public";
 			$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
             if($user->socid) $sql.= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid=p.fk_soc";
-			$sql.= " WHERE p.entity IN (".getEntity('project',1).')';
+			$sql.= " WHERE p.entity IN (".getEntity('project').')';
             if (! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")";     // public and assigned to, or restricted to company for external users
 			if ($user->socid) $sql.= " AND s.rowid = ".$user->socid;
             $sql.= " AND p.fk_statut = 1"; // Seulement les projets ouverts
@@ -130,7 +130,7 @@ class box_project extends ModeleBoxes
 
 					$sql ="SELECT count(*) as nb, sum(progress) as totprogress";
 					$sql.=" FROM ".MAIN_DB_PREFIX."projet as p LEFT JOIN ".MAIN_DB_PREFIX."projet_task as pt on pt.fk_projet = p.rowid";
-	           		$sql.= " WHERE p.entity IN (".getEntity('project',1).')';
+	           		$sql.= " WHERE p.entity IN (".getEntity('project').')';
     				$sql.=" AND p.rowid = ".$objp->rowid;
 					$resultTask = $db->query($sql);
 					if ($resultTask) {
diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php
index 1acd77addfc..abc99246c4a 100644
--- a/htdocs/core/boxes/box_prospect.php
+++ b/htdocs/core/boxes/box_prospect.php
@@ -90,7 +90,7 @@ class box_prospect extends ModeleBoxes
 			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			$sql.= " WHERE s.client IN (2, 3)";
-			$sql.= " AND s.entity IN (".getEntity('societe', 1).")";
+			$sql.= " AND s.entity IN (".getEntity('societe').")";
 			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 			if ($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
 			$sql.= " ORDER BY s.tms DESC";
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index fe93387cadb..01ffb706586 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -959,7 +959,7 @@ abstract class CommonObject
         $sql.= " WHERE ec.element_id = ".$id;
         $sql.= " AND ec.fk_socpeople = c.rowid";
         if ($source == 'internal') $sql.= " AND c.entity IN (0,".$conf->entity.")";
-        if ($source == 'external') $sql.= " AND c.entity IN (".getEntity('societe', 1).")";
+        if ($source == 'external') $sql.= " AND c.entity IN (".getEntity('societe').")";
         $sql.= " AND ec.fk_c_type_contact = tc.rowid";
         $sql.= " AND tc.element = '".$element."'";
         $sql.= " AND tc.source = '".$source."'";
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index cf6ae18f568..b72a451a41c 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1042,7 +1042,7 @@ class Form
         $sql = "SELECT s.rowid, s.nom as name, s.name_alias, s.client, s.fournisseur, s.code_client, s.code_fournisseur";
         $sql.= " FROM ".MAIN_DB_PREFIX ."societe as s";
         if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql.= " WHERE s.entity IN (".getEntity('societe', 1).")";
+        $sql.= " WHERE s.entity IN (".getEntity('societe').")";
         if (! empty($user->societe_id)) $sql.= " AND s.rowid = ".$user->societe_id;
         if ($filter) $sql.= " AND (".$filter.")";
         if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
@@ -1282,7 +1282,7 @@ class Form
         if ($showsoc > 0) $sql.= " , s.nom as company";
         $sql.= " FROM ".MAIN_DB_PREFIX ."socpeople as sp";
         if ($showsoc > 0) $sql.= " LEFT OUTER JOIN  ".MAIN_DB_PREFIX ."societe as s ON s.rowid=sp.fk_soc";
-        $sql.= " WHERE sp.entity IN (".getEntity('societe', 1).")";
+        $sql.= " WHERE sp.entity IN (".getEntity('societe').")";
         if ($socid > 0) $sql.= " AND sp.fk_soc=".$socid;
         if (! empty($conf->global->CONTACT_HIDE_INACTIVE_IN_COMBOBOX)) $sql.= " AND sp.statut <> 0";
         $sql.= " ORDER BY sp.lastname ASC";
@@ -1905,7 +1905,7 @@ class Form
             $sql .= " LEFT JOIN llx_product_attribute_combination pac ON pac.fk_product_child = p.rowid";
         }
 
-        $sql.= ' WHERE p.entity IN ('.getEntity('product', 1).')';
+        $sql.= ' WHERE p.entity IN ('.getEntity('product').')';
         if (count($warehouseStatusArray))
         {
             $sql.= ' AND (p.fk_product_type = 1 OR e.statut IN ('.implode(',',$warehouseStatusArray).'))';
@@ -2140,7 +2140,7 @@ class Form
             $sql = "SELECT price, price_ttc, price_base_type, tva_tx";
             $sql.= " FROM ".MAIN_DB_PREFIX."product_price";
             $sql.= " WHERE fk_product='".$objp->rowid."'";
-            $sql.= " AND entity IN (".getEntity('productprice', 1).")";
+            $sql.= " AND entity IN (".getEntity('productprice').")";
             $sql.= " AND price_level=".$price_level;
             $sql.= " ORDER BY date_price DESC, rowid DESC"; // Warning DESC must be both on date_price and rowid.
             $sql.= " LIMIT 1";
@@ -2364,7 +2364,7 @@ class Form
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
         if ($socid) $sql.= " AND pfp.fk_soc = ".$socid;
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON pfp.fk_soc = s.rowid";
-        $sql.= " WHERE p.entity IN (".getEntity('product', 1).")";
+        $sql.= " WHERE p.entity IN (".getEntity('product').")";
         $sql.= " AND p.tobuy = 1";
         if (strval($filtertype) != '') $sql.=" AND p.fk_product_type=".$this->db->escape($filtertype);
         if (! empty($filtre)) $sql.=" ".$filtre;
@@ -2574,7 +2574,7 @@ class Form
         $sql.= " FROM ".MAIN_DB_PREFIX."product as p";
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON pfp.fk_soc = s.rowid";
-        $sql.= " WHERE p.entity IN (".getEntity('productprice', 1).")";
+        $sql.= " WHERE p.entity IN (".getEntity('productprice').")";
         $sql.= " AND p.tobuy = 1";
         $sql.= " AND s.fournisseur = 1";
         $sql.= " AND p.rowid = ".$productid;
@@ -3316,7 +3316,7 @@ class Form
 
         $sql = "SELECT rowid, label, bank, clos as status";
         $sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
-        $sql.= " WHERE entity IN (".getEntity('bank_account', 1).")";
+        $sql.= " WHERE entity IN (".getEntity('bank_account').")";
         if ($statut != 2) $sql.= " AND clos = '".$statut."'";
         if ($filtre) $sql.=" AND ".$filtre;
         $sql.= " ORDER BY label";
@@ -4352,7 +4352,7 @@ class Form
 		$TCurrency = array();
 
 		$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'multicurrency';
-		$sql.= " WHERE entity IN ('".getEntity('mutlicurrency')."')";
+		$sql.= " WHERE entity IN ('".getEntity('mutlicurrency', false)"')";
 		$resql = $db->query($sql);
 		if ($resql)
 		{
@@ -5596,14 +5596,14 @@ class Form
     		if (($object->thirdparty->parent > 0) && ! empty($conf->global->THIRDPARTY_INCLUDE_PARENT_IN_LINKTO)) $listofidcompanytoscan.=','.$object->thirdparty->parent;
 
     		$possiblelinks=array(
-    		    'propal'=>array('enabled'=>$conf->propal->enabled, 'perms'=>1, 'label'=>'LinkToProposal', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('propal',1).')'),
-    		    'order'=>array('enabled'=>$conf->commande->enabled, 'perms'=>1, 'label'=>'LinkToOrder', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('commande',1).')'),
-    		    'invoice'=>array('enabled'=>$conf->facture->enabled, 'perms'=>1, 'label'=>'LinkToInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.facnumber as ref, t.ref_client, t.total as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('facture',1).')'),
-    		    'contrat'=>array('enabled'=>$conf->contrat->enabled , 'perms'=>1, 'label'=>'LinkToContract', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, '' as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('contract',1).')'),
-    		    'fichinter'=>array('enabled'=>$conf->ficheinter->enabled, 'perms'=>1, 'label'=>'LinkToIntervention', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."fichinter as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('intervention',1).')'),
-    		    'supplier_proposal'=>array('enabled'=>$conf->supplier_proposal->enabled , 'perms'=>1, 'label'=>'LinkToSupplierProposal', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, '' as ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."supplier_proposal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('supplier_proposal',1).')'),
-    		    'order_supplier'=>array('enabled'=>$conf->fournisseur->commande->enabled , 'perms'=>1, 'label'=>'LinkToSupplierOrder', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande_fournisseur as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('commande_fournisseur',1).')'),
-    		    'invoice_supplier'=>array('enabled'=>$conf->fournisseur->facture->enabled , 'perms'=>1, 'label'=>'LinkToSupplierInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('facture_fourn',1).')')
+    		    'propal'=>array('enabled'=>$conf->propal->enabled, 'perms'=>1, 'label'=>'LinkToProposal', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('propal').')'),
+    		    'order'=>array('enabled'=>$conf->commande->enabled, 'perms'=>1, 'label'=>'LinkToOrder', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('commande').')'),
+    		    'invoice'=>array('enabled'=>$conf->facture->enabled, 'perms'=>1, 'label'=>'LinkToInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.facnumber as ref, t.ref_client, t.total as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('facture').')'),
+    		    'contrat'=>array('enabled'=>$conf->contrat->enabled , 'perms'=>1, 'label'=>'LinkToContract', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, '' as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('contract').')'),
+    		    'fichinter'=>array('enabled'=>$conf->ficheinter->enabled, 'perms'=>1, 'label'=>'LinkToIntervention', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."fichinter as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('intervention').')'),
+    		    'supplier_proposal'=>array('enabled'=>$conf->supplier_proposal->enabled , 'perms'=>1, 'label'=>'LinkToSupplierProposal', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, '' as ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."supplier_proposal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('supplier_proposal').')'),
+    		    'order_supplier'=>array('enabled'=>$conf->fournisseur->commande->enabled , 'perms'=>1, 'label'=>'LinkToSupplierOrder', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande_fournisseur as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('commande_fournisseur').')'),
+    		    'invoice_supplier'=>array('enabled'=>$conf->fournisseur->facture->enabled , 'perms'=>1, 'label'=>'LinkToSupplierInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('facture_fourn').')')
     		);
 		}
 
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index f3db5777783..2d444c1aefe 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -221,7 +221,7 @@ class FormAccounting extends Form
 		$options = array();
 
 		$sql = 'SELECT DISTINCT import_key from ' . MAIN_DB_PREFIX . 'accounting_bookkeeping';
-	    $sql .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
+	    $sql .= " WHERE entity IN (" . getEntity('accountancy') . ")";
 		$sql .= ' ORDER BY import_key DESC';
 
 		dol_syslog(get_class($this) . "::select_bookkeeping_importkey", LOG_DEBUG);
@@ -344,7 +344,7 @@ class FormAccounting extends Form
 		// Auxiliary customer account
 		$sql = "SELECT DISTINCT code_compta, nom ";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
-	    $sql .= " WHERE entity IN (" . getEntity("societe", 1) . ")";
+	    $sql .= " WHERE entity IN (" . getEntity('societe') . ")";
 		$sql .= " ORDER BY code_compta";
 		dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -364,7 +364,7 @@ class FormAccounting extends Form
 		// Auxiliary supplier account
 		$sql = "SELECT DISTINCT code_compta_fournisseur, nom ";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
-		$sql .= " WHERE entity IN (" . getEntity("societe", 1) . ")";
+		$sql .= " WHERE entity IN (" . getEntity('societe') . ")";
 		$sql .= " ORDER BY code_compta_fournisseur";
 		dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -405,7 +405,7 @@ class FormAccounting extends Form
 
 		$sql = "SELECT DISTINCT date_format(doc_date,'%Y') as dtyear";
 		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping";
-	    $sql .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
+	    $sql .= " WHERE entity IN (" . getEntity('accountancy') . ")";
 		$sql .= " ORDER BY date_format(doc_date,'%Y')";
 		dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index bcff0981a70..3ab47e1994b 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -629,7 +629,7 @@ class FormCompany
 			// Search to list thirdparties
 			$sql = "SELECT s.rowid, s.nom as name FROM";
 			$sql.= " ".MAIN_DB_PREFIX."societe as s";
-			$sql.= " WHERE s.entity IN (".getEntity('societe', 1).")";
+			$sql.= " WHERE s.entity IN (".getEntity('societe').")";
 			// For ajax search we limit here. For combo list, we limit later
 			if (is_array($limitto) && count($limitto))
 			{
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 3641ac87cef..feac8b20cec 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -843,7 +843,7 @@ class FormMail extends Form
 		$sql = "SELECT label, topic, content, content_lines, lang";
 		$sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
 		$sql.= " WHERE type_template='".$db->escape($type_template)."'";
-		$sql.= " AND entity IN (".getEntity("c_email_templates").")";
+		$sql.= " AND entity IN (".getEntity('c_email_templates', false)")";
 		$sql.= " AND (fk_user is NULL or fk_user = 0 or fk_user = ".$user->id.")";
 		if ($active >= 0) $sql.=" AND active = ".$active;
 		if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";
@@ -910,7 +910,7 @@ class FormMail extends Form
 		$sql = "SELECT label, topic, content, lang";
 		$sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
 		$sql.= " WHERE type_template='".$this->db->escape($type_template)."'";
-		$sql.= " AND entity IN (".getEntity("c_email_templates").")";
+		$sql.= " AND entity IN (".getEntity('c_email_templates', false)")";
 		$sql.= " AND (fk_user is NULL or fk_user = 0 or fk_user = ".$user->id.")";
 		if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";
 		$sql.= $this->db->order("lang,label","ASC");
@@ -947,7 +947,7 @@ class FormMail extends Form
 		$sql = "SELECT rowid, label, topic, content, content_lines, lang, position";
 		$sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
 		$sql.= " WHERE type_template='".$this->db->escape($type_template)."'";
-		$sql.= " AND entity IN (".getEntity("c_email_templates").")";
+		$sql.= " AND entity IN (".getEntity('c_email_templates', false)")";
 		$sql.= " AND (fk_user is NULL or fk_user = 0 or fk_user = ".$user->id.")";
 		if ($active >= 0) $sql.=" AND active = ".$active;
 		if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index 30481497163..119787874ea 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -153,7 +153,7 @@ class FormProjets
 		// Search all projects
 		$sql = 'SELECT p.rowid, p.ref, p.title, p.fk_soc, p.fk_statut, p.public, s.nom as name, s.name_alias';
 		$sql.= ' FROM '.MAIN_DB_PREFIX .'projet as p LEFT JOIN '.MAIN_DB_PREFIX .'societe as s ON s.rowid = p.fk_soc';
-		$sql.= " WHERE p.entity IN (".getEntity('project', 1).")";
+		$sql.= " WHERE p.entity IN (".getEntity('project').")";
 		if ($projectsListId !== false) $sql.= " AND p.rowid IN (".$projectsListId.")";
 		if ($socid == 0) $sql.= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
 		if ($socid > 0)
@@ -526,7 +526,7 @@ class FormProjets
 		    if (is_numeric($socid)) $sql.= " AND t.fk_soc=".$socid;
 		    else $sql.= " AND t.fk_soc IN (".$socid.")";
 		}
-		if (! in_array($table_element, array('expensereport_det','stock_mouvement'))) $sql.= ' AND t.entity IN ('.getEntity('project',1).')';
+		if (! in_array($table_element, array('expensereport_det','stock_mouvement'))) $sql.= ' AND t.entity IN ('.getEntity('project').')';
 		if ($linkedtothirdparty) $sql.=" AND s.rowid = t.fk_soc";
 		if ($sqlfilter) $sql.= " AND ".$sqlfilter;
 		$sql.= " ORDER BY ref DESC";
diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index 1205f0c5c63..6f2f9e56d61 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -147,7 +147,7 @@ class Notify
     		        if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
     		        else $sql.= " AND a.code = '".$notifcode."'";			// New usage
     	        }
-    	        $sql.= " AND s.entity IN (".getEntity('societe', 1).")";
+    	        $sql.= " AND s.entity IN (".getEntity('societe').")";
     	        if ($socid > 0) $sql.= " AND s.rowid = ".$socid;
     
     			dol_syslog(__METHOD__." ".$notifcode.", ".$socid."", LOG_DEBUG);
@@ -192,7 +192,7 @@ class Notify
     			    if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
     			    else $sql.= " AND a.code = '".$notifcode."'";			// New usage
     			}
-    			$sql.= " AND c.entity IN (".getEntity('user', 1).")";
+    			$sql.= " AND c.entity IN (".getEntity('user').")";
     			if ($userid > 0) $sql.= " AND c.rowid = ".$userid;
     			
     			dol_syslog(__METHOD__." ".$notifcode.", ".$socid."", LOG_DEBUG);
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 3c37a18ab27..0a41969afd3 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -1065,7 +1065,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
         if (get_class($filterobj) == 'Adherent') $sql.= ", ".MAIN_DB_PREFIX."adherent as m";
         if (get_class($filterobj) == 'CommandeFournisseur') $sql.= ", ".MAIN_DB_PREFIX."commande_fournisseur as o";
         $sql.= " WHERE u.rowid = a.fk_user_action";
-        $sql.= " AND a.entity IN (".getEntity('agenda', 1).")";
+        $sql.= " AND a.entity IN (".getEntity('agenda').")";
         if (get_class($filterobj) == 'Societe'  && $filterobj->id) $sql.= " AND a.fk_soc = ".$filterobj->id;
         if (get_class($filterobj) == 'Project' && $filterobj->id) $sql.= " AND a.fk_project = ".$filterobj->id;
         if (get_class($filterobj) == 'Adherent') 
@@ -1478,7 +1478,7 @@ function show_subsidiaries($conf,$langs,$db,$object)
 	$sql = "SELECT s.rowid, s.nom as name, s.address, s.zip, s.town, s.code_client, s.canvas";
 	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 	$sql.= " WHERE s.parent = ".$object->id;
-	$sql.= " AND s.entity IN (".getEntity('societe', 1).")";
+	$sql.= " AND s.entity IN (".getEntity('societe').")";
 	$sql.= " ORDER BY s.nom";
 
 	$result = $db->query($sql);
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index ad800708522..82f399417ba 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1946,7 +1946,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed=1;
 		}
 		$original_file=$conf->societe->multidir_output[$entity].'/'.$original_file;
-		$sqlprotectagainstexternals = "SELECT rowid as fk_soc FROM ".MAIN_DB_PREFIX."societe WHERE rowid='".$db->escape($refname)."' AND entity IN (".getEntity('societe', 1).")";
+		$sqlprotectagainstexternals = "SELECT rowid as fk_soc FROM ".MAIN_DB_PREFIX."societe WHERE rowid='".$db->escape($refname)."' AND entity IN (".getEntity('societe').")";
 	}
 
 	// Wrapping for contact
@@ -2087,7 +2087,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed=1;
 		}
 		$original_file=$conf->projet->dir_output.'/'.$original_file;
-		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project', 1).")";
+		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project').")";
 	}
 	else if ($modulepart == 'project_task' && !empty($conf->projet->dir_output))
 	{
@@ -2096,7 +2096,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed=1;
 		}
 		$original_file=$conf->projet->dir_output.'/'.$original_file;
-		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project', 1).")";
+		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project').")";
 	}
 
 	// Wrapping pour les commandes fournisseurs
@@ -2210,7 +2210,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed=1;
 		}
 		$original_file=$conf->contrat->dir_output.'/'.$original_file;
-		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."contrat WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('contract', 1).")";
+		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."contrat WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('contract').")";
 	}
 
 	// Wrapping pour les dons
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 041235f40f6..97070483aaf 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -110,10 +110,10 @@ function getDoliDBInstance($type, $host, $user, $pass, $name, $port)
  *                              'commande', 'commande_fournisseur', 'expedition', 'intervention', 'survey',
  *                              'contract', 'tax', 'expensereport', 'holiday', 'multicurrency', 'project',
  *                              'email_template', 'event',
- * 	@param	int		$shared		0=Return id of entity, 1=Return id entity + shared entities
+ * 	@param	int		$shared		true=Return id entity + shared entities (by default), false=Return id of current entity or referent entity if current element is "societe"
  * 	@return	mixed				Entity id(s) to use
  */
-function getEntity($element=false, $shared=0)
+function getEntity($element=false, $shared=true)
 {
 	global $conf, $mc;
 
diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
index 3455979afbe..78de61a729f 100644
--- a/htdocs/core/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -184,7 +184,7 @@ function show_list_sending_receive($origin,$origin_id,$filter='')
 	//if ($conf->livraison_bon->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.fk_expedition = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."livraisondet as ld ON ld.fk_livraison = l.rowid  AND obj.rowid = ld.fk_origin_line";
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON obj.fk_product = p.rowid";
 	//TODO Add link to expeditiondet_batch
-	$sql.= " WHERE e.entity IN (".getEntity('expedition', 1).")";
+	$sql.= " WHERE e.entity IN (".getEntity('expedition').")";
 	$sql.= " AND obj.fk_".$origin." = ".$origin_id;
 	$sql.= " AND obj.rowid = ed.fk_origin_line";
 	$sql.= " AND ed.fk_expedition = e.rowid";
diff --git a/htdocs/core/modules/facture/mod_facture_mars.php b/htdocs/core/modules/facture/mod_facture_mars.php
index 578ed1a16ff..15d3ce53fa8 100644
--- a/htdocs/core/modules/facture/mod_facture_mars.php
+++ b/htdocs/core/modules/facture/mod_facture_mars.php
@@ -153,7 +153,7 @@ class mod_facture_mars extends ModeleNumRefFactures
 		$sql = "SELECT MAX(CAST(SUBSTRING(facnumber FROM ".$posindice.") AS SIGNED)) as max";	// This is standard SQL
 		$sql.= " FROM ".MAIN_DB_PREFIX."facture";
 		$sql.= " WHERE facnumber LIKE '".$prefix."____-%'";
-		$sql.= " AND entity IN (".getEntity('facture', 1).")";
+		$sql.= " AND entity IN (".getEntity('facture').")";
 
 		$resql=$db->query($sql);
 		dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
@@ -177,7 +177,7 @@ class mod_facture_mars extends ModeleNumRefFactures
             $sql = "SELECT facnumber as ref";
             $sql.= " FROM ".MAIN_DB_PREFIX."facture";
             $sql.= " WHERE facnumber LIKE '".$prefix."____-".$num."'";
-            $sql.= " AND entity IN (".getEntity('facture', 1).")";
+            $sql.= " AND entity IN (".getEntity('facture').")";
 
             dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
             $resql=$db->query($sql);
diff --git a/htdocs/core/modules/facture/mod_facture_terre.php b/htdocs/core/modules/facture/mod_facture_terre.php
index c0497f5fb5c..b2a2f22cd12 100644
--- a/htdocs/core/modules/facture/mod_facture_terre.php
+++ b/htdocs/core/modules/facture/mod_facture_terre.php
@@ -169,7 +169,7 @@ class mod_facture_terre extends ModeleNumRefFactures
 		$sql = "SELECT MAX(CAST(SUBSTRING(facnumber FROM ".$posindice.") AS SIGNED)) as max";	// This is standard SQL
 		$sql.= " FROM ".MAIN_DB_PREFIX."facture";
 		$sql.= " WHERE facnumber LIKE '".$prefix."____-%'";
-		$sql.= " AND entity IN (".getEntity('facture', 1).")";
+		$sql.= " AND entity IN (".getEntity('facture').")";
 
 		$resql=$db->query($sql);
 		dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
@@ -193,7 +193,7 @@ class mod_facture_terre extends ModeleNumRefFactures
             $sql = "SELECT facnumber as ref";
             $sql.= " FROM ".MAIN_DB_PREFIX."facture";
             $sql.= " WHERE facnumber LIKE '".$prefix."____-".$num."'";
-            $sql.= " AND entity IN (".getEntity('facture', 1).")";
+            $sql.= " AND entity IN (".getEntity('facture').")";
 
             dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
             $resql=$db->query($sql);
diff --git a/htdocs/core/modules/mailings/advthirdparties.modules.php b/htdocs/core/modules/mailings/advthirdparties.modules.php
index 737b239498f..497d3c54f54 100644
--- a/htdocs/core/modules/mailings/advthirdparties.modules.php
+++ b/htdocs/core/modules/mailings/advthirdparties.modules.php
@@ -71,7 +71,7 @@ class mailing_advthirdparties extends MailingTargets
 			{
 				$sql= "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact";
 				$sql.= " FROM ".MAIN_DB_PREFIX."societe as s LEFT OUTER JOIN ".MAIN_DB_PREFIX."societe_extrafields se ON se.fk_object=s.rowid";
-				$sql.= " WHERE s.entity IN (".getEntity('societe', 1).")";
+				$sql.= " WHERE s.entity IN (".getEntity('societe').")";
 				$sql.= " AND s.rowid IN (".implode(',',$socid).")";
 				$sql.= " ORDER BY email";
 
@@ -122,7 +122,7 @@ class mailing_advthirdparties extends MailingTargets
 			{
 				$sql= "SELECT socp.rowid as id, socp.email as email, socp.lastname as lastname, socp.firstname as firstname";
 				$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as socp";
-				$sql.= " WHERE socp.entity IN (".getEntity('societe', 1).")";
+				$sql.= " WHERE socp.entity IN (".getEntity('societe').")";
 				if (count($contactid)>0) {
 					$sql.= " AND socp.rowid IN (".implode(',',$contactid).")";
 				}
@@ -211,7 +211,7 @@ class mailing_advthirdparties extends MailingTargets
 		$sql = "SELECT count(distinct(s.email)) as nb";
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 		$sql.= " WHERE s.email != ''";
-		$sql.= " AND s.entity IN (".getEntity('societe', 1).")";
+		$sql.= " AND s.entity IN (".getEntity('societe').")";
 
 		// La requete doit retourner un champ "nb" pour etre comprise
 		// par parent::getNbOfRecipients
diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php
index 02bcc17ec30..0e4966a5ada 100644
--- a/htdocs/core/modules/mailings/contacts1.modules.php
+++ b/htdocs/core/modules/mailings/contacts1.modules.php
@@ -72,7 +72,7 @@ class mailing_contacts1 extends MailingTargets
 		$statssql[0] = "SELECT '".$langs->trans("NbOfCompaniesContacts")."' as label,";
 		$statssql[0].= " count(distinct(c.email)) as nb";
 		$statssql[0].= " FROM ".MAIN_DB_PREFIX."socpeople as c";
-		$statssql[0].= " WHERE c.entity IN (".getEntity('societe', 1).")";
+		$statssql[0].= " WHERE c.entity IN (".getEntity('societe').")";
 		$statssql[0].= " AND c.email != ''";      // Note that null != '' is false
 		$statssql[0].= " AND c.no_email = 0";
 		$statssql[0].= " AND c.statut = 1";
@@ -96,7 +96,7 @@ class mailing_contacts1 extends MailingTargets
 		$sql  = "SELECT count(distinct(c.email)) as nb";
 		$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c";
     	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = c.fk_soc";
-		$sql.= " WHERE c.entity IN (".getEntity('societe', 1).")";
+		$sql.= " WHERE c.entity IN (".getEntity('societe').")";
 		$sql.= " AND c.email != ''"; // Note that null != '' is false
 		$sql.= " AND c.no_email = 0";
 		$sql.= " AND c.statut = 1";
@@ -203,7 +203,7 @@ class mailing_contacts1 extends MailingTargets
 		$sql.= " s.nom as companyname";
 		$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c";
     	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = c.fk_soc";
-		$sql.= " WHERE c.entity IN (".getEntity('societe', 1).")";
+		$sql.= " WHERE c.entity IN (".getEntity('societe').")";
 		$sql.= " AND c.email <> ''";
 		$sql.= " AND c.no_email = 0";
 		$sql.= " AND c.statut = 1";
diff --git a/htdocs/core/modules/mailings/contacts2.modules.php b/htdocs/core/modules/mailings/contacts2.modules.php
index 778b2182e1a..a9c05434cd3 100644
--- a/htdocs/core/modules/mailings/contacts2.modules.php
+++ b/htdocs/core/modules/mailings/contacts2.modules.php
@@ -83,7 +83,7 @@ class mailing_contacts2 extends MailingTargets
         $sql.= " s.nom as companyname";
     	$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
     	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = sp.fk_soc";
-        $sql.= " WHERE sp.entity IN (".getEntity('societe', 1).")";
+        $sql.= " WHERE sp.entity IN (".getEntity('societe').")";
     	$sql.= " AND sp.email <> ''";  // Note that null != '' is false
     	$sql.= " AND sp.no_email = 0";
     	$sql.= " AND sp.statut = 1";
@@ -140,7 +140,7 @@ class mailing_contacts2 extends MailingTargets
             $statssql[$i].= " WHERE s.rowid = sp.fk_soc";
             $statssql[$i].= " AND sp.email != ''";  // Note that null != '' is false
             $statssql[$i].= " AND (sp.poste IS NOT NULL AND sp.poste != '')";
-            $statssql[$i].= " AND sp.entity IN (".getEntity('societe', 1).")";
+            $statssql[$i].= " AND sp.entity IN (".getEntity('societe').")";
             $statssql[$i].= " GROUP BY label";
             $statssql[$i].= " ORDER BY nb DESC";
             $statssql[$i].= " LIMIT $i,1";
@@ -166,7 +166,7 @@ class mailing_contacts2 extends MailingTargets
     	$sql = "SELECT count(distinct(sp.email)) as nb";
     	$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
     	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = sp.fk_soc";
-        $sql.= " WHERE sp.entity IN (".getEntity('societe', 1).")";
+        $sql.= " WHERE sp.entity IN (".getEntity('societe').")";
     	$sql.= " AND sp.email != ''";  // Note that null != '' is false
     	$sql.= " AND sp.no_email = 0";
     	$sql.= " AND sp.statut = 1";
@@ -190,7 +190,7 @@ class mailing_contacts2 extends MailingTargets
 
         $sql = "SELECT sp.poste, count(distinct(sp.email)) AS nb";
         $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
-        $sql.= " WHERE sp.entity IN (".getEntity('societe', 1).")";
+        $sql.= " WHERE sp.entity IN (".getEntity('societe').")";
         $sql.= " AND sp.email != ''";    // Note that null != '' is false
         $sql.= " AND sp.no_email = 0";
         $sql.= " AND sp.statut = 1";
diff --git a/htdocs/core/modules/mailings/contacts3.modules.php b/htdocs/core/modules/mailings/contacts3.modules.php
index 2c142541023..c16f6869668 100644
--- a/htdocs/core/modules/mailings/contacts3.modules.php
+++ b/htdocs/core/modules/mailings/contacts3.modules.php
@@ -86,7 +86,7 @@ class mailing_contacts3 extends MailingTargets
     	$sql.= " WHERE sp.email <> ''";     // Note that null != '' is false
     	$sql.= " AND sp.no_email = 0";
     	$sql.= " AND sp.statut = 1";
-    	$sql.= " AND sp.entity IN (".getEntity('societe', 1).")";
+    	$sql.= " AND sp.entity IN (".getEntity('societe').")";
     	$sql.= " AND sp.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
     	if ($filtersarray[0] <> 'all') $sql.= " AND cs.fk_categorie = c.rowid";
     	if ($filtersarray[0] <> 'all') $sql.= " AND cs.fk_soc = sp.fk_soc";
@@ -143,7 +143,7 @@ class mailing_contacts3 extends MailingTargets
             $statssql[$i].= " ".MAIN_DB_PREFIX."categorie_societe as cs";
             $statssql[$i].= " WHERE s.rowid = sp.fk_soc";
             $statssql[$i].= " AND sp.email != ''";    // Note that null != '' is false
-            $statssql[$i].= " AND sp.entity IN (".getEntity('societe', 1).")";
+            $statssql[$i].= " AND sp.entity IN (".getEntity('societe').")";
             $statssql[$i].= " AND cs.fk_categorie = c.rowid";
             $statssql[$i].= " AND cs.fk_soc = sp.fk_soc";
             $statssql[$i].= " GROUP BY c.label";
@@ -171,7 +171,7 @@ class mailing_contacts3 extends MailingTargets
     	$sql = "SELECT count(distinct(c.email)) as nb";
         $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c";
     	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = c.fk_soc";
-        $sql.= " WHERE c.entity IN (".getEntity('societe', 1).")";
+        $sql.= " WHERE c.entity IN (".getEntity('societe').")";
         $sql.= " AND c.email != ''"; // Note that null != '' is false
         $sql.= " AND c.no_email = 0";
         $sql.= " AND c.statut = 1";
@@ -182,7 +182,7 @@ class mailing_contacts3 extends MailingTargets
         $sql.= " ".MAIN_DB_PREFIX."categorie as c,";
         $sql.= " ".MAIN_DB_PREFIX."categorie_societe as cs";
         $sql.= " WHERE s.rowid = sp.fk_soc";
-        $sql.= " AND sp.entity IN (".getEntity('societe', 1).")";
+        $sql.= " AND sp.entity IN (".getEntity('societe').")";
         $sql.= " AND sp.email != ''"; // Note that null != '' is false
         $sql.= " AND cs.fk_categorie = c.rowid";
         $sql.= " AND cs.fk_soc = sp.fk_soc";
@@ -211,7 +211,7 @@ class mailing_contacts3 extends MailingTargets
         $sql.= " WHERE sp.email != ''";     // Note that null != '' is false
         $sql.= " AND sp.no_email = 0";
         $sql.= " AND sp.statut = 1";
-        $sql.= " AND sp.entity IN (".getEntity('societe', 1).")";
+        $sql.= " AND sp.entity IN (".getEntity('societe').")";
         $sql.= " AND cs.fk_categorie = c.rowid";
         $sql.= " AND cs.fk_soc = sp.fk_soc";
         $sql.= " GROUP BY c.label";
diff --git a/htdocs/core/modules/mailings/contacts4.modules.php b/htdocs/core/modules/mailings/contacts4.modules.php
index a79d48a03e4..f4c67874bfb 100644
--- a/htdocs/core/modules/mailings/contacts4.modules.php
+++ b/htdocs/core/modules/mailings/contacts4.modules.php
@@ -86,7 +86,7 @@ class mailing_contacts4 extends MailingTargets
     	$sql.= " WHERE sp.email != ''";     // Note that null != '' is false
     	$sql.= " AND sp.no_email = 0";
     	$sql.= " AND sp.statut = 1";
-    	$sql.= " AND sp.entity IN (".getEntity('societe', 1).")";
+    	$sql.= " AND sp.entity IN (".getEntity('societe').")";
     	if ($filtersarray[0] <> 'all') $sql.= " AND c.label = '".$this->db->escape($filtersarray[0])."'";
     	$sql.= " ORDER BY sp.lastname, sp.firstname";
 
@@ -144,7 +144,7 @@ class mailing_contacts4 extends MailingTargets
             $statssql[$i].= " ".MAIN_DB_PREFIX."categorie_societe as cs";
             $statssql[$i].= " WHERE s.rowid = sp.fk_soc";
             $statssql[$i].= " AND sp.email != ''";    // Note that null != '' is false
-            $statssql[$i].= " AND sp.entity IN (".getEntity('societe', 1).")";
+            $statssql[$i].= " AND sp.entity IN (".getEntity('societe').")";
             $statssql[$i].= " AND cs.fk_categorie = c.rowid";
             $statssql[$i].= " AND cs.fk_soc = sp.fk_soc";
             $statssql[$i].= " GROUP BY c.label";
@@ -171,7 +171,7 @@ class mailing_contacts4 extends MailingTargets
         // If we want a filter "is inside at least one category", we must add it into formFilter
     	$sql = "SELECT count(distinct(c.email)) as nb";
         $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c";
-        $sql.= " WHERE c.entity IN (".getEntity('societe', 1).")";
+        $sql.= " WHERE c.entity IN (".getEntity('societe').")";
         $sql.= " AND c.email != ''"; // Note that null != '' is false
         $sql.= " AND c.no_email = 0";
         $sql.= " AND c.statut = 1";
@@ -182,7 +182,7 @@ class mailing_contacts4 extends MailingTargets
         $sql.= " ".MAIN_DB_PREFIX."categorie as c,";
         $sql.= " ".MAIN_DB_PREFIX."categorie_societe as cs";
         $sql.= " WHERE s.rowid = sp.fk_soc";
-        $sql.= " AND sp.entity IN (".getEntity('societe', 1).")";
+        $sql.= " AND sp.entity IN (".getEntity('societe').")";
         $sql.= " AND sp.email != ''"; // Note that null != '' is false
         $sql.= " AND cs.fk_categorie = c.rowid";
         $sql.= " AND cs.fk_soc = sp.fk_soc";
@@ -211,7 +211,7 @@ class mailing_contacts4 extends MailingTargets
         $sql.= " WHERE sp.email != ''";     // Note that null != '' is false
         $sql.= " AND sp.no_email = 0";
         $sql.= " AND sp.statut = 1";
-        $sql.= " AND sp.entity IN (".getEntity('societe', 1).")";
+        $sql.= " AND sp.entity IN (".getEntity('societe').")";
         $sql.= " GROUP BY c.label";
         $sql.= " ORDER BY c.label";
 
diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index 2f9be84aab4..e1d3cd5861c 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -65,7 +65,7 @@ class mailing_thirdparties extends MailingTargets
 		    $sql = "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, null as label";
 		    $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 		    $sql.= " WHERE s.email <> ''";
-		    $sql.= " AND s.entity IN (".getEntity('societe', 1).")";
+		    $sql.= " AND s.entity IN (".getEntity('societe').")";
 		    $sql.= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
 		}
 		else
@@ -73,7 +73,7 @@ class mailing_thirdparties extends MailingTargets
 		    $sql = "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, c.label as label";
 		    $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."categorie_societe as cs, ".MAIN_DB_PREFIX."categorie as c";
 		    $sql.= " WHERE s.email <> ''";
-		    $sql.= " AND s.entity IN (".getEntity('societe', 1).")";
+		    $sql.= " AND s.entity IN (".getEntity('societe').")";
 		    $sql.= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
 		    $sql.= " AND cs.fk_soc = s.rowid";
 		    $sql.= " AND c.rowid = cs.fk_categorie";
@@ -82,7 +82,7 @@ class mailing_thirdparties extends MailingTargets
 		    $sql.= "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, c.label as label";
 		    $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."categorie_fournisseur as cs, ".MAIN_DB_PREFIX."categorie as c";
 		    $sql.= " WHERE s.email <> ''";
-		    $sql.= " AND s.entity IN (".getEntity('societe', 1).")";
+		    $sql.= " AND s.entity IN (".getEntity('societe').")";
 		    $sql.= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
 		    $sql.= " AND cs.fk_soc = s.rowid";
 		    $sql.= " AND c.rowid = cs.fk_categorie";
@@ -167,7 +167,7 @@ class mailing_thirdparties extends MailingTargets
 		$sql = "SELECT count(distinct(s.email)) as nb";
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 		$sql.= " WHERE s.email != ''";
-		$sql.= " AND s.entity IN (".getEntity('societe', 1).")";
+		$sql.= " AND s.entity IN (".getEntity('societe').")";
 
 		// La requete doit retourner un champ "nb" pour etre comprise
 		// par parent::getNbOfRecipients
diff --git a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
index 21a37301e38..786cfa1f756 100644
--- a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
@@ -48,7 +48,7 @@ class mailing_thirdparties_services_expired extends MailingTargets
 
         // List of services
         $sql = "SELECT ref FROM ".MAIN_DB_PREFIX."product";
-        $sql.= " WHERE entity IN (".getEntity('product', 1).")";
+        $sql.= " WHERE entity IN (".getEntity('product').")";
         if (empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $sql.= " AND fk_product_type = 1";	// By default, only services
         $sql.= " ORDER BY ref";
         $result=$this->db->query($sql);
@@ -102,7 +102,7 @@ class mailing_thirdparties_services_expired extends MailingTargets
         $sql = "SELECT s.rowid as id, s.email, s.nom as name, cd.rowid as cdid, cd.date_ouverture, cd.date_fin_validite, cd.fk_contrat";
         $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
         $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."product as p";
-        $sql.= " WHERE s.entity IN (".getEntity('societe', 1).")";
+        $sql.= " WHERE s.entity IN (".getEntity('societe').")";
         $sql.= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
         $sql.= " AND s.rowid = c.fk_soc AND cd.fk_contrat = c.rowid AND s.email != ''";
         $sql.= " AND cd.statut= 4 AND cd.fk_product=p.rowid AND p.ref = '".$product."'";
@@ -192,7 +192,7 @@ class mailing_thirdparties_services_expired extends MailingTargets
         $sql = "SELECT count(*) as nb";
         $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
         $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."product as p";
-        $sql.= " WHERE s.entity IN (".getEntity('societe', 1).")";
+        $sql.= " WHERE s.entity IN (".getEntity('societe').")";
         $sql.= " AND s.rowid = c.fk_soc AND cd.fk_contrat = c.rowid AND s.email != ''";
         $sql.= " AND cd.statut= 4 AND cd.fk_product=p.rowid";
         $sql.= " AND p.ref IN ('".join("','",$this->arrayofproducts)."')";
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index 9204cd02aa0..1780da06456 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -295,7 +295,7 @@ class modAccounting extends DolibarrModules
 
         $this->export_sql_start[$r]='SELECT DISTINCT ';
         $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'accounting_account as aa, '.MAIN_DB_PREFIX.'accounting_system as ac';
-        $this->export_sql_end[$r] .=' WHERE ac.pcg_version = aa.fk_pcg_version AND aa.entity IN ('.getEntity('accounting', 1).') ';
+        $this->export_sql_end[$r] .=' WHERE ac.pcg_version = aa.fk_pcg_version AND aa.entity IN ('.getEntity('accounting').') ';
 
 	}
 }
diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php
index b75d674b41f..041892c35ee 100644
--- a/htdocs/core/modules/modAdherent.class.php
+++ b/htdocs/core/modules/modAdherent.class.php
@@ -290,7 +290,7 @@ class modAdherent extends DolibarrModules
         $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'subscription as c ON c.fk_adherent = a.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON a.state_id = d.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON a.country = co.rowid';
-        $this->export_sql_end[$r] .=' WHERE a.fk_adherent_type = ta.rowid AND ta.entity IN ('.getEntity('adherent', 1).') ';
+        $this->export_sql_end[$r] .=' WHERE a.fk_adherent_type = ta.rowid AND ta.entity IN ('.getEntity('adherent').') ';
         $this->export_dependencies_array[$r]=array('subscription'=>'c.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 
         // Imports
diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index 339a208fc31..7513b489195 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -401,7 +401,7 @@ class modAgenda extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s on ac.fk_soc = s.rowid';
 		if (! empty($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co on s.fk_pays = co.rowid';
-		$this->export_sql_end[$r] .=' WHERE ac.entity IN ('.getEntity('agenda',1).')';
+		$this->export_sql_end[$r] .=' WHERE ac.entity IN ('.getEntity('agenda').')';
 		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND (sc.fk_user = '.(empty($user)?0:$user->id).' OR ac.fk_soc IS NULL)';
 		if (empty($user->rights->agenda->allactions->read)) $this->export_sql_end[$r] .=' AND acr.fk_element = '.(empty($user)?0:$user->id);
 		$this->export_sql_end[$r] .=' ORDER BY ac.datep';
diff --git a/htdocs/core/modules/modBanque.class.php b/htdocs/core/modules/modBanque.class.php
index a868bfd2f08..c9fde5f0087 100644
--- a/htdocs/core/modules/modBanque.class.php
+++ b/htdocs/core/modules/modBanque.class.php
@@ -162,7 +162,7 @@ class modBanque extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX."bank_url as bu ON (bu.fk_bank = b.rowid AND bu.type = 'company')";
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON bu.url_id = s.rowid';
 		$this->export_sql_end[$r] .=' WHERE ba.rowid = b.fk_account';
-		$this->export_sql_end[$r] .=' AND ba.entity IN ('.getEntity('bank_account',1).')';
+		$this->export_sql_end[$r] .=' AND ba.entity IN ('.getEntity('bank_account').')';
 		$this->export_sql_order[$r] =' ORDER BY b.datev, b.num_releve';
 
 		$r++;
@@ -189,7 +189,7 @@ class modBanque extends DolibarrModules
 		$this->export_sql_end[$r] .=' WHERE ba.rowid = b.fk_account AND bch.rowid = b.fk_bordereau and bch.fk_bank_account=ba.rowid';
 		$this->export_sql_end[$r] .=" AND b.fk_type = 'CHQ'";
 		$this->export_sql_end[$r] .=' AND p.fk_paiement = 7';
-		$this->export_sql_end[$r] .=' AND ba.entity IN ('.getEntity('bank_account',1).')';
+		$this->export_sql_end[$r] .=' AND ba.entity IN ('.getEntity('bank_account').')';
 		$this->export_sql_order[$r] =' ORDER BY b.datev, b.num_releve';
 
 	}
diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php
index edda1043d71..b56d405c354 100644
--- a/htdocs/core/modules/modCategorie.class.php
+++ b/htdocs/core/modules/modCategorie.class.php
@@ -129,7 +129,7 @@ class modCategorie extends DolibarrModules
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'categorie as u, '.MAIN_DB_PREFIX.'categorie_fournisseur as cf, '.MAIN_DB_PREFIX.'societe as s LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as t ON s.fk_typent = t.id LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as ce ON s.fk_effectif = ce.id LEFT JOIN '.MAIN_DB_PREFIX.'c_forme_juridique as cfj ON s.fk_forme_juridique = cfj.code';
 		$this->export_sql_end[$r] .=' WHERE u.rowid = cf.fk_categorie AND cf.fk_soc = s.rowid';
-		$this->export_sql_end[$r] .=' AND u.entity IN ('.getEntity('category',1).')';
+		$this->export_sql_end[$r] .=' AND u.entity IN ('.getEntity('category').')';
 		$this->export_sql_end[$r] .=' AND u.type = 1';	// Supplier categories
 
 		$r++;
@@ -144,7 +144,7 @@ class modCategorie extends DolibarrModules
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'categorie as u, '.MAIN_DB_PREFIX.'categorie_societe as cf, '.MAIN_DB_PREFIX.'societe as s LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as t ON s.fk_typent = t.id LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as ce ON s.fk_effectif = ce.id LEFT JOIN '.MAIN_DB_PREFIX.'c_forme_juridique as cfj ON s.fk_forme_juridique = cfj.code LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra ON s.rowid = extra.fk_object ';
 		$this->export_sql_end[$r] .=' WHERE u.rowid = cf.fk_categorie AND cf.fk_soc = s.rowid';
-		$this->export_sql_end[$r] .=' AND u.entity IN ('.getEntity('category',1).')';
+		$this->export_sql_end[$r] .=' AND u.entity IN ('.getEntity('category').')';
 		$this->export_sql_end[$r] .=' AND u.type = 2';	// Customer/Prospect categories
 
         // Add extra fields
@@ -201,7 +201,7 @@ class modCategorie extends DolibarrModules
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'categorie as u, '.MAIN_DB_PREFIX.'categorie_product as cp, '.MAIN_DB_PREFIX.'product as p';
 		$this->export_sql_end[$r] .=' WHERE u.rowid = cp.fk_categorie AND cp.fk_product = p.rowid';
-		$this->export_sql_end[$r] .=' AND u.entity IN ('.getEntity('category',1).')';
+		$this->export_sql_end[$r] .=' AND u.entity IN ('.getEntity('category').')';
 		$this->export_sql_end[$r] .=' AND u.type = 0';	// Supplier categories
 
 		$r++;
@@ -216,7 +216,7 @@ class modCategorie extends DolibarrModules
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'categorie as u, '.MAIN_DB_PREFIX.'categorie_member as cp, '.MAIN_DB_PREFIX.'adherent as p';
 		$this->export_sql_end[$r] .=' WHERE u.rowid = cp.fk_categorie AND cp.fk_member = p.rowid';
-		$this->export_sql_end[$r] .=' AND u.entity IN ('.getEntity('category',1).')';
+		$this->export_sql_end[$r] .=' AND u.entity IN ('.getEntity('category').')';
 		$this->export_sql_end[$r] .=' AND u.type = 3';	// Member categories
 
 		$r++;
@@ -352,7 +352,7 @@ class modCategorie extends DolibarrModules
 		$this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'c_country as country ON p.fk_pays = country.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'societe as s ON s.rowid = p.fk_soc';
         $this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'socpeople_extrafields as extra ON extra.fk_object = p.rowid';
-		$this->export_sql_end[$r] .= ' WHERE u.rowid = cp.fk_categorie AND cp.fk_socpeople = p.rowid AND u.entity IN ('.getEntity('category',1).')';
+		$this->export_sql_end[$r] .= ' WHERE u.rowid = cp.fk_categorie AND cp.fk_socpeople = p.rowid AND u.entity IN ('.getEntity('category').')';
 		$this->export_sql_end[$r] .= ' AND u.type = 4'; // contact categories
 
 		// Imports
diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
index 1806bfdea71..e80833ae7c4 100644
--- a/htdocs/core/modules/modCommande.class.php
+++ b/htdocs/core/modules/modCommande.class.php
@@ -217,7 +217,7 @@ class modCommande extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on cd.fk_product = p.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra3 on p.rowid = extra3.fk_object';
 		$this->export_sql_end[$r] .=' WHERE c.fk_soc = s.rowid AND c.rowid = cd.fk_commande';
-		$this->export_sql_end[$r] .=' AND c.entity IN ('.getEntity('commande',1).')';
+		$this->export_sql_end[$r] .=' AND c.entity IN ('.getEntity('commande').')';
 		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND sc.fk_user = '.(empty($user)?0:$user->id);
 	}
 
diff --git a/htdocs/core/modules/modContrat.class.php b/htdocs/core/modules/modContrat.class.php
index 52127c4e6f4..1b17b773c77 100644
--- a/htdocs/core/modules/modContrat.class.php
+++ b/htdocs/core/modules/modContrat.class.php
@@ -200,7 +200,7 @@ class modContrat extends DolibarrModules
 		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'contratdet as cod';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (cod.fk_product = p.rowid)';
 		$this->export_sql_end[$r] .=' WHERE co.fk_soc = s.rowid and co.rowid = cod.fk_contrat';
-		$this->export_sql_end[$r] .=' AND co.entity IN ('.getEntity('contract',1).')';
+		$this->export_sql_end[$r] .=' AND co.entity IN ('.getEntity('contract').')';
 	}
 
 
diff --git a/htdocs/core/modules/modDeplacement.class.php b/htdocs/core/modules/modDeplacement.class.php
index 9563e11aaa2..ec8d665b1e0 100644
--- a/htdocs/core/modules/modDeplacement.class.php
+++ b/htdocs/core/modules/modDeplacement.class.php
@@ -132,7 +132,7 @@ class modDeplacement extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON d.fk_soc = s.rowid';
 		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
 		$this->export_sql_end[$r] .=' WHERE d.fk_user = u.rowid';
-		$this->export_sql_end[$r] .=' AND d.entity IN ('.getEntity('deplacement',1).')';
+		$this->export_sql_end[$r] .=' AND d.entity IN ('.getEntity('deplacement').')';
 		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND (sc.fk_user = '.(empty($user)?0:$user->id).' OR d.fk_soc IS NULL)';
 		
 		if (! empty($user))   // Not defined during migration process
diff --git a/htdocs/core/modules/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php
index 7320eba6736..94c86e6e3b1 100644
--- a/htdocs/core/modules/modExpedition.class.php
+++ b/htdocs/core/modules/modExpedition.class.php
@@ -277,7 +277,7 @@ class modExpedition extends DolibarrModules
 		  $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra3 ON sp.rowid = extra3.fk_object';
 		}
 		$this->export_sql_end[$r] .=' WHERE c.fk_soc = s.rowid AND c.rowid = ed.fk_expedition AND ed.fk_origin_line = cd.rowid';
-		$this->export_sql_end[$r] .=' AND c.entity IN ('.getEntity('expedition',1).')';
+		$this->export_sql_end[$r] .=' AND c.entity IN ('.getEntity('expedition').')';
 		if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
 	}
 
diff --git a/htdocs/core/modules/modExpenseReport.class.php b/htdocs/core/modules/modExpenseReport.class.php
index 0d9b808fb6a..cbaf141809f 100644
--- a/htdocs/core/modules/modExpenseReport.class.php
+++ b/htdocs/core/modules/modExpenseReport.class.php
@@ -186,7 +186,7 @@ class modExpenseReport extends DolibarrModules
 		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'expensereport_det as ed LEFT JOIN '.MAIN_DB_PREFIX.'c_type_fees as tf ON ed.fk_c_type_fees = tf.id';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'projet as p ON ed.fk_projet = p.rowid';
 		$this->export_sql_end[$r] .=' WHERE ed.fk_expensereport = d.rowid AND d.fk_user_author = u.rowid';
-		$this->export_sql_end[$r] .=' AND d.entity IN ('.getEntity('expensereport',1).')';
+		$this->export_sql_end[$r] .=' AND d.entity IN ('.getEntity('expensereport').')';
 	}
 
 	/**
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index b16c7749e40..3af85a1944d 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -241,7 +241,7 @@ class modFacture extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra3 on p.rowid = extra3.fk_object';
 		$this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
-		$this->export_sql_end[$r] .=' AND f.entity IN ('.getEntity('facture',1).')';
+		$this->export_sql_end[$r] .=' AND f.entity IN ('.getEntity('facture').')';
 		if(isset($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
 		$r++;
 
@@ -271,7 +271,7 @@ class modFacture extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON b.rowid = p.fk_bank';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON ba.rowid = b.fk_account';
 		$this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid';
-		$this->export_sql_end[$r] .=' AND f.entity IN ('.getEntity('facture',1).')';
+		$this->export_sql_end[$r] .=' AND f.entity IN ('.getEntity('facture').')';
 		if (isset($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
 		$r++;
 	}
diff --git a/htdocs/core/modules/modFicheinter.class.php b/htdocs/core/modules/modFicheinter.class.php
index 55deaf2403f..0d9f73b76e4 100644
--- a/htdocs/core/modules/modFicheinter.class.php
+++ b/htdocs/core/modules/modFicheinter.class.php
@@ -172,7 +172,7 @@ class modFicheinter extends DolibarrModules
         $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'fichinterdet as fd ON f.rowid = fd.fk_fichinter,';
         $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'societe as s';
         $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid';
-        $this->export_sql_end[$r] .=' AND f.entity IN ('.getEntity('intervention',1).')';
+        $this->export_sql_end[$r] .=' AND f.entity IN ('.getEntity('intervention').')';
         $r++;
 
     }
diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index fc2572d3669..233b1601842 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -380,7 +380,7 @@ class modFournisseur extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn_det_extrafields as extraline ON fd.rowid = extraline.fk_object';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
 		$this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture_fourn';
-		$this->export_sql_end[$r] .=' AND f.entity IN ('.getEntity('supplier_invoice',1).')';
+		$this->export_sql_end[$r] .=' AND f.entity IN ('.getEntity('supplier_invoice').')';
 		if (is_object($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
 
 		$r++;
@@ -443,7 +443,7 @@ class modFournisseur extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON pf.fk_facturefourn = f.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn as p ON pf.fk_paiementfourn = p.rowid';
 		$this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid';
-        $this->export_sql_end[$r] .=' AND f.entity IN ('.getEntity('supplier_invoice',1).')';
+        $this->export_sql_end[$r] .=' AND f.entity IN ('.getEntity('supplier_invoice').')';
 		if (is_object($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
 
 		// Order
@@ -552,7 +552,7 @@ class modFournisseur extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'commande_fournisseurdet_extrafields as extraline ON fd.rowid = extraline.fk_object';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
 		$this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_commande';
-		$this->export_sql_end[$r] .=' AND f.entity IN ('.getEntity('supplier_order',1).')';
+		$this->export_sql_end[$r] .=' AND f.entity IN ('.getEntity('supplier_order').')';
 		if (is_object($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
 	}
 
diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index 30e64b5de2c..dae39fc00d4 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -187,7 +187,7 @@ class modProduct extends DolibarrModules
 		if (! empty($conf->global->MAIN_MULTILANGS)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_lang as l ON l.fk_product = p.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra ON p.rowid = extra.fk_object';
 		if (! empty($conf->fournisseur->enabled)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_fournisseur_price as pf ON pf.fk_product = p.rowid LEFT JOIN '.MAIN_DB_PREFIX.'societe s ON s.rowid = pf.fk_soc';
-		$this->export_sql_end[$r] .=' WHERE p.fk_product_type = 0 AND p.entity IN ('.getEntity("product", 1).')';
+		$this->export_sql_end[$r] .=' WHERE p.fk_product_type = 0 AND p.entity IN ('.getEntity('product').')';
 		if (! empty($conf->global->EXPORTTOOL_CATEGORIES)) $this->export_sql_order[$r] =' GROUP BY p.rowid'; 	// FIXME The group by used a generic value to say "all fields in select except function fields"
 		    
 		if (! empty($conf->global->PRODUIT_MULTIPRICES))
@@ -215,7 +215,7 @@ class modProduct extends DolibarrModules
 			$this->export_sql_start[$r]='SELECT DISTINCT ';
 			$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'product as p';
 			$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_price as pr ON p.rowid = pr.fk_product';
-			$this->export_sql_end[$r] .=' WHERE p.fk_product_type = 0 AND p.entity IN ('.getEntity("product", 1).')';
+			$this->export_sql_end[$r] .=' WHERE p.fk_product_type = 0 AND p.entity IN ('.getEntity('product').')';
 		}
 
 		if (! empty($conf->global->PRODUIT_SOUSPRODUITS))
@@ -244,7 +244,7 @@ class modProduct extends DolibarrModules
     		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'product as p';
     		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra ON p.rowid = extra.fk_object,';
     		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'product_association as pa, '.MAIN_DB_PREFIX.'product as p2';
-    		$this->export_sql_end[$r] .=' WHERE p.fk_product_type = 0 AND p.entity IN ('.getEntity("product", 1).')';
+    		$this->export_sql_end[$r] .=' WHERE p.fk_product_type = 0 AND p.entity IN ('.getEntity('product').')';
     		$this->export_sql_end[$r] .=' AND p.rowid = pa.fk_product_pere AND p2.rowid = pa.fk_product_fils';
 		}		
 
diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php
index 96e5a96b384..071912e1c00 100644
--- a/htdocs/core/modules/modProjet.class.php
+++ b/htdocs/core/modules/modProjet.class.php
@@ -231,7 +231,7 @@ class modProjet extends DolibarrModules
 	    // Add multicompany field
         if (! empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED))
         {
-            $nbofallowedentities=count(explode(',',getEntity('project',1)));    // If project are shared, nb will be > 1
+            $nbofallowedentities=count(explode(',',getEntity('project')));    // If project are shared, nb will be > 1
             if (! empty($conf->multicompany->enabled) && $nbofallowedentities > 1) $this->export_fields_array[$r]+=array('p.entity'=>'Entity');
         }
 		if (empty($conf->global->PROJECT_USE_OPPORTUNITIES))
diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php
index 3dd39b336bc..43ba37aa26e 100644
--- a/htdocs/core/modules/modPropale.class.php
+++ b/htdocs/core/modules/modPropale.class.php
@@ -209,7 +209,7 @@ class modPropale extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (cd.fk_product = p.rowid)';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra3 on p.rowid = extra3.fk_object';
 		$this->export_sql_end[$r] .=' WHERE c.fk_soc = s.rowid AND c.rowid = cd.fk_propal';
-		$this->export_sql_end[$r] .=' AND c.entity IN ('.getEntity('propal',1).')';
+		$this->export_sql_end[$r] .=' AND c.entity IN ('.getEntity('propal').')';
 		if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
 	}
 
diff --git a/htdocs/core/modules/modResource.class.php b/htdocs/core/modules/modResource.class.php
index 020fa92e9f3..7ab7afc1e4b 100644
--- a/htdocs/core/modules/modResource.class.php
+++ b/htdocs/core/modules/modResource.class.php
@@ -271,7 +271,7 @@ class modResource extends DolibarrModules
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'resource as r ';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_type_resource as c ON c.rowid=r.fk_code_type_resource';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'resource_extrafields as extra ON extra.fk_object = c.rowid';
-		$this->export_sql_end[$r] .=' AND r.entity IN ('.getEntity('resource',1).')';
+		$this->export_sql_end[$r] .=' AND r.entity IN ('.getEntity('resource').')';
 		
 
 		// Imports
diff --git a/htdocs/core/modules/modSalaries.class.php b/htdocs/core/modules/modSalaries.class.php
index d5e982bcccc..bf37a7e73d8 100644
--- a/htdocs/core/modules/modSalaries.class.php
+++ b/htdocs/core/modules/modSalaries.class.php
@@ -158,7 +158,7 @@ class modSalaries extends DolibarrModules
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'user as u';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'payment_salary as p ON p.fk_user = u.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as cp ON p.fk_typepayment = cp.id';
-		$this->export_sql_end[$r] .=' AND u.entity IN ('.getEntity('user',1).')';
+		$this->export_sql_end[$r] .=' AND u.entity IN ('.getEntity('user').')';
 	}
 
 
diff --git a/htdocs/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php
index c385ece4b26..f9c6a608085 100644
--- a/htdocs/core/modules/modService.class.php
+++ b/htdocs/core/modules/modService.class.php
@@ -194,7 +194,7 @@ class modService extends DolibarrModules
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'product as p';
         $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra ON p.rowid = extra.fk_object';
 		if (! empty($conf->fournisseur->enabled)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_fournisseur_price as pf ON pf.fk_product = p.rowid LEFT JOIN '.MAIN_DB_PREFIX.'societe s ON s.rowid = pf.fk_soc';
-        $this->export_sql_end[$r] .=' WHERE p.fk_product_type = 1 AND p.entity IN ('.getEntity("product", 1).')';
+        $this->export_sql_end[$r] .=' WHERE p.fk_product_type = 1 AND p.entity IN ('.getEntity('product').')';
 
 
 		if (empty($conf->product->enabled))	// We enable next import templates only if module product not already enabled (to avoid duplicate entries)
@@ -222,7 +222,7 @@ class modService extends DolibarrModules
 				$this->export_sql_start[$r]='SELECT DISTINCT ';
 				$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'product as p';
 				$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_price as pr ON p.rowid = pr.fk_product';
-				$this->export_sql_end[$r] .=' WHERE p.fk_product_type = 0 AND p.entity IN ('.getEntity("product", 1).')';
+				$this->export_sql_end[$r] .=' WHERE p.fk_product_type = 0 AND p.entity IN ('.getEntity('product').')';
 			}
 		}
 
diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index a2239514898..c4c93537444 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -263,7 +263,7 @@ class modSociete extends DolibarrModules
 		// Add multicompany field
 		if (! empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED))
 		{
-		    $nbofallowedentities=count(explode(',',getEntity('societe',1)));    // If project are shared, nb will be > 1
+		    $nbofallowedentities=count(explode(',',getEntity('societe')));    // If project are shared, nb will be > 1
 		    if (! empty($conf->multicompany->enabled) && $nbofallowedentities > 1) $this->export_fields_array[$r]+=array('s.entity'=>'Entity');
 		}
 		$keyforselect='societe'; $keyforelement='company'; $keyforaliasextra='extra';
@@ -286,7 +286,7 @@ class modSociete extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON sc.fk_user = u.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as payterm ON s.cond_reglement = payterm.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as paymode ON s.mode_reglement = paymode.id';
-		$this->export_sql_end[$r] .=' WHERE s.entity IN ('.getEntity('societe', 1).')';
+		$this->export_sql_end[$r] .=' WHERE s.entity IN ('.getEntity('societe').')';
 		if (is_object($user) && empty($user->rights->societe->client->voir)) {
 			$this->export_sql_end[$r] .=' AND (sc.fk_user = '.$user->id.' ';
 			if (! empty($conf->global->SOCIETE_EXPORT_SUBORDINATES_CHILDS)) {
@@ -323,7 +323,7 @@ class modSociete extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON c.fk_departement = d.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON c.fk_pays = co.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra ON extra.fk_object = c.rowid';
-		$this->export_sql_end[$r] .=' WHERE c.entity IN ('.getEntity("societe", 1).')';
+		$this->export_sql_end[$r] .=' WHERE c.entity IN ('.getEntity('societe').')';
 		if (is_object($user) && empty($user->rights->societe->client->voir)) {
 			$this->export_sql_end[$r] .=' AND (sc.fk_user = '.$user->id.' ';
 			if (! empty($conf->global->SOCIETE_EXPORT_SUBORDINATES_CHILDS)) {
diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index be6817062b6..8362343f8cb 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -176,7 +176,7 @@ class modStock extends DolibarrModules
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'product as p, '.MAIN_DB_PREFIX.'product_stock as ps, '.MAIN_DB_PREFIX.'entrepot as e';
 		$this->export_sql_end[$r] .=' WHERE p.rowid = ps.fk_product AND ps.fk_entrepot = e.rowid';
-		$this->export_sql_end[$r] .=' AND e.entity IN ('.getEntity('stock',1).')';
+		$this->export_sql_end[$r] .=' AND e.entity IN ('.getEntity('stock').')';
 
 		if ($conf->productbatch->enabled)
 		{
@@ -196,7 +196,7 @@ class modStock extends DolibarrModules
 			$this->export_sql_start[$r]='SELECT DISTINCT ';
 			$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'product as p, '.MAIN_DB_PREFIX.'product_stock as ps, '.MAIN_DB_PREFIX.'entrepot as e, '.MAIN_DB_PREFIX.'product_batch as pb';
 			$this->export_sql_end[$r] .=' WHERE p.rowid = ps.fk_product AND ps.fk_entrepot = e.rowid AND ps.rowid = pb.fk_product_stock';
-			$this->export_sql_end[$r] .=' AND e.entity IN ('.getEntity('stock',1).')';
+			$this->export_sql_end[$r] .=' AND e.entity IN ('.getEntity('stock').')';
 		}
 
 		// Imports
diff --git a/htdocs/core/modules/modTax.class.php b/htdocs/core/modules/modTax.class.php
index bb8f31e466d..8dfc7283b90 100644
--- a/htdocs/core/modules/modTax.class.php
+++ b/htdocs/core/modules/modTax.class.php
@@ -139,7 +139,7 @@ class modTax extends DolibarrModules
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'c_chargesociales as cc, '.MAIN_DB_PREFIX.'chargesociales as c';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiementcharge as p ON p.fk_charge = c.rowid';
 		$this->export_sql_end[$r] .=' WHERE c.fk_type = cc.id';
-		$this->export_sql_end[$r] .=' AND c.entity IN ('.getEntity('tax',1).')';
+		$this->export_sql_end[$r] .=' AND c.entity IN ('.getEntity('tax').')';
 		
 		// Import social contributions
 		$r++;
diff --git a/htdocs/core/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php
index 55d4d45d28e..1bd4281b507 100644
--- a/htdocs/core/modules/modUser.class.php
+++ b/htdocs/core/modules/modUser.class.php
@@ -229,7 +229,7 @@ class modUser extends DolibarrModules
         }
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'user as u';
-		$this->export_sql_end[$r] .=' WHERE u.entity IN ('.getEntity('user',1).')';
+		$this->export_sql_end[$r] .=' WHERE u.entity IN ('.getEntity('user').')';
 		
 		// Imports
 		//--------
diff --git a/htdocs/core/modules/societe/mod_codeclient_monkey.php b/htdocs/core/modules/societe/mod_codeclient_monkey.php
index 88ec1a6e8db..e942e747794 100644
--- a/htdocs/core/modules/societe/mod_codeclient_monkey.php
+++ b/htdocs/core/modules/societe/mod_codeclient_monkey.php
@@ -123,7 +123,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
         $sql = "SELECT MAX(CAST(SUBSTRING(".$field." FROM ".$posindice.") AS SIGNED)) as max";   // This is standard SQL
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe";
 		$sql.= " WHERE ".$field." LIKE '".$prefix."____-%'";
-		$sql.= " AND entity IN (".getEntity('societe', 1).")";
+		$sql.= " AND entity IN (".getEntity('societe').")";
 
 		dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
 
@@ -224,7 +224,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 
 		$sql = "SELECT code_client FROM ".MAIN_DB_PREFIX."societe";
 		$sql.= " WHERE code_client = '".$code."'";
-		$sql.= " AND entity IN (".getEntity('societe', 1).")";
+		$sql.= " AND entity IN (".getEntity('societe').")";
 		if ($soc->id > 0) $sql.= " AND rowid <> ".$soc->id;
 
 		dol_syslog(get_class($this)."::verif_dispo", LOG_DEBUG);
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index bfcbd6b7059..695314bb526 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -818,7 +818,7 @@ class Don extends CommonObject
         $sql = "SELECT count(d.rowid) as nb";
         $sql.= " FROM ".MAIN_DB_PREFIX."don as d";
         $sql.= " WHERE d.fk_statut > 0";
-        $sql.= " AND d.entity IN (".getEntity('don', 1).")";
+        $sql.= " AND d.entity IN (".getEntity('don').")";
 
         $resql=$this->db->query($sql);
         if ($resql)
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index a48d3171020..9a8c503ac2e 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -263,7 +263,7 @@ class EcmFiles //extends CommonObject
 		$sql.= ' WHERE 1 = 1';
 		/* Fetching this table depends on filepath+filename, it must not depends on entity
 		if (! empty($conf->multicompany->enabled)) {
-		    $sql .= " AND entity IN (" . getEntity("ecmfiles", 1) . ")";
+		    $sql .= " AND entity IN (" . getEntity('ecmfiles') . ")";
 		}*/
 		if ($fullpath) {
 			$sql .= " AND t.filepath = '" . $this->db->escape(dirname($fullpath)) . "' AND t.filename = '".$this->db->escape(basename($fullpath))."'";
@@ -371,7 +371,7 @@ class EcmFiles //extends CommonObject
 		$sql.= ' WHERE 1 = 1';
 		/* Fetching this table depends on filepath+filename, it must not depends on entity
 		if (! empty($conf->multicompany->enabled)) {
-		    $sql .= " AND entity IN (" . getEntity("ecmfiles", 1) . ")";
+		    $sql .= " AND entity IN (" . getEntity('ecmfiles') . ")";
 		}*/
 		if (count($sqlwhere) > 0) {
 			$sql .= ' AND ' . implode(' '.$filtermode.' ', $sqlwhere);
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 8a5811a790a..b4345c72878 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1780,7 +1780,7 @@ else if ($id || $ref)
     		$sql.= ", ".MAIN_DB_PREFIX.$origin."det as obj";
     		//if ($conf->livraison_bon->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.fk_expedition = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."livraisondet as ld ON ld.fk_livraison = l.rowid  AND obj.rowid = ld.fk_origin_line";
     		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON obj.fk_product = p.rowid";
-    		$sql.= " WHERE e.entity IN (".getEntity('expedition', 1).")";
+    		$sql.= " WHERE e.entity IN (".getEntity('expedition').")";
     		$sql.= " AND obj.fk_".$origin." = ".$origin_id;
     		$sql.= " AND obj.rowid = ed.fk_origin_line";
     		$sql.= " AND ed.fk_expedition = e.rowid";
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 2b7ada7a0c2..06cddeace91 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -491,7 +491,7 @@ class Expedition extends CommonObject
 		$sql.= " FROM ".MAIN_DB_PREFIX."expedition as e";
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = e.rowid AND el.targettype = '".$this->db->escape($this->element)."'";
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON e.fk_incoterms = i.rowid';
-		$sql.= " WHERE e.entity IN (".getEntity('expedition', 1).")";
+		$sql.= " WHERE e.entity IN (".getEntity('expedition').")";
 		if ($id)   	  $sql.= " AND e.rowid=".$id;
         if ($ref)     $sql.= " AND e.ref='".$this->db->escape($ref)."'";
         if ($ref_ext) $sql.= " AND e.ref_ext='".$this->db->escape($ref_ext)."'";
@@ -1583,7 +1583,7 @@ class Expedition extends CommonObject
 		$prodids = array();
 		$sql = "SELECT rowid";
 		$sql.= " FROM ".MAIN_DB_PREFIX."product";
-		$sql.= " WHERE entity IN (".getEntity('product', 1).")";
+		$sql.= " WHERE entity IN (".getEntity('product').")";
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php
index 039a038f18a..7eaba0b29ad 100644
--- a/htdocs/expedition/index.php
+++ b/htdocs/expedition/index.php
@@ -77,7 +77,7 @@ if (!$user->rights->societe->client->voir && !$socid)
 	$clause = " AND ";
 }
 $sql.= $clause." e.fk_statut = 0";
-$sql.= " AND e.entity IN (".getEntity('expedition', 1).")";
+$sql.= " AND e.entity IN (".getEntity('expedition').")";
 if ($socid) $sql.= " AND c.fk_soc = ".$socid;
 
 $resql=$db->query($sql);
@@ -242,7 +242,7 @@ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_ta
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON el.fk_source = c.rowid AND el.sourcetype IN ('commande') AND el.targettype = 'shipping'";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
 if (! $user->rights->societe->client->voir && ! $socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
-$sql.= " WHERE e.entity IN (".getEntity('expedition', 1).")";
+$sql.= " WHERE e.entity IN (".getEntity('expedition').")";
 if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND sc.fk_user = " .$user->id;
 $sql.= " AND e.fk_statut = 1";
 if ($socid) $sql.= " AND c.fk_soc = ".$socid;
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index c838c002cc9..c46a8b6bcde 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -197,7 +197,7 @@ if (!$user->rights->societe->client->voir && !$socid)	// Internal user with no p
 {
 	$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
-$sql.= " WHERE e.entity IN (".getEntity('expedition', 1).")";
+$sql.= " WHERE e.entity IN (".getEntity('expedition').")";
 if (!$user->rights->societe->client->voir && !$socid)	// Internal user with no permission to see all
 {
 	$sql.= " AND e.fk_soc = sc.fk_soc";
diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php
index 763b550d34e..58783ba69b3 100644
--- a/htdocs/expensereport/class/api_expensereports.class.php
+++ b/htdocs/expensereport/class/api_expensereports.class.php
@@ -104,7 +104,7 @@ class ExpenseReports extends DolibarrApi
         
         $sql = "SELECT t.rowid";
         $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as t";
-        $sql.= ' WHERE t.entity IN ('.getEntity('expensereport', 1).')';
+        $sql.= ' WHERE t.entity IN ('.getEntity('expensereport').')';
         if ($user_ids) $sql.=" AND t.fk_user_author IN (".$user_ids.")";
         
         // Add sql filters
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index d62de0596e1..ffef31cad8b 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -1859,7 +1859,7 @@ class ExpenseReport extends CommonObject
         $sql = "SELECT count(ex.rowid) as nb";
         $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as ex";
         $sql.= " WHERE ex.fk_statut > 0";
-        $sql.= " AND ex.entity IN (".getEntity('expensereport', 1).")";
+        $sql.= " AND ex.entity IN (".getEntity('expensereport').")";
 
         $resql=$this->db->query($sql);
         if ($resql)
@@ -1900,7 +1900,7 @@ class ExpenseReport extends CommonObject
         $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as ex";
         if ($option == 'toapprove') $sql.= " WHERE ex.fk_statut = 2";
         else $sql.= " WHERE ex.fk_statut = 5";
-        $sql.= " AND ex.entity IN (".getEntity('expensereport', 1).")";
+        $sql.= " AND ex.entity IN (".getEntity('expensereport').")";
         $sql.= " AND (ex.fk_user_author IN (".join(',',$userchildids).")";
         $sql.= " OR ex.fk_user_validator IN (".join(',',$userchildids)."))";
 
diff --git a/htdocs/expensereport/class/expensereportstats.class.php b/htdocs/expensereport/class/expensereportstats.class.php
index d68483cb32b..d29e1202bf4 100644
--- a/htdocs/expensereport/class/expensereportstats.class.php
+++ b/htdocs/expensereport/class/expensereportstats.class.php
@@ -61,7 +61,7 @@ class ExpenseReportStats extends Stats
 
 		//$this->where = " e.fk_statut > 0";
 		//$this->where.= " AND e.date_valid > '2000-01-01'";    // To filter only correct "valid date". If date is invalid, the group by on it will fails. Launch a repair.php if you have. 
-		$this->where.= ' e.entity IN ('.getEntity('expensereport', 1).')';
+		$this->where.= ' e.entity IN ('.getEntity('expensereport').')';
 		
 		//$this->where.= " AND entity = ".$conf->entity;
 		if ($this->socid)
diff --git a/htdocs/expensereport/export_csv.php b/htdocs/expensereport/export_csv.php
index d55e262e2e4..26df07cbcfb 100644
--- a/htdocs/expensereport/export_csv.php
+++ b/htdocs/expensereport/export_csv.php
@@ -128,7 +128,7 @@ if (isset($_POST['action']))
 
 		$sql = "SELECT d.rowid, d.ref, d.total_ht, d.total_tva, d.total_ttc";
 		$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as d";
-        $sql.= ' AND d.entity IN ('.getEntity('expensereport', 1).')';
+        $sql.= ' AND d.entity IN ('.getEntity('expensereport').')';
 		$sql.= " ORDER BY d.rowid";
 
 		$result = $db->query($sql);
diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index 724fb234798..e08c5563de4 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -70,7 +70,7 @@ $label=$somme=$nb=array();
 $totalnb=$totalsum=0;
 $sql = "SELECT tf.code, tf.label, count(de.rowid) as nb, sum(de.total_ht) as km";
 $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as d, ".MAIN_DB_PREFIX."expensereport_det as de, ".MAIN_DB_PREFIX."c_type_fees as tf";
-$sql.= " WHERE de.fk_expensereport = d.rowid AND d.entity IN (".getEntity('expensereport', 1).") AND de.fk_c_type_fees = tf.id";
+$sql.= " WHERE de.fk_expensereport = d.rowid AND d.entity IN (".getEntity('expensereport').") AND de.fk_c_type_fees = tf.id";
 // RESTRICT RIGHTS
 if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)
     && (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance)))
@@ -158,7 +158,7 @@ if (empty($user->rights->expensereport->readall) && empty($user->rights->expense
     $childids[]=$user->id;
     $sql.= " AND d.fk_user_author IN (".join(',',$childids).")\n";
 }
-$sql.= ' AND d.entity IN ('.getEntity('expensereport', 1).')';
+$sql.= ' AND d.entity IN ('.getEntity('expensereport').')';
 if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND d.fk_user_author = s.rowid AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($socid) $sql.= " AND d.fk_user_author = ".$socid;
 $sql.= $db->order($sortfield,$sortorder);
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index f95952db482..e1039ca304d 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -194,7 +194,7 @@ $sql.=$hookmanager->resPrint;
 $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as d";
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport_extrafields as ef on (d.rowid = ef.fk_object)";
 $sql.= ", ".MAIN_DB_PREFIX."user as u";
-$sql.= " WHERE d.fk_user_author = u.rowid AND d.entity IN (".getEntity('expensereport', 1).")";
+$sql.= " WHERE d.fk_user_author = u.rowid AND d.entity IN (".getEntity('expensereport').")";
 // Search all
 if (!empty($sall)) $sql.= natural_search(array_keys($fieldstosearchall), $sall);
 // Ref
diff --git a/htdocs/expensereport/payment/card.php b/htdocs/expensereport/payment/card.php
index ce6e0da8c5a..d2f3a4c3567 100644
--- a/htdocs/expensereport/payment/card.php
+++ b/htdocs/expensereport/payment/card.php
@@ -214,7 +214,7 @@ dol_fiche_end();
 $sql = 'SELECT er.rowid as eid, er.paid, er.total_ttc, per.amount';
 $sql.= ' FROM '.MAIN_DB_PREFIX.'payment_expensereport as per,'.MAIN_DB_PREFIX.'expensereport as er';
 $sql.= ' WHERE per.fk_expensereport = er.rowid';
-$sql.= ' AND er.entity IN ('.getEntity('expensereport', 1).')';
+$sql.= ' AND er.entity IN ('.getEntity('expensereport').')';
 $sql.= ' AND per.rowid = '.$id;
 
 dol_syslog("expensereport/payment/card.php", LOG_DEBUG);
diff --git a/htdocs/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php
index fdac304ffcb..29e6b2174e3 100644
--- a/htdocs/expensereport/payment/payment.php
+++ b/htdocs/expensereport/payment/payment.php
@@ -209,7 +209,7 @@ if ($action == 'create' || empty($action))
 	$sql = "SELECT sum(p.amount) as total";
 	$sql.= " FROM ".MAIN_DB_PREFIX."payment_expensereport as p, ".MAIN_DB_PREFIX."expensereport as e";
 	$sql.= " WHERE p.fk_expensereport = e.rowid AND p.fk_expensereport = ".$chid;
-    $sql.= ' AND e.entity IN ('.getEntity('expensereport', 1).')';
+    $sql.= ' AND e.entity IN ('.getEntity('expensereport').')';
 	$resql = $db->query($sql);
 	if ($resql)
 	{
diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php
index fe00c046117..53116dae843 100644
--- a/htdocs/fichinter/index.php
+++ b/htdocs/fichinter/index.php
@@ -82,7 +82,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql.= ", ".MAIN_DB_PREFIX."fichinter as f";
 if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE f.fk_soc = s.rowid";
-$sql.= " AND f.entity IN (".getEntity('societe', 1).")";
+$sql.= " AND f.entity IN (".getEntity('societe').")";
 if ($user->societe_id) $sql.=' AND f.fk_soc = '.$user->societe_id;
 if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 $sql.= " GROUP BY f.fk_statut";
@@ -171,7 +171,7 @@ if (! empty($conf->ficheinter->enabled))
 	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE f.fk_soc = s.rowid";
-	$sql.= " AND f.entity IN (".getEntity('intervention', 1).")";
+	$sql.= " AND f.entity IN (".getEntity('intervention').")";
 	$sql.= " AND f.fk_statut = 0";
 	if ($socid) $sql.= " AND f.fk_soc = ".$socid;
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
@@ -219,7 +219,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."fichinter as f,";
 $sql.= " ".MAIN_DB_PREFIX."societe as s";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE f.fk_soc = s.rowid";
-$sql.= " AND f.entity IN (".getEntity('commande', 1).")";
+$sql.= " AND f.entity IN (".getEntity('commande').")";
 //$sql.= " AND c.fk_statut > 2";
 if ($socid) $sql .= " AND f.fk_soc = ".$socid;
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
@@ -290,7 +290,7 @@ if (! empty($conf->ficheinter->enabled))
 	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE f.fk_soc = s.rowid";
-	$sql.= " AND f.entity IN (".getEntity('intervention', 1).")";
+	$sql.= " AND f.entity IN (".getEntity('intervention').")";
 	$sql.= " AND f.fk_statut = 1";
 	if ($socid) $sql.= " AND f.fk_soc = ".$socid;
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index cfa88b187f0..0c1f3e56c5b 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -391,7 +391,7 @@ if ($object->id > 0)
 		$sql.= ' pfp.tms, pfp.ref_fourn as supplier_ref, pfp.price, pfp.quantity, pfp.unitprice';
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'product_fournisseur_price as pfp';
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = pfp.fk_product";
-		$sql.= ' WHERE p.entity IN ('.getEntity('product', 1).')';
+		$sql.= ' WHERE p.entity IN ('.getEntity('product').')';
 		$sql.= ' AND pfp.fk_soc = '.$object->id;
 		$sql .= $db->order('pfp.tms', 'desc');
 		$sql.= $db->plimit($MAXLIST);
diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index 1eb1872126c..6f3291518ca 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -113,7 +113,7 @@ class SupplierInvoices extends DolibarrApi
         
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
 
-        $sql.= ' WHERE t.entity IN ('.getEntity('supplier_invoice', 1).')';
+        $sql.= ' WHERE t.entity IN ('.getEntity('supplier_invoice').')';
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
         if ($socids) $sql.= " AND t.fk_soc IN (".$socids.")";
         if ($search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php
index c8d1ccb846a..7364199fca5 100644
--- a/htdocs/fourn/class/fournisseur.class.php
+++ b/htdocs/fourn/class/fournisseur.class.php
@@ -124,7 +124,7 @@ class Fournisseur extends Societe
 			$clause = "AND";
 		}
 		$sql.= " ".$clause." s.fournisseur = 1";
-		$sql.= " AND s.entity IN (".getEntity('societe', 1).")";
+		$sql.= " AND s.entity IN (".getEntity('societe').")";
 
 		$resql=$this->db->query($sql);
 		if ($resql)
@@ -189,7 +189,7 @@ class Fournisseur extends Societe
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE s.fournisseur = 1";
-		$sql.= " AND s.entity IN (".getEntity('societe', 1).")";
+		$sql.= " AND s.entity IN (".getEntity('societe').")";
 		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 
 		$resql=$this->db->query($sql);
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index cb47a2d99df..159f76249df 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2455,7 +2455,7 @@ class CommandeFournisseur extends CommonOrder
         $product=new ProductFournisseur($this->db);
         $sql = "SELECT rowid";
         $sql.= " FROM ".MAIN_DB_PREFIX."product";
-        $sql.= " WHERE entity IN (".getEntity('product', 1).")";
+        $sql.= " WHERE entity IN (".getEntity('product').")";
         $sql.=$this->db->order("rowid","ASC");
         $sql.=$this->db->plimit(1);
         $resql = $this->db->query($sql);
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index f9df07e96cc..5c8a41a0466 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1966,7 +1966,7 @@ class FactureFournisseur extends CommonInvoice
 
         $sql = "SELECT rowid";
         $sql.= " FROM ".MAIN_DB_PREFIX."product";
-        $sql.= " WHERE entity IN (".getEntity('product', 1).")";
+        $sql.= " WHERE entity IN (".getEntity('product').")";
 
         $resql = $this->db->query($sql);
         if ($resql)
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 4f576148099..ae34f543c22 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -448,7 +448,7 @@ class ProductFournisseur extends Product
         $sql.= " pfp.price, pfp.quantity, pfp.unitprice, pfp.remise_percent, pfp.remise, pfp.tva_tx, pfp.fk_availability, pfp.charges, pfp.unitcharges, pfp.info_bits, pfp.delivery_time_days, pfp.supplier_reputation";
         $sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
         $sql.= ", ".MAIN_DB_PREFIX."societe as s";
-        $sql.= " WHERE pfp.entity IN (".getEntity('productprice', 1).")";
+        $sql.= " WHERE pfp.entity IN (".getEntity('productprice').")";
         $sql.= " AND pfp.fk_soc = s.rowid";
         $sql.= " AND s.status=1"; // only enabled company selected
         $sql.= " AND pfp.fk_product = ".$prodid;
@@ -557,7 +557,7 @@ class ProductFournisseur extends Product
         $sql.= " pfp.price, pfp.quantity, pfp.unitprice, pfp.tva_tx, pfp.charges, pfp.unitcharges, ";
         $sql.= " pfp.remise, pfp.remise_percent, pfp.fk_supplier_price_expression, pfp.delivery_time_days";
         $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
-        $sql.= " WHERE s.entity IN (".getEntity('societe', 1).")";
+        $sql.= " WHERE s.entity IN (".getEntity('societe').")";
         $sql.= " AND pfp.fk_product = ".$prodid;
         $sql.= " AND pfp.fk_soc = s.rowid";
         $sql.= " AND s.status = 1"; // only enabled society
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 544d882cda3..2375168fca3 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -524,7 +524,7 @@ if ($search_user > 0)
     $sql.=", ".MAIN_DB_PREFIX."c_type_contact as tc";
 }
 $sql.= ' WHERE cf.fk_soc = s.rowid';
-$sql.= ' AND cf.entity IN ('.getEntity('supplier_order', 1).')';
+$sql.= ' AND cf.entity IN ('.getEntity('supplier_order').')';
 if ($socid > 0) $sql.= " AND s.rowid = ".$socid;
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($search_ref) $sql .= natural_search('cf.ref', $search_ref);
diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php
index b1db17f3754..1c345478ef7 100644
--- a/htdocs/fourn/contact.php
+++ b/htdocs/fourn/contact.php
@@ -64,7 +64,7 @@ if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", ".MAIN_DB_PRE
 $sql.= " WHERE s.fk_stcomm = st.id";
 $sql.= " AND s.fournisseur = 1";
 $sql.= " AND s.rowid = p.fk_soc";
-$sql.= " AND s.entity IN (".getEntity('societe', 1).")";
+$sql.= " AND s.entity IN (".getEntity('societe').")";
 if (! $user->rights->societe->client->voir && ! $socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 
 if (dol_strlen($stcomm)) {
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 0918423908e..782a78981ed 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -292,7 +292,7 @@ if ($search_user > 0)
     $sql.=", ".MAIN_DB_PREFIX."c_type_contact as tc";
 }
 $sql.= ' WHERE f.fk_soc = s.rowid';
-$sql.= ' AND f.entity IN ('.getEntity('facture_fourn', 1).')';
+$sql.= ' AND f.entity IN ('.getEntity('facture_fourn').')';
 if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($search_product_category > 0) $sql.=" AND cp.fk_categorie = ".$search_product_category;
 if ($socid > 0) $sql .= ' AND s.rowid = '.$socid;
diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php
index 32f785460ba..690835a5e99 100644
--- a/htdocs/fourn/index.php
+++ b/htdocs/fourn/index.php
@@ -240,7 +240,7 @@ $sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
 if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE s.fk_stcomm = st.id";
 $sql.= " AND s.fournisseur = 1";
-$sql.= " AND s.entity IN (".getEntity('societe', 1).")";
+$sql.= " AND s.entity IN (".getEntity('societe').")";
 if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($socid) $sql .= " AND s.rowid = ".$socid;
 $sql.= " ORDER BY s.tms DESC";
diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index ca874511c94..9d62747a1cb 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -94,7 +94,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."product as p";
 if ($catid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = p.rowid";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as ppf ON p.rowid = ppf.fk_product";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON ppf.fk_soc = s.rowid";
-$sql.= " WHERE p.entity IN (".getEntity('product', 1).")";
+$sql.= " WHERE p.entity IN (".getEntity('product').")";
 if ($sRefSupplier)
 {
 	$sql .= natural_search('ppf.ref_fourn', $sRefSupplier);
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index ba36d911971..03d3c23f5cc 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -320,7 +320,7 @@ class Holiday extends CommonObject
         $sql.= " ua.photo as validator_photo";
         
         $sql.= " FROM ".MAIN_DB_PREFIX."holiday as cp, ".MAIN_DB_PREFIX."user as uu, ".MAIN_DB_PREFIX."user as ua";
-        $sql.= " WHERE cp.entity IN (".getEntity('holiday', 1).")";
+        $sql.= " WHERE cp.entity IN (".getEntity('holiday').")";
 		$sql.= " AND cp.fk_user = uu.rowid AND cp.fk_validator = ua.rowid "; // Hack pour la recherche sur le tableau
         $sql.= " AND cp.fk_user = '".$user_id."'";
 
@@ -445,7 +445,7 @@ class Holiday extends CommonObject
         $sql.= " ua.photo as validator_photo";
         
         $sql.= " FROM ".MAIN_DB_PREFIX."holiday as cp, ".MAIN_DB_PREFIX."user as uu, ".MAIN_DB_PREFIX."user as ua";
-        $sql.= " WHERE cp.entity IN (".getEntity('holiday', 1).")";
+        $sql.= " WHERE cp.entity IN (".getEntity('holiday').")";
         $sql.= " AND cp.fk_user = uu.rowid AND cp.fk_validator = ua.rowid "; // Hack pour la recherche sur le tableau
 
         // Filtrage de séléction
diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
index 383b2276d6c..56ffa78f429 100644
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/livraison/class/livraison.class.php
@@ -844,7 +844,7 @@ class Livraison extends CommonObject
 		$prodids = array();
 		$sql = "SELECT rowid";
 		$sql.= " FROM ".MAIN_DB_PREFIX."product";
-		$sql.= " WHERE entity IN (".getEntity('product', 1).")";
+		$sql.= " WHERE entity IN (".getEntity('product').")";
 		$sql.= " AND tosell = 1";
 		$resql = $this->db->query($sql);
 		if ($resql)
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index 846daad7806..ee0a068251b 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -130,7 +130,7 @@ $sql.= ", ".MAIN_DB_PREFIX."facturedet as d";
 $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= ", ".MAIN_DB_PREFIX."user as u";
 $sql.= " WHERE f.fk_soc = s.rowid";
-$sql.= ' AND f.entity IN ('.getEntity('facture', 1).')';
+$sql.= ' AND f.entity IN ('.getEntity('facture').')';
 $sql.= " AND sc.fk_soc = f.fk_soc";
 $sql.= " AND (d.product_type = 0 OR d.product_type = 1)";
 if (! empty($conf->global->AGENT_CONTACT_TYPE))
@@ -138,7 +138,7 @@ if (! empty($conf->global->AGENT_CONTACT_TYPE))
 else
 	$sql .= " AND sc.fk_user = u.rowid";
 $sql.= " AND f.fk_statut > 0";
-$sql.= ' AND s.entity IN ('.getEntity('societe', 1).')';
+$sql.= ' AND s.entity IN ('.getEntity('societe').')';
 $sql.= " AND d.fk_facture = f.rowid";
 if ($agentid > 0) {
 	if (! empty($conf->global->AGENT_CONTACT_TYPE))
diff --git a/htdocs/margin/checkMargins.php b/htdocs/margin/checkMargins.php
index 9656fa99fd9..c576b3ce4a6 100644
--- a/htdocs/margin/checkMargins.php
+++ b/htdocs/margin/checkMargins.php
@@ -193,7 +193,7 @@ $sql .= " FROM " . MAIN_DB_PREFIX . "facture as f ";
 $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facturedet as d  ON d.fk_facture = f.rowid";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON d.fk_product = p.rowid";
 $sql .= " WHERE f.fk_statut > 0";
-$sql .= " AND f.entity = " . getEntity('facture', 1);
+$sql .= " AND f.entity = " . getEntity('facture');
 if (! empty($startdate)) $sql .= " AND f.datef >= '" . $db->idate($startdate) . "'";
 if (! empty($enddate))   $sql .= " AND f.datef <= '" . $db->idate($enddate) . "'";
 if ($search_ref) $sql.=natural_search('f.facnumber', $search_ref);
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index bcb3cc65699..f7ccf637676 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -181,7 +181,7 @@ $sql.= ", ".MAIN_DB_PREFIX."facture as f";
 $sql.= ", ".MAIN_DB_PREFIX."facturedet as d";
 $sql.= " WHERE f.fk_soc = s.rowid";
 $sql.= " AND f.fk_statut > 0";
-$sql.= ' AND s.entity IN ('.getEntity('societe', 1).')';
+$sql.= ' AND s.entity IN ('.getEntity('societe').')';
 $sql.= " AND d.fk_facture = f.rowid";
 $sql.= " AND (d.product_type = 0 OR d.product_type = 1)";
 if ($client)
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index f5e84dd5c04..d52bcf1b3b0 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -177,7 +177,7 @@ $sql.= ", ".MAIN_DB_PREFIX."facture as f";
 $sql.= ", ".MAIN_DB_PREFIX."facturedet as d";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = d.fk_product";
 $sql.= " WHERE f.fk_soc = s.rowid";
-$sql.= ' AND f.entity IN ('.getEntity('facture', 1).')';
+$sql.= ' AND f.entity IN ('.getEntity('facture').')';
 $sql.= " AND f.fk_statut > 0";
 $sql.= " AND d.fk_facture = f.rowid";
 if ($id > 0)
diff --git a/htdocs/modulebuilder/oldskeletons/skeleton_api_class.class.php b/htdocs/modulebuilder/oldskeletons/skeleton_api_class.class.php
index a40b00af72c..97224b64da9 100644
--- a/htdocs/modulebuilder/oldskeletons/skeleton_api_class.class.php
+++ b/htdocs/modulebuilder/oldskeletons/skeleton_api_class.class.php
@@ -120,7 +120,7 @@ class SkeletonApi extends DolibarrApi
         //if ($mode == 1) $sql.= " AND s.client IN (1, 3)";
         //if ($mode == 2) $sql.= " AND s.client IN (2, 3)";
 
-        $sql.= ' AND s.entity IN ('.getEntity('skeleton', 1).')';
+        $sql.= ' AND s.entity IN ('.getEntity('skeleton').')';
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND s.fk_soc = sc.fk_soc";
         if ($socid) $sql.= " AND s.fk_soc = ".$socid;
         if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
diff --git a/htdocs/modulebuilder/oldskeletons/skeleton_class.class.php b/htdocs/modulebuilder/oldskeletons/skeleton_class.class.php
index 6805a697043..ea552ad85f9 100644
--- a/htdocs/modulebuilder/oldskeletons/skeleton_class.class.php
+++ b/htdocs/modulebuilder/oldskeletons/skeleton_class.class.php
@@ -179,7 +179,7 @@ class Skeleton_Class extends CommonObject
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
 		$sql.= ' WHERE 1 = 1';
 		if (! empty($conf->multicompany->enabled)) {
-		    $sql .= " AND entity IN (" . getEntity("skeleton", 1) . ")";
+		    $sql .= " AND entity IN (" . getEntity('skeleton') . ")";
 		}
 		if (null !== $ref) {
 			$sql .= ' AND t.ref = ' . '\'' . $ref . '\'';
@@ -257,7 +257,7 @@ class Skeleton_Class extends CommonObject
 		}
 		$sql.= ' WHERE 1 = 1';
 		if (! empty($conf->multicompany->enabled)) {
-		    $sql .= " AND entity IN (" . getEntity("skeleton", 1) . ")";
+		    $sql .= " AND entity IN (" . getEntity('skeleton') . ")";
 		}
 		if (count($sqlwhere) > 0) {
 			$sql .= ' AND ' . implode(' '.$filtermode.' ', $sqlwhere);
diff --git a/htdocs/modulebuilder/oldskeletons/skeleton_list.php b/htdocs/modulebuilder/oldskeletons/skeleton_list.php
index 47aeda79fdc..842fdf32457 100644
--- a/htdocs/modulebuilder/oldskeletons/skeleton_list.php
+++ b/htdocs/modulebuilder/oldskeletons/skeleton_list.php
@@ -216,7 +216,7 @@ $sql.=$hookmanager->resPrint;
 $sql.= " FROM ".MAIN_DB_PREFIX."mytable as t";
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."mytable_extrafields as ef on (t.rowid = ef.fk_object)";
 $sql.= " WHERE 1 = 1";
-//$sql.= " WHERE u.entity IN (".getEntity('mytable',1).")";
+//$sql.= " WHERE u.entity IN (".getEntity('mytable').")";
 if ($search_field1) $sql.= natural_search("field1",$search_field1);
 if ($search_field2) $sql.= natural_search("field2",$search_field2);
 if ($sall)          $sql.= natural_search(array_keys($fieldstosearchall), $sall);
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 292c6a139a4..b35519826d3 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -180,7 +180,7 @@ class MyModuleObject extends CommonObject
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
 		$sql.= ' WHERE 1 = 1';
 		if (! empty($conf->multicompany->enabled)) {
-		    $sql .= " AND entity IN (" . getEntity("mymoduleobject", 1) . ")";
+		    $sql .= " AND entity IN (" . getEntity('mymoduleobject') . ")";
 		}
 		if (null !== $ref) {
 			$sql .= ' AND t.ref = ' . '\'' . $ref . '\'';
@@ -258,7 +258,7 @@ class MyModuleObject extends CommonObject
 		}
 		$sql.= ' WHERE 1 = 1';
 		if (! empty($conf->multicompany->enabled)) {
-		    $sql .= " AND entity IN (" . getEntity("mymoduleobject", 1) . ")";
+		    $sql .= " AND entity IN (" . getEntity('mymoduleobject') . ")";
 		}
 		if (count($sqlwhere) > 0) {
 			$sql .= ' AND ' . implode(' '.$filtermode.' ', $sqlwhere);
diff --git a/htdocs/modulebuilder/template/class/myobject_api_class.class.php b/htdocs/modulebuilder/template/class/myobject_api_class.class.php
index 8f0dbee2e38..7f5ee413892 100644
--- a/htdocs/modulebuilder/template/class/myobject_api_class.class.php
+++ b/htdocs/modulebuilder/template/class/myobject_api_class.class.php
@@ -123,7 +123,7 @@ class MyObjectApi extends DolibarrApi
         //if ($mode == 1) $sql.= " AND s.client IN (1, 3)";
         //if ($mode == 2) $sql.= " AND s.client IN (2, 3)";
 
-        $sql.= ' AND s.entity IN ('.getEntity('myobject', 1).')';
+        $sql.= ' AND s.entity IN ('.getEntity('myobject').')';
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND s.fk_soc = sc.fk_soc";
         if ($socid) $sql.= " AND s.fk_soc = ".$socid;
         if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index a935b87bd58..fc8bdcc9200 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -215,7 +215,7 @@ $sql.=$hookmanager->resPrint;
 $sql.= " FROM ".MAIN_DB_PREFIX."mytable as t";
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."mytable_extrafields as ef on (t.rowid = ef.fk_object)";
 $sql.= " WHERE 1 = 1";
-//$sql.= " WHERE u.entity IN (".getEntity('mytable',1).")";
+//$sql.= " WHERE u.entity IN (".getEntity('mytable').")";
 if ($search_field1) $sql.= natural_search("field1",$search_field1);
 if ($search_field2) $sql.= natural_search("field2",$search_field2);
 if ($sall)          $sql.= natural_search(array_keys($fieldstosearchall), $sall);
diff --git a/htdocs/multicurrency/class/multicurrency.class.php b/htdocs/multicurrency/class/multicurrency.class.php
index b8ce1995b5a..67725bad586 100644
--- a/htdocs/multicurrency/class/multicurrency.class.php
+++ b/htdocs/multicurrency/class/multicurrency.class.php
@@ -520,7 +520,7 @@ class MultiCurrency extends CommonObject
 	 	$sql1 = 'SELECT m.rowid, mc.rate FROM '.MAIN_DB_PREFIX.'multicurrency m';
 		$sql1.= ' LEFT JOIN '.MAIN_DB_PREFIX.'multicurrency_rate mc ON (m.rowid = mc.fk_multicurrency)';
 		$sql1.= ' WHERE m.code = \''.$db->escape($code).'\'';
-		$sql1.= " AND m.entity IN (".getEntity('multicurrency', 1).")";
+		$sql1.= " AND m.entity IN (".getEntity('multicurrency').")";
 		$sql2= '';
 		if (!empty($conf->global->MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE) && !empty($date_document)) $sql2.= ' AND DATE_FORMAT(mc.date_sync, "%Y-%m-%d") = "'.date('Y-m-d', $date_document).'"';
 		$sql3.= ' ORDER BY mc.date_sync DESC LIMIT 1';
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index 510a0545372..861d9fa3300 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -133,7 +133,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
 }
-$sql.= " WHERE p.entity = ".getEntity('survey',1);
+$sql.= " WHERE p.entity = ".getEntity('survey');
 if ($status == 'expired') $sql.=" AND date_fin < '".$db->idate($now)."'";
 if ($status == 'opened') $sql.=" AND date_fin >= '".$db->idate($now)."'";
 if ($search_ref) $sql.=natural_search("p.id_sondage", $search_ref);
diff --git a/htdocs/product/admin/product_tools.php b/htdocs/product/admin/product_tools.php
index 58d66f3a2c5..85351a0fb2a 100644
--- a/htdocs/product/admin/product_tools.php
+++ b/htdocs/product/admin/product_tools.php
@@ -72,7 +72,7 @@ if ($action == 'convert')
 		{
 			$sql = 'SELECT rowid';
 			$sql.= ' FROM '.MAIN_DB_PREFIX.'product';
-			$sql.= ' WHERE entity IN ('.getEntity('product',1).')';
+			$sql.= ' WHERE entity IN ('.getEntity('product').')';
 			$sql.= " AND tva_tx = '".$db->escape($oldvatrate)."'";
 
 			$resql=$db->query($sql);
@@ -162,7 +162,7 @@ if ($action == 'convert')
 		// Change supplier prices
 		$sql = 'SELECT pfp.rowid, pfp.fk_soc, pfp.price as price, pfp.quantity as qty, pfp.fk_availability, pfp.ref_fourn';
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'product_fournisseur_price as pfp, '.MAIN_DB_PREFIX.'societe as s';
-		$sql.= ' WHERE pfp.fk_soc = s.rowid AND pfp.entity IN ('.getEntity('product',1).')';
+		$sql.= ' WHERE pfp.fk_soc = s.rowid AND pfp.entity IN ('.getEntity('product').')';
 		$sql.= " AND tva_tx = '".$db->escape($oldvatrate)."'";
 		$sql.= " AND s.fk_pays = '".$country_id."'";
 		//print $sql;
diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index 8867011101b..8e4892678e5 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -110,7 +110,7 @@ if (! empty($action) && $action == 'fetch' && ! empty($id))
 			$sql = "SELECT price, price_ttc, price_base_type, tva_tx";
 			$sql .= " FROM " . MAIN_DB_PREFIX . "product_price ";
 			$sql .= " WHERE fk_product='" . $id . "'";
-			$sql .= " AND entity IN (" . getEntity('productprice', 1) . ")";
+			$sql .= " AND entity IN (" . getEntity('productprice') . ")";
 			$sql .= " AND price_level=" . $price_level;
 			$sql .= " ORDER BY date_price";
 			$sql .= " DESC LIMIT 1";
diff --git a/htdocs/product/canvas/product/actions_card_product.class.php b/htdocs/product/canvas/product/actions_card_product.class.php
index a60694ca7cb..53442d94d39 100644
--- a/htdocs/product/canvas/product/actions_card_product.class.php
+++ b/htdocs/product/canvas/product/actions_card_product.class.php
@@ -352,7 +352,7 @@ class ActionsCardProduct
 		}
 
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'product as p';
-		$sql.= " WHERE p.entity IN (".getEntity('product', 1).")";
+		$sql.= " WHERE p.entity IN (".getEntity('product').")";
 
 		if ($sall)
 		{
diff --git a/htdocs/product/canvas/service/actions_card_service.class.php b/htdocs/product/canvas/service/actions_card_service.class.php
index 970ac535273..f053e6f8d0b 100644
--- a/htdocs/product/canvas/service/actions_card_service.class.php
+++ b/htdocs/product/canvas/service/actions_card_service.class.php
@@ -313,7 +313,7 @@ class ActionsCardService
 			$fourn_id = GETPOST("fourn_id",'int');
 			$sql.= ", ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
 		}
-		$sql.= " WHERE p.entity IN (".getEntity('product', 1).")";
+		$sql.= " WHERE p.entity IN (".getEntity('product').")";
 		if ($search_categ) $sql.= " AND p.rowid = cp.fk_product";	// Join for the needed table to filter by categ
 		if ($sall)
 		{
diff --git a/htdocs/product/class/api_deprecated_product.class.php b/htdocs/product/class/api_deprecated_product.class.php
index e33c7dd3e32..a1d475f53ab 100644
--- a/htdocs/product/class/api_deprecated_product.class.php
+++ b/htdocs/product/class/api_deprecated_product.class.php
@@ -115,7 +115,7 @@ class ProductApi extends DolibarrApi
 
         $sql ="SELECT rowid, ref, ref_ext";
         $sql.= " FROM ".MAIN_DB_PREFIX."product as p";
-        $sql.= ' WHERE p.entity IN ('.getEntity('product', 1).')';
+        $sql.= ' WHERE p.entity IN ('.getEntity('product').')';
 		
         // Show products
         if ($mode == 1) $sql.= " AND p.fk_product_type = 0";
@@ -198,7 +198,7 @@ class ProductApi extends DolibarrApi
         $sql = "SELECT rowid, ref, ref_ext";
         $sql.= " FROM ".MAIN_DB_PREFIX."product as p, ";
         $sql.= MAIN_DB_PREFIX."categorie_product as c";
-        $sql.= ' WHERE p.entity IN ('.getEntity('product', 1).')';
+        $sql.= ' WHERE p.entity IN ('.getEntity('product').')';
 
         // Select products of given category
         $sql.= " AND c.fk_categorie = ".$db->escape($category);
diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index a733a554fd5..0d6694ac569 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -109,7 +109,7 @@ class Products extends DolibarrApi
         {
             $sql.= ", ".MAIN_DB_PREFIX."categorie_product as c";
         }
-        $sql.= ' WHERE t.entity IN ('.getEntity('product', 1).')';
+        $sql.= ' WHERE t.entity IN ('.getEntity('product').')';
         // Select products of given category
         if ($category > 0)
         {
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index dda92ea0c0f..01064c8ffa3 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -112,7 +112,7 @@ class FormProduct
                 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_batch as pb on pb.fk_product_stock = ps.rowid AND pb.batch = '".$batch."'";
             }
 		}
-		$sql.= " WHERE e.entity IN (".getEntity('stock', 1).")";
+		$sql.= " WHERE e.entity IN (".getEntity('stock').")";
 		if (count($warehouseStatus))
 		{
 			$sql.= " AND e.statut IN (".implode(',',$warehouseStatus).")";
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index d866e3ec2ae..606274cd30e 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -493,7 +493,7 @@ class Product extends CommonObject
         {
 			$sql = "SELECT count(*) as nb";
 			$sql.= " FROM ".MAIN_DB_PREFIX."product";
-			$sql.= " WHERE entity IN (".getEntity('product', 1).")";
+			$sql.= " WHERE entity IN (".getEntity('product').")";
 			$sql.= " AND ref = '" .$this->db->escape($this->ref)."'";
 
 			$result = $this->db->query($sql);
@@ -1942,7 +1942,7 @@ class Product extends CommonObject
 						$sql = "SELECT price, price_ttc, price_min, price_min_ttc,";
 						$sql.= " price_base_type, tva_tx, default_vat_code, tosell, price_by_qty, rowid, recuperableonly";
 						$sql.= " FROM ".MAIN_DB_PREFIX."product_price";
-						$sql.= " WHERE entity IN (".getEntity('productprice', 1).")";
+						$sql.= " WHERE entity IN (".getEntity('productprice').")";
 						$sql.= " AND price_level=".$i;
 						$sql.= " AND fk_product = ".$this->id;
 						$sql.= " ORDER BY date_price DESC, rowid DESC";
@@ -2108,7 +2108,7 @@ class Product extends CommonObject
 		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE p.rowid = pd.fk_propal";
 		$sql.= " AND p.fk_soc = s.rowid";
-		$sql.= " AND p.entity IN (".getEntity('propal', 1).")";
+		$sql.= " AND p.entity IN (".getEntity('propal').")";
 		$sql.= " AND pd.fk_product = ".$this->id;
 		if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		//$sql.= " AND pr.fk_statut != 0";
@@ -2151,7 +2151,7 @@ class Product extends CommonObject
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE c.rowid = cd.fk_commande";
 		$sql.= " AND c.fk_soc = s.rowid";
-		$sql.= " AND c.entity IN (".getEntity('commande', 1).")";
+		$sql.= " AND c.entity IN (".getEntity('commande').")";
 		$sql.= " AND cd.fk_product = ".$this->id;
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($socid > 0)	$sql.= " AND c.fk_soc = ".$socid;
@@ -2217,7 +2217,7 @@ class Product extends CommonObject
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE c.rowid = cd.fk_commande";
 		$sql.= " AND c.fk_soc = s.rowid";
-		$sql.= " AND c.entity IN (".getEntity('supplier_order', 1).")";
+		$sql.= " AND c.entity IN (".getEntity('supplier_order').")";
 		$sql.= " AND cd.fk_product = ".$this->id;
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($socid > 0) $sql.= " AND c.fk_soc = ".$socid;
@@ -2262,7 +2262,7 @@ class Product extends CommonObject
 		$sql.= " WHERE e.rowid = ed.fk_expedition";
 		$sql.= " AND c.rowid = cd.fk_commande";
 		$sql.= " AND e.fk_soc = s.rowid";
-		$sql.= " AND e.entity IN (".getEntity('expedition', 1).")";
+		$sql.= " AND e.entity IN (".getEntity('expedition').")";
 		$sql.= " AND ed.fk_origin_line = cd.rowid";
 		$sql.= " AND cd.fk_product = ".$this->id;
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND e.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
@@ -2305,7 +2305,7 @@ class Product extends CommonObject
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE cf.rowid = fd.fk_commande";
 		$sql.= " AND cf.fk_soc = s.rowid";
-		$sql.= " AND cf.entity IN (".getEntity('supplier_order', 1).")";
+		$sql.= " AND cf.entity IN (".getEntity('supplier_order').")";
 		$sql.= " AND fd.fk_product = ".$this->id;
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND cf.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($socid > 0)	$sql.= " AND cf.fk_soc = ".$socid;
@@ -2347,7 +2347,7 @@ class Product extends CommonObject
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE c.rowid = cd.fk_contrat";
 		$sql.= " AND c.fk_soc = s.rowid";
-		$sql.= " AND c.entity IN (".getEntity('contract', 1).")";
+		$sql.= " AND c.entity IN (".getEntity('contract').")";
 		$sql.= " AND cd.fk_product = ".$this->id;
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		//$sql.= " AND c.statut != 0";
@@ -2389,7 +2389,7 @@ class Product extends CommonObject
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE f.rowid = fd.fk_facture";
 		$sql.= " AND f.fk_soc = s.rowid";
-		$sql.= " AND f.entity IN (".getEntity('facture', 1).")";
+		$sql.= " AND f.entity IN (".getEntity('facture').")";
 		$sql.= " AND fd.fk_product = ".$this->id;
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		//$sql.= " AND f.fk_statut != 0";
@@ -2431,7 +2431,7 @@ class Product extends CommonObject
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE f.rowid = fd.fk_facture_fourn";
 		$sql.= " AND f.fk_soc = s.rowid";
-		$sql.= " AND f.entity IN (".getEntity('facture_fourn', 1).")";
+		$sql.= " AND f.entity IN (".getEntity('facture_fourn').")";
 		$sql.= " AND fd.fk_product = ".$this->id;
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		//$sql.= " AND f.fk_statut != 0";
@@ -2543,7 +2543,7 @@ class Product extends CommonObject
 		else $sql.=" AND d.fk_product > 0";
 		if ($filteronproducttype >= 0) $sql.= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype;
 		$sql.= " AND f.fk_soc = s.rowid";
-		$sql.= " AND f.entity IN (".getEntity('facture', 1).")";
+		$sql.= " AND f.entity IN (".getEntity('facture').")";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($socid > 0)	$sql.= " AND f.fk_soc = $socid";
 		$sql.=$morefilter;
@@ -2579,7 +2579,7 @@ class Product extends CommonObject
 		else $sql.=" AND d.fk_product > 0";
 		if ($filteronproducttype >= 0) $sql.= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype;
 		$sql.= " AND f.fk_soc = s.rowid";
-		$sql.= " AND f.entity IN (".getEntity('facture_fourn', 1).")";
+		$sql.= " AND f.entity IN (".getEntity('facture_fourn').")";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($socid > 0)	$sql.= " AND f.fk_soc = $socid";
 		$sql.=$morefilter;
@@ -2614,7 +2614,7 @@ class Product extends CommonObject
 		else $sql.=" AND d.fk_product > 0";
 		if ($filteronproducttype >= 0) $sql.= " AND prod.rowid = d.fk_product AND prod.fk_product_type =".$filteronproducttype;
 		$sql.= " AND p.fk_soc = s.rowid";
-		$sql.= " AND p.entity IN (".getEntity('propal', 1).")";
+		$sql.= " AND p.entity IN (".getEntity('propal').")";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($socid > 0)	$sql.= " AND p.fk_soc = ".$socid;
 		$sql.=$morefilter;
@@ -2649,7 +2649,7 @@ class Product extends CommonObject
 		else $sql.=" AND d.fk_product > 0";
 		if ($filteronproducttype >= 0) $sql.= " AND prod.rowid = d.fk_product AND prod.fk_product_type =".$filteronproducttype;
 		$sql.= " AND p.fk_soc = s.rowid";
-		$sql.= " AND p.entity IN (".getEntity('propal', 1).")";
+		$sql.= " AND p.entity IN (".getEntity('propal').")";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($socid > 0)	$sql.= " AND p.fk_soc = ".$socid;
 		$sql.=$morefilter;
@@ -2683,7 +2683,7 @@ class Product extends CommonObject
 		else $sql.=" AND d.fk_product > 0";
 		if ($filteronproducttype >= 0) $sql.= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype;
 		$sql.= " AND c.fk_soc = s.rowid";
-		$sql.= " AND c.entity IN (".getEntity('commande', 1).")";
+		$sql.= " AND c.entity IN (".getEntity('commande').")";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($socid > 0)	$sql.= " AND c.fk_soc = ".$socid;
 		$sql.=$morefilter;
@@ -2717,7 +2717,7 @@ class Product extends CommonObject
 		else $sql.=" AND d.fk_product > 0";
 		if ($filteronproducttype >= 0) $sql.= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype;
 		$sql.= " AND c.fk_soc = s.rowid";
-		$sql.= " AND c.entity IN (".getEntity('supplier_order', 1).")";
+		$sql.= " AND c.entity IN (".getEntity('supplier_order').")";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($socid > 0)	$sql.= " AND c.fk_soc = ".$socid;
 		$sql.=$morefilter;
@@ -2908,7 +2908,7 @@ class Product extends CommonObject
     		$sql.= " WHERE fk_soc = ".$id_fourn;
     		$sql.= " AND ref_fourn = '".$this->db->escape($ref_fourn)."'";
     		$sql.= " AND fk_product != ".$this->id;
-    		$sql.= " AND entity IN (".getEntity('productprice', 1).")";
+    		$sql.= " AND entity IN (".getEntity('productprice').")";
 
     		$resql=$this->db->query($sql);
     		if ($resql)
@@ -2931,7 +2931,7 @@ class Product extends CommonObject
 		else $sql.= " AND (ref_fourn = '' OR ref_fourn IS NULL)";
 		$sql.= " AND quantity = '".$quantity."'";
 		$sql.= " AND fk_product = ".$this->id;
-		$sql.= " AND entity IN (".getEntity('productprice', 1).")";
+		$sql.= " AND entity IN (".getEntity('productprice').")";
 
 		$resql=$this->db->query($sql);
 		if ($resql)
@@ -3742,7 +3742,7 @@ class Product extends CommonObject
 		$sql = "SELECT ps.rowid, ps.reel, ps.fk_entrepot";
 		$sql.= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
 		$sql.= ", ".MAIN_DB_PREFIX."entrepot as w";
-		$sql.= " WHERE w.entity IN (".getEntity('stock', 1).")";
+		$sql.= " WHERE w.entity IN (".getEntity('stock').")";
 		$sql.= " AND w.rowid = ps.fk_entrepot";
 		$sql.= " AND ps.fk_product = ".$this->id;
 		if ($conf->global->ENTREPOT_EXTRA_STATUS && count($warehouseStatus)) $sql.= " AND w.statut IN (".implode(',',$warehouseStatus).")";
diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php
index 5b9050077c9..6a488c87e2b 100644
--- a/htdocs/product/class/productcustomerprice.class.php
+++ b/htdocs/product/class/productcustomerprice.class.php
@@ -338,7 +338,7 @@ class Productcustomerprice extends CommonObject
 		$sql .= " ," . MAIN_DB_PREFIX . "societe as soc ";
 		$sql .= " WHERE soc.rowid=t.fk_soc ";
 		$sql .= " AND prod.rowid=t.fk_product ";
-		$sql .= " AND prod.entity IN (" . getEntity('product', 1) . ")";
+		$sql .= " AND prod.entity IN (" . getEntity('product') . ")";
 
 		// Manage filter
 		if (count($filter) > 0) {
@@ -445,7 +445,7 @@ class Productcustomerprice extends CommonObject
 		$sql .= " ," . MAIN_DB_PREFIX . "societe as soc ";
 		$sql .= " WHERE soc.rowid=t.fk_soc ";
 		$sql .= " AND prod.rowid=t.fk_product ";
-		$sql .= " AND prod.entity IN (" . getEntity('product', 1) . ")";
+		$sql .= " AND prod.entity IN (" . getEntity('product') . ")";
 
 		// Manage filter
 		if (count($filter) > 0) {
@@ -724,7 +724,7 @@ class Productcustomerprice extends CommonObject
 		$sql = "SELECT s.rowid";
 		$sql .= " FROM " . MAIN_DB_PREFIX . "societe as s";
 		$sql .= " WHERE s.parent = " . $this->fk_soc;
-		$sql .= " AND s.entity IN (" . getEntity('societe', 1) . ")";
+		$sql .= " AND s.entity IN (" . getEntity('societe') . ")";
 
 		dol_syslog(get_class($this) . "::setPriceOnAffiliateThirdparty", LOG_DEBUG);
 		$resql = $this->db->query($sql);
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index aa1cf4137e9..07d83fc8d3a 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -148,7 +148,7 @@ if ($action == 'search')
 	$sql.= ' FROM '.MAIN_DB_PREFIX.'product as p';
 	$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON p.rowid = cp.fk_product';
 	if (! empty($conf->global->MAIN_MULTILANGS)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_lang as pl ON pl.fk_product = p.rowid AND lang='".($current_lang)."'";
-	$sql.= ' WHERE p.entity IN ('.getEntity('product', 1).')';
+	$sql.= ' WHERE p.entity IN ('.getEntity('product').')';
 	if ($key != "")
 	{
 		// For natural search
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 34da4f857b9..49a80859bd9 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -186,7 +186,7 @@ if (! empty($conf->categorie->enabled) && ! empty($conf->global->CATEGORY_GRAPHS
 	$sql.= " FROM ".MAIN_DB_PREFIX."categorie_product as cs";
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cs.fk_categorie = c.rowid";
 	$sql.= " WHERE c.type = 0";
-	$sql.= " AND c.entity IN (".getEntity('category',1).")";
+	$sql.= " AND c.entity IN (".getEntity('category').")";
 	$sql.= " GROUP BY c.label";
 	$total=0;
 	$result = $db->query($sql);
diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index 8cb1f56eb9d..dc79dac28e5 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -519,7 +519,7 @@ class Inventory extends CoreObject
 			$sql = 'SELECT i.rowid,i.title, e.label, i.date_inventory, i.fk_warehouse, i.datec, i.tms, i.status';
             $sql.= ' FROM '.MAIN_DB_PREFIX.'inventory i';
             $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'entrepot e ON (e.rowid = i.fk_warehouse)';
-            $sql.= ' WHERE i.entity IN ('.getEntity('inventory', 1).')';
+            $sql.= ' WHERE i.entity IN ('.getEntity('inventory').')';
 		}
 	
 		return $sql;	
diff --git a/htdocs/product/list-with-listview.php b/htdocs/product/list-with-listview.php
index 1ebbf256c9c..0a40858cab9 100644
--- a/htdocs/product/list-with-listview.php
+++ b/htdocs/product/list-with-listview.php
@@ -286,7 +286,7 @@ else
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination pac ON pac.fk_product_child = p.rowid";
 	}
 
-	$sql.= ' WHERE p.entity IN ('.getEntity('product', 1).')';
+	$sql.= ' WHERE p.entity IN ('.getEntity('product').')';
 	if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
     // if the type is not 1, we show all products (type = 0,2,3)
     if (dol_strlen($type))
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 74f9c59cff3..e84aeb53681 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -288,7 +288,7 @@ else
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination pac ON pac.fk_product_child = p.rowid";
 	}
 
-	$sql.= ' WHERE p.entity IN ('.getEntity('product', 1).')';
+	$sql.= ' WHERE p.entity IN ('.getEntity('product').')';
 	if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
     // if the type is not 1, we show all products (type = 0,2,3)
     if (dol_strlen($search_type) && $search_type != '-1')
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index 5320e637316..07a19c4af5e 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -114,7 +114,7 @@ $infoprod=array();
 $sql  = "SELECT p.rowid, p.label, p.ref, p.fk_product_type as type, SUM(pd.qty) as c";
 $sql.= " FROM ".MAIN_DB_PREFIX."propaldet as pd";
 $sql.= ", ".MAIN_DB_PREFIX."product as p";
-$sql.= ' WHERE p.entity IN ('.getEntity('product', 1).')';
+$sql.= ' WHERE p.entity IN ('.getEntity('product').')';
 $sql.= " AND p.rowid = pd.fk_product";
 if ($type !== '') {
 	$sql.= " AND fk_product_type = ".$type;
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 99184b89e72..41f5cda1eb7 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1319,7 +1319,7 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action=='showlog_default_
     $sql .= " FROM " . MAIN_DB_PREFIX . "product_price as p,";
     $sql .= " " . MAIN_DB_PREFIX . "user as u";
     $sql .= " WHERE fk_product = " . $object->id;
-    $sql .= " AND p.entity IN (" . getEntity('productprice', 1) . ")";
+    $sql .= " AND p.entity IN (" . getEntity('productprice') . ")";
     $sql .= " AND p.fk_user_author = u.rowid";
     if (! empty($socid) && ! empty($conf->global->PRODUIT_MULTIPRICES)) $sql .= " AND p.price_level = " . $soc->price_level;
     $sql .= " ORDER BY p.date_price DESC, p.rowid DESC, p.price_level ASC";
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index e460bbec7c5..ffa0544976b 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -119,7 +119,7 @@ $sql.= ' FROM '.MAIN_DB_PREFIX.'product as p';
 $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock as s on p.rowid = s.fk_product';
 // We'll need this table joined to the select in order to filter by categ
 if ($search_categ) $sql.= ", ".MAIN_DB_PREFIX."categorie_product as cp";
-$sql.= " WHERE p.entity IN (".getEntity('product', 1).")";
+$sql.= " WHERE p.entity IN (".getEntity('product').")";
 if ($search_categ) $sql.= " AND p.rowid = cp.fk_product";	// Join for the needed table to filter by categ
 if ($sall) $sql.=natural_search(array('p.ref', 'p.label', 'p.description', 'p.note'), $all);
 // if the type is not 1, we show all products (type = 0,2,3)
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index 6ab18ac87cb..1d45e93590c 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -124,7 +124,7 @@ $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_batch as pb on pb.fk_product_stock
 $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_lot as pl on pl.fk_product = p.rowid AND pl.batch = pb.batch'; // Link on unique key
 // We'll need this table joined to the select in order to filter by categ
 if ($search_categ) $sql.= ", ".MAIN_DB_PREFIX."categorie_product as cp";
-$sql.= " WHERE p.entity IN (".getEntity('product', 1).")";
+$sql.= " WHERE p.entity IN (".getEntity('product').")";
 if ($search_categ) $sql.= " AND p.rowid = cp.fk_product";	// Join for the needed table to filter by categ
 if ($sall) $sql.=natural_search(array('p.ref','p.label','p.description','p.note'), $sall);
 // if the type is not 1, we show all products (type = 0,2,3)
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index 1c72d5f6615..221e76d7ac9 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -129,7 +129,7 @@ if ($id > 0 || ! empty($ref))
 			$sql.= ", ".MAIN_DB_PREFIX."commandedet as d";
 			if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			$sql.= " WHERE c.fk_soc = s.rowid";
-			$sql.= " AND c.entity IN (".getEntity('commande', 1).")";
+			$sql.= " AND c.entity IN (".getEntity('commande').")";
 			$sql.= " AND d.fk_commande = c.rowid";
 			$sql.= " AND d.fk_product =".$product->id;
 	            if (! empty($search_month))
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index e2f5bccc430..eec53697a91 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -123,7 +123,7 @@ if ($id > 0 || ! empty($ref))
 		$sql.= ", ".MAIN_DB_PREFIX."contratdet as cd";
 		$sql.= " WHERE c.rowid = cd.fk_contrat";
 		$sql.= " AND c.fk_soc = s.rowid";
-		$sql.= " AND c.entity IN (".getEntity('contract', 1).")";
+		$sql.= " AND c.entity IN (".getEntity('contract').")";
 		$sql.= " AND cd.fk_product =".$product->id;
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($socid) $sql.= " AND s.rowid = ".$socid;
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 506689a6001..0aa1ca90c98 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -149,7 +149,7 @@ if ($id > 0 || ! empty($ref))
             $sql.= ", ".MAIN_DB_PREFIX."facturedet as d";
             if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
             $sql.= " WHERE f.fk_soc = s.rowid";
-            $sql.= " AND f.entity IN (".getEntity('facture', 1).")";
+            $sql.= " AND f.entity IN (".getEntity('facture').")";
             $sql.= " AND d.fk_facture = f.rowid";
             $sql.= " AND d.fk_product =".$product->id;
             if (! empty($search_month))
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index ac2849fefcf..db957ae6532 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -131,7 +131,7 @@ if ($id > 0 || ! empty($ref))
 			$sql .= ", " . MAIN_DB_PREFIX . "facture_fourn_det as d";
 			if (! $user->rights->societe->client->voir && ! $socid)	$sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
 			$sql .= " WHERE f.fk_soc = s.rowid";
-			$sql .= " AND f.entity IN (".getEntity('facture_fourn', 1).")";
+			$sql .= " AND f.entity IN (".getEntity('facture_fourn').")";
 			$sql .= " AND d.fk_facture_fourn = f.rowid";
 			$sql .= " AND d.fk_product =" . $product->id;
 			if (! empty($search_month))
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index 06d43838bce..ec796422f0b 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -131,7 +131,7 @@ if ($id > 0 || ! empty($ref))
 			if (! $user->rights->societe->client->voir && ! $socid)
 				$sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
 			$sql .= " WHERE p.fk_soc = s.rowid";
-			$sql .= " AND p.entity IN (".getEntity('propal', 1).")";
+			$sql .= " AND p.entity IN (".getEntity('propal').")";
 			$sql .= " AND d.fk_propal = p.rowid";
 			$sql .= " AND d.fk_product =" . $product->id;
 			if (! empty($search_month))
diff --git a/htdocs/product/stock/class/api_stockmovements.class.php b/htdocs/product/stock/class/api_stockmovements.class.php
index 79e17749991..5465c04d9a9 100644
--- a/htdocs/product/stock/class/api_stockmovements.class.php
+++ b/htdocs/product/stock/class/api_stockmovements.class.php
@@ -104,7 +104,7 @@ class StockMovements extends DolibarrApi
         
         $sql = "SELECT t.rowid";
         $sql.= " FROM ".MAIN_DB_PREFIX."stock_mouvement as t";
-        //$sql.= ' WHERE t.entity IN ('.getEntity('stock', 1).')';
+        //$sql.= ' WHERE t.entity IN ('.getEntity('stock').')';
         $sql.= ' WHERE 1 = 1';
         // Add sql filters
         if ($sqlfilters) 
diff --git a/htdocs/product/stock/class/api_warehouses.class.php b/htdocs/product/stock/class/api_warehouses.class.php
index d50f590c30c..6eccf805b41 100644
--- a/htdocs/product/stock/class/api_warehouses.class.php
+++ b/htdocs/product/stock/class/api_warehouses.class.php
@@ -103,7 +103,7 @@ class Warehouses extends DolibarrApi
         
         $sql = "SELECT t.rowid";
         $sql.= " FROM ".MAIN_DB_PREFIX."entrepot as t";
-        $sql.= ' WHERE t.entity IN ('.getEntity('stock', 1).')';
+        $sql.= ' WHERE t.entity IN ('.getEntity('stock').')';
         // Add sql filters
         if ($sqlfilters) 
         {
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 1b650a4e7bb..9263fe4ba10 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -411,7 +411,7 @@ class Entrepot extends CommonObject
 
 		$sql = "SELECT rowid, label";
 		$sql.= " FROM ".MAIN_DB_PREFIX."entrepot";
-		$sql.= " WHERE entity IN (".getEntity('stock', 1).")";
+		$sql.= " WHERE entity IN (".getEntity('stock').")";
 		$sql.= " AND statut = ".$status;
 
 		$result = $this->db->query($sql);
diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php
index a6e20aabcab..22a9e95410c 100644
--- a/htdocs/product/stock/index.php
+++ b/htdocs/product/stock/index.php
@@ -64,7 +64,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is usele
 $sql = "SELECT e.label, e.rowid, e.statut";
 $sql.= " FROM ".MAIN_DB_PREFIX."entrepot as e";
 $sql.= " WHERE e.statut in (0,1)";
-$sql.= " AND e.entity IN (".getEntity('stock', 1).")";
+$sql.= " AND e.entity IN (".getEntity('stock').")";
 $sql.= $db->order('e.statut','DESC');
 $sql.= $db->plimit(15, 0);
 
@@ -119,7 +119,7 @@ $sql.= ", ".MAIN_DB_PREFIX."stock_mouvement as m";
 $sql.= ", ".MAIN_DB_PREFIX."product as p";
 $sql.= " WHERE m.fk_product = p.rowid";
 $sql.= " AND m.fk_entrepot = e.rowid";
-$sql.= " AND e.entity IN (".getEntity('stock', 1).")";
+$sql.= " AND e.entity IN (".getEntity('stock').")";
 if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) $sql.= " AND p.fk_product_type = 0";
 $sql.= $db->order("datem","DESC");
 $sql.= $db->plimit($max,0);
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index eefbe3deee9..d3de2b6b6e5 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -87,7 +87,7 @@ $sql.= " SUM(p.pmp * ps.reel) as estimatedvalue, SUM(p.price * ps.reel) as sellv
 $sql.= " FROM ".MAIN_DB_PREFIX."entrepot as e";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON e.rowid = ps.fk_entrepot";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON ps.fk_product = p.rowid";
-$sql.= " WHERE e.entity IN (".getEntity('stock', 1).")";
+$sql.= " WHERE e.entity IN (".getEntity('stock').")";
 if ($search_ref) $sql.= natural_search("e.label", $search_ref);			// ref
 if ($search_label) $sql.= natural_search("e.lieu", $search_label);		// label
 if ($search_status != '' && $search_status >= 0) $sql.= " AND e.statut = ".$search_status;
diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
index 5f0f9c213dc..7a8010117a2 100644
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -434,7 +434,7 @@ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_lot as pl ON m.batch = pl.batch AND
 $sql.= " WHERE m.fk_product = p.rowid";
 if ($msid > 0) $sql .= " AND m.rowid = ".$msid;
 $sql.= " AND m.fk_entrepot = e.rowid";
-$sql.= " AND e.entity IN (".getEntity('stock', 1).")";
+$sql.= " AND e.entity IN (".getEntity('stock').")";
 if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) $sql.= " AND p.fk_product_type = 0";
 if ($id > 0) $sql.= " AND e.rowid ='".$id."'";
 if ($month > 0)
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index e894368beaf..3ad426eda8c 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -810,7 +810,7 @@ $sql.= " ".MAIN_DB_PREFIX."product_stock as ps";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = ps.fk_product";
 $sql.= " WHERE ps.reel != 0";
 $sql.= " AND ps.fk_entrepot = e.rowid";
-$sql.= " AND e.entity IN (".getEntity('stock', 1).")";
+$sql.= " AND e.entity IN (".getEntity('stock').")";
 $sql.= " AND ps.fk_product = ".$object->id;
 $sql.= " ORDER BY e.label";
 
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index 78d3c470cb1..6233d8a3583 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -227,7 +227,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."product_lot as t";
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_lot_extrafields as ef on (t.rowid = ef.fk_object)";
 $sql.= ", ".MAIN_DB_PREFIX."product as p";
 $sql.= " WHERE p.rowid = t.fk_product";
-//$sql.= " WHERE u.entity IN (".getEntity('productlot',1).")";
+//$sql.= " WHERE u.entity IN (".getEntity('productlot').")";
 
 if ($search_entity) $sql.= natural_search("entity",$search_entity);
 if ($search_product) $sql.= natural_search("p.ref",$search_product);
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 1a3d7c9edb2..405fe098bb2 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -292,7 +292,7 @@ if($fk_supplier > 0) {
 if(!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entrepot > 0) {
 	$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_warehouse_properties AS pse ON (p.rowid = pse.fk_product AND pse.fk_entrepot = '.$fk_entrepot.')';
 }
-$sql.= ' WHERE p.entity IN (' . getEntity("product", 1) . ')';
+$sql.= ' WHERE p.entity IN (' . getEntity('product') . ')';
 if ($sall) $sql .= natural_search(array('p.ref', 'p.label', 'p.description', 'p.note'), $sall);
 // if the type is not 1, we show all products (type = 0,2,3)
 if (dol_strlen($type)) {
@@ -322,7 +322,7 @@ if ($usevirtualstock)
 	$sqlCommandesCli = "(SELECT ".$db->ifsql("SUM(cd.qty) IS NULL", "0", "SUM(cd.qty)")." as qty";
 	$sqlCommandesCli.= " FROM ".MAIN_DB_PREFIX."commandedet as cd";
 	$sqlCommandesCli.= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON (c.rowid = cd.fk_commande)";
-	$sqlCommandesCli.= " WHERE c.entity IN (".getEntity('commande', 1).")";
+	$sqlCommandesCli.= " WHERE c.entity IN (".getEntity('commande').")";
 	$sqlCommandesCli.= " AND cd.fk_product = p.rowid";
 	$sqlCommandesCli.= " AND c.fk_statut IN (1,2))";
 
@@ -331,7 +331,7 @@ if ($usevirtualstock)
 	$sqlExpeditionsCli.= " LEFT JOIN ".MAIN_DB_PREFIX."expeditiondet as ed ON (ed.fk_expedition = e.rowid)";
 	$sqlExpeditionsCli.= " LEFT JOIN ".MAIN_DB_PREFIX."commandedet as cd ON (cd.rowid = ed.fk_origin_line)";
 	$sqlExpeditionsCli.= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON (c.rowid = cd.fk_commande)";
-	$sqlExpeditionsCli.= " WHERE e.entity IN (".getEntity('expedition', 1).")";
+	$sqlExpeditionsCli.= " WHERE e.entity IN (".getEntity('expedition').")";
 	$sqlExpeditionsCli.= " AND cd.fk_product = p.rowid";
 	$sqlExpeditionsCli.= " AND c.fk_statut IN (1,2))";
 
@@ -339,14 +339,14 @@ if ($usevirtualstock)
 	$sqlCommandesFourn.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd";
 	$sqlCommandesFourn.= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
 	$sqlCommandesFourn.= " WHERE c.rowid = cd.fk_commande";
-	$sqlCommandesFourn.= " AND c.entity IN (".getEntity('supplier_order', 1).")";
+	$sqlCommandesFourn.= " AND c.entity IN (".getEntity('supplier_order').")";
 	$sqlCommandesFourn.= " AND cd.fk_product = p.rowid";
 	$sqlCommandesFourn.= " AND c.fk_statut IN (3,4))";
 
 	$sqlReceptionFourn = "(SELECT ".$db->ifsql("SUM(fd.qty) IS NULL", "0", "SUM(fd.qty)")." as qty";
 	$sqlReceptionFourn.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as cf";
 	$sqlReceptionFourn.= " LEFT JOIN ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as fd ON (fd.fk_commande = cf.rowid)";
-	$sqlReceptionFourn.= " WHERE cf.entity IN (".getEntity('supplier_order', 1).")";
+	$sqlReceptionFourn.= " WHERE cf.entity IN (".getEntity('supplier_order').")";
 	$sqlReceptionFourn.= " AND fd.fk_product = p.rowid";
 	$sqlReceptionFourn.= " AND cf.fk_statut IN (3,4))";
 
diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php
index 0c71eb6ad18..40e3060cfee 100644
--- a/htdocs/product/stock/valo.php
+++ b/htdocs/product/stock/valo.php
@@ -56,7 +56,7 @@ $sql.= " SUM(ps.pmp * ps.reel) as estimatedvalue, SUM(p.price * ps.reel) as sell
 $sql.= " FROM ".MAIN_DB_PREFIX."entrepot as e";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON e.rowid = ps.fk_entrepot";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON ps.fk_product = p.rowid";
-$sql.= " WHERE e.entity IN (".getEntity('stock', 1).")";
+$sql.= " WHERE e.entity IN (".getEntity('stock').")";
 if ($sref)
 {
     $sql.= " AND e.label LIKE '%".$db->escape($sref)."%'";
diff --git a/htdocs/projet/class/api_projects.class.php b/htdocs/projet/class/api_projects.class.php
index 0f4f85c05af..e2a60578e9e 100644
--- a/htdocs/projet/class/api_projects.class.php
+++ b/htdocs/projet/class/api_projects.class.php
@@ -116,7 +116,7 @@ class Projects extends DolibarrApi
 
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
 
-        $sql.= ' WHERE t.entity IN ('.getEntity('project', 1).')';
+        $sql.= ' WHERE t.entity IN ('.getEntity('project').')';
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
         if ($socids) $sql.= " AND t.fk_soc IN (".$socids.")";
         if ($search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
diff --git a/htdocs/projet/class/api_tasks.class.php b/htdocs/projet/class/api_tasks.class.php
index d2d7b81d865..d6303c18a16 100644
--- a/htdocs/projet/class/api_tasks.class.php
+++ b/htdocs/projet/class/api_tasks.class.php
@@ -123,7 +123,7 @@ class Tasks extends DolibarrApi
 
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
 
-        $sql.= ' WHERE t.entity IN ('.getEntity('project', 1).')';
+        $sql.= ' WHERE t.entity IN ('.getEntity('project').')';
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
         if ($socids) $sql.= " AND t.fk_soc IN (".$socids.")";
         if ($search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 6a7b130ac0d..7cb6c29de1a 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -385,7 +385,7 @@ class Project extends CommonObject
         else if (! empty($ref))
         {
         	$sql.= " WHERE ref='".$this->db->escape($ref)."'";
-        	$sql.= " AND entity IN (".getEntity('project',1).")";
+        	$sql.= " AND entity IN (".getEntity('project').")";
         }
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
@@ -1108,7 +1108,7 @@ class Project extends CommonObject
         {
             $sql.= ", " . MAIN_DB_PREFIX . "element_contact as ec";
         }
-        $sql.= " WHERE p.entity IN (".getEntity('project',1).")";
+        $sql.= " WHERE p.entity IN (".getEntity('project').")";
         // Internal users must see project he is contact to even if project linked to a third party he can't see.
         //if ($socid || ! $user->rights->societe->client->voir)	$sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
         if ($socid > 0) $sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = " . $socid . ")";
@@ -1681,7 +1681,7 @@ class Project extends CommonObject
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
         if (! $user->rights->societe->client->voir && ! $socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
         $sql.= " WHERE p.fk_statut = 1";
-        $sql.= " AND p.entity IN (".getEntity('project').')';
+        $sql.= " AND p.entity IN (".getEntity('project', false)')';
         if ($mine || ! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")";
         // No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
         //if ($socid || ! $user->rights->societe->client->voir)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
@@ -1756,7 +1756,7 @@ class Project extends CommonObject
 	    $sql = "SELECT count(p.rowid) as nb";
 	    $sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
 	    $sql.= " WHERE";
-	    $sql.= " p.entity IN (".getEntity('projet', 1).")";
+	    $sql.= " p.entity IN (".getEntity('projet').")";
 		if (! $user->rights->projet->all->lire) 
 		{
 			$projectsListId = $this->getProjectsAuthorizedForUser($user,0,1);
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index e1025241115..c21669daf3b 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -690,7 +690,7 @@ class Task extends CommonObject
                 $sql.= ", ".MAIN_DB_PREFIX."element_contact as ec2";
                 $sql.= ", ".MAIN_DB_PREFIX."c_type_contact as ctc2";
             }
-            $sql.= " WHERE p.entity IN (".getEntity('project',1).")";
+            $sql.= " WHERE p.entity IN (".getEntity('project').")";
             $sql.= " AND t.fk_projet = p.rowid";
         }
         elseif ($mode == 1)
@@ -710,7 +710,7 @@ class Task extends CommonObject
             {
                 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t on t.fk_projet = p.rowid";
             }
-            $sql.= " WHERE p.entity IN (".getEntity('project',1).")";
+            $sql.= " WHERE p.entity IN (".getEntity('project').")";
         }
         else return 'BadValueForParameterMode';
 
@@ -1704,7 +1704,7 @@ class Task extends CommonObject
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
         if (! $user->rights->societe->client->voir && ! $socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
         $sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
-        $sql.= " WHERE p.entity IN (".getEntity('project').')';
+        $sql.= " WHERE p.entity IN (".getEntity('project', false)')';
         $sql.= " AND p.fk_statut = 1";
         $sql.= " AND t.fk_projet = p.rowid";
         $sql.= " AND t.progress < 100";         // tasks to do
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index b327573e3db..851956f816b 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -259,7 +259,7 @@ if ($search_project_user > 0)
 {
 	$sql.=", ".MAIN_DB_PREFIX."element_contact as ecp";
 }
-$sql.= " WHERE p.entity IN (".getEntity('project',1).')';
+$sql.= " WHERE p.entity IN (".getEntity('project').')';
 if (! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")";     // public and assigned to, or restricted to company for external users
 // No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
 if ($socid) $sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 4e31434dbc4..19e64826110 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -268,7 +268,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 if ($search_project_user > 0)  $sql.=", ".MAIN_DB_PREFIX."element_contact as ecp";
 if ($search_task_user > 0)     $sql.=", ".MAIN_DB_PREFIX."element_contact as ect";
 $sql.= " WHERE t.fk_projet = p.rowid";
-$sql.= " AND p.entity IN (".getEntity('project',1).')';
+$sql.= " AND p.entity IN (".getEntity('project').')';
 if (! $user->rights->projet->all->lire) $sql.=" AND p.rowid IN (".($projectsListId?$projectsListId:'0').")";    // public and assigned to projects, or restricted to company for external users
 // No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
 if ($socid) $sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php
index 51024cfe7ee..4fbb8dde70d 100644
--- a/htdocs/resource/class/dolresource.class.php
+++ b/htdocs/resource/class/dolresource.class.php
@@ -470,7 +470,7 @@ class Dolresource extends CommonObject
     	$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
     	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_resource as ty ON ty.code=t.fk_code_type_resource";
     	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX.$this->table_element."_extrafields as ef ON ef.fk_object=t.rowid";
-    	$sql.= " WHERE t.entity IN (".getEntity('resource',1).")";
+    	$sql.= " WHERE t.entity IN (".getEntity('resource').")";
 
     	//Manage filter
     	if (!empty($filter)){
@@ -555,7 +555,7 @@ class Dolresource extends CommonObject
 		$sql.= " t.fk_user_create,";
 		$sql.= " t.tms";
    		$sql.= ' FROM '.MAIN_DB_PREFIX .'element_resources as t ';
-   		$sql.= " WHERE t.entity IN (".getEntity('resource',1).")";
+   		$sql.= " WHERE t.entity IN (".getEntity('resource').")";
 
    		//Manage filter
    		if (!empty($filter)){
@@ -637,7 +637,7 @@ class Dolresource extends CommonObject
     	$sql.= " t.fk_user_create,";
     	$sql.= " t.tms";
     	$sql.= ' FROM '.MAIN_DB_PREFIX .'element_resources as t ';
-    	$sql.= " WHERE t.entity IN (".getEntity('resource',1).")";
+    	$sql.= " WHERE t.entity IN (".getEntity('resource').")";
 
     	//Manage filter
     	if (!empty($filter)){
diff --git a/htdocs/societe/ajaxcompanies.php b/htdocs/societe/ajaxcompanies.php
index b3565a2ca26..f81d9092fd2 100644
--- a/htdocs/societe/ajaxcompanies.php
+++ b/htdocs/societe/ajaxcompanies.php
@@ -61,7 +61,7 @@ if (GETPOST('newcompany') || GETPOST('socid','int') || GETPOST('id_fourn'))
 
 	$sql = "SELECT rowid, nom";
 	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-	$sql.= " WHERE s.entity IN (".getEntity('societe', 1).")";
+	$sql.= " WHERE s.entity IN (".getEntity('societe').")";
 	if ($socid)
 	{
         $sql.=" AND (";
diff --git a/htdocs/societe/class/api_contacts.class.php b/htdocs/societe/class/api_contacts.class.php
index 02c1410fcbf..ad82db3e008 100644
--- a/htdocs/societe/class/api_contacts.class.php
+++ b/htdocs/societe/class/api_contacts.class.php
@@ -114,7 +114,7 @@ class Contacts extends DolibarrApi
 			$sql.= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc"; 
 		}
 		$sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s ON t.fk_soc = s.rowid";
-		$sql.= ' WHERE t.entity IN (' . getEntity('socpeople', 1) . ')';
+		$sql.= ' WHERE t.entity IN (' . getEntity('socpeople') . ')';
 		if ($socids) $sql.= " AND t.fk_soc IN (" . $socids . ")";
 
 		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0)
diff --git a/htdocs/societe/class/api_deprecated_contact.class.php b/htdocs/societe/class/api_deprecated_contact.class.php
index 8cb61fa3eb0..bfa032f13c4 100644
--- a/htdocs/societe/class/api_deprecated_contact.class.php
+++ b/htdocs/societe/class/api_deprecated_contact.class.php
@@ -126,7 +126,7 @@ class ContactApi extends DolibarrApi
 			$sql.= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc"; 
 		}
 		$sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s ON c.fk_soc = s.rowid";
-		$sql.= ' WHERE  c.entity IN (' . getEntity('socpeople', 1) . ')';
+		$sql.= ' WHERE  c.entity IN (' . getEntity('socpeople') . ')';
 		if ($socid)
 			$sql.= " AND c.fk_soc = " . $socid;
 
diff --git a/htdocs/societe/class/api_deprecated_thirdparty.class.php b/htdocs/societe/class/api_deprecated_thirdparty.class.php
index a8146f4cca6..bca74ba8ae2 100644
--- a/htdocs/societe/class/api_deprecated_thirdparty.class.php
+++ b/htdocs/societe/class/api_deprecated_thirdparty.class.php
@@ -178,7 +178,7 @@ class ThirdpartyApi extends DolibarrApi
         if ($mode == 1) $sql.= " AND s.client IN (1, 3)";
         if ($mode == 2) $sql.= " AND s.client IN (2, 3)";
         if ($mode == 3) $sql.= " AND s.client IN (0)";
-        $sql.= ' AND s.entity IN ('.getEntity('societe', 1).')';
+        $sql.= ' AND s.entity IN ('.getEntity('societe').')';
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc";
         if ($email != NULL) $sql.= " AND s.email = \"".$email."\"";
         if ($socid) $sql.= " AND s.rowid = ".$socid;
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index 507fd62ec48..24cf991da52 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -119,7 +119,7 @@ class Thirdparties extends DolibarrApi
         if ($mode == 1) $sql.= " AND t.client IN (1, 3)";
         if ($mode == 2) $sql.= " AND t.client IN (2, 3)";
         if ($mode == 3) $sql.= " AND t.client IN (0)";
-        $sql.= ' AND t.entity IN ('.getEntity('societe', 1).')';
+        $sql.= ' AND t.entity IN ('.getEntity('societe').')';
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";
         //if ($email != NULL) $sql.= " AND s.email = \"".$email."\"";
         if ($socid) $sql.= " AND t.rowid IN (".$socids.")";
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index ebd06dbd5c4..2610ea7071f 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1248,7 +1248,7 @@ class Societe extends CommonObject
 
     	// Generation requete recherche
     	$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe";
-    	$sql.= " WHERE entity IN (".getEntity('category',1).")";
+    	$sql.= " WHERE entity IN (".getEntity('category').")";
     	if (! empty($type))
     	{
     		if ($type == 1 || $type == 2)
@@ -2640,7 +2640,7 @@ class Societe extends CommonObject
         }
 
          //Verify duplicate entries
-        $sql  = "SELECT COUNT(*) as idprof FROM ".MAIN_DB_PREFIX."societe WHERE ".$field." = '".$value."' AND entity IN (".getEntity('societe',1).")";
+        $sql  = "SELECT COUNT(*) as idprof FROM ".MAIN_DB_PREFIX."societe WHERE ".$field." = '".$value."' AND entity IN (".getEntity('societe').")";
         if($socid) $sql .= " AND rowid <> ".$socid;
         $resql = $this->db->query($sql);
         if ($resql)
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index c3508bd0cef..0973de848b5 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -107,7 +107,7 @@ $total=0;
 $sql = "SELECT s.rowid, s.client, s.fournisseur";
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql.= ' WHERE s.entity IN ('.getEntity('societe', 1).')';
+$sql.= ' WHERE s.entity IN ('.getEntity('societe').')';
 if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($socid)	$sql.= " AND s.rowid = ".$socid;
 if (! $user->rights->fournisseur->lire) $sql.=" AND (s.fournisseur <> 1 OR s.client <> 0)";    // client=0, fournisseur=0 must be visible
@@ -184,7 +184,7 @@ if (! empty($conf->categorie->enabled) && ! empty($conf->global->CATEGORY_GRAPHS
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cs.fk_categorie = c.rowid";
 	$sql.= " WHERE c.type = 2";
 	if (! is_numeric($conf->global->CATEGORY_GRAPHSTATS_ON_THIRDPARTIES)) $sql.= " AND c.label like '".$db->escape($conf->global->CATEGORY_GRAPHSTATS_ON_THIRDPARTIES)."'";
-	$sql.= " AND c.entity IN (".getEntity('category',1).")";
+	$sql.= " AND c.entity IN (".getEntity('category').")";
 	$sql.= " GROUP BY c.label";
 	$total=0;
 	$result = $db->query($sql);
@@ -248,7 +248,7 @@ $sql.= ", s.logo";
 $sql.= ", s.canvas, s.tms as datem, s.status as status";
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql.= ' WHERE s.entity IN ('.getEntity('societe', 1).')';
+$sql.= ' WHERE s.entity IN ('.getEntity('societe').')';
 if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($socid)	$sql.= " AND s.rowid = ".$socid;
 if (! $user->rights->fournisseur->lire) $sql.=" AND (s.fournisseur != 1 OR s.client != 0)";
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 51d4b41e6bb..3ab173e958b 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -396,7 +396,7 @@ $sql.= " ,".MAIN_DB_PREFIX."c_stcomm as st";
 // We'll need this table joined to the select in order to filter by sale
 if ($search_sale || (!$user->rights->societe->client->voir && !$socid)) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE s.fk_stcomm = st.id";
-$sql.= " AND s.entity IN (".getEntity('societe', 1).")";
+$sql.= " AND s.entity IN (".getEntity('societe').")";
 if (! $user->rights->societe->client->voir && ! $socid)	$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($socid)           $sql.= " AND s.rowid = ".$socid;
 if ($search_sale)     $sql.= " AND s.rowid = sc.fk_soc";        // Join for the needed table to filter by sale
diff --git a/htdocs/societe/notify/index.php b/htdocs/societe/notify/index.php
index 02125e8fad8..ebebb23494c 100644
--- a/htdocs/societe/notify/index.php
+++ b/htdocs/societe/notify/index.php
@@ -64,7 +64,7 @@ $sql.= " ".MAIN_DB_PREFIX."societe as s";
 $sql.= " WHERE n.fk_contact = c.rowid";
 $sql.= " AND a.rowid = n.fk_action";
 $sql.= " AND n.fk_soc = s.rowid";
-$sql.= " AND s.entity IN (".getEntity('societe', 1).")";
+$sql.= " AND s.entity IN (".getEntity('societe').")";
 if ($socid > 0)	$sql.= " AND s.rowid = " . $user->societe_id;
 
 $sql.= $db->order($sortfield,$sortorder);
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 7019933fb9c..35914750ddc 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -2185,7 +2185,7 @@ class SupplierProposal extends CommonObject
         $prodids = array();
         $sql = "SELECT rowid";
         $sql.= " FROM ".MAIN_DB_PREFIX."product";
-        $sql.= " WHERE entity IN (".getEntity('product', 1).")";
+        $sql.= " WHERE entity IN (".getEntity('product').")";
         $resql = $this->db->query($sql);
         if ($resql)
         {
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index 2c10e2451a6..a5d1d6cdc0f 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -266,7 +266,7 @@ if ($search_user > 0)
     $sql.=", ".MAIN_DB_PREFIX."c_type_contact as tc";
 }
 $sql.= ' WHERE sp.fk_soc = s.rowid';
-$sql.= ' AND sp.entity IN ('.getEntity('supplier_proposal', 1).')';
+$sql.= ' AND sp.entity IN ('.getEntity('supplier_proposal').')';
 if (! $user->rights->societe->client->voir && ! $socid) //restriction
 {
 	$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index af1b8441293..f119fa36ffa 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -77,7 +77,7 @@ class Users extends DolibarrApi
 	
 	    $sql = "SELECT t.rowid";
 	    $sql.= " FROM ".MAIN_DB_PREFIX."user as t";
-	    $sql.= ' WHERE t.entity IN ('.getEntity('user', 1).')';
+	    $sql.= ' WHERE t.entity IN ('.getEntity('user').')';
 	    if ($user_ids) $sql.=" AND t.rowid IN (".$user_ids.")";
 	    // Add sql filters
         if ($sqlfilters) 
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index e09e52c1882..869059d359b 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -2529,7 +2529,7 @@ class User extends CommonObject
 		$sql = "SELECT fk_user as id_parent, rowid as id_son";
 		$sql.= " FROM ".MAIN_DB_PREFIX."user";
 		$sql.= " WHERE fk_user <> 0";
-		$sql.= " AND entity IN (".getEntity('user',1).")";
+		$sql.= " AND entity IN (".getEntity('user').")";
 
 		dol_syslog(get_class($this)."::load_parentof", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -2579,7 +2579,7 @@ class User extends CommonObject
 		}
 		else
 		{
-			$sql.= " WHERE u.entity IN (".getEntity('user',1).")";
+			$sql.= " WHERE u.entity IN (".getEntity('user').")";
 		}
 		if ($filter) $sql.=" AND ".$filter;
 
@@ -2764,7 +2764,7 @@ class User extends CommonObject
         $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
         $sql.= " WHERE u.statut > 0";
         //$sql.= " AND employee != 0";
-        $sql.= " AND u.entity IN (".getEntity('user', 1).")";
+        $sql.= " AND u.entity IN (".getEntity('user').")";
 
         $resql=$this->db->query($sql);
         if ($resql)
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 8333acbbb79..898851d2108 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -200,7 +200,7 @@ if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && (! empty($conf
 }
 else
 {
-	$sql.= " WHERE u.entity IN (".getEntity('user',1).")";
+	$sql.= " WHERE u.entity IN (".getEntity('user').")";
 }
 if ($socid > 0) $sql.= " AND u.fk_soc = ".$socid;
 //if ($search_user != '')       $sql.=natural_search(array('u.login', 'u.lastname', 'u.firstname'), $search_user);
diff --git a/htdocs/variants/class/ProductAttribute.class.php b/htdocs/variants/class/ProductAttribute.class.php
index bbfc655a0bd..792a0f67e93 100644
--- a/htdocs/variants/class/ProductAttribute.class.php
+++ b/htdocs/variants/class/ProductAttribute.class.php
@@ -73,7 +73,7 @@ class ProductAttribute
 			return -1;
 		}
 
-		$sql = "SELECT rowid, ref, label, rang FROM ".MAIN_DB_PREFIX."product_attribute WHERE rowid = ".(int) $id." AND entity IN (".getEntity('product', 1).")";
+		$sql = "SELECT rowid, ref, label, rang FROM ".MAIN_DB_PREFIX."product_attribute WHERE rowid = ".(int) $id." AND entity IN (".getEntity('product').")";
 
 		$query = $this->db->query($sql);
 
@@ -100,7 +100,7 @@ class ProductAttribute
 	{
 		$return = array();
 
-		$sql = 'SELECT rowid, ref, label, rang FROM '.MAIN_DB_PREFIX."product_attribute WHERE entity IN (".getEntity('product', 1).')';
+		$sql = 'SELECT rowid, ref, label, rang FROM '.MAIN_DB_PREFIX."product_attribute WHERE entity IN (".getEntity('product').')';
 		$sql .= $this->db->order('rang', 'asc');
 		$query = $this->db->query($sql);
 		if ($query)
@@ -202,7 +202,7 @@ class ProductAttribute
 	public function countChildProducts()
 	{
 		$sql = "SELECT COUNT(*) count FROM ".MAIN_DB_PREFIX."product_attribute_combination2val pac2v
-		LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination pac ON pac2v.fk_prod_combination = pac.rowid WHERE pac2v.fk_prod_attr = ".(int) $this->id." AND pac.entity IN (".getEntity('product', 1).")";
+		LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination pac ON pac2v.fk_prod_combination = pac.rowid WHERE pac2v.fk_prod_attr = ".(int) $this->id." AND pac.entity IN (".getEntity('product').")";
 
 		$query = $this->db->query($sql);
 
diff --git a/htdocs/variants/class/ProductAttributeValue.class.php b/htdocs/variants/class/ProductAttributeValue.class.php
index 399137dca18..02ef86a9222 100644
--- a/htdocs/variants/class/ProductAttributeValue.class.php
+++ b/htdocs/variants/class/ProductAttributeValue.class.php
@@ -68,7 +68,7 @@ class ProductAttributeValue
 	 */
 	public function fetch($valueid)
 	{
-		$sql = "SELECT rowid, fk_product_attribute, ref, value FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE rowid = ".(int) $valueid." AND entity IN (".getEntity('product', 1).")";
+		$sql = "SELECT rowid, fk_product_attribute, ref, value FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE rowid = ".(int) $valueid." AND entity IN (".getEntity('product').")";
 
 		$query = $this->db->query($sql);
 
diff --git a/htdocs/variants/class/ProductCombination.class.php b/htdocs/variants/class/ProductCombination.class.php
index 155d92af532..f6eb4c58935 100644
--- a/htdocs/variants/class/ProductCombination.class.php
+++ b/htdocs/variants/class/ProductCombination.class.php
@@ -86,7 +86,7 @@ class ProductCombination
 	 */
 	public function fetch($rowid)
 	{
-		$sql = "SELECT rowid, fk_product_parent, fk_product_child, variation_price, variation_price_percentage, variation_weight FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE rowid = ".(int) $rowid." AND entity IN (".getEntity('product', 1).")";
+		$sql = "SELECT rowid, fk_product_parent, fk_product_child, variation_price, variation_price_percentage, variation_weight FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE rowid = ".(int) $rowid." AND entity IN (".getEntity('product').")";
 
 		$query = $this->db->query($sql);
 
@@ -118,7 +118,7 @@ class ProductCombination
 	 */
 	public function fetchByFkProductChild($fk_child)
 	{
-		$sql = "SELECT rowid, fk_product_parent, fk_product_child, variation_price, variation_price_percentage, variation_weight FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_child = ".(int) $fk_child." AND entity IN (".getEntity('product', 1).")";
+		$sql = "SELECT rowid, fk_product_parent, fk_product_child, variation_price, variation_price_percentage, variation_weight FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_child = ".(int) $fk_child." AND entity IN (".getEntity('product').")";
 
 		$query = $this->db->query($sql);
 
@@ -150,7 +150,7 @@ class ProductCombination
 	 */
 	public function fetchAllByFkProductParent($fk_product_parent)
 	{
-		$sql = "SELECT rowid, fk_product_parent, fk_product_child, variation_price, variation_price_percentage, variation_weight FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_parent = ".(int) $fk_product_parent." AND entity IN (".getEntity('product', 1).")";
+		$sql = "SELECT rowid, fk_product_parent, fk_product_child, variation_price, variation_price_percentage, variation_weight FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_parent = ".(int) $fk_product_parent." AND entity IN (".getEntity('product').")";
 
 		$query = $this->db->query($sql);
 
@@ -185,7 +185,7 @@ class ProductCombination
 	public function countNbOfCombinationForFkProductParent($fk_product_parent)
 	{
 	    $nb = 0;
-	    $sql = "SELECT count(rowid) as nb FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_parent = ".(int) $fk_product_parent." AND entity IN (".getEntity('product', 1).")";
+	    $sql = "SELECT count(rowid) as nb FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_parent = ".(int) $fk_product_parent." AND entity IN (".getEntity('product').")";
 	
 	    $resql = $this->db->query($sql);
 	    if ($resql) {
diff --git a/htdocs/websites/class/websitepage.class.php b/htdocs/websites/class/websitepage.class.php
index c80d20fe44b..c454a7d3502 100644
--- a/htdocs/websites/class/websitepage.class.php
+++ b/htdocs/websites/class/websitepage.class.php
@@ -205,7 +205,7 @@ class WebsitePage extends CommonObject
 		$sql .= " t.tms as date_modification";
 
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
-		//$sql .= ' WHERE entity IN ('.getEntity('website', 1).')';       // entity is on website level
+		//$sql .= ' WHERE entity IN ('.getEntity('website').')';       // entity is on website level
 		$sql .= ' WHERE 1 = 1';
 		if (null !== $website_id) {
 		    $sql .= " AND t.fk_website = '" . $this->db->escape($website_id) . "'";

From aa780ea33b3164656c71aa3231e53f76ef14bcba Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Tue, 30 May 2017 19:15:37 +0200
Subject: [PATCH 024/438] Fix: missing dot

---
 .../compta/deplacement/class/deplacement.class.php |  2 +-
 htdocs/compta/facture/class/facture.class.php      |  2 +-
 htdocs/contrat/class/contrat.class.php             |  2 +-
 htdocs/contrat/index.php                           | 14 +++++++-------
 htdocs/core/class/html.form.class.php              |  2 +-
 htdocs/core/class/html.formmail.class.php          |  6 +++---
 htdocs/projet/class/project.class.php              |  2 +-
 htdocs/projet/class/task.class.php                 |  2 +-
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php
index 2cfed45c9d4..6fb146c205b 100644
--- a/htdocs/compta/deplacement/class/deplacement.class.php
+++ b/htdocs/compta/deplacement/class/deplacement.class.php
@@ -223,7 +223,7 @@ class Deplacement extends CommonObject
 	{
 		$sql = "SELECT rowid, fk_user, type, fk_statut, km, fk_soc, dated, note_private, note_public, fk_projet, extraparams";
 		$sql.= " FROM ".MAIN_DB_PREFIX."deplacement";
-		$sql.= " WHERE entity IN (".getEntity('deplacement', false)")";
+		$sql.= " WHERE entity IN (".getEntity('deplacement', false).")";
 		if ($ref) $sql.= " AND ref ='".$this->db->escape($ref)."'";
 		else $sql.= " AND rowid = ".$id;
 
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 36d59c36c9a..50ccf788bf5 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -3964,7 +3964,7 @@ class Facture extends CommonInvoice
 	function newCycle()
 	{
 		$sql = 'SELECT max(situation_cycle_ref) FROM ' . MAIN_DB_PREFIX . 'facture as f';
-		$sql.= " WHERE f.entity in (".getEntity('facture', false)")";
+		$sql.= " WHERE f.entity in (".getEntity('facture', false).")";
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			if ($resql->num_rows > 0)
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 762a22889c6..9632d1766e6 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -504,7 +504,7 @@ class Contrat extends CommonObject
 		if ($ref)
 		{
 			$sql.= " WHERE ref='".$this->db->escape($ref)."'";
-			$sql.= " AND entity IN (".getEntity('contract', false)")";
+			$sql.= " AND entity IN (".getEntity('contract', false).")";
 		}
 		else $sql.= " WHERE rowid=".$id;
 
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 3cff590bc4b..608a1167fba 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -107,7 +107,7 @@ $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."contrat as c";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE cd.fk_contrat = c.rowid AND c.fk_soc = s.rowid";
 $sql.= " AND (cd.statut != 4 OR (cd.statut = 4 AND (cd.date_fin_validite is null or cd.date_fin_validite >= '".$db->idate($now)."')))";
-$sql.= " AND c.entity IN (".getEntity('contract', false)")";
+$sql.= " AND c.entity IN (".getEntity('contract', false).")";
 if ($user->societe_id) $sql.=' AND c.fk_soc = '.$user->societe_id;
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 $sql.= " GROUP BY cd.statut";
@@ -144,7 +144,7 @@ $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."contrat as c";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE cd.fk_contrat = c.rowid AND c.fk_soc = s.rowid";
 $sql.= " AND (cd.statut = 4 AND cd.date_fin_validite < '".$db->idate($now)."')";
-$sql.= " AND c.entity IN (".getEntity('contract', false)")";
+$sql.= " AND c.entity IN (".getEntity('contract', false).")";
 if ($user->societe_id) $sql.=' AND c.fk_soc = '.$user->societe_id;
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 $sql.= " GROUP BY cd.statut";
@@ -230,7 +230,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
 	$sql .= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE s.rowid = c.fk_soc";
-	$sql.= " AND c.entity IN (".getEntity('contract', false)")";
+	$sql.= " AND c.entity IN (".getEntity('contract', false).")";
 	$sql.= " AND c.statut = 0";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 	if ($socid) $sql.= " AND c.fk_soc = ".$socid;
@@ -302,7 +302,7 @@ if (!$user->rights->societe->client->voir && !$socid) $sql.= " ".MAIN_DB_PREFIX.
 $sql.= " ".MAIN_DB_PREFIX."contrat as c";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."contratdet as cd ON c.rowid = cd.fk_contrat";
 $sql.= " WHERE c.fk_soc = s.rowid";
-$sql.= " AND c.entity IN (".getEntity('contract', false)")";
+$sql.= " AND c.entity IN (".getEntity('contract', false).")";
 $sql.= " AND c.statut > 0";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($socid) $sql.= " AND s.rowid = ".$socid;
@@ -372,7 +372,7 @@ $sql.= ", ".MAIN_DB_PREFIX."societe as s";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd";
 $sql.= ") LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
-$sql.= " WHERE c.entity IN (".getEntity('contract', false)")";
+$sql.= " WHERE c.entity IN (".getEntity('contract', false).")";
 $sql.= " AND cd.fk_contrat = c.rowid";
 $sql.= " AND c.fk_soc = s.rowid";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
@@ -450,7 +450,7 @@ $sql.= ", ".MAIN_DB_PREFIX."societe as s";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd";
 $sql.= " ) LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
-$sql.= " WHERE c.entity IN (".getEntity('contract', false)")";
+$sql.= " WHERE c.entity IN (".getEntity('contract', false).")";
 $sql.= " AND c.statut = 1";
 $sql.= " AND cd.statut = 0";
 $sql.= " AND cd.fk_contrat = c.rowid";
@@ -529,7 +529,7 @@ $sql.= ", ".MAIN_DB_PREFIX."societe as s";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd";
 $sql.= " ) LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
-$sql.= " WHERE c.entity IN (".getEntity('contract', false)")";
+$sql.= " WHERE c.entity IN (".getEntity('contract', false).")";
 $sql.= " AND c.statut = 1";
 $sql.= " AND cd.statut = 4";
 $sql.= " AND cd.date_fin_validite < '".$db->idate($now)."'";
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index b72a451a41c..1244001da57 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4352,7 +4352,7 @@ class Form
 		$TCurrency = array();
 
 		$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'multicurrency';
-		$sql.= " WHERE entity IN ('".getEntity('mutlicurrency', false)"')";
+		$sql.= " WHERE entity IN ('".getEntity('mutlicurrency', false)."')";
 		$resql = $db->query($sql);
 		if ($resql)
 		{
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index feac8b20cec..fce080bdcf4 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -843,7 +843,7 @@ class FormMail extends Form
 		$sql = "SELECT label, topic, content, content_lines, lang";
 		$sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
 		$sql.= " WHERE type_template='".$db->escape($type_template)."'";
-		$sql.= " AND entity IN (".getEntity('c_email_templates', false)")";
+		$sql.= " AND entity IN (".getEntity('c_email_templates', false).")";
 		$sql.= " AND (fk_user is NULL or fk_user = 0 or fk_user = ".$user->id.")";
 		if ($active >= 0) $sql.=" AND active = ".$active;
 		if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";
@@ -910,7 +910,7 @@ class FormMail extends Form
 		$sql = "SELECT label, topic, content, lang";
 		$sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
 		$sql.= " WHERE type_template='".$this->db->escape($type_template)."'";
-		$sql.= " AND entity IN (".getEntity('c_email_templates', false)")";
+		$sql.= " AND entity IN (".getEntity('c_email_templates', false).")";
 		$sql.= " AND (fk_user is NULL or fk_user = 0 or fk_user = ".$user->id.")";
 		if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";
 		$sql.= $this->db->order("lang,label","ASC");
@@ -947,7 +947,7 @@ class FormMail extends Form
 		$sql = "SELECT rowid, label, topic, content, content_lines, lang, position";
 		$sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
 		$sql.= " WHERE type_template='".$this->db->escape($type_template)."'";
-		$sql.= " AND entity IN (".getEntity('c_email_templates', false)")";
+		$sql.= " AND entity IN (".getEntity('c_email_templates', false).")";
 		$sql.= " AND (fk_user is NULL or fk_user = 0 or fk_user = ".$user->id.")";
 		if ($active >= 0) $sql.=" AND active = ".$active;
 		if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 7cb6c29de1a..ba394f1b8e6 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -1681,7 +1681,7 @@ class Project extends CommonObject
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
         if (! $user->rights->societe->client->voir && ! $socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
         $sql.= " WHERE p.fk_statut = 1";
-        $sql.= " AND p.entity IN (".getEntity('project', false)')';
+        $sql.= " AND p.entity IN (".getEntity('project', false).')';
         if ($mine || ! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")";
         // No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
         //if ($socid || ! $user->rights->societe->client->voir)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index c21669daf3b..b751f8f0478 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -1704,7 +1704,7 @@ class Task extends CommonObject
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
         if (! $user->rights->societe->client->voir && ! $socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
         $sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
-        $sql.= " WHERE p.entity IN (".getEntity('project', false)')';
+        $sql.= " WHERE p.entity IN (".getEntity('project', false).')';
         $sql.= " AND p.fk_statut = 1";
         $sql.= " AND t.fk_projet = p.rowid";
         $sql.= " AND t.progress < 100";         // tasks to do

From 5d115bcf6919d8796ef2abcd0e2291e5de0855ec Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 30 May 2017 20:58:32 +0200
Subject: [PATCH 025/438] Fix deadlock feature, can't process a leave request
 when validator has left company.

---
 htdocs/holiday/card.php         | 60 +++++++++++++++++++++++++++++----
 htdocs/langs/en_US/holiday.lang |  2 +-
 htdocs/langs/en_US/main.lang    |  2 ++
 3 files changed, 57 insertions(+), 7 deletions(-)

diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index c875caab271..78e2940942f 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -570,14 +570,43 @@ if ($action == 'confirm_refuse')
     }
 }
 
+
+// Si Validation de la demande
+if ($action == 'confirm_draft' && GETPOST('confirm') == 'yes')
+{
+    $object = new Holiday($db);
+    $object->fetch($id);
+    
+    $oldstatus = $object->statut;
+    $object->statut = 1;
+    
+    $result = $object->update($user);
+    if ($result < 0)
+    {
+        $error = $langs->trans('ErrorBackToDraft');
+    }
+    
+    if (! $error)
+    {
+        $db->commit();
+        
+        header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+        exit;
+    }
+    else
+    {
+        $db->rollback();
+    }    
+}
+
 // Si Validation de la demande
 if ($action == 'confirm_cancel' && GETPOST('confirm') == 'yes')
 {
     $object = new Holiday($db);
     $object->fetch($id);
 
-    // Si statut en attente de validation et valideur = utilisateur
-    if (($object->statut == 2 || $object->statut == 3) && ($user->id == $object->fk_validator || $user->id == $object->fk_user))
+    // Si statut en attente de validation et valideur = valideur ou utilisateur, ou droits de faire pour les autres
+    if (($object->statut == 2 || $object->statut == 3) && ($user->id == $object->fk_validator || $user->id == $object->fk_user || ! empty($user->rights->holiday->write_all)))
     {
     	$db->begin();
 
@@ -989,6 +1018,12 @@ else
                     print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("TitleCancelCP"),$langs->trans("ConfirmCancelCP"),"confirm_cancel", '', 1, 1);
                 }
 
+                // Si back to draft
+                if ($action == 'backtodraft')
+                {
+                    print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("TitleSetToDraft"),$langs->trans("ConfirmSetToDraft"),"confirm_draft", '', 1, 1);
+                }
+                
                 $head=holiday_prepare_head($object);
 
 
@@ -1208,18 +1243,31 @@ else
                     	print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete" class="butActionDelete">'.$langs->trans("DeleteCP").'</a>';
                     }
 
-                    if ($user->id == $object->fk_validator && $object->statut == 2)
+                    if ($object->statut == 2)
                     {
-                        print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=valid" class="butAction">'.$langs->trans("Approve").'</a>';
-                        print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=refuse" class="butAction">'.$langs->trans("ActionRefuseCP").'</a>';
+                        if ($user->id == $object->fk_validator)
+                        {
+                            print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=valid" class="butAction">'.$langs->trans("Approve").'</a>';
+                            print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=refuse" class="butAction">'.$langs->trans("ActionRefuseCP").'</a>';
+                        }
+                        else
+                        {
+                            print '<a href="#" class="butActionRefused" title="'.$langs->trans("NotTheAssignedApprover").'">'.$langs->trans("Approve").'</a>';
+                            print '<a href="#" class="butActionRefused" title="'.$langs->trans("NotTheAssignedApprover").'">'.$langs->trans("ActionRefuseCP").'</a>';
+                        }
                     }
 
-                    if (($user->id == $object->fk_validator || $user->id == $object->fk_user) && ($object->statut == 2 || $object->statut == 3))	// Status validated or approved
+                    if (($user->id == $object->fk_validator || $user->id == $object->fk_user || ! empty($user->rights->holiday->write_all)) && ($object->statut == 2 || $object->statut == 3))	// Status validated or approved
                     {
                     	if (($object->date_debut > dol_now()) || $user->admin) print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=cancel" class="butAction">'.$langs->trans("ActionCancelCP").'</a>';
                     	else print '<a href="#" class="butActionRefused" title="'.$langs->trans("HolidayStarted").'">'.$langs->trans("ActionCancelCP").'</a>';
                     }
 
+                    if ($canedit && $object->statut == 4)
+                    {
+                        print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=backtodraft" class="butAction">'.$langs->trans("SetToDraft").'</a>';
+                    }
+                    
                     print '</div>';
                 }
 
diff --git a/htdocs/langs/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang
index 441701c098d..e8d225d5af6 100644
--- a/htdocs/langs/en_US/holiday.lang
+++ b/htdocs/langs/en_US/holiday.lang
@@ -16,7 +16,7 @@ CancelCP=Canceled
 RefuseCP=Refused
 ValidatorCP=Approbator
 ListeCP=List of leaves
-ReviewedByCP=Will be reviewed by
+ReviewedByCP=Will be approved by
 DescCP=Description
 SendRequestCP=Create leave request
 DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index ec4e218a11e..ba95ce233f8 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -757,6 +757,8 @@ SomeTranslationAreUncomplete=Some languages may be partially translated or may c
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Monday
 Tuesday=Tuesday

From 48a6e9e03808cbc2a8c9b43f69392aede20c0e92 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 30 May 2017 22:31:57 +0200
Subject: [PATCH 026/438] Removed not used files

---
 htdocs/modulebuilder/index.html               |   0
 htdocs/modulebuilder/oldskeletons/.gitignore  |   2 -
 htdocs/modulebuilder/oldskeletons/README      |  34 -
 .../oldskeletons/build_api_class.php          | 123 ----
 .../oldskeletons/build_class_from_table.php   | 677 ------------------
 .../build_webservice_from_class.php           | 179 -----
 .../oldskeletons/modMyModule.class.php        | 291 --------
 .../oldskeletons/skeleton_api_class.class.php | 289 --------
 .../oldskeletons/skeleton_card.php            | 604 ----------------
 .../oldskeletons/skeleton_class.class.php     | 606 ----------------
 .../oldskeletons/skeleton_list.php            | 570 ---------------
 .../oldskeletons/skeleton_script.php          | 166 -----
 .../skeleton_webservice_server.php            | 272 -------
 .../stock/class/api_stockmovements.class.php  |   1 +
 14 files changed, 1 insertion(+), 3813 deletions(-)
 create mode 100644 htdocs/modulebuilder/index.html
 delete mode 100644 htdocs/modulebuilder/oldskeletons/.gitignore
 delete mode 100644 htdocs/modulebuilder/oldskeletons/README
 delete mode 100755 htdocs/modulebuilder/oldskeletons/build_api_class.php
 delete mode 100755 htdocs/modulebuilder/oldskeletons/build_class_from_table.php
 delete mode 100755 htdocs/modulebuilder/oldskeletons/build_webservice_from_class.php
 delete mode 100644 htdocs/modulebuilder/oldskeletons/modMyModule.class.php
 delete mode 100644 htdocs/modulebuilder/oldskeletons/skeleton_api_class.class.php
 delete mode 100644 htdocs/modulebuilder/oldskeletons/skeleton_card.php
 delete mode 100644 htdocs/modulebuilder/oldskeletons/skeleton_class.class.php
 delete mode 100644 htdocs/modulebuilder/oldskeletons/skeleton_list.php
 delete mode 100644 htdocs/modulebuilder/oldskeletons/skeleton_script.php
 delete mode 100644 htdocs/modulebuilder/oldskeletons/skeleton_webservice_server.php

diff --git a/htdocs/modulebuilder/index.html b/htdocs/modulebuilder/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/modulebuilder/oldskeletons/.gitignore b/htdocs/modulebuilder/oldskeletons/.gitignore
deleted file mode 100644
index 2dda6229d24..00000000000
--- a/htdocs/modulebuilder/oldskeletons/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-out.*
-socpeople*
diff --git a/htdocs/modulebuilder/oldskeletons/README b/htdocs/modulebuilder/oldskeletons/README
deleted file mode 100644
index 5b5b992d91e..00000000000
--- a/htdocs/modulebuilder/oldskeletons/README
+++ /dev/null
@@ -1,34 +0,0 @@
-README (English)
---------------------------------
-This directory contains PHP script samples that can be used to start a development on Dolibarr.
-
-
-*** build_class_from_table.php:
-
-This is the script to use to generate PHP code of a PHP POJO class
-object, a PHP script that use this POJO. This script use the files
-skeleton_*.php to build its generated code. 
-
-
-*** modMyModule.class.php:
-
-Is a sample of module descriptor that you can use if you want to build a new module/plugin for
-Dolibarr.
-
-
-*** skeleton_script.php:
-
-Is a sample you can use as an example if you need to build a script to run on command line
-
-
-*** skeleton_page.php:
-
-Is a sample you can use as an example if you need to build an HTML page to include in Dolibarr GUI.
-
-
-*** skeleton_class.class.php:
-
-Is a sample you can use as an example if you need to build a class file to access a new table required by a Dolibarr development.
-However it is better to run the build_class_from_table.php script that accepts a table name as a parameter and will uses the description table within database and the skeleton_class.class.php file to generate full code for your class file.
-After running this script, the class to access your table (insert a record, update, delete and select) is directly finished and can be used by your module's code. 
-No more coding is needed to get access to table with this script because the file is completely generated once.
diff --git a/htdocs/modulebuilder/oldskeletons/build_api_class.php b/htdocs/modulebuilder/oldskeletons/build_api_class.php
deleted file mode 100755
index 6263eabcd6e..00000000000
--- a/htdocs/modulebuilder/oldskeletons/build_api_class.php
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/usr/bin/env php
-<?php
-/* Copyright (C) 2015   Jean-François Ferry <jfefe@aternatik.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       dev/skeletons/build_api_class.php
- *  \ingroup    core
- *  \brief      Create a complete API class file from existant class file
- */
-
-$sapi_type = php_sapi_name();
-$script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
-
-// Test if batch mode
-if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-    exit;
-}
-
-// Include Dolibarr environment
-require_once($path."../../htdocs/master.inc.php");
-// After this $db is a defined handler to database.
-
-// Main
-$version='1';
-@set_time_limit(0);
-$error=0;
-
-$langs->load("main");
-
-
-print "***** $script_file ($version) *****\n";
-
-
-// -------------------- START OF BUILD_API_FROM_CLASS --------------------
-
-// Check parameters
-if (! isset($argv[1]) && ! isset($argv[2]))
-{
-    print "Usage: $script_file phpClassFile phpClassName\n";
-    exit;
-}
-// Show parameters
-print 'Classfile='.$argv[1]."\n";
-print 'Classname='.$argv[2]."\n";
-
-$classfile=$argv[1];
-$classname=$argv[2];
-$classmin=strtolower($classname);
-$classnameApi = $classname.'Api';
-$property=array();
-$targetcontent='';
-
-// Load the class and read properties
-require_once($classfile);
-
-$property=array();
-$class = new $classname($db);
-$values=get_class_vars($classname);
-
-unset($values['db']);
-unset($values['error']);
-unset($values['errors']);
-unset($values['element']);
-unset($values['table_element']);
-unset($values['table_element_line']);
-unset($values['fk_element']);
-unset($values['ismultientitymanaged']);
-
-// Read skeleton_api_class.class.php file
-$skeletonfile=$path.'skeleton_api_class.class.php';
-$sourcecontent=file_get_contents($skeletonfile);
-if (! $sourcecontent)
-{
-	print "\n";
-	print "Error: Failed to read skeleton sample '".$skeletonfile."'\n";
-	print "Try to run script from skeletons directory.\n";
-	exit;
-}
-
-// Define output variables
-$outfile='out.api_'.$classmin.'.class.php';
-$targetcontent=$sourcecontent;
-
-// Substitute class name
-$targetcontent=preg_replace('/skeleton_api_class\.class\.php/', 'api_'.$classmin.'.class.php', $targetcontent);
-$targetcontent=preg_replace('/skeleton/', $classmin, $targetcontent);
-//$targetcontent=preg_replace('/\$table_element=\'skeleton\'/', '\$table_element=\''.$tablenoprefix.'\'', $targetcontent);
-$targetcontent=preg_replace('/SkeletonApi/', $classnameApi, $targetcontent);
-$targetcontent=preg_replace('/Skeleton/', $classname, $targetcontent);
-
-// Build file
-$fp=fopen($outfile,"w");
-if ($fp)
-{
-	fputs($fp, $targetcontent);
-	fclose($fp);
-	print "\n";
-	print "File '".$outfile."' has been built in current directory.\n";
-}
-else $error++;
-
-
-
-// -------------------- END OF BUILD_CLASS_FROM_TABLE SCRIPT --------------------
-
-print "You can now rename generated files by removing the 'out.' prefix in their name and store them into directory /module/class.\n";
-return $error;
diff --git a/htdocs/modulebuilder/oldskeletons/build_class_from_table.php b/htdocs/modulebuilder/oldskeletons/build_class_from_table.php
deleted file mode 100755
index 0e5a6d82a82..00000000000
--- a/htdocs/modulebuilder/oldskeletons/build_class_from_table.php
+++ /dev/null
@@ -1,677 +0,0 @@
-#!/usr/bin/env php
-<?php
-/* Copyright (C) 2008-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       dev/skeletons/build_class_from_table.php
- *  \ingroup    core
- *  \brief      Create a complete class file from a table in database
- */
-
-$sapi_type = php_sapi_name();
-$script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
-
-// Test if batch mode
-if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-    exit;
-}
-
-// Include Dolibarr environment
-require_once($path."../../htdocs/master.inc.php");
-// After this $db is a defined handler to database.
-
-// Main
-$version='3.2';
-@set_time_limit(0);
-$error=0;
-
-$langs->load("main");
-
-
-print "***** $script_file ($version) *****\n";
-
-
-// -------------------- START OF BUILD_CLASS_FROM_TABLE SCRIPT --------------------
-
-// Check parameters
-if (! isset($argv[1]) || ! isset($argv[2]) || (isset($argv[3]) && ! isset($argv[7])))
-{
-    print "Usage: $script_file tablename modulename [server port databasename user pass]\n";
-    exit;
-}
-
-if (isset($argv[3]) && isset($argv[4]) && isset($argv[5]) && isset($argv[6]) && isset($argv[7]))
-{
-	print 'Use specific database ids'."\n";
-	$db=getDoliDBInstance('mysqli',$argv[3],$argv[6],$argv[7],$argv[5],$argv[4]);
-}
-
-if ($db->type != 'mysql' && $db->type != 'mysqli')
-{
-	print "Error: This script works with mysql or mysqli driver only\n";
-	exit;
-}
-
-$table=$argv[1];
-$module=$argv[2];
-
-// Show parameters
-print 'Tablename: '.$table."\n";
-print 'Modulename: '.$module."\n";
-print "Current dir: ".getcwd()."\n";
-print "Database name: ".$db->database_name."\n";
-
-
-// Define array with list of properties
-$property=array();
-$foundprimary=0;
-$resql=$db->DDLDescTable($table);
-if ($resql)
-{
-	$i=0;
-	while($obj=$db->fetch_object($resql))
-	{
-		//var_dump($obj);
-		$i++;
-		$property[$i]['field']=$obj->Field;
-		if ($obj->Key == 'PRI')
-		{
-			$property[$i]['primary']=1;
-			$foundprimary=1;
-		}
-		else
-		{
-			$property[$i]['primary']=1;
-		}
-		$property[$i]['type'] =$obj->Type;
-		$property[$i]['null'] =$obj->Null;
-		$property[$i]['extra']=$obj->Extra;
-		if ($property[$i]['type'] == 'date'
-			|| $property[$i]['type'] == 'datetime'
-			|| $property[$i]['type'] == 'timestamp')
-		{
-			$property[$i]['istime']=true;
-		}
-		else
-		{
-			$property[$i]['istime']=false;
-		}
-		if (preg_match('/varchar/i',$property[$i]['type'])
-			|| preg_match('/text/i',$property[$i]['type']))
-		{
-			$property[$i]['ischar']=true;
-		}
-		else
-		{
-			$property[$i]['ischar']=false;
-		}
-		if (preg_match('/int/i',$property[$i]['type']))
-		{
-			$property[$i]['isint']=true;
-		}
-		else
-		{
-			$property[$i]['isint']=false;
-		}
-	}
-}
-else
-{
-	print "Error: Failed to get description for table '".$table."'.\n";
-	return false;
-}
-//var_dump($property);
-
-// Define substitute fetch/select parameters
-$varpropselect="\n";
-$cleanparam='';
-$i=0;
-foreach($property as $key => $prop)
-{
-    $i++;
-    if ($prop['field'] != 'rowid')
-    {
-        $varpropselect.="\t\t\$sql .= \" ";
-        $varpropselect.="t.".$prop['field'];
-        if ($i < count($property)) $varpropselect.=",";
-        $varpropselect.="\";";
-        $varpropselect.="\n";
-    }
-}
-
-
-
-//--------------------------------
-// Build skeleton_class.class.php
-//--------------------------------
-
-// Define working variables
-$table=strtolower($table);
-$tablenoprefix=preg_replace('/'.preg_quote(MAIN_DB_PREFIX,'/').'/i','',$table);
-$classname=preg_replace('/_/','',ucfirst($tablenoprefix));
-$classmin=preg_replace('/_/','',strtolower($classname));
-
-
-// Read skeleton_class.class.php file
-$skeletonfile=$path.'skeleton_class.class.php';
-$sourcecontent=file_get_contents($skeletonfile);
-if (! $sourcecontent)
-{
-	print "\n";
-	print "Error: Failed to read skeleton sample '".$skeletonfile."'\n";
-	print "Try to run script from skeletons directory.\n";
-	exit;
-}
-
-// Define output variables
-$outfile=$classmin.'.class.php';
-$targetcontent=$sourcecontent;
-
-// Substitute module name
-$targetcontent=preg_replace('/dev\/skeletons/', $module, $targetcontent);
-$targetcontent=preg_replace('/mymodule othermodule1 othermodule2/', $module, $targetcontent);
-$targetcontent=preg_replace('/mymodule/', $module, $targetcontent);
-
-// Substitute class name
-$targetcontent=preg_replace('/skeleton_class\.class\.php/', $classmin.'.class.php', $targetcontent);
-$targetcontent=preg_replace('/\$element = \'skeleton\'/', '\$element = \''.$classmin.'\'', $targetcontent);
-$targetcontent=preg_replace('/\$table_element = \'skeleton\'/', '\$table_element = \''.$tablenoprefix.'\'', $targetcontent);
-$targetcontent=preg_replace('/Skeleton_Class/', $classname, $targetcontent);
-$targetcontent=preg_replace('/skeletons/', $classmin, $targetcontent);
-$targetcontent=preg_replace('/skeleton/', $classmin, $targetcontent);
-
-// Substitute comments
-$targetcontent=preg_replace('/This file is an example to create a new class file/', 'Put here description of this class', $targetcontent);
-$targetcontent=preg_replace('/\s*\/\/\.\.\./', '', $targetcontent);
-$targetcontent=preg_replace('/Put here some comments/','Initialy built by build_class_from_table on '.strftime('%Y-%m-%d %H:%M',mktime()), $targetcontent);
-
-// Substitute table name
-$targetcontent=preg_replace('/MAIN_DB_PREFIX."mytable/', 'MAIN_DB_PREFIX."'.$tablenoprefix, $targetcontent);
-
-// Substitute declaration parameters
-$varprop="\n";
-$cleanparam='';
-foreach($property as $key => $prop)
-{
-	if ($prop['field'] != 'rowid' && $prop['field'] != 'id')
-	{
-		$varprop.="\tpublic \$".$prop['field'];
-		if ($prop['istime']) $varprop.=" = ''";
-		$varprop.=";";
-		if ($prop['comment']) $varprop.="\t// ".$prop['extra'];
-		$varprop.="\n";
-	}
-}
-$targetcontent=preg_replace('/'.preg_quote('public $prop1;','/').'/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/'.preg_quote('public $prop2;','/').'/', '', $targetcontent);
-
-$targetcontent=preg_replace('/\*((\s|\n|\r|\t)*)\@var mixed Sample property 1((\s|\n|\r|\t)*)/', '', $targetcontent);
-$targetcontent=preg_replace('/\*((\s|\n|\r|\t)*)\@var mixed Sample property 2((\s|\n|\r|\t)*)/', '', $targetcontent);
-
-// Substitute clean parameters
-$varprop="\n";
-$cleanparam='';
-foreach($property as $key => $prop)
-{
-	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-	{
-		$varprop.="\t\tif (isset(\$this->".$prop['field'].")) {\n\t\t\t \$this->".$prop['field']." = trim(\$this->".$prop['field'].");\n\t\t}";
-		$varprop.="\n";
-	}
-}
-$targetcontent=preg_replace('/if \(isset\(\$this->prop1\)\) {((\n|\r|\t)*)\$this->prop1 = trim\(\$this->prop1\);((\n|\r|\t)*)}/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/if \(isset\(\$this->prop2\)\) {((\n|\r|\t)*)\$this->prop2 = trim\(\$this->prop2\);((\n|\r|\t)*)}/', '', $targetcontent);
-
-
-$no_output_field=0;
-foreach($property as $key => $prop)
-{
-	if ($prop['field'] == 'tms') $no_output_field++;	// This is a field of type timestamp edited automatically
-	if ($prop['extra'] == 'auto_increment') $no_output_field++;
-}
-// Substitute insert into parameters
-$varprop="\n";
-$cleanparam='';
-$i=0;
-foreach($property as $key => $prop)
-{
-	$i++;
-	$addfield=1;
-	if ($prop['field'] == 'tms') $addfield=0;	// This is a field of type timestamp edited automatically
-	if ($prop['extra'] == 'auto_increment') $addfield=0;
-
-	if ($addfield)
-	{
-		$varprop.="\t\t\$sql.= '".$prop['field'];
-		if ($i < (count($property)-$no_output_field)) $varprop.=",";
-		$varprop.="';";
-		$varprop.="\n";
-	}
-}
-$targetcontent=preg_replace('/\$sql \.= \' field1,\';/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/\$sql \.= \' field2\';/', '', $targetcontent);
-
-// Substitute insert values parameters
-$varprop="\n";
-$cleanparam='';
-$i=0;
-
-//Count nb field to output to manage commat at end SQL instruction
-
-
-foreach($property as $key => $prop)
-{
-	
-	$addfield=1;
-	if ($prop['field'] == 'tms') $addfield=0;	// This is a field of type timestamp edited automatically
-	if ($prop['extra'] == 'auto_increment') $addfield=0;
-	
-	if ($addfield)
-	{
-		$i++;
-		
-		$varprop.="\t\t\$sql .= ' ";
-		if ($prop['field']=='datec')
-		{
-			$varprop.='\'."\'".$this->db->idate(dol_now())."\'"';
-		}
-		elseif ($prop['istime'])
-		{
-			$varprop.='\'.(! isset($this->'.$prop['field'].') || dol_strlen($this->'.$prop['field'].')==0?\'NULL\':"\'".$this->db->idate(';
-			$varprop.="\$this->".$prop['field'];
-			$varprop.=").\"'\")";
-		}
-		elseif ($prop['ischar'])
-		{
-			$varprop.="'.(! isset(\$this->".$prop['field'].")?'NULL':\"'\".";
-			$varprop.="\$this->db->escape(\$this->".$prop['field'].")";
-			$varprop.=".\"'\")";
-		}
-		elseif ($prop['field']=='fk_user_mod' || $prop['field']=='fk_user_m' ||  $prop['field']=='fk_user_author')
-		{
-			$varprop.="'.\$user->id";
-		}
-		elseif ($prop['isint'])
-		{
-			$varprop.='\'.(! isset($this->'.$prop['field'].')?\'NULL\':';
-			$varprop.="\$this->".$prop['field'];
-			$varprop.=')';
-		}
-		else
-		{
-			$varprop.='\'.(! isset($this->'.$prop['field'].')?\'NULL\':"\'".';
-			$varprop.="\$this->".$prop['field'];
-			$varprop.='."\'")';
-		}
-		
-		if ($i < (count($property)-$no_output_field)) $varprop.=".','";
-		$varprop.=';';
-		$varprop.="\n";
-	}
-}
-
-$patern1='/\$sql \.= \' (.*)\' \. \$this->prop1 \. \'(.*),\';/';
-$patern2='/\$sql \.= \' (.*)\' \. \$this->prop2 \. \'(.*)\';/';
-$targetcontent=preg_replace($patern1, $varprop, $targetcontent);
-$targetcontent=preg_replace($patern2, '', $targetcontent);
-
-// Substitute update values parameters
-
-//Count nb field to output to manage commat at end SQL instruction
-$no_output_field=0;
-foreach($property as $key => $prop)
-{
-	if ($prop['extra'] == 'auto_increment') $no_output_field++;
-}
-
-$varprop="\n";
-$cleanparam='';
-$i=0;
-foreach($property as $key => $prop)
-{
-	
-	$addfield=1;
-	if ($prop['extra'] == 'auto_increment') $addfield=0;
-	
-	if ($addfield)
-	{
-		$i++;
-		
-		$varprop.="\t\t\$sql .= ' ";
-		$varprop.=$prop['field'].' = ';
-		if ($prop['field']=='tms') {
-			$varprop.='\'.(dol_strlen($this->'.$prop['field'].') != 0 ? "\'".$this->db->idate(';
-			$varprop.='$this->'.$prop['field'];
-			$varprop.=')."\'" : "\'".$this->db->idate(dol_now())."\'")';
-		}
-		elseif ($prop['istime'])
-		{
-			$varprop.='\'.(! isset($this->'.$prop['field'].') || dol_strlen($this->'.$prop['field'].') != 0 ? "\'".$this->db->idate(';
-			$varprop.='$this->'.$prop['field'];
-			$varprop.=')."\'" : \'null\')';
-		}
-		
-		elseif ($prop['field']=='fk_user_mod' || $prop['field']=='fk_user_m') {
-			$varprop.="'.\$user->id";
-		}
-		else
-		{
-			$varprop.="'.";
-			if ($prop['ischar']) $varprop.='(isset($this->'.$prop['field'].')?"\'".$this->db->escape($this->'.$prop['field'].')."\'":"null")';
-			elseif ($prop['isint']) $varprop.='(isset($this->'.$prop['field'].')?$this->'.$prop['field'].':"null")';
-			else $varprop.='(isset($this->'.$prop['field'].')?$this->'.$prop['field'].':"null")';
-		}
-
-		if ($i < (count($property)-$no_output_field)) $varprop.=".','";
-		$varprop.=';';
-		$varprop.="\n";
-	}
-}
-$targetcontent=preg_replace('/\$sql \.= " field1=".\(isset\(\$this->field1\)\?"\'".\$this->db->escape\(\$this->field1\)."\'":"null"\).",";/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/\$sql \.= " field2=".\(isset\(\$this->field2\)\?"\'".\$this->db->escape\(\$this->field2\)."\'":"null"\)."";/', '', $targetcontent);
-
-// Substitute fetch/select parameters
-$targetcontent=preg_replace('/\$sql \.= \' t\.field1,\';/', $varpropselect, $targetcontent);
-$targetcontent=preg_replace('/\$sql \.= \' t\.field2\';/', '', $targetcontent);
-
-// Substitute select set parameters
-$varprop="\n";
-$varpropline="\n";
-$cleanparam='';
-$i=0;
-foreach($property as $key => $prop)
-{
-	$i++;
-	if ($prop['field'] != 'rowid' && $prop['field'] != 'id')
-	{
-		$varprop.="\t\t\t\t\$this->".$prop['field']." = ";
-		if ($prop['istime']) $varprop.='$this->db->jdate(';
-		$varprop.='$obj->'.$prop['field'];
-		if ($prop['istime']) $varprop.=')';
-		$varprop.=";";
-		$varprop.="\n";
-		
-		$varpropline.="\t\t\t\t\$line->".$prop['field']." = ";
-		if ($prop['istime']) $varpropline.='$this->db->jdate(';
-		$varpropline.='$obj->'.$prop['field'];
-		if ($prop['istime']) $varpropline.=')';
-		$varpropline.=";";
-		$varpropline.="\n";
-	}
-}
-$targetcontent=preg_replace('/\$this->prop1 = \$obj->field1;/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/\$this->prop2 = \$obj->field2;/', '', $targetcontent);
-
-//Substirute fetchAll
-$targetcontent=preg_replace('/\$line->prop1 = \$obj->field1;/', $varpropline, $targetcontent);
-$targetcontent=preg_replace('/\$line->prop2 = \$obj->field2;/', '', $targetcontent);
-
-
-// Substitute initasspecimen parameters
-$varprop="\n";
-$cleanparam='';
-foreach($property as $key => $prop)
-{
-	if ($prop['field'] != 'rowid' && $prop['field'] != 'id')
-	{
-		$varprop.="\t\t\$this->".$prop['field']." = '';";
-		$varprop.="\n";
-	}
-}
-$targetcontent=preg_replace('/\$this->prop1 = \'prop1\';/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/\$this->prop2 = \'prop2\';/', '', $targetcontent);
-
-// Build file
-$fp=fopen($outfile,"w");
-if ($fp)
-{
-	fputs($fp, $targetcontent);
-	fclose($fp);
-	print "\n";
-	print "File '".$outfile."' has been built in current directory.\n";
-}
-else $error++;
-
-
-
-//--------------------------------------------------------------------
-// Build skeleton_script.php, skeleton_list.php and skeleton_card.php
-//--------------------------------------------------------------------
-
-$skeletonfiles=array(
-    $path.'skeleton_script.php' => $classmin.'_script.php', 
-    $path.'skeleton_list.php' => $classmin.'_list.php', 
-    $path.'skeleton_card.php' => $classmin.'_card.php'
-    );
-    
-foreach ($skeletonfiles as $skeletonfile => $outfile)
-{
-    $sourcecontent=file_get_contents($skeletonfile);
-    if (! $sourcecontent)
-    {
-    	print "\n";
-    	print "Error: Failed to read skeleton sample '".$skeletonfile."'\n";
-    	print "Try to run script from skeletons directory.\n";
-    	exit;
-    }
-    
-    // Define output variables
-    $targetcontent=$sourcecontent;
-    
-    // Substitute module name
-    $targetcontent=preg_replace('/dev\/skeletons/', $module, $targetcontent);
-    $targetcontent=preg_replace('/mymodule othermodule1 othermodule2/', $module, $targetcontent);
-    $targetcontent=preg_replace('/mymodule/', $module, $targetcontent);
-    
-    // Substitute class name
-    $targetcontent=preg_replace('/skeleton_class\.class\.php/', $classmin.'.class.php', $targetcontent);
-    $targetcontent=preg_replace('/skeleton_script\.php/', $classmin.'_script.php', $targetcontent);
-    $targetcontent=preg_replace('/\$element = \'skeleton\'/', '\$element=\''.$classmin.'\'', $targetcontent);
-    $targetcontent=preg_replace('/\$table_element = \'skeleton\'/', '\$table_element=\''.$classmin.'\'', $targetcontent);
-    $targetcontent=preg_replace('/Skeleton_Class/', $classname, $targetcontent);
-    $targetcontent=preg_replace('/skeletons/', $classmin, $targetcontent);
-    $targetcontent=preg_replace('/skeleton/', $classmin, $targetcontent);
-    
-    // Substitute comments
-    $targetcontent=preg_replace('/This file is an example to create a new class file/', 'Put here description of this class', $targetcontent);
-    $targetcontent=preg_replace('/\s*\/\/\.\.\./', '', $targetcontent);
-    $targetcontent=preg_replace('/Put here some comments/','Initialy built by build_class_from_table on '.strftime('%Y-%m-%d %H:%M',mktime()), $targetcontent);
-    
-    // Substitute table name
-    $targetcontent=preg_replace('/MAIN_DB_PREFIX."mytable/', 'MAIN_DB_PREFIX."'.$tablenoprefix, $targetcontent);
-        
-    // Substitute GETPOST search_fieldx
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    if ($prop['isint']) $varprop.='$search_'.$prop['field']."=GETPOST('search_".$prop['field']."','int');\n";
-    	    else $varprop.='$search_'.$prop['field']."=GETPOST('search_".$prop['field']."','alpha');\n";
-    	}
-    }
-    $targetcontent=preg_replace('/'.preg_quote('$search_field1=GETPOST("search_field1");','/').'/', $varprop, $targetcontent);
-    $targetcontent=preg_replace('/'.preg_quote('$search_field2=GETPOST("search_field2");','/').'/', '', $targetcontent);
-    
-    // Substitute GETPOST fieldx
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    if ($prop['isint']) $varprop.="\t\$object->".$prop['field']."=GETPOST('".$prop['field']."','int');\n";
-    	    else $varprop.="\t\$object->".$prop['field']."=GETPOST('".$prop['field']."','alpha');\n";
-    	}
-    }
-    $targetcontent=preg_replace('/'.preg_quote('$object->prop1=GETPOST("field1");','/').'/', $varprop, $targetcontent);
-    $targetcontent=preg_replace('/'.preg_quote('$object->prop2=GETPOST("field2");','/').'/', '', $targetcontent);
-    
-    // Substitute reset search_field = '';
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.='$search_'.$prop['field']."='';\n";
-    	}
-    }
-    $targetcontent=preg_replace('/'.preg_quote('$search_field1=\'\';','/').'/', $varprop, $targetcontent);
-    $targetcontent=preg_replace('/'.preg_quote('$search_field2=\'\';','/').'/', '', $targetcontent);
-    
-    // Substitute fetch/select parameters
-    $targetcontent=preg_replace('/\$sql\s*\.= " t\.field1,";/', $varpropselect, $targetcontent);
-    $targetcontent=preg_replace('/\$sql\s*\.= " t\.field2";/', '', $targetcontent);
-    
-    // Substitute where for search
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.='if ($search_'.$prop['field'].') $sql.= natural_search("'.$prop['field'].'",$search_'.$prop['field'].');'."\n";
-    	}
-    }
-    $targetcontent=preg_replace('/'.preg_quote('if ($search_field1) $sql.= natural_search("field1",$search_field1);','/').'/', $varprop, $targetcontent);
-    $targetcontent=preg_replace('/'.preg_quote('if ($search_field2) $sql.= natural_search("field2",$search_field2);','/').'/', '', $targetcontent);
-    
-    // substitute $params.=
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.="if (\$search_".$prop['field']." != '') \$params.= '&amp;search_".$prop['field']."='.urlencode(\$search_".$prop['field'].");\n";
-    	}
-    }
-    $targetcontent=preg_replace('/'.preg_quote("if (\$search_field1 != '') \$params.= '&amp;search_field1='.urlencode(\$search_field1);",'/').'/', $varprop, $targetcontent);
-    $targetcontent=preg_replace('/'.preg_quote("if (\$search_field2 != '') \$params.= '&amp;search_field2='.urlencode(\$search_field2);",'/').'/', '', $targetcontent);
-    
-    // Substitute arrayfields
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.="'t.".$prop['field']."'=>array('label'=>\$langs->trans(\"Field".$prop['field']."\"), 'checked'=>1),\n";
-    	}
-    }
-    $targetcontent=preg_replace('/'.preg_quote("'t.field1'=>array('label'=>\$langs->trans(\"Field1\"), 'checked'=>1),",'/').'/', $varprop, $targetcontent);
-    $targetcontent=preg_replace('/'.preg_quote("'t.field2'=>array('label'=>\$langs->trans(\"Field2\"), 'checked'=>1),",'/').'/', '', $targetcontent);
-    
-    // Substitute print_liste_field_titre
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.="if (! empty(\$arrayfields['t.".$prop['field']."']['checked'])) print_liste_field_titre(\$arrayfields['t.".$prop['field']."']['label'],\$_SERVER['PHP_SELF'],'t.".$prop['field']."','',\$params,'',\$sortfield,\$sortorder);\n";
-    	}
-    }
-    $targetcontent=preg_replace('/LIST_OF_TD_TITLE_FIELDS/', $varprop, $targetcontent);
-    
-    // Substitute fields title search
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.="if (! empty(\$arrayfields['t.".$prop['field']."']['checked'])) print '<td class=\"liste_titre\"><input type=\"text\" class=\"flat\" name=\"search_".$prop['field']."\" value=\"'.\$search_".$prop['field'].".'\" size=\"10\"></td>';\n";
-    	}
-    }
-    $targetcontent=preg_replace('/LIST_OF_TD_TITLE_SEARCH/', $varprop, $targetcontent);
-    
-    // Substitute where for <td>.fieldx.</td>
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.="if (! empty(\$arrayfields['t.".$prop['field']."']['checked'])) print '<td>'.\$obj->".$prop['field'].".'</td>';\n";
-    	}
-    }
-    $targetcontent=preg_replace('/'.preg_quote("if (! empty(\$arrayfields['t.field1']['checked'])) print '<td>'.\$obj->field1.'</td>';",'/').'/', $varprop, $targetcontent);
-    $targetcontent=preg_replace('/'.preg_quote("if (! empty(\$arrayfields['t.field2']['checked'])) print '<td>'.\$obj->field2.'</td>';",'/').'/', '', $targetcontent);
-
-    // LIST_OF_TD_LABEL_FIELDS_CREATE - List of td for card view 
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.="print '<tr><td class=\"fieldrequired\">'.\$langs->trans(\"Field".$prop['field']."\").'</td><td><input class=\"flat\" type=\"text\" name=\"".$prop['field']."\" value=\"'.GETPOST('".$prop['field']."').'\"></td></tr>';\n";
-    	}
-    }
-    $targetcontent=preg_replace('/LIST_OF_TD_LABEL_FIELDS_CREATE/', $varprop, $targetcontent);
-
-    // LIST_OF_TD_LABEL_FIELDS_EDIT - List of td for card view 
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-            $baseString = 'print "<tr><td class=\"fieldrequired\">".\$langs->trans("Field%s")."</td><td><input class=\"flat\" type=\"text\" name=\"%s\" value=\"".$object->%s."\"></td></tr>";';
-            $varprop.= sprintf("\t ".$baseString." \n", $prop['field'], $prop['field'], $prop['field']);
-    	}
-    }
-    $targetcontent=preg_replace('/LIST_OF_TD_LABEL_FIELDS_EDIT/', $varprop, $targetcontent);
-    
-    // LIST_OF_TD_LABEL_FIELDS_VIEW - List of td for card view 
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.=sprintf("\t print '<tr><td class=\"fieldrequired\">'.\$langs->trans(\"Field%s\").'</td><td>'.\$object->%s.'</td></tr>';\n",$prop['field'],$prop['field']);
-    	}
-    }
-    $targetcontent=preg_replace('/LIST_OF_TD_LABEL_FIELDS_VIEW/', $varprop, $targetcontent);
-    
-    
-    // LIST_OF_TD_FIELDS_LIST
-    
-    
-    
-    // Build file
-    $fp=fopen($outfile,"w");
-    if ($fp)
-    {
-    	fputs($fp, $targetcontent);
-    	fclose($fp);
-    	print "File '".$outfile."' has been built in current directory.\n";
-    }
-    else $error++;
-}
-
-
-// -------------------- END OF BUILD_CLASS_FROM_TABLE SCRIPT --------------------
-
-print "You can now move generated files to store them into directory /yourmodule/class (for .class.php file) or /yourmodule.\n";
-return $error;
diff --git a/htdocs/modulebuilder/oldskeletons/build_webservice_from_class.php b/htdocs/modulebuilder/oldskeletons/build_webservice_from_class.php
deleted file mode 100755
index c91347a424d..00000000000
--- a/htdocs/modulebuilder/oldskeletons/build_webservice_from_class.php
+++ /dev/null
@@ -1,179 +0,0 @@
-#!/usr/bin/env php
-<?php
-/* Copyright (C) 2009 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       dev/skeletons/build_webservice_from_class.php
- *  \ingroup    core
- *  \brief      Create a complete webservice file from CRUD functions of a PHP class
- */
-
-$sapi_type = php_sapi_name();
-$script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
-
-// Test if batch mode
-if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-    exit;
-}
-
-// Include Dolibarr environment
-require_once($path."../../htdocs/master.inc.php");
-// After this $db is a defined handler to database.
-
-// Main
-$version='1.8';
-@set_time_limit(0);
-$error=0;
-
-$langs->load("main");
-
-
-print "***** $script_file ($version) *****\n";
-
-
-// -------------------- START OF BUILD_CLASS_FROM_TABLE SCRIPT --------------------
-
-// Check parameters
-if (! isset($argv[1]) && ! isset($argv[2]))
-{
-    print "Usage: $script_file phpClassFile phpClassName\n";
-    exit;
-}
-
-// Show parameters
-print 'Classfile='.$argv[1]."\n";
-print 'Classname='.$argv[2]."\n";
-
-$classfile=$argv[1];
-$classname=$argv[2];
-$classmin=strtolower($classname);
-$property=array();
-$targetcontent='';
-
-// Load the class and read properties
-require_once($classfile);
-
-$property=array();
-$class = new $classname($db);
-$values=get_class_vars($classname);
-
-unset($values['db']);
-unset($values['error']);
-unset($values['errors']);
-unset($values['element']);
-unset($values['table_element']);
-unset($values['table_element_line']);
-unset($values['fk_element']);
-unset($values['ismultientitymanaged']);
-
-$properties=array_keys($values);
-
-// Read skeleton_class.class.php file
-$skeletonfile='skeleton_webservice_server.php';
-$sourcecontent=file_get_contents($skeletonfile);
-if (! $sourcecontent)
-{
-	print "\n";
-	print "Error: Failed to read skeleton sample '".$skeletonfile."'\n";
-	print "Try to run script from skeletons directory.\n";
-	exit;
-}
-
-// Define output variables
-$outfile='out.server_'.$classmin.'.php';
-$targetcontent=$sourcecontent;
-
-
-
-// Substitute class name
-$targetcontent=preg_replace('/Skeleton/', $classname, $targetcontent);
-$targetcontent=preg_replace('/skeleton/', $classmin, $targetcontent);
-
-// Substitute declaration parameters
-$varprop="\n";
-$cleanparam='';
-$i=0;
-
-while($i<count($properties))
-{
-		$varprop.="'".$properties[$i]."' => array('name'=>'".$properties[$i]."','type'=>'xsd:string')";
-		$i++;
-
-		if ($i == count($properties))
-			$varprop.="\n";
-		else
-			$varprop.=",\n";
-}
-
-$targetcontent=preg_replace('/\'prop1\'=>\'xxx\',/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/\'prop2\'=>\'xxx\',/', '', $targetcontent);
-// Substitute get method parameters
-$varprop="\n";
-$cleanparam='';
-$i=0;
-
-while($i<count($properties))
-{
-		$varprop.="'".$properties[$i]."' => $".$classmin."->".$properties[$i];
-
-		$i++;
-		if ($i == count($properties))
-			$varprop.="\n";
-		else
-			$varprop.=",\n";
-}
-
-$targetcontent=preg_replace('/\'prop1\'=>\$'.$classmin.'->prop1,/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/\'prop2\'=>\$'.$classmin.'->prop2,/', '', $targetcontent);
-
-// Substitute get method parameters
-$varprop="\n\t\t";
-$cleanparam='';
-$i=0;
-
-while($i<count($properties))
-{
-
-	$varprop.='$newobject->'.$properties[$i].'=$'.$classmin.'->'.$properties[$i].';';
-
-	$i++;
-	if ($i == count($properties))
-		$varprop.="\n";
-	else
-		$varprop.="\n\t\t";
-}
-$targetcontent=preg_replace('/\$newobject->prop1=\$'.$classmin.'->prop1;/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/\$newobject->prop2=\$'.$classmin.'->prop2;/', '', $targetcontent);
-
-
-
-// Build file
-$fp=fopen($outfile,"w");
-if ($fp)
-{
-	fputs($fp, $targetcontent);
-	fclose($fp);
-	print "File '".$outfile."' has been built in current directory.\n";
-}
-else $error++;
-
-// -------------------- END OF BUILD_CLASS_FROM_TABLE SCRIPT --------------------
-
-print "You must rename files by removing the 'out.' prefix in their name.\n";
-return $error;
diff --git a/htdocs/modulebuilder/oldskeletons/modMyModule.class.php b/htdocs/modulebuilder/oldskeletons/modMyModule.class.php
deleted file mode 100644
index 4f994c7c654..00000000000
--- a/htdocs/modulebuilder/oldskeletons/modMyModule.class.php
+++ /dev/null
@@ -1,291 +0,0 @@
-<?php
-/* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2016 Regis Houssin        <regis.houssin@capnetworks.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/>.
- */
-
-/**
- * 	\defgroup   mymodule     Module MyModule
- *  \brief      Example of a module descriptor.
- *				Such a file must be copied into htdocs/mymodule/core/modules directory.
- *  \file       htdocs/mymodule/core/modules/modMyModule.class.php
- *  \ingroup    mymodule
- *  \brief      Description and activation file for module MyModule
- */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
-
-
-/**
- *  Description and activation class for module MyModule
- */
-class modMyModule extends DolibarrModules
-{
-	/**
-	 * Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 * @param DoliDB $db Database handler
-	 */
-	public function __construct($db)
-	{
-        global $langs,$conf;
-
-        $this->db = $db;
-
-		// Id for module (must be unique).
-		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
-		$this->numero = 500000;		// TODO Go on page http://wiki.dolibarr.org/index.php/List_of_modules_id to reserve id number for your module
-		// Key text used to identify module (for permissions, menus, etc...)
-		$this->rights_class = 'mymodule';
-
-		// Family can be 'crm','financial','hr','projects','products','ecm','technic','interface','other'
-		// It is used to group modules by family in module setup page
-		$this->family = "other";
-		// Module position in the family
-		$this->module_position = 500;
-		// 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' => '001', 'label' => $langs->trans("MyOwnFamily")));
-
-		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
-		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
-		$this->description = "Description of module MyModule";
-		$this->descriptionlong = "A very long description. Can be a full HTML content";
-		$this->editor_name = 'Editor name';
-		$this->editor_url = 'https://www.dolibarr.org';
-		
-		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
-		$this->version = '1.0';
-		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		// Name of image file used for this module.
-		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
-		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-		$this->picto='generic';
-
-		// Defined all module parts (triggers, login, substitutions, menus, css, etc...)
-		// for default path (eg: /mymodule/core/xxxxx) (0=disable, 1=enable)
-		// for specific path of parts (eg: /mymodule/core/modules/barcode)
-		// for specific css file (eg: /mymodule/css/mymodule.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 directory (core/login)
-		//							'substitutions' => 0,                            	// Set this to 1 if module has its own substitution function file (core/substitutions)
-		//							'menus' => 0,                                    	// Set this to 1 if module has its own menus handler directory (core/menus)
-		//							'theme' => 0,                                    	// Set this to 1 if module has its own theme directory (theme)
-		//                        	'tpl' => 0,                                      	// Set this to 1 if module overwrite template dir (core/tpl)
-		//							'barcode' => 0,                                  	// Set this to 1 if module has its own barcode directory (core/modules/barcode)
-		//							'models' => 0,                                   	// Set this to 1 if module has its own models directory (core/modules/xxx)
-		//							'css' => array('/mymodule/css/mymodule.css.php'),	// Set this to relative path of css file if module has its own css file
-	 	//							'js' => array('/mymodule/js/mymodule.js'),          // Set this to relative path of js file if module must load a js on all pages
-		//							'hooks' => array('hookcontext1','hookcontext2',...) // Set here all hooks context managed by module. You can also set hook context 'all'
-		//							'dir' => array('output' => 'othermodulename'),      // To force the default directories names
-		//							'workflow' => array('WORKFLOW_MODULE1_YOURACTIONTYPE_MODULE2'=>array('enabled'=>'! empty($conf->module1->enabled) && ! empty($conf->module2->enabled)', 'picto'=>'yourpicto@mymodule')) // Set here all workflow context managed by module
-		//                        );
-		$this->module_parts = array();
-
-		// Data directories to create when module is enabled.
-		// Example: this->dirs = array("/mymodule/temp");
-		$this->dirs = array();
-
-		// Config pages. Put here list of php page, stored into mymodule/admin directory, to use to setup module.
-		$this->config_page_url = array("mysetuppage.php@mymodule");
-
-		// 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->phpmin = array(5,0);					// Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
-		$this->langfiles = array("mylangfile@mymodule");
-
-		// 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('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
-		//                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
-		// );
-		$this->const = array();
-
-		// Array to add new pages in new tabs
-		// Example: $this->tabs = array('objecttype:+tabname1:Title1:mylangfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__',  					// To add a new tab identified by code tabname1
-        //                              'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@mymodule:$user->rights->othermodule->read:/mymodule/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.
-        //                              'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
-		// where objecttype can be
-		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
-		// 'contact'          to add a tab in contact view
-		// 'contract'         to add a tab in contract view
-		// 'group'            to add a tab in group view
-		// 'intervention'     to add a tab in intervention view
-		// 'invoice'          to add a tab in customer invoice view
-		// 'invoice_supplier' to add a tab in supplier invoice view
-		// 'member'           to add a tab in fundation member view
-		// 'opensurveypoll'	  to add a tab in opensurvey poll view
-		// 'order'            to add a tab in customer order view
-		// 'order_supplier'   to add a tab in supplier order view
-		// 'payment'		  to add a tab in payment view
-		// 'payment_supplier' to add a tab in supplier payment view
-		// 'product'          to add a tab in product view
-		// 'propal'           to add a tab in propal view
-		// 'project'          to add a tab in project view
-		// 'stock'            to add a tab in stock view
-		// 'thirdparty'       to add a tab in third party view
-		// 'user'             to add a tab in user view
-        $this->tabs = array();
-
-		if (! isset($conf->mymodule) || ! isset($conf->mymodule->enabled))
-        {
-        	$conf->mymodule=new stdClass();
-        	$conf->mymodule->enabled=0;
-        }
-        
-        // Dictionaries
-		$this->dictionaries=array();
-        /* Example:
-        $this->dictionaries=array(
-            'langs'=>'mylangfile@mymodule',
-            'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),		// List of tables we want to see into dictonnary editor
-            'tablib'=>array("Table1","Table2","Table3"),													// Label of tables
-            'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),	// Request to select fields
-            'tabsqlsort'=>array("label ASC","label ASC","label ASC"),																					// Sort order
-            'tabfield'=>array("code,label","code,label","code,label"),																					// List of fields (result of select to show dictionary)
-            'tabfieldvalue'=>array("code,label","code,label","code,label"),																				// List of fields (list of fields to edit a record)
-            'tabfieldinsert'=>array("code,label","code,label","code,label"),																			// List of fields (list of fields for insert)
-            'tabrowid'=>array("rowid","rowid","rowid"),																									// Name of columns with primary key (try to always name it 'rowid')
-            'tabcond'=>array($conf->mymodule->enabled,$conf->mymodule->enabled,$conf->mymodule->enabled)												// Condition to show each dictionary
-        );
-        */
-
-        // Boxes
-		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
-        $this->boxes = array();			// List of boxes
-		// Example:
-		//$this->boxes=array(
-		//    0=>array('file'=>'myboxa.php@mymodule','note'=>'','enabledbydefaulton'=>'Home'),
-		//    1=>array('file'=>'myboxb.php@mymodule','note'=>''),
-		//    2=>array('file'=>'myboxc.php@mymodule','note'=>'')
-		//);
-
-		// Cronjobs
-		$this->cronjobs = array();			// List of cron jobs entries to add
-		// Example: $this->cronjobs=array(0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'test'=>true),
-		//                                1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'test'=>true)
-		// );
-
-		// Permissions
-		$this->rights = array();		// Permission array used by this module
-		$r=0;
-
-		// Add here list of permission defined by an id, a label, a boolean and two constant strings.
-		// Example:
-		// $this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
-		// $this->rights[$r][1] = 'Permision label';	// Permission label
-		// $this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
-		// $this->rights[$r][4] = 'level1';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		// $this->rights[$r][5] = 'level2';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		// $r++;
-
-		// Main menu entries
-		$this->menu = array();			// List of menus to add
-		$r=0;
-
-		// Add here entries to declare new menus
-		//
-		// Example to declare a new Top Menu entry and its Left menu entry:
-		// $this->menu[$r]=array(	'fk_menu'=>'',			                // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-		//							'type'=>'top',			                // This is a Top menu entry
-		//							'titre'=>'MyModule top menu',
-		//							'mainmenu'=>'mymodule',
-		//							'leftmenu'=>'mymodule',
-		//							'url'=>'/mymodule/pagetop.php',
-		//							'langs'=>'mylangfile@mymodule',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-		//							'position'=>100,
-		//							'enabled'=>'$conf->mymodule->enabled',	// Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled.
-		//							'perms'=>'1',			                // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
-		//							'target'=>'',
-		//							'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
-		// $r++;
-		//
-		// Example to declare a Left Menu entry into an existing Top menu entry:
-		// $this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=xxx',		    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-		//							'type'=>'left',			                // This is a Left menu entry
-		//							'titre'=>'MyModule left menu',
-		//							'mainmenu'=>'xxx',
-		//							'leftmenu'=>'mymodule',
-		//							'url'=>'/mymodule/pagelevel2.php',
-		//							'langs'=>'mylangfile@mymodule',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-		//							'position'=>100,
-		//							'enabled'=>'$conf->mymodule->enabled',  // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-		//							'perms'=>'1',			                // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
-		//							'target'=>'',
-		//							'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
-		// $r++;
-
-
-		// Exports
-		$r=1;
-
-		// Example:
-		// $this->export_code[$r]=$this->rights_class.'_'.$r;
-		// $this->export_label[$r]='MyModule';	// Translation key (used only if key ExportDataset_xxx_z not found)
-        // $this->export_enabled[$r]='1';                               // Condition to show export in list (ie: '$user->id==3'). Set to 1 to always show when module is enabled.
-        // $this->export_icon[$r]='generic:MyModule';					// Put here code of icon then string for translation key of module name
-		// $this->export_permission[$r]=array(array("mymodule","level1","level2"));
-		// $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','s.fk_pays'=>'Country','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','f.rowid'=>"InvoiceId",'f.facnumber'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note'=>"InvoiceNote",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.price'=>"LineUnitPrice",'fd.tva_tx'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",'fd.total_tva'=>"LineTotalTVA",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",'fd.date_end'=>"DateEnd",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef');
-		// $this->export_TypeFields_array[$r]=array('t.date'=>'Date', 't.qte'=>'Numeric', 't.poids'=>'Numeric', 't.fad'=>'Numeric', 't.paq'=>'Numeric', 't.stockage'=>'Numeric', 't.fadparliv'=>'Numeric', 't.livau100'=>'Numeric', 't.forfait'=>'Numeric', 's.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text','f.facnumber'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.date_lim_reglement'=>"Date",'f.total'=>"Numeric",'f.total_ttc'=>"Numeric",'f.tva'=>"Numeric",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_private'=>"Text",'f.note_public'=>"Text",'fd.description'=>"Text",'fd.subprice'=>"Numeric",'fd.tva_tx'=>"Numeric",'fd.qty'=>"Numeric",'fd.total_ht'=>"Numeric",'fd.total_tva'=>"Numeric",'fd.total_ttc'=>"Numeric",'fd.date_start'=>"Date",'fd.date_end'=>"Date",'fd.special_code'=>'Numeric','fd.product_type'=>"Numeric",'fd.fk_product'=>'List:product:label','p.ref'=>'Text','p.label'=>'Text','p.accountancy_code_sell'=>'Text');
-		// $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','s.fk_pays'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company','f.rowid'=>"invoice",'f.facnumber'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",'fd.price'=>"invoice_line",'fd.total_ht'=>"invoice_line",'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_tx'=>"invoice_line",'fd.qty'=>"invoice_line",'fd.date_start'=>"invoice_line",'fd.date_end'=>"invoice_line",'fd.fk_product'=>'product','p.ref'=>'product');
-		// $this->export_dependencies_array[$r]=array('invoice_line'=>'fd.rowid','product'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
-		// $this->export_sql_start[$r]='SELECT DISTINCT ';
-		// $this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facturedet as fd, '.MAIN_DB_PREFIX.'societe as s)';
-		// $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
-		// $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
-		// $this->export_sql_order[$r] .=' ORDER BY s.nom';
-		// $r++;
-	}
-
-	/**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-	 */
-	public function init($options='')
-	{
-		$sql = array();
-
-		//$this->_load_tables('/mymodule/sql/');
-
-		return $this->_init($sql, $options);
-	}
-
-	/**
-	 * Function called when module is disabled.
-	 * Remove from database constants, boxes and permissions from Dolibarr database.
-	 * Data directories are not deleted
-	 *
-	 * @param      string	$options    Options when enabling module ('', 'noboxes')
-	 * @return     int             	1 if OK, 0 if KO
-	 */
-	public function remove($options = '')
-	{
-		$sql = array();
-
-		return $this->_remove($sql, $options);
-	}
-
-}
-
diff --git a/htdocs/modulebuilder/oldskeletons/skeleton_api_class.class.php b/htdocs/modulebuilder/oldskeletons/skeleton_api_class.class.php
deleted file mode 100644
index a40b00af72c..00000000000
--- a/htdocs/modulebuilder/oldskeletons/skeleton_api_class.class.php
+++ /dev/null
@@ -1,289 +0,0 @@
-<?php
-/* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
- use Luracast\Restler\RestException;
-
-
-/**
- * API class for skeleton object
- *
- * @smart-auto-routing false
- * @access protected 
- * @class  DolibarrApiAccess {@requires user,external}
- * 
- *
- */
-class SkeletonApi extends DolibarrApi
-{
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object 
-     */
-    static $FIELDS = array(
-        'name'
-    );
-
-    /**
-     * @var Skeleton $skeleton {@type Skeleton}
-     */
-    public $skeleton;
-
-    /**
-     * Constructor
-     *
-     * @url     GET skeleton/
-     * 
-     */
-    function __construct()
-    {
-		global $db, $conf;
-		$this->db = $db;
-        $this->skeleton = new Skeleton($this->db);
-    }
-
-    /**
-     * Get properties of a skeleton object
-     *
-     * Return an array with skeleton informations
-     *
-     * @param 	int 	$id ID of skeleton
-     * @return 	array|mixed data without useless information
-	 * 
-     * @url	GET skeleton/{id}
-     * @throws 	RestException
-     */
-    function get($id)
-    {		
-		if(! DolibarrApiAccess::$user->rights->skeleton->read) {
-			throw new RestException(401);
-		}
-			
-        $result = $this->skeleton->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'Skeleton not found');
-        }
-		
-		if( ! DolibarrApi::_checkAccessToResource('skeleton',$this->skeleton->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		return $this->_cleanObjectDatas($this->skeleton);
-    }
-
-    /**
-     * List skeletons
-     * 
-     * Get a list of skeletons
-     * 
-     * @param int		$mode		Use this param to filter list
-     * @param string	$sortfield	Sort field
-     * @param string	$sortorder	Sort order
-     * @param int		$limit		Limit for list
-     * @param int		$page		Page number
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101') or (t.import_key:=:'20160101')"
-     * @return array Array of skeleton objects
-     *
-     * @url	GET /skeletons/
-     */
-    function index($mode, $sortfield = "t.rowid", $sortorder = 'ASC', $limit = 0, $page = 0, $sqlfilters = '') {
-        global $db, $conf;
-        
-        $obj_ret = array();
-        
-        $socid = DolibarrApiAccess::$user->societe_id ? DolibarrApiAccess::$user->societe_id : '';
-            
-        // If the internal user must only see his customers, force searching by him
-        if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
-
-        $sql = "SELECT s.rowid";
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-        $sql.= " FROM ".MAIN_DB_PREFIX."skeleton as s";
-        
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
-        $sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
-        $sql.= " WHERE s.fk_stcomm = st.id";
-        
-		// Example of use $mode
-        //if ($mode == 1) $sql.= " AND s.client IN (1, 3)";
-        //if ($mode == 2) $sql.= " AND s.client IN (2, 3)";
-
-        $sql.= ' AND s.entity IN ('.getEntity('skeleton', 1).')';
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND s.fk_soc = sc.fk_soc";
-        if ($socid) $sql.= " AND s.fk_soc = ".$socid;
-        if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
-        // Insert sale filter
-        if ($search_sale > 0)
-        {
-            $sql .= " AND sc.fk_user = ".$search_sale;
-        }
-        if ($sqlfilters)
-        {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-        $sql.= $db->order($sortfield, $sortorder);
-        if ($limit)	{
-            if ($page < 0)
-            {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql.= $db->plimit($limit + 1, $offset);
-        }
-
-        $result = $db->query($sql);
-        if ($result)
-        {
-            $num = $db->num_rows($result);
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($result);
-                $skeleton_static = new Skeleton($db);
-                if($skeleton_static->fetch($obj->rowid)) {
-                    $obj_ret[] = parent::_cleanObjectDatas($skeleton_static);
-                }
-                $i++;
-            }
-        }
-        else {
-            throw new RestException(503, 'Error when retrieve skeleton list');
-        }
-        if( ! count($obj_ret)) {
-            throw new RestException(404, 'No skeleton found');
-        }
-		return $obj_ret;
-    }
-    
-    /**
-     * Create skeleton object
-     *
-     * @param array $request_data   Request datas
-     * @return int  ID of skeleton
-     * 
-     * @url	POST skeleton/
-     */
-    function post($request_data = NULL)
-    {
-        if(! DolibarrApiAccess::$user->rights->skeleton->create) {
-			throw new RestException(401);
-		}
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
-        
-        foreach($request_data as $field => $value) {
-            $this->skeleton->$field = $value;
-        }
-        if( ! $this->skeleton->create(DolibarrApiAccess::$user)) {
-            throw new RestException(500);
-        }
-        return $this->skeleton->id;
-    }
-
-    /**
-     * Update skeleton
-     *
-     * @param int   $id             Id of skeleton to update
-     * @param array $request_data   Datas   
-     * @return int 
-     * 
-     * @url	PUT skeleton/{id}
-     */
-    function put($id, $request_data = NULL)
-    {
-        if(! DolibarrApiAccess::$user->rights->skeleton->create) {
-			throw new RestException(401);
-		}
-        
-        $result = $this->skeleton->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'Skeleton not found');
-        }
-		
-		if( ! DolibarrApi::_checkAccessToResource('skeleton',$this->skeleton->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-        foreach($request_data as $field => $value) {
-            $this->skeleton->$field = $value;
-        }
-        
-        if($this->skeleton->update($id, DolibarrApiAccess::$user))
-            return $this->get ($id);
-        
-        return false;
-    }
-    
-    /**
-     * Delete skeleton
-     *
-     * @param   int     $id   Skeleton ID
-     * @return  array
-     * 
-     * @url	DELETE skeleton/{id}
-     */
-    function delete($id)
-    {
-        if(! DolibarrApiAccess::$user->rights->skeleton->supprimer) {
-			throw new RestException(401);
-		}
-        $result = $this->skeleton->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'Skeleton not found');
-        }
-		
-		if( ! DolibarrApi::_checkAccessToResource('skeleton',$this->skeleton->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-        
-        if( !$this->skeleton->delete($id))
-        {
-            throw new RestException(500);
-        }
-        
-         return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Skeleton deleted'
-            )
-        );
-        
-    }
-    
-    /**
-     * Validate fields before create or update object
-     * 
-     * @param array $data   Data to validate
-     * @return array
-     * 
-     * @throws RestException
-     */
-    function _validate($data)
-    {
-        $skeleton = array();
-        foreach (SkeletonApi::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $skeleton[$field] = $data[$field];
-        }
-        return $skeleton;
-    }
-}
diff --git a/htdocs/modulebuilder/oldskeletons/skeleton_card.php b/htdocs/modulebuilder/oldskeletons/skeleton_card.php
deleted file mode 100644
index 49683af79c8..00000000000
--- a/htdocs/modulebuilder/oldskeletons/skeleton_card.php
+++ /dev/null
@@ -1,604 +0,0 @@
-<?php
-/* Copyright (C) 2007-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) ---Put here your own copyright and developer email---
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *   	\file       dev/skeletons/skeleton_card.php
- *		\ingroup    mymodule othermodule1 othermodule2
- *		\brief      This file is an example of a php page
- *					Put here some comments
- */
-
-//if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
-//if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
-//if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-//if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');			// Do not check anti CSRF attack test
-//if (! defined('NOSTYLECHECK'))   define('NOSTYLECHECK','1');			// Do not check style html tag into posted data
-//if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');		// Do not check anti POST attack test
-//if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');			// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');			// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-//if (! defined("NOLOGIN"))        define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
-
-// Change this following line to use the correct relative path (../, ../../, etc)
-$res=0;
-if (! $res && file_exists("../main.inc.php")) $res=@include '../main.inc.php';					// to work if your module directory is into dolibarr root htdocs directory
-if (! $res && file_exists("../../main.inc.php")) $res=@include '../../main.inc.php';			// to work if your module directory is into a subdir of root htdocs directory
-if (! $res && file_exists("../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../dolibarr/htdocs/main.inc.php';     // Used on dev env only
-if (! $res && file_exists("../../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../../dolibarr/htdocs/main.inc.php';   // Used on dev env only
-if (! $res) die("Include of main fails");
-// Change this following line to use the correct relative path from htdocs
-include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
-dol_include_once('/mymodule/class/skeleton_class.class.php');
-
-// Load traductions files requiredby by page
-$langs->load("mymodule");
-$langs->load("other");
-
-// Get parameters
-$id			= GETPOST('id','int');
-$action		= GETPOST('action','alpha');
-$cancel     = GETPOST('cancel');
-$backtopage = GETPOST('backtopage');
-$myparam	= GETPOST('myparam','alpha');
-
-$search_field1=GETPOST("search_field1");
-$search_field2=GETPOST("search_field2");
-
-if (empty($action) && empty($id) && empty($ref)) $action='view';
-
-// Protection if external user
-if ($user->societe_id > 0)
-{
-	//accessforbidden();
-}
-//$result = restrictedArea($user, 'mymodule', $id);
-
-
-$object = new Skeleton_Class($db);
-$extrafields = new ExtraFields($db);
-
-// fetch optionals attributes and labels
-$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
-
-// Load object
-include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
-
-// Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('skeleton'));
-
-
-
-/*
- * ACTIONS
- *
- * Put here all code to do according to value of "action" parameter
- */
-
-$parameters=array();
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
-{
-	if ($cancel) 
-	{
-		if ($action != 'addlink')
-		{
-			$urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
-			header("Location: ".$urltogo);
-			exit;
-		}		
-		if ($id > 0 || ! empty($ref)) $ret = $object->fetch($id,$ref);
-		$action='';
-	}
-	
-	// Action to add record
-	if ($action == 'add' && ! empty($user->rights->mymodule->create))
-	{
-		if ($cancel)
-		{
-			$urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
-			header("Location: ".$urltogo);
-			exit;
-		}
-
-		$error=0;
-
-		/* object_prop_getpost_prop */
-		$object->prop1=GETPOST("field1");
-		$object->prop2=GETPOST("field2");
-
-		if (empty($object->ref))
-		{
-			$error++;
-			setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), null, 'errors');
-		}
-
-		if (! $error)
-		{
-			$result=$object->create($user);
-			if ($result > 0)
-			{
-				// Creation OK
-				$urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
-				header("Location: ".$urltogo);
-				exit;
-			}
-			{
-				// Creation KO
-				if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-				else  setEventMessages($object->error, null, 'errors');
-				$action='create';
-			}
-		}
-		else
-		{
-			$action='create';
-		}
-	}
-
-	// Action to update record
-	if ($action == 'update' && ! empty($user->rights->mymodule->create))
-	{
-		$error=0;
-
-		$object->prop1=GETPOST("field1");
-		$object->prop2=GETPOST("field2");
-
-		if (empty($object->ref))
-		{
-			$error++;
-			setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), null, 'errors');
-		}
-
-		if (! $error)
-		{
-			$result=$object->update($user);
-			if ($result > 0)
-			{
-				$action='view';
-			}
-			else
-			{
-				// Creation KO
-				if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-				else setEventMessages($object->error, null, 'errors');
-				$action='edit';
-			}
-		}
-		else
-		{
-			$action='edit';
-		}
-	}
-
-	// Action to delete
-	if ($action == 'confirm_delete' && ! empty($user->rights->mymodule->delete))
-	{
-		$result=$object->delete($user);
-		if ($result > 0)
-		{
-			// Delete OK
-			setEventMessages("RecordDeleted", null, 'mesgs');
-			header("Location: ".dol_buildpath('/mymodule/list.php',1));
-			exit;
-		}
-		else
-		{
-			if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-			else setEventMessages($object->error, null, 'errors');
-		}
-	}
-}
-
-
-
-
-/*
- * VIEW
- *
- * Put here all code to build page
- */
-
-$form=new Form($db);
-
-llxHeader('','MyPageName','');
-
-
-// Put here content of your page
-
-// Example : Adding jquery code
-print '<script type="text/javascript" language="javascript">
-jQuery(document).ready(function() {
-	function init_myfunc()
-	{
-		jQuery("#myid").removeAttr(\'disabled\');
-		jQuery("#myid").attr(\'disabled\',\'disabled\');
-	}
-	init_myfunc();
-	jQuery("#mybutton").click(function() {
-		init_myfunc();
-	});
-});
-</script>';
-
-
-// Part to create
-if ($action == 'create')
-{
-	print load_fiche_titre($langs->trans("NewMyModule"));
-
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	print '<input type="hidden" name="action" value="add">';
-	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-
-	dol_fiche_head();
-
-	print '<table class="border centpercent">'."\n";
-	// print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input class="flat" type="text" size="36" name="label" value="'.$label.'"></td></tr>';
-	// LIST_OF_TD_LABEL_FIELDS_CREATE
-	print '</table>'."\n";
-
-	dol_fiche_end();
-
-	print '<div class="center"><input type="submit" class="button" name="add" value="'.$langs->trans("Create").'"> &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
-
-	print '</form>';
-}
-
-
-
-// Part to edit record
-if (($id || $ref) && $action == 'edit')
-{
-	print load_fiche_titre($langs->trans("MyModule"));
-    
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	print '<input type="hidden" name="action" value="update">';
-	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-	print '<input type="hidden" name="id" value="'.$object->id.'">';
-	
-	dol_fiche_head();
-
-	print '<table class="border centpercent">'."\n";
-	// print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input class="flat" type="text" size="36" name="label" value="'.$label.'"></td></tr>';
-	// LIST_OF_TD_LABEL_FIELDS_EDIT
-	print '</table>';
-	
-	dol_fiche_end();
-
-	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-	print ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</div>';
-
-	print '</form>';
-}
-
-
-
-// Part to show record
-if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
-{
-    $res = $object->fetch_optionals($object->id, $extralabels);
-
-	$head = mymodule_prepare_head($object);
-	dol_fiche_head($head, 'order', $langs->trans("CustomerOrder"), -1, 'order');
-		
-	$formconfirm = '';
-	
-	// Confirmation to delete
-	if ($action == 'delete') {
-	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteOrder'), $langs->trans('ConfirmDeleteOrder'), 'confirm_delete', '', 0, 1);
-	}
-	
-	// Confirmation of action xxxx
-	if ($action == 'xxx')
-	{
-	    $formquestion=array();
-	    /*
-	        $formquestion = array(
-	            // 'text' => $langs->trans("ConfirmClone"),
-	            // array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
-	            // array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1),
-	            // array('type' => 'other',    'name' => 'idwarehouse',   'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse')?GETPOST('idwarehouse'):'ifone', 'idwarehouse', '', 1)));
-	    }*/	
-	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220);
-	}
-	
-	if (! $formconfirm) {
-	    $parameters = array('lineid' => $lineid);
-	    $reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	    if (empty($reshook)) $formconfirm.=$hookmanager->resPrint;
-	    elseif ($reshook > 0) $formconfirm=$hookmanager->resPrint;
-	}
-	
-	// Print form confirm
-	print $formconfirm;
-	
-	
-	
-	// Object card
-	// ------------------------------------------------------------
-	
-	$linkback = '<a href="' . DOL_URL_ROOT . '/mymodule/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
-	
-	
-	$morehtmlref='<div class="refidno">';
-	/*
-	// Ref bis
-	$morehtmlref.=$form->editfieldkey("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->mymodule->creer, 'string', '', 0, 1);
-	$morehtmlref.=$form->editfieldval("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->mymodule->creer, 'string', '', null, null, '', 1);
-	// Thirdparty
-	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
-	// Project
-	if (! empty($conf->projet->enabled))
-	{
-	    $langs->load("projects");
-	    $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-	    if ($user->rights->mymodule->creer)
-	    {
-	        if ($action != 'classify')
-	        {
-	            $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-	            if ($action == 'classify') {
-	                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-	                $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-	                $morehtmlref.='<input type="hidden" name="action" value="classin">';
-	                $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	                $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	                $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	                $morehtmlref.='</form>';
-	            } else {
-	                $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-	            }
-	        }
-	    } else {
-	        if (! empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-	            $morehtmlref.=$proj->ref;
-	            $morehtmlref.='</a>';
-	        } else {
-	            $morehtmlref.='';
-	        }
-	    }
-	}
-	*/
-	$morehtmlref.='</div>';
-	
-	
-	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-	
-	
-	print '<div class="fichecenter">';
-	print '<div class="fichehalfleft">';
-	print '<div class="underbanner clearboth"></div>';
-	print '<table class="border centpercent">'."\n";
-	// print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td>'.$object->label.'</td></tr>';
-	// LIST_OF_TD_LABEL_FIELDS_VIEW
-
-
-	// Other attributes
-	$cols = 2;
-	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
-
-	print '</table>';
-	print '</div>';
-	print '<div class="fichehalfright">';
-	print '<div class="ficheaddleft">';
-	print '<div class="underbanner clearboth"></div>';
-	print '<table class="border centpercent">';
-	
-	
-
-	print '</table>';
-	print '</div>';
-	print '</div>';
-	print '</div>';
-	
-	print '<div class="clearboth"></div><br>';
-	
-	dol_fiche_end();
-
-
-	// Buttons for actions
-	if ($action != 'presend' && $action != 'editline') {
-    	print '<div class="tabsAction">'."\n";
-    	$parameters=array();
-    	$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-    	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-    
-    	if (empty($reshook))
-    	{
-    		if ($user->rights->mymodule->write)
-    		{
-    			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
-    		}
-    
-    		if ($user->rights->mymodule->delete)
-    		{
-    			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>'."\n";
-    		}
-    	}
-    	print '</div>'."\n";
-	}
-
-	
-	// Select mail models is same action as presend
-	if (GETPOST('modelselected')) {
-	    $action = 'presend';
-	}
-	
-	if ($action != 'presend')
-	{
-	    print '<div class="fichecenter"><div class="fichehalfleft">';
-	    print '<a name="builddoc"></a>'; // ancre
-	    // Documents
-	    $comref = dol_sanitizeFileName($object->ref);
-	    $relativepath = $comref . '/' . $comref . '.pdf';
-	    $filedir = $conf->mymodule->dir_output . '/' . $comref;
-	    $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
-	    $genallowed = $user->rights->mymodule->creer;
-	    $delallowed = $user->rights->mymodule->supprimer;
-	    print $formfile->showdocuments('mymodule', $comref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
-	
-	
-	    // Show links to link elements
-	    $linktoelem = $form->showLinkToObjectBlock($object, null, array('order'));
-	    $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
-	
-	
-	    print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-	
-	    // List of actions on element
-	    include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
-	    $formactions = new FormActions($db);
-	    $somethingshown = $formactions->showactions($object, 'order', $socid);
-	
-	    print '</div></div></div>';
-	}
-	
-
-	/*
-	 * Action presend
-	 */
-    /*
-	if ($action == 'presend')
-	{
-		$object->fetch_projet();
-
-		$ref = dol_sanitizeFileName($object->ref);
-		include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-		$fileparams = dol_most_recent_file($conf->commande->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-		$file = $fileparams['fullname'];
-
-		// Define output language
-		$outputlangs = $langs;
-		$newlang = '';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
-			$newlang = $_REQUEST['lang_id'];
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-			$newlang = $object->thirdparty->default_lang;
-
-		if (!empty($newlang))
-		{
-			$outputlangs = new Translate('', $conf);
-			$outputlangs->setDefaultLang($newlang);
-			$outputlangs->load('commercial');
-		}
-
-		// Build document if it not exists
-		if (! $file || ! is_readable($file)) {
-			$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if ($result <= 0) {
-				dol_print_error($db, $object->error, $object->errors);
-				exit();
-			}
-			$fileparams = dol_most_recent_file($conf->commande->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-			$file = $fileparams['fullname'];
-		}
-
-		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
-		print '<div class="clearboth"></div>';
-		print '<br>';
-		print load_fiche_titre($langs->trans('SendOrderByMail'));
-
-		dol_fiche_head('');
-
-		// Cree l'objet formulaire mail
-		include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
-		$formmail = new FormMail($db);
-		$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
-        $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
-
-        if($formmail->fromtype === 'user'){
-            $formmail->fromid = $user->id;
-
-        }
-		$formmail->trackid='ord'.$object->id;
-		if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
-		{
-			include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-			$formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'ord'.$object->id);
-		}
-		$formmail->withfrom = 1;
-		$liste = array();
-		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value)
-			$liste [$key] = $value;
-		$formmail->withto = GETPOST('sendto') ? GETPOST('sendto') : $liste;
-		$formmail->withtocc = $liste;
-		$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
-		if (empty($object->ref_client)) {
-			$formmail->withtopic = $outputlangs->trans('SendOrderRef', '__ORDERREF__');
-		} else if (! empty($object->ref_client)) {
-			$formmail->withtopic = $outputlangs->trans('SendOrderRef', '__ORDERREF__ (__REFCLIENT__)');
-		}
-		$formmail->withfile = 2;
-		$formmail->withbody = 1;
-		$formmail->withdeliveryreceipt = 1;
-		$formmail->withcancel = 1;
-		// Tableau des substitutions
-		$formmail->setSubstitFromObject($object);
-		$formmail->substit ['__ORDERREF__'] = $object->ref;
-
-		$custcontact = '';
-		$contactarr = array();
-		$contactarr = $object->liste_contact(- 1, 'external');
-
-		if (is_array($contactarr) && count($contactarr) > 0)
-		{
-			foreach ($contactarr as $contact)
-			{
-				if ($contact['libelle'] == $langs->trans('TypeContact_commande_external_CUSTOMER')) {	// TODO Use code and not label
-					$contactstatic = new Contact($db);
-					$contactstatic->fetch($contact ['id']);
-					$custcontact = $contactstatic->getFullName($langs, 1);
-				}
-			}
-
-			if (! empty($custcontact)) {
-				$formmail->substit['__CONTACTCIVNAME__'] = $custcontact;
-			}
-		}
-
-		// Tableau des parametres complementaires
-		$formmail->param['action'] = 'send';
-		$formmail->param['models'] = 'order_send';
-		$formmail->param['models_id']=GETPOST('modelmailselected','int');
-		$formmail->param['orderid'] = $object->id;
-		$formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
-
-		// Init list of files
-		if (GETPOST("mode") == 'init') {
-			$formmail->clear_attached_files();
-			$formmail->add_attached_files($file, basename($file), dol_mimetype($file));
-		}
-
-		// Show form
-		print $formmail->get_form();
-
-		dol_fiche_end();
-	}*/
-}
-
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/modulebuilder/oldskeletons/skeleton_class.class.php b/htdocs/modulebuilder/oldskeletons/skeleton_class.class.php
deleted file mode 100644
index 6805a697043..00000000000
--- a/htdocs/modulebuilder/oldskeletons/skeleton_class.class.php
+++ /dev/null
@@ -1,606 +0,0 @@
-<?php
-/* Copyright (C) 2007-2017  Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2014-2016  Juanjo Menent       <jmenent@2byte.es>
- * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
- * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) ---Put here your own copyright and developer email---
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file        modulebuilder/skeletons/skeleton_class.class.php
- * \ingroup     mymodule othermodule1 othermodule2
- * \brief       This file is an example for a CRUD class file (Create/Read/Update/Delete)
- */
-
-// Put here all includes required by your class file
-require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
-//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
-//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
-
-/**
- * Class Skeleton_Class
- *
- * Put here description of your class.
- */
-class Skeleton_Class extends CommonObject
-{
-	/**
-	 * @var string Id to identify managed object
-	 */
-	public $element = 'skeleton';
-	/**
-	 * @var string Name of table without prefix where object is stored
-	 */
-	public $table_element = 'skeleton';
-    /**
-     * @var array Array with all fields and their property
-     */
-	public $picto = 'generic';
-    /**
-     * @var array Array with all fields and their property
-     */
-	public $fields;
-	
-	/**
-	 * @var mixed Sample property 1
-	 */
-	public $prop1;
-	/**
-	 * @var mixed Sample property 2
-	 */
-	public $prop2;
-	
-	//...
-	
-	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-	
-	public $table_element_line = 'skeletondet';
-    public $class_element_line = 'SkeletonLine';
-    public $fk_element = 'fk_skeleton';
-    /**
-	 * @var Skeleton_ClassLine[] Lines
-	 */
-	public $lines = array();
-	
-	
-	
-	/**
-	 * Constructor
-	 *
-	 * @param DoliDb $db Database handler
-	 */
-	public function __construct(DoliDB $db)
-	{
-		$this->db = $db;
-	}
-
-	/**
-	 * Create object into database
-	 *
-	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int <0 if KO, Id of created object if OK
-	 */
-	public function create(User $user, $notrigger = false)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$error = 0;
-
-		// Clean parameters
-		if (isset($this->prop1)) {
-			$this->prop1 = trim($this->prop1);
-		}
-		if (isset($this->prop2)) {
-			$this->prop2 = trim($this->prop2);
-		}
-		//...
-
-		// Check parameters
-		// Put here code to add control on parameters values
-
-		// Insert request
-		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
-		$sql .= ' field1,';
-		$sql .= ' field2';
-		//...
-		$sql .= ') VALUES (';
-		$sql .= ' \'' . $this->prop1 . '\',';
-		$sql .= ' \'' . $this->prop2 . '\'';
-		//...
-		$sql .= ')';
-
-		$this->db->begin();
-
-		$resql = $this->db->query($sql);
-		if (!$resql) {
-			$error ++;
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-		}
-
-		if (!$error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
-
-			if (!$notrigger) {
-				// Uncomment this and change MYOBJECT to your own tag if you
-				// want this action to call a trigger.
-
-				//// Call triggers
-				//$result=$this->call_trigger('MYOBJECT_CREATE',$user);
-				//if ($result < 0) $error++;
-				//// End call triggers
-			}
-		}
-
-		// Commit or rollback
-		if ($error) {
-			$this->db->rollback();
-
-			return - 1 * $error;
-		} else {
-			$this->db->commit();
-
-			return $this->id;
-		}
-	}
-
-	/**
-	 * Load object in memory from the database
-	 *
-	 * @param int    $id  Id object
-	 * @param string $ref Ref
-	 *
-	 * @return int <0 if KO, 0 if not found, >0 if OK
-	 */
-	public function fetch($id, $ref = null)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$sql = 'SELECT';
-		$sql .= ' t.rowid,';
-		$sql .= ' t.field1,';
-		$sql .= ' t.field2';
-		//...
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
-		$sql.= ' WHERE 1 = 1';
-		if (! empty($conf->multicompany->enabled)) {
-		    $sql .= " AND entity IN (" . getEntity("skeleton", 1) . ")";
-		}
-		if (null !== $ref) {
-			$sql .= ' AND t.ref = ' . '\'' . $ref . '\'';
-		} else {
-			$sql .= ' AND t.rowid = ' . $id;
-		}
-
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$numrows = $this->db->num_rows($resql);
-			if ($numrows) {
-				$obj = $this->db->fetch_object($resql);
-
-				$this->id = $obj->rowid;
-				$this->prop1 = $obj->field1;
-				$this->prop2 = $obj->field2;
-				//...
-			}
-			
-			// Retrieve all extrafields for invoice
-			// fetch optionals attributes and labels
-			/*
-			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-			$extrafields=new ExtraFields($this->db);
-			$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-			$this->fetch_optionals($this->id,$extralabels);
-            */
-			
-			// $this->fetch_lines();
-			
-			$this->db->free($resql);
-
-			if ($numrows) {
-				return 1;
-			} else {
-				return 0;
-			}
-		} else {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-
-			return - 1;
-		}
-	}
-
-	/**
-	 * Load object in memory from the database
-	 *
-	 * @param string $sortorder Sort Order
-	 * @param string $sortfield Sort field
-	 * @param int    $limit     offset limit
-	 * @param int    $offset    offset limit
-	 * @param array  $filter    filter array
-	 * @param string $filtermode filter mode (AND or OR)
-	 *
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, array $filter = array(), $filtermode='AND')
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$sql = 'SELECT';
-		$sql .= ' t.rowid,';
-		$sql .= ' t.field1,';
-		$sql .= ' t.field2';
-		//...
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
-
-		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				$sqlwhere [] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
-			}
-		}
-		$sql.= ' WHERE 1 = 1';
-		if (! empty($conf->multicompany->enabled)) {
-		    $sql .= " AND entity IN (" . getEntity("skeleton", 1) . ")";
-		}
-		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ' . implode(' '.$filtermode.' ', $sqlwhere);
-		}
-		if (!empty($sortfield)) {
-			$sql .= $this->db->order($sortfield,$sortorder);
-		}
-		if (!empty($limit)) {
-		 $sql .=  ' ' . $this->db->plimit($limit, $offset);
-		}
-
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$num = $this->db->num_rows($resql);
-
-			while ($obj = $this->db->fetch_object($resql)) {
-				$line = new self($this->db);
-
-				$line->id = $obj->rowid;
-				$line->prop1 = $obj->field1;
-				$line->prop2 = $obj->field2;
-				//...
-			}
-			$this->db->free($resql);
-
-			return $num;
-		} else {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-
-			return - 1;
-		}
-	}
-
-	/**
-	 * Update object into database
-	 *
-	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function update(User $user, $notrigger = false)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$error = 0;
-		
-		// Clean parameters
-		if (isset($this->prop1)) {
-			$this->prop1 = trim($this->prop1);
-		}
-		if (isset($this->prop2)) {
-			$this->prop2 = trim($this->prop2);
-		}
-		//...
-
-		// Check parameters
-		// Put here code to add a control on parameters values
-
-		// Update request
-		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
-		$sql .= " field1=".(isset($this->field1)?"'".$this->db->escape($this->field1)."'":"null").",";
-        $sql .= " field2=".(isset($this->field2)?"'".$this->db->escape($this->field2)."'":"null")."";
-		//...
-		$sql .= ' WHERE rowid=' . $this->id;
-
-		$this->db->begin();
-
-		$resql = $this->db->query($sql);
-		if (!$resql) {
-			$error ++;
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-		}
-
-		if (!$error && !$notrigger) {
-			// Uncomment this and change MYOBJECT to your own tag if you
-			// want this action calls a trigger.
-
-			//// Call triggers
-			//$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
-			//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-			//// End call triggers
-		}
-
-		// Commit or rollback
-		if ($error) {
-			$this->db->rollback();
-
-			return - 1 * $error;
-		} else {
-			$this->db->commit();
-
-			return 1;
-		}
-	}
-
-	/**
-	 * Delete object in database
-	 *
-	 * @param User $user      User that deletes
-	 * @param bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function delete(User $user, $notrigger = false)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$error = 0;
-
-		$this->db->begin();
-
-		if (!$error) {
-			if (!$notrigger) {
-				// Uncomment this and change MYOBJECT to your own tag if you
-				// want this action calls a trigger.
-
-				//// Call triggers
-				//$result=$this->call_trigger('MYOBJECT_DELETE',$user);
-				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-				//// End call triggers
-			}
-		}
-
-		// If you need to delete child tables to, you can insert them here
-		
-		if (!$error) {
-			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
-			$sql .= ' WHERE rowid=' . $this->id;
-
-			$resql = $this->db->query($sql);
-			if (!$resql) {
-				$error ++;
-				$this->errors[] = 'Error ' . $this->db->lasterror();
-				dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-			}
-		}
-
-		// Commit or rollback
-		if ($error) {
-			$this->db->rollback();
-
-			return - 1 * $error;
-		} else {
-			$this->db->commit();
-
-			return 1;
-		}
-	}
-
-	/**
-	 * Load an object from its id and create a new one in database
-	 *
-	 * @param int $fromid Id of object to clone
-	 *
-	 * @return int New id of clone
-	 */
-	public function createFromClone($fromid)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		global $user;
-		$error = 0;
-		$object = new Skeleton_Class($this->db);
-
-		$this->db->begin();
-
-		// Load source object
-		$object->fetch($fromid);
-		// Reset object
-		$object->id = 0;
-
-		// Clear fields
-		// ...
-
-		// Create clone
-		$result = $object->create($user);
-
-		// Other options
-		if ($result < 0) {
-			$error ++;
-			$this->errors = $object->errors;
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-		}
-
-		// End
-		if (!$error) {
-			$this->db->commit();
-
-			return $object->id;
-		} else {
-			$this->db->rollback();
-
-			return - 1;
-		}
-	}
-
-	/**
-	 *  Return a link to the object card (with optionaly the picto)
-	 *
-	 *	@param	int		$withpicto			Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
-	 *	@param	string	$option				On what the link point to
-     *  @param	int  	$notooltip			1=Disable tooltip
-     *  @param	int		$maxlen				Max length of visible user name
-     *  @param  string  $morecss            Add more css on link
-	 *	@return	string						String with URL
-	 */
-	function getNomUrl($withpicto=0, $option='', $notooltip=0, $maxlen=24, $morecss='')
-	{
-		global $db, $conf, $langs;
-        global $dolibarr_main_authentication, $dolibarr_main_demo;
-        global $menumanager;
-
-        if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
-        
-        $result = '';
-        $companylink = '';
-
-        $label = '<u>' . $langs->trans("MyModule") . '</u>';
-        $label.= '<br>';
-        $label.= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
-
-        $url = DOL_URL_ROOT.'/mymodule/'.$this->table_name.'_card.php?id='.$this->id;
-        
-        $linkclose='';
-        if (empty($notooltip))
-        {
-            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label=$langs->trans("ShowProject");
-                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
-            $linkclose.=' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose.=' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
-        }
-        else $linkclose = ($morecss?' class="'.$morecss.'"':'');
-        
-		$linkstart = '<a href="'.$url.'"';
-		$linkstart.=$linkclose.'>';
-		$linkend='</a>';
-
-        if ($withpicto)
-        {
-            $result.=($linkstart.img_object(($notooltip?'':$label), 'label', ($notooltip?'':'class="classfortooltip"')).$linkend);
-            if ($withpicto != 2) $result.=' ';
-		}
-		$result.= $linkstart . $this->ref . $linkend;
-		return $result;
-	}
-
-	/**
-	 *  Retourne le libelle du status d'un user (actif, inactif)
-	 *
-	 *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-	 *  @return	string 			       Label of status
-	 */
-	function getLibStatut($mode=0)
-	{
-		return $this->LibStatut($this->status,$mode);
-	}
-
-	/**
-	 *  Return the status
-	 *
-	 *  @param	int		$status        	Id status
-	 *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 5=Long label + Picto
-	 *  @return string 			       	Label of status
-	 */
-	static function LibStatut($status,$mode=0)
-	{
-		global $langs;
-
-		if ($mode == 0)
-		{
-			$prefix='';
-			if ($status == 1) return $langs->trans('Enabled');
-			if ($status == 0) return $langs->trans('Disabled');
-		}
-		if ($mode == 1)
-		{
-			if ($status == 1) return $langs->trans('Enabled');
-			if ($status == 0) return $langs->trans('Disabled');
-		}
-		if ($mode == 2)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
-		}
-		if ($mode == 3)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
-		}
-		if ($mode == 4)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
-		}
-		if ($mode == 5)
-		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
-		}
-		if ($mode == 6)
-		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
-		}
-	}
-
-
-	/**
-	 * Initialise object with example values
-	 * Id must be 0 if object instance is a specimen
-	 *
-	 * @return void
-	 */
-	public function initAsSpecimen()
-	{
-		$this->id = 0;
-		$this->prop1 = 'prop1';
-		$this->prop2 = 'prop2';
-	}
-
-}
-
-/**
- * Class Skeleton_ClassLine
- */
-class Skeleton_ClassLine
-{
-	/**
-	 * @var int ID
-	 */
-	public $id;
-	/**
-	 * @var mixed Sample line property 1
-	 */
-	public $prop1;
-	/**
-	 * @var mixed Sample line property 2
-	 */
-	public $prop2;
-}
diff --git a/htdocs/modulebuilder/oldskeletons/skeleton_list.php b/htdocs/modulebuilder/oldskeletons/skeleton_list.php
deleted file mode 100644
index 47aeda79fdc..00000000000
--- a/htdocs/modulebuilder/oldskeletons/skeleton_list.php
+++ /dev/null
@@ -1,570 +0,0 @@
-<?php
-/* Copyright (C) 2007-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2014-2016 Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2016      Jean-François Ferry	<jfefe@aternatik.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *   	\file       dev/skeletons/skeleton_list.php
- *		\ingroup    mymodule othermodule1 othermodule2
- *		\brief      This file is an example of a php page
- *					Put here some comments
- */
-
-//if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
-//if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
-//if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-//if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');			// Do not check anti CSRF attack test
-//if (! defined('NOSTYLECHECK'))   define('NOSTYLECHECK','1');			// Do not check style html tag into posted data
-//if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');		// Do not check anti POST attack test
-//if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');			// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');			// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-//if (! defined("NOLOGIN"))        define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
-
-// Change this following line to use the correct relative path (../, ../../, etc)
-$res=0;
-if (! $res && file_exists("../main.inc.php")) $res=@include '../main.inc.php';					// to work if your module directory is into dolibarr root htdocs directory
-if (! $res && file_exists("../../main.inc.php")) $res=@include '../../main.inc.php';			// to work if your module directory is into a subdir of root htdocs directory
-if (! $res && file_exists("../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../dolibarr/htdocs/main.inc.php';     // Used on dev env only
-if (! $res && file_exists("../../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../../dolibarr/htdocs/main.inc.php';   // Used on dev env only
-if (! $res) die("Include of main fails");
-// Change this following line to use the correct relative path from htdocs
-require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-dol_include_once('/mymodule/class/skeleton_class.class.php');
-
-// Load traductions files requiredby by page
-$langs->load("mymodule");
-$langs->load("other");
-
-$action=GETPOST('action','alpha');
-$massaction=GETPOST('massaction','alpha');
-$show_files=GETPOST('show_files','int');
-$confirm=GETPOST('confirm','alpha');
-$toselect = GETPOST('toselect', 'array');
-
-$id			= GETPOST('id','int');
-$backtopage = GETPOST('backtopage');
-$myparam	= GETPOST('myparam','alpha');
-
-$search_all=trim(GETPOST("sall"));
-$search_field1=GETPOST("search_field1");
-$search_field2=GETPOST("search_field2");
-$search_myfield=GETPOST('search_myfield');
-$optioncss = GETPOST('optioncss','alpha');
-
-// Load variable for pagination
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
-$sortfield = GETPOST('sortfield','alpha');
-$sortorder = GETPOST('sortorder','alpha');
-$page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
-$offset = $limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-if (! $sortfield) $sortfield="t.rowid"; // Set here default search field
-if (! $sortorder) $sortorder="ASC";
-
-// Protection if external user
-$socid=0;
-if ($user->societe_id > 0)
-{
-    $socid = $user->societe_id;
-	//accessforbidden();
-}
-
-// Initialize technical object to manage context to save list fields
-$contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'mymodulelist';
-
-// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
-$hookmanager->initHooks(array('mymodulelist'));
-$extrafields = new ExtraFields($db);
-
-// fetch optionals attributes and labels
-$extralabels = $extrafields->fetch_name_optionals_label('mymodule');
-$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
-
-// List of fields to search into when doing a "search in all"
-$fieldstosearchall = array(
-    't.ref'=>'Ref',
-    't.note_public'=>'NotePublic',
-);
-if (empty($user->socid)) $fieldstosearchall["t.note_private"]="NotePrivate";
-
-// Definition of fields for list
-$arrayfields=array(
-    't.field1'=>array('label'=>"Field1", 'checked'=>1),
-    't.field2'=>array('label'=>"Field2", 'checked'=>1),
-    //'t.entity'=>array('label'=>"Entity", 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))),
-    't.datec'=>array('label'=>"DateCreationShort", 'checked'=>0, 'position'=>500),
-    't.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
-    //'t.statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
-);
-// Extra fields
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-{
-    foreach($extrafields->attribute_label as $key => $val)
-    {
-        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
-    }
-}
-
-
-$object=new Skeleton_Class($db);
-
-
-
-
-/*
- * ACTIONS
- *
- * Put here all code to do according to value of "action" parameter
- */
-
-if (GETPOST('cancel')) { $action='list'; $massaction=''; }
-if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
-
-$parameters=array();
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
-{
-    // Selection of new fields
-    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
-
-    // Purge search criteria
-    if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") ||GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
-    {
-    	$search_field1='';
-    	$search_field2='';
-    	$search_date_creation='';
-    	$search_date_update='';
-        $toselect='';
-        $search_array_options=array();
-    }
-
-    // Mass actions
-    $objectclass='Skeleton';
-    $objectlabel='Skeleton';
-    $permtoread = $user->rights->skeleton->read;
-    $permtodelete = $user->rights->skeleton->delete;
-    $uploaddir = $conf->skeleton->dir_output;
-    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
-}
-
-
-
-/*
- * VIEW
- *
- * Put here all code to build page
- */
-
-$now=dol_now();
-
-$form=new Form($db);
-
-//$help_url="EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_Pedidos_de_clientes";
-$help_url='';
-$title = $langs->trans('MyModuleListTitle');
-
-// Put here content of your page
-
-// Example : Adding jquery code
-print '<script type="text/javascript" language="javascript">
-jQuery(document).ready(function() {
-	function init_myfunc()
-	{
-		jQuery("#myid").removeAttr(\'disabled\');
-		jQuery("#myid").attr(\'disabled\',\'disabled\');
-	}
-	init_myfunc();
-	jQuery("#mybutton").click(function() {
-		init_myfunc();
-	});
-});
-</script>';
-
-
-$sql = "SELECT";
-$sql.= " t.rowid,";
-$sql.= " t.field1,";
-$sql.= " t.field2";
-// Add fields from extrafields
-foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
-// Add fields from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
-$sql.= " FROM ".MAIN_DB_PREFIX."mytable as t";
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."mytable_extrafields as ef on (t.rowid = ef.fk_object)";
-$sql.= " WHERE 1 = 1";
-//$sql.= " WHERE u.entity IN (".getEntity('mytable',1).")";
-if ($search_field1) $sql.= natural_search("field1",$search_field1);
-if ($search_field2) $sql.= natural_search("field2",$search_field2);
-if ($sall)          $sql.= natural_search(array_keys($fieldstosearchall), $sall);
-// Add where from extra fields
-foreach ($search_array_options as $key => $val)
-{
-    $crit=$val;
-    $tmpkey=preg_replace('/search_options_/','',$key);
-    $typ=$extrafields->attribute_type[$tmpkey];
-    $mode=0;
-    if (in_array($typ, array('int','double'))) $mode=1;    // Search on a numeric
-    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit))) 
-    {
-        $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
-    }
-}
-// Add where from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
-$sql.=$db->order($sortfield,$sortorder);
-
-// Count total nb of records
-$nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
-	$result = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($result);
-}	
-
-$sql.= $db->plimit($limit+1, $offset);
-
-dol_syslog($script_file, LOG_DEBUG);
-$resql=$db->query($sql);
-if (! $resql)
-{
-    dol_print_error($db);
-    exit;
-}
-
-$num = $db->num_rows($resql);
-
-// Direct jump if only one record found
-if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all)
-{
-    $obj = $db->fetch_object($resql);
-    $id = $obj->rowid;
-    header("Location: ".DOL_URL_ROOT.'/skeleton/card.php?id='.$id);
-    exit;
-}
-
-llxHeader('', $title, $help_url);
-
-$arrayofselected=is_array($toselect)?$toselect:array();
-
-$param='';
-if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-if ($search_field1 != '') $param.= '&amp;search_field1='.urlencode($search_field1);
-if ($search_field2 != '') $param.= '&amp;search_field2='.urlencode($search_field2);
-if ($optioncss != '') $param.='&optioncss='.$optioncss;
-// Add $param from extra fields
-foreach ($search_array_options as $key => $val)
-{
-    $crit=$val;
-    $tmpkey=preg_replace('/search_options_/','',$key);
-    if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
-} 
-
-$arrayofmassactions =  array(
-    'presend'=>$langs->trans("SendByMail"),
-    'builddoc'=>$langs->trans("PDFMerge"),
-);
-if ($user->rights->mymodule->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
-if ($massaction == 'presend') $arrayofmassactions=array();
-$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
-
-print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-print '<input type="hidden" name="action" value="list">';
-print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-print '<input type="hidden" name="page" value="'.$page.'">';
-print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
-
-print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies', 0, '', '', $limit);
-
-if ($sall)
-{
-    foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
-    print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
-}
-
-$moreforfilter = '';
-$moreforfilter.='<div class="divsearchfield">';
-$moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_myfield" value="'.dol_escape_htmltag($search_myfield).'">';
-$moreforfilter.= '</div>';
-
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
-else $moreforfilter = $hookmanager->resPrint;
-
-if (! empty($moreforfilter))
-{
-	print '<div class="liste_titre liste_titre_bydiv centpercent">';
-	print $moreforfilter;
-    print '</div>';
-}
-
-$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
-$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-
-print '<div class="div-table-responsive">';
-print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-
-// Fields title
-print '<tr class="liste_titre">';
-// LIST_OF_TD_TITLE_FIELDS
-//if (! empty($arrayfields['t.field1']['checked'])) print_liste_field_titre($arrayfields['t.field1']['label'],$_SERVER['PHP_SELF'],'t.field1','',$param,'',$sortfield,$sortorder);
-//if (! empty($arrayfields['t.field2']['checked'])) print_liste_field_titre($arrayfields['t.field2']['label'],$_SERVER['PHP_SELF'],'t.field2','',$param,'',$sortfield,$sortorder);
-// Extra fields
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-{
-   foreach($extrafields->attribute_label as $key => $val) 
-   {
-       if (! empty($arrayfields["ef.".$key]['checked'])) 
-       {
-			$align=$extrafields->getAlignFlag($key);
-			$sortonfield = "ef.".$key;
-			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
-			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
-       }
-   }
-}
-// Hook fields
-$parameters=array('arrayfields'=>$arrayfields);
-$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-print $hookmanager->resPrint;
-if (! empty($arrayfields['t.datec']['checked']))  print_liste_field_titre($arrayfields['t.datec']['label'],$_SERVER["PHP_SELF"],"t.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['t.tms']['checked']))    print_liste_field_titre($arrayfields['t.tms']['label'],$_SERVER["PHP_SELF"],"t.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-//if (! empty($arrayfields['t.status']['checked'])) print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"t.status","",$param,'align="center"',$sortfield,$sortorder);
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
-print '</tr>'."\n";
-
-// Fields title search
-print '<tr class="liste_titre">';
-// LIST_OF_TD_TITLE_SEARCH
-//if (! empty($arrayfields['t.field1']['checked'])) print '<td class="liste_titre"><input type="text" class="flat" name="search_field1" value="'.$search_field1.'" size="10"></td>';
-//if (! empty($arrayfields['t.field2']['checked'])) print '<td class="liste_titre"><input type="text" class="flat" name="search_field2" value="'.$search_field2.'" size="10"></td>';
-// Extra fields
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-{
-    foreach($extrafields->attribute_label as $key => $val) 
-    {
-        if (! empty($arrayfields["ef.".$key]['checked']))
-        {
-            $align=$extrafields->getAlignFlag($key);
-            $typeofextrafield=$extrafields->attribute_type[$key];
-            print '<td class="liste_titre'.($align?' '.$align:'').'">';
-        	if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')) && empty($extrafields->attribute_computed[$key]))
-			{
-			    $crit=$val;
-				$tmpkey=preg_replace('/search_options_/','',$key);
-				$searchclass='';
-				if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass='searchstring';
-				if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
-				print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
-			}
-            print '</td>';
-        }
-    }
-}
-// Fields from hook
-$parameters=array('arrayfields'=>$arrayfields);
-$reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
-print $hookmanager->resPrint;
-if (! empty($arrayfields['t.datec']['checked']))
-{
-    // Date creation
-    print '<td class="liste_titre">';
-    print '</td>';
-}
-if (! empty($arrayfields['t.tms']['checked']))
-{
-    // Date modification
-    print '<td class="liste_titre">';
-    print '</td>';
-}
-/*if (! empty($arrayfields['u.statut']['checked']))
-{
-    // Status
-    print '<td class="liste_titre" align="center">';
-    print $form->selectarray('search_statut', array('-1'=>'','0'=>$langs->trans('Disabled'),'1'=>$langs->trans('Enabled')),$search_statut);
-    print '</td>';
-}*/
-// Action column
-print '<td class="liste_titre" align="right">';
-$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
-print $searchpicto;
-print '</td>';
-print '</tr>'."\n";
-    
-
-// Detect if we need a fetch on each output line
-$needToFetchEachLine=0;
-foreach ($extrafields->attribute_computed as $key => $val)
-{
-    if (preg_match('/\$object/',$val)) $needToFetchEachLine++;  // There is at least one compute field that use $object
-}
-
-
-$i=0;
-$totalarray=array();
-while ($i < min($num, $limit))
-{
-    $obj = $db->fetch_object($resql);
-    if ($obj)
-    {
-        // Show here line of result
-        print '<tr class="oddeven">';
-        // LIST_OF_TD_FIELDS_LIST
-        /*
-        if (! empty($arrayfields['t.field1']['checked'])) 
-        {
-            print '<td>'.$obj->field1.'</td>';
-		    if (! $i) $totalarray['nbfield']++;
-        }
-        if (! empty($arrayfields['t.field2']['checked'])) 
-        {
-            print '<td>'.$obj->field2.'</td>';
-		    if (! $i) $totalarray['nbfield']++;
-        }*/
-    	// Extra fields
-		if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-		{
-		   foreach($extrafields->attribute_label as $key => $val) 
-		   {
-				if (! empty($arrayfields["ef.".$key]['checked'])) 
-				{
-					print '<td';
-					$align=$extrafields->getAlignFlag($key);
-					if ($align) print ' align="'.$align.'"';
-					print '>';
-					$tmpkey='options_'.$key;
-					print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
-					print '</td>';
-		            if (! $i) $totalarray['nbfield']++;
-				}
-		   }
-		}
-        // Fields from hook
-	    $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
-		$reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
-    	// Date creation
-        if (! empty($arrayfields['t.datec']['checked']))
-        {
-            print '<td align="center">';
-            print dol_print_date($db->jdate($obj->date_creation), 'dayhour');
-            print '</td>';
-		    if (! $i) $totalarray['nbfield']++;
-        }
-        // Date modification
-        if (! empty($arrayfields['t.tms']['checked']))
-        {
-            print '<td align="center">';
-            print dol_print_date($db->jdate($obj->date_update), 'dayhour');
-            print '</td>';
-		    if (! $i) $totalarray['nbfield']++;
-        }
-        // Status
-        /*
-        if (! empty($arrayfields['u.statut']['checked']))
-        {
-		  $userstatic->statut=$obj->statut;
-          print '<td align="center">'.$userstatic->getLibStatut(3).'</td>';
-        }*/
-
-        // Action column
-        print '<td class="nowrap" align="center">';
-	    if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-        {
-	        $selected=0;
-			if (in_array($obj->rowid, $arrayofselected)) $selected=1;
-			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
-        }
-	    print '</td>';
-        if (! $i) $totalarray['nbfield']++;
-
-        print '</tr>';
-    }
-    $i++;
-}
-
-// Show total line
-if (isset($totalarray['totalhtfield']))
-{
-    print '<tr class="liste_total">';
-    $i=0;
-    while ($i < $totalarray['nbfield'])
-    {
-        $i++;
-        if ($i == 1)
-        {
-            if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
-            else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
-        }
-        elseif ($totalarray['totalhtfield'] == $i) print '<td align="right">'.price($totalarray['totalht']).'</td>';
-        elseif ($totalarray['totalvatfield'] == $i) print '<td align="right">'.price($totalarray['totalvat']).'</td>';
-        elseif ($totalarray['totalttcfield'] == $i) print '<td align="right">'.price($totalarray['totalttc']).'</td>';
-        else print '<td></td>';
-    }
-    print '</tr>';
-}
-
-$db->free($resql);
-
-$parameters=array('arrayfields'=>$arrayfields, 'sql'=>$sql);
-$reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
-print $hookmanager->resPrint;
-
-print '</table>'."\n";
-print '</div>'."\n";
-
-print '</form>'."\n";
-
-
-if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
-{
-    // Show list of available documents
-    $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
-    $urlsource.=str_replace('&amp;','&',$param);
-
-    $filedir=$diroutputmassaction;
-    $genallowed=$user->rights->facture->lire;
-    $delallowed=$user->rights->facture->lire;
-
-    print $formfile->showdocuments('massfilesarea_mymodule','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
-}
-else
-{
-    print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
-}
-
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/modulebuilder/oldskeletons/skeleton_script.php b/htdocs/modulebuilder/oldskeletons/skeleton_script.php
deleted file mode 100644
index 5eb1565d4a3..00000000000
--- a/htdocs/modulebuilder/oldskeletons/skeleton_script.php
+++ /dev/null
@@ -1,166 +0,0 @@
-#!/usr/bin/env php
-<?php
-/* Copyright (C) 2007-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) ---Put here your own copyright and developer email---
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *      \file       dev/skeletons/skeleton_script.php
- *		\ingroup    mymodule
- *      \brief      This file is an example for a command line script
- *					Put here some comments
- */
-
-$sapi_type = php_sapi_name();
-$script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
-
-// Test if batch mode
-if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
-}
-
-// Global variables
-$version='1.0';
-$error=0;
-
-
-// -------------------- START OF YOUR CODE HERE --------------------
-@set_time_limit(0);							// No timeout for this script
-define('EVEN_IF_ONLY_LOGIN_ALLOWED',1);		// Set this define to 0 if you want to lock your script when dolibarr setup is "locked to admin user only".
-
-// Include and load Dolibarr environment variables
-require_once($path."../../htdocs/master.inc.php");
-// After this $db, $mysoc, $langs, $conf and $hookmanager are defined (Opened $db handler to database will be closed at end of file).
-// $user is created but empty.
-
-//$langs->setDefaultLang('en_US'); 	// To change default language of $langs
-$langs->load("main");				// To load language file for default language
-
-// Load user and its permissions
-$result=$user->fetch('','admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
-if (! $result > 0) { dol_print_error('',$user->error); exit; }
-$user->getrights();
-
-
-print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
-if (! isset($argv[1])) {	// Check parameters
-    print "Usage: ".$script_file." param1 param2 ...\n";
-	exit(-1);
-}
-print '--- start'."\n";
-print 'Argument 1='.$argv[1]."\n";
-print 'Argument 2='.$argv[2]."\n";
-
-
-// Start of transaction
-$db->begin();
-
-
-// Examples for manipulating class skeleton_class
-require_once(DOL_DOCUMENT_ROOT."/../dev/skeletons/skeleton_class.class.php");
-$myobject=new Skeleton_Class($db);
-
-// Example for inserting creating object in database
-/*
-dol_syslog($script_file." CREATE", LOG_DEBUG);
-$myobject->prop1='value_prop1';
-$myobject->prop2='value_prop2';
-$id=$myobject->create($user);
-if ($id < 0) { $error++; dol_print_error($db,$myobject->error); }
-else print "Object created with id=".$id."\n";
-*/
-
-// Example for reading object from database
-/*
-dol_syslog($script_file." FETCH", LOG_DEBUG);
-$result=$myobject->fetch($id);
-if ($result < 0) { $error; dol_print_error($db,$myobject->error); }
-else print "Object with id=".$id." loaded\n";
-*/
-
-// Example for updating object in database ($myobject must have been loaded by a fetch before)
-/*
-dol_syslog($script_file." UPDATE", LOG_DEBUG);
-$myobject->prop1='newvalue_prop1';
-$myobject->prop2='newvalue_prop2';
-$result=$myobject->update($user);
-if ($result < 0) { $error++; dol_print_error($db,$myobject->error); }
-else print "Object with id ".$myobject->id." updated\n";
-*/
-
-// Example for deleting object in database ($myobject must have been loaded by a fetch before)
-/*
-dol_syslog($script_file." DELETE", LOG_DEBUG);
-$result=$myobject->delete($user);
-if ($result < 0) { $error++; dol_print_error($db,$myobject->error); }
-else print "Object with id ".$myobject->id." deleted\n";
-*/
-
-
-// An example of a direct SQL read without using the fetch method
-/*
-$sql = "SELECT field1, field2";
-$sql.= " FROM ".MAIN_DB_PREFIX."skeleton";
-$sql.= " WHERE field3 = 'xxx'";
-$sql.= " ORDER BY field1 ASC";
-
-dol_syslog($script_file, LOG_DEBUG);
-$resql=$db->query($sql);
-if ($resql)
-{
-	$num = $db->num_rows($resql);
-	$i = 0;
-	if ($num)
-	{
-		while ($i < $num)
-		{
-			$obj = $db->fetch_object($resql);
-			if ($obj)
-			{
-				// You can use here results
-				print $obj->field1;
-				print $obj->field2;
-			}
-			$i++;
-		}
-	}
-}
-else
-{
-	$error++;
-	dol_print_error($db);
-}
-*/
-
-
-// -------------------- END OF YOUR CODE --------------------
-
-if (! $error)
-{
-	$db->commit();
-	print '--- end ok'."\n";
-}
-else
-{
-	print '--- end error code='.$error."\n";
-	$db->rollback();
-}
-
-$db->close();	// Close $db database opened handler
-
-exit($error);
diff --git a/htdocs/modulebuilder/oldskeletons/skeleton_webservice_server.php b/htdocs/modulebuilder/oldskeletons/skeleton_webservice_server.php
deleted file mode 100644
index 54a050ff9da..00000000000
--- a/htdocs/modulebuilder/oldskeletons/skeleton_webservice_server.php
+++ /dev/null
@@ -1,272 +0,0 @@
-<?php
-/* Copyright (C) 2006-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *       \file       htdocs/webservices/server_skeleton.php
- *       \brief      File that is entry point to call Dolibarr WebServices
- *       \version    $Id: server_skeleton.php,v 1.7 2010/12/19 11:49:37 eldy Exp $
- */
-
-// This is to make Dolibarr working with Plesk
-set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
-
-require_once("../master.inc.php");
-require_once(NUSOAP_PATH.'/nusoap.php');		// Include SOAP
-require_once(DOL_DOCUMENT_ROOT."/core/lib/ws.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/skeleton/class/skeleton.class.php");
-
-
-dol_syslog("Call Skeleton webservices interfaces");
-
-// Enable and test if module web services is enabled
-if (empty($conf->global->MAIN_MODULE_WEBSERVICES))
-{
-    $langs->load("admin");
-    dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
-    print $langs->trans("WarningModuleNotActive",'WebServices').'.<br><br>';
-    print $langs->trans("ToActivateModule");
-    exit;
-}
-
-// Create the soap Object
-$server = new nusoap_server();
-$server->soap_defencoding='UTF-8';
-$server->decode_utf8=false;
-$ns='http://www.dolibarr.org/ns/';
-$server->configureWSDL('WebServicesDolibarrSkeleton',$ns);
-$server->wsdl->schemaTargetNamespace=$ns;
-
-
-// Define WSDL Authentication object
-$server->wsdl->addComplexType(
-    'authentication',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'dolibarrkey' => array('name'=>'dolibarrkey','type'=>'xsd:string'),
-    	'sourceapplication' => array('name'=>'sourceapplication','type'=>'xsd:string'),
-    	'login' => array('name'=>'login','type'=>'xsd:string'),
-    	'password' => array('name'=>'password','type'=>'xsd:string'),
-        'entity' => array('name'=>'entity','type'=>'xsd:string'),
-    )
-);
-
-// Define WSDL Return object
-$server->wsdl->addComplexType(
-    'result',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'result_code' => array('name'=>'result_code','type'=>'xsd:string'),
-        'result_label' => array('name'=>'result_label','type'=>'xsd:string'),
-    )
-);
-
-// Define other specific objects
-$server->wsdl->addComplexType(
-    'skeleton',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-	    'prop1'=>'xxx',
-		'prop2'=>'xxx',
-    //...
-    )
-);
-
-
-
-// 5 styles: RPC/encoded, RPC/literal, Document/encoded (not WS-I compliant), Document/literal, Document/literal wrapped
-// Style merely dictates how to translate a WSDL binding to a SOAP message. Nothing more. You can use either style with any programming model.
-// http://www.ibm.com/developerworks/webservices/library/ws-whichwsdl/
-$styledoc='rpc';       // rpc/document (document is an extend into SOAP 1.0 to support unstructured messages)
-$styleuse='encoded';   // encoded/literal/literal wrapped
-// Better choice is document/literal wrapped but literal wrapped not supported by nusoap.
-
-
-// Register WSDL
-$server->register(
-    'getSkeleton',
-    // Entry values
-    array('authentication'=>'tns:authentication','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string'),
-    // Exit values
-    array('result'=>'tns:result','skeleton'=>'tns:skeleton'),
-    $ns,
-    $ns.'#getSkeleton',
-    $styledoc,
-    $styleuse,
-    'WS to get skeleton'
-);
-
-// Register WSDL
-$server->register(
-	'createSkeleton',
-	// Entry values
-	array('authentication'=>'tns:authentication','skeleton'=>'tns:skeleton'),
-	// Exit values
-	array('result'=>'tns:result','id'=>'xsd:string'),
-	$ns,
-	$ns.'#createSkeleton',
-	$styledoc,
-	$styleuse,
-	'WS to create a skeleton'
-);
-
-
-
-
-/**
- * Get Skeleton
- *
- * @param	array		$authentication		Array of authentication information
- * @param	int			$id					Id of object
- * @param	string		$ref				Ref of object
- * @param	string		$ref_ext			Ref external of object
- * @return	mixed
- */
-function getSkeleton($authentication,$id,$ref='',$ref_ext='')
-{
-    global $db,$conf,$langs;
-
-    dol_syslog("Function: getSkeleton login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
-
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
-
-    // Init and check authentication
-    $objectresp=array();
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
-    // Check parameters
-    if (! $error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
-    {
-        $error++;
-        $errorcode='BAD_PARAMETERS'; $errorlabel="Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
-    }
-
-    if (! $error)
-    {
-        $fuser->getrights();
-
-        if ($fuser->rights->skeleton->read)
-        {
-            $skeleton=new Skeleton($db);
-            $result=$skeleton->fetch($id,$ref,$ref_ext);
-            if ($result > 0)
-            {
-                // Create
-                $objectresp = array(
-			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
-			        'skeleton'=>array(
-				    'prop1'=>$skeleton->prop1,
-				    'prop2'=>$skeleton->prop2,
-                    //...
-                    )
-                );
-            }
-            else
-            {
-                $error++;
-                $errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
-            }
-        }
-        else
-        {
-            $error++;
-            $errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
-        }
-    }
-
-    if ($error)
-    {
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-    }
-
-    return $objectresp;
-}
-
-
-/**
- * Create Skeleton
- *
- * @param	array		$authentication		Array of authentication information
- * @param	Skeleton	$skeleton		    $skeleton
- * @return	array							Array result
- */
-function createSkeleton($authentication,$skeleton)
-{
-	global $db,$conf,$langs;
-
-	$now=dol_now();
-
-	dol_syslog("Function: createSkeleton login=".$authentication['login']);
-
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
-
-	// Init and check authentication
-	$objectresp=array();
-	$errorcode='';$errorlabel='';
-	$error=0;
-	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
-	// Check parameters
-
-
-	if (! $error)
-	{
-		$newobject=new Skeleton($db);
-		$newobject->prop1=$skeleton->prop1;
-		$newobject->prop2=$skeleton->prop2;
-		//...
-
-		$db->begin();
-
-		$result=$newobject->create($fuser);
-		if ($result <= 0)
-		{
-			$error++;
-		}
-
-		if (! $error)
-		{
-			$db->commit();
-			$objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref);
-		}
-		else
-		{
-			$db->rollback();
-			$error++;
-			$errorcode='KO';
-			$errorlabel=$newobject->error;
-		}
-	}
-
-	if ($error)
-	{
-		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-	}
-
-	return $objectresp;
-}
-
-// Return the results.
-$server->service(file_get_contents("php://input"));
diff --git a/htdocs/product/stock/class/api_stockmovements.class.php b/htdocs/product/stock/class/api_stockmovements.class.php
index 79e17749991..3cc9147a001 100644
--- a/htdocs/product/stock/class/api_stockmovements.class.php
+++ b/htdocs/product/stock/class/api_stockmovements.class.php
@@ -320,6 +320,7 @@ class StockMovements extends DolibarrApi
         unset($object->user);
         unset($object->fk_project);
         unset($object->project);
+        unset($object->canvas);
         
         //unset($object->eatby);        Filled correctly in read mode
         //unset($object->sellby);       Filled correctly in read mode

From c39ca4cff8824a7181b9354a40f5ff3c02135c6c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 31 May 2017 00:20:35 +0200
Subject: [PATCH 027/438] NEW Introduce function dol_compress_dir

---
 htdocs/core/lib/files.lib.php  | 85 ++++++++++++++++++++++++++++++++++
 htdocs/langs/en_US/errors.lang |  3 +-
 htdocs/langs/en_US/other.lang  |  1 +
 htdocs/modulebuilder/index.php | 59 ++++++++++++++++++++++-
 4 files changed, 146 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index e52f8bf98ec..95fca68aa5d 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1685,6 +1685,91 @@ function dol_uncompress($inputfile,$outputdir)
 }
 
 
+/**
+ * Compress a directory and subdirectories into a package file.
+ *
+ * @param 	string	$inputdir		Source dir name
+ * @param 	string	$outputfile		Target file name
+ * @param 	string	$mode			'zip'
+ * @return	int						<0 if KO, >0 if OK
+ */
+function dol_compress_dir($inputdir, $outputfile, $mode="zip")
+{
+    $foundhandler=0;
+
+    dol_syslog("Try to zip dir ".$inputdir." into ".$outputdir." mode=".$mode);
+    try
+    {
+        if ($mode == 'gz')     { $foundhandler=0; }
+        elseif ($mode == 'bz') { $foundhandler=0; }
+        elseif ($mode == 'zip')
+        {
+            /*if (defined('ODTPHP_PATHTOPCLZIP'))
+            {
+                $foundhandler=0;        // TODO implement this
+
+                include_once ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php';
+                $archive = new PclZip($outputfile);
+                $archive->add($inputfile, PCLZIP_OPT_REMOVE_PATH, dirname($inputfile));
+                //$archive->add($inputfile);
+                return 1;
+            }
+            else*/
+            if (class_exists('ZipArchive'))
+            {
+                $foundhandler=1;
+                
+                // Initialize archive object
+                $zip = new ZipArchive();
+                $zip->open($outputfile, ZipArchive::CREATE | ZipArchive::OVERWRITE);
+                
+                // Create recursive directory iterator
+                /** @var SplFileInfo[] $files */
+                $files = new RecursiveIteratorIterator(
+                    new RecursiveDirectoryIterator($inputdir),
+                    RecursiveIteratorIterator::LEAVES_ONLY
+                    );
+
+                foreach ($files as $name => $file)
+                {
+                    // Skip directories (they would be added automatically)
+                    if (!$file->isDir())
+                    {
+                        // Get real and relative path for current file
+                        $filePath = $file->getRealPath();
+                        $relativePath = substr($filePath, strlen($inputdir) + 1);
+                
+                        // Add current file to archive
+                        $zip->addFile($filePath, $relativePath);
+                    }
+                }
+                
+                // Zip archive will be created only after closing object
+                $zip->close();                
+    
+                return 1;
+            }
+        }
+
+        if (! $foundhandler)
+        {
+            dol_syslog("Try to zip with format ".$mode." with no handler for this format",LOG_ERR);
+            return -2;
+        }
+    }
+    catch (Exception $e)
+    {
+        global $langs, $errormsg;
+        $langs->load("errors");
+        dol_syslog("Failed to open file ".$outputfile, LOG_ERR);
+        dol_syslog($e->getMessage(), LOG_ERR);
+        $errormsg=$langs->trans("ErrorFailedToWriteInDir",$outputfile);
+        return -1;
+    }
+}
+
+
+
 /**
  * Return file(s) into a directory (by default most recent)
  *
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index aea5ad68113..740397a5044 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -19,6 +19,7 @@ ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
 ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
 ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
 ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
 ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
@@ -115,7 +116,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoice
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 280a1666b02..a14bfffffb6 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -16,6 +16,7 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index e11ff31a303..b3b2c8dac77 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -115,9 +115,60 @@ if ($dircustom && $action == 'initmodule' && $modulename)
 
 if ($dircustom && $action == 'generatepackage')
 {
-    $dir = $dircustom.'/'.$modulename;
+    $modulelowercase=strtolower($module);
 	
+    // Dir for module
+    $dir = $dircustom.'/'.$modulelowercase;
+    // Zip file to build
+    $FILENAMEZIP='';
+    
+    // Load module
+    dol_include_once($modulelowercase.'/core/modules/mod'.$module.'.class.php');
+    $class='mod'.$module;
 
+    if (class_exists($class))
+    {
+        try {
+            $moduleobj = new $class($db);
+        }
+        catch(Exception $e)
+        {
+            $error++;
+            dol_print_error($e->getMessage());
+        }
+    }
+    else
+    {
+        $error++;
+        $langs->load("errors");
+        dol_print_error($langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module));
+        exit;
+    }
+    
+    $arrayversion=explode('.',$moduleobj->version,3);
+    if (count($arrayversion))
+    {
+        $FILENAMEZIP="module_".$modulelowercase.'-'.$arrayversion[0].'.'.$arrayversion[1].($arrayversion[2]?".".$arrayversion[2]:"").".zip";
+        $outputfile = $conf->admin->dir_temp.'/'.$FILENAMEZIP;
+    
+        $result = dol_compress_dir($dir, $outputfile, 'zip');
+        if ($result > 0)
+        {
+            setEventMessages($langs->trans("ZipFileGeneratedInto", $outputfile), null);
+        }
+        else
+        {
+            $error++;
+            $langs->load("errors");
+            setEventMessages($langs->trans("ErrorFailToGenerateFile", $outputfile), null, 'errors');
+        }
+    }
+    else
+    {
+        $error++;
+        $langs->load("errors");
+        setEventMessages($langs->trans("ErrorCheckVersionIsDefined"), null, 'errors');
+    }
 }
 
 
@@ -434,6 +485,12 @@ elseif (! empty($module))
 
         if ($tab == 'buildpackage')
         {
+            if (! class_exists('ZipArchive') && ! defined('ODTPHP_PATHTOPCLZIP'))
+            {
+                print img_warning().' '.$langs->trans("ErrNoZipEngine");
+                print '<br>';
+            }
+            
         	print '<form name="generatepackage">';
         	print '<input type="hidden" name="action" value="generatepackage">';
         	print '<input type="hidden" name="tab" value="'.dol_escape_htmltag($tab).'">';

From 21183f91a3f0c9eb2613ad74a3b5e1e6929e2a8e Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Wed, 31 May 2017 05:27:39 +0200
Subject: [PATCH 028/438] FIX : Vat payment - Sql error / Add information in
 tooltip / Correct writting in general ledger

---
 htdocs/accountancy/journal/bankjournal.php | 30 +++++++++++++++---
 htdocs/compta/tva/reglement.php            | 36 ++++++++++++----------
 2 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index ea98d678671..7bb1ef20923 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -284,7 +284,8 @@ if ($result) {
 					$paymentvatstatic->id = $links[$key]['url_id'];
 					$paymentvatstatic->ref = $links[$key]['url_id'];
 					$paymentvatstatic->label = $links[$key]['label'];
-					$tabpay[$obj->rowid]["lib"] .= ' ' . $langs->trans("PaymentVat");
+					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentvatstatic->getNomUrl(2);
+					$tabpay[$obj->rowid]["paymentvatid"] = $paymentvatstatic->id;
 					$tabtp[$obj->rowid][$account_pay_vat] += $obj->amount;
 				} else if ($links[$key]['type'] == 'payment_salary') {
 					$paymentsalstatic->id = $links[$key]['url_id'];
@@ -415,8 +416,11 @@ if (! $error && $action == 'writebookkeeping') {
         					$objmid = $db->fetch_object($resultmid);
         					$bookkeeping->doc_ref = $objmid->ref; // Ref of expensereport
         				}
-        			}
-        
+        			} else if ($tabtype[$key] == 'payment_vat') {
+						$bookkeeping->code_tiers = '';
+						$bookkeeping->doc_ref = $langs->trans("PaymentVat") . ' (' . $val["paymentvatid"] . ')'; // Rowid of vat payment
+					}
+
         			$result = $bookkeeping->create($user);
         			if ($result < 0) {
         				if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
@@ -489,6 +493,10 @@ if (! $error && $action == 'writebookkeeping') {
         				}
                         $bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
         				$bookkeeping->numero_compte = $k;
+					} else if ($tabtype[$key] == 'payment_vat') {
+						$bookkeeping->code_tiers = '';
+						$bookkeeping->numero_compte = $k;
+						$bookkeeping->doc_ref = $langs->trans("PaymentVat") . ' (' . $val["paymentvatid"] . ')'; // Rowid of vat
         			} else if ($tabtype[$key] == 'banktransfert') {
 						$bookkeeping->code_tiers = '';
         				$bookkeeping->numero_compte = $k;
@@ -724,6 +732,7 @@ if (empty($action) || $action == 'view') {
 	$invoicestatic = new Facture($db);
 	$invoicesupplierstatic = new FactureFournisseur($db);
 	$expensereportstatic = new ExpenseReport($db);
+	$vatstatic = new Tva($db);
 
 	llxHeader('', $langs->trans("FinanceJournal"));
 
@@ -850,7 +859,20 @@ if (empty($action) || $action == 'view') {
 		    }
 		    else dol_print_error($db);
 		}
-
+		elseif ($tabtype[$key] == 'payment_vat')
+		{
+			$sqlmid = 'SELECT v.rowid as id';
+			$sqlmid .= " FROM " . MAIN_DB_PREFIX . "tva as v";
+			$sqlmid .= " WHERE v.rowid=" . $val["paymentvatid"];
+			dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
+			$resultmid = $db->query($sqlmid);
+			if ($resultmid) {
+				$objmid = $db->fetch_object($resultmid);
+				$vatstatic->fetch($objmid->id);
+				$ref=$langs->trans("PaymentVat").' '.$vatstatic->getNomUrl(1);
+			}
+			else dol_print_error($db);
+		}
 
 		/*$invoicestatic->id = $key;
 		$invoicestatic->ref = $val["ref"];
diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php
index 076978a86fb..8b4d3299f9c 100644
--- a/htdocs/compta/tva/reglement.php
+++ b/htdocs/compta/tva/reglement.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2011-2014 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2011-2017 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,6 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 
 $langs->load("compta");
 $langs->load("bills");
@@ -94,10 +95,10 @@ llxHeader('', $langs->trans("VATPayments"));
 $form = new Form($db);
 $formother=new FormOther($db);
 $tva_static = new Tva($db);
-$accountstatic = new Account($db);
+$bankstatic = new Account($db);
 
 $sql = "SELECT t.rowid, t.amount, t.label, t.datev as dv, t.datep as dp, t.fk_typepayment as type, t.num_payment, t.fk_bank, pst.code as payment_code,";
-$sql.= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.accountancy_journal, ba.label as blabel";
+$sql.= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel";
 $sql.= " FROM ".MAIN_DB_PREFIX."tva as t";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pst ON t.fk_typepayment = pst.id";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON t.fk_bank = b.rowid";
@@ -227,19 +228,22 @@ if ($result)
 	    {
 	        print '<td>';
 	        if ($obj->fk_bank > 0)
-	        {
-	        	//$accountstatic->fetch($obj->fk_bank);
-	            $accountstatic->id=$obj->bid;
-	            $accountstatic->ref=$obj->bref;
-	            $accountstatic->number=$obj->bnumber;
-	            $accountstatic->accountancy_number=$obj->account_number;
-	            $accountstatic->accountancy_journal=$obj->accountancy_journal;
-	            $accountstatic->label=$obj->blabel;
-	            print $accountstatic->getNomUrl(1);
-	        }
-	        else print '&nbsp;';
-	        print '</td>';
-	    }
+			{
+				$bankstatic->id=$obj->bid;
+				$bankstatic->ref=$obj->bref;
+				$bankstatic->number=$obj->bnumber;
+				$bankstatic->account_number=$obj->account_number;
+
+				$accountingjournal = new AccountingJournal($db);
+				$accountingjournal->fetch($obj->fk_accountancy_journal);
+				$bankstatic->accountancy_journal = $accountingjournal->getNomUrl(0,1,1,'',1);
+
+				$bankstatic->label=$obj->blabel;
+				print $bankstatic->getNomUrl(1);
+			}
+			else print '&nbsp;';
+			print '</td>';
+		}
 		// Amount
         $total = $total + $obj->amount;
 		print "<td align=\"right\">".price($obj->amount)."</td>";

From 292571688b54b4d327dc7ad7bac9e1e3fae0b445 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 31 May 2017 10:43:01 +0200
Subject: [PATCH 029/438] Fix error message not reported

---
 htdocs/core/class/dolgraph.class.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 4fb973160d4..691cb8b986d 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -24,7 +24,12 @@
 
 
 /**
- * Parent class of graph classes
+ * Class to build graphs.
+ * Usage is: 
+ *    $dolgraph=new DolGraph();
+ *    $dolgraph->SetData($data);
+ *    $dolgraph->draw('idofgraph');
+ *    print $dolgraph->show();
  */
 class DolGraph
 {
@@ -780,9 +785,9 @@ class DolGraph
 
 	/**
 	 * Build a graph using JFlot library. Input when calling this method should be:
-	 *	$this->data  = array(array(      0=>'labelxA',     1=>yA),  array('labelxB',yB)); or
+	 *	$this->data  = array(array(0=>'labelxA',1=>yA),  array('labelxB',yB));
+	 *	$this->data  = array(array(0=>'labelxA',1=>yA1,...,n=>yAn), array('labelxB',yB1,...yBn));   // or when there is n series to show for each x
 	 *  $this->data  = array(array('label'=>'labelxA','data'=>yA),  array('labelxB',yB));			// TODO Syntax not supported. Removed when dol_print_graph_removed
-	 *	$this->data  = array(array(0=>'labelxA',1=>yA1,...,n=>yAn), array('labelxB',yB1,...yBn));   // when there is n series to show for each x
 	 *  $this->legend= array("Val1",...,"Valn");													// list of n series name
 	 *  $this->type  = array('bars',...'lines'); or array('pie')
 	 *  $this->mode = 'depth' ???
@@ -808,7 +813,7 @@ class DolGraph
 
 		$legends=array();
 		$nblot=count($this->data[0])-1;    // -1 to remove legend
-		if ($nblot < 0) dol_print_error('Bad value for property ->data. Must be set by mydolgraph->SetData before callinf mydolgrapgh->draw');
+		if ($nblot < 0) dol_print_error('', 'Bad value for property ->data. Must be set by mydolgraph->SetData before calling mydolgrapgh->draw');
 		$firstlot=0;
 		// Works with line but not with bars
 		//if ($nblot > 2) $firstlot = ($nblot - 2);        // We limit nblot to 2 because jflot can't manage more than 2 bars on same x

From 145cb628cd12d51d6b98e8e88a05d11ce408249f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 31 May 2017 11:11:25 +0200
Subject: [PATCH 030/438] FIX dol_string_nohtmltag make 2 passes to clean html
 into html attributes.

---
 htdocs/core/lib/functions.lib.php | 7 ++++++-
 test/phpunit/FunctionsLibTest.php | 8 ++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 041235f40f6..4a9d25aefde 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4704,8 +4704,13 @@ function dol_string_nohtmltag($StringHtml,$removelinefeed=1,$pagecodeto='UTF-8')
 	$pattern = "/<[^<>]+>/";
 	$StringHtml = preg_replace('/<br[^>]*>/', "\n", $StringHtml);
 	$temp = dol_html_entity_decode($StringHtml,ENT_COMPAT,$pagecodeto);
-	$temp = preg_replace($pattern,"",$temp);
 
+    // Exemple of $temp: <a href="/myurl" title="<u>A title</u>">0000-021</a>
+    $temp = preg_replace($pattern,"",$temp);    // pass 1
+    // $temp after pass 1: <a href="/myurl" title="A title">0000-021
+    $temp = preg_replace($pattern,"",$temp);    // pass 2
+    // $temp after pass 2: 0000-021
+    
 	// Supprime aussi les retours
 	if ($removelinefeed) $temp=str_replace(array("\r\n","\r","\n")," ",$temp);
 
diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php
index 8c57e8a178a..4e98ce0b3bc 100644
--- a/test/phpunit/FunctionsLibTest.php
+++ b/test/phpunit/FunctionsLibTest.php
@@ -377,6 +377,14 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
         $after=dol_string_nohtmltag($text,1);
         $this->assertEquals("A string Another string",$after,"test5");
 
+        $text='<a href="/myurl" title="<u>Afficher projet</u>">ABC</a>';
+        $after=dol_string_nohtmltag($text,1);
+        $this->assertEquals("ABC",$after,"test6");
+        
+        $text='<a href="/myurl" title="&lt;u&gt;Afficher projet&lt;/u&gt;">DEF</a>';
+        $after=dol_string_nohtmltag($text,1);
+        $this->assertEquals("DEF",$after,"test7");
+        
         return true;
     }
 

From 10ac53077e24241e9919d21c2e98650a6eb343ba Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 31 May 2017 11:51:38 +0200
Subject: [PATCH 031/438] Code comment

---
 htdocs/core/class/dolgraph.class.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 691cb8b986d..4fad0149a5b 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -27,7 +27,13 @@
  * Class to build graphs.
  * Usage is: 
  *    $dolgraph=new DolGraph();
+ *    $dolgraph->SetTitle($langs->transnoentities('Tracking_Projects_Pourcent').'<br>'.$langs->transnoentities('Tracking_IndicatorDefGraph').'%');
+ *    $dolgraph->SetMaxValue(50);
  *    $dolgraph->SetData($data);
+ *    $dolgraph->setShowLegend(1);
+ *    $dolgraph->setShowPercent(1);
+ *    $dolgraph->SetType(array('pie'));
+ *    $dolgraph->setWidth('100%');
  *    $dolgraph->draw('idofgraph');
  *    print $dolgraph->show();
  */
@@ -803,7 +809,7 @@ class DolGraph
 	{
 		global $artichow_defaultfont;
 
-		dol_syslog(get_class($this)."::draw_jflot this->type=".join(',',$this->type));
+		dol_syslog(get_class($this)."::draw_jflot this->type=".join(',',$this->type)." this->MaxValue=".$this->MaxValue);
 
 		if (empty($this->width) && empty($this->height))
 		{

From b2779e2c08e176e639aab478c92e1a2a84016634 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 31 May 2017 12:05:53 +0200
Subject: [PATCH 032/438] Typo

---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index c297c5d8bce..57824562787 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -215,7 +215,7 @@ Dolibarr better:
 - Method commande->set_availability(user, availability_id) removed from commande class, use method commande->availability(availability_id, notrigger).
 
 Dolibarr 5.0 was frozen before PHP 7.1 was released. Unit tests are successful on PHP 7.1 but we don't have enough
-feedback to confirm all application is compatible. Current officiel supported PHP versions are PHP 5.3 to 7.0.
+feedback to confirm whole application is compatible. Current officiel supported PHP versions are PHP 5.3 to 7.0.
 
 
 ***** ChangeLog for 4.0.6 to 4.0.5 *****

From e41541ab79150449ba1db6f52497beb7ac13db88 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 31 May 2017 12:47:21 +0200
Subject: [PATCH 033/438] Enhance detection of changelog not updated

---
 build/makepack-dolibarr.pl | 74 +++++++++++++++++++++++---------------
 1 file changed, 45 insertions(+), 29 deletions(-)

diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index 9c8f8ea601e..fdd14fcf5a2 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -14,7 +14,7 @@
 #----------------------------------------------------------------------------
 
 use Cwd;
-
+use Term::ANSIColor;
 
 # Change this to defined target for option 98 and 99
 $PROJECT="dolibarr";
@@ -313,20 +313,6 @@ foreach my $target (sort keys %CHOOSEDTARGET) {
 
 print "\n";
 
-# Build xml check file
-#-----------------------
-if ($CHOOSEDTARGET{'-CHKSUM'})
-{
-   	print 'Create xml check file with md5 checksum with command php '.$SOURCE.'/build/generate_filecheck_xml.php release='.$MAJOR.'.'.$MINOR.'.'.$BUILD."\n";
-  	$ret=`php $SOURCE/build/generate_filelist_xml.php release=$MAJOR.$MINOR.$BUILD`;
-  	print $ret."\n";
-  	# Copy to final dir
-  	$NEWDESTI=$DESTI;
-	print "Copy \"$SOURCE/htdocs/install/filelist-$MAJOR.$MINOR.$BUILD.xml\" to $NEWDESTI/signatures/filelist-$MAJOR.$MINOR.$BUILD.xml\n";
-    use File::Copy qw(copy);
-    copy "$SOURCE/htdocs/install/filelist-$MAJOR.$MINOR.$BUILD.xml", "$NEWDESTI/signatures/filelist-$MAJOR.$MINOR.$BUILD.xml";
-}
-
 
 #print join(',',sort keys %CHOOSEDTARGET)."\n";
 
@@ -335,7 +321,10 @@ if ($CHOOSEDTARGET{'-CHKSUM'})
 $nboftargetok=0;
 $nboftargetneedbuildroot=0;
 $nbofpublishneedtag=0;
+$nbofpublishneedchangelog=0;
+
 foreach my $target (sort keys %CHOOSEDTARGET) {
+	if ($target eq '-CHKSUM') { $nbofpublishneedchangelog++; }
 	if ($CHOOSEDTARGET{$target} < 0) { next; }
 	if ($target ne 'EXE' && $target ne 'EXEDOLIWAMP' && $target ne '-CHKSUM') 
 	{
@@ -345,34 +334,31 @@ foreach my $target (sort keys %CHOOSEDTARGET) {
 }
 foreach my $target (sort keys %CHOOSEDPUBLISH) {
 	if ($CHOOSEDPUBLISH{$target} < 0) { next; }
-	if ($target eq 'ASSO') { $nbofpublishneedtag++; }
-	if ($target eq 'SF') { $nbofpublishneedtag++; }
+	if ($target eq 'ASSO') { $nbofpublishneedchangelog++; $nbofpublishneedtag++; }
+	if ($target eq 'SF') { $nbofpublishneedchangelog++; $nbofpublishneedtag++; }
 	$nboftargetok++;
 }
 
+
 if ($nboftargetok) {
 
-	# Update GIT tag if required
-	#---------------------------
-	if ($nbofpublishneedtag)
+	# Check Changelog
+	#----------------
+	if ($nbofpublishneedchangelog)
 	{
-		print "Go to directory $SOURCE\n";
-		$olddir=getcwd();
-		chdir("$SOURCE");
-		
 		# Test that the ChangeLog is ok
 		$TMPBUILDTOCHECKCHANGELOG=$BUILD;
 		$TMPBUILDTOCHECKCHANGELOG =~ s/\-rc\d*//;
 		$TMPBUILDTOCHECKCHANGELOG =~ s/\-beta\d*//;
-		print "Check if ChangeLog is ok for version $MAJOR.$MINOR\.$TMPBUILDTOCHECKCHANGELOG\n";
+		print "\nCheck if ChangeLog is ok for version $MAJOR.$MINOR\.$TMPBUILDTOCHECKCHANGELOG\n";
 		$ret=`grep "ChangeLog for $MAJOR.$MINOR\.$TMPBUILDTOCHECKCHANGELOG" "$SOURCE/ChangeLog" 2>&1`;
 		if (! $ret)
 		{
-			print "Error: The ChangeLogFile was not updated. Run the following command before building package for $MAJOR.$MINOR.$BUILD:\n";
+			print color("yellow"), "Error: The ChangeLogFile was not updated. Run the following command before building package for $MAJOR.$MINOR.$BUILD:\n", color('reset');
 		}
 		else
 		{
-			print "ChangeLog for $MAJOR.$MINOR\.$BUILD was found into '$SOURCE/ChangeLog. But you can regenerate it with commande:'\n";
+			print "ChangeLog for $MAJOR.$MINOR\.$BUILD was found into '$SOURCE/ChangeLog. But you can regenerate it with command:'\n";
 		}
 		if (! $BUILD || $BUILD eq '0-rc')	# For a major version
 		{
@@ -385,9 +371,39 @@ if ($nboftargetok) {
 		print "\n";
 		if (! $ret)
 		{
-			exit;
+			print "\nPress F to force and continue anyway (or other key to stop)... ";
+			my $WAITKEY=<STDIN>;
+			chomp($WAITKEY);
+			if ($WAITKEY ne 'F')
+			{
+				print "Canceled.\n";
+				exit;
+			}
 		}
-			
+	}
+		
+	# Build xml check file
+	#-----------------------
+	if ($CHOOSEDTARGET{'-CHKSUM'})
+	{
+	   	print 'Create xml check file with md5 checksum with command php '.$SOURCE.'/build/generate_filecheck_xml.php release='.$MAJOR.'.'.$MINOR.'.'.$BUILD."\n";
+	  	$ret=`php $SOURCE/build/generate_filelist_xml.php release=$MAJOR.$MINOR.$BUILD`;
+	  	print $ret."\n";
+	  	# Copy to final dir
+	  	$NEWDESTI=$DESTI;
+		print "Copy \"$SOURCE/htdocs/install/filelist-$MAJOR.$MINOR.$BUILD.xml\" to $NEWDESTI/signatures/filelist-$MAJOR.$MINOR.$BUILD.xml\n";
+	    use File::Copy qw(copy);
+	    copy "$SOURCE/htdocs/install/filelist-$MAJOR.$MINOR.$BUILD.xml", "$NEWDESTI/signatures/filelist-$MAJOR.$MINOR.$BUILD.xml";
+	}
+
+	# Update GIT tag if required
+	#---------------------------
+	if ($nbofpublishneedtag)
+	{
+		print "Go to directory $SOURCE\n";
+		$olddir=getcwd();
+		chdir("$SOURCE");
+		
 		print 'Run git tag -a -m "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'" "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'"'."\n";
 		$ret=`git tag -a -m "$MAJOR.$MINOR.$BUILD" "$MAJOR.$MINOR.$BUILD" 2>&1`;
 		if ($ret =~ /(already exists|existe déjà)/)

From 7139a2dd9d420c9f4dec6179edd40e045f190276 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 31 May 2017 13:09:25 +0200
Subject: [PATCH 034/438] Update debian package

---
 build/debian/source/lintian-overrides | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/build/debian/source/lintian-overrides b/build/debian/source/lintian-overrides
index b4c0956e90f..c878035b482 100644
--- a/build/debian/source/lintian-overrides
+++ b/build/debian/source/lintian-overrides
@@ -4,7 +4,12 @@ dolibarr: source-contains-prebuilt-javascript-object htdocs/includes/jsgantt/*
 dolibarr: source-contains-prebuilt-javascript-object htdocs/includes/jstz/*
 # Those are false positives, the files are their own sources since
 # they are not minified
-source-is-missing htdocs/includes/jsgantt/jsgantt.js *
-source-is-missing htdocs/includes/jquery/plugins/colorpicker/jquery.colorpicker.js *
-source-is-missing htdocs/includes/jquery/plugins/select2/select2.js *
-source-is-missing htdocs/includes/jquery/plugins/select2/select2_locale_ar.js *
+source-is-missing htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/*.js
+source-is-missing htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/*.js
+source-is-missing htdocs/includes/ckeditor/ckeditor/lang/*.js
+source-is-missing htdocs/includes/ckeditor/ckeditor/plugins/*/dialogs/*.js
+source-is-missing htdocs/includes/ckeditor/ckeditor/plugins/*/filter/*.js
+source-is-missing htdocs/includes/ckeditor/ckeditor/plugins/templates/templates/default.js
+source-is-missing htdocs/includes/mobiledetect/mobiledetectlib/Mobile_Detect.json
+source-is-missing htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/*.js
+

From 82ddf293b622c543e4e9740b775a23358008ab93 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 31 May 2017 13:29:31 +0200
Subject: [PATCH 035/438] Prepare 5.0.3

---
 ChangeLog | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 57824562787..78793b9d419 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,26 @@ English Dolibarr ChangeLog
 --------------------------------------------------------------
 
 
+***** ChangeLog for 5.0.3 compared to 5.0.2 *****
+FIX: #6677 Expired contracts dashboard box does not show the name of the thirdparty
+FIX: #6813
+FIX: 6863
+FIX: #6877
+FIX: #6881
+FIX: Better sanitizing of search all parameter.
+FIX: Correction with author and validator user on orders
+FIX: dialog window with md theme must not be hidden by left menu part.
+FIX: doactions hook missing in invoice model page
+FIX: Fullname when member is a moral entity with no name.
+FIX: Link to files on bank account tab broken with multicompany FIX: Link to preview on thirdparty broken with multicompany
+FIX: New vat code not correctly implemented if "1 price per customer".
+FIX: Pagination of invoices
+FIX: pagination on resources
+FIX: REST API not possible to add agendaevents
+FIX: situation invoice broken due to the all percent application form inside addline form
+FIX: SQL injection on user/index.php parameter search_statut.
+FIX: XSS
+
 ***** ChangeLog for 5.0.2 compared to 5.0.1 *****
 FIX: #6468 + Fix missing translation
 FIX: #6517 #6525 Autocompletion of thirdparty after n chars not implemented

From 7c29e286f82f2ca3d3a77a6b67d0534067bad6b0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 31 May 2017 13:31:17 +0200
Subject: [PATCH 036/438] Prepare 4.0.7

---
 htdocs/filefunc.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index d2ca04278ff..13349d3c1da 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -31,7 +31,7 @@
  */
 
 if (! defined('DOL_APPLICATION_TITLE')) define('DOL_APPLICATION_TITLE','Dolibarr');
-if (! defined('DOL_VERSION')) define('DOL_VERSION','4.0.6');
+if (! defined('DOL_VERSION')) define('DOL_VERSION','4.0.7');
 
 if (! defined('EURO')) define('EURO',chr(128));
 

From d70c14a411f520714656f2d5ca8c0a64d300742c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 31 May 2017 19:07:39 +0200
Subject: [PATCH 037/438] Update bonprelevement.class.php

---
 htdocs/compta/prelevement/class/bonprelevement.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 2bfed9b0696..dd6b773af9f 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -1562,11 +1562,11 @@ class BonPrelevement extends CommonObject
 		$XML_DEBITOR .='					</FinInstnId>'.$CrLf;
 		$XML_DEBITOR .='				</DbtrAgt>'.$CrLf;
 		$XML_DEBITOR .='				<Dbtr>'.$CrLf;
-		$XML_DEBITOR .='					<Nm>'.strtoupper(dol_string_unaccent(dolEscapeXML($row_nom))).'</Nm>'.$CrLf;
+		$XML_DEBITOR .='					<Nm>'.strtoupper(dolEscapeXML(dol_string_unaccent($row_nom))).'</Nm>'.$CrLf;
 		$XML_DEBITOR .='					<PstlAdr>'.$CrLf;
 		$XML_DEBITOR .='						<Ctry>'.$row_country_code.'</Ctry>'.$CrLf;
 		$XML_DEBITOR .='						<AdrLine>'.dol_trunc(dol_string_unaccent(strtr($row_address, array(CHR(13) => ", ", CHR(10) => ""))),70,'right','UTF-8',true).'</AdrLine>'.$CrLf;
-		$XML_DEBITOR .='						<AdrLine>'.dol_string_unaccent($row_zip.' '.$row_town).'</AdrLine>'.$CrLf;
+		$XML_DEBITOR .='						<AdrLine>'.dolEscapeXML(dol_string_unaccent($row_zip.' '.$row_town)).'</AdrLine>'.$CrLf;
 		$XML_DEBITOR .='					</PstlAdr>'.$CrLf;
 		$XML_DEBITOR .='				</Dbtr>'.$CrLf;
 		$XML_DEBITOR .='				<DbtrAcct>'.$CrLf;

From d5f83d6bbe9159347192a9dc95bf6285c47a1b4e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 31 May 2017 19:13:06 +0200
Subject: [PATCH 038/438] NEW #6915 Simplest change.

---
 htdocs/core/lib/functions.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 4a9d25aefde..f1a7b5b57a9 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -110,10 +110,10 @@ function getDoliDBInstance($type, $host, $user, $pass, $name, $port)
  *                              'commande', 'commande_fournisseur', 'expedition', 'intervention', 'survey',
  *                              'contract', 'tax', 'expensereport', 'holiday', 'multicurrency', 'project',
  *                              'email_template', 'event',
- * 	@param	int		$shared		0=Return id of entity, 1=Return id entity + shared entities
+ * 	@param	int	     $shared	1=Return id of current entity + shared entities (default), 0=Return id of current entity only 
  * 	@return	mixed				Entity id(s) to use
  */
-function getEntity($element=false, $shared=0)
+function getEntity($element=false, $shared=1)
 {
 	global $conf, $mc;
 

From 6c7179d28190a0490aee936f74fb670986dd453c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 31 May 2017 19:20:33 +0200
Subject: [PATCH 039/438] Test of commit with autoremove trail space

---
 htdocs/core/lib/functions.lib.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index f1a7b5b57a9..bd2944fa2f4 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -100,7 +100,7 @@ function getDoliDBInstance($type, $host, $user, $pass, $name, $port)
 }
 
 /**
- * 	Get list of entity id to use
+ * 	Get list of entity id to use.
  *
  * 	@param	string	$element	Current element
  *                              'societe', 'socpeople', 'actioncomm', 'agenda', 'resource',
@@ -110,7 +110,7 @@ function getDoliDBInstance($type, $host, $user, $pass, $name, $port)
  *                              'commande', 'commande_fournisseur', 'expedition', 'intervention', 'survey',
  *                              'contract', 'tax', 'expensereport', 'holiday', 'multicurrency', 'project',
  *                              'email_template', 'event',
- * 	@param	int	     $shared	1=Return id of current entity + shared entities (default), 0=Return id of current entity only 
+ * 	@param	int	     $shared	1=Return id of current entity + shared entities (default), 0=Return id of current entity only
  * 	@return	mixed				Entity id(s) to use
  */
 function getEntity($element=false, $shared=1)
@@ -4710,7 +4710,7 @@ function dol_string_nohtmltag($StringHtml,$removelinefeed=1,$pagecodeto='UTF-8')
     // $temp after pass 1: <a href="/myurl" title="A title">0000-021
     $temp = preg_replace($pattern,"",$temp);    // pass 2
     // $temp after pass 2: 0000-021
-    
+
 	// Supprime aussi les retours
 	if ($removelinefeed) $temp=str_replace(array("\r\n","\r","\n")," ",$temp);
 

From a49174313f6bf6c6fa05b812c5a78258a65a1f66 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 31 May 2017 19:45:54 +0200
Subject: [PATCH 040/438] Replace {extra_ with {user_extra_

---
 htdocs/core/lib/functions2.lib.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 69ee228504d..c3d8714ab89 100755
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -790,16 +790,16 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
         $maskpersonew[$regKey[1]]=str_pad('', '_', $regKey[2], STR_PAD_RIGHT);
         $tmpmask=preg_replace('/\{'.$regKey[1].'\-'.$regKey[2].'\}/i', $maskpersonew, $tmpmask);
     }*/
-	
-    if(strstr($mask,'extra_')){
 
-			$start = "{extra_";
+    if (strstr($mask,'user_extra_'))
+    {
+			$start = "{user_extra_";
 			$end = "\}";
-			$extra= get_string_between($mask, "extra_", "}");
+			$extra= get_string_between($mask, "user_extra_", "}");
 			if(!empty($user->array_options['options_'.$extra])){
-				$mask =  preg_replace('#('.($start).')(.*?)('.($end).')#si', $user->array_options['options_'.$extra], $mask);	
+				$mask =  preg_replace('#('.$start.')(.*?)('.$end.')#si', $user->array_options['options_'.$extra], $mask);
 			}
-	} 
+    } 
     $maskwithonlyymcode=$mask;
     $maskwithonlyymcode=preg_replace('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i',$maskcounter,$maskwithonlyymcode);
     $maskwithonlyymcode=preg_replace('/\{dd\}/i','dd',$maskwithonlyymcode);

From dc9d9b47b4c61362138778b7896e28ceefbe3388 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Wed, 31 May 2017 21:35:26 +0200
Subject: [PATCH 041/438] Fix : Missing language key

---
 htdocs/langs/en_US/banks.lang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index d98d2b465d0..3c7f8b338c0 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -66,6 +66,7 @@ RemoveFromRubriqueConfirm=Are you sure you want to remove link between the entry
 ListBankTransactions=List of bank entries
 IdTransaction=Transaction ID
 BankTransactions=Bank entries
+BankTransaction=Bank entry
 ListTransactions=List entries
 ListTransactionsByCategory=List entries/category
 TransactionsToConciliate=Entries to reconcile

From c70beaa56b3afce61c4e0f1def585eeffe566487 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Jun 2017 01:53:55 +0200
Subject: [PATCH 042/438] Complete work for mutualizing generic substitution
 system.

---
 htdocs/admin/commande.php                 |  14 +--
 htdocs/admin/contract.php                 |   2 +-
 htdocs/admin/defaultvalues.php            |  44 ++++-----
 htdocs/admin/expedition.php               |   2 +-
 htdocs/admin/expensereport.php            |  12 +--
 htdocs/admin/facture.php                  |   2 +-
 htdocs/admin/fichinter.php                |   4 +-
 htdocs/admin/ihm.php                      |  88 +++++++++++-------
 htdocs/admin/livraison.php                |   4 +-
 htdocs/admin/mails_templates.php          |  68 +++++++-------
 htdocs/admin/propal.php                   |   6 +-
 htdocs/admin/supplier_invoice.php         |   6 +-
 htdocs/admin/supplier_order.php           |  10 +--
 htdocs/admin/supplier_proposal.php        |   6 +-
 htdocs/core/class/html.formmail.class.php |  75 ++++++++--------
 htdocs/core/lib/functions.lib.php         | 103 +++++++++++++++++++++-
 htdocs/core/lib/pdf.lib.php               |  50 ++++-------
 htdocs/core/lib/security2.lib.php         |  16 ++--
 htdocs/index.php                          |  31 +++----
 19 files changed, 315 insertions(+), 228 deletions(-)

diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index d60144a3492..6d92ad21999 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -182,7 +182,7 @@ else if ($action == 'setdoc')
 
 else if ($action == 'setmod')
 {
-	// TODO Check if numbering module chosen can be activated 
+	// TODO Check if numbering module chosen can be activated
 	// by calling method canBeActivated
 
 	dolibarr_set_const($db, "COMMANDE_ADDON",$value,'chaine',0,'',$conf->entity);
@@ -331,7 +331,7 @@ foreach ($dirmodels as $reldir)
 
 					if ($module->isEnabled())
 					{
-						
+
 						print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
 						print $module->info();
 						print '</td>';
@@ -609,7 +609,7 @@ print "</td></tr>\n";
 print '</form>';
 
 // Shippable Icon in List
-/* Kept as hidden feature for the moment, result seems bugged. 
+/* Kept as hidden feature for the moment, result seems bugged.
 Whet is definition of "shippable" according to all different STOCK_CALCULATE_... options ?
 
 print '<tr class="oddeven">';
@@ -631,7 +631,7 @@ print '</tr>';
 // Ask for payment bank during order
 if ($conf->banque->enabled)
 {
-    
+
     print '<tr class="oddeven"><td>';
     print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_ORDER").'</td><td>&nbsp</td><td align="center">';
     if (! empty($conf->use_javascript_ajax))
@@ -653,7 +653,7 @@ if ($conf->banque->enabled)
 }
 else
 {
-    
+
     print '<tr class="oddeven"><td>';
     print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_ORDER").'</td><td>&nbsp;</td><td align="center">'.$langs->trans('NotAvailable').'</td></tr>';
 }
@@ -661,7 +661,7 @@ else
 // Ask for warehouse during order
 if ($conf->stock->enabled)
 {
-    
+
     print '<tr class="oddeven"><td>';
     print $langs->trans("WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER").'</td><td>&nbsp</td><td align="center">';
     if (! empty($conf->use_javascript_ajax))
@@ -683,7 +683,7 @@ if ($conf->stock->enabled)
 }
 else
 {
-    
+
     print '<tr class="oddeven"><td>';
     print $langs->trans("WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER").'</td><td>&nbsp;</td><td align="center">'.$langs->trans('NotAvailable').'</td></tr>';
 }
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index 4c0a9572761..47e53a05048 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -265,7 +265,7 @@ foreach ($dirmodels as $reldir)
 
 					if ($module->isEnabled())
 					{
-						
+
 						print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
 						print $module->info();
 						print '</td>';
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 40e63de8aea..10d9ec5c282 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -120,11 +120,11 @@ if (($action == 'add' || (GETPOST('add') && $action != 'update')) || GETPOST('ac
 	        $error++;
 	    }
 	}
-	
+
 	if (! $error)
 	{
 	    $db->begin();
-	    
+
 	    if ($action == 'add' || (GETPOST('add') && $action != 'update'))
 	    {
             $sql = "INSERT INTO ".MAIN_DB_PREFIX."default_values(type, user_id, page, param, value, entity) VALUES ('".$db->escape($mode)."', 0, '".$db->escape($defaulturl)."','".$db->escape($defaultkey)."','".$db->escape($defaultvalue)."', ".$db->escape($conf->entity).")";
@@ -134,7 +134,7 @@ if (($action == 'add' || (GETPOST('add') && $action != 'update')) || GETPOST('ac
 		    $sql = "UPDATE ".MAIN_DB_PREFIX."default_values SET page = '".$db->escape($urlpage)."', param = '".$db->escape($key)."', value = '".$db->escape($value)."'";
 		    $sql.= " WHERE rowid = ".$id;
 	    }
-		
+
 		$result = $db->query($sql);
 		if ($result > 0)
 		{
@@ -223,7 +223,7 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
 
 $head=defaultvalues_prepare_head();
-    
+
 dol_fiche_head($head, $mode, '', -1, '');
 
 if ($mode == 'sortorder')
@@ -249,11 +249,11 @@ $texturl=$form->textwithpicto($langs->trans("Url"), $texthelp);
 print_liste_field_titre($texturl,$_SERVER["PHP_SELF"],'page,param','',$param,'',$sortfield,$sortorder);
 // Field
 $texthelp=$langs->trans("TheKeyIsTheNameOfHtmlField");
-if ($mode != 'sortorder') 
+if ($mode != 'sortorder')
 {
     $textkey=$form->textwithpicto($langs->trans("Field"), $texthelp);
 }
-else 
+else
 {
     $texthelp='field or alias.field';
     $textkey=$form->textwithpicto($langs->trans("Field"), $texthelp);
@@ -264,22 +264,14 @@ if ($mode != 'focus')
 {
     if ($mode != 'sortorder')
     {
+        $substitutionarray=getCommonSubstitutionArray($langs, 0, array('object')); // Must match list into GETPOST
+        $substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
         $texthelp=$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
-        // See list into GETPOST
-        $texthelp.='__USERID__<br>';
-        $texthelp.='__SUPERVISORID__<br>';
-        $texthelp.='__MYCOUNTRYID__<br>';
-        $texthelp.='__DAY__<br>';
-        $texthelp.='__MONTH__<br>';
-        $texthelp.='__YEAR__<br>';
-        $texthelp.='__PREVIOUS_DAY__<br>';
-        $texthelp.='__PREVIOUS_MONTH__<br>';
-        $texthelp.='__PREVIOUS_YEAR__<br>';
-        $texthelp.='__NEXT_DAY__<br>';
-        $texthelp.='__NEXT_MONTH__<br>';
-        $texthelp.='__NEXT_YEAR__<br>';
-        if (! empty($conf->multicompany->enabled)) $texthelp.='__ENTITYID__<br>';
-        $textvalue=$form->textwithpicto($langs->trans("Value"), $texthelp, 1, 'help', '', 0, 2, '');
+        foreach($substitutionarray as $key => $val)
+        {
+            $texthelp.=$key.'<br>';
+        }
+        $textvalue=$form->textwithpicto($langs->trans("Value"), $texthelp, 1, 'help', '', 0, 2, '');    // No tooltip on click, this also triggers the sort click
     }
     else
     {
@@ -351,18 +343,18 @@ if ($result)
 	while ($i < $num)
 	{
 		$obj = $db->fetch_object($result);
-		
+
 
 		print "\n";
 
 		print '<tr class="oddeven">';
-		
+
 		// Page
 		print '<td>';
 		if ($action != 'edit' || GETPOST('rowid') != $obj->rowid) print $obj->page;
 		else print '<input type="text" name="urlpage" value="'.dol_escape_htmltag($obj->page).'">';
 		print '</td>'."\n";
-   	    
+
 		// Field
 		print '<td>';
 		if ($action != 'edit' || GETPOST('rowid') != $obj->rowid) print $obj->param;
@@ -382,7 +374,7 @@ if ($result)
     		else print '<input type="text" name="value" value="'.dol_escape_htmltag($obj->value).'">';
     		print '</td>';
 		}
-		
+
 		// Actions
 		print '<td align="center">';
 		if ($action != 'edit' || GETPOST('rowid') != $obj->rowid)
@@ -400,7 +392,7 @@ if ($result)
 		    print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
 		}
 		print '</td>';
-        
+
 		print "</tr>\n";
 		print "\n";
 		$i++;
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 3c89960ede6..e9a9aaedb18 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -82,7 +82,7 @@ else if ($action == 'set_param')
 		$error++;
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-	
+
 	$draft=GETPOST('SHIPPING_DRAFT_WATERMARK','alpha');
 	$res = dolibarr_set_const($db, "SHIPPING_DRAFT_WATERMARK",trim($draft),'chaine',0,'',$conf->entity);
 	if ($res <= 0)
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index eefe5747abd..92ba9375927 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -77,7 +77,7 @@ else if ($action == 'specimen') // For fiche inter
 	$inter->initAsSpecimen();
 	$inter->status = 0;     // Force statut draft to show watermark
 	$inter->fk_statut = 0;     // Force statut draft to show watermark
-	
+
 	// Search template files
 	$file=''; $classname=''; $filefound=0;
 	$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
@@ -193,13 +193,13 @@ else if ($action == 'setmod')
 else if ($action == 'setoptions')
 {
     $db->begin();
-    
+
 	$freetext= GETPOST('EXPENSEREPORT_FREE_TEXT');	// No alpha here, we want exact string
 	$res1 = dolibarr_set_const($db, "EXPENSEREPORT_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
-	
+
 	$draft= GETPOST('EXPENSEREPORT_DRAFT_WATERMARK','alpha');
 	$res2 = dolibarr_set_const($db, "EXPENSEREPORT_DRAFT_WATERMARK",trim($draft),'chaine',0,'',$conf->entity);
-	
+
 	if (! $res1 > 0 || ! $res2 > 0) $error++;
 
  	if (! $error)
@@ -276,7 +276,7 @@ foreach ($dirmodels as $reldir)
 						if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
 						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
-						
+
 						print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
 						print $module->info();
 						print '</td>';
@@ -399,7 +399,7 @@ foreach ($dirmodels as $reldir)
 
 		    		if (file_exists($dir.'/'.$file))
 		    		{
-		    			
+
 
 		    			$name = substr($file, 4, dol_strlen($file) -16);
 		    			$classname = substr($file, 0, dol_strlen($file) -12);
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 77230dc3f68..64ae1abdde6 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -693,7 +693,7 @@ if ($resql)
     $i = 0;
     while ($i < $num)
     {
-        
+
         $row = $db->fetch_row($resql);
 
         print '<option value="'.$row[0].'"';
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 3ce82ce59cb..e3000231c38 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -310,7 +310,7 @@ foreach ($dirmodels as $reldir)
 						if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
 						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
-						
+
 						print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
 						print $module->info();
 						print '</td>';
@@ -432,7 +432,7 @@ foreach ($dirmodels as $reldir)
 		    	{
 		    		if (file_exists($dir.'/'.$file))
 		    		{
-		    			
+
 
 		    			$name = substr($file, 4, dol_strlen($file) -16);
 		    			$classname = substr($file, 0, dol_strlen($file) -12);
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 7c23b62f230..f764f40c054 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -90,11 +90,11 @@ if ($action == 'update')
 	$val=GETPOST('THEME_TOPMENU_DISABLE_IMAGE');
 	if (! $val) dolibarr_del_const($db, 'THEME_TOPMENU_DISABLE_IMAGE', $conf->entity);
     else dolibarr_set_const($db, 'THEME_TOPMENU_DISABLE_IMAGE', GETPOST('THEME_TOPMENU_DISABLE_IMAGE'),'chaine',0,'',$conf->entity);
-    
+
 	$val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_BACKBODY'),array()))));
 	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_BACKBODY', $conf->entity);
 	else dolibarr_set_const($db, 'THEME_ELDY_BACKBODY', $val,'chaine',0,'',$conf->entity);
-	
+
     $val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_TOPMENU_BACK1'),array()))));
 	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_TOPMENU_BACK1', $conf->entity);
     else dolibarr_set_const($db, 'THEME_ELDY_TOPMENU_BACK1', $val,'chaine',0,'',$conf->entity);
@@ -109,25 +109,25 @@ if ($action == 'update')
     $val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_LINEIMPAIR1'),array()))));
     if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_LINEIMPAIR2', $conf->entity);
     else dolibarr_set_const($db, 'THEME_ELDY_LINEIMPAIR2', $val,'chaine',0,'',$conf->entity);
-    
+
     $val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_LINEPAIR1'),array()))));
     if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_LINEPAIR1', $conf->entity);
     else dolibarr_set_const($db, 'THEME_ELDY_LINEPAIR1', $val,'chaine',0,'',$conf->entity);
     $val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_LINEPAIR1'),array()))));
     if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_LINEPAIR2', $conf->entity);
     else dolibarr_set_const($db, 'THEME_ELDY_LINEPAIR2', $val,'chaine',0,'',$conf->entity);
-    
+
     $val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_TEXTTITLENOTAB'),array()))));
 	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_TEXTTITLENOTAB', $conf->entity);
     else dolibarr_set_const($db, 'THEME_ELDY_TEXTTITLENOTAB', $val,'chaine',0,'',$conf->entity);
-    
+
     if (GETPOST('THEME_ELDY_USE_HOVER') == '') dolibarr_set_const($db, "THEME_ELDY_USE_HOVER", '0', 'chaine', 0, '', $conf->entity);    // If empty, we set to '0' ('000000' is for black)
 	else dolibarr_set_const($db, "THEME_ELDY_USE_HOVER", $_POST["THEME_ELDY_USE_HOVER"], 'chaine', 0, '', $conf->entity);
 
 	$val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_TEXTLINK'),array()))));
 	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_TEXTLINK', $conf->entity);
     else dolibarr_set_const($db, 'THEME_ELDY_TEXTLINK', $val,'chaine',0,'',$conf->entity);
-	
+
     dolibarr_set_const($db, "MAIN_SIZE_LISTE_LIMIT",			$_POST["main_size_liste_limit"],'chaine',0,'',$conf->entity);
     dolibarr_set_const($db, "MAIN_SIZE_SHORTLIST_LIMIT",		$_POST["main_size_shortliste_limit"],'chaine',0,'',$conf->entity);
     dolibarr_set_const($db, "MAIN_DISABLE_JAVASCRIPT",			$_POST["main_disable_javascript"],'chaine',0,'',$conf->entity);
@@ -137,7 +137,7 @@ if ($action == 'update')
     dolibarr_set_const($db, "MAIN_DEFAULT_WORKING_HOURS",		$_POST["MAIN_DEFAULT_WORKING_HOURS"],'chaine',0,'',$conf->entity);
     dolibarr_set_const($db, "MAIN_SHOW_LOGO",					$_POST["MAIN_SHOW_LOGO"],'chaine',0,'',$conf->entity);
     dolibarr_set_const($db, "MAIN_FIRSTNAME_NAME_POSITION",		$_POST["MAIN_FIRSTNAME_NAME_POSITION"],'chaine',0,'',$conf->entity);
-    
+
 	dolibarr_set_const($db, "MAIN_HELPCENTER_DISABLELINK",		$_POST["MAIN_HELPCENTER_DISABLELINK"],'chaine',0,'',0);	// Param for all entities
 	dolibarr_set_const($db, "MAIN_MOTD",						dol_htmlcleanlastbr($_POST["main_motd"]),'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_HOME",						dol_htmlcleanlastbr($_POST["main_home"]),'chaine',0,'',$conf->entity);
@@ -150,7 +150,7 @@ if ($action == 'update')
 	    if (preg_match('/([^\\/:]+)$/i',$_FILES[$varforimage]["name"],$reg))
 	    {
 	        $original_file=$reg[1];
-	
+
 	        $isimage=image_format_supported($original_file);
 	        if ($isimage >= 0)
 	        {
@@ -185,9 +185,9 @@ if ($action == 'update')
 	        }
 	    }
 	}
-	
-	
-	
+
+
+
 	$_SESSION["mainmenu"]="";   // Le gestionnaire de menu a pu changer
 
 	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
@@ -222,7 +222,7 @@ if ($action == 'edit')	// Edit
     print '<input type="hidden" name="action" value="update">';
 
     clearstatcache();
-    
+
     print '<br>';
     print '<table summary="edit" class="noborder" width="100%">';
     print '<tr class="liste_titre"><td>'.$langs->trans("Language").'</td><td></td>';
@@ -264,7 +264,7 @@ if ($action == 'edit')	// Edit
     print '<tr><td>'.$langs->trans("DefaultMaxSizeShortList").'</td><td><input class="flat" name="main_size_shortliste_limit" size="4" value="' . $conf->global->MAIN_SIZE_SHORTLIST_LIMIT . '"></td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
-	
+
     // show input border
     /*
     print '<tr><td>'.$langs->trans("showInputBorder").'</td><td>';
@@ -273,7 +273,7 @@ if ($action == 'edit')	// Edit
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
     */
-	
+
 	// Disable javascript and ajax
     print '<tr><td>'.$langs->trans("DisableJavascript").'</td><td>';
     print $form->selectyesno('main_disable_javascript',isset($conf->global->MAIN_DISABLE_JAVASCRIPT)?$conf->global->MAIN_DISABLE_JAVASCRIPT:0,1);
@@ -323,17 +323,17 @@ if ($action == 'edit')	// Edit
 	print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
-	
+
 	// Hide version link
 	/*
-	
+
 	print '<tr><td class="titlefield">'.$langs->trans("HideVersionLink").'</td><td>';
 	print $form->selectyesno('MAIN_HIDE_VERSION',$conf->global->MAIN_HIDE_VERSION,1);
 	print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
     */
-	
+
 	// Show bugtrack link
 	print '<tr><td class="titlefield">'.$langs->trans("ShowBugTrackLink", $langs->transnoentitiesnoconv("FindBug")).'</td><td>';
 	print $form->selectyesno('MAIN_BUGTRACK_ENABLELINK',$conf->global->MAIN_BUGTRACK_ENABLELINK,1);
@@ -349,7 +349,19 @@ if ($action == 'edit')	// Edit
 	print '</tr>';
 
 	// Message of the day on home page
-    print '<tr><td class="titlefield">'.$langs->trans("MessageOfDay").'</td><td colspan="2">';
+    $substitutionarray=getCommonSubstitutionArray($langs, 0, array('object'));
+    complete_substitutions_array($substitutionarray, $langs);
+    $substitutionarray['__(AnyTranslationKey)__']=$langs->trans('TranslationKey');
+
+    print '<tr><td class="titlefield">';
+    $texthelp=$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
+    foreach($substitutionarray as $key => $val)
+    {
+        $texthelp.=$key.'<br>';
+    }
+    print $form->textwithpicto($langs->trans("MessageOfDay"), $texthelp, 1, 'help', '', 0, 2, '');
+
+    print '</td><td colspan="2">';
 
     $doleditor = new DolEditor('main_motd', (isset($conf->global->MAIN_MOTD)?$conf->global->MAIN_MOTD:''), '', 142, 'dolibarr_notes', 'In', false, true, true, ROWS_4, '90%');
 	$doleditor->Create();
@@ -359,26 +371,36 @@ if ($action == 'edit')	// Edit
 	print '</table>'."\n";
 
 	print '<br>';
-	
+
 	// Other
 	print '<table summary="edit" class="noborder" width="100%">';
 	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("LoginPage").'</td><td></td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
-	
+
 	// Message on login page
-	print '<tr><td>'.$langs->trans("MessageLogin").'</td><td colspan="2">';
+	$substitutionarray=getCommonSubstitutionArray($langs, 0, array('object','user'));
+    complete_substitutions_array($substitutionarray, $langs);
+    $substitutionarray['__(AnyTranslationKey)__']=$langs->trans('TranslationKey');
+    print '<tr><td>';
+	$texthelp=$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
+	foreach($substitutionarray as $key => $val)
+	{
+	    $texthelp.=$key.'<br>';
+	}
+	print $form->textwithpicto($langs->trans("MessageLogin"), $texthelp, 1, 'help', '', 0, 2, '');
+	print '</td><td colspan="2">';
 	$doleditor = new DolEditor('main_home', (isset($conf->global->MAIN_HOME)?$conf->global->MAIN_HOME:''), '', 142, 'dolibarr_notes', 'In', false, true, true, ROWS_4, '90%');
 	$doleditor->Create();
 	print '</td></tr>'."\n";
-	
+
 	// Hide helpcenter link on login page
 	print '<tr><td class="titlefield">'.$langs->trans("DisableLinkToHelpCenter").'</td><td>';
 	print $form->selectyesno('MAIN_HELPCENTER_DISABLELINK',isset($conf->global->MAIN_HELPCENTER_DISABLELINK)?$conf->global->MAIN_HELPCENTER_DISABLELINK:0,1);
 	print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
-	
+
 	// Background
 	print '<tr><td><label for="imagebackground">'.$langs->trans("BackgroundImageLogin").' (png,jpg)</label></td><td colspan="2">';
     print '<div class="centpercent inline-block">';
@@ -394,9 +416,9 @@ if ($action == 'edit')	// Edit
 	}
 	print '</div>';
 	print '</td></tr>';
-	
+
 	print '</table>'."\n";
-	
+
 
     print '<br><div class="center">';
     print '<input class="button" type="submit" name="submit" value="'.$langs->trans("Save").'">';
@@ -421,7 +443,7 @@ else	// Show
     if ($user->admin && $conf->global->MAIN_LANG_DEFAULT!='auto') print info_admin($langs->trans("SubmitTranslation".($conf->global->MAIN_LANG_DEFAULT=='en_US'?'ENUS':''),$conf->global->MAIN_LANG_DEFAULT),1);
 	print '</td>';
 	print "</tr>";
-    
+
     print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("EnableMultilangInterface").'</td><td>' . yn($conf->global->MAIN_MULTILANGS) . '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print "</tr>";
@@ -441,7 +463,7 @@ else	// Show
     print '<tr class="oddeven"><td>'.$langs->trans("DefaultMaxSizeList").'</td><td>' . $conf->global->MAIN_SIZE_LISTE_LIMIT . '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print "</tr>";
-	
+
     print '<tr class="oddeven"><td>'.$langs->trans("DefaultMaxSizeShortList").'</td><td>' . $conf->global->MAIN_SIZE_SHORTLIST_LIMIT . '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print "</tr>";
@@ -452,7 +474,7 @@ else	// Show
     print '<td width="20">&nbsp;</td>';
     print "</tr>";
 	*/
-	
+
     // Disable javascript/ajax
     print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DisableJavascript").'</td><td>';
     print yn($conf->global->MAIN_DISABLE_JAVASCRIPT)."</td>";
@@ -506,7 +528,7 @@ else	// Show
 	 print '<td width="20">&nbsp;</td>';
 	 print '</tr>';
 	 */
-	
+
     // Show bugtrack link
 	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("ShowBugTrackLink", $langs->transnoentitiesnoconv("FindBug")).'</td><td>';
 	print yn($conf->global->MAIN_BUGTRACK_ENABLELINK)."</td>";
@@ -527,7 +549,7 @@ else	// Show
     print '</table>'."\n";
 
     print '<br>';
-    
+
     // Login page
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre"><td>'.$langs->trans("LoginPage").'</td><td></td><td>&nbsp;</td></tr>';
@@ -537,7 +559,7 @@ else	// Show
     if (isset($conf->global->MAIN_HOME)) print dol_htmlcleanlastbr($conf->global->MAIN_HOME);
     else print '&nbsp;';
     print '</td></tr>'."\n";
-    
+
 	// Link to help center
     print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DisableLinkToHelpCenter").'</td><td colspan="2">';
     print yn((isset($conf->global->MAIN_HELPCENTER_DISABLELINK)?$conf->global->MAIN_HELPCENTER_DISABLELINK:0),1);
@@ -557,9 +579,9 @@ else	// Show
     }
     print '</div>';
     print '</td></tr>';
-    
+
     print '</table>'."\n";
-    
+
     print '<div class="tabsAction tabsActionNoBottom">';
     print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
     print '</div>';
diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
index 74081266f43..cf97b397e44 100644
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -259,7 +259,7 @@ foreach ($dirmodels as $reldir)
 						if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
 						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
-                        
+
                         print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
                         print $module->info();
                         print '</td>';
@@ -386,7 +386,7 @@ foreach ($dirmodels as $reldir)
                 {
                 	if (file_exists($dir.'/'.$file))
                 	{
-                		
+
 
 		    			$name = substr($file, 4, dol_strlen($file) -16);
 		    			$classname = substr($file, 0, dol_strlen($file) -12);
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index caea3bef9f7..3711b346585 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -59,8 +59,8 @@ $acts[1] = "disable";
 $actl[0] = img_picto($langs->trans("Disabled"),'switch_off');
 $actl[1] = img_picto($langs->trans("Activated"),'switch_on');
 
-$listoffset=GETPOST('listoffset');
-$listlimit=GETPOST('listlimit')>0?GETPOST('listlimit'):1000;
+$listoffset=GETPOST('listoffset','alpha');
+$listlimit=GETPOST('listlimit','alpha')>0?GETPOST('listlimit','alpha'):1000;
 $active = 1;
 
 $sortfield = GETPOST("sortfield",'alpha');
@@ -119,14 +119,14 @@ $formmail=new FormMail($db);
 if (empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES))
 {
     $tmp=FormMail::getAvailableSubstitKey('formemail');
-    $tmp['__(AnyTransKey)__']='__(AnyTransKey)__';
+    $tmp['__(AnyTranslationKey)__']='__(AnyTranslationKey)__';
     $helpsubstit = $langs->trans("AvailableVariables").':<br>'.implode('<br>', $tmp);
     $helpsubstitforlines = $langs->trans("AvailableVariables").':<br>'.implode('<br>', $tmp);
 }
 else
 {
     $tmp=FormMail::getAvailableSubstitKey('formemailwithlines');
-    $tmp['__(AnyTransKey)__']='__(AnyTransKey)__';
+    $tmp['__(AnyTranslationKey)__']='__(AnyTranslationKey)__';
     $helpsubstit = $langs->trans("AvailableVariables").':<br>'.implode('<br>', $tmp);
     $tmp=FormMail::getAvailableSubstitKey('formemailforlines');
     $helpsubstitforlines = $langs->trans("AvailableVariables").':<br>'.implode('<br>', $tmp);
@@ -175,7 +175,7 @@ $id = 25;
 
 if (GETPOST('button_removefilter') || GETPOST('button_removefilter.x') || GETPOST('button_removefilter_x'))
 {
-    //$search_country_id = '';    
+    //$search_country_id = '';
 }
 
 // Actions add or modify an entry into a dictionary
@@ -479,12 +479,12 @@ if ($action != 'edit')
         if ($fieldlist[$field]=='type_template')   { $valuetoshow=$langs->trans("TypeOfTemplate"); }
     	if ($fieldlist[$field]=='content')         { $valuetoshow=''; }
     	if ($fieldlist[$field]=='content_lines')   { $valuetoshow=''; }
-    		
+
         if ($valuetoshow != '')
         {
             print '<td align="'.$align.'">';
         	if (! empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i',$tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1,$valuetoshow).'</a>';
-        	else if (! empty($tabhelp[$id][$value])) 
+        	else if (! empty($tabhelp[$id][$value]))
         	{
         	    if (in_array($value, array('topic'))) print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, $value);   // Tooltip on click
         	    else print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2);                             // Tooltip on hover
@@ -494,15 +494,15 @@ if ($action != 'edit')
          }
          if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') $alabelisused=1;
     }
-    
+
     print '<td colspan="3">';
     print '<input type="hidden" name="id" value="'.$id.'">';
     print '</td>';
     print '</tr>';
-    
+
     // Line to enter new values
     print "<tr ".$bcnd[$var].">";
-    
+
     $obj = new stdClass();
     // If data was already input, we define them in obj to populate input fields.
     if (GETPOST('actionadd'))
@@ -513,12 +513,12 @@ if ($action != 'edit')
             	$obj->$val=GETPOST($val);
         }
     }
-    
+
     $tmpaction = 'create';
     $parameters=array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
     $reshook=$hookmanager->executeHooks('createDictionaryFieldlist',$parameters, $obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
     $error=$hookmanager->error; $errors=$hookmanager->errors;
-    
+
     if (empty($reshook))
     {
     	if ($tabname[$id] == MAIN_DB_PREFIX.'c_email_templates' && $action == 'edit')
@@ -530,11 +530,11 @@ if ($action != 'edit')
     		fieldList($fieldlist,$obj,$tabname[$id],'add');
     	}
     }
-    
+
     print '<td align="right" colspan="3">';
     print '</td>';
     print "</tr>";
-    
+
     $fieldsforcontent = array('content');
     if (! empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES))
     {
@@ -545,7 +545,7 @@ if ($action != 'edit')
         print '<tr class="impair nodrag nodrop nohover"><td colspan="5">';
         if ($tmpfieldlist == 'content') print '<strong>'.$form->textwithpicto($langs->trans("Content"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'</strong><br>';
         if ($tmpfieldlist == 'content_lines') print '<strong>'.$form->textwithpicto($langs->trans("ContentForLines"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'</strong><br>';
-    
+
         if ($context != 'hide')
         {
             //print '<textarea cols="3" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'</textarea>';
@@ -556,7 +556,7 @@ if ($action != 'edit')
         }
         else print '&nbsp;';
         print '</td>';
-        if ($tmpfieldlist == 'content') 
+        if ($tmpfieldlist == 'content')
         {
             print '<td align="center" colspan="3" rowspan="'.(count($fieldsforcontent)).'">';
             if ($action != 'edit')
@@ -568,12 +568,12 @@ if ($action != 'edit')
         //else print '<td></td>';
         print '</tr>';
     }
-    
-    
-    
+
+
+
     $colspan=count($fieldlist)+1;
     print '<tr><td colspan="'.$colspan.'">&nbsp;</td></tr>';	// Keep &nbsp; to have a line with enough height
-}    
+}
 
 
 // List of available record in database
@@ -590,7 +590,7 @@ if ($resql)
     if ($sortorder) $paramwithsearch.= '&sortorder='.$sortorder;
     if ($sortfield) $paramwithsearch.= '&sortfield='.$sortfield;
     if (GETPOST('from')) $paramwithsearch.= '&from='.GETPOST('from','alpha');
-    
+
     // There is several pages
     if ($num > $listlimit)
     {
@@ -628,7 +628,7 @@ if ($resql)
         // Affiche nom du champ
         if ($showfield)
         {
-            if (! empty($tabhelp[$id][$value])) 
+            if (! empty($tabhelp[$id][$value]))
             {
                 if (in_array($value, array('topic'))) $valuetoshow = $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2);   // Tooltip on hover
                 else $valuetoshow = $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2);                             // Tooltip on hover
@@ -653,7 +653,7 @@ if ($resql)
     print '<td class="liste_titre"></td>';
     print '<td class="liste_titre"></td>';
     print '</tr>';
-        
+
     if ($num)
     {
         // Lines with values
@@ -680,7 +680,7 @@ if ($resql)
                 print '<div name="'.(! empty($obj->rowid)?$obj->rowid:$obj->code).'"></div>';
                 print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
                 print '</td>';
-                
+
                 $fieldsforcontent = array('content');
                 if (! empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES))
                 {
@@ -691,11 +691,11 @@ if ($resql)
                     $showfield = 1;
                     $align = "left";
                     $valuetoshow = $obj->{$tmpfieldlist};
-                
+
                     $class = 'tddict';
                     // Show value for field
                     if ($showfield) {
-                
+
                         print '</tr><tr class="oddeven" nohover tr-'.$tmpfieldlist.'-'.$rowid.' "><td colspan="5">'; // To create an artificial CR for the current tr we are on
                         $okforextended = true;
                         if (empty($conf->global->FCKEDITOR_ENABLE_MAIL))
@@ -704,9 +704,9 @@ if ($resql)
                             print $doleditor->Create(1);
                             print '</td>';
                             print '<td></td><td></td><td></td>';
-                
+
                     }
-                }                
+                }
             }
             else
             {
@@ -778,16 +778,16 @@ if ($resql)
                 {
                     $fieldsforcontent = array('content', 'content_lines');
                 }
-                foreach ($fieldsforcontent as $tmpfieldlist) 
+                foreach ($fieldsforcontent as $tmpfieldlist)
                 {
                     $showfield = 1;
                     $align = "left";
                     $valuetoshow = $obj->{$tmpfieldlist};
-                    
+
                     $class = 'tddict';
                     // Show value for field
                     if ($showfield) {
-                        
+
                         print '</tr><tr class="oddeven" nohover tr-'.$tmpfieldlist.'-'.$i.' "><td colspan="5">'; // To create an artificial CR for the current tr we are on
                         $okforextended = true;
                         if (empty($conf->global->FCKEDITOR_ENABLE_MAIL))
@@ -796,13 +796,13 @@ if ($resql)
                         print $doleditor->Create(1);
                         print '</td>';
                         print '<td></td><td></td><td></td>';
-                        
+
                     }
                 }*/
             }
             print "</tr>\n";
-            
-            
+
+
             $i++;
         }
     }
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index 7c8413a28a6..e0dc1d3b5b4 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -310,7 +310,7 @@ foreach ($dirmodels as $reldir)
 
 					if ($module->isEnabled())
 					{
-						
+
 						print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
 						print $module->info();
 						print '</td>';
@@ -614,7 +614,7 @@ print '</form>';
 /* Seems to be not so used. So kept hidden for the moment to avoid dangerous options inflation.
 if ($conf->banque->enabled)
 {
-    
+
     print '<tr class="oddeven"><td>';
     print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL").'</td><td>&nbsp</td><td align="right">';
     if (! empty($conf->use_javascript_ajax))
@@ -636,7 +636,7 @@ if ($conf->banque->enabled)
 }
 else
 {
-    
+
     print '<tr class="oddeven"><td>';
     print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL").'</td><td>&nbsp;</td><td align="center">'.$langs->trans('NotAvailable').'</td></tr>';
 }
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index d408657ac8c..549bb93809b 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -251,7 +251,7 @@ foreach ($dirmodels as $reldir)
                         if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
                         if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
-                        
+
                         print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
                         print $module->info();
                         print '</td>';
@@ -370,7 +370,7 @@ foreach ($dirmodels as $reldir)
         {
             while (($file = readdir($handle))!==false)
             {
-                if (preg_match('/\.modules\.php$/i',$file) && preg_match('/^(pdf_|doc_)/',$file))            	
+                if (preg_match('/\.modules\.php$/i',$file) && preg_match('/^(pdf_|doc_)/',$file))
                 {
                     $name = substr($file, 4, dol_strlen($file) -16);
                     $classname = substr($file, 0, dol_strlen($file) -12);
@@ -378,7 +378,7 @@ foreach ($dirmodels as $reldir)
 	                require_once $dir.'/'.$file;
 	                $module = new $classname($db, new FactureFournisseur($db));
 
-                    
+
                     print "<tr class=\"oddeven\">\n";
                     print "<td>";
 	                print (empty($module->name)?$name:$module->name);
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index acce3a38c7c..55e4e4b3d07 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -280,7 +280,7 @@ foreach ($dirmodels as $reldir)
                         if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
                         if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
-                        
+
                         print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
                         print $module->info();
                         print '</td>';
@@ -402,7 +402,7 @@ foreach ($dirmodels as $reldir)
 	                require_once $dir.'/'.$file;
 	                $module = new $classname($db, new CommandeFournisseur($db));
 
-                    
+
                     print "<tr class=\"oddeven\">\n";
                     print "<td>";
 	                print (empty($module->name)?$name:$module->name);
@@ -502,14 +502,14 @@ $var=false;
 	print '</td><td align="right">';
 	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 	print "</td></tr>\n";
-	
+
 //}
 
 // Ask for payment bank during supplier order
 /* Kept as hidden for the moment
 if ($conf->banque->enabled)
 {
-    
+
     print '<tr class="oddeven"><td>';
     print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER").'</td><td>&nbsp</td><td align="center">';
     if (! empty($conf->use_javascript_ajax))
@@ -531,7 +531,7 @@ if ($conf->banque->enabled)
 }
 else
 {
-    
+
     print '<tr class="oddeven"><td>';
     print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER").'</td><td>&nbsp;</td><td align="center">'.$langs->trans('NotAvailable').'</td></tr>';
 }
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index 8a8d2a181a4..82eeddd594c 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -289,7 +289,7 @@ foreach ($dirmodels as $reldir)
 
 					if ($module->isEnabled())
 					{
-						
+
 						print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
 						print $module->info();
 						print '</td>';
@@ -567,7 +567,7 @@ print '</form>';
 
 if ($conf->banque->enabled)
 {
-    
+
     print '<tr class="oddeven"><td>';
     print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL").'</td><td>&nbsp</td><td align="right">';
     if (! empty($conf->use_javascript_ajax))
@@ -589,7 +589,7 @@ if ($conf->banque->enabled)
 }
 else
 {
-    
+
     print '<tr class="oddeven"><td>';
     print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL").'</td><td>&nbsp;</td><td align="center">'.$langs->trans('NotAvailable').'</td></tr>';
 }
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 3641ac87cef..a8d6d64c45c 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -155,7 +155,7 @@ class FormMail extends Form
         $listofpaths=array();
         $listofnames=array();
         $listofmimes=array();
-        
+
         $keytoavoidconflict = empty($this->trackid)?'':'-'.$this->trackid;   // this->trackid must be defined
         if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
         if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
@@ -182,7 +182,7 @@ class FormMail extends Form
         $listofpaths=array();
         $listofnames=array();
         $listofmimes=array();
-        
+
         $keytoavoidconflict = empty($this->trackid)?'':'-'.$this->trackid;   // this->trackid must be defined
         if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
         if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
@@ -209,7 +209,7 @@ class FormMail extends Form
         $listofpaths=array();
         $listofnames=array();
         $listofmimes=array();
-        
+
         $keytoavoidconflict = empty($this->trackid)?'':'-'.$this->trackid;   // this->trackid must be defined
         if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
         if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
@@ -266,13 +266,13 @@ class FormMail extends Form
         	$out='';
 
         	$disablebademails=1;
-        	
+
         	// Define list of attached files
         	$listofpaths=array();
         	$listofnames=array();
         	$listofmimes=array();
             $keytoavoidconflict = empty($this->trackid)?'':'-'.$this->trackid;   // this->trackid must be defined
-            
+
         	if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
         	if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
         	if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
@@ -415,7 +415,7 @@ class FormMail extends Form
                             {
                                 $posalias++;
                                 $listaliasval=trim($listaliasval);
-                                if ($listaliasval) 
+                                if ($listaliasval)
                                 {
                                     $listaliasval=preg_replace('/</', '&lt;', $listaliasval);
                                     $listaliasval=preg_replace('/>/', '&gt;', $listaliasval);
@@ -720,7 +720,7 @@ class FormMail extends Form
         				$this->substit['__PERSONALIZED__']=str_replace('\n',"\n",$langs->transnoentitiesnoconv("PredefinedMailContentLink",$url));
         			}
         		}
-                
+
                 //Add lines substitution key from each line
                 $lines = '';
                 $defaultlines = $arraydefaultmessage['content_lines'];
@@ -979,14 +979,14 @@ class FormMail extends Form
 			return -1;
 		}
 	}
-	
-	
-	
+
+
+
 	/**
 	 * Set substit array from object
-	 * 
+	 *
 	 * @param	CommonObject	   $object		  Object to use
-	 * @param   Translate  $outputlangs   Object lang 
+	 * @param   Translate  $outputlangs   Object lang
 	 * @return	void
 	 */
 	function setSubstitFromObject($object, $outputlangs=null)
@@ -1001,14 +1001,14 @@ class FormMail extends Form
 		$this->substit['__AMOUNT__'] = price($object->total_ttc);
 		$this->substit['__AMOUNT_WO_TAX__'] = price($object->total_ht);
 		$this->substit['__AMOUNT_VAT__'] = price($object->total_tva);
-		
+
 		$this->substit['__THIRDPARTY_ID__'] = (is_object($object->thirdparty)?$object->thirdparty->id:'');
 		$this->substit['__THIRDPARTY_NAME__'] = (is_object($object->thirdparty)?$object->thirdparty->name:'');
-		
+
 		$this->substit['__PROJECT_ID__'] = (is_object($object->projet)?$object->projet->id:'');
 		$this->substit['__PROJECT_REF__'] = (is_object($object->projet)?$object->projet->ref:'');
 		$this->substit['__PROJECT_NAME__'] = (is_object($object->projet)?$object->projet->title:'');
-		
+
 		$this->substit['__SIGNATURE__'] = $user->signature;
 		$this->substit['__PERSONALIZED__'] = '';
 		$this->substit['__CONTACTCIVNAME__'] = '';	// Will be replace just before sending
@@ -1020,7 +1020,7 @@ class FormMail extends Form
         foreach ($extrafields->attribute_label as $key => $label) {
             $this->substit['__EXTRAFIELD_' . strtoupper($key) . '__'] = $object->array_options['options_' . $key];
         }
-		
+
         //Fill substit_lines with each object lines content
         if (is_array($object->lines))
         {
@@ -1057,36 +1057,37 @@ class FormMail extends Form
             }
         }
 	}
-	
+
 	/**
-	 * Get list of substition keys available.
-	 * 
+	 * Get list of substition keys available for emails.
+	 * This include the complete_substitutions_array. TODO Include the getCommonSubstitutionArray().
+	 *
 	 * @param	string	$mode		'formemail', 'formemailwithlines', 'formemailforlines', 'emailing', ...
-	 * @return	void
+	 * @return	array               Array of substitution values for emails.
 	 */
 	static function getAvailableSubstitKey($mode='formemail')
 	{
 		global $conf, $langs;
-		
+
 		$vars=array();
-		
+
 		if ($mode == 'formemail' || $mode == 'formemailwithlines' || $mode == 'formemailforlines')
 		{
 			$vars=array(
-				'__REF__', 
-				'__REFCLIENT__', 
-				'__REFSUPPLIER__', 
-			    '__THIRDPARTY_ID__', 
-			    '__THIRDPARTY_NAME__', 
-			    '__PROJECT_ID__', 
-			    '__PROJECT_REF__', 
+				'__REF__',
+				'__REFCLIENT__',
+				'__REFSUPPLIER__',
+			    '__THIRDPARTY_ID__',
+			    '__THIRDPARTY_NAME__',
+			    '__PROJECT_ID__',
+			    '__PROJECT_REF__',
 			    '__PROJECT_NAME__',
 				'__CONTACTCIVNAME__',
-				'__AMOUNT__', 
-				'__AMOUNT_WO_TAX__', 
-				'__AMOUNT_VAT__', 
+				'__AMOUNT__',
+				'__AMOUNT_WO_TAX__',
+				'__AMOUNT_VAT__',
 			    '__PERSONALIZED__',			// Paypal link will be added here in form mode
-				'__SIGNATURE__', 
+				'__SIGNATURE__',
 			);
 			if ($mode == 'formwithlines')
 			{
@@ -1127,21 +1128,21 @@ class FormMail extends Form
 					if ($conf->contrat->enabled) $vars['__SECUREKEYPAYPAL_CONTRACTLINE__']='SecureKeyPaypalUniquePerContractLine';
 				}
 			}
-			else 
+			else
 			{
 				$vars['__SECUREKEYPAYPAL__']='';
 				$vars['__SECUREKEYPAYPAL_MEMBER__']='';
 			}
 		}
-		
-		$tmparray=array();
+
 		$parameters=array('mode'=>$mode);
+		$tmparray=getCommonSubstitutionArray($langs);
 		complete_substitutions_array($tmparray, $langs, null, $parameters);
 		foreach($tmparray as $key => $val)
 		{
 		    $vars[$key]=$key;
 		}
-		
+
 		return $vars;
 	}
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index bd2944fa2f4..a18b9e14110 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5014,8 +5014,100 @@ function dol_concatdesc($text1,$text2,$forxml=false)
 	return $ret;
 }
 
+
 /**
- *  Make substition into a string replacing key with vals from $substitutionarray (oldval=>newval)
+ * Return array of possible common substitutions.
+ *
+ * @param	Translate	$outputlangs	Output language
+ * @param   int         $onlykey        Do not calculate heavy values of keys (performance enhancement when we need only the keys)
+ * @param   array       $exclude        Array of family keys we want to exclude. For example array('mycompany', 'object', 'date', 'user', ...)
+ * @param   Object      $object         Object for keys on object
+ * @return	array						Array of substitutions
+ */
+function getCommonSubstitutionArray($outputlangs, $onlykey=0, $exclude=null, $object=null)
+{
+    global $conf, $mysoc, $user;
+
+    $substitutionarray=array();
+
+    if (empty($exclude) || ! in_array('mycompany', $exclude))
+    {
+        $substitutionarray=array_merge($substitutionarray, array(
+            '__MYCOMPANY_NAME__' => $mysoc->name,
+            '__MYCOMPANY_EMAIL__' => $mysoc->email,
+            '__MYCOMPANY_PROFID1__' => $mysoc->idprof1,
+            '__MYCOMPANY_PROFID2__' => $mysoc->idprof2,
+            '__MYCOMPANY_PROFID3__' => $mysoc->idprof3,
+            '__MYCOMPANY_PROFID4__' => $mysoc->idprof4,
+            '__MYCOMPANY_PROFID5__' => $mysoc->idprof5,
+            '__MYCOMPANY_PROFID6__' => $mysoc->idprof6,
+            '__MYCOMPANY_CAPITAL__' => $mysoc->capital,
+            '__MYCOMPANY_COUNTRY_ID__' => $mysoc->country_id
+        ));
+    }
+    if (empty($exclude) || ! in_array('object', $exclude))
+    {
+        if (is_object($object))       // For backward compatibility
+        {
+            $substitutionarray['__TOTAL_TTC__']    =is_object($object)?$object->total_ttc:'';
+            $substitutionarray['__TOTAL_HT__']     =is_object($object)?$object->total_ht:'';
+            $substitutionarray['__TOTAL_VAT__']    =is_object($object)?($object->total_vat?$object->total_vat:$object->total_tva):'';
+        }
+        $substitutionarray['__AMOUNT__']       =is_object($object)?$object->total_ttc:'';
+        $substitutionarray['__AMOUNT_WO_TAX__']=is_object($object)?$object->total_ht:'';
+        $substitutionarray['__AMOUNT_VAT__']   =is_object($object)?($object->total_vat?$object->total_vat:$object->total_tva):'';
+    }
+
+    if (empty($exclude) || ! in_array('date', $exclude))
+    {
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+
+        if (! empty($onlykey))
+        {
+            $tmp=$tmp2=$tmp3=$tmp4=$tmp5=array();
+        }
+        else
+        {
+            $tmp=dol_getdate(dol_now(), true);
+            $tmp2=dol_get_prev_day($tmp['mday'], $tmp['mon'], $tmp['year']);
+            $tmp3=dol_get_prev_month($tmp['mday'], $tmp['mon'], $tmp['year']);
+            $tmp4=dol_get_next_day($tmp['mday'], $tmp['mon'], $tmp['year']);
+            $tmp5=dol_get_next_month($tmp['mday'], $tmp['mon'], $tmp['year']);
+        }
+        $substitutionarray=array_merge($substitutionarray, array(
+            '__DAY__' => $tmp['mday'],
+            '__MONTH__' => $tmp['mon'],
+            '__YEAR__' => $tmp['year'],
+            '__PREVIOUS_DAY__' => $tmp2['day'],
+            '__PREVIOUS_MONTH__' => $tmp3['month'],
+            '__PREVIOUS_YEAR__' => ($tmp['year'] - 1),
+            '__NEXT_DAY__' => $tmp4['day'],
+            '__NEXT_MONTH__' => $tmp5['month'],
+            '__NEXT_YEAR__' => ($tmp['year'] + 1),
+        ));
+    }
+
+    if (empty($exclude) || ! in_array('user', $exclude))
+    {
+        $substitutionarray=array_merge($substitutionarray, array(
+            '__USER_ID__' => $user->id,
+            '__USER_LOGIN__' => $user->login,
+            '__USER_LASTNAME__' => $user->lastname,
+            '__USER_FIRSTNAME__' => $user->firstname,
+            '__USER_FULLNAME__' => $user->getFullName($outputlangs),
+            '__USER_SUPERVISOR_ID__' => $user->fk_user
+        ));
+    }
+    if (! empty($conf->multicompany->enabled))
+    {
+        $substitutionarray=array_merge($substitutionarray, array('__ENTITY_ID__' => $conf->entity));
+    }
+
+    return $substitutionarray;
+}
+
+/**
+ *  Make substition into a text string, replacing keys with vals from $substitutionarray (oldval=>newval).
  *
  *  @param	string		$text	      			Source string in which we must do substitution
  *  @param  array		$substitutionarray		Array with key->val to substitute
@@ -5034,11 +5126,16 @@ function make_substitutions($text, $substitutionarray, $outputlangs=null)
 	// Make substitution for language keys
 	if (is_object($outputlangs))
 	{
-		while (preg_match('/__\((.*)\)__/', $text, $reg))
+		while (preg_match('/__\(([^\)]*)\)__/', $text, $reg))
 		{
+		    // If key is __(TranslationKey|langfile)__, then force load of langfile.lang
+			$tmp=explode('|',$reg[1]);
+			if (! empty($tmp[1])) $outputlangs->load($tmp[1]);
+
 			$msgishtml = 0;
 			if (dol_textishtml($text,1)) $msgishtml = 1;
-			$text = preg_replace('/__\('.preg_quote($reg[1]).'\)__/', $msgishtml?dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])):$outputlangs->transnoentitiesnoconv($reg[1]), $text);
+
+			$text = preg_replace('/__\('.preg_quote($reg[1], '/').'\)__/', $msgishtml?dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])):$outputlangs->transnoentitiesnoconv($reg[1]), $text);
 		}
 	}
 
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index e83faee6c8d..8c48e2301e3 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -588,38 +588,25 @@ function pdf_pagehead(&$pdf,$outputlangs,$page_height)
 
 
 /**
- *   	Return array of possible substitutions
+ *   	Return array of possible substitutions for PDF content (without external module substitutions).
  *
  *		@param	Translate	$outputlangs	Output language
+ *      @param  Object      $object         Object
  *      @return	array						Array of substitutions
  */
-function pdf_getSubstitutionArray($outputlangs)
+function pdf_getSubstitutionArray($outputlangs, $object=null)
 {
-	global $conf, $mysoc, $user;
-	$substitutionarray=array(
-		'__MYCOMPANY_NAME__' => $mysoc->name,
-		'__MYCOMPANY_EMAIL__' => $mysoc->email,
-		'__MYCOMPANY_PROFID1__' => $mysoc->idprof1,
-		'__MYCOMPANY_PROFID2__' => $mysoc->idprof2,
-		'__MYCOMPANY_PROFID3__' => $mysoc->idprof3,
-		'__MYCOMPANY_PROFID4__' => $mysoc->idprof4,
-		'__MYCOMPANY_PROFID5__' => $mysoc->idprof5,
-		'__MYCOMPANY_PROFID6__' => $mysoc->idprof6,
-		'__MYCOMPANY_CAPITAL__' => $mysoc->capital,
-	    '__USER_ID__' => $user->id,
-		'__USER_LOGIN__' => $user->login,
-		'__USER_LASTNAME__' => $user->lastname,
-		'__USER_FIRSTNAME__' => $user->firstname,
-		'__USER_FULLNAME__' => $user->getFullName($outputlangs)
-	);
-	return $substitutionarray;
+    $substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+    $substitutionarray['__FROM_NAME__']='__FROM_NAME__';
+    $substitutionarray['__FROM_EMAIL__']='__FROM_EMAIL__';
+    return $substitutionarray;
 }
 
 
 /**
  *      Add a draft watermark on PDF files
  *
- *      @param	TCPDF      	$pdf           Object PDF
+ *      @param	TCPDF      	$pdf            Object PDF
  *      @param  Translate	$outputlangs	Object lang
  *      @param  int		    $h		        Height of PDF
  *      @param  int		    $w		        Width of PDF
@@ -630,7 +617,7 @@ function pdf_getSubstitutionArray($outputlangs)
 function pdf_watermark(&$pdf, $outputlangs, $h, $w, $unit, $text)
 {
 	global $langs, $mysoc, $user;
-	
+
 	// Print Draft Watermark
 	if ($unit=='pt') $k=1;
 	elseif ($unit=='mm') $k=72/25.4;
@@ -638,11 +625,11 @@ function pdf_watermark(&$pdf, $outputlangs, $h, $w, $unit, $text)
 	elseif ($unit=='in') $k=72;
 
 	// Make substitution
-	$substitutionarray=pdf_getSubstitutionArray($outputlangs);
-	complete_substitutions_array($substitutionarray,$outputlangs,$object);
+	$substitutionarray=pdf_getSubstitutionArray($outputlangs,null);
+	complete_substitutions_array($substitutionarray,$outputlangs,null);
 	$text=make_substitutions($text,$substitutionarray,$outputlangs);
 	$text=$outputlangs->convToOutputCharset($text);
-	
+
 	$savx=$pdf->getX(); $savy=$pdf->getY();
 
 	$watermark_angle=atan($h/$w)/2;
@@ -867,13 +854,10 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
 	// Line of free text
 	if (empty($hidefreetext) && ! empty($conf->global->$paramfreetext))
 	{
-		$substitutionarray=pdf_getSubstitutionArray($outputlangs);
+		$substitutionarray=pdf_getSubstitutionArray($outputlangs, $object);
 		// More substitution keys
 		$substitutionarray['__FROM_NAME__']=$fromcompany->name;
 		$substitutionarray['__FROM_EMAIL__']=$fromcompany->email;
-		$substitutionarray['__TOTAL_TTC__']=$object->total_ttc;
-		$substitutionarray['__TOTAL_HT__']=$object->total_ht;
-		$substitutionarray['__TOTAL_VAT__']=$object->total_vat;
 		complete_substitutions_array($substitutionarray,$outputlangs,$object);
 		$newfreetext=make_substitutions($conf->global->$paramfreetext,$substitutionarray,$outputlangs);
 		$line.=$outputlangs->convToOutputCharset($newfreetext);
@@ -1289,16 +1273,16 @@ function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issuppl
 
 			if (empty($hideref))
 			{
-				if ($issupplierline) 
+				if ($issupplierline)
 				{
 					if ($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES == 1)
 						$ref_prodserv = $ref_supplier;
 					elseif ($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES == 2)
-						$ref_prodserv = $ref_supplier. ' ('.$outputlangs->transnoentitiesnoconv("InternalRef").' '.$prodser->ref.')';  
-					else 
+						$ref_prodserv = $ref_supplier. ' ('.$outputlangs->transnoentitiesnoconv("InternalRef").' '.$prodser->ref.')';
+					else
 						$ref_prodserv = $prodser->ref.' ('.$outputlangs->transnoentitiesnoconv("SupplierRef").' '.$ref_supplier.')';
 				}
-				else 
+				else
 					$ref_prodserv = $prodser->ref; // Show local ref only
 
 				if (! empty($libelleproduitservice)) $ref_prodserv .= " - ";
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index 3f41e74b7f6..d20b9612b5f 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -265,15 +265,11 @@ function dol_loginfunction($langs,$conf,$mysoc)
 	$main_home='';
 	if (! empty($conf->global->MAIN_HOME))
 	{
-		$i=0;
-		while (preg_match('/__\(([a-zA-Z|@]+)\)__/i',$conf->global->MAIN_HOME,$reg) && $i < 100)
-		{
-			$tmp=explode('|',$reg[1]);
-			if (! empty($tmp[1])) $langs->load($tmp[1]);
-			$conf->global->MAIN_HOME=preg_replace('/__\('.preg_quote($reg[1]).'\)__/i',$langs->trans($tmp[0]),$conf->global->MAIN_HOME);
-			$i++;
-		}
-		$main_home=dol_htmlcleanlastbr($conf->global->MAIN_HOME);
+	    $substitutionarray=getCommonSubstitutionArray($langs);
+	    complete_substitutions_array($substitutionarray, $langs);
+	    $texttoshow = make_substitutions($conf->global->MAIN_HOME, $substitutionarray, $langs);
+
+		$main_home=dol_htmlcleanlastbr($texttoshow);
 	}
 
 	// Google AD
@@ -415,7 +411,7 @@ function encodedecode_dbpassconf($level=0)
 			fflush($fp);
 			fclose($fp);
 			clearstatcache();
-			
+
 			// It's config file, so we set read permission for creator only.
 			// Should set permission to web user and groups for users used by batch
 			//@chmod($file, octdec('0600'));
diff --git a/htdocs/index.php b/htdocs/index.php
index d2da24471d8..5303587150e 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -77,7 +77,7 @@ if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $title=$langs->trans("HomeAr
 
 llxHeader('',$title);
 
-    
+
 $resultboxes=FormOther::getBoxesArea($user,"0");    // Load $resultboxes (selectboxlist + boxactivated + boxlista + boxlistb)
 
 
@@ -88,18 +88,13 @@ if (! empty($conf->global->MAIN_MOTD))
     $conf->global->MAIN_MOTD=preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i','<br>',$conf->global->MAIN_MOTD);
     if (! empty($conf->global->MAIN_MOTD))
     {
-    	$i=0;
-    	while (preg_match('/__\(([a-zA-Z|@]+)\)__/i',$conf->global->MAIN_MOTD,$reg) && $i < 100)
-    	{
-    		$tmp=explode('|',$reg[1]);
-    		if (! empty($tmp[1])) $langs->load($tmp[1]);
-    		$conf->global->MAIN_MOTD=preg_replace('/__\('.preg_quote($reg[1]).'\)__/i',$langs->trans($tmp[0]),$conf->global->MAIN_MOTD);
-    		$i++;
-    	}
+        $substitutionarray=getCommonSubstitutionArray($langs);
+        complete_substitutions_array($substitutionarray, $langs);
+        $texttoshow = make_substitutions($conf->global->MAIN_MOTD, $substitutionarray, $langs);
 
         print "\n<!-- Start of welcome text -->\n";
         print '<table width="100%" class="notopnoleftnoright"><tr><td>';
-        print dol_htmlentitiesbr($conf->global->MAIN_MOTD);
+        print dol_htmlentitiesbr($texttoshow);
         print '</td></tr></table><br>';
         print "\n<!-- End of welcome text -->\n";
     }
@@ -136,7 +131,7 @@ if (empty($user->societe_id))
     $action='';
     $reshook=$hookmanager->executeHooks('addStatisticLine',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
     $boxstat.=$hookmanager->resPrint;
-    
+
     if (empty($reshook))
     {
 	    // Condition to be checked for each display line dashboard
@@ -179,7 +174,7 @@ if (empty($user->societe_id))
     	    DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php",
     	    DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php",
     	    DOL_DOCUMENT_ROOT."/supplier_proposal/class/supplier_proposal.class.php",
-            DOL_DOCUMENT_ROOT."/projet/class/project.class.php", 
+            DOL_DOCUMENT_ROOT."/projet/class/project.class.php",
 	        DOL_DOCUMENT_ROOT."/expensereport/class/expensereport.class.php",
 			DOL_DOCUMENT_ROOT."/don/class/don.class.php"
 	    );
@@ -327,12 +322,12 @@ if (empty($user->societe_id))
 	                $board->load_state_board($user);
 	                $boardloaded[$classe]=$board;
 	            }
-	            else 
+	            else
 	            {
 	                $board=$boardloaded[$classe];
 	            }
 
-	            
+
 	            if (!empty($langfile[$key])) $langs->load($langfile[$key]);
 	            $text=$langs->trans($titres[$key]);
 	            $boxstat.='<a href="'.$links[$key].'" class="boxstatsindicator thumbstat nobold nounderline">';
@@ -353,7 +348,7 @@ if (empty($user->societe_id))
     $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
     $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
     $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
-    
+
     $boxstat.='</td></tr>';
     $boxstat.='</table>';
     $boxstat.='</div>';
@@ -558,7 +553,7 @@ if (! empty($valid_dashboardlines))
 
         $textlate = $langs->trans("NActionsLate",$board->nbtodolate);
         $textlate.= ' ('.$langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($board->warning_delay) >= 0 ? '+' : '').ceil($board->warning_delay).' '.$langs->trans("days").')';
-        
+
         $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats130 boxstatsborder">';
         $boxwork .= '<div class="boxstatscontent">';
         $boxwork .= '<span class="boxstatstext" title="'.dol_escape_htmltag($board->label).'">'.$board->img.' '.$board->label.'</span><br>';
@@ -579,7 +574,7 @@ if (! empty($valid_dashboardlines))
         $boxwork.='</div></div>';
         $boxwork .="\n";
     }
-    
+
     $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
     $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
     $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
@@ -693,7 +688,7 @@ function showWeather($totallate,$text,$options)
     $out='';
     $offset=0;
     $factor=10; // By default
-    
+
     $level0=$offset;           if (! empty($conf->global->MAIN_METEO_LEVEL0)) $level0=$conf->global->MAIN_METEO_LEVEL0;
     $level1=$offset+1*$factor; if (! empty($conf->global->MAIN_METEO_LEVEL1)) $level1=$conf->global->MAIN_METEO_LEVEL1;
     $level2=$offset+2*$factor; if (! empty($conf->global->MAIN_METEO_LEVEL2)) $level2=$conf->global->MAIN_METEO_LEVEL2;

From 9d8374693509f237538c490a29dfb15164430f2c Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Thu, 1 Jun 2017 04:44:05 +0200
Subject: [PATCH 043/438] Fix : Book entry in general ledger for salaries

---
 htdocs/accountancy/journal/bankjournal.php | 70 ++++++++++++++--------
 1 file changed, 46 insertions(+), 24 deletions(-)

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index b42ef34d663..35d4112ebc9 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -223,7 +223,7 @@ if ($result) {
 		    // Now loop on each link of record in bank.
 			foreach ( $links as $key => $val ) {
 
-			    if (in_array($links[$key]['type'], array('sc', 'payment_sc', 'payment', 'payment_supplier', 'payment_vat', 'payment_expensereport', 'banktransfert', 'payment_donation')))     // So we excluded 'company' here
+			    if (in_array($links[$key]['type'], array('sc', 'payment_sc', 'payment', 'payment_supplier', 'payment_vat', 'payment_expensereport', 'banktransfert', 'payment_donation', 'payment_salary')))     // So we excluded 'company' here
 			    {
 			        // We save tabtype for a future use, to remember what kind of payment it is 
 			        $tabtype[$obj->rowid] = $links[$key]['type'];
@@ -294,7 +294,7 @@ if ($result) {
 					$paymentsalstatic->ref = $links[$key]['url_id'];
 					$paymentsalstatic->label = $links[$key]['label'];
 					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentsalstatic->getNomUrl(2);
-					// $tabtp[$obj->rowid][$account_employee] += $obj->amount;
+					$tabpay[$obj->rowid]["paymentsalid"] = $paymentsalstatic->id;
 				} else if ($links[$key]['type'] == 'payment_expensereport') {
 					$paymentexpensereportstatic->id = $links[$key]['url_id'];
 					$paymentexpensereportstatic->fk_expensereport = $links[$key]['url_id'];
@@ -418,14 +418,17 @@ if (! $error && $action == 'writebookkeeping') {
         					$objmid = $db->fetch_object($resultmid);
         					$bookkeeping->doc_ref = $objmid->ref; // Ref of expensereport
         				}
-        			} else if ($tabtype[$key] == 'payment_vat') {
-  			  			$bookkeeping->code_tiers = '';
-	  			  		$bookkeeping->doc_ref = $langs->trans("PaymentVat") . ' (' . $val["paymentvatid"] . ')'; // Rowid of vat payment
-        			} else if ($tabtype[$key] == 'payment_donation') {
-		  			  	$bookkeeping->code_tiers = '';
-			  			  $bookkeeping->doc_ref = $langs->trans("Donation") . ' (' . $val["paymentdonationid"] . ')'; // Rowid of donation
-        			}
-        
+					} else if ($tabtype[$key] == 'payment_vat') {
+						$bookkeeping->code_tiers = '';
+						$bookkeeping->doc_ref = $langs->trans("PaymentVat") . ' (' . $val["paymentvatid"] . ')'; // Rowid of vat payment
+					} else if ($tabtype[$key] == 'payment_donation') {
+						$bookkeeping->code_tiers = '';
+						$bookkeeping->doc_ref = $langs->trans("Donation") . ' (' . $val["paymentdonationid"] . ')'; // Rowid of donation
+					} else if ($tabtype[$key] == 'payment_salary') {
+						$bookkeeping->code_tiers = '';
+						$bookkeeping->doc_ref = $langs->trans("PaymentSalary") . ' (' . $val["paymentsalid"] . ')'; // Ref of salary payment
+					}
+
         			$result = $bookkeeping->create($user);
         			if ($result < 0) {
         				if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
@@ -495,19 +498,23 @@ if (! $error && $action == 'writebookkeeping') {
         					$objmid = $db->fetch_object($resultmid);
         					$bookkeeping->doc_ref = $objmid->ref_supplier . ' (' . $objmid->ref . ')';
         				}
-                $bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
-        				$bookkeeping->numero_compte = $k;
-    					} else if ($tabtype[$key] == 'payment_vat') {
-	  		  			$bookkeeping->code_tiers = '';
-		  		  		$bookkeeping->numero_compte = $k;
-			  		  	$bookkeeping->doc_ref = $langs->trans("PaymentVat") . ' (' . $val["paymentvatid"] . ')'; // Rowid of vat
-            	} else if ($tabtype[$key] == 'payment_donation') {
-					  	  $bookkeeping->code_tiers = '';
-						    $bookkeeping->numero_compte = $k;
-						    $bookkeeping->doc_ref = $langs->trans("Donation") . ' (' . $val["paymentdonationid"] . ')'; // Rowid of donation
-         			} else if ($tabtype[$key] == 'banktransfert') {
-  						  $bookkeeping->code_tiers = '';
-        				$bookkeeping->numero_compte = $k;
+						$bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
+						$bookkeeping->numero_compte = $k;
+					} else if ($tabtype[$key] == 'payment_vat') {
+						$bookkeeping->code_tiers = '';
+						$bookkeeping->numero_compte = $k;
+						$bookkeeping->doc_ref = $langs->trans("PaymentVat") . ' (' . $val["paymentvatid"] . ')'; // Rowid of vat
+					} else if ($tabtype[$key] == 'payment_donation') {
+						$bookkeeping->code_tiers = '';
+						$bookkeeping->numero_compte = $k;
+						$bookkeeping->doc_ref = $langs->trans("Donation") . ' (' . $val["paymentdonationid"] . ')'; // Rowid of donation
+					} else if ($tabtype[$key] == 'payment_salary') {
+						$bookkeeping->code_tiers = $tabuser[$key]['accountancy_code'];
+						$bookkeeping->numero_compte = $k;
+						$bookkeeping->doc_ref = $langs->trans("PaymentSalary") . ' (' . $val["paymentsalid"] . ')'; // Rowid of salary payment
+					} else if ($tabtype[$key] == 'banktransfert') {
+						$bookkeeping->code_tiers = '';
+						$bookkeeping->numero_compte = $k;
         			} else {
         			    // FIXME Should be a temporary account ???
         				$bookkeeping->doc_ref = $k;
@@ -740,8 +747,9 @@ if (empty($action) || $action == 'view') {
 	$invoicestatic = new Facture($db);
 	$invoicesupplierstatic = new FactureFournisseur($db);
 	$expensereportstatic = new ExpenseReport($db);
-  $vatstatic = new Tva($db);
+	$vatstatic = new Tva($db);
 	$donationstatic = new Don($db);
+	$salarystatic = new PaymentSalary($db);
 
 	llxHeader('', $langs->trans("FinanceJournal"));
 
@@ -896,6 +904,20 @@ if (empty($action) || $action == 'view') {
 		    }
 		    else dol_print_error($db);
 		}
+		elseif ($tabtype[$key] == 'payment_salary')
+		{
+			$sqlmid = 'SELECT s.rowid as id';
+			$sqlmid .= " FROM " . MAIN_DB_PREFIX . "payment_salary as s";
+			$sqlmid .= " WHERE s.rowid=" . $val["paymentsalid"];
+			dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
+			$resultmid = $db->query($sqlmid);
+			if ($resultmid) {
+				$objmid = $db->fetch_object($resultmid);
+				$salarystatic->fetch($objmid->id);
+				$ref=$langs->trans("SalaryPayment").' '.$salarystatic->getNomUrl(1);
+			}
+			else dol_print_error($db);
+		}
 
 
 		/*$invoicestatic->id = $key;

From ab99c178e1a587f301ecad0e34b8bdb57e552469 Mon Sep 17 00:00:00 2001
From: Inovea Conseil <inoveaconseil@users.noreply.github.com>
Date: Thu, 1 Jun 2017 09:04:20 +0200
Subject: [PATCH 044/438] Print the value of fields

Add a loop for printing the value of fields
---
 dev/skeletons/skeleton_list.php | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/dev/skeletons/skeleton_list.php b/dev/skeletons/skeleton_list.php
index 4453f2d8302..7053486234f 100644
--- a/dev/skeletons/skeleton_list.php
+++ b/dev/skeletons/skeleton_list.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2007-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2014-2016 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2016      Jean-François Ferry	<jfefe@aternatik.fr>
+ * Copyright (C) 2017      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
@@ -440,17 +441,14 @@ while ($i < min($num, $limit))
         // Show here line of result
         print '<tr '.$bc[$var].'>';
         // LIST_OF_TD_FIELDS_LIST
-        /*
-        if (! empty($arrayfields['t.field1']['checked'])) 
-        {
-            print '<td>'.$obj->field1.'</td>';
-		    if (! $i) $totalarray['nbfield']++;
+        foreach ($arrayfields as $key => $value) {
+        	if (!empty($arrayfields[$key]['checked'])) {
+                	$key2 = str_replace('t.', '', $key);
+                	print '<td>' . $obj->$key2 . '</td>';
+                	if (!$i)
+                    	$totalarray['nbfield'] ++;
+            	}
         }
-        if (! empty($arrayfields['t.field2']['checked'])) 
-        {
-            print '<td>'.$obj->field2.'</td>';
-		    if (! $i) $totalarray['nbfield']++;
-        }*/
     	// Extra fields
 		if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 		{

From fa3cd267f48f98cd4312e90c5779849fd1bbe60a Mon Sep 17 00:00:00 2001
From: Inovea Conseil <inoveaconseil@users.noreply.github.com>
Date: Thu, 1 Jun 2017 10:51:30 +0200
Subject: [PATCH 045/438] Fix bug of prepare_head of card

Delete the call of commande_prepare_head function because do not use in skeleton
---
 dev/skeletons/skeleton_card.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dev/skeletons/skeleton_card.php b/dev/skeletons/skeleton_card.php
index f0a9dd23c26..8c487dee776 100644
--- a/dev/skeletons/skeleton_card.php
+++ b/dev/skeletons/skeleton_card.php
@@ -297,9 +297,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 {
     $res = $object->fetch_optionals($object->id, $extralabels);
 
-	$head = commande_prepare_head($object);
-	dol_fiche_head($head, 'order', $langs->trans("CustomerOrder"), 0, 'order');
-		
+			
 	print load_fiche_titre($langs->trans("MyModule"));
     
 	dol_fiche_head();

From 40dd6fc61c0a08118d2d5b1914a2a17c8a44a0d5 Mon Sep 17 00:00:00 2001
From: Inovea Conseil <inoveaconseil@users.noreply.github.com>
Date: Thu, 1 Jun 2017 11:22:08 +0200
Subject: [PATCH 046/438] Fix bug to display value

Fix bug to display the values in the future card.php
---
 dev/skeletons/build_class_from_table.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev/skeletons/build_class_from_table.php b/dev/skeletons/build_class_from_table.php
index 537975365ef..532da3131a6 100755
--- a/dev/skeletons/build_class_from_table.php
+++ b/dev/skeletons/build_class_from_table.php
@@ -1,6 +1,7 @@
 #!/usr/bin/env php
 <?php
 /* Copyright (C) 2008-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2017 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
@@ -649,7 +650,7 @@ foreach ($skeletonfiles as $skeletonfile => $outfile)
     {
     	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
     	{
-    	    $varprop.="print '<tr><td class=\"fieldrequired\">'.\$langs->trans(\"Field".$prop['field']."\").'</td><td>\$object->".$prop['field']."</td></tr>';\n";
+    	    $varprop.="print '<tr><td class=\"fieldrequired\">'.\$langs->trans(\"Field".$prop['field']."\").'</td><td>'.\$object->".$prop['field'].".'</td></tr>';\n";
     	}
     }
     $targetcontent=preg_replace('/LIST_OF_TD_LABEL_FIELDS_VIEW/', $varprop, $targetcontent);

From 0e175ba3737f1120b0ef6d5ce84c483f15ffa594 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Thu, 1 Jun 2017 11:48:14 +0200
Subject: [PATCH 047/438] Fix : SEPA XML address should also have dolEscapeXML

---
 htdocs/compta/prelevement/class/bonprelevement.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index dd6b773af9f..134e125b067 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -1565,7 +1565,7 @@ class BonPrelevement extends CommonObject
 		$XML_DEBITOR .='					<Nm>'.strtoupper(dolEscapeXML(dol_string_unaccent($row_nom))).'</Nm>'.$CrLf;
 		$XML_DEBITOR .='					<PstlAdr>'.$CrLf;
 		$XML_DEBITOR .='						<Ctry>'.$row_country_code.'</Ctry>'.$CrLf;
-		$XML_DEBITOR .='						<AdrLine>'.dol_trunc(dol_string_unaccent(strtr($row_address, array(CHR(13) => ", ", CHR(10) => ""))),70,'right','UTF-8',true).'</AdrLine>'.$CrLf;
+		$XML_DEBITOR .='						<AdrLine>'.dol_trunc(dolEscapeXML(dol_string_unaccent(strtr($row_address, array(CHR(13) => ", ", CHR(10) => "")))),70,'right','UTF-8',true).'</AdrLine>'.$CrLf;
 		$XML_DEBITOR .='						<AdrLine>'.dolEscapeXML(dol_string_unaccent($row_zip.' '.$row_town)).'</AdrLine>'.$CrLf;
 		$XML_DEBITOR .='					</PstlAdr>'.$CrLf;
 		$XML_DEBITOR .='				</Dbtr>'.$CrLf;

From 77df19009db350893462e42caaad9bad2c50924e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Jun 2017 12:11:45 +0200
Subject: [PATCH 048/438] Removed duplicated code

---
 htdocs/admin/agenda_other.php                 |  57 +++----
 htdocs/admin/barcode.php                      |  36 +---
 htdocs/admin/commande.php                     |  31 +---
 htdocs/admin/contract.php                     |  31 +---
 htdocs/admin/expedition.php                   |  32 +---
 htdocs/admin/expensereport.php                |  32 +---
 htdocs/admin/facture.php                      |  27 +--
 htdocs/admin/fichinter.php                    |  32 +---
 htdocs/admin/livraison.php                    |  32 +---
 htdocs/admin/propal.php                       |  32 +---
 htdocs/admin/supplier_payment.php             |  35 +---
 htdocs/admin/supplier_proposal.php            |  36 +---
 htdocs/admin/user.php                         |  32 +---
 htdocs/admin/usergroup.php                    |  32 +---
 htdocs/core/actions_setmoduleoptions.inc.php  |  86 ++++++++++
 htdocs/core/lib/files.lib.php                 | 160 +++++++++---------
 .../doc/doc_generic_contract_odt.modules.php  |  41 +----
 htdocs/langs/en_US/admin.lang                 |   2 +
 htdocs/modulebuilder/template/admin/setup.php |   9 +-
 htdocs/product/admin/product.php              |  45 +----
 htdocs/projet/admin/project.php               |  39 +----
 htdocs/societe/admin/societe.php              |  32 +---
 22 files changed, 265 insertions(+), 626 deletions(-)
 create mode 100644 htdocs/core/actions_setmoduleoptions.inc.php

diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index bd9587a4440..44ec3ade889 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -49,6 +49,8 @@ $type = 'action';
  *	Actions
  */
 
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
 if (preg_match('/set_(.*)/',$action,$reg))
 {
 	$code=$reg[1];
@@ -77,21 +79,6 @@ if (preg_match('/del_(.*)/',$action,$reg))
 		dol_print_error($db);
 	}
 }
-// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
-if ($action == 'setModuleOptions')
-{
-
-	if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-	if (! $res > 0) $error++;
-	if (! $error)
-	{
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
-        setEventMessages($langs->trans("Error"), null, 'errors');
-	}
-}
 if ($action == 'set')
 {
 	dolibarr_set_const($db, 'AGENDA_USE_EVENT_TYPE_DEFAULT', GETPOST('AGENDA_USE_EVENT_TYPE_DEFAULT'), 'chaine', 0, '', $conf->entity);
@@ -233,7 +220,7 @@ else
 if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 {
     print load_fiche_titre($langs->trans("AgendaModelModule"),'','');
-    
+
     print '<table class="noborder" width="100%">'."\n";
     print '<tr class="liste_titre">'."\n";
     print '<td width="100">'.$langs->trans("Name").'</td>'."\n";
@@ -243,13 +230,13 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
     print '<td align="center" width="40">'.$langs->trans("ShortInfo").'</td>';
     print '<td align="center" width="40">'.$langs->trans("Preview").'</td>';
     print '</tr>'."\n";
-    
+
     clearstatcache();
-    
+
     foreach ($dirmodels as $reldir)
     {
     	$dir = dol_buildpath($reldir."core/modules/action/doc/");
-    
+
         if (is_dir($dir))
         {
             $handle=opendir($dir);
@@ -261,10 +248,10 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
                     {
             			$name = substr($file, 4, dol_strlen($file) -16);
             			$classname = substr($file, 0, dol_strlen($file) -12);
-            			
+
             			require_once $dir.'/'.$file;
-            			$module = new $classname($db, new ActionComm($db));           			
-            			
+            			$module = new $classname($db, new ActionComm($db));
+
             			print '<tr class="oddeven">'."\n";
             			print "<td>";
             			print (empty($module->name)?$name:$module->name);
@@ -272,16 +259,16 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
             			print "<td>\n";
             			require_once $dir.$file;
             			$module = new $classname($db,$specimenthirdparty);
-            			if (method_exists($module,'info')) 
+            			if (method_exists($module,'info'))
             				print $module->info($langs);
-            			else 
+            			else
             				print $module->description;
             			print "</td>\n";
-            			
+
             			// Active
             			if (in_array($name, $def))
             			{
-            			    
+
             			print '<td align="center">'."\n";
             			if ($conf->global->ACTION_EVENT_ADDON_PDF != "$name")
             			{
@@ -301,7 +288,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
             				print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmodel&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=action">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
             				print "</td>";
             			}
-            			
+
             			// Default
             			print '<td align="center">';
             			if ($conf->global->ACTION_EVENT_ADDON_PDF == "$name")
@@ -313,7 +300,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
             				print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=action"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
             			}
             			print '</td>';
-            			
+
             			// Info
             			$htmltooltip =    ''.$langs->trans("Name").': '.$module->name;
             			$htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
@@ -326,7 +313,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
             			print '<td align="center">';
             			print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&amp;module='.$name.'">'.img_object($langs->trans("Preview"),'order').'</a>';
             			print '</td>';
-            			
+
             			print "</tr>\n";
                     }
                 }
@@ -366,7 +353,7 @@ print '</td></tr>'."\n";
 
 if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
 {
-    
+
     print '<!-- AGENDA_USE_EVENT_TYPE_DEFAULT -->';
     print '<tr class="oddeven">'."\n";
     print '<td>'.$langs->trans("AGENDA_USE_EVENT_TYPE_DEFAULT").'</td>'."\n";
@@ -404,30 +391,30 @@ print '</td></tr>'."\n";
 // AGENDA NOTIFICATION
 if ($conf->global->MAIN_FEATURES_LEVEL > 0)
 {
-    
+
     print '<tr class="oddeven">'."\n";
     print '<td>'.$langs->trans('AGENDA_NOTIFICATION').'</td>'."\n";
     print '<td align="center">&nbsp;</td>'."\n";
     print '<td align="right">'."\n";
-    
+
     if (empty($conf->global->AGENDA_NOTIFICATION)) {
         print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_NOTIFICATION">'.img_picto($langs->trans('Disabled'),'switch_off').'</a>';
         print '</td></tr>'."\n";
     } else {
         print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_NOTIFICATION">'.img_picto($langs->trans('Enabled'),'switch_on').'</a>';
         print '</td></tr>'."\n";
-    	
+
         print '<tr class="oddeven">'."\n";
         print '<td>'.$langs->trans('AGENDA_NOTIFICATION_SOUND').'</td>'."\n";
         print '<td align="center">&nbsp;</td>'."\n";
         print '<td align="right">'."\n";
-    
+
         if (empty($conf->global->AGENDA_NOTIFICATION_SOUND)) {
             print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_NOTIFICATION_SOUND">'.img_picto($langs->trans('Disabled'),'switch_off').'</a>';
         } else {
             print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_NOTIFICATION_SOUND">'.img_picto($langs->trans('Enabled'),'switch_on').'</a>';
         }
-    
+
         print '</td></tr>'."\n";
     }
 }
diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index db81c9a325f..ba649fe9223 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -39,6 +39,8 @@ $action = GETPOST('action','alpha');
  * Actions
  */
 
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
 if ($action == 'setbarcodeproducton')
 {
 	$res=dolibarr_set_const($db, "BARCODE_PRODUCT_ADDON_NUM", GETPOST('value'), 'chaine', 0, '', $conf->entity);
@@ -72,33 +74,7 @@ else if ($action == 'update')
 else if ($action == 'updateengine')
 {
     // TODO Update engines.
-    
-}
 
-// define constants for models generator that need parameters
-if ($action == 'setModuleOptions')
-{
-    $post_size=count($_POST);
-
-    for($i=0;$i < $post_size;$i++)
-    {
-        if (array_key_exists('param'.$i,$_POST))
-        {
-            $param=GETPOST("param".$i,'alpha');
-            $value=GETPOST("value".$i,'alpha');
-            if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-        }
-    }
-	if (! $res > 0) $error++;
-
- 	if (! $error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
 }
 
 if ($action && $action != 'setcoder' && $action != 'setModuleOptions')
@@ -276,7 +252,7 @@ if ($resql)
 		print '<td align="center">';
 		print $formbarcode->setBarcodeEncoder($obj->coder,$barcodelist,$obj->rowid,'form'.$i);
 		print "</td></tr>\n";
-		
+
 		$i++;
 	}
 }
@@ -312,7 +288,7 @@ print '</tr>';
 // Chemin du binaire genbarcode sous linux
 if (! isset($_SERVER['WINDIR']))
 {
-	
+
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("GenbarcodeLocation").'</td>';
 	print '<td width="60" align="center">';
@@ -328,7 +304,7 @@ if (! isset($_SERVER['WINDIR']))
 // Module products
 if (! empty($conf->product->enabled))
 {
-	
+
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("SetDefaultBarcodeTypeProducts").'</td>';
 	print '<td width="60" align="right">';
@@ -339,7 +315,7 @@ if (! empty($conf->product->enabled))
 // Module thirdparty
 if (! empty($conf->societe->enabled))
 {
-	
+
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("SetDefaultBarcodeTypeThirdParties").'</td>';
 	print '<td width="60" align="right">';
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 6d92ad21999..3f3c997b0d8 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -54,6 +54,8 @@ $type = 'order';
  * Actions
  */
 
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
 if ($action == 'updateMask')
 {
 	$maskconstorder=GETPOST('maskconstorder','alpha');
@@ -118,35 +120,6 @@ else if ($action == 'specimen')
 	}
 }
 
-// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
-if ($action == 'setModuleOptions')
-{
-	$post_size=count($_POST);
-
-	$db->begin();
-
-	for($i=0;$i < $post_size;$i++)
-	{
-		if (array_key_exists('param'.$i,$_POST))
-		{
-			$param=GETPOST("param".$i,'alpha');
-			$value=GETPOST("value".$i,'alpha');
-			if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-			if (! $res > 0) $error++;
-		}
-	}
-	if (! $error)
-	{
-		$db->commit();
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
-		$db->rollback();
-		setEventMessages($langs->trans("Error"), null, 'errors');
-	}
-}
-
 // Activate a model
 else if ($action == 'set')
 {
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index 47e53a05048..206d9020022 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -50,6 +50,8 @@ if (empty($conf->global->CONTRACT_ADDON))
  * Actions
  */
 
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
 if ($action == 'updateMask')
 {
     $maskconst = GETPOST('maskconstcontract','alpha');
@@ -113,35 +115,6 @@ else if ($action == 'specimen') // For contract
 	}
 }
 
-// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
-if ($action == 'setModuleOptions')
-{
-	$post_size=count($_POST);
-
-	$db->begin();
-
-	for($i=0;$i < $post_size;$i++)
-	{
-		if (array_key_exists('param'.$i,$_POST))
-		{
-			$param=GETPOST("param".$i,'alpha');
-			$value=GETPOST("value".$i,'alpha');
-			if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-			if (! $res > 0) $error++;
-		}
-	}
-	if (! $error)
-	{
-		$db->commit();
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
-		$db->rollback();
-        setEventMessages($langs->trans("Error"), null, 'errors');
-	}
-}
-
 // Activate a model
 else if ($action == 'set')
 {
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index e9a9aaedb18..6182538f820 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -57,6 +57,9 @@ if (empty($conf->global->EXPEDITION_ADDON_NUMBER))
 /*
  * Actions
  */
+
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
 if ($action == 'updateMask')
 {
 	$maskconst=GETPOST('maskconstexpedition','alpha');
@@ -142,35 +145,6 @@ else if ($action == 'specimen')
 	}
 }
 
-// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
-else if ($action == 'setModuleOptions')
-{
-	$post_size=count($_POST);
-
-	$db->begin();
-
-	for($i=0;$i < $post_size;$i++)
-	{
-		if (array_key_exists('param'.$i,$_POST))
-		{
-			$param=GETPOST("param".$i,'alpha');
-			$value=GETPOST("value".$i,'alpha');
-			if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-			if (! $res > 0) $error++;
-		}
-	}
-	if (! $error)
-	{
-		$db->commit();
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
-		$db->rollback();
-		setEventMessages($langs->trans("Error"), null, 'errors');
-	}
-}
-
 // Activate a model
 else if ($action == 'set')
 {
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index 92ba9375927..6c659181c4c 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -51,6 +51,9 @@ $type='expensereport';
 /*
  * Actions
  */
+
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
 if ($action == 'updateMask')
 {
 	$maskconst=GETPOST('maskconst','alpha');
@@ -116,35 +119,6 @@ else if ($action == 'specimen') // For fiche inter
 	}
 }
 
-// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
-if ($action == 'setModuleOptions')
-{
-	$post_size=count($_POST);
-
-	$db->begin();
-
-	for($i=0;$i < $post_size;$i++)
-	{
-		if (array_key_exists('param'.$i,$_POST))
-		{
-			$param=GETPOST("param".$i,'alpha');
-			$value=GETPOST("value".$i,'alpha');
-			if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-			if (! $res > 0) $error++;
-		}
-	}
-	if (! $error)
-	{
-		$db->commit();
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
-		$db->rollback();
-		setEventMessages($langs->trans("Error"), null, 'errors');
-	}
-}
-
 // Activate a model
 else if ($action == 'set')
 {
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 64ae1abdde6..115a685a3f2 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -51,6 +51,8 @@ $type='invoice';
  * Actions
  */
 
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
 if ($action == 'updateMask')
 {
     $maskconstinvoice=GETPOST('maskconstinvoice','alpha');
@@ -123,31 +125,6 @@ if ($action == 'specimen')
     }
 }
 
-// define constants for models generator that need parameters
-if ($action == 'setModuleOptions')
-{
-    $post_size=count($_POST);
-    for($i=0;$i < $post_size;$i++)
-    {
-        if (array_key_exists('param'.$i,$_POST))
-        {
-            $param=GETPOST("param".$i,'alpha');
-            $value=GETPOST("value".$i,'alpha');
-            if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-        }
-    }
-	if (! $res > 0) $error++;
-
- 	if (! $error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
-}
-
 // Activate a model
 else if ($action == 'set')
 {
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index e3000231c38..25c46164783 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -51,6 +51,9 @@ $type='ficheinter';
 /*
  * Actions
  */
+
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
 if ($action == 'updateMask')
 {
 	$maskconst=GETPOST('maskconst','alpha');
@@ -114,35 +117,6 @@ else if ($action == 'specimen') // For fiche inter
 	}
 }
 
-// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
-if ($action == 'setModuleOptions')
-{
-	$post_size=count($_POST);
-
-	$db->begin();
-
-	for($i=0;$i < $post_size;$i++)
-	{
-		if (array_key_exists('param'.$i,$_POST))
-		{
-			$param=GETPOST("param".$i,'alpha');
-			$value=GETPOST("value".$i,'alpha');
-			if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-			if (! $res > 0) $error++;
-		}
-	}
-	if (! $error)
-	{
-		$db->commit();
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
-		$db->rollback();
-		setEventMessages($langs->trans("Error"), null, 'errors');
-	}
-}
-
 // Activate a model
 else if ($action == 'set')
 {
diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
index cf97b397e44..ef73ec7a757 100644
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -47,10 +47,13 @@ $label   = GETPOST('label','alpha');
 $scandir = GETPOST('scandir','alpha');
 $type='delivery';
 
+
 /*
  * Actions
  */
 
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
 if ($action == 'updateMask')
 {
     $maskconstdelivery=GETPOST('maskconstdelivery','alpha');
@@ -131,35 +134,6 @@ if ($action == 'specimen')
     }
 }
 
-// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
-if ($action == 'setModuleOptions')
-{
-	$post_size=count($_POST);
-
-	$db->begin();
-
-	for($i=0;$i < $post_size;$i++)
-	{
-		if (array_key_exists('param'.$i,$_POST))
-		{
-			$param=GETPOST("param".$i,'alpha');
-			$value=GETPOST("value".$i,'alpha');
-			if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-			if (! $res > 0) $error++;
-		}
-	}
-	if (! $error)
-	{
-		$db->commit();
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
-		$db->rollback();
-		setEventMessages($langs->trans("Error"), null, 'errors');
-	}
-}
-
 if ($action == 'set')
 {
     $ret = addDocumentModel($value, $type, $label, $scandir);
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index e0dc1d3b5b4..9fa8dad0c0c 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -49,6 +49,9 @@ $type='propal';
 /*
  * Actions
  */
+
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
 $error=0;
 if ($action == 'updateMask')
 {
@@ -180,35 +183,6 @@ if ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL')
     }
 }
 
-// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
-if ($action == 'setModuleOptions')
-{
-	$post_size=count($_POST);
-
-	$db->begin();
-
-	for($i=0;$i < $post_size;$i++)
-	{
-		if (array_key_exists('param'.$i,$_POST))
-		{
-			$param=GETPOST("param".$i,'alpha');
-			$value=GETPOST("value".$i,'alpha');
-			if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-			if (! $res > 0) $error++;
-		}
-	}
-	if (! $error)
-	{
-		$db->commit();
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
-		$db->rollback();
-		setEventMessages($langs->trans("Error"), null, 'errors');
-	}
-}
-
 // Activate a model
 if ($action == 'set')
 {
diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php
index adaa114b1ca..4227f4d4221 100644
--- a/htdocs/admin/supplier_payment.php
+++ b/htdocs/admin/supplier_payment.php
@@ -47,6 +47,8 @@ $type='supplier_payment';
  * Actions
  */
 
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
 if ($action == 'updateMask')
 {
     $maskconstsupplierpayment=GETPOST('maskconstsupplierpayment','alpha');
@@ -68,31 +70,6 @@ if ($action == 'updateMask')
     dolibarr_set_const($db, "SUPPLIER_PAYMENT_ADDON", $value, 'chaine', 0, '', $conf->entity);
 }
 
-// define constants for models generator that need parameters
-else if ($action == 'setModuleOptions')
-{
-    $post_size=count($_POST);
-    for($i=0;$i < $post_size;$i++)
-    {
-        if (array_key_exists('param'.$i,$_POST))
-        {
-            $param=GETPOST("param".$i,'alpha');
-            $value=GETPOST("value".$i,'alpha');
-            if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-        }
-    }
-	if (! $res > 0) $error++;
-
- 	if (! $error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
-}
-
 // Activate a model
 else if ($action == 'set')
 {
@@ -195,7 +172,7 @@ dol_fiche_head($head, 'supplierpayment', $langs->trans("Suppliers"), -1, 'compan
  */
 
 if (empty($conf->global->SUPPLIER_PAYMENT_ADDON)) $conf->global->SUPPLIER_PAYMENT_ADDON = 'mod_supplier_payment_bronan';
-    
+
 print load_fiche_titre($langs->trans("PaymentsNumberingModule"), '', '');
 
 // Load array def with activated templates
@@ -265,7 +242,7 @@ foreach ($dirmodels as $reldir)
                         require_once $dir.$filebis;
 
                         $module = new $classname($db);
-						
+
                         // Show modules according to features level
                         if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
                         if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
@@ -375,7 +352,7 @@ foreach ($dirmodels as $reldir)
         {
             while (($file = readdir($handle))!==false)
             {
-                if (preg_match('/\.modules\.php$/i',$file) && preg_match('/^(pdf_|doc_)/',$file))            	
+                if (preg_match('/\.modules\.php$/i',$file) && preg_match('/^(pdf_|doc_)/',$file))
                 {
                     $name = substr($file, 4, dol_strlen($file) -16);
                     $classname = substr($file, 0, dol_strlen($file) -12);
@@ -383,7 +360,7 @@ foreach ($dirmodels as $reldir)
 	                require_once $dir.'/'.$file;
 	                $module = new $classname($db, new PaiementFourn($db));
 
-                    
+
                     print "<tr class=\"oddeven\">\n";
                     print "<td>";
 	                print (empty($module->name)?$name:$module->name);
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index 82eeddd594c..210d601c33c 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -41,10 +41,15 @@ $label = GETPOST('label','alpha');
 $scandir = GETPOST('scandir','alpha');
 $type='supplier_proposal';
 
+$error=0;
+
+
 /*
  * Actions
  */
-$error=0;
+
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
 if ($action == 'updateMask')
 {
 	$maskconstsupplier_proposal=GETPOST('maskconstsupplier_proposal','alpha');
@@ -159,35 +164,6 @@ if ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL')
     }
 }
 
-// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
-if ($action == 'setModuleOptions')
-{
-	$post_size=count($_POST);
-
-	$db->begin();
-
-	for($i=0;$i < $post_size;$i++)
-	{
-		if (array_key_exists('param'.$i,$_POST))
-		{
-			$param=GETPOST("param".$i,'alpha');
-			$value=GETPOST("value".$i,'alpha');
-			if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-			if (! $res > 0) $error++;
-		}
-	}
-	if (! $error)
-	{
-		$db->commit();
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
-		$db->rollback();
-		setEventMessages($langs->trans("Error"), null, 'errors');
-	}
-}
-
 // Activate a model
 if ($action == 'set')
 {
diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index 0c7574b7ec4..31efcb22474 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -47,37 +47,9 @@ $type='user';
  * Action
  */
 
-// Activate a model
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
-// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
-if ($action == 'setModuleOptions')
-{
-	$post_size=count($_POST);
-
-	$db->begin();
-
-	for($i=0;$i < $post_size;$i++)
-    {
-    	if (array_key_exists('param'.$i,$_POST))
-    	{
-    		$param=GETPOST("param".$i,'alpha');
-    		$value=GETPOST("value".$i,'alpha');
-    		if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-	    	if (! $res > 0) $error++;
-    	}
-    }
-	if (! $error)
-    {
-        $db->commit();
-	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-        $db->rollback();
-	    setEventMessages($langs->trans("Error"), null, 'errors');
-	}
-}
-elseif ($action == 'set_default')
+if ($action == 'set_default')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
 	$res = true;
diff --git a/htdocs/admin/usergroup.php b/htdocs/admin/usergroup.php
index 4642e6d3183..8d098ee6923 100644
--- a/htdocs/admin/usergroup.php
+++ b/htdocs/admin/usergroup.php
@@ -47,37 +47,9 @@ $type='group';
  * Action
  */
 
-// Activate a model
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
-// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
-if ($action == 'setModuleOptions')
-{
-	$post_size=count($_POST);
-
-	$db->begin();
-
-	for($i=0;$i < $post_size;$i++)
-    {
-    	if (array_key_exists('param'.$i,$_POST))
-    	{
-    		$param=GETPOST("param".$i,'alpha');
-    		$value=GETPOST("value".$i,'alpha');
-    		if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-	    	if (! $res > 0) $error++;
-    	}
-    }
-	if (! $error)
-    {
-        $db->commit();
-	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-        $db->rollback();
-	    setEventMessages($langs->trans("Error"), null, 'errors');
-	}
-}
-elseif ($action == 'set_default')
+if ($action == 'set_default')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
 	$res = true;
diff --git a/htdocs/core/actions_setmoduleoptions.inc.php b/htdocs/core/actions_setmoduleoptions.inc.php
new file mode 100644
index 00000000000..03b33b19eb1
--- /dev/null
+++ b/htdocs/core/actions_setmoduleoptions.inc.php
@@ -0,0 +1,86 @@
+<?php
+/* Copyright (C) 2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ *	\file			htdocs/core/actions_setnotes.inc.php
+ *  \brief			Code for actions on setting notes of object page
+ */
+
+
+// $action must be defined
+// $_FILES may be defined
+// $nomessageinsetmoduleoptions can be set to 1
+
+// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
+if ($action == 'setModuleOptions')
+{
+    $db->begin();
+
+    // Process common param fields
+    foreach($_POST as $key => $val)
+    {
+        if (preg_match('/^param(\d*)$/', $key, $reg))    // Works for POST['param'], POST['param1'], POST['param2'], ...
+        {
+            $param=GETPOST("param".$reg[1],'alpha');
+            $value=GETPOST("value".$reg[1],'alpha');
+            if ($param)
+            {
+                $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
+                if (! $res > 0) $error++;
+            }
+        }
+    }
+
+    // Process upload fields
+    if (GETPOST('upload','alpha') && GETPOST('keyforuploaddir','aZ09'))
+    {
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+        $keyforuploaddir=GETPOST('keyforuploaddir','aZ09');
+        $listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->$keyforuploaddir)));
+        foreach($listofdir as $key=>$tmpdir)
+        {
+            $tmpdir=trim($tmpdir);
+            $tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
+            if (! $tmpdir) {
+                unset($listofdir[$key]); continue;
+            }
+            if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
+            else
+            {
+                $upload_dir=$tmpdir;
+            }
+        }
+        if ($upload_dir)
+        {
+            $result = dol_add_file_process($upload_dir, 0, 1, 'uploadfile', '');
+            if ($result <= 0) $error++;
+        }
+    }
+
+    if (! $error)
+    {
+        $db->commit();
+        if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+    }
+    else
+    {
+        $db->rollback();
+        if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
+    }
+}
+
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 95fca68aa5d..85aace9db0b 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -44,7 +44,7 @@ function dol_basename($pathfile)
  *  @param	string		$path        	Starting path from which to search. This is a full path.
  *  @param	string		$types        	Can be "directories", "files", or "all"
  *  @param	int			$recursive		Determines whether subdirectories are searched
- *  @param	string		$filter        	Regex filter to restrict list. This regex value must be escaped for '/' by doing preg_quote($var,'/'), since this char is used for preg_match function, 
+ *  @param	string		$filter        	Regex filter to restrict list. This regex value must be escaped for '/' by doing preg_quote($var,'/'), since this char is used for preg_match function,
  *                                      but must not contains the start and end '/'. Filter is checked into basename only.
  *  @param	array		$excludefilter  Array of Regex for exclude filter (example: array('(\.meta|_preview.*\.png)$','^\.')). Exclude is checked into fullpath.
  *  @param	string		$sortcriteria	Sort criteria ("","fullname","name","date","size")
@@ -71,9 +71,9 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
 
 	$reshook = 0;
 	$file_list = array();
-	
+
 	$hookmanager->resArray=array();
-	
+
 	if (! $nohook)
 	{
 		$hookmanager->initHooks(array('fileslib'));
@@ -196,9 +196,9 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
 			}
 		}
 	}
-	
+
 	$file_list = array_merge($file_list, $hookmanager->resArray);
-	
+
 	return $file_list;
 }
 
@@ -219,7 +219,7 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
 function dol_dir_list_in_database($path, $filter="", $excludefilter=null, $sortcriteria="name", $sortorder=SORT_ASC, $mode=0)
 {
     global $conf, $db;
-    
+
     $sql=" SELECT rowid, label, entity, filename, filepath, fullpath_orig, keywords, cover, gen_or_uploaded, extraparams, date_c, date_m, fk_user_c, fk_user_m, acl, position";
     if ($mode) $sql.=", description";
     $sql.=" FROM ".MAIN_DB_PREFIX."ecm_files";
@@ -234,7 +234,7 @@ function dol_dir_list_in_database($path, $filter="", $excludefilter=null, $sortc
         $i = 0;
         while ($i < $num)
         {
-            $obj = $db->fetch_object($resql);            
+            $obj = $db->fetch_object($resql);
             if ($obj)
             {
                 preg_match('/([^\/]+)\/[^\/]+$/',DOL_DATA_ROOT.'/'.$obj->filepath.'/'.$obj->filename,$reg);
@@ -258,7 +258,7 @@ function dol_dir_list_in_database($path, $filter="", $excludefilter=null, $sortc
             }
             $i++;
         }
-        
+
         // Obtain a list of columns
         if (! empty($sortcriteria))
         {
@@ -270,7 +270,7 @@ function dol_dir_list_in_database($path, $filter="", $excludefilter=null, $sortc
             // Sort the data
             if ($sortorder) array_multisort($myarray, $sortorder, $file_list);
         }
-        
+
         return $file_list;
     }
     else
@@ -279,7 +279,7 @@ function dol_dir_list_in_database($path, $filter="", $excludefilter=null, $sortc
         return array();
     }
 }
-    
+
 
 /**
  * Fast compare of 2 files identified by their properties ->name, ->date and ->size
@@ -460,10 +460,10 @@ function dolReplaceInFile($srcfile, $arrayreplacement, $destfile='', $newmask=0,
 
     if (empty($srcfile)) return -1;
     if (empty($destfile)) $destfile=$srcfile;
-    
+
     $destexists=dol_is_file($destfile);
     if (($destfile != $srcfile) && $destexists) return 0;
-    
+
     $tmpdestfile=$destfile.'.tmp';
 
     $newpathofsrcfile=dol_osencode($srcfile);
@@ -481,17 +481,17 @@ function dolReplaceInFile($srcfile, $arrayreplacement, $destfile='', $newmask=0,
         dol_syslog("files.lib.php::dolReplaceInFile failed Permission denied to write into target directory ".$newdirdestfile, LOG_WARNING);
         return -2;
     }
-   
+
     dol_delete_file($tmpdestfile);
-    
+
     // Create $newpathoftmpdestfile from $newpathofsrcfile
     $content=file_get_contents($newpathofsrcfile, 'r');
-    
+
     $content = make_substitutions($content, $arrayreplacement, null);
-    
+
     file_put_contents($newpathoftmpdestfile, $content);
     @chmod($newpathoftmpdestfile, octdec($newmask));
-    
+
     // Rename
     $result=dol_move($newpathoftmpdestfile, $newpathofdestfile, $newmask, (($destfile == $srcfile)?1:0), 0, $indexdatabase);
     if (! $result)
@@ -589,7 +589,7 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayrep
 
 	$destexists=dol_is_dir($destfile);
 	//if (! $overwriteifexists && $destexists) return 0;	// The overwriteifexists is for files only, so propagated to dol_copy only.
-    
+
     if (! $destexists)
     {
         // We must set mask just before creating dir, becaause it can be set differently by dol_copy
@@ -599,7 +599,7 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayrep
         $dirmaskdec |= octdec('0200');  // Set w bit required to be able to create content for recursive subdirs files
         dol_mkdir($destfile, '', decoct($dirmaskdec));
     }
-    
+
 	$ossrcfile=dol_osencode($srcfile);
 	$osdestfile=dol_osencode($destfile);
 
@@ -639,7 +639,7 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayrep
                     $result=$tmpresult;
                 }
                 if ($result < 0) break;
-                
+
             }
         }
         closedir($dir_handle);
@@ -656,10 +656,10 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayrep
 
 /**
  * Move a file into another name.
- * Note: 
+ * Note:
  *  - This function differs from dol_move_uploaded_file, because it can be called in any context.
  *  - Database of files is updated.
- *  - Test on antivirus is done only if param testvirus is provided and an antivirus was set. 
+ *  - Test on antivirus is done only if param testvirus is provided and an antivirus was set.
  *
  * @param	string  $srcfile            Source file (can't be a directory. use native php @rename() to move a directory)
  * @param   string	$destfile           Destination file (can't be a directory. use native php @rename() to move a directory)
@@ -679,12 +679,12 @@ function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1, $testvi
     $srcexists=dol_is_file($srcfile);
     $destexists=dol_is_file($destfile);
 
-    if (! $srcexists) 
+    if (! $srcexists)
     {
         dol_syslog("files.lib.php::dol_move srcfile does not exists. we ignore the move request.");
         return false;
     }
-    
+
     if ($overwriteifexists || ! $destexists)
     {
         $newpathofsrcfile=dol_osencode($srcfile);
@@ -695,7 +695,7 @@ function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1, $testvi
         if ($testvirus)
         {
             $testvirusarray=dolCheckVirus($newpathofsrcfile);
-            if (count($testvirusarray)) 
+            if (count($testvirusarray))
             {
                 dol_syslog("files.lib.php::dol_move canceled because a virus was found into source file. we ignore the move request.", LOG_WARNING);
                 return false;
@@ -729,14 +729,14 @@ function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1, $testvi
 
                 dol_syslog("Try to rename also entries in database for full relative path before = ".$rel_filetorenamebefore." after = ".$rel_filetorenameafter, LOG_DEBUG);
                 include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-                
+
                 $ecmfiletarget=new EcmFiles($db);
                 $resultecmtarget = $ecmfiletarget->fetch(0, '', $rel_filetorenameafter);
                 if ($resultecmtarget > 0)   // An entry for target name already exists for target, we delete it, a new one will be created.
                 {
                     $ecmfiletarget->delete($user);
                 }
-                
+
                 $ecmfile=new EcmFiles($db);
                 $resultecm = $ecmfile->fetch(0, '', $rel_filetorenamebefore);
                 if ($resultecm > 0)   // If an entry was found for src file, we use it to move entry
@@ -745,7 +745,7 @@ function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1, $testvi
                     $rel_dir = dirname($rel_filetorenameafter);
                     $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
                     $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
-                    
+
                     $ecmfile->filepath = $rel_dir;
                     $ecmfile->filename = $filename;
                     $resultecm = $ecmfile->update($user);
@@ -756,7 +756,7 @@ function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1, $testvi
                     $rel_dir = dirname($rel_filetorenameafter);
                     $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
                     $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
-                    	
+
                     $ecmfile->filepath = $rel_dir;
                     $ecmfile->filename = $filename;
                     $ecmfile->label = md5_file(dol_osencode($destfile));        // $destfile is a full path to file
@@ -774,12 +774,12 @@ function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1, $testvi
                 {
                     setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
                 }
-                
+
                 if ($resultecm > 0) $result=true;
                 else $result = false;
-            }        
+            }
         }
-        
+
         if (empty($newmask)) $newmask=empty($conf->global->MAIN_UMASK)?'0755':$conf->global->MAIN_UMASK;
         $newmaskdec=octdec($newmask);
         // Currently method is restricted to files (dol_delete_files previously used is for files, and mask usage if for files too)
@@ -809,14 +809,14 @@ function dol_unescapefile($filename)
 
 /**
  * Check virus into a file
- * 
+ *
  * @param   string      $src_file       Source file to check
  * @return  array                       Array of errors or empty array if not virus found
  */
 function dolCheckVirus($src_file)
 {
     global $conf;
-    
+
     if (! empty($conf->global->MAIN_ANTIVIRUS_COMMAND))
     {
         if (! class_exists('AntiVir')) {
@@ -837,10 +837,10 @@ function dolCheckVirus($src_file)
 /**
  *	Make control on an uploaded file from an GUI page and move it to final destination.
  * 	If there is errors (virus found, antivir in error, bad filename), file is not moved.
- *  Note: 
+ *  Note:
  *  - This function can be used only into a HTML page context. Use dol_move if you are outside.
- *  - Database of files is not updated.
  *  - Test on antivirus is always done (if antivirus set).
+ *  - Database of files is NOT updated.
  *
  *	@param	string	$src_file			Source full path filename ($_FILES['field']['tmp_name'])
  *	@param	string	$dest_file			Target full path filename  ($_FILES['field']['name'])
@@ -867,7 +867,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
 		$parameters=array('dest_file' => $dest_file, 'src_file' => $src_file, 'file_name' => $file_name, 'varfiles' => $varfiles, 'allowoverwrite' => $allowoverwrite);
 		$reshook=$hookmanager->executeHooks('moveUploadedFile', $parameters, $object);
 	}
-    
+
 	if (empty($reshook))
 	{
     	// If an upload error has been reported
@@ -897,7 +897,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
     	            break;
     	    }
     	}
-    	
+
     	// If we need to make a virus scan
     	if (empty($disablevirusscan) && file_exists($src_file))
     	{
@@ -908,7 +908,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
     	       return 'ErrorFileIsInfectedWithAVirus: '.join(',',$checkvirusarray);
     	    }
     	}
-    	
+
     	// Security:
     	// Disallow file with some extensions. We renamed them.
     	// Car si on a mis le rep documents dans un rep de la racine web (pas bien), cela permet d'executer du code a la demande.
@@ -916,7 +916,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
     	{
     	    $file_name.= '.noexe';
     	}
-    	
+
     	// Security:
     	// We refuse cache files/dirs, upload using .. and pipes into filenames.
     	if (preg_match('/^\./',$src_file) || preg_match('/\.\./',$src_file) || preg_match('/[<>|]/',$src_file))
@@ -924,7 +924,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
     	    dol_syslog("Refused to deliver file ".$src_file, LOG_WARNING);
     	    return -1;
     	}
-    	
+
     	// Security:
     	// On interdit fichiers caches, remontees de repertoire ainsi que les pipe dans les noms de fichiers.
     	if (preg_match('/^\./',$dest_file) || preg_match('/\.\./',$dest_file) || preg_match('/[<>|]/',$dest_file))
@@ -933,7 +933,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
     	    return -2;
     	}
 	}
-	
+
 	if ($reshook < 0)	// At least one blocking error returned by one hook
 	{
 		$errmsg = join(',', $hookmanager->errors);
@@ -1005,7 +1005,7 @@ function dol_delete_file($file,$disableglob=0,$nophperrors=0,$nohook=0,$object=n
         dol_syslog("Refused to delete file ".$file, LOG_WARNING);
 	    return False;
 	}
-	
+
 	if (empty($nohook))
 	{
 		$hookmanager->initHooks(array('fileslib'));
@@ -1042,16 +1042,16 @@ function dol_delete_file($file,$disableglob=0,$nophperrors=0,$nohook=0,$object=n
 				{
 					if ($nophperrors) $ok=@unlink($filename);
 					else $ok=unlink($filename);
-					if ($ok) 
+					if ($ok)
 					{
 					    dol_syslog("Removed file ".$filename, LOG_DEBUG);
-					    
+
 	                    // Delete entry into ecm database
     				    $rel_filetodelete = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $filename);
     				    if (! preg_match('/(\/temp\/|\/thumbs\/|\.meta$)/', $rel_filetodelete))     // If not a tmp file
     				    {
     				        $rel_filetodelete = preg_replace('/^[\\/]/', '', $rel_filetodelete);
-    				        
+
     				        dol_syslog("Try to remove also entries in database for full relative path = ".$rel_filetodelete, LOG_DEBUG);
         				    include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
         				    $ecmfile=new EcmFiles($db);
@@ -1079,7 +1079,7 @@ function dol_delete_file($file,$disableglob=0,$nophperrors=0,$nohook=0,$object=n
 			if ($nophperrors) $ok=@unlink($file_osencoded);
 			else $ok=unlink($file_osencoded);
 			if ($ok) dol_syslog("Removed file ".$file_osencoded, LOG_DEBUG);
-			else dol_syslog("Failed to remove file ".$file_osencoded, LOG_WARNING);      
+			else dol_syslog("Failed to remove file ".$file_osencoded, LOG_WARNING);
 		}
 
 		return $ok;
@@ -1104,7 +1104,7 @@ function dol_delete_dir($dir,$nophperrors=0)
         dol_syslog("Refused to delete dir ".$dir, LOG_WARNING);
 	    return False;
 	}
-	
+
     $dir_osencoded=dol_osencode($dir);
     return ($nophperrors?@rmdir($dir_osencoded):rmdir($dir_osencoded));
 }
@@ -1340,7 +1340,7 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio
 	global $db,$user,$conf,$langs;
 
 	$res = 0;
-	
+
 	if (! empty($_FILES[$varfiles])) // For view $_FILES[$varfiles]['error']
 	{
 		dol_syslog('dol_add_file_process upload_dir='.$upload_dir.' allowoverwrite='.$allowoverwrite.' donotupdatesession='.$donotupdatesession.' savingdocmask='.$savingdocmask, LOG_DEBUG);
@@ -1354,17 +1354,17 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio
 					$val = array($val);
 				}
 			}
-			
+
 			$nbfile = count($TFile['name']);
-			
+
 			for ($i = 0; $i < $nbfile; $i++)
 			{
 				// Define $destfull (path to file including filename) and $destfile (only filename)
 				$destfull=$upload_dir . "/" . $TFile['name'][$i];
 				$destfile=$TFile['name'][$i];
-	
+
 				$savingdocmask = dol_sanitizeFileName($savingdocmask);
-	
+
 				if ($savingdocmask)
 				{
 					$destfull=$upload_dir . "/" . preg_replace('/__file__/',$TFile['name'][$i],$savingdocmask);
@@ -1378,26 +1378,26 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio
 				$destfile = $info['filename'].'.'.strtolower($info['extension']);
 
 				$resupload = dol_move_uploaded_file($TFile['tmp_name'][$i], $destfull, $allowoverwrite, 0, $TFile['error'][$i], 0, $varfiles);
-				
+
 				if (is_numeric($resupload) && $resupload > 0)   // $resupload can be 'ErrorFileAlreadyExists'
 				{
 					global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini;
-				
+
 					include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
-					
+
 					// Generate thumbs.
 					if (image_format_supported($destfull) == 1)
 					{
 					    // Create thumbs
 					    // We can't use $object->addThumbs here because there is no $object known
-					
+
 					    // Used on logon for example
 					    $imgThumbSmall = vignette($destfull, $maxwidthsmall, $maxheightsmall, '_small', 50, "thumbs");
 					    // Create mini thumbs for image (Ratio is near 16/9)
 					    // Used on menu or for setup page for example
 					    $imgThumbMini = vignette($destfull, $maxwidthmini, $maxheightmini, '_mini', 50, "thumbs");
 					}
-					
+
 					// Update session
 					if (empty($donotupdatesession))
 					{
@@ -1406,18 +1406,18 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio
 						$formmail->trackid = $trackid;
 						$formmail->add_attached_files($destfull, $destfile, $TFile['type'][$i]);
 					}
-					
+
 					// Update table of files
-					if ($donotupdatesession) 
+					if ($donotupdatesession)
 					{
 					    $rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dir);
-				    
+
 					    if (! preg_match('/[\\/]temp[\\/]/', $rel_dir))     // If not a tmp dir
 					    {
 					        $filename = basename($destfile);
 					        $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
 					        $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
-    					    
+
     					    include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
     					    $ecmfile=new EcmFiles($db);
     					    $ecmfile->filepath = $rel_dir;
@@ -1455,7 +1455,7 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio
 					}
 				}
 			}
-			
+
 		}
 	} elseif ($link) {
 		require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
@@ -1478,7 +1478,7 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio
 		$langs->load("errors");
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("File")), null, 'errors');
 	}
-	
+
 	return $res;
 }
 
@@ -1718,11 +1718,11 @@ function dol_compress_dir($inputdir, $outputfile, $mode="zip")
             if (class_exists('ZipArchive'))
             {
                 $foundhandler=1;
-                
+
                 // Initialize archive object
                 $zip = new ZipArchive();
                 $zip->open($outputfile, ZipArchive::CREATE | ZipArchive::OVERWRITE);
-                
+
                 // Create recursive directory iterator
                 /** @var SplFileInfo[] $files */
                 $files = new RecursiveIteratorIterator(
@@ -1738,15 +1738,15 @@ function dol_compress_dir($inputdir, $outputfile, $mode="zip")
                         // Get real and relative path for current file
                         $filePath = $file->getRealPath();
                         $relativePath = substr($filePath, strlen($inputdir) + 1);
-                
+
                         // Add current file to archive
                         $zip->addFile($filePath, $relativePath);
                     }
                 }
-                
+
                 // Zip archive will be created only after closing object
-                $zip->close();                
-    
+                $zip->close();
+
                 return 1;
             }
         }
@@ -1793,7 +1793,7 @@ function dol_most_recent_file($dir,$regexfilter='',$excludefilter=array('(\.meta
  * @param	string	$entity				Restrict onto entity (0=no restriction)
  * @param  	User	$fuser				User object (forced)
  * @param	string	$refname			Ref of object to check permission for external users (autodetect if not provided)
- * @param   string  $mode               Check permission for 'read' or 'write'               
+ * @param   string  $mode               Check permission for 'read' or 'write'
  * @return	mixed						Array with access information : 'accessallowed' & 'sqlprotectagainstexternals' & 'original_file' (as a full path name)
  * @see restrictedArea
  */
@@ -1801,7 +1801,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 {
 	global $user, $conf, $db;
 	global $dolibarr_main_data_root;
-	
+
 	if (! is_object($fuser)) $fuser=$user;
 
 	if (empty($modulepart)) return 'ErrorBadParameter';
@@ -1823,7 +1823,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 	{
 	    $lire='creer'; $read='write'; $download='upload';
 	}
-	 
+
 	// Wrapping for some images
 	if (($modulepart == 'mycompany' || $modulepart == 'companylogo') && !empty($conf->mycompany->dir_output))
 	{
@@ -2022,7 +2022,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 	    }
 	    $original_file=$conf->user->dir_output.'/'.$original_file;
 	}
-	
+
 	// Wrapping for third parties
 	else if (($modulepart == 'company' || $modulepart == 'societe') && !empty($conf->societe->dir_output))
 	{
@@ -2119,7 +2119,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 	    }
 	    $original_file=$conf->fournisseur->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
-	
+
 	// Wrapping for interventions
 	else if (($modulepart == 'fichinter' || $modulepart == 'ficheinter') && !empty($conf->ficheinter->dir_output))
 	{
@@ -2185,7 +2185,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 	}
 
 	// Wrapping pour les commandes fournisseurs
-	else if (($modulepart == 'commande_fournisseur' || $modulepart == 'order_supplier') && !empty($conf->fournisseur->commande->dir_output)) 
+	else if (($modulepart == 'commande_fournisseur' || $modulepart == 'order_supplier') && !empty($conf->fournisseur->commande->dir_output))
 	{
 		if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
@@ -2317,7 +2317,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file=$conf->resource->dir_output.'/'.$original_file;
 	}
-	
+
 	// Wrapping pour les remises de cheques
 	else if ($modulepart == 'remisecheque' && !empty($conf->banque->dir_output))
 	{
@@ -2361,14 +2361,14 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		$accessallowed=1;
 		$original_file=$conf->fckeditor->dir_output.'/'.$original_file;
 	}
-	
+
 	// Wrapping for miscellaneous medias files
 	elseif ($modulepart == 'medias' && !empty($dolibarr_main_data_root))
 	{
 	    $accessallowed=1;
 	    $original_file=$dolibarr_main_data_root.'/medias/'.$original_file;
 	}
-	
+
 	// Wrapping for backups
 	else if ($modulepart == 'systemtools' && !empty($conf->admin->dir_output))
 	{
@@ -2416,7 +2416,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
     // If modulepart=module				Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart
     else
 	{
-	    if (preg_match('/^specimen/i',$original_file))	$accessallowed=1;    // If link to a file called specimen. Test must be done before changing $original_file int full path. 
+	    if (preg_match('/^specimen/i',$original_file))	$accessallowed=1;    // If link to a file called specimen. Test must be done before changing $original_file int full path.
 	    if ($fuser->admin) $accessallowed=1;    // If user is admin
 
 		// Define $accessallowed
diff --git a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
index a58d00455e8..64d0da9b5fd 100644
--- a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
+++ b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
@@ -102,16 +102,10 @@ class doc_generic_contract_odt extends ModelePDFContract
 		$form = new Form($this->db);
 
 		$texte = $this->description.".<br>\n";
-		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" enctype="multipart/form-data">';
 		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		$texte.= '<input type="hidden" name="action" value="setModuleOptions">';
 		$texte.= '<input type="hidden" name="param1" value="CONTRACT_ADDON_PDF_ODT_PATH">';
-		if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
-		{
-			$texte.= '<input type="hidden" name="param2" value="CONTRACT_ADDON_PDF_ODT_DEFAULT">';
-			$texte.= '<input type="hidden" name="param3" value="CONTRACT_ADDON_PDF_ODT_TOBILL">';
-			$texte.= '<input type="hidden" name="param4" value="CONTRACT_ADDON_PDF_ODT_CLOSED">';
-		}
 		$texte.= '<table class="nobordernopadding" width="100%">';
 
 		// List of directories area
@@ -144,40 +138,21 @@ class doc_generic_contract_odt extends ModelePDFContract
 		$texte.=$conf->global->CONTRACT_ADDON_PDF_ODT_PATH;
 		$texte.= '</textarea>';
 		$texte.= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte.= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte.= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Modify")).'" name="Button">';
 		$texte.= '<br></div></div>';
 
 		// Scan directories
 		if (count($listofdir))
 		{
 			$texte.=$langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>';
-
-			if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
-			{
-				// Model for creation
-				$liste=ModelePDFContract::liste_modeles($this->db);
-				$texte.= '<table width="50%;">';
-				$texte.= '<tr>';
-				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalCreate").'</td>';
-				$texte.= '<td colspan="">';
-				$texte.= $form->selectarray('value2',$liste,$conf->global->CONTRACT_ADDON_PDF_ODT_DEFAULT);
-				$texte.= "</td></tr>";
-
-				$texte.= '<tr>';
-				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalToBill").'</td>';
-				$texte.= '<td colspan="">';
-				$texte.= $form->selectarray('value3',$liste,$conf->global->CONTRACT_ADDON_PDF_ODT_TOBILL);
-				$texte.= "</td></tr>";
-				$texte.= '<tr>';
-
-				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalClosed").'</td>';
-				$texte.= '<td colspan="">';
-				$texte.= $form->selectarray('value4',$liste,$conf->global->CONTRACT_ADDON_PDF_ODT_CLOSED);
-				$texte.= "</td></tr>";
-				$texte.= '</table>';
-			}
 		}
 
+		// Add select to upload a new template file. TODO Copy this feature on other admin pages.
+		$texte.= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
+		$texte.= '<input type="hidden" value="CONTRACT_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
+		$texte.= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+        $texte.= '</div>';
+
 		$texte.= '</td>';
 
 		$texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index fe547931908..5b213135878 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=Internal users
 ExternalUsers=External users
 GUISetup=Display
 SetupArea=Setup area
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form to test file upload (according to setup)
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
@@ -873,6 +874,7 @@ DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Setup saved
+SetupNotSaved=Setup not saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
 VATManagement=VAT Management
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index 63b92bc6468..b3f2cc87d73 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -39,20 +39,23 @@ require_once '../lib/mymodule.lib.php';
 $langs->load("mymodule@mymodule");
 
 // Access control
-if (! $user->admin) {
-	accessforbidden();
-}
+if (! $user->admin) accessforbidden();
 
 // Parameters
 $action = GETPOST('action', 'alpha');
 
+
 /*
  * Actions
  */
 
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
+
 /*
  * View
  */
+
 $page_name = "MyModuleSetup";
 llxHeader('', $langs->trans($page_name));
 
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index 5183eeb3382..172bdd9354c 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -74,6 +74,9 @@ $error = 0;
  * Actions
  */
 
+$nomessageinsetmoduleoptions=1;
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
 if ($action == 'setcodeproduct')
 {
 	if (dolibarr_set_const($db, "PRODUCT_CODEPRODUCT_ADDON",$value,'chaine',0,'',$conf->entity) > 0)
@@ -87,36 +90,6 @@ if ($action == 'setcodeproduct')
 	}
 }
 
-// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
-if ($action == 'setModuleOptions')
-{
-	$post_size=count($_POST);
-
-	$db->begin();
-
-	for($i=0;$i < $post_size;$i++)
-    {
-    	if (array_key_exists('param'.$i,$_POST))
-    	{
-    		$param=GETPOST("param".$i,'alpha');
-    		$value=GETPOST("value".$i,'alpha');
-    		if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-	    	if (! $res > 0) $error++;
-    	}
-    }
-	if (! $error)
-    {
-        $db->commit();
-	//setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-        $db->rollback();
-	// message yet present at the bottom if($action)
-	//setEventMessages($langs->trans("Error"), null, 'errors');
-	}
-}
-
 if ($action == 'other' && GETPOST('value_PRODUIT_LIMIT_SIZE') >= 0)
 {
 	$res = dolibarr_set_const($db, "PRODUIT_LIMIT_SIZE", GETPOST('value_PRODUIT_LIMIT_SIZE'),'chaine',0,'',$conf->entity);
@@ -278,7 +251,7 @@ if ($action)
     }
     else
     {
-	    setEventMessages($langs->trans("Error"), null, 'errors');
+	    setEventMessages($langs->trans("SetupNotError"), null, 'errors');
     }
 }
 
@@ -543,7 +516,7 @@ foreach ($dirmodels as $reldir)
 
 print '</table>';
 print "<br>";
-    
+
 /*
  * Other conf
  */
@@ -598,7 +571,7 @@ print '</tr>';
 // multiprix nombre de prix a proposer
 if (! empty($conf->global->PRODUIT_MULTIPRICES))
 {
-	
+
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("MultiPricesNumPrices").'</td>';
 	print '<td align="right"><input size="3" type="text" class="flat" name="value_PRODUIT_MULTIPRICES_LIMIT" value="'.$conf->global->PRODUIT_MULTIPRICES_LIMIT.'"></td>';
@@ -640,7 +613,7 @@ print '</tr>';
 
 if (empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT))
 {
-	
+
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("NumberOfProductShowInSelect").'</td>';
 	print '<td align="right"><input size="3" type="text" class="flat" name="value_PRODUIT_LIMIT_SIZE" value="'.$conf->global->PRODUIT_LIMIT_SIZE.'"></td>';
@@ -681,7 +654,7 @@ print '</tr>';
 // View product description in thirdparty language
 if (! empty($conf->global->MAIN_MULTILANGS))
 {
-	
+
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("ViewProductDescInThirdpartyLanguageAbility").'</td>';
 	print '<td width="60" align="right">';
@@ -723,7 +696,7 @@ if (! empty($conf->global->PRODUCT_CANVAS_ABILITY))
 
     				if ($conf->$module->enabled)
     				{
-    					
+
     					print "<tr ".$bc[$var]."><td>";
 
     					print $object->description;
diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index fbcecf032cf..9e35ea77e0b 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -51,6 +51,8 @@ $type='project';
  * Actions
  */
 
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
 if ($action == 'setmainoptions')
 {
 	if (GETPOST('PROJECT_USE_OPPORTUNITIES')) dolibarr_set_const($db, "PROJECT_USE_OPPORTUNITIES",GETPOST('PROJECT_USE_OPPORTUNITIES'),'chaine',0,'',$conf->entity);
@@ -104,7 +106,7 @@ else if ($action == 'specimen')
 
 	$project = new Project($db);
 	$project->initAsSpecimen();
-    
+
 	// Search template files
 	$file=''; $classname=''; $filefound=0;
 	$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
@@ -188,35 +190,6 @@ else if ($action == 'specimentask')
 	}
 }
 
-// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
-if ($action == 'setModuleOptions')
-{
-	$post_size=count($_POST);
-
-	$db->begin();
-
-	for($i=0;$i < $post_size;$i++)
-	{
-		if (array_key_exists('param'.$i,$_POST))
-		{
-			$param=GETPOST("param".$i,'alpha');
-			$value=GETPOST("value".$i,'alpha');
-			if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-			if (! $res > 0) $error++;
-		}
-	}
-	if (! $error)
-	{
-		$db->commit();
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
-		$db->rollback();
-        setEventMessages($langs->trans("Error"), null, 'errors');
-	}
-}
-
 // Activate a model
 else if ($action == 'set')
 {
@@ -414,7 +387,7 @@ foreach ($dirmodels as $reldir)
 
 					if ($module->isEnabled())
 					{
-						
+
 						print '<tr class="oddeven"><td>'.$module->name."</td><td>\n";
 						print $module->info();
 						print '</td>';
@@ -518,7 +491,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 
 						if ($module->isEnabled())
 						{
-							
+
 							print '<tr class="oddeven"><td>'.$module->name."</td><td>\n";
 							print $module->info();
 							print '</td>';
@@ -660,7 +633,7 @@ foreach ($dirmodels as $reldir)
 
 							if ($modulequalified)
 							{
-								
+
 								print '<tr class="oddeven"><td width="100">';
 								print (empty($module->name)?$name:$module->name);
 								print "</td><td>\n";
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index 63ba12197fd..5c84be25521 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -42,6 +42,9 @@ if (!$user->admin) accessforbidden();
 /*
  * Actions
  */
+
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
 if ($action == 'setcodeclient')
 {
 	if (dolibarr_set_const($db, "SOCIETE_CODECLIENT_ADDON",$value,'chaine',0,'',$conf->entity) > 0)
@@ -101,35 +104,6 @@ if ($action == 'updateoptions')
 	}
 }
 
-// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
-if ($action == 'setModuleOptions')
-{
-	$post_size=count($_POST);
-
-	$db->begin();
-
-	for($i=0;$i < $post_size;$i++)
-    {
-    	if (array_key_exists('param'.$i,$_POST))
-    	{
-    		$param=GETPOST("param".$i,'alpha');
-    		$value=GETPOST("value".$i,'alpha');
-    		if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-	    	if (! $res > 0) $error++;
-    	}
-    }
-	if (! $error)
-    {
-        $db->commit();
-	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-        $db->rollback();
-	    setEventMessages($langs->trans("Error"), null, 'errors');
-	}
-}
-
 // Activate a document generator module
 if ($action == 'set')
 {

From 07a6bb56642f06d32840e2bb2681a84e8b828296 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Jun 2017 12:26:17 +0200
Subject: [PATCH 049/438] More files to delete in migration

---
 htdocs/install/upgrade2.php | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 42c8f50632e..33cfd088ebe 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -413,10 +413,10 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
         {
             // Migrate to add entity value into llx_societe_remise
             migrate_remise_entity($db,$langs,$conf);
-        
+
             // Migrate to add entity value into llx_societe_remise_except
             migrate_remise_except_entity($db,$langs,$conf);
-        
+
             // Reload modules (this must be always and only into last targeted version)
             $listofmodule=array(
                 'MAIN_MODULE_ACCOUNTING'=>'newboxdefonly',
@@ -426,11 +426,11 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
                 'MAIN_MODULE_PRINTING'=>'newboxdefonly',
             );
             migrate_reload_modules($db,$langs,$conf,$listofmodule);
-        
+
             // Reload menus (this must be always and only into last targeted version)
             migrate_reload_menu($db,$langs,$conf,$versionto);
         }
-        
+
         // Can force activation of some module during migration with third paramater = MAIN_MODULE_XXX,MAIN_MODULE_YYY,...
         if ($enablemodules)
         {
@@ -456,8 +456,8 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
         // Actions for all versions (not in database)
         migrate_delete_old_files($db, $langs, $conf);
         migrate_delete_old_dir($db, $langs, $conf);
-        
-        
+
+
         dol_mkdir(DOL_DATA_ROOT.'/bank');
         migrate_directories($db, $langs, $conf, '/banque/bordereau', '/bank/checkdeposits');
     }
@@ -3927,10 +3927,13 @@ function migrate_delete_old_files($db,$langs,$conf)
     DOL_DOCUMENT_ROOT.'/core/modules/mailings/kiwi.modules.php',
     DOL_DOCUMENT_ROOT.'/core/modules/facture/pdf_crabe.modules.php',
     DOL_DOCUMENT_ROOT.'/core/modules/facture/pdf_oursin.modules.php',
-    
+
     DOL_DOCUMENT_ROOT.'/compta/facture/class/api_invoice.class.php',
     DOL_DOCUMENT_ROOT.'/commande/class/api_commande.class.php',
-    DOL_DOCUMENT_ROOT.'/user/class/api_user.class.php'
+    DOL_DOCUMENT_ROOT.'/user/class/api_user.class.php',
+    DOL_DOCUMENT_ROOT.'/product/class/api_product.class.php',
+    DOL_DOCUMENT_ROOT.'/societe/class/api_contact.class.php',
+    DOL_DOCUMENT_ROOT.'/societe/class/api_thirdparty.class.php'
     );
 
     foreach ($filetodeletearray as $filetodelete)

From 733d1caac6578da19a998b7a206e799c3ebdea9e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Jun 2017 12:37:16 +0200
Subject: [PATCH 050/438] Correct usage of parameter 'none' in GETPOST

---
 htdocs/admin/chequereceipts.php           |  2 +-
 htdocs/admin/commande.php                 |  2 +-
 htdocs/admin/contract.php                 |  2 +-
 htdocs/admin/expedition.php               |  2 +-
 htdocs/admin/expensereport.php            |  2 +-
 htdocs/admin/facture.php                  |  2 +-
 htdocs/admin/fichinter.php                |  2 +-
 htdocs/admin/livraison.php                |  2 +-
 htdocs/admin/payment.php                  | 17 ++---------------
 htdocs/admin/propal.php                   |  2 +-
 htdocs/admin/supplier_invoice.php         |  2 +-
 htdocs/admin/supplier_order.php           |  2 +-
 htdocs/admin/supplier_proposal.php        |  2 +-
 htdocs/don/admin/donation.php             |  4 ++--
 htdocs/install/mysql/migration/repair.sql |  2 +-
 15 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/htdocs/admin/chequereceipts.php b/htdocs/admin/chequereceipts.php
index bc55eb4b9f6..f88dfc6f5a6 100644
--- a/htdocs/admin/chequereceipts.php
+++ b/htdocs/admin/chequereceipts.php
@@ -77,7 +77,7 @@ if ($action == 'setmod')
 
 if ($action == 'set_BANK_CHEQUERECEIPT_FREE_TEXT')
 {
-	$freetext = GETPOST('BANK_CHEQUERECEIPT_FREE_TEXT');	// No alpha here, we want exact string
+	$freetext = GETPOST('BANK_CHEQUERECEIPT_FREE_TEXT','none');	// No alpha here, we want exact string
 
     $res = dolibarr_set_const($db, "BANK_CHEQUERECEIPT_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
 
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 3f3c997b0d8..f4104e2007f 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -180,7 +180,7 @@ else if ($action == 'set_COMMANDE_DRAFT_WATERMARK')
 
 else if ($action == 'set_ORDER_FREE_TEXT')
 {
-	$freetext = GETPOST("ORDER_FREE_TEXT");	// No alpha here, we want exact string
+	$freetext = GETPOST("ORDER_FREE_TEXT",'none');	// No alpha here, we want exact string
 
 	$res = dolibarr_set_const($db, "ORDER_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
 
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index 206d9020022..7f9465b6f65 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -158,7 +158,7 @@ else if ($action == 'setmod')
 
 else if ($action == 'set_other')
 {
-	$freetext= GETPOST('CONTRACT_FREE_TEXT');	// No alpha here, we want exact string
+	$freetext= GETPOST('CONTRACT_FREE_TEXT','none');	// No alpha here, we want exact string
 	$res1 = dolibarr_set_const($db, "CONTRACT_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
 
 	$draft= GETPOST('CONTRACT_DRAFT_WATERMARK','alpha');
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 6182538f820..12d0b7951d5 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -78,7 +78,7 @@ if ($action == 'updateMask')
 
 else if ($action == 'set_param')
 {
-	$freetext=GETPOST('SHIPPING_FREE_TEXT');	// No alpha here, we want exact string
+	$freetext=GETPOST('SHIPPING_FREE_TEXT','none');	// No alpha here, we want exact string
 	$res = dolibarr_set_const($db, "SHIPPING_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
 	if ($res <= 0)
 	{
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index 6c659181c4c..24aaeede5b4 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -168,7 +168,7 @@ else if ($action == 'setoptions')
 {
     $db->begin();
 
-	$freetext= GETPOST('EXPENSEREPORT_FREE_TEXT');	// No alpha here, we want exact string
+	$freetext= GETPOST('EXPENSEREPORT_FREE_TEXT','none');	// No alpha here, we want exact string
 	$res1 = dolibarr_set_const($db, "EXPENSEREPORT_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
 
 	$draft= GETPOST('EXPENSEREPORT_DRAFT_WATERMARK','alpha');
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 115a685a3f2..df371639cde 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -206,7 +206,7 @@ if ($action == 'set_FACTURE_DRAFT_WATERMARK')
 
 if ($action == 'set_INVOICE_FREE_TEXT')
 {
-	$freetext = GETPOST('INVOICE_FREE_TEXT');	// No alpha here, we want exact string
+	$freetext = GETPOST('INVOICE_FREE_TEXT','none');	// No alpha here, we want exact string
 
     $res = dolibarr_set_const($db, "INVOICE_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
 
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 25c46164783..43ad7ad8178 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -160,7 +160,7 @@ else if ($action == 'setmod')
 
 else if ($action == 'set_FICHINTER_FREE_TEXT')
 {
-	$freetext= GETPOST('FICHINTER_FREE_TEXT');	// No alpha here, we want exact string
+	$freetext= GETPOST('FICHINTER_FREE_TEXT','none');	// No alpha here, we want exact string
 	$res = dolibarr_set_const($db, "FICHINTER_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
 
 	if (! $res > 0) $error++;
diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
index ef73ec7a757..0136f6cc9d9 100644
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -74,7 +74,7 @@ if ($action == 'updateMask')
 
 if ($action == 'set_DELIVERY_FREE_TEXT')
 {
-    $free=GETPOST('DELIVERY_FREE_TEXT');	// No alpha here, we want exact string
+    $free=GETPOST('DELIVERY_FREE_TEXT','none');	// No alpha here, we want exact string
     $res=dolibarr_set_const($db, "DELIVERY_FREE_TEXT",$free,'chaine',0,'',$conf->entity);
 
     if (! $res > 0) $error++;
diff --git a/htdocs/admin/payment.php b/htdocs/admin/payment.php
index 88f2d8cd1c1..061b9d50f6a 100644
--- a/htdocs/admin/payment.php
+++ b/htdocs/admin/payment.php
@@ -71,7 +71,7 @@ if ($action == 'setmod')
 
 if ($action == 'setparams')
 {
-	$freetext = GETPOST('FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS');	// No alpha here, we want exact string
+	$freetext = GETPOST('FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS','none');	// No alpha here, we want exact string
 
 	$res = dolibarr_set_const($db, "FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS",$freetext,'chaine',0,'',$conf->entity);
 
@@ -81,24 +81,11 @@ if ($action == 'setparams')
 	{
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-	
-	/*
-	$freetext = GETPOST('INVOICE_AUTO_FILLJS');	// No alpha here, we want exact string
-	
-	$res = dolibarr_set_const($db, "INVOICE_AUTO_FILLJS",$freetext,'chaine',0,'',$conf->entity);
-	
-	if (! $res > 0) $error++;
-	
-	if ($error)
-	{
-	    setEventMessages($langs->trans("Error"), null, 'errors');
-	}*/
-
 	if (! $error)
 	{
 	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	
+
 }
 
 
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index 9fa8dad0c0c..8acbf19f939 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -135,7 +135,7 @@ if ($action == 'set_PROPALE_DRAFT_WATERMARK')
 
 if ($action == 'set_PROPOSAL_FREE_TEXT')
 {
-	$freetext = GETPOST('PROPOSAL_FREE_TEXT');	// No alpha here, we want exact string
+	$freetext = GETPOST('PROPOSAL_FREE_TEXT','none');	// No alpha here, we want exact string
 
 	$res = dolibarr_set_const($db, "PROPOSAL_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
 
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index 549bb93809b..17501cdb4f9 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -172,7 +172,7 @@ if ($action == 'addcat')
 
 if ($action == 'set_SUPPLIER_INVOICE_FREE_TEXT')
 {
-    $freetext = GETPOST('SUPPLIER_INVOICE_FREE_TEXT');	// No alpha here, we want exact string
+    $freetext = GETPOST('SUPPLIER_INVOICE_FREE_TEXT','none');	// No alpha here, we want exact string
 
     $res = dolibarr_set_const($db, "SUPPLIER_INVOICE_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
 
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index 55e4e4b3d07..13499af551a 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -169,7 +169,7 @@ else if ($action == 'addcat')
 
 else if ($action == 'set_SUPPLIER_ORDER_OTHER')
 {
-    $freetext = GETPOST('SUPPLIER_ORDER_FREE_TEXT');	// No alpha here, we want exact string
+    $freetext = GETPOST('SUPPLIER_ORDER_FREE_TEXT','none');	// No alpha here, we want exact string
 	$doubleapproval = GETPOST('SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED','alpha');
 	$doubleapproval = price2num($doubleapproval );
 
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index 210d601c33c..8c52ee83dda 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -132,7 +132,7 @@ if ($action == 'set_SUPPLIER_PROPOSAL_DRAFT_WATERMARK')
 
 if ($action == 'set_SUPPLIER_PROPOSAL_FREE_TEXT')
 {
-	$freetext = GETPOST('SUPPLIER_PROPOSAL_FREE_TEXT');	// No alpha here, we want exact string
+	$freetext = GETPOST('SUPPLIER_PROPOSAL_FREE_TEXT','none');	// No alpha here, we want exact string
 
 	$res = dolibarr_set_const($db, "SUPPLIER_PROPOSAL_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
 
diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php
index c8d8be2461d..2ca1cba1083 100644
--- a/htdocs/don/admin/donation.php
+++ b/htdocs/don/admin/donation.php
@@ -121,7 +121,7 @@ else if ($action == 'del')
 // Options
 if ($action == 'set_DONATION_ACCOUNTINGACCOUNT')
 {
-	$account = GETPOST('DONATION_ACCOUNTINGACCOUNT');	// No alpha here, we want exact string
+	$account = GETPOST('DONATION_ACCOUNTINGACCOUNT','alpha');
 
     $res = dolibarr_set_const($db, "DONATION_ACCOUNTINGACCOUNT",$account,'chaine',0,'',$conf->entity);
 
@@ -139,7 +139,7 @@ if ($action == 'set_DONATION_ACCOUNTINGACCOUNT')
 
 if ($action == 'set_DONATION_MESSAGE')
 {
-	$freemessage = GETPOST('DONATION_MESSAGE');	// No alpha here, we want exact string
+	$freemessage = GETPOST('DONATION_MESSAGE','none');	// No alpha here, we want exact string
 
     $res = dolibarr_set_const($db, "DONATION_MESSAGE",$freemessage,'chaine',0,'',$conf->entity);
 
diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index 6ff7356847f..0277f7e996b 100755
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -28,7 +28,7 @@
 
 
 
--- Requests to clean corrupted database
+-- Requests to clean corrupted data
 
 
 UPDATE llx_user set api_key = null where api_key = '';

From 7ad92c3a4d52c7dc0f456d92bed4756ba0efb079 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Jun 2017 13:32:20 +0200
Subject: [PATCH 051/438] Fix new generic substitution system

---
 htdocs/admin/contract.php                     |  2 +-
 htdocs/contrat/class/contrat.class.php        | 23 +++++++-------
 htdocs/core/lib/functions.lib.php             | 30 ++++++++++---------
 htdocs/core/lib/pdf.lib.php                   | 17 ++++++-----
 .../contract/doc/pdf_strato.modules.php       | 17 ++++++-----
 5 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index 7f9465b6f65..e2f865f61f6 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -474,7 +474,7 @@ print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 $var=true;
 
-$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray=pdf_getSubstitutionArray($langs, array('objectamount'));
 $substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
 $htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
 foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index db6464edb6a..b11e19d114b 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -46,7 +46,7 @@ class Contrat extends CommonObject
 	public $fk_element='fk_contrat';
 	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
     public $picto='contract';
-    
+
 	/**
 	 * {@inheritdoc}
 	 */
@@ -530,7 +530,7 @@ class Contrat extends CommonObject
 				$this->fin_validite				= $this->db->jdate($result["fin_validite"]);
 				$this->date_cloture				= $this->db->jdate($result["date_cloture"]);
 
-				
+
 				$this->user_author_id			= $result["fk_user_author"];
 
 				$this->commercial_signature_id	= $result["fk_commercial_signature"];
@@ -613,7 +613,7 @@ class Contrat extends CommonObject
 
 		$this->lines=array();
         $pos = 0;
-		
+
 		// Selectionne les lignes contrats liees a un produit
 		$sql = "SELECT p.label as product_label, p.description as product_desc, p.ref as product_ref,";
 		$sql.= " d.rowid, d.fk_contrat, d.statut, d.description, d.price_ht, d.vat_src_code, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.localtax1_type, d.localtax2_type, d.qty, d.remise_percent, d.subprice, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht,";
@@ -1858,7 +1858,7 @@ class Contrat extends CommonObject
 		$url = DOL_URL_ROOT.'/contrat/card.php?id='.$this->id;
         $picto = 'contract';
         $label = '';
-        
+
         if ($user->rights->contrat->lire) {
             $label = '<u>'.$langs->trans("ShowContract").'</u>';
             $label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
@@ -1874,7 +1874,7 @@ class Contrat extends CommonObject
                 $label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
             }
         }
-        
+
         $linkclose='';
         if (empty($notooltip) && $user->rights->contrat->lire)
         {
@@ -1890,7 +1890,7 @@ class Contrat extends CommonObject
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart.=$linkclose.'>';
 		$linkend='</a>';
-		
+
 		if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
 		if ($withpicto && $withpicto != 2) $result.=' ';
 		$result.=$linkstart.$this->ref.$linkend;
@@ -2225,7 +2225,11 @@ class Contrat extends CommonObject
 			$line->total_ht=90;
 			$line->total_ttc=107.64;	// 90 * 1.196
 			$line->total_tva=17.64;
-            if ($num_prods > 0)
+			$line->date_ouverture = dol_now() - 200000;
+			$line->date_ouverture_prevue = dol_now() - 500000;
+			$line->date_fin_validite = dol_now() + 500000;
+			$line->date_cloture = dol_now() - 100000;
+			if ($num_prods > 0)
             {
 				$prodid = mt_rand(1, $num_prods);
 				$line->fk_product=$prodids[$prodid];
@@ -2233,11 +2237,6 @@ class Contrat extends CommonObject
 			$this->lines[$xnbp]=$line;
 			$xnbp++;
 		}
-
-		$this->amount_ht      = $xnbp*100;
-		$this->total_ht       = $xnbp*100;
-		$this->total_tva      = $xnbp*19.6;
-		$this->total_ttc      = $xnbp*119.6;
 	}
 
 	/**
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index a18b9e14110..dd4f720b378 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -239,7 +239,7 @@ function dol_shutdown()
 /**
  *  Return value of a param into GET or POST supervariable.
  *  Use the property $user->default_values[path]['creatform'] and/or $user->default_values[path]['filters'] and/or $user->default_values[path]['sortorder']
- *  Note: The property $user->default_values is loaded by the main when loading the user.
+ *  Note: The property $user->default_values is loaded by main.php when loading the user.
  *
  *  @param	string	$paramname   Name of parameter to found
  *  @param	string	$check	     Type of check
@@ -359,32 +359,34 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 
 	if (! empty($check))
 	{
-	    // Replace vars like __DAY__, __MONTH__, __YEAR__, __MYCOUNTRYID__, __USERID__, __ENTITYID__, ...
-	    if (! is_array($out))
+	    // Substitution variables for GETPOST (used to get final url with variable parameters or final default value with variable paramaters)
+	    // Example of variables: __DAY__, __MONTH__, __YEAR__, __MYCOUNTRYID__, __USERID__, __ENTITYID__, ...
+	    // We do this only if var is a GET. If it is a POST, may be we want to post the text with vars as the setup text.
+	    if (! is_array($out) && empty($_POST[$paramname]))
 	    {
 	        $maxloop=20; $loopnb=0;    // Protection against infinite loop
 	        while (preg_match('/__([A-Z0-9]+_?[A-Z0-9]+)__/i', $out, $reg) && ($loopnb < $maxloop))    // Detect '__ABCDEF__' as key 'ABCDEF' and '__ABC_DEF__' as key 'ABC_DEF'. Detection is also correct when 2 vars are side by side.
 	        {
 	            $loopnb++; $newout = '';
 
-    	        if ($reg[1] == 'DAY')       { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['mday']; }
-    	        elseif ($reg[1] == 'MONTH') { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['mon'];  }
-    	        elseif ($reg[1] == 'YEAR')  { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['year']; }
+    	        if ($reg[1] == 'DAY')                { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['mday']; }
+    	        elseif ($reg[1] == 'MONTH')          { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['mon'];  }
+    	        elseif ($reg[1] == 'YEAR')           { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['year']; }
     	    	elseif ($reg[1] == 'PREVIOUS_DAY')   { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_prev_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; }
     	        elseif ($reg[1] == 'PREVIOUS_MONTH') { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_prev_month($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['month']; }
     	        elseif ($reg[1] == 'PREVIOUS_YEAR')  { $tmp=dol_getdate(dol_now(), true); $newout = ($tmp['year'] - 1); }
-    	    	elseif ($reg[1] == 'NEXT_DAY')   { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_next_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; }
-    	        elseif ($reg[1] == 'NEXT_MONTH') { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_next_month($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['month']; }
-    	        elseif ($reg[1] == 'NEXT_YEAR')  { $tmp=dol_getdate(dol_now(), true); $newout = ($tmp['year'] + 1); }
-    	        elseif ($reg[1] == 'MYCOUNTRYID')
+    	    	elseif ($reg[1] == 'NEXT_DAY')       { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_next_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; }
+    	        elseif ($reg[1] == 'NEXT_MONTH')     { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_next_month($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['month']; }
+    	        elseif ($reg[1] == 'NEXT_YEAR')      { $tmp=dol_getdate(dol_now(), true); $newout = ($tmp['year'] + 1); }
+    	        elseif ($reg[1] == 'MYCOUNTRY_ID' || $reg[1] == 'MYCOUNTRYID')
     	        {
     	            $newout = $mysoc->country_id;
     	        }
-    	        elseif ($reg[1] == 'USERID')
+    	        elseif ($reg[1] == 'USER_ID' || $reg[1] == 'USERID')
     	        {
     	            $newout = $user->id;
     	        }
-    	    	elseif ($reg[1] == 'SUPERVISORID')
+    	    	elseif ($reg[1] == 'SUPERVISOR_ID' || $reg[1] == 'SUPERVISORID')
     	        {
     	            $newout = $user->fk_user;
     	        }
@@ -5020,7 +5022,7 @@ function dol_concatdesc($text1,$text2,$forxml=false)
  *
  * @param	Translate	$outputlangs	Output language
  * @param   int         $onlykey        Do not calculate heavy values of keys (performance enhancement when we need only the keys)
- * @param   array       $exclude        Array of family keys we want to exclude. For example array('mycompany', 'object', 'date', 'user', ...)
+ * @param   array       $exclude        Array of family keys we want to exclude. For example array('mycompany', 'objectamount', 'date', 'user', ...)
  * @param   Object      $object         Object for keys on object
  * @return	array						Array of substitutions
  */
@@ -5045,7 +5047,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey=0, $exclude=null, $ob
             '__MYCOMPANY_COUNTRY_ID__' => $mysoc->country_id
         ));
     }
-    if (empty($exclude) || ! in_array('object', $exclude))
+    if (empty($exclude) || ! in_array('objectamount', $exclude))
     {
         if (is_object($object))       // For backward compatibility
         {
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 8c48e2301e3..9220725dc8e 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -591,12 +591,13 @@ function pdf_pagehead(&$pdf,$outputlangs,$page_height)
  *   	Return array of possible substitutions for PDF content (without external module substitutions).
  *
  *		@param	Translate	$outputlangs	Output language
+ *      @param  array       $exclude        Array of family keys we want to exclude. For example array('mycompany', 'object', 'date', 'user', ...)
  *      @param  Object      $object         Object
  *      @return	array						Array of substitutions
  */
-function pdf_getSubstitutionArray($outputlangs, $object=null)
+function pdf_getSubstitutionArray($outputlangs, $exclude=null, $object=null)
 {
-    $substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+    $substitutionarray = getCommonSubstitutionArray($outputlangs, 0, $exclude, $object);
     $substitutionarray['__FROM_NAME__']='__FROM_NAME__';
     $substitutionarray['__FROM_EMAIL__']='__FROM_EMAIL__';
     return $substitutionarray;
@@ -625,9 +626,9 @@ function pdf_watermark(&$pdf, $outputlangs, $h, $w, $unit, $text)
 	elseif ($unit=='in') $k=72;
 
 	// Make substitution
-	$substitutionarray=pdf_getSubstitutionArray($outputlangs,null);
-	complete_substitutions_array($substitutionarray,$outputlangs,null);
-	$text=make_substitutions($text,$substitutionarray,$outputlangs);
+	$substitutionarray=pdf_getSubstitutionArray($outputlangs, null, null);
+	complete_substitutions_array($substitutionarray, $outputlangs, null);
+	$text=make_substitutions($text, $substitutionarray, $outputlangs);
 	$text=$outputlangs->convToOutputCharset($text);
 
 	$savx=$pdf->getX(); $savy=$pdf->getY();
@@ -854,12 +855,12 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
 	// Line of free text
 	if (empty($hidefreetext) && ! empty($conf->global->$paramfreetext))
 	{
-		$substitutionarray=pdf_getSubstitutionArray($outputlangs, $object);
+		$substitutionarray=pdf_getSubstitutionArray($outputlangs, null, $object);
 		// More substitution keys
 		$substitutionarray['__FROM_NAME__']=$fromcompany->name;
 		$substitutionarray['__FROM_EMAIL__']=$fromcompany->email;
-		complete_substitutions_array($substitutionarray,$outputlangs,$object);
-		$newfreetext=make_substitutions($conf->global->$paramfreetext,$substitutionarray,$outputlangs);
+		complete_substitutions_array($substitutionarray, $outputlangs, $object);
+		$newfreetext=make_substitutions($conf->global->$paramfreetext, $substitutionarray, $outputlangs);
 		$line.=$outputlangs->convToOutputCharset($newfreetext);
 	}
 
diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
index 411b3deadf3..c06882fa121 100644
--- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php
+++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
@@ -294,22 +294,25 @@ class pdf_strato extends ModelePDFContract
 						} else {
 							$datere = $langs->trans("Unknown");
 						}
-						
+
 						$txtpredefinedservice='';
-                        $txtpredefinedservice = $objectligne->product_ref;
+                        $txtpredefinedservice = $objectligne->product_label;
                         if ($objectligne->product_label)
                         {
                         	$txtpredefinedservice .= ' - ';
                         	$txtpredefinedservice .= $objectligne->product_label;
                         }
 
-						$txt='<strong>'.dol_htmlentitiesbr($outputlangs->transnoentities("DateStartPlannedShort")." : ".$datei." - ".$outputlangs->transnoentities("DateEndPlanned")." : ".$datee,1,$outputlangs->charset_output).'</strong>';
+						$desc=dol_htmlentitiesbr($objectligne->desc,1);   // Desc (not empty for free lines)
+						$txt='';
+						$txt.=$outputlangs->transnoentities("Quantity").' : <strong>'.$objectligne->qty.'</strong> - '.$outputlangs->transnoentities("UnitPrice").' : <strong>'.price($objectligne->subprice).'</strong>';   // Desc (not empty for free lines)
 						$txt.='<br>';
-						$txt.='<strong>'.dol_htmlentitiesbr($outputlangs->transnoentities("DateStartRealShort")." : ".$daters,1,$outputlangs->charset_output);
-						if ($objectligne->date_cloture) $txt.=dol_htmlentitiesbr(" - ".$outputlangs->transnoentities("DateEndRealShort")." : ".$datere,1,$outputlangs->charset_output).'</strong>';
-						$desc=dol_htmlentitiesbr($objectligne->desc,1);
+						$txt.=$outputlangs->transnoentities("DateStartPlannedShort")." : <strong>".$datei."</strong> - ".$outputlangs->transnoentities("DateEndPlanned")." : <strong>".$datee.'</strong>';
+						$txt.='<br>';
+                        $txt.=$outputlangs->transnoentities("DateStartRealShort")." : <strong>".$daters.'</strong>';
+						if ($objectligne->date_cloture) $txt.=" - ".$outputlangs->transnoentities("DateEndRealShort")." : '<strong>'".$datere.'</strong>';
 
-						$pdf->writeHTMLCell(0, 0, $curX, $curY, dol_concatdesc($txt,dol_concatdesc($txtpredefinedservice,$desc)), 0, 1, 0);
+						$pdf->writeHTMLCell(0, 0, $curX, $curY, dol_concatdesc($txtpredefinedservice, dol_concatdesc($txt, $desc)), 0, 1, 0);
 
 						$nexY = $pdf->GetY() + 2;
 						$pageposafter=$pdf->getPage();

From f4cdb6b25475ece60ec0bcf8bfcc82bc739d3e5e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Jun 2017 15:33:23 +0200
Subject: [PATCH 052/438] Fix month on 2 chars. Some setup return on 1 char
 only. More phpunit assert.

---
 htdocs/core/lib/functions.lib.php | 173 +++++++++++++++---------------
 test/phpunit/DateLibTest.php      |  39 ++++---
 2 files changed, 109 insertions(+), 103 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index c678e0bc7df..0943bc1a7af 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -102,14 +102,14 @@ function getDoliDBInstance($type, $host, $user, $pass, $name, $port)
 /**
  * 	Get list of entity id to use
  *
- * 	@param	string	$element	Current element 
- *                              'societe', 'socpeople', 'actioncomm', 'agenda', 'resource', 
+ * 	@param	string	$element	Current element
+ *                              'societe', 'socpeople', 'actioncomm', 'agenda', 'resource',
  *                              'product', 'productprice', 'stock',
  *                              'propal', 'facture', 'facture_fourn',
- *                              'categorie', 'bank_account', 'bank_account', 'adherent', 'user',  
+ *                              'categorie', 'bank_account', 'bank_account', 'adherent', 'user',
  *                              'commande', 'commande_fournisseur', 'expedition', 'intervention', 'survey',
  *                              'contract', 'tax', 'expensereport', 'holiday', 'multicurrency', 'project',
- *                              'email_template', 'event',  
+ *                              'email_template', 'event',
  * 	@param	int		$shared		0=Return id of entity, 1=Return id entity + shared entities
  * 	@return	mixed				Entity id(s) to use
  */
@@ -121,7 +121,7 @@ function getEntity($element=false, $shared=0)
 	if ($element == 'actioncomm') $element='agenda';
 	if ($element == 'fichinter')  $element='intervention';
 	if ($element == 'categorie')  $element='category';
-	
+
 	if (is_object($mc))
 	{
 		return $mc->getEntity($element, $shared);
@@ -203,7 +203,7 @@ function getBrowserInfo($user_agent)
 	elseif (preg_match('/opera(\/|\s)([\d\.]*)/i', $user_agent, $reg))    { $name='opera';     $version=$reg[2]; }
 	elseif (preg_match('/(MSIE\s([0-9]+\.[0-9]))|.*(Trident\/[0-9]+.[0-9];\srv:([0-9]+\.[0-9]+))/i', $user_agent, $reg))  { $name='ie'; $version=end($reg); }    // MS products at end
 	elseif (preg_match('/l(i|y)n(x|ks)(\(|\/|\s)*([\d\.]+)/i', $user_agent, $reg)) { $name='lynxlinks'; $version=$reg[4]; }
-	
+
 	if ($tablet) {
 		$layout = 'tablet';
 	} elseif ($phone) {
@@ -268,7 +268,7 @@ function GETPOST($paramname,$check='',$method=0,$filter=NULL,$options=NULL)
 	        {
     	        $tmp=dol_getdate(dol_now(), true);
     	        $out = $tmp['mon'];
-	        }	         
+	        }
 	        elseif ($reg[1] == 'YEAR')
 	        {
 	            $tmp=dol_getdate(dol_now(), true);
@@ -280,7 +280,7 @@ function GETPOST($paramname,$check='',$method=0,$filter=NULL,$options=NULL)
 	            $out = $mysoc->country_id;
 	        }
 	    }
-	     
+
 	    switch ($check)
 	    {
 	        case 'int':
@@ -337,13 +337,13 @@ function GETPOST($paramname,$check='',$method=0,$filter=NULL,$options=NULL)
  *  This prefix is unique for instance and avoid conflict between multi-instances,
  *  even when having two instances with one root dir or two instances in virtual servers
  *
- *  @param  string  $mode       '' or 'email'              
+ *  @param  string  $mode       '' or 'email'
  *  @return	string      		A calculated prefix
  */
 function dol_getprefix($mode='')
 {
     global $conf;
-    
+
     // If MAIL_PREFIX_FOR_EMAIL_ID is set and prefix is for email
     if ($mode == 'email' && ! empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID))
     {
@@ -425,15 +425,15 @@ function dol_buildpath($path, $type=0)
 		if ($type == 1) $res = DOL_URL_ROOT.'/'.$path;			// Standard value
 		if ($type == 2) $res = DOL_MAIN_URL_ROOT.'/'.$path;		// Standard value
 		if ($type == 3) $res = DOL_URL_ROOT.'/'.$path;
-		
+
 		foreach ($conf->file->dol_document_root as $key => $dirroot)	// ex: array(["main"]=>"/home/main/htdocs", ["alt0"]=>"/home/dirmod/htdocs", ...)
 		{
-			if ($key == 'main') 
+			if ($key == 'main')
 			{
 			    if ($type == 3)
 			    {
 			        global $dolibarr_main_url_root;
-			        	
+
 			        // Define $urlwithroot
 			        $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
 			        $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
@@ -460,12 +460,12 @@ function dol_buildpath($path, $type=0)
 					if ($type == 3)
 					{
 					    global $dolibarr_main_url_root;
-					    
+
 					    // Define $urlwithroot
 					    $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
 					    $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
 					    //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
-					    					
+
 					    $res=(preg_match('/^http/i',$conf->file->dol_url_root[$key])?'':$urlwithroot).$conf->file->dol_url_root[$key].'/'.$path;     // Test on start with http is for old conf syntax
 					}
 					break;
@@ -732,13 +732,13 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename='
     		throw new Exception('Incorrect log level');
     	}
     	if ($level > $conf->global->SYSLOG_LEVEL) return;
-    
+
     	// If adding log inside HTML page is required
     	if (! empty($_REQUEST['logtohtml']) && (! empty($conf->global->MAIN_ENABLE_LOG_TO_HTML) || ! empty($conf->global->MAIN_LOGTOHTML)))   // MAIN_LOGTOHTML kept for backward compatibility
     	{
     		$conf->logbuffer[] = dol_print_date(time(),"%Y-%m-%d %H:%M:%S")." ".$message;
     	}
-    
+
     	//TODO: Remove this. MAIN_ENABLE_LOG_INLINE_HTML should be deprecated and use a log handler dedicated to HTML output
     	// If enable html log tag enabled and url parameter log defined, we show output log on HTML comments
     	if (! empty($conf->global->MAIN_ENABLE_LOG_INLINE_HTML) && ! empty($_GET["log"]))
@@ -747,7 +747,7 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename='
     		print $message."\n";
     		print "Log end -->\n";
     	}
-    
+
     	$data = array(
     		'message' => $message,
     		'script' => (isset($_SERVER['PHP_SELF'])? basename($_SERVER['PHP_SELF'],'.php') : false),
@@ -755,7 +755,7 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename='
     		'user' => ((is_object($user) && $user->id) ? $user->login : false),
     		'ip' => false
     	);
-    
+
     	if (! empty($_SERVER["REMOTE_ADDR"])) $data['ip'] = $_SERVER['REMOTE_ADDR'];
     	// This is when PHP session is ran inside a web server but not inside a client request (example: init code of apache)
     	else if (! empty($_SERVER['SERVER_ADDR'])) $data['ip'] = $_SERVER['SERVER_ADDR'];
@@ -814,7 +814,7 @@ function dol_get_fiche_head($links=array(), $active='', $title='', $notab=0, $pi
 	global $conf, $langs, $hookmanager;
 
 	if ($notab == -1) $notab = 0;  // For better compatiblity with modules for 6.0
-	
+
 	$out="\n".'<div class="tabs" data-role="controlgroup" data-type="horizontal">'."\n";
 
 	// Show title
@@ -944,7 +944,7 @@ function dol_get_fiche_head($links=array(), $active='', $title='', $notab=0, $pi
 	{
 		$out = $hookmanager->resPrint;
 	}
-	
+
 	return $out;
 }
 
@@ -1003,7 +1003,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 	if ($object->element == 'member')		$modulepart='memberphoto';
 	if ($object->element == 'user')			$modulepart='userphoto';
 	if ($object->element == 'product')		$modulepart='product';
-	
+
 	if ($object->element == 'product')
 	{
 	    $width=80; $cssclass='photoref';
@@ -1011,7 +1011,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 	    $maxvisiblephotos=(isset($conf->global->PRODUCT_MAX_VISIBLE_PHOTO)?$conf->global->PRODUCT_MAX_VISIBLE_PHOTO:5);
 		if ($conf->browser->phone) $maxvisiblephotos=1;
 		if ($showimage) $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos($conf->product->multidir_output[$object->entity],'small',$maxvisiblephotos,0,0,0,$width,0).'</div>';
-        else 
+        else
         {
 			if (!empty($conf->global->PRODUCT_NODISPLAYIFNOPHOTO)) {
 				$nophoto='';
@@ -1023,11 +1023,11 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 			}
         }
 	}
-	else 
+	else
 	{
-        if ($showimage) 
+        if ($showimage)
         {
-            if ($modulepart != 'unknown') 
+            if ($modulepart != 'unknown')
             {
                 $phototoshow = $form->showphoto($modulepart,$object,0,0,0,'photoref','small',1,0,$maxvisiblephotos);
                 if ($phototoshow)
@@ -1040,7 +1040,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
             elseif ($conf->browser->layout != 'phone')      // Show No photo link (picto of pbject)
             {
                 $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">';
-                if ($object->element == 'action') 
+                if ($object->element == 'action')
                 {
                     $cssclass='photorefcenter';
                     $nophoto=img_picto('', 'title_agenda', '', false, 1);
@@ -1061,7 +1061,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 	if ($showbarcode) $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">'.$form->showbarcode($object).'</div>';
 	if ($object->element == 'societe' && ! empty($conf->use_javascript_ajax) && $user->rights->societe->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
 		$morehtmlstatus.=ajax_object_onoff($object, 'status', 'status', 'InActivity', 'ActivityCeased');
-	} 
+	}
 	elseif ($object->element == 'product')
 	{
 	    //$morehtmlstatus.=$langs->trans("Status").' ('.$langs->trans("Sell").') ';
@@ -1081,39 +1081,39 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 	elseif ($object->element == 'facture' || $object->element == 'invoice' || $object->element == 'invoice_supplier')
 	{
 	    $tmptxt=$object->getLibStatut(6, $object->totalpaye);
-	    if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout=='phone') $tmptxt=$object->getLibStatut(5, $object->totalpaye); 
+	    if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout=='phone') $tmptxt=$object->getLibStatut(5, $object->totalpaye);
 		$morehtmlstatus.=$tmptxt;
 	}
 	elseif ($object->element == 'chargesociales')
 	{
 	    $tmptxt=$object->getLibStatut(6, $object->totalpaye);
-	    if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout=='phone') $tmptxt=$object->getLibStatut(5, $object->totalpaye); 
+	    if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout=='phone') $tmptxt=$object->getLibStatut(5, $object->totalpaye);
 		$morehtmlstatus.=$tmptxt;
 	}
 	elseif ($object->element == 'loan')
 	{
 	    $tmptxt=$object->getLibStatut(6, $object->totalpaye);
-	    if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout=='phone') $tmptxt=$object->getLibStatut(5, $object->totalpaye); 
+	    if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout=='phone') $tmptxt=$object->getLibStatut(5, $object->totalpaye);
 		$morehtmlstatus.=$tmptxt;
 	}
-	elseif ($object->element == 'contrat') 
+	elseif ($object->element == 'contrat')
 	{
         if ($object->statut==0) $morehtmlstatus.=$object->getLibStatut(2);
         else $morehtmlstatus.=$object->getLibStatut(4);
 	}
 	else { // Generic case
 	    $tmptxt=$object->getLibStatut(6);
-	    if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout=='phone') $tmptxt=$object->getLibStatut(5); 
+	    if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout=='phone') $tmptxt=$object->getLibStatut(5);
 		$morehtmlstatus.=$tmptxt;
 	}
 	if (! empty($object->name_alias)) $morehtmlref.='<div class="refidno">'.$object->name_alias.'</div>';      // For thirdparty
-	
+
 	if ($object->element == 'product' || $object->element == 'bank_account')
 	{
 		if(! empty($object->label)) $morehtmlref.='<div class="refidno">'.$object->label.'</div>';
 	}
 
-	if ($object->element != 'product' && $object->element != 'bookmark') 
+	if ($object->element != 'product' && $object->element != 'bookmark')
 	{
     	$morehtmlref.='<div class="refidno">';
     	$morehtmlref.=$object->getBannerAddress('refaddress',$object);
@@ -1125,7 +1125,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 		$morehtmlref.=$langs->trans("TechnicalID").': '.$object->id;
 		$morehtmlref.='</div>';
 	}
-	
+
 	print '<div class="'.($onlybanner?'arearefnobottom ':'arearef ').'heightref valignmiddle" width="100%">';
 	print $form->showrefnav($object, $paramid, $morehtml, $shownav, $fieldid, $fieldref, $morehtmlref, $moreparam, $nodbprefix, $morehtmlleft, $morehtmlstatus, $morehtmlright);
 	print '</div>';
@@ -1301,9 +1301,9 @@ function dol_print_date($time,$format='',$tzoutput='tzserver',$outputlangs='',$e
 	$reduceformat=(! empty($conf->dol_optimize_smallscreen) && in_array($format,array('day','dayhour')))?1:0;
 	$formatwithoutreduce = preg_replace('/reduceformat/','',$format);
 	if ($formatwithoutreduce != $format) { $format = $formatwithoutreduce; $reduceformat=1; }  // so format 'dayreduceformat' is processed like day
-    
+
 	// Change predefined format into computer format. If found translation in lang file we use it, otherwise we use default.
-	// TODO Add format daysmallyear and dayhoursmallyear 
+	// TODO Add format daysmallyear and dayhoursmallyear
 	if ($format == 'day')				$format=($outputlangs->trans("FormatDateShort")!="FormatDateShort"?$outputlangs->trans("FormatDateShort"):$conf->format_date_short);
 	else if ($format == 'hour')			$format=($outputlangs->trans("FormatHourShort")!="FormatHourShort"?$outputlangs->trans("FormatHourShort"):$conf->format_hour_short);
 	else if ($format == 'hourduration')	$format=($outputlangs->trans("FormatHourShortDuration")!="FormatHourShortDuration"?$outputlangs->trans("FormatHourShortDuration"):$conf->format_hour_short_duration);
@@ -1375,7 +1375,8 @@ function dol_print_date($time,$format='',$tzoutput='tzserver',$outputlangs='',$e
 	if (preg_match('/__b__/i',$format))
 	{
 		// Here ret is string in PHP setup language (strftime was used). Now we convert to $outputlangs.
-		$month=adodb_strftime('%m',$time+$offsettz+$offsetdst);					// TODO Remove this
+		$month=adodb_strftime('%m',$time+$offsettz+$offsetdst);					// TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
+        $month=sprintf("%02d", $month);                             // $month may be return with format '06' on some installation and '6' on other, so we force it to '06'.
 		if ($encodetooutput)
 		{
 			$monthtext=$outputlangs->transnoentities('Month'.$month);
@@ -1805,7 +1806,7 @@ function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$sep
 	        $newphone=($separ!=''?'(':'').substr($newphone,0,3).($separ!=''?')':'').$separ.substr($newphone,3,3).($separ!=''?'-':'').substr($newphone,6,4);
 	    }
 	}
-	
+
 	if (! empty($addlink))	// Link on phone number (+ link to add action if conf->global->AGENDA_ADDACTIONFORPHONE set)
 	{
 		if (! empty($conf->browser->phone) || (! empty($conf->clicktodial->enabled) && ! empty($conf->global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS)))	// If phone or option for, we use link of phone
@@ -1935,7 +1936,7 @@ function dol_user_country()
  *  @param  int		$mode       thirdparty|contact|member|other
  *  @param  int		$id         Id of object
  *  @param	int		$noprint	No output. Result is the function return
- *  @param  string  $charfornl  Char to use instead of nl2br. '' means we use a standad nl2br.  
+ *  @param  string  $charfornl  Char to use instead of nl2br. '' means we use a standad nl2br.
  *  @return string|void			Nothing if noprint is 0, formatted address if noprint is 1
  *  @see dol_format_address
  */
@@ -1956,7 +1957,7 @@ function dol_print_address($address, $htmlid, $mode, $id, $noprint=0, $charfornl
         {
             if (empty($charfornl)) $out.=nl2br($address);
             else $out.=preg_replace('/[\r\n]+/', $charfornl, $address);
-            
+
             $showgmap=$showomap=0;
 
             // TODO Add a hook here
@@ -2084,7 +2085,7 @@ function dol_print_graph($htmlid,$width,$height,$data,$showlegend=0,$type='pie',
 	    print '<div class="nographyettext">'.$langs->trans("NotEnoughDataYet").'</div>';
 	    return;
 	}
-	
+
 	if (empty($conf->use_javascript_ajax)) return;
 	$jsgraphlib='flot';
 	$datacolor=array();
@@ -2253,7 +2254,7 @@ function dol_trunc($string,$size=40,$trunc='right',$stringencoding='UTF-8',$nodo
 	global $conf;
 
 	if ($size==0 || ! empty($conf->global->MAIN_DISABLE_TRUNC)) return $string;
-	
+
 	if (empty($stringencoding)) $stringencoding='UTF-8';
 	// reduce for small screen
 	if ($conf->dol_optimize_smallscreen==1 && $display==1) $size = round($size/3);
@@ -3206,7 +3207,7 @@ function load_fiche_titre($titre, $morehtmlright='', $picto='title_generic.png',
  *	@param	string	    $options         	More parameters for links ('' by default, does not include sortfield neither sortorder)
  *	@param	string    	$sortfield       	Field to sort on ('' by default)
  *	@param	string	    $sortorder       	Order to sort ('' by default)
- *	@param	string	    $center          	String in the middle ('' by default). We often find here string $massaction comming from $form->selectMassAction() 
+ *	@param	string	    $center          	String in the middle ('' by default). We often find here string $massaction comming from $form->selectMassAction()
  *	@param	int		    $num				Number of records found by select with limit+1
  *	@param	int|string  $totalnboflines		Total number of records/lines for all pages (if known). Use a negative value of number to not show number. Use '' if unknown.
  *	@param	string	    $picto				Icon to use before title (should be a 32x32 transparent png file)
@@ -3220,11 +3221,11 @@ function load_fiche_titre($titre, $morehtmlright='', $picto='title_generic.png',
 function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $sortorder='', $center='', $num=-1, $totalnboflines='', $picto='title_generic.png', $pictoisfullpath=0, $morehtml='', $morecss='', $limit=-1, $hideselectlimit=0)
 {
 	global $conf,$langs;
-	
+
 	$savlimit = $limit;
     $savtotalnboflines = $totalnboflines;
     $totalnboflines=abs($totalnboflines);
-    
+
 	if ($picto == 'setup') $picto='title_setup.png';
 	if (($conf->browser->name == 'ie') && $picto=='title_generic.png') $picto='title.gif';
 	if ($limit < 0) $limit = $conf->liste_limit;
@@ -3237,7 +3238,7 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
 		$nextpage = 0;
 	}
 	//print 'totalnboflines='.$totalnboflines.'-savlimit='.$savlimit.'-limit='.$limit.'-num='.$num.'-nextpage='.$nextpage;
-	
+
 	print "\n";
 	print "<!-- Begin title '".$titre."' -->\n";
 	print '<table width="100%" border="0" class="notopnoleftnoright'.($morecss?' '.$morecss:'').'" style="margin-bottom: 6px;"><tr>';
@@ -3338,7 +3339,7 @@ function print_fleche_navigation($page, $file, $options='', $nextpage=0, $betwee
 	    //$pagesizechoices.=',0:'.$langs->trans("All");     // Not yet supported
 	    //$pagesizechoices.=',2:2';
 	    if (! empty($conf->global->MAIN_PAGESIZE_CHOICES)) $pagesizechoices=$conf->global->MAIN_PAGESIZE_CHOICES;
-	     
+
         print '<li class="pagination">';
         print '<select class="flat selectlimit" name="limit" title="'.dol_escape_htmltag($langs->trans("MaxNbOfRecordPerPage")).'">';
         $tmpchoice=explode(',',$pagesizechoices);
@@ -3378,7 +3379,7 @@ function print_fleche_navigation($page, $file, $options='', $nextpage=0, $betwee
             		</script>
                 ';
         }
-        print '</li>';	    
+        print '</li>';
 	}
 	if ($page > 0)
 	{
@@ -3417,7 +3418,7 @@ function print_fleche_navigation($page, $file, $options='', $nextpage=0, $betwee
 function vatrate($rate, $addpercent=false, $info_bits=0, $usestarfornpr=0)
 {
     $morelabel='';
-    
+
     if (preg_match('/%/',$rate))
 	{
 		$rate=str_replace('%','',$rate);
@@ -3620,7 +3621,7 @@ function price2num($amount,$rounding='',$alreadysqlnb=0)
 
 /**
  * Output a dimension with best unit
- *  
+ *
  * @param   float       $dimension      Dimension
  * @param   int         $unit           Unit of dimension (0, -3, ...)
  * @param   string      $type           'weight', 'volume', ...
@@ -3632,16 +3633,16 @@ function price2num($amount,$rounding='',$alreadysqlnb=0)
 function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs, $round=-1, $forceunitoutput='no')
 {
     require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
-    
-    if (($forceunitoutput == 'no' && $dimension < 1/10000) || (is_numeric($forceunitoutput) && $forceunitoutput == -6)) 
+
+    if (($forceunitoutput == 'no' && $dimension < 1/10000) || (is_numeric($forceunitoutput) && $forceunitoutput == -6))
     {
         $dimension = $dimension * 1000000;
-        $unit = $unit - 6; 
+        $unit = $unit - 6;
     }
     elseif (($forceunitoutput == 'no' && $dimension < 1/10) || (is_numeric($forceunitoutput) && $forceunitoutput == -3))
     {
         $dimension = $dimension * 1000;
-        $unit = $unit - 3; 
+        $unit = $unit - 3;
     }
     elseif (($forceunitoutput == 'no' && $dimension > 100000000) || (is_numeric($forceunitoutput) && $forceunitoutput == 6))
     {
@@ -3653,9 +3654,9 @@ function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs, $round=
         $dimension = $dimension / 1000;
         $unit = $unit + 3;
     }
-    
+
     $ret=price($dimension, 0, $outputlangs, 0, 0, $round).' '.measuring_units_string($unit, $type);
-    
+
     return $ret;
 }
 
@@ -3686,12 +3687,12 @@ function get_localtax($vatrate, $local, $thirdparty_buyer="", $thirdparty_seller
         $vatratecleaned = trim($reg[1]);
 	    $vatratecode = $reg[2];
 	}
-	
+
 	/*if ($thirdparty_buyer->country_code != $thirdparty_seller->country_code)
 	{
 		return 0;
 	}*/
-	
+
 	// Some test to guess with no need to make database access
 	if ($mysoc->country_code == 'ES') // For spain localtaxes 1 and 2, tax is qualified if buyer use local taxe
 	{
@@ -3732,7 +3733,7 @@ function get_localtax($vatrate, $local, $thirdparty_buyer="", $thirdparty_seller
 	{
 	    $conf->global->MAIN_GET_LOCALTAXES_VALUES_FROM_THIRDPARTY = 1;
 	}
-	    
+
 	// Search local taxes
 	if (! empty($conf->global->MAIN_GET_LOCALTAXES_VALUES_FROM_THIRDPARTY))
 	{
@@ -3789,7 +3790,7 @@ function get_localtax($vatrate, $local, $thirdparty_buyer="", $thirdparty_seller
    		if ($local==1) return $obj->localtax1;
    		elseif ($local==2) return $obj->localtax2;
 	}
-	
+
 	return 0;
 }
 
@@ -3849,7 +3850,7 @@ function get_localtax_by_third($local)
 
 /**
  *  Get vat rate and npr from id.
- *  You can call getLocalTaxesFromRate after to get other fields 
+ *  You can call getLocalTaxesFromRate after to get other fields
  *
  *  @param	int      $vatrowid			Line ID into vat rate table.
  *  @return	array    	  				array(localtax_type1(1-6 / 0 if not found), rate of localtax1, ...)
@@ -3903,7 +3904,7 @@ function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisi
 	    $vatratecleaned = $reg[1];
 	    $vatratecode = $reg[2];
 	}
-	
+
 	// Search local taxes
 	$sql  = "SELECT t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.accountancy_code_sell, t.accountancy_code_buy";
 	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t";
@@ -3976,7 +3977,7 @@ function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisi
 /**
  *	Return vat rate of a product in a particular selling country or default country vat if product is unknown
  *  Function called by get_default_tva
- *  
+ *
  *  @param	int			$idprod          	Id of product or 0 if not a predefined product
  *  @param  Societe		$thirdparty_seller  Thirdparty with a ->country_code defined (FR, US, IT, ...)
  *	@param	int			$idprodfournprice	Id product_fournisseur_price (for "supplier" order/invoice)
@@ -4014,7 +4015,7 @@ function get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournpr
 		}
 		else
 		{
-			// TODO Read default product vat according to countrycode and product. Vat for couple countrycode/product is a feature not implemeted yet. 
+			// TODO Read default product vat according to countrycode and product. Vat for couple countrycode/product is a feature not implemeted yet.
 			// May be usefull/required if hidden option SERVICE_ARE_ECOMMERCE_200238EC is on
 		}
 	}
@@ -4324,7 +4325,7 @@ function yn($yesno, $case=1, $color=0)
 /**
  *	Return a path to have a directory according to object.
  *  New usage:       $conf->product->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, 'modulepart')
- *  Old usage:       '015' with level 3->"0/1/5/", '015' with level 1->"5/", 'ABC-1' with level 3 ->"0/0/1/" 
+ *  Old usage:       '015' with level 3->"0/1/5/", '015' with level 1->"5/", 'ABC-1' with level 3 ->"0/0/1/"
  *
  *	@param	string	$num            Id of object (deprecated, $object will be used in future)
  *	@param  int		$level		    Level of subdirs to return (1, 2 or 3 levels). (deprecated, global option will be used in future)
@@ -4341,7 +4342,7 @@ function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart)
 	$path = '';
 
 	$arrayforoldpath=array('cheque','user','category','holiday','shipment','supplier_invoice','invoice_supplier','mailing');
-	if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) $arrayforoldpath[]='product';	
+	if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) $arrayforoldpath[]='product';
 	if (! empty($level) && in_array($modulepart, $arrayforoldpath))
 	{
 		// This part should be removed once all code is using "get_exdir" to forge path, with all parameters provided
@@ -4494,7 +4495,7 @@ function dolGetFirstLineOfText($text)
 	{
 		$firstline=preg_replace('/<br[^>]*>.*$/s','',$text);		// The s pattern modifier means the . can match newline characters
 		$firstline=preg_replace('/<div[^>]*>.*$/s','',$firstline);	// The s pattern modifier means the . can match newline characters
-		
+
 	}
 	else
 	{
@@ -5400,7 +5401,7 @@ function picto_from_langcode($codelang)
 }
 
 /**
- *  Complete or removed entries into a head array (used to build tabs). 
+ *  Complete or removed entries into a head array (used to build tabs).
  *  For example, with value added by external modules. Such values are declared into $conf->modules_parts['tab'].
  *  Or by change using hook completeTabsHead
  *
@@ -5430,7 +5431,7 @@ function picto_from_langcode($codelang)
 function complete_head_from_modules($conf,$langs,$object,&$head,&$h,$type,$mode='add')
 {
 	global $hookmanager;
-	
+
 	if (isset($conf->modules_parts['tabs'][$type]) && is_array($conf->modules_parts['tabs'][$type]))
 	{
 		foreach ($conf->modules_parts['tabs'][$type] as $value)
@@ -5496,7 +5497,7 @@ function complete_head_from_modules($conf,$langs,$object,&$head,&$h,$type,$mode=
 			}
 		}
 	}
-	
+
 	// No need to make a return $head. Var is modified as a reference
 	if (! empty($hookmanager))
 	{
@@ -5534,11 +5535,11 @@ function printCommonFooter($zone='private')
 	{
 		print '<!-- Reposition management (does not work if a redirect is done after action of submission) -->'."\n";
     	print '<script type="text/javascript" language="javascript">jQuery(document).ready(function() {'."\n";
-    	
+
     	print '<!-- If page_y set, we set scollbar with it -->'."\n";
     	print "page_y=getParameterByName('page_y', 0);";
     	print "if (page_y > 0) $('html, body').scrollTop(page_y);\n";
-    	
+
     	print '<!-- Set handler to add page_y param on some a href links -->'."\n";
     	print 'jQuery(".reposition").click(function() {
     	           var page_y = $(document).scrollTop();
@@ -5546,7 +5547,7 @@ function printCommonFooter($zone='private')
     	           this.href=this.href+\'&page_y=\'+page_y;
     	           });'."\n";
     	print '});'."\n";
-    	
+
     	if (empty($conf->dol_use_jmobile))
     	{
         	print '<!-- Set handler to switch left menu page -->'."\n";
@@ -5555,10 +5556,10 @@ function printCommonFooter($zone='private')
         	if ($conf->theme == 'md') print "  $('.login_block').toggle();";
         	print '});'."\n";
     	}
-    	
+
     	print '</script>'."\n";
 	}
-	
+
 	// Google Analytics (need Google module)
 	if (! empty($conf->google->enabled) && ! empty($conf->global->MAIN_GOOGLE_AN_ID))
 	{
@@ -5717,9 +5718,9 @@ function natural_search($fields, $value, $mode=0, $nofirstand=0)
     {
     	$value=preg_replace('/([<>=]+)\s+([0-9'.preg_quote($langs->trans("DecimalSeparator"),'/').'\-])/','\1\2',$value);	// Clean string '< 10' into '<10' so we can the explode on space to get all tests to do
     }
-    
+
     $value = preg_replace('/\s*\|\s*/','|', $value);
-    
+
     $crits = explode(' ', $value);
     $res = '';
     if (! is_array($fields)) $fields = array($fields);
@@ -5774,15 +5775,15 @@ function natural_search($fields, $value, $mode=0, $nofirstand=0)
 	            	$tmpcrit=trim($tmpcrit);
 	            	$tmpcrit2=$tmpcrit;
 	            	$tmpbefore='%'; $tmpafter='%';
-	            	if (preg_match('/^[\^\$]/', $tmpcrit)) 
-	            	{ 
+	            	if (preg_match('/^[\^\$]/', $tmpcrit))
+	            	{
 	            	    $tmpbefore='';
-	            	    $tmpcrit2 = preg_replace('/^[\^\$]/', '', $tmpcrit2); 
+	            	    $tmpcrit2 = preg_replace('/^[\^\$]/', '', $tmpcrit2);
 	            	}
-					if (preg_match('/[\^\$]$/', $tmpcrit)) 
-	            	{ 
+					if (preg_match('/[\^\$]$/', $tmpcrit))
+	            	{
 	            	    $tmpafter='';
-	            	    $tmpcrit2 = preg_replace('/[\^\$]$/', '', $tmpcrit2); 
+	            	    $tmpcrit2 = preg_replace('/[\^\$]$/', '', $tmpcrit2);
 	            	}
 	            	$newres .= $tmpbefore;
 	            	$newres .= $db->escape($tmpcrit2);
@@ -5848,7 +5849,7 @@ function getImageFileNameForSize($file, $extName, $extImgTarget='')
 function getAdvancedPreviewUrl($modulepart, $relativepath, $param='')
 {
     global $conf;
-    
+
     if (empty($conf->use_javascript_ajax)) return '';
 
     $mime_preview = array('bmp', 'jpeg', 'png', 'gif', 'tiff', 'pdf', 'plain', 'css');
diff --git a/test/phpunit/DateLibTest.php b/test/phpunit/DateLibTest.php
index 02d85164d79..645993d8659 100644
--- a/test/phpunit/DateLibTest.php
+++ b/test/phpunit/DateLibTest.php
@@ -179,32 +179,32 @@ class DateLibTest extends PHPUnit_Framework_TestCase
         $user=$this->savuser;
         $langs=$this->savlangs;
         $db=$this->savdb;
-    
+
         // With same hours - Tuesday/Wednesday jan 2013
         $date1=dol_mktime(0, 0, 0, 1, 1, 2013);
         $date2=dol_mktime(0, 0, 0, 1, 2, 2013);
-    
+
         $result=num_public_holiday($date1,$date2,'FR',1);
         print __METHOD__." result=".$result."\n";
         $this->assertEquals(1,$result,'NumPublicHoliday for Tuesday/Wednesday jan 2013 for FR');   // 1 closed days
-    
+
         $result=num_public_holiday($date1,$date2,'XX',1);
         print __METHOD__." result=".$result."\n";
         $this->assertEquals(0,$result,'NumPublicHoliday for Tuesday/Wednesday jan 2013 for XX');   // no closed days (country unknown)
-        
+
         // With same hours - Friday/Sunday jan 2013
         $date1=dol_mktime(0, 0, 0, 1, 4, 2013);
         $date2=dol_mktime(0, 0, 0, 1, 6, 2013);
-        
+
         $result=num_public_holiday($date1,$date2,'FR',1);
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals(2,$result,'NumPublicHoliday for FR');   // 1 opened day, 2 closed days 
-        
+        $this->assertEquals(2,$result,'NumPublicHoliday for FR');   // 1 opened day, 2 closed days
+
         $result=num_public_holiday($date1,$date2,'XX',1);
         print __METHOD__." result=".$result."\n";
         $this->assertEquals(2,$result,'NumPublicHoliday for XX');   // 1 opened day, 2 closed days (even if country unknown)
     }
-    
+
     /**
      * testNumOpenDay
      *
@@ -217,32 +217,32 @@ class DateLibTest extends PHPUnit_Framework_TestCase
         $user=$this->savuser;
         $langs=$this->savlangs;
         $db=$this->savdb;
-        
+
         // With same hours - Tuesday/Wednesday jan 2013
         $date1=dol_mktime(0, 0, 0, 1, 1, 2013);
         $date2=dol_mktime(0, 0, 0, 1, 2, 2013);
-        
+
         $result=num_open_day($date1,$date2,0,1,0,'FR');
         print __METHOD__." result=".$result."\n";
         $this->assertEquals(1,$result,'NumOpenDay Tuesday/Wednesday jan 2013 for FR');   // 1 opened days
-        
+
         $result=num_open_day($date1,$date2,0,1,0,'XX');
         print __METHOD__." result=".$result."\n";
         $this->assertEquals(2,$result,'NumOpenDay Tuesday/Wednesday jan 2013 for XX');   // 2 opened days (country unknown)
-        
+
         // With same hours - Friday/Sunday jan 2013
         $date1=dol_mktime(0, 0, 0, 1, 4, 2013);
         $date2=dol_mktime(0, 0, 0, 1, 6, 2013);
-        
+
         $result=num_open_day($date1,$date2,0,1,0,'FR');
         print __METHOD__." result=".$result."\n";
         $this->assertEquals(1,$result,'NumOpenDay for FR');   // 1 opened day, 2 closed
-        
+
         $result=num_open_day($date1,$date2,'XX',1);
         print __METHOD__." result=".$result."\n";
         $this->assertEquals(1,$result,'NumOpenDay for XX');   // 1 opened day, 2 closes (even if country unknown)
     }
-    
+
     /**
      * testConvertTime2Seconds
      *
@@ -335,6 +335,11 @@ class DateLibTest extends PHPUnit_Framework_TestCase
     	print __METHOD__." result=".$result."\n";
     	$this->assertEquals('02/01/1970 00:00',$result);
 
+    	// Check %a and %b format for fr_FR
+    	$result=dol_print_date(0,'%a %b %B',true,$outputlangs);
+    	print __METHOD__." result=".$result."\n";
+    	$this->assertEquals('Jeu Jan. Janvier',$result);
+
     	// Check day format for en_US
     	$outputlangs=new Translate('',$conf);
     	$outputlangs->setDefaultLang('en_US');
@@ -345,9 +350,9 @@ class DateLibTest extends PHPUnit_Framework_TestCase
     	$this->assertEquals('01/02/1970',$result);
 
     	// Check %a and %b format for en_US
-    	$result=dol_print_date(0,'%a %b',true,$outputlangs);
+    	$result=dol_print_date(0,'%a %b %B',true,$outputlangs);
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('Thu Jan',$result);
+    	$this->assertEquals('Thu Jan January',$result);
 
     	return $result;
     }

From fb252706f9568074de2ee19d5fe86df8211c6588 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Thu, 1 Jun 2017 15:42:19 +0200
Subject: [PATCH 053/438] FIX : situation_progress param default value must be
 100 and not 0

---
 htdocs/compta/facture/class/facture.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index a1364702d52..1dd45234b9b 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -2482,7 +2482,7 @@ class Facture extends CommonInvoice
 	 * 	@param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
 	 *  @return    	int             				< 0 if KO, > 0 if OK
 	 */
-	function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $type= self::TYPE_STANDARD, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='', $special_code=0, $array_options=0, $situation_percent=0, $fk_unit = null)
+	function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $type= self::TYPE_STANDARD, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='', $special_code=0, $array_options=0, $situation_percent=100, $fk_unit = null)
 	{
 		global $conf,$user;
 		// Deprecation warning

From 9b4c929d79e45ba26ede698805a92841bf986b84 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Jun 2017 16:09:09 +0200
Subject: [PATCH 054/438] NEW Add phpunit to check the engine is defined into
 sql create files.

---
 htdocs/install/mysql/migration/repair.sql     |  5 +++++
 .../mysql/tables/llx_advtargetemailing.sql    |  2 +-
 .../mysql/tables/llx_product_attribute.sql    |  2 +-
 .../llx_product_attribute_combination.sql     |  2 +-
 .../llx_product_attribute_combination2val.sql |  2 +-
 .../tables/llx_product_attribute_value.sql    |  2 +-
 .../mysql/tables/llx_product_pricerules.sql   |  2 +-
 test/phpunit/CodingSqlTest.php                | 22 +++++++++++--------
 8 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index 0277f7e996b..4d3658d20bb 100755
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -337,3 +337,8 @@ drop table tmp_c_shipment_mode;
 -- VMYSQL4.1 update llx_expensereport_det as ed set date = (select date_debut from llx_expensereport as e where ed.fk_expensereport = e.rowid) where DATE(STR_TO_DATE(date, '%Y-%m-%d')) < '1000-00-00';
 -- VMYSQL4.1 SET sql_mode = 'NO_ZERO_DATE';
 
+
+-- Backport a change of value into the hourly rate. 
+-- update llx_projet_task_time as ptt set ptt.thm = (SELECT thm from llx_user as u where ptt.fk_user = u.rowid) where (ptt.thm is null)
+
+  
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_advtargetemailing.sql b/htdocs/install/mysql/tables/llx_advtargetemailing.sql
index d22503bb548..7e95f6b8097 100644
--- a/htdocs/install/mysql/tables/llx_advtargetemailing.sql
+++ b/htdocs/install/mysql/tables/llx_advtargetemailing.sql
@@ -28,4 +28,4 @@ CREATE TABLE llx_advtargetemailing
   datec datetime NOT NULL,
   fk_user_mod integer NOT NULL,
   tms timestamp NOT NULL
-)ENGINE=InnoDB;
+)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_product_attribute.sql b/htdocs/install/mysql/tables/llx_product_attribute.sql
index 77c045327b8..cb655508e89 100644
--- a/htdocs/install/mysql/tables/llx_product_attribute.sql
+++ b/htdocs/install/mysql/tables/llx_product_attribute.sql
@@ -23,4 +23,4 @@ CREATE TABLE llx_product_attribute
   label VARCHAR(255) NOT NULL,
   rang INT DEFAULT 0 NOT NULL,
   entity INT DEFAULT 1 NOT NULL
-);
+)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_product_attribute_combination.sql b/htdocs/install/mysql/tables/llx_product_attribute_combination.sql
index fae38f8403d..85c46706014 100644
--- a/htdocs/install/mysql/tables/llx_product_attribute_combination.sql
+++ b/htdocs/install/mysql/tables/llx_product_attribute_combination.sql
@@ -25,4 +25,4 @@ CREATE TABLE llx_product_attribute_combination
   variation_price_percentage INT NULL,
   variation_weight FLOAT NOT NULL,
   entity INT DEFAULT 1 NOT NULL
-);
\ No newline at end of file
+)ENGINE=innodb;
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_product_attribute_combination2val.sql b/htdocs/install/mysql/tables/llx_product_attribute_combination2val.sql
index a64230923e6..af0da7f710d 100644
--- a/htdocs/install/mysql/tables/llx_product_attribute_combination2val.sql
+++ b/htdocs/install/mysql/tables/llx_product_attribute_combination2val.sql
@@ -22,4 +22,4 @@ CREATE TABLE llx_product_attribute_combination2val
   fk_prod_combination INT NOT NULL,
   fk_prod_attr INT NOT NULL,
   fk_prod_attr_val INT NOT NULL
-);
\ No newline at end of file
+)ENGINE=innodb;
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_product_attribute_value.sql b/htdocs/install/mysql/tables/llx_product_attribute_value.sql
index ebd2cf8bb49..8ca6888d91b 100644
--- a/htdocs/install/mysql/tables/llx_product_attribute_value.sql
+++ b/htdocs/install/mysql/tables/llx_product_attribute_value.sql
@@ -23,4 +23,4 @@ CREATE TABLE llx_product_attribute_value
   ref VARCHAR(255) DEFAULT NULL,
   value VARCHAR(255) DEFAULT NULL,
   entity INT DEFAULT 1 NOT NULL
-);
\ No newline at end of file
+)ENGINE=innodb;
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_product_pricerules.sql b/htdocs/install/mysql/tables/llx_product_pricerules.sql
index 3e3dfc02ed1..3cf58c9585f 100644
--- a/htdocs/install/mysql/tables/llx_product_pricerules.sql
+++ b/htdocs/install/mysql/tables/llx_product_pricerules.sql
@@ -23,4 +23,4 @@ CREATE TABLE llx_product_pricerules
     fk_level INT NOT NULL, -- Price variations are made over price of X
     var_percent FLOAT NOT NULL, -- Price variation over based price
     var_min_percent FLOAT NOT NULL -- Min price discount over general price
-);
\ No newline at end of file
+)ENGINE=innodb;
diff --git a/test/phpunit/CodingSqlTest.php b/test/phpunit/CodingSqlTest.php
index c6123df3e77..c56f76af246 100644
--- a/test/phpunit/CodingSqlTest.php
+++ b/test/phpunit/CodingSqlTest.php
@@ -143,16 +143,16 @@ class CodingSqlTest extends PHPUnit_Framework_TestCase
 
         $listofsqldir = array(DOL_DOCUMENT_ROOT.'/install/mysql/tables', DOL_DOCUMENT_ROOT.'/install/mysql/migration');
 
-        foreach ($listofsqldir as $dir) 
+        foreach ($listofsqldir as $dir)
         {
             print 'Process dir '.$dir."\n";
             $filesarray = scandir($dir);
-        
-            foreach($filesarray as $key => $file) 
+
+            foreach($filesarray as $key => $file)
             {
                 if (! preg_match('/\.sql$/',$file))
                     continue;
-                    
+
                 print 'Check sql file '.$file."\n";
                 $filecontent=file_get_contents($dir.'/'.$file);
 
@@ -167,7 +167,7 @@ class CodingSqlTest extends PHPUnit_Framework_TestCase
                 $result=strpos($filecontent,'ON DELETE CASCADE');
                 print __METHOD__." Result for checking we don't have 'ON DELETE CASCADE' = ".$result."\n";
                 $this->assertTrue($result===false, 'Found ON DELETE CASCADE into '.$file.'. Bad.');
-                
+
                 if ($dir == DOL_DOCUMENT_ROOT.'/install/mysql/migration')
                 {
                     // Test for migration files only
@@ -176,16 +176,20 @@ class CodingSqlTest extends PHPUnit_Framework_TestCase
                 else
                 {
                     if (preg_match('/\.key\.sql$/',$file))
-                    {                
-                        // Test for files key files only
-                    
+                    {
+                        // Test for key files only
+
                     }
                     else
                     {
-                        // Test for files non key files only
+                        // Test for non key files only
                         $result=(strpos($filecontent,'KEY ') && strpos($filecontent,'PRIMARY KEY ') == 0);
                         print __METHOD__." Result for checking we don't have ' KEY ' instead of a sql file to create index = ".$result."\n";
                         $this->assertTrue($result===false, 'Found KEY into '.$file.'. Bad.');
+
+                        $result=stripos($filecontent,'ENGINE=innodb');
+                        print __METHOD__." Result for checking we have the ENGINE=innodb string = ".$result."\n";
+                        $this->assertGreaterThan(0, $result, 'The ENGINE=innodb was not found into '.$file.'. Add it or just fix syntax to match case.');
                     }
                 }
             }

From 31aa8bdf05391f759a22933c765bca43dc578b63 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Thu, 1 Jun 2017 16:26:32 +0200
Subject: [PATCH 055/438] Fix week view link has wrong link

---
 htdocs/comm/action/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 90596b54197..dcd958f660e 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1196,7 +1196,7 @@ if ($id > 0)
 		$out.=img_picto($langs->trans("ViewCal"),'object_calendar','class="hideonsmartphone pictoactionview"');
 		$out.='<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_month&year='.dol_print_date($object->datep,'%Y').'&month='.dol_print_date($object->datep,'%m').'&day='.dol_print_date($object->datep,'%d').'">'.$langs->trans("ViewCal").'</a>';
 		$out.=img_picto($langs->trans("ViewWeek"),'object_calendarweek','class="hideonsmartphone pictoactionview"');
-		$out.='<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($object->datep,'%Y').'&month='.dol_print_date($object->datep,'%m').'&day='.dol_print_date($object->datep,'%d').'">'.$langs->trans("ViewWeek").'</a>';
+		$out.='<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_week&year='.dol_print_date($object->datep,'%Y').'&month='.dol_print_date($object->datep,'%m').'&day='.dol_print_date($object->datep,'%d').'">'.$langs->trans("ViewWeek").'</a>';
 		$out.=img_picto($langs->trans("ViewDay"),'object_calendarday','class="hideonsmartphone pictoactionview"');
 		$out.='<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($object->datep,'%Y').'&month='.dol_print_date($object->datep,'%m').'&day='.dol_print_date($object->datep,'%d').'">'.$langs->trans("ViewDay").'</a>';
 		$linkback.=$out;

From 76e1438fe667627851a5e105eec63309787d0ae8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Jun 2017 17:29:47 +0200
Subject: [PATCH 056/438] FIX REST api to get project when user has permission
 to read all.

---
 htdocs/core/lib/security.lib.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 7870824285a..7aa9e522b71 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -372,7 +372,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid=0, $tableandsh
 		$check = array('adherent','banque','user','usergroup','produit','service','produit|service','categorie'); // Test on entity only (Objects with no link to company)
 		$checksoc = array('societe');	 // Test for societe object
 		$checkother = array('contact');	 // Test on entity and link to societe. Allowed if link is empty (Ex: contacts...).
-		$checkproject = array('projet'); // Test for project object
+		$checkproject = array('projet','project'); // Test for project object
 		$nocheck = array('barcode','stock','fournisseur');	// No test
 		$checkdefault = 'all other not already defined'; // Test on entity and link to third party. Not allowed if link is empty (Ex: invoice, orders...).
 
@@ -462,6 +462,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid=0, $tableandsh
 			}
 			else
 			{
+			    if ($dbtablename == 'project') $dbtablename='projet';
 				$sql = "SELECT dbt.".$dbt_select;
 				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql.= " WHERE dbt.".$dbt_select." = ".$objectid;

From dd2d9f533ac4e8972239893525d964c42cd3667e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Jun 2017 18:18:57 +0200
Subject: [PATCH 057/438] Clean duplicated vars

---
 htdocs/projet/class/api_projects.class.php | 59 ++++++++++++----------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/htdocs/projet/class/api_projects.class.php b/htdocs/projet/class/api_projects.class.php
index 5bb7e8dfc7e..c8d51c02d7c 100644
--- a/htdocs/projet/class/api_projects.class.php
+++ b/htdocs/projet/class/api_projects.class.php
@@ -20,7 +20,7 @@
 
  require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
  require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
- 
+
 /**
  * API class for projects
  *
@@ -83,8 +83,8 @@ class Projects extends DolibarrApi
 		return $this->_cleanObjectDatas($this->project);
     }
 
-    
-   
+
+
     /**
      * List projects
      *
@@ -102,7 +102,7 @@ class Projects extends DolibarrApi
         global $db, $conf;
 
         $obj_ret = array();
-        
+
         // case of external user, $thirdparty_ids param is ignored and replaced by user's socid
         $socids = DolibarrApiAccess::$user->societe_id ? DolibarrApiAccess::$user->societe_id : $thirdparty_ids;
 
@@ -126,7 +126,7 @@ class Projects extends DolibarrApi
             $sql .= " AND sc.fk_user = ".$search_sale;
         }
         // Add sql filters
-        if ($sqlfilters) 
+        if ($sqlfilters)
         {
             if (! DolibarrApi::_checkFilters($sqlfilters))
             {
@@ -135,7 +135,7 @@ class Projects extends DolibarrApi
 	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
             $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
-        
+
         $sql.= $db->order($sortfield, $sortorder);
         if ($limit)	{
             if ($page < 0)
@@ -227,7 +227,7 @@ class Projects extends DolibarrApi
       }
       $this->project->getLinesArray(DolibarrApiAccess::$user);
       $result = array();
-      foreach ($this->project->lines as $line)      // $line is a task 
+      foreach ($this->project->lines as $line)      // $line is a task
       {
           if ($includetimespent == 1)
           {
@@ -243,7 +243,7 @@ class Projects extends DolibarrApi
       return $result;
     }
 
-    
+
     /**
      * Get roles a user is assigned to a project with
      *
@@ -256,20 +256,20 @@ class Projects extends DolibarrApi
      */
     function getRoles($id, $userid=0) {
         global $db;
-        
+
         if(! DolibarrApiAccess::$user->rights->projet->lire) {
             throw new RestException(401);
         }
-    
+
         $result = $this->project->fetch($id);
         if( ! $result ) {
             throw new RestException(404, 'Project not found');
         }
-    
+
         if( ! DolibarrApi::_checkAccessToResource('project',$this->project->id)) {
             throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
-        
+
         require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
         $taskstatic=new Task($this->db);
         $userp = DolibarrApiAccess::$user;
@@ -285,8 +285,8 @@ class Projects extends DolibarrApi
         }
         return $result;
     }
-    
-    
+
+
     /**
      * Add a task to given project
      *
@@ -347,7 +347,7 @@ class Projects extends DolibarrApi
       return false;
     }
     */
-    
+
     /**
      * Update a task to given project
      *
@@ -405,9 +405,9 @@ class Projects extends DolibarrApi
       }
       return false;
     }*/
-    
 
-    
+
+
     /**
      * Update project general fields (won't touch lines of project)
      *
@@ -482,7 +482,7 @@ class Projects extends DolibarrApi
      * Validate a project.
      * You can test this API with the following input message
      * { "notrigger": 0 }
-     * 
+     *
      * @param   int $id             Project ID
      * @param   int $notrigger      1=Does not execute triggers, 0= execute triggers
      *
@@ -526,7 +526,7 @@ class Projects extends DolibarrApi
         );
     }
 
-    
+
     /**
      * Clean sensible object datas
      *
@@ -534,9 +534,12 @@ class Projects extends DolibarrApi
      * @return    array    Array of cleaned object properties
      */
     function _cleanObjectDatas($object) {
-    
+
         $object = parent::_cleanObjectDatas($object);
-    
+
+        unset($object->titre);
+        unset($object->datec);
+        unset($object->datem);
         unset($object->barcode_type);
         unset($object->barcode_type_code);
         unset($object->barcode_type_label);
@@ -558,21 +561,21 @@ class Projects extends DolibarrApi
         unset($object->country);
         unset($object->country_id);
         unset($object->country_code);
-        
+
         unset($object->weekWorkLoad);
         unset($object->weekWorkLoad);
-        
+
         //unset($object->lines);            // for task we use timespent_lines, but for project we use lines
-        
+
         unset($object->total_ht);
         unset($object->total_tva);
         unset($object->total_localtax1);
         unset($object->total_localtax2);
         unset($object->total_ttc);
-        
+
         return $object;
     }
-    
+
     /**
      * Validate fields before create or update object
      *
@@ -591,8 +594,8 @@ class Projects extends DolibarrApi
         }
         return $object;
     }
-    
-    
+
+
     // TODO
     // getSummaryOfTimeSpent
 }

From b4f1df03de0db99afb82ebd480d60f17eea6f6a9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Jun 2017 19:07:51 +0200
Subject: [PATCH 058/438] Update doc

---
 build/debian/README.howto       |  1 +
 htdocs/theme/eldy/style.css.php | 58 ++++++++++++++++-----------------
 2 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/build/debian/README.howto b/build/debian/README.howto
index c94309ec2ef..1632e954237 100644
--- a/build/debian/README.howto
+++ b/build/debian/README.howto
@@ -444,3 +444,4 @@ Note that package 3.5.7 contains not only fixed for bugs reported to debian. It
 so it is a better solution to validate this maintenance release than applying a patch of the only CVE-2015-3935. 
 After discussion with ..., it appears that security holes are enough to request this unblock request."
 
+Note: If there is a response to ask more information, don't forget to remove the tag during answer.
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 33bba8f1404..c66fa33dfaa 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -39,7 +39,7 @@ if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX','1');
 $colorbackhmenu1='80,90,120';      // topmenu
 $colorbackvmenu1='255,255,255';      // vmenu
 $colortopbordertitle1='120,120,120';    // top border of title
-$colorbacktitle1='230,230,230';      // title of tables,list
+$colorbacktitle1='230,230,233';      // title of tables,list
 $colorbacktabcard1='255,255,255';  // card
 $colorbacktabactive='234,234,234';
 $colorbacklineimpair1='255,255,255';    // line impair
@@ -56,7 +56,7 @@ $fontsize='13';
 $fontsizesmaller='12';
 
 if (defined('THEME_ONLY_CONSTANT')) return;
-    
+
 session_cache_limiter(FALSE);
 
 require_once '../../main.inc.php';
@@ -272,8 +272,8 @@ input[type=submit] {
 	margin-left: 5px;
 }
 input, input.flat, form.flat select, select, select.flat, .dataTables_length label select {
-	<?php if (empty($conf->global->THEME_ELDY_SHOW_BORDER_INPUT)) 
-	print "border: none;" 
+	<?php if (empty($conf->global->THEME_ELDY_SHOW_BORDER_INPUT))
+	print "border: none;"
 	?>
 }
 input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
@@ -901,7 +901,7 @@ td.showDragHandle {
 #id-right, #id-left {
 	padding-top: 16px;
 	padding-bottom: 16px;
-	
+
 	display: table-cell;			/* DOL_XXX Empeche fonctionnement correct du scroll horizontal sur tableau, avec datatable ou CSS */
 	float: none;
 	vertical-align: top;
@@ -1529,7 +1529,7 @@ foreach($mainmenuusedarray as $val)
 	display: table;
     position: absolute;
     height: 100%;
-    width: 100%;	
+    width: 100%;
 }
 .login_center {
 	display: table-cell;
@@ -1754,12 +1754,12 @@ div.vmenu, td.vmenu {
 	<?php } ?>
 }
 
-/* Force vmenusearchselectcombo with type=text differently than without because beautify with select2 affect vmenusearchselectcombo differently */ 
+/* Force vmenusearchselectcombo with type=text differently than without because beautify with select2 affect vmenusearchselectcombo differently */
 input.vmenusearchselectcombo[type=text] {
 	width: 180px !important;
 }
 .vmenusearchselectcombo {
-	width: 188px; 
+	width: 188px;
 }
 
 .menu_contenu {
@@ -1926,7 +1926,7 @@ td.ecmroot {
     background-image: -webkit-linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important;
     background-image: -ms-linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important;
     background-image: linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important;
-	
+
     background: #FFF;
     background-repeat: repeat-x !important;
     */
@@ -1939,7 +1939,7 @@ td.ecmroot {
     -webkit-box-shadow: 2px 2px 4px #DDD;
     box-shadow: 2px 2px 4px #DDD;
 	*/
-	
+
     padding: 10px 4px 14px 4px !important;
     min-height: 32px;
 }
@@ -1969,7 +1969,7 @@ div.tabs {
     padding-right: 6px !important;
 	clear:both;
 	height:100%;
-	/* background-image: linear-gradient(to top,#f6f6f6 0,#fff 8px);  */	
+	/* background-image: linear-gradient(to top,#f6f6f6 0,#fff 8px);  */
 }
 div.tabsElem {
 	margin-top: 1px;
@@ -1987,12 +1987,12 @@ div.tabBar {
 	background: rgb(<?php echo $colorbacktabcard1; ?>);
 }
 div.tabBar div.titre {
-	padding-top: 10px;    
+	padding-top: 10px;
 }
 
 div.tabBarWithBottom {
 	padding-bottom: 18px;
-	border-bottom: 1px solid #aaa; 
+	border-bottom: 1px solid #aaa;
 }
 div.tabBar table.tableforservicepart2:last-child {
     border-bottom: 1px solid #aaa;
@@ -2623,7 +2623,7 @@ div.liste_titre_bydiv, .liste_titre div.tagtr, tr.liste_titre, tr.liste_titre_se
 	background: rgb(<?php echo $colorbacktitle1; ?>);
 	font-weight: <?php echo $useboldtitle?'bold':'normal'; ?>;
     border-bottom: 1px solid #ddd;
-	
+
     color: rgb(<?php echo $colortexttitle; ?>);
     font-family: <?php print $fontlist ?>;
     text-align: <?php echo $left; ?>;
@@ -2734,7 +2734,7 @@ div.tabBar .noborder {
 
 /* Prepare to remove class pair - impair */
 
-.noborder > tbody > tr:nth-child(even):not(.liste_titre), .liste > tbody > tr:nth-child(even):not(.liste_titre) { 
+.noborder > tbody > tr:nth-child(even):not(.liste_titre), .liste > tbody > tr:nth-child(even):not(.liste_titre) {
 	background: linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
 	background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
 	background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
@@ -2761,7 +2761,7 @@ div.tabBar .noborder {
 /*
  *  Boxes
  */
- 
+
 .ficheaddleft div.boxstats {
     border: none;
 }
@@ -2775,19 +2775,19 @@ div.tabBar .noborder {
     text-align: center;
     border-radius: 2px;
 }
-.boxstats, .boxstats130, .boxstatscontent {    
+.boxstats, .boxstats130, .boxstatscontent {
 	white-space: nowrap;
 	overflow: hidden;
     text-overflow: ellipsis;
 }
 .boxstats {
     padding: 3px;
-    width: 105px;    
+    width: 105px;
 }
 .boxstats130 {
-    width: 160px; 
+    width: 160px;
     height: 48px;
-    padding: 3px  
+    padding: 3px
 }
 .boxstatscontent {
 	padding: 3px;
@@ -2799,9 +2799,9 @@ div.tabBar .noborder {
 		flex: 1 1 110px;
 	}
 	.boxstats, .boxstats130 {
-        width: 90px;    
+        width: 90px;
     }
-    .dashboardlineindicator { 
+    .dashboardlineindicator {
         float: left;
     	padding-left: 5px;
     }
@@ -2833,7 +2833,7 @@ span.dashboardlineko {
 	color: #FFF;
 	/*color: #8c4446 ! important;
 	padding-left: 1px;*/
-	
+
 	font-size: 80%;
 }
 .dashboardlinelatecoin {
@@ -2842,7 +2842,7 @@ span.dashboardlineko {
     text-align: right;
     top: -24px;
     padding: 1px 2px 1px 2px;
-    border-radius: .25em;    
+    border-radius: .25em;
 
     background-color: #af4705;
     padding: 0px 5px 0px 5px;
@@ -2854,7 +2854,7 @@ span.dashboardlineko {
     margin-right: 2px;
     background-color: #8c4446;
     color: #FFFFFF ! important;
-    border-radius: .25em;    
+    border-radius: .25em;
 	display: inline-block;
 	vertical-align: middle;
 }
@@ -3955,7 +3955,7 @@ div.dataTables_length select {
 	border-top: 1px solid #ccc;
 	border-bottom: solid 1px rgba(0,0,0,.2);
 }
-.select2-container-active .select2-choice, .select2-container-active .select2-choices 
+.select2-container-active .select2-choice, .select2-container-active .select2-choices
 {
 	outline: none;
 	border-top: none;
@@ -4039,7 +4039,7 @@ a span.select2-chosen
 	border-right: none;
 	border-top: none;
 	border-left: none;
-	
+
 }
 
 
@@ -4593,7 +4593,7 @@ div.tabsElem a.tab {
     	z-index: 201;
         background: #FFF;
 	}
-	    
+
 	/* Reduce login top right info */
 	.help {
 	<?php if ($disableimages) {  ?>
@@ -4628,7 +4628,7 @@ div.tabsElem a.tab {
         vertical-align: middle;
         background: #FFF;
         height: 42px;
-        
+
     	z-index: 202;
     	min-width: 190px;
     	max-width: 190px;

From 976c8e0752d4438321c2b90ba0fb55347ebe1471 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Jun 2017 19:53:12 +0200
Subject: [PATCH 059/438] Fix security to test access on a task

---
 htdocs/core/lib/security.lib.php | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 7aa9e522b71..45dbb32b7f0 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -344,7 +344,7 @@ function restrictedArea($user, $features, $objectid=0, $tableandshare='', $featu
  * This function is also called by restrictedArea
  *
  * @param User		$user			User to check
- * @param array		$featuresarray	Features/modules to check. Example: ('user','service')
+ * @param array		$featuresarray	Features/modules to check. Example: ('user','service','member','project','task',...)
  * @param int		$objectid		Object ID if we want to check a particular record (optional) is linked to a owned thirdparty (optional).
  * @param string	$tableandshare	'TableName&SharedElement' with Tablename is table where object is stored. SharedElement is an optional key to define where to check entity for multicompany modume. Param not used if objectid is null (optional).
  * @param string	$feature2		Feature to check, second level of permission (optional). Can be or check with 'level1|level2'.
@@ -368,11 +368,14 @@ function checkUserAccessToObject($user, $featuresarray, $objectid=0, $tableandsh
 
 		// For backward compatibility
 		if ($feature == 'member') $feature='adherent';
+		if ($feature == 'project') $feature='projet';
+		if ($feature == 'task') $feature='projet_task';
 
 		$check = array('adherent','banque','user','usergroup','produit','service','produit|service','categorie'); // Test on entity only (Objects with no link to company)
 		$checksoc = array('societe');	 // Test for societe object
 		$checkother = array('contact');	 // Test on entity and link to societe. Allowed if link is empty (Ex: contacts...).
 		$checkproject = array('projet','project'); // Test for project object
+		$checktask = array('projet_task');
 		$nocheck = array('barcode','stock','fournisseur');	// No test
 		$checkdefault = 'all other not already defined'; // Test on entity and link to third party. Not allowed if link is empty (Ex: invoice, orders...).
 
@@ -452,7 +455,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid=0, $tableandsh
 		}
 		else if (in_array($feature,$checkproject))
 		{
-			if (! empty($conf->projet->enabled) && ! $user->rights->projet->all->lire)
+			if (! empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
 			{
 				include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 				$projectstatic=new Project($db);
@@ -462,7 +465,27 @@ function checkUserAccessToObject($user, $featuresarray, $objectid=0, $tableandsh
 			}
 			else
 			{
-			    if ($dbtablename == 'project') $dbtablename='projet';
+				$sql = "SELECT dbt.".$dbt_select;
+				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+				$sql.= " WHERE dbt.".$dbt_select." = ".$objectid;
+				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+			}
+		}
+		else if (in_array($feature,$checktask))
+		{
+			if (! empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
+			{
+			    $task = new Task($db);
+			    $task->fetch($objectid);
+
+				include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+				$projectstatic=new Project($db);
+				$tmps=$projectstatic->getProjectsAuthorizedForUser($user,0,1,0);
+				$tmparray=explode(',',$tmps);
+				if (! in_array($task->fk_project,$tmparray)) return false;
+			}
+			else
+			{
 				$sql = "SELECT dbt.".$dbt_select;
 				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql.= " WHERE dbt.".$dbt_select." = ".$objectid;

From 5c58ed8ca78bc1aafdee3f817afcf14e03c83650 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Jun 2017 09:13:04 +0200
Subject: [PATCH 060/438] Add a better error message when payment link is not
 valid.

---
 htdocs/core/lib/functions.lib.php    |   8 +-
 htdocs/langs/en_US/errors.lang       |   1 +
 htdocs/langs/en_US/projects.lang     |   2 +-
 htdocs/public/paybox/newpayment.php  |  77 +++++++++--------
 htdocs/public/payment/newpayment.php | 123 ++++++++++++++-------------
 htdocs/public/paypal/newpayment.php  |  83 ++++++++++--------
 htdocs/public/stripe/newpayment.php  |  96 +++++++++++----------
 7 files changed, 217 insertions(+), 173 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index dd4f720b378..ef03b0c00cc 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3235,15 +3235,19 @@ function dol_print_error($db='',$error='',$errors=null)
  * Show a public email and error code to contact if technical error
  *
  * @param	string	$prefixcode		Prefix of public error code
+ * @param   string  $errormessage   Complete error message
  * @return	void
  */
-function dol_print_error_email($prefixcode)
+function dol_print_error_email($prefixcode, $errormessage='')
 {
 	global $langs,$conf;
 
 	$langs->load("errors");
 	$now=dol_now();
-	print '<br><div class="error">'.$langs->trans("ErrorContactEMail", $conf->global->MAIN_INFO_SOCIETE_MAIL, $prefixcode.dol_print_date($now,'%Y%m%d')).'</div>';
+	print '<br><div class="center login_main_message"><div class="error">';
+	print $langs->trans("ErrorContactEMail", $conf->global->MAIN_INFO_SOCIETE_MAIL, $prefixcode.dol_print_date($now,'%Y%m%d'));
+	if ($errormessage) print '<br><br>'.$errormessage;
+	print '</div></div>';
 }
 
 /**
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 740397a5044..0f49bd832d6 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -190,6 +190,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. 
 
 # 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.  
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index c98c2120e21..27db2976b2a 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -185,7 +185,7 @@ ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php
index c3aff6341cc..97a4c5452ff 100644
--- a/htdocs/public/paybox/newpayment.php
+++ b/htdocs/public/paybox/newpayment.php
@@ -135,7 +135,7 @@ if (GETPOST('action','aZ09') == 'dopayment')
     $email=GETPOST("email");
 
     $origfulltag=GETPOST("fulltag",'alpha');
-    
+
 	$mesg='';
 	if (empty($PRICE) || ! is_numeric($PRICE)) $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Amount"));
 	elseif (empty($email))            $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("YourEMail"));
@@ -143,7 +143,7 @@ if (GETPOST('action','aZ09') == 'dopayment')
     elseif (! $origfulltag)           $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("PaymentCode"));
 	elseif (dol_strlen($urlok) > 150) $mesg='Error urlok too long '.$urlok;
     elseif (dol_strlen($urlko) > 150) $mesg='Error urlko too long '.$urlko;
-    
+
 	if (empty($mesg))
 	{
 		dol_syslog("newpayment.php call paybox api and do redirect", LOG_DEBUG);
@@ -169,13 +169,22 @@ $conf->dol_hide_leftmenu=1;
 
 llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
 
-
 // Common variables
 $creditor=$mysoc->name;
 $paramcreditor='PAYBOX_CREDITOR_'.$suffix;
 if (! empty($conf->global->$paramcreditor)) $creditor=$conf->global->$paramcreditor;
 else if (! empty($conf->global->PAYBOX_CREDITOR)) $creditor=$conf->global->PAYBOX_CREDITOR;
 
+// Check link validity
+if (! empty($SOURCE) && in_array($ref, array('member_ref', 'contractline_ref', 'invoice_ref', 'order_ref', '')))
+{
+    $langs->load("errors");
+    dol_print_error_email('BADREFINPAYMENTFORM', $langs->trans("ErrorBadLinkSourceSetButBadValueForRef", $SOURCE, $ref));
+    llxFooter();
+    $db->close();
+    exit;
+}
+
 print '<span id="dolpaymentspan"></span>'."\n";
 print '<div class="center">';
 print '<form id="dolpaymentform" class="center" name="paymentform" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
@@ -258,14 +267,14 @@ if (! GETPOST("source") && $valid)
     $fulltag=$tag;
 
 	// Creditor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
     print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
     print '</td></tr>'."\n";
 
 	// Amount
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
@@ -286,7 +295,7 @@ if (! GETPOST("source") && $valid)
 	print '</td></tr>'."\n";
 
 	// Tag
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
@@ -294,7 +303,7 @@ if (! GETPOST("source") && $valid)
 	print '</td></tr>'."\n";
 
 	// EMail
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("YourEMail");
 	print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><input class="flat" type="text" name="email" size="48" value="'.GETPOST("email").'"></td></tr>'."\n";
@@ -331,19 +340,19 @@ if (GETPOST("source") == 'order' && $valid)
 	$fulltag=dol_string_unaccent($fulltag);
 
 	// Creditor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
     print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
     print '</td></tr>'."\n";
 
 	// Debitor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$order->thirdparty->name.'</b>';
 
 	// Object
-	
+
 	$text='<b>'.$langs->trans("PaymentOrderRef",$order->ref).'</b>';
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
@@ -352,7 +361,7 @@ if (GETPOST("source") == 'order' && $valid)
 	print '</td></tr>'."\n";
 
 	// Amount
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
@@ -372,7 +381,7 @@ if (GETPOST("source") == 'order' && $valid)
 	print '</td></tr>'."\n";
 
 	// Tag
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
@@ -380,7 +389,7 @@ if (GETPOST("source") == 'order' && $valid)
 	print '</td></tr>'."\n";
 
 	// EMail
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("YourEMail");
 	print ' ('.$langs->trans("ToComplete").')';
 	$email=$order->thirdparty->email;
@@ -419,19 +428,19 @@ if (GETPOST("source") == 'invoice' && $valid)
 	$fulltag=dol_string_unaccent($fulltag);
 
 	// Creditor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
     print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
     print '</td></tr>'."\n";
 
 	// Debitor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$invoice->thirdparty->name.'</b>';
 
 	// Object
-	
+
 	$text='<b>'.$langs->trans("PaymentInvoiceRef",$invoice->ref).'</b>';
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
@@ -440,7 +449,7 @@ if (GETPOST("source") == 'invoice' && $valid)
 	print '</td></tr>'."\n";
 
 	// Amount
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
@@ -460,7 +469,7 @@ if (GETPOST("source") == 'invoice' && $valid)
 	print '</td></tr>'."\n";
 
 	// Tag
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
@@ -468,7 +477,7 @@ if (GETPOST("source") == 'invoice' && $valid)
 	print '</td></tr>'."\n";
 
 	// EMail
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("YourEMail");
 	print ' ('.$langs->trans("ToComplete").')';
     $email=$invoice->thirdparty->email;
@@ -553,19 +562,19 @@ if (GETPOST("source") == 'contractline' && $valid)
 	if (GETPOST('qty')) $qty=GETPOST('qty');
 
 	// Creditor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
     print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
     print '</td></tr>'."\n";
 
 	// Debitor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$contract->thirdparty->name.'</b>';
 
 	// Object
-	
+
 	$text='<b>'.$langs->trans("PaymentRenewContractId",$contract->ref,$contractline->ref).'</b>';
 	if ($contractline->fk_product)
 	{
@@ -588,7 +597,7 @@ if (GETPOST("source") == 'contractline' && $valid)
 	print '</td></tr>'."\n";
 
 	// Quantity
-	
+
 	$label=$langs->trans("Quantity");
 	$qty=1;
 	$duration='';
@@ -616,7 +625,7 @@ if (GETPOST("source") == 'contractline' && $valid)
 	print '</b></td></tr>'."\n";
 
 	// Amount
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
@@ -636,7 +645,7 @@ if (GETPOST("source") == 'contractline' && $valid)
 	print '</td></tr>'."\n";
 
 	// Tag
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
@@ -644,7 +653,7 @@ if (GETPOST("source") == 'contractline' && $valid)
 	print '</td></tr>'."\n";
 
 	// EMail
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("YourEMail");
 	print ' ('.$langs->trans("ToComplete").')';
     $email=$contract->thirdparty->email;
@@ -684,14 +693,14 @@ if (GETPOST("source") == 'membersubscription' && $valid)
 	$fulltag=dol_string_unaccent($fulltag);
 
 	// Creditor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
     print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
     print '</td></tr>'."\n";
 
 	// Debitor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Member");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>';
 	if ($member->morphy == 'mor' && ! empty($member->societe)) print $member->societe;
@@ -699,7 +708,7 @@ if (GETPOST("source") == 'membersubscription' && $valid)
 	print '</b>';
 
 	// Object
-	
+
 	$text='<b>'.$langs->trans("PaymentSubscription").'</b>';
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
@@ -710,13 +719,13 @@ if (GETPOST("source") == 'membersubscription' && $valid)
 	if ($member->last_subscription_date || $member->last_subscription_amount)
 	{
 		// Last subscription date
-		
+
 		print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionDate");
 		print '</td><td class="CTableRow'.($var?'1':'2').'">'.dol_print_date($member->last_subscription_date,'day');
 		print '</td></tr>'."\n";
 
 		// Last subscription amount
-		
+
 		print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionAmount");
 		print '</td><td class="CTableRow'.($var?'1':'2').'">'.price($member->last_subscription_amount);
 		print '</td></tr>'."\n";
@@ -725,7 +734,7 @@ if (GETPOST("source") == 'membersubscription' && $valid)
 	}
 
 	// Amount
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
@@ -749,7 +758,7 @@ if (GETPOST("source") == 'membersubscription' && $valid)
 	print '</td></tr>'."\n";
 
 	// Tag
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
@@ -757,7 +766,7 @@ if (GETPOST("source") == 'membersubscription' && $valid)
 	print '</td></tr>'."\n";
 
 	// EMail
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("YourEMail");
     $email=$member->email;
     $email=(GETPOST("email")?GETPOST("email"):(isValidEmail($email)?$email:''));
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 788321b6212..cdfaaa2afc6 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -156,10 +156,10 @@ $urlko=preg_replace('/&$/','',$urlko);  // Remove last &
 if (! empty($conf->paypal->enabled))
 {
 	$langs->load("paypal");
-	
+
 	require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
 	require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
-	
+
 	$PAYPAL_API_OK="";
 	if ($urlok) $PAYPAL_API_OK=$urlok;
 	$PAYPAL_API_KO="";
@@ -194,7 +194,7 @@ if (! empty($conf->paypal->enabled))
 	        $token = $conf->global->PAYPAL_SECURITY_TOKEN;
 	    }
 		if ($SECUREKEY != $token) $valid=false;
-		
+
 		if (! $valid)
 		{
 	    	print '<div class="error">Bad value for key.</div>';
@@ -202,16 +202,16 @@ if (! empty($conf->paypal->enabled))
 	    	exit;
 		}
 	}
-	
+
     $validpaymentmethod['paypal']='valid';
 }
 
 if (! empty($conf->paybox->enabled))
 {
 	$langs->load("paybox");
-	
+
 	// TODO
-	
+
     $validpaymentmethod['paybox']='valid';
 }
 
@@ -256,10 +256,10 @@ if (empty($validpaymentmethod)) accessforbidden('', 0, 0, 1);
 if ($action == 'dopayment')
 {
 	if ($paymentmethod == 'paypal')
-	{ 
+	{
 		$PAYPAL_API_PRICE=price2num(GETPOST("newamount"),'MT');
 	    $PAYPAL_PAYMENT_TYPE='Sale';
-	
+
 	    $origfulltag=GETPOST("fulltag",'alpha');
 	    $shipToName=GETPOST("shipToName");
 	    $shipToStreet=GETPOST("shipToStreet");
@@ -271,24 +271,24 @@ if ($action == 'dopayment')
 	    $phoneNum=GETPOST("phoneNum");
 	    $email=GETPOST("email");
 	    $desc=GETPOST("desc");
-	
+
 		$mesg='';
 		if (empty($PAYPAL_API_PRICE) || ! is_numeric($PAYPAL_API_PRICE))   $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Amount"));
 		//elseif (empty($EMAIL))          $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("YourEMail"));
 		//elseif (! isValidEMail($EMAIL)) $mesg=$langs->trans("ErrorBadEMail",$EMAIL);
 		elseif (! $origfulltag)        $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("PaymentCode"));
-	
+
 	    //var_dump($_POST);
 		if (empty($mesg))
 		{
 			dol_syslog("newpayment.php call paypal api and do redirect", LOG_DEBUG);
-	
+
 			// Other
 			$PAYPAL_API_DEVISE="USD";
 			//if ($currency == 'EUR') $PAYPAL_API_DEVISE="EUR";
 			//if ($currency == 'USD') $PAYPAL_API_DEVISE="USD";
 	        if (! empty($currency)) $PAYPAL_API_DEVISE=$currency;
-	
+
 		    dol_syslog("Submit Paypal form", LOG_DEBUG);
 		    dol_syslog("PAYPAL_API_USER: $PAYPAL_API_USER", LOG_DEBUG);
 		    //dol_syslog("PAYPAL_API_PASSWORD: $PAYPAL_API_PASSWORD", LOG_DEBUG);  // No password into log files
@@ -308,15 +308,15 @@ if ($action == 'dopayment')
 	        dol_syslog("phoneNum: $phoneNum", LOG_DEBUG);
 	        dol_syslog("email: $email", LOG_DEBUG);
 	        dol_syslog("desc: $desc", LOG_DEBUG);
-	
+
 	        dol_syslog("SCRIPT_URI: ".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]), LOG_DEBUG);	// If defined script uri must match domain of PAYPAL_API_OK and PAYPAL_API_KO
 		    //$_SESSION["PaymentType"]=$PAYPAL_PAYMENT_TYPE;
 		    //$_SESSION["currencyCodeType"]=$PAYPAL_API_DEVISE;
 		    //$_SESSION["Payment_Amount"]=$PAYPAL_API_PRICE;
-	
+
 		    // A redirect is added if API call successfull
 	        print_paypal_redirect($PAYPAL_API_PRICE,$PAYPAL_API_DEVISE,$PAYPAL_PAYMENT_TYPE,$PAYPAL_API_OK,$PAYPAL_API_KO, $FULLTAG);
-	
+
 			exit;
 		}
 	}
@@ -335,19 +335,28 @@ $conf->dol_hide_leftmenu=1;
 
 llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
 
+// Check link validity
+if (! empty($SOURCE) && in_array($ref, array('member_ref', 'contractline_ref', 'invoice_ref', 'order_ref', '')))
+{
+    $langs->load("errors");
+    dol_print_error_email('BADREFINPAYMENTFORM', $langs->trans("ErrorBadLinkSourceSetButBadValueForRef", $SOURCE, $ref));
+    llxFooter();
+    $db->close();
+    exit;
+}
 
 if (! empty($conf->paypal->enabled))
 {
-	if (! empty($PAYPAL_API_SANDBOX))
-	{
-		dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode'),'','warning');
-	}
-
 	// Common variables
 	$creditor=$mysoc->name;
 	$paramcreditor='PAYPAL_CREDITOR_'.$suffix;
 	if (! empty($conf->global->$paramcreditor)) $creditor=$conf->global->$paramcreditor;
 	else if (! empty($conf->global->PAYPAL_CREDITOR)) $creditor=$conf->global->PAYPAL_CREDITOR;
+
+	if (! empty($PAYPAL_API_SANDBOX))
+	{
+		dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode'),'','warning');
+	}
 }
 
 print '<span id="dolpaymentspan"></span>'."\n";
@@ -442,14 +451,14 @@ if (! GETPOST("source"))
 	$fulltag=$tag;
 
 	// Creditor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
     print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
     print '</td></tr>'."\n";
 
 	// Amount
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
@@ -469,7 +478,7 @@ if (! GETPOST("source"))
 	print '</td></tr>'."\n";
 
 	// Tag
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
@@ -507,26 +516,26 @@ if (GETPOST("source") == 'order')
         if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
         $amount=price2num($amount);
     }
-    
+
 	$fulltag='ORD='.$order->ref.'.CUS='.$order->thirdparty->id;
 	//$fulltag.='.NAM='.strtr($order->thirdparty->name,"-"," ");
 	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
 	$fulltag=dol_string_unaccent($fulltag);
 
 	// Creditor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
     print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
     print '</td></tr>'."\n";
 
 	// Debitor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$order->thirdparty->name.'</b>';
 
 	// Object
-	
+
 	$text='<b>'.$langs->trans("PaymentOrderRef",$order->ref).'</b>';
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
@@ -535,7 +544,7 @@ if (GETPOST("source") == 'order')
 	print '</td></tr>'."\n";
 
 	// Amount
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
@@ -555,7 +564,7 @@ if (GETPOST("source") == 'order')
 	print '</td></tr>'."\n";
 
 	// Tag
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
@@ -617,26 +626,26 @@ if (GETPOST("source") == 'invoice')
         if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
         $amount=price2num($amount);
     }
-    
+
 	$fulltag='INV='.$invoice->ref.'.CUS='.$invoice->thirdparty->id;
 	//$fulltag.='.NAM='.strtr($invoice->thirdparty->name,"-"," ");
 	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
 	$fulltag=dol_string_unaccent($fulltag);
 
 	// Creditor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
     print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
     print '</td></tr>'."\n";
 
 	// Debitor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$invoice->thirdparty->name.'</b>';
 
 	// Object
-	
+
 	$text='<b>'.$langs->trans("PaymentInvoiceRef",$invoice->ref).'</b>';
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
@@ -645,7 +654,7 @@ if (GETPOST("source") == 'invoice')
 	print '</td></tr>'."\n";
 
 	// Amount
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
@@ -665,7 +674,7 @@ if (GETPOST("source") == 'invoice')
 	print '</td></tr>'."\n";
 
 	// Tag
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
@@ -745,7 +754,7 @@ if (GETPOST("source") == 'contractline')
     	{
     		$product=new Product($db);
     		$result=$product->fetch($contractline->fk_product);
-    
+
     		// We define price for product (TODO Put this in a method in product class)
     		if (! empty($conf->global->PRODUIT_MULTIPRICES))
     		{
@@ -759,7 +768,7 @@ if (GETPOST("source") == 'contractline')
     			$pu_ttc = $product->price_ttc;
     			$price_base_type = $product->price_base_type;
     		}
-    
+
     		$amount=$pu_ttc;
     		if (empty($amount))
     		{
@@ -780,19 +789,19 @@ if (GETPOST("source") == 'contractline')
 	if (GETPOST('qty')) $qty=GETPOST('qty');
 
 	// Creditor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
 	print '</td></tr>'."\n";
 
 	// Debitor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$contract->thirdparty->name.'</b>';
 
 	// Object
-	
+
 	$text='<b>'.$langs->trans("PaymentRenewContractId",$contract->ref,$contractline->ref).'</b>';
 	if ($contractline->fk_product)
 	{
@@ -815,7 +824,7 @@ if (GETPOST("source") == 'contractline')
 	print '</td></tr>'."\n";
 
 	// Quantity
-	
+
 	$label=$langs->trans("Quantity");
 	$qty=1;
 	$duration='';
@@ -843,7 +852,7 @@ if (GETPOST("source") == 'contractline')
 	print '</b></td></tr>'."\n";
 
 	// Amount
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
@@ -863,7 +872,7 @@ if (GETPOST("source") == 'contractline')
 	print '</td></tr>'."\n";
 
 	// Tag
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
@@ -925,20 +934,20 @@ if (GETPOST("source") == 'membersubscription')
         if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
         $amount=price2num($amount);
     }
-    
+
 	$fulltag='MEM='.$member->id.'.DAT='.dol_print_date(dol_now(),'%Y%m%d%H%M');
 	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
 	$fulltag=dol_string_unaccent($fulltag);
 
 	// Creditor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
     print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
     print '</td></tr>'."\n";
 
 	// Debitor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Member");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>';
 	if ($member->morphy == 'mor' && ! empty($member->societe)) print $member->societe;
@@ -946,7 +955,7 @@ if (GETPOST("source") == 'membersubscription')
 	print '</b>';
 
 	// Object
-	
+
 	$text='<b>'.$langs->trans("PaymentSubscription").'</b>';
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
@@ -957,13 +966,13 @@ if (GETPOST("source") == 'membersubscription')
 	if ($member->last_subscription_date || $member->last_subscription_amount)
 	{
 		// Last subscription date
-		
+
 		print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionDate");
 		print '</td><td class="CTableRow'.($var?'1':'2').'">'.dol_print_date($member->last_subscription_date,'day');
 		print '</td></tr>'."\n";
 
 		// Last subscription amount
-		
+
 		print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionAmount");
 		print '</td><td class="CTableRow'.($var?'1':'2').'">'.price($member->last_subscription_amount);
 		print '</td></tr>'."\n";
@@ -972,7 +981,7 @@ if (GETPOST("source") == 'membersubscription')
 	}
 
 	// Amount
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount))
 	{
@@ -1001,7 +1010,7 @@ if (GETPOST("source") == 'membersubscription')
 	print '</td></tr>'."\n";
 
 	// Tag
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
@@ -1051,11 +1060,11 @@ if ($action != 'dopayment')
     if ($found && ! $error)	// We are in a management option and no error
     {
         // Buttons for all payments registration methods
-        
+
         if (! empty($conf->paypal->enabled))
         {
         	if (empty($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY)) $conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY='integral';
-        
+
         	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'integral')
         	{
         		print '<br><input class="button" type="submit" name="dopayment_paypal" value="'.$langs->trans("PaypalOrCBDoPayment").'">';
@@ -1065,13 +1074,13 @@ if ($action != 'dopayment')
         		print '<br><input class="button" type="submit" name="dopayment_paypal" value="'.$langs->trans("PaypalDoPayment").'">';
         	}
         }
-    
+
         if (! empty($conf->paybox->enabled))
         {
-        
-            
+
+
         }
-        
+
         // TODO Other methods
     }
     else
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index 6de2cb8a441..65fbfbd38a7 100644
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -265,17 +265,27 @@ $conf->dol_hide_leftmenu=1;
 
 llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
 
-if (! empty($conf->global->PAYPAL_API_SANDBOX))
-{
-	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode'),'','warning');
-}
-
 // Common variables
 $creditor=$mysoc->name;
 $paramcreditor='PAYPAL_CREDITOR_'.$suffix;
 if (! empty($conf->global->$paramcreditor)) $creditor=$conf->global->$paramcreditor;
 else if (! empty($conf->global->PAYPAL_CREDITOR)) $creditor=$conf->global->PAYPAL_CREDITOR;
 
+// Check link validity
+if (! empty($SOURCE) && in_array($ref, array('member_ref', 'contractline_ref', 'invoice_ref', 'order_ref', '')))
+{
+    $langs->load("errors");
+    dol_print_error_email('BADREFINPAYMENTFORM', $langs->trans("ErrorBadLinkSourceSetButBadValueForRef", $SOURCE, $ref));
+    llxFooter();
+    $db->close();
+    exit;
+}
+
+if (! empty($conf->global->PAYPAL_API_SANDBOX))
+{
+	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode'),'','warning');
+}
+
 print '<span id="dopaymentspan"></span>'."\n";
 print '<div class="center">'."\n";
 print '<form id="dolpaymentform" class="center" name="paymentform" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
@@ -359,14 +369,14 @@ if (! GETPOST("source"))
 	$fulltag=$tag;
 
 	// Creditor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
     print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
     print '</td></tr>'."\n";
 
 	// Amount
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
@@ -386,7 +396,7 @@ if (! GETPOST("source"))
 	print '</td></tr>'."\n";
 
 	// Tag
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
@@ -424,26 +434,26 @@ if (GETPOST("source") == 'order')
         if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
         $amount=price2num($amount);
     }
-    
+
 	$fulltag='ORD='.$order->ref.'.CUS='.$order->thirdparty->id;
 	//$fulltag.='.NAM='.strtr($order->thirdparty->name,"-"," ");
 	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
 	$fulltag=dol_string_unaccent($fulltag);
 
 	// Creditor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
     print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
     print '</td></tr>'."\n";
 
 	// Debitor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$order->thirdparty->name.'</b>';
 
 	// Object
-	
+
 	$text='<b>'.$langs->trans("PaymentOrderRef",$order->ref).'</b>';
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
@@ -452,7 +462,7 @@ if (GETPOST("source") == 'order')
 	print '</td></tr>'."\n";
 
 	// Amount
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
@@ -472,7 +482,7 @@ if (GETPOST("source") == 'order')
 	print '</td></tr>'."\n";
 
 	// Tag
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
@@ -534,26 +544,26 @@ if (GETPOST("source") == 'invoice')
         if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
         $amount=price2num($amount);
     }
-    
+
 	$fulltag='INV='.$invoice->ref.'.CUS='.$invoice->thirdparty->id;
 	//$fulltag.='.NAM='.strtr($invoice->thirdparty->name,"-"," ");
 	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
 	$fulltag=dol_string_unaccent($fulltag);
 
 	// Creditor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
     print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
     print '</td></tr>'."\n";
 
 	// Debitor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$invoice->thirdparty->name.'</b>';
 
 	// Object
-	
+
 	$text='<b>'.$langs->trans("PaymentInvoiceRef",$invoice->ref).'</b>';
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
@@ -562,7 +572,7 @@ if (GETPOST("source") == 'invoice')
 	print '</td></tr>'."\n";
 
 	// Amount
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
@@ -582,7 +592,7 @@ if (GETPOST("source") == 'invoice')
 	print '</td></tr>'."\n";
 
 	// Tag
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
@@ -662,7 +672,7 @@ if (GETPOST("source") == 'contractline')
     	{
     		$product=new Product($db);
     		$result=$product->fetch($contractline->fk_product);
-    
+
     		// We define price for product (TODO Put this in a method in product class)
     		if (! empty($conf->global->PRODUIT_MULTIPRICES))
     		{
@@ -676,7 +686,7 @@ if (GETPOST("source") == 'contractline')
     			$pu_ttc = $product->price_ttc;
     			$price_base_type = $product->price_base_type;
     		}
-    
+
     		$amount=$pu_ttc;
     		if (empty($amount))
     		{
@@ -697,19 +707,19 @@ if (GETPOST("source") == 'contractline')
 	if (GETPOST('qty')) $qty=GETPOST('qty');
 
 	// Creditor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
 	print '</td></tr>'."\n";
 
 	// Debitor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$contract->thirdparty->name.'</b>';
 
 	// Object
-	
+
 	$text='<b>'.$langs->trans("PaymentRenewContractId",$contract->ref,$contractline->ref).'</b>';
 	if ($contractline->fk_product)
 	{
@@ -732,7 +742,7 @@ if (GETPOST("source") == 'contractline')
 	print '</td></tr>'."\n";
 
 	// Quantity
-	
+
 	$label=$langs->trans("Quantity");
 	$qty=1;
 	$duration='';
@@ -760,7 +770,7 @@ if (GETPOST("source") == 'contractline')
 	print '</b></td></tr>'."\n";
 
 	// Amount
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
@@ -780,7 +790,7 @@ if (GETPOST("source") == 'contractline')
 	print '</td></tr>'."\n";
 
 	// Tag
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
@@ -824,6 +834,7 @@ if (GETPOST("source") == 'membersubscription')
 	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
 
+
 	$member=new Adherent($db);
 	$result=$member->fetch('',$ref);
 	if ($result < 0)
@@ -842,20 +853,20 @@ if (GETPOST("source") == 'membersubscription')
         if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
         $amount=price2num($amount);
     }
-    
+
 	$fulltag='MEM='.$member->id.'.DAT='.dol_print_date(dol_now(),'%Y%m%d%H%M');
 	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
 	$fulltag=dol_string_unaccent($fulltag);
 
 	// Creditor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
     print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
     print '</td></tr>'."\n";
 
 	// Debitor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Member");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>';
 	if ($member->morphy == 'mor' && ! empty($member->societe)) print $member->societe;
@@ -863,7 +874,7 @@ if (GETPOST("source") == 'membersubscription')
 	print '</b>';
 
 	// Object
-	
+
 	$text='<b>'.$langs->trans("PaymentSubscription").'</b>';
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
@@ -874,13 +885,13 @@ if (GETPOST("source") == 'membersubscription')
 	if ($member->last_subscription_date || $member->last_subscription_amount)
 	{
 		// Last subscription date
-		
+
 		print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionDate");
 		print '</td><td class="CTableRow'.($var?'1':'2').'">'.dol_print_date($member->last_subscription_date,'day');
 		print '</td></tr>'."\n";
 
 		// Last subscription amount
-		
+
 		print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionAmount");
 		print '</td><td class="CTableRow'.($var?'1':'2').'">'.price($member->last_subscription_amount);
 		print '</td></tr>'."\n";
@@ -889,7 +900,7 @@ if (GETPOST("source") == 'membersubscription')
 	}
 
 	// Amount
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount))
 	{
@@ -918,7 +929,7 @@ if (GETPOST("source") == 'membersubscription')
 	print '</td></tr>'."\n";
 
 	// Tag
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
diff --git a/htdocs/public/stripe/newpayment.php b/htdocs/public/stripe/newpayment.php
index 01ae19c7032..af0c880d3c8 100644
--- a/htdocs/public/stripe/newpayment.php
+++ b/htdocs/public/stripe/newpayment.php
@@ -196,7 +196,7 @@ else if (! empty($conf->global->STRIPE_CREDITOR)) $creditor=$conf->global->STRIP
 if ($action == 'dopayment')    // We click on button Create payment
 {
     if (GETPOST('newamount')) $amount = GETPOST('newamount');
-    else 
+    else
     {
         setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
         $action = '';
@@ -209,18 +209,18 @@ if ($action == 'charge')
     // See https://support.stripe.com/questions/which-zero-decimal-currencies-does-stripe-support
     $arrayzerounitcurrency=array('BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'VND', 'VUV', 'XAF', 'XOF', 'XPF');
     if (! in_array($currency, $arrayzerounitcurrency)) $amount=$amount * 100;
-    
+
     dol_syslog("POST keys  : ".join(',', array_keys($_POST)), LOG_DEBUG, 0, '_stripe');
     dol_syslog("POST values: ".join(',', $_POST), LOG_DEBUG, 0, '_stripe');
-    
+
     $stripeToken = GETPOST("stripeToken",'alpha');
     $email = GETPOST("stripeEmail",'alpha');
 
     dol_syslog("stripeToken = ".$stripeToken, LOG_DEBUG, 0, '_stripe');
     dol_syslog("stripeEmail = ".$stripeEmail, LOG_DEBUG, 0, '_stripe');
-    
+
     $error = 0;
-    
+
     try {
         dol_syslog("Create customer", LOG_DEBUG, 0, '_stripe');
         $customer = \Stripe\Customer::create(array(
@@ -230,7 +230,7 @@ if ($action == 'charge')
             'source'  => $stripeToken           // source can be a token OR array('object'=>'card', 'exp_month'=>xx, 'exp_year'=>xxxx, 'number'=>xxxxxxx, 'cvc'=>xxx, 'name'=>'Cardholder's full name', zip ?)
         ));
         // TODO Add 'business_vat_id' ?
-        
+
         dol_syslog("Create charge", LOG_DEBUG, 0, '_stripe');
         $charge = \Stripe\Charge::create(array(
             'customer' => $customer->id,
@@ -244,14 +244,14 @@ if ($action == 'charge')
         // Since it's a decline, \Stripe\Error\Card will be caught
         $body = $e->getJsonBody();
         $err  = $body['error'];
-    
+
         print('Status is:' . $e->getHttpStatus() . "\n");
         print('Type is:' . $err['type'] . "\n");
         print('Code is:' . $err['code'] . "\n");
         // param is '' in this case
         print('Param is:' . $err['param'] . "\n");
         print('Message is:' . $err['message'] . "\n");
-    
+
         $error++;
         setEventMessages($e->getMessage(), null, 'errors');
         dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
@@ -295,7 +295,7 @@ if ($action == 'charge')
         setEventMessages($e->getMessage(), null, 'errors');
         $action='';
     }
-        
+
 	$_SESSION["onlinetoken"] = $stripeToken;
     $_SESSION["FinalPaymentAmt"] = $amount;
     $_SESSION["currencyCodeType"] = $currency;
@@ -303,12 +303,12 @@ if ($action == 'charge')
     $_SESSION['ipaddress'] = $_SERVER['REMOTE_ADDR'];  // Payer ip
     $_SESSION['payerID'] = is_object($customer)?$customer->id:'';
     $_SESSION['TRANSACTIONID'] = is_object($charge)?$charge->id:'';
-    
+
     dol_syslog("Action charge stripe result=".$error." ip=".$_SESSION['ipaddress'], LOG_DEBUG, 0, '_stripe');
     dol_syslog("onlinetoken=".$_SESSION["onlinetoken"]." FinalPaymentAmt=".$_SESSION["FinalPaymentAmt"]." currencyCodeType=".$_SESSION["currencyCodeType"]." payerID=".$_SESSION['payerID']." TRANSACTIONID=".$_SESSION['TRANSACTIONID'], LOG_DEBUG, 0, '_stripe');
     dol_syslog("FULLTAG=".$FULLTAG, LOG_DEBUG, 0, '_stripe');
     dol_syslog("Now call the redirect to paymentok or paymentko", LOG_DEBUG, 0, '_stripe');
-    
+
     if ($error)
     {
         header("Location: ".$urlko);
@@ -319,7 +319,7 @@ if ($action == 'charge')
         header("Location: ".$urlok);
         exit;
     }
-    
+
 }
 
 
@@ -335,6 +335,16 @@ $conf->dol_hide_leftmenu=1;
 
 llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
 
+// Check link validity
+if (! empty($SOURCE) && in_array($ref, array('member_ref', 'contractline_ref', 'invoice_ref', 'order_ref', '')))
+{
+    $langs->load("errors");
+    dol_print_error_email('BADREFINPAYMENTFORM', $langs->trans("ErrorBadLinkSourceSetButBadValueForRef", $SOURCE, $ref));
+    llxFooter();
+    $db->close();
+    exit;
+}
+
 if (empty($conf->global->STRIPE_LIVE))
 {
     dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode'),'','warning');
@@ -420,7 +430,7 @@ if (! GETPOST("source"))
     $found=true;
     $tag=GETPOST("tag");
     $fulltag=$tag;
-    
+
     // Creditor
     print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
     print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
@@ -485,7 +495,7 @@ if (GETPOST("source") == 'order')
         if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
         $amount=price2num($amount);
     }
-    
+
     $fulltag='ORD='.$order->ref.'.CUS='.$order->thirdparty->id;
     //$fulltag.='.NAM='.strtr($order->thirdparty->name,"-"," ");
     if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
@@ -600,7 +610,7 @@ if (GETPOST("source") == 'invoice')
     //$fulltag.='.NAM='.strtr($invoice->thirdparty->name,"-"," ");
     if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
     $fulltag=dol_string_unaccent($fulltag);
-    
+
     // Creditor
 
     print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
@@ -723,7 +733,7 @@ if (GETPOST("source") == 'contractline')
         {
             $product=new Product($db);
             $result=$product->fetch($contractline->fk_product);
-    
+
             // We define price for product (TODO Put this in a method in product class)
             if (! empty($conf->global->PRODUIT_MULTIPRICES))
             {
@@ -737,7 +747,7 @@ if (GETPOST("source") == 'contractline')
                 $pu_ttc = $product->price_ttc;
                 $price_base_type = $product->price_base_type;
             }
-    
+
             $amount=$pu_ttc;
             if (empty($amount))
             {
@@ -749,7 +759,7 @@ if (GETPOST("source") == 'contractline')
         if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
         $amount=price2num($amount);
     }
-    
+
     $fulltag='COL='.$contractline->ref.'.CON='.$contract->ref.'.CUS='.$contract->thirdparty->id.'.DAT='.dol_print_date(dol_now(),'%Y%m%d%H%M');
     //$fulltag.='.NAM='.strtr($contract->thirdparty->name,"-"," ");
     if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
@@ -904,7 +914,7 @@ if (GETPOST("source") == 'membersubscription')
         if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
         $amount=price2num($amount);
     }
-    
+
     $fulltag='MEM='.$member->id.'.DAT='.dol_print_date(dol_now(),'%Y%m%d%H%M');
     if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
     $fulltag=dol_string_unaccent($fulltag);
@@ -1059,7 +1069,7 @@ if (preg_match('/^dopayment/',$action))
      data-description="'.$ref.'">
      </script>';
      */
-    
+
     // Personalized checkout
     print '<style>
     /**
@@ -1075,22 +1085,22 @@ if (preg_match('/^dopayment/',$action))
         -webkit-transition: box-shadow 150ms ease;
         transition: box-shadow 150ms ease;
     }
-    
+
     .StripeElement--focus {
         box-shadow: 0 1px 3px 0 #cfd7df;
     }
-    
+
     .StripeElement--invalid {
         border-color: #fa755a;
     }
-    
+
     .StripeElement--webkit-autofill {
         background-color: #fefde5 !important;
     }
     </style>';
-    
+
     print '
-    
+
     <br>
     <form action="'.$_SERVER['REQUEST_URI'].'" method="POST" id="payment-form">';
 
@@ -1106,11 +1116,11 @@ if (preg_match('/^dopayment/',$action))
     print '<input type="hidden" name="entity" value="'.$entity.'" />';
     print '<input type="hidden" name="amount" value="'.$amount.'">'."\n";
     print '<input type="hidden" name="currency" value="'.$currency.'">'."\n";
-    
+
     print '
     <table id="dolpaymenttable" summary="Payment form" class="center">
     <tbody><tr><td class="textpublicpayment">
-                    
+
     <div class="form-row left">
     <label for="card-element">
     Credit or debit card
@@ -1118,7 +1128,7 @@ if (preg_match('/^dopayment/',$action))
     <div id="card-element">
     <!-- a Stripe Element will be inserted here. -->
     </div>
-    
+
     <!-- Used to display form errors -->
     <div id="card-errors" role="alert"></div>
     </div>
@@ -1126,22 +1136,22 @@ if (preg_match('/^dopayment/',$action))
     <button class="button" id="buttontopay">'.$langs->trans("ToPay").'</button>
     <img id="hourglasstopay" class="hidden" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/working.gif'.'">
     </td></tr></tbody></table>
-        
+
     </form>
 
-        
+
     <script src="https://js.stripe.com/v2/"></script>
     <script src="https://js.stripe.com/v3/"></script>
-    
+
     <script type="text/javascript" language="javascript">';
     ?>
 
     // Create a Stripe client
     var stripe = Stripe('<?php echo $stripe['publishable_key']; ?>');
-    
+
     // Create an instance of Elements
     var elements = stripe.elements();
-    
+
     // Custom styling can be passed to options when creating an Element.
     // (Note that this demo uses a wider set of styles than the guide below.)
     var style = {
@@ -1160,13 +1170,13 @@ if (preg_match('/^dopayment/',$action))
         iconColor: '#fa755a'
       }
     };
-    
+
     // Create an instance of the card Element
     var card = elements.create('card', {style: style});
-    
+
     // Add an instance of the card Element into the `card-element` <div>
     card.mount('#card-element');
-    
+
     // Handle real-time validation errors from the card Element.
     card.addEventListener('change', function(event) {
       var displayError = document.getElementById('card-errors');
@@ -1176,13 +1186,13 @@ if (preg_match('/^dopayment/',$action))
         displayError.textContent = '';
       }
     });
-    
+
     // Handle form submission
     var form = document.getElementById('payment-form');
     console.log(form);
     form.addEventListener('submit', function(event) {
       event.preventDefault();
-    
+
       stripe.createToken(card).then(function(result) {
         if (result.error) {
           // Inform the user if there was an error
@@ -1194,7 +1204,7 @@ if (preg_match('/^dopayment/',$action))
         }
       });
     });
-    
+
     function stripeTokenHandler(token) {
       // Insert the token ID into the form so it gets submitted to the server
       var form = document.getElementById('payment-form');
@@ -1203,16 +1213,16 @@ if (preg_match('/^dopayment/',$action))
       hiddenInput.setAttribute('name', 'stripeToken');
       hiddenInput.setAttribute('value', token.id);
       form.appendChild(hiddenInput);
-    
+
       // Submit the form
       jQuery('#buttontopay').hide();
       jQuery('#hourglasstopay').show();
       console.log("submit");
       form.submit();
-    }        
-    
+    }
+
     <?php
-    print '</script>';    
+    print '</script>';
 }
 
 

From bebf2b33eaa3f4439543d012d7f9e97cb7f457cd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Jun 2017 09:25:35 +0200
Subject: [PATCH 061/438] CSS enhancement for mobile

---
 htdocs/theme/eldy/style.css.php |  9 ++++++++
 htdocs/theme/md/style.css.php   | 41 ++++++++++++++++++---------------
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index c66fa33dfaa..4227b86ca51 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -712,6 +712,7 @@ div.fiche>form>div.div-table-responsive {
     align-self: flex-start;
 }
 
+
 /* ============================================================================== */
 /* Styles to hide objects                                                         */
 /* ============================================================================== */
@@ -2795,6 +2796,9 @@ div.tabBar .noborder {
 
 @media only screen and (max-width: 767px)
 {
+	.thumbstat {
+		flex: 1 1 110px;
+	}
 	.thumbstat150 {
 		flex: 1 1 110px;
 	}
@@ -4594,6 +4598,11 @@ div.tabsElem a.tab {
         background: #FFF;
 	}
 
+    .login_vertical_align {
+    	padding-left: 20px;
+    	padding-right: 20px;
+    }
+
 	/* Reduce login top right info */
 	.help {
 	<?php if ($disableimages) {  ?>
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index a1851dc4a76..6e31fc3ed11 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -317,7 +317,7 @@ textarea {
 	border-left:solid 1px rgba(0,0,0,.1);
 	border-right:solid 1px rgba(0,0,0,.1);
 	border-bottom:solid 1px rgba(0,0,0,.2);
-		
+
 	background-color: #FFF;
 	padding:4px;
 	margin-left:1px;
@@ -867,10 +867,10 @@ div.fiche>form>div.div-table-responsive {
     	width: 20px;
         object-fit: contain;
     }
-    
+
 	div.statusref {
     	padding-right: 10px;
-   	}    
+   	}
 }
 .linkobject { cursor: pointer; }
 <?php if (GETPOST('optioncss','aZ09') == 'print') { ?>
@@ -1557,12 +1557,12 @@ foreach($mainmenuusedarray as $val)
 	display: table;
     position: absolute;
     height: 100%;
-    width: 100%;	
+    width: 100%;
 }
 .login_center {
 	display: table-cell;
     vertical-align: middle;
-}	
+}
 .login_vertical_align {
 	padding: 10px;
 	padding-bottom: 80px;
@@ -1992,14 +1992,14 @@ div.tabBar {
     border-top: 1px solid #CCC;
 	width: auto;
 	background: rgb(<?php echo $colorbacktabcard1; ?>);
-	border-bottom: 1px solid #aaa; 
+	border-bottom: 1px solid #aaa;
 }
 div.tabBar div.titre {
-	padding-top: 10px;    
+	padding-top: 10px;
 }
 div.tabBarWithBottom {
 	padding-bottom: 18px;
-	border-bottom: 1px solid #aaa; 
+	border-bottom: 1px solid #aaa;
 }
 div.tabBar table.tableforservicepart2:last-child {
     border-bottom: 1px solid #aaa;
@@ -2720,7 +2720,7 @@ tr.liste_titre th, tr.liste_titre td, th.liste_titre, form.liste_titre div, div.
 {
 	border-bottom: 1px solid #<?php echo ($colorbacktitle1 == '255,255,255'?'BBBBBB':'FDFFFF'); ?>;
 }
-/* TODO Once title line is moved under title search, make border bottom of all th black and force to whit when it's first tr */ 
+/* TODO Once title line is moved under title search, make border bottom of all th black and force to whit when it's first tr */
 tr:first-child th.liste_titre {
     border-bottom: 1px solid #FFF ! important;
 }
@@ -2826,7 +2826,7 @@ div .tdtop {
 
 /* Prepare to remove class pair - impair */
 
-.noborder > tbody > tr:nth-child(even):not(.liste_titre), .liste > tbody > tr:nth-child(even):not(.liste_titre) { 
+.noborder > tbody > tr:nth-child(even):not(.liste_titre), .liste > tbody > tr:nth-child(even):not(.liste_titre) {
 	background: linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
 	background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
 	background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
@@ -2852,7 +2852,7 @@ div .tdtop {
 /*
  *  Boxes
  */
- 
+
 .ficheaddleft div.boxstats {
     border: none;
 }
@@ -2866,29 +2866,32 @@ div .tdtop {
     text-align: center;
     border-radius: 2px;
 }
-.boxstats, .boxstats130, .boxstatscontent {    
+.boxstats, .boxstats130, .boxstatscontent {
 	white-space: nowrap;
 	overflow: hidden;
     text-overflow: ellipsis;
 }
 .boxstats {
     padding: 3px;
-    width: 105px;    
+    width: 105px;
 }
 .boxstats130 {
-    width: 135px; 
+    width: 135px;
     height: 48px;
-    padding: 3px  
+    padding: 3px
 }
 @media only screen and (max-width: 767px)
 {
+	.thumbstat {
+		flex: 1 1 110px;
+	}
 	.thumbstat150 {
 		flex: 1 1 110px;
 	}
 	.boxstats, .boxstats130 {
-        width: 90px;    
+        width: 90px;
     }
-    .dashboardlineindicator { 
+    .dashboardlineindicator {
         float: left;
     	padding-left: 5px;
     }
@@ -2927,7 +2930,7 @@ span.dashboardlineko {
     padding: 1px 6px 1px 6px;
     background-color: #8c4446;
     color: #FFFFFF ! important;
-    border-radius: .25em;    
+    border-radius: .25em;
 }
 .boxtable {
     margin-bottom: 8px !important;
@@ -4047,7 +4050,7 @@ div.dataTables_length select {
 	border-top: 1px solid #ccc;
 	border-bottom: 1px solid #ccc;
 }
-.select2-container-active .select2-choice, .select2-container-active .select2-choices 
+.select2-container-active .select2-choice, .select2-container-active .select2-choices
 {
 	outline: none;
 	border-top: none;

From df883a601b53ead931a2d6187d2e1576a44d09ef Mon Sep 17 00:00:00 2001
From: arnaud <arnaud.saint-patrice@atm-consulting.fr>
Date: Fri, 2 Jun 2017 12:28:50 +0200
Subject: [PATCH 062/438] FIX contratligne update

---
 htdocs/contrat/class/contrat.class.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index a97391de170..9878e08d447 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -2743,6 +2743,8 @@ class ContratLigne extends CommonObjectLine
 		if (empty($this->total_ht)) $this->total_ht = 0;
 		if (empty($this->total_tva)) $this->total_tva = 0;
 		if (empty($this->total_ttc)) $this->total_ttc = 0;
+		if (empty($this->localtax1_tx)) $this->localtax1_tx = 0;
+		if (empty($this->localtax2_tx)) $this->localtax2_tx = 0;
 
 		// Check parameters
 		// Put here code to add control on parameters values

From 64cd1e0923755d4fddcf2c8788e2fe323f953d8d Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Fri, 2 Jun 2017 12:31:03 +0200
Subject: [PATCH 063/438] Fix get extrafields value from getOptionalsFromPost
 give an error with chkbxlst type on propaldet for exemple

---
 htdocs/core/class/extrafields.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index c89fc593745..bd1daca8886 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1681,7 +1681,7 @@ class ExtraFields
 					// Clean parameters
 					$value_key=dol_mktime($_POST[$keysuffix."options_".$key.$keyprefix."hour"], $_POST[$keysuffix."options_".$key.$keyprefix."min"], 0, $_POST[$keysuffix."options_".$key.$keyprefix."month"], $_POST[$keysuffix."options_".$key.$keyprefix."day"], $_POST[$keysuffix."options_".$key.$keyprefix."year"]);
 				}
-				else if (in_array($key_type,array('checkbox')))
+				else if (in_array($key_type,array('checkbox', 'chkbxlst')))
 				{
 					$value_arr=GETPOST($keysuffix."options_".$key.$keyprefix);
 					// Make sure we get an array even if there's only one checkbox

From c59d216cf5f82572f7b3a24de978dda8037845ae Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Jun 2017 12:27:46 +0200
Subject: [PATCH 064/438] NEW Can read time spent of others (hierarchy only or
 all if granted)

---
 htdocs/core/actions_setmoduleoptions.inc.php |  86 ------------
 htdocs/core/class/html.form.class.php        |   8 +-
 htdocs/core/class/html.formcompany.class.php |  19 +--
 htdocs/core/class/html.formprojet.class.php  |  52 ++++----
 htdocs/core/js/timesheet.js                  |   4 +-
 htdocs/core/lib/project.lib.php              | 130 +++++++++++--------
 htdocs/langs/en_US/admin.lang                |   2 +-
 htdocs/langs/en_US/projects.lang             |   9 +-
 htdocs/projet/activity/perday.php            | 100 +++++++-------
 htdocs/projet/activity/perweek.php           | 114 ++++++++--------
 htdocs/projet/card.php                       |  60 +++++----
 htdocs/theme/eldy/style.css.php              |  14 +-
 htdocs/theme/md/style.css.php                |   9 +-
 13 files changed, 269 insertions(+), 338 deletions(-)
 delete mode 100644 htdocs/core/actions_setmoduleoptions.inc.php

diff --git a/htdocs/core/actions_setmoduleoptions.inc.php b/htdocs/core/actions_setmoduleoptions.inc.php
deleted file mode 100644
index 03b33b19eb1..00000000000
--- a/htdocs/core/actions_setmoduleoptions.inc.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-/* Copyright (C) 2014 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * or see http://www.gnu.org/
- */
-
-/**
- *	\file			htdocs/core/actions_setnotes.inc.php
- *  \brief			Code for actions on setting notes of object page
- */
-
-
-// $action must be defined
-// $_FILES may be defined
-// $nomessageinsetmoduleoptions can be set to 1
-
-// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
-if ($action == 'setModuleOptions')
-{
-    $db->begin();
-
-    // Process common param fields
-    foreach($_POST as $key => $val)
-    {
-        if (preg_match('/^param(\d*)$/', $key, $reg))    // Works for POST['param'], POST['param1'], POST['param2'], ...
-        {
-            $param=GETPOST("param".$reg[1],'alpha');
-            $value=GETPOST("value".$reg[1],'alpha');
-            if ($param)
-            {
-                $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-                if (! $res > 0) $error++;
-            }
-        }
-    }
-
-    // Process upload fields
-    if (GETPOST('upload','alpha') && GETPOST('keyforuploaddir','aZ09'))
-    {
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-        $keyforuploaddir=GETPOST('keyforuploaddir','aZ09');
-        $listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->$keyforuploaddir)));
-        foreach($listofdir as $key=>$tmpdir)
-        {
-            $tmpdir=trim($tmpdir);
-            $tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
-            if (! $tmpdir) {
-                unset($listofdir[$key]); continue;
-            }
-            if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
-            else
-            {
-                $upload_dir=$tmpdir;
-            }
-        }
-        if ($upload_dir)
-        {
-            $result = dol_add_file_process($upload_dir, 0, 1, 'uploadfile', '');
-            if ($result <= 0) $error++;
-        }
-    }
-
-    if (! $error)
-    {
-        $db->commit();
-        if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-        $db->rollback();
-        if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
-    }
-}
-
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index cf6ae18f568..34693cba67a 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1391,7 +1391,7 @@ class Form
      *  @deprecated
      *  @see select_dolusers()
      */
-    function select_users($selected='',$htmlname='userid',$show_empty=0,$exclude='',$disabled=0,$include='',$enableonly='',$force_entity=0)
+    function select_users($selected='',$htmlname='userid',$show_empty=0,$exclude=null,$disabled=0,$include='',$enableonly='',$force_entity=0)
     {
         print $this->select_dolusers($selected,$htmlname,$show_empty,$exclude,$disabled,$include,$enableonly,$force_entity);
     }
@@ -1411,13 +1411,13 @@ class Form
      *  @param	int		$showstatus		0=show user status only if status is disabled, 1=always show user status into label, -1=never show user status
      *  @param	string	$morefilter		Add more filters into sql request
      *  @param	integer	$show_every		0=default list, 1=add also a value "Everybody" at beginning of list
-     *  @param	string	$enableonlytext	If option $enableonly is set, we use this text to explain into label why record is disabled. Not used if enableonly is empty.
+     *  @param	string	$enableonlytext	If option $enableonlytext is set, we use this text to explain into label why record is disabled. Not used if enableonly is empty.
      *  @param	string	$morecss		More css
      *  @param  int     $noactive       Show only active users (this will also happened whatever is this option if USER_HIDE_INACTIVE_IN_COMBOBOX is on).
      * 	@return	string					HTML select string
      *  @see select_dolgroups
      */
-    function select_dolusers($selected='', $htmlname='userid', $show_empty=0, $exclude='', $disabled=0, $include='', $enableonly='', $force_entity=0, $maxlength=0, $showstatus=0, $morefilter='', $show_every=0, $enableonlytext='', $morecss='', $noactive=0)
+    function select_dolusers($selected='', $htmlname='userid', $show_empty=0, $exclude=null, $disabled=0, $include='', $enableonly='', $force_entity=0, $maxlength=0, $showstatus=0, $morefilter='', $show_every=0, $enableonlytext='', $morecss='', $noactive=0)
     {
         global $conf,$user,$langs;
 
@@ -1613,7 +1613,7 @@ class Form
      * 	@return	string					HTML select string
      *  @see select_dolgroups
      */
-    function select_dolusers_forevent($action='', $htmlname='userid', $show_empty=0, $exclude='', $disabled=0, $include='', $enableonly='', $force_entity=0, $maxlength=0, $showstatus=0, $morefilter='')
+    function select_dolusers_forevent($action='', $htmlname='userid', $show_empty=0, $exclude=null, $disabled=0, $include='', $enableonly='', $force_entity=0, $maxlength=0, $showstatus=0, $morefilter='')
     {
         global $conf,$user,$langs;
 
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index bcff0981a70..88ebb816a31 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -358,7 +358,7 @@ class FormCompany
 	 *
 	 *  @param  string	$selected   	Title preselected
 	 * 	@param	string	$htmlname		Name of HTML select combo field
-	 *  @param  string  $morecss        Add more css on SELECT element      
+	 *  @param  string  $morecss        Add more css on SELECT element
 	 *  @return	string					String with HTML select
 	 */
 	function select_civility($selected='',$htmlname='civility_id',$morecss='maxwidth100')
@@ -563,11 +563,11 @@ class FormCompany
 			$events=array();
 			// Add an entry 'method' to say 'yes, we must execute url with param action = method';
 			// Add an entry 'url' to say which url to execute
-			// Add an entry htmlname to say which element we must change once url is called 
-			// Add entry params => array('cssid' => 'attr') to say to remov or add attribute attr if answer of url return  0 or >0 lines 
+			// Add an entry htmlname to say which element we must change once url is called
+			// Add entry params => array('cssid' => 'attr') to say to remov or add attribute attr if answer of url return  0 or >0 lines
 			// To refresh contacts list on thirdparty list change
 			$events[]=array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php',1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
-			
+
 			if (count($events))	// If there is some ajax events to run once selection is done, we add code here to run events
 			{
 				print '<script type="text/javascript">
@@ -583,7 +583,7 @@ class FormCompany
 						/* Clean contact */
 						$("div#s2id_contactid>a>span").html(\'\');
 					});
-								    
+
 					// Function used to execute events when search_htmlname change
 					function runJsCodeForEvent'.$htmlname.'(obj) {
 						var id = $("#'.$htmlname.'").val();
@@ -693,16 +693,17 @@ class FormCompany
      *  @param  string		$source			Source ('internal' or 'external')
      *  @param  string		$sortorder		Sort criteria ('position', 'code', ...)
      *  @param  int			$showempty      1=Add en empty line
+     *  @param  string      $morecss        Add more css to select component
      *  @return	void
      */
-	function selectTypeContact($object, $selected, $htmlname = 'type', $source='internal', $sortorder='position', $showempty=0)
+	function selectTypeContact($object, $selected, $htmlname = 'type', $source='internal', $sortorder='position', $showempty=0, $morecss='')
 	{
 	    global $user, $langs;
-	    
+
 		if (is_object($object) && method_exists($object, 'liste_type_contact'))
 		{
 			$lesTypes = $object->liste_type_contact($source, $sortorder, 0, 1);
-			print '<select class="flat valignmiddle" name="'.$htmlname.'" id="'.$htmlname.'">';
+			print '<select class="flat valignmiddle'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'">';
 			if ($showempty) print '<option value="0"></option>';
 			foreach($lesTypes as $key=>$value)
 			{
@@ -791,7 +792,7 @@ class FormCompany
 
         $maxlength=$formlength;
         if (empty($formlength)) { $formlength=24; $maxlength=128; }
-        
+
         $out = '<input type="text" '.($morecss?'class="'.$morecss.'" ':'').'name="'.$htmlname.'" id="'.$htmlname.'" maxlength="'.$maxlength.'" value="'.$selected.'">';
 
         return $out;
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index 30481497163..93ebbf71ddd 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -68,7 +68,7 @@ class FormProjets
 		global $langs,$conf,$form;
 
 		$out='';
-		
+
 		if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->PROJECT_USE_SEARCH_TO_SELECT))
 		{
 			$placeholder='';
@@ -92,7 +92,7 @@ class FormProjets
 		else
 		{
 			$out.=$this->select_projects_list($socid, $selected, $htmlname, $maxlength, $option_only, $show_empty, $discard_closed, $forcefocus, $disabled, 0, $filterkey, 1, $forceaddid, $htmlid);
-			if ($discard_closed) 
+			if ($discard_closed)
 			{
 			    if (class_exists('Form'))
 			    {
@@ -101,8 +101,8 @@ class FormProjets
 			    }
 			}
 		}
-		
-		if (empty($nooutput)) 
+
+		if (empty($nooutput))
 		{
 		    print $out;
 		    return '';
@@ -136,10 +136,10 @@ class FormProjets
 		require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 		if (empty($htmlid)) $htmlid = $htmlname;
-		
+
 		$out='';
         $outarray=array();
-        
+
 		$hideunselectables = false;
 		if (! empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true;
 
@@ -170,21 +170,19 @@ class FormProjets
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
-			$minmax='maxwidth500';
+			$morecss='maxwidth500';
 
 			// Use select2 selector
-			$nodatarole='';
 			if (! empty($conf->use_javascript_ajax))
 			{
 				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
 	           	$comboenhancement = ajax_combobox($htmlid, array(), 0, $forcefocus);
             	$out.=$comboenhancement;
-            	$nodatarole=($comboenhancement?' data-role="none"':'');
-            	$minmax='minwidth100 maxwidth300';
+            	$morecss='minwidth100 maxwidth300';
 			}
 
 			if (empty($option_only)) {
-				$out.= '<select class="flat'.($minmax?' '.$minmax:'').'"'.($disabled?' disabled="disabled"':'').' id="'.$htmlid.'" name="'.$htmlname.'"'.$nodatarole.'>';
+				$out.= '<select class="flat'.($morecss?' '.$morecss:'').'"'.($disabled?' disabled="disabled"':'').' id="'.$htmlid.'" name="'.$htmlname.'">';
 			}
 			if (!empty($show_empty)) {
 				$out.= '<option value="0">&nbsp;</option>';
@@ -213,12 +211,12 @@ class FormProjets
 						//if ($obj->public) $labeltoshow.=' ('.$langs->trans("SharedProject").')';
 						//else $labeltoshow.=' ('.$langs->trans("Private").')';
 						$labeltoshow.=', '.dol_trunc($obj->title, $maxlength);
-						if ($obj->name) 
+						if ($obj->name)
 						{
 						    $labeltoshow.=' - '.$obj->name;
 						    if ($obj->name_alias) $labeltoshow.=' ('.$obj->name_alias.')';
 						}
-						
+
 						$disabled=0;
 						if ($obj->fk_statut == 0)
 						{
@@ -277,7 +275,7 @@ class FormProjets
 
 			if (!$mode) {
 				if (empty($option_only)) $out.= '</select>';
-				if (empty($nooutput)) 
+				if (empty($nooutput))
 				{
 				    print $out;
 				    return '';
@@ -302,13 +300,14 @@ class FormProjets
 	 *	@param  string	$htmlname   	Name of HTML select
 	 *	@param	int		$maxlength		Maximum length of label
 	 *	@param	int		$option_only	Return only html options lines without the select tag
-	 *	@param	int		$show_empty		Add an empty line
+	 *	@param	string	$show_empty		Add an empty line ('1' or string to show for empty line)
 	 *  @param	int		$discard_closed Discard closed projects (0=Keep,1=hide completely,2=Disable)
      *  @param	int		$forcefocus		Force focus on field (works with javascript only)
      *  @param	int		$disabled		Disabled
+	 *  @param	string	$morecss        More css added to the select component
 	 *	@return int         			Nbr of project if OK, <0 if KO
 	 */
-	function selectTasks($socid=-1, $selected='', $htmlname='taskid', $maxlength=24, $option_only=0, $show_empty=1, $discard_closed=0, $forcefocus=0, $disabled=0)
+	function selectTasks($socid=-1, $selected='', $htmlname='taskid', $maxlength=24, $option_only=0, $show_empty='1', $discard_closed=0, $forcefocus=0, $disabled=0, $morecss='maxwidth500')
 	{
 		global $user,$conf,$langs;
 
@@ -339,28 +338,26 @@ class FormProjets
 		if ($socid > 0)  $sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
 		$sql.= " ORDER BY p.ref, t.ref ASC";
 
-		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
-			$minmax='maxwidth500';
-
 			// Use select2 selector
-			$nodatarole='';
 			if (! empty($conf->use_javascript_ajax))
 			{
 				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
 	           	$comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);
             	$out.=$comboenhancement;
-            	$nodatarole=($comboenhancement?' data-role="none"':'');
-            	$minmax='minwidth200 maxwidth500';
+            	$morecss='minwidth200 maxwidth500';
 			}
 
 			if (empty($option_only)) {
-				$out.= '<select class="valignmiddle flat'.($minmax?' '.$minmax:'').'"'.($disabled?' disabled="disabled"':'').' id="'.$htmlname.'" name="'.$htmlname.'"'.$nodatarole.'>';
+				$out.= '<select class="valignmiddle flat'.($morecss?' '.$morecss:'').'"'.($disabled?' disabled="disabled"':'').' id="'.$htmlname.'" name="'.$htmlname.'">';
 			}
-			if (!empty($show_empty)) {
-				$out.= '<option value="0">&nbsp;</option>';
+			if (! empty($show_empty)) {
+				$out.= '<option value="0" class="optiongrey">';
+				if (! is_numeric($show_empty)) $out.=$show_empty;
+				else $out.='&nbsp;';
+				$out.= '</option>';
 			}
 			$num = $this->db->num_rows($resql);
 			$i = 0;
@@ -370,7 +367,7 @@ class FormProjets
 				{
 					$obj = $this->db->fetch_object($resql);
 					// If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
-					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && ! $user->rights->societe->lire)
+					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && empty($user->rights->societe->lire))
 					{
 						// Do nothing
 					}
@@ -382,7 +379,7 @@ class FormProjets
 							continue;
 						}
 
-						$labeltoshow=dol_trunc($obj->ref,18);
+						$labeltoshow=dol_trunc($obj->ref,18);     // Project ref
 						//if ($obj->public) $labeltoshow.=' ('.$langs->trans("SharedProject").')';
 						//else $labeltoshow.=' ('.$langs->trans("Private").')';
 						$labeltoshow.=' '.dol_trunc($obj->title,$maxlength);
@@ -532,7 +529,6 @@ class FormProjets
 		$sql.= " ORDER BY ref DESC";
 
 		dol_syslog(get_class($this).'::select_element', LOG_DEBUG);
-
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
diff --git a/htdocs/core/js/timesheet.js b/htdocs/core/js/timesheet.js
index ea0e0782767..5541f348c9f 100644
--- a/htdocs/core/js/timesheet.js
+++ b/htdocs/core/js/timesheet.js
@@ -1,5 +1,5 @@
-/* Copyright (C) 2014 delcroip <delcroip@gmail.com>
- * Laurent Destailleur 2015 <eldy@users.sourceforge.net>
+/* Copyright (C) 2014      delcroip            <delcroip@gmail.com>
+ * Copyright (C) 2015-2017 Laurent Destailleur <eldy@users.sourceforge.net>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 38f78dd8333..c3583e72ac8 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 function project_prepare_head($object)
 {
 	global $db, $langs, $conf, $user;
-	
+
 	$h = 0;
 	$head = array();
 
@@ -119,7 +119,7 @@ function project_prepare_head($object)
     }
 	$head[$h][2] = 'agenda';
 	$h++;
-	
+
 	complete_head_from_modules($conf,$langs,$object,$head,$h,'project','remove');
 
 	return $head;
@@ -163,7 +163,7 @@ function task_prepare_head($object)
 	    if ($obj) $nbTimeSpent=1;
 	}
 	else dol_print_error($db);
-	
+
 	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
 	$head[$h][1] = $langs->trans("TimeSpent");
 	if ($nbTimeSpent > 0) $head[$h][1].= ' <span class="badge">...</span>';
@@ -208,9 +208,10 @@ function task_prepare_head($object)
  * Prepare array with list of tabs
  *
  * @param	string	$mode		Mode
+ * @param   string  $fuser      Filter on user
  * @return  array				Array of tabs to show
  */
-function project_timesheet_prepare_head($mode)
+function project_timesheet_prepare_head($mode, $fuser=null)
 {
 	global $langs, $conf, $user;
 	$h = 0;
@@ -218,9 +219,13 @@ function project_timesheet_prepare_head($mode)
 
 	$h = 0;
 
+	$param='';
+	$param.=($mode?'&mode='.$mode:'');
+	if (is_object($fuser) && $fuser->id > 0 && $fuser->id != $user->id) $param.='&search_usertoprocessid='.$fuser->id;
+
 	if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERWEEK))
 	{
-		$head[$h][0] = DOL_URL_ROOT."/projet/activity/perweek.php".($mode?'?mode='.$mode:'');
+		$head[$h][0] = DOL_URL_ROOT."/projet/activity/perweek.php".($param?'?'.$param:'');
 		$head[$h][1] = $langs->trans("InputPerWeek");
 		$head[$h][2] = 'inputperweek';
 		$h++;
@@ -228,7 +233,7 @@ function project_timesheet_prepare_head($mode)
 
 	if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERTIME))
 	{
-		$head[$h][0] = DOL_URL_ROOT."/projet/activity/perday.php".($mode?'?mode='.$mode:'');
+		$head[$h][0] = DOL_URL_ROOT."/projet/activity/perday.php".($param?'?'.$param:'');
 		$head[$h][1] = $langs->trans("InputPerDay");
 		$head[$h][2] = 'inputperday';
 		$h++;
@@ -507,7 +512,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
     				if ($lines[$i]->id) projectLinesa($inc, $lines[$i]->id, $lines, $level, $var, $showproject, $taskrole, $projectsListId, $addordertick);
     				$level--;
 				}
-				
+
 				$total_projectlinesa_spent += $lines[$i]->duration;
 				$total_projectlinesa_planned += $lines[$i]->planned_workload;
 				if ($lines[$i]->planned_workload) $total_projectlinesa_spent_if_planned += $lines[$i]->duration;
@@ -571,9 +576,9 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 	$lastprojectid=0;
 	$workloadforid=array();
 	$lineswithoutlevel0=array();
-	
+
 	$numlines=count($lines);
-	
+
 	// Create a smaller array with sublevels only to be used later. This increase dramatically performances.
 	if ($parent == 0) // Always and only if at first level
 	{
@@ -581,7 +586,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 	    {
 	        if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[]=$lines[$i];
 	    }
-	}	
+	}
 
     //dol_syslog('projectLinesPerDay inc='.$inc.' preselectedday='.$preselectedday.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
 	for ($i = 0 ; $i < $numlines ; $i++)
@@ -594,7 +599,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 			if (empty($mine) || ! empty($tasksrole[$lines[$i]->id]))
 			{
                 //dol_syslog("projectLinesPerWeek Found line ".$i.", a qualified task (i have role or want to show all tasks) with id=".$lines[$i]->id." project id=".$lines[$i]->fk_project);
-                
+
 				// Break on a new project
         		if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
         		{
@@ -604,7 +609,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
         				$projectstatic->id = $lines[$i]->fk_project;
         			}
         		}
-			    
+
 			    if (empty($workloadforid[$projectstatic->id]))
 			    {
     				if ($preselectedday)
@@ -613,7 +618,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 	       		        $workloadforid[$projectstatic->id]=1;
     				}
 			    }
-			     
+
 				$projectstatic->id=$lines[$i]->fk_project;
 				$projectstatic->ref=$lines[$i]->projectref;
 				$projectstatic->title=$lines[$i]->projectlabel;
@@ -621,7 +626,12 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 
 				$taskstatic->id=$lines[$i]->id;
 
-				print "<tr ".$bc[$var].">\n";
+				print '<tr class="oddeven">'."\n";
+
+				// User
+				print '<td class="nowrap">';
+				print $fuser->getNomUrl(1, 'withproject', 'time');
+				print '</td>';
 
 				// Ref
 				print '<td>';
@@ -656,7 +666,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 				    print $thirdpartystatic->getNomUrl(1, 'project', 10);
 				    print '</td>';
 				}
-				
+
 				// Planned Workload
 				print '<td align="right">';
 				if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload,'allhourmin');
@@ -707,7 +717,10 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 				print '<td class="nowrap" align="center">';
 				$tableCell=$form->select_date($preselectedday,$lines[$i]->id,1,1,2,"addtime",0,0,1,$disabledtask);
 				print $tableCell;
-				print '</td><td align="right">';
+				print '</td>';
+
+				// Duration
+				print '<td align="right">';
 
 				$dayWorkLoad = $projectstatic->weekWorkLoadPerTask[$preselectedday][$lines[$i]->id];
 		        $alreadyspent='';
@@ -723,24 +736,25 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 				print '</td>';
 
 				print '<td align="right">';
-				if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("YouAreNotContactOfProject"));
-				else if ($disabledtask) print $form->textwithpicto('',$langs->trans("TaskIsNotAffectedToYou"));
-				print '</td>';
-
-				print '<td align="right">';
-				print '<textarea name="'.$lines[$i]->id.'note" rows="2" id="note">';
+				print '<textarea name="'.$lines[$i]->id.'note" rows="'.ROWS_2.'" id="'.$lines[$i]->id.'note"'.($disabledtask?' disabled="disabled"':'').'>';
 				print '</textarea>';
 				print '</td>';
-				
+
+				// Warning
+				print '<td align="right">';
+   				if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
+   				else if ($disabledtask) print $form->textwithpicto('',$langs->trans("TaskIsNotAssignedToUser", $langs->transnoentitiesnoconv("AssignTaskToUser", '...')));
+				print '</td>';
+
 				print "</tr>\n";
 			}
 
 			$inc++;
 			$level++;
-			if ($lines[$i]->id > 0) 
+			if ($lines[$i]->id > 0)
 			{
 			    if ($parent == 0) projectLinesPerDay($inc, $lines[$i]->id, $fuser, $lineswithoutlevel0, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $preselectedday, $var);
-			    else projectLinesPerDay($inc, $lines[$i]->id, $fuser, $lines, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $preselectedday, $var); 
+			    else projectLinesPerDay($inc, $lines[$i]->id, $fuser, $lines, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $preselectedday, $var);
 			}
 			$level--;
 		}
@@ -781,7 +795,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 	$lastprojectid=0;
 	$workloadforid=array();
 	$lineswithoutlevel0=array();
-	
+
 	// Create a smaller array with sublevels only to be used later. This increase dramatically performances.
 	if ($parent == 0) // Always and only if at first level
 	{
@@ -792,18 +806,18 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 	}
 
     //dol_syslog('projectLinesPerWeek inc='.$inc.' firstdaytoshow='.$firstdaytoshow.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
-	
+
 	for ($i = 0 ; $i < $numlines ; $i++)
 	{
 		if ($parent == 0) $level = 0;
-		
+
 		if ($lines[$i]->fk_task_parent == $parent)
 		{
 			// If we want all or we have a role on task, we show it
 			if (empty($mine) || ! empty($tasksrole[$lines[$i]->id]))
 			{
 			    //dol_syslog("projectLinesPerWeek Found line ".$i.", a qualified task (i have role or want to show all tasks) with id=".$lines[$i]->id." project id=".$lines[$i]->fk_project);
-			    
+
 			    // Break on a new project
     			if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
     			{
@@ -811,14 +825,19 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
     				$lastprojectid=$lines[$i]->fk_project;
     				$projectstatic->id = $lines[$i]->fk_project;
     			}
-			    
+
 			    if (empty($workloadforid[$projectstatic->id]))
 			    {
 				    $projectstatic->loadTimeSpent($firstdaytoshow, 0, $fuser->id);	// Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
                     $workloadforid[$projectstatic->id]=1;
 			    }
-			    
-				print "<tr ".$bc[$var].">\n";
+
+				print '<tr class="oddeven">'."\n";
+
+				// User
+				print '<td class="nowrap">';
+				print $fuser->getNomUrl(1, 'withproject', 'time');
+				print '</td>';
 
 				// Ref
 				print '<td class="nowrap">';
@@ -842,7 +861,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 				print "</td>\n";
 
 				// Project
-				print '<td class="nowrap">'.$var;
+				print '<td class="nowrap">';
 				$projectstatic->id=$lines[$i]->fk_project;
 				$projectstatic->ref=$lines[$i]->projectref;
 				$projectstatic->title=$lines[$i]->projectlabel;
@@ -860,7 +879,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 				    print $thirdpartystatic->getNomUrl(1, 'project');
 				    print '</td>';
 				}
-				
+
 				// Planned Workload
 				print '<td align="right">';
 				if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload,'allhourmin');
@@ -908,7 +927,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 				}
 
 				//var_dump($projectstatic->weekWorkLoadPerTask);
-				
+
 				// Fields to show current time
 				$tableCell=''; $modeinput='hours';
 				for ($idw = 0; $idw < 7; $idw++)
@@ -919,7 +938,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 		        	$alreadyspent='';
 		        	if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($dayWorkLoad,'allhourmin');
                     $alttitle=$langs->trans("AddHereTimeSpentForDay",$tmparray['day'],$tmparray['mon']);
-		        	
+
                     $tableCell ='<td align="center" class="hide'.$idw.'">';
                     if ($alreadyspent)
                     {
@@ -934,10 +953,11 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
                     $tableCell.='</td>';
                     print $tableCell;
 		        }
-		        
+
+		        // Warning
 				print '<td align="right">';
-				if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("YouAreNotContactOfProject"));
-				else if ($disabledtask) print $form->textwithpicto('',$langs->trans("TaskIsNotAffectedToYou"));
+   				if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
+   				else if ($disabledtask) print $form->textwithpicto('',$langs->trans("TaskIsNotAssignedToUser", $langs->transnoentitiesnoconv("AssignTaskToUser", '...')));
 				print '</td>';
 
 		        print "</tr>\n";
@@ -946,7 +966,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 			// Call to show task with a lower level (task under the current task)
 			$inc++;
 			$level++;
-			if ($lines[$i]->id > 0) 
+			if ($lines[$i]->id > 0)
 			{
 			    if ($parent == 0) projectLinesPerWeek($inc, $firstdaytoshow, $fuser, $lines[$i]->id, $lineswithoutlevel0, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $var);
 			    else projectLinesPerWeek($inc, $firstdaytoshow, $fuser, $lines[$i]->id, $lines, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $var);
@@ -1020,7 +1040,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
 
 	$projectstatic=new Project($db);
     $thirdpartystatic=new Societe($db);
-    
+
 	$sortfield='';
 	$sortorder='';
 	$project_year_filter=0;
@@ -1029,7 +1049,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
 	if (strcmp($statut, '') && $statut >= 0) $title=$langs->trans("Projects").' '.$langs->trans($projectstatic->statuts_long[$statut]);
 
 	$arrayidtypeofcontact=array();
-	
+
 	print '<table class="noborder" width="100%">';
 
 	$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
@@ -1072,11 +1092,11 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
 			$sql.= " AND (p.datee IS NULL OR p.datee >= ".$db->idate(dol_get_first_day($project_year_filter,1,false)).")";
 		}
 	}
-	
+
 	// Get id of project we must show tasks
 	$arrayidofprojects=array();
 	$sql1 = "SELECT p.rowid as projectid";
-	$sql1.= $sql; 
+	$sql1.= $sql;
 	$resql = $db->query($sql1);
 	if ($resql)
 	{
@@ -1091,7 +1111,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
 	}
 	else dol_print_error($db);
 	if (empty($arrayidofprojects)) $arrayidofprojects[0]=-1;
-	
+
 	// Get list of project with calculation on tasks
 	$sql2 = "SELECT p.rowid as projectid, p.ref, p.title, p.fk_soc, s.nom as socname, p.fk_user_creat, p.public, p.fk_statut as status, p.fk_opp_status as opp_status, p.opp_amount,";
 	$sql2.= " p.dateo, p.datee,";
@@ -1122,7 +1142,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
     		print_liste_field_titre($langs->trans("OpportunityAmount"),"","","","",'align="right"',$sortfield,$sortorder);
     		print_liste_field_titre($langs->trans("OpportunityStatus"),"","","","",'align="right"',$sortfield,$sortorder);
     	}
-    	if (empty($conf->global->PROJECT_HIDE_TASKS)) 
+    	if (empty($conf->global->PROJECT_HIDE_TASKS))
     	{
             print_liste_field_titre($langs->trans("Tasks"),"","","","",'align="right"',$sortfield,$sortorder);
             if (! in_array('plannedworkload', $hiddenfields))  print_liste_field_titre($langs->trans("PlannedWorkload"),"","","","",'align="right"',$sortfield,$sortorder);
@@ -1130,7 +1150,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
     	}
     	print_liste_field_titre($langs->trans("Status"),"","","","",'align="right"',$sortfield,$sortorder);
     	print "</tr>\n";
-		
+
 		while ($i < $num)
 		{
 			$objp = $db->fetch_object($resql);
@@ -1148,8 +1168,8 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
 			    $projectstatic->title = $objp->title;
 			    $projectstatic->datee = $db->jdate($objp->datee);
 			    $projectstatic->dateo = $db->jdate($objp->dateo);
-			     
-				
+
+
 				print '<tr class="oddeven">';
 				print '<td>';
 				print $projectstatic->getNomUrl(1);
@@ -1174,17 +1194,17 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
         			if ($code) print $langs->trans("OppStatus".$code);
 					print '</td>';
 				}
-				if (empty($conf->global->PROJECT_HIDE_TASKS)) 
+				if (empty($conf->global->PROJECT_HIDE_TASKS))
 				{
 				    print '<td align="right">'.$objp->nb.'</td>';
-    	       
+
     				$plannedworkload=$objp->planned_workload;
     				$total_plannedworkload+=$plannedworkload;
     				if (! in_array('plannedworkload', $hiddenfields))
     				{
     				    print '<td align="right">'.($plannedworkload?convertSecondToTime($plannedworkload):'').'</td>';
     				}
-    				if (! in_array('declaredprogress', $hiddenfields)) 
+    				if (! in_array('declaredprogress', $hiddenfields))
     				{
     				    $declaredprogressworkload=$objp->declared_progess_workload;
         				$total_declaredprogressworkload+=$declaredprogressworkload;
@@ -1194,7 +1214,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
         				print '</td>';
     				}
 				}
-				
+
 				print '<td align="right">'.$projectstatic->getLibStatut(3).'</td>';
 				print "</tr>\n";
 
@@ -1213,7 +1233,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
 			print '<td class="liste_total" align="right">'.price($total_opp_amount, 0, '', 1, -1, -1, $conf->currency).'</td>';
 			print '<td class="liste_total" align="right">'.$form->textwithpicto(price($ponderated_opp_amount, 0, '', 1, -1, -1, $conf->currency), $langs->trans("OpportunityPonderatedAmountDesc"), 1).'</td>';
 		}
-		if (empty($conf->global->PROJECT_HIDE_TASKS)) 
+		if (empty($conf->global->PROJECT_HIDE_TASKS))
 		{
             print '<td class="liste_total" align="right">'.$total_task.'</td>';
             if (! in_array('plannedworkload', $hiddenfields))  print '<td class="liste_total" align="right">'.($total_plannedworkload?convertSecondToTime($total_plannedworkload):'').'</td>';
@@ -1221,7 +1241,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
 		}
 		print '<td class="liste_total"></td>';
         print '</tr>';
-        
+
 		$db->free($resql);
 	}
 	else
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 5b213135878..fe292db145d 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -614,7 +614,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects i'm contact for)
 Permission45=Export projects
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 27db2976b2a..3b4e4f4d14f 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -53,7 +53,7 @@ TaskTimeNote=Note
 TaskTimeDate=Date
 TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
-NewTimeSpent=New time spent
+NewTimeSpent=Time spent
 MyTimeSpent=My time spent
 Tasks=Tasks
 Task=Task
@@ -107,6 +107,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
 ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
@@ -115,7 +116,7 @@ TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
-TaskIsNotAffectedToYou=Task not assigned to you
+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.
@@ -166,13 +167,15 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
 TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
 ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index a2b3f1cc667..9cda69560d5 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -34,6 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 
 $langs->load('projects');
+$langs->load('users');
 
 $action=GETPOST('action','aZ09');
 $mode=GETPOST("mode");
@@ -62,6 +63,8 @@ $month=GETPOST('remonth')?GETPOST('remonth'):(GETPOST("month","int")?GETPOST("mo
 $day=GETPOST('reday')?GETPOST('reday'):(GETPOST("day","int")?GETPOST("day","int"):date("d"));
 $day = (int) $day;
 $week=GETPOST("week","int")?GETPOST("week","int"):date("W");
+
+$search_usertoprocessid=GETPOST('search_usertoprocessid', 'int');
 $search_task_ref=GETPOST('search_task_ref', 'alpha');
 $search_task_label=GETPOST('search_task_label', 'alpha');
 $search_project_ref=GETPOST('search_project_ref', 'alpha');
@@ -75,6 +78,17 @@ $daytoparse = $now;
 if ($yearofday && $monthofday && $dayofday) $daytoparse=dol_mktime(0, 0, 0, $monthofday, $dayofday, $yearofday);	// xxxofday is value of day after submit action 'addtime'
 else if ($year && $month && $day) $daytoparse=dol_mktime(0, 0, 0, $month, $day, $year);							// this are value submited after submit of action 'submitdateselect'
 
+if (empty($search_usertoprocessid) || $search_usertoprocessid == $user->id)
+{
+    $usertoprocess=$user;
+}
+else
+{
+    $usertoprocess=new User($db);
+    $usertoprocess->fetch($search_usertoprocessid);
+}
+$search_usertoprocessid=$usertoprocess->id;
+
 $object=new Task($db);
 
 
@@ -83,9 +97,10 @@ $object=new Task($db);
  */
 
 // Purge criteria
-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
 {
     $action = '';
+    $search_usertoprocessid = '';
     $search_task_ref = '';
     $search_task_label = '';
     $search_project_ref = '';
@@ -125,7 +140,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
     }
     if (! $error)
     {
-    	$idfortaskuser=$user->id;
+    	$idfortaskuser=$usertoprocess->id;
 		$result = $object->add_contact($idfortaskuser, GETPOST("type"), 'internal');
 
     	if ($result >= 0 || $result == -2)	// Contact add ok or already contact of task
@@ -143,7 +158,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
     				$project->fetch($object->fk_project);
     				// Get type
     				$listofprojcontact=$project->liste_type_contact('internal');
-    				
+
     				if (count($listofprojcontact))
     				{
     					$typeforprojectcontact=reset(array_keys($listofprojcontact));
@@ -151,7 +166,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
     				}
     			}
     		}
-    		else 
+    		else
     		{
     			dol_print_error($db);
     		}
@@ -175,6 +190,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 	if (! $error)
 	{
 		setEventMessages("TaskAssignedToEnterTime", null);
+		$taskid=0;
 	}
 
 	$action='';
@@ -247,12 +263,12 @@ if ($action == 'addtime' && $user->rights->projet->lire)
 	    	setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 
     	    // Redirect to avoid submit twice on back
-        	header('Location: '.$_SERVER["PHP_SELF"].($projectid?'?id='.$projectid:'?').($mode?'&mode='.$mode:'').'&year='.$yearofday.'&month='.$monthofday.'&day='.$dayofday);
+        	header('Location: '.$_SERVER["PHP_SELF"].'?'.($projectid?'id='.$projectid:'').($search_usertoprocessid?'&search_usertoprocessid='.$search_usertoprocessid:'').($mode?'&mode='.$mode:'').'&year='.$yearofday.'&month='.$monthofday.'&day='.$dayofday);
         	exit;
     	}
     }
-    else    
-    {   
+    else
+    {
    	    setEventMessages($langs->trans("ErrorTimeSpentIsEmpty"), null, 'errors');
     }
 }
@@ -286,8 +302,6 @@ $next_day   = $next['mday'];
 $title=$langs->trans("TimeSpent");
 if ($mine) $title=$langs->trans("MyTimeSpent");
 
-$usertoprocess = $user;
-
 $projectsListId = $projectstatic->getProjectsAuthorizedForUser($usertoprocess,0,1);  // Return all project i have permission on. I want my tasks and some of my task may be on a public projet that is not my project
 
 if ($id)
@@ -314,8 +328,9 @@ llxHeader("",$title,"");
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num, '', 'title_project');
 
 $param='';
-$param.=($mode?'&amp;mode='.$mode:'');
-$param.=($search_project_ref?'&amp;search_project_ref='.$search_project_ref:'');
+$param.=($mode?'&mode='.$mode:'');
+$param.=($search_project_ref?'&search_project_ref='.$search_project_ref:'');
+$param.=($search_userassignedid > 0?'&search_userassignedid='.$search_usertoprocessid:'');
 
 // Show navigation bar
 $nav ='<a class="inline-block valignmiddle" href="?year='.$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day.$param.'">'.img_previous($langs->trans("Previous"))."</a>\n";
@@ -337,7 +352,7 @@ print '<input type="hidden" name="addtimeyear" value="'.$tmp['year'].'">';
 print '<input type="hidden" name="addtimemonth" value="'.$tmp['mon'].'">';
 print '<input type="hidden" name="addtimeday" value="'.$tmp['mday'].'">';
 
-$head=project_timesheet_prepare_head($mode);
+$head=project_timesheet_prepare_head($mode, $usertoprocess);
 dol_fiche_head($head, 'inputperday', '', -1, 'task');
 
 // Show description of content
@@ -360,45 +375,17 @@ print '</div>';
 
 dol_fiche_end();
 
-
-// Filter on user
-/*	dol_fiche_head('');
-	print '<table class="border" width="100%"><tr><td width="25%">'.$langs->trans("User").'</td>';
-	print '<td>';
-	if ($mine) print $user->getLoginUrl(1);
-	print '</td>';
-	print '</tr></table>';
-	dol_fiche_end();
-*/
-
-// Filter on user
-/*	dol_fiche_head('');
-	print '<table class="border" width="100%"><tr><td width="25%">'.$langs->trans("User").'</td>';
-	print '<td>';
-	if ($mine) print $user->getLoginUrl(1);
-	print '</td>';
-	print '</tr></table>';
-	dol_fiche_end();
-*/
-
-
-// Add a new project/task
-//print '<br>';
-//print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-//print '<input type="hidden" name="action" value="assigntask">';
-//print '<input type="hidden" name="mode" value="'.$mode.'">';
-//print '<input type="hidden" name="year" value="'.$year.'">';
-//print '<input type="hidden" name="month" value="'.$month.'">';
-//print '<input type="hidden" name="day" value="'.$day.'">';
-
-print '<div class="floatright right">'.$nav.'</div>';     // We move this before the assign to components so, the default submit button is not the assign to.
+print '<div class="floatright right'.($conf->dol_optimize_smallscreen?' centpercent':'').'">'.$nav.'</div>';     // We move this before the assign to components so, the default submit button is not the assign to.
 
 print '<div class="float valignmiddle">';
-print $langs->trans("AssignTaskToMe").'<br>';
+$titleassigntask = $langs->trans("AssignTaskToMe");
+if ($usertoprocess->id != $user->id) $titleassigntask = $langs->trans("AssignTaskToUser", $usertoprocess->getFullName($langs));
+print '<div class="taskiddiv inline-block">';
 $formproject->selectTasks($socid?$socid:-1, $taskid, 'taskid', 32, 0, 1, 1);
-print $formcompany->selectTypeContact($object, '', 'type','internal','rowid', 0);
-print '<input type="submit" class="button valignmiddle" name="assigntask" value="'.$langs->trans("AssignTask").'">';
-//print '</form>';
+print '</div>';
+print ' ';
+print $formcompany->selectTypeContact($object, '', 'type','internal','rowid', 0, 'maxwidth200');
+print '<input type="submit" class="button valignmiddle" name="assigntask" value="'.dol_escape_htmltag($titleassigntask).'">';
 print '</div>';
 
 print '<div class="clearboth" style="padding-bottom: 8px;"></div>';
@@ -408,6 +395,11 @@ print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'" id="tablelines3">'."\n";
 
 print '<tr class="liste_titre_filter">';
+print '<td class="liste_titre">';
+$usersettoshow='hierarchyme';
+if ($user->rights->projet->all->lire) $usersettoshow='';
+print $form->select_dolusers($usertoprocess->id, 'search_usertoprocessid', 0, null, 0, $usersettoshow, 0, 0, 0, 1, '', 0, '', 'maxwidth150');
+print '</td>';
 print '<td class="liste_titre"><input type="text" size="4" name="search_task_ref" value="'.dol_escape_htmltag($search_task_ref).'"></td>';
 print '<td class="liste_titre"><input type="text" size="4" name="search_task_label" value="'.dol_escape_htmltag($search_task_label).'"></td>';
 print '<td class="liste_titre"><input type="text" size="4" name="search_project_ref" value="'.dol_escape_htmltag($search_project_ref).'"></td>';
@@ -427,6 +419,7 @@ print '</td>';
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("User").'</td>';
 print '<td>'.$langs->trans("RefTask").'</td>';
 print '<td>'.$langs->trans("LabelTask").'</td>';
 print '<td>'.$langs->trans("ProjectRef").'</td>';
@@ -436,12 +429,15 @@ if (! empty($conf->global->PROJECT_LINES_PERDAY_SHOW_THIRDPARTY))
 }
 print '<td align="right" class="maxwidth100">'.$langs->trans("PlannedWorkload").'</td>';
 print '<td align="right" class="maxwidth100">'.$langs->trans("ProgressDeclared").'</td>';
-print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpent").'</td>';
+/*print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpent").'</td>';
 if ($usertoprocess->id == $user->id) print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpentByYou").'</td>';
-else print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpentByUser").'</td>';
+else print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpentByUser").'</td>';*/
+print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpent").'<br>('.$langs->trans("Everybody").')</td>';
+print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpent").'</td>';
 print '<td align="center">'.$langs->trans("HourStart").'</td>';
-print '<td align="center" colspan="2">'.$langs->trans("Duration").'</td>';
+print '<td align="center">'.$langs->trans("Duration").'</td>';
 print '<td align="right">'.$langs->trans("Note").'</td>';
+print '<td align="center"></td>';
 print "</tr>\n";
 
 
@@ -455,7 +451,7 @@ if (count($tasksarray) > 0)
 }
 else
 {
-	print '<tr><td colspan="10">'.$langs->trans("NoTasks").'</td></tr>';
+	print '<tr><td colspan="14">'.$langs->trans("NoTasks").'</td></tr>';
 }
 print "</table>";
 print '</div>';
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index da5303511ad..4a2156430af 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -58,11 +58,14 @@ $nowtmp=dol_getdate($now);
 $nowday=$nowtmp['mday'];
 $nowmonth=$nowtmp['mon'];
 $nowyear=$nowtmp['year'];
+
 $year=GETPOST('reyear')?GETPOST('reyear','int'):(GETPOST("year")?GETPOST("year","int"):date("Y"));
 $month=GETPOST('remonth')?GETPOST('remonth','int'):(GETPOST("month")?GETPOST("month","int"):date("m"));
 $day=GETPOST('reday')?GETPOST('reday','int'):(GETPOST("day")?GETPOST("day","int"):date("d"));
 $day = (int) $day;
 $week=GETPOST("week","int")?GETPOST("week","int"):date("W");
+
+$search_usertoprocessid=GETPOST('search_usertoprocessid', 'int');
 $search_task_ref=GETPOST('search_task_ref', 'alpha');
 $search_task_label=GETPOST('search_task_label', 'alpha');
 $search_project_ref=GETPOST('search_project_ref', 'alpha');
@@ -88,7 +91,16 @@ $next_day   = $next['day'];
 $firstdaytoshow=dol_mktime(0,0,0,$first_month,$first_day,$first_year);
 $lastdaytoshow=dol_time_plus_duree($firstdaytoshow, 7, 'd');
 
-$usertoprocess=$user;
+if (empty($search_usertoprocessid) || $search_usertoprocessid == $user->id)
+{
+    $usertoprocess=$user;
+}
+else
+{
+    $usertoprocess=new User($db);
+    $usertoprocess->fetch($search_usertoprocessid);
+}
+$search_usertoprocessid=$usertoprocess->id;
 
 $object=new Task($db);
 
@@ -98,9 +110,10 @@ $object=new Task($db);
  */
 
 // Purge criteria
-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
 {
     $action = '';
+    $search_usertoprocessid = '';
     $search_task_ref = '';
     $search_task_label = '';
     $search_project_ref = '';
@@ -137,13 +150,13 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
     	setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), '', 'errors');
     	$error++;
     }
-    
+
     if (! $error)
     {
-    	$idfortaskuser=$user->id;
+    	$idfortaskuser=$usertoprocess->id;
     	$result = $object->add_contact($idfortaskuser, GETPOST("type"), 'internal');
 
-    	if (! $result || $result == -2)	// Contact add ok or already contact of task
+    	if ($result >= 0 || $result == -2)	// Contact add ok or already contact of task
     	{
     		// Test if we are already contact of the project (should be rare but sometimes we can add as task contact without being contact of project, like when admin user has been removed from contact of project)
     		$sql='SELECT ec.rowid FROM '.MAIN_DB_PREFIX.'element_contact as ec, '.MAIN_DB_PREFIX.'c_type_contact as tc WHERE tc.rowid = ec.fk_c_type_contact';
@@ -158,7 +171,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
     				$project->fetch($object->fk_project);
     				// Get type
     				$listofprojcontact=$project->liste_type_contact('internal');
-    				
+
     				if (count($listofprojcontact))
     				{
     					$typeforprojectcontact=reset(array_keys($listofprojcontact));
@@ -166,7 +179,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
     				}
     			}
     		}
-    		else 
+    		else
     		{
     			dol_print_error($db);
     		}
@@ -190,6 +203,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 	if (! $error)
 	{
 		setEventMessages("TaskAssignedToEnterTime", null);
+		$taskid=0;
 	}
 
 	$action='';
@@ -233,16 +247,16 @@ if ($action == 'addtime' && $user->rights->projet->lire)
 							$error++;
 							break;
 						}
-						
+
 						$updateoftaskdone++;
 		        	}
 		        }
 			}
-			
+
 			if (! $updateoftaskdone)  // Check to update progress if no update were done on task.
 			{
 			    $object->fetch($taskid);
-                //var_dump($object->progress);var_dump(GETPOST($taskid . 'progress', 'int')); exit;			    
+                //var_dump($object->progress);var_dump(GETPOST($taskid . 'progress', 'int')); exit;
 			    if ($object->progress != GETPOST($taskid . 'progress', 'int'))
 			    {
 			        $object->progress = GETPOST($taskid . 'progress', 'int');
@@ -262,7 +276,7 @@ if ($action == 'addtime' && $user->rights->projet->lire)
 	    	setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 
 	   	    // Redirect to avoid submit twice on back
-	       	header('Location: '.$_SERVER["PHP_SELF"].($projectid?'?id='.$projectid:'?').($mode?'&mode='.$mode:'').($day?'&day='.$day:'').($month?'&month='.$month:'').($year?'&year='.$year:''));
+	       	header('Location: '.$_SERVER["PHP_SELF"].'?'.($projectid?'id='.$projectid:'').($search_usertoprocessid?'&search_usertoprocessid='.$search_usertoprocessid:'').($mode?'&mode='.$mode:'').($day?'&day='.$day:'').($month?'&month='.$month:'').($year?'&year='.$year:''));
 	       	exit;
 	   	}
 	}
@@ -312,14 +326,15 @@ llxHeader("",$title,"",'','','',array('/core/js/timesheet.js'));
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num, '', 'title_project');
 
 $param='';
-$param.=($mode?'&amp;mode='.$mode:'');
-$param.=($search_project_ref?'&amp;search_project_ref='.$search_project_ref:'');
+$param.=($mode?'&mode='.$mode:'');
+$param.=($search_project_ref?'&search_project_ref='.$search_project_ref:'');
+$param.=($search_usertoprocessid > 0?'&search_usertoprocessid='.$search_usertoprocessid:'');
 
 // Show navigation bar
-$nav ='<a class="inline-block valignmiddle" href="?year='.$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day.$param.'">'.img_previous($langs->trans("Previous"))."</a>\n";
+$nav ='<a class="inline-block valignmiddle" href="?year='.$prev_year."&month=".$prev_month."&day=".$prev_day.$param.'">'.img_previous($langs->trans("Previous"))."</a>\n";
 $nav.=" <span id=\"month_name\">".dol_print_date(dol_mktime(0,0,0,$first_month,$first_day,$first_year),"%Y").", ".$langs->trans("WeekShort")." ".$week." </span>\n";
-$nav.='<a class="inline-block valignmiddle" href="?year='.$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param.'">'.img_next($langs->trans("Next"))."</a>\n";
-$nav.=" &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a>)";
+$nav.='<a class="inline-block valignmiddle" href="?year='.$next_year."&month=".$next_month."&day=".$next_day.$param.'">'.img_next($langs->trans("Next"))."</a>\n";
+$nav.=" &nbsp; (<a href=\"?year=".$nowyear."&month=".$nowmonth."&day=".$nowday.$param."\">".$langs->trans("Today")."</a>)";
 $nav.='<br>'.$form->select_date(-1,'',0,0,2,"addtime",1,0,1).' ';
 $nav.=' <input type="submit" name="submitdateselect" class="button" value="'.$langs->trans("Refresh").'">';
 
@@ -333,7 +348,7 @@ print '<input type="hidden" name="day" value="'.$day.'">';
 print '<input type="hidden" name="month" value="'.$month.'">';
 print '<input type="hidden" name="year" value="'.$year.'">';
 
-$head=project_timesheet_prepare_head($mode);
+$head=project_timesheet_prepare_head($mode, $usertoprocess);
 dol_fiche_head($head, 'inputperweek', '', -1, 'task');
 
 // Show description of content
@@ -356,44 +371,17 @@ print '</div>';
 
 dol_fiche_end();
 
-// Filter on user
-/*	dol_fiche_head('');
-	print '<table class="border" width="100%"><tr><td width="25%">'.$langs->trans("User").'</td>';
-	print '<td>';
-	if ($mine) print $user->getLoginUrl(1);
-	print '</td>';
-	print '</tr></table>';
-	dol_fiche_end();
-*/
-
-// Filter on user
-/*	dol_fiche_head('');
-	print '<table class="border" width="100%"><tr><td width="25%">'.$langs->trans("User").'</td>';
-	print '<td>';
-	if ($mine) print $user->getLoginUrl(1);
-	print '</td>';
-	print '</tr></table>';
-	dol_fiche_end();
-*/
-
-
-// Add a new project/task
-//print '<br>';
-//print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-//print '<input type="hidden" name="action" value="assigntask">';
-//print '<input type="hidden" name="mode" value="'.$mode.'">';
-//print '<input type="hidden" name="year" value="'.$year.'">';
-//print '<input type="hidden" name="month" value="'.$month.'">';
-//print '<input type="hidden" name="day" value="'.$day.'">';
-
-print '<div class="floatright right">'.$nav.'</div>';     // We move this before the assign to components so, the default submit button is not the assign to.
+print '<div class="floatright right'.($conf->dol_optimize_smallscreen?' centpercent':'').'">'.$nav.'</div>';     // We move this before the assign to components so, the default submit button is not the assign to.
 
 print '<div class="float valignmiddle">';
-print $langs->trans("AssignTaskToMe").'<br>';
+$titleassigntask = $langs->trans("AssignTaskToMe");
+if ($usertoprocess->id != $user->id) $titleassigntask = $langs->trans("AssignTaskToUser", $usertoprocess->getFullName($langs));
+print '<div class="taskiddiv inline-block">';
 $formproject->selectTasks($socid?$socid:-1, $taskid, 'taskid', 32, 0, 1, 1);
-print $formcompany->selectTypeContact($object, '', 'type','internal','rowid', 0);
-print '<input type="submit" class="button valignmiddle" name="assigntask" value="'.$langs->trans("AssignTask").'">';
-//print '</form>';
+print '</div>';
+print ' ';
+print $formcompany->selectTypeContact($object, '', 'type','internal','rowid', 0, 'maxwidth200');
+print '<input type="submit" class="button valignmiddle" name="assigntask" value="'.dol_escape_htmltag($titleassigntask).'">';
 print '</div>';
 
 print '<div class="clearboth" style="padding-bottom: 8px;"></div>';
@@ -403,6 +391,11 @@ print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'" id="tablelines3">'."\n";
 
 print '<tr class="liste_titre_filter">';
+print '<td class="liste_titre">';
+$usersettoshow='hierarchyme';
+if ($user->rights->projet->all->lire) $usersettoshow='';
+print $form->select_dolusers($usertoprocess->id, 'search_usertoprocessid', 0, null, 0, $usersettoshow, 0, 0, 0, 1, '', 0, '', 'maxwidth150');
+print '</td>';
 print '<td class="liste_titre"><input type="text" size="4" name="search_task_ref" value="'.dol_escape_htmltag($search_task_ref).'"></td>';
 print '<td class="liste_titre"><input type="text" size="4" name="search_task_label" value="'.dol_escape_htmltag($search_task_label).'"></td>';
 print '<td class="liste_titre"><input type="text" size="4" name="search_project_ref" value="'.dol_escape_htmltag($search_project_ref).'"></td>';
@@ -423,6 +416,7 @@ print '</td>';
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("User").'</td>';
 print '<td>'.$langs->trans("RefTask").'</td>';
 print '<td>'.$langs->trans("LabelTask").'</td>';
 print '<td>'.$langs->trans("ProjectRef").'</td>';
@@ -432,9 +426,11 @@ if (! empty($conf->global->PROJECT_LINES_PERWEEK_SHOW_THIRDPARTY))
 }
 print '<td align="right" class="maxwidth75">'.$langs->trans("PlannedWorkload").'</td>';
 print '<td align="right" class="maxwidth75">'.$langs->trans("ProgressDeclared").'</td>';
+/*print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpent").'</td>';
+ if ($usertoprocess->id == $user->id) print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpentByYou").'</td>';
+ else print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpentByUser").'</td>';*/
+print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpent").'<br>('.$langs->trans("Everybody").')</td>';
 print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpent").'</td>';
-if ($usertoprocess->id == $user->id) print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpentByYou").'</td>';
-else print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpentByUser").'</td>';
 
 $startday=dol_mktime(12, 0, 0, $startdayarray['first_month'], $startdayarray['first_day'], $startdayarray['first_year']);
 
@@ -452,16 +448,16 @@ if (count($tasksarray) > 0)
 {
     //var_dump($tasksarray);
     //var_dump($tasksrole);
-    
+
 	$j=0;
 	$level=0;
 	projectLinesPerWeek($j, $firstdaytoshow, $usertoprocess, 0, $tasksarray, $level, $projectsrole, $tasksrole, $mine, $restrictviewformytask);
 
-	$colspan=7;
+	$colspan=8;
 	if (! empty($conf->global->PROJECT_LINES_PERWEEK_SHOW_THIRDPARTY)) $colspan++;
-	
+
 	print '<tr class="liste_total">
-                <td class="liste_total" colspan="'.$colspan.'" align="right">'.$langs->trans("Total").'</td>
+                <td class="liste_total" colspan="'.$colspan.'">'.$langs->trans("Total").'</td>
                 <td class="liste_total hide0" align="center"><div id="totalDay[0]">&nbsp;</div></td>
                 <td class="liste_total hide1" align="center"><div id="totalDay[1]">&nbsp;</div></td>
                 <td class="liste_total hide2" align="center"><div id="totalDay[2]">&nbsp;</div></td>
@@ -474,7 +470,7 @@ if (count($tasksarray) > 0)
 }
 else
 {
-	print '<tr><td colspan="11">'.$langs->trans("NoTasks").'</td></tr>';
+	print '<tr><td colspan="16">'.$langs->trans("NoTasks").'</td></tr>';
 }
 print "</table>";
 print '</div>';
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index f6355ec5566..7c60ac49092 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -134,7 +134,7 @@ if (empty($reshook))
 	        $error++;
 	        setEventMessages($langs->trans("ErrorOppStatusRequiredIfAmount"), null, 'errors');
 	    }
-	    
+
 	    if (! $error)
 	    {
 	        $error=0;
@@ -308,8 +308,8 @@ if (empty($reshook))
 			    setEventMessages($langs->trans("FailedToCloseProject").':'.$object->error, $object->errors, 'errors');
 	        }
 	    }
-	    
-	    
+
+
 	    if ($error)
 	    {
 			$db->rollback();
@@ -322,7 +322,7 @@ if (empty($reshook))
 			if (GETPOST('socid','int') > 0) $object->fetch_thirdparty(GETPOST('socid','int'));
 			else unset($object->thirdparty);
 	    }
-	    
+
 	}
 
 	// Build doc
@@ -623,7 +623,7 @@ if ($action == 'create' && $user->rights->projet->creer)
     {
         print ' &nbsp; &nbsp; ';
         print '<input type="button" class="button" value="' . $langs->trans("Cancel") . '" onClick="javascript:history.go(-1)">';
-    }    
+    }
     print '</div>';
 
     print '</form>';
@@ -645,12 +645,12 @@ if ($action == 'create' && $user->rights->projet->creer)
         });
         </script>';
 }
-elseif ($object->id > 0) 
+elseif ($object->id > 0)
 {
     /*
      * Show or edit
      */
-    
+
     $res=$object->fetch_optionals($object->id,$extralabels);
 
     // To verify role of users
@@ -711,10 +711,11 @@ elseif ($object->id > 0)
     print '<input type="hidden" name="comefromclone" value="'.$comefromclone.'">';
 
     $head=project_prepare_head($object);
-    dol_fiche_head($head, 'project', $langs->trans("Project"), -1, ($object->public?'projectpub':'project'));
 
     if ($action == 'edit' && $userWrite > 0)
     {
+        dol_fiche_head($head, 'project', $langs->trans("Project"), 0, ($object->public?'projectpub':'project'));
+
         print '<table class="border" width="100%">';
 
         // Ref
@@ -835,27 +836,30 @@ elseif ($object->id > 0)
     }
     else
     {
+        dol_fiche_head($head, 'project', $langs->trans("Project"), -1, ($object->public?'projectpub':'project'));
+
         // Project card
-        
+
         $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
-        
+
         $morehtmlref='<div class="refidno">';
         // Title
         $morehtmlref.=$object->title;
         // Thirdparty
-        if ($object->thirdparty->id > 0) 
+        $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ';
+        if ($object->thirdparty->id > 0)
         {
-            $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1, 'project');
+            $morehtmlref .= $object->thirdparty->getNomUrl(1, 'project');
         }
         $morehtmlref.='</div>';
-        
+
         // Define a complementary filter for search of next/prev ref.
         if (! $user->rights->projet->all->lire)
         {
             $objectsListId = $object->getProjectsAuthorizedForUser($user,0,0);
             $object->next_prev_filter=" rowid in (".(count($objectsListId)?join(',',array_keys($objectsListId)):'0').")";
         }
-        
+
 	    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 
@@ -889,7 +893,7 @@ elseif ($object->id > 0)
 	        if (strcmp($object->opp_amount,'')) print price($object->opp_amount,0,$langs,1,0,0,$conf->currency);
 	        print '</td></tr>';
 	    }
-    
+
         // Date start - end
         print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
 		$start = dol_print_date($object->date_start,'dayhour');
@@ -899,7 +903,7 @@ elseif ($object->id > 0)
 		print ($end?$end:'?');
 		if ($object->hasDelay()) print img_warning("Late");
         print '</td></tr>';
-    	     
+
         // Budget
         print '<tr><td>'.$langs->trans("Budget").'</td><td>';
         if (strcmp($object->budget_amount, '')) print price($object->budget_amount,0,$langs,1,0,0,$conf->currency);
@@ -908,16 +912,16 @@ elseif ($object->id > 0)
         // Other attributes
         $cols = 2;
         include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
-        
+
         print '</table>';
-        
+
         print '</div>';
         print '<div class="fichehalfright">';
         print '<div class="ficheaddleft">';
         print '<div class="underbanner clearboth"></div>';
-        
+
         print '<table class="border" width="100%">';
-        
+
         // Description
         print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
         print nl2br($object->description);
@@ -929,13 +933,13 @@ elseif ($object->id > 0)
             print $form->showCategories($object->id,'project',1);
             print "</td></tr>";
         }
-        
+
         print '</table>';
-        
+
         print '</div>';
         print '</div>';
         print '</div>';
-        
+
         print '<div class="clearboth"></div>';
     }
 
@@ -956,7 +960,7 @@ elseif ($object->id > 0)
     {
         $defaultcheckedwhenoppclose=1;
         if (empty($conf->global->PROJECT_HIDE_TASKS)) $defaultcheckedwhenoppclose=0;
-        
+
         print '<!-- Javascript to manage opportunity status change -->';
         print '<script type="text/javascript" language="javascript">
             jQuery(document).ready(function() {
@@ -973,9 +977,9 @@ elseif ($object->id > 0)
                     jQuery("#divtocloseproject").show();
                     if (defaultcloseproject) jQuery("#inputcloseproject").prop("checked", true);
                     else jQuery("#inputcloseproject").prop("checked", false);
-                        
+
                     /* Make close project visible or not */
-                    if (elemcode == \'WON\' || elemcode == \'LOST\') 
+                    if (elemcode == \'WON\' || elemcode == \'LOST\')
                     {
                         jQuery("#divtocloseproject").show();
                     }
@@ -983,7 +987,7 @@ elseif ($object->id > 0)
                     {
                         jQuery("#divtocloseproject").hide();
                     }
-                        
+
                     /* Change percent of default percent of new status is higher */
                     if (parseFloat(jQuery("#opp_percent").val()) != parseFloat(defaultpercent))
                     {
@@ -1010,7 +1014,7 @@ elseif ($object->id > 0)
     {
 	    if ($action != "edit" )
 	    {
-	        
+
         	// Create event
         	if ($conf->agenda->enabled && ! empty($conf->global->MAIN_ADD_EVENT_ON_ELEMENT_CARD)) 				// Add hidden condition because this is not a
             	// "workflow" action so should appears somewhere else on
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 4227b86ca51..1240f091cc0 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -340,9 +340,9 @@ input.buttongen {
 	vertical-align: middle;
 }
 span.timesheetalreadyrecorded input {
-    /*font-size: smaller;*/
     border: none;
-    /*background:	transparent;*/
+    border-bottom: solid 1px rgba(0,0,0,0.4);
+    margin-right: 1px !important;
 }
 
 select.flat, form.flat select {
@@ -363,8 +363,10 @@ select.flat, form.flat select {
 .opacitytransp {
 	opacity: 0;
 }
-select:invalid { color: gray; }
-	input:disabled {
+select:invalid {
+	color: gray;
+}
+input:disabled {
 	background:#ddd;
 }
 
@@ -988,7 +990,7 @@ div.fiche {
 
 div.fiche {
 	margin-<?php print $left; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?6:($dol_hide_leftmenu?'6':'26')); ?>px;
-	margin-<?php print $right; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?8:(empty($conf->dol_optimize_smallscreen)?'16':'6')); ?>px;
+	margin-<?php print $right; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?8:(empty($conf->dol_optimize_smallscreen)?'16':'12')); ?>px;
 	<?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'."\n"; ?>
 	<?php if (! empty($conf->dol_hide_leftmenu)) print 'margin-bottom: 12px;'."\n"; ?>
 }
@@ -2683,7 +2685,7 @@ input.liste_titre {
 }
 
 .noborder tr.liste_total, .noborder tr.liste_total td, tr.liste_total, form.liste_total {
-	/* background: #F0F0F0; */
+	height: 32px;
 }
 .noborder tr.liste_total td, tr.liste_total td, form.liste_total div {
     color: #552266;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 6e31fc3ed11..d3f822bcca2 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -337,9 +337,9 @@ input.buttongen {
 	vertical-align: middle;
 }
 span.timesheetalreadyrecorded input {
-    /*font-size: smaller;*/
     border: none;
-    /*background:	transparent;*/
+    border-bottom: solid 1px rgba(0,0,0,0.1);
+    margin-right: 1px !important;
 }
 
 select.flat, form.flat select {
@@ -1027,7 +1027,7 @@ div.fiche {
 
 div.fiche {
 	margin-<?php print $left; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?6:($dol_hide_leftmenu?'4':'20')); ?>px;
-	margin-<?php print $right; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?8:(empty($conf->dol_optimize_smallscreen)?'16':'4')); ?>px;
+	margin-<?php print $right; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?8:(empty($conf->dol_optimize_smallscreen)?'16':'12')); ?>px;
 	<?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?>
 	margin-bottom: 15px;
 }
@@ -2769,7 +2769,7 @@ input.liste_titre {
 }
 
 .noborder tr.liste_total, .noborder tr.liste_total td, tr.liste_total, form.liste_total {
-	/* background: #F0F0F0; */
+	height: 32px;
 }
 .noborder tr.liste_total td, tr.liste_total td, form.liste_total div {
     /* border-top: 1px solid #f4f4f4; */
@@ -2777,7 +2777,6 @@ input.liste_titre {
     font-weight: normal;
     white-space: nowrap;
     padding: 4px;
-    height: 20px;
 }
 tr.liste_sub_total, tr.liste_sub_total td {
 	border-bottom: 2px solid #aaa;

From 447db1b3245a56e98ea53c9448ebe7a685d180fb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Jun 2017 13:46:30 +0200
Subject: [PATCH 065/438] Fix orphelins for categories tables

---
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  6 ++++
 htdocs/install/mysql/migration/repair.sql     |  1 +
 htdocs/projet/tasks/list.php                  | 28 +++++++++----------
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index f8b638b079a..11a86724cf0 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -348,5 +348,11 @@ ALTER TABLE llx_facture ADD COLUMN fk_fac_rec_source integer;
 
 DELETE from llx_c_actioncomm where code in ('AC_PROP','AC_COM','AC_FAC','AC_SHIP','AC_SUP_ORD','AC_SUP_INV') AND id NOT IN (SELECT DISTINCT fk_action FROM llx_actioncomm);
 
+-- Fix: delete orphelin category.
+delete from llx_categorie_product where fk_categorie not in (select rowid from llx_categorie where type = 0);
+delete from llx_categorie_societe where fk_categorie not in (select rowid from llx_categorie where type in (1, 2));
+delete from llx_categorie_member where fk_categorie not in (select rowid from llx_categorie where type = 3);
+delete from llx_categorie_contact where fk_categorie not in (select rowid from llx_categorie where type = 4);
+delete from llx_categorie_project where fk_categorie not in (select rowid from llx_categorie where type = 5);
 
 ALTER TABLE llx_inventory ADD COLUMN ref varchar(48);
\ No newline at end of file
diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index 4d3658d20bb..c748f38acb3 100755
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -124,6 +124,7 @@ delete from llx_categorie_product where fk_categorie not in (select rowid from l
 delete from llx_categorie_societe where fk_categorie not in (select rowid from llx_categorie where type in (1, 2));
 delete from llx_categorie_member where fk_categorie not in (select rowid from llx_categorie where type = 3);
 delete from llx_categorie_contact where fk_categorie not in (select rowid from llx_categorie where type = 4);
+delete from llx_categorie_project where fk_categorie not in (select rowid from llx_categorie where type = 5);
 
 
 -- Fix: delete orphelin deliveries. Note: deliveries are linked to shipment by llx_element_element only. No other links.
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 4e31434dbc4..4af874ce21e 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -43,7 +43,7 @@ $id=GETPOST('id','int');
 $search_all=GETPOST('search_all', 'alphanohtml');
 $search_categ=GETPOST("search_categ",'alpha');
 $search_project=GETPOST('search_project');
-if (! isset($_GET['search_projectstatus']) && ! isset($_POST['search_projectstatus'])) 
+if (! isset($_GET['search_projectstatus']) && ! isset($_POST['search_projectstatus']))
 {
     if ($search_all != '') $search_projectstatus=-1;
     else $search_projectstatus=1;
@@ -173,14 +173,14 @@ if (empty($reshook))
         $toselect='';
         $search_array_options=array();
     }
-    
+
     // Mass actions
     $objectclass='Task';
     $objectlabel='Tasks';
     $permtoread = $user->rights->projet->lire;
     $permtodelete = $user->rights->projet->supprimer;
     $uploaddir = $conf->projet->dir_output.'/tasks';
-    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';    
+    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
 if (empty($search_projectstatus) && $search_projectstatus == '') $search_projectstatus=1;
@@ -322,7 +322,7 @@ foreach ($search_array_options as $key => $val)
     $typ=$extrafields->attribute_type[$tmpkey];
     $mode=0;
     if (in_array($typ, array('int','double'))) $mode=1;    // Search on a numeric
-    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit))) 
+    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit)))
     {
         $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
     }
@@ -396,7 +396,7 @@ foreach ($search_array_options as $key => $val)
     $tmpkey=preg_replace('/search_options_/','',$key);
     if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
 }
-    
+
 // List of mass actions available
 $arrayofmassactions =  array(
 //    'presend'=>$langs->trans("SendByMail"),
@@ -544,7 +544,7 @@ if (! empty($arrayfields['t.progress']['checked'])) print '<td class="liste_titr
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
-    foreach($extrafields->attribute_label as $key => $val) 
+    foreach($extrafields->attribute_label as $key => $val)
     {
         if (! empty($arrayfields["ef.".$key]['checked']))
         {
@@ -649,7 +649,7 @@ while ($i < min($num,$limit))
 	$projectstatic->public = $obj->public;
 	$projectstatic->statut = $obj->projectstatus;
 	$projectstatic->datee = $db->jdate($obj->projectdatee);
-	
+
 	$userAccess = $projectstatic->restrictedProjectArea($user);    // why this ?
 	if ($userAccess >= 0)
 	{
@@ -663,7 +663,7 @@ while ($i < min($num,$limit))
     		if ($object->hasDelay()) print img_warning("Late");
     	    print '</td>';
 		    if (! $i) $totalarray['nbfield']++;
-    	}        	 
+    	}
 	    // Label
     	if (! empty($arrayfields['t.label']['checked']))
     	{
@@ -730,7 +730,7 @@ while ($i < min($num,$limit))
     	    print '</td>';
     	    if (! $i) $totalarray['nbfield']++;
     	}
-    	
+
     	// Planned workload
     	if (! empty($arrayfields['t.planned_workload']['checked']))
     	{
@@ -764,7 +764,7 @@ while ($i < min($num,$limit))
             if (! $i) $totalarray['nbfield']++;
 		    if (! $i) $totalarray['totaldurationeffectivefield']=$totalarray['nbfield'];
 		    $totalarray['totaldurationeffective'] += $obj->duration_effective;
-    	}    		
+    	}
 	    // Calculated progress
     	if (! empty($arrayfields['t.progress_calculated']['checked']))
     	{
@@ -777,7 +777,7 @@ while ($i < min($num,$limit))
     		print '</td>';
             if (! $i) $totalarray['nbfield']++;
             if (! $i) $totalarray['totalprogress_calculated']=$totalarray['nbfield'];
-    	}    		
+    	}
 	    // Declared progress
     	if (! empty($arrayfields['t.progress']['checked']))
     	{
@@ -843,13 +843,13 @@ while ($i < min($num,$limit))
         }
         print '</td>';
         if (! $i) $totalarray['nbfield']++;
-		
+
 		print "</tr>\n";
-    
+
 		//print projectLinesa();
 	}
 
-	$i++;    
+	$i++;
 }
 
 // Show total line

From b0f2db7aaadd7250c88f1495dce77fe1eb97060f Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Fri, 2 Jun 2017 17:48:29 +0200
Subject: [PATCH 066/438] NEW : Add calculation function for Loan schedule

---
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  21 +-
 .../mysql/tables/llx_loan_schedule.sql        |  37 ++
 htdocs/langs/en_US/loan.lang                  |   1 +
 htdocs/loan/calcmens.php                      |  72 +++
 htdocs/loan/card.php                          |  66 ++-
 htdocs/loan/class/loanschedule.class.php      | 526 ++++++++++++++++++
 htdocs/loan/createschedule.php                | 208 +++++++
 7 files changed, 904 insertions(+), 27 deletions(-)
 create mode 100644 htdocs/install/mysql/tables/llx_loan_schedule.sql
 create mode 100644 htdocs/loan/calcmens.php
 create mode 100644 htdocs/loan/class/loanschedule.class.php
 create mode 100644 htdocs/loan/createschedule.php

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index f8b638b079a..a574e6f84dd 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -349,4 +349,23 @@ ALTER TABLE llx_facture ADD COLUMN fk_fac_rec_source integer;
 DELETE from llx_c_actioncomm where code in ('AC_PROP','AC_COM','AC_FAC','AC_SHIP','AC_SUP_ORD','AC_SUP_INV') AND id NOT IN (SELECT DISTINCT fk_action FROM llx_actioncomm);
 
 
-ALTER TABLE llx_inventory ADD COLUMN ref varchar(48);
\ No newline at end of file
+ALTER TABLE llx_inventory ADD COLUMN ref varchar(48);
+
+create table llx_loan_schedule
+(
+  rowid				integer AUTO_INCREMENT PRIMARY KEY,
+  fk_loan			integer,
+  datec				datetime,         
+  tms				timestamp,
+  datep				datetime,         
+  amount_capital	real DEFAULT 0,
+  amount_insurance	real DEFAULT 0,
+  amount_interest	real DEFAULT 0,
+  fk_typepayment	integer NOT NULL,
+  num_payment		varchar(50),
+  note_private      text,
+  note_public       text,
+  fk_bank			integer NOT NULL,
+  fk_user_creat		integer,          
+  fk_user_modif		integer           
+)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_loan_schedule.sql b/htdocs/install/mysql/tables/llx_loan_schedule.sql
new file mode 100644
index 00000000000..c682b22f276
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_loan_schedule.sql
@@ -0,0 +1,37 @@
+-- ===================================================================
+-- Copyright (C) 2014		Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+-- Copyright (C) 2015       Frederic France      <frederic.france@free.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+create table llx_loan_schedule
+(
+  rowid				integer AUTO_INCREMENT PRIMARY KEY,
+  fk_loan			integer,
+  datec				datetime,         -- creation date
+  tms				timestamp,
+  datep				datetime,         -- payment date
+  amount_capital	real DEFAULT 0,
+  amount_insurance	real DEFAULT 0,
+  amount_interest	real DEFAULT 0,
+  fk_typepayment	integer NOT NULL,
+  num_payment		varchar(50),
+  note_private      text,
+  note_public       text,
+  fk_bank			integer NOT NULL,
+  fk_user_creat		integer,          -- creation user
+  fk_user_modif		integer           -- last modification user
+)ENGINE=innodb;
diff --git a/htdocs/langs/en_US/loan.lang b/htdocs/langs/en_US/loan.lang
index 927aab2abf4..d00b11738be 100644
--- a/htdocs/langs/en_US/loan.lang
+++ b/htdocs/langs/en_US/loan.lang
@@ -50,3 +50,4 @@ ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
+CreateCalcSchedule=Créer / Modifier échéancier de pret
diff --git a/htdocs/loan/calcmens.php b/htdocs/loan/calcmens.php
new file mode 100644
index 00000000000..3778f455b04
--- /dev/null
+++ b/htdocs/loan/calcmens.php
@@ -0,0 +1,72 @@
+<?php
+/* TVI
+ * Copyright (C) 2015	Florian HENRY 		<florian.henry@open-concept.pro>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/**
+ * \file tvi/ajax/list.php
+ * \brief File to return datables output
+ */
+if (! defined('NOTOKENRENEWAL'))
+	define('NOTOKENRENEWAL', '1'); // Disables token renewal
+if (! defined('NOREQUIREMENU'))
+	define('NOREQUIREMENU', '1');
+	// if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1');
+if (! defined('NOREQUIREAJAX'))
+	define('NOREQUIREAJAX', '1');
+	// if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1');
+	// if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');
+
+
+require '../main.inc.php';
+require DOL_DOCUMENT_ROOT.'/loan/class/loanschedule.class.php';
+
+$mens=GETPOST('mens');
+$capital=GETPOST('capital');
+$rate=GETPOST('rate');
+$echance=GETPOST('echeance');
+$nbterm=GETPOST('nbterm');
+
+top_httphead();
+
+$output=array();
+
+$object = new LoanSchedule($db);
+
+$int = ($capital*($rate/12));
+$int = round($int ,2,PHP_ROUND_HALF_UP);
+$cap_rest = round($capital - ($mens-$int),2,PHP_ROUND_HALF_UP);
+$output[$echance]=array('cap_rest'=>$cap_rest,'cap_rest_str'=>price($cap_rest),'interet'=>$int,'interet_str'=>price($int,0,'',1),'mens'=>$mens);
+
+$echance++;
+$capital=$cap_rest;
+while ($echance<=$nbterm) {
+
+	$mens = round($object->calc_mens($capital,$rate,$nbterm-$echance+1),2,PHP_ROUND_HALF_UP);
+
+	$int = ($capital*($rate/12));
+	$int = round($int ,2,PHP_ROUND_HALF_UP);
+	$cap_rest = round($capital - ($mens-$int),2,PHP_ROUND_HALF_UP);
+
+	$output[$echance]=array('cap_rest'=>$cap_rest,'cap_rest_str'=>price($cap_rest),'interet'=>$int,'interet_str'=>price($int,0,'',1),'mens'=>$mens);
+
+	$capital=$cap_rest;
+	$echance++;
+}
+
+echo json_encode($output);
+
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 81d43e46ab0..557d48be680 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -72,7 +72,7 @@ if (empty($reshook))
             setEventMessages($loan->error, null, 'errors');
         }
     }
-    
+
     // Delete loan
     if ($action == 'confirm_delete' && $confirm == 'yes')
     {
@@ -89,7 +89,7 @@ if (empty($reshook))
     		setEventMessages($loan->error, null, 'errors');
     	}
     }
-    
+
     // Add loan
     if ($action == 'add' && $user->rights->loan->write)
     {
@@ -99,7 +99,7 @@ if (empty($reshook))
     		$dateend	= dol_mktime(12, 0, 0, GETPOST('endmonth','int'), GETPOST('endday','int'), GETPOST('endyear','int'));
     		$capital 	= price2num(GETPOST('capital'));
             $rate       = GETPOST('rate');
-            
+
     		if (! $capital)
     		{
     		    $error++; $action = 'create';
@@ -120,7 +120,7 @@ if (empty($reshook))
     		    $error++; $action = 'create';
     		    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Rate")), null, 'errors');
     		}
-    		
+
     		if (! $error)
     		{
     			$object->label					= GETPOST('label');
@@ -133,15 +133,15 @@ if (empty($reshook))
     			$object->note_private 			= GETPOST('note_private');
     			$object->note_public 			= GETPOST('note_public');
     			$object->fk_project 			= GETPOST('fk_project');
-    			
+
     			$accountancy_account_capital	= GETPOST('accountancy_account_capital');
     			$accountancy_account_insurance	= GETPOST('accountancy_account_insurance');
     			$accountancy_account_interest	= GETPOST('accountancy_account_interest');
-    
+
     			if ($accountancy_account_capital <= 0) { $object->account_capital = ''; } else { $object->account_capital = $accountancy_account_capital; }
     			if ($accountancy_account_insurance <= 0) { $object->account_insurance = ''; } else { $object->account_insurance = $accountancy_account_insurance; }
     			if ($accountancy_account_interest <= 0) { $object->account_interest = ''; } else { $object->account_interest = $accountancy_account_interest; }
-    
+
     			$id=$object->create($user);
     			if ($id <= 0)
     			{
@@ -157,7 +157,7 @@ if (empty($reshook))
     		exit();
     	}
     }
-    
+
     // Update record
     else if ($action == 'update' && $user->rights->loan->write)
     {
@@ -168,7 +168,7 @@ if (empty($reshook))
     		$datestart	= dol_mktime(12, 0, 0, GETPOST('startmonth','int'), GETPOST('startday','int'), GETPOST('startyear','int'));
     		$dateend	= dol_mktime(12, 0, 0, GETPOST('endmonth','int'), GETPOST('endday','int'), GETPOST('endyear','int'));
     		$capital 	= price2num(GETPOST('capital'));
-    
+
     		if (! $capital)
     		{
     			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("LoanCapital")), null, 'errors');
@@ -185,14 +185,14 @@ if (empty($reshook))
 				$accountancy_account_capital	= GETPOST('accountancy_account_capital');
 				$accountancy_account_insurance	= GETPOST('accountancy_account_insurance');
 				$accountancy_account_interest	= GETPOST('accountancy_account_interest');
-	
+
 				if ($accountancy_account_capital <= 0) { $object->account_capital = ''; } else { $object->account_capital = $accountancy_account_capital; }
 				if ($accountancy_account_insurance <= 0) { $object->account_insurance = ''; } else { $object->account_insurance = $accountancy_account_insurance; }
 				if ($accountancy_account_interest <= 0) { $object->account_interest = ''; } else { $object->account_interest = $accountancy_account_interest; }
     		}
-    
+
             $result = $object->update($user);
-    
+
             if ($result > 0)
             {
                 header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
@@ -209,7 +209,7 @@ if (empty($reshook))
             exit;
         }
     }
-    
+
 	// Link to a project
 	if ($action == 'classin' && $user->rights->loan->write)
 	{
@@ -307,12 +307,12 @@ if ($action == 'create')
 		$langs->load("projects");
 
     	print '<tr><td>'.$langs->trans("Project").'</td><td>';
-        
+
         $numproject=$formproject->select_projects(-1,GETPOST("fk_project"),'fk_project',16,0,1,1);
-        
+
         print '</td></tr>';
     }
-    
+
     // Note Private
     print '<tr>';
     print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
@@ -352,7 +352,7 @@ if ($action == 'create')
 		print $formaccounting->select_account($object->accountancy_account_interest, 'accountancy_account_interest', 1, '', 0, 1);
         print '</td></tr>';
 	}
-	else // For external software 
+	else // For external software
 	{
         // Accountancy_account_capital
         print '<tr><td class="titlefieldcreate">'.$langs->trans("LoanAccountancyCapitalCode").'</td>';
@@ -417,10 +417,22 @@ if ($id > 0)
 
 		dol_fiche_head($head, 'card', $langs->trans("Loan"), 0, 'bill');
 
+		print '<script type="text/javascript">' . "\n";
+		print '  	function popEcheancier() {' . "\n";
+		print '  		$div = $(\'<div id="popCalendar"><iframe width="100%" height="100%" frameborder="0" src="createschedule.php?loanid=' . $object->id . '"></iframe></div>\');' . "\n";
+		print '  		$div.dialog({' . "\n";
+		print '  			modal:true' . "\n";
+		print '  			,width:"90%"' . "\n";
+		print '  			,height:$(window).height() - 150' . "\n";
+		print '  		});' . "\n";
+		print '  	}' . "\n";
+		print '</script>';
+
+
 		// Loan card
-		
+
 		$linkback = '<a href="' . DOL_URL_ROOT . '/loan/index.php">' . $langs->trans("BackToList") . '</a>';
-		
+
 		$morehtmlref='<div class="refidno">';
 		// Ref loan
 		$morehtmlref.=$form->editfieldkey("Label", 'label', $object->label, $object, $user->rights->loan->write, 'string', '', 0, 1);
@@ -458,7 +470,7 @@ if ($id > 0)
 	        }
 	    }
 	    $morehtmlref.='</div>';
-		
+
 		$object->totalpaid = $totalpaid;   // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
 		dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
@@ -652,7 +664,7 @@ if ($id > 0)
 			while ($i < $num)
 			{
 				$objp = $db->fetch_object($resql);
-				
+
 				print '<tr class="oddeven">';
 				print '<td><a href="'.DOL_URL_ROOT.'/loan/payment/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.'</a></td>';
 				print '<td>'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
@@ -713,31 +725,33 @@ if ($id > 0)
  			if (empty($reshook))
             {
                 print '<div class="tabsAction">';
-    
+
     			// Edit
     			if ($user->rights->loan->write)
     			{
+    				print '<a href="javascript:popEcheancier()" class="butAction">'.$langs->trans('CreateCalcSchedule').'</a>';
+
     				print '<a class="butAction" href="'.DOL_URL_ROOT.'/loan/card.php?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>';
     			}
-    
+
     			// Emit payment
     			if ($object->paid == 0 && ((price2num($object->capital) > 0 && round($staytopay) < 0) || (price2num($object->capital) > 0 && round($staytopay) > 0)) && $user->rights->loan->write)
     			{
     				print '<a class="butAction" href="'.DOL_URL_ROOT.'/loan/payment/payment.php?id='.$object->id.'&amp;action=create">'.$langs->trans("DoPayment").'</a>';
     			}
-    
+
     			// Classify 'paid'
     			if ($object->paid == 0 && round($staytopay) <=0 && $user->rights->loan->write)
     			{
     				print '<a class="butAction" href="'.DOL_URL_ROOT.'/loan/card.php?id='.$object->id.'&amp;action=paid">'.$langs->trans("ClassifyPaid").'</a>';
     			}
-    
+
     			// Delete
     			if ($user->rights->loan->delete)
     			{
     				print '<a class="butActionDelete" href="'.DOL_URL_ROOT.'/loan/card.php?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a>';
     			}
-    
+
     			print "</div>";
             }
 		}
diff --git a/htdocs/loan/class/loanschedule.class.php b/htdocs/loan/class/loanschedule.class.php
new file mode 100644
index 00000000000..1e519e6a2af
--- /dev/null
+++ b/htdocs/loan/class/loanschedule.class.php
@@ -0,0 +1,526 @@
+<?php
+/* Copyright (C) 2017	Florian HENRY <florian.henry@atm-consulting.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       htdocs/loan/class/loanschedule.class.php
+ *		\ingroup    facture
+ *		\brief      File of class to manage schedule of loans
+ */
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+
+
+/**     \class      LoanSchedule
+ *		\brief      Class to manage Schedule of loans
+ */
+class LoanSchedule extends CommonObject
+{
+	public $element='loan_schedule';			//!< Id that identify managed objects
+	public $table_element='loan_schedule';	//!< Name of table without prefix where object is stored
+
+	var $fk_loan;
+	var $datec='';
+	var $tms='';
+	var $datep='';
+    var $amounts=array();   // Array of amounts
+    var $amount_capital;    // Total amount of payment
+	var $amount_insurance;
+	var $amount_interest;
+	var $fk_typepayment;
+	var $num_payment;
+	var $fk_bank;
+	var $fk_user_creat;
+	var $fk_user_modif;
+	var $lines=array();
+
+	/**
+	 * @deprecated
+	 * @see amount, amounts
+	 */
+	var $total;
+
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	function __construct($db)
+	{
+		$this->db = $db;
+	}
+
+	/**
+	 *  Create payment of loan into database.
+     *  Use this->amounts to have list of lines for the payment
+     *
+	 *  @param      User		$user   User making payment
+	 *  @return     int     			<0 if KO, id of payment if OK
+	 */
+	function create($user)
+	{
+		global $conf, $langs;
+
+		$error=0;
+
+        $now=dol_now();
+
+        // Validate parameters
+		if (! $this->datepaid)
+		{
+			$this->error='ErrorBadValueForParameter';
+			return -1;
+		}
+
+		// Clean parameters
+		if (isset($this->fk_loan)) 			$this->fk_loan = trim($this->fk_loan);
+		if (isset($this->amount_capital))	$this->amount_capital = trim($this->amount_capital?$this->amount_capital:0);
+		if (isset($this->amount_insurance))	$this->amount_insurance = trim($this->amount_insurance?$this->amount_insurance:0);
+		if (isset($this->amount_interest))	$this->amount_interest = trim($this->amount_interest?$this->amount_interest:0);
+		if (isset($this->fk_typepayment))	$this->fk_typepayment = trim($this->fk_typepayment);
+		if (isset($this->fk_bank))			$this->fk_bank = trim($this->fk_bank);
+		if (isset($this->fk_user_creat))	$this->fk_user_creat = trim($this->fk_user_creat);
+		if (isset($this->fk_user_modif))	$this->fk_user_modif = trim($this->fk_user_modif);
+
+        $totalamount = $this->amount_capital + $this->amount_insurance + $this->amount_interest;
+        $totalamount = price2num($totalamount);
+
+        // Check parameters
+        if ($totalamount == 0) {
+        	$this->errors[]='step1';
+        	return -1; // Negative amounts are accepted for reject prelevement but not null
+        }
+
+
+		$this->db->begin();
+
+		if ($totalamount != 0)
+		{
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (fk_loan, datec, datep, amount_capital, amount_insurance, amount_interest,";
+			$sql.= " fk_typepayment, fk_user_creat, fk_bank)";
+			$sql.= " VALUES (".$this->fk_loan.", '".$this->db->idate($now)."',";
+			$sql.= " '".$this->db->idate($this->datepaid)."',";
+			$sql.= " ".$this->amount_capital.",";
+			$sql.= " ".$this->amount_insurance.",";
+			$sql.= " ".$this->amount_interest.",";
+			$sql.= " ".$this->fk_typepayment.", ";
+			$sql.= " ".$user->id.",";
+			$sql.= " ".$this->fk_bank . ")";
+
+			dol_syslog(get_class($this)."::create", LOG_DEBUG);
+			$resql=$this->db->query($sql);
+			if ($resql)
+			{
+				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_loan");
+			}
+			else
+			{
+                $this->error=$this->db->lasterror();
+				$error++;
+			}
+
+		}
+
+		if ($totalamount != 0 && ! $error)
+		{
+		    $this->amount_capital=$totalamount;
+            $this->total=$totalamount;    // deprecated
+		    $this->db->commit();
+			return $this->id;
+		}
+		else
+		{
+			$this->errors[]=$this->db->lasterror();
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 *  Load object in memory from database
+	 *
+	 *  @param	int		$id         Id object
+	 *  @return int         		<0 if KO, >0 if OK
+	 */
+	function fetch($id)
+	{
+		global $langs;
+		$sql = "SELECT";
+		$sql.= " t.rowid,";
+		$sql.= " t.fk_loan,";
+		$sql.= " t.datec,";
+		$sql.= " t.tms,";
+		$sql.= " t.datep,";
+		$sql.= " t.amount_capital,";
+		$sql.= " t.amount_insurance,";
+		$sql.= " t.amount_interest,";
+		$sql.= " t.fk_typepayment,";
+		$sql.= " t.num_payment,";
+        $sql.= " t.note_private,";
+        $sql.= " t.note_public,";
+		$sql.= " t.fk_bank,";
+		$sql.= " t.fk_user_creat,";
+		$sql.= " t.fk_user_modif,";
+		$sql.= " pt.code as type_code, pt.libelle as type_libelle,";
+		$sql.= ' b.fk_account';
+		$sql.= " FROM (".MAIN_DB_PREFIX."c_paiement as pt, ".MAIN_DB_PREFIX.$this->table_element." as t)";
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON t.fk_bank = b.rowid';
+		$sql.= " WHERE t.rowid = ".$id." AND t.fk_typepayment = pt.id";
+
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+	{
+		if ($this->db->num_rows($resql))
+		{
+			$obj = $this->db->fetch_object($resql);
+
+			$this->id = $obj->rowid;
+			$this->ref = $obj->rowid;
+
+			$this->fk_loan = $obj->fk_loan;
+			$this->datec = $this->db->jdate($obj->datec);
+			$this->tms = $this->db->jdate($obj->tms);
+			$this->datep = $this->db->jdate($obj->datep);
+			$this->amount_capital = $obj->amount_capital;
+			$this->amount_insurance = $obj->amount_insurance;
+			$this->amount_interest = $obj->amount_interest;
+			$this->fk_typepayment = $obj->fk_typepayment;
+			$this->num_payment = $obj->num_payment;
+			$this->note_private = $obj->note_private;
+			$this->note_public = $obj->note_public;
+			$this->fk_bank = $obj->fk_bank;
+			$this->fk_user_creat = $obj->fk_user_creat;
+			$this->fk_user_modif = $obj->fk_user_modif;
+
+			$this->type_code = $obj->type_code;
+			$this->type_libelle = $obj->type_libelle;
+
+			$this->bank_account   = $obj->fk_account;
+			$this->bank_line      = $obj->fk_bank;
+		}
+		$this->db->free($resql);
+
+			return 1;
+		}
+		else
+		{
+			$this->error="Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *  Update database
+	 *
+	 *  @param	User	$user        	User that modify
+	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
+	 *  @return int         			<0 if KO, >0 if OK
+	 */
+	function update($user=0, $notrigger=0)
+	{
+		global $conf, $langs;
+		$error=0;
+
+		// Clean parameters
+		if (isset($this->fk_loan)) $this->fk_loan=trim($this->fk_loan);
+		if (isset($this->amount_capital)) $this->amount_capital=trim($this->amount_capital);
+		if (isset($this->amount_insurance)) $this->amount_insurance=trim($this->amount_insurance);
+		if (isset($this->amount_interest)) $this->amount_interest=trim($this->amount_interest);
+		if (isset($this->fk_typepayment)) $this->fk_typepayment=trim($this->fk_typepayment);
+		if (isset($this->num_payment)) $this->num_payment=trim($this->num_payment);
+		if (isset($this->note_private)) $this->note_private=trim($this->note_private);
+		if (isset($this->note_public)) $this->note_public=trim($this->note_public);
+		if (isset($this->fk_bank)) $this->fk_bank=trim($this->fk_bank);
+		if (isset($this->fk_user_creat)) $this->fk_user_creat=trim($this->fk_user_creat);
+		if (isset($this->fk_user_modif)) $this->fk_user_modif=trim($this->fk_user_modif);
+
+		// Check parameters
+		// Put here code to add control on parameters values
+
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+
+		$sql.= " fk_loan=".(isset($this->fk_loan)?$this->fk_loan:"null").",";
+		$sql.= " datec=".(dol_strlen($this->datec)!=0 ? "'".$this->db->idate($this->datec)."'" : 'null').",";
+		$sql.= " tms=".(dol_strlen($this->tms)!=0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
+		$sql.= " datep=".(dol_strlen($this->datep)!=0 ? "'".$this->db->idate($this->datep)."'" : 'null').",";
+		$sql.= " amount_capital=".(isset($this->amount_capital)?$this->amount_capital:"null").",";
+		$sql.= " amount_insurance=".(isset($this->amount_insurance)?$this->amount_insurance:"null").",";
+		$sql.= " amount_interest=".(isset($this->amount_interest)?$this->amount_interest:"null").",";
+		$sql.= " fk_typepayment=".(isset($this->fk_typepayment)?$this->fk_typepayment:"null").",";
+		$sql.= " num_payment=".(isset($this->num_payment)?"'".$this->db->escape($this->num_payment)."'":"null").",";
+		$sql.= " note_private=".(isset($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null").",";
+		$sql.= " note_public=".(isset($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null").",";
+		$sql.= " fk_bank=".(isset($this->fk_bank)?$this->fk_bank:"null").",";
+		$sql.= " fk_user_creat=".(isset($this->fk_user_creat)?$this->fk_user_creat:"null").",";
+		$sql.= " fk_user_modif=".(isset($this->fk_user_modif)?$this->fk_user_modif:"null")."";
+
+		$sql.= " WHERE rowid=".$this->id;
+
+		$this->db->begin();
+
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+		if (! $error)
+		{
+			if (! $notrigger)
+			{
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action call a trigger.
+
+				//// Call triggers
+				//include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+				//$interface=new Interfaces($this->db);
+				//$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
+				//if ($result < 0) { $error++; $this->errors=$interface->errors; }
+				//// End call triggers
+			}
+		}
+
+		// Commit or rollback
+		if ($error)
+		{
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+
+	/**
+	 *  Delete object in database
+	 *
+	 *  @param	User	$user        	User that delete
+	 *  @param  int		$notrigger		0=launch triggers after, 1=disable triggers
+	 *  @return int						<0 if KO, >0 if OK
+	 */
+	function delete($user, $notrigger=0)
+	{
+		global $conf, $langs;
+		$error=0;
+
+		$this->db->begin();
+
+	    if (! $error)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
+			$sql.= " WHERE rowid=".$this->id;
+
+			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		}
+
+		if (! $error)
+		{
+			if (! $notrigger)
+			{
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action call a trigger.
+
+				//// Call triggers
+				//include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+				//$interface=new Interfaces($this->db);
+				//$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
+				//if ($result < 0) { $error++; $this->errors=$interface->errors; }
+				//// End call triggers
+			}
+		}
+
+		// Commit or rollback
+		if ($error)
+		{
+			foreach($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+	function calc_mens($capital,$rate,$nbterm)
+	{
+		$result='';
+
+		if (!empty($capital)&&!empty($rate)&&!empty($nbterm))
+		{
+			$result=($capital*($rate/12))/(1-pow((1+($rate/12)),($nbterm*-1)));
+		}
+
+		return $result;
+	}
+
+
+	/**
+	 *  Load all object in memory from database
+	 *
+	 *  @param	int		$id         Id object
+	 *  @return int         		<0 if KO, >0 if OK
+	 */
+	function fetchall($loan)
+	{
+		global $langs;
+
+		$sql = "SELECT";
+		$sql.= " t.rowid,";
+		$sql.= " t.fk_loan,";
+		$sql.= " t.datec,";
+		$sql.= " t.tms,";
+		$sql.= " t.datep,";
+		$sql.= " t.amount_capital,";
+		$sql.= " t.amount_insurance,";
+		$sql.= " t.amount_interest,";
+		$sql.= " t.fk_typepayment,";
+		$sql.= " t.num_payment,";
+		$sql.= " t.note_private,";
+		$sql.= " t.note_public,";
+		$sql.= " t.fk_bank,";
+		$sql.= " t.fk_user_creat,";
+		$sql.= " t.fk_user_modif";
+		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
+		$sql.= " WHERE t.fk_loan = ".$loan;
+
+		dol_syslog(get_class($this)."::fetchall", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+
+		if ($resql)
+		{
+			while($obj = $this->db->fetch_object($resql))
+			{
+				$line = New LoanSchedule($this->db);
+				$line->id = $obj->rowid;
+				$line->ref = $obj->rowid;
+
+				$line->fk_loan = $obj->fk_loan;
+				$line->datec = $this->db->jdate($obj->datec);
+				$line->tms = $this->db->jdate($obj->tms);
+				$line->datep = $this->db->jdate($obj->datep);
+				$line->amount_capital = $obj->amount_capital;
+				$line->amount_insurance = $obj->amount_insurance;
+				$line->amount_interest = $obj->amount_interest;
+				$line->fk_typepayment = $obj->fk_typepayment;
+				$line->num_payment = $obj->num_payment;
+				$line->note_private = $obj->note_private;
+				$line->note_public = $obj->note_public;
+				$line->fk_bank = $obj->fk_bank;
+				$line->fk_user_creat = $obj->fk_user_creat;
+				$line->fk_user_modif = $obj->fk_user_modif;
+
+				$this->lines[] = $line;
+			}
+			$this->db->free($resql);
+			return 1;
+		}
+		else
+		{
+			$this->error="Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
+
+	function trans_paiment()
+	{
+		require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+
+		$toinsert = array();
+
+		$sql = "SELECT l.rowid";
+		$sql.= " FROM ".MAIN_DB_PREFIX."loan as l ";
+		$sql.= " WHERE l.paid = 0";
+		$resql=$this->db->query($sql);
+
+		if($resql){
+			while($obj = $this->db->fetch_object($resql)){
+				$lastrecorded = $this->lastpaiment($obj->rowid);
+				$toinsert = $this->paimenttorecord($obj->rowid, $lastrecorded);
+				if(count($toinsert)>0){
+					foreach ($toinsert as $echid){
+						$this->db->begin();
+						$sql = "INSERT INTO " .MAIN_DB_PREFIX . "payment_loan ";
+						$sql.= "(fk_loan,datec,tms,datep,amount_capital,amount_insurance,amount_interest,fk_typepayment,num_payment,note_private,note_public,fk_bank,fk_user_creat,fk_user_modif) ";
+						$sql.= "SELECT fk_loan,datec,tms,datep,amount_capital,amount_insurance,amount_interest,fk_typepayment,num_payment,note_private,note_public,fk_bank,fk_user_creat,fk_user_modif FROM " . MAIN_DB_PREFIX . "loan_schedule WHERE rowid =" .$echid;
+						$res=$this->db->query($sql);
+						if($res){
+							$this->db->commit();
+						}else {
+							$this->db->rollback();
+						}
+					}
+				}
+			}
+		}
+	}
+
+
+	function lastpaiment($loan)
+	{
+		$sql = "SELECT p.datep";
+		$sql.= " FROM ".MAIN_DB_PREFIX."payment_loan as p ";
+		$sql.= " WHERE p.fk_loan = " . $loan;
+		$sql.= " ORDER BY p.datep DESC ";
+		$sql.= " LIMIT 1 ";
+
+		$resql=$this->db->query($sql);
+
+		if($resql){
+			$obj = $this->db->fetch_object($resql);
+			return $this->db->jdate($obj->datep);
+		}else{
+			return -1;
+		}
+	}
+
+	function paimenttorecord($loan,$datemax)
+	{
+		$sql = "SELECT p.rowid";
+		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as p ";
+		$sql.= " WHERE p.fk_loan = " . $loan;
+		if(!empty($datemax)){ $sql.= " AND p.datep > '" . $this->db->idate($datemax) ."'";}
+		$sql.= " AND p.datep <= '" . $this->db->idate(dol_now()). "'";
+
+
+		$resql=$this->db->query($sql);
+
+		if($resql){
+			while($obj = $this->db->fetch_object($resql))
+			{
+				$result[] = $obj->rowid;
+
+			}
+
+		}
+
+		return $result;
+	}
+}
+
diff --git a/htdocs/loan/createschedule.php b/htdocs/loan/createschedule.php
new file mode 100644
index 00000000000..0d15d1b2de6
--- /dev/null
+++ b/htdocs/loan/createschedule.php
@@ -0,0 +1,208 @@
+<?php
+/* Copyright (C) 2017	Franck Moreau   <franck.moreau@theobald.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/>.
+ */
+
+/**
+ *      \file       htdocs/loan/createecheancier.php
+ *		\ingroup    loan
+ *		\brief      Schedule card
+ */
+
+require '../main.inc.php';
+
+require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/loan/class/loanschedule.class.php';
+
+global $user;
+
+$loanid = GETPOST('loanid', 'int');
+$action = GETPOST('action');
+
+$object = new Loan($db);
+$object->fetch($loanid);
+
+$langs->load('loan');
+
+if ($action == 'createecheancier') {
+
+	$i=1;
+	while($i <$object->nbterm+1){
+
+		$date =  GETPOST('hi_date'.$i,'int');
+		$mens = GETPOST('mens'.$i);
+		$int = GETPOST('hi_interets'.$i);
+
+		$echeance = new LoanSchedule($db);
+
+		$echeance->fk_loan = $object->id;
+		$echeance->datec = dol_now();
+		$echeance->tms = dol_now();
+		$echeance->datepaid = $date;
+		$echeance->amount_capital = $mens-$int;
+		$echeance->amount_insurance = 0;
+		$echeance->amount_interest = $int;
+		$echeance->fk_typepayment = 3;
+		$echeance->fk_bank = 1;
+		$echeance->fk_user_creat = $user->id;
+		$echeance->fk_user_modif = $user->id;
+		$result=$echeance->create($user);
+		if ($result<0) {
+			setEventMessages(null, $echeance->errors,'errors');
+		}
+		$i++;
+	}
+}
+
+if ($action == 'updateecheancier') {
+
+	$i=1;
+	while($i <$object->nbterm+1){
+
+		$mens = GETPOST('mens'.$i);
+		$int = GETPOST('hi_interets'.$i);
+		$id = GETPOST('hi_rowid'.$i);
+		$echeance = new LoanSchedule($db);
+		$echeance->fetch($id);
+		$echeance->tms = dol_now();
+		$echeance->amount_capital = $mens-$int;
+		$echeance->amount_insurance = 0;
+		$echeance->amount_interest = $int;
+		$echeance->fk_user_modif = $user->id;
+		$result= $echeance->update($user,0);
+		if ($result<0) {
+			setEventMessages(null, $echeance->errors,'errors');
+		}
+		$i++;
+	}
+}
+
+$echeance = new LoanSchedule($db);
+$echeance->fetchall($object->id);
+
+top_htmlhead('', '');
+$var = ! $var;
+
+
+?>
+<script type="text/javascript" language="javascript">
+$(document).ready(function() {
+	$('[name^="mens"]').focusout(function() {
+		var echeance=$(this).attr('ech');
+		var mens=$(this).val();
+		var idcap=echeance-1;
+		idcap = '#hi_capital'+idcap;
+		var capital=$(idcap).val();
+		$.ajax({
+			  dataType: 'json',
+			  url: 'calcmens.php',
+			  data: { echeance: echeance, mens: mens, capital:capital, rate:<?php echo $object->rate/100;?> , nbterm : <?php echo $object->nbterm;?>},
+			  success: function(data) {
+				$.each(data, function(index, element) {
+					var idcap_res='#hi_capital'+index;
+					var idcap_res_srt='#capital'+index;
+					var interet_res='#hi_interets'+index;
+					var interet_res_str='#interets'+index;
+					var men_res='#mens'+index;
+					$(idcap_res).val(element.cap_rest);
+					$(idcap_res_srt).text(element.cap_rest_str+' €');
+					$(interet_res).val(element.interet);
+					$(interet_res_str).text(element.interet_str+' €');
+					$(men_res).val(element.mens);
+				});
+			}
+		});
+	});
+});
+</script>
+<?php
+
+
+print '<form name="createecheancier" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
+print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+print '<input type="hidden" name="loanid" value="' . $loanid . '">';
+if(count($echeance->lines)>0){
+	print '<input type="hidden" name="action" value="updateecheancier">';
+}else{
+	print '<input type="hidden" name="action" value="createecheancier">';
+}
+print '<table class="border" width="100%">';
+print '<tr class="liste_titre">';
+print '<th align="center" colspan="5">' . "Création d'échéancier</th>";
+print '</tr>';
+
+print '<tr class="liste_titre">';
+Print '<th width="10%" align="center"> Echéance </th>';
+Print '<th width="10%" align="center"> Date </th>';
+Print '<th width="10%" align="center"> Montant </th>';
+Print '<th width="20%" align="center"> Intérêts </th>';
+Print '<th width="40%" align="center"> Capital restant du </th>';
+print '</tr>';
+
+if ($object->nbterm > 0 && count($echeance->lines)==0)
+{
+	$i=1;
+	$capital = $object->capital;
+	while($i <$object->nbterm+1){
+		$mens = round($echeance->calc_mens($capital, $object->rate/100, $object->nbterm-$i+1),2,PHP_ROUND_HALF_UP);
+		$int = ($capital*($object->rate/12))/100;
+		$int = round($int ,2,PHP_ROUND_HALF_UP);
+		$cap_rest = round($capital - ($mens-$int),2,PHP_ROUND_HALF_UP);
+		print '<tr>';
+		print '<td align="center" id="n'.$i.'">' . $i .'</td>';
+		print '<td align="center" id ="date' .$i .'"><input type="hidden" name="hi_date' .$i .'" id ="hi_date' .$i .'" value="' . dol_time_plus_duree($object->datestart, $i-1, 'm') . '">' . dol_print_date(dol_time_plus_duree($object->datestart, $i-1, 'm'),'day') . '</td>';
+		print '<td align="center"><input name="mens'.$i.'" id="mens'.$i.'" size="5" value="'.$mens.'" ech="'.$i.'"> €</td>';
+		print '<td align="center" id="interets'.$i.'">'.price($int,0,'',1).' €</td><input type="hidden" name="hi_interets' .$i .'" id ="hi_interets' .$i .'" value="' . $int . '">';
+		print '<td align="center" id="capital'.$i.'">'.price($cap_rest).' €</td><input type="hidden" name="hi_capital' .$i .'" id ="hi_capital' .$i .'" value="' . $cap_rest . '">';
+		print '</tr>';
+		$i++;
+		$capital = $cap_rest;
+	}
+}elseif(count($echeance->lines)>0){
+	$i=1;
+	$capital = $object->capital;
+	foreach ($echeance->lines as $line){
+		$mens = $line->amount_capital+$line->amount_insurance+$line->amount_interest;
+		$int = $line->amount_interest;
+		$cap_rest = round($capital - ($mens-$int),2,PHP_ROUND_HALF_UP);
+		print '<tr>';
+		print '<td align="center" id="n'.$i.'"><input type="hidden" name="hi_rowid' .$i .'" id ="hi_rowid' .$i .'" value="' . $line->id . '">' . $i .'</td>';
+		print '<td align="center" id ="date' .$i .'"><input type="hidden" name="hi_date' .$i .'" id ="hi_date' .$i .'" value="' . $line->datep . '">' . dol_print_date($line->datep,'day') . '</td>';
+		if($line->datep > dol_now()){
+			print '<td align="center"><input name="mens'.$i.'" id="mens'.$i.'" size="5" value="'.$mens.'" ech="'.$i.'"> €</td>';
+		}else{
+			print '<td align="center">' . price($mens) . ' €</td><input type="hidden" name="mens' .$i .'" id ="mens' .$i .'" value="' . $mens . '">';
+		}
+		print '<td align="center" id="interets'.$i.'">'.price($int,0,'',1).' €</td><input type="hidden" name="hi_interets' .$i .'" id ="hi_interets' .$i .'" value="' . $int . '">';
+		print '<td align="center" id="capital'.$i.'">'.price($cap_rest).' €</td><input type="hidden" name="hi_capital' .$i .'" id ="hi_capital' .$i .'" value="' . $cap_rest . '">';
+		print '</tr>';
+		$i++;
+		$capital = $cap_rest;
+	}
+}
+
+print '</table>';
+print '</br>';
+print '</br>';
+print '<div align="center"><input class="button" type="submit" value="'.$langs->trans("Save").'"></div>';
+print '</form>';
+
+llxFooter();
+$db->close();
+
+
+

From 1761df2bc243ec9f333f38195ece72c533f83553 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Jun 2017 19:28:22 +0200
Subject: [PATCH 067/438] NEW Add page statistics for project tasks

---
 htdocs/core/menus/init_menu_auguria.sql |   1 +
 htdocs/core/menus/standard/eldy.lib.php |  45 +--
 htdocs/langs/en_US/projects.lang        |   3 +
 htdocs/projet/class/taskstats.class.php | 471 ++++++++++++++++++++++++
 htdocs/projet/tasks/stats/index.php     | 218 +++++++++++
 5 files changed, 716 insertions(+), 22 deletions(-)
 create mode 100644 htdocs/projet/class/taskstats.class.php
 create mode 100644 htdocs/projet/tasks/stats/index.php

diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 9106c345fda..7a60f330727 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -288,6 +288,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3701__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/tasks.php?leftmenu=projects&amp;action=create', 'NewTask', 1, 'projects', '$user->rights->projet->creer', '', 2, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3702__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/tasks/list.php?leftmenu=projects', 'List', 1, 'projects', '$user->rights->projet->lire', '', 2, 2, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3703__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/activity/perweek.php?leftmenu=projects', 'NewTimeSpent', 1, 'projects', '$user->rights->projet->lire', '', 2, 3, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3704__+MAX_llx_menu__, 'project', '', 3600__+MAX_llx_menu__, '/projet/tasks/stats/index.php?leftmenu=projects', 'Statistics', 1, 'projects', '$user->rights->projet->lire', '', 2, 4, __ENTITY__);
 
 -- Project - Categories
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->categorie->enabled', __HANDLER__, 'left', 3804__+MAX_llx_menu__, 'project', 'cat', 3__+MAX_llx_menu__, '/categories/index.php?leftmenu=cat&amp;type=6', 'Categories', 0, 'categories', '$user->rights->categorie->lire', '', 2, 4, __ENTITY__);
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 6248f294476..38a9a66a137 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -52,7 +52,7 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$mode
 	if (empty($noout)) print_start_menu_array();
 
 	$usemenuhider = (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER));
-	
+
 	// Show/Hide vertical menu
 	if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 	{
@@ -437,7 +437,7 @@ function print_end_menu_array()
 /**
  * Core function to output left menu eldy
  * Fill &$menu (example with $forcemainmenu='home' $forceleftmenu='all', return left menu tree of Home)
- * 
+ *
  * @param	DoliDB		$db                 Database handler
  * @param 	array		$menu_array_before  Table of menu entries to show before entries of menu handler (menu->liste filled with menu->add)
  * @param   array		$menu_array_after   Table of menu entries to show after entries of menu handler (menu->liste filled with menu->add)
@@ -445,7 +445,7 @@ function print_end_menu_array()
  * @param	Menu		$menu				Object Menu to return back list of menu entries
  * @param	int			$noout				Disable output (Initialise &$menu only).
  * @param	string		$forcemainmenu		'x'=Force mainmenu to mainmenu='x'
- * @param	string		$forceleftmenu		'all'=Force leftmenu to '' (= all). If value come being '', we change it to value in session and 'none' if not efined in session. 
+ * @param	string		$forceleftmenu		'all'=Force leftmenu to '' (= all). If value come being '', we change it to value in session and 'none' if not efined in session.
  * @param	array		$moredata			An array with more data to output
  * @return	int								nb of menu entries
  */
@@ -459,7 +459,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 	$leftmenu=($forceleftmenu?'':(empty($_SESSION["leftmenu"])?'none':$_SESSION["leftmenu"]));
 
 	$usemenuhider = (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER));
-	
+
 	// Show logo company
 	if (empty($conf->global->MAIN_MENU_INVERT) && empty($noout) && ! empty($conf->global->MAIN_SHOW_LOGO) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 	{
@@ -503,7 +503,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 	    print '</div>'."\n";
 	    print "<!-- End Bookmarks -->\n";
 	}
-	
+
 	/**
 	 * We update newmenu with entries found into database
 	 * --------------------------------------------------
@@ -605,7 +605,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 					$newmenu->add("/user/group/index.php?leftmenu=users", $langs->trans("ListOfGroups"), 2, ($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->read:$user->rights->user->user->lire) || $user->admin);
 				}
 			}
-			
+
 		}
 
 
@@ -839,7 +839,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				}
 
 				$newmenu->add("/fourn/facture/paiement.php", $langs->trans("Payments"),1,$user->rights->fournisseur->facture->lire);
-				
+
 				$newmenu->add("/fourn/facture/rapport.php",$langs->trans("Reportings"),2,$user->rights->fournisseur->facture->lire);
 
 				$newmenu->add("/compta/facture/stats/index.php?mode=supplier", $langs->trans("Statistics"),1,$user->rights->fournisseur->facture->lire);
@@ -957,29 +957,29 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Chartofaccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 30);
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/categories_list.php?id=32&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingCategory"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 31);
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuDefaultAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 40);
-				if (! empty($conf->facture->enabled) || ! empty($conf->fournisseur->enabled)) 
+				if (! empty($conf->facture->enabled) || ! empty($conf->fournisseur->enabled))
 				{
 				    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/admin/dict.php?id=10&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuVatAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 50);
 				}
-				if (! empty($conf->tax->enabled)) 
+				if (! empty($conf->tax->enabled))
 				{
 				    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/admin/dict.php?id=7&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuTaxAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 50);
 				}
-				if (! empty($conf->expensereport->enabled)) 
+				if (! empty($conf->expensereport->enabled))
 				{
 				    if (preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuExpenseReportAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 50);
 				}
 				/* not required yet, already supported by default account
-				if (! empty($conf->loan->enabled)) 
+				if (! empty($conf->loan->enabled))
 				{
 				    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/admin/loan.php?mainmenu=accountancy&amp;leftmenu=accountancy_admin", $langs->trans("MenuLoanAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_loan', 45);
 				}
-				if (! empty($conf->don->enabled)) 
+				if (! empty($conf->don->enabled))
 				{
 				    if (preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/don/admin/donation.php?from=accountancy&mainmenu=accountancy&amp;leftmenu=accountancy_admin", $langs->trans("MenuDonationAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_donation', 47);
 				}*/
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/productaccount.php?mainmenu=accountancy&amp;leftmenu=accountancy_admin", $langs->trans("MenuProductsAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_product', 60);
-				
+
 				// Binding
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/customer/index.php?leftmenu=accountancy_dispatch_customer&amp;mainmenu=accountancy",$langs->trans("CustomersVentilation"),1,$user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_customer');
 			    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_customer/',$leftmenu)) $newmenu->add("/accountancy/customer/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer",$langs->trans("ToBind"),2,$user->rights->accounting->bind->write);
@@ -1023,19 +1023,19 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
     							$objp = $db->fetch_object($resql);
 
     							$nature='';
-    							// Must match array $sourceList defined into journals_list.php 
+    							// Must match array $sourceList defined into journals_list.php
     							if ($objp->nature == 2) $nature="sells";
     							if ($objp->nature == 3) $nature="purchases";
     							if ($objp->nature == 4) $nature="bank";
     							if ($objp->nature == 1) $nature="various";
     							if ($objp->nature == 9) $nature="hasnew";
-    							
+
     							// To enable when page exists
     							if (empty($conf->global->MAIN_FEATURES_LEVEL))
     							{
-    							    if ($nature == 'various' || $nature == 'hasnew') $nature='';	
+    							    if ($nature == 'various' || $nature == 'hasnew') $nature='';
     							}
-    								
+
     							if ($nature)
     							{
                                     if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&code_journal='.$objp->code,dol_trunc($objp->label,25),2,$user->rights->accounting->comptarapport->lire);
@@ -1275,7 +1275,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
     				$newmenu->add("/product/inventory/list.php", $langs->trans("List"), 1, $user->rights->stock->lire);
     			}
 			}
-			
+
 			// Expeditions
 			if (! empty($conf->expedition->enabled))
 			{
@@ -1299,9 +1299,9 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			if (! empty($conf->projet->enabled))
 			{
 				$langs->load("projects");
-				
+
 				$search_project_user = GETPOST('search_project_user','int');
-				
+
 				// Project affected to user
 				$newmenu->add("/projet/index.php?leftmenu=projects".($search_project_user?'&search_project_user='.$search_project_user:''), $langs->trans("Projects"), 0, $user->rights->projet->lire, '', $mainmenu, 'projects');
 				$newmenu->add("/projet/card.php?leftmenu=projects&action=create".($search_project_user?'&search_project_user='.$search_project_user:''), $langs->trans("NewProject"), 1, $user->rights->projet->creer);
@@ -1314,7 +1314,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				$newmenu->add("/projet/list.php?leftmenu=projects&search_status=99", $langs->trans("List"), 1, $user->rights->projet->lire && $user->rights->projet->lire);
                 */
 				$newmenu->add("/projet/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->rights->projet->lire);
-				
+
 				if (empty($conf->global->PROJECT_HIDE_TASKS))
 				{
 					// Project affected to user
@@ -1322,6 +1322,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 					$newmenu->add("/projet/tasks.php?leftmenu=tasks&action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer);
 					$newmenu->add("/projet/tasks/list.php?leftmenu=tasks".($search_project_user?'&search_project_user='.$search_project_user:''), $langs->trans("List"), 1, $user->rights->projet->lire);
 					$newmenu->add("/projet/activity/perweek.php?leftmenu=tasks".($search_project_user?'&search_project_user='.$search_project_user:''), $langs->trans("NewTimeSpent"), 1, $user->rights->projet->lire);
+				    $newmenu->add("/projet/tasks/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->rights->projet->lire);
 
 					// All project i have permission on
 					/*$newmenu->add("/projet/activity/index.php", $langs->trans("Activities"), 0, $user->rights->projet->lire && $user->rights->projet->lire);
@@ -1445,7 +1446,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				$newmenu->add("/adherents/stats/index.php?leftmenu=members",$langs->trans("MenuMembersStats"),1,$user->rights->adherent->lire);
 				if (! empty($conf->global->MEMBER_LINK_TO_HTPASSWDFILE) && ($usemenuhider || empty($leftmenu) || $leftmenu=="export")) $newmenu->add("/adherents/htpasswd.php?leftmenu=export",$langs->trans("Filehtpasswd"),1,$user->rights->adherent->export);
 				if ($usemenuhider || empty($leftmenu) || $leftmenu=="export") $newmenu->add("/adherents/cartes/carte.php?leftmenu=export",$langs->trans("MembersCards"),1,$user->rights->adherent->export);
-				
+
 				$newmenu->add("/adherents/index.php?leftmenu=members&amp;mainmenu=members",$langs->trans("Subscriptions"),0,$user->rights->adherent->cotisation->lire);
 				$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=-1,1&amp;mainmenu=members",$langs->trans("NewSubscription"),1,$user->rights->adherent->cotisation->creer);
 				$newmenu->add("/adherents/subscription/list.php?leftmenu=members",$langs->trans("List"),1,$user->rights->adherent->cotisation->lire);
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 3b4e4f4d14f..b3317df9c8e 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -41,6 +41,7 @@ ShowProject=Show project
 SetProject=Set project
 NoProject=No project defined or owned
 NbOfProjects=Nb of projects
+NbOfTasks=Nb of tasks
 TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
@@ -181,10 +182,12 @@ ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
diff --git a/htdocs/projet/class/taskstats.class.php b/htdocs/projet/class/taskstats.class.php
new file mode 100644
index 00000000000..c0a0530bc75
--- /dev/null
+++ b/htdocs/projet/class/taskstats.class.php
@@ -0,0 +1,471 @@
+<?php
+/* Lead
+ * Copyright (C) 2014-2015 Florian HENRY <florian.henry@open-concept.pro>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General 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/>.
+ */
+include_once DOL_DOCUMENT_ROOT . '/core/class/stats.class.php';
+include_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
+
+
+/**
+ * Class to manage statistics on project tasks
+ */
+class TaskStats extends Stats
+{
+	private $project;
+	public $userid;
+	public $socid;
+	public $year;
+
+	function __construct($db)
+	{
+		global $conf, $user;
+
+		$this->db = $db;
+
+		require_once 'task.class.php';
+		$this->task = new Task($this->db);
+	}
+
+
+	/**
+	 * Return all tasks grouped by status.
+	 *
+	 * @param  int             $limit Limit results
+	 * @return array|int       Array with value or -1 if error
+	 * @throws Exception
+	 */
+	function getAllTaskByStatus($limit = 5)
+	{
+		global $conf, $user, $langs;
+
+		$datay = array ();
+
+		$sql = "SELECT";
+		$sql .= " COUNT(t.rowid), t.priority";
+		$sql.= " FROM ". MAIN_DB_PREFIX . "projet_task as t INNER JOIN " . MAIN_DB_PREFIX . "projet as p ON p.rowid = t.fk_projet";
+		$sql .= $this->buildWhere();
+		//$sql .= " AND t.fk_statut <> 0";     // We want historic also, so all task not draft
+		$sql .= " GROUP BY t.priority";
+
+		$result = array ();
+		$res = array ();
+
+		dol_syslog(get_class($this) . '::' . __METHOD__ . "", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			$other = 0;
+			while ( $i < $num ) {
+				$row = $this->db->fetch_row($resql);
+				if ($i < $limit || $num == $limit)
+				{
+					$result[$i] = array(
+						$row[1],
+						$row[0]
+					);
+				}
+				else
+					$other += $row[1];
+				$i++;
+			}
+			if ($num > $limit)
+				$result[$i] = array (
+						$langs->transnoentitiesnoconv("Other"),
+						$other
+				);
+			$this->db->free($resql);
+		} else {
+			$this->error = "Error " . $this->db->lasterror();
+			dol_syslog(get_class($this) . '::' . __METHOD__ . ' ' . $this->error, LOG_ERR);
+			return -1;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Return count, and sum of products
+	 *
+	 * @return array of values
+	 */
+	function getAllByYear()
+	{
+		global $conf, $user, $langs;
+
+		$datay = array ();
+
+		$wonlostfilter=0; // No filter on status WON/LOST
+
+		$sql = "SELECT date_format(t.datec,'%Y') as year, COUNT(t.rowid) as nb";
+		$sql.= " FROM ". MAIN_DB_PREFIX . "projet_task as t INNER JOIN " . MAIN_DB_PREFIX . "projet as p ON p.rowid = t.fk_projet";
+		if (! $user->rights->societe->client->voir && ! $user->societe_id)
+			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
+		$sql.= $this->buildWhere();
+		$sql.= " GROUP BY year";
+		$sql.= $this->db->order('year', 'DESC');
+
+		return $this->_getAllByYear($sql);
+	}
+
+
+	/**
+	 * Build the where part
+	 *
+	 * @return string
+	 */
+	public function buildWhere()
+	{
+		$sqlwhere_str = '';
+		$sqlwhere = array();
+
+		$sqlwhere[] = ' t.entity IN (' . getEntity('project') . ')';
+
+		if (! empty($this->userid))
+			$sqlwhere[] = ' t.fk_user_resp=' . $this->userid;
+		if (! empty($this->socid))
+			$sqlwhere[] = ' t.fk_soc=' . $this->socid;
+		if (! empty($this->year) && empty($this->yearmonth))
+			$sqlwhere[] = " date_format(t.datec,'%Y')='" . $this->db->escape($this->year) . "'";
+		if (! empty($this->yearmonth))
+			$sqlwhere[] = " t.datec BETWEEN '" . $this->db->idate(dol_get_first_day($this->yearmonth)) . "' AND '" . $this->db->idate(dol_get_last_day($this->yearmonth)) . "'";
+
+		if (! empty($this->status))
+			$sqlwhere[] = " t.priority IN (" . $this->priority . ")";
+
+		if (count($sqlwhere) > 0) {
+			$sqlwhere_str = ' WHERE ' . implode(' AND ', $sqlwhere);
+		}
+
+		return $sqlwhere_str;
+	}
+
+	/**
+	 * Return Task number by month for a year
+	 *
+	 * @param int $year scan
+	 * @return array of values
+	 */
+	function getNbByMonth($year)
+	{
+		global $user;
+
+		$this->yearmonth = $year;
+
+		$sql = "SELECT date_format(t.datec,'%m') as dm, COUNT(t.rowid) as nb";
+		$sql.= " FROM ". MAIN_DB_PREFIX . "projet_task as t INNER JOIN " . MAIN_DB_PREFIX . "projet as p ON p.rowid = t.fk_projet";
+		if (! $user->rights->societe->client->voir && ! $user->societe_id)
+			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
+		$sql .= $this->buildWhere();
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
+
+		$this->yearmonth=0;
+
+		$res = $this->_getNbByMonth($year, $sql);
+		// var_dump($res);print '<br>';
+		return $res;
+	}
+
+	/**
+	 * Return the Task amount by month for a year
+	 *
+	 * @param int $year scan
+	 * @return array with amount by month
+	 */
+	/*
+	function getAmountByMonth($year)
+	{
+		global $user;
+
+		$this->yearmonth = $year;
+
+		$sql = "SELECT date_format(t.datec,'%m') as dm, COUNT(t.rowid)";
+		$sql.= " FROM ". MAIN_DB_PREFIX . "projet_task as t INNER JOIN " . MAIN_DB_PREFIX . "projet as p ON p.rowid = t.fk_projet";
+		if (! $user->rights->societe->client->voir && ! $user->societe_id)
+			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
+		$sql .= $this->buildWhere();
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
+		$this->yearmonth=0;
+
+		$res = $this->_getAmountByMonth($year, $sql);
+		// var_dump($res);print '<br>';
+		return $res;
+	}*/
+
+
+	/**
+	 * Return amount of elements by month for several years
+	 *
+	 * @param	int		$endyear		Start year
+	 * @param	int		$startyear		End year
+	 * @param	int		$cachedelay		Delay we accept for cache file (0=No read, no save of cache, -1=No read but save)
+	 * @param   int     $wonlostfilter  Add a filter on status won/lost
+	 * @return 	array					Array of values
+	 */
+    /*
+	function getWeightedAmountByMonthWithPrevYear($endyear,$startyear,$cachedelay=0,$wonlostfilter=1)
+	{
+		global $conf,$user,$langs;
+
+        if ($startyear > $endyear) return -1;
+
+        $datay=array();
+
+        // Search into cache
+        if (! empty($cachedelay))
+        {
+        	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+        	include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
+        }
+
+        $newpathofdestfile=$conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix)?'':$this->cachefilesuffix.'_').$langs->defaultlang.'_user'.$user->id.'.cache';
+        $newmask='0644';
+
+        $nowgmt = dol_now();
+
+        $foundintocache=0;
+        if ($cachedelay > 0)
+        {
+        	$filedate=dol_filemtime($newpathofdestfile);
+        	if ($filedate >= ($nowgmt - $cachedelay))
+        	{
+        		$foundintocache=1;
+
+        		$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$filedate;
+        	}
+        	else
+        	{
+        		dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
+        	}
+        }
+
+        // Load file into $data
+        if ($foundintocache)    // Cache file found and is not too old
+        {
+        	dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
+        	$data = json_decode(file_get_contents($newpathofdestfile), true);
+        }
+        else
+		{
+			$year=$startyear;
+			while($year <= $endyear)
+			{
+				$datay[$year] = $this->getWeightedAmountByMonth($year,$wonlostfilter);
+				$year++;
+			}
+
+			$data = array();
+			// $data = array('xval'=>array(0=>xlabel,1=>yval1,2=>yval2...),...)
+			for ($i = 0 ; $i < 12 ; $i++)
+			{
+				$data[$i][]=$datay[$endyear][$i][0];	// set label
+				$year=$startyear;
+				while($year <= $endyear)
+				{
+					$data[$i][]=$datay[$year][$i][1];	// set yval for x=i
+					$year++;
+				}
+			}
+		}
+
+		// Save cache file
+		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))
+		{
+			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
+			if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
+			$fp = fopen($newpathofdestfile, 'w');
+			if ($fp)
+			{
+				fwrite($fp, json_encode($data));
+				fclose($fp);
+				if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+				@chmod($newpathofdestfile, octdec($newmask));
+			}
+			else dol_syslog("Failed to write cache file", LOG_ERR);
+			$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt;
+		}
+
+		return $data;
+	}
+	*/
+
+
+	/**
+	 * Return the Task weighted opp amount by month for a year.
+	 *
+	 * @param  int $year               Year to scan
+	 * @param  int $wonlostfilter      Add a filter on status won/lost
+	 * @return array                   Array with amount by month
+	 */
+    /*
+	function getWeightedAmountByMonth($year, $wonlostfilter=1)
+	{
+		global $user;
+
+		$this->yearmonth = $year;
+
+		$sql = "SELECT date_format(t.datec,'%m') as dm";
+		$sql.= " FROM ". MAIN_DB_PREFIX . "projet_task as t INNER JOIN " . MAIN_DB_PREFIX . "projet as p ON p.rowid = t.fk_projet";
+		if (! $user->rights->societe->client->voir && ! $user->societe_id)
+			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
+		$sql .= $this->buildWhere();
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
+		$this->yearmonth=0;
+
+		$res = $this->_getAmountByMonth($year, $sql);
+		// var_dump($res);print '<br>';
+		return $res;
+	}*/
+
+	/**
+	 * Return amount of elements by month for several years
+	 *
+	 * @param int $endyear		End year
+	 * @param int $startyear	Start year
+	 * @param int $cachedelay accept for cache file (0=No read, no save of cache, -1=No read but save)
+	 * @return array of values
+	 */
+    /*
+	function getTransformRateByMonthWithPrevYear($endyear, $startyear, $cachedelay = 0)
+	{
+		global $conf, $user, $langs;
+
+		if ($startyear > $endyear) return - 1;
+
+		$datay = array();
+
+		// Search into cache
+		if (! empty($cachedelay))
+		{
+			include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+			include_once DOL_DOCUMENT_ROOT . '/core/lib/json.lib.php';
+		}
+
+		$newpathofdestfile = $conf->user->dir_temp . '/' . get_class($this) . '_' . __FUNCTION__ . '_' . (empty($this->cachefilesuffix) ? '' : $this->cachefilesuffix . '_') . $langs->defaultlang . '_user' . $user->id . '.cache';
+		$newmask = '0644';
+
+		$nowgmt = dol_now();
+
+		$foundintocache = 0;
+		if ($cachedelay > 0) {
+			$filedate = dol_filemtime($newpathofdestfile);
+			if ($filedate >= ($nowgmt - $cachedelay)) {
+				$foundintocache = 1;
+
+				$this->_lastfetchdate[get_class($this) . '_' . __FUNCTION__] = $filedate;
+			} else {
+				dol_syslog(get_class($this) . '::' . __FUNCTION__ . " cache file " . $newpathofdestfile . " is not found or older than now - cachedelay (" . $nowgmt . " - " . $cachedelay . ") so we can't use it.");
+			}
+		}
+
+		// Load file into $data
+		if ($foundintocache) // Cache file found and is not too old
+		{
+			dol_syslog(get_class($this) . '::' . __FUNCTION__ . " read data from cache file " . $newpathofdestfile . " " . $filedate . ".");
+			$data = json_decode(file_get_contents($newpathofdestfile), true);
+		} else {
+			$year = $startyear;
+			while ( $year <= $endyear ) {
+				$datay[$year] = $this->getTransformRateByMonth($year);
+				$year ++;
+			}
+
+			$data = array ();
+			// $data = array('xval'=>array(0=>xlabel,1=>yval1,2=>yval2...),...)
+			for($i = 0; $i < 12; $i ++) {
+				$data[$i][] = $datay[$endyear][$i][0]; // set label
+				$year = $startyear;
+				while ( $year <= $endyear ) {
+					$data[$i][] = $datay[$year][$i][1]; // set yval for x=i
+					$year ++;
+				}
+			}
+		}
+
+		// Save cache file
+		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == - 1)) {
+			dol_syslog(get_class($this) . '::' . __FUNCTION__ . " save cache file " . $newpathofdestfile . " onto disk.");
+			if (! dol_is_dir($conf->user->dir_temp))
+				dol_mkdir($conf->user->dir_temp);
+			$fp = fopen($newpathofdestfile, 'w');
+			fwrite($fp, json_encode($data));
+			fclose($fp);
+			if (! empty($conf->global->MAIN_UMASK))
+				$newmask = $conf->global->MAIN_UMASK;
+			@chmod($newpathofdestfile, octdec($newmask));
+
+			$this->_lastfetchdate[get_class($this) . '_' . __FUNCTION__] = $nowgmt;
+		}
+
+		return $data;
+	}*/
+
+	/**
+	 * Return the Task transformation rate by month for a year
+	 *
+	 * @param int $year scan
+	 * @return array with amount by month
+	 */
+	/*
+	function getTransformRateByMonth($year)
+	{
+		global $user;
+
+		$this->yearmonth = $year;
+
+		$sql = "SELECT date_format(t.datec,'%m') as dm, count(t.rowid)";
+		$sql.= " FROM ". MAIN_DB_PREFIX . "projet_task as t INNER JOIN " . MAIN_DB_PREFIX . "projet as p ON p.rowid = t.fk_projet";
+		if (! $user->rights->societe->client->voir && ! $user->societe_id)
+			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
+		$sql .= $this->buildWhere();
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
+
+		$res_total = $this->_getNbByMonth($year, $sql);
+
+		$this->status=6;
+
+		$sql = "SELECT date_format(t.datec,'%m') as dm, count(t.rowid)";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "projet_task as t";
+		if (! $user->rights->societe->client->voir && ! $user->societe_id)
+			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
+		$sql .= $this->buildWhere();
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
+
+		$this->status=0;
+		$this->yearmonth=0;
+
+		$res_only_wined = $this->_getNbByMonth($year, $sql);
+
+		$res=array();
+
+		foreach($res_total as $key=>$total_row) {
+			//var_dump($total_row);
+			if (!empty($total_row[1])) {
+				$res[$key]=array($total_row[0],(100*$res_only_wined[$key][1])/$total_row[1]);
+			} else {
+				$res[$key]=array($total_row[0],0);
+			}
+
+		}
+		// var_dump($res);print '<br>';
+		return $res;
+	}*/
+}
diff --git a/htdocs/projet/tasks/stats/index.php b/htdocs/projet/tasks/stats/index.php
new file mode 100644
index 00000000000..b03d01a8006
--- /dev/null
+++ b/htdocs/projet/tasks/stats/index.php
@@ -0,0 +1,218 @@
+<?php
+/* Copyright (C) 2014-2015 Florian HENRY       <florian.henry@open-concept.pro>
+ * Copyright (C) 2015      Laurent Destailleur <ldestailleur@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/projet/tasks/stats/index.php
+ *       \ingroup    project
+ *       \brief      Page for tasks statistics
+ */
+
+require '../../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/taskstats.class.php';
+
+// Security check
+if (! $user->rights->projet->lire)
+	accessforbidden();
+
+
+$WIDTH=DolGraph::getDefaultGraphSizeForStats('width');
+$HEIGHT=DolGraph::getDefaultGraphSizeForStats('height');
+
+$userid=GETPOST('userid','int');
+$socid=GETPOST('socid','int');
+// Security check
+if ($user->societe_id > 0)
+{
+	$action = '';
+	$socid = $user->societe_id;
+}
+$nowyear=strftime("%Y", dol_now());
+$year = GETPOST('year')>0?GETPOST('year'):$nowyear;
+//$startyear=$year-2;
+$startyear=$year-1;
+$endyear=$year;
+
+$langs->load('companies');
+$langs->load('projects');
+
+
+/*
+ * View
+ */
+
+$form=new Form($db);
+
+$includeuserlist=array();
+
+
+llxHeader('', $langs->trans('Tasks'));
+
+$title=$langs->trans("TasksStatistics");
+$dir=$conf->projet->dir_output.'/temp';
+
+print load_fiche_titre($title,'','title_project.png');
+
+dol_mkdir($dir);
+
+
+$stats_tasks= new TaskStats($db);
+if (!empty($userid) && $userid!=-1) $stats_tasks->userid=$userid;
+if (!empty($socid)  && $socid!=-1) $stats_tasks->socid=$socid;
+if (!empty($year)) $stats_tasks->year=$year;
+
+
+
+// Build graphic number of object
+// $data = array(array('Lib',val1,val2,val3),...)
+$data = $stats_tasks->getNbByMonthWithPrevYear($endyear,$startyear);
+//var_dump($data);
+
+$filenamenb = $conf->project->dir_output . "/stats/tasknbprevyear-".$year.".png";
+$fileurlnb = DOL_URL_ROOT . '/viewimage.php?modulepart=taskstats&amp;file=tasknbprevyear-'.$year.'.png';
+
+$px1 = new DolGraph();
+$mesg = $px1->isGraphKo();
+if (! $mesg)
+{
+	$px1->SetData($data);
+	$px1->SetPrecisionY(0);
+	$i=$startyear;$legend=array();
+	while ($i <= $endyear)
+	{
+		$legend[]=$i;
+		$i++;
+	}
+	$px1->SetLegend($legend);
+	$px1->SetMaxValue($px1->GetCeilMaxValue());
+	$px1->SetWidth($WIDTH);
+	$px1->SetHeight($HEIGHT);
+	$px1->SetYLabel($langs->trans("ProjectNbTask"));
+	$px1->SetShading(3);
+	$px1->SetHorizTickIncrement(1);
+	$px1->SetPrecisionY(0);
+	$px1->mode='depth';
+	$px1->SetTitle($langs->trans("ProjectNbTaskByMonth"));
+
+	$px1->draw($filenamenb,$fileurlnb);
+}
+
+
+// Show array
+$stats_tasks->year=0;
+$data_all_year = $stats_tasks->getAllByYear();
+
+if (!empty($year)) $stats_tasks->year=$year;
+$arrayyears=array();
+foreach($data_all_year as $val) {
+	$arrayyears[$val['year']]=$val['year'];
+}
+if (! count($arrayyears)) $arrayyears[$nowyear]=$nowyear;
+
+
+$h=0;
+$head = array();
+$head[$h][0] = DOL_URL_ROOT . '/projet/tasks/stats/index.php?mode='.$mode;
+$head[$h][1] = $langs->trans("ByMonthYear");
+$head[$h][2] = 'byyear';
+$h++;
+
+complete_head_from_modules($conf,$langs,null,$head,$h,$type);
+
+dol_fiche_head($head,'byyear',$langs->trans("Statistics"), -1, '');
+
+
+print '<div class="fichecenter"><div class="fichethirdleft">';
+
+print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
+// Company
+/*print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
+if ($mode == 'customer') $filter='s.client in (1,2,3)';
+if ($mode == 'supplier') $filter='s.fournisseur = 1';
+print $form->select_company($socid,'socid',$filter,1,0,0,array(),0,'','style="width: 95%"');
+print '</td></tr>';
+*/
+// User
+/*print '<tr><td>'.$langs->trans("ProjectCommercial").'</td><td>';
+print $form->select_dolusers($userid, 'userid', 1, array(),0,$includeuserlist);
+print '</td></tr>';*/
+// Year
+print '<tr><td>'.$langs->trans("Year").'</td><td>';
+if (! in_array($year,$arrayyears)) $arrayyears[$year]=$year;
+if (! in_array($nowyear,$arrayyears)) $arrayyears[$nowyear]=$nowyear;
+arsort($arrayyears);
+print $form->selectarray('year',$arrayyears,$year,0);
+print '</td></tr>';
+print '<tr><td align="center" colspan="2"><input type="submit" name="submit" class="button" value="'.$langs->trans("Refresh").'"></td></tr>';
+print '</table>';
+print '</form>';
+print '<br><br>';
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre" height="24">';
+print '<td align="center">'.$langs->trans("Year").'</td>';
+print '<td align="right">'.$langs->trans("NbOfTasks").'</td>';
+print '</tr>';
+
+$oldyear=0;
+$var=true;
+foreach ($data_all_year as $val)
+{
+	$year = $val['year'];
+	while ($year && $oldyear > $year+1)
+	{	// If we have empty year
+		$oldyear--;
+
+		print '<tr '.$bc[$var].' height="24">';
+		print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$oldyear.'</a></td>';
+		print '<td align="right">0</td>';
+		print '</tr>';
+	}
+
+	print '<tr '.$bc[$var].' height="24">';
+	print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$year.'</a></td>';
+	print '<td align="right">'.$val['nb'].'</td>';
+	print '</tr>';
+	$oldyear=$year;
+}
+
+print '</table>';
+
+print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+
+$stringtoshow.= '<table class="border" width="100%"><tr valign="top"><td align="center">';
+if ($mesg) { print $mesg; }
+else {
+	$stringtoshow.= $px1->show();
+	$stringtoshow.= "<br>\n";
+}
+$stringtoshow.= '</td></tr></table>';
+
+print $stringtoshow;
+
+
+print '</div></div></div>';
+print '<div style="clear:both"></div>';
+
+
+llxFooter();
+$db->close();

From bfa50b8d1d8574151d9bdac304d487f84f39da0e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Jun 2017 19:36:03 +0200
Subject: [PATCH 068/438] Fix some security issues

---
 htdocs/projet/class/projectstats.class.php |  41 +--
 htdocs/projet/class/taskstats.class.php    | 297 +--------------------
 2 files changed, 27 insertions(+), 311 deletions(-)

diff --git a/htdocs/projet/class/projectstats.class.php b/htdocs/projet/class/projectstats.class.php
index 4485117fb0f..a47d28d1b43 100644
--- a/htdocs/projet/class/projectstats.class.php
+++ b/htdocs/projet/class/projectstats.class.php
@@ -28,8 +28,8 @@ class ProjectStats extends Stats
 	public $userid;
 	public $socid;
 	public $year;
-	
-	function __construct($db) 
+
+	function __construct($db)
 	{
 		global $conf, $user;
 
@@ -41,7 +41,7 @@ class ProjectStats extends Stats
 
 
 	/**
-	 * Return all leads grouped by status.
+	 * Return all leads grouped by opportunity status.
 	 * Warning: There is no filter on WON/LOST because we want this for statistics.
 	 *
 	 * @param  int             $limit Limit results
@@ -56,7 +56,10 @@ class ProjectStats extends Stats
 
 		$sql = "SELECT";
 		$sql .= " SUM(t.opp_amount), t.fk_opp_status, cls.code, cls.label";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "projet as t, ".MAIN_DB_PREFIX."c_lead_status as cls";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "projet as t";
+		if (! $user->rights->societe->client->voir && ! $user->socid)
+			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
+		$sql .= ", ".MAIN_DB_PREFIX."c_lead_status as cls";
 		$sql .= $this->buildWhere();
 		$sql .= " AND t.fk_opp_status = cls.rowid";
 		$sql .= " AND t.fk_statut <> 0";     // We want historic also, so all projects not draft
@@ -112,11 +115,11 @@ class ProjectStats extends Stats
 		$datay = array ();
 
 		$wonlostfilter=0; // No filter on status WON/LOST
-		
+
 		$sql = "SELECT date_format(t.datec,'%Y') as year, COUNT(t.rowid) as nb, SUM(t.opp_amount) as total, AVG(t.opp_amount) as avg,";
 		$sql.= " SUM(t.opp_amount * ".$this->db->ifsql("t.opp_percent IS NULL".($wonlostfilter?" OR cls.code IN ('WON','LOST')":""), '0', 't.opp_percent')." / 100) as weighted";
 		$sql.= " FROM " . MAIN_DB_PREFIX . "projet as t LEFT JOIN ".MAIN_DB_PREFIX."c_lead_status as cls ON cls.rowid = t.fk_opp_status";
-		if (! $user->rights->societe->client->voir && ! $user->societe_id)
+		if (! $user->rights->societe->client->voir && ! $user->soc_id)
 			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
 		$sql.= $this->buildWhere();
 		$sql.= " GROUP BY year";
@@ -124,14 +127,14 @@ class ProjectStats extends Stats
 
 		return $this->_getAllByYear($sql);
 	}
-	
-	
+
+
 	/**
 	 * Build the where part
-	 * 
+	 *
 	 * @return string
 	 */
-	public function buildWhere() 
+	public function buildWhere()
 	{
 		$sqlwhere_str = '';
 		$sqlwhere = array();
@@ -163,7 +166,7 @@ class ProjectStats extends Stats
 	 * @param int $year scan
 	 * @return array of values
 	 */
-	function getNbByMonth($year) 
+	function getNbByMonth($year)
 	{
 		global $user;
 
@@ -171,7 +174,7 @@ class ProjectStats extends Stats
 
 		$sql = "SELECT date_format(t.datec,'%m') as dm, COUNT(*) as nb";
 		$sql .= " FROM " . MAIN_DB_PREFIX . "projet as t";
-		if (! $user->rights->societe->client->voir && ! $user->societe_id)
+		if (! $user->rights->societe->client->voir && ! $user->soc_id)
 			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
 		$sql .= $this->buildWhere();
 		$sql .= " GROUP BY dm";
@@ -190,7 +193,7 @@ class ProjectStats extends Stats
 	 * @param int $year scan
 	 * @return array with amount by month
 	 */
-	function getAmountByMonth($year) 
+	function getAmountByMonth($year)
 	{
 		global $user;
 
@@ -198,7 +201,7 @@ class ProjectStats extends Stats
 
 		$sql = "SELECT date_format(t.datec,'%m') as dm, SUM(t.opp_amount)";
 		$sql .= " FROM " . MAIN_DB_PREFIX . "projet as t";
-		if (! $user->rights->societe->client->voir && ! $user->societe_id)
+		if (! $user->rights->societe->client->voir && ! $user->soc_id)
 			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
 		$sql .= $this->buildWhere();
 		$sql .= " GROUP BY dm";
@@ -313,7 +316,7 @@ class ProjectStats extends Stats
 	 * @param  int $wonlostfilter      Add a filter on status won/lost
 	 * @return array                   Array with amount by month
 	 */
-	function getWeightedAmountByMonth($year, $wonlostfilter=1) 
+	function getWeightedAmountByMonth($year, $wonlostfilter=1)
 	{
 		global $user;
 
@@ -321,7 +324,7 @@ class ProjectStats extends Stats
 
 		$sql = "SELECT date_format(t.datec,'%m') as dm, SUM(t.opp_amount * ".$this->db->ifsql("t.opp_percent IS NULL".($wonlostfilter?" OR cls.code IN ('WON','LOST')":""), '0', 't.opp_percent')." / 100)";
 		$sql .= " FROM " . MAIN_DB_PREFIX . "projet as t LEFT JOIN ".MAIN_DB_PREFIX.'c_lead_status as cls ON t.fk_opp_status = cls.rowid';
-		if (! $user->rights->societe->client->voir && ! $user->societe_id)
+		if (! $user->rights->societe->client->voir && ! $user->soc_id)
 			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
 		$sql .= $this->buildWhere();
 		$sql .= " GROUP BY dm";
@@ -421,7 +424,7 @@ class ProjectStats extends Stats
 	 * @param int $year scan
 	 * @return array with amount by month
 	 */
-	function getTransformRateByMonth($year) 
+	function getTransformRateByMonth($year)
 	{
 		global $user;
 
@@ -429,7 +432,7 @@ class ProjectStats extends Stats
 
 		$sql = "SELECT date_format(t.datec,'%m') as dm, count(t.opp_amount)";
 		$sql .= " FROM " . MAIN_DB_PREFIX . "projet as t";
-		if (! $user->rights->societe->client->voir && ! $user->societe_id)
+		if (! $user->rights->societe->client->voir && ! $user->soc_id)
 			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
 		$sql .= $this->buildWhere();
 		$sql .= " GROUP BY dm";
@@ -441,7 +444,7 @@ class ProjectStats extends Stats
 
 		$sql = "SELECT date_format(t.datec,'%m') as dm, count(t.opp_amount)";
 		$sql .= " FROM " . MAIN_DB_PREFIX . "projet as t";
-		if (! $user->rights->societe->client->voir && ! $user->societe_id)
+		if (! $user->rights->societe->client->voir && ! $user->soc_id)
 			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
 		$sql .= $this->buildWhere();
 		$sql .= " GROUP BY dm";
diff --git a/htdocs/projet/class/taskstats.class.php b/htdocs/projet/class/taskstats.class.php
index c0a0530bc75..b71c88f3d6b 100644
--- a/htdocs/projet/class/taskstats.class.php
+++ b/htdocs/projet/class/taskstats.class.php
@@ -51,11 +51,13 @@ class TaskStats extends Stats
 	{
 		global $conf, $user, $langs;
 
-		$datay = array ();
+		$datay = array();
 
 		$sql = "SELECT";
 		$sql .= " COUNT(t.rowid), t.priority";
 		$sql.= " FROM ". MAIN_DB_PREFIX . "projet_task as t INNER JOIN " . MAIN_DB_PREFIX . "projet as p ON p.rowid = t.fk_projet";
+		if (! $user->rights->societe->client->voir && ! $user->soc_id)
+			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
 		$sql .= $this->buildWhere();
 		//$sql .= " AND t.fk_statut <> 0";     // We want historic also, so all task not draft
 		$sql .= " GROUP BY t.priority";
@@ -112,7 +114,7 @@ class TaskStats extends Stats
 
 		$sql = "SELECT date_format(t.datec,'%Y') as year, COUNT(t.rowid) as nb";
 		$sql.= " FROM ". MAIN_DB_PREFIX . "projet_task as t INNER JOIN " . MAIN_DB_PREFIX . "projet as p ON p.rowid = t.fk_projet";
-		if (! $user->rights->societe->client->voir && ! $user->societe_id)
+		if (! $user->rights->societe->client->voir && ! $user->soc_id)
 			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
 		$sql.= $this->buildWhere();
 		$sql.= " GROUP BY year";
@@ -167,7 +169,7 @@ class TaskStats extends Stats
 
 		$sql = "SELECT date_format(t.datec,'%m') as dm, COUNT(t.rowid) as nb";
 		$sql.= " FROM ". MAIN_DB_PREFIX . "projet_task as t INNER JOIN " . MAIN_DB_PREFIX . "projet as p ON p.rowid = t.fk_projet";
-		if (! $user->rights->societe->client->voir && ! $user->societe_id)
+		if (! $user->rights->societe->client->voir && ! $user->soc_id)
 			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
 		$sql .= $this->buildWhere();
 		$sql .= " GROUP BY dm";
@@ -179,293 +181,4 @@ class TaskStats extends Stats
 		// var_dump($res);print '<br>';
 		return $res;
 	}
-
-	/**
-	 * Return the Task amount by month for a year
-	 *
-	 * @param int $year scan
-	 * @return array with amount by month
-	 */
-	/*
-	function getAmountByMonth($year)
-	{
-		global $user;
-
-		$this->yearmonth = $year;
-
-		$sql = "SELECT date_format(t.datec,'%m') as dm, COUNT(t.rowid)";
-		$sql.= " FROM ". MAIN_DB_PREFIX . "projet_task as t INNER JOIN " . MAIN_DB_PREFIX . "projet as p ON p.rowid = t.fk_projet";
-		if (! $user->rights->societe->client->voir && ! $user->societe_id)
-			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
-		$sql .= $this->buildWhere();
-		$sql .= " GROUP BY dm";
-		$sql .= $this->db->order('dm', 'DESC');
-		$this->yearmonth=0;
-
-		$res = $this->_getAmountByMonth($year, $sql);
-		// var_dump($res);print '<br>';
-		return $res;
-	}*/
-
-
-	/**
-	 * Return amount of elements by month for several years
-	 *
-	 * @param	int		$endyear		Start year
-	 * @param	int		$startyear		End year
-	 * @param	int		$cachedelay		Delay we accept for cache file (0=No read, no save of cache, -1=No read but save)
-	 * @param   int     $wonlostfilter  Add a filter on status won/lost
-	 * @return 	array					Array of values
-	 */
-    /*
-	function getWeightedAmountByMonthWithPrevYear($endyear,$startyear,$cachedelay=0,$wonlostfilter=1)
-	{
-		global $conf,$user,$langs;
-
-        if ($startyear > $endyear) return -1;
-
-        $datay=array();
-
-        // Search into cache
-        if (! empty($cachedelay))
-        {
-        	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-        	include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
-        }
-
-        $newpathofdestfile=$conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix)?'':$this->cachefilesuffix.'_').$langs->defaultlang.'_user'.$user->id.'.cache';
-        $newmask='0644';
-
-        $nowgmt = dol_now();
-
-        $foundintocache=0;
-        if ($cachedelay > 0)
-        {
-        	$filedate=dol_filemtime($newpathofdestfile);
-        	if ($filedate >= ($nowgmt - $cachedelay))
-        	{
-        		$foundintocache=1;
-
-        		$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$filedate;
-        	}
-        	else
-        	{
-        		dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
-        	}
-        }
-
-        // Load file into $data
-        if ($foundintocache)    // Cache file found and is not too old
-        {
-        	dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
-        	$data = json_decode(file_get_contents($newpathofdestfile), true);
-        }
-        else
-		{
-			$year=$startyear;
-			while($year <= $endyear)
-			{
-				$datay[$year] = $this->getWeightedAmountByMonth($year,$wonlostfilter);
-				$year++;
-			}
-
-			$data = array();
-			// $data = array('xval'=>array(0=>xlabel,1=>yval1,2=>yval2...),...)
-			for ($i = 0 ; $i < 12 ; $i++)
-			{
-				$data[$i][]=$datay[$endyear][$i][0];	// set label
-				$year=$startyear;
-				while($year <= $endyear)
-				{
-					$data[$i][]=$datay[$year][$i][1];	// set yval for x=i
-					$year++;
-				}
-			}
-		}
-
-		// Save cache file
-		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))
-		{
-			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
-			if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
-			$fp = fopen($newpathofdestfile, 'w');
-			if ($fp)
-			{
-				fwrite($fp, json_encode($data));
-				fclose($fp);
-				if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
-				@chmod($newpathofdestfile, octdec($newmask));
-			}
-			else dol_syslog("Failed to write cache file", LOG_ERR);
-			$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt;
-		}
-
-		return $data;
-	}
-	*/
-
-
-	/**
-	 * Return the Task weighted opp amount by month for a year.
-	 *
-	 * @param  int $year               Year to scan
-	 * @param  int $wonlostfilter      Add a filter on status won/lost
-	 * @return array                   Array with amount by month
-	 */
-    /*
-	function getWeightedAmountByMonth($year, $wonlostfilter=1)
-	{
-		global $user;
-
-		$this->yearmonth = $year;
-
-		$sql = "SELECT date_format(t.datec,'%m') as dm";
-		$sql.= " FROM ". MAIN_DB_PREFIX . "projet_task as t INNER JOIN " . MAIN_DB_PREFIX . "projet as p ON p.rowid = t.fk_projet";
-		if (! $user->rights->societe->client->voir && ! $user->societe_id)
-			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
-		$sql .= $this->buildWhere();
-		$sql .= " GROUP BY dm";
-		$sql .= $this->db->order('dm', 'DESC');
-		$this->yearmonth=0;
-
-		$res = $this->_getAmountByMonth($year, $sql);
-		// var_dump($res);print '<br>';
-		return $res;
-	}*/
-
-	/**
-	 * Return amount of elements by month for several years
-	 *
-	 * @param int $endyear		End year
-	 * @param int $startyear	Start year
-	 * @param int $cachedelay accept for cache file (0=No read, no save of cache, -1=No read but save)
-	 * @return array of values
-	 */
-    /*
-	function getTransformRateByMonthWithPrevYear($endyear, $startyear, $cachedelay = 0)
-	{
-		global $conf, $user, $langs;
-
-		if ($startyear > $endyear) return - 1;
-
-		$datay = array();
-
-		// Search into cache
-		if (! empty($cachedelay))
-		{
-			include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-			include_once DOL_DOCUMENT_ROOT . '/core/lib/json.lib.php';
-		}
-
-		$newpathofdestfile = $conf->user->dir_temp . '/' . get_class($this) . '_' . __FUNCTION__ . '_' . (empty($this->cachefilesuffix) ? '' : $this->cachefilesuffix . '_') . $langs->defaultlang . '_user' . $user->id . '.cache';
-		$newmask = '0644';
-
-		$nowgmt = dol_now();
-
-		$foundintocache = 0;
-		if ($cachedelay > 0) {
-			$filedate = dol_filemtime($newpathofdestfile);
-			if ($filedate >= ($nowgmt - $cachedelay)) {
-				$foundintocache = 1;
-
-				$this->_lastfetchdate[get_class($this) . '_' . __FUNCTION__] = $filedate;
-			} else {
-				dol_syslog(get_class($this) . '::' . __FUNCTION__ . " cache file " . $newpathofdestfile . " is not found or older than now - cachedelay (" . $nowgmt . " - " . $cachedelay . ") so we can't use it.");
-			}
-		}
-
-		// Load file into $data
-		if ($foundintocache) // Cache file found and is not too old
-		{
-			dol_syslog(get_class($this) . '::' . __FUNCTION__ . " read data from cache file " . $newpathofdestfile . " " . $filedate . ".");
-			$data = json_decode(file_get_contents($newpathofdestfile), true);
-		} else {
-			$year = $startyear;
-			while ( $year <= $endyear ) {
-				$datay[$year] = $this->getTransformRateByMonth($year);
-				$year ++;
-			}
-
-			$data = array ();
-			// $data = array('xval'=>array(0=>xlabel,1=>yval1,2=>yval2...),...)
-			for($i = 0; $i < 12; $i ++) {
-				$data[$i][] = $datay[$endyear][$i][0]; // set label
-				$year = $startyear;
-				while ( $year <= $endyear ) {
-					$data[$i][] = $datay[$year][$i][1]; // set yval for x=i
-					$year ++;
-				}
-			}
-		}
-
-		// Save cache file
-		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == - 1)) {
-			dol_syslog(get_class($this) . '::' . __FUNCTION__ . " save cache file " . $newpathofdestfile . " onto disk.");
-			if (! dol_is_dir($conf->user->dir_temp))
-				dol_mkdir($conf->user->dir_temp);
-			$fp = fopen($newpathofdestfile, 'w');
-			fwrite($fp, json_encode($data));
-			fclose($fp);
-			if (! empty($conf->global->MAIN_UMASK))
-				$newmask = $conf->global->MAIN_UMASK;
-			@chmod($newpathofdestfile, octdec($newmask));
-
-			$this->_lastfetchdate[get_class($this) . '_' . __FUNCTION__] = $nowgmt;
-		}
-
-		return $data;
-	}*/
-
-	/**
-	 * Return the Task transformation rate by month for a year
-	 *
-	 * @param int $year scan
-	 * @return array with amount by month
-	 */
-	/*
-	function getTransformRateByMonth($year)
-	{
-		global $user;
-
-		$this->yearmonth = $year;
-
-		$sql = "SELECT date_format(t.datec,'%m') as dm, count(t.rowid)";
-		$sql.= " FROM ". MAIN_DB_PREFIX . "projet_task as t INNER JOIN " . MAIN_DB_PREFIX . "projet as p ON p.rowid = t.fk_projet";
-		if (! $user->rights->societe->client->voir && ! $user->societe_id)
-			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
-		$sql .= $this->buildWhere();
-		$sql .= " GROUP BY dm";
-		$sql .= $this->db->order('dm', 'DESC');
-
-		$res_total = $this->_getNbByMonth($year, $sql);
-
-		$this->status=6;
-
-		$sql = "SELECT date_format(t.datec,'%m') as dm, count(t.rowid)";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "projet_task as t";
-		if (! $user->rights->societe->client->voir && ! $user->societe_id)
-			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
-		$sql .= $this->buildWhere();
-		$sql .= " GROUP BY dm";
-		$sql .= $this->db->order('dm', 'DESC');
-
-		$this->status=0;
-		$this->yearmonth=0;
-
-		$res_only_wined = $this->_getNbByMonth($year, $sql);
-
-		$res=array();
-
-		foreach($res_total as $key=>$total_row) {
-			//var_dump($total_row);
-			if (!empty($total_row[1])) {
-				$res[$key]=array($total_row[0],(100*$res_only_wined[$key][1])/$total_row[1]);
-			} else {
-				$res[$key]=array($total_row[0],0);
-			}
-
-		}
-		// var_dump($res);print '<br>';
-		return $res;
-	}*/
 }

From 9e629bdb0290561813a1ebe22d40828132301c6a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Jun 2017 20:01:25 +0200
Subject: [PATCH 069/438] Work on modulebuilder

---
 htdocs/core/class/interfaces.class.php            |  14 +++++++-------
 htdocs/core/lib/functions.lib.php                 |   1 +
 .../modulebuilder/template/img/object_mytest.png  | Bin 0 -> 360 bytes
 htdocs/theme/eldy/style.css.php                   |   2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 htdocs/modulebuilder/template/img/object_mytest.png

diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php
index cd4a56f4174..625b30e3ac2 100644
--- a/htdocs/core/class/interfaces.class.php
+++ b/htdocs/core/class/interfaces.class.php
@@ -76,14 +76,14 @@ class Interfaces
             global $db;
             $user = new User($db);
         }
-        
+
         $nbfile = $nbtotal = $nbok = $nbko = 0;
 
         $files = array();
         $modules = array();
         $orders = array();
 		$i=0;
-		
+
 		$dirtriggers=array_merge(array('/core/triggers'),$conf->modules_parts['triggers']);
         foreach($dirtriggers as $reldir)
         {
@@ -106,7 +106,7 @@ class Interfaces
 						$part3=$reg[3];
 
                         $nbfile++;
-                        
+
                         // Check if trigger file is disabled by name
                         if (preg_match('/NORUN$/i',$file)) continue;
                         // Check if trigger file is for a particular module
@@ -132,7 +132,7 @@ class Interfaces
                             dol_syslog(get_class($this)."::run_triggers action=".$action." ".$langs->trans("ErrorDuplicateTrigger", $newdir."/".$file, $fullpathfiles[$modName]), LOG_WARNING);
                             continue;
                         }
-                        
+
                         try {
                             //print 'Todo for '.$modName." : ".$newdir.'/'.$file."\n";
                             include_once $newdir.'/'.$file;
@@ -142,7 +142,7 @@ class Interfaces
                         {
                             dol_syslog('ko for '.$modName." ".$e->getMessage()."\n", LOG_ERR);
                         }
-                        
+
                         $modules[$i] = $modName;
                         $files[$i] = $file;
                         $fullpathfiles[$modName] = $newdir.'/'.$file;
@@ -155,7 +155,7 @@ class Interfaces
         }
 
         asort($orders);
-        
+
         // Loop on each trigger
         foreach ($orders as $key => $value)
         {
@@ -246,7 +246,7 @@ class Interfaces
         {
         	$dirtriggers=$forcedirtriggers;
         }
-        	
+
         foreach($dirtriggers as $reldir)
         {
             $dir=dol_buildpath($reldir,0);
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index ef03b0c00cc..3569cdd006d 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2556,6 +2556,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 			$picto = $regs[1];
 			$path = $regs[2];	// $path is $mymodule
 		}
+
 		// Clean parameters
 		if (! preg_match('/(\.png|\.gif)$/i',$picto)) $picto .= '.png';
 		// If alt path are defined, define url where img file is, according to physical path
diff --git a/htdocs/modulebuilder/template/img/object_mytest.png b/htdocs/modulebuilder/template/img/object_mytest.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a307bfc62f85df909a3cf024f27ee87d44be275
GIT binary patch
literal 360
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xamSQK*5Dp-y;YjHK@;M7UB8!3Q
zuY)k7lg8`{prB-lYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt)eIT^vI+
zChono-m4{0gyqBiz=Ju)w^;&N<{#X1a0!1><Y%Q{d~D5Uw;i2s5YZwkcu^%vjOU;9
z;kxeEpK=W=9!xuY=FUv(?UR0-KJ&M;m376cVx6Rpy(;rBA6R8|OzYm{5|xWL-acNe
zILqe75o^6;yQR|Ctg@T8v309Tyzut9rW>bC%GsW3bBL=<%|p84;9-@5SwA|2OIEL%
zb=QtBT0T9C&(LA{syqXqqW_DHn`b;(x5}@uA-g2{Ncy)Mhpp~Sy0eY()*3IP6|4C4
z(mDEHWvtPCEP7WZe7{4e?P9&>AE%^j|Mz!&9rL?{G_w^d>;^y&GkCiCxvX<aXaWE|
CJd*hU

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 1240f091cc0..3912a9b80ff 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2850,7 +2850,7 @@ span.dashboardlineko {
     padding: 1px 2px 1px 2px;
     border-radius: .25em;
 
-    background-color: #af4705;
+    background-color: #9f4705;
     padding: 0px 5px 0px 5px;
     top: -26px;
 }

From 5e298179103c2c76b680788353d71c3fad79b4b2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Jun 2017 20:17:08 +0200
Subject: [PATCH 070/438] Init of the onlinesign

---
 htdocs/public/onlinesign/newonlinesign.php | 640 +++++++++++++++++++++
 1 file changed, 640 insertions(+)
 create mode 100644 htdocs/public/onlinesign/newonlinesign.php

diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php
new file mode 100644
index 00000000000..73d9f41eab0
--- /dev/null
+++ b/htdocs/public/onlinesign/newonlinesign.php
@@ -0,0 +1,640 @@
+<?php
+/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2006-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2009-2012	Regis Houssin			<regis.houssin@capnetworks.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/>.
+ *
+ * For paypal test: https://developer.paypal.com/
+ * For paybox test: ???
+ */
+
+/**
+ *     	\file       htdocs/public/onlinesign/newsign.php
+ *		\ingroup    core
+ *		\brief      File to offer a way to make an online signature for a particular Dolibarr entity
+ */
+
+define("NOLOGIN",1);		// This means this output page does not require to be logged.
+define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+
+// For MultiCompany module.
+// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
+// TODO This should be useless. Because entity must be retreive from object ref and not from url.
+$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+if (is_numeric($entity)) define("DOLENTITY", $entity);
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+
+// Security check
+// No check on module enabled. Done later according to $validpaymentmethod
+
+$langs->load("main");
+$langs->load("other");
+$langs->load("dict");
+$langs->load("bills");
+$langs->load("companies");
+$langs->load("errors");
+$langs->load("paybox");     // File with generic data
+
+$action=GETPOST('action','alpha');
+
+// Input are:
+// type ('invoice','order','contractline'),
+// id (object id),
+// amount (required if id is empty),
+// tag (a free text, required if type is empty)
+// currency (iso code)
+
+$suffix=GETPOST("suffix",'alpha');
+$SOURCE=GETPOST("source",'alpha');
+$ref=$REF=GETPOST("ref",'alpha');
+
+if (! $action)
+{
+    if ($source && ! $ref)
+    {
+    	dol_print_error('',$langs->trans('ErrorBadParameters')." - ref");
+    	exit;
+    }
+}
+
+
+$paymentmethod='';
+$validpaymentmethod=array();
+
+
+
+
+// Define $urlwithroot
+//$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+//$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+$urlwithroot=DOL_MAIN_URL_ROOT;						// This is to use same domain name than current. For Paypal payment, we can use internal URL like localhost.
+
+
+// Complete urls for post treatment
+$SECUREKEY=GETPOST("securekey");	        // Secure key
+
+if (! empty($SOURCE))
+{
+    $urlok.='source='.urlencode($SOURCE).'&';
+    $urlko.='source='.urlencode($SOURCE).'&';
+}
+if (! empty($REF))
+{
+    $urlok.='ref='.urlencode($REF).'&';
+    $urlko.='ref='.urlencode($REF).'&';
+}
+if (! empty($SECUREKEY))
+{
+    $urlok.='securekey='.urlencode($SECUREKEY).'&';
+    $urlko.='securekey='.urlencode($SECUREKEY).'&';
+}
+if (! empty($entity))
+{
+	$urlok.='entity='.urlencode($entity).'&';
+	$urlko.='entity='.urlencode($entity).'&';
+}
+$urlok=preg_replace('/&$/','',$urlok);  // Remove last &
+$urlko=preg_replace('/&$/','',$urlko);  // Remove last &
+
+
+
+
+/*
+ * Actions
+ */
+
+
+if ($action == 'dosign')
+{
+    // TODO
+
+}
+
+
+/*
+ * View
+ */
+
+$head='';
+if (! empty($conf->global->MAIN_SIGN_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->MAIN_SIGN_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+
+$conf->dol_hide_topmenu=1;
+$conf->dol_hide_leftmenu=1;
+
+llxHeader($head, $langs->trans("OnlineSignature"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
+
+// Check link validity
+if (! empty($SOURCE) && in_array($ref, array('member_ref', 'contractline_ref', 'invoice_ref', 'order_ref', '')))
+{
+    $langs->load("errors");
+    dol_print_error_email('BADREFINONLINESIGNFORM', $langs->trans("ErrorBadLinkSourceSetButBadValueForRef", $SOURCE, $ref));
+    llxFooter();
+    $db->close();
+    exit;
+}
+
+print '<span id="dolpaymentspan"></span>'."\n";
+print '<div class="center">'."\n";
+print '<form id="dolpaymentform" class="center" name="paymentform" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
+print '<input type="hidden" name="action" value="dosign">'."\n";
+print '<input type="hidden" name="tag" value="'.GETPOST("tag",'alpha').'">'."\n";
+print '<input type="hidden" name="suffix" value="'.GETPOST("suffix",'alpha').'">'."\n";
+print '<input type="hidden" name="securekey" value="'.$SECUREKEY.'">'."\n";
+print '<input type="hidden" name="entity" value="'.$entity.'" />';
+print "\n";
+print '<!-- Form to sign -->'."\n";
+
+print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n";
+
+// Show logo (search order: logo defined by PAYBOX_LOGO_suffix, then PAYBOX_LOGO, then small company logo, large company logo, theme logo, common logo)
+$width=0;
+// Define logo and logosmall
+$logosmall=$mysoc->logo_small;
+$logo=$mysoc->logo;
+$paramlogo='ONLINE_SIGN_LOGO_'.$suffix;
+if (! empty($conf->global->$paramlogo)) $logosmall=$conf->global->$paramlogo;
+else if (! empty($conf->global->ONLINE_SIGN_LOGO)) $logosmall=$conf->global->ONLINE_SIGN_LOGO;
+//print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
+// Define urllogo
+$urllogo='';
+if (! empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$logosmall))
+{
+	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('thumbs/'.$logosmall);
+}
+elseif (! empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
+{
+	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode($logo);
+	$width=96;
+}
+// Output html code for logo
+if ($urllogo)
+{
+	print '<tr>';
+	print '<td align="center"><img id="dolpaymentlogo" title="'.$title.'" src="'.$urllogo.'"';
+	if ($width) print ' width="'.$width.'"';
+	print '></td>';
+	print '</tr>'."\n";
+}
+
+// Output introduction text
+$text='';
+if (! empty($conf->global->ONLINE_SIGN_NEWFORM_TEXT))
+{
+    $langs->load("members");
+    if (preg_match('/^\((.*)\)$/',$conf->global->ONLINE_SIGN_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
+    else $text.=$conf->global->ONLINE_SIGN_NEWFORM_TEXT."<br>\n";
+    $text='<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
+}
+if (empty($text))
+{
+    $text.='<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("WelcomeOnOnlineSignaturePage").'</strong><br></td></tr>'."\n";
+    $text.='<tr><td class="textpublicpayment"><br>'.$langs->trans("ThisScreenAllowsYouToSignDocFrom",$creditor).'<br><br></td></tr>'."\n";
+}
+print $text;
+
+// Output payment summary form
+print '<tr><td align="center">';
+print '<table with="100%" id="tablepublicpayment">';
+print '<tr class="liste_total"><td align="left" colspan="2">'.$langs->trans("ThisIsInformationOnDocumentToSign").' :</td></tr>'."\n";
+
+$found=false;
+$error=0;
+$var=false;
+
+// Free payment
+if (! GETPOST("source"))
+{
+	$found=true;
+	$tag=GETPOST("tag");
+	$fulltag=$tag;
+
+	// Creditor
+
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+    print '</td></tr>'."\n";
+
+
+
+    // We do not add fields shipToName, shipToStreet, shipToCity, shipToState, shipToCountryCode, shipToZip, shipToStreet2, phoneNum
+    // as they don't exists (buyer is unknown, tag is free).
+}
+
+
+// Payment on customer order
+if (GETPOST("source") == 'order')
+{
+	$found=true;
+	$langs->load("orders");
+
+	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+
+	$order=new Commande($db);
+	$result=$order->fetch('',$ref);
+	if ($result < 0)
+	{
+		$mesg=$order->error;
+		$error++;
+	}
+	else
+	{
+		$result=$order->fetch_thirdparty($order->socid);
+	}
+
+	// Creditor
+
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+    print '</td></tr>'."\n";
+
+	// Debitor
+
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$order->thirdparty->name.'</b>';
+
+	// Object
+
+	$text='<b>'.$langs->trans("PaymentOrderRef",$order->ref).'</b>';
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
+	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
+	print '<input type="hidden" name="ref" value="'.$order->ref.'">';
+	print '</td></tr>'."\n";
+
+
+}
+
+
+// Payment on customer invoice
+if (GETPOST("source") == 'invoice')
+{
+	$found=true;
+	$langs->load("bills");
+
+	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+
+	$invoice=new Facture($db);
+	$result=$invoice->fetch('',$ref);
+	if ($result < 0)
+	{
+		$mesg=$invoice->error;
+		$error++;
+	}
+	else
+	{
+		$result=$invoice->fetch_thirdparty($invoice->socid);
+	}
+
+    if ($action != 'dosign') // Do not change amount if we just click on first dosign
+    {
+    	$amount=price2num($invoice->total_ttc - $invoice->getSommePaiement());
+        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+        $amount=price2num($amount);
+    }
+
+	// Creditor
+
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+    print '</td></tr>'."\n";
+
+	// Debitor
+
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$invoice->thirdparty->name.'</b>';
+
+	// Object
+
+	$text='<b>'.$langs->trans("PaymentInvoiceRef",$invoice->ref).'</b>';
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
+	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
+	print '<input type="hidden" name="ref" value="'.$invoice->ref.'">';
+	print '</td></tr>'."\n";
+
+}
+
+// Payment on contract line
+if (GETPOST("source") == 'contractline')
+{
+	$found=true;
+	$langs->load("contracts");
+
+	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+
+	$contractline=new ContratLigne($db);
+	$result=$contractline->fetch('',$ref);
+	if ($result < 0)
+	{
+		$mesg=$contractline->error;
+		$error++;
+	}
+	else
+	{
+		if ($contractline->fk_contrat > 0)
+		{
+			$contract=new Contrat($db);
+			$result=$contract->fetch($contractline->fk_contrat);
+			if ($result > 0)
+			{
+				$result=$contract->fetch_thirdparty($contract->socid);
+			}
+			else
+			{
+				$mesg=$contract->error;
+				$error++;
+			}
+		}
+		else
+		{
+			$mesg='ErrorRecordNotFound';
+			$error++;
+		}
+	}
+
+    if ($action != 'dosign') // Do not change amount if we just click on first dosign
+    {
+    	$amount=$contractline->total_ttc;
+    	if ($contractline->fk_product)
+    	{
+    		$product=new Product($db);
+    		$result=$product->fetch($contractline->fk_product);
+
+    		// We define price for product (TODO Put this in a method in product class)
+    		if (! empty($conf->global->PRODUIT_MULTIPRICES))
+    		{
+    			$pu_ht = $product->multiprices[$contract->thirdparty->price_level];
+    			$pu_ttc = $product->multiprices_ttc[$contract->thirdparty->price_level];
+    			$price_base_type = $product->multiprices_base_type[$contract->thirdparty->price_level];
+    		}
+    		else
+    		{
+    			$pu_ht = $product->price;
+    			$pu_ttc = $product->price_ttc;
+    			$price_base_type = $product->price_base_type;
+    		}
+
+    		$amount=$pu_ttc;
+    		if (empty($amount))
+    		{
+    			dol_print_error('','ErrorNoPriceDefinedForThisProduct');
+    			exit;
+    		}
+    	}
+        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+        $amount=price2num($amount);
+    }
+
+	$qty=1;
+	if (GETPOST('qty')) $qty=GETPOST('qty');
+
+	// Creditor
+
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+	print '</td></tr>'."\n";
+
+	// Debitor
+
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$contract->thirdparty->name.'</b>';
+
+	// Object
+
+	$text='<b>'.$langs->trans("PaymentRenewContractId",$contract->ref,$contractline->ref).'</b>';
+	if ($contractline->fk_product)
+	{
+		$text.='<br>'.$product->ref.($product->label?' - '.$product->label:'');
+	}
+	if ($contractline->description) $text.='<br>'.dol_htmlentitiesbr($contractline->description);
+	//if ($contractline->date_fin_validite) {
+	//	$text.='<br>'.$langs->trans("DateEndPlanned").': ';
+	//	$text.=dol_print_date($contractline->date_fin_validite);
+	//}
+	if ($contractline->date_fin_validite)
+	{
+		$text.='<br>'.$langs->trans("ExpiredSince").': '.dol_print_date($contractline->date_fin_validite);
+	}
+
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
+	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
+	print '<input type="hidden" name="ref" value="'.$contractline->ref.'">';
+	print '</td></tr>'."\n";
+
+	// Quantity
+
+	$label=$langs->trans("Quantity");
+	$qty=1;
+	$duration='';
+	if ($contractline->fk_product)
+	{
+		if ($product->isService() && $product->duration_value > 0)
+		{
+			$label=$langs->trans("Duration");
+
+			// TODO Put this in a global method
+			if ($product->duration_value > 1)
+			{
+				$dur=array("h"=>$langs->trans("Hours"),"d"=>$langs->trans("DurationDays"),"w"=>$langs->trans("DurationWeeks"),"m"=>$langs->trans("DurationMonths"),"y"=>$langs->trans("DurationYears"));
+			}
+			else
+			{
+				$dur=array("h"=>$langs->trans("Hour"),"d"=>$langs->trans("DurationDay"),"w"=>$langs->trans("DurationWeek"),"m"=>$langs->trans("DurationMonth"),"y"=>$langs->trans("DurationYear"));
+			}
+			$duration=$product->duration_value.' '.$dur[$product->duration_unit];
+		}
+	}
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$label.'</td>';
+	print '<td class="CTableRow'.($var?'1':'2').'"><b>'.($duration?$duration:$qty).'</b>';
+	print '<input type="hidden" name="newqty" value="'.dol_escape_htmltag($qty).'">';
+	print '</b></td></tr>'."\n";
+
+	// Amount
+
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
+	print '</td><td class="CTableRow'.($var?'1':'2').'">';
+	if (empty($amount) || ! is_numeric($amount))
+	{
+        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
+	    print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
+	}
+	else {
+		print '<b>'.price($amount).'</b>';
+        print '<input type="hidden" name="amount" value="'.$amount.'">';
+		print '<input type="hidden" name="newamount" value="'.$amount.'">';
+	}
+	// Currency
+	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
+	print '<input type="hidden" name="currency" value="'.$currency.'">';
+	print '</td></tr>'."\n";
+
+}
+
+// Payment on member subscription
+if (GETPOST("source") == 'membersubscription')
+{
+	$found=true;
+	$langs->load("members");
+
+	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
+
+	$member=new Adherent($db);
+	$result=$member->fetch('',$ref);
+	if ($result < 0)
+	{
+		$mesg=$member->error;
+		$error++;
+	}
+	else
+	{
+		$subscription=new Subscription($db);
+	}
+
+    if ($action != 'dosign') // Do not change amount if we just click on first dosign
+    {
+    	$amount=$subscription->total_ttc;
+        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+        $amount=price2num($amount);
+    }
+
+	$fulltag='MEM='.$member->id.'.DAT='.dol_print_date(dol_now(),'%Y%m%d%H%M');
+	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
+	$fulltag=dol_string_unaccent($fulltag);
+
+	// Creditor
+
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+    print '</td></tr>'."\n";
+
+	// Debitor
+
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Member");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>';
+	if ($member->morphy == 'mor' && ! empty($member->societe)) print $member->societe;
+	else print $member->getFullName($langs);
+	print '</b>';
+
+	// Object
+
+	$text='<b>'.$langs->trans("PaymentSubscription").'</b>';
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
+	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
+	print '<input type="hidden" name="ref" value="'.$member->ref.'">';
+	print '</td></tr>'."\n";
+
+	if ($member->last_subscription_date || $member->last_subscription_amount)
+	{
+		// Last subscription date
+
+		print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionDate");
+		print '</td><td class="CTableRow'.($var?'1':'2').'">'.dol_print_date($member->last_subscription_date,'day');
+		print '</td></tr>'."\n";
+
+		// Last subscription amount
+
+		print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionAmount");
+		print '</td><td class="CTableRow'.($var?'1':'2').'">'.price($member->last_subscription_amount);
+		print '</td></tr>'."\n";
+
+		if (empty($amount) && ! GETPOST('newamount')) $_GET['newamount']=$member->last_subscription_amount;
+	}
+
+	// Amount
+
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+	if (empty($amount))
+	{
+		print ' ('.$langs->trans("ToComplete");
+		if (! empty($conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO)) print ' - <a href="'.$conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO.'" rel="external" target="_blank">'.$langs->trans("SeeHere").'</a>';
+		print ')';
+	}
+	print '</td><td class="CTableRow'.($var?'1':'2').'">';
+	if (empty($amount) || ! is_numeric($amount))
+	{
+	    $valtoshow=GETPOST("newamount",'int');
+	    if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
+        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
+	    print '<input class="flat" size="8" type="text" name="newamount" value="'.$valtoshow.'">';
+	}
+	else {
+	    $valtoshow=$amount;
+	    if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
+	    print '<b>'.price($valtoshow).'</b>';
+        print '<input type="hidden" name="amount" value="'.$valtoshow.'">';
+		print '<input type="hidden" name="newamount" value="'.$valtoshow.'">';
+	}
+	// Currency
+	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
+	print '<input type="hidden" name="currency" value="'.$currency.'">';
+	print '</td></tr>'."\n";
+
+}
+
+
+
+
+if (! $found && ! $mesg) $mesg=$langs->trans("ErrorBadParameters");
+
+if ($mesg) print '<tr><td align="center" colspan="2"><br><div class="warning">'.$mesg.'</div></td></tr>'."\n";
+
+print '</table>'."\n";
+print "\n";
+
+if ($action != 'dosign')
+{
+    if ($found && ! $error)	// We are in a management option and no error
+    {
+
+
+    }
+    else
+    {
+    	dol_print_error_email('ERRORNEWONLINESIGNPAYPAL');
+    }
+}
+else
+{
+    // Print
+}
+
+print '</td></tr>'."\n";
+
+print '</table>'."\n";
+print '</form>'."\n";
+print '</div>'."\n";
+print '<br>';
+
+
+htmlPrintOnlinePaymentFooter($mysoc,$langs);
+
+llxFooter('', 'public');
+
+$db->close();

From 70a188c0421045c87a07d6df39f15e5fc9727c1b Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Fri, 2 Jun 2017 21:45:02 +0200
Subject: [PATCH 071/438] Fix missing column entity on llx_accounting_journal
 after init demo with the bash

---
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 11a86724cf0..4680d451e39 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -159,6 +159,9 @@ CREATE TABLE llx_product_attribute_combination
 
 ALTER TABLE llx_bank_account drop foreign key bank_fk_accountancy_journal;
 
+-- Fix missing entity column after init demo
+ALTER TABLE llx_accounting_journal ADD COLUMN entity integer DEFAULT 1;
+
 -- Add journal entries
 INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (1,'VT', 'Sale journal', 2, 1);
 INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (2,'AC', 'Purchase journal', 3, 1);
@@ -355,4 +358,4 @@ delete from llx_categorie_member where fk_categorie not in (select rowid from ll
 delete from llx_categorie_contact where fk_categorie not in (select rowid from llx_categorie where type = 4);
 delete from llx_categorie_project where fk_categorie not in (select rowid from llx_categorie where type = 5);
 
-ALTER TABLE llx_inventory ADD COLUMN ref varchar(48);
\ No newline at end of file
+ALTER TABLE llx_inventory ADD COLUMN ref varchar(48);

From 66420d0e80d8fb3e43ffa4c96373154d2f7c779c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Jun 2017 23:02:48 +0200
Subject: [PATCH 072/438] Restore lost file and better generation of modules

---
 htdocs/core/actions_setmoduleoptions.inc.php  |  86 +++++++++++++++
 htdocs/core/class/hookmanager.class.php       |  17 +--
 htdocs/core/class/html.form.class.php         |  19 +++-
 htdocs/core/modules/DolibarrModules.class.php | 102 ++++++++++--------
 .../template/langs/en_US/mymodule.lang        |  10 +-
 .../template/langs/fr_FR/mymodule.lang        |  10 +-
 6 files changed, 173 insertions(+), 71 deletions(-)
 create mode 100644 htdocs/core/actions_setmoduleoptions.inc.php

diff --git a/htdocs/core/actions_setmoduleoptions.inc.php b/htdocs/core/actions_setmoduleoptions.inc.php
new file mode 100644
index 00000000000..03b33b19eb1
--- /dev/null
+++ b/htdocs/core/actions_setmoduleoptions.inc.php
@@ -0,0 +1,86 @@
+<?php
+/* Copyright (C) 2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ *	\file			htdocs/core/actions_setnotes.inc.php
+ *  \brief			Code for actions on setting notes of object page
+ */
+
+
+// $action must be defined
+// $_FILES may be defined
+// $nomessageinsetmoduleoptions can be set to 1
+
+// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
+if ($action == 'setModuleOptions')
+{
+    $db->begin();
+
+    // Process common param fields
+    foreach($_POST as $key => $val)
+    {
+        if (preg_match('/^param(\d*)$/', $key, $reg))    // Works for POST['param'], POST['param1'], POST['param2'], ...
+        {
+            $param=GETPOST("param".$reg[1],'alpha');
+            $value=GETPOST("value".$reg[1],'alpha');
+            if ($param)
+            {
+                $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
+                if (! $res > 0) $error++;
+            }
+        }
+    }
+
+    // Process upload fields
+    if (GETPOST('upload','alpha') && GETPOST('keyforuploaddir','aZ09'))
+    {
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+        $keyforuploaddir=GETPOST('keyforuploaddir','aZ09');
+        $listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->$keyforuploaddir)));
+        foreach($listofdir as $key=>$tmpdir)
+        {
+            $tmpdir=trim($tmpdir);
+            $tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
+            if (! $tmpdir) {
+                unset($listofdir[$key]); continue;
+            }
+            if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
+            else
+            {
+                $upload_dir=$tmpdir;
+            }
+        }
+        if ($upload_dir)
+        {
+            $result = dol_add_file_process($upload_dir, 0, 1, 'uploadfile', '');
+            if ($result <= 0) $error++;
+        }
+    }
+
+    if (! $error)
+    {
+        $db->commit();
+        if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+    }
+    else
+    {
+        $db->rollback();
+        if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
+    }
+}
+
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 590f8060296..1e20ee6ce31 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -133,10 +133,12 @@ class HookManager
 		if (in_array(
 			$method,
 			array(
-				'addMoreActionsButtons',
+                'addCalendarChoice',
+			    'addMoreActionsButtons',
+			    'addMoreMassActions',
 			    'addSearchEntry',
 				'addStatisticLine',
-				'deleteFile',
+			    'deleteFile',
 				'doActions',
 				'formCreateThirdpartyOptions',
 				'formObjectOptions',
@@ -169,7 +171,6 @@ class HookManager
 				'printSearchForm',
 				'printTabsHead',
 				'formatEvent',
-                'addCalendarChoice',
                 'printObjectLine',
                 'printObjectSubLine',
 				'createDictionaryFieldList',
@@ -181,14 +182,16 @@ class HookManager
 
         if ($method == 'insertExtraFields')
         {
-        	$hooktype='returnvalue';	// deprecated. TODO Remove all code with "executeHooks('insertExtraFields'" as soon as there is a trigger available.
+        	$hooktype='returnvalue';	// @deprecated. TODO Remove all code with "executeHooks('insertExtraFields'" as soon as there is a trigger available.
         	dol_syslog("Warning: The hook 'insertExtraFields' is deprecated and must not be used. Use instead trigger on CRUD event (ask it to dev team if not implemented)", LOG_WARNING);
         }
 
+        // Init return properties
+        $this->resPrint=''; $this->resArray=array();
+
         // Loop on each hook to qualify modules that have declared context
         $modulealreadyexecuted=array();
         $resaction=0; $error=0; $result='';
-		$this->resPrint=''; $this->resArray=array();
         foreach($this->hooks as $context => $modules)    // $this->hooks is an array with context as key and value is an array of modules that handle this context
         {
             if (! empty($modules))
@@ -202,9 +205,9 @@ class HookManager
 
                     // test to avoid running twice a hook, when a module implements several active contexts
                     if (in_array($module,$modulealreadyexecuted)) continue;
-                    
+
                     dol_syslog(get_class($this).'::executeHooks a qualified hook was found for method='.$method.' module='.$module." action=".$action." context=".$context);
-                    
+
                     $modulealreadyexecuted[$module]=$module; // Use the $currentcontext in method to avoid running twice
 
                     // Clean class (an error may have been set from a previous call of another method for same module/hook)
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 34693cba67a..997bc94cc42 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -545,11 +545,20 @@ class Form
     	$disabled=0;
     	$ret='<div class="centpercent center">';
     	$ret.='<select data-role="none" class="flat'.(empty($conf->use_javascript_ajax)?'':' hideobject').' massaction massactionselect" name="massaction"'.($disabled?' disabled="disabled"':'').'>';
-    	$ret.='<option value="0"'.($disabled?' disabled="disabled"':'').'>-- '.$langs->trans("SelectAction").' --</option>';
-    	foreach($arrayofaction as $code => $label)
-    	{
-    		$ret.='<option value="'.$code.'"'.($disabled?' disabled="disabled"':'').'>'.$label.'</option>';
-    	}
+
+        // Complete list with data from external modules. THe module can use $_SERVER['PHP_SELF'] to know on which page we are, or use the $parameters['context'] completed by executeHooks.
+    	$parameters=array();
+    	$reshook=$hookmanager->executeHooks('addMoreMassActions',$parameters);    // Note that $action and $object may have been modified by hook
+        if (empty($reshook))
+        {
+        	$ret.='<option value="0"'.($disabled?' disabled="disabled"':'').'>-- '.$langs->trans("SelectAction").' --</option>';
+        	foreach($arrayofaction as $code => $label)
+        	{
+        		$ret.='<option value="'.$code.'"'.($disabled?' disabled="disabled"':'').'>'.$label.'</option>';
+        	}
+        }
+        $ret.=$hookmanager->resPrint;
+
     	$ret.='</select>';
     	// Warning: if you set submit button to disabled, post using 'Enter' will no more work.
     	$ret.='<input type="submit" data-role="none" name="confirmmassaction" class="button'.(empty($conf->use_javascript_ajax)?'':' hideobject').' massaction massactionconfirmed" value="'.dol_escape_htmltag($langs->trans("Confirm")).'">';
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 71de341a769..a79f17b1fdc 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -50,13 +50,13 @@ class DolibarrModules           // Can not be abstract, because we need to insta
      * @since 4.0.0
      */
     public $editor_name;
-    
+
     /**
      * @var string URL of module at publisher site
      * @since 4.0.0
      */
     public $editor_url;
-    
+
     /**
      * @var string Family
      * @see familyinfo
@@ -80,13 +80,13 @@ class DolibarrModules           // Can not be abstract, because we need to insta
      *
      */
     public $familyinfo;
-    
+
     /**
      * @var int Module position
      * @since 3.9.0
      */
     public $module_position=500;
-    
+
     /**
      * @var string Module name
      *
@@ -214,7 +214,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
      * HTML content supported.
      */
     public $descriptionlong;
-    
+
     /**
      * @var string Module export code
      */
@@ -249,7 +249,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
      * @var bool Module is enabled globally (Multicompany support)
      */
     public $core_enabled;
-    
+
     /**
      * @var string Relative path to module style sheet
      * @deprecated
@@ -286,7 +286,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 	 */
 	public $config_page_url;
 
-	
+
 	/**
 	 * @var string[] List of module class names that must be enabled if this module is enabled.
 	 *
@@ -309,22 +309,22 @@ class DolibarrModules           // Can not be abstract, because we need to insta
      * @var string[] Module language files
      */
     public $langfiles;
-    
+
     /**
      * @var string[] Array of warnings to show when we activate the module
-     * 
+     *
      * array('always'='text') or array('FR'='text')
      */
     public $warnings_activation;
-    
+
     /**
      * @var string[] Array of warnings to show when we activate an external module
-     * 
+     *
      * array('always'='text') or array('FR'='text')
      */
     public $warnings_activation_ext;
-    
-	
+
+
 	/**
 	 * @var array() Minimum version of PHP required by module.
 	 * e.g.: PHP ≥ 5.3 = array(5, 3)
@@ -342,7 +342,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 	 */
 	public $hidden = false;
 
-	
+
 	/**
 	 * Constructor. Define names, constants, directories, boxes, permissions
 	 *
@@ -538,8 +538,8 @@ class DolibarrModules           // Can not be abstract, because we need to insta
             return $langs->trans("Module".$this->numero."Name");
         }
         else
-       {
-            // If module name translation using it's unique id does not exists, we take use its name to find translation
+        {
+            // If module name translation using it's unique id does not exists, we try to use its name to find translation
             if (is_array($this->langfiles))
             {
                 foreach($this->langfiles as $val)
@@ -547,6 +547,14 @@ class DolibarrModules           // Can not be abstract, because we need to insta
                     if ($val) $langs->load($val);
                 }
             }
+
+            if ($langs->trans("Module".$this->name."Name") != ("Module".$this->name."Name"))
+            {
+                // If module name translation exists
+                return $langs->trans("Module".$this->name."Name");
+            }
+
+            // Last change with simple product label
             return $langs->trans($this->name);
         }
     }
@@ -591,13 +599,13 @@ class DolibarrModules           // Can not be abstract, because we need to insta
     {
         global $langs;
         $langs->load("admin");
-        
+
         include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
         include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 
         $filefound= false;
-        
-        // Define path to file README.md. 
+
+        // Define path to file README.md.
         // First check README-la_LA.md then README.md
         $pathoffile = dol_buildpath(strtolower($this->name).'/README-'.$langs->defaultlang.'.md', 0);
         if (dol_is_file($pathoffile))
@@ -612,11 +620,11 @@ class DolibarrModules           // Can not be abstract, because we need to insta
                 $filefound = true;
             }
         }
-        
+
         if ($filefound)     // Mostly for external modules
         {
             $content = file_get_contents($pathoffile);
-    
+
             if ((float) DOL_VERSION >= 6.0)
             {
                 @include_once DOL_DOCUMENT_ROOT.'/core/lib/parsemd.lib.php';
@@ -638,14 +646,14 @@ class DolibarrModules           // Can not be abstract, because we need to insta
                         if ($val) $langs->load($val);
                     }
                 }
-            
+
                 $content = $langs->trans($this->descriptionlong);
             }
         }
-    
+
         return $content;
     }
-    
+
     /**
      * Gives the publisher name
      *
@@ -655,7 +663,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
     {
         return $this->editor_name;
     }
-    
+
     /**
      * Gives the publisher url
      *
@@ -665,7 +673,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
     {
         return $this->editor_url;
     }
-    
+
     /**
      * Gives module version (translated if param $translated is on)
      * For 'experimental' modules, gives 'experimental' translation
@@ -768,7 +776,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
         }
     }
 
-    
+
     /**
      * Gives the last date of activation
      *
@@ -777,11 +785,11 @@ class DolibarrModules           // Can not be abstract, because we need to insta
     function getLastActivationDate()
     {
         global $conf;
-        
+
         $sql = "SELECT tms FROM ".MAIN_DB_PREFIX."const";
         $sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
         $sql.= " AND entity IN (0, ".$conf->entity.")";
-        
+
         dol_syslog(get_class($this)."::getLastActiveDate", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if (! $resql) $err++;
@@ -790,11 +798,11 @@ class DolibarrModules           // Can not be abstract, because we need to insta
             $obj=$this->db->fetch_object($resql);
             if ($obj) return $this->db->jdate($obj->tms);
         }
-        
+
         return '';
     }
-    
-    
+
+
     /**
      * Gives the last author of activation
      *
@@ -803,11 +811,11 @@ class DolibarrModules           // Can not be abstract, because we need to insta
     function getLastActivationInfo()
     {
         global $conf;
-        
+
         $sql = "SELECT tms, note FROM ".MAIN_DB_PREFIX."const";
         $sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
         $sql.= " AND entity IN (0, ".$conf->entity.")";
-        
+
         dol_syslog(get_class($this)."::getLastActiveDate", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if (! $resql) $err++;
@@ -821,11 +829,11 @@ class DolibarrModules           // Can not be abstract, because we need to insta
             }
             if ($obj) return array('authorid'=>$tmp['authorid'], 'ip'=>$tmp['ip'], 'lastactivationdate'=>$this->db->jdate($obj->tms));
         }
-        
+
         return array();
     }
-    
-    
+
+
     /**
      * Insert constants for module activation
      *
@@ -929,7 +937,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
                         $files[] = $file;
                     }
                     sort($files);
-                    foreach ($files as $file) 
+                    foreach ($files as $file)
                     {
                         if (preg_match('/\.sql$/i',$file) && ! preg_match('/\.key\.sql$/i',$file) && substr($file,0,4) == 'llx_' && substr($file,0,4) != 'data')
                         {
@@ -947,7 +955,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
                         $files[] = $file;
                     }
                     sort($files);
-                    foreach ($files as $file) 
+                    foreach ($files as $file)
                     {
                         if (preg_match('/\.key\.sql$/i',$file) && substr($file,0,4) == 'llx_' && substr($file,0,4) != 'data')
                         {
@@ -965,7 +973,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
                         $files[] = $file;
                     }
                     sort($files);
-                    foreach ($files as $file) 
+                    foreach ($files as $file)
                     {
                         if (preg_match('/\.sql$/i',$file) && ! preg_match('/\.key\.sql$/i',$file) && substr($file,0,4) == 'data')
                         {
@@ -983,7 +991,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
                         $files[] = $file;
                     }
                     sort($files);
-                    foreach ($files as $file) 
+                    foreach ($files as $file)
                     {
                         if (preg_match('/\.sql$/i',$file) && ! preg_match('/\.key\.sql$/i',$file) && substr($file,0,6) == 'update')
                         {
@@ -1123,19 +1131,19 @@ class DolibarrModules           // Can not be abstract, because we need to insta
                 //$titre = $this->boxes[$key][0];
                 $file  = $this->boxes[$key]['file'];
                 //$note  = $this->boxes[$key][2];
-                
+
                 // TODO If the box is also included by another module and the other module is still on, we should not remove it.
                 // For the moment, we manage this with hard coded exception
                 //print "Remove box ".$file.'<br>';
                 if ($file == 'box_graph_product_distribution.php')
                 {
-                    if (! empty($conf->produit->enabled) || ! empty($conf->service->enabled)) 
+                    if (! empty($conf->produit->enabled) || ! empty($conf->service->enabled))
                     {
                         dol_syslog("We discard disabling of module ".$file." because another module still active require it.");
                         continue;
                     }
                 }
-                
+
                 if (empty($file)) $file  = isset($this->boxes[$key][1])?$this->boxes[$key][1]:'';	// For backward compatibility
 
                 if ($this->db->type == 'sqlite3') {
@@ -1210,7 +1218,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
                 $status = isset($this->cronjobs[$key]['status'])?$this->cronjobs[$key]['status']:'';
                 $priority = isset($this->cronjobs[$key]['priority'])?$this->cronjobs[$key]['priority']:'';
                 $test = isset($this->cronjobs[$key]['test'])?$this->cronjobs[$key]['test']:'';                              // Line must be visible
-                
+
                 // Search if boxes def already present
                 $sql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."cronjob";
                 $sql.= " WHERE module_name = '".$this->db->escape($this->rights_class)."'";
@@ -1645,7 +1653,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 
     /**
      * Removes access rights
-     * 
+     *
      * @return  int                     Error count (0 if OK)
      */
     function delete_permissions()
@@ -1678,7 +1686,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
         global $user;
 
         if (! is_array($this->menu) || empty($this->menu)) return 0;
-        
+
         require_once DOL_DOCUMENT_ROOT . '/core/class/menubase.class.php';
 
         $err=0;
diff --git a/htdocs/modulebuilder/template/langs/en_US/mymodule.lang b/htdocs/modulebuilder/template/langs/en_US/mymodule.lang
index 53c6205386c..c33f2453fc4 100644
--- a/htdocs/modulebuilder/template/langs/en_US/mymodule.lang
+++ b/htdocs/modulebuilder/template/langs/en_US/mymodule.lang
@@ -18,12 +18,10 @@
 # Generic
 #
 
-# Module label 'ModuleXXXName'
-# (where XXX is value of numeric property 'numero' of module)
-Module500000Name = My module
-# Module description 'ModuleXXXDesc'
-# (where XXX is value of numeric property 'numero' of module)
-Module500000Desc = My module description
+# Module label 'ModuleMyModuleName'
+ModuleMyModuleName = My module
+# Module description 'ModuleMyModuleDesc'
+ModuleMyModuleDesc = My module description
 
 #
 # Admin page
diff --git a/htdocs/modulebuilder/template/langs/fr_FR/mymodule.lang b/htdocs/modulebuilder/template/langs/fr_FR/mymodule.lang
index d15d37f0ebf..06e7ba33885 100644
--- a/htdocs/modulebuilder/template/langs/fr_FR/mymodule.lang
+++ b/htdocs/modulebuilder/template/langs/fr_FR/mymodule.lang
@@ -18,12 +18,10 @@
 # Générique
 #
 
-# Module label 'ModuleXXXName'
-# (where XXX is value of numeric property 'numero' of module)
-Module500000Name = Mon module
-# Module description 'ModuleXXXDesc'
-# (where XXX is value of numeric property 'numero' of module)
-Module500000Desc = Description de mon module
+# Module label 'ModuleMyModuleName'
+ModuleMyModuleName = Mon module
+# Module description 'ModuleMyModuleDesc'
+ModuleMyModuleDesc = Description de mon module
 
 #
 # Page d'administration

From 111087dfdc5b32330ab6b3d45fe1b5ca2586abf7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Jun 2017 23:41:18 +0200
Subject: [PATCH 073/438] Work on module template

---
 htdocs/core/actions_massactions.inc.php       | 49 +++++-----
 htdocs/core/class/hookmanager.class.php       |  1 +
 htdocs/core/class/html.form.class.php         |  2 +-
 .../template/class/actions_mymodule.class.php | 89 +++++++++++++++++--
 4 files changed, 113 insertions(+), 28 deletions(-)

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 92d1011b923..fde828fd6d4 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -24,20 +24,22 @@
 
 // $massaction must be defined
 // $objectclass and $$objectlabel must be defined
-// $uploaddir (example $conf->projet->dir_output . "/";)
+// $parameters, $object, $action must be defined for the hook.
+
+// $uploaddir may be defined (example to $conf->projet->dir_output."/";)
 // $toselect may be defined
 
 
 // Protection
-if (empty($objectclass) || empty($uploaddir)) 
+if (empty($objectclass) || empty($uploaddir))
 {
     dol_print_error(null, 'include of actions_massactions.inc.php is done but var $massaction or $objectclass or $uploaddir was not defined');
     exit;
 }
 
 
-// Mass actions. Controls on number of lines checked
-$maxformassaction=1000;
+// Mass actions. Controls on number of lines checked.
+$maxformassaction=(empty($conf->global->MAIN_LIMIT_FOR_MASS_ACTIONS)?1000:$conf->global->MAIN_LIMIT_FOR_MASS_ACTIONS);
 if (! empty($massaction) && count($toselect) < 1)
 {
     $error++;
@@ -87,7 +89,7 @@ if (! $error && $massaction == 'confirm_presend')
             }
         }
         //var_dump($listofobjectthirdparties);exit;
-        	
+
         foreach ($listofobjectthirdparties as $thirdpartyid)
         {
             $result = $thirdparty->fetch($thirdpartyid);
@@ -144,7 +146,7 @@ if (! $error && $massaction == 'confirm_presend')
             {
                 //var_dump($object);
                 //var_dump($thirdpartyid.' - '.$objectid.' - '.$object->statut);
-                	
+
                 if ($objectclass == 'Facture' && $object->statut != Facture::STATUS_VALIDATED)
                 {
                     $nbignored++;
@@ -157,7 +159,7 @@ if (! $error && $massaction == 'confirm_presend')
                     $resaction.='<div class="error">'.$langs->trans('ErrorOnlyOrderNotDraftCanBeSentInMassAction',$object->ref).'</div><br>';
                     continue;
                 }
-                
+
                 // Read document
                 // TODO Use future field $object->fullpathdoc to know where is stored default file
                 // TODO If not defined, use $object->modelpdf (or defaut invoice config) to know what is template to use to regenerate doc.
@@ -202,7 +204,7 @@ if (! $error && $massaction == 'confirm_presend')
                     dol_syslog('Failed to read file: '.$file, LOG_WARNING);
                     continue;
                 }
-                	
+
                 //var_dump($listofqualifiedref);
             }
 
@@ -252,9 +254,9 @@ if (! $error && $massaction == 'confirm_presend')
                 $filepath = $attachedfiles['paths'];
                 $filename = $attachedfiles['names'];
                 $mimetype = $attachedfiles['mimes'];
-                	
+
                 //var_dump($filepath);
-                	
+
                 // Send mail
                 require_once(DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php');
                 $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,$sendtobcc,$deliveryreceipt,-1);
@@ -280,7 +282,7 @@ if (! $error && $massaction == 'confirm_presend')
                             if ($objectclass == 'Supplier_Proposal') $actiontypecode='AC_SUP_PRO';
                             if ($objectclass == 'CommandeFournisseur') $actiontypecode='AC_SUP_ORD';
                             if ($objectclass == 'FactureFournisseur') $actiontypecode='AC_SUP_INV';*/
-                            
+
                             $actionmsg=$langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
                             if ($message)
                             {
@@ -290,7 +292,7 @@ if (! $error && $massaction == 'confirm_presend')
                                 $actionmsg = dol_concatdesc($actionmsg, $message);
                             }
                             $actionmsg2='';
-                            
+
                             // Initialisation donnees
                             $object->sendtoid		= 0;
                             $object->actionmsg		= $actionmsg;  // Long text
@@ -335,7 +337,7 @@ if (! $error && $massaction == 'confirm_presend')
         $resaction.=$langs->trans("NbSelected").': '.count($toselect)."\n<br>";
         $resaction.=$langs->trans("NbIgnored").': '.($nbignored?$nbignored:0)."\n<br>";
         $resaction.=$langs->trans("NbSent").': '.($nbsent?$nbsent:0)."\n<br>";
-        	
+
         if ($nbsent)
         {
             $action='';	// Do not show form post if there was at least one successfull sent
@@ -359,7 +361,7 @@ if (! $error && $massaction == "builddoc" && $permtoread && ! GETPOST('button_se
     require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-     
+
     $objecttmp=new $objectclass($db);
     $listofobjectid=array();
     $listofobjectthirdparties=array();
@@ -425,21 +427,21 @@ if (! $error && $massaction == "builddoc" && $permtoread && ! GETPOST('button_se
 
     	if (count($files)>0)
     	{
-    	
+
     		$now=dol_now();
     		$file=$diroutputmassaction.'/'.$filename.'_'.dol_print_date($now,'dayhourlog').'.pdf';
-    		
+
     		$input_files = '';
     		foreach($files as $f) {
     			$input_files.=' '.escapeshellarg($f);
     		}
-    		
+
     		$cmd = 'pdftk '.$input_files.' cat output '.escapeshellarg($file);
     		exec($cmd);
-    		
+
     		if (! empty($conf->global->MAIN_UMASK))
     			@chmod($file, octdec($conf->global->MAIN_UMASK));
-    			
+
     			$langs->load("exports");
     			setEventMessages($langs->trans('FileSuccessfullyBuilt',$filename.'_'.dol_print_date($now,'dayhourlog')), null, 'mesgs');
     	}
@@ -447,7 +449,7 @@ if (! $error && $massaction == "builddoc" && $permtoread && ! GETPOST('button_se
     	{
     		setEventMessages($langs->trans('NoPDFAvailableForDocGenAmongChecked'), null, 'errors');
     	}
-    	
+
     }
     else {
 	    // Create empty PDF
@@ -481,7 +483,7 @@ if (! $error && $massaction == "builddoc" && $permtoread && ! GETPOST('button_se
 	    // Defined name of merged file
 	    $filename=strtolower(dol_sanitizeFileName($langs->transnoentities($objectlabel)));
 	    $filename=preg_replace('/\s/','_',$filename);
-	    
+
 	    // Save merged file
 	    if ($filter=='paye:0')
 	    {
@@ -565,6 +567,11 @@ if (! $error && $massaction == 'delete' && $permtodelete)
     //var_dump($listofobjectthirdparties);exit;
 }
 
+$parameters['toselect']=$toselect;
+$parameters['uploaddir']=$uploaddir;
+
+$reshook=$hookmanager->executeHooks('doMassActions',$parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 
 
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 1e20ee6ce31..40ed4153060 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -140,6 +140,7 @@ class HookManager
 				'addStatisticLine',
 			    'deleteFile',
 				'doActions',
+			    'doMassActions',
 				'formCreateThirdpartyOptions',
 				'formObjectOptions',
 				'formattachOptions',
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 997bc94cc42..b14f72a1b7b 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -546,7 +546,7 @@ class Form
     	$ret='<div class="centpercent center">';
     	$ret.='<select data-role="none" class="flat'.(empty($conf->use_javascript_ajax)?'':' hideobject').' massaction massactionselect" name="massaction"'.($disabled?' disabled="disabled"':'').'>';
 
-        // Complete list with data from external modules. THe module can use $_SERVER['PHP_SELF'] to know on which page we are, or use the $parameters['context'] completed by executeHooks.
+        // Complete list with data from external modules. THe module can use $_SERVER['PHP_SELF'] to know on which page we are, or use the $parameters['currentcontext'] completed by executeHooks.
     	$parameters=array();
     	$reshook=$hookmanager->executeHooks('addMoreMassActions',$parameters);    // Note that $action and $object may have been modified by hook
         if (empty($reshook))
diff --git a/htdocs/modulebuilder/template/class/actions_mymodule.class.php b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
index f3ce5963aa6..7f1897c80ae 100644
--- a/htdocs/modulebuilder/template/class/actions_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
@@ -62,24 +62,101 @@ class ActionsMyModule
 	 */
 	public function doActions($parameters, &$object, &$action, $hookmanager)
 	{
+		global $conf, $user, $langs;
+
 		$error = 0; // Error counter
-		$myvalue = 'test'; // A result value
 
+        /*
 		print_r($parameters);
-		echo "action: " . $action;
 		print_r($object);
+		echo "action: " . $action;
+        */
+
+	    if (in_array($parameters['currentcontext'], array('somecontext1','somecontext2'))) {    // do something only for the context 'somecontext1' or 'somecontext2'
+
 
-		if (in_array('somecontext', explode(':', $parameters['context']))) {
-		  // do something only for the context 'somecontext'
 		}
 
 		if (! $error) {
-			$this->results = array('myreturn' => $myvalue);
+			$this->results = array('myreturn' => 999);
 			$this->resprints = 'A text to show';
-			return 0; // or return 1 to replace standard code
+			return 0;                                    // or return 1 to replace standard code
 		} else {
 			$this->errors[] = 'Error message';
 			return -1;
 		}
 	}
+
+
+	/**
+	 * Overloading the doActions function : replacing the parent's function with the one below
+	 *
+	 * @param   array()         $parameters     Hook metadatas (context, etc...)
+	 * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
+	 * @param   string          $action         Current action (if set). Generally create or edit or null
+	 * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
+	 * @return  int                             < 0 on error, 0 on success, 1 to replace standard code
+	 */
+	public function doMassActions($parameters, &$object, &$action, $hookmanager)
+	{
+	    global $conf, $user, $langs;
+
+	    $error = 0; // Error counter
+
+        /*
+	    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'
+
+	        foreach($parameters['toselect'] as $objectid)
+	        {
+	            // Do action on each object id
+
+	        }
+	    }
+
+	    if (! $error) {
+	        $this->results = array('myreturn' => 999);
+	        $this->resprints = 'A text to show';
+	        return 0;                                    // or return 1 to replace standard code
+	    } else {
+	        $this->errors[] = 'Error message';
+	        return -1;
+	    }
+	}
+
+
+	/**
+	 * Overloading the addMoreMassActions function : replacing the parent's function with the one below
+	 *
+	 * @param   array()         $parameters     Hook metadatas (context, etc...)
+	 * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
+	 * @param   string          $action         Current action (if set). Generally create or edit or null
+	 * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
+	 * @return  int                             < 0 on error, 0 on success, 1 to replace standard code
+	 */
+	public function addMoreMassActions($parameters, &$object, &$action, $hookmanager)
+	{
+	    global $conf, $user, $langs;
+
+	    $error = 0; // Error counter
+
+	    if (in_array($parameters['currentcontext'], array('somecontext1','somecontext2')))  // do something only for the context 'somecontext'
+	    {
+	        $this->resprints = '<option value="0"'.($disabled?' disabled="disabled"':'').'>'.$langs->trans("MyModuleMassAction").'</option>';
+	    }
+
+	    if (! $error) {
+	        return 0;                                    // or return 1 to replace standard code
+	    } else {
+	        $this->errors[] = 'Error message';
+	        return -1;
+	    }
+	}
+
+
+
 }

From e1b19b831ae8770887c5b51c04679af3c6b103de Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Jun 2017 23:41:18 +0200
Subject: [PATCH 074/438] NEW An external module can hook and add mass actions

---
 htdocs/core/actions_massactions.inc.php       | 49 +++++-----
 htdocs/core/class/hookmanager.class.php       |  1 +
 htdocs/core/class/html.form.class.php         |  2 +-
 .../template/class/actions_mymodule.class.php | 89 +++++++++++++++++--
 4 files changed, 113 insertions(+), 28 deletions(-)

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 92d1011b923..fde828fd6d4 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -24,20 +24,22 @@
 
 // $massaction must be defined
 // $objectclass and $$objectlabel must be defined
-// $uploaddir (example $conf->projet->dir_output . "/";)
+// $parameters, $object, $action must be defined for the hook.
+
+// $uploaddir may be defined (example to $conf->projet->dir_output."/";)
 // $toselect may be defined
 
 
 // Protection
-if (empty($objectclass) || empty($uploaddir)) 
+if (empty($objectclass) || empty($uploaddir))
 {
     dol_print_error(null, 'include of actions_massactions.inc.php is done but var $massaction or $objectclass or $uploaddir was not defined');
     exit;
 }
 
 
-// Mass actions. Controls on number of lines checked
-$maxformassaction=1000;
+// Mass actions. Controls on number of lines checked.
+$maxformassaction=(empty($conf->global->MAIN_LIMIT_FOR_MASS_ACTIONS)?1000:$conf->global->MAIN_LIMIT_FOR_MASS_ACTIONS);
 if (! empty($massaction) && count($toselect) < 1)
 {
     $error++;
@@ -87,7 +89,7 @@ if (! $error && $massaction == 'confirm_presend')
             }
         }
         //var_dump($listofobjectthirdparties);exit;
-        	
+
         foreach ($listofobjectthirdparties as $thirdpartyid)
         {
             $result = $thirdparty->fetch($thirdpartyid);
@@ -144,7 +146,7 @@ if (! $error && $massaction == 'confirm_presend')
             {
                 //var_dump($object);
                 //var_dump($thirdpartyid.' - '.$objectid.' - '.$object->statut);
-                	
+
                 if ($objectclass == 'Facture' && $object->statut != Facture::STATUS_VALIDATED)
                 {
                     $nbignored++;
@@ -157,7 +159,7 @@ if (! $error && $massaction == 'confirm_presend')
                     $resaction.='<div class="error">'.$langs->trans('ErrorOnlyOrderNotDraftCanBeSentInMassAction',$object->ref).'</div><br>';
                     continue;
                 }
-                
+
                 // Read document
                 // TODO Use future field $object->fullpathdoc to know where is stored default file
                 // TODO If not defined, use $object->modelpdf (or defaut invoice config) to know what is template to use to regenerate doc.
@@ -202,7 +204,7 @@ if (! $error && $massaction == 'confirm_presend')
                     dol_syslog('Failed to read file: '.$file, LOG_WARNING);
                     continue;
                 }
-                	
+
                 //var_dump($listofqualifiedref);
             }
 
@@ -252,9 +254,9 @@ if (! $error && $massaction == 'confirm_presend')
                 $filepath = $attachedfiles['paths'];
                 $filename = $attachedfiles['names'];
                 $mimetype = $attachedfiles['mimes'];
-                	
+
                 //var_dump($filepath);
-                	
+
                 // Send mail
                 require_once(DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php');
                 $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,$sendtobcc,$deliveryreceipt,-1);
@@ -280,7 +282,7 @@ if (! $error && $massaction == 'confirm_presend')
                             if ($objectclass == 'Supplier_Proposal') $actiontypecode='AC_SUP_PRO';
                             if ($objectclass == 'CommandeFournisseur') $actiontypecode='AC_SUP_ORD';
                             if ($objectclass == 'FactureFournisseur') $actiontypecode='AC_SUP_INV';*/
-                            
+
                             $actionmsg=$langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
                             if ($message)
                             {
@@ -290,7 +292,7 @@ if (! $error && $massaction == 'confirm_presend')
                                 $actionmsg = dol_concatdesc($actionmsg, $message);
                             }
                             $actionmsg2='';
-                            
+
                             // Initialisation donnees
                             $object->sendtoid		= 0;
                             $object->actionmsg		= $actionmsg;  // Long text
@@ -335,7 +337,7 @@ if (! $error && $massaction == 'confirm_presend')
         $resaction.=$langs->trans("NbSelected").': '.count($toselect)."\n<br>";
         $resaction.=$langs->trans("NbIgnored").': '.($nbignored?$nbignored:0)."\n<br>";
         $resaction.=$langs->trans("NbSent").': '.($nbsent?$nbsent:0)."\n<br>";
-        	
+
         if ($nbsent)
         {
             $action='';	// Do not show form post if there was at least one successfull sent
@@ -359,7 +361,7 @@ if (! $error && $massaction == "builddoc" && $permtoread && ! GETPOST('button_se
     require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-     
+
     $objecttmp=new $objectclass($db);
     $listofobjectid=array();
     $listofobjectthirdparties=array();
@@ -425,21 +427,21 @@ if (! $error && $massaction == "builddoc" && $permtoread && ! GETPOST('button_se
 
     	if (count($files)>0)
     	{
-    	
+
     		$now=dol_now();
     		$file=$diroutputmassaction.'/'.$filename.'_'.dol_print_date($now,'dayhourlog').'.pdf';
-    		
+
     		$input_files = '';
     		foreach($files as $f) {
     			$input_files.=' '.escapeshellarg($f);
     		}
-    		
+
     		$cmd = 'pdftk '.$input_files.' cat output '.escapeshellarg($file);
     		exec($cmd);
-    		
+
     		if (! empty($conf->global->MAIN_UMASK))
     			@chmod($file, octdec($conf->global->MAIN_UMASK));
-    			
+
     			$langs->load("exports");
     			setEventMessages($langs->trans('FileSuccessfullyBuilt',$filename.'_'.dol_print_date($now,'dayhourlog')), null, 'mesgs');
     	}
@@ -447,7 +449,7 @@ if (! $error && $massaction == "builddoc" && $permtoread && ! GETPOST('button_se
     	{
     		setEventMessages($langs->trans('NoPDFAvailableForDocGenAmongChecked'), null, 'errors');
     	}
-    	
+
     }
     else {
 	    // Create empty PDF
@@ -481,7 +483,7 @@ if (! $error && $massaction == "builddoc" && $permtoread && ! GETPOST('button_se
 	    // Defined name of merged file
 	    $filename=strtolower(dol_sanitizeFileName($langs->transnoentities($objectlabel)));
 	    $filename=preg_replace('/\s/','_',$filename);
-	    
+
 	    // Save merged file
 	    if ($filter=='paye:0')
 	    {
@@ -565,6 +567,11 @@ if (! $error && $massaction == 'delete' && $permtodelete)
     //var_dump($listofobjectthirdparties);exit;
 }
 
+$parameters['toselect']=$toselect;
+$parameters['uploaddir']=$uploaddir;
+
+$reshook=$hookmanager->executeHooks('doMassActions',$parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 
 
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 1e20ee6ce31..40ed4153060 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -140,6 +140,7 @@ class HookManager
 				'addStatisticLine',
 			    'deleteFile',
 				'doActions',
+			    'doMassActions',
 				'formCreateThirdpartyOptions',
 				'formObjectOptions',
 				'formattachOptions',
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 997bc94cc42..b14f72a1b7b 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -546,7 +546,7 @@ class Form
     	$ret='<div class="centpercent center">';
     	$ret.='<select data-role="none" class="flat'.(empty($conf->use_javascript_ajax)?'':' hideobject').' massaction massactionselect" name="massaction"'.($disabled?' disabled="disabled"':'').'>';
 
-        // Complete list with data from external modules. THe module can use $_SERVER['PHP_SELF'] to know on which page we are, or use the $parameters['context'] completed by executeHooks.
+        // Complete list with data from external modules. THe module can use $_SERVER['PHP_SELF'] to know on which page we are, or use the $parameters['currentcontext'] completed by executeHooks.
     	$parameters=array();
     	$reshook=$hookmanager->executeHooks('addMoreMassActions',$parameters);    // Note that $action and $object may have been modified by hook
         if (empty($reshook))
diff --git a/htdocs/modulebuilder/template/class/actions_mymodule.class.php b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
index f3ce5963aa6..7f1897c80ae 100644
--- a/htdocs/modulebuilder/template/class/actions_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
@@ -62,24 +62,101 @@ class ActionsMyModule
 	 */
 	public function doActions($parameters, &$object, &$action, $hookmanager)
 	{
+		global $conf, $user, $langs;
+
 		$error = 0; // Error counter
-		$myvalue = 'test'; // A result value
 
+        /*
 		print_r($parameters);
-		echo "action: " . $action;
 		print_r($object);
+		echo "action: " . $action;
+        */
+
+	    if (in_array($parameters['currentcontext'], array('somecontext1','somecontext2'))) {    // do something only for the context 'somecontext1' or 'somecontext2'
+
 
-		if (in_array('somecontext', explode(':', $parameters['context']))) {
-		  // do something only for the context 'somecontext'
 		}
 
 		if (! $error) {
-			$this->results = array('myreturn' => $myvalue);
+			$this->results = array('myreturn' => 999);
 			$this->resprints = 'A text to show';
-			return 0; // or return 1 to replace standard code
+			return 0;                                    // or return 1 to replace standard code
 		} else {
 			$this->errors[] = 'Error message';
 			return -1;
 		}
 	}
+
+
+	/**
+	 * Overloading the doActions function : replacing the parent's function with the one below
+	 *
+	 * @param   array()         $parameters     Hook metadatas (context, etc...)
+	 * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
+	 * @param   string          $action         Current action (if set). Generally create or edit or null
+	 * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
+	 * @return  int                             < 0 on error, 0 on success, 1 to replace standard code
+	 */
+	public function doMassActions($parameters, &$object, &$action, $hookmanager)
+	{
+	    global $conf, $user, $langs;
+
+	    $error = 0; // Error counter
+
+        /*
+	    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'
+
+	        foreach($parameters['toselect'] as $objectid)
+	        {
+	            // Do action on each object id
+
+	        }
+	    }
+
+	    if (! $error) {
+	        $this->results = array('myreturn' => 999);
+	        $this->resprints = 'A text to show';
+	        return 0;                                    // or return 1 to replace standard code
+	    } else {
+	        $this->errors[] = 'Error message';
+	        return -1;
+	    }
+	}
+
+
+	/**
+	 * Overloading the addMoreMassActions function : replacing the parent's function with the one below
+	 *
+	 * @param   array()         $parameters     Hook metadatas (context, etc...)
+	 * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
+	 * @param   string          $action         Current action (if set). Generally create or edit or null
+	 * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
+	 * @return  int                             < 0 on error, 0 on success, 1 to replace standard code
+	 */
+	public function addMoreMassActions($parameters, &$object, &$action, $hookmanager)
+	{
+	    global $conf, $user, $langs;
+
+	    $error = 0; // Error counter
+
+	    if (in_array($parameters['currentcontext'], array('somecontext1','somecontext2')))  // do something only for the context 'somecontext'
+	    {
+	        $this->resprints = '<option value="0"'.($disabled?' disabled="disabled"':'').'>'.$langs->trans("MyModuleMassAction").'</option>';
+	    }
+
+	    if (! $error) {
+	        return 0;                                    // or return 1 to replace standard code
+	    } else {
+	        $this->errors[] = 'Error message';
+	        return -1;
+	    }
+	}
+
+
+
 }

From af584bc9c01950efb993182bc5dab705645d5908 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 3 Jun 2017 00:58:51 +0200
Subject: [PATCH 075/438] FIX #6880 #6925

---
 htdocs/projet/card.php | 67 +++++++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 31 deletions(-)

diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index f69b54cffdc..727ef1d7fdd 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -134,7 +134,7 @@ if (empty($reshook))
 	        $error++;
 	        setEventMessages($langs->trans("ErrorOppStatusRequiredIfAmount"), null, 'errors');
 	    }
-	    
+
 	    if (! $error)
 	    {
 	        $error=0;
@@ -308,8 +308,8 @@ if (empty($reshook))
 			    setEventMessages($langs->trans("FailedToCloseProject").':'.$object->error, $object->errors, 'errors');
 	        }
 	    }
-	    
-	    
+
+
 	    if ($error)
 	    {
 			$db->rollback();
@@ -322,7 +322,7 @@ if (empty($reshook))
 			if (GETPOST('socid','int') > 0) $object->fetch_thirdparty(GETPOST('socid','int'));
 			else unset($object->thirdparty);
 	    }
-	    
+
 	}
 
 	// Build doc
@@ -619,7 +619,7 @@ if ($action == 'create' && $user->rights->projet->creer)
     {
         print ' &nbsp; &nbsp; ';
         print '<input type="button" class="button" value="' . $langs->trans("Cancel") . '" onClick="javascript:history.go(-1)">';
-    }    
+    }
     print '</div>';
 
     print '</form>';
@@ -641,12 +641,12 @@ if ($action == 'create' && $user->rights->projet->creer)
         });
         </script>';
 }
-elseif ($object->id > 0) 
+elseif ($object->id > 0)
 {
     /*
      * Show or edit
      */
-    
+
     $res=$object->fetch_optionals($object->id,$extralabels);
 
     // To verify role of users
@@ -828,26 +828,26 @@ elseif ($object->id > 0)
     else
     {
         // Project card
-        
+
         $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php">'.$langs->trans("BackToList").'</a>';
-        
+
         $morehtmlref='<div class="refidno">';
         // Title
         $morehtmlref.=$object->title;
         // Thirdparty
-        if ($object->thirdparty->id > 0) 
+        if ($object->thirdparty->id > 0)
         {
             $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1, 'project');
         }
         $morehtmlref.='</div>';
-        
+
         // Define a complementary filter for search of next/prev ref.
         if (! $user->rights->projet->all->lire)
         {
             $objectsListId = $object->getProjectsAuthorizedForUser($user,0,0);
             $object->next_prev_filter=" rowid in (".(count($objectsListId)?join(',',array_keys($objectsListId)):'0').")";
         }
-        
+
 	    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 
@@ -881,18 +881,18 @@ elseif ($object->id > 0)
 	        if (strcmp($object->opp_amount,'')) print price($object->opp_amount,0,$langs,1,0,0,$conf->currency);
 	        print '</td></tr>';
 	    }
-    
+
         // Date start - end
         print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
         print dol_print_date($object->date_start,'day');
         $end=dol_print_date($object->date_end,'day');
-        if ($end) 
+        if ($end)
         {
             print ' - '.$end;
             if ($object->hasDelay()) print img_warning($langs->trans('Late'));
         }
         print '</td></tr>';
-    	     
+
         // Budget
         print '<tr><td>'.$langs->trans("Budget").'</td><td>';
         if (strcmp($object->budget_amount, '')) print price($object->budget_amount,0,$langs,1,0,0,$conf->currency);
@@ -901,16 +901,16 @@ elseif ($object->id > 0)
         // Other attributes
         $cols = 2;
         include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
-        
+
         print '</table>';
-        
+
         print '</div>';
         print '<div class="fichehalfright">';
         print '<div class="ficheaddleft">';
         print '<div class="underbanner clearboth"></div>';
-        
+
         print '<table class="border" width="100%">';
-        
+
         // Description
         print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
         print nl2br($object->description);
@@ -922,13 +922,13 @@ elseif ($object->id > 0)
             print $form->showCategories($object->id,'project',1);
             print "</td></tr>";
         }
-        
+
         print '</table>';
-        
+
         print '</div>';
         print '</div>';
         print '</div>';
-        
+
         print '<div class="clearboth"></div>';
     }
 
@@ -947,9 +947,10 @@ elseif ($object->id > 0)
     // Change probability from status
     if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
     {
+        // Default value to close or not when we set opp to 'WON'.
         $defaultcheckedwhenoppclose=1;
         if (empty($conf->global->PROJECT_HIDE_TASKS)) $defaultcheckedwhenoppclose=0;
-        
+
         print '<!-- Javascript to manage opportunity status change -->';
         print '<script type="text/javascript" language="javascript">
             jQuery(document).ready(function() {
@@ -962,13 +963,17 @@ elseif ($object->id > 0)
                     var oldpercent = \''.dol_escape_js($object->opp_percent).'\';
 
                     console.log("We select "+elemcode);
-                    if (elemcode == \'LOST\') defaultcloseproject = 1;
-                    jQuery("#divtocloseproject").show();
-                    if (defaultcloseproject) jQuery("#inputcloseproject").prop("checked", true);
+
+                    /* Define if checkbox to close is checked or not */
+                    closeproject = 0;
+                    if (elemcode == \'LOST\') closeproject = 1;
+                    if (elemcode == \'WON\') closeproject = defaultcloseproject;
+                    if (closeproject) jQuery("#inputcloseproject").prop("checked", true);
                     else jQuery("#inputcloseproject").prop("checked", false);
-                        
-                    /* Make close project visible or not */
-                    if (elemcode == \'WON\' || elemcode == \'LOST\') 
+                    console.log("closeproject="+closeproject);
+
+                    /* Make the close project checkbox visible or not */
+                    if (elemcode == \'WON\' || elemcode == \'LOST\')
                     {
                         jQuery("#divtocloseproject").show();
                     }
@@ -976,7 +981,7 @@ elseif ($object->id > 0)
                     {
                         jQuery("#divtocloseproject").hide();
                     }
-                        
+
                     /* Change percent of default percent of new status is higher */
                     if (parseFloat(jQuery("#opp_percent").val()) != parseFloat(defaultpercent))
                     {
@@ -1003,7 +1008,7 @@ elseif ($object->id > 0)
     {
 	    if ($action != "edit" )
 	    {
-	        
+
         	// Create event
         	if ($conf->agenda->enabled && ! empty($conf->global->MAIN_ADD_EVENT_ON_ELEMENT_CARD)) 				// Add hidden condition because this is not a
             	// "workflow" action so should appears somewhere else on

From d9794f942d87f734ebe2486b7ae84a149f20f1b6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 3 Jun 2017 01:17:33 +0200
Subject: [PATCH 076/438] Prepare 5.0.4

---
 htdocs/filefunc.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 5eba45e2c57..9e065451001 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -31,7 +31,7 @@
  */
 
 if (! defined('DOL_APPLICATION_TITLE')) define('DOL_APPLICATION_TITLE','Dolibarr');
-if (! defined('DOL_VERSION')) define('DOL_VERSION','5.0.3');                         // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
+if (! defined('DOL_VERSION')) define('DOL_VERSION','5.0.4');                         // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
 
 if (! defined('EURO')) define('EURO',chr(128));
 

From 344263f53cbd50aed4f4090be6924865b1c4f27b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 3 Jun 2017 02:22:21 +0200
Subject: [PATCH 077/438] Fix travis

---
 htdocs/loan/calcmens.php                 |  4 +--
 htdocs/loan/class/loanschedule.class.php | 40 +++++++++++++++++-------
 htdocs/loan/createschedule.php           |  2 +-
 3 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/htdocs/loan/calcmens.php b/htdocs/loan/calcmens.php
index 3778f455b04..96c8b5204b8 100644
--- a/htdocs/loan/calcmens.php
+++ b/htdocs/loan/calcmens.php
@@ -48,7 +48,7 @@ $output=array();
 $object = new LoanSchedule($db);
 
 $int = ($capital*($rate/12));
-$int = round($int ,2,PHP_ROUND_HALF_UP);
+$int = round($int,2,PHP_ROUND_HALF_UP);
 $cap_rest = round($capital - ($mens-$int),2,PHP_ROUND_HALF_UP);
 $output[$echance]=array('cap_rest'=>$cap_rest,'cap_rest_str'=>price($cap_rest),'interet'=>$int,'interet_str'=>price($int,0,'',1),'mens'=>$mens);
 
@@ -59,7 +59,7 @@ while ($echance<=$nbterm) {
 	$mens = round($object->calc_mens($capital,$rate,$nbterm-$echance+1),2,PHP_ROUND_HALF_UP);
 
 	$int = ($capital*($rate/12));
-	$int = round($int ,2,PHP_ROUND_HALF_UP);
+	$int = round($int,2,PHP_ROUND_HALF_UP);
 	$cap_rest = round($capital - ($mens-$int),2,PHP_ROUND_HALF_UP);
 
 	$output[$echance]=array('cap_rest'=>$cap_rest,'cap_rest_str'=>price($cap_rest),'interet'=>$int,'interet_str'=>price($int,0,'',1),'mens'=>$mens);
diff --git a/htdocs/loan/class/loanschedule.class.php b/htdocs/loan/class/loanschedule.class.php
index 1e519e6a2af..fb6df8fcb6c 100644
--- a/htdocs/loan/class/loanschedule.class.php
+++ b/htdocs/loan/class/loanschedule.class.php
@@ -24,8 +24,8 @@
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 
-/**     \class      LoanSchedule
- *		\brief      Class to manage Schedule of loans
+/**
+ *		Class to manage Schedule of loans
  */
 class LoanSchedule extends CommonObject
 {
@@ -382,10 +382,10 @@ class LoanSchedule extends CommonObject
 	/**
 	 *  Load all object in memory from database
 	 *
-	 *  @param	int		$id         Id object
+	 *  @param	int		$loanid     Id object
 	 *  @return int         		<0 if KO, >0 if OK
 	 */
-	function fetchall($loan)
+	function fetchall($loanid)
 	{
 		global $langs;
 
@@ -406,7 +406,7 @@ class LoanSchedule extends CommonObject
 		$sql.= " t.fk_user_creat,";
 		$sql.= " t.fk_user_modif";
 		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
-		$sql.= " WHERE t.fk_loan = ".$loan;
+		$sql.= " WHERE t.fk_loan = ".$loanid;
 
 		dol_syslog(get_class($this)."::fetchall", LOG_DEBUG);
 		$resql=$this->db->query($sql);
@@ -446,6 +446,11 @@ class LoanSchedule extends CommonObject
 		}
 	}
 
+	/**
+	 *  trans_paiment
+	 *
+	 *  @return void
+	 */
 	function trans_paiment()
 	{
 		require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
@@ -482,11 +487,17 @@ class LoanSchedule extends CommonObject
 	}
 
 
-	function lastpaiment($loan)
+	/**
+	 *  trans_paiment
+	 *
+	 *  @param  int    $loanid     Loan id
+	 *  @return int                < 0 if KO, Date > 0 if OK
+	 */
+	function lastpaiment($loanid)
 	{
 		$sql = "SELECT p.datep";
 		$sql.= " FROM ".MAIN_DB_PREFIX."payment_loan as p ";
-		$sql.= " WHERE p.fk_loan = " . $loan;
+		$sql.= " WHERE p.fk_loan = " . $loanid;
 		$sql.= " ORDER BY p.datep DESC ";
 		$sql.= " LIMIT 1 ";
 
@@ -500,22 +511,27 @@ class LoanSchedule extends CommonObject
 		}
 	}
 
-	function paimenttorecord($loan,$datemax)
+	/**
+	 *  paimenttorecord
+	 *
+	 *  @param  int        $loanid     Loan id
+	 *  @param  int        $datemax    Date max
+	 *  @return array                  Array of id
+	 */
+	function paimenttorecord($loanid, $datemax)
 	{
 		$sql = "SELECT p.rowid";
 		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as p ";
-		$sql.= " WHERE p.fk_loan = " . $loan;
-		if(!empty($datemax)){ $sql.= " AND p.datep > '" . $this->db->idate($datemax) ."'";}
+		$sql.= " WHERE p.fk_loan = " . $loanid;
+		if (!empty($datemax)) { $sql.= " AND p.datep > '" . $this->db->idate($datemax) ."'";}
 		$sql.= " AND p.datep <= '" . $this->db->idate(dol_now()). "'";
 
-
 		$resql=$this->db->query($sql);
 
 		if($resql){
 			while($obj = $this->db->fetch_object($resql))
 			{
 				$result[] = $obj->rowid;
-
 			}
 
 		}
diff --git a/htdocs/loan/createschedule.php b/htdocs/loan/createschedule.php
index 0d15d1b2de6..596cc9fd536 100644
--- a/htdocs/loan/createschedule.php
+++ b/htdocs/loan/createschedule.php
@@ -160,7 +160,7 @@ if ($object->nbterm > 0 && count($echeance->lines)==0)
 	while($i <$object->nbterm+1){
 		$mens = round($echeance->calc_mens($capital, $object->rate/100, $object->nbterm-$i+1),2,PHP_ROUND_HALF_UP);
 		$int = ($capital*($object->rate/12))/100;
-		$int = round($int ,2,PHP_ROUND_HALF_UP);
+		$int = round($int,2,PHP_ROUND_HALF_UP);
 		$cap_rest = round($capital - ($mens-$int),2,PHP_ROUND_HALF_UP);
 		print '<tr>';
 		print '<td align="center" id="n'.$i.'">' . $i .'</td>';

From 90c1a3848698c6bec7203d7e6e4905fb81ef747a Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sat, 3 Jun 2017 07:23:14 +0200
Subject: [PATCH 078/438] Accountancy - Activate multijournal on bank_journal

---
 htdocs/accountancy/journal/bankjournal.php    | 46 +++++++-----------
 htdocs/core/menus/standard/eldy.lib.php       | 48 +++++++++----------
 .../mysql/tables/llx_accounting_journal.sql   |  6 +--
 3 files changed, 43 insertions(+), 57 deletions(-)

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index b42ef34d663..3fa7d7a1110 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -65,10 +65,8 @@ $langs->load("accountancy");
 $langs->load("trips");
 $langs->load("hrm");
 
-// Old system menu
-$id_bank_account = GETPOST('id_account', 'int');
 // Multi journal
-$code_journal = GETPOST('code_journal', 'alpha');
+$id_journal = GETPOST('id_journal', 'int');
 
 $date_startmonth = GETPOST('date_startmonth');
 $date_startday = GETPOST('date_startday');
@@ -81,7 +79,7 @@ $action = GETPOST('action','aZ09');
 $now = dol_now();
 
 // Security check
-if ($user->societe_id > 0 && empty($id_bank_account))
+if ($user->societe_id > 0 && empty($id_journal))
 	accessforbidden();
 
 
@@ -112,7 +110,7 @@ $p = explode(":", $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
 $idpays = $p[0];
 
 $sql  = "SELECT b.rowid, b.dateo as do, b.datev as dv, b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type,";
-$sql .= " ba.courant, ba.ref as baref, ba.account_number,";
+$sql .= " ba.courant, ba.ref as baref, ba.account_number, ba.fk_accountancy_journal,";
 $sql .= " soc.code_compta, soc.code_compta_fournisseur, soc.rowid as socid, soc.nom as name, bu1.type as typeop,";
 $sql .= " u.accountancy_code, u.rowid as userid, u.lastname as name, u.firstname as firstname, bu2.type as typeop";
 $sql .= " FROM " . MAIN_DB_PREFIX . "bank as b";
@@ -121,7 +119,7 @@ $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "bank_url as bu1 ON bu1.fk_bank = b.row
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "bank_url as bu2 ON bu2.fk_bank = b.rowid AND bu2.type='user'";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as soc on bu1.url_id=soc.rowid";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "user as u on bu2.url_id=u.rowid";
-$sql .= " WHERE ba.rowid=" . $id_bank_account;
+$sql .= " WHERE ba.fk_accountancy_journal=" . $id_journal;
 $sql .= ' AND ba.entity IN ('.getEntity('bank_account', 0).')';        // We don't share object for accountancy
 if ($date_start && $date_end)
 	$sql .= " AND b.dateo >= '" . $db->idate($date_start) . "' AND b.dateo <= '" . $db->idate($date_end) . "'";
@@ -139,20 +137,8 @@ $paymentsalstatic = new PaymentSalary($db);
 $paymentexpensereportstatic = new PaymentExpenseReport($db);
 
 // Get code of finance journal
-$journal = '';
-$bankstatic = new Account($db);
-$bankstatic->fetch($id_bank_account);
-$bankstatic->rowid;
-$bankstatic->number;
-$bankstatic->label;
-$bankstatic->fk_accountancy_journal;
-
 $accountingjournalstatic = new AccountingJournal($db);
-if(! empty($id_bank_account)) {
-	$accountingjournalstatic->fetch($bankstatic->fk_accountancy_journal);
-} else {
-	$accountingjournalstatic->fetch('',$code_journal);
-}
+$accountingjournalstatic->fetch($id_journal);
 $journal = $accountingjournalstatic->code;
 
 dol_syslog("accountancy/journal/bankjournal.php", LOG_DEBUG);
@@ -194,7 +180,7 @@ if ($result) {
 		$tabcompany[$obj->rowid] = array (
 				'id' => $obj->socid,
 				'name' => $obj->name,
-		        'code_compta' => $compta_soc,
+				'code_compta' => $compta_soc,
 		);
 
 		$compta_user = (! empty($obj->accountancy_code) ? $obj->accountancy_code : $account_employee);
@@ -203,7 +189,7 @@ if ($result) {
 				'id' => $obj->userid,
 				'lastname' => $obj->lastname,
 				'firstname' => $obj->firstname,
-		        'accountancy_code' => $compta_user,
+				'accountancy_code' => $compta_user,
 		);
 
 		// Variable bookkeeping
@@ -220,14 +206,14 @@ if ($result) {
 
 		// get_url may return -1 which is not traversable
 		if (is_array($links)) {
-		    // Now loop on each link of record in bank.
+			// Now loop on each link of record in bank.
 			foreach ( $links as $key => $val ) {
 
-			    if (in_array($links[$key]['type'], array('sc', 'payment_sc', 'payment', 'payment_supplier', 'payment_vat', 'payment_expensereport', 'banktransfert', 'payment_donation')))     // So we excluded 'company' here
-			    {
-			        // We save tabtype for a future use, to remember what kind of payment it is 
-			        $tabtype[$obj->rowid] = $links[$key]['type'];
-			    }
+				if (in_array($links[$key]['type'], array('sc', 'payment_sc', 'payment', 'payment_supplier', 'payment_vat', 'payment_expensereport', 'banktransfert', 'payment_donation')))     // So we excluded 'company' here
+				{
+					// We save tabtype for a future use, to remember what kind of payment it is 
+					$tabtype[$obj->rowid] = $links[$key]['type'];
+				}
 
 				if ($links[$key]['type'] == 'payment') {
 					$paymentstatic->id = $links[$key]['url_id'];
@@ -740,18 +726,18 @@ if (empty($action) || $action == 'view') {
 	$invoicestatic = new Facture($db);
 	$invoicesupplierstatic = new FactureFournisseur($db);
 	$expensereportstatic = new ExpenseReport($db);
-  $vatstatic = new Tva($db);
+	$vatstatic = new Tva($db);
 	$donationstatic = new Don($db);
 
 	llxHeader('', $langs->trans("FinanceJournal"));
 
-	$nom = $langs->trans("FinanceJournal") . ' - ' . $bankstatic->getNomUrl(1);
+	$nom = $langs->trans("FinanceJournal") . ' - ' . $accountingjournalstatic->getNomUrl(1);
 	$builddate = time();
 	//$description = $langs->trans("DescFinanceJournal") . '<br>';
 	$description.= $langs->trans("DescJournalOnlyBindedVisible").'<br>';
 	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
 
-	$varlink = 'id_account=' . $id_bank_account;
+	$varlink = 'id_journal=' . $id_journal;
 
 	journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''), '', $varlink);
 
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 6248f294476..9245a481aff 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1008,7 +1008,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 					$sql = "SELECT rowid, code, label, nature";
 					$sql.= " FROM ".MAIN_DB_PREFIX."accounting_journal";
 					$sql.= " WHERE entity = ".$conf->entity;
-					$sql.= " ORDER BY nature";
+					$sql.= " ORDER BY label";
 
 					$resql = $db->query($sql);
 					if ($resql)
@@ -1018,30 +1018,30 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 
 						if ($numr > 0)
 						{
-    						while ($i < $numr)
-    						{
-    							$objp = $db->fetch_object($resql);
+							while ($i < $numr)
+							{
+								$objp = $db->fetch_object($resql);
 
-    							$nature='';
-    							// Must match array $sourceList defined into journals_list.php 
-    							if ($objp->nature == 2) $nature="sells";
-    							if ($objp->nature == 3) $nature="purchases";
-    							if ($objp->nature == 4) $nature="bank";
-    							if ($objp->nature == 1) $nature="various";
-    							if ($objp->nature == 9) $nature="hasnew";
-    							
-    							// To enable when page exists
-    							if (empty($conf->global->MAIN_FEATURES_LEVEL))
-    							{
-    							    if ($nature == 'various' || $nature == 'hasnew') $nature='';	
-    							}
-    								
-    							if ($nature)
-    							{
-                                    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&code_journal='.$objp->code,dol_trunc($objp->label,25),2,$user->rights->accounting->comptarapport->lire);
-    							}
-    							$i++;
-    						}
+								$nature='';
+								// Must match array $sourceList defined into journals_list.php 
+								if ($objp->nature == 2) $nature="sells";
+								if ($objp->nature == 3) $nature="purchases";
+								if ($objp->nature == 4) $nature="bank";
+								if ($objp->nature == 1) $nature="various";
+								if ($objp->nature == 9) $nature="hasnew";
+
+								// To enable when page exists
+								if (empty($conf->global->MAIN_FEATURES_LEVEL))
+								{
+									if ($nature == 'various' || $nature == 'hasnew') $nature='';
+								}
+
+								if ($nature)
+								{
+									if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid,dol_trunc($objp->label,25),2,$user->rights->accounting->comptarapport->lire);
+								}
+								$i++;
+							}
 						}
 						else
 						{
diff --git a/htdocs/install/mysql/tables/llx_accounting_journal.sql b/htdocs/install/mysql/tables/llx_accounting_journal.sql
index 348654b56dc..dbd9e4d311b 100644
--- a/htdocs/install/mysql/tables/llx_accounting_journal.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_journal.sql
@@ -20,9 +20,9 @@
 create table llx_accounting_journal
 (
   rowid             integer AUTO_INCREMENT PRIMARY KEY,
-  entity            integer DEFAULT 1,
-  code       		varchar(32) NOT NULL,
+  entity            integer DEFAULT 1 NOT NULL,
+  code              varchar(32) NOT NULL,
   label             varchar(128) NOT NULL,
-  nature			smallint DEFAULT 1 NOT NULL,			-- type of journals (1:various operations / 2:sale / 3:purchase / 4:bank / 9: has-new)
+  nature            smallint DEFAULT 1 NOT NULL,        -- type of journals (1:various operations / 2:sale / 3:purchase / 4:bank / 9: has-new)
   active            smallint DEFAULT 0
 )ENGINE=innodb;

From 0eadef9a7ad540e81bc03edaf1e81795043d7b0e Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Sat, 3 Jun 2017 11:46:18 +0200
Subject: [PATCH 079/438] Fix: merge correction

---
 htdocs/modulebuilder/oldskeletons/.gitignore  |   2 -
 htdocs/modulebuilder/oldskeletons/README      |  34 -
 .../oldskeletons/build_api_class.php          | 123 ----
 .../oldskeletons/build_class_from_table.php   | 677 ------------------
 .../build_webservice_from_class.php           | 179 -----
 .../oldskeletons/modMyModule.class.php        | 291 --------
 .../oldskeletons/skeleton_api_class.class.php | 289 --------
 .../oldskeletons/skeleton_card.php            | 604 ----------------
 .../oldskeletons/skeleton_class.class.php     | 606 ----------------
 .../oldskeletons/skeleton_list.php            | 570 ---------------
 .../oldskeletons/skeleton_script.php          | 166 -----
 .../skeleton_webservice_server.php            | 272 -------
 12 files changed, 3813 deletions(-)
 delete mode 100644 htdocs/modulebuilder/oldskeletons/.gitignore
 delete mode 100644 htdocs/modulebuilder/oldskeletons/README
 delete mode 100755 htdocs/modulebuilder/oldskeletons/build_api_class.php
 delete mode 100755 htdocs/modulebuilder/oldskeletons/build_class_from_table.php
 delete mode 100755 htdocs/modulebuilder/oldskeletons/build_webservice_from_class.php
 delete mode 100644 htdocs/modulebuilder/oldskeletons/modMyModule.class.php
 delete mode 100644 htdocs/modulebuilder/oldskeletons/skeleton_api_class.class.php
 delete mode 100644 htdocs/modulebuilder/oldskeletons/skeleton_card.php
 delete mode 100644 htdocs/modulebuilder/oldskeletons/skeleton_class.class.php
 delete mode 100644 htdocs/modulebuilder/oldskeletons/skeleton_list.php
 delete mode 100644 htdocs/modulebuilder/oldskeletons/skeleton_script.php
 delete mode 100644 htdocs/modulebuilder/oldskeletons/skeleton_webservice_server.php

diff --git a/htdocs/modulebuilder/oldskeletons/.gitignore b/htdocs/modulebuilder/oldskeletons/.gitignore
deleted file mode 100644
index 2dda6229d24..00000000000
--- a/htdocs/modulebuilder/oldskeletons/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-out.*
-socpeople*
diff --git a/htdocs/modulebuilder/oldskeletons/README b/htdocs/modulebuilder/oldskeletons/README
deleted file mode 100644
index 5b5b992d91e..00000000000
--- a/htdocs/modulebuilder/oldskeletons/README
+++ /dev/null
@@ -1,34 +0,0 @@
-README (English)
---------------------------------
-This directory contains PHP script samples that can be used to start a development on Dolibarr.
-
-
-*** build_class_from_table.php:
-
-This is the script to use to generate PHP code of a PHP POJO class
-object, a PHP script that use this POJO. This script use the files
-skeleton_*.php to build its generated code. 
-
-
-*** modMyModule.class.php:
-
-Is a sample of module descriptor that you can use if you want to build a new module/plugin for
-Dolibarr.
-
-
-*** skeleton_script.php:
-
-Is a sample you can use as an example if you need to build a script to run on command line
-
-
-*** skeleton_page.php:
-
-Is a sample you can use as an example if you need to build an HTML page to include in Dolibarr GUI.
-
-
-*** skeleton_class.class.php:
-
-Is a sample you can use as an example if you need to build a class file to access a new table required by a Dolibarr development.
-However it is better to run the build_class_from_table.php script that accepts a table name as a parameter and will uses the description table within database and the skeleton_class.class.php file to generate full code for your class file.
-After running this script, the class to access your table (insert a record, update, delete and select) is directly finished and can be used by your module's code. 
-No more coding is needed to get access to table with this script because the file is completely generated once.
diff --git a/htdocs/modulebuilder/oldskeletons/build_api_class.php b/htdocs/modulebuilder/oldskeletons/build_api_class.php
deleted file mode 100755
index 6263eabcd6e..00000000000
--- a/htdocs/modulebuilder/oldskeletons/build_api_class.php
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/usr/bin/env php
-<?php
-/* Copyright (C) 2015   Jean-François Ferry <jfefe@aternatik.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       dev/skeletons/build_api_class.php
- *  \ingroup    core
- *  \brief      Create a complete API class file from existant class file
- */
-
-$sapi_type = php_sapi_name();
-$script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
-
-// Test if batch mode
-if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-    exit;
-}
-
-// Include Dolibarr environment
-require_once($path."../../htdocs/master.inc.php");
-// After this $db is a defined handler to database.
-
-// Main
-$version='1';
-@set_time_limit(0);
-$error=0;
-
-$langs->load("main");
-
-
-print "***** $script_file ($version) *****\n";
-
-
-// -------------------- START OF BUILD_API_FROM_CLASS --------------------
-
-// Check parameters
-if (! isset($argv[1]) && ! isset($argv[2]))
-{
-    print "Usage: $script_file phpClassFile phpClassName\n";
-    exit;
-}
-// Show parameters
-print 'Classfile='.$argv[1]."\n";
-print 'Classname='.$argv[2]."\n";
-
-$classfile=$argv[1];
-$classname=$argv[2];
-$classmin=strtolower($classname);
-$classnameApi = $classname.'Api';
-$property=array();
-$targetcontent='';
-
-// Load the class and read properties
-require_once($classfile);
-
-$property=array();
-$class = new $classname($db);
-$values=get_class_vars($classname);
-
-unset($values['db']);
-unset($values['error']);
-unset($values['errors']);
-unset($values['element']);
-unset($values['table_element']);
-unset($values['table_element_line']);
-unset($values['fk_element']);
-unset($values['ismultientitymanaged']);
-
-// Read skeleton_api_class.class.php file
-$skeletonfile=$path.'skeleton_api_class.class.php';
-$sourcecontent=file_get_contents($skeletonfile);
-if (! $sourcecontent)
-{
-	print "\n";
-	print "Error: Failed to read skeleton sample '".$skeletonfile."'\n";
-	print "Try to run script from skeletons directory.\n";
-	exit;
-}
-
-// Define output variables
-$outfile='out.api_'.$classmin.'.class.php';
-$targetcontent=$sourcecontent;
-
-// Substitute class name
-$targetcontent=preg_replace('/skeleton_api_class\.class\.php/', 'api_'.$classmin.'.class.php', $targetcontent);
-$targetcontent=preg_replace('/skeleton/', $classmin, $targetcontent);
-//$targetcontent=preg_replace('/\$table_element=\'skeleton\'/', '\$table_element=\''.$tablenoprefix.'\'', $targetcontent);
-$targetcontent=preg_replace('/SkeletonApi/', $classnameApi, $targetcontent);
-$targetcontent=preg_replace('/Skeleton/', $classname, $targetcontent);
-
-// Build file
-$fp=fopen($outfile,"w");
-if ($fp)
-{
-	fputs($fp, $targetcontent);
-	fclose($fp);
-	print "\n";
-	print "File '".$outfile."' has been built in current directory.\n";
-}
-else $error++;
-
-
-
-// -------------------- END OF BUILD_CLASS_FROM_TABLE SCRIPT --------------------
-
-print "You can now rename generated files by removing the 'out.' prefix in their name and store them into directory /module/class.\n";
-return $error;
diff --git a/htdocs/modulebuilder/oldskeletons/build_class_from_table.php b/htdocs/modulebuilder/oldskeletons/build_class_from_table.php
deleted file mode 100755
index 0e5a6d82a82..00000000000
--- a/htdocs/modulebuilder/oldskeletons/build_class_from_table.php
+++ /dev/null
@@ -1,677 +0,0 @@
-#!/usr/bin/env php
-<?php
-/* Copyright (C) 2008-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       dev/skeletons/build_class_from_table.php
- *  \ingroup    core
- *  \brief      Create a complete class file from a table in database
- */
-
-$sapi_type = php_sapi_name();
-$script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
-
-// Test if batch mode
-if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-    exit;
-}
-
-// Include Dolibarr environment
-require_once($path."../../htdocs/master.inc.php");
-// After this $db is a defined handler to database.
-
-// Main
-$version='3.2';
-@set_time_limit(0);
-$error=0;
-
-$langs->load("main");
-
-
-print "***** $script_file ($version) *****\n";
-
-
-// -------------------- START OF BUILD_CLASS_FROM_TABLE SCRIPT --------------------
-
-// Check parameters
-if (! isset($argv[1]) || ! isset($argv[2]) || (isset($argv[3]) && ! isset($argv[7])))
-{
-    print "Usage: $script_file tablename modulename [server port databasename user pass]\n";
-    exit;
-}
-
-if (isset($argv[3]) && isset($argv[4]) && isset($argv[5]) && isset($argv[6]) && isset($argv[7]))
-{
-	print 'Use specific database ids'."\n";
-	$db=getDoliDBInstance('mysqli',$argv[3],$argv[6],$argv[7],$argv[5],$argv[4]);
-}
-
-if ($db->type != 'mysql' && $db->type != 'mysqli')
-{
-	print "Error: This script works with mysql or mysqli driver only\n";
-	exit;
-}
-
-$table=$argv[1];
-$module=$argv[2];
-
-// Show parameters
-print 'Tablename: '.$table."\n";
-print 'Modulename: '.$module."\n";
-print "Current dir: ".getcwd()."\n";
-print "Database name: ".$db->database_name."\n";
-
-
-// Define array with list of properties
-$property=array();
-$foundprimary=0;
-$resql=$db->DDLDescTable($table);
-if ($resql)
-{
-	$i=0;
-	while($obj=$db->fetch_object($resql))
-	{
-		//var_dump($obj);
-		$i++;
-		$property[$i]['field']=$obj->Field;
-		if ($obj->Key == 'PRI')
-		{
-			$property[$i]['primary']=1;
-			$foundprimary=1;
-		}
-		else
-		{
-			$property[$i]['primary']=1;
-		}
-		$property[$i]['type'] =$obj->Type;
-		$property[$i]['null'] =$obj->Null;
-		$property[$i]['extra']=$obj->Extra;
-		if ($property[$i]['type'] == 'date'
-			|| $property[$i]['type'] == 'datetime'
-			|| $property[$i]['type'] == 'timestamp')
-		{
-			$property[$i]['istime']=true;
-		}
-		else
-		{
-			$property[$i]['istime']=false;
-		}
-		if (preg_match('/varchar/i',$property[$i]['type'])
-			|| preg_match('/text/i',$property[$i]['type']))
-		{
-			$property[$i]['ischar']=true;
-		}
-		else
-		{
-			$property[$i]['ischar']=false;
-		}
-		if (preg_match('/int/i',$property[$i]['type']))
-		{
-			$property[$i]['isint']=true;
-		}
-		else
-		{
-			$property[$i]['isint']=false;
-		}
-	}
-}
-else
-{
-	print "Error: Failed to get description for table '".$table."'.\n";
-	return false;
-}
-//var_dump($property);
-
-// Define substitute fetch/select parameters
-$varpropselect="\n";
-$cleanparam='';
-$i=0;
-foreach($property as $key => $prop)
-{
-    $i++;
-    if ($prop['field'] != 'rowid')
-    {
-        $varpropselect.="\t\t\$sql .= \" ";
-        $varpropselect.="t.".$prop['field'];
-        if ($i < count($property)) $varpropselect.=",";
-        $varpropselect.="\";";
-        $varpropselect.="\n";
-    }
-}
-
-
-
-//--------------------------------
-// Build skeleton_class.class.php
-//--------------------------------
-
-// Define working variables
-$table=strtolower($table);
-$tablenoprefix=preg_replace('/'.preg_quote(MAIN_DB_PREFIX,'/').'/i','',$table);
-$classname=preg_replace('/_/','',ucfirst($tablenoprefix));
-$classmin=preg_replace('/_/','',strtolower($classname));
-
-
-// Read skeleton_class.class.php file
-$skeletonfile=$path.'skeleton_class.class.php';
-$sourcecontent=file_get_contents($skeletonfile);
-if (! $sourcecontent)
-{
-	print "\n";
-	print "Error: Failed to read skeleton sample '".$skeletonfile."'\n";
-	print "Try to run script from skeletons directory.\n";
-	exit;
-}
-
-// Define output variables
-$outfile=$classmin.'.class.php';
-$targetcontent=$sourcecontent;
-
-// Substitute module name
-$targetcontent=preg_replace('/dev\/skeletons/', $module, $targetcontent);
-$targetcontent=preg_replace('/mymodule othermodule1 othermodule2/', $module, $targetcontent);
-$targetcontent=preg_replace('/mymodule/', $module, $targetcontent);
-
-// Substitute class name
-$targetcontent=preg_replace('/skeleton_class\.class\.php/', $classmin.'.class.php', $targetcontent);
-$targetcontent=preg_replace('/\$element = \'skeleton\'/', '\$element = \''.$classmin.'\'', $targetcontent);
-$targetcontent=preg_replace('/\$table_element = \'skeleton\'/', '\$table_element = \''.$tablenoprefix.'\'', $targetcontent);
-$targetcontent=preg_replace('/Skeleton_Class/', $classname, $targetcontent);
-$targetcontent=preg_replace('/skeletons/', $classmin, $targetcontent);
-$targetcontent=preg_replace('/skeleton/', $classmin, $targetcontent);
-
-// Substitute comments
-$targetcontent=preg_replace('/This file is an example to create a new class file/', 'Put here description of this class', $targetcontent);
-$targetcontent=preg_replace('/\s*\/\/\.\.\./', '', $targetcontent);
-$targetcontent=preg_replace('/Put here some comments/','Initialy built by build_class_from_table on '.strftime('%Y-%m-%d %H:%M',mktime()), $targetcontent);
-
-// Substitute table name
-$targetcontent=preg_replace('/MAIN_DB_PREFIX."mytable/', 'MAIN_DB_PREFIX."'.$tablenoprefix, $targetcontent);
-
-// Substitute declaration parameters
-$varprop="\n";
-$cleanparam='';
-foreach($property as $key => $prop)
-{
-	if ($prop['field'] != 'rowid' && $prop['field'] != 'id')
-	{
-		$varprop.="\tpublic \$".$prop['field'];
-		if ($prop['istime']) $varprop.=" = ''";
-		$varprop.=";";
-		if ($prop['comment']) $varprop.="\t// ".$prop['extra'];
-		$varprop.="\n";
-	}
-}
-$targetcontent=preg_replace('/'.preg_quote('public $prop1;','/').'/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/'.preg_quote('public $prop2;','/').'/', '', $targetcontent);
-
-$targetcontent=preg_replace('/\*((\s|\n|\r|\t)*)\@var mixed Sample property 1((\s|\n|\r|\t)*)/', '', $targetcontent);
-$targetcontent=preg_replace('/\*((\s|\n|\r|\t)*)\@var mixed Sample property 2((\s|\n|\r|\t)*)/', '', $targetcontent);
-
-// Substitute clean parameters
-$varprop="\n";
-$cleanparam='';
-foreach($property as $key => $prop)
-{
-	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-	{
-		$varprop.="\t\tif (isset(\$this->".$prop['field'].")) {\n\t\t\t \$this->".$prop['field']." = trim(\$this->".$prop['field'].");\n\t\t}";
-		$varprop.="\n";
-	}
-}
-$targetcontent=preg_replace('/if \(isset\(\$this->prop1\)\) {((\n|\r|\t)*)\$this->prop1 = trim\(\$this->prop1\);((\n|\r|\t)*)}/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/if \(isset\(\$this->prop2\)\) {((\n|\r|\t)*)\$this->prop2 = trim\(\$this->prop2\);((\n|\r|\t)*)}/', '', $targetcontent);
-
-
-$no_output_field=0;
-foreach($property as $key => $prop)
-{
-	if ($prop['field'] == 'tms') $no_output_field++;	// This is a field of type timestamp edited automatically
-	if ($prop['extra'] == 'auto_increment') $no_output_field++;
-}
-// Substitute insert into parameters
-$varprop="\n";
-$cleanparam='';
-$i=0;
-foreach($property as $key => $prop)
-{
-	$i++;
-	$addfield=1;
-	if ($prop['field'] == 'tms') $addfield=0;	// This is a field of type timestamp edited automatically
-	if ($prop['extra'] == 'auto_increment') $addfield=0;
-
-	if ($addfield)
-	{
-		$varprop.="\t\t\$sql.= '".$prop['field'];
-		if ($i < (count($property)-$no_output_field)) $varprop.=",";
-		$varprop.="';";
-		$varprop.="\n";
-	}
-}
-$targetcontent=preg_replace('/\$sql \.= \' field1,\';/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/\$sql \.= \' field2\';/', '', $targetcontent);
-
-// Substitute insert values parameters
-$varprop="\n";
-$cleanparam='';
-$i=0;
-
-//Count nb field to output to manage commat at end SQL instruction
-
-
-foreach($property as $key => $prop)
-{
-	
-	$addfield=1;
-	if ($prop['field'] == 'tms') $addfield=0;	// This is a field of type timestamp edited automatically
-	if ($prop['extra'] == 'auto_increment') $addfield=0;
-	
-	if ($addfield)
-	{
-		$i++;
-		
-		$varprop.="\t\t\$sql .= ' ";
-		if ($prop['field']=='datec')
-		{
-			$varprop.='\'."\'".$this->db->idate(dol_now())."\'"';
-		}
-		elseif ($prop['istime'])
-		{
-			$varprop.='\'.(! isset($this->'.$prop['field'].') || dol_strlen($this->'.$prop['field'].')==0?\'NULL\':"\'".$this->db->idate(';
-			$varprop.="\$this->".$prop['field'];
-			$varprop.=").\"'\")";
-		}
-		elseif ($prop['ischar'])
-		{
-			$varprop.="'.(! isset(\$this->".$prop['field'].")?'NULL':\"'\".";
-			$varprop.="\$this->db->escape(\$this->".$prop['field'].")";
-			$varprop.=".\"'\")";
-		}
-		elseif ($prop['field']=='fk_user_mod' || $prop['field']=='fk_user_m' ||  $prop['field']=='fk_user_author')
-		{
-			$varprop.="'.\$user->id";
-		}
-		elseif ($prop['isint'])
-		{
-			$varprop.='\'.(! isset($this->'.$prop['field'].')?\'NULL\':';
-			$varprop.="\$this->".$prop['field'];
-			$varprop.=')';
-		}
-		else
-		{
-			$varprop.='\'.(! isset($this->'.$prop['field'].')?\'NULL\':"\'".';
-			$varprop.="\$this->".$prop['field'];
-			$varprop.='."\'")';
-		}
-		
-		if ($i < (count($property)-$no_output_field)) $varprop.=".','";
-		$varprop.=';';
-		$varprop.="\n";
-	}
-}
-
-$patern1='/\$sql \.= \' (.*)\' \. \$this->prop1 \. \'(.*),\';/';
-$patern2='/\$sql \.= \' (.*)\' \. \$this->prop2 \. \'(.*)\';/';
-$targetcontent=preg_replace($patern1, $varprop, $targetcontent);
-$targetcontent=preg_replace($patern2, '', $targetcontent);
-
-// Substitute update values parameters
-
-//Count nb field to output to manage commat at end SQL instruction
-$no_output_field=0;
-foreach($property as $key => $prop)
-{
-	if ($prop['extra'] == 'auto_increment') $no_output_field++;
-}
-
-$varprop="\n";
-$cleanparam='';
-$i=0;
-foreach($property as $key => $prop)
-{
-	
-	$addfield=1;
-	if ($prop['extra'] == 'auto_increment') $addfield=0;
-	
-	if ($addfield)
-	{
-		$i++;
-		
-		$varprop.="\t\t\$sql .= ' ";
-		$varprop.=$prop['field'].' = ';
-		if ($prop['field']=='tms') {
-			$varprop.='\'.(dol_strlen($this->'.$prop['field'].') != 0 ? "\'".$this->db->idate(';
-			$varprop.='$this->'.$prop['field'];
-			$varprop.=')."\'" : "\'".$this->db->idate(dol_now())."\'")';
-		}
-		elseif ($prop['istime'])
-		{
-			$varprop.='\'.(! isset($this->'.$prop['field'].') || dol_strlen($this->'.$prop['field'].') != 0 ? "\'".$this->db->idate(';
-			$varprop.='$this->'.$prop['field'];
-			$varprop.=')."\'" : \'null\')';
-		}
-		
-		elseif ($prop['field']=='fk_user_mod' || $prop['field']=='fk_user_m') {
-			$varprop.="'.\$user->id";
-		}
-		else
-		{
-			$varprop.="'.";
-			if ($prop['ischar']) $varprop.='(isset($this->'.$prop['field'].')?"\'".$this->db->escape($this->'.$prop['field'].')."\'":"null")';
-			elseif ($prop['isint']) $varprop.='(isset($this->'.$prop['field'].')?$this->'.$prop['field'].':"null")';
-			else $varprop.='(isset($this->'.$prop['field'].')?$this->'.$prop['field'].':"null")';
-		}
-
-		if ($i < (count($property)-$no_output_field)) $varprop.=".','";
-		$varprop.=';';
-		$varprop.="\n";
-	}
-}
-$targetcontent=preg_replace('/\$sql \.= " field1=".\(isset\(\$this->field1\)\?"\'".\$this->db->escape\(\$this->field1\)."\'":"null"\).",";/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/\$sql \.= " field2=".\(isset\(\$this->field2\)\?"\'".\$this->db->escape\(\$this->field2\)."\'":"null"\)."";/', '', $targetcontent);
-
-// Substitute fetch/select parameters
-$targetcontent=preg_replace('/\$sql \.= \' t\.field1,\';/', $varpropselect, $targetcontent);
-$targetcontent=preg_replace('/\$sql \.= \' t\.field2\';/', '', $targetcontent);
-
-// Substitute select set parameters
-$varprop="\n";
-$varpropline="\n";
-$cleanparam='';
-$i=0;
-foreach($property as $key => $prop)
-{
-	$i++;
-	if ($prop['field'] != 'rowid' && $prop['field'] != 'id')
-	{
-		$varprop.="\t\t\t\t\$this->".$prop['field']." = ";
-		if ($prop['istime']) $varprop.='$this->db->jdate(';
-		$varprop.='$obj->'.$prop['field'];
-		if ($prop['istime']) $varprop.=')';
-		$varprop.=";";
-		$varprop.="\n";
-		
-		$varpropline.="\t\t\t\t\$line->".$prop['field']." = ";
-		if ($prop['istime']) $varpropline.='$this->db->jdate(';
-		$varpropline.='$obj->'.$prop['field'];
-		if ($prop['istime']) $varpropline.=')';
-		$varpropline.=";";
-		$varpropline.="\n";
-	}
-}
-$targetcontent=preg_replace('/\$this->prop1 = \$obj->field1;/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/\$this->prop2 = \$obj->field2;/', '', $targetcontent);
-
-//Substirute fetchAll
-$targetcontent=preg_replace('/\$line->prop1 = \$obj->field1;/', $varpropline, $targetcontent);
-$targetcontent=preg_replace('/\$line->prop2 = \$obj->field2;/', '', $targetcontent);
-
-
-// Substitute initasspecimen parameters
-$varprop="\n";
-$cleanparam='';
-foreach($property as $key => $prop)
-{
-	if ($prop['field'] != 'rowid' && $prop['field'] != 'id')
-	{
-		$varprop.="\t\t\$this->".$prop['field']." = '';";
-		$varprop.="\n";
-	}
-}
-$targetcontent=preg_replace('/\$this->prop1 = \'prop1\';/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/\$this->prop2 = \'prop2\';/', '', $targetcontent);
-
-// Build file
-$fp=fopen($outfile,"w");
-if ($fp)
-{
-	fputs($fp, $targetcontent);
-	fclose($fp);
-	print "\n";
-	print "File '".$outfile."' has been built in current directory.\n";
-}
-else $error++;
-
-
-
-//--------------------------------------------------------------------
-// Build skeleton_script.php, skeleton_list.php and skeleton_card.php
-//--------------------------------------------------------------------
-
-$skeletonfiles=array(
-    $path.'skeleton_script.php' => $classmin.'_script.php', 
-    $path.'skeleton_list.php' => $classmin.'_list.php', 
-    $path.'skeleton_card.php' => $classmin.'_card.php'
-    );
-    
-foreach ($skeletonfiles as $skeletonfile => $outfile)
-{
-    $sourcecontent=file_get_contents($skeletonfile);
-    if (! $sourcecontent)
-    {
-    	print "\n";
-    	print "Error: Failed to read skeleton sample '".$skeletonfile."'\n";
-    	print "Try to run script from skeletons directory.\n";
-    	exit;
-    }
-    
-    // Define output variables
-    $targetcontent=$sourcecontent;
-    
-    // Substitute module name
-    $targetcontent=preg_replace('/dev\/skeletons/', $module, $targetcontent);
-    $targetcontent=preg_replace('/mymodule othermodule1 othermodule2/', $module, $targetcontent);
-    $targetcontent=preg_replace('/mymodule/', $module, $targetcontent);
-    
-    // Substitute class name
-    $targetcontent=preg_replace('/skeleton_class\.class\.php/', $classmin.'.class.php', $targetcontent);
-    $targetcontent=preg_replace('/skeleton_script\.php/', $classmin.'_script.php', $targetcontent);
-    $targetcontent=preg_replace('/\$element = \'skeleton\'/', '\$element=\''.$classmin.'\'', $targetcontent);
-    $targetcontent=preg_replace('/\$table_element = \'skeleton\'/', '\$table_element=\''.$classmin.'\'', $targetcontent);
-    $targetcontent=preg_replace('/Skeleton_Class/', $classname, $targetcontent);
-    $targetcontent=preg_replace('/skeletons/', $classmin, $targetcontent);
-    $targetcontent=preg_replace('/skeleton/', $classmin, $targetcontent);
-    
-    // Substitute comments
-    $targetcontent=preg_replace('/This file is an example to create a new class file/', 'Put here description of this class', $targetcontent);
-    $targetcontent=preg_replace('/\s*\/\/\.\.\./', '', $targetcontent);
-    $targetcontent=preg_replace('/Put here some comments/','Initialy built by build_class_from_table on '.strftime('%Y-%m-%d %H:%M',mktime()), $targetcontent);
-    
-    // Substitute table name
-    $targetcontent=preg_replace('/MAIN_DB_PREFIX."mytable/', 'MAIN_DB_PREFIX."'.$tablenoprefix, $targetcontent);
-        
-    // Substitute GETPOST search_fieldx
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    if ($prop['isint']) $varprop.='$search_'.$prop['field']."=GETPOST('search_".$prop['field']."','int');\n";
-    	    else $varprop.='$search_'.$prop['field']."=GETPOST('search_".$prop['field']."','alpha');\n";
-    	}
-    }
-    $targetcontent=preg_replace('/'.preg_quote('$search_field1=GETPOST("search_field1");','/').'/', $varprop, $targetcontent);
-    $targetcontent=preg_replace('/'.preg_quote('$search_field2=GETPOST("search_field2");','/').'/', '', $targetcontent);
-    
-    // Substitute GETPOST fieldx
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    if ($prop['isint']) $varprop.="\t\$object->".$prop['field']."=GETPOST('".$prop['field']."','int');\n";
-    	    else $varprop.="\t\$object->".$prop['field']."=GETPOST('".$prop['field']."','alpha');\n";
-    	}
-    }
-    $targetcontent=preg_replace('/'.preg_quote('$object->prop1=GETPOST("field1");','/').'/', $varprop, $targetcontent);
-    $targetcontent=preg_replace('/'.preg_quote('$object->prop2=GETPOST("field2");','/').'/', '', $targetcontent);
-    
-    // Substitute reset search_field = '';
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.='$search_'.$prop['field']."='';\n";
-    	}
-    }
-    $targetcontent=preg_replace('/'.preg_quote('$search_field1=\'\';','/').'/', $varprop, $targetcontent);
-    $targetcontent=preg_replace('/'.preg_quote('$search_field2=\'\';','/').'/', '', $targetcontent);
-    
-    // Substitute fetch/select parameters
-    $targetcontent=preg_replace('/\$sql\s*\.= " t\.field1,";/', $varpropselect, $targetcontent);
-    $targetcontent=preg_replace('/\$sql\s*\.= " t\.field2";/', '', $targetcontent);
-    
-    // Substitute where for search
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.='if ($search_'.$prop['field'].') $sql.= natural_search("'.$prop['field'].'",$search_'.$prop['field'].');'."\n";
-    	}
-    }
-    $targetcontent=preg_replace('/'.preg_quote('if ($search_field1) $sql.= natural_search("field1",$search_field1);','/').'/', $varprop, $targetcontent);
-    $targetcontent=preg_replace('/'.preg_quote('if ($search_field2) $sql.= natural_search("field2",$search_field2);','/').'/', '', $targetcontent);
-    
-    // substitute $params.=
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.="if (\$search_".$prop['field']." != '') \$params.= '&amp;search_".$prop['field']."='.urlencode(\$search_".$prop['field'].");\n";
-    	}
-    }
-    $targetcontent=preg_replace('/'.preg_quote("if (\$search_field1 != '') \$params.= '&amp;search_field1='.urlencode(\$search_field1);",'/').'/', $varprop, $targetcontent);
-    $targetcontent=preg_replace('/'.preg_quote("if (\$search_field2 != '') \$params.= '&amp;search_field2='.urlencode(\$search_field2);",'/').'/', '', $targetcontent);
-    
-    // Substitute arrayfields
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.="'t.".$prop['field']."'=>array('label'=>\$langs->trans(\"Field".$prop['field']."\"), 'checked'=>1),\n";
-    	}
-    }
-    $targetcontent=preg_replace('/'.preg_quote("'t.field1'=>array('label'=>\$langs->trans(\"Field1\"), 'checked'=>1),",'/').'/', $varprop, $targetcontent);
-    $targetcontent=preg_replace('/'.preg_quote("'t.field2'=>array('label'=>\$langs->trans(\"Field2\"), 'checked'=>1),",'/').'/', '', $targetcontent);
-    
-    // Substitute print_liste_field_titre
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.="if (! empty(\$arrayfields['t.".$prop['field']."']['checked'])) print_liste_field_titre(\$arrayfields['t.".$prop['field']."']['label'],\$_SERVER['PHP_SELF'],'t.".$prop['field']."','',\$params,'',\$sortfield,\$sortorder);\n";
-    	}
-    }
-    $targetcontent=preg_replace('/LIST_OF_TD_TITLE_FIELDS/', $varprop, $targetcontent);
-    
-    // Substitute fields title search
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.="if (! empty(\$arrayfields['t.".$prop['field']."']['checked'])) print '<td class=\"liste_titre\"><input type=\"text\" class=\"flat\" name=\"search_".$prop['field']."\" value=\"'.\$search_".$prop['field'].".'\" size=\"10\"></td>';\n";
-    	}
-    }
-    $targetcontent=preg_replace('/LIST_OF_TD_TITLE_SEARCH/', $varprop, $targetcontent);
-    
-    // Substitute where for <td>.fieldx.</td>
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.="if (! empty(\$arrayfields['t.".$prop['field']."']['checked'])) print '<td>'.\$obj->".$prop['field'].".'</td>';\n";
-    	}
-    }
-    $targetcontent=preg_replace('/'.preg_quote("if (! empty(\$arrayfields['t.field1']['checked'])) print '<td>'.\$obj->field1.'</td>';",'/').'/', $varprop, $targetcontent);
-    $targetcontent=preg_replace('/'.preg_quote("if (! empty(\$arrayfields['t.field2']['checked'])) print '<td>'.\$obj->field2.'</td>';",'/').'/', '', $targetcontent);
-
-    // LIST_OF_TD_LABEL_FIELDS_CREATE - List of td for card view 
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.="print '<tr><td class=\"fieldrequired\">'.\$langs->trans(\"Field".$prop['field']."\").'</td><td><input class=\"flat\" type=\"text\" name=\"".$prop['field']."\" value=\"'.GETPOST('".$prop['field']."').'\"></td></tr>';\n";
-    	}
-    }
-    $targetcontent=preg_replace('/LIST_OF_TD_LABEL_FIELDS_CREATE/', $varprop, $targetcontent);
-
-    // LIST_OF_TD_LABEL_FIELDS_EDIT - List of td for card view 
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-            $baseString = 'print "<tr><td class=\"fieldrequired\">".\$langs->trans("Field%s")."</td><td><input class=\"flat\" type=\"text\" name=\"%s\" value=\"".$object->%s."\"></td></tr>";';
-            $varprop.= sprintf("\t ".$baseString." \n", $prop['field'], $prop['field'], $prop['field']);
-    	}
-    }
-    $targetcontent=preg_replace('/LIST_OF_TD_LABEL_FIELDS_EDIT/', $varprop, $targetcontent);
-    
-    // LIST_OF_TD_LABEL_FIELDS_VIEW - List of td for card view 
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.=sprintf("\t print '<tr><td class=\"fieldrequired\">'.\$langs->trans(\"Field%s\").'</td><td>'.\$object->%s.'</td></tr>';\n",$prop['field'],$prop['field']);
-    	}
-    }
-    $targetcontent=preg_replace('/LIST_OF_TD_LABEL_FIELDS_VIEW/', $varprop, $targetcontent);
-    
-    
-    // LIST_OF_TD_FIELDS_LIST
-    
-    
-    
-    // Build file
-    $fp=fopen($outfile,"w");
-    if ($fp)
-    {
-    	fputs($fp, $targetcontent);
-    	fclose($fp);
-    	print "File '".$outfile."' has been built in current directory.\n";
-    }
-    else $error++;
-}
-
-
-// -------------------- END OF BUILD_CLASS_FROM_TABLE SCRIPT --------------------
-
-print "You can now move generated files to store them into directory /yourmodule/class (for .class.php file) or /yourmodule.\n";
-return $error;
diff --git a/htdocs/modulebuilder/oldskeletons/build_webservice_from_class.php b/htdocs/modulebuilder/oldskeletons/build_webservice_from_class.php
deleted file mode 100755
index c91347a424d..00000000000
--- a/htdocs/modulebuilder/oldskeletons/build_webservice_from_class.php
+++ /dev/null
@@ -1,179 +0,0 @@
-#!/usr/bin/env php
-<?php
-/* Copyright (C) 2009 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       dev/skeletons/build_webservice_from_class.php
- *  \ingroup    core
- *  \brief      Create a complete webservice file from CRUD functions of a PHP class
- */
-
-$sapi_type = php_sapi_name();
-$script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
-
-// Test if batch mode
-if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-    exit;
-}
-
-// Include Dolibarr environment
-require_once($path."../../htdocs/master.inc.php");
-// After this $db is a defined handler to database.
-
-// Main
-$version='1.8';
-@set_time_limit(0);
-$error=0;
-
-$langs->load("main");
-
-
-print "***** $script_file ($version) *****\n";
-
-
-// -------------------- START OF BUILD_CLASS_FROM_TABLE SCRIPT --------------------
-
-// Check parameters
-if (! isset($argv[1]) && ! isset($argv[2]))
-{
-    print "Usage: $script_file phpClassFile phpClassName\n";
-    exit;
-}
-
-// Show parameters
-print 'Classfile='.$argv[1]."\n";
-print 'Classname='.$argv[2]."\n";
-
-$classfile=$argv[1];
-$classname=$argv[2];
-$classmin=strtolower($classname);
-$property=array();
-$targetcontent='';
-
-// Load the class and read properties
-require_once($classfile);
-
-$property=array();
-$class = new $classname($db);
-$values=get_class_vars($classname);
-
-unset($values['db']);
-unset($values['error']);
-unset($values['errors']);
-unset($values['element']);
-unset($values['table_element']);
-unset($values['table_element_line']);
-unset($values['fk_element']);
-unset($values['ismultientitymanaged']);
-
-$properties=array_keys($values);
-
-// Read skeleton_class.class.php file
-$skeletonfile='skeleton_webservice_server.php';
-$sourcecontent=file_get_contents($skeletonfile);
-if (! $sourcecontent)
-{
-	print "\n";
-	print "Error: Failed to read skeleton sample '".$skeletonfile."'\n";
-	print "Try to run script from skeletons directory.\n";
-	exit;
-}
-
-// Define output variables
-$outfile='out.server_'.$classmin.'.php';
-$targetcontent=$sourcecontent;
-
-
-
-// Substitute class name
-$targetcontent=preg_replace('/Skeleton/', $classname, $targetcontent);
-$targetcontent=preg_replace('/skeleton/', $classmin, $targetcontent);
-
-// Substitute declaration parameters
-$varprop="\n";
-$cleanparam='';
-$i=0;
-
-while($i<count($properties))
-{
-		$varprop.="'".$properties[$i]."' => array('name'=>'".$properties[$i]."','type'=>'xsd:string')";
-		$i++;
-
-		if ($i == count($properties))
-			$varprop.="\n";
-		else
-			$varprop.=",\n";
-}
-
-$targetcontent=preg_replace('/\'prop1\'=>\'xxx\',/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/\'prop2\'=>\'xxx\',/', '', $targetcontent);
-// Substitute get method parameters
-$varprop="\n";
-$cleanparam='';
-$i=0;
-
-while($i<count($properties))
-{
-		$varprop.="'".$properties[$i]."' => $".$classmin."->".$properties[$i];
-
-		$i++;
-		if ($i == count($properties))
-			$varprop.="\n";
-		else
-			$varprop.=",\n";
-}
-
-$targetcontent=preg_replace('/\'prop1\'=>\$'.$classmin.'->prop1,/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/\'prop2\'=>\$'.$classmin.'->prop2,/', '', $targetcontent);
-
-// Substitute get method parameters
-$varprop="\n\t\t";
-$cleanparam='';
-$i=0;
-
-while($i<count($properties))
-{
-
-	$varprop.='$newobject->'.$properties[$i].'=$'.$classmin.'->'.$properties[$i].';';
-
-	$i++;
-	if ($i == count($properties))
-		$varprop.="\n";
-	else
-		$varprop.="\n\t\t";
-}
-$targetcontent=preg_replace('/\$newobject->prop1=\$'.$classmin.'->prop1;/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/\$newobject->prop2=\$'.$classmin.'->prop2;/', '', $targetcontent);
-
-
-
-// Build file
-$fp=fopen($outfile,"w");
-if ($fp)
-{
-	fputs($fp, $targetcontent);
-	fclose($fp);
-	print "File '".$outfile."' has been built in current directory.\n";
-}
-else $error++;
-
-// -------------------- END OF BUILD_CLASS_FROM_TABLE SCRIPT --------------------
-
-print "You must rename files by removing the 'out.' prefix in their name.\n";
-return $error;
diff --git a/htdocs/modulebuilder/oldskeletons/modMyModule.class.php b/htdocs/modulebuilder/oldskeletons/modMyModule.class.php
deleted file mode 100644
index 4f994c7c654..00000000000
--- a/htdocs/modulebuilder/oldskeletons/modMyModule.class.php
+++ /dev/null
@@ -1,291 +0,0 @@
-<?php
-/* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2016 Regis Houssin        <regis.houssin@capnetworks.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/>.
- */
-
-/**
- * 	\defgroup   mymodule     Module MyModule
- *  \brief      Example of a module descriptor.
- *				Such a file must be copied into htdocs/mymodule/core/modules directory.
- *  \file       htdocs/mymodule/core/modules/modMyModule.class.php
- *  \ingroup    mymodule
- *  \brief      Description and activation file for module MyModule
- */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
-
-
-/**
- *  Description and activation class for module MyModule
- */
-class modMyModule extends DolibarrModules
-{
-	/**
-	 * Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 * @param DoliDB $db Database handler
-	 */
-	public function __construct($db)
-	{
-        global $langs,$conf;
-
-        $this->db = $db;
-
-		// Id for module (must be unique).
-		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
-		$this->numero = 500000;		// TODO Go on page http://wiki.dolibarr.org/index.php/List_of_modules_id to reserve id number for your module
-		// Key text used to identify module (for permissions, menus, etc...)
-		$this->rights_class = 'mymodule';
-
-		// Family can be 'crm','financial','hr','projects','products','ecm','technic','interface','other'
-		// It is used to group modules by family in module setup page
-		$this->family = "other";
-		// Module position in the family
-		$this->module_position = 500;
-		// 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' => '001', 'label' => $langs->trans("MyOwnFamily")));
-
-		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
-		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
-		$this->description = "Description of module MyModule";
-		$this->descriptionlong = "A very long description. Can be a full HTML content";
-		$this->editor_name = 'Editor name';
-		$this->editor_url = 'https://www.dolibarr.org';
-		
-		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
-		$this->version = '1.0';
-		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		// Name of image file used for this module.
-		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
-		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-		$this->picto='generic';
-
-		// Defined all module parts (triggers, login, substitutions, menus, css, etc...)
-		// for default path (eg: /mymodule/core/xxxxx) (0=disable, 1=enable)
-		// for specific path of parts (eg: /mymodule/core/modules/barcode)
-		// for specific css file (eg: /mymodule/css/mymodule.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 directory (core/login)
-		//							'substitutions' => 0,                            	// Set this to 1 if module has its own substitution function file (core/substitutions)
-		//							'menus' => 0,                                    	// Set this to 1 if module has its own menus handler directory (core/menus)
-		//							'theme' => 0,                                    	// Set this to 1 if module has its own theme directory (theme)
-		//                        	'tpl' => 0,                                      	// Set this to 1 if module overwrite template dir (core/tpl)
-		//							'barcode' => 0,                                  	// Set this to 1 if module has its own barcode directory (core/modules/barcode)
-		//							'models' => 0,                                   	// Set this to 1 if module has its own models directory (core/modules/xxx)
-		//							'css' => array('/mymodule/css/mymodule.css.php'),	// Set this to relative path of css file if module has its own css file
-	 	//							'js' => array('/mymodule/js/mymodule.js'),          // Set this to relative path of js file if module must load a js on all pages
-		//							'hooks' => array('hookcontext1','hookcontext2',...) // Set here all hooks context managed by module. You can also set hook context 'all'
-		//							'dir' => array('output' => 'othermodulename'),      // To force the default directories names
-		//							'workflow' => array('WORKFLOW_MODULE1_YOURACTIONTYPE_MODULE2'=>array('enabled'=>'! empty($conf->module1->enabled) && ! empty($conf->module2->enabled)', 'picto'=>'yourpicto@mymodule')) // Set here all workflow context managed by module
-		//                        );
-		$this->module_parts = array();
-
-		// Data directories to create when module is enabled.
-		// Example: this->dirs = array("/mymodule/temp");
-		$this->dirs = array();
-
-		// Config pages. Put here list of php page, stored into mymodule/admin directory, to use to setup module.
-		$this->config_page_url = array("mysetuppage.php@mymodule");
-
-		// 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->phpmin = array(5,0);					// Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
-		$this->langfiles = array("mylangfile@mymodule");
-
-		// 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('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
-		//                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
-		// );
-		$this->const = array();
-
-		// Array to add new pages in new tabs
-		// Example: $this->tabs = array('objecttype:+tabname1:Title1:mylangfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__',  					// To add a new tab identified by code tabname1
-        //                              'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@mymodule:$user->rights->othermodule->read:/mymodule/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.
-        //                              'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
-		// where objecttype can be
-		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
-		// 'contact'          to add a tab in contact view
-		// 'contract'         to add a tab in contract view
-		// 'group'            to add a tab in group view
-		// 'intervention'     to add a tab in intervention view
-		// 'invoice'          to add a tab in customer invoice view
-		// 'invoice_supplier' to add a tab in supplier invoice view
-		// 'member'           to add a tab in fundation member view
-		// 'opensurveypoll'	  to add a tab in opensurvey poll view
-		// 'order'            to add a tab in customer order view
-		// 'order_supplier'   to add a tab in supplier order view
-		// 'payment'		  to add a tab in payment view
-		// 'payment_supplier' to add a tab in supplier payment view
-		// 'product'          to add a tab in product view
-		// 'propal'           to add a tab in propal view
-		// 'project'          to add a tab in project view
-		// 'stock'            to add a tab in stock view
-		// 'thirdparty'       to add a tab in third party view
-		// 'user'             to add a tab in user view
-        $this->tabs = array();
-
-		if (! isset($conf->mymodule) || ! isset($conf->mymodule->enabled))
-        {
-        	$conf->mymodule=new stdClass();
-        	$conf->mymodule->enabled=0;
-        }
-        
-        // Dictionaries
-		$this->dictionaries=array();
-        /* Example:
-        $this->dictionaries=array(
-            'langs'=>'mylangfile@mymodule',
-            'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),		// List of tables we want to see into dictonnary editor
-            'tablib'=>array("Table1","Table2","Table3"),													// Label of tables
-            'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),	// Request to select fields
-            'tabsqlsort'=>array("label ASC","label ASC","label ASC"),																					// Sort order
-            'tabfield'=>array("code,label","code,label","code,label"),																					// List of fields (result of select to show dictionary)
-            'tabfieldvalue'=>array("code,label","code,label","code,label"),																				// List of fields (list of fields to edit a record)
-            'tabfieldinsert'=>array("code,label","code,label","code,label"),																			// List of fields (list of fields for insert)
-            'tabrowid'=>array("rowid","rowid","rowid"),																									// Name of columns with primary key (try to always name it 'rowid')
-            'tabcond'=>array($conf->mymodule->enabled,$conf->mymodule->enabled,$conf->mymodule->enabled)												// Condition to show each dictionary
-        );
-        */
-
-        // Boxes
-		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
-        $this->boxes = array();			// List of boxes
-		// Example:
-		//$this->boxes=array(
-		//    0=>array('file'=>'myboxa.php@mymodule','note'=>'','enabledbydefaulton'=>'Home'),
-		//    1=>array('file'=>'myboxb.php@mymodule','note'=>''),
-		//    2=>array('file'=>'myboxc.php@mymodule','note'=>'')
-		//);
-
-		// Cronjobs
-		$this->cronjobs = array();			// List of cron jobs entries to add
-		// Example: $this->cronjobs=array(0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'test'=>true),
-		//                                1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'test'=>true)
-		// );
-
-		// Permissions
-		$this->rights = array();		// Permission array used by this module
-		$r=0;
-
-		// Add here list of permission defined by an id, a label, a boolean and two constant strings.
-		// Example:
-		// $this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
-		// $this->rights[$r][1] = 'Permision label';	// Permission label
-		// $this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
-		// $this->rights[$r][4] = 'level1';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		// $this->rights[$r][5] = 'level2';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		// $r++;
-
-		// Main menu entries
-		$this->menu = array();			// List of menus to add
-		$r=0;
-
-		// Add here entries to declare new menus
-		//
-		// Example to declare a new Top Menu entry and its Left menu entry:
-		// $this->menu[$r]=array(	'fk_menu'=>'',			                // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-		//							'type'=>'top',			                // This is a Top menu entry
-		//							'titre'=>'MyModule top menu',
-		//							'mainmenu'=>'mymodule',
-		//							'leftmenu'=>'mymodule',
-		//							'url'=>'/mymodule/pagetop.php',
-		//							'langs'=>'mylangfile@mymodule',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-		//							'position'=>100,
-		//							'enabled'=>'$conf->mymodule->enabled',	// Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled.
-		//							'perms'=>'1',			                // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
-		//							'target'=>'',
-		//							'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
-		// $r++;
-		//
-		// Example to declare a Left Menu entry into an existing Top menu entry:
-		// $this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=xxx',		    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-		//							'type'=>'left',			                // This is a Left menu entry
-		//							'titre'=>'MyModule left menu',
-		//							'mainmenu'=>'xxx',
-		//							'leftmenu'=>'mymodule',
-		//							'url'=>'/mymodule/pagelevel2.php',
-		//							'langs'=>'mylangfile@mymodule',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-		//							'position'=>100,
-		//							'enabled'=>'$conf->mymodule->enabled',  // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-		//							'perms'=>'1',			                // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
-		//							'target'=>'',
-		//							'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
-		// $r++;
-
-
-		// Exports
-		$r=1;
-
-		// Example:
-		// $this->export_code[$r]=$this->rights_class.'_'.$r;
-		// $this->export_label[$r]='MyModule';	// Translation key (used only if key ExportDataset_xxx_z not found)
-        // $this->export_enabled[$r]='1';                               // Condition to show export in list (ie: '$user->id==3'). Set to 1 to always show when module is enabled.
-        // $this->export_icon[$r]='generic:MyModule';					// Put here code of icon then string for translation key of module name
-		// $this->export_permission[$r]=array(array("mymodule","level1","level2"));
-		// $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','s.fk_pays'=>'Country','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','f.rowid'=>"InvoiceId",'f.facnumber'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note'=>"InvoiceNote",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.price'=>"LineUnitPrice",'fd.tva_tx'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",'fd.total_tva'=>"LineTotalTVA",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",'fd.date_end'=>"DateEnd",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef');
-		// $this->export_TypeFields_array[$r]=array('t.date'=>'Date', 't.qte'=>'Numeric', 't.poids'=>'Numeric', 't.fad'=>'Numeric', 't.paq'=>'Numeric', 't.stockage'=>'Numeric', 't.fadparliv'=>'Numeric', 't.livau100'=>'Numeric', 't.forfait'=>'Numeric', 's.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text','f.facnumber'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.date_lim_reglement'=>"Date",'f.total'=>"Numeric",'f.total_ttc'=>"Numeric",'f.tva'=>"Numeric",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_private'=>"Text",'f.note_public'=>"Text",'fd.description'=>"Text",'fd.subprice'=>"Numeric",'fd.tva_tx'=>"Numeric",'fd.qty'=>"Numeric",'fd.total_ht'=>"Numeric",'fd.total_tva'=>"Numeric",'fd.total_ttc'=>"Numeric",'fd.date_start'=>"Date",'fd.date_end'=>"Date",'fd.special_code'=>'Numeric','fd.product_type'=>"Numeric",'fd.fk_product'=>'List:product:label','p.ref'=>'Text','p.label'=>'Text','p.accountancy_code_sell'=>'Text');
-		// $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','s.fk_pays'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company','f.rowid'=>"invoice",'f.facnumber'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",'fd.price'=>"invoice_line",'fd.total_ht'=>"invoice_line",'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_tx'=>"invoice_line",'fd.qty'=>"invoice_line",'fd.date_start'=>"invoice_line",'fd.date_end'=>"invoice_line",'fd.fk_product'=>'product','p.ref'=>'product');
-		// $this->export_dependencies_array[$r]=array('invoice_line'=>'fd.rowid','product'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
-		// $this->export_sql_start[$r]='SELECT DISTINCT ';
-		// $this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facturedet as fd, '.MAIN_DB_PREFIX.'societe as s)';
-		// $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
-		// $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
-		// $this->export_sql_order[$r] .=' ORDER BY s.nom';
-		// $r++;
-	}
-
-	/**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-	 */
-	public function init($options='')
-	{
-		$sql = array();
-
-		//$this->_load_tables('/mymodule/sql/');
-
-		return $this->_init($sql, $options);
-	}
-
-	/**
-	 * Function called when module is disabled.
-	 * Remove from database constants, boxes and permissions from Dolibarr database.
-	 * Data directories are not deleted
-	 *
-	 * @param      string	$options    Options when enabling module ('', 'noboxes')
-	 * @return     int             	1 if OK, 0 if KO
-	 */
-	public function remove($options = '')
-	{
-		$sql = array();
-
-		return $this->_remove($sql, $options);
-	}
-
-}
-
diff --git a/htdocs/modulebuilder/oldskeletons/skeleton_api_class.class.php b/htdocs/modulebuilder/oldskeletons/skeleton_api_class.class.php
deleted file mode 100644
index 97224b64da9..00000000000
--- a/htdocs/modulebuilder/oldskeletons/skeleton_api_class.class.php
+++ /dev/null
@@ -1,289 +0,0 @@
-<?php
-/* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
- use Luracast\Restler\RestException;
-
-
-/**
- * API class for skeleton object
- *
- * @smart-auto-routing false
- * @access protected 
- * @class  DolibarrApiAccess {@requires user,external}
- * 
- *
- */
-class SkeletonApi extends DolibarrApi
-{
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object 
-     */
-    static $FIELDS = array(
-        'name'
-    );
-
-    /**
-     * @var Skeleton $skeleton {@type Skeleton}
-     */
-    public $skeleton;
-
-    /**
-     * Constructor
-     *
-     * @url     GET skeleton/
-     * 
-     */
-    function __construct()
-    {
-		global $db, $conf;
-		$this->db = $db;
-        $this->skeleton = new Skeleton($this->db);
-    }
-
-    /**
-     * Get properties of a skeleton object
-     *
-     * Return an array with skeleton informations
-     *
-     * @param 	int 	$id ID of skeleton
-     * @return 	array|mixed data without useless information
-	 * 
-     * @url	GET skeleton/{id}
-     * @throws 	RestException
-     */
-    function get($id)
-    {		
-		if(! DolibarrApiAccess::$user->rights->skeleton->read) {
-			throw new RestException(401);
-		}
-			
-        $result = $this->skeleton->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'Skeleton not found');
-        }
-		
-		if( ! DolibarrApi::_checkAccessToResource('skeleton',$this->skeleton->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		return $this->_cleanObjectDatas($this->skeleton);
-    }
-
-    /**
-     * List skeletons
-     * 
-     * Get a list of skeletons
-     * 
-     * @param int		$mode		Use this param to filter list
-     * @param string	$sortfield	Sort field
-     * @param string	$sortorder	Sort order
-     * @param int		$limit		Limit for list
-     * @param int		$page		Page number
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101') or (t.import_key:=:'20160101')"
-     * @return array Array of skeleton objects
-     *
-     * @url	GET /skeletons/
-     */
-    function index($mode, $sortfield = "t.rowid", $sortorder = 'ASC', $limit = 0, $page = 0, $sqlfilters = '') {
-        global $db, $conf;
-        
-        $obj_ret = array();
-        
-        $socid = DolibarrApiAccess::$user->societe_id ? DolibarrApiAccess::$user->societe_id : '';
-            
-        // If the internal user must only see his customers, force searching by him
-        if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
-
-        $sql = "SELECT s.rowid";
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-        $sql.= " FROM ".MAIN_DB_PREFIX."skeleton as s";
-        
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
-        $sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
-        $sql.= " WHERE s.fk_stcomm = st.id";
-        
-		// Example of use $mode
-        //if ($mode == 1) $sql.= " AND s.client IN (1, 3)";
-        //if ($mode == 2) $sql.= " AND s.client IN (2, 3)";
-
-        $sql.= ' AND s.entity IN ('.getEntity('skeleton').')';
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND s.fk_soc = sc.fk_soc";
-        if ($socid) $sql.= " AND s.fk_soc = ".$socid;
-        if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
-        // Insert sale filter
-        if ($search_sale > 0)
-        {
-            $sql .= " AND sc.fk_user = ".$search_sale;
-        }
-        if ($sqlfilters)
-        {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-        $sql.= $db->order($sortfield, $sortorder);
-        if ($limit)	{
-            if ($page < 0)
-            {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql.= $db->plimit($limit + 1, $offset);
-        }
-
-        $result = $db->query($sql);
-        if ($result)
-        {
-            $num = $db->num_rows($result);
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($result);
-                $skeleton_static = new Skeleton($db);
-                if($skeleton_static->fetch($obj->rowid)) {
-                    $obj_ret[] = parent::_cleanObjectDatas($skeleton_static);
-                }
-                $i++;
-            }
-        }
-        else {
-            throw new RestException(503, 'Error when retrieve skeleton list');
-        }
-        if( ! count($obj_ret)) {
-            throw new RestException(404, 'No skeleton found');
-        }
-		return $obj_ret;
-    }
-    
-    /**
-     * Create skeleton object
-     *
-     * @param array $request_data   Request datas
-     * @return int  ID of skeleton
-     * 
-     * @url	POST skeleton/
-     */
-    function post($request_data = NULL)
-    {
-        if(! DolibarrApiAccess::$user->rights->skeleton->create) {
-			throw new RestException(401);
-		}
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
-        
-        foreach($request_data as $field => $value) {
-            $this->skeleton->$field = $value;
-        }
-        if( ! $this->skeleton->create(DolibarrApiAccess::$user)) {
-            throw new RestException(500);
-        }
-        return $this->skeleton->id;
-    }
-
-    /**
-     * Update skeleton
-     *
-     * @param int   $id             Id of skeleton to update
-     * @param array $request_data   Datas   
-     * @return int 
-     * 
-     * @url	PUT skeleton/{id}
-     */
-    function put($id, $request_data = NULL)
-    {
-        if(! DolibarrApiAccess::$user->rights->skeleton->create) {
-			throw new RestException(401);
-		}
-        
-        $result = $this->skeleton->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'Skeleton not found');
-        }
-		
-		if( ! DolibarrApi::_checkAccessToResource('skeleton',$this->skeleton->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-        foreach($request_data as $field => $value) {
-            $this->skeleton->$field = $value;
-        }
-        
-        if($this->skeleton->update($id, DolibarrApiAccess::$user))
-            return $this->get ($id);
-        
-        return false;
-    }
-    
-    /**
-     * Delete skeleton
-     *
-     * @param   int     $id   Skeleton ID
-     * @return  array
-     * 
-     * @url	DELETE skeleton/{id}
-     */
-    function delete($id)
-    {
-        if(! DolibarrApiAccess::$user->rights->skeleton->supprimer) {
-			throw new RestException(401);
-		}
-        $result = $this->skeleton->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'Skeleton not found');
-        }
-		
-		if( ! DolibarrApi::_checkAccessToResource('skeleton',$this->skeleton->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-        
-        if( !$this->skeleton->delete($id))
-        {
-            throw new RestException(500);
-        }
-        
-         return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Skeleton deleted'
-            )
-        );
-        
-    }
-    
-    /**
-     * Validate fields before create or update object
-     * 
-     * @param array $data   Data to validate
-     * @return array
-     * 
-     * @throws RestException
-     */
-    function _validate($data)
-    {
-        $skeleton = array();
-        foreach (SkeletonApi::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $skeleton[$field] = $data[$field];
-        }
-        return $skeleton;
-    }
-}
diff --git a/htdocs/modulebuilder/oldskeletons/skeleton_card.php b/htdocs/modulebuilder/oldskeletons/skeleton_card.php
deleted file mode 100644
index 49683af79c8..00000000000
--- a/htdocs/modulebuilder/oldskeletons/skeleton_card.php
+++ /dev/null
@@ -1,604 +0,0 @@
-<?php
-/* Copyright (C) 2007-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) ---Put here your own copyright and developer email---
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *   	\file       dev/skeletons/skeleton_card.php
- *		\ingroup    mymodule othermodule1 othermodule2
- *		\brief      This file is an example of a php page
- *					Put here some comments
- */
-
-//if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
-//if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
-//if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-//if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');			// Do not check anti CSRF attack test
-//if (! defined('NOSTYLECHECK'))   define('NOSTYLECHECK','1');			// Do not check style html tag into posted data
-//if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');		// Do not check anti POST attack test
-//if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');			// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');			// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-//if (! defined("NOLOGIN"))        define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
-
-// Change this following line to use the correct relative path (../, ../../, etc)
-$res=0;
-if (! $res && file_exists("../main.inc.php")) $res=@include '../main.inc.php';					// to work if your module directory is into dolibarr root htdocs directory
-if (! $res && file_exists("../../main.inc.php")) $res=@include '../../main.inc.php';			// to work if your module directory is into a subdir of root htdocs directory
-if (! $res && file_exists("../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../dolibarr/htdocs/main.inc.php';     // Used on dev env only
-if (! $res && file_exists("../../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../../dolibarr/htdocs/main.inc.php';   // Used on dev env only
-if (! $res) die("Include of main fails");
-// Change this following line to use the correct relative path from htdocs
-include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
-dol_include_once('/mymodule/class/skeleton_class.class.php');
-
-// Load traductions files requiredby by page
-$langs->load("mymodule");
-$langs->load("other");
-
-// Get parameters
-$id			= GETPOST('id','int');
-$action		= GETPOST('action','alpha');
-$cancel     = GETPOST('cancel');
-$backtopage = GETPOST('backtopage');
-$myparam	= GETPOST('myparam','alpha');
-
-$search_field1=GETPOST("search_field1");
-$search_field2=GETPOST("search_field2");
-
-if (empty($action) && empty($id) && empty($ref)) $action='view';
-
-// Protection if external user
-if ($user->societe_id > 0)
-{
-	//accessforbidden();
-}
-//$result = restrictedArea($user, 'mymodule', $id);
-
-
-$object = new Skeleton_Class($db);
-$extrafields = new ExtraFields($db);
-
-// fetch optionals attributes and labels
-$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
-
-// Load object
-include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
-
-// Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('skeleton'));
-
-
-
-/*
- * ACTIONS
- *
- * Put here all code to do according to value of "action" parameter
- */
-
-$parameters=array();
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
-{
-	if ($cancel) 
-	{
-		if ($action != 'addlink')
-		{
-			$urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
-			header("Location: ".$urltogo);
-			exit;
-		}		
-		if ($id > 0 || ! empty($ref)) $ret = $object->fetch($id,$ref);
-		$action='';
-	}
-	
-	// Action to add record
-	if ($action == 'add' && ! empty($user->rights->mymodule->create))
-	{
-		if ($cancel)
-		{
-			$urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
-			header("Location: ".$urltogo);
-			exit;
-		}
-
-		$error=0;
-
-		/* object_prop_getpost_prop */
-		$object->prop1=GETPOST("field1");
-		$object->prop2=GETPOST("field2");
-
-		if (empty($object->ref))
-		{
-			$error++;
-			setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), null, 'errors');
-		}
-
-		if (! $error)
-		{
-			$result=$object->create($user);
-			if ($result > 0)
-			{
-				// Creation OK
-				$urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
-				header("Location: ".$urltogo);
-				exit;
-			}
-			{
-				// Creation KO
-				if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-				else  setEventMessages($object->error, null, 'errors');
-				$action='create';
-			}
-		}
-		else
-		{
-			$action='create';
-		}
-	}
-
-	// Action to update record
-	if ($action == 'update' && ! empty($user->rights->mymodule->create))
-	{
-		$error=0;
-
-		$object->prop1=GETPOST("field1");
-		$object->prop2=GETPOST("field2");
-
-		if (empty($object->ref))
-		{
-			$error++;
-			setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), null, 'errors');
-		}
-
-		if (! $error)
-		{
-			$result=$object->update($user);
-			if ($result > 0)
-			{
-				$action='view';
-			}
-			else
-			{
-				// Creation KO
-				if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-				else setEventMessages($object->error, null, 'errors');
-				$action='edit';
-			}
-		}
-		else
-		{
-			$action='edit';
-		}
-	}
-
-	// Action to delete
-	if ($action == 'confirm_delete' && ! empty($user->rights->mymodule->delete))
-	{
-		$result=$object->delete($user);
-		if ($result > 0)
-		{
-			// Delete OK
-			setEventMessages("RecordDeleted", null, 'mesgs');
-			header("Location: ".dol_buildpath('/mymodule/list.php',1));
-			exit;
-		}
-		else
-		{
-			if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-			else setEventMessages($object->error, null, 'errors');
-		}
-	}
-}
-
-
-
-
-/*
- * VIEW
- *
- * Put here all code to build page
- */
-
-$form=new Form($db);
-
-llxHeader('','MyPageName','');
-
-
-// Put here content of your page
-
-// Example : Adding jquery code
-print '<script type="text/javascript" language="javascript">
-jQuery(document).ready(function() {
-	function init_myfunc()
-	{
-		jQuery("#myid").removeAttr(\'disabled\');
-		jQuery("#myid").attr(\'disabled\',\'disabled\');
-	}
-	init_myfunc();
-	jQuery("#mybutton").click(function() {
-		init_myfunc();
-	});
-});
-</script>';
-
-
-// Part to create
-if ($action == 'create')
-{
-	print load_fiche_titre($langs->trans("NewMyModule"));
-
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	print '<input type="hidden" name="action" value="add">';
-	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-
-	dol_fiche_head();
-
-	print '<table class="border centpercent">'."\n";
-	// print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input class="flat" type="text" size="36" name="label" value="'.$label.'"></td></tr>';
-	// LIST_OF_TD_LABEL_FIELDS_CREATE
-	print '</table>'."\n";
-
-	dol_fiche_end();
-
-	print '<div class="center"><input type="submit" class="button" name="add" value="'.$langs->trans("Create").'"> &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
-
-	print '</form>';
-}
-
-
-
-// Part to edit record
-if (($id || $ref) && $action == 'edit')
-{
-	print load_fiche_titre($langs->trans("MyModule"));
-    
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	print '<input type="hidden" name="action" value="update">';
-	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-	print '<input type="hidden" name="id" value="'.$object->id.'">';
-	
-	dol_fiche_head();
-
-	print '<table class="border centpercent">'."\n";
-	// print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input class="flat" type="text" size="36" name="label" value="'.$label.'"></td></tr>';
-	// LIST_OF_TD_LABEL_FIELDS_EDIT
-	print '</table>';
-	
-	dol_fiche_end();
-
-	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-	print ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</div>';
-
-	print '</form>';
-}
-
-
-
-// Part to show record
-if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
-{
-    $res = $object->fetch_optionals($object->id, $extralabels);
-
-	$head = mymodule_prepare_head($object);
-	dol_fiche_head($head, 'order', $langs->trans("CustomerOrder"), -1, 'order');
-		
-	$formconfirm = '';
-	
-	// Confirmation to delete
-	if ($action == 'delete') {
-	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteOrder'), $langs->trans('ConfirmDeleteOrder'), 'confirm_delete', '', 0, 1);
-	}
-	
-	// Confirmation of action xxxx
-	if ($action == 'xxx')
-	{
-	    $formquestion=array();
-	    /*
-	        $formquestion = array(
-	            // 'text' => $langs->trans("ConfirmClone"),
-	            // array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
-	            // array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1),
-	            // array('type' => 'other',    'name' => 'idwarehouse',   'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse')?GETPOST('idwarehouse'):'ifone', 'idwarehouse', '', 1)));
-	    }*/	
-	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220);
-	}
-	
-	if (! $formconfirm) {
-	    $parameters = array('lineid' => $lineid);
-	    $reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	    if (empty($reshook)) $formconfirm.=$hookmanager->resPrint;
-	    elseif ($reshook > 0) $formconfirm=$hookmanager->resPrint;
-	}
-	
-	// Print form confirm
-	print $formconfirm;
-	
-	
-	
-	// Object card
-	// ------------------------------------------------------------
-	
-	$linkback = '<a href="' . DOL_URL_ROOT . '/mymodule/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
-	
-	
-	$morehtmlref='<div class="refidno">';
-	/*
-	// Ref bis
-	$morehtmlref.=$form->editfieldkey("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->mymodule->creer, 'string', '', 0, 1);
-	$morehtmlref.=$form->editfieldval("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->mymodule->creer, 'string', '', null, null, '', 1);
-	// Thirdparty
-	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
-	// Project
-	if (! empty($conf->projet->enabled))
-	{
-	    $langs->load("projects");
-	    $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-	    if ($user->rights->mymodule->creer)
-	    {
-	        if ($action != 'classify')
-	        {
-	            $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-	            if ($action == 'classify') {
-	                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-	                $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-	                $morehtmlref.='<input type="hidden" name="action" value="classin">';
-	                $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	                $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	                $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	                $morehtmlref.='</form>';
-	            } else {
-	                $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-	            }
-	        }
-	    } else {
-	        if (! empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-	            $morehtmlref.=$proj->ref;
-	            $morehtmlref.='</a>';
-	        } else {
-	            $morehtmlref.='';
-	        }
-	    }
-	}
-	*/
-	$morehtmlref.='</div>';
-	
-	
-	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-	
-	
-	print '<div class="fichecenter">';
-	print '<div class="fichehalfleft">';
-	print '<div class="underbanner clearboth"></div>';
-	print '<table class="border centpercent">'."\n";
-	// print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td>'.$object->label.'</td></tr>';
-	// LIST_OF_TD_LABEL_FIELDS_VIEW
-
-
-	// Other attributes
-	$cols = 2;
-	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
-
-	print '</table>';
-	print '</div>';
-	print '<div class="fichehalfright">';
-	print '<div class="ficheaddleft">';
-	print '<div class="underbanner clearboth"></div>';
-	print '<table class="border centpercent">';
-	
-	
-
-	print '</table>';
-	print '</div>';
-	print '</div>';
-	print '</div>';
-	
-	print '<div class="clearboth"></div><br>';
-	
-	dol_fiche_end();
-
-
-	// Buttons for actions
-	if ($action != 'presend' && $action != 'editline') {
-    	print '<div class="tabsAction">'."\n";
-    	$parameters=array();
-    	$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-    	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-    
-    	if (empty($reshook))
-    	{
-    		if ($user->rights->mymodule->write)
-    		{
-    			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
-    		}
-    
-    		if ($user->rights->mymodule->delete)
-    		{
-    			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>'."\n";
-    		}
-    	}
-    	print '</div>'."\n";
-	}
-
-	
-	// Select mail models is same action as presend
-	if (GETPOST('modelselected')) {
-	    $action = 'presend';
-	}
-	
-	if ($action != 'presend')
-	{
-	    print '<div class="fichecenter"><div class="fichehalfleft">';
-	    print '<a name="builddoc"></a>'; // ancre
-	    // Documents
-	    $comref = dol_sanitizeFileName($object->ref);
-	    $relativepath = $comref . '/' . $comref . '.pdf';
-	    $filedir = $conf->mymodule->dir_output . '/' . $comref;
-	    $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
-	    $genallowed = $user->rights->mymodule->creer;
-	    $delallowed = $user->rights->mymodule->supprimer;
-	    print $formfile->showdocuments('mymodule', $comref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
-	
-	
-	    // Show links to link elements
-	    $linktoelem = $form->showLinkToObjectBlock($object, null, array('order'));
-	    $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
-	
-	
-	    print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-	
-	    // List of actions on element
-	    include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
-	    $formactions = new FormActions($db);
-	    $somethingshown = $formactions->showactions($object, 'order', $socid);
-	
-	    print '</div></div></div>';
-	}
-	
-
-	/*
-	 * Action presend
-	 */
-    /*
-	if ($action == 'presend')
-	{
-		$object->fetch_projet();
-
-		$ref = dol_sanitizeFileName($object->ref);
-		include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-		$fileparams = dol_most_recent_file($conf->commande->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-		$file = $fileparams['fullname'];
-
-		// Define output language
-		$outputlangs = $langs;
-		$newlang = '';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
-			$newlang = $_REQUEST['lang_id'];
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-			$newlang = $object->thirdparty->default_lang;
-
-		if (!empty($newlang))
-		{
-			$outputlangs = new Translate('', $conf);
-			$outputlangs->setDefaultLang($newlang);
-			$outputlangs->load('commercial');
-		}
-
-		// Build document if it not exists
-		if (! $file || ! is_readable($file)) {
-			$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if ($result <= 0) {
-				dol_print_error($db, $object->error, $object->errors);
-				exit();
-			}
-			$fileparams = dol_most_recent_file($conf->commande->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-			$file = $fileparams['fullname'];
-		}
-
-		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
-		print '<div class="clearboth"></div>';
-		print '<br>';
-		print load_fiche_titre($langs->trans('SendOrderByMail'));
-
-		dol_fiche_head('');
-
-		// Cree l'objet formulaire mail
-		include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
-		$formmail = new FormMail($db);
-		$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
-        $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
-
-        if($formmail->fromtype === 'user'){
-            $formmail->fromid = $user->id;
-
-        }
-		$formmail->trackid='ord'.$object->id;
-		if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
-		{
-			include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-			$formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'ord'.$object->id);
-		}
-		$formmail->withfrom = 1;
-		$liste = array();
-		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value)
-			$liste [$key] = $value;
-		$formmail->withto = GETPOST('sendto') ? GETPOST('sendto') : $liste;
-		$formmail->withtocc = $liste;
-		$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
-		if (empty($object->ref_client)) {
-			$formmail->withtopic = $outputlangs->trans('SendOrderRef', '__ORDERREF__');
-		} else if (! empty($object->ref_client)) {
-			$formmail->withtopic = $outputlangs->trans('SendOrderRef', '__ORDERREF__ (__REFCLIENT__)');
-		}
-		$formmail->withfile = 2;
-		$formmail->withbody = 1;
-		$formmail->withdeliveryreceipt = 1;
-		$formmail->withcancel = 1;
-		// Tableau des substitutions
-		$formmail->setSubstitFromObject($object);
-		$formmail->substit ['__ORDERREF__'] = $object->ref;
-
-		$custcontact = '';
-		$contactarr = array();
-		$contactarr = $object->liste_contact(- 1, 'external');
-
-		if (is_array($contactarr) && count($contactarr) > 0)
-		{
-			foreach ($contactarr as $contact)
-			{
-				if ($contact['libelle'] == $langs->trans('TypeContact_commande_external_CUSTOMER')) {	// TODO Use code and not label
-					$contactstatic = new Contact($db);
-					$contactstatic->fetch($contact ['id']);
-					$custcontact = $contactstatic->getFullName($langs, 1);
-				}
-			}
-
-			if (! empty($custcontact)) {
-				$formmail->substit['__CONTACTCIVNAME__'] = $custcontact;
-			}
-		}
-
-		// Tableau des parametres complementaires
-		$formmail->param['action'] = 'send';
-		$formmail->param['models'] = 'order_send';
-		$formmail->param['models_id']=GETPOST('modelmailselected','int');
-		$formmail->param['orderid'] = $object->id;
-		$formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
-
-		// Init list of files
-		if (GETPOST("mode") == 'init') {
-			$formmail->clear_attached_files();
-			$formmail->add_attached_files($file, basename($file), dol_mimetype($file));
-		}
-
-		// Show form
-		print $formmail->get_form();
-
-		dol_fiche_end();
-	}*/
-}
-
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/modulebuilder/oldskeletons/skeleton_class.class.php b/htdocs/modulebuilder/oldskeletons/skeleton_class.class.php
deleted file mode 100644
index ea552ad85f9..00000000000
--- a/htdocs/modulebuilder/oldskeletons/skeleton_class.class.php
+++ /dev/null
@@ -1,606 +0,0 @@
-<?php
-/* Copyright (C) 2007-2017  Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2014-2016  Juanjo Menent       <jmenent@2byte.es>
- * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
- * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) ---Put here your own copyright and developer email---
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file        modulebuilder/skeletons/skeleton_class.class.php
- * \ingroup     mymodule othermodule1 othermodule2
- * \brief       This file is an example for a CRUD class file (Create/Read/Update/Delete)
- */
-
-// Put here all includes required by your class file
-require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
-//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
-//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
-
-/**
- * Class Skeleton_Class
- *
- * Put here description of your class.
- */
-class Skeleton_Class extends CommonObject
-{
-	/**
-	 * @var string Id to identify managed object
-	 */
-	public $element = 'skeleton';
-	/**
-	 * @var string Name of table without prefix where object is stored
-	 */
-	public $table_element = 'skeleton';
-    /**
-     * @var array Array with all fields and their property
-     */
-	public $picto = 'generic';
-    /**
-     * @var array Array with all fields and their property
-     */
-	public $fields;
-	
-	/**
-	 * @var mixed Sample property 1
-	 */
-	public $prop1;
-	/**
-	 * @var mixed Sample property 2
-	 */
-	public $prop2;
-	
-	//...
-	
-	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-	
-	public $table_element_line = 'skeletondet';
-    public $class_element_line = 'SkeletonLine';
-    public $fk_element = 'fk_skeleton';
-    /**
-	 * @var Skeleton_ClassLine[] Lines
-	 */
-	public $lines = array();
-	
-	
-	
-	/**
-	 * Constructor
-	 *
-	 * @param DoliDb $db Database handler
-	 */
-	public function __construct(DoliDB $db)
-	{
-		$this->db = $db;
-	}
-
-	/**
-	 * Create object into database
-	 *
-	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int <0 if KO, Id of created object if OK
-	 */
-	public function create(User $user, $notrigger = false)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$error = 0;
-
-		// Clean parameters
-		if (isset($this->prop1)) {
-			$this->prop1 = trim($this->prop1);
-		}
-		if (isset($this->prop2)) {
-			$this->prop2 = trim($this->prop2);
-		}
-		//...
-
-		// Check parameters
-		// Put here code to add control on parameters values
-
-		// Insert request
-		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
-		$sql .= ' field1,';
-		$sql .= ' field2';
-		//...
-		$sql .= ') VALUES (';
-		$sql .= ' \'' . $this->prop1 . '\',';
-		$sql .= ' \'' . $this->prop2 . '\'';
-		//...
-		$sql .= ')';
-
-		$this->db->begin();
-
-		$resql = $this->db->query($sql);
-		if (!$resql) {
-			$error ++;
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-		}
-
-		if (!$error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
-
-			if (!$notrigger) {
-				// Uncomment this and change MYOBJECT to your own tag if you
-				// want this action to call a trigger.
-
-				//// Call triggers
-				//$result=$this->call_trigger('MYOBJECT_CREATE',$user);
-				//if ($result < 0) $error++;
-				//// End call triggers
-			}
-		}
-
-		// Commit or rollback
-		if ($error) {
-			$this->db->rollback();
-
-			return - 1 * $error;
-		} else {
-			$this->db->commit();
-
-			return $this->id;
-		}
-	}
-
-	/**
-	 * Load object in memory from the database
-	 *
-	 * @param int    $id  Id object
-	 * @param string $ref Ref
-	 *
-	 * @return int <0 if KO, 0 if not found, >0 if OK
-	 */
-	public function fetch($id, $ref = null)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$sql = 'SELECT';
-		$sql .= ' t.rowid,';
-		$sql .= ' t.field1,';
-		$sql .= ' t.field2';
-		//...
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
-		$sql.= ' WHERE 1 = 1';
-		if (! empty($conf->multicompany->enabled)) {
-		    $sql .= " AND entity IN (" . getEntity('skeleton') . ")";
-		}
-		if (null !== $ref) {
-			$sql .= ' AND t.ref = ' . '\'' . $ref . '\'';
-		} else {
-			$sql .= ' AND t.rowid = ' . $id;
-		}
-
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$numrows = $this->db->num_rows($resql);
-			if ($numrows) {
-				$obj = $this->db->fetch_object($resql);
-
-				$this->id = $obj->rowid;
-				$this->prop1 = $obj->field1;
-				$this->prop2 = $obj->field2;
-				//...
-			}
-			
-			// Retrieve all extrafields for invoice
-			// fetch optionals attributes and labels
-			/*
-			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-			$extrafields=new ExtraFields($this->db);
-			$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-			$this->fetch_optionals($this->id,$extralabels);
-            */
-			
-			// $this->fetch_lines();
-			
-			$this->db->free($resql);
-
-			if ($numrows) {
-				return 1;
-			} else {
-				return 0;
-			}
-		} else {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-
-			return - 1;
-		}
-	}
-
-	/**
-	 * Load object in memory from the database
-	 *
-	 * @param string $sortorder Sort Order
-	 * @param string $sortfield Sort field
-	 * @param int    $limit     offset limit
-	 * @param int    $offset    offset limit
-	 * @param array  $filter    filter array
-	 * @param string $filtermode filter mode (AND or OR)
-	 *
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, array $filter = array(), $filtermode='AND')
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$sql = 'SELECT';
-		$sql .= ' t.rowid,';
-		$sql .= ' t.field1,';
-		$sql .= ' t.field2';
-		//...
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
-
-		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				$sqlwhere [] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
-			}
-		}
-		$sql.= ' WHERE 1 = 1';
-		if (! empty($conf->multicompany->enabled)) {
-		    $sql .= " AND entity IN (" . getEntity('skeleton') . ")";
-		}
-		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ' . implode(' '.$filtermode.' ', $sqlwhere);
-		}
-		if (!empty($sortfield)) {
-			$sql .= $this->db->order($sortfield,$sortorder);
-		}
-		if (!empty($limit)) {
-		 $sql .=  ' ' . $this->db->plimit($limit, $offset);
-		}
-
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$num = $this->db->num_rows($resql);
-
-			while ($obj = $this->db->fetch_object($resql)) {
-				$line = new self($this->db);
-
-				$line->id = $obj->rowid;
-				$line->prop1 = $obj->field1;
-				$line->prop2 = $obj->field2;
-				//...
-			}
-			$this->db->free($resql);
-
-			return $num;
-		} else {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-
-			return - 1;
-		}
-	}
-
-	/**
-	 * Update object into database
-	 *
-	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function update(User $user, $notrigger = false)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$error = 0;
-		
-		// Clean parameters
-		if (isset($this->prop1)) {
-			$this->prop1 = trim($this->prop1);
-		}
-		if (isset($this->prop2)) {
-			$this->prop2 = trim($this->prop2);
-		}
-		//...
-
-		// Check parameters
-		// Put here code to add a control on parameters values
-
-		// Update request
-		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
-		$sql .= " field1=".(isset($this->field1)?"'".$this->db->escape($this->field1)."'":"null").",";
-        $sql .= " field2=".(isset($this->field2)?"'".$this->db->escape($this->field2)."'":"null")."";
-		//...
-		$sql .= ' WHERE rowid=' . $this->id;
-
-		$this->db->begin();
-
-		$resql = $this->db->query($sql);
-		if (!$resql) {
-			$error ++;
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-		}
-
-		if (!$error && !$notrigger) {
-			// Uncomment this and change MYOBJECT to your own tag if you
-			// want this action calls a trigger.
-
-			//// Call triggers
-			//$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
-			//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-			//// End call triggers
-		}
-
-		// Commit or rollback
-		if ($error) {
-			$this->db->rollback();
-
-			return - 1 * $error;
-		} else {
-			$this->db->commit();
-
-			return 1;
-		}
-	}
-
-	/**
-	 * Delete object in database
-	 *
-	 * @param User $user      User that deletes
-	 * @param bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function delete(User $user, $notrigger = false)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$error = 0;
-
-		$this->db->begin();
-
-		if (!$error) {
-			if (!$notrigger) {
-				// Uncomment this and change MYOBJECT to your own tag if you
-				// want this action calls a trigger.
-
-				//// Call triggers
-				//$result=$this->call_trigger('MYOBJECT_DELETE',$user);
-				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-				//// End call triggers
-			}
-		}
-
-		// If you need to delete child tables to, you can insert them here
-		
-		if (!$error) {
-			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
-			$sql .= ' WHERE rowid=' . $this->id;
-
-			$resql = $this->db->query($sql);
-			if (!$resql) {
-				$error ++;
-				$this->errors[] = 'Error ' . $this->db->lasterror();
-				dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-			}
-		}
-
-		// Commit or rollback
-		if ($error) {
-			$this->db->rollback();
-
-			return - 1 * $error;
-		} else {
-			$this->db->commit();
-
-			return 1;
-		}
-	}
-
-	/**
-	 * Load an object from its id and create a new one in database
-	 *
-	 * @param int $fromid Id of object to clone
-	 *
-	 * @return int New id of clone
-	 */
-	public function createFromClone($fromid)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		global $user;
-		$error = 0;
-		$object = new Skeleton_Class($this->db);
-
-		$this->db->begin();
-
-		// Load source object
-		$object->fetch($fromid);
-		// Reset object
-		$object->id = 0;
-
-		// Clear fields
-		// ...
-
-		// Create clone
-		$result = $object->create($user);
-
-		// Other options
-		if ($result < 0) {
-			$error ++;
-			$this->errors = $object->errors;
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-		}
-
-		// End
-		if (!$error) {
-			$this->db->commit();
-
-			return $object->id;
-		} else {
-			$this->db->rollback();
-
-			return - 1;
-		}
-	}
-
-	/**
-	 *  Return a link to the object card (with optionaly the picto)
-	 *
-	 *	@param	int		$withpicto			Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
-	 *	@param	string	$option				On what the link point to
-     *  @param	int  	$notooltip			1=Disable tooltip
-     *  @param	int		$maxlen				Max length of visible user name
-     *  @param  string  $morecss            Add more css on link
-	 *	@return	string						String with URL
-	 */
-	function getNomUrl($withpicto=0, $option='', $notooltip=0, $maxlen=24, $morecss='')
-	{
-		global $db, $conf, $langs;
-        global $dolibarr_main_authentication, $dolibarr_main_demo;
-        global $menumanager;
-
-        if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
-        
-        $result = '';
-        $companylink = '';
-
-        $label = '<u>' . $langs->trans("MyModule") . '</u>';
-        $label.= '<br>';
-        $label.= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
-
-        $url = DOL_URL_ROOT.'/mymodule/'.$this->table_name.'_card.php?id='.$this->id;
-        
-        $linkclose='';
-        if (empty($notooltip))
-        {
-            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label=$langs->trans("ShowProject");
-                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
-            $linkclose.=' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose.=' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
-        }
-        else $linkclose = ($morecss?' class="'.$morecss.'"':'');
-        
-		$linkstart = '<a href="'.$url.'"';
-		$linkstart.=$linkclose.'>';
-		$linkend='</a>';
-
-        if ($withpicto)
-        {
-            $result.=($linkstart.img_object(($notooltip?'':$label), 'label', ($notooltip?'':'class="classfortooltip"')).$linkend);
-            if ($withpicto != 2) $result.=' ';
-		}
-		$result.= $linkstart . $this->ref . $linkend;
-		return $result;
-	}
-
-	/**
-	 *  Retourne le libelle du status d'un user (actif, inactif)
-	 *
-	 *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-	 *  @return	string 			       Label of status
-	 */
-	function getLibStatut($mode=0)
-	{
-		return $this->LibStatut($this->status,$mode);
-	}
-
-	/**
-	 *  Return the status
-	 *
-	 *  @param	int		$status        	Id status
-	 *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 5=Long label + Picto
-	 *  @return string 			       	Label of status
-	 */
-	static function LibStatut($status,$mode=0)
-	{
-		global $langs;
-
-		if ($mode == 0)
-		{
-			$prefix='';
-			if ($status == 1) return $langs->trans('Enabled');
-			if ($status == 0) return $langs->trans('Disabled');
-		}
-		if ($mode == 1)
-		{
-			if ($status == 1) return $langs->trans('Enabled');
-			if ($status == 0) return $langs->trans('Disabled');
-		}
-		if ($mode == 2)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
-		}
-		if ($mode == 3)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
-		}
-		if ($mode == 4)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
-		}
-		if ($mode == 5)
-		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
-		}
-		if ($mode == 6)
-		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
-		}
-	}
-
-
-	/**
-	 * Initialise object with example values
-	 * Id must be 0 if object instance is a specimen
-	 *
-	 * @return void
-	 */
-	public function initAsSpecimen()
-	{
-		$this->id = 0;
-		$this->prop1 = 'prop1';
-		$this->prop2 = 'prop2';
-	}
-
-}
-
-/**
- * Class Skeleton_ClassLine
- */
-class Skeleton_ClassLine
-{
-	/**
-	 * @var int ID
-	 */
-	public $id;
-	/**
-	 * @var mixed Sample line property 1
-	 */
-	public $prop1;
-	/**
-	 * @var mixed Sample line property 2
-	 */
-	public $prop2;
-}
diff --git a/htdocs/modulebuilder/oldskeletons/skeleton_list.php b/htdocs/modulebuilder/oldskeletons/skeleton_list.php
deleted file mode 100644
index 842fdf32457..00000000000
--- a/htdocs/modulebuilder/oldskeletons/skeleton_list.php
+++ /dev/null
@@ -1,570 +0,0 @@
-<?php
-/* Copyright (C) 2007-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2014-2016 Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2016      Jean-François Ferry	<jfefe@aternatik.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *   	\file       dev/skeletons/skeleton_list.php
- *		\ingroup    mymodule othermodule1 othermodule2
- *		\brief      This file is an example of a php page
- *					Put here some comments
- */
-
-//if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
-//if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
-//if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-//if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');			// Do not check anti CSRF attack test
-//if (! defined('NOSTYLECHECK'))   define('NOSTYLECHECK','1');			// Do not check style html tag into posted data
-//if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');		// Do not check anti POST attack test
-//if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');			// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');			// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-//if (! defined("NOLOGIN"))        define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
-
-// Change this following line to use the correct relative path (../, ../../, etc)
-$res=0;
-if (! $res && file_exists("../main.inc.php")) $res=@include '../main.inc.php';					// to work if your module directory is into dolibarr root htdocs directory
-if (! $res && file_exists("../../main.inc.php")) $res=@include '../../main.inc.php';			// to work if your module directory is into a subdir of root htdocs directory
-if (! $res && file_exists("../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../dolibarr/htdocs/main.inc.php';     // Used on dev env only
-if (! $res && file_exists("../../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../../dolibarr/htdocs/main.inc.php';   // Used on dev env only
-if (! $res) die("Include of main fails");
-// Change this following line to use the correct relative path from htdocs
-require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-dol_include_once('/mymodule/class/skeleton_class.class.php');
-
-// Load traductions files requiredby by page
-$langs->load("mymodule");
-$langs->load("other");
-
-$action=GETPOST('action','alpha');
-$massaction=GETPOST('massaction','alpha');
-$show_files=GETPOST('show_files','int');
-$confirm=GETPOST('confirm','alpha');
-$toselect = GETPOST('toselect', 'array');
-
-$id			= GETPOST('id','int');
-$backtopage = GETPOST('backtopage');
-$myparam	= GETPOST('myparam','alpha');
-
-$search_all=trim(GETPOST("sall"));
-$search_field1=GETPOST("search_field1");
-$search_field2=GETPOST("search_field2");
-$search_myfield=GETPOST('search_myfield');
-$optioncss = GETPOST('optioncss','alpha');
-
-// Load variable for pagination
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
-$sortfield = GETPOST('sortfield','alpha');
-$sortorder = GETPOST('sortorder','alpha');
-$page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
-$offset = $limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-if (! $sortfield) $sortfield="t.rowid"; // Set here default search field
-if (! $sortorder) $sortorder="ASC";
-
-// Protection if external user
-$socid=0;
-if ($user->societe_id > 0)
-{
-    $socid = $user->societe_id;
-	//accessforbidden();
-}
-
-// Initialize technical object to manage context to save list fields
-$contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'mymodulelist';
-
-// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
-$hookmanager->initHooks(array('mymodulelist'));
-$extrafields = new ExtraFields($db);
-
-// fetch optionals attributes and labels
-$extralabels = $extrafields->fetch_name_optionals_label('mymodule');
-$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
-
-// List of fields to search into when doing a "search in all"
-$fieldstosearchall = array(
-    't.ref'=>'Ref',
-    't.note_public'=>'NotePublic',
-);
-if (empty($user->socid)) $fieldstosearchall["t.note_private"]="NotePrivate";
-
-// Definition of fields for list
-$arrayfields=array(
-    't.field1'=>array('label'=>"Field1", 'checked'=>1),
-    't.field2'=>array('label'=>"Field2", 'checked'=>1),
-    //'t.entity'=>array('label'=>"Entity", 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))),
-    't.datec'=>array('label'=>"DateCreationShort", 'checked'=>0, 'position'=>500),
-    't.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
-    //'t.statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
-);
-// Extra fields
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-{
-    foreach($extrafields->attribute_label as $key => $val)
-    {
-        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
-    }
-}
-
-
-$object=new Skeleton_Class($db);
-
-
-
-
-/*
- * ACTIONS
- *
- * Put here all code to do according to value of "action" parameter
- */
-
-if (GETPOST('cancel')) { $action='list'; $massaction=''; }
-if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
-
-$parameters=array();
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
-{
-    // Selection of new fields
-    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
-
-    // Purge search criteria
-    if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") ||GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
-    {
-    	$search_field1='';
-    	$search_field2='';
-    	$search_date_creation='';
-    	$search_date_update='';
-        $toselect='';
-        $search_array_options=array();
-    }
-
-    // Mass actions
-    $objectclass='Skeleton';
-    $objectlabel='Skeleton';
-    $permtoread = $user->rights->skeleton->read;
-    $permtodelete = $user->rights->skeleton->delete;
-    $uploaddir = $conf->skeleton->dir_output;
-    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
-}
-
-
-
-/*
- * VIEW
- *
- * Put here all code to build page
- */
-
-$now=dol_now();
-
-$form=new Form($db);
-
-//$help_url="EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_Pedidos_de_clientes";
-$help_url='';
-$title = $langs->trans('MyModuleListTitle');
-
-// Put here content of your page
-
-// Example : Adding jquery code
-print '<script type="text/javascript" language="javascript">
-jQuery(document).ready(function() {
-	function init_myfunc()
-	{
-		jQuery("#myid").removeAttr(\'disabled\');
-		jQuery("#myid").attr(\'disabled\',\'disabled\');
-	}
-	init_myfunc();
-	jQuery("#mybutton").click(function() {
-		init_myfunc();
-	});
-});
-</script>';
-
-
-$sql = "SELECT";
-$sql.= " t.rowid,";
-$sql.= " t.field1,";
-$sql.= " t.field2";
-// Add fields from extrafields
-foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
-// Add fields from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
-$sql.= " FROM ".MAIN_DB_PREFIX."mytable as t";
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."mytable_extrafields as ef on (t.rowid = ef.fk_object)";
-$sql.= " WHERE 1 = 1";
-//$sql.= " WHERE u.entity IN (".getEntity('mytable').")";
-if ($search_field1) $sql.= natural_search("field1",$search_field1);
-if ($search_field2) $sql.= natural_search("field2",$search_field2);
-if ($sall)          $sql.= natural_search(array_keys($fieldstosearchall), $sall);
-// Add where from extra fields
-foreach ($search_array_options as $key => $val)
-{
-    $crit=$val;
-    $tmpkey=preg_replace('/search_options_/','',$key);
-    $typ=$extrafields->attribute_type[$tmpkey];
-    $mode=0;
-    if (in_array($typ, array('int','double'))) $mode=1;    // Search on a numeric
-    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit))) 
-    {
-        $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
-    }
-}
-// Add where from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
-$sql.=$db->order($sortfield,$sortorder);
-
-// Count total nb of records
-$nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
-	$result = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($result);
-}	
-
-$sql.= $db->plimit($limit+1, $offset);
-
-dol_syslog($script_file, LOG_DEBUG);
-$resql=$db->query($sql);
-if (! $resql)
-{
-    dol_print_error($db);
-    exit;
-}
-
-$num = $db->num_rows($resql);
-
-// Direct jump if only one record found
-if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all)
-{
-    $obj = $db->fetch_object($resql);
-    $id = $obj->rowid;
-    header("Location: ".DOL_URL_ROOT.'/skeleton/card.php?id='.$id);
-    exit;
-}
-
-llxHeader('', $title, $help_url);
-
-$arrayofselected=is_array($toselect)?$toselect:array();
-
-$param='';
-if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-if ($search_field1 != '') $param.= '&amp;search_field1='.urlencode($search_field1);
-if ($search_field2 != '') $param.= '&amp;search_field2='.urlencode($search_field2);
-if ($optioncss != '') $param.='&optioncss='.$optioncss;
-// Add $param from extra fields
-foreach ($search_array_options as $key => $val)
-{
-    $crit=$val;
-    $tmpkey=preg_replace('/search_options_/','',$key);
-    if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
-} 
-
-$arrayofmassactions =  array(
-    'presend'=>$langs->trans("SendByMail"),
-    'builddoc'=>$langs->trans("PDFMerge"),
-);
-if ($user->rights->mymodule->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
-if ($massaction == 'presend') $arrayofmassactions=array();
-$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
-
-print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-print '<input type="hidden" name="action" value="list">';
-print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-print '<input type="hidden" name="page" value="'.$page.'">';
-print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
-
-print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies', 0, '', '', $limit);
-
-if ($sall)
-{
-    foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
-    print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
-}
-
-$moreforfilter = '';
-$moreforfilter.='<div class="divsearchfield">';
-$moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_myfield" value="'.dol_escape_htmltag($search_myfield).'">';
-$moreforfilter.= '</div>';
-
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
-else $moreforfilter = $hookmanager->resPrint;
-
-if (! empty($moreforfilter))
-{
-	print '<div class="liste_titre liste_titre_bydiv centpercent">';
-	print $moreforfilter;
-    print '</div>';
-}
-
-$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
-$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-
-print '<div class="div-table-responsive">';
-print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-
-// Fields title
-print '<tr class="liste_titre">';
-// LIST_OF_TD_TITLE_FIELDS
-//if (! empty($arrayfields['t.field1']['checked'])) print_liste_field_titre($arrayfields['t.field1']['label'],$_SERVER['PHP_SELF'],'t.field1','',$param,'',$sortfield,$sortorder);
-//if (! empty($arrayfields['t.field2']['checked'])) print_liste_field_titre($arrayfields['t.field2']['label'],$_SERVER['PHP_SELF'],'t.field2','',$param,'',$sortfield,$sortorder);
-// Extra fields
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-{
-   foreach($extrafields->attribute_label as $key => $val) 
-   {
-       if (! empty($arrayfields["ef.".$key]['checked'])) 
-       {
-			$align=$extrafields->getAlignFlag($key);
-			$sortonfield = "ef.".$key;
-			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
-			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
-       }
-   }
-}
-// Hook fields
-$parameters=array('arrayfields'=>$arrayfields);
-$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-print $hookmanager->resPrint;
-if (! empty($arrayfields['t.datec']['checked']))  print_liste_field_titre($arrayfields['t.datec']['label'],$_SERVER["PHP_SELF"],"t.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['t.tms']['checked']))    print_liste_field_titre($arrayfields['t.tms']['label'],$_SERVER["PHP_SELF"],"t.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-//if (! empty($arrayfields['t.status']['checked'])) print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"t.status","",$param,'align="center"',$sortfield,$sortorder);
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
-print '</tr>'."\n";
-
-// Fields title search
-print '<tr class="liste_titre">';
-// LIST_OF_TD_TITLE_SEARCH
-//if (! empty($arrayfields['t.field1']['checked'])) print '<td class="liste_titre"><input type="text" class="flat" name="search_field1" value="'.$search_field1.'" size="10"></td>';
-//if (! empty($arrayfields['t.field2']['checked'])) print '<td class="liste_titre"><input type="text" class="flat" name="search_field2" value="'.$search_field2.'" size="10"></td>';
-// Extra fields
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-{
-    foreach($extrafields->attribute_label as $key => $val) 
-    {
-        if (! empty($arrayfields["ef.".$key]['checked']))
-        {
-            $align=$extrafields->getAlignFlag($key);
-            $typeofextrafield=$extrafields->attribute_type[$key];
-            print '<td class="liste_titre'.($align?' '.$align:'').'">';
-        	if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')) && empty($extrafields->attribute_computed[$key]))
-			{
-			    $crit=$val;
-				$tmpkey=preg_replace('/search_options_/','',$key);
-				$searchclass='';
-				if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass='searchstring';
-				if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
-				print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
-			}
-            print '</td>';
-        }
-    }
-}
-// Fields from hook
-$parameters=array('arrayfields'=>$arrayfields);
-$reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
-print $hookmanager->resPrint;
-if (! empty($arrayfields['t.datec']['checked']))
-{
-    // Date creation
-    print '<td class="liste_titre">';
-    print '</td>';
-}
-if (! empty($arrayfields['t.tms']['checked']))
-{
-    // Date modification
-    print '<td class="liste_titre">';
-    print '</td>';
-}
-/*if (! empty($arrayfields['u.statut']['checked']))
-{
-    // Status
-    print '<td class="liste_titre" align="center">';
-    print $form->selectarray('search_statut', array('-1'=>'','0'=>$langs->trans('Disabled'),'1'=>$langs->trans('Enabled')),$search_statut);
-    print '</td>';
-}*/
-// Action column
-print '<td class="liste_titre" align="right">';
-$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
-print $searchpicto;
-print '</td>';
-print '</tr>'."\n";
-    
-
-// Detect if we need a fetch on each output line
-$needToFetchEachLine=0;
-foreach ($extrafields->attribute_computed as $key => $val)
-{
-    if (preg_match('/\$object/',$val)) $needToFetchEachLine++;  // There is at least one compute field that use $object
-}
-
-
-$i=0;
-$totalarray=array();
-while ($i < min($num, $limit))
-{
-    $obj = $db->fetch_object($resql);
-    if ($obj)
-    {
-        // Show here line of result
-        print '<tr class="oddeven">';
-        // LIST_OF_TD_FIELDS_LIST
-        /*
-        if (! empty($arrayfields['t.field1']['checked'])) 
-        {
-            print '<td>'.$obj->field1.'</td>';
-		    if (! $i) $totalarray['nbfield']++;
-        }
-        if (! empty($arrayfields['t.field2']['checked'])) 
-        {
-            print '<td>'.$obj->field2.'</td>';
-		    if (! $i) $totalarray['nbfield']++;
-        }*/
-    	// Extra fields
-		if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-		{
-		   foreach($extrafields->attribute_label as $key => $val) 
-		   {
-				if (! empty($arrayfields["ef.".$key]['checked'])) 
-				{
-					print '<td';
-					$align=$extrafields->getAlignFlag($key);
-					if ($align) print ' align="'.$align.'"';
-					print '>';
-					$tmpkey='options_'.$key;
-					print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
-					print '</td>';
-		            if (! $i) $totalarray['nbfield']++;
-				}
-		   }
-		}
-        // Fields from hook
-	    $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
-		$reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
-    	// Date creation
-        if (! empty($arrayfields['t.datec']['checked']))
-        {
-            print '<td align="center">';
-            print dol_print_date($db->jdate($obj->date_creation), 'dayhour');
-            print '</td>';
-		    if (! $i) $totalarray['nbfield']++;
-        }
-        // Date modification
-        if (! empty($arrayfields['t.tms']['checked']))
-        {
-            print '<td align="center">';
-            print dol_print_date($db->jdate($obj->date_update), 'dayhour');
-            print '</td>';
-		    if (! $i) $totalarray['nbfield']++;
-        }
-        // Status
-        /*
-        if (! empty($arrayfields['u.statut']['checked']))
-        {
-		  $userstatic->statut=$obj->statut;
-          print '<td align="center">'.$userstatic->getLibStatut(3).'</td>';
-        }*/
-
-        // Action column
-        print '<td class="nowrap" align="center">';
-	    if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-        {
-	        $selected=0;
-			if (in_array($obj->rowid, $arrayofselected)) $selected=1;
-			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
-        }
-	    print '</td>';
-        if (! $i) $totalarray['nbfield']++;
-
-        print '</tr>';
-    }
-    $i++;
-}
-
-// Show total line
-if (isset($totalarray['totalhtfield']))
-{
-    print '<tr class="liste_total">';
-    $i=0;
-    while ($i < $totalarray['nbfield'])
-    {
-        $i++;
-        if ($i == 1)
-        {
-            if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
-            else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
-        }
-        elseif ($totalarray['totalhtfield'] == $i) print '<td align="right">'.price($totalarray['totalht']).'</td>';
-        elseif ($totalarray['totalvatfield'] == $i) print '<td align="right">'.price($totalarray['totalvat']).'</td>';
-        elseif ($totalarray['totalttcfield'] == $i) print '<td align="right">'.price($totalarray['totalttc']).'</td>';
-        else print '<td></td>';
-    }
-    print '</tr>';
-}
-
-$db->free($resql);
-
-$parameters=array('arrayfields'=>$arrayfields, 'sql'=>$sql);
-$reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
-print $hookmanager->resPrint;
-
-print '</table>'."\n";
-print '</div>'."\n";
-
-print '</form>'."\n";
-
-
-if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
-{
-    // Show list of available documents
-    $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
-    $urlsource.=str_replace('&amp;','&',$param);
-
-    $filedir=$diroutputmassaction;
-    $genallowed=$user->rights->facture->lire;
-    $delallowed=$user->rights->facture->lire;
-
-    print $formfile->showdocuments('massfilesarea_mymodule','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
-}
-else
-{
-    print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
-}
-
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/modulebuilder/oldskeletons/skeleton_script.php b/htdocs/modulebuilder/oldskeletons/skeleton_script.php
deleted file mode 100644
index 5eb1565d4a3..00000000000
--- a/htdocs/modulebuilder/oldskeletons/skeleton_script.php
+++ /dev/null
@@ -1,166 +0,0 @@
-#!/usr/bin/env php
-<?php
-/* Copyright (C) 2007-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) ---Put here your own copyright and developer email---
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *      \file       dev/skeletons/skeleton_script.php
- *		\ingroup    mymodule
- *      \brief      This file is an example for a command line script
- *					Put here some comments
- */
-
-$sapi_type = php_sapi_name();
-$script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
-
-// Test if batch mode
-if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
-}
-
-// Global variables
-$version='1.0';
-$error=0;
-
-
-// -------------------- START OF YOUR CODE HERE --------------------
-@set_time_limit(0);							// No timeout for this script
-define('EVEN_IF_ONLY_LOGIN_ALLOWED',1);		// Set this define to 0 if you want to lock your script when dolibarr setup is "locked to admin user only".
-
-// Include and load Dolibarr environment variables
-require_once($path."../../htdocs/master.inc.php");
-// After this $db, $mysoc, $langs, $conf and $hookmanager are defined (Opened $db handler to database will be closed at end of file).
-// $user is created but empty.
-
-//$langs->setDefaultLang('en_US'); 	// To change default language of $langs
-$langs->load("main");				// To load language file for default language
-
-// Load user and its permissions
-$result=$user->fetch('','admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
-if (! $result > 0) { dol_print_error('',$user->error); exit; }
-$user->getrights();
-
-
-print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
-if (! isset($argv[1])) {	// Check parameters
-    print "Usage: ".$script_file." param1 param2 ...\n";
-	exit(-1);
-}
-print '--- start'."\n";
-print 'Argument 1='.$argv[1]."\n";
-print 'Argument 2='.$argv[2]."\n";
-
-
-// Start of transaction
-$db->begin();
-
-
-// Examples for manipulating class skeleton_class
-require_once(DOL_DOCUMENT_ROOT."/../dev/skeletons/skeleton_class.class.php");
-$myobject=new Skeleton_Class($db);
-
-// Example for inserting creating object in database
-/*
-dol_syslog($script_file." CREATE", LOG_DEBUG);
-$myobject->prop1='value_prop1';
-$myobject->prop2='value_prop2';
-$id=$myobject->create($user);
-if ($id < 0) { $error++; dol_print_error($db,$myobject->error); }
-else print "Object created with id=".$id."\n";
-*/
-
-// Example for reading object from database
-/*
-dol_syslog($script_file." FETCH", LOG_DEBUG);
-$result=$myobject->fetch($id);
-if ($result < 0) { $error; dol_print_error($db,$myobject->error); }
-else print "Object with id=".$id." loaded\n";
-*/
-
-// Example for updating object in database ($myobject must have been loaded by a fetch before)
-/*
-dol_syslog($script_file." UPDATE", LOG_DEBUG);
-$myobject->prop1='newvalue_prop1';
-$myobject->prop2='newvalue_prop2';
-$result=$myobject->update($user);
-if ($result < 0) { $error++; dol_print_error($db,$myobject->error); }
-else print "Object with id ".$myobject->id." updated\n";
-*/
-
-// Example for deleting object in database ($myobject must have been loaded by a fetch before)
-/*
-dol_syslog($script_file." DELETE", LOG_DEBUG);
-$result=$myobject->delete($user);
-if ($result < 0) { $error++; dol_print_error($db,$myobject->error); }
-else print "Object with id ".$myobject->id." deleted\n";
-*/
-
-
-// An example of a direct SQL read without using the fetch method
-/*
-$sql = "SELECT field1, field2";
-$sql.= " FROM ".MAIN_DB_PREFIX."skeleton";
-$sql.= " WHERE field3 = 'xxx'";
-$sql.= " ORDER BY field1 ASC";
-
-dol_syslog($script_file, LOG_DEBUG);
-$resql=$db->query($sql);
-if ($resql)
-{
-	$num = $db->num_rows($resql);
-	$i = 0;
-	if ($num)
-	{
-		while ($i < $num)
-		{
-			$obj = $db->fetch_object($resql);
-			if ($obj)
-			{
-				// You can use here results
-				print $obj->field1;
-				print $obj->field2;
-			}
-			$i++;
-		}
-	}
-}
-else
-{
-	$error++;
-	dol_print_error($db);
-}
-*/
-
-
-// -------------------- END OF YOUR CODE --------------------
-
-if (! $error)
-{
-	$db->commit();
-	print '--- end ok'."\n";
-}
-else
-{
-	print '--- end error code='.$error."\n";
-	$db->rollback();
-}
-
-$db->close();	// Close $db database opened handler
-
-exit($error);
diff --git a/htdocs/modulebuilder/oldskeletons/skeleton_webservice_server.php b/htdocs/modulebuilder/oldskeletons/skeleton_webservice_server.php
deleted file mode 100644
index 54a050ff9da..00000000000
--- a/htdocs/modulebuilder/oldskeletons/skeleton_webservice_server.php
+++ /dev/null
@@ -1,272 +0,0 @@
-<?php
-/* Copyright (C) 2006-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *       \file       htdocs/webservices/server_skeleton.php
- *       \brief      File that is entry point to call Dolibarr WebServices
- *       \version    $Id: server_skeleton.php,v 1.7 2010/12/19 11:49:37 eldy Exp $
- */
-
-// This is to make Dolibarr working with Plesk
-set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
-
-require_once("../master.inc.php");
-require_once(NUSOAP_PATH.'/nusoap.php');		// Include SOAP
-require_once(DOL_DOCUMENT_ROOT."/core/lib/ws.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/skeleton/class/skeleton.class.php");
-
-
-dol_syslog("Call Skeleton webservices interfaces");
-
-// Enable and test if module web services is enabled
-if (empty($conf->global->MAIN_MODULE_WEBSERVICES))
-{
-    $langs->load("admin");
-    dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
-    print $langs->trans("WarningModuleNotActive",'WebServices').'.<br><br>';
-    print $langs->trans("ToActivateModule");
-    exit;
-}
-
-// Create the soap Object
-$server = new nusoap_server();
-$server->soap_defencoding='UTF-8';
-$server->decode_utf8=false;
-$ns='http://www.dolibarr.org/ns/';
-$server->configureWSDL('WebServicesDolibarrSkeleton',$ns);
-$server->wsdl->schemaTargetNamespace=$ns;
-
-
-// Define WSDL Authentication object
-$server->wsdl->addComplexType(
-    'authentication',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'dolibarrkey' => array('name'=>'dolibarrkey','type'=>'xsd:string'),
-    	'sourceapplication' => array('name'=>'sourceapplication','type'=>'xsd:string'),
-    	'login' => array('name'=>'login','type'=>'xsd:string'),
-    	'password' => array('name'=>'password','type'=>'xsd:string'),
-        'entity' => array('name'=>'entity','type'=>'xsd:string'),
-    )
-);
-
-// Define WSDL Return object
-$server->wsdl->addComplexType(
-    'result',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'result_code' => array('name'=>'result_code','type'=>'xsd:string'),
-        'result_label' => array('name'=>'result_label','type'=>'xsd:string'),
-    )
-);
-
-// Define other specific objects
-$server->wsdl->addComplexType(
-    'skeleton',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-	    'prop1'=>'xxx',
-		'prop2'=>'xxx',
-    //...
-    )
-);
-
-
-
-// 5 styles: RPC/encoded, RPC/literal, Document/encoded (not WS-I compliant), Document/literal, Document/literal wrapped
-// Style merely dictates how to translate a WSDL binding to a SOAP message. Nothing more. You can use either style with any programming model.
-// http://www.ibm.com/developerworks/webservices/library/ws-whichwsdl/
-$styledoc='rpc';       // rpc/document (document is an extend into SOAP 1.0 to support unstructured messages)
-$styleuse='encoded';   // encoded/literal/literal wrapped
-// Better choice is document/literal wrapped but literal wrapped not supported by nusoap.
-
-
-// Register WSDL
-$server->register(
-    'getSkeleton',
-    // Entry values
-    array('authentication'=>'tns:authentication','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string'),
-    // Exit values
-    array('result'=>'tns:result','skeleton'=>'tns:skeleton'),
-    $ns,
-    $ns.'#getSkeleton',
-    $styledoc,
-    $styleuse,
-    'WS to get skeleton'
-);
-
-// Register WSDL
-$server->register(
-	'createSkeleton',
-	// Entry values
-	array('authentication'=>'tns:authentication','skeleton'=>'tns:skeleton'),
-	// Exit values
-	array('result'=>'tns:result','id'=>'xsd:string'),
-	$ns,
-	$ns.'#createSkeleton',
-	$styledoc,
-	$styleuse,
-	'WS to create a skeleton'
-);
-
-
-
-
-/**
- * Get Skeleton
- *
- * @param	array		$authentication		Array of authentication information
- * @param	int			$id					Id of object
- * @param	string		$ref				Ref of object
- * @param	string		$ref_ext			Ref external of object
- * @return	mixed
- */
-function getSkeleton($authentication,$id,$ref='',$ref_ext='')
-{
-    global $db,$conf,$langs;
-
-    dol_syslog("Function: getSkeleton login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
-
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
-
-    // Init and check authentication
-    $objectresp=array();
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
-    // Check parameters
-    if (! $error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
-    {
-        $error++;
-        $errorcode='BAD_PARAMETERS'; $errorlabel="Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
-    }
-
-    if (! $error)
-    {
-        $fuser->getrights();
-
-        if ($fuser->rights->skeleton->read)
-        {
-            $skeleton=new Skeleton($db);
-            $result=$skeleton->fetch($id,$ref,$ref_ext);
-            if ($result > 0)
-            {
-                // Create
-                $objectresp = array(
-			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
-			        'skeleton'=>array(
-				    'prop1'=>$skeleton->prop1,
-				    'prop2'=>$skeleton->prop2,
-                    //...
-                    )
-                );
-            }
-            else
-            {
-                $error++;
-                $errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
-            }
-        }
-        else
-        {
-            $error++;
-            $errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
-        }
-    }
-
-    if ($error)
-    {
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-    }
-
-    return $objectresp;
-}
-
-
-/**
- * Create Skeleton
- *
- * @param	array		$authentication		Array of authentication information
- * @param	Skeleton	$skeleton		    $skeleton
- * @return	array							Array result
- */
-function createSkeleton($authentication,$skeleton)
-{
-	global $db,$conf,$langs;
-
-	$now=dol_now();
-
-	dol_syslog("Function: createSkeleton login=".$authentication['login']);
-
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
-
-	// Init and check authentication
-	$objectresp=array();
-	$errorcode='';$errorlabel='';
-	$error=0;
-	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
-	// Check parameters
-
-
-	if (! $error)
-	{
-		$newobject=new Skeleton($db);
-		$newobject->prop1=$skeleton->prop1;
-		$newobject->prop2=$skeleton->prop2;
-		//...
-
-		$db->begin();
-
-		$result=$newobject->create($fuser);
-		if ($result <= 0)
-		{
-			$error++;
-		}
-
-		if (! $error)
-		{
-			$db->commit();
-			$objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref);
-		}
-		else
-		{
-			$db->rollback();
-			$error++;
-			$errorcode='KO';
-			$errorlabel=$newobject->error;
-		}
-	}
-
-	if ($error)
-	{
-		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-	}
-
-	return $objectresp;
-}
-
-// Return the results.
-$server->service(file_get_contents("php://input"));

From a25facef7ce7c6aeae7f1116439a278bd60494da Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Sat, 3 Jun 2017 11:49:59 +0200
Subject: [PATCH 080/438] Fix: use 0 instead false

---
 ChangeLog                                          |  2 +-
 htdocs/accountancy/customer/card.php               |  2 +-
 htdocs/accountancy/customer/index.php              | 10 +++++-----
 htdocs/accountancy/customer/lines.php              |  4 ++--
 htdocs/accountancy/customer/list.php               |  2 +-
 htdocs/accountancy/expensereport/card.php          |  2 +-
 htdocs/accountancy/expensereport/index.php         |  6 +++---
 htdocs/accountancy/expensereport/lines.php         |  2 +-
 htdocs/accountancy/expensereport/list.php          |  2 +-
 .../accountancy/journal/expensereportsjournal.php  |  2 +-
 htdocs/accountancy/journal/purchasesjournal.php    |  2 +-
 htdocs/accountancy/supplier/card.php               |  2 +-
 htdocs/accountancy/supplier/index.php              |  6 +++---
 htdocs/accountancy/supplier/lines.php              |  2 +-
 htdocs/accountancy/supplier/list.php               |  2 +-
 .../compta/deplacement/class/deplacement.class.php |  2 +-
 htdocs/compta/facture/class/facture.class.php      |  2 +-
 htdocs/contrat/class/contrat.class.php             |  2 +-
 htdocs/contrat/index.php                           | 14 +++++++-------
 htdocs/core/class/html.form.class.php              |  2 +-
 htdocs/core/class/html.formmail.class.php          |  6 +++---
 htdocs/projet/class/project.class.php              |  2 +-
 htdocs/projet/class/task.class.php                 |  2 +-
 23 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 06650828623..fd431b407d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,7 +22,7 @@ Following changes may create regression for some external modules, but were nece
 * Removed Societe::set_commnucation_level (was deprecated in 4.0). Was not used.
 * Removed the trigger file of PAYPAL module that stored data that was not used by Dolibarr. The trigger event still
   exists, but if an external module need action on it, it must provides itself its trigger file.
-* Use getEntity('xxx') instead getEntity('xxx', 1) and use getEntity('xxx', false) instead getEntity('xxx') or getEntity('xxx', 0)
+* Use getEntity('xxx') instead getEntity('xxx', 1) and use getEntity('xxx', 0) instead getEntity('xxx')
 
 ***** ChangeLog for 5.0.3 compared to 5.0.2 *****
 FIX: #6677 Expired contracts dashboard box does not show the name of the thirdparty
diff --git a/htdocs/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php
index b32486038af..c436fdfd088 100644
--- a/htdocs/accountancy/customer/card.php
+++ b/htdocs/accountancy/customer/card.php
@@ -93,7 +93,7 @@ if (! empty($id)) {
 	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON l.fk_code_ventilation = aa.rowid";
 	$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = l.fk_facture";
 	$sql .= " WHERE f.fk_statut > 0 AND l.rowid = " . $id;
-	$sql .= " AND f.entity IN (" . getEntity('facture', false) . ")"; // We don't share object for accountancy
+	$sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")"; // We don't share object for accountancy
 
 	dol_syslog("/accounting/customer/card.php sql=" . $sql, LOG_DEBUG);
 	$result = $db->query($sql);
diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index ab10efde376..deca83b6f12 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -187,7 +187,7 @@ if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 } else {
 	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
 }
-$sql .= " AND f.entity IN (" . getEntity('facture', false) . ")";    // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")";    // We don't share object for accountancy
 
 dol_syslog("htdocs/accountancy/customer/index.php sql=" . $sql, LOG_DEBUG);
 $result = $db->query($sql);
@@ -228,7 +228,7 @@ $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_factu
 $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
 $sql .= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
 $sql .= "  AND f.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
-$sql .= " AND f.entity IN (" . getEntity('facture', false) . ")";   // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")";   // We don't share object for accountancy
 $sql .= " AND aa.account_number IS NULL";
 if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
@@ -284,7 +284,7 @@ $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_factu
 $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
 $sql .= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
 $sql .= "  AND f.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
-$sql .= " AND f.entity IN (" . getEntity('facture', false) . ")";   // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")";   // We don't share object for accountancy
 if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
 } else {
@@ -341,7 +341,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
     $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_facture";
     $sql .= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
     $sql .= "  AND f.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
-    $sql .= " AND f.entity IN (" . getEntity('facture', false) . ")"; // We don't share object for accountancy
+    $sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")"; // We don't share object for accountancy
     if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
         $sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
     } else {
@@ -387,7 +387,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
     	$sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_facture";
     	$sql .= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
     	$sql .= "  AND f.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
-    	$sql .= " AND f.entity IN (" . getEntity('facture', false) . ")";   // We don't share object for accountancy
+    	$sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")";   // We don't share object for accountancy
     	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
     	    $sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
     	} else {
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index f5e8881e51b..9c88a417bac 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -164,7 +164,7 @@ $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_factu
 $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_country as co ON co.rowid = s.fk_pays ";
 $sql .= " WHERE fd.fk_code_ventilation > 0 ";
-$sql .= " AND f.entity IN (" . getEntity('facture', false) . ")";   // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")";   // We don't share object for accountancy
 $sql .= " AND f.fk_statut > 0";
 if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
@@ -201,7 +201,7 @@ if (strlen(trim($search_country))) {
 if (strlen(trim($search_tvaintra))) {
 	$sql .= natural_search("s.tva_intra", $search_tva_intra);
 }
-$sql .= " AND f.entity IN (" . getEntity('facture', false) . ")";    // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")";    // We don't share object for accountancy
 $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index cc2495a0f9e..9e534d55af7 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -220,7 +220,7 @@ if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 } else {
 	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_STANDARD . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
 }
-$sql .= " AND f.entity IN (" . getEntity('facture', false) . ")";    // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")";    // We don't share object for accountancy
 
 $sql .= $db->order($sortfield, $sortorder);
 
diff --git a/htdocs/accountancy/expensereport/card.php b/htdocs/accountancy/expensereport/card.php
index 201e61e97ab..1c94b0b649a 100644
--- a/htdocs/accountancy/expensereport/card.php
+++ b/htdocs/accountancy/expensereport/card.php
@@ -96,7 +96,7 @@ if (! empty($id)) {
 	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON erd.fk_code_ventilation = aa.rowid";
 	$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "expensereport as er ON er.rowid = erd.fk_expensereport";
 	$sql .= " WHERE er.fk_statut > 0 AND erd.rowid = " . $id;
-	$sql .= " AND er.entity IN (" . getEntity('expensereport', false) . ")";     // We don't share object for accountancy
+	$sql .= " AND er.entity IN (" . getEntity('expensereport', 0) . ")";     // We don't share object for accountancy
 
 	dol_syslog("/accounting/expensereport/card.php sql=" . $sql, LOG_DEBUG);
 	$result = $db->query($sql);
diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
index 933cd6c3303..e9ce1b2e729 100644
--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -206,7 +206,7 @@ $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid =
 $sql .= " WHERE er.date_debut >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
 $sql .= " AND er.date_debut <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
 $sql .= " AND er.fk_statut > 0 ";
-$sql .= " AND er.entity IN (" . getEntity('expensereport', false) . ")";     // We don't share object for accountancy
+$sql .= " AND er.entity IN (" . getEntity('expensereport', 0) . ")";     // We don't share object for accountancy
 $sql .= " AND aa.account_number IS NULL";
 $sql .= " GROUP BY erd.fk_code_ventilation,aa.account_number,aa.label";
 
@@ -259,7 +259,7 @@ $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid =
 $sql .= " WHERE er.date_debut >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
 $sql .= " AND er.date_debut <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
 $sql .= " AND er.fk_statut > 0 ";
-$sql .= " AND er.entity IN (" . getEntity('expensereport', false) . ")";     // We don't share object for accountancy
+$sql .= " AND er.entity IN (" . getEntity('expensereport', 0) . ")";     // We don't share object for accountancy
 $sql .= " AND aa.account_number IS NOT NULL";
 $sql .= " GROUP BY erd.fk_code_ventilation,aa.account_number,aa.label";
 
@@ -313,7 +313,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
     $sql .= " WHERE er.date_debut >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
     $sql .= " AND er.date_debut <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
     $sql .= " AND er.fk_statut > 0 ";
-    $sql .= " AND er.entity IN (" . getEntity('expensereport', false) . ")";     // We don't share object for accountancy
+    $sql .= " AND er.entity IN (" . getEntity('expensereport', 0) . ")";     // We don't share object for accountancy
     
     dol_syslog('/accountancy/expensereport/index.php:: sql=' . $sql);
     $resql = $db->query($sql);
diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
index c678795bf2d..ca2369a11e4 100644
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -173,7 +173,7 @@ if (strlen(trim($search_account))) {
 if (strlen(trim($search_vat))) {
 	$sql .= " AND (erd.tva_tx like '" . $search_vat . "%')";
 }
-$sql .= " AND er.entity IN (" . getEntity('expensereport', false) . ")";  // We don't share object for accountancy
+$sql .= " AND er.entity IN (" . getEntity('expensereport', 0) . ")";  // We don't share object for accountancy
 
 $sql .= $db->order($sortfield, $sortorder);
 
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index 4b0a379faf3..01acf759260 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -203,7 +203,7 @@ if (strlen(trim($search_account))) {
 if (strlen(trim($search_vat))) {
     $sql .= natural_search("erd.tva_tx",$search_vat,1);
 }
-$sql .= " AND er.entity IN (" . getEntity('expensereport', false) . ")";  // We don't share object for accountancy
+$sql .= " AND er.entity IN (" . getEntity('expensereport', 0) . ")";  // We don't share object for accountancy
 
 $sql .= $db->order($sortfield, $sortorder);
 
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index f1f0ac4b0de..9ed0435f298 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -97,7 +97,7 @@ $sql .= " JOIN " . MAIN_DB_PREFIX . "expensereport as er ON er.rowid = erd.fk_ex
 $sql .= " JOIN " . MAIN_DB_PREFIX . "user as u ON u.rowid = er.fk_user_author";
 $sql .= " WHERE er.fk_statut > 0 ";
 $sql .= " AND erd.fk_code_ventilation > 0 ";
-$sql .= " AND er.entity IN (" . getEntity('expensereport', false) . ")";  // We don't share object for accountancy
+$sql .= " AND er.entity IN (" . getEntity('expensereport', 0) . ")";  // We don't share object for accountancy
 if ($date_start && $date_end)
 	$sql .= " AND er.date_debut >= '" . $db->idate($date_start) . "' AND er.date_debut <= '" . $db->idate($date_end) . "'";
 $sql .= " ORDER BY er.date_debut";
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index e7f887547d3..a8dd976ba9e 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -96,7 +96,7 @@ $sql .= " JOIN " . MAIN_DB_PREFIX . "facture_fourn as f ON f.rowid = fd.fk_factu
 $sql .= " JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
 $sql .= " WHERE f.fk_statut > 0 ";
 $sql .= " AND fd.fk_code_ventilation > 0 ";
-$sql .= " AND f.entity IN (" . getEntity('facture_fourn', false) . ")";  // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity('facture_fourn', 0) . ")";  // We don't share object for accountancy
 if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
 	$sql .= " AND f.type IN (0,1,2)";
 else
diff --git a/htdocs/accountancy/supplier/card.php b/htdocs/accountancy/supplier/card.php
index 863c68c5746..69a7855dfd2 100644
--- a/htdocs/accountancy/supplier/card.php
+++ b/htdocs/accountancy/supplier/card.php
@@ -96,7 +96,7 @@ if (! empty($id)) {
 	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON l.fk_code_ventilation = aa.rowid";
 	$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facture_fourn as f ON f.rowid = l.fk_facture_fourn ";
 	$sql .= " WHERE f.fk_statut > 0 AND l.rowid = " . $id;
-	$sql .= " AND f.entity IN (" . getEntity('facture_fourn', false) . ")";     // We don't share object for accountancy
+	$sql .= " AND f.entity IN (" . getEntity('facture_fourn', 0) . ")";     // We don't share object for accountancy
 	
 	dol_syslog("/accounting/supplier/card.php sql=" . $sql, LOG_DEBUG);
 	$result = $db->query($sql);
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index fdaa70e22ca..805c5e40420 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -204,7 +204,7 @@ $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid
 $sql .= " WHERE ff.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
 $sql .= "  AND ff.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
 $sql .= "  AND ff.fk_statut > 0 ";
-$sql .= " AND ff.entity IN (" . getEntity('facture_fourn', false) . ")";     // We don't share object for accountancy
+$sql .= " AND ff.entity IN (" . getEntity('facture_fourn', 0) . ")";     // We don't share object for accountancy
 $sql .= " AND aa.account_number IS NULL";
 $sql .= " GROUP BY ffd.fk_code_ventilation,aa.account_number,aa.label";
 
@@ -258,7 +258,7 @@ $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid
 $sql .= " WHERE ff.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
 $sql .= "  AND ff.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
 $sql .= "  AND ff.fk_statut > 0 ";
-$sql .= " AND ff.entity IN (" . getEntity('facture_fourn', false) . ")";     // We don't share object for accountancy
+$sql .= " AND ff.entity IN (" . getEntity('facture_fourn', 0) . ")";     // We don't share object for accountancy
 $sql .= " AND aa.account_number IS NOT NULL";
 $sql .= " GROUP BY ffd.fk_code_ventilation,aa.account_number,aa.label";
 
@@ -312,7 +312,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
     $sql .= " WHERE ff.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
     $sql .= "  AND ff.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
     $sql .= "  AND ff.fk_statut > 0 ";
-    $sql .= " AND ff.entity IN (" . getEntity('facture_fourn', false) . ")";     // We don't share object for accountancy
+    $sql .= " AND ff.entity IN (" . getEntity('facture_fourn', 0) . ")";     // We don't share object for accountancy
     
     dol_syslog('/accountancy/supplier/index.php:: sql=' . $sql);
     $resql = $db->query($sql);
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 22982a6f087..06308a67fa1 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -182,7 +182,7 @@ if (strlen(trim($search_account))) {
 if (strlen(trim($search_vat))) {
 	$sql .= natural_search("l.tva_tx", $search_vat, 1);
 }
-$sql .= " AND f.entity IN (" . getEntity('facture_fourn', false) . ")";  // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity('facture_fourn', 0) . ")";  // We don't share object for accountancy
 
 $sql .= $db->order($sortfield, $sortorder);
 
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 30a42410d8b..7ed1453982e 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -217,7 +217,7 @@ if (strlen(trim($search_account))) {
 if (strlen(trim($search_vat))) {
     $sql .= natural_search("l.tva_tx",$search_vat,1);
 }
-$sql .= " AND f.entity IN (" . getEntity('facture_fourn', false) . ")";  // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity('facture_fourn', 0) . ")";  // We don't share object for accountancy
 
 $sql .= $db->order($sortfield, $sortorder);
 
diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php
index 6fb146c205b..ea8b85c55af 100644
--- a/htdocs/compta/deplacement/class/deplacement.class.php
+++ b/htdocs/compta/deplacement/class/deplacement.class.php
@@ -223,7 +223,7 @@ class Deplacement extends CommonObject
 	{
 		$sql = "SELECT rowid, fk_user, type, fk_statut, km, fk_soc, dated, note_private, note_public, fk_projet, extraparams";
 		$sql.= " FROM ".MAIN_DB_PREFIX."deplacement";
-		$sql.= " WHERE entity IN (".getEntity('deplacement', false).")";
+		$sql.= " WHERE entity IN (".getEntity('deplacement', 0).")";
 		if ($ref) $sql.= " AND ref ='".$this->db->escape($ref)."'";
 		else $sql.= " AND rowid = ".$id;
 
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 86e8dd893f5..880832f80e1 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -3965,7 +3965,7 @@ class Facture extends CommonInvoice
 	function newCycle()
 	{
 		$sql = 'SELECT max(situation_cycle_ref) FROM ' . MAIN_DB_PREFIX . 'facture as f';
-		$sql.= " WHERE f.entity in (".getEntity('facture', false).")";
+		$sql.= " WHERE f.entity in (".getEntity('facture', 0).")";
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			if ($resql->num_rows > 0)
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index d40e41013dd..2b0dd2f2924 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -504,7 +504,7 @@ class Contrat extends CommonObject
 		if ($ref)
 		{
 			$sql.= " WHERE ref='".$this->db->escape($ref)."'";
-			$sql.= " AND entity IN (".getEntity('contract', false).")";
+			$sql.= " AND entity IN (".getEntity('contract', 0).")";
 		}
 		else $sql.= " WHERE rowid=".$id;
 
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 608a1167fba..509467cc822 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -107,7 +107,7 @@ $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."contrat as c";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE cd.fk_contrat = c.rowid AND c.fk_soc = s.rowid";
 $sql.= " AND (cd.statut != 4 OR (cd.statut = 4 AND (cd.date_fin_validite is null or cd.date_fin_validite >= '".$db->idate($now)."')))";
-$sql.= " AND c.entity IN (".getEntity('contract', false).")";
+$sql.= " AND c.entity IN (".getEntity('contract', 0).")";
 if ($user->societe_id) $sql.=' AND c.fk_soc = '.$user->societe_id;
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 $sql.= " GROUP BY cd.statut";
@@ -144,7 +144,7 @@ $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."contrat as c";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE cd.fk_contrat = c.rowid AND c.fk_soc = s.rowid";
 $sql.= " AND (cd.statut = 4 AND cd.date_fin_validite < '".$db->idate($now)."')";
-$sql.= " AND c.entity IN (".getEntity('contract', false).")";
+$sql.= " AND c.entity IN (".getEntity('contract', 0).")";
 if ($user->societe_id) $sql.=' AND c.fk_soc = '.$user->societe_id;
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 $sql.= " GROUP BY cd.statut";
@@ -230,7 +230,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
 	$sql .= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE s.rowid = c.fk_soc";
-	$sql.= " AND c.entity IN (".getEntity('contract', false).")";
+	$sql.= " AND c.entity IN (".getEntity('contract', 0).")";
 	$sql.= " AND c.statut = 0";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 	if ($socid) $sql.= " AND c.fk_soc = ".$socid;
@@ -302,7 +302,7 @@ if (!$user->rights->societe->client->voir && !$socid) $sql.= " ".MAIN_DB_PREFIX.
 $sql.= " ".MAIN_DB_PREFIX."contrat as c";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."contratdet as cd ON c.rowid = cd.fk_contrat";
 $sql.= " WHERE c.fk_soc = s.rowid";
-$sql.= " AND c.entity IN (".getEntity('contract', false).")";
+$sql.= " AND c.entity IN (".getEntity('contract', 0).")";
 $sql.= " AND c.statut > 0";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($socid) $sql.= " AND s.rowid = ".$socid;
@@ -372,7 +372,7 @@ $sql.= ", ".MAIN_DB_PREFIX."societe as s";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd";
 $sql.= ") LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
-$sql.= " WHERE c.entity IN (".getEntity('contract', false).")";
+$sql.= " WHERE c.entity IN (".getEntity('contract', 0).")";
 $sql.= " AND cd.fk_contrat = c.rowid";
 $sql.= " AND c.fk_soc = s.rowid";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
@@ -450,7 +450,7 @@ $sql.= ", ".MAIN_DB_PREFIX."societe as s";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd";
 $sql.= " ) LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
-$sql.= " WHERE c.entity IN (".getEntity('contract', false).")";
+$sql.= " WHERE c.entity IN (".getEntity('contract', 0).")";
 $sql.= " AND c.statut = 1";
 $sql.= " AND cd.statut = 0";
 $sql.= " AND cd.fk_contrat = c.rowid";
@@ -529,7 +529,7 @@ $sql.= ", ".MAIN_DB_PREFIX."societe as s";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd";
 $sql.= " ) LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
-$sql.= " WHERE c.entity IN (".getEntity('contract', false).")";
+$sql.= " WHERE c.entity IN (".getEntity('contract', 0).")";
 $sql.= " AND c.statut = 1";
 $sql.= " AND cd.statut = 4";
 $sql.= " AND cd.date_fin_validite < '".$db->idate($now)."'";
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index b2f831a1cbb..7b112a2d333 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4361,7 +4361,7 @@ class Form
 		$TCurrency = array();
 
 		$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'multicurrency';
-		$sql.= " WHERE entity IN ('".getEntity('mutlicurrency', false)."')";
+		$sql.= " WHERE entity IN ('".getEntity('mutlicurrency', 0)."')";
 		$resql = $db->query($sql);
 		if ($resql)
 		{
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 0d953a22be6..860d3fcfb1c 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -843,7 +843,7 @@ class FormMail extends Form
 		$sql = "SELECT label, topic, content, content_lines, lang";
 		$sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
 		$sql.= " WHERE type_template='".$db->escape($type_template)."'";
-		$sql.= " AND entity IN (".getEntity('c_email_templates', false).")";
+		$sql.= " AND entity IN (".getEntity('c_email_templates', 0).")";
 		$sql.= " AND (fk_user is NULL or fk_user = 0 or fk_user = ".$user->id.")";
 		if ($active >= 0) $sql.=" AND active = ".$active;
 		if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";
@@ -910,7 +910,7 @@ class FormMail extends Form
 		$sql = "SELECT label, topic, content, lang";
 		$sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
 		$sql.= " WHERE type_template='".$this->db->escape($type_template)."'";
-		$sql.= " AND entity IN (".getEntity('c_email_templates', false).")";
+		$sql.= " AND entity IN (".getEntity('c_email_templates', 0).")";
 		$sql.= " AND (fk_user is NULL or fk_user = 0 or fk_user = ".$user->id.")";
 		if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";
 		$sql.= $this->db->order("lang,label","ASC");
@@ -947,7 +947,7 @@ class FormMail extends Form
 		$sql = "SELECT rowid, label, topic, content, content_lines, lang, position";
 		$sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
 		$sql.= " WHERE type_template='".$this->db->escape($type_template)."'";
-		$sql.= " AND entity IN (".getEntity('c_email_templates', false).")";
+		$sql.= " AND entity IN (".getEntity('c_email_templates', 0).")";
 		$sql.= " AND (fk_user is NULL or fk_user = 0 or fk_user = ".$user->id.")";
 		if ($active >= 0) $sql.=" AND active = ".$active;
 		if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index ba394f1b8e6..ca3a1157e74 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -1681,7 +1681,7 @@ class Project extends CommonObject
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
         if (! $user->rights->societe->client->voir && ! $socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
         $sql.= " WHERE p.fk_statut = 1";
-        $sql.= " AND p.entity IN (".getEntity('project', false).')';
+        $sql.= " AND p.entity IN (".getEntity('project', 0).')';
         if ($mine || ! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")";
         // No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
         //if ($socid || ! $user->rights->societe->client->voir)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index b751f8f0478..227ea68d41b 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -1704,7 +1704,7 @@ class Task extends CommonObject
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
         if (! $user->rights->societe->client->voir && ! $socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
         $sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
-        $sql.= " WHERE p.entity IN (".getEntity('project', false).')';
+        $sql.= " WHERE p.entity IN (".getEntity('project', 0).')';
         $sql.= " AND p.fk_statut = 1";
         $sql.= " AND t.fk_projet = p.rowid";
         $sql.= " AND t.progress < 100";         // tasks to do

From 74710827b25622c354fa21516a57ef505e3c06e1 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Sat, 3 Jun 2017 14:15:34 +0200
Subject: [PATCH 081/438] Fix: avoid warning "Undefined property:
 stdClass::$AGENDA_DEFAULT_FILTER_TYPE"

---
 htdocs/core/class/conf.class.php | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 578ed17049e..edac78e9b30 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2003      Xavier Dutoit        <doli@sydesy.com>
  * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin      	<regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2017 Regis Houssin      	<regis.houssin@capnetworks.com>
  * Copyright (C) 2006 	   Jean Heimburger    	<jean@tiaris.info>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -320,7 +320,7 @@ class Conf
 		// For backward compatibility
 		$this->user->dir_output=$rootforuser."/users";
 		$this->user->dir_temp=$rootforuser."/users/temp";
-		
+
 		// UserGroup
 		$this->usergroup->dir_output=$rootforuser."/usergroups";
 		$this->usergroup->dir_temp=$rootforuser."/usergroups/temp";
@@ -386,13 +386,13 @@ class Conf
 
 		$this->global->MAIN_ACTIVATE_HTML5=1;
         $this->global->MAIN_MAIL_USE_MULTI_PART=1;
-        
+
 		// societe
 		if (empty($this->global->SOCIETE_CODECLIENT_ADDON))       $this->global->SOCIETE_CODECLIENT_ADDON="mod_codeclient_leopard";
 		if (empty($this->global->SOCIETE_CODECOMPTA_ADDON))       $this->global->SOCIETE_CODECOMPTA_ADDON="mod_codecompta_panicum";
 
 		if (empty($this->global->CHEQUERECEIPTS_ADDON))           $this->global->CHEQUERECEIPTS_ADDON='mod_chequereceipt_mint';
-		
+
         // Security
 		if (empty($this->global->USER_PASSWORD_GENERATED)) $this->global->USER_PASSWORD_GENERATED='standard'; // Default password generator
         if (empty($this->global->MAIN_UMASK)) $this->global->MAIN_UMASK='0664';         // Default mask
@@ -425,7 +425,7 @@ class Conf
 		$this->currency=$this->global->MAIN_MONNAIE;
 
 		if (empty($conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY)) $conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY = 30;   // Less than 1 minutes to be sure
-		
+
 		// conf->global->ACCOUNTING_MODE = Option des modules Comptabilites (simple ou expert). Defini le mode de calcul des etats comptables (CA,...)
         if (empty($this->global->ACCOUNTING_MODE)) $this->global->ACCOUNTING_MODE='RECETTES-DEPENSES';  // By default. Can be 'RECETTES-DEPENSES' ou 'CREANCES-DETTES'
 
@@ -434,7 +434,7 @@ class Conf
 
         // MAIN_HTML_TITLE
         if (! isset($this->global->MAIN_HTML_TITLE)) $this->global->MAIN_HTML_TITLE='noapp,thirdpartynameonly,contactnameonly,projectnameonly';
-        
+
 		// conf->liste_limit = constante de taille maximale des listes
 		if (empty($this->global->MAIN_SIZE_LISTE_LIMIT)) $this->global->MAIN_SIZE_LISTE_LIMIT=25;
 		$this->liste_limit=$this->global->MAIN_SIZE_LISTE_LIMIT;
@@ -461,7 +461,7 @@ class Conf
 		$this->mailing->email_from=$this->email_from;
 		if (! empty($this->global->MAILING_EMAIL_FROM))	$this->mailing->email_from=$this->global->MAILING_EMAIL_FROM;
 		if (! isset($this->global->MAIN_EMAIL_ADD_TRACK_ID)) $this->global->MAIN_EMAIL_ADD_TRACK_ID=1;
-		
+
         // Format for date (used by default when not found or not searched in lang)
         $this->format_date_short="%d/%m/%Y";            // Format of day with PHP/C tags (strftime functions)
         $this->format_date_short_java="dd/MM/yyyy";     // Format of day with Java tags
@@ -485,7 +485,7 @@ class Conf
 		// Default pdf option
 		if (! isset($this->global->MAIN_PDF_DASH_BETWEEN_LINES)) $this->global->MAIN_PDF_DASH_BETWEEN_LINES=1;    // use dash between lines
         if (! isset($this->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) $this->global->PDF_ALLOW_HTML_FOR_FREE_TEXT=1;  // allow html content into free footer text
-		
+
 		// Set default value to MAIN_SHOW_LOGO
 		if (! isset($this->global->MAIN_SHOW_LOGO)) $this->global->MAIN_SHOW_LOGO=1;
 
@@ -500,7 +500,7 @@ class Conf
 
 		// By default, we open card if one found
 		if (! isset($this->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE)) $this->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE=1;
-		
+
 		// Define list of limited modules (value must be key found for "name" property of module, so for example 'supplierproposal' for Module "Supplier Proposal"
 		if (! isset($this->global->MAIN_MODULES_FOR_EXTERNAL)) $this->global->MAIN_MODULES_FOR_EXTERNAL='user,societe,propal,commande,facture,categorie,supplierproposal,fournisseur,contact,projet,contrat,ficheinter,expedition,agenda,resource,adherent';	// '' means 'all'. Note that contact is added here as it should be a module later.
 
@@ -568,12 +568,12 @@ class Conf
 		    $this->expensereport->payment		= new stdClass();
 		    $this->expensereport->payment->warning_delay=(isset($this->global->MAIN_DELAY_EXPENSEREPORTS_TO_PAY)?$this->global->MAIN_DELAY_EXPENSEREPORTS_TO_PAY:0)*24*60*60;
 		}
-		
+
 		if (! empty($this->global->PRODUIT_MULTIPRICES) && empty($this->global->PRODUIT_MULTIPRICES_LIMIT))
 		{
 		    $this->global->PRODUIT_MULTIPRICES_LIMIT = 5;
 		}
-		
+
 		// For modules that want to disable top or left menu
 		if (! empty($this->global->MAIN_HIDE_TOP_MENU)) $this->dol_hide_topmenu=$this->global->MAIN_HIDE_TOP_MENU;
 		if (! empty($this->global->MAIN_HIDE_LEFT_MENU)) $this->dol_hide_leftmenu=$this->global->MAIN_HIDE_LEFT_MENU;
@@ -581,11 +581,11 @@ class Conf
 		if (empty($this->global->MAIN_SIZE_SHORTLIST_LIMIT)) $this->global->MAIN_SIZE_SHORTLIST_LIMIT=3;
 
 		// Save inconsistent option
-		if (empty($conf->global->AGENDA_USE_EVENT_TYPE) && $conf->global->AGENDA_DEFAULT_FILTER_TYPE == 'AC_NON_AUTO')
+		if (empty($conf->global->AGENDA_USE_EVENT_TYPE) && (! isset($conf->global->AGENDA_DEFAULT_FILTER_TYPE) || $conf->global->AGENDA_DEFAULT_FILTER_TYPE == 'AC_NON_AUTO'))
 		{
 		    $conf->global->AGENDA_DEFAULT_FILTER_TYPE='0';    // 'AC_NON_AUTO' does not exists when AGENDA_DEFAULT_FILTER_TYPE is not on.
 		}
-		    
+
 		// For backward compatibility
 		if (isset($this->product))   $this->produit=$this->product;
 		if (isset($this->facture))   $this->invoice=$this->facture;
@@ -633,7 +633,7 @@ class Conf
 				$this->loghandlers[$handler] = $loghandlerinstance;
 			}
 		}
-		
+
 	}
 }
 

From 6787d717f915be421949ef03b97983088940529a Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sat, 3 Jun 2017 18:23:19 +0200
Subject: [PATCH 082/438] Update bonprelevement.class.php

---
 htdocs/compta/prelevement/class/bonprelevement.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 134e125b067..a63708bfe6a 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -1565,7 +1565,7 @@ class BonPrelevement extends CommonObject
 		$XML_DEBITOR .='					<Nm>'.strtoupper(dolEscapeXML(dol_string_unaccent($row_nom))).'</Nm>'.$CrLf;
 		$XML_DEBITOR .='					<PstlAdr>'.$CrLf;
 		$XML_DEBITOR .='						<Ctry>'.$row_country_code.'</Ctry>'.$CrLf;
-		$XML_DEBITOR .='						<AdrLine>'.dol_trunc(dolEscapeXML(dol_string_unaccent(strtr($row_address, array(CHR(13) => ", ", CHR(10) => "")))),70,'right','UTF-8',true).'</AdrLine>'.$CrLf;
+		$XML_DEBITOR .='						<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_unaccent(strtr($row_address, array(CHR(13) => ", ", CHR(10) => "")))),70,'right','UTF-8',true).'</AdrLine>'.$CrLf;
 		$XML_DEBITOR .='						<AdrLine>'.dolEscapeXML(dol_string_unaccent($row_zip.' '.$row_town)).'</AdrLine>'.$CrLf;
 		$XML_DEBITOR .='					</PstlAdr>'.$CrLf;
 		$XML_DEBITOR .='				</Dbtr>'.$CrLf;

From a0b4f8b004f99065b0451b36ddb09036333e9f1e Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Sun, 4 Jun 2017 12:09:54 +0200
Subject: [PATCH 083/438] FIX : bug #6943

---
 htdocs/societe/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 346f4ea38dc..ba4383e6f8e 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -2417,7 +2417,7 @@ else
 
 	        if ($user->rights->societe->supprimer)
 	        {
-	        	print '<div class="inline-block divButAction"><a class="butActionDelete" href="soc.php?action=merge&socid='.$object->id.'" title="'.dol_escape_htmltag($langs->trans("MergeThirdparties")).'">'.$langs->trans('Merge').'</a></div>';
+	        	print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?action=merge&socid='.$object->id.'" title="'.dol_escape_htmltag($langs->trans("MergeThirdparties")).'">'.$langs->trans('Merge').'</a></div>';
 	        }
 
 	        if ($user->rights->societe->supprimer)

From 806d25ae4116f5141a0c2f8f6404ed4b738d4979 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Mon, 5 Jun 2017 06:44:53 +0200
Subject: [PATCH 084/438] Activate multi-journal on expensereport journal

---
 .../journal/expensereportsjournal.php         | 311 +++++++++---------
 htdocs/core/menus/standard/eldy.lib.php       |   1 +
 htdocs/install/mysql/data/llx_accounting.sql  |   1 +
 .../install/mysql/migration/5.0.0-6.0.0.sql   |   1 +
 .../mysql/tables/llx_accounting_journal.sql   |   2 +-
 5 files changed, 163 insertions(+), 153 deletions(-)

diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index f67224e3996..9bd9f8b7f42 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2007-2010	Jean Heimburger		<jean@tiaris.info>
  * Copyright (C) 2011		Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2012		Regis Houssin		<regis@dolibarr.fr>
- * Copyright (C) 2013-2016	Alexandre Spangaro	<aspangaro@zendsi.com>
+ * Copyright (C) 2013-2017	Alexandre Spangaro	<aspangaro@zendsi.com>
  * Copyright (C) 2013-2016	Olivier Geffroy		<jeff@jeffinfo.com>
  * Copyright (C) 2013-2016	Florian Henry		<florian.henry@open-concept.pro>
  *
@@ -32,10 +32,11 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
 require_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 
 // Langs
 $langs->load("compta");
@@ -45,6 +46,9 @@ $langs->load("main");
 $langs->load("accountancy");
 $langs->load("trips");
 
+// Multi journal
+$id_journal = GETPOST('id_journal', 'int');
+
 $date_startmonth = GETPOST('date_startmonth');
 $date_startday = GETPOST('date_startday');
 $date_startyear = GETPOST('date_startyear');
@@ -64,6 +68,10 @@ $action = GETPOST('action','aZ09');
 /*
  * Actions
  */
+// Get code of finance journal
+$accountingjournalstatic = new AccountingJournal($db);
+$accountingjournalstatic->fetch($id_journal);
+$journal = $accountingjournalstatic->code;
 
 $year_current = strftime("%Y", dol_now());
 $pastmonth = strftime("%m", dol_now()) - 1;
@@ -157,161 +165,159 @@ if ($action == 'writebookkeeping') {
 	{
 		$errorforline = 0;
 
-	    $db->begin();
-	     
-        if (! $errorforline)
-        {
-    	    foreach ( $tabttc[$key] as $k => $mt ) {
-    			if ($mt) {
-        	        // get compte id and label
-        
-        			$bookkeeping = new BookKeeping($db);
-        			$bookkeeping->doc_date = $val["date"];
-        			$bookkeeping->doc_ref = $val["ref"];
-        			$bookkeeping->date_create = $now;
-        			$bookkeeping->doc_type = 'expense_report';
-        			$bookkeeping->fk_doc = $key;
-        			$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
-        			$bookkeeping->code_tiers = $tabuser[$key]['user_accountancy_code'];
-        			$bookkeeping->label_compte = $tabuser[$key]['name'];
-        			$bookkeeping->numero_compte = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
-        			$bookkeeping->montant = $mt;
-        			$bookkeeping->sens = ($mt >= 0) ? 'C' : 'D';
-        			$bookkeeping->debit = ($mt <= 0) ? $mt : 0;
-        			$bookkeeping->credit = ($mt > 0) ? $mt : 0;
-        			$bookkeeping->code_journal = $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL;
-        			$bookkeeping->fk_user_author = $user->id;
-        
-        			$result = $bookkeeping->create($user);
-        			if ($result < 0) {
-        			    if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-        			    {
-        			        $error++;
-        			        $errorforline++;
-        			        //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-        			    }
-        			    else
-        			    {
-        			        $error++;
-        			        $errorforline++;
-        			        setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-        			    }
-        			}
-    			}
-    		}
-        }
-        
-        if (! $errorforline)
-        {
-            // Fees
-    		foreach ( $tabht[$key] as $k => $mt ) {
-    			$accountingaccount = new AccountingAccount($db);
-    			$accountingaccount->fetch(null, $k, true);
-    			if ($mt) {
-    				// get compte id and label
-    				$accountingaccount = new AccountingAccount($db);
-    				if ($accountingaccount->fetch(null, $k, true)) {
-    					$bookkeeping = new BookKeeping($db);
-    					$bookkeeping->doc_date = $val["date"];
-    					$bookkeeping->doc_ref = $val["ref"];
-    					$bookkeeping->date_create = $now;
-    					$bookkeeping->doc_type = 'expense_report';
-    					$bookkeeping->fk_doc = $key;
-    					$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
-    					$bookkeeping->code_tiers = '';
-    					$bookkeeping->label_compte = $accountingaccount->label;
-    					$bookkeeping->numero_compte = $k;
-    					$bookkeeping->montant = $mt;
-    					$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
-    					$bookkeeping->debit = ($mt > 0) ? $mt : 0;
-    					$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
-    					$bookkeeping->code_journal = $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL;
-    					$bookkeeping->fk_user_author = $user->id;
-    
-    					$result = $bookkeeping->create($user);
-	        			if ($result < 0) {
-            			    if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-            			    {
-            			        $error++;
-            			        $errorforline++;
-            			        //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-            			    }
-            			    else
-            			    {
-            			        $error++;
-            			        $errorforline++;
-            			        setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-            			    }
-	        			}
-    				}
-    			}
-    		}
-        }
-        
-        if (! $errorforline)
-        {
-            // VAT
-    		// var_dump($tabtva);
-    		foreach ( $tabtva[$key] as $k => $mt ) {
-    			if ($mt) {
-    				// get compte id and label
-    				$bookkeeping = new BookKeeping($db);
-    				$bookkeeping->doc_date = $val["date"];
-    				$bookkeeping->doc_ref = $val["ref"];
-    				$bookkeeping->date_create = $now;
-    				$bookkeeping->doc_type = 'expense_report';
-    				$bookkeeping->fk_doc = $key;
-    				$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
-    				$bookkeeping->code_tiers = '';
-    				$bookkeeping->label_compte = $langs->trans("VAT"). ' '.$def_tva[$key];
-    				$bookkeeping->numero_compte = $k;
-    				$bookkeeping->montant = $mt;
-    				$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
-    				$bookkeeping->debit = ($mt > 0) ? $mt : 0;
-    				$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
-    				$bookkeeping->code_journal = $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL;
-    				$bookkeeping->fk_user_author = $user->id;
-    
-    				$result = $bookkeeping->create($user);
-    				if ($result < 0) {
-           			    if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-        			    {
-        			        $error++;
-        			        $errorforline++;
-        			        //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-        			    }
-        			    else
-        			    {
-        			        $error++;
-        			        $errorforline++;
-        			        setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-        			    }
-    				}
-    			}
-    		}
-        }
-        
+		$db->begin();
+
 		if (! $errorforline)
 		{
-		    $db->commit();
+			foreach ( $tabttc[$key] as $k => $mt ) {
+				if ($mt) {
+					// get compte id and label
+					$bookkeeping = new BookKeeping($db);
+					$bookkeeping->doc_date = $val["date"];
+					$bookkeeping->doc_ref = $val["ref"];
+					$bookkeeping->date_create = $now;
+					$bookkeeping->doc_type = 'expense_report';
+					$bookkeeping->fk_doc = $key;
+					$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
+					$bookkeeping->code_tiers = $tabuser[$key]['user_accountancy_code'];
+					$bookkeeping->label_compte = $tabuser[$key]['name'];
+					$bookkeeping->numero_compte = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
+					$bookkeeping->montant = $mt;
+					$bookkeeping->sens = ($mt >= 0) ? 'C' : 'D';
+					$bookkeeping->debit = ($mt <= 0) ? $mt : 0;
+					$bookkeeping->credit = ($mt > 0) ? $mt : 0;
+					$bookkeeping->code_journal = $journal;
+					$bookkeeping->fk_user_author = $user->id;
+
+					$result = $bookkeeping->create($user);
+					if ($result < 0) {
+						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+						{
+							$error++;
+							$errorforline++;
+							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+						}
+						else
+						{
+							$error++;
+							$errorforline++;
+							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+						}
+					}
+				}
+			}
+		}
+
+		if (! $errorforline)
+		{
+			// Fees
+			foreach ( $tabht[$key] as $k => $mt ) {
+				$accountingaccount = new AccountingAccount($db);
+				$accountingaccount->fetch(null, $k, true);
+				if ($mt) {
+					// get compte id and label
+					$accountingaccount = new AccountingAccount($db);
+					if ($accountingaccount->fetch(null, $k, true)) {
+						$bookkeeping = new BookKeeping($db);
+						$bookkeeping->doc_date = $val["date"];
+						$bookkeeping->doc_ref = $val["ref"];
+						$bookkeeping->date_create = $now;
+						$bookkeeping->doc_type = 'expense_report';
+						$bookkeeping->fk_doc = $key;
+						$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
+						$bookkeeping->code_tiers = '';
+						$bookkeeping->label_compte = $accountingaccount->label;
+						$bookkeeping->numero_compte = $k;
+						$bookkeeping->montant = $mt;
+						$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
+						$bookkeeping->debit = ($mt > 0) ? $mt : 0;
+						$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
+						$bookkeeping->code_journal = $journal;
+						$bookkeeping->fk_user_author = $user->id;
+
+						$result = $bookkeeping->create($user);
+						if ($result < 0) {
+							if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+							{
+								$error++;
+								$errorforline++;
+								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+							}
+							else
+							{
+								$error++;
+								$errorforline++;
+								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+							}
+						}
+					}
+				}
+			}
+		}
+
+		if (! $errorforline)
+		{
+			// VAT
+			// var_dump($tabtva);
+			foreach ( $tabtva[$key] as $k => $mt ) {
+				if ($mt) {
+					// get compte id and label
+					$bookkeeping = new BookKeeping($db);
+					$bookkeeping->doc_date = $val["date"];
+					$bookkeeping->doc_ref = $val["ref"];
+					$bookkeeping->date_create = $now;
+					$bookkeeping->doc_type = 'expense_report';
+					$bookkeeping->fk_doc = $key;
+					$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
+					$bookkeeping->code_tiers = '';
+					$bookkeeping->label_compte = $langs->trans("VAT"). ' '.$def_tva[$key];
+					$bookkeeping->numero_compte = $k;
+					$bookkeeping->montant = $mt;
+					$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
+					$bookkeeping->debit = ($mt > 0) ? $mt : 0;
+					$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
+					$bookkeeping->code_journal = $journal;
+					$bookkeeping->fk_user_author = $user->id;
+
+					$result = $bookkeeping->create($user);
+					if ($result < 0) {
+						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+						{
+							$error++;
+							$errorforline++;
+							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+						}
+						else
+						{
+							$error++;
+							$errorforline++;
+							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+						}
+					}
+				}
+			}
+		}
+
+		if (! $errorforline)
+		{
+			$db->commit();
 		}
 		else
 		{
-		    $db->rollback();
+			$db->rollback();
 		}
-		
 	}
 
 	if (empty($error) && count($tabpay)) {
-	    setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
+		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
 	}
 	elseif (count($tabpay) == $error)
 	{
-	    setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
+		setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
 	}
 	else
 	{
-	    setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
+		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
 	}
 
 	$action='';
@@ -328,7 +334,6 @@ $userstatic = new User($db);
 // Export
 /*if ($action == 'export_csv') {
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
-	$journal = $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL;
 
 	include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';
 
@@ -448,7 +453,9 @@ if (empty($action) || $action == 'view') {
 
 	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
 
-	journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''));
+	$varlink = 'id_journal=' . $id_journal;
+
+	journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''), '', $varlink);
 
 	/*if ($conf->global->ACCOUNTING_EXPORT_MODELCSV != 1 && $conf->global->ACCOUNTING_EXPORT_MODELCSV != 2) {
 		print '<input type="button" class="butActionRefused" style="float: right;" value="' . $langs->trans("Export") . '" disabled="disabled" title="' . $langs->trans('ExportNotSupported') . '"/>';
@@ -456,10 +463,10 @@ if (empty($action) || $action == 'view') {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
 	}*/
 
-    print '<div class="tabsAction">';
+	print '<div class="tabsAction">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
-    print '</div>';
-    
+	print '</div>';
+
 	print '
 	<script type="text/javascript">
 		function launch_export() {
@@ -556,9 +563,9 @@ if (empty($action) || $action == 'view') {
 
 		// Third party
 		foreach ( $tabttc[$key] as $k => $mt ) {
-		    print '<tr class="oddeven">';
-		    print "<td><!-- Thirdparty --></td>";
-		    print "<td>" . $date . "</td>";
+			print '<tr class="oddeven">';
+			print "<td><!-- Thirdparty --></td>";
+			print "<td>" . $date . "</td>";
 			print "<td>" . $expensereportstatic->getNomUrl(1) . "</td>";
 			$userstatic->id = $tabuser[$key]['id'];
 			$userstatic->name = $tabuser[$key]['name'];
@@ -566,14 +573,14 @@ if (empty($action) || $action == 'view') {
 			$accountoshow = length_accounta($k);
 			if (empty($accountoshow) || $accountoshow == 'NotDefined')
 			{
-			    print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
+				print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
 			}
 			else print $accountoshow;
 			print "</td>";
 			print "<td>" . $userstatic->getNomUrl(0, 'user', 16) . ' - ' . $langs->trans("Code_tiers") . "</td>";
 			print '<td align="right">' . ($mt < 0 ? - price(- $mt) : '') . "</td>";
 			print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
-		    print "</tr>";
+			print "</tr>";
 		}
 	}
 
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 8b167e3a6f6..8b6b26d772c 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1027,6 +1027,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 								if ($objp->nature == 2) $nature="sells";
 								if ($objp->nature == 3) $nature="purchases";
 								if ($objp->nature == 4) $nature="bank";
+								if ($objp->nature == 5) $nature="expensereports";
 								if ($objp->nature == 1) $nature="various";
 								if ($objp->nature == 9) $nature="hasnew";
 
diff --git a/htdocs/install/mysql/data/llx_accounting.sql b/htdocs/install/mysql/data/llx_accounting.sql
index e81d13dd2b8..ea1fe7a7dd7 100644
--- a/htdocs/install/mysql/data/llx_accounting.sql
+++ b/htdocs/install/mysql/data/llx_accounting.sql
@@ -32,6 +32,7 @@ INSERT INTO llx_accounting_journal (code, label, nature, active) VALUES ('AC', '
 INSERT INTO llx_accounting_journal (code, label, nature, active) VALUES ('BQ', 'Journal de banque', 4, 1);
 INSERT INTO llx_accounting_journal (code, label, nature, active) VALUES ('OD', 'Journal des opérations diverses', 1, 1);
 INSERT INTO llx_accounting_journal (code, label, nature, active) VALUES ('AN', 'Journal des à-nouveaux', 9, 1);
+INSERT INTO llx_accounting_journal (code, label, nature, active) VALUES ('ER', 'Journal des notes de frais', 5, 1);
 --
 -- Descriptif des plans comptables FR PCG99-ABREGE
 --
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index d7e68346511..594568307a6 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -168,6 +168,7 @@ INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (
 INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (3,'BQ', 'Bank journal', 4, 1);
 INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (4,'OD', 'Other journal', 1, 1);
 INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (5,'AN', 'Has new journal', 9, 1);
+INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (6,'ER', 'Expense report journal', 5, 1);
 -- Fix old entries
 UPDATE llx_accounting_journal SET nature = 1 where code = 'OD' and nature = 0;
 UPDATE llx_accounting_journal SET nature = 2 where code = 'VT' and nature = 1;
diff --git a/htdocs/install/mysql/tables/llx_accounting_journal.sql b/htdocs/install/mysql/tables/llx_accounting_journal.sql
index dbd9e4d311b..51f1f972859 100644
--- a/htdocs/install/mysql/tables/llx_accounting_journal.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_journal.sql
@@ -23,6 +23,6 @@ create table llx_accounting_journal
   entity            integer DEFAULT 1 NOT NULL,
   code              varchar(32) NOT NULL,
   label             varchar(128) NOT NULL,
-  nature            smallint DEFAULT 1 NOT NULL,        -- type of journals (1:various operations / 2:sale / 3:purchase / 4:bank / 9: has-new)
+  nature            smallint DEFAULT 1 NOT NULL,        -- type of journals (1:various operations / 2:sale / 3:purchase / 4:bank / 5:expense report / 9:has-new)
   active            smallint DEFAULT 0
 )ENGINE=innodb;

From 2281850abfb912282aa9e6b7763fabed2ee31e5f Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Mon, 5 Jun 2017 14:56:14 +0200
Subject: [PATCH 085/438] Fix label and name

---
 htdocs/accountancy/journal/bankjournal.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 35d4112ebc9..306fa4d2cab 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -63,7 +63,7 @@ $langs->load('bills');
 $langs->load('donations');
 $langs->load("accountancy");
 $langs->load("trips");
-$langs->load("hrm");
+$langs->load("salaries");
 
 // Old system menu
 $id_bank_account = GETPOST('id_account', 'int');
@@ -114,7 +114,7 @@ $idpays = $p[0];
 $sql  = "SELECT b.rowid, b.dateo as do, b.datev as dv, b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type,";
 $sql .= " ba.courant, ba.ref as baref, ba.account_number,";
 $sql .= " soc.code_compta, soc.code_compta_fournisseur, soc.rowid as socid, soc.nom as name, bu1.type as typeop,";
-$sql .= " u.accountancy_code, u.rowid as userid, u.lastname as name, u.firstname as firstname, bu2.type as typeop";
+$sql .= " u.accountancy_code, u.rowid as userid, u.lastname as lastname, u.firstname as firstname, bu2.type as typeop";
 $sql .= " FROM " . MAIN_DB_PREFIX . "bank as b";
 $sql .= " JOIN " . MAIN_DB_PREFIX . "bank_account as ba on b.fk_account=ba.rowid";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "bank_url as bu1 ON bu1.fk_bank = b.rowid AND bu1.type='company'";
@@ -201,9 +201,8 @@ if ($result) {
 
 		$tabuser[$obj->rowid] = array (
 				'id' => $obj->userid,
-				'lastname' => $obj->lastname,
-				'firstname' => $obj->firstname,
-		        'accountancy_code' => $compta_user,
+				'name' => $obj->firstname.' '.$obj->lastname,
+				'accountancy_code' => $compta_user,
 		);
 
 		// Variable bookkeeping
@@ -426,7 +425,8 @@ if (! $error && $action == 'writebookkeeping') {
 						$bookkeeping->doc_ref = $langs->trans("Donation") . ' (' . $val["paymentdonationid"] . ')'; // Rowid of donation
 					} else if ($tabtype[$key] == 'payment_salary') {
 						$bookkeeping->code_tiers = '';
-						$bookkeeping->doc_ref = $langs->trans("PaymentSalary") . ' (' . $val["paymentsalid"] . ')'; // Ref of salary payment
+						$bookkeeping->label_compte = $tabuser[$key]['name'];
+						$bookkeeping->doc_ref = $langs->trans("SalaryPayment") . ' (' . $val["paymentsalid"] . ')'; // Ref of salary payment
 					}
 
         			$result = $bookkeeping->create($user);
@@ -510,8 +510,9 @@ if (! $error && $action == 'writebookkeeping') {
 						$bookkeeping->doc_ref = $langs->trans("Donation") . ' (' . $val["paymentdonationid"] . ')'; // Rowid of donation
 					} else if ($tabtype[$key] == 'payment_salary') {
 						$bookkeeping->code_tiers = $tabuser[$key]['accountancy_code'];
-						$bookkeeping->numero_compte = $k;
-						$bookkeeping->doc_ref = $langs->trans("PaymentSalary") . ' (' . $val["paymentsalid"] . ')'; // Rowid of salary payment
+						$bookkeeping->numero_compte = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
+						$bookkeeping->label_compte = $tabuser[$key]['name'];
+						$bookkeeping->doc_ref = $langs->trans("SalaryPayment") . ' (' . $val["paymentsalid"] . ')'; // Rowid of salary payment
 					} else if ($tabtype[$key] == 'banktransfert') {
 						$bookkeeping->code_tiers = '';
 						$bookkeeping->numero_compte = $k;

From e547aa8aeea8b02c271fa0efc8794e529747db2c Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Mon, 5 Jun 2017 15:41:33 +0200
Subject: [PATCH 086/438] NEW : VAT payment v6 look and feel

---
 htdocs/compta/tva/card.php                    |  33 +++---
 htdocs/compta/tva/class/tva.class.php         | 100 +++++++++++-------
 htdocs/compta/tva/info.php                    |  11 +-
 .../install/mysql/migration/5.0.0-6.0.0.sql   |   1 +
 htdocs/install/mysql/tables/llx_tva.sql       |   1 +
 5 files changed, 93 insertions(+), 53 deletions(-)

diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index cb80f49e790..e33ec6b3d55 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2013 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2015	   Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2015-2017 Alexandre Spangaro   <aspangaro@zendsi.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
@@ -305,16 +305,17 @@ if ($id)
 
 	dol_fiche_head($head, 'card', $langs->trans("VATPayment"), 0, 'payment');
 
+	$linkback = '<a href="'.DOL_URL_ROOT.'/compta/tva/reglement.php">'.$langs->trans("BackToList").'</a>';
+
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', '');
+
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 
 	print '<table class="border" width="100%">';
 
-	print "<tr>";
-	print '<td class="titlefield">'.$langs->trans("Ref").'</td><td colspan="3">';
-	print $object->ref;
-	print '</td></tr>';
-
 	// Label
-	print '<tr><td>'.$langs->trans("Label").'</td><td>'.$object->label.'</td></tr>';
+	print '<tr><td class="titlefield">'.$langs->trans("Label").'</td><td>'.$object->label.'</td></tr>';
 
 	print "<tr>";
 	print '<td>'.$langs->trans("DatePayment").'</td><td>';
@@ -335,23 +336,25 @@ if ($id)
 	{
 		if ($object->fk_account > 0)
 		{
- 		   	$bankline=new AccountLine($db);
-    		$bankline->fetch($object->fk_bank);
+			$bankline=new AccountLine($db);
+			$bankline->fetch($object->fk_bank);
 
-	    	print '<tr>';
-	    	print '<td>'.$langs->trans('BankTransactionLine').'</td>';
+			print '<tr>';
+			print '<td>'.$langs->trans('BankTransactionLine').'</td>';
 			print '<td>';
 			print $bankline->getNomUrl(1,0,'showall');
-	    	print '</td>';
-	    	print '</tr>';
+			print '</td>';
+			print '</tr>';
 		}
 	}
 
-        // Other attributes
-        $reshook=$hookmanager->executeHooks('formObjectOptions','',$object,$action);    // Note that $action and $object may have been modified by hook
+	// Other attributes
+	$reshook=$hookmanager->executeHooks('formObjectOptions','',$object,$action);    // Note that $action and $object may have been modified by hook
 
 	print '</table>';
 
+	print '</div>';
+
 	dol_fiche_end();
 
 	/*
diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index 5cf8b6566bd..045284bd47c 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2011-2015 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2011-2017 Alexandre Spangaro   <aspangaro@zendsi.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
@@ -34,6 +34,7 @@ class Tva extends CommonObject
 {
 	//public $element='tva';			//!< Id that identify managed objects
 	//public $table_element='tva';	//!< Name of table without prefix where object is stored
+	public $picto='payment';
 
 	var $tms;
 	var $datep;
@@ -73,6 +74,7 @@ class Tva extends CommonObject
     	global $conf, $langs;
 
 		$error=0;
+		$now=dol_now();
 
 		// Clean parameters
 		$this->amount=trim($this->amount);
@@ -89,7 +91,7 @@ class Tva extends CommonObject
 
 		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."tva(";
-		$sql.= "tms,";
+		$sql.= "datec,";
 		$sql.= "datep,";
 		$sql.= "datev,";
 		$sql.= "amount,";
@@ -101,7 +103,7 @@ class Tva extends CommonObject
 
         $sql.= ") VALUES (";
 
-		$sql.= " '".$this->db->idate($this->tms)."',";
+		$sql.= " '".$this->db->idate($now)."',";
 		$sql.= " '".$this->db->idate($this->datep)."',";
 		$sql.= " '".$this->db->idate($this->datev)."',";
 		$sql.= " '".$this->amount."',";
@@ -677,46 +679,70 @@ class Tva extends CommonObject
 	 *	@param	int		$id     Id of vat payment
 	 *	@return	int				<0 if KO, >0 if OK
 	 */
-    function info($id)
-    {
-        $sql = "SELECT t.rowid, t.tms as datec, t.fk_user_creat";
-        $sql.= " FROM ".MAIN_DB_PREFIX."tva as t";
-        $sql.= " WHERE t.rowid = ".$id;
+	function info($id)
+	{
+		$sql = "SELECT t.rowid, t.tms, t.datec, t.fk_user_creat";
+		$sql.= " FROM ".MAIN_DB_PREFIX."tva as t";
+		$sql.= " WHERE t.rowid = ".$id;
 
-        dol_syslog(get_class($this)."::info", LOG_DEBUG);
-        $result=$this->db->query($sql);
-        if ($result)
-        {
-            if ($this->db->num_rows($result))
-            {
-                $obj = $this->db->fetch_object($result);
+		dol_syslog(get_class($this)."::info", LOG_DEBUG);
+		$result=$this->db->query($sql);
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
 
-                $this->id = $obj->rowid;
+				$this->id = $obj->rowid;
 
-                if ($obj->fk_user_creat) {
-                    $cuser = new User($this->db);
-                    $cuser->fetch($obj->fk_user_creat);
-                    $this->user_creation = $cuser;
-                }
+				if ($obj->fk_user_creat) {
+					$cuser = new User($this->db);
+					$cuser->fetch($obj->fk_user_creat);
+					$this->user_creation = $cuser;
+				}
 
-                if ($obj->fk_user_modif) {
-                    $muser = new User($this->db);
-                    $muser->fetch($obj->fk_user_modif);
-                    $this->user_modification = $muser;
-                }
+				if ($obj->fk_user_modif) {
+					$muser = new User($this->db);
+					$muser->fetch($obj->fk_user_modif);
+					$this->user_modification = $muser;
+				}
 
-                $this->date_creation     = $this->db->jdate($obj->datec);
-                $this->date_modification = $this->db->jdate($obj->datec);
-                $this->import_key        = $obj->import_key;
-            }
+				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->tms);
+				$this->import_key        = $obj->import_key;
+			}
 
-            $this->db->free($result);
+			$this->db->free($result);
 
-        }
-        else
-        {
-            dol_print_error($this->db);
-        }
-    }
+		}
+		else
+		{
+			dol_print_error($this->db);
+		}
+	}
 
+	/**
+	 * Retourne le libelle du statut d'une facture (brouillon, validee, abandonnee, payee)
+	 *
+	 * @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 * @return  string				Libelle
+	 */
+	function getLibStatut($mode=0)
+	{
+	    return $this->LibStatut($this->statut,$mode);
+	}
+	
+	/**
+	 * Renvoi le libelle d'un statut donne
+	 *
+	 * @param   int		$status     Statut
+	 * @param   int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 * @return	string  		    Libelle du statut
+	 */
+	function LibStatut($status,$mode=0)
+	{
+	    global $langs;	// TODO Renvoyer le libelle anglais et faire traduction a affichage
+
+	    return '';
+	}
 }
diff --git a/htdocs/compta/tva/info.php b/htdocs/compta/tva/info.php
index 0c6ce29475a..fb932f0f983 100644
--- a/htdocs/compta/tva/info.php
+++ b/htdocs/compta/tva/info.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2016	Alexandre Spangaro	<aspangaro@zendsi.com>
+/* Copyright (C) 2016-2017  Alexandre Spangaro	<aspangaro@zendsi.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
@@ -53,12 +53,21 @@ $head = vat_prepare_head($object);
 
 dol_fiche_head($head, 'info', $langs->trans("VATPayment"), 0, 'payment');
 
+$linkback = '<a href="'.DOL_URL_ROOT.'/compta/tva/reglement.php">'.$langs->trans("BackToList").'</a>';
+
+dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', '');
+
+print '<div class="fichecenter">';
+print '<div class="underbanner clearboth"></div>';
+
 print '<table width="100%"><tr><td>';
 dol_print_object_info($object);
 print '</td></tr></table>';
 
 print '</div>';
 
+dol_fiche_end();
+
 llxFooter();
 
 $db->close();
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index d7e68346511..8fd64aa596e 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -379,3 +379,4 @@ create table llx_loan_schedule
   fk_user_modif		integer           
 )ENGINE=innodb;
 
+ALTER TABLE llx_tva ADD COLUMN datec date AFTER tms;
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_tva.sql b/htdocs/install/mysql/tables/llx_tva.sql
index f33280ff511..9abf63d6ad9 100644
--- a/htdocs/install/mysql/tables/llx_tva.sql
+++ b/htdocs/install/mysql/tables/llx_tva.sql
@@ -21,6 +21,7 @@ create table llx_tva
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   tms             timestamp,
+  datec           datetime,                   -- Create date
   datep           date,                       -- date de paiement
   datev           date,                       -- date de valeur
   amount          real NOT NULL DEFAULT 0,

From 22efbabfa68020ac9b0428dc0d2152a3c923d9ba Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 6 Jun 2017 01:34:25 +0200
Subject: [PATCH 087/438] NEW Add hook doUpgrade2

---
 htdocs/core/class/hookmanager.class.php |  10 +-
 htdocs/install/upgrade.php              |  80 -----------
 htdocs/install/upgrade2.php             | 183 ++++++++++++++++++++----
 htdocs/langs/en_US/install.lang         |   1 +
 4 files changed, 162 insertions(+), 112 deletions(-)

diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 40ed4153060..65495cb0100 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -43,6 +43,8 @@ class HookManager
 	var $resArray=array();
 	// Printable result
 	var $resPrint='';
+	// Nb of qualified hook ran
+	var $resNbOfHooks=0;
 
 	/**
 	 * Constructor
@@ -188,7 +190,7 @@ class HookManager
         }
 
         // Init return properties
-        $this->resPrint=''; $this->resArray=array();
+        $this->resPrint=''; $this->resArray=array(); $this->$resNbOfHooks=0;
 
         // Loop on each hook to qualify modules that have declared context
         $modulealreadyexecuted=array();
@@ -201,11 +203,13 @@ class HookManager
                 {
                 	//print "Before hook ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction." result=".$result."<br>\n";
 
+                    // test to avoid running twice a hook, when a module implements several active contexts
+                    if (in_array($module,$modulealreadyexecuted)) continue;
+
                 	// jump to next module/class if method does not exist
                     if (! method_exists($actionclassinstance,$method)) continue;
 
-                    // test to avoid running twice a hook, when a module implements several active contexts
-                    if (in_array($module,$modulealreadyexecuted)) continue;
+                    $this->$resNbOfHooks++;
 
                     dol_syslog(get_class($this).'::executeHooks a qualified hook was found for method='.$method.' module='.$module." action=".$action." context=".$context);
 
diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index 96853887f81..772d578a841 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -234,86 +234,6 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
 	    flush();
     }
 
-    /*
-     * Delete duplicates in table categorie_association
-     */
-    if ($ok)
-    {
-	    $result = $db->DDLDescTable(MAIN_DB_PREFIX."categorie_association");
-	    if ($result)	// result defined for version 3.2 or -
-	    {
-		    $obj = $db->fetch_object($result);
-		    if ($obj)	// It table categorie_association exists
-		    {
-		    	$couples=array();
-			    $filles=array();
-			    $sql = "SELECT fk_categorie_mere, fk_categorie_fille";
-			    $sql.= " FROM ".MAIN_DB_PREFIX."categorie_association";
-			    dolibarr_install_syslog("upgrade: search duplicate");
-			    $resql = $db->query($sql);
-			    if ($resql)
-			    {
-			        $num=$db->num_rows($resql);
-			        while ($obj=$db->fetch_object($resql))
-			        {
-			            if (! isset($filles[$obj->fk_categorie_fille]))	// Only one record as child (a child has only on parent).
-			            {
-			                if ($obj->fk_categorie_mere != $obj->fk_categorie_fille)
-			                {
-			                    $filles[$obj->fk_categorie_fille]=1;	// Set record for this child
-			                    $couples[$obj->fk_categorie_mere.'_'.$obj->fk_categorie_fille]=array('mere'=>$obj->fk_categorie_mere, 'fille'=>$obj->fk_categorie_fille);
-			                }
-			            }
-			        }
-
-			        dolibarr_install_syslog("upgrade: result is num=" . $num . " count(couples)=" . count($couples));
-
-			        // If there is duplicates couples or child with two parents
-			        if (count($couples) > 0 && $num > count($couples))
-			        {
-			            $error=0;
-
-			            $db->begin();
-
-			            // We delete all
-			            $sql="DELETE FROM ".MAIN_DB_PREFIX."categorie_association";
-			            dolibarr_install_syslog("upgrade: delete association");
-			            $resqld=$db->query($sql);
-			            if ($resqld)
-			            {
-			            	// And we insert only each record once
-			                foreach($couples as $key => $val)
-			                {
-			                    $sql ="INSERT INTO ".MAIN_DB_PREFIX."categorie_association(fk_categorie_mere,fk_categorie_fille)";
-			                    $sql.=" VALUES(".$val['mere'].", ".$val['fille'].")";
-			                    dolibarr_install_syslog("upgrade: insert association");
-			                    $resqli=$db->query($sql);
-			                    if (! $resqli) $error++;
-			                }
-			            }
-
-			            if (! $error)
-			            {
-			                print '<tr><td>'.$langs->trans("RemoveDuplicates").'</td>';
-			                print '<td align="right">'.$langs->trans("Success").' ('.$num.'=>'.count($couples).')</td></tr>';
-			                $db->commit();
-			            }
-			            else
-			            {
-			                print '<tr><td>'.$langs->trans("RemoveDuplicates").'</td>';
-			                print '<td align="right">'.$langs->trans("Failed").'</td></tr>';
-			                $db->rollback();
-			            }
-			        }
-			    }
-			    else
-			    {
-			        print '<div class="error">'.$langs->trans("Error").' '.$db->lasterror().'</div>';
-			    }
-		    }
-	    }
-    }
-
 
 	/*
 	 * Remove deprecated indexes and constraints for Mysql
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 19195e17000..36bbeb966d4 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -170,14 +170,14 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
      * Migration des donnees
      *
      ***************************************************************************************/
+    $db->begin();
+
     if (! $error)
     {
         // Current version is $conf->global->MAIN_VERSION_LAST_UPGRADE
         // Version to install is DOL_VERSION
         $dolibarrlastupgradeversionarray=preg_split('/[\.-]/',isset($conf->global->MAIN_VERSION_LAST_UPGRADE)?$conf->global->MAIN_VERSION_LAST_UPGRADE:$conf->global->MAIN_VERSION_LAST_INSTALL);
 
-        $db->begin();
-
         // Chaque action de migration doit renvoyer une ligne sur 4 colonnes avec
         // dans la 1ere colonne, la description de l'action a faire
         // dans la 4eme colonne, le texte 'OK' si fait ou 'AlreadyDone' si rien n'est fait ou 'Error'
@@ -342,6 +342,8 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
 
         	migrate_mode_reglement($db,$langs,$conf);
 
+        	migrate_clean_association($db,$langs,$conf);
+
             // Reload modules
             migrate_reload_modules($db,$langs,$conf);
 
@@ -426,11 +428,11 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
                 'MAIN_MODULE_PRINTING'=>'newboxdefonly',
             );
             migrate_reload_modules($db,$langs,$conf,$listofmodule);
-        
+
             // Reload menus (this must be always and only into last targeted version)
             migrate_reload_menu($db,$langs,$conf,$versionto);
         }
-        
+
         // Scripts for last version
         $afterversionarray=explode('.','5.0.9');
         $beforeversionarray=explode('.','6.0.9');
@@ -445,39 +447,72 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
             // Reload menus (this must be always and only into last targeted version)
             migrate_reload_menu($db,$langs,$conf,$versionto);
         }
+    }
 
-        // Can force activation of some module during migration with third paramater = MAIN_MODULE_XXX,MAIN_MODULE_YYY,...
-        if ($enablemodules)
+
+    // Can force activation of some module during migration with paramater 'enablemodules=MAIN_MODULE_XXX,MAIN_MODULE_YYY,...'
+    if (! $error && $enablemodules)
+    {
+        // Reload modules (this must be always and only into last targeted version)
+        $listofmodules=array();
+        $tmplistofmodules=explode(',', $enablemodules);
+        foreach($tmplistofmodules as $value)
         {
-            // Reload modules (this must be always and only into last targeted version)
-            $listofmodules=array();
-            $tmplistofmodules=explode(',', $enablemodules);
-            foreach($tmplistofmodules as $value)
-            {
-                $listofmodules[$value]='newboxdefonly';
-            }
-            migrate_reload_modules($db,$langs,$conf,$listofmodules,1);
+            $listofmodules[$value]='newboxdefonly';
         }
+        migrate_reload_modules($db,$langs,$conf,$listofmodules,1);
+    }
 
 
-        print '<tr><td colspan="4"><br>'.$langs->trans("MigrationFinished").'</td></tr>';
-
-        // On commit dans tous les cas.
-        // La procedure etant concue pour pouvoir passer plusieurs fois quelquesoit la situation.
-        $db->commit();
-        $db->close();
-
-
-        // Actions for all versions (not in database)
-        migrate_delete_old_files($db, $langs, $conf);
-        migrate_delete_old_dir($db, $langs, $conf);
-
-
-        dol_mkdir(DOL_DATA_ROOT.'/bank');
-        migrate_directories($db, $langs, $conf, '/banque/bordereau', '/bank/checkdeposits');
+    // Can call a dedicated external upgrade process
+    if (! $error)
+    {
+        $parameters=array('versionfrom'=>$versionfrom, 'versionto='.$versionto);
+        $object=new stdClass();
+        $action="upgrade";
+        $reshook=$hookmanager->executeHooks('doUpgrade2',$parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+        if ($hookmanager->resNbOfHooks > 0)
+        {
+            if ($reshook < 0)
+            {
+                print '<tr><td colspan="4">';
+                print '<b>'.$langs->trans('UpgradeExternalModule').'</b>: ';
+                print $hookmanager->error;
+                print "<!-- (".$reshook.") -->";
+                print '</td></tr>';
+            }
+            else
+            {
+                print '<tr><td colspan="4">';
+                print '<b>'.$langs->trans('UpgradeExternalModule').'</b>: OK';
+                print "<!-- (".$reshook.") -->";
+                print '</td></tr>';
+            }
+        }
+        else
+        {
+            print '<tr><td colspan="4">';
+            print '<b>'.$langs->trans('UpgradeExternalModule').'</b>: '.$langs->trans("None");
+            print '</td></tr>';
+        }
     }
 
     print '</table>';
+
+    // We always commit.
+    // Process is designed so we can run it several times whatever is situation.
+    $db->commit();
+    $db->close();
+
+    // Actions for all versions (no database change, delete files and directories)
+    migrate_delete_old_files($db, $langs, $conf);
+    migrate_delete_old_dir($db, $langs, $conf);
+    // Actions for all versions (no database change, create directories)
+    dol_mkdir(DOL_DATA_ROOT.'/bank');
+    // Actions for all versions (no database change, rename directories)
+    migrate_directories($db, $langs, $conf, '/banque/bordereau', '/bank/checkdeposits');
+
+    print '<div><br>'.$langs->trans("MigrationFinished").'</div>';
 }
 else
 {
@@ -3519,6 +3554,95 @@ function migrate_mode_reglement($db,$langs,$conf)
 	print '</td></tr>';
 }
 
+
+/**
+ * Delete duplicates in table categorie_association
+ *
+ * @param	DoliDB		$db			Database handler
+ * @param	Translate	$langs		Object langs
+ * @param	Conf		$conf		Object conf
+ * @param	string		$versionto	Version target
+ * @return	void
+ */
+function migrate_clean_association($db,$langs,$conf,$versionto)
+{
+    $result = $db->DDLDescTable(MAIN_DB_PREFIX."categorie_association");
+    if ($result)	// result defined for version 3.2 or -
+    {
+        $obj = $db->fetch_object($result);
+        if ($obj)	// It table categorie_association exists
+        {
+            $couples=array();
+            $filles=array();
+            $sql = "SELECT fk_categorie_mere, fk_categorie_fille";
+            $sql.= " FROM ".MAIN_DB_PREFIX."categorie_association";
+            dolibarr_install_syslog("upgrade: search duplicate");
+            $resql = $db->query($sql);
+            if ($resql)
+            {
+                $num=$db->num_rows($resql);
+                while ($obj=$db->fetch_object($resql))
+                {
+                    if (! isset($filles[$obj->fk_categorie_fille]))	// Only one record as child (a child has only on parent).
+                    {
+                        if ($obj->fk_categorie_mere != $obj->fk_categorie_fille)
+                        {
+                            $filles[$obj->fk_categorie_fille]=1;	// Set record for this child
+                            $couples[$obj->fk_categorie_mere.'_'.$obj->fk_categorie_fille]=array('mere'=>$obj->fk_categorie_mere, 'fille'=>$obj->fk_categorie_fille);
+                        }
+                    }
+                }
+
+                dolibarr_install_syslog("upgrade: result is num=" . $num . " count(couples)=" . count($couples));
+
+                // If there is duplicates couples or child with two parents
+                if (count($couples) > 0 && $num > count($couples))
+                {
+                    $error=0;
+
+                    $db->begin();
+
+                    // We delete all
+                    $sql="DELETE FROM ".MAIN_DB_PREFIX."categorie_association";
+                    dolibarr_install_syslog("upgrade: delete association");
+                    $resqld=$db->query($sql);
+                    if ($resqld)
+                    {
+                        // And we insert only each record once
+                        foreach($couples as $key => $val)
+                        {
+                            $sql ="INSERT INTO ".MAIN_DB_PREFIX."categorie_association(fk_categorie_mere,fk_categorie_fille)";
+                            $sql.=" VALUES(".$val['mere'].", ".$val['fille'].")";
+                            dolibarr_install_syslog("upgrade: insert association");
+                            $resqli=$db->query($sql);
+                            if (! $resqli) $error++;
+                        }
+                    }
+
+                    if (! $error)
+                    {
+                        print '<tr><td>'.$langs->trans("MigrationCategorieAssociation").'</td>';
+                        print '<td align="right">'.$langs->trans("RemoveDuplicates").' '.$langs->trans("Success").' ('.$num.'=>'.count($couples).')</td></tr>';
+                        $db->commit();
+                    }
+                    else
+                    {
+                        print '<tr><td>'.$langs->trans("MigrationCategorieAssociation").'</td>';
+                        print '<td align="right">'.$langs->trans("RemoveDuplicates").' '.$langs->trans("Failed").'</td></tr>';
+                        $db->rollback();
+                    }
+                }
+            }
+            else
+            {
+                print '<tr><td>'.$langs->trans("Error").'</td>';
+                print '<td align="right"><div class="error">'.$db->lasterror().'</div></td></tr>';
+            }
+        }
+    }
+}
+
+
 /**
  * Migrate categorie association
  *
@@ -4304,6 +4428,7 @@ function migrate_reload_menu($db,$langs,$conf,$versionto)
 
 
 
+
 /* A faire egalement: Modif statut paye et fk_facture des factures payes completement
 
 On recherche facture incorrecte:
diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang
index 336b20bff16..2b10dea91ec 100644
--- a/htdocs/langs/en_US/install.lang
+++ b/htdocs/langs/en_US/install.lang
@@ -138,6 +138,7 @@ KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values
 KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
 KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
 KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
+UpgradeExternalModule=Run dedicated upgrade process of external modules
 
 #########
 # upgrade

From 6e83e899e20d2a3728b713fd6eac5a29d610602c Mon Sep 17 00:00:00 2001
From: BENKE Charlene <charles.fr@benke.fr>
Date: Tue, 6 Jun 2017 08:29:41 +0200
Subject: [PATCH 088/438] Additionnal filter on getProjectsAuthorizedForUser

with great list of projects, have more filter is a good thing
---
 htdocs/projet/class/project.class.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 6a7b130ac0d..c434fa65381 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -1095,9 +1095,10 @@ class Project extends CommonObject
      * @param 	int		$mode			0=All project I have permission on (assigned to me and public), 1=Projects assigned to me only, 2=Will return list of all projects with no test on contacts
      * @param 	int		$list			0=Return array,1=Return string list
      * @param	int		$socid			0=No filter on third party, id of third party
+     * @param	string		$filter			additionnal filter on project (statut, ref, ...)
      * @return 	array or string			Array of projects id, or string with projects id separated with ","
      */
-    function getProjectsAuthorizedForUser($user, $mode=0, $list=0, $socid=0)
+    function getProjectsAuthorizedForUser($user, $mode=0, $list=0, $socid=0, $filter='')
     {
         $projects = array();
         $temp = array();
@@ -1149,6 +1150,8 @@ class Project extends CommonObject
         {
             // No filter. Use this if user has permission to see all project
         }
+	    
+	$sql.= $filter;
         //print $sql;
 
         $resql = $this->db->query($sql);

From ca5fd6ac4cd986ccdde6e5634f1e3d5105f5ab6f Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Tue, 6 Jun 2017 09:15:11 +0200
Subject: [PATCH 089/438] FIX #6926

---
 htdocs/contrat/class/contrat.class.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 9878e08d447..a1696c749f8 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -46,7 +46,7 @@ class Contrat extends CommonObject
 	public $fk_element='fk_contrat';
 	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
     public $picto='contract';
-    
+
 	/**
 	 * {@inheritdoc}
 	 */
@@ -609,7 +609,7 @@ class Contrat extends CommonObject
 
 		$this->lines=array();
         $pos = 0;
-		
+
 		// Selectionne les lignes contrats liees a un produit
 		$sql = "SELECT p.label as product_label, p.description as product_desc, p.ref as product_ref,";
 		$sql.= " d.rowid, d.fk_contrat, d.statut, d.description, d.price_ht, d.vat_src_code, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.localtax1_type, d.localtax2_type, d.qty, d.remise_percent, d.subprice, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht,";
@@ -1849,7 +1849,7 @@ class Contrat extends CommonObject
 		$url = DOL_URL_ROOT.'/contrat/card.php?id='.$this->id;
         $picto = 'contract';
         $label = '';
-        
+
         if ($user->rights->contrat->lire) {
             $label = '<u>'.$langs->trans("ShowContract").'</u>';
             $label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
@@ -1865,7 +1865,7 @@ class Contrat extends CommonObject
                 $label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
             }
         }
-        
+
         $linkclose='';
         if (empty($notooltip) && $user->rights->contrat->lire)
         {
@@ -1881,7 +1881,7 @@ class Contrat extends CommonObject
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart.=$linkclose.'>';
 		$linkend='</a>';
-		
+
 		if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
 		if ($withpicto && $withpicto != 2) $result.=' ';
 		$result.=$linkstart.$this->ref.$linkend;
@@ -2911,7 +2911,7 @@ class ContratLigne extends CommonObjectLine
 
 		// Insertion dans la base
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."contratdet";
-		$sql.= " (fk_contrat, label, description, fk_product, qty, tva_tx,";
+		$sql.= " (fk_contrat, label, description, fk_product, qty, vat_src_code, tva_tx,";
 		$sql.= " localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, remise_percent, subprice,";
 		$sql.= " total_ht, total_tva, total_localtax1, total_localtax2, total_ttc,";
 		$sql.= " info_bits,";

From b66da3d1480b93f71a67f821dedd78c14b58c3b0 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Tue, 6 Jun 2017 07:57:03 +0200
Subject: [PATCH 090/438] New: big refactorization of multicompany transverse
 mode

---
 ChangeLog                                     |   2 +
 htdocs/admin/boxes.php                        |   6 +-
 htdocs/admin/perms.php                        |   4 +-
 htdocs/conf/conf.php.example                  |  10 -
 htdocs/core/class/conf.class.php              |  35 +-
 htdocs/core/class/html.form.class.php         |   6 +-
 htdocs/core/class/infobox.class.php           |   6 +-
 htdocs/core/class/menubase.class.php          |   2 +-
 htdocs/core/lib/functions2.lib.php            |  26 +-
 htdocs/core/lib/usergroups.lib.php            |  83 ++---
 htdocs/core/login/functions_dolibarr.php      |   2 +-
 htdocs/core/login/functions_ldap.php          |   2 +-
 htdocs/core/menus/init_menu_auguria.sql       |   8 +-
 htdocs/core/menus/standard/eldy.lib.php       |   8 +-
 htdocs/filefunc.inc.php                       |   3 -
 htdocs/holiday/class/holiday.class.php        |   4 +-
 htdocs/index.php                              |  12 +-
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  16 +
 .../mysql/tables/llx_user_rights.key.sql      |   8 +-
 .../install/mysql/tables/llx_user_rights.sql  |  10 +-
 .../mysql/tables/llx_usergroup_rights.key.sql |   4 +-
 .../mysql/tables/llx_usergroup_rights.sql     |  11 +-
 htdocs/master.inc.php                         |  29 +-
 .../modulebuilder/template/myobject_list.php  |   2 +-
 htdocs/product/stock/productlot_list.php      |   2 +-
 htdocs/societe/class/societe.class.php        |   2 +-
 htdocs/societe/commerciaux.php                |   6 +-
 htdocs/user/card.php                          | 325 +++++++++---------
 htdocs/user/class/user.class.php              |  40 +--
 htdocs/user/class/usergroup.class.php         |  50 +--
 htdocs/user/group/card.php                    |  49 +--
 htdocs/user/group/index.php                   |  14 +-
 htdocs/user/group/ldap.php                    |  10 +-
 htdocs/user/group/perms.php                   | 194 ++++++-----
 htdocs/user/hierarchy.php                     |  25 +-
 htdocs/user/home.php                          |   4 +-
 htdocs/user/index.php                         |  16 +-
 htdocs/user/perms.php                         |  89 ++---
 htdocs/webservices/server_user.php            |   2 +-
 39 files changed, 539 insertions(+), 588 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 15c1dc404f5..74b35ce985a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ English Dolibarr ChangeLog
 
 For developers:
 NEW: Add a lot of API REST: dictionaryevents, memberstypes, ...
+NEW: Big refactorization of multicompany transverse mode
 
 WARNING: 
 
@@ -21,6 +22,7 @@ Following changes may create regression for some external modules, but were nece
 * Removed Societe::set_commnucation_level (was deprecated in 4.0). Was not used.
 * Removed the trigger file of PAYPAL module that stored data that was not used by Dolibarr. The trigger event still
   exists, but if an external module need action on it, it must provides itself its trigger file.
+* Use $conf->global->MULTICOMPANY_TRANSVERSE_MODE instead $conf->multicompany->transverse_mode
 
 ***** ChangeLog for 5.0.3 compared to 5.0.2 *****
 FIX: #6677 Expired contracts dashboard box does not show the name of the thirdparty
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index c76c35dfdeb..03e4a0ec9f3 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -235,7 +235,7 @@ $sql = "SELECT b.rowid, b.box_id, b.position, b.box_order,";
 $sql.= " bd.rowid as boxid";
 $sql.= " FROM ".MAIN_DB_PREFIX."boxes as b, ".MAIN_DB_PREFIX."boxes_def as bd";
 $sql.= " WHERE b.box_id = bd.rowid";
-$sql.= " AND b.entity IN (0,".(! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)?"1,":"").$conf->entity.")";
+$sql.= " AND b.entity IN (0,".$conf->entity.")";
 $sql.= " AND b.fk_user=0";
 $sql.= " ORDER by b.position, b.box_order";
 
@@ -342,7 +342,7 @@ print "</tr>\n";
 $var=true;
 foreach($boxtoadd as $box)
 {
-    
+
 
     if (preg_match('/^([^@]+)@([^@]+)$/i',$box->boximg))
     {
@@ -479,7 +479,7 @@ print '</tr>';
 
 // Activate FileCache - Developement
 if ($conf->global->MAIN_FEATURES_LEVEL == 2 || ! empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
-    
+
     print '<tr class="oddeven"><td width="35%">'.$langs->trans("EnableFileCache").'</td><td>';
     print $form->selectyesno('MAIN_ACTIVATE_FILECACHE',$conf->global->MAIN_ACTIVATE_FILECACHE,1);
     print '</td>';
diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php
index 0c7ed656d9f..7528fb09115 100644
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -131,7 +131,7 @@ print '<table class="noborder" width="100%">';
 $sql = "SELECT r.id, r.libelle, r.module, r.perms, r.subperms, r.bydefault";
 $sql.= " FROM ".MAIN_DB_PREFIX."rights_def as r";
 $sql.= " WHERE r.libelle NOT LIKE 'tou%'";    // On ignore droits "tous"
-$sql.= " AND entity IN (".(! empty($conf->multicompany->transverse_mode)?"1,":"").$conf->entity.")";
+$sql.= " AND entity = ".$conf->entity;
 if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) $sql.= " AND r.perms NOT LIKE '%_advance'";  // Hide advanced perms if option is not enabled
 $sql.= " ORDER BY r.module, r.id";
 
@@ -185,7 +185,7 @@ if ($result)
             print "</tr>\n";
         }
 
-        
+
         print '<tr class="oddeven">';
         print '<td>'.img_object('',$picto).' '.$objMod->getName();
         print '<a name="'.$objMod->getName().'">&nbsp;</a>';
diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example
index 89e1458d4fd..356e76ba374 100644
--- a/htdocs/conf/conf.php.example
+++ b/htdocs/conf/conf.php.example
@@ -324,14 +324,4 @@ $dolibarr_nocsrfcheck='0';
 // External module
 //##############################
 
-// multicompany_transverse_mode
-// Prerequisite: Need external module "multicompany"
-// Pyramidal   (0): The rights and groups are managed in each entity. Each user belongs to the entity he was created into.
-// Transversal (1): The user is created and managed only into master entity but can login to all entities if he is admmin
-//                  of entity or belongs to at least one user group created into entity.
-
-// Default value: 0 (pyramidal)
-// Examples:
-// $multicompany_transverse_mode='1';
-
 
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 578ed17049e..7a70549a2d1 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2003      Xavier Dutoit        <doli@sydesy.com>
  * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin      	<regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2017 Regis Houssin      	<regis.houssin@capnetworks.com>
  * Copyright (C) 2006 	   Jean Heimburger    	<jean@tiaris.info>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -132,14 +132,7 @@ class Conf
 		$sql = "SELECT ".$db->decrypt('name')." as name,";
 		$sql.= " ".$db->decrypt('value')." as value, entity";
 		$sql.= " FROM ".MAIN_DB_PREFIX."const";
-		if (! empty($this->multicompany->transverse_mode))
-		{
-			$sql.= " WHERE entity IN (0,1,".$this->entity.")";
-		}
-		else
-		{
-			$sql.= " WHERE entity IN (0,".$this->entity.")";
-		}
+		$sql.= " WHERE entity IN (0,".$this->entity.")";
 		$sql.= " ORDER BY entity";	// This is to have entity 0 first, then entity 1 that overwrite.
 
 		$resql = $db->query($sql);
@@ -320,7 +313,7 @@ class Conf
 		// For backward compatibility
 		$this->user->dir_output=$rootforuser."/users";
 		$this->user->dir_temp=$rootforuser."/users/temp";
-		
+
 		// UserGroup
 		$this->usergroup->dir_output=$rootforuser."/usergroups";
 		$this->usergroup->dir_temp=$rootforuser."/usergroups/temp";
@@ -386,13 +379,13 @@ class Conf
 
 		$this->global->MAIN_ACTIVATE_HTML5=1;
         $this->global->MAIN_MAIL_USE_MULTI_PART=1;
-        
+
 		// societe
 		if (empty($this->global->SOCIETE_CODECLIENT_ADDON))       $this->global->SOCIETE_CODECLIENT_ADDON="mod_codeclient_leopard";
 		if (empty($this->global->SOCIETE_CODECOMPTA_ADDON))       $this->global->SOCIETE_CODECOMPTA_ADDON="mod_codecompta_panicum";
 
 		if (empty($this->global->CHEQUERECEIPTS_ADDON))           $this->global->CHEQUERECEIPTS_ADDON='mod_chequereceipt_mint';
-		
+
         // Security
 		if (empty($this->global->USER_PASSWORD_GENERATED)) $this->global->USER_PASSWORD_GENERATED='standard'; // Default password generator
         if (empty($this->global->MAIN_UMASK)) $this->global->MAIN_UMASK='0664';         // Default mask
@@ -425,7 +418,7 @@ class Conf
 		$this->currency=$this->global->MAIN_MONNAIE;
 
 		if (empty($conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY)) $conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY = 30;   // Less than 1 minutes to be sure
-		
+
 		// conf->global->ACCOUNTING_MODE = Option des modules Comptabilites (simple ou expert). Defini le mode de calcul des etats comptables (CA,...)
         if (empty($this->global->ACCOUNTING_MODE)) $this->global->ACCOUNTING_MODE='RECETTES-DEPENSES';  // By default. Can be 'RECETTES-DEPENSES' ou 'CREANCES-DETTES'
 
@@ -434,7 +427,7 @@ class Conf
 
         // MAIN_HTML_TITLE
         if (! isset($this->global->MAIN_HTML_TITLE)) $this->global->MAIN_HTML_TITLE='noapp,thirdpartynameonly,contactnameonly,projectnameonly';
-        
+
 		// conf->liste_limit = constante de taille maximale des listes
 		if (empty($this->global->MAIN_SIZE_LISTE_LIMIT)) $this->global->MAIN_SIZE_LISTE_LIMIT=25;
 		$this->liste_limit=$this->global->MAIN_SIZE_LISTE_LIMIT;
@@ -461,7 +454,7 @@ class Conf
 		$this->mailing->email_from=$this->email_from;
 		if (! empty($this->global->MAILING_EMAIL_FROM))	$this->mailing->email_from=$this->global->MAILING_EMAIL_FROM;
 		if (! isset($this->global->MAIN_EMAIL_ADD_TRACK_ID)) $this->global->MAIN_EMAIL_ADD_TRACK_ID=1;
-		
+
         // Format for date (used by default when not found or not searched in lang)
         $this->format_date_short="%d/%m/%Y";            // Format of day with PHP/C tags (strftime functions)
         $this->format_date_short_java="dd/MM/yyyy";     // Format of day with Java tags
@@ -485,7 +478,7 @@ class Conf
 		// Default pdf option
 		if (! isset($this->global->MAIN_PDF_DASH_BETWEEN_LINES)) $this->global->MAIN_PDF_DASH_BETWEEN_LINES=1;    // use dash between lines
         if (! isset($this->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) $this->global->PDF_ALLOW_HTML_FOR_FREE_TEXT=1;  // allow html content into free footer text
-		
+
 		// Set default value to MAIN_SHOW_LOGO
 		if (! isset($this->global->MAIN_SHOW_LOGO)) $this->global->MAIN_SHOW_LOGO=1;
 
@@ -500,7 +493,7 @@ class Conf
 
 		// By default, we open card if one found
 		if (! isset($this->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE)) $this->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE=1;
-		
+
 		// Define list of limited modules (value must be key found for "name" property of module, so for example 'supplierproposal' for Module "Supplier Proposal"
 		if (! isset($this->global->MAIN_MODULES_FOR_EXTERNAL)) $this->global->MAIN_MODULES_FOR_EXTERNAL='user,societe,propal,commande,facture,categorie,supplierproposal,fournisseur,contact,projet,contrat,ficheinter,expedition,agenda,resource,adherent';	// '' means 'all'. Note that contact is added here as it should be a module later.
 
@@ -568,12 +561,12 @@ class Conf
 		    $this->expensereport->payment		= new stdClass();
 		    $this->expensereport->payment->warning_delay=(isset($this->global->MAIN_DELAY_EXPENSEREPORTS_TO_PAY)?$this->global->MAIN_DELAY_EXPENSEREPORTS_TO_PAY:0)*24*60*60;
 		}
-		
+
 		if (! empty($this->global->PRODUIT_MULTIPRICES) && empty($this->global->PRODUIT_MULTIPRICES_LIMIT))
 		{
 		    $this->global->PRODUIT_MULTIPRICES_LIMIT = 5;
 		}
-		
+
 		// For modules that want to disable top or left menu
 		if (! empty($this->global->MAIN_HIDE_TOP_MENU)) $this->dol_hide_topmenu=$this->global->MAIN_HIDE_TOP_MENU;
 		if (! empty($this->global->MAIN_HIDE_LEFT_MENU)) $this->dol_hide_leftmenu=$this->global->MAIN_HIDE_LEFT_MENU;
@@ -585,7 +578,7 @@ class Conf
 		{
 		    $conf->global->AGENDA_DEFAULT_FILTER_TYPE='0';    // 'AC_NON_AUTO' does not exists when AGENDA_DEFAULT_FILTER_TYPE is not on.
 		}
-		    
+
 		// For backward compatibility
 		if (isset($this->product))   $this->produit=$this->product;
 		if (isset($this->facture))   $this->invoice=$this->facture;
@@ -633,7 +626,7 @@ class Conf
 				$this->loghandlers[$handler] = $loghandlerinstance;
 			}
 		}
-		
+
 	}
 }
 
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index b14f72a1b7b..52f46ba6863 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1468,7 +1468,7 @@ class Form
         }
         else
        {
-        	if (! empty($conf->multicompany->transverse_mode))
+        	if (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
         	{
         		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug";
         		$sql.= " ON ug.fk_user = u.rowid";
@@ -1565,7 +1565,7 @@ class Form
 							$moreinfo++;
 						}
 					}
-                    if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
+                    if (! empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && ! $user->entity)
                     {
                         if ($obj->admin && ! $obj->entity)
                         {
@@ -6196,7 +6196,7 @@ class Form
                     $out.= '>';
 
                     $out.= $obj->name;
-                    if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode) && $conf->entity == 1)
+                    if (! empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1)
                     {
                         $out.= " (".$obj->label.")";
                     }
diff --git a/htdocs/core/class/infobox.class.php b/htdocs/core/class/infobox.class.php
index 419f31dca4d..e77a1196530 100644
--- a/htdocs/core/class/infobox.class.php
+++ b/htdocs/core/class/infobox.class.php
@@ -60,7 +60,7 @@ class InfoBox
             $sql.= " d.rowid as box_id, d.file, d.note, d.tms";
             $sql.= " FROM ".MAIN_DB_PREFIX."boxes as b, ".MAIN_DB_PREFIX."boxes_def as d";
             $sql.= " WHERE b.box_id = d.rowid";
-            $sql.= " AND b.entity IN (0,".(! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)?"1,":"").$conf->entity.")";
+            $sql.= " AND b.entity IN (0,".$conf->entity.")";
             if ($zone >= 0) $sql.= " AND b.position = ".$zone;
             if (is_object($user)) $sql.= " AND b.fk_user IN (0,".$user->id.")";
             else $sql.= " AND b.fk_user = 0";
@@ -70,9 +70,9 @@ class InfoBox
 		{
             $sql = "SELECT d.rowid as box_id, d.file, d.note, d.tms";
             $sql.= " FROM ".MAIN_DB_PREFIX."boxes_def as d";
-           	$sql.= " WHERE d.entity IN (0,".(! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)?"1,":"").$conf->entity.")";
+           	$sql.= " WHERE d.entity IN (0,".$conf->entity.")";
         }
-        
+
         dol_syslog(get_class()."::listBoxes get default box list for mode=".$mode." userid=".(is_object($user)?$user->id:'')."", LOG_DEBUG);
         $resql = $db->query($sql);
         if ($resql)
diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index ed6b9929a32..a6770b57c37 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -508,7 +508,7 @@ class Menubase
 
         $sql = "SELECT m.rowid, m.type, m.module, m.fk_menu, m.fk_mainmenu, m.fk_leftmenu, m.url, m.titre, m.langs, m.perms, m.enabled, m.target, m.mainmenu, m.leftmenu, m.position";
         $sql.= " FROM ".MAIN_DB_PREFIX."menu as m";
-        $sql.= " WHERE m.entity IN (0,".(! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)?"1,":"").$conf->entity.")";
+        $sql.= " WHERE m.entity IN (0,".$conf->entity.")";
         $sql.= " AND m.menu_handler IN ('".$menu_handler."','all')";
         if ($type_user == 0) $sql.= " AND m.usertype IN (0,2)";
         if ($type_user == 1) $sql.= " AND m.usertype IN (1,2)";
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index c3d8714ab89..b68d7706e43 100755
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -98,7 +98,7 @@ function dolGetModulesDirs($subdir='')
             while (($file = readdir($handle))!==false)
             {
                 if (preg_match('/disabled/',$file)) continue;   // We discard module if it contains disabled into name.
-                
+
                 if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
                 {
                     if (is_dir($dirroot . '/' . $file . '/core/modules'.$subdir.'/'))
@@ -207,7 +207,7 @@ function dol_print_object_info($object, $usetable=0)
     //print "x".$deltadateforserver." - ".$deltadateforclient." - ".$deltadateforuser;
 
     if ($usetable) print '<table class="border centpercent">';
-    
+
     // Import key
     if (! empty($object->import_key))
     {
@@ -378,7 +378,7 @@ function dol_print_object_info($object, $usetable=0)
         if ($usetable) print '</td></tr>';
         else print '<br>';
     }
-    
+
     // Date approve
     if (! empty($object->date_approve2))
     {
@@ -391,7 +391,7 @@ function dol_print_object_info($object, $usetable=0)
         if ($usetable) print '</td></tr>';
         else print '<br>';
     }
-    
+
     // User close
     if (! empty($object->user_cloture))
     {
@@ -476,7 +476,7 @@ function dol_print_object_info($object, $usetable=0)
         if ($usetable) print '</td></tr>';
         else print '<br>';
     }
-    
+
     if ($usetable) print '</table>';
 }
 
@@ -799,7 +799,7 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
 			if(!empty($user->array_options['options_'.$extra])){
 				$mask =  preg_replace('#('.$start.')(.*?)('.$end.')#si', $user->array_options['options_'.$extra], $mask);
 			}
-    } 
+    }
     $maskwithonlyymcode=$mask;
     $maskwithonlyymcode=preg_replace('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i',$maskcounter,$maskwithonlyymcode);
     $maskwithonlyymcode=preg_replace('/\{dd\}/i','dd',$maskwithonlyymcode);
@@ -928,11 +928,11 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
     //print "masktri=".$masktri." maskcounter=".$maskcounter." maskraz=".$maskraz." maskoffset=".$maskoffset."<br>\n";
 
     // Define $sqlstring
-    if (function_exists('mb_strrpos')) 
+    if (function_exists('mb_strrpos'))
     	{
     	$posnumstart=mb_strrpos($maskwithnocode,$maskcounter, 'UTF-8');
-	} 
-	else 
+	}
+	else
 	{
     	$posnumstart=strrpos($maskwithnocode,$maskcounter);
 	}	// Pos of counter in final string (from 0 to ...)
@@ -1123,7 +1123,7 @@ function get_string_between($string, $start, $end){
     $string = " ".$string;
      $ini = strpos($string,$start);
      if ($ini == 0) return "";
-     $ini += strlen($start);     
+     $ini += strlen($start);
      $len = strpos($string,$end,$ini) - $ini;
      return substr($string,$ini,$len);
 }
@@ -1539,9 +1539,9 @@ function getListOfModels($db,$type,$maxfilenamelength=0)
     $sql = "SELECT nom as id, nom as lib, libelle as label, description as description";
     $sql.= " FROM ".MAIN_DB_PREFIX."document_model";
     $sql.= " WHERE type = '".$type."'";
-    $sql.= " AND entity IN (0,".(! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)?"1,":"").$conf->entity.")";
+    $sql.= " AND entity IN (0,".$conf->entity.")";
     $sql.= " ORDER BY description DESC";
-		
+
     dol_syslog('/core/lib/function2.lib.php::getListOfModels', LOG_DEBUG);
     $resql = $db->query($sql);
     if ($resql)
@@ -1625,7 +1625,7 @@ function getListOfModels($db,$type,$maxfilenamelength=0)
 /**
  * This function evaluates a string that should be a valid IPv4
  * Note: For ip 169.254.0.0, it returns 0 with some PHP (5.6.24) and 2 with some minor patchs of PHP (5.6.25). See https://github.com/php/php-src/pull/1954.
- *   
+ *
  * @param	string $ip IP Address
  * @return	int 0 if not valid or reserved range, 1 if valid and public IP, 2 if valid and private range IP
  */
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 1c919237f44..f39e6ecd628 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2006-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2010-2012	Regis Houssin		<regis.houssin@capnetworks.com>
+ * Copyright (C) 2010-2017	Regis Houssin		<regis.houssin@capnetworks.com>
  * Copyright (C) 2015	    Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -76,7 +76,7 @@ function user_prepare_head($object)
     {
         if (empty($conf->global->AGENDA_EXT_NB)) $conf->global->AGENDA_EXT_NB=5;
         $MAXAGENDA=$conf->global->AGENDA_EXT_NB;
-        
+
         $i=1;
         $nbagenda = 0;
         while ($i <= $MAXAGENDA)
@@ -87,10 +87,10 @@ function user_prepare_head($object)
             $offsettz='AGENDA_EXT_OFFSETTZ_'.$object->id.'_'.$key;
             $color='AGENDA_EXT_COLOR_'.$object->id.'_'.$key;
             $i++;
-        
+
             if (! empty($object->conf->$name)) $nbagenda++;
         }
-        
+
 	    $head[$h][0] = DOL_URL_ROOT.'/user/agenda_extsites.php?id='.$object->id;
 	    $head[$h][1] = $langs->trans("ExtSites").($nbagenda ? ' <span class="badge">'.$nbagenda.'</span>' : '');
 	    $head[$h][2] = 'extsites';
@@ -238,8 +238,6 @@ function group_prepare_head($object)
     return $head;
 }
 
-
-
 /**
  * Prepare array with list of tabs
  *
@@ -283,32 +281,6 @@ function user_admin_prepare_head()
 	return $head;
 }
 
-
-
-/**
- * Prepare array with list of tabs
- *
- * @param   Object	$object		Object related to tabs
- * @param	array	$aEntities	Entities array
- * @return  array				Array of tabs
- */
-function entity_prepare_head($object, $aEntities)
-{
-	global $mc;
-
-	$head = array();
-
-	foreach($aEntities as $entity)
-	{
-		$mc->getInfo($entity);
-		$head[$entity][0] = $_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;entity='.$entity;
-		$head[$entity][1] = $mc->label;
-		$head[$entity][2] = $entity;
-	}
-
-	return $head;
-}
-
 /**
  * 	Show list of themes. Show all thumbs of themes
  *
@@ -485,7 +457,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
         print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
         print '</td>';
     }
-    
+
 	// Background color THEME_ELDY_BACKBODY
     if ($foruserprofile)
 	{
@@ -508,7 +480,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 			else print '';
 	   	}
     	if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
-	    print '</td>';*/	    
+	    print '</td>';*/
 	}
 	else
 	{
@@ -530,7 +502,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
     	print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
 	    print '</td>';
 	}
-	
+
 	// TopMenuBackgroundColor
     if ($foruserprofile)
 	{
@@ -553,13 +525,13 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 			else print '';
 	   	}
     	if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
-	    print '</td>';*/	    
+	    print '</td>';*/
 	}
 	else
 	{
 	    $default='5a6482';
 	    if ($conf->theme == 'md') $default='5a3278';
-	    
+
 	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
 	    print '<td colspan="'.($colspan-1).'">';
@@ -577,15 +549,15 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
     	print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
 	    print '</td>';
 	}
-	
+
 	// BackgroundTableTitleColor
 	if ($foruserprofile)
 	{
-	    
-	    
+
+
 	}
 	else
-	{	
+	{
 	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("BackgroundTableTitleColor").'</td>';
 	    print '<td colspan="'.($colspan-1).'">';
@@ -613,7 +585,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	{
 	    $default='ffffff';
 	    if ($conf->theme == 'md') $default='ffffff';
-	
+
 	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("BackgroundTableLineOddColor").'</td>';
 	    print '<td colspan="'.($colspan-1).'">';
@@ -631,17 +603,17 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	    print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
 	    print '</td>';
 	}
-	
+
 	// BackgroundTableLineEvenColor
 	if ($foruserprofile)
 	{
-	
+
 	}
 	else
 	{
 	    $default='f8f8f8';
 	    if ($conf->theme == 'md') $default='f8f8f8';
-	
+
 	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("BackgroundTableLineEvenColor").'</td>';
 	    print '<td colspan="'.($colspan-1).'">';
@@ -659,12 +631,12 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	    print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
 	    print '</td>';
 	}
-	
+
 	// TextTitleColor
 	if ($foruserprofile)
 	{
-	     
-	     
+
+
 	}
 	else
 	{
@@ -681,12 +653,12 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	    }
 	    print ' &nbsp; ('.$langs->trans("Default").': <strong><span style="color: #3c3c14">3c3c14</span></strong>) ';
     	print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
-	    
+
 	    print '</td>';
-	
+
 	    print '</tr>';
 	}
-	
+
 	// Text LinkColor
 	if ($foruserprofile)
 	{
@@ -724,7 +696,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	    {
 	        $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK,array()),'');
 	        if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-	        else 
+	        else
 	        {
 	            //print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$defaultcolor.'" value="'.$langs->trans("Default").'">';
 	            //print '<span style="color: #000078">'.$langs->trans("Default").'</span>';
@@ -735,7 +707,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
     	print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
 	    print '</td>';
 	}
-		
+
 	// Use Hover
 	if ($foruserprofile)
 	{
@@ -767,7 +739,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	    {
 	        if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color='edf4fb';
 	        else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER,array()),'');
-	        if ($color) 
+	        if ($color)
 	        {
 	            if ($color != 'edf4fb') print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 	            else print $langs->trans("Default");
@@ -779,7 +751,6 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	    print '</td>';
 	    print '</tr>';
 	}
-	
+
     print '</table>';
 }
-
diff --git a/htdocs/core/login/functions_dolibarr.php b/htdocs/core/login/functions_dolibarr.php
index daf82b2f995..190d779d90b 100644
--- a/htdocs/core/login/functions_dolibarr.php
+++ b/htdocs/core/login/functions_dolibarr.php
@@ -39,7 +39,7 @@ function check_user_password_dolibarr($usertotest,$passwordtotest,$entitytotest=
 
 	// Force master entity in transversal mode
 	$entity=$entitytotest;
-	if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)) $entity=1;
+	if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $entity=1;
 
 	$login='';
 
diff --git a/htdocs/core/login/functions_ldap.php b/htdocs/core/login/functions_ldap.php
index c94312c8aa2..129bbcedf38 100644
--- a/htdocs/core/login/functions_ldap.php
+++ b/htdocs/core/login/functions_ldap.php
@@ -45,7 +45,7 @@ function check_user_password_ldap($usertotest,$passwordtotest,$entitytotest)
 
 	// Force master entity in transversal mode
 	$entity=$entitytotest;
-	if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)) $entity=1;
+	if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $entity=1;
 
 	$login='';
 	$resultFetchUser='';
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 7a60f330727..a32d3ef6886 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -63,9 +63,9 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 -- Home - Menu users and groups
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '1', __HANDLER__, 'left', 400__+MAX_llx_menu__, 'home', 'users', 1__+MAX_llx_menu__, '/user/home.php?leftmenu=users', 'MenuUsersAndGroups', 0, 'users', '', '', 2, 4, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="users"', __HANDLER__, 'left', 401__+MAX_llx_menu__, 'home', '', 400__+MAX_llx_menu__, '/user/index.php?leftmenu=users', 'Users', 1, 'users', '$user->rights->user->user->lire || $user->admin', '', 2, 0, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="users"', __HANDLER__, 'left', 402__+MAX_llx_menu__, 'home', '', 401__+MAX_llx_menu__, '/user/card.php?leftmenu=users&amp;action=create', 'NewUser', 2, 'users', '$user->rights->user->user->creer || $user->admin', '', 2, 0, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="users"', __HANDLER__, 'left', 403__+MAX_llx_menu__, 'home', '', 400__+MAX_llx_menu__, '/user/group/index.php?leftmenu=users', 'Groups', 1, 'users', '($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->read:$user->rights->user->user->lire) || $user->admin', '', 2, 1, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="users"', __HANDLER__, 'left', 404__+MAX_llx_menu__, 'home', '', 403__+MAX_llx_menu__, '/user/group/card.php?leftmenu=users&amp;action=create', 'NewGroup', 2, 'users', '($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->write:$user->rights->user->user->creer) || $user->admin', '', 2, 0, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="users"', __HANDLER__, 'left', 402__+MAX_llx_menu__, 'home', '', 401__+MAX_llx_menu__, '/user/card.php?leftmenu=users&amp;action=create', 'NewUser', 2, 'users', '($user->rights->user->user->creer || $user->admin) && !(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)', '', 2, 0, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="users"', __HANDLER__, 'left', 403__+MAX_llx_menu__, 'home', '', 400__+MAX_llx_menu__, '/user/group/index.php?leftmenu=users', 'Groups', 1, 'users', '(($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->read:$user->rights->user->user->lire) || $user->admin) && !(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)', '', 2, 1, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="users"', __HANDLER__, 'left', 404__+MAX_llx_menu__, 'home', '', 403__+MAX_llx_menu__, '/user/group/card.php?leftmenu=users&amp;action=create', 'NewGroup', 2, 'users', '(($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->write:$user->rights->user->user->creer) || $user->admin) && !(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)', '', 2, 0, __ENTITY__);
 -- Third parties
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 500__+MAX_llx_menu__, 'companies', 'thirdparties', 2__+MAX_llx_menu__, '/societe/index.php?leftmenu=thirdparties', 'ThirdParty', 0, 'companies', '$user->rights->societe->lire', '', 2, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 501__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/societe/card.php?action=create', 'MenuNewThirdParty', 1, 'companies', '$user->rights->societe->lire', '', 2, 0, __ENTITY__);
@@ -211,7 +211,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2400__+MAX_llx_menu__, 'accountancy', 'accounting', 6__+MAX_llx_menu__, '/accountancy/index.php?leftmenu=accountancy', 'MenuAccountancy', 0, 'accountancy', '! empty($conf->accounting->enabled) || $user->rights->accounting->bind->write || $user->rights->accounting->bind->write || $user->rights->compta->resultat->lire', '', 0, 7, __ENTITY__);
 	-- Setup
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2451__+MAX_llx_menu__, 'accountancy', 'accountancy_admin',            2400__+MAX_llx_menu__, '/accountancy/index.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'Setup', 1, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 1, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2457__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_journal',       2451__+MAX_llx_menu__, '/accountancy/admin/journals_list.php?id=35&mainmenu=accountancy&leftmenu=accountancy_admin', 'AccountingJournals', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 10, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2454__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_journal',       2451__+MAX_llx_menu__, '/accountancy/admin/journals_list.php?id=35&mainmenu=accountancy&leftmenu=accountancy_admin', 'AccountingJournals', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 10, __ENTITY__);
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2455__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chartmodel',    2451__+MAX_llx_menu__, '/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'Pcg_version', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 20, __ENTITY__);
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2456__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chart',         2451__+MAX_llx_menu__, '/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'Chartofaccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 30, __ENTITY__);
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2457__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chart_group',   2451__+MAX_llx_menu__, '/accountancy/admin/categories_list.php?id=32&mainmenu=accountancy&leftmenu=accountancy_admin', 'AccountingCategory', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 40, __ENTITY__);
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 38a9a66a137..af8bfff5f2c 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -597,12 +597,12 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				if ($usemenuhider || empty($leftmenu) || $leftmenu=="users")
 				{
 					$newmenu->add("", $langs->trans("Users"), 1, $user->rights->user->user->lire || $user->admin);
-					$newmenu->add("/user/card.php?leftmenu=users&action=create", $langs->trans("NewUser"),2, $user->rights->user->user->creer || $user->admin, '', 'home');
+					$newmenu->add("/user/card.php?leftmenu=users&action=create", $langs->trans("NewUser"),2, ($user->rights->user->user->creer || $user->admin) && !(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE), '', 'home');
 					$newmenu->add("/user/index.php?leftmenu=users", $langs->trans("ListOfUsers"), 2, $user->rights->user->user->lire || $user->admin);
 					$newmenu->add("/user/hierarchy.php?leftmenu=users", $langs->trans("HierarchicView"), 2, $user->rights->user->user->lire || $user->admin);
-					$newmenu->add("", $langs->trans("Groups"), 1, $user->rights->user->user->lire || $user->admin);
-					$newmenu->add("/user/group/card.php?leftmenu=users&action=create", $langs->trans("NewGroup"), 2, ($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->write:$user->rights->user->user->creer) || $user->admin);
-					$newmenu->add("/user/group/index.php?leftmenu=users", $langs->trans("ListOfGroups"), 2, ($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->read:$user->rights->user->user->lire) || $user->admin);
+					$newmenu->add("", $langs->trans("Groups"), 1, ($user->rights->user->user->lire || $user->admin) && !(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE));
+					$newmenu->add("/user/group/card.php?leftmenu=users&action=create", $langs->trans("NewGroup"), 2, (($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->write:$user->rights->user->user->creer) || $user->admin) && !(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE));
+					$newmenu->add("/user/group/index.php?leftmenu=users", $langs->trans("ListOfGroups"), 2, (($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->read:$user->rights->user->user->lire) || $user->admin) && !(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE));
 				}
 			}
 
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 2bb2121411f..6d14f47af10 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -156,9 +156,6 @@ if (empty($dolibarr_main_limit_users)) $dolibarr_main_limit_users=0;
 if (empty($dolibarr_mailing_limit_sendbyweb)) $dolibarr_mailing_limit_sendbyweb=0;
 if (empty($dolibarr_mailing_limit_sendbycli)) $dolibarr_mailing_limit_sendbycli=0;
 if (empty($dolibarr_strict_mode)) $dolibarr_strict_mode=0; // For debug in php strict mode
-// TODO Multicompany Remove this. Useless.
-if (empty($multicompany_transverse_mode)) $multicompany_transverse_mode=0;
-if (empty($multicompany_force_entity)) $multicompany_force_entity=0; // To force entity in login page
 
 // Security: CSRF protection
 // This test check if referrer ($_SERVER['HTTP_REFERER']) is same web site than Dolibarr ($_SERVER['HTTP_HOST'])
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index ba36d911971..c99ea6899a2 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -1209,7 +1209,7 @@ class Holiday extends CommonObject
                 $sql = "SELECT u.rowid";
                 $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
 
-                if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
+                if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
                 {
                 	$sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
                 	$sql.= " WHERE (ug.fk_user = u.rowid";
@@ -1305,7 +1305,7 @@ class Holiday extends CommonObject
                 $sql = "SELECT u.rowid, u.lastname, u.firstname, u.gender, u.photo, u.employee, u.statut";
                 $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
 
-                if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
+                if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
                 {
                 	$sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
                 	$sql.= " WHERE (ug.fk_user = u.rowid";
diff --git a/htdocs/index.php b/htdocs/index.php
index 5303587150e..90c014b0e99 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -1,9 +1,9 @@
 <?php
-/* Copyright (C) 2001-2004 Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2015 Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2015 Regis Houssin	<regis.houssin@capnetworks.com>
- * Copyright (C) 2011-2012 Juanjo Menent	<jmenent@2byte.es>
- * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
+/* Copyright (C) 2001-2004	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2015	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2017	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2011-2012	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2015		Marcos García			<marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -165,7 +165,7 @@ if (empty($user->societe_id))
     	    DOL_DOCUMENT_ROOT."/contact/class/contact.class.php",
     	    DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php",
     	    DOL_DOCUMENT_ROOT."/product/class/product.class.php",
-    	    DOL_DOCUMENT_ROOT."/product/class/service.class.php",
+    	    DOL_DOCUMENT_ROOT."/product/class/product.class.php",
     	    DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php",
     	    DOL_DOCUMENT_ROOT."/commande/class/commande.class.php",
     	    DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php",
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index d7e68346511..e807c446830 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -379,3 +379,19 @@ create table llx_loan_schedule
   fk_user_modif		integer           
 )ENGINE=innodb;
 
+ALTER TABLE llx_user_rights ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER rowid;
+ALTER TABLE llx_user_rights DROP FOREIGN KEY fk_user_rights_fk_user_user;
+ALTER TABLE llx_user_rights DROP INDEX uk_user_rights;
+ALTER TABLE llx_user_rights DROP INDEX fk_user;
+ALTER TABLE llx_user_rights ADD UNIQUE INDEX uk_user_rights (entity, fk_user, fk_id);
+ALTER TABLE llx_user_rights ADD CONSTRAINT fk_user_rights_fk_user_user FOREIGN KEY (fk_user) REFERENCES llx_user (rowid);
+
+ALTER TABLE llx_usergroup_rights ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER rowid;
+ALTER TABLE llx_usergroup_rights DROP FOREIGN KEY fk_usergroup_rights_fk_usergroup;
+ALTER TABLE llx_usergroup_rights DROP INDEX fk_usergroup;
+ALTER TABLE llx_usergroup_rights ADD UNIQUE INDEX uk_usergroup_rights (entity, fk_usergroup, fk_id);
+ALTER TABLE llx_usergroup_rights ADD CONSTRAINT fk_usergroup_rights_fk_usergroup FOREIGN KEY (fk_usergroup) REFERENCES llx_usergroup (rowid);
+
+
+
+
diff --git a/htdocs/install/mysql/tables/llx_user_rights.key.sql b/htdocs/install/mysql/tables/llx_user_rights.key.sql
index 6e87568e247..8fae1c1a160 100644
--- a/htdocs/install/mysql/tables/llx_user_rights.key.sql
+++ b/htdocs/install/mysql/tables/llx_user_rights.key.sql
@@ -1,6 +1,7 @@
 -- ============================================================================
--- Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
--- Copyright (C) 2005 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2003	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+-- Copyright (C) 2005	Laurent Destailleur		<eldy@users.sourceforge.net>
+-- Copyright (C) 2017	Regis Houssin			<regis.houssin@capnetworks.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
@@ -21,7 +22,6 @@
 -- Delete orphans
 -- V4 DELETE llx_user_rights FROM llx_user_rights LEFT JOIN llx_user ON llx_user_rights.fk_user = llx_user.rowid WHERE llx_user.rowid IS NULL;
 
+ALTER TABLE llx_user_rights ADD UNIQUE INDEX uk_user_rights (entity, fk_user, fk_id);
 
 ALTER TABLE llx_user_rights ADD CONSTRAINT fk_user_rights_fk_user_user FOREIGN KEY (fk_user)    REFERENCES llx_user (rowid);
-
-ALTER TABLE llx_user_rights ADD UNIQUE INDEX uk_user_rights (fk_user, fk_id);
diff --git a/htdocs/install/mysql/tables/llx_user_rights.sql b/htdocs/install/mysql/tables/llx_user_rights.sql
index bd4c0afc242..cedfa8a00c9 100644
--- a/htdocs/install/mysql/tables/llx_user_rights.sql
+++ b/htdocs/install/mysql/tables/llx_user_rights.sql
@@ -1,5 +1,6 @@
 -- ============================================================================
--- Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2003	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+-- Copyright (C) 2017	Regis Houssin			<regis.houssin@capnetworks.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
@@ -18,8 +19,9 @@
 
 create table llx_user_rights
 (
-  rowid         integer AUTO_INCREMENT PRIMARY KEY,
-  fk_user       integer NOT NULL,
-  fk_id         integer NOT NULL
+  rowid			integer AUTO_INCREMENT PRIMARY KEY,
+  entity		integer DEFAULT 1 NOT NULL, -- multi company id
+  fk_user		integer NOT NULL,
+  fk_id			integer NOT NULL
 )ENGINE=innodb;
 
diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql
index 119ce8982b5..f08a6f62637 100644
--- a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql
+++ b/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql
@@ -1,5 +1,6 @@
 -- ============================================================================
--- Copyright (C) 2005 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2005	Laurent Destailleur	<eldy@users.sourceforge.net>
+-- Copyright (C) 2017	Regis Houssin		<regis.houssin@capnetworks.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
@@ -20,5 +21,6 @@
 -- Supprime orhpelins pour permettre montee de la cle
 -- V4 DELETE llx_usergroup_rights FROM llx_usergroup_rights LEFT JOIN llx_usergroup ON llx_usergroup_rights.fk_usergroup = llx_usergroup.rowid WHERE llx_usergroup.rowid IS NULL;
 
+ALTER TABLE llx_usergroup_rights ADD UNIQUE INDEX uk_usergroup_rights (entity, fk_usergroup, fk_id);
 
 ALTER TABLE llx_usergroup_rights ADD CONSTRAINT fk_usergroup_rights_fk_usergroup FOREIGN KEY (fk_usergroup)    REFERENCES llx_usergroup (rowid);
diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.sql
index 850648edea4..e8a3af37e7c 100644
--- a/htdocs/install/mysql/tables/llx_usergroup_rights.sql
+++ b/htdocs/install/mysql/tables/llx_usergroup_rights.sql
@@ -1,5 +1,6 @@
 -- ============================================================================
--- Copyright (C) 2005 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2005	Laurent Destailleur	<eldy@users.sourceforge.net>
+-- Copyright (C) 2017	Regis Houssin		<regis.houssin@capnetworks.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
@@ -18,10 +19,10 @@
 
 create table llx_usergroup_rights
 (
-  rowid         integer AUTO_INCREMENT PRIMARY KEY,
-  fk_usergroup  integer NOT NULL,
-  fk_id         integer NOT NULL,
+  rowid			integer AUTO_INCREMENT PRIMARY KEY,
+  entity		integer DEFAULT 1 NOT NULL, -- multi company id
+  fk_usergroup	integer NOT NULL,
+  fk_id			integer NOT NULL
 
-  UNIQUE(fk_usergroup,fk_id)
 )ENGINE=innodb;
 
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 90a4cb70611..ecb1c46478f 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -1,14 +1,14 @@
 <?php
-/* Copyright (C) 2002-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2003      Xavier Dutoit        <doli@sydesy.com>
- * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
- * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2005 	   Simon Tosser         <simon@kornog-computing.com>
- * Copyright (C) 2006 	   Andre Cianfarani     <andre.cianfarani@acdeveloppement.net>
- * Copyright (C) 2010      Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2011      Philippe Grand       <philippe.grand@atoo-net.com>
+/* Copyright (C) 2002-2007	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2003		Xavier Dutoit			<doli@sydesy.com>
+ * Copyright (C) 2004-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2004		Sebastien Di Cintio		<sdicintio@ressource-toi.org>
+ * Copyright (C) 2004		Benoit Mortier			<benoit.mortier@opensides.be>
+ * Copyright (C) 2005-2017	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2005		Simon Tosser			<simon@kornog-computing.com>
+ * Copyright (C) 2006		Andre Cianfarani		<andre.cianfarani@acdeveloppement.net>
+ * Copyright (C) 2010		Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2011		Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2014		Teddy Andreotti			<125155@supinfo.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -98,11 +98,6 @@ if (! empty($dolibarr_main_document_root_alt))
 	}
 }
 
-// Set properties specific to multicompany
-// TODO Multicompany Remove this. Useless. Var should be read when required.
-$conf->multicompany->transverse_mode = empty($multicompany_transverse_mode)?'':$multicompany_transverse_mode;		// Force Multi-Company transverse mode
-$conf->multicompany->force_entity = empty($multicompany_force_entity)?'':(int) $multicompany_force_entity;			// Force entity in login page
-
 // Chargement des includes principaux de librairies communes
 if (! defined('NOREQUIREUSER')) require_once DOL_DOCUMENT_ROOT .'/user/class/user.class.php';		// Need 500ko memory
 if (! defined('NOREQUIRETRAN')) require_once DOL_DOCUMENT_ROOT .'/core/class/translate.class.php';
@@ -170,10 +165,6 @@ if (! defined('NOREQUIREDB'))
 	{
 		$conf->entity = $_COOKIE['DOLENTITY'];
 	}
-	else if (! empty($conf->multicompany->force_entity) && is_numeric($conf->multicompany->force_entity)) // To force entity in login page
-	{
-		$conf->entity = $conf->multicompany->force_entity;
-	}
 
 	// Sanitize entity
 	if (! is_numeric($conf->entity)) $conf->entity=1;
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index a935b87bd58..c3a11ac7cab 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -110,7 +110,7 @@ if (empty($user->socid)) $fieldstosearchall["t.note_private"]="NotePrivate";
 $arrayfields=array(
     't.field1'=>array('label'=>"Field1", 'checked'=>1),
     't.field2'=>array('label'=>"Field2", 'checked'=>1),
-    //'t.entity'=>array('label'=>"Entity", 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))),
+    //'t.entity'=>array('label'=>"Entity", 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))),
     't.datec'=>array('label'=>"DateCreationShort", 'checked'=>0, 'position'=>500),
     't.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
     //'t.statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index 78d3c470cb1..162bd6d04b6 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -102,7 +102,7 @@ $arrayfields=array(
 	't.eatby'=>array('label'=>$langs->trans("EatByDate"), 'checked'=>1),
 	't.sellby'=>array('label'=>$langs->trans("SellByDate"), 'checked'=>1),
 	//'t.import_key'=>array('label'=>$langs->trans("ImportKey"), 'checked'=>1),
-    //'t.entity'=>array('label'=>$langs->trans("Entity"), 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))),
+    //'t.entity'=>array('label'=>$langs->trans("Entity"), 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))),
     //'t.fk_user_creat'=>array('label'=>$langs->trans("UserCreationShort"), 'checked'=>0, 'position'=>500),
 	//'t.fk_user_modif'=>array('label'=>$langs->trans("UserModificationShort"), 'checked'=>0, 'position'=>500),
     't.datec'=>array('label'=>$langs->trans("DateCreationShort"), 'checked'=>0, 'position'=>500),
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index ebd06dbd5c4..5b300f39b33 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1695,7 +1695,7 @@ class Societe extends CommonObject
 
         $sql = "SELECT DISTINCT u.rowid, u.login, u.lastname, u.firstname, u.email, u.statut, u.entity, u.photo";
         $sql.= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."user as u";
-        if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
+        if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
         {
         	$sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
         	$sql.= " WHERE ((ug.fk_user = sc.fk_user";
diff --git a/htdocs/societe/commerciaux.php b/htdocs/societe/commerciaux.php
index 89bb836d119..7046310fa6f 100644
--- a/htdocs/societe/commerciaux.php
+++ b/htdocs/societe/commerciaux.php
@@ -142,13 +142,13 @@ if (! empty($socid))
 	$sql = "SELECT DISTINCT u.rowid, u.login, u.fk_soc, u.lastname, u.firstname, u.statut, u.entity, u.photo";
 	$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
 	$sql .= " , ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
+	if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
 	{
 	    $sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
 	}
 	$sql .= " WHERE sc.fk_soc =".$object->id;
 	$sql .= " AND sc.fk_user = u.rowid";
-	if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
+	if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
 	{
 		$sql.= " AND ((ug.fk_user = sc.fk_user";
 		$sql.= " AND ug.entity = ".$conf->entity.")";
@@ -232,7 +232,7 @@ if (! empty($socid))
 
 		$sql = "SELECT DISTINCT u.rowid, u.lastname, u.firstname, u.login, u.email, u.statut, u.fk_soc, u.photo";
 		$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
-		if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
+		if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
 		{
 			$sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
 			$sql.= " WHERE ((ug.fk_user = u.rowid";
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 92951de98e8..86bb168c54f 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2002-2003 Jean-Louis Bergamo   <jlb@j1b.org>
  * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2016 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2017 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2005      Lionel Cousteix      <etm_ltd@tiscali.co.uk>
  * Copyright (C) 2011      Herve Prot           <herve.prot@symeos.com>
  * Copyright (C) 2012      Juanjo Menent        <jmenent@2byte.es>
@@ -57,6 +57,12 @@ $subaction	= GETPOST('subaction','alpha');
 $group		= GETPOST("group","int",3);
 $cancel     = GETPOST('cancel');
 
+// Users/Groups management only in master entity if transverse mode
+if (($action == 'create' || $action == 'adduserldap') && ! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)
+{
+	accessforbidden();
+}
+
 // Define value to know what current user can do on users
 $canadduser=(! empty($user->admin) || $user->rights->user->user->creer);
 $canreaduser=(! empty($user->admin) || $user->rights->user->user->lire);
@@ -228,11 +234,11 @@ if (empty($reshook)) {
 
 			// Set entity property
 			$entity = GETPOST('entity', 'int');
-			if (!empty($conf->multicompany->enabled)) {
-				if (!empty($_POST["superadmin"])) {
+			if (! empty($conf->multicompany->enabled)) {
+				if (GETPOST('superadmin', 'int')) {
 					$object->entity = 0;
 				} else {
-					if ($conf->multicompany->transverse_mode) {
+					if (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 						$object->entity = 1; // all users are forced into master entity
 					} else {
 						$object->entity = ($entity == '' ? 1 : $entity);
@@ -249,8 +255,8 @@ if (empty($reshook)) {
 
 			$id = $object->create($user);
 			if ($id > 0) {
-				if (isset($_POST['password']) && trim($_POST['password'])) {
-					$object->setPassword($user, trim($_POST['password']));
+				if (GETPOST('password')) {
+					$object->setPassword($user, GETPOST('password'));
 				}
             			if (! empty($conf->categorie->enabled)) {
 					// Categories association
@@ -283,10 +289,10 @@ if (empty($reshook)) {
 
 			$object->fetch($id);
 			if ($action == 'addgroup') {
-				$object->SetInGroup($group, ($conf->multicompany->transverse_mode ? GETPOST("entity") : $editgroup->entity));
+				$object->SetInGroup($group, (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) ? GETPOST('entity', 'int') : $editgroup->entity));
 			}
 			if ($action == 'removegroup') {
-				$object->RemoveFromGroup($group, ($conf->multicompany->transverse_mode ? GETPOST("entity") : $editgroup->entity));
+				$object->RemoveFromGroup($group, (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) ? GETPOST('entity', 'int') : $editgroup->entity));
 			}
 
 			if ($result > 0) {
@@ -300,7 +306,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == 'update' && ! $cancel) 
+	if ($action == 'update' && ! $cancel)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
@@ -319,7 +325,7 @@ if (empty($reshook)) {
 				$error ++;
 			}
 
-			if (!$error) 
+			if (!$error)
 			{
 				$object->fetch($id);
 
@@ -367,7 +373,7 @@ if (empty($reshook)) {
 					{
 						$object->entity = 0;
 					}
-					else if ($conf->multicompany->transverse_mode)
+					else if (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
 					{
 						$object->entity = 1; // all users in master entity
 					}
@@ -409,7 +415,7 @@ if (empty($reshook)) {
 					}
 				}
 
-				if (!$error && isset($_POST['contactid'])) {
+				if (!$error && GETPOST('contactid', 'int')) {
 					$contactid = GETPOST('contactid', 'int');
 
 					if ($contactid > 0) {
@@ -456,7 +462,7 @@ if (empty($reshook)) {
 								setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
 							} else {
         					    // Create thumbs
-        					    $object->addThumbs($newfile);					    
+        					    $object->addThumbs($newfile);
 							}
 						} else {
 							$error ++;
@@ -465,7 +471,7 @@ if (empty($reshook)) {
 						}
 					}
 				}
-				
+
             	if (! $error && ! count($object->errors))
             	{
             		// Then we add the associated categories
@@ -476,7 +482,7 @@ if (empty($reshook)) {
 				if (!$error && !count($object->errors)) {
 					setEventMessages($langs->trans("UserModified"), null, 'mesgs');
 					$db->commit();
-					
+
 					$login = $_SESSION["dol_login"];
 					if ($login && $login == $object->oldcopy->login && $object->oldcopy->login != $object->login)    // Current user has changed its login
 					{
@@ -495,11 +501,11 @@ if (empty($reshook)) {
 		    if ($caneditpassword)    // Case we can edit only password
 		    {
 		        dol_syslog("Not allowed to change fields, only password");
-		        
+
 		        $object->fetch($id);
-		    
+
 		        $object->oldcopy = clone $object;
-		    
+
 		        $ret = $object->setPassword($user, GETPOST("password"));
 		        if ($ret < 0)
 		        {
@@ -591,14 +597,14 @@ if (empty($reshook)) {
             setEventMessages($ldap->error, $ldap->errors, 'errors');
         }
     }
-		
+
     // Actions to send emails
     $trigger_name='USER_SENTBYMAIL';
     $paramname='id';    // Name of param key to open the card
     $mode='emailfromuser';
     $trackid='use'.$object->id;
     include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
-    
+
     // Actions to build doc
     $upload_dir = $conf->user->dir_output;
     $permissioncreate=$user->rights->user->user->creer;
@@ -617,7 +623,7 @@ $formfile = new FormFile($db);
 
 llxHeader('',$langs->trans("UserCard"));
 
-if (($action == 'create') || ($action == 'adduserldap'))
+if ($action == 'create' || $action == 'adduserldap')
 {
     /* ************************************************************************** */
     /*                                                                            */
@@ -858,7 +864,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
         print '<td>';
         print $form->selectyesno('admin',GETPOST('admin'),1);
 
-        if (! empty($conf->multicompany->enabled) && ! $user->entity && empty($conf->multicompany->transverse_mode))
+        if (! empty($conf->multicompany->enabled) && ! $user->entity && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
         {
             if (! empty($conf->use_javascript_ajax))
             {
@@ -888,8 +894,8 @@ if (($action == 'create') || ($action == 'adduserldap'))
                             });
                     </script>';
             }
-            $checked=($_POST["superadmin"]?' checked':'');
-            $disabled=($_POST["superadmin"]?'':' disabled');
+            $checked=(GETPOST('superadmin', 'int')?' checked':'');
+            $disabled=(GETPOST('superadmin', 'int')?'':' disabled');
             print '<input type="checkbox" name="superadmin" value="1"'.$checked.$disabled.' /> '.$langs->trans("SuperAdministrator");
         }
         print "</td></tr>\n";
@@ -1005,9 +1011,9 @@ if (($action == 'create') || ($action == 'adduserldap'))
     print '</td></tr>';
 
     // Multicompany
-    if (! empty($conf->multicompany->enabled))
+    if (! empty($conf->multicompany->enabled) && is_object($mc))
     {
-        if (empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity && is_object($mc))
+    	if (empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && ! $user->entity)
         {
             print "<tr>".'<td>'.$langs->trans("Entity").'</td>';
             print "<td>".$mc->select_entities($conf->entity);
@@ -1027,9 +1033,9 @@ if (($action == 'create') || ($action == 'adduserldap'))
         print '<input size="30" type="text" name="accountancy_code" value="'.GETPOST('accountancy_code').'">';
         print '</td></tr>';
     }
-    
+
     // TODO Move this into tab RH (HierarchicalResponsible must be on both tab)
-    
+
     // Hierarchy
     print '<tr><td>'.$langs->trans("HierarchicalResponsible").'</td>';
     print '<td>';
@@ -1076,7 +1082,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
     print '<input size="8" type="text" name="weeklyhours" value="'.GETPOST('weeklyhours').'">';
     print '</td>';
     print "</tr>\n";
-	
+
     // Date employment
     print '<tr><td>'.$langs->trans("DateEmployment").'</td>';
     print '<td>';
@@ -1092,9 +1098,9 @@ if (($action == 'create') || ($action == 'adduserldap'))
 		print $formother->selectColor(GETPOST('color')?GETPOST('color'):$object->color, 'color', null, 1, '', 'hideifnotset');
 		print '</td></tr>';
 	}
-	
+
 	// Categories
-	if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire)) 
+	if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire))
 	{
 		print '<tr><td>' . fieldLabel('Categories', 'usercats') . '</td><td colspan="3">';
 		$cate_arbo = $form->select_all_categories('user', null, 'parent', null, null, 1);
@@ -1110,7 +1116,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
     {
     	print $object->showOptionals($extrafields,'edit');
     }
-	
+
     // Note
     print '<tr><td class="tdtop">';
     print $langs->trans("Note");
@@ -1127,7 +1133,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
     $doleditor=new DolEditor('signature',GETPOST('signature'),'',138,'dolibarr_mailings','In',true,true,empty($conf->global->FCKEDITOR_ENABLE_USERSIGN)?0:1,ROWS_4,'90%');
     print $doleditor->Create(1);
     print '</td></tr>';
-    
+
     print "</table>\n";
 
  	dol_fiche_end();
@@ -1153,7 +1159,7 @@ else
         $object->fetch($id, '', '', 1);
         if ($res < 0) { dol_print_error($db,$object->error); exit; }
         $res=$object->fetch_optionals($object->id,$extralabels);
-		
+
 		// Check if user has rights
 		$object->getrights();
 		if(empty($object->nb_rights)) setEventMessages($langs->trans('UserHasNoPermissions'), null, 'warnings');
@@ -1226,7 +1232,7 @@ else
          */
         if ($action == 'password')
         {
-            print $form->formconfirm("card.php?id=$object->id",$langs->trans("ReinitPassword"),$langs->trans("ConfirmReinitPassword",$object->login),"confirm_password", '', 0, 1);
+        	print $form->formconfirm($_SERVER['PHP_SELF']."?id=$object->id",$langs->trans("ReinitPassword"),$langs->trans("ConfirmReinitPassword",$object->login),"confirm_password", '', 0, 1);
         }
 
         /*
@@ -1234,7 +1240,7 @@ else
          */
         if ($action == 'passwordsend')
         {
-            print $form->formconfirm("card.php?id=$object->id",$langs->trans("SendNewPassword"),$langs->trans("ConfirmSendNewPassword",$object->login),"confirm_passwordsend", '', 0, 1);
+        	print $form->formconfirm($_SERVER['PHP_SELF']."?id=$object->id",$langs->trans("SendNewPassword"),$langs->trans("ConfirmSendNewPassword",$object->login),"confirm_passwordsend", '', 0, 1);
         }
 
         /*
@@ -1242,7 +1248,7 @@ else
          */
         if ($action == 'disable')
         {
-            print $form->formconfirm("card.php?id=$object->id",$langs->trans("DisableAUser"),$langs->trans("ConfirmDisableUser",$object->login),"confirm_disable", '', 0, 1);
+        	print $form->formconfirm($_SERVER['PHP_SELF']."?id=$object->id",$langs->trans("DisableAUser"),$langs->trans("ConfirmDisableUser",$object->login),"confirm_disable", '', 0, 1);
         }
 
         /*
@@ -1250,7 +1256,7 @@ else
          */
         if ($action == 'enable')
         {
-            print $form->formconfirm("card.php?id=$object->id",$langs->trans("EnableAUser"),$langs->trans("ConfirmEnableUser",$object->login),"confirm_enable", '', 0, 1);
+        	print $form->formconfirm($_SERVER['PHP_SELF']."?id=$object->id",$langs->trans("EnableAUser"),$langs->trans("ConfirmEnableUser",$object->login),"confirm_enable", '', 0, 1);
         }
 
         /*
@@ -1258,7 +1264,7 @@ else
          */
         if ($action == 'delete')
         {
-            print $form->formconfirm("card.php?id=$object->id",$langs->trans("DeleteAUser"),$langs->trans("ConfirmDeleteUser",$object->login),"confirm_delete", '', 0, 1);
+        	print $form->formconfirm($_SERVER['PHP_SELF']."?id=$object->id",$langs->trans("DeleteAUser"),$langs->trans("ConfirmDeleteUser",$object->login),"confirm_delete", '', 0, 1);
         }
 
         /*
@@ -1387,7 +1393,7 @@ else
                 print '<tr><td>'.$langs->trans("AccountancyCode").'</td>';
                 print '<td>'.$object->accountancy_code.'</td></tr>';
             }
-            
+
             // TODO Move this into tab RH, visible when salarie or RH is visible (HierarchicalResponsible must be on both tab)
 
             // Hierarchy
@@ -1468,7 +1474,7 @@ else
             }
 
             // Categories
-		    if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire)) 
+		    if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire))
 	    	{
 				print '<tr><td>' . $langs->trans( "Categories" ) . '</td>';
 				print '<td colspan="3">';
@@ -1476,71 +1482,52 @@ else
 				print '</td></tr>';
 		    }
 
-		    // Multicompany
-		    // TODO This should be done with hook formObjectOption
-		    if (is_object($mc))
-		    {
-		        if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
-		        {
-		            print '<tr><td>'.$langs->trans("Entity").'</td><td>';
-		            if (empty($object->entity))
-		            {
-		                print $langs->trans("AllEntities");
-		            }
-		            else
-		            {
-		                $mc->getInfo($object->entity);
-		                print $mc->label;
-		            }
-		            print "</td></tr>\n";
-		        }
-		    }
-		    
 		    if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file->main_authentication) && ! empty($conf->global->MAIN_OPENIDURL_PERUSER))
 		    {
 		        print '<tr><td>'.$langs->trans("OpenIDURL").'</td>';
 		        print '<td>'.$object->openid.'</td>';
 		        print "</tr>\n";
 		    }
-		    
+
 		    print '<tr><td class="titlefield">'.$langs->trans("LastConnexion").'</td>';
 		    print '<td>'.dol_print_date($object->datelastlogin,"dayhour").'</td>';
 		    print "</tr>\n";
-		    
+
 		    print '<tr><td>'.$langs->trans("PreviousConnexion").'</td>';
 		    print '<td>'.dol_print_date($object->datepreviouslogin,"dayhour").'</td>';
 		    print "</tr>\n";
-		    
+
 		    // Other attributes
 		    $parameters=array();
 		    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+		    print $hookmanager->resPrint;
 		    if (empty($reshook) && ! empty($extrafields->attribute_label))
 		    {
 		        print $object->showOptionals($extrafields);
 		    }
-		    
+
             // Company / Contact
             if (! empty($conf->societe->enabled))
             {
                 print '<tr><td>'.$langs->trans("LinkToCompanyContact").'</td>';
                 print '<td>';
-                if (isset($object->societe_id) && $object->societe_id > 0)
+                if (isset($object->socid) && $object->socid > 0)
                 {
                     $societe = new Societe($db);
-                    $societe->fetch($object->societe_id);
+                    $societe->fetch($object->socid);
                     print $societe->getNomUrl(1,'');
                 }
                 else
                 {
                     print $langs->trans("ThisUserIsNot");
                 }
-                if (! empty($object->contact_id))
+                if (! empty($object->contactid))
                 {
                     $contact = new Contact($db);
-                    $contact->fetch($object->contact_id);
-                    if ($object->societe_id > 0) print ' / ';
+                    $contact->fetch($object->contactid);
+                    if ($object->socid > 0) print ' / ';
                     else print '<br>';
-                    print '<a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$object->contact_id.'">'.img_object($langs->trans("ShowContact"),'contact').' '.dol_trunc($contact->getFullName($langs),32).'</a>';
+                    print '<a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$object->contactid.'">'.img_object($langs->trans("ShowContact"),'contact').' '.dol_trunc($contact->getFullName($langs),32).'</a>';
                 }
                 print '</td>';
                 print '</tr>'."\n";
@@ -1598,8 +1585,8 @@ else
                 $langs->load("mails");
                 print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a></div>';
             }
-            
-            if ($caneditfield && (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+
+            if ($caneditfield && (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
             {
                 if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
                 {
@@ -1611,7 +1598,7 @@ else
                 }
             }
             elseif ($caneditpassword && ! $object->ldap_sid &&
-            (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
             {
                 print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("EditPassword").'</a></div>';
             }
@@ -1624,7 +1611,7 @@ else
 	                print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("UserDisabled")).'">'.$langs->trans("ReinitPassword").'</a></div>';
 				}
                 elseif (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
-                ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+                ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
                 {
                     print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=password">'.$langs->trans("ReinitPassword").'</a></div>';
                 }
@@ -1634,7 +1621,7 @@ else
 	                print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("UserDisabled")).'">'.$langs->trans("SendNewPassword").'</a></div>';
 				}
                 else if (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
-                ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+                ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
                 {
                     if ($object->email) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=passwordsend">'.$langs->trans("SendNewPassword").'</a></div>';
                     else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans("SendNewPassword").'</a></div>';
@@ -1643,19 +1630,19 @@ else
 
             // Activer
             if ($user->id <> $id && $candisableuser && $object->statut == 0 &&
-            ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
             {
                 print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=enable">'.$langs->trans("Reactivate").'</a></div>';
             }
             // Desactiver
             if ($user->id <> $id && $candisableuser && $object->statut == 1 &&
-            ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
             {
                 print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=disable&amp;id='.$object->id.'">'.$langs->trans("DisableUser").'</a></div>';
             }
             // Delete
             if ($user->id <> $id && $candisableuser &&
-            ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
             {
             	if ($user->admin || ! $object->admin) // If user edited is admin, delete is possible on for an admin
             	{
@@ -1680,36 +1667,36 @@ else
                 /*
                  * Affiche formulaire mail
                  */
-            
+
                 // By default if $action=='presend'
                 $titreform='SendMail';
                 $topicmail='';
                 $action='send';
                 $modelmail='user';
-            
+
                 print '<div id="presend"></div>';
                 print load_fiche_titre($langs->trans($titreform));
-            
+
                 dol_fiche_head();
-            
+
                 // Define output language
                 $outputlangs = $langs;
                 $newlang = '';
                 if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
                     $newlang = $_REQUEST['lang_id'];
-                
+
                 if ($conf->global->MAIN_MULTILANGS && empty($newlang))
                     $newlang = $object->default_lang;
-            
+
                 // Cree l'objet formulaire mail
                 include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
                 $formmail = new FormMail($db);
                 $formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
                 $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
-    
+
                 if($formmail->fromtype === 'user'){
                     $formmail->fromid = $user->id;
-    
+
                 }
                 $formmail->trackid='thi'.$object->id;
                 if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
@@ -1733,40 +1720,40 @@ else
                 $formmail->substit['__FIRSTNAME__']=$object->firstname;
                 $formmail->substit['__SIGNATURE__']=$user->signature;
                 $formmail->substit['__PERSONALIZED__']='';
-    
+
                 //Find the good contact adress
                 /*
                 $custcontact='';
                 $contactarr=array();
                 $contactarr=$object->liste_contact(-1,'external');
-    
+
                 if (is_array($contactarr) && count($contactarr)>0)
                 {
                 foreach($contactarr as $contact)
                 {
                 if ($contact['libelle']==$langs->trans('TypeContact_facture_external_BILLING')) {
-    
+
                 require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
-    
+
                 $contactstatic=new Contact($db);
                 $contactstatic->fetch($contact['id']);
                 $custcontact=$contactstatic->getFullName($langs,1);
                 }
                 }
-    
+
                 if (!empty($custcontact)) {
                 $formmail->substit['__CONTACTCIVNAME__']=$custcontact;
                 }
                 }*/
-    
-    
+
+
                 // Tableau des parametres complementaires du post
                 $formmail->param['action']=$action;
                 $formmail->param['models']=$modelmail;
                 $formmail->param['models_id']=GETPOST('modelmailselected','int');
                 $formmail->param['socid']=$object->id;
                 $formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-    
+
                 // Init list of files
                 if (GETPOST("mode")=='init')
                 {
@@ -1774,7 +1761,7 @@ else
                     $formmail->add_attached_files($file,basename($file),dol_mimetype($file));
                 }
                 print $formmail->get_form();
-    
+
                 dol_fiche_end();
             }
 
@@ -1783,20 +1770,20 @@ else
                 /*
                  * List of groups of user
                  */
-    
+
                 if ($canreadgroup)
                 {
                     print load_fiche_titre($langs->trans("ListOfGroupsForUser"),'','');
-    
+
                     // On selectionne les groupes auquel fait parti le user
                     $exclude = array();
-    
+
                     $usergroup=new UserGroup($db);
                     $groupslist = $usergroup->listGroupsForUser($object->id);
-    
+
                     if (! empty($groupslist))
                     {
-                        if (! (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)))
+                        if (! (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)))
                         {
                             foreach($groupslist as $groupforuser)
                             {
@@ -1804,46 +1791,54 @@ else
                             }
                         }
                     }
-    
+
                     if ($caneditgroup)
                     {
                         print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">'."\n";
                         print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
                         print '<input type="hidden" name="action" value="addgroup" />';
                     }
-                    
+
                     print '<table class="noborder" width="100%">'."\n";
                     print '<tr class="liste_titre"><th class="liste_titre" width="25%">'.$langs->trans("Groups").'</th>'."\n";
-                    if(! empty($conf->multicompany->enabled) && !empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
+                    if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && ! $user->entity)
                     {
                         print '<td class="liste_titre" width="25%">'.$langs->trans("Entity").'</td>';
                     }
                     print '<th align="right">';
                     if ($caneditgroup)
                     {
-                        print $form->select_dolgroups('', 'group', 1, $exclude, 0, '', '', $object->entity);
-                        print ' &nbsp; ';
-                        // Multicompany
-                        if (! empty($conf->multicompany->enabled))
-                        {
-                            if ($conf->entity == 1 && $conf->multicompany->transverse_mode)
-                            {
-                                print '</td><td>'.$langs->trans("Entity").'</td>';
-                                print "<td>".$mc->select_entities($conf->entity);
-                            }
-                            else
-                            {
-                                print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
-                            }
-                        }
-                        else
-                        {
-                        	print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
-                        }
-                        print '<input type="submit" class="button" value="'.$langs->trans("Add").'" />';
+                    	// Users/Groups management only in master entity if transverse mode
+                    	if (! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)
+                    	{
+                    		// nothing
+                    	}
+                    	else
+                    	{
+                    		print $form->select_dolgroups('', 'group', 1, $exclude, 0, '', '', $object->entity);
+                    		print ' &nbsp; ';
+                    		// Multicompany
+                    		if (! empty($conf->multicompany->enabled))
+                    		{
+                    			if ($conf->entity == 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)
+                    			{
+                    				print '</td><td>'.$langs->trans("Entity").'</td>';
+                    				print "<td>".$mc->select_entities($conf->entity);
+                    			}
+                    			else
+                    			{
+                    				print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
+                    			}
+                    		}
+                    		else
+                    		{
+                    			print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
+                    		}
+                    		print '<input type="submit" class="button" value="'.$langs->trans("Add").'" />';
+                    	}
                     }
                     print '</th></tr>'."\n";
-    
+
                     /*
                      * Groups assigned to user
                      */
@@ -1851,8 +1846,8 @@ else
                     {
                         foreach($groupslist as $group)
                         {
-                            
-    
+
+
                             print '<tr class="oddeven">';
                             print '<td>';
                             if ($caneditgroup)
@@ -1864,7 +1859,7 @@ else
                                 print img_object($langs->trans("ShowGroup"),"group").' '.$group->name;
                             }
                             print '</td>';
-                            if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
+                            if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && ! $user->entity)
                             {
                             	print '<td class="valeur">';
                             	if (! empty($group->usergroup_entity))
@@ -1882,7 +1877,7 @@ else
                             	}
                             }
                             print '<td align="right">';
-                            if ($caneditgroup && empty($conf->multicompany->transverse_mode))
+                            if ($caneditgroup && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
                             {
                                 print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=removegroup&amp;group='.$group->id.'">';
                                 print img_delete($langs->trans("RemoveFromGroup"));
@@ -1899,9 +1894,9 @@ else
                     {
                         print '<tr '.$bc[false].'><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
                     }
-    
+
                     print "</table>";
-                    
+
                     if ($caneditgroup)
                     {
                         print '</form>';
@@ -1910,7 +1905,7 @@ else
                 }
             }
         }
-        
+
         /*
          * Fiche en mode edition
          */
@@ -2030,7 +2025,7 @@ else
             print "</td></tr>\n";
 
             // API key
-            if(! empty($conf->api->enabled) && $user->admin) 
+            if(! empty($conf->api->enabled) && $user->admin)
             {
                 print '<tr><td>'.$langs->trans("ApiKey").'</td>';
                 print '<td>';
@@ -2042,7 +2037,7 @@ else
 
             // Administrator
             print '<tr><td>'.$langs->trans("Administrator").'</td>';
-            if ($object->societe_id > 0)
+            if ($object->socid > 0)
             {
             	$langs->load("admin");
                 print '<td>';
@@ -2067,7 +2062,7 @@ else
                 {
                     print $form->selectyesno('admin',$object->admin,1);
 
-                    if (! empty($conf->multicompany->enabled) && ! $user->entity && empty($conf->multicompany->transverse_mode))
+                    if (! empty($conf->multicompany->enabled) && ! $user->entity && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
                     {
                         if ($conf->use_javascript_ajax)
                         {
@@ -2129,7 +2124,7 @@ else
            	if ($user->id == $object->id || ! $user->admin)
            	{
 	           	$type=$langs->trans("Internal");
-    	       	if ($object->societe_id) $type=$langs->trans("External");
+    	       	if ($object->socid) $type=$langs->trans("External");
         	   	print $form->textwithpicto($type,$langs->trans("InternalExternalDesc"));
 	           	if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
            	}
@@ -2280,9 +2275,9 @@ else
                 print '</td>';
                 print "</tr>";
             }
-            
+
             // TODO Move this into tab RH (HierarchicalResponsible must be on both tab)
-            
+
             // Hierarchy
             print '<tr><td>'.$langs->trans("HierarchicalResponsible").'</td>';
             print '<td>';
@@ -2355,7 +2350,7 @@ else
     			print $formother->selectColor(GETPOST('color')?GETPOST('color'):$object->color, 'color', null, 1, '', 'hideifnotset');
     			print '</td></tr>';
     		}
-    
+
     		// Photo
     		print '<tr>';
     		print '<td>'.$langs->trans("Photo").'</td>';
@@ -2363,9 +2358,9 @@ else
     		print $form->showphoto('userphoto',$object,60,0,$caneditfield,'photowithmargin','small');
     		print '</td>';
     		print '</tr>';
-    		
+
     		// Categories
-    		if (!empty( $conf->categorie->enabled ) && !empty( $user->rights->categorie->lire )) 
+    		if (!empty( $conf->categorie->enabled ) && !empty( $user->rights->categorie->lire ))
     		{
     			print '<tr><td>' . fieldLabel( 'Categories', 'usercats' ) . '</td>';
     			print '<td>';
@@ -2390,16 +2385,16 @@ else
             {
                 print '<tr><td width="25%">'.$langs->trans("LinkToCompanyContact").'</td>';
                 print '<td>';
-                if ($object->societe_id > 0)
+                if ($object->socid > 0)
                 {
                     $societe = new Societe($db);
-                    $societe->fetch($object->societe_id);
+                    $societe->fetch($object->socid);
                     print $societe->getNomUrl(1,'');
-                    if ($object->contact_id)
+                    if ($object->contactid)
                     {
                         $contact = new Contact($db);
-                        $contact->fetch($object->contact_id);
-                        print ' / <a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$object->contact_id.'">'.img_object($langs->trans("ShowContact"),'contact').' '.dol_trunc($contact->getFullName($langs),32).'</a>';
+                        $contact->fetch($object->contactid);
+                        print ' / <a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$object->contactid.'">'.img_object($langs->trans("ShowContact"),'contact').' '.dol_trunc($contact->getFullName($langs),32).'</a>';
                     }
                 }
                 else
@@ -2432,25 +2427,10 @@ else
                 print "</tr>\n";
             }
 
-            // Multicompany
-            // TODO check if user not linked with the current entity before change entity (thirdparty, invoice, etc.) !!
-            if (! empty($conf->multicompany->enabled) && is_object($mc))
-            {
-            	if (empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
-            	{
-            		print "<tr>".'<td>'.$langs->trans("Entity").'</td>';
-            		print "<td>".$mc->select_entities($object->entity, 'entity', '', 0, 1);		// last parameter 1 means, show also a choice 0=>'all entities'
-            		print "</td></tr>\n";
-            	}
-            	else
-            	{
-            		print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
-            	}
-            }
-
             // Other attributes
             $parameters=array('colspan' => ' colspan="2"');
             $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+            print $hookmanager->resPrint;
             if (empty($reshook) && ! empty($extrafields->attribute_label))
             {
             	print $object->showOptionals($extrafields,'edit');
@@ -2470,7 +2450,7 @@ else
                 print dol_htmlentitiesbr($object->signature);
             }
             print '</td></tr>';
-            
+
             print '</table>';
 
             dol_fiche_end();
@@ -2495,27 +2475,28 @@ else
             $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
             $genallowed = $user->rights->user->user->creer;
             $delallowed = $user->rights->user->user->supprimer;
-    
-            $somethingshown = $formfile->show_documents('user', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
-    
+
+            print $formfile->showdocuments('user', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
+            $somethingshown = $formfile->numoffiles;
+
     		// Show links to link elements
     		$linktoelem = $form->showLinkToObjectBlock($object, null, null);
     		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
-    
+
             print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-    
+
     		// List of actions on element
     		include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
     		$formactions = new FormActions($db);
     		$somethingshown = $formactions->showactions($object, 'user', $socid);
-            
-            
+
+
             print '</div></div></div>';
         }
-        
+
 		if (! empty($conf->ldap->enabled) && ! empty($object->ldap_sid)) $ldap->close();
     }
-    
+
 }
 
 if (! empty($conf->api->enabled) && ! empty($conf->use_javascript_ajax))
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index e09e52c1882..5ec9d54300d 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -107,16 +107,16 @@ class User extends CommonObject
 	public $all_permissions_are_loaded;	   // All permission are loaded
 	public $nb_rights;			           // Number of rights granted to the user
 	private $_tab_loaded=array();		   // Cache array of already loaded permissions
-	
+
 	public $conf;           		// To store personal config
 	public $default_values;         // To store default values for user
 	public $lastsearch_values_tmp;  // To store current search criterias for user
 	public $lastsearch_values;      // To store last saved search criterias for user
-	
+
 	public $users;					// To store all tree of users hierarchy
 	public $parentof;				// To store an array of all parents for all ids.
 	private $cache_childids;
-	
+
 	public $accountancy_code;			// Accountancy code in prevision of the complete accountancy module
 
 	public $thm;					// Average cost of employee - Used for valuation of time spent
@@ -207,7 +207,7 @@ class User extends CommonObject
 
 		if ($entity < 0)
 		{
-    		if ((empty($conf->multicompany->enabled) || empty($conf->multicompany->transverse_mode)) && (! empty($user->entity)))
+    		if ((empty($conf->multicompany->enabled) || empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) && (! empty($user->entity)))
     		{
     			$sql.= " WHERE u.entity IN (0,".$conf->entity.")";
     		}
@@ -218,7 +218,7 @@ class User extends CommonObject
 		}
 		else  // The fetch was forced on an entity
 		{
-			if (!empty($conf->multicompany->enabled) && !empty($conf->multicompany->transverse_mode))
+			if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
 				$sql.= " WHERE u.entity IS NOT NULL";    // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database
 			else
 				$sql.= " WHERE u.entity IN (0, ".$conf->entity.")";
@@ -365,7 +365,7 @@ class User extends CommonObject
 				$this->error=$this->db->lasterror();
 				return -2;
 			}
-			
+
 			// Load user->default_values for user. TODO Save this in memcached ?
 			$sql = "SELECT rowid, entity, type, page, param, value";
 			$sql.= " FROM ".MAIN_DB_PREFIX."default_values";
@@ -376,7 +376,7 @@ class User extends CommonObject
 			{
 			    while ($obj = $this->db->fetch_object($resql))
 			    {
-			        if (! empty($obj->page) && ! empty($obj->type) && ! empty($obj->param)) 
+			        if (! empty($obj->page) && ! empty($obj->type) && ! empty($obj->param))
 			        {
 			            $this->default_values[$obj->page][$obj->type][$obj->param]=$obj->value;
 			        }
@@ -389,7 +389,7 @@ class User extends CommonObject
 				return -3;
 			}
 		}
-		
+
 		return 1;
 	}
 
@@ -469,9 +469,9 @@ class User extends CommonObject
 					$obj = $this->db->fetch_object($result);
 					$nid = $obj->id;
 
-					$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_rights WHERE fk_user = ".$this->id." AND fk_id=".$nid;
+					$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_rights WHERE fk_user = ".$this->id." AND fk_id=".$nid." AND entity = ".$entity;
 					if (! $this->db->query($sql)) $error++;
-					$sql = "INSERT INTO ".MAIN_DB_PREFIX."user_rights (fk_user, fk_id) VALUES (".$this->id.", ".$nid.")";
+					$sql = "INSERT INTO ".MAIN_DB_PREFIX."user_rights (entity, fk_user, fk_id) VALUES (".$entity.", ".$this->id.", ".$nid.")";
 					if (! $this->db->query($sql)) $error++;
 
 					$i++;
@@ -581,6 +581,7 @@ class User extends CommonObject
 
 					$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_rights";
 					$sql.= " WHERE fk_user = ".$this->id." AND fk_id=".$nid;
+					$sql.= " AND entity = ".$entity;
 					if (! $this->db->query($sql)) $error++;
 
 					$i++;
@@ -660,7 +661,7 @@ class User extends CommonObject
 		$sql.= " FROM ".MAIN_DB_PREFIX."user_rights as ur";
 		$sql.= ", ".MAIN_DB_PREFIX."rights_def as r";
 		$sql.= " WHERE r.id = ur.fk_id";
-		$sql.= " AND r.entity IN (0,".(! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)?"1,":"").$conf->entity.")";
+		$sql.= " AND ur.entity = ".$conf->entity;
 		$sql.= " AND ur.fk_user= ".$this->id;
 		$sql.= " AND r.perms IS NOT NULL";
 		if ($moduletag) $sql.= " AND r.module = '".$this->db->escape($moduletag)."'";
@@ -706,11 +707,8 @@ class User extends CommonObject
 		$sql.= " ".MAIN_DB_PREFIX."usergroup_user as gu,";
 		$sql.= " ".MAIN_DB_PREFIX."rights_def as r";
 		$sql.= " WHERE r.id = gr.fk_id";
-		if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)) {
-			$sql.= " AND gu.entity IN (0,".$conf->entity.")";
-		} else {
-			$sql.= " AND r.entity = ".$conf->entity;
-		}
+		$sql.= " AND gr.entity = ".$conf->entity;
+		$sql.= " AND r.entity = ".$conf->entity;
 		$sql.= " AND gr.fk_usergroup = gu.fk_usergroup";
 		$sql.= " AND gu.fk_user = ".$this->id;
 		$sql.= " AND r.perms IS NOT NULL";
@@ -2014,14 +2012,14 @@ class User extends CommonObject
 
         $result=''; $label='';
         $link=''; $linkstart=''; $linkend='';
-		
+
 		if (! empty($this->photo))
 		{
 		    $label.= '<div class="photointooltip">';
 		    $label.= Form::showphoto('userphoto', $this, 80, 0, 0, 'photowithmargin photologintooltip', 'small', 0, 1);
 		    $label.= '</div><div style="clear: both;"></div>';
 		}
-		
+
 		$label.= '<div class="centpercent">';
 		$label.= '<u>' . $langs->trans("User") . '</u><br>';
 		$label.= '<b>' . $langs->trans('Name') . ':</b> ' . $this->getFullName($langs,'','');
@@ -2112,9 +2110,9 @@ class User extends CommonObject
 		}
 		$result.=$linkend;
 		//if ($withpictoimg == -1) $result.='</div>';
-		
+
 		$result.=$companylink;
-		
+
 		return $result;
 	}
 
@@ -2573,7 +2571,7 @@ class User extends CommonObject
 		// Init $this->users array
 		$sql = "SELECT DISTINCT u.rowid, u.firstname, u.lastname, u.fk_user, u.fk_soc, u.login, u.email, u.gender, u.admin, u.statut, u.photo, u.entity";	// Distinct reduce pb with old tables with duplicates
 		$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
-		if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && (! empty($conf->multicompany->transverse_mode) || (! empty($user->admin) && empty($user->entity))))
+		if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) || (! empty($user->admin) && empty($user->entity))))
 		{
 			$sql.= " WHERE u.entity IS NOT NULL";
 		}
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index af73e1305bb..be9bb0e1f4c 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -39,7 +39,7 @@ class UserGroup extends CommonObject
 	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
     public $picto='group';
 	public $entity;		// Entity of group
-	
+
 	/**
 	 * @deprecated
 	 * @see name
@@ -252,16 +252,19 @@ class UserGroup extends CommonObject
 	/**
 	 *    Add a permission to a group
 	 *
-	 *    @param      int		$rid         id du droit a ajouter
-	 *    @param      string	$allmodule   Ajouter tous les droits du module allmodule
-	 *    @param      string	$allperms    Ajouter tous les droits du module allmodule, perms allperms
-	 *    @return     int         			 > 0 if OK, < 0 if KO
+	 *    @param	int		$rid		id du droit a ajouter
+	 *    @param	string	$allmodule	Ajouter tous les droits du module allmodule
+	 *    @param	string	$allperms	Ajouter tous les droits du module allmodule, perms allperms
+	 *    @param	int		$entity		Entity to use
+	 *    @return	int					> 0 if OK, < 0 if KO
 	 */
-	function addrights($rid,$allmodule='',$allperms='')
+	function addrights($rid, $allmodule='', $allperms='', $entity=0)
 	{
 		global $conf, $user, $langs;
 
-		dol_syslog(get_class($this)."::addrights $rid, $allmodule, $allperms");
+		$entity = (! empty($entity)?$entity:$conf->entity);
+
+		dol_syslog(get_class($this)."::addrights $rid, $allmodule, $allperms, $entity");
 		$error=0;
 		$whereforadd='';
 
@@ -274,7 +277,7 @@ class UserGroup extends CommonObject
 			$sql = "SELECT module, perms, subperms";
 			$sql.= " FROM ".MAIN_DB_PREFIX."rights_def";
 			$sql.= " WHERE id = '".$this->db->escape($rid)."'";
-			$sql.= " AND entity = ".$conf->entity;
+			$sql.= " AND entity = ".$entity;
 
 			$result=$this->db->query($sql);
 			if ($result) {
@@ -311,7 +314,7 @@ class UserGroup extends CommonObject
 			$sql = "SELECT id";
 			$sql.= " FROM ".MAIN_DB_PREFIX."rights_def";
 			$sql.= " WHERE $whereforadd";
-			$sql.= " AND entity = ".$conf->entity;
+			$sql.= " AND entity = ".$entity;
 
 			$result=$this->db->query($sql);
 			if ($result)
@@ -323,9 +326,9 @@ class UserGroup extends CommonObject
 					$obj = $this->db->fetch_object($result);
 					$nid = $obj->id;
 
-					$sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_rights WHERE fk_usergroup = $this->id AND fk_id=".$nid;
+					$sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_rights WHERE fk_usergroup = $this->id AND fk_id=".$nid." AND entity = ".$entity;
 					if (! $this->db->query($sql)) $error++;
-					$sql = "INSERT INTO ".MAIN_DB_PREFIX."usergroup_rights (fk_usergroup, fk_id) VALUES ($this->id, $nid)";
+					$sql = "INSERT INTO ".MAIN_DB_PREFIX."usergroup_rights (entity, fk_usergroup, fk_id) VALUES (".$entity.", ".$this->id.", ".$nid.")";
 					if (! $this->db->query($sql)) $error++;
 
 					$i++;
@@ -363,18 +366,21 @@ class UserGroup extends CommonObject
 	/**
 	 *    Remove a permission from group
 	 *
-	 *    @param      int		$rid         id du droit a retirer
-	 *    @param      string	$allmodule   Retirer tous les droits du module allmodule
-	 *    @param      string	$allperms    Retirer tous les droits du module allmodule, perms allperms
-	 *    @return     int         			 > 0 if OK, < 0 if OK
+	 *    @param	int		$rid		id du droit a retirer
+	 *    @param	string	$allmodule	Retirer tous les droits du module allmodule
+	 *    @param	string	$allperms	Retirer tous les droits du module allmodule, perms allperms
+	 *    @param	int		$entity		Entity to use
+	 *    @return	int					> 0 if OK, < 0 if OK
 	 */
-	function delrights($rid,$allmodule='',$allperms='')
+	function delrights($rid, $allmodule='', $allperms='', $entity=0)
 	{
 		global $conf, $user, $langs;
 
 		$error=0;
 		$wherefordel='';
 
+		$entity = (! empty($entity)?$entity:$conf->entity);
+
 		$this->db->begin();
 
 		if (! empty($rid))
@@ -384,7 +390,7 @@ class UserGroup extends CommonObject
 			$sql = "SELECT module, perms, subperms";
 			$sql.= " FROM ".MAIN_DB_PREFIX."rights_def";
 			$sql.= " WHERE id = '".$this->db->escape($rid)."'";
-			$sql.= " AND entity = ".$conf->entity;
+			$sql.= " AND entity = ".$entity;
 
 			$result=$this->db->query($sql);
 			if ($result) {
@@ -421,7 +427,7 @@ class UserGroup extends CommonObject
 			$sql = "SELECT id";
 			$sql.= " FROM ".MAIN_DB_PREFIX."rights_def";
 			$sql.= " WHERE $wherefordel";
-			$sql.= " AND entity = ".$conf->entity;
+			$sql.= " AND entity = ".$entity;
 
 			$result=$this->db->query($sql);
 			if ($result)
@@ -435,6 +441,7 @@ class UserGroup extends CommonObject
 
 					$sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_rights";
 					$sql.= " WHERE fk_usergroup = $this->id AND fk_id=".$nid;
+					$sql.= " AND entity = ".$entity;
 					if (! $this->db->query($sql)) $error++;
 
 					$i++;
@@ -498,6 +505,7 @@ class UserGroup extends CommonObject
 		$sql.= " FROM ".MAIN_DB_PREFIX."usergroup_rights as u, ".MAIN_DB_PREFIX."rights_def as r";
 		$sql.= " WHERE r.id = u.fk_id";
 		$sql.= " AND r.entity = ".$conf->entity;
+		$sql.= " AND u.entity = ".$conf->entity;
 		$sql.= " AND u.fk_usergroup = ".$this->id;
 		$sql.= " AND r.perms IS NOT NULL";
 		if ($moduletag) $sql.= " AND r.module = '".$this->db->escape($moduletag)."'";
@@ -755,7 +763,7 @@ class UserGroup extends CommonObject
 	{
 	    return $this->LibStatut(0,$mode);
 	}
-	
+
 	/**
 	 *  Renvoi le libelle d'un statut donne
 	 *
@@ -769,7 +777,7 @@ class UserGroup extends CommonObject
 	    $langs->load('users');
 	    return '';
 	}
-	    
+
 	/**
 	 *	Retourne chaine DN complete dans l'annuaire LDAP pour l'objet
 	 *
@@ -849,7 +857,7 @@ class UserGroup extends CommonObject
 				$user->id => $user
 		);
 	}
-	
+
 	/**
 	 *  Create a document onto disk according to template module.
 	 *
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index bbcbd38c168..0b23fc10932 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2005-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2015 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2017 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2011      Herve Prot           <herve.prot@symeos.com>
  * Copyright (C) 2012	   Florian Henry		<florian.henry@open-concept.pro>
  *
@@ -54,7 +54,8 @@ $userid=GETPOST('user', 'int');
 // Security check
 $result = restrictedArea($user, 'user', $id, 'usergroup&usergroup', 'user');
 
-if (! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->multicompany->transverse_mode)
+// Users/Groups management only in master entity if transverse mode
+if (! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)
 {
     accessforbidden();
 }
@@ -105,7 +106,7 @@ if ($action == 'add')
       		$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
 			if ($ret < 0) $error++;
 
-      		if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)) $object->entity = 0;
+      		if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $object->entity = 0;
 			else $object->entity = $_POST["entity"];
 
             $db->begin();
@@ -148,8 +149,8 @@ if ($action == 'adduser' || $action =='removeuser')
 
 			$edituser = new User($db);
 			$edituser->fetch($userid);
-			if ($action == 'adduser')    $result=$edituser->SetInGroup($object->id,(! empty($conf->multicompany->transverse_mode)?GETPOST('entity','int'):$object->entity));
-			if ($action == 'removeuser') $result=$edituser->RemoveFromGroup($object->id,(! empty($conf->multicompany->transverse_mode)?GETPOST('entity','int'):$object->entity));
+			if ($action == 'adduser')    $result=$edituser->SetInGroup($object->id,(! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)?GETPOST('entity','int'):$object->entity));
+			if ($action == 'removeuser') $result=$edituser->RemoveFromGroup($object->id,(! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)?GETPOST('entity','int'):$object->entity));
 
             if ($result > 0)
             {
@@ -188,7 +189,7 @@ if ($action == 'update')
       	$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
 		if ($ret < 0) $error++;
 
-		if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)) $object->entity = 0;
+		if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $object->entity = 0;
 		else $object->entity = $_POST["entity"];
 
         $ret=$object->update();
@@ -210,7 +211,7 @@ if ($action == 'update')
         setEventMessages($langs->trans('ErrorForbidden'), null, 'mesgs');
     }
 }
-					
+
 // Actions to build doc
 $upload_dir = $conf->usergroup->dir_output;
 $permissioncreate=$user->rights->user->user->creer;
@@ -250,7 +251,7 @@ if ($action == 'create')
 	// Multicompany
 	if (! empty($conf->multicompany->enabled) && is_object($mc))
 	{
-		if (empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
+		if (empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && ! $user->entity)
 		{
 			print "<tr>".'<td class="tdtop">'.$langs->trans("Entity").'</td>';
 			print "<td>".$mc->select_entities($conf->entity);
@@ -317,10 +318,10 @@ else
         	dol_fiche_head($head, 'group', $title, -1, 'group');
 
 			dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin);
-			
+
 			print '<div class="fichecenter">';
 			print '<div class="underbanner clearboth"></div>';
-			
+
         	print '<table class="border" width="100%">';
 
 			// Name
@@ -333,7 +334,7 @@ else
 			print "</td></tr>\n";
 
 			// Multicompany
-			if (! empty($conf->multicompany->enabled) && is_object($mc) && empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
+			if (! empty($conf->multicompany->enabled) && is_object($mc) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && ! $user->entity)
 			{
 				$mc->getInfo($object->entity);
 				print "<tr>".'<td class="tdtop">'.$langs->trans("Entity").'</td>';
@@ -356,7 +357,7 @@ else
 
 			print "</table>\n";
             print '</div>';
-            
+
 			dol_fiche_end();
 
 
@@ -386,7 +387,7 @@ else
 
             if (! empty($object->members))
             {
-                if (! (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)))
+                if (! (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)))
                 {
                     foreach($object->members as $useringroup)
                     {
@@ -408,7 +409,7 @@ else
                 // Multicompany
                 if (! empty($conf->multicompany->enabled) && is_object($mc))
                 {
-                    if ($conf->entity == 1 && $conf->multicompany->transverse_mode)
+                    if ($conf->entity == 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)
                     {
                         print '</td><td class="tdtop">'.$langs->trans("Entity").'</td>';
                         print "<td>".$mc->select_entities($conf->entity);
@@ -448,7 +449,7 @@ else
             {
             	foreach($object->members as $useringroup)
             	{
-            		
+
 
             		print '<tr class="oddeven">';
             		print '<td>';
@@ -458,7 +459,7 @@ else
             		print '</td>';
             		print '<td>'.$useringroup->lastname.'</td>';
             		print '<td>'.$useringroup->firstname.'</td>';
-            		if (! empty($conf->multicompany->enabled)  && is_object($mc) && ! empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
+            		if (! empty($conf->multicompany->enabled)  && is_object($mc) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && ! $user->entity)
             		{
             			print '<td class="valeur">';
             			if (! empty($useringroup->usergroup_entity))
@@ -497,7 +498,7 @@ else
             }
             print "</table>";
             print "<br>";
-			
+
 			/*
 	         * Documents generes
 	         */
@@ -506,21 +507,21 @@ else
 	        $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
 	        $genallowed = $user->rights->user->user->creer;
 	        $delallowed = $user->rights->user->user->supprimer;
-	
+
 	        $somethingshown = $formfile->show_documents('usergroup', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
-	
+
 	        // Show links to link elements
 	        $linktoelem = $form->showLinkToObjectBlock($object, null, null);
 	        $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
-	
+
 	        print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-	
+
 			// List of actions on element
 			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
 			$formactions = new FormActions($db);
 			$somethingshown = $formactions->showactions($object, 'usergroup', $socid);
-	        
-	        
+
+
 	        print '</div></div></div>';
         }
 
@@ -543,7 +544,7 @@ else
             // Multicompany
             if (! empty($conf->multicompany->enabled) && is_object($mc))
             {
-                if (empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
+                if (empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && ! $user->entity)
                 {
                     print "<tr>".'<td class="tdtop">'.$langs->trans("Entity").'</td>';
                     print "<td>".$mc->select_entities($object->entity);
diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php
index 38fdf68b2ba..16091381e8d 100644
--- a/htdocs/user/group/index.php
+++ b/htdocs/user/group/index.php
@@ -32,6 +32,12 @@ if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 		accessforbidden();
 }
 
+// Users/Groups management only in master entity if transverse mode
+if (! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)
+{
+	accessforbidden();
+}
+
 $langs->load("users");
 
 $sall=GETPOST('sall', 'alphanohtml');
@@ -95,7 +101,7 @@ llxHeader();
 $sql = "SELECT g.rowid, g.nom as name, g.entity, g.datec, COUNT(DISTINCT ugu.fk_user) as nb";
 $sql.= " FROM ".MAIN_DB_PREFIX."usergroup as g";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_usergroup = g.rowid";
-if (! empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->multicompany->transverse_mode || ($user->admin && ! $user->entity)))
+if (! empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->global->MULTICOMPANY_TRANSVERSE_MODE || ($user->admin && ! $user->entity)))
 {
 	$sql.= " WHERE g.entity IS NOT NULL";
 }
@@ -160,7 +166,7 @@ if ($resql)
     print '<tr class="liste_titre">';
     print_liste_field_titre($langs->trans("Group"),$_SERVER["PHP_SELF"],"g.nom",$param,"","",$sortfield,$sortorder);
     //multicompany
-    if(! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode) && $conf->entity == 1)
+    if(! empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1)
     {
     	print_liste_field_titre($langs->trans("Entity"),$_SERVER["PHP_SELF"],"g.entity",$param,"",'align="center"',$sortfield,$sortorder);
     }
@@ -172,7 +178,7 @@ if ($resql)
     while ($i < $num)
     {
         $obj = $db->fetch_object($resql);
-        
+
 
         print '<tr class="oddeven">';
         print '<td><a href="card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowGroup"),"group").' '.$obj->name.'</a>';
@@ -182,7 +188,7 @@ if ($resql)
         }
         print "</td>";
         //multicompany
-        if (! empty($conf->multicompany->enabled) && is_object($mc) && empty($conf->multicompany->transverse_mode) && $conf->entity == 1)
+        if (! empty($conf->multicompany->enabled) && is_object($mc) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1)
         {
             $mc->getInfo($obj->entity);
             print '<td align="center">'.$mc->label.'</td>';
diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php
index 2ced8e11d4b..6d987be85cb 100644
--- a/htdocs/user/group/ldap.php
+++ b/htdocs/user/group/ldap.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2006-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2006-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2006-2017 Regis Houssin        <regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,6 +33,12 @@ $langs->load("companies");
 $langs->load("ldap");
 $langs->load("users");
 
+// Users/Groups management only in master entity if transverse mode
+if (! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)
+{
+	accessforbidden();
+}
+
 $canreadperms=true;
 if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 {
@@ -98,7 +104,7 @@ $head = group_prepare_head($object);
 dol_fiche_head($head, 'ldap', $langs->trans("Group"), -1, 'group');
 
 dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin);
- 
+
 print '<div class="fichecenter">';
 print '<div class="underbanner clearboth"></div>';
 
diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php
index 5262857afb2..77532de7c3e 100644
--- a/htdocs/user/group/perms.php
+++ b/htdocs/user/group/perms.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2002-2003 Jean-Louis Bergamo   <jlb@j1b.org>
  * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2017 Regis Houssin        <regis.houssin@capnetworks.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
@@ -38,6 +38,12 @@ $confirm=GETPOST('confirm', 'alpha');
 $module=GETPOST('module', 'alpha');
 $rights=GETPOST('rights', 'int');
 
+// Users/Groups management only in master entity if transverse mode
+if (! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)
+{
+	accessforbidden();
+}
+
 // Defini si peux lire les permissions
 $canreadperms=($user->admin || $user->rights->user->user->lire);
 // Defini si peux modifier les permissions
@@ -53,22 +59,44 @@ if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 
 if (! $canreadperms) accessforbidden();
 
+$object = new Usergroup($db);
+$object->fetch($id);
+$object->getrights();
+
+$entity=$conf->entity;
+if (! empty($conf->multicompany->enabled))
+{
+	if (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
+		$entity=(GETPOST('entity','int') ? GETPOST('entity','int') : $conf->entity);
+	else
+		$entity=(! empty($object->entity) ? $object->entity : $conf->entity);
+}
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('groupcard','globalcard'));
+
 
 /**
  * Actions
  */
-if ($action == 'addrights' && $caneditperms)
-{
-    $editgroup = new Usergroup($db);
-    $result=$editgroup->fetch($id);
-    if ($result > 0) $editgroup->addrights($rights, $module);
-}
+$parameters=array();
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if ($action == 'delrights' && $caneditperms)
-{
-    $editgroup = new Usergroup($db);
-    $result=$editgroup->fetch($id);
-    if ($result > 0) $editgroup->delrights($rights, $module);
+if (empty($reshook)) {
+	if ($action == 'addrights' && $caneditperms)
+	{
+		$editgroup = new Usergroup($db);
+		$result=$editgroup->fetch($id);
+		if ($result > 0) $editgroup->addrights($rights, $module, '', $entity);
+	}
+
+	if ($action == 'delrights' && $caneditperms)
+	{
+		$editgroup = new Usergroup($db);
+		$result=$editgroup->fetch($id);
+		if ($result > 0) $editgroup->delrights($rights, $module, '', $entity);
+	}
 }
 
 
@@ -80,12 +108,8 @@ $form = new Form($db);
 
 llxHeader('',$langs->trans("Permissions"));
 
-if ($id)
+if ($object->id)
 {
-    $object = new Usergroup($db);
-    $object->fetch($id);
-    $object->getrights();
-
     /*
      * Affichage onglets
      */
@@ -127,7 +151,6 @@ if ($id)
                         // Load all permissions
                         if ($objMod->rights_class)
                         {
-                        	$entity=((! empty($conf->multicompany->enabled) && ! empty($object->entity)) ? $object->entity : null);
                             $ret=$objMod->insert_permissions(0, $entity);
                             $modules[$objMod->rights_class]=$objMod;
                         }
@@ -140,56 +163,42 @@ if ($id)
     $db->commit();
 
     // Lecture des droits groupes
-    $permsgroup = array();
+    $permsgroupbyentity = array();
 
-    $sql = "SELECT r.id, r.libelle, r.module ";
-    $sql.= " FROM ".MAIN_DB_PREFIX."rights_def as r";
-    $sql.= ", ".MAIN_DB_PREFIX."usergroup_rights as ugr";
-    $sql.= " WHERE ugr.fk_id = r.id";
-    if(! empty($conf->multicompany->enabled))
-    {
-        if (empty($conf->multicompany->transverse_mode))
-        {
-        	$sql.= " AND r.entity = ".$object->entity;
-        }
-        else
-        {
-        	$sql.= " AND r.entity IN (0,1)";
-        }
-    }
-    else
-    {
-    	$sql.= " AND r.entity IN (0,".$conf->entity.")";
-    }
-
-    $sql.= " AND ugr.fk_usergroup = ".$object->id;
+    $sql = "SELECT DISTINCT r.id, r.libelle, r.module, gr.entity";
+    $sql.= " FROM ".MAIN_DB_PREFIX."rights_def as r,";
+    $sql.= " ".MAIN_DB_PREFIX."usergroup_rights as gr";
+    $sql.= " WHERE gr.fk_id = r.id";
+    $sql.= " AND gr.entity = ".$entity;
+    $sql.= " AND gr.fk_usergroup = ".$object->id;
 
+    dol_syslog("get user perms", LOG_DEBUG);
     $result=$db->query($sql);
-
     if ($result)
     {
-        $num = $db->num_rows($result);
-        $i = 0;
-        while ($i < $num)
-        {
-            $obj = $db->fetch_object($result);
-            array_push($permsgroup,$obj->id);
-            $i++;
-        }
-        $db->free($result);
+    	$num = $db->num_rows($result);
+    	$i = 0;
+    	while ($i < $num)
+    	{
+    		$obj = $db->fetch_object($result);
+    		if (! isset($permsgroupbyentity[$obj->entity]))
+    			$permsgroupbyentity[$obj->entity] = array();
+    			array_push($permsgroupbyentity[$obj->entity], $obj->id);
+    			$i++;
+    	}
+    	$db->free($result);
     }
     else
     {
-        dol_print_error($db);
+    	dol_print_error($db);
     }
 
-    
-    
+
     dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin);
-     
+
     print '<div class="fichecenter">';
     print '<div class="underbanner clearboth"></div>';
-     
+
     /*
      * Ecran ajout/suppression permission
      */
@@ -214,6 +223,10 @@ if ($id)
 
     if ($user->admin) print info_admin($langs->trans("WarningOnlyPermissionOfActivatedModules"));
 
+    $parameters=array();
+    $reshook=$hookmanager->executeHooks('insertExtraHeader',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+    if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
     print '<table width="100%" class="noborder">';
     print '<tr class="liste_titre">';
     print '<td>'.$langs->trans("Module").'</td>';
@@ -225,22 +238,7 @@ if ($id)
     $sql = "SELECT r.id, r.libelle, r.module";
     $sql.= " FROM ".MAIN_DB_PREFIX."rights_def as r";
     $sql.= " WHERE r.libelle NOT LIKE 'tou%'";    // On ignore droits "tous"
-    if(! empty($conf->multicompany->enabled))
-    {
-        if (empty($conf->multicompany->transverse_mode))
-        {
-        	$sql.= " AND r.entity = ".$object->entity;
-        }
-        else
-        {
-        	$sql.= " AND r.entity IN (0,1)";
-        }
-    }
-    else
-    {
-    	$sql.= " AND r.entity = ".$conf->entity;
-    }
-
+    $sql.= " AND r.entity = " . $entity;
     if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) $sql.= " AND r.perms NOT LIKE '%_advance'";  // Hide advanced perms if option is disable
     $sql.= " ORDER BY r.module, r.id";
 
@@ -279,9 +277,9 @@ if ($id)
                     print '<td class="nowrap">'.img_object('',$picto).' '.$objMod->getName();
                     print '<a name="'.$objMod->getName().'">&nbsp;</a></td>';
                     print '<td align="center" class="nowrap">';
-                    print '<a title='.$langs->trans("All").' alt='.$langs->trans("All").' href="perms.php?id='.$object->id.'&amp;action=addrights&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("All")."</a>";
+                    print '<a title='.$langs->trans("All").' alt='.$langs->trans("All").' href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("All")."</a>";
                     print '/';
-                    print '<a title='.$langs->trans("None").' alt='.$langs->trans("None").' href="perms.php?id='.$object->id.'&amp;action=delrights&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("None")."</a>";
+                    print '<a title='.$langs->trans("None").' alt='.$langs->trans("None").' href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("None")."</a>";
                     print '</td>';
                     print '<td colspan="2">&nbsp;</td>';
                     print '</tr>';
@@ -293,25 +291,37 @@ if ($id)
             // Module
             print '<td class="nowrap">'.img_object('',$picto).' '.$objMod->getName().'</td>';
 
-            if (in_array($obj->id, $permsgroup))
+            if (is_array($permsgroupbyentity[$entity]))
             {
-                // Own permission by group
-                if ($caneditperms)
-                {
-                    print '<td align="center"><a class="reposition" href="perms.php?id='.$object->id.'&amp;action=delrights&amp;rights='.$obj->id.'">'.img_edit_remove($langs->trans("Remove")).'</a></td>';
-                }
-                print '<td align="center">';
-                print img_picto($langs->trans("Active"),'tick');
-                print '</td>';
+            	if (in_array($obj->id, $permsgroupbyentity[$entity]))
+            	{
+            		// Own permission by group
+            		if ($caneditperms)
+            		{
+            			print '<td align="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'">'.img_edit_remove($langs->trans("Remove")).'</a></td>';
+            		}
+            		print '<td align="center">';
+            		print img_picto($langs->trans("Active"),'tick');
+            		print '</td>';
+            	}
+            	else
+            	{
+            		// Do not own permission
+            		if ($caneditperms)
+            		{
+            			print '<td align="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'">'.img_edit_add($langs->trans("Add")).'</a></td>';
+            		}
+            		print '<td>&nbsp</td>';
+            	}
             }
             else
             {
-                // Do not own permission
-                if ($caneditperms)
-                {
-                    print '<td align="center"><a class="reposition" href="perms.php?id='.$object->id.'&amp;action=addrights&amp;rights='.$obj->id.'">'.img_edit_add($langs->trans("Add")).'</a></td>';
-                }
-                print '<td>&nbsp</td>';
+            	// Do not own permission
+            	if ($caneditperms)
+            	{
+            		print '<td align="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'">'.img_edit_add($langs->trans("Add")).'</a></td>';
+            	}
+            	print '<td>&nbsp</td>';
             }
 
             $perm_libelle=($conf->global->MAIN_USE_ADVANCED_PERMS && ($langs->trans("PermissionAdvanced".$obj->id)!=("PermissionAdvanced".$obj->id))?$langs->trans("PermissionAdvanced".$obj->id):(($langs->trans("Permission".$obj->id)!=("Permission".$obj->id))?$langs->trans("Permission".$obj->id):$langs->trans($obj->libelle)));
@@ -323,9 +333,13 @@ if ($id)
         }
     }
     print '</table>';
-    
+
     print '</div>';
-    
+
+    $parameters=array();
+    $reshook=$hookmanager->executeHooks('insertExtraFooter',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+    if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
     dol_fiche_end();
 }
 
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index 9e7f6583f6e..3e82e2b6357 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -73,7 +73,7 @@ $user_arbo = $userstatic->get_full_tree(0, ($search_statut != '' && $search_stat
 
 if (! is_array($user_arbo) && $user_arbo < 0)
 {
-    setEventMessages($userstatic->error, $userstatic->errors, 'warnings');    
+    setEventMessages($userstatic->error, $userstatic->errors, 'warnings');
 }
 else
 {
@@ -97,24 +97,21 @@ foreach($fulltree as $key => $val)
 	$userstatic->admin=$val['admin'];
 	$userstatic->entity=$val['entity'];
 	$userstatic->photo=$val['photo'];
-	
+
 	$entity=$val['entity'];
 	$entitystring='';
 
 	// TODO Set of entitystring should be done with a hook
-	if (is_object($mc))
+	if (! empty($conf->multicompany->enabled) && is_object($mc))
 	{
-		if (! empty($conf->multicompany->enabled))
+		if (empty($entity))
 		{
-			if (empty($entity))
-			{
-				$entitystring=$langs->trans("AllEntities");
-			}
-			else
-			{
-				$mc->getInfo($entity);
-				$entitystring=$mc->label;
-			}
+			$entitystring=$langs->trans("AllEntities");
+		}
+		else
+		{
+			$mc->getInfo($entity);
+			$entitystring=$mc->label;
 		}
 	}
 
@@ -128,7 +125,7 @@ foreach($fulltree as $key => $val)
 		$li.=img_picto($langs->trans("Administrator"),'star');
 	}
 	$li.=' ('.$val['login'].($entitystring?' - '.$entitystring:'').')';
-	
+
 	$data[] = array(
 		'rowid'=>$val['rowid'],
 		'fk_menu'=>$val['fk_user'],
diff --git a/htdocs/user/home.php b/htdocs/user/home.php
index 66a4448491e..7c464ce2e45 100644
--- a/htdocs/user/home.php
+++ b/htdocs/user/home.php
@@ -100,7 +100,7 @@ $sql.= ", s.code_client";
 $sql.= ", s.canvas";
 $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON u.fk_soc = s.rowid";
-if (! empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->multicompany->transverse_mode || ($user->admin && ! $user->entity)))
+if (! empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->global->MULTICOMPANY_TRANSVERSE_MODE || ($user->admin && ! $user->entity)))
 {
 	$sql.= " WHERE u.entity IS NOT NULL";
 }
@@ -212,7 +212,7 @@ if ($canreadperms)
 
 	$sql = "SELECT g.rowid, g.nom as name, g.note, g.entity, g.datec";
 	$sql.= " FROM ".MAIN_DB_PREFIX."usergroup as g";
-	if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->multicompany->transverse_mode || ($user->admin && ! $user->entity)))
+	if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->global->MULTICOMPANY_TRANSVERSE_MODE || ($user->admin && ! $user->entity)))
 	{
 		$sql.= " WHERE g.entity IS NOT NULL";
 	}
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 8333acbbb79..984479465ff 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -92,7 +92,7 @@ $arrayfields=array(
     'u.accountancy_code'=>array('label'=>$langs->trans("AccountancyCode"), 'checked'=>0),
     'u.email'=>array('label'=>$langs->trans("EMail"), 'checked'=>1),
     'u.fk_soc'=>array('label'=>$langs->trans("Company"), 'checked'=>1),
-    'u.entity'=>array('label'=>$langs->trans("Entity"), 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))),
+    'u.entity'=>array('label'=>$langs->trans("Entity"), 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))),
     'u.fk_user'=>array('label'=>$langs->trans("HierarchicalResponsible"), 'checked'=>1),
     'u.datelastlogin'=>array('label'=>$langs->trans("LastConnexion"), 'checked'=>1, 'position'=>100),
     'u.datepreviouslogin'=>array('label'=>$langs->trans("PreviousConnexion"), 'checked'=>0, 'position'=>110),
@@ -194,7 +194,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user_extrafields as ef on (u.rowid = ef.fk_object)";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON u.fk_soc = s.rowid";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u2 ON u.fk_user = u2.rowid";
-if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && (! empty($conf->multicompany->transverse_mode) || (! empty($user->admin) && empty($user->entity))))
+if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) || (! empty($user->admin) && empty($user->entity))))
 {
 	$sql.= " WHERE u.entity IS NOT NULL";
 }
@@ -545,7 +545,7 @@ while ($i < min($num,$limit))
         print '</td>';
 	}
     // Multicompany enabled
-    if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))
+	if (! empty($conf->multicompany->enabled) && is_object($mc) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
     {
         if (! empty($arrayfields['u.entity']['checked']))
 		{
@@ -556,12 +556,8 @@ while ($i < min($num,$limit))
         	}
         	else
         	{
-        		// $mc is defined in conf.class.php if multicompany enabled.
-        		if (is_object($mc))
-        		{
-        			$mc->getInfo($obj->entity);
-        			print $mc->label;
-        		}
+        		$mc->getInfo($obj->entity);
+        		print $mc->label;
         	}
         	print '</td>';
 		}
@@ -581,7 +577,7 @@ while ($i < min($num,$limit))
 	        $user2->photo=$obj->photo2;
 	        $user2->admin=$obj->admin2;
 	        $user2->email=$obj->email2;
-	        $user2->societe_id=$obj->fk_soc2;
+	        $user2->socid=$obj->fk_soc2;
 	        print $user2->getNomUrl(-1,'',0,0,24,0,'');
             if (! empty($conf->multicompany->enabled) && $obj->admin2 && ! $obj->entity2)
             {
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index b40c79f783e..5de1a3b80ac 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2002-2003 Jean-Louis Bergamo   <jlb@j1b.org>
  * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2015 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2017 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2012      Juanjo Menent        <jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -38,7 +38,6 @@ $action=GETPOST('action', 'alpha');
 $confirm=GETPOST('confirm', 'alpha');
 $module=GETPOST('module', 'alpha');
 $rights=GETPOST('rights', 'int');
-$entity=(GETPOST('entity','int')?GETPOST('entity','int'):$conf->entity);
 
 if (! isset($id) || empty($id)) accessforbidden();
 
@@ -71,6 +70,15 @@ $object = new User($db);
 $object->fetch($id, '', '', 1);
 $object->getrights();
 
+$entity=$conf->entity;
+if (! empty($conf->multicompany->enabled))
+{
+	if (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
+		$entity=(GETPOST('entity','int') ? GETPOST('entity','int') : $conf->entity);
+	else
+		$entity=(! empty($object->entity) ? $object->entity : $conf->entity);
+}
+
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('usercard','globalcard'));
 
@@ -86,12 +94,11 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 if (empty($reshook)) {
 	if ($action == 'addrights' && $caneditperms) {
 		$edituser = new User($db);
-		$edituser->fetch($id);
-		//$edituser->addrights($rights, $module, '', $entity); // TODO unused for the moment
-		$edituser->addrights($rights, $module);
+		$edituser->fetch($object->id);
+		$edituser->addrights($rights, $module, '', $entity);
 
 		// Si on a touche a ses propres droits, on recharge
-		if ($id == $user->id) {
+		if ($object->id == $user->id) {
 			$user->clearrights();
 			$user->getrights();
 			$menumanager->loadMenu();
@@ -100,12 +107,11 @@ if (empty($reshook)) {
 
 	if ($action == 'delrights' && $caneditperms) {
 		$edituser = new User($db);
-		$edituser->fetch($id);
-		//$edituser->delrights($rights, $module, '', $entity); // TODO unused for the moment
-		$edituser->delrights($rights, $module);
+		$edituser->fetch($object->id);
+		$edituser->delrights($rights, $module, '', $entity);
 
 		// Si on a touche a ses propres droits, on recharge
-		if ($id == $user->id) {
+		if ($object->id == $user->id) {
 			$user->clearrights();
 			$user->getrights();
 			$menumanager->loadMenu();
@@ -161,8 +167,7 @@ foreach($modulesdir as $dir)
     	            // Load all permissions
     	            if ($objMod->rights_class)
     	            {
-    	            	$forceEntity=((! empty($conf->multicompany->enabled) && ! empty($object->entity)) ? $object->entity : null);
-    	                $ret=$objMod->insert_permissions(0, $forceEntity);
+    	                $ret=$objMod->insert_permissions(0, $entity);
     	                $modules[$objMod->rights_class]=$objMod;
     	                //print "modules[".$objMod->rights_class."]=$objMod;";
     	            }
@@ -177,22 +182,11 @@ $db->commit();
 // Lecture des droits utilisateurs
 $permsuser = array();
 
-$sql = "SELECT r.id, r.libelle, r.module";
+$sql = "SELECT DISTINCT r.id, r.libelle, r.module";
 $sql.= " FROM ".MAIN_DB_PREFIX."rights_def as r,";
 $sql.= " ".MAIN_DB_PREFIX."user_rights as ur";
 $sql.= " WHERE ur.fk_id = r.id";
-if (! empty($conf->multicompany->enabled))
-{
-	if (1==2 && ! empty($conf->multicompany->transverse_mode)) {
-		$sql.= " AND r.entity = ".(GETPOST('entity','int')?GETPOST('entity','int'):$conf->entity); // TODO unused for the moment
-	} else {
-		$sql.= " AND r.entity = ".(! empty($object->entity) ? $object->entity : $conf->entity);
-	}
-}
-else
-{
-	$sql.= " AND r.entity = ".$conf->entity;
-}
+$sql.= " AND ur.entity = ".$entity;
 $sql.= " AND ur.fk_user = ".$object->id;
 
 dol_syslog("get user perms", LOG_DEBUG);
@@ -216,18 +210,13 @@ else
 
 // Lecture des droits groupes
 $permsgroupbyentity = array();
-$aEntities = array();
 
-$sql = "SELECT r.id, r.libelle, r.module, gu.entity";
+$sql = "SELECT DISTINCT r.id, r.libelle, r.module, gu.entity";
 $sql.= " FROM ".MAIN_DB_PREFIX."rights_def as r,";
 $sql.= " ".MAIN_DB_PREFIX."usergroup_rights as gr,";
 $sql.= " ".MAIN_DB_PREFIX."usergroup_user as gu";
 $sql.= " WHERE gr.fk_id = r.id";
-if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)) {
-	$sql.= " AND gu.entity IS NOT NULL";
-} else {
-	$sql.= " AND r.entity = ".((! empty($conf->multicompany->enabled) && ! empty($object->entity)) ? $object->entity : $conf->entity);
-}
+$sql.= " AND gr.entity = ".$entity;
 $sql.= " AND gr.fk_usergroup = gu.fk_usergroup";
 $sql.= " AND gu.fk_user = ".$object->id;
 
@@ -272,17 +261,10 @@ if ($user->admin) print info_admin($langs->trans("WarningOnlyPermissionOfActivat
 // Show warning about external users
 if (empty($user->societe_id)) print info_admin(showModulesExludedForExternal($modules))."\n";
 
-// For multicompany transversal mode
-// TODO Place a hook here
-if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
-{
-	$aEntities=array_keys($permsgroupbyentity);
-	sort($aEntities);
-	$entity = (GETPOST('entity', 'int')?GETPOST('entity', 'int'):$aEntities[0]);
-	$head = entity_prepare_head($object, $aEntities);
-	$title = $langs->trans("Entities");
-	dol_fiche_head($head, $entity, $title, 1, 'multicompany@multicompany');
-}
+$parameters=array('permsgroupbyentity'=>$permsgroupbyentity);
+$reshook=$hookmanager->executeHooks('insertExtraHeader',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
 
 print "\n";
 print '<table width="100%" class="noborder">';
@@ -297,7 +279,7 @@ print '</tr>'."\n";
 $sql = "SELECT r.id, r.libelle, r.module";
 $sql.= " FROM ".MAIN_DB_PREFIX."rights_def as r";
 $sql.= " WHERE r.libelle NOT LIKE 'tou%'";    // On ignore droits "tous"
-$sql.= " AND r.entity = ".((! empty($conf->multicompany->enabled) && ! empty($object->entity)) ? $object->entity : $conf->entity);
+$sql.= " AND r.entity = " . $entity;
 if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) $sql.= " AND r.perms NOT LIKE '%_advance'";  // Hide advanced perms if option is disable
 $sql.= " ORDER BY r.module, r.id";
 
@@ -336,9 +318,9 @@ if ($result)
         		print '<td class="maxwidthonsmartphone tdoverflowonsmartphone">'.img_object('',$picto).' '.$objMod->getName();
         		print '<a name="'.$objMod->getName().'"></a></td>';
         		print '<td align="center" class="nowrap">';
-        		print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="perms.php?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module='.$obj->module.'">'.$langs->trans("All")."</a>";
+        		print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module='.$obj->module.'">'.$langs->trans("All")."</a>";
         		print '/';
-        		print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.dol_escape_htmltag($langs->trans("None")).'" href="perms.php?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module='.$obj->module.'">'.$langs->trans("None")."</a>";
+        		print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.dol_escape_htmltag($langs->trans("None")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module='.$obj->module.'">'.$langs->trans("None")."</a>";
         		print '</td>';
         		print '<td colspan="2">&nbsp;</td>';
         		print '</tr>'."\n";
@@ -365,7 +347,7 @@ if ($result)
         {
         	if ($caneditperms)
         	{
-        		print '<td align="center"><a class="reposition" href="perms.php?id='.$object->id.'&amp;action=delrights&amp;rights='.$obj->id.'">'.img_edit_remove($langs->trans("Remove")).'</a></td>';
+        		print '<td align="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'">'.img_edit_remove($langs->trans("Remove")).'</a></td>';
         	}
         	print '<td align="center" class="nowrap">';
         	print img_picto($langs->trans("Active"),'tick');
@@ -391,7 +373,7 @@ if ($result)
 	        	// Do not own permission
 	        	if ($caneditperms)
 	        	{
-	        		print '<td align="center"><a class="reposition" href="perms.php?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'">'.img_edit_add($langs->trans("Add")).'</a></td>';
+	        		print '<td align="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'">'.img_edit_add($langs->trans("Add")).'</a></td>';
 	        	}
 	        	print '<td>&nbsp</td>';
 	        }
@@ -401,7 +383,7 @@ if ($result)
         	// Do not own permission
         	if ($caneditperms)
         	{
-        		print '<td align="center"><a class="reposition" href="perms.php?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'">'.img_edit_add($langs->trans("Add")).'</a></td>';
+        		print '<td align="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'">'.img_edit_add($langs->trans("Add")).'</a></td>';
         	}
         	print '<td>&nbsp</td>';
         }
@@ -417,13 +399,10 @@ if ($result)
 else dol_print_error($db);
 print '</table>';
 
+$parameters=array();
+$reshook=$hookmanager->executeHooks('insertExtraFooter',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-// For multicompany transversal mode
-// TODO Place a hook here
-if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
-{
-	dol_fiche_end();
-}
 
 dol_fiche_end();
 
diff --git a/htdocs/webservices/server_user.php b/htdocs/webservices/server_user.php
index c4d8ce08724..3de5ef815c9 100644
--- a/htdocs/webservices/server_user.php
+++ b/htdocs/webservices/server_user.php
@@ -416,7 +416,7 @@ function getListOfGroups($authentication)
 		$sql = "SELECT g.rowid, g.nom as name, g.entity, g.datec, COUNT(DISTINCT ugu.fk_user) as nb";
 		$sql.= " FROM ".MAIN_DB_PREFIX."usergroup as g";
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_usergroup = g.rowid";
-		if (! empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->multicompany->transverse_mode || ($user->admin && ! $user->entity)))
+		if (! empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->global->MULTICOMPANY_TRANSVERSE_MODE || ($user->admin && ! $user->entity)))
 		{
 			$sql.= " WHERE g.entity IS NOT NULL";
 		}

From 2510ec70153ea20f0eb551e12d31b5f0a7d97749 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 6 Jun 2017 10:29:34 +0200
Subject: [PATCH 091/438] Fix php error

---
 htdocs/core/class/hookmanager.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 65495cb0100..afb670dc267 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -190,7 +190,7 @@ class HookManager
         }
 
         // Init return properties
-        $this->resPrint=''; $this->resArray=array(); $this->$resNbOfHooks=0;
+        $this->resPrint=''; $this->resArray=array(); $this->resNbOfHooks=0;
 
         // Loop on each hook to qualify modules that have declared context
         $modulealreadyexecuted=array();
@@ -209,7 +209,7 @@ class HookManager
                 	// jump to next module/class if method does not exist
                     if (! method_exists($actionclassinstance,$method)) continue;
 
-                    $this->$resNbOfHooks++;
+                    $this->resNbOfHooks++;
 
                     dol_syslog(get_class($this).'::executeHooks a qualified hook was found for method='.$method.' module='.$module." action=".$action." context=".$context);
 

From 02b5d9e6f7574be222e74be648d44e209d06113a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 6 Jun 2017 10:53:53 +0200
Subject: [PATCH 092/438] FIX #6945

---
 htdocs/accountancy/admin/fiscalyear.php         | 2 +-
 htdocs/accountancy/admin/importaccounts.php     | 2 +-
 htdocs/accountancy/admin/productaccount.php     | 2 +-
 htdocs/adherents/list.php                       | 2 +-
 htdocs/adherents/type.php                       | 2 +-
 htdocs/admin/defaultvalues.php                  | 2 +-
 htdocs/admin/translation.php                    | 2 +-
 htdocs/bookmarks/list.php                       | 2 +-
 htdocs/comm/action/document.php                 | 2 +-
 htdocs/comm/action/index.php                    | 2 +-
 htdocs/comm/action/pertype.php                  | 2 +-
 htdocs/comm/action/peruser.php                  | 2 +-
 htdocs/comm/card.php                            | 2 +-
 htdocs/comm/mailing/cibles.php                  | 2 +-
 htdocs/comm/mailing/list.php                    | 2 +-
 htdocs/comm/propal/document.php                 | 2 +-
 htdocs/comm/propal/list.php                     | 2 +-
 htdocs/commande/customer.php                    | 2 +-
 htdocs/commande/document.php                    | 2 +-
 htdocs/commande/list.php                        | 2 +-
 htdocs/compta/bank/bankentries.php              | 2 +-
 htdocs/compta/bank/index.php                    | 2 +-
 htdocs/compta/bank/releve.php                   | 2 +-
 htdocs/compta/bank/various_payment/document.php | 2 +-
 htdocs/compta/bank/various_payment/index.php    | 2 +-
 htdocs/compta/charges/index.php                 | 2 +-
 htdocs/compta/clients.php                       | 2 +-
 htdocs/compta/deplacement/document.php          | 2 +-
 htdocs/compta/deplacement/index.php             | 2 +-
 htdocs/compta/deplacement/list.php              | 2 +-
 htdocs/compta/facture/document.php              | 2 +-
 htdocs/compta/facture/fiche-rec.php             | 2 +-
 htdocs/compta/facture/list.php                  | 2 +-
 htdocs/compta/paiement/avalider.php             | 2 +-
 htdocs/compta/paiement/cheque/list.php          | 2 +-
 htdocs/compta/paiement/list.php                 | 2 +-
 htdocs/compta/prelevement/bons.php              | 2 +-
 htdocs/compta/prelevement/card.php              | 2 +-
 htdocs/compta/prelevement/demandes.php          | 2 +-
 htdocs/compta/prelevement/factures.php          | 2 +-
 htdocs/compta/prelevement/list.php              | 2 +-
 htdocs/compta/recap-compta.php                  | 2 +-
 htdocs/compta/resultat/clientfourn.php          | 2 +-
 htdocs/compta/salaries/document.php             | 2 +-
 htdocs/compta/salaries/index.php                | 2 +-
 htdocs/compta/sociales/index.php                | 2 +-
 htdocs/compta/sociales/payments.php             | 2 +-
 htdocs/compta/tva/reglement.php                 | 2 +-
 htdocs/contact/agenda.php                       | 2 +-
 htdocs/contrat/document.php                     | 2 +-
 htdocs/contrat/list.php                         | 2 +-
 htdocs/contrat/services.php                     | 2 +-
 htdocs/core/ajax/ajaxdirpreview.php             | 2 +-
 htdocs/cron/list.php                            | 2 +-
 htdocs/don/document.php                         | 2 +-
 htdocs/don/list.php                             | 2 +-
 htdocs/ecm/docdir.php                           | 2 +-
 htdocs/ecm/docfile.php                          | 2 +-
 htdocs/ecm/docmine.php                          | 2 +-
 htdocs/ecm/index.php                            | 2 +-
 htdocs/ecm/index_auto.php                       | 2 +-
 htdocs/ecm/search.php                           | 2 +-
 htdocs/expedition/list.php                      | 2 +-
 htdocs/expensereport/document.php               | 2 +-
 htdocs/expensereport/index.php                  | 2 +-
 htdocs/expensereport/list.php                   | 2 +-
 htdocs/fichinter/document.php                   | 2 +-
 htdocs/fichinter/list.php                       | 2 +-
 htdocs/fourn/commande/document.php              | 2 +-
 htdocs/fourn/commande/list.php                  | 2 +-
 htdocs/fourn/contact.php                        | 2 +-
 htdocs/fourn/facture/impayees.php               | 2 +-
 htdocs/fourn/facture/paiement.php               | 2 +-
 htdocs/ftp/index.php                            | 2 +-
 htdocs/holiday/document.php                     | 2 +-
 htdocs/loan/index.php                           | 2 +-
 htdocs/margin/agentMargins.php                  | 2 +-
 htdocs/margin/customerMargins.php               | 2 +-
 htdocs/margin/productMargins.php                | 2 +-
 htdocs/margin/tabs/productMargins.php           | 2 +-
 htdocs/margin/tabs/thirdpartyMargins.php        | 2 +-
 htdocs/modulebuilder/template/myobject_list.php | 2 +-
 htdocs/opensurvey/list.php                      | 2 +-
 htdocs/product/document.php                     | 2 +-
 htdocs/product/inventory/list.php               | 2 +-
 htdocs/product/list-with-listview.php           | 2 +-
 htdocs/product/list.php                         | 2 +-
 htdocs/product/popuprop.php                     | 2 +-
 htdocs/product/stats/commande.php               | 2 +-
 htdocs/product/stats/contrat.php                | 2 +-
 htdocs/product/stats/facture.php                | 2 +-
 htdocs/product/stats/facture_fournisseur.php    | 2 +-
 htdocs/product/stock/productlot_list.php        | 2 +-
 htdocs/product/stock/replenish.php              | 2 +-
 htdocs/projet/document.php                      | 2 +-
 htdocs/projet/tasks/document.php                | 2 +-
 htdocs/projet/tasks/list.php                    | 2 +-
 htdocs/projet/tasks/time.php                    | 2 +-
 htdocs/public/members/public_list.php           | 2 +-
 htdocs/resource/document.php                    | 2 +-
 htdocs/societe/agenda.php                       | 2 +-
 htdocs/societe/consumption.php                  | 2 +-
 htdocs/societe/document.php                     | 2 +-
 htdocs/supplier_proposal/document.php           | 2 +-
 htdocs/supplier_proposal/list.php               | 2 +-
 105 files changed, 105 insertions(+), 105 deletions(-)

diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php
index 16e11225d49..47759792d71 100644
--- a/htdocs/accountancy/admin/fiscalyear.php
+++ b/htdocs/accountancy/admin/fiscalyear.php
@@ -32,7 +32,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/accountancy/admin/importaccounts.php b/htdocs/accountancy/admin/importaccounts.php
index 1bb1bf178b3..d1083c50d10 100644
--- a/htdocs/accountancy/admin/importaccounts.php
+++ b/htdocs/accountancy/admin/importaccounts.php
@@ -43,7 +43,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):(empty($conf->global->ACCOUNTIN
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index fcb44c6f858..4552a478d6a 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -74,7 +74,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):(empty($conf->global->ACCOUNTIN
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 1b059d8616d..af8530e6567 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -66,7 +66,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page ;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 31a40e96669..20adc36dec5 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -48,7 +48,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page ;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 10d9ec5c282..7409ef1b973 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -43,7 +43,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 72aaa7fe355..67433eca35d 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -49,7 +49,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index 40a316d881b..57bb6a71cec 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -43,7 +43,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index 2caa55bcd59..30eeb2ffe8e 100644
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -67,7 +67,7 @@ if ($id > 0)
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 307d6417285..486f31331eb 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -58,7 +58,7 @@ if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS))
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page","int");
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $offset = $limit * $page;
 if (! $sortorder) $sortorder="ASC";
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index 544da904cdc..577f18dea87 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -54,7 +54,7 @@ if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS))
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page","int");
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $offset = $limit * $page;
 if (! $sortorder) $sortorder="ASC";
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 2a707cd2d8f..b893ada83b3 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -54,7 +54,7 @@ if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS))
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page","int");
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $offset = $limit * $page;
 if (! $sortorder) $sortorder="ASC";
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 7599cce4cfd..5b08519b9b8 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -66,7 +66,7 @@ $mode		= GETPOST("mode");
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 719dba1a622..8ee163e8e6f 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -43,7 +43,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php
index e7775a6485e..65e82b8f939 100644
--- a/htdocs/comm/mailing/list.php
+++ b/htdocs/comm/mailing/list.php
@@ -34,7 +34,7 @@ $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index 82244886763..6cc40873060 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -54,7 +54,7 @@ $result = restrictedArea($user, 'propal', $id);
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index d2a6c6e926f..31f0a433d59 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -88,7 +88,7 @@ $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php
index 431a54b9f76..4f9666e71a8 100644
--- a/htdocs/commande/customer.php
+++ b/htdocs/commande/customer.php
@@ -49,7 +49,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index 0b6cb908ef3..0996907b245 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -53,7 +53,7 @@ $result=restrictedArea($user,'commande',$id,'');
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index b9102e78ddc..f241053ec92 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -86,7 +86,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/bank/bankentries.php b/htdocs/compta/bank/bankentries.php
index f98c48b1aba..35b229c17ec 100644
--- a/htdocs/compta/bank/bankentries.php
+++ b/htdocs/compta/bank/bankentries.php
@@ -103,7 +103,7 @@ $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
 $pageplusone = GETPOST("pageplusone",'int');
 if ($pageplusone) $page = $pageplusone - 1;
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index 8ff5f1964fc..db5f5e5d85b 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -59,7 +59,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 4e5fc5dea81..61a88aa9c2f 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -77,7 +77,7 @@ $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
 $pageplusone = GETPOST("pageplusone",'int');
 if ($pageplusone) $page = $pageplusone - 1;
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/bank/various_payment/document.php b/htdocs/compta/bank/various_payment/document.php
index 5311aca0618..8ae83f9c550 100644
--- a/htdocs/compta/bank/various_payment/document.php
+++ b/htdocs/compta/bank/various_payment/document.php
@@ -46,7 +46,7 @@ $result = restrictedArea($user, 'salaries', $id, '');
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/bank/various_payment/index.php b/htdocs/compta/bank/various_payment/index.php
index f189eeef306..39c6d27be4f 100644
--- a/htdocs/compta/bank/various_payment/index.php
+++ b/htdocs/compta/bank/various_payment/index.php
@@ -44,7 +44,7 @@ $search_account = GETPOST('search_account','int');
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index a690478a53e..78656682c6f 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -52,7 +52,7 @@ $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php
index 59fb3af2f00..9ffed35f1df 100644
--- a/htdocs/compta/clients.php
+++ b/htdocs/compta/clients.php
@@ -47,7 +47,7 @@ $mode=GETPOST("mode");
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/deplacement/document.php b/htdocs/compta/deplacement/document.php
index 6fa539ba297..1f3974ce041 100644
--- a/htdocs/compta/deplacement/document.php
+++ b/htdocs/compta/deplacement/document.php
@@ -53,7 +53,7 @@ $result = restrictedArea($user, 'deplacement', $id, '');
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php
index bb6d58293b6..fdb7e46900c 100644
--- a/htdocs/compta/deplacement/index.php
+++ b/htdocs/compta/deplacement/index.php
@@ -39,7 +39,7 @@ $result = restrictedArea($user, 'deplacement','','');
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php
index 1cf976325ec..de5e00045e7 100644
--- a/htdocs/compta/deplacement/list.php
+++ b/htdocs/compta/deplacement/list.php
@@ -47,7 +47,7 @@ $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
 $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index 2d2ff5cc073..b6c77207952 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -58,7 +58,7 @@ $result=restrictedArea($user,'facture',$id,'');
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index cb43c05680b..aa5c6103638 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -76,7 +76,7 @@ $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 if (! $sortorder) $sortorder='DESC';
 if (! $sortfield) $sortfield='f.titre';
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 1ab17765d8f..8f1ea2338d0 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -102,7 +102,7 @@ $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 if (! $sortorder && ! empty($conf->global->INVOICE_DEFAULT_UNPAYED_SORT_ORDER) && $search_status == 1) $sortorder=$conf->global->INVOICE_DEFAULT_UNPAYED_SORT_ORDER;
 if (! $sortorder) $sortorder='DESC';
diff --git a/htdocs/compta/paiement/avalider.php b/htdocs/compta/paiement/avalider.php
index 1f00da90a8c..0fe627cf7ac 100644
--- a/htdocs/compta/paiement/avalider.php
+++ b/htdocs/compta/paiement/avalider.php
@@ -42,7 +42,7 @@ $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index a4fac965e7a..63a2884e5bf 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -47,7 +47,7 @@ $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index daf70556213..efc9d5e10d2 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -61,7 +61,7 @@ $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php
index 302e1e9e59c..41f6abb25c5 100644
--- a/htdocs/compta/prelevement/bons.php
+++ b/htdocs/compta/prelevement/bons.php
@@ -41,7 +41,7 @@ $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index 62e57813886..443f93eb52c 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -52,7 +52,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index e619b28e994..8b5e024f3b6 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -49,7 +49,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index 6136ee48499..9987d41e802 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -48,7 +48,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index 9b1f1ff461e..e9e46b6afff 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -44,7 +44,7 @@ $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index a383f841a47..5ec219a48ee 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -44,7 +44,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 1b5a232b812..2b4b86aeb9d 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -56,7 +56,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/salaries/document.php b/htdocs/compta/salaries/document.php
index 03a69a764cf..678442453c6 100644
--- a/htdocs/compta/salaries/document.php
+++ b/htdocs/compta/salaries/document.php
@@ -55,7 +55,7 @@ $result = restrictedArea($user, 'salaries', $id, '');
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php
index dc95b06bc52..e87fc932c50 100644
--- a/htdocs/compta/salaries/index.php
+++ b/htdocs/compta/salaries/index.php
@@ -48,7 +48,7 @@ $search_account = GETPOST('search_account','int');
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php
index 194c3f38d99..2ab2cb1c172 100644
--- a/htdocs/compta/sociales/index.php
+++ b/htdocs/compta/sociales/index.php
@@ -46,7 +46,7 @@ $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php
index ae7240c204a..cd7e93455e6 100644
--- a/htdocs/compta/sociales/payments.php
+++ b/htdocs/compta/sociales/payments.php
@@ -49,7 +49,7 @@ $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php
index 8b4d3299f9c..44c45a65dc7 100644
--- a/htdocs/compta/tva/reglement.php
+++ b/htdocs/compta/tva/reglement.php
@@ -50,7 +50,7 @@ $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php
index f57e088e00e..ba0ec3f8ef0 100644
--- a/htdocs/contact/agenda.php
+++ b/htdocs/contact/agenda.php
@@ -93,7 +93,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index 7c0263f8376..132ab187777 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -55,7 +55,7 @@ $result = restrictedArea($user, 'contrat', $id);
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 43cce90bd1c..1568999cae6 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -69,7 +69,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php
index adac837f3e0..8d4fa7e69d4 100644
--- a/htdocs/contrat/services.php
+++ b/htdocs/contrat/services.php
@@ -37,7 +37,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index 8d8f48ec141..a21f0d107cd 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -49,7 +49,7 @@ if (! isset($mode) || $mode != 'noajax')    // For ajax call
     $sortfield = GETPOST("sortfield",'alpha');
     $sortorder = GETPOST("sortorder",'alpha');
     $page = GETPOST("page",'int');
-    if ($page == -1) { $page = 0; }
+    if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
     $offset = $conf->liste_limit * $page;
     $pageprev = $page - 1;
     $pagenext = $page + 1;
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 95338247eca..636770ef567 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -43,7 +43,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/don/document.php b/htdocs/don/document.php
index 0f4166a4cde..115f58e5cc1 100644
--- a/htdocs/don/document.php
+++ b/htdocs/don/document.php
@@ -59,7 +59,7 @@ $result = restrictedArea($user, 'don', $id, '');
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index daa6f7aa1f2..a4f5f07679f 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -35,7 +35,7 @@ $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
 $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/ecm/docdir.php b/htdocs/ecm/docdir.php
index cf135e5ecb1..b3b9fa528e0 100644
--- a/htdocs/ecm/docdir.php
+++ b/htdocs/ecm/docdir.php
@@ -60,7 +60,7 @@ $upload_dir = $conf->ecm->dir_output.'/'.$urlsection;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/ecm/docfile.php b/htdocs/ecm/docfile.php
index 5f40d1bb6f3..31f9b6b11c2 100644
--- a/htdocs/ecm/docfile.php
+++ b/htdocs/ecm/docfile.php
@@ -54,7 +54,7 @@ if ($user->societe_id > 0)
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/ecm/docmine.php b/htdocs/ecm/docmine.php
index 1e7613991e4..48f39cb12f2 100644
--- a/htdocs/ecm/docmine.php
+++ b/htdocs/ecm/docmine.php
@@ -41,7 +41,7 @@ $confirm=GETPOST('confirm','alpha');
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index edbe7538dfa..28913f9aa11 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -58,7 +58,7 @@ $section_dir=GETPOST('section_dir');
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index a605440ff61..b613d336fc4 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -58,7 +58,7 @@ $section_dir=GETPOST('section_dir');
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php
index 15266395026..070acf2d4e1 100644
--- a/htdocs/ecm/search.php
+++ b/htdocs/ecm/search.php
@@ -58,7 +58,7 @@ $upload_dir = $conf->ecm->dir_output.'/'.$section;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index c838c002cc9..6f5e9e742b1 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -59,7 +59,7 @@ $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
 if (! $sortfield) $sortfield="e.ref";
 if (! $sortorder) $sortorder="DESC";
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/expensereport/document.php b/htdocs/expensereport/document.php
index 227bdec8bc9..2b8dd3ee0c6 100644
--- a/htdocs/expensereport/document.php
+++ b/htdocs/expensereport/document.php
@@ -53,7 +53,7 @@ $result = restrictedArea($user, 'expensereport', $id, 'expensereport');
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index 724fb234798..1568246f194 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -42,7 +42,7 @@ $result = restrictedArea($user, 'expensereport','','');
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index f95952db482..555fbd19802 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -55,7 +55,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php
index 03c7f83a827..3d5a3c544e8 100644
--- a/htdocs/fichinter/document.php
+++ b/htdocs/fichinter/document.php
@@ -53,7 +53,7 @@ $result = restrictedArea($user, 'ficheinter', $id, 'fichinter');
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 9271a348558..68d4e2bef34 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -61,7 +61,7 @@ $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index 0f99d747b51..68976e9b7c7 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -56,7 +56,7 @@ $result = restrictedArea($user, 'fournisseur', $id, '', 'commande');
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 544d882cda3..1e8ac06d475 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -105,7 +105,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php
index b1db17f3754..c43b4c9c797 100644
--- a/htdocs/fourn/contact.php
+++ b/htdocs/fourn/contact.php
@@ -44,7 +44,7 @@ if ($user->societe_id > 0)
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php
index 4ade0a6dbb0..7cfe9697891 100644
--- a/htdocs/fourn/facture/impayees.php
+++ b/htdocs/fourn/facture/impayees.php
@@ -57,7 +57,7 @@ $search_amount_no_tax = GETPOST('search_amount_no_tax','alpha');
 $search_amount_all_tax = GETPOST('search_amount_all_tax','alpha');
 
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 10851e629e3..f51246d8eea 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -56,7 +56,7 @@ $search_payment_num=GETPOST('search_payment_num','alpha');
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php
index 5b9dc94172b..c9172bfd0c8 100644
--- a/htdocs/ftp/index.php
+++ b/htdocs/ftp/index.php
@@ -51,7 +51,7 @@ $download_dir = $conf->ftp->dir_temp;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php
index 57ab947c8e7..38f68e58937 100644
--- a/htdocs/holiday/document.php
+++ b/htdocs/holiday/document.php
@@ -54,7 +54,7 @@ $langs->load("holiday");
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/loan/index.php b/htdocs/loan/index.php
index b04d3bd90b3..3ce2c048057 100644
--- a/htdocs/loan/index.php
+++ b/htdocs/loan/index.php
@@ -41,7 +41,7 @@ $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index 846daad7806..1c99d6e7082 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -55,7 +55,7 @@ if (! $sortfield)
 	    $sortfield="u.lastname";
 }
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index bcb3cc65699..5e3e8d9342e 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -42,7 +42,7 @@ $result = restrictedArea($user, 'societe','','');
 $mesg = '';
 
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index f5e84dd5c04..2862d3ff862 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -64,7 +64,7 @@ if (! $sortfield)
 }
 
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index b1023839eca..907e927c5fd 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -49,7 +49,7 @@ $mesg = '';
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index 45ce972bbc3..3c9e721b3f6 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -42,7 +42,7 @@ $mesg = '';
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index a935b87bd58..b1768785f4c 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -73,7 +73,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index 510a0545372..0d51664f5db 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -42,7 +42,7 @@ $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index e9ae9073835..d0b58c9909c 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -57,7 +57,7 @@ $hookmanager->initHooks(array('productdocuments'));
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index 57545b07948..41c03756a44 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -40,7 +40,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = (GETPOST("page",'int')?GETPOST("page", 'int'):0);
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/product/list-with-listview.php b/htdocs/product/list-with-listview.php
index 1ebbf256c9c..512ae6d08a1 100644
--- a/htdocs/product/list-with-listview.php
+++ b/htdocs/product/list-with-listview.php
@@ -81,7 +81,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = (GETPOST("page",'int')?GETPOST("page", 'int'):0);
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 74f9c59cff3..7db6e876cf1 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -81,7 +81,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = (GETPOST("page",'int')?GETPOST("page", 'int'):0);
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index 5320e637316..79b347019d3 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -42,7 +42,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 if (! $sortfield) $sortfield="c";
 if (! $sortorder) $sortorder="DESC";
 $offset = $limit * $page ;
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index 1c72d5f6615..0e6056b91da 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -52,7 +52,7 @@ $mesg = '';
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index e2f5bccc430..1df5e9fa02f 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -49,7 +49,7 @@ $mesg = '';
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 506689a6001..06fd9d64916 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -53,7 +53,7 @@ $showmessage=GETPOST('showmessage');
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index ac2849fefcf..03979f3e9d3 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -54,7 +54,7 @@ $mesg = '';
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOST("page", 'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index 78d3c470cb1..7ea0800625f 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -65,7 +65,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 1a3d7c9edb2..006f882b820 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -64,7 +64,7 @@ $texte = '';
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $offset = $limit * $page ;
 
diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php
index 21dd30f560c..8777d83e419 100644
--- a/htdocs/projet/document.php
+++ b/htdocs/projet/document.php
@@ -57,7 +57,7 @@ if ($id > 0 || ! empty($ref)) {
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index 241ba0162e5..661776b9b4d 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -55,7 +55,7 @@ if (!$user->rights->projet->lire) accessforbidden();
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 4af874ce21e..fab7805fa41 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -89,7 +89,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index b35cc4d707d..b4ed0ab2928 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -62,7 +62,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/public/members/public_list.php b/htdocs/public/members/public_list.php
index ed1c8139e2f..232c6ef5aa3 100644
--- a/htdocs/public/members/public_list.php
+++ b/htdocs/public/members/public_list.php
@@ -83,7 +83,7 @@ $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/resource/document.php b/htdocs/resource/document.php
index 2d8e260d85a..f3c48f754ec 100644
--- a/htdocs/resource/document.php
+++ b/htdocs/resource/document.php
@@ -53,7 +53,7 @@ $result = restrictedArea($user, 'resource', $id, 'resource');
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index 32d13356654..d0eb936fcbb 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -54,7 +54,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 17018091951..056a67e5587 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -43,7 +43,7 @@ $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index 3802397509b..78af32c652a 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -53,7 +53,7 @@ $result = restrictedArea($user, 'societe', $id, '&societe');
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/supplier_proposal/document.php b/htdocs/supplier_proposal/document.php
index 62ff5e0c71a..cec276a6064 100644
--- a/htdocs/supplier_proposal/document.php
+++ b/htdocs/supplier_proposal/document.php
@@ -53,7 +53,7 @@ $result = restrictedArea($user, 'supplier_proposal', $id);
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index 2c10e2451a6..10aa98fee3f 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -84,7 +84,7 @@ $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;

From 0486a18972e42e3b3b4a8d5fa9cdf69d87d8e606 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 6 Jun 2017 11:07:35 +0200
Subject: [PATCH 093/438] Fix: use dolGetFirstLastname

---
 htdocs/accountancy/journal/bankjournal.php | 36 +++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 244331b76dc..cb3afb95f5a 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -166,7 +166,7 @@ if ($result) {
 	// one line for bank jounral = tabbq
 	// one line for thirdparty journal = tabtp
 	$i = 0;
-	while ( $i < $num ) 
+	while ( $i < $num )
 	{
 		$obj = $db->fetch_object($result);
 
@@ -187,7 +187,7 @@ if ($result) {
 
 		$tabuser[$obj->rowid] = array (
 				'id' => $obj->userid,
-				'name' => $obj->firstname.' '.$obj->lastname,
+				'name' => dolGetFirstLastname($obj->firstname, $obj->lastname),
 				'lastname' => $obj->lastname,
 				'firstname' => $obj->firstname,
 				'accountancy_code' => $compta_user,
@@ -212,7 +212,7 @@ if ($result) {
 
 			    if (in_array($links[$key]['type'], array('sc', 'payment_sc', 'payment', 'payment_supplier', 'payment_vat', 'payment_expensereport', 'banktransfert', 'payment_donation', 'payment_salary')))     // So we excluded 'company' here
 			    {
-			        // We save tabtype for a future use, to remember what kind of payment it is 
+			        // We save tabtype for a future use, to remember what kind of payment it is
 			        $tabtype[$obj->rowid] = $links[$key]['type'];
 			    }
 
@@ -296,7 +296,7 @@ if ($result) {
 
 		$tabbq[$obj->rowid][$compta_bank] += $obj->amount;
 
-		
+
 		// Check account number is ok
 		/*if ($action == 'writebookkeeping')        // Make test now in such a case
 		{
@@ -315,7 +315,7 @@ if ($result) {
     	        setEventMessages($langs->trans('ErrorAccountancyCodeOnThirdPartyNotDefined'), null, 'errors');
     		}
 		}*/
-		
+
 		// if($obj->socid)$tabtp[$obj->rowid][$compta_soc] += $obj->amount;
 
 		$i ++;
@@ -345,7 +345,7 @@ if (! $error && $action == 'writebookkeeping') {
 		if (! $errorforline)
 		{
 		    // Line into bank account
-    		foreach ( $tabbq[$key] as $k => $mt ) 
+    		foreach ( $tabbq[$key] as $k => $mt )
     		{
     			if ($mt) {
         		    $bookkeeping = new BookKeeping($db);
@@ -363,10 +363,10 @@ if (! $error && $action == 'writebookkeeping') {
         			$bookkeeping->code_journal = $journal;
         			$bookkeeping->fk_user_author = $user->id;
         			$bookkeeping->date_create = $now;
-        
+
         			if ($tabtype[$key] == 'payment') {
         			    $bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
-    
+
         				$sqlmid = 'SELECT fac.facnumber';
         				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac";
         				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON payfac.fk_facture=fac.rowid";
@@ -380,7 +380,7 @@ if (! $error && $action == 'writebookkeeping') {
         				}
         			} else if ($tabtype[$key] == 'payment_supplier') {
         			    $bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
-    
+
         				$sqlmid = 'SELECT facf.ref_supplier, facf.ref';
         				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf";
         				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON payfacf.fk_facturefourn=facf.rowid";
@@ -394,7 +394,7 @@ if (! $error && $action == 'writebookkeeping') {
         				}
         			} else if ($tabtype[$key] == 'payment_expensereport') {
         			    $bookkeeping->code_tiers = $tabuser[$key]['accountancy_code'];
-    
+
         				$sqlmid = 'SELECT e.ref';
         				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "expensereport as e";
         				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "payment_expensereport as payer ON payer.fk_expensereport=e.rowid";
@@ -456,7 +456,7 @@ if (! $error && $action == 'writebookkeeping') {
         			$bookkeeping->code_journal = $journal;
         			$bookkeeping->fk_user_author = $user->id;
         			$bookkeeping->date_create = $now;
-        
+
         			if (in_array($tabtype[$key], array('sc', 'payment_sc'))) {   // If payment is payment of social contribution
         				$bookkeeping->code_tiers = '';
         				$bookkeeping->numero_compte = $k;
@@ -510,7 +510,7 @@ if (! $error && $action == 'writebookkeeping') {
         				//$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
         				$bookkeeping->numero_compte = 'CodeNotDef';
         			}
-        
+
         			$result = $bookkeeping->create($user);
         			if ($result < 0) {
         				if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
@@ -529,7 +529,7 @@ if (! $error && $action == 'writebookkeeping') {
     			}
     		}
 		}
-		
+
 		if (! $errorforline)
 		{
             $db->commit();
@@ -551,7 +551,7 @@ if (! $error && $action == 'writebookkeeping') {
 	{
 	    setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
 	}
-	
+
 	$action = '';
 }
 
@@ -592,7 +592,7 @@ if ($action == 'export_csv') {
 			if ($reflabel == '(ExpenseReportPayment)') {
 				$reflabel = $langs->trans('Employee');
 			}
-			
+
 			$companystatic->id = $tabcompany[$key]['id'];
 			$companystatic->name = $tabcompany[$key]['name'];
 
@@ -761,7 +761,7 @@ if (empty($action) || $action == 'view') {
     print '<div class="tabsAction">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
     print '</div>';
-    
+
 	// TODO Avoid using js. We can use a direct link with $param
 	print '
 	<script type="text/javascript">
@@ -913,7 +913,7 @@ if (empty($action) || $action == 'view') {
 		$invoicestatic->ref = $val["ref"];
 		$invoicestatic->type = $val["type"];*/
 		// Bank
-		foreach ( $tabbq[$key] as $k => $mt ) 
+		foreach ( $tabbq[$key] as $k => $mt )
 		{
 		    print '<tr class="oddeven">';
 		    print "<td><!-- Bank bank.rowid=".$key."--></td>";
@@ -972,7 +972,7 @@ if (empty($action) || $action == 'view') {
         		{
         		    print '<span class="error">'.$langs->trans("WaitAccountNotDefined").'</span>';
         		}
-				else print length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE); 
+				else print length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE);
 				print "</td>";
 				print "<td>" . $reflabel . "</td>";
 				print "<td>&nbsp;</td>";

From 707a9e40c0e28ab48a9d48c362d40ce76894d0bb Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Tue, 6 Jun 2017 12:00:47 +0200
Subject: [PATCH 094/438] Fix can't use search on all extrafields on list

---
 htdocs/product/inventory/listview.class.php | 8 ++++++++
 htdocs/product/list-with-listview.php       | 2 +-
 htdocs/societe/list.php                     | 5 +++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/inventory/listview.class.php b/htdocs/product/inventory/listview.class.php
index 1c03d0b524f..ac5ec68f51a 100644
--- a/htdocs/product/inventory/listview.class.php
+++ b/htdocs/product/inventory/listview.class.php
@@ -41,6 +41,11 @@ class Listview
 		$this->totalRow=0;
 		
 		$this->TField=array();
+		
+		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+		$this->extrafields = new ExtraFields($this->db);
+		$this->extralabels = $this->extrafields->fetch_name_optionals_label('product');
+		$this->search_array_options=$this->extrafields->getOptionalsFromPost($this->extralabels,'','search_');
 	}
 
     /**
@@ -808,6 +813,9 @@ class Listview
 				  	}
 					else
 					{
+						// Overrive search from extrafields
+						// for the type as 'checkbox', 'chkbxlst', 'sellist' we should use code instead of id (example: I declare a 'chkbxlst' to have a link with dictionnairy, I have to extend it with the 'code' instead 'rowid')
+						if (isset($this->extralabels[$field])) $TParam['search'][$field] = $this->extrafields->showInputField($field, $this->search_array_options['search_options_'.$field], '', '', 'search_');
 						$visible = 1;
 					}
 		            
diff --git a/htdocs/product/list-with-listview.php b/htdocs/product/list-with-listview.php
index 1ebbf256c9c..6cd8533778e 100644
--- a/htdocs/product/list-with-listview.php
+++ b/htdocs/product/list-with-listview.php
@@ -611,7 +611,7 @@ else
     }
     
     //var_dump($arraytitle,$arrayhide);
-    $list=new Listview($db, 'products');
+    $list=new Listview($db, 'product');
     $listHTML = $list->render($sql,array(
     		'list'=>array(
     				'title'=>$texte
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 51d4b41e6bb..29c1ab3bd4c 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -840,6 +840,11 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 				if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
 				print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
 			}
+			else
+			{
+				// for the type as 'checkbox', 'chkbxlst', 'sellist' we should use code instead of id (example: I declare a 'chkbxlst' to have a link with dictionnairy, I have to extend it with the 'code' instead 'rowid')
+				echo $extrafields->showInputField($key, $search_array_options['search_options_'.$key], '', '', 'search_');
+			}
 			print '</td>';
 		}
    }

From c041fe21650458783bcee40b7f04ef7a95468df1 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Wed, 7 Jun 2017 06:03:52 +0200
Subject: [PATCH 095/438] Fix : Missing ref of getNomUrl in AccountLine (Bank)

---
 htdocs/compta/bank/class/account.class.php |  3 ++-
 htdocs/compta/salaries/card.php            | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index b77ed4db1a5..f4067a63a9c 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2005-2010	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2013		Florian Henry			<florian.henry@open-concept.pro>
  * Copyright (C) 2015-2016	Marcos García			<marcosgdf@gmail.com>
- * Copyright (C) 2015		Alexandre Spangaro		<aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2015		Alexandre Spangaro		<aspangaro@zendsi.com>
  * Copyright (C) 2016		Ferran Marcet   		<fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -2028,6 +2028,7 @@ class AccountLine extends CommonObject
             $result.=$langs->trans("BankAccount").': ';
             $accountstatic=new Account($this->db);
             $accountstatic->id=$this->fk_account;
+			$accountstatic->ref=$this->bank_account_ref;
             $accountstatic->label=$this->bank_account_label;
             $result.=$accountstatic->getNomUrl(0).', ';
         }
diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php
index 68f59d03cfa..b7cc64927a9 100644
--- a/htdocs/compta/salaries/card.php
+++ b/htdocs/compta/salaries/card.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2011-2017 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+/* Copyright (C) 2011-2017 Alexandre Spangaro   <aspangaro@zendsi.com>
  * Copyright (C) 2014      Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
  * Copyright (C) 2015      Charlie BENKE		<charlie@patas-monkey.com> 
@@ -19,9 +19,9 @@
  */
 
 /**
- *	    \file       htdocs/compta/salaries/card.php
- *      \ingroup    salaries
- *		\brief      Page of salaries payments
+ *	\file       htdocs/compta/salaries/card.php
+ *	\ingroup    salaries
+ *	\brief      Page of salaries payments
  */
 
 require '../../main.inc.php';
@@ -72,7 +72,7 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
 	$datesp=dol_mktime(12,0,0, $_POST["datespmonth"], $_POST["datespday"], $_POST["datespyear"]);
 	$dateep=dol_mktime(12,0,0, $_POST["dateepmonth"], $_POST["dateepday"], $_POST["dateepyear"]);
 	if (empty($datev)) $datev=$datep;
-	
+
 	$object->accountid=GETPOST("accountid") > 0 ? GETPOST("accountid","int") : 0;
 	$object->fk_user=GETPOST("fk_user") > 0 ? GETPOST("fk_user","int") : 0;
 	$object->datev=$datev;
@@ -228,8 +228,8 @@ if ($action == 'create')
 
 	print load_fiche_titre($langs->trans("NewSalaryPayment"),'', 'title_accountancy.png');
 
-	dol_fiche_head('', '');
-	
+	dol_fiche_head('');
+
 	print '<table class="border" width="100%">';
 
 	// Date payment
@@ -340,12 +340,12 @@ if ($id)
 	$morehtmlref.=$langs->trans('Employee') . ' : ' . $userstatic->getNomUrl(1);
 	$morehtmlref.='</div>';
 
-    dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', '');
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', '');
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border" width="100%">';
+	print '<table class="border" width="100%">';
 
 	// Label
 	print '<tr><td class="titlefield">'.$langs->trans("Label").'</td><td>'.$object->label.'</td></tr>';
@@ -405,7 +405,7 @@ if ($id)
 	{
 		if (! empty($user->rights->salaries->delete))
 		{
-			print '<a class="butActionDelete" href="card.php?id='.$object->id.'&action=delete">'.$langs->trans("Delete").'</a>';
+			print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete">'.$langs->trans("Delete").'</a>';
 		}
 		else
 		{

From a96049d0e6dd74697f8407158a45e24ab6cc41f1 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Wed, 7 Jun 2017 06:06:53 +0200
Subject: [PATCH 096/438] Spaces!!!

---
 htdocs/compta/bank/class/account.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index f4067a63a9c..92f2cfc584c 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2005-2010	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2013		Florian Henry			<florian.henry@open-concept.pro>
  * Copyright (C) 2015-2016	Marcos García			<marcosgdf@gmail.com>
- * Copyright (C) 2015		Alexandre Spangaro		<aspangaro@zendsi.com>
+ * Copyright (C) 2015-2017	Alexandre Spangaro		<aspangaro@zendsi.com>
  * Copyright (C) 2016		Ferran Marcet   		<fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -2028,7 +2028,7 @@ class AccountLine extends CommonObject
             $result.=$langs->trans("BankAccount").': ';
             $accountstatic=new Account($this->db);
             $accountstatic->id=$this->fk_account;
-			$accountstatic->ref=$this->bank_account_ref;
+            $accountstatic->ref=$this->bank_account_ref;
             $accountstatic->label=$this->bank_account_label;
             $result.=$accountstatic->getNomUrl(0).', ';
         }

From 0805c693aeea312e7e3a11aece83a592541aa10c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Jun 2017 10:55:39 +0200
Subject: [PATCH 097/438] Fix restore of last_search_value ko

---
 htdocs/projet/class/task.class.php |  69 ++++++------
 htdocs/projet/tasks/contact.php    |  54 +++++-----
 htdocs/projet/tasks/document.php   |  56 +++++-----
 htdocs/projet/tasks/note.php       |  58 +++++-----
 htdocs/projet/tasks/task.php       |  74 ++++++-------
 htdocs/projet/tasks/time.php       | 168 ++++++++++++++---------------
 6 files changed, 242 insertions(+), 237 deletions(-)

diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index e1025241115..8124f500bd6 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -36,7 +36,7 @@ class Task extends CommonObject
     public $fk_element='fk_task';
     public $picto = 'task';
     protected $childtables=array('projet_task_time');    // To test if we can delete object
-    
+
     var $fk_task_parent;
     var $label;
     var $description;
@@ -59,7 +59,7 @@ class Task extends CommonObject
 	var $timespent_nblinesnull;
 	var $timespent_nblines;
 	// For detail of lines of timespent record, there is the property ->lines in common
-	
+
 	// Var used to call method addTimeSpent(). Bad practice.
     var $timespent_id;
     var $timespent_duration;
@@ -100,7 +100,7 @@ class Task extends CommonObject
         // Clean parameters
         $this->label = trim($this->label);
         $this->description = trim($this->description);
-        
+
         // Check parameters
         // Put here code to add control on parameters values
 
@@ -226,7 +226,7 @@ class Task extends CommonObject
         if ($resql)
         {
             $num_rows = $this->db->num_rows($resql);
-            
+
             if ($num_rows)
             {
                 $obj = $this->db->fetch_object($resql);
@@ -409,7 +409,7 @@ class Task extends CommonObject
             $this->db->rollback();
             return 0;
         }
-        
+
         if (! $error)
         {
             // Delete linked contacts
@@ -534,7 +534,7 @@ class Task extends CommonObject
             return -1;
         }
     }
-    
+
 	/**
      *	Return nb of time spent
      *
@@ -579,14 +579,15 @@ class Task extends CommonObject
      * 	@param	int		$addlabel		0=Default, 1=Add label into string, >1=Add first chars into string
      *  @param	string	$sep			Separator between ref and label if option addlabel is set
      *  @param	int   	$notooltip		1=Disable tooltip
+     *  @param  int     $save_lastsearch_value    -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
      *	@return	string					Chaine avec URL
      */
-    function getNomUrl($withpicto=0,$option='',$mode='task', $addlabel=0, $sep=' - ', $notooltip=0)
+    function getNomUrl($withpicto=0,$option='',$mode='task', $addlabel=0, $sep=' - ', $notooltip=0, $save_lastsearch_value=-1)
     {
         global $conf, $langs, $user;
 
         if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
-        
+
         $result='';
         $label = '<u>' . $langs->trans("ShowTask") . '</u>';
         if (! empty($this->ref))
@@ -597,8 +598,12 @@ class Task extends CommonObject
         {
         	$label .= "<br>".get_date_range($this->date_start,$this->date_end,'',$langs,0);
         }
-        
+
         $url = DOL_URL_ROOT.'/projet/tasks/'.$mode.'.php?id='.$this->id.($option=='withproject'?'&withproject=1':'');
+        // Add param to save lastsearch_values or not
+        $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+        if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+        if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
 
         $linkclose = '';
         if (empty($notooltip))
@@ -611,11 +616,11 @@ class Task extends CommonObject
             $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
             $linkclose.=' class="classfortooltip"';
         }
-        
+
         $linkstart = '<a href="'.$url.'"';
         $linkstart.=$linkclose.'>';
         $linkend='</a>';
-        
+
         $picto='projecttask';
 
         if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
@@ -706,7 +711,7 @@ class Task extends CommonObject
                 $sql.= ", ".MAIN_DB_PREFIX."element_contact as ec2";
                 $sql.= ", ".MAIN_DB_PREFIX."c_type_contact as ctc2";
             }
-            else 
+            else
             {
                 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t on t.fk_projet = p.rowid";
             }
@@ -790,7 +795,7 @@ class Task extends CommonObject
                     $tasks[$i]->date_start		= $this->db->jdate($obj->date_start);
                     $tasks[$i]->date_end		= $this->db->jdate($obj->date_end);
                     $tasks[$i]->rang	   		= $obj->rang;
-                    
+
                     $tasks[$i]->thirdparty_id	= $obj->thirdparty_id;
                     $tasks[$i]->thirdparty_name	= $obj->thirdparty_name;
                 }
@@ -963,7 +968,7 @@ class Task extends CommonObject
             $tasktime_id = $this->db->last_insert_id(MAIN_DB_PREFIX."projet_task_time");
             $ret = $tasktime_id;
 			$this->timespent_id = $ret;
-			
+
             if (! $notrigger)
             {
                 // Call trigger
@@ -1027,10 +1032,10 @@ class Task extends CommonObject
         global $langs;
 
         $id=$this->id;
-        if (empty($id)) 
+        if (empty($id))
         {
             dol_syslog("getSummaryOfTimeSpent called on a not loaded task", LOG_ERR);
-            return -1; 
+            return -1;
         }
 
         $result=array();
@@ -1045,7 +1050,7 @@ class Task extends CommonObject
         $sql.= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
         $sql.= " WHERE t.fk_task = ".$id;
         if ($userid > 0) $sql.=" AND t.fk_user = ".$userid;
-        
+
         dol_syslog(get_class($this)."::getSummaryOfTimeSpent", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
@@ -1055,14 +1060,14 @@ class Task extends CommonObject
             $result['min_date'] = $obj->min_date;               // deprecated. use the ->timespent_xxx instead
             $result['max_date'] = $obj->max_date;               // deprecated. use the ->timespent_xxx instead
             $result['total_duration'] = $obj->total_duration;   // deprecated. use the ->timespent_xxx instead
-            
+
             $this->timespent_min_date=$this->db->jdate($obj->min_date);
             $this->timespent_max_date=$this->db->jdate($obj->max_date);
             $this->timespent_total_duration=$obj->total_duration;
             $this->timespent_total_amount=$obj->total_amount;
             $this->timespent_nblinesnull=($obj->nblinesnull?$obj->nblinesnull:0);
             $this->timespent_nblines=($obj->nblines?$obj->nblines:0);
-            
+
             $this->db->free($resql);
         }
         else
@@ -1357,7 +1362,7 @@ class Task extends CommonObject
 		$clone_task->fetch($fromid);
 		$clone_task->fetch_optionals();
 		//var_dump($clone_task->array_options);exit;
-		
+
 		$origin_task->fetch($fromid);
 
 		$defaultref='';
@@ -1680,7 +1685,7 @@ class Task extends CommonObject
 		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	}
 
-	
+
 	/**
 	 * Load indicators for dashboard (this->nbtodo and this->nbtodolate)
 	 *
@@ -1690,12 +1695,12 @@ class Task extends CommonObject
 	function load_board($user)
 	{
 	    global $conf, $langs;
-	
+
 	    $mine=0; $socid=$user->societe_id;
-	    
+
 	    $projectstatic = new Project($this->db);
 	    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,1,$socid);
-	    
+
 	    // List of tasks (does not care about permissions. Filtering will be done later)
 	    $sql = "SELECT p.rowid as projectid, p.fk_statut as projectstatus,";
 	    $sql.= " t.rowid as taskid, t.progress as progress, t.fk_statut as status,";
@@ -1718,29 +1723,29 @@ class Task extends CommonObject
 	    if ($resql)
 	    {
 	        $task_static = new Task($this->db);
-	
+
 	        $response = new WorkboardResponse();
 	        $response->warning_delay = $conf->projet->task->warning_delay/60/60/24;
 	        $response->label = $langs->trans("OpenedTasks");
 	        if ($user->rights->projet->all->lire) $response->url = DOL_URL_ROOT.'/projet/tasks/list.php?mainmenu=project';
 	        else $response->url = DOL_URL_ROOT.'/projet/tasks/list.php?mode=mine&amp;mainmenu=project';
 	        $response->img = img_object('',"task");
-	
+
 	        // This assignment in condition is not a bug. It allows walking the results.
 	        while ($obj=$this->db->fetch_object($resql))
 	        {
 	            $response->nbtodo++;
-	
+
 	            $task_static->projectstatus = $obj->projectstatus;
 	            $task_static->progress = $obj->progress;
 	            $task_static->fk_statut = $obj->status;
 	            $task_static->date_end = $this->db->jdate($obj->datee);
-	
+
 	            if ($task_static->hasDelay()) {
 	                $response->nbtodolate++;
 	            }
 	        }
-	
+
 	        return $response;
 	    }
 	    else
@@ -1749,7 +1754,7 @@ class Task extends CommonObject
 	        return -1;
 	    }
 	}
-	
+
 	/**
 	 * Is the task delayed?
 	 *
@@ -1758,7 +1763,7 @@ class Task extends CommonObject
 	public function hasDelay()
 	{
 	    global $conf;
-	
+
         if (! ($this->progress >= 0 && $this->progress < 100)) {
             return false;
         }
@@ -1768,5 +1773,5 @@ class Task extends CommonObject
         $datetouse = ($this->date_end > 0) ? $this->date_end : ($this->datee > 0 ? $this->datee : 0);
 
         return ($datetouse > 0 && ($datetouse < ($now - $conf->projet->task->warning_delay)));
-	}	
+	}
 }
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index 9160f2b3795..d4029847534 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -174,7 +174,7 @@ if ($id > 0 || ! empty($ref))
 	if ($object->fetch($id, $ref) > 0)
 	{
 	    $id = $object->id;     // So when doing a search from ref, id is also set correctly.
-	    
+
 		$result=$projectstatic->fetch($object->fk_project);
 		if (! empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
 
@@ -192,83 +192,83 @@ if ($id > 0 || ! empty($ref))
     		$param=($mode=='mine'?'&mode=mine':'');
 
 			// Project card
-    
-            $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php">'.$langs->trans("BackToList").'</a>';
-            
+
+            $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+
             $morehtmlref='<div class="refidno">';
             // Title
             $morehtmlref.=$projectstatic->title;
             // Thirdparty
-            if ($projectstatic->thirdparty->id > 0) 
+            if ($projectstatic->thirdparty->id > 0)
             {
                 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $projectstatic->thirdparty->getNomUrl(1, 'project');
             }
             $morehtmlref.='</div>';
-            
+
             // Define a complementary filter for search of next/prev ref.
             if (! $user->rights->projet->all->lire)
             {
                 $objectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,0);
                 $projectstatic->next_prev_filter=" rowid in (".(count($objectsListId)?join(',',array_keys($objectsListId)):'0').")";
             }
-            
+
             dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-        
+
             print '<div class="fichecenter">';
             print '<div class="fichehalfleft">';
             print '<div class="underbanner clearboth"></div>';
-        
+
             print '<table class="border" width="100%">';
-        
+
             // Visibility
             print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
             if ($projectstatic->public) print $langs->trans('SharedProject');
             else print $langs->trans('PrivateProject');
             print '</td></tr>';
-        
+
             // Date start - end
             print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
             print dol_print_date($projectstatic->date_start,'day');
             $end=dol_print_date($projectstatic->date_end,'day');
             if ($end) print ' - '.$end;
             print '</td></tr>';
-            
+
             // Budget
             print '<tr><td>'.$langs->trans("Budget").'</td><td>';
             if (strcmp($projectstatic->budget_amount, '')) print price($projectstatic->budget_amount,'',$langs,1,0,0,$conf->currency);
             print '</td></tr>';
-        
+
             // Other attributes
             $cols = 2;
             //include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
-            
+
             print '</table>';
-            
+
             print '</div>';
             print '<div class="fichehalfright">';
             print '<div class="ficheaddleft">';
             print '<div class="underbanner clearboth"></div>';
-            
+
             print '<table class="border" width="100%">';
-            
+
             // Description
             print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
             print nl2br($projectstatic->description);
             print '</td></tr>';
-        
+
             // Categories
             if($conf->categorie->enabled) {
                 print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td>';
                 print $form->showCategories($projectstatic->id,'project',1);
                 print "</td></tr>";
             }
-            
+
             print '</table>';
-            
+
             print '</div>';
             print '</div>';
             print '</div>';
-            
+
             print '<div class="clearboth"></div>';
 
     		dol_fiche_end();
@@ -284,16 +284,16 @@ if ($id > 0 || ! empty($ref))
 
 		$param=(GETPOST('withproject')?'&withproject=1':'');
 		$linkback=GETPOST('withproject')?'<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'">'.$langs->trans("BackToList").'</a>':'';
-		
+
 		if (! GETPOST('withproject') || empty($projectstatic->id))
 		{
 		    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1);
 		    $object->next_prev_filter=" fk_projet in (".$projectsListId.")";
 		}
 		else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
-		
+
 		$morehtmlref='';
-		
+
 		// Project
 		if (empty($withproject))
 		{
@@ -301,13 +301,13 @@ if ($id > 0 || ! empty($ref))
 		    $morehtmlref.=$langs->trans("Project").': ';
 		    $morehtmlref.=$projectstatic->getNomUrl(1);
 		    $morehtmlref.='<br>';
-		
+
 		    // Third party
 		    $morehtmlref.=$langs->trans("ThirdParty").': ';
 		    $morehtmlref.=$projectstatic->thirdparty->getNomUrl(1);
 		    $morehtmlref.='</div>';
 		}
-		
+
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param, 0, '', '', 1);
 
 		dol_fiche_end();
@@ -385,7 +385,7 @@ if ($id > 0 || ! empty($ref))
 				print '<input type="hidden" name="id" value="'.$object->id.'">';
 				if ($withproject) print '<input type="hidden" name="withproject" value="'.$withproject.'">';
 
-				
+
 				print '<tr class="oddeven">';
 
 				print '<td class="nowrap">';
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index 661776b9b4d..649e1efd575 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -136,84 +136,84 @@ if ($object->id > 0)
 
 		// Project card
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php">'.$langs->trans("BackToList").'</a>';
-        
+        $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+
         $morehtmlref='<div class="refidno">';
         // Title
         $morehtmlref.=$projectstatic->title;
         // Thirdparty
-        if ($projectstatic->thirdparty->id > 0) 
+        if ($projectstatic->thirdparty->id > 0)
         {
             $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $projectstatic->thirdparty->getNomUrl(1, 'project');
         }
         $morehtmlref.='</div>';
-        
+
         // Define a complementary filter for search of next/prev ref.
         if (! $user->rights->projet->all->lire)
         {
             $objectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,0);
             $projectstatic->next_prev_filter=" rowid in (".(count($objectsListId)?join(',',array_keys($objectsListId)):'0').")";
         }
-        
+
         dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-    
+
         print '<div class="fichecenter">';
         print '<div class="fichehalfleft">';
         print '<div class="underbanner clearboth"></div>';
-    
+
         print '<table class="border" width="100%">';
-    
+
         // Visibility
         print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
         if ($projectstatic->public) print $langs->trans('SharedProject');
         else print $langs->trans('PrivateProject');
         print '</td></tr>';
-    
+
         // Date start - end
         print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
         print dol_print_date($projectstatic->date_start,'day');
         $end=dol_print_date($projectstatic->date_end,'day');
         if ($end) print ' - '.$end;
         print '</td></tr>';
-        
+
         // Budget
         print '<tr><td>'.$langs->trans("Budget").'</td><td>';
         if (strcmp($projectstatic->budget_amount, '')) print price($projectstatic->budget_amount,'',$langs,1,0,0,$conf->currency);
         print '</td></tr>';
-    
+
         // Other attributes
         $cols = 2;
         //include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
-        
+
         print '</table>';
-        
+
         print '</div>';
         print '<div class="fichehalfright">';
         print '<div class="ficheaddleft">';
         print '<div class="underbanner clearboth"></div>';
-        
+
         print '<table class="border" width="100%">';
-        
+
         // Description
         print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
         print nl2br($projectstatic->description);
         print '</td></tr>';
-    
+
         // Categories
         if($conf->categorie->enabled) {
             print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td>';
             print $form->showCategories($projectstatic->id,'project',1);
             print "</td></tr>";
         }
-        
+
         print '</table>';
-        
+
         print '</div>';
         print '</div>';
         print '</div>';
-        
+
         print '<div class="clearboth"></div>';
-        
+
 		dol_fiche_end();
 	}
 
@@ -227,7 +227,7 @@ if ($object->id > 0)
 	{
 		$totalsize+=$file['size'];
 	}
-	
+
 	$param=(GETPOST('withproject')?'&withproject=1':'');
 	$linkback=GETPOST('withproject')?'<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'">'.$langs->trans("BackToList").'</a>':'';
 
@@ -237,9 +237,9 @@ if ($object->id > 0)
 	    $object->next_prev_filter=" fk_projet in (".$projectsListId.")";
 	}
 	else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
-	
+
 	$morehtmlref='';
-	
+
 	// Project
 	if (empty($withproject))
 	{
@@ -247,17 +247,17 @@ if ($object->id > 0)
 	    $morehtmlref.=$langs->trans("Project").': ';
 	    $morehtmlref.=$projectstatic->getNomUrl(1);
 	    $morehtmlref.='<br>';
-	
+
 	    // Third party
 	    $morehtmlref.=$langs->trans("ThirdParty").': ';
 	    $morehtmlref.=$projectstatic->thirdparty->getNomUrl(1);
 	    $morehtmlref.='</div>';
 	}
-	
+
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
-	
+
 	print '<div class="fichecenter">';
-	
+
 	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border" width="100%">';
 
@@ -268,7 +268,7 @@ if ($object->id > 0)
 	print "</table>\n";
 
 	print '</div>';
-	
+
 	dol_fiche_end();
 
 	print '<br>';
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index 0d6df7d85fd..13a8979ae91 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -114,9 +114,9 @@ if ($object->id > 0)
 
 		$param=($mode=='mine'?'&mode=mine':'');
 		// Project card
-		
-		$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php">'.$langs->trans("BackToList").'</a>';
-		
+
+		$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+
 		$morehtmlref='<div class="refidno">';
 		// Title
 		$morehtmlref.=$projectstatic->title;
@@ -126,92 +126,92 @@ if ($object->id > 0)
 		    $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $projectstatic->thirdparty->getNomUrl(1, 'project');
 		}
 		$morehtmlref.='</div>';
-		
+
 		// Define a complementary filter for search of next/prev ref.
 		if (! $user->rights->projet->all->lire)
 		{
 		    $objectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,0);
 		    $projectstatic->next_prev_filter=" rowid in (".(count($objectsListId)?join(',',array_keys($objectsListId)):'0').")";
 		}
-		
+
 		dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-		
+
 		print '<div class="fichecenter">';
 		print '<div class="fichehalfleft">';
 		print '<div class="underbanner clearboth"></div>';
-		
+
 		print '<table class="border" width="100%">';
-		
+
 		// Visibility
 		print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
 		if ($projectstatic->public) print $langs->trans('SharedProject');
 		else print $langs->trans('PrivateProject');
 		print '</td></tr>';
-		
+
 		// Date start - end
 		print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
 		print dol_print_date($projectstatic->date_start,'day');
 		$end=dol_print_date($projectstatic->date_end,'day');
 		if ($end) print ' - '.$end;
 		print '</td></tr>';
-		
+
 		// Budget
 		print '<tr><td>'.$langs->trans("Budget").'</td><td>';
 		if (strcmp($projectstatic->budget_amount, '')) print price($projectstatic->budget_amount,'',$langs,1,0,0,$conf->currency);
 		print '</td></tr>';
-		
+
 		// Other attributes
 		$cols = 2;
 		//include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
-		
+
 		print '</table>';
-		
+
 		print '</div>';
 		print '<div class="fichehalfright">';
 		print '<div class="ficheaddleft">';
 		print '<div class="underbanner clearboth"></div>';
-		
+
 		print '<table class="border" width="100%">';
-		
+
 		// Description
 		print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
 		print nl2br($projectstatic->description);
 		print '</td></tr>';
-		
+
 		// Categories
 		if($conf->categorie->enabled) {
 		    print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td>';
 		    print $form->showCategories($projectstatic->id,'project',1);
 		    print "</td></tr>";
 		}
-		
+
 		print '</table>';
-		
+
 		print '</div>';
 		print '</div>';
 		print '</div>';
-		
+
 		print '<div class="clearboth"></div>';
-		
+
 		dol_fiche_end();
 	}
 
 	$head = task_prepare_head($object);
 	dol_fiche_head($head, 'task_notes', $langs->trans('Task'), -1, 'projecttask');
 
-	
+
 	$param=(GETPOST('withproject')?'&withproject=1':'');
 	$linkback=GETPOST('withproject')?'<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'">'.$langs->trans("BackToList").'</a>':'';
-	
+
 	if (! GETPOST('withproject') || empty($projectstatic->id))
 	{
 	    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1);
 	    $object->next_prev_filter=" fk_projet in (".$projectsListId.")";
 	}
 	else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
-	
+
 	$morehtmlref='';
-	
+
 	// Project
 	if (empty($withproject))
 	{
@@ -219,17 +219,17 @@ if ($object->id > 0)
 	    $morehtmlref.=$langs->trans("Project").': ';
 	    $morehtmlref.=$projectstatic->getNomUrl(1);
 	    $morehtmlref.='<br>';
-	
+
 	    // Third party
 	    $morehtmlref.=$langs->trans("ThirdParty").': ';
 	    $morehtmlref.=$projectstatic->thirdparty->getNomUrl(1);
 	    $morehtmlref.='</div>';
 	}
-	
+
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
-	
+
 	print '<div class="fichecenter">';
-	
+
     print '<div class="underbanner clearboth"></div>';
 
 	$cssclass='titlefield';
@@ -237,7 +237,7 @@ if ($object->id > 0)
 	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
 	print '</div>';
-	
+
 	dol_fiche_end();
 }
 
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 5f493167fd8..9211d75f499 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -226,85 +226,85 @@ if ($id > 0 || ! empty($ref))
 			$param=($mode=='mine'?'&mode=mine':'');
 
 			// Project card
-    
-            $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php">'.$langs->trans("BackToList").'</a>';
-            
+
+            $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+
             $morehtmlref='<div class="refidno">';
             // Title
             $morehtmlref.=$projectstatic->title;
             // Thirdparty
-            if ($projectstatic->thirdparty->id > 0) 
+            if ($projectstatic->thirdparty->id > 0)
             {
                 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $projectstatic->thirdparty->getNomUrl(1, 'project');
             }
             $morehtmlref.='</div>';
-            
+
             // Define a complementary filter for search of next/prev ref.
             if (! $user->rights->projet->all->lire)
             {
                 $objectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,0);
                 $projectstatic->next_prev_filter=" rowid in (".(count($objectsListId)?join(',',array_keys($objectsListId)):'0').")";
             }
-            
+
             dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-        
+
             print '<div class="fichecenter">';
             print '<div class="fichehalfleft">';
             print '<div class="underbanner clearboth"></div>';
-        
+
             print '<table class="border" width="100%">';
-        
+
             // Visibility
             print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
             if ($projectstatic->public) print $langs->trans('SharedProject');
             else print $langs->trans('PrivateProject');
             print '</td></tr>';
-        
+
             // Date start - end
             print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
             print dol_print_date($projectstatic->date_start,'day');
             $end=dol_print_date($projectstatic->date_end,'day');
             if ($end) print ' - '.$end;
             print '</td></tr>';
-            
+
             // Budget
             print '<tr><td>'.$langs->trans("Budget").'</td><td>';
             if (strcmp($projectstatic->budget_amount, '')) print price($projectstatic->budget_amount,'',$langs,1,0,0,$conf->currency);
             print '</td></tr>';
-        
+
             // Other attributes
             $cols = 2;
             //include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
-            
+
             print '</table>';
-            
+
             print '</div>';
             print '<div class="fichehalfright">';
             print '<div class="ficheaddleft">';
             print '<div class="underbanner clearboth"></div>';
-            
+
             print '<table class="border" width="100%">';
-            
+
             // Description
             print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
             print nl2br($projectstatic->description);
             print '</td></tr>';
-        
+
             // Categories
             if($conf->categorie->enabled) {
                 print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td>';
                 print $form->showCategories($projectstatic->id,'project',1);
                 print "</td></tr>";
             }
-            
+
             print '</table>';
-            
+
             print '</div>';
             print '</div>';
             print '</div>';
-            
+
             print '<div class="clearboth"></div>';
-        
+
 			dol_fiche_end();
 
 			print '<br>';
@@ -430,7 +430,7 @@ if ($id > 0 || ! empty($ref))
 			 * Fiche tache en mode visu
 			 */
 			$param=($withproject?'&withproject=1':'');
-			$linkback=$withproject?'<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'">'.$langs->trans("BackToList").'</a>':'';
+			$linkback=$withproject?'<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'&restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>':'';
 
 			dol_fiche_head($head, 'task_task', $langs->trans("Task"), -1, 'projecttask');
 
@@ -445,9 +445,9 @@ if ($id > 0 || ! empty($ref))
 			    $object->next_prev_filter=" fk_projet in (".$projectsListId.")";
 			}
 			else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
-			
+
 			$morehtmlref='';
-			
+
 			// Project
 			if (empty($withproject))
 			{
@@ -455,18 +455,18 @@ if ($id > 0 || ! empty($ref))
 			    $morehtmlref.=$langs->trans("Project").': ';
 			    $morehtmlref.=$projectstatic->getNomUrl(1);
 			    $morehtmlref.='<br>';
-			
+
 			    // Third party
 			    $morehtmlref.=$langs->trans("ThirdParty").': ';
 			    $morehtmlref.=$projectstatic->thirdparty->getNomUrl(1);
 			    $morehtmlref.='</div>';
 			}
-			
+
 			dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
-			
+
 			print '<div class="fichecenter">';
-			
-			print '<div class="underbanner clearboth"></div>';			
+
+			print '<div class="underbanner clearboth"></div>';
 			print '<table class="border" width="100%">';
 
 			// Date start - Date end
@@ -520,9 +520,9 @@ if ($id > 0 || ! empty($ref))
 			}
 
 			print '</table>';
-            
+
 			print '</div>';
-            
+
 			dol_fiche_end();
 		}
 
@@ -532,7 +532,7 @@ if ($id > 0 || ! empty($ref))
 			/*
 			 * Actions
  			 */
-			
+
 		    print '<div class="tabsAction">';
 
 		    $parameters = array();
@@ -549,7 +549,7 @@ if ($id > 0 || ! empty($ref))
 				{
 					print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('Modify').'</a>';
 				}
-	
+
 				// Delete
 				if ($user->rights->projet->supprimer)
 				{
@@ -566,13 +566,13 @@ if ($id > 0 || ! empty($ref))
 				{
 					print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('Delete').'</a>';
 				}
-	
+
 				print '</div>';
 		    }
-		    
+
     		print '<div class="fichecenter"><div class="fichehalfleft">';
     		print '<a name="builddoc"></a>'; // ancre
-    		
+
 			/*
 			 * Documents generes
 			 */
@@ -587,7 +587,7 @@ if ($id > 0 || ! empty($ref))
 			print $formfile->showdocuments('project_task',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf);
 
 			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-				
+
 			print '</div></div></div>';
 		}
 	}
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index b4ed0ab2928..ecd15a8aa3b 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -190,7 +190,7 @@ if ($action == 'updateline' && ! $_POST["cancel"] && $user->rights->projet->lire
 	{
 		$object->fetch($id, $ref);
 		// TODO Check that ($task_time->fk_user == $user->id || in_array($task_time->fk_user, $childids))
-		
+
 		$object->timespent_id = $_POST["lineid"];
 		$object->timespent_note = $_POST["timespent_note_line"];
 		$object->timespent_old_duration = $_POST["old_duration"];
@@ -262,10 +262,10 @@ $projectidforalltimes=0;
 if (GETPOST('projectid'))
 {
     $projectidforalltimes=GETPOST('projectid','int');
-    
+
 }
 
-    
+
 /*
  * View
  */
@@ -292,10 +292,10 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		$result=$projectstatic->fetch($object->fk_project);
 		if (! empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
 		$res=$projectstatic->fetch_optionals($object->id,$extralabels_projet);
-		
+
 		$object->project = clone $projectstatic;
     }
-	
+
     $userWrite = $projectstatic->restrictedProjectArea($user,'write');
 
 	if ($projectstatic->id > 0)
@@ -310,88 +310,88 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 			$param=($mode=='mine'?'&mode=mine':'');
 
 			// Project card
-    
-            $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php">'.$langs->trans("BackToList").'</a>';
-            
+
+            $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+
             $morehtmlref='<div class="refidno">';
             // Title
             $morehtmlref.=$projectstatic->title;
             // Thirdparty
-            if ($projectstatic->thirdparty->id > 0) 
+            if ($projectstatic->thirdparty->id > 0)
             {
                 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $projectstatic->thirdparty->getNomUrl(1, 'project');
             }
             $morehtmlref.='</div>';
-            
+
             // Define a complementary filter for search of next/prev ref.
             if (! $user->rights->projet->all->lire)
             {
                 $objectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,0);
                 $projectstatic->next_prev_filter=" rowid in (".(count($objectsListId)?join(',',array_keys($objectsListId)):'0').")";
             }
-            
+
             dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-        
+
             print '<div class="fichecenter">';
             print '<div class="fichehalfleft">';
             print '<div class="underbanner clearboth"></div>';
-        
+
             print '<table class="border" width="100%">';
-        
+
             // Visibility
             print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
             if ($projectstatic->public) print $langs->trans('SharedProject');
             else print $langs->trans('PrivateProject');
             print '</td></tr>';
-        
+
             // Date start - end
             print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
             print dol_print_date($projectstatic->date_start,'day');
             $end=dol_print_date($projectstatic->date_end,'day');
             if ($end) print ' - '.$end;
             print '</td></tr>';
-            
+
             // Budget
             print '<tr><td>'.$langs->trans("Budget").'</td><td>';
             if (strcmp($projectstatic->budget_amount, '')) print price($projectstatic->budget_amount,'',$langs,1,0,0,$conf->currency);
             print '</td></tr>';
-        
+
             // Other attributes
             $cols = 2;
             //include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
-            
+
             print '</table>';
-            
+
             print '</div>';
             print '<div class="fichehalfright">';
             print '<div class="ficheaddleft">';
             print '<div class="underbanner clearboth"></div>';
-            
+
             print '<table class="border" width="100%">';
-            
+
             // Description
             print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
             print nl2br($projectstatic->description);
             print '</td></tr>';
-        
+
             // Categories
             if($conf->categorie->enabled) {
                 print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td>';
                 print $form->showCategories($projectstatic->id,'project',1);
                 print "</td></tr>";
             }
-            
+
             print '</table>';
-            
+
             print '</div>';
             print '</div>';
             print '</div>';
-            
+
             print '<div class="clearboth"></div>';
 
 			dol_fiche_end();
-			
-			
+
+
 			/*
 			 * Actions
 			 */
@@ -399,7 +399,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 			if ((empty($id) && empty($ref)) || ! empty($projectidforalltimes))
 			{
     			print '<div class="tabsAction">';
-    			
+
     			if ($user->rights->projet->all->creer || $user->rights->projet->creer)
     			{
     			    if ($object->public || $userWrite > 0)
@@ -415,12 +415,12 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
     			{
     			    print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('AddTask').'</a>';
     			}
-    			
+
     			print '</div>';
 			}
 		}
 	}
-	
+
 	if (empty($projectidforalltimes))
 	{
 		$head=task_prepare_head($object);
@@ -440,9 +440,9 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 			$object->next_prev_filter=" fk_projet in (".$projectsListId.")";
 		}
 		else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
-		
+
 		$morehtmlref='';
-		
+
 		// Project
 		if (empty($withproject))
 		{
@@ -450,18 +450,18 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		    $morehtmlref.=$langs->trans("Project").': ';
 		    $morehtmlref.=$projectstatic->getNomUrl(1);
 		    $morehtmlref.='<br>';
-		
+
 		    // Third party
 		    $morehtmlref.=$langs->trans("ThirdParty").': ';
 		    $morehtmlref.=$projectstatic->thirdparty->getNomUrl(1);
 		    $morehtmlref.='</div>';
 		}
-		
+
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
-		
+
 		print '<div class="fichecenter">';
 		print '<div class="fichehalfleft">';
-		
+
         print '<div class="underbanner clearboth"></div>';
 		print '<table class="border" width="100%">';
 
@@ -482,12 +482,12 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 
 		print '</table>';
 		print '</div>';
-		
+
 		print '<div class="fichehalfright"><div class="ficheaddleft">';
-		
+
 		print '<div class="underbanner clearboth"></div>';
 		print '<table class="border" width="100%">';
-		
+
 		// Progress declared
 		print '<tr><td>'.$langs->trans("ProgressDeclared").'</td><td>';
 		print $object->progress.' %';
@@ -508,10 +508,10 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 
 		print '</div>';
 		print '</div>';
-        
+
 		print '</div>';
 		print '<div class="clearboth"></div>';
-		    
+
 		dol_fiche_end();
 
 
@@ -583,18 +583,18 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 			print '</td></tr>';
 
 			print '</table></form>';
-			
+
 			print '<br>';
 		}
 	}
-	
+
 	if ($projectstatic->id > 0)
-	{	
+	{
 		if ($action == 'deleteline')
 		{
 			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id.'&lineid='.$_GET["lineid"].($withproject?'&withproject=1':''),$langs->trans("DeleteATimeSpent"),$langs->trans("ConfirmDeleteATimeSpent"),"confirm_delete",'','',1);
 		}
-	    
+
 	    // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
 	    $hookmanager->initHooks(array('tasktimelist'));
 	    $extrafields = new ExtraFields($db);
@@ -619,12 +619,12 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 	            $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
 	        }
 	    }
-	    
+
 		/*
 		 *  List of time spent
 		 */
 		$tasks = array();
-		
+
 		$sql = "SELECT t.rowid, t.fk_task, t.task_date, t.task_datehour, t.task_date_withhour, t.task_duration, t.fk_user, t.note, t.thm,";
 		$sql .= " pt.ref, pt.label,";
 		$sql .= " u.lastname, u.firstname, u.login, u.photo";
@@ -638,7 +638,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		if ($search_task_label) $sql .= natural_search('pt.label', $search_task_label);
 		if ($search_user > 0) $sql .= natural_search('t.fk_user', $search_user);
 		$sql .= $db->order($sortfield, $sortorder);
-        
+
 		$var=true;
 		$resql = $db->query($sql);
 		if ($resql)
@@ -668,9 +668,9 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 			dol_print_error($db);
 		}
 
-		
+
 		$arrayofselected=is_array($toselect)?$toselect:array();
-		
+
 		$params='';
 		if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 		if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
@@ -687,8 +687,8 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		if ($id) $params.='&amp;id='.$id;
 		if ($projectid) $params.='&amp;projectid='.$projectid;
 		if ($withproject) $params.='&amp;withproject='.$withproject;
-		
-		
+
+
 		$arrayofmassactions =  array(
 		    //'presend'=>$langs->trans("SendByMail"),
 		    //'builddoc'=>$langs->trans("PDFMerge"),
@@ -696,9 +696,9 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		//if ($user->rights->projet->creer) $arrayofmassactions['delete']=$langs->trans("Delete");
 		if ($massaction == 'presend') $arrayofmassactions=array();
 		$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
-		
-		
-		
+
+
+
 		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$id.'">';
         if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -708,31 +708,31 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 	    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	    print '<input type="hidden" name="page" value="'.$page.'">';
-	     
+
 		print '<input type="hidden" name="id" value="'.$id.'">';
 		print '<input type="hidden" name="projectid" value="'.$projectidforalltimes.'">';
 		print '<input type="hidden" name="withproject" value="'.$withproject.'">';
 
 		$moreforfilter = '';
-		
+
 		$parameters=array();
 		$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
 		if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
 		else $moreforfilter = $hookmanager->resPrint;
-		
+
 		if (! empty($moreforfilter))
 		{
 		    print '<div class="liste_titre liste_titre_bydiv centpercent">';
 		    print $moreforfilter;
 		    print '</div>';
 		}
-		
+
 		$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
 		$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-		
+
         print '<div class="div-table-responsive">';
 		print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-		
+
 		// Fields title search
 		print '<tr class="liste_titre_filter">';
 		// Date
@@ -783,14 +783,14 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
 		print $searchpicto;
 		print '</td>';
-		print '</tr>'."\n";	
-		
+		print '</tr>'."\n";
+
 		print '<tr class="liste_titre">';
 		if (! empty($arrayfields['t.task_date']['checked'])) print_liste_field_titre($arrayfields['t.task_date']['label'],$_SERVER['PHP_SELF'],'t.task_date,t.task_datehour,t.rowid','',$params,'',$sortfield,$sortorder);
 		if ((empty($id) && empty($ref)) || ! empty($projectidforalltimes))   // Not a dedicated task
         {
-            if (! empty($arrayfields['t.task_ref']['checked']))   print_liste_field_titre($arrayfields['t.task_ref']['label'],$_SERVER['PHP_SELF'],'pt.ref','',$params,'',$sortfield,$sortorder);            
-            if (! empty($arrayfields['t.task_label']['checked'])) print_liste_field_titre($arrayfields['t.task_label']['label'],$_SERVER['PHP_SELF'],'pt.label','',$params,'',$sortfield,$sortorder);            
+            if (! empty($arrayfields['t.task_ref']['checked']))   print_liste_field_titre($arrayfields['t.task_ref']['label'],$_SERVER['PHP_SELF'],'pt.ref','',$params,'',$sortfield,$sortorder);
+            if (! empty($arrayfields['t.task_label']['checked'])) print_liste_field_titre($arrayfields['t.task_label']['label'],$_SERVER['PHP_SELF'],'pt.label','',$params,'',$sortfield,$sortorder);
         }
         if (! empty($arrayfields['author']['checked'])) print_liste_field_titre($arrayfields['author']['label'],$_SERVER['PHP_SELF'],'','',$params,'',$sortfield,$sortorder);
 		if (! empty($arrayfields['t.note']['checked'])) print_liste_field_titre($arrayfields['t.note']['label'],$_SERVER['PHP_SELF'],'t.note','',$params,'',$sortfield,$sortorder);
@@ -800,9 +800,9 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		/*
     	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
     	{
-    	   foreach($extrafields->attribute_label as $key => $val) 
+    	   foreach($extrafields->attribute_label as $key => $val)
     	   {
-               if (! empty($arrayfields["ef.".$key]['checked'])) 
+               if (! empty($arrayfields["ef.".$key]['checked']))
                {
     				$align=$extrafields->getAlignFlag($key);
     				print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
@@ -817,17 +817,17 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		print "</tr>\n";
 
 		$tasktmp = new Task($db);
-		
+
 		$i = 0;
 
 		$childids = $user->getAllChildIds();
-		
+
 		$total = 0;
 		$totalvalue = 0;
 		$totalarray=array();
 		foreach ($tasks as $task_time)
 		{
-			
+
 			print '<tr class="oddeven">';
 
 			$date1=$db->jdate($task_time->task_date);
@@ -858,26 +858,26 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
         			$tasktmp->id = $task_time->fk_task;
         			$tasktmp->ref = $task_time->ref;
         			$tasktmp->label = $task_time->label;
-        			print $tasktmp->getNomUrl(1, 'withproject', 'time');	
+        			print $tasktmp->getNomUrl(1, 'withproject', 'time');
         			print '</td>';
         			if (! $i) $totalarray['nbfield']++;
     			}
             }
-            
+
 			// Task label
             if (! empty($arrayfields['t.task_label']['checked']))
             {
         		if ((empty($id) && empty($ref)) || ! empty($projectidforalltimes))   // Not a dedicated task
     			{
         			print '<td class="nowrap">';
-        			print $task_time->label;	
+        			print $task_time->label;
         			print '</td>';
         			if (! $i) $totalarray['nbfield']++;
     			}
             }
-            
+
             // User
-            if (! empty($arrayfields['author']['checked'])) 
+            if (! empty($arrayfields['author']['checked']))
             {
                 print '<td>';
     			if ($_GET['action'] == 'editline' && $_GET['lineid'] == $task_time->rowid)
@@ -907,7 +907,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
             }
 
 			// Note
-            if (! empty($arrayfields['t.note']['checked'])) 
+            if (! empty($arrayfields['t.note']['checked']))
             {
                 print '<td align="left">';
     			if ($_GET['action'] == 'editline' && $_GET['lineid'] == $task_time->rowid)
@@ -921,7 +921,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
     			print '</td>';
     			if (! $i) $totalarray['nbfield']++;
             }
-            
+
 			// Time spent
             if (! empty($arrayfields['t.task_duration']['checked']))
             {
@@ -940,9 +940,9 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
     			if (! $i) $totalarray['totaldurationfield']=$totalarray['nbfield'];
     			$totalarray['totalduration'] += $task_time->task_duration;
             }
-            
+
 			// Value spent
-            if (! empty($arrayfields['value']['checked'])) 
+            if (! empty($arrayfields['value']['checked']))
             {
 				print '<td align="right">';
 				$value = price2num($task_time->thm * $task_time->task_duration / 3600);
@@ -957,7 +957,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 			$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
 			$reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
 			print $hookmanager->resPrint;
-		
+
             // Action column
 			print '<td class="center"">';
 			if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid)
@@ -975,7 +975,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
     				print '<a href="'.$_SERVER["PHP_SELF"].'?'.($projectidforalltimes?'projectid='.$projectidforalltimes.'&amp;':'').'id='.$task_time->fk_task.'&amp;action=editline&amp;lineid='.$task_time->rowid.($withproject?'&amp;withproject=1':'').'">';
     				print img_edit();
     				print '</a>';
-    
+
     				print '&nbsp;';
     				print '<a href="'.$_SERVER["PHP_SELF"].'?'.($projectidforalltimes?'projectid='.$projectidforalltimes.'&amp;':'').'id='.$task_time->fk_task.'&amp;action=deleteline&amp;lineid='.$task_time->rowid.($withproject?'&amp;withproject=1':'').'">';
     				print img_delete();
@@ -984,12 +984,12 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 			}
         	print '</td>';
         	if (! $i) $totalarray['nbfield']++;
-        	
+
 			print "</tr>\n";
-			
+
 			$i++;
 		}
-		
+
 		// Show total line
 		if (isset($totalarray['totaldurationfield']) || isset($totalarray['totalvaluefield']))
 		{

From a0295821baf2f8d32132fbc4e1c4699a6cf5a45a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Jun 2017 11:38:42 +0200
Subject: [PATCH 098/438] Fix errors in extra computed field

---
 htdocs/core/class/extrafields.class.php | 44 ++++++++++++-------------
 htdocs/langs/en_US/admin.lang           |  2 +-
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index bd1daca8886..16214e10bf1 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -39,7 +39,7 @@ class ExtraFields
 
 	// type of element (for what object is the extrafield)
 	var $attribute_elementtype;
-	
+
 	// Array with type of the extra field
 	var $attribute_type;
 	// Array with label of extra field
@@ -68,7 +68,7 @@ class ExtraFields
 	var $attribute_list;
 	// Array to store if extra field is hidden
 	var $attribute_hidden;		// warning, do not rely on this. If your module need a hidden data, it must use its own table.
-	
+
 	var $error;
 	var $errno;
 
@@ -95,7 +95,7 @@ class ExtraFields
 	'separate' => 'ExtrafieldSeparator',
 	);
 
-	
+
 	/**
 	 *	Constructor
 	 *
@@ -149,7 +149,7 @@ class ExtraFields
 		// Create field into database except for separator type which is not stored in database
 		if ($type != 'separate')
 		{
-			$result=$this->create($attrname, $type, $size, $elementtype, $unique, $required, $default_value, $param, $perms, $list, $copmputed);
+			$result=$this->create($attrname, $type, $size, $elementtype, $unique, $required, $default_value, $param, $perms, $list, $computed);
 		}
 		$err1=$this->errno;
 		if ($result > 0 || $err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' || $type == 'separate')
@@ -349,7 +349,7 @@ class ExtraFields
 		$table=$elementtype.'_extrafields';
 
 		$error=0;
-		
+
 		if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
 		{
 			$result=$this->delete_label($attrname,$elementtype);
@@ -381,7 +381,7 @@ class ExtraFields
                     }
                 }
 			}
-			
+
 			return $result;
 		}
 		else
@@ -736,7 +736,7 @@ class ExtraFields
 		$hidden=$this->attribute_hidden[$key];
 
 		if ($computed) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
-		
+
 		if (empty($showsize))
 		{
     		if ($type == 'date')
@@ -772,14 +772,14 @@ class ExtraFields
     			{
     			    $showsize = 'minwidth200imp';
     			}
-    			else 
+    			else
     			{
     			    //$showsize=48;
     			    $showsize = 'minwidth400imp';
     			}
     		}
 		}
-        
+
 		if (in_array($type,array('date','datetime')))
 		{
 			$tmp=explode(',',$size);
@@ -1029,7 +1029,7 @@ class ExtraFields
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 			$form = new Form($db);
-			
+
 			$value_arr=explode(',',$value);
 			$out=$form->multiselectarray($keysuffix.'options_'.$key.$keyprefix, $param['options'], $value_arr, '', 0, '', 0, '100%');
 
@@ -1124,9 +1124,9 @@ class ExtraFields
 				if ($resql) {
 					$num = $this->db->num_rows($resql);
 					$i = 0;
-					
+
 					$data=array();
-					
+
 					while ( $i < $num ) {
 						$labeltoshow = '';
 						$obj = $this->db->fetch_object($resql);
@@ -1152,9 +1152,9 @@ class ExtraFields
 									$labeltoshow = dol_trunc($obj->$field_toshow, 18) . ' ';
 								}
 							}
-							
+
 							$data[$obj->rowid]=$labeltoshow;
-							
+
 						} else {
 							if (! $notrans) {
 								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
@@ -1177,16 +1177,16 @@ class ExtraFields
 
 							$data[$obj->rowid]=$labeltoshow;
 						}
-						
+
 						$i ++;
 					}
 					$this->db->free($resql);
-					
+
 					require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 					$form = new Form($db);
-					
+
 					$out=$form->multiselectarray($keysuffix.'options_'.$key.$keyprefix, $data, $value_arr, '', 0, '', 0, '100%');
-					
+
 				} else {
 					print 'Error in request ' . $sql . ' ' . $this->db->lasterror() . '. Check setup of extra parameters.<br>';
 				}
@@ -1205,11 +1205,11 @@ class ExtraFields
 			if ($InfoFieldList[0] && class_exists($InfoFieldList[0]))
 			{
 			    $valuetoshow=$value;
-                if (!empty($value)) 
+                if (!empty($value))
                 {
                     $object = new $InfoFieldList[0]($this->db);
                     $resfetch=$object->fetch($value);
-                    if ($resfetch > 0) 
+                    if ($resfetch > 0)
                     {
                         $valuetoshow=$object->ref;
                         if ($object->element == 'societe') $valuetoshow=$object->name;  // Special case for thirdparty because ->ref is not name but id (because name is not unique)
@@ -1269,7 +1269,7 @@ class ExtraFields
 		    //var_dump($computed);
 		    $value = dol_eval($computed, 1, 0);
 		}
-		
+
 		$showsize=0;
 		if ($type == 'date')
 		{
@@ -1477,7 +1477,7 @@ class ExtraFields
 					}
 				}
 				$value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
-				
+
 			} else {
 				dol_syslog(get_class($this) . '::showOutputField error ' . $this->db->lasterror(), LOG_WARNING);
 			}
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index fe292db145d..b04aaf40a31 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -390,7 +390,7 @@ 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 < 5 ? round($object->id / 2, 2) : ($object->id + 2*$user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>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'<br><br>Other example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? round($reloadedobj->capital / 5) : '-1'
+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->array_options['options_extrafieldkey'] + 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)) ? round($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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...

From 1820649175451d34a84f29ad1ea6c5e29aed161f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Jun 2017 16:44:04 +0200
Subject: [PATCH 099/438] Maxi debug of v6

---
 htdocs/accountancy/index.php                  |  24 +-
 htdocs/adherents/card.php                     | 111 ++++----
 htdocs/adherents/subscription.php             |  28 +-
 htdocs/adherents/type.php                     |  14 +-
 htdocs/admin/dict.php                         |  54 ++--
 htdocs/categories/edit.php                    |   1 +
 htdocs/categories/viewcat.php                 |  23 +-
 htdocs/comm/action/card.php                   |  82 ++----
 htdocs/comm/card.php                          |  75 +++--
 htdocs/comm/mailing/advtargetemailing.php     |  11 +-
 htdocs/comm/mailing/card.php                  |  69 +++--
 htdocs/comm/propal/card.php                   | 127 +++------
 htdocs/commande/card.php                      |  86 +++---
 htdocs/commande/orderstoinvoice.php           |  31 +--
 htdocs/compta/bank/card.php                   | 101 +++----
 htdocs/compta/bank/various_payment/card.php   |  16 +-
 htdocs/compta/deplacement/card.php            |  24 +-
 htdocs/compta/facture/card.php                | 133 +++++----
 htdocs/compta/localtax/card.php               |  22 +-
 htdocs/compta/prelevement/bons.php            |  31 +--
 htdocs/compta/prelevement/create.php          |  10 +-
 htdocs/compta/prelevement/index.php           |   6 +-
 htdocs/compta/prelevement/list.php            |  36 +--
 htdocs/compta/salaries/card.php               |  26 +-
 htdocs/compta/tva/card.php                    |  15 +-
 htdocs/contact/card.php                       |  56 ++--
 htdocs/contrat/card.php                       | 258 +++++++++---------
 htdocs/core/class/commonobject.class.php      | 234 ++++++++--------
 htdocs/core/class/extrafields.class.php       |  38 ++-
 htdocs/core/tpl/extrafields_view.tpl.php      |  90 ++++--
 htdocs/don/card.php                           |  38 +--
 htdocs/expedition/card.php                    | 224 +++++++--------
 htdocs/fourn/card.php                         |  71 +++--
 htdocs/fourn/commande/card.php                |  43 ++-
 htdocs/fourn/commande/orderstoinvoice.php     |  27 +-
 htdocs/fourn/facture/card.php                 |  38 +--
 htdocs/fourn/product/list.php                 | 132 ++++++---
 htdocs/langs/en_US/admin.lang                 |   2 +-
 htdocs/langs/en_US/main.lang                  |   2 +-
 htdocs/langs/en_US/withdrawals.lang           |   2 +-
 .../template/class/myobject.class.php         |  49 ++--
 .../core/modules/modMyModule.class.php        |  39 ++-
 .../modulebuilder/template/myobject_card.php  |  75 +++--
 .../modulebuilder/template/myobject_list.php  | 123 ++++-----
 htdocs/product/card.php                       |  82 +++---
 htdocs/product/document.php                   |  23 +-
 htdocs/product/stock/product.php              |  92 +++----
 htdocs/projet/class/project.class.php         |  52 ++--
 htdocs/projet/class/task.class.php            |   3 +
 htdocs/projet/tasks/task.php                  |  11 +-
 htdocs/resource/add.php                       |   2 +-
 htdocs/resource/card.php                      |  35 +--
 htdocs/societe/card.php                       |  80 +++---
 htdocs/societe/class/societe.class.php        |  49 ++--
 htdocs/societe/commerciaux.php                |  19 +-
 htdocs/societe/consumption.php                |  27 +-
 htdocs/supplier_proposal/card.php             |  96 +++----
 htdocs/theme/eldy/style.css.php               |   4 +-
 htdocs/theme/md/style.css.php                 |   2 +-
 htdocs/user/card.php                          | 147 +++++-----
 htdocs/user/group/card.php                    |  30 +-
 61 files changed, 1705 insertions(+), 1746 deletions(-)

diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php
index c7caa5daac3..02549be2a94 100644
--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -45,10 +45,13 @@ $langs->load("compta");
 $langs->load("banks");
 $langs->load("loans");
 
+
 /*
  * Actions
  */
 
+// None
+
 
 /*
  * View
@@ -73,35 +76,31 @@ print "<br>\n";
 $step++;
 print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescJournalSetup", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("AccountingJournals").'</strong>');
 print "<br>\n";
-print "<br>\n";
 $step++;
 print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChartModel", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("Pcg_version").'</strong>');
 print "<br>\n";
-print "<br>\n";
 $step++;
 print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChart", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("Chartofaccounts").'</strong>');
 print "<br>\n";
-print "<br>\n";
 
+print "<br>\n";
 print $langs->trans("AccountancyAreaDescActionOnceBis");
 print "<br>\n";
 print "<br>\n";
 
 $step++;
-print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescMisc", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>')."<br>\n";
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescMisc", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>')."\n";
 print "<br>\n";
 $step++;
 $textlink = '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup").'-'.$langs->transnoentitiesnoconv("MenuVatAccounts").'</strong>';
 print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescVat", $step, $textlink);
 print "<br>\n";
-print "<br>\n";
 if (! empty($conf->tax->enabled))
 {
     $textlink = '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup").'-'.$langs->transnoentitiesnoconv("MenuTaxAccounts").'</strong>';
     $step++;
     print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescContrib", $step, $textlink);
     print "<br>\n";
-    print "<br>\n";
 }
 /*if (! empty($conf->salaries->enabled))
 {
@@ -116,7 +115,6 @@ if (! empty($conf->expensereport->enabled))  // TODO Move this in the default ac
     $step++;
     print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescExpenseReport", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuExpenseReportAccounts").'</strong>');
     print "<br>\n";
-    print "<br>\n";
 }
 /*
 if (! empty($conf->loan->enabled))
@@ -124,26 +122,22 @@ if (! empty($conf->loan->enabled))
     $step++;
     print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescLoan", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuSpecialExpenses").'-'.$langs->transnoentitiesnoconv("Loans").'</strong> '.$langs->transnoentitiesnoconv("or").' <strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
     print "<br>\n";
-    print "<br>\n";
 }
 if (! empty($conf->don->enabled))
 {
     $step++;
     print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescDonation", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDonationAccounts").'</strong>');
     print "<br>\n";
-    print "<br>\n";
 }*/
 
 $step++;
 print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescProd", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("ProductsBinding").'</strong>');
 print "<br>\n";
-print "<br>\n";
 
 $step++;
 $textlink='<strong>'.$langs->transnoentitiesnoconv("MenuBankCash").'</strong>';
 print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBank", $step, $textlink);
 print "<br>\n";
-print "<br>\n";
 
 
 print "<br>\n";
@@ -155,19 +149,19 @@ $step = 0;
 $langs->loadLangs(array('bills', 'trips'));
 
 $step++;
-print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64+$step), $langs->transnoentitiesnoconv("BillsCustomers"), '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("CustomersVentilation").'</strong>')."<br>\n";
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64+$step), $langs->transnoentitiesnoconv("BillsCustomers"), '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("CustomersVentilation").'</strong>')."\n";
 print "<br>\n";
 
 $step++;
-print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64+$step), $langs->transnoentitiesnoconv("BillsSuppliers"), '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("SuppliersVentilation").'</strong>')."<br>\n";
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64+$step), $langs->transnoentitiesnoconv("BillsSuppliers"), '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$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("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("ExpenseReportsVentilation").'</strong>')."<br>\n";
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64+$step), $langs->transnoentitiesnoconv("ExpenseReports"), '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$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"))."<br>\n";
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescWriteRecords", chr(64+$step), $langs->transnoentitiesnoconv("Journalization"), $langs->transnoentitiesnoconv("WriteBookKeeping"))."\n";
 print "<br>\n";
 
 $step++;
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 1234f75e059..81aa2c7c6ad 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -96,7 +96,7 @@ if ($id > 0)
 	// Define variables to know what current user can do on properties of user linked to edited member
 	if ($object->user_id)
 	{
-		// $ User is the user who edits, $ object->user_id is the id of the related user in the edited member  
+		// $ User is the user who edits, $ object->user_id is the id of the related user in the edited member
 		$caneditfielduser=((($user->id == $object->user_id) && $user->rights->user->self->creer)
 				|| (($user->id != $object->user_id) && $user->rights->user->user->creer));
 		$caneditpassworduser=((($user->id == $object->user_id) && $user->rights->user->self->password)
@@ -213,7 +213,7 @@ if (empty($reshook))
 	{
 		if ($result > 0)
 		{
-			// User creation 
+			// User creation
 			$company = new Societe($db);
 			$result=$company->create_from_member($object,GETPOST('companyname'));
 
@@ -714,7 +714,7 @@ if (empty($reshook))
 			}
 		}
 	}
-	
+
 	// Actions to build doc
 	$upload_dir = $conf->adherent->dir_output;
 	$permissioncreate=$user->rights->adherent->creer;
@@ -834,7 +834,7 @@ else
 			print '<input size="30" maxsize="32" type="text" name="password" value="'.$generated_password.'">';
 			print '</td></tr>';
 		}
-		
+
 		// Type
 		print '<tr><td class="fieldrequired">'.$langs->trans("MemberType").'</td><td>';
 		$listetype=$adht->liste_array();
@@ -948,20 +948,6 @@ else
 			print $object->showOptionals($extrafields,'edit');
 		}
 
-		/*
-		 // Third party Dolibarr
-		if (! empty($conf->societe->enabled))
-		{
-		print '<tr><td>'.$langs->trans("LinkedToDolibarrThirdParty").'</td><td class="valeur">';
-		print $form->select_company($object->fk_soc,'socid','',1);
-		print '</td></tr>';
-		}
-
-		// Login Dolibarr
-		print '<tr><td>'.$langs->trans("LinkedToDolibarrUser").'</td><td class="valeur">';
-		print $form->select_dolusers($object->user_id, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
-		print '</td></tr>';
-		*/
         print '<tbody>';
 		print "</table>\n";
 
@@ -1061,12 +1047,12 @@ else
 		print '<table class="border" width="100%">';
 
 		// Ref
-		print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td><td class="valeur" colspan="2">'.$object->id.'</td></tr>';
+		print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td><td class="valeur">'.$object->id.'</td></tr>';
 
 		// Login
 		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
 		{
-			print '<tr><td><span class="fieldrequired">'.$langs->trans("Login").' / '.$langs->trans("Id").'</span></td><td colspan="2"><input type="text" name="login" class="maxwidth200" value="'.(isset($_POST["login"])?GETPOST("login",'alpha',2):$object->login).'"></td></tr>';
+			print '<tr><td><span class="fieldrequired">'.$langs->trans("Login").' / '.$langs->trans("Id").'</span></td><td><input type="text" name="login" class="maxwidth200" value="'.(isset($_POST["login"])?GETPOST("login",'alpha',2):$object->login).'"></td></tr>';
 		}
 
 	// Password
@@ -1095,7 +1081,7 @@ else
 		print "</td></tr>";
 
 		// Company
-		print '<tr><td id="tdcompany">'.$langs->trans("Company").'</td><td><input type="text" name="societe" size="40" value="'.(isset($_POST["societe"])?GETPOST("societe",'',2):$object->societe).'"></td></tr>';
+		print '<tr><td id="tdcompany">'.$langs->trans("Company").'</td><td><input type="text" name="societe" class="minwidth100" value="'.(isset($_POST["societe"])?GETPOST("societe",'',2):$object->societe).'"></td></tr>';
 
 		// Civility
 		print '<tr><td>'.$langs->trans("UserTitle").'</td><td>';
@@ -1104,11 +1090,11 @@ else
 		print '</tr>';
 
 		// Lastname
-		print '<tr><td id="tdlastname">'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" size="40" value="'.(isset($_POST["lastname"])?GETPOST("lastname",'',2):$object->lastname).'"></td>';
+		print '<tr><td id="tdlastname">'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" class="minwidth100" value="'.(isset($_POST["lastname"])?GETPOST("lastname",'',2):$object->lastname).'"></td>';
 		print '</tr>';
 
 		// Firstname
-		print '<tr><td id="tdfirstname">'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" size="40" value="'.(isset($_POST["firstname"])?GETPOST("firstname",'',3):$object->firstname).'"></td>';
+		print '<tr><td id="tdfirstname">'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" class="minwidth100" value="'.(isset($_POST["firstname"])?GETPOST("firstname",'',3):$object->firstname).'"></td>';
 		print '</tr>';
 
 		// Photo
@@ -1131,7 +1117,7 @@ else
 
 		// Address
 		print '<tr><td>'.$langs->trans("Address").'</td><td>';
-		print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="2">'.(isset($_POST["address"])?GETPOST("address",'',2):$object->address).'</textarea>';
+		print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_2.'">'.(isset($_POST["address"])?GETPOST("address",'',2):$object->address).'</textarea>';
 		print '</td></tr>';
 
 		// Zip / Town
@@ -1143,7 +1129,7 @@ else
 
 		// Country
 		//$object->country_id=$object->country_id?$object->country_id:$mysoc->country_id;    // In edit mode we don't force to company country if not defined
-		print '<tr><td width="25%">'.$langs->trans('Country').'</td><td>';
+		print '<tr><td>'.$langs->trans('Country').'</td><td>';
 		print $form->select_country(isset($_POST["country_id"])?$_POST["country_id"]:$object->country_id,'country_id');
 		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
 		print '</td></tr>';
@@ -1168,7 +1154,7 @@ else
 	    // Skype
 	    if (! empty($conf->skype->enabled))
 	    {
-			    print '<tr><td>'.$langs->trans("Skype").'</td><td><input type="text" name="skype" size="40" value="'.(isset($_POST["skype"])?GETPOST("skype"):$object->skype).'"></td></tr>';
+			    print '<tr><td>'.$langs->trans("Skype").'</td><td><input type="text" name="skype" class="minwidth100" value="'.(isset($_POST["skype"])?GETPOST("skype"):$object->skype).'"></td></tr>';
 	    }
 
 		// Birthday
@@ -1185,7 +1171,7 @@ else
 		if (! empty( $conf->categorie->enabled ) && !empty( $user->rights->categorie->lire ))
 		{
 			print '<tr><td>' . fieldLabel('Categories', 'memcats') . '</td>';
-			print '<td colspan="2">';
+			print '<td>';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_MEMBER, null, null, null, null, 1);
 			$c = new Categorie($db);
 			$cats = $c->containing($object->id, Categorie::TYPE_MEMBER);
@@ -1197,7 +1183,7 @@ else
 		}
 
 		// Other attributes
-		$parameters=array("colspan"=>2);
+		$parameters=array();
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 		if (empty($reshook) && ! empty($extrafields->attribute_label))
 		{
@@ -1416,12 +1402,12 @@ else
 		if (! empty($conf->societe->enabled)) $rowspan++;
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php">'.$langs->trans("BackToList").'</a>';
-		
+
 		dol_banner_tab($object, 'rowid', $linkback);
-        
+
         print '<div class="fichecenter">';
         print '<div class="fichehalfleft">';
-        
+
         print '<div class="underbanner clearboth"></div>';
 		print '<table class="border centpercent">';
 
@@ -1463,15 +1449,15 @@ else
 			}
 			print '</td></tr>';
 		}
-		
+
         print '</table>';
-        
+
         print '</div>';
         print '<div class="fichehalfright"><div class="ficheaddleft">';
-       
+
         print '<div class="underbanner clearboth"></div>';
         print '<table class="border tableforfield" width="100%">';
-		
+
 		// Birthday
 		print '<tr><td class="titlefield">'.$langs->trans("Birthday").'</td><td class="valeur">'.dol_print_date($object->birth,'day').'</td></tr>';
 
@@ -1487,13 +1473,8 @@ else
 			print '</td></tr>';
 		}
 
-		// Other attributes
-		$parameters=array('colspan'=>2);
-		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-		if (empty($reshook) && ! empty($extrafields->attribute_label))
-		{
-			print $object->showOptionals($extrafields, 'view', $parameters);
-		}
+    	// Other attributes
+    	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
         // Date end subscription
         print '<tr><td>'.$langs->trans("SubscriptionEndDate").'</td><td class="valeur">';
@@ -1518,7 +1499,7 @@ else
 	        }
         }
         print '</td></tr>';
-		
+
 		// Third party Dolibarr
 		if (! empty($conf->societe->enabled))
 		{
@@ -1595,12 +1576,12 @@ else
         print '<div style="clear:both"></div>';
 
         dol_fiche_end();
-        
-        
+
+
 		/*
 		 * Hotbar
 		 */
-        
+
 		print '<div class="tabsAction">';
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
@@ -1616,7 +1597,7 @@ else
 				{
 					print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Modify").'</font></div>';
 				}
-	
+
 				// Validate
 				if ($object->statut == -1)
 				{
@@ -1629,7 +1610,7 @@ else
 						print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Validate").'</font></div>';
 					}
 				}
-	
+
 				// Reactivate
 				if ($object->statut == 0)
 				{
@@ -1642,7 +1623,7 @@ else
 						print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Reenable")."</font></div>";
 					}
 				}
-	
+
 				// Send card by email
 				if ($user->rights->adherent->creer)
 				{
@@ -1660,7 +1641,7 @@ else
 				{
 					print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("SendCardByMail")."</font></div>";
 				}
-	
+
 				// Terminate
 				if ($object->statut >= 1)
 				{
@@ -1673,7 +1654,7 @@ else
 						print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Resiliate")."</font></div>";
 					}
 				}
-	
+
 				// Create third party
 				if (! empty($conf->societe->enabled) && ! $object->fk_soc)
 				{
@@ -1687,7 +1668,7 @@ else
 						print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("CreateDolibarrThirdParty")."</font></div>";
 					}
 				}
-	
+
 				// Create user
 				if (! $user->societe_id && ! $object->user_id)
 				{
@@ -1701,7 +1682,7 @@ else
 						print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("CreateDolibarrLogin")."</font></div>";
 					}
 				}
-	
+
 				// Delete
 				if ($user->rights->adherent->supprimer)
 				{
@@ -1711,12 +1692,12 @@ else
 				{
 					print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Delete")."</font></div>";
 				}
-	
+
 				// Action SPIP
 				if (! empty($conf->mailmanspip->enabled) && ! empty($conf->global->ADHERENT_USE_SPIP))
 				{
 					$isinspip = $mailmanspip->is_in_spip($object);
-	
+
 					if ($isinspip == 1)
 					{
 						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$object->id.'&action=del_spip">'.$langs->trans("DeleteIntoSpip")."</a></div>\n";
@@ -1726,7 +1707,7 @@ else
 						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$object->id.'&action=add_spip">'.$langs->trans("AddIntoSpip")."</a></div>\n";
 					}
 				}
-	
+
 			}
 		}
 		print '</div>';
@@ -1736,11 +1717,11 @@ else
 			print '<br><br><font class="error">'.$langs->trans('SPIPConnectionFailed').': '.$mailmanspip->error.'</font>';
 		}
 
-		
-		
+
+
 		print '<div class="fichecenter"><div class="fichehalfleft">';
 		print '<a name="builddoc"></a>'; // ancre
-		
+
 		// Documents generes
 		$filename = dol_sanitizeFileName($object->ref);
 		//$filename =  'tmp_cards.php';
@@ -1752,15 +1733,15 @@ else
 
 		print $formfile->showdocuments('member', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $object->default_lang, '', $object);
 		$somethingshown = $formfile->numoffiles;
-		
+
 		// Show links to link elements
 		//$linktoelem = $form->showLinkToObjectBlock($object, null, array('subscription'));
 		//$somethingshown = $form->showLinkedObjectBlock($object, '');
-		
+
 		// Show links to link elements
 		/*$linktoelem = $form->showLinkToObjectBlock($object,array('order'));
 		 if ($linktoelem) print ($somethingshown?'':'<br>').$linktoelem;
-		
+
 		 // Link for paypal payment
 		 /*
 		 if (! empty($conf->paypal->enabled) && $object->statut != 0) {
@@ -1769,15 +1750,15 @@ else
 		 }
 		 */
 		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-		
+
 		// List of actions on element
         /* Already in tab Agenda/Events
         include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
 		$formactions = new FormActions($db);
 		$somethingshown = $formactions->showactions($object, 'member', $socid);
 		*/
-		print '</div></div></div>';		
-		
+		print '</div></div></div>';
+
 	}
 }
 
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 1874a0b37a7..21de6e305b5 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -389,7 +389,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
 	                {
 	                    $invoice->linked_objects = array_merge($invoice->linked_objects, $_POST['other_linked_objects']);
 	                }
-	                 
+
 	                $result=$invoice->create($user);
 	                if ($result <= 0)
 	                {
@@ -581,12 +581,12 @@ if ($rowid > 0)
     dol_fiche_head($head, 'subscription', $langs->trans("Member"), -1, 'user');
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php">'.$langs->trans("BackToList").'</a>';
-    
+
     dol_banner_tab($object, 'rowid', $linkback);
-    
+
     print '<div class="fichecenter">';
     print '<div class="fichehalfleft">';
-    
+
     print '<div class="underbanner clearboth"></div>';
     print '<table class="border" width="100%">';
 
@@ -624,13 +624,13 @@ if ($rowid > 0)
 	}
 
     print '</table>';
-    
+
     print '</div>';
     print '<div class="fichehalfright"><div class="ficheaddleft">';
-   
+
     print '<div class="underbanner clearboth"></div>';
     print '<table class="border tableforfield" width="100%">';
-	
+
 	// Birthday
 	print '<tr><td class="titlefield">'.$langs->trans("Birthday").'</td><td class="valeur">'.dol_print_date($object->birth,'day').'</td></tr>';
 
@@ -646,13 +646,9 @@ if ($rowid > 0)
 		print '</td></tr>';
 	}
 
-	// Other attributes
-	$parameters=array('colspan'=>2);
-	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-	if (empty($reshook) && ! empty($extrafields->attribute_label))
-	{
-		print $object->showOptionals($extrafields, 'view', $parameters);
-	}
+    // Other attributes
+    $cols=2;
+    include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
 	// Date end subscription
 	print '<tr><td>'.$langs->trans("SubscriptionEndDate").'</td><td class="valeur">';
@@ -677,7 +673,7 @@ if ($rowid > 0)
 	    }
 	}
 	print '</td></tr>';
-	
+
 	// Third party Dolibarr
 	if (! empty($conf->societe->enabled))
 	{
@@ -752,7 +748,7 @@ if ($rowid > 0)
 
 	print "</div></div></div>\n";
     print '<div style="clear:both"></div>';
-    
+
     dol_fiche_end();
 
     print '</form>';
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 20adc36dec5..4935b6c4c6d 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -336,14 +336,8 @@ if ($rowid > 0)
 		print '<tr><td class="tdtop">'.$langs->trans("WelcomeEMail").'</td><td>';
 		print nl2br($object->mail_valid)."</td></tr>";
 
-		// Other attributes
-		$parameters=array();
-		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$act,$action);    // Note that $action and $object may have been modified by hook
-		if (empty($reshook) && ! empty($extrafields->attribute_label))
-		{
-			// View extrafields
-			print $object->showOptionals($extrafields);
-		}
+    	// Other attributes
+    	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
 		print '</table>';
         print '</div>';
@@ -674,6 +668,10 @@ if ($rowid > 0)
 		// Other attributes
 		$parameters=array();
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$act,$action);    // Note that $action and $object may have been modified by hook
+		if (empty($reshook) && ! empty($extrafields->attribute_label))
+		{
+		    print $object->showOptionals($extrafields,'edit');
+		}
 
 		print '</table>';
 
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 913fcf75de6..22e7bf7087f 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -569,8 +569,8 @@ if ($id == 10)
 
 if (GETPOST('button_removefilter') || GETPOST('button_removefilter.x') || GETPOST('button_removefilter_x'))
 {
-    $search_country_id = '';    
-    $search_code = '';    
+    $search_country_id = '';
+    $search_code = '';
 }
 
 // Actions add or modify an entry into a dictionary
@@ -660,11 +660,11 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
 	if ($_POST["accountancy_code"] <= 0) $_POST["accountancy_code"]='';	// If empty, we force to null
 	if ($_POST["accountancy_code_sell"] <= 0) $_POST["accountancy_code_sell"]='';	// If empty, we force to null
 	if ($_POST["accountancy_code_buy"] <= 0) $_POST["accountancy_code_buy"]='';	// If empty, we force to null
-    if ($id == 10 && isset($_POST["code"]))  // Spaces are not allowed into code 
+    if ($id == 10 && isset($_POST["code"]))  // Spaces are not allowed into code
     {
         $_POST["code"]=preg_replace('/\s/','',$_POST["code"]);
     }
-    
+
     // Si verif ok et action add, on ajoute la ligne
     if ($ok && GETPOST('actionadd'))
     {
@@ -945,7 +945,7 @@ if ($id)
     if (! preg_match('/ WHERE /',$sql)) $sql.= " WHERE 1 = 1";
     if ($search_country_id > 0) $sql.= " AND c.rowid = ".$search_country_id;
     if ($search_code != '')     $sql.= natural_search("code", $search_code);
-    
+
     if ($sortfield)
     {
         // If sort order is "country", we use country_code instead
@@ -972,16 +972,16 @@ if ($id)
     print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from','alpha')).'">';
-    
+
     // Form to add a new line
     if ($tabname[$id])
     {
         $alabelisused=0;
-        
+
         $fieldlist=explode(',',$tabfield[$id]);
 
         print '<table class="noborder" width="100%">';
-        
+
         // Line for title
         print '<tr class="liste_titre">';
         foreach ($fieldlist as $field => $value)
@@ -1012,9 +1012,9 @@ if ($id)
             if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label')
             {
             	if ($id != 25) $valuetoshow=$form->textwithtooltip($langs->trans("Label"), $langs->trans("LabelUsedByDefault"),2,1,img_help(1,''));
-            	else $valuetoshow=$langs->trans("Label"); 
+            	else $valuetoshow=$langs->trans("Label");
             }
-            if ($fieldlist[$field]=='libelle_facture') { 
+            if ($fieldlist[$field]=='libelle_facture') {
                 $valuetoshow=$form->textwithtooltip($langs->trans("LabelOnDocuments"), $langs->trans("LabelUsedByDefault"),2,1,img_help(1,''));
             }
             if ($fieldlist[$field]=='country')         {
@@ -1055,7 +1055,7 @@ if ($id)
 			if ($fieldlist[$field]=='affect')          { $valuetoshow=$langs->trans("WithCounter"); }
 			if ($fieldlist[$field]=='delay')           { $valuetoshow=$langs->trans("NoticePeriod"); }
 			if ($fieldlist[$field]=='newbymonth')      { $valuetoshow=$langs->trans("NewByMonth"); }
-				
+
             if ($id == 2)	// Special cas for state page
             {
             	if ($fieldlist[$field]=='region_id') { $valuetoshow='&nbsp;'; $showfield=1; }
@@ -1120,7 +1120,7 @@ if ($id)
         if ($id == 4) $colspan++;
 
         print '</table>';
-        
+
         /*if (! empty($alabelisused) && $id != 25)  // If there is one label among fields, we show legend of *
         {
         	print '* '.$langs->trans("LabelUsedByDefault").'.<br>';
@@ -1130,11 +1130,11 @@ if ($id)
     print '</form>';
 
     print '<br>';
-    
+
     print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from','alpha')).'">';
-    
+
     // List of available record in database
     dol_syslog("htdocs/admin/dict", LOG_DEBUG);
     $resql=$db->query($sql);
@@ -1150,29 +1150,29 @@ if ($id)
         }
 
         print '<table class="noborder" width="100%">';
-        
+
         // Title line with search boxes
         print '<tr class="liste_titre_filter">';
         $filterfound=0;
         foreach ($fieldlist as $field => $value)
         {
             $showfield=1;							  	// By defaut
-            
+
             if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='country_id') { $showfield=0; }
-            
+
             if ($showfield)
             {
                 if ($value == 'country')
                 {
                     print '<td class="liste_titre">';
-                    print $form->select_country($search_country_id, 'search_country_id', '', 28, 'maxwidth200 maxwidthonsmartphone');
+                    print $form->select_country($search_country_id, 'search_country_id', '', 28, 'maxwidth150 maxwidthonsmartphone');
                     print '</td>';
                     $filterfound++;
                 }
                 elseif ($value == 'code')
                 {
                     print '<td class="liste_titre">';
-                    print '<input type="text" name="search_code" value="'.dol_escape_htmltag($search_code).'">';
+                    print '<input type="text" class="maxwidth100" name="search_code" value="'.dol_escape_htmltag($search_code).'">';
                     print '</td>';
                     $filterfound++;
                 }
@@ -1193,7 +1193,7 @@ if ($id)
     	}
     	print '</td>';
         print '</tr>';
-            
+
         // Title of lines
         print '<tr class="liste_titre">';
         foreach ($fieldlist as $field => $value)
@@ -1235,7 +1235,7 @@ if ($id)
                 //else $valuetoshow=$langs->trans("Label");
                 $valuetoshow=$langs->trans("Label");
             }
-            if ($fieldlist[$field]=='libelle_facture') { 
+            if ($fieldlist[$field]=='libelle_facture') {
                 //$valuetoshow=$form->textwithtooltip($langs->trans("LabelOnDocuments"), $langs->trans("LabelUsedByDefault"),2,1,img_help(1,''));
                 $valuetoshow=$langs->trans("LabelOnDocuments");
             }
@@ -1368,7 +1368,7 @@ if ($id)
                             if ($value == 'private')
                             {
                                 $valuetoshow = yn($elementList[$valuetoshow]);
-                            }				
+                            }
                             else if ($fieldlist[$field]=='libelle_facture') {
                                 $langs->load("bills");
                                 $key=$langs->trans("PaymentCondition".strtoupper($obj->code));
@@ -1516,7 +1516,7 @@ if ($id)
                     if ($obj->code == 'RECEP') $canbemodified=1;
                     if ($tabname[$id] == MAIN_DB_PREFIX."c_actioncomm") $canbemodified=1;
 
-                    // Url 
+                    // Url
                     $rowidcol=$tabrowid[$id];
                     // If rowidcol not defined
                     if (empty($rowidcol) || in_array($id, array(6,7,8,13,17,19,27))) $rowidcol='rowid';
@@ -1565,7 +1565,7 @@ if ($id)
                 $i++;
             }
         }
-    
+
         print '</table>';
     }
     else {
@@ -1598,12 +1598,12 @@ else
         {
         	if ($showemptyline)
         	{
-        		
+
         		print '<tr class="oddeven"><td width="30%">&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>';
         		$showemptyline=0;
         	}
 
-            
+
             $value=$tabname[$i];
             print '<tr class="oddeven"><td width="50%">';
             if (! empty($tabcond[$i]))
@@ -1764,7 +1764,7 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 		    print '<td>';
 		    $transfound=0;
 	        // Special case for labels
-	        if ($tabname == MAIN_DB_PREFIX.'c_payment_term') 
+	        if ($tabname == MAIN_DB_PREFIX.'c_payment_term')
 	        {
 	            $langs->load("bills");
 	            $transkey="PaymentCondition".strtoupper($obj->code);
diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index 9981d09cda0..c2f93c17ccd 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -173,6 +173,7 @@ print '<tr><td>'.$langs->trans("In").'</td><td>';
 print $form->select_all_categories($type,$object->fk_parent,'parent',64,$object->id);
 print '</td></tr>';
 
+$parameters=array();
 $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 if (empty($reshook) && ! empty($extrafields->attribute_label))
 {
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 665b033936e..11aff01dc99 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -235,11 +235,8 @@ print $langs->trans("Color").'</td><td>';
 print $formother->showColor($object->color);
 print '</td></tr>';
 
-$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-if (empty($reshook) && ! empty($extrafields->attribute_label))
-{
-	print $object->showOptionals($extrafields);
-}
+// Other attributes
+include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
 print '</table>';
 print '</div>';
@@ -290,7 +287,7 @@ else
 	if (count($cats) > 0)
 	{
 		foreach ($cats as $cat)
-		{			
+		{
 			print "\t".'<tr class="oddeven">'."\n";
 			print "\t\t".'<td class="nowrap">';
 			print "<a href='viewcat.php?id=".$cat->id."&amp;type=".$type."'>".$cat->label."</a>";
@@ -359,7 +356,7 @@ if ($object->type == Categorie::TYPE_PRODUCT)
 		if (count($prods) > 0)
 		{
 			foreach ($prods as $prod)
-			{				
+			{
 				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
 				print $prod->getNomUrl(1);
@@ -408,7 +405,7 @@ if ($object->type == Categorie::TYPE_SUPPLIER)
 		if (count($socs) > 0)
 		{
 			foreach ($socs as $soc)
-			{				
+			{
 				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
 				print $soc->getNomUrl(1);
@@ -462,7 +459,7 @@ if($object->type == Categorie::TYPE_CUSTOMER)
 				if ($user->societe_id > 0 && $soc->id != $user->societe_id)	continue; 	// External user always see only themself
 
 				$i++;
-				
+
 				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
 				print $soc->getNomUrl(1);
@@ -513,7 +510,7 @@ if ($object->type == Categorie::TYPE_MEMBER)
 		if (count($prods) > 0)
 		{
 			foreach ($prods as $key => $member)
-			{				
+			{
 				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
 				$member->ref=$member->login;
@@ -567,7 +564,7 @@ if($object->type == Categorie::TYPE_CONTACT)
 			foreach ($contacts as $key => $contact)
 			{
 				$i++;
-				
+
 				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
 				print $contact->getNomUrl(1,'category');
@@ -619,7 +616,7 @@ if ($object->type == Categorie::TYPE_ACCOUNT)
         if (count($accounts) > 0)
         {
             foreach ($accounts as $key => $account)
-            {              
+            {
                 print "\t".'<tr class="oddeven">'."\n";
                 print '<td class="nowrap" valign="top">';
                 print $account->getNomUrl(1,0);
@@ -672,7 +669,7 @@ if ($object->type == Categorie::TYPE_PROJECT)
 		if (count($projects) > 0)
 		{
 			foreach ($projects as $key => $project)
-			{				
+			{
 				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
 				print $project->getNomUrl(1,0);
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index eb2eddb3197..3a634cc21cd 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -121,7 +121,7 @@ if (GETPOST('removedassigned') || GETPOST('removedassigned') == '0')
 	$donotclearsession=1;
 	if ($action == 'add') $action = 'create';
 	if ($action == 'update') $action = 'edit';
-	
+
 	$listUserAssignedUpdated = true;
 }
 
@@ -734,7 +734,7 @@ if ($action == 'create')
 	print '<div class="assignedtouser">';
 	print $form->select_dolusers_forevent(($action=='create'?'add':'update'), 'assignedtouser', 1, '', 0, '', '', 0, 0, 0, 'AND u.statut != 0');
 	print '</div>';
-	if (in_array($user->id,array_keys($listofuserid))) 
+	if (in_array($user->id,array_keys($listofuserid)))
 	{
 		print '<div class="myavailability">';
 		print $langs->trans("MyAvailability").': <input id="transparency" type="checkbox" name="transparency"'.(((! isset($_GET['transparency']) && ! isset($_POST['transparency'])) || GETPOST('transparency'))?' checked':'').'> '.$langs->trans("Busy");
@@ -752,8 +752,8 @@ if ($action == 'create')
 
 	print '</table>';
 	print '<br><br>';
-	
-	
+
+
 	print '<table class="border" width="100%">';
 
 	// Related company
@@ -830,12 +830,9 @@ if ($action == 'create')
     $doleditor->Create();
     print '</td></tr>';
 
-
     // Other attributes
-    $parameters=array('id'=>$object->id);
+    $parameters=array();
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-
-
 	if (empty($reshook) && ! empty($extrafields->attribute_label))
 	{
 		print $object->showOptionals($extrafields,'edit');
@@ -863,11 +860,11 @@ if ($id > 0)
 	$result3=$object->fetch_contact();
 	$result4=$object->fetch_userassigned();
 	$result5=$object->fetch_optionals($id,$extralabels);
-	
-	if ($listUserAssignedUpdated || $donotclearsession) 
+
+	if ($listUserAssignedUpdated || $donotclearsession)
 	{
         $percentage=in_array(GETPOST('status'),array(-1,100))?GETPOST('status'):(in_array(GETPOST('complete'),array(-1,100))?GETPOST('complete'):GETPOST("percentage"));	// If status is -1 or 100, percentage is not defined and we must use status
-	
+
 		$datep=dol_mktime($fulldayevent?'00':$aphour, $fulldayevent?'00':$apmin, 0, $_POST["apmonth"], $_POST["apday"], $_POST["apyear"]);
 		$datef=dol_mktime($fulldayevent?'23':$p2hour, $fulldayevent?'59':$p2min, $fulldayevent?'59':'0', $_POST["p2month"], $_POST["p2day"], $_POST["p2year"]);
 
@@ -884,7 +881,7 @@ if ($id > 0)
 		//$object->societe->id = $_POST["socid"];			// deprecated
 		//$object->contact->id = $_POST["contactid"];		// deprecated
 		$object->fk_project  = GETPOST("projectid",'int');
-		
+
 		$object->note = GETPOST("note");
 	}
 
@@ -1076,11 +1073,11 @@ if ($id > 0)
 				$listofuserid=json_decode($_SESSION['assignedtouser'], true);
 			}
 		}
-		
+
 		print '<div class="assignedtouser">';
 		print $form->select_dolusers_forevent(($action=='create'?'add':'update'), 'assignedtouser', 1, '', 0, '', '', 0, 0, 0, 'AND u.statut != 0');
 		print '</div>';
-		if (in_array($user->id,array_keys($listofuserid))) 
+		if (in_array($user->id,array_keys($listofuserid)))
 		{
 			print '<div class="myavailability">';
 			print $langs->trans("MyAvailability").':  <input id="transparency" type="checkbox" name="transparency"'.($listofuserid[$user->id]['transparency']?' checked':'').'>'.$langs->trans("Busy");
@@ -1098,10 +1095,10 @@ if ($id > 0)
 
 		print '</table>';
 
-		
+
 		print '<br><br>';
 
-		
+
 		print '<table class="border" width="100%">';
 
 		if ($conf->societe->enabled)
@@ -1165,7 +1162,7 @@ if ($id > 0)
         print '</td></tr>';
 
         // Other attributes
-        $parameters=array('id'=>$object->id);
+        $parameters=array();
         $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 		if (empty($reshook) && ! empty($extrafields->attribute_label))
 		{
@@ -1212,8 +1209,8 @@ if ($id > 0)
 		$out.=img_picto($langs->trans("ViewDay"),'object_calendarday','class="hideonsmartphone pictoactionview"');
 		$out.='<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($object->datep,'%Y').'&month='.dol_print_date($object->datep,'%m').'&day='.dol_print_date($object->datep,'%d').'">'.$langs->trans("ViewDay").'</a>';
 		$linkback.=$out;
-		
-		
+
+
 		$morehtmlref='<div class="refidno">';
 		// Thirdparty
 		//$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
@@ -1253,14 +1250,14 @@ if ($id > 0)
 		    }
 		}
 		$morehtmlref.='</div>';
-		
-		
+
+
 		dol_banner_tab($object, 'id', $linkback, ($user->societe_id?0:1), 'id', 'ref', $morehtmlref);
-		
+
 	    print '<div class="fichecenter">';
-	
+
 		print '<div class="underbanner clearboth"></div>';
-		
+
 		// Affichage fiche action en mode visu
 		print '<table class="border" width="100%">';
 
@@ -1324,7 +1321,7 @@ if ($id > 0)
 		print '<div class="assignedtouser">';
 		print $form->select_dolusers_forevent('view', 'assignedtouser', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
 		print '</div>';
-		if ($object->datep != $object->datef && in_array($user->id,array_keys($listofuserid))) 
+		if ($object->datep != $object->datef && in_array($user->id,array_keys($listofuserid)))
 		{
 			print '<div class="myavailability">';
 			print $langs->trans("MyAvailability").': '.(($object->userassigned[$user->id]['transparency'] > 0)?$langs->trans("Busy"):$langs->trans("Available"));	// We show nothing if event is assigned to nobody
@@ -1364,7 +1361,7 @@ if ($id > 0)
 				}
 			}
 			print '</td></tr>';
-			
+
 			// Related contact
 			print '<tr><td>'.$langs->trans("ActionOnContact").'</td>';
 			print '<td colspan="3">';
@@ -1385,7 +1382,7 @@ if ($id > 0)
 			}
 			print '</td></tr>';
 		}
-		
+
 		// Priority
 		print '<tr><td class="nowrap" class="titlefield">'.$langs->trans("Priority").'</td><td colspan="3">';
 		print ($object->priority?$object->priority:'');
@@ -1409,38 +1406,13 @@ if ($id > 0)
 		print '</td></tr>';
 
         // Other attributes
-		$parameters=array('colspan'=>' colspan="3"', 'colspanvalue'=>'3', 'id'=>$object->id);
-        $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+        $cols=3;
+        include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
 		print '</table>';
 
-		//Extra field
-		if (empty($reshook) && ! empty($extrafields->attribute_label))
-		{
-			print '<br><br>';
-		    print '<div class="underbanner clearboth"></div>';
-			print '<table class="border" width="100%">';
-			foreach($extrafields->attribute_label as $key=>$label)
-			{
-				if (isset($_POST["options_" . $key])) {
-					if (is_array($_POST["options_" . $key])) {
-						// $_POST["options"] is an array but following code expects a comma separated string
-						$value = implode(",", $_POST["options_" . $key]);
-					} else {
-						$value = $_POST["options_" . $key];
-					}
-				} else {
-					$value = $object->array_options["options_" . $key];
-				}
-				print '<tr><td class="titlefield">'.$label.'</td><td>';
-				print $extrafields->showOutputField($key,$value);
-				print "</td></tr>\n";
-			}
-			print '</table>';
-		}
-
 		print '</div>';
-		
+
 		dol_fiche_end();
 	}
 
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 5b08519b9b8..bee23ad4ded 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -131,7 +131,7 @@ if (empty($reshook))
 		$result=$object->setBankAccount(GETPOST('fk_account','int'));
 		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 	}
-	
+
 	// customer preferred shipping method
     if ($action == 'setshippingmethod' && $user->rights->societe->creer)
     {
@@ -207,9 +207,9 @@ if ($id > 0)
 	dol_fiche_head($head, 'customer', $langs->trans("ThirdParty"), -1, 'company');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
-	
+
     dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
-        
+
 	print '<div class="fichecenter"><div class="fichehalfleft">';
 
     print '<div class="underbanner clearboth"></div>';
@@ -376,11 +376,11 @@ if ($id > 0)
 	    $limit_field_type = (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE)) ? 'numeric' : 'amount';
 	    print $form->editfieldval("OutstandingBill",'outstanding_limit',$object->outstanding_limit,$object,$user->rights->societe->creer,$limit_field_type,($object->outstanding_limit != '' ? price($object->outstanding_limit) : ''));
 	    //if (empty($object->outstanding_limit)) print $langs->trans("NoLimit");
-	
+
 	    print '</td>';
 	    print '</tr>';
 	}
-	
+
 	// Multiprice level
 	if (! empty($conf->global->PRODUIT_MULTIPRICES))
 	{
@@ -432,13 +432,8 @@ if ($id > 0)
 	}
 
 	// Other attributes
-	$parameters=array('socid'=>$object->id, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');
-	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	if (empty($reshook) && ! empty($extrafields->attribute_label))
-	{
-		print $object->showOptionals($extrafields);
-	}
+	$parameters=array('socid'=>$object->id);
+	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
     // Sales representative
 	include DOL_DOCUMENT_ROOT.'/societe/tpl/linesalesrepresentative.tpl.php';
@@ -471,10 +466,10 @@ if ($id > 0)
 	if ($object->client == 2 || $object->client == 3)
 	{
     	print '<br>';
-    
+
     	print '<div class="underbanner clearboth"></div>';
     	print '<table class="border" width="100%">';
-	
+
 	    // Level of prospect
 	    print '<tr><td class="titlefield nowrap">';
 	    print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
@@ -508,12 +503,12 @@ if ($id > 0)
         print '</div></td></tr>';
 	   print "</table>";
 	}
-	
+
 	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
 
 	$boxstat = '';
-	
+
 	// Nbre max d'elements des petites listes
 	$MAXLIST=$conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 
@@ -521,7 +516,7 @@ if ($id > 0)
 	$boxstat.='<div class="box">';
 	$boxstat.='<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="noborder boxtable boxtablenobottom" width="100%">';
 	$boxstat.='<tr class="impair"><td colspan="2" class="tdboxstats nohover">';
-	
+
 	if ($conf->propal->enabled)
 	{
     	// Box proposals
@@ -557,14 +552,14 @@ if ($id > 0)
 	    $boxstat.='</div>';
 	    if ($link) $boxstat.='</a>';
 	}
-	
+
 	if ($conf->facture->enabled)
 	{
     	$tmp = $object->getOutstandingBills();
     	$outstandingOpened=$tmp['opened'];
     	$outstandingTotal=$tmp['total_ht'];
     	$outstandingTotalIncTax=$tmp['total_ttc'];
-	    
+
     	$text=$langs->trans("OverAllInvoices");
     	$link='';
     	$icon='bill';
@@ -574,7 +569,7 @@ if ($id > 0)
     	$boxstat.='<span class="boxstatsindicator">'.price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
     	$boxstat.='</div>';
     	if ($link) $boxstat.='</a>';
-    	
+
     	// Box outstanding bill
     	$warn = '';
     	if ($object->outstanding_limit != '' && $object->outstanding_limit < $outstandingOpened)
@@ -591,13 +586,13 @@ if ($id > 0)
     	$boxstat.='</div>';
     	if ($link) $boxstat.='</a>';
 	}
-	
+
 	$boxstat.='</td></tr>';
 	$boxstat.='</table>';
 	$boxstat.='</div>';
-	
+
     print $boxstat;
-    
+
 	$now=dol_now();
 
 	/*
@@ -639,7 +634,7 @@ if ($id > 0)
 			while ($i < $num && $i < $MAXLIST)
 			{
 				$objp = $db->fetch_object($resql);
-				
+
 				print '<tr class="oddeven">';
                 print '<td class="nowrap">';
                 $propal_static->id = $objp->propalid;
@@ -723,7 +718,7 @@ if ($id > 0)
 			while ($i < $num && $i < $MAXLIST)
 			{
 				$objp = $db->fetch_object($resql);
-				
+
 				print '<tr class="oddeven">';
                 print '<td class="nowrap">';
                 $commande_static->id = $objp->cid;
@@ -849,7 +844,7 @@ if ($id > 0)
 				$contrat=new Contrat($db);
 
 				$objp = $db->fetch_object($resql);
-				
+
 				print '<tr class="oddeven">';
 				print '<td class="nowrap">';
 				$contrat->id=$objp->id;
@@ -905,7 +900,7 @@ if ($id > 0)
 				print '<td width="20px" align="right"><a href="'.DOL_URL_ROOT.'/fichinter/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"),'stats').'</a></td>';
 				print '</tr></table></td>';
 				print '</tr>';
-				
+
 			}
 			$i = 0;
 			while ($i < $num && $i < $MAXLIST)
@@ -921,7 +916,7 @@ if ($id > 0)
 				print '<td align="right" style="min-width: 60px">'.convertSecondToTime($objp->duration).'</td>'."\n";
 				print '<td align="right" class="nowrap" style="min-width: 60px">'.$fichinter_static->getLibStatut(5).'</td>'."\n";
 				print '</tr>';
-				
+
 				$i++;
 			}
 			$db->free($resql);
@@ -977,7 +972,7 @@ if ($id > 0)
 			while ($i < $num && $i < $MAXLIST)
 			{
 				$objp = $db->fetch_object($resql);
-				
+
 				print '<tr class="oddeven">';
 				print '<td class="nowrap">';
 				$facturestatic->id = $objp->facid;
@@ -1006,7 +1001,7 @@ if ($id > 0)
     				print price($objp->total_ttc);
     				print '</td>';
 				}
-				
+
 				print '<td align="right" class="nowrap" style="min-width: 60px">'.($facturestatic->LibStatut($objp->paye,$objp->statut,5,$objp->am)).'</td>';
 				print "</tr>\n";
 				$i++;
@@ -1042,31 +1037,31 @@ if ($id > 0)
         {
             print '<div class="inline-block divButAction"><a class="butActionRefused" title="'.dol_escape_js($langs->trans("ThirdPartyIsClosed")).'" href="#">'.$langs->trans("ThirdPartyIsClosed").'</a></div>';
         }
-        
+
     	if (! empty($conf->propal->enabled) && $user->rights->propal->creer && $object->status==1)
     	{
     		$langs->load("propal");
     		print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/comm/propal/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddProp").'</a></div>';
     	}
-    
+
     	if (! empty($conf->commande->enabled) && $user->rights->commande->creer && $object->status==1)
     	{
     		$langs->load("orders");
     		print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddOrder").'</a></div>';
     	}
-    
+
     	if ($user->rights->contrat->creer && $object->status==1)
     	{
     		$langs->load("contracts");
     		print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/contrat/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddContract").'</a></div>';
     	}
-    
+
     	if (! empty($conf->ficheinter->enabled) && $user->rights->ficheinter->creer && $object->status==1)
     	{
     		$langs->load("fichinter");
     		print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/fichinter/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddIntervention").'</a></div>';
     	}
-    
+
     	// Add invoice
     	if ($user->societe_id == 0)
     	{
@@ -1075,7 +1070,7 @@ if ($id > 0)
     			$langs->load("trips");
     			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/deplacement/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddTrip").'</a></div>';
     		}
-    
+
     		if (! empty($conf->facture->enabled) && $object->status==1)
     		{
     			if (empty($user->rights->facture->creer))
@@ -1086,7 +1081,7 @@ if ($id > 0)
     			{
     				$langs->load("bills");
     				$langs->load("orders");
-    
+
     				if (! empty($conf->commande->enabled))
     				{
     				    if ($object->client != 0 && $object->client != 2)
@@ -1099,11 +1094,11 @@ if ($id > 0)
 
     				if ($object->client != 0 && $object->client != 2) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a></div>';
     				else print '<div class="inline-block divButAction"><a class="butActionRefused" title="'.dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
-    
+
     			}
     		}
     	}
-    
+
     	// Add action
     	if (! empty($conf->agenda->enabled) && ! empty($conf->global->MAIN_REPEATTASKONEACHTAB) && $object->status==1)
     	{
@@ -1117,7 +1112,7 @@ if ($id > 0)
     		}
     	}
     }
-    
+
 	print '</div>';
 
 	if (! empty($conf->global->MAIN_REPEATCONTACTONEACHTAB))
diff --git a/htdocs/comm/mailing/advtargetemailing.php b/htdocs/comm/mailing/advtargetemailing.php
index 0a9cdca7abc..0262a50d65c 100644
--- a/htdocs/comm/mailing/advtargetemailing.php
+++ b/htdocs/comm/mailing/advtargetemailing.php
@@ -767,16 +767,15 @@ if ($object->fetch($id) >= 0) {
 		} else {
 			$std_soc = new Societe($db);
 			$action_search = 'query';
+
 			// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
 			include_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
 			$hookmanager = new HookManager($db);
-			$hookmanager->initHooks(array (
-					'thirdpartycard'
-			));
+			$hookmanager->initHooks(array ('thirdpartycard'));
+
+			$parameters=array();
 			if (! empty($advTarget->id)) {
-				$parameters = array (
-						'array_query' => $advTarget->filtervalue
-				);
+				$parameters = array('array_query' => $advTarget->filtervalue);
 			}
 			// Module extrafield feature
 			$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $std_soc, $action_search);
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 0b4c3c239f9..956710e2abc 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -231,10 +231,10 @@ if (empty($reshook))
 
 							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_ORDER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
 							else $substitutionarray['__SECUREKEYPAYPAL_ORDER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'order' . $obj->source_id, 2);
-							
+
 							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_INVOICE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
 							else $substitutionarray['__SECUREKEYPAYPAL_INVOICE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'invoice' . $obj->source_id, 2);
-							
+
 							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
 							else $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'contractline' . $obj->source_id, 2);
 						}
@@ -700,11 +700,11 @@ if ($action == 'create')
 	}
 	$htmltext.='</i>';
 
-	
+
 	$availablelink=$form->textwithpicto($langs->trans("AvailableVariables"), $htmltext, 1, 'help', '', 0, 2, 'availvar');
 	//print '<a href="javascript:document_preview(\''.DOL_URL_ROOT.'/admin/modulehelp.php?id='.$objMod->numero.'\',\'text/html\',\''.dol_escape_js($langs->trans("Module")).'\')">'.img_picto($langs->trans("ClickToShowDescription"), $imginfo).'</a>';
-	
-	
+
+
 	// Print mail form
 	print load_fiche_titre($langs->trans("NewMailing"), $availablelink, 'title_generic');
 
@@ -733,14 +733,14 @@ if ($action == 'create')
 	print '</td></tr>';
 
 	print '</table>';
-	
+
 	print '<div style="padding-top: 10px">';
 	// Editeur wysiwyg
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 	$doleditor=new DolEditor('body',$_POST['body'],'',600,'dolibarr_mailings','',true,true,$conf->global->FCKEDITOR_ENABLE_MAILING,20,'90%');
 	$doleditor->Create();
 	print '</div>';
-	
+
 	dol_fiche_end();
 
 	print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("CreateMailing").'"></div>';
@@ -809,7 +809,7 @@ else
 				{
 				    if (! empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
 				    if (! empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
-				    
+
 					// The feature is forbidden from GUI, we show just message to use from command line.
 				    setEventMessages($langs->trans("MailingNeedCommand"), null, 'warnings');
 					setEventMessages('<textarea cols="60" rows="'.ROWS_1.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.'</textarea>', null, 'warnings');
@@ -823,7 +823,7 @@ else
 				{
 				    if (! empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
 				    if (! empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
-				    
+
 				    $text='';
 				    if ($conf->global->MAILING_LIMIT_SENDBYCLI >= 0)
                     {
@@ -841,12 +841,12 @@ else
 
 			$morehtmlright='';
 			if ($object->statut == 2) $morehtmlright.=' ('.$object->countNbOfTargets('alreadysent').'/'.$object->nbemail.') ';
-			
+
 			dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', $morehtmlright);
 
 			print '<div class="fichecenter">';
 			print '<div class="underbanner clearboth"></div>';
-			
+
 			print '<table class="border" width="100%">';
 
 			// Description
@@ -863,7 +863,7 @@ else
 			print '<tr><td>'.$form->editfieldkey("MailErrorsTo",'email_errorsto',$object->email_errorsto,$object,$user->rights->mailing->creer && $object->statut < 3,'string').'</td><td colspan="3">';
 			print $form->editfieldval("MailErrorsTo",'email_errorsto',$object->email_errorsto,$object,$user->rights->mailing->creer && $object->statut < 3,'string');
 			print '</td></tr>';
-			
+
 			// Nb of distinct emails
 			print '<tr><td>';
 			print $langs->trans("TotalNbOfDistinctRecipients");
@@ -895,20 +895,15 @@ else
 			print '</td></tr>';
 
 			// Other attributes
-			$parameters=array();
-			$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-			if (empty($reshook) && ! empty($extrafields->attribute_label))
-			{
-				print $object->showOptionals($extrafields);
-			}
+			include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
 			print '</table>';
 
 			print "</div>";
-			
+
 			dol_fiche_end();
 
-			
+
 			// Clone confirmation
 			if ($action == 'clone')
 			{
@@ -1053,12 +1048,12 @@ else
 				$htmltext.=$key.' = '.$langs->trans($val).'<br>';
 			}
 			$htmltext.='</i>';
-			
+
 			// Print mail content
 			print load_fiche_titre($langs->trans("EMail"), $form->textwithpicto($langs->trans("AvailableVariables"), $htmltext, 1, 'help', '', 0, 2, 'emailsubstitionhelp'), 'title_generic');
-			
+
 			dol_fiche_head('', '', '', -1);
-			
+
 			print '<table class="border" width="100%">';
 
 			// Subject
@@ -1086,9 +1081,9 @@ else
             /*print '<tr><td width="15%">'.$langs->trans("BackgroundColorByDefault").'</td><td colspan="3">';
             print $htmlother->selectColor($object->bgcolor,'bgcolor','edit_mailing',0);
             print '</td></tr>';*/
-			
+
 			print '</table>';
-			
+
 		    // Message
 			print '<div style="padding-top: 10px" bgcolor="'.($object->bgcolor?(preg_match('/^#/',$object->bgcolor)?'':'#').$object->bgcolor:'white').'">';
 			if (empty($object->bgcolor) || strtolower($object->bgcolor) == 'ffffff')
@@ -1103,23 +1098,23 @@ else
 			print '</div>';
 
 			dol_fiche_end();
-			
+
 		}
 		else
 		{
 			/*
 			 * Mailing en mode edition
 			 */
-			
+
 			dol_fiche_head($head, 'card', $langs->trans("Mailing"), -1, 'email');
-			
+
 			$linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/list.php">'.$langs->trans("BackToList").'</a>';
 
 			$morehtmlright='';
 			if ($object->statut == 2) $morehtmlright.=' ('.$object->countNbOfTargets('alreadysent').'/'.$object->nbemail.') ';
-			
+
 			dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', $morehtmlright);
-			
+
 			print '<div class="fichecenter">';
 			print '<div class="underbanner clearboth"></div>';
 
@@ -1131,7 +1126,7 @@ else
 			print $form->showrefnav($object,'id', $linkback);
 			print '</td></tr>';
 			*/
-			
+
 			// Topic
 			print '<tr><td class="titlefield">'.$langs->trans("MailTitle").'</td><td colspan="3">'.$object->titre.'</td></tr>';
 			// From
@@ -1171,24 +1166,24 @@ else
 
 
 			print "<br>\n";
-			
+
 			print '<form name="edit_mailing" action="card.php" method="post" enctype="multipart/form-data">'."\n";
 			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 			print '<input type="hidden" name="action" value="update">';
 			print '<input type="hidden" name="id" value="'.$object->id.'">';
-			
+
 			$htmltext = '<i>'.$langs->trans("FollowingConstantsWillBeSubstituted").':<br>';
 			foreach($object->substitutionarray as $key => $val)
 			{
 				$htmltext.=$key.' = '.$langs->trans($val).'<br>';
 			}
 			$htmltext.='</i>';
-			
+
 			// Print mail content
 			print load_fiche_titre($langs->trans("EMail"), $form->textwithpicto($langs->trans("AvailableVariables"), $htmltext, 1, 'help', '', 0, 2, 'emailsubstitionhelp'), 'title_generic');
 
 			dol_fiche_head();
-			
+
 			print '<table class="border" width="100%">';
 
 			// Subject
@@ -1237,9 +1232,9 @@ else
 			print '<tr><td>'.$langs->trans("BackgroundColorByDefault").'</td><td colspan="3">';
 			print $htmlother->selectColor($object->bgcolor,'bgcolor','edit_mailing',0);
 			print '</td></tr>';
-			
+
 			print '</table>';
-			
+
 			// Message
 			print '<div style="padding-top: 10px">';
 			// Editeur wysiwyg
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index df86464281a..2dee7425e8c 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -499,7 +499,7 @@ if (empty($reshook))
 
 										$tva_tx = $lines[$i]->tva_tx;
 										if (! empty($lines[$i]->vat_src_code) && ! preg_match('/\(/', $tva_tx)) $tva_tx .= ' ('.$lines[$i]->vat_src_code.')';
-										
+
 										$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, 'HT', 0, $lines[$i]->info_bits, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $date_start, $date_end, $array_options, $lines[$i]->fk_unit);
 
 										if ($result > 0) {
@@ -755,7 +755,7 @@ if (empty($reshook))
 			$db->begin();
 
             // $tva_tx can be 'x.x (XXX)'
-            
+
 			// Ecrase $pu par celui du produit
 			// Ecrase $desc par celui du produit
 			// Ecrase $tva_tx par celui du produit
@@ -770,7 +770,7 @@ if (empty($reshook))
 				$tva_tx = get_default_tva($mysoc, $object->thirdparty, $prod->id);
 				$tva_npr = get_default_npr($mysoc, $object->thirdparty, $prod->id);
 				if (empty($tva_tx)) $tva_npr=0;
-				
+
 				$pu_ht = $prod->price;
 				$pu_ttc = $prod->price_ttc;
 				$price_min = $prod->price_min;
@@ -811,7 +811,7 @@ if (empty($reshook))
 
 				$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $tva_tx));
 				$tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx));
-				
+
 				// if price ht is forced (ie: calculated by margin rate and cost price). TODO Why this ?
 				if (! empty($price_ht)) {
 					$pu_ht = price2num($price_ht, 'MU');
@@ -1170,27 +1170,12 @@ if (empty($reshook))
 		$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 		$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
 		if ($ret < 0) $error++;
-
 		if (! $error)
 		{
-			// Actions on extra fields (by external module or standard code)
-			// TODO le hook fait double emploi avec le trigger !!
-			$hookmanager->initHooks(array('propaldao'));
-			$parameters = array('id' => $object->id);
-			$reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $object, $action); // Note that $action and $object may have been
-			                                                                                           // modified by
-			                                                                                           // some hooks
-			if (empty($reshook)) {
-				$result = $object->insertExtraFields();
-				if ($result < 0) {
-					$error ++;
-				}
-			} else if ($reshook < 0)
-				$error ++;
+			$result = $object->insertExtraFields();
+			if ($result < 0) $error++;
 		}
-
-		if ($error)
-			$action = 'edit_extras';
+		if ($error) $action = 'edit_extras';
 	}
 
 	if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->propal->creer)
@@ -1325,7 +1310,7 @@ if ($action == 'create')
 			// Replicate extrafields
 			$objectsrc->fetch_optionals($originid);
 			$object->array_options = $objectsrc->array_options;
-			
+
 			if (!empty($conf->multicurrency->enabled))
 			{
 			    if (!empty($objectsrc->multicurrency_code)) $currency_code = $objectsrc->multicurrency_code;
@@ -1355,10 +1340,10 @@ if ($action == 'create')
 	print '<table class="border" width="100%">';
 
 	// Reference
-	print '<tr><td class="titlefieldcreate fieldrequired">' . $langs->trans('Ref') . '</td><td colspan="2">' . $langs->trans("Draft") . '</td></tr>';
+	print '<tr><td class="titlefieldcreate fieldrequired">' . $langs->trans('Ref') . '</td><td>' . $langs->trans("Draft") . '</td></tr>';
 
 	// Ref customer
-	print '<tr><td>' . $langs->trans('RefCustomer') . '</td><td colspan="2">';
+	print '<tr><td>' . $langs->trans('RefCustomer') . '</td><td>';
 	print '<input type="text" name="ref_client" value="'.GETPOST('ref_client').'"></td>';
 	print '</tr>';
 
@@ -1366,7 +1351,7 @@ if ($action == 'create')
 	print '<tr>';
 	print '<td class="fieldrequired">' . $langs->trans('Customer') . '</td>';
 	if ($socid > 0) {
-		print '<td colspan="2">';
+		print '<td>';
 		print $soc->getNomUrl(1);
 		print '<input type="hidden" name="socid" value="' . $soc->id . '">';
 		print '</td>';
@@ -1374,7 +1359,7 @@ if ($action == 'create')
             $shipping_method_id = $soc->shipping_method_id;
         }
 	} else {
-		print '<td colspan="2">';
+		print '<td>';
 		print $form->select_company('', 'socid', '(s.client = 1 OR s.client = 2 OR s.client = 3) AND status=1', 'SelectThirdParty');
 		// reload page to retrieve customer informations
 		if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE))
@@ -1396,7 +1381,7 @@ if ($action == 'create')
 	// Contacts (ask contact only if thirdparty already defined). TODO do this also into order and invoice.
 	if ($socid > 0)
 	{
-		print "<tr><td>" . $langs->trans("DefaultContact") . '</td><td colspan="2">';
+		print "<tr><td>" . $langs->trans("DefaultContact") . '</td><td>';
 		$form->select_contacts($soc->id, $contactid, 'contactid', 1, $srccontactslist);
 		print '</td></tr>';
 	}
@@ -1404,7 +1389,7 @@ if ($action == 'create')
 	if ($socid > 0)
 	{
 		// Ligne info remises tiers
-		print '<tr><td>' . $langs->trans('Discounts') . '</td><td colspan="2">';
+		print '<tr><td>' . $langs->trans('Discounts') . '</td><td>';
 		if ($soc->remise_percent)
 			print $langs->trans("CompanyHasRelativeDiscount", $soc->remise_percent);
 		else
@@ -1420,26 +1405,26 @@ if ($action == 'create')
 	}
 
 	// Date
-	print '<tr><td class="fieldrequired">' . $langs->trans('Date') . '</td><td colspan="2">';
+	print '<tr><td class="fieldrequired">' . $langs->trans('Date') . '</td><td>';
 	$form->select_date('', '', '', '', '', "addprop", 1, 1);
 	print '</td></tr>';
 
 	// Validaty duration
-	print '<tr><td class="fieldrequired">' . $langs->trans("ValidityDuration") . '</td><td colspan="2"><input name="duree_validite" size="5" value="' . $conf->global->PROPALE_VALIDITY_DURATION . '"> ' . $langs->trans("days") . '</td></tr>';
+	print '<tr><td class="fieldrequired">' . $langs->trans("ValidityDuration") . '</td><td><input name="duree_validite" size="5" value="' . $conf->global->PROPALE_VALIDITY_DURATION . '"> ' . $langs->trans("days") . '</td></tr>';
 
 	// Terms of payment
-	print '<tr><td class="nowrap fieldrequired">' . $langs->trans('PaymentConditionsShort') . '</td><td colspan="2">';
+	print '<tr><td class="nowrap fieldrequired">' . $langs->trans('PaymentConditionsShort') . '</td><td>';
 	$form->select_conditions_paiements($soc->cond_reglement_id, 'cond_reglement_id');
 	print '</td></tr>';
 
 	// Mode of payment
-	print '<tr><td>' . $langs->trans('PaymentMode') . '</td><td colspan="2">';
+	print '<tr><td>' . $langs->trans('PaymentMode') . '</td><td>';
 	$form->select_types_paiements($soc->mode_reglement_id, 'mode_reglement_id');
 	print '</td></tr>';
 
     // Bank Account
     if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL) && ! empty($conf->banque->enabled)) {
-        print '<tr><td>' . $langs->trans('BankAccount') . '</td><td colspan="2">';
+        print '<tr><td>' . $langs->trans('BankAccount') . '</td><td>';
         $form->select_comptes($fk_account, 'fk_account', 0, '', 1);
         print '</td></tr>';
     }
@@ -1450,20 +1435,20 @@ if ($action == 'create')
 	print '</td></tr>';
 
 	// Delivery delay
-	print '<tr class="fielddeliverydelay"><td>' . $langs->trans('AvailabilityPeriod') . '</td><td colspan="2">';
+	print '<tr class="fielddeliverydelay"><td>' . $langs->trans('AvailabilityPeriod') . '</td><td>';
 	$form->selectAvailabilityDelay('', 'availability_id', '', 1);
 	print '</td></tr>';
 
     // Shipping Method
     if (! empty($conf->expedition->enabled)) {
-        print '<tr><td>' . $langs->trans('SendingMethod') . '</td><td colspan="2">';
+        print '<tr><td>' . $langs->trans('SendingMethod') . '</td><td>';
         print $form->selectShippingMethod($shipping_method_id, 'shipping_method_id', '', 1);
         print '</td></tr>';
     }
 
 	// Delivery date (or manufacturing)
 	print '<tr><td>' . $langs->trans("DeliveryDate") . '</td>';
-	print '<td colspan="2">';
+	print '<td>';
 	if ($conf->global->DATE_LIVRAISON_WEEK_DELAY != "") {
 		$tmpdte = time() + ((7 * $conf->global->DATE_LIVRAISON_WEEK_DELAY) * 24 * 60 * 60);
 		$syear = date("Y", $tmpdte);
@@ -1483,7 +1468,7 @@ if ($action == 'create')
 
 		$langs->load("projects");
 		print '<tr>';
-		print '<td>' . $langs->trans("Project") . '</td><td colspan="2">';
+		print '<td>' . $langs->trans("Project") . '</td><td>';
 		$numprojet = $formproject->select_projects($soc->id, $projectid, 'projectid', 0);
 		print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid=' . $soc->id . '&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'">' . $langs->trans("AddProject") . '</a>';
 		print '</td>';
@@ -1495,7 +1480,7 @@ if ($action == 'create')
 	{
 		print '<tr>';
 		print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $soc->libelle_incoterms, 1).'</label></td>';
-        print '<td colspan="3" class="maxwidthonsmartphone">';
+        print '<td class="maxwidthonsmartphone">';
         print $form->select_incoterms((!empty($soc->fk_incoterms) ? $soc->fk_incoterms : ''), (!empty($soc->location_incoterms)?$soc->location_incoterms:''));
 		print '</td></tr>';
 	}
@@ -1503,7 +1488,7 @@ if ($action == 'create')
 	// Template to use by default
 	print '<tr>';
 	print '<td>' . $langs->trans("DefaultModel") . '</td>';
-	print '<td colspan="2">';
+	print '<td>';
 	$liste = ModelePDFPropales::liste_modeles($db);
 	print $form->selectarray('model', $liste, ($conf->global->PROPALE_ADDON_PDF_ODT_DEFAULT ? $conf->global->PROPALE_ADDON_PDF_ODT_DEFAULT : $conf->global->PROPALE_ADDON_PDF));
 	print "</td></tr>";
@@ -1513,7 +1498,7 @@ if ($action == 'create')
 	{
 		print '<tr>';
 		print '<td>'.fieldLabel('Currency','multicurrency_code').'</td>';
-        print '<td colspan="3" class="maxwidthonsmartphone">';
+        print '<td class="maxwidthonsmartphone">';
 	    print $form->selectMultiCurrency($currency_code, 'multicurrency_code', 0);
 		print '</td></tr>';
 	}
@@ -1521,7 +1506,7 @@ if ($action == 'create')
 	// Public note
 	print '<tr>';
 	print '<td class="tdtop">' . $langs->trans('NotePublic') . '</td>';
-	print '<td valign="top" colspan="2">';
+	print '<td valign="top">';
 	$note_public = $object->getDefaultCreateValueFor('note_public', (is_object($objectsrc)?$objectsrc->note_public:null));
 	$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
 	print $doleditor->Create(1);
@@ -1531,7 +1516,7 @@ if ($action == 'create')
 	{
 		print '<tr>';
 		print '<td class="tdtop">' . $langs->trans('NotePrivate') . '</td>';
-		print '<td valign="top" colspan="2">';
+		print '<td valign="top">';
         $note_private = $object->getDefaultCreateValueFor('note_private', ((! empty($origin) && ! empty($originid) && is_object($objectsrc))?$objectsrc->note_private:null));
 		$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
 		print $doleditor->Create(1);
@@ -1540,10 +1525,8 @@ if ($action == 'create')
 	}
 
 	// Other attributes
-	$parameters = array('colspan' => ' colspan="3"');
-	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified
-	                                                                                           // by
-	                                                                                           // hook
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	if (empty($reshook) && ! empty($extrafields->attribute_label)) {
 		print $object->showOptionals($extrafields, 'edit');
 	}
@@ -1578,19 +1561,19 @@ if ($action == 'create')
 		elseif ($newclassname == 'Fichinter')
 			$newclassname = 'Intervention';
 
-		print '<tr><td>' . $langs->trans($newclassname) . '</td><td colspan="2">' . $objectsrc->getNomUrl(1) . '</td></tr>';
-		print '<tr><td>' . $langs->trans('TotalHT') . '</td><td colspan="2">' . price($objectsrc->total_ht, 0, $langs, 1, -1, -1, $conf->currency) . '</td></tr>';
-		print '<tr><td>' . $langs->trans('TotalVAT') . '</td><td colspan="2">' . price($objectsrc->total_tva, 0, $langs, 1, -1, -1, $conf->currency) . "</td></tr>";
+		print '<tr><td>' . $langs->trans($newclassname) . '</td><td>' . $objectsrc->getNomUrl(1) . '</td></tr>';
+		print '<tr><td>' . $langs->trans('TotalHT') . '</td><td>' . price($objectsrc->total_ht, 0, $langs, 1, -1, -1, $conf->currency) . '</td></tr>';
+		print '<tr><td>' . $langs->trans('TotalVAT') . '</td><td>' . price($objectsrc->total_tva, 0, $langs, 1, -1, -1, $conf->currency) . "</td></tr>";
 		if ($mysoc->localtax1_assuj == "1" || $objectsrc->total_localtax1 != 0 ) 		// Localtax1
 		{
-			print '<tr><td>' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td><td colspan="2">' . price($objectsrc->total_localtax1, 0, $langs, 1, -1, -1, $conf->currency) . "</td></tr>";
+			print '<tr><td>' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td><td>' . price($objectsrc->total_localtax1, 0, $langs, 1, -1, -1, $conf->currency) . "</td></tr>";
 		}
 
 		if ($mysoc->localtax2_assuj == "1" || $objectsrc->total_localtax2 != 0) 		// Localtax2
 		{
-			print '<tr><td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td><td colspan="2">' . price($objectsrc->total_localtax2, 0, $langs, 1, -1, -1, $conf->currency) . "</td></tr>";
+			print '<tr><td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td><td>' . price($objectsrc->total_localtax2, 0, $langs, 1, -1, -1, $conf->currency) . "</td></tr>";
 		}
-		print '<tr><td>' . $langs->trans('TotalTTC') . '</td><td colspan="2">' . price($objectsrc->total_ttc, 0, $langs, 1, -1, -1, $conf->currency) . "</td></tr>";
+		print '<tr><td>' . $langs->trans('TotalTTC') . '</td><td>' . price($objectsrc->total_ttc, 0, $langs, 1, -1, -1, $conf->currency) . "</td></tr>";
 	}
 
 	print "</table>\n";
@@ -2036,43 +2019,6 @@ if ($action == 'create')
 		print '</td></tr>';
 	}
 
-	// Project
-	/*
-	if (! empty($conf->projet->enabled))
-	{
-		$langs->load("projects");
-		print '<tr><td>';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		print $langs->trans('Project') . '</td>';
-		if ($user->rights->propal->creer)
-		{
-			if ($action != 'classify')
-				print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a></td>';
-			print '</tr></table>';
-			print '</td><td colspan="5">';
-			if ($action == 'classify') {
-				$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1);
-			} else {
-				$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0);
-			}
-			print '</td></tr>';
-		} else {
-			print '</td></tr></table>';
-			if (! empty($object->fk_project)) {
-				print '<td colspan="3">';
-				$proj = new Project($db);
-				$proj->fetch($object->fk_project);
-				print '<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-				print $proj->ref;
-				print '</a>';
-				print '</td>';
-			} else {
-				print '<td colspan="3">&nbsp;</td>';
-			}
-		}
-		print '</tr>';
-	}*/
-
 	if ($soc->outstanding_limit)
 	{
 		// Outstanding Bill
@@ -2129,7 +2075,6 @@ if ($action == 'create')
 	}
 
 	// Other attributes
-	$cols = 2;
 	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
 	print '</table>';
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index ebd8864568a..189d13c3ced 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -49,7 +49,7 @@ if (! empty($conf->projet->enabled)) {
 	require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
 }
-    
+
 require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
 
 if (!empty($conf->variants->enabled)) {
@@ -116,7 +116,7 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-	if ($cancel) 
+	if ($cancel)
 	{
 		if ($action != 'addlink' && $action != 'updateline')
 		{
@@ -130,7 +130,7 @@ if (empty($reshook))
         }
 		$action='';
 	}
-	
+
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; 	// Must be include, not include_once
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';		// Must be include, not include_once
@@ -379,7 +379,7 @@ if (empty($reshook))
 
 								$tva_tx = $lines[$i]->tva_tx;
 								if (! empty($lines[$i]->vat_src_code) && ! preg_match('/\(/', $tva_tx)) $tva_tx .= ' ('.$lines[$i]->vat_src_code.')';
-								
+
 								$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, $lines[$i]->info_bits, $lines[$i]->fk_remise_except, 'HT', 0, $date_start, $date_end, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $array_options, $lines[$i]->fk_unit, $object->origin, $lines[$i]->rowid);
 
 								if ($result < 0) {
@@ -779,7 +779,7 @@ if (empty($reshook))
 
 				$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $tva_tx));
 				$tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx));
-				
+
 				// if price ht is forced (ie: calculated by margin rate and cost price). TODO Why this ?
 				if (! empty($price_ht)) {
 					$pu_ht = price2num($price_ht, 'MU');
@@ -1457,10 +1457,10 @@ if ($action == 'create' && $user->rights->commande->creer)
 	print '<table class="border" width="100%">';
 
 	// Reference
-	print '<tr><td class="titlefieldcreate fieldrequired">' . $langs->trans('Ref') . '</td><td colspan="2">' . $langs->trans("Draft") . '</td></tr>';
+	print '<tr><td class="titlefieldcreate fieldrequired">' . $langs->trans('Ref') . '</td><td>' . $langs->trans("Draft") . '</td></tr>';
 
 	// Reference client
-	print '<tr><td>' . $langs->trans('RefCustomer') . '</td><td colspan="2">';
+	print '<tr><td>' . $langs->trans('RefCustomer') . '</td><td>';
 	if (!empty($conf->global->MAIN_USE_PROPAL_REFCLIENT_FOR_ORDER) && ! empty($origin) && ! empty($originid))
 		print '<input type="text" name="ref_client" value="'.$ref_client.'"></td>';
 	else
@@ -1471,12 +1471,12 @@ if ($action == 'create' && $user->rights->commande->creer)
 	print '<tr>';
 	print '<td class="fieldrequired">' . $langs->trans('Customer') . '</td>';
 	if ($socid > 0) {
-		print '<td colspan="2">';
+		print '<td>';
 		print $soc->getNomUrl(1);
 		print '<input type="hidden" name="socid" value="' . $soc->id . '">';
 		print '</td>';
 	} else {
-		print '<td colspan="2">';
+		print '<td>';
 		print $form->select_company('', 'socid', 's.client = 1 OR s.client = 3', 'SelectThirdParty');
 		// reload page to retrieve customer informations
 		if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE))
@@ -1497,12 +1497,12 @@ if ($action == 'create' && $user->rights->commande->creer)
 
 	// Contact of order
 	if ($socid > 0) {
-		print "<tr><td>" . $langs->trans("DefaultContact") . '</td><td colspan="2">';
+		print "<tr><td>" . $langs->trans("DefaultContact") . '</td><td>';
 		$form->select_contacts($soc->id, $setcontact, 'contactid', 1, $srccontactslist);
 		print '</td></tr>';
 
 		// Ligne info remises tiers
-		print '<tr><td>' . $langs->trans('Discounts') . '</td><td colspan="2">';
+		print '<tr><td>' . $langs->trans('Discounts') . '</td><td>';
 		if ($soc->remise_percent)
 			print $langs->trans("CompanyHasRelativeDiscount", $soc->remise_percent);
 		else
@@ -1517,12 +1517,12 @@ if ($action == 'create' && $user->rights->commande->creer)
 		print '</td></tr>';
 	}
 	// Date
-	print '<tr><td class="fieldrequired">' . $langs->trans('Date') . '</td><td colspan="2">';
+	print '<tr><td class="fieldrequired">' . $langs->trans('Date') . '</td><td>';
 	$form->select_date('', 're', '', '', '', "crea_commande", 1, 1);			// Always autofill date with current date
 	print '</td></tr>';
 
 	// Delivery date planed
-	print "<tr><td>".$langs->trans("DateDeliveryPlanned").'</td><td colspan="2">';
+	print "<tr><td>".$langs->trans("DateDeliveryPlanned").'</td><td>';
 	if (empty($datedelivery))
 	{
 		if (! empty($conf->global->DATE_LIVRAISON_WEEK_DELAY)) $datedelivery = time() + ((7*$conf->global->DATE_LIVRAISON_WEEK_DELAY) * 24 * 60 * 60);
@@ -1532,31 +1532,31 @@ if ($action == 'create' && $user->rights->commande->creer)
 	print "</td></tr>";
 
 	// Conditions de reglement
-	print '<tr><td class="nowrap">' . $langs->trans('PaymentConditionsShort') . '</td><td colspan="2">';
+	print '<tr><td class="nowrap">' . $langs->trans('PaymentConditionsShort') . '</td><td>';
 	$form->select_conditions_paiements($cond_reglement_id, 'cond_reglement_id', - 1, 1);
 	print '</td></tr>';
 
 	// Mode de reglement
-	print '<tr><td>' . $langs->trans('PaymentMode') . '</td><td colspan="2">';
+	print '<tr><td>' . $langs->trans('PaymentMode') . '</td><td>';
 	$form->select_types_paiements($mode_reglement_id, 'mode_reglement_id');
 	print '</td></tr>';
 
     // Bank Account
 	if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_ORDER) && ! empty($conf->banque->enabled))
 	{
-		print '<tr><td>' . $langs->trans('BankAccount') . '</td><td colspan="2">';
+		print '<tr><td>' . $langs->trans('BankAccount') . '</td><td>';
     	$form->select_comptes($fk_account, 'fk_account', 0, '', 1);
     	print '</td></tr>';
 	}
 
 	// Delivery delay
-	print '<tr class="fielddeliverydelay"><td>' . $langs->trans('AvailabilityPeriod') . '</td><td colspan="2">';
+	print '<tr class="fielddeliverydelay"><td>' . $langs->trans('AvailabilityPeriod') . '</td><td>';
 	$form->selectAvailabilityDelay($availability_id, 'availability_id', '', 1);
 	print '</td></tr>';
 
     // Shipping Method
     if (! empty($conf->expedition->enabled)) {
-        print '<tr><td>' . $langs->trans('SendingMethod') . '</td><td colspan="2">';
+        print '<tr><td>' . $langs->trans('SendingMethod') . '</td><td>';
         print $form->selectShippingMethod($shipping_method_id, 'shipping_method_id', '', 1);
         print '</td></tr>';
     }
@@ -1565,13 +1565,13 @@ if ($action == 'create' && $user->rights->commande->creer)
     if (! empty($conf->expedition->enabled) && ! empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER)) {
         require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
         $formproduct=new FormProduct($db);
-        print '<tr><td>' . $langs->trans('Warehouse') . '</td><td colspan="2">';
+        print '<tr><td>' . $langs->trans('Warehouse') . '</td><td>';
         print $formproduct->selectWarehouses($warehouse_id, 'warehouse_id', '', 1);
         print '</td></tr>';
     }
 
 	// What trigger creation
-	print '<tr><td>' . $langs->trans('Source') . '</td><td colspan="2">';
+	print '<tr><td>' . $langs->trans('Source') . '</td><td>';
 	$form->selectInputReason($demand_reason_id, 'demand_reason_id', '', 1);
 	print '</td></tr>';
 
@@ -1582,7 +1582,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 	{
 		$langs->load("projects");
 		print '<tr>';
-		print '<td>' . $langs->trans("Project") . '</td><td colspan="2">';
+		print '<td>' . $langs->trans("Project") . '</td><td>';
 		$numprojet = $formproject->select_projects($soc->id, $projectid, 'projectid', 0);
 		print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid=' . $soc->id . '&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'">' . $langs->trans("AddProject") . '</a>';
 		print '</td>';
@@ -1594,7 +1594,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 	{
 		print '<tr>';
 		print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $objectsrc->libelle_incoterms, 1).'</label></td>';
-        print '<td colspan="3" class="maxwidthonsmartphone">';
+        print '<td class="maxwidthonsmartphone">';
         $incoterm_id = GETPOST('incoterm_id');
         $incoterm_location = GETPOST('location_incoterms');
         if (empty($incoterm_id))
@@ -1607,16 +1607,15 @@ if ($action == 'create' && $user->rights->commande->creer)
 	}
 
 	// Other attributes
-	$parameters = array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"', 'socid'=>$socid);
+	$parameters = array('objectsrc' => $objectsrc, 'socid'=>$socid);
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by
-	                                                                                      // hook
 	if (empty($reshook) && ! empty($extrafields->attribute_label)) {
 		print $object->showOptionals($extrafields, 'edit');
 	}
 
 	// Template to use by default
 	print '<tr><td>' . $langs->trans('DefaultModel') . '</td>';
-	print '<td colspan="2">';
+	print '<td>';
 	include_once DOL_DOCUMENT_ROOT . '/core/modules/commande/modules_commande.php';
 	$liste = ModelePDFCommandes::liste_modeles($db);
 	print $form->selectarray('model', $liste, $conf->global->COMMANDE_ADDON_PDF);
@@ -1627,7 +1626,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 	{
 		print '<tr>';
 		print '<td>'.fieldLabel('Currency','multicurrency_code').'</td>';
-        print '<td colspan="3" class="maxwidthonsmartphone">';
+        print '<td class="maxwidthonsmartphone">';
 	    print $form->selectMultiCurrency($currency_code, 'multicurrency_code');
 		print '</td></tr>';
 	}
@@ -1635,7 +1634,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 	// Note public
 	print '<tr>';
 	print '<td class="tdtop">' . $langs->trans('NotePublic') . '</td>';
-	print '<td colspan="2">';
+	print '<td>';
 
 	$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
 	print $doleditor->Create(1);
@@ -1646,7 +1645,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 	if (empty($user->societe_id)) {
 		print '<tr>';
 		print '<td class="tdtop">' . $langs->trans('NotePrivate') . '</td>';
-		print '<td colspan="2">';
+		print '<td>';
 
 		$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
 		print $doleditor->Create(1);
@@ -1689,26 +1688,26 @@ if ($action == 'create' && $user->rights->commande->creer)
 				$newclassname = $classname;
 		}
 
-		print '<tr><td>' . $langs->trans($newclassname) . '</td><td colspan="2">' . $objectsrc->getNomUrl(1) . '</td></tr>';
-		print '<tr><td>' . $langs->trans('TotalHT') . '</td><td colspan="2">' . price($objectsrc->total_ht) . '</td></tr>';
-		print '<tr><td>' . $langs->trans('TotalVAT') . '</td><td colspan="2">' . price($objectsrc->total_tva) . "</td></tr>";
+		print '<tr><td>' . $langs->trans($newclassname) . '</td><td>' . $objectsrc->getNomUrl(1) . '</td></tr>';
+		print '<tr><td>' . $langs->trans('TotalHT') . '</td><td>' . price($objectsrc->total_ht) . '</td></tr>';
+		print '<tr><td>' . $langs->trans('TotalVAT') . '</td><td>' . price($objectsrc->total_tva) . "</td></tr>";
 		if ($mysoc->localtax1_assuj == "1" || $objectsrc->total_localtax1 != 0) 		// Localtax1 RE
 		{
-			print '<tr><td>' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td><td colspan="2">' . price($objectsrc->total_localtax1) . "</td></tr>";
+			print '<tr><td>' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td><td>' . price($objectsrc->total_localtax1) . "</td></tr>";
 		}
 
 		if ($mysoc->localtax2_assuj == "1" || $objectsrc->total_localtax2 != 0) 		// Localtax2 IRPF
 		{
-			print '<tr><td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td><td colspan="2">' . price($objectsrc->total_localtax2) . "</td></tr>";
+			print '<tr><td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td><td>' . price($objectsrc->total_localtax2) . "</td></tr>";
 		}
 
-		print '<tr><td>' . $langs->trans('TotalTTC') . '</td><td colspan="2">' . price($objectsrc->total_ttc) . "</td></tr>";
+		print '<tr><td>' . $langs->trans('TotalTTC') . '</td><td>' . price($objectsrc->total_ttc) . "</td></tr>";
 
 		if (!empty($conf->multicurrency->enabled))
 		{
-			print '<tr><td>' . $langs->trans('MulticurrencyTotalHT') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_ht) . '</td></tr>';
-			print '<tr><td>' . $langs->trans('MulticurrencyTotalVAT') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_tva) . "</td></tr>";
-			print '<tr><td>' . $langs->trans('MulticurrencyTotalTTC') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_ttc) . "</td></tr>";
+			print '<tr><td>' . $langs->trans('MulticurrencyTotalHT') . '</td><td>' . price($objectsrc->multicurrency_total_ht) . '</td></tr>';
+			print '<tr><td>' . $langs->trans('MulticurrencyTotalVAT') . '</td><td>' . price($objectsrc->multicurrency_total_tva) . "</td></tr>";
+			print '<tr><td>' . $langs->trans('MulticurrencyTotalTTC') . '</td><td>' . price($objectsrc->multicurrency_total_ttc) . "</td></tr>";
 		}
 	}
 
@@ -2240,7 +2239,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 		}
 		print '</td></tr>';
 		*/
-		
+
 		$tmparray=$object->getTotalWeightVolume();
 		$totalWeight=$tmparray['weight'];
 		$totalVolume=$tmparray['volume'];
@@ -2269,7 +2268,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 	        else print '&nbsp;';
 	        print '</td></tr></table>';
 	        print '</td>';
-	        print '<td colspan="3">';
+	        print '<td>';
 			if ($action != 'editincoterm')
 			{
 				print $form->textwithpicto($object->display_incoterms(), $object->libelle_incoterms, 1);
@@ -2291,7 +2290,7 @@ if ($action == 'create' && $user->rights->commande->creer)
         	if ($action != 'editbankaccount' && $user->rights->commande->creer)
         	    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'),1).'</a></td>';
         	print '</tr></table>';
-        	print '</td><td colspan="3">';
+        	print '</td><td>';
         	if ($action == 'editbankaccount') {
         	    $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
         	} else {
@@ -2302,7 +2301,6 @@ if ($action == 'create' && $user->rights->commande->creer)
 		}
 
 		// Other attributes
-		$cols = 2;
 		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
 		print '</table>';
@@ -2320,18 +2318,18 @@ if ($action == 'create' && $user->rights->commande->creer)
 		    print '<tr><td class="titlefieldmiddle">' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . '</td>';
 		    print '<td class="nowrap">' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
 		    print '</tr>';
-		
+
 		    // Multicurrency Amount VAT
 		    print '<tr><td>' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . '</td>';
 		    print '<td class="nowrap">' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
 		    print '</tr>';
-		
+
 		    // Multicurrency Amount TTC
 		    print '<tr><td>' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . '</td>';
 		    print '<td class="nowrap">' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
 		    print '</tr>';
 		}
-		
+
 		// Total HT
 		print '<tr><td class="titlefieldmiddle">' . $langs->trans('AmountHT') . '</td>';
 		print '<td>' . price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency) . '</td>';
diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php
index b05b6658ca7..8db18cea304 100644
--- a/htdocs/commande/orderstoinvoice.php
+++ b/htdocs/commande/orderstoinvoice.php
@@ -411,17 +411,17 @@ if ($action == 'create' && !$error)
 	print '<table class="border" width="100%">';
 
 	// Ref
-	print '<tr><td class="fieldrequired">'.$langs->trans('Ref').'</td><td colspan="2">'.$langs->trans('Draft').'</td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans('Ref').'</td><td>'.$langs->trans('Draft').'</td></tr>';
 
 	// Third party
-	print '<tr><td class="fieldrequired">'.$langs->trans('Customer').'</td><td colspan="2">';
+	print '<tr><td class="fieldrequired">'.$langs->trans('Customer').'</td><td>';
 	print $soc->getNomUrl(1);
 	print '<input type="hidden" name="socid" value="'.$soc->id.'">';
 	print '</td>';
 	print '</tr>'."\n";
 
 	// Type
-	print '<tr><td class="tdtop fieldrequired">'.$langs->trans('Type').'</td><td colspan="2">';
+	print '<tr><td class="tdtop fieldrequired">'.$langs->trans('Type').'</td><td>';
 	print '<table class="nobordernopadding">'."\n";
 
 	// Standard invoice
@@ -434,15 +434,15 @@ if ($action == 'create' && !$error)
 	print '</table>';
 
 	// Date invoice
-	print '<tr><td class="fieldrequired">'.$langs->trans('Date').'</td><td colspan="2">';
+	print '<tr><td class="fieldrequired">'.$langs->trans('Date').'</td><td>';
 	$html->select_date('','','','','',"add",1,1);
 	print '</td></tr>';
 	// Payment term
-	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td colspan="2">';
+	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td>';
 	$html->select_conditions_paiements(isset($_POST['cond_reglement_id'])?$_POST['cond_reglement_id']:$cond_reglement_id,'cond_reglement_id');
 	print '</td></tr>';
 	// Payment mode
-	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td colspan="2">';
+	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td>';
 	$html->select_types_paiements(isset($_POST['mode_reglement_id'])?$_POST['mode_reglement_id']:$mode_reglement_id,'mode_reglement_id');
 	print '</td></tr>';
 	// Project
@@ -451,7 +451,7 @@ if ($action == 'create' && !$error)
 		$formproject=new FormProjets($db);
 
 		$langs->load('projects');
-		print '<tr><td>'.$langs->trans('Project').'</td><td colspan="2">';
+		print '<tr><td>'.$langs->trans('Project').'</td><td>';
 		$formproject->select_projects($soc->id, $projectid, 'projectid');
 		print '</td></tr>';
 	}
@@ -469,9 +469,8 @@ if ($action == 'create' && !$error)
 	}
 
 	// Other attributes
-	$parameters=array('objectsrc' => $objectsrc, 'idsrc' => $listoforders, 'colspan' => ' colspan="3"');
+	$parameters=array('objectsrc' => $objectsrc, 'idsrc' => $listoforders);
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-
 	if (empty($reshook) && ! empty($extrafields->attribute_label))
 	{
 		$object=new Facture($db);
@@ -489,8 +488,8 @@ if ($action == 'create' && !$error)
 	// Public note
 	print '<tr>';
 	print '<td class="border" valign="top">'.$langs->trans('NotePublic').'</td>';
-	print '<td valign="top" colspan="2">';
-	print '<textarea name="note_public" wrap="soft" cols="70" rows="'.ROWS_3.'">';
+	print '<td valign="top">';
+	print '<textarea name="note_public" class="quatrevingtpercent" rows="'.ROWS_3.'">';
 
 	print $langs->trans("Orders").": ".implode(', ', $listoforders);
 
@@ -500,8 +499,8 @@ if ($action == 'create' && !$error)
 	{
 		print '<tr>';
 		print '<td class="border" valign="top">'.$langs->trans('NotePrivate').'</td>';
-		print '<td valign="top" colspan="2">';
-		print '<textarea name="note" wrap="soft" cols="70" rows="'.ROWS_3.'">';
+		print '<td valign="top">';
+		print '<textarea name="note" class="quatrevingtpercent" rows="'.ROWS_3.'">';
 
 		print '</textarea></td></tr>';
 	}
@@ -622,7 +621,7 @@ if (($action != 'create' && $action != 'add') || ($action == 'create' && $error)
 		print '<td class="liste_titre" align="left">';
 		print '<input class="flat" type="text" size="10" name="sref_client" value="'.$sref_client.'">';
         print '</td>';
-        
+
 		//DATE ORDER
 		print '<td class="liste_titre" align="center">';
 		print $period;
@@ -637,7 +636,7 @@ if (($action != 'create' && $action != 'add') || ($action == 'create' && $error)
 		print '<td align="right" class="liste_titre">';
 		print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'"  value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
         print '</td>';
-        
+
 		//ALL/NONE
 		print '<td align="center" class="liste_titre">';
 		if ($conf->use_javascript_ajax) print '<a href="#" id="checkall">'.$langs->trans("All").'</a> / <a href="#" id="checknone">'.$langs->trans("None").'</a>';
@@ -653,7 +652,7 @@ if (($action != 'create' && $action != 'add') || ($action == 'create' && $error)
 		while ($i < $num)
 		{
 			$objp = $db->fetch_object($resql);
-			
+
 			print '<tr class="oddeven">';
 			print '<td class="nowrap">';
 
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 2cb90b6a44a..7267769379e 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -75,7 +75,7 @@ if ($action == 'add')
     $error=0;
 
     $db->begin();
-    
+
     // Create account
     $object = new Account($db);
 
@@ -116,7 +116,7 @@ if ($action == 'add')
     $object->comment         = trim(GETPOST("account_comment"));
 
     $object->fk_user_author  = $user->id;
-    
+
     if ($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED && empty($object->account_number))
     {
         setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("AccountancyCode")), null, 'errors');
@@ -149,7 +149,7 @@ if ($action == 'add')
             $object->setCategories($categories);
 
             $_GET["id"]=$id;            // Force chargement page en mode visu
-            
+
             $action='';
         }
         else {
@@ -159,7 +159,7 @@ if ($action == 'add')
             $action='create';   // Force chargement page en mode creation
         }
     }
-    
+
     if (! $error)
     {
         $db->commit();
@@ -324,21 +324,21 @@ if ($action == 'create')
 
 	// Ref
 	print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("Ref").'</td>';
-	print '<td colspan="3"><input size="8" type="text" class="flat" name="ref" value="'.(GETPOST("ref")?GETPOST("ref",'alpha'):$object->ref).'" maxlength="12"></td></tr>';
+	print '<td><input size="8" type="text" class="flat" name="ref" value="'.(GETPOST("ref")?GETPOST("ref",'alpha'):$object->ref).'" maxlength="12"></td></tr>';
 
 	// Label
 	print '<tr><td class="fieldrequired">'.$langs->trans("LabelBankCashAccount").'</td>';
-	print '<td colspan="3"><input size="30" type="text" class="flat" name="label" value="'.GETPOST("label", 'alpha').'"></td></tr>';
+	print '<td><input size="30" type="text" class="flat" name="label" value="'.GETPOST("label", 'alpha').'"></td></tr>';
 
 	// Type
 	print '<tr><td class="fieldrequired">'.$langs->trans("AccountType").'</td>';
-	print '<td colspan="3">';
+	print '<td>';
 	$formbank->selectTypeOfBankAccount(isset($_POST["type"])?$_POST["type"]: Account::TYPE_CURRENT,"type");
 	print '</td></tr>';
 
 	// Currency
 	print '<tr><td class="fieldrequired">'.$langs->trans("Currency").'</td>';
-	print '<td colspan="3">';
+	print '<td>';
 	$selectedcode=$object->currency_code;
 	if (! $selectedcode) $selectedcode=$conf->currency;
 	print $form->selectCurrency((isset($_POST["account_currency_code"])?$_POST["account_currency_code"]:$selectedcode), 'account_currency_code');
@@ -348,7 +348,7 @@ if ($action == 'create')
 
 	// Status
     print '<tr><td class="fieldrequired">'.$langs->trans("Status").'</td>';
-    print '<td colspan="3">';
+    print '<td>';
     print $form->selectarray("clos", $object->status,(isset($_POST["clos"])?$_POST["clos"]:$object->clos));
     print '</td></tr>';
 
@@ -362,13 +362,13 @@ if ($action == 'create')
 	$object->country_code = getCountry($selectedcode, 2);	// Force country code on account to have following field on bank fields matching country rules
 
 	print '<tr><td class="fieldrequired">'.$langs->trans("BankAccountCountry").'</td>';
-	print '<td colspan="3">';
+	print '<td>';
 	print $form->select_country($selectedcode,'account_country_id');
 	if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
 	print '</td></tr>';
 
 	// State
-	print '<tr><td>'.$langs->trans('State').'</td><td colspan="3">';
+	print '<tr><td>'.$langs->trans('State').'</td><td>';
 	if ($selectedcode)
 	{
 		$formcompany->select_departement(isset($_POST["account_state_id"])?$_POST["account_state_id"]:'',$selectedcode,'account_state_id');
@@ -381,12 +381,12 @@ if ($action == 'create')
 
 	// Web
 	print '<tr><td>'.$langs->trans("Web").'</td>';
-	print '<td colspan="3"><input class="minwidth300" type="text" class="flat" name="url" value="'.GETPOST("url").'"></td></tr>';
+	print '<td><input class="minwidth300" type="text" class="flat" name="url" value="'.GETPOST("url").'"></td></tr>';
 
     // Tags-Categories
-    if ($conf->categorie->enabled) 
+    if ($conf->categorie->enabled)
     {
-        print '<tr><td class="tdtop">'.$langs->trans("Categories").'</td><td colspan="3">';
+        print '<tr><td class="tdtop">'.$langs->trans("Categories").'</td><td>';
         $cate_arbo = $form->select_all_categories(Categorie::TYPE_ACCOUNT, '', 'parent', 64, 0, 1);
         $c = new Categorie($db);
         $cats = $c->containing($object->id,Categorie::TYPE_ACCOUNT);
@@ -399,7 +399,7 @@ if ($action == 'create')
 
 	// Comment
 	print '<tr><td class="tdtop">'.$langs->trans("Comment").'</td>';
-	print '<td colspan="3">';
+	print '<td>';
     // Editor wysiwyg
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 	$doleditor=new DolEditor('account_comment',(GETPOST("account_comment")?GETPOST("account_comment"):$object->comment),'',90,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_4,'90%');
@@ -407,7 +407,7 @@ if ($action == 'create')
 	print '</td></tr>';
 
  	// Other attributes
-	$parameters=array('colspan' => 3);
+	$parameters=array();
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 	if (empty($reshook) && ! empty($extrafields->attribute_label))
 	{
@@ -422,18 +422,18 @@ if ($action == 'create')
 
 	// Sold
 	print '<tr><td class="titlefieldcreate">'.$langs->trans("InitialBankBalance").'</td>';
-	print '<td colspan="3"><input size="12" type="text" class="flat" name="solde" value="'.(GETPOST("solde")?GETPOST("solde"):price2num($object->solde)).'"></td></tr>';
+	print '<td><input size="12" type="text" class="flat" name="solde" value="'.(GETPOST("solde")?GETPOST("solde"):price2num($object->solde)).'"></td></tr>';
 
 	print '<tr><td>'.$langs->trans("Date").'</td>';
-	print '<td colspan="3">';
+	print '<td>';
 	$form->select_date('', 're', 0, 0, 0, 'formsoc');
 	print '</td></tr>';
 
 	print '<tr><td>'.$langs->trans("BalanceMinimalAllowed").'</td>';
-	print '<td colspan="3"><input size="12" type="text" class="flat" name="account_min_allowed" value="'.(GETPOST("account_min_allowed")?GETPOST("account_min_allowed"):$object->min_allowed).'"></td></tr>';
+	print '<td><input size="12" type="text" class="flat" name="account_min_allowed" value="'.(GETPOST("account_min_allowed")?GETPOST("account_min_allowed"):$object->min_allowed).'"></td></tr>';
 
 	print '<tr><td>'.$langs->trans("BalanceMinimalDesired").'</td>';
-	print '<td colspan="3"><input size="12" type="text" class="flat" name="account_min_desired" value="'.(GETPOST("account_min_desired")?GETPOST("account_min_desired"):$object->min_desired).'"></td></tr>';
+	print '<td><input size="12" type="text" class="flat" name="account_min_desired" value="'.(GETPOST("account_min_desired")?GETPOST("account_min_desired"):$object->min_desired).'"></td></tr>';
 
 	print '</table>';
 	print '<br>';
@@ -444,7 +444,7 @@ if ($action == 'create')
 
 		// If bank account
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("BankName").'</td>';
-		print '<td colspan="3"><input size="30" type="text" class="flat" name="bank" value="'.(GETPOST('bank')?GETPOST('bank','alpha'):$object->bank).'"></td>';
+		print '<td><input size="30" type="text" class="flat" name="bank" value="'.(GETPOST('bank')?GETPOST('bank','alpha'):$object->bank).'"></td>';
 		print '</tr>';
 
 		// Show fields of bank account
@@ -477,21 +477,21 @@ if ($action == 'create')
 
 		// IBAN
 		print '<tr><td>'.$langs->trans($ibankey).'</td>';
-		print '<td colspan="3"><input size="34" maxlength="34" type="text" class="flat" name="iban" value="'.(GETPOST('iban')?GETPOST('iban','alpha'):$object->iban).'"></td></tr>';
+		print '<td><input size="34" maxlength="34" type="text" class="flat" name="iban" value="'.(GETPOST('iban')?GETPOST('iban','alpha'):$object->iban).'"></td></tr>';
 
 		print '<tr><td>'.$langs->trans($bickey).'</td>';
-		print '<td colspan="3"><input size="11" maxlength="11" type="text" class="flat" name="bic" value="'.(GETPOST('bic')?GETPOST('bic','alpha'):$object->bic).'"></td></tr>';
+		print '<td><input size="11" maxlength="11" type="text" class="flat" name="bic" value="'.(GETPOST('bic')?GETPOST('bic','alpha'):$object->bic).'"></td></tr>';
 
-		print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="3">';
+		print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
 		print "<textarea class=\"flat\" name=\"domiciliation\" rows=\"2\" cols=\"40\">";
 		print (GETPOST('domiciliation')?GETPOST('domiciliation'):$object->domiciliation);
 		print "</textarea></td></tr>";
 
 		print '<tr><td>'.$langs->trans("BankAccountOwner").'</td>';
-		print '<td colspan="3"><input size="30" type="text" class="flat" name="proprio" value="'.(GETPOST('proprio')?GETPOST('proprio','alpha'):$object->proprio).'">';
+		print '<td><input size="30" type="text" class="flat" name="proprio" value="'.(GETPOST('proprio')?GETPOST('proprio','alpha'):$object->proprio).'">';
 		print '</td></tr>';
 
-		print '<tr><td class="tdtop">'.$langs->trans("BankAccountOwnerAddress").'</td><td colspan="3">';
+		print '<tr><td class="tdtop">'.$langs->trans("BankAccountOwnerAddress").'</td><td>';
 		print "<textarea class=\"flat\" name=\"owner_address\" rows=\"2\" cols=\"40\">";
 		print (GETPOST('owner_address')?GETPOST('owner_address','alpha'):$object->owner_address);
 		print "</textarea></td></tr>";
@@ -503,8 +503,8 @@ if ($action == 'create')
 	print '<table class="border" width="100%">';
 	// Accountancy code
 	$fieldrequired='';
-    if (! empty($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED)) $fieldrequired='fieldrequired '; 
-    
+    if (! empty($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED)) $fieldrequired='fieldrequired ';
+
 	if (! empty($conf->accounting->enabled))
 	{
 		print '<tr><td class="'.$fieldrequired.'titlefieldcreate">'.$langs->trans("AccountancyCode").'</td>';
@@ -515,7 +515,7 @@ if ($action == 'create')
 	else
 	{
 		print '<tr><td class="'.$fieldrequired.'titlefieldcreate">'.$langs->trans("AccountancyCode").'</td>';
-		print '<td colspan="3"><input type="text" name="account_number" value="'.(GETPOST("account_number")?GETPOST('account_number', 'alpha'):$object->account_number).'"></td></tr>';
+		print '<td><input type="text" name="account_number" value="'.(GETPOST("account_number")?GETPOST('account_number', 'alpha'):$object->account_number).'"></td></tr>';
 	}
 
 	// Accountancy journal
@@ -565,10 +565,10 @@ else
 
 		// Onglets
 		$head=bank_prepare_head($object);
-		dol_fiche_head($head, 'bankname', $langs->trans("FinancialAccount"),0,'account');
+		dol_fiche_head($head, 'bankname', $langs->trans("FinancialAccount"), -1, 'account');
 
 		$formconfirm = '';
-		
+
 		// Confirmation to delete
 		if ($action == 'delete')
 		{
@@ -578,24 +578,24 @@ else
 
 		// Print form confirm
 		print $formconfirm;
-		
+
 		$linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/index.php">'.$langs->trans("BackToList").'</a>';
-		
+
 		$morehtmlref='';
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-		
-		
+
+
 		print '<div class="fichecenter">';
 		print '<div class="fichehalfleft">';
 		print '<div class="underbanner clearboth"></div>';
-		
+
 		print '<table class="border" width="100%">';
 
 
 		// Ref
 		/*
 		print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td>';
-		print '<td colspan="3">';
+		print '<td>';
 		print $form->showrefnav($object, 'ref', $linkback, 1, 'ref');
 		print '</td></tr>';*/
 
@@ -662,25 +662,25 @@ else
 		    print $object->account_number;
 		}
 		print '</td></tr>';
-		
+
 		// Accountancy journal
 		if (! empty($conf->accounting->enabled))
 		{
 		    print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
 		    print '<td>';
-			
+
 			$accountingjournal = new AccountingJournal($db);
 			$accountingjournal->fetch($object->fk_accountancy_journal);
 
 			print $accountingjournal->getNomUrl(0,1,1,'',1);
-			
+
 			print '</td></tr>';
 		}
-		
+
 		// Other attributes
 		$cols = 2;
 		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
-		
+
 		print '</table>';
 
 		print '</div>';
@@ -689,7 +689,7 @@ else
 		print '<div class="underbanner clearboth"></div>';
 
 		print '<table class="border centpercent">';
-		
+
         // Categories
         if ($conf->categorie->enabled) {
             print '<tr><td class="titlefield">'.$langs->trans("Categories").'</td><td>';
@@ -705,9 +705,9 @@ else
 		if ($object->type == Account::TYPE_SAVINGS || $object->type == Account::TYPE_CURRENT)
 		{
 		    print '<br>';
-		
+
 		    print '<div class="underbanner clearboth"></div>';
-		    
+
 		    print '<table class="border centpercent">';
 
 			print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("BankName").'</td>';
@@ -726,7 +726,7 @@ else
 				}
 
 				print '<tr><td>'.$langs->trans($val).'</td>';
-				print '<td colspan="3">'.$content.'</td>';
+				print '<td>'.$content.'</td>';
 				print '</tr>';
 			}
 
@@ -776,7 +776,7 @@ else
 		print '</div>';
 
 		print '<div class="clearboth"></div>';
-		
+
 		dol_fiche_end();
 
 		/*
@@ -839,7 +839,7 @@ else
         dol_fiche_head('');
 
         print '<div class="underbanner clearboth"></div>';
-        
+
         print '<table class="border" width="100%">';
 
 		// Ref
@@ -921,7 +921,7 @@ else
         print '</td></tr>';
 
         // Tags-Categories
-        if ($conf->categorie->enabled) 
+        if ($conf->categorie->enabled)
         {
             print '<tr><td class="tdtop">'.$langs->trans("Categories").'</td><td>';
             $cate_arbo = $form->select_all_categories(Categorie::TYPE_ACCOUNT, '', 'parent', 64, 0, 1);
@@ -944,12 +944,13 @@ else
 		print '</td></tr>';
 
 		// Other attributes
-		$parameters=array('colspan' => 3);
+		$parameters=array();
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 		if (empty($reshook) && ! empty($extrafields->attribute_label))
 		{
 			print $object->showOptionals($extrafields,'edit');
 		}
+
 		print '</table>';
 		print '<br>';
 
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index 20c49c71468..c0481829425 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -74,7 +74,7 @@ if ($action == 'add' && empty($cancel))
 	$datep=dol_mktime(12,0,0, GETPOST("datepmonth"), GETPOST("datepday"), GETPOST("datepyear"));
 	$datev=dol_mktime(12,0,0, GETPOST("datevmonth"), GETPOST("datevday"), GETPOST("datevyear"));
 	if (empty($datev)) $datev=$datep;
-	
+
 	$object->accountid=GETPOST("accountid") > 0 ? GETPOST("accountid","int") : 0;
 	$object->datev=$datev;
 	$object->datep=$datep;
@@ -207,7 +207,7 @@ if ($action == 'create')
 	print load_fiche_titre($langs->trans("NewVariousPayment"),'', 'title_accountancy.png');
 
 	dol_fiche_head('', '');
-	
+
 	print '<table class="border" width="100%">';
 
 	// Date payment
@@ -274,7 +274,7 @@ if ($action == 'create')
 		print $formaccounting->select_account($accountancy_code, 'accountancy_code', 1, null, 1, 1, '');
         print '</td></tr>';
 	}
-	else // For external software 
+	else // For external software
 	{
 		print '<tr><td>'.$langs->trans("AccountAccounting").'</td>';
 		print '<td class="maxwidthonsmartphone"><input class="minwidth100" name="accountancy_code" value="'.$accountancy_code.'">';
@@ -282,7 +282,7 @@ if ($action == 'create')
 	}
 
 	// Other attributes
-	$parameters=array('colspan' => ' colspan="1"');
+	$parameters=array();
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 
 	print '</table>';
@@ -315,7 +315,7 @@ if ($id)
 	print '<table class="border" width="100%">';
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/various_payment/index.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
-	
+
     print "<tr>";
 	print '<td class="titlefield">'.$langs->trans("Ref").'</td><td>';
 	print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'ref', '');
@@ -372,14 +372,14 @@ if ($id)
 	}
 
 	// Other attributes
-	$parameters=array('colspan' => ' colspan="1"');
-	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+	$parameters=array('socid'=>$object->id);
+	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
 	print '</table>';
 
 	dol_fiche_end();
 
-	
+
 	/*
 	 * Action buttons
 	 */
diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php
index aa315e5c854..949a7701698 100644
--- a/htdocs/compta/deplacement/card.php
+++ b/htdocs/compta/deplacement/card.php
@@ -251,7 +251,7 @@ if ($action == 'create')
     print '<table class="border" width="100%">';
 
     print "<tr>";
-    print '<td width="25%" class="fieldrequired">'.$langs->trans("Type").'</td><td>';
+    print '<td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
     $form->select_type_fees(GETPOST('type','int'),'type',1);
     print '</td></tr>';
 
@@ -277,7 +277,7 @@ if ($action == 'create')
     // Public note
     print '<tr>';
     print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
-    print '<td valign="top" colspan="2">';
+    print '<td>';
 
     $doleditor = new DolEditor('note_public', GETPOST('note_public', 'alpha'), '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8,'90%');
     print $doleditor->Create(1);
@@ -289,7 +289,7 @@ if ($action == 'create')
     {
         print '<tr>';
         print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
-        print '<td valign="top" colspan="2">';
+        print '<td>';
 
         $doleditor = new DolEditor('note_private', GETPOST('note_private', 'alpha'), '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
         print $doleditor->Create(1);
@@ -298,7 +298,7 @@ if ($action == 'create')
     }
 
     // Other attributes
-    $parameters=array('colspan' => ' colspan="2"');
+    $parameters=array();
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 
     print '</table>';
@@ -340,7 +340,7 @@ else if ($id)
 
             // Ref
             print "<tr>";
-            print '<td width="20%">'.$langs->trans("Ref").'</td><td>';
+            print '<td class="titlefield">'.$langs->trans("Ref").'</td><td>';
             print $object->ref;
             print '</td></tr>';
 
@@ -374,7 +374,7 @@ else if ($id)
 
             // Public note
             print '<tr><td class="tdtop">'.$langs->trans("NotePublic").'</td>';
-            print '<td valign="top" colspan="3">';
+            print '<td>';
 
             $doleditor = new DolEditor('note_public', $object->note_public, '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
             print $doleditor->Create(1);
@@ -385,7 +385,7 @@ else if ($id)
             if (empty($user->societe_id))
             {
                 print '<tr><td class="tdtop">'.$langs->trans("NotePrivate").'</td>';
-                print '<td valign="top" colspan="3">';
+                print '<td>';
 
                 $doleditor = new DolEditor('note_private', $object->note_private, '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
                 print $doleditor->Create(1);
@@ -394,7 +394,7 @@ else if ($id)
             }
 
             // Other attributes
-            $parameters=array('colspan' => ' colspan="3"');
+            $parameters=array();
             $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 
             print '</table>';
@@ -412,7 +412,7 @@ else if ($id)
         else
         {
            /*
-            * Confirm delete trip 
+            * Confirm delete trip
             */
             if ($action == 'delete')
             {
@@ -501,9 +501,9 @@ else if ($id)
             // Statut
             print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
 
-            // Other attributes
-            $parameters=array('colspan' => ' colspan="3"', 'showblocbydefault' => 1);
-            $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+        	// Other attributes
+        	$parameters=array('socid'=>$object->id);
+        	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
             print "</table><br>";
 
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index b739e551b9d..e9be0a0b962 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -615,7 +615,7 @@ if (empty($reshook))
 			$db->begin();
 
 			$amount_ht = $amount_tva = $amount_ttc = array();
-			
+
 			// Loop on each vat rate
 			$i = 0;
 			foreach ($object->lines as $line)
@@ -644,19 +644,19 @@ if (empty($reshook))
 			$discount->fk_facture_source = $object->id;
 
 			$error = 0;
-			
-			if ($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT || $object->type == Facture::TYPE_SITUATION) 
+
+			if ($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT || $object->type == Facture::TYPE_SITUATION)
 			{
 				// If we're on a standard invoice, we have to get excess received to create a discount in TTC without VAT
-				
+
 				$sql = 'SELECT SUM(pf.amount) as total_paiements
 						FROM llx_c_paiement as c, llx_paiement_facture as pf, llx_paiement as p
 						WHERE pf.fk_facture = '.$object->id.' AND p.fk_paiement = c.id AND pf.fk_paiement = p.rowid ORDER BY p.datep, p.tms';
-				
+
 				$resql = $db->query($sql);
 				$res = $db->fetch_object($resql);
 				$total_paiements = $res->total_paiements;
-				
+
 				$discount->amount_ht = $discount->amount_ttc = $total_paiements - $object->total_ttc;
 				$discount->amount_tva = 0;
 				$discount->tva_tx = 0;
@@ -666,7 +666,7 @@ if (empty($reshook))
 				{
 					$error++;
 				}
-				
+
 			}
 			if ($object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT)
 			{
@@ -676,7 +676,7 @@ if (empty($reshook))
 					$discount->amount_tva = abs($amount_tva[$tva_tx]);
 					$discount->amount_ttc = abs($amount_ttc[$tva_tx]);
 					$discount->tva_tx = abs($tva_tx);
-	
+
 					$result = $discount->create($user);
 					if ($result < 0)
 					{
@@ -684,7 +684,7 @@ if (empty($reshook))
 						break;
 					}
 				}
-			
+
 			}
 
 			if (empty($error))
@@ -1027,7 +1027,7 @@ if (empty($reshook))
 					}
 
 					$id = $object->create($user);      // This include class to add_object_linked() and add add_contact()
-					
+
 					if ($id > 0)
 					{
 						dol_include_once('/' . $element . '/class/' . $subelement . '.class.php');
@@ -1049,13 +1049,13 @@ if (empty($reshook))
 							{
 								if ($typeamount == 'amount') $amount = $valuedeposit;
 								else $amount = $srcobject->total_ttc * ($valuedeposit / 100);
-								
+
 								$TTotalByTva = array();
 								foreach ($srcobject->lines as &$line)
 								{
 									$TTotalByTva[$line->tva_tx] += $line->total_ttc ;
 								}
-								
+
 								$amount_to_diff = 0;
 								foreach ($TTotalByTva as $tva => &$total)
 								{
@@ -1099,10 +1099,10 @@ if (empty($reshook))
 										$error ++;
 									}
 								}
-								
+
 								$amount_ttc_diff = $amountdeposit[0];
 							}
-							
+
 							foreach ($amountdeposit as $tva => $amount)
 							{
 								$result = $object->addline(
@@ -1116,7 +1116,7 @@ if (empty($reshook))
 										0, 						// remise_percent
 										0, 						// date_start
 										0, 						// date_end
-										0, 
+										0,
 								        $lines[$i]->info_bits,  // info_bits
 										0,
 										'HT',
@@ -1132,16 +1132,16 @@ if (empty($reshook))
 										$langs->trans('Deposit')
 									);
 							}
-							
+
 							$diff = $object->total_ttc - $amount_ttc_diff;
-							
+
 							if (!empty($conf->global->MAIN_DEPOSIT_MULTI_TVA) && $diff != 0)
 							{
 								$object->fetch_lines();
 								$subprice_diff = $object->lines[0]->subprice - $diff / (1 + $object->lines[0]->tva_tx / 100);
 								$object->updateline($object->lines[0]->id, $object->lines[0]->desc, $subprice_diff, $object->lines[0]->qty, $object->lines[0]->remise_percent, $object->lines[0]->date_start, $object->lines[0]->date_end, $object->lines[0]->tva_tx, 0, 0, 'HT', $object->lines[0]->info_bits, $object->lines[0]->product_type, 0, 0, 0, $object->lines[0]->pa_ht, $object->lines[0]->label, 0, array(), 100);
 							}
-							
+
 						}
 						else
 						{
@@ -1219,7 +1219,7 @@ if (empty($reshook))
 
 										$tva_tx = $lines[$i]->tva_tx;
 										if (! empty($lines[$i]->vat_src_code) && ! preg_match('/\(/', $tva_tx)) $tva_tx .= ' ('.$lines[$i]->vat_src_code.')';
-										
+
 										// View third's localtaxes for NOW and do not use value from origin.
 										// TODO Is this really what we want ? Yes if source if template invoice but what if proposal or order ?
 										$localtax1_tx = get_localtax($tva_tx, 1, $object->thirdparty);
@@ -1556,7 +1556,7 @@ if (empty($reshook))
 
 				$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $tva_tx));
 				$tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx));
-			    
+
 				// if price ht was forced (ie: from gui when calculated by margin rate and cost price). TODO Why this ?
 				if (! empty($price_ht))
 				{
@@ -2123,11 +2123,11 @@ if ($action == 'create')
 
 		if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) $currency_code = $soc->multicurrency_code;
 	}
-    
+
 	if (!empty($soc->id)) $absolute_discount = $soc->getAvailableDiscounts();
 	$note_public = $object->getDefaultCreateValueFor('note_public', (is_object($objectsrc)?$objectsrc->note_public:null));
 	$note_private = $object->getDefaultCreateValueFor('note_private', ((! empty($origin) && ! empty($originid) && is_object($objectsrc))?$objectsrc->note_private:null));
-	
+
 	if (! empty($conf->use_javascript_ajax))
 	{
 		require_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
@@ -2331,7 +2331,7 @@ if ($action == 'create')
 	if ((empty($origin)) || ((($origin == 'propal') || ($origin == 'commande')) && (! empty($originid))))
 	{
 		// Deposit
-		if (empty($conf->global->INVOICE_DISABLE_DEPOSIT)) 
+		if (empty($conf->global->INVOICE_DISABLE_DEPOSIT))
    		{
     	    print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
     		$tmp='<input type="radio" id="radio_deposit" name="type" value="3"' . (GETPOST('type') == 3 ? ' checked' : '') . '> ';
@@ -2342,7 +2342,7 @@ if ($action == 'create')
     			});
     		});
     		</script>';
-    
+
     		$desc = $form->textwithpicto($tmp.$langs->trans("InvoiceDeposit"), $langs->transnoentities("InvoiceDepositDesc"), 1, 'help', '', 0, 3);
     		print '<table class="nobordernopadding"><tr><td>';
     		print $desc;
@@ -2356,7 +2356,7 @@ if ($action == 'create')
     			print '<td class="nowrap" style="padding-left: 5px">' . $langs->trans('Value') . ':<input type="text" id="valuedeposit" name="valuedeposit" size="3" value="' . GETPOST('valuedeposit', 'int') . '"/>';
     		}
     		print '</td></tr></table>';
-    
+
     		print '</div></div>';
    		}
 	}
@@ -2388,7 +2388,7 @@ if ($action == 'create')
 		}
 
 		// Replacement
-		if (empty($conf->global->INVOICE_DISABLE_REPLACEMENT)) 
+		if (empty($conf->global->INVOICE_DISABLE_REPLACEMENT))
 		{
     		print '<!-- replacement line -->';
     		print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
@@ -2435,7 +2435,7 @@ if ($action == 'create')
 		if ($socid > 0)
 		{
     		// Credit note
-		    if (empty($conf->global->INVOICE_DISABLE_CREDIT_NOTE)) 
+		    if (empty($conf->global->INVOICE_DISABLE_CREDIT_NOTE))
     		{
     			print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
     			$tmp='<input type="radio" id="radio_creditnote" name="type" value="2"' . (GETPOST('type') == 2 ? ' checked' : '');
@@ -2471,12 +2471,12 @@ if ($action == 'create')
     			$text .= '</select>';
     			$desc = $form->textwithpicto($text, $langs->transnoentities("InvoiceAvoirDesc"), 1, 'help', '', 0, 3);
     			print $desc;
-    
+
     			print '<div id="credit_note_options" class="clearboth">';
     	        print '&nbsp;&nbsp;&nbsp; <input data-role="none" type="checkbox" name="invoiceAvoirWithLines" id="invoiceAvoirWithLines" value="1" onclick="if($(this).is(\':checked\') ) { $(\'#radio_creditnote\').prop(\'checked\', true); $(\'#invoiceAvoirWithPaymentRestAmount\').removeAttr(\'checked\');   }" '.(GETPOST('invoiceAvoirWithLines','int')>0 ? 'checked':'').' /> <label for="invoiceAvoirWithLines">'.$langs->trans('invoiceAvoirWithLines')."</label>";
     	        print '<br>&nbsp;&nbsp;&nbsp; <input data-role="none" type="checkbox" name="invoiceAvoirWithPaymentRestAmount" id="invoiceAvoirWithPaymentRestAmount" value="1" onclick="if($(this).is(\':checked\') ) { $(\'#radio_creditnote\').prop(\'checked\', true);  $(\'#invoiceAvoirWithLines\').removeAttr(\'checked\');   }" '.(GETPOST('invoiceAvoirWithPaymentRestAmount','int')>0 ? 'checked':'').' /> <label for="invoiceAvoirWithPaymentRestAmount">'.$langs->trans('invoiceAvoirWithPaymentRestAmount')."</label>";
     			print '</div>';
-    
+
     			print '</div></div>';
     		}
 		}
@@ -2492,7 +2492,7 @@ if ($action == 'create')
 			print '</div></div>' . "\n";
 		}
 	}
-	
+
 	// Template invoice
 	print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 	$tmp='<input type="radio" name="type" id="radio_template" value="0" disabled> ';
@@ -2589,9 +2589,8 @@ if ($action == 'create')
 	}
 
 	// Other attributes
-	$parameters = array('objectsrc' => $objectsrc,'colspan' => ' colspan="3"');
-	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by
-	                                                                                      // hook
+	$parameters = array('objectsrc' => $objectsrc,'colspan' => ' colspan="2"', 'cols'=>2);
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	if (empty($reshook) && ! empty($extrafields->attribute_label)) {
 		print $object->showOptionals($extrafields, 'edit');
 	}
@@ -2731,7 +2730,7 @@ if ($action == 'create')
 		{
 			print '<tr><td>' . $langs->trans('MulticurrencyTotalHT') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_ht) . '</td></tr>';
 			print '<tr><td>' . $langs->trans('MulticurrencyTotalVAT') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_tva) . "</td></tr>";
-			print '<tr><td>' . $langs->trans('MulticurrencyTotalTTC') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_ttc) . "</td></tr>";	
+			print '<tr><td>' . $langs->trans('MulticurrencyTotalTTC') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_ttc) . "</td></tr>";
 		}
 	}
 
@@ -3488,21 +3487,21 @@ else if ($id > 0 || ! empty($ref))
 	print '<div class="fichehalfright">';
 	print '<div class="ficheaddleft">';
 	print '<div class="underbanner clearboth"></div>';
-	
+
 	print '<table class="border centpercent">';
-	
+
 	if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency))
 	{
 	    // Multicurrency Amount HT
 	    print '<tr><td class="titlefieldmiddle">' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . '</td>';
 	    print '<td class="nowrap amountcard">' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
 	    print '</tr>';
-	
+
 	    // Multicurrency Amount VAT
 	    print '<tr><td>' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . '</td>';
 	    print '<td class="nowrap amountcard">' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
 	    print '</tr>';
-	
+
 	    // Multicurrency Amount TTC
 	    print '<tr><td>' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . '</td>';
 	    print '<td class="nowrap amountcard">' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
@@ -3584,12 +3583,12 @@ else if ($id > 0 || ! empty($ref))
         $nbrows += 5;
     if (! empty($conf->incoterm->enabled))
         $nbrows += 1;
-    
-    if ($object->type == Facture::TYPE_SITUATION && ! empty($conf->global->INVOICE_USE_SITUATION)) 
+
+    if ($object->type == Facture::TYPE_SITUATION && ! empty($conf->global->INVOICE_USE_SITUATION))
     {
         if (count($object->tab_previous_situation_invoice) > 0 || count($object->tab_next_situation_invoice) > 0)
             print '<table class="nobordernopadding paymenttable" width="100%">';
-        
+
         if (count($object->tab_previous_situation_invoice) > 0) {
             // List of previous invoices
             print '<tr class="liste_titre">';
@@ -3601,7 +3600,7 @@ else if ($id > 0 || ! empty($ref))
             print '<td align="right">' . $langs->trans('AmountTTC') . '</td>';
             print '<td width="18">&nbsp;</td>';
             print '</tr>';
-            
+
             $total_prev_ht = $total_prev_ttc = 0;
             foreach ($object->tab_previous_situation_invoice as $prev_invoice) {
                 $totalpaye = $prev_invoice->getSommePaiement();
@@ -3616,9 +3615,9 @@ else if ($id > 0 || ! empty($ref))
                 print '<td align="right">' . price($prev_invoice->total_ttc) . '</td>';
                 print '<td align="right">' . $prev_invoice->getLibStatut(3, $totalpaye) . '</td>';
                 print '</tr>';
-                
+
             }
-            
+
             print '<tr class="oddeven">';
             print '<td colspan="2" align="right"></td>';
             print '<td align="right"><b>' . price($total_prev_ht) . '</b></td>';
@@ -3626,7 +3625,7 @@ else if ($id > 0 || ! empty($ref))
             print '<td width="18">&nbsp;</td>';
             print '</tr>';
         }
-        
+
         if (count($object->tab_next_situation_invoice) > 0) {
             // List of next invoices
             print '<tr class="liste_titre">';
@@ -3637,9 +3636,9 @@ else if ($id > 0 || ! empty($ref))
             print '<td align="right">' . $langs->trans('AmountTTC') . '</td>';
             print '<td width="18">&nbsp;</td>';
             print '</tr>';
-            
+
             $total_next_ht = $total_next_ttc = 0;
-            
+
             foreach ($object->tab_next_situation_invoice as $next_invoice) {
                 $totalpaye = $next_invoice->getSommePaiement();
                 $total_next_ht += $next_invoice->total_ht;
@@ -3652,9 +3651,9 @@ else if ($id > 0 || ! empty($ref))
                 print '<td align="right">' . price($next_invoice->total_ttc) . '</td>';
                 print '<td align="right">' . $next_invoice->getLibStatut(3, $totalpaye) . '</td>';
                 print '</tr>';
-                
+
             }
-            
+
             print '<tr class="oddeven">';
             print '<td colspan="2" align="right"></td>';
 		    if (! empty($conf->banque->enabled)) print '<td align="right"></td>';
@@ -3664,7 +3663,7 @@ else if ($id > 0 || ! empty($ref))
             print '<td width="18">&nbsp;</td>';
             print '</tr>';
         }
-        
+
         if (count($object->tab_previous_situation_invoice) > 0 || count($object->tab_next_situation_invoice) > 0)
             print '</table>';
     }
@@ -3741,7 +3740,7 @@ else if ($id > 0 || ! empty($ref))
                 print '</tr>';
                 $i ++;
             }
-        } 
+        }
         /*else {
             print '<tr class="oddeven"><td colspan="' . $nbcols . '" class="opacitymedium">' . $langs->trans("None") . '</td><td></td><td></td></tr>';
         }*/
@@ -3837,7 +3836,7 @@ else if ($id > 0 || ! empty($ref))
 
         // Billed
         print '<tr><td colspan="' . $nbcols . '" align="right">' . $langs->trans("Billed") . ' :</td><td align="right">' . price($object->total_ttc) . '</td><td>&nbsp;</td></tr>';
-        
+
         // Remainder to pay
         print '<tr><td colspan="' . $nbcols . '" align="right">';
         if ($resteapayeraffiche >= 0)
@@ -3847,11 +3846,11 @@ else if ($id > 0 || ! empty($ref))
         print ' :</td>';
         print '<td align="right"'.($resteapayeraffiche?' class="amountremaintopay"':(' class="'.$cssforamountpaymentcomplete.'"')).'>' . price($resteapayeraffiche) . '</td>';
         print '<td class="nowrap">&nbsp;</td></tr>';
-    } 
+    }
     else // Credit note
     {
         $cssforamountpaymentcomplete='';
-        
+
         // Total already paid back
         print '<tr><td colspan="' . $nbcols . '" align="right">';
         print $langs->trans('AlreadyPaidBack');
@@ -3909,14 +3908,14 @@ else if ($id > 0 || ! empty($ref))
 	{
 		if ($object->situation_cycle_ref && $object->statut == 0) {
 			print '<div class="div-table-responsive">';
-			
+
 			print '<form name="updatealllines" id="updatealllines" action="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '#updatealllines" method="POST">';
 			print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '" />';
 			print '<input type="hidden" name="action" value="updatealllines" />';
 			print '<input type="hidden" name="id" value="' . $object->id . '" />';
-			
+
 			print '<table id="tablelines_all_progress" class="noborder noshadow" width="100%">';
-		    
+
 			print '<tr class="liste_titre nodrag nodrop">';
 
 			if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
@@ -3954,11 +3953,11 @@ else if ($id > 0 || ! empty($ref))
 			print '<td align="right" class="nowrap"><input type="text" size="1" value="" name="all_progress">%</td>';
 			print '<td colspan="4" align="right"><input class="button" type="submit" name="all_percent" value="Modifier" /></td>';
 			print '</tr>';
-			
+
 			print '</table>';
-			
+
 			print '</form>';
-			
+
 			print '</div>';
 		}
 	}
@@ -3969,14 +3968,14 @@ else if ($id > 0 || ! empty($ref))
 	<input type="hidden" name="mode" value="">
 	<input type="hidden" name="id" value="' . $object->id . '">
 	';
-	
+
 	if (! empty($conf->use_javascript_ajax) && $object->statut == 0) {
 	    include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
 	}
-	
+
 	print '<div class="div-table-responsive">';
 	print '<table id="tablelines" class="noborder noshadow" width="100%">';
-	
+
 	// Show object lines
 	if (! empty($object->lines))
 		$ret = $object->printObjectLines($action, $mysoc, $soc, $lineid, 1);
@@ -4037,10 +4036,10 @@ else if ($id > 0 || ! empty($ref))
 					}
 				}
 			}
-			
+
 			$discount = new DiscountAbsolute($db);
 			$result = $discount->fetch(0, $object->id);
-			
+
 			// Reopen a standard paid invoice
 			if ((($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT)
 				|| ($object->type == Facture::TYPE_CREDIT_NOTE && empty($discount->id))
@@ -4097,7 +4096,7 @@ else if ($id > 0 || ! empty($ref))
 			        //print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("AmountMustBePositive")).'">'.$langs->trans("MakeWithdrawRequest").'</a>';
 			    }
 			}
-			
+
 			// Create payment
 			if ($object->type != Facture::TYPE_CREDIT_NOTE && $object->statut == 1 && $object->paye == 0 && $user->rights->facture->paiement) {
 				if ($objectidnext) {
@@ -4253,7 +4252,7 @@ else if ($id > 0 || ! empty($ref))
 		// Show links to link elements
 		$linktoelem = $form->showLinkToObjectBlock($object, null, array('invoice'));
 		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
-		
+
 		// Link for paypal payment
 		if (! empty($conf->paypal->enabled) && $object->statut != 0) {
 			include_once DOL_DOCUMENT_ROOT . '/paypal/lib/paypal.lib.php';
diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php
index 1772b6861dd..315b89637af 100644
--- a/htdocs/compta/localtax/card.php
+++ b/htdocs/compta/localtax/card.php
@@ -158,7 +158,7 @@ if ($id)
 if ($action == 'create')
 {
     print load_fiche_titre($langs->transcountry($lttype==2?"newLT2Payment":"newLT1Payment",$mysoc->country_code));
-    
+
     print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" name="formlocaltax" method="post">'."\n";
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="localTaxType" value="'.$lttype.'">';
@@ -193,14 +193,14 @@ if ($action == 'create')
 	    $form->select_types_paiements(GETPOST("paiementtype"), "paiementtype");
 	    print "</td>\n";
 	    print "</tr>";
-	
+
 		// Number
 		print '<tr><td>'.$langs->trans('Numero');
 		print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
 		print '<td><input name="num_payment" type="text" value="'.GETPOST("num_payment").'"></td></tr>'."\n";
     }
     // Other attributes
-    $parameters=array('colspan' => ' colspan="1"');
+    $parameters=array();
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 
     print '</table>';
@@ -237,20 +237,20 @@ if ($id)
 	print '<table class="border" width="100%">';
 
 	print "<tr>";
-	print '<td width="25%">'.$langs->trans("Ref").'</td><td colspan="3">';
+	print '<td width="25%">'.$langs->trans("Ref").'</td><td>';
 	print $vatpayment->ref;
 	print '</td></tr>';
 
 	print "<tr>";
-	print '<td>'.$langs->trans("DatePayment").'</td><td colspan="3">';
+	print '<td>'.$langs->trans("DatePayment").'</td><td>';
 	print dol_print_date($vatpayment->datep,'day');
 	print '</td></tr>';
 
-	print '<tr><td>'.$langs->trans("DateValue").'</td><td colspan="3">';
+	print '<tr><td>'.$langs->trans("DateValue").'</td><td>';
 	print dol_print_date($vatpayment->datev,'day');
 	print '</td></tr>';
 
-	print '<tr><td>'.$langs->trans("Amount").'</td><td colspan="3">'.price($vatpayment->amount).'</td></tr>';
+	print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($vatpayment->amount).'</td></tr>';
 
 	if (! empty($conf->banque->enabled))
 	{
@@ -261,7 +261,7 @@ if ($id)
 
 	    	print '<tr>';
 	    	print '<td>'.$langs->trans('BankTransactionLine').'</td>';
-			print '<td colspan="3">';
+			print '<td>';
 			print $bankline->getNomUrl(1,0,'showall');
 	    	print '</td>';
 	    	print '</tr>';
@@ -269,13 +269,13 @@ if ($id)
 	}
 
     // Other attributes
-    $parameters=array('colspan' => ' colspan="3"');
+    $parameters=array();
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$vatpayment,$action);    // Note that $action and $object may have been modified by hook
-	
+
     print '</table>';
 
 	dol_fiche_end();
-	
+
 
 	/*
 	* Boutons d'actions
diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php
index 41f6abb25c5..9a5585c2513 100644
--- a/htdocs/compta/prelevement/bons.php
+++ b/htdocs/compta/prelevement/bons.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2010-2012 Juanjo Menent        <jmenent@2byte.es>
  *
@@ -107,33 +107,32 @@ if ($result)
   print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
   print '<input type="hidden" name="page" value="'.$page.'">';
   print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
-  
+
   print_barre_liste($langs->trans("WithdrawalsReceipts"), $page, $_SERVER["PHP_SELF"], $urladd, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_generic', 0, '', '', $limit);
 
   $moreforfilter='';
-    
+
   print '<div class="div-table-responsive">';
   print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
+  print '<tr class="liste_titre">';
+  print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_ref" value="'. $db->escape($search_ref).'"></td>';
+  print '<td class="liste_titre">&nbsp;</td>';
+  print '<td class="liste_titre" align="right">';
+  $searchpicto=$form->showFilterButtons();
+  print $searchpicto;
+  print '</td>';
+  print '</tr>';
+
   print '<tr class="liste_titre">';
   print_liste_field_titre($langs->trans("WithdrawalsReceipts"),$_SERVER["PHP_SELF"],"p.ref",'','','class="liste_titre"');
   print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"p.datec","","",'class="liste_titre" align="center"');
   print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"","","",'align="center"');
   print "</tr>\n";
 
-  print '<tr class="liste_titre">';
-  print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_ref" value="'. $db->escape($search_ref).'"></td>';
-  print '<td class="liste_titre">&nbsp;</td>';
-  print '<td class="liste_titre" align="right">';
-  $searchpicto=$form->showFilterAndCheckAddButtons(0);
-  print $searchpicto;
-  print '</td>';
-  print '</tr>';
-
-
   while ($i < min($num,$limit))
   {
-      $obj = $db->fetch_object($result);     
+      $obj = $db->fetch_object($result);
 
       print '<tr class="oddeven"><td>';
 
@@ -151,9 +150,9 @@ if ($result)
     }
   print "</table>";
   print '</div>';
-  
+
   print '</form>';
-  
+
   $db->free($result);
 }
 else
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 5d77a9b9771..0834b3500a7 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -94,9 +94,7 @@ llxHeader('', $langs->trans("NewStandingOrder"));
 if (prelevement_check_config() < 0)
 {
 	$langs->load("errors");
-	print '<div class="error">';
-	print $langs->trans("ErrorModuleSetupNotComplete");
-	print '</div>';
+	setEventMessages($langs->trans("ErrorModuleSetupNotComplete"), null, 'errors');
 }
 
 /*$h=0;
@@ -148,7 +146,7 @@ if ($nb)
 }
 else
 {
-    print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NoInvoiceToWithdraw")).'">'.$langs->trans("CreateAll")."</a>\n";
+    print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NoInvoiceToWithdraw", $langs->transnoentitiesnoconv("StandingOrders"))).'">'.$langs->trans("CreateAll")."</a>\n";
 }
 
 print "</div>\n";
@@ -194,7 +192,7 @@ if ($resql)
         while ($i < $num && $i < 20)
         {
             $obj = $db->fetch_object($resql);
-            
+
             print '<tr class="oddeven">';
             print '<td>';
             $invoicestatic->id=$obj->rowid;
@@ -268,7 +266,7 @@ if ($result)
     while ($i < min($num,$limit))
     {
         $obj = $db->fetch_object($result);
-        
+
 
         print '<tr class="oddeven">';
 
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index 32257a71a0f..271ce4da7fe 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -129,7 +129,7 @@ if ($resql)
             $invoicestatic->type=$obj->type;
             $alreadypayed=$invoicestatic->getSommePaiement();
 
-            
+
             print '<tr class="oddeven"><td>';
             print $invoicestatic->getNomUrl(1,'withdraw');
             print '</td>';
@@ -157,7 +157,7 @@ if ($resql)
     }
     else
     {
-        print '<tr '.$bc[false].'><td colspan="2" class="opacitymedium">'.$langs->trans("NoInvoiceToWithdraw").'</td></tr>';
+        print '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("NoInvoiceToWithdraw", $langs->transnoentitiesnoconv("StandingOrders")).'</td></tr>';
     }
     print "</table><br>";
 }
@@ -197,7 +197,7 @@ if ($result)
     while ($i < min($num,$limit))
     {
         $obj = $db->fetch_object($result);
-        
+
 
         print '<tr class="oddeven">';
 
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index e9e46b6afff..208be88aeae 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -130,10 +130,24 @@ if ($result)
     print '<form action="'.$_SERVER["PHP_SELF"].'" method="GET">';
 
     $moreforfilter='';
-    
+
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
+    print '<tr class="liste_titre">';
+    print '<td class="liste_titre"><input type="text" class="flat" name="search_line" value="'. dol_escape_htmltag($search_line).'" size="6"></td>';
+    print '<td class="liste_titre"><input type="text" class="flat" name="search_bon" value="'. dol_escape_htmltag($search_bon).'" size="6"></td>';
+    print '<td class="liste_titre">&nbsp;</td>';
+    print '<td class="liste_titre"><input type="text" class="flat" name="search_company" value="'. dol_escape_htmltag($search_company).'" size="6"></td>';
+    print '<td class="liste_titre" align="center"><input type="text" class="flat" name="search_code" value="'. dol_escape_htmltag($search_code).'" size="6"></td>';
+    print '<td class="liste_titre">&nbsp;</td>';
+    print '<td class="liste_titre">&nbsp;</td>';
+    print '<td class="liste_titre" align="right">';
+    $searchpicto=$form->showFilterButtons();
+    print $searchpicto;
+    print '</td>';
+    print '</tr>';
+
     print '<tr class="liste_titre">';
     print_liste_field_titre($langs->trans("Line"),$_SERVER["PHP_SELF"]);
     print_liste_field_titre($langs->trans("WithdrawalsReceipts"),$_SERVER["PHP_SELF"],"p.ref");
@@ -144,24 +158,10 @@ if ($result)
     print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"pl.amount","","",'align="right"');
     print_liste_field_titre('');
 	print "</tr>\n";
-	
-    print '<tr class="liste_titre">';
-    print '<td class="liste_titre"><input type="text" class="flat" name="search_line" value="'. dol_escape_htmltag($search_line).'" size="6"></td>';
-    print '<td class="liste_titre"><input type="text" class="flat" name="search_bon" value="'. dol_escape_htmltag($search_bon).'" size="6"></td>';
-    print '<td class="liste_titre">&nbsp;</td>';
-    print '<td class="liste_titre"><input type="text" class="flat" name="search_company" value="'. dol_escape_htmltag($search_company).'" size="6"></td>';
-    print '<td class="liste_titre" align="center"><input type="text" class="flat" name="search_code" value="'. dol_escape_htmltag($search_code).'" size="6"></td>';
-    print '<td class="liste_titre">&nbsp;</td>';
-    print '<td class="liste_titre">&nbsp;</td>';
-    print '<td class="liste_titre" align="right">';
-    $searchpicto=$form->showFilterAndCheckAddButtons(0);
-    print $searchpicto;
-    print '</td>';
-    print '</tr>';
 
     while ($i < min($num,$limit))
     {
-        $obj = $db->fetch_object($result);    
+        $obj = $db->fetch_object($result);
 
         print '<tr class="oddeven"><td>';
 
@@ -199,9 +199,9 @@ if ($result)
     }
     print "</table>";
     print '</div>';
-    
+
     print '</form>';
-    
+
     $db->free($result);
 }
 else
diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php
index 68f59d03cfa..599f54d97be 100644
--- a/htdocs/compta/salaries/card.php
+++ b/htdocs/compta/salaries/card.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2011-2017 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2014      Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
- * Copyright (C) 2015      Charlie BENKE		<charlie@patas-monkey.com> 
+ * Copyright (C) 2015      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
@@ -72,7 +72,7 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
 	$datesp=dol_mktime(12,0,0, $_POST["datespmonth"], $_POST["datespday"], $_POST["datespyear"]);
 	$dateep=dol_mktime(12,0,0, $_POST["dateepmonth"], $_POST["dateepday"], $_POST["dateepyear"]);
 	if (empty($datev)) $datev=$datep;
-	
+
 	$object->accountid=GETPOST("accountid") > 0 ? GETPOST("accountid","int") : 0;
 	$object->fk_user=GETPOST("fk_user") > 0 ? GETPOST("fk_user","int") : 0;
 	$object->datev=$datev;
@@ -116,7 +116,7 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankAccount")), null, 'errors');
 		$error++;
 	}
-	
+
 	if (! $error)
 	{
 		$db->begin();
@@ -229,7 +229,7 @@ if ($action == 'create')
 	print load_fiche_titre($langs->trans("NewSalaryPayment"),'', 'title_accountancy.png');
 
 	dol_fiche_head('', '');
-	
+
 	print '<table class="border" width="100%">';
 
 	// Date payment
@@ -300,7 +300,7 @@ if ($action == 'create')
 	}
 
 	// Other attributes
-	$parameters=array('colspan' => ' colspan="1"');
+	$parameters=array();
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 
 	print '</table>';
@@ -351,24 +351,24 @@ if ($id)
 	print '<tr><td class="titlefield">'.$langs->trans("Label").'</td><td>'.$object->label.'</td></tr>';
 
 	print "<tr>";
-	print '<td>'.$langs->trans("DateStartPeriod").'</td><td colspan="3">';
+	print '<td>'.$langs->trans("DateStartPeriod").'</td><td>';
 	print dol_print_date($object->datesp,'day');
 	print '</td></tr>';
 
-	print '<tr><td>'.$langs->trans("DateEndPeriod").'</td><td colspan="3">';
+	print '<tr><td>'.$langs->trans("DateEndPeriod").'</td><td>';
 	print dol_print_date($object->dateep,'day');
 	print '</td></tr>';
 
 	print "<tr>";
-	print '<td>'.$langs->trans("DatePayment").'</td><td colspan="3">';
+	print '<td>'.$langs->trans("DatePayment").'</td><td>';
 	print dol_print_date($object->datep,'day');
 	print '</td></tr>';
 
-	print '<tr><td>'.$langs->trans("DateValue").'</td><td colspan="3">';
+	print '<tr><td>'.$langs->trans("DateValue").'</td><td>';
 	print dol_print_date($object->datev,'day');
 	print '</td></tr>';
 
-	print '<tr><td>'.$langs->trans("Amount").'</td><td colspan="3">'.price($object->amount,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
+	print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($object->amount,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
 
 	if (! empty($conf->banque->enabled))
 	{
@@ -379,7 +379,7 @@ if ($id)
 
 			print '<tr>';
 			print '<td>'.$langs->trans('BankTransactionLine').'</td>';
-			print '<td colspan="3">';
+			print '<td>';
 			print $bankline->getNomUrl(1,0,'showall');
 			print '</td>';
 			print '</tr>';
@@ -387,7 +387,7 @@ if ($id)
 	}
 
 	// Other attributes
-	$parameters=array('colspan' => ' colspan="3"');
+	$parameters=array();
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 
 	print '</table>';
@@ -396,7 +396,7 @@ if ($id)
 
 	dol_fiche_end();
 
-	
+
 	/*
 	 * Action buttons
 	 */
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index e33ec6b3d55..4a3ea9ee516 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -65,7 +65,7 @@ if ($action == 'setdatev' && $user->rights->tax->charges->creer)
     $object->datev=dol_mktime(12,0,0,$_POST['datevmonth'],$_POST['datevday'],$_POST['datevyear']);
     $result=$object->update($user);
     if ($result < 0) dol_print_error($db,$object->error);
-    
+
     $action='';
 }
 
@@ -81,7 +81,7 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
 	$object->num_payment=GETPOST("num_payment");
     $object->datev=$datev;
     $object->datep=$datep;
-	
+
 	$amount = price2num(GETPOST("amount"));
 	if ($refund == 1) {
 		$amount= -$amount;
@@ -89,7 +89,7 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
     $object->amount= $amount;
 	$object->label=GETPOST("label");
 	$object->note=GETPOST("note");
-	
+
 	if (empty($object->datev))
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateValue")), null, 'errors');
@@ -207,11 +207,11 @@ if ($action == 'create')
         print '$(document).ready(function () {
                 $("#radiopayment").click(function() {
                     $("#label").val($(this).data("label"));
-                    
+
                 });
                 $("#radiorefund").click(function() {
                     $("#label").val($(this).data("label"));
-                    
+
                 });
         });';
 		print '</script>'."\n";
@@ -282,7 +282,7 @@ if ($action == 'create')
 	print '<td><input name="num_payment" type="text" value="'.GETPOST("num_payment").'"></td></tr>'."\n";
 
     // Other attributes
-    $parameters=array('colspan' => ' colspan="1"');
+    $parameters=array();
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 
     print '</table>';
@@ -349,7 +349,8 @@ if ($id)
 	}
 
 	// Other attributes
-	$reshook=$hookmanager->executeHooks('formObjectOptions','',$object,$action);    // Note that $action and $object may have been modified by hook
+	$parameters=array();
+	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 
 	print '</table>';
 
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index fde2e428169..67a7d9b31e4 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -316,7 +316,7 @@ if (empty($reshook))
                             $object->photo = dol_sanitizeFileName($_FILES['photo']['name']);
 
     					    // Create thumbs
-    					    $object->addThumbs($newfile);					    
+    					    $object->addThumbs($newfile);
                         }
                     }
                 }
@@ -664,7 +664,7 @@ else
 			}
 
             // Other attributes
-            $parameters=array('colspan' => ' colspan="3"');
+            $parameters=array('colspan' => ' colspan="3"','cols'=>3);
             $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
             if (empty($reshook) && ! empty($extrafields->attribute_label))
             {
@@ -674,7 +674,7 @@ else
             print "</table><br>";
 
 			print '<hr style="margin-bottom: 20px">';
-			
+
             // Add personnal information
             print load_fiche_titre('<div class="comboperso">'.$langs->trans("PersonalInformations").'</div>','','');
 
@@ -787,7 +787,7 @@ else
 	            print $object->ref;
 	            print '</td></tr>';
            	}
-           	
+
             // Lastname
             print '<tr><td class="titlefieldcreate fieldrequired"><label for="lastname">'.$langs->trans("Lastname").' / '.$langs->trans("Label").'</label></td>';
             print '<td colspan="3"><input name="lastname" id="lastname" type="text" class="minwidth200" maxlength="80" value="'.(isset($_POST["lastname"])?GETPOST("lastname"):$object->lastname).'" autofocus="autofocus"></td>';
@@ -932,7 +932,7 @@ else
 			}
 
             // Other attributes
-            $parameters=array('colspan' => ' colspan="3"');
+            $parameters=array('colspan' => ' colspan="3"', 'cols'=>3);
             $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
             if (empty($reshook) && ! empty($extrafields->attribute_label))
             {
@@ -1054,7 +1054,7 @@ else
         }
 
         $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php">'.$langs->trans("BackToList").'</a>';
-        
+
         $morehtmlref='<div class="refidno">';
         if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
         {
@@ -1064,14 +1064,14 @@ else
             if ($objsoc->id > 0) $morehtmlref.=$objsoc->getNomUrl(1);
             else $morehtmlref.=$langs->trans("ContactNotLinkedToCompany");
         }
-        $morehtmlref.='</div>';        
-        
+        $morehtmlref.='</div>';
+
         dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
-        
-        
+
+
         print '<div class="fichecenter">';
         print '<div class="fichehalfleft">';
-        
+
         print '<div class="underbanner clearboth"></div>';
         print '<table class="border tableforfield" width="100%">';
 
@@ -1102,26 +1102,14 @@ else
         print $object->LibPubPriv($object->priv);
         print '</td></tr>';
 
-        // Note Public
-        /*
-        print '<tr><td class="tdtop">'.$langs->trans("NotePublic").'</td><td>';
-        print nl2br($object->note_public);
-        print '</td></tr>';
-
-        // Note Private
-        print '<tr><td class="tdtop">'.$langs->trans("NotePrivate").'</td><td>';
-        print nl2br($object->note_private);
-        print '</td></tr>';
-        */
-        
         print '</table>';
-        
+
         print '</div>';
         print '<div class="fichehalfright"><div class="ficheaddleft">';
-       
+
         print '<div class="underbanner clearboth"></div>';
         print '<table class="border tableforfield" width="100%">';
-        
+
 		// Categories
 		if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire)) {
 			print '<tr><td class="titlefield">' . $langs->trans("Categories") . '</td>';
@@ -1130,14 +1118,10 @@ else
 			print '</td></tr>';
 		}
 
-        // Other attributes
-        $parameters=array('socid'=>$socid, 'colspan' => ' colspan="3"');
-        $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
-        if (empty($reshook) && ! empty($extrafields->attribute_label))
-        {
-        	print $object->showOptionals($extrafields);
-        }
+    	// Other attributes
+    	$cols = 3;
+    	$parameyers=array('socid'=>$socid);
+    	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
         $object->load_ref_elements();
 
@@ -1193,10 +1177,10 @@ else
         print '</td></tr>';
 
         print "</table>";
-        
+
         print '</div></div></div>';
         print '<div style="clear:both"></div>';
-                
+
         print dol_fiche_end();
 
         // Barre d'actions
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 31e5d6f3094..3c644e4260c 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -104,13 +104,13 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 if (empty($reshook))
 {
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';	// Must be include, not includ_once
-	
+
 	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';		// Must be include, not include_once
-	
+
 	if ($action == 'confirm_active' && $confirm == 'yes' && $user->rights->contrat->activer)
 	{
 	    $result = $object->active_line($user, GETPOST('ligne'), GETPOST('date'), GETPOST('dateend'), GETPOST('comment'));
-	
+
 	    if ($result > 0)
 	    {
 	        header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
@@ -136,13 +136,13 @@ if (empty($reshook))
 		        header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		        exit;
 		    }
-		    else 
+		    else
 		    {
 		        setEventMessages($object->error, $object->errors, 'errors');
 		    }
 		}
 	}
-	
+
 	// Si ajout champ produit predefini
 	if (GETPOST('mode')=='predefined')
 	{
@@ -157,7 +157,7 @@ if (empty($reshook))
 	        $date_end=dol_mktime(GETPOST('date_endhour'), GETPOST('date_endmin'), 0, GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));
 	    }
 	}
-	
+
 	// Si ajout champ produit libre
 	if (GETPOST('mode')=='libre')
 	{
@@ -172,7 +172,7 @@ if (empty($reshook))
 	        $date_end_sl=dol_mktime(GETPOST('date_end_slhour'), GETPOST('date_end_slmin'), 0, GETPOST('date_end_slmonth'), GETPOST('date_end_slday'), GETPOST('date_end_slyear'));
 	    }
 	}
-	
+
 	// Param dates
 	$date_contrat='';
 	$date_start_update='';
@@ -199,7 +199,7 @@ if (empty($reshook))
 	{
 	    $datecontrat = dol_mktime(GETPOST('rehour'), GETPOST('remin'), 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
 	}
-	
+
 	// Add contract
 	if ($action == 'add' && $user->rights->contrat->creer)
 	{
@@ -210,29 +210,29 @@ if (empty($reshook))
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
 			$action='create';
 		}
-	
+
 		if ($socid<1)
 		{
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdParty")), null, 'errors');
 			$action='create';
 			$error++;
 		}
-	
+
 		// Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
 		if ($ret < 0) {
 			$error ++;
 			$action = 'create';
 		}
-	
+
 		if (! $error)
 		{
 			$object->socid						= $socid;
 	    	$object->date_contrat				= $datecontrat;
-	
+
 	    	$object->commercial_suivi_id		= GETPOST('commercial_suivi_id','int');
 	    	$object->commercial_signature_id	= GETPOST('commercial_signature_id','int');
-	
+
 	    	$object->note_private				= GETPOST('note_private','alpha');
 	    	$object->note_public				= GETPOST('note_public','alpha');
 	    	$object->fk_project					= GETPOST('projectid','int');
@@ -251,33 +251,33 @@ if (empty($reshook))
 		            $element = $regs[1];
 		            $subelement = $regs[2];
 		        }
-	
+
 		        // For compatibility
 		        if ($element == 'order')    { $element = $subelement = 'commande'; }
 		        if ($element == 'propal')   { $element = 'comm/propal'; $subelement = 'propal'; }
-	
+
 		        $object->origin    = $origin;
 		        $object->origin_id = $originid;
-	
+
 		        // Possibility to add external linked objects with hooks
 		        $object->linked_objects[$object->origin] = $object->origin_id;
 		        if (is_array($_POST['other_linked_objects']) && ! empty($_POST['other_linked_objects']))
 		        {
 		        	$object->linked_objects = array_merge($object->linked_objects, $_POST['other_linked_objects']);
 		        }
-	
+
 		        $id = $object->create($user);
 		        if ($id < 0) {
 		        	setEventMessages($object->error, $object->errors, 'errors');
 		        }
-	
+
 		        if ($id > 0)
 		        {
 		            dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
-	
+
 		            $classname = ucfirst($subelement);
 		            $srcobject = new $classname($db);
-	
+
 		            dol_syslog("Try to find source object origin=".$object->origin." originid=".$object->origin_id." to add lines");
 		            $result=$srcobject->fetch($object->origin_id);
 		            if ($result > 0)
@@ -289,27 +289,27 @@ if (empty($reshook))
 		                	$srcobject->fetch_lines();
 		                	$lines = $srcobject->lines;
 		                }
-	
+
 		                $fk_parent_line=0;
 		                $num=count($lines);
-	
+
 		                for ($i=0;$i<$num;$i++)
 		                {
 		                    $product_type=($lines[$i]->product_type?$lines[$i]->product_type:0);
-	
+
 							if ($product_type == 1 || (! empty($conf->global->CONTRACT_SUPPORT_PRODUCTS) && in_array($product_type, array(0,1)))) { 	// TODO Exclude also deee
 								// service prédéfini
 								if ($lines[$i]->fk_product > 0)
 								{
 									$product_static = new Product($db);
-	
+
 									// Define output language
 									if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
 									{
 										$prod = new Product($db);
 										$prod->id=$lines[$i]->fk_product;
 										$prod->getMultiLangs();
-	
+
 										$outputlangs = $langs;
 										$newlang='';
 										if (empty($newlang) && GETPOST('lang_id')) $newlang=GETPOST('lang_id');
@@ -319,14 +319,14 @@ if (empty($reshook))
 											$outputlangs = new Translate("",$conf);
 											$outputlangs->setDefaultLang($newlang);
 										}
-	
+
 										$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["libelle"])) ? $prod->multilangs[$outputlangs->defaultlang]["libelle"] : $lines[$i]->product_label;
 									}
 									else
 									{
 										$label = $lines[$i]->product_label;
 									}
-	
+
 									$desc .= ($lines[$i]->desc && $lines[$i]->desc!=$lines[$i]->libelle)?dol_htmlentitiesbr($lines[$i]->desc):'';
 								}
 								else {
@@ -338,7 +338,7 @@ if (empty($reshook))
 								// View third's localtaxes for now
 								$localtax1_tx = get_localtax($txtva, 1, $object->thirdparty);
 								$localtax2_tx = get_localtax($txtva, 2, $object->thirdparty);
-	
+
 			                    $result = $object->addline(
 					                $desc,
 					                $lines[$i]->subprice,
@@ -358,7 +358,7 @@ if (empty($reshook))
 			                        array(),
 				                    $lines[$i]->fk_unit
 			                    );
-	
+
 			                    if ($result < 0)
 			                    {
 			                        $error++;
@@ -372,13 +372,13 @@ if (empty($reshook))
 		                setEventMessages($srcobject->error, $srcobject->errors, 'errors');
 		                $error++;
 		            }
-		            
+
 		            // Hooks
 		            $parameters = array('objFrom' => $srcobject);
 		            $reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been
 		            // modified by hook
 		            if ($reshook < 0)
-		                $error++;		            
+		                $error++;
 		        }
 		        else
 		        {
@@ -401,12 +401,12 @@ if (empty($reshook))
 			}
 	    }
 	}
-	
+
 	else if ($action == 'classin' && $user->rights->contrat->creer)
 	{
 	    $object->setProject(GETPOST('projectid'));
 	}
-	
+
 	// Add a new line
 	else if ($action == 'addline' && $user->rights->contrat->creer)
 	{
@@ -425,10 +425,10 @@ if (empty($reshook))
 			$idprod=GETPOST('idprod', 'int');
 			$tva_tx = '';
 		}
-	
+
 		$qty = GETPOST('qty'.$predef);
 		$remise_percent = GETPOST('remise_percent'.$predef);
-	
+
 	    if ($qty == '')
 	    {
 	    	setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Qty")), null, 'errors');
@@ -439,7 +439,7 @@ if (empty($reshook))
 	    	setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Description")), null, 'errors');
 	    	$error++;
 	    }
-	
+
 	    // Extrafields
 	    $extrafieldsline = new ExtraFields($db);
 	    $extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
@@ -458,7 +458,7 @@ if (empty($reshook))
 			$date_start=dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start'.$predef.'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
 			$date_end=dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
 			$price_base_type = (GETPOST('price_base_type', 'alpha')?GETPOST('price_base_type', 'alpha'):'HT');
-	
+
 	        // Ecrase $pu par celui du produit
 	        // Ecrase $desc par celui du produit
 	        // Ecrase $tva_tx par celui du produit
@@ -467,17 +467,17 @@ if (empty($reshook))
 	        {
 	            $prod = new Product($db);
 	            $prod->fetch($idprod);
-	
+
 	            // Update if prices fields are defined
 	            $tva_tx = get_default_tva($mysoc,$object->thirdparty,$prod->id);
 	            $tva_npr = get_default_npr($mysoc,$object->thirdparty,$prod->id);
 	            if (empty($tva_tx)) $tva_npr=0;
-	            
+
 	            $pu_ht = $prod->price;
 	            $pu_ttc = $prod->price_ttc;
 	            $price_min = $prod->price_min;
 	            $price_base_type = $prod->price_base_type;
-	
+
 	            // On defini prix unitaire
 	            if ($conf->global->PRODUIT_MULTIPRICES && $object->thirdparty->price_level)
 	            {
@@ -489,11 +489,11 @@ if (empty($reshook))
 	        	elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 				{
 					require_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
-	
+
 					$prodcustprice = new Productcustomerprice($db);
-	
+
 					$filter = array('t.fk_product' => $prod->id,'t.fk_soc' => $object->thirdparty->id);
-	
+
 					$result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
 					if ($result) {
 						if (count($prodcustprice->lines) > 0) {
@@ -504,10 +504,10 @@ if (empty($reshook))
 						}
 					}
 				}
-	
+
 				$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $tva_tx));
 				$tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx));
-				
+
 				// On reevalue prix selon taux tva car taux tva transaction peut etre different
 	            // de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
 	            if ($tmpvat != $tmpprodvat)
@@ -521,7 +521,7 @@ if (empty($reshook))
 	                    $pu_ttc = price2num($pu_ht * (1 + ($tmpvat/100)), 'MU');
 	                }
 	            }
-	
+
 	           	$desc=$prod->description;
 	           	$desc=dol_concatdesc($desc,$product_desc);
 		        $fk_unit = $prod->fk_unit;
@@ -535,20 +535,20 @@ if (empty($reshook))
 	            $desc=$product_desc;
 				$fk_unit= GETPOST('units', 'alpha');
 	        }
-	
+
 	        $localtax1_tx=get_localtax($tva_tx,1,$object->thirdparty,$mysoc,$tva_npr);
 	        $localtax2_tx=get_localtax($tva_tx,2,$object->thirdparty,$mysoc,$tva_npr);
-	
+
 			// ajout prix achat
 			$fk_fournprice = $_POST['fournprice'];
 			if ( ! empty($_POST['buying_price']) )
 			  $pa_ht = $_POST['buying_price'];
 			else
 			  $pa_ht = null;
-	
+
 	        $info_bits=0;
 	        if ($tva_npr) $info_bits |= 0x01;
-	
+
 	        if($price_min && (price2num($pu_ht)*(1-price2num($remise_percent)/100) < price2num($price_min)))
 	        {
 	            $object->error = $langs->trans("CantBeLessThanMinPrice",price(price2num($price_min,'MU'),0,$langs,0,0,-1,$conf->currency));
@@ -577,7 +577,7 @@ if (empty($reshook))
 		            $fk_unit
 	            );
 	        }
-	
+
 	        if ($result > 0)
 	        {
 	        	// Define output language
@@ -591,14 +591,14 @@ if (empty($reshook))
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
 					}
-	
+
 					$ret = $object->fetch($id); // Reload to get new records
-	
+
 					$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 				}
-	
+
 				unset($_POST ['prod_entry_mode']);
-	
+
 				unset($_POST['qty']);
 				unset($_POST['type']);
 				unset($_POST['remise_percent']);
@@ -615,7 +615,7 @@ if (empty($reshook))
 				unset($_POST ['np_markRate']);
 				unset($_POST['dp_desc']);
 				unset($_POST['idprod']);
-	
+
 		    	unset($_POST['date_starthour']);
 		    	unset($_POST['date_startmin']);
 		    	unset($_POST['date_startsec']);
@@ -635,30 +635,30 @@ if (empty($reshook))
 	        }
 	    }
 	}
-	
+
 	else if ($action == 'updateline' && $user->rights->contrat->creer && ! GETPOST('cancel'))
 	{
 	    $objectline = new ContratLigne($db);
 	    if ($objectline->fetch(GETPOST('elrowid')))
 	    {
 	        $db->begin();
-	
+
 	        if ($date_start_real_update == '') $date_start_real_update=$objectline->date_ouverture;
 	        if ($date_end_real_update == '')   $date_end_real_update=$objectline->date_cloture;
-	
+
 	        $vat_rate = GETPOST('eltva_tx');
 	        // Define info_bits
 	        $info_bits = 0;
 	        if (preg_match('/\*/', $vat_rate))
 	            $info_bits |= 0x01;
-	             
+
     		// Define vat_rate
     		$vat_rate = str_replace('*', '', $vat_rate);
 	        $localtax1_tx=get_localtax($vat_rate, 1, $object->thirdparty, $mysoc);
 	        $localtax2_tx=get_localtax($vat_rate, 2, $object->thirdparty, $mysoc);
-		
+
 	        $txtva = $vat_rate;
-	        
+
 		    // Clean vat code
 	        $vat_src_code='';
 	        if (preg_match('/\((.*)\)/', $txtva, $reg))
@@ -666,16 +666,16 @@ if (empty($reshook))
 	            $vat_src_code = $reg[1];
 	            $txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
 	        }
-	        
+
 		  	// ajout prix d'achat
 		  	$fk_fournprice = $_POST['fournprice'];
 		  	if ( ! empty($_POST['buying_price']) )
 		  	  $pa_ht = $_POST['buying_price'];
 		  	else
 		  	  $pa_ht = null;
-	
+
 		    $fk_unit = GETPOST('unit', 'alpha');
-	
+
 	        $objectline->description=GETPOST('product_desc');
 	        $objectline->price_ht=GETPOST('elprice');
 	        $objectline->subprice=GETPOST('elprice');
@@ -692,21 +692,21 @@ if (empty($reshook))
 	        $objectline->fk_user_cloture=$user->id;
 	        $objectline->fk_fournprice=$fk_fournprice;
 	        $objectline->pa_ht=$pa_ht;
-	
+
 		    if ($fk_unit > 0) {
 			    $objectline->fk_unit = GETPOST('unit');
 		    } else {
 			    $objectline->fk_unit = null;
 		    }
-	
+
 	        // Extrafields
 	        $extrafieldsline = new ExtraFields($db);
 	        $extralabelsline = $extrafieldsline->fetch_name_optionals_label($objectline->table_element);
 	        $array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline, $predef);
 	        $objectline->array_options=$array_options;
-	
+
 	        // TODO verifier price_min si fk_product et multiprix
-	
+
 	        $result=$objectline->update($user);
 	        if ($result > 0)
 	        {
@@ -723,11 +723,11 @@ if (empty($reshook))
 	    	setEventMessages($objectline->error, $objectline->errors, 'errors');
 	    }
 	}
-	
+
 	else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->contrat->creer)
 	{
 	    $result = $object->deleteline(GETPOST('lineid'),$user);
-	
+
 	    if ($result >= 0)
 	    {
 	        header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
@@ -738,23 +738,23 @@ if (empty($reshook))
 	    	setEventMessages($object->error, $object->errors, 'errors');
 	    }
 	}
-	
+
 	else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->contrat->creer)
 	{
 	    $result = $object->validate($user);
 	}
-	
+
 	else if ($action == 'reopen' && $user->rights->contrat->creer)
 	{
 	    $result = $object->reopen($user);
 	}
-	
+
 	// Close all lines
 	else if ($action == 'confirm_close' && $confirm == 'yes' && $user->rights->contrat->creer)
 	{
 	    $object->cloture($user);
 	}
-	
+
 	else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->contrat->supprimer)
 	{
 		$result=$object->delete($user);
@@ -768,7 +768,7 @@ if (empty($reshook))
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
-	
+
 	else if ($action == 'confirm_move' && $confirm == 'yes' && $user->rights->contrat->creer)
 	{
 		if (GETPOST('newcid') > 0)
@@ -791,39 +791,39 @@ if (empty($reshook))
 		{
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("RefNewContract")), null, 'errors');
 		}
-	} 
-	else if ($action == 'update_extras') 
+	}
+	else if ($action == 'update_extras')
 	{
 		// Fill array 'array_options' with data from update form
 		$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 		$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
 		if ($ret < 0)
 			$error ++;
-	
+
 		if (! $error) {
-	
+
 				$result = $object->insertExtraFields();
 				if ($result < 0) {
 					$error ++;
 				}
 			} else if ($reshook < 0)
 				$error ++;
-	
+
 		if ($error) {
 			$action = 'edit_extras';
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	} 
-	elseif ($action=='setref_supplier') 
+	}
+	elseif ($action=='setref_supplier')
 	{
 		$cancelbutton = GETPOST('cancel');
 		if (!$cancelbutton) {
-	
+
 			$result = $object->fetch($id);
 			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-	
+
 	        $result = $object->setValueFrom('ref_supplier', GETPOST('ref_supplier','alpha'), '', null, 'text', '', $user, 'CONTRACT_MODIFY');
 			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -838,17 +838,17 @@ if (empty($reshook))
 	        exit;
 	    }
 	}
-	elseif ($action=='setref_customer') 
+	elseif ($action=='setref_customer')
 	{
 		$cancelbutton = GETPOST('cancel');
-		
+
 		if (!$cancelbutton)
 		{
 			$result = $object->fetch($id);
 			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-		
+
 	        $result = $object->setValueFrom('ref_customer', GETPOST('ref_customer','alpha'), '', null, 'text', '', $user, 'CONTRACT_MODIFY');
 	        if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -863,16 +863,16 @@ if (empty($reshook))
 	        exit;
 	    }
 	}
-	elseif ($action=='setref') 
+	elseif ($action=='setref')
 	{
 	    $cancelbutton = GETPOST('cancel');
-	
+
 	    if (!$cancelbutton) {
 	        $result = $object->fetch($id);
 	        if ($result < 0) {
 	            setEventMessages($object->error, $object->errors, 'errors');
 	        }
-	
+
 	        $result = $object->setValueFrom('ref', GETPOST('ref','alpha'), '', null, 'text', '', $user, 'CONTRACT_MODIFY');
 	        if ($result < 0) {
 	            setEventMessages($object->error, $object->errors, 'errors');
@@ -886,11 +886,11 @@ if (empty($reshook))
 	        header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $id);
 	        exit;
 	    }
-	} 
-	elseif ($action=='setdate_contrat') 
+	}
+	elseif ($action=='setdate_contrat')
 	{
 	    $cancelbutton = GETPOST('cancel');
-	
+
 	    if (!$cancelbutton) {
 	        $result = $object->fetch($id);
 	        if ($result < 0) {
@@ -911,13 +911,13 @@ if (empty($reshook))
 	        exit;
 	    }
 	}
-	
+
 	// Generation doc (depuis lien ou depuis cartouche doc)
 	else if ($action == 'builddoc' && $user->rights->contrat->creer) {
 		if (GETPOST('model')) {
 			$object->setDocModel($user, GETPOST('model'));
 		}
-	
+
 		// Define output language
 		$outputlangs = $langs;
 		if (! empty($conf->global->MAIN_MULTILANGS)) {
@@ -933,12 +933,12 @@ if (empty($reshook))
 	        $action='';
 		}
 	}
-	
+
 	// Remove file in doc form
 	else if ($action == 'remove_file' && $user->rights->contrat->creer) {
 		if ($object->id > 0) {
 			require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-	
+
 			$langs->load("other");
 			$upload_dir = $conf->contrat->dir_output;
 			$file = $upload_dir . '/' . GETPOST('file');
@@ -965,7 +965,7 @@ if (empty($reshook))
 		{
 			$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
 			$result = $object->add_contact($contactid, GETPOST('type'), GETPOST('source'));
-	
+
 			if ($result >= 0)
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
@@ -984,18 +984,18 @@ if (empty($reshook))
 				}
 			}
 		}
-	
+
 		// bascule du statut d'un contact
 		else if ($action == 'swapstatut')
 		{
 			$result=$object->swapContactStatus(GETPOST('ligne'));
 		}
-	
+
 		// Efface un contact
 		else if ($action == 'deletecontact')
 		{
 			$result = $object->delete_contact(GETPOST('lineid'));
-	
+
 			if ($result >= 0)
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
@@ -1040,7 +1040,7 @@ llxHeader('',$langs->trans("Contract"),"");
 $form = new Form($db);
 $formfile = new FormFile($db);
 if (! empty($conf->projet->enabled)) $formproject = new FormProjets($db);
-    
+
 $objectlignestatic=new ContratLigne($db);
 
 // Load object modContract
@@ -1209,7 +1209,7 @@ if ($action == 'create')
     }
 
     // Other attributes
-    $parameters=array('objectsrc' => $objectsrc,'colspan' => ' colspan="3"');
+    $parameters=array('objectsrc' => $objectsrc,'colspan' => ' colspan="3"', 'cols'=>3);
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 
     // Other attributes
@@ -1333,7 +1333,7 @@ else
 
         $linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
 
-        
+
         $morehtmlref='';
         if (! empty($modCodeContract->code_auto)) {
             $morehtmlref.=$object->ref;
@@ -1341,7 +1341,7 @@ else
             $morehtmlref.=$form->editfieldkey("",'ref',$object->ref,$object,$user->rights->contrat->creer,'string','',0,3);
             $morehtmlref.=$form->editfieldval("",'ref',$object->ref,$object,$user->rights->contrat->creer,'string','',0,2);
         }
-        
+
 		$morehtmlref.='<div class="refidno">';
 		// Ref customer
 		$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->rights->contrat->creer, 'string', '', 0, 1);
@@ -1392,10 +1392,10 @@ else
 
 	    print '<div class="fichecenter">';
 	    print '<div class="underbanner clearboth"></div>';
-        
-	    
+
+
         print '<table class="border" width="100%">';
-	    
+
         // Ligne info remises tiers
         print '<tr><td class="titlefield">'.$langs->trans('Discount').'</td><td colspan="3">';
         if ($object->thirdparty->remise_percent) print $langs->trans("CompanyHasRelativeDiscount",$object->thirdparty->remise_percent);
@@ -1423,7 +1423,7 @@ else
         print "</table>";
 
         print '</div>';
-        
+
         if (! empty($object->brouillon) && $user->rights->contrat->creer)
         {
             print '</form>';
@@ -1615,7 +1615,7 @@ else
                         {
                             print dol_print_date($db->jdate($objp->date_debut));
                             // Warning si date prevu passee et pas en service
-                            if ($objp->statut == 0 && $db->jdate($objp->date_debut) < ($now - $conf->contrat->services->inactifs->warning_delay)) { 
+                            if ($objp->statut == 0 && $db->jdate($objp->date_debut) < ($now - $conf->contrat->services->inactifs->warning_delay)) {
                     		    $warning_delay=$conf->contrat->services->inactifs->warning_delay / 3600 / 24;
                                 $textlate = $langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($warning_delay) >= 0 ? '+' : '').ceil($warning_delay).' '.$langs->trans("days");
                     		    print " ".img_warning($textlate);
@@ -1627,7 +1627,7 @@ else
                         if ($objp->date_fin)
                         {
                             print dol_print_date($db->jdate($objp->date_fin));
-                            if ($objp->statut == 4 && $db->jdate($objp->date_fin) < ($now - $conf->contrat->services->expires->warning_delay)) { 
+                            if ($objp->statut == 4 && $db->jdate($objp->date_fin) < ($now - $conf->contrat->services->expires->warning_delay)) {
                     		    $warning_delay=$conf->contrat->services->expires->warning_delay / 3600 / 24;
                                 $textlate = $langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($warning_delay) >= 0 ? '+' : '').ceil($warning_delay).' '.$langs->trans("days");
                     		    print " ".img_warning($textlate);
@@ -1814,13 +1814,13 @@ else
                         $tmpaction='activateline';
                         $tmpactionpicto='play';
                         $tmpactiontext=$langs->trans("Activate");
-                        if ($objp->statut == 4) 
+                        if ($objp->statut == 4)
                         {
                             $tmpaction='unactivateline';
                             $tmpactionpicto='playstop';
                             $tmpactiontext=$langs->trans("Unactivate");
                         }
-						if (($tmpaction=='activateline' && $user->rights->contrat->activer) || ($tmpaction=='unactivateline' && $user->rights->contrat->desactiver)) 
+						if (($tmpaction=='activateline' && $user->rights->contrat->activer) || ($tmpaction=='unactivateline' && $user->rights->contrat->desactiver))
 						{
 							print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;ligne=' . $object->lines[$cursorline - 1]->id . '&amp;action=' . $tmpaction . '">';
 							print img_picto($tmpactiontext, $tmpactionpicto);
@@ -1962,7 +1962,7 @@ else
                 print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
                 print '</td>';
                 print '</tr>';
-                
+
                 print '</table>';
 
                 print '</form>';
@@ -1997,7 +1997,7 @@ else
 				$var = true;
 
 				$forcetoshowtitlelines=1;
-				
+
 				// Add free products/services
 				$object->formAddObjectLine(1, $mysoc, $soc);
 
@@ -2037,7 +2037,7 @@ else
                 if ($user->rights->contrat->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("Modify").'</a></div>';
                 else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Modify").'</a></div>';
             }
-            
+
             if (! empty($conf->facture->enabled) && $object->statut > 0 && $object->nbofservicesclosed < $nbofservices)
             {
                 $langs->load("bills");
@@ -2051,7 +2051,7 @@ else
             	if ($user->rights->commande->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->thirdparty->id.'">'.$langs->trans("CreateOrder").'</a></div>';
             	else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CreateOrder").'</a></div>';
             }
-            
+
             // Clone
             if ($user->rights->contrat->creer) {
             	print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&amp;socid=' . $object->socid . '&amp;action=clone&amp;object=' . $object->element . '">' . $langs->trans("ToClone") . '</a></div>';
@@ -2083,16 +2083,16 @@ else
 
             print "</div>";
         }
-        
+
     	// Select mail models is same action as presend
     	if (GETPOST('modelselected')) {
     		$action = 'presend';
     	}
-    
+
     	if ($action != 'presend')
     	{
     		print '<div class="fichecenter"><div class="fichehalfleft">';
-    
+
     		/*
     		 * Documents generes
     		*/
@@ -2101,25 +2101,25 @@ else
     		$urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
     		$genallowed = $user->rights->contrat->creer;
     		$delallowed = $user->rights->contrat->supprimer;
-    
+
     		$var = true;
-    
+
     		print $formfile->showdocuments('contract', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
-    
-    
+
+
     			// Show links to link elements
     			$linktoelem = $form->showLinkToObjectBlock($object, null, array('contrat'));
     			$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
-    
-    
+
+
     		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-    
+
 			// List of actions on element
 			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
 			$formactions = new FormActions($db);
 			$somethingshown = $formactions->showactions($object, 'contract', $socid);
 
-    
+
     		print '</div></div></div>';
     	}
 
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index fe93387cadb..7656d8bcc06 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -89,13 +89,13 @@ abstract class CommonObject
      * @var Object      To store a cloned copy of object before to edit it and keep track of old properties
      */
     public $oldcopy;
-   
+
     /**
      * @var string		Column name of the ref field.
      */
     protected $table_ref_field = '';
 
-    
+
 
     // Following vars are used by some objects only. We keep this property here in CommonObject to be able to provide common method using them.
 
@@ -330,10 +330,10 @@ abstract class CommonObject
     public $firstname;
     public $civility_id;
 
-    
+
     // No constructor as it is an abstract class
 
-    
+
     /**
      * Check an object id/ref exists
      * If you don't need/want to instantiate object and just need to know if object exists, use this method instead of fetch
@@ -398,7 +398,7 @@ abstract class CommonObject
         $lastname=$this->lastname;
         $firstname=$this->firstname;
         if (empty($lastname))  $lastname=(isset($this->lastname)?$this->lastname:(isset($this->name)?$this->name:(isset($this->nom)?$this->nom:(isset($this->societe)?$this->societe:(isset($this->company)?$this->company:'')))));
-        
+
         $ret='';
         if ($option && $this->civility_id)
         {
@@ -597,11 +597,11 @@ abstract class CommonObject
             dol_syslog("CODE_NOT_VALID_FOR_THIS_ELEMENT");
             return -3;
         }
-            
+
         $datecreate = dol_now();
 
         $this->db->begin();
-        
+
         // Insertion dans la base
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."element_contact";
         $sql.= " (element_id, fk_socpeople, datecreate, statut, fk_c_type_contact) ";
@@ -1238,19 +1238,19 @@ abstract class CommonObject
     function setValueFrom($field, $value, $table='', $id=null, $format='', $id_field='', $fuser=null, $trigkey='')
     {
         global $user,$langs,$conf;
-        
+
         if (empty($table)) 	  $table=$this->table_element;
         if (empty($id))    	  $id=$this->id;
 		if (empty($format))   $format='text';
 		if (empty($id_field)) $id_field='rowid';
 
 		$error=0;
-		
+
         $this->db->begin();
 
         // Special case
         if ($table == 'product' && $field == 'note_private') $field='note';
-        
+
         $sql = "UPDATE ".MAIN_DB_PREFIX.$table." SET ";
         if ($format == 'text') $sql.= $field." = '".$this->db->escape($value)."'";
         else if ($format == 'int') $sql.= $field." = ".$this->db->escape($value);
@@ -1396,13 +1396,13 @@ abstract class CommonObject
         }
 
         $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-        if ($this->table_element == 'actioncomm') 
+        if ($this->table_element == 'actioncomm')
         {
             if ($projectid) $sql.= ' SET fk_project = '.$projectid;
             else $sql.= ' SET fk_project = NULL';
-            $sql.= ' WHERE id = '.$this->id; 
+            $sql.= ' WHERE id = '.$this->id;
         }
-        else 
+        else
         {
             if ($projectid) $sql.= ' SET fk_projet = '.$projectid;
             else $sql.= ' SET fk_projet = NULL';
@@ -1535,7 +1535,7 @@ abstract class CommonObject
 						if($mode == 1) {
 							$line->subprice = 0;
 						}
-						
+
 						switch ($this->element) {
 							case 'propal':
 								$this->updateline($line->id, $line->subprice, $line->qty, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, $line->desc, 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice);
@@ -1626,7 +1626,7 @@ abstract class CommonObject
     /**
      *	Define delivery address
      *  @deprecated
-     *  
+     *
      *	@param      int		$id		Address id
      *	@return     int				<0 si ko, >0 si ok
      */
@@ -1950,7 +1950,7 @@ abstract class CommonObject
 	{
 	    $fieldposition = 'rang';
 	    if ($this->table_element_line == 'ecm_files') $fieldposition = 'position';
-	    
+
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;
 		$sql.= ' WHERE rowid = '.$rowid;
 
@@ -2163,7 +2163,7 @@ abstract class CommonObject
     function update_note($note,$suffix='')
     {
         global $user;
-        
+
     	if (! $this->table_element)
     	{
     		dol_syslog(get_class($this)."::update_note was called on objet with property table_element not defined", LOG_ERR);
@@ -2177,7 +2177,7 @@ abstract class CommonObject
         // Special cas
         //var_dump($this->table_element);exit;
 		if ($this->table_element == 'product') $suffix='';
-            
+
     	$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
     	$sql.= " SET note".$suffix." = ".(!empty($note)?("'".$this->db->escape($note)."'"):"NULL");
     	$sql.= " ,".(in_array($this->table_element, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))?"fk_user_mod":"fk_user_modif")." = ".$user->id;
@@ -2188,7 +2188,7 @@ abstract class CommonObject
     	{
     		if ($suffix == '_public') $this->note_public = $note;
     		else if ($suffix == '_private') $this->note_private = $note;
-    		else 
+    		else
     		{
     		    $this->note = $note;      // deprecated
     		    $this->note_private = $note;
@@ -2437,7 +2437,7 @@ abstract class CommonObject
     	// Special case
     	if ($origin == 'order') $origin='commande';
     	if ($origin == 'invoice') $origin='facture';
-    	
+
         $this->db->begin();
 
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
@@ -2470,10 +2470,10 @@ abstract class CommonObject
      *	Fetch array of objects linked to current object. Links are loaded into this->linkedObjects array and this->linkedObjectsIds
      *  Possible usage for parameters:
      *  - all parameters empty -> we look all link to current object (current object can be source or target)
-     *  - source id+type -> will get target list linked to source 
-     *  - target id+type -> will get source list linked to target 
-     *  - source id+type + target type -> will get target list of the type 
-     *  - target id+type + target source -> will get source list of the type 
+     *  - source id+type -> will get target list linked to source
+     *  - target id+type -> will get source list linked to target
+     *  - source id+type + target type -> will get target list of the type
+     *  - target id+type + target source -> will get source list of the type
      *
      *	@param	int		$sourceid		Object source id (if not defined, id of object)
      *	@param  string	$sourcetype		Object source type (if not defined, element name of object)
@@ -2791,7 +2791,7 @@ abstract class CommonObject
     	global $user,$langs,$conf;
 
     	$savElementId=$elementId;  // To be used later to know if we were using the method using the id of this or not.
-    	
+
         $elementId = (!empty($elementId)?$elementId:$this->id);
         $elementTable = (!empty($elementType)?$elementType:$this->table_element);
 
@@ -2821,7 +2821,7 @@ abstract class CommonObject
             if ($this->element == 'fichinter' && $status == 3) $trigkey='FICHINTER_CLASSIFY_DONE';
             if ($this->element == 'fichinter' && $status == 2) $trigkey='FICHINTER_CLASSIFY_BILLED';
             if ($this->element == 'fichinter' && $status == 1) $trigkey='FICHINTER_CLASSIFY_UNBILLED';
-            
+
             if ($trigkey)
             {
                 // Appel des triggers
@@ -2837,7 +2837,7 @@ abstract class CommonObject
 			if (! $error)
 			{
 				$this->db->commit();
-				
+
         		if (empty($savElementId))    // If the element we update was $this (so $elementId is null)
         		{
         		    $this->statut = $status;
@@ -2932,7 +2932,7 @@ abstract class CommonObject
     function isObjectUsed($id=0)
     {
         if (empty($id)) $id=$this->id;
-        
+
         // Check parameters
         if (! isset($this->childtables) || ! is_array($this->childtables) || count($this->childtables) == 0)
         {
@@ -3049,12 +3049,12 @@ abstract class CommonObject
 
         foreach ($this->lines as $line)
         {
-            if (isset($line->qty_asked))   
+            if (isset($line->qty_asked))
             {
                 if (empty($totalOrdered)) $totalOrdered=0;  // Avoid warning because $totalOrdered is ''
                 $totalOrdered+=$line->qty_asked;    // defined for shipment only
             }
-            if (isset($line->qty_shipped)) 
+            if (isset($line->qty_shipped))
             {
                 if (empty($totalToShip)) $totalToShip=0;    // Avoid warning because $totalToShip is ''
                 $totalToShip+=$line->qty_shipped;   // defined for shipment only
@@ -3082,7 +3082,7 @@ abstract class CommonObject
 
             if (empty($totalWeight)) $totalWeight=0;  // Avoid warning because $totalWeight is ''
             if (empty($totalVolume)) $totalVolume=0;  // Avoid warning because $totalVolume is ''
-            
+
             //var_dump($line->volume_units);
             if ($weight_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
             {
@@ -3318,54 +3318,54 @@ abstract class CommonObject
 		if (! empty($conf->margin->enabled) && ! empty($this->element) && in_array($this->element,array('facture','propal','commande'))) $usemargins=1;
 
 		$num = count($this->lines);
-		
+
 		//Line extrafield
 		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 		$extrafieldsline = new ExtraFields($this->db);
 		$extralabelslines=$extrafieldsline->fetch_name_optionals_label($this->table_element_line);
-		
+
 		$parameters = array('num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);
 		$reshook = $hookmanager->executeHooks('printObjectLineTitle', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if (empty($reshook))
 		{
     		print '<tr class="liste_titre nodrag nodrop">';
-    
+
     		if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) print '<td class="linecolnum" align="center" width="5">&nbsp;</td>';
-    
+
     		// Description
     		print '<td class="linecoldescription">'.$langs->trans('Description').'</td>';
-    
+
     		if ($this->element == 'supplier_proposal')
     		{
     			print '<td class="linerefsupplier" align="right"><span id="title_fourn_ref">'.$langs->trans("SupplierProposalRefFourn").'</span></td>';
     		}
-    
+
     		// VAT
     		print '<td class="linecolvat" align="right" width="80">'.$langs->trans('VAT').'</td>';
-    
+
     		// Price HT
     		print '<td class="linecoluht" align="right" width="80">'.$langs->trans('PriceUHT').'</td>';
-    
+
     		// Multicurrency
     		if (!empty($conf->multicurrency->enabled)) print '<td class="linecoluht_currency" align="right" width="80">'.$langs->trans('PriceUHTCurrency', $this->multicurrency_code).'</td>';
-    
+
     		if ($inputalsopricewithtax) print '<td align="right" width="80">'.$langs->trans('PriceUTTC').'</td>';
-    
+
     		// Qty
     		print '<td class="linecolqty" align="right">'.$langs->trans('Qty').'</td>';
-    
+
     		if($conf->global->PRODUCT_USE_UNITS)
     		{
     			print '<td class="linecoluseunit" align="left">'.$langs->trans('Unit').'</td>';
     		}
-    
+
     		// Reduction short
     		print '<td class="linecoldiscount" align="right">'.$langs->trans('ReductionShort').'</td>';
-    
+
     		if ($this->situation_cycle_ref) {
     			print '<td class="linecolcycleref" align="right">' . $langs->trans('Progress') . '</td>';
     		}
-    
+
     		if ($usemargins && ! empty($conf->margin->enabled) && empty($user->societe_id))
     		{
     			if (!empty($user->rights->margins->creer))
@@ -3373,32 +3373,32 @@ abstract class CommonObject
     				if ($conf->global->MARGIN_TYPE == "1")
     					print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('BuyingPrice').'</td>';
     				else
-    					print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('CostPrice').'</td>';	
+    					print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('CostPrice').'</td>';
     			}
-    			
+
     			if (! empty($conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous)
     				print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarginRate').'</td>';
     			if (! empty($conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous)
     				print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarkRate').'</td>';
     		}
-    
+
     		// Total HT
     		print '<td class="linecolht" align="right">'.$langs->trans('TotalHTShort').'</td>';
-    
+
     		// Multicurrency
     		if (!empty($conf->multicurrency->enabled)) print '<td class="linecoltotalht_currency" align="right">'.$langs->trans('TotalHTShortCurrency', $this->multicurrency_code).'</td>';
-    
+
             if ($outputalsopricetotalwithtax) print '<td align="right" width="80">'.$langs->trans('TotalTTCShort').'</td>';
-    
+
     		print '<td class="linecoledit"></td>';  // No width to allow autodim
-    
+
     		print '<td class="linecoldelete" width="10"></td>';
-    
+
     		print '<td class="linecolmove" width="10"></td>';
-    
+
     		print "</tr>\n";
 		}
-		
+
 		$var = true;
 		$i	 = 0;
 
@@ -3407,7 +3407,7 @@ abstract class CommonObject
 			//Line extrafield
 			$line->fetch_optionals($line->id,$extralabelslines);
 
-			
+
 
 			//if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))
             if (is_object($hookmanager))   // Old code is commented on preceding line.
@@ -3588,7 +3588,7 @@ abstract class CommonObject
 
         foreach ($this->lines as $line)
         {
-            
+
 
             if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))
             {
@@ -3868,7 +3868,7 @@ abstract class CommonObject
 			$modele=$tmp[0];
 			$srctemplatepath=$tmp[1];
 		}
-		
+
 
 		// Search template files
 		$file=''; $classname=''; $filefound=0;
@@ -3897,7 +3897,7 @@ abstract class CommonObject
 		if ($filefound)
 		{
 			global $db;  // Required to solve a conception default in commonstickergenerator.class.php making an include of code using $db
-		    
+
 			require_once $file;
 
 			$obj = new $classname($this->db);
@@ -3956,7 +3956,7 @@ abstract class CommonObject
 			// output format that does not support UTF8.
 			$sav_charset_output=$outputlangs->charset_output;
 
-			if (in_array(get_class($this), array('Adherent'))) 
+			if (in_array(get_class($this), array('Adherent')))
 			{
 			    $arrayofrecords = array();   // The write_file of templates of adherent class need this
 			    $resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, 'member', 1, $moreparams);
@@ -4104,25 +4104,36 @@ abstract class CommonObject
      *  Function to get extra fields of a member into $this->array_options
      *  This method is in most cases called by method fetch of objects but you can call it separately.
      *
-     *  @param	int		$rowid			Id of line
-     *  @param  array	$optionsArray   Array resulting of call of extrafields->fetch_name_optionals_label()
+     *  @param	int		$rowid			Id of line. Use the id of object if not defined. Deprecated. Function must be called without parameters.
+     *  @param  array	$optionsArray   Array resulting of call of extrafields->fetch_name_optionals_label(). Deprecated. Function must be called without parameters.
      *  @return	int						<0 if error, 0 if no optionals to find nor found, 1 if a line is found and optional loaded
      */
     function fetch_optionals($rowid=null,$optionsArray=null)
     {
     	if (empty($rowid)) $rowid=$this->id;
 
-        //To avoid SQL errors. Probably not the better solution though
+        // To avoid SQL errors. Probably not the better solution though
         if (!$this->table_element) {
             return 0;
         }
 
         if (! is_array($optionsArray))
         {
-            // optionsArray not already loaded, so we load it
-            require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-            $extrafields = new ExtraFields($this->db);
-            $optionsArray = $extrafields->fetch_name_optionals_label($this->table_element);
+            // $extrafields is not a known object, we initialize it. Best practice is to have $extrafields defined into card.php or list.php page.
+            // TODO Use of existing extrafield is not yet ready (must mutualize code that use extrafields in form first)
+            // global $extrafields;
+            //if (! is_object($extrafields))
+            //{
+                require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+                $extrafields = new ExtraFields($this->db);
+            //}
+
+            // Load array of extrafields for elementype = $this->table_element
+            if (empty($extrafields->attributes[$this->table_element]['loaded']))
+            {
+                $extrafields->fetch_name_optionals_label($this->table_element);
+            }
+            $optionsArray = $extrafields->attributes[$this->table_element]['label'];
         }
 
         // Request to get complementary values
@@ -4131,12 +4142,15 @@ abstract class CommonObject
             $sql = "SELECT rowid";
             foreach ($optionsArray as $name => $label)
             {
-                $sql.= ", ".$name;
+                if (empty($extrafields->attributes[$this->table_element]['type'][$name]) || $extrafields->attributes[$this->table_element]['type'][$name] != 'separate')
+                {
+                    $sql.= ", ".$name;
+                }
             }
             $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element."_extrafields";
             $sql.= " WHERE fk_object = ".$rowid;
 
-            dol_syslog(get_class($this)."::fetch_optionals", LOG_DEBUG);
+            dol_syslog(get_class($this)."::fetch_optionals get extrafields data for ".$this->table_element, LOG_DEBUG);
             $resql=$this->db->query($sql);
             if ($resql)
             {
@@ -4217,7 +4231,7 @@ abstract class CommonObject
             require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
             $extrafields = new ExtraFields($this->db);
             $target_extrafields=$extrafields->fetch_name_optionals_label($this->table_element);
-            
+
             //Eliminate copied source object extra_fields that do not exist in target object
             $new_array_options=array();
             foreach ($this->array_options as $key => $value) {
@@ -4266,7 +4280,7 @@ abstract class CommonObject
     						{
     							if (is_numeric($value)) $res=$object->fetch($value);
 								else $res=$object->fetch('',$value);
-								
+
     							if ($res > 0) $this->array_options[$key]=$object->id;
     							else
     							{
@@ -4678,7 +4692,7 @@ abstract class CommonObject
 		}
 		return $buyPrice;
 	}
-	
+
 	/**
 	 * Function test if type is date
 	 *
@@ -4690,7 +4704,7 @@ abstract class CommonObject
 		if(isset($info['type']) && $info['type']=='date') return true;
 		else return false;
 	}
-	
+
 	/**
 	 * Function test if type is array
 	 *
@@ -4706,7 +4720,7 @@ abstract class CommonObject
 		}
 		else return false;
 	}
-	
+
 	/**
 	 * Function test if type is null
 	 *
@@ -4722,7 +4736,7 @@ abstract class CommonObject
 		}
 		else return false;
 	}
-	
+
 	/**
 	 * Function test if type is integer
 	 *
@@ -4738,7 +4752,7 @@ abstract class CommonObject
 		}
 		else return false;
 	}
-	
+
 	/**
 	 * Function test if type is float
 	 *
@@ -4754,7 +4768,7 @@ abstract class CommonObject
 		}
 		else return false;
 	}
-	
+
 	/**
 	 * Function test if type is text
 	 *
@@ -4770,7 +4784,7 @@ abstract class CommonObject
 		}
 		else return false;
 	}
-	
+
 	/**
 	 * Function test if is indexed
 	 *
@@ -4786,7 +4800,7 @@ abstract class CommonObject
 		}
 		else return false;
 	}
-	
+
 	/**
 	 * Function to prepare the values to insert
 	 *
@@ -4829,7 +4843,7 @@ abstract class CommonObject
 				$query[$field] = $this->{$field};
 			}
 		}
-		
+
 		return $query;
 	}
 
@@ -4843,30 +4857,30 @@ abstract class CommonObject
 	 */
 	public function createCommon(User $user, $notrigger = false)
 	{
-	    
+
 	    $fields = array_merge(array('datec'=>$this->db->idate(dol_now())), $this->set_save_query());
-	    
+
 	    foreach ($fields as $k => $v) {
-	    	
+
 	    	$keys[] = $k;
 	    	$values[] = $this->quote($v);
-	    	
+
 	    }
 	    $sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element.'
 					( '.implode( ",", $keys ).' )
 					VALUES ( '.implode( ",", $values ).' ) ';
 	    $res = $this->db->query( $sql );
 	    if($res===false) {
-	    	
+
 	    	return false;
 	    }
-	    
+
 	    // TODO Add triggers
-	    
+
 	    return true;
-	    
+
 	}
-	
+
 	/**
 	 * Function to load data into current object this
 	 *
@@ -4905,10 +4919,10 @@ abstract class CommonObject
 			{
 				$this->{$field} = $obj->{$field};
 			}
-			
+
 		}
 	}
-	
+
 	/**
 	 * Function to concat keys of fields
 	 *
@@ -4919,7 +4933,7 @@ abstract class CommonObject
 		$keys = array_keys($this->fields);
 		return implode(',', $keys);
 	}
-	
+
 	/**
 	 * Load object in memory from the database
 	 *
@@ -4930,12 +4944,12 @@ abstract class CommonObject
 	 */
 	public function fetchCommon($id, $ref = null)
 	{
-	    
+
 		if (empty($id) && empty($ref)) return false;
-		
+
 		$sql = 'SELECT '.$this->get_field_list().', datec, tms';
 		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
-		
+
 		if(!empty($id)) $sql.= ' WHERE rowid = '.$id;
 		else  $sql.= ' WHERE ref = \''.$this->quote($ref).'\'';
 
@@ -4946,10 +4960,10 @@ abstract class CommonObject
     		{
     			$this->id = $id;
     			$this->set_vars_by_db($obj);
-    			
+
     			$this->datec = $this->db->idate($obj->datec);
     			$this->tms = $this->db->idate($obj->tms);
-    			
+
     			return $this->id;
     		}
     		else
@@ -4978,9 +4992,9 @@ abstract class CommonObject
 	public function updateCommon(User $user, $notrigger = false)
 	{
 		$fields = $this->set_save_query();
-		
+
 		foreach ($fields as $k => $v) {
-			
+
 			if (is_array($key)){
 				$i=array_search($k, $key);
 				if ( $i !== false) {
@@ -4993,22 +5007,22 @@ abstract class CommonObject
 					continue;
 				}
 			}
-			
+
 			$tmp[] = $k.'='.$this->quote($v);
 		}
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET '.implode( ',', $tmp ).' WHERE rowid='.$this->id ;
 		$res = $this->db->query( $sql );
-		
+
 		if($res===false) {
 			//error
 			return false;
 		}
-		
+
 		// TODO Add triggers
-		
+
 		return true;
 	}
-	
+
 	/**
 	 * Delete object in database
 	 *
@@ -5020,14 +5034,14 @@ abstract class CommonObject
 	public function deleteCommon(User $user, $notrigger = false)
 	{
 		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE rowid='.$this->id;
-		
+
 		$res = $this->db->query( $sql );
 		if($res===false) {
 			return false;
 		}
-		
+
 		// TODO Add triggers
-		
+
 		return true;
 	}
 
@@ -5038,12 +5052,12 @@ abstract class CommonObject
 	 * @return string|int
 	 */
 	protected function quote($value) {
-	
+
 	    if(is_null($value)) return 'NULL';
 	    else if(is_numeric($value)) return $value;
 	    else return "'".$this->db->escape( $value )."'";
-	
+
 	}
-	
+
 }
 
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 16214e10bf1..754a8300366 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -69,6 +69,9 @@ class ExtraFields
 	// Array to store if extra field is hidden
 	var $attribute_hidden;		// warning, do not rely on this. If your module need a hidden data, it must use its own table.
 
+	// New array to store extrafields definition
+	var $attributes;
+
 	var $error;
 	var $errno;
 
@@ -640,26 +643,29 @@ class ExtraFields
 
 
 	/**
-	 * 	Load array this->attribute_xxx like attribute_label, attribute_type, ...
+	 * 	Load array this->attributes, or old this->attribute_xxx like attribute_label, attribute_type, ...
 	 *
-	 * 	@param	string		$elementtype		Type of element ('adherent', 'commande', 'thirdparty', 'facture', 'propal', 'product', ...)
-	 * 	@param	boolean		$forceload			Force load of extra fields whatever is option MAIN_EXTRAFIELDS_DISABLED
-	 * 	@return	array							Array of attributes for all extra fields
+	 * 	@param	string		$elementtype		Type of element ('adherent', 'commande', 'thirdparty', 'facture', 'propal', 'product', ...).
+	 * 	@param	boolean		$forceload			Force load of extra fields whatever is option MAIN_EXTRAFIELDS_DISABLED. Deprecated. Should not be required.
+	 * 	@return	array							Array of attributes keys+label for all extra fields.
 	 */
 	function fetch_name_optionals_label($elementtype,$forceload=false)
 	{
 		global $conf;
 
-		if ( empty($elementtype) ) return array();
+		if (empty($elementtype) ) return array();
 
 		if ($elementtype == 'thirdparty') $elementtype='societe';
 		if ($elementtype == 'contact') $elementtype='socpeople';
 
 		$array_name_label=array();
 
-		// For avoid conflicts with external modules
+		// To avoid conflicts with external modules. TODO Remove this.
 		if (!$forceload && !empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return $array_name_label;
 
+		// We should not have several time this log. If we have, there is some optimization to do by calling a simple $object->fetch_optionals() that include cache management.
+		dol_syslog("fetch_name_optionals_label elementtype=".$elementtype);
+
 		$sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable,perms,list,ishidden,fielddefault,fieldcomputed";
 		$sql.= " FROM ".MAIN_DB_PREFIX."extrafields";
 		$sql.= " WHERE entity IN (0,".$conf->entity.")";
@@ -673,12 +679,13 @@ class ExtraFields
 			{
 				while ($tab = $this->db->fetch_object($resql))
 				{
-					// we can add this attribute to adherent object
+					// We can add this attribute to object. TODO Remove this and return $this->attributes[$elementtype]['label']
 					if ($tab->type != 'separate')
 					{
 						$array_name_label[$tab->name]=$tab->label;
 					}
 
+					// Old usage
 					$this->attribute_type[$tab->name]=$tab->type;
 					$this->attribute_label[$tab->name]=$tab->label;
 					$this->attribute_size[$tab->name]=$tab->size;
@@ -693,8 +700,25 @@ class ExtraFields
 					$this->attribute_perms[$tab->name]=$tab->perms;
 					$this->attribute_list[$tab->name]=$tab->list;
 					$this->attribute_hidden[$tab->name]=$tab->ishidden;
+
+					// New usage
+					$this->attributes[$tab->elementtype]['type'][$tab->name]=$tab->type;
+					$this->attributes[$tab->elementtype]['label'][$tab->name]=$tab->label;
+					$this->attributes[$tab->elementtype]['size'][$tab->name]=$tab->size;
+					$this->attributes[$tab->elementtype]['elementtype'][$tab->name]=$tab->elementtype;
+					$this->attributes[$tab->elementtype]['default'][$tab->name]=$tab->fielddefault;
+					$this->attributes[$tab->elementtype]['computed'][$tab->name]=$tab->fieldcomputed;
+					$this->attributes[$tab->elementtype]['unique'][$tab->name]=$tab->fieldunique;
+					$this->attributes[$tab->elementtype]['required'][$tab->name]=$tab->fieldrequired;
+					$this->attributes[$tab->elementtype]['param'][$tab->name]=($tab->param ? unserialize($tab->param) : '');
+					$this->attributes[$tab->elementtype]['pos'][$tab->name]=$tab->pos;
+					$this->attributes[$tab->elementtype]['alwayseditable'][$tab->name]=$tab->alwayseditable;
+					$this->attributes[$tab->elementtype]['perms'][$tab->name]=$tab->perms;
+					$this->attributes[$tab->elementtype]['list'][$tab->name]=$tab->list;
+					$this->attributes[$tab->elementtype]['ishidden'][$tab->name]=$tab->ishidden;
 				}
 			}
+			if ($elementtype) $this->attributes[$elementtype]['loaded']=1;
 		}
 		else
 		{
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index fcb92f1b525..9c9813e18ca 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -17,22 +17,28 @@
  *
  * Need to have following variables defined:
  * $object (invoice, order, ...)
+ * $action
  * $conf
  * $langs
  *
+ * $parameters
  * $cols
  */
 ?>
-<!-- BEGIN PHP TEMPLATE admin_extrafields_view.tpl.php -->
+<!-- BEGIN PHP TEMPLATE extrafields_view.tpl.php -->
 <?php
 
-//$res = $object->fetch_optionals($object->id, $extralabels);
-$parameters = array('colspan' => ' colspan="'.$cols.'"', 'cols' => $cols, 'socid' => $object->fk_soc);
-$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action);
+if (! is_array($parameters)) $parameters = array();
+if (! empty($cols)) $parameters['colspan'] = ' colspan="'.$cols.'"';
+if (! empty($cols)) $parameters['cols'] = $cols;
+if (! empty($object->fk_soc)) $parameters['socid'] = $object->fk_soc;
 
-if (empty($reshook) && ! empty($extrafields->attribute_label))
+$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action);
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook) && ! empty($extrafields->attributes[$object->table_element]['label']))
 {
-	foreach ($extrafields->attribute_label as $key => $label)
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label)
 	{
 		if ($action == 'edit_extras')
 		{
@@ -42,54 +48,63 @@ if (empty($reshook) && ! empty($extrafields->attribute_label))
 		{
 			$value = $object->array_options["options_" . $key];
 		}
-		if ($extrafields->attribute_type[$key] == 'separate')
+		if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate')
 		{
 			print $extrafields->showSeparator($key);
 		}
 		else
 		{
-			if (!empty($extrafields->attribute_hidden[$key])) print '<tr class="hideobject"><td>';
+			if (! empty($extrafields->attributes[$object->table_element]['ishidden'][$key])) print '<tr class="hideobject"><td>';
 			else print '<tr><td>';
 			print '<table width="100%" class="nobordernopadding">';
 			print '<tr>';
 			print '<td';
 			//var_dump($action);exit;
-			if ((! empty($action) && ($action == 'create' || $action == 'edit')) && ! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"';
+			if ((! empty($action) && ($action == 'create' || $action == 'edit')) && ! empty($extrafields->attributes[$object->table_element]['required'][$key])) print ' class="fieldrequired"';
 			print '>' . $langs->trans($label) . '</td>';
 
 			//TODO Improve element and rights detection
 			//var_dump($user->rights);
 			$permok=false;
+
 			$keyforperm=$object->element;
 			if ($object->element == 'fichinter') $keyforperm='ficheinter';
 			if (isset($user->rights->$keyforperm)) $permok=$user->rights->$keyforperm->creer||$user->rights->$keyforperm->create||$user->rights->$keyforperm->write;
-			if ($object->element=='order_supplier') $permok=$user->rights->fournisseur->commande->creer;
+
+			if ($object->element=='order_supplier')   $permok=$user->rights->fournisseur->commande->creer;
 			if ($object->element=='invoice_supplier') $permok=$user->rights->fournisseur->facture->creer;
-			if ($object->element=='shipping') $permok=$user->rights->expedition->creer;
-			if ($object->element=='delivery') $permok=$user->rights->expedition->livraison->creer;
-			if ($object->element=='productlot') $permok=$user->rights->stock->creer;
-
-			if (($object->statut == 0 || $extrafields->attribute_alwayseditable[$key])
-				&& $permok && ($action != 'edit_extras' || GETPOST('attribute') != $key))
-				print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=edit_extras&attribute=' . $key . '">' . img_edit().'</a></td>';
+			if ($object->element=='shipping')         $permok=$user->rights->expedition->creer;
+			if ($object->element=='delivery')         $permok=$user->rights->expedition->livraison->creer;
+			if ($object->element=='productlot')       $permok=$user->rights->stock->creer;
 
+			if (($object->statut == 0 || ! empty($extrafields->attributes[$object->table_element]['alwayseditable'][$key]))
+				&& $permok && ($action != 'edit_extras' || GETPOST('attribute') != $key)
+			    && empty($extrafields->attributes[$object->table_element]['computed'][$key]))
+			{
+			    $fieldid='id';
+			    if ($object->table_element == 'societe') $fieldid='socid';
+				print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?'.$fieldid.'=' . $object->id . '&action=edit_extras&attribute=' . $key . '">' . img_edit().'</a></td>';
+			}
 			print '</tr></table>';
 			$html_id = !empty($object->id) ? $object->element.'_extras_'.$key.'_'.$object->id : '';
 			print '<td id="'.$html_id.'" class="'.$object->element.'_extras_'.$key.'" colspan="'.$cols.'">';
 
 			// Convert date into timestamp format
-			if (in_array($extrafields->attribute_type[$key], array('date','datetime'))) {
+			if (in_array($extrafields->attributes[$object->table_element]['type'][$key], array('date','datetime'))) {
 				$value = isset($_POST["options_" . $key]) ? dol_mktime($_POST["options_" . $key . "hour"], $_POST["options_" . $key . "min"], 0, $_POST["options_" . $key . "month"], $_POST["options_" . $key . "day"], $_POST["options_" . $key . "year"]) : $db->jdate($object->array_options['options_' . $key]);
 			}
 
 			//TODO Improve element and rights detection
 			if ($action == 'edit_extras' && $permok && GETPOST('attribute') == $key)
 			{
-				print '<form enctype="multipart/form-data" action="' . $_SERVER["PHP_SELF"] . '" method="post" name="formextra">';
+			    $fieldid='id';
+			    if ($object->table_element == 'societe') $fieldid='socid';
+
+			    print '<form enctype="multipart/form-data" action="' . $_SERVER["PHP_SELF"] . '" method="post" name="formextra">';
 				print '<input type="hidden" name="action" value="update_extras">';
 				print '<input type="hidden" name="attribute" value="' . $key . '">';
 				print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
-				print '<input type="hidden" name="id" value="' . $object->id . '">';
+				print '<input type="hidden" name="'.$fieldid.'" value="' . $object->id . '">';
 
 				print $extrafields->showInputField($key, $value,'','','',0,$object->id);
 
@@ -102,8 +117,41 @@ if (empty($reshook) && ! empty($extrafields->attribute_label))
 				print $extrafields->showOutputField($key, $value);
 			}
 			print '</td></tr>' . "\n";
+
+			print "\n";
+			// Add code to manage list depending on others
+			if (! empty($conf->use_javascript_ajax))
+			    print '
+				<script type="text/javascript">
+				    jQuery(document).ready(function() {
+				    	function showOptions(child_list, parent_list)
+				    	{
+				    		var val = $("select[name=\"options_"+parent_list+"\"]").val();
+				    		var parentVal = parent_list + ":" + val;
+							if(val > 0) {
+					    		$("select[name=\""+child_list+"\"] option[parent]").hide();
+					    		$("select[name=\""+child_list+"\"] option[parent=\""+parentVal+"\"]").show();
+							} else {
+								$("select[name=\""+child_list+"\"] option").show();
+							}
+				    	}
+						function setListDependencies() {
+					    	jQuery("select option[parent]").parent().each(function() {
+					    		var child_list = $(this).attr("name");
+								var parent = $(this).find("option[parent]:first").attr("parent");
+								var infos = parent.split(":");
+								var parent_list = infos[0];
+								$("select[name=\""+parent_list+"\"]").change(function() {
+									showOptions(child_list, parent_list);
+								});
+					    	});
+						}
+
+						setListDependencies();
+				    });
+				</script>'."\n";
 		}
 	}
 }
 ?>
-<!-- END PHP TEMPLATE admin_extrafields_view.tpl.php -->
\ No newline at end of file
+<!-- END PHP TEMPLATE extrafields_view.tpl.php -->
\ No newline at end of file
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 882b80ec339..8e1bd00d893 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -50,7 +50,7 @@ $cancel=GETPOST('cancel');
 $amount=GETPOST('amount');
 $donation_date=dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
 $projectid = (GETPOST('projectid') ? GETPOST('projectid', 'int') : 0);
-    
+
 $object = new Don($db);
 $extrafields = new ExtraFields($db);
 
@@ -336,7 +336,7 @@ if ($action == 'create')
     print '</tr>';
 
 	// Country
-    print '<tr><td><label for="selectcountry_id">'.$langs->trans('Country').'</label></td><td colspan="3" class="maxwidthonsmartphone">';
+    print '<tr><td><label for="selectcountry_id">'.$langs->trans('Country').'</label></td><td class="maxwidthonsmartphone">';
     print $form->select_country(GETPOST('country_id')!=''?GETPOST('country_id'):$object->country_id);
     if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
     print '</td></tr>';
@@ -346,7 +346,7 @@ if ($action == 'create')
 	// Public note
 	print '<tr>';
 	print '<td class="border" valign="top">' . $langs->trans('NotePublic') . '</td>';
-	print '<td valign="top" colspan="2">';
+	print '<td>';
 
     $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
 	print $doleditor->Create(1);
@@ -356,7 +356,7 @@ if ($action == 'create')
 	if (empty($user->societe_id)) {
 		print '<tr>';
 		print '<td class="border" valign="top">' . $langs->trans('NotePrivate') . '</td>';
-		print '<td valign="top" colspan="2">';
+		print '<td>';
 
 		$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
 		print $doleditor->Create(1);
@@ -371,7 +371,7 @@ if ($action == 'create')
     }
 
     // Other attributes
-    $parameters=array('colspan' => 3);
+    $parameters=array();
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
     if (empty($reshook) && ! empty($extrafields->attribute_label))
     {
@@ -442,7 +442,7 @@ if (! empty($id) && $action == 'edit')
 	}
 	else
 	{
-		print '<tr><td>'.$langs->trans("Amount").'</td><td colspan="2">';
+		print '<tr><td>'.$langs->trans("Amount").'</td><td>';
 		print price($object->amount,0,$langs,0,0,-1,$conf->currency);
 		print '</td></tr>';
 	}
@@ -467,7 +467,7 @@ if (! empty($id) && $action == 'edit')
 	print '</tr>';
 
 	// Country
-	print '<tr><td class="titlefieldcreate">'.$langs->trans('Country').'</td><td colspan="3">';
+	print '<tr><td class="titlefieldcreate">'.$langs->trans('Country').'</td><td>';
 	print $form->select_country((!empty($object->country_id)?$object->country_id:$mysoc->country_code),'country_id');
 	if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
 	print '</td></tr>';
@@ -496,7 +496,7 @@ if (! empty($id) && $action == 'edit')
     }
 
     // Other attributes
-    $parameters=array('colspan' => ' colspan="2"');
+    $parameters=array();
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
     if (empty($reshook) && ! empty($extrafields->attribute_label))
     {
@@ -544,9 +544,9 @@ if (! empty($id) && $action != 'edit')
 
 	// Print form confirm
 	print $formconfirm;
-	
+
 	$linkback = '<a href="'.DOL_URL_ROOT.'/don/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
-	
+
 	$morehtmlref='<div class="refidno">';
 	// Project
 	if (! empty($conf->projet->enabled))
@@ -581,8 +581,8 @@ if (! empty($id) && $action != 'edit')
 	    }
 	}
 	$morehtmlref.='</div>';
-	
-	
+
+
     dol_banner_tab($object, 'rowid', $linkback, 1, 'rowid', 'ref', $morehtmlref);
 
 
@@ -620,7 +620,7 @@ if (! empty($id) && $action != 'edit')
 	// Zip / Town
 	print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
 	print $object->zip.($object->zip && $object->town?' / ':'').$object->town.'</td></tr>';
-	
+
 	// Country
 	print '<tr><td>'.$langs->trans('Country').'</td><td>';
 	if (! empty($object->country_code))
@@ -634,18 +634,18 @@ if (! empty($id) && $action != 'edit')
 	    print $object->country_olddata;
 	}
 	print '</td></tr>';
-	
+
 	// EMail
 	print "<tr>".'<td>'.$langs->trans("EMail").'</td><td>'.dol_print_email($object->email).'</td></tr>';
 	*/
-	
+
 	// Payment mode
 	print "<tr><td>".$langs->trans("PaymentMode")."</td><td>";
 	$form->form_modes_reglement(null, $object->modepaymentid,'none');
 	print "</td></tr>\n";
-	
+
 	//print "<tr>".'<td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
-	
+
 	// Project
 	/*
 	if (! empty($conf->projet->enabled))
@@ -660,7 +660,7 @@ if (! empty($id) && $action != 'edit')
 	    print '</td>';
 	    print '</tr>';
 	}*/
-	
+
 	// Other attributes
 	$cols = 2;
 	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
@@ -702,7 +702,7 @@ if (! empty($id) && $action != 'edit')
 		while ($i < $num)
 		{
 			$objp = $db->fetch_object($resql);
-			
+
 			print '<tr class="oddeven"><td>';
 			print '<a href="'.DOL_URL_ROOT.'/don/payment/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.'</a></td>';
 			print '<td>'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 8a5811a790a..2c34f5eddcd 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -115,12 +115,12 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    if ($cancel) 
-	{ 
-		$action = ''; 
+    if ($cancel)
+	{
+		$action = '';
 		$object->fetch($id); // show shipment also after canceling modification
 	}
-    
+
 	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';		// Must be include, not include_once
 
 	// Set incoterm
@@ -129,13 +129,13 @@ if (empty($reshook))
 	    $object->fetch($id);
 	    $result = $object->reOpen();
 	}
-	
+
 	// Set incoterm
 	if ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
 	{
 	    $result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
 	}
-	
+
 	if ($action == 'setref_customer')
 	{
         $result = $object->fetch($id);
@@ -152,14 +152,14 @@ if (empty($reshook))
             exit;
         }
 	}
-	
+
 	if ($action == 'update_extras')
 	{
 	    // Fill array 'array_options' with data from update form
 	    $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 	    $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
 	    if ($ret < 0) $error++;
-	
+
 	    if (! $error)
 	    {
 	        // Actions on extra fields (by external module or standard code)
@@ -175,11 +175,11 @@ if (empty($reshook))
 	        } else if ($reshook < 0)
 	            $error++;
 	    }
-	
+
 	    if ($error)
 	        $action = 'edit_extras';
 	}
-	
+
 	// Create shipment
 	if ($action == 'add' && $user->rights->expedition->creer)
 	{
@@ -251,18 +251,18 @@ if (empty($reshook))
     				    $sub_qty[$j]['q']=GETPOST($qty,'int');				// the qty we want to move for this stock record
     				    $sub_qty[$j]['id_batch']=GETPOST($batch,'int');		// the id into llx_product_batch of stock record to move
     					$subtotalqty+=$sub_qty[$j]['q'];
-    				
+
     					//var_dump($qty);var_dump($batch);var_dump($sub_qty[$j]['q']);var_dump($sub_qty[$j]['id_batch']);
-    					
+
     					$j++;
     					$batch="batchl".$i."_".$j;
     					$qty = "qtyl".$i.'_'.$j;
     				}
-    
+
     				$batch_line[$i]['detail']=$sub_qty;		// array of details
     				$batch_line[$i]['qty']=$subtotalqty;
     				$batch_line[$i]['ix_l']=GETPOST($idl,'int');
-    
+
     				$totalqty+=$subtotalqty;
 			    }
 			    else
@@ -289,11 +289,11 @@ if (empty($reshook))
 			        $stockLine[$i][$j]['ix_l']=GETPOST($idl,'int');
 
 			        $totalqty+=GETPOST($qty,'int');
-			        
+
 			        $j++;
 			        $stockLocation="ent1".$i."_".$j;
 			        $qty = "qtyl".$i.'_'.$j;
-			    }			    
+			    }
 			}
 			else
 			{
@@ -301,7 +301,7 @@ if (empty($reshook))
 				//shipment line for product with no batch management and no multiple stock location
 				if (GETPOST($qty,'int') > 0) $totalqty+=GETPOST($qty,'int');
 			}
-				
+
 			// Extrafields
 			$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
             $array_options[$i] = $extrafieldsline->getOptionalsFromPost($extralabelsline, $i);
@@ -312,9 +312,9 @@ if (empty($reshook))
 					unset($_POST["options_" . $key]);
 				}
 			}
-			
+
 	    }
-	
+
 	    //var_dump($batch_line[2]);
 
 	    if ($totalqty > 0)		// There is at least one thing to ship
@@ -324,7 +324,7 @@ if (empty($reshook))
 	        {
 	            $qty = "qtyl".$i;
 				if (! isset($batch_line[$i]))
-				{	
+				{
 					// not batch mode
 					if (isset($stockLine[$i]))
 					{
@@ -352,7 +352,7 @@ if (empty($reshook))
 							$entrepot_id = is_numeric(GETPOST($ent,'int'))?GETPOST($ent,'int'):GETPOST('entrepot_id','int');
 							if ($entrepot_id < 0) $entrepot_id='';
 							if (! ($objectsrc->lines[$i]->fk_product > 0)) $entrepot_id = 0;
-						
+
 							$ret=$object->addline($entrepot_id, GETPOST($idl,'int'), GETPOST($qty,'int'), $array_options[$i]);
 							if ($ret < 0)
 							{
@@ -363,7 +363,7 @@ if (empty($reshook))
 					}
 				}
 				else
-				{	
+				{
 					// batch mode
 					if ($batch_line[$i]['qty']>0)
 					{
@@ -375,11 +375,11 @@ if (empty($reshook))
 						}
 					}
 				}
-	        }	        
+	        }
 	        // Fill array 'array_options' with data from add form
 	        $ret = $extrafields->setOptionalsFromPost($extralabels, $object);
 	        if ($ret < 0) $error++;
-	        
+
 	        if (! $error)
 	        {
 	            $ret=$object->create($user);		// This create shipment (like Odoo picking) and line of shipments. Stock movement will when validating shipment.
@@ -433,9 +433,9 @@ if (empty($reshook))
 	)
 	{
 	    $object->fetch_thirdparty();
-	    
+
 	    $result = $object->valid($user);
-	    
+
 	    if ($result < 0)
 	    {
 			$langs->load("errors");
@@ -627,7 +627,7 @@ if ($action == 'create2')
     $action=''; $id=''; $ref='';
 }
 
-// Mode creation. 
+// Mode creation.
 if ($action == 'create')
 {
     $expe = new Expedition($db);
@@ -740,7 +740,7 @@ if ($action == 'create')
             // Weight
             print '<tr><td>';
             print $langs->trans("Weight");
-            print '</td><td><input name="weight" size="4" value="'.GETPOST('weight','int').'"> ';
+            print '</td><td colspan="3"><input name="weight" size="4" value="'.GETPOST('weight','int').'"> ';
             $text=$formproduct->select_measuring_units("weight_units","weight",GETPOST('weight_units','int'));
             $htmltext=$langs->trans("KeepEmptyForAutoCalculation");
             print $form->textwithpicto($text, $htmltext);
@@ -770,15 +770,15 @@ if ($action == 'create')
             print '<td colspan="3">';
             print '<input name="tracking_number" size="20" value="'.GETPOST('tracking_number','alpha').'">';
             print "</td></tr>\n";
-            
+
             // Other attributes
             $parameters = array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"', 'socid'=>$socid);
             $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$expe,$action);    // Note that $action and $object may have been modified by hook
-            
+
             if (empty($reshook) && ! empty($extrafields->attribute_label)) {
             	print $expe->showOptionals($extrafields, 'edit');
             }
-            
+
 
             // Incoterms
 			if (!empty($conf->incoterm->enabled))
@@ -800,12 +800,12 @@ if ($action == 'create')
     			print $form->selectarray('model', $liste, $conf->global->EXPEDITION_ADDON_PDF);
                 print "</td></tr>\n";
 			}
-			
+
             print "</table>";
 
             dol_fiche_end();
 
-            
+
             // Shipment lines
 
             $numAsked = count($object->lines);
@@ -833,14 +833,14 @@ if ($action == 'create')
 
 
             print '<br>';
-            
-            
+
+
             print '<table class="noborder" width="100%">';
 
 
             // Load shipments already done for same order
             $object->loadExpeditions();
-            
+
             if ($numAsked)
             {
                 print '<tr class="liste_titre">';
@@ -848,7 +848,7 @@ if ($action == 'create')
                 print '<td align="center">'.$langs->trans("QtyOrdered").'</td>';
                 print '<td align="center">'.$langs->trans("QtyShipped").'</td>';
                 print '<td align="center">'.$langs->trans("QtyToShip");
-				if (empty($conf->productbatch->enabled)) 
+				if (empty($conf->productbatch->enabled))
 				{
 	                print ' <br>(<a href="#" id="autofill">'.$langs->trans("Fill").'</a>';
 	                print ' / <a href="#" id="autoreset">'.$langs->trans("Reset").'</a>)';
@@ -875,7 +875,7 @@ if ($action == 'create')
                 $product = new Product($db);
 
                 $line = $object->lines[$indiceAsked];
-                
+
 
                 // Show product and description
                 $type=$line->product_type?$line->product_type:$line->fk_product_type;
@@ -885,7 +885,7 @@ if ($action == 'create')
                 if (! empty($line->date_end)) $type=1;
 
                 print '<tr class="oddeven">'."\n";
-                
+
                 // Product label
                 if ($line->fk_product > 0)  // If predefined product
                 {
@@ -913,7 +913,7 @@ if ($action == 'create')
                     {
                         print ($line->desc && $line->desc!=$line->product_label)?'<br>'.dol_htmlentitiesbr($line->desc):'';
                     }
-                    
+
                     print '</td>';
                 }
                 else
@@ -958,7 +958,7 @@ if ($action == 'create')
 					$quantityToBeDelivered = $quantityAsked - $quantityDelivered;
 				}
                 $warehouse_id = GETPOST('entrepot_id','int');
-			
+
 				$warehouseObject = null;
 				if ($warehouse_id > 0 || ! ($line->fk_product > 0) || empty($conf->stock->enabled))     // If warehouse was already selected or if product is not a predefined, we go into this part with no multiwarehouse selection
 				{
@@ -1040,10 +1040,10 @@ if ($action == 'create')
 					{
 					    // Product need lot
 						print '<td></td><td></td></tr>';	// end line and start a new one for lot/serial
-						
+
 						$staticwarehouse=new Entrepot($db);
 						if ($warehouse_id > 0) $staticwarehouse->fetch($warehouse_id);
-						
+
 						$subj=0;
 						// Define nb of lines suggested for this order line
 						$nbofsuggested=0;
@@ -1066,11 +1066,11 @@ if ($action == 'create')
 								print '<td colspan="3" ></td><td align="center">';
 								print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="'.$deliverableQty.'">';
 								print '</td>';
-		
+
 								print '<td align="left">';
-		
+
 								print $staticwarehouse->getNomUrl(0).' / ';
-		
+
 								print '<!-- Show details of lot -->';
 								print '<input name="batchl'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$dbatch->id.'">';
 								print $langs->trans("DetailBatchFormat", $dbatch->batch, dol_print_date($dbatch->eatby,"day"), dol_print_date($dbatch->sellby,"day"), $dbatch->qty);
@@ -1089,28 +1089,28 @@ if ($action == 'create')
 						    print '<tr class="oddeven"><td colspan="3"></td><td align="center">';
 							print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="0" disabled="disabled"> ';
 							print '</td>';
-							
+
 							print '<td align="left">';
 							print img_warning().' '.$langs->trans("NoProductToShipFoundIntoStock", $staticwarehouse->libelle);
 							print '</td></tr>';
 						}
 					}
 				}
-				else 
+				else
 				{
 					// ship from multiple locations
 					if (empty($conf->productbatch->enabled) || ! $product->hasbatch())
 					{
 					    print '<td></td><td></td></tr>';	// end line and start a new one for each warehouse
 					    print '<!-- Case warehouse not already known and product does not need lot -->';
-					    	
+
 						print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
 						$subj=0;
     					// Define nb of lines suggested for this order line
 						$nbofsuggested=0;
 						foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse)
 						{
-							if ($stock_warehouse->real > 0) 
+							if ($stock_warehouse->real > 0)
 							{
                                 $nbofsuggested++;
 						    }
@@ -1119,7 +1119,7 @@ if ($action == 'create')
 						foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse)    // $stock_warehouse is product_stock
 						{
 							$tmpwarehouseObject->fetch($warehouse_id);
-							if ($stock_warehouse->real > 0) 
+							if ($stock_warehouse->real > 0)
 							{
 								$stock = + $stock_warehouse->real; // Convert it to number
 								$deliverableQty = min($quantityToBeDelivered,$stock);
@@ -1134,7 +1134,7 @@ if ($action == 'create')
 								}
 								else print $langs->trans("NA");
 								print '</td>';
-								
+
 								// Stock
 								if (! empty($conf->stock->enabled))
 								{
@@ -1142,10 +1142,10 @@ if ($action == 'create')
 									if ($line->product_type == 0 || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
 									{
 										print $tmpwarehouseObject->getNomUrl(0).' ';
-										 
+
 										print '<!-- Show details of stock -->';
 										print '('.$stock.')';
-									   
+
 									}
 									else
 									{
@@ -1193,7 +1193,7 @@ if ($action == 'create')
 
 						$subj=0;
 						print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
-						
+
 						$tmpwarehouseObject=new Entrepot($db);
 						$productlotObject=new Productlot($db);
 						// Define nb of lines suggested for this order line
@@ -1207,7 +1207,7 @@ if ($action == 'create')
 								}
 						    }
 						}
-						foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse) 
+						foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse)
 						{
 							$tmpwarehouseObject->fetch($warehouse_id);
 							if (($stock_warehouse->real > 0) && (count($stock_warehouse->detail_batch))) {
@@ -1219,11 +1219,11 @@ if ($action == 'create')
 									print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested)?$bc[$var]:'').'><td colspan="3"></td><td align="center">';
 									print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="'.$deliverableQty.'">';
 									print '</td>';
-									 
+
 									print '<td align="left">';
-									 
+
 									print $tmpwarehouseObject->getNomUrl(0).' / ';
-									 
+
 									print '<!-- Show details of lot -->';
 									print '<input name="batchl'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$dbatch->id.'">';
 									//print $langs->trans("DetailBatchFormat", $dbatch->batch, dol_print_date($dbatch->eatby,"day"), dol_print_date($dbatch->sellby,"day"), $dbatch->qty);
@@ -1242,7 +1242,7 @@ if ($action == 'create')
 								}
 							}
 						}
-						
+
 					}
 					if ($subj == 0) // Line not shown yet, we show it
 					{
@@ -1262,12 +1262,12 @@ if ($action == 'create')
 						    print $langs->trans("NA");
 						}
 						print '</td>';
-						
+
 						print '<td align="left">';
 						if ($line->product_type == 0 || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
 						{
-							$warehouse_selected_id = GETPOST('entrepot_id','int');							
-    						if ($warehouse_selected_id > 0) 
+							$warehouse_selected_id = GETPOST('entrepot_id','int');
+    						if ($warehouse_selected_id > 0)
     						{
     							$warehouseObject=new Entrepot($db);
     							$warehouseObject->fetch($warehouse_selected_id);
@@ -1287,10 +1287,10 @@ if ($action == 'create')
 						print '</tr>';
 					}
 				}
-				
-				
+
+
 				//Display lines extrafields
-				if (is_array($extralabelslines) && count($extralabelslines)>0) 
+				if (is_array($extralabelslines) && count($extralabelslines)>0)
 				{
 					$colspan=5;
 					$line = new ExpeditionLigne($db);
@@ -1340,14 +1340,14 @@ else if ($id || $ref)
 
 		$soc = new Societe($db);
 		$soc->fetch($object->socid);
-		
+
 		$res = $object->fetch_optionals($object->id, $extralabels);
 
 		$head=shipping_prepare_head($object);
 		dol_fiche_head($head, 'shipping', $langs->trans("Shipment"), 0, 'sending');
 
 		$formconfirm='';
-		
+
 		// Confirm deleteion
 		if ($action == 'delete')
 		{
@@ -1393,18 +1393,18 @@ else if ($id || $ref)
 		    if (empty($reshook)) $formconfirm.=$hookmanager->resPrint;
 		    elseif ($reshook > 0) $formconfirm=$hookmanager->resPrint;
 		}
-		
+
 		// Print form confirm
 		print $formconfirm;
-		
-		
+
+
 		// Calculate totalWeight and totalVolume for all products
 		// by adding weight and volume of each product line.
 		$tmparray=$object->getTotalWeightVolume();
 		$totalWeight=$tmparray['weight'];
 		$totalVolume=$tmparray['volume'];
-		
-		
+
+
 		if ($typeobject == 'commande' && $object->$typeobject->id && ! empty($conf->commande->enabled))
 		{
 		    $objectsrc=new Commande($db);
@@ -1459,15 +1459,15 @@ else if ($id || $ref)
             }
         }
 		$morehtmlref.='</div>';
-		
+
 
     	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-    	
-    	
+
+
     	print '<div class="fichecenter">';
     	print '<div class="fichehalfleft">';
     	print '<div class="underbanner clearboth"></div>';
-    	
+
         print '<table class="border" width="100%">';
 
 		// Linked documents
@@ -1550,7 +1550,7 @@ else if ($id || $ref)
 			if (!empty($object->trueWeight)) print ' ('.$langs->trans("SumOfProductWeights").': ';
 			//print $totalWeight.' '.measuring_units_string(0,"weight");
 			print showDimensionInBestUnit($totalWeight, 0, "weight", $langs, isset($conf->global->MAIN_WEIGHT_DEFAULT_ROUND)?$conf->global->MAIN_WEIGHT_DEFAULT_ROUND:-1, isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT)?$conf->global->MAIN_WEIGHT_DEFAULT_UNIT:'no');
-			//if (empty($object->trueWeight)) print ' ('.$langs->trans("Calculated").')'; 
+			//if (empty($object->trueWeight)) print ' ('.$langs->trans("Calculated").')';
 			if (!empty($object->trueWeight)) print ')';
 		}
 		print '</td></tr>';
@@ -1597,7 +1597,7 @@ else if ($id || $ref)
 		print '<td colspan="3">';
 		$calculatedVolume=0;
 		$volumeUnit=0;
-		if ($object->trueWidth && $object->trueHeight && $object->trueDepth) 
+		if ($object->trueWidth && $object->trueHeight && $object->trueDepth)
 		{
 		    $calculatedVolume=($object->trueWidth * $object->trueHeight * $object->trueDepth);
 		    $volumeUnit=$object->size_units * 3;
@@ -1605,7 +1605,7 @@ else if ($id || $ref)
 		// If sending volume not defined we use sum of products
 		if ($calculatedVolume > 0)
 		{
-			if ($volumeUnit < 50) 
+			if ($volumeUnit < 50)
 			{
 			    //print $calculatedVolume.' '.measuring_units_string($volumeUnit,"volume");
 			    print showDimensionInBestUnit($calculatedVolume, $volumeUnit, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND)?$conf->global->MAIN_VOLUME_DEFAULT_ROUND:-1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT)?$conf->global->MAIN_VOLUME_DEFAULT_UNIT:'no');
@@ -1626,14 +1626,14 @@ else if ($id || $ref)
 		// Other attributes
 		$cols = 2;
 		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
-		
+
 		print '</table>';
-		
+
 		print '</div>';
 		print '<div class="fichehalfright">';
 		print '<div class="ficheaddleft">';
 		print '<div class="underbanner clearboth"></div>';
-		
+
 		print '<table class="border centpercent">';
 
 		// Sending method
@@ -1667,7 +1667,7 @@ else if ($id || $ref)
 		}
 		print '</td>';
 		print '</tr>';
-		
+
 		// Tracking Number
 		print '<tr><td class="titlefield">'.$form->editfieldkey("TrackingNumber",'trackingnumber',$object->tracking_number,$object,$user->rights->expedition->creer).'</td><td colspan="3">';
 		print $form->editfieldval("TrackingNumber",'trackingnumber',$object->tracking_url,$object,$user->rights->expedition->creer,'string',$object->tracking_number);
@@ -1697,19 +1697,19 @@ else if ($id || $ref)
 		}
 
 		print "</table>";
-		
+
 		print '</div>';
 		print '</div>';
 		print '</div>';
-			
+
 		print '<div class="clearboth"></div>';
-			
+
 
 		/*
 		 * Lines of products
 		 */
 		print '<br>';
-		
+
         print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
@@ -1732,7 +1732,7 @@ else if ($id || $ref)
 		{
             print '<td align="center">'.$langs->trans("QtyInOtherShipments").'</td>';
 		}
-		
+
 		print '<td align="center">'.$langs->trans("CalculatedWeight").'</td>';
 		print '<td align="center">'.$langs->trans("CalculatedVolume").'</td>';
 		//print '<td align="center">'.$langs->trans("Size").'</td>';
@@ -1793,7 +1793,7 @@ else if ($id || $ref)
     		{
     		    $num = $db->num_rows($resql);
     		    $i = 0;
-    		
+
     		    while($i < $num)
     		    {
         		    $obj = $db->fetch_object($resql);
@@ -1900,7 +1900,7 @@ else if ($id || $ref)
     			        }
     			    }
     			}
-    		}			
+    		}
 			print '</td>';
 
 			// Weight
@@ -1960,7 +1960,7 @@ else if ($id || $ref)
 						}
 						print $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"),$detail);
 					}
-					else 
+					else
 					{
 						print $langs->trans("NA");
 					}
@@ -1970,7 +1970,7 @@ else if ($id || $ref)
 				}
 			}
 			print "</tr>";
-			
+
 			// Display lines extrafields
 			if (is_array($extralabelslines) && count($extralabelslines)>0) {
 				$colspan= empty($conf->productbatch->enabled) ? 5 : 6;
@@ -1981,11 +1981,11 @@ else if ($id || $ref)
 				print '</tr>';
 			}
 
-			
+
 		}
-		
+
 		// TODO Show also lines ordered but not delivered
-		
+
 		print "</table>\n";
 		print '</div>';
 	}
@@ -1996,7 +1996,7 @@ else if ($id || $ref)
 
 	$object->fetchObjectLinked($object->id,$object->element);
 
-	
+
 	/*
 	 *    Boutons actions
 	 */
@@ -2023,14 +2023,14 @@ else if ($id || $ref)
 					print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Validate").'</a>';
 				}
 			}
-	
+
 			// TODO add alternative status
 			// 0=draft, 1=validated, 2=billed, we miss a status "delivered" (only available on order)
 			if ($object->statut == 2 && $object->billed && $user->rights->expedition->creer)
 			{
 			    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
 			}
-			
+
 			// Send
 			if ($object->statut > 0)
 			{
@@ -2040,7 +2040,7 @@ else if ($id || $ref)
 				}
 				else print '<a class="butActionRefused" href="#">'.$langs->trans('SendByMail').'</a>';
 			}
-	
+
 			// Create bill and Close shipment
 			if (! empty($conf->facture->enabled) && $object->statut > 0)
 			{
@@ -2049,7 +2049,7 @@ else if ($id || $ref)
 					print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("CreateBill").'</a>';
 				}
 			}
-	
+
 			// This is just to generate a delivery receipt
 			//var_dump($object->linkedObjectsIds['delivery']);
 			if ($conf->livraison_bon->enabled && ($object->statut == 1 || $object->statut == 2) && $user->rights->expedition->livraison->creer && count($object->linkedObjectsIds['delivery']) == 0)
@@ -2071,14 +2071,14 @@ else if ($id || $ref)
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action='.$paramaction.'">'.$langs->trans($label).'</a>';
 				}
 			}
-	
+
 			if ($user->rights->expedition->supprimer)
 			{
 				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a>';
 			}
-			
+
 		}
-		
+
 		print '</div>';
 	}
 
@@ -2086,11 +2086,11 @@ else if ($id || $ref)
 	/*
 	 * Documents generated
 	 */
-	
+
 	if ($action != 'presend')
 	{
         print '<div class="fichecenter"><div class="fichehalfleft">';
-	    
+
         $objectref = dol_sanitizeFileName($object->ref);
 		$filedir = $conf->expedition->dir_output . "/sending/" .$objectref;
 
@@ -2101,12 +2101,12 @@ else if ($id || $ref)
 
 		print $formfile->showdocuments('expedition',$objectref,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'','','',$soc->default_lang);
 
-		
+
 		// Show links to link elements
 		//$linktoelem = $form->showLinkToObjectBlock($object, null, array('order'));
 		$somethingshown = $form->showLinkedObjectBlock($object, '');
 
-		
+
 		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
 		// List of actions on element
@@ -2117,11 +2117,11 @@ else if ($id || $ref)
 		print '</div></div></div>';
 	}
 
-	
+
 	/*
 	 * Action presend
 	 */
-	
+
 	//Select mail models is same action as presend
 	if (GETPOST('modelselected')) {
 		$action = 'presend';
@@ -2182,7 +2182,7 @@ else if ($id || $ref)
 		{
 			include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 			$formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'shi'.$object->id);
-		}		
+		}
 		$formmail->withfrom=1;
 		$liste=array();
 		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value)	$liste[$key]=$value;
@@ -2215,7 +2215,7 @@ else if ($id || $ref)
 		{
     		$contactarr=$objectsrc->liste_contact(-1,'external');
 		}
-		
+
 		if (is_array($contactarr) && count($contactarr)>0) {
 			foreach($contactarr as $contact) {
 
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index cfa88b187f0..2e6fed839eb 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -133,9 +133,9 @@ if ($object->id > 0)
 	dol_fiche_head($head, 'supplier', $langs->trans("ThirdParty"), -1, 'company');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
-	
+
 	dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
-        
+
 	print '<div class="fichecenter"><div class="fichehalfleft">';
 
     print '<div class="underbanner clearboth"></div>';
@@ -243,12 +243,7 @@ if ($object->id > 0)
 
 	// Other attributes
 	$parameters=array('socid'=>$object->id, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');
-	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	if (empty($reshook) && ! empty($extrafields->attribute_label))
-	{
-		print $object->showOptionals($extrafields);
-	}
+	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
 	// Module Adherent
     if (! empty($conf->adherent->enabled))
@@ -278,15 +273,15 @@ if ($object->id > 0)
 	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
 	$boxstat = '';
-	
+
 	// Nbre max d'elements des petites listes
 	$MAXLIST=$conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
-	
+
 	// Lien recap
 	$boxstat.='<div class="box">';
 	$boxstat.='<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="noborder boxtable boxtablenobottom" width="100%">';
 	$boxstat.='<tr class="impair"><td colspan="2" class="tdboxstats nohover">';
-	
+
 	if ($conf->supplier_proposal->enabled)
 	{
 	    // Box proposals
@@ -304,7 +299,7 @@ if ($object->id > 0)
 	    $boxstat.='</div>';
 	    if ($link) $boxstat.='</a>';
 	}
-	
+
 	if ($conf->fournisseur->enabled)
 	{
 	    // Box proposals
@@ -322,14 +317,14 @@ if ($object->id > 0)
 	    $boxstat.='</div>';
 	    if ($link) $boxstat.='</a>';
 	}
-	
+
 	if ($conf->fournisseur->enabled)
 	{
 	    $tmp = $object->getOutstandingBills('supplier');
 	    $outstandingOpened=$tmp['opened'];
 	    $outstandingTotal=$tmp['total_ht'];
 	    $outstandingTotalIncTax=$tmp['total_ttc'];
-	     
+
 	    $text=$langs->trans("OverAllInvoices");
 	    $link='';
 	    $icon='bill';
@@ -339,7 +334,7 @@ if ($object->id > 0)
 	    $boxstat.='<span class="boxstatsindicator">'.price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
 	    $boxstat.='</div>';
 	    if ($link) $boxstat.='</a>';
-	     
+
 	    // Box outstanding bill
 	    $text=$langs->trans("CurrentOutstandingBill");
 	    $link=DOL_URL_ROOT.'/fourn/recap-fourn.php?socid='.$object->id;
@@ -351,14 +346,14 @@ if ($object->id > 0)
 	    $boxstat.='</div>';
 	    if ($link) $boxstat.='</a>';
 	}
-	
+
 	$boxstat.='</td></tr>';
 	$boxstat.='</table>';
 	$boxstat.='</div>';
-	
+
 	print $boxstat;
-	
-	
+
+
 	$var=true;
 
 	$MAXLIST=$conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
@@ -395,10 +390,10 @@ if ($object->id > 0)
 		$sql.= ' AND pfp.fk_soc = '.$object->id;
 		$sql .= $db->order('pfp.tms', 'desc');
 		$sql.= $db->plimit($MAXLIST);
-		
+
 		$query = $db->query($sql);
         if (! $query) dol_print_error($db);
-        
+
 		$return = array();
 
 		if ($db->num_rows($query)) {
@@ -407,7 +402,7 @@ if ($object->id > 0)
 
 			while ($objp = $db->fetch_object($query)) {
 
-				
+
 
 				$productstatic->id = $objp->rowid;
 				$productstatic->ref = $objp->ref;
@@ -445,12 +440,12 @@ if ($object->id > 0)
 		print '</table>';
 	}
 
-	
+
 	/*
 	 * Last supplier proposal
 	 */
 	$proposalstatic = new SupplierProposal($db);
-	
+
 	if ($user->rights->supplier_proposal->lire)
 	{
 	    $sql  = "SELECT p.rowid, p.ref, p.date_valid as dc, p.fk_statut, p.total_ht, p.tva as total_tva, p.total as total_ttc";
@@ -459,17 +454,17 @@ if ($object->id > 0)
 	    $sql.= " AND p.entity =".$conf->entity;
 	    $sql.= " ORDER BY p.date_valid DESC";
 	    $sql.= " ".$db->plimit($MAXLIST);
-	    
+
 	    $resql=$db->query($sql);
 	    if ($resql)
 	    {
 	        $i = 0 ;
 	        $num = $db->num_rows($resql);
-	
+
 	        if ($num > 0)
 	        {
 	            print '<table class="noborder" width="100%">';
-	
+
 	            print '<tr class="liste_titre">';
 	            print '<td colspan="3">';
 	            print '<table class="nobordernopadding" width="100%"><tr><td>'.$langs->trans("LastSupplierProposals",($num<$MAXLIST?"":$MAXLIST)).'</td>';
@@ -478,13 +473,13 @@ if ($object->id > 0)
 	            print '</tr></table>';
 	            print '</td></tr>';
 	        }
-	
+
 	        $var = True;
 	        while ($i < $num && $i <= $MAXLIST)
 	        {
 	            $obj = $db->fetch_object($resql);
-	            
-	
+
+
 	            print '<tr class="oddeven">';
 	            print '<td class="nowrap">';
 	            $proposalstatic->id = $obj->rowid;
@@ -509,14 +504,14 @@ if ($object->id > 0)
 	            $i++;
 	        }
 	        $db->free($resql);
-	
+
 	        if ($num >0) print "</table>";
 	    }
 	    else
 	    {
 	        dol_print_error($db);
 	    }
-	}	
+	}
 
 	/*
 	 * Last supplier orders
@@ -558,7 +553,7 @@ if ($object->id > 0)
 			$object_count = $db->fetch_object($resql);
 			$num = $object_count->total;
 		}
-		
+
 		$sql  = "SELECT p.rowid,p.ref, p.date_commande as dc, p.fk_statut, p.total_ht, p.tva as total_tva, p.total_ttc";
 		$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as p ";
 		$sql.= " WHERE p.fk_soc =".$object->id;
@@ -587,7 +582,7 @@ if ($object->id > 0)
 			while ($i < $num && $i < $MAXLIST)
 			{
 				$obj = $db->fetch_object($resql);
-				
+
 
 				print '<tr class="oddeven">';
                 print '<td class="nowrap">';
@@ -660,7 +655,7 @@ if ($object->id > 0)
 			while ($i < min($num,$MAXLIST))
 			{
 				$obj = $db->fetch_object($resql);
-				
+
 				print '<tr class="oddeven">';
 				print '<td>';
 				print '<a href="facture/card.php?facid='.$obj->rowid.'">';
@@ -712,7 +707,7 @@ if ($object->id > 0)
         {
             print '<div class="inline-block divButAction"><a class="butActionRefused" title="'.dol_escape_js($langs->trans("ThirdPartyIsClosed")).'" href="#">'.$langs->trans("ThirdPartyIsClosed").'</a></div>';
         }
-	    
+
 		if ($conf->supplier_proposal->enabled && $user->rights->supplier_proposal->creer && $object->status==1)
 		{
 			$langs->load("supplier_proposal");
@@ -750,9 +745,9 @@ if ($object->id > 0)
         	}
     	}
 	}
-	
+
 	print '</div>';
-	
+
 
 	if (! empty($conf->global->MAIN_REPEATCONTACTONEACHTAB))
 	{
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index a6f0cc248f1..f77eb949c9a 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -279,7 +279,7 @@ if (empty($reshook))
 	if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
 	{
 	    $db->begin();
-	    
+
 	    $langs->load('errors');
 	    $error = 0;
 
@@ -469,7 +469,7 @@ if (empty($reshook))
 	    if (! $error && $result > 0)
 	    {
 	        $db->commit();
-	        
+
 	    	$ret=$object->fetch($object->id);    // Reload to get new records
 
 	        // Define output language
@@ -526,7 +526,7 @@ if (empty($reshook))
 		    $db->rollback();
             setEventMessages($object->error, $object->errors, 'errors');
 	    }
-	    
+
 	    $action = '';
 	}
 
@@ -1617,7 +1617,7 @@ elseif (! empty($object->id))
 
 	$res=$object->fetch_optionals($object->id,$extralabels);
 
-	
+
 	$head = ordersupplier_prepare_head($object);
 
 	$title=$langs->trans("SupplierOrder");
@@ -1754,11 +1754,11 @@ elseif (! empty($object->id))
 	// Print form confirm
 	print $formconfirm;
 
-	
+
 	// Supplier order card
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/fourn/commande/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
-	
+
 	$morehtmlref='<div class="refidno">';
 	// Ref supplier
 	$morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->fournisseur->commande->creer, 'string', '', 0, 1);
@@ -1798,15 +1798,15 @@ elseif (! empty($object->id))
 	    }
 	}
 	$morehtmlref.='</div>';
-	
-	
-	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);	
-	
+
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
 
 	print '<div class="fichecenter">';
 	print '<div class="fichehalfleft">';
 	print '<div class="underbanner clearboth"></div>';
-	 	
+
 	print '<table class="border" width="100%">';
 
 	// Date
@@ -1995,16 +1995,15 @@ elseif (! empty($object->id))
 	}
 
 	// Other attributes
-	$cols = 2;
 	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
 	print '</table>';
-	
+
 	print '</div>';
 	print '<div class="fichehalfright">';
 	print '<div class="ficheaddleft">';
 	print '<div class="underbanner clearboth"></div>';
-	
+
 	print '<table class="border centpercent">';
 
 	if (!empty($conf->multicurrency->enabled))
@@ -2013,18 +2012,18 @@ elseif (! empty($object->id))
 	    print '<tr><td class="titlefieldmiddle">' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . '</td>';
 	    print '<td class="nowrap">' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
 	    print '</tr>';
-	
+
 	    // Multicurrency Amount VAT
 	    print '<tr><td>' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . '</td>';
 	    print '<td class="nowrap">' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
 	    print '</tr>';
-	
+
 	    // Multicurrency Amount TTC
 	    print '<tr><td>' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . '</td>';
 	    print '<td class="nowrap">' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
 	    print '</tr>';
 	}
-	
+
 	// Total
 	print '<tr><td class="titlefieldmiddle">'.$langs->trans("AmountHT").'</td>';
 	print '<td>'.price($object->total_ht,'',$langs,1,-1,-1,$conf->currency).'</td>';
@@ -2053,19 +2052,19 @@ elseif (! empty($object->id))
 	print '</tr>';
 
 	print '</table>';
-	
+
 	// Margin Infos
 	/*if (! empty($conf->margin->enabled)) {
 	    $formmargin->displayMarginInfos($object);
 	}*/
-	
-	
+
+
 	print '</div>';
 	print '</div>';
 	print '</div>';
-	
+
 	print '<div class="clearboth"></div><br>';
-	
+
 	if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
 		$blocname = 'contacts';
diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php
index 32f1a5538b5..9fb9a63828d 100644
--- a/htdocs/fourn/commande/orderstoinvoice.php
+++ b/htdocs/fourn/commande/orderstoinvoice.php
@@ -76,9 +76,9 @@ $extrafields = new ExtraFields($db);
 // fetch optionals attributes and labels
 $extralabels=$extrafields->fetch_name_optionals_label('facture_fourn');
 
-if ($action == 'create') 
+if ($action == 'create')
 {
-	if (! is_array($selected)) 
+	if (! is_array($selected))
 	{
 		$error++;
 		setEventMessages($langs->trans('Error_OrderNotChecked'), null, 'errors');
@@ -246,10 +246,10 @@ if (($action == 'create' || $action == 'add') && ! $error) {
 
 		// End of object creation, we show it
 		if ($id > 0 && ! $error) {
-			
+
 			foreach($orders_id as $fk_supplier_order) {
 				$supplier_order = new CommandeFournisseur($db);
-				if ($supplier_order->fetch($fk_supplier_order)>0 && $supplier_order->statut == 5) 
+				if ($supplier_order->fetch($fk_supplier_order)>0 && $supplier_order->statut == 5)
 				{
 					if ($supplier_order->classifyBilled($user) < 0)
 					{
@@ -258,20 +258,20 @@ if (($action == 'create' || $action == 'add') && ! $error) {
 						$_GET["origin"] = $_POST["origin"];
 						$_GET["originid"] = $_POST["originid"];
 						$mesgs[] = '<div class="error">' . $object->error . '</div>';
-						
+
 						$error++;
 						break;
 					}
-					
+
 				}
 			}
-			
+
 			if(!$error) {
 				$db->commit();
 				header('Location: ' . DOL_URL_ROOT . '/fourn/facture/card.php?facid=' . $id);
 				exit();
 			}
-			
+
 		} else {
 			$db->rollback();
 			$action = 'create';
@@ -366,7 +366,8 @@ if ($action == 'create' && !$error) {
 	$parameters = array (
 			'objectsrc' => $objectsrc,
 			'idsrc' => $listoforders,
-			'colspan' => ' colspan="3"'
+			'colspan' => ' colspan="2"',
+	        'cols'=>2
 	);
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 
@@ -494,7 +495,7 @@ if (($action != 'create' && $action != 'add') && !$error) {
 			$companystatic->nom = $soc->nom;
 			print '<h3>' . $companystatic->getNomUrl(1, 'customer') . '</h3>';
 		}
-		
+
 		print '<form name="orders2invoice" method="GET" action="orderstoinvoice.php">';
 		print '<input type="hidden" name="socid" value="' . $socid . '">';
 		print '<table class="noborder" width="100%">';
@@ -517,7 +518,7 @@ if (($action != 'create' && $action != 'add') && !$error) {
 		print '<td class="liste_titre" align="left">';
 		print '<input class="flat" type="text" size="10" name="sref_client" value="' . $sref_client . '">';
         print '</td>';
-        
+
 		// DATE ORDER
 		print '<td class="liste_titre" align="center">';
 		print $period;
@@ -606,9 +607,9 @@ if (($action != 'create' && $action != 'add') && !$error) {
 		print '<input type="submit" class="butAction" value="' . $langs->trans("GenerateBill") . '">';
 		print '</div>';
 		print '</div>';
-		
+
 		print '</form>';
-		
+
 		$db->free($resql);
 	} else {
 		print dol_print_error($db);
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 04e6ea98481..0ec657ccdfe 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -206,7 +206,7 @@ if (empty($reshook))
                     }
                     $model=$object->modelpdf;
                     $ret = $object->fetch($id); // Reload to get new records
-    
+
                     $result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
                     if ($result < 0) dol_print_error($db,$result);
 	            }
@@ -1198,7 +1198,7 @@ if (empty($reshook))
 	$upload_dir = $conf->fournisseur->facture->dir_output;
 	$permissioncreate = $user->rights->fournisseur->facture->creer;
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
-	
+
 	// Make calculation according to calculationrule
 	if ($action == 'calculate')
 	{
@@ -1674,7 +1674,7 @@ if ($action == 'create')
 	if ($socid > 0)
 	{
 		// Discounts for third party
-		print '<tr><td>' . $langs->trans('Discounts') . '</td><td colspan="2">';
+		print '<tr><td>' . $langs->trans('Discounts') . '</td><td>';
 		if ($soc->remise_percent)
 			print $langs->trans("CompanyHasRelativeDiscount", '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $soc->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">' . $soc->remise_percent . '</a>');
 		else
@@ -1705,17 +1705,17 @@ if ($action == 'create')
     print '</td></tr>';
 
 	// Payment term
-	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td colspan="2">';
+	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td>';
 	$form->select_conditions_paiements(isset($_POST['cond_reglement_id'])?$_POST['cond_reglement_id']:$cond_reglement_id, 'cond_reglement_id');
 	print '</td></tr>';
 
 	// Payment mode
-	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td colspan="2">';
+	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td>';
 	$form->select_types_paiements(isset($_POST['mode_reglement_id'])?$_POST['mode_reglement_id']:$mode_reglement_id, 'mode_reglement_id', 'DBIT');
 	print '</td></tr>';
 
     // Bank Account
-    print '<tr><td>'.$langs->trans('BankAccount').'</td><td colspan="2">';
+    print '<tr><td>'.$langs->trans('BankAccount').'</td><td>';
     $form->select_comptes($fk_account, 'fk_account', 0, '', 1);
     print '</td></tr>';
 
@@ -1724,7 +1724,7 @@ if ($action == 'create')
 	{
 		print '<tr>';
 		print '<td>'.fieldLabel('Currency','multicurrency_code').'</td>';
-        print '<td colspan="2" class="maxwidthonsmartphone">';
+        print '<td class="maxwidthonsmartphone">';
 	    print $form->selectMultiCurrency($currency_code, 'multicurrency_code');
 		print '</td></tr>';
 	}
@@ -1735,7 +1735,7 @@ if ($action == 'create')
 		$formproject = new FormProjets($db);
 
 		$langs->load('projects');
-		print '<tr><td>' . $langs->trans('Project') . '</td><td colspan="2">';
+		print '<tr><td>' . $langs->trans('Project') . '</td><td>';
 		$formproject->select_projects((empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS)?$societe->id:-1), $projectid, 'projectid', 0, 0, 1, 1);
 		print '</td></tr>';
 	}
@@ -1790,7 +1790,7 @@ if ($action == 'create')
 	        $langs->load('orders');
 	        $txt=$langs->trans("SupplierOrder");
         }
-        print '<tr><td>'.$txt.'</td><td colspan="2">'.$objectsrc->getNomUrl(1);
+        print '<tr><td>'.$txt.'</td><td>'.$objectsrc->getNomUrl(1);
         // We check if Origin document (id and type is known) has already at least one invoice attached to it
         $objectsrc->fetchObjectLinked($originid,$origin,'','invoice_supplier');
         $cntinvoice=count($objectsrc->linkedObjects['invoice_supplier']);
@@ -1800,29 +1800,29 @@ if ($action == 'create')
         	echo ' ('.$langs->trans('LatestRelatedBill').end($objectsrc->linkedObjects['invoice_supplier'])->getNomUrl(1).')';
         }
         echo '</td></tr>';
-        print '<tr><td>'.$langs->trans('TotalHT').'</td><td colspan="2">'.price($objectsrc->total_ht).'</td></tr>';
-        print '<tr><td>'.$langs->trans('TotalVAT').'</td><td colspan="2">'.price($objectsrc->total_tva)."</td></tr>";
+        print '<tr><td>'.$langs->trans('TotalHT').'</td><td>'.price($objectsrc->total_ht).'</td></tr>';
+        print '<tr><td>'.$langs->trans('TotalVAT').'</td><td>'.price($objectsrc->total_tva)."</td></tr>";
         if ($mysoc->localtax1_assuj=="1" || $object->total_localtax1 != 0) //Localtax1
         {
-            print '<tr><td>'.$langs->transcountry("AmountLT1",$mysoc->country_code).'</td><td colspan="2">'.price($objectsrc->total_localtax1)."</td></tr>";
+            print '<tr><td>'.$langs->transcountry("AmountLT1",$mysoc->country_code).'</td><td>'.price($objectsrc->total_localtax1)."</td></tr>";
         }
 
         if ($mysoc->localtax2_assuj=="1" || $object->total_localtax2 != 0) //Localtax2
         {
-            print '<tr><td>'.$langs->transcountry("AmountLT2",$mysoc->country_code).'</td><td colspan="2">'.price($objectsrc->total_localtax2)."</td></tr>";
+            print '<tr><td>'.$langs->transcountry("AmountLT2",$mysoc->country_code).'</td><td>'.price($objectsrc->total_localtax2)."</td></tr>";
         }
-        print '<tr><td>'.$langs->trans('TotalTTC').'</td><td colspan="2">'.price($objectsrc->total_ttc)."</td></tr>";
+        print '<tr><td>'.$langs->trans('TotalTTC').'</td><td>'.price($objectsrc->total_ttc)."</td></tr>";
 
 		if (!empty($conf->multicurrency->enabled))
 		{
-			print '<tr><td>' . $langs->trans('MulticurrencyTotalHT') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_ht) . '</td></tr>';
-			print '<tr><td>' . $langs->trans('MulticurrencyTotalVAT') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_tva) . "</td></tr>";
-			print '<tr><td>' . $langs->trans('MulticurrencyTotalTTC') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_ttc) . "</td></tr>";
+			print '<tr><td>' . $langs->trans('MulticurrencyTotalHT') . '</td><td>' . price($objectsrc->multicurrency_total_ht) . '</td></tr>';
+			print '<tr><td>' . $langs->trans('MulticurrencyTotalVAT') . '</td><td>' . price($objectsrc->multicurrency_total_tva) . "</td></tr>";
+			print '<tr><td>' . $langs->trans('MulticurrencyTotalTTC') . '</td><td>' . price($objectsrc->multicurrency_total_ttc) . "</td></tr>";
 		}
     }
 
     // Other options
-    $parameters=array('colspan' => ' colspan="6"');
+    $parameters=array();
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
 
     // Bouton "Create Draft"
@@ -2347,7 +2347,7 @@ else
     	        while ($i < $num)
     	        {
     	            $objp = $db->fetch_object($result);
-    	            
+
     	            print '<tr class="oddeven"><td>';
     	            $paymentstatic->id=$objp->rowid;
     	            $paymentstatic->datepaye=$db->jdate($objp->dp);
diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index ca874511c94..14682f7928b 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -31,8 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 
-$langs->load("products");
-$langs->load("suppliers");
+$langs->loadLangs(array("products","suppliers"));
 
 if (!$user->rights->produit->lire && !$user->rights->service->lire) accessforbidden();
 
@@ -42,40 +41,66 @@ $snom = GETPOST('snom');
 $type = GETPOST('type');
 $optioncss = GETPOST('optioncss','alpha');
 
-$sortfield = GETPOST('sortfield');
-$sortorder = GETPOST('sortorder');
-$page = GETPOST('page');
-if ($page < 0) {
-    $page = 0 ;
-}
+// Load variable for pagination
+$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$sortfield = GETPOST('sortfield','alpha');
+$sortorder = GETPOST('sortorder','alpha');
+$page = GETPOST('page','int');
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortfield) $sortfield="p.ref"; // Set here default search field
+if (! $sortorder) $sortorder="ASC";
 
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
-$offset = $limit * $page ;
+$fourn_id = GETPOST('fourn_id', 'intcomma');
+$catid = GETPOST('catid', 'intcomma');
 
-if (! $sortfield) $sortfield = 'p.ref';
-if (! $sortorder) $sortorder = 'DESC';
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('supplierpricelist'));
+$extrafields = new ExtraFields($db);
 
-if (GETPOST('button_removefilter'))
-{
-	$sref = '';
-	$sRefSupplier = '';
-	$snom = '';
-}
-
-$fourn_id = GETPOST('fourn_id', 'int');
-
-if (isset($_REQUEST['catid']))
-{
-	$catid = $_REQUEST['catid'];
-}
 
 
 
 /*
-* Mode Liste
-*
-*/
+ * ACTIONS
+ *
+ * Put here all code to do according to value of "action" parameter
+ */
 
+if (GETPOST('cancel')) { $action='list'; $massaction=''; }
+if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
+
+$parameters=array();
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
+{
+    // Selection of new fields
+    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+    // Purge search criteria
+    if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") ||GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
+    {
+    	$sref = '';
+    	$sRefSupplier = '';
+    	$snom = '';
+        $search_field1='';
+        $search_field2='';
+        $search_date_creation='';
+        $search_date_update='';
+        $toselect='';
+        $search_array_options=array();
+    }
+}
+
+/*
+ * View
+ */
+
+$form = new Form($db);
 $productstatic = new Product($db);
 $companystatic = new Societe($db);
 
@@ -87,6 +112,17 @@ if ($fourn_id)
 	$supplier->fetch($fourn_id);
 }
 
+
+
+$arrayofmassactions =  array(
+    'presend'=>$langs->trans("SendByMail"),
+    'builddoc'=>$langs->trans("PDFMerge"),
+);
+if ($user->rights->mymodule->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
+if ($massaction == 'presend') $arrayofmassactions=array();
+$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
+
+
 $sql = "SELECT p.rowid, p.label, p.ref, p.fk_product_type, p.entity,";
 $sql.= " ppf.fk_soc, ppf.ref_fourn, ppf.price as price, ppf.quantity as qty, ppf.unitprice,";
 $sql.= " s.rowid as socid, s.nom as name";
@@ -155,7 +191,7 @@ if ($resql)
 	print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords);
 
 
-	if (isset($catid))
+	if (! empty($catid))
 	{
 		print "<div id='ways'>";
 		$c = new Categorie($db);
@@ -175,17 +211,6 @@ if ($resql)
 
 	print '<table class="liste" width="100%">';
 
-	// Lignes des titres
-	print "<tr class=\"liste_titre\">";
-	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"], "p.ref",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("RefSupplierShort"),$_SERVER["PHP_SELF"], "ppf.ref_fourn",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"], "p.label",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Supplier"),$_SERVER["PHP_SELF"], "ppf.fk_soc",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("BuyingPrice"),$_SERVER["PHP_SELF"], "ppf.price",$param,"",'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("QtyMin"),$_SERVER["PHP_SELF"], "ppf.quantity",$param,"",'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("UnitPrice"),$_SERVER["PHP_SELF"], "ppf.unitprice",$param,"",'align="right"',$sortfield,$sortorder);
-	print "</tr>\n";
-
 	// Lignes des champs de filtre
 	print '<tr class="liste_titre">';
 	print '<td class="liste_titre">';
@@ -197,19 +222,34 @@ if ($resql)
 	print '<td class="liste_titre">';
 	print '<input class="flat" type="text" name="snom" value="'.$snom.'">';
 	print '</td>';
-	print '<td class="liste_titre" colspan="4" align="right">';
-	print '<input type="image" class="liste_titre" value="button_search" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '&nbsp; ';
-	print '<input type="image" class="liste_titre" value="button_removefilter" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+	print '<td></td>';
+	print '<td></td>';
+	print '<td></td>';
+	print '<td></td>';
+	print '<td class="liste_titre" align="right">';
+	$searchpicto=$form->showFilterButtons();
+	print $searchpicto;
 	print '</td>';
 	print '</tr>';
 
+	// Lignes des titres
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"], "p.ref",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("RefSupplierShort"),$_SERVER["PHP_SELF"], "ppf.ref_fourn",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"], "p.label",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Supplier"),$_SERVER["PHP_SELF"], "ppf.fk_soc",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("BuyingPrice"),$_SERVER["PHP_SELF"], "ppf.price",$param,"",'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("QtyMin"),$_SERVER["PHP_SELF"], "ppf.quantity",$param,"",'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("UnitPrice"),$_SERVER["PHP_SELF"], "ppf.unitprice",$param,"",'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre('',$_SERVER["PHP_SELF"]);
+	print "</tr>\n";
+
 	$oldid = '';
 	$var=True;
 	while ($i < min($num,$limit))
 	{
 		$objp = $db->fetch_object($resql);
-		
+
 		print '<tr class="oddeven">';
 
 		print '<td>';
@@ -236,6 +276,8 @@ if ($resql)
 
 		print '<td align="right">'.(isset($objp->unitprice) ? price($objp->unitprice) : '').'</td>';
 
+		print '<td align="right"></td>';
+
 		print "</tr>\n";
 		$i++;
 	}
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index b04aaf40a31..03af3ddfe88 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -390,7 +390,7 @@ 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->array_options['options_extrafieldkey'] + 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)) ? round($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'
+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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 91e00c274ff..8ea14fdb305 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -726,7 +726,7 @@ ViewPrivateNote=View notes
 XMoreLines=%s line(s) hidden
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
+SelectElementAndClick=Select an element and click %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang
index 1eb906f1acc..8e80a111516 100644
--- a/htdocs/langs/en_US/withdrawals.lang
+++ b/htdocs/langs/en_US/withdrawals.lang
@@ -17,7 +17,7 @@ NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Amount to withdraw
 WithdrawsRefused=Direct debit refused
-NoInvoiceToWithdraw=No customer invoice in payment mode "withdraw" is waiting. Go on 'Withdraw' tab on invoice card to make a request.
+NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
 ResponsibleUser=Responsible user
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Direct debit payment statistics
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 292c6a139a4..fe9105d0d9f 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -53,7 +53,7 @@ class MyModuleObject extends CommonObject
      * @var array Array with all fields and their property
      */
 	public $fields;
-	
+
 	/**
 	 * @var mixed Sample property 1
 	 */
@@ -62,11 +62,11 @@ class MyModuleObject extends CommonObject
 	 * @var mixed Sample property 2
 	 */
 	public $prop2;
-	
+
 	//...
-	
+
 	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-	
+
 	public $table_element_line = 'mymoduleobjectdet';
     public $class_element_line = 'MyModuleObjectline';
     public $fk_element = 'fk_mymoduleobject';
@@ -75,9 +75,9 @@ class MyModuleObject extends CommonObject
 	 * @var MyModuleObjectLine[] Lines
 	 */
 	public $lines = array();
-	
-	
-	
+
+
+
 	/**
 	 * Constructor
 	 *
@@ -163,10 +163,9 @@ class MyModuleObject extends CommonObject
 	/**
 	 * Load object in memory from the database
 	 *
-	 * @param int    $id  Id object
-	 * @param string $ref Ref
-	 *
-	 * @return int <0 if KO, 0 if not found, >0 if OK
+	 * @param  int     $id      Id object
+	 * @param  string  $ref     Ref
+	 * @return int              <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -199,20 +198,13 @@ class MyModuleObject extends CommonObject
 				$this->prop2 = $obj->field2;
 				//...
 			}
-			
-			// Retrieve all extrafields for invoice
-			// fetch optionals attributes and labels
-			/*
-			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-			$extrafields=new ExtraFields($this->db);
-			$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-			$this->fetch_optionals($this->id,$extralabels);
-            */
-			
-			// $this->fetch_lines();
-			
+
 			$this->db->free($resql);
 
+			$this->fetch_optionals();
+
+			// $this->fetch_lines();
+
 			if ($numrows) {
 				return 1;
 			} else {
@@ -221,7 +213,6 @@ class MyModuleObject extends CommonObject
 		} else {
 			$this->errors[] = 'Error ' . $this->db->lasterror();
 			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-
 			return - 1;
 		}
 	}
@@ -306,7 +297,7 @@ class MyModuleObject extends CommonObject
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$error = 0;
-		
+
 		// Clean parameters
 		if (isset($this->prop1)) {
 			$this->prop1 = trim($this->prop1);
@@ -386,7 +377,7 @@ class MyModuleObject extends CommonObject
 		}
 
 		// If you need to delete child tables to, you can insert them here
-		
+
 		if (!$error) {
 			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
 			$sql .= ' WHERE rowid=' . $this->id;
@@ -475,7 +466,7 @@ class MyModuleObject extends CommonObject
         global $menumanager;
 
         if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
-        
+
         $result = '';
         $companylink = '';
 
@@ -484,7 +475,7 @@ class MyModuleObject extends CommonObject
         $label.= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
 
         $url = DOL_URL_ROOT.'/mymodule/'.$this->table_name.'_card.php?id='.$this->id;
-        
+
         $linkclose='';
         if (empty($notooltip))
         {
@@ -497,7 +488,7 @@ class MyModuleObject extends CommonObject
             $linkclose.=' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
         }
         else $linkclose = ($morecss?' class="'.$morecss.'"':'');
-        
+
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart.=$linkclose.'>';
 		$linkend='</a>';
diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
index 5799d5bbab7..9e8f5ca9975 100644
--- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
+++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
@@ -69,7 +69,7 @@ class modMyModule extends DolibarrModules
 		$this->descriptionlong = "MyModuleDescription (Long)";
 		$this->editor_name = 'Editor name';
 		$this->editor_url = 'https://www.example.com';
-		
+
 		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
 		$this->version = '1.0';
 		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
@@ -151,7 +151,7 @@ class modMyModule extends DolibarrModules
         	$conf->mymodule=new stdClass();
         	$conf->mymodule->enabled=0;
         }
-        
+
         // Dictionaries
 		$this->dictionaries=array();
         /* Example:
@@ -169,8 +169,9 @@ class modMyModule extends DolibarrModules
         );
         */
 
+
         // Boxes
-		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
+		// Add here list of php file(s) stored in core/boxes that contains class to show a widget.
         $this->boxes = array();			// List of boxes
 		// Example:
 		//$this->boxes=array(
@@ -179,24 +180,38 @@ class modMyModule extends DolibarrModules
 		//    2=>array('file'=>'myboxc.php@mymodule','note'=>'')
 		//);
 
+
 		// Cronjobs
 		$this->cronjobs = array();			// List of cron jobs entries to add
 		// Example: $this->cronjobs=array(0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'test'=>true),
 		//                                1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'test'=>true)
 		// );
 
+
 		// Permissions
 		$this->rights = array();		// Permission array used by this module
-		$r=0;
 
-		// Add here list of permission defined by an id, a label, a boolean and two constant strings.
-		// Example:
-		// $this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
-		// $this->rights[$r][1] = 'Permision label';	// Permission label
-		// $this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
-		// $this->rights[$r][4] = 'level1';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		// $this->rights[$r][5] = 'level2';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		// $r++;
+		$r=0;
+		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		$this->rights[$r][1] = 'Read objects of My Module';	// Permission label
+		$this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'read';				// In php code, permission will be checked by test if ($user->rights->mymodule->level1->level2)
+		$this->rights[$r][5] = '';				    // In php code, permission will be checked by test if ($user->rights->mymodule->level1->level2)
+
+		$r++;
+		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		$this->rights[$r][1] = 'Create/Update objects of My Module';	// Permission label
+		$this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'create';				// In php code, permission will be checked by test if ($user->rights->mymodule->level1->level2)
+		$this->rights[$r][5] = '';				    // In php code, permission will be checked by test if ($user->rights->mymodule->level1->level2)
+
+		$r++;
+		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		$this->rights[$r][1] = 'Delete objects of My Module';	// Permission label
+		$this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'delete';				// In php code, permission will be checked by test if ($user->rights->mymodule->level1->level2)
+		$this->rights[$r][5] = '';				    // In php code, permission will be checked by test if ($user->rights->mymodule->level1->level2)
+
 
 		// Main menu entries
 		$this->menu = array();			// List of menus to add
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 1d22c464212..56e0ea1d3ed 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -96,18 +96,18 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-	if ($cancel) 
+	if ($cancel)
 	{
 		if ($action != 'addlink')
 		{
 			$urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
 			header("Location: ".$urltogo);
 			exit;
-		}		
+		}
 		if ($id > 0 || ! empty($ref)) $ret = $object->fetch($id,$ref);
 		$action='';
 	}
-	
+
 	// Action to add record
 	if ($action == 'add' && ! empty($user->rights->mymodule->create))
 	{
@@ -268,19 +268,19 @@ if ($action == 'create')
 if (($id || $ref) && $action == 'edit')
 {
 	print load_fiche_titre($langs->trans("MyModule"));
-    
+
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="action" value="update">';
 	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	print '<input type="hidden" name="id" value="'.$object->id.'">';
-	
+
 	dol_fiche_head();
 
 	print '<table class="border centpercent">'."\n";
 	// print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input class="flat" type="text" size="36" name="label" value="'.$label.'"></td></tr>';
 	// LIST_OF_TD_LABEL_FIELDS_EDIT
 	print '</table>';
-	
+
 	dol_fiche_end();
 
 	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
@@ -299,14 +299,14 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	$head = mymodule_prepare_head($object);
 	dol_fiche_head($head, 'order', $langs->trans("CustomerOrder"), -1, 'order');
-		
+
 	$formconfirm = '';
-	
+
 	// Confirmation to delete
 	if ($action == 'delete') {
 	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteOrder'), $langs->trans('ConfirmDeleteOrder'), 'confirm_delete', '', 0, 1);
 	}
-	
+
 	// Confirmation of action xxxx
 	if ($action == 'xxx')
 	{
@@ -317,28 +317,28 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	            // array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
 	            // array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1),
 	            // array('type' => 'other',    'name' => 'idwarehouse',   'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse')?GETPOST('idwarehouse'):'ifone', 'idwarehouse', '', 1)));
-	    }*/	
+	    }*/
 	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220);
 	}
-	
+
 	if (! $formconfirm) {
 	    $parameters = array('lineid' => $lineid);
 	    $reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	    if (empty($reshook)) $formconfirm.=$hookmanager->resPrint;
 	    elseif ($reshook > 0) $formconfirm=$hookmanager->resPrint;
 	}
-	
+
 	// Print form confirm
 	print $formconfirm;
-	
-	
-	
+
+
+
 	// Object card
 	// ------------------------------------------------------------
-	
+
 	$linkback = '<a href="' . DOL_URL_ROOT . '/mymodule/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
-	
-	
+
+
 	$morehtmlref='<div class="refidno">';
 	/*
 	// Ref bis
@@ -382,11 +382,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	}
 	*/
 	$morehtmlref.='</div>';
-	
-	
+
+
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-	
-	
+
+
 	print '<div class="fichecenter">';
 	print '<div class="fichehalfleft">';
 	print '<div class="underbanner clearboth"></div>';
@@ -396,7 +396,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 
 	// Other attributes
-	$cols = 2;
 	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
 	print '</table>';
@@ -405,16 +404,16 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	print '<div class="ficheaddleft">';
 	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent">';
-	
-	
+
+
 
 	print '</table>';
 	print '</div>';
 	print '</div>';
 	print '</div>';
-	
+
 	print '<div class="clearboth"></div><br>';
-	
+
 	dol_fiche_end();
 
 
@@ -424,14 +423,14 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     	$parameters=array();
     	$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
     	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-    
+
     	if (empty($reshook))
     	{
     		if ($user->rights->mymodule->write)
     		{
     			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
     		}
-    
+
     		if ($user->rights->mymodule->delete)
     		{
     			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>'."\n";
@@ -440,12 +439,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     	print '</div>'."\n";
 	}
 
-	
+
 	// Select mail models is same action as presend
 	if (GETPOST('modelselected')) {
 	    $action = 'presend';
 	}
-	
+
 	if ($action != 'presend')
 	{
 	    print '<div class="fichecenter"><div class="fichehalfleft">';
@@ -458,23 +457,23 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	    $genallowed = $user->rights->mymodule->creer;
 	    $delallowed = $user->rights->mymodule->supprimer;
 	    print $formfile->showdocuments('mymodule', $comref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
-	
-	
+
+
 	    // Show links to link elements
 	    $linktoelem = $form->showLinkToObjectBlock($object, null, array('order'));
 	    $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
-	
-	
+
+
 	    print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-	
+
 	    // List of actions on element
 	    include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
 	    $formactions = new FormActions($db);
 	    $somethingshown = $formactions->showactions($object, 'order', $socid);
-	
+
 	    print '</div></div></div>';
 	}
-	
+
 
 	/*
 	 * Action presend
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index b1768785f4c..2d8525dfffa 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -35,7 +35,7 @@
 //if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
 //if (! defined("NOLOGIN"))        define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
 
-// Change this following line to use the correct relative path (../, ../../, etc)
+// Change this following lines to use the correct relative path (../, ../../, etc)
 $res=0;
 if (! $res && file_exists("../main.inc.php")) $res=@include '../main.inc.php';					// to work if your module directory is into dolibarr root htdocs directory
 if (! $res && file_exists("../../main.inc.php")) $res=@include '../../main.inc.php';			// to work if your module directory is into a subdir of root htdocs directory
@@ -49,8 +49,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 dol_include_once('/mymodule/class/myobject.class.php');
 
 // Load traductions files requiredby by page
-$langs->load("mymodule");
-$langs->load("other");
+$langs->loadLangs(array("mymodule","other"));
 
 $action=GETPOST('action','alpha');
 $massaction=GETPOST('massaction','alpha');
@@ -89,14 +88,14 @@ if ($user->societe_id > 0)
 }
 
 // Initialize technical object to manage context to save list fields
-$contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'mymodulelist';
+$contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'myobjectlist';
 
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
-$hookmanager->initHooks(array('mymodulelist'));
+$hookmanager->initHooks(array('myobjectlist'));
 $extrafields = new ExtraFields($db);
 
 // fetch optionals attributes and labels
-$extralabels = $extrafields->fetch_name_optionals_label('mymodule');
+$extralabels = $extrafields->fetch_name_optionals_label('myobject');
 $search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
 
 // List of fields to search into when doing a "search in all"
@@ -227,7 +226,7 @@ foreach ($search_array_options as $key => $val)
     $typ=$extrafields->attribute_type[$tmpkey];
     $mode=0;
     if (in_array($typ, array('int','double'))) $mode=1;    // Search on a numeric
-    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit))) 
+    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit)))
     {
         $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
     }
@@ -244,7 +243,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
-}	
+}
 
 $sql.= $db->plimit($limit+1, $offset);
 
@@ -263,7 +262,7 @@ if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) &&
 {
     $obj = $db->fetch_object($resql);
     $id = $obj->rowid;
-    header("Location: ".DOL_URL_ROOT.'/skeleton/card.php?id='.$id);
+    header("Location: ".DOL_URL_ROOT.'/mymodule/myobject_card.php?id='.$id);
     exit;
 }
 
@@ -283,13 +282,13 @@ foreach ($search_array_options as $key => $val)
     $crit=$val;
     $tmpkey=preg_replace('/search_options_/','',$key);
     if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
-} 
+}
 
 $arrayofmassactions =  array(
     'presend'=>$langs->trans("SendByMail"),
     'builddoc'=>$langs->trans("PDFMerge"),
 );
-if ($user->rights->mymodule->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
+if ($user->rights->mymodule->delete) $arrayofmassactions['delete']=$langs->trans("Delete");
 if ($massaction == 'presend') $arrayofmassactions=array();
 $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 
@@ -330,38 +329,11 @@ if (! empty($moreforfilter))
 
 $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
 $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
+if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
 
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
-// Fields title
-print '<tr class="liste_titre">';
-// LIST_OF_TD_TITLE_FIELDS
-//if (! empty($arrayfields['t.field1']['checked'])) print_liste_field_titre($arrayfields['t.field1']['label'],$_SERVER['PHP_SELF'],'t.field1','',$param,'',$sortfield,$sortorder);
-//if (! empty($arrayfields['t.field2']['checked'])) print_liste_field_titre($arrayfields['t.field2']['label'],$_SERVER['PHP_SELF'],'t.field2','',$param,'',$sortfield,$sortorder);
-// Extra fields
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-{
-   foreach($extrafields->attribute_label as $key => $val) 
-   {
-       if (! empty($arrayfields["ef.".$key]['checked'])) 
-       {
-			$align=$extrafields->getAlignFlag($key);
-			$sortonfield = "ef.".$key;
-			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
-			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
-       }
-   }
-}
-// Hook fields
-$parameters=array('arrayfields'=>$arrayfields);
-$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-print $hookmanager->resPrint;
-if (! empty($arrayfields['t.datec']['checked']))  print_liste_field_titre($arrayfields['t.datec']['label'],$_SERVER["PHP_SELF"],"t.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['t.tms']['checked']))    print_liste_field_titre($arrayfields['t.tms']['label'],$_SERVER["PHP_SELF"],"t.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-//if (! empty($arrayfields['t.status']['checked'])) print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"t.status","",$param,'align="center"',$sortfield,$sortorder);
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
-print '</tr>'."\n";
 
 // Fields title search
 print '<tr class="liste_titre">';
@@ -371,22 +343,22 @@ print '<tr class="liste_titre">';
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
-    foreach($extrafields->attribute_label as $key => $val) 
+    foreach($extrafields->attribute_label as $key => $val)
     {
         if (! empty($arrayfields["ef.".$key]['checked']))
         {
             $align=$extrafields->getAlignFlag($key);
             $typeofextrafield=$extrafields->attribute_type[$key];
             print '<td class="liste_titre'.($align?' '.$align:'').'">';
-        	if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')) && empty($extrafields->attribute_computed[$key]))
-			{
-			    $crit=$val;
-				$tmpkey=preg_replace('/search_options_/','',$key);
-				$searchclass='';
-				if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass='searchstring';
-				if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
-				print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
-			}
+            if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')) && empty($extrafields->attribute_computed[$key]))
+            {
+                $crit=$val;
+                $tmpkey=preg_replace('/search_options_/','',$key);
+                $searchclass='';
+                if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass='searchstring';
+                if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
+                print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
+            }
             print '</td>';
         }
     }
@@ -408,19 +380,48 @@ if (! empty($arrayfields['t.tms']['checked']))
     print '</td>';
 }
 /*if (! empty($arrayfields['u.statut']['checked']))
-{
-    // Status
-    print '<td class="liste_titre" align="center">';
-    print $form->selectarray('search_statut', array('-1'=>'','0'=>$langs->trans('Disabled'),'1'=>$langs->trans('Enabled')),$search_statut);
-    print '</td>';
-}*/
+ {
+ // Status
+ print '<td class="liste_titre" align="center">';
+ print $form->selectarray('search_statut', array('-1'=>'','0'=>$langs->trans('Disabled'),'1'=>$langs->trans('Enabled')),$search_statut);
+ print '</td>';
+ }*/
 // Action column
 print '<td class="liste_titre" align="right">';
-$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+$searchpicto=$form->showFilterButtons();
 print $searchpicto;
 print '</td>';
 print '</tr>'."\n";
-    
+
+// Fields title
+print '<tr class="liste_titre">';
+// LIST_OF_TD_TITLE_FIELDS
+//if (! empty($arrayfields['t.field1']['checked'])) print_liste_field_titre($arrayfields['t.field1']['label'],$_SERVER['PHP_SELF'],'t.field1','',$param,'',$sortfield,$sortorder);
+//if (! empty($arrayfields['t.field2']['checked'])) print_liste_field_titre($arrayfields['t.field2']['label'],$_SERVER['PHP_SELF'],'t.field2','',$param,'',$sortfield,$sortorder);
+// Extra fields
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+{
+   foreach($extrafields->attribute_label as $key => $val)
+   {
+       if (! empty($arrayfields["ef.".$key]['checked']))
+       {
+			$align=$extrafields->getAlignFlag($key);
+			$sortonfield = "ef.".$key;
+			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+       }
+   }
+}
+// Hook fields
+$parameters=array('arrayfields'=>$arrayfields);
+$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+if (! empty($arrayfields['t.datec']['checked']))  print_liste_field_titre($arrayfields['t.datec']['label'],$_SERVER["PHP_SELF"],"t.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+if (! empty($arrayfields['t.tms']['checked']))    print_liste_field_titre($arrayfields['t.tms']['label'],$_SERVER["PHP_SELF"],"t.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+//if (! empty($arrayfields['t.status']['checked'])) print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"t.status","",$param,'align="center"',$sortfield,$sortorder);
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
+print '</tr>'."\n";
+
 
 // Detect if we need a fetch on each output line
 $needToFetchEachLine=0;
@@ -441,12 +442,12 @@ while ($i < min($num, $limit))
         print '<tr class="oddeven">';
         // LIST_OF_TD_FIELDS_LIST
         /*
-        if (! empty($arrayfields['t.field1']['checked'])) 
+        if (! empty($arrayfields['t.field1']['checked']))
         {
             print '<td>'.$obj->field1.'</td>';
 		    if (! $i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.field2']['checked'])) 
+        if (! empty($arrayfields['t.field2']['checked']))
         {
             print '<td>'.$obj->field2.'</td>';
 		    if (! $i) $totalarray['nbfield']++;
@@ -454,9 +455,9 @@ while ($i < min($num, $limit))
     	// Extra fields
 		if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 		{
-		   foreach($extrafields->attribute_label as $key => $val) 
+		   foreach($extrafields->attribute_label as $key => $val)
 		   {
-				if (! empty($arrayfields["ef.".$key]['checked'])) 
+				if (! empty($arrayfields["ef.".$key]['checked']))
 				{
 					print '<td';
 					$align=$extrafields->getAlignFlag($key);
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 5c6690b44f2..02ad2f5172c 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -145,9 +145,9 @@ if (empty($reshook))
     $upload_dir = $conf->produit->dir_output;
     $permissioncreate = $user->rights->produit->creer;
     include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
-    
+
     include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
-    
+
     // Barcode type
     if ($action ==	'setfk_barcode_type' && $createbarcode)
     {
@@ -203,7 +203,7 @@ if (empty($reshook))
             $action = "create";
             $error++;
         }
-        
+
         if (! $error)
         {
 	        $units = GETPOST('units', 'int');
@@ -630,7 +630,7 @@ if (empty($reshook))
 
 			$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $tva_tx));
 			$tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx));
-            
+
             // On reevalue prix selon taux tva car taux tva transaction peut etre different
             // de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
             if ($tmpvat != $tmpprodvat) {
@@ -640,7 +640,7 @@ if (empty($reshook))
                     $pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
                 }
             }
-            
+
             if (GETPOST('propalid') > 0) {
                 // Define cost price for margin calculation
                 $buyprice=0;
@@ -653,7 +653,7 @@ if (empty($reshook))
                 {
                     $buyprice = $result;
                 }
-                
+
                 $result = $propal->addline(
                     $desc,
                     $pu_ht,
@@ -696,7 +696,7 @@ if (empty($reshook))
                 {
                     $buyprice = $result;
                 }
-                
+
                 $result = $commande->addline(
                     $desc,
                     $pu_ht,
@@ -882,7 +882,7 @@ else
         dol_fiche_head('');
 
         print '<table class="border centpercent">';
-        
+
         print '<tr>';
         $tmpcode='';
 		if (! empty($modCodeProduct->code_auto)) $tmpcode=$modCodeProduct->getNextValue($object,$type);
@@ -1045,7 +1045,7 @@ else
         }
 
         // Other attributes
-        $parameters=array('colspan' => 3);
+        $parameters=array('cols' => 3);
         $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
         if (empty($reshook) && ! empty($extrafields->attribute_label))
         {
@@ -1056,14 +1056,14 @@ else
         //if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))       available in create mode
         //{
             print '<tr><td class="tdtop">'.$langs->trans("NoteNotVisibleOnBill").'</td><td colspan="3">';
-    
+
             // We use dolibarr_details as type of DolEditor here, because we must not accept images as description is included into PDF and not accepted by TCPDF.
             $doleditor = new DolEditor('note_private', GETPOST('note_private'), '', 140, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_8, '90%');
     	    $doleditor->Create();
-    
+
             print "</td></tr>";
         //}
-        
+
 		if($conf->categorie->enabled) {
 			// Categories
 			print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
@@ -1123,7 +1123,7 @@ else
 			print $formaccounting->select_account(GETPOST('accountancy_code_buy'), 'accountancy_code_buy', 1, null, 1, 1, '');
             print '</td></tr>';
 		}
-		else // For external software 
+		else // For external software
 		{
             // Accountancy_code_sell
             print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
@@ -1364,7 +1364,7 @@ else
         	}
 
             // Other attributes
-            $parameters=array('colspan' => ' colspan="2"');
+            $parameters=array('colspan' => ' colspan="3"', 'cols'=>3);
             $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
             if (empty($reshook) && ! empty($extrafields->attribute_label))
             {
@@ -1372,7 +1372,7 @@ else
             }
 
 			// Tags-Categories
-            if ($conf->categorie->enabled) 
+            if ($conf->categorie->enabled)
 			{
 				print '<tr><td class="tdtop">'.$langs->trans("Categories").'</td><td colspan="3">';
 				$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', 'parent', 64, 0, 1);
@@ -1389,13 +1389,13 @@ else
 			if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 			{
                 print '<tr><td class="tdtop">'.$langs->trans("NoteNotVisibleOnBill").'</td><td colspan="3">';
-        
+
                 $doleditor = new DolEditor('note_private', $object->note_private, '', 140, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_4, '90%');
                 $doleditor->Create();
-    
+
                 print "</td></tr>";
 			}
-			
+
             print '</table>';
 
             print '<br>';
@@ -1416,7 +1416,7 @@ else
 				print $formaccounting->select_account($object->accountancy_code_buy, 'accountancy_code_buy', 1, '', 1, 1);
                 print '</td></tr>';
 			}
-			else // For external software 
+			else // For external software
 			{
                 // Accountancy_code_sell
                 print '<tr><td class="titlefield">'.$langs->trans("ProductAccountancySellCode").'</td>';
@@ -1449,21 +1449,21 @@ else
 		    $head=product_prepare_head($object);
             $titre=$langs->trans("CardProduct".$object->type);
             $picto=($object->type== Product::TYPE_SERVICE?'service':'product');
-            
+
             dol_fiche_head($head, 'card', $titre, -1, $picto);
 
             $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?type='.$object->type.'">'.$langs->trans("BackToList").'</a>';
             $object->next_prev_filter=" fk_product_type = ".$object->type;
 
             dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
-            
-            
+
+
             print '<div class="fichecenter">';
             print '<div class="fichehalfleft">';
-            
+
             print '<div class="underbanner clearboth"></div>';
             print '<table class="border tableforfield" width="100%">';
-            
+
             // Type
             if (! empty($conf->produit->enabled) && ! empty($conf->service->enabled))
             {
@@ -1577,7 +1577,7 @@ else
             }
             print '</td></tr>';
             */
-            
+
             // Batch number management (to batch)
             if (! empty($conf->productbatch->enabled)) {
                 print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td colspan="2">';
@@ -1616,10 +1616,10 @@ else
             print '</table>';
             print '</div>';
             print '<div class="fichehalfright"><div class="ficheaddleft">';
-       
+
             print '<div class="underbanner clearboth"></div>';
             print '<table class="border tableforfield" width="100%">';
-            
+
             // Nature
             if($object->type!= Product::TYPE_SERVICE)
             {
@@ -1727,11 +1727,7 @@ else
 
             // Other attributes
             $parameters=array('colspan' => ' colspan="'.(2+(($showphoto||$showbarcode)?1:0)).'"');
-            $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-            if (empty($reshook) && ! empty($extrafields->attribute_label))
-            {
-            	print $object->showOptionals($extrafields);
-            }
+            include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
 			// Categories
 			if($conf->categorie->enabled) {
@@ -1747,13 +1743,13 @@ else
                 print '<tr><td class="tdtop">'.$langs->trans("NotePrivate").'</td><td colspan="'.(2+(($showphoto||$showbarcode)?1:0)).'">'.(dol_textishtml($object->note_private)?$object->note_private:dol_nl2br($object->note_private,1,true)).'</td></tr>'."\n";
                 print '<!-- End show Note --> '."\n";
 			}
-			
+
             print "</table>\n";
     		print '</div>';
-    		
+
             print '</div></div>';
             print '<div style="clear:both"></div>';
-        
+
             dol_fiche_end();
         }
 
@@ -1814,16 +1810,16 @@ if (($action == 'clone' && (empty($conf->use_javascript_ajax) || ! empty($conf->
 if ($action != 'create' && $action != 'edit')
 {
     print "\n".'<div class="tabsAction">'."\n";
-    
+
     $parameters=array();
     $reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
     if (empty($reshook))
     {
-        if (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer ) || 
+        if (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer ) ||
            ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer))
         {
             if (! isset($object->no_button_edit) || $object->no_button_edit <> 1) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("Modify").'</a></div>';
-    
+
             if (! isset($object->no_button_copy) || $object->no_button_copy <> 1)
             {
                 if (! empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))
@@ -1837,7 +1833,7 @@ if ($action != 'create' && $action != 'edit')
             }
         }
         $object_is_used = $object->isObjectUsed($object->id);
-    
+
         if (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->supprimer)
         || ($object->type == Product::TYPE_SERVICE && $user->rights->service->supprimer))
         {
@@ -1862,7 +1858,7 @@ if ($action != 'create' && $action != 'edit')
             print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Delete").'</a></div>';
         }
     }
-    
+
     print "\n</div>\n";
 }
 
@@ -1957,7 +1953,7 @@ if (! empty($conf->global->PRODUCT_ADD_FORM_ADD_TO) && $object->id && ($action =
     	print '<input type="hidden" name="action" value="addin">';
 
 	    print load_fiche_titre($langs->trans("AddToDraft"),'','');
-		
+
 		dol_fiche_head('');
 
     	$html .= '<tr><td class="nowrap">'.$langs->trans("Quantity").' ';
@@ -1969,7 +1965,7 @@ if (! empty($conf->global->PRODUCT_ADD_FORM_ADD_TO) && $object->id && ($action =
     	print '<table width="100%" class="border">';
         print $html;
         print '</table>';
-		
+
         print '<div class="center">';
         print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
         print '</div>';
@@ -2000,7 +1996,7 @@ if ($action != 'create' && $action != 'edit' && $action != 'delete')
 
     print $formfile->showdocuments($modulepart,$object->ref,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,28,0,'',0,'',$object->default_lang, '', $object);
     $somethingshown=$formfile->numoffiles;
-    
+
     print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
     print '</div></div></div>';
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index d0b58c9909c..2cf2f36b419 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -72,7 +72,7 @@ if ($id > 0 || ! empty($ref))
 
     if (! empty($conf->product->enabled)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
     elseif (! empty($conf->service->enabled)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
-    
+
 	if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))    // For backward compatiblity, we scan also old dirs
 	{
 	    if (! empty($conf->product->enabled)) $upload_dirold = $conf->product->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2),1,1).'/'.substr(substr("000".$object->id, -2),0,1).'/'.$object->id."/photos";
@@ -188,12 +188,13 @@ if ($object->id)
 	$head=product_prepare_head($object);
 	$titre=$langs->trans("CardProduct".$object->type);
 	$picto=($object->type== Product::TYPE_SERVICE?'service':'product');
-	
+
 	dol_fiche_head($head, 'documents', $titre, -1, $picto);
 
+	$parameters=array();
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-	
+
 	// Construit liste des fichiers
 	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 
@@ -213,9 +214,9 @@ if ($object->id)
     $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
     $object->next_prev_filter=" fk_product_type = ".$object->type;
     dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
-    
+
     print '<div class="fichecenter">';
-    
+
     print '<div class="underbanner clearboth"></div>';
     print '<table class="border tableforfield" width="100%">';
 
@@ -225,14 +226,14 @@ if ($object->id)
 
     print '</div>';
     print '<div style="clear:both"></div>';
-    
+
     dol_fiche_end();
 
     $permission = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer));
     $param = '&id=' . $object->id;
     include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
 
-    
+
     // Merge propal PDF document PDF files
     if (!empty($conf->global->PRODUIT_PDF_MERGE_PROPAL))
     {
@@ -308,17 +309,17 @@ if ($object->id)
     				$checked = '';
     				$filename = $filetoadd['name'];
 
-    				if ($conf->global->MAIN_MULTILANGS) 
+    				if ($conf->global->MAIN_MULTILANGS)
     				{
-    					if (array_key_exists($filetoadd['name'] . '_' . $delauft_lang, $filetomerge->lines)) 
+    					if (array_key_exists($filetoadd['name'] . '_' . $delauft_lang, $filetomerge->lines))
     					{
     						$filename = $filetoadd['name'] . ' - ' . $langs->trans('Language_' . $delauft_lang);
     						$checked = ' checked ';
     					}
     				}
-    				else 
+    				else
     				{
-    					if (array_key_exists($filetoadd['name'], $filetomerge->lines)) 
+    					if (array_key_exists($filetoadd['name'], $filetomerge->lines))
     					{
     						$checked = ' checked ';
     					}
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index e894368beaf..4911026be47 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -111,10 +111,10 @@ $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if ($action == 'addlimitstockwarehouse') {
-	
+
 	$seuil_stock_alerte = GETPOST('seuil_stock_alerte');
 	$desiredstock = GETPOST('desiredstock');
-	
+
 	$maj_ok = true;
 	if($seuil_stock_alerte == '') {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("StockLimit")), null, 'errors');
@@ -124,44 +124,44 @@ if ($action == 'addlimitstockwarehouse') {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DesiredStock")), null, 'errors');
 		$maj_ok = false;
 	}
-	
+
 	if($maj_ok) {
-		
+
 		$pse = new ProductStockEntrepot($db);
 		if($pse->fetch('', GETPOST('id'), GETPOST('fk_entrepot')) > 0) {
-			
+
 			// Update
 			$pse->seuil_stock_alerte = $seuil_stock_alerte;
 			$pse->desiredstock  	 = $desiredstock;
 			if($pse->update($user) > 0) setEventMessage($langs->trans('ProductStockWarehouseUpdated'));
-			
+
 		} else {
-			
+
 			// Create
 			$pse->fk_entrepot 		 = GETPOST('fk_entrepot');
 			$pse->fk_product  	 	 = GETPOST('id');
 			$pse->seuil_stock_alerte = GETPOST('seuil_stock_alerte');
 			$pse->desiredstock  	 = GETPOST('desiredstock');
 			if($pse->create($user) > 0) setEventMessage($langs->trans('ProductStockWarehouseCreated'));
-			
+
 		}
-		
+
 	}
 
 	header("Location: ".$_SERVER["PHP_SELF"]."?id=".GETPOST('id'));
 	exit;
-	
+
 }
 
 if($action == 'delete_productstockwarehouse')
 {
-	
+
 	$pse = new ProductStockEntrepot($db);
 	$pse->fetch(GETPOST('fk_productstockwarehouse'));
 	if($pse->delete($user) > 0) setEventMessage($langs->trans('ProductStockWarehouseDeleted'));
-	
+
 	$action = '';
-	
+
 }
 
 // Set stock limit
@@ -233,7 +233,7 @@ if ($action == "correct_stock" && ! $cancel)
 				$origin_element = 'project';
 				$origin_id = GETPOST('projectid', 'int');
 			}
-		
+
 			if (empty($object)) {
 				$object = new Product($db);
 				$result=$object->fetch($id);
@@ -317,7 +317,7 @@ if ($action == "transfert_stock" && ! $cancel)
 	{
 	    $object = new Product($db);
 	    $result=$object->fetch($id);
-	
+
 	    if ($object->hasbatch() && ! $batchnumber)
 	    {
 	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("batch_number")), null, 'errors');
@@ -325,7 +325,7 @@ if ($action == "transfert_stock" && ! $cancel)
 	        $action='transfert';
 	    }
 	}
-	
+
 	if (! $error)
 	{
 		if ($id)
@@ -341,7 +341,7 @@ if ($action == "transfert_stock" && ! $cancel)
 			$pricesrc=0;
 			if (isset($object->pmp)) $pricesrc=$object->pmp;
 			$pricedest=$pricesrc;
-			
+
 			if ($object->hasbatch())
 			{
 				$pdluo = new Productbatch($db);
@@ -514,7 +514,7 @@ if ($id > 0 || $ref)
 {
 	$object = new Product($db);
 	$result = $object->fetch($id,$ref);
-	
+
 	$object->load_stock();
 
 	$title = $langs->trans('ProductServiceCard');
@@ -538,21 +538,21 @@ if ($id > 0 || $ref)
 		$head=product_prepare_head($object);
 		$titre=$langs->trans("CardProduct".$object->type);
 		$picto=($object->type==Product::TYPE_SERVICE?'service':'product');
-		
+
 		dol_fiche_head($head, 'stock', $titre, -1, $picto);
 
 		dol_htmloutput_events();
 
         $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
-		
+
         dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
-        
+
         print '<div class="fichecenter">';
-        
+
         print '<div class="underbanner clearboth"></div>';
         print '<table class="border tableforfield" width="100%">';
-		
-		if ($conf->productbatch->enabled) 
+
+		if ($conf->productbatch->enabled)
 		{
 			print '<tr><td class="titlefield">'.$langs->trans("ManageLotSerial").'</td><td>';
 			print $object->getLibStatut(0,2);
@@ -614,11 +614,11 @@ if ($id > 0 || $ref)
         print '<tr><td>'.$form->editfieldkey("StockLimit",'seuil_stock_alerte',$object->seuil_stock_alerte,$object,$user->rights->produit->creer).'</td><td colspan="2">';
         print $form->editfieldval("StockLimit",'seuil_stock_alerte',$object->seuil_stock_alerte,$object,$user->rights->produit->creer,'string');
         print '</td></tr>';
-		
+
 		// Hook formObject
-		$parameters=array('colspan' => 3);
+		$parameters=array('cols'=>2);
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-     
+
         // Desired stock
         print '<tr><td>'.$form->editfieldkey($form->textwithpicto($langs->trans("DesiredStock"), $langs->trans("DesiredStockDesc"), 1),'desiredstock',$object->desiredstock,$object,$user->rights->produit->creer);
         print '</td><td colspan="2">';
@@ -643,7 +643,7 @@ if ($id > 0 || $ref)
 		print '</tr>';
 
 		$stocktheo = price2num($object->stock_theorique, 'MS');
-		
+
 		$found=0;
 		$helpondiff='<strong>'.$langs->trans("StockDiffPhysicTeoric").':</strong><br>';
 		// Number of customer orders running
@@ -655,7 +655,7 @@ if ($id > 0 || $ref)
 		    if ($result < 0) dol_print_error($db,$object->error);
 		    $helpondiff.=' ('.$langs->trans("ProductQtyInDraft").': '.$object->stats_commande['qty'].')';
 		}
-		
+
 		// Number of product from customer order already sent (partial shipping)
 		if (! empty($conf->expedition->enabled))
 		{
@@ -663,7 +663,7 @@ if ($id > 0 || $ref)
 		    $result=$object->load_stats_sending(0,'2');
 		    $helpondiff.=$langs->trans("ProductQtyInShipmentAlreadySent").': '.$object->stats_expedition['qty'];
 		}
-		
+
 		// Number of supplier order running
 		if (! empty($conf->fournisseur->enabled))
 		{
@@ -674,14 +674,14 @@ if ($id > 0 || $ref)
 		    if ($result < 0) dol_print_error($db,$object->error);
 		    $helpondiff.=' ('.$langs->trans("ProductQtyInDraftOrWaitingApproved").': '.$object->stats_commande_fournisseur['qty'].')';
 		}
-		
+
 		// Number of product from supplier order already received (partial receipt)
 		if (! empty($conf->fournisseur->enabled))
 		{
 		    if ($found) $helpondiff.='<br>'; else $found=1;
 		    $helpondiff.=$langs->trans("ProductQtyInSuppliersShipmentAlreadyRecevied").': '.$object->stats_reception['qty'];
 		}
-		
+
         // Calculating a theorical value
         print '<tr><td>';
         print $form->textwithpicto($langs->trans("VirtualStock"), $langs->trans("VirtualStockDesc"));
@@ -723,7 +723,7 @@ if ($id > 0 || $ref)
 
         print '</div>';
         print '<div style="clear:both"></div>';
-    		
+
 		dol_fiche_end();
 	}
 
@@ -762,18 +762,18 @@ if (empty($reshook))
 	if (empty($action) && $object->id)
 	{
 	    print "<div class=\"tabsAction\">\n";
-	
+
 	    if ($user->rights->stock->mouvement->creer)
 	    {
 	        print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=correction">'.$langs->trans("StockCorrection").'</a>';
 	    }
-	
+
 	    //if (($user->rights->stock->mouvement->creer) && ! $object->hasbatch())
 	    if ($user->rights->stock->mouvement->creer)
 		{
 			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=transfert">'.$langs->trans("StockTransfer").'</a>';
 		}
-	
+
 		print '</div>';
 	}
 
@@ -897,7 +897,7 @@ if ($resql)
 			}
 		}
 		$i++;
-		
+
 	}
 }
 else dol_print_error($db);
@@ -929,25 +929,25 @@ if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE))
 	print '<br><br>';
 	print_titre($langs->trans('AddNewProductStockWarehouse'));
 	//print '<br />';
-	
+
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 	print '<input type="hidden" name="action" value="addlimitstockwarehouse">';
 	print '<input type="hidden" name="id" value="'.GETPOST('id').'">';
 	print '<table class="noborder" width="100%">';
-	
+
 	print '<tr class="liste_titre"><td width="40%" colspan="4">'.$formproduct->selectWarehouses('', 'fk_entrepot').'</td>';
 	print '<td align="right"><input name="seuil_stock_alerte" type="text" placeholder="'.$langs->trans("StockLimit").'" /></td>';
 	print '<td align="right"><input name="desiredstock" type="text" placeholder="'.$langs->trans("DesiredStock").'" /></td>';
 	print '<td align="right"><input type="submit" value="'.$langs->trans('Save').'" class="button" /></td>';
 	print '</tr>';
-	
+
 	$pse = new ProductStockEntrepot($db);
 	$lines = $pse->fetchAll(GETPOST('id'));
-	
-	if (!empty($lines)) 
+
+	if (!empty($lines))
 	{
 		$var=false;
-		foreach($lines as $line) 
+		foreach($lines as $line)
 		{
 			$ent = new Entrepot($db);
 			$ent->fetch($line['fk_entrepot']);
@@ -956,12 +956,12 @@ if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE))
 			print '<td align="right">'.$line['desiredstock'].'</td>';
 			print '<td align="right"><a href="?id='.GETPOST('id').'&fk_productstockwarehouse='.$line['id'].'&action=delete_productstockwarehouse">'.img_delete().'</a></td>';
 			print '</tr>';
-			
+
 		}
 	}
-	
+
 	print "</table>";
-	
+
 	print '</form>';
 }
 
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index c434fa65381..ae5e5dbaa68 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -39,7 +39,7 @@ class Project extends CommonObject
     public $fk_element = 'fk_projet';
     protected $ismultientitymanaged = 1;  // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
     public $picto = 'projectpub';
-    
+
     /**
      * {@inheritdoc}
      */
@@ -102,7 +102,7 @@ class Project extends CommonObject
 	 * @var Task[]
 	 */
 	public $lines;
-	
+
 
     /**
      *  Constructor
@@ -146,7 +146,7 @@ class Project extends CommonObject
             dol_syslog(get_class($this)."::create error -1 ref null", LOG_ERR);
             return -1;
         }
-        
+
         $this->db->begin();
 
         $sql = "INSERT INTO " . MAIN_DB_PREFIX . "projet (";
@@ -261,7 +261,7 @@ class Project extends CommonObject
             dol_syslog(get_class($this)."::update error -3 " . $this->error, LOG_ERR);
             return -3;
         }
-        
+
         if (dol_strlen(trim($this->ref)) > 0)
         {
             $this->db->begin();
@@ -392,7 +392,9 @@ class Project extends CommonObject
         $resql = $this->db->query($sql);
         if ($resql)
         {
-            if ($this->db->num_rows($resql))
+            $num_rows = $this->db->num_rows($resql);
+
+            if ($num_rows)
             {
                 $obj = $this->db->fetch_object($resql);
 
@@ -423,12 +425,16 @@ class Project extends CommonObject
 
                 $this->db->free($resql);
 
+                // Retreive all extrafield for thirdparty
+                $this->fetch_optionals();
+
                 return 1;
             }
-            else
-            {
-                return 0;
-            }
+
+            $this->db->free($resql);
+
+            if ($num_rows) return 1;
+            else return 0;
         }
         else
         {
@@ -745,7 +751,7 @@ class Project extends CommonObject
                 $this->error=$langs->trans("ErrorFieldFormat",$langs->transnoentities("Label")).'. '.$langs->trans('RemoveString',$langs->transnoentitiesnoconv("CopyOf"));
                 return -1;
             }
-            
+
             $this->db->begin();
 
             $sql = "UPDATE " . MAIN_DB_PREFIX . "projet";
@@ -764,7 +770,7 @@ class Project extends CommonObject
                     if ($result < 0) { $error++; }
                     // End call triggers
                 }
-                
+
                 if (!$error)
                 {
                 	$this->statut=1;
@@ -847,7 +853,7 @@ class Project extends CommonObject
                 return -1;
             }
         }
-        
+
         return 0;
     }
 
@@ -936,9 +942,9 @@ class Project extends CommonObject
         global $conf, $langs, $user;
 
         if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
-        
+
         $result = '';
-        
+
         $label='';
         if ($option != 'nolink') $label = '<u>' . $langs->trans("ShowProject") . '</u>';
         $label .= ($label?'<br>':'').'<b>' . $langs->trans('Ref') . ': </b>' . $this->ref;	// The space must be after the : to not being explode when showing the title in img_picto
@@ -965,11 +971,11 @@ class Project extends CommonObject
                 $url = DOL_URL_ROOT . '/projet/card.php?id=' . $this->id;
             }
             // Add param to save lastsearch_values or not
-            $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0); 
+            $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
             if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
             if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
         }
-        
+
         $linkclose='';
         if (empty($notooltip) && $user->rights->propal->lire)
         {
@@ -988,7 +994,7 @@ class Project extends CommonObject
         $linkstart = '<a href="'.$url.'"';
         $linkstart.=$linkclose.'>';
         $linkend='</a>';
-        
+
         if ($withpicto) $result.=($linkstart . img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1) . $linkend);
         if ($withpicto && $withpicto != 2) $result.=' ';
         if ($withpicto != 2) $result.=$linkstart . $this->ref . $linkend . (($addlabel && $this->title) ? $sep . dol_trunc($this->title, ($addlabel > 1 ? $addlabel : 0)) : '');
@@ -1150,7 +1156,7 @@ class Project extends CommonObject
         {
             // No filter. Use this if user has permission to see all project
         }
-	    
+
 	$sql.= $filter;
         //print $sql;
 
@@ -1760,7 +1766,7 @@ class Project extends CommonObject
 	    $sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
 	    $sql.= " WHERE";
 	    $sql.= " p.entity IN (".getEntity('projet', 1).")";
-		if (! $user->rights->projet->all->lire) 
+		if (! $user->rights->projet->all->lire)
 		{
 			$projectsListId = $this->getProjectsAuthorizedForUser($user,0,1);
 			$sql .= "AND p.rowid IN (".$projectsListId.")";
@@ -1800,7 +1806,7 @@ class Project extends CommonObject
         $now = dol_now();
 
         return ($this->datee ? $this->datee : $this->date_end) < ($now - $conf->projet->warning_delay);
-	}	
+	}
 
 
 	/**
@@ -1911,10 +1917,10 @@ class Project extends CommonObject
 		return 1;
 	}
 
-	
+
 	/**
 	 * 	Create an array of tasks of current project
-	 * 
+	 *
 	 *  @param  User   $user       Object user we want project allowed to
 	 * 	@return int		           >0 if OK, <0 if KO
 	 */
@@ -1925,6 +1931,6 @@ class Project extends CommonObject
 
 	    $this->lines = $taskstatic->getTasksArray(0, $user, $this->id, 0, 0);
 	}
-	
+
 }
 
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 8124f500bd6..84c0ec30471 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -250,6 +250,9 @@ class Task extends CommonObject
                 $this->note_private			= $obj->note_private;
                 $this->note_public			= $obj->note_public;
 				$this->rang					= $obj->rang;
+
+                // Retreive all extrafield for thirdparty
+               	$this->fetch_optionals();
             }
 
             $this->db->free($resql);
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 9211d75f499..6018b8bef69 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -511,13 +511,10 @@ if ($id > 0 || ! empty($ref))
 			print nl2br($object->description);
 			print '</td></tr>';
 
-			// Other options
-			$parameters=array();
-			$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
-			if (empty($reshook) && ! empty($extrafields->attribute_label))
-			{
-				print $object->showOptionals($extrafields);
-			}
+			// Other attributes
+			$cols = 3;
+			$parameyers=array('socid'=>$socid);
+			include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
 			print '</table>';
 
diff --git a/htdocs/resource/add.php b/htdocs/resource/add.php
index c8b4d124fed..2e988d16025 100644
--- a/htdocs/resource/add.php
+++ b/htdocs/resource/add.php
@@ -175,7 +175,7 @@ if (! $action)
         print '</tr>';
 
         // Other attributes
-        $parameters=array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"');
+        $parameters=array('objectsrc' => $objectsrc);
         $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
         if (empty($reshook) && ! empty($extrafields->attribute_label))
         {
diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php
index 7f0a96a7ab4..a286eb60097 100644
--- a/htdocs/resource/card.php
+++ b/htdocs/resource/card.php
@@ -201,7 +201,7 @@ if ( $object->fetch($id) > 0 )
 		print '</td></tr>';
 
 		// Other attributes
-		$parameters=array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"');
+		$parameters=array('objectsrc' => $objectsrc);
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 		if (empty($reshook) && ! empty($extrafields->attribute_label))
 		{
@@ -224,7 +224,7 @@ if ( $object->fetch($id) > 0 )
 		dol_fiche_head($head, 'resource', $langs->trans("ResourceSingular"), -1, 'resource');
 
 		$formconfirm = '';
-		
+
 		// Confirm deleting resource line
 	    if ($action == 'delete')
 	    {
@@ -233,21 +233,21 @@ if ( $object->fetch($id) > 0 )
 
 	    // Print form confirm
 	    print $formconfirm;
-	    
-	    
+
+
 	    $linkback = '<a href="' . DOL_URL_ROOT . '/resource/list.php' . (! empty($socid) ? '?id=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
-	    
-	    
+
+
 	    $morehtmlref='<div class="refidno">';
 	    $morehtmlref.='</div>';
-	    
-	    
+
+
 	    dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
-	    
-	    
+
+
 	    print '<div class="fichecenter">';
 	    print '<div class="underbanner clearboth"></div>';
-	    
+
 		/*---------------------------------------
 		 * View object
 		 */
@@ -269,21 +269,16 @@ if ( $object->fetch($id) > 0 )
 		print '</td>';
 
 		// Other attributes
-		$parameters=array();
-		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-		if (empty($reshook) && ! empty($extrafields->attribute_label))
-		{
-			print $object->showOptionals($extrafields);
-		}
+		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
 		print '</tr>';
 
 		print '</table>';
-		
+
 		print '</div>';
-		
+
 		print '<div class="clearboth"></div><br>';
-		
+
 		dol_fiche_end();
 	}
 
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index ba4383e6f8e..cb99949407b 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -140,7 +140,7 @@ if (empty($reshook))
 			if (!$errors)
 			{
 			    // TODO Move the merge function into class of object.
-			    
+
 				$db->begin();
 
 				// Recopy some data
@@ -157,16 +157,16 @@ if (empty($reshook))
 				{
 				    if (empty($object->$property)) $object->$property = $soc_origin->$property;
 				}
-				
+
 				// Concat some data
 				$listofproperties=array(
-				    'note_public', 'note_private' 
+				    'note_public', 'note_private'
 				);
 				foreach ($listofproperties as $property)
 				{
 				    $object->$property = dol_concatdesc($object->$property, $soc_origin->$property);
 				}
-				
+
 				// Merge extrafields
 				foreach ($soc_origin->array_options as $key => $val)
 				{
@@ -175,8 +175,8 @@ if (empty($reshook))
 
 				// TODO Merge categories
 				$object->update($object->id, $user);
-				
-				// Move links 
+
+				// Move links
 				$objects = array(
 					'Adherent' => '/adherents/class/adherent.class.php',
 					'Societe' => '/societe/class/societe.class.php',
@@ -280,6 +280,21 @@ if (empty($reshook))
     	$res=$object->setValueFrom('localtax2_value', $value, '', null, 'text', '', $user, 'COMPANY_MODIFY');
     }
 
+    if ($action == 'update_extras') {
+        $object->fetch($socid);
+
+        // Fill array 'array_options' with data from update form
+        $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
+        $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
+        if ($ret < 0) $error++;
+        if (! $error)
+        {
+            $result = $object->insertExtraFields();
+            if ($result < 0) $error++;
+        }
+        if ($error) $action = 'edit_extras';
+    }
+
     // Add new or update third party
     if ((! GETPOST('getcustomercode') && ! GETPOST('getsuppliercode'))
     && ($action == 'add' || $action == 'update') && $user->rights->societe->creer)
@@ -487,7 +502,7 @@ if (empty($reshook))
                 if (empty($object->fournisseur)) $object->code_fournisseur='';
 
                 $result = $object->create($user);
-                
+
 				if ($result >= 0)
                 {
                     if ($object->particulier)
@@ -557,7 +572,7 @@ if (empty($reshook))
 						$object->code_fournisseur = null;
 						$object->code_client = null;
 					}
-					
+
                     $error=$object->error; $errors=$object->errors;
                 }
 
@@ -851,7 +866,7 @@ else
         $object->particulier		= $private;
         $object->prefix_comm		= GETPOST('prefix_comm');
         $object->client				= GETPOST('client')?GETPOST('client'):$object->client;
-        
+
         if(empty($duplicate_code_error)) {
 	        $object->code_client		= GETPOST('code_client', 'alpha');
 	        $object->fournisseur		= GETPOST('fournisseur')?GETPOST('fournisseur'):$object->fournisseur;
@@ -859,7 +874,7 @@ else
 		else {
 			setEventMessages($langs->trans('NewCustomerSupplierCodeProposed'),'', 'warnings');
 		}
-		
+
         $object->code_fournisseur	= GETPOST('code_fournisseur', 'alpha');
         $object->address			= GETPOST('address', 'alpha');
         $object->zip				= GETPOST('zipcode', 'alpha');
@@ -1135,7 +1150,7 @@ else
 	    print '<td colspan="3"><input type="text" name="email" id="email" value="'.$object->email.'"></td></tr>';
         print '<tr><td>'.fieldLabel('Web','url').'</td>';
 	    print '<td colspan="3"><input type="text" name="url" id="url" value="'.$object->url.'"></td></tr>';
-	    
+
         // Skype
         if (! empty($conf->skype->enabled))
         {
@@ -1215,7 +1230,7 @@ else
             print '</td><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td>';
             print $form->selectyesno('localtax2assuj_value',(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2)?$conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2:0),1);
             print '</td></tr>';
-        
+
         }
         elseif($mysoc->localtax1_assuj=="1")
         {
@@ -1229,7 +1244,7 @@ else
             print $form->selectyesno('localtax2assuj_value',(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2)?$conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2:0),1);
             print '</td></tr>';
         }
-        
+
         // Type - Size
         print '<tr><td>'.fieldLabel('ThirdPartyType','typent_id').'</td><td class="maxwidthonsmartphone">'."\n";
         $sortparam=(empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
@@ -1544,7 +1559,7 @@ else
 
             dol_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company');
 
-            print '<div class="fichecenter2">'; 
+            print '<div class="fichecenter2">';
             print '<table class="border" width="100%">';
 
             // Ref/ID
@@ -1750,7 +1765,7 @@ else
                     $formcompany->select_localtax(1,$object->localtax1_value, "lt1");
                     print '</span>';
                 }
-            
+
                 print '</td><td>'.fieldLabel($langs->transcountry("LocalTax2IsUsed",$mysoc->country_code),'localtax2assuj_value').'</td><td>';
                 print $form->selectyesno('localtax2assuj_value',$object->localtax2_assuj,1);
                 if  (! isOnlyOneLocalTax(2))
@@ -1760,7 +1775,7 @@ else
                     print '</span>';
                 }
                 print '</td></tr>';
-            
+
             }
             elseif($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj!="1")
             {
@@ -1773,7 +1788,7 @@ else
                     print '</span>';
                 }
                 print '</td></tr>';
-            
+
             }
             elseif($mysoc->localtax2_assuj=="1" && $mysoc->localtax1_assuj!="1")
             {
@@ -1787,7 +1802,7 @@ else
                 }
                 print '</td></tr>';
             }
-            
+
             // VAT Code
             print '<tr><td>'.fieldLabel('VATIntra','intra_vat').'</td>';
             print '<td colspan="3">';
@@ -1935,7 +1950,7 @@ else
 
             print '</table>';
             print '</div>';
-            
+
 	        dol_fiche_end();
 
             print '<div align="center">';
@@ -1952,7 +1967,7 @@ else
         /*
          * View
          */
-        
+
         if (!empty($object->id)) $res=$object->fetch_optionals($object->id,$extralabels);
         //if ($res < 0) { dol_print_error($db); exit; }
 
@@ -2091,7 +2106,7 @@ else
 		    print '</td></tr><tr><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td>';
 		    print yn($object->localtax2_assuj);
 		    print '</td></tr>';
-		
+
 		    if($object->localtax1_assuj=="1" && (! isOnlyOneLocalTax(1)))
 		    {
 		        print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
@@ -2145,7 +2160,7 @@ else
 		            print '<td>'.$object->localtax1_value.'</td>';
 		        }
 		        print '</tr></form>';
-		
+
 		    }
 		}
 		elseif($mysoc->localtax2_assuj=="1" && $mysoc->localtax1_assuj!="1")
@@ -2155,7 +2170,7 @@ else
 		    print '</td></tr>';
 		    if($object->localtax2_assuj=="1" && (! isOnlyOneLocalTax(2)))
 		    {
-		
+
 		        print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
 		        print '<input type="hidden" name="action" value="set_localtax2">';
 		        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -2168,7 +2183,7 @@ else
 		            print '<td>'.$object->localtax2_value.'</td>';
 		        }
 		        print '</tr></form>';
-		
+
 		    }
 		}
 		/*
@@ -2179,7 +2194,7 @@ else
 		 print '</td><tr>';
 		 }
 		 */
-		
+
         // VAT Code
         print '<tr>';
 		print '<td class="nowrap">'.$langs->trans('VATIntra').'</td><td>';
@@ -2308,14 +2323,9 @@ else
 			print '</td></tr>';
 		}
 
-        // Other attributes
-        $parameters=array('socid'=>$socid, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');
-        $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
-        if (empty($reshook) && ! empty($extrafields->attribute_label))
-        {
-        	print $object->showOptionals($extrafields);
-        }
+		// Other attributes
+		$parameters=array('socid'=>$socid, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');
+		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
         // Parent company
         if (empty($conf->global->SOCIETE_DISABLE_PARENTCOMPANY))
@@ -2574,10 +2584,10 @@ else
 
 	        // Subsidiaries list
 	        if (empty($conf->global->SOCIETE_DISABLE_SUBSIDIARIES))
-	        {	        
+	        {
 	           $result=show_subsidiaries($conf,$langs,$db,$object);
 	        }
-	        
+
 	        // Contacts list
 	        if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
 	        {
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index ebd06dbd5c4..724c0f66523 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1062,7 +1062,6 @@ class Societe extends CommonObject
         else if ($idprof6) $sql .= " WHERE s.idprof6 = '".$this->db->escape($idprof6)."' AND s.entity IN (".getEntity($this->element, 1).")";
 
         $resql=$this->db->query($sql);
-        dol_syslog(get_class($this)."::fetch ".$sql);
         if ($resql)
         {
             $num=$this->db->num_rows($resql);
@@ -1196,11 +1195,7 @@ class Societe extends CommonObject
                 $result = 1;
 
                 // Retreive all extrafield for thirdparty
-                // fetch optionals attributes and labels
-                require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
-                $extrafields=new ExtraFields($this->db);
-                $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-               	$this->fetch_optionals($this->id,$extralabels);
+               	$this->fetch_optionals();
             }
             else
 			{
@@ -1843,16 +1838,16 @@ class Societe extends CommonObject
     			&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
     			|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 2
     			)
-    		) 
+    		)
     		$code = $this->code_client . ' - ';
 
     		if (($this->fournisseur) && (! empty ( $this->code_fournisseur ))
     			&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
     			|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 3
     			)
-    		) 
+    		)
     		$code .= $this->code_fournisseur . ' - ';
-    
+
     		if ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1)
     			$name =$code.' '.$name;
     		else
@@ -1870,7 +1865,7 @@ class Societe extends CommonObject
             $label.= Form::showphoto('societe', $this, 80, 0, 0, 'photowithmargin', 'mini');
             $label.= '</div><div style="clear: both;"></div>';
         }
-        
+
         $label.= '<div class="centpercent">';
 
         if ($option == 'customer' || $option == 'compta' || $option == 'category' || $option == 'category_supplier')
@@ -1903,7 +1898,7 @@ class Societe extends CommonObject
             $label.= '<u>' . $langs->trans("ShowMargin") . '</u>';
             $linkstart = '<a href="'.DOL_URL_ROOT.'/margin/tabs/thirdpartyMargins.php?socid='.$this->id.'&type=1';
         }
-        
+
         // By default
         if (empty($linkstart))
         {
@@ -1924,13 +1919,13 @@ class Societe extends CommonObject
             $label.= '<br><b>' . $langs->trans('CustomerAccountancyCode') . ':</b> '. $this->code_compta_client;
         if (! empty($conf->accounting->enabled) && $this->fournisseur)
             $label.= '<br><b>' . $langs->trans('SupplierAccountancyCode') . ':</b> '. $this->code_compta_fournisseur;
-            
+
         $label.= '</div>';
 
         // Add type of canvas
         $linkstart.=(!empty($this->canvas)?'&canvas='.$this->canvas:'');
         // Add param to save lastsearch_values or not
-        $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0); 
+        $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
         if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
         if ($add_save_lastsearch_values) $linkstart.='&save_lastsearch_values=1';
         $linkstart.='"';
@@ -1965,7 +1960,7 @@ class Societe extends CommonObject
             $linkstart='';
             $linkend='';
         }
-        
+
         if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), 'company', ($notooltip?'':'class="classfortooltip valigntextbottom"'), 0, 0, $notooltip?0:1).$linkend);
         if ($withpicto && $withpicto != 2) $result.=' ';
         if ($withpicto != 2) $result.=$linkstart.($maxlen?dol_trunc($name,$maxlen):$name).$linkend;
@@ -3352,7 +3347,7 @@ class Societe extends CommonObject
 	{
 	    $table='propal';
 	    if ($mode == 'supplier') $table = 'supplier_proposal';
-	    
+
 	    $sql  = "SELECT rowid, total_ht, total as total_ttc, fk_statut FROM ".MAIN_DB_PREFIX.$table." as f";
 	    $sql .= " WHERE fk_soc = ". $this->id;
 
@@ -3376,7 +3371,7 @@ class Societe extends CommonObject
 	    else
 	        return array();
 	}
-	
+
 	/**
 	 *  Return amount of order not paid and total
 	 *
@@ -3387,7 +3382,7 @@ class Societe extends CommonObject
 	{
 	    $table='commande';
 	    if ($mode == 'supplier') $table = 'commande_fournisseur';
-	     
+
 	    $sql  = "SELECT rowid, total_ht, total_ttc, fk_statut FROM ".MAIN_DB_PREFIX.$table." as f";
 	    $sql .= " WHERE fk_soc = ". $this->id;
 
@@ -3411,7 +3406,7 @@ class Societe extends CommonObject
 	    else
 	        return array();
 	}
-	
+
 	/**
 	 *  Return amount of bill not paid and total
 	 *
@@ -3422,7 +3417,7 @@ class Societe extends CommonObject
 	{
 	    $table='facture';
 	    if ($mode == 'supplier') $table = 'facture_fourn';
-	     
+
 	    /* Accurate value of remain to pay is to sum remaintopay for each invoice
 	     $paiement = $invoice->getSommePaiement();
 	     $creditnotes=$invoice->getSumCreditNotesUsed();
@@ -3455,7 +3450,7 @@ class Societe extends CommonObject
 	            $tmpobject->id=$obj->rowid;
 	            if ($obj->fk_statut != 0                                           // Not a draft
 	                && ! ($obj->fk_statut == 3 && $obj->close_code == 'replaced')  // Not a replaced invoice
-	                )                                                      
+	                )
 	            {
 	                $outstandingTotal+= $obj->total_ht;
 	                $outstandingTotalIncTax+= $obj->total_ttc;
@@ -3474,12 +3469,12 @@ class Societe extends CommonObject
 	        }
 	        return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);
 	    }
-	    else 
+	    else
 	    {
 	        return array();
 	    }
 	}
-	
+
 	/**
 	 *  Return amount of bill not paid
 	 *
@@ -3502,7 +3497,7 @@ class Societe extends CommonObject
 	    //$sql .= " AND (fk_statut <> 3 OR close_code <> 'abandon')";		// Not abandonned for undefined reason
 	    $sql .= " AND fk_statut <> 3";		// Not abandonned
 	    $sql .= " AND fk_statut <> 2";		// Not clasified as paid
-	
+
 	    dol_syslog("get_OutstandingBill", LOG_DEBUG);
 	    $resql=$this->db->query($sql);
 	    if ($resql)
@@ -3522,7 +3517,7 @@ class Societe extends CommonObject
 	    else
 	        return 0;
 	}
-	
+
 	/**
 	 * Return label of status customer is prospect/customer
 	 *
@@ -3592,9 +3587,9 @@ class Societe extends CommonObject
                     return 0;
     			}
     		}
-    
+
     		$modelpath = "core/modules/societe/doc/";
-		
+
     		$result=$this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
 		}
 
@@ -3615,7 +3610,7 @@ class Societe extends CommonObject
 	public function setCategories($categories, $type)
 	{
 		require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
-	    
+
 	    // Decode type
 		if ($type == 'customer') {
 			$type_id = Categorie::TYPE_CUSTOMER;
diff --git a/htdocs/societe/commerciaux.php b/htdocs/societe/commerciaux.php
index 89bb836d119..83bc3d6e99f 100644
--- a/htdocs/societe/commerciaux.php
+++ b/htdocs/societe/commerciaux.php
@@ -115,9 +115,9 @@ if (! empty($socid))
 	dol_fiche_head($head, 'salesrepresentative', $langs->trans("ThirdParty"), -1, 'company');
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
-	
+
     dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
-        
+
 	print '<div class="fichecenter">';
 
     print '<div class="underbanner clearboth"></div>';
@@ -167,17 +167,14 @@ if (! empty($socid))
 		$i = 0;
 
 		$tmpuser = new User($db);
-		
+
 		while ($i < $num)
 		{
 			$obj = $db->fetch_object($resql);
 
  			$parameters=array('socid'=>$object->id);
         	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$obj,$action);    // Note that $action and $object may have been modified by hook
-      		if (empty($reshook)) {
-
-				null; // actions in normal case
-      		}
+      		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
       		$tmpuser->id = $obj->rowid;
       		$tmpuser->firstname = $obj->firstname;
@@ -188,7 +185,7 @@ if (! empty($socid))
       		$tmpuser->societe_id = $obj->fk_soc;
       		$tmpuser->photo = $obj->photo;
       		print $tmpuser->getNomUrl(-1);
-      		
+
 			/*print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->rowid.'">';
 			print img_object($langs->trans("ShowUser"),"user").' ';
 			print dolGetFirstLastname($obj->firstname, $obj->lastname)."\n";
@@ -216,7 +213,7 @@ if (! empty($socid))
 
 	print '</table>';
 	print "</div>\n";
-	
+
 	dol_fiche_end();
 
 
@@ -263,11 +260,11 @@ if (! empty($socid))
 
 			$var=True;
 			$tmpuser=new User($db);
-				
+
 			while ($i < $num)
 			{
 				$obj = $db->fetch_object($resql);
-				
+
 				print "<tr ".$bc[$var]."><td>";
 				$tmpuser->id=$obj->rowid;
 				$tmpuser->firstname=$obj->firstname;
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 056a67e5587..29bc06ff760 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -359,16 +359,7 @@ if ($sql_select)
     print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num, $totalnboflines, '', 0, '', '', $limit);
 
     print '<table class="liste" width="100%">'."\n";
-    // Titles with sort buttons
-    print '<tr class="liste_titre">';
-    print_liste_field_titre($langs->trans('Ref'),$_SERVER['PHP_SELF'],'doc_number','',$param,'align="left"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans('Date'),$_SERVER['PHP_SELF'],'dateprint','',$param,'align="center" width="150"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans('Status'),$_SERVER['PHP_SELF'],'fk_statut','',$param,'align="center"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans('Product'),$_SERVER['PHP_SELF'],'','',$param,'align="left"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans('Quantity'),$_SERVER['PHP_SELF'],'prod_qty','',$param,'align="right"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans('TotalHT'),$_SERVER['PHP_SELF'],'total_ht','',$param,'align="right"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans('UnitPrice'),$_SERVER['PHP_SELF'],'','',$param,'align="right"',$sortfield,$sortorder);
-    print "</tr>\n";
+
     // Filters
     print '<tr class="liste_titre">';
     print '<td class="liste_titre" align="left">';
@@ -393,6 +384,18 @@ if ($sql_select)
     print '</td>';
     print '</tr>';
 
+    // Titles with sort buttons
+    print '<tr class="liste_titre">';
+    print_liste_field_titre($langs->trans('Ref'),$_SERVER['PHP_SELF'],'doc_number','',$param,'align="left"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans('Date'),$_SERVER['PHP_SELF'],'dateprint','',$param,'align="center" width="150"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans('Status'),$_SERVER['PHP_SELF'],'fk_statut','',$param,'align="center"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans('Product'),$_SERVER['PHP_SELF'],'','',$param,'align="left"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans('Quantity'),$_SERVER['PHP_SELF'],'prod_qty','',$param,'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans('TotalHT'),$_SERVER['PHP_SELF'],'total_ht','',$param,'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans('UnitPrice'),$_SERVER['PHP_SELF'],'','',$param,'align="right"',$sortfield,$sortorder);
+    print "</tr>\n";
+
+
 	$i = 0;
 	while (($objp = $db->fetch_object($resql)) && $i < min($num, $limit))
 	{
@@ -407,7 +410,7 @@ if ($sql_select)
 
 		if (is_object($documentstaticline)) $documentstaticline->statut=$objp->status;
 
-		
+
 		print '<tr class="oddeven">';
 		print '<td class="nobordernopadding nowrap" width="100">';
 		print $documentstatic->getNomUrl(1);
@@ -609,7 +612,7 @@ else if (empty($type_element) || $type_element == -1)
     print_liste_field_titre($langs->trans('Quantity'),$_SERVER['PHP_SELF'],'prod_qty','',$param,'align="right"',$sortfield,$sortorder);
     print "</tr>\n";
 
-	print '<tr '.$bc[0].'><td class="opacitymedium" colspan="5">'.$langs->trans("SelectElementAndClickRefresh").'</td></tr>';
+	print '<tr '.$bc[0].'><td class="opacitymedium" colspan="5">'.$langs->trans("SelectElementAndClick", $langs->transnoentitiesnoconv("Search")).'</td></tr>';
 
 	print "</table>";
 }
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 86c350ecc22..020473fee59 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -505,7 +505,7 @@ if (empty($reshook))
 	}
 
 	// Add a product line
-	if ($action == 'addline' && $user->rights->supplier_proposal->creer) 
+	if ($action == 'addline' && $user->rights->supplier_proposal->creer)
 	{
 	    $langs->load('errors');
 	    $error = 0;
@@ -515,7 +515,7 @@ if (empty($reshook))
 		$product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):'');
 		$date_start=dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start' . $predef . 'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
 		$date_end=dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end' . $predef . 'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
-		
+
 		if (GETPOST('prod_entry_mode') == 'free')
 		{
 			$idprod=0;
@@ -572,7 +572,7 @@ if (empty($reshook))
 			if ((GETPOST('prod_entry_mode') != 'free') && empty($error))	// With combolist mode idprodfournprice is > 0 or -1. With autocomplete, idprodfournprice is > 0 or ''
 			{
 			    $productsupplier = new ProductFournisseur($db);
-			    
+
 			    if (empty($conf->global->SUPPLIER_PROPOSAL_WITH_NOPRICEDEFINED))
 			    {
 			        $idprod=0;
@@ -592,7 +592,7 @@ if (empty($reshook))
 			        $idprod=$productsupplier->get_buyprice(GETPOST('idprodfournprice'), -1);        // We force qty to -1 to be sure to find if a supplier price exist
                     $res=$productsupplier->fetch($idprod);
 			    }
-                
+
 			    if ($idprod > 0)
 			    {
 			        $pu_ht = $productsupplier->fourn_pu;
@@ -601,7 +601,7 @@ if (empty($reshook))
 			        $label = $productsupplier->label;
 			        $desc = $productsupplier->description;
 			        if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc);
-			
+
 			        $tva_tx	= get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice'));
 			        $tva_npr = get_default_npr($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice'));
 			        if (empty($tva_tx)) $tva_npr=0;
@@ -659,13 +659,13 @@ if (empty($reshook))
 			    $type = GETPOST('type');
 
 			    $fk_unit= GETPOST('units', 'alpha');
-			
+
 			    $tva_tx = price2num($tva_tx);	// When vat is text input field
-			
+
 			    // Local Taxes
 			    $localtax1_tx= get_localtax($tva_tx, 1, $mysoc, $object->thirdparty);
 			    $localtax2_tx= get_localtax($tva_tx, 2, $mysoc, $object->thirdparty);
-			
+
 			    if (GETPOST('price_ht')!=='')
 			    {
 			        $price_base_type = 'HT';
@@ -678,13 +678,13 @@ if (empty($reshook))
 			        $ht = $ttc / (1 + ($tva_tx / 100));
 			        $price_base_type = 'HT';
 			    }
-			
+
 				$result = $object->addline($desc, $ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $price_base_type, $ttc, $info_bits, $type, - 1, 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $array_options, $ref_fourn, $fk_unit);
 			    //$result = $object->addline($desc, $ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, 0, 0, '', $remise_percent, $price_base_type, $ttc, $type,'','', $date_start, $date_end, $array_options, $fk_unit);
 			}
 
 
-			if (! $error && $result > 0) 
+			if (! $error && $result > 0)
 			{
 					$db->commit();
 
@@ -701,7 +701,7 @@ if (empty($reshook))
 						}
 						$model=$object->modelpdf;
 						$ret = $object->fetch($id); // Reload to get new records
-						
+
 						$result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			    		if ($result < 0) dol_print_error($db,$result);
 					}
@@ -711,7 +711,7 @@ if (empty($reshook))
 					unset($_POST['qty']);
 					unset($_POST['type']);
 					unset($_POST['remise_percent']);
-					unset($_POST['pu']);					
+					unset($_POST['pu']);
 					unset($_POST['price_ht']);
 					unset($_POST['multicurrency_price_ht']);
 					unset($_POST['price_ttc']);
@@ -742,8 +742,8 @@ if (empty($reshook))
 					unset($_POST['date_endday']);
 					unset($_POST['date_endmonth']);
 					unset($_POST['date_endyear']);
-			} 
-			else 
+			}
+			else
 			{
 				$db->rollback();
 
@@ -959,27 +959,13 @@ if (empty($reshook))
 		// Fill array 'array_options' with data from update form
 		$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 		$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
-		if ($ret < 0)
-			$error ++;
-
-		if (! $error) {
-			// Actions on extra fields (by external module or standard code)
-			$hookmanager->initHooks(array('supplier_proposaldao'));
-			$parameters = array('id' => $object->id);
-			$reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $object, $action); // Note that $action and $object may have been
-			                                                                                           // modified by
-			                                                                                           // some hooks
-			if (empty($reshook)) {
-				$result = $object->insertExtraFields();
-				if ($result < 0) {
-					$error ++;
-				}
-			} else if ($reshook < 0)
-				$error ++;
+		if ($ret < 0) $error++;
+		if (! $error)
+		{
+			$result = $object->insertExtraFields();
+			if ($result < 0) $error++;
 		}
-
-		if ($error)
-			$action = 'edit_extras';
+		if ($error) $action = 'edit_extras';
 	}
 }
 
@@ -1163,9 +1149,7 @@ if ($action == 'create')
 
 	// Other attributes
 	$parameters = array('colspan' => ' colspan="3"');
-	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified
-	                                                                                           // by
-	                                                                                           // hook
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	if (empty($reshook) && ! empty($extrafields->attribute_label)) {
 		print $object->showOptionals($extrafields, 'edit');
 	}
@@ -1367,11 +1351,11 @@ if ($action == 'create')
 	// Print form confirm
 	print $formconfirm;
 
-	
+
 	// Supplier proposal card
 	$linkback = '<a href="' . DOL_URL_ROOT . '/supplier_proposal/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
-	
-	
+
+
 	$morehtmlref='<div class="refidno">';
 	// Ref supplier
 	//$morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->fournisseur->commande->creer, 'string', '', 0, 1);
@@ -1411,15 +1395,15 @@ if ($action == 'create')
 	    }
 	}
 	$morehtmlref.='</div>';
-	
-	
+
+
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-	
-	
+
+
 	print '<div class="fichecenter">';
 	print '<div class="fichehalfleft">';
 	print '<div class="underbanner clearboth"></div>';
-	
+
 	print '<table class="border" width="100%">';
 
 	// Payment term
@@ -1563,14 +1547,14 @@ if ($action == 'create')
 	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
 	print '</table>';
-	
+
 	print '</div>';
 	print '<div class="fichehalfright">';
 	print '<div class="ficheaddleft">';
 	print '<div class="underbanner clearboth"></div>';
-	
+
 	print '<table class="border centpercent">';
-	
+
 	if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency))
 	{
 		// Multicurrency Amount HT
@@ -1588,7 +1572,7 @@ if ($action == 'create')
 		print '<td>' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
 		print '</tr>';
 	}
-	
+
 	// Amount HT
 	print '<tr><td class="titlefieldmiddle">' . $langs->trans('AmountHT') . '</td>';
 	print '<td>' . price($object->total_ht, '', $langs, 0, - 1, - 1, $conf->currency) . '</td>';
@@ -1619,18 +1603,18 @@ if ($action == 'create')
 	print '</tr>';
 
 	print '</table>';
-	
+
 	// Margin Infos
 	/*if (! empty($conf->margin->enabled)) {
 	   $formmargin->displayMarginInfos($object);
-	}*/	
+	}*/
 
 	print '</div>';
 	print '</div>';
 	print '</div>';
-	
+
 	print '<div class="clearboth"></div><br>';
-	
+
 	if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
 		$blocname = 'contacts';
 		$title = $langs->trans('ContactsAddresses');
@@ -1667,7 +1651,7 @@ if ($action == 'create')
 	// Add free products/services form
 	global $forceall, $senderissupplier, $dateSelector;
 	$forceall=1; $senderissupplier=2; $dateSelector=0;     // $senderissupplier=2 is same than 1 but disable test on minimum qty.
-	
+
 	if (! empty($object->lines))
 		$ret = $object->printObjectLines($action, $soc, $mysoc, $lineid, 1);
 
@@ -1810,12 +1794,12 @@ if ($action == 'create')
 
 		print $formfile->showdocuments('supplier_proposal', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
 
-		
+
 		// Show links to link elements
 		$linktoelem = $form->showLinkToObjectBlock($object, null, array('supplier_proposal'));
 		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
-		
+
 		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
 		// List of actions on element
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 3912a9b80ff..c0738f004bc 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -265,7 +265,7 @@ input.select2-input {
 	border-bottom:  solid 1px rgba(0,0,0,.2) !important;	/* required to avoid to lose bottom line when focus is lost on select2. */
 }
 
-.liste_titre input[name=monthvalid], .liste_titre input[name=search_smonth], .liste_titre input[name=search_emonth], .liste_titre input[name=smonth], .liste_titre input[name=month], .liste_titre input[name=month_lim] {
+.liste_titre input[name=monthvalid], .liste_titre input[name=search_smonth], .liste_titre input[name=search_emonth], .liste_titre input[name=smonth], .liste_titre input[name=month], .liste_titre select[name=month], .liste_titre input[name=month_lim] {
 	margin-right: 4px;
 }
 input[type=submit] {
@@ -691,7 +691,7 @@ div.fiche>form>div.div-table-responsive, div.fiche>form>div.div-table-responsive
     overflow-x: auto;
 }
 div.fiche>form>div.div-table-responsive {
-    min-height: 390px;
+    min-height: 392px;
 }
 
 .flexcontainer {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index d3f822bcca2..4557c6856fb 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -692,7 +692,7 @@ div.fiche>form>div.div-table-responsive, div.fiche>form>div.div-table-responsive
     overflow-x: auto;
 }
 div.fiche>form>div.div-table-responsive {
-    min-height: 390px;
+    min-height: 392px;
 }
 
 .flexcontainer {
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 92951de98e8..88315f82763 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -300,7 +300,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == 'update' && ! $cancel) 
+	if ($action == 'update' && ! $cancel)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
@@ -319,7 +319,7 @@ if (empty($reshook)) {
 				$error ++;
 			}
 
-			if (!$error) 
+			if (!$error)
 			{
 				$object->fetch($id);
 
@@ -456,7 +456,7 @@ if (empty($reshook)) {
 								setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
 							} else {
         					    // Create thumbs
-        					    $object->addThumbs($newfile);					    
+        					    $object->addThumbs($newfile);
 							}
 						} else {
 							$error ++;
@@ -465,7 +465,7 @@ if (empty($reshook)) {
 						}
 					}
 				}
-				
+
             	if (! $error && ! count($object->errors))
             	{
             		// Then we add the associated categories
@@ -476,7 +476,7 @@ if (empty($reshook)) {
 				if (!$error && !count($object->errors)) {
 					setEventMessages($langs->trans("UserModified"), null, 'mesgs');
 					$db->commit();
-					
+
 					$login = $_SESSION["dol_login"];
 					if ($login && $login == $object->oldcopy->login && $object->oldcopy->login != $object->login)    // Current user has changed its login
 					{
@@ -495,11 +495,11 @@ if (empty($reshook)) {
 		    if ($caneditpassword)    // Case we can edit only password
 		    {
 		        dol_syslog("Not allowed to change fields, only password");
-		        
+
 		        $object->fetch($id);
-		    
+
 		        $object->oldcopy = clone $object;
-		    
+
 		        $ret = $object->setPassword($user, GETPOST("password"));
 		        if ($ret < 0)
 		        {
@@ -591,14 +591,14 @@ if (empty($reshook)) {
             setEventMessages($ldap->error, $ldap->errors, 'errors');
         }
     }
-		
+
     // Actions to send emails
     $trigger_name='USER_SENTBYMAIL';
     $paramname='id';    // Name of param key to open the card
     $mode='emailfromuser';
     $trackid='use'.$object->id;
     include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
-    
+
     // Actions to build doc
     $upload_dir = $conf->user->dir_output;
     $permissioncreate=$user->rights->user->user->creer;
@@ -1027,9 +1027,9 @@ if (($action == 'create') || ($action == 'adduserldap'))
         print '<input size="30" type="text" name="accountancy_code" value="'.GETPOST('accountancy_code').'">';
         print '</td></tr>';
     }
-    
+
     // TODO Move this into tab RH (HierarchicalResponsible must be on both tab)
-    
+
     // Hierarchy
     print '<tr><td>'.$langs->trans("HierarchicalResponsible").'</td>';
     print '<td>';
@@ -1076,7 +1076,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
     print '<input size="8" type="text" name="weeklyhours" value="'.GETPOST('weeklyhours').'">';
     print '</td>';
     print "</tr>\n";
-	
+
     // Date employment
     print '<tr><td>'.$langs->trans("DateEmployment").'</td>';
     print '<td>';
@@ -1092,9 +1092,9 @@ if (($action == 'create') || ($action == 'adduserldap'))
 		print $formother->selectColor(GETPOST('color')?GETPOST('color'):$object->color, 'color', null, 1, '', 'hideifnotset');
 		print '</td></tr>';
 	}
-	
+
 	// Categories
-	if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire)) 
+	if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire))
 	{
 		print '<tr><td>' . fieldLabel('Categories', 'usercats') . '</td><td colspan="3">';
 		$cate_arbo = $form->select_all_categories('user', null, 'parent', null, null, 1);
@@ -1110,7 +1110,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
     {
     	print $object->showOptionals($extrafields,'edit');
     }
-	
+
     // Note
     print '<tr><td class="tdtop">';
     print $langs->trans("Note");
@@ -1127,7 +1127,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
     $doleditor=new DolEditor('signature',GETPOST('signature'),'',138,'dolibarr_mailings','In',true,true,empty($conf->global->FCKEDITOR_ENABLE_USERSIGN)?0:1,ROWS_4,'90%');
     print $doleditor->Create(1);
     print '</td></tr>';
-    
+
     print "</table>\n";
 
  	dol_fiche_end();
@@ -1153,7 +1153,7 @@ else
         $object->fetch($id, '', '', 1);
         if ($res < 0) { dol_print_error($db,$object->error); exit; }
         $res=$object->fetch_optionals($object->id,$extralabels);
-		
+
 		// Check if user has rights
 		$object->getrights();
 		if(empty($object->nb_rights)) setEventMessages($langs->trans('UserHasNoPermissions'), null, 'warnings');
@@ -1387,7 +1387,7 @@ else
                 print '<tr><td>'.$langs->trans("AccountancyCode").'</td>';
                 print '<td>'.$object->accountancy_code.'</td></tr>';
             }
-            
+
             // TODO Move this into tab RH, visible when salarie or RH is visible (HierarchicalResponsible must be on both tab)
 
             // Hierarchy
@@ -1468,7 +1468,7 @@ else
             }
 
             // Categories
-		    if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire)) 
+		    if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire))
 	    	{
 				print '<tr><td>' . $langs->trans( "Categories" ) . '</td>';
 				print '<td colspan="3">';
@@ -1495,30 +1495,25 @@ else
 		            print "</td></tr>\n";
 		        }
 		    }
-		    
+
 		    if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file->main_authentication) && ! empty($conf->global->MAIN_OPENIDURL_PERUSER))
 		    {
 		        print '<tr><td>'.$langs->trans("OpenIDURL").'</td>';
 		        print '<td>'.$object->openid.'</td>';
 		        print "</tr>\n";
 		    }
-		    
+
 		    print '<tr><td class="titlefield">'.$langs->trans("LastConnexion").'</td>';
 		    print '<td>'.dol_print_date($object->datelastlogin,"dayhour").'</td>';
 		    print "</tr>\n";
-		    
+
 		    print '<tr><td>'.$langs->trans("PreviousConnexion").'</td>';
 		    print '<td>'.dol_print_date($object->datepreviouslogin,"dayhour").'</td>';
 		    print "</tr>\n";
-		    
+
 		    // Other attributes
-		    $parameters=array();
-		    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-		    if (empty($reshook) && ! empty($extrafields->attribute_label))
-		    {
-		        print $object->showOptionals($extrafields);
-		    }
-		    
+    		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+
             // Company / Contact
             if (! empty($conf->societe->enabled))
             {
@@ -1598,7 +1593,7 @@ else
                 $langs->load("mails");
                 print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a></div>';
             }
-            
+
             if ($caneditfield && (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
             {
                 if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
@@ -1680,36 +1675,36 @@ else
                 /*
                  * Affiche formulaire mail
                  */
-            
+
                 // By default if $action=='presend'
                 $titreform='SendMail';
                 $topicmail='';
                 $action='send';
                 $modelmail='user';
-            
+
                 print '<div id="presend"></div>';
                 print load_fiche_titre($langs->trans($titreform));
-            
+
                 dol_fiche_head();
-            
+
                 // Define output language
                 $outputlangs = $langs;
                 $newlang = '';
                 if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
                     $newlang = $_REQUEST['lang_id'];
-                
+
                 if ($conf->global->MAIN_MULTILANGS && empty($newlang))
                     $newlang = $object->default_lang;
-            
+
                 // Cree l'objet formulaire mail
                 include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
                 $formmail = new FormMail($db);
                 $formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
                 $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
-    
+
                 if($formmail->fromtype === 'user'){
                     $formmail->fromid = $user->id;
-    
+
                 }
                 $formmail->trackid='thi'.$object->id;
                 if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
@@ -1733,40 +1728,40 @@ else
                 $formmail->substit['__FIRSTNAME__']=$object->firstname;
                 $formmail->substit['__SIGNATURE__']=$user->signature;
                 $formmail->substit['__PERSONALIZED__']='';
-    
+
                 //Find the good contact adress
                 /*
                 $custcontact='';
                 $contactarr=array();
                 $contactarr=$object->liste_contact(-1,'external');
-    
+
                 if (is_array($contactarr) && count($contactarr)>0)
                 {
                 foreach($contactarr as $contact)
                 {
                 if ($contact['libelle']==$langs->trans('TypeContact_facture_external_BILLING')) {
-    
+
                 require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
-    
+
                 $contactstatic=new Contact($db);
                 $contactstatic->fetch($contact['id']);
                 $custcontact=$contactstatic->getFullName($langs,1);
                 }
                 }
-    
+
                 if (!empty($custcontact)) {
                 $formmail->substit['__CONTACTCIVNAME__']=$custcontact;
                 }
                 }*/
-    
-    
+
+
                 // Tableau des parametres complementaires du post
                 $formmail->param['action']=$action;
                 $formmail->param['models']=$modelmail;
                 $formmail->param['models_id']=GETPOST('modelmailselected','int');
                 $formmail->param['socid']=$object->id;
                 $formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-    
+
                 // Init list of files
                 if (GETPOST("mode")=='init')
                 {
@@ -1774,7 +1769,7 @@ else
                     $formmail->add_attached_files($file,basename($file),dol_mimetype($file));
                 }
                 print $formmail->get_form();
-    
+
                 dol_fiche_end();
             }
 
@@ -1783,17 +1778,17 @@ else
                 /*
                  * List of groups of user
                  */
-    
+
                 if ($canreadgroup)
                 {
                     print load_fiche_titre($langs->trans("ListOfGroupsForUser"),'','');
-    
+
                     // On selectionne les groupes auquel fait parti le user
                     $exclude = array();
-    
+
                     $usergroup=new UserGroup($db);
                     $groupslist = $usergroup->listGroupsForUser($object->id);
-    
+
                     if (! empty($groupslist))
                     {
                         if (! (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)))
@@ -1804,14 +1799,14 @@ else
                             }
                         }
                     }
-    
+
                     if ($caneditgroup)
                     {
                         print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">'."\n";
                         print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
                         print '<input type="hidden" name="action" value="addgroup" />';
                     }
-                    
+
                     print '<table class="noborder" width="100%">'."\n";
                     print '<tr class="liste_titre"><th class="liste_titre" width="25%">'.$langs->trans("Groups").'</th>'."\n";
                     if(! empty($conf->multicompany->enabled) && !empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
@@ -1843,7 +1838,7 @@ else
                         print '<input type="submit" class="button" value="'.$langs->trans("Add").'" />';
                     }
                     print '</th></tr>'."\n";
-    
+
                     /*
                      * Groups assigned to user
                      */
@@ -1851,8 +1846,8 @@ else
                     {
                         foreach($groupslist as $group)
                         {
-                            
-    
+
+
                             print '<tr class="oddeven">';
                             print '<td>';
                             if ($caneditgroup)
@@ -1899,9 +1894,9 @@ else
                     {
                         print '<tr '.$bc[false].'><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
                     }
-    
+
                     print "</table>";
-                    
+
                     if ($caneditgroup)
                     {
                         print '</form>';
@@ -1910,7 +1905,7 @@ else
                 }
             }
         }
-        
+
         /*
          * Fiche en mode edition
          */
@@ -2030,7 +2025,7 @@ else
             print "</td></tr>\n";
 
             // API key
-            if(! empty($conf->api->enabled) && $user->admin) 
+            if(! empty($conf->api->enabled) && $user->admin)
             {
                 print '<tr><td>'.$langs->trans("ApiKey").'</td>';
                 print '<td>';
@@ -2280,9 +2275,9 @@ else
                 print '</td>';
                 print "</tr>";
             }
-            
+
             // TODO Move this into tab RH (HierarchicalResponsible must be on both tab)
-            
+
             // Hierarchy
             print '<tr><td>'.$langs->trans("HierarchicalResponsible").'</td>';
             print '<td>';
@@ -2355,7 +2350,7 @@ else
     			print $formother->selectColor(GETPOST('color')?GETPOST('color'):$object->color, 'color', null, 1, '', 'hideifnotset');
     			print '</td></tr>';
     		}
-    
+
     		// Photo
     		print '<tr>';
     		print '<td>'.$langs->trans("Photo").'</td>';
@@ -2363,9 +2358,9 @@ else
     		print $form->showphoto('userphoto',$object,60,0,$caneditfield,'photowithmargin','small');
     		print '</td>';
     		print '</tr>';
-    		
+
     		// Categories
-    		if (!empty( $conf->categorie->enabled ) && !empty( $user->rights->categorie->lire )) 
+    		if (!empty( $conf->categorie->enabled ) && !empty( $user->rights->categorie->lire ))
     		{
     			print '<tr><td>' . fieldLabel( 'Categories', 'usercats' ) . '</td>';
     			print '<td>';
@@ -2470,7 +2465,7 @@ else
                 print dol_htmlentitiesbr($object->signature);
             }
             print '</td></tr>';
-            
+
             print '</table>';
 
             dol_fiche_end();
@@ -2495,27 +2490,27 @@ else
             $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
             $genallowed = $user->rights->user->user->creer;
             $delallowed = $user->rights->user->user->supprimer;
-    
+
             $somethingshown = $formfile->show_documents('user', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
-    
+
     		// Show links to link elements
     		$linktoelem = $form->showLinkToObjectBlock($object, null, null);
     		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
-    
+
             print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-    
+
     		// List of actions on element
     		include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
     		$formactions = new FormActions($db);
     		$somethingshown = $formactions->showactions($object, 'user', $socid);
-            
-            
+
+
             print '</div></div></div>';
         }
-        
+
 		if (! empty($conf->ldap->enabled) && ! empty($object->ldap_sid)) $ldap->close();
     }
-    
+
 }
 
 if (! empty($conf->api->enabled) && ! empty($conf->use_javascript_ajax))
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index bbcbd38c168..6cb04c8eab5 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -210,7 +210,7 @@ if ($action == 'update')
         setEventMessages($langs->trans('ErrorForbidden'), null, 'mesgs');
     }
 }
-					
+
 // Actions to build doc
 $upload_dir = $conf->usergroup->dir_output;
 $permissioncreate=$user->rights->user->user->creer;
@@ -317,10 +317,10 @@ else
         	dol_fiche_head($head, 'group', $title, -1, 'group');
 
 			dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin);
-			
+
 			print '<div class="fichecenter">';
 			print '<div class="underbanner clearboth"></div>';
-			
+
         	print '<table class="border" width="100%">';
 
 			// Name
@@ -348,15 +348,11 @@ else
 
 			// Other attributes
             $parameters=array('colspan' => ' colspan="2"');
-            $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-            if (empty($reshook) && ! empty($extrafields->attribute_label))
-            {
-            	print $object->showOptionals($extrafields);
-            }
+    		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
 			print "</table>\n";
             print '</div>';
-            
+
 			dol_fiche_end();
 
 
@@ -448,7 +444,7 @@ else
             {
             	foreach($object->members as $useringroup)
             	{
-            		
+
 
             		print '<tr class="oddeven">';
             		print '<td>';
@@ -497,7 +493,7 @@ else
             }
             print "</table>";
             print "<br>";
-			
+
 			/*
 	         * Documents generes
 	         */
@@ -506,21 +502,21 @@ else
 	        $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
 	        $genallowed = $user->rights->user->user->creer;
 	        $delallowed = $user->rights->user->user->supprimer;
-	
+
 	        $somethingshown = $formfile->show_documents('usergroup', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
-	
+
 	        // Show links to link elements
 	        $linktoelem = $form->showLinkToObjectBlock($object, null, null);
 	        $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
-	
+
 	        print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-	
+
 			// List of actions on element
 			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
 			$formactions = new FormActions($db);
 			$somethingshown = $formactions->showactions($object, 'usergroup', $socid);
-	        
-	        
+
+
 	        print '</div></div></div>';
         }
 

From 5e3a2e06d46613ce45fcd4e0639da148cfb20636 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Thu, 8 Jun 2017 06:35:09 +0200
Subject: [PATCH 100/438] NEW : Accountancy - Activate multi-journal & Add
 journal_label to database (FEC)

---
 htdocs/accountancy/bookkeeping/list.php       |   6 +-
 .../accountancy/class/bookkeeping.class.php   |  35 +-
 htdocs/accountancy/journal/bankjournal.php    | 486 +++++------
 .../journal/expensereportsjournal.php         |  23 +-
 .../accountancy/journal/purchasesjournal.php  | 381 ++++-----
 htdocs/accountancy/journal/sellsjournal.php   | 760 +++++++++---------
 6 files changed, 866 insertions(+), 825 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 369dd7afcec..60e283eea2c 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2013-2016	Olivier Geffroy		<jeff@jeffinfo.com>
  * Copyright (C) 2013-2016	Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2013-2017	Alexandre Spangaro	<aspangaro@zendsi.com>
- * Copyright (C) 2016	  	Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2016		Laurent Destailleur <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -463,10 +463,10 @@ print '</td>';
 print '<td  align="right">';
 print price($total_debit);
 print '</td>';
-print '<td  align="right">';
+print '<td align="right">';
 print price($total_credit);
 print '</td>';
-print '<td></td>';
+print '<td colspan="2"></td>';
 print '</tr>';
 
 print "</table>";
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 5d9e7a9910a..6cc0e54a8dd 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -85,6 +85,7 @@ class BookKeeping extends CommonObject
 	public $fk_user_author;
 	public $import_key;
 	public $code_journal;
+	public $journal_label;
 	public $piece_num;
 
 	/**
@@ -156,6 +157,9 @@ class BookKeeping extends CommonObject
 		if (isset($this->code_journal)) {
 			$this->code_journal = trim($this->code_journal);
 		}
+		if (isset($this->journal_label)) {
+			$this->journal_label = trim($this->journal_label);
+		}
 		if (isset($this->piece_num)) {
 			$this->piece_num = trim($this->piece_num);
 		}
@@ -250,6 +254,7 @@ class BookKeeping extends CommonObject
 				$sql .= ", fk_user_author";
 				$sql .= ", import_key";
 				$sql .= ", code_journal";
+				$sql .= ", journal_label";
 				$sql .= ", piece_num";
 				$sql .= ', entity';				
 				$sql .= ") VALUES (";
@@ -268,6 +273,7 @@ class BookKeeping extends CommonObject
 				$sql .= ",'" . $this->fk_user_author . "'";
 				$sql .= ",'" . $this->db->idate($this->date_create). "'";
 				$sql .= ",'" . $this->code_journal . "'";
+				$sql .= ",'" . $this->journal_label . "'";
 				$sql .= "," . $this->piece_num;
 				$sql .= ", " . (! isset($this->entity) ? '1' : $this->entity);
 				$sql .= ")";
@@ -384,6 +390,9 @@ class BookKeeping extends CommonObject
 		if (isset($this->code_journal)) {
 			$this->code_journal = trim($this->code_journal);
 		}
+		if (isset($this->journal_label)) {
+			$this->journal_label = trim($this->journal_label);
+		}
 		if (isset($this->piece_num)) {
 			$this->piece_num = trim($this->piece_num);
 		}
@@ -410,6 +419,7 @@ class BookKeeping extends CommonObject
 		$sql .= 'fk_user_author,';
 		$sql .= 'import_key,';
 		$sql .= 'code_journal,';
+		$sql .= 'journal_label,';
 		$sql .= 'piece_num,';
 		$sql .= 'entity';
 		$sql .= ') VALUES (';
@@ -428,6 +438,7 @@ class BookKeeping extends CommonObject
 		$sql .= ' ' . $user->id . ',';
 		$sql .= ' ' . (! isset($this->import_key) ? 'NULL' : "'" . $this->db->escape($this->import_key) . "'") . ',';
 		$sql .= ' ' . (empty($this->code_journal) ? 'NULL' : "'" . $this->db->escape($this->code_journal) . "'") . ',';
+		$sql .= ' ' . (empty($this->journal_label) ? 'NULL' : "'" . $this->db->escape($this->journal_label) . "'") . ',';
 		$sql .= ' ' . (empty($this->piece_num) ? 'NULL' : $this->piece_num).',';
 		$sql .= ' ' . (! isset($this->entity) ? '1' : $this->entity);
 		$sql .= ')';
@@ -458,11 +469,11 @@ class BookKeeping extends CommonObject
 		// Commit or rollback
 		if ($error) {
 			$this->db->rollback();
-			
+
 			return - 1 * $error;
 		} else {
 			$this->db->commit();
-			
+
 			return $this->id;
 		}
 	}
@@ -478,7 +489,7 @@ class BookKeeping extends CommonObject
 	public function fetch($id, $ref = null) {
 		global $conf;
 
-	    dol_syslog(__METHOD__, LOG_DEBUG);
+		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$sql = 'SELECT';
 		$sql .= ' t.rowid,';
@@ -497,6 +508,7 @@ class BookKeeping extends CommonObject
 		$sql .= " t.fk_user_author,";
 		$sql .= " t.import_key,";
 		$sql .= " t.code_journal,";
+		$sql .= " t.journal_label,";
 		$sql .= " t.piece_num";
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
 		$sql .= ' WHERE 1 = 1';
@@ -530,6 +542,7 @@ class BookKeeping extends CommonObject
 				$this->fk_user_author = $obj->fk_user_author;
 				$this->import_key = $obj->import_key;
 				$this->code_journal = $obj->code_journal;
+				$this->journal_label = $obj->journal_label;
 				$this->piece_num = $obj->piece_num;
 			}
 			$this->db->free($resql);
@@ -581,6 +594,7 @@ class BookKeeping extends CommonObject
 		$sql .= " t.fk_user_author,";
 		$sql .= " t.import_key,";
 		$sql .= " t.code_journal,";
+		$sql .= " t.journal_label,";
 		$sql .= " t.piece_num";
 		// Manage filter
 		$sqlwhere = array ();
@@ -643,6 +657,7 @@ class BookKeeping extends CommonObject
 				$line->fk_user_author = $obj->fk_user_author;
 				$line->import_key = $obj->import_key;
 				$line->code_journal = $obj->code_journal;
+				$line->journal_label = $obj->journal_label;
 				$line->piece_num = $obj->piece_num;
 
 				$this->lines[] = $line;
@@ -693,6 +708,7 @@ class BookKeeping extends CommonObject
 		$sql .= " t.fk_user_author,";
 		$sql .= " t.import_key,";
 		$sql .= " t.code_journal,";
+		$sql .= " t.journal_label,";
 		$sql .= " t.piece_num";
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
 		// Manage filter
@@ -752,6 +768,7 @@ class BookKeeping extends CommonObject
 				$line->fk_user_author = $obj->fk_user_author;
 				$line->import_key = $obj->import_key;
 				$line->code_journal = $obj->code_journal;
+				$line->journal_label = $obj->journal_label;
 				$line->piece_num = $obj->piece_num;
 
 				$this->lines[] = $line;
@@ -903,6 +920,9 @@ class BookKeeping extends CommonObject
 		if (isset($this->code_journal)) {
 			$this->code_journal = trim($this->code_journal);
 		}
+		if (isset($this->journal_label)) {
+			$this->journal_label = trim($this->journal_label);
+		}
 		if (isset($this->piece_num)) {
 			$this->piece_num = trim($this->piece_num);
 		}
@@ -927,6 +947,7 @@ class BookKeeping extends CommonObject
 		$sql .= ' fk_user_author = ' . (isset($this->fk_user_author) ? $this->fk_user_author : "null") . ',';
 		$sql .= ' import_key = ' . (isset($this->import_key) ? "'" . $this->db->escape($this->import_key) . "'" : "null") . ',';
 		$sql .= ' code_journal = ' . (isset($this->code_journal) ? "'" . $this->db->escape($this->code_journal) . "'" : "null") . ',';
+		$sql .= ' journal_label = ' . (isset($this->journal_label) ? "'" . $this->db->escape($this->journal_label) . "'" : "null") . ',';
 		$sql .= ' piece_num = ' . (isset($this->piece_num) ? $this->piece_num : "null");
 		$sql .= ' WHERE rowid=' . $this->id;
 
@@ -1185,6 +1206,7 @@ class BookKeeping extends CommonObject
 		$this->fk_user_author = $user->id;
 		$this->import_key = '';
 		$this->code_journal = '';
+		$this->journal_label = '';
 		$this->piece_num = '';
 	}
 
@@ -1197,7 +1219,7 @@ class BookKeeping extends CommonObject
 	public function fetchPerMvt($piecenum) {
 		global $conf;
 
-		$sql = "SELECT piece_num,doc_date,code_journal,doc_ref,doc_type";
+		$sql = "SELECT piece_num,doc_date,code_journal,journal_label,doc_ref,doc_type";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql .= " WHERE piece_num = " . $piecenum;
 		$sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
@@ -1209,6 +1231,7 @@ class BookKeeping extends CommonObject
 
 			$this->piece_num = $obj->piece_num;
 			$this->code_journal = $obj->code_journal;
+			$this->journal_label = $obj->journal_label;
 			$this->doc_date = $this->db->jdate($obj->doc_date);
 			$this->doc_ref = $obj->doc_ref;
 			$this->doc_type = $obj->doc_type;
@@ -1260,7 +1283,7 @@ class BookKeeping extends CommonObject
 		$sql = "SELECT rowid, doc_date, doc_type,";
 		$sql .= " doc_ref, fk_doc, fk_docdet, code_tiers,";
 		$sql .= " numero_compte, label_compte, debit, credit,";
-		$sql .= " montant, sens, fk_user_author, import_key, code_journal, piece_num";
+		$sql .= " montant, sens, fk_user_author, import_key, code_journal, journal_label, piece_num";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql .= " WHERE piece_num = " . $piecenum;
 		$sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
@@ -1288,6 +1311,7 @@ class BookKeeping extends CommonObject
 				$line->montant = $obj->montant;
 				$line->sens = $obj->sens;
 				$line->code_journal = $obj->code_journal;
+				$line->journal_label = $obj->journal_label;
 				$line->piece_num = $obj->piece_num;
 
 				$this->linesmvt[] = $line;
@@ -1533,5 +1557,6 @@ class BookKeepingLine
 	public $fk_user_author;
 	public $import_key;
 	public $code_journal;
+	public $journal_label;
 	public $piece_num;
 }
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index cb3afb95f5a..9eae2072243 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -28,8 +28,6 @@
  * \brief 		Page with bank journal
  */
 require '../../main.inc.php';
-
-// Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/bank.lib.php';
@@ -53,8 +51,6 @@ require_once DOL_DOCUMENT_ROOT . '/societe/class/client.class.php';
 require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
 require_once DOL_DOCUMENT_ROOT . '/expensereport/class/paymentexpensereport.class.php';
 
-
-// Langs
 $langs->load("companies");
 $langs->load("other");
 $langs->load("compta");
@@ -77,6 +73,7 @@ $date_endyear = GETPOST('date_endyear');
 $action = GETPOST('action','aZ09');
 
 $now = dol_now();
+$action = GETPOST('action','aZ09');
 
 // Security check
 if ($user->societe_id > 0 && empty($id_journal))
@@ -120,7 +117,7 @@ $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "bank_url as bu2 ON bu2.fk_bank = b.row
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as soc on bu1.url_id=soc.rowid";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "user as u on bu2.url_id=u.rowid";
 $sql .= " WHERE ba.fk_accountancy_journal=" . $id_journal;
-$sql .= ' AND ba.entity IN ('.getEntity('bank_account', 0).')';        // We don't share object for accountancy
+$sql .= ' AND ba.entity IN ('.getEntity('bank_account', 0).')';		// We don't share object for accountancy
 if ($date_start && $date_end)
 	$sql .= " AND b.dateo >= '" . $db->idate($date_start) . "' AND b.dateo <= '" . $db->idate($date_end) . "'";
 $sql .= " ORDER BY b.datev";
@@ -140,6 +137,7 @@ $paymentexpensereportstatic = new PaymentExpenseReport($db);
 $accountingjournalstatic = new AccountingJournal($db);
 $accountingjournalstatic->fetch($id_journal);
 $journal = $accountingjournalstatic->code;
+$journal_label = $accountingjournalstatic->label;
 
 dol_syslog("accountancy/journal/bankjournal.php", LOG_DEBUG);
 $result = $db->query($sql);
@@ -210,11 +208,11 @@ if ($result) {
 			// Now loop on each link of record in bank.
 			foreach ( $links as $key => $val ) {
 
-			    if (in_array($links[$key]['type'], array('sc', 'payment_sc', 'payment', 'payment_supplier', 'payment_vat', 'payment_expensereport', 'banktransfert', 'payment_donation', 'payment_salary')))     // So we excluded 'company' here
-			    {
-			        // We save tabtype for a future use, to remember what kind of payment it is
-			        $tabtype[$obj->rowid] = $links[$key]['type'];
-			    }
+				if (in_array($links[$key]['type'], array('sc', 'payment_sc', 'payment', 'payment_supplier', 'payment_vat', 'payment_expensereport', 'banktransfert', 'payment_donation', 'payment_salary')))	 // So we excluded 'company' here
+				{
+					// We save tabtype for a future use, to remember what kind of payment it is
+					$tabtype[$obj->rowid] = $links[$key]['type'];
+				}
 
 				if ($links[$key]['type'] == 'payment') {
 					$paymentstatic->id = $links[$key]['url_id'];
@@ -298,22 +296,22 @@ if ($result) {
 
 
 		// Check account number is ok
-		/*if ($action == 'writebookkeeping')        // Make test now in such a case
+		/*if ($action == 'writebookkeeping')		// Make test now in such a case
 		{
-    		reset($tabbq[$obj->rowid]);
-    		$first_key_tabbq = key($tabbq[$obj->rowid]);
-    		if (empty($first_key_tabbq))
-    		{
-    		    $error++;
-    		    setEventMessages($langs->trans('ErrorAccountancyCodeOnBankAccountNotDefined', $obj->baref), null, 'errors');
-    		}
-    		reset($tabtp[$obj->rowid]);
-    		$first_key_tabtp = key($tabtp[$obj->rowid]);
-    		if (empty($first_key_tabtp))
-    		{
-    	        $error++;
-    	        setEventMessages($langs->trans('ErrorAccountancyCodeOnThirdPartyNotDefined'), null, 'errors');
-    		}
+			reset($tabbq[$obj->rowid]);
+			$first_key_tabbq = key($tabbq[$obj->rowid]);
+			if (empty($first_key_tabbq))
+			{
+				$error++;
+				setEventMessages($langs->trans('ErrorAccountancyCodeOnBankAccountNotDefined', $obj->baref), null, 'errors');
+			}
+			reset($tabtp[$obj->rowid]);
+			$first_key_tabtp = key($tabtp[$obj->rowid]);
+			if (empty($first_key_tabtp))
+			{
+				$error++;
+				setEventMessages($langs->trans('ErrorAccountancyCodeOnThirdPartyNotDefined'), null, 'errors');
+			}
 		}*/
 
 		// if($obj->socid)$tabtp[$obj->rowid][$compta_soc] += $obj->amount;
@@ -335,76 +333,77 @@ if (! $error && $action == 'writebookkeeping') {
 	$now = dol_now();
 
 	$error = 0;
-	foreach ( $tabpay as $key => $val ) {      // $key is rowid into llx_bank
+	foreach ( $tabpay as $key => $val ) {	  // $key is rowid into llx_bank
 
-	    $errorforline = 0;
+		$errorforline = 0;
 
-	    $db->begin();
+		$db->begin();
 
 		// Bank
 		if (! $errorforline)
 		{
-		    // Line into bank account
-    		foreach ( $tabbq[$key] as $k => $mt )
-    		{
-    			if ($mt) {
-        		    $bookkeeping = new BookKeeping($db);
-        			$bookkeeping->doc_date = $val["date"];
-        			$bookkeeping->doc_ref = $val["ref"];
-        			$bookkeeping->doc_type = 'bank';
-        			$bookkeeping->fk_doc = $key;
-        			$bookkeeping->fk_docdet = $val["fk_bank"];
-        			$bookkeeping->numero_compte = $k;
-        			$bookkeeping->label_compte = $compte->label;
-        			$bookkeeping->montant = ($mt < 0 ? - $mt : $mt);
-        			$bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
-        			$bookkeeping->debit = ($mt >= 0 ? $mt : 0);
-        			$bookkeeping->credit = ($mt < 0 ? - $mt : 0);
-        			$bookkeeping->code_journal = $journal;
-        			$bookkeeping->fk_user_author = $user->id;
-        			$bookkeeping->date_create = $now;
+			// Line into bank account
+			foreach ( $tabbq[$key] as $k => $mt )
+			{
+				if ($mt) {
+					$bookkeeping = new BookKeeping($db);
+					$bookkeeping->doc_date = $val["date"];
+					$bookkeeping->doc_ref = $val["ref"];
+					$bookkeeping->doc_type = 'bank';
+					$bookkeeping->fk_doc = $key;
+					$bookkeeping->fk_docdet = $val["fk_bank"];
+					$bookkeeping->numero_compte = $k;
+					$bookkeeping->label_compte = $compte->label;
+					$bookkeeping->montant = ($mt < 0 ? - $mt : $mt);
+					$bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
+					$bookkeeping->debit = ($mt >= 0 ? $mt : 0);
+					$bookkeeping->credit = ($mt < 0 ? - $mt : 0);
+					$bookkeeping->code_journal = $journal;
+					$bookkeeping->journal_label = $journal_label;
+					$bookkeeping->fk_user_author = $user->id;
+					$bookkeeping->date_create = $now;
 
-        			if ($tabtype[$key] == 'payment') {
-        			    $bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
+					if ($tabtype[$key] == 'payment') {
+						$bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
 
-        				$sqlmid = 'SELECT fac.facnumber';
-        				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac";
-        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON payfac.fk_facture=fac.rowid";
-        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
-        				$sqlmid .= " WHERE pay.fk_bank=" . $key;
-        				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-        				$resultmid = $db->query($sqlmid);
-        				if ($resultmid) {
-        					$objmid = $db->fetch_object($resultmid);
-        					$bookkeeping->doc_ref = $objmid->facnumber;    // Ref of invoice
-        				}
-        			} else if ($tabtype[$key] == 'payment_supplier') {
-        			    $bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
+						$sqlmid = 'SELECT fac.facnumber';
+						$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac";
+						$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON payfac.fk_facture=fac.rowid";
+						$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
+						$sqlmid .= " WHERE pay.fk_bank=" . $key;
+						dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+						$resultmid = $db->query($sqlmid);
+						if ($resultmid) {
+							$objmid = $db->fetch_object($resultmid);
+							$bookkeeping->doc_ref = $objmid->facnumber;	// Ref of invoice
+						}
+					} else if ($tabtype[$key] == 'payment_supplier') {
+						$bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
 
-        				$sqlmid = 'SELECT facf.ref_supplier, facf.ref';
-        				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf";
-        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON payfacf.fk_facturefourn=facf.rowid";
-        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn as payf ON  payfacf.fk_paiementfourn=payf.rowid";
-        				$sqlmid .= " WHERE payf.fk_bank=" . $key;
-        				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-        				$resultmid = $db->query($sqlmid);
-        				if ($resultmid) {
-        					$objmid = $db->fetch_object($resultmid);
-        					$bookkeeping->doc_ref = $objmid->ref_supplier . ' (' . $objmid->ref . ')'; // Ref on invoice
-        				}
-        			} else if ($tabtype[$key] == 'payment_expensereport') {
-        			    $bookkeeping->code_tiers = $tabuser[$key]['accountancy_code'];
+						$sqlmid = 'SELECT facf.ref_supplier, facf.ref';
+						$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf";
+						$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON payfacf.fk_facturefourn=facf.rowid";
+						$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn as payf ON  payfacf.fk_paiementfourn=payf.rowid";
+						$sqlmid .= " WHERE payf.fk_bank=" . $key;
+						dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+						$resultmid = $db->query($sqlmid);
+						if ($resultmid) {
+							$objmid = $db->fetch_object($resultmid);
+							$bookkeeping->doc_ref = $objmid->ref_supplier . ' (' . $objmid->ref . ')'; // Ref on invoice
+						}
+					} else if ($tabtype[$key] == 'payment_expensereport') {
+						$bookkeeping->code_tiers = $tabuser[$key]['accountancy_code'];
 
-        				$sqlmid = 'SELECT e.ref';
-        				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "expensereport as e";
-        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "payment_expensereport as payer ON payer.fk_expensereport=e.rowid";
-        				$sqlmid .= " WHERE payer.fk_expensereport=" . $val["fk_expensereport"];
-        				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-        				$resultmid = $db->query($sqlmid);
-        				if ($resultmid) {
-        					$objmid = $db->fetch_object($resultmid);
-        					$bookkeeping->doc_ref = $objmid->ref; // Ref of expensereport
-        				}
+						$sqlmid = 'SELECT e.ref';
+						$sqlmid .= " FROM " . MAIN_DB_PREFIX . "expensereport as e";
+						$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "payment_expensereport as payer ON payer.fk_expensereport=e.rowid";
+						$sqlmid .= " WHERE payer.fk_expensereport=" . $val["fk_expensereport"];
+						dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+						$resultmid = $db->query($sqlmid);
+						if ($resultmid) {
+							$objmid = $db->fetch_object($resultmid);
+							$bookkeeping->doc_ref = $objmid->ref; // Ref of expensereport
+						}
 					} else if ($tabtype[$key] == 'payment_vat') {
 						$bookkeeping->code_tiers = '';
 						$bookkeeping->doc_ref = $langs->trans("PaymentVat") . ' (' . $val["paymentvatid"] . ')'; // Rowid of vat payment
@@ -417,75 +416,76 @@ if (! $error && $action == 'writebookkeeping') {
 						$bookkeeping->doc_ref = $langs->trans("SalaryPayment") . ' (' . $val["paymentsalid"] . ')'; // Ref of salary payment
 					}
 
-        			$result = $bookkeeping->create($user);
-        			if ($result < 0) {
-        				if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-        				{
-        					$error++;
-        					$errorforline++;
-        					//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-        				}
-        				else
-        				{
-    	    				$error++;
-    	    				$errorforline++;
-    	    				setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-        				}
-        			}
-    			}
-    		}
+					$result = $bookkeeping->create($user);
+					if ($result < 0) {
+						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+						{
+							$error++;
+							$errorforline++;
+							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+						}
+						else
+						{
+							$error++;
+							$errorforline++;
+							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+						}
+					}
+				}
+			}
 		}
 
 		// Third party
 		if (! $errorforline)
 		{
-		    // Line into thirdparty account
-    		foreach ( $tabtp[$key] as $k => $mt ) {
-    			if ($mt) {
-        		    $bookkeeping = new BookKeeping($db);
-        			$bookkeeping->doc_date = $val["date"];
-        			$bookkeeping->doc_ref = $val["ref"];
-        			$bookkeeping->doc_type = 'bank';
-        			$bookkeeping->fk_doc = $key;
-        			$bookkeeping->fk_docdet = $val["fk_bank"];
-        			$bookkeeping->label_compte = $tabcompany[$key]['name'];
-        			$bookkeeping->montant = ($mt < 0 ? - $mt : $mt);
-        			$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
-        			$bookkeeping->debit = ($mt < 0 ? - $mt : 0);
-        			$bookkeeping->credit = ($mt >= 0) ? $mt : 0;
-        			$bookkeeping->code_journal = $journal;
-        			$bookkeeping->fk_user_author = $user->id;
-        			$bookkeeping->date_create = $now;
+			// Line into thirdparty account
+			foreach ( $tabtp[$key] as $k => $mt ) {
+				if ($mt) {
+					$bookkeeping = new BookKeeping($db);
+					$bookkeeping->doc_date = $val["date"];
+					$bookkeeping->doc_ref = $val["ref"];
+					$bookkeeping->doc_type = 'bank';
+					$bookkeeping->fk_doc = $key;
+					$bookkeeping->fk_docdet = $val["fk_bank"];
+					$bookkeeping->label_compte = $tabcompany[$key]['name'];
+					$bookkeeping->montant = ($mt < 0 ? - $mt : $mt);
+					$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
+					$bookkeeping->debit = ($mt < 0 ? - $mt : 0);
+					$bookkeeping->credit = ($mt >= 0) ? $mt : 0;
+					$bookkeeping->code_journal = $journal;
+					$bookkeeping->journal_label = $journal_label;
+					$bookkeeping->fk_user_author = $user->id;
+					$bookkeeping->date_create = $now;
 
-        			if (in_array($tabtype[$key], array('sc', 'payment_sc'))) {   // If payment is payment of social contribution
-        				$bookkeeping->code_tiers = '';
-        				$bookkeeping->numero_compte = $k;
-        			} else if ($tabtype[$key] == 'payment') {    // If payment is payment of customer invoice, we get ref of invoice
-        				$sqlmid = 'SELECT fac.facnumber';
-        				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac ";
-        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON  payfac.fk_facture=fac.rowid";
-        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
-        				$sqlmid .= " WHERE pay.fk_bank=" . $key;
-        				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-        				$resultmid = $db->query($sqlmid);
-        				if ($resultmid) {
-        					$objmid = $db->fetch_object($resultmid);
-        					$bookkeeping->doc_ref = $objmid->facnumber;
-        				}
-        				$bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
-        				$bookkeeping->numero_compte = $k;
-        			} else if ($tabtype[$key] == 'payment_supplier') {           // If payment is payment of supplier invoice, we get ref of invoice
-        				$sqlmid = 'SELECT facf.ref_supplier,facf.ref';
-        				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf ";
-        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON  payfacf.fk_facturefourn=facf.rowid";
-        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn as payf ON  payfacf.fk_paiementfourn=payf.rowid";
-        				$sqlmid .= " WHERE payf.fk_bank=" . $key;
-        				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-        				$resultmid = $db->query($sqlmid);
-        				if ($resultmid) {
-        					$objmid = $db->fetch_object($resultmid);
-        					$bookkeeping->doc_ref = $objmid->ref_supplier . ' (' . $objmid->ref . ')';
-        				}
+					if (in_array($tabtype[$key], array('sc', 'payment_sc'))) {   // If payment is payment of social contribution
+						$bookkeeping->code_tiers = '';
+						$bookkeeping->numero_compte = $k;
+					} else if ($tabtype[$key] == 'payment') {	// If payment is payment of customer invoice, we get ref of invoice
+						$sqlmid = 'SELECT fac.facnumber';
+						$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac ";
+						$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON  payfac.fk_facture=fac.rowid";
+						$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
+						$sqlmid .= " WHERE pay.fk_bank=" . $key;
+						dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+						$resultmid = $db->query($sqlmid);
+						if ($resultmid) {
+							$objmid = $db->fetch_object($resultmid);
+							$bookkeeping->doc_ref = $objmid->facnumber;
+						}
+						$bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
+						$bookkeeping->numero_compte = $k;
+					} else if ($tabtype[$key] == 'payment_supplier') {		   // If payment is payment of supplier invoice, we get ref of invoice
+						$sqlmid = 'SELECT facf.ref_supplier,facf.ref';
+						$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf ";
+						$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON  payfacf.fk_facturefourn=facf.rowid";
+						$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn as payf ON  payfacf.fk_paiementfourn=payf.rowid";
+						$sqlmid .= " WHERE payf.fk_bank=" . $key;
+						dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+						$resultmid = $db->query($sqlmid);
+						if ($resultmid) {
+							$objmid = $db->fetch_object($resultmid);
+							$bookkeeping->doc_ref = $objmid->ref_supplier . ' (' . $objmid->ref . ')';
+						}
 						$bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
 						$bookkeeping->numero_compte = $k;
 					} else if ($tabtype[$key] == 'payment_vat') {
@@ -504,52 +504,52 @@ if (! $error && $action == 'writebookkeeping') {
 					} else if ($tabtype[$key] == 'banktransfert') {
 						$bookkeeping->code_tiers = '';
 						$bookkeeping->numero_compte = $k;
-        			} else {
-        			    // FIXME Should be a temporary account ???
-        				$bookkeeping->doc_ref = $k;
-        				//$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
-        				$bookkeeping->numero_compte = 'CodeNotDef';
-        			}
+					} else {
+						// FIXME Should be a temporary account ???
+						$bookkeeping->doc_ref = $k;
+						//$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
+						$bookkeeping->numero_compte = 'CodeNotDef';
+					}
 
-        			$result = $bookkeeping->create($user);
-        			if ($result < 0) {
-        				if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-        				{
-        					$error++;
-        					$errorforline++;
-        					//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-        				}
-        				else
-        				{
-    	    				$error++;
-    	    				$errorforline++;
-    	    				setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-        				}
-        			}
-    			}
-    		}
+					$result = $bookkeeping->create($user);
+					if ($result < 0) {
+						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+						{
+							$error++;
+							$errorforline++;
+							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+						}
+						else
+						{
+							$error++;
+							$errorforline++;
+							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+						}
+					}
+				}
+			}
 		}
 
 		if (! $errorforline)
 		{
-            $db->commit();
+			$db->commit();
 		}
 		else
 		{
-		    $db->rollback();
+			$db->rollback();
 		}
 	}
 
 	if (empty($error)) {
-	    setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
+		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
 	}
 	elseif (count($tabpay) == $error)
 	{
-	    setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
+		setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
 	}
 	else
 	{
-	    setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
+		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
 	}
 
 	$action = '';
@@ -758,24 +758,24 @@ if (empty($action) || $action == 'view') {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
 	}*/
 
-    print '<div class="tabsAction">';
+	print '<div class="tabsAction">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
-    print '</div>';
+	print '</div>';
 
 	// TODO Avoid using js. We can use a direct link with $param
 	print '
 	<script type="text/javascript">
 		function launch_export() {
-	        console.log("Set value into form and submit");
-		    $("div.fiche div.tabBar form input[name=\"action\"]").val("export_csv");
+			console.log("Set value into form and submit");
+			$("div.fiche div.tabBar form input[name=\"action\"]").val("export_csv");
 			$("div.fiche div.tabBar form input[type=\"submit\"]").click();
-		    $("div.fiche div.tabBar form input[name=\"action\"]").val("");
+			$("div.fiche div.tabBar form input[name=\"action\"]").val("");
 		}
 		function writebookkeeping() {
-	        console.log("Set value into form and submit");
-		    $("div.fiche div.tabBar form input[name=\"action\"]").val("writebookkeeping");
+			console.log("Set value into form and submit");
+			$("div.fiche div.tabBar form input[name=\"action\"]").val("writebookkeeping");
 			$("div.fiche div.tabBar form input[type=\"submit\"]").click();
-		    $("div.fiche div.tabBar form input[name=\"action\"]").val("");
+			$("div.fiche div.tabBar form input[name=\"action\"]").val("");
 		}
 	</script>';
 
@@ -799,7 +799,7 @@ if (empty($action) || $action == 'view') {
 
 	$r = '';
 
-	foreach ( $tabpay as $key => $val ) {      // $key is rowid in llx_bank
+	foreach ( $tabpay as $key => $val ) {	  // $key is rowid in llx_bank
 		$date = dol_print_date($db->jdate($val["date"]), 'day');
 
 		$reflabel = $val["ref"];
@@ -825,45 +825,45 @@ if (empty($action) || $action == 'view') {
 		$ref=$reflabel;
 		if ($tabtype[$key] == 'payment')
 		{
-		    $sqlmid = 'SELECT payfac.fk_facture as id';
-		    $sqlmid .= " FROM ".MAIN_DB_PREFIX."paiement_facture as payfac";
-		    $sqlmid .= " WHERE payfac.fk_paiement=" . $val["paymentid"];
-		    dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
-		    $resultmid = $db->query($sqlmid);
-		    if ($resultmid) {
-		        $objmid = $db->fetch_object($resultmid);
-		        $invoicestatic->fetch($objmid->id);
-		        $ref=$langs->trans("Invoice").' '.$invoicestatic->getNomUrl(1);
-		    }
-		    else dol_print_error($db);
+			$sqlmid = 'SELECT payfac.fk_facture as id';
+			$sqlmid .= " FROM ".MAIN_DB_PREFIX."paiement_facture as payfac";
+			$sqlmid .= " WHERE payfac.fk_paiement=" . $val["paymentid"];
+			dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
+			$resultmid = $db->query($sqlmid);
+			if ($resultmid) {
+				$objmid = $db->fetch_object($resultmid);
+				$invoicestatic->fetch($objmid->id);
+				$ref=$langs->trans("Invoice").' '.$invoicestatic->getNomUrl(1);
+			}
+			else dol_print_error($db);
 		}
 		elseif ($tabtype[$key] == 'payment_supplier')
 		{
-		    $sqlmid = 'SELECT payfac.fk_facturefourn as id';
-		    $sqlmid .= " FROM " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfac";
-		    $sqlmid .= " WHERE payfac.fk_paiementfourn=" . $val["paymentsupplierid"];
-		    dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
-		    $resultmid = $db->query($sqlmid);
-		    if ($resultmid) {
-		        $objmid = $db->fetch_object($resultmid);
-		        $invoicesupplierstatic->fetch($objmid->id);
-		        $ref=$langs->trans("SupplierInvoice").' '.$invoicesupplierstatic->getNomUrl(1);
-		    }
-		    else dol_print_error($db);
+			$sqlmid = 'SELECT payfac.fk_facturefourn as id';
+			$sqlmid .= " FROM " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfac";
+			$sqlmid .= " WHERE payfac.fk_paiementfourn=" . $val["paymentsupplierid"];
+			dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
+			$resultmid = $db->query($sqlmid);
+			if ($resultmid) {
+				$objmid = $db->fetch_object($resultmid);
+				$invoicesupplierstatic->fetch($objmid->id);
+				$ref=$langs->trans("SupplierInvoice").' '.$invoicesupplierstatic->getNomUrl(1);
+			}
+			else dol_print_error($db);
 		}
 		elseif ($tabtype[$key] == 'payment_expensereport')
 		{
-		    $sqlmid = 'SELECT payer.fk_expensereport as id';
-		    $sqlmid .= " FROM " . MAIN_DB_PREFIX . "payment_expensereport as payer";
-		    $sqlmid .= " WHERE payer.fk_expensereport=" . $val["fk_expensereport"];
-		    dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
-		    $resultmid = $db->query($sqlmid);
-		    if ($resultmid) {
-		        $objmid = $db->fetch_object($resultmid);
-		        $expensereportstatic->fetch($objmid->id);
-		        $ref=$langs->trans("ExpenseReport").' '.$expensereportstatic->getNomUrl(1);
-		    }
-		    else dol_print_error($db);
+			$sqlmid = 'SELECT payer.fk_expensereport as id';
+			$sqlmid .= " FROM " . MAIN_DB_PREFIX . "payment_expensereport as payer";
+			$sqlmid .= " WHERE payer.fk_expensereport=" . $val["fk_expensereport"];
+			dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
+			$resultmid = $db->query($sqlmid);
+			if ($resultmid) {
+				$objmid = $db->fetch_object($resultmid);
+				$expensereportstatic->fetch($objmid->id);
+				$ref=$langs->trans("ExpenseReport").' '.$expensereportstatic->getNomUrl(1);
+			}
+			else dol_print_error($db);
 		}
 		elseif ($tabtype[$key] == 'payment_vat')
 		{
@@ -881,17 +881,17 @@ if (empty($action) || $action == 'view') {
 		}
 		elseif ($tabtype[$key] == 'payment_donation')
 		{
-		    $sqlmid = 'SELECT payd.fk_donation as id';
-		    $sqlmid .= " FROM " . MAIN_DB_PREFIX . "payment_donation as payd";
-		    $sqlmid .= " WHERE payd.fk_donation=" . $val["paymentdonationid"];
-		    dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
-		    $resultmid = $db->query($sqlmid);
-		    if ($resultmid) {
-		        $objmid = $db->fetch_object($resultmid);
-		        $donationstatic->fetch($objmid->id);
-		        $ref=$langs->trans("Donation").' '.$donationstatic->getNomUrl(1);
-		    }
-		    else dol_print_error($db);
+			$sqlmid = 'SELECT payd.fk_donation as id';
+			$sqlmid .= " FROM " . MAIN_DB_PREFIX . "payment_donation as payd";
+			$sqlmid .= " WHERE payd.fk_donation=" . $val["paymentdonationid"];
+			dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
+			$resultmid = $db->query($sqlmid);
+			if ($resultmid) {
+				$objmid = $db->fetch_object($resultmid);
+				$donationstatic->fetch($objmid->id);
+				$ref=$langs->trans("Donation").' '.$donationstatic->getNomUrl(1);
+			}
+			else dol_print_error($db);
 		}
 		elseif ($tabtype[$key] == 'payment_salary')
 		{
@@ -915,15 +915,15 @@ if (empty($action) || $action == 'view') {
 		// Bank
 		foreach ( $tabbq[$key] as $k => $mt )
 		{
-		    print '<tr class="oddeven">';
-		    print "<td><!-- Bank bank.rowid=".$key."--></td>";
-		    print "<td>" . $date . "</td>";
+			print '<tr class="oddeven">';
+			print "<td><!-- Bank bank.rowid=".$key."--></td>";
+			print "<td>" . $date . "</td>";
 			print "<td>" . $ref . "</td>";
 			print "<td>";
 			$accountoshow = length_accountg($k);
 			if (empty($accountoshow) || $accountoshow == 'NotDefined')
 			{
-			    print '<span class="error">'.$langs->trans("BankAccountNotDefined").'</span>';
+				print '<span class="error">'.$langs->trans("BankAccountNotDefined").'</span>';
 			}
 			else print $accountoshow;
 			print "</td>";
@@ -947,12 +947,12 @@ if (empty($action) || $action == 'view') {
 					print "<td>" . $date . "</td>";
 					print "<td>" . $ref . "</td>";
 					print "<td>";
-        			$accountoshow = length_accounta($k);
-        			if (empty($accountoshow) || $accountoshow == 'NotDefined')
-        			{
-        			    print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
-        			}
-        			else print $accountoshow;
+					$accountoshow = length_accounta($k);
+					if (empty($accountoshow) || $accountoshow == 'NotDefined')
+					{
+						print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
+					}
+					else print $accountoshow;
 					print "</td>";
 					print "<td>" . $reflabel . ' ' . $val['soclib'] . "</td>";
 					print "<td>" . $val["type_payment"] . "</td>";
@@ -968,10 +968,10 @@ if (empty($action) || $action == 'view') {
 				print "<td>" . $date . "</td>";
 				print "<td>" . $ref . "</td>";
 				print "<td>";
-			    if (empty($accountoshow) || $accountoshow == 'NotDefined')
-        		{
-        		    print '<span class="error">'.$langs->trans("WaitAccountNotDefined").'</span>';
-        		}
+				if (empty($accountoshow) || $accountoshow == 'NotDefined')
+				{
+					print '<span class="error">'.$langs->trans("WaitAccountNotDefined").'</span>';
+				}
 				else print length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE);
 				print "</td>";
 				print "<td>" . $reflabel . "</td>";
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index 9bd9f8b7f42..934fb6e51ce 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -22,13 +22,11 @@
  */
 
 /**
- * \file	htdocs/accountancy/journal/expensereportsjournal.php
- * \ingroup	Advanced accountancy
- * \brief	Page with expense reports journal
+ * \file		htdocs/accountancy/journal/expensereportsjournal.php
+ * \ingroup		Advanced accountancy
+ * \brief		Page with expense reports journal
  */
 require '../../main.inc.php';
-
-// Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
@@ -38,7 +36,6 @@ require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
 require_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
 
-// Langs
 $langs->load("compta");
 $langs->load("bills");
 $langs->load("other");
@@ -46,8 +43,8 @@ $langs->load("main");
 $langs->load("accountancy");
 $langs->load("trips");
 
-// Multi journal
 $id_journal = GETPOST('id_journal', 'int');
+$action = GETPOST('action','aZ09');
 
 $date_startmonth = GETPOST('date_startmonth');
 $date_startday = GETPOST('date_startday');
@@ -62,16 +59,15 @@ $now = dol_now();
 if ($user->societe_id > 0)
 	accessforbidden();
 
-$action = GETPOST('action','aZ09');
-
-
 /*
  * Actions
  */
-// Get code of finance journal
+ 
+// Get informations of journal
 $accountingjournalstatic = new AccountingJournal($db);
 $accountingjournalstatic->fetch($id_journal);
 $journal = $accountingjournalstatic->code;
+$journal_label = $accountingjournalstatic->label;
 
 $year_current = strftime("%Y", dol_now());
 $pastmonth = strftime("%m", dol_now()) - 1;
@@ -187,6 +183,7 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->debit = ($mt <= 0) ? $mt : 0;
 					$bookkeeping->credit = ($mt > 0) ? $mt : 0;
 					$bookkeeping->code_journal = $journal;
+					$bookkeeping->journal_label = $journal_label;
 					$bookkeeping->fk_user_author = $user->id;
 
 					$result = $bookkeeping->create($user);
@@ -233,6 +230,7 @@ if ($action == 'writebookkeeping') {
 						$bookkeeping->debit = ($mt > 0) ? $mt : 0;
 						$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
 						$bookkeeping->code_journal = $journal;
+						$bookkeeping->journal_label = $journal_label;
 						$bookkeeping->fk_user_author = $user->id;
 
 						$result = $bookkeeping->create($user);
@@ -277,6 +275,7 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->debit = ($mt > 0) ? $mt : 0;
 					$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
 					$bookkeeping->code_journal = $journal;
+					$bookkeeping->journal_label = $journal_label;
 					$bookkeeping->fk_user_author = $user->id;
 
 					$result = $bookkeeping->create($user);
@@ -444,7 +443,7 @@ if (empty($action) || $action == 'view') {
 
 	llxHeader('', $langs->trans("ExpenseReportsJournal"));
 
-	$nom = $langs->trans("ExpenseReportsJournal");
+	$nom = $langs->trans("ExpenseReportsJournal") . ' - ' . $accountingjournalstatic->getNomUrl(1);
 	$nomlink = '';
 	$periodlink = '';
 	$exportlink = '';
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index f9cd162b6a0..e0237285b2e 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -1,11 +1,11 @@
 <?php
-/* Copyright (C) 2007-2010	Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2007-2010	Jean Heimburger		<jean@tiaris.info>
- * Copyright (C) 2011		Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2012		Regis Houssin		<regis@dolibarr.fr>
- * Copyright (C) 2013-2015  Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
+/* Copyright (C) 2007-2010  Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2007-2010  Jean Heimburger		<jean@tiaris.info>
+ * Copyright (C) 2011       Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2012       Regis Houssin		<regis@dolibarr.fr>
+ * Copyright (C) 2013-2015  Alexandre Spangaro	<aspangaro@zendsi.com>
  * Copyright (C) 2013-2016  Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2013-2016  Florian Henry	    <florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2016  Florian Henry		<florian.henry@open-concept.pro>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,28 +22,29 @@
  */
 
 /**
- * \file htdocs/accountancy/journal/purchasesjournal.php
- * \ingroup Advanced accountancy
- * \brief Page with purchases journal
+ * \file		htdocs/accountancy/journal/purchasesjournal.php
+ * \ingroup		Advanced accountancy
+ * \brief		Page with purchases journal
  */
 require '../../main.inc.php';
-
-// Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 
-// Langs
 $langs->load("compta");
 $langs->load("bills");
 $langs->load("other");
 $langs->load("main");
 $langs->load("accountancy");
 
+$id_journal = GETPOST('id_journal', 'int');
+$action = GETPOST('action','aZ09');
+
 $date_startmonth = GETPOST('date_startmonth');
 $date_startday = GETPOST('date_startday');
 $date_startyear = GETPOST('date_startyear');
@@ -57,13 +58,16 @@ $now = dol_now();
 if ($user->societe_id > 0)
 	accessforbidden();
 
-$action = GETPOST('action','aZ09');
-
-
 /*
  * Actions
  */
 
+// Get informations of journal
+$accountingjournalstatic = new AccountingJournal($db);
+$accountingjournalstatic->fetch($id_journal);
+$journal = $accountingjournalstatic->code;
+$journal_label = $accountingjournalstatic->label;
+
 $year_current = strftime("%Y", dol_now());
 $pastmonth = strftime("%m", dol_now()) - 1;
 $pastmonthyear = $year_current;
@@ -148,11 +152,11 @@ if ($result) {
 		$tabfac[$obj->rowid]["type"] = $obj->type;
 		$tabfac[$obj->rowid]["description"] = $obj->description;
 		//$tabfac[$obj->rowid]["fk_facturefourndet"] = $obj->fdid;
-		
-        // Avoid warnings
-        if (! isset($tabttc[$obj->rowid][$compta_soc])) $tabttc[$obj->rowid][$compta_soc] = 0;
-        if (! isset($tabht[$obj->rowid][$compta_prod])) $tabht[$obj->rowid][$compta_prod] = 0;
-        if (! isset($tabtva[$obj->rowid][$compta_tva])) $tabtva[$obj->rowid][$compta_tva] = 0;
+
+		// Avoid warnings
+		if (! isset($tabttc[$obj->rowid][$compta_soc])) $tabttc[$obj->rowid][$compta_soc] = 0;
+		if (! isset($tabht[$obj->rowid][$compta_prod])) $tabht[$obj->rowid][$compta_prod] = 0;
+		if (! isset($tabtva[$obj->rowid][$compta_tva])) $tabtva[$obj->rowid][$compta_tva] = 0;
 
 		$tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc;
 		$tabht[$obj->rowid][$compta_prod] += $obj->total_ht;
@@ -177,10 +181,10 @@ if ($action == 'writebookkeeping') {
 
 	foreach ($tabfac as $key => $val)  // Loop on each invoice
 	{
-	    $errorforline = 0;
-	     
-	    $db->begin();
-	     
+		$errorforline = 0;
+
+		$db->begin();
+
 		$companystatic = new Societe($db);
 		$invoicestatic = new FactureFournisseur($db);
 
@@ -198,160 +202,161 @@ if ($action == 'writebookkeeping') {
 		$companystatic->code_fournisseur = $tabcompany[$key]['code_fournisseur'];
 		$companystatic->client = $tabcompany[$key]['code_client'];
 
-        if (! $errorforline)
-        {
-    		foreach ( $tabttc[$key] as $k => $mt ) {
-    			// get compte id and label
-    		    if ($mt) {
-        			$bookkeeping = new BookKeeping($db);
-        			$bookkeeping->doc_date = $val["date"];
-        			$bookkeeping->doc_ref = $val["ref"];
-        			$bookkeeping->date_create = $now;
-        			$bookkeeping->doc_type = 'supplier_invoice';
-        			$bookkeeping->fk_doc = $key;
-        			$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
-        			$bookkeeping->code_tiers = $tabcompany[$key]['code_fournisseur'];
-        			$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("Code_tiers");
-        			$bookkeeping->numero_compte = $tabcompany[$key]['code_compta_fournisseur'];
-        			$bookkeeping->montant = $mt;
-        			$bookkeeping->sens = ($mt >= 0) ? 'C' : 'D';
-        			$bookkeeping->debit = ($mt <= 0) ? $mt : 0;
-        			$bookkeeping->credit = ($mt > 0) ? $mt : 0;
-        			$bookkeeping->code_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
-        			$bookkeeping->fk_user_author = $user->id;
-        
-        			$result = $bookkeeping->create($user);
-           			if ($result < 0) {
-                        if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-                        {
-                            $error++;
-                            $errorforline++;
-                            //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-                        }
-                        else
-                        {
-                            $error++;
-                            $errorforline++;
-                            setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-                        }
-        			}
-    		    }
-    		}
-        }
-        
+		if (! $errorforline)
+		{
+			foreach ( $tabttc[$key] as $k => $mt ) {
+				// get compte id and label
+				if ($mt) {
+					$bookkeeping = new BookKeeping($db);
+					$bookkeeping->doc_date = $val["date"];
+					$bookkeeping->doc_ref = $val["ref"];
+					$bookkeeping->date_create = $now;
+					$bookkeeping->doc_type = 'supplier_invoice';
+					$bookkeeping->fk_doc = $key;
+					$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
+					$bookkeeping->code_tiers = $tabcompany[$key]['code_fournisseur'];
+					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("Code_tiers");
+					$bookkeeping->numero_compte = $tabcompany[$key]['code_compta_fournisseur'];
+					$bookkeeping->montant = $mt;
+					$bookkeeping->sens = ($mt >= 0) ? 'C' : 'D';
+					$bookkeeping->debit = ($mt <= 0) ? $mt : 0;
+					$bookkeeping->credit = ($mt > 0) ? $mt : 0;
+					$bookkeeping->code_journal = $journal;
+					$bookkeeping->journal_label = $journal_label;
+					$bookkeeping->fk_user_author = $user->id;
+
+					$result = $bookkeeping->create($user);
+					if ($result < 0) {
+						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+						{
+							$error++;
+							$errorforline++;
+							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+						}
+						else
+						{
+							$error++;
+							$errorforline++;
+							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+						}
+					}
+				}
+			}
+		}
+
 		// Product / Service
-        if (! $errorforline)
-        {
-            foreach ( $tabht[$key] as $k => $mt ) {
-    			$accountingaccount = new AccountingAccount($db);
-    			$accountingaccount->fetch(null, $k, true);
-    			if ($mt) {
-    				// get compte id and label
-    				$accountingaccount = new AccountingAccount($db);
-    				if ($accountingaccount->fetch(null, $k, true)) {
-    					$bookkeeping = new BookKeeping($db);
-    					$bookkeeping->doc_date = $val["date"];
-    					$bookkeeping->doc_ref = $val["ref"];
-    					$bookkeeping->date_create = $now;
-    					$bookkeeping->doc_type = 'supplier_invoice';
-    					$bookkeeping->fk_doc = $key;
-    					$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
-    					$bookkeeping->code_tiers = '';
-    					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $accountingaccount->label;
-    					$bookkeeping->numero_compte = $k;
-    					$bookkeeping->montant = $mt;
-    					$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
-    					$bookkeeping->debit = ($mt > 0) ? $mt : 0;
-    					$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
-    					$bookkeeping->code_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
-    					$bookkeeping->fk_user_author = $user->id;
-    
-    					$result = $bookkeeping->create($user);
-    					if ($result < 0) {
-    					    if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-            			    {
-            			        $error++;
-            			        $errorforline++;
-            			        //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-            			    }
-            			    else
-            			    {
-            			        $error++;
-            			        $errorforline++;
-            			        setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-            			    }
-    					}
-    				}
-    			}
-    		}
-        }
-        
+		if (! $errorforline)
+		{
+			foreach ( $tabht[$key] as $k => $mt ) {
+				$accountingaccount = new AccountingAccount($db);
+				$accountingaccount->fetch(null, $k, true);
+				if ($mt) {
+					// get compte id and label
+					$accountingaccount = new AccountingAccount($db);
+					if ($accountingaccount->fetch(null, $k, true)) {
+						$bookkeeping = new BookKeeping($db);
+						$bookkeeping->doc_date = $val["date"];
+						$bookkeeping->doc_ref = $val["ref"];
+						$bookkeeping->date_create = $now;
+						$bookkeeping->doc_type = 'supplier_invoice';
+						$bookkeeping->fk_doc = $key;
+						$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
+						$bookkeeping->code_tiers = '';
+						$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $accountingaccount->label;
+						$bookkeeping->numero_compte = $k;
+						$bookkeeping->montant = $mt;
+						$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
+						$bookkeeping->debit = ($mt > 0) ? $mt : 0;
+						$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
+						$bookkeeping->code_journal = $journal;
+						$bookkeeping->journal_label = $journal_label;
+						$bookkeeping->fk_user_author = $user->id;
+
+						$result = $bookkeeping->create($user);
+						if ($result < 0) {
+							if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+							{
+								$error++;
+								$errorforline++;
+								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+							}
+							else
+							{
+								$error++;
+								$errorforline++;
+								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+							}
+						}
+					}
+				}
+			}
+		}
+
 		// VAT
 		// var_dump($tabtva);
-        if (! $errorforline)
-        {
-            foreach ( $tabtva[$key] as $k => $mt ) {
-    			if ($mt) {
-    				// get compte id and label
-    				$bookkeeping = new BookKeeping($db);
-    				$bookkeeping->doc_date = $val["date"];
-    				$bookkeeping->doc_ref = $val["ref"];
-    				$bookkeeping->date_create = $now;
-    				$bookkeeping->doc_type = 'supplier_invoice';
-    				$bookkeeping->fk_doc = $key;
-    				$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
-    				$bookkeeping->code_tiers = '';
-    				$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("VAT"). ' '.$def_tva[$key];
-    				$bookkeeping->numero_compte = $k;
-    				$bookkeeping->montant = $mt;
-    				$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
-    				$bookkeeping->debit = ($mt > 0) ? $mt : 0;
-    				$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
-    				$bookkeeping->code_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
-    				$bookkeeping->fk_user_author = $user->id;
-    
-    				$result = $bookkeeping->create($user);
-    				if ($result < 0) {
-    				    if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-    				    {
-    				        $error++;
-    				        $errorforline++;
-    				        //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-    				    }
-    				    else
-    				    {
-    				        $error++;
-    				        $errorforline++;
-    				        setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-    				    }
-    				}
-    			}
-    		}
-        }
+		if (! $errorforline)
+		{
+			foreach ( $tabtva[$key] as $k => $mt ) {
+				if ($mt) {
+					// get compte id and label
+					$bookkeeping = new BookKeeping($db);
+					$bookkeeping->doc_date = $val["date"];
+					$bookkeeping->doc_ref = $val["ref"];
+					$bookkeeping->date_create = $now;
+					$bookkeeping->doc_type = 'supplier_invoice';
+					$bookkeeping->fk_doc = $key;
+					$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
+					$bookkeeping->code_tiers = '';
+					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("VAT"). ' '.$def_tva[$key];
+					$bookkeeping->numero_compte = $k;
+					$bookkeeping->montant = $mt;
+					$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
+					$bookkeeping->debit = ($mt > 0) ? $mt : 0;
+					$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
+					$bookkeeping->code_journal = $journal;
+					$bookkeeping->journal_label = $journal_label;
+					$bookkeeping->fk_user_author = $user->id;
+
+					$result = $bookkeeping->create($user);
+					if ($result < 0) {
+						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+						{
+							$error++;
+							$errorforline++;
+							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+						}
+						else
+						{
+							$error++;
+							$errorforline++;
+							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+						}
+					}
+				}
+			}
+		}
 
 		if (! $errorforline)
 		{
-		    $db->commit();
+			$db->commit();
 		}
 		else
 		{
-		    $db->rollback();
+			$db->rollback();
 		}
-		
 	}
 
 	if (empty($error) && count($tabpay)) {
-	    setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
+		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
 	}
 	elseif (count($tabpay) == $error)
 	{
-	    setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
+		setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
 	}
 	else
 	{
-	    setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
+		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
 	}
-	
 	$action='';
 }
 
@@ -488,7 +493,7 @@ if (empty($action) || $action == 'view') {
 
 	llxHeader('', $langs->trans("PurchasesJournal"));
 
-	$nom = $langs->trans("PurchasesJournal");
+	$nom = $langs->trans("PurchasesJournal") . ' - ' . $accountingjournalstatic->getNomUrl(1);
 	$nomlink = '';
 	$periodlink = '';
 	$exportlink = '';
@@ -502,8 +507,10 @@ if (empty($action) || $action == 'view') {
 	}
 
 	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
-	
-	journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''));
+
+	$varlink = 'id_journal=' . $id_journal;
+
+	journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''), '', $varlink);
 
 	/*if ($conf->global->ACCOUNTING_EXPORT_MODELCSV != 1 && $conf->global->ACCOUNTING_EXPORT_MODELCSV != 2) {
 		print '<input type="button" class="butActionRefused" style="float: right;" value="' . $langs->trans("Export") . '" disabled="disabled" title="' . $langs->trans('ExportNotSupported') . '"/>';
@@ -511,21 +518,21 @@ if (empty($action) || $action == 'view') {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
 	}*/
 
-    print '<div class="tabsAction">';
+	print '<div class="tabsAction">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
-    print '</div>';
-    
+	print '</div>';
+
 	print '
 	<script type="text/javascript">
 		function launch_export() {
-		    $("div.fiche div.tabBar form input[name=\"action\"]").val("export_csv");
+			$("div.fiche div.tabBar form input[name=\"action\"]").val("export_csv");
 			$("div.fiche div.tabBar form input[type=\"submit\"]").click();
-		    $("div.fiche div.tabBar form input[name=\"action\"]").val("");
+			$("div.fiche div.tabBar form input[name=\"action\"]").val("");
 		}
 		function writebookkeeping() {
-		    $("div.fiche div.tabBar form input[name=\"action\"]").val("writebookkeeping");
+			$("div.fiche div.tabBar form input[name=\"action\"]").val("writebookkeeping");
 			$("div.fiche div.tabBar form input[type=\"submit\"]").click();
-		    $("div.fiche div.tabBar form input[name=\"action\"]").val("");
+			$("div.fiche div.tabBar form input[name=\"action\"]").val("");
 		}
 	</script>';
 
@@ -537,7 +544,6 @@ if (empty($action) || $action == 'view') {
 	$i = 0;
 	print "<table class=\"noborder\" width=\"100%\">";
 	print "<tr class=\"liste_titre\">";
-	// /print "<td>".$langs->trans("JournalNum")."</td>";
 	print "<td></td>";
 	print "<td>" . $langs->trans("Date") . "</td>";
 	print "<td>" . $langs->trans("Piece") . ' (' . $langs->trans("InvoiceRef") . ")</td>";
@@ -574,12 +580,12 @@ if (empty($action) || $action == 'view') {
 				print "<td>" . $date . "</td>";
 				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
 				print "<td>";
-    			$accountoshow = length_accountg($k);
-    			if (empty($accountoshow) || $accountoshow == 'NotDefined')
-    			{
-    			    print '<span class="error">'.$langs->trans("ProductAccountNotDefined").'</span>';
-    			}
-    			else print $accountoshow;
+				$accountoshow = length_accountg($k);
+				if (empty($accountoshow) || $accountoshow == 'NotDefined')
+				{
+					print '<span class="error">'.$langs->trans("ProductAccountNotDefined").'</span>';
+				}
+				else print $accountoshow;
 				print "</td>";
 				$companystatic->id = $tabcompany[$key]['id'];
 				$companystatic->name = $tabcompany[$key]['name'];
@@ -590,6 +596,7 @@ if (empty($action) || $action == 'view') {
 				print "</tr>";
 			}
 		}
+
 		// VAT
 		foreach ( $tabtva[$key] as $k => $mt ) {
 			if ($mt) {
@@ -598,12 +605,12 @@ if (empty($action) || $action == 'view') {
 				print "<td>" . $date . "</td>";
 				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
 				print "<td>";
-    			$accountoshow = length_accountg($k);
-    			if (empty($accountoshow) || $accountoshow == 'NotDefined')
-    			{
-    			    print '<span class="error">'.$langs->trans("VatAccountNotDefined").'</span>';
-    			}
-    			else print $accountoshow;
+				$accountoshow = length_accountg($k);
+				if (empty($accountoshow) || $accountoshow == 'NotDefined')
+				{
+					print '<span class="error">'.$langs->trans("VatAccountNotDefined").'</span>';
+				}
+				else print $accountoshow;
 				print "</td>";
 				print "<td>" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("VAT"). ' '.$def_tva[$key]. "</td>";
 				print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
@@ -614,9 +621,9 @@ if (empty($action) || $action == 'view') {
 
 		// Third party
 		foreach ( $tabttc[$key] as $k => $mt ) {
-		    print '<tr class="oddeven">';
-		    print "<td><!-- Thirdparty --></td>";
-		    print "<td>" . $date . "</td>";
+			print '<tr class="oddeven">';
+			print "<td><!-- Thirdparty --></td>";
+			print "<td>" . $date . "</td>";
 			print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
 			$companystatic->id = $tabcompany[$key]['id'];
 			$companystatic->name = $tabcompany[$key]['name'];
@@ -624,10 +631,10 @@ if (empty($action) || $action == 'view') {
 			$accountoshow = length_accounta($k);
 			if (empty($accountoshow) || $accountoshow == 'NotDefined')
 			{
-			    print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
+				print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
 			}
 			else print $accountoshow;
-            print "</td>";
+			print "</td>";
 			print "<td>" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("Code_tiers") . "</td>";
 			// print "</td><td>" . $langs->trans("ThirdParty");
 			// print ' (' . $companystatic->getNomUrl(0, 'supplier', 16) . ')';
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 85ce7361394..0d2e7ac19cc 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -1,13 +1,13 @@
 <?php
-/* Copyright (C) 2007-2010	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2007-2010	Jean Heimburger			<jean@tiaris.info>
- * Copyright (C) 2011		Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2012		Regis Houssin			<regis@dolibarr.fr>
- * Copyright (C) 2013		Christophe Battarel		<christophe.battarel@altairis.fr>
- * Copyright (C) 2013-2016	Alexandre Spangaro		<aspangaro.dolibarr@gmail.com>
- * Copyright (C) 2013-2016	Florian Henry			<florian.henry@open-concept.pro>
- * Copyright (C) 2013-2016	Olivier Geffroy			<jeff@jeffinfo.com>
- * Copyright (C) 2014		Raphaël Doursenaud		<rdoursenaud@gpcsolutions.fr>
+/* Copyright (C) 2007-2010  Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2007-2010  Jean Heimburger			<jean@tiaris.info>
+ * Copyright (C) 2011	   Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2012	   Regis Houssin			<regis@dolibarr.fr>
+ * Copyright (C) 2013	   Christophe Battarel		<christophe.battarel@altairis.fr>
+ * Copyright (C) 2013-2017  Alexandre Spangaro		<aspangaro@zendsi.com>
+ * Copyright (C) 2013-2016  Florian Henry			<florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2016  Olivier Geffroy			<jeff@jeffinfo.com>
+ * Copyright (C) 2014	   Raphaël Doursenaud		<rdoursenaud@gpcsolutions.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,17 +29,15 @@
  * \brief		Page with sells journal
  */
 require '../../main.inc.php';
-
-// Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT . '/societe/class/client.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 
-// Langs
 $langs->load("commercial");
 $langs->load("compta");
 $langs->load("bills");
@@ -47,6 +45,9 @@ $langs->load("other");
 $langs->load("main");
 $langs->load("accountancy");
 
+$id_journal = GETPOST('id_journal', 'int');
+$action = GETPOST('action','aZ09');
+
 $date_startmonth = GETPOST('date_startmonth');
 $date_startday = GETPOST('date_startday');
 $date_startyear = GETPOST('date_startyear');
@@ -60,19 +61,23 @@ $now = dol_now();
 if ($user->societe_id > 0)
 	accessforbidden();
 
-$action = GETPOST('action','aZ09');
-
 
 /*
  * Actions
  */
 
+// Get informations of journal
+$accountingjournalstatic = new AccountingJournal($db);
+$accountingjournalstatic->fetch($id_journal);
+$journal = $accountingjournalstatic->code;
+$journal_label = $accountingjournalstatic->label;
+
 $year_current = strftime("%Y", dol_now());
 $pastmonth = strftime("%m", dol_now()) - 1;
 $pastmonthyear = $year_current;
 if ($pastmonth == 0) {
-    $pastmonth = 12;
-    $pastmonthyear --;
+	$pastmonth = 12;
+	$pastmonthyear --;
 }
 
 $date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
@@ -80,8 +85,8 @@ $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
 
 if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 {
-    $date_start = dol_get_first_day($pastmonthyear, $pastmonth, false);
-    $date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
+	$date_start = dol_get_first_day($pastmonthyear, $pastmonth, false);
+	$date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
 }
 
 $p = explode(":", $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
@@ -99,274 +104,277 @@ $sql .= " JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_facture";
 $sql .= " JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_tva as ct ON fd.tva_tx = ct.taux AND ct.fk_pays = '" . $idpays . "'";
 $sql .= " WHERE fd.fk_code_ventilation > 0";
-$sql .= " AND f.entity IN (".getEntity('facture', 0).')';    // We don't share object for accountancy
+$sql .= " AND f.entity IN (".getEntity('facture', 0).')';	// We don't share object for accountancy
 $sql .= " AND f.fk_statut > 0"; // TODO Facture annulée ?
 if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-    $sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
+	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
 } else {
-    $sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_STANDARD . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
+	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_STANDARD . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
 }
 $sql .= " AND fd.product_type IN (0,1)";
 if ($date_start && $date_end)
-    $sql .= " AND f.datef >= '" . $db->idate($date_start) . "' AND f.datef <= '" . $db->idate($date_end) . "'";
+	$sql .= " AND f.datef >= '" . $db->idate($date_start) . "' AND f.datef <= '" . $db->idate($date_end) . "'";
 $sql .= " ORDER BY f.datef";
 
 dol_syslog('accountancy/journal/sellsjournal.php', LOG_DEBUG);
 $result = $db->query($sql);
 if ($result) {
-    $tabfac = array ();
-    $tabht = array ();
-    $tabtva = array ();
-    $def_tva = array ();
-    $tabttc = array ();
-    $tabcompany = array ();
+	$tabfac = array ();
+	$tabht = array ();
+	$tabtva = array ();
+	$def_tva = array ();
+	$tabttc = array ();
+	$tabcompany = array ();
 
-    $num = $db->num_rows($result);
-    $i = 0;
+	$num = $db->num_rows($result);
+	$i = 0;
 
-    $cptcli = (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER)) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef");
-    
-    while ( $i < $num ) {
-        $obj = $db->fetch_object($result);
-        
-        // les variables
-        $compta_soc = (! empty($obj->code_compta)) ? $obj->code_compta : $cptcli;
+	$cptcli = (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER)) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef");
 
-        $compta_prod = $obj->compte;
-        if (empty($compta_prod)) {
-            if ($obj->product_type == 0)
-                $compta_prod = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef");
-                else
-                    $compta_prod = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef");
-        }
-        $cpttva = (! empty($conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT : $langs->trans("CodeNotDef");
-        $compta_tva = (! empty($obj->account_tva) ? $obj->account_tva : $cpttva);
+	while ( $i < $num ) {
+		$obj = $db->fetch_object($result);
+
+		// les variables
+		$compta_soc = (! empty($obj->code_compta)) ? $obj->code_compta : $cptcli;
+
+		$compta_prod = $obj->compte;
+		if (empty($compta_prod)) {
+			if ($obj->product_type == 0)
+				$compta_prod = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef");
+				else
+					$compta_prod = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef");
+		}
+		$cpttva = (! empty($conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT : $langs->trans("CodeNotDef");
+		$compta_tva = (! empty($obj->account_tva) ? $obj->account_tva : $cpttva);
 
 
-        //Define array for display vat tx
-        $def_tva[$obj->rowid]=price($obj->tva_tx);
+		//Define array for display vat tx
+		$def_tva[$obj->rowid]=price($obj->tva_tx);
 
-        // Situation invoices handling
-        $line = new FactureLigne($db);
-        $line->fetch($obj->fdid);
-        $prev_progress = $line->get_prev_progress($obj->fdid);
-        if ($obj->type == Facture::TYPE_SITUATION) {
-            // Avoid divide by 0
-            if ($obj->situation_percent == 0) {
-                $situation_ratio = 0;
-            } else {
-                $situation_ratio = ($obj->situation_percent - $prev_progress) / $obj->situation_percent;
-            }
-        } else {
-            $situation_ratio = 1;
-        }
+		// Situation invoices handling
+		$line = new FactureLigne($db);
+		$line->fetch($obj->fdid);
+		$prev_progress = $line->get_prev_progress($obj->fdid);
+		if ($obj->type == Facture::TYPE_SITUATION) {
+			// Avoid divide by 0
+			if ($obj->situation_percent == 0) {
+				$situation_ratio = 0;
+			} else {
+				$situation_ratio = ($obj->situation_percent - $prev_progress) / $obj->situation_percent;
+			}
+		} else {
+			$situation_ratio = 1;
+		}
 
-        // Invoice lines
-        $tabfac[$obj->rowid]["date"] = $db->jdate($obj->df);
-        $tabfac[$obj->rowid]["ref"] = $obj->facnumber;
-        $tabfac[$obj->rowid]["type"] = $obj->type;
-        $tabfac[$obj->rowid]["description"] = $obj->label_compte;
-        //$tabfac[$obj->rowid]["fk_facturedet"] = $obj->fdid;
-       
-        // Avoid warnings
-        if (! isset($tabttc[$obj->rowid][$compta_soc])) $tabttc[$obj->rowid][$compta_soc] = 0;
-        if (! isset($tabht[$obj->rowid][$compta_prod])) $tabht[$obj->rowid][$compta_prod] = 0;
-        if (! isset($tabtva[$obj->rowid][$compta_tva])) $tabtva[$obj->rowid][$compta_tva] = 0;
+		// Invoice lines
+		$tabfac[$obj->rowid]["date"] = $db->jdate($obj->df);
+		$tabfac[$obj->rowid]["ref"] = $obj->facnumber;
+		$tabfac[$obj->rowid]["type"] = $obj->type;
+		$tabfac[$obj->rowid]["description"] = $obj->label_compte;
+		//$tabfac[$obj->rowid]["fk_facturedet"] = $obj->fdid;
 
-        $tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc * $situation_ratio;
-        $tabht[$obj->rowid][$compta_prod] += $obj->total_ht * $situation_ratio;
-        $tabtva[$obj->rowid][$compta_tva] += $obj->total_tva * $situation_ratio;
-        $tabcompany[$obj->rowid] = array (
-            'id' => $obj->socid,
-            'name' => $obj->name,
-            'code_client' => $obj->code_client,
-            'code_compta' => $compta_soc
-        );
+		// Avoid warnings
+		if (! isset($tabttc[$obj->rowid][$compta_soc])) $tabttc[$obj->rowid][$compta_soc] = 0;
+		if (! isset($tabht[$obj->rowid][$compta_prod])) $tabht[$obj->rowid][$compta_prod] = 0;
+		if (! isset($tabtva[$obj->rowid][$compta_tva])) $tabtva[$obj->rowid][$compta_tva] = 0;
 
-        $i ++;
-    }
+		$tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc * $situation_ratio;
+		$tabht[$obj->rowid][$compta_prod] += $obj->total_ht * $situation_ratio;
+		$tabtva[$obj->rowid][$compta_tva] += $obj->total_tva * $situation_ratio;
+		$tabcompany[$obj->rowid] = array (
+			'id' => $obj->socid,
+			'name' => $obj->name,
+			'code_client' => $obj->code_client,
+			'code_compta' => $compta_soc
+		);
+
+		$i ++;
+	}
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 // Bookkeeping Write
 if ($action == 'writebookkeeping') {
-    $now = dol_now();
-    $error = 0;
+	$now = dol_now();
+	$error = 0;
 
-    foreach ( $tabfac as $key => $val ) {   // Loop on each invoice
-         
-        $errorforline = 0;
+	foreach ( $tabfac as $key => $val ) {   // Loop on each invoice
 
-        $db->begin();
+		$errorforline = 0;
 
-        $companystatic = new Societe($db);
-        $invoicestatic = new Facture($db);
+		$db->begin();
 
-        $companystatic->id = $tabcompany[$key]['id'];
-        $companystatic->name = $tabcompany[$key]['name'];
+		$companystatic = new Societe($db);
+		$invoicestatic = new Facture($db);
+
+		$companystatic->id = $tabcompany[$key]['id'];
+		$companystatic->name = $tabcompany[$key]['name'];
 		$companystatic->code_compta = $tabcompany[$key]['code_compta'];
 		$companystatic->code_compta_fournisseur = $tabcompany[$key]['code_compta_fournisseur'];
 		$companystatic->code_client = $tabcompany[$key]['code_client'];
 		$companystatic->code_fournisseur = $tabcompany[$key]['code_fournisseur'];
-        $companystatic->client = $tabcompany[$key]['code_client'];
+		$companystatic->client = $tabcompany[$key]['code_client'];
 
-        $invoicestatic->id = $key;
-        $invoicestatic->ref = (string) $val["ref"];
+		$invoicestatic->id = $key;
+		$invoicestatic->ref = (string) $val["ref"];
 
-        // Thirdparty
-        if (! $errorforline)
-        {
-            foreach ( $tabttc[$key] as $k => $mt ) {
-                if ($mt) {
-                    $bookkeeping = new BookKeeping($db);
-                    $bookkeeping->doc_date = $val["date"];
-                    $bookkeeping->doc_ref = $val["ref"];
-                    $bookkeeping->date_create = $now;
-                    $bookkeeping->doc_type = 'customer_invoice';
-                    $bookkeeping->fk_doc = $key;
-                    $bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
-                    $bookkeeping->code_tiers = $tabcompany[$key]['code_client'];
-                    $bookkeeping->numero_compte = $tabcompany[$key]['code_compta'];
-                    // $bookkeeping->label_compte = $tabcompany[$key]['name'];
-                    $bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers");
-                    $bookkeeping->montant = $mt;
-                    $bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
-                    $bookkeeping->debit = ($mt >= 0) ? $mt : 0;
-                    $bookkeeping->credit = ($mt < 0) ? $mt : 0;
-                    $bookkeeping->code_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
-                    $bookkeeping->fk_user_author = $user->id;
-    
-                    $result = $bookkeeping->create($user);
-           			if ($result < 0) {
-                        if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-                        {
-                            $error++;
-                            $errorforline++;
-                            //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-                        }
-                        else
-                        {
-                            $error++;
-                            $errorforline++;
-                            setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-                        }
-        			}
-                }
-            }
-        }
-        
-        // Product / Service
-        if (! $errorforline)
-        {
-            foreach ( $tabht[$key] as $k => $mt ) {
-                if ($mt) {
-                    // get compte id and label
-                    $accountingaccount = new AccountingAccount($db);
-                    if ($accountingaccount->fetch(null, $k, true)) {
-                        $bookkeeping = new BookKeeping($db);
-                        $bookkeeping->doc_date = $val["date"];
-                        $bookkeeping->doc_ref = $val["ref"];
-                        $bookkeeping->date_create = $now;
-                        $bookkeeping->doc_type = 'customer_invoice';
-                        $bookkeeping->fk_doc = $key;
-                        $bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add;
-                        $bookkeeping->code_tiers = '';
-                        $bookkeeping->numero_compte = $k;
-                        $bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $accountingaccount->label;
-                        $bookkeeping->montant = $mt;
-                        $bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
-                        $bookkeeping->debit = ($mt < 0) ? $mt : 0;
-                        $bookkeeping->credit = ($mt >= 0) ? $mt : 0;
-                        $bookkeeping->code_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
-                        $bookkeeping->fk_user_author = $user->id;
-    
-                        $result = $bookkeeping->create($user);
-            			if ($result < 0) {
-                            if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-                            {
-                                $error++;
-                                $errorforline++;
-                                //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-                            }
-                            else
-                            {
-                                $error++;
-                                $errorforline++;
-                                setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-                            }
-            			}                        
-                    }
-                }
-            }
-        }
-        
-        // VAT
-        // var_dump($tabtva);
-        if (! $errorforline)
-        {
-            foreach ( $tabtva[$key] as $k => $mt ) {
-                if ($mt) {
-                    $bookkeeping = new BookKeeping($db);
-                    $bookkeeping->doc_date = $val["date"];
-                    $bookkeeping->doc_ref = $val["ref"];
-                    $bookkeeping->date_create = $now;
-                    $bookkeeping->doc_type = 'customer_invoice';
-                    $bookkeeping->fk_doc = $key;
-                    $bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
-                    $bookkeeping->code_tiers = '';
-                    $bookkeeping->numero_compte = $k;
-                    $bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT").' '.$def_tva[$key];
-                    $bookkeeping->montant = $mt;
-                    $bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
-                    $bookkeeping->debit = ($mt < 0) ? $mt : 0;
-                    $bookkeeping->credit = ($mt >= 0) ? $mt : 0;
-                    $bookkeeping->code_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
-                    $bookkeeping->fk_user_author = $user->id;
-    
-                    $result = $bookkeeping->create($user);
-                    if ($result < 0) {
-           			    if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-        			    {
-        			        $error++;
-        			        $errorforline++;
-        			        //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-        			    }
-        			    else
-        			    {
-        			        $error++;
-        			        $errorforline++;
-        			        setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-        			    }
-                    }
-                }
-            }
-        }
+		// Thirdparty
+		if (! $errorforline)
+		{
+			foreach ( $tabttc[$key] as $k => $mt ) {
+				if ($mt) {
+					$bookkeeping = new BookKeeping($db);
+					$bookkeeping->doc_date = $val["date"];
+					$bookkeeping->doc_ref = $val["ref"];
+					$bookkeeping->date_create = $now;
+					$bookkeeping->doc_type = 'customer_invoice';
+					$bookkeeping->fk_doc = $key;
+					$bookkeeping->fk_docdet = 0;	// Useless, can be several lines that are source of this record to add
+					$bookkeeping->code_tiers = $tabcompany[$key]['code_client'];
+					$bookkeeping->numero_compte = $tabcompany[$key]['code_compta'];
+					// $bookkeeping->label_compte = $tabcompany[$key]['name'];
+					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers");
+					$bookkeeping->montant = $mt;
+					$bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
+					$bookkeeping->debit = ($mt >= 0) ? $mt : 0;
+					$bookkeeping->credit = ($mt < 0) ? $mt : 0;
+					$bookkeeping->code_journal = $journal;
+					$bookkeeping->journal_label = $journal_label;
+					$bookkeeping->fk_user_author = $user->id;
 
-        if (! $errorforline)
-        {
-            $db->commit();
-        }
-        else
-        {
-            $db->rollback();
-        }
+					$result = $bookkeeping->create($user);
+					if ($result < 0) {
+						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+						{
+							$error++;
+							$errorforline++;
+							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+						}
+						else
+						{
+							$error++;
+							$errorforline++;
+							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+						}
+					}
+				}
+			}
+		}
 
-    }
+		// Product / Service
+		if (! $errorforline)
+		{
+			foreach ( $tabht[$key] as $k => $mt ) {
+				if ($mt) {
+					// get compte id and label
+					$accountingaccount = new AccountingAccount($db);
+					if ($accountingaccount->fetch(null, $k, true)) {
+						$bookkeeping = new BookKeeping($db);
+						$bookkeeping->doc_date = $val["date"];
+						$bookkeeping->doc_ref = $val["ref"];
+						$bookkeeping->date_create = $now;
+						$bookkeeping->doc_type = 'customer_invoice';
+						$bookkeeping->fk_doc = $key;
+						$bookkeeping->fk_docdet = 0;	// Useless, can be several lines that are source of this record to add;
+						$bookkeeping->code_tiers = '';
+						$bookkeeping->numero_compte = $k;
+						$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $accountingaccount->label;
+						$bookkeeping->montant = $mt;
+						$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
+						$bookkeeping->debit = ($mt < 0) ? $mt : 0;
+						$bookkeeping->credit = ($mt >= 0) ? $mt : 0;
+						$bookkeeping->code_journal = $journal;
+						$bookkeeping->journal_label = $journal_label;
+						$bookkeeping->fk_user_author = $user->id;
 
-    if (empty($error) && count($tabpay) > 0) {
-        setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
-    }
-    elseif (count($tabpay) == $error)
-    {
-        setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
-    }
-    else
-    {
-        setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
-    }
-    
-    $action='';
+						$result = $bookkeeping->create($user);
+						if ($result < 0) {
+							if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+							{
+								$error++;
+								$errorforline++;
+								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+							}
+							else
+							{
+								$error++;
+								$errorforline++;
+								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+							}
+						}
+					}
+				}
+			}
+		}
+
+		// VAT
+		// var_dump($tabtva);
+		if (! $errorforline)
+		{
+			foreach ( $tabtva[$key] as $k => $mt ) {
+				if ($mt) {
+					$bookkeeping = new BookKeeping($db);
+					$bookkeeping->doc_date = $val["date"];
+					$bookkeeping->doc_ref = $val["ref"];
+					$bookkeeping->date_create = $now;
+					$bookkeeping->doc_type = 'customer_invoice';
+					$bookkeeping->fk_doc = $key;
+					$bookkeeping->fk_docdet = 0;	// Useless, can be several lines that are source of this record to add
+					$bookkeeping->code_tiers = '';
+					$bookkeeping->numero_compte = $k;
+					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT").' '.$def_tva[$key];
+					$bookkeeping->montant = $mt;
+					$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
+					$bookkeeping->debit = ($mt < 0) ? $mt : 0;
+					$bookkeeping->credit = ($mt >= 0) ? $mt : 0;
+					$bookkeeping->code_journal = $journal;
+					$bookkeeping->journal_label = $journal_label;
+					$bookkeeping->fk_user_author = $user->id;
+
+					$result = $bookkeeping->create($user);
+					if ($result < 0) {
+		   				if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+						{
+							$error++;
+							$errorforline++;
+							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+						}
+						else
+						{
+							$error++;
+							$errorforline++;
+							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+						}
+					}
+				}
+			}
+		}
+
+		if (! $errorforline)
+		{
+			$db->commit();
+		}
+		else
+		{
+			$db->rollback();
+		}
+
+	}
+
+	if (empty($error) && count($tabpay) > 0) {
+		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
+	}
+	elseif (count($tabpay) == $error)
+	{
+		setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
+	}
+	else
+	{
+		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
+	}
+	
+	$action='';
 }
 
 
@@ -380,123 +388,123 @@ $form = new Form($db);
 // Export
 /*if ($action == 'export_csv') {
 
-    $sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
-    $sell_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
+	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
+	$sell_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
 
-    include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';
+	include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';
 
-    $companystatic = new Client($db);
+	$companystatic = new Client($db);
 
-    // Model Cegid Expert Export
-    if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 2) {
-        $sep = ";";
+	// Model Cegid Expert Export
+	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 2) {
+		$sep = ";";
 
-        foreach ( $tabfac as $key => $val ) {
-            $companystatic->id = $tabcompany[$key]['id'];
-            $companystatic->name = $tabcompany[$key]['name'];
-            $companystatic->client = $tabcompany[$key]['code_client'];
+		foreach ( $tabfac as $key => $val ) {
+			$companystatic->id = $tabcompany[$key]['id'];
+			$companystatic->name = $tabcompany[$key]['name'];
+			$companystatic->client = $tabcompany[$key]['code_client'];
 
-            $invoicestatic->id = $key;
-            $invoicestatic->ref = $val["ref"];
+			$invoicestatic->id = $key;
+			$invoicestatic->ref = $val["ref"];
 
-            $date = dol_print_date($val["date"], '%d%m%Y');
+			$date = dol_print_date($val["date"], '%d%m%Y');
 
-            foreach ( $tabttc[$key] as $k => $mt ) {
-                print $date . $sep;
-                print $sell_journal . $sep;
-                print length_accountg($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) . $sep;
-                print length_accounta(html_entity_decode($k)) . $sep;
-                print ($mt < 0 ? 'C' : 'D') . $sep;
-                print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
-                print dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers") . $sep;
-                print $val["ref"];
-                print "\n";
-            }
+			foreach ( $tabttc[$key] as $k => $mt ) {
+				print $date . $sep;
+				print $sell_journal . $sep;
+				print length_accountg($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) . $sep;
+				print length_accounta(html_entity_decode($k)) . $sep;
+				print ($mt < 0 ? 'C' : 'D') . $sep;
+				print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
+				print dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers") . $sep;
+				print $val["ref"];
+				print "\n";
+			}
 
-            // Product / Service
-            foreach ( $tabht[$key] as $k => $mt ) {
-                $accountingaccount_static = new AccountingAccount($db);
-                if ($accountingaccount_static->fetch(null, $k, true)) {
-                    print $date . $sep;
-                    print $sell_journal . $sep;
-                    print length_accountg(html_entity_decode($k)) . $sep;
-                    print $sep;
-                    print ($mt < 0 ? 'D' : 'C') . $sep;
-                    print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
-                    print dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $accountingaccount_static->label . $sep;
-                    print $val["ref"];
-                    print "\n";
-                }
-            }
+			// Product / Service
+			foreach ( $tabht[$key] as $k => $mt ) {
+				$accountingaccount_static = new AccountingAccount($db);
+				if ($accountingaccount_static->fetch(null, $k, true)) {
+					print $date . $sep;
+					print $sell_journal . $sep;
+					print length_accountg(html_entity_decode($k)) . $sep;
+					print $sep;
+					print ($mt < 0 ? 'D' : 'C') . $sep;
+					print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
+					print dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $accountingaccount_static->label . $sep;
+					print $val["ref"];
+					print "\n";
+				}
+			}
 
-            // TVA
-            foreach ( $tabtva[$key] as $k => $mt ) {
-                if ($mt) {
-                    print $date . $sep;
-                    print $sell_journal . $sep;
-                    print length_accountg(html_entity_decode($k)) . $sep;
-                    print $sep;
-                    print ($mt < 0 ? 'D' : 'C') . $sep;
-                    print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
-                    print dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT") . $sep;
-                    // print $langs->trans("VAT") . $sep;
-                    print $val["ref"];
-                    print "\n";
-                }
-            }
-        }
-    } elseif ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 1) {
-        // Model Classic Export
-        foreach ( $tabfac as $key => $val ) {
-            $companystatic->id = $tabcompany[$key]['id'];
-            $companystatic->name = $tabcompany[$key]['name'];
-            $companystatic->client = $tabcompany[$key]['code_client'];
+			// TVA
+			foreach ( $tabtva[$key] as $k => $mt ) {
+				if ($mt) {
+					print $date . $sep;
+					print $sell_journal . $sep;
+					print length_accountg(html_entity_decode($k)) . $sep;
+					print $sep;
+					print ($mt < 0 ? 'D' : 'C') . $sep;
+					print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
+					print dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT") . $sep;
+					// print $langs->trans("VAT") . $sep;
+					print $val["ref"];
+					print "\n";
+				}
+			}
+		}
+	} elseif ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 1) {
+		// Model Classic Export
+		foreach ( $tabfac as $key => $val ) {
+			$companystatic->id = $tabcompany[$key]['id'];
+			$companystatic->name = $tabcompany[$key]['name'];
+			$companystatic->client = $tabcompany[$key]['code_client'];
 
-            $invoicestatic->id = $key;
-            $invoicestatic->ref = $val["ref"];
+			$invoicestatic->id = $key;
+			$invoicestatic->ref = $val["ref"];
 
-            $date = dol_print_date($val["date"], 'day');
+			$date = dol_print_date($val["date"], 'day');
 
-            foreach ( $tabttc[$key] as $k => $mt ) {
-                print '"' . $date . '"' . $sep;
-                print '"' . $val["ref"] . '"' . $sep;
-                print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
-                print '"' . dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers") . '"' . $sep;
-                print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
-                print '"' . ($mt < 0 ? price(- $mt) : '') . '"';
-                print "\n";
-            }
+			foreach ( $tabttc[$key] as $k => $mt ) {
+				print '"' . $date . '"' . $sep;
+				print '"' . $val["ref"] . '"' . $sep;
+				print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
+				print '"' . dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers") . '"' . $sep;
+				print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
+				print '"' . ($mt < 0 ? price(- $mt) : '') . '"';
+				print "\n";
+			}
 
-            // Product / Service
-            foreach ( $tabht[$key] as $k => $mt ) {
-                $accountingaccount = new AccountingAccount($db);
-                $accountingaccount->fetch(null, $k, true);
+			// Product / Service
+			foreach ( $tabht[$key] as $k => $mt ) {
+				$accountingaccount = new AccountingAccount($db);
+				$accountingaccount->fetch(null, $k, true);
 
-                if ($mt) {
-                    print '"' . $date . '"' . $sep;
-                    print '"' . $val["ref"] . '"' . $sep;
-                    print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
-                    print '"' . dol_trunc($companystatic->name, 16) . ' - ' . dol_trunc($accountingaccount->label, 32) . '"' . $sep;
-                    print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
-                    print '"' . ($mt >= 0 ? price($mt) : '') . '"';
-                    print "\n";
-                }
-            }
+				if ($mt) {
+					print '"' . $date . '"' . $sep;
+					print '"' . $val["ref"] . '"' . $sep;
+					print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
+					print '"' . dol_trunc($companystatic->name, 16) . ' - ' . dol_trunc($accountingaccount->label, 32) . '"' . $sep;
+					print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
+					print '"' . ($mt >= 0 ? price($mt) : '') . '"';
+					print "\n";
+				}
+			}
 
-            // VAT
-            foreach ( $tabtva[$key] as $k => $mt ) {
-                if ($mt) {
-                    print '"' . $date . '"' . $sep;
-                    print '"' . $val["ref"] . '"' . $sep;
-                    print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
-                    print '"' . dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT") . '"' . $sep;
-                    print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
-                    print '"' . ($mt >= 0 ? price($mt) : '') . '"';
-                    print "\n";
-                }
-            }
-        }
-    }
+			// VAT
+			foreach ( $tabtva[$key] as $k => $mt ) {
+				if ($mt) {
+					print '"' . $date . '"' . $sep;
+					print '"' . $val["ref"] . '"' . $sep;
+					print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
+					print '"' . dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT") . '"' . $sep;
+					print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
+					print '"' . ($mt >= 0 ? price($mt) : '') . '"';
+					print "\n";
+				}
+			}
+		}
+	}
 }
 */
 
@@ -505,7 +513,7 @@ if (empty($action) || $action == 'view') {
 
 	llxHeader('', $langs->trans("SellsJournal"));
 
-	$nom = $langs->trans("SellsJournal");
+	$nom = $langs->trans("SellsJournal") . ' - ' . $accountingjournalstatic->getNomUrl(1);
 	$nomlink = '';
 	$periodlink = '';
 	$exportlink = '';
@@ -517,29 +525,31 @@ if (empty($action) || $action == 'view') {
 	else
 		$description .= $langs->trans("DepositsAreIncluded");
 	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
-	
-	journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''));
+
+	$varlink = 'id_journal=' . $id_journal;
+
+	journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''), '', $varlink);
 
 	/*if ($conf->global->ACCOUNTING_EXPORT_MODELCSV != 1 && $conf->global->ACCOUNTING_EXPORT_MODELCSV != 2) {
 		print '<input type="button" class="butActionRefused" style="float: right;" value="' . $langs->trans("Export") . '" disabled="disabled" title="' . $langs->trans('ExportNotSupported') . '"/>';
 	} else {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
 	}*/
-    print '<div class="tabsAction">';
+	print '<div class="tabsAction">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
-    print '</div>';
-    
+	print '</div>';
+
 	print '
 	<script type="text/javascript">
 		function launch_export() {
-		    $("div.fiche div.tabBar form input[name=\"action\"]").val("export_csv");
+			$("div.fiche div.tabBar form input[name=\"action\"]").val("export_csv");
 			$("div.fiche div.tabBar form input[type=\"submit\"]").click();
-		    $("div.fiche div.tabBar form input[name=\"action\"]").val("");
+			$("div.fiche div.tabBar form input[name=\"action\"]").val("");
 		}
 		function writebookkeeping() {
-		    $("div.fiche div.tabBar form input[name=\"action\"]").val("writebookkeeping");
+			$("div.fiche div.tabBar form input[name=\"action\"]").val("writebookkeeping");
 			$("div.fiche div.tabBar form input[type=\"submit\"]").click();
-		    $("div.fiche div.tabBar form input[name=\"action\"]").val("");
+			$("div.fiche div.tabBar form input[name=\"action\"]").val("");
 		}
 	</script>';
 
@@ -586,7 +596,7 @@ if (empty($action) || $action == 'view') {
 			$accountoshow = length_accounta($k);
 			if (empty($accountoshow) || $accountoshow == 'NotDefined')
 			{
-			    print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
+				print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
 			}
 			else print $accountoshow;
 			// print "</td><td>" . $langs->trans("ThirdParty");
@@ -595,7 +605,7 @@ if (empty($action) || $action == 'view') {
 			print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers") . "</td>";
 			print "<td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
 			print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
-		    print "</tr>";
+			print "</tr>";
 		}
 
 		// Product / Service
@@ -609,12 +619,12 @@ if (empty($action) || $action == 'view') {
 				print "<td>" . $date . "</td>";
 				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
 				print "<td>";
-    			$accountoshow = length_accountg($k);
-    			if (empty($accountoshow) || $accountoshow == 'NotDefined')
-    			{
-    			    print '<span class="error">'.$langs->trans("ProductNotDefined").'</span>';
-    			}
-    			else print $accountoshow;
+				$accountoshow = length_accountg($k);
+				if (empty($accountoshow) || $accountoshow == 'NotDefined')
+				{
+					print '<span class="error">'.$langs->trans("ProductNotDefined").'</span>';
+				}
+				else print $accountoshow;
 				print "</td>";
 				// print "<td>" . $accountingaccount->label . "</td>";
 				print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $accountingaccount->label . "</td>";
@@ -632,12 +642,12 @@ if (empty($action) || $action == 'view') {
 				print "<td>" . $date . "</td>";
 				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
 				print "<td>";
-    			$accountoshow = length_accountg($k);
-    			if (empty($accountoshow) || $accountoshow == 'NotDefined')
-    			{
-    			    print '<span class="error">'.$langs->trans("VATAccountNotDefined").'</span>';
-    			}
-    			else print $accountoshow;
+				$accountoshow = length_accountg($k);
+				if (empty($accountoshow) || $accountoshow == 'NotDefined')
+				{
+					print '<span class="error">'.$langs->trans("VATAccountNotDefined").'</span>';
+				}
+				else print $accountoshow;
 				print "</td>";
 				print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT") . ' '.$def_tva[$key]. "</td>";
 				// print "<td>" . $langs->trans("VAT") . "</td>";

From 832e2888141dfcd4cc008cfe79bd67e559c1b334 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Jun 2017 10:47:22 +0200
Subject: [PATCH 101/438] FIX #6955

---
 htdocs/core/class/html.form.class.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index b14f72a1b7b..c5397eb40eb 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -984,6 +984,7 @@ class Form
 
     	if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT) && ! $forcecombo)
     	{
+    	    // No immediate load of all database
     		$placeholder='';
     		if ($selected && empty($selected_input_value))
     		{
@@ -1016,6 +1017,7 @@ class Form
     	}
     	else
     	{
+    	    // Immediate load of all database
     		$out.=$this->select_thirdparty_list($selected, $htmlname, $filter, $showempty, $showtype, $forcecombo, $events, '', 0, $limit, $morecss, $moreparam);
     	}
 
@@ -1023,7 +1025,8 @@ class Form
     }
 
     /**
-     *  Output html form to select a third party
+     *  Output html form to select a third party.
+     *  Note, you must use the select_company to get the component to select a third party. This function must only be called by select_company.
      *
      *	@param	string	$selected       Preselected type
      *	@param  string	$htmlname       Name of field in form
@@ -1085,8 +1088,6 @@ class Form
         $resql=$this->db->query($sql);
         if ($resql)
         {
-			$events = null;
-
            	if ($conf->use_javascript_ajax && ! $forcecombo)
             {
 				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

From a1144e1f66fdc0208f35d4097020b5582a71cbb4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Jun 2017 11:18:41 +0200
Subject: [PATCH 102/438] Fix missing init of hookmanager

---
 htdocs/core/class/hookmanager.class.php |  5 ++---
 htdocs/install/upgrade2.php             | 11 ++++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index afb670dc267..8faea875ab5 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -59,15 +59,14 @@ class HookManager
 
 	/**
 	 *	Init array $this->hooks with instantiated action controlers.
-	 *  First, a hook is declared by a module by adding a constant MAIN_MODULE_MYMODULENAME_HOOKS
-	 *  with value 'nameofcontext1:nameofcontext2:...' into $this->const of module descriptor file.
+	 *  First, a hook is declared by a module by adding a constant MAIN_MODULE_MYMODULENAME_HOOKS with value 'nameofcontext1:nameofcontext2:...' into $this->const of module descriptor file.
 	 *  This makes $conf->hooks_modules loaded with an entry ('modulename'=>array(nameofcontext1,nameofcontext2,...))
 	 *  When initHooks function is called, with initHooks(list_of_contexts), an array $this->hooks is defined with instance of controler
 	 *  class found into file /mymodule/class/actions_mymodule.class.php (if module has declared the context as a managed context).
 	 *  Then when a hook executeHooks('aMethod'...) is called, the method aMethod found into class will be executed.
 	 *
 	 *	@param	string[]	$arraycontext	    Array list of searched hooks tab/features. For example: 'thirdpartycard' (for hook methods into page card thirdparty), 'thirdpartydao' (for hook methods into Societe), ...
-	 *	@return	int							Always 1
+	 *	@return	int							    Always 1
 	 */
 	function initHooks($arraycontext)
 	{
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 36bbeb966d4..6beeb7ca7b2 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -136,6 +136,7 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
     // Create the global $hookmanager object
     include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
     $hookmanager=new HookManager($db);
+    $hookmanager->initHooks(array('upgrade'));
 
     if (!$db->connected)
     {
@@ -491,9 +492,13 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
         }
         else
         {
-            print '<tr><td colspan="4">';
-            print '<b>'.$langs->trans('UpgradeExternalModule').'</b>: '.$langs->trans("None");
-            print '</td></tr>';
+            //if (! empty($conf->modules))
+            if (! empty($conf->modules_parts['hooks']))     // If there is at least one module with one hook, we show message to say nothing was done
+            {
+                print '<tr><td colspan="4">';
+                print '<b>'.$langs->trans('UpgradeExternalModule').'</b>: '.$langs->trans("None");
+                print '</td></tr>';
+            }
         }
     }
 

From 3e51d2f537b6b052b939fd973f382edc8b8d1a03 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Jun 2017 11:51:22 +0200
Subject: [PATCH 103/438] Fix backto link after creating a third party

---
 htdocs/core/class/html.form.class.php | 2 +-
 htdocs/societe/card.php               | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index e4f6ec7bbcb..7a69172889e 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5760,7 +5760,7 @@ class Form
         $disabled = ($disabled ? ' disabled' : '');
 
         $resultyesno = '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.$disabled.'>'."\n";
-        if ($useempty) $resultyesno .= '<option value="-1"'.(($value < 0)?' selected':'').'></option>'."\n";
+        if ($useempty) $resultyesno .= '<option value="-1"'.(($value < 0)?' selected':'').'>&nbsp;</option>'."\n";
         if (("$value" == 'yes') || ($value == 1))
         {
             $resultyesno .= '<option value="'.$yes.'" selected>'.$langs->trans("Yes").'</option>'."\n";
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index cb99949407b..d6710f68c92 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -582,6 +582,7 @@ if (empty($reshook))
 
                 	if (! empty($backtopage))
                 	{
+                	    if (preg_match('/\?/', $backtopage)) $backtopage.='&socid='.$object->id;
                		    header("Location: ".$backtopage);
                     	exit;
                 	}
@@ -1065,7 +1066,7 @@ else
 	    print '<td class="maxwidthonsmartphone">';
 	    $selected=isset($_POST['client'])?GETPOST('client'):$object->client;
         print '<select class="flat" name="client" id="customerprospect">';
-        if (GETPOST("type") == '') print '<option value="-1"></option>';
+        if (GETPOST("type") == '') print '<option value="-1">&nbsp;</option>';
         if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print '<option value="2"'.($selected==2?' selected':'').'>'.$langs->trans('Prospect').'</option>';
         if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS)) print '<option value="3"'.($selected==3?' selected':'').'>'.$langs->trans('ProspectCustomer').'</option>';
         if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print '<option value="1"'.($selected==1?' selected':'').'>'.$langs->trans('Customer').'</option>';

From 543630e4876e835122a081dd5f522134e0c6a0fb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Jun 2017 12:21:41 +0200
Subject: [PATCH 104/438] Fix missing count of nb of columns into lists

---
 htdocs/contact/list.php               | 20 +++++-
 htdocs/core/lib/functions.lib.php     |  2 +-
 htdocs/product/list.php               | 82 ++++++++++++++--------
 htdocs/projet/card.php                | 33 ++++++---
 htdocs/projet/class/project.class.php | 14 ++++
 htdocs/projet/list.php                | 75 +++++++++++----------
 htdocs/resource/list.php              | 97 +++++++++++++--------------
 htdocs/societe/list.php               | 32 ++++++++-
 htdocs/theme/eldy/style.css.php       |  2 +-
 htdocs/theme/md/style.css.php         |  2 +-
 htdocs/user/index.php                 | 22 +++++-
 11 files changed, 248 insertions(+), 133 deletions(-)

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 2d46b91f922..ad71eb3786f 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -682,6 +682,7 @@ print "</tr>\n";
 
 
 $i = 0;
+$totalarray=array();
 while ($i < min($num,$limit))
 {
     $obj = $db->fetch_object($result);
@@ -706,56 +707,67 @@ while ($i < min($num,$limit))
         print '<td valign="middle">';
         print $contactstatic->getNomUrl(1,'',0);
         print '</td>';
+	    if (! $i) $totalarray['nbfield']++;
     }
 	// Firstname
     if (! empty($arrayfields['p.firstname']['checked']))
     {
         print '<td>'.$obj->firstname.'</td>';
+	    if (! $i) $totalarray['nbfield']++;
     }
 	// Zip
     if (! empty($arrayfields['p.zip']['checked']))
     {
         print '<td>'.$obj->zip.'</td>';
+	    if (! $i) $totalarray['nbfield']++;
     }
 	// Town
     if (! empty($arrayfields['p.town']['checked']))
     {
         print '<td>'.$obj->town.'</td>';
+	    if (! $i) $totalarray['nbfield']++;
     }
     // Function
     if (! empty($arrayfields['p.poste']['checked']))
     {
         print '<td>'.dol_trunc($obj->poste,20).'</td>';
+	    if (! $i) $totalarray['nbfield']++;
     }
     // Phone
     if (! empty($arrayfields['p.phone']['checked']))
     {
         print '<td>'.dol_print_phone($obj->phone_pro,$obj->country_code,$obj->rowid,$obj->socid,'AC_TEL').'</td>';
+	    if (! $i) $totalarray['nbfield']++;
     }
     // Phone perso
     if (! empty($arrayfields['p.phone_perso']['checked']))
     {
         print '<td>'.dol_print_phone($obj->phone_perso,$obj->country_code,$obj->rowid,$obj->socid,'AC_TEL').'</td>';
+	    if (! $i) $totalarray['nbfield']++;
     }
     // Phone mobile
     if (! empty($arrayfields['p.phone_mobile']['checked']))
     {
         print '<td>'.dol_print_phone($obj->phone_mobile,$obj->country_code,$obj->rowid,$obj->socid,'AC_TEL').'</td>';
+	    if (! $i) $totalarray['nbfield']++;
     }
     // Fax
     if (! empty($arrayfields['p.fax']['checked']))
     {
         print '<td>'.dol_print_phone($obj->fax,$obj->country_code,$obj->rowid,$obj->socid,'AC_TEL').'</td>';
+	    if (! $i) $totalarray['nbfield']++;
     }
     // EMail
     if (! empty($arrayfields['p.email']['checked']))
     {
         print '<td>'.dol_print_email($obj->email,$obj->rowid,$obj->socid,'AC_EMAIL',18).'</td>';
+	    if (! $i) $totalarray['nbfield']++;
     }
     // Skype
     if (! empty($arrayfields['p.skype']['checked']))
     {
         if (! empty($conf->skype->enabled)) { print '<td>'.dol_print_skype($obj->skype,$obj->rowid,$obj->socid,'AC_SKYPE',18).'</td>'; }
+	    if (! $i) $totalarray['nbfield']++;
     }
     // Company
     if (! empty($arrayfields['p.thirdparty']['checked']))
@@ -770,12 +782,14 @@ while ($i < min($num,$limit))
         else
             print '&nbsp;';
         print '</td>';
+	    if (! $i) $totalarray['nbfield']++;
     }
 
     // Private/Public
     if (! empty($arrayfields['p.priv']['checked']))
     {
 	    print '<td align="center">'.$contactstatic->LibPubPriv($obj->priv).'</td>';
+	    if (! $i) $totalarray['nbfield']++;
     }
 
 	// Extra fields
@@ -792,6 +806,7 @@ while ($i < min($num,$limit))
 				$tmpkey='options_'.$key;
 				print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
 				print '</td>';
+	            if (! $i) $totalarray['nbfield']++;
 			}
 	   }
 	}
@@ -805,6 +820,7 @@ while ($i < min($num,$limit))
         print '<td align="center">';
         print dol_print_date($db->jdate($obj->date_creation), 'dayhour');
         print '</td>';
+	    if (! $i) $totalarray['nbfield']++;
     }
     // Date modification
     if (! empty($arrayfields['p.tms']['checked']))
@@ -812,11 +828,13 @@ while ($i < min($num,$limit))
         print '<td align="center">';
         print dol_print_date($db->jdate($obj->date_update), 'dayhour');
         print '</td>';
+	    if (! $i) $totalarray['nbfield']++;
     }
     // Status
     if (! empty($arrayfields['p.statut']['checked']))
     {
         print '<td align="center">'.$contactstatic->getLibStatut(3).'</td>';
+	    if (! $i) $totalarray['nbfield']++;
     }
 
    // Action column
@@ -829,7 +847,7 @@ while ($i < min($num,$limit))
     }
     print '</td>';
     if (! $i) $totalarray['nbfield']++;
-    
+
     print "</tr>\n";
     $i++;
 }
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 5113c9f1d96..92cb35e02f5 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3692,7 +3692,7 @@ function vatrate($rate, $addpercent=false, $info_bits=0, $usestarfornpr=0)
  *		@param	float		$amount			Amount to format
  *		@param	integer		$form			Type of format, HTML or not (not by default)
  *		@param	Translate	$outlangs		Object langs for output
- *		@param	int			$trunc			1=Truncate if there is too much decimals (default), 0=Does not truncate. Deprecated because amount are rounded (to unit or total amount accurancy) before inserted into database or after a computation, so this parameter should be useless.
+ *		@param	int			$trunc			1=Truncate if there is more decimals than MAIN_MAX_DECIMALS_SHOWN (default), 0=Does not truncate. Deprecated because amount are rounded (to unit or total amount accurancy) before inserted into database or after a computation, so this parameter should be useless.
  *		@param	int			$rounding		Minimum number of decimal to show. If 0, no change, if -1, we use min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOTAL)
  *		@param	int			$forcerounding	Force the number of decimal to forcerounding decimal (-1=do not force)
  *		@param	string		$currency_code	To add currency symbol (''=add nothing, 'auto'=Use default currency, 'XXX'=add currency symbols for XXX currency)
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 2b3657070e4..2afa8438e73 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -179,7 +179,7 @@ $arrayfields=array(
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
-   foreach($extrafields->attribute_label as $key => $val) 
+   foreach($extrafields->attribute_label as $key => $val)
    {
        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key]);
    }
@@ -219,16 +219,16 @@ if (empty($reshook))
     	$search_accountancy_code_buy='';
     	$search_array_options=array();
     }
-    
+
     // Mass actions
     $objectclass='Product';
     if ((string) $search_type == '1') { $objectlabel='Services'; }
     if ((string) $search_type == '0') { $objectlabel='Products'; }
-    
+
     $permtoread = $user->rights->produit->lire;
     $permtodelete = $user->rights->produit->supprimer;
     $uploaddir = $conf->product->dir_output;
-    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';    
+    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
 
@@ -324,7 +324,7 @@ else
 	    $typ=$extrafields->attribute_type[$tmpkey];
 	    $mode=0;
 	    if (in_array($typ, array('int','double'))) $mode=1;    // Search on a numeric
-	    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit))) 
+	    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit)))
 	    {
 	        $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
 	    }
@@ -361,7 +361,7 @@ else
     	$num = $db->num_rows($resql);
 
     	$arrayofselected=is_array($toselect)?$toselect:array();
-    	 
+
     	if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall)
     	{
     	    $obj = $db->fetch_object($resql);
@@ -415,8 +415,8 @@ else
 	        $crit=$val;
 	        $tmpkey=preg_replace('/search_options_/','',$key);
 	        if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
-	    } 	
-		
+	    }
+
 	    // List of mass actions available
 	    $arrayofmassactions =  array(
 	        //'presend'=>$langs->trans("SendByMail"),
@@ -425,7 +425,7 @@ else
 	    if ($user->rights->produit->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
 	    if ($massaction == 'presend' || $massaction == 'createbills') $arrayofmassactions=array();
 	    $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
-	     
+
 		print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formulaire">';
         if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -473,7 +473,7 @@ else
                 foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
                 print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
             }
-            
+
     		// Filter on categories
     	 	$moreforfilter='';
     		if (! empty($conf->categorie->enabled))
@@ -505,10 +505,10 @@ else
 			$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
             $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
             if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
-            
+
             print '<div class="div-table-responsive">';
             print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-    		
+
     		// Lines with input filters
     		print '<tr class="liste_titre_filter">';
     		if (! empty($arrayfields['p.ref']['checked']))
@@ -591,7 +591,7 @@ else
     		// Extra fields
 			if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 			{
-			   foreach($extrafields->attribute_label as $key => $val) 
+			   foreach($extrafields->attribute_label as $key => $val)
 			   {
 					if (! empty($arrayfields["ef.".$key]['checked'])) print '<td class="liste_titre"></td>';
 			   }
@@ -668,12 +668,13 @@ else
     		if (! empty($arrayfields['p.tobuy']['checked']))  print_liste_field_titre($langs->trans("Status").' ('.$langs->trans("Buy").')',$_SERVER["PHP_SELF"],"p.tobuy","",$param,'align="right"',$sortfield,$sortorder);
     		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
     		print "</tr>\n";
-    		
-    		
+
+
     		$product_static=new Product($db);
     		$product_fourn =new ProductFournisseur($db);
 
     	    $i = 0;
+    	    $totalarray=array();
     		while ($i < min($num,$limit))
     		{
     			$obj = $db->fetch_object($resql);
@@ -721,6 +722,7 @@ else
 	    			print '<td class="nowrap">';
 	    			print $product_static->getNomUrl(1,'',24);
 	    			print "</td>\n";
+		            if (! $i) $totalarray['nbfield']++;
 			    }
        			// Ref supplier
 			    if (! empty($arrayfields['pfp.ref_fourn']['checked']))
@@ -728,24 +730,28 @@ else
 	    			print '<td class="nowrap">';
 	    			print $product_static->getNomUrl(1,'',24);
 	    			print "</td>\n";
+		            if (! $i) $totalarray['nbfield']++;
 			    }
     			// Label
 			    if (! empty($arrayfields['p.label']['checked']))
 			    {
 			    	print '<td>'.dol_trunc($obj->label,40).'</td>';
+		            if (! $i) $totalarray['nbfield']++;
 			    }
-			    
+
     		    // Type
 			    if (! empty($arrayfields['p.fk_product_type']['checked']))
 			    {
 			    	print '<td>'.$obj->fk_product_type.'</td>';
+		            if (! $i) $totalarray['nbfield']++;
 			    }
-			    
+
 			    // Barcode
 			    if (! empty($arrayfields['p.barcode']['checked']))
 			    {
     				print '<td>'.$obj->barcode.'</td>';
-    			}
+		            if (! $i) $totalarray['nbfield']++;
+			    }
 
     			// Duration
  			    if (! empty($arrayfields['p.duration']['checked']))
@@ -761,6 +767,7 @@ else
 	    				else print $obj->duration;
     				}
     				print '</td>';
+		            if (! $i) $totalarray['nbfield']++;
     			}
 
     			// Sell price
@@ -773,6 +780,7 @@ else
         				else print price($obj->price).' '.$langs->trans("HT");
     			    }
         			print '</td>';
+		            if (! $i) $totalarray['nbfield']++;
     			}
 
     			// Better buy price
@@ -796,6 +804,7 @@ else
     					}
         			}
         			print '</td>';
+		            if (! $i) $totalarray['nbfield']++;
     			}
 
     		    // Limit alert
@@ -807,6 +816,7 @@ else
                         print $obj->seuil_stock_alerte;
     				}
     				print '</td>';
+		            if (! $i) $totalarray['nbfield']++;
         		}
     			// Desired stock
 		        if (! empty($arrayfields['p.desiredstock']['checked']))
@@ -817,6 +827,7 @@ else
                         print $obj->desiredstock;
     				}
     				print '</td>';
+		            if (! $i) $totalarray['nbfield']++;
         		}
 				// Stock
 		        if (! empty($arrayfields['p.stock']['checked']))
@@ -828,7 +839,8 @@ else
       					print $product_static->stock_reel;
     				}
     				print '</td>';
-    			}
+		            if (! $i) $totalarray['nbfield']++;
+        		}
     			// Stock
 		        if (! empty($arrayfields['stock_virtual']['checked']))
         		{
@@ -839,24 +851,34 @@ else
       					print $product_static->stock_theorique;
     				}
     				print '</td>';
-    			}
+		            if (! $i) $totalarray['nbfield']++;
+        		}
     			// Lot/Serial
 		        if (! empty($arrayfields['p.tobatch']['checked']))
         		{
                     print '<td align="center">';
     				print yn($obj->tobatch);
     				print '</td>';
+		            if (! $i) $totalarray['nbfield']++;
         		}
     			// Accountancy code sell
-		        if (! empty($arrayfields['p.accountancy_code_sell']['checked'])) print '<td>'.$obj->accountancy_code_sell.'</td>';
+		        if (! empty($arrayfields['p.accountancy_code_sell']['checked']))
+		        {
+		            print '<td>'.$obj->accountancy_code_sell.'</td>';
+		            if (! $i) $totalarray['nbfield']++;
+		        }
     			// Accountancy code sell
-		        if (! empty($arrayfields['p.accountancy_code_buy']['checked'])) print '<td>'.$obj->accountancy_code_buy.'</td>';
+		        if (! empty($arrayfields['p.accountancy_code_buy']['checked']))
+		        {
+		            print '<td>'.$obj->accountancy_code_buy.'</td>';
+		            if (! $i) $totalarray['nbfield']++;
+		        }
 		        // Extra fields
 				if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 				{
-				   foreach($extrafields->attribute_label as $key => $val) 
+				   foreach($extrafields->attribute_label as $key => $val)
 				   {
-						if (! empty($arrayfields["ef.".$key]['checked'])) 
+						if (! empty($arrayfields["ef.".$key]['checked']))
 						{
 							print '<td';
 							$align=$extrafields->getAlignFlag($key);
@@ -865,6 +887,7 @@ else
 							$tmpkey='options_'.$key;
 							print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
 							print '</td>';
+		                    if (! $i) $totalarray['nbfield']++;
 						}
 				   }
 				}
@@ -878,6 +901,7 @@ else
 		            print '<td align="center">';
 		            print dol_print_date($obj->date_creation, 'dayhour');
 		            print '</td>';
+		            if (! $i) $totalarray['nbfield']++;
 		        }
 		        // Date modification
 		        if (! empty($arrayfields['p.tms']['checked']))
@@ -885,8 +909,9 @@ else
 		            print '<td align="center">';
 		            print dol_print_date($obj->date_update, 'dayhour');
 		            print '</td>';
-		        }    			
-    			
+		            if (! $i) $totalarray['nbfield']++;
+		        }
+
                 // Status (to sell)
 		        if (! empty($arrayfields['p.tosell']['checked']))
         		{
@@ -897,6 +922,7 @@ else
 	                    print $product_static->LibStatut($obj->tosell,5,0);
 	                }
 	                print '</td>';
+		            if (! $i) $totalarray['nbfield']++;
         		}
                 // Status (to buy)
 		        if (! empty($arrayfields['p.tobuy']['checked']))
@@ -908,6 +934,7 @@ else
 	                    print $product_static->LibStatut($obj->tobuy,5,1);
 	                }
 	                print '</td>';
+		            if (! $i) $totalarray['nbfield']++;
         		}
         		// Action
         		print '<td class="nowrap" align="center">';
@@ -918,11 +945,12 @@ else
         		    print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
         		}
         		print '</td>';
+        		if (! $i) $totalarray['nbfield']++;
 
                 print "</tr>\n";
     			$i++;
     		}
-    		
+
     		$db->free($resql);
 
     		print "</table>";
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 0b45a0d0696..174d93f4aef 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -41,6 +41,7 @@ $ref=GETPOST('ref','alpha');
 $action=GETPOST('action','alpha');
 $backtopage=GETPOST('backtopage','alpha');
 $cancel=GETPOST('cancel','alpha');
+$confirm=GETPOST('confirm','aZ09');
 $status=GETPOST('status','int');
 $opp_status=GETPOST('opp_status','int');
 $opp_percent=price2num(GETPOST('opp_percent','alpha'));
@@ -68,7 +69,7 @@ if ($id > 0 || ! empty($ref))
 }
 
 // Security check
-$socid=GETPOST('socid');
+$socid=GETPOST('socid','int');
 //if ($user->societe_id > 0) $socid = $user->societe_id;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
 $result = restrictedArea($user, 'projet', $object->id,'projet&project');
 
@@ -135,6 +136,12 @@ if (empty($reshook))
 	        setEventMessages($langs->trans("ErrorOppStatusRequiredIfAmount"), null, 'errors');
 	    }
 
+	    // Create with status validated immediatly
+	    if (! empty($conf->global->PROJECT_CREATE_NO_DRAFT))
+	    {
+	        $status=Project::STATUS_VALIDATED;
+	    }
+
 	    if (! $error)
 	    {
 	        $error=0;
@@ -148,10 +155,10 @@ if (empty($reshook))
 	        $object->public          = GETPOST('public','alpha');
 	        $object->opp_amount      = price2num(GETPOST('opp_amount'));
 	        $object->budget_amount   = price2num(GETPOST('budget_amount'));
-	        $object->datec=dol_now();
-	        $object->date_start=$date_start;
-	        $object->date_end=$date_end;
-	        $object->statuts         = $status;
+	        $object->datec           = dol_now();
+	        $object->date_start      = $date_start;
+	        $object->date_end        = $date_end;
+	        $object->statut          = $status;
 	        $object->opp_status      = $opp_status;
 	        $object->opp_percent     = $opp_percent;
 
@@ -365,7 +372,7 @@ if (empty($reshook))
 	}
 
 
-	if ($action == 'confirm_validate' && GETPOST('confirm') == 'yes')
+	if ($action == 'confirm_validate' && $confirm == 'yes')
 	{
 	    $result = $object->setValid($user);
 	    if ($result <= 0)
@@ -374,7 +381,7 @@ if (empty($reshook))
 	    }
 	}
 
-	if ($action == 'confirm_close' && GETPOST('confirm') == 'yes')
+	if ($action == 'confirm_close' && $confirm == 'yes')
 	{
 	    $result = $object->setClose($user);
 	    if ($result <= 0)
@@ -383,7 +390,7 @@ if (empty($reshook))
 	    }
 	}
 
-	if ($action == 'confirm_reopen' && GETPOST('confirm') == 'yes')
+	if ($action == 'confirm_reopen' && $confirm == 'yes')
 	{
 	    $result = $object->setValid($user);
 	    if ($result <= 0)
@@ -409,7 +416,7 @@ if (empty($reshook))
 	    }
 	}
 
-	if ($action == 'confirm_clone' && $user->rights->projet->creer && GETPOST('confirm') == 'yes')
+	if ($action == 'confirm_clone' && $user->rights->projet->creer && $confirm == 'yes')
 	{
 	    $clone_contacts=GETPOST('clone_contacts')?1:0;
 	    $clone_tasks=GETPOST('clone_tasks')?1:0;
@@ -885,12 +892,16 @@ elseif ($object->id > 0)
 
 	        // Opportunity percent
 	        print '<tr><td>'.$langs->trans("OpportunityProbability").'</td><td>';
-	        if (strcmp($object->opp_percent,'')) print price($object->opp_percent,0,$langs,1,0).' %';
+	        if (strcmp($object->opp_percent,'')) print price($object->opp_percent, 0, $langs, 1, 0).' %';
 	        print '</td></tr>';
 
 	        // Opportunity Amount
 	        print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
-	        if (strcmp($object->opp_amount,'')) print price($object->opp_amount,0,$langs,1,0,0,$conf->currency);
+	        /*if ($object->opp_status)
+	        {
+	           print price($obj->opp_amount, 1, $langs, 1, 0, -1, $conf->currency);
+	        }*/
+	        if (strcmp($object->opp_amount,'')) print price($object->opp_amount, 0, $langs, 1, 0, -1, $conf->currency);
 	        print '</td></tr>';
 	    }
 
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 6a53be25c54..b22ea32f646 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -103,6 +103,20 @@ class Project extends CommonObject
 	 */
 	public $lines;
 
+	/**
+	 * Draft status
+	 */
+	const STATUS_DRAFT = 0;
+	/**
+	 * Open/Validated status
+	 */
+	const STATUS_VALIDATED = 1;
+	/**
+	 * Closed status
+	 */
+	const STATUS_CLOSED = 2;
+
+
 
     /**
      *  Constructor
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 851956f816b..b9da5379655 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -135,7 +135,7 @@ $arrayfields=array(
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
-   foreach($extrafields->attribute_label as $key => $val) 
+   foreach($extrafields->attribute_label as $key => $val)
    {
        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
    }
@@ -186,7 +186,7 @@ if (empty($reshook))
     	$toselect='';
     	$search_array_options=array();
     }
-    
+
 
     // Mass actions
     $objectclass='Project';
@@ -297,12 +297,12 @@ else if ($search_eyear > 0)
     $sql.= " AND p.datee BETWEEN '".$db->idate(dol_get_first_day($search_eyear,1,false))."' AND '".$db->idate(dol_get_last_day($search_eyear,12,false))."'";
 }
 if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
-if ($search_status >= 0) 
+if ($search_status >= 0)
 {
     if ($search_status == 99) $sql .= " AND p.fk_statut <> 2";
     else $sql .= " AND p.fk_statut = ".$db->escape($search_status);
 }
-if ($search_opp_status) 
+if ($search_opp_status)
 {
     if (is_numeric($search_opp_status) && $search_opp_status > 0) $sql .= " AND p.fk_opp_status = ".$db->escape($search_opp_status);
     if ($search_opp_status == 'all') $sql .= " AND p.fk_opp_status IS NOT NULL";
@@ -313,7 +313,7 @@ if ($search_public!='') $sql .= " AND p.public = ".$db->escape($search_public);
 if ($search_sale > 0) $sql.= " AND sc.fk_user = " .$search_sale;
 // For external user, no check is done on company permission because readability is managed by public status of project and assignement.
 //if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))";
-if ($search_project_user > 0) $sql.= " AND ecp.fk_c_type_contact IN (".join(',',array_keys($listofprojectcontacttype)).") AND ecp.element_id = p.rowid AND ecp.fk_socpeople = ".$search_project_user; 
+if ($search_project_user > 0) $sql.= " AND ecp.fk_c_type_contact IN (".join(',',array_keys($listofprojectcontacttype)).") AND ecp.element_id = p.rowid AND ecp.fk_socpeople = ".$search_project_user;
 if ($search_opp_amount != '') $sql .= natural_search('p.opp_amount', $search_opp_amount, 1);
 if ($search_budget_amount != '') $sql .= natural_search('p.budget_amount', $search_budget_amount, 1);
 // Add where from extra fields
@@ -324,7 +324,7 @@ foreach ($search_array_options as $key => $val)
     $typ=$extrafields->attribute_type[$tmpkey];
     $mode=0;
     if (in_array($typ, array('int','double'))) $mode=1;    // Search on a numeric
-    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit))) 
+    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit)))
     {
         $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
     }
@@ -383,8 +383,8 @@ if ($search_ref != '') 			$param.='&search_ref='.$search_ref;
 if ($search_label != '') 		$param.='&search_label='.$search_label;
 if ($search_societe != '') 		$param.='&search_societe='.$search_societe;
 if ($search_status >= 0) 		$param.='&search_status='.$search_status;
-if ((is_numeric($search_opp_status) && $search_opp_status >= 0) || in_array($search_opp_status, array('all','openedopp','none'))) 	$param.='&search_opp_status='.urlencode($search_opp_status);
-if ((is_numeric($search_opp_percent) && $search_opp_percent >= 0) || in_array($search_opp_percent, array('all','openedopp','none'))) 	$param.='&search_opp_percent='.urlencode($search_opp_percent);
+if ((is_numeric($search_opp_status) && $search_opp_status >= 0) || in_array($search_opp_status, array('all','openedopp','none'))) 	    $param.='&search_opp_status='.urlencode($search_opp_status);
+if ($search_opp_percent != '') 	$param.='&search_opp_percent='.urlencode($search_opp_percent);
 if ($search_public != '') 		$param.='&search_public='.$search_public;
 if ($search_project_user != '')   $param.='&search_project_user='.$search_project_user;
 if ($search_sale > 0)    		$param.='&search_sale='.$search_sale;
@@ -532,18 +532,18 @@ if (! empty($arrayfields['p.public']['checked']))
     print $form->selectarray('search_public',$array,$search_public);
     print '</td>';
 }
-if (! empty($arrayfields['p.opp_amount']['checked']))
-{
-	print '<td class="liste_titre nowrap right">';
-	print '<input type="text" class="flat" name="search_opp_amount" size="3" value="'.$search_opp_amount.'">';
-	print '</td>';
-}
 if (! empty($arrayfields['p.fk_opp_status']['checked']))
 {
 	print '<td class="liste_titre nowrap center">';
 	print $formproject->selectOpportunityStatus('search_opp_status', $search_opp_status, 1, 1, 1, 0, 'maxwidth100');
     print '</td>';
 }
+if (! empty($arrayfields['p.opp_amount']['checked']))
+{
+	print '<td class="liste_titre nowrap right">';
+	print '<input type="text" class="flat" name="search_opp_amount" size="3" value="'.$search_opp_amount.'">';
+	print '</td>';
+}
 if (! empty($arrayfields['p.opp_percent']['checked']))
 {
 	print '<td class="liste_titre nowrap right">';
@@ -620,8 +620,8 @@ if (! empty($arrayfields['commercial']['checked']))      print_liste_field_titre
 if (! empty($arrayfields['p.dateo']['checked']))         print_liste_field_titre($arrayfields['p.dateo']['label'],$_SERVER["PHP_SELF"],"p.dateo","",$param,'align="center"',$sortfield,$sortorder);
 if (! empty($arrayfields['p.datee']['checked']))         print_liste_field_titre($arrayfields['p.datee']['label'],$_SERVER["PHP_SELF"],"p.datee","",$param,'align="center"',$sortfield,$sortorder);
 if (! empty($arrayfields['p.public']['checked']))        print_liste_field_titre($arrayfields['p.public']['label'],$_SERVER["PHP_SELF"],"p.public","",$param,"",$sortfield,$sortorder);
-if (! empty($arrayfields['p.opp_amount']['checked']))    print_liste_field_titre($arrayfields['p.opp_amount']['label'],$_SERVER["PHP_SELF"],'p.opp_amount',"",$param,'align="right"',$sortfield,$sortorder);
 if (! empty($arrayfields['p.fk_opp_status']['checked'])) print_liste_field_titre($arrayfields['p.fk_opp_status']['label'],$_SERVER["PHP_SELF"],'p.fk_opp_status',"",$param,'align="center"',$sortfield,$sortorder);
+if (! empty($arrayfields['p.opp_amount']['checked']))    print_liste_field_titre($arrayfields['p.opp_amount']['label'],$_SERVER["PHP_SELF"],'p.opp_amount',"",$param,'align="right"',$sortfield,$sortorder);
 if (! empty($arrayfields['p.opp_percent']['checked']))   print_liste_field_titre($arrayfields['p.opp_percent']['label'],$_SERVER["PHP_SELF"],'p.opp_percent',"",$param,'align="right"',$sortfield,$sortorder);
 if (! empty($arrayfields['p.budget_amount']['checked'])) print_liste_field_titre($arrayfields['p.budget_amount']['label'],$_SERVER["PHP_SELF"],'p.budget_amount',"",$param,'align="right"',$sortfield,$sortorder);
 // Extra fields
@@ -661,7 +661,7 @@ while ($i < min($num,$limit))
 	$object->datee = $db->jdate($obj->date_end);
 	$object->statut = $obj->fk_statut;
 	$object->opp_status = $obj->fk_opp_status;
-	
+
 	$userAccess = $object->restrictedProjectArea($user);    // why this ?
 	if ($userAccess >= 0)
 	{
@@ -770,20 +770,7 @@ while ($i < min($num,$limit))
     		print '</td>';
 		    if (! $i) $totalarray['nbfield']++;
     	}
-    	// Opp Amount
-    	if (! empty($arrayfields['p.opp_amount']['checked']))
-    	{
-			print '<td align="right">';
-			if ($obj->opp_status_code) 
-			{
-			    print price($obj->opp_amount, 1, '', 1, -1, -1, '');
-			    $totalarray['totalopp'] += $obj->opp_amount;
-			}
-			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
-			if (! $i) $totalarray['totaloppfield']=$totalarray['nbfield'];
-    	}
-    	// Opp Status
+	    // Opp Status
     	if (! empty($arrayfields['p.fk_opp_status']['checked']))
     	{
             print '<td class="center">';
@@ -791,11 +778,25 @@ while ($i < min($num,$limit))
 			print '</td>';
 		    if (! $i) $totalarray['nbfield']++;
     	}
+    	// Opp Amount
+    	if (! empty($arrayfields['p.opp_amount']['checked']))
+    	{
+			print '<td align="right">';
+			//if ($obj->opp_status_code)
+			if (strcmp($obj->opp_amount,''))
+			{
+			    print price($obj->opp_amount, 1, $langs, 1, -1, -1, '');
+			    $totalarray['totalopp'] += $obj->opp_amount;
+			}
+			print '</td>';
+			if (! $i) $totalarray['nbfield']++;
+			if (! $i) $totalarray['totaloppfield']=$totalarray['nbfield'];
+    	}
     	// Opp percent
 	    if (! empty($arrayfields['p.opp_percent']['checked']))
     	{
 			print '<td align="right">';
-			if ($obj->opp_percent) print price($obj->opp_percent, 1, '', 1, 0).'%';
+			if ($obj->opp_percent) print price($obj->opp_percent, 1, $langs, 1, 0).'%';
 			print '</td>';
 		    if (! $i) $totalarray['nbfield']++;
     	}
@@ -803,9 +804,9 @@ while ($i < min($num,$limit))
 	    if (! empty($arrayfields['p.budget_amount']['checked']))
     	{
 			print '<td align="right">';
-			if ($obj->budget_amount != '') 
+			if ($obj->budget_amount != '')
 			{
-			    print price($obj->budget_amount, 1, '', 1, -1, -1);
+			    print price($obj->budget_amount, 1, $langs, 1, -1, -1);
 			    $totalarray['totalbudget'] += $obj->budget_amount;
 			}
 			print '</td>';
@@ -826,9 +827,9 @@ while ($i < min($num,$limit))
 		            $tmpkey='options_'.$key;
 		            print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
 		            print '</td>';
+		            if (! $i) $totalarray['nbfield']++;
 		        }
 		    }
-		    if (! $i) $totalarray['nbfield']++;
 		}
 		// Fields from hook
 		$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
@@ -866,7 +867,7 @@ while ($i < min($num,$limit))
         }
         print '</td>';
 		if (! $i) $totalarray['nbfield']++;
-		
+
 		print "</tr>\n";
 
 	}
@@ -887,8 +888,8 @@ if (isset($totalarray['totaloppfield']) || isset($totalarray['totalbudgetfield']
             if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>';
             else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
         }
-        elseif ($totalarray['totaloppfield'] == $i) print '<td align="right">'.price($totalarray['totalopp']).'</td>';
-        elseif ($totalarray['totalbudgetfield'] == $i) print '<td align="right">'.price($totalarray['totalbudget']).'</td>';
+        elseif ($totalarray['totaloppfield'] == $i) print '<td align="right">'.price($totalarray['totalopp'], 1, $langs, 1, -1, -1).'</td>';
+        elseif ($totalarray['totalbudgetfield'] == $i) print '<td align="right">'.price($totalarray['totalbudget'], 1, $langs, 1, -1, -1).'</td>';
         else print '<td></td>';
     }
     print '</tr>';
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index 44524cd7acd..d157cfc99d2 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -257,66 +257,63 @@ if ($ret)
 {
     foreach ($object->lines as $resource)
     {
-            
+        print '<tr class="oddeven">';
 
-            $style='';
-            if ($resource->id == GETPOST('lineid')) $style='style="background: orange;"';
+        if (! empty($arrayfields['t.ref']['checked']))
+        {
+        	print '<td>';
+        	print $resource->getNomUrl(5);
+        	print '</td>';
+	        if (! $i) $totalarray['nbfield']++;
+        }
 
-            print '<tr '.$bc[$var].' '.$style.'>';
+        if (! empty($arrayfields['ty.label']['checked']))
+        {
+        	print '<td>';
+        	print $resource->type_label;
+        	print '</td>';
+	        if (! $i) $totalarray['nbfield']++;
+        }
+        // Extra fields
+        if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+        {
+        	foreach($extrafields->attribute_label as $key => $val)
+        	{
+        		if (! empty($arrayfields["ef.".$key]['checked']))
+        		{
+        			print '<td';
+        			$align=$extrafields->getAlignFlag($key);
+        			if ($align) print ' align="'.$align.'"';
+        			print '>';
+        			$tmpkey='options_'.$key;
+        			print $extrafields->showOutputField($key, $resource->array_options[$tmpkey], '', 1);
+        			print '</td>';
+	                if (! $i) $totalarray['nbfield']++;
+        		}
+        	}
+        }
 
-            if (! empty($arrayfields['t.ref']['checked']))
-            {
-            	print '<td>';
-            	print $resource->getNomUrl(5);
-            	print '</td>';
-            }
+        print '<td align="center">';
+        print '<a href="./card.php?action=edit&id='.$resource->id.'">';
+        print img_edit();
+        print '</a>';
+        print '&nbsp;';
+        print '<a href="./card.php?action=delete&id='.$resource->id.'">';
+        print img_delete();
+        print '</a>';
+        print '</td>';
+        if (! $i) $totalarray['nbfield']++;
 
-            if (! empty($arrayfields['ty.label']['checked']))
-            {
-            	print '<td>';
-            	print $resource->type_label;
-            	print '</td>';
-            }
-            // Extra fields
-            if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-            {
-            	foreach($extrafields->attribute_label as $key => $val)
-            	{
-            		if (! empty($arrayfields["ef.".$key]['checked']))
-            		{
-            			print '<td';
-            			$align=$extrafields->getAlignFlag($key);
-            			if ($align) print ' align="'.$align.'"';
-            			print '>';
-            			$tmpkey='options_'.$key;
-            			print $extrafields->showOutputField($key, $resource->array_options[$tmpkey], '', 1);
-            			print '</td>';
-            		}
-            	}
-            	if (! $i) $totalarray['nbfield']++;
-            }
-
-            print '<td align="center">';
-            print '<a href="./card.php?action=edit&id='.$resource->id.'">';
-            print img_edit();
-            print '</a>';
-            print '&nbsp;';
-            print '<a href="./card.php?action=delete&id='.$resource->id.'">';
-            print img_delete();
-            print '</a>';
-            print '</td>';
-
-            print '</tr>';
+        print '</tr>';
     }
-
-    print '</table>';
-    print "</form>\n";
 }
 else
 {
     print '<tr><td class="opacitymedium">'.$langs->trans('NoResourceInDatabase').'</td></tr>';
 }
 
-llxFooter();
+print '</table>';
+print "</form>\n";
 
+llxFooter();
 $db->close();
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 28d6ec27368..3cbd8768e92 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -247,7 +247,7 @@ if (empty($reshook))
     $permtodelete = $user->rights->societe->supprimer;
     $uploaddir = $conf->societe->dir_output;
     include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
-    
+
     if ($action == 'setstcomm')
     {
         $object = new Client($db);
@@ -930,6 +930,7 @@ print "</tr>\n";
 
 
 $i = 0;
+$totalarray=array();
 while ($i < min($num, $limit))
 {
 	$obj = $db->fetch_object($resql);
@@ -955,46 +956,55 @@ while ($i < min($num, $limit))
 		print '<td class="tdoverflowmax200">';
 		print $companystatic->getNomUrl(1,'',100);
 		print "</td>\n";
+        if (! $i) $totalarray['nbfield']++;
 	}
 	// Barcode
     if (! empty($arrayfields['s.barcode']['checked']))
 	{
 		print '<td>'.$obj->barcode.'</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
 	// Customer code
     if (! empty($arrayfields['s.code_client']['checked']))
 	{
 		print '<td>'.$obj->code_client.'</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
     // Supplier code
     if (! empty($arrayfields['s.code_fournisseur']['checked']))
 	{
 		print '<td>'.$obj->code_fournisseur.'</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
 	// Account customer code
     if (! empty($arrayfields['s.code_compta']['checked']))
 	{
 		print '<td>'.$obj->code_compta.'</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
     // Account supplier code
     if (! empty($arrayfields['s.code_compta_fournisseur']['checked']))
 	{
 		print '<td>'.$obj->code_compta_fournisseur.'</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
 	// Town
     if (! empty($arrayfields['s.town']['checked']))
     {
         print "<td>".$obj->town."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
     }
     // Zip
     if (! empty($arrayfields['s.zip']['checked']))
     {
         print "<td>".$obj->zip."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
     }
     // State
     if (! empty($arrayfields['state.nom']['checked']))
     {
         print "<td>".$obj->state_name."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
     }
     // Country
     if (! empty($arrayfields['country.code_iso']['checked']))
@@ -1003,6 +1013,7 @@ while ($i < min($num, $limit))
 		$tmparray=getCountry($obj->fk_pays,'all');
 		print $tmparray['label'];
 		print '</td>';
+        if (! $i) $totalarray['nbfield']++;
     }
 	// Type ent
     if (! empty($arrayfields['typent.code']['checked']))
@@ -1011,42 +1022,52 @@ while ($i < min($num, $limit))
 		if (count($typenArray)==0) $typenArray = $formcompany->typent_array(1);
 		print $typenArray[$obj->typent_code];
 		print '</td>';
+        if (! $i) $totalarray['nbfield']++;
     }
     if (! empty($arrayfields['s.email']['checked']))
     {
         print "<td>".$obj->email."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
     }
     if (! empty($arrayfields['s.phone']['checked']))
     {
         print "<td>".$obj->phone."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
     }
     if (! empty($arrayfields['s.url']['checked']))
     {
         print "<td>".$obj->url."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
     }
     if (! empty($arrayfields['s.siren']['checked']))
     {
         print "<td>".$obj->idprof1."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
     }
     if (! empty($arrayfields['s.siret']['checked']))
     {
         print "<td>".$obj->idprof2."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
     }
     if (! empty($arrayfields['s.ape']['checked']))
     {
         print "<td>".$obj->idprof3."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
     }
     if (! empty($arrayfields['s.idprof4']['checked']))
     {
         print "<td>".$obj->idprof4."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
     }
     if (! empty($arrayfields['s.idprof5']['checked']))
     {
         print "<td>".$obj->idprof5."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
     }
     if (! empty($arrayfields['s.idprof6']['checked']))
     {
         print "<td>".$obj->idprof6."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
     }
     // Type
     if (! empty($arrayfields['customerorsupplier']['checked']))
@@ -1075,6 +1096,7 @@ while ($i < min($num, $limit))
     	}
     	print $s;
     	print '</td>';
+        if (! $i) $totalarray['nbfield']++;
     }
 
     if (! empty($arrayfields['s.fk_prospectlevel']['checked']))
@@ -1083,6 +1105,7 @@ while ($i < min($num, $limit))
 		print '<td align="center">';
 		print $companystatic->getLibProspLevel();
 		print "</td>";
+        if (! $i) $totalarray['nbfield']++;
     }
 
     if (! empty($arrayfields['s.fk_stcomm']['checked']))
@@ -1098,6 +1121,7 @@ while ($i < min($num, $limit))
 			if ($obj->stcomm_id != $val['id']) print '<a class="pictosubstatus" href="'.$_SERVER["PHP_SELF"].'?stcommsocid='.$obj->rowid.'&stcomm='.$val['code'].'&action=setstcomm'.$param.($page?'&page='.urlencode($page):'').'">'.img_action($titlealt,$val['code']).'</a>';
 		}
 		print '</div></div></td>';
+        if (! $i) $totalarray['nbfield']++;
     }
 	// Extra fields
 	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
@@ -1113,6 +1137,7 @@ while ($i < min($num, $limit))
 				$tmpkey='options_'.$key;
 				print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
 				print '</td>';
+                if (! $i) $totalarray['nbfield']++;
 			}
 	   }
 	}
@@ -1126,6 +1151,7 @@ while ($i < min($num, $limit))
         print '<td align="center" class="nowrap">';
         print dol_print_date($db->jdate($obj->date_creation), 'dayhour');
         print '</td>';
+        if (! $i) $totalarray['nbfield']++;
     }
     // Date modification
     if (! empty($arrayfields['s.tms']['checked']))
@@ -1133,11 +1159,13 @@ while ($i < min($num, $limit))
         print '<td align="center" class="nowrap">';
         print dol_print_date($db->jdate($obj->date_update), 'dayhour');
         print '</td>';
+        if (! $i) $totalarray['nbfield']++;
     }
     // Status
     if (! empty($arrayfields['s.status']['checked']))
     {
         print '<td align="center" class="nowrap">'.$companystatic->getLibStatut(3).'</td>';
+        if (! $i) $totalarray['nbfield']++;
     }
 
     // Action column
@@ -1150,7 +1178,7 @@ while ($i < min($num, $limit))
     }
     print '</td>';
     if (! $i) $totalarray['nbfield']++;
-    
+
 	print '</tr>'."\n";
 	$i++;
 }
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index c0738f004bc..f3e7df31609 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -4179,7 +4179,7 @@ dl.dropdown {
     position:absolute;
     top:2px;
     list-style:none;
-    max-height: 300px;
+    max-height: 280px;
     overflow: auto;
 }
 .dropdown span.value {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 4557c6856fb..49a8745f61e 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -4266,7 +4266,7 @@ dl.dropdown {
     position:absolute;
     top:2px;
     list-style:none;
-    max-height: 300px;
+    max-height: 280px;
     overflow: auto;
 }
 .dropdown span.value {
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 415665bc5fc..6aaa3274b9d 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -465,6 +465,7 @@ print "</tr>\n";
 
 
 $i = 0;
+$totalarray=array();
 while ($i < min($num,$limit))
 {
     $obj = $db->fetch_object($result);
@@ -497,32 +498,39 @@ while ($i < min($num,$limit))
         	print img_picto($langs->trans("Administrator"), 'star', 'class="valignmiddle paddingleft"');
         }
         print '</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
     if (! empty($arrayfields['u.lastname']['checked']))
 	{
 	      print '<td>'.$obj->lastname.'</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
     if (! empty($arrayfields['u.firstname']['checked']))
 	{
 	  print '<td>'.$obj->firstname.'</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
     if (! empty($arrayfields['u.gender']['checked']))
 	{
 	  print '<td>';
 	  if ($obj->gender) print $langs->trans("Gender".$obj->gender);
 	  print '</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
     if (! empty($arrayfields['u.employee']['checked']))
 	{
 	  print '<td>'.yn($obj->employee).'</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
 	if (! empty($arrayfields['u.accountancy_code']['checked']))
 	{
 	  print '<td>'.$obj->accountancy_code.'</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
     if (! empty($arrayfields['u.email']['checked']))
 	{
 	  print '<td>'.$obj->email.'</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
 	if (! empty($arrayfields['u.fk_soc']['checked']))
 	{
@@ -543,6 +551,7 @@ while ($i < min($num,$limit))
         	print $langs->trans("InternalUser");
         }
         print '</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
     // Multicompany enabled
 	if (! empty($conf->multicompany->enabled) && is_object($mc) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
@@ -560,6 +569,7 @@ while ($i < min($num,$limit))
         		print $mc->label;
         	}
         	print '</td>';
+            if (! $i) $totalarray['nbfield']++;
 		}
     }
     // Supervisor
@@ -589,17 +599,20 @@ while ($i < min($num,$limit))
             }
         }
         print '</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
 
     // Date last login
     if (! empty($arrayfields['u.datelastlogin']['checked']))
 	{
         print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($obj->datelastlogin),"dayhour").'</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
     // Date previous login
     if (! empty($arrayfields['u.datepreviouslogin']['checked']))
 	{
         print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($obj->datepreviouslogin),"dayhour").'</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
 
 	// Extra fields
@@ -616,6 +629,7 @@ while ($i < min($num,$limit))
 				$tmpkey='options_'.$key;
 				print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
 				print '</td>';
+                if (! $i) $totalarray['nbfield']++;
 			}
 	   }
 	}
@@ -629,6 +643,7 @@ while ($i < min($num,$limit))
         print '<td align="center">';
         print dol_print_date($db->jdate($obj->date_creation), 'dayhour');
         print '</td>';
+        if (! $i) $totalarray['nbfield']++;
     }
     // Date modification
     if (! empty($arrayfields['u.tms']['checked']))
@@ -636,15 +651,18 @@ while ($i < min($num,$limit))
         print '<td align="center">';
         print dol_print_date($db->jdate($obj->date_update), 'dayhour');
         print '</td>';
+        if (! $i) $totalarray['nbfield']++;
     }
     // Status
     if (! empty($arrayfields['u.statut']['checked']))
     {
-	  $userstatic->statut=$obj->statut;
-      print '<td align="center">'.$userstatic->getLibStatut(3).'</td>';
+	   $userstatic->statut=$obj->statut;
+       print '<td align="center">'.$userstatic->getLibStatut(3).'</td>';
+       if (! $i) $totalarray['nbfield']++;
     }
     // Action column
     print '<td></td>';
+    if (! $i) $totalarray['nbfield']++;
 
     print "</tr>\n";
     $i++;

From e0275285454bcb2090816e42c6298aa44a7ee768 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Jun 2017 14:24:12 +0200
Subject: [PATCH 105/438] Clean module builder

---
 .../template/core/modules/modMyModule.class.php           | 8 +++++---
 htdocs/modulebuilder/template/css/mycss.css.php           | 6 ++----
 htdocs/modulebuilder/template/js/mymodule.js.php          | 4 +---
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
index 9e8f5ca9975..dc98c327cb3 100644
--- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
+++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
@@ -50,7 +50,7 @@ class modMyModule extends DolibarrModules
 
 		// Id for module (must be unique).
 		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
-		$this->numero = 500000;		// TODO Go on page http://wiki.dolibarr.org/index.php/List_of_modules_id to reserve id number for your module
+		$this->numero = 500000;		// TODO Go on page https://wiki.dolibarr.org/index.php/List_of_modules_id to reserve id number for your module
 		// Key text used to identify module (for permissions, menus, etc...)
 		$this->rights_class = 'mymodule';
 
@@ -62,11 +62,13 @@ class modMyModule extends DolibarrModules
 		// 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' => '001', 'label' => $langs->trans("MyOwnFamily")));
 
-		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		// Module label (no space allowed), used if translation string 'ModuleMyModuleName' not found (MyModue is name of module).
 		$this->name = preg_replace('/^mod/i','',get_class($this));
-		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+		// Module description, used if translation string 'ModuleMyModuleDesc' not found (MyModue is name of module).
 		$this->description = "MyModuleDescription";
+		// Used only if file README.md and README-LL.md not found.
 		$this->descriptionlong = "MyModuleDescription (Long)";
+
 		$this->editor_name = 'Editor name';
 		$this->editor_url = 'https://www.example.com';
 
diff --git a/htdocs/modulebuilder/template/css/mycss.css.php b/htdocs/modulebuilder/template/css/mycss.css.php
index eaa248288e8..60d49d7c0bc 100644
--- a/htdocs/modulebuilder/template/css/mycss.css.php
+++ b/htdocs/modulebuilder/template/css/mycss.css.php
@@ -17,11 +17,9 @@
  */
 
 /**
- * \file    css/mycss.css.php
+ * \file    htdocs/modulebuilder/template/css/mycss.css.php
  * \ingroup mymodule
- * \brief   Example CSS.
- *
- * Put detailed description here.
+ * \brief   CSS file for module MyModule.
  */
 
 header('Content-Type: text/css');
diff --git a/htdocs/modulebuilder/template/js/mymodule.js.php b/htdocs/modulebuilder/template/js/mymodule.js.php
index a08ae02c2fc..32915dbe34e 100644
--- a/htdocs/modulebuilder/template/js/mymodule.js.php
+++ b/htdocs/modulebuilder/template/js/mymodule.js.php
@@ -19,9 +19,7 @@
 /**
  * \file    htdocs/modulebuilder/template/js/mymodule.js.php
  * \ingroup mymodule
- * \brief   Example JavaScript.
- *
- * Put detailed description here.
+ * \brief   JavaScript file for module MyModule.
  */
 
 header('Content-Type: application/javascript');

From b1f93ccb0c72301ffc186ebf96669774f2d2971e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Jun 2017 14:33:46 +0200
Subject: [PATCH 106/438] Fix security

---
 htdocs/accountancy/admin/account.php             | 2 +-
 htdocs/accountancy/admin/fiscalyear.php          | 2 +-
 htdocs/accountancy/admin/importaccounts.php      | 2 +-
 htdocs/accountancy/admin/productaccount.php      | 2 +-
 htdocs/accountancy/bookkeeping/balance.php       | 2 +-
 htdocs/accountancy/bookkeeping/list.php          | 2 +-
 htdocs/accountancy/bookkeeping/listbyaccount.php | 2 +-
 htdocs/accountancy/bookkeeping/listbyyear.php    | 2 +-
 htdocs/accountancy/customer/lines.php            | 2 +-
 htdocs/accountancy/customer/list.php             | 2 +-
 htdocs/accountancy/expensereport/lines.php       | 2 +-
 htdocs/accountancy/expensereport/list.php        | 2 +-
 htdocs/accountancy/supplier/lines.php            | 2 +-
 htdocs/accountancy/supplier/list.php             | 2 +-
 htdocs/adherents/list.php                        | 2 +-
 htdocs/adherents/subscription/list.php           | 2 +-
 htdocs/adherents/type.php                        | 2 +-
 htdocs/admin/defaultvalues.php                   | 2 +-
 htdocs/admin/translation.php                     | 2 +-
 htdocs/bookmarks/list.php                        | 2 +-
 htdocs/comm/action/listactions.php               | 2 +-
 htdocs/comm/mailing/cibles.php                   | 2 +-
 htdocs/commande/customer.php                     | 2 +-
 htdocs/commande/list.php                         | 2 +-
 htdocs/compta/bank/index.php                     | 2 +-
 htdocs/compta/prelevement/card.php               | 2 +-
 htdocs/compta/prelevement/demandes.php           | 2 +-
 htdocs/compta/prelevement/factures.php           | 2 +-
 htdocs/compta/recap-compta.php                   | 2 +-
 htdocs/compta/resultat/clientfourn.php           | 2 +-
 htdocs/contact/agenda.php                        | 2 +-
 htdocs/contact/list.php                          | 2 +-
 htdocs/contrat/list.php                          | 2 +-
 htdocs/contrat/services.php                      | 2 +-
 htdocs/cron/list.php                             | 2 +-
 htdocs/expedition/list.php                       | 2 +-
 htdocs/expensereport/list.php                    | 2 +-
 htdocs/fourn/commande/list.php                   | 2 +-
 htdocs/fourn/product/list.php                    | 2 +-
 htdocs/modulebuilder/template/myobject_list.php  | 2 +-
 htdocs/product/inventory/list.php                | 2 +-
 htdocs/product/list-with-listview.php            | 2 +-
 htdocs/product/list.php                          | 2 +-
 htdocs/product/popuprop.php                      | 2 +-
 htdocs/product/stock/productlot_list.php         | 2 +-
 htdocs/projet/info.php                           | 2 +-
 htdocs/projet/list.php                           | 2 +-
 htdocs/projet/tasks/list.php                     | 2 +-
 htdocs/projet/tasks/time.php                     | 2 +-
 htdocs/resource/list.php                         | 2 +-
 htdocs/societe/agenda.php                        | 2 +-
 htdocs/societe/list.php                          | 2 +-
 htdocs/societe/notify/card.php                   | 2 +-
 htdocs/user/group/index.php                      | 2 +-
 htdocs/user/index.php                            | 2 +-
 htdocs/user/notify/card.php                      | 2 +-
 56 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index c2b6997d96e..83c844123be 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -52,7 +52,7 @@ if ($user->societe_id > 0) accessforbidden();
 if (! $user->rights->accounting->chartofaccount) accessforbidden();
 
 // Load variable for pagination
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'sortorder');
 $page = GETPOST("page", 'int');
diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php
index 47759792d71..5eabf9eda25 100644
--- a/htdocs/accountancy/admin/fiscalyear.php
+++ b/htdocs/accountancy/admin/fiscalyear.php
@@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/fiscalyear.class.php';
 $action = GETPOST('action','aZ09');
 
 // Load variable for pagination
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/accountancy/admin/importaccounts.php b/htdocs/accountancy/admin/importaccounts.php
index d1083c50d10..6b462928736 100644
--- a/htdocs/accountancy/admin/importaccounts.php
+++ b/htdocs/accountancy/admin/importaccounts.php
@@ -39,7 +39,7 @@ $langs->load("accountancy");
 if (! $user->admin)
 	accessforbidden();
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index 069076e3d88..b6af74ec96d 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -70,7 +70,7 @@ $accounting_product_mode = GETPOST('accounting_product_mode', 'alpha');
 $btn_changeaccount = GETPOST('changeaccount');
 $btn_changetype = GETPOST('changetype');
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 34db60f7a0f..3f2c472cc58 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -55,7 +55,7 @@ if (GETPOST("button_export_csv_x") || GETPOST("button_export_csv")) {
 	$action = 'export_csv';
 }
 
-$limit = GETPOST('limit') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int'):$conf->liste_limit;
 
 $offset = $limit * $page;
 
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 60e283eea2c..26ab0fa4c4d 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -80,7 +80,7 @@ $search_direction = GETPOST('search_direction', 'alpha');
 $search_ledger_code = GETPOST('search_ledger_code', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit') ? GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int'):(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 6b329e421ad..b9a5526a7ab 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -59,7 +59,7 @@ $search_direction = GETPOST('search_direction', 'alpha');
 $search_ledger_code = GETPOST('search_ledger_code', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit') ? GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int'):(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/accountancy/bookkeeping/listbyyear.php b/htdocs/accountancy/bookkeeping/listbyyear.php
index 5fba55f2eba..f4134a2e028 100644
--- a/htdocs/accountancy/bookkeeping/listbyyear.php
+++ b/htdocs/accountancy/bookkeeping/listbyyear.php
@@ -37,7 +37,7 @@ $langs->load("accountancy");
 $page = GETPOST("page");
 $sortorder = GETPOST("sortorder");
 $sortfield = GETPOST("sortfield");
-$limit = GETPOST('limit') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int'):$conf->liste_limit;
 $search_date_start = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
 $search_date_end = dol_mktime(0, 0, 0, GETPOST('date_endmonth', 'int'), GETPOST('date_endday', 'int'), GETPOST('date_endyear', 'int'));
 $search_doc_type = GETPOST('search_doc_type', 'alpha');
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index 9c88a417bac..a5dfa3941d1 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -55,7 +55,7 @@ $search_country = GETPOST('search_country', 'alpha');
 $search_tvaintra = GETPOST('search_tvaintra', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit') ? GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int'):(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page', 'int');
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 9e534d55af7..56765e1ba4f 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -63,7 +63,7 @@ $search_vat = GETPOST('search_vat', 'alpha');
 $btn_ventil = GETPOST('ventil', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit') ? GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int'):(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
index ca2369a11e4..5a386c82522 100644
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -52,7 +52,7 @@ $search_account = GETPOST('search_account', 'alpha');
 $search_vat = GETPOST('search_vat', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit') ? GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int'):(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page', 'int');
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index 01acf759260..7fb5f26b28b 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -61,7 +61,7 @@ $search_vat = GETPOST('search_vat', 'alpha');
 $btn_ventil = GETPOST('ventil', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit') ? GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int'):(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 06308a67fa1..164525d5214 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -54,7 +54,7 @@ $search_account = GETPOST('search_account', 'alpha');
 $search_vat = GETPOST('search_vat', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit') ? GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int'):(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page', 'int');
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 7ed1453982e..26000c3fb66 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -63,7 +63,7 @@ $search_vat = GETPOST('search_vat', 'alpha');
 $btn_ventil = GETPOST('ventil', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit') ? GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int'):(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 82ab87961f3..3dd60ad7478 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -62,7 +62,7 @@ $optioncss = GETPOST('optioncss','alpha');
 
 if ($statut < -1) $statut = '';
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index 633c872e607..a5066f98f0c 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -42,7 +42,7 @@ $optioncss = GETPOST('optioncss','alpha');
 
 $date_select=isset($_GET["date_select"])?$_GET["date_select"]:$_POST["date_select"];
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 4935b6c4c6d..1461098034e 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -44,7 +44,7 @@ $search_email		= GETPOST('search_email','alpha');
 $type				= GETPOST('type','alpha');
 $status				= GETPOST('status','alpha');
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 7409ef1b973..04a9320f4c1 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -39,7 +39,7 @@ $action=GETPOST('action','alpha');
 
 $mode = GETPOST('mode')?GETPOST('mode'):'createform';   // 'createform', 'filters', 'sortorder', 'focus'
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 67433eca35d..f48ef749b8a 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -45,7 +45,7 @@ $transvalue=GETPOST('transvalue','alpha');
 
 $mode = GETPOST('mode')?GETPOST('mode'):'overwrite';
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index 57bb6a71cec..71c8174f1cd 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -39,7 +39,7 @@ if (! $user->rights->bookmark->lire) {
 }
 $optioncss = GETPOST('optioncss','alpha');
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index 400b882d143..186165b2f9a 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -76,7 +76,7 @@ if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS))
 	$filtert=$user->id;
 }
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 8ee163e8e6f..73aaab22248 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -39,7 +39,7 @@ if (! $user->rights->mailing->lire || $user->societe_id > 0) accessforbidden();
 
 
 // Load variable for pagination
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php
index 1fa05a07832..cdf26b6a36d 100644
--- a/htdocs/commande/customer.php
+++ b/htdocs/commande/customer.php
@@ -45,7 +45,7 @@ accessforbidden();
 $langs->load("companies");
 $langs->load("orders");
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index c879a2da7d8..2f8dfc28ae7 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -82,7 +82,7 @@ $result = restrictedArea($user, 'commande', $id,'');
 
 $diroutputmassaction=$conf->commande->dir_output . '/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index 6315b8e1d50..f5e9d347e8c 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -55,7 +55,7 @@ $result=restrictedArea($user,'banque');
 
 $diroutputmassaction=$conf->bank->dir_output . '/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index 443f93eb52c..915cf43fb79 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -48,7 +48,7 @@ $id = GETPOST('id','int');
 $socid = GETPOST('socid','int');
 
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index 8b5e024f3b6..6e63b74a408 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -45,7 +45,7 @@ $page =  GETPOST('page','int');
 $sortorder = GETPOST('sortorder','alpha');
 $sortfield = GETPOST('sortfield','alpha');
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index 9987d41e802..28836abe667 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -44,7 +44,7 @@ if ($user->societe_id > 0) accessforbidden();
 $prev_id = GETPOST('id','int');
 $socid = GETPOST('socid','int');
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index 5ec219a48ee..3ddb99a4369 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -40,7 +40,7 @@ $object = new Societe($db);
 if ($id > 0) $object->fetch($id);
 
 // Load variable for pagination
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 8a69af99cf5..61d18cd85cc 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -52,7 +52,7 @@ if ($user->societe_id > 0) $socid = $user->societe_id;
 if (! empty($conf->comptabilite->enabled)) $result=restrictedArea($user,'compta','','','resultat');
 if (! empty($conf->accounting->enabled)) $result=restrictedArea($user,'accounting','','','comptarapport');
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php
index ba0ec3f8ef0..96876ed561d 100644
--- a/htdocs/contact/agenda.php
+++ b/htdocs/contact/agenda.php
@@ -89,7 +89,7 @@ $search_agenda_label=GETPOST('search_agenda_label');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', $objcanvas); // If we create a contact with no company (shared contacts), no check on write permission
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index ad71eb3786f..fd48794afad 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -74,7 +74,7 @@ $optioncss = GETPOST('optioncss','alpha');
 $type=GETPOST("type");
 $view=GETPOST("view");
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page', 'int');
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index bbe30fe26dd..0003bdec348 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -65,7 +65,7 @@ $month=GETPOST("month","int");
 
 $optioncss = GETPOST('optioncss','alpha');
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php
index 8d4fa7e69d4..6902927a8b7 100644
--- a/htdocs/contrat/services.php
+++ b/htdocs/contrat/services.php
@@ -33,7 +33,7 @@ $langs->load("products");
 $langs->load("contracts");
 $langs->load("companies");
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 636770ef567..12c92e9bdd3 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -39,7 +39,7 @@ $action=GETPOST('action','alpha');
 $confirm=GETPOST('confirm','alpha');
 $id=GETPOST('id','int');
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 68938afef6a..517a231fdb9 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -53,7 +53,7 @@ $search_type_thirdparty=GETPOST("search_type_thirdparty",'int');
 $sall = GETPOST('sall', 'alphanohtml');
 $optioncss = GETPOST('optioncss','alpha');
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index e41666cdd92..8fcacda5d44 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -51,7 +51,7 @@ $diroutputmassaction=$conf->expensereport->dir_output . '/temp/massgeneration/'.
 
 
 // Load variable for pagination
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 9650aa5328b..4b117cc4a2c 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -101,7 +101,7 @@ $result = restrictedArea($user, 'fournisseur', $orderid, '', 'commande');
 
 $diroutputmassaction=$conf->fournisseur->commande->dir_output . '/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index d6af4d3b1ac..d6d0ac734a2 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -42,7 +42,7 @@ $type = GETPOST('type');
 $optioncss = GETPOST('optioncss','alpha');
 
 // Load variable for pagination
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index baca7249a51..8fac1c8a388 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -68,7 +68,7 @@ $search_myfield=GETPOST('search_myfield');
 $optioncss = GETPOST('optioncss','alpha');
 
 // Load variable for pagination
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index 41c03756a44..93a18788f95 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/inventory/lib/inventory.lib.php';
 $langs->load("stock");
 $langs->load("inventory");
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = (GETPOST("page",'int')?GETPOST("page", 'int'):0);
diff --git a/htdocs/product/list-with-listview.php b/htdocs/product/list-with-listview.php
index 61f6233f32e..f3119af83c9 100644
--- a/htdocs/product/list-with-listview.php
+++ b/htdocs/product/list-with-listview.php
@@ -77,7 +77,7 @@ if (!$_POST) {
 
 $diroutputmassaction=$conf->product->dir_output . '/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = (GETPOST("page",'int')?GETPOST("page", 'int'):0);
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 2afa8438e73..841156ebb0d 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -77,7 +77,7 @@ if (!$_POST) {
 
 $diroutputmassaction=$conf->product->dir_output . '/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = (GETPOST("page",'int')?GETPOST("page", 'int'):0);
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index 5670b62e6bd..8aa5191b176 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -38,7 +38,7 @@ $type=GETPOST("type","int");
 if (! empty($user->societe_id)) $socid=$user->societe_id;
 $result=restrictedArea($user,'produit|service');
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index de245b9b04a..1d74cf85fad 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -61,7 +61,7 @@ $search_myfield=GETPOST('search_myfield');
 $optioncss = GETPOST('optioncss','alpha');
 
 // Load variable for pagination
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/projet/info.php b/htdocs/projet/info.php
index 74015626b9e..135517f26db 100644
--- a/htdocs/projet/info.php
+++ b/htdocs/projet/info.php
@@ -35,7 +35,7 @@ $ref    = GETPOST('ref','alpha');
 $socid  = GETPOST('socid','int');
 $action = GETPOST('action','alpha');
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield","alpha");
 $sortorder = GETPOST("sortorder");
 $page = GETPOST("page");
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index b9da5379655..c85b96ffcf4 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -55,7 +55,7 @@ if (!$user->rights->projet->lire) accessforbidden();
 
 $diroutputmassaction=$conf->projet->dir_output . '/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield","alpha");
 $sortorder = GETPOST("sortorder");
 $page = GETPOST("page");
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 67f745c0b57..7e809fe966f 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -85,7 +85,7 @@ if (!$user->rights->projet->lire) accessforbidden();
 
 $diroutputmassaction=$conf->projet->dir_output . '/tasks/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index ecd15a8aa3b..8aa496eaa5a 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -58,7 +58,7 @@ $socid=0;
 //if ($user->societe_id > 0) $socid = $user->societe_id;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
 if (!$user->rights->projet->lire) accessforbidden();
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index d157cfc99d2..f16d1ef122c 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -91,7 +91,7 @@ if (empty($sortorder)) $sortorder="ASC";
 if (empty($sortfield)) $sortfield="t.rowid";
 if (empty($arch)) $arch = 0;
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $page = GETPOST("page");
 $page = is_numeric($page) ? $page : 0;
 $page = $page == -1 ? 0 : $page;
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index d0eb936fcbb..dbb9e831fe9 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -50,7 +50,7 @@ $socid = GETPOST('socid','int');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'societe', $socid, '&societe');
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 3cbd8768e92..9842e913dae 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -84,7 +84,7 @@ $mode=GETPOST("mode");
 
 $diroutputmassaction=$conf->societe->dir_output . '/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield=GETPOST("sortfield",'alpha');
 $sortorder=GETPOST("sortorder",'alpha');
 $page=GETPOST("page",'int');
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index 7e7648db712..9a5405de7fd 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -44,7 +44,7 @@ $actionid=GETPOST('actionid');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'societe','','');
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield=GETPOST("sortfield",'alpha');
 $sortorder=GETPOST("sortorder",'alpha');
 $page=GETPOST("page",'int');
diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php
index 16091381e8d..d88d591a152 100644
--- a/htdocs/user/group/index.php
+++ b/htdocs/user/group/index.php
@@ -45,7 +45,7 @@ $search_group=GETPOST('search_group');
 $optioncss = GETPOST('optioncss','alpha');
 
 // Load variable for pagination
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 6aaa3274b9d..1aedee87908 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -46,7 +46,7 @@ if ($user->societe_id > 0)
 $mode = GETPOST("mode", 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index e39d8153cac..5fc0af8fa14 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -44,7 +44,7 @@ $actionid=GETPOST('actionid');
 if ($user->societe_id) $id=$user->societe_id;
 $result = restrictedArea($user, 'societe','','');
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield=GETPOST("sortfield",'alpha');
 $sortorder=GETPOST("sortorder",'alpha');
 $page=GETPOST("page",'int');

From b441c62e1d595aaa472ef8fef58a8ecb56c2c6d0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Jun 2017 14:55:12 +0200
Subject: [PATCH 107/438] Fix syntax error

---
 htdocs/accountancy/admin/account.php          |  2 +-
 htdocs/accountancy/admin/fiscalyear.php       |  2 +-
 htdocs/accountancy/admin/importaccounts.php   |  2 +-
 htdocs/accountancy/admin/productaccount.php   |  2 +-
 htdocs/adherents/list.php                     |  2 +-
 htdocs/adherents/subscription/list.php        |  2 +-
 htdocs/adherents/type.php                     |  2 +-
 htdocs/admin/defaultvalues.php                |  2 +-
 htdocs/admin/translation.php                  |  2 +-
 htdocs/bookmarks/list.php                     |  2 +-
 htdocs/comm/action/listactions.php            |  2 +-
 htdocs/comm/mailing/cibles.php                |  2 +-
 htdocs/commande/customer.php                  |  2 +-
 htdocs/commande/list.php                      |  2 +-
 htdocs/compta/bank/index.php                  |  2 +-
 htdocs/compta/prelevement/card.php            |  2 +-
 htdocs/compta/prelevement/demandes.php        |  2 +-
 htdocs/compta/prelevement/factures.php        |  2 +-
 htdocs/compta/recap-compta.php                |  2 +-
 htdocs/compta/resultat/clientfourn.php        |  2 +-
 htdocs/contact/agenda.php                     |  2 +-
 htdocs/contact/list.php                       |  2 +-
 htdocs/contrat/list.php                       |  2 +-
 htdocs/contrat/services.php                   |  2 +-
 htdocs/cron/class/cronjob.class.php           | 72 +++++++++----------
 htdocs/cron/info.php                          |  2 +-
 htdocs/cron/list.php                          |  2 +-
 htdocs/expedition/list.php                    |  2 +-
 htdocs/expensereport/list.php                 |  2 +-
 htdocs/fourn/commande/list.php                |  2 +-
 htdocs/fourn/product/list.php                 |  2 +-
 .../modulebuilder/template/myobject_list.php  |  2 +-
 htdocs/product/inventory/list.php             |  2 +-
 htdocs/product/list-with-listview.php         |  2 +-
 htdocs/product/list.php                       |  2 +-
 htdocs/product/popuprop.php                   |  2 +-
 htdocs/product/stock/productlot_list.php      |  2 +-
 htdocs/projet/info.php                        |  2 +-
 htdocs/projet/list.php                        |  2 +-
 htdocs/projet/tasks/list.php                  |  2 +-
 htdocs/projet/tasks/time.php                  |  2 +-
 htdocs/resource/list.php                      |  2 +-
 htdocs/societe/agenda.php                     |  2 +-
 htdocs/societe/list.php                       |  2 +-
 htdocs/societe/notify/card.php                |  2 +-
 htdocs/user/group/index.php                   |  2 +-
 htdocs/user/index.php                         |  2 +-
 htdocs/user/notify/card.php                   |  2 +-
 48 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 83c844123be..e369081f7e1 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -52,7 +52,7 @@ if ($user->societe_id > 0) accessforbidden();
 if (! $user->rights->accounting->chartofaccount) accessforbidden();
 
 // Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'sortorder');
 $page = GETPOST("page", 'int');
diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php
index 5eabf9eda25..bf26348b50a 100644
--- a/htdocs/accountancy/admin/fiscalyear.php
+++ b/htdocs/accountancy/admin/fiscalyear.php
@@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/fiscalyear.class.php';
 $action = GETPOST('action','aZ09');
 
 // Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/accountancy/admin/importaccounts.php b/htdocs/accountancy/admin/importaccounts.php
index 6b462928736..6ae94dc8ce2 100644
--- a/htdocs/accountancy/admin/importaccounts.php
+++ b/htdocs/accountancy/admin/importaccounts.php
@@ -39,7 +39,7 @@ $langs->load("accountancy");
 if (! $user->admin)
 	accessforbidden();
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index b6af74ec96d..33bf067fa9e 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -70,7 +70,7 @@ $accounting_product_mode = GETPOST('accounting_product_mode', 'alpha');
 $btn_changeaccount = GETPOST('changeaccount');
 $btn_changetype = GETPOST('changetype');
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 3dd60ad7478..06de3e09f95 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -62,7 +62,7 @@ $optioncss = GETPOST('optioncss','alpha');
 
 if ($statut < -1) $statut = '';
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index a5066f98f0c..af3174c0b60 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -42,7 +42,7 @@ $optioncss = GETPOST('optioncss','alpha');
 
 $date_select=isset($_GET["date_select"])?$_GET["date_select"]:$_POST["date_select"];
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 1461098034e..f2fa12446b3 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -44,7 +44,7 @@ $search_email		= GETPOST('search_email','alpha');
 $type				= GETPOST('type','alpha');
 $status				= GETPOST('status','alpha');
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 04a9320f4c1..bd539becb86 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -39,7 +39,7 @@ $action=GETPOST('action','alpha');
 
 $mode = GETPOST('mode')?GETPOST('mode'):'createform';   // 'createform', 'filters', 'sortorder', 'focus'
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index f48ef749b8a..0c4e40948ed 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -45,7 +45,7 @@ $transvalue=GETPOST('transvalue','alpha');
 
 $mode = GETPOST('mode')?GETPOST('mode'):'overwrite';
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index 71c8174f1cd..a192076e88a 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -39,7 +39,7 @@ if (! $user->rights->bookmark->lire) {
 }
 $optioncss = GETPOST('optioncss','alpha');
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index 186165b2f9a..0e6fbb196a1 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -76,7 +76,7 @@ if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS))
 	$filtert=$user->id;
 }
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 73aaab22248..6c580cc93d6 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -39,7 +39,7 @@ if (! $user->rights->mailing->lire || $user->societe_id > 0) accessforbidden();
 
 
 // Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php
index cdf26b6a36d..8aa699fed71 100644
--- a/htdocs/commande/customer.php
+++ b/htdocs/commande/customer.php
@@ -45,7 +45,7 @@ accessforbidden();
 $langs->load("companies");
 $langs->load("orders");
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 2f8dfc28ae7..dbfeafc8f94 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -82,7 +82,7 @@ $result = restrictedArea($user, 'commande', $id,'');
 
 $diroutputmassaction=$conf->commande->dir_output . '/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index f5e9d347e8c..44ecbe6eb6f 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -55,7 +55,7 @@ $result=restrictedArea($user,'banque');
 
 $diroutputmassaction=$conf->bank->dir_output . '/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index 915cf43fb79..1a0435862ea 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -48,7 +48,7 @@ $id = GETPOST('id','int');
 $socid = GETPOST('socid','int');
 
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index 6e63b74a408..dd453bd7f4e 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -45,7 +45,7 @@ $page =  GETPOST('page','int');
 $sortorder = GETPOST('sortorder','alpha');
 $sortfield = GETPOST('sortfield','alpha');
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index 28836abe667..996a1aabe88 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -44,7 +44,7 @@ if ($user->societe_id > 0) accessforbidden();
 $prev_id = GETPOST('id','int');
 $socid = GETPOST('socid','int');
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index 3ddb99a4369..c3231ecccdd 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -40,7 +40,7 @@ $object = new Societe($db);
 if ($id > 0) $object->fetch($id);
 
 // Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 61d18cd85cc..62ee285d70b 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -52,7 +52,7 @@ if ($user->societe_id > 0) $socid = $user->societe_id;
 if (! empty($conf->comptabilite->enabled)) $result=restrictedArea($user,'compta','','','resultat');
 if (! empty($conf->accounting->enabled)) $result=restrictedArea($user,'accounting','','','comptarapport');
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php
index 96876ed561d..6c412c146d1 100644
--- a/htdocs/contact/agenda.php
+++ b/htdocs/contact/agenda.php
@@ -89,7 +89,7 @@ $search_agenda_label=GETPOST('search_agenda_label');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', $objcanvas); // If we create a contact with no company (shared contacts), no check on write permission
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index fd48794afad..b2f8066367c 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -74,7 +74,7 @@ $optioncss = GETPOST('optioncss','alpha');
 $type=GETPOST("type");
 $view=GETPOST("view");
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page', 'int');
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 0003bdec348..11a259abce7 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -65,7 +65,7 @@ $month=GETPOST("month","int");
 
 $optioncss = GETPOST('optioncss','alpha');
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php
index 6902927a8b7..0af99eeed33 100644
--- a/htdocs/contrat/services.php
+++ b/htdocs/contrat/services.php
@@ -33,7 +33,7 @@ $langs->load("products");
 $langs->load("contracts");
 $langs->load("companies");
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index 789e3bafcec..9d01ec888f0 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -109,7 +109,7 @@ class Cronjob extends CommonObject
 		if (isset($this->nbrun)) $this->nbrun=trim($this->nbrun);
 		if (isset($this->libname)) $this->libname = trim($this->libname);
 		if (isset($this->test)) $this->test = trim($this->test);
-		
+
 		// Check parameters
 		// Put here code to add a control on parameters values
 		if (dol_strlen($this->datestart)==0) {
@@ -361,15 +361,15 @@ class Cronjob extends CommonObject
 	 *  @param	int			$offset    	    page
 	 *  @param	int			$status    	    display active or not
 	 *  @param	array		$filter    	    filter output
-	 *  @param  int         $processing     Processing or not 
+	 *  @param  int         $processing     Processing or not
      *  @return int          			    <0 if KO, >0 if OK
      */
     function fetch_all($sortorder='DESC', $sortfield='t.rowid', $limit=0, $offset=0, $status=1, $filter='', $processing=-1)
     {
     	global $langs;
-    	
+
     	$this->lines=array();
-    	
+
     	$sql = "SELECT";
     	$sql.= " t.rowid,";
     	$sql.= " t.entity,";
@@ -409,7 +409,7 @@ class Cronjob extends CommonObject
     	if ($status == 2) $sql.= " AND t.status = 2";
     	//Manage filter
     	if (is_array($filter) && count($filter)>0) {
-    		foreach($filter as $key => $value) 
+    		foreach($filter as $key => $value)
     		{
     		    if ($key == 't.rowid') $sql.= ' AND '.$key.' = '.$this->db->escape($value);
    				else $sql.= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
@@ -532,7 +532,7 @@ class Cronjob extends CommonObject
 
 		if (empty($this->maxrun)) $this->maxrun=0;
         if (empty($this->processing)) $this->processing=0;
-        
+
 		// Check parameters
 		// Put here code to add a control on parameters values
 		if (dol_strlen($this->datestart)==0) {
@@ -845,8 +845,8 @@ class Cronjob extends CommonObject
 
 	/**
 	 * Run a job.
-	 * Once job is finished, status and nb of run is updated. 
-	 * This function does not plan the next run. This is done by function ->reprogram_jobs 
+	 * Once job is finished, status and nb of run is updated.
+	 * This function does not plan the next run. This is done by function ->reprogram_jobs
 	 *
 	 * @param   string		$userlogin    	User login
 	 * @return	int					 		<0 if KO, >0 if OK
@@ -861,7 +861,7 @@ class Cronjob extends CommonObject
 
 		$langs->load('cron');
 
-		if (empty($userlogin)) 
+		if (empty($userlogin))
 		{
 			$this->error="User login is mandatory";
 			dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR);
@@ -948,7 +948,7 @@ class Cronjob extends CommonObject
     				$error++;
 			    }
 			}
-			
+
 			// Load langs
 			if (! $error)
 			{
@@ -963,14 +963,14 @@ class Cronjob extends CommonObject
 	                $error++;
 				}
 			}
-			
+
 			if (! $error)
 			{
 				dol_syslog(get_class($this)."::run_jobs START ".$this->objectname."->".$this->methodename."(".$this->params.");", LOG_DEBUG);
-	
+
 				// Create Object for the call module
 				$object = new $this->objectname($this->db);
-	
+
 				$params_arr = array_map('trim', explode(",",$this->params));
 				if (!is_array($params_arr))
 				{
@@ -980,7 +980,7 @@ class Cronjob extends CommonObject
 				{
 					$result = call_user_func_array(array($object, $this->methodename), $params_arr);
 				}
-			
+
 				if ($result===false || $result != 0)
 				{
 				    $langs->load("errors");
@@ -998,7 +998,7 @@ class Cronjob extends CommonObject
 					$this->lastresult=var_export($result,true);
 					$retval = $this->lastresult;
 				}
-			}		
+			}
 		}
 
 		if($this->jobtype == 'function')
@@ -1071,7 +1071,7 @@ class Cronjob extends CommonObject
 				    $this->lastoutput = '';     // Will be filled later
 				    $this->lastresult = $retval;
 				    $retval = $this->lastresult;
-				    $error++;				    
+				    $error++;
 				}
 			}
 			if ($execmethod == 2)
@@ -1102,14 +1102,14 @@ class Cronjob extends CommonObject
     				$this->lastoutput.=$val."\n";
     			}
     		}
-    		
+
     		$this->lastresult=$retval;
-		
+
     		dol_syslog(get_class($this)."::run_jobs output_arr:".var_export($output_arr,true)." lastoutput=".$this->lastoutput." lastresult=".$this->lastresult, LOG_DEBUG);
 		}
-		
+
 		dol_syslog(get_class($this)."::run_jobs now we update job to track it is finished (with success or error)");
-		
+
 		$this->datelastresult=dol_now();
 		$this->processing=0;
 		$result = $this->update($user);       // This include begin/commit
@@ -1135,19 +1135,19 @@ class Cronjob extends CommonObject
 	function reprogram_jobs($userlogin, $now)
 	{
 		dol_syslog(get_class($this)."::reprogram_jobs userlogin:$userlogin", LOG_DEBUG);
-        
+
 		require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 		$user=new User($this->db);
 		$result=$user->fetch('',$userlogin);
-		if ($result<0) 
+		if ($result<0)
 		{
 			$this->error="User Error:".$user->error;
 			dol_syslog(get_class($this)."::reprogram_jobs ".$this->error, LOG_ERR);
 			return -1;
 		}
-		else 
+		else
 		{
-			if (empty($user->id)) 
+			if (empty($user->id))
 			{
 				$this->error=" User user login:".$userlogin." do not exists";
 				dol_syslog(get_class($this)."::reprogram_jobs ".$this->error, LOG_ERR);
@@ -1155,28 +1155,28 @@ class Cronjob extends CommonObject
 			}
 		}
 
-		dol_syslog(get_class($this)."::reprogram_jobs  ", LOG_DEBUG);
+		dol_syslog(get_class($this)."::reprogram_jobs datenextrun=".$this->datenextrun." ".dol_print_date($this->datenextrun, 'dayhourrfc')." frequency=".$this->frequency." unitfrequency=".$this->unitfrequency, LOG_DEBUG);
 
-		
-		if (empty($this->datenextrun)) 
+		if (empty($this->datenextrun))
 		{
 			if (empty($this->datestart)) $this->datenextrun = $now + ($this->frequency * $this->unitfrequency);
 			else $this->datenextrun = $this->datestart + ($this->frequency * $this->unitfrequency);
 		}
 
-		if ($this->datenextrun < $now && $this->frequency > 0 && $this->unitfrequency > 0) 
+		if ($this->datenextrun < $now && $this->frequency > 0 && $this->unitfrequency > 0)
 		{
 		    // Loop until date is after future
 		    while ($this->datenextrun < $now)
 		    {
 		        $this->datenextrun += ($this->frequency * $this->unitfrequency);
-		        
+
 		        // TODO For exact frequency (every month, every year, ...), use instead a dol_time_plus_duree($time, $duration_value, $duration_unit)
 		    }
 		}
-		else 
+		else
 		{
 			//$this->datenextrun=$this->datenextrun + ($this->frequency * $this->unitfrequency);
+		    dol_syslog(get_class($this)."::reprogram_jobs datenextrun is already in future, we do not change it");
 		}
 
 
@@ -1190,9 +1190,9 @@ class Cronjob extends CommonObject
 		        dol_syslog(get_class($this)."::reprogram_jobs Job will be set to archived", LOG_ERR);
 		    }
 		}
-		
+
 		$result = $this->update($user);
-		if ($result<0) 
+		if ($result<0)
 		{
 			dol_syslog(get_class($this)."::reprogram_jobs ".$this->error, LOG_ERR);
 			return -1;
@@ -1200,7 +1200,7 @@ class Cronjob extends CommonObject
 
 		return 1;
 	}
-	
+
 	/**
 	 *  Return label of status of user (active, inactive)
 	 *
@@ -1211,7 +1211,7 @@ class Cronjob extends CommonObject
 	{
 	    return $this->LibStatut($this->status,$mode);
 	}
-	
+
 	/**
 	 *  Renvoi le libelle d'un statut donne
 	 *
@@ -1223,7 +1223,7 @@ class Cronjob extends CommonObject
 	{
 	    global $langs;
 	    $langs->load('users');
-	
+
 	    if ($mode == 0)
 	    {
 	        $prefix='';
@@ -1255,7 +1255,7 @@ class Cronjob extends CommonObject
 	        if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4','class="pictostatus"');
 	        if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5','class="pictostatus"');
 	    }
-	}	
+	}
 }
 
 
diff --git a/htdocs/cron/info.php b/htdocs/cron/info.php
index 334a5da6890..18ab50adeaa 100644
--- a/htdocs/cron/info.php
+++ b/htdocs/cron/info.php
@@ -48,7 +48,7 @@ $object->info($id);
 
 $head = cron_prepare_head($object);
 
-dol_fiche_head($head, 'info', $langs->trans("CronTask"), 0, 'cron');
+dol_fiche_head($head, 'info', $langs->trans("CronTask"), -1, 'cron');
 
 print '<table width="100%"><tr><td>';
 dol_print_object_info($object);
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 12c92e9bdd3..3b830e4801f 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -39,7 +39,7 @@ $action=GETPOST('action','alpha');
 $confirm=GETPOST('confirm','alpha');
 $id=GETPOST('id','int');
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 517a231fdb9..091b5e44bb8 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -53,7 +53,7 @@ $search_type_thirdparty=GETPOST("search_type_thirdparty",'int');
 $sall = GETPOST('sall', 'alphanohtml');
 $optioncss = GETPOST('optioncss','alpha');
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 8fcacda5d44..9cf47ddea94 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -51,7 +51,7 @@ $diroutputmassaction=$conf->expensereport->dir_output . '/temp/massgeneration/'.
 
 
 // Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 4b117cc4a2c..86fb7e5c4f5 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -101,7 +101,7 @@ $result = restrictedArea($user, 'fournisseur', $orderid, '', 'commande');
 
 $diroutputmassaction=$conf->fournisseur->commande->dir_output . '/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index d6d0ac734a2..00e2dbf939d 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -42,7 +42,7 @@ $type = GETPOST('type');
 $optioncss = GETPOST('optioncss','alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 8fac1c8a388..ef3cb110224 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -68,7 +68,7 @@ $search_myfield=GETPOST('search_myfield');
 $optioncss = GETPOST('optioncss','alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index 93a18788f95..c8d570a6fd7 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/inventory/lib/inventory.lib.php';
 $langs->load("stock");
 $langs->load("inventory");
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = (GETPOST("page",'int')?GETPOST("page", 'int'):0);
diff --git a/htdocs/product/list-with-listview.php b/htdocs/product/list-with-listview.php
index f3119af83c9..947cfaecbc2 100644
--- a/htdocs/product/list-with-listview.php
+++ b/htdocs/product/list-with-listview.php
@@ -77,7 +77,7 @@ if (!$_POST) {
 
 $diroutputmassaction=$conf->product->dir_output . '/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = (GETPOST("page",'int')?GETPOST("page", 'int'):0);
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 841156ebb0d..4cd986de291 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -77,7 +77,7 @@ if (!$_POST) {
 
 $diroutputmassaction=$conf->product->dir_output . '/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = (GETPOST("page",'int')?GETPOST("page", 'int'):0);
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index 8aa5191b176..21491eab512 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -38,7 +38,7 @@ $type=GETPOST("type","int");
 if (! empty($user->societe_id)) $socid=$user->societe_id;
 $result=restrictedArea($user,'produit|service');
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index 1d74cf85fad..61e9438c929 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -61,7 +61,7 @@ $search_myfield=GETPOST('search_myfield');
 $optioncss = GETPOST('optioncss','alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/projet/info.php b/htdocs/projet/info.php
index 135517f26db..05c31287745 100644
--- a/htdocs/projet/info.php
+++ b/htdocs/projet/info.php
@@ -35,7 +35,7 @@ $ref    = GETPOST('ref','alpha');
 $socid  = GETPOST('socid','int');
 $action = GETPOST('action','alpha');
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield","alpha");
 $sortorder = GETPOST("sortorder");
 $page = GETPOST("page");
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index c85b96ffcf4..827719148fe 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -55,7 +55,7 @@ if (!$user->rights->projet->lire) accessforbidden();
 
 $diroutputmassaction=$conf->projet->dir_output . '/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield","alpha");
 $sortorder = GETPOST("sortorder");
 $page = GETPOST("page");
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 7e809fe966f..18f133513b1 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -85,7 +85,7 @@ if (!$user->rights->projet->lire) accessforbidden();
 
 $diroutputmassaction=$conf->projet->dir_output . '/tasks/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 8aa496eaa5a..08eb429f664 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -58,7 +58,7 @@ $socid=0;
 //if ($user->societe_id > 0) $socid = $user->societe_id;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
 if (!$user->rights->projet->lire) accessforbidden();
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index f16d1ef122c..5ec9eabbfb1 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -91,7 +91,7 @@ if (empty($sortorder)) $sortorder="ASC";
 if (empty($sortfield)) $sortfield="t.rowid";
 if (empty($arch)) $arch = 0;
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $page = GETPOST("page");
 $page = is_numeric($page) ? $page : 0;
 $page = $page == -1 ? 0 : $page;
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index dbb9e831fe9..15ea29e9954 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -50,7 +50,7 @@ $socid = GETPOST('socid','int');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'societe', $socid, '&societe');
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 9842e913dae..422768bce31 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -84,7 +84,7 @@ $mode=GETPOST("mode");
 
 $diroutputmassaction=$conf->societe->dir_output . '/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield=GETPOST("sortfield",'alpha');
 $sortorder=GETPOST("sortorder",'alpha');
 $page=GETPOST("page",'int');
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index 9a5405de7fd..eacd047d93a 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -44,7 +44,7 @@ $actionid=GETPOST('actionid');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'societe','','');
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield=GETPOST("sortfield",'alpha');
 $sortorder=GETPOST("sortorder",'alpha');
 $page=GETPOST("page",'int');
diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php
index d88d591a152..06e11caced9 100644
--- a/htdocs/user/group/index.php
+++ b/htdocs/user/group/index.php
@@ -45,7 +45,7 @@ $search_group=GETPOST('search_group');
 $optioncss = GETPOST('optioncss','alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 1aedee87908..da5ddd99339 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -46,7 +46,7 @@ if ($user->societe_id > 0)
 $mode = GETPOST("mode", 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index 5fc0af8fa14..b803fd93f7b 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -44,7 +44,7 @@ $actionid=GETPOST('actionid');
 if ($user->societe_id) $id=$user->societe_id;
 $result = restrictedArea($user, 'societe','','');
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield=GETPOST("sortfield",'alpha');
 $sortorder=GETPOST("sortorder",'alpha');
 $page=GETPOST("page",'int');

From 9b3b2e600f80823e222ce6e60f4952f5ea1dd848 Mon Sep 17 00:00:00 2001
From: alexis Algoud <alexis@atm-consulting.fr>
Date: Thu, 8 Jun 2017 17:52:02 +0200
Subject: [PATCH 108/438] init blockedlog trigger and hash store

---
 htdocs/core/class/blockedlog.class.php        | 235 ++++++++++++++++++
 ..._modBlockedlog_ActionsBlockedLog.class.php |  78 ++++++
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  18 ++
 3 files changed, 331 insertions(+)
 create mode 100644 htdocs/core/class/blockedlog.class.php
 create mode 100644 htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php

diff --git a/htdocs/core/class/blockedlog.class.php b/htdocs/core/class/blockedlog.class.php
new file mode 100644
index 00000000000..3e622c42dc4
--- /dev/null
+++ b/htdocs/core/class/blockedlog.class.php
@@ -0,0 +1,235 @@
+<?php 
+
+class BlockedLog {
+	
+	public $signature = '';
+	
+	public $key_value1 = null;
+	
+	public $action = '';
+	
+	public $element = '';
+	
+	public $fk_object = 0;
+	
+	public $certified = false;
+	
+	public $fk_user = 0;
+	
+	function __construct(&$db) {
+		
+		$this->db =&$db;
+		
+	}
+	
+	public function create($user) {
+		
+		global $conf,$langs,$hookmanager;
+		
+		$langs->load('blockedlog');
+		
+		$error=0;
+		
+		dol_syslog(get_class($this).'::create', LOG_DEBUG);
+		
+		// Clean parameters
+		$this->signature = $this->getSignatureRecursive();
+		
+		
+		if (is_null($this->key_value1))
+		{
+			$this->error=$langs->trans("BlockLogNeedKey1Value");
+			dol_syslog($this->error, LOG_WARNING);
+			return -1;
+		}
+		
+		if(empty($this->element)) {
+			$this->error=$langs->trans("BlockLogNeedElement");
+			dol_syslog($this->error, LOG_WARNING);
+			return -2;
+		}
+		
+		if(empty($this->action)) {
+			$this->error=$langs->trans("BlockLogNeedAction");
+			dol_syslog($this->error, LOG_WARNING);
+			return -3;
+		}
+
+		$this->fk_user = $user->id;
+		
+		$this->db->begin();
+		
+		//TODO add fk_user;
+		
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."blockedlog (";
+		$sql.= "action,";
+		$sql.= " key_value1,";
+		$sql.= " signature,";
+		$sql.= " element,";
+		$sql.= " fk_object,";
+		$sql.= " certified,";
+		$sql.= " entity";
+		$sql.= ") VALUES (";
+		$sql.= "'".$this->db->escape($this->action)."',";
+		$sql.= "".$this->key_value1.",";
+		$sql.= "'".$this->db->escape($this->signature)."',";
+		$sql.= "'".$this->db->escape($this->element)."',";
+		$sql.= "".$this->fk_object.",";
+		$sql.= "'".($this->certified ? 1 : 0)."',";
+		$sql.= $conf->entity;
+		$sql.= ")";
+		
+		$res = $this->db->query($sql);
+		if ($res)
+		{
+			$id = $this->db->last_insert_id(MAIN_DB_PREFIX."blockedlog");
+			
+			if ($id > 0)
+			{
+				$this->id = $id;
+			
+			}
+			else
+			{
+				$this->db->rollback();
+				return -2;
+			}
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			$this->db->rollback();
+			return -1;
+		}
+		
+	}
+	
+	private function crypt($value) {
+		
+		return md5($value);
+		
+	}
+	
+	public function checkSignature() {
+		
+		$signature = $this->getSignatureRecursive();
+		
+		return ($signature === $this->signature);
+		
+	}
+	
+	private function getSignatureRecursive(){
+		
+		$signature = $this->crypt( $this->action . $this->getSignature() . $this->key_value1  );
+		
+		$logs = $this->getLog('payment', 0, 0, 'ASC') ;
+		if($logs!==false) {
+			foreach($logs as &$b) {
+			
+				if($this->id>0 && $b->id == $this->id) break; // on arrête sur un enregistrement précis pour recalculer une signature
+				
+				$b->updateValue(); // on récupère la valeur actuelle en base de l'élément enregistré
+				
+				$signature = $this->crypt($signature. $this->action . $b->signature . $b->key_value1);
+			}
+		}
+		return $signature;
+	
+	}
+	
+	public function getLog($element, $fk_object, $limit = 0, $order = 'DESC') {
+		global $conf,$cachedlogs ; 
+		
+		if(empty($cachedlogs)) $cachedlogs=array();
+	
+		
+		if($element=='payment') {
+		
+	 		$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
+	         WHERE entity=".$conf->entity." AND  action LIKE '%PAYMENT%'
+	         ORDER BY tms ".$order;
+			
+		}
+		else if($element=='payments_not_certified') {
+			$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
+	         WHERE entity=".$conf->entity." AND action LIKE '%PAYMENT%' AND certified = 0
+	         ORDER BY tms ".$order;
+			
+		}
+		else if($element=='payments_just_certified') {
+			$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
+	         WHERE entity=".$conf->entity." AND action LIKE '%PAYMENT%' AND certified = 1
+	         ORDER BY tms ".$order;
+			
+		}
+		else{
+			$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
+	         WHERE element='".$element."' AND fk_object=".(int)$fk_object."
+	         ORDER BY tms ".$order;
+			
+		}
+		
+		
+		if($limit > 0 )$sql.=' LIMIT '.$limit;
+		
+		$res = $this->db->query($sql);
+		
+		if($res) {
+		
+			$results=array();
+			
+			while($obj = $this->db->fetch_object($res)) {
+				
+				if(!isset($cachedlogs[$obj->rowid])) {
+					$b=new BlockedLog($this->db);
+					$b->fetch($obj->rowid);
+					
+					$cachedlogs[$obj->rowid] = $b;
+				}
+				
+				$results[] = $cachedlogs[$obj->rowid];
+				
+			}
+			
+			return $results;
+		}
+		else{
+			return false;
+		}
+	}
+	
+	private function updateValue() {
+		
+		if($this->action === 'PAYMENT_CUSTOMER_CREATE'
+		|| $this->action === 'PAYMENT_ADD_TO_BANK') {
+			$sql="SELECT amount FROM ".MAIN_DB_PREFIX."paiement WHERE rowid=".$this->fk_object;
+					
+			$res = $this->db->query($sql);
+			
+			if($res && $obj = $db->fetch_object($res)) {
+				$this->key_value1 = (double)$obj->amount;
+			}
+		}
+				
+	}
+	
+	
+	public function getSignature() {
+		global $db,$conf,$mysoc;
+		
+		if(empty($conf->global->BLOCKEDLOG_ENTITY_FINGERPRINT)) { // creation of a unique fingerprint
+			
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+			
+			$fingerprint = $this->crypt(print_r($mysoc,true).time().rand(0,1000));
+			
+			dolibarr_set_const($db, 'BLOCKEDLOG_ENTITY_FINGERPRINT', $fingerprint, '',0,'Numeric Unique Fingerprint', $conf->entity);
+			
+			$conf->global->BLOCKEDLOG_ENTITY_FINGERPRINT= $fingerprint;
+		}
+		
+		return $conf->global->BLOCKEDLOG_ENTITY_FINGERPRINT;
+	}
+	
+}
+
diff --git a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
new file mode 100644
index 00000000000..3307e4216ea
--- /dev/null
+++ b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
@@ -0,0 +1,78 @@
+<?php
+/* Copyright (C) 2005-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2009-2011 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2011-2014 Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2013	   Cedric GROSS         <c.gross@kreiz-it.fr>
+ * Copyright (C) 2014       Marcos García       <marcosgdf@gmail.com>
+ * Copyright (C) 2015       Bahfir Abbes        <bafbes@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+ *  \ingroup    agenda
+ *  \brief      Trigger file for agenda module
+ */
+
+require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/blockedlog.class.php';
+
+/**
+ *  Class of triggered functions for agenda module
+ */
+class InterfaceActionsBlockedLog extends DolibarrTriggers
+{
+	public $family = 'system';
+	public $description = "Triggers of this module add blocklog.";
+	public $version = self::VERSION_DOLIBARR;
+	public $picto = 'system';
+
+	/**
+	 * Function called on Dolibarrr payment or invoice event.
+	 *
+	 * @param string		$action		Event action code
+	 * @param Object		$object     Object
+	 * @param User		    $user       Object user
+	 * @param Translate 	$langs      Object langs
+	 * @param conf		    $conf       Object conf
+	 * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
+	 */
+	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
+	{
+		// Do not log events not enabled for this action
+		if (empty($conf->blockedlog->enabled)) {
+			return 0;
+		}
+		
+		$b=new BlockedLog($this->db);
+		$b->element = $object->element;
+		$b->action = $action;
+		$b->fk_object = $object->id;
+		$b->key_value1 = 0;
+		
+		$res = $b->create($user);
+		if($res<0) {
+			setEventMessage($b->error,'errors');
+			
+			return -1;
+		}
+		else {
+			return 1;
+		}
+		
+		
+    }
+
+}
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 85b9d3106cf..786becac0ba 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -395,3 +395,21 @@ ALTER TABLE llx_usergroup_rights DROP INDEX fk_usergroup;
 ALTER TABLE llx_usergroup_rights ADD UNIQUE INDEX uk_usergroup_rights (entity, fk_usergroup, fk_id);
 ALTER TABLE llx_usergroup_rights ADD CONSTRAINT fk_usergroup_rights_fk_usergroup FOREIGN KEY (fk_usergroup) REFERENCES llx_usergroup (rowid);
 
+CREATE TABLE llx_blockedlog 
+( 
+	rowid integer AUTO_INCREMENT, 
+	tms	timestamp,
+	action varchar(50), 
+	key_value1 real NOT NULL, 
+	signature varchar(32) NOT NULL, 
+	element varchar(50), 
+	fk_object integer, 
+	entity integer, 
+	certified integer, 
+	PRIMARY KEY (rowid), 
+	KEY signature (signature), 
+	KEY fk_object_element (fk_object,element), 
+	KEY entity (entity), 
+	KEY entity_action (entity,action), 
+	KEY entity_action_certified (entity,action,certified) 
+) 

From 75624376a525a4e819c62e2adb42da9726fd7bc3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Jun 2017 00:27:19 +0200
Subject: [PATCH 109/438] FIX Warnings

---
 htdocs/core/lib/files.lib.php  | 10 +++++-----
 htdocs/core/lib/images.lib.php |  5 +++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 3fa17aa8bcf..06df150d983 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -72,11 +72,11 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
 	$reshook = 0;
 	$file_list = array();
 
-	$hookmanager->resArray=array();
-
-	if (! $nohook)
+	if (is_object($hookmanager) && ! $nohook)
 	{
-		$hookmanager->initHooks(array('fileslib'));
+	    $hookmanager->resArray=array();
+
+	    $hookmanager->initHooks(array('fileslib'));
 
 		$parameters=array(
 				'path' => $newpath,
@@ -197,7 +197,7 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
 		}
 	}
 
-	$file_list = array_merge($file_list, $hookmanager->resArray);
+	if (is_object($hookmanager) && is_array($hookmanager->resArray)) $file_list = array_merge($file_list, $hookmanager->resArray);
 
 	return $file_list;
 }
diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index acfa917720e..d9d7d0d9730 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -38,7 +38,7 @@ $quality = 80;
 function image_format_supported($file)
 {
     $regeximgext='\.gif|\.jpg|\.jpeg|\.png|\.bmp|\.xpm|\.xbm';   // See also into product.class.php
-    
+
     // Case filename is not a format image
     if (! preg_match('/('.$regeximgext.')$/i',$file,$reg)) return -1;
 
@@ -90,7 +90,7 @@ function dol_getImageSize($file, $url = false)
     	$ret['width']=$infoImg[0]; // Largeur de l'image
     	$ret['height']=$infoImg[1]; // Hauteur de l'image
 	}
-	
+
 	return $ret;
 }
 
@@ -438,6 +438,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName='_small', $
 	dol_mkdir($dirthumb);
 
 	// Initialisation des variables selon l'extension de l'image
+	$img=null;
 	switch($infoImg[2])
 	{
 		case IMAGETYPE_GIF:	    // 1

From 811b0d9af44158f0aac7aaeacfa0c7183c425d4f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Jun 2017 00:27:44 +0200
Subject: [PATCH 110/438] Fix missing thumbs images for products

---
 htdocs/install/repair.php | 121 ++++++++++++++++++++++++++++----------
 1 file changed, 90 insertions(+), 31 deletions(-)

diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index a70553cbfb0..bab7b5e5da4 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -26,6 +26,7 @@
 include_once 'inc.php';
 if (file_exists($conffile)) include_once $conffile;
 require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php';
+include_once $dolibarr_main_document_root.'/core/lib/images.lib.php';
 require_once $dolibarr_main_document_root.'/core/class/extrafields.class.php';
 require_once 'lib/repair.lib.php';
 
@@ -72,11 +73,12 @@ $actiondone=1;
 
 print '<h3>'.$langs->trans("Repair").'</h3>';
 
-print 'Option restore_thirdparties_logos is '.(GETPOST('restore_thirdparties_logos')?GETPOST('restore_thirdparties_logos'):'0').'<br>'."\n";
-print 'Option clean_linked_elements is '.(GETPOST('clean_linked_elements')?GETPOST('clean_linked_elements'):'0').'<br>'."\n";
-print 'Option clean_orphelin_dir (0 or \'test\' or \'confirmed\') is '.(GETPOST('clean_orphelin_dir')?GETPOST('clean_orphelin_dir'):'0').'<br>'."\n";
-print 'Option clean_product_stock_batch (0 or \'test\' or \'confirmed\') is '.(GETPOST('clean_product_stock_batch')?GETPOST('clean_product_stock_batch'):'0').'<br>'."\n";
-print 'Option set_empty_time_spent_amount (0 or \'test\' or \'confirmed\') is '.(GETPOST('set_empty_time_spent_amount')?GETPOST('set_empty_time_spent_amount'):'0').'<br>'."\n";
+print 'Option restore_thirdparties_logos is '.(GETPOST('restore_thirdparties_logos','alpha')?GETPOST('restore_thirdparties_logos','alpha'):'0').'<br>'."\n";
+print 'Option clean_linked_elements is '.(GETPOST('clean_linked_elements','alpha')?GETPOST('clean_linked_elements','alpha'):'0').'<br>'."\n";
+print 'Option clean_orphelin_dir (0 or \'test\' or \'confirmed\') is '.(GETPOST('clean_orphelin_dir','alpha')?GETPOST('clean_orphelin_dir','alpha'):'0').'<br>'."\n";
+print 'Option clean_product_stock_batch (0 or \'test\' or \'confirmed\') is '.(GETPOST('clean_product_stock_batch','alpha')?GETPOST('clean_product_stock_batch','alpha'):'0').'<br>'."\n";
+print 'Option set_empty_time_spent_amount (0 or \'test\' or \'confirmed\') is '.(GETPOST('set_empty_time_spent_amount','alpha')?GETPOST('set_empty_time_spent_amount','alpha'):'0').'<br>'."\n";
+print 'Option rebuild_product_thumbs (0 or \'test\' or \'confirmed\') is '.(GETPOST('rebuild_product_thumbs','alpha')?GETPOST('rebuild_product_thumbs','alpha'):'0').'<br>'."\n";
 print '<br>';
 
 print '<table cellspacing="0" cellpadding="1" border="0" width="100%">';
@@ -253,7 +255,7 @@ if ($ok)
 	            {
 	                print 'Found field '.$code.' declared into '.MAIN_DB_PREFIX.'extrafields table but not found into desc of table '.$tableextra." -> ";
 	                $type=$extrafields->attribute_type[$code]; $length=$extrafields->attribute_size[$code]; $attribute=''; $default=''; $extra=''; $null='null';
-	                
+
            			if ($type=='boolean') {
         				$typedb='int';
         				$lengthdb='1';
@@ -276,7 +278,7 @@ if ($ok)
         				$typedb=$type;
         				$lengthdb=$length;
         			}
-	                
+
 	                $field_desc=array(
 	                	'type'=>$typedb,
 	                	'value'=>$lengthdb,
@@ -318,13 +320,13 @@ if ($ok)
 
 
 
-// clean_linked_elements: Check and clean linked elements
+// restore_thirdparties_logos: Move logos to correct new directory.
 if ($ok && GETPOST('restore_thirdparties_logos'))
 {
 	//$exts=array('gif','png','jpg');
 
 	$ext='';
-	
+
 	print '<tr><td colspan="2"><br>*** Restore thirdparties logo<br>';
 	//foreach($exts as $ext)
 	//{
@@ -393,8 +395,66 @@ if ($ok && GETPOST('restore_thirdparties_logos'))
 }
 
 
+// rebuild_product_thumbs: Rebuild thumbs for product files
+if ($ok && GETPOST('rebuild_product_thumbs','alpha'))
+{
+    $ext='';
+    global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini;
+
+    print '<tr><td colspan="2"><br>*** Rebuild product thumbs<br>';
+
+    $sql="SELECT s.rowid, s.ref FROM ".MAIN_DB_PREFIX."product as s ORDER BY s.ref";
+    $resql=$db->query($sql);
+    if ($resql)
+    {
+        $num=$db->num_rows($resql);
+        $i=0;
+
+        while($i < $num)
+        {
+            $obj=$db->fetch_object($resql);
+
+            if (! empty($obj->ref))
+            {
+                $files=dol_dir_list($dolibarr_main_data_root.'/produit/'.$obj->ref, 'files', 0);
+                foreach($files as $file)
+                {
+					// Generate thumbs.
+					if (image_format_supported($file['fullname']) == 1)
+					{
+					    $imgThumbSmall='notbuild';
+                        if (GETPOST('rebuild_product_thumbs','alpha') == 'confirmed')
+                        {
+                            // Used on logon for example
+                            $imgThumbSmall = vignette($file['fullname'], $maxwidthsmall, $maxheightsmall, '_small', 50, "thumbs");
+                        }
+					    print 'Check product '.$obj->rowid.", file ".$file['fullname']." -> ".$imgThumbSmall." maxwidthsmall=".$maxwidthsmall." maxheightsmall=".$maxheightsmall."<br>\n";
+					    $imgThumbMini='notbuild';
+                        if (GETPOST('rebuild_product_thumbs','alpha') == 'confirmed')
+                        {
+                            // Create mini thumbs for image (Ratio is near 16/9)
+                            // Used on menu or for setup page for example
+                            $imgThumbMini = vignette($file['fullname'], $maxwidthmini, $maxheightmini, '_mini', 50, "thumbs");
+                        }
+					    print 'Check product '.$obj->rowid.", file ".$file['fullname']." -> ".$imgThumbMini." maxwidthmini=".$maxwidthmini." maxheightmini=".$maxheightmini."<br>\n";
+					}
+                }
+            }
+
+            $i++;
+        }
+    }
+    else
+    {
+        $ok=0;
+        dol_print_error($db);
+    }
+
+    print '</td></tr>';
+}
+
 // clean_linked_elements: Check and clean linked elements
-if ($ok && GETPOST('clean_linked_elements'))
+if ($ok && GETPOST('clean_linked_elements','alpha'))
 {
     print '<tr><td colspan="2"><br>*** Check table of linked elements and delete orphelins links</td></tr>';
 	// propal => order
@@ -418,7 +478,7 @@ if ($ok && GETPOST('clean_linked_elements'))
 
 
 // clean_orphelin_dir: Run purge of directory
-if ($ok && GETPOST('clean_orphelin_dir'))
+if ($ok && GETPOST('clean_orphelin_dir','alpha'))
 {
     $conf->setValues($db);
 
@@ -530,7 +590,7 @@ if ($ok && GETPOST('clean_orphelin_dir'))
                         // Clean of orphelins directories are done into repair.php
                         print '<tr><td colspan="2">';
                         print 'Delete orphelins file '.$file['fullname'].'<br>';
-                        if (GETPOST('clean_orphelin_dir') == 'confirmed')
+                        if (GETPOST('clean_orphelin_dir','alpha') == 'confirmed')
                         {
                             dol_delete_file($file['fullname'],1,1,1);
                             dol_delete_dir(dirname($file['fullname']),1);
@@ -545,12 +605,12 @@ if ($ok && GETPOST('clean_orphelin_dir'))
 }
 
 // clean_linked_elements: Check and clean linked elements
-if ($ok && GETPOST('clean_product_stock_batch'))
+if ($ok && GETPOST('clean_product_stock_batch','alpha'))
 {
-    $methodtofix=GETPOST('methodtofix')?GETPOST('methodtofix'):'updatestock';
-    
+    $methodtofix=GETPOST('methodtofix','alpha')?GETPOST('methodtofix','alpha'):'updatestock';
+
     print '<tr><td colspan="2"><br>*** Clean table product_batch, methodtofix='.$methodtofix.' (possible values: updatestock or updatebatch)</td></tr>';
-    
+
     $sql ="SELECT p.rowid, p.ref, p.tobatch, ps.rowid as psrowid, ps.fk_entrepot, ps.reel, SUM(pb.qty) as reelbatch";
     $sql.=" FROM ".MAIN_DB_PREFIX."product as p, ".MAIN_DB_PREFIX."product_stock as ps LEFT JOIN ".MAIN_DB_PREFIX."product_batch as pb ON ps.rowid = pb.fk_product_stock";
     $sql.=" WHERE p.rowid = ps.fk_product";
@@ -562,7 +622,7 @@ if ($ok && GETPOST('clean_product_stock_batch'))
     if ($resql)
     {
         $num = $db->num_rows($resql);
-        
+
         if ($num)
         {
             $i = 0;
@@ -570,7 +630,7 @@ if ($ok && GETPOST('clean_product_stock_batch'))
             {
                 $obj=$db->fetch_object($resql);
                 print '<tr><td>Product '.$obj->rowid.'-'.$obj->ref.' in warehose '.$obj->fk_entrepot.' -> '.$obj->psrowid.': '.$obj->reel.' (product_stock.reel) != '.($obj->reelbatch?$obj->reelbatch:'0').' (sum product_batch)';
-                
+
                 // Fix
                 if ($obj->reel != $obj->reelbatch)
                 {
@@ -599,9 +659,9 @@ if ($ok && GETPOST('clean_product_stock_batch'))
                         if (GETPOST('clean_product_stock_batch') == 'confirmed')
                         {
                             $error=0;
-                            
+
                             $db->begin();
-                            
+
                             $sql2 ="UPDATE ".MAIN_DB_PREFIX."product_stock";
                             $sql2.=" SET reel = ".($obj->reelbatch?$obj->reelbatch:'0')." WHERE rowid = ".$obj->psrowid;
                             $resql2=$db->query($sql2);
@@ -610,26 +670,26 @@ if ($ok && GETPOST('clean_product_stock_batch'))
                                 // We update product_stock, so we must field stock into product too.
                                 $sql3='UPDATE llx_product p SET p.stock= (SELECT SUM(ps.reel) FROM llx_product_stock ps WHERE ps.fk_product = p.rowid)';
                                 $resql3=$db->query($sql3);
-                                if (! $resql3) 
+                                if (! $resql3)
                                 {
                                     $error++;
                                     dol_print_error($db);
                                 }
                             }
-                            else 
+                            else
                             {
                                 $error++;
                                 dol_print_error($db);
                             }
-                            
+
                             if (!$error) $db->commit();
                             else $db->rollback();
                         }
                     }
                 }
-                
+
                 print'</td></tr>';
-            
+
                 $i++;
             }
         }
@@ -646,7 +706,7 @@ if ($ok && GETPOST('clean_product_stock_batch'))
 
 
 // clean_linked_elements: Check and clean linked elements
-if ($ok && GETPOST('clean_product_stock_negative_if_batch'))
+if ($ok && GETPOST('clean_product_stock_negative_if_batch','alpha'))
 {
     print '<tr><td colspan="2"><br>Clean table product_batch, methodtofix='.$methodtofix.' (possible values: updatestock or updatebatch)</td></tr>';
 
@@ -675,7 +735,7 @@ if ($ok && GETPOST('clean_product_stock_negative_if_batch'))
 }
 
 // clean_linked_elements: Check and clean linked elements
-if ($ok && GETPOST('set_empty_time_spent_amount'))
+if ($ok && GETPOST('set_empty_time_spent_amount','alpha'))
 {
     print '<tr><td colspan="2"><br>*** Set value of time spent without amount</td></tr>';
 
@@ -684,7 +744,7 @@ if ($ok && GETPOST('set_empty_time_spent_amount'))
     $sql.=" WHERE ptt.fk_user = u.rowid";
     $sql.=" AND ptt.thm IS NULL and u.thm > 0";
     $sql.=" GROUP BY u.rowid, u.login, u.thm";
-    
+
     $resql = $db->query($sql);
     if ($resql)
     {
@@ -711,14 +771,14 @@ if ($ok && GETPOST('set_empty_time_spent_amount'))
                         dol_print_error($db);
                     }
                 }
-                
+
                 if (!$error) $db->commit();
                 else $db->rollback();
 
                 print'</td></tr>';
 
                 if ($error) break;
-                
+
                 $i++;
             }
         }
@@ -732,7 +792,6 @@ if ($ok && GETPOST('set_empty_time_spent_amount'))
         dol_print_error($db);
     }
 
-
 }
 
 

From a63050bf46ca78c6563c16dff2f849c6033030c5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Jun 2017 00:27:19 +0200
Subject: [PATCH 111/438] FIX Warnings

Conflicts:
	htdocs/core/lib/files.lib.php
	htdocs/core/lib/images.lib.php
---
 htdocs/core/lib/files.lib.php  | 57 ++++++++++++++++++++--------------
 htdocs/core/lib/images.lib.php |  3 +-
 2 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 708aee9e498..7d8f29f7681 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -67,9 +67,14 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
 	$path=preg_replace('/([\\/]+)$/i','',$path);
 	$newpath=dol_osencode($path);
 
-	if (! $nohook)
+	$reshook = 0;
+	$file_list = array();
+
+	if (is_object($hookmanager) && ! $nohook)
 	{
-		$hookmanager->initHooks(array('fileslib'));
+	    $hookmanager->resArray=array();
+
+	    $hookmanager->initHooks(array('fileslib'));
 
 		$parameters=array(
 				'path' => $newpath,
@@ -202,6 +207,10 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
 			return array();
 		}
 	}
+
+	if (is_object($hookmanager) && is_array($hookmanager->resArray)) $file_list = array_merge($file_list, $hookmanager->resArray);
+
+	return $file_list;
 }
 
 
@@ -442,7 +451,7 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists)
 
 	$destexists=dol_is_dir($destfile);
 	if (! $overwriteifexists && $destexists) return 0;
-    
+
     if (! $destexists)
     {
         // We must set mask just before creating dir, becaause it can be set differently by dol_copy
@@ -452,7 +461,7 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists)
         $dirmaskdec |= octdec('0200');  // Set w bit required to be able to create content for recursive subdirs files
         dol_mkdir($destfile."/".$file, '', decoct($dirmaskdec));
     }
-    
+
 	$srcfile=dol_osencode($srcfile);
 	$destfile=dol_osencode($destfile);
 
@@ -726,7 +735,7 @@ function dol_delete_file($file,$disableglob=0,$nophperrors=0,$nohook=0,$object=n
         dol_syslog("Refused to delete file ".$file, LOG_WARNING);
 	    return False;
 	}
-	
+
 	if (empty($nohook))
 	{
 		$hookmanager->initHooks(array('fileslib'));
@@ -777,7 +786,7 @@ function dol_delete_file($file,$disableglob=0,$nophperrors=0,$nohook=0,$object=n
 			if ($nophperrors) $ok=@unlink($file_osencoded);
 			else $ok=unlink($file_osencoded);
 			if ($ok) dol_syslog("Removed file ".$file_osencoded, LOG_DEBUG);
-			else dol_syslog("Failed to remove file ".$file_osencoded, LOG_WARNING);      
+			else dol_syslog("Failed to remove file ".$file_osencoded, LOG_WARNING);
 		}
 
 		return $ok;
@@ -802,7 +811,7 @@ function dol_delete_dir($dir,$nophperrors=0)
         dol_syslog("Refused to delete dir ".$dir, LOG_WARNING);
 	    return False;
 	}
-	
+
     $dir_osencoded=dol_osencode($dir);
     return ($nophperrors?@rmdir($dir_osencoded):rmdir($dir_osencoded));
 }
@@ -1050,17 +1059,17 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio
 					$val = array($val);
 				}
 			}
-			
+
 			$nbfile = count($TFile['name']);
-			
+
 			for ($i = 0; $i < $nbfile; $i++)
 			{
 				// Define $destpath (path to file including filename) and $destfile (only filename)
 				$destpath=$upload_dir . "/" . $TFile['name'][$i];
 				$destfile=$TFile['name'][$i];
-	
+
 				$savingdocmask = dol_sanitizeFileName($savingdocmask);
-	
+
 				if ($savingdocmask)
 				{
 					$destpath=$upload_dir . "/" . preg_replace('/__file__/',$TFile['name'][$i],$savingdocmask);
@@ -1072,12 +1081,12 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio
 				$destpath = $info['dirname'].'/'.$info['filename'].'.'.strtolower($info['extension']);
 				$info = pathinfo($destfile);
 				$destfile = $info['filename'].'.'.strtolower($info['extension']);
-				    
+
 				$resupload = dol_move_uploaded_file($TFile['tmp_name'][$i], $destpath, $allowoverwrite, 0, $TFile['error'][$i], 0, $varfiles);
 				if (is_numeric($resupload) && $resupload > 0)
 				{
 					global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini;
-				
+
 					include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 					if (empty($donotupdatesession))
 					{
@@ -1090,14 +1099,14 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio
 					{
 						// Create thumbs
 						// We can't use $object->addThumbs here because there is no $object known
-						
+
 						// Used on logon for example
 						$imgThumbSmall = vignette($destpath, $maxwidthsmall, $maxheightsmall, '_small', 50, "thumbs");
 						// Create mini thumbs for image (Ratio is near 16/9)
 						// Used on menu or for setup page for example
 						$imgThumbMini = vignette($destpath, $maxwidthmini, $maxheightmini, '_mini', 50, "thumbs");
 					}
-	
+
 					setEventMessages($langs->trans("FileTransferComplete"), null, 'mesgs');
 				}
 				else
@@ -1117,7 +1126,7 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio
 					}
 				}
 			}
-			
+
 		}
 	} elseif ($link) {
 		require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
@@ -1374,7 +1383,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 {
 	global $user, $conf, $db;
 	global $dolibarr_main_data_root;
-	
+
 	if (! is_object($fuser)) $fuser=$user;
 
 	if (empty($modulepart)) return 'ErrorBadParameter';
@@ -1389,7 +1398,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	if (empty($refname)) $refname=basename(dirname($original_file)."/");
 
 	$relative_original_file = $original_file;
-	
+
 	// Wrapping for some images
 	if ($modulepart == 'companylogo' && !empty($conf->mycompany->dir_output))
 	{
@@ -1564,7 +1573,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	    }
 	    $original_file=$conf->user->dir_output.'/'.$original_file;
 	}
-	
+
 	// Wrapping for third parties
 	else if (($modulepart == 'company' || $modulepart == 'societe') && !empty($conf->societe->dir_output))
 	{
@@ -1620,7 +1629,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	    }
 	    $original_file=$conf->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
-	
+
 	// Wrapping for interventions
 	else if (($modulepart == 'fichinter' || $modulepart == 'ficheinter') && !empty($conf->ficheinter->dir_output))
 	{
@@ -1686,7 +1695,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	}
 
 	// Wrapping pour les commandes fournisseurs
-	else if (($modulepart == 'commande_fournisseur' || $modulepart == 'order_supplier') && !empty($conf->fournisseur->commande->dir_output)) 
+	else if (($modulepart == 'commande_fournisseur' || $modulepart == 'order_supplier') && !empty($conf->fournisseur->commande->dir_output))
 	{
 		if ($fuser->rights->fournisseur->commande->lire || preg_match('/^specimen/i',$original_file))
 		{
@@ -1841,14 +1850,14 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 		$accessallowed=1;
 		$original_file=$conf->fckeditor->dir_output.'/'.$original_file;
 	}
-	
+
 	// Wrapping for miscellaneous medias files
 	elseif ($modulepart == 'medias' && !empty($dolibarr_main_data_root))
 	{
 	    $accessallowed=1;
 	    $original_file=$dolibarr_main_data_root.'/medias/'.$original_file;
 	}
-	
+
 	// Wrapping for backups
 	else if ($modulepart == 'systemtools' && !empty($conf->admin->dir_output))
 	{
@@ -1896,7 +1905,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
     // If modulepart=module				Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart
     else
 	{
-	    if (preg_match('/^specimen/i',$original_file))	$accessallowed=1;    // If link to a file called specimen. Test must be done before changing $original_file int full path. 
+	    if (preg_match('/^specimen/i',$original_file))	$accessallowed=1;    // If link to a file called specimen. Test must be done before changing $original_file int full path.
 	    if ($fuser->admin) $accessallowed=1;    // If user is admin
 
 		// Define $accessallowed
diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index 8a95a91db40..d4bc996fdfb 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -86,7 +86,7 @@ function dol_getImageSize($file, $url = false)
     	$ret['width']=$infoImg[0]; // Largeur de l'image
     	$ret['height']=$infoImg[1]; // Hauteur de l'image
 	}
-	
+
 	return $ret;
 }
 
@@ -434,6 +434,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName='_small', $
 	dol_mkdir($dirthumb);
 
 	// Initialisation des variables selon l'extension de l'image
+	$img=null;
 	switch($infoImg[2])
 	{
 		case IMAGETYPE_GIF:	    // 1

From d326f161ef96cd149000ed102648be2a89b4e964 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Jun 2017 01:06:52 +0200
Subject: [PATCH 112/438] Fix permission on page to print barcode

---
 htdocs/barcode/printsheet.php | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/htdocs/barcode/printsheet.php b/htdocs/barcode/printsheet.php
index a60ac19d0af..daf366d0739 100644
--- a/htdocs/barcode/printsheet.php
+++ b/htdocs/barcode/printsheet.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2003	   Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2003	   Jean-Louis Bergamo	<jlb@j1b.org>
- * Copyright (C) 2006-2016 Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2006-2017 Laurent Destailleur	<eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -145,7 +145,7 @@ if ($action == 'builddoc')
 		// Load barcode class for generating barcode image
 		$classname = "mod".ucfirst($generator);
 		$module = new $classname($db);
-		if ($generator != 'tcpdfbarcode') 
+		if ($generator != 'tcpdfbarcode')
 		{
 		    // May be phpbarcode
 			$template = 'standardlabel';
@@ -374,19 +374,25 @@ jQuery(document).ready(function() {
 print '<input id="fillmanually" type="radio" '.((! GETPOST("selectorforbarcode") || GETPOST("selectorforbarcode")=='fillmanually')?'checked ':'').'name="selectorforbarcode" value="fillmanually" class="radiobarcodeselect"> '.$langs->trans("FillBarCodeTypeAndValueManually").' &nbsp; ';
 print '<br>';
 
-print '<input id="fillfromproduct" type="radio" '.((GETPOST("selectorforbarcode")=='fillfromproduct')?'checked ':'').'name="selectorforbarcode" value="fillfromproduct" class="radiobarcodeselect"> '.$langs->trans("FillBarCodeTypeAndValueFromProduct").' &nbsp; ';
-print '<br>';
-print '<div class="showforproductselector">';
-$form->select_produits(GETPOST('productid'), 'productid', '');
-print ' &nbsp; <input type="submit" id="submitproduct" name="submitproduct" class="button" value="'.(dol_escape_htmltag($langs->trans("GetBarCode"))).'">';
-print '</div>';
+if (! empty($user->rights->produit->lire) || ! empty($user->rights->service->lire))
+{
+    print '<input id="fillfromproduct" type="radio" '.((GETPOST("selectorforbarcode")=='fillfromproduct')?'checked ':'').'name="selectorforbarcode" value="fillfromproduct" class="radiobarcodeselect"> '.$langs->trans("FillBarCodeTypeAndValueFromProduct").' &nbsp; ';
+    print '<br>';
+    print '<div class="showforproductselector">';
+    $form->select_produits(GETPOST('productid'), 'productid', '');
+    print ' &nbsp; <input type="submit" id="submitproduct" name="submitproduct" class="button" value="'.(dol_escape_htmltag($langs->trans("GetBarCode"))).'">';
+    print '</div>';
+}
 
-print '<input id="fillfromthirdparty" type="radio" '.((GETPOST("selectorforbarcode")=='fillfromthirdparty')?'checked ':'').'name="selectorforbarcode" value="fillfromthirdparty" class="radiobarcodeselect"> '.$langs->trans("FillBarCodeTypeAndValueFromThirdParty").' &nbsp; ';
-print '<br>';
-print '<div class="showforthirdpartyselector">';
-print $form->select_company(GETPOST('socid'), 'socid', '', 'SelectThirdParty', 0, 0, array(), 0, 'minwidth300');
-print ' &nbsp; <input type="submit" id="submitthirdparty" name="submitthirdparty" class="button showforthirdpartyselector" value="'.(dol_escape_htmltag($langs->trans("GetBarCode"))).'">';
-print '</div>';
+if (! empty($user->rights->societe->lire))
+{
+    print '<input id="fillfromthirdparty" type="radio" '.((GETPOST("selectorforbarcode")=='fillfromthirdparty')?'checked ':'').'name="selectorforbarcode" value="fillfromthirdparty" class="radiobarcodeselect"> '.$langs->trans("FillBarCodeTypeAndValueFromThirdParty").' &nbsp; ';
+    print '<br>';
+    print '<div class="showforthirdpartyselector">';
+    print $form->select_company(GETPOST('socid'), 'socid', '', 'SelectThirdParty', 0, 0, array(), 0, 'minwidth300');
+    print ' &nbsp; <input type="submit" id="submitthirdparty" name="submitthirdparty" class="button showforthirdpartyselector" value="'.(dol_escape_htmltag($langs->trans("GetBarCode"))).'">';
+    print '</div>';
+}
 
 print '<br>';
 

From d6ba16d3570a98406cb554ce83af4be724b4cf97 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Jun 2017 09:45:22 +0200
Subject: [PATCH 113/438] Fix missing printFieldListWhere hook

---
 htdocs/product/index.php | 17 ++++++++++++++---
 htdocs/product/list.php  | 40 ++++++++++++++++++++--------------------
 2 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 74a974804ff..56508616edd 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -42,6 +42,9 @@ else $result=restrictedArea($user,'produit|service');
 $langs->load("products");
 $langs->load("stocks");
 
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array of hooks
+$hookmanager->initHooks(array('productindex'));
+
 $product_static = new Product($db);
 
 
@@ -80,7 +83,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 /*
  * Search Area of product/service
  */
- 
+
 // Search contract
 if ((! empty($conf->product->enabled) || ! empty($conf->service->enabled)) && ($user->rights->produit->lire || $user->rights->service->lire))
 {
@@ -102,7 +105,7 @@ if (count($listofsearchfields))
 		print '</tr>';
 		$i++;
 	}
-	print '</table>';	
+	print '</table>';
 	print '</form>';
 	print '<br>';
 }
@@ -117,6 +120,10 @@ $sql = "SELECT COUNT(p.rowid) as total, p.fk_product_type, p.tosell, p.tobuy";
 $sql.= " FROM ".MAIN_DB_PREFIX."product as p";
 $sql.= ' WHERE p.entity IN ('.getEntity($product_static->element, 1).')';
 $sql.= " GROUP BY p.fk_product_type, p.tosell, p.tobuy";
+// Add where from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
 $result = $db->query($sql);
 while ($objp = $db->fetch_object($result))
 {
@@ -246,6 +253,10 @@ $sql.= " p.tms as datem";
 $sql.= " FROM ".MAIN_DB_PREFIX."product as p";
 $sql.= " WHERE p.entity IN (".getEntity($product_static->element, 1).")";
 if ($type != '') $sql.= " AND p.fk_product_type = ".$type;
+// Add where from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
 $sql.= $db->order("p.tms","DESC");
 $sql.= $db->plimit($max,0);
 
@@ -419,7 +430,7 @@ function activitytrim($product_type)
 		$i = 0;
 
 		$var=true;
-		
+
 		while ($i < $num)
 		{
 			$objp = $db->fetch_object($result);
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 1aec109474e..043327920db 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -78,7 +78,7 @@ $contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'productser
 if ((string) $type == '1') { $contextpage='servicelist'; if ($search_type=='') $search_type='1'; }
 if ((string) $type == '0') { $contextpage='productlist'; if ($search_type=='') $search_type='0'; }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array of hooks
 $hookmanager->initHooks(array($contextpage));
 $extrafields = new ExtraFields($db);
 $form=new Form($db);
@@ -163,7 +163,7 @@ $arrayfields=array(
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
-   foreach($extrafields->attribute_label as $key => $val) 
+   foreach($extrafields->attribute_label as $key => $val)
    {
        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key]);
    }
@@ -284,7 +284,7 @@ else
 	    $typ=$extrafields->attribute_type[$tmpkey];
 	    $mode=0;
 	    if (in_array($typ, array('int','double'))) $mode=1;    // Search on a numeric
-	    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit))) 
+	    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit)))
 	    {
 	        $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
 	    }
@@ -369,8 +369,8 @@ else
 	        $crit=$val;
 	        $tmpkey=preg_replace('/search_options_/','',$key);
 	        if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
-	    } 	
-		
+	    }
+
 		print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formulaire">';
         if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -416,7 +416,7 @@ else
                 foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
                 print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
             }
-            
+
     		// Filter on categories
     	 	$moreforfilter='';
     		if (! empty($conf->categorie->enabled))
@@ -458,9 +458,9 @@ else
     		if (! empty($arrayfields['p.accountancy_code_buy']['checked']))  print_liste_field_titre($arrayfields['p.accountancy_code_buy']['label'], $_SERVER["PHP_SELF"],"p.accountancy_code_buy","",$param,'',$sortfield,$sortorder);
     		if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 			{
-			   foreach($extrafields->attribute_label as $key => $val) 
+			   foreach($extrafields->attribute_label as $key => $val)
 			   {
-		           if (! empty($arrayfields["ef.".$key]['checked'])) 
+		           if (! empty($arrayfields["ef.".$key]['checked']))
 		           {
 						$align=$extrafields->getAlignFlag($key);
 						print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
@@ -552,7 +552,7 @@ else
     		// Extra fields
 			if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 			{
-			   foreach($extrafields->attribute_label as $key => $val) 
+			   foreach($extrafields->attribute_label as $key => $val)
 			   {
 					if (! empty($arrayfields["ef.".$key]['checked'])) print '<td class="liste_titre"></td>';
 			   }
@@ -627,7 +627,7 @@ else
     			$product_static->status_buy = $objp->tobuy;
                 $product_static->status     = $objp->tosell;
 				$product_static->entity = $objp->entity;
-				
+
 				if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1)	// To optimize call of load_stock
 				{
 				    if ($objp->fk_product_type != 1)    // Not a service
@@ -635,8 +635,8 @@ else
 				        $product_static->load_stock('nobatch');             // Load stock_reel + stock_warehouse. This also call load_virtual_stock()
 				    }
 				}
-				 
-				
+
+
     			$var=!$var;
     			print '<tr '.$bc[$var].'>';
 
@@ -659,7 +659,7 @@ else
 			    {
 			    	print '<td>'.dol_trunc($objp->label,40).'</td>';
 			    }
-			    
+
     			// Barcode
 			    if (! empty($arrayfields['p.barcode']['checked']))
 			    {
@@ -765,7 +765,7 @@ else
                     print '<td align="center">';
     				print yn($objp->tobatch);
     				print '</td>';
-        		}        		
+        		}
     			// Accountancy code sell
 		        if (! empty($arrayfields['p.accountancy_code_sell']['checked'])) print '<td>'.$objp->accountancy_code_sell.'</td>';
     			// Accountancy code sell
@@ -773,9 +773,9 @@ else
 		        // Extra fields
 				if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 				{
-				   foreach($extrafields->attribute_label as $key => $val) 
+				   foreach($extrafields->attribute_label as $key => $val)
 				   {
-						if (! empty($arrayfields["ef.".$key]['checked'])) 
+						if (! empty($arrayfields["ef.".$key]['checked']))
 						{
 							print '<td';
 							$align=$extrafields->getAlignFlag($key);
@@ -804,8 +804,8 @@ else
 		            print '<td align="center">';
 		            print dol_print_date($objp->date_update, 'dayhour');
 		            print '</td>';
-		        }    			
-    			
+		        }
+
                 // Status (to sell)
 		        if (! empty($arrayfields['p.tosell']['checked']))
         		{
@@ -828,13 +828,13 @@ else
 	                }
 	                print '</td>';
         		}
-        		// Action	
+        		// Action
                 print '<td>&nbsp;</td>';
 
                 print "</tr>\n";
     			$i++;
     		}
-    		
+
     		$db->free($resql);
 
     		print "</table>";

From 929946ad470dd950a401eba7a14a40ca4d081fac Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Jun 2017 10:12:01 +0200
Subject: [PATCH 114/438] Fix several problem with hook printFieldListWhere

---
 htdocs/core/class/commonobject.class.php | 58 +++++++++++++-----------
 htdocs/core/class/hookmanager.class.php  | 10 ++--
 htdocs/core/class/html.form.class.php    | 12 ++++-
 htdocs/core/lib/functions.lib.php        |  3 +-
 4 files changed, 48 insertions(+), 35 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 529bb20a89b..835ad698a1b 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -398,7 +398,7 @@ abstract class CommonObject
         $lastname=$this->lastname;
         $firstname=$this->firstname;
         if (empty($lastname))  $lastname=(isset($this->lastname)?$this->lastname:(isset($this->name)?$this->name:(isset($this->nom)?$this->nom:(isset($this->societe)?$this->societe:(isset($this->company)?$this->company:'')))));
-        
+
         $ret='';
         if ($option && $this->civility_id)
         {
@@ -597,11 +597,11 @@ abstract class CommonObject
             dol_syslog("CODE_NOT_VALID_FOR_THIS_ELEMENT");
             return -3;
         }
-            
+
         $datecreate = dol_now();
 
         $this->db->begin();
-        
+
         // Insertion dans la base
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."element_contact";
         $sql.= " (element_id, fk_socpeople, datecreate, statut, fk_c_type_contact) ";
@@ -1230,19 +1230,19 @@ abstract class CommonObject
     function setValueFrom($field, $value, $table='', $id=null, $format='', $id_field='', $fuser=null, $trigkey='')
     {
         global $user,$langs,$conf;
-        
+
         if (empty($table)) 	  $table=$this->table_element;
         if (empty($id))    	  $id=$this->id;
 		if (empty($format))   $format='text';
 		if (empty($id_field)) $id_field='rowid';
 
 		$error=0;
-		
+
         $this->db->begin();
 
         // Special case
         if ($table == 'product' && $field == 'note_private') $field='note';
-        
+
         $sql = "UPDATE ".MAIN_DB_PREFIX.$table." SET ";
         if ($format == 'text') $sql.= $field." = '".$this->db->escape($value)."'";
         else if ($format == 'int') $sql.= $field." = ".$this->db->escape($value);
@@ -1284,7 +1284,7 @@ abstract class CommonObject
     /**
      *      Load properties id_previous and id_next
      *
-     *      @param	string	$filter		Optional filter
+     *      @param	string	$filter		Optional filter. Example: " AND (t.field1 = 'aa' OR t.field2 = 'bb')"
      *	 	@param  int		$fieldid   	Name of field to use for the select MAX and MIN
      *		@param	int		$nodbprefix	Do not include DB prefix to forge table name
      *      @return int         		<0 if KO, >0 if OK
@@ -1310,11 +1310,15 @@ abstract class CommonObject
         if (empty($this->isnolinkedbythird) && !$user->rights->societe->client->voir) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
         $sql.= " WHERE te.".$fieldid." < '".$this->db->escape($this->ref)."'";  // ->ref must always be defined (set to id if field does not exists)
         if (empty($this->isnolinkedbythird) && !$user->rights->societe->client->voir) $sql.= " AND sc.fk_user = " .$user->id;
-        if (! empty($filter)) $sql.=" AND ".$filter;
+        if (! empty($filter))
+        {
+            if (! preg_match('/^\s*AND/i', $filter)) $sql.=" AND ";   // For backward compatibility
+            $sql.=$filter;
+        }
         if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2 || ($this->element != 'societe' && empty($this->isnolinkedbythird) && !$user->rights->societe->client->voir)) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to entity
         if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql.= ' AND te.entity IN ('.getEntity($this->element, 1).')';
 
-        //print $sql."<br>";
+        //print $filter.' '.$sql."<br>";
         $result = $this->db->query($sql);
         if (! $result)
         {
@@ -1518,7 +1522,7 @@ abstract class CommonObject
 						if($mode == 1) {
 							$line->subprice = 0;
 						}
-						
+
 						switch ($this->element) {
 							case 'propal':
 								$this->updateline($line->id, $line->subprice, $line->qty, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, $line->desc, 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice);
@@ -2154,7 +2158,7 @@ abstract class CommonObject
         // Special cas
         //var_dump($this->table_element);exit;
 		if ($this->table_element == 'product') $suffix='';
-            
+
     	$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
     	$sql.= " SET note".$suffix." = ".(!empty($note)?("'".$this->db->escape($note)."'"):"NULL");
     	$sql.= " WHERE rowid =". $this->id;
@@ -2164,7 +2168,7 @@ abstract class CommonObject
     	{
     		if ($suffix == '_public') $this->note_public = $note;
     		else if ($suffix == '_private') $this->note_private = $note;
-    		else 
+    		else
     		{
     		    $this->note = $note;      // deprecated
     		    $this->note_private = $note;
@@ -2413,7 +2417,7 @@ abstract class CommonObject
     	// Special case
     	if ($origin == 'order') $origin='commande';
     	if ($origin == 'invoice') $origin='facture';
-    	
+
         $this->db->begin();
 
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
@@ -2446,10 +2450,10 @@ abstract class CommonObject
      *	Fetch array of objects linked to current object. Links are loaded into this->linkedObjects array and this->linkedObjectsIds
      *  Possible usage for parameters:
      *  - all parameters empty -> we look all link to current object (current object can be source or target)
-     *  - source id+type -> will get target list linked to source 
-     *  - target id+type -> will get source list linked to target 
-     *  - source id+type + target type -> will get target list of the type 
-     *  - target id+type + target source -> will get source list of the type 
+     *  - source id+type -> will get target list linked to source
+     *  - target id+type -> will get source list linked to target
+     *  - source id+type + target type -> will get target list of the type
+     *  - target id+type + target source -> will get source list of the type
      *
      *	@param	int		$sourceid		Object source id (if not defined, id of object)
      *	@param  string	$sourcetype		Object source type (if not defined, element name of object)
@@ -2902,7 +2906,7 @@ abstract class CommonObject
     function isObjectUsed($id=0)
     {
         if (empty($id)) $id=$this->id;
-        
+
         // Check parameters
         if (! isset($this->childtables) || ! is_array($this->childtables) || count($this->childtables) == 0)
         {
@@ -3019,12 +3023,12 @@ abstract class CommonObject
 
         foreach ($this->lines as $line)
         {
-            if (isset($line->qty_asked))   
+            if (isset($line->qty_asked))
             {
                 if (empty($totalOrdered)) $totalOrdered=0;  // Avoid warning because $totalOrdered is ''
                 $totalOrdered+=$line->qty_asked;    // defined for shipment only
             }
-            if (isset($line->qty_shipped)) 
+            if (isset($line->qty_shipped))
             {
                 if (empty($totalToShip)) $totalToShip=0;    // Avoid warning because $totalToShip is ''
                 $totalToShip+=$line->qty_shipped;   // defined for shipment only
@@ -3052,7 +3056,7 @@ abstract class CommonObject
 
             if (empty($totalWeight)) $totalWeight=0;  // Avoid warning because $totalWeight is ''
             if (empty($totalVolume)) $totalVolume=0;  // Avoid warning because $totalVolume is ''
-            
+
             //var_dump($line->volume_units);
             if ($weight_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
             {
@@ -3369,9 +3373,9 @@ abstract class CommonObject
 				if ($conf->global->MARGIN_TYPE == "1")
 					print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('BuyingPrice').'</td>';
 				else
-					print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('CostPrice').'</td>';	
+					print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('CostPrice').'</td>';
 			}
-			
+
 			if (! empty($conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous)
 				print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarginRate').'</td>';
 			if (! empty($conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous)
@@ -3906,7 +3910,7 @@ abstract class CommonObject
 		if ($filefound)
 		{
 			global $db;  // Required to solve a conception default in commonstickergenerator.class.php making an include of code using $db
-		    
+
 			require_once $file;
 
 			$obj = new $classname($this->db);
@@ -3965,7 +3969,7 @@ abstract class CommonObject
 			// output format that does not support UTF8.
 			$sav_charset_output=$outputlangs->charset_output;
 
-			if (in_array(get_class($this), array('Adherent'))) 
+			if (in_array(get_class($this), array('Adherent')))
 			{
 			    $arrayofrecords = array();   // The write_file of templates of adherent class need this
 			    $resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, 'member', 1, $moreparams);
@@ -4226,7 +4230,7 @@ abstract class CommonObject
             require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
             $extrafields = new ExtraFields($this->db);
             $target_extrafields=$extrafields->fetch_name_optionals_label($this->table_element);
-            
+
             //Eliminate copied source object extra_fields that do not exist in target object
             $new_array_options=array();
             foreach ($this->array_options as $key => $value) {
@@ -4275,7 +4279,7 @@ abstract class CommonObject
     						{
     							if (is_numeric($value)) $res=$object->fetch($value);
 								else $res=$object->fetch('',$value);
-								
+
     							if ($res > 0) $this->array_options[$key]=$object->id;
     							else
     							{
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 0c78e89fa9e..ea1048fd4d1 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -121,7 +121,7 @@ class HookManager
      *                                          All types can also return some values into an array ->results that will be finaly merged into this->resArray for caller.
      * 											$this->error or this->errors are also defined by class called by this function if error.
      */
-	function executeHooks($method, $parameters=false, &$object='', &$action='')
+	function executeHooks($method, $parameters=array(), &$object='', &$action='')
 	{
         if (! is_array($this->hooks) || empty($this->hooks)) return '';
 
@@ -200,9 +200,9 @@ class HookManager
 
                     // test to avoid running twice a hook, when a module implements several active contexts
                     if (in_array($module,$modulealreadyexecuted)) continue;
-                    
+
                     dol_syslog(get_class($this).'::executeHooks a qualified hook was found for method='.$method.' module='.$module." action=".$action." context=".$context);
-                    
+
                     $modulealreadyexecuted[$module]=$module; // Use the $currentcontext in method to avoid running twice
 
                     // Clean class (an error may have been set from a previous call of another method for same module/hook)
@@ -229,7 +229,7 @@ class HookManager
                     // Generic hooks that return a string or array (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...)
                     else
 					{
-                    	// TODO. this should be done into the method of hook by returning nothing
+                    	// TODO. this test should be done into the method of hook by returning nothing
                     	if (is_array($parameters) && ! empty($parameters['special_code']) && $parameters['special_code'] > 3 && $parameters['special_code'] != $actionclassinstance->module_number) continue;
 
                     	//dol_syslog("Call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", hooktype=".$hooktype, LOG_DEBUG);
@@ -237,7 +237,7 @@ class HookManager
 
                     	if (! empty($actionclassinstance->results) && is_array($actionclassinstance->results)) $this->resArray =array_merge($this->resArray, $actionclassinstance->results);
                     	if (! empty($actionclassinstance->resprints)) $this->resPrint.=$actionclassinstance->resprints;
-                    	// TODO dead code to remove (do not enable this, but fix hook instead): result must not be a string. we must use $actionclassinstance->resprints to return a string
+                    	// TODO dead code to remove (do not enable this, but fix hook instead): result must not be a string but an int. you must use $actionclassinstance->resprints to return a string
                     	if (! is_array($resaction) && ! is_numeric($resaction))
                     	{
                     		dol_syslog('Error: Bug into hook '.$method.' of module class '.get_class($actionclassinstance).'. Method must not return a string but an int (0=OK, 1=Replace, -1=KO) and set string into ->resprints', LOG_ERR);
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index dedac785362..b440c012f04 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5683,7 +5683,7 @@ class Form
 
     /**
      *    Return a HTML area with the reference of object and a navigation bar for a business object
-     *    To add a particular filter on select, you must set $object->next_prev_filter to SQL criteria.
+     *    Note: To add a particular filter on select, you can have $object->next_prev_filter set to add SQL criterias.
      *
      *    @param	object	$object			Object to show.
      *    @param	string	$paramid   		Name of parameter to use to name the id into the URL next/previous link.
@@ -5701,12 +5701,20 @@ class Form
      */
     function showrefnav($object,$paramid,$morehtml='',$shownav=1,$fieldid='rowid',$fieldref='ref',$morehtmlref='',$moreparam='',$nodbprefix=0,$morehtmlleft='',$morehtmlstatus='',$morehtmlright='')
     {
-    	global $langs,$conf;
+    	global $langs,$conf,$hookmanager;
 
     	$ret='';
         if (empty($fieldid))  $fieldid='rowid';
         if (empty($fieldref)) $fieldref='ref';
 
+        // Add where from hooks
+        if (is_object($hookmanager))
+        {
+            $parameters=array();
+            $reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters, $object);    // Note that $action and $object may have been modified by hook
+            $object->next_prev_filter.=$hookmanager->resPrint;
+        }
+
         //print "paramid=$paramid,morehtml=$morehtml,shownav=$shownav,$fieldid,$fieldref,$morehtmlref,$moreparam";
         $object->load_previous_next_ref((isset($object->next_prev_filter)?$object->next_prev_filter:''),$fieldid,$nodbprefix);
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 0943bc1a7af..44670d7a5c1 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -972,7 +972,8 @@ function dol_get_fiche_end($notab=0)
 }
 
 /**
- *  Show tab footer of a card
+ *  Show tab footer of a card.
+ *  Note: $object->next_prev_filter can be set to restrict select to find next or previous record by $form->showrefnav.
  *
  *  @param	object	$object			Object to show
  *  @param	string	$paramid   		Name of parameter to use to name the id into the URL next/previous link

From bec6ad9fb30f1c7037014fdab1d107a2173b8bc0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Jun 2017 10:22:07 +0200
Subject: [PATCH 115/438] Fix bad position of hook

---
 htdocs/product/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 56508616edd..c882390a56a 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -119,11 +119,11 @@ $prodser[0][0]=$prodser[0][1]=$prodser[1][0]=$prodser[1][1]=0;
 $sql = "SELECT COUNT(p.rowid) as total, p.fk_product_type, p.tosell, p.tobuy";
 $sql.= " FROM ".MAIN_DB_PREFIX."product as p";
 $sql.= ' WHERE p.entity IN ('.getEntity($product_static->element, 1).')';
-$sql.= " GROUP BY p.fk_product_type, p.tosell, p.tobuy";
 // Add where from hooks
 $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
+$sql.= " GROUP BY p.fk_product_type, p.tosell, p.tobuy";
 $result = $db->query($sql);
 while ($objp = $db->fetch_object($result))
 {

From b92980c6ff71c83252a65a16a5b13e75b982435b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Jun 2017 10:38:06 +0200
Subject: [PATCH 116/438] Fix statistics on products

---
 htdocs/langs/en_US/products.lang |  8 ++++---
 htdocs/product/index.php         | 38 +++++++++++++++++++-------------
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 0ab21cae322..ae9cd743c8f 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -25,11 +25,13 @@ ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
-ProductsOnSell=Product for sale or for purchase
+ProductsOnSaleOnly=Products for sale only
+ProductsOnPurchaseOnly=Product for purchase only
 ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Products for sale and for purchase
-ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services not for sale
+ServicesOnSaleOnly=Services for sale only
+ServicesOnPurchaseOnly=Services for purchase only
+ServicesNotOnSell=Services not for sale and not for purchase
 ServicesOnSellAndOnBuy=Services for sale and for purchase
 LastModifiedProductsAndServices=Latest %s modified products/services
 LastRecordedProducts=Latest %s recorded products
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 49a80859bd9..a09a8069b9e 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -84,7 +84,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is usele
     {
     	$listofsearchfields['search_product']=array('text'=>'ProductOrService');
     }
-    
+
     if (count($listofsearchfields))
     {
     	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
@@ -100,7 +100,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is usele
     		print '</tr>';
     		$i++;
     	}
-    	print '</table>';	
+    	print '</table>';
     	print '</form>';
     	print '<br>';
     }
@@ -111,7 +111,8 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is usele
  * Number of products and/or services
  */
 $prodser = array();
-$prodser[0][0]=$prodser[0][1]=$prodser[1][0]=$prodser[1][1]=0;
+$prodser[0][0]=$prodser[0][1]=$prodser[0][2]=$prodser[0][3]=0;
+$prodser[1][0]=$prodser[1][1]=$prodser[1][2]=$prodser[1][3]=0;
 
 $sql = "SELECT COUNT(p.rowid) as total, p.fk_product_type, p.tosell, p.tobuy";
 $sql.= " FROM ".MAIN_DB_PREFIX."product as p";
@@ -120,9 +121,10 @@ $sql.= " GROUP BY p.fk_product_type, p.tosell, p.tobuy";
 $result = $db->query($sql);
 while ($objp = $db->fetch_object($result))
 {
-	$status=2;
-	if (! $objp->tosell && ! $objp->tobuy) $status=0;	// To sell OR to buy
-	if ((! $objp->tosell && $objp->tobuy) || ($objp->tosell && ! $objp->tobuy)) $status=1;
+	$status=3;
+	if (! $objp->tosell && ! $objp->tobuy) $status=0;	// Not on sale, not on purchase
+	if ($objp->tosell && ! $objp->tobuy) $status=1;     // On sale only
+	if (! $objp->tosell && $objp->tobuy) $status=2;     // On purchase only
 	$prodser[$objp->fk_product_type][$status]=$objp->total;
 }
 
@@ -134,10 +136,13 @@ if (! empty($conf->product->enabled))
 	$statProducts.= '<td><a href="list.php?type=0&amp;tosell=0&amp;tobuy=0">'.$langs->trans("ProductsNotOnSell").'</a></td><td align="right">'.round($prodser[0][0]).'</td>';
 	$statProducts.= "</tr>";
 	$statProducts.= '<tr class="oddeven">';
-	$statProducts.= '<td><a href="list.php?type=0">'.$langs->trans("ProductsOnSell").'</a></td><td align="right">'.round($prodser[0][1]).'</td>';
+	$statProducts.= '<td><a href="list.php?type=0">'.$langs->trans("ProductsOnSaleOnly").'</a></td><td align="right">'.round($prodser[0][1]).'</td>';
 	$statProducts.= "</tr>";
 	$statProducts.= '<tr class="oddeven">';
-	$statProducts.= '<td><a href="list.php?type=0&amp;tosell=1&amp;tobuy=1">'.$langs->trans("ProductsOnSellAndOnBuy").'</a></td><td align="right">'.round($prodser[0][2]).'</td>';
+	$statProducts.= '<td><a href="list.php?type=0">'.$langs->trans("ProductsOnPurchaseOnly").'</a></td><td align="right">'.round($prodser[0][2]).'</td>';
+	$statProducts.= "</tr>";
+	$statProducts.= '<tr class="oddeven">';
+	$statProducts.= '<td><a href="list.php?type=0&amp;tosell=1&amp;tobuy=1">'.$langs->trans("ProductsOnSellAndOnBuy").'</a></td><td align="right">'.round($prodser[0][3]).'</td>';
 	$statProducts.= "</tr>";
 
 }
@@ -147,10 +152,13 @@ if (! empty($conf->service->enabled))
 	$statServices.= '<td><a href="list.php?type=1&amp;tosell=0&amp;tobuy=0">'.$langs->trans("ServicesNotOnSell").'</a></td><td align="right">'.round($prodser[1][0]).'</td>';
 	$statServices.= "</tr>";
 	$statServices.= '<tr class="oddeven">';
-	$statServices.= '<td><a href="list.php?type=1">'.$langs->trans("ServicesOnSell").'</a></td><td align="right">'.round($prodser[1][1]).'</td>';
+	$statServices.= '<td><a href="list.php?type=1">'.$langs->trans("ServicesOnSaleOnly").'</a></td><td align="right">'.round($prodser[1][1]).'</td>';
 	$statServices.= "</tr>";
 	$statServices.= '<tr class="oddeven">';
-	$statServices.= '<td><a href="list.php?type=1&amp;tosell=1&amp;tobuy=1">'.$langs->trans("ServicesOnSellAndOnBuy").'</a></td><td align="right">'.round($prodser[1][2]).'</td>';
+	$statServices.= '<td><a href="list.php?type=1">'.$langs->trans("ServicesOnPurchaseOnly").'</a></td><td align="right">'.round($prodser[1][2]).'</td>';
+	$statServices.= "</tr>";
+	$statServices.= '<tr class="oddeven">';
+	$statServices.= '<td><a href="list.php?type=1&amp;tosell=1&amp;tobuy=1">'.$langs->trans("ServicesOnSellAndOnBuy").'</a></td><td align="right">'.round($prodser[1][3]).'</td>';
 	$statServices.= "</tr>";
 
 }
@@ -220,7 +228,7 @@ if (! empty($conf->categorie->enabled) && ! empty($conf->global->CATEGORY_GRAPHS
 			while ($i < $num)
 			{
 				$obj = $db->fetch_object($result);
-				
+
 				print '<tr $bc[$var]><td>'.$obj->label.'</td><td>'.$obj->nb.'</td></tr>';
 				$total+=$obj->nb;
 				$i++;
@@ -292,7 +300,7 @@ if ($result)
 				}
 			}
 
-			
+
 			print '<tr class="oddeven">';
 			print '<td class="nowrap">';
 			$product_static->id=$objp->rowid;
@@ -419,7 +427,7 @@ function activitytrim($product_type)
 		$i = 0;
 
 		$var=true;
-		
+
 		while ($i < $num)
 		{
 			$objp = $db->fetch_object($result);
@@ -427,7 +435,7 @@ function activitytrim($product_type)
 			{
 				if ($trim1+$trim2+$trim3+$trim4 > 0)
 				{
-				    
+
 					print '<tr class="oddeven"><td align=left>'.$tmpyear.'</td>';
 					print '<td align=right>'.price($trim1).'</td>';
 					print '<td align=right>'.price($trim2).'</td>';
@@ -461,7 +469,7 @@ function activitytrim($product_type)
 		}
 		if ($trim1+$trim2+$trim3+$trim4 > 0)
 		{
-		    
+
 			print '<tr class="oddeven"><td align=left>'.$tmpyear.'</td>';
 			print '<td align=right>'.price($trim1).'</td>';
 			print '<td align=right>'.price($trim2).'</td>';

From 02781b41ca3ac52a1df93a4badc32bdaacf71d50 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Jun 2017 11:02:34 +0200
Subject: [PATCH 117/438] Fix several problem with hook printFieldListWhere

---
 htdocs/core/boxes/box_produits.php            |   9 +-
 .../core/boxes/box_produits_alerte_stock.php  |  11 +-
 htdocs/product/class/product.class.php        | 125 +++++++++---------
 htdocs/product/class/service.class.php        |   9 +-
 4 files changed, 91 insertions(+), 63 deletions(-)

diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index 51ee156fbeb..c495c83f867 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -53,7 +53,7 @@ class box_produits extends ModeleBoxes
 	 */
 	function loadBox($max=5)
 	{
-		global $user, $langs, $db, $conf;
+		global $user, $langs, $db, $conf, $hookmanager;
 
 		$this->max=$max;
 
@@ -69,6 +69,13 @@ class box_produits extends ModeleBoxes
 			$sql.= ' WHERE p.entity IN ('.getEntity($productstatic->element, 1).')';
 			if (empty($user->rights->produit->lire)) $sql.=' AND p.fk_product_type != 0';
 			if (empty($user->rights->service->lire)) $sql.=' AND p.fk_product_type != 1';
+			// Add where from hooks
+			if (is_object($hookmanager))
+			{
+			    $parameters=array();
+			    $reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
+			    $sql.=$hookmanager->resPrint;
+			}
 			$sql.= $db->order('p.datec', 'DESC');
 			$sql.= $db->plimit($max, 0);
 
diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
index 884cf92b52a..c8c856684af 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -55,7 +55,7 @@ class box_produits_alerte_stock extends ModeleBoxes
 	 */
 	function loadBox($max=5)
 	{
-		global $user, $langs, $db, $conf;
+		global $user, $langs, $db, $conf, $hookmanager;
 
 		$this->max=$max;
 
@@ -74,7 +74,14 @@ class box_produits_alerte_stock extends ModeleBoxes
 			$sql.= " AND p.tosell = 1 AND p.seuil_stock_alerte > 0";
 			if (empty($user->rights->produit->lire)) $sql.=' AND p.fk_product_type != 0';
 			if (empty($user->rights->service->lire)) $sql.=' AND p.fk_product_type != 1';
-			$sql.= " GROUP BY p.rowid, p.ref, p.label, p.price, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.seuil_stock_alerte, p.entity";
+			// Add where from hooks
+    		if (is_object($hookmanager))
+    		{
+    		    $parameters=array();
+    		    $reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
+    		    $sql.=$hookmanager->resPrint;
+    		}
+		    $sql.= " GROUP BY p.rowid, p.ref, p.label, p.price, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.seuil_stock_alerte, p.entity";
 			$sql.= " HAVING SUM(".$db->ifsql("s.reel IS NULL","0","s.reel").") < p.seuil_stock_alerte";
 			$sql.= $db->order('p.seuil_stock_alerte', 'DESC');
 			$sql.= $db->plimit($max, 0);
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 48badb5623e..0f28ffdea30 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -108,7 +108,7 @@ class Product extends CommonObject
 	var $localtax2_tx;
 	var $localtax1_type;
 	var $localtax2_type;
-	
+
 	//! Stock real
 	var $stock_reel;
 	//! Stock virtual
@@ -196,7 +196,7 @@ class Product extends CommonObject
 	public $fourn_pu;
 
 	public $fourn_price_base_type;
-    
+
 	/**
 	 * @deprecated
 	 * @see ref_supplier
@@ -306,7 +306,7 @@ class Product extends CommonObject
 		if (empty($this->localtax2_tx)) $this->localtax2_tx = 0;
 		if (empty($this->localtax1_type)) $this->localtax1_type = '0';
 		if (empty($this->localtax2_type)) $this->localtax2_type = '0';
-		
+
 		if (empty($this->price))     	$this->price = 0;
 		if (empty($this->price_min)) 	$this->price_min = 0;
 
@@ -675,7 +675,7 @@ class Product extends CommonObject
                 $org->fetch($this->id);
                 $this->oldcopy=$org;
             }
-            
+
             // Test if batch management is activated on existing product
             // If yes, we create missing entries into product_batch
             if ($this->hasbatch() && !$this->oldcopy->hasbatch())
@@ -691,7 +691,7 @@ class Product extends CommonObject
                     $qty_batch = 0;
                     foreach ($ObjW->detail_batch as $detail)    // Each lines of detail in product_batch of the current $ObjW = product_stock
                     {
-                        if ($detail->batch == $valueforundefinedlot || $detail->batch == 'Undefined') 
+                        if ($detail->batch == $valueforundefinedlot || $detail->batch == 'Undefined')
                         {
                             // We discard this line, we will create it later
                             $sqlclean="DELETE FROM ".MAIN_DB_PREFIX."product_batch WHERE batch in('Undefined', '".$valueforundefinedlot."') AND fk_product_stock = ".$ObjW->id;
@@ -703,7 +703,7 @@ class Product extends CommonObject
                             }
                             continue;
                         }
-                    
+
                         $qty_batch += $detail->qty;
                     }
                     // Quantities in batch details are not same as stock quantity,
@@ -711,7 +711,7 @@ class Product extends CommonObject
                     if ($ObjW->real <> $qty_batch)
                     {
                         $ObjBatch = new Productbatch($this->db);
-                        $ObjBatch->batch = $valueforundefinedlot; 
+                        $ObjBatch->batch = $valueforundefinedlot;
                         $ObjBatch->qty = ($ObjW->real - $qty_batch);
                         $ObjBatch->fk_product_stock = $ObjW->id;
 
@@ -738,7 +738,7 @@ class Product extends CommonObject
 			$sql.= ", localtax2_tx = " . $this->localtax2_tx;
 			$sql.= ", localtax1_type = " . ($this->localtax1_type!=''?"'".$this->localtax1_type."'":"'0'");
 			$sql.= ", localtax2_type = " . ($this->localtax2_type!=''?"'".$this->localtax2_type."'":"'0'");
-				
+
 			$sql.= ", barcode = ". (empty($this->barcode)?"null":"'".$this->db->escape($this->barcode)."'");
 			$sql.= ", fk_barcode_type = ". (empty($this->barcode_type)?"null":$this->db->escape($this->barcode_type));
 
@@ -924,8 +924,8 @@ class Product extends CommonObject
                 if ($result < 0) { $error++; }
                 // End call triggers
 			}
-			
-			// Delete from product_batch on product delete	
+
+			// Delete from product_batch on product delete
 			if (! $error)
 			{
 				$sql = "DELETE FROM ".MAIN_DB_PREFIX.'product_batch';
@@ -940,7 +940,7 @@ class Product extends CommonObject
 					$this->errors[] = $this->db->lasterror();
 				}
 			}
-			
+
    			// Delete all child tables
 			if (! $error)
 			{
@@ -1038,7 +1038,7 @@ class Product extends CommonObject
 	function setMultiLangs($user)
 	{
 		global $conf, $langs;
-		
+
 		$langs_available = $langs->get_available_languages(DOL_DOCUMENT_ROOT, 0, 2);
 		$current_lang = $langs->getDefaultLang();
 
@@ -1357,7 +1357,7 @@ class Product extends CommonObject
 		$sql.= " WHERE pfp.rowid = ".$prodfournprice;
 		if ($qty > 0) $sql.= " AND pfp.quantity <= ".$qty;
 		$sql.= " ORDER BY pfp.quantity DESC";
-		
+
 		dol_syslog(get_class($this)."::get_buyprice first search by prodfournprice/qty", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -1487,7 +1487,7 @@ class Product extends CommonObject
 
 		// If multiprices are enabled, then we check if the current product is subject to price autogeneration
 		// Price will be modified ONLY when the first one is the one that is being modified
-		if (!empty($conf->global->PRODUIT_MULTIPRICES) && !$ignore_autogen && $this->price_autogen && ($level == 1)) 
+		if (!empty($conf->global->PRODUIT_MULTIPRICES) && !$ignore_autogen && $this->price_autogen && ($level == 1))
 		{
 			return $this->generateMultiprices($user, $newprice, $newpricebase, $newvat, $newnpr, $newpsq);
 		}
@@ -1555,7 +1555,7 @@ class Product extends CommonObject
 			}
 			if (empty($localtax1)) $localtax1=0;	// If = '' then = 0
 			if (empty($localtax2)) $localtax2=0;	// If = '' then = 0
-			
+
 			$this->db->begin();
 
 			// Ne pas mettre de quote sur les numeriques decimaux.
@@ -1601,7 +1601,7 @@ class Product extends CommonObject
 				$this->localtax2_tx = $localtax2;
 				$this->localtax1_type = $localtaxtype1;
 				$this->localtax2_type = $localtaxtype2;
-				
+
 				// Price by quantity
 				$this->price_by_qty = $newpsq;
 
@@ -1702,7 +1702,7 @@ class Product extends CommonObject
 				$this->url						= $obj->url;
 				$this->note_private				= $obj->note_private;
 				$this->note						= $obj->note_private;  // deprecated
-				
+
 				$this->type						= $obj->fk_product_type;
 				$this->status					= $obj->tosell;
 				$this->status_buy				= $obj->tobuy;
@@ -1726,7 +1726,7 @@ class Product extends CommonObject
 				$this->localtax2_tx				= $obj->localtax2_tx;
 				$this->localtax1_type			= $obj->localtax1_type;
 				$this->localtax2_type			= $obj->localtax2_type;
-				
+
 				$this->finished					= $obj->finished;
 				$this->duration					= $obj->duration;
 				$this->duration_value			= substr($obj->duration,0,dol_strlen($obj->duration)-1);
@@ -1773,7 +1773,7 @@ class Product extends CommonObject
 
 				// multilangs
 				if (! empty($conf->global->MAIN_MULTILANGS)) $this->getMultiLangs();
-				
+
 				// Load multiprices array
 				if (! empty($conf->global->PRODUIT_MULTIPRICES))
 				{
@@ -2006,29 +2006,29 @@ class Product extends CommonObject
 			$this->stats_commande['rows']=$obj->nb_rows;
 			$this->stats_commande['qty']=$obj->qty?$obj->qty:0;
 
-			// if it's a virtual product, maybe it is in order by extension		
+			// if it's a virtual product, maybe it is in order by extension
 			if (! empty($conf->global->ORDER_ADD_ORDERS_WITH_PARENT_PROD_IF_INCDEC))
-			{	
+			{
 				$TFather = $this->getFather();
 				if (is_array($TFather) && !empty($TFather)) {
 					foreach($TFather as &$fatherData) {
 						$pFather = new Product($this->db);
-						$pFather->id = $fatherData['id'];  
+						$pFather->id = $fatherData['id'];
 						$qtyCoef = $fatherData['qty'];
-	
+
 						if ($fatherData['incdec']) {
 							$pFather->load_stats_commande($socid, $filtrestatut);
-							
+
 							$this->stats_commande['customers']+=$pFather->stats_commande['customers'];
 							$this->stats_commande['nb']+=$pFather->stats_commande['nb'];
 							$this->stats_commande['rows']+=$pFather->stats_commande['rows'];
 							$this->stats_commande['qty']+=$pFather->stats_commande['qty'] * $qtyCoef;
-							
+
 						}
 					}
 				}
 			}
-						
+
 			return 1;
 		}
 		else
@@ -2432,7 +2432,7 @@ class Product extends CommonObject
 		$sql = "SELECT sum(d.qty), date_format(p.datep, '%Y%m')";
 		if ($mode == 'bynumber') $sql.= ", count(DISTINCT p.rowid)";
 		$sql.= " FROM ".MAIN_DB_PREFIX."propaldet as d, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."societe as s";
-        if ($filteronproducttype >= 0) $sql.=", ".MAIN_DB_PREFIX."product as prod";		
+        if ($filteronproducttype >= 0) $sql.=", ".MAIN_DB_PREFIX."product as prod";
 		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE p.rowid = d.fk_propal";
 		if ($this->id > 0) $sql.= " AND d.fk_product =".$this->id;
@@ -2464,7 +2464,7 @@ class Product extends CommonObject
 		$sql = "SELECT sum(d.qty), date_format(p.date_valid, '%Y%m')";
 		if ($mode == 'bynumber') $sql.= ", count(DISTINCT p.rowid)";
 		$sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposaldet as d, ".MAIN_DB_PREFIX."supplier_proposal as p, ".MAIN_DB_PREFIX."societe as s";
-        if ($filteronproducttype >= 0) $sql.=", ".MAIN_DB_PREFIX."product as prod";		
+        if ($filteronproducttype >= 0) $sql.=", ".MAIN_DB_PREFIX."product as prod";
 		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE p.rowid = d.fk_supplier_proposal";
 		if ($this->id > 0) $sql.= " AND d.fk_product =".$this->id;
@@ -2479,7 +2479,7 @@ class Product extends CommonObject
 
 		return $this->_get_stats($sql,$mode);
 	}
-	
+
 	/**
 	 *  Return nb of units or orders in which product is included
 	 *
@@ -2526,7 +2526,7 @@ class Product extends CommonObject
 		$sql = "SELECT sum(d.qty), date_format(c.date_commande, '%Y%m')";
 		if ($mode == 'bynumber') $sql.= ", count(DISTINCT c.rowid)";
 		$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as d, ".MAIN_DB_PREFIX."commande_fournisseur as c, ".MAIN_DB_PREFIX."societe as s";
-        if ($filteronproducttype >= 0) $sql.=", ".MAIN_DB_PREFIX."product as p";		
+        if ($filteronproducttype >= 0) $sql.=", ".MAIN_DB_PREFIX."product as p";
 		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE c.rowid = d.fk_commande";
 		if ($this->id > 0) $sql.= " AND d.fk_product =".$this->id;
@@ -2715,7 +2715,7 @@ class Product extends CommonObject
 		$now=dol_now();
 
     	dol_syslog(get_class($this)."::add_fournisseur id_fourn = ".$id_fourn." ref_fourn=".$ref_fourn." quantity=".$quantity, LOG_DEBUG);
-    	
+
 		if ($ref_fourn)
 		{
     		$sql = "SELECT rowid, fk_product";
@@ -3104,7 +3104,7 @@ class Product extends CommonObject
 	function getChildsArbo($id, $firstlevelonly=0, $level=1)
 	{
 		global $alreadyfound;
-		
+
 		$sql = "SELECT p.rowid, p.label as label, pa.qty as qty, pa.fk_product_fils as id, p.fk_product_type, pa.incdec";
 		$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
 		$sql.= ", ".MAIN_DB_PREFIX."product_association as pa";
@@ -3113,18 +3113,18 @@ class Product extends CommonObject
 		$sql.= " AND pa.fk_product_fils != ".$id;	// This should not happens, it is to avoid infinite loop if it happens
 
 		dol_syslog(get_class($this).'::getChildsArbo id='.$id.' level='.$level, LOG_DEBUG);
-		
+
 		if ($level == 1) $alreadyfound=array($id=>1);	// We init array of found object to start of tree, so if we found it later (should not happened), we stop immediatly
 		// Protection against infinite loop
 		if ($level > 30) return array();
-		
+
 		$res  = $this->db->query($sql);
 		if ($res)
 		{
 			$prods = array();
 			while ($rec = $this->db->fetch_array($res))
 			{
-				if (! empty($alreadyfound[$rec['rowid']])) 
+				if (! empty($alreadyfound[$rec['rowid']]))
 				{
 					dol_syslog(get_class($this).'::getChildsArbo the product id='.$rec['rowid'].' was already found at a higher level in tree. We discard to avoid infinite loop', LOG_WARNING);
 					continue;
@@ -3194,7 +3194,7 @@ class Product extends CommonObject
 		$result='';
         $newref=$this->ref;
         if ($maxlength) $newref=dol_trunc($newref,$maxlength,'middle');
-        
+
         if ($this->type == Product::TYPE_PRODUCT) $label = '<u>' . $langs->trans("ShowProduct") . '</u>';
         if ($this->type == Product::TYPE_SERVICE) $label = '<u>' . $langs->trans("ShowService") . '</u>';
         if (! empty($this->ref))
@@ -3217,13 +3217,13 @@ class Product extends CommonObject
         {
             //
         }
-        if (! empty($this->entity)) 
+        if (! empty($this->entity))
         {
             $tmpphoto = $this->show_photos($conf->product->multidir_output[$this->entity],1,1,0,0,0,80);
-            if ($this->nbphoto > 0) $label .= '<br>' . $tmpphoto; 
+            if ($this->nbphoto > 0) $label .= '<br>' . $tmpphoto;
         }
 
-        
+
 		$linkclose='';
 		if (empty($notooltip))
 		{
@@ -3235,7 +3235,7 @@ class Product extends CommonObject
 
 		    $linkclose.= ' title="'.dol_escape_htmltag($label, 1, 1).'"';
 		    $linkclose.=' class="classfortooltip"';
-		    
+
 		    if (! is_object($hookmanager))
 	        {
 	            include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
@@ -3260,7 +3260,7 @@ class Product extends CommonObject
         $linkstart = '<a href="'.$url.'"';
         $linkstart.=$linkclose.'>';
         $linkend='</a>';
-        
+
 		if ($withpicto) {
 			if ($this->type == Product::TYPE_PRODUCT) $result.=($linkstart.img_object(($notooltip?'':$label), 'product', ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend.' ');
 			if ($this->type == Product::TYPE_SERVICE) $result.=($linkstart.img_object(($notooltip?'':$label), 'service',  ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend.' ');
@@ -3303,7 +3303,7 @@ class Product extends CommonObject
 	function LibStatut($status,$mode=0,$type=0)
 	{
 		global $conf, $langs;
-		
+
 		$langs->load('products');
 		if (! empty($conf->productbatch->enabled)) $langs->load("productbatch");
 
@@ -3473,14 +3473,14 @@ class Product extends CommonObject
 
 	/**
 	 *    Load information about stock of a product into stock_reel, stock_warehouse[] (including stock_warehouse[idwarehouse]->detail_batch for batch products)
-	 *    This function need a lot of load. If you use it on list, use a cache to execute it one for each product id. 
+	 *    This function need a lot of load. If you use it on list, use a cache to execute it one for each product id.
 	 *    If ENTREPOT_EXTRA_STATUS set, filtering on warehouse status possible.
 	 *
-	 *    @param      string   $option 		'' = Load all stock info, also from closed and internal warehouses, 
-	 *										'nobatch' = Do not load batch information, 
+	 *    @param      string   $option 		'' = Load all stock info, also from closed and internal warehouses,
+	 *										'nobatch' = Do not load batch information,
 	 *										'novirtual' = Do not load virtual stock,
 	 *										'warehouseopen' = Load stock from open warehouses,
-	 *										'warehouseclosed' = Load stock from closed warehouses, 
+	 *										'warehouseclosed' = Load stock from closed warehouses,
 	 *										'warehouseinternal' = Load stock from warehouses for internal correct/transfer only
 	 *    @return     int                  < 0 if KO, > 0 if OK
 	 *    @see		  load_virtual_stock, getBatchInfo
@@ -3488,26 +3488,26 @@ class Product extends CommonObject
 	function load_stock($option='')
 	{
 		global $conf;
-		
+
 		$this->stock_reel = 0;
 		$this->stock_warehouse = array();
 		$this->stock_theorique = 0;
 
 		$warehouseStatus = array();
 
-		if (preg_match('/warehouseclosed/', $option)) 
+		if (preg_match('/warehouseclosed/', $option))
 		{
 			$warehouseStatus[] = Entrepot::STATUS_CLOSED;
 		}
-		if (preg_match('/warehouseopen/', $option)) 
+		if (preg_match('/warehouseopen/', $option))
 		{
 			$warehouseStatus[] = Entrepot::STATUS_OPEN_ALL;
 		}
-		if (preg_match('/warehouseinternal/', $option)) 
+		if (preg_match('/warehouseinternal/', $option))
 		{
 			$warehouseStatus[] = Entrepot::STATUS_OPEN_INTERNAL;
 		}
-		
+
 		$sql = "SELECT ps.rowid, ps.reel, ps.fk_entrepot";
 		$sql.= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
 		$sql.= ", ".MAIN_DB_PREFIX."entrepot as w";
@@ -3537,7 +3537,7 @@ class Product extends CommonObject
 			}
 			$this->db->free($result);
 
-			if (! preg_match('/novirtual/', $option)) 
+			if (! preg_match('/novirtual/', $option))
 			{
 			    $this->load_virtual_stock();		// This also load stats_commande_fournisseur, ...
 			}
@@ -3553,7 +3553,7 @@ class Product extends CommonObject
 
 	/**
 	 *    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. 
+	 *    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
@@ -3790,7 +3790,7 @@ class Product extends CommonObject
     						// Find name of thumb file
     						$photo_vignette=basename(getImageFileNameForSize($dir.$file, '_small'));
     						if (! dol_is_file($dirthumb.$photo_vignette)) $photo_vignette='';
-    						
+
     						// Get filesize of original file
     						$imgarray=dol_getImageSize($dir.$photo);
 
@@ -3804,9 +3804,9 @@ class Product extends CommonObject
     						else if ($nbbyrow < 0) $return .= '<div class="inline-block">';
 
     						$return.= "\n";
-    						
+
     						$relativefile=preg_replace('/^\//', '', $pdir.$photo);
-    						if (empty($nolink)) 
+    						if (empty($nolink))
     						{
     						    $urladvanced=getAdvancedPreviewUrl('product', $relativefile);
     						    if ($urladvanced) $return.='<a href="'.$urladvanced.'">';
@@ -3817,7 +3817,7 @@ class Product extends CommonObject
     						// Si fichier vignette disponible et image source trop grande, on utilise la vignette, sinon on utilise photo origine
     						$alt=$langs->transnoentitiesnoconv('File').': '.$relativefile;
     						$alt.=' - '.$langs->transnoentitiesnoconv('Size').': '.$imgarray['width'].'x'.$imgarray['height'];
-    						
+
     						if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)
     						{
     							$return.= '<!-- Show thumb -->';
@@ -4017,7 +4017,7 @@ class Product extends CommonObject
 	 */
 	function load_state_board()
 	{
-		global $conf, $user;
+		global $conf, $user, $hookmanager;
 
 		$this->nb=array();
 
@@ -4025,6 +4025,13 @@ class Product extends CommonObject
 		$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
 		$sql.= ' WHERE p.entity IN ('.getEntity($this->element, 1).')';
 		$sql.= " AND p.fk_product_type <> 1";
+		// Add where from hooks
+		if (is_object($hookmanager))
+		{
+		    $parameters=array();
+		    $reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
+		    $sql.=$hookmanager->resPrint;
+		}
 
 		$resql=$this->db->query($sql);
 		if ($resql)
@@ -4350,7 +4357,7 @@ class Product extends CommonObject
 			return $user->rights->service;
 		}
 	}
-	
+
     /**
      *  Load information for tab info
      *
diff --git a/htdocs/product/class/service.class.php b/htdocs/product/class/service.class.php
index 2cd785527a5..ed78adb5ee5 100644
--- a/htdocs/product/class/service.class.php
+++ b/htdocs/product/class/service.class.php
@@ -56,7 +56,7 @@ class Service extends CommonObject
 	 */
 	function load_state_board()
 	{
-		global $conf, $user;
+		global $conf, $user, $hookmanager;
 
 		$this->nb=array();
 
@@ -64,6 +64,13 @@ class Service extends CommonObject
 		$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
 		$sql.= ' WHERE p.entity IN ('.getEntity('product', 1).')';
 		$sql.= " AND p.fk_product_type = 1";
+		// Add where from hooks
+		if (is_object($hookmanager))
+		{
+		    $parameters=array();
+		    $reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
+		    $sql.=$hookmanager->resPrint;
+		}
 
 		$resql=$this->db->query($sql);
 		if ($resql)

From 92b7914ef39a40d5dc9845ca4fd9694ab54f57e7 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Fri, 9 Jun 2017 11:09:06 +0200
Subject: [PATCH 118/438] Fix : button convert was still available even if
 deposit was already converted

---
 htdocs/compta/facture.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index d7f6a5c7dfd..c19c521ca65 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -3938,6 +3938,9 @@ else if ($id > 0 || ! empty($ref))
 				}
 			}
 
+			$discount = new DiscountAbsolute($db);
+			$result = $discount->fetch(0, $object->id);
+
 			// Reopen a standard paid invoice
 			if ((($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT)
 				|| ($object->type == Facture::TYPE_CREDIT_NOTE && empty($discount->id))

From 62933e9a267dccc6da52e6f534af58eade3fff53 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Jun 2017 11:22:42 +0200
Subject: [PATCH 119/438] Fix sql syntax error in some cases

---
 htdocs/core/class/commonobject.class.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 835ad698a1b..d98625db1cc 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1335,7 +1335,11 @@ abstract class CommonObject
         if (empty($this->isnolinkedbythird) && !$user->rights->societe->client->voir) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
         $sql.= " WHERE te.".$fieldid." > '".$this->db->escape($this->ref)."'";  // ->ref must always be defined (set to id if field does not exists)
         if (empty($this->isnolinkedbythird) && !$user->rights->societe->client->voir) $sql.= " AND sc.fk_user = " .$user->id;
-        if (! empty($filter)) $sql.=" AND ".$filter;
+        if (! empty($filter))
+        {
+            if (! preg_match('/^\s*AND/i', $filter)) $sql.=" AND ";   // For backward compatibility
+            $sql.=$filter;
+        }
         if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2 || ($this->element != 'societe' && empty($this->isnolinkedbythird) && !$user->rights->societe->client->voir)) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to entity
         if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql.= ' AND te.entity IN ('.getEntity($this->element, 1).')';
         // Rem: Bug in some mysql version: SELECT MIN(rowid) FROM llx_socpeople WHERE rowid > 1 when one row in database with rowid=1, returns 1 instead of null

From 41586b76c045f44afe6c30710f5db280d8e6f693 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Jun 2017 11:31:08 +0200
Subject: [PATCH 120/438] Fix missing css

---
 htdocs/admin/perms.php          |  2 +-
 htdocs/theme/eldy/style.css.php |  9 ++++++---
 htdocs/theme/md/style.css.php   | 13 ++++++++-----
 htdocs/user/perms.php           |  4 ++--
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php
index 4302222630c..10d72f88bf0 100644
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -189,7 +189,7 @@ if ($result)
         $var=!$var;
         print '<tr '. $bc[$var].'>';
 
-        print '<td>'.img_object('',$picto).' '.$objMod->getName();
+        print '<td>'.img_object('',$picto,'class="pictoobjectwidth"').' '.$objMod->getName();
         print '<a name="'.$objMod->getName().'">&nbsp;</a>';
 
         $perm_libelle=($conf->global->MAIN_USE_ADVANCED_PERMS && ($langs->trans("PermissionAdvanced".$obj->id)!=("PermissionAdvanced".$obj->id))?$langs->trans("PermissionAdvanced".$obj->id):(($langs->trans("Permission".$obj->id)!=("Permission".$obj->id))?$langs->trans("Permission".$obj->id):$obj->libelle));
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index dd91fc17d28..8d803160325 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -986,6 +986,9 @@ div.nopadding {
 	margin-<?php echo $right; ?>: 8px;
 	margin-bottom: 4px;
 }
+.pictoobjectwidth {
+	width: 14px;
+}
 .pictosubstatus {
     padding-left: 2px;
     padding-right: 2px;
@@ -2972,16 +2975,16 @@ div.tabBar .noborder {
     border: 1px solid #CCC;
     text-align: center;
     border-radius: 2px;
-    
+
 	white-space: nowrap;
 	overflow: hidden;
     text-overflow: ellipsis;
-    width: 115px;    
+    width: 115px;
 }
 @media only screen and (max-width: 767px)
 {
     .boxstats {
-        width: 100px;    
+        width: 100px;
     }
 }
 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 05b127250cb..a047eabef13 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -756,10 +756,10 @@ div.fiche>form>div.div-table-responsive {
     	width: 20px;
         object-fit: contain;
     }
-    
+
 	div.statusref {
     	padding-right: 10px;
-   	}    
+   	}
 }
 .linkobject { cursor: pointer; }
 <?php if (GETPOST("optioncss") == 'print') { ?>
@@ -1010,6 +1010,9 @@ table.noborder tr.liste_titre td {
 	margin-<?php echo $right; ?>: 8px;
 	margin-bottom: 4px;
 }
+.pictoobjectwidth {
+	width: 14px;
+}
 .pictosubstatus {
     padding-left: 2px;
     padding-right: 2px;
@@ -2854,16 +2857,16 @@ div .tdtop {
     text-align: center;
     border-radius: 2px;
     min-height: 38px;
-    
+
 	white-space: nowrap;
 	overflow: hidden;
     text-overflow: ellipsis;
-    width: 115px;    
+    width: 115px;
 }
 @media only screen and (max-width: 767px)
 {
     .boxstats {
-        width: 100px;    
+        width: 100px;
     }
 }
 .boxstats:hover {
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index 082d6286b8a..694ed013318 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -333,7 +333,7 @@ if ($result)
         	{
         		// On affiche ligne pour modifier droits
         		print '<tr '. $bc[$var].'>';
-        		print '<td class="maxwidthonsmartphone tdoverflowonsmartphone">'.img_object('',$picto).' '.$objMod->getName();
+        		print '<td class="maxwidthonsmartphone tdoverflowonsmartphone">'.img_object('',$picto,'class="pictoobjectwidth"').' '.$objMod->getName();
         		print '<a name="'.$objMod->getName().'"></a></td>';
         		print '<td align="center" class="nowrap">';
         		print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="perms.php?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module='.$obj->module.'">'.$langs->trans("All")."</a>";
@@ -348,7 +348,7 @@ if ($result)
 		print '<tr '. $bc[$var].'>';
 
 		// Picto and label of permission
-		print '<td class="maxwidthonsmartphone tdoverflowonsmartphone">'.img_object('',$picto).' '.$objMod->getName().'</td>';
+		print '<td class="maxwidthonsmartphone tdoverflowonsmartphone">'.img_object('',$picto,'class="pictoobjectwidth"').' '.$objMod->getName().'</td>';
 
         // Permission and tick
         if (! empty($object->admin) && ! empty($objMod->rights_admin_allowed))    // Permission own because admin

From 1935de03c719a4128a748cde234730192b2ffc57 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Jun 2017 12:01:55 +0200
Subject: [PATCH 121/438] Fix bad consistency of labels

---
 htdocs/product/list.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 043327920db..40dcd116ab4 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -158,7 +158,7 @@ $arrayfields=array(
 	'p.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
     'p.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
     'p.tosell'=>array('label'=>$langs->trans("Status").' ('.$langs->trans("Sell").')', 'checked'=>1, 'position'=>1000),
-    'p.tobuy'=>array('label'=>$langs->trans("Status").' ('.$langs->trans("Purchases").')', 'checked'=>1, 'position'=>1000)
+    'p.tobuy'=>array('label'=>$langs->trans("Status").' ('.$langs->trans("Buy").')', 'checked'=>1, 'position'=>1000)
 );
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
@@ -473,8 +473,8 @@ else
 		    print $hookmanager->resPrint;
 			if (! empty($arrayfields['p.datec']['checked']))  print_liste_field_titre($arrayfields['p.datec']['label'],$_SERVER["PHP_SELF"],"p.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
 			if (! empty($arrayfields['p.tms']['checked']))    print_liste_field_titre($arrayfields['p.tms']['label'],$_SERVER["PHP_SELF"],"p.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-			if (! empty($arrayfields['p.tosell']['checked'])) print_liste_field_titre($langs->trans("Status").' ('.$langs->trans("Sell").')',$_SERVER["PHP_SELF"],"p.tosell","",$param,'align="right"',$sortfield,$sortorder);
-			if (! empty($arrayfields['p.tobuy']['checked']))  print_liste_field_titre($langs->trans("Status").' ('.$langs->trans("Buy").')',$_SERVER["PHP_SELF"],"p.tobuy","",$param,'align="right"',$sortfield,$sortorder);
+			if (! empty($arrayfields['p.tosell']['checked'])) print_liste_field_titre($arrayfields['p.tosell']['label'],$_SERVER["PHP_SELF"],"p.tosell","",$param,'align="right"',$sortfield,$sortorder);
+			if (! empty($arrayfields['p.tobuy']['checked']))  print_liste_field_titre($arrayfields['p.tobuy']['label'],$_SERVER["PHP_SELF"],"p.tobuy","",$param,'align="right"',$sortfield,$sortorder);
 			print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
 			print "</tr>\n";
 

From 985a9ed8d32f56c17c6611c2918c8e6d4ba73b14 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Jun 2017 12:12:12 +0200
Subject: [PATCH 122/438] FIX Redirect to payment page from member subscription
 page failed if a unique security key was defined.

---
 htdocs/public/members/new.php | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index b101e656f67..03f24c3ec80 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -300,20 +300,27 @@ if ($action == 'add')
             {
                 if ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paybox')
                 {
-                    $urlback=DOL_MAIN_URL_ROOT.'/public/paybox/newpayment.php?from=membernewform&source=membersubscription&ref='.$adh->ref;
+                    $urlback=DOL_MAIN_URL_ROOT.'/public/paybox/newpayment.php?from=membernewform&source=membersubscription&ref='.urlencode($adh->ref);
                     if (price2num(GETPOST('amount'))) $urlback.='&amount='.price2num(GETPOST('amount'));
                     if (GETPOST('email')) $urlback.='&email='.urlencode(GETPOST('email'));
                 }
                 else if ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paypal')
                 {
-                    $urlback=DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?from=membernewform&source=membersubscription&ref='.$adh->ref;
+                    $urlback=DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?from=membernewform&source=membersubscription&ref='.urlencode($adh->ref);
                     if (price2num(GETPOST('amount'))) $urlback.='&amount='.price2num(GETPOST('amount'));
                     if (GETPOST('email')) $urlback.='&email='.urlencode(GETPOST('email'));
-                    if (! empty($conf->global->PAYPAL_SECURITY_TOKEN) && ! empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE))
+                    if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
                     {
-                    	$urlback.='&securekey='.dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'membersubscription' . $adh->ref, 2);
+                        if (! empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE))
+                        {
+                    	   $urlback.='&securekey='.urlencode(dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'membersubscription' . $adh->ref, 2));
+                        }
+                        else
+                        {
+                            $urlback.='&securekey='.urlencode($conf->global->PAYPAL_SECURITY_TOKEN);
+                        }
                     }
-                    
+
                 }
                 else
                 {

From cc37a7d84823b6db24ae6a09d53451ec0c841a35 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Jun 2017 13:11:34 +0200
Subject: [PATCH 123/438] Fix parenthesis

---
 .../prelevement/class/bonprelevement.class.php   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 9b86bd66897..0785efe6b1a 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -252,7 +252,7 @@ class BonPrelevement extends CommonObject
     function getErrorString($error)
     {
         global $langs;
-        
+
         $errors = array();
 
         $errors[1027] = $langs->trans("DateInvalid");
@@ -920,7 +920,7 @@ class BonPrelevement extends CommonObject
 
 					$dir=$conf->prelevement->dir_output.'/receipts';
 					if (! is_dir($dir)) dol_mkdir($dir);
-					
+
 					$this->filename = $dir.'/'.$ref.'.xml';
 
 	                // Create withdraw receipt in database
@@ -1028,7 +1028,7 @@ class BonPrelevement extends CommonObject
                         $this->emetteur_bic                = $account->bic;
 
                         $this->emetteur_ics                = $conf->global->PRELEVEMENT_ICS;		// Ex: PRELEVEMENT_ICS = "FR78ZZZ123456";
-    
+
                         $this->raison_sociale              = $account->proprio;
                     }
 
@@ -1572,7 +1572,7 @@ class BonPrelevement extends CommonObject
 		$XML_DEBITOR .='					<Nm>'.strtoupper(dolEscapeXML(dol_string_unaccent($row_nom))).'</Nm>'.$CrLf;
 		$XML_DEBITOR .='					<PstlAdr>'.$CrLf;
 		$XML_DEBITOR .='						<Ctry>'.$row_country_code.'</Ctry>'.$CrLf;
-		$XML_DEBITOR .='						<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_unaccent(strtr($row_address, array(CHR(13) => ", ", CHR(10) => "")))),70,'right','UTF-8',true).'</AdrLine>'.$CrLf;
+		$XML_DEBITOR .='						<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_unaccent(strtr($row_address, array(CHR(13) => ", ", CHR(10) => ""))),70,'right','UTF-8',true)).'</AdrLine>'.$CrLf;
 		$XML_DEBITOR .='						<AdrLine>'.dolEscapeXML(dol_string_unaccent($row_zip.' '.$row_town)).'</AdrLine>'.$CrLf;
 		$XML_DEBITOR .='					</PstlAdr>'.$CrLf;
 		$XML_DEBITOR .='				</Dbtr>'.$CrLf;
@@ -1668,7 +1668,7 @@ class BonPrelevement extends CommonObject
      *	@return	string					String with SEPA Sender
      */
     function EnregEmetteurSEPA($configuration, $ladate, $nombre, $total, $CrLf='\n')
-    {	
+    {
         // SEPA INITIALISATION
 		global $conf;
 
@@ -1687,12 +1687,12 @@ class BonPrelevement extends CommonObject
 		    $this->emetteur_number_key		   = $account->cle_rib;
 		    $this->emetteur_iban               = $account->iban;
 		    $this->emetteur_bic                = $account->bic;
-		
+
 		    $this->emetteur_ics                = $conf->global->PRELEVEMENT_ICS;		// Ex: PRELEVEMENT_ICS = "FR78ZZZ123456";
-		
+
 		    $this->raison_sociale              = $account->proprio;
 		}
-		
+
 		// Récupération info demandeur
 		$sql = "SELECT rowid, ref";
 		$sql.= " FROM";

From 9341d5f448476a9a52d3b4cdf914706c882c8fcc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Jun 2017 15:35:27 +0200
Subject: [PATCH 124/438] FIX Line of invoices not inserted when using POS
 module and VAT NPR.

---
 htdocs/cashdesk/affContenu.php                |   6 +-
 htdocs/cashdesk/class/Facturation.class.php   |  26 ++--
 htdocs/cashdesk/facturation.php               |  45 ++-----
 htdocs/cashdesk/facturation_verif.php         | 115 +++++++++++-------
 htdocs/cashdesk/tpl/facturation1.tpl.php      |   8 +-
 htdocs/cashdesk/validation_verif.php          |  11 +-
 htdocs/compta/facture/class/facture.class.php |  11 +-
 htdocs/main.inc.php                           |  14 +--
 8 files changed, 125 insertions(+), 111 deletions(-)

diff --git a/htdocs/cashdesk/affContenu.php b/htdocs/cashdesk/affContenu.php
index 280f2b81908..bd778f3422e 100644
--- a/htdocs/cashdesk/affContenu.php
+++ b/htdocs/cashdesk/affContenu.php
@@ -34,8 +34,8 @@ if ( $_GET['id'] == 'NOUV' )
 // Recuperation, s'il existe, de l'objet contenant les infos de la vente en cours ...
 if (isset($_SESSION['serObjFacturation']))
 {
-	$obj_facturation = unserialize($_SESSION['serObjFacturation']);
-	unset($_SESSION['serObjFacturation']);
+    $obj_facturation = unserialize($_SESSION['serObjFacturation']);
+    unset($_SESSION['serObjFacturation']);
 }
 else
 {
@@ -43,7 +43,7 @@ else
 	$obj_facturation = new Facturation();
 }
 
-
+// $obj_facturation contains data for all invoice total + selection of current product
 
 $obj_facturation->calculTotaux();	// Redefine prix_total_ttc, prix_total_ht et montant_tva from $_SESSION['poscart']
 
diff --git a/htdocs/cashdesk/class/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php
index 240b32e34db..4b0ad0bf101 100644
--- a/htdocs/cashdesk/class/Facturation.class.php
+++ b/htdocs/cashdesk/class/Facturation.class.php
@@ -99,17 +99,25 @@ class Facturation
         $product = new Product($db);
         $product->fetch($this->id);
 
-        
+
         $vatrowid = $this->tva();
-        
+
         $tmp = getTaxesFromId($vatrowid);
-        $vat_rate = $tmp['rate'];
+        $txtva = $tmp['rate'].(empty($tmp['code'])?'':' ('.$tmp['code'].')');
         $vat_npr = $tmp['npr'];
-        
+
         $localtaxarray = getLocalTaxesFromRate($vatrowid, 0, $societe, $mysoc, 1);
-        
+
+        // Clean vat code
+        $vat_src_code='';
+        if (preg_match('/\((.*)\)/', $txtva, $reg))
+        {
+            $vat_src_code = $reg[1];
+            $txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
+        }
+
         // Define part of HT, VAT, TTC
-        $resultarray=calcul_price_total($this->qte, $this->prix(), $this->remisePercent(), $vat_rate, -1, -1, 0, 'HT', $use_npr, $product->type, $mysoc, $localtaxarray);
+        $resultarray=calcul_price_total($this->qte, $this->prix(), $this->remisePercent(), $txtva, -1, -1, 0, 'HT', $use_npr, $product->type, $mysoc, $localtaxarray);
 
         // Calcul du total ht sans remise
         $total_ht = $resultarray[0];
@@ -136,7 +144,7 @@ class Facturation
         $newcartarray[$i]['label']=$product->label;
         $newcartarray[$i]['price']=$product->price;
         $newcartarray[$i]['price_ttc']=$product->price_ttc;
-        
+
         if (! empty($conf->global->PRODUIT_MULTIPRICES))
         {
             if (isset($product->multiprices[$societe->price_level]))
@@ -148,7 +156,7 @@ class Facturation
 
         $newcartarray[$i]['fk_article']=$this->id;
         $newcartarray[$i]['qte']=$this->qte();
-        $newcartarray[$i]['fk_tva']=$this->tva();
+        $newcartarray[$i]['fk_tva']=$this->tva();   // Vat rowid
         $newcartarray[$i]['remise_percent']=$remise_percent;
         $newcartarray[$i]['remise']=price2num($montant_remise_ht);
         $newcartarray[$i]['total_ht']=price2num($total_ht,'MT');
@@ -220,7 +228,7 @@ class Facturation
         $this->prix_total_vat = $total_vat;
         $this->prix_total_localtax1 = $total_localtax1;
         $this->prix_total_localtax2 = $total_localtax2;
-        
+
         $this->montant_tva = $total_ttc - $total_ht;
         //print $this->prix_total_ttc.'eeee'; exit;
     }
diff --git a/htdocs/cashdesk/facturation.php b/htdocs/cashdesk/facturation.php
index dd722805eb6..f4542ec91f8 100644
--- a/htdocs/cashdesk/facturation.php
+++ b/htdocs/cashdesk/facturation.php
@@ -35,7 +35,7 @@
 $form=new Form($db);
 
 // Get list of articles (in warehouse '$conf_fkentrepot' if defined and stock module enabled)
-if ( GETPOST('filtre') ) {
+if ( GETPOST('filtre','alpha') ) {
 
 	// Avec filtre
 	$ret=array(); $i=0;
@@ -47,22 +47,23 @@ if ( GETPOST('filtre') ) {
 	$sql.= " WHERE p.entity IN (".getEntity('product', 1).")";
 	$sql.= " AND p.tosell = 1";
 	if(!$conf->global->CASHDESK_SERVICES) $sql.= " AND p.fk_product_type = 0";
-	$sql.= " AND (p.ref LIKE '%".$db->escape(GETPOST('filtre'))."%' OR p.label LIKE '%".$db->escape(GETPOST('filtre'))."%'";
-	if (! empty($conf->barcode->enabled)) {
-
-		$filtre = GETPOST('filtre');
+	$sql.= " AND (";
+	$sql.= "p.ref LIKE '%".$db->escape(GETPOST('filtre'))."%' OR p.label LIKE '%".$db->escape(GETPOST('filtre'))."%'";
+	if (! empty($conf->barcode->enabled))
+	{
+		$filtre = GETPOST('filtre','alpha');
 
 		//If the barcode looks like an EAN13 format and the last digit is included in it,
 		//then whe look for the 12-digit too
 		//As the twelve-digit string will also hit the 13-digit code, we only look for this one
 		if (strlen($filtre) == 13) {
 			$crit_12digit = substr($filtre, 0, 12);
-			$sql .= " OR p.barcode LIKE '%".$db->escape($crit_12digit)."%')";
+			$sql .= " OR p.barcode LIKE '%".$db->escape($crit_12digit)."%'";
 		} else {
-			$sql.= " OR p.barcode LIKE '%".$db->escape($filtre)."%')";
+			$sql.= " OR p.barcode LIKE '%".$db->escape($filtre)."%'";
 		}
 	}
-	else $sql.= ")";
+	$sql.= ")";
 	$sql.= " ORDER BY label";
 
 	dol_syslog("facturation.php", LOG_DEBUG);
@@ -154,34 +155,6 @@ global $mysoc;
 $ret=array();
 $i=0;
 
-$sql = "SELECT t.rowid, t.taux";
-$sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t";
-$sql.= ", ".MAIN_DB_PREFIX."c_country as c";
-$sql.= " WHERE t.fk_pays = c.rowid";
-$sql.= " AND t.active = 1";
-$sql.= " AND c.code = '".$mysoc->country_code."'";
-//print $sql;
-
-$resql = $db->query($sql);
-if ($resql)
-{
-	while ( $tab = $db->fetch_array($resql) )
-	{
-		foreach ( $tab as $cle => $valeur )
-		{
-			$ret[$i][$cle] = $valeur;
-		}
-		$i++;
-	}
-	$db->free($resql);
-}
-else
-{
-	dol_print_error($db);
-}
-$tab_tva = $ret;
-
-
 // Reinitialisation du mode de paiement, en cas de retour aux achats apres validation
 $obj_facturation->getSetPaymentMode('RESET');
 $obj_facturation->montantEncaisse('RESET');
diff --git a/htdocs/cashdesk/facturation_verif.php b/htdocs/cashdesk/facturation_verif.php
index 95a129e88a5..ec21de2225d 100644
--- a/htdocs/cashdesk/facturation_verif.php
+++ b/htdocs/cashdesk/facturation_verif.php
@@ -32,12 +32,12 @@ $obj_facturation = unserialize($_SESSION['serObjFacturation']);
 unset ($_SESSION['serObjFacturation']);
 
 
-switch ( $_GET['action'] )
+switch (GETPOST('action','alpha'))
 {
 	default:
 		if ( $_POST['hdnSource'] != 'NULL' )
 		{
-			$sql = "SELECT p.rowid, p.ref, p.price, p.tva_tx, p.recuperableonly";
+			$sql = "SELECT p.rowid, p.ref, p.price, p.tva_tx, p.default_vat_code, p.recuperableonly";
 			if (! empty($conf->stock->enabled) && !empty($conf_fkentrepot)) $sql.= ", ps.reel";
 			$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
 			if (! empty($conf->stock->enabled) && !empty($conf_fkentrepot)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON p.rowid = ps.fk_product AND ps.fk_entrepot = ".$conf_fkentrepot;
@@ -54,7 +54,6 @@ switch ( $_GET['action'] )
 			}
 
 			$result = $db->query($sql);
-
 			if ($result)
 			{
 				// ... et enregistrement dans l'objet
@@ -67,62 +66,90 @@ switch ( $_GET['action'] )
 						$ret[$key] = $value;
 					}
                     // Here $ret['tva_tx'] is vat rate of product but we want to not use the one into table but found by function
-                    
+
 					$productid = $ret['rowid'];
 					$product = new Product($db);
                     $product->fetch($productid);
+                    $prod = $product;
 
 					$thirdpartyid = $_SESSION['CASHDESK_ID_THIRDPARTY'];
                     $societe = new Societe($db);
 					$societe->fetch($thirdpartyid);
 
-					$tva_tx = get_default_tva($mysoc,$societe,$productid);
-					$tva_npr = get_default_npr($mysoc,$societe,$productid);
+					// Update if prices fields are defined
+					$tva_tx = get_default_tva($mysoc, $societe, $product->id);
+					$tva_npr = get_default_npr($mysoc, $societe, $product->id);
 					if (empty($tva_tx)) $tva_npr=0;
-					dol_syslog('tva_tx='.$tva_tx.'-tva_npr='.$tva_npr);
-					
+
+					$pu_ht = $prod->price;
+					$pu_ttc = $prod->price_ttc;
+					$price_min = $prod->price_min;
+					$price_base_type = $prod->price_base_type;
+
+					// multiprix
 					if (! empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($societe->price_level))
 					{
-						if(isset($product->multiprices[$societe->price_level]))
-						{
-							$ret['price'] = $product->multiprices[$societe->price_level];
-							$ret['price_ttc'] = $product->multiprices_ttc[$societe->price_level];
-							// $product->multiprices_min[$societe->price_level];
-							// $product->multiprices_min_ttc[$societe->price_level];
-							// $product->multiprices_base_type[$societe->price_level];
-							if (! empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL))  // using this option is a bug. kept for backward compatibility
-							{
-							    if (isset($prod->multiprices_tva_tx[$societe->price_level])) $tva_tx=$prod->multiprices_tva_tx[$societe->price_level];
-							    if (isset($prod->multiprices_recuperableonly[$societe->price_level])) $tva_npr=$prod->multiprices_recuperableonly[$societe->price_level];
-							    if (empty($tva_tx)) $tva_npr=0;
-							}
-						}
+					    $pu_ht = $prod->multiprices[$societe->price_level];
+					    $pu_ttc = $prod->multiprices_ttc[$societe->price_level];
+					    $price_min = $prod->multiprices_min[$societe->price_level];
+					    $price_base_type = $prod->multiprices_base_type[$societe->price_level];
+					    if (! empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL))  // using this option is a bug. kept for backward compatibility
+					    {
+					        if (isset($prod->multiprices_tva_tx[$societe->price_level])) $tva_tx=$prod->multiprices_tva_tx[$societe->price_level];
+					        if (isset($prod->multiprices_recuperableonly[$societe->price_level])) $tva_npr=$prod->multiprices_recuperableonly[$societe->price_level];
+					    }
+					}
+					elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
+					{
+					    require_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
+
+					    $prodcustprice = new Productcustomerprice($db);
+
+					    $filter = array('t.fk_product' => $prod->id,'t.fk_soc' => $societe->id);
+
+					    $result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
+					    if ($result >= 0)
+					    {
+					        if (count($prodcustprice->lines) > 0)
+					        {
+					            $pu_ht = price($prodcustprice->lines [0]->price);
+					            $pu_ttc = price($prodcustprice->lines [0]->price_ttc);
+					            $price_base_type = $prodcustprice->lines [0]->price_base_type;
+					            $tva_tx = $prodcustprice->lines [0]->tva_tx;
+					        }
+					    }
+					    else
+					    {
+					        setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
+					    }
+					}
+
+					$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $tva_tx));
+					$tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx));
+
+					// if price ht is forced (ie: calculated by margin rate and cost price). TODO Why this ?
+					if (! empty($price_ht)) {
+					    $pu_ht = price2num($price_ht, 'MU');
+					    $pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
+					}
+					// On reevalue prix selon taux tva car taux tva transaction peut etre different
+					// de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
+					elseif ($tmpvat != $tmpprodvat) {
+					    if ($price_base_type != 'HT') {
+					        $pu_ht = price2num($pu_ttc / (1 + ($tmpvat / 100)), 'MU');
+					    } else {
+					        $pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
+					    }
 					}
 
-					$ret['tva_tx'] = $tva_tx;
-					$ret['tva_npr'] = $tva_npr;
-                    //var_dump('tva_tx='.$ret['tva_tx'].'-tva_npr='.$ret['tva_npr'].'-'.$conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL);exit;
-                    
 					$obj_facturation->id($ret['rowid']);
 					$obj_facturation->ref($ret['ref']);
 					$obj_facturation->stock($ret['reel']);
 					$obj_facturation->prix($ret['price']);
-					
-					// Use $ret['tva_tx'] / ret['tva_npr'] to find vat id
-					$vatrowid = null;
-					$sqlfindvatid = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'c_tva';
-					$sqlfindvatid.= ' WHERE taux = '.$ret['tva_tx'].' AND recuperableonly = '.(int) $ret['tva_npr'];
-					$sqlfindvatid.= ' AND fk_pays = '.$mysoc->country_id;
-					$resqlfindvatid=$db->query($sqlfindvatid);
-					if ($resqlfindvatid)
-					{
-					    $obj = $db->fetch_object($resqlfindvatid);
-					    if ($obj) $vatrowid = $obj->rowid;
-					}
-					else dol_print_error($db);
-					
-					dol_syslog("save vatrowid=".$vatrowid);
-					$obj_facturation->tva($vatrowid);     // Save vat it for next use
+
+
+					$vatrate = $tva_tx;
+					$obj_facturation->vatrate = $vatrate;       // Save vat rate (full text vat with code)
 
 					// Definition du filtre pour n'afficher que le produit concerne
 					if ( $_POST['hdnSource'] == 'LISTE' )
@@ -168,11 +195,11 @@ switch ( $_GET['action'] )
 		{
 		    dol_syslog("facturation_verif save vat ".$_POST['selTva']);
 			$obj_facturation->qte($_POST['txtQte']);
-			$obj_facturation->tva($_POST['selTva']);                 // Save VAT selected so we can use it for next product
+			$obj_facturation->tva($_POST['selTva']);     // id of vat. Saved so we can use it for next product
 			$obj_facturation->remisePercent($_POST['txtRemise']);
 			$obj_facturation->ajoutArticle();	// This add an entry into $_SESSION['poscart']
 			// We update prixTotalTtc
-			 
+
 		}
 
 		$redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=facturation';
diff --git a/htdocs/cashdesk/tpl/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php
index 8f74cf98626..fce4df22c7a 100644
--- a/htdocs/cashdesk/tpl/facturation1.tpl.php
+++ b/htdocs/cashdesk/tpl/facturation1.tpl.php
@@ -125,12 +125,12 @@ $langs->load("cashdesk");
     			<td><input class="texte1_off maxwidth50onsmartphone" type="text" name="txtTotal" value="" disabled /></td><td></td>
                 <!-- Choix du taux de TVA -->
                 <td class="select_tva">
-                <?php //var_dump($tab_tva); 
-					$tva_tx = $obj_facturation->tva();  // Try to get a previously entered VAT rowid. First time, this will return empty.
+                <?php
+					$vatrate = $obj_facturation->vatrate;      // To get vat rate we just have selected
+
 					$buyer = new Societe($db);
 					if ($_SESSION["CASHDESK_ID_THIRDPARTY"] > 0) $buyer->fetch($_SESSION["CASHDESK_ID_THIRDPARTY"]);
-					
-					echo $form->load_tva('selTva', (isset($_POST["selTva"])?GETPOST("selTva",'alpha',2):-1), $mysoc, $buyer, 0, 0, '', false, -1);
+					echo $form->load_tva('selTva', (isset($_POST["selTva"])?GETPOST("selTva",'alpha',2):$vatrate), $mysoc, $buyer, 0, 0, '', false, -1);
 			    ?>
                 </td>
 			</tr>
diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php
index afe73820568..48d2d9bd0c7 100644
--- a/htdocs/cashdesk/validation_verif.php
+++ b/htdocs/cashdesk/validation_verif.php
@@ -165,6 +165,7 @@ switch ($action)
 			$tmp = getTaxesFromId($tab_liste[$i]['fk_tva']);
 			$vat_rate = $tmp['rate'];
 			$vat_npr = $tmp['npr'];
+			$vat_src_code = $tmp['code'];
 
 			$invoiceline=new FactureLigne($db);
 			$invoiceline->fk_product=$tab_liste[$i]['fk_article'];
@@ -173,15 +174,17 @@ switch ($action)
 			$invoiceline->remise_percent=$tab_liste[$i]['remise_percent'];
 			$invoiceline->price=$tab_liste[$i]['price'];
 			$invoiceline->subprice=$tab_liste[$i]['price'];
-			
+
 			$invoiceline->tva_tx=empty($vat_rate)?0:$vat_rate;	// works even if vat_rate is ''
 			$invoiceline->info_bits=empty($vat_npr)?0:$vat_npr;
-				
+			$invoiceline->vat_src_code=$vat_src_code;
+
 			$invoiceline->total_ht=$tab_liste[$i]['total_ht'];
 			$invoiceline->total_ttc=$tab_liste[$i]['total_ttc'];
 			$invoiceline->total_tva=$tab_liste[$i]['total_vat'];
 			$invoiceline->total_localtax1=$tab_liste[$i]['total_localtax1'];
 			$invoiceline->total_localtax2=$tab_liste[$i]['total_localtax2'];
+
 			$invoice->lines[]=$invoiceline;
 		}
 
@@ -205,7 +208,7 @@ switch ($action)
 			{
 				$warehouseidtodecrease=(isset($_SESSION["CASHDESK_ID_WAREHOUSE"])?$_SESSION["CASHDESK_ID_WAREHOUSE"]:0);
 				if (! empty($conf->global->CASHDESK_NO_DECREASE_STOCK)) $warehouseidtodecrease=0;	// If a particular stock is defined, we disable choice
-				
+
 				$resultvalid=$invoice->validate($user, $obj_facturation->numInvoice(), 0);
 
 				if ($warehouseidtodecrease > 0)
@@ -245,7 +248,7 @@ switch ($action)
 			{
 				$warehouseidtodecrease=(isset($_SESSION["CASHDESK_ID_WAREHOUSE"])?$_SESSION["CASHDESK_ID_WAREHOUSE"]:0);
 				if (! empty($conf->global->CASHDESK_NO_DECREASE_STOCK)) $warehouseidtodecrease=0;	// If a particular stock is defined, we disable choice
-				
+
 				$resultvalid=$invoice->validate($user, $obj_facturation->numInvoice(), 0);
 
 				if ($warehouseidtodecrease > 0)
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 5eeaa4a725e..6c73746d9af 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -519,9 +519,12 @@ class Facture extends CommonInvoice
 				{
 					$newinvoiceline=$this->lines[$i];
 					$newinvoiceline->fk_facture=$this->id;
-                    $newinvoiceline->origin = $this->element;           // TODO This seems not used. Here we but origin 'facture' but after
-                    $newinvoiceline->origin_id = $this->lines[$i]->id;  // we put an id of object !
-					if ($result >= 0 && ($newinvoiceline->info_bits & 0x01) == 0)	// We keep only lines with first bit = 0
+
+					// TODO This seems not used. Here we put origin 'facture' but after,  we put an id of object !
+					$newinvoiceline->origin = $this->element;
+                    $newinvoiceline->origin_id = $this->lines[$i]->id;
+
+					if ($result >= 0)
 					{
 						// Reset fk_parent_line for no child products and special product
 						if (($newinvoiceline->product_type != 9 && empty($newinvoiceline->fk_parent_line)) || $newinvoiceline->product_type == 9) {
@@ -558,7 +561,7 @@ class Facture extends CommonInvoice
 				    //if (! is_object($line)) $line=json_decode(json_encode($line), FALSE);  // convert recursively array into object.
                 	if (! is_object($line)) $line = (object) $line;
 
-				    if (($line->info_bits & 0x01) == 0)	// We keep only lines with first bit = 0
+				    if ($result >= 0)
 					{
 						// Reset fk_parent_line for no child products and special product
 						if (($line->product_type != 9 && empty($line->fk_parent_line)) || $line->product_type == 9) {
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 9d97770e48a..82f008c2378 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -300,7 +300,7 @@ if (! defined('NOTOKENRENEWAL'))
 {
     // roulement des jetons car cree a chaque appel
     if (isset($_SESSION['newtoken'])) $_SESSION['token'] = $_SESSION['newtoken'];
-    
+
     // Save in $_SESSION['newtoken'] what will be next token. Into forms, we will add param token = $_SESSION['newtoken']
     $token = dol_hash(uniqid(mt_rand(),TRUE)); // Generates a hash of a random number
     $_SESSION['newtoken'] = $token;
@@ -586,7 +586,7 @@ if (! defined('NOLOGIN'))
         // We are already into an authenticated session
         $login=$_SESSION["dol_login"];
         $entity=$_SESSION["dol_entity"];
-        dol_syslog("This is an already logged session. _SESSION['dol_login']=".$login." _SESSION['dol_entity']=".$entity, LOG_DEBUG);
+        dol_syslog("- This is an already logged session. _SESSION['dol_login']=".$login." _SESSION['dol_entity']=".$entity, LOG_DEBUG);
 
         $resultFetchUser=$user->fetch('',$login,'',1,($entity > 0 ? $entity : -1));
         if ($resultFetchUser <= 0)
@@ -1051,7 +1051,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
         $ext='version='.urlencode(DOL_VERSION);
         if (GETPOST('version')) $ext='version='.GETPOST('version','int');	// usefull to force no cache on css/js
         if (GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) $ext='testmenuhider='.GETPOST('testmenuhider','int');
-        
+
         $themeparam='?lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss')?'&amp;optioncss='.GETPOST('optioncss','alpha',1):'').'&amp;userid='.$user->id.'&amp;entity='.$conf->entity;
         $themeparam.=($ext?'&amp;'.$ext:'');
         if (! empty($_SESSION['dol_resetcache'])) $themeparam.='&amp;dol_resetcache='.$_SESSION['dol_resetcache'];
@@ -1060,7 +1060,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
         if (GETPOST('dol_optimize_smallscreen'))   { $themeparam.='&amp;dol_optimize_smallscreen='.GETPOST('dol_optimize_smallscreen','int'); }
         if (GETPOST('dol_no_mouse_hover'))         { $themeparam.='&amp;dol_no_mouse_hover='.GETPOST('dol_no_mouse_hover','int'); }
         if (GETPOST('dol_use_jmobile'))            { $themeparam.='&amp;dol_use_jmobile='.GETPOST('dol_use_jmobile','int'); $conf->dol_use_jmobile=GETPOST('dol_use_jmobile','int'); }
-        
+
         if (! defined('DISABLE_JQUERY') && ! $disablejs && $conf->use_javascript_ajax)
         {
             print '<!-- Includes CSS for JQuery (Ajax library) -->'."\n";
@@ -1929,7 +1929,7 @@ if (! function_exists("llxFooter"))
             	});
             </script>' . "\n";
         }
-        
+
         // Wrapper to manage dropdown
         if ($conf->use_javascript_ajax)
         {
@@ -1960,7 +1960,7 @@ if (! function_exists("llxFooter"))
                      console.log("Link has class dropdowncloseonclick, so we close/hide the popup ul");
                      $(this).parent().parent().hide();
                   });
-            
+
                   $(document).bind(\'click\', function (e) {
                       var $clicked = $(e.target);
                       if (!$clicked.parents().hasClass("dropdown")) $(".dropdown dd ul").hide();
@@ -1968,7 +1968,7 @@ if (! function_exists("llxFooter"))
                 });
                 </script>';
         }
-                
+
 		// A div for the address popup
 		print "\n<!-- A div to allow dialog popup -->\n";
 		print '<div id="dialogforpopup" style="display: none;"></div>'."\n";

From 0f80ee757f6c6dfec4de05febc7d23809801376c Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Fri, 9 Jun 2017 16:37:05 +0200
Subject: [PATCH 125/438] Fix can not update extrafields values

---
 htdocs/comm/card.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index f9d9309a755..61fcc4dc502 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -175,6 +175,21 @@ if (empty($reshook))
 		$result=$object->update($object->id, $user);
 		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 	}
+	
+	if ($action == 'update_extras') {
+        $object->fetch($id);
+
+        // Fill array 'array_options' with data from update form
+        $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
+        $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
+        if ($ret < 0) $error++;
+        if (! $error)
+        {
+            $result = $object->insertExtraFields();
+            if ($result < 0) $error++;
+        }
+        if ($error) $action = 'edit_extras';
+    }
 }
 
 

From c1f3a168cd62d7e9b3bbb5f8a1f37343e3e5ecd0 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Fri, 9 Jun 2017 16:57:20 +0200
Subject: [PATCH 126/438] Fix wrong attribute name for loop

---
 htdocs/core/lib/admin.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 6a0336aab38..ba5f099365c 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -825,7 +825,7 @@ function activateModule($value,$withdeps=1)
             {
                 // Activation of modules this module depends on
                 // this->depends may be array('modModule1', 'mmodModule2') or array('always'=>"modModule1", 'FR'=>'modModule2')
-                foreach ($objMod->depend as $key => $modulestring)
+                foreach ($objMod->depends as $key => $modulestring)
                 {
                     if ((! is_numeric($key)) && $key != 'always' && $key != $mysoc->country_code)
                     {

From 3347316d3c00a6bb89f124711ab20ba91b3ceb71 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Jun 2017 17:02:05 +0200
Subject: [PATCH 127/438] Fix delete of member

---
 .../actions_adherentcard_common.class.php     |   4 +-
 htdocs/adherents/card.php                     |   2 +-
 htdocs/adherents/class/adherent.class.php     |  40 ++--
 htdocs/adherents/class/api_members.class.php  |   6 +-
 htdocs/adherents/list.php                     | 119 ++++++------
 htdocs/commande/list.php                      | 180 +++++++++---------
 htdocs/core/actions_massactions.inc.php       |   2 +-
 7 files changed, 177 insertions(+), 176 deletions(-)

diff --git a/htdocs/adherents/canvas/actions_adherentcard_common.class.php b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
index a749ff269e5..c768b019d69 100644
--- a/htdocs/adherents/canvas/actions_adherentcard_common.class.php
+++ b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
@@ -182,7 +182,7 @@ abstract class ActionsAdherentCardCommon
             $this->object->old_name = $_POST["old_name"];
             $this->object->old_firstname = $_POST["old_firstname"];
 
-            $result = $this->object->delete();
+            $result = $this->object->delete(0, $user, 0);
             if ($result > 0)
             {
                 header("Location: list.php");
@@ -424,7 +424,7 @@ abstract class ActionsAdherentCardCommon
             if ($resql)
             {
                 $obj = $this->db->fetch_object($resql);
-            
+
                 $this->object->country_code	=	$obj->code;
                 $this->object->country		=	$langs->trans("Country".$obj->code)?$langs->trans("Country".$obj->code):$obj->libelle;
             }
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 81aa2c7c6ad..fe3bd4f4cfd 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -585,7 +585,7 @@ if (empty($reshook))
 
 	if ($user->rights->adherent->supprimer && $action == 'confirm_delete' && $confirm == 'yes')
 	{
-		$result=$object->delete($id);
+		$result=$object->delete($id, $user);
 		if ($result > 0)
 		{
 			if (! empty($backtopage))
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 20f5fa671c9..18e144c363c 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -705,11 +705,13 @@ class Adherent extends CommonObject
      *  Fonction qui supprime l'adherent et les donnees associees
      *
      *  @param	int		$rowid		Id of member to delete
+     *	@param	User	$user		User object
+     *	@param	int		$notrigger	1=Does not execute triggers, 0= execute triggers
      *  @return	int					<0 if KO, 0=nothing to do, >0 if OK
      */
-    function delete($rowid)
+    function delete($rowid, $user, $notrigger=0)
     {
-        global $conf, $langs, $user;
+        global $conf, $langs;
 
         $result = 0;
 		$error=0;
@@ -720,6 +722,14 @@ class Adherent extends CommonObject
 
         $this->db->begin();
 
+        if (! $error && ! $notrigger)
+        {
+            // Call trigger
+            $result=$this->call_trigger('MEMBER_DELETE',$user);
+            if ($result < 0) $error++;
+            // End call triggers
+        }
+
         // Remove category
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_member WHERE fk_member = ".$rowid;
         dol_syslog(get_class($this)."::delete", LOG_DEBUG);
@@ -787,16 +797,6 @@ class Adherent extends CommonObject
         	}
         }
 
-        if (! $error)
-        {
-            // Call trigger
-            $result=$this->call_trigger('MEMBER_DELETE',$user);
-            if ($result < 0) { $error++; }
-            // End call triggers
-        }
-
-
-
         if (! $error)
         {
         	$this->db->commit();
@@ -1592,7 +1592,7 @@ class Adherent extends CommonObject
         global $conf, $langs;
 
         if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $withpictoimg) $withpictoimg=0;
-        
+
         $result=''; $label='';
         $link=''; $linkstart=''; $linkend='';
 
@@ -1602,7 +1602,7 @@ class Adherent extends CommonObject
             $label.= Form::showphoto('memberphoto', $this, 80, 0, 0, 'photowithmargin photologintooltip', 'small', 0, 1);
             $label.= '</div><div style="clear: both;"></div>';
         }
-        
+
         $label.= '<div class="centpercent">';
         $label.= '<u>' . $langs->trans("Member") . '</u>';
         if (! empty($this->ref))
@@ -1610,7 +1610,7 @@ class Adherent extends CommonObject
         if (! empty($this->firstname) || ! empty($this->lastname))
             $label.= '<br><b>' . $langs->trans('Name') . ':</b> ' . $this->getFullName($langs);
         $label.='</div>';
-        
+
         if ($option == 'card' || $option == 'category')
         {
             $link = '<a href="'.DOL_URL_ROOT.'/adherents/card.php?rowid='.$this->id.'"';
@@ -1619,7 +1619,7 @@ class Adherent extends CommonObject
         {
             $link = '<a href="'.DOL_URL_ROOT.'/adherents/subscription.php?rowid='.$this->id.'"';
         }
-        
+
         $linkclose="";
         if (empty($notooltip))
         {
@@ -1632,10 +1632,10 @@ class Adherent extends CommonObject
             $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
             $linkclose.= ' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
         }
-        
+
         $link.=$linkclose.'>';
         $linkend='</a>';
-        
+
         //if ($withpictoimg == -1) $result.='<div class="nowrap">';
         $result.=$link;
         if ($withpictoimg)
@@ -1658,7 +1658,7 @@ class Adherent extends CommonObject
         }
         $result.=$linkend;
         //if ($withpictoimg == -1) $result.='</div>';
-        
+
         return $result;
     }
 
@@ -1883,7 +1883,7 @@ class Adherent extends CommonObject
 			    $modele = $conf->global->ADHERENT_ADDON_PDF;
 		    }
 	    }
-    
+
         $modelpath = "core/modules/member/doc/";
 
         return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php
index 3defcabd059..4d13b6347ec 100644
--- a/htdocs/adherents/class/api_members.class.php
+++ b/htdocs/adherents/class/api_members.class.php
@@ -250,11 +250,7 @@ class Members extends DolibarrApi
             throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
 
-        // The Adherent::delete() method uses the global variable $user.
-        global $user;
-        $user = DolibarrApiAccess::$user;
-
-        if (! $member->delete($member->id)) {
+        if (! $member->delete($member->id, DolibarrApiAccess::$user)) {
             throw new RestException(401,'error when deleting member');
         }
 
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 06de3e09f95..949d55020c8 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -31,13 +31,17 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
-$langs->load("members");
-$langs->load("companies");
+$langs->loadLangs(array("members","companies"));
+
+$action=GETPOST('action','aZ09');
+$massaction=GETPOST('massaction','alpha');
+$show_files=GETPOST('show_files','int');
+$confirm=GETPOST('confirm','alpha');
+$toselect = GETPOST('toselect', 'array');
 
 // Security check
 $result=restrictedArea($user,'adherent');
 
-$action=GETPOST('action','aZ09');
 $filter=GETPOST("filter");
 $statut=GETPOST("statut");
 $search=GETPOST("search");
@@ -53,7 +57,7 @@ $search_country=GETPOST("search_country");
 $search_phone=GETPOST("search_phone");
 $search_phone_perso=GETPOST("search_phone_perso");
 $search_phone_mobile=GETPOST("search_phone_mobile");
-$type=GETPOST("type");
+$search_type=GETPOST("search_type");
 $search_email=GETPOST("search_email");
 $search_categ = GETPOST("search_categ",'int');
 $catid        = GETPOST("catid",'int');
@@ -155,7 +159,7 @@ if (empty($reshook))
     	$search_firstname="";
     	$search_login="";
     	$search_company="";
-    	$type="";
+    	$search_type="";
     	$search_email="";
     	$search_address="";
     	$search_zip="";
@@ -173,6 +177,14 @@ if (empty($reshook))
     	$toselect='';
     	$search_array_options=array();
     }
+
+    // Mass actions
+    $objectclass='Adherent';
+    $objectlabel='Members';
+    $permtoread = $user->rights->adherent->lire;
+    $permtodelete = $user->rights->adherent->supprimer;
+    $uploaddir = $conf->adherent->dir_output;
+    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
 
@@ -193,8 +205,8 @@ $sql.= " d.email, d.phone, d.phone_perso, d.phone_mobile, d.skype, d.birth, d.pu
 $sql.= " d.fk_adherent_type as type_id, d.morphy, d.statut, d.datec as date_creation, d.tms as date_update,";
 $sql.= " t.libelle as type, t.subscription,";
 $sql.= " state.code_departement as state_code, state.nom as state_name";
-// Add fields for extrafields
-foreach ($extrafields->attribute_list as $key => $val) $sql.=",ef.".$key.' as options_'.$key;
+// Add fields from extrafields
+foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
 // Add fields from hooks
 $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
@@ -212,7 +224,7 @@ if ($search_categ > 0)   $sql.= " AND cm.fk_categorie = ".$db->escape($search_ca
 if ($search_categ == -2) $sql.= " AND cm.fk_categorie IS NULL";
 $sql.= " AND d.entity IN (".getEntity('adherent').")";
 if ($sall) $sql.=natural_search(array_keys($fieldstosearchall), $sall);
-if ($type > 0) $sql.=" AND t.rowid=".$db->escape($type);
+if ($search_type > 0) $sql.=" AND t.rowid=".$db->escape($search_type);
 if ($statut != '') $sql.=" AND d.statut in (".$db->escape($statut).")";     // Peut valoir un nombre ou liste de nombre separes par virgules
 if ($search_ref)
 {
@@ -298,10 +310,10 @@ elseif ($action == 'search')
 	$titre=$langs->trans("MembersListQualified");
 }
 
-if ($type > 0)
+if ($search_type > 0)
 {
 	$membertype=new AdherentType($db);
-	$result=$membertype->fetch(GETPOST("type"));
+	$result=$membertype->fetch(GETPOST("type",'int'));
 	$titre.=" (".$membertype->libelle.")";
 }
 
@@ -326,7 +338,7 @@ if ($search_phone != '') $param.= "&search_phone=".urlencode($search_phone);
 if ($search_phone_perso != '') $param.= "&search_phone_perso=".urlencode($search_phone_perso);
 if ($search_phone_mobile != '') $param.= "&search_phone_mobile=".urlencode($search_phone_mobile);
 if ($filter)         $param.="&filter=".urlencode($filter);
-if ($type > 0)       $param.="&type=".urlencode($type);
+if ($search_type > 0)       $param.="&search_type=".urlencode($search_type);
 if ($optioncss != '')       $param.='&optioncss='.urlencode($optioncss);
 // Add $param from extra fields
 foreach ($search_array_options as $key => $val)
@@ -346,7 +358,7 @@ if ($user->rights->adherent->supprimer) $arrayofmassactions['delete']=$langs->tr
 //if ($massaction == 'presend' || $massaction == 'createbills') $arrayofmassactions=array();
 $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 
-print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
@@ -403,32 +415,32 @@ if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
 }
 
 // Ref
-if (! empty($arrayfields['d.ref']['checked'])) 
+if (! empty($arrayfields['d.ref']['checked']))
 {
     print '<td class="liste_titre">';
 	print '<input class="flat maxwidth50" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
     print '</td>';
 }
 
-if (! empty($arrayfields['d.firstname']['checked'])) 
+if (! empty($arrayfields['d.firstname']['checked']))
 {
 	print '<td class="liste_titre" align="left">';
 	print '<input class="flat maxwidth50" type="text" name="search_firstname" value="'.dol_escape_htmltag($search_firstname).'"></td>';
 }
 
-if (! empty($arrayfields['d.lastname']['checked'])) 
+if (! empty($arrayfields['d.lastname']['checked']))
 {
 	print '<td class="liste_titre" align="left">';
 	print '<input class="flat maxwidth50" type="text" name="search_lastname" value="'.dol_escape_htmltag($search_lastname).'"></td>';
 }
 
-if (! empty($arrayfields['d.company']['checked'])) 
+if (! empty($arrayfields['d.company']['checked']))
 {
 	print '<td class="liste_titre" align="left">';
 	print '<input class="flat maxwidth50" type="text" name="search_company" value="'.dol_escape_htmltag($search_company).'"></td>';
 }
 
-if (! empty($arrayfields['d.login']['checked'])) 
+if (! empty($arrayfields['d.login']['checked']))
 {
 	print '<td class="liste_titre" align="left">';
 	print '<input class="flat maxwidth50" type="text" name="search_login" value="'.dol_escape_htmltag($search_login).'"></td>';
@@ -440,26 +452,26 @@ if (! empty($arrayfields['d.morphy']['checked']))
     print '</td>';
 }
 
-if (! empty($arrayfields['t.libelle']['checked'])) 
+if (! empty($arrayfields['t.libelle']['checked']))
 {
 	print '<td class="liste_titre">';
 	$listetype=$membertypestatic->liste_array();
-	print $form->selectarray("type", $listetype, $type, 1, 0, 0, '', 0, 32);
+	print $form->selectarray("search_type", $listetype, $type, 1, 0, 0, '', 0, 32);
 	print '</td>';
 }
 
-if (! empty($arrayfields['d.address']['checked'])) 
+if (! empty($arrayfields['d.address']['checked']))
 {
 	print '<td class="liste_titre" align="left">';
 	print '<input class="flat maxwidth50" type="text" name="search_address" value="'.$search_address.'"></td>';
 }
 
-if (! empty($arrayfields['d.zip']['checked'])) 
+if (! empty($arrayfields['d.zip']['checked']))
 {
 	print '<td class="liste_titre" align="left">';
 	print '<input class="flat maxwidth50" type="text" name="search_zip" value="'.$search_zip.'"></td>';
 }
-if (! empty($arrayfields['d.town']['checked'])) 
+if (! empty($arrayfields['d.town']['checked']))
 {
 	print '<td class="liste_titre" align="left">';
 	print '<input class="flat maxwidth50" type="text" name="search_town" value="'.$search_town.'"></td>';
@@ -479,31 +491,31 @@ if (! empty($arrayfields['country.code_iso']['checked']))
     print '</td>';
 }
 // Phone pro
-if (! empty($arrayfields['d.phone']['checked'])) 
+if (! empty($arrayfields['d.phone']['checked']))
 {
 	print '<td class="liste_titre" align="left">';
 	print '<input class="flat maxwidth50" type="text" name="search_phone" value="'.$search_phone.'"></td>';
 }
 // Phone perso
-if (! empty($arrayfields['d.phone_perso']['checked'])) 
+if (! empty($arrayfields['d.phone_perso']['checked']))
 {
 	print '<td class="liste_titre" align="left">';
 	print '<input class="flat maxwidth50" type="text" name="search_phone_perso" value="'.$search_phone_perso.'"></td>';
 }
 // Phone mobile
-if (! empty($arrayfields['d.phone_mobile']['checked'])) 
+if (! empty($arrayfields['d.phone_mobile']['checked']))
 {
 	print '<td class="liste_titre" align="left">';
 	print '<input class="flat maxwidth50" type="text" name="search_phone_mobile" value="'.$search_phone_mobile.'"></td>';
 }
 // Email
-if (! empty($arrayfields['d.email']['checked'])) 
+if (! empty($arrayfields['d.email']['checked']))
 {
 	print '<td class="liste_titre" align="left">';
 	print '<input class="flat maxwidth50" type="text" name="search_email" value="'.$search_email.'"></td>';
 }
 
-if (! empty($arrayfields['d.datefin']['checked'])) 
+if (! empty($arrayfields['d.datefin']['checked']))
 {
 	print '<td class="liste_titre" align="left">';
 	print '</td>';
@@ -626,7 +638,7 @@ while ($i < min($num, $limit))
 	$memberstatic->datefin= $datefin;
 	$memberstatic->socid = $obj->fk_soc;
 	$memberstatic->photo = $obj->photo;
-	
+
 	if (! empty($obj->fk_soc)) {
 	    $memberstatic->fetch_thirdparty();
 		$companyname=$memberstatic->thirdparty->name;
@@ -635,52 +647,52 @@ while ($i < min($num, $limit))
 	}
 
 	print '<tr class="oddeven">';
-	
+
 	if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
 	{
 		print '<td align="center">'.($i+1).'</td>';
 	}
 
 	// Ref
-	if (! empty($arrayfields['d.ref']['checked'])) 
+	if (! empty($arrayfields['d.ref']['checked']))
 	{
    		print "<td>";
 		print $memberstatic->getNomUrl(-1, 0, 'card', 'ref');
 		print "</td>\n";
-	}		
+	}
 	// Firstname
-	if (! empty($arrayfields['d.firstname']['checked'])) 
+	if (! empty($arrayfields['d.firstname']['checked']))
 	{
     	print "<td>";
 		print $obj->firstname;
 		print "</td>\n";
 	}
 	// Lastname
-	if (! empty($arrayfields['d.lastname']['checked'])) 
+	if (! empty($arrayfields['d.lastname']['checked']))
 	{
     	print "<td>";
 		print $obj->lastname;
 		print "</td>\n";
 	}
 	// Company
-	if (! empty($arrayfields['d.company']['checked'])) 
+	if (! empty($arrayfields['d.company']['checked']))
 	{
     	print "<td>";
     	print $companyname;
 		print "</td>\n";
 	}
 	// Login
-	if (! empty($arrayfields['d.login']['checked'])) 
+	if (! empty($arrayfields['d.login']['checked']))
 	{
 	   print "<td>".$obj->login."</td>\n";
 	}
 	// Moral/Physique
-	if (! empty($arrayfields['d.morphy']['checked'])) 
+	if (! empty($arrayfields['d.morphy']['checked']))
 	{
 	   print "<td>".$memberstatic->getmorphylib($obj->morphy)."</td>\n";
 	}
 	// Type label
-	if (! empty($arrayfields['t.libelle']['checked'])) 
+	if (! empty($arrayfields['t.libelle']['checked']))
 	{
     	$membertypestatic->id=$obj->type_id;
 		$membertypestatic->libelle=$obj->type;
@@ -727,7 +739,7 @@ while ($i < min($num, $limit))
 	    if (! $i) $totalarray['nbfield']++;
 	}
 	// Phone pro
-	if (! empty($arrayfields['d.phone']['checked'])) 
+	if (! empty($arrayfields['d.phone']['checked']))
 	{
 		print '<td class="nocellnopadd">';
 	    print $obj->phone;
@@ -735,7 +747,7 @@ while ($i < min($num, $limit))
 	    if (! $i) $totalarray['nbfield']++;
 	}
 	// Phone perso
-	if (! empty($arrayfields['d.phone_perso']['checked'])) 
+	if (! empty($arrayfields['d.phone_perso']['checked']))
 	{
 		print '<td class="nocellnopadd">';
 	    print $obj->phone_perso;
@@ -743,7 +755,7 @@ while ($i < min($num, $limit))
 	    if (! $i) $totalarray['nbfield']++;
 	}
 	// Phone mobile
-	if (! empty($arrayfields['d.phone_mobile']['checked'])) 
+	if (! empty($arrayfields['d.phone_mobile']['checked']))
 	{
 		print '<td class="nocellnopadd">';
 	    print $obj->phone_mobile;
@@ -756,7 +768,7 @@ while ($i < min($num, $limit))
         print "<td>".dol_print_email($obj->email,0,0,1)."</td>\n";
 	}
 	// End of subscription date
-	$datefin=$db->jdate($obj->datefin);		
+	$datefin=$db->jdate($obj->datefin);
 	if (! empty($arrayfields['d.datefin']['checked']))
 	{
 		if ($datefin)
@@ -832,22 +844,15 @@ while ($i < min($num, $limit))
 	}
 	// Action column
 	print '<td align="center">';
-	if ($user->rights->adherent->creer)
-	{
-		print "<a href=\"card.php?rowid=".$obj->rowid."&action=edit&backtopage=1\">".img_edit()."</a>";
-	}
-	print '&nbsp;';
-	if ($user->rights->adherent->supprimer && $obj->statut == -1)
-	{
-		print "<a href=\"card.php?rowid=".$obj->rowid."&action=delete&backtopage=1\">".img_picto($langs->trans("Delete"),'disable.png')."</a>";
-	}
-	if ($user->rights->adherent->supprimer && $obj->statut == 1)
-	{
-		print "<a href=\"card.php?rowid=".$obj->rowid."&action=resign&backtopage=1\">".img_picto($langs->trans("Resiliate"),'disable.png')."</a>";
-	}
-	print "</td>";
-	if (! $i) $totalarray['nbfield']++;
-	
+    if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+    {
+        $selected=0;
+		if (in_array($obj->rowid, $arrayofselected)) $selected=1;
+		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
+    }
+    print '</td>';
+    if (! $i) $totalarray['nbfield']++;
+
 	print "</tr>\n";
 	$i++;
 }
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index dbfeafc8f94..2f8810333f0 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -45,7 +45,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
 $langs->loadLangs(array("orders",'sendings','deliveries','companies','compta','bills'));
 
-$action=GETPOST('action','alpha');
+$action=GETPOST('action','aZ09');
 $massaction=GETPOST('massaction','alpha');
 $show_files=GETPOST('show_files','int');
 $confirm=GETPOST('confirm','alpha');
@@ -160,7 +160,7 @@ if (empty($reshook))
 {
     // Selection of new fields
     include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
-    
+
     // Purge search criteria
     if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
     {
@@ -202,51 +202,51 @@ if (empty($reshook))
 
 	// TODO Move this into mass action include
     if ($massaction == 'confirm_createbills') {
-    	
+
     	$orders = GETPOST('toselect');
     	$createbills_onebythird = GETPOST('createbills_onebythird', 'int');
     	$validate_invoices = GETPOST('valdate_invoices', 'int');
-    	
+
     	$TFact = array();
     	$TFactThird = array();
-    	
+
     	$nb_bills_created = 0;
-    	
+
     	$db->begin();
-    	
+
     	foreach($orders as $id_order) {
-    		
+
     		$cmd = new Commande($db);
     		if($cmd->fetch($id_order) <= 0) continue;
-    		
+
     		$object = new Facture($db);
     		if(!empty($createbills_onebythird) && !empty($TFactThird[$cmd->socid])) $object = $TFactThird[$cmd->socid]; // If option "one bill per third" is set, we use already created order.
     		else {
-    			
+
     			$object->socid = $cmd->socid;
     			$object->type = Facture::TYPE_STANDARD;
     			$object->cond_reglement_id	= $cmd->cond_reglement_id;
     			$object->mode_reglement_id	= $cmd->mode_reglement_id;
     			$object->fk_project			= $cmd->fk_project;
-    			
+
     			$datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
     			if (empty($datefacture))
     			{
     				$datefacture = dol_mktime(date("h"), date("M"), 0, date("m"), date("d"), date("Y"));
     			}
-    			
+
     			$object->date = $datefacture;
     			$object->origin    = 'commande';
     			$object->origin_id = $id_order;
-    			
+
     			$res = $object->create($user);
-    			
+
     			if($res > 0) $nb_bills_created++;
-    			
+
     		}
-    		
+
     		if($object->id > 0) {
-    			
+
     			$db->begin();
     			$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
     			$sql.= "fk_source";
@@ -259,7 +259,7 @@ if (empty($reshook))
     			$sql.= ", ".$object->id;
     			$sql.= ", '".$object->element."'";
     			$sql.= ")";
-    
+
     			if ($db->query($sql))
     			{
     				$db->commit();
@@ -268,17 +268,17 @@ if (empty($reshook))
     			{
     				$db->rollback();
     			}
-    			
+
     			$lines = $cmd->lines;
     			if (empty($lines) && method_exists($cmd, 'fetch_lines'))
     			{
     				$cmd->fetch_lines();
     				$lines = $cmd->lines;
     			}
-    			
+
     			$fk_parent_line=0;
     			$num=count($lines);
-    			
+
     			for ($i=0;$i<$num;$i++)
     			{
     				$desc=($lines[$i]->desc?$lines[$i]->desc:$lines[$i]->libelle);
@@ -367,43 +367,43 @@ if (empty($reshook))
     						$fk_parent_line = $result;
     					}
     				}
-    			}			
-    			
+    			}
+
     		}
-    		 
+
     		$cmd->classifyBilled($user);
-    
+
     		if(!empty($createbills_onebythird) && empty($TFactThird[$cmd->socid])) $TFactThird[$cmd->socid] = $object;
     		else $TFact[$object->id] = $object;
     	}
-    	
+
     	// Build doc with all invoices
     	$TAllFact = empty($createbills_onebythird) ? $TFact : $TFactThird;
     	$toselect = array();
-    	
+
     	if(!empty($validate_invoices)) {
-    		
+
     		$massaction = $action = 'builddoc';
-    		
+
     		foreach($TAllFact as &$object) {
     			$object->validate($user);
     			$toselect[] = $object->id; // For builddoc action
-    			
+
     			// Fac builddoc
     			$upload_dir = $conf->facture->dir_output;
     		    $permissioncreate=$user->rights->facture->creer;
     		    include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
     		}
-    		
+
     		$objectclass='Facture';
     	    $objectlabel='Invoice';
     	    $permtoread = $user->rights->facture->lire;
     	    $permtodelete = $user->rights->facture->supprimer;
     	    $uploaddir = $conf->facture->dir_output;
     		include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
-    		
+
     	}
-    	
+
     	if (! $error)
     	{
     		$db->commit();
@@ -418,7 +418,7 @@ if (empty($reshook))
     		setEventMessages($object->error, $object->errors, 'errors');
     		$error++;
     	}
-    }	
+    }
 }
 
 
@@ -596,9 +596,9 @@ if ($resql)
 	$title.=' - '.$langs->trans('StatusOrderValidated').', '.(empty($conf->expedition->enabled)?'':$langs->trans("StatusOrderSent").', ').$langs->trans('StatusOrderToBill');
 
 	$num = $db->num_rows($resql);
-	
+
 	$arrayofselected=is_array($toselect)?$toselect:array();
-	
+
 	$param='';
     if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
@@ -629,7 +629,7 @@ if ($resql)
 	    $tmpkey=preg_replace('/search_options_/','',$key);
 	    if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
 	}
-	
+
 	// List of mass actions available
 	$arrayofmassactions =  array(
 	    'presend'=>$langs->trans("SendByMail"),
@@ -653,12 +653,12 @@ if ($resql)
 	print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
 
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit);
-	
+
 	// TODO Move this into an invluce
 	if ($massaction == 'presend')
 	{
 	    $langs->load("mails");
-	
+
 	    if (! GETPOST('cancel'))
 	    {
 	        $objecttmp=new Commande($db);
@@ -677,14 +677,14 @@ if ($resql)
 	            }
 	        }
 	    }
-	
+
 	    print '<input type="hidden" name="massaction" value="confirm_presend">';
-	
+
 	    dol_fiche_head(null, '', '');
-	
+
 	    $topicmail="SendOrderRef";
 	    $modelmail="order_send";
-	
+
 	    // Cree l'objet formulaire mail
 	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 	    $formmail = new FormMail($db);
@@ -737,23 +737,23 @@ if ($resql)
 	    $formmail->substit['__REFCLIENT__']='__REFCLIENT__';	// We want to keep the tag
 	    $formmail->substit['__PERSONALIZED__']='';
 	    $formmail->substit['__CONTACTCIVNAME__']='';
-	
+
 	    // Tableau des parametres complementaires du post
 	    $formmail->param['action']=$action;
 	    $formmail->param['models']=$modelmail;
 	    $formmail->param['models_id']=GETPOST('modelmailselected','int');
 	    $formmail->param['id']=join(',',$arrayofselected);
 	    //$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-	
+
 	    print $formmail->get_form();
-	
+
 	    dol_fiche_end();
 	}
 	elseif ($massaction == 'createbills')
 	{
 		//var_dump($_REQUEST);
 		print '<input type="hidden" name="massaction" value="confirm_createbills">';
-		
+
 		print '<table class="border" width="100%" >';
 		print '<tr>';
 		print '<td class="titlefieldmiddle">';
@@ -780,7 +780,7 @@ if ($resql)
 		print '</td>';
 		print '</tr>';
 		print '</table>';
-		
+
 		print '<br>';
 		print '<div class="center">';
 		print '<input type="submit" class="button" id="createbills" name="createbills" value="'.$langs->trans('CreateInvoiceForThisCustomer').'">  ';
@@ -788,13 +788,13 @@ if ($resql)
 		print '</div>';
 		print '<br>';
 	}
-	
+
 	if ($sall)
     {
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
         print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
     }
-	
+
 	$moreforfilter='';
 
  	// If the user can view prospects other than his'
@@ -828,7 +828,7 @@ if ($resql)
 	$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
 	if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
 	else $moreforfilter = $hookmanager->resPrint;
-	
+
 	if (! empty($moreforfilter))
 	{
 		print '<div class="liste_titre liste_titre_bydiv centpercent">';
@@ -839,27 +839,27 @@ if ($resql)
     $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
     $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
     if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
-    
+
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
 	print '<tr class="liste_titre_filter">';
 	// Ref
-	if (! empty($arrayfields['c.ref']['checked'])) 
+	if (! empty($arrayfields['c.ref']['checked']))
 	{
 	    print '<td class="liste_titre">';
     	print '<input class="flat" size="6" type="text" name="search_ref" value="'.$search_ref.'">';
 	    print '</td>';
 	}
 	// Ref customer
-	if (! empty($arrayfields['c.ref_client']['checked'])) 
+	if (! empty($arrayfields['c.ref_client']['checked']))
 	{
     	print '<td class="liste_titre" align="left">';
     	print '<input class="flat" type="text" size="6" name="search_ref_customer" value="'.$search_ref_customer.'">';
     	print '</td>';
 	}
 	// Thirpdarty
-	if (! empty($arrayfields['s.nom']['checked'])) 
+	if (! empty($arrayfields['s.nom']['checked']))
 	{
     	print '<td class="liste_titre" align="left">';
     	print '<input class="flat" type="text" name="search_company" value="'.$search_company.'">';
@@ -899,7 +899,7 @@ if ($resql)
         $formother->select_year($orderyear?$orderyear:-1,'orderyear',1, 20, 5);
     	print '</td>';
 	}
-	if (! empty($arrayfields['c.date_delivery']['checked'])) 
+	if (! empty($arrayfields['c.date_delivery']['checked']))
 	{
     	print '<td class="liste_titre" align="center">';
         if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="deliveryday" value="'.$deliveryday.'">';
@@ -972,10 +972,10 @@ if ($resql)
 	{
 	    print '<td class="liste_titre maxwidthonsmartphone" align="right">';
     	$liststatus=array(
-    	    Commande::STATUS_DRAFT=>$langs->trans("StatusOrderDraftShort"), 
-    	    Commande::STATUS_VALIDATED=>$langs->trans("StatusOrderValidated"), 
-    	    Commande::STATUS_ACCEPTED=>$langs->trans("StatusOrderSentShort"), 
-    	    Commande::STATUS_CLOSED=>$langs->trans("StatusOrderDelivered"), 
+    	    Commande::STATUS_DRAFT=>$langs->trans("StatusOrderDraftShort"),
+    	    Commande::STATUS_VALIDATED=>$langs->trans("StatusOrderValidated"),
+    	    Commande::STATUS_ACCEPTED=>$langs->trans("StatusOrderSentShort"),
+    	    Commande::STATUS_CLOSED=>$langs->trans("StatusOrderDelivered"),
     	    Commande::STATUS_CANCELED=>$langs->trans("StatusOrderCanceledShort")
     	);
     	print $form->selectarray('viewstatut', $liststatus, $viewstatut, -4);
@@ -993,7 +993,7 @@ if ($resql)
 	$searchpicto=$form->showFilterButtons();
 	print $searchpicto;
 	print '</td>';
-	
+
     print "</tr>\n";
 
 	// Fields title
@@ -1014,9 +1014,9 @@ if ($resql)
 	// Extra fields
 	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 	{
-	   foreach($extrafields->attribute_label as $key => $val) 
+	   foreach($extrafields->attribute_label as $key => $val)
 	   {
-           if (! empty($arrayfields["ef.".$key]['checked'])) 
+           if (! empty($arrayfields["ef.".$key]['checked']))
            {
 				$align=$extrafields->getAlignFlag($key);
 				print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
@@ -1033,20 +1033,20 @@ if ($resql)
 	if (! empty($arrayfields['c.facture']['checked']))   print_liste_field_titre($arrayfields['c.facture']['label'],$_SERVER["PHP_SELF"],'c.facture','',$param,'align="center"',$sortfield,$sortorder,'');
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 	print '</tr>'."\n";
-    
+
 	$total=0;
 	$subtotal=0;
     $productstat_cache=array();
-    
+
     $generic_commande = new Commande($db);
     $generic_product = new Product($db);
-	
+
     $i=0;
 	$totalarray=array();
     while ($i < min($num,$limit))
     {
         $obj = $db->fetch_object($resql);
-        
+
         print '<tr class="oddeven">';
 
         $notshippable=0;
@@ -1054,7 +1054,7 @@ if ($resql)
         $text_info='';
         $text_warning='';
         $nbprod=0;
-        
+
         // Ref
         if (! empty($arrayfields['c.ref']['checked']))
         {
@@ -1070,12 +1070,12 @@ if ($resql)
             $generic_commande->total_ttc = $obj->total_ttc;
             $generic_commande->lines=array();
             $generic_commande->getLinesArray();
-    
+
             print '<table class="nobordernopadding"><tr class="nocellnopadd">';
             print '<td class="nobordernopadding nowrap">';
             print $generic_commande->getNomUrl(1,($viewstatut != 2?0:$obj->fk_statut));
             print '</td>';
-    		
+
             // Show shippable Icon (create subloop, so may be slow)
             if ($conf->stock->enabled)
             {
@@ -1083,7 +1083,7 @@ if ($resql)
 	            if (($obj->fk_statut > 0) && ($obj->fk_statut < 3))
     	        {
                     $numlines = count($generic_commande->lines); // Loop on each line of order
-                    for ($lig=0; $lig < $numlines; $lig++) 
+                    for ($lig=0; $lig < $numlines; $lig++)
                     {
                         if ($generic_commande->lines[$lig]->product_type == 0 && $generic_commande->lines[$lig]->fk_product > 0)  // If line is a product and not a service
                         {
@@ -1107,8 +1107,8 @@ if ($resql)
                                 $text_info .= ' - '.$langs->trans("Stock").': '.$generic_product->stock_reel;
                                 $text_info .= ' - '.$langs->trans("VirtualStock").': '.$generic_product->stock_theorique;
                                 $text_info .= '<br>';
-                                
-                                if ($generic_commande->lines[$lig]->qty > $generic_product->stock_reel) 
+
+                                if ($generic_commande->lines[$lig]->qty > $generic_product->stock_reel)
                                 {
                                     $notshippable++;
                                 }
@@ -1168,7 +1168,7 @@ if ($resql)
                         $text_info = $langs->trans('NonShippable').'<br>'.$text_info;
                     }
                 }
-                
+
                 print '<td>';
                 if ($nbprod)
                 {
@@ -1179,7 +1179,7 @@ if ($resql)
                 }
                 print '</td>';
             }
-    
+
             // Warning late icon and note
     		print '<td class="nobordernopadding nowrap">';
     		if ($generic_commande->hasDelay()) {
@@ -1192,7 +1192,7 @@ if ($resql)
     			print '</span>';
     		}
     		print '</td>';
-    
+
     		print '<td width="16" align="right" class="nobordernopadding hideonsmartphone">';
     		$filename=dol_sanitizeFileName($obj->ref);
     		$filedir=$conf->commande->dir_output . '/' . dol_sanitizeFileName($obj->ref);
@@ -1200,11 +1200,11 @@ if ($resql)
     		print $formfile->getDocumentsLink($generic_commande->element, $filename, $filedir);
     		print '</td>';
     		print '</tr></table>';
-    
+
     		print '</td>';
     		if (! $i) $totalarray['nbfield']++;
         }
-        
+
 		// Ref customer
 		if (! empty($arrayfields['c.ref_client']['checked']))
 		{
@@ -1222,7 +1222,7 @@ if ($resql)
 		{
     		print '<td class="tdoverflowmax200">';
     		print $companystatic->getNomUrl(1,'customer');
-    
+
     		// If module invoices enabled and user with invoice creation permissions
     		if (! empty($conf->facture->enabled) && ! empty($conf->global->ORDER_BILLING_ALL_CUSTOMER))
     		{
@@ -1278,7 +1278,7 @@ if ($resql)
 		    print '</td>';
 		    if (! $i) $totalarray['nbfield']++;
 		}
-		
+
 		// Order date
 		if (! empty($arrayfields['c.date_commande']['checked']))
 		{
@@ -1319,7 +1319,7 @@ if ($resql)
 		    if (! $i) $totalarray['totalttcfield']=$totalarray['nbfield'];
 		    $totalarray['totalttc'] += $obj->total_ttc;
         }
-		
+
         // Extra fields
         if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
         {
@@ -1370,7 +1370,7 @@ if ($resql)
             print '<td align="center">'.yn($obj->billed).'</td>';
             if (! $i) $totalarray['nbfield']++;
         }
-        
+
         // Action column
         print '<td class="nowrap" align="center">';
         if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
@@ -1381,9 +1381,9 @@ if ($resql)
         }
         print '</td>';
         if (! $i) $totalarray['nbfield']++;
-		
+
 		print "</tr>\n";
-        
+
 		$total+=$obj->total_ht;
 		$subtotal+=$obj->total_ht;
 		$i++;
@@ -1416,14 +1416,14 @@ if ($resql)
 	}
 
 	$db->free($resql);
-	
+
 	$parameters=array('arrayfields'=>$arrayfields, 'sql'=>$sql);
 	$reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-				
+
 	print '</table>'."\n";
 	print '</div>';
-	
+
 	print '</form>'."\n";
 
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
@@ -1433,18 +1433,18 @@ if ($resql)
 	     */
 	    $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
 	    $urlsource.=str_replace('&amp;','&',$param);
-	
+
 	    $filedir=$diroutputmassaction;
 	    $genallowed=$user->rights->commande->lire;
 	    $delallowed=$user->rights->commande->supprimer;
-	
+
 	    print $formfile->showdocuments('massfilesarea_orders','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
 	}
 	else
 	{
 	    print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
 	}
-	
+
 }
 else
 {
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index fde828fd6d4..20b3d155a27 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -536,7 +536,7 @@ if (! $error && $massaction == 'delete' && $permtodelete)
         $result=$objecttmp->fetch($toselectid);
         if ($result > 0)
         {
-            if ($objecttmp->element == 'societe') $result = $objecttmp->delete($objecttmp->id, $user, 1);
+            if (in_array($objecttmp->element, array('societe','member'))) $result = $objecttmp->delete($objecttmp->id, $user, 1);
             else $result = $objecttmp->delete($user);
             if ($result <= 0)
             {

From 0458b7d38f9610bd3e3ef2fae83722b39d48c55f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Jun 2017 17:29:34 +0200
Subject: [PATCH 128/438] Fix css subscription form

---
 htdocs/adherents/admin/public.php | 13 ++++---------
 htdocs/public/members/new.php     | 29 +++++++++++++++--------------
 htdocs/theme/eldy/style.css.php   |  5 ++++-
 htdocs/theme/md/style.css.php     |  5 ++++-
 4 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/htdocs/adherents/admin/public.php b/htdocs/adherents/admin/public.php
index 141c39d7e9e..940c6c6e457 100644
--- a/htdocs/adherents/admin/public.php
+++ b/htdocs/adherents/admin/public.php
@@ -115,16 +115,11 @@ if ($conf->use_javascript_ajax)
                 {
 					if (jQuery("#MEMBER_ENABLE_PUBLIC").val()==\'0\')
                     {
-                        jQuery("#tramount").hide();
-                        jQuery("#tredit").hide();
-                        jQuery("#trpayment").hide();
-                        jQuery("#tremail").hide();
+                        jQuery("#trforcetype, #tramount, #tredit, #trpayment, #tremail").hide();
                     }
                     if (jQuery("#MEMBER_ENABLE_PUBLIC").val()==\'1\')
                     {
-                        jQuery("#tramount").show();
-                        jQuery("#tredit").show();
-                        jQuery("#trpayment").show();
+                        jQuery("#trforcetype, #tramount, #tredit, #trpayment").show();
                         if (jQuery("#MEMBER_NEWFORM_PAYONLINE").val()==\'-1\') jQuery("#tremail").hide();
                         else jQuery("#tremail").show();
 					}
@@ -156,9 +151,9 @@ print "</td></tr>\n";
 
 // Force Type
 $adht = new AdherentType($db);
-print '<tr class="oddeven drag"><td>';
+print '<tr class="oddeven drag" id="trforcetype"><td>';
 print $langs->trans("ForceMemberType");
-print '</td><td width="60" align="center">';
+print '</td><td width="60" align="right">';
 $listofval = array(-1 => $langs->trans("Undefined"));
 $listofval += $adht->liste_array();
 $forcetype = $conf->global->MEMBER_NEWFORM_FORCETYPE ?: -1;
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index a2cab708281..f174c51cc74 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -115,7 +115,7 @@ function llxHeaderVierge($title, $head="", $disablejs=0, $disablehead=0, $arrayo
     print '<img alt="Logo" id="logosubscribe" title="" src="'.$urllogo.'" />';
     print '</div><br>';
 
-    print '<div style="margin-left: 50px; margin-right: 50px;">';
+    print '<div class="divmainbodylarge">';
 }
 
 /**
@@ -407,8 +407,9 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" / >';
 print '<input type="hidden" name="entity" value="'.$entity.'" />';
 print '<input type="hidden" name="action" value="add" />';
 
+print '<br>';
 
-print '<br>'.$langs->trans("FieldsWithAreMandatory",'*').'<br>';
+print '<br><span class="opacitymedium">'.$langs->trans("FieldsWithAreMandatory",'*').'</span><br>';
 //print $langs->trans("FieldsWithIsForPublic",'**').'<br>';
 
 dol_fiche_head('');
@@ -448,7 +449,7 @@ if (empty($conf->global->MEMBER_NEWFORM_FORCETYPE))
     $defaulttype='';
     $isempty=1;
     if (count($listoftype)==1) { $defaulttype=$tmp[0]; $isempty=0; }
-    print '<tr><td width="15%">'.$langs->trans("Type").' <FONT COLOR="red">*</FONT></td><td width="35%">';
+    print '<tr><td class="titlefield">'.$langs->trans("Type").' <FONT COLOR="red">*</FONT></td><td>';
     print $form->selectarray("type",  $adht->liste_array(), GETPOST('type')?GETPOST('type'):$defaulttype, $isempty);
     print '</td></tr>'."\n";
 }
@@ -463,7 +464,7 @@ $morphys["phy"] = $langs->trans("Physical");
 $morphys["mor"] = $langs->trans("Moral");
 if (empty($conf->global->MEMBER_NEWFORM_FORCEMORPHY))
 {
-    print '<tr class="morphy"><td>'.$langs->trans('Nature').' <FONT COLOR="red">*</FONT></td><td>'."\n";
+    print '<tr class="morphy"><td class="titlefield">'.$langs->trans('Nature').' <FONT COLOR="red">*</FONT></td><td>'."\n";
     print $form->selectarray("morphy",  $morphys, GETPOST('morphy'), 1);
     print '</td></tr>'."\n";
 }
@@ -473,14 +474,14 @@ else
     print '<input type="hidden" id="morphy" name="morphy" value="'.$conf->global->MEMBER_NEWFORM_FORCEMORPHY.'">';
 }
 // Civility
-print '<tr><td>'.$langs->trans('UserTitle').'</td><td>';
+print '<tr><td class="titlefield">'.$langs->trans('UserTitle').'</td><td>';
 print $formcompany->select_civility(GETPOST('civility_id'),'civility_id').'</td></tr>'."\n";
 // Lastname
-print '<tr><td>'.$langs->trans("Lastname").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="lastname" size="40" value="'.dol_escape_htmltag(GETPOST('lastname')).'"></td></tr>'."\n";
+print '<tr><td>'.$langs->trans("Lastname").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="lastname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('lastname')).'"></td></tr>'."\n";
 // Firstname
-print '<tr><td>'.$langs->trans("Firstname").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="firstname" size="40" value="'.dol_escape_htmltag(GETPOST('firstname')).'"></td></tr>'."\n";
+print '<tr><td>'.$langs->trans("Firstname").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="firstname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('firstname')).'"></td></tr>'."\n";
 // Company
-print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" size="40" value="'.dol_escape_htmltag(GETPOST('societe')).'"></td></tr>'."\n";
+print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('societe')).'"></td></tr>'."\n";
 // Address
 print '<tr><td>'.$langs->trans("Address").'</td><td>'."\n";
 print '<textarea name="address" id="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('address')).'</textarea></td></tr>'."\n";
@@ -491,7 +492,7 @@ print ' / ';
 print $formcompany->select_ziptown(GETPOST('town'), 'town', array('zipcode','selectcountry_id','state_id'), 0, 1);
 print '</td></tr>';
 // Country
-print '<tr><td width="25%">'.$langs->trans('Country').'</td><td>';
+print '<tr><td>'.$langs->trans('Country').'</td><td>';
 $country_id=GETPOST('country_id');
 if (! $country_id && ! empty($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE)) $country_id=getCountry($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE,2,$db,$langs);
 if (! $country_id && ! empty($conf->geoipmaxmind->enabled))
@@ -517,20 +518,20 @@ if (empty($conf->global->SOCIETE_DISABLE_STATE))
     print '</td></tr>';
 }
 // EMail
-print '<tr><td>'.$langs->trans("Email").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="email" size="40" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
+print '<tr><td>'.$langs->trans("Email").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="email" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
 // Login
 if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
 {
-    print '<tr><td>'.$langs->trans("Login").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="login" size="20" value="'.dol_escape_htmltag(GETPOST('login')).'"></td></tr>'."\n";
-    print '<tr><td>'.$langs->trans("Password").' <FONT COLOR="red">*</FONT></td><td><input type="password" name="pass1" size="20" value="'.GETPOST("pass1").'"></td></tr>'."\n";
-    print '<tr><td>'.$langs->trans("PasswordAgain").' <FONT COLOR="red">*</FONT></td><td><input type="password" name="pass2" size="20" value="'.GETPOST("pass2").'"></td></tr>'."\n";
+    print '<tr><td>'.$langs->trans("Login").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="login" class="minwidth100"value="'.dol_escape_htmltag(GETPOST('login')).'"></td></tr>'."\n";
+    print '<tr><td>'.$langs->trans("Password").' <FONT COLOR="red">*</FONT></td><td><input type="password" name="pass1" class="minwidth100" value="'.GETPOST("pass1").'"></td></tr>'."\n";
+    print '<tr><td>'.$langs->trans("PasswordAgain").' <FONT COLOR="red">*</FONT></td><td><input type="password" name="pass2" class="minwidth100" value="'.GETPOST("pass2").'"></td></tr>'."\n";
 }
 // Birthday
 print '<tr id="trbirth" class="trbirth"><td>'.$langs->trans("DateToBirth").'</td><td>';
 print $form->select_date($birthday,'birth',0,0,1,"newmember",1,0,1);
 print '</td></tr>'."\n";
 // Photo
-print '<tr><td>'.$langs->trans("URLPhoto").'</td><td><input type="text" name="photo" size="40" value="'.dol_escape_htmltag(GETPOST('photo')).'"></td></tr>'."\n";
+print '<tr><td>'.$langs->trans("URLPhoto").'</td><td><input type="text" name="photo" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('photo')).'"></td></tr>'."\n";
 // Public
 print '<tr><td>'.$langs->trans("Public").'</td><td><input type="checkbox" name="public"></td></tr>'."\n";
 // Extrafields
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 9ba91c33475..320d4f1859b 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -792,6 +792,8 @@ div.fiche>form>div.div-table-responsive {
 /* Force values for small screen 570 */
 @media only screen and (max-width: 570px)
 {
+	.divmainbodylarge { margin-left: 20px !important; margin-right: 20px !important; }
+
     .tdoverflowonsmartphone {
         max-width: 0;
         overflow: hidden;
@@ -3077,7 +3079,8 @@ div.titre {
 #tablepublicpayment tr.liste_total { border-bottom: 1px solid #CCCCCC !important; }
 #tablepublicpayment tr.liste_total td { border-top: none; }
 
-#divsubscribe { width: 700px; }
+.divmainbodylarge { margin-left: 40px; margin-right: 40px; }
+#divsubscribe { max-width: 900px; }
 #tablesubscribe { width: 100%; }
 
 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index a1d26705d46..c21aafd407f 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -794,6 +794,8 @@ div.fiche>form>div.div-table-responsive {
 /* Force values for small screen 570 */
 @media only screen and (max-width: 570px)
 {
+	.divmainbodylarge { margin-left: 20px; margin-right: 20px; }
+
     .tdoverflowonsmartphone {
         max-width: 0;
         overflow: hidden;
@@ -3156,7 +3158,8 @@ div.titre {
 #tablepublicpayment tr.liste_total { border-bottom: 1px solid #CCCCCC !important; }
 #tablepublicpayment tr.liste_total td { border-top: none; }
 
-#divsubscribe { width: 700px; }
+.divmainbodylarge { margin-left: 40px; margin-right: 40px; }
+#divsubscribe { max-width: 900px; }
 #tablesubscribe { width: 100%; }
 
 

From 884c6c674ddfd7717adea8cc18f16477e1ce7547 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Jun 2017 20:08:23 +0200
Subject: [PATCH 129/438] Fix css

---
 htdocs/core/class/html.form.class.php | 7 ++-----
 htdocs/theme/eldy/style.css.php       | 2 +-
 htdocs/theme/md/style.css.php         | 2 +-
 htdocs/user/class/user.class.php      | 4 ++--
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index ac17e1d9e17..7c8efcc8328 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6083,7 +6083,7 @@ class Form
             }
             else
 			{
-				$nophoto='/public/theme/common/nophoto.png';
+                $nophoto='/public/theme/common/nophoto.png';
 				if (in_array($modulepart,array('userphoto','contact')))	// For module that are "physical" users
 				{
 					$nophoto='/public/theme/common/user_anonymous.png';
@@ -6102,10 +6102,7 @@ class Form
                 }
                 else
 				{
-				    if ($conf->browser->layout != 'phone')
-				    {
-                        $ret.='<img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="No photo" '.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="'.DOL_URL_ROOT.$nophoto.'">';
-				    }
+                    $ret.='<img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="No photo" '.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="'.DOL_URL_ROOT.$nophoto.'">';
                 }
             }
 
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 320d4f1859b..3b2ba307bbd 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -4188,7 +4188,7 @@ dl.dropdown {
     position:absolute;
     top:2px;
     list-style:none;
-    max-height: 280px;
+    max-height: 270px;
     overflow: auto;
 }
 .dropdown span.value {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index c21aafd407f..927830da51d 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -4275,7 +4275,7 @@ dl.dropdown {
     position:absolute;
     top:2px;
     list-style:none;
-    max-height: 280px;
+    max-height: 270px;
     overflow: auto;
 }
 .dropdown span.value {
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index a69ed968dfb..6b39158a87b 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -2096,9 +2096,9 @@ class User extends CommonObject
 	      	$paddafterimage='';
 			if (abs($withpictoimg) == 1) $paddafterimage='style="margin-right: 3px;"';
         	// Only picto
-			if ($withpictoimg > 0) $picto='<div class="inline-block nopadding '.($morecss?' userimg'.$morecss:'').'">'.img_object('', 'user', $paddafterimage.' '.($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).'</div>';
+			if ($withpictoimg > 0) $picto='<!-- picto user --><div class="inline-block nopadding '.($morecss?' userimg'.$morecss:'').'">'.img_object('', 'user', $paddafterimage.' '.($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).'</div>';
         	// Picto must be a photo
-			else $picto='<div class="inline-block nopadding '.($morecss?' userimg'.$morecss:'').'"'.($paddafterimage?' '.$paddafterimage:'').'>'.Form::showphoto('userphoto', $this, 0, 0, 0, 'userphoto'.($withpictoimg==-3?'small':''), 'mini', 0, 1).'</div>';
+			else $picto='<!-- picto photo user --><div class="inline-block nopadding '.($morecss?' userimg'.$morecss:'').'"'.($paddafterimage?' '.$paddafterimage:'').'>'.Form::showphoto('userphoto', $this, 0, 0, 0, 'userphoto'.($withpictoimg==-3?'small':''), 'mini', 0, 1).'</div>';
             $result.=$picto;
 		}
 		if ($withpictoimg > -2 && $withpictoimg != 2)

From 58a407d9f1681f3b60449d9460dd33002afc9e09 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 00:05:47 +0200
Subject: [PATCH 130/438] Fix style and align when no permission on widget

---
 htdocs/admin/defaultvalues.php                |  26 ++---
 htdocs/admin/ldap.php                         |   6 +-
 htdocs/admin/ldap_contacts.php                |   8 +-
 htdocs/admin/ldap_groups.php                  |  10 +-
 htdocs/admin/ldap_members.php                 |   6 +-
 htdocs/admin/ldap_users.php                   |   2 +-
 htdocs/admin/perms.php                        |   4 +-
 htdocs/admin/translation.php                  | 103 +++++++++---------
 htdocs/core/boxes/box_actions.php             |   6 +-
 htdocs/core/boxes/box_bookmarks.php           |   4 +-
 htdocs/core/boxes/box_clients.php             |   6 +-
 htdocs/core/boxes/box_commandes.php           |   4 +-
 htdocs/core/boxes/box_comptes.php             |   4 +-
 htdocs/core/boxes/box_contacts.php            |   4 +-
 htdocs/core/boxes/box_contracts.php           |   6 +-
 htdocs/core/boxes/box_factures.php            |   4 +-
 htdocs/core/boxes/box_factures_fourn.php      |   4 +-
 htdocs/core/boxes/box_factures_fourn_imp.php  |   4 +-
 htdocs/core/boxes/box_factures_imp.php        |   4 +-
 htdocs/core/boxes/box_ficheinter.php          |   6 +-
 htdocs/core/boxes/box_fournisseurs.php        |   4 +-
 htdocs/core/boxes/box_goodcustomers.php       |   8 +-
 .../boxes/box_graph_invoices_permonth.php     |   8 +-
 .../box_graph_invoices_supplier_permonth.php  |   8 +-
 .../core/boxes/box_graph_orders_permonth.php  |   6 +-
 .../box_graph_orders_supplier_permonth.php    |   6 +-
 .../boxes/box_graph_product_distribution.php  |  24 ++--
 .../boxes/box_graph_propales_permonth.php     |   6 +-
 htdocs/core/boxes/box_members.php             |   4 +-
 htdocs/core/boxes/box_produits.php            |   4 +-
 .../core/boxes/box_produits_alerte_stock.php  |   4 +-
 htdocs/core/boxes/box_propales.php            |   4 +-
 htdocs/core/boxes/box_prospect.php            |   4 +-
 htdocs/core/boxes/box_services_contracts.php  |   6 +-
 htdocs/core/boxes/box_services_expired.php    |   8 +-
 htdocs/core/boxes/box_supplier_orders.php     |   4 +-
 htdocs/langs/en_US/admin.lang                 |   4 +-
 htdocs/theme/eldy/style.css.php               |   3 +-
 htdocs/theme/md/style.css.php                 |   2 +-
 39 files changed, 182 insertions(+), 156 deletions(-)

diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index bd539becb86..94682cd502f 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -182,29 +182,29 @@ $formadmin = new FormAdmin($db);
 $wikihelp='EN:Setup|FR:Paramétrage|ES:Configuración';
 llxHeader('',$langs->trans("Setup"),$wikihelp);
 
-print load_fiche_titre($langs->trans("DefaultValues"),'','title_setup');
+$param='&mode='.$mode;
 
-print $langs->trans("DefaultValuesDesc")."<br>\n";
-print "<br>\n";
-
-print $langs->trans("EnableDefaultValues").' ';
+$enabledisablehtml.= $langs->trans("EnableDefaultValues").' ';
 if (empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES))
 {
     // Button off, click to enable
-    print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&amp;value=1">';
-    print img_picto($langs->trans("Disabled"),'switch_off');
-    print '</a>';
+    $enabledisablehtml.= '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&value=1'.$param.'">';
+    $enabledisablehtml.= img_picto($langs->trans("Disabled"),'switch_off');
+    $enabledisablehtml.= '</a>';
 }
 else
 {
     // Button on, click to disable
-    print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&amp;value=0">';
-    print img_picto($langs->trans("Activated"),'switch_on');
-    print '</a>';
+    $enabledisablehtml.= '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&value=0'.$param.'">';
+    $enabledisablehtml.= img_picto($langs->trans("Activated"),'switch_on');
+    $enabledisablehtml.= '</a>';
 }
-print "<br><br>\n";
 
-$param='&mode='.$mode;
+print load_fiche_titre($langs->trans("DefaultValues"), $enabledisablehtml, 'title_setup');
+
+print $langs->trans("DefaultValuesDesc")."<br>\n";
+print "<br>\n";
+
 if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
 if ($optioncss != '')  $param.='&optioncss='.$optioncss;
diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index 4d8dab035ca..dd084894b3d 100644
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -100,7 +100,7 @@ $form=new Form($db);
 print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?action=setvalue">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
-dol_fiche_head($head, 'ldap', $langs->trans("LDAPSetup"));
+dol_fiche_head($head, 'ldap', $langs->trans("LDAPSetup"), -1);
 
 print '<table class="noborder" width="100%">';
 
@@ -127,7 +127,7 @@ print '</td></tr>';
 // Synchro contact active
 if (! empty($conf->societe->enabled))
 {
-	
+
 	print '<tr class="oddeven"><td>'.$langs->trans("LDAPDnContactActive").'</td><td>';
 	$arraylist=array();
 	$arraylist['0']=$langs->trans("No");
@@ -139,7 +139,7 @@ if (! empty($conf->societe->enabled))
 // Synchro member active
 if (! empty($conf->adherent->enabled))
 {
-	
+
 	print '<tr class="oddeven"><td>'.$langs->trans("LDAPDnMemberActive").'</td><td>';
 	$arraylist=array();
 	$arraylist['0']=$langs->trans("No");
diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php
index d5ca994c258..f183c29b5ef 100644
--- a/htdocs/admin/ldap_contacts.php
+++ b/htdocs/admin/ldap_contacts.php
@@ -39,7 +39,7 @@ if (!$user->admin)
   accessforbidden();
 
 $action = GETPOST('action','aZ09');
-  
+
 /*
  * Actions
  */
@@ -49,7 +49,7 @@ if ($action == 'setvalue' && $user->admin)
 	$error=0;
 
 	$db->begin();
-	
+
 	if (! dolibarr_set_const($db, 'LDAP_CONTACT_DN',GETPOST("contactdn"),'chaine',0,'',$conf->entity)) $error++;
 	if (! dolibarr_set_const($db, 'LDAP_CONTACT_OBJECT_CLASS',GETPOST("objectclass"),'chaine',0,'',$conf->entity)) $error++;
 
@@ -73,7 +73,7 @@ if ($action == 'setvalue' && $user->admin)
     $key=GETPOST("key");
     if ($key) $valkey=$conf->global->$key;
     if (! dolibarr_set_const($db, 'LDAP_KEY_CONTACTS',$valkey,'chaine',0,'',$conf->entity)) $error++;
-    
+
     if (! $error)
     {
     	$db->commit();
@@ -107,7 +107,7 @@ if (! function_exists("ldap_connect"))
 	setEventMessages($langs->trans("LDAPFunctionsNotAvailableOnPHP"), null, 'errors');
 }
 
-dol_fiche_head($head, 'contacts', $langs->trans("LDAPSetup"));
+dol_fiche_head($head, 'contacts', $langs->trans("LDAPSetup"), -1);
 
 
 print $langs->trans("LDAPDescContact").'<br>';
diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php
index 3f8869de70f..fc68d815439 100644
--- a/htdocs/admin/ldap_groups.php
+++ b/htdocs/admin/ldap_groups.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2005      Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2006-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2011-2013 Juanjo Menent		<jmenent@2byte.es>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
@@ -38,7 +38,7 @@ $langs->load("errors");
 
 if (!$user->admin)
   accessforbidden();
-  
+
 $action = GETPOST('action','aZ09');
 
 
@@ -50,7 +50,7 @@ if ($action == 'setvalue' && $user->admin)
 {
 	$error=0;
 	$db->begin();
-	
+
 	if (! dolibarr_set_const($db, 'LDAP_GROUP_DN',GETPOST("group"),'chaine',0,'',$conf->entity)) $error++;
 	if (! dolibarr_set_const($db, 'LDAP_GROUP_OBJECT_CLASS',GETPOST("objectclass"),'chaine',0,'',$conf->entity)) $error++;
 
@@ -64,7 +64,7 @@ if ($action == 'setvalue' && $user->admin)
     $key=GETPOST("key");
     if ($key) $valkey=$conf->global->$key;
     if (! dolibarr_set_const($db, 'LDAP_KEY_GROUPS',$valkey,'chaine',0,'',$conf->entity)) $error++;
-    
+
     if (! $error)
     {
     	$db->commit();
@@ -96,7 +96,7 @@ if (! function_exists("ldap_connect"))
 	setEventMessages($langs->trans("LDAPFunctionsNotAvailableOnPHP"), null, 'errors');
 }
 
-dol_fiche_head($head, 'groups', $langs->trans("LDAPSetup"));
+dol_fiche_head($head, 'groups', $langs->trans("LDAPSetup"), -1);
 
 
 print $langs->trans("LDAPDescGroups").'<br>';
diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php
index afbf8da375a..cad37cc4ccc 100644
--- a/htdocs/admin/ldap_members.php
+++ b/htdocs/admin/ldap_members.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2005      Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2006-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2011-2013 Juanjo Menent		<jmenent@2byte.es>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
@@ -50,7 +50,7 @@ if ($action == 'setvalue' && $user->admin)
 	$error=0;
 
 	$db->begin();
-	
+
 	if (! dolibarr_set_const($db, 'LDAP_MEMBER_DN',GETPOST("user"),'chaine',0,'',$conf->entity)) $error++;
 	if (! dolibarr_set_const($db, 'LDAP_MEMBER_OBJECT_CLASS',GETPOST("objectclass"),'chaine',0,'',$conf->entity)) $error++;
 	if (! dolibarr_set_const($db, 'LDAP_MEMBER_FILTER',GETPOST("filterconnection"),'chaine',0,'',$conf->entity)) $error++;
@@ -126,7 +126,7 @@ if (! function_exists("ldap_connect"))
 print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?action=setvalue">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
-dol_fiche_head($head, 'members', $langs->trans("LDAPSetup"));
+dol_fiche_head($head, 'members', $langs->trans("LDAPSetup"), -1);
 
 
 print $langs->trans("LDAPDescMembers").'<br>';
diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php
index 43a6720a448..a0866c1305a 100644
--- a/htdocs/admin/ldap_users.php
+++ b/htdocs/admin/ldap_users.php
@@ -113,7 +113,7 @@ print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?action=setvalue">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
 
-dol_fiche_head($head, 'users', $langs->trans("LDAPSetup"));
+dol_fiche_head($head, 'users', $langs->trans("LDAPSetup"), -1);
 
 print $langs->trans("LDAPDescUsers").'<br>';
 print '<br>';
diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php
index 03b29abc109..eb348869b34 100644
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -187,11 +187,11 @@ if ($result)
 
 
         print '<tr class="oddeven">';
-        print '<td>'
+        print '<td>';
         print img_object('',$picto,'class="pictoobjectwidth"').' '.$objMod->getName();
         print '<a name="'.$objMod->getName().'">&nbsp;</a>';
 		print '</td>';
-		
+
         $perm_libelle=($conf->global->MAIN_USE_ADVANCED_PERMS && ($langs->trans("PermissionAdvanced".$obj->id)!=("PermissionAdvanced".$obj->id))?$langs->trans("PermissionAdvanced".$obj->id):(($langs->trans("Permission".$obj->id)!=("Permission".$obj->id))?$langs->trans("Permission".$obj->id):$obj->libelle));
         print '<td>'.$perm_libelle. '</td>';
 
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 0c4e40948ed..8a6c38ffe46 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -107,7 +107,7 @@ if ($action == 'add' || (GETPOST('add') && $action != 'update'))
 	if (! $error)
 	{
 	    $db->begin();
-	    
+
 	    $sql = "INSERT INTO ".MAIN_DB_PREFIX."overwrite_trans(lang, transkey, transvalue, entity) VALUES ('".$db->escape($langcode)."','".$db->escape($transkey)."','".$db->escape($transvalue)."', ".$db->escape($conf->entity).")";
 		$result = $db->query($sql);
 		if ($result > 0)
@@ -126,7 +126,7 @@ if ($action == 'add' || (GETPOST('add') && $action != 'update'))
 		    {
 		        setEventMessages($langs->trans("WarningAnEntryAlreadyExistForTransKey"), null, 'warnings');
 		    }
-		    else 
+		    else
 		    {
 		        setEventMessages($db->lasterror(), null, 'errors');
 		    }
@@ -164,7 +164,25 @@ $formadmin = new FormAdmin($db);
 $wikihelp='EN:Setup|FR:Paramétrage|ES:Configuración';
 llxHeader('',$langs->trans("Setup"),$wikihelp);
 
-print load_fiche_titre($langs->trans("Translation"),'','title_setup');
+$param='&mode='.$mode;
+
+$enabledisablehtml = $langs->trans("EnableOverwriteTranslation").' ';
+if (empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION))
+{
+    // Button off, click to enable
+    $enabledisablehtml.='<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_OVERWRITE_TRANSLATION&value=1'.$param.'">';
+    $enabledisablehtml.=img_picto($langs->trans("Disabled"),'switch_off');
+    $enabledisablehtml.='</a>';
+}
+else
+{
+    // Button on, click to disable
+    $enabledisablehtml.='<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_OVERWRITE_TRANSLATION&value=0'.$param.'">';
+    $enabledisablehtml.=img_picto($langs->trans("Activated"),'switch_on');
+    $enabledisablehtml.='</a>';
+}
+
+print load_fiche_titre($langs->trans("Translation"), $enabledisablehtml, 'title_setup');
 
 print $langs->trans("TranslationDesc")."<br>\n";
 print "<br>\n";
@@ -175,25 +193,6 @@ print $langs->trans("CurrentUserLanguage").': <strong>'.$s.' '.$current_language
 
 print '<br>';
 
-print $langs->trans("EnableOverwriteTranslation").' ';
-if (empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION))
-{
-    // Button off, click to enable
-    print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_OVERWRITE_TRANSLATION&amp;value=1">';
-    print img_picto($langs->trans("Disabled"),'switch_off');
-    print '</a>';
-}
-else
-{
-    // Button on, click to disable
-    print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_OVERWRITE_TRANSLATION&amp;value=0">';
-    print img_picto($langs->trans("Activated"),'switch_on');
-    print '</a>';
-}
-
-print '<br><br>';
-
-$param='&mode='.$mode;
 if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
 if ($optioncss != '') $param.='&optioncss='.$optioncss;
@@ -225,12 +224,12 @@ if ($mode == 'overwrite')
     print $langs->trans("TranslationOverwriteDesc",$langs->transnoentitiesnoconv("Language"),$langs->transnoentitiesnoconv("Key"),$langs->transnoentitiesnoconv("NewTranslationStringToShow"))."\n";
     print ' ('.$langs->trans("TranslationOverwriteDesc2").').'."<br>\n";
     print '<br>';
-    
-    
+
+
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" id="action" name="action" value="">';
     print '<input type="hidden" id="mode" name="mode" value="'.$mode.'">';
-    
+
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
     print_liste_field_titre($langs->trans("Language").' (en_US, es_MX, ...)',$_SERVER["PHP_SELF"],'lang,transkey','',$param,'',$sortfield,$sortorder);
@@ -239,11 +238,11 @@ if ($mode == 'overwrite')
     //if (! empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre($langs->trans("Entity"),$_SERVER["PHP_SELF"],'entity,transkey','',$param,'',$sortfield,$sortorder);
     print '<td align="center"></td>';
     print "</tr>\n";
-    
-    
+
+
     // Line to add new record
     print "\n";
-    
+
     print '<tr class="oddeven"><td>';
     print $formadmin->select_language(GETPOST('langcode'), 'langcode', 0, null, 1, 0, 0, 'maxwidthonsmartphone', 1);
     print '</td>'."\n";
@@ -270,33 +269,33 @@ if ($mode == 'overwrite')
     print '<input type="submit" class="button"'.$disabled.' value="'.$langs->trans("Add").'" name="add">';
     print "</td>\n";
     print '</tr>';
-    
-    
+
+
     // Show constants
     $sql = "SELECT rowid, entity, lang, transkey, transvalue";
     $sql.= " FROM ".MAIN_DB_PREFIX."overwrite_trans";
     $sql.= " WHERE 1 = 1";
     //$sql.= " AND entity IN (".$user->entity.",".$conf->entity.")";
     $sql.= $db->order($sortfield, $sortorder);
-    
+
     dol_syslog("translation::select from table", LOG_DEBUG);
     $result = $db->query($sql);
     if ($result)
     {
     	$num = $db->num_rows($result);
     	$i = 0;
-    
+
     	while ($i < $num)
     	{
     		$obj = $db->fetch_object($result);
-    
+
     		print "\n";
-    
+
     		print '<tr class="oddeven">';
-    		
+
     		print '<td>'.$obj->lang.'</td>'."\n";
     		print '<td>'.$obj->transkey.'</td>'."\n";
-    
+
     		// Value
     		print '<td>';
     		/*print '<input type="hidden" name="const['.$i.'][rowid]" value="'.$obj->rowid.'">';
@@ -306,18 +305,18 @@ if ($mode == 'overwrite')
     		*/
     		print $obj->transvalue;
     		print '</td>';
-    
+
     		print '<td align="center">';
     		print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&action=delete'.((empty($user->entity) && $debug)?'&debug=1':'').'">'.img_delete().'</a>';
     		print '</td>';
-    		
+
     		print "</tr>\n";
     		print "\n";
     		$i++;
     	}
     }
-    
-    
+
+
     print '</table>';
 
 }
@@ -325,15 +324,15 @@ if ($mode == 'overwrite')
 if ($mode == 'searchkey')
 {
     $langcode=GETPOST('langcode')?GETPOST('langcode'):$langs->defaultlang;
-    
+
     $newlang=new Translate('',$conf);
     $newlang->setDefaultLang($langcode);
 
     $newlangfileonly=new Translate('',$conf);
     $newlangfileonly->setDefaultLang($langcode);
-    
+
     $recordtoshow=array();
-    
+
     $nbempty=0;
     /*var_dump($langcode);
      var_dump($transkey);
@@ -353,9 +352,9 @@ if ($mode == 'searchkey')
             // Directory of translation files
             $dir_lang = $searchdir."/langs/".$langcode;
             $dir_lang_osencoded=dol_osencode($dir_lang);
-    
+
             $filearray=dol_dir_list($dir_lang_osencoded,'files',0,'','',$sortfield,(strtolower($sortorder)=='asc'?SORT_ASC:SORT_DESC),1);
-    
+
             foreach($filearray as $file)
             {
                 $tmpfile=preg_replace('/.lang/i', '', basename($file['name']));
@@ -364,7 +363,7 @@ if ($mode == 'searchkey')
                 //print 'After loading lang '.$tmpfile.', newlang has '.count($newlang->tab_translate).' records<br>'."\n";
             }
         }
-    
+
         // Now search into translation array
         foreach($newlang->tab_translate as $key => $val)
         {
@@ -373,13 +372,13 @@ if ($mode == 'searchkey')
             $recordtoshow[$key]=$val;
         }
     }
-    
+
     //print '<br>';
     $nbtotalofrecordswithoutfilters = count($newlang->tab_translate);
     $nbtotalofrecords = count($recordtoshow);
     $num = $limit + 1;
     if (($offset + $num) > $nbtotalofrecords) $num = $limit;
-    
+
     //print 'param='.$param.' $_SERVER["PHP_SELF"]='.$_SERVER["PHP_SELF"].' num='.$num.' page='.$page.' nbtotalofrecords='.$nbtotalofrecords." sortfield=".$sortfield." sortorder=".$sortorder;
     $title = $langs->trans("TranslationKeySearch");
     if ($nbtotalofrecords > 0) $title.=' ('.$nbtotalofrecords.' / '.$nbtotalofrecordswithoutfilters.')';
@@ -419,19 +418,19 @@ if ($mode == 'searchkey')
     {*/
         print '<input type="hidden" name="entitysearch" value="'.$conf->entity.'">';
     //}
-    print '</td>';    
+    print '</td>';
     // Action column
     print '<td class="liste_titre nowrap" align="right">';
     $searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
     print $searchpicto;
     print '</td>';
     print '</tr>';
-    
+
     if ($sortfield == 'transkey' && strtolower($sortorder) == 'asc') ksort($recordtoshow);
     if ($sortfield == 'transkey' && strtolower($sortorder) == 'desc') krsort($recordtoshow);
     if ($sortfield == 'transvalue' && strtolower($sortorder) == 'asc') asort($recordtoshow);
     if ($sortfield == 'transvalue' && strtolower($sortorder) == 'desc') arsort($recordtoshow);
-    
+
     // Show result
     $i=0;
     foreach($recordtoshow as $key => $val)
@@ -444,7 +443,7 @@ if ($mode == 'searchkey')
         print '</td><td align="right">';
         if (! empty($newlangfileonly->tab_translate[$key]))
         {
-            if ($val != $newlangfileonly->tab_translate[$key]) 
+            if ($val != $newlangfileonly->tab_translate[$key])
             {
                 $htmltext = $langs->trans("OriginalValueWas", $newlangfileonly->tab_translate[$key]);
                 print $form->textwithpicto('', $htmltext, 1, 'info');
diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php
index e856d52c2b6..0ce87a92c61 100644
--- a/htdocs/core/boxes/box_actions.php
+++ b/htdocs/core/boxes/box_actions.php
@@ -156,8 +156,8 @@ class box_actions extends ModeleBoxes
             }
         } else {
             $this->info_box_contents[0][0] = array(
-                'align' => 'left',
-                'text' => $langs->trans("ReadPermissionNotAllowed"),
+                'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
             );
 		}
 	}
@@ -191,7 +191,7 @@ class box_actions extends ModeleBoxes
 						// on affiche que les évènement du jours ou passé
 						// qui ne sont pas à 100%
 						$actioncejour=true;
-						
+
 						// TR
 						$logo=$contents[$line][0]['logo'];
 						$label=$contents[$line][1]['text'];
diff --git a/htdocs/core/boxes/box_bookmarks.php b/htdocs/core/boxes/box_bookmarks.php
index b6df56f52a2..653922c4cd2 100644
--- a/htdocs/core/boxes/box_bookmarks.php
+++ b/htdocs/core/boxes/box_bookmarks.php
@@ -124,8 +124,8 @@ class box_bookmarks extends ModeleBoxes
             }
         } else {
             $this->info_box_contents[0][0] = array(
-                'align' => 'left',
-                'text' => $langs->trans("ReadPermissionNotAllowed"),
+                'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
             );
         }
     }
diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php
index 51e4a22d756..5e6f50f5b88 100644
--- a/htdocs/core/boxes/box_clients.php
+++ b/htdocs/core/boxes/box_clients.php
@@ -146,8 +146,10 @@ class box_clients extends ModeleBoxes
 			}
 		}
 		else {
-			$this->info_box_contents[0][0] = array('align' => 'left',
-            'text' => $langs->trans("ReadPermissionNotAllowed"));
+			$this->info_box_contents[0][0] = array(
+			    'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
 		}
 
 	}
diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php
index be9a868109d..c7c6bbb92d3 100644
--- a/htdocs/core/boxes/box_commandes.php
+++ b/htdocs/core/boxes/box_commandes.php
@@ -165,8 +165,8 @@ class box_commandes extends ModeleBoxes
             }
         } else {
             $this->info_box_contents[0][0] = array(
-                'align' => 'left',
-                'text' => $langs->trans("ReadPermissionNotAllowed"),
+                'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
             );
         }
     }
diff --git a/htdocs/core/boxes/box_comptes.php b/htdocs/core/boxes/box_comptes.php
index 2372a31f035..7d08a643f87 100644
--- a/htdocs/core/boxes/box_comptes.php
+++ b/htdocs/core/boxes/box_comptes.php
@@ -158,8 +158,8 @@ class box_comptes extends ModeleBoxes
             }
         } else {
             $this->info_box_contents[0][0] = array(
-                'td' => '',
-                'text' => $langs->trans("ReadPermissionNotAllowed"),
+                'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
             );
         }
 
diff --git a/htdocs/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php
index c6aaf1ec24a..63b617ffe62 100644
--- a/htdocs/core/boxes/box_contacts.php
+++ b/htdocs/core/boxes/box_contacts.php
@@ -151,8 +151,8 @@ class box_contacts extends ModeleBoxes
             }
         } else {
             $this->info_box_contents[0][0] = array(
-                'align' => 'left',
-                'text' => $langs->trans("ReadPermissionNotAllowed"),
+                'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
             );
         }
 
diff --git a/htdocs/core/boxes/box_contracts.php b/htdocs/core/boxes/box_contracts.php
index 7585c5d931c..197425b9a51 100644
--- a/htdocs/core/boxes/box_contracts.php
+++ b/htdocs/core/boxes/box_contracts.php
@@ -134,7 +134,7 @@ class box_contracts extends ModeleBoxes
 
                 if ($num==0)
                     $this->info_box_contents[$line][0] = array(
-                        'td' => 'align="center"',
+                        'td' => 'align="center opacitymedium"',
                         'text'=>$langs->trans("NoRecordedContracts"),
                     );
 
@@ -148,8 +148,8 @@ class box_contracts extends ModeleBoxes
             }
         } else {
             $this->info_box_contents[0][0] = array(
-                'td' => '',
-                'text' => $langs->trans("ReadPermissionNotAllowed"),
+                'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
             );
         }
     }
diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php
index b7c9dfa0e91..cf1d70531b3 100644
--- a/htdocs/core/boxes/box_factures.php
+++ b/htdocs/core/boxes/box_factures.php
@@ -169,8 +169,8 @@ class box_factures extends ModeleBoxes
 
         } else {
             $this->info_box_contents[0][0] = array(
-                'td' => '',
-                'text' => $langs->trans("ReadPermissionNotAllowed"),
+                'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
             );
         }
     }
diff --git a/htdocs/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php
index 4f88d99bb09..9869901c7ab 100644
--- a/htdocs/core/boxes/box_factures_fourn.php
+++ b/htdocs/core/boxes/box_factures_fourn.php
@@ -178,8 +178,8 @@ class box_factures_fourn extends ModeleBoxes
             }
         } else {
             $this->info_box_contents[0][0] = array(
-                'td' => '',
-                'text' => $langs->transnoentities("ReadPermissionNotAllowed"),
+                'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->transnoentities("ReadPermissionNotAllowed")
             );
         }
     }
diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php
index 3313b4cbd50..11361b0aa44 100644
--- a/htdocs/core/boxes/box_factures_fourn_imp.php
+++ b/htdocs/core/boxes/box_factures_fourn_imp.php
@@ -168,8 +168,8 @@ class box_factures_fourn_imp extends ModeleBoxes
             }
         } else {
             $this->info_box_contents[0][0] = array(
-                'td' => '',
-                'text' => $langs->trans("ReadPermissionNotAllowed"),
+                'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
             );
         }
 
diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php
index 14a21d9712d..bba23671c47 100644
--- a/htdocs/core/boxes/box_factures_imp.php
+++ b/htdocs/core/boxes/box_factures_imp.php
@@ -172,8 +172,8 @@ class box_factures_imp extends ModeleBoxes
 		}
 		else {
             $this->info_box_contents[0][0] = array(
-                'td' => '',
-                'text' => $langs->trans("ReadPermissionNotAllowed"),
+                'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
             );
 		}
 	}
diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php
index 9fcd8ec6cd7..a76715c9474 100644
--- a/htdocs/core/boxes/box_ficheinter.php
+++ b/htdocs/core/boxes/box_ficheinter.php
@@ -134,8 +134,10 @@ class box_ficheinter extends ModeleBoxes
 		}
 		else
 		{
-			$this->info_box_contents[0][0] = array('td' => '',
-			'text' => $langs->trans("ReadPermissionNotAllowed"));
+			$this->info_box_contents[0][0] = array(
+			    'td' => 'align="left" class="nohover opacitymedium"',
+			    'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
 		}
 	}
 
diff --git a/htdocs/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php
index 530a99c8224..6e11c67c51f 100644
--- a/htdocs/core/boxes/box_fournisseurs.php
+++ b/htdocs/core/boxes/box_fournisseurs.php
@@ -127,8 +127,8 @@ class box_fournisseurs extends ModeleBoxes
             }
         } else {
             $this->info_box_contents[0][0] = array(
-                'td' => '',
-                'text' => $langs->trans("ReadPermissionNotAllowed"),
+                'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
             );
         }
 
diff --git a/htdocs/core/boxes/box_goodcustomers.php b/htdocs/core/boxes/box_goodcustomers.php
index 6c19b46e468..8a7681fb2b2 100644
--- a/htdocs/core/boxes/box_goodcustomers.php
+++ b/htdocs/core/boxes/box_goodcustomers.php
@@ -59,7 +59,7 @@ class box_goodcustomers extends ModeleBoxes
 
 		// disable box for such cases
 		if (! empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $this->enabled=0;	// disabled by this option
-		if (empty($conf->global->MAIN_BOX_ENABLE_BEST_CUSTOMERS)) $this->enabled=0; // not enabled by default. Very slow on large database 
+		if (empty($conf->global->MAIN_BOX_ENABLE_BEST_CUSTOMERS)) $this->enabled=0; // not enabled by default. Very slow on large database
 	}
 
 	/**
@@ -148,8 +148,10 @@ class box_goodcustomers extends ModeleBoxes
 			}
 		}
 		else {
-			$this->info_box_contents[0][0] = array('align' => 'left',
-				'text' => $langs->trans("ReadPermissionNotAllowed"));
+			$this->info_box_contents[0][0] = array(
+			    'td' => 'align="left" class="nohover opacitymedium"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
 		}
 
 	}
diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php
index 8d8fea71411..1b90aae701a 100644
--- a/htdocs/core/boxes/box_graph_invoices_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_permonth.php
@@ -133,7 +133,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 				if (! $mesg)
 				{
 				    $langs->load("bills");
-				    
+
 				    $px1->SetData($data1);
 					unset($data1);
 					$px1->SetPrecisionY(0);
@@ -255,8 +255,10 @@ class box_graph_invoices_permonth extends ModeleBoxes
 
 		}
 		else {
-			$this->info_box_contents[0][0] = array('td' => '',
-            'text' => $langs->trans("ReadPermissionNotAllowed"));
+			$this->info_box_contents[0][0] = array(
+			    'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
 		}
 	}
 
diff --git a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
index e7ece7a2a53..55866288ef2 100644
--- a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
@@ -132,7 +132,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 				if (! $mesg)
 				{
 				    $langs->load("bills");
-				    
+
 				    $px1->SetData($data1);
 					unset($data1);
 					$px1->SetPrecisionY(0);
@@ -254,8 +254,10 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 
 		}
 		else {
-			$this->info_box_contents[0][0] = array('td' => '',
-            'text' => $langs->trans("ReadPermissionNotAllowed"));
+			$this->info_box_contents[0][0] = array(
+			    'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
 		}
 	}
 
diff --git a/htdocs/core/boxes/box_graph_orders_permonth.php b/htdocs/core/boxes/box_graph_orders_permonth.php
index ec45cc3dde7..fcc98d368f5 100644
--- a/htdocs/core/boxes/box_graph_orders_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_permonth.php
@@ -253,8 +253,10 @@ class box_graph_orders_permonth extends ModeleBoxes
 
 		}
 		else {
-			$this->info_box_contents[0][0] = array('td' => '',
-            'text' => $langs->trans("ReadPermissionNotAllowed"));
+			$this->info_box_contents[0][0] = array(
+			    'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
 		}
 	}
 
diff --git a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
index 28335c79b62..b259cf48604 100644
--- a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
@@ -252,8 +252,10 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 
 		}
 		else {
-			$this->info_box_contents[0][0] = array('td' => '',
-            'text' => $langs->trans("ReadPermissionNotAllowed"));
+			$this->info_box_contents[0][0] = array(
+			    'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
 		}
 	}
 
diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php
index 44d5d0b0c15..6c178e0c989 100644
--- a/htdocs/core/boxes/box_graph_product_distribution.php
+++ b/htdocs/core/boxes/box_graph_product_distribution.php
@@ -99,6 +99,10 @@ class box_graph_product_distribution extends ModeleBoxes
 		$nowarray=dol_getdate(dol_now(),true);
 		if (empty($year)) $year=$nowarray['year'];
 
+		$nbofgraph=0;
+		if ($showinvoicenb) $nbofgraph++;
+		if ($showpropalnb)  $nbofgraph++;
+		if ($showordernb)   $nbofgraph++;
 
 		$text = $langs->trans("BoxProductDistribution",$max).' - '.$langs->trans("Year").': '.$year;
 		$this->info_box_head = array(
@@ -113,11 +117,6 @@ class box_graph_product_distribution extends ModeleBoxes
 		);
 
 
-		$nbofgraph=0;
-		if ($showinvoicenb) $nbofgraph++;
-		if ($showpropalnb)  $nbofgraph++;
-		if ($showordernb)   $nbofgraph++;
-
 		$paramtitle=$langs->transnoentitiesnoconv("Products").'/'.$langs->transnoentitiesnoconv("Services");
 		if (empty($conf->produit->enabled)) $paramtitle=$langs->transnoentitiesnoconv("Services");
 		if (empty($conf->service->enabled)) $paramtitle=$langs->transnoentitiesnoconv("Products");
@@ -250,7 +249,7 @@ class box_graph_product_distribution extends ModeleBoxes
 		if (! empty($conf->commande->enabled) && ! empty($user->rights->commande->lire))
 		{
 			$langs->load("orders");
-			
+
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($showordernb)
 			{
@@ -309,6 +308,11 @@ class box_graph_product_distribution extends ModeleBoxes
 			}
 		}
 
+		if (empty($nbofgraph))
+		{
+		    $langs->load("errors");
+		    $mesg=$langs->trans("ReadPermissionNotAllowed");
+		}
 		if (empty($conf->use_javascript_ajax))
 		{
 			$langs->load("errors");
@@ -380,9 +384,11 @@ class box_graph_product_distribution extends ModeleBoxes
 		}
 		else
 		{
-			$this->info_box_contents[0][0] = array(	'td' => 'align="left" class="nohover"',
-					'maxlength'=>500,
-					'text' => $mesg);
+			$this->info_box_contents[0][0] = array(
+			    'td' => 'align="left" class="nohover opacitymedium"',
+				'maxlength'=>500,
+				'text' => $mesg
+			);
 		}
 
 	}
diff --git a/htdocs/core/boxes/box_graph_propales_permonth.php b/htdocs/core/boxes/box_graph_propales_permonth.php
index ccce8372d1f..0ad485a115d 100644
--- a/htdocs/core/boxes/box_graph_propales_permonth.php
+++ b/htdocs/core/boxes/box_graph_propales_permonth.php
@@ -254,8 +254,10 @@ class box_graph_propales_permonth extends ModeleBoxes
 
 		}
 		else {
-			$this->info_box_contents[0][0] = array('td' => '',
-            'text' => $langs->trans("ReadPermissionNotAllowed"));
+			$this->info_box_contents[0][0] = array(
+			    'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
 		}
 	}
 
diff --git a/htdocs/core/boxes/box_members.php b/htdocs/core/boxes/box_members.php
index 1bbcec45881..03780eb366d 100644
--- a/htdocs/core/boxes/box_members.php
+++ b/htdocs/core/boxes/box_members.php
@@ -157,8 +157,8 @@ class box_members extends ModeleBoxes
             }
         } else {
             $this->info_box_contents[0][0] = array(
-                'align' => 'left',
-                'text' => $langs->trans("ReadPermissionNotAllowed"),
+                'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
             );
         }
 
diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index 761fb6013b8..b0c47422806 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -188,8 +188,8 @@ class box_produits extends ModeleBoxes
             }
         } else {
             $this->info_box_contents[0][0] = array(
-                'td' => '',
-                'text' => $langs->trans("ReadPermissionNotAllowed"),
+                'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
             );
         }
     }
diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
index 69652fde11e..2f323fc5c4b 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -195,8 +195,8 @@ class box_produits_alerte_stock extends ModeleBoxes
 		}
 		else {
             $this->info_box_contents[0][0] = array(
-                'td' => '',
-                'text' => $langs->trans("ReadPermissionNotAllowed"),
+                'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
             );
 		}
 	}
diff --git a/htdocs/core/boxes/box_propales.php b/htdocs/core/boxes/box_propales.php
index 3f7b37f186a..60bc627005a 100644
--- a/htdocs/core/boxes/box_propales.php
+++ b/htdocs/core/boxes/box_propales.php
@@ -155,8 +155,8 @@ class box_propales extends ModeleBoxes
             }
         } else {
             $this->info_box_contents[0][0] = array(
-                'td' => '',
-                'text' => $langs->trans("ReadPermissionNotAllowed"),
+                'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
             );
         }
     }
diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php
index abc99246c4a..7d735136326 100644
--- a/htdocs/core/boxes/box_prospect.php
+++ b/htdocs/core/boxes/box_prospect.php
@@ -156,8 +156,8 @@ class box_prospect extends ModeleBoxes
             }
         } else {
             $this->info_box_contents[0][0] = array(
-                'td' => '',
-                'text' => $langs->trans("ReadPermissionNotAllowed"),
+                'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
             );
 		}
 	}
diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php
index 0151ba24966..b1793a6ca41 100644
--- a/htdocs/core/boxes/box_services_contracts.php
+++ b/htdocs/core/boxes/box_services_contracts.php
@@ -161,8 +161,10 @@ class box_services_contracts extends ModeleBoxes
 			}
 		}
 		else {
-			$this->info_box_contents[0][0] = array('td' => '',
-            'text' => $langs->trans("ReadPermissionNotAllowed"));
+			$this->info_box_contents[0][0] = array(
+			    'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
 		}
 
 	}
diff --git a/htdocs/core/boxes/box_services_expired.php b/htdocs/core/boxes/box_services_expired.php
index 2754a4cece6..da1d42af408 100644
--- a/htdocs/core/boxes/box_services_expired.php
+++ b/htdocs/core/boxes/box_services_expired.php
@@ -84,7 +84,7 @@ class box_services_expired extends ModeleBoxes
     			$i = 0;
 
     			$thirdpartytmp = new Societe($this->db);
-    			
+
     			while ($i < $num)
     			{
     			    $late='';
@@ -140,8 +140,10 @@ class box_services_expired extends ModeleBoxes
     	}
     	else
     	{
-    		$this->info_box_contents[0][0] = array('td' => '',
-    		'text' => $langs->trans("ReadPermissionNotAllowed"));
+    		$this->info_box_contents[0][0] = array(
+    		    'td' => 'align="left" class="nohover opacitymedium"',
+    		    'text' => $langs->trans("ReadPermissionNotAllowed")
+    		);
     	}
     }
 
diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php
index 29b6009b367..83a34c2c0e5 100644
--- a/htdocs/core/boxes/box_supplier_orders.php
+++ b/htdocs/core/boxes/box_supplier_orders.php
@@ -160,8 +160,8 @@ class box_supplier_orders extends ModeleBoxes
         else
         {
             $this->info_box_contents[0][0] = array(
-                'td' => '',
-                'text' => $langs->trans("ReadPermissionNotAllowed"),
+                'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
             );
         }
     }
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 03af3ddfe88..421b3fae132 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -191,7 +191,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after enabling module. Click on button on/off to enable an application/module.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -1107,7 +1107,7 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists in any language files
-TotalNumberOfActivatedModules=Activated feature/modules: <b>%s</b> / <b>%s</b>
+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
 YesInSummer=Yes in summer
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 3b2ba307bbd..777121e2acb 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2245,7 +2245,8 @@ div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border
 }
 div .tdtop {
     vertical-align: top !important;
-	padding-top: 5px !important;
+	padding-top: 8px !important;
+	padding-bottom: 2px !important;
 	padding-bottom: 0px;
 }
 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 927830da51d..e1a286d5d7a 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2820,7 +2820,7 @@ div.tabBar .noborder {
 div .tdtop {
     vertical-align: top !important;
 	padding-top: 5px !important;
-	padding-bottom: 0px;
+	padding-bottom: 0px !important;
 }
 
 #tablelines tr.liste_titre td, .paymenttable tr.liste_titre td, .margintable tr.liste_titre td, .tableforservicepart1 tr.liste_titre td {

From 605dbd61f265aa78f5f055a090d973f0cf16943c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 00:21:04 +0200
Subject: [PATCH 131/438] Fix phpunit

---
 test/phpunit/AdherentTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/phpunit/AdherentTest.php b/test/phpunit/AdherentTest.php
index 5db9808c9ab..34ec0a80917 100644
--- a/test/phpunit/AdherentTest.php
+++ b/test/phpunit/AdherentTest.php
@@ -79,13 +79,13 @@ class AdherentTest extends PHPUnit_Framework_TestCase
         global $conf,$user,$langs,$db;
         $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
-        if (! empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)) { 
+        if (! empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)) {
             print "\n".__METHOD__." Company must be setup to have name-firstname in order 'Firstname Lastname'\n";
             die();
         }
         if (! empty($conf->global->MAIN_MODULE_LDAP)) { print "\n".__METHOD__." module LDAP must be disabled.\n"; die(); }
         if (! empty($conf->global->MAIN_MODULE_MAILMANSPIP)) { print "\n".__METHOD__." module MailmanSpip must be disabled.\n"; die(); }
-        
+
         print __METHOD__."\n";
     }
 
@@ -532,7 +532,7 @@ class AdherentTest extends PHPUnit_Framework_TestCase
         $langs=$this->savlangs;
         $db=$this->savdb;
 
-        $result=$localobject->delete($localobject->id);
+        $result=$localobject->delete($localobject->id, $user);
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertLessThan($result, 0);
 

From 9a30e8edc6d6ac718d4c08b0b228b0f06fe6ca09 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 00:22:12 +0200
Subject: [PATCH 132/438] Update changelog

---
 ChangeLog | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a7bbaf440ae..5b4f986fbb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,8 +6,8 @@ English Dolibarr ChangeLog
 
 For developers:
 NEW: Add a lot of API REST: dictionaryevents, memberstypes, ...
-NEW: Big refactorization of multicompany transverse mode
-NEW: getEntity function use true $shared value by default
+NEW: Big refactorization of multicompany transverse mode.
+NEW: getEntity function use true $shared value by default.
 
 WARNING: 
 
@@ -17,7 +17,9 @@ Following changes may create regression for some external modules, but were nece
 * The page societe/soc.php was renamed into societe/card.php to match page naming conventions.
 * The page compta/facture.php was renamed into compta/facture/card.php to match page naming conventions.
 * The signature of method ->delete() of class Product and PriceExpression was changed from 
-  ->delete($id, notrigger) to ->delete(User, notrigger) to match standard dev rules.
+  ->delete(id, notrigger) to ->delete(User, notrigger) to match standard dev rules.
+* The signature of method ->delete() of class Adherent was changed from 
+  ->delete(id) to ->delete(id, User, notrigger) to match standard dev rules.
 * Removed CommonObject::displayMarginInfos (was deprecated in 3.8). Use same method into
   html.formmargin.class.php
 * Removed Societe::set_commnucation_level (was deprecated in 4.0). Was not used.

From 87c8659e72a0ae22e083b1170414b443f71a8561 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 00:45:18 +0200
Subject: [PATCH 133/438] Fix responsive

---
 htdocs/core/lib/functions.lib.php | 6 ++++--
 htdocs/theme/eldy/style.css.php   | 1 +
 htdocs/theme/md/style.css.php     | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 7d3cfac1c41..6f73d504d11 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1226,11 +1226,13 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
                             if ($ret < 0) $error++;
                         }
 
+                        $heightforphotref=70;
+                        if (! empty($conf->dol_optimize_smallscreen)) $heightforphotref=60;
                         // Si fichier png PDF d'1 page trouve
                         if (file_exists($fileimage))
                         {
                             $phototoshow = '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';
-                            $phototoshow.= '<img height="70" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';
+                            $phototoshow.= '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';
                             $phototoshow.= '</div></div>';
                         }
                         // Si fichier png PDF de plus d'1 page trouve
@@ -1238,7 +1240,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
                         {
                             $preview = preg_replace('/\.png/','',$relativepathimage) . "-0.png";
                             $phototoshow = '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';
-                            $phototoshow.= '<img height="70" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($preview).'"><p>';
+                            $phototoshow.= '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($preview).'"><p>';
                             $phototoshow.= '</div></div>';
                         }
                     }
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 777121e2acb..4fd7120a771 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -857,6 +857,7 @@ div.fiche>form>div.div-table-responsive {
 
 	div.divphotoref {
 		padding-right: 5px;
+	    padding-bottom: 5px;
 	}
     img.photoref, div.photoref {
     	border: none;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index e1a286d5d7a..dc61977cf5f 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -858,6 +858,7 @@ div.fiche>form>div.div-table-responsive {
 
 	div.divphotoref {
 		padding-right: 5px;
+	    padding-bottom: 5px;
 	}
     img.photoref, div.photoref {
     	border: none;

From 9e33baf0d62dc249b801074e81b051e06a1ccfca Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 01:09:11 +0200
Subject: [PATCH 134/438] Prepare package for 6.0beta

---
 .tx/config                       | 4 ++--
 build/makepack-dolibarr.pl       | 2 +-
 build/rpm/dolibarr_fedora.spec   | 2 ++
 build/rpm/dolibarr_generic.spec  | 2 ++
 build/rpm/dolibarr_mandriva.spec | 2 ++
 build/rpm/dolibarr_opensuse.spec | 2 ++
 6 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.tx/config b/.tx/config
index 1839523f114..89d123b0362 100644
--- a/.tx/config
+++ b/.tx/config
@@ -224,13 +224,13 @@ source_file = htdocs/langs/en_US/members.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.members]
+[dolibarr.modulebuilder]
 file_filter = htdocs/langs/<lang>/modulebuilder.lang
 source_file = htdocs/langs/en_US/modulebuilder.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.members]
+[dolibarr.multicurrency]
 file_filter = htdocs/langs/<lang>/multicurrency.lang
 source_file = htdocs/langs/en_US/multicurrency.lang
 source_lang = en_US
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index b47ae023129..e908fb20d0a 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -591,7 +591,7 @@ if ($nboftargetok) {
         
         print "Remove subdir of custom dir\n";
    	    print "find $BUILDROOT/$PROJECT/htdocs/custom/* -type d -exec rm -fr {} \\;\n";
-   	    $ret=`find $BUILDROOT/$PROJECT/htdocs/custom/* -type d -exec rm -fr {} \\; >/dev/null 2>&1`;	# For custom we want to keep dir
+   	    $ret=`find $BUILDROOT/$PROJECT/htdocs/custom/* -type d -exec rm -fr {} \\; >/dev/null 2>&1`;	# For custom we want to remove all subdirs but not files
 	}
 
 	# Build package for each target
diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec
index a0f981b8c11..33dc951309d 100755
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -194,6 +194,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/loan
 %_datadir/dolibarr/htdocs/mailmanspip
 %_datadir/dolibarr/htdocs/margin
+%_datadir/dolibarr/htdocs/modulebuilder
 %_datadir/dolibarr/htdocs/multicurrency
 %_datadir/dolibarr/htdocs/opensurvey
 %_datadir/dolibarr/htdocs/paybox
@@ -209,6 +210,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
 %_datadir/dolibarr/htdocs/user
+%_datadir/dolibarr/htdocs/variants
 %_datadir/dolibarr/htdocs/webservices
 %_datadir/dolibarr/htdocs/websites
 %_datadir/dolibarr/htdocs/*.ico
diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec
index 446e0e0d5f7..42a89675abf 100755
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -274,6 +274,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/loan
 %_datadir/dolibarr/htdocs/mailmanspip
 %_datadir/dolibarr/htdocs/margin
+%_datadir/dolibarr/htdocs/modulebuilder
 %_datadir/dolibarr/htdocs/multicurrency
 %_datadir/dolibarr/htdocs/opensurvey
 %_datadir/dolibarr/htdocs/paybox
@@ -289,6 +290,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
 %_datadir/dolibarr/htdocs/user
+%_datadir/dolibarr/htdocs/variants
 %_datadir/dolibarr/htdocs/webservices
 %_datadir/dolibarr/htdocs/websites
 %_datadir/dolibarr/htdocs/*.ico
diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec
index 1fb1b7fcc75..9dd2100b02c 100755
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -190,6 +190,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/loan
 %_datadir/dolibarr/htdocs/mailmanspip
 %_datadir/dolibarr/htdocs/margin
+%_datadir/dolibarr/htdocs/modulebuilder
 %_datadir/dolibarr/htdocs/multicurrency
 %_datadir/dolibarr/htdocs/opensurvey
 %_datadir/dolibarr/htdocs/paybox
@@ -205,6 +206,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
 %_datadir/dolibarr/htdocs/user
+%_datadir/dolibarr/htdocs/variants
 %_datadir/dolibarr/htdocs/webservices
 %_datadir/dolibarr/htdocs/websites
 %_datadir/dolibarr/htdocs/*.ico
diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec
index 1bb7ef061e6..d780c47da99 100755
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -202,6 +202,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/loan
 %_datadir/dolibarr/htdocs/mailmanspip
 %_datadir/dolibarr/htdocs/margin
+%_datadir/dolibarr/htdocs/modulebuilder
 %_datadir/dolibarr/htdocs/multicurrency
 %_datadir/dolibarr/htdocs/opensurvey
 %_datadir/dolibarr/htdocs/paybox
@@ -217,6 +218,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
 %_datadir/dolibarr/htdocs/user
+%_datadir/dolibarr/htdocs/variants
 %_datadir/dolibarr/htdocs/webservices
 %_datadir/dolibarr/htdocs/websites
 %_datadir/dolibarr/htdocs/*.ico

From 2a6c21bd038e6c95e2b1ff4c39f7281210f54ea7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 01:13:26 +0200
Subject: [PATCH 135/438] Fix permissions on script file

---
 htdocs/modulebuilder/template/scripts/myobject.php | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 htdocs/modulebuilder/template/scripts/myobject.php

diff --git a/htdocs/modulebuilder/template/scripts/myobject.php b/htdocs/modulebuilder/template/scripts/myobject.php
old mode 100644
new mode 100755

From 660faac0f3a6c5a9e330be76374299a0851cab97 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 01:17:48 +0200
Subject: [PATCH 136/438] Prepare package 6.0

---
 build/generate_filelist_xml.php | 10 +++++-----
 build/makepack-dolibarr.pl      | 13 ++++++-------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/build/generate_filelist_xml.php b/build/generate_filelist_xml.php
index c1a56beacd7..94df2206579 100755
--- a/build/generate_filelist_xml.php
+++ b/build/generate_filelist_xml.php
@@ -43,7 +43,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 $includecustom=0;
 $includeconstants=array();
 
-if (empty($argv[1])) 
+if (empty($argv[1]))
 {
     print "Usage:   ".$script_file." release=x.y.z[-...] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
     print "Example: ".$script_file." release=6.0.0 includecustom=1 includeconstant=FR:INVOICE_CAN_ALWAYS_BE_REMOVED:0 includeconstant=all:MAILING_NO_USING_PHPMAIL:1\n";
@@ -56,7 +56,7 @@ while ($i < $argc)
     if (preg_match('/includeconstant=/',$argv[$i]))
     {
         $tmp=explode(':', $includeconstant, 3);
-        if (count($tmp) != 3) 
+        if (count($tmp) != 3)
         {
             print "Error: Bad parameter includeconstant ".$includeconstant."\n";
             exit -1;
@@ -85,9 +85,9 @@ else
     }
 }
 
-print "Release          : ".$release."\n";
-print "Include custom   : ".$includecustom."\n";
-print "Include constants: ";
+print "Release                        : ".$release."\n";
+print "Include custom in signature    : ".$includecustom."\n";
+print "Include constants in signature : ";
 foreach ($includeconstants as $countrycode => $tmp)
 {
     foreach($tmp as $constname => $constvalue)
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index e908fb20d0a..9ded8399ccc 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -972,13 +972,12 @@ if ($nboftargetok) {
 			$ret=`$cmd`;
 			$ret=`chmod 755 $BUILDROOT/$PROJECT.tmp/debian/rules`;
 			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/translation/autotranslator.class.php`;
-			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/modMyModule.class.php`;
-			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_api_class.class.php`;
-			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_card.php`;
-			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_class.class.php`;
-			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_list.php`;
-			$ret=`chmod -R 755 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_script.php`;
-			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_webservice_server.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/class/myobject_class.class.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/class/myobject_api_class.class.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/core/modules/modMyModule.class.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/myobject_card.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/myobject_list.php`;
+			$ret=`chmod -R 755 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/scripts/myobject.php`;
 			$cmd="find $BUILDROOT/$PROJECT.tmp/scripts -name '*.php' -type f -exec chmod 755 {} \\; ";
 			$ret=`$cmd`;
 			$cmd="find $BUILDROOT/$PROJECT.tmp/scripts -name '*.sh' -type f -exec chmod 755 {} \\; ";

From 4cf862f03375a4b10ddb39f36088ffc4552e0984 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 01:19:20 +0200
Subject: [PATCH 137/438] Prepare package 6.0

---
 build/makepack-dolibarr.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index 9ded8399ccc..c2d983653cb 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -972,7 +972,7 @@ if ($nboftargetok) {
 			$ret=`$cmd`;
 			$ret=`chmod 755 $BUILDROOT/$PROJECT.tmp/debian/rules`;
 			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/translation/autotranslator.class.php`;
-			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/class/myobject_class.class.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/class/myobject.class.php`;
 			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/class/myobject_api_class.class.php`;
 			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/core/modules/modMyModule.class.php`;
 			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/myobject_card.php`;

From 3d5899edf385c3951981327c8ec39cac558c45d0 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Sat, 10 Jun 2017 09:25:32 +0200
Subject: [PATCH 138/438] final blockedlog init

---
 htdocs/blockedlog/admin/blockedlog.php        | 126 +++++
 htdocs/blockedlog/admin/fingerprints.php      | 126 +++++
 htdocs/blockedlog/admin/index.html            |   0
 htdocs/blockedlog/ajax/authority.php          |  45 ++
 htdocs/blockedlog/ajax/check_signature.php    |  30 +
 htdocs/blockedlog/class/authority.class.php   | 308 +++++++++++
 htdocs/blockedlog/class/blockedlog.class.php  | 512 ++++++++++++++++++
 htdocs/blockedlog/lib/blockedlog.lib.php      |  57 ++
 htdocs/blockedlog/lib/index.html              |   0
 .../compta/paiement/class/paiement.class.php  |   4 +-
 htdocs/core/class/blockedlog.class.php        | 235 --------
 htdocs/core/modules/modBlockedLog.class.php   |   2 +-
 ..._modBlockedlog_ActionsBlockedLog.class.php |  42 +-
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  31 +-
 .../mysql/tables/llx_blockedlog.key.sql       |   6 +
 .../install/mysql/tables/llx_blockedlog.sql   |  19 +
 .../tables/llx_blockedlog_authority.key.sql   |   1 +
 .../mysql/tables/llx_blockedlog_authority.sql |   7 +
 18 files changed, 1291 insertions(+), 260 deletions(-)
 create mode 100644 htdocs/blockedlog/admin/blockedlog.php
 create mode 100644 htdocs/blockedlog/admin/fingerprints.php
 create mode 100644 htdocs/blockedlog/admin/index.html
 create mode 100644 htdocs/blockedlog/ajax/authority.php
 create mode 100644 htdocs/blockedlog/ajax/check_signature.php
 create mode 100644 htdocs/blockedlog/class/authority.class.php
 create mode 100644 htdocs/blockedlog/class/blockedlog.class.php
 create mode 100644 htdocs/blockedlog/lib/blockedlog.lib.php
 create mode 100644 htdocs/blockedlog/lib/index.html
 delete mode 100644 htdocs/core/class/blockedlog.class.php
 create mode 100644 htdocs/install/mysql/tables/llx_blockedlog.key.sql
 create mode 100644 htdocs/install/mysql/tables/llx_blockedlog.sql
 create mode 100644 htdocs/install/mysql/tables/llx_blockedlog_authority.key.sql
 create mode 100644 htdocs/install/mysql/tables/llx_blockedlog_authority.sql

diff --git a/htdocs/blockedlog/admin/blockedlog.php b/htdocs/blockedlog/admin/blockedlog.php
new file mode 100644
index 00000000000..3c143b70b83
--- /dev/null
+++ b/htdocs/blockedlog/admin/blockedlog.php
@@ -0,0 +1,126 @@
+<?php
+/* Copyright (C) 2017 ATM Consulting <contact@atm-consulting.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/blockedlog/admin/blockedlog.php
+ *  \ingroup    system
+ *  \brief      Page setup for blockedlog module
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/blockedlog/lib/blockedlog.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+
+$langs->load("admin");
+$langs->load("other");
+$langs->load("blockedlog");
+
+if (! $user->admin) accessforbidden();
+  
+$action = GETPOST('action','alpha');
+
+/*
+ * Actions
+ */
+if (preg_match('/set_(.*)/',$action,$reg))
+{
+	$code=$reg[1];
+	if (dolibarr_set_const($db, $code, GETPOST($code), 'chaine', 0, '', $conf->entity) > 0)
+	{
+		header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	}
+	else
+	{
+		dol_print_error($db);
+	}
+}
+
+if (preg_match('/del_(.*)/',$action,$reg))
+{
+	$code=$reg[1];
+	if (dolibarr_del_const($db, $code, 0) > 0)
+	{
+		Header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	}
+	else
+	{
+		dol_print_error($db);
+	}
+}
+
+
+/*
+ *	View
+ */
+
+$block_static = new BlockedLog($db);
+
+$form=new Form($db);
+
+llxHeader('',$langs->trans("BlockedLogSetup"));
+
+$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("ModuleSetup").' BlockedLog',$linkback);
+
+$head=blockedlogadmin_prepare_head();
+
+dol_fiche_head($head, 'blockedlog', '', -1);
+
+print $langs->trans("BlockedLogDesc")."<br>\n";
+
+print '<br>';
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Key").'</td>';
+print '<td>'.$langs->trans("Value").'</td>';
+print "</tr>\n";
+
+print '<tr class="oddeven">';
+print '<td class="titlefield">';
+print $langs->trans("EntityKey").'</td><td align="center">';
+
+print $block_static->getSignature();
+
+print '</td></tr>';
+
+
+// Example with a yes / no select
+$var=!$var;
+print '<tr '.$bc[$var].'>';
+print '<td>'.$langs->trans("BlockedLogAuthorityUrl").img_info($langs->trans('BlockedLogAuthorityNeededToStoreYouFingerprintsInNonAlterableRemote')).'</td>';
+print '<td align="right" width="300">';
+print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="set_BLOCKEDLOG_AUTHORITY_URL">';
+print '<input type="text" name="BLOCKEDLOG_AUTHORITY_URL" value="'.$conf->global->BLOCKEDLOG_AUTHORITY_URL.'" size="40" />';
+print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '</form>';
+print '</td></tr>';
+
+
+print '</table>';
+
+dol_fiche_end();
+
+print '<br><br>';
+
+llxFooter();
+$db->close();
diff --git a/htdocs/blockedlog/admin/fingerprints.php b/htdocs/blockedlog/admin/fingerprints.php
new file mode 100644
index 00000000000..bdd569d31bc
--- /dev/null
+++ b/htdocs/blockedlog/admin/fingerprints.php
@@ -0,0 +1,126 @@
+<?php
+/* Copyright (C) 2017 ATM Consulting <contact@atm-consulting.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/blockedlog/admin/blockedlog.php
+ *  \ingroup    system
+ *  \brief      Page setup for blockedlog module
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/blockedlog/lib/blockedlog.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+
+$langs->load("admin");
+$langs->load("other");
+$langs->load("blockedlog");
+
+if (! $user->admin) accessforbidden();
+  
+$action = GETPOST('action','alpha');
+
+
+/*
+ *	View
+ */
+
+$block_static = new BlockedLog($db);
+
+$blocks = $block_static->getLog('all', 0, GETPOST('all') ? 0 : 50);
+
+$form=new Form($db);
+
+llxHeader('',$langs->trans("BlockedLogSetup"));
+
+$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("ModuleSetup").' BlockedLog',$linkback);
+
+$head=blockedlogadmin_prepare_head();
+
+dol_fiche_head($head, 'fingerprints', '', -1);
+
+print $langs->trans("FingerprintsDesc")."<br>\n";
+
+print '<br>';
+
+echo '<div align="right"><a href="?all=1">'.$langs->trans('ShowAllFingerPrintsMightBeTooLong').'</a></div>';
+		
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+
+print '<td>'.$langs->trans('Date').'</td>';
+print '<td>'.$langs->trans('Ref').'</td>';
+print '<td>'.$langs->trans('Action').'</td>';
+print '<td>'.$langs->trans('Element').'</td>';
+print '<td>'.$langs->trans('Amount').'</td>';
+print '<td>'.$langs->trans('Author').'</td>';
+print '<td>'.$langs->trans('Fingerprint').'</td>';
+print '<td><span id="blockchainstatus"></span></td>';
+				
+print '</tr>';
+
+foreach($blocks as &$block) {
+	
+   	print '<tr class="oddeven">';
+   	print '<td>'.dol_print_date($block->tms,'dayhour').'</td>';
+   	print '<td>'.$block->ref_object.'</td>';
+   	print '<td>'.$langs->trans('log'.$block->action).'</td>';
+   	print '<td>'.$block->getObject().'</td>';
+   	print '<td align="right">'.price($block->amounts).'</td>';
+   	print '<td>'.$block->getUser().'</td>';
+   	print '<td>'.$block->signature.'</td>';
+   	print '<td>';
+   	
+   	print $block->checkSignature() ? img_picto('OkCheckPaymentValidity', 'on') : img_picto($langs->trans('KoCheckPaymentValidity'), 'off');
+   	print ' '.($block->certified ? img_picto($langs->trans('AddedByAuthority'), 'info') :  img_picto($langs->trans('NotAddedByAuthorityYet'), 'info_black') );
+
+	print '</td>';
+	print '</tr>';
+					
+}
+
+print '</table>';
+
+?>
+				<script type="text/javascript">
+					
+					$.ajax({
+						url : "<?php echo dol_buildpath('/blockedlog/ajax/check_signature.php',1) ?>"
+						,dataType:"html"
+					}).done(function(data) {
+						
+						if(data == 'hashisok') {
+							$('#blockchainstatus').html('<?php echo $langs->trans('AuthorityReconizeFingerprintConformity'). ' '. img_picto($langs->trans('SignatureOK'), 'on') ?>');
+						}
+						else{
+							$('#blockchainstatus').html('<?php echo $langs->trans('AuthorityDidntReconizeFingerprintConformity'). ' '.img_picto($langs->trans('SignatureKO'), 'off') ?>');
+						}
+						
+					});
+					
+				</script>
+				
+<?php
+
+dol_fiche_end();
+
+print '<br><br>';
+
+llxFooter();
+$db->close();
diff --git a/htdocs/blockedlog/admin/index.html b/htdocs/blockedlog/admin/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/blockedlog/ajax/authority.php b/htdocs/blockedlog/ajax/authority.php
new file mode 100644
index 00000000000..12584b2bace
--- /dev/null
+++ b/htdocs/blockedlog/ajax/authority.php
@@ -0,0 +1,45 @@
+<?php
+	
+	require '../../master.inc.php';
+	
+	require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/authority.class.php';
+
+	$user=new User($db);
+	$user->fetch(1); //TODO conf user authority
+	
+	$auth = new BlockedLogAuthority($db);
+	
+	$signature = GETPOST('s');
+	$newblock = GETPOST('b');
+	$hash = GETPOST('h');
+	
+	if($auth->fetch(0, $signature)<=0) {
+		$auth->signature = $signature;
+		$auth->create($user);
+	}
+	
+	
+	if(!empty($hash)) {
+		
+		echo $auth->checkBlockchain($hash) ? 'hashisok' : 'hashisjunk';
+			
+	}
+	elseif(!empty($newblock)){
+		if($auth->checkBlock($newblock)) {
+			$auth->addBlock($newblock);
+			$auth->update($user);
+			
+			echo 'blockadded';
+		}
+		else{
+				
+			echo 'blockalreadyadded';
+				
+		}
+	}
+	else{
+		echo 'idontunderstandwhatihavetodo';
+	}
+	
+	
diff --git a/htdocs/blockedlog/ajax/check_signature.php b/htdocs/blockedlog/ajax/check_signature.php
new file mode 100644
index 00000000000..bb018508a31
--- /dev/null
+++ b/htdocs/blockedlog/ajax/check_signature.php
@@ -0,0 +1,30 @@
+<?php
+
+	require '../../main.inc.php';
+
+	if(empty($conf->global->BLOCKEDLOG_AUTHORITY_URL)) exit('BLOCKEDLOG_AUTHORITY_URL not set');
+	
+	require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/authority.class.php';
+	
+	$auth=new BlockedLogAuthority($db);
+	$auth->syncSignatureWithAuthority();
+	
+	$block_static = new BlockedLog($db);
+	
+	$blocks = $block_static->getLog('just_certified', 0, 0, 1) ;
+
+	$auth->signature = $block_static->getSignature();
+	
+	foreach($blocks as &$b) {
+		$auth->blockchain.=$b->signature;	
+			
+	}
+	
+	$hash = $auth->getBlockchainHash();
+	
+	$url = $conf->global->BLOCKEDLOG_AUTHORITY_URL.'/blockedlog/ajax/authority.php?s='.$auth->signature.'&h='.$hash;
+
+	$res = file_get_contents($url);
+	//echo $url;
+	echo $res;
\ No newline at end of file
diff --git a/htdocs/blockedlog/class/authority.class.php b/htdocs/blockedlog/class/authority.class.php
new file mode 100644
index 00000000000..b7128b28e09
--- /dev/null
+++ b/htdocs/blockedlog/class/authority.class.php
@@ -0,0 +1,308 @@
+<?php 
+/* Copyright (C) 2017 ATM Consulting <contact@atm-consulting.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	Class to manage certif authority
+ */
+class BlockedLogAuthority {
+	
+	/**
+	 * Id of the log
+	 * @var int
+	 */
+	public $id;
+	
+	/**
+	 * Unique fingerprint of the blockchain to store
+	 * @var string
+	 */
+	public $signature = '';
+	
+	/**
+	 * Entire fingerprints blockchain
+	 * @var string
+	 */
+	public $blockchain = '';
+	
+	/**
+	 * timestamp
+	 * @var int
+	 */
+	public $tms = 0;
+	
+	/**
+	 *      Constructor
+	 *
+	 *      @param		DoliDB		$db      Database handler
+	 */
+    public function __construct($db) {
+    	
+    	$this->db = $db;
+    	
+	}
+	
+	/**
+	 *	Get hash of the block chain to check
+	 *
+	 *	@return     string         			hash md5 of blockchain
+	 */
+	public function getBlockchainHash() {
+		
+		return md5($this->signature.$this->blockchain);
+		
+	}
+	
+	/**
+	 *	Get hash of the block chain to check
+	 *
+	 *	@param      string		$hash		hash md5 of blockchain to test
+	 *	@return     boolean
+	 */
+	public function checkBlockchain($hash) {
+		
+		return ($hash === $this->getBlockchainHash() );
+		
+	}
+	
+	/**
+	 *	Add a new block to the chain
+	 *
+	 *	@param      string		$block		new block to chain
+	 */
+	public function addBlock($block) {
+		
+		$this->blockchain.=$block;
+		
+	}
+	
+	/**
+	 *	hash already exist into chain ?
+	 *
+	 *	@param      string		$block		new block to chain
+	 *	@return     boolean
+	 */
+	public function checkBlock($block) {
+		
+		if(strlen($block)!=64) return false;
+		
+		$blocks = str_split($this->blockchain,64);
+		
+		if(!in_array($block,$blocks)) {
+			return true;
+		}			
+		else{
+			return false;
+		}
+	}
+	
+	
+	/**
+	 *	Get object from database
+	 *
+	 *	@param      int		$rowid       	Id of object to load
+	 *	@return     int         			>0 if OK, <0 if KO, 0 if not found
+	 */
+	public function fetch($id, $signature='') {
+		
+		global $langs;
+		
+		dol_syslog(get_class($this)."::fetch id=".$id, LOG_DEBUG);
+		
+		if (empty($id) && empty($signature))
+		{
+			$this->error='BadParameter';
+			return -1;
+		}
+		
+		$langs->load("blockedlog");
+		
+		$sql = "SELECT b.rowid, b.signature, b.blockchain, b.tms";
+		$sql.= " FROM ".MAIN_DB_PREFIX."blockedlog_authority as b";
+		
+		if ($id) $sql.= " WHERE b.rowid = ". $id;
+		else if($signature)$sql.= " WHERE b.signature = '". $this->db->escape( $signature ) ."'" ;
+	
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
+				
+				$this->id				= $obj->rowid;
+				$this->ref				= $obj->rowid;
+				
+				$this->signature		= $obj->signature;
+				$this->blockchain		= $obj->blockchain;
+				
+				$this->tms				= $this->db->jdate($obj->tms);
+				
+				return 1;
+			}
+			else
+			{
+				$this->error=$langs->trans("RecordNotFound");
+				return 0;
+			}
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			return -1;
+		}
+		
+	}
+	
+	/**
+	 *	Create authority in database.
+	 *
+	 *	@param	User	$user      		Object user that create
+	 *	@return	int						<0 if KO, >0 if OK
+	 */
+	public function create($user) {
+		
+		global $conf,$langs,$hookmanager;
+		
+		$langs->load('blockedlog');
+		
+		$error=0;
+		
+		dol_syslog(get_class($this).'::create', LOG_DEBUG);
+		
+		$this->db->begin();
+		
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."blockedlog_authority (";
+		$sql.= " signature,";
+		$sql.= " blockchain";
+		$sql.= ") VALUES (";
+		$sql.= "'".$this->db->escape($this->signature)."',";
+		$sql.= "'".$this->db->escape($this->blockchain)."'";
+		$sql.= ")";
+		
+		$res = $this->db->query($sql);
+		if ($res)
+		{
+			$id = $this->db->last_insert_id(MAIN_DB_PREFIX."blockedlog_authority");
+			
+			if ($id > 0)
+			{
+				$this->id = $id;
+				
+				$this->db->commit();
+				
+				return $this->id;
+			}
+			else
+			{
+				$this->db->rollback();
+				return -2;
+			}
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			$this->db->rollback();
+			return -1;
+		}
+		
+	}
+	
+	/**
+	 *	Create authority in database.
+	 *
+	 *	@param	User	$user      		Object user that create
+	 *	@return	int						<0 if KO, >0 if OK
+	 */
+	public function update($user) {
+		
+		global $conf,$langs,$hookmanager;
+		
+		$langs->load('blockedlog');
+		
+		$error=0;
+		
+		dol_syslog(get_class($this).'::create', LOG_DEBUG);
+		
+		$this->db->begin();
+		
+		$sql = "UPDATE ".MAIN_DB_PREFIX."blockedlog_authority SET ";
+		$sql.= " blockchain='".$this->db->escape($this->blockchain)."'";
+		$sql.= " WHERE rowid=".$this->id;
+		
+		$res = $this->db->query($sql);
+		if ($res)
+		{
+			$this->db->commit();
+				
+			return 1;
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			$this->db->rollback();
+			return -1;
+		}
+		
+	}
+	
+	/**
+	 *	For cron to sync to authority.
+	 *
+	 *	@return	int						<0 if KO, >0 if OK
+	 */
+	public function syncSignatureWithAuthority() {
+		global $conf, $langs;
+		
+		//TODO create cron task on activation
+		
+		if(empty($conf->global->BLOCKEDLOG_AUTHORITY_URL)) {
+			$this->error = $langs->trans('NoAuthorityURLDefined');
+			return -2;
+		}
+
+		require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
+		
+		$block_static = new BlockedLog($this->db);
+		
+		$blocks = $block_static->getLog('not_certified', 0, 0, 1);
+	
+		$signature=$block_static->getSignature();
+		
+		foreach($blocks as &$block) {
+			
+			$url = $conf->global->BLOCKEDLOG_AUTHORITY_URL.'/blockedlog/ajax/authority.php?s='.$signature.'&b='.$block->signature;
+			
+			$res = file_get_contents($url);
+			echo $block->signature.' '.$url. ' '.$res.'<br>';
+			if($res === 'blockalreadyadded' || $res === 'blockadded') {
+				
+				$block->setCertified();
+				
+			}
+			else {
+				
+				$this->error = $langs->trans('ImpossibleToContactAuthority ',$url);
+				return -1;
+			}
+			
+			
+		}
+		
+		return 1;
+	}
+	
+}
\ No newline at end of file
diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
new file mode 100644
index 00000000000..d41790c63b5
--- /dev/null
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -0,0 +1,512 @@
+<?php
+/* Copyright (C) 2017 ATM Consulting <contact@atm-consulting.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	Class to manage Blocked Log
+ */
+
+class BlockedLog {
+	
+	/**
+	 * Id of the log
+	 * @var int
+	 */
+	public $id;
+	
+	/**
+	 * Unique fingerprint of the log
+	 * @var string
+	 */
+	public $signature = '';
+	
+	/**
+	 * Unique fingerprint of the line log content
+	 * @var string
+	 */
+	public $signature_line = '';
+	
+	public $amounts = null;
+	
+	public $action = '';
+	
+	public $element = '';
+	
+	public $fk_object = 0;
+	
+	public $certified = false;
+	
+	public $fk_user = 0;
+	
+	public $date_object = 0;
+	
+	public $ref_object = '';
+	
+	public $object_data = null;
+	
+	
+	/**
+	 *      Constructor
+	 *
+	 *      @param		DoliDB		$db      Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		$this->db = $db;
+		
+	}
+
+	/**
+	 *      try to retrieve logged object
+	 *
+	 *      @param		object|string		$object      object logged
+	 */
+	public function getObject() {
+		global $langs;
+		
+		if($this->element === 'facture') {
+			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+			
+			$object = new Facture($this->db);
+			if($object->fetch($this->fk_object)>0) {
+				return $object->getNomUrl(1);
+			}
+		}
+		else if($this->element === 'payment') {
+			require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+			
+			$object = new Paiement($this->db);
+			if($object->fetch($this->fk_object)>0) {
+				return $object->getNomUrl(1);
+			}
+		}
+	
+		return $langs->trans('ImpossibleToReloadObject', $this->element, $this->fk_object);
+		
+	}
+	
+	/**
+	 *      try to retrieve user author
+	 *
+	 *      @param		object|string		$object      object logged
+	 */
+	public function getUser() {
+		global $langs, $cachedUser;
+		
+		if(empty($cachedUser))$cachedUser=array();
+		
+		if(empty($cachedUser[$this->fk_user])) {
+			$u=new User($this->db);
+			if($u->fetch($this->fk_user)>0) {
+				$cachedUser[$this->fk_user] = $u;
+			}
+		}
+		
+		if(!empty($cachedUser[$this->fk_user])) {
+			return $cachedUser[$this->fk_user]->getNomUrl(1);
+		}
+		
+		return $langs->trans('ImpossibleToRetrieveUser', $this->fk_user);
+	}
+	
+	/**
+	 *      populate log by object
+	 *
+	 *      @param		payment|facture		$object      object to store
+	 */
+	public function setObjectData(&$object) {
+		
+		if($object->element=='payment') {
+			$this->date_object = $object->datepaye;
+		}
+		else{
+			$this->date_object = $object->date;
+		}
+		
+		$this->ref_object = $object->ref;
+		$this->element = $object->element;
+		$this->fk_object = $object->id;
+		
+		$this->object_data=new stdClass();
+		
+		if($this->element === 'facture') {
+			if(empty($object->thirdparty))$object->fetch_thirdparty();
+			$this->object_data->thirdparty=new stdClass();
+			
+			foreach($object->thirdparty as $key=>$value) {
+				if(!is_object($value)) $this->object_data->thirdparty->{$key} = $value;
+			}
+			
+			$this->object_data->total_ht 	= (double)$object->total_ht;
+			$this->object_data->total_tva	= (double)$object->total_tva;
+			$this->object_data->total_ttc	= (double)$object->total_ttc;
+			$this->object_data->total_localtax1= (double)$object->total_localtax1;
+			$this->object_data->total_localtax2= (double)$object->total_localtax2;
+			$this->object_data->note_public	= (double)$object->note_public;
+			$this->object_data->note_private= (double)$object->note_private;
+						
+		}
+		elseif($this->element==='payment'){
+			
+			$this->object_data->amounts = $object->amounts;
+			
+		}
+		
+		
+	}
+	
+	/**
+	 *	Get object from database
+	 *
+	 *	@param      int		$rowid       	Id of object to load
+	 *	@return     int         			>0 if OK, <0 if KO, 0 if not found
+	 */
+	public function fetch($id) {
+		
+		global $langs;
+		
+		dol_syslog(get_class($this)."::fetch id=".$id, LOG_DEBUG);
+		
+		if (empty($id))
+		{
+			$this->error='BadParameter';
+			return -1;
+		}
+		
+		$langs->load("blockedlog");
+		
+		$sql = "SELECT b.rowid, b.signature, b.amounts, b.action, b.element, b.fk_object, b.certified, b.tms, b.fk_user, b.date_object, b.ref_object, b.object_data";
+		$sql.= " FROM ".MAIN_DB_PREFIX."blockedlog as b";
+		if ($id) $sql.= " WHERE b.rowid = ". $id;
+		
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
+				
+				$this->id				= $obj->rowid;
+				$this->ref				= $obj->rowid;
+				
+				$this->signature		= $obj->signature;
+				$this->amounts			= (double)$obj->amounts;
+				$this->action			= $obj->action;
+				$this->element			= $obj->element;
+				
+				$this->fk_object		= trim($obj->fk_object);
+				$this->date_object		= $this->db->jdate($obj->date_object);
+				$this->ref_object		= $obj->ref_object;
+				
+				$this->certified		= ($obj->certified == 1);
+				
+				$this->fk_user 			= $obj->fk_user;
+				
+				$this->tms				= $this->db->jdate($obj->tms);
+				
+				$this->object_data		= unserialize($obj->object_data);
+				
+				return 1;
+			}
+			else
+			{
+				$this->error=$langs->trans("RecordNotFound");
+				return 0;
+			}
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			return -1;
+		}
+		
+	}
+	
+	/**
+	 *	Set block certified by authority
+	 *
+	 *	@return	boolean
+	 */
+	public function setCertified() {
+		
+		$res = $this->db->query("UPDATE ".MAIN_DB_PREFIX."blockedlog SET certified=1 WHERE rowid=".$this->id);
+		if($res===false) return false;
+		
+		return true;
+		
+		
+	}
+	
+	/**
+	 *	Create blocked log in database.
+	 *
+	 *	@param	User	$user      		Object user that create
+	 *	@return	int						<0 if KO, >0 if OK
+	 */
+	public function create($user) {
+		
+		global $conf,$langs,$hookmanager;
+		
+		$langs->load('blockedlog');
+		
+		$error=0;
+		
+		dol_syslog(get_class($this).'::create', LOG_DEBUG);
+		
+		$this->getSignatureRecursive();
+		
+		
+		if (is_null($this->amounts))
+		{
+			$this->error=$langs->trans("BlockLogNeedAmountsValue");
+			dol_syslog($this->error, LOG_WARNING);
+			return -1;
+		}
+		
+		if(empty($this->element)) {
+			$this->error=$langs->trans("BlockLogNeedElement");
+			dol_syslog($this->error, LOG_WARNING);
+			return -2;
+		}
+		
+		if(empty($this->action)) {
+			$this->error=$langs->trans("BlockLogNeedAction");
+			dol_syslog($this->error, LOG_WARNING);
+			return -3;
+		}
+
+		$this->fk_user = $user->id;
+		
+		$this->db->begin();
+		
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."blockedlog (";
+		$sql.= "action,";
+		$sql.= " amounts,";
+		$sql.= " signature,";
+		$sql.= " signature_line,";
+		$sql.= " element,";
+		$sql.= " fk_object,";
+		$sql.= " date_object,";
+		$sql.= " ref_object,";
+		$sql.= " object_data,";
+		$sql.= " certified,";
+		$sql.= " fk_user,";
+		$sql.= " entity";
+		$sql.= ") VALUES (";
+		$sql.= "'".$this->db->escape($this->action)."',";
+		$sql.= "".$this->amounts.",";
+		$sql.= "'".$this->db->escape($this->signature)."',";
+		$sql.= "'".$this->db->escape($this->signature_line)."',";
+		$sql.= "'".$this->db->escape($this->element)."',";
+		$sql.= "".$this->fk_object.",";
+		$sql.= "'".$this->db->idate($this->date_object)."',";
+		$sql.= "'".$this->db->escape($this->ref_object)."',";
+		$sql.= "'".$this->db->escape(serialize($this->object_data))."',";
+		$sql.= "0,";
+		$sql.= "".$user->id.",";
+		$sql.= $conf->entity;
+		$sql.= ")";
+		
+		$res = $this->db->query($sql);
+		if ($res)
+		{
+			$id = $this->db->last_insert_id(MAIN_DB_PREFIX."blockedlog");
+			
+			if ($id > 0)
+			{
+				$this->id = $id;
+				
+				$this->db->commit();
+				
+				return $this->id;
+			}
+			else
+			{
+				$this->db->rollback();
+				return -2;
+			}
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			$this->db->rollback();
+			return -1;
+		}
+		
+	}
+	
+	/**
+	 *	return crypted value.
+	 *
+	 *	@param	string $value      		string to crypt
+	 *	@return	string					crypted string
+	 */
+	private function crypt($value) {
+		
+		return hash('sha256',$value);
+		
+	}
+	
+	/**
+	 *	check if current signature still correct compare to the chain
+	 *
+	 *	@return	boolean					
+	 */
+	public function checkSignature() {
+		
+		$signature_to_test = $this->signature;
+		
+		$this->getSignatureRecursive();
+	
+		return ($signature_to_test=== $this->signature);
+		
+	}
+	
+	/**
+	 *	set current signatures 
+	 */
+	 private function getSignatureRecursive(){
+		
+		$this->signature_line = $this->crypt( $this->action . $this->getSignature() . $this->amounts . print_r($this->object_data, true) );
+		/*if($this->signature=='d6320580a02c1ab67fcc0a6d49d453c7d96dda0148901736f7f55725bfe1b900' || $this->signature=='ea65d435ff12ca929936a406aa9d707d99fb334c127878d256b602a5541bbbc9') {
+			var_dump($this->signature_line,$this->action ,$this->getSignature() , $this->amounts , $this->object_data);
+		}*/
+		$this->signature = $this->signature_line;
+		
+		$logs = $this->getLog('all', 0, 0, 1) ;
+		if($logs!==false) {
+			foreach($logs as &$b) {
+			
+				if($this->id>0 && $b->id == $this->id) break; // on arrête sur un enregistrement précis pour recalculer une signature
+				
+				$b->getCurrentValue(); // on récupère la valeur actuelle en base de l'élément enregistré
+				
+				$this->signature = $this->crypt($this->signature. $this->action . $b->signature . $b->amounts);
+			}
+		}
+		
+	}
+	
+	/**
+	 *	return log object for a element.
+	 *
+	 *	@param	string $element      	element to search
+	 *	@param	int $fk_object			id of object to search
+	 *	@param	int $limit      		max number of element, 0 for all
+	 *	@param	string $order      		sort of query
+	 *	@return	array					array of object log
+	 */
+	public function getLog($element, $fk_object, $limit = 0, $order = -1) {
+		global $conf,$cachedlogs ; 
+		
+		/* $cachedlogs allow fastest search */
+		if(empty($cachedlogs)) $cachedlogs=array();
+	
+		
+		if($element=='all') {
+		
+	 		$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
+	         WHERE entity=".$conf->entity;
+	    	
+		}
+		else if($element=='not_certified') {
+			$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
+	         WHERE entity=".$conf->entity." AND certified = 0";
+			
+		}
+		else if($element=='just_certified') {
+			$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
+	         WHERE entity=".$conf->entity." AND certified = 1";
+			
+		}
+		else{
+			$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
+	         WHERE element='".$element."' AND fk_object=".(int)$fk_object;
+			
+		}
+		
+		$sql.=($order<0 ? ' ORDER BY rowid DESC ' : ' ORDER BY rowid ASC ');
+		
+		if($limit > 0 )$sql.=' LIMIT '.$limit;
+		
+		$res = $this->db->query($sql);
+		
+		if($res) {
+		
+			$results=array();
+			
+			while($obj = $this->db->fetch_object($res)) {
+				
+				if(!isset($cachedlogs[$obj->rowid])) {
+					$b=new BlockedLog($this->db);
+					$b->fetch($obj->rowid);
+					
+					$cachedlogs[$obj->rowid] = $b;
+				}
+				
+				$results[] = $cachedlogs[$obj->rowid];
+				
+			}
+			
+			return $results;
+		}
+		else{
+			return false;
+		}
+	}
+	
+	/**
+	 *	set amounts of log from current element value in order to compare signature.
+	 */
+	private function getCurrentValue() {
+		
+		if($this->action === 'PAYMENT_CUSTOMER_CREATE'
+		|| $this->action === 'PAYMENT_ADD_TO_BANK') {
+			$sql="SELECT amount FROM ".MAIN_DB_PREFIX."paiement WHERE rowid=".$this->fk_object;
+					
+			$res = $this->db->query($sql);
+			
+			if($res && $obj = $this->db->fetch_object($res)) {
+				$this->amounts = (double)$obj->amount;
+			}
+		}
+				
+	}
+	
+	/**
+	 *	return and set the entity signature included into line signature
+	 *
+	 *	@return	string					current entity signature
+	 */
+	public function getSignature() {
+		global $db,$conf,$mysoc;
+		
+		if(empty($conf->global->BLOCKEDLOG_ENTITY_FINGERPRINT)) { // creation of a unique fingerprint
+			
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+			
+			$fingerprint = $this->crypt(print_r($mysoc,true).time().rand(0,1000));
+			
+			dolibarr_set_const($db, 'BLOCKEDLOG_ENTITY_FINGERPRINT', $fingerprint, 'chaine',0,'Numeric Unique Fingerprint', $conf->entity);
+			
+			$conf->global->BLOCKEDLOG_ENTITY_FINGERPRINT= $fingerprint;
+		}
+		
+		return $conf->global->BLOCKEDLOG_ENTITY_FINGERPRINT;
+	}
+	
+}
+
diff --git a/htdocs/blockedlog/lib/blockedlog.lib.php b/htdocs/blockedlog/lib/blockedlog.lib.php
new file mode 100644
index 00000000000..a7fca40d116
--- /dev/null
+++ b/htdocs/blockedlog/lib/blockedlog.lib.php
@@ -0,0 +1,57 @@
+<?php
+/* Copyright (C) 2017 ATM Consulting <contact@atm-consulting.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file			htdocs/blockedlog/lib/blockedlog.lib.php
+ *	\ingroup		system
+ *  \brief			Library for common blockedlog functions
+ */
+
+/**
+ *  Define head array for tabs of blockedlog tools setup pages
+ *
+ *  @return			Array of head
+ */
+function blockedlogadmin_prepare_head()
+{
+	global $langs, $conf;
+
+	$h = 0;
+	$head = array();
+	
+	$head[$h][0] = DOL_URL_ROOT."/blockedlog/admin/blockedlog.php";
+	$head[$h][1] = $langs->trans("BlockedLog");
+	$head[$h][2] = 'blockedlog';
+	$h++;
+	
+	$head[$h][0] = DOL_URL_ROOT."/blockedlog/admin/fingerprints.php";
+	$head[$h][1] = $langs->trans("Fingerprints");
+	$head[$h][2] = 'fingerprints';
+	$h++;
+	
+	$object=new stdClass();
+
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'blockedlog');
+
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'blockedlog','remove');
+
+    return $head;
+}
diff --git a/htdocs/blockedlog/lib/index.html b/htdocs/blockedlog/lib/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 03a7759e52c..c8d7f4d3759 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -196,7 +196,7 @@ class Paiement extends CommonObject
 
 		$this->db->begin();
 
-		$ref = $this->getNextNumRef('');
+		$this->ref = $this->getNextNumRef('');
 
 		if ($way == 'dolibarr')
 		{
@@ -210,7 +210,7 @@ class Paiement extends CommonObject
 		}
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."paiement (entity, ref, datec, datep, amount, multicurrency_amount, fk_paiement, num_paiement, note, fk_user_creat)";
-		$sql.= " VALUES (".$conf->entity.", '".$ref."', '". $this->db->idate($now)."', '".$this->db->idate($this->datepaye)."', '".$total."', '".$mtotal."', ".$this->paiementid.", '".$this->num_paiement."', '".$this->db->escape($this->note)."', ".$user->id.")";
+		$sql.= " VALUES (".$conf->entity.", '".$this->ref."', '". $this->db->idate($now)."', '".$this->db->idate($this->datepaye)."', '".$total."', '".$mtotal."', ".$this->paiementid.", '".$this->num_paiement."', '".$this->db->escape($this->note)."', ".$user->id.")";
 		
 		dol_syslog(get_class($this)."::Create insert paiement", LOG_DEBUG);
 		$resql = $this->db->query($sql);
diff --git a/htdocs/core/class/blockedlog.class.php b/htdocs/core/class/blockedlog.class.php
deleted file mode 100644
index 3e622c42dc4..00000000000
--- a/htdocs/core/class/blockedlog.class.php
+++ /dev/null
@@ -1,235 +0,0 @@
-<?php 
-
-class BlockedLog {
-	
-	public $signature = '';
-	
-	public $key_value1 = null;
-	
-	public $action = '';
-	
-	public $element = '';
-	
-	public $fk_object = 0;
-	
-	public $certified = false;
-	
-	public $fk_user = 0;
-	
-	function __construct(&$db) {
-		
-		$this->db =&$db;
-		
-	}
-	
-	public function create($user) {
-		
-		global $conf,$langs,$hookmanager;
-		
-		$langs->load('blockedlog');
-		
-		$error=0;
-		
-		dol_syslog(get_class($this).'::create', LOG_DEBUG);
-		
-		// Clean parameters
-		$this->signature = $this->getSignatureRecursive();
-		
-		
-		if (is_null($this->key_value1))
-		{
-			$this->error=$langs->trans("BlockLogNeedKey1Value");
-			dol_syslog($this->error, LOG_WARNING);
-			return -1;
-		}
-		
-		if(empty($this->element)) {
-			$this->error=$langs->trans("BlockLogNeedElement");
-			dol_syslog($this->error, LOG_WARNING);
-			return -2;
-		}
-		
-		if(empty($this->action)) {
-			$this->error=$langs->trans("BlockLogNeedAction");
-			dol_syslog($this->error, LOG_WARNING);
-			return -3;
-		}
-
-		$this->fk_user = $user->id;
-		
-		$this->db->begin();
-		
-		//TODO add fk_user;
-		
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."blockedlog (";
-		$sql.= "action,";
-		$sql.= " key_value1,";
-		$sql.= " signature,";
-		$sql.= " element,";
-		$sql.= " fk_object,";
-		$sql.= " certified,";
-		$sql.= " entity";
-		$sql.= ") VALUES (";
-		$sql.= "'".$this->db->escape($this->action)."',";
-		$sql.= "".$this->key_value1.",";
-		$sql.= "'".$this->db->escape($this->signature)."',";
-		$sql.= "'".$this->db->escape($this->element)."',";
-		$sql.= "".$this->fk_object.",";
-		$sql.= "'".($this->certified ? 1 : 0)."',";
-		$sql.= $conf->entity;
-		$sql.= ")";
-		
-		$res = $this->db->query($sql);
-		if ($res)
-		{
-			$id = $this->db->last_insert_id(MAIN_DB_PREFIX."blockedlog");
-			
-			if ($id > 0)
-			{
-				$this->id = $id;
-			
-			}
-			else
-			{
-				$this->db->rollback();
-				return -2;
-			}
-		}
-		else
-		{
-			$this->error=$this->db->error();
-			$this->db->rollback();
-			return -1;
-		}
-		
-	}
-	
-	private function crypt($value) {
-		
-		return md5($value);
-		
-	}
-	
-	public function checkSignature() {
-		
-		$signature = $this->getSignatureRecursive();
-		
-		return ($signature === $this->signature);
-		
-	}
-	
-	private function getSignatureRecursive(){
-		
-		$signature = $this->crypt( $this->action . $this->getSignature() . $this->key_value1  );
-		
-		$logs = $this->getLog('payment', 0, 0, 'ASC') ;
-		if($logs!==false) {
-			foreach($logs as &$b) {
-			
-				if($this->id>0 && $b->id == $this->id) break; // on arrête sur un enregistrement précis pour recalculer une signature
-				
-				$b->updateValue(); // on récupère la valeur actuelle en base de l'élément enregistré
-				
-				$signature = $this->crypt($signature. $this->action . $b->signature . $b->key_value1);
-			}
-		}
-		return $signature;
-	
-	}
-	
-	public function getLog($element, $fk_object, $limit = 0, $order = 'DESC') {
-		global $conf,$cachedlogs ; 
-		
-		if(empty($cachedlogs)) $cachedlogs=array();
-	
-		
-		if($element=='payment') {
-		
-	 		$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
-	         WHERE entity=".$conf->entity." AND  action LIKE '%PAYMENT%'
-	         ORDER BY tms ".$order;
-			
-		}
-		else if($element=='payments_not_certified') {
-			$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
-	         WHERE entity=".$conf->entity." AND action LIKE '%PAYMENT%' AND certified = 0
-	         ORDER BY tms ".$order;
-			
-		}
-		else if($element=='payments_just_certified') {
-			$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
-	         WHERE entity=".$conf->entity." AND action LIKE '%PAYMENT%' AND certified = 1
-	         ORDER BY tms ".$order;
-			
-		}
-		else{
-			$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
-	         WHERE element='".$element."' AND fk_object=".(int)$fk_object."
-	         ORDER BY tms ".$order;
-			
-		}
-		
-		
-		if($limit > 0 )$sql.=' LIMIT '.$limit;
-		
-		$res = $this->db->query($sql);
-		
-		if($res) {
-		
-			$results=array();
-			
-			while($obj = $this->db->fetch_object($res)) {
-				
-				if(!isset($cachedlogs[$obj->rowid])) {
-					$b=new BlockedLog($this->db);
-					$b->fetch($obj->rowid);
-					
-					$cachedlogs[$obj->rowid] = $b;
-				}
-				
-				$results[] = $cachedlogs[$obj->rowid];
-				
-			}
-			
-			return $results;
-		}
-		else{
-			return false;
-		}
-	}
-	
-	private function updateValue() {
-		
-		if($this->action === 'PAYMENT_CUSTOMER_CREATE'
-		|| $this->action === 'PAYMENT_ADD_TO_BANK') {
-			$sql="SELECT amount FROM ".MAIN_DB_PREFIX."paiement WHERE rowid=".$this->fk_object;
-					
-			$res = $this->db->query($sql);
-			
-			if($res && $obj = $db->fetch_object($res)) {
-				$this->key_value1 = (double)$obj->amount;
-			}
-		}
-				
-	}
-	
-	
-	public function getSignature() {
-		global $db,$conf,$mysoc;
-		
-		if(empty($conf->global->BLOCKEDLOG_ENTITY_FINGERPRINT)) { // creation of a unique fingerprint
-			
-			require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-			
-			$fingerprint = $this->crypt(print_r($mysoc,true).time().rand(0,1000));
-			
-			dolibarr_set_const($db, 'BLOCKEDLOG_ENTITY_FINGERPRINT', $fingerprint, '',0,'Numeric Unique Fingerprint', $conf->entity);
-			
-			$conf->global->BLOCKEDLOG_ENTITY_FINGERPRINT= $fingerprint;
-		}
-		
-		return $conf->global->BLOCKEDLOG_ENTITY_FINGERPRINT;
-	}
-	
-}
-
diff --git a/htdocs/core/modules/modBlockedLog.class.php b/htdocs/core/modules/modBlockedLog.class.php
index c3e2cb6345a..b149471cd20 100644
--- a/htdocs/core/modules/modBlockedLog.class.php
+++ b/htdocs/core/modules/modBlockedLog.class.php
@@ -60,7 +60,7 @@ class modBlockedLog extends DolibarrModules
 
         // Config pages
         //-------------
-        $this->config_page_url = array();
+        $this->config_page_url = array('blockedlog.php@blockedlog');
 
         // Dependancies
         //-------------
diff --git a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
index 3307e4216ea..dde792a27d0 100644
--- a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
+++ b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
@@ -1,10 +1,5 @@
 <?php
-/* Copyright (C) 2005-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2009-2011 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2011-2014 Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2013	   Cedric GROSS         <c.gross@kreiz-it.fr>
- * Copyright (C) 2014       Marcos García       <marcosgdf@gmail.com>
- * Copyright (C) 2015       Bahfir Abbes        <bafbes@gmail.com>
+/* Copyright (C) 2017 ATM Consulting <contact@atm-consulting.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,13 +16,13 @@
  */
 
 /**
- *	\file       htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
- *  \ingroup    agenda
- *  \brief      Trigger file for agenda module
+ *	\file       htdocs/core/triggers/interface_50_modAgenda_ActionsBlockedLog.class.php
+ *  \ingroup    system
+ *  \brief      Trigger file for blockedlog module
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/blockedlog.class.php';
+require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
 
 /**
  *  Class of triggered functions for agenda module
@@ -56,19 +51,40 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 			return 0;
 		}
 		
+		if($action==='BILL_VALIDATE' || $action === 'BILL_PAYED' || $action==='BILL_UNPAYED') {
+			$amounts=  (double)$object->total_ttc;
+		}
+		else if($action === 'PAYMENT_CUSTOMER_CREATE' || $action === 'PAYMENT_ADD_TO_BANK') {
+			$amounts = 0;
+			if(!empty($object->amounts)) {
+				foreach($object->amounts as $amount) {
+					$amounts+= price2num($amount);
+				}
+			}
+			
+			
+		}
+		else if(strpos($action,'PAYMENT')!==false) {
+			$amounts= (double)$object->amount;
+		}
+		else {
+			return 0; // not implemented action log
+		}
+		
 		$b=new BlockedLog($this->db);
-		$b->element = $object->element;
 		$b->action = $action;
-		$b->fk_object = $object->id;
-		$b->key_value1 = 0;
+		$b->amounts= $amounts;
+		$b->setObjectData($object);
 		
 		$res = $b->create($user);
+		
 		if($res<0) {
 			setEventMessage($b->error,'errors');
 			
 			return -1;
 		}
 		else {
+			
 			return 1;
 		}
 		
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 786becac0ba..d5e758eb566 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -397,19 +397,32 @@ ALTER TABLE llx_usergroup_rights ADD CONSTRAINT fk_usergroup_rights_fk_usergroup
 
 CREATE TABLE llx_blockedlog 
 ( 
-	rowid integer AUTO_INCREMENT, 
-	tms	timestamp,
+	rowid integer AUTO_INCREMENT PRIMARY KEY, 
+	tms	timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	action varchar(50), 
-	key_value1 real NOT NULL, 
-	signature varchar(32) NOT NULL, 
+	amounts real NOT NULL, 
+	signature varchar(100) NOT NULL, 
+	signature_line varchar(100) NOT NULL, 
 	element varchar(50), 
-	fk_object integer, 
+	fk_object integer,
+	ref_object varchar(100), 
+	date_object	datetime,
+	object_data	text,
+	fk_user	integer,
 	entity integer, 
-	certified integer, 
-	PRIMARY KEY (rowid), 
+	certified integer,
 	KEY signature (signature), 
 	KEY fk_object_element (fk_object,element), 
-	KEY entity (entity), 
+	KEY entity (entity),
+	KEY fk_user (fk_user), 
 	KEY entity_action (entity,action), 
 	KEY entity_action_certified (entity,action,certified) 
-) 
+) ENGINE=innodb;
+
+CREATE TABLE llx_blockedlog_authority 
+( 
+	rowid integer AUTO_INCREMENT PRIMARY KEY, 
+	blockchain longtext NOT NULL,
+	signature varchar(100) NOT NULL,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_blockedlog.key.sql b/htdocs/install/mysql/tables/llx_blockedlog.key.sql
new file mode 100644
index 00000000000..4312a056894
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_blockedlog.key.sql
@@ -0,0 +1,6 @@
+ALTER TABLE llx_blockedlog ADD INDEX signature (signature);
+ALTER TABLE llx_blockedlog ADD INDEX fk_object_element (fk_object,element);
+ALTER TABLE llx_blockedlog ADD INDEX entity (entity);
+ALTER TABLE llx_blockedlog ADD INDEX fk_user (fk_user); 
+ALTER TABLE llx_blockedlog ADD INDEX entity_action (entity,action);
+ALTER TABLE llx_blockedlog ADD INDEX entity_action_certified (entity,action,certified);
diff --git a/htdocs/install/mysql/tables/llx_blockedlog.sql b/htdocs/install/mysql/tables/llx_blockedlog.sql
new file mode 100644
index 00000000000..769eb34e092
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_blockedlog.sql
@@ -0,0 +1,19 @@
+
+CREATE TABLE llx_blockedlog 
+( 
+	rowid integer AUTO_INCREMENT PRIMARY KEY, 
+	tms	timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+	action varchar(50), 
+	amounts real NOT NULL, 
+	signature varchar(100) NOT NULL, 
+	signature_line varchar(100) NOT NULL, 
+	element varchar(50), 
+	fk_object integer,
+	ref_object varchar(100), 
+	date_object	datetime,
+	object_data	text,
+	fk_user	integer,
+	entity integer, 
+	certified integer
+) ENGINE=innodb;
+
diff --git a/htdocs/install/mysql/tables/llx_blockedlog_authority.key.sql b/htdocs/install/mysql/tables/llx_blockedlog_authority.key.sql
new file mode 100644
index 00000000000..289b6dbde56
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_blockedlog_authority.key.sql
@@ -0,0 +1 @@
+ALTER TABLE llx_blockedlog_authority ADD INDEX signature (signature);
diff --git a/htdocs/install/mysql/tables/llx_blockedlog_authority.sql b/htdocs/install/mysql/tables/llx_blockedlog_authority.sql
new file mode 100644
index 00000000000..eb491f93af4
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_blockedlog_authority.sql
@@ -0,0 +1,7 @@
+CREATE TABLE llx_blockedlog_authority 
+( 
+	rowid integer AUTO_INCREMENT PRIMARY KEY, 
+	blockchain longtext NOT NULL,
+	signature varchar(100) NOT NULL,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+) ENGINE=innodb;

From 63b3010c2e33f631b8e515e8c37e60ebf8d3a8f0 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Sat, 10 Jun 2017 09:28:07 +0200
Subject: [PATCH 139/438] fix sql

---
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index d5e758eb566..f4757e2475f 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -410,15 +410,16 @@ CREATE TABLE llx_blockedlog
 	object_data	text,
 	fk_user	integer,
 	entity integer, 
-	certified integer,
-	KEY signature (signature), 
-	KEY fk_object_element (fk_object,element), 
-	KEY entity (entity),
-	KEY fk_user (fk_user), 
-	KEY entity_action (entity,action), 
-	KEY entity_action_certified (entity,action,certified) 
+	certified integer
 ) ENGINE=innodb;
 
+ALTER TABLE llx_blockedlog ADD INDEX signature (signature);
+ALTER TABLE llx_blockedlog ADD INDEX fk_object_element (fk_object,element);
+ALTER TABLE llx_blockedlog ADD INDEX entity (entity);
+ALTER TABLE llx_blockedlog ADD INDEX fk_user (fk_user); 
+ALTER TABLE llx_blockedlog ADD INDEX entity_action (entity,action);
+ALTER TABLE llx_blockedlog ADD INDEX entity_action_certified (entity,action,certified);
+
 CREATE TABLE llx_blockedlog_authority 
 ( 
 	rowid integer AUTO_INCREMENT PRIMARY KEY, 
@@ -426,3 +427,5 @@ CREATE TABLE llx_blockedlog_authority
 	signature varchar(100) NOT NULL,
 	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 ) ENGINE=innodb;
+
+ALTER TABLE llx_blockedlog_authority ADD INDEX signature (signature);

From 4fd24f6d8c9c2e5c5f154530e052827e8ccf3edb Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Sat, 10 Jun 2017 09:58:07 +0200
Subject: [PATCH 140/438] fix travis

---
 .../interface_50_modBlockedlog_ActionsBlockedLog.class.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
index dde792a27d0..5a52777cbb9 100644
--- a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
+++ b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
@@ -52,7 +52,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 		}
 		
 		if($action==='BILL_VALIDATE' || $action === 'BILL_PAYED' || $action==='BILL_UNPAYED') {
-			$amounts=  (double)$object->total_ttc;
+			$amounts=  (double) $object->total_ttc;
 		}
 		else if($action === 'PAYMENT_CUSTOMER_CREATE' || $action === 'PAYMENT_ADD_TO_BANK') {
 			$amounts = 0;
@@ -65,7 +65,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 			
 		}
 		else if(strpos($action,'PAYMENT')!==false) {
-			$amounts= (double)$object->amount;
+			$amounts= (double) $object->amount;
 		}
 		else {
 			return 0; // not implemented action log

From 3cae54c29606bd892dffae11e4eb25201acd9c7f Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Sat, 10 Jun 2017 10:10:34 +0200
Subject: [PATCH 141/438] fix travis

---
 htdocs/blockedlog/class/authority.class.php  |  8 +--
 htdocs/blockedlog/class/blockedlog.class.php | 53 +++++++++++++-------
 2 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/htdocs/blockedlog/class/authority.class.php b/htdocs/blockedlog/class/authority.class.php
index b7128b28e09..8d241694b70 100644
--- a/htdocs/blockedlog/class/authority.class.php
+++ b/htdocs/blockedlog/class/authority.class.php
@@ -18,7 +18,8 @@
 /**
  *	Class to manage certif authority
  */
-class BlockedLogAuthority {
+class BlockedLogAuthority 
+{
 	
 	/**
 	 * Id of the log
@@ -113,8 +114,9 @@ class BlockedLogAuthority {
 	/**
 	 *	Get object from database
 	 *
-	 *	@param      int		$rowid       	Id of object to load
-	 *	@return     int         			>0 if OK, <0 if KO, 0 if not found
+	 *	@param      int			$id		       	Id of object to load
+	 *	@param      string		$signature		Signature of object to load
+	 *	@return     int         				>0 if OK, <0 if KO, 0 if not found
 	 */
 	public function fetch($id, $signature='') {
 		
diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index d41790c63b5..26283d6b08a 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -19,7 +19,8 @@
  *	Class to manage Blocked Log
  */
 
-class BlockedLog {
+class BlockedLog 
+{
 	
 	/**
 	 * Id of the log
@@ -41,14 +42,34 @@ class BlockedLog {
 	
 	public $amounts = null;
 	
+	/**
+	 * trigger action
+	 * @var string
+	 */
 	public $action = '';
 	
+	/**
+	 * Object element
+	 * @var string
+	 */
 	public $element = '';
 	
+	/**
+	 * Object id
+	 * @var int
+	 */
 	public $fk_object = 0;
 	
+	/**
+	 * Log certified by remote authority or not
+	 * @var boolean
+	 */
 	public $certified = false;
 	
+	/**
+	 * Author
+	 * @var int
+	 */
 	public $fk_user = 0;
 	
 	public $date_object = 0;
@@ -71,8 +92,6 @@ class BlockedLog {
 
 	/**
 	 *      try to retrieve logged object
-	 *
-	 *      @param		object|string		$object      object logged
 	 */
 	public function getObject() {
 		global $langs;
@@ -100,9 +119,7 @@ class BlockedLog {
 	
 	/**
 	 *      try to retrieve user author
-	 *
-	 *      @param		object|string		$object      object logged
-	 */
+	*/
 	public function getUser() {
 		global $langs, $cachedUser;
 		
@@ -144,19 +161,19 @@ class BlockedLog {
 		
 		if($this->element === 'facture') {
 			if(empty($object->thirdparty))$object->fetch_thirdparty();
-			$this->object_data->thirdparty=new stdClass();
+			$this->object_data->thirdparty = new stdClass();
 			
 			foreach($object->thirdparty as $key=>$value) {
 				if(!is_object($value)) $this->object_data->thirdparty->{$key} = $value;
 			}
 			
-			$this->object_data->total_ht 	= (double)$object->total_ht;
-			$this->object_data->total_tva	= (double)$object->total_tva;
-			$this->object_data->total_ttc	= (double)$object->total_ttc;
-			$this->object_data->total_localtax1= (double)$object->total_localtax1;
-			$this->object_data->total_localtax2= (double)$object->total_localtax2;
-			$this->object_data->note_public	= (double)$object->note_public;
-			$this->object_data->note_private= (double)$object->note_private;
+			$this->object_data->total_ht 	= (double) $object->total_ht;
+			$this->object_data->total_tva	= (double) $object->total_tva;
+			$this->object_data->total_ttc	= (double) $object->total_ttc;
+			$this->object_data->total_localtax1= (double) $object->total_localtax1;
+			$this->object_data->total_localtax2= (double) $object->total_localtax2;
+			$this->object_data->note_public	= (double) $object->note_public;
+			$this->object_data->note_private= (double) $object->note_private;
 						
 		}
 		elseif($this->element==='payment'){
@@ -171,7 +188,7 @@ class BlockedLog {
 	/**
 	 *	Get object from database
 	 *
-	 *	@param      int		$rowid       	Id of object to load
+	 *	@param      int		$id       	Id of object to load
 	 *	@return     int         			>0 if OK, <0 if KO, 0 if not found
 	 */
 	public function fetch($id) {
@@ -203,7 +220,7 @@ class BlockedLog {
 				$this->ref				= $obj->rowid;
 				
 				$this->signature		= $obj->signature;
-				$this->amounts			= (double)$obj->amounts;
+				$this->amounts			= (double) $obj->amounts;
 				$this->action			= $obj->action;
 				$this->element			= $obj->element;
 				
@@ -434,7 +451,7 @@ class BlockedLog {
 		}
 		else{
 			$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
-	         WHERE element='".$element."' AND fk_object=".(int)$fk_object;
+	         WHERE element='".$element."' AND fk_object=".(int) $fk_object;
 			
 		}
 		
@@ -480,7 +497,7 @@ class BlockedLog {
 			$res = $this->db->query($sql);
 			
 			if($res && $obj = $this->db->fetch_object($res)) {
-				$this->amounts = (double)$obj->amount;
+				$this->amounts = (double) $obj->amount;
 			}
 		}
 				

From 7c0de18ac18b2c2e8ae78c8f38f7c915e4a1c486 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 12:56:28 +0200
Subject: [PATCH 142/438] Fix code comment

---
 htdocs/accountancy/admin/accountmodel.php     | 2 +-
 htdocs/accountancy/admin/categories_list.php  | 2 +-
 htdocs/accountancy/admin/journals_list.php    | 2 +-
 htdocs/adherents/card.php                     | 2 +-
 htdocs/adherents/list.php                     | 2 +-
 htdocs/adherents/subscription.php             | 2 +-
 htdocs/adherents/subscription/list.php        | 2 +-
 htdocs/adherents/type.php                     | 2 +-
 htdocs/admin/dict.php                         | 2 +-
 htdocs/admin/index.php                        | 2 +-
 htdocs/admin/mails_templates.php              | 2 +-
 htdocs/admin/websites.php                     | 2 +-
 htdocs/comm/action/card.php                   | 2 +-
 htdocs/comm/action/index.php                  | 2 +-
 htdocs/comm/action/listactions.php            | 2 +-
 htdocs/comm/action/pertype.php                | 2 +-
 htdocs/comm/action/peruser.php                | 2 +-
 htdocs/comm/card.php                          | 2 +-
 htdocs/comm/mailing/advtargetemailing.php     | 2 +-
 htdocs/comm/mailing/card.php                  | 2 +-
 htdocs/comm/mailing/list.php                  | 2 +-
 htdocs/comm/propal/card.php                   | 2 +-
 htdocs/comm/propal/list.php                   | 4 ++--
 htdocs/commande/card.php                      | 2 +-
 htdocs/commande/list.php                      | 2 +-
 htdocs/commande/orderstoinvoice.php           | 2 +-
 htdocs/compta/bank/bankentries.php            | 2 +-
 htdocs/compta/bank/index.php                  | 2 +-
 htdocs/compta/bank/various_payment/card.php   | 2 +-
 htdocs/compta/deplacement/card.php            | 2 +-
 htdocs/compta/facture/card.php                | 2 +-
 htdocs/compta/facture/fiche-rec.php           | 2 +-
 htdocs/compta/facture/list.php                | 4 ++--
 htdocs/compta/localtax/card.php               | 2 +-
 htdocs/compta/paiement/list.php               | 2 +-
 htdocs/compta/salaries/card.php               | 2 +-
 htdocs/compta/tva/card.php                    | 2 +-
 htdocs/contact/agenda.php                     | 2 +-
 htdocs/contact/card.php                       | 2 +-
 htdocs/contact/list.php                       | 2 +-
 htdocs/contrat/card.php                       | 2 +-
 htdocs/contrat/list.php                       | 4 ++--
 htdocs/contrat/services.php                   | 2 +-
 htdocs/cron/list.php                          | 4 ++--
 htdocs/don/card.php                           | 2 +-
 htdocs/don/list.php                           | 2 +-
 htdocs/expedition/card.php                    | 2 +-
 htdocs/expedition/list.php                    | 4 ++--
 htdocs/expensereport/card.php                 | 2 +-
 htdocs/expensereport/list.php                 | 4 ++--
 htdocs/fichinter/card.php                     | 2 +-
 htdocs/fichinter/list.php                     | 2 +-
 htdocs/fourn/card.php                         | 2 +-
 htdocs/fourn/commande/card.php                | 2 +-
 htdocs/fourn/commande/list.php                | 4 ++--
 htdocs/fourn/commande/orderstoinvoice.php     | 2 +-
 htdocs/fourn/facture/card.php                 | 2 +-
 htdocs/fourn/facture/list.php                 | 4 ++--
 htdocs/fourn/facture/paiement.php             | 2 +-
 htdocs/livraison/card.php                     | 2 +-
 htdocs/main.inc.php                           | 2 +-
 htdocs/margin/tabs/thirdpartyMargins.php      | 2 +-
 htdocs/product/card.php                       | 2 +-
 htdocs/product/document.php                   | 2 +-
 htdocs/product/fournisseurs.php               | 2 +-
 htdocs/product/info.php                       | 2 +-
 htdocs/product/list-with-listview.php         | 2 +-
 htdocs/product/price.php                      | 2 +-
 htdocs/product/stats/commande.php             | 2 +-
 htdocs/product/stats/commande_fournisseur.php | 2 +-
 htdocs/product/stats/contrat.php              | 2 +-
 htdocs/product/stats/facture.php              | 2 +-
 htdocs/product/stats/facture_fournisseur.php  | 2 +-
 htdocs/product/stats/propal.php               | 2 +-
 htdocs/product/stock/card.php                 | 2 +-
 htdocs/product/stock/mouvement.php            | 2 +-
 htdocs/product/stock/product.php              | 2 +-
 htdocs/projet/card.php                        | 2 +-
 htdocs/projet/list.php                        | 2 +-
 htdocs/projet/tasks.php                       | 2 +-
 htdocs/projet/tasks/list.php                  | 2 +-
 htdocs/projet/tasks/task.php                  | 2 +-
 htdocs/projet/tasks/time.php                  | 2 +-
 htdocs/public/demo/index.php                  | 2 +-
 htdocs/societe/agenda.php                     | 2 +-
 htdocs/societe/card.php                       | 2 +-
 htdocs/societe/consumption.php                | 2 +-
 htdocs/societe/list.php                       | 4 ++--
 htdocs/societe/notify/card.php                | 2 +-
 htdocs/societe/price.php                      | 2 +-
 htdocs/societe/project.php                    | 2 +-
 htdocs/societe/rib.php                        | 4 ++--
 htdocs/supplier_proposal/card.php             | 2 +-
 htdocs/supplier_proposal/list.php             | 4 ++--
 htdocs/user/agenda_extsites.php               | 2 +-
 htdocs/user/clicktodial.php                   | 2 +-
 htdocs/user/document.php                      | 2 +-
 htdocs/user/group/perms.php                   | 2 +-
 htdocs/user/index.php                         | 2 +-
 htdocs/user/ldap.php                          | 2 +-
 htdocs/user/note.php                          | 2 +-
 htdocs/user/param_ihm.php                     | 2 +-
 htdocs/user/perms.php                         | 2 +-
 103 files changed, 114 insertions(+), 114 deletions(-)

diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index e63e44b4f80..e22e993796f 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -80,7 +80,7 @@ if ($user->societe_id > 0) accessforbidden();
 if (! $user->rights->accounting->chartofaccount) accessforbidden();
 
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('admin'));
 
 // This page is a generic page to edit dictionaries
diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index e78737c3fb9..1bf9a693efd 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -80,7 +80,7 @@ $pagenext = $page + 1;
 
 $search_country_id = GETPOST('search_country_id','int');
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('admin'));
 
 // This page is a generic page to edit dictionaries
diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index 1421d71be97..68d5e5af5c0 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -66,7 +66,7 @@ if (empty($sortorder)) $sortorder='ASC';
 
 $error = 0;
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('admin'));
 
 // This page is a generic page to edit dictionaries
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index fe3bd4f4cfd..147040fbf67 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -112,7 +112,7 @@ if ($id)
 	$caneditfieldmember=$user->rights->adherent->creer;
 }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('membercard','globalcard'));
 
 
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 949d55020c8..ec6bb85710c 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -77,7 +77,7 @@ $pagenext = $page + 1;
 if (! $sortorder) { $sortorder=($filter=='outofdate'?"DESC":"ASC"); }
 if (! $sortfield) { $sortfield=($filter=='outofdate'?"d.datefin":"d.lastname"); }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('memberlist'));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 21de6e305b5..d1cbcea4864 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -89,7 +89,7 @@ if ($rowid)
     $caneditfieldmember=$user->rights->adherent->creer;
 }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('subscription'));
 
 // PDF
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index af3174c0b60..628ceb390e3 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -53,7 +53,7 @@ $pagenext = $page + 1;
 if (! $sortorder) {  $sortorder="DESC"; }
 if (! $sortfield) {  $sortfield="c.dateadh"; }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('subscriptionlist'));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index f2fa12446b3..f0be2ee9fae 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -79,7 +79,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter_x") || GETP
 }
 
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('membertypecard','globalcard'));
 
 
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 880c9a9ba1a..f903ce3e8fc 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -80,7 +80,7 @@ $pagenext = $page + 1;
 $search_country_id = GETPOST('search_country_id','int');
 $search_code = GETPOST('search_code','alpha');
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('admin'));
 
 // This page is a generic page to edit dictionaries
diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php
index e9d38ad3776..a1ac45244e1 100644
--- a/htdocs/admin/index.php
+++ b/htdocs/admin/index.php
@@ -29,7 +29,7 @@ $langs->load("companies");
 
 if (!$user->admin) accessforbidden();
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('homesetup'));
 
 
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 9ff909862a3..b25e3a6a2ee 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -71,7 +71,7 @@ $offset = $listlimit * $page ;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('emailtemplates'));
 
 // Name of SQL tables of dictionaries
diff --git a/htdocs/admin/websites.php b/htdocs/admin/websites.php
index 9aecc4dfb0a..1dc91786ada 100644
--- a/htdocs/admin/websites.php
+++ b/htdocs/admin/websites.php
@@ -59,7 +59,7 @@ $offset = $listlimit * $page ;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('admin'));
 
 // This page is a generic page to edit dictionaries
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 3a634cc21cd..1bb35fe7fe8 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -95,7 +95,7 @@ $extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
 
 //var_dump($_POST);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('actioncard','globalcard'));
 
 
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 9a1d4db92ae..7d150efe140 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -118,7 +118,7 @@ $langs->load("agenda");
 $langs->load("other");
 $langs->load("commercial");
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('agenda'));
 
 
diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index 0e6fbb196a1..7bedc4d8356 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -109,7 +109,7 @@ if (! $user->rights->agenda->allactions->read || $filter=='mine')	// If no permi
 	$filtert=$user->id;
 }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('agendalist'));
 
 
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index c6fe302cf63..23d434742a0 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -140,7 +140,7 @@ $langs->load("agenda");
 $langs->load("other");
 $langs->load("commercial");
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('agenda'));
 
 
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index ecb30881433..2f1e3735cd2 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -139,7 +139,7 @@ $langs->load("agenda");
 $langs->load("other");
 $langs->load("commercial");
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('agenda'));
 
 
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 61fcc4dc502..b8906bd1038 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -80,7 +80,7 @@ $extrafields = new ExtraFields($db);
 // fetch optionals attributes and labels
 $extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('commcard','globalcard'));
 
 
diff --git a/htdocs/comm/mailing/advtargetemailing.php b/htdocs/comm/mailing/advtargetemailing.php
index 0262a50d65c..832cefa5774 100644
--- a/htdocs/comm/mailing/advtargetemailing.php
+++ b/htdocs/comm/mailing/advtargetemailing.php
@@ -768,7 +768,7 @@ if ($object->fetch($id) >= 0) {
 			$std_soc = new Societe($db);
 			$action_search = 'query';
 
-			// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+			// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 			include_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
 			$hookmanager = new HookManager($db);
 			$hookmanager->initHooks(array ('thirdpartycard'));
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 956710e2abc..353117f5fa3 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -52,7 +52,7 @@ $extrafields = new ExtraFields($db);
 // fetch optionals attributes and labels
 $extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('mailingcard','globalcard'));
 
 // Array of possible substitutions (See also file mailing-send.php that should manage same substitutions)
diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php
index 65e82b8f939..fb513c99b9b 100644
--- a/htdocs/comm/mailing/list.php
+++ b/htdocs/comm/mailing/list.php
@@ -45,7 +45,7 @@ $sall=GETPOST('sall', 'alphanohtml');
 $sref=GETPOST("sref", "alpha");
 $filteremail=GETPOST('filteremail','alpha');
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('mailinglist'));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 4e26437fd19..d58f2223adb 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -107,7 +107,7 @@ if ($id > 0 || ! empty($ref)) {
 		dol_print_error('', $object->error);
 }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('propalcard','globalcard'));
 
 $permissionnote = $user->rights->propale->creer; // Used by the include of actions_setnotes.inc.php
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index cb4aa123f12..220422a6404 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -95,7 +95,7 @@ $pagenext = $page + 1;
 if (! $sortfield) $sortfield='p.ref';
 if (! $sortorder) $sortorder='DESC';
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $contextpage='proposallist';
 
 // Security check
@@ -113,7 +113,7 @@ $result = restrictedArea($user, $module, $objectid, $dbtable);
 
 $diroutputmassaction=$conf->propal->dir_output . '/temp/massgeneration/'.$user->id;
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('propallist'));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 189d13c3ced..eeea825c1e5 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -98,7 +98,7 @@ $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('ordercard','globalcard'));
 
 $permissionnote = $user->rights->commande->creer; 		// Used by the include of actions_setnotes.inc.php
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 2f8810333f0..c49c1b18a4a 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -96,7 +96,7 @@ if (! $sortorder) $sortorder='DESC';
 // Initialize technical object to manage context to save list fields
 $contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'orderlist';
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array($contextpage));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php
index 95e896160ce..e76adb2a67c 100644
--- a/htdocs/commande/orderstoinvoice.php
+++ b/htdocs/commande/orderstoinvoice.php
@@ -89,7 +89,7 @@ if ($action == 'create')
 	}
 }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 $hookmanager=new HookManager($db);
 $hookmanager->initHooks(array('orderstoinvoice'));
diff --git a/htdocs/compta/bank/bankentries.php b/htdocs/compta/bank/bankentries.php
index 5f6d5156b72..5f50bf74c1b 100644
--- a/htdocs/compta/bank/bankentries.php
+++ b/htdocs/compta/bank/bankentries.php
@@ -131,7 +131,7 @@ if ($id > 0 || ! empty($ref))
 $contextpage='banktransactionlist'.(empty($object->ref)?'':'-'.$object->id);
 //var_dump($contextpage);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('banktransactionlist', $contextpage));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index 44ecbe6eb6f..0c24d25e064 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -69,7 +69,7 @@ if (! $sortorder) $sortorder='ASC';
 // Initialize technical object to manage context to save list fields
 $contextpage='bankaccountlist';
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array($contextpage));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index c0481829425..9444c0585f7 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -52,7 +52,7 @@ $result = restrictedArea($user, 'banque', '', '', '');
 
 $object = new PaymentVarious($db);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('variouscard','globalcard'));
 
 
diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php
index 949a7701698..555ea52b4e0 100644
--- a/htdocs/compta/deplacement/card.php
+++ b/htdocs/compta/deplacement/card.php
@@ -46,7 +46,7 @@ $confirm = GETPOST('confirm','alpha');
 
 $object = new Deplacement($db);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('tripsandexpensescard','globalcard'));
 
 $permissionnote=$user->rights->deplacement->creer;	// Used by the include of actions_setnotes.inc.php
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index e9be0a0b962..c79beaac4f3 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -114,7 +114,7 @@ if ($id > 0 || ! empty($ref)) {
 	$ret = $object->fetch($id, $ref, '', '', $conf->global->INVOICE_USE_SITUATION);
 }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('invoicecard','globalcard'));
 
 $permissionnote = $user->rights->facture->creer; // Used by the include of actions_setnotes.inc.php
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index aa5c6103638..221167a485a 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -93,7 +93,7 @@ if (($id > 0 || $ref) && $action != 'create' && $action != 'add')
 	}
 }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('invoicereccard','globalcard'));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 746106b2307..00b18c00759 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -110,7 +110,7 @@ if (! $sortfield) $sortfield='f.datef';
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $contextpage='invoicelist';
 
 // Security check
@@ -124,7 +124,7 @@ $object=new Facture($db);
 
 $now=dol_now();
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('invoicelist'));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php
index 315b89637af..bd1f83d7f43 100644
--- a/htdocs/compta/localtax/card.php
+++ b/htdocs/compta/localtax/card.php
@@ -44,7 +44,7 @@ $result = restrictedArea($user, 'tax', '', '', 'charges');
 
 $localtax = new Localtax($db);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('localtaxvatcard','globalcard'));
 
 
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index efc9d5e10d2..ec2bbc78fc6 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -68,7 +68,7 @@ $pagenext = $page + 1;
 if (! $sortorder) $sortorder="DESC";
 if (! $sortfield) $sortfield="p.rowid";
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('paymentlist'));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php
index 9abbecd35fc..20079ad18ee 100644
--- a/htdocs/compta/salaries/card.php
+++ b/htdocs/compta/salaries/card.php
@@ -48,7 +48,7 @@ $result = restrictedArea($user, 'salaries', '', '', '');
 
 $object = new PaymentSalary($db);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('salarycard','globalcard'));
 
 
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index 4a3ea9ee516..ea26d2c55a8 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -45,7 +45,7 @@ $result = restrictedArea($user, 'tax', '', '', 'charges');
 
 $object = new Tva($db);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('taxvatcard','globalcard'));
 
 
diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php
index 6c412c146d1..74ec89bf5d1 100644
--- a/htdocs/contact/agenda.php
+++ b/htdocs/contact/agenda.php
@@ -100,7 +100,7 @@ $pagenext = $page + 1;
 if (! $sortfield) $sortfield='a.datep, a.id';
 if (! $sortorder) $sortorder='DESC';
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('contactcard','globalcard'));
 
 
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 67a7d9b31e4..ae13bb44a3a 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -76,7 +76,7 @@ if (! empty($canvas))
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', $objcanvas); // If we create a contact with no company (shared contacts), no check on write permission
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('contactcard','globalcard'));
 
 
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index b2f8066367c..1293a258fab 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -114,7 +114,7 @@ else if ($type == "o")
 	$urlfiche="";
 }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array($contextpage));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 3c644e4260c..4e19d6109b8 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -68,7 +68,7 @@ $usehm=(! empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?$conf->global->MA
 if ($user->societe_id) $socid=$user->societe_id;
 $result=restrictedArea($user,'contrat',$id);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('contractcard','globalcard'));
 
 $object = new Contrat($db);
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 11a259abce7..29e13412892 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -86,10 +86,10 @@ $staticcontratligne=new ContratLigne($db);
 
 if ($search_status == '') $search_status=1;
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $contextpage='contractlist';
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array($contextpage));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php
index 0af99eeed33..3d5db42495a 100644
--- a/htdocs/contrat/services.php
+++ b/htdocs/contrat/services.php
@@ -77,7 +77,7 @@ $filter_opcloture=GETPOST('filter_opcloture');
 // Initialize context for list
 $contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'servicelist'.$mode;
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array($contextpage));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 3b830e4801f..620efae0437 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -50,7 +50,7 @@ $pagenext = $page + 1;
 if (! $sortfield) $sortfield='t.status';
 if (! $sortorder) $sortorder='ASC';
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $contextpage='cronjoblist';
 
 $status=GETPOST('status','int');
@@ -62,7 +62,7 @@ $securitykey = GETPOST('securitykey','alpha');
 
 $diroutputmassaction=$conf->cronjob->dir_output . '/temp/massgeneration/'.$user->id;
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('cronjoblist'));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 8e1bd00d893..33f2375a1bf 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -60,7 +60,7 @@ $result = restrictedArea($user, 'don', $id);
 // fetch optionals attributes and labels
 $extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('doncard','globalcard'));
 
 /*
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index a4f5f07679f..24ee68eb0f7 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -61,7 +61,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
 	$search_amount="";
 }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('orderlist'));
 
 
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 966f1f95972..e3a1b0bc3fa 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -98,7 +98,7 @@ $extralabelslines=$extrafieldsline->fetch_name_optionals_label($object->table_el
 // Load object. Make an object->fetch
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('expeditioncard','globalcard'));
 
 $permissiondellink=$user->rights->expedition->livraison->creer;	// Used by the include of actions_dellink.inc.php
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 091b5e44bb8..c4a07580a9a 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -64,12 +64,12 @@ $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $contextpage='shipmentlist';
 
 $viewstatut=GETPOST('viewstatut');
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('shipmentlist'));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index dff27139581..d9c195f4ca9 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -105,7 +105,7 @@ $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('expensereportcard','globalcard'));
 
 $permissionnote = $user->rights->expensereport->creer; 		// Used by the include of actions_setnotes.inc.php
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 9cf47ddea94..8a8014edcb6 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -79,10 +79,10 @@ $optioncss = GETPOST('optioncss','alpha');
 if ($search_status == '') $search_status=-1;
 if ($search_user == '') $search_user=-1;
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $contextpage='expensereportlist';
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('expensereportlist'));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 51cd5a62d3f..9e463eb8ac4 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -76,7 +76,7 @@ $hideref 	 = (GETPOST('hideref','int') ? GETPOST('hideref','int') : (! empty($co
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'ficheinter', $id, 'fichinter');
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('interventioncard','globalcard'));
 
 $object = new Fichinter($db);
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 68d4e2bef34..0404f976328 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -82,7 +82,7 @@ $search_desc=GETPOST('search_desc','alpha');
 $search_status=GETPOST('search_status');
 $optioncss = GETPOST('optioncss','alpha');
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array($contextpage));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 7b24ee4f082..e5e42042015 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -58,7 +58,7 @@ $extrafields = new ExtraFields($db);
 // fetch optionals attributes and labels
 $extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('suppliercard','globalcard'));
 
 
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index f77eb949c9a..2137e7ca747 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -92,7 +92,7 @@ $datelivraison=dol_mktime(GETPOST('liv_hour','int'), GETPOST('liv_min','int'), G
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'fournisseur', $id, '', 'commande');
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('ordersuppliercard','globalcard'));
 
 $object = new CommandeFournisseur($db);
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 86fb7e5c4f5..9e8d841e976 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -114,10 +114,10 @@ if (! $sortorder) $sortorder='DESC';
 
 if ($search_status == '') $search_status=-1;
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $contextpage='supplierorderlist';
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('orderlist'));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php
index 9fb9a63828d..a503776b653 100644
--- a/htdocs/fourn/commande/orderstoinvoice.php
+++ b/htdocs/fourn/commande/orderstoinvoice.php
@@ -88,7 +88,7 @@ if ($action == 'create')
 	}
 }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 include_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
 $hookmanager = new HookManager($db);
 $hookmanager->initHooks(array('orderstoinvoicesupplier'));
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 0ec657ccdfe..306ad62d69b 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -81,7 +81,7 @@ $socid='';
 if (! empty($user->societe_id)) $socid=$user->societe_id;
 $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('invoicesuppliercard','globalcard'));
 
 $object=new FactureFournisseur($db);
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 782a78981ed..0e19c73615b 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -116,7 +116,7 @@ $pagenext = $page + 1;
 if (! $sortorder) $sortorder="DESC";
 if (! $sortfield) $sortfield="f.datef,f.rowid";
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $contextpage='supplierinvoicelist';
 
 $diroutputmassaction=$conf->fournisseur->facture->dir_output . '/temp/massgeneration/'.$user->id;
@@ -125,7 +125,7 @@ $object=new FactureFournisseur($db);
 
 $now=dol_now();
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('supplierinvoicelist'));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index f51246d8eea..59b6e2a27e9 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -79,7 +79,7 @@ if ($user->societe_id > 0)
 }
 
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('paymentsupplier'));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php
index 4bfcc4611e6..bf8dc3e9bed 100644
--- a/htdocs/livraison/card.php
+++ b/htdocs/livraison/card.php
@@ -74,7 +74,7 @@ $extralabelslines=$extrafieldsline->fetch_name_optionals_label($object->table_el
 // Load object. Make an object->fetch
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('deliverycard','globalcard'));
 
 /*
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 26f455131cd..67458a66445 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -643,7 +643,7 @@ if (! defined('NOLOGIN'))
         }
         else
 		{
-	       // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+	       // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 	       $hookmanager->initHooks(array('main'));
 
 	       // Code for search criteria persistence.
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index 3c9e721b3f6..d7257a3cb1d 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -52,7 +52,7 @@ if (! $sortfield) $sortfield="f.datef";
 $object = new Societe($db);
 if ($socid > 0) $object->fetch($socid);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('thirdpartymargins','globalcard'));
 
 
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 02ad2f5172c..d42dc87b4b9 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -113,7 +113,7 @@ $fieldvalue = (! empty($id) ? $id : (! empty($ref) ? $ref : ''));
 $fieldtype = (! empty($ref) ? 'ref' : 'rowid');
 $result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype,$objcanvas);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('productcard','globalcard'));
 
 
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 2cf2f36b419..2b76fb0a111 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -50,7 +50,7 @@ $fieldtype = (! empty($ref) ? 'ref' : 'rowid');
 if ($user->societe_id) $socid=$user->societe_id;
 $result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('productdocuments'));
 
 // Get parameters
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index a12499e4eac..84532ad219e 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -65,7 +65,7 @@ $fieldtype = (! empty($ref) ? 'ref' : 'rowid');
 if ($user->societe_id) $socid=$user->societe_id;
 $result=restrictedArea($user,'produit|service&fournisseur',$fieldvalue,'product&product','','',$fieldtype);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('pricesuppliercard','globalcard'));
 
 $object = new ProductFournisseur($db);
diff --git a/htdocs/product/info.php b/htdocs/product/info.php
index e6011c7945c..b73883a9aa0 100644
--- a/htdocs/product/info.php
+++ b/htdocs/product/info.php
@@ -36,7 +36,7 @@ $ref = GETPOST('ref','alpha');
 
 $result=restrictedArea($user,'produit|service',$id,'product&product');
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('infoproduct'));
 
 $object = new Product($db);
diff --git a/htdocs/product/list-with-listview.php b/htdocs/product/list-with-listview.php
index 947cfaecbc2..8e4218db227 100644
--- a/htdocs/product/list-with-listview.php
+++ b/htdocs/product/list-with-listview.php
@@ -93,7 +93,7 @@ $contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'productser
 if ((string) $type == '1') { $contextpage='servicelist'; if ($search_type=='') $search_type='1'; }
 if ((string) $type == '0') { $contextpage='productlist'; if ($search_type=='') $search_type='0'; }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array($contextpage));
 $extrafields = new ExtraFields($db);
 $form=new Form($db);
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 41f5cda1eb7..c1a6568f82b 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -72,7 +72,7 @@ if ($id > 0 || ! empty($ref))
 // Clean param
 if (! empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_MULTIPRICES_LIMIT)) $conf->global->PRODUIT_MULTIPRICES_LIMIT = 5;
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('productpricecard','globalcard'));
 
 
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index 94eeb756385..f4c0c66cdec 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -44,7 +44,7 @@ $socid='';
 if (! empty($user->societe_id)) $socid=$user->societe_id;
 $result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('productstatsorder'));
 
 $mesg = '';
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index 3201e7ed2e8..dafb2b5aafd 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -44,7 +44,7 @@ if (! empty($user->societe_id))
 	$socid = $user->societe_id;
 $result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array (
 		'productstatssupplyorder'
 ));
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index cae9c86104f..b5a8ec2b039 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -41,7 +41,7 @@ $fieldtype = (! empty($ref) ? 'ref' : 'rowid');
 if ($user->societe_id) $socid=$user->societe_id;
 $result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('productstatscontract'));
 
 $mesg = '';
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 92a80cf018e..d4f447128a1 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -45,7 +45,7 @@ $socid='';
 if (! empty($user->societe_id)) $socid=$user->societe_id;
 $result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('productstatsinvoice'));
 
 $showmessage=GETPOST('showmessage');
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index 8da1a68d9c2..5701b8960e5 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -46,7 +46,7 @@ $socid = '';
 if (! empty($user->societe_id)) $socid=$user->societe_id;
 $result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('productstatssupplyinvoice'));
 
 $mesg = '';
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index ec796422f0b..c9aa8fd85bc 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -43,7 +43,7 @@ $socid='';
 if (! empty($user->societe_id)) $socid=$user->societe_id;
 $result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array ('productstatspropal'));
 
 $mesg = '';
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 665d340f6f9..28e3f187f13 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -53,7 +53,7 @@ $backtopage=GETPOST("backtopage");
 // Security check
 $result=restrictedArea($user,'stock');
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('warehousecard','globalcard'));
 
 $object = new Entrepot($db);
diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
index 7a8010117a2..a227d62c5d9 100644
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -79,7 +79,7 @@ $pdluoid=GETPOST('pdluoid','int');
 // Initialize context for list
 $contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'movementlist';
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array($contextpage));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 81942468ab3..69421aa5624 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -96,7 +96,7 @@ if (! empty($canvas))
     $objcanvas->getCanvas('stockproduct','card',$canvas);
 }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('stockproductcard','globalcard'));
 
 
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 174d93f4aef..e8c48352120 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -51,7 +51,7 @@ if ($id == '' && $ref == '' && ($action != "create" && $action != "add" && $acti
 $mine = GETPOST('mode')=='mine' ? 1 : 0;
 //if (! $user->rights->projet->all->lire) $mine=1;	// Special for projects
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('projectcard','globalcard'));
 
 $object = new Project($db);
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 827719148fe..0c638f8dd6b 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -99,7 +99,7 @@ if ($search_status == '') $search_status=-1;	// -1 or 1
 // Initialize context for list
 $contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'projectlist';
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array($contextpage));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 064281633c8..a9e50f96f91 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -64,7 +64,7 @@ $socid=0;
 //if ($user->societe_id > 0) $socid = $user->societe_id;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
 $result = restrictedArea($user, 'projet', $id, 'projet&project');
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('projecttaskcard','globalcard'));
 
 $progress=GETPOST('progress', 'int');
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 18f133513b1..47387ec625a 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -70,7 +70,7 @@ $search_eyear	= GETPOST('search_eyear','int');
 // Initialize context for list
 $contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'tasklist';
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array($contextpage));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 6018b8bef69..2d35be97f4a 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -50,7 +50,7 @@ $socid=0;
 //if ($user->societe_id > 0) $socid = $user->societe_id;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
 if (! $user->rights->projet->lire) accessforbidden();
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('projecttaskcard','globalcard'));
 
 $object = new Task($db);
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 08eb429f664..2ace6736889 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -69,7 +69,7 @@ $pagenext = $page + 1;
 if (! $sortfield) $sortfield='t.task_date,t.task_datehour,t.rowid';
 if (! $sortorder) $sortorder='DESC';
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('projecttaskcard','globalcard'));
 
 $object = new Task($db);
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index d5db9866c1f..a24b43b806a 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -45,7 +45,7 @@ $conf->dol_use_jmobile=GETPOST('dol_use_jmobile','int');
 global $dolibarr_main_demo;
 if (empty($dolibarr_main_demo)) accessforbidden('Parameter dolibarr_main_demo must be defined in conf file with value "default login,default pass" to enable the demo entry page',0,0,1);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $res=$hookmanager->initHooks(array('demo'));
 
 $demoprofiles=array();
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index 15ea29e9954..4d1ce4da9c7 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -61,7 +61,7 @@ $pagenext = $page + 1;
 if (! $sortfield) $sortfield='a.datep,a.id';
 if (! $sortorder) $sortorder='DESC';
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('agendathirdparty'));
 
 
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index d6710f68c92..e26b4733c84 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -69,7 +69,7 @@ $extrafields = new ExtraFields($db);
 // fetch optionals attributes and labels
 $extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('thirdpartycard','globalcard'));
 
 if ($action == 'view' && $object->fetch($socid)<=0)
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 29bc06ff760..1fcd73f0ddc 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -78,7 +78,7 @@ $langs->load("interventions");
 $langs->load("contracts");
 $langs->load("products");
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('consumptionthirdparty'));
 
 
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 422768bce31..3bde7f09967 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -95,7 +95,7 @@ $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $contextpage='thirdpartylist';
 /*if ($search_type == '1,3') { $contextpage='customerlist'; $type='c'; }
 if ($search_type == '2,3') { $contextpage='prospectlist'; $type='p'; }
@@ -105,7 +105,7 @@ if ($type == 'c') { $contextpage='customerlist'; if ($search_type=='') $search_t
 if ($type == 'p') { $contextpage='prospectlist'; if ($search_type=='') $search_type='2,3'; }
 if ($type == 'f') { $contextpage='supplierlist'; if ($search_type=='') $search_type='4'; }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array($contextpage));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index eacd047d93a..8487185ecd5 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -59,7 +59,7 @@ $now=dol_now();
 
 $object = new Societe($db);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('thirdpartynotification','globalcard'));
 
 
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index 952a34a9a59..05e39ffc576 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -52,7 +52,7 @@ $result = restrictedArea($user, 'societe', $socid, '&societe');
 
 $object = new Societe($db);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('thirdpartycustomerprice','globalcard'));
 
 
diff --git a/htdocs/societe/project.php b/htdocs/societe/project.php
index 72c371ce934..df2deb9da0c 100644
--- a/htdocs/societe/project.php
+++ b/htdocs/societe/project.php
@@ -39,7 +39,7 @@ $socid = GETPOST('socid','int');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'societe', $socid, '&societe');
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('projectthirdparty'));
 
 
diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php
index 36914d74585..cb5dffc3399 100644
--- a/htdocs/societe/rib.php
+++ b/htdocs/societe/rib.php
@@ -59,11 +59,11 @@ $extrafields = new ExtraFields($db);
 // fetch optionals attributes and labels
 $extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('thirdpartybancard','globalcard'));
 
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('thirdpartybancard'));
 
 
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 020473fee59..c7807d8c4e5 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -97,7 +97,7 @@ if ($id > 0 || ! empty($ref)) {
 		dol_print_error('', $object->error);
 }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('supplier_proposalcard','globalcard'));
 
 $permissionnote = $user->rights->supplier_proposal->creer; // Used by the include of actions_setnotes.inc.php
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index 7eb5d1323ed..e401fdbe710 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -96,7 +96,7 @@ if ($object_statut != '') $search_status=$object_statut;
 // Nombre de ligne pour choix de produit/service predefinis
 $NBLINES=4;
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $contextpage='supplierproposallist';
 
 // Security check
@@ -114,7 +114,7 @@ $result = restrictedArea($user, $module, $objectid, $dbtable);
 
 $diroutputmassaction=$conf->supplier_proposal->dir_output . '/temp/massgeneration/'.$user->id;
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('supplier_proposallist'));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php
index e789a8277f3..255b476eb61 100644
--- a/htdocs/user/agenda_extsites.php
+++ b/htdocs/user/agenda_extsites.php
@@ -67,7 +67,7 @@ $result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
 if (($object->id != $user->id) && (! $user->rights->user->user->lire))
   accessforbidden();
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('usercard','globalcard'));
 
 /*
diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php
index 1500a3be55c..2ba3c67d0b4 100644
--- a/htdocs/user/clicktodial.php
+++ b/htdocs/user/clicktodial.php
@@ -41,7 +41,7 @@ if ($user->id == $id)	// A user can always read its own card
 }
 $result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('usercard','globalcard'));
 
 /*
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index b15af46bcd8..bc4727feaa8 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -93,7 +93,7 @@ if ($id > 0 || ! empty($ref))
 	$upload_dir = $conf->user->multidir_output[$entitytouseforuserdir] . "/" . $object->id ;
 }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('usercard','globalcard'));
 
 
diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php
index 77532de7c3e..94a9c9c1883 100644
--- a/htdocs/user/group/perms.php
+++ b/htdocs/user/group/perms.php
@@ -72,7 +72,7 @@ if (! empty($conf->multicompany->enabled))
 		$entity=(! empty($object->entity) ? $object->entity : $conf->entity);
 }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('groupcard','globalcard'));
 
 
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index da5ddd99339..f5434f822d5 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -60,7 +60,7 @@ if (! $sortorder) $sortorder="ASC";
 // Initialize context for list
 $contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'userlist';
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array($contextpage));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php
index 252ed9f82b4..96c0ac881be 100644
--- a/htdocs/user/ldap.php
+++ b/htdocs/user/ldap.php
@@ -45,7 +45,7 @@ $object = new User($db);
 $object->fetch($id, '', '', 1);
 $object->getrights();
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('usercard','globalcard'));
 
 /*
diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index b9e8cb69869..1734e7286d4 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -49,7 +49,7 @@ $feature2 = (($socid && $user->rights->user->self->creer)?'':'user');
 if ($user->id == $id) $feature2=''; // A user can always read its own card
 $result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('usercard','globalcard'));
 
 
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 9ffeb05f280..8831b56f09a 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -78,7 +78,7 @@ $searchformtitle=array($langs->trans("Companies"),$langs->trans("Contacts"),$lan
 $form = new Form($db);
 $formadmin=new FormAdmin($db);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('usercard','globalcard'));
 
 
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index 041213fbe64..5d87232c928 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -79,7 +79,7 @@ if (! empty($conf->multicompany->enabled))
 		$entity=(! empty($object->entity) ? $object->entity : $conf->entity);
 }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('usercard','globalcard'));
 
 

From 5dfb988cb17042971ef9f0cc0b3b6ecab78fd9ba Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Sat, 10 Jun 2017 13:34:28 +0200
Subject: [PATCH 143/438] Fix 6944 compatibility PHP7 and missing parameter to
 call delete function

---
 htdocs/fourn/class/paiementfourn.class.php | 2 +-
 htdocs/fourn/facture/card.php              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index 12fccab91d8..03f3ecb0e21 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -533,7 +533,7 @@ class PaiementFourn extends Paiement
 	 *	@param		string	$option			Sur quoi pointe le lien
 	 *	@return		string					Chaine avec URL
 	 */
-	function getNomUrl($withpicto=0,$option='')
+	function getNomUrl($withpicto=0,$option='',$mode='withlistofinvoices')
 	{
 		global $langs;
 
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 0ec657ccdfe..813f23cdc88 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -218,7 +218,7 @@ if (empty($reshook))
 	{
 	    $object->fetch($id);
 	    $object->fetch_thirdparty();
-	    $result=$object->delete($id);
+	    $result=$object->delete($user, $id);
 	    if ($result > 0)
 	    {
 	        header('Location: list.php');

From a8e16910c0f22413d78651dde5d8b1e9495026d8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 13:44:20 +0200
Subject: [PATCH 144/438] Fix look and feel v6

---
 htdocs/comm/action/rapport/index.php      |  46 +++++++--
 htdocs/core/class/html.formfile.class.php | 116 +++++++++++-----------
 2 files changed, 95 insertions(+), 67 deletions(-)

diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index f6d01b18ca1..e83506d8206 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -26,6 +26,7 @@
 
 require '../../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/action/rapport.pdf.php';
@@ -71,6 +72,8 @@ if ($action == 'builddoc')
  * View
  */
 
+$formfile=new FormFile($db);
+
 llxHeader();
 
 $sql = "SELECT count(*) as cc,";
@@ -103,7 +106,7 @@ if ($resql)
 
 	$param='';
 	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-	
+
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -112,23 +115,24 @@ if ($resql)
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
-	
+
 	print_barre_liste($langs->trans("Actions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_agenda', 0, '', '', $limit);
 
 	$moreforfilter='';
-	
+
 	$i = 0;
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
     print '<tr class="liste_titre">';
-	print '<td>'.$langs->trans("Date").'</td>';
+	print '<td>'.$langs->trans("Period").'</td>';
 	print '<td align="center">'.$langs->trans("EventsNb").'</td>';
 	print '<td align="center">'.$langs->trans("Action").'</td>';
-	print '<td align="center">'.$langs->trans("PDF").'</td>';
+	print '<td>'.$langs->trans("PDF").'</td>';
 	print '<td align="center">'.$langs->trans("Date").'</td>';
 	print '<td align="center">'.$langs->trans("Size").'</td>';
 	print "</tr>\n";
+
 	$var=true;
 	while ($i < min($num,$limit))
 	{
@@ -136,23 +140,47 @@ if ($resql)
 
 		if ($obj)
 		{
-			
+
 			print '<tr class="oddeven">';
 
+			// Date
 			print "<td>".$obj->df."</td>\n";
+
+			// Nb of events
 			print '<td align="center">'.$obj->cc.'</td>';
 
+			// Button to build doc
 			print '<td align="center">';
-			print '<a href="'.$_SERVER["PHP_SELF"].'?action=builddoc&amp;page='.$page.'&amp;month='.$obj->month.'&amp;year='.$obj->year.'">'.img_picto($langs->trans('GenerateReport'),'filenew').'</a>';
+			print '<a href="'.$_SERVER["PHP_SELF"].'?action=builddoc&amp;page='.$page.'&amp;month='.$obj->month.'&amp;year='.$obj->year.'">'.img_picto($langs->trans('BuildDoc'),'filenew').'</a>';
 			print '</td>';
 
 			$name = "actions-".$obj->month."-".$obj->year.".pdf";
 			$relativepath= $name;
 			$file = $conf->agenda->dir_temp."/".$name;
+			$modulepart = 'actionsreport';
+			$documenturl= DOL_URL_ROOT.'/document.php';
+			if (isset($conf->global->DOL_URL_ROOT_DOCUMENT_PHP)) $documenturl=$conf->global->DOL_URL_ROOT_DOCUMENT_PHP;    // To use another wrapper
 
 			if (file_exists($file))
 			{
-				print '<td align="center"><a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?page='.$page.'&amp;file='.urlencode($relativepath).'&amp;modulepart=actionsreport">'.img_pdf().'</a></td>';
+				print '<td class="tdoverflowmax300">';
+				//print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?page='.$page.'&amp;file='.urlencode($relativepath).'&amp;modulepart=actionsreport">'.img_pdf().'</a>';
+
+				$filearray=array('name'=>basename($file),'fullname'=>$file,'type'=>'file');
+				$out='';
+
+				// Show file name with link to download
+				$tmp = $formfile->showPreview($filearray,$modulepart,$relativepath,0,$param);
+				$out.= ($tmp?$tmp.' ':'');
+				$out.= '<a href="'.$documenturl.'?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).($param?'&'.$param:'').'"';
+				$mime=dol_mimetype($relativepath,'',0);
+				if (preg_match('/text/',$mime)) $out.= ' target="_blank"';
+				$out.= ' target="_blank">';
+				$out.= img_mime($filearray["name"],$langs->trans("File").': '.$filearray["name"]).' '.$filearray["name"];
+				$out.= '</a>'."\n";
+                print $out;
+
+				print '</td>';
 				print '<td align="center">'.dol_print_date(dol_filemtime($file),'dayhour').'</td>';
 				print '<td align="center">'.dol_print_size(dol_filesize($file)).'</td>';
 			}
@@ -169,7 +197,7 @@ if ($resql)
 	print "</table>";
 	print '</div>';
 	print '</form>';
-	
+
 	$db->free($resql);
 }
 else
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index e263efeaa57..89cf70951ad 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -35,7 +35,7 @@
 class FormFile
 {
     private $db;
-    
+
     public $error;
     public $numoffiles;
     public $infofiles;			// Used to return informations by function getDocumentsLink
@@ -332,11 +332,11 @@ class FormFile
 							jQuery(\'#togglemassfilesarea\').text("('.dol_escape_js($langs->trans("Hide")).')");
 						}
 						return false;
-					});		
+					});
 				});
 				</script>';
-        }        
-        
+        }
+
         $titletoshow=$langs->trans("Documents");
         if (! empty($title)) $titletoshow=$title;
 
@@ -593,7 +593,7 @@ class FormFile
             if (empty($noform)) $out.= '<form action="'.$urlsource.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc').'" id="'.$forname.'_form" method="post">';
             $out.= '<input type="hidden" name="action" value="builddoc">';
             $out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-            
+
             $out.= load_fiche_titre($titletoshow, '', '');
             $out.= '<div class="div-table-responsive-no-min">';
             $out.= '<table class="liste formdoc noborder" summary="listofdocumentstable" width="100%">';
@@ -682,9 +682,9 @@ class FormFile
                 $sortfield = $sortorder = null;
                 $res = $link->fetchAll($link_list, $object->element, $object->id, $sortfield, $sortorder);
             }
-            
+
             $out.= '<!-- html.formfile::showdocuments -->'."\n";
-            
+
             // Show title of array if not already shown
             if ((! empty($file_list) || ! empty($link_list) || preg_match('/^massfilesarea/', $modulepart)) && ! $headershown)
             {
@@ -706,8 +706,8 @@ class FormFile
 					$out.= '<tr class="oddeven">';
 
 					$documenturl = DOL_URL_ROOT.'/document.php';
-					if (isset($conf->global->DOL_URL_ROOT_DOCUMENT_PHP)) $documenturl=$conf->global->DOL_URL_ROOT_DOCUMENT_PHP;
-					
+					if (isset($conf->global->DOL_URL_ROOT_DOCUMENT_PHP)) $documenturl=$conf->global->DOL_URL_ROOT_DOCUMENT_PHP;    // To use another wrapper
+
 					// Show file name with link to download
 					$out.= '<td class="tdoverflowmax300">';
                     $tmp = $this->showPreview($file,$modulepart,$relativepath,0,$param);
@@ -774,7 +774,7 @@ class FormFile
             if (is_array($link_list))
             {
                 $colspan=2;
-                    
+
                 foreach($link_list as $file)
                 {
                     $out.='<tr class="oddeven">';
@@ -791,7 +791,7 @@ class FormFile
                 }
                 $this->numoffiles++;
             }
-            
+
 		 	if (count($file_list) == 0 && count($link_list) == 0 && $headershown)
             {
 	        	$out.='<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
@@ -835,7 +835,7 @@ class FormFile
     	$this->infofiles=array('nboffiles'=>0,'extensions'=>array(),'files'=>array());
 
     	//if (! empty($conf->dol_use_jmobile)) return '';
-  	 
+
 		$file_list=dol_dir_list($filedir, 'files', 0, preg_quote(basename($modulesubdir),'/').'[^\-]+', '\.meta$|\.png$');	// Get list of files starting with name of ref (but not followed by "-" to discard uploaded files)
 
     	// For ajax treatment
@@ -876,7 +876,7 @@ class FormFile
                     $tmparray = getAdvancedPreviewUrl($modulepart, $relativepath, 1, '&entity='.$entity);
                     if ($tmparray && $tmparray['url']) $tmpout.= '<li><a href="'.$tmparray['url'].'"'.($tmparray['css']?' class="'.$tmparray['css'].'"':'').($tmparray['mime']?' mime="'.$tmparray['mime'].'"':'').($tmparray['target']?' target="'.$tmparray['target'].'"':'').'>'.img_picto('','detail').' '.$langs->trans("Preview").' '.$ext.'</a></li>';
     			}
-    			
+
     			// Download
     		    $tmpout.= '<li><a class="pictopreview" href="'.DOL_URL_ROOT . '/document.php?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).'"';
     			$mime=dol_mimetype($relativepath,'',0);
@@ -946,7 +946,7 @@ class FormFile
 		if ($upload_dir)
 		{
     		$relativedir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dir);
-    		$relativedir = preg_replace('/^[\\/]/','',$relativedir); 
+    		$relativedir = preg_replace('/^[\\/]/','',$relativedir);
 		}
 
 		$hookmanager->initHooks(array('formfile'));
@@ -983,7 +983,7 @@ class FormFile
 			        if ($user->rights->service->creer && $object->type == Product::TYPE_SERVICE) $permtoeditline=1;
 			    }
 			}
-			if (empty($conf->global->MAIN_UPLOAD_DOC)) 
+			if (empty($conf->global->MAIN_UPLOAD_DOC))
 			{
 			    $permtoeditline=0;
 			    $permonobject=0;
@@ -992,7 +992,7 @@ class FormFile
 			// Show list of existing files
 			if (empty($useinecm)) print load_fiche_titre($title?$title:$langs->trans("AttachedFiles"));
 			if (empty($url)) $url=$_SERVER["PHP_SELF"];
-			
+
 			print '<!-- html.formfile::list_of_documents -->'."\n";
 			if (GETPOST('action','aZ09') == 'editfile' && $permtoeditline)
 			{
@@ -1003,7 +1003,7 @@ class FormFile
 			}
 			print '<div class="div-table-responsive-no-min">';
 			print '<table width="100%" id="tablelines" class="'.($useinecm?'liste noborder':'liste').'">'."\n";
-			
+
 			print '<tr class="liste_titre nodrag nodrop">';
 			print_liste_field_titre($langs->trans("Documents2"),$url,"name","",$param,'align="left"',$sortfield,$sortorder);
 			print_liste_field_titre($langs->trans("Size"),$url,"size","",$param,'align="right"',$sortfield,$sortorder);
@@ -1017,10 +1017,10 @@ class FormFile
 			if ($relativedir)
 			{
                 $filearrayindatabase = dol_dir_list_in_database($relativedir, '', null, 'name', SORT_ASC);
-    
+
                 //var_dump($filearray);
                 //var_dump($filearrayindatabase);
-                
+
                 // Complete filearray with properties found into $filearrayindatabase
     			foreach($filearray as $key => $val)
     			{
@@ -1040,7 +1040,7 @@ class FormFile
     			            break;
     			        }
     			    }
-    			    
+
     			    if (! $found)    // This happen in transition towerd version 6, or if files were added manually into os dir.
     			    {
     			        $filearray[$key]['position']='999999';     // File not indexed are at end. So if we add a file, it will not replace an existing position
@@ -1053,13 +1053,13 @@ class FormFile
         			        dol_syslog("list_of_documents We found a file called '".$filearray[$key]['name']."' not indexed into database. We add it");
         			        include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
         			        $ecmfile=new EcmFiles($this->db);
-        			        	
+
         			        // Add entry into database
         			        $filename = basename($rel_filename);
         			        $rel_dir = dirname($rel_filename);
         			        $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
         			        $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
-        			         
+
         			        $ecmfile->filepath = $rel_dir;
         			        $ecmfile->filename = $filename;
         			        $ecmfile->label = md5_file(dol_osencode($filearray[$key]['fullname']));        // $destfile is a full path to file
@@ -1083,21 +1083,21 @@ class FormFile
     			        }
     			    }
     			}
-    
+
     			/*var_dump($filearray);
     			var_dump($sortfield);
     			var_dump($sortorder);*/
-    			 
+
     			if ($sortfield && $sortorder)
     			{
         			$filearray=dol_sort_array($filearray, $sortfield, $sortorder);
     			}
     			//var_dump($filearray);
 			}
-			
+
 			$nboffiles=count($filearray);
 			if ($nboffiles > 0) include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
-				
+
 			$var=true; $i=0; $nboflines = 0; $lastrowid=0;
 			foreach($filearray as $key => $file)      // filearray must be only files here
 			{
@@ -1105,10 +1105,10 @@ class FormFile
 						&& $file['name'] != '..'
 						&& ! preg_match('/\.meta$/i',$file['name']))
 				{
-					
-					
+
+
 					if ($filearray[$key]['rowid'] > 0) $lastrowid = $filearray[$key]['rowid'];
-					
+
 					$editline=0;
 					$nboflines++;
 			        print '<!-- Line list_of_documents '.$key.' relativepath = '.$relativepath.' -->'."\n";
@@ -1116,11 +1116,11 @@ class FormFile
 			        print '<!-- In database: position='.$filearray[$key]['position'].' -->'."\n";
 					print '<tr id="row-'.($filearray[$key]['rowid']>0?$filearray[$key]['rowid']:'-AFTER'.$lastrowid.'POS'.($i+1)).'" '.$bcdd[$var].'>';
 					print '<td class="tdoverflowmax300">';
-					
+
 					$filepath=$relativepath.$file['name'];
-					
+
 					if (! $editline) print $this->showPreview($file,$modulepart,$filepath);
-					
+
 					//print "XX".$file['name'];	//$file['name'] must be utf8
 					print '<a class="paddingleft" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
 					if ($forcedownload) print '&attachment=1';
@@ -1143,13 +1143,13 @@ class FormFile
 					    print $file['name'];
 					    print '</a>';
 					}
-					
+
 					print "</td>\n";
-					
+
 					print '<td align="right" width="80px">'.dol_print_size($file['size'],1,1).'</td>';
-					
+
 					print '<td align="center" width="130px">'.dol_print_date($file['date'],"dayhour","tzuser").'</td>';
-				
+
 					// Preview
 					if (empty($useinecm))
 					{
@@ -1175,7 +1175,7 @@ class FormFile
     					// Delete or view link
     					// ($param must start with &)
     					print '<td class="valignmiddle right"><!-- action on files -->';
-    					if ($useinecm)     
+    					if ($useinecm)
     					{
     					    print '<a href="'.DOL_URL_ROOT.'/ecm/docfile.php?urlfile='.urlencode($file['name']).$param.'" class="editfilelink" rel="'.urlencode($file['name']).'">'.img_view('default', 0, 'class="paddingrightonly"').'</a>';
     					}
@@ -1183,10 +1183,10 @@ class FormFile
     					{
         					$newmodulepart=$modulepart;
         					if (in_array($modulepart, array('product','produit','service'))) $newmodulepart='produit|service';
-    						
-        					$disablecrop=1; 
+
+        					$disablecrop=1;
         					if (in_array($modulepart, array('product','produit','service','expensereport','holiday','project','user'))) $disablecrop=0;
-        					
+
     					    if (! $disablecrop && image_format_supported($file['name']) > 0)
     						{
     							if ($permtoeditline)
@@ -1195,7 +1195,7 @@ class FormFile
        			               		print '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode($newmodulepart).'&id='.$object->id.'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension'])).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"),DOL_URL_ROOT.'/theme/common/transform-crop-and-resize','class="paddingrightonly"',1).'</a>';
     							}
     						}
-    						
+
     						if ($permtoeditline)
     						{
     						    print '<a href="'.(($useinecm && $useajax)?'#':$url.'?action=editfile&urlfile='.urlencode($filepath).$param).'" class="editfilelink" rel="'.$filepath.'">'.img_edit('default',0,'class="paddingrightonly"').'</a>';
@@ -1213,15 +1213,15 @@ class FormFile
     						if (! empty($conf->dol_use_jmobile)) $useajax=0;
     						if (empty($conf->use_javascript_ajax)) $useajax=0;
     						if (! empty($conf->global->MAIN_ECM_DISABLE_JS)) $useajax=0;
-    
+
     						print '<a href="'.(($useinecm && $useajax)?'#':$url.'?action=delete&urlfile='.urlencode($filepath).$param).'" class="deletefilelink" rel="'.$filepath.'">'.img_delete().'</a>';
     					}
 					    print "</td>";
 
 					    if (empty($disablemove))
 					    {
-    					    if ($nboffiles > 1 && empty($conf->browser->phone)) { 
-    					    	print '<td align="center" class="linecolmove tdlineupdown">'; 
+    					    if ($nboffiles > 1 && empty($conf->browser->phone)) {
+    					    	print '<td align="center" class="linecolmove tdlineupdown">';
     					    	if ($i > 0) {
     					    		print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=up&amp;rowid='.$line->id.'">'.img_up('default',0,'imgupforline').'</a>';
     					    	}
@@ -1245,7 +1245,7 @@ class FormFile
 					    if (empty($disablemove)) print '<td class="right"></td>';
 					}
 					print "</tr>\n";
-					
+
 					$i++;
 				}
 			}
@@ -1260,19 +1260,19 @@ class FormFile
 			}
 			print "</table>";
 			print '</div>';
-			
-			if (! $editline && $nboflines > 1) { 
+
+			if (! $editline && $nboflines > 1) {
 				if (! empty($conf->use_javascript_ajax) && $permtoeditline) {
 				    $table_element_line = 'ecm_files';
 				    include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
 				}
-			}				
-			
+			}
+
 			if (GETPOST('action','aZ09') == 'editfile' && $permtoeditline)
 			{
 			    print '</form>';
 			}
-			    	
+
 			return $nboffiles;
 		}
 	}
@@ -1449,19 +1449,19 @@ class FormFile
 
                 if (! $found > 0 || ! is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) continue;    // We do not show orphelins files
 
-                
+
                 print '<!-- Line list_of_autoecmfiles '.$key.' -->'."\n";
                 print '<tr class="oddeven">';
                 print '<td>';
                 if ($found > 0 && is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) print $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]->getNomUrl(1,'document');
                 else print $langs->trans("ObjectDeleted",($id?$id:$ref));
-                
+
                 $filename=dol_sanitizeFileName($ref);
                 //$filedir=$conf->$modulepart->dir_output . '/' . dol_sanitizeFileName($obj->ref);
                 $filedir=$file['path'];
                 //$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
                 //print $formfile->getDocumentsLink($modulepart, $filename, $filedir);
-                
+
                 print '</td>';
                 print '<td>';
                 //print "XX".$file['name']; //$file['name'] must be utf8
@@ -1471,9 +1471,9 @@ class FormFile
                 print img_mime($file['name'],$file['name'].' ('.dol_print_size($file['size'],0,0).')').' ';
                 print dol_trunc($file['name'],$maxlength,'middle');
                 print '</a>';
-                
+
                 print $this->getDocumentsLink($modulepart, $filename, $filedir);
-                
+
                 print "</td>\n";
                 print '<td align="right">'.dol_print_size($file['size'],1,1).'</td>';
                 print '<td align="center">'.dol_print_date($file['date'],"dayhour").'</td>';
@@ -1668,11 +1668,11 @@ class FormFile
 
         return $nboflinks;
     }
-    
-    
+
+
     /**
      * Show detail icon with link for preview
-     * 
+     *
      * @param   array     $file           File
      * @param   string    $modulepart     propal, facture, facture_fourn, ...
      * @param   string    $relativepath   Relative path of docs

From 6ab47a845e9c1bcb8df1c792d6cb36121ca2ef07 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 13:54:43 +0200
Subject: [PATCH 145/438] Fix look and feel v6

---
 htdocs/comm/action/listactions.php           | 22 ++++++------
 htdocs/core/class/html.formactions.class.php | 37 +++++++++++++-------
 2 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index 7bedc4d8356..01094a78164 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -47,12 +47,12 @@ $status=GETPOST("status",'alpha');
 $type=GETPOST('type');
 $optioncss = GETPOST('optioncss','alpha');
 // Set actioncode (this code must be same for setting actioncode into peruser, listacton and index)
-if (GETPOST('actioncode','array')) 
+if (GETPOST('actioncode','array'))
 {
     $actioncode=GETPOST('actioncode','array',3);
     if (! count($actioncode)) $actioncode='0';
 }
-else 
+else
 {
     $actioncode=GETPOST("actioncode","alpha",3)?GETPOST("actioncode","alpha",3):(GETPOST("actioncode")=='0'?'0':(empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE)?'':$conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
@@ -337,11 +337,11 @@ if ($resql)
     if ($pid)    $nav.='<input type="hidden" name="projectid" value="'.$pid.'">';
     if ($usergroup) $nav.='<input type="hidden" name="usergroup" value="'.$usergroup.'">';
     print $nav;
-    
+
     print_barre_liste($s, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $link, $num, -1 * $nbtotalofrecords, '', 0, $nav, '', $limit);
 
     $moreforfilter='';
-    
+
     $i = 0;
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
@@ -369,11 +369,11 @@ if ($resql)
 	print $searchpicto;
 	print '</td>';
 	print "</tr>\n";
-	
+
 	print '<tr class="liste_titre">';
 	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"a.id",$param,"","",$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Title"),$_SERVER["PHP_SELF"],"a.label",$param,"","",$sortfield,$sortorder);
-	//if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) 
+	//if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
 	print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"c.libelle",$param,"","",$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("DateStart"),$_SERVER["PHP_SELF"],"a.datep",$param,'','align="center"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("DateEnd"),$_SERVER["PHP_SELF"],"a.datep2",$param,'','align="center"',$sortfield,$sortorder);
@@ -392,7 +392,7 @@ if ($resql)
 	require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
 	$caction=new CActionComm($db);
 	$arraylist=$caction->liste_array(1, 'code', '', (empty($conf->global->AGENDA_USE_EVENT_TYPE)?1:0));
-	
+
 	$var=true;
 	while ($i < min($num,$limit))
 	{
@@ -405,15 +405,13 @@ if ($resql)
         	continue;
         }
 
-		
-
 		$actionstatic->id=$obj->id;
 		$actionstatic->ref=$obj->id;
 		$actionstatic->type_code=$obj->type_code;
 		$actionstatic->type_label=$obj->type_label;
 		$actionstatic->type_picto=$obj->type_picto;
 		$actionstatic->label=$obj->label;
-		
+
 		print '<tr class="oddeven">';
 
 		// Action (type)
@@ -443,7 +441,7 @@ if ($resql)
 		if (! empty($arraylist[$labeltype])) $labeltype=$arraylist[$labeltype];
 		print dol_trunc($labeltype,28);
 		print '</td>';
-		
+
 		// Start date
 		print '<td align="center" class="nowrap">';
 		print dol_print_date($db->jdate($obj->dp),"dayhour");
@@ -514,7 +512,7 @@ if ($resql)
 		print '<td align="center" class="nowrap">'.$actionstatic->LibStatut($obj->percent,3,1,$datep).'</td>';
 
 		print '<td></td>';
-		
+
 		print "</tr>\n";
 		$i++;
 	}
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 456faa7931e..a6ec8db928a 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -188,9 +188,9 @@ class FormActions
         	print load_fiche_titre($title, $buttontoaddnewevent, '');
 
         	$page=0; $param=''; $sortfield='a.datep';
-        	
-        	$total = 0; 
-        	
+
+        	$total = 0;
+
         	print '<div class="div-table-responsive">';
         	print '<table class="noborder'.($morecss?' '.$morecss:'').'" width="100%">';
         	print '<tr class="liste_titre">';
@@ -209,12 +209,23 @@ class FormActions
         	{
         		$ref=$action->getNomUrl(1,-1);
         		$label=$action->getNomUrl(0,38);
-                
-        		
+
         		print '<tr class="oddeven">';
 				print '<td>'.$ref.'</td>';
         		print '<td>'.$label.'</td>';
-        		print '<td>'.$action->type.'</td>';
+        		print '<td>';
+        		if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
+        		{
+        		    if ($action->type_picto) print img_picto('', $action->type_picto);
+        		    else {
+        		        if ($action->type_code == 'AC_RDV')   print img_picto('', 'object_group').' ';
+        		        if ($action->type_code == 'AC_TEL')   print img_picto('', 'object_phoning').' ';
+        		        if ($action->type_code == 'AC_FAX')   print img_picto('', 'object_phoning_fax').' ';
+        		        if ($action->type_code == 'AC_EMAIL') print img_picto('', 'object_email').' ';
+        		    }
+        		}
+        		print $action->type;
+        		print '</td>';
         		print '<td>'.dol_print_date($action->datep,'dayhour');
         		if ($action->datef)
         		{
@@ -233,7 +244,7 @@ class FormActions
         			$userstatic->id = $action->author->id;
         			$userstatic->firstname = $action->author->firstname;
         			$userstatic->lastname = $action->author->lastname;
-        			print $userstatic->getNomUrl(1);
+        			print $userstatic->getNomUrl(1, '', 0, 0, 16, 0, '', '');
         		}
         		print '</td>';
         		print '<td align="right">';
@@ -285,22 +296,22 @@ class FormActions
        	if (! empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO)) unset($arraylist['AC_OTH_AUTO']);
 
        	$out='';
-       	
-		if (! empty($multiselect)) 
+
+		if (! empty($multiselect))
 		{
 	        if (!is_array($selected) && !empty($selected)) $selected = explode(',', $selected);
 			$out.=$form->multiselectarray($htmlname, $arraylist, $selected, 0, 0, 'centpercent', 0, 0);
 		}
-		else 
+		else
 		{
 			$out.=$form->selectarray($htmlname, $arraylist, $selected);
 		}
-		
-        if ($user->admin && empty($onlyautoornot) && $hideinfohelp <= 0) 
+
+        if ($user->admin && empty($onlyautoornot) && $hideinfohelp <= 0)
         {
             $out.=info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup").($hideinfohelp == -1 ? ". ".$langs->trans("YouCanSetDefaultValueInModuleSetup") : ''),1);
         }
-        
+
         if ($nooutput) return $out;
         else print $out;
         return '';

From 0d24df9ffcd0762bc732da77bd80badf81f8af80 Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Sat, 10 Jun 2017 14:40:17 +0200
Subject: [PATCH 146/438] Fix 6939 new path for pictures is not used

---
 .../supplier_proposal/doc/pdf_aurore.modules.php   | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
index 3b2812c7b90..c546aad91ad 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -167,9 +167,17 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				$objphoto = new Product($this->db);
 				$objphoto->fetch($object->lines[$i]->fk_product);
 
-				$pdir = get_exdir($object->lines[$i]->fk_product,2,0,0,$objphoto,'product') . $object->lines[$i]->fk_product ."/photos/";
-				$dir = $conf->product->dir_output.'/'.$pdir;
-
+				if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
+				{
+					$pdir = get_exdir($object->lines[$i]->fk_product,2,0,0,$objphoto,'product') . $object->lines[$i]->fk_product ."/photos/";
+					$dir = $conf->product->dir_output.'/'.$pdir;
+				}
+				else
+				{
+					$pdir = get_exdir(0,2,0,0,$objphoto,'product') . dol_sanitizeFileName($objphoto->ref).'/';
+					$dir = $conf->product->dir_output.'/'.$pdir;
+				}
+				
 				$realpath='';
 				foreach ($objphoto->liste_photos($dir,1) as $key => $obj)
 				{

From b6af1f7e6effed2bad4d06b15cb0ba7b8787ee90 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 15:21:49 +0200
Subject: [PATCH 147/438] Fix responsive design

---
 htdocs/public/demo/demo.css  |  5 +++++
 htdocs/public/demo/index.php | 31 ++++++++++++++++---------------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/htdocs/public/demo/demo.css b/htdocs/public/demo/demo.css
index dd1f7aad7b7..daf4f20e585 100644
--- a/htdocs/public/demo/demo.css
+++ b/htdocs/public/demo/demo.css
@@ -65,6 +65,11 @@ a:hover {
 }
 @media only screen and (max-width: 420px)
 {
+	.demomaxoveflow {
+	    max-width: none !important;
+	    overflow: hidden;
+	    text-overflow: ellipsis;
+	}
 	.csscolumns {
 		-webkit-column-count: 1; /* Chrome, Safari, Opera */
 	    -moz-column-count: 1; /* Firefox */
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index a24b43b806a..fe8da7ee072 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -316,7 +316,7 @@ foreach ($demoprofiles as $profilearray)
 		{
 		    print '<div class="clearboth"></div>';
 		}
-		
+
 		print '<form method="POST" class="valigntop inline-block" name="form'.$profilearray['key'].'" action="'.$_SERVER["PHP_SELF"].'#a1'.$profilearray['key'].'">'."\n";
 		print '<input type="hidden" name="action" value="gotodemo">'."\n";
         print '<input type="hidden" name="urlfrom" value="'.dol_escape_htmltag($urlfrom).'">'."\n";
@@ -328,34 +328,35 @@ foreach ($demoprofiles as $profilearray)
         print '<input type="hidden" name="dol_no_mouse_hover" value="'.$conf->dol_no_mouse_hover.'">'."\n";
         print '<input type="hidden" name="dol_use_jmobile" value="'.$conf->dol_use_jmobile.'">'."\n";
 
-        print '<div summary="Dolibarr online demonstration for profile '.$profilearray['label'].'" class="center inline-block CTable CTableRow'.($i%2==0?'1':'0').'" style="width: 400px;">'."\n";
+        print '<div summary="Dolibarr online demonstration for profile '.$profilearray['label'].'" class="center inline-block CTable CTableRow'.($i%2==0?'1':'0').'" style="width: 340px;">'."\n";
+
 
-        
         print '<div id="a1'.$profilearray['key'].'" class="demobox '.(empty($profilearray['url'])?'modulelineshow cursorpointer':'nomodulelines').'">';
 
         print '<a href="'.$urlwithmod.'" class="'.(empty($profilearray['url'])?'modulelineshow':'nomodulelines').'">';
 		print '<div style="padding: 10px;">';
-        
+
 		print '<img class="demothumb" src="'.$profilearray['icon'].'" alt="Demo '.$profilearray['label'].'">';
-		
+
 		print '<div class="clearboth"></div>';
-	
+
 		print '<div class="demothumbtext">';
     	print $langs->trans($profilearray['label']);
     	print '</div>';
-    	
+
     	print '</div>';
     	print '</a>';
-    	 
-    	
+
+
         // Modules
         if (empty($profilearray['url']))
         {
-    		print '<div id="tr1'.$profilearray['key'].'" class="moduleline hidden" style="font-size:14px; line-height: 110%; padding-bottom: 8px">';
-    		
-    		print $langs->trans("ThisIsListOfModules").'<br>';
+    		print '<div id="tr1'.$profilearray['key'].'" class="moduleline hidden" style="margin-left: 8px; margin-right: 8px; text-align: justify; font-size:14px; line-height: 130%; padding-bottom: 8px">';
+
+    		print $langs->trans("ThisIsListOfModules").'<br><br>';
+
     		print '<div class="csscolumns">';
-    		
+
     		$listofdisabledmodules=explode(',',$profilearray['disablemodules']);
     		$j=0;
     		$nbcolsmod=empty($conf->dol_optimize_smallscreen)?4:3;
@@ -395,10 +396,10 @@ foreach ($demoprofiles as $profilearray)
 
     		print '</div>';
 
-		    print '<div class="center">';
+		    print '<br><div class="center">';
 		    print '<input type="submit" value=" &nbsp; &nbsp; '.$langs->trans("Start").' &nbsp; &nbsp; " class="button">';
 		    print '</div>';
-    	
+
 		    print '</div>';
         }
 

From 6b4e22ec3cf1f75eef5c0923fafd9f942e2e9fcf Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Sat, 10 Jun 2017 16:07:56 +0200
Subject: [PATCH 148/438] Fix 6910 if conf PROJECT_USE_SEARCH_TO_SELECT is used
 we got BadFirstParameterForGETPOST

---
 htdocs/expedition/class/expedition.class.php | 1 +
 htdocs/projet/ajax/projects.php              | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 06cddeace91..1a36f68a81a 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -195,6 +195,7 @@ class Expedition extends CommonObject
 		// Clean parameters
 		$this->brouillon = 1;
 		$this->tracking_number = dol_sanitizeFileName($this->tracking_number);
+		if (empty($this->fk_project)) $this->fk_project = 0;
 
 		$this->user = $user;
 
diff --git a/htdocs/projet/ajax/projects.php b/htdocs/projet/ajax/projects.php
index 3140352bf60..ae4c412f6e3 100644
--- a/htdocs/projet/ajax/projects.php
+++ b/htdocs/projet/ajax/projects.php
@@ -61,7 +61,7 @@ $idprod = (! empty($match[0]) ? $match[0] : '');
 if (! GETPOST($htmlname) && ! GETPOST($idprod)) return;
 
 // When used from jQuery, the search term is added as GET param "term".
-$searchkey=(GETPOST($idprod)?GETPOST($idprod):(GETPOST($htmlname)?GETPOST($htmlname):''));
+$searchkey=(!empty($idprod) && GETPOST($idprod)?GETPOST($idprod):(GETPOST($htmlname)?GETPOST($htmlname):''));
 
 $form = new FormProjets($db);
 $arrayresult=$form->select_projects_list($socid, '', $htmlname, 0, 0, 1, $discard_closed, 0, 0, 1, $searchkey);

From 20f1bb76cba15bf2fc7abdab24a5c1a01f78089d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 16:13:37 +0200
Subject: [PATCH 149/438] Fix memu under disabled entries, when using
 smartphone

---
 htdocs/core/boxes/box_produits.php         |  2 +-
 htdocs/core/menus/standard/auguria.lib.php | 37 ++++++++++++++--------
 htdocs/core/menus/standard/eldy.lib.php    | 37 ++++++++++++++--------
 htdocs/core/menus/standard/eldy_menu.php   | 20 ++++++------
 htdocs/public/demo/demo.css                |  9 +++---
 htdocs/public/demo/index.php               |  2 +-
 6 files changed, 62 insertions(+), 45 deletions(-)

diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index b0c47422806..f1fa5a84d5d 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -113,7 +113,7 @@ class box_produits extends ModeleBoxes
 					$productstatic->entity = $objp->entity;
 
 					$this->info_box_contents[$line][] = array(
-                        'td' => '',
+                        'td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
                         'text' => $productstatic->getNomUrl(1),
                         'asis' => 1,
                     );
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 3cc9c569120..cc5c0710fb9 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -393,14 +393,14 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 	// Show menu
 	if (empty($noout))
 	{
-		$alt=0; $altok=0; $blockvmenuopened=false;
+		$altok=0; $blockvmenuopened=false; $lastlevel0='';
 		$num=count($menu_array);
-		for ($i = 0; $i < $num; $i++)
+		for ($i = 0; $i < $num; $i++)     // Loop on each menu entry
 		{
 			$showmenu=true;
 			if (! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($menu_array[$i]['enabled'])) 	$showmenu=false;
 
-			$alt++;
+			// Begin of new left menu block
 			if (empty($menu_array[$i]['level']) && $showmenu)
 			{
 				$altok++;
@@ -420,14 +420,14 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 				}
 			}
 
-			// Place tabulation
+			// Add tabulation
 			$tabstring='';
 			$tabul=($menu_array[$i]['level'] - 1);
 			if ($tabul > 0)
 			{
 				for ($j=0; $j < $tabul; $j++)
 				{
-					$tabstring.='&nbsp; &nbsp;';
+					$tabstring.='&nbsp;&nbsp;&nbsp;';
 				}
 			}
 
@@ -445,26 +445,35 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 
 			print '<!-- Process menu entry with mainmenu='.$menu_array[$i]['mainmenu'].', leftmenu='.$menu_array[$i]['leftmenu'].', level='.$menu_array[$i]['level'].' enabled='.$menu_array[$i]['enabled'].' -->'."\n";
 
-			// Menu niveau 0
+			// Menu level 0
 			if ($menu_array[$i]['level'] == 0)
 			{
-				if ($menu_array[$i]['enabled'])
+				if ($menu_array[$i]['enabled'])     // Enabled so visible
 				{
 					print '<div class="menu_titre">'.$tabstring.'<a class="vmenu" href="'.$url.'"'.($menu_array[$i]['target']?' target="'.$menu_array[$i]['target'].'"':'').'>'.$menu_array[$i]['titre'].'</a></div>';
+					$lastlevel0='enabled';
 				}
-				else if ($showmenu)
+				else if ($showmenu)                 // Not enabled but visible (so greyed)
 				{
 					print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$menu_array[$i]['titre'].'</font></div>'."\n";
+					$lastlevel0='greyed';
+				}
+				else
+				{
+				    $lastlevel0='hidden';
 				}
 				if ($showmenu)
+				{
 					print '<div class="menu_top"></div>'."\n";
+				}
 			}
-			// Menu niveau > 0
+			// Menu level > 0
 			if ($menu_array[$i]['level'] > 0)
 			{
-				if ($menu_array[$i]['enabled'])
+				if ($menu_array[$i]['enabled'] && $lastlevel0 == 'enabled')     // Enabled so visible, except if parent was not enabled.
 				{
 					print '<div class="menu_contenu">'.$tabstring;
+					//print $lastlevel0;
 					if ($menu_array[$i]['url']) print '<a class="vsmenu" href="'.$url.'"'.($menu_array[$i]['target']?' target="'.$menu_array[$i]['target'].'"':'').'>';
 					else print '<span class="vsmenu">';
 					print $menu_array[$i]['titre'];
@@ -474,22 +483,22 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 					if (! strstr($menu_array[$i]['titre'],'<table')) print '<br>';
 					print '</div>'."\n";
 				}
-				else if ($showmenu)
+				else if ($showmenu && $lastlevel0 == 'enabled')       // Not enabled but visible (so greyed), except if parent was not enabled.
 				{
 					print '<div class="menu_contenu">'.$tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</font><br></div>'."\n";
 				}
 			}
 
 			// If next is a new block or if there is nothing after
-			if (empty($menu_array[$i+1]['level']))
+			if (empty($menu_array[$i+1]['level']))               // End menu block
 			{
 				if ($showmenu)
 					print '<div class="menu_end"></div>'."\n";
-				if ($blockvmenuopened) { print "</div>\n"; $blockvmenuopened=false; }
+				if ($blockvmenuopened) { print '</div>'."\n"; $blockvmenuopened=false; }
 			}
 		}
 		
-		if ($altok) print '<div class="blockvmenuend"></div>';
+		if ($altok) print '<div class="blockvmenuend"></div>';    // End menu block
 	}
 
 	if (is_array($moredata) && ! empty($moredata['bookmarks']))
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 7a1dfcd4ecf..8c83435914b 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -445,7 +445,7 @@ function print_end_menu_array()
  * @param	Menu		$menu				Object Menu to return back list of menu entries
  * @param	int			$noout				Disable output (Initialise &$menu only).
  * @param	string		$forcemainmenu		'x'=Force mainmenu to mainmenu='x'
- * @param	string		$forceleftmenu		'all'=Force leftmenu to '' (= all). If value come being '', we change it to value in session and 'none' if not efined in session.
+ * @param	string		$forceleftmenu		'all'=Force leftmenu to '' (= all). If value come being '', we change it to value in session and 'none' if not defined in session.
  * @param	array		$moredata			An array with more data to output
  * @return	int								nb of menu entries
  */
@@ -1023,7 +1023,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 								$objp = $db->fetch_object($resql);
 
 								$nature='';
-								// Must match array $sourceList defined into journals_list.php 
+								// Must match array $sourceList defined into journals_list.php
 								if ($objp->nature == 2) $nature="sells";
 								if ($objp->nature == 3) $nature="purchases";
 								if ($objp->nature == 4) $nature="bank";
@@ -1558,14 +1558,14 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 	$invert=empty($conf->global->MAIN_MENU_INVERT)?"":"invert";
 	if (empty($noout))
 	{
-		$alt=0; $altok=0; $blockvmenuopened=false;
+		$altok=0; $blockvmenuopened=false; $lastlevel0='';
 		$num=count($menu_array);
-		for ($i = 0; $i < $num; $i++)
+		for ($i = 0; $i < $num; $i++)     // Loop on each menu entry
 		{
 			$showmenu=true;
 			if (! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($menu_array[$i]['enabled'])) 	$showmenu=false;
 
-			$alt++;
+			// Begin of new left menu block
 			if (empty($menu_array[$i]['level']) && $showmenu)
 			{
 			    $altok++;
@@ -1585,7 +1585,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				}
 			}
 
-			// Place tabulation
+			// Add tabulation
 			$tabstring='';
 			$tabul=($menu_array[$i]['level'] - 1);
 			if ($tabul > 0)
@@ -1625,26 +1625,35 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 
 			print '<!-- Process menu entry with mainmenu='.$menu_array[$i]['mainmenu'].', leftmenu='.$menu_array[$i]['leftmenu'].', level='.$menu_array[$i]['level'].' enabled='.$menu_array[$i]['enabled'].', position='.$menu_array[$i]['position'].' -->'."\n";
 
-			// Menu niveau 0
+			// Menu level 0
 			if ($menu_array[$i]['level'] == 0)
 			{
-				if ($menu_array[$i]['enabled'])
+				if ($menu_array[$i]['enabled'])     // Enabled so visible
 				{
 					print '<div class="menu_titre">'.$tabstring.'<a class="vmenu" href="'.$url.'"'.($menu_array[$i]['target']?' target="'.$menu_array[$i]['target'].'"':'').'>'.$menu_array[$i]['titre'].'</a></div>'."\n";
+					$lastlevel0='enabled';
 				}
-				else if ($showmenu)
+				else if ($showmenu)                 // Not enabled but visible (so greyed)
 				{
 					print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$menu_array[$i]['titre'].'</font></div>'."\n";
+					$lastlevel0='greyed';
+				}
+				else
+				{
+				    $lastlevel0='hidden';
 				}
 				if ($showmenu)
+				{
 					print '<div class="menu_top"></div>'."\n";
+				}
 			}
-			// Menu niveau > 0
+			// Menu level > 0
 			if ($menu_array[$i]['level'] > 0)
 			{
-				if ($menu_array[$i]['enabled'])
+				if ($menu_array[$i]['enabled'] && $lastlevel0 == 'enabled')     // Enabled so visible, except if parent was not enabled.
 				{
 					print '<div class="menu_contenu">'.$tabstring;
+					//print $lastlevel0;
 					if ($menu_array[$i]['url']) print '<a class="vsmenu" href="'.$url.'"'.($menu_array[$i]['target']?' target="'.$menu_array[$i]['target'].'"':'').'>';
 					else print '<span class="vsmenu">';
 					print $menu_array[$i]['titre'];
@@ -1654,14 +1663,14 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 					if (! strstr($menu_array[$i]['titre'],'<table')) print '<br>';
 					print '</div>'."\n";
 				}
-				else if ($showmenu)
+				else if ($showmenu && $lastlevel0 == 'enabled')       // Not enabled but visible (so greyed), except if parent was not enabled.
 				{
 					print '<div class="menu_contenu">'.$tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</font><br></div>'."\n";
 				}
 			}
 
 			// If next is a new block or if there is nothing after
-			if (empty($menu_array[$i+1]['level']))
+			if (empty($menu_array[$i+1]['level']))               // End menu block
 			{
 				if ($showmenu)
 					print '<div class="menu_end"></div>'."\n";
@@ -1669,7 +1678,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			}
 		}
 
-		if ($altok) print '<div class="blockvmenuend"></div>';
+		if ($altok) print '<div class="blockvmenuend"></div>';    // End menu block
 	}
 
 	return count($menu_array);
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index 9750811ffa5..b0b7f95c27b 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -105,7 +105,7 @@ class MenuManager
         $menuArbo = new Menubase($this->db,'eldy');
         $menuArbo->menuLoad($mainmenu, $leftmenu, $this->type_user, 'eldy', $tabMenu);
         $this->tabMenu=$tabMenu;
-        
+
         //if ($forcemainmenu == 'all') { var_dump($this->tabMenu); exit; }
     }
 
@@ -149,13 +149,13 @@ class MenuManager
 		    print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,1,$mode);  // no output
 		    return $this->menu->getNbOfVisibleMenuEntries();
 		}
-		    
+
         if ($mode == 'jmobile')
         {
             print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,1,$mode);      // Fill this->menu that is empty with top menu
 
             // $this->menu->liste is top menu
-            //var_dump($this->menu->liste);exit;            
+            //var_dump($this->menu->liste);exit;
         	print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
         	foreach($this->menu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
         	{
@@ -168,12 +168,12 @@ class MenuManager
 					$relurl=preg_replace('/__LOGIN__/',$user->login,$relurl);
 					$relurl=preg_replace('/__USERID__/',$user->id,$relurl);
 
-					
+
         			print '<a class="alilevel0" href="#">';
-					
+
 					// Add font-awesome
 					if ($val['level'] == 0 && $val['mainmenu'] == 'home') print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';
-        			
+
 					print $val['titre'];
         			print '</a>'."\n";
         			// Search submenu fot this mainmenu entry
@@ -184,7 +184,7 @@ class MenuManager
         		    //if ($tmpmainmenu.'-'.$tmpleftmenu == 'home-all') { var_dump($submenu); exit; }
                     //if ($tmpmainmenu=='accountancy') { var_dump($submenu->liste); exit; }
 	        		$nexturl=dol_buildpath($submenu->liste[0]['url'],1);
-                    
+
         			$canonrelurl=preg_replace('/\?.*$/','',$relurl);
         			$canonnexturl=preg_replace('/\?.*$/','',$nexturl);
         			//var_dump($canonrelurl);
@@ -198,16 +198,16 @@ class MenuManager
         				print '<a href="'.$relurl.'"';
         				//print ' data-ajax="false"';
         				print '>';
-        				if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard")  // No translation 
+        				if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard")  // No translation
         				{
         				    if (in_array($val['mainmenu'], array('cashdesk', 'websites'))) print $langs->trans("Access");
-        				    else print $langs->trans("Dashboard");	
+        				    else print $langs->trans("Dashboard");
         				}
         				else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
         				print '</a>';
         				print '</li>'."\n";
         			}
-        			
+
        				foreach($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu']
        				{
 						$showmenu=true;
diff --git a/htdocs/public/demo/demo.css b/htdocs/public/demo/demo.css
index daf4f20e585..c4624f2d943 100644
--- a/htdocs/public/demo/demo.css
+++ b/htdocs/public/demo/demo.css
@@ -32,16 +32,15 @@ a:hover {
 	background: -webkit-linear-gradient(bottom, rgb(255,255,255) 85%, rgb(255,255,255) 100%);
 }
 .csscolumns {
-    margin-left: 8px;
     margin-top: 6px;
     margin-bottom: 5px;
-    -webkit-column-count: 4; /* Chrome, Safari, Opera */
-    -moz-column-count: 4; /* Firefox */
-    column-count: 3;
+    -webkit-column-count: 2; /* Chrome, Safari, Opera */
+    -moz-column-count: 2; /* Firefox */
+    column-count: 2;
     text-align: left;
 }
 .demomaxoveflow {
-    max-width: 100px;
+    max-width: 120px;
     overflow: hidden;
     text-overflow: ellipsis;
 }
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index fe8da7ee072..be844c8a2da 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -328,7 +328,7 @@ foreach ($demoprofiles as $profilearray)
         print '<input type="hidden" name="dol_no_mouse_hover" value="'.$conf->dol_no_mouse_hover.'">'."\n";
         print '<input type="hidden" name="dol_use_jmobile" value="'.$conf->dol_use_jmobile.'">'."\n";
 
-        print '<div summary="Dolibarr online demonstration for profile '.$profilearray['label'].'" class="center inline-block CTable CTableRow'.($i%2==0?'1':'0').'" style="width: 340px;">'."\n";
+        print '<div summary="Dolibarr online demonstration for profile '.$profilearray['label'].'" class="center inline-block CTable CTableRow'.($i%2==0?'1':'0').'" style="width: 346px;">'."\n";
 
 
         print '<div id="a1'.$profilearray['key'].'" class="demobox '.(empty($profilearray['url'])?'modulelineshow cursorpointer':'nomodulelines').'">';

From 039130c6943f4ba3f47d74ca09481a262f9a7c58 Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Sat, 10 Jun 2017 16:19:33 +0200
Subject: [PATCH 150/438] Fix travis

---
 htdocs/fourn/class/paiementfourn.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index 03f3ecb0e21..25639bfd3f9 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -531,6 +531,7 @@ class PaiementFourn extends Paiement
 	 *
 	 *	@param		int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
 	 *	@param		string	$option			Sur quoi pointe le lien
+	 *  @param		string  $mode           'withlistofinvoices'=Include list of invoices into tooltip
 	 *	@return		string					Chaine avec URL
 	 */
 	function getNomUrl($withpicto=0,$option='',$mode='withlistofinvoices')

From ce470b8dd5aee2bc6ffdccb003bbe51d1046c004 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 16:23:24 +0200
Subject: [PATCH 151/438] Fix css fot liste_total lines

---
 htdocs/theme/eldy/style.css.php | 2 +-
 htdocs/theme/md/style.css.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 4fd7120a771..bee5aac9d36 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2692,7 +2692,7 @@ input.liste_titre {
 }
 
 .noborder tr.liste_total, .noborder tr.liste_total td, tr.liste_total, form.liste_total {
-	height: 32px;
+	/* height: 32px; */
 }
 .noborder tr.liste_total td, tr.liste_total td, form.liste_total div {
     color: #552266;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index dc61977cf5f..9ec18cca050 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2775,7 +2775,7 @@ input.liste_titre {
 }
 
 .noborder tr.liste_total, .noborder tr.liste_total td, tr.liste_total, form.liste_total {
-	height: 32px;
+	/* height: 32px; */
 }
 .noborder tr.liste_total td, tr.liste_total td, form.liste_total div {
     /* border-top: 1px solid #f4f4f4; */

From 75452e6d19ee04dcfa802752dbc414bfd90e9db7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 16:29:25 +0200
Subject: [PATCH 152/438] Fix compatibility php 5.5-

---
 htdocs/main.inc.php | 52 ++++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 67458a66445..15934a32f86 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -300,7 +300,7 @@ if (! defined('NOTOKENRENEWAL'))
 {
     // roulement des jetons car cree a chaque appel
     if (isset($_SESSION['newtoken'])) $_SESSION['token'] = $_SESSION['newtoken'];
-    
+
     // Save in $_SESSION['newtoken'] what will be next token. Into forms, we will add param token = $_SESSION['newtoken']
     $token = dol_hash(uniqid(mt_rand(),TRUE)); // Generates a hash of a random number
     $_SESSION['newtoken'] = $token;
@@ -659,7 +659,7 @@ if (! defined('NOLOGIN'))
                    unset($_SESSION['lastsearch_values_tmp_'.$relativepathstring]);
                }
 	       }
-	       
+
 	       $action = '';
 	       $reshook = $hookmanager->executeHooks('updateSession', array(), $user, $action);
 	       if ($reshook < 0) {
@@ -667,7 +667,7 @@ if (! defined('NOLOGIN'))
 	       }
         }
     }
-    
+
     // Is it a new session that has started ?
     // If we are here, this means authentication was successfull.
     if (! isset($_SESSION["dol_login"]))
@@ -981,7 +981,7 @@ if (! function_exists("llxHeader"))
 		{
 			top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss, $morequerystring, $help_url);
 		}
-		
+
 		if (empty($conf->dol_hide_leftmenu))
 		{
 			left_menu('', $help_url, '', '', 1, $title, 1);
@@ -1011,13 +1011,13 @@ function top_httphead($contenttype='text/html')
     if (! empty($conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY))
     {
         // For example, to restrict script, object, frames or img to some domains
-        // script-src https://api.google.com https://anotherhost.com; object-src https://youtube.com; child-src https://youtube.com; img-src: https://static.example.com  
+        // script-src https://api.google.com https://anotherhost.com; object-src https://youtube.com; child-src https://youtube.com; img-src: https://static.example.com
         // For example, to restrict everything to one domain, except object, ...
         // default-src https://cdn.example.net; object-src 'none'
         header("Content-Security-Policy: ".$conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY);
     }
-      
-    
+
+
     // On the fly GZIP compression for all pages (if browser support it). Must set the bit 3 of constant to 1.
     /*if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x04)) {
         ob_start("ob_gzhandler");
@@ -1085,7 +1085,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
         $ext='version='.urlencode(DOL_VERSION);
         if (GETPOST('version','int')) $ext='version='.GETPOST('version','int');	// usefull to force no cache on css/js
         if (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER)) $ext.='&testmenuhider='.(GETPOST('testmenuhider','int')?GETPOST('testmenuhider','int'):$conf->global->MAIN_TESTMENUHIDER);
-        
+
         $themeparam='?lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss','aZ09')?'&amp;optioncss='.GETPOST('optioncss','aZ09',1):'').'&amp;userid='.$user->id.'&amp;entity='.$conf->entity;
         $themeparam.=($ext?'&amp;'.$ext:'');
         if (! empty($_SESSION['dol_resetcache'])) $themeparam.='&amp;dol_resetcache='.$_SESSION['dol_resetcache'];
@@ -1094,7 +1094,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
         if (GETPOST('dol_optimize_smallscreen','int'))   { $themeparam.='&amp;dol_optimize_smallscreen='.GETPOST('dol_optimize_smallscreen','int'); }
         if (GETPOST('dol_no_mouse_hover','int'))         { $themeparam.='&amp;dol_no_mouse_hover='.GETPOST('dol_no_mouse_hover','int'); }
         if (GETPOST('dol_use_jmobile','int'))            { $themeparam.='&amp;dol_use_jmobile='.GETPOST('dol_use_jmobile','int'); $conf->dol_use_jmobile=GETPOST('dol_use_jmobile','int'); }
-        
+
         if (! defined('DISABLE_JQUERY') && ! $disablejs && $conf->use_javascript_ajax)
         {
             print '<!-- Includes CSS for JQuery (Ajax library) -->'."\n";
@@ -1122,13 +1122,13 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
             	print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.css'.($ext?'?'.$ext:'').'">'."\n";
             }
         }
-        
+
         if (! defined('DISABLE_FONT_AWSOME'))
         {
             print '<!-- Includes CSS for font awesome -->'."\n";
             print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/common/fontawesome/css/font-awesome.min.css'.($ext?'?'.$ext:'').'">'."\n";
         }
-            
+
         print '<!-- Includes CSS for Dolibarr theme -->'."\n";
         // Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
         $themepath=dol_buildpath($conf->css,1);
@@ -1293,7 +1293,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
                 print '</script>'."\n";
                 print '<script type="text/javascript" src="'.$pathckeditor.$jsckeditor.($ext?'?'.$ext:'').'"></script>'."\n";
             }
-            
+
             // Browser notifications
             if (! defined('DISABLE_BROWSER_NOTIF'))
             {
@@ -1306,7 +1306,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
                     print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_notification.js.php'.($ext?'?'.$ext:'').'"></script>'."\n";
                 }
             }
-            
+
             // Global js function
             print '<!-- Includes JS of Dolibarr -->'."\n";
             print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php'.($ext?'?'.$ext:'').'"></script>'."\n";
@@ -1316,7 +1316,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
             {
                 print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/datepicker.js.php'.($ext?'?'.$ext:'').'"></script>'."\n";
             }
-            
+
             // JS forced by modules (relative url starting with /)
             if (! empty($conf->modules_parts['js']))		// $conf->modules_parts['js'] is array('module'=>array('file1','file2'))
         	{
@@ -1391,7 +1391,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
     $toprightmenu='';
 
     // For backward compatibility with old modules
-    if (empty($conf->headerdone)) 
+    if (empty($conf->headerdone))
     {
         top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
         print '<body id="mainbody">';
@@ -1403,7 +1403,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
     if (empty($conf->dol_hide_topmenu) && (! defined('NOREQUIREMENU') || ! constant('NOREQUIREMENU')))
     {
         print "\n".'<!-- Start top horizontal -->'."\n";
-        
+
         print '<div class="side-nav-vert"><div id="id-top">';
 
 	    // Show menu entries
@@ -1461,7 +1461,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 		$toprightmenu.='</div>';
 
 	    $toprightmenu.='<div class="login_block_other">';
-		
+
 		// Execute hook printTopRightMenu (hooks should output string like '<div class="login"><a href="">mylink</a></div>')
 	    $parameters=array();
 	    $result=$hookmanager->executeHooks('printTopRightMenu',$parameters);    // Note that $action and $object may have been modified by some hooks
@@ -1548,7 +1548,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 		print '</div></div>';
 
 	    //unset($form);
-	
+
 		print '<div style="clear: both;"></div>';
         print "<!-- End top horizontal menu -->\n\n";
     }
@@ -1693,7 +1693,7 @@ function left_menu($menu_array_before, $helppagename='', $notused='', $menu_arra
     		if (preg_match('/de/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.de';
     		if (preg_match('/it/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.it';
     		if (preg_match('/gr/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.gr';
-    
+
             $appli=constant('DOL_APPLICATION_TITLE');
     	    if (! empty($conf->global->MAIN_APPLICATION_TITLE))
     	    {
@@ -1778,7 +1778,7 @@ function main_area($title='')
     print "\n";
 
     print '<!-- Begin div class="fiche" -->'."\n".'<div class="fiche">'."\n";
-    
+
     if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) print info_admin($langs->trans("WarningYouAreInMaintenanceMode",$conf->global->MAIN_ONLY_LOGIN_ALLOWED));
 }
 
@@ -1908,7 +1908,7 @@ if (! function_exists("llxFooter"))
                 {
                     if (empty($val['sortfield'])) unset($val['sortfield']);
                     if (empty($val['sortorder'])) unset($val['sortorder']);
-                    dol_syslog('Save lastsearch_values_tmp_'.$key.'='.json_encode($val, 0, 1)." (systematic recording of last search criteria)");
+                    dol_syslog('Save lastsearch_values_tmp_'.$key.'='.json_encode($val, 0)." (systematic recording of last search criteria)");
                     $_SESSION['lastsearch_values_tmp_'.$key]=json_encode($val);
                     unset($_SESSION['lastsearch_values_'.$key]);
                 }
@@ -1935,7 +1935,7 @@ if (! function_exists("llxFooter"))
         }
 
         print "\n\n";
-        
+
         print '</div> <!-- End div class="fiche" -->'."\n"; // End div fiche
 
 		if (empty($conf->dol_hide_leftmenu)) print '</div> <!-- End div id-right -->'; // End div id-right
@@ -1970,7 +1970,7 @@ if (! function_exists("llxFooter"))
                 });
             </script>' . "\n";
         }
-        
+
         // Wrapper to manage document_preview
         if (! empty($conf->use_javascript_ajax) && ($conf->browser->layout != 'phone'))
         {
@@ -1985,7 +1985,7 @@ if (! function_exists("llxFooter"))
         		});
             </script>' . "\n";
         }
-        
+
         // Wrapper to manage dropdown
         if ($conf->use_javascript_ajax)
         {
@@ -2016,7 +2016,7 @@ if (! function_exists("llxFooter"))
                      console.log("Link has class dropdowncloseonclick, so we close/hide the popup ul");
                      $(this).parent().parent().hide();
                   });
-            
+
                   $(document).bind(\'click\', function (e) {
                       var $clicked = $(e.target);
                       if (!$clicked.parents().hasClass("dropdown")) $(".dropdown dd ul").hide();
@@ -2024,7 +2024,7 @@ if (! function_exists("llxFooter"))
                 });
                 </script>';
         }
-                
+
 		// A div for the address popup
 		print "\n<!-- A div to allow dialog popup -->\n";
 		print '<div id="dialogforpopup" style="display: none;"></div>'."\n";

From 890ac81e4de89f1080e7a3d5e445f421f1a0136a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 19:16:42 +0200
Subject: [PATCH 153/438] Fix menu entried must be greyed, sub menus not
 visible fi not allowed on parent.

---
 htdocs/core/lib/functions.lib.php           |  5 +-
 htdocs/core/menus/standard/auguria_menu.php | 88 ++++++++++++++++++---
 htdocs/core/menus/standard/eldy_menu.php    | 76 +++++++++++++++---
 htdocs/theme/eldy/style.css.php             |  1 +
 htdocs/theme/md/style.css.php               |  2 +-
 5 files changed, 145 insertions(+), 27 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 6f73d504d11..3157348062a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5949,8 +5949,9 @@ function printCommonFooter($zone='private')
         	print '<!-- Set handler to switch left menu page (menuhider) -->'."\n";
         	print 'jQuery(".menuhider").click(function() {';
         	print '  console.log("We click on .menuhider");'."\n";
-        	print "  $('.side-nav').toggle();";
-        	print "  $('.login_block').toggle();";
+        	//print "  $('.side-nav').animate({width:'toggle'},200);\n";     // OK with eldy theme but not with md
+        	print "  $('.side-nav').toggle()\n";
+        	print "  $('.login_block').toggle()\n";
         	print '});'."\n";
     	}
 
diff --git a/htdocs/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php
index 4b19ffd5f3b..bd762083d2f 100644
--- a/htdocs/core/menus/standard/auguria_menu.php
+++ b/htdocs/core/menus/standard/auguria_menu.php
@@ -115,7 +115,7 @@ class MenuManager
     /**
      *  Show menu
      *
-     *	@param	string	$mode		    'top', 'left', 'jmobile'
+     *	@param	string	$mode		    'top', 'left', 'jmobile' (used to get full xml ul/li menu)
      *  @param	array	$moredata		An array with more data to output
      *  @return int                     0 or nb of top menu entries if $mode = 'topnb'
 	 */
@@ -136,17 +136,20 @@ class MenuManager
 
         if ($mode == 'top')  print_auguria_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,0,$mode);
         if ($mode == 'left') print_left_auguria_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$this->menu,0,'','',$moredata);
-		
+
 		if ($mode == 'topnb')
 		{
 		    print_auguria_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,1,$mode);
 		    return $this->menu->getNbOfVisibleMenuEntries();
 		}
-		    
-        if ($mode == 'jmobile')
+
+        if ($mode == 'jmobile')     // Used to get menu in xml ul/li
         {
         	print_auguria_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,1,$mode);
 
+            // $this->menu->liste is top menu
+            //var_dump($this->menu->liste);exit;
+        	$lastlevel = array();
         	print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
         	foreach($this->menu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
         	{
@@ -157,9 +160,17 @@ class MenuManager
         			$relurl=dol_buildpath($val['url'],1);
         			$relurl=preg_replace('/__LOGIN__/',$user->login,$relurl);
         			$relurl=preg_replace('/__USERID__/',$user->id,$relurl);
+        			$canonurl=preg_replace('/\?.*$/','',$val['url']);
 
-        			print '<a class="alilevel0" href="#">'.$val['titre'].'</a>'."\n";
-        			// Search submenu fot this entry
+        			print '<a class="alilevel0" href="#">';
+        			
+					// Add font-awesome
+					if ($val['level'] == 0 && $val['mainmenu'] == 'home') print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';
+        			
+					print $val['titre'];
+        			print '</a>'."\n";
+        			
+        			// Search submenu fot this mainmenu entry
         			$tmpmainmenu=$val['mainmenu'];
         			$tmpleftmenu='all';
         			$submenu=new Menu();
@@ -177,21 +188,50 @@ class MenuManager
 						// We add sub entry
 						print str_pad('',1).'<li class="lilevel1 ui-btn-icon-right ui-btn">';	 // ui-btn to highlight on clic
 						print '<a href="'.$relurl.'">';
-					    if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard")  // No translation 
+					    if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard")  // No translation
         				{
-        				    if ($val['mainmenu'] == 'cashdesk') print $langs->trans("Access");
-        				    else print $langs->trans("Dashboard");	
+        				    if (in_array($val['mainmenu'], array('cashdesk', 'websites'))) print $langs->trans("Access");
+        				    else print $langs->trans("Dashboard");
         				}
 						else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
 						print '</a>';
 						print '</li>'."\n";
         			}
-        			foreach($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
+
+    				if ($val['level']==0)
+					{
+					    if ($val['enabled'])
+					    {
+					        $lastlevel[0]='enabled';
+					    }
+					    else if ($showmenu)                 // Not enabled but visible (so greyed)
+					    {
+					        $lastlevel[0]='greyed';
+					    }
+					    else
+					    {
+					        $lastlevel[0]='hidden';
+					    }
+					}
+
+					$lastlevel2 = array();
+					foreach($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
         			{
 						$showmenu=true;
 						if (! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) $showmenu=false;
 
-       					if ($showmenu)		// Visible (option to hide when not allowed is off or allowed)
+        				// If at least one parent is not enabled, we do not show any menu of all children
+						if ($val2['level'] > 0)
+						{
+						    $levelcursor = $val2['level']-1;
+						    while ($levelcursor >= 0)
+						    {
+                                if ($lastlevel2[$levelcursor] != 'enabled') $showmenu=false;
+                                $levelcursor--;
+						    }
+						}
+
+						if ($showmenu)		// Visible (option to hide when not allowed is off or allowed)
        					{
 	        				$relurl2=dol_buildpath($val2['url'],1);
 		        			$relurl2=preg_replace('/__LOGIN__/',$user->login,$relurl2);
@@ -199,8 +239,17 @@ class MenuManager
 	        				$canonurl2=preg_replace('/\?.*$/','',$val2['url']);
 	        				//var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
 	        				if (in_array($canonurl2,array('/admin/index.php','/admin/tools/index.php','/core/tools.php'))) $relurl2='';
-	        				if ($val2['level']==0) print str_pad('',$val2['level']+1).'<li class="lilevel'.($val2['level']+1).' ui-btn-icon-right ui-btn">';	 // ui-btn to highlight on clic
-	        				else print str_pad('',$val2['level']+1).'<li class="lilevel'.($val2['level']+1).'">';	 // ui-btn to highlight on clic
+
+	        				$disabled='';
+	        				if (! $val2['enabled'])
+	        				{
+	        				    $disabled=" vsmenudisabled";
+	        				}
+
+	        				print str_pad('',$val2['level']+1);
+	        				print '<li class="lilevel'.($val2['level']+1);
+	        				if ($val2['level']==0) print ' ui-btn-icon-right ui-btn';  // ui-btn to highlight on clic
+	        				print $disabled.'">';	 // ui-btn to highlight on clic
 	        				if ($relurl2)
 	        				{
 	        					if ($val2['enabled'])	// Allowed
@@ -208,12 +257,25 @@ class MenuManager
 	        						print '<a href="'.$relurl2.'"';
 		        					//print ' data-ajax="false"';
 		        					print '>';
+		        					$lastlevel2[$val2['level']]='enabled';
 	        					}
 	        					else					// Not allowed but visible (greyed)
 	        					{
 				        			print '<a href="#" class="vsmenudisabled">';
+				        			$lastlevel2[$val2['level']]='greyed';
 	        					}
 	        				}
+	        				else
+	        				{
+	        				    if ($val2['enabled'])	// Allowed
+	        				    {
+	        				        $lastlevel2[$val2['level']]='enabled';
+	        				    }
+	        				    else
+	        				    {
+	        				        $lastlevel2[$val2['level']]='greyed';
+	        				    }
+	        				}
 	        				print $val2['titre'];
 	        				if ($relurl2)
 	        				{
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index b0b7f95c27b..d8f90cb912f 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -113,7 +113,7 @@ class MenuManager
     /**
      *  Show menu
      *
-     *	@param	string	$mode			'top', 'topnb', 'left', 'jmobile'
+     *	@param	string	$mode			'top', 'topnb', 'left', 'jmobile' (used to get full xml ul/li menu)
      *  @param	array	$moredata		An array with more data to output
      *  @return int                     0 or nb of top menu entries if $mode = 'topnb'
      */
@@ -125,7 +125,7 @@ class MenuManager
 
         if ($this->type_user == 1)
         {
-        	$conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED=0;
+        	$conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED=1;
         	$conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED=1;
         }
 
@@ -150,12 +150,13 @@ class MenuManager
 		    return $this->menu->getNbOfVisibleMenuEntries();
 		}
 
-        if ($mode == 'jmobile')
+        if ($mode == 'jmobile')     // Used to get menu in xml ul/li
         {
             print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,1,$mode);      // Fill this->menu that is empty with top menu
 
             // $this->menu->liste is top menu
             //var_dump($this->menu->liste);exit;
+            $lastlevel = array();
         	print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
         	foreach($this->menu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
         	{
@@ -167,7 +168,7 @@ class MenuManager
 					$relurl=dol_buildpath($val['url'],1);
 					$relurl=preg_replace('/__LOGIN__/',$user->login,$relurl);
 					$relurl=preg_replace('/__USERID__/',$user->id,$relurl);
-
+					$canonurl=preg_replace('/\?.*$/','',$val['url']);
 
         			print '<a class="alilevel0" href="#">';
 
@@ -176,6 +177,7 @@ class MenuManager
 
 					print $val['titre'];
         			print '</a>'."\n";
+        			
         			// Search submenu fot this mainmenu entry
         			$tmpmainmenu=$val['mainmenu'];
         			$tmpleftmenu='all';
@@ -195,9 +197,7 @@ class MenuManager
 					{
         				// We add sub entry
         				print str_pad('',1).'<li class="lilevel1 ui-btn-icon-right ui-btn">';	 // ui-btn to highlight on clic
-        				print '<a href="'.$relurl.'"';
-        				//print ' data-ajax="false"';
-        				print '>';
+        				print '<a href="'.$relurl.'">';
         				if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard")  // No translation
         				{
         				    if (in_array($val['mainmenu'], array('cashdesk', 'websites'))) print $langs->trans("Access");
@@ -208,11 +208,39 @@ class MenuManager
         				print '</li>'."\n";
         			}
 
-       				foreach($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu']
+        			if ($val['level']==0)
+        			{
+        			    if ($val['enabled'])
+        			    {
+        			        $lastlevel[0]='enabled';
+        			    }
+        			    else if ($showmenu)                 // Not enabled but visible (so greyed)
+        			    {
+        			        $lastlevel[0]='greyed';
+        			    }
+        			    else
+        			    {
+        			        $lastlevel[0]='hidden';
+        			    }
+        			}
+
+        			$lastlevel2 = array();
+       				foreach($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
        				{
 						$showmenu=true;
 						if (! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) $showmenu=false;
 
+						// If at least one parent is not enabled, we do not show any menu of all children
+						if ($val2['level'] > 0)
+						{
+						    $levelcursor = $val2['level']-1;
+						    while ($levelcursor >= 0)
+						    {
+                                if ($lastlevel2[$levelcursor] != 'enabled') $showmenu=false;
+                                $levelcursor--;
+						    }
+						}
+
        					if ($showmenu)		// Visible (option to hide when not allowed is off or allowed)
        					{
 	        				$relurl2=dol_buildpath($val2['url'],1);
@@ -221,8 +249,17 @@ class MenuManager
 	        				$canonurl2=preg_replace('/\?.*$/','',$val2['url']);
 	        				//var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
 	        				if (in_array($canonurl2,array('/admin/index.php','/admin/tools/index.php','/core/tools.php'))) $relurl2='';
-	        				if ($val2['level']==0) print str_pad('',$val2['level']+1).'<li class="lilevel'.($val2['level']+1).' ui-btn-icon-right ui-btn">';	 // ui-btn to highlight on clic
-	        				else print str_pad('',$val2['level']+1).'<li class="lilevel'.($val2['level']+1).'">';	 // ui-btn to highlight on clic
+
+	        				$disabled='';
+	        				if (! $val2['enabled'])
+	        				{
+	        				    $disabled=" vsmenudisabled";
+	        				}
+
+	        				print str_pad('',$val2['level']+1);
+	        				print '<li class="lilevel'.($val2['level']+1);
+	        				if ($val2['level']==0) print ' ui-btn-icon-right ui-btn';  // ui-btn to highlight on clic
+	        				print $disabled.'">';	 // ui-btn to highlight on clic
 	        				if ($relurl2)
 	        				{
 	        					if ($val2['enabled'])	// Allowed
@@ -230,13 +267,28 @@ class MenuManager
 	        						print '<a href="'.$relurl2.'"';
 		        					//print ' data-ajax="false"';
 		        					print '>';
+		        					$lastlevel2[$val2['level']]='enabled';
 	        					}
 	        					else					// Not allowed but visible (greyed)
 	        					{
 				        			print '<a href="#" class="vsmenudisabled">';
+				        			$lastlevel2[$val2['level']]='greyed';
 	        					}
 	        				}
-	        				print $val2['titre'];
+	        				else
+	        				{
+	        				    if ($val2['enabled'])	// Allowed
+	        				    {
+	        				        $lastlevel2[$val2['level']]='enabled';
+	        				    }
+	        				    else
+	        				    {
+	        				        $lastlevel2[$val2['level']]='greyed';
+	        				    }
+	        				}
+                            //var_dump($val2['level']);
+	        				//var_dump($lastlevel2);
+                            print $val2['titre'];
 	        				if ($relurl2)
 	        				{
 	        					if ($val2['enabled'])	// Allowed
@@ -246,6 +298,8 @@ class MenuManager
 	        				}
 	        				print '</li>'."\n";
        					}
+
+
        				}
         			//var_dump($submenu);
         			print '</ul>';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index bee5aac9d36..8e0a9b856ea 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1790,6 +1790,7 @@ a.vsmenu:link, a.vsmenu:visited, a.vsmenu:hover, a.vsmenu:active, span.vsmenu {
 font.vsmenudisabled { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #aaa; }
 a.vsmenu:link, a.vsmenu:visited { color: #<?php echo $colortextbackvmenu; ?>; white-space: nowrap; }
 font.vsmenudisabledmargin { margin: 1px 1px 1px 6px; }
+li a.vsmenudisabled, li.vsmenudisabled { color: #aaa !important; }
 
 a.help:link, a.help:visited, a.help:hover, a.help:active, span.help { font-size:<?php print $fontsizesmaller ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #aaa; text-decoration: none; }
 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 9ec18cca050..e98c631c758 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1678,7 +1678,7 @@ div.login_block {
 	vertical-align: middle;
 	background: #FFF;
 	width: 228px;
-	height: 42px;
+	height: 43px;
 	<?php if (GETPOST('optioncss','aZ09') == 'print') { ?>
 	display: none;
 	<?php } ?>

From b62da4bb7aa669409f84aadfea3eb2116b99e5f8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 20:04:24 +0200
Subject: [PATCH 154/438] Fix a parameter is required to know what we share.

---
 htdocs/adherents/class/adherent.class.php |  2 +-
 htdocs/adherents/index.php                | 16 ++++++++--------
 htdocs/adherents/stats/byproperties.php   |  2 +-
 htdocs/adherents/stats/geo.php            |  8 ++++----
 htdocs/adherents/type.php                 |  4 ++--
 htdocs/core/lib/functions.lib.php         |  2 +-
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 18e144c363c..65f9de24496 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1097,7 +1097,7 @@ class Adherent extends CommonObject
         $sql.= " WHERE d.fk_adherent_type = t.rowid";
         if ($rowid) $sql.= " AND d.rowid=".$rowid;
         elseif ($ref || $fk_soc) {
-        	$sql.= " AND d.entity IN (".getEntity().")";
+        	$sql.= " AND d.entity IN (".getEntity('adherent').")";
         	if ($ref) $sql.= " AND d.rowid='".$this->db->escape($ref)."'";
         	elseif ($fk_soc > 0) $sql.= " AND d.fk_soc=".$fk_soc;
         }
diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index 76368fc5673..2614a27d509 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -64,8 +64,8 @@ $sql.= " d.statut, count(d.rowid) as somme";
 $sql.= " FROM ".MAIN_DB_PREFIX."adherent_type as t";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."adherent as d";
 $sql.= " ON t.rowid = d.fk_adherent_type";
-$sql.= " AND d.entity IN (".getEntity().")";
-$sql.= " WHERE t.entity IN (".getEntity().")";
+$sql.= " AND d.entity IN (".getEntity('adherent').")";
+$sql.= " WHERE t.entity IN (".getEntity('adherent').")";
 $sql.= " GROUP BY t.rowid, t.libelle, t.subscription, d.statut";
 
 dol_syslog("index.php::select nb of members by type", LOG_DEBUG);
@@ -100,7 +100,7 @@ $now=dol_now();
 // old rule: uptodate = if type does not need payment, that end date is null, if type need payment that end date is in future)
 $sql = "SELECT count(*) as somme , d.fk_adherent_type";
 $sql.= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."adherent_type as t";
-$sql.= " WHERE d.entity IN (".getEntity().")";
+$sql.= " WHERE d.entity IN (".getEntity('adherent').")";
 //$sql.= " AND d.statut = 1 AND ((t.subscription = 0 AND d.datefin IS NULL) OR d.datefin >= '".$db->idate($now)."')";
 $sql.= " AND d.statut = 1 AND d.datefin >= '".$db->idate($now)."'";
 $sql.= " AND t.rowid = d.fk_adherent_type";
@@ -133,7 +133,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is usele
     {
     	$listofsearchfields['search_member']=array('text'=>'Member');
     }
-    
+
     if (count($listofsearchfields))
     {
     	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
@@ -149,7 +149,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is usele
     		print '</tr>';
     		$i++;
     	}
-    	print '</table>';	
+    	print '</table>';
     	print '</form>';
     	print '<br>';
     }
@@ -211,7 +211,7 @@ $numb=0;
 
 $sql = "SELECT c.subscription, c.dateadh as dateh";
 $sql.= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."subscription as c";
-$sql.= " WHERE d.entity IN (".getEntity().")";
+$sql.= " WHERE d.entity IN (".getEntity('adherent').")";
 $sql.= " AND d.rowid = c.fk_adherent";
 if(isset($date_select) && $date_select != '')
 {
@@ -275,7 +275,7 @@ $sql = "SELECT a.rowid, a.statut, a.lastname, a.firstname, a.societe as company,
 $sql.= " a.tms as datem, datefin as date_end_subscription,";
 $sql.= " ta.rowid as typeid, ta.libelle, ta.subscription";
 $sql.= " FROM ".MAIN_DB_PREFIX."adherent as a, ".MAIN_DB_PREFIX."adherent_type as ta";
-$sql.= " WHERE a.entity IN (".getEntity().")";
+$sql.= " WHERE a.entity IN (".getEntity('adherent').")";
 $sql.= " AND a.fk_adherent_type = ta.rowid";
 $sql.= $db->order("a.tms","DESC");
 $sql.= $db->plimit($max, 0);
@@ -336,7 +336,7 @@ $sql = "SELECT a.rowid, a.statut, a.lastname, a.firstname, a.societe as company,
 $sql.= " datefin as date_end_subscription,";
 $sql.= " c.rowid as cid, c.tms as datem, c.datec as datec, c.dateadh as date_start, c.datef as date_end, c.subscription";
 $sql.= " FROM ".MAIN_DB_PREFIX."adherent as a, ".MAIN_DB_PREFIX."subscription as c";
-$sql.= " WHERE a.entity IN (".getEntity().")";
+$sql.= " WHERE a.entity IN (".getEntity('adherent').")";
 $sql.= " AND c.fk_adherent = a.rowid";
 $sql.= $db->order("c.tms","DESC");
 $sql.= $db->plimit($max, 0);
diff --git a/htdocs/adherents/stats/byproperties.php b/htdocs/adherents/stats/byproperties.php
index 6f896e186bb..f067b27b3d4 100644
--- a/htdocs/adherents/stats/byproperties.php
+++ b/htdocs/adherents/stats/byproperties.php
@@ -67,7 +67,7 @@ $tab='byproperties';
 $data = array();
 $sql.="SELECT COUNT(d.rowid) as nb, MAX(d.datevalid) as lastdate, d.morphy as code";
 $sql.=" FROM ".MAIN_DB_PREFIX."adherent as d";
-$sql.=" WHERE d.entity IN (".getEntity().")";
+$sql.=" WHERE d.entity IN (".getEntity('adherent').")";
 $sql.=" AND d.statut = 1";
 $sql.=" GROUP BY d.morphy";
 
diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php
index 8e3d0862490..1f9ff189068 100644
--- a/htdocs/adherents/stats/geo.php
+++ b/htdocs/adherents/stats/geo.php
@@ -79,7 +79,7 @@ if ($mode)
         $data = array();
         $sql.="SELECT COUNT(d.rowid) as nb, MAX(d.datevalid) as lastdate, c.code, c.label";
         $sql.=" FROM ".MAIN_DB_PREFIX."adherent as d LEFT JOIN ".MAIN_DB_PREFIX."c_country as c on d.country = c.rowid";
-        $sql.=" WHERE d.entity IN (".getEntity().")";
+        $sql.=" WHERE d.entity IN (".getEntity('adherent').")";
         $sql.=" AND d.statut = 1";
         $sql.=" GROUP BY c.label, c.code";
         //print $sql;
@@ -96,7 +96,7 @@ if ($mode)
         $sql.=" FROM ".MAIN_DB_PREFIX."adherent as d LEFT JOIN ".MAIN_DB_PREFIX."c_departements as c on d.state_id = c.rowid";
         $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."c_regions as r on c.fk_region = r.code_region";
         $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."c_country as co on d.country = co.rowid";
-        $sql.=" WHERE d.entity IN (".getEntity().")";
+        $sql.=" WHERE d.entity IN (".getEntity('adherent').")";
         $sql.=" AND d.statut = 1";
         $sql.=" GROUP BY co.label, co.code, c.nom";
         //print $sql;
@@ -112,7 +112,7 @@ if ($mode)
         $sql.=" FROM ".MAIN_DB_PREFIX."adherent as d LEFT JOIN ".MAIN_DB_PREFIX."c_departements as c on d.state_id = c.rowid";
         $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."c_regions as r on c.fk_region = r.code_region";
         $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."c_country as co on d.country = co.rowid";
-        $sql.=" WHERE d.entity IN (".getEntity().")";
+        $sql.=" WHERE d.entity IN (".getEntity('adherent').")";
         $sql.=" AND d.statut = 1";
         $sql.=" GROUP BY co.label, co.code, r.nom"; //+
         //print $sql;
@@ -127,7 +127,7 @@ if ($mode)
         $sql.="SELECT COUNT(d.rowid) as nb, MAX(d.datevalid) as lastdate, c.code, c.label, d.town as label2";
         $sql.=" FROM ".MAIN_DB_PREFIX."adherent as d";
         $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."c_country as c on d.country = c.rowid";
-        $sql.=" WHERE d.entity IN (".getEntity().")";
+        $sql.=" WHERE d.entity IN (".getEntity('adherent').")";
         $sql.=" AND d.statut = 1";
         $sql.=" GROUP BY c.label, c.code, d.town";
         //print $sql;
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index f0be2ee9fae..50c464596fd 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -173,7 +173,7 @@ if (! $rowid && $action != 'create' && $action != 'edit')
 
 	$sql = "SELECT d.rowid, d.libelle as label, d.subscription, d.vote";
 	$sql.= " FROM ".MAIN_DB_PREFIX."adherent_type as d";
-	$sql.= " WHERE d.entity IN (".getEntity().")";
+	$sql.= " WHERE d.entity IN (".getEntity('adherent').")";
 
 	$result = $db->query($sql);
 	if ($result)
@@ -380,7 +380,7 @@ if ($rowid > 0)
 		$sql.= " t.libelle as type, t.subscription";
 		$sql.= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."adherent_type as t";
 		$sql.= " WHERE d.fk_adherent_type = t.rowid ";
-		$sql.= " AND d.entity IN (".getEntity().")";
+		$sql.= " AND d.entity IN (".getEntity('adherent').")";
 		$sql.= " AND t.rowid = ".$object->id;
 		if ($sall)
 		{
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 3157348062a..8a9bd1e88b6 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -113,7 +113,7 @@ function getDoliDBInstance($type, $host, $user, $pass, $name, $port)
  * 	@param	int	     $shared	1=Return id of current entity + shared entities (default), 0=Return id of current entity only
  * 	@return	mixed				Entity id(s) to use
  */
-function getEntity($element=false, $shared=1)
+function getEntity($element, $shared=1)
 {
 	global $conf, $mc;
 

From d037515e37938161982583d866c598fc03061c9d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 May 2017 09:57:05 +0200
Subject: [PATCH 155/438] FIX SQL injection on user/index.php parameter
 search_statut.

Conflicts:
	htdocs/user/index.php
---
 htdocs/core/lib/functions.lib.php |  3 ++
 htdocs/user/index.php             | 58 +++++++++++++++----------------
 2 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 3ced09db552..a212b82c18f 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -250,6 +250,9 @@ function GETPOST($paramname,$check='',$method=0,$filter=NULL,$options=NULL)
 	        case 'int':
 	            if (! is_numeric($out)) { $out=''; }
 	            break;
+	        case 'intcomma':
+	            if (preg_match('/[^0-9,]+/i',$out)) $out='';
+	            break;
 	        case 'alpha':
 	            $out=trim($out);
 	            // '"' is dangerous because param in url can close the href= or src= and add javascript functions.
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 5d8f02e1c32..669152cb145 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -100,7 +100,7 @@ $arrayfields=array(
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
-   foreach($extrafields->attribute_label as $key => $val) 
+   foreach($extrafields->attribute_label as $key => $val)
    {
        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
    }
@@ -116,9 +116,9 @@ $search_gender=GETPOST('search_gender','alpha');
 $search_employee=GETPOST('search_employee','alpha');
 $search_accountancy_code=GETPOST('search_accountancy_code','alpha');
 $search_email=GETPOST('search_email','alpha');
-$search_statut=GETPOST('search_statut','alpha');
+$search_statut=GETPOST('search_statut','intcomma');
 $search_thirdparty=GETPOST('search_thirdparty','alpha');
-$search_supervisor=GETPOST('search_supervisor','alpha');
+$search_supervisor=GETPOST('search_supervisor','intcomma');
 $search_previousconn=GETPOST('search_previousconn','alpha');
 $optioncss = GETPOST('optioncss','alpha');
 
@@ -131,7 +131,7 @@ if ($mode == 'employee') $search_employee=1;
 /*
  * Actions
  */
- 
+
 $parameters=array();
 $reshook=$hookmanager->executeHooks('doActions',$parameters);    // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -196,8 +196,8 @@ else
 }
 if ($socid > 0) $sql.= " AND u.fk_soc = ".$socid;
 //if ($search_user != '')       $sql.=natural_search(array('u.login', 'u.lastname', 'u.firstname'), $search_user);
-if ($search_supervisor > 0)   $sql.= " AND u.fk_user = ".$search_supervisor;
-if ($search_thirdparty != '') $sql.=natural_search(array('s.nom'), $search_thirdparty);
+if ($search_supervisor > 0)   $sql.= " AND u.fk_user = ".$db->escape($search_supervisor);
+if ($search_thirdparty != '') $sql.= natural_search(array('s.nom'), $search_thirdparty);
 if ($search_login != '')      $sql.= natural_search("u.login", $search_login);
 if ($search_lastname != '')   $sql.= natural_search("u.lastname", $search_lastname);
 if ($search_firstname != '')  $sql.= natural_search("u.firstname", $search_firstname);
@@ -206,9 +206,9 @@ if (is_numeric($search_employee) && $search_employee >= 0)    {
 	$sql .= ' AND u.employee = '.(int) $search_employee;
 }
 if ($search_accountancy_code != '')  $sql.= natural_search("u.accountancy_code", $search_accountancy_code);
-if ($search_email != '')  $sql.= natural_search("u.email", $search_email);
-if ($search_statut != '' && $search_statut >= 0) $sql.= " AND (u.statut=".$search_statut.")";
-if ($sall)                    $sql.= natural_search(array_keys($fieldstosearchall), $sall);
+if ($search_email != '')             $sql.= natural_search("u.email", $search_email);
+if ($search_statut != '' && $search_statut >= 0) $sql.= " AND u.statut IN (".$db->escape($search_statut).")";
+if ($sall)                           $sql.= natural_search(array_keys($fieldstosearchall), $sall);
 // Add where from extra fields
 foreach ($search_array_options as $key => $val)
 {
@@ -217,7 +217,7 @@ foreach ($search_array_options as $key => $val)
     $typ=$extrafields->attribute_type[$tmpkey];
     $mode=0;
     if (in_array($typ, array('int','double'))) $mode=1;    // Search on a numeric
-    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit))) 
+    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit)))
     {
         $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
     }
@@ -265,27 +265,27 @@ if ($result)
         $crit=$val;
         $tmpkey=preg_replace('/search_options_/','',$key);
         if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
-    } 	
-    
-    
+    }
+
+
     print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    
+
     if ($sall)
     {
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
         print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
     }
-	
+
     $moreforfilter='';
-    
+
 	$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
 	$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-    
+
     print '<table class="liste '.($moreforfilter?"listwithfilterbefore":"").'">';
     print '<tr class="liste_titre">';
     if (! empty($arrayfields['u.login']['checked']))          print_liste_field_titre($langs->trans("Login"),$_SERVER['PHP_SELF'],"u.login",$param,"","",$sortfield,$sortorder);
@@ -303,9 +303,9 @@ if ($result)
 	// Extra fields
 	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 	{
-	   foreach($extrafields->attribute_label as $key => $val) 
+	   foreach($extrafields->attribute_label as $key => $val)
 	   {
-           if (! empty($arrayfields["ef.".$key]['checked'])) 
+           if (! empty($arrayfields["ef.".$key]['checked']))
            {
 				$align=$extrafields->getAlignFlag($key);
 				print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
@@ -340,7 +340,7 @@ if ($result)
     {
         print '<td>';
         $arraygender=array('man'=>$langs->trans("Genderman"),'woman'=>$langs->trans("Genderwoman"));
-        print $form->selectarray('search_gender', $arraygender, $search_gender, 1);        
+        print $form->selectarray('search_gender', $arraygender, $search_gender, 1);
         print '</td>';
     }
     if (! empty($arrayfields['u.employee']['checked']))
@@ -380,9 +380,9 @@ if ($result)
 	// Extra fields
 	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 	{
-	   foreach($extrafields->attribute_label as $key => $val) 
+	   foreach($extrafields->attribute_label as $key => $val)
 	   {
-			if (! empty($arrayfields["ef.".$key]['checked'])) 
+			if (! empty($arrayfields["ef.".$key]['checked']))
 			{
                 $align=$extrafields->getAlignFlag($key);
                 $typeofextrafield=$extrafields->attribute_type[$key];
@@ -428,7 +428,7 @@ if ($result)
     $searchpitco=$form->showFilterAndCheckAddButtons(0);
     print $searchpitco;
     print '</td>';
-	
+
     print "</tr>\n";
 
     $user2=new User($db);
@@ -451,7 +451,7 @@ if ($result)
 		$userstatic->lastname=$obj->lastname;
 		$userstatic->employee=$obj->employee;
 		$userstatic->photo=$obj->photo;
-        
+
 		$li=$userstatic->getNomUrl(-1,'',0,0,24,1,'login');
 
         print "<tr ".$bc[$var].">";
@@ -564,8 +564,8 @@ if ($result)
                 }
             }
             print '</td>';
-		}		
-        
+		}
+
         // Date last login
         if (! empty($arrayfields['u.datelastlogin']['checked']))
     	{
@@ -576,13 +576,13 @@ if ($result)
     	{
             print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($obj->datepreviouslogin),"dayhour").'</td>';
     	}
-        
+
     	// Extra fields
 		if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 		{
-		   foreach($extrafields->attribute_label as $key => $val) 
+		   foreach($extrafields->attribute_label as $key => $val)
 		   {
-				if (! empty($arrayfields["ef.".$key]['checked'])) 
+				if (! empty($arrayfields["ef.".$key]['checked']))
 				{
 					print '<td';
 					$align=$extrafields->getAlignFlag($key);

From 9c482b9f2a021604e29b7321e2e18eed60d08932 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 21:37:27 +0200
Subject: [PATCH 156/438] FIX CVE-2017-7886

---
 htdocs/core/datepicker.php        |   2 +-
 htdocs/core/get_menudiv.php       |   2 +-
 htdocs/core/lib/functions.lib.php | 106 +++++++++++++++---------------
 htdocs/core/search_page.php       |   8 +--
 htdocs/externalsite/frames.php    |   2 +-
 htdocs/install/inc.php            |   6 +-
 htdocs/main.inc.php               |   4 +-
 htdocs/master.inc.php             |   2 +-
 htdocs/support/inc.php            |   2 +-
 htdocs/theme/eldy/style.css.php   |  12 ++--
 htdocs/theme/md/style.css.php     |  52 +++++++--------
 11 files changed, 99 insertions(+), 99 deletions(-)

diff --git a/htdocs/core/datepicker.php b/htdocs/core/datepicker.php
index 63b765fbadb..99bf9b15a80 100644
--- a/htdocs/core/datepicker.php
+++ b/htdocs/core/datepicker.php
@@ -39,7 +39,7 @@ if (! defined('NOREQUIREHTML'))   define('NOREQUIREHTML',1);
 require_once '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
-if (GETPOST('lang')) $langs->setDefaultLang(GETPOST('lang'));	// If language was forced on URL by the main.inc.php
+if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09'));	// If language was forced on URL by the main.inc.php
 $langs->load("main");
 $langs->load("agenda");
 $right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
diff --git a/htdocs/core/get_menudiv.php b/htdocs/core/get_menudiv.php
index 655e10afd67..f8b3a652e08 100644
--- a/htdocs/core/get_menudiv.php
+++ b/htdocs/core/get_menudiv.php
@@ -35,7 +35,7 @@ if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML',1);
 
 require_once '../main.inc.php';
 
-if (GETPOST('lang')) $langs->setDefaultLang(GETPOST('lang'));	// If language was forced on URL by the main.inc.php
+if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09'));	// If language was forced on URL by the main.inc.php
 $langs->load("main");
 $right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
 $left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index a212b82c18f..c4674fbe5a0 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -191,7 +191,7 @@ function getBrowserInfo($user_agent)
 	elseif (preg_match('/opera(\/|\s)([\d\.]*)/i', $user_agent, $reg))    { $name='opera';     $version=$reg[2]; }
 	elseif (preg_match('/(MSIE\s([0-9]+\.[0-9]))|.*(Trident\/[0-9]+.[0-9];\srv:([0-9]+\.[0-9]+))/i', $user_agent, $reg))  { $name='ie'; $version=end($reg); }    // MS products at end
 	elseif (preg_match('/l(i|y)n(x|ks)(\(|\/|\s)*([\d\.]+)/i', $user_agent, $reg)) { $name='lynxlinks'; $version=$reg[4]; }
-	
+
 	if ($tablet) {
 		$layout = 'tablet';
 	} elseif ($phone) {
@@ -269,7 +269,7 @@ function GETPOST($paramname,$check='',$method=0,$filter=NULL,$options=NULL)
 	            break;
 	        case 'aZ09':
 	            $out=trim($out);
-	            if (preg_match('/[^a-z0-9]+/i',$out)) $out='';
+	            if (preg_match('/[^a-z0-9_\-]+/i',$out)) $out='';
 	            break;
 	        case 'array':
 	            if (! is_array($out) || empty($out)) $out=array();
@@ -290,13 +290,13 @@ function GETPOST($paramname,$check='',$method=0,$filter=NULL,$options=NULL)
  *  This prefix is unique for instance and avoid conflict between multi-instances,
  *  even when having two instances with one root dir or two instances in virtual servers
  *
- *  @param  string  $mode       '' or 'email'              
+ *  @param  string  $mode       '' or 'email'
  *  @return	string      		A calculated prefix
  */
 function dol_getprefix($mode='')
 {
     global $conf;
-    
+
     // If MAIL_PREFIX_FOR_EMAIL_ID is set and prefix is for email
     if ($mode == 'email' && ! empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID))
     {
@@ -378,15 +378,15 @@ function dol_buildpath($path, $type=0)
 		if ($type == 1) $res = DOL_URL_ROOT.'/'.$path;			// Standard value
 		if ($type == 2) $res = DOL_MAIN_URL_ROOT.'/'.$path;		// Standard value
 		if ($type == 3) $res = DOL_URL_ROOT.'/'.$path;
-		
+
 		foreach ($conf->file->dol_document_root as $key => $dirroot)	// ex: array(["main"]=>"/home/main/htdocs", ["alt0"]=>"/home/dirmod/htdocs", ...)
 		{
-			if ($key == 'main') 
+			if ($key == 'main')
 			{
 			    if ($type == 3)
 			    {
 			        global $dolibarr_main_url_root;
-			        	
+
 			        // Define $urlwithroot
 			        $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
 			        $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
@@ -413,12 +413,12 @@ function dol_buildpath($path, $type=0)
 					if ($type == 3)
 					{
 					    global $dolibarr_main_url_root;
-					    
+
 					    // Define $urlwithroot
 					    $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
 					    $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
 					    //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
-					    					
+
 					    $res=(preg_match('/^http/i',$conf->file->dol_url_root[$key])?'':$urlwithroot).$conf->file->dol_url_root[$key].'/'.$path;     // Test on start with http is for old conf syntax
 					}
 					break;
@@ -957,7 +957,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 	    $maxvisiblephotos=(isset($conf->global->PRODUCT_MAX_VISIBLE_PHOTO)?$conf->global->PRODUCT_MAX_VISIBLE_PHOTO:5);
 		if ($conf->browser->phone) $maxvisiblephotos=1;
 		if ($showimage) $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos($conf->product->multidir_output[$object->entity],'small',$maxvisiblephotos,0,0,0,$width,0).'</div>';
-        else 
+        else
         {
 			if (!empty($conf->global->PRODUCT_NODISPLAYIFNOPHOTO)) {
 				$nophoto='';
@@ -967,17 +967,17 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 				$nophoto='/public/theme/common/nophoto.png';
 				$morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="No photo" border="0"'.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="'.DOL_URL_ROOT.$nophoto.'"></div>';
 			}
-            
+
         }
 	}
-	else 
+	else
 	{
         if ($showimage) $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">'.$form->showphoto($modulepart,$object,0,0,0,'photoref','small',1,0,$maxvisiblephotos).'</div>';
 	}
 	if ($showbarcode) $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">'.$form->showbarcode($object).'</div>';
 	if ($object->element == 'societe' && ! empty($conf->use_javascript_ajax) && $user->rights->societe->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
 		$morehtmlright.=ajax_object_onoff($object, 'status', 'status', 'InActivity', 'ActivityCeased');
-	} 
+	}
 	elseif ($object->element == 'product')
 	{
 	    //$morehtmlright.=$langs->trans("Status").' ('.$langs->trans("Sell").') ';
@@ -999,7 +999,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 	}
 	if (! empty($object->name_alias)) $morehtmlref.='<div class="refidno">'.$object->name_alias.'</div>';      // For thirdparty
 	if (! empty($object->label))      $morehtmlref.='<div class="refidno">'.$object->label.'</div>';           // For product
-	if ($object->element != 'product') 
+	if ($object->element != 'product')
 	{
     	$morehtmlref.='<div class="refidno">';
     	$morehtmlref.=$object->getBannerAddress('refaddress',$object);
@@ -1184,9 +1184,9 @@ function dol_print_date($time,$format='',$tzoutput='tzserver',$outputlangs='',$e
 	$reduceformat=(! empty($conf->dol_optimize_smallscreen) && in_array($format,array('day','dayhour')))?1:0;
 	$formatwithoutreduce = preg_replace('/reduceformat/','',$format);
 	if ($formatwithoutreduce != $format) { $format = $formatwithoutreduce; $reduceformat=1; }  // so format 'dayreduceformat' is processed like day
-    
+
 	// Change predefined format into computer format. If found translation in lang file we use it, otherwise we use default.
-	// TODO Add format daysmallyear and dayhoursmallyear 
+	// TODO Add format daysmallyear and dayhoursmallyear
 	if ($format == 'day')				$format=($outputlangs->trans("FormatDateShort")!="FormatDateShort"?$outputlangs->trans("FormatDateShort"):$conf->format_date_short);
 	else if ($format == 'hour')			$format=($outputlangs->trans("FormatHourShort")!="FormatHourShort"?$outputlangs->trans("FormatHourShort"):$conf->format_hour_short);
 	else if ($format == 'hourduration')	$format=($outputlangs->trans("FormatHourShortDuration")!="FormatHourShortDuration"?$outputlangs->trans("FormatHourShortDuration"):$conf->format_hour_short_duration);
@@ -1957,7 +1957,7 @@ function dol_print_graph($htmlid,$width,$height,$data,$showlegend=0,$type='pie',
 	    print '<div class="nographyettext">'.$langs->trans("NotEnoughDataYet").'</div>';
 	    return;
 	}
-	
+
 	if (empty($conf->use_javascript_ajax)) return;
 	$jsgraphlib='flot';
 	$datacolor=array();
@@ -2126,7 +2126,7 @@ function dol_trunc($string,$size=40,$trunc='right',$stringencoding='UTF-8',$nodo
 	global $conf;
 
 	if ($size==0 || ! empty($conf->global->MAIN_DISABLE_TRUNC)) return $string;
-	
+
 	if (empty($stringencoding)) $stringencoding='UTF-8';
 	// reduce for small screen
 	if ($conf->dol_optimize_smallscreen==1 && $display==1) $size = round($size/3);
@@ -3076,7 +3076,7 @@ function load_fiche_titre($titre, $mesg='', $picto='title_generic.png', $pictois
  *	@param	string	    $options         	parametres complementaires lien ('' par defaut)
  *	@param	string    	$sortfield       	champ de tri ('' par defaut)
  *	@param	string	    $sortorder       	ordre de tri ('' par defaut)
- *	@param	string	    $center          	chaine du centre ('' par defaut). We often find here string $massaction comming from $form->selectMassAction() 
+ *	@param	string	    $center          	chaine du centre ('' par defaut). We often find here string $massaction comming from $form->selectMassAction()
  *	@param	int		    $num				number of records found by select with limit+1
  *	@param	int		    $totalnboflines		Total number of records/lines for all pages (if known). Use a negative value to no show number.
  *	@param	string	    $picto				Icon to use before title (should be a 32x32 transparent png file)
@@ -3090,11 +3090,11 @@ function load_fiche_titre($titre, $mesg='', $picto='title_generic.png', $pictois
 function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $sortorder='', $center='', $num=-1, $totalnboflines=0, $picto='title_generic.png', $pictoisfullpath=0, $morehtml='', $morecss='', $limit=-1, $hideselectlimit=0)
 {
 	global $conf,$langs;
-	
+
 	$savlimit = $limit;
     $savtotalnboflines = $totalnboflines;
     $totalnboflines=abs($totalnboflines);
-    
+
 	if ($picto == 'setup') $picto='title_setup.png';
 	if (($conf->browser->name == 'ie') && $picto=='title_generic.png') $picto='title.gif';
 	if ($limit < 0) $limit = $conf->liste_limit;
@@ -3107,7 +3107,7 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
 		$nextpage = 0;
 	}
 	//print 'totalnboflines='.$totalnboflines.'-savlimit='.$savlimit.'-limit='.$limit.'-num='.$num.'-nextpage='.$nextpage;
-	
+
 	print "\n";
 	print "<!-- Begin title '".$titre."' -->\n";
 	print '<table width="100%" border="0" class="notopnoleftnoright'.($morecss?' '.$morecss:'').'" style="margin-bottom: 6px;"><tr>';
@@ -3206,7 +3206,7 @@ function print_fleche_navigation($page, $file, $options='', $nextpage=0, $betwee
 	    //$pagesizechoices.=',0:'.$langs->trans("All");     // Not yet supported
 	    //$pagesizechoices.=',2:2';
 	    if (! empty($conf->global->MAIN_PAGESIZE_CHOICES)) $pagesizechoices=$conf->global->MAIN_PAGESIZE_CHOICES;
-	     
+
         print '<li class="pagination">';
         print '<select class="flat selectlimit" name="limit">';
         $tmpchoice=explode(',',$pagesizechoices);
@@ -3246,7 +3246,7 @@ function print_fleche_navigation($page, $file, $options='', $nextpage=0, $betwee
             		</script>
                 ';
         }
-        print '</li>';	    
+        print '</li>';
 	}
 	if ($page > 0)
 	{
@@ -3285,7 +3285,7 @@ function print_fleche_navigation($page, $file, $options='', $nextpage=0, $betwee
 function vatrate($rate,$addpercent=false,$info_bits=0,$usestarfornpr=0)
 {
     $morelabel='';
-    
+
     if (preg_match('/%/',$rate))
 	{
 		$rate=str_replace('%','',$rate);
@@ -3488,7 +3488,7 @@ function price2num($amount,$rounding='',$alreadysqlnb=0)
 
 /**
  * Output a dimension with best unit
- *  
+ *
  * @param   float       $dimension      Dimension
  * @param   int         $unit           Unit of dimension (0, -3, ...)
  * @param   string      $type           'weight', 'volume', ...
@@ -3500,16 +3500,16 @@ function price2num($amount,$rounding='',$alreadysqlnb=0)
 function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs, $round=-1, $forceunitoutput='no')
 {
     require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
-    
-    if (($forceunitoutput == 'no' && $dimension < 1/10000) || (is_numeric($forceunitoutput) && $forceunitoutput == -6)) 
+
+    if (($forceunitoutput == 'no' && $dimension < 1/10000) || (is_numeric($forceunitoutput) && $forceunitoutput == -6))
     {
         $dimension = $dimension * 1000000;
-        $unit = $unit - 6; 
+        $unit = $unit - 6;
     }
     elseif (($forceunitoutput == 'no' && $dimension < 1/10) || (is_numeric($forceunitoutput) && $forceunitoutput == -3))
     {
         $dimension = $dimension * 1000;
-        $unit = $unit - 3; 
+        $unit = $unit - 3;
     }
     elseif (($forceunitoutput == 'no' && $dimension > 100000000) || (is_numeric($forceunitoutput) && $forceunitoutput == 6))
     {
@@ -3521,9 +3521,9 @@ function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs, $round=
         $dimension = $dimension / 1000;
         $unit = $unit + 3;
     }
-    
+
     $ret=price($dimension, 0, $outputlangs, 0, 0, $round).' '.measuring_units_string($unit, $type);
-    
+
     return $ret;
 }
 
@@ -3554,12 +3554,12 @@ function get_localtax($vatrate, $local, $thirdparty_buyer="", $thirdparty_seller
         $vatratecleaned = trim($reg[1]);
 	    $vatratecode = $reg[2];
 	}
-	
+
 	/*if ($thirdparty_buyer->country_code != $thirdparty_seller->country_code)
 	{
 		return 0;
 	}*/
-	
+
 	// Some test to guess with no need to make database access
 	if ($mysoc->country_code == 'ES') // For spain localtaxes 1 and 2, tax is qualified if buyer use local taxe
 	{
@@ -3600,7 +3600,7 @@ function get_localtax($vatrate, $local, $thirdparty_buyer="", $thirdparty_seller
 	{
 	    $conf->global->MAIN_GET_LOCALTAXES_VALUES_FROM_THIRDPARTY = 1;
 	}
-	    
+
 	// Search local taxes
 	if (! empty($conf->global->MAIN_GET_LOCALTAXES_VALUES_FROM_THIRDPARTY))
 	{
@@ -3657,7 +3657,7 @@ function get_localtax($vatrate, $local, $thirdparty_buyer="", $thirdparty_seller
    		if ($local==1) return $obj->localtax1;
    		elseif ($local==2) return $obj->localtax2;
 	}
-	
+
 	return 0;
 }
 
@@ -3717,7 +3717,7 @@ function get_localtax_by_third($local)
 
 /**
  *  Get vat rate and npr from id.
- *  You can call getLocalTaxesFromRate after to get other fields 
+ *  You can call getLocalTaxesFromRate after to get other fields
  *
  *  @param	int      $vatrowid			Line ID into vat rate table.
  *  @return	array    	  				array(localtax_type1(1-6 / 0 if not found), rate of localtax1, ...)
@@ -3771,7 +3771,7 @@ function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisi
 	    $vatratecleaned = $reg[1];
 	    $vatratecode = $reg[2];
 	}
-	
+
 	// Search local taxes
 	$sql  = "SELECT t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.accountancy_code_sell, t.accountancy_code_buy";
 	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t";
@@ -3784,7 +3784,7 @@ function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisi
     	$sql.= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";
     	if ($vatratecode) $sql.= " AND t.code ='".$vatratecode."'";
 	}
-	
+
 	$resql=$db->query($sql);
 	if ($resql)
 	{
@@ -4191,7 +4191,7 @@ function yn($yesno, $case=1, $color=0)
 /**
  *	Return a path to have a directory according to object.
  *  New usage:       $conf->product->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, 'modulepart')
- *  Old usage:       '015' with level 3->"0/1/5/", '015' with level 1->"5/", 'ABC-1' with level 3 ->"0/0/1/" 
+ *  Old usage:       '015' with level 3->"0/1/5/", '015' with level 1->"5/", 'ABC-1' with level 3 ->"0/0/1/"
  *
  *	@param	string	$num            Id of object (deprecated, $object will be used in future)
  *	@param  int		$level		    Level of subdirs to return (1, 2 or 3 levels). (deprecated, global option will be used in future)
@@ -4208,7 +4208,7 @@ function get_exdir($num,$level,$alpha,$withoutslash,$object,$modulepart)
 	$path = '';
 
 	$arrayforoldpath=array('cheque','user','category','holiday','shipment', 'member','don','donation','supplier_invoice','invoice_supplier','mailing');
-	if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) $arrayforoldpath[]='product';	
+	if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) $arrayforoldpath[]='product';
 	if (! empty($level) && in_array($modulepart, $arrayforoldpath))
 	{
 		// This part should be removed once all code is using "get_exdir" to forge path, with all parameters provided
@@ -4360,7 +4360,7 @@ function dolGetFirstLineOfText($text)
 	{
 		$firstline=preg_replace('/<br[^>]*>.*$/s','',$text);		// The s pattern modifier means the . can match newline characters
 		$firstline=preg_replace('/<div[^>]*>.*$/s','',$firstline);	// The s pattern modifier means the . can match newline characters
-		
+
 	}
 	else
 	{
@@ -5386,11 +5386,11 @@ function printCommonFooter($zone='private')
 	{
 		print '<!-- Reposition management (does not work if a redirect is done after action of submission) -->'."\n";
     	print '<script type="text/javascript" language="javascript">jQuery(document).ready(function() {'."\n";
-    	
+
     	print '<!-- If page_y set, we set scollbar with it -->'."\n";
     	print "page_y=getParameterByName('page_y', 0);";
     	print "if (page_y > 0) $('html, body').scrollTop(page_y);\n";
-    	
+
     	print '<!-- Set handler to add page_y param on some a href links -->'."\n";
     	print 'jQuery(".reposition").click(function() {
     	           var page_y = $(document).scrollTop();
@@ -5398,7 +5398,7 @@ function printCommonFooter($zone='private')
     	           this.href=this.href+\'&page_y=\'+page_y;
     	           });'."\n";
     	print '});'."\n";
-    	
+
     	if (empty($conf->dol_use_jmobile))
     	{
         	print '<!-- Set handler to switch left menu page -->'."\n";
@@ -5407,10 +5407,10 @@ function printCommonFooter($zone='private')
         	if ($conf->theme == 'md') print "  $('.login_block').toggle();";
         	print '});'."\n";
     	}
-    	
+
     	print '</script>'."\n";
 	}
-	
+
 	// Google Analytics (need Google module)
 	if (! empty($conf->google->enabled) && ! empty($conf->global->MAIN_GOOGLE_AN_ID))
 	{
@@ -5623,15 +5623,15 @@ function natural_search($fields, $value, $mode=0, $nofirstand=0)
 	            	$tmpcrit=trim($tmpcrit);
 	            	$tmpcrit2=$tmpcrit;
 	            	$tmpbefore='%'; $tmpafter='%';
-	            	if (preg_match('/^[\^\$]/', $tmpcrit)) 
-	            	{ 
+	            	if (preg_match('/^[\^\$]/', $tmpcrit))
+	            	{
 	            	    $tmpbefore='';
-	            	    $tmpcrit2 = preg_replace('/^[\^\$]/', '', $tmpcrit2); 
+	            	    $tmpcrit2 = preg_replace('/^[\^\$]/', '', $tmpcrit2);
 	            	}
-					if (preg_match('/[\^\$]$/', $tmpcrit)) 
-	            	{ 
+					if (preg_match('/[\^\$]$/', $tmpcrit))
+	            	{
 	            	    $tmpafter='';
-	            	    $tmpcrit2 = preg_replace('/[\^\$]$/', '', $tmpcrit2); 
+	            	    $tmpcrit2 = preg_replace('/[\^\$]$/', '', $tmpcrit2);
 	            	}
 	            	$newres .= $tmpbefore;
 	            	$newres .= $db->escape($tmpcrit2);
diff --git a/htdocs/core/search_page.php b/htdocs/core/search_page.php
index 09b37f4bb8a..c0d98a001b8 100644
--- a/htdocs/core/search_page.php
+++ b/htdocs/core/search_page.php
@@ -35,7 +35,7 @@ if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU',1);
 
 require_once '../main.inc.php';
 
-if (GETPOST('lang')) $langs->setDefaultLang(GETPOST('lang'));	// If language was forced on URL by the main.inc.php
+if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09'));	// If language was forced on URL by the main.inc.php
 $langs->load("main");
 $right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
 $left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
@@ -76,11 +76,11 @@ if ($conf->use_javascript_ajax && 1 == 2)   // select2 is ko with jmobile
 else
 {
     $conf->global->MAIN_HTML5_PLACEHOLDER = 1;
-    
-    
+
+
     $usedbyinclude = 1; // Used into next include
     include DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php';
-    
+
     $accesskeyalreadyassigned=array();
     foreach($arrayresult as $key => $val)
     {
diff --git a/htdocs/externalsite/frames.php b/htdocs/externalsite/frames.php
index c0b5cf92e7e..adf9d547073 100644
--- a/htdocs/externalsite/frames.php
+++ b/htdocs/externalsite/frames.php
@@ -38,7 +38,7 @@ $mainmenu=GETPOST('mainmenu', 'alpha');
 $leftmenu=GETPOST('leftmenu', 'alpha');
 $idmenu=GETPOST('idmenu', 'int');
 $theme=GETPOST('theme', 'alpha');
-$codelang=GETPOST('lang', 'alpha');
+$codelang=GETPOST('lang', 'aZ09');
 
 print "
 <html>
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index a0d873d4f5c..c0d89083325 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -258,7 +258,7 @@ if (function_exists('get_magic_quotes_gpc'))	// magic_quotes_* removed in PHP 5.
 
 // Defini objet langs
 $langs = new Translate('..',$conf);
-if (GETPOST('lang')) $langs->setDefaultLang(GETPOST('lang'));
+if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09'));
 else $langs->setDefaultLang('auto');
 
 $bc[false]=' class="bg1"';
@@ -442,9 +442,9 @@ function pFooter($nonext=0,$setuplang='',$jscheckfunction='', $withpleasewait=0)
         print '<div class="nextbutton" id="nextbutton">';
         if ($nonext == '2')
 		{
-			print $langs->trans("ErrorFoundDuringMigration", $_SERVER["REQUEST_URI"].'&ignoreerrors=1').'<br><br>';	
+			print $langs->trans("ErrorFoundDuringMigration", $_SERVER["REQUEST_URI"].'&ignoreerrors=1').'<br><br>';
 		}
-        
+
         print '<input type="submit" '.($nonext == '2' ? 'disabled="disabled" ':'').'value="'.$langs->trans("NextStep").' ->"';
         if ($jscheckfunction) print ' onClick="return '.$jscheckfunction.'();"';
         print '></div>';
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 1a832990f38..34e548d397c 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -567,7 +567,7 @@ if (! defined('NOLOGIN'))
 	        $paramsurl=array();
 	        if (GETPOST('textbrowser')) $paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
 	        if (GETPOST('nojs')) $paramsurl[]='nojs='.GETPOST('nojs','int');
-	        if (GETPOST('lang')) $paramsurl[]='lang='.GETPOST('lang','alpha');
+	        if (GETPOST('lang')) $paramsurl[]='lang='.GETPOST('lang', 'aZ09');
             header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl)?'?'.implode('&',$paramsurl):''));
             exit;
         }
@@ -626,7 +626,7 @@ if (! defined('NOLOGIN'))
 	        $paramsurl=array();
 	        if (GETPOST('textbrowser')) $paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
 	        if (GETPOST('nojs')) $paramsurl[]='nojs='.GETPOST('nojs','int');
-	        if (GETPOST('lang')) $paramsurl[]='lang='.GETPOST('lang','alpha');
+	        if (GETPOST('lang')) $paramsurl[]='lang='.GETPOST('lang', 'aZ09');
             header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl)?'?'.implode('&',$paramsurl):''));
             exit;
         }
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 80fc5d9a1d4..16c09207102 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -246,7 +246,7 @@ if (! defined('NOREQUIREDB') && ! defined('NOREQUIRESOC'))
 // Set default language (must be after the setValues setting global $conf->global->MAIN_LANG_DEFAULT. Page main.inc.php will overwrite langs->defaultlang with user value later)
 if (! defined('NOREQUIRETRAN'))
 {
-    $langcode=(GETPOST('lang')?GETPOST('lang','alpha',1):(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT));
+    $langcode=(GETPOST('lang', 'aZ09')?GETPOST('lang', 'aZ09', 1):(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT));
 	$langs->setDefaultLang($langcode);
 }
 
diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php
index 36566b0d3f5..141dfd11f35 100644
--- a/htdocs/support/inc.php
+++ b/htdocs/support/inc.php
@@ -142,7 +142,7 @@ if (empty($conf->db->user)) $conf->db->user='';
 
 // Defini objet langs
 $langs = new Translate('..',$conf);
-if (GETPOST('lang')) $langs->setDefaultLang(GETPOST('lang'));
+if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09'));
 else $langs->setDefaultLang('auto');
 
 $bc[false]=' class="bg1"';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index fef5f3d1e64..c1f9ef1962b 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -53,7 +53,7 @@ else header('Cache-Control: no-cache');
 // On the fly GZIP compression for all pages (if browser support it). Must set the bit 3 of constant to 1.
 if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x04)) { ob_start("ob_gzhandler"); }
 
-if (GETPOST('lang')) $langs->setDefaultLang(GETPOST('lang', 'alpha'));	// If language was forced on URL
+if (GETPOST('lang')) $langs->setDefaultLang(GETPOST('lang', 'aZ09'));	// If language was forced on URL
 if (GETPOST('theme')) $conf->theme=GETPOST('theme', 'alpha');  // If theme was forced on URL
 $langs->load("main",0,1);
 $right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
@@ -1101,7 +1101,7 @@ div.menu_titre {
 	padding-top: 4px;
 	padding-bottom: 4px;
 	overflow: hidden;
-    text-overflow: ellipsis;	
+    text-overflow: ellipsis;
 }
 .mainmenuaspan
 {
@@ -1488,7 +1488,7 @@ a.vsmenu.addbookmarkpicto {
 {
 /*	border-bottom: 1px solid #BBB; */
 }
-div.blockvmenusearchphone 
+div.blockvmenusearchphone
 {
 	border-bottom: none !important;
 }
@@ -2681,7 +2681,7 @@ div.liste_titre_bydiv {
 	border-top-width: <?php echo $borderwith ?>px;
     border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
     border-top-style: solid;
-    
+
 	border-collapse: collapse;
 	display: table;
 	padding: 2px 0px 2px 0;
@@ -3288,7 +3288,7 @@ td.hidden {
 	border-bottom: 1px solid #888;
 	background: #eee;
 }
-.websitebar .button, .websitebar .buttonDelete 
+.websitebar .button, .websitebar .buttonDelete
 {
 	padding: 2px 5px 3px 5px !important;
 	margin: 2px 4px 2px 4px  !important;
@@ -3297,7 +3297,7 @@ td.hidden {
 .websiteselection {
 	display: inline-block;
 	padding-left: 10px;
-	vertical-align: middle; 
+	vertical-align: middle;
 	line-height: 29px;
 }
 .websitetools {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 32c0604386c..ca04a8f6f0e 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -54,7 +54,7 @@ else header('Cache-Control: no-cache');
 // On the fly GZIP compression for all pages (if browser support it). Must set the bit 3 of constant to 1.
 if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x04)) { ob_start("ob_gzhandler"); }
 
-if (GETPOST('lang')) $langs->setDefaultLang(GETPOST('lang'));	// If language was forced on URL
+if (GETPOST('lang')) $langs->setDefaultLang(GETPOST('lang', 'aZ09'));	// If language was forced on URL
 if (GETPOST('theme')) $conf->theme=GETPOST('theme');  // If theme was forced on URL
 $langs->load("main",0,1);
 $right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
@@ -520,7 +520,7 @@ div.divsearchfield {
 	margin-<?php print $left; ?>: 2px;
 	margin-top: 4px;
     margin-bottom: 4px;
-  	padding-left: 2px;	
+  	padding-left: 2px;
 }
 div.confirmmessage {
 	padding-top: 6px;
@@ -545,8 +545,8 @@ div.myavailability {
 }
 .checkallactions {
 	vertical-align: top;
-    margin-top: 6px;	
-    margin-left: 4px;	
+    margin-top: 6px;
+    margin-left: 4px;
 }
 .selectlimit {
 	margin-right: 10px !important;
@@ -713,7 +713,7 @@ td.showDragHandle {
 <?php if (GETPOST("optioncss") != 'print') { ?>
 	padding-left: 229px;
 	padding-top: 12px;
-<?php } ?>	
+<?php } ?>
 }
 
 .side-nav {
@@ -919,7 +919,7 @@ table.noborder tr.liste_titre td {
 	padding-right: 1px;
 	padding-top: 1px;
 	padding-bottom: 1px;
-	width: 44px; 
+	width: 44px;
 }
 div.attacharea {
 	padding-top: 10px;
@@ -934,7 +934,7 @@ div.arearef {
 	margin-bottom: 10px;
 }
 div.heightref {
-	min-height: 74px; 
+	min-height: 74px;
 }
 div.divphotoref {
 	padding-right: 20px;
@@ -1131,7 +1131,7 @@ div.tmenucenter
 div.menu_titre {
 	padding-bottom: 2px;
 	overflow: hidden;
-    text-overflow: ellipsis;	
+    text-overflow: ellipsis;
 }
 .mainmenuaspan
 {
@@ -1493,8 +1493,8 @@ div.vmenu, td.vmenu {
 	width: 202px;
 }
 
-.menu_contenu { 
-	padding-top: 4px; 
+.menu_contenu {
+	padding-top: 4px;
 	padding-bottom: 3px;
 	overflow: hidden;
     text-overflow: ellipsis;
@@ -2005,8 +2005,8 @@ span.tabspan {
 /* Boutons actions                                                                */
 /* ============================================================================== */
 
-div.divButAction { 
-	margin-bottom: 1.4em; 
+div.divButAction {
+	margin-bottom: 1.4em;
 	vertical-align: top;
 }
 
@@ -2072,16 +2072,16 @@ span.butAction, span.butActionDelete {
     text-shadow: none;
     border-color: #555;
     cursor: not-allowed;
-    
+
     background-color: #f5f5f5;
     background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
     background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
     background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
     background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
     background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
-    background-repeat: repeat-x    
+    background-repeat: repeat-x
 }
-   
+
 .butActionDelete, .buttonDelete {
 	color: #ffffff !important;
 	text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
@@ -2231,7 +2231,7 @@ table.liste, table.noborder, table.formdoc, div.noborder {
 	border-bottom-width: 1px;
 	border-bottom-color: #BBB;
 	border-bottom-style: solid;
-	
+
 	margin: 0px 0px 8px 0px;
     /*
 	-moz-box-shadow: 2px 2px 4px #CCC;
@@ -2239,7 +2239,7 @@ table.liste, table.noborder, table.formdoc, div.noborder {
 	box-shadow: 2px 2px 4px #CCC;
     */
 	/* box-shadow: 0 0 3px rgba(0,0,0,0.16); */
-	
+
 	-moz-border-radius: 0.1em;
 	-webkit-border-radius: 0.1em;
 	border-radius: 0.1em;
@@ -2495,7 +2495,7 @@ div.pagination li.paginationafterarrows {
 	margin-bottom: 1px;
 	color: #202020;
 	min-height: 18px; /* seems to not be used */
-	
+
 	background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?>;
 }
 #GanttChartDIV {
@@ -2562,7 +2562,7 @@ div.liste_titre_bydiv {
 	border-top-width: <?php echo $borderwith; ?>px;
     border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
     border-top-style: solid;
-    
+
 	box-shadow: none;
 	border-collapse: collapse;
 	display: table;
@@ -2589,7 +2589,7 @@ div.liste_titre, tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.list
 	background: rgb(<?php echo $colorbacktitle1; ?>);
 	<?php } ?>
 	font-weight: <?php echo $useboldtitle?'bold':'normal'; ?>;
-	
+
     color: rgb(<?php echo $colortexttitle; ?>);
     font-family: <?php print $fontlist ?>;
     border-bottom: 1px solid #FDFFFF;
@@ -2745,7 +2745,7 @@ span.dashboardlineko {
 
 tr.box_titre {
     height: 26px !important;
-    
+
     /* TO MATCH BOOTSTRAP */
 	/*background: #ddd;
 	color: #000 !important; */
@@ -2760,7 +2760,7 @@ tr.box_titre {
 	<?php } else { ?>
 	background: rgb(<?php echo $colorbacktitle1; ?>);
 	<?php } ?>
-	
+
     background-repeat: repeat-x;
     color: rgb(<?php echo $colortexttitle; ?>);
     font-family: <?php print $fontlist ?>, sans-serif;
@@ -3184,7 +3184,7 @@ td.hidden {
 	border-bottom: 1px solid #888;
 	background: #eee;
 }
-.websitebar .button, .websitebar .buttonDelete 
+.websitebar .button, .websitebar .buttonDelete
 {
 	padding: 2px 4px 2px 4px !important;
 	margin: 2px 4px 2px 4px  !important;
@@ -3193,7 +3193,7 @@ td.hidden {
 .websiteselection {
 	display: inline-block;
 	padding-left: 10px;
-	vertical-align: middle; 
+	vertical-align: middle;
 	line-height: 29px;
 }
 .websitetools {
@@ -4297,7 +4297,7 @@ img.demothumb {
 @media only screen and (max-width: 767px)
 {
 	.imgopensurveywizard { width:95%; height: auto; }
-	
+
 	#tooltip {
 		position: absolute;
 		width: <?php print dol_size(350,'width'); ?>px;
@@ -4375,7 +4375,7 @@ img.demothumb {
 	div.mainmenu {
     	min-width: 20px;
     }
-    
+
 	#tooltip {
 		position: absolute;
 		width: <?php print dol_size(300,'width'); ?>px;

From 36b18f030095053f122e1a13e6f35bd590d2a40c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 22:11:12 +0200
Subject: [PATCH 157/438] Save MAIN_VERSION_FIRST_INSTALL that is not erased.

---
 htdocs/core/lib/functions.lib.php              |  2 +-
 htdocs/core/modules/syslog/mod_syslog_file.php |  9 +++++----
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql |  2 ++
 htdocs/install/mysql/tables/llx_c_typent.sql   |  2 +-
 htdocs/install/step1.php                       |  8 ++++----
 htdocs/install/step2.php                       |  2 +-
 htdocs/install/step5.php                       | 13 +++++++++----
 7 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 8a9bd1e88b6..a09ebd6fe7d 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -846,7 +846,7 @@ function dol_strtoupper($utf8_string)
  *	SYSLOG_HANDLERS = ["mod_syslog_syslog"]  	facility is then defined by SYSLOG_FACILITY
  *  Warning, syslog functions are bugged on Windows, generating memory protection faults. To solve
  *  this, use logging to files instead of syslog (see setup of module).
- *  Note: If SYSLOG_FILE_NO_ERROR defined, we never output any error message when writing to log fails.
+ *  Note: If constant 'SYSLOG_FILE_NO_ERROR' defined, we never output any error message when writing to log fails.
  *  Note: You can get log message into html sources by adding parameter &logtohtml=1 (constant MAIN_LOGTOHTML must be set)
  *  This function works only if syslog module is enabled.
  * 	This must not use any call to other function calling dol_syslog (avoid infinite loop).
diff --git a/htdocs/core/modules/syslog/mod_syslog_file.php b/htdocs/core/modules/syslog/mod_syslog_file.php
index 68493fd4eb4..b059c63e003 100644
--- a/htdocs/core/modules/syslog/mod_syslog_file.php
+++ b/htdocs/core/modules/syslog/mod_syslog_file.php
@@ -127,12 +127,13 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 
 		$logfile = $this->getFilename($suffixinfilename);
 
-		if (! empty($conf->global->SYSLOG_FILE_NO_ERROR)) $filefd = @fopen($logfile, 'a+');
+		// Test constant SYSLOG_FILE_NO_ERROR (should stay a constant defined with define('SYSLOG_FILE_NO_ERROR',1);
+		if (defined('SYSLOG_FILE_NO_ERROR')) $filefd = @fopen($logfile, 'a+');
 		else $filefd = fopen($logfile, 'a+');
 
 		if (! $filefd)
 		{
-			if (empty($conf->global->SYSLOG_FILE_NO_ERROR))
+			if (! defined('SYSLOG_FILE_NO_ERROR') || ! constant('SYSLOG_FILE_NO_ERROR'))
 			{
 				// Do not break dolibarr usage if log fails
 				//throw new Exception('Failed to open log file '.basename($logfile));
@@ -151,7 +152,7 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 				LOG_INFO => 'INFO',
 				LOG_DEBUG => 'DEBUG'
 			);
-			
+
 			$delay = "";
 			if (!empty($conf->global->MAIN_SYSLOG_SHOW_DELAY))
 			{
@@ -159,7 +160,7 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 				$delay = " ".sprintf("%05.3f", $this->lastTime != 0 ? $now - $this->lastTime : 0);
 				$this->lastTime = $now;
 			}
-			
+
 			$message = dol_print_date(time(),"%Y-%m-%d %H:%M:%S").$delay." ".sprintf("%-7s", $logLevels[$content['level']])." ".sprintf("%-15s", $content['ip'])." ".($this->ident>0?str_pad('',$this->ident,' '):'').$content['message'];
 			fwrite($filefd, $message."\n");
 			fclose($filefd);
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 85b9d3106cf..09d6c4de475 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -38,6 +38,8 @@
 ALTER TABLE llx_extrafields ADD COLUMN fieldcomputed text;
 ALTER TABLE llx_extrafields ADD COLUMN fielddefault varchar(255);
 
+ALTER TABLE llx_c_typent MODIFY COLUMN libelle varchar(64); 
+
 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP;
 
 ALTER TABLE llx_opensurvey_sondage ADD COLUMN fk_user_creat integer NOT NULL DEFAULT 0;
diff --git a/htdocs/install/mysql/tables/llx_c_typent.sql b/htdocs/install/mysql/tables/llx_c_typent.sql
index ae89faf5c74..5b78abf1a75 100644
--- a/htdocs/install/mysql/tables/llx_c_typent.sql
+++ b/htdocs/install/mysql/tables/llx_c_typent.sql
@@ -21,7 +21,7 @@ create table llx_c_typent
 (
   id         integer      PRIMARY KEY,
   code       varchar(12)  NOT NULL,
-  libelle    varchar(48),
+  libelle    varchar(64),
   fk_country integer NULL,		-- Defined only to have specific list for countries that can't use generic list (like argentina that need type A or B)
   active     tinyint DEFAULT 1   NOT NULL,
   module     varchar(32) NULL,
diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php
index b1a9fabb20d..a57ffd0c674 100644
--- a/htdocs/install/step1.php
+++ b/htdocs/install/step1.php
@@ -33,7 +33,7 @@ include 'inc.php';
 global $langs;
 
 $action=GETPOST('action','alpha');
-$setuplang=(GETPOST('selectlang','',3)?GETPOST('selectlang','',3):'auto');
+$setuplang=(GETPOST('selectlang','aZ09',3)?GETPOST('selectlang','aZ09',3):'auto');
 $langs->setDefaultLang($setuplang);
 
 $langs->load("admin");
@@ -341,7 +341,7 @@ if (! $error && $db->connected && $action == "set")
     }
 
     // Show title of step
-    print '<h3>'.$langs->trans("ConfigurationFile").'</h3>';
+    print '<h3><img class="valigntextbottom" src="../theme/common/octicons/lib/svg/gear.svg" width="20" alt="Configuration"> '.$langs->trans("ConfigurationFile").'</h3>';
     print '<table cellspacing="0" width="100%" cellpadding="1" border="0">';
 
     // Check parameter main_dir
@@ -552,7 +552,7 @@ if (! $error && $db->connected && $action == "set")
                 if ($db->connected)
                 {
                     $resultbis = 1;
-                    
+
                     // Create user
                     $result=$db->DDLCreateUser($dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name);
                     // Create user bis
@@ -563,7 +563,7 @@ if (! $error && $db->connected && $action == "set")
                             $resultbis=$db->DDLCreateUser('%', $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name);
                         }
                     }
-                    
+
                     if ($result > 0 && $resultbis > 0)
                     {
 
diff --git a/htdocs/install/step2.php b/htdocs/install/step2.php
index baceee5f7eb..ae5adc4e471 100644
--- a/htdocs/install/step2.php
+++ b/htdocs/install/step2.php
@@ -86,7 +86,7 @@ if (! is_writable($conffile))
 
 if ($action == "set")
 {
-    print '<h3>'.$langs->trans("Database").'</h3>';
+    print '<h3><img class="valigntextbottom" src="../theme/common/octicons/lib/svg/database.svg" width="20" alt="Database"> '.$langs->trans("Database").'</h3>';
 
     print '<table cellspacing="0" style="padding: 4px 4px 4px 0px" border="0" width="100%">';
     $error=0;
diff --git a/htdocs/install/step5.php b/htdocs/install/step5.php
index 875fd9378f2..b4bf7987547 100644
--- a/htdocs/install/step5.php
+++ b/htdocs/install/step5.php
@@ -174,13 +174,13 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
 		    {
 		        $numrows=$db->num_rows($resql);
     			if ($numrows == 0) dolibarr_set_const($db, "DATABASE_PWD_ENCRYPTED", "1",'chaine',0,'',$conf->entity);
-		    }            
-            
+		    }
+
 		    // Create user used to create the admin user
             $createuser=new User($db);
             $createuser->id=0;
             $createuser->admin=1;
-            
+
             // Set admin user
             $newuser = new User($db);
             $newuser->lastname='SuperAdmin';
@@ -216,10 +216,15 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
             {
                 $db->begin();
 
+                dolibarr_install_syslog('step5: set MAIN_VERSION_FIRST_INSTALL const to ' . $targetversion, LOG_DEBUG);
+                $resql=$db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) values(".$db->encrypt('MAIN_VERSION_FIRST_INSTALL',1).",".$db->encrypt($targetversion,1).",'chaine',0,'Dolibarr version when first install',0)");
+                //if (! $resql) dol_print_error($db,'Error in setup program');      // We ignore errors. Key may already exists
+                $conf->global->MAIN_VERSION_FIRST_INSTALL=$targetversion;
+
                 dolibarr_install_syslog('step5: set MAIN_VERSION_LAST_INSTALL const to ' . $targetversion, LOG_DEBUG);
                 $resql=$db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_VERSION_LAST_INSTALL'");
                 if (! $resql) dol_print_error($db,'Error in setup program');
-                $resql=$db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) values(".$db->encrypt('MAIN_VERSION_LAST_INSTALL',1).",".$db->encrypt($targetversion,1).",'chaine',0,'Dolibarr version when install',0)");
+                $resql=$db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) values(".$db->encrypt('MAIN_VERSION_LAST_INSTALL',1).",".$db->encrypt($targetversion,1).",'chaine',0,'Dolibarr version when last install',0)");
                 if (! $resql) dol_print_error($db,'Error in setup program');
                 $conf->global->MAIN_VERSION_LAST_INSTALL=$targetversion;
 

From acfaec684d71bcd85635ce8efecc43d8afd9b5b1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 22:31:22 +0200
Subject: [PATCH 158/438] FIX CVE-2017-7888

---
 htdocs/core/login/functions_dolibarr.php |  3 ++-
 htdocs/install/step5.php                 | 13 +++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/login/functions_dolibarr.php b/htdocs/core/login/functions_dolibarr.php
index 190d779d90b..d8cf78747b8 100644
--- a/htdocs/core/login/functions_dolibarr.php
+++ b/htdocs/core/login/functions_dolibarr.php
@@ -60,7 +60,7 @@ function check_user_password_dolibarr($usertotest,$passwordtotest,$entitytotest=
 		$sql.=') AND '.$entitycol." IN (0," . ($entity ? $entity : 1) . ")";
 		$sql.=' AND statut = 1';
 		// Required to first found the user into entity, then the superadmin.
-		// For the case (TODO and that we must avoid) a user has renamed its login with same value than a user in entity 0. 
+		// For the case (TODO and that we must avoid) a user has renamed its login with same value than a user in entity 0.
 		$sql.=' ORDER BY entity DESC';
 
 		$resql=$db->query($sql);
@@ -78,6 +78,7 @@ function check_user_password_dolibarr($usertotest,$passwordtotest,$entitytotest=
 				// Check crypted password
 				$cryptType='';
 				if (! empty($conf->global->DATABASE_PWD_ENCRYPTED)) $cryptType=$conf->global->DATABASE_PWD_ENCRYPTED;
+
 				// By default, we used MD5
 				if (! in_array($cryptType,array('md5'))) $cryptType='md5';
 				// Check crypted password according to crypt algorithm
diff --git a/htdocs/install/step5.php b/htdocs/install/step5.php
index b4bf7987547..78d29584a30 100644
--- a/htdocs/install/step5.php
+++ b/htdocs/install/step5.php
@@ -162,18 +162,23 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
         {
             $conf->setValues($db);
 
-            // Create user
+            // Create admin user
             include_once DOL_DOCUMENT_ROOT .'/user/class/user.class.php';
 
-            // Set default encryption to yes if there is no user yet into database
+            // Set default encryption to yes, generate a salt and set default encryption algorythm (but only if there is no user yet into database)
 		    $sql = "SELECT u.rowid, u.pass, u.pass_crypted";
 		    $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
-		    //$sql.= " WHERE u.pass IS NOT NULL AND LENGTH(u.pass) < 32"; // Not a MD5 value
 		    $resql=$db->query($sql);
 		    if ($resql)
 		    {
 		        $numrows=$db->num_rows($resql);
-    			if ($numrows == 0) dolibarr_set_const($db, "DATABASE_PWD_ENCRYPTED", "1",'chaine',0,'',$conf->entity);
+    			if ($numrows == 0)
+    			{
+    			    // Define default setup for password encryption
+    			    dolibarr_set_const($db, "DATABASE_PWD_ENCRYPTED", "1", 'chaine', 0, '', $conf->entity);
+    			    dolibarr_set_const($db, "MAIN_SECURITY_SALT", dol_print_date(dol_now(), 'dayhourlog'), 'chaine', 0, '', 0);      // All entities
+    			    dolibarr_set_const($db, "MAIN_SECURITY_HASH_ALGO", 'sha1md5', 'chaine', 0, '', 0);                               // All entities
+    			}
 		    }
 
 		    // Create user used to create the admin user

From 4683ef41be54012bfd3d06ea2fc59b3be97d89a9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 22:49:16 +0200
Subject: [PATCH 159/438] Fix hide search label on computed field into lists

---
 htdocs/core/class/extrafields.class.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 754a8300366..4b5f151ec72 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -759,7 +759,11 @@ class ExtraFields
 		$list=$this->attribute_list[$key];
 		$hidden=$this->attribute_hidden[$key];
 
-		if ($computed) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
+		if ($computed)
+		{
+		    if ($keysuffix != 'search_') return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
+		    else return '';
+		}
 
 		if (empty($showsize))
 		{

From a74d008ff25d497f7a68a8c8356e5ccfb94bcbf4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 22:57:25 +0200
Subject: [PATCH 160/438] Fix missing translation

---
 htdocs/holiday/class/holiday.class.php | 34 ++++++++++++++------------
 htdocs/holiday/view_log.php            | 30 +++++++++++------------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index e6a3d3d2f0e..15a565b04f9 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -37,7 +37,7 @@ class Holiday extends CommonObject
 	protected $isnolinkedbythird = 1;     // No field fk_soc
 	protected $ismultientitymanaged = 0;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
     public $picto = 'holiday';
-    
+
 	/**
 	 * @deprecated
 	 * @see id
@@ -128,7 +128,7 @@ class Holiday extends CommonObject
         if (empty($this->fk_user) || ! is_numeric($this->fk_user) || $this->fk_user < 0) { $this->error="ErrorBadParameter"; return -1; }
         if (empty($this->fk_validator) || ! is_numeric($this->fk_validator) || $this->fk_validator < 0)  { $this->error="ErrorBadParameter"; return -1; }
         if (empty($this->fk_type) || ! is_numeric($this->fk_type) || $this->fk_type < 0) { $this->error="ErrorBadParameter"; return -1; }
-        
+
         // Insert request
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday(";
         $sql.= "fk_user,";
@@ -290,7 +290,7 @@ class Holiday extends CommonObject
 
         $sql = "SELECT";
         $sql.= " cp.rowid,";
-        
+
         $sql.= " cp.fk_user,";
         $sql.= " cp.date_create,";
         $sql.= " cp.description,";
@@ -312,13 +312,13 @@ class Holiday extends CommonObject
 		$sql.= " uu.login as user_login,";
 		$sql.= " uu.statut as user_statut,";
 		$sql.= " uu.photo as user_photo,";
-		
+
         $sql.= " ua.lastname as validator_lastname,";
         $sql.= " ua.firstname as validator_firstname,";
         $sql.= " ua.login as validator_login,";
         $sql.= " ua.statut as validator_statut,";
         $sql.= " ua.photo as validator_photo";
-        
+
         $sql.= " FROM ".MAIN_DB_PREFIX."holiday as cp, ".MAIN_DB_PREFIX."user as uu, ".MAIN_DB_PREFIX."user as ua";
         $sql.= " WHERE cp.entity IN (".getEntity('holiday').")";
 		$sql.= " AND cp.fk_user = uu.rowid AND cp.fk_validator = ua.rowid "; // Hack pour la recherche sur le tableau
@@ -379,13 +379,13 @@ class Holiday extends CommonObject
                 $tab_result[$i]['user_login'] = $obj->user_login;
                 $tab_result[$i]['user_statut'] = $obj->user_statut;
                 $tab_result[$i]['user_photo'] = $obj->user_photo;
-                
+
                 $tab_result[$i]['validator_firstname'] = $obj->validator_firstname;
                 $tab_result[$i]['validator_lastname'] = $obj->validator_lastname;
                 $tab_result[$i]['validator_login'] = $obj->validator_login;
                 $tab_result[$i]['validator_statut'] = $obj->validator_statut;
                 $tab_result[$i]['validator_photo'] = $obj->validator_photo;
-                
+
                 $i++;
             }
 
@@ -437,13 +437,13 @@ class Holiday extends CommonObject
         $sql.= " uu.login as user_login,";
         $sql.= " uu.statut as user_statut,";
         $sql.= " uu.photo as user_photo,";
-        
+
         $sql.= " ua.lastname as validator_lastname,";
         $sql.= " ua.firstname as validator_firstname,";
         $sql.= " ua.login as validator_login,";
         $sql.= " ua.statut as validator_statut,";
         $sql.= " ua.photo as validator_photo";
-        
+
         $sql.= " FROM ".MAIN_DB_PREFIX."holiday as cp, ".MAIN_DB_PREFIX."user as uu, ".MAIN_DB_PREFIX."user as ua";
         $sql.= " WHERE cp.entity IN (".getEntity('holiday').")";
         $sql.= " AND cp.fk_user = uu.rowid AND cp.fk_validator = ua.rowid "; // Hack pour la recherche sur le tableau
@@ -504,13 +504,13 @@ class Holiday extends CommonObject
                 $tab_result[$i]['user_login'] = $obj->user_login;
                 $tab_result[$i]['user_statut'] = $obj->user_statut;
                 $tab_result[$i]['user_photo'] = $obj->user_photo;
-                
+
                 $tab_result[$i]['validator_firstname'] = $obj->validator_firstname;
                 $tab_result[$i]['validator_lastname'] = $obj->validator_lastname;
                 $tab_result[$i]['validator_login'] = $obj->validator_login;
                 $tab_result[$i]['validator_statut'] = $obj->validator_statut;
                 $tab_result[$i]['validator_photo'] = $obj->validator_photo;
-                
+
                 $i++;
             }
             // Retourne 1 et ajoute le tableau à la variable
@@ -817,7 +817,7 @@ class Holiday extends CommonObject
 		    if ($statut == 4) return $langs->trans('CancelCP').' '.img_picto($langs->trans('CancelCP'),'statut5');
 		    if ($statut == 5) return $langs->trans('RefuseCP').' '.img_picto($langs->trans('RefuseCP'),'statut5');
 		}
-		
+
 		return $statut;
     }
 
@@ -905,11 +905,11 @@ class Holiday extends CommonObject
                     $sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday_config(name, value)";
                     $sql.= " VALUES('".$this->db->escape($name)."', '".$this->db->escape($createifnotfound)."')";
                     $result = $this->db->query($sql);
-                    if ($result) 
+                    if ($result)
                     {
                         return $createifnotfound;
                     }
-                    else 
+                    else
                     {
                         $this->error=$this->db->lasterror();
                         return -2;
@@ -920,7 +920,7 @@ class Holiday extends CommonObject
                     return '';
                 }
             }
-            else 
+            else
             {
                 return $obj->value;
             }
@@ -948,12 +948,14 @@ class Holiday extends CommonObject
 
         if (empty($userID) && empty($nbHoliday) && empty($fk_type))
         {
+            $langs->load("holiday");
+
             // Si mise à jour pour tout le monde en début de mois
 			$now=dol_now();
 
             $month = date('m',$now);
             $newdateforlastupdate = dol_print_date($now, '%Y%m%d%H%M%S');
-            
+
             // Get month of last update
             $lastUpdate = $this->getConfCP('lastUpdate', $newdateforlastupdate);
             $monthLastUpdate = $lastUpdate[4].$lastUpdate[5];
diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php
index 7fcf6a48a97..17b374e5f4a 100644
--- a/htdocs/holiday/view_log.php
+++ b/htdocs/holiday/view_log.php
@@ -57,7 +57,8 @@ llxHeader('', $langs->trans('CPTitreMenu').' ('.$langs->trans("Year").' '.$year.
 // Recent changes are more important than old changes
 $log_holiday = $cp->fetchLog('ORDER BY cpl.rowid DESC', " AND date_action BETWEEN '".$db->idate(dol_get_first_day($year,1,1))."' AND '".$db->idate(dol_get_last_day($year,12,1))."'");	// Load $cp->logs
 
-print load_fiche_titre($langs->trans('LogCP'), '<div class="pagination"><ul><li class="pagination"><a href="'.$_SERVER["PHP_SELF"].'?year='.($year-1).'">&lt;</a><li class="pagination"><a href="">'.$langs->trans("Year").' '.$year.'</a></li><li class="pagination"><a href="'.$_SERVER["PHP_SELF"].'?year='.($year+1).'">&gt;</a></li></lu></div>', 'title_hrm.png');
+$pagination='<div class="pagination"><ul><li class="pagination"><a href="'.$_SERVER["PHP_SELF"].'?year='.($year-1).'"><i class="fa fa-chevron-left" title="Previous"></i></a><li class="pagination"><span class="active">'.$langs->trans("Year").' '.$year.'</span></li><li class="pagination"><a href="'.$_SERVER["PHP_SELF"].'?year='.($year+1).'"><i class="fa fa-chevron-right" title="Next"></i></a></li></lu></div>';
+print load_fiche_titre($langs->trans('LogCP'), $pagination, 'title_hrm.png');
 
 print '<div class="info">'.$langs->trans('LastUpdateCP').': '."\n";
 $lastUpdate = $cp->getConfCP('lastUpdate');
@@ -77,6 +78,18 @@ print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'" id="tablelines3">'."\n";
 
 print '<tbody>';
+
+print '<tr class="liste_titre">';
+print '<td class="liste_titre"></td>';
+print '<td class="liste_titre"></td>';
+print '<td class="liste_titre"></td>';
+print '<td class="liste_titre"></td>';
+print '<td class="liste_titre"></td>';
+print '<td class="liste_titre"></td>';
+print '<td class="liste_titre"></td>';
+print '<td class="liste_titre"></td>';
+print '</tr>';
+
 print '<tr class="liste_titre">';
 print_liste_field_titre($langs->trans('ID'));
 print_liste_field_titre($langs->trans('Date'), $_SERVER["PHP_SELF"], '', '', '', 'align="center"');
@@ -88,24 +101,9 @@ print_liste_field_titre($langs->trans('PrevSoldeCP'), $_SERVER["PHP_SELF"], '',
 print_liste_field_titre($langs->trans('NewSoldeCP'), $_SERVER["PHP_SELF"], '', '', '', 'align="right"');
 print '</tr>';
 
-print '<tr class="liste_titre">';
-print '<td class="liste_titre"></td>';
-print '<td class="liste_titre"></td>';
-print '<td class="liste_titre"></td>';
-print '<td class="liste_titre"></td>';
-print '<td class="liste_titre"></td>';
-print '<td class="liste_titre"></td>';
-print '<td class="liste_titre"></td>';
-print '<td class="liste_titre"></td>';
-print '</tr>';
-
-
-$var=true;
 
 foreach($cp->logs as $logs_CP)
 {
-   	
-
    	$user_action = new User($db);
    	$user_action->fetch($logs_CP['fk_user_action']);
 

From 542a72c684c989137788efba087edc8698e61bbb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 23:50:02 +0200
Subject: [PATCH 161/438] NEW custom dir is enabled dy default on first
 install. Fix modulebuilder when custom dir not defined.

---
 htdocs/admin/modules.php       |  70 +++++++-------
 htdocs/install/step1.php       |  10 +-
 htdocs/langs/en_US/admin.lang  |   2 +-
 htdocs/modulebuilder/README.md |  16 +---
 htdocs/modulebuilder/index.php | 168 ++++++++++++++++++++-------------
 5 files changed, 150 insertions(+), 116 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index fe735cb2499..57ed97c9b20 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -278,7 +278,7 @@ foreach ($modulesdir as $dir)
 
 		            try
 		            {
-		                $res=include_once $dir.$file;     // A class already exists in a different file will send a non catchable fatal error. 
+		                $res=include_once $dir.$file;     // A class already exists in a different file will send a non catchable fatal error.
 		                if (class_exists($modName))
 						{
 							try {
@@ -352,7 +352,7 @@ foreach ($modulesdir as $dir)
 		    			            {
 		    			                $arrayofwarningsext[$modName]=$objMod->warnings_activation_ext;
 		    			            }
-		    			             
+
 		    			            $orders[$i]  = $familyinfo[$familykey]['position']."_".$familykey."_".$moduleposition."_".$j;   // Sort by family, then by module position then number
 		    						$dirmod[$i]  = $dir;
 		    						//print $i.'-'.$dirmod[$i].'<br>';
@@ -436,7 +436,7 @@ if ($mode == 'common')
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
     print '<input type="hidden" name="page" value="'.$page.'">';
-    
+
     dol_fiche_head($head, $mode, '', -1);
 
     $moreforfilter = '';
@@ -473,12 +473,12 @@ if ($mode == 'common')
         $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
         print $hookmanager->resPrint;
     }
-    
-    
+
+
     print '<div class="clearboth"></div><br>';
 
     $moreforfilter='';
-    
+
     // Show list of modules
 
     $oldfamily='';
@@ -564,13 +564,13 @@ if ($mode == 'common')
         if ($familykey!=$oldfamily)
         {
         	if ($oldfamily) print '</table></div><br>';
-        	
+
             $familytext=empty($familyinfo[$familykey]['label'])?$familykey:$familyinfo[$familykey]['label'];
             print_fiche_titre($familytext, '', '');
-    		
+
             print '<div class="div-table-responsive">';
         	print '<table class="tagtable liste" summary="list_of_modules">'."\n";
-            
+
         	$atleastoneforfamily=0;
         }
 
@@ -582,9 +582,9 @@ if ($mode == 'common')
         	$oldfamily=$familykey;
         }
 
-        
 
-        
+
+
         // Version (with picto warning or not)
         $version=$objMod->getVersion(0);
         $versiontrans='';
@@ -592,14 +592,14 @@ if ($mode == 'common')
         if (preg_match('/experimental/i', $version)) $versiontrans.=img_warning($langs->trans("Experimental"), 'style="float: left"');
         if (preg_match('/deprecated/i', $version))   $versiontrans.=img_warning($langs->trans("Deprecated"), 'style="float: left"');
         $versiontrans.=$objMod->getVersion(1);
-        
+
         // Define imginfo
         $imginfo="info";
         if ($objMod->isCoreOrExternalModule() == 'external')
         {
             $imginfo="info_black";
         }
-        
+
         print '<tr>'."\n";
 
         // Picto + Name of module
@@ -756,32 +756,32 @@ if ($mode == 'common')
 	        	print "</a>\n";
         	}
         	print "</td>\n";
-        	
+
         	// Link config
         	print '<td class="tdsetuppicto right valignmiddle" width="60px">'.img_picto($langs->trans("NothingToSetup"),"setup",'class="opacitytransp" style="padding-right: 6px"').'</td>';
         }
 
         print "</tr>\n";
     }
-    
+
     if ($oldfamily)
     {
         print "</table>\n";
         print '</div>';
     }
-    
+
     dol_fiche_end();
-    
+
     // Show warning about external users
     print info_admin(showModulesExludedForExternal($modules))."\n";
-    
+
     print '</form>';
 }
 
 if ($mode == 'marketplace')
 {
     dol_fiche_head($head, $mode, '', -1);
-    
+
     // Marketplace
     print "<table summary=\"list_of_modules\" class=\"noborder\" width=\"100%\">\n";
     print "<tr class=\"liste_titre\">\n";
@@ -790,7 +790,7 @@ if ($mode == 'marketplace')
     print '<td>'.$langs->trans("URL").'</td>';
     print '</tr>';
 
-    
+
     print "<tr class=\"oddeven\">\n";
     $url='https://www.dolistore.com';
     print '<td align="left"><a href="'.$url.'" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_URL_ROOT.'/theme/dolistore_logo.png"></a></td>';
@@ -798,7 +798,7 @@ if ($mode == 'marketplace')
     print '<td><a href="'.$url.'" target="_blank" rel="external">'.$url.'</a></td>';
     print '</tr>';
 
-    
+
     print "<tr class=\"oddeven\">\n";
     $url='https://partners.dolibarr.org';
     print '<td align="left"><a href="'.$url.'" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_URL_ROOT.'/theme/dolibarr_preferred_partner_int.png"></a></td>';
@@ -813,23 +813,23 @@ if ($mode == 'marketplace')
 
 
 // Install external module
-   
+
 if ($mode == 'deploy')
 {
     dol_fiche_head($head, $mode, '', -1);
 
-    
+
     $allowonlineinstall=true;
     $allowfromweb=1;
     if (dol_is_file($dolibarrdataroot.'/installmodules.lock')) $allowonlineinstall=false;
-    
+
     $fullurl='<a href="'.$urldolibarrmodules.'" target="_blank">'.$urldolibarrmodules.'</a>';
     $message='';
     if (! empty($allowonlineinstall))
     {
         if (! in_array('/custom',explode(',',$dolibarr_main_url_root_alt)))
         {
-            $message=info_admin($langs->trans("ConfFileMuseContainCustom", DOL_DOCUMENT_ROOT.'/custom', DOL_DOCUMENT_ROOT));
+            $message=info_admin($langs->trans("ConfFileMustContainCustom", DOL_DOCUMENT_ROOT.'/custom', DOL_DOCUMENT_ROOT));
             $allowfromweb=-1;
         }
         else
@@ -845,7 +845,7 @@ if ($mode == 'deploy')
             }
             else
             {
-    
+
                 $message=info_admin($langs->trans("NotExistsDirect",$dirins).$langs->trans("InfDirAlt").$langs->trans("InfDirExample"));
                 $allowfromweb=0;
             }
@@ -856,7 +856,7 @@ if ($mode == 'deploy')
         $message=info_admin($langs->trans("InstallModuleFromWebHasBeenDisabledByFile",$dolibarrdataroot.'/installmodules.lock'));
         $allowfromweb=0;
     }
-    
+
     if ($allowfromweb < 1)
     {
     	print $langs->trans("SomethingMakeInstallFromWebNotPossible");
@@ -864,15 +864,15 @@ if ($mode == 'deploy')
     	//print $langs->trans("SomethingMakeInstallFromWebNotPossible2");
     	print '<br>';
     }
-    
-    
+
+
     if ($allowfromweb >= 0)
     {
-    	if ($allowfromweb == 1) 
+    	if ($allowfromweb == 1)
     	{
     	    //print $langs->trans("ThisIsProcessToFollow").'<br>';
     	}
-    	else 
+    	else
     	{
     	    print $langs->trans("ThisIsAlternativeProcessToFollow").'<br>';
         	print '<b>'.$langs->trans("StepNb",1).'</b>: ';
@@ -881,7 +881,7 @@ if ($mode == 'deploy')
         	print $langs->trans("DownloadPackageFromWebSite",$fullurl).'<br>';
         	print '<b>'.$langs->trans("StepNb",3).'</b>: ';
     	}
-    
+
     	if ($allowfromweb == 1)
     	{
     		print $langs->trans("UnpackPackageInModulesRoot",$dirins).'<br>';
@@ -899,12 +899,12 @@ if ($mode == 'deploy')
     		print $langs->trans("SetupIsReadyForUse").'<br>';
     	}
     }
-    
-    
+
+
     if (! empty($result['return']))
     {
     	print '<br>';
-    
+
     	foreach($result['return'] as $value)
     	{
     		echo $value.'<br>';
diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php
index a57ffd0c674..631ac79752f 100644
--- a/htdocs/install/step1.php
+++ b/htdocs/install/step1.php
@@ -57,14 +57,14 @@ $db_user=GETPOST('db_user','alpha');
 $db_pass=GETPOST('db_pass');
 $db_port=GETPOST('db_port','int');
 $db_prefix=GETPOST('db_prefix','alpha');
-$db_create_database = GETPOST('db_create_database');
-$db_create_user = GETPOST('db_create_user');
+$db_create_database = GETPOST('db_create_database','none');
+$db_create_user = GETPOST('db_create_user','none');
 // Force https
-$main_force_https = ((GETPOST("main_force_https") && (GETPOST("main_force_https") == "on" || GETPOST("main_force_https") == 1)) ? '1' : '0');
+$main_force_https = ((GETPOST("main_force_https",'alpha') && (GETPOST("main_force_https",'alpha') == "on" || GETPOST("main_force_https",'alpha') == 1)) ? '1' : '0');
 // Use alternative directory
-$main_use_alt_dir = ((GETPOST("main_use_alt_dir") && (GETPOST("main_use_alt_dir") == "on" || GETPOST("main_use_alt_dir") == 1)) ? '' : '//');
+$main_use_alt_dir = ((GETPOST("main_use_alt_dir",'alpha') == '' || (GETPOST("main_use_alt_dir",'alpha') == "on" || GETPOST("main_use_alt_dir",'alpha') == 1)) ? '' : '//');
 // Alternative root directory name
-$main_alt_dir_name = ((GETPOST("main_alt_dir_name") && GETPOST("main_alt_dir_name") != '') ? GETPOST("main_alt_dir_name") : 'custom');
+$main_alt_dir_name = ((GETPOST("main_alt_dir_name",'alpha') && GETPOST("main_alt_dir_name",'alpha') != '') ? GETPOST("main_alt_dir_name",'alpha') : 'custom');
 
 session_start();    // To be able to keep info into session (used for not losing password during navigation. The password must not transit through parameters)
 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 421b3fae132..695373e22b5 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1619,7 +1619,7 @@ 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. 
 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.
-ConfFileMuseContainCustom=Installing 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)
 TextTitleColor=Color of page title
diff --git a/htdocs/modulebuilder/README.md b/htdocs/modulebuilder/README.md
index 5e2af06a430..548e87b7912 100644
--- a/htdocs/modulebuilder/README.md
+++ b/htdocs/modulebuilder/README.md
@@ -9,26 +9,26 @@ If you're not a module developer you have no use for this.
 Documentation
 -------------
 
-[Module tutorial](http://wiki.dolibarr.org/index.php/Module_development)
+[Module tutorial](https://wiki.dolibarr.org/index.php/Module_development)
 
-[Dolibarr development](http://wiki.dolibarr.org/index.php/Developer_documentation)
+[Dolibarr development](https://wiki.dolibarr.org/index.php/Developer_documentation)
 
 ### Translations
 
-Dolibarr uses [Transifex](http://transifex.com) to manage it's translations.
+Dolibarr uses [Transifex](https://transifex.com) to manage it's translations.
 
 This template also contains a sample configuration for Transifex managed translations under the hidden [.tx](.tx) directory.
 
 For more informations, see the [translator's documentation](http://wiki.dolibarr.org/index.php/Translator_documentation).
 
-There is a [Transifex project](http://transifex.com/projects/p/dolibarr-module-template) for this module.
+There is a [Transifex project](https://transifex.com/projects/p/dolibarr-module-template) for this module.
 
 Install
 -------
 
 ### Manually
 
-- Make sure Dolibarr (>= 3.3.x) is already installed and configured on your workstation or development server.
+- Make sure Dolibarr is already installed and configured on your workstation or development server.
 
 - In your Dolibarr installation directory, edit the ```htdocs/conf/conf.php``` file
 
@@ -60,8 +60,6 @@ Install
 
     For more information about the ```conf.php``` file take a look at the conf.php.example file.
 
-*Note that for Dolibarr versions before 3.5, the ```$dolibarr_main_url_root_alt``` has to be an absolute path*
-
 - Clone the repository in ```$dolibarr_main_document_root_alt/mymodule```
 
 *(You may have to create the ```htdocs/custom``` directory first if it doesn't exist yet.)*
@@ -187,10 +185,6 @@ The de-facto standard for publishing and marketing modules for Dolibarr is the [
 Templates for required images and texts are [provided](dev/dolistore).  
 Check the dedicated [README](dev/dolistore/README.md) for more informations.
 
-Contributions
--------------
-
-Feel free to contribute and report defects on our [issue tracker](http://github.com/Dolibarr/dolibarr-module-template/issues).
 
 Licenses
 --------
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index b3b2c8dac77..17599e922aa 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -45,7 +45,7 @@ if (! $user->admin && empty($conf->global->MODULEBUILDER_FOREVERYONE)) accessfor
 
 // Dir for custom dirs
 $tmp=explode(',', $dolibarr_main_document_root_alt);
-$dircustom = $tmp[0];
+$dirins = $tmp[0];
 
 $FILEFLAG='modulebuilder.txt';
 
@@ -54,16 +54,16 @@ $FILEFLAG='modulebuilder.txt';
  * Actions
  */
 
-if ($dircustom && $action == 'initmodule' && $modulename)
+if ($dirins && $action == 'initmodule' && $modulename)
 {
     $srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
-    $destdir = $dircustom.'/'.strtolower($modulename);
+    $destdir = $dirins.'/'.strtolower($modulename);
 
     $arrayreplacement=array(
         'mymodule'=>strtolower($modulename),
      	'MyModule'=>$modulename
     );
-    
+
     $result = dolCopyDir($srcdir, $destdir, 0, 0, $arrayreplacement);
     //dol_mkdir($destfile);
     if ($result <= 0)
@@ -94,17 +94,17 @@ if ($dircustom && $action == 'initmodule' && $modulename)
 	        	'My module'=>$modulename,
 	        	'htdocs/modulebuilder/template/'=>'',
 	        );
-	        
-	        
+
+
 	        $result=dolReplaceInFile($phpfileval['fullname'], $arrayreplacement);
 	        //var_dump($result);
 	        if ($result < 0)
 	        {
 	        	setEventMessages($langs->trans("ErrorFailToMakeReplacementInto", $phpfileval['fullname']), null, 'errors');
 	        }
-	    }    
+	    }
     }
-        
+
     if (! $error)
     {
         setEventMessages('ModuleInitialized', null);
@@ -113,15 +113,15 @@ if ($dircustom && $action == 'initmodule' && $modulename)
     }
 }
 
-if ($dircustom && $action == 'generatepackage')
+if ($dirins && $action == 'generatepackage')
 {
     $modulelowercase=strtolower($module);
-	
+
     // Dir for module
-    $dir = $dircustom.'/'.$modulelowercase;
+    $dir = $dirins.'/'.$modulelowercase;
     // Zip file to build
     $FILENAMEZIP='';
-    
+
     // Load module
     dol_include_once($modulelowercase.'/core/modules/mod'.$module.'.class.php');
     $class='mod'.$module;
@@ -144,13 +144,13 @@ if ($dircustom && $action == 'generatepackage')
         dol_print_error($langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module));
         exit;
     }
-    
+
     $arrayversion=explode('.',$moduleobj->version,3);
     if (count($arrayversion))
     {
         $FILENAMEZIP="module_".$modulelowercase.'-'.$arrayversion[0].'.'.$arrayversion[1].($arrayversion[2]?".".$arrayversion[2]:"").".zip";
         $outputfile = $conf->admin->dir_temp.'/'.$FILENAMEZIP;
-    
+
         $result = dol_compress_dir($dir, $outputfile, 'zip');
         if ($result > 0)
         {
@@ -176,6 +176,14 @@ if ($dircustom && $action == 'generatepackage')
  * View
  */
 
+// Set dir where external modules are installed
+if (! dol_is_dir($dirins))
+{
+    dol_mkdir($dirins);
+}
+$dirins_ok=(dol_is_dir($dirins));
+
+
 llxHeader("",$langs->trans("ModuleBuilder"),"");
 
 
@@ -193,8 +201,8 @@ if (!empty($conf->modulebuilder->enabled) && $mainmenu == 'modulebuilder')	// En
     {
         foreach ($dolibarr_main_document_root_alt as $diralt)
         {*/
-            $dirsincustom=dol_dir_list($dircustom, 'directories');
-            
+            $dirsincustom=dol_dir_list($dirins, 'directories');
+
             if (is_array($dirsincustom) && count($dirsincustom) > 0)
             {
                 foreach ($dirsincustom as $dircustomcursor)
@@ -224,8 +232,40 @@ if (!empty($conf->modulebuilder->enabled) && $mainmenu == 'modulebuilder')	// En
 
 
 // Show description of content
+$newdircustom=$dirins;
+if (empty($newdircustom)) $newdircustom=img_warning();
 print $langs->trans("ModuleBuilderDesc").'<br>';
-print $langs->trans("ModuleBuilderDesc2", 'conf/conf.php', $dircustom).'<br>';
+print $langs->trans("ModuleBuilderDesc2", 'conf/conf.php', $newdircustom).'<br>';
+
+$message='';
+if (! $dirins)
+{
+    $message=info_admin($langs->trans("ConfFileMustContainCustom", DOL_DOCUMENT_ROOT.'/custom', DOL_DOCUMENT_ROOT));
+    $allowfromweb=-1;
+}
+else
+{
+    if ($dirins_ok)
+    {
+        if (! is_writable(dol_osencode($dirins)))
+        {
+            $langs->load("errors");
+            $message=info_admin($langs->trans("ErrorFailedToWriteInDir",$dirins));
+            $allowfromweb=0;
+        }
+    }
+    else
+    {
+
+        $message=info_admin($langs->trans("NotExistsDirect",$dirins).$langs->trans("InfDirAlt").$langs->trans("InfDirExample"));
+        $allowfromweb=0;
+    }
+}
+if ($message)
+{
+    print $message;
+}
+
 print $langs->trans("ModuleBuilderDesc3", count($listofmodules), $FILEFLAG).'<br>';
 //print '<br>';
 
@@ -237,7 +277,7 @@ $moduleobj = null;
 if (! empty($module) && $module != 'initmodule')
 {
 	$modulelowercase=strtolower($module);
-	
+
     // Load module
     dol_include_once($modulelowercase.'/core/modules/mod'.$module.'.class.php');
     $class='mod'.$module;
@@ -261,7 +301,7 @@ if (! empty($module) && $module != 'initmodule')
     }
 }
 
-print '<br>';            
+print '<br>';
 
 
 // Tabs for all modules
@@ -272,7 +312,7 @@ $head[$h][0] = $_SERVER["PHP_SELF"].'?module=initmodule';
 $head[$h][1] = $langs->trans("NewModule");
 $head[$h][2] = 'initmodule';
 $h++;
-    
+
 foreach($listofmodules as $tmpmodule => $tmpmodulewithcase)
 {
     $head[$h][0] = $_SERVER["PHP_SELF"].'?module='.$tmpmodulewithcase;
@@ -292,11 +332,11 @@ if ($module == 'initmodule')
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="action" value="initmodule">';
     print '<input type="hidden" name="module" value="initmodule">';
-    
+
     print $langs->trans("EnterNameOfModuleDesc").'<br><br>';
-    
+
     print '<input type="text" name="modulename" value="'.dol_escape_htmltag($modulename).'" placeholder="'.dol_escape_htmltag($langs->trans("ModuleKey")).'">';
-    print '<input type="submit" class="button" name="create" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
+    print '<input type="submit" class="button" name="create" value="'.dol_escape_htmltag($langs->trans("Create")).'"'.($dirins?'':' disabled="disabled"').'>';
     print '</form>';
 }
 elseif (! empty($module))
@@ -310,53 +350,53 @@ elseif (! empty($module))
        	$modulestatusinfo=img_info('').' '.$langs->trans("ModuleIsNotActive");
         if (! empty($conf->$module->enabled))
         {
-        	$modulestatusinfo=img_warning().' '.$langs->trans("ModuleIsLive");	
+        	$modulestatusinfo=img_warning().' '.$langs->trans("ModuleIsLive");
         }
-        
+
         foreach($listofmodules as $tmpmodule => $tmpmodulewithcase)
         {
             $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=description&module='.$tmpmodulewithcase;
             $head2[$h][1] = $langs->trans("Description");
             $head2[$h][2] = 'description';
             $h++;
-            
+
             $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=objects&module='.$tmpmodulewithcase;
             $head2[$h][1] = $langs->trans("Objects");
             $head2[$h][2] = 'objects';
-            $h++;        
-        
+            $h++;
+
             $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=menus&module='.$tmpmodulewithcase;
             $head2[$h][1] = $langs->trans("Menus");
             $head2[$h][2] = 'menus';
             $h++;
-            
+
             $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=permissions&module='.$tmpmodulewithcase;
             $head2[$h][1] = $langs->trans("Permissions");
             $head2[$h][2] = 'permissions';
-            $h++;        
-    
+            $h++;
+
             $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=triggers&module='.$tmpmodulewithcase;
             $head2[$h][1] = $langs->trans("Triggers");
             $head2[$h][2] = 'triggers';
-            $h++;        
+            $h++;
 
             $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=buildpackage&module='.$tmpmodulewithcase;
             $head2[$h][1] = $langs->trans("BuildPackage");
             $head2[$h][2] = 'buildpackage';
-            $h++;        
+            $h++;
         }
 
         print $modulestatusinfo.'<br><br>';
-       
+
         dol_fiche_head($head2, $tab, '', -1, '');
 
         print $langs->trans("ModuleBuilderDesc".$tab).'<br><br>';
-        
+
         if ($tab == 'description')
         {
         	print '<div class="underbanner clearboth"></div>';
         	print '<div class="fichecenter">';
-        	
+
         	print '<table class="border centpercent">';
         	print '<tr class="liste_titre"><td class="titlefield">';
         	print $langs->trans("Parameter");
@@ -369,90 +409,90 @@ elseif (! empty($module))
         	print '</td><td>';
         	print $moduleobj->numero;
         	print '</td></tr>';
-        	
+
         	print '<tr><td>';
         	print $langs->trans("Name");
         	print '</td><td>';
         	print $moduleobj->getName();
         	print '</td></tr>';
-        	
+
         	print '<tr><td>';
         	print $langs->trans("Version");
         	print '</td><td>';
         	print $moduleobj->getVersion();
         	print '</td></tr>';
-        	
+
         	print '<tr><td>';
         	print $langs->trans("Family");
         	print "<br>'crm','financial','hr','projects','products','ecm','technic','interface','other'";
         	print '</td><td>';
         	print $moduleobj->family;
         	print '</td></tr>';
-        	
+
         	print '<tr><td>';
         	print $langs->trans("EditorName");
         	print '</td><td>';
         	print $moduleobj->editor_name;
         	print '</td></tr>';
-        	
+
         	print '<tr><td>';
         	print $langs->trans("EditorUrl");
         	print '</td><td>';
         	print $moduleobj->editor_url;
         	print '</td></tr>';
-        	
+
         	print '<tr><td>';
         	print $langs->trans("Description");
         	print '</td><td>';
         	print $moduleobj->getDesc();
         	print '</td></tr>';
-        	
+
         	print '<tr><td>';
         	print $langs->trans("LongDescription");
         	print '</td><td>';
         	print $moduleobj->getDescLong();
         	print '</td></tr>';
-        	
+
         	print '</table>';
-    		
+
         	print '</div>';
-    		
+
         	print '<br><br>';
         	print '<form name="delete">';
         	print '<input type="hidden" name="action" value="confirm_delete">';
         	print '<input type="hidden" name="tab" value="'.dol_escape_htmltag($tab).'">';
         	print '<input type="hidden" name="module" value="'.dol_escape_htmltag($module).'">';
-        	print '<input type="submit" class="buttonDelete" value="'.$langs->trans("Delete").'">';		
+        	print '<input type="submit" class="buttonDelete" value="'.$langs->trans("Delete").'"'.($dirins?'':' disabled="disabled"').'>';
         	print '</form>';
         }
-        
+
         if ($tab == 'objects')
         {
     		print $langs->trans("FeatureNotYetAvailable");
-        	
-        
+
+
         }
-        
+
         if ($tab == 'menus')
         {
     		print $langs->trans("FeatureNotYetAvailable");
-        	
-        
+
+
         }
-        
+
         if ($tab == 'permissions')
         {
     		print $langs->trans("FeatureNotYetAvailable");
-        
+
         }
-        
+
         if ($tab == 'triggers')
         {
         	require_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
-        	
+
 			$interfaces = new Interfaces($db);
 			$triggers = $interfaces->getTriggersList(array('/'.strtolower($module).'/core/triggers'));
-			
+
 			print '<div class="div-table-responsive-no-min">';
 			print '<table class="noborder">
 			<tr class="liste_titre">
@@ -461,11 +501,11 @@ elseif (! empty($module))
 			<td align="center">&nbsp;</td>
 			</tr>
 			';
-			
+
 			$var=True;
 			foreach ($triggers as $trigger)
 			{
-				
+
 				print '<tr class="oddeven">';
 				print '<td valign="top" width="14" align="center">'.$trigger['picto'].'</td>';
 				print '<td class="tdtop">'.$trigger['file'].'</td>';
@@ -478,7 +518,7 @@ elseif (! empty($module))
 				print '</td>';
 				print '</tr>';
 			}
-			
+
 			print '</table>';
 			print '</div>';
         }
@@ -490,15 +530,15 @@ elseif (! empty($module))
                 print img_warning().' '.$langs->trans("ErrNoZipEngine");
                 print '<br>';
             }
-            
+
         	print '<form name="generatepackage">';
         	print '<input type="hidden" name="action" value="generatepackage">';
         	print '<input type="hidden" name="tab" value="'.dol_escape_htmltag($tab).'">';
         	print '<input type="hidden" name="module" value="'.dol_escape_htmltag($module).'">';
-        	print '<input type="submit" class="button" value="'.$langs->trans("Generate").'">';		
+        	print '<input type="submit" class="button" value="'.$langs->trans("Generate").'">';
         	print '</form>';
         }
-        
+
         dol_fiche_end();
     }
 }

From 3f9c7db4c1ac9413bfdb1701a8efc52ccb08dc6b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 23:56:43 +0200
Subject: [PATCH 162/438] Fix duplicate tabs

---
 htdocs/modulebuilder/index.php | 51 ++++++++++++++++------------------
 1 file changed, 24 insertions(+), 27 deletions(-)

diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 17599e922aa..5b3a33c9d41 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -353,38 +353,35 @@ elseif (! empty($module))
         	$modulestatusinfo=img_warning().' '.$langs->trans("ModuleIsLive");
         }
 
-        foreach($listofmodules as $tmpmodule => $tmpmodulewithcase)
-        {
-            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=description&module='.$tmpmodulewithcase;
-            $head2[$h][1] = $langs->trans("Description");
-            $head2[$h][2] = 'description';
-            $h++;
+        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=description&module='.$module;
+        $head2[$h][1] = $langs->trans("Description");
+        $head2[$h][2] = 'description';
+        $h++;
 
-            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=objects&module='.$tmpmodulewithcase;
-            $head2[$h][1] = $langs->trans("Objects");
-            $head2[$h][2] = 'objects';
-            $h++;
+        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=objects&module='.$module;
+        $head2[$h][1] = $langs->trans("Objects");
+        $head2[$h][2] = 'objects';
+        $h++;
 
-            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=menus&module='.$tmpmodulewithcase;
-            $head2[$h][1] = $langs->trans("Menus");
-            $head2[$h][2] = 'menus';
-            $h++;
+        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=menus&module='.$module;
+        $head2[$h][1] = $langs->trans("Menus");
+        $head2[$h][2] = 'menus';
+        $h++;
 
-            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=permissions&module='.$tmpmodulewithcase;
-            $head2[$h][1] = $langs->trans("Permissions");
-            $head2[$h][2] = 'permissions';
-            $h++;
+        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=permissions&module='.$module;
+        $head2[$h][1] = $langs->trans("Permissions");
+        $head2[$h][2] = 'permissions';
+        $h++;
 
-            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=triggers&module='.$tmpmodulewithcase;
-            $head2[$h][1] = $langs->trans("Triggers");
-            $head2[$h][2] = 'triggers';
-            $h++;
+        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=triggers&module='.$module;
+        $head2[$h][1] = $langs->trans("Triggers");
+        $head2[$h][2] = 'triggers';
+        $h++;
 
-            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=buildpackage&module='.$tmpmodulewithcase;
-            $head2[$h][1] = $langs->trans("BuildPackage");
-            $head2[$h][2] = 'buildpackage';
-            $h++;
-        }
+        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=buildpackage&module='.$module;
+        $head2[$h][1] = $langs->trans("BuildPackage");
+        $head2[$h][2] = 'buildpackage';
+        $h++;
 
         print $modulestatusinfo.'<br><br>';
 

From 11d2a5538bb233bf419bdf053559c27ecfafabc4 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Sun, 11 Jun 2017 00:03:01 +0200
Subject: [PATCH 163/438] fix entity default value and add link to download
 blockchain

---
 htdocs/blockedlog/admin/fingerprints.php      | 18 ++++++++++++-
 htdocs/blockedlog/class/authority.class.php   | 25 ++++++++++++++++++-
 htdocs/blockedlog/class/blockedlog.class.php  |  2 +-
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  2 +-
 .../install/mysql/tables/llx_blockedlog.sql   |  2 +-
 5 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/htdocs/blockedlog/admin/fingerprints.php b/htdocs/blockedlog/admin/fingerprints.php
index bdd569d31bc..29cd2a3f73b 100644
--- a/htdocs/blockedlog/admin/fingerprints.php
+++ b/htdocs/blockedlog/admin/fingerprints.php
@@ -24,6 +24,7 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/blockedlog/lib/blockedlog.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
+require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/authority.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
 $langs->load("admin");
@@ -34,6 +35,21 @@ if (! $user->admin) accessforbidden();
   
 $action = GETPOST('action','alpha');
 
+if($action === 'downloadblockchain') {
+	
+	$auth = new BlockedLogAuthority($db);
+	
+	$bc = $auth->getLocalBlockChain();
+	
+	header('Content-Type: application/octet-stream');
+	header("Content-Transfer-Encoding: Binary");
+	header("Content-disposition: attachment; filename=\"" .$auth->signature. ".certif\""); 
+	
+	echo $bc;
+	
+	exit;
+}
+
 
 /*
  *	View
@@ -58,7 +74,7 @@ print $langs->trans("FingerprintsDesc")."<br>\n";
 
 print '<br>';
 
-echo '<div align="right"><a href="?all=1">'.$langs->trans('ShowAllFingerPrintsMightBeTooLong').'</a></div>';
+echo '<div align="right"><a href="?all=1">'.$langs->trans('ShowAllFingerPrintsMightBeTooLong').'</a> <a href="?action=downloadblockchain">'.$langs->trans('DownloadBlockChain').'</a></div>';
 		
 
 print '<table class="noborder" width="100%">';
diff --git a/htdocs/blockedlog/class/authority.class.php b/htdocs/blockedlog/class/authority.class.php
index 8d241694b70..b422fb130d7 100644
--- a/htdocs/blockedlog/class/authority.class.php
+++ b/htdocs/blockedlog/class/authority.class.php
@@ -18,7 +18,7 @@
 /**
  *	Class to manage certif authority
  */
-class BlockedLogAuthority 
+class BlockedLogAuthority
 {
 	
 	/**
@@ -56,6 +56,29 @@ class BlockedLogAuthority
     	
 	}
 	
+	/**
+	 *	Get the blockchain 
+	 *
+	 *	@return     string         			blockchain
+	 */
+	public function getLocalBlockChain() {
+		
+		$block_static = new BlockedLog($this->db);
+		
+		$this->signature = $block_static->getSignature();
+		
+		$blocks = $block_static->getLog('all', 0, 0, 1) ;
+		
+		$this->blockchain = '';
+		
+		foreach($blocks as &$b) {
+			$this->blockchain.=$b->signature;
+			
+		}
+		
+		return $this->blockchain;
+	}
+	
 	/**
 	 *	Get hash of the block chain to check
 	 *
diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index 26283d6b08a..1f93eb3cc26 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -19,7 +19,7 @@
  *	Class to manage Blocked Log
  */
 
-class BlockedLog 
+class BlockedLog
 {
 	
 	/**
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index f4757e2475f..0f9ef8ee3ca 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -409,7 +409,7 @@ CREATE TABLE llx_blockedlog
 	date_object	datetime,
 	object_data	text,
 	fk_user	integer,
-	entity integer, 
+	entity integer DEFAULT 1, 
 	certified integer
 ) ENGINE=innodb;
 
diff --git a/htdocs/install/mysql/tables/llx_blockedlog.sql b/htdocs/install/mysql/tables/llx_blockedlog.sql
index 769eb34e092..afc0f0d4375 100644
--- a/htdocs/install/mysql/tables/llx_blockedlog.sql
+++ b/htdocs/install/mysql/tables/llx_blockedlog.sql
@@ -13,7 +13,7 @@ CREATE TABLE llx_blockedlog
 	date_object	datetime,
 	object_data	text,
 	fk_user	integer,
-	entity integer, 
+	entity integer DEFAULT 1, 
 	certified integer
 ) ENGINE=innodb;
 

From b19e0e3cae12cac65c5b9e06ee61e3c19796bcbd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jun 2017 00:31:58 +0200
Subject: [PATCH 164/438] Create card.php

---
 htdocs/fourn/facture/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 813f23cdc88..5471b3111f7 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -218,7 +218,7 @@ if (empty($reshook))
 	{
 	    $object->fetch($id);
 	    $object->fetch_thirdparty();
-	    $result=$object->delete($user, $id);
+	    $result=$object->delete($user);
 	    if ($result > 0)
 	    {
 	        header('Location: list.php');

From 074c43920ad168c66931fcd08cc9b4fee1540440 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jun 2017 00:35:03 +0200
Subject: [PATCH 165/438] Create projects.php

---
 htdocs/projet/ajax/projects.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/projet/ajax/projects.php b/htdocs/projet/ajax/projects.php
index ae4c412f6e3..991cae22aa3 100644
--- a/htdocs/projet/ajax/projects.php
+++ b/htdocs/projet/ajax/projects.php
@@ -61,7 +61,7 @@ $idprod = (! empty($match[0]) ? $match[0] : '');
 if (! GETPOST($htmlname) && ! GETPOST($idprod)) return;
 
 // When used from jQuery, the search term is added as GET param "term".
-$searchkey=(!empty($idprod) && GETPOST($idprod)?GETPOST($idprod):(GETPOST($htmlname)?GETPOST($htmlname):''));
+$searchkey=((!empty($idprod) && GETPOST($idprod))?GETPOST($idprod):(GETPOST($htmlname)?GETPOST($htmlname):''));
 
 $form = new FormProjets($db);
 $arrayresult=$form->select_projects_list($socid, '', $htmlname, 0, 0, 1, $discard_closed, 0, 0, 1, $searchkey);

From e93cefbbf01aa5ad992605123cd05ece1b17bd02 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jun 2017 10:37:58 +0200
Subject: [PATCH 166/438] FIX #6985

---
 htdocs/adherents/card.php                     |   2 +
 htdocs/adherents/type.php                     |   2 +
 htdocs/categories/card.php                    |   3 +-
 htdocs/categories/edit.php                    |   1 +
 htdocs/comm/action/card.php                   |   6 +-
 htdocs/comm/mailing/advtargetemailing.php     |   3 +-
 htdocs/comm/mailing/card.php                  |   2 +
 htdocs/comm/propal/card.php                   |   1 +
 htdocs/commande/card.php                      |   1 +
 htdocs/commande/orderstoinvoice.php           |   1 +
 htdocs/compta/bank/card.php                   |   2 +
 htdocs/compta/bank/various_payment/card.php   |   1 +
 htdocs/compta/deplacement/card.php            |   2 +
 htdocs/compta/facture/card.php                |   1 +
 htdocs/compta/localtax/card.php               |   2 +
 htdocs/compta/salaries/card.php               |   2 +
 htdocs/compta/tva/card.php                    |   2 +
 htdocs/contact/card.php                       |   2 +
 htdocs/contrat/card.php                       |   1 +
 htdocs/core/tpl/extrafields_view.tpl.php      |   1 +
 htdocs/don/card.php                           |   2 +
 htdocs/expedition/card.php                    |   1 +
 htdocs/expensereport/card.php                 | 198 +++++++++---------
 htdocs/fichinter/card.php                     |  45 ++--
 htdocs/fourn/commande/card.php                |   1 +
 htdocs/fourn/commande/orderstoinvoice.php     |   1 +
 htdocs/fourn/facture/card.php                 |   1 +
 htdocs/product/card.php                       |   2 +
 htdocs/product/document.php                   |   1 +
 htdocs/product/fournisseurs.php               |  43 ++--
 htdocs/product/stats/commande.php             |  15 +-
 htdocs/product/stats/commande_fournisseur.php |  18 +-
 htdocs/product/stats/contrat.php              |  21 +-
 htdocs/product/stats/facture.php              |  23 +-
 htdocs/product/stats/facture_fournisseur.php  |  13 +-
 htdocs/product/stats/propal.php               |  19 +-
 htdocs/product/stock/product.php              |  17 +-
 htdocs/projet/card.php                        |   2 +
 htdocs/projet/tasks.php                       |  53 ++---
 htdocs/projet/tasks/task.php                  |   1 +
 htdocs/resource/add.php                       |   1 +
 htdocs/resource/card.php                      |   1 +
 htdocs/societe/commerciaux.php                |   3 +-
 htdocs/supplier_proposal/card.php             |   1 +
 htdocs/user/card.php                          |   1 +
 htdocs/user/group/card.php                    |   2 +
 46 files changed, 293 insertions(+), 231 deletions(-)

diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 147040fbf67..78969a8df14 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -943,6 +943,7 @@ else
 		// Other attributes
 		$parameters=array();
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
 		if (empty($reshook) && ! empty($extrafields->attribute_label))
 		{
 			print $object->showOptionals($extrafields,'edit');
@@ -1185,6 +1186,7 @@ else
 		// Other attributes
 		$parameters=array();
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
 		if (empty($reshook) && ! empty($extrafields->attribute_label))
 		{
 			print $object->showOptionals($extrafields,'edit',$parameters);
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 50c464596fd..f54c89ffeba 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -278,6 +278,7 @@ if ($action == 'create')
 	// Other attributes
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$act,$action);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
 	if (empty($reshook) && ! empty($extrafields->attribute_label))
 	{
 		print $object->showOptionals($extrafields,'edit');
@@ -668,6 +669,7 @@ if ($rowid > 0)
 		// Other attributes
 		$parameters=array();
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$act,$action);    // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
 		if (empty($reshook) && ! empty($extrafields->attribute_label))
 		{
 		    print $object->showOptionals($extrafields,'edit');
diff --git a/htdocs/categories/card.php b/htdocs/categories/card.php
index ed497cbbb7f..55bf400ea3a 100644
--- a/htdocs/categories/card.php
+++ b/htdocs/categories/card.php
@@ -268,7 +268,8 @@ if ($user->rights->categorie->creer)
 
 		$parameters=array();
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-		if (empty($reshook))
+        print $hookmanager->resPrint;
+		if (empty($reshook) && ! empty($extrafields->attribute_label))
 		{
 			print $object->showOptionals($extrafields,'edit');
 		}
diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index c2f93c17ccd..59bee88b75b 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -175,6 +175,7 @@ print '</td></tr>';
 
 $parameters=array();
 $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
 if (empty($reshook) && ! empty($extrafields->attribute_label))
 {
 	print $object->showOptionals($extrafields,'edit');
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 1bb35fe7fe8..60486ac6f01 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -833,7 +833,8 @@ if ($action == 'create')
     // Other attributes
     $parameters=array();
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-	if (empty($reshook) && ! empty($extrafields->attribute_label))
+    print $hookmanager->resPrint;
+    if (empty($reshook) && ! empty($extrafields->attribute_label))
 	{
 		print $object->showOptionals($extrafields,'edit');
 	}
@@ -1164,7 +1165,8 @@ if ($id > 0)
         // Other attributes
         $parameters=array();
         $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-		if (empty($reshook) && ! empty($extrafields->attribute_label))
+        print $hookmanager->resPrint;
+        if (empty($reshook) && ! empty($extrafields->attribute_label))
 		{
 			print $object->showOptionals($extrafields,'edit');
 		}
diff --git a/htdocs/comm/mailing/advtargetemailing.php b/htdocs/comm/mailing/advtargetemailing.php
index 832cefa5774..81c29f687ce 100644
--- a/htdocs/comm/mailing/advtargetemailing.php
+++ b/htdocs/comm/mailing/advtargetemailing.php
@@ -777,8 +777,9 @@ if ($object->fetch($id) >= 0) {
 			if (! empty($advTarget->id)) {
 				$parameters = array('array_query' => $advTarget->filtervalue);
 			}
-			// Module extrafield feature
+			// Other attributes
 			$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $std_soc, $action_search);
+            print $hookmanager->resPrint;
 		}
 
 		// State Contact
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 353117f5fa3..17d4d066569 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -718,6 +718,7 @@ if ($action == 'create')
 	// Other attributes
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
 	if (empty($reshook) && ! empty($extrafields->attribute_label))
 	{
 		print $object->showOptionals($extrafields,'edit');
@@ -1153,6 +1154,7 @@ else
 			// Other attributes
 			$parameters=array();
 			$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+            print $hookmanager->resPrint;
 			if (empty($reshook) && ! empty($extrafields->attribute_label))
 			{
 				print $object->showOptionals($extrafields,'edit');
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index d58f2223adb..3e8580d5350 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1527,6 +1527,7 @@ if ($action == 'create')
 	// Other attributes
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
 	if (empty($reshook) && ! empty($extrafields->attribute_label)) {
 		print $object->showOptionals($extrafields, 'edit');
 	}
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index eeea825c1e5..e2db47a6c9d 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1609,6 +1609,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 	// Other attributes
 	$parameters = array('objectsrc' => $objectsrc, 'socid'=>$socid);
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by
+    print $hookmanager->resPrint;
 	if (empty($reshook) && ! empty($extrafields->attribute_label)) {
 		print $object->showOptionals($extrafields, 'edit');
 	}
diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php
index e76adb2a67c..fa9f810b036 100644
--- a/htdocs/commande/orderstoinvoice.php
+++ b/htdocs/commande/orderstoinvoice.php
@@ -471,6 +471,7 @@ if ($action == 'create' && !$error)
 	// Other attributes
 	$parameters=array('objectsrc' => $objectsrc, 'idsrc' => $listoforders);
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
 	if (empty($reshook) && ! empty($extrafields->attribute_label))
 	{
 		$object=new Facture($db);
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 7267769379e..06918ff2846 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -409,6 +409,7 @@ if ($action == 'create')
  	// Other attributes
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
 	if (empty($reshook) && ! empty($extrafields->attribute_label))
 	{
 		print $object->showOptionals($extrafields,'edit',$parameters);
@@ -946,6 +947,7 @@ else
 		// Other attributes
 		$parameters=array();
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
 		if (empty($reshook) && ! empty($extrafields->attribute_label))
 		{
 			print $object->showOptionals($extrafields,'edit');
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index 9444c0585f7..e19deca91c9 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -284,6 +284,7 @@ if ($action == 'create')
 	// Other attributes
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
 
 	print '</table>';
 
diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php
index 555ea52b4e0..979ef5960e0 100644
--- a/htdocs/compta/deplacement/card.php
+++ b/htdocs/compta/deplacement/card.php
@@ -300,6 +300,7 @@ if ($action == 'create')
     // Other attributes
     $parameters=array();
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
 
     print '</table>';
 
@@ -396,6 +397,7 @@ else if ($id)
             // Other attributes
             $parameters=array();
             $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+            print $hookmanager->resPrint;
 
             print '</table>';
 
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index c79beaac4f3..fa9bdf60dc5 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2591,6 +2591,7 @@ if ($action == 'create')
 	// Other attributes
 	$parameters = array('objectsrc' => $objectsrc,'colspan' => ' colspan="2"', 'cols'=>2);
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
 	if (empty($reshook) && ! empty($extrafields->attribute_label)) {
 		print $object->showOptionals($extrafields, 'edit');
 	}
diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php
index bd1f83d7f43..317d3ae813d 100644
--- a/htdocs/compta/localtax/card.php
+++ b/htdocs/compta/localtax/card.php
@@ -202,6 +202,7 @@ if ($action == 'create')
     // Other attributes
     $parameters=array();
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
 
     print '</table>';
 
@@ -271,6 +272,7 @@ if ($id)
     // Other attributes
     $parameters=array();
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$vatpayment,$action);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
 
     print '</table>';
 
diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php
index 20079ad18ee..45bde4bcd32 100644
--- a/htdocs/compta/salaries/card.php
+++ b/htdocs/compta/salaries/card.php
@@ -302,6 +302,7 @@ if ($action == 'create')
 	// Other attributes
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
 
 	print '</table>';
 
@@ -389,6 +390,7 @@ if ($id)
 	// Other attributes
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
 
 	print '</table>';
 
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index ea26d2c55a8..6f7e250f4f5 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -284,6 +284,7 @@ if ($action == 'create')
     // Other attributes
     $parameters=array();
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
 
     print '</table>';
 
@@ -351,6 +352,7 @@ if ($id)
 	// Other attributes
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
 
 	print '</table>';
 
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index ae13bb44a3a..fbd27b0d841 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -666,6 +666,7 @@ else
             // Other attributes
             $parameters=array('colspan' => ' colspan="3"','cols'=>3);
             $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+            print $hookmanager->resPrint;
             if (empty($reshook) && ! empty($extrafields->attribute_label))
             {
             	print $object->showOptionals($extrafields,'edit');
@@ -934,6 +935,7 @@ else
             // Other attributes
             $parameters=array('colspan' => ' colspan="3"', 'cols'=>3);
             $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+            print $hookmanager->resPrint;
             if (empty($reshook) && ! empty($extrafields->attribute_label))
             {
             	print $object->showOptionals($extrafields,'edit');
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 4e19d6109b8..58b1608f44b 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1211,6 +1211,7 @@ if ($action == 'create')
     // Other attributes
     $parameters=array('objectsrc' => $objectsrc,'colspan' => ' colspan="3"', 'cols'=>3);
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
 
     // Other attributes
     if (empty($reshook) && ! empty($extrafields->attribute_label)) {
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index 9c9813e18ca..0f1d581c99f 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -34,6 +34,7 @@ if (! empty($cols)) $parameters['cols'] = $cols;
 if (! empty($object->fk_soc)) $parameters['socid'] = $object->fk_soc;
 
 $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action);
+print $hookmanager->resPrint;
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook) && ! empty($extrafields->attributes[$object->table_element]['label']))
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 33f2375a1bf..3f58982624d 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -373,6 +373,7 @@ if ($action == 'create')
     // Other attributes
     $parameters=array();
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
     if (empty($reshook) && ! empty($extrafields->attribute_label))
     {
 		print $object->showOptionals($extrafields,'edit',$parameters);
@@ -498,6 +499,7 @@ if (! empty($id) && $action == 'edit')
     // Other attributes
     $parameters=array();
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
     if (empty($reshook) && ! empty($extrafields->attribute_label))
     {
       	print $object->showOptionals($extrafields,'edit');
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index e3a1b0bc3fa..72044d68fcf 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -774,6 +774,7 @@ if ($action == 'create')
             // Other attributes
             $parameters = array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"', 'socid'=>$socid);
             $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$expe,$action);    // Note that $action and $object may have been modified by hook
+            print $hookmanager->resPrint;
 
             if (empty($reshook) && ! empty($extrafields->attribute_label)) {
             	print $expe->showOptionals($extrafields, 'edit');
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index d9c195f4ca9..c4aa6caccd8 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -125,7 +125,7 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    if ($cancel) 
+    if ($cancel)
     {
         $action='';
     	$fk_projet='';
@@ -158,7 +158,7 @@ if (empty($reshook))
             {
                 // Because createFromClone modifies the object, we must clone it so that we can restore it later if it fails
                 $orig = clone $object;
-    
+
                 $result=$object->createFromClone(GETPOST('fk_user_author','int'));
                 if ($result > 0)
                 {
@@ -174,7 +174,7 @@ if (empty($reshook))
             }
         }
     }
-    
+
     if ($action == 'confirm_delete' && GETPOST("confirm") == "yes" && $id > 0 && $user->rights->expensereport->supprimer)
     {
     	$object = new ExpenseReport($db);
@@ -190,20 +190,20 @@ if (empty($reshook))
     		setEventMessages($object->error, $object->errors, 'errors');
     	}
     }
-    
+
     if ($action == 'add' && $user->rights->expensereport->creer)
     {
     	$object = new ExpenseReport($db);
-    
+
     	$object->date_debut = $date_start;
     	$object->date_fin = $date_end;
-    
+
     	$object->fk_user_author             = GETPOST('fk_user_author','int');
     	if (! ($object->fk_user_author > 0)) $object->fk_user_author = $user->id;
-    	
+
     	$fuser=new User($db);
     	$fuser->fetch($object->fk_user_author);
-    	
+
     	$object->fk_statut = 1;
     	$object->fk_c_paiement				= GETPOST('fk_c_paiement','int');
     	$object->fk_user_validator			= GETPOST('fk_user_validator','int');
@@ -215,20 +215,20 @@ if (empty($reshook))
     	    $ret = $extrafields->setOptionalsFromPost($extralabels, $object);
     	    if ($ret < 0) $error++;
     	}
-    	 
+
     	if ($object->periode_existe($fuser,$object->date_debut,$object->date_fin))
     	{
     		$error++;
     		setEventMessages($langs->trans("ErrorDoubleDeclaration"), null, 'errors');
     		$action='create';
     	}
-    
+
     	if (! $error)
     	{
     		$db->begin();
-    
+
     		$id = $object->create($user);
-    
+
     		if ($id > 0)
     		{
     			$db->commit();
@@ -243,25 +243,25 @@ if (empty($reshook))
     		}
     	}
     }
-    
+
     if ($action == 'update' && $user->rights->expensereport->creer)
     {
     	$object = new ExpenseReport($db);
     	$object->fetch($id);
-    
+
     	$object->date_debut = $date_start;
     	$object->date_fin = $date_end;
-    
+
     	if($object->fk_statut < 3)
     	{
     		$object->fk_user_validator = GETPOST('fk_user_validator','int');
     	}
-    
+
     	$object->fk_c_paiement = GETPOST('fk_c_paiement','int');
     	$object->note_public = GETPOST('note_public');
     	$object->note_private = GETPOST('note_private');
     	$object->fk_user_modif = $user->id;
-    	
+
     	$result = $object->update($user);
     	if ($result > 0)
     	{
@@ -273,14 +273,14 @@ if (empty($reshook))
     		setEventMessages($object->error, $object->errors, 'errors');
     	}
     }
-    
+
     if ($action == 'update_extras')
     {
         // Fill array 'array_options' with data from update form
         $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
         $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
         if ($ret < 0) $error++;
-    
+
         if (! $error)
         {
             // Actions on extra fields (by external module or standard code)
@@ -296,17 +296,17 @@ if (empty($reshook))
             } else if ($reshook < 0)
                 $error++;
         }
-    
+
         if ($error)
             $action = 'edit_extras';
     }
-    
+
     if ($action == "confirm_validate" && GETPOST("confirm") == "yes" && $id > 0 && $user->rights->expensereport->creer)
     {
     	$object = new ExpenseReport($db);
     	$object->fetch($id);
     	$result = $object->setValidate($user);
-    
+
     	if ($result > 0)
     	{
     		// Define output language
@@ -322,51 +322,51 @@ if (empty($reshook))
     			}
     			$model=$object->modelpdf;
     			$ret = $object->fetch($id); // Reload to get new records
-    
+
     			$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     		}
     	}
-    
+
     	if ($result > 0 && $object->fk_user_validator > 0)
     	{
     		$langs->load("mails");
-    
+
     		// TO
     		$destinataire = new User($db);
     		$destinataire->fetch($object->fk_user_validator);
     		$emailTo = $destinataire->email;
-    
+
     		// FROM
     		$expediteur = new User($db);
     		$expediteur->fetch($object->fk_user_author);
     		$emailFrom = $expediteur->email;
-    
+
     		if ($emailTo && $emailFrom)
     		{
     			$filename=array(); $filedir=array(); $mimetype=array();
-    
+
     			// SUBJECT
     			$subject = $langs->transnoentities("ExpenseReportWaitingForApproval");
-    
+
     			// CONTENT
     			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
     			$message = $langs->transnoentities("ExpenseReportWaitingForApprovalMessage", $expediteur->getFullName($langs), get_date_range($object->date_debut,$object->date_fin,'',$langs), $link);
-    
+
     			// Rebuild pdf
     			/*
     			$object->setDocModel($user,"");
     			$resultPDF = expensereport_pdf_create($db,$id,'',"",$langs);
-    
+
     			if($resultPDF):
     			// ATTACHMENT
     			array_push($filename,dol_sanitizeFileName($object->ref).".pdf");
     			array_push($filedir,$conf->expensereport->dir_output . "/" . dol_sanitizeFileName($object->ref) . "/" . dol_sanitizeFileName($object->ref).".pdf");
     			array_push($mimetype,"application/pdf");
     			*/
-    
+
     			// PREPARE SEND
     			$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
-    
+
     			if ($mailfile)
     			{
     				// SEND
@@ -411,13 +411,13 @@ if (empty($reshook))
     		setEventMessages($object->error, $object->errors, 'errors');
     	}
     }
-    
+
     if ($action == "confirm_save_from_refuse" && GETPOST("confirm") == "yes" && $id > 0 && $user->rights->expensereport->creer)
     {
     	$object = new ExpenseReport($db);
     	$object->fetch($id);
     	$result = $object->set_save_from_refuse($user);
-    
+
     	if ($result > 0)
     	{
     		// Define output language
@@ -433,11 +433,11 @@ if (empty($reshook))
     			}
     			$model=$object->modelpdf;
     			$ret = $object->fetch($id); // Reload to get new records
-    
+
     			$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     		}
     	}
-    
+
     	if ($result > 0)
     	{
     		// Send mail
@@ -446,7 +446,7 @@ if (empty($reshook))
    			$destinataire = new User($db);
    			$destinataire->fetch($object->fk_user_validator);
    			$emailTo = $destinataire->email;
-    
+
 			// FROM
 			$expediteur = new User($db);
 			$expediteur->fetch($object->fk_user_author);
@@ -455,10 +455,10 @@ if (empty($reshook))
    			if ($emailFrom && $emailTo)
    			{
     			$filename=array(); $filedir=array(); $mimetype=array();
-   			    
+
    			    // SUBJECT
     			$subject = $langs->transnoentities("ExpenseReportWaitingForReApproval");
-    
+
     			// CONTENT
     			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
 				$dateRefusEx = explode(" ",$object->date_refuse);
@@ -481,7 +481,7 @@ if (empty($reshook))
 
     			// PREPARE SEND
     			$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
-    
+
     			if ($mailfile)
     			{
     				// SEND
@@ -526,15 +526,15 @@ if (empty($reshook))
     		setEventMessages($object->error, $object->errors, 'errors');
     	}
     }
-    
+
     // Approve
     if ($action == "confirm_approve" && GETPOST("confirm") == "yes" && $id > 0 && $user->rights->expensereport->approve)
     {
     	$object = new ExpenseReport($db);
     	$object->fetch($id);
-    
+
     	$result = $object->setApproved($user);
-    
+
     	if ($result > 0)
     	{
     		// Define output language
@@ -550,11 +550,11 @@ if (empty($reshook))
     			}
     			$model=$object->modelpdf;
     			$ret = $object->fetch($id); // Reload to get new records
-    
+
     			$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     		}
     	}
-    
+
     	if ($result > 0)
     	{
     		// Send mail
@@ -576,19 +576,19 @@ if (empty($reshook))
    			if ($emailFrom && $emailTo)
    			{
     			$filename=array(); $filedir=array(); $mimetype=array();
-   			    
+
    			    // SUBJECT
        			$subject = $langs->transnoentities("ExpenseReportApproved");
-    
+
        			// CONTENT
        			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
        			$message = $langs->transnoentities("ExpenseReportApprovedMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $link);
-    
+
        			// Rebuilt pdf
     			/*
         		$object->setDocModel($user,"");
         		$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
-        
+
         		if($resultPDF
     			{
         			// ATTACHMENT
@@ -600,7 +600,7 @@ if (empty($reshook))
     			*/
 
         		$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
-    
+
        			if ($mailfile)
        			{
        				// SEND
@@ -673,7 +673,7 @@ if (empty($reshook))
     			}
     			$model=$object->modelpdf;
     			$ret = $object->fetch($id); // Reload to get new records
-    
+
     			$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     		}
     	}
@@ -686,28 +686,28 @@ if (empty($reshook))
     		$destinataire = new User($db);
     		$destinataire->fetch($object->fk_user_author);
     		$emailTo = $destinataire->email;
-    
+
     		// FROM
     		$expediteur = new User($db);
     		$expediteur->fetch($object->fk_user_refuse);
     		$emailFrom = $expediteur->email;
-    
+
     		if ($emailFrom && $emailTo)
     		{
     			$filename=array(); $filedir=array(); $mimetype=array();
-    		    
+
     		    // SUBJECT
        			$subject = $langs->transnoentities("ExpenseReportRefused");
-    
+
        			// CONTENT
        			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
     			$message = $langs->transnoentities("ExpenseReportRefusedMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $_POST['detail_refuse'], $link);
-    
+
        			// Rebuilt pdf
     			/*
         		$object->setDocModel($user,"");
         		$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
-        
+
         		if($resultPDF
     			{
         			// ATTACHMENT
@@ -796,7 +796,7 @@ if (empty($reshook))
     				}
     				$model=$object->modelpdf;
     				$ret = $object->fetch($id); // Reload to get new records
-    
+
     				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     			}
     		}
@@ -814,23 +814,23 @@ if (empty($reshook))
     			$expediteur = new User($db);
     			$expediteur->fetch($object->fk_user_cancel);
     			$emailFrom = $expediteur->email;
-    
+
     			if ($emailFrom && $emailTo)
     			{
     			    $filename=array(); $filedir=array(); $mimetype=array();
-    			    
+
     			    // SUBJECT
     				$subject = $langs->transnoentities("ExpenseReportCanceled");
-    
+
     				// CONTENT
     				$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
     				$message = $langs->transnoentities("ExpenseReportCanceledMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $_POST['detail_cancel'], $link);
-    
+
     				// Rebuilt pdf
     				/*
     				$object->setDocModel($user,"");
     				$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
-    		
+
     				if($resultPDF
     				{
     					// ATTACHMENT
@@ -840,10 +840,10 @@ if (empty($reshook))
     					array_push($mimetype,"application/pdf");
     				}
     				*/
-    
+
         			// PREPARE SEND
         			$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
-        
+
         			if ($mailfile)
         			{
         				// SEND
@@ -881,7 +881,7 @@ if (empty($reshook))
     			{
     			    setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
     			    $action='';
-    			}        			
+    			}
     		}
     		else
     		{
@@ -918,7 +918,7 @@ if (empty($reshook))
     				}
     				$model=$object->modelpdf;
     				$ret = $object->fetch($id); // Reload to get new records
-    
+
     				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     			}
     		}
@@ -961,7 +961,7 @@ if (empty($reshook))
     			}
     			$model=$object->modelpdf;
     			$ret = $object->fetch($id); // Reload to get new records
-    
+
     			$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     		}
     	}
@@ -983,7 +983,7 @@ if (empty($reshook))
     		if ($emailFrom && $emailTo)
     		{
     			$filename=array(); $filedir=array(); $mimetype=array();
-    		    
+
     		    // SUBJECT
     			$subject = $langs->transnoentities("ExpenseReportPaid");
 
@@ -1154,7 +1154,7 @@ if (empty($reshook))
     {
     	$object = new ExpenseReport($db);
     	$object->fetch($id);
-    
+
     	$object_ligne = new ExpenseReportLine($db);
     	$object_ligne->fetch(GETPOST("rowid"));
     	$total_ht = $object_ligne->total_ht;
@@ -1178,11 +1178,11 @@ if (empty($reshook))
     				}
     				$model=$object->modelpdf;
     				$ret = $object->fetch($id); // Reload to get new records
-    
+
     				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     			}
     		}
-    
+
     		$object->update_totaux_del($object_ligne->total_ht,$object_ligne->total_tva);
     		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$_GET['id']);
     		exit;
@@ -1244,13 +1244,13 @@ if (empty($reshook))
     					}
     					$model=$object->modelpdf;
     					$ret = $object->fetch($id); // Reload to get new records
-    
+
     					$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     				}
     			}
-    
+
     			$result = $object->recalculer($id);
-    
+
     			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
     			exit;
     		}
@@ -1296,7 +1296,7 @@ if ($action == 'create')
 
 	print '<table class="border" width="100%">';
 	print '<tbody>';
-	
+
 	// Date start
 	print '<tr>';
 	print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("DateStart").'</td>';
@@ -1304,7 +1304,7 @@ if ($action == 'create')
 	$form->select_date($date_start?$date_start:-1,'date_debut',0,0,0,'',1,1);
 	print '</td>';
 	print '</tr>';
-	
+
 	// Date end
 	print '<tr>';
 	print '<td class="fieldrequired">'.$langs->trans("DateEnd").'</td>';
@@ -1312,7 +1312,7 @@ if ($action == 'create')
 	$form->select_date($date_end?$date_end:-1,'date_fin',0,0,0,'',1,1);
 	print '</td>';
 	print '</tr>';
-	
+
 	print '<tr>';
 	print '<td class="fieldrequired">'.$langs->trans("User").'</td>';
 	print '<td>';
@@ -1341,7 +1341,7 @@ if ($action == 'create')
 	}
 	print '</td>';
 	print '</tr>';
-	
+
 	// Payment mode
 	if (! empty($conf->global->EXPENSEREPORT_ASK_PAYMENTMODE_ON_CREATION))
 	{
@@ -1376,7 +1376,7 @@ if ($action == 'create')
 	// Other attributes
 	$parameters = array('colspan' => ' colspan="3"');
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by
-	// hook
+    print $hookmanager->resPrint;
 	if (empty($reshook) && ! empty($extrafields->attribute_label)) {
 	    print $object->showOptionals($extrafields, 'edit');
 	}
@@ -1400,7 +1400,7 @@ else
 		$result = $object->fetch($id, $ref);
 
 		$res = $object->fetch_optionals($object->id, $extralabels);
-		
+
 		if ($result > 0)
 		{
 			if (! in_array($object->fk_user_author, $user->getAllChildIds(1)))
@@ -1698,7 +1698,7 @@ else
 						$userfee=new User($db);
 						$result = $userfee->fetch($object->fk_user_validator);
 						if ($result > 0) print $userfee->getNomUrl(-1);
-						if (empty($userfee->email) || ! isValidEmail($userfee->email)) 
+						if (empty($userfee->email) || ! isValidEmail($userfee->email))
 						{
 						    $langs->load("errors");
 						    print img_warning($langs->trans("ErrorBadEMail", $userfee->email));
@@ -1902,9 +1902,9 @@ else
 				    {
 				        print '<tr><td colspan="' . $nbcols . '" align="right">'.$langs->trans("AlreadyPaid").':</td><td align="right">'.price($totalpaid).'</td></tr>';
 				        print '<tr><td colspan="' . $nbcols . '" align="right">'.$langs->trans("AmountExpected").':</td><td align="right">'.price($object->total_ttc).'</td></tr>';
-				
+
 				        $remaintopay = $object->total_ttc - $totalpaid;
-				
+
 				        print '<tr><td colspan="' . $nbcols . '" align="right">'.$langs->trans("RemainderToPay").':</td>';
 				        print '<td align="right"'.($remaintopay?' class="amountremaintopay"':'').'>'.price($remaintopay).'</td></tr>';
 				    }
@@ -1984,7 +1984,7 @@ else
 							if ($action != 'editline' || $objp->rowid != GETPOST('rowid'))
 							{
 								print '<tr class="oddeven">';
-								
+
 								print '<td style="text-align:center;">';
 								print img_picto($langs->trans("Document"), "object_generic");
 								print ' <span>'.$piece_comptable.'</span></td>';
@@ -2006,7 +2006,7 @@ else
 								print '<td style="text-align:right;">'.vatrate($objp->vatrate,true).'</td>';
 								print '<td style="text-align:right;">'.price($objp->value_unit).'</td>';
 								print '<td style="text-align:right;">'.$objp->qty.'</td>';
-								
+
 								if ($action != 'editline')
 								{
 									print '<td style="text-align:right;">'.price($objp->total_ht).'</td>';
@@ -2034,7 +2034,7 @@ else
 							if ($action == 'editline' && $objp->rowid == GETPOST('rowid'))
 							{
 									print '<tr class="oddeven">';
-									
+
 									print '<td></td>';
 
 									// Select date
@@ -2049,7 +2049,7 @@ else
     									$formproject->select_projects(-1, $objp->fk_projet,'fk_projet', 0, 0, 1, 1);
     									print '</td>';
 									}
-									
+
 									// Select type
 									print '<td class="center">';
 									select_type_fees_id($objp->type_fees_code,'fk_c_type_fees');
@@ -2168,13 +2168,13 @@ else
 						}
 
 						print '<td align="center"><input type="submit" value="'.$langs->trans("Add").'" name="bouton" class="button"></td>';
-						
+
 						print '</tr>';
 					} // Fin si c'est payé/validé
 
 					print '</table>';
 					print '</div>';
-					
+
 					print '</form>';
 				}
 				else
@@ -2290,7 +2290,7 @@ if ($action != 'create' && $action != 'edit')
 
 	// If status is Appoved
 	// --------------------
-	
+
 	if ($user->rights->expensereport->approve && $object->fk_statut == 5)
 	{
 	    print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=refuse&id='.$object->id.'">'.$langs->trans('Deny').'</a></div>';
@@ -2309,7 +2309,7 @@ if ($action != 'create' && $action != 'edit')
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/expensereport/payment/payment.php?id=' . $object->id . '&amp;action=create">' . $langs->trans('DoPayment') . '</a></div>';
 		}
 	}
-	
+
 	// If bank module is not used
 	if (($user->rights->expensereport->to_paid || empty($conf->banque->enabled)) && $object->fk_statut == 5)
 	{
@@ -2319,26 +2319,26 @@ if ($action != 'create' && $action != 'edit')
 			print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id='.$object->id.'&action=set_paid">'.$langs->trans("ClassifyPaid")."</a></div>";
 		}
 	}
-	
+
 	if ($user->rights->expensereport->creer && ($user->id == $object->fk_user_author || $user->id == $object->fk_user_valid) && $object->fk_statut == 5)
 	{
     	// Cancel
    		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=cancel&id='.$object->id.'">'.$langs->trans('Cancel').'</a></div>';
 	}
-	
+
     // TODO Replace this. It should be SetUnpaid and should go back to status unpaid not canceled.
 	if (($user->rights->expensereport->approve || $user->rights->expensereport->to_paid) && $object->fk_statut == 6)
 	{
 	    // Cancel
 	    print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=cancel&id='.$object->id.'">'.$langs->trans('Cancel').'</a></div>';
 	}
-	
+
 	// Clone
 	if ($user->rights->expensereport->creer) {
 	    print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&amp;action=clone">' . $langs->trans("ToClone") . '</a></div>';
 	}
-	
-	/* If draft, validated, cancel, and user can create, he can always delete its card before it is approved */ 
+
+	/* If draft, validated, cancel, and user can create, he can always delete its card before it is approved */
 	if ($user->rights->expensereport->creer && $user->id == $object->fk_user_author && $object->fk_statut <= 4)
 	{
 	    // Delete
@@ -2389,7 +2389,7 @@ if ($action != 'create' && $action != 'edit' && ($id || $ref))
         $object->fetch_thirdparty();
         $result = $object->add_object_linked('fichinter', GETPOST('LinkedFichinter'));
     }
-    
+
     // Show links to link elements
     $linktoelements=array();
     if (! empty($conf->global->EXPENSES_LINK_TO_INTERVENTION))
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 9e463eb8ac4..c084806c4a6 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -581,7 +581,7 @@ if (empty($reshook))
 	        setEventMessages($object->error, $object->errors, 'errors');
 	    }
 	}
-	
+
 	/*
 	 *  Mise a jour d'une ligne d'intervention
 	 */
@@ -997,7 +997,8 @@ if ($action == 'create')
         // Other attributes
         $parameters=array('colspan' => ' colspan="2"');
         $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-		if (empty($reshook) && ! empty($extrafields->attribute_label))
+        print $hookmanager->resPrint;
+        if (empty($reshook) && ! empty($extrafields->attribute_label))
 		{
 			print $object->showOptionals($extrafields,'edit');
 		}
@@ -1147,11 +1148,11 @@ else if ($id > 0 || ! empty($ref))
 	// Print form confirm
 	print $formconfirm;
 
-	
+
 	// Intervention card
 	$linkback = '<a href="'.DOL_URL_ROOT.'/fichinter/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
-	
-	
+
+
 	$morehtmlref='<div class="refidno">';
 	// Ref customer
 	//$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->fichinter->creer, 'string', '', 0, 1);
@@ -1191,16 +1192,16 @@ else if ($id > 0 || ! empty($ref))
 	    }
 	}
 	$morehtmlref.='</div>';
-	
+
     dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-	    
-	
+
+
     print '<div class="fichecenter">';
     print '<div class="fichehalfleft">';
     print '<div class="underbanner clearboth"></div>';
-    
+
     print '<table class="border" width="100%">';
-    
+
 	if (! empty($conf->global->FICHINTER_USE_PLANNED_AND_DONE_DATES))
 	{
 		// Date Start
@@ -1279,14 +1280,14 @@ else if ($id > 0 || ! empty($ref))
     include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
     print '</table>';
-    
+
     print '</div>';
     print '<div class="fichehalfright">';
     print '<div class="ficheaddleft">';
     print '<div class="underbanner clearboth"></div>';
-    
+
     print '<table class="border centpercent">';
-    
+
     if (empty($conf->global->FICHINTER_DISABLE_DETAILS))
     {
         // Duration
@@ -1294,15 +1295,15 @@ else if ($id > 0 || ! empty($ref))
         print '<td>'.convertSecondToTime($object->duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY).'</td>';
         print '</tr>';
     }
-    
+
 	print "</table>";
-    
+
 	print '</div>';
     print '</div>';
     print '</div>';
-    
+
     print '<div class="clearboth"></div><br>';
-    
+
 
 	if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
@@ -1367,7 +1368,7 @@ else if ($id > 0 || ! empty($ref))
 			while ($i < $num)
 			{
 				$objp = $db->fetch_object($resql);
-				
+
 
 				// Ligne en mode visu
 				if ($action != 'editline' || GETPOST('line_id','int') != $objp->rowid)
@@ -1488,7 +1489,7 @@ else if ($id > 0 || ! empty($ref))
 			// Add new line
 			if ($object->statut == 0 && $user->rights->ficheinter->creer && $action <> 'editline' && empty($conf->global->FICHINTER_DISABLE_DETAILS))
 			{
-				if (! $num) 
+				if (! $num)
 				{
 				    print '<br><table class="noborder" width="100%">';
 
@@ -1501,7 +1502,7 @@ else if ($id > 0 || ! empty($ref))
       				print '<td colspan="3">&nbsp;</td>';
     				print "</tr>\n";
 				}
-				
+
 				print '<tr class="oddeven">'."\n";
                 print '<td>';
                 // editeur wysiwyg
@@ -1655,7 +1656,7 @@ else if ($id > 0 || ! empty($ref))
 				{
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifydone">'.$langs->trans("InterventionClassifyDone").'</a></div>';
 				}
-				
+
 				// Clone
 				if ($user->rights->ficheinter->creer) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&amp;socid=' . $object->socid . '&amp;action=clone&amp;object=ficheinter">' . $langs->trans("ToClone") . '</a></div>';
@@ -1698,7 +1699,7 @@ else if ($id > 0 || ! empty($ref))
 		// Show links to link elements
 		$linktoelem = $form->showLinkToObjectBlock($object, null, array('fichinter'));
 		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
-		
+
 
 		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 2137e7ca747..dda4a0d7254 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1572,6 +1572,7 @@ if ($action=='create')
 	// Other options
     $parameters=array();
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
 
 	if (empty($reshook) && ! empty($extrafields->attribute_label))
     {
diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php
index a503776b653..86c177c4313 100644
--- a/htdocs/fourn/commande/orderstoinvoice.php
+++ b/htdocs/fourn/commande/orderstoinvoice.php
@@ -370,6 +370,7 @@ if ($action == 'create' && !$error) {
 	        'cols'=>2
 	);
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
 
 	if (empty($reshook) && ! empty($extrafields->attribute_label))
 	{
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 306ad62d69b..e67cb74d1ea 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1824,6 +1824,7 @@ if ($action == 'create')
     // Other options
     $parameters=array();
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
 
     // Bouton "Create Draft"
     print "</table>\n";
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index d42dc87b4b9..dc75ee54bb5 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1047,6 +1047,7 @@ else
         // Other attributes
         $parameters=array('cols' => 3);
         $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
         if (empty($reshook) && ! empty($extrafields->attribute_label))
         {
         	print $object->showOptionals($extrafields,'edit',$parameters);
@@ -1366,6 +1367,7 @@ else
             // Other attributes
             $parameters=array('colspan' => ' colspan="3"', 'cols'=>3);
             $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+            print $hookmanager->resPrint;
             if (empty($reshook) && ! empty($extrafields->attribute_label))
             {
             	print $object->showOptionals($extrafields,'edit');
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 2b76fb0a111..a7c7b4f22be 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -193,6 +193,7 @@ if ($object->id)
 
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
 	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 	// Construit liste des fichiers
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 84532ad219e..46db7f69b91 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -98,7 +98,7 @@ if (empty($reshook))
 		if ($id)
 		{
 			$result=$object->fetch($id);
-			$object->cost_price = price2num($cost_price); 
+			$object->cost_price = price2num($cost_price);
 			$result=$object->update($object->id, $user);
 			if ($result > 0)
 			{
@@ -112,7 +112,7 @@ if (empty($reshook))
 			}
 		}
 	}
-	
+
 	if ($action == 'confirm_remove_pf')
 	{
 		if ($rowid)	// id of product supplier price to remove
@@ -299,21 +299,21 @@ if ($id > 0 || $ref)
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $id . '&rowid=' . $rowid, $langs->trans('DeleteProductBuyPrice'), $langs->trans('ConfirmDeleteProductBuyPrice'), 'confirm_remove_pf', '', 0, 1);
 			echo $formconfirm;
 		}
-		
+
 		if ($action <> 'edit' && $action <> 're-edit')
 		{
 			$head=product_prepare_head($object);
 			$titre=$langs->trans("CardProduct".$object->type);
 			$picto=($object->type== Product::TYPE_SERVICE?'service':'product');
-			
+
 			dol_fiche_head($head, 'suppliers', $titre, -1, $picto);
-			
+
 			$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
-		    $object->next_prev_filter=" fk_product_type = ".$object->type;		
+		    $object->next_prev_filter=" fk_product_type = ".$object->type;
             dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
-            
+
             print '<div class="fichecenter">';
-            
+
             print '<div class="underbanner clearboth"></div>';
             print '<table class="border tableforfield" width="100%">';
 
@@ -338,14 +338,14 @@ if ($id > 0 || $ref)
             print '</td><td colspan="2">';
             print $form->editfieldval($text,'cost_price',$object->cost_price,$object,$user->rights->produit->creer||$user->rights->service->creer,'amount:6');
             print '</td></tr>';
-            
+
 			print '</table>';
 
             print '</div>';
             print '<div style="clear:both"></div>';
-			
+
 			dol_fiche_end();
-			
+
 
 			// Form to add or update a price
 			if (($action == 'add_price' || $action == 'updateprice' ) && ($user->rights->produit->creer || $user->rights->service->creer))
@@ -365,7 +365,7 @@ if ($id > 0 || $ref)
 				print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST">';
 				print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 				print '<input type="hidden" name="action" value="updateprice">';
-				
+
 				dol_fiche_head();
 
 				print '<table class="border" width="100%">';
@@ -450,11 +450,11 @@ if ($id > 0 || $ref)
 				$default_vat=get_default_tva($mysoc2, $mysoc, $object->id, 0);
 				$default_npr=get_default_npr($mysoc2, $mysoc, $object->id, 0);
 				if (empty($default_vat)) $default_npr=$default_vat;
-				
+
 				print '<tr><td class="fieldrequired">'.$langs->trans("VATRateForSupplierProduct").'</td>';
 				print '<td>';
 				//print $form->load_tva('tva_tx',$object->tva_tx,$supplier,$mysoc);    // Do not use list here as it may be any vat rates for any country
-				if (! empty($rowid))	// If we have a supplier, it is an update, we must show the vat of current supplier price 
+				if (! empty($rowid))	// If we have a supplier, it is an update, we must show the vat of current supplier price
 				{
 				    $tmpproductsupplier=new ProductFournisseur($db);
 				    $tmpproductsupplier->fetch_product_fournisseur_price($rowid, 1);
@@ -463,7 +463,7 @@ if ($id > 0 || $ref)
 				}
 				else
 				{
-                    if (empty($default_vat)) 
+                    if (empty($default_vat))
                     {
                         $default_vat=$object->tva_tx;
                     }
@@ -546,6 +546,7 @@ if ($id > 0 || $ref)
 				{
 					$parameters=array('id_fourn'=>$id_fourn,'prod_id'=>$object->id);
 				    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);
+                    print $hookmanager->resPrint;
 				}
 
 				print '</table>';
@@ -589,7 +590,7 @@ if ($id > 0 || $ref)
 				$product_fourn_list = $product_fourn->list_product_fournisseur_price($object->id, $sortfield, $sortorder);
 				$nbtotalofrecords = count($product_fourn_list);
 			    print_barre_liste($langs->trans('SupplierPrices'), $page, $_SERVEUR ['PHP_SELF'], $option, $sortfield, $sortorder, '', count($product_fourn_list), $nbtotalofrecords, 'title_accountancy.png');
-			     
+
 				// Suppliers list title
 			    print '<div class="div-table-responsive">';
 			    print '<table class="noborder" width="100%">';
@@ -608,7 +609,7 @@ if ($id > 0 || $ref)
 				print_liste_field_titre($langs->trans("DiscountQtyMin"),$_SERVER["PHP_SELF"],'','',$param,'align="right"',$sortfield,$sortorder);
 				print_liste_field_titre($langs->trans("NbDaysToDelivery"),$_SERVER["PHP_SELF"],"pfp.delivery_time_days","",$param,'align="right"',$sortfield,$sortorder);
 				print_liste_field_titre($langs->trans("ReputationForThisProduct"),$_SERVER["PHP_SELF"],"pfp.supplier_reputation","",$param,'align="center"',$sortfield,$sortorder);
-				
+
 				// Charges ????
 				if ($conf->global->PRODUCT_CHARGES)
 				{
@@ -623,13 +624,13 @@ if ($id > 0 || $ref)
 
 					foreach($product_fourn_list as $productfourn)
 					{
-						
+
 
 						print '<tr class="oddeven">';
 
 						// Supplier
 						print '<td>'.$productfourn->getSocNomUrl(1,'supplier').'</td>';
-						
+
 						// Supplier
 						print '<td align="left">'.$productfourn->fourn_ref.'</td>';
 
@@ -675,8 +676,8 @@ if ($id > 0 || $ref)
 						// Reputation
 						print '<td align="center">';
 						if (!empty($productfourn->supplier_reputation) && !empty($object->reputations[$productfourn->supplier_reputation])) {
-							print $object->reputations[$productfourn->supplier_reputation];	
-						}  
+							print $object->reputations[$productfourn->supplier_reputation];
+						}
 						print'</td>';
 
 						// Charges ????
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index f4c0c66cdec..fe6f92bffec 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -82,7 +82,7 @@ if ($id > 0 || ! empty($ref))
 	$result = $product->fetch($id, $ref);
 
 	$object = $product;
-	
+
 	$parameters=array('id'=>$id);
 	$reshook=$hookmanager->executeHooks('doActions',$parameters,$product,$action);    // Note that $action and $object may have been modified by some hooks
 	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -97,14 +97,15 @@ if ($id > 0 || ! empty($ref))
 		dol_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$product,$action);    // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
         $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
-		
+
         dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
-        
+
         print '<div class="fichecenter">';
-        
+
         print '<div class="underbanner clearboth"></div>';
         print '<table class="border tableforfield" width="100%">';
 
@@ -114,9 +115,9 @@ if ($id > 0 || ! empty($ref))
 
         print '</div>';
         print '<div style="clear:both"></div>';
-		
+
 		dol_fiche_end();
-		
+
 
 		if ($user->rights->commande->lire)
 		{
@@ -211,7 +212,7 @@ if ($id > 0 || ! empty($ref))
 					while ($i < $num && $i < $conf->liste_limit)
 					{
 						$objp = $db->fetch_object($result);
-						
+
 
 						print '<tr class="oddeven">';
 	 					print '<td>';
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index dafb2b5aafd..2d9bccbcca4 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -88,7 +88,7 @@ if ($id > 0 || ! empty($ref)) {
 	$result = $product->fetch($id, $ref);
 
 	$object = $product;
-	
+
 	$parameters = array ('id' => $id);
 	$reshook = $hookmanager->executeHooks('doActions', $parameters, $product, $action); // Note that $action and $object may have been modified by some hooks
 	if ($reshook < 0)
@@ -96,7 +96,7 @@ if ($id > 0 || ! empty($ref)) {
 
 	llxHeader("", "", $langs->trans("CardProduct" . $product->type));
 
-	if ($result > 0) 
+	if ($result > 0)
 	{
 		$head = product_prepare_head($product);
 		$titre = $langs->trans("CardProduct" . $product->type);
@@ -104,15 +104,15 @@ if ($id > 0 || ! empty($ref)) {
 		dol_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook
-		if ($reshook < 0)
-			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+        print $hookmanager->resPrint;
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
-				
+
         dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
-        
+
         print '<div class="fichecenter">';
-        
+
         print '<div class="underbanner clearboth"></div>';
         print '<table class="border tableforfield" width="100%">';
 
@@ -122,9 +122,9 @@ if ($id > 0 || ! empty($ref)) {
 
         print '</div>';
         print '<div style="clear:both"></div>';
-		
+
 		dol_fiche_end();
-		
+
 
 		if ($user->rights->fournisseur->commande->lire)
 		{
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index b5a8ec2b039..c4421aa21f3 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -72,7 +72,7 @@ if ($id > 0 || ! empty($ref))
 	$result = $product->fetch($id, $ref);
 
 	$object = $product;
-	
+
 	$parameters=array('id'=>$id);
 	$reshook=$hookmanager->executeHooks('doActions',$parameters,$product,$action);    // Note that $action and $object may have been modified by some hooks
 	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -87,14 +87,15 @@ if ($id > 0 || ! empty($ref))
 		dol_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$product,$action);    // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
         $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
-		
+
         dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
-        
+
         print '<div class="fichecenter">';
-        
+
         print '<div class="underbanner clearboth"></div>';
         print '<table class="border tableforfield" width="100%">';
 
@@ -104,9 +105,9 @@ if ($id > 0 || ! empty($ref))
 
         print '</div>';
         print '<div style="clear:both"></div>';
-		
+
 		dol_fiche_end();
-		
+
 
 		$now=dol_now();
 
@@ -141,7 +142,7 @@ if ($id > 0 || ! empty($ref))
                 $option .= '&amp;search_month=' . $search_month;
             if (! empty($search_year))
                 $option .= '&amp;search_year=' . $search_year;
-            
+
             print '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?id=' . $product->id . '" name="search_form">' . "\n";
             if (! empty($sortfield))
                 print '<input type="hidden" name="sortfield" value="' . $sortfield . '"/>';
@@ -151,7 +152,7 @@ if ($id > 0 || ! empty($ref))
                 print '<input type="hidden" name="page" value="' . $page . '"/>';
                 $option .= '&amp;page=' . $page;
             }
-			                    
+
 			print_barre_liste($langs->trans("Contrats"),$page,$_SERVER["PHP_SELF"],"&amp;id=$product->id",$sortfield,$sortorder,'',$num,0,'');
 
 			$i = 0;
@@ -177,7 +178,7 @@ if ($id > 0 || ! empty($ref))
 				while ($i < $num && $i < $conf->liste_limit)
 				{
 					$objp = $db->fetch_object($result);
-					
+
 
 					print '<tr class="oddeven">';
 					print '<td><a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowContract"),"contract").' ';
@@ -197,7 +198,7 @@ if ($id > 0 || ! empty($ref))
 					$i++;
 				}
 			}
-			
+
 			print '</table>';
 			print '</div>';
 			print '</form>';
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index d4f447128a1..3b3cfb37b1d 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -83,9 +83,9 @@ if ($id > 0 || ! empty($ref))
 {
 	$product = new Product($db);
 	$result = $product->fetch($id, $ref);
-    
+
 	$object = $product;
-    
+
 	$parameters=array('id'=>$id);
 	$reshook=$hookmanager->executeHooks('doActions',$parameters,$product,$action);    // Note that $action and $object may have been modified by some hooks
 	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -114,14 +114,15 @@ if ($id > 0 || ! empty($ref))
 		dol_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$product,$action);    // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
         $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
-        
+
 		dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
-        
+
         print '<div class="fichecenter">';
-        
+
         print '<div class="underbanner clearboth"></div>';
         print '<table class="border tableforfield" width="100%">';
 
@@ -131,14 +132,14 @@ if ($id > 0 || ! empty($ref))
 
         print '</div>';
         print '<div style="clear:both"></div>';
-		
+
 		dol_fiche_end();
 
 		if ($showmessage && $nboflines > 1)
 		{
 			print $langs->trans("ClinkOnALinkOfColumn", $langs->transnoentitiesnoconv("Referers"));
 		}
-        elseif ($user->rights->facture->lire) 
+        elseif ($user->rights->facture->lire)
         {
             $sql = "SELECT DISTINCT s.nom as name, s.rowid as socid, s.code_client,";
             $sql.= " f.facnumber, f.datef, f.paye, f.fk_statut as statut, f.rowid as facid,";
@@ -164,13 +165,13 @@ if ($id > 0 || ! empty($ref))
             $total_ht=0;
             $total_qty=0;
 			$totalrecords=0;
-            if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) 
+            if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
             {
             	$result = $db->query($sql);
-            	if ($result) 
+            	if ($result)
             	{
             		$totalrecords = $db->num_rows($result);
-            		while ($objp = $db->fetch_object($result)) 
+            		while ($objp = $db->fetch_object($result))
             		{
             			$total_ht+=$objp->total_ht;
             			$total_qty+=$objp->qty;
@@ -234,7 +235,7 @@ if ($id > 0 || ! empty($ref))
                     while ($i < min($num,$conf->liste_limit))
 					{
                         $objp = $db->fetch_object($result);
-                        
+
 
                         print '<tr class="oddeven">';
                         print '<td>';
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index 5701b8960e5..ba17b1b3265 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -84,7 +84,7 @@ if ($id > 0 || ! empty($ref))
 	$result = $product->fetch($id, $ref);
 
 	$object = $product;
-	
+
 	$parameters = array('id' => $id);
 	$reshook = $hookmanager->executeHooks('doActions', $parameters, $product, $action); // Note that $action and $object may have been modified by some hooks
 	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -99,14 +99,15 @@ if ($id > 0 || ! empty($ref))
 		dol_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
         $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
-		
+
         dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
-        
+
         print '<div class="fichecenter">';
-        
+
         print '<div class="underbanner clearboth"></div>';
         print '<table class="border tableforfield" width="100%">';
 
@@ -116,9 +117,9 @@ if ($id > 0 || ! empty($ref))
 
         print '</div>';
         print '<div style="clear:both"></div>';
-		
+
 		dol_fiche_end();
-		
+
 
 		if ($user->rights->fournisseur->facture->lire)
 		{
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index c9aa8fd85bc..616a54f67ff 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -82,7 +82,7 @@ if ($id > 0 || ! empty($ref))
 	$result = $product->fetch($id, $ref);
 
     $object = $product;
-    
+
 	$parameters = array ('id' => $id);
 	$reshook = $hookmanager->executeHooks('doActions', $parameters, $product, $action); // Note that $action and $object may have been modified by some hooks
 	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -97,14 +97,15 @@ if ($id > 0 || ! empty($ref))
 		dol_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
         $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
-        
+
 		dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
-        
+
         print '<div class="fichecenter">';
-        
+
         print '<div class="underbanner clearboth"></div>';
         print '<table class="border tableforfield" width="100%">';
 
@@ -114,11 +115,11 @@ if ($id > 0 || ! empty($ref))
 
         print '</div>';
         print '<div style="clear:both"></div>';
-		
-		dol_fiche_end();
-		
 
-		if ($user->rights->propale->lire) 
+		dol_fiche_end();
+
+
+		if ($user->rights->propale->lire)
 		{
 			$sql = "SELECT DISTINCT s.nom as name, s.rowid as socid, p.rowid as propalid, p.ref, d.total_ht as amount,";
 			$sql .= " p.ref_client,";
@@ -239,7 +240,7 @@ if ($id > 0 || ! empty($ref))
 						}
 					}
 				}
-				
+
         		print '<tr class="liste_total">';
         		print '<td>' . $langs->trans('Total') . '</td>';
         		print '<td colspan="2"></td>';
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 69421aa5624..b7b2b98baa8 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -568,7 +568,7 @@ if ($id > 0 || $ref)
 
 		// Minimum Price
 		print '<tr><td>'.$langs->trans("BuyingPriceMin").'</td>';
-		print '<td colspan="2">';
+		print '<td>';
 		$product_fourn = new ProductFournisseur($db);
 		if ($product_fourn->find_min_price_product_fournisseur($object->id) > 0)
 		{
@@ -611,17 +611,18 @@ if ($id > 0 || $ref)
 		}
 
         // Stock alert threshold
-        print '<tr><td>'.$form->editfieldkey("StockLimit",'seuil_stock_alerte',$object->seuil_stock_alerte,$object,$user->rights->produit->creer).'</td><td colspan="2">';
+        print '<tr><td>'.$form->editfieldkey("StockLimit",'seuil_stock_alerte',$object->seuil_stock_alerte,$object,$user->rights->produit->creer).'</td><td>';
         print $form->editfieldval("StockLimit",'seuil_stock_alerte',$object->seuil_stock_alerte,$object,$user->rights->produit->creer,'string');
         print '</td></tr>';
 
 		// Hook formObject
-		$parameters=array('cols'=>2);
+		$parameters=array();
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
 
         // Desired stock
         print '<tr><td>'.$form->editfieldkey($form->textwithpicto($langs->trans("DesiredStock"), $langs->trans("DesiredStockDesc"), 1),'desiredstock',$object->desiredstock,$object,$user->rights->produit->creer);
-        print '</td><td colspan="2">';
+        print '</td><td>';
         print $form->editfieldval("DesiredStock",'desiredstock',$object->desiredstock,$object,$user->rights->produit->creer,'string');
         print '</td></tr>';
 
@@ -707,7 +708,7 @@ if ($id > 0 || $ref)
 		{
 			dol_print_error($db);
 		}
-		print '<tr><td class="tdtop">'.$langs->trans("LastMovement").'</td><td colspan="3">';
+		print '<tr><td class="tdtop">'.$langs->trans("LastMovement").'</td><td>';
 		if ($lastmovementdate)
 		{
 		    print dol_print_date($lastmovementdate,'dayhour').' ';
@@ -800,7 +801,11 @@ if ((! empty($conf->productbatch->enabled)) && $object->hasbatch())
 	print '<td align="right" width="10%">'.$langs->trans("batch_number").'</td>';
 	print '<td align="center" width="10%">'.$langs->trans("EatByDate").'</td>';
 	print '<td align="center" width="10%">'.$langs->trans("SellByDate").'</td>';
-	print '<td align="right" colspan="5"></td>';
+	print '<td></td>';
+	print '<td></td>';
+	print '<td></td>';
+	print '<td></td>';
+	print '<td></td>';
 	print '</tr>';
 }
 
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index e8c48352120..7b0b448ef59 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -610,6 +610,7 @@ if ($action == 'create' && $user->rights->projet->creer)
     // Other options
     $parameters=array();
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
     if (empty($reshook) && ! empty($extrafields->attribute_label))
     {
     	print $object->showOptionals($extrafields,'edit');
@@ -834,6 +835,7 @@ elseif ($object->id > 0)
         // Other options
         $parameters=array();
         $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
         if (empty($reshook) && ! empty($extrafields->attribute_label))
         {
         	print $object->showOptionals($extrafields,'edit');
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index a9e50f96f91..41ae6d28364 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -42,7 +42,7 @@ $backtopage=GETPOST('backtopage','alpha');
 $cancel=GETPOST('cancel');
 
 $search_user_id = GETPOST('search_user_id', 'int');
-    
+
 //if (! $user->rights->projet->all->lire) $mine=1;	// Special for projects
 
 $object = new Project($db);
@@ -97,7 +97,7 @@ if ($action == 'createtask' && $user->rights->projet->creer)
 	//$date_end = dol_mktime($_POST['dateehour'],$_POST['dateemin'],0,$_POST['dateemonth'],$_POST['dateeday'],$_POST['dateeyear'],'user');
 	$date_start = dol_mktime($_POST['dateohour'],$_POST['dateomin'],0,$_POST['dateomonth'],$_POST['dateoday'],$_POST['dateoyear']);
 	$date_end = dol_mktime($_POST['dateehour'],$_POST['dateemin'],0,$_POST['dateemonth'],$_POST['dateeday'],$_POST['dateeyear']);
-	
+
 	if (! $cancel)
 	{
 		if (empty($taskref))
@@ -139,7 +139,7 @@ if ($action == 'createtask' && $user->rights->projet->creer)
 			$task->date_start = $date_start;
 			$task->date_end = $date_end;
 			$task->progress = $progress;
-			
+
 			// Fill array 'array_options' with data from add form
 			$ret = $extrafields_task->setOptionalsFromPost($extralabels_task,$task);
 
@@ -224,26 +224,26 @@ if ($id > 0 || ! empty($ref))
     if ($search_user_id > 0) $param.='&search_user_id='.dol_escape_htmltag($search_user_id);
 
     // Project card
-    
+
     $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
-    
+
     $morehtmlref='<div class="refidno">';
     // Title
     $morehtmlref.=$object->title;
     // Thirdparty
-    if ($object->thirdparty->id > 0) 
+    if ($object->thirdparty->id > 0)
     {
         $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1, 'project');
     }
     $morehtmlref.='</div>';
-    
+
     // Define a complementary filter for search of next/prev ref.
     if (! $user->rights->projet->all->lire)
     {
         $objectsListId = $object->getProjectsAuthorizedForUser($user,0,0);
         $object->next_prev_filter=" rowid in (".(count($objectsListId)?join(',',array_keys($objectsListId)):'0').")";
     }
-    
+
     dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
     print '<div class="fichecenter">';
@@ -286,7 +286,7 @@ if ($id > 0 || ! empty($ref))
     print ($end?$end:'?');
     if ($object->hasDelay()) print img_warning("Late");
     print '</td></tr>';
-    
+
     // Budget
     print '<tr><td>'.$langs->trans("Budget").'</td><td>';
     if (strcmp($object->budget_amount, '')) print price($object->budget_amount,'',$langs,1,0,0,$conf->currency);
@@ -295,16 +295,16 @@ if ($id > 0 || ! empty($ref))
     // Other attributes
     $cols = 2;
     include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
-    
+
     print '</table>';
-    
+
     print '</div>';
     print '<div class="fichehalfright">';
     print '<div class="ficheaddleft">';
     print '<div class="underbanner clearboth"></div>';
-    
+
     print '<table class="border" width="100%">';
-    
+
     // Description
     print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
     print nl2br($object->description);
@@ -316,13 +316,13 @@ if ($id > 0 || ! empty($ref))
         print $form->showCategories($object->id,'project',1);
         print "</td></tr>";
     }
-    
+
     print '</table>';
-    
+
     print '</div>';
     print '</div>';
     print '</div>';
-    
+
     print '<div class="clearboth"></div>';
 
 
@@ -341,7 +341,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 	print '<input type="hidden" name="action" value="createtask">';
 	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	if (! empty($object->id)) print '<input type="hidden" name="id" value="'.$object->id.'">';
-	
+
 	dol_fiche_head('');
 
 	print '<table class="border" width="100%">';
@@ -413,6 +413,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 	// Other options
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
 	if (empty($reshook) && ! empty($extrafields_task->attribute_label))
 	{
 		print $object->showOptionals($extrafields_task,'edit');
@@ -460,7 +461,7 @@ else if ($id > 0 || ! empty($ref))
 
 	print '</div>';
 
-	
+
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
 	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -470,12 +471,12 @@ else if ($id > 0 || ! empty($ref))
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
     print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
-	
+
 	$title=$langs->trans("ListOfTasks");
 	$linktotasks='<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?projectid='.$object->id.'&withproject=1">'.$langs->trans("GoToListOfTimeConsumed").'</a>';
 	//print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $linktotasks, $num, $totalnboflines, 'title_generic.png', 0, '', '', 0, 1);
 	print load_fiche_titre($title,$linktotasks,'title_generic.png');
-	
+
 	// Get list of tasks in tasksarray and taskarrayfiltered
 	// We need all tasks (even not limited to a user because a task to user can have a parent that is not affected to him).
 	$filteronthirdpartyid = $socid;
@@ -483,7 +484,7 @@ else if ($id > 0 || ! empty($ref))
 	// We load also tasks limited to a particular user
 	$tmpuser=new User($db);
 	if ($search_user_id > 0) $tmpuser->fetch($search_user_id);
-	
+
 	$tasksrole=($tmpuser->id > 0 ? $taskstatic->getUserRolesForProjectsOrTasks(0, $tmpuser, $object->id, 0) : '');
 	//var_dump($tasksarray);
 	//var_dump($tasksrole);
@@ -494,7 +495,7 @@ else if ($id > 0 || ! empty($ref))
 	}
 
 	print '<table id="tablelines" class="noborder" width="100%">';
-	
+
 	if (count($tasksarray) > 0)
 	{
     	// Link to switch in "my task" / "all task"
@@ -509,7 +510,7 @@ else if ($id > 0 || ! empty($ref))
         print $searchpicto;
         print '</td>';
 	}
-	
+
 	print '<tr class="liste_titre nodrag nodrop">';
 	// print '<td>'.$langs->trans("Project").'</td>';
 	print '<td width="100">'.$langs->trans("RefTask").'</td>';
@@ -522,7 +523,7 @@ else if ($id > 0 || ! empty($ref))
 	print '<td align="right">'.$langs->trans("ProgressDeclared").'</td>';
 	print '<td>&nbsp;</td>';
 	print "</tr>\n";
-	
+
 	if (count($tasksarray) > 0)
 	{
 	    // Show all lines in taskarray (recursive function to go down on tree)
@@ -533,11 +534,11 @@ else if ($id > 0 || ! empty($ref))
 	{
 		print '<tr class="oddeven"><td colspan="9" class="opacitymedium">'.$langs->trans("NoTasks").'</td></tr>';
 	}
-	
+
 	print "</table>";
 
 	print '</form>';
-	
+
 
 	// Test if database is clean. If not we clean it.
 	//print 'mode='.$_REQUEST["mode"].' $nboftaskshown='.$nboftaskshown.' count($tasksarray)='.count($tasksarray).' count($tasksrole)='.count($tasksrole).'<br>';
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 2d35be97f4a..df89cac3e83 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -408,6 +408,7 @@ if ($id > 0 || ! empty($ref))
 			// Other options
 			$parameters=array();
 			$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+            print $hookmanager->resPrint;
 			if (empty($reshook) && ! empty($extrafields->attribute_label))
 			{
 				print $object->showOptionals($extrafields,'edit');
diff --git a/htdocs/resource/add.php b/htdocs/resource/add.php
index 2e988d16025..a294dfb94db 100644
--- a/htdocs/resource/add.php
+++ b/htdocs/resource/add.php
@@ -177,6 +177,7 @@ if (! $action)
         // Other attributes
         $parameters=array('objectsrc' => $objectsrc);
         $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
         if (empty($reshook) && ! empty($extrafields->attribute_label))
         {
         	print $object->showOptionals($extrafields,'edit');
diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php
index a286eb60097..02d38c2b924 100644
--- a/htdocs/resource/card.php
+++ b/htdocs/resource/card.php
@@ -203,6 +203,7 @@ if ( $object->fetch($id) > 0 )
 		// Other attributes
 		$parameters=array('objectsrc' => $objectsrc);
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
 		if (empty($reshook) && ! empty($extrafields->attribute_label))
 		{
 			print $object->showOptionals($extrafields,'edit');
diff --git a/htdocs/societe/commerciaux.php b/htdocs/societe/commerciaux.php
index da9b7c4a8f3..e972aaa1091 100644
--- a/htdocs/societe/commerciaux.php
+++ b/htdocs/societe/commerciaux.php
@@ -174,7 +174,8 @@ if (! empty($socid))
 
  			$parameters=array('socid'=>$object->id);
         	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$obj,$action);    // Note that $action and $object may have been modified by hook
-      		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+            print $hookmanager->resPrint;
+        	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
       		$tmpuser->id = $obj->rowid;
       		$tmpuser->firstname = $obj->firstname;
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index c7807d8c4e5..72c9793b40b 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1150,6 +1150,7 @@ if ($action == 'create')
 	// Other attributes
 	$parameters = array('colspan' => ' colspan="3"');
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
 	if (empty($reshook) && ! empty($extrafields->attribute_label)) {
 		print $object->showOptionals($extrafields, 'edit');
 	}
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 9e9e2b09e28..8400a95d370 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1112,6 +1112,7 @@ if ($action == 'create' || $action == 'adduserldap')
     // Other attributes
     $parameters=array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"');
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
     if (empty($reshook) && ! empty($extrafields->attribute_label))
     {
     	print $object->showOptionals($extrafields,'edit');
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index 8be0276e6ee..e53080cea73 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -272,6 +272,7 @@ if ($action == 'create')
 	// Other attributes
     $parameters=array('object' => $object, 'colspan' => ' colspan="2"');
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
     if (empty($reshook) && ! empty($extrafields->attribute_label))
     {
     	print $object->showOptionals($extrafields,'edit');
@@ -562,6 +563,7 @@ else
         	// Other attributes
             $parameters=array();
             $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+            print $hookmanager->resPrint;
             if (empty($reshook) && ! empty($extrafields->attribute_label))
             {
             	print $object->showOptionals($extrafields,'edit');

From bb091c3b8bc7fd21ebc0efcae271e8c0c10d8521 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jun 2017 10:45:45 +0200
Subject: [PATCH 167/438] FIX The hook formObjectOptions was not implemented
 correctly in previous version. Sometimes, you had to return output content by
 doing a print into function, sometimes by returning content into "resprint".
 This has been fixed to follow hook specifications so you must return output
 into "resprint".

---
 ChangeLog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 5b4f986fbb1..766efb9c02a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,9 @@ Following changes may create regression for some external modules, but were nece
   exists, but if an external module need action on it, it must provides itself its trigger file.
 * Use $conf->global->MULTICOMPANY_TRANSVERSE_MODE instead $conf->multicompany->transverse_mode
 * Use getEntity('xxx') instead getEntity('xxx', 1) and use getEntity('xxx', 0) instead getEntity('xxx')
+* The hook formObjectOptions was not implemented correctly in previous version. Sometimes, you had to return output 
+content by doing a print into function, sometimes by returning content into "resprint". This has been fixed to follow
+hook specifications so you must return output into "resprint".
 
 ***** ChangeLog for 5.0.3 compared to 5.0.2 *****
 FIX: #6677 Expired contracts dashboard box does not show the name of the thirdparty

From 57f99ba7a1e69371d3996bbcc2e084b25cd641ce Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jun 2017 11:09:05 +0200
Subject: [PATCH 168/438] Update README

---
 README-FR.md | 19 +++++++++----------
 README.md    | 21 +++++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/README-FR.md b/README-FR.md
index 1c097e7914e..4129e2b7452 100644
--- a/README-FR.md
+++ b/README-FR.md
@@ -103,25 +103,24 @@ Voir fichier ChangeLog.
 
 ### Divers:
 
-- Application multi-utilisateurs avec différents niveaux de permissions par module.
+- Multi-langue.
+- Multi-utilisateurs avec différents niveaux de permissions par module.
+- Multi-devise.
 - Peux être multi-société par ajout du module externe multi-société.
-- Peux-être multi-devise par ajout du module externe multi-devise.
-- Plusieurs gestionnaires de menus (possibilité de différencier les menus pour les utilisateurs internes ou externes comme les clients ou fournisseurs).
-- Application simple à utiliser.
 - Plusieurs thèmes visuels.
-- Code simple et facilement personnalisable.
-- Requiert PHP et MariaDb, Mysql ou Postgresql (Voir versions exactes sur http://wiki.dolibarr.org/index.php/Prérequis). 
+- Application simple à utiliser.
+- Requiert PHP et MariaDb, Mysql ou Postgresql (Voir versions exactes sur https://wiki.dolibarr.org/index.php/Prérequis). 
 - Compatible avec toutes les offres Cloud du marché respectant les prérequis de base de données et PHP.
-- Export PDF de tous les éléments (factures, propositions commerciales, commandes, bons expéditions, etc...)
+- Code simple et facilement personnalisable (pas de framework lourd; mécanisme de hook et triggers).
+- APIs.
+- Génération PDF et ODT des éléments (factures, propositions commerciales, commandes, bons expéditions, etc...)
 
 
 ## CE QUE DOLIBARR NE PEUT PAS FAIRE (TACHES A FAIRE)
 
 Voici un liste de fonctionnalites pas encore gérées par Dolibarr:
-- Pas encore de compta analytique double-partie (uniquement gestion de trésorerie).
-- Dolibarr ne gère qu'une seule monnaie à la fois (mono-devise).
 - Dolibarr ne contient pas de module de Gestion de la paie.
-- Les tâches du module de gestion de projets n'ont pas de dépendance entre elle.
+- Les tâches du module de gestion de projets n'ont pas de dépendances entre elle.
 - Dolibarr ne contient pas de Webmail.
 - Dolibarr ne fait pas le café (pas encore). 
 
diff --git a/README.md b/README.md
index eda6b8b642e..f091bb6c952 100644
--- a/README.md
+++ b/README.md
@@ -81,7 +81,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 
 ## FEATURES
 
-### Main modules (all optional)
+### Main application/modules (all optional)
 
 - Customers, Prospects and/or Suppliers directory
 - Products and/or Services catalog
@@ -107,7 +107,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 - Point of Sale
 - …
 
-### Other modules
+### Other application/modules
 
 - Bookmarks management
 - Donations management
@@ -124,15 +124,17 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 - …
 
 ### Other general features
-- Multi-Users and groups with finely grained rights
-- Localization in most major languages
-- Can manage several companies by adding external module multi-company.
-- Can manage several currencies by adding external module multi-currency.
-- Very user friendly and easy to use
+
+- Localization in most major languages.
+- Multi-Users and groups with finely grained rights.
+- Multi-currency.
+- Multi-company by adding of an external module.
+- Very user friendly and easy to use.
 - Highly customizable: enable only the modules you need, add user personalized fields, choose your skin, several menu managers (can be used by internal users as a back-office with a particular menu, or by external users as a front-office with another one)
-- Works with PHP 5.3+ and MariaDB 5.0.3+, MySQL 5.0.3+ or PostgreSQL 8.1.4+ (See requirements on the [Wiki](http://wiki.dolibarr.org/index.php/Prerequisite))
+- Works with PHP 5.3+ and MariaDB 5.0.3+, MySQL 5.0.3+ or PostgreSQL 8.1.4+ (See requirements on the [Wiki](https://wiki.dolibarr.org/index.php/Prerequisite))
 - Compatible with all Cloud solutions that match MySQL, PHP or PostgreSQL prerequisites.
-- An easy to understand, maintain and code interfaces with your own information system (PHP with no heavy framework; trigger and hook architecture)
+- APIs
+- An easy to understand, maintain and develop code (PHP with no heavy framework; trigger and hook architecture)
 - Support for country specific features:
     - Spanish Tax RE and ISPF
     - French NPR VAT rate (VAT called "Non Perçue Récupérable" for DOM-TOM)
@@ -150,7 +152,6 @@ Dolibarr can be extended with a lot of other external modules from third party d
 
 These are features that Dolibarr does **not** yet fully support:
 
-- Double-entry bookkeeping yet (only bank and treasury management)
 - Tasks dependencies in projects
 - Payroll module
 - Webmail

From 965e3e514047c438a9b346a658e4d81596da4e4a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jun 2017 11:21:17 +0200
Subject: [PATCH 169/438] Update doc

---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index f091bb6c952..29a7d4f9545 100644
--- a/README.md
+++ b/README.md
@@ -133,20 +133,21 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 - Highly customizable: enable only the modules you need, add user personalized fields, choose your skin, several menu managers (can be used by internal users as a back-office with a particular menu, or by external users as a front-office with another one)
 - Works with PHP 5.3+ and MariaDB 5.0.3+, MySQL 5.0.3+ or PostgreSQL 8.1.4+ (See requirements on the [Wiki](https://wiki.dolibarr.org/index.php/Prerequisite))
 - Compatible with all Cloud solutions that match MySQL, PHP or PostgreSQL prerequisites.
-- APIs
+- APIs.
 - An easy to understand, maintain and develop code (PHP with no heavy framework; trigger and hook architecture)
 - Support for country specific features:
     - Spanish Tax RE and ISPF
     - French NPR VAT rate (VAT called "Non Perçue Récupérable" for DOM-TOM)
     - Canadian double taxes (federal/province) and other countries using cumulative VAT
     - Tunisian tax stamp
+    - Argentina invoice numbering using A,B,C... 
     - Compatible with [European directives](http://europa.eu/legislation_summaries/taxation/l31057_en.htm) (2006/112/CE ... 2010/45/UE)
 - PDF or ODT generation for invoice, proposals, orders...
 - …
 
 ### Extending
 
-Dolibarr can be extended with a lot of other external modules from third party developers available at the [DoliStore](https://www.dolistore.com).
+Dolibarr can be extended with a lot of other external application or modules from third party developers available at the [DoliStore](https://www.dolistore.com).
 
 ## FUTURE
 

From a96362e2f94808304165e6ea6b9c29dd139a4405 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jun 2017 11:40:01 +0200
Subject: [PATCH 170/438] Fix #formmailbeforetitle not supported everywhere

---
 htdocs/admin/mails.php                        | 89 ++++++++++---------
 htdocs/comm/mailing/card.php                  |  3 +-
 htdocs/comm/propal/card.php                   |  3 +-
 htdocs/commande/card.php                      |  2 +-
 htdocs/compta/facture/card.php                |  3 +-
 htdocs/contrat/card.php                       |  1 +
 htdocs/expedition/card.php                    |  3 +-
 htdocs/fichinter/card.php                     |  3 +-
 htdocs/fourn/commande/card.php                |  3 +-
 htdocs/fourn/facture/card.php                 |  5 +-
 .../modulebuilder/template/myobject_card.php  |  3 +
 htdocs/societe/card.php                       |  4 +-
 htdocs/supplier_proposal/card.php             |  3 +-
 htdocs/user/card.php                          |  1 +
 14 files changed, 71 insertions(+), 55 deletions(-)

diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 03cce1dff09..6b8126bd977 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -229,11 +229,11 @@ if ($action == 'edit')
 	print '<input type="hidden" name="action" value="update">';
 
 	dol_fiche_head($head, 'common', '', -1);
-	
+
 	print $langs->trans("EMailsDesc")."<br>\n";
 	print "<br>\n";
-	
-	
+
+
 	clearstatcache();
 	$var=true;
 
@@ -241,17 +241,17 @@ if ($action == 'edit')
 	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
 	// Disable
-	
+
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_DISABLE_ALL_MAILS").'</td><td>';
 	print $form->selectyesno('MAIN_DISABLE_ALL_MAILS',$conf->global->MAIN_DISABLE_ALL_MAILS,1);
 	print '</td></tr>';
 
 	// Separator
-	
+
 	print '<tr class="oddeven"><td colspan="2">&nbsp;</td></tr>';
 
 	// Method
-	
+
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td>';
 
 	// SuperAdministrator access only
@@ -270,7 +270,7 @@ if ($action == 'edit')
 	print '</td></tr>';
 
 	// Host server
-	
+
 	print '<tr class="oddeven"><td>';
 	if (! $conf->use_javascript_ajax && $linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail')
 	{
@@ -303,7 +303,7 @@ if ($action == 'edit')
 	print '</td></tr>';
 
 	// Port
-	
+
 	print '<tr class="oddeven"><td>';
 	if (! $conf->use_javascript_ajax && $linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail')
 	{
@@ -338,7 +338,7 @@ if ($action == 'edit')
 	// ID
 	if (! empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer'))))
 	{
-		
+
 		$mainstmpid=(! empty($conf->global->MAIN_MAIL_SMTPS_ID)?$conf->global->MAIN_MAIL_SMTPS_ID:'');
 		print '<tr '.$bcdd[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>';
 		// SuperAdministrator access only
@@ -358,7 +358,7 @@ if ($action == 'edit')
 	// PW
 	if (! empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer'))))
 	{
-		
+
 		$mainsmtppw=(! empty($conf->global->MAIN_MAIL_SMTPS_PW)?$conf->global->MAIN_MAIL_SMTPS_PW:'');
 		print '<tr '.$bcdd[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>';
 		// SuperAdministrator access only
@@ -376,7 +376,7 @@ if ($action == 'edit')
 	}
 
 	// TLS
-	
+
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</td><td>';
 	if (! empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer'))))
 	{
@@ -390,7 +390,7 @@ if ($action == 'edit')
 	print '</td></tr>';
 
 	// STARTTLS
-	
+
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_STARTTLS").'</td><td>';
 	if (! empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer'))))
 	{
@@ -404,17 +404,17 @@ if ($action == 'edit')
 	print '</td></tr>';
 
 	// Separator
-	
+
 	print '<tr class="oddeven"><td colspan="2">&nbsp;</td></tr>';
-	
+
 	// From
-	
+
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_FROM",ini_get('sendmail_from')?ini_get('sendmail_from'):$langs->transnoentities("Undefined")).'</td>';
 	print '<td><input class="flat" name="MAIN_MAIL_EMAIL_FROM" size="32" value="' . (! empty($conf->global->MAIN_MAIL_EMAIL_FROM)?$conf->global->MAIN_MAIL_EMAIL_FROM:'');
 	print '"></td></tr>';
 
     // Default from type
-    
+
     $liste = array();
     $liste['user'] = $langs->trans('UserEmail');
     $liste['company'] = $langs->trans('CompanyEmail').' ('.(empty($conf->global->MAIN_INFO_SOCIETE_MAIL)?$langs->trans("NotDefined"):$conf->global->MAIN_INFO_SOCIETE_MAIL).')';
@@ -424,17 +424,17 @@ if ($action == 'edit')
     print '</td></tr>';
 
     // Separator
-    
+
     print '<tr class="oddeven"><td colspan="2">&nbsp;</td></tr>';
-    
+
 	// From
-	
+
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_ERRORS_TO").'</td>';
 	print '<td><input class="flat" name="MAIN_MAIL_ERRORS_TO" size="32" value="' . (! empty($conf->global->MAIN_MAIL_ERRORS_TO)?$conf->global->MAIN_MAIL_ERRORS_TO:'');
 	print '"></td></tr>';
 
 	// Autocopy to
-	
+
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_AUTOCOPY_TO").'</td>';
 	print '<td><input class="flat" name="MAIN_MAIL_AUTOCOPY_TO" size="32" value="' . (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)?$conf->global->MAIN_MAIL_AUTOCOPY_TO:'');
 	print '"></td></tr>';
@@ -442,7 +442,7 @@ if ($action == 'edit')
     print '</table>';
 
     dol_fiche_end();
-    
+
     print '<br><div class="center">';
     print '<input class="button" type="submit" name="save" value="'.$langs->trans("Save").'">';
     print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
@@ -454,26 +454,26 @@ if ($action == 'edit')
 else
 {
     dol_fiche_head($head, 'common', '', -1);
-    
+
     print $langs->trans("EMailsDesc")."<br>\n";
     print "<br>\n";
-    
-    
+
+
 	$var=true;
 
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
 	// Disable
-	
+
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_DISABLE_ALL_MAILS").'</td><td>'.yn($conf->global->MAIN_DISABLE_ALL_MAILS).'</td></tr>';
 
 	// Separator
-	
+
 	print '<tr class="oddeven"><td colspan="2">&nbsp;</td></tr>';
 
 	// Method
-	
+
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td>';
 	$text=$listofmethods[$conf->global->MAIN_MAIL_SENDMODE];
 	if (empty($text)) $text=$langs->trans("Undefined").img_warning();
@@ -481,7 +481,7 @@ else
 	print '</td></tr>';
 
 	// Host server
-	
+
 	if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'mail'))
 	{
 		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike").'</td><td>'.$langs->trans("SeeLocalSendMailSetup").'</td></tr>';
@@ -492,7 +492,7 @@ else
 	}
 
 	// Port
-	
+
 	if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'mail'))
 	{
 		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike").'</td><td>'.$langs->trans("SeeLocalSendMailSetup").'</td></tr>';
@@ -503,21 +503,21 @@ else
 	}
 
 	// SMTPS ID
-	
+
 	if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))
 	{
 		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>'.$conf->global->MAIN_MAIL_SMTPS_ID.'</td></tr>';
 	}
 
 	// SMTPS PW
-	
+
 	if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))
 	{
 		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>'.preg_replace('/./','*',$conf->global->MAIN_MAIL_SMTPS_PW).'</td></tr>';
 	}
 
 	// TLS
-	
+
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</td><td>';
 	if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))
 	{
@@ -531,7 +531,7 @@ else
 	print '</td></tr>';
 
 	// STARTTLS
-	
+
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_STARTTLS").'</td><td>';
 	if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))
 	{
@@ -545,18 +545,18 @@ else
 	print '</td></tr>';
 
 	// Separator
-	
+
 	print '<tr class="oddeven"><td colspan="2">&nbsp;</td></tr>';
 
 	// From
-	
+
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_FROM",ini_get('sendmail_from')?ini_get('sendmail_from'):$langs->transnoentities("Undefined")).'</td>';
 	print '<td>'.$conf->global->MAIN_MAIL_EMAIL_FROM;
 	if (! empty($conf->global->MAIN_MAIL_EMAIL_FROM) && ! isValidEmail($conf->global->MAIN_MAIL_EMAIL_FROM)) print img_warning($langs->trans("ErrorBadEMail"));
 	print '</td></tr>';
 
 	// Default from type
-    
+
     print '<tr '.$bc[$var?1:0].'><td>'.$langs->trans('MAIN_MAIL_DEFAULT_FROMTYPE').'</td>';
     print '<td>';
     if($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE === 'user'){
@@ -567,18 +567,18 @@ else
     print '</td></tr>';
 
 	// Separator
-	
+
 	print '<tr class="oddeven"><td colspan="2">&nbsp;</td></tr>';
 
     // Errors To
-	
+
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_ERRORS_TO").'</td>';
 	print '<td>'.$conf->global->MAIN_MAIL_ERRORS_TO;
 	if (! empty($conf->global->MAIN_MAIL_ERRORS_TO) && ! isValidEmail($conf->global->MAIN_MAIL_ERRORS_TO)) print img_warning($langs->trans("ErrorBadEMail"));
 	print '</td></tr>';
 
 	// Autocopy to
-	
+
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_AUTOCOPY_TO").'</td>';
 	print '<td>';
 	if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO))
@@ -591,12 +591,12 @@ else
 		print '&nbsp;';
 	}
 	print '</td></tr>';
-    
+
 	print '</table>';
 
 	dol_fiche_end();
-	
-	
+
+
     if ($conf->global->MAIN_MAIL_SENDMODE == 'mail' && empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
     {
         print '<br>';
@@ -614,7 +614,7 @@ else
    	    print info_admin($langs->trans("SendmailOptionMayHurtBuggedMTA"));
     }
 
-    
+
 	// Boutons actions
 	print '<div class="tabsAction">';
 
@@ -647,7 +647,7 @@ else
         $text = $langs->trans("WarningPHPMail");
 	    print info_admin($text);
 	}
-	    
+
 	// Run the test to connect
 	if ($action == 'testconnect')
 	{
@@ -673,6 +673,7 @@ else
 	// Show email send test form
 	if ($action == 'test' || $action == 'testhtml')
 	{
+	    print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
 		print load_fiche_titre($action == 'testhtml'?$langs->trans("DoTestSendHTML"):$langs->trans("DoTestSend"));
 
 		// Cree l'objet formulaire mail
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 17d4d066569..8f4deb53edf 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -1010,7 +1010,8 @@ else
 			// Affichage formulaire de TEST
 			if ($action == 'test')
 			{
-				print load_fiche_titre($langs->trans("TestMailing"));
+			    print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
+			    print load_fiche_titre($langs->trans("TestMailing"));
 
 				// Create l'objet formulaire mail
 				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 3e8580d5350..67dbca101f8 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -2281,7 +2281,7 @@ if ($action == 'create')
 				// Send
 				if ($object->statut == Propal::STATUS_VALIDATED || $object->statut == Propal::STATUS_SIGNED) {
 					if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->propal->propal_advance->send) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=presend&amp;mode=init">' . $langs->trans('SendByMail') . '</a></div>';
+						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendByMail') . '</a></div>';
 					} else
 						print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">' . $langs->trans('SendByMail') . '</a></div>';
 				}
@@ -2412,6 +2412,7 @@ if ($action == 'create')
 			$file = $fileparams['fullname'];
 		}
 
+		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
 		print '<div class="clearboth"></div>';
 		print '<br>';
 		print load_fiche_titre($langs->trans('SendPropalByMail'));
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index e2db47a6c9d..83135a8c0f5 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -2443,7 +2443,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 				// Send
 				if ($object->statut > Commande::STATUS_DRAFT) {
 					if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->commande->order_advance->send)) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=presend&amp;mode=init">' . $langs->trans('SendByMail') . '</a></div>';
+						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendByMail') . '</a></div>';
 					} else
 						print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">' . $langs->trans('SendByMail') . '</a></div>';
 				}
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index fa9bdf60dc5..c4bf83293de 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -4071,7 +4071,7 @@ else if ($id > 0 || ! empty($ref))
 					print '<div class="inline-block divButAction"><span class="butActionRefused" title="' . $langs->trans("DisabledBecauseReplacedInvoice") . '">' . $langs->trans('SendByMail') . '</span></div>';
 				} else {
 					if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->facture->invoice_advance->send) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?facid=' . $object->id . '&amp;action=presend&amp;mode=init">' . $langs->trans('SendByMail') . '</a></div>';
+						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?facid=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendByMail') . '</a></div>';
 					} else
 						print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">' . $langs->trans('SendByMail') . '</a></div>';
 				}
@@ -4328,6 +4328,7 @@ else if ($id > 0 || ! empty($ref))
 			$file = $fileparams['fullname'];
 		}
 
+		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
 		print '<div class="clearboth"></div>';
 		print '<br>';
 		print load_fiche_titre($langs->trans($titreform));
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 58b1608f44b..b2ab3bf3cb8 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -2162,6 +2162,7 @@ else
 				$file = $fileparams['fullname'];
 			}
 
+			print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
 			print '<div class="clearboth"></div>';
 			print '<br>';
 			print load_fiche_titre($langs->trans('SendContractByMail'));
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 72044d68fcf..efc64d84396 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -2037,7 +2037,7 @@ else if ($id || $ref)
 			{
 				if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->expedition->shipping_advance->send)
 				{
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=presend&amp;mode=init">'.$langs->trans('SendByMail').'</a>';
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendByMail').'</a>';
 				}
 				else print '<a class="butActionRefused" href="#">'.$langs->trans('SendByMail').'</a>';
 			}
@@ -2162,6 +2162,7 @@ else if ($id || $ref)
 			$file=$fileparams['fullname'];
 		}
 
+		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
 		print '<div class="clearboth"></div>';
 		print '<br>';
 		print load_fiche_titre($langs->trans('SendShippingByEMail'));
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index c084806c4a6..108aaf7a23a 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -1598,7 +1598,7 @@ else if ($id > 0 || ! empty($ref))
 				{
 					if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->ficheinter->ficheinter_advance->send)
 					{
-						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=presend&amp;mode=init">'.$langs->trans('SendByMail').'</a></div>';
+						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendByMail').'</a></div>';
 					}
 					else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">'.$langs->trans('SendByMail').'</a></div>';
 				}
@@ -1753,6 +1753,7 @@ else if ($id > 0 || ! empty($ref))
 			$file=$fileparams['fullname'];
 		}
 
+		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
 		print '<div class="clearboth"></div>';
 		print '<br>';
 		print load_fiche_titre($langs->trans('SendInterventionByMail'));
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index dda4a0d7254..4deca7ea836 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -2174,6 +2174,7 @@ elseif (! empty($object->id))
 			$file=$fileparams['fullname'];
 		}
 
+		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
 		print '<div class="clearboth"></div>';
 		print '<br>';
 		print load_fiche_titre($langs->trans('SendOrderByMail'));
@@ -2572,7 +2573,7 @@ elseif (! empty($object->id))
 				{
 					if ($user->rights->fournisseur->commande->commander)
 					{
-						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=presend&amp;mode=init">'.$langs->trans('SendByMail').'</a>';
+						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendByMail').'</a>';
 					}
 				}
 
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 1078999b89e..db017cc004a 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2660,7 +2660,7 @@ else
 	            {
 	                if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->fournisseur->supplier_invoice_advance->send)
 	                {
-	                    print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=presend&amp;mode=init">'.$langs->trans('SendByMail').'</a></div>';
+	                    print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendByMail').'</a></div>';
 	                }
 	                else print '<div class="inline-block divButAction"><span class="butActionRefused">'.$langs->trans('SendByMail').'</a></div>';
 	            }
@@ -2836,7 +2836,8 @@ else
                 $file=$fileparams['fullname'];
             }
 
-			print '<div class="clearboth"></div>';
+			print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
+            print '<div class="clearboth"></div>';
             print '<br>';
             print load_fiche_titre($langs->trans('SendBillByMail'));
 
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 56e0ea1d3ed..03dfd62f5d3 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -426,6 +426,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
     	if (empty($reshook))
     	{
+    	    // Send
+            print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendByMail') . '</a></div>'."\n";
+
     		if ($user->rights->mymodule->write)
     		{
     			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index e26b4733c84..b5afba996b8 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -2462,7 +2462,9 @@ else
 			$action='send';
 			$modelmail='thirdparty';
 
-			//print '<br>';
+    		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
+    		print '<div class="clearboth"></div>';
+    		print '<br>';
 			print load_fiche_titre($langs->trans($titreform));
 
 			dol_fiche_head();
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 72c9793b40b..d7d967d24b8 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1740,7 +1740,7 @@ if ($action == 'create')
 				// Send
 				if ($object->statut == SupplierProposal::STATUS_VALIDATED || $object->statut == SupplierProposal::STATUS_SIGNED) {
 					if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->supplier_proposal->send_advance) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=presend&amp;mode=init">' . $langs->trans('SendByMail') . '</a></div>';
+						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendByMail') . '</a></div>';
 					} else
 						print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">' . $langs->trans('SendByMail') . '</a></div>';
 				}
@@ -1854,6 +1854,7 @@ if ($action == 'create')
 			$file = $fileparams['fullname'];
 		}
 
+		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
 		print '<div class="clearboth"></div>';
 		print '<br>';
 		print load_fiche_titre($langs->trans('SendAskByMail'));
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 8400a95d370..9d9684371a9 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1669,6 +1669,7 @@ else
                 $action='send';
                 $modelmail='user';
 
+    		    print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
                 print '<div id="presend"></div>';
                 print load_fiche_titre($langs->trans($titreform));
 

From 946e72f269a3ec7aede35fedf42a0c38ecf713fd Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Sun, 11 Jun 2017 12:26:51 +0200
Subject: [PATCH 171/438] Fix 6982 missing parameter to get more informations
 about files

---
 htdocs/core/lib/files.lib.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 7d8f29f7681..a4680ca81e2 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1361,11 +1361,12 @@ function dol_uncompress($inputfile,$outputdir)
  * @param	string		$regexfilter	Regex filter to restrict list. This regex value must be escaped for '/', since this char is used for preg_match function
  * @param	array		$excludefilter  Array of Regex for exclude filter (example: array('(\.meta|_preview\.png)$','^\.')). This regex value must be escaped for '/', since this char is used for preg_match function
  * @param	int			$nohook			Disable all hooks
+ * @param	int			$mode			0=Return array minimum keys loaded (faster), 1=Force all keys like date and size to be loaded (slower), 2=Force load of date only, 3=Force load of size only
  * @return	string						Full path to most recent file
  */
-function dol_most_recent_file($dir,$regexfilter='',$excludefilter=array('(\.meta|_preview\.png)$','^\.'),$nohook=false)
+function dol_most_recent_file($dir,$regexfilter='',$excludefilter=array('(\.meta|_preview\.png)$','^\.'),$nohook=false,$mode='')
 {
-    $tmparray=dol_dir_list($dir,'files',0,$regexfilter,$excludefilter,'date',SORT_DESC,'',$nohook);
+    $tmparray=dol_dir_list($dir,'files',0,$regexfilter,$excludefilter,'date',SORT_DESC,$mode,$nohook);
     return $tmparray[0];
 }
 

From 51579817517c8ef8159702f81cea9a6aa883bb9b Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Sun, 11 Jun 2017 12:59:54 +0200
Subject: [PATCH 172/438] Fix 6962 wrong permission check

---
 htdocs/expedition/card.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 0077338aae5..a7f4043fcd1 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -73,7 +73,12 @@ $ref=GETPOST('ref','alpha');
 // Security check
 $socid='';
 if ($user->societe_id) $socid=$user->societe_id;
-$result=restrictedArea($user, $origin, $origin_id);
+
+if ($origin == 'expedition') $result=restrictedArea($user, $origin, $id);
+else {
+	$result=restrictedArea($user, 'expedition');
+	if (empty($user->rights->{$origin}->lire) && empty($user->rights->{$origin}->read)) accessforbidden();
+}
 
 $action		= GETPOST('action','alpha');
 $confirm	= GETPOST('confirm','alpha');

From 248c5acff29a1662e9ac54dcbee9fc1e480883ea Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jun 2017 16:18:21 +0200
Subject: [PATCH 173/438] Fix remove a FIXME tag.

---
 htdocs/compta/paiement/cheque/list.php        | 44 ++++++-------
 .../compta/paiement/class/paiement.class.php  | 66 ++++++++++---------
 2 files changed, 58 insertions(+), 52 deletions(-)

diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index 63a2884e5bf..aeed72d93d1 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -139,24 +139,14 @@ if ($resql)
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
-	
+
 	print_barre_liste($langs->trans("MenuChequeDeposits"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_bank.png', '', '', $limit);
-	
+
 	$moreforfilter='';
-	
+
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
-    print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"bc.ref","",$param,"",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"dp","",$param,'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Account"),$_SERVER["PHP_SELF"],"ba.label","",$param,"",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("NbOfCheques"),$_SERVER["PHP_SELF"],"bc.nbcheque","",$param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"bc.amount","",$param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"bc.statut","",$param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre('');
-	print "</tr>\n";
-
 	// Lignes des champs de filtre
 	print '<tr class="liste_titre">';
 	print '<td class="liste_titre" align="left">';
@@ -181,15 +171,25 @@ if ($resql)
     print '</td>';
     print "</tr>\n";
 
+    print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"bc.ref","",$param,"",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"dp","",$param,'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Account"),$_SERVER["PHP_SELF"],"ba.label","",$param,"",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("NbOfCheques"),$_SERVER["PHP_SELF"],"bc.nbcheque","",$param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"bc.amount","",$param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"bc.statut","",$param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre('');
+	print "</tr>\n";
+
     if ($num > 0)
     {
     	$var=true;
     	while ($i < min($num,$limit))
     	{
     		$objp = $db->fetch_object($resql);
-    		
+
     		print '<tr class="oddeven">';
-    
+
     		// Num ref cheque
     		print '<td>';
     		$checkdepositstatic->id=$objp->rowid;
@@ -197,29 +197,29 @@ if ($resql)
     		$checkdepositstatic->statut=$objp->statut;
     		print $checkdepositstatic->getNomUrl(1);
     		print '</td>';
-    
+
     		// Date
     		print '<td align="center">'.dol_print_date($db->jdate($objp->dp),'day').'</td>';  // TODO Use date hour
-    
+
     		// Bank
     		print '<td>';
     		if ($objp->bid) print '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries.php?account='.$objp->bid.'">'.img_object($langs->trans("ShowAccount"),'account').' '.$objp->label.'</a>';
     		else print '&nbsp;';
     		print '</td>';
-    
+
     		// Number of cheques
     		print '<td align="right">'.$objp->nbcheque.'</td>';
-    
+
     		// Amount
     		print '<td align="right">'.price($objp->amount).'</td>';
-    
+
     		// Statut
     		print '<td align="right">';
     		print $checkdepositstatic->LibStatut($objp->statut,5);
     		print '</td>';
-    		
+
     		print '<td></td>';
-    		
+
             print "</tr>\n";
     		$i++;
     	}
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index c8d7f4d3759..f4e61380a9c 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -38,7 +38,7 @@ class Paiement extends CommonObject
     public $element='payment';
     public $table_element='paiement';
     public $picto = 'payment';
-    
+
 	var $facid;
 	var $datepaye;
 	/**
@@ -65,7 +65,7 @@ class Paiement extends CommonObject
 	// fk_paiement dans llx_paiement_facture est le rowid du paiement
     var $fk_paiement;    // Type of paiment
 
-    
+
 	/**
 	 *	Constructor
 	 *
@@ -153,14 +153,14 @@ class Paiement extends CommonObject
 
 		$error = 0;
 		$way = $this->getWay();
-		
+
 		$now=dol_now();
-		
+
         // Clean parameters
         $totalamount = 0;
 		$totalamount_converted = 0;
         $atleastonepaymentnotnull = 0;
-		
+
 		if ($way == 'dolibarr')
 		{
 			$amounts = &$this->amounts;
@@ -171,22 +171,22 @@ class Paiement extends CommonObject
 			$amounts = &$this->multicurrency_amounts;
 			$amounts_to_update = &$this->amounts;
 		}
-		
+
 		foreach ($amounts as $key => $value)	// How payment is dispatch
 		{
 			$value_converted = Multicurrency::getAmountConversionFromInvoiceRate($key, $value, $way);
 			$totalamount_converted += $value_converted;
 			$amounts_to_update[$key] = price2num($value_converted, 'MT');
-			
+
 			$newvalue = price2num($value,'MT');
 			$amounts[$key] = $newvalue;
 			$totalamount += $newvalue;
 			if (! empty($newvalue)) $atleastonepaymentnotnull++;
 		}
-		
+
 		$totalamount = price2num($totalamount);
 		$totalamount_converted = price2num($totalamount_converted);
-		
+
 		// Check parameters
         if (empty($totalamount) && empty($atleastonepaymentnotnull))	 // We accept negative amounts for withdraw reject but not empty arrays
         {
@@ -211,7 +211,7 @@ class Paiement extends CommonObject
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."paiement (entity, ref, datec, datep, amount, multicurrency_amount, fk_paiement, num_paiement, note, fk_user_creat)";
 		$sql.= " VALUES (".$conf->entity.", '".$this->ref."', '". $this->db->idate($now)."', '".$this->db->idate($this->datepaye)."', '".$total."', '".$mtotal."', ".$this->paiementid.", '".$this->num_paiement."', '".$this->db->escape($this->note)."', ".$user->id.")";
-		
+
 		dol_syslog(get_class($this)."::Create insert paiement", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -227,7 +227,7 @@ class Paiement extends CommonObject
 					$amount = price2num($amount);
 					$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'paiement_facture (fk_facture, fk_paiement, amount, multicurrency_amount)';
 					$sql .= ' VALUES ('.$facid.', '. $this->id.', \''.$amount.'\', \''.$this->multicurrency_amounts[$key].'\')';
-		
+
 					dol_syslog(get_class($this).'::Create Amount line '.$key.' insert paiement_facture', LOG_DEBUG);
 					$resql=$this->db->query($sql);
 					if ($resql)
@@ -245,21 +245,27 @@ class Paiement extends CommonObject
 
 							//var_dump($invoice->total_ttc.' - '.$paiement.' -'.$creditnotes.' - '.$deposits.' - '.$remaintopay);exit;
 
-                            // If there is withdrawals request to do and not done yet, we wait before closing.
+                            /* Why this ? We can remove i think.
+                            // If there is withdrawals request to do and not done yet on the invoice the payment is on, we wait before closing.
                             $mustwait=0;
+                            $sqlrequest ="SELECT COUNT(rowid) FROM ".MAIN_DB_PREFIX."prelevement_facture_demande";
+                            $sqlrequest.="WHERE fk_facture = ".$invoice->id." AND traite = 0";
+                            ...
+
                             $listofpayments=$invoice->getListOfPayments();
                             foreach($listofpayments as $paym)
                             {
-                                // This payment might be this one or a previous one
+                                // This payment on invoice $invoice might be the one we record or another one
                                 if ($paym['type']=='PRE')
                                 {
                                     if (! empty($conf->prelevement->enabled))
                                     {
-                                        // FIXME Check if this invoice has a withdraw request
                                         // if not, $mustwait++;      // This will disable automatic close on invoice to allow to process
+
                                     }
                                 }
                             }
+                            */
 
                             //Invoice types that are eligible for changing status to paid
 							$affected_types = array(
@@ -272,14 +278,14 @@ class Paiement extends CommonObject
 
                             if (!in_array($invoice->type, $affected_types)) dol_syslog("Invoice ".$facid." is not a standard, nor replacement invoice, nor credit note, nor deposit invoice, nor situation invoice. We do nothing more.");
                             else if ($remaintopay) dol_syslog("Remain to pay for invoice ".$facid." not null. We do nothing more.");
-                            else if ($mustwait) dol_syslog("There is ".$mustwait." differed payment to process, we do nothing more.");
+                            //else if ($mustwait) dol_syslog("There is ".$mustwait." differed payment to process, we do nothing more.");
                             else
                             {
                                 // If invoice is a down payment, we also convert down payment to discount
                                 if ($invoice->type == Facture::TYPE_DEPOSIT)
                                 {
 			                        $amount_ht = $amount_tva = $amount_ttc = array();
-			                         
+
                                     // Loop on each vat rate
                                     $i = 0;
                                     foreach ($invoice->lines as $line)
@@ -292,20 +298,20 @@ class Paiement extends CommonObject
                                             $i ++;
                                         }
                                     }
-                                    
+
                                     // Insert one discount by VAT rate category
                                     $discount = new DiscountAbsolute($this->db);
                                     $discount->description = '(DEPOSIT)';
                                     $discount->fk_soc = $invoice->socid;
                                     $discount->fk_facture_source = $invoice->id;
-                                
+
                                     foreach ($amount_ht as $tva_tx => $xxx)
                                     {
                                         $discount->amount_ht = abs($amount_ht[$tva_tx]);
                                         $discount->amount_tva = abs($amount_tva[$tva_tx]);
                                         $discount->amount_ttc = abs($amount_ttc[$tva_tx]);
                                         $discount->tva_tx = abs($tva_tx);
-                            
+
                                         $result = $discount->create($user);
                                         if ($result < 0)
                                         {
@@ -313,14 +319,14 @@ class Paiement extends CommonObject
                                             break;
                                         }
                                     }
-                                    
+
                                     if ($error)
                                     {
                                         setEventMessages($discount->error, $discount->errors, 'errors');
                                         $error++;
-                                    }                                   
+                                    }
                                 }
-                                
+
                                 // Set invoice to paid
                                 if (! $error)
                                 {
@@ -520,13 +526,13 @@ class Paiement extends CommonObject
 
             $acc = new Account($this->db);
             $result=$acc->fetch($this->fk_account);
-			
+
 			$totalamount=$this->amount;
             if (empty($totalamount)) $totalamount=$this->total; // For backward compatibility
-            
+
             // if dolibarr currency != bank currency then we received an amount in customer currency (currently I don't manage the case : my currency is USD, the customer currency is EUR and he paid me in GBP. Seems no sense for me)
             if (!empty($conf->multicurrency->enabled) && $conf->currency != $acc->currency_code) $totalamount=$this->multicurrency_amount;
-			
+
             if ($mode == 'payment_supplier') $totalamount=-$totalamount;
 
             // Insert payment into llx_bank
@@ -796,7 +802,7 @@ class Paiement extends CommonObject
 
 	/**
 	 *    Information sur l'objet
-	 *    
+	 *
 	 *    @param   int     $id      id du paiement dont il faut afficher les infos
 	 *    @return  void
 	 */
@@ -962,13 +968,13 @@ class Paiement extends CommonObject
 
 	/**
 	 * 	get the right way of payment
-	 * 
+	 *
 	 * 	@return 	string 	'dolibarr' if standard comportment or paid in dolibarr currency, 'customer' if payment received from multicurrency inputs
 	 */
 	function getWay()
 	{
 		global $conf;
-		
+
 		$way = 'dolibarr';
 		if (!empty($conf->multicurrency->enabled))
 		{
@@ -981,10 +987,10 @@ class Paiement extends CommonObject
 				}
 			}
 		}
-		
+
 		return $way;
 	}
-	
+
 	/**
 	 *  Initialise an instance with random values.
 	 *  Used to build previews or test instances.

From ca324346e41e4939d885fc9331611018d5453c5f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jun 2017 19:08:40 +0200
Subject: [PATCH 174/438] Update doc

---
 htdocs/install/mysql/migration/repair.sql | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index c748f38acb3..991212c7d22 100755
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -13,11 +13,12 @@
 -- flush privileges;
 
 
--- Requests to change character set and collation of a column
+-- Requests to change character set and collation of a varchar column.
+-- utf8 and utf8_unicode_ci is recommended (or even better utf8mb4 and utf8mb4_unicode_ci with mysql 5.5.3+)
 
 -- ALTER TABLE llx_accounting_account MODIFY account_number VARCHAR(20) CHARACTER SET utf8;
 -- ALTER TABLE llx_accounting_account MODIFY account_number VARCHAR(20) COLLATE utf8_unicode_ci;
--- You can check with "show full columns from llx_accountingaccount";
+-- You can check with "show full columns from llx_accounting_account";
 
 
 

From 58c4144123d6b472fcebb01e79bc7f2bfd067abd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jun 2017 19:27:07 +0200
Subject: [PATCH 175/438] Fix sort of dictionnary

---
 htdocs/admin/dict.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index f903ce3e8fc..c83a3aa39be 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -502,6 +502,14 @@ $tabfieldcheck[34] = array();
 complete_dictionary_with_modules($taborder,$tabname,$tablib,$tabsql,$tabsqlsort,$tabfield,$tabfieldvalue,$tabfieldinsert,$tabrowid,$tabcond,$tabhelp,$tabfieldcheck);
 
 
+// Defaut sortorder
+if (empty($sortfield))
+{
+    $tmp1 = explode(',',$tabsqlsort[$id]);
+    $tmp2 = explode(' ',$tmp1[0]);
+    $sortfield=preg_replace('/^.*\./', '', $tmp2[0]);
+}
+
 // Define elementList and sourceList (used for dictionary type of contacts "llx_c_type_contact")
 $elementList = array();
 $sourceList=array();
@@ -944,7 +952,8 @@ if ($id)
 
     if (! preg_match('/ WHERE /',$sql)) $sql.= " WHERE 1 = 1";
     if ($search_country_id > 0) $sql.= " AND c.rowid = ".$search_country_id;
-    if ($search_code != '')     $sql.= natural_search("code", $search_code);
+    if ($search_code != '' && $id != 9)     $sql.= natural_search("code", $search_code);
+    if ($search_code != '' && $id == 9)     $sql.= natural_search("code_iso", $search_code);
 
     if ($sortfield)
     {

From b80ee49032ec1c4a097b37515c237ec977d2d838 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jun 2017 19:27:21 +0200
Subject: [PATCH 176/438] Add missing currency for bengladesh

---
 htdocs/install/mysql/data/llx_c_currencies.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/install/mysql/data/llx_c_currencies.sql b/htdocs/install/mysql/data/llx_c_currencies.sql
index 1c9d4b5f8a7..d9b1390bb32 100644
--- a/htdocs/install/mysql/data/llx_c_currencies.sql
+++ b/htdocs/install/mysql/data/llx_c_currencies.sql
@@ -41,6 +41,7 @@ INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'AZN'
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BHD', NULL, 1,					'Bahrain');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BSD', '[36]', 1,				'Bahamas Dollar');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BBD', '[36]', 1,				'Barbados Dollar');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BDT', '[2547]', 1,			    'Bangladeshi Taka');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BYR', '[112,46]', 1,			'Belarus Ruble');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BZD', '[66,90,36]', 1,			'Belize Dollar');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BMD', '[36]', 1,				'Bermuda Dollar');

From 277dde5d618cae0d661ac69c51040224e36b3cda Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Jun 2017 10:25:28 +0200
Subject: [PATCH 177/438] Fix dol_banner

---
 htdocs/cron/card.php                |  85 ++++++++++----------
 htdocs/cron/class/cronjob.class.php | 115 ++++++++++++++--------------
 htdocs/cron/info.php                |  11 +++
 htdocs/langs/en_US/cron.lang        |   4 +-
 4 files changed, 110 insertions(+), 105 deletions(-)

diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index fc89f6eb3cf..a371069d7cf 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -109,9 +109,9 @@ if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->ex
     else
     {
         $now = dol_now();   // Date we start
-        
+
     	$result=$object->run_jobs($user->login);
-    
+
     	if ($result < 0)
     	{
     		setEventMessages($object->error, $object->errors, 'errors');
@@ -155,7 +155,7 @@ if ($action=='add')
 	$object->unitfrequency=GETPOST('unitfrequency','int');
 	$object->frequency=GETPOST('nbfrequency','int');
 	$object->maxrun=GETPOST('maxrun','int');
-	
+
 	// Add cron task
 	$result = $object->create($user);
 
@@ -191,7 +191,7 @@ if ($action=='update')
 	$object->unitfrequency=GETPOST('unitfrequency','int');
 	$object->frequency=GETPOST('nbfrequency','int');
 	$object->maxrun=GETPOST('maxrun','int');
-	
+
 	// Add cron task
 	$result = $object->update($user);
 
@@ -353,7 +353,7 @@ if (($action=="create") || ($action=="edit"))
 
 	print '<tr class="blockmethod"><td>';
 	print $langs->trans('CronClassFile')."</td><td>";
-	print "<input type=\"text\" size=\"20\" name=\"classesname\" value=\"".$object->classesname."\" /> ";
+	print '<input type="text" class="minwidth300" name="classesname" value="'.$object->classesname.'" /> ';
 	print "</td>";
 	print "<td>";
 	print $form->textwithpicto('',$langs->trans("CronClassFileHelp"),1,'help');
@@ -371,7 +371,7 @@ if (($action=="create") || ($action=="edit"))
 
 	print '<tr class="blockmethod"><td>';
 	print $langs->trans('CronMethod')."</td><td>";
-	print "<input type=\"text\" size=\"20\" name=\"methodename\" value=\"".$object->methodename."\" /> ";
+	print '<input type="text" class="minwidth300" name="methodename" value="'.$object->methodename.'" /> ';
 	print "</td>";
 	print "<td>";
 	print $form->textwithpicto('',$langs->trans("CronMethodHelp"),1,'help');
@@ -431,7 +431,7 @@ if (($action=="create") || ($action=="edit"))
 	}
 	$input .= "<label for=\"frequency_minute\">".$langs->trans('Minutes')."</label>";
 	print $input;
-	
+
 	$input = " <input type=\"radio\" name=\"unitfrequency\" value=\"3600\" id=\"frequency_heures\" ";
 	if($object->unitfrequency=="3600"){
 	    $input .= ' checked />';
@@ -441,7 +441,7 @@ if (($action=="create") || ($action=="edit"))
 	}
 	$input .= "<label for=\"frequency_heures\">".$langs->trans('Hours')."</label>";
 	print $input;
-	
+
 	$input = " <input type=\"radio\" name=\"unitfrequency\" value=\"86400\" id=\"frequency_jours\" ";
 	if($object->unitfrequency=="86400"){
 	    $input .= ' checked />';
@@ -451,7 +451,7 @@ if (($action=="create") || ($action=="edit"))
 	}
 	$input .= "<label for=\"frequency_jours\">".$langs->trans('Days')."</label>";
 	print $input;
-	
+
 	$input = " <input type=\"radio\" name=\"unitfrequency\" value=\"604800\" id=\"frequency_semaine\" ";
 	if($object->unitfrequency=="604800"){
 	    $input .= ' checked />';
@@ -465,7 +465,7 @@ if (($action=="create") || ($action=="edit"))
 	print "<td>";
 	print "</td>";
 	print "</tr>\n";
-	
+
 	print "<tr><td>";
 	print $langs->trans('CronDtStart')."</td><td>";
 	if(!empty($object->datestart))
@@ -480,7 +480,7 @@ if (($action=="create") || ($action=="edit"))
 	print "<td>";
 	print "</td>";
 	print "</tr>\n";
-	
+
 	print "<tr><td>";
 	print $langs->trans('CronDtEnd')."</td><td>";
 	if(!empty($object->dateend)){
@@ -493,7 +493,7 @@ if (($action=="create") || ($action=="edit"))
 	print "<td>";
 	print "</td>";
 	print "</tr>\n";
-	
+
 	print "<tr><td>";
 	print $langs->trans('CronPriority')."</td>";
 	$priority=0;
@@ -505,7 +505,7 @@ if (($action=="create") || ($action=="edit"))
 	print "<td>";
 	print "</td>";
 	print "</tr>\n";
-	
+
 	print '<tr><td>';
 	$maxrun='';
 	if (!empty($object->maxrun)) {
@@ -517,7 +517,7 @@ if (($action=="create") || ($action=="edit"))
 	print "<td>";
 	print "</td>";
 	print "</tr>\n";
-	
+
 	print '<tr><td>';
 	print $langs->trans('CronDtNextLaunch');
 	print ' ('.$langs->trans('CronFrom').')';
@@ -529,14 +529,14 @@ if (($action=="create") || ($action=="edit"))
 	else
 	{
 	    $form->select_date(-1,'datenextrun',1,1,'',"cronform");
-	}	
+	}
 	print "</td>";
     print "<td>";
 	print "</td>";
 	print "</tr>";
-	
+
 	print '</table>';
-    
+
 	dol_fiche_end();
 
 	print '<div align="center">';
@@ -554,24 +554,22 @@ else
 	 * view card
 	 */
     $now = dol_now();
-    
+
 	dol_fiche_head($head, 'card', $langs->trans("CronTask"), -1, 'cron');
 
 	$linkback = '<a href="' . DOL_URL_ROOT . '/cron/list.php?status=-2">' . $langs->trans("BackToList") . '</a>';
 
-	// TODO Use dol_banner
-	
+	$morehtmlref='<div class="refidno">';
+	$morehtmlref.='</div>';
+
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
+
 	// box add_jobs_box
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border" width="100%">';
 
 	print '<tr><td class="titlefield">';
-	print $langs->trans('CronId')."</td>";
-	print "<td>".$form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'id', '', '', 0);
-	print "</td></tr>\n";
-
-	print '<tr><td>';
 	print $langs->trans('CronLabel')."</td>";
 	print "<td>".$langs->trans($object->label);
 	print "</td></tr>";
@@ -616,21 +614,16 @@ else
 	print $langs->trans($object->note);
 	print "</td></tr>";
 
-	print '<tr><td>';
-	print $langs->trans('Active')."</td><td>";
-	print $object->getLibStatut(4);
-	print "</td></tr>";
-
 	print '</table>';
     print '</div>';
-    
+
 	print '<br>';
 
-	
+
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border" width="100%">';
-	
+
 	print '<tr><td class="titlefield">';
 	print $langs->trans('CronEvery')."</td>";
 	print "<td>";
@@ -639,33 +632,33 @@ else
 	if($object->unitfrequency == "86400") print $langs->trans('CronEach')." ".($object->frequency)." ".$langs->trans('Days');
 	if($object->unitfrequency == "604800") print $langs->trans('CronEach')." ".($object->frequency)." ".$langs->trans('Weeks');
 	print "</td></tr>";
-	
+
 	print '<tr><td>';
 	print $langs->trans('CronDtStart')."</td><td>";
 	if(!empty($object->datestart)) {print dol_print_date($object->datestart,'dayhoursec');}
 	print "</td></tr>";
-	
+
 	print "<tr><td>";
 	print $langs->trans('CronDtEnd')."</td><td>";
 	if(!empty($object->dateend)) {print dol_print_date($object->dateend,'dayhoursec');}
 	print "</td></tr>";
-	
+
 	print "<tr><td>";
 	print $langs->trans('CronPriority')."</td>";
 	print "<td>".$object->priority;
 	print "</td></tr>";
-	
+
 	print "<tr><td>";
 	print $langs->trans('CronMaxRun')."</td>";
 	print "<td>";
 	print $object->maxrun>0?$object->maxrun:'';
 	print "</td></tr>";
-	
+
 	print "<tr><td>";
 	print $langs->trans('CronNbRun')."</td>";
 	print "<td>".$object->nbrun;
 	print "</td></tr>";
-	
+
 	// Date next run (from)
 	print '<tr><td>';
 	print $langs->trans('CronDtNextLaunch');
@@ -673,18 +666,18 @@ else
 	print "</td><td>";
 	//print '<strong>';
 	if (! $object->status) print $langs->trans("Disabled");
-	elseif (!empty($object->datenextrun)) { print img_picto('','object_calendarday').' '.dol_print_date($object->datenextrun,'dayhoursec');} 
+	elseif (!empty($object->datenextrun)) { print img_picto('','object_calendarday').' '.dol_print_date($object->datenextrun,'dayhoursec');}
 	else {print $langs->trans('CronNone');}
 	//print '</strong>';
 	if ($object->maxnbrun && $object->nbrun >= $object->maxrun) print img_warning($langs->trans("Finished"));
 	if ($object->datenextrun && $object->datenextrun < $now) print img_warning($langs->trans("Late"));
 	print "</td></tr>";
-	
+
 	print '</table>';
 	print '</div>';
-	
+
 	print '<br>';
-	
+
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border" width="100%">';
@@ -711,7 +704,7 @@ else
 
 	print '</table>';
     print '</div>';
-    
+
 	dol_fiche_end();
 
 
@@ -733,7 +726,7 @@ else
 	else {
 		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=execute&id='.$object->id.(empty($conf->global->CRON_KEY)?'':'&securitykey='.$conf->global->CRON_KEY).'">'.$langs->trans("CronExecute").'</a>';
 	}
-	
+
 	if (! $user->rights->cron->create) {
 	    print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("CronStatusActiveBtn").'/'.$langs->trans("CronStatusInactiveBtn").'</a>';
 	} else {
@@ -743,7 +736,7 @@ else
 	        print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=inactive&id='.$object->id.'">'.$langs->trans("CronStatusInactiveBtn").'</a>';
 	    }
 	}
-	
+
 	if (! $user->rights->cron->delete) {
 		print '<a class="butActionDeleteRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("Delete").'</a>';
 	} else {
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index 9d01ec888f0..f9b4ac67f03 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -30,36 +30,37 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
  */
 class Cronjob extends CommonObject
 {
-	var $element='cronjob';			//!< Id that identify managed objects
-	var $table_element='cronjob';		//!< Name of table without prefix where object is stored
+	public $element='cronjob';			//!< Id that identify managed objects
+	public $table_element='cronjob';		//!< Name of table without prefix where object is stored
+    public $picto = 'cron';
 
-    var $jobtype;
-	var $tms='';
-	var $datec='';
-	var $label;
-	var $command;
-	var $classesname;
-	var $objectname;
-	var $methodename;
-	var $params;
-	var $md5params;
-	var $module_name;
-	var $priority;
-	var $datelastrun='';
-	var $datenextrun='';
-	var $dateend='';
-	var $datestart='';
-	var $datelastresult='';
-	var $lastresult;
-	var $lastoutput;
-	var $unitfrequency;
-	var $frequency;
-	var $status;
-	var $processing;
-	var $fk_user_author;
-	var $fk_user_mod;
-	var $nbrun;
-	var $libname;
+    public $jobtype;
+	public $tms='';
+	public $datec='';
+	public $label;
+	public $command;
+	public $classesname;
+	public $objectname;
+	public $methodename;
+	public $params;
+	public $md5params;
+	public $module_name;
+	public $priority;
+	public $datelastrun='';
+	public $datenextrun='';
+	public $dateend='';
+	public $datestart='';
+	public $datelastresult='';
+	public $lastresult;
+	public $lastoutput;
+	public $unitfrequency;
+	public $frequency;
+	public $status;
+	public $processing;
+	public $fk_user_author;
+	public $fk_user_mod;
+	public $nbrun;
+	public $libname;
 
 
     /**
@@ -1265,35 +1266,35 @@ class Cronjob extends CommonObject
 class Cronjobline
 {
 
-	var $id;
-	var $ref;
+	public $id;
+	public $ref;
 
-	var $tms='';
-	var $datec='';
-	var $label;
-	var $jobtype;
-	var $command;
-	var $classesname;
-	var $objectname;
-	var $methodename;
-	var $params;
-	var $md5params;
-	var $module_name;
-	var $priority;
-	var $datelastrun='';
-	var $datenextrun='';
-	var $dateend='';
-	var $datestart='';
-	var $lastresult='';
-	var $lastoutput;
-	var $unitfrequency;
-	var $frequency;
-	var $status;
-	var $fk_user_author;
-	var $fk_user_mod;
-	var $note;
-	var $nbrun;
-	var $libname;
+	public $tms='';
+	public $datec='';
+	public $label;
+	public $jobtype;
+	public $command;
+	public $classesname;
+	public $objectname;
+	public $methodename;
+	public $params;
+	public $md5params;
+	public $module_name;
+	public $priority;
+	public $datelastrun='';
+	public $datenextrun='';
+	public $dateend='';
+	public $datestart='';
+	public $lastresult='';
+	public $lastoutput;
+	public $unitfrequency;
+	public $frequency;
+	public $status;
+	public $fk_user_author;
+	public $fk_user_mod;
+	public $note;
+	public $nbrun;
+	public $libname;
 
 	/**
 	 *  Constructor
diff --git a/htdocs/cron/info.php b/htdocs/cron/info.php
index 18ab50adeaa..d3365abb90b 100644
--- a/htdocs/cron/info.php
+++ b/htdocs/cron/info.php
@@ -50,6 +50,17 @@ $head = cron_prepare_head($object);
 
 dol_fiche_head($head, 'info', $langs->trans("CronTask"), -1, 'cron');
 
+$linkback = '<a href="' . DOL_URL_ROOT . '/cron/list.php?status=-2">' . $langs->trans("BackToList") . '</a>';
+
+$morehtmlref='<div class="refidno">';
+$morehtmlref.='</div>';
+
+dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
+
+print '<div class="underbanner clearboth"></div>';
+
+print '<br>';
+
 print '<table width="100%"><tr><td>';
 dol_print_object_info($object);
 print '</td></tr></table>';
diff --git a/htdocs/langs/en_US/cron.lang b/htdocs/langs/en_US/cron.lang
index a1d3c6a9986..8eb03114c64 100644
--- a/htdocs/langs/en_US/cron.lang
+++ b/htdocs/langs/en_US/cron.lang
@@ -57,9 +57,9 @@ CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
-CronClassFile=Classes (filename.class.php)
+CronClassFile=Filename with class
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
-CronClassFileHelp=The file name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product.class.php</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
 CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
 CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
 CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>

From 0312d2479d58124e4942ce1c29ce027b1904e5c0 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Mon, 12 Jun 2017 10:26:24 +0200
Subject: [PATCH 178/438] add block info popin, translation, hidden authority
 feature

---
 htdocs/blockedlog/admin/blockedlog.php        | 28 ++++-----
 htdocs/blockedlog/admin/fingerprints.php      | 61 +++++++++++++++++--
 htdocs/blockedlog/ajax/block-info.php         | 15 +++++
 htdocs/blockedlog/class/authority.class.php   |  2 +-
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  2 +-
 .../install/mysql/tables/llx_blockedlog.sql   |  2 +-
 htdocs/langs/en_US/blockedlog.lang            | 16 +++++
 7 files changed, 104 insertions(+), 22 deletions(-)
 create mode 100644 htdocs/blockedlog/ajax/block-info.php
 create mode 100644 htdocs/langs/en_US/blockedlog.lang

diff --git a/htdocs/blockedlog/admin/blockedlog.php b/htdocs/blockedlog/admin/blockedlog.php
index 3c143b70b83..f77c6e9edd8 100644
--- a/htdocs/blockedlog/admin/blockedlog.php
+++ b/htdocs/blockedlog/admin/blockedlog.php
@@ -101,20 +101,20 @@ print $block_static->getSignature();
 
 print '</td></tr>';
 
-
-// Example with a yes / no select
-$var=!$var;
-print '<tr '.$bc[$var].'>';
-print '<td>'.$langs->trans("BlockedLogAuthorityUrl").img_info($langs->trans('BlockedLogAuthorityNeededToStoreYouFingerprintsInNonAlterableRemote')).'</td>';
-print '<td align="right" width="300">';
-print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="set_BLOCKEDLOG_AUTHORITY_URL">';
-print '<input type="text" name="BLOCKEDLOG_AUTHORITY_URL" value="'.$conf->global->BLOCKEDLOG_AUTHORITY_URL.'" size="40" />';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-print '</form>';
-print '</td></tr>';
-
+if(!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY)) {
+	// Example with a yes / no select
+	$var=!$var;
+	print '<tr '.$bc[$var].'>';
+	print '<td>'.$langs->trans("BlockedLogAuthorityUrl").img_info($langs->trans('BlockedLogAuthorityNeededToStoreYouFingerprintsInNonAlterableRemote')).'</td>';
+	print '<td align="right" width="300">';
+	print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="set_BLOCKEDLOG_AUTHORITY_URL">';
+	print '<input type="text" name="BLOCKEDLOG_AUTHORITY_URL" value="'.$conf->global->BLOCKEDLOG_AUTHORITY_URL.'" size="40" />';
+	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+	print '</form>';
+	print '</td></tr>';
+}
 
 print '</table>';
 
diff --git a/htdocs/blockedlog/admin/fingerprints.php b/htdocs/blockedlog/admin/fingerprints.php
index 29cd2a3f73b..95117bf2c28 100644
--- a/htdocs/blockedlog/admin/fingerprints.php
+++ b/htdocs/blockedlog/admin/fingerprints.php
@@ -74,7 +74,7 @@ print $langs->trans("FingerprintsDesc")."<br>\n";
 
 print '<br>';
 
-echo '<div align="right"><a href="?all=1">'.$langs->trans('ShowAllFingerPrintsMightBeTooLong').'</a> <a href="?action=downloadblockchain">'.$langs->trans('DownloadBlockChain').'</a></div>';
+echo '<div align="right"><a href="?all=1">'.$langs->trans('ShowAllFingerPrintsMightBeTooLong').'</a> | <a href="?action=downloadblockchain">'.$langs->trans('DownloadBlockChain').'</a></div>';
 		
 
 print '<table class="noborder" width="100%">';
@@ -97,15 +97,16 @@ foreach($blocks as &$block) {
    	print '<td>'.dol_print_date($block->tms,'dayhour').'</td>';
    	print '<td>'.$block->ref_object.'</td>';
    	print '<td>'.$langs->trans('log'.$block->action).'</td>';
-   	print '<td>'.$block->getObject().'</td>';
+   	print '<td>'.$block->getObject().'<a href="#" blockid="'.$block->id.'" rel="show-info">'.img_info($langs->trans('ShowDetails')).'</a></td>';
    	print '<td align="right">'.price($block->amounts).'</td>';
    	print '<td>'.$block->getUser().'</td>';
    	print '<td>'.$block->signature.'</td>';
    	print '<td>';
    	
-   	print $block->checkSignature() ? img_picto('OkCheckPaymentValidity', 'on') : img_picto($langs->trans('KoCheckPaymentValidity'), 'off');
-   	print ' '.($block->certified ? img_picto($langs->trans('AddedByAuthority'), 'info') :  img_picto($langs->trans('NotAddedByAuthorityYet'), 'info_black') );
-
+   	print $block->checkSignature() ? img_picto($langs->trans('OkCheckFingerprintValidity'), 'on') : img_picto($langs->trans('KoCheckFingerprintValidity'), 'off');
+   	if(!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY) && !empty($conf->global->BLOCKEDLOG_AUTHORITY_URL)) {
+   		print ' '.($block->certified ? img_picto($langs->trans('AddedByAuthority'), 'info') :  img_picto($langs->trans('NotAddedByAuthorityYet'), 'info_black') );
+   	}
 	print '</td>';
 	print '</tr>';
 					
@@ -113,6 +114,54 @@ foreach($blocks as &$block) {
 
 print '</table>';
 
+?>
+<script type="text/javascript">
+$('a[rel=show-info]').click(function() {
+
+	$pop = $('<div id="pop-info"><table width="100%" class="border"><thead><th width="25%"><?php echo $langs->trans('Field') ?></th><th><?php echo $langs->trans('Value') ?></th></thead><tbody></tbody></table></div>');
+	
+	$pop.dialog({
+		title:"<?php echo $langs->trans('BlockedlogInfoDialog'); ?>"
+		,modal:true
+		,width:'80%'
+	});
+
+	var fk_block = $(this).attr("blockid");
+	
+	$.ajax({
+		url:"../ajax/block-info.php?id="+fk_block
+		,dataType:'json'
+	}).done(function(data) {
+
+		drawData(data,'');
+		
+	});
+	
+});
+
+function drawData(data, prefix) {
+
+	for(x in data) {
+
+		value = data[x];
+
+		$('#pop-info table tbody').append('<tr><td>'+prefix+x+'</td><td>'+value+'</td></tr>');
+		
+		if( (typeof value === "object") && (value !== null) ) {
+			drawData(value, prefix+x+' &gt;&gt; ');
+		}
+
+	}
+	
+}
+
+</script>
+
+<?php 
+
+
+if(!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY) && !empty($conf->global->BLOCKEDLOG_AUTHORITY_URL)) {
+
 ?>
 				<script type="text/javascript">
 					
@@ -134,6 +183,8 @@ print '</table>';
 				
 <?php
 
+}
+
 dol_fiche_end();
 
 print '<br><br>';
diff --git a/htdocs/blockedlog/ajax/block-info.php b/htdocs/blockedlog/ajax/block-info.php
new file mode 100644
index 00000000000..7a5f531e8f1
--- /dev/null
+++ b/htdocs/blockedlog/ajax/block-info.php
@@ -0,0 +1,15 @@
+<?php
+
+	require '../../main.inc.php';
+	require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
+	
+	$id = GETPOST('id');
+	
+	$block = new BlockedLog($db);
+	if($block->fetch($id)>0) {
+		echo json_encode($block->object_data);
+	}
+	else {
+		echo json_encode(false);
+	}
+	
\ No newline at end of file
diff --git a/htdocs/blockedlog/class/authority.class.php b/htdocs/blockedlog/class/authority.class.php
index b422fb130d7..707e3b1b172 100644
--- a/htdocs/blockedlog/class/authority.class.php
+++ b/htdocs/blockedlog/class/authority.class.php
@@ -294,7 +294,7 @@ class BlockedLogAuthority
 		
 		//TODO create cron task on activation
 		
-		if(empty($conf->global->BLOCKEDLOG_AUTHORITY_URL)) {
+		if(empty($conf->global->BLOCKEDLOG_AUTHORITY_URL) || empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY)) {
 			$this->error = $langs->trans('NoAuthorityURLDefined');
 			return -2;
 		}
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 0f9ef8ee3ca..07fb37597c3 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -409,7 +409,7 @@ CREATE TABLE llx_blockedlog
 	date_object	datetime,
 	object_data	text,
 	fk_user	integer,
-	entity integer DEFAULT 1, 
+	entity integer DEFAULT 1 NOT NULL, 
 	certified integer
 ) ENGINE=innodb;
 
diff --git a/htdocs/install/mysql/tables/llx_blockedlog.sql b/htdocs/install/mysql/tables/llx_blockedlog.sql
index afc0f0d4375..ae696a0d6d1 100644
--- a/htdocs/install/mysql/tables/llx_blockedlog.sql
+++ b/htdocs/install/mysql/tables/llx_blockedlog.sql
@@ -13,7 +13,7 @@ CREATE TABLE llx_blockedlog
 	date_object	datetime,
 	object_data	text,
 	fk_user	integer,
-	entity integer DEFAULT 1, 
+	entity integer DEFAULT 1 NOT NULL, 
 	certified integer
 ) ENGINE=innodb;
 
diff --git a/htdocs/langs/en_US/blockedlog.lang b/htdocs/langs/en_US/blockedlog.lang
new file mode 100644
index 00000000000..995801292a3
--- /dev/null
+++ b/htdocs/langs/en_US/blockedlog.lang
@@ -0,0 +1,16 @@
+Field=Field
+BlockedLogDesc=This module store event for invoice and payments as block chain
+FingerprintsDesc=All fingerprints stored
+EntityKey=Entity Key
+ShowAllFingerPrintsMightBeTooLong=Show all fingerprints (might be long)
+DownloadBlockChain=Download fingerprints
+KoCheckFingerprintValidity=Fingerprint is not valid
+OkCheckFingerprintValidity=Fingerprint is valid
+AddedByAuthority=Stored into remote authority
+NotAddedByAuthorityYet=Not yet stored into remote authority
+ShowDetails=Show stored details
+logPAYMENT_ADD_TO_BANK=Payment added to bank
+logPAYMENT_CUSTOMER_CREATE=Payment of customer created
+logBILL_PAYED=Customer bill payed
+logBILL_UNPAYED=Customer bill set unpayed
+logBILL_VALIDATE=Customer bill set valid from draft

From 6d130351a0c82612f69b93fa7d8cbee4e24f0193 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Jun 2017 11:32:10 +0200
Subject: [PATCH 179/438] Fix css

---
 htdocs/core/lib/functions.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 44670d7a5c1..3ed597d50e5 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1069,14 +1069,14 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
         if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
             $morehtmlstatus.=ajax_object_onoff($object, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell');
         } else {
-            $morehtmlstatus.=$object->getLibStatut(5,0);
+            $morehtmlstatus.='<span class="statusrefsell">'.$object->getLibStatut(5,0).'</span>';
         }
         $morehtmlstatus.=' &nbsp; ';
         //$morehtmlstatus.=$langs->trans("Status").' ('.$langs->trans("Buy").') ';
 	    if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
             $morehtmlstatus.=ajax_object_onoff($object, 'status_buy', 'tobuy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');
         } else {
-            $morehtmlstatus.=$object->getLibStatut(5,1);
+            $morehtmlstatus.='<span class="statusrefbuy">'.$object->getLibStatut(5,1).'</span>';
         }
 	}
 	elseif ($object->element == 'facture' || $object->element == 'invoice' || $object->element == 'invoice_supplier')

From 98708acf576cdf9245b412456fe6b541614f199e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Jun 2017 11:41:16 +0200
Subject: [PATCH 180/438] Fix bad name of css file

---
 .../modulebuilder/template/css/mycss.css.php  | 25 -------
 .../template/css/mymodule.css.php             | 66 +++++++++++++++++++
 2 files changed, 66 insertions(+), 25 deletions(-)
 delete mode 100644 htdocs/modulebuilder/template/css/mycss.css.php
 create mode 100644 htdocs/modulebuilder/template/css/mymodule.css.php

diff --git a/htdocs/modulebuilder/template/css/mycss.css.php b/htdocs/modulebuilder/template/css/mycss.css.php
deleted file mode 100644
index 60d49d7c0bc..00000000000
--- a/htdocs/modulebuilder/template/css/mycss.css.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/* <one line to give the program's name and a brief idea of what it does.>
- * Copyright (C) <year>  <name of author>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file    htdocs/modulebuilder/template/css/mycss.css.php
- * \ingroup mymodule
- * \brief   CSS file for module MyModule.
- */
-
-header('Content-Type: text/css');
diff --git a/htdocs/modulebuilder/template/css/mymodule.css.php b/htdocs/modulebuilder/template/css/mymodule.css.php
new file mode 100644
index 00000000000..0dbfae5b9ef
--- /dev/null
+++ b/htdocs/modulebuilder/template/css/mymodule.css.php
@@ -0,0 +1,66 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <year>  <name of author>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    htdocs/modulebuilder/template/css/mymodule.css.php
+ * \ingroup mymodule
+ * \brief   CSS file for module MyModule.
+ */
+
+//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');	// Not disabled because need to load personalized language
+//if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');	// Not disabled to increase speed. Language code is found on url.
+if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC','1');
+//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');	// Not disabled because need to do translations
+if (! defined('NOCSRFCHECK'))     define('NOCSRFCHECK',1);
+if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL',1);
+if (! defined('NOLOGIN'))         define('NOLOGIN',1);          // File must be accessed by logon page so without login
+//if (! defined('NOREQUIREMENU'))   define('NOREQUIREMENU',1);  // We need top menu content
+if (! defined('NOREQUIREHTML'))   define('NOREQUIREHTML',1);
+if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX','1');
+
+
+session_cache_limiter(FALSE);
+
+$res=0;
+if (! $res && ! empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res=@include($_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php");
+if (! $res && file_exists("../../main.inc.php")) $res=@include("../../main.inc.php");
+if (! $res && file_exists("../../../main.inc.php")) $res=@include("../../../main.inc.php");
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
+// Load user to have $user->conf loaded (not done into main because of NOLOGIN constant defined) and load permission if we need to use them in CSS
+/*if (empty($user->id) && ! empty($_SESSION['dol_login']))
+{
+    $user->fetch('',$_SESSION['dol_login']);
+	$user->getrights();
+}*/
+
+
+// Define css type
+header('Content-type: text/css');
+// Important: Following code is to cache this file to avoid page request by browser at each Dolibarr page access.
+// You can use CTRL+F5 to refresh your browser cache.
+if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
+else header('Cache-Control: no-cache');
+
+?>
+
+.myclasscss {
+	/* ... */
+}
+
+

From 8f7371cdf0f6b7e8a286a783673f847daeac6706 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Jun 2017 12:24:42 +0200
Subject: [PATCH 181/438] Product has 2 status. Add span to differentiate for
 css

---
 htdocs/core/boxes/box_produits.php              |  6 ++++--
 htdocs/core/boxes/box_produits_alerte_stock.php | 17 ++++++++++++-----
 htdocs/product/index.php                        |  8 ++++----
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index c495c83f867..7ea5b8aec58 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -162,12 +162,14 @@ class box_produits extends ModeleBoxes
 
 					$this->info_box_contents[$line][] = array(
                         'td' => 'align="right" width="18"',
-                        'text' => $productstatic->LibStatut($objp->tosell,3,0),
+                        'text' => '<span class="statusrefsell">'.$productstatic->LibStatut($objp->tosell,3,0).'<span>',
+					    'asis' => 1
                     );
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'align="right" width="18"',
-                        'text' => $productstatic->LibStatut($objp->tobuy,3,1),
+                        'text' => '<span class="statusrefbuy">'.$productstatic->LibStatut($objp->tobuy,3,1).'</span>',
+					    'asis' => 1
                     );
 
                     $line++;
diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
index c8c856684af..8a6044583d5 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -164,15 +164,22 @@ class box_produits_alerte_stock extends ModeleBoxes
                         'text' => $price_base_type,
                     );
 
-					$this->info_box_contents[$line][] = array('td' => 'align="center"',
+					$this->info_box_contents[$line][] = array(
+					    'td' => 'align="center"',
                     'text' => $objp->total_stock . ' / '.$objp->seuil_stock_alerte,
 					'text2'=>img_warning($langs->transnoentitiesnoconv("StockLowerThanLimit")));
 
-					$this->info_box_contents[$line][] = array('td' => 'align="right" width="18"',
-                    'text' => $productstatic->LibStatut($objp->tosell,3,0));
+					$this->info_box_contents[$line][] = array(
+					    'td' => 'align="right" width="18"',
+                        'text' => '<span class="statusrefsell">'.$productstatic->LibStatut($objp->tosell,3,0).'<span>',
+					    'asis' => 1
+					);
 
-                    $this->info_box_contents[$line][] = array('td' => 'align="right" width="18"',
-                    'text' => $productstatic->LibStatut($objp->tobuy,3,1));
+                    $this->info_box_contents[$line][] = array(
+                        'td' => 'align="right" width="18"',
+                        'text' => '<span class="statusrefbuy">'.$productstatic->LibStatut($objp->tobuy,3,0).'<span>',
+                        'asis' => 1
+                    );
 
                     $line++;
                 }
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index c882390a56a..981ba71e72d 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -335,12 +335,12 @@ if ($result)
     			else print price($objp->price).' '.$langs->trans("HT");
     			print '</td>';
 			}
-			print '<td align="right" class="nowrap">';
+			print '<td align="right" class="nowrap"><span class="statusrefsell">';
 			print $product_static->LibStatut($objp->tosell,5,0);
-			print "</td>";
-            print '<td align="right" class="nowrap">';
+			print "</span></td>";
+            print '<td align="right" class="nowrap"><span class="statusrefbuy">';
             print $product_static->LibStatut($objp->tobuy,5,1);
-            print "</td>";
+            print "</span></td>";
 			print "</tr>\n";
 			$i++;
 		}

From cd0869064650d17d514a7b78c8ee11061d475de4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Jun 2017 12:42:06 +0200
Subject: [PATCH 182/438] Fix ajax search product that return bad json response

---
 htdocs/product/ajax/products.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index 0510299fbd7..15541016963 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -160,7 +160,7 @@ if (! empty($action) && $action == 'fetch' && ! empty($id))
 	}
 
 	echo json_encode($outjson);
-} 
+}
 else
 {
 	require_once DOL_DOCUMENT_ROOT . '/core/class/html.form.class.php';
@@ -171,17 +171,23 @@ else
 	top_httphead();
 
 	if (empty($htmlname))
-		return;
+	{
+		print json_encode(array());
+	    return;
+	}
 
 	$match = preg_grep('/(' . $htmlname . '[0-9]+)/', array_keys($_GET));
 	sort($match);
 
 	$idprod = (! empty($match[0]) ? $match[0] : '');
-	
-	if (! GETPOST($htmlname) && ! GETPOST($idprod))
-		return;
 
-		// When used from jQuery, the search term is added as GET param "term".
+	if (GETPOST($htmlname) == '' && ! GETPOST($idprod))
+	{
+		print json_encode(array());
+	    return;
+	}
+
+	// When used from jQuery, the search term is added as GET param "term".
 	$searchkey = (GETPOST($idprod) ? GETPOST($idprod) : (GETPOST($htmlname) ? GETPOST($htmlname) : ''));
 
 	$form = new Form($db);

From ec24f223b5f137c30ea1f1672f64c60ce75bf9a2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Jun 2017 12:55:57 +0200
Subject: [PATCH 183/438] Fix permission on widget

---
 htdocs/core/boxes/box_produits_alerte_stock.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
index 8a6044583d5..50a4abd320a 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -64,7 +64,7 @@ class box_produits_alerte_stock extends ModeleBoxes
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleProductsAlertStock",$max));
 
-		if ($user->rights->produit->lire || $user->rights->service->lire)
+		if (($user->rights->produit->lire || $user->rights->service->lire) && $user->rights->stock->lire)
 		{
 			$sql = "SELECT p.rowid, p.label, p.price, p.ref, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.seuil_stock_alerte, p.entity,";
 			$sql.= " SUM(".$db->ifsql("s.reel IS NULL","0","s.reel").") as total_stock";

From 8f383e3fa1011d42df7ff1621a647ae49e043e53 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Jun 2017 14:12:40 +0200
Subject: [PATCH 184/438] Fix template

---
 htdocs/modulebuilder/template/core/boxes/mybox.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/modulebuilder/template/core/boxes/mybox.php b/htdocs/modulebuilder/template/core/boxes/mybox.php
index 4fcdd69ae26..7200d07559a 100644
--- a/htdocs/modulebuilder/template/core/boxes/mybox.php
+++ b/htdocs/modulebuilder/template/core/boxes/mybox.php
@@ -84,7 +84,7 @@ class MyBox extends ModeleBoxes
 	 */
 	public function __construct(DoliDB $db, $param = '')
 	{
-		global $langs;
+		global $user, $conf, $langs;
 		$langs->load("boxes");
 		$langs->load('mymodule@mymodule');
 
@@ -93,6 +93,9 @@ class MyBox extends ModeleBoxes
 		$this->boxlabel = $langs->transnoentitiesnoconv("MyBox");
 
 		$this->param = $param;
+
+		//$this->enabled = $conf->global->FEATURES_LEVEL > 0;         // Condition when module is enabled or not
+		//$this->hidden = ! ($user->rights->mymodule->myobject->read);   // Condition when module is visible by user (test on permission)
 	}
 
 	/**

From bf41056c68d879aac5f6196f7ca85e9099d7c274 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Jun 2017 14:09:00 +0200
Subject: [PATCH 185/438] Fix test on permission for widgets

---
 htdocs/core/boxes/box_actions.php             | 19 ++++++++++++--
 htdocs/core/boxes/box_activity.php            | 16 ++++++++----
 htdocs/core/boxes/box_bookmarks.php           | 19 ++++++++++++--
 htdocs/core/boxes/box_clients.php             |  6 +++--
 htdocs/core/boxes/box_commandes.php           | 19 ++++++++++++--
 htdocs/core/boxes/box_comptes.php             |  6 +++--
 htdocs/core/boxes/box_contacts.php            | 19 ++++++++++++--
 htdocs/core/boxes/box_contracts.php           | 19 ++++++++++++--
 htdocs/core/boxes/box_external_rss.php        |  4 +--
 htdocs/core/boxes/box_factures.php            | 19 ++++++++++++--
 htdocs/core/boxes/box_factures_fourn.php      | 19 ++++++++++++--
 htdocs/core/boxes/box_factures_fourn_imp.php  | 19 ++++++++++++--
 htdocs/core/boxes/box_factures_imp.php        | 19 ++++++++++++--
 htdocs/core/boxes/box_ficheinter.php          | 19 ++++++++++++--
 htdocs/core/boxes/box_fournisseurs.php        | 19 ++++++++++++--
 htdocs/core/boxes/box_goodcustomers.php       |  8 +++---
 .../boxes/box_graph_invoices_permonth.php     | 10 +++++---
 .../box_graph_invoices_supplier_permonth.php  |  8 +++---
 .../core/boxes/box_graph_orders_permonth.php  |  8 +++---
 .../box_graph_orders_supplier_permonth.php    |  8 +++---
 .../boxes/box_graph_product_distribution.php  | 20 +++++++++------
 .../boxes/box_graph_propales_permonth.php     | 10 +++++---
 htdocs/core/boxes/box_members.php             |  6 +++--
 htdocs/core/boxes/box_produits.php            | 19 ++++++++++++--
 .../core/boxes/box_produits_alerte_stock.php  | 19 ++++++++++++--
 htdocs/core/boxes/box_project.php             | 20 ++++++++-------
 htdocs/core/boxes/box_propales.php            | 19 ++++++++++++--
 htdocs/core/boxes/box_prospect.php            |  6 +++--
 htdocs/core/boxes/box_services_contracts.php  | 19 ++++++++++++--
 htdocs/core/boxes/box_services_expired.php    | 21 +++++++++++++---
 htdocs/core/boxes/box_supplier_orders.php     | 19 ++++++++++++--
 htdocs/core/boxes/box_task.php                |  9 ++++---
 htdocs/core/boxes/modules_boxes.php           | 25 ++++++++++++-------
 htdocs/core/class/html.formother.class.php    | 18 ++++++-------
 htdocs/core/class/infobox.class.php           |  7 +++---
 35 files changed, 410 insertions(+), 110 deletions(-)

diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php
index 973738fec11..096786c0ffa 100644
--- a/htdocs/core/boxes/box_actions.php
+++ b/htdocs/core/boxes/box_actions.php
@@ -44,6 +44,21 @@ class box_actions extends ModeleBoxes
 	var $info_box_contents = array();
 
 
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB	$db      	Database handler
+	 *  @param	string	$param		More parameters
+	 */
+	function __construct($db,$param='')
+	{
+	    global $user;
+
+	    $this->db = $db;
+
+	    $this->hidden = ! ($user->rights->agenda->myactions->read);
+	}
+
 	/**
      *  Load data for box to show them later
      *
@@ -173,8 +188,8 @@ class box_actions extends ModeleBoxes
     function showBox($head = null, $contents = null, $nooutput=0)
     {
 		global $langs, $conf;
-		parent::showBox($this->info_box_head, $this->info_box_contents);
-		$out='';
+		$out = parent::showBox($this->info_box_head, $this->info_box_contents);
+
         if (! empty($conf->global->SHOW_DIALOG_HOMEPAGE))
         {
 			$actioncejour=false;
diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php
index 34666507488..a7d54f3554a 100644
--- a/htdocs/core/boxes/box_activity.php
+++ b/htdocs/core/boxes/box_activity.php
@@ -51,11 +51,17 @@ class box_activity extends ModeleBoxes
      */
     function __construct($db,$param)
     {
-        global $conf;
+        global $conf, $user;
 
         $this->db=$db;
+
         // FIXME: Pb into some status
-        $this->enabled=$conf->global->MAIN_FEATURES_LEVEL;  // Not enabled by default due to bugs (see previous comments)
+        $this->enabled=($conf->global->MAIN_FEATURES_LEVEL);    // Not enabled by default due to bugs (see previous comments)
+
+        $this->hidden= ! ((! empty($conf->facture->enabled) && $user->rights->facture->lire)
+            || (! empty($conf->commande->enabled) && $user->rights->commande->lire)
+            || (! empty($conf->propal->enabled) && $user->rights->propale->lire)
+            );
     }
 
     /**
@@ -352,7 +358,7 @@ class box_activity extends ModeleBoxes
         }
 
         // list the summary of the propals
-        if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
+        if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
         {
             include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
             $propalstatic=new Propal($db);
@@ -456,10 +462,10 @@ class box_activity extends ModeleBoxes
 	 *	@param	array	$head       Array with properties of box title
 	 *	@param  array	$contents   Array with properties of box lines
 	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	void
+	 *	@return	string
 	 */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_bookmarks.php b/htdocs/core/boxes/box_bookmarks.php
index e99a0b30387..92a2313d8e4 100644
--- a/htdocs/core/boxes/box_bookmarks.php
+++ b/htdocs/core/boxes/box_bookmarks.php
@@ -40,6 +40,21 @@ class box_bookmarks extends ModeleBoxes
 	var $info_box_contents = array();
 
 
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	function __construct($db,$param)
+	{
+	    global $user;
+
+	    $this->db=$db;
+
+	    $this->hidden=! ($user->rights->bookmark->lire);
+	}
+
 	/**
      *  Load data for box to show them later
      *
@@ -136,11 +151,11 @@ class box_bookmarks extends ModeleBoxes
 	 *	@param	array	$head       Array with properties of box title
 	 *	@param  array	$contents   Array with properties of box lines
 	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	void
+	 *	@return	string
 	 */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 
 }
diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php
index 307dcc7cbfd..e6cd2ede39e 100644
--- a/htdocs/core/boxes/box_clients.php
+++ b/htdocs/core/boxes/box_clients.php
@@ -58,6 +58,8 @@ class box_clients extends ModeleBoxes
 
 		// disable box for such cases
 		if (! empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $this->enabled=0;	// disabled by this option
+
+		$this->hidden = ! ($user->rights->societe->lire);
 	}
 
 	/**
@@ -158,11 +160,11 @@ class box_clients extends ModeleBoxes
 	 *	@param	array	$head       Array with properties of box title
 	 *	@param  array	$contents   Array with properties of box lines
 	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	void
+	 *	@return	string
 	 */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 
 }
diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php
index 7653206333d..c8b2b30fbad 100644
--- a/htdocs/core/boxes/box_commandes.php
+++ b/htdocs/core/boxes/box_commandes.php
@@ -44,6 +44,21 @@ class box_commandes extends ModeleBoxes
     var $info_box_contents = array();
 
 
+    /**
+     *  Constructor
+     *
+     *  @param  DoliDB  $db         Database handler
+     *  @param  string  $param      More parameters
+     */
+    function __construct($db,$param)
+    {
+        global $user;
+
+        $this->db=$db;
+
+        $this->hidden=! ($user->rights->commande->lire);
+    }
+
     /**
      *  Load data for box to show them later
      *
@@ -177,11 +192,11 @@ class box_commandes extends ModeleBoxes
 	 *	@param	array	$head       Array with properties of box title
 	 *	@param  array	$contents   Array with properties of box lines
 	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	void
+	 *	@return	string
 	 */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-        parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
     }
 
 }
diff --git a/htdocs/core/boxes/box_comptes.php b/htdocs/core/boxes/box_comptes.php
index a1c3625e78c..245a15e946c 100644
--- a/htdocs/core/boxes/box_comptes.php
+++ b/htdocs/core/boxes/box_comptes.php
@@ -61,6 +61,8 @@ class box_comptes extends ModeleBoxes
 		// disable module for such cases
 		$listofmodulesforexternal=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL);
 		if (! in_array('banque',$listofmodulesforexternal) && ! empty($user->societe_id)) $this->enabled=0;	// disabled for external users
+
+		$this->hidden = ! ($user->rights->banque->lire);
 	}
 
 	/**
@@ -171,11 +173,11 @@ class box_comptes extends ModeleBoxes
 	 *	@param	array	$head       Array with properties of box title
 	 *	@param  array	$contents   Array with properties of box lines
 	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	void
+	 *	@return	string
 	 */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 
 }
diff --git a/htdocs/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php
index 45963af9bb1..068d378ac5e 100644
--- a/htdocs/core/boxes/box_contacts.php
+++ b/htdocs/core/boxes/box_contacts.php
@@ -45,6 +45,21 @@ class box_contacts extends ModeleBoxes
 	var $info_box_contents = array();
 
 
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	function __construct($db,$param)
+	{
+	    global $user;
+
+	    $this->db=$db;
+
+	    $this->hidden=! ($user->rights->societe->lire);
+	}
+
 	/**
 	 *  Load data into info_box_contents array to show array later.
 	 *
@@ -164,11 +179,11 @@ class box_contacts extends ModeleBoxes
 	 *	@param	array	$head       Array with properties of box title
 	 *	@param  array	$contents   Array with properties of box lines
 	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	void
+	 *	@return	string
 	 */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 
 }
diff --git a/htdocs/core/boxes/box_contracts.php b/htdocs/core/boxes/box_contracts.php
index fe864e1df16..747368d6112 100644
--- a/htdocs/core/boxes/box_contracts.php
+++ b/htdocs/core/boxes/box_contracts.php
@@ -43,6 +43,21 @@ class box_contracts extends ModeleBoxes
     var $info_box_contents = array();
 
 
+    /**
+     *  Constructor
+     *
+     *  @param  DoliDB  $db         Database handler
+     *  @param  string  $param      More parameters
+     */
+    function __construct($db,$param)
+    {
+        global $user;
+
+        $this->db=$db;
+
+        $this->hidden=! ($user->rights->contrat->lire);
+    }
+
     /**
      *  Load data for box to show them later
      *
@@ -160,11 +175,11 @@ class box_contracts extends ModeleBoxes
 	 *	@param	array	$head       Array with properties of box title
 	 *	@param  array	$contents   Array with properties of box lines
 	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	void
+	 *	@return	string
 	 */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-        parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
     }
 
 }
diff --git a/htdocs/core/boxes/box_external_rss.php b/htdocs/core/boxes/box_external_rss.php
index dbe71a6ca41..0e49caf9381 100644
--- a/htdocs/core/boxes/box_external_rss.php
+++ b/htdocs/core/boxes/box_external_rss.php
@@ -185,11 +185,11 @@ class box_external_rss extends ModeleBoxes
 	 *	@param	array	$head       Array with properties of box title
 	 *	@param  array	$contents   Array with properties of box lines
 	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	void
+	 *	@return	string
 	 */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-        parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
     }
 
 }
diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php
index 22a90929a0b..aadf5ab13ba 100644
--- a/htdocs/core/boxes/box_factures.php
+++ b/htdocs/core/boxes/box_factures.php
@@ -42,6 +42,21 @@ class box_factures extends ModeleBoxes
 	var $info_box_contents = array();
 
 
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	function __construct($db,$param)
+	{
+	    global $user;
+
+	    $this->db=$db;
+
+	    $this->hidden=! ($user->rights->facture->lire);
+	}
+
 	/**
 	 *  Load data into info_box_contents array to show array later.
 	 *
@@ -181,11 +196,11 @@ class box_factures extends ModeleBoxes
 	 *  @param  array   $head       Array with properties of box title
 	 *  @param  array   $contents   Array with properties of box lines
 	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	void
+	 *	@return	string
 	 */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 
 }
diff --git a/htdocs/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php
index b43d9cfc47b..383a6115b29 100644
--- a/htdocs/core/boxes/box_factures_fourn.php
+++ b/htdocs/core/boxes/box_factures_fourn.php
@@ -43,6 +43,21 @@ class box_factures_fourn extends ModeleBoxes
 	var $info_box_contents = array();
 
 
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	function __construct($db,$param)
+	{
+	    global $user;
+
+	    $this->db=$db;
+
+	    $this->hidden=! ($user->rights->fournisseur->facture->lire);
+	}
+
 	/**
 	 *  Load data into info_box_contents array to show array later.
 	 *
@@ -190,11 +205,11 @@ class box_factures_fourn extends ModeleBoxes
 	 *	@param	array	$head       Array with properties of box title
 	 *	@param  array	$contents   Array with properties of box lines
 	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	void
+	 *	@return	string
 	 */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 
 }
diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php
index 0d6bc28f077..4c56fc9cc93 100644
--- a/htdocs/core/boxes/box_factures_fourn_imp.php
+++ b/htdocs/core/boxes/box_factures_fourn_imp.php
@@ -42,6 +42,21 @@ class box_factures_fourn_imp extends ModeleBoxes
 	var $info_box_contents = array();
 
 
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	function __construct($db,$param)
+	{
+	    global $user;
+
+	    $this->db=$db;
+
+	    $this->hidden=! ($user->rights->fournisseur->facture->lire);
+	}
+
 	/**
 	 *  Load data into info_box_contents array to show array later.
 	 *
@@ -181,11 +196,11 @@ class box_factures_fourn_imp extends ModeleBoxes
 	 *	@param	array	$head       Array with properties of box title
 	 *	@param  array	$contents   Array with properties of box lines
 	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	void
+	 *	@return	string
 	 */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 
 }
diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php
index d3336500263..ccb7f5c91eb 100644
--- a/htdocs/core/boxes/box_factures_imp.php
+++ b/htdocs/core/boxes/box_factures_imp.php
@@ -45,6 +45,21 @@ class box_factures_imp extends ModeleBoxes
 	var $info_box_contents = array();
 
 
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	function __construct($db,$param)
+	{
+	    global $user;
+
+	    $this->db=$db;
+
+	    $this->hidden=! ($user->rights->facture->lire);
+	}
+
 	/**
 	 *  Load data into info_box_contents array to show array later.
 	 *
@@ -184,11 +199,11 @@ class box_factures_imp extends ModeleBoxes
 	 *	@param	array	$head       Array with properties of box title
 	 *	@param  array	$contents   Array with properties of box lines
 	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	void
+	 *	@return	string
 	 */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 
 }
diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php
index d57a2a991df..0a68c8173b4 100644
--- a/htdocs/core/boxes/box_ficheinter.php
+++ b/htdocs/core/boxes/box_ficheinter.php
@@ -43,6 +43,21 @@ class box_ficheinter extends ModeleBoxes
 	var $info_box_contents = array();
 
 
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	function __construct($db,$param)
+	{
+	    global $user;
+
+	    $this->db=$db;
+
+	    $this->hidden=! ($user->rights->ficheinter->lire);
+	}
+
 	/**
 	 *  Load data for box to show them later
 	 *
@@ -145,11 +160,11 @@ class box_ficheinter extends ModeleBoxes
 	 *	@param	array	$head       Array with properties of box title
 	 *	@param  array	$contents   Array with properties of box lines
 	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	void
+	 *	@return	string
 	 */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 
 }
diff --git a/htdocs/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php
index ed3680af455..bac582a4534 100644
--- a/htdocs/core/boxes/box_fournisseurs.php
+++ b/htdocs/core/boxes/box_fournisseurs.php
@@ -43,6 +43,21 @@ class box_fournisseurs extends ModeleBoxes
     var $info_box_contents = array();
 
 
+    /**
+     *  Constructor
+     *
+     *  @param  DoliDB  $db         Database handler
+     *  @param  string  $param      More parameters
+     */
+    function __construct($db,$param)
+    {
+        global $user;
+
+        $this->db=$db;
+
+        $this->hidden=! ($user->rights->societe->lire);
+    }
+
     /**
 	 *  Load data into info_box_contents array to show array later.
 	 *
@@ -140,11 +155,11 @@ class box_fournisseurs extends ModeleBoxes
 	 *	@param	array	$head       Array with properties of box title
 	 *	@param  array	$contents   Array with properties of box lines
 	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	void
+	 *	@return	string
 	 */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-        parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
     }
 
 }
diff --git a/htdocs/core/boxes/box_goodcustomers.php b/htdocs/core/boxes/box_goodcustomers.php
index 552ed92b8a3..36d99ce7b9a 100644
--- a/htdocs/core/boxes/box_goodcustomers.php
+++ b/htdocs/core/boxes/box_goodcustomers.php
@@ -59,7 +59,9 @@ class box_goodcustomers extends ModeleBoxes
 
 		// disable box for such cases
 		if (! empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $this->enabled=0;	// disabled by this option
-		if (empty($conf->global->MAIN_BOX_ENABLE_BEST_CUSTOMERS)) $this->enabled=0; // not enabled by default. Very slow on large database 
+		if (empty($conf->global->MAIN_BOX_ENABLE_BEST_CUSTOMERS)) $this->enabled=0; // not enabled by default. Very slow on large database
+
+		$this->hidden = ! ($user->rights->societe->lire);
 	}
 
 	/**
@@ -160,11 +162,11 @@ class box_goodcustomers extends ModeleBoxes
 	 *	@param	array	$head       Array with properties of box title
 	 *	@param  array	$contents   Array with properties of box lines
 	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	void
+	 *	@return	string
 	 */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
 
diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php
index e4639070203..49bdc447fa1 100644
--- a/htdocs/core/boxes/box_graph_invoices_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_permonth.php
@@ -47,9 +47,11 @@ class box_graph_invoices_permonth extends ModeleBoxes
 	 */
 	function __construct($db,$param)
 	{
-		global $conf;
+		global $user;
 
 		$this->db=$db;
+
+		$this->hidden = ! ($user->rights->facture->lire);
 	}
 
 	/**
@@ -133,7 +135,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 				if (! $mesg)
 				{
 				    $langs->load("bills");
-				    
+
 				    $px1->SetData($data1);
 					unset($data1);
 					$px1->SetPrecisionY(0);
@@ -266,11 +268,11 @@ class box_graph_invoices_permonth extends ModeleBoxes
 	 *	@param	array	$head       Array with properties of box title
 	 *	@param  array	$contents   Array with properties of box lines
 	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	void
+	 *	@return	string
 	 */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 
 }
diff --git a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
index 254195b42f1..8e822db8baf 100644
--- a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
@@ -47,9 +47,11 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 	 */
 	function __construct($db,$param)
 	{
-		global $conf;
+		global $user;
 
 		$this->db=$db;
+
+		$this->hidden = ! ($user->rights->fournisseur->facture->lire);
 	}
 
 	/**
@@ -263,11 +265,11 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 	 *	@param	array	$head       Array with properties of box title
 	 *	@param  array	$contents   Array with properties of box lines
 	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	void
+	 *	@return	string
 	 */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 
 }
diff --git a/htdocs/core/boxes/box_graph_orders_permonth.php b/htdocs/core/boxes/box_graph_orders_permonth.php
index 6b023b9c157..ac48ca6313e 100644
--- a/htdocs/core/boxes/box_graph_orders_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_permonth.php
@@ -47,9 +47,11 @@ class box_graph_orders_permonth extends ModeleBoxes
 	 */
 	function __construct($db,$param)
 	{
-		global $conf;
+		global $user;
 
 		$this->db=$db;
+
+		$this->hidden = ! ($user->rights->commande->lire);
 	}
 
 	/**
@@ -264,11 +266,11 @@ class box_graph_orders_permonth extends ModeleBoxes
 	 *	@param	array	$head       Array with properties of box title
 	 *	@param  array	$contents   Array with properties of box lines
 	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	void
+	 *	@return	string
 	 */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 
 }
diff --git a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
index 646f28e949c..63868c8dcee 100644
--- a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
@@ -47,9 +47,11 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 	 */
 	function __construct($db,$param)
 	{
-		global $conf;
+		global $user;
 
 		$this->db=$db;
+
+		$this->hidden = ! ($user->rights->fournisseur->commande->lire);
 	}
 
 	/**
@@ -263,11 +265,11 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 	 *	@param	array	$head       Array with properties of box title
 	 *	@param  array	$contents   Array with properties of box lines
 	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	void
+	 *	@return	string
 	 */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 
 }
diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php
index 2b3c69a9e15..0623c9a0466 100644
--- a/htdocs/core/boxes/box_graph_product_distribution.php
+++ b/htdocs/core/boxes/box_graph_product_distribution.php
@@ -48,9 +48,15 @@ class box_graph_product_distribution extends ModeleBoxes
 	 */
 	function __construct($db,$param)
 	{
-		global $conf;
+		global $user, $conf;
 
 		$this->db=$db;
+
+		$this->hidden = ! (
+		    (! empty($conf->facture->enabled) && ! empty($user->rights->facture->lire))
+		 || (! empty($conf->commande->enabled) && ! empty($user->rights->commande->lire))
+		 || (! empty($conf->propal->enabled) && ! empty($user->rights->propale->lire))
+		);
 	}
 
 	/**
@@ -93,7 +99,7 @@ class box_graph_product_distribution extends ModeleBoxes
 		}
 		if (empty($showinvoicenb) && empty($showpropalnb) && empty($showordernb)) { $showpropalnb=1; $showinvoicenb=1; $showordernb=1; }
 		if (empty($conf->facture->enabled) || empty($user->rights->facture->lire)) $showinvoicenb=0;
-		if (empty($conf->propal->enabled) || empty($user->rights->propal->lire)) $showpropalnb=0;
+		if (empty($conf->propal->enabled) || empty($user->rights->propale->lire)) $showpropalnb=0;
 		if (empty($conf->commande->enabled) || empty($user->rights->commande->lire)) $showordernb=0;
 
 		$nowarray=dol_getdate(dol_now(),true);
@@ -188,7 +194,7 @@ class box_graph_product_distribution extends ModeleBoxes
 			}
 		}
 
-		if (! empty($conf->propal->enabled) && ! empty($user->rights->propal->lire))
+		if (! empty($conf->propal->enabled) && ! empty($user->rights->propale->lire))
 		{
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($showpropalnb)
@@ -250,7 +256,7 @@ class box_graph_product_distribution extends ModeleBoxes
 		if (! empty($conf->commande->enabled) && ! empty($user->rights->commande->lire))
 		{
 			$langs->load("orders");
-			
+
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($showordernb)
 			{
@@ -334,7 +340,7 @@ class box_graph_product_distribution extends ModeleBoxes
 				$stringtoshow.='<input type="checkbox" name="'.$param_showinvoicenb.'"'.($showinvoicenb?' checked':'').'> '.$langs->trans("ForCustomersInvoices");
 				$stringtoshow.=' &nbsp; ';
 			}
-			if (! empty($conf->propal->enabled) || ! empty($user->rights->propal->lire))
+			if (! empty($conf->propal->enabled) || ! empty($user->rights->propale->lire))
 			{
 				$stringtoshow.='<input type="checkbox" name="'.$param_showpropalnb.'"'.($showpropalnb?' checked':'').'> '.$langs->trans("ForProposals");
 				$stringtoshow.='&nbsp;';
@@ -393,11 +399,11 @@ class box_graph_product_distribution extends ModeleBoxes
 	 *	@param	array	$head       Array with properties of box title
 	 *	@param  array	$contents   Array with properties of box lines
 	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	void
+	 *	@return	string
 	 */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 
 }
diff --git a/htdocs/core/boxes/box_graph_propales_permonth.php b/htdocs/core/boxes/box_graph_propales_permonth.php
index 39fe12ed7a3..00bcc0cd1e3 100644
--- a/htdocs/core/boxes/box_graph_propales_permonth.php
+++ b/htdocs/core/boxes/box_graph_propales_permonth.php
@@ -47,9 +47,11 @@ class box_graph_propales_permonth extends ModeleBoxes
 	 */
 	function __construct($db,$param)
 	{
-		global $conf;
+		global $user;
 
 		$this->db=$db;
+
+		$this->hidden=! ($user->rights->propale->lire);
 	}
 
 	/**
@@ -87,7 +89,7 @@ class box_graph_propales_permonth extends ModeleBoxes
 		if ($user->societe_id) $socid=$user->societe_id;
 		if (! $user->rights->societe->client->voir || $socid) $prefix.='private-'.$user->id.'-';	// If user has no permission to see all, output dir is specific to user
 
-		if ($user->rights->propal->lire)
+		if ($user->rights->propale->lire)
 		{
 			$param_year='DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
 			$param_shownb='DOLUSERCOOKIE_box_'.$this->boxcode.'_shownb';
@@ -265,11 +267,11 @@ class box_graph_propales_permonth extends ModeleBoxes
 	 *	@param	array	$head       Array with properties of box title
 	 *	@param  array	$contents   Array with properties of box lines
 	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	void
+	 *	@return	string
 	 */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 
 }
diff --git a/htdocs/core/boxes/box_members.php b/htdocs/core/boxes/box_members.php
index afcbe8e68a6..b19c35ca8b3 100644
--- a/htdocs/core/boxes/box_members.php
+++ b/htdocs/core/boxes/box_members.php
@@ -60,6 +60,8 @@ class box_members extends ModeleBoxes
 		// disable module for such cases
 		$listofmodulesforexternal=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL);
 		if (! in_array('adherent',$listofmodulesforexternal) && ! empty($user->societe_id)) $this->enabled=0;	// disabled for external users
+
+		$this->hidden=! ($user->rights->adherent->lire);
 	}
 
 	/**
@@ -170,11 +172,11 @@ class box_members extends ModeleBoxes
 	 *	@param	array	$head       Array with properties of box title
 	 *	@param  array	$contents   Array with properties of box lines
 	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	void
+	 *	@return	string
 	 */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 
 }
diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index 7ea5b8aec58..f1307e496f5 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -45,6 +45,21 @@ class box_produits extends ModeleBoxes
 	var $info_box_contents = array();
 
 
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	function __construct($db,$param)
+	{
+	    global $user;
+
+	    $this->db=$db;
+
+	    $this->hidden=! ($user->rights->produit->lire || $user->rights->service->lire);
+	}
+
 	/**
 	 *  Load data into info_box_contents array to show array later.
 	 *
@@ -202,11 +217,11 @@ class box_produits extends ModeleBoxes
 	 *	@param	array	$head       Array with properties of box title
 	 *	@param  array	$contents   Array with properties of box lines
 	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	void
+	 *	@return	string
 	 */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 
 }
diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
index 50a4abd320a..2fb58372db4 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -47,6 +47,21 @@ class box_produits_alerte_stock extends ModeleBoxes
 	var $info_box_contents = array();
 
 
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB	$db      	Database handler
+	 *  @param	string	$param		More parameters
+	 */
+	function __construct($db,$param='')
+	{
+	    global $user;
+
+	    $this->db = $db;
+
+		$this->hidden = ! (($user->rights->produit->lire || $user->rights->service->lire) && $user->rights->stock->lire);
+	}
+
 	/**
 	 *  Load data into info_box_contents array to show array later.
 	 *
@@ -214,11 +229,11 @@ class box_produits_alerte_stock extends ModeleBoxes
 	 *	@param	array	$head       Array with properties of box title
 	 *	@param  array	$contents   Array with properties of box lines
 	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	void
+	 *	@return	string
 	 */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 
 }
diff --git a/htdocs/core/boxes/box_project.php b/htdocs/core/boxes/box_project.php
index a47ae3d0cb5..66fd386d226 100644
--- a/htdocs/core/boxes/box_project.php
+++ b/htdocs/core/boxes/box_project.php
@@ -48,12 +48,14 @@ class box_project extends ModeleBoxes
      */
     function __construct($db,$param='')
     {
-        global $langs;
+        global $user, $langs;
         $langs->load("boxes");
         $langs->load("projects");
 
         $this->db = $db;
         $this->boxlabel="Projects";
+
+        $this->hidden=! ($user->rights->projet->lire);
     }
 
 	/**
@@ -77,16 +79,16 @@ class box_project extends ModeleBoxes
 
 		// list the summary of the orders
 		if ($user->rights->projet->lire) {
-		    
+
 		    include_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php');
 		    $projectstatic = new Project($this->db);
-		    
+
 		    $socid=$user->societe_id;
-		    
+
     		// Get list of project id allowed to user (in a string list separated by coma)
 		    $projectsListId='';
     		if (! $user->rights->projet->all->lire) $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1,$socid);
-		
+
 		    $sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut, p.public";
 			$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
             if($user->socid) $sql.= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid=p.fk_soc";
@@ -96,7 +98,7 @@ class box_project extends ModeleBoxes
             $sql.= " AND p.fk_statut = 1"; // Seulement les projets ouverts
             if ($socid) $sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
             if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))";
-            
+
             $sql.= " ORDER BY p.datec DESC";
 			//$sql.= $db->plimit($max, 0);
 
@@ -156,7 +158,7 @@ class box_project extends ModeleBoxes
 				}
 				if ($max < $num)
 				{
-				    $this->info_box_contents[$i][0] = array('td' => 'colspan="5"', 'text' => '...');				    
+				    $this->info_box_contents[$i][0] = array('td' => 'colspan="5"', 'text' => '...');
 				    $i++;
 				}
 			}
@@ -195,11 +197,11 @@ class box_project extends ModeleBoxes
 	 *	@param	array	$head       Array with properties of box title
 	 *	@param  array	$contents   Array with properties of box lines
 	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	void
+	 *	@return	string
 	 */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
 
diff --git a/htdocs/core/boxes/box_propales.php b/htdocs/core/boxes/box_propales.php
index b0a1e4a3798..a505fa8e275 100644
--- a/htdocs/core/boxes/box_propales.php
+++ b/htdocs/core/boxes/box_propales.php
@@ -44,6 +44,21 @@ class box_propales extends ModeleBoxes
     var $info_box_contents = array();
 
 
+    /**
+     *  Constructor
+     *
+     *  @param  DoliDB  $db         Database handler
+     *  @param  string  $param      More parameters
+     */
+    function __construct($db,$param)
+    {
+        global $user;
+
+        $this->db=$db;
+
+        $this->hidden=! ($user->rights->propale->lire);
+    }
+
     /**
 	 *  Load data into info_box_contents array to show array later.
 	 *
@@ -167,11 +182,11 @@ class box_propales extends ModeleBoxes
 	 *	@param	array	$head       Array with properties of box title
 	 *	@param  array	$contents   Array with properties of box lines
 	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	void
+	 *	@return	string
 	 */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-        parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
     }
 
 }
diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php
index 40adb98b405..098ea813e44 100644
--- a/htdocs/core/boxes/box_prospect.php
+++ b/htdocs/core/boxes/box_prospect.php
@@ -60,6 +60,8 @@ class box_prospect extends ModeleBoxes
 
 		// disable box for such cases
 		if (! empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) $this->enabled=0;	// disabled by this option
+
+		$this->hidden=! ($user->rights->societe->lire);
 	}
 
 	/**
@@ -168,11 +170,11 @@ class box_prospect extends ModeleBoxes
 	 *	@param	array	$head       Array with properties of box title
 	 *	@param  array	$contents   Array with properties of box lines
 	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	void
+	 *	@return	string
 	 */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 
 }
diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php
index 4d7759ff081..fd8346a3f0c 100644
--- a/htdocs/core/boxes/box_services_contracts.php
+++ b/htdocs/core/boxes/box_services_contracts.php
@@ -43,6 +43,21 @@ class box_services_contracts extends ModeleBoxes
 	var $info_box_contents = array();
 
 
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	function __construct($db,$param)
+	{
+	    global $user;
+
+	    $this->db=$db;
+
+	    $this->hidden=! ($user->rights->service->lire && $user->rights->contrat->lire);
+	}
+
 	/**
 	 *  Load data into info_box_contents array to show array later.
 	 *
@@ -173,11 +188,11 @@ class box_services_contracts extends ModeleBoxes
 	 *	@param	array	$head       Array with properties of box title
 	 *	@param  array	$contents   Array with properties of box lines
 	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	void
+	 *	@return	string
 	 */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 
 }
diff --git a/htdocs/core/boxes/box_services_expired.php b/htdocs/core/boxes/box_services_expired.php
index 90f36ef6d30..42ac3750a11 100644
--- a/htdocs/core/boxes/box_services_expired.php
+++ b/htdocs/core/boxes/box_services_expired.php
@@ -42,6 +42,21 @@ class box_services_expired extends ModeleBoxes
     var $info_box_contents = array();
 
 
+    /**
+     *  Constructor
+     *
+     *  @param  DoliDB  $db         Database handler
+     *  @param  string  $param      More parameters
+     */
+    function __construct($db,$param)
+    {
+        global $user;
+
+        $this->db=$db;
+
+        $this->hidden=! ($user->rights->contrat->lire);
+    }
+
     /**
      *  Load data for box to show them later
      *
@@ -84,7 +99,7 @@ class box_services_expired extends ModeleBoxes
     			$i = 0;
 
     			$thirdpartytmp = new Societe($this->db);
-    			
+
     			while ($i < $num)
     			{
     			    $late='';
@@ -151,11 +166,11 @@ class box_services_expired extends ModeleBoxes
 	 *	@param	array	$head       Array with properties of box title
 	 *	@param  array	$contents   Array with properties of box lines
 	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	void
+	 *	@return	string
 	 */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-        parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
     }
 
  }
diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php
index 1f0e1ece2ef..4f28a8ce62c 100644
--- a/htdocs/core/boxes/box_supplier_orders.php
+++ b/htdocs/core/boxes/box_supplier_orders.php
@@ -43,6 +43,21 @@ class box_supplier_orders extends ModeleBoxes
     var $info_box_contents = array();
 
 
+    /**
+     *  Constructor
+     *
+     *  @param  DoliDB  $db         Database handler
+     *  @param  string  $param      More parameters
+     */
+    function __construct($db,$param)
+    {
+        global $user;
+
+        $this->db=$db;
+
+        $this->hidden=! ($user->rights->fournisseur->commande->lire);
+    }
+
     /**
      *  Load data into info_box_contents array to show array later.
      *
@@ -172,11 +187,11 @@ class box_supplier_orders extends ModeleBoxes
      * 	@param	array	$head       Array with properties of box title
      * 	@param  array	$contents   Array with properties of box lines
 	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	void
+	 *	@return	string
 	 */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-        parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
     }
 
 }
diff --git a/htdocs/core/boxes/box_task.php b/htdocs/core/boxes/box_task.php
index 29dd9390597..e6224198ca5 100644
--- a/htdocs/core/boxes/box_task.php
+++ b/htdocs/core/boxes/box_task.php
@@ -42,6 +42,7 @@ class box_task extends ModeleBoxes
     var $info_box_head = array();
     var $info_box_contents = array();
 
+
     /**
      *  Constructor
      *
@@ -50,11 +51,13 @@ class box_task extends ModeleBoxes
      */
     function __construct($db,$param='')
     {
-        global $langs;
+        global $user, $langs;
         $langs->load("boxes");
         $langs->load("projects");
         $this->boxlabel="Tasks";
         $this->db = $db;
+
+        $this->hidden = ! ($user->rights->projet->lire);
     }
 
 	/**
@@ -138,10 +141,10 @@ class box_task extends ModeleBoxes
 	 *	@param	array	$head       Array with properties of box title
 	 *	@param  array	$contents   Array with properties of box lines
 	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	void
+	 *	@return	string
 	 */
 	function showBox($head = null, $contents = null, $nooutput=0)
 	{
-		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index 566da25aad3..b1a27f1d77c 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -49,10 +49,15 @@ class ModeleBoxes    // Can't be abtract as it is instantiated to build "empty"
 	public $max = 5;
 
 	/**
-	 * @var int Status
+	 * @var int Condition to have widget enabled
 	 */
 	public $enabled=1;
 
+	/**
+	 * @var int Condition to have widget visible (in most cases, permissions)
+	 */
+	public $hidden=0;
+
 	/**
 	 * @var int Box definition database ID
 	 */
@@ -168,29 +173,29 @@ class ModeleBoxes    // Can't be abtract as it is instantiated to build "empty"
 		}
 	}
 
-    
+
 	/**
 	 * Standard method to get content of a box
 	 *
 	 * @param   array   $head       Array with properties of box title
 	 * @param   array   $contents   Array with properties of box lines
 	 *
-	 * @return  string              
+	 * @return  string
 	 */
 	function outputBox($head = null, $contents = null)
 	{
 		global $langs, $user, $conf;
-	
+
 		// Trick to get result into a var from a function that makes print instead of return
 		// TODO Replace ob_start with param nooutput=1 into showBox
 		ob_start();
 		$result = $this->showBox($head, $contents);
 		$output = ob_get_contents();
 		ob_end_clean();
-		
+
 		return $output;
 	}
-	
+
 	/**
 	 * Standard method to show a box (usage by boxes not mandatory, a box can still use its own showBox function)
 	 *
@@ -203,6 +208,8 @@ class ModeleBoxes    // Can't be abtract as it is instantiated to build "empty"
 	{
 		global $langs, $user, $conf;
 
+		if (! empty($this->hidden)) return '\n<!-- Box ".get_class($this)." hidden -->\n';    // Nothing done if hidden (for example when user has no permission)
+
         require_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php';
 
 		$MAXLENGTHBOX=60;   // Mettre 0 pour pas de limite
@@ -365,13 +372,13 @@ class ModeleBoxes    // Can't be abtract as it is instantiated to build "empty"
             $out = "<!-- Box ".get_class($this)." from cache -->";
             $out.= dol_readcachefile($cachedir, $filename);
         }
-        
+
         if ($nooutput) return $out;
         else print $out;
-    
+
         return '';
 	}
-	
+
 }
 
 
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 7e78f7bbe4d..cdf6dc79155 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -320,7 +320,7 @@ class FormOther
         {
             dol_syslog(__METHOD__ . ': using numeric value for parameter type is deprecated. Use string code instead.', LOG_WARNING);
         }
-        
+
         // Load list of "categories"
         $static_categs = new Categorie($this->db);
         $tab_categs = $static_categs->get_full_arbo($type);
@@ -621,12 +621,12 @@ class FormOther
             	$b = hexdec($hexb);
     	    }
         	$bright = (max($r, $g, $b) + min($r, $g, $b)) / 510.0;    // HSL algorithm
-            if ($bright > 0.6) $textcolor='000';     	   
+            if ($bright > 0.6) $textcolor='000';
     	}
-    	
+
     	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
     	$color = colorArrayToHex(colorStringToArray($color,array()),'');
-    	
+
 		if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; color: #'.$textcolor.'; background-color: #'.$color.'" value="'.$color.'">';
 		else print $textifnotdefined;
     }
@@ -989,7 +989,7 @@ class FormOther
      *  Class 'Form' must be known.
      *
      * 	@param	   User         $user		 Object User
-     * 	@param	   String       $areacode    Code of area for pages (0=value for Home page)
+     * 	@param	   string       $areacode    Code of area for pages ('0'=value for Home page)
      * 	@return    array                     array('selectboxlist'=>, 'boxactivated'=>, 'boxlist'=>)
      */
     static function getBoxesArea($user,$areacode)
@@ -1002,16 +1002,16 @@ class FormOther
 
         // $boxactivated will be array of boxes enabled into global setup
         // $boxidactivatedforuser will be array of boxes choosed by user
-        
+
         $selectboxlist='';
-        $boxactivated=InfoBox::listBoxes($db,'activated',$areacode,(empty($user->conf->$confuserzone)?null:$user));	// Search boxes of common+user (or common only if user has no specific setup)
-        
+        $boxactivated=InfoBox::listBoxes($db, 'activated', $areacode, (empty($user->conf->$confuserzone)?null:$user), array(), 0);	// Search boxes of common+user (or common only if user has no specific setup)
+
         $boxidactivatedforuser=array();
         foreach($boxactivated as $box)
         {
         	if (empty($user->conf->$confuserzone) || $box->fk_user == $user->id) $boxidactivatedforuser[$box->id]=$box->id;	// We keep only boxes to show for user
         }
-        
+
         // Define selectboxlist
         $arrayboxtoactivatelabel=array();
         if (! empty($user->conf->$confuserzone))
diff --git a/htdocs/core/class/infobox.class.php b/htdocs/core/class/infobox.class.php
index cd06eb587b7..41e131bba37 100644
--- a/htdocs/core/class/infobox.class.php
+++ b/htdocs/core/class/infobox.class.php
@@ -45,9 +45,10 @@ class InfoBox
      *  @param	string		$zone			Name or area (-1 for all, 0 for Homepage, 1 for xxx, ...)
      *  @param  User|null   $user	  		Object user to filter
      *  @param	array		$excludelist	Array of box id (box.box_id = boxes_def.rowid) to exclude
+     *  @param  int         $includehidden  Include also hidden boxes
      *  @return array       	        	Array of boxes
      */
-    static function listBoxes($db, $mode, $zone, $user=null, $excludelist=array())
+    static function listBoxes($db, $mode, $zone, $user=null, $excludelist=array(), $includehidden=1)
     {
         global $conf;
 
@@ -72,7 +73,7 @@ class InfoBox
             $sql.= " FROM ".MAIN_DB_PREFIX."boxes_def as d";
            	$sql.= " WHERE d.entity IN (0,".(! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)?"1,":"").$conf->entity.")";
         }
-        
+
         dol_syslog(get_class()."::listBoxes get default box list for mode=".$mode." userid=".(is_object($user)?$user->id:'')."", LOG_DEBUG);
         $resql = $db->query($sql);
         if ($resql)
@@ -155,7 +156,7 @@ class InfoBox
                         //print '=>'.$boxname.'-enabled='.$enabled.'<br>';
 
                         //print 'xx module='.$module.' enabled='.$enabled;
-                        if ($enabled) $boxes[]=$box;
+                        if ($enabled && ($includehidden || empty($box->hidden))) $boxes[]=$box;
                         else unset($box);
                     }
                     else

From d7cbb598c12283d1d937a17089349510258eff4f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Jun 2017 14:30:00 +0200
Subject: [PATCH 186/438] Fix permission for external users

---
 htdocs/core/boxes/box_clients.php      | 2 +-
 htdocs/core/boxes/box_fournisseurs.php | 2 +-
 htdocs/core/boxes/box_prospect.php     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php
index e6cd2ede39e..5ef627e1ced 100644
--- a/htdocs/core/boxes/box_clients.php
+++ b/htdocs/core/boxes/box_clients.php
@@ -59,7 +59,7 @@ class box_clients extends ModeleBoxes
 		// disable box for such cases
 		if (! empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $this->enabled=0;	// disabled by this option
 
-		$this->hidden = ! ($user->rights->societe->lire);
+		$this->hidden = ! ($user->rights->societe->lire && empty($user->socid));
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php
index bac582a4534..d9d41fd3d4f 100644
--- a/htdocs/core/boxes/box_fournisseurs.php
+++ b/htdocs/core/boxes/box_fournisseurs.php
@@ -55,7 +55,7 @@ class box_fournisseurs extends ModeleBoxes
 
         $this->db=$db;
 
-        $this->hidden=! ($user->rights->societe->lire);
+        $this->hidden=! ($user->rights->societe->lire && empty($user->socid));
     }
 
     /**
diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php
index 098ea813e44..d3b24782d83 100644
--- a/htdocs/core/boxes/box_prospect.php
+++ b/htdocs/core/boxes/box_prospect.php
@@ -61,7 +61,7 @@ class box_prospect extends ModeleBoxes
 		// disable box for such cases
 		if (! empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) $this->enabled=0;	// disabled by this option
 
-		$this->hidden=! ($user->rights->societe->lire);
+		$this->hidden=! ($user->rights->societe->lire && empty($user->socid));
 	}
 
 	/**

From 279e6ab30468429e5a46964000e76680c42fae16 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Jun 2017 14:54:03 +0200
Subject: [PATCH 187/438] Fix missing parameters

---
 htdocs/core/boxes/box_produits.php              | 2 +-
 htdocs/core/boxes/box_produits_alerte_stock.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index f1307e496f5..35e44296d93 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -87,7 +87,7 @@ class box_produits extends ModeleBoxes
 			// Add where from hooks
 			if (is_object($hookmanager))
 			{
-			    $parameters=array();
+			    $parameters=array('boxproductlist'=>1);
 			    $reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
 			    $sql.=$hookmanager->resPrint;
 			}
diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
index 2fb58372db4..295fd6c6392 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -92,7 +92,7 @@ class box_produits_alerte_stock extends ModeleBoxes
 			// Add where from hooks
     		if (is_object($hookmanager))
     		{
-    		    $parameters=array();
+			    $parameters=array('boxproductalertstocklist'=>1);
     		    $reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
     		    $sql.=$hookmanager->resPrint;
     		}

From 2916444f6c7919cc80b8c316ac881994e25d8dc8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Jun 2017 15:30:00 +0200
Subject: [PATCH 188/438] Fix check on module product for external user

---
 htdocs/core/lib/security.lib.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 45dbb32b7f0..f55f60c7f69 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -146,7 +146,9 @@ function restrictedArea($user, $features, $objectid=0, $tableandshare='', $featu
     $readok=1; $nbko=0;
     foreach ($featuresarray as $feature)	// first we check nb of test ko
     {
-    	if (! empty($user->societe_id) && ! empty($conf->global->MAIN_MODULES_FOR_EXTERNAL) && ! in_array($feature,$listofmodules))	// If limits on modules for external users, module must be into list of modules for external users
+        $featureforlistofmodule=$feature;
+        if ($featureforlistofmodule == 'produit') $featureforlistofmodule='product';
+        if (! empty($user->societe_id) && ! empty($conf->global->MAIN_MODULES_FOR_EXTERNAL) && ! in_array($featureforlistofmodule,$listofmodules))	// If limits on modules for external users, module must be into list of modules for external users
     	{
     		$readok=0; $nbko++;
     		continue;

From 5d9a84dedb4bea9283c30b257b4add9385ab383d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Jun 2017 15:35:50 +0200
Subject: [PATCH 189/438] Fix sql syntax error

---
 htdocs/core/class/html.formother.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index cdf6dc79155..98720d335b9 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -409,7 +409,7 @@ class FormOther
             $sql_usr.= " WHERE u2.entity IN (0,".$conf->entity.")";
             $sql_usr.= " AND u2.rowid = sc.fk_user AND sc.fk_soc=".$user->societe_id;
         }
-	$sql_usr.= " ORDER BY u.statut DESC, lastname ASC";
+	    $sql_usr.= " ORDER BY statut DESC, lastname ASC";  // Do not use 'ORDER BY u.statut' here, not compatible with the UNION.
         //print $sql_usr;exit;
 
         $resql_usr = $this->db->query($sql_usr);

From b52971d0a224c6de4f13d520ad1c548f246c0829 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Jun 2017 16:00:38 +0200
Subject: [PATCH 190/438] Fix template

---
 .../template/class/actions_mymodule.class.php | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/htdocs/modulebuilder/template/class/actions_mymodule.class.php b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
index 7f1897c80ae..a3ba3baeaad 100644
--- a/htdocs/modulebuilder/template/class/actions_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
@@ -29,6 +29,20 @@
  */
 class ActionsMyModule
 {
+    /**
+     * @var DoliDB Database handler.
+     */
+    public $db;
+    /**
+     * @var string Error
+     */
+    public $error = '';
+    /**
+     * @var array Errors
+     */
+    public $errors = array();
+
+
 	/**
 	 * @var array Hook results. Propagated to $hookmanager->resArray for later reuse
 	 */
@@ -39,16 +53,13 @@ class ActionsMyModule
 	 */
 	public $resprints;
 
-	/**
-	 * @var array Errors
-	 */
-	public $errors = array();
 
 	/**
 	 * Constructor
 	 */
-	public function __construct()
+	public function __construct($db)
 	{
+	    $this->db = $db;
 	}
 
 	/**

From 64a6ff9687d8fec5462117066fd335f62591e849 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Jun 2017 16:26:25 +0200
Subject: [PATCH 191/438] Fix test for navigation disabling for external users

---
 htdocs/product/card.php                       |  77 ++++----
 htdocs/product/composition/card.php           |  31 ++--
 htdocs/product/document.php                   |  25 +--
 htdocs/product/fournisseurs.php               |  43 ++---
 htdocs/product/info.php                       |  13 +-
 htdocs/product/note.php                       |  13 +-
 htdocs/product/price.php                      | 169 +++++++++---------
 htdocs/product/stats/card.php                 |  21 ++-
 htdocs/product/stats/commande.php             |  17 +-
 htdocs/product/stats/commande_fournisseur.php |  19 +-
 htdocs/product/stats/contrat.php              |  23 +--
 htdocs/product/stats/facture.php              |  25 +--
 htdocs/product/stats/facture_fournisseur.php  |  17 +-
 htdocs/product/stats/propal.php               |  23 +--
 htdocs/product/stock/card.php                 |  13 +-
 htdocs/product/stock/info.php                 |   7 +-
 htdocs/product/stock/mouvement.php            |  97 +++++-----
 htdocs/product/stock/product.php              |  85 ++++-----
 htdocs/product/stock/productlot_card.php      |  53 +++---
 htdocs/product/traduction.php                 |   9 +-
 20 files changed, 420 insertions(+), 360 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 380163121e3..31a865132c8 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -165,7 +165,7 @@ if (empty($reshook))
 			exit;
 		}
 	}
-	
+
     // Barcode type
     if ($action ==	'setfk_barcode_type' && $createbarcode)
     {
@@ -221,7 +221,7 @@ if (empty($reshook))
             $action = "create";
             $error++;
         }
-        
+
         if (! $error)
         {
 	        $units = GETPOST('units', 'int');
@@ -289,7 +289,7 @@ if (empty($reshook))
             $object->volume_units       	 = GETPOST('volume_units');
             $object->finished           	 = GETPOST('finished');
 	        $object->fk_unit                 = GETPOST('units');
-			
+
 			$accountancy_code_sell 			 = GETPOST('accountancy_code_sell');
 			$accountancy_code_buy 			 = GETPOST('accountancy_code_buy');
 
@@ -413,7 +413,7 @@ if (empty($reshook))
 
 				$accountancy_code_sell 			 = GETPOST('accountancy_code_sell');
 				$accountancy_code_buy 			 = GETPOST('accountancy_code_buy');
-				
+
 				if ($accountancy_code_sell <= 0) { $object->accountancy_code_sell = ''; } else { $object->accountancy_code_sell = $accountancy_code_sell; }
 				if ($accountancy_code_buy <= 0) { $object->accountancy_code_buy = ''; } else { $object->accountancy_code_buy = $accountancy_code_buy; }
 
@@ -643,7 +643,7 @@ if (empty($reshook))
 
 			$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $tva_tx));
 			$tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx));
-            
+
             // On reevalue prix selon taux tva car taux tva transaction peut etre different
             // de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
             if ($tmpvat != $tmpprodvat) {
@@ -653,7 +653,7 @@ if (empty($reshook))
                     $pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
                 }
             }
-            
+
             if (GETPOST('propalid') > 0) {
                 // Define cost price for margin calculation
                 $buyprice=0;
@@ -666,7 +666,7 @@ if (empty($reshook))
                 {
                     $buyprice = $result;
                 }
-                
+
                 $result = $propal->addline(
                     $desc,
                     $pu_ht,
@@ -709,7 +709,7 @@ if (empty($reshook))
                 {
                     $buyprice = $result;
                 }
-                
+
                 $result = $commande->addline(
                     $desc,
                     $pu_ht,
@@ -895,7 +895,7 @@ else
         dol_fiche_head('');
 
         print '<table class="border centpercent">';
-        
+
         print '<tr>';
         $tmpcode='';
 		if (! empty($modCodeProduct->code_auto)) $tmpcode=$modCodeProduct->getNextValue($object,$type);
@@ -1067,14 +1067,14 @@ else
         //if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))       available in create mode
         //{
             print '<tr><td class="tdtop">'.$langs->trans("NoteNotVisibleOnBill").'</td><td colspan="3">';
-    
+
             // We use dolibarr_details as type of DolEditor here, because we must not accept images as description is included into PDF and not accepted by TCPDF.
             $doleditor = new DolEditor('note_private', GETPOST('note_private'), '', 140, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_8, '90%');
     	    $doleditor->Create();
-    
+
             print "</td></tr>";
         //}
-        
+
 		if($conf->categorie->enabled) {
 			// Categories
 			print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
@@ -1119,7 +1119,7 @@ else
 
         // Accountancy codes
         print '<table class="border" width="100%">';
-		
+
 		if (! empty($conf->accounting->enabled))
 		{
             // Accountancy_code_sell
@@ -1133,8 +1133,8 @@ else
             print '<td>';
 			print $formaccountancy->select_account(GETPOST('accountancy_code_buy'), 'accountancy_code_buy', 1, null, 1, 1, '');
             print '</td></tr>';
-		}			
-		else // For external software 
+		}
+		else // For external software
 		{
             // Accountancy_code_sell
             print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
@@ -1378,7 +1378,7 @@ else
             }
 
 			// Tags-Categories
-            if ($conf->categorie->enabled) 
+            if ($conf->categorie->enabled)
 			{
 				print '<tr><td class="tdtop">'.$langs->trans("Categories").'</td><td colspan="3">';
 				$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', 'parent', 64, 0, 1);
@@ -1395,13 +1395,13 @@ else
 			if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 			{
                 print '<tr><td class="tdtop">'.$langs->trans("NoteNotVisibleOnBill").'</td><td colspan="3">';
-        
+
                 $doleditor = new DolEditor('note_private', $object->note_private, '', 140, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_4, '90%');
                 $doleditor->Create();
-    
+
                 print "</td></tr>";
 			}
-			
+
             print '</table>';
 
             print '<br>';
@@ -1421,8 +1421,8 @@ else
                 print '<td>';
 				print $formaccountancy->select_account($object->accountancy_code_buy, 'accountancy_code_buy', 1, '', 1, 1);
                 print '</td></tr>';
-			}			
-			else // For external software 
+			}
+			else // For external software
 			{
                 // Accountancy_code_sell
                 print '<tr><td class="titlefield">'.$langs->trans("ProductAccountancySellCode").'</td>';
@@ -1460,15 +1460,18 @@ else
             $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?type='.$object->type.'">'.$langs->trans("BackToList").'</a>';
             $object->next_prev_filter=" fk_product_type = ".$object->type;
 
-            dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
-            
-            
+            $shownav = 1;
+            if ($user->societe_id && ! in_array('product', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
+
+            dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
+
+
             print '<div class="fichecenter">';
             print '<div class="fichehalfleft">';
-            
+
             print '<div class="underbanner clearboth"></div>';
             print '<table class="border tableforfield" width="100%">';
-            
+
             // Type
             if (! empty($conf->produit->enabled) && ! empty($conf->service->enabled))
             {
@@ -1574,7 +1577,7 @@ else
             }
             print '</td></tr>';
             */
-            
+
             // Batch number management (to batch)
             if (! empty($conf->productbatch->enabled)) {
                 print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td colspan="2">';
@@ -1597,10 +1600,10 @@ else
             print '</table>';
             print '</div>';
             print '<div class="fichehalfright"><div class="ficheaddleft">';
-       
+
             print '<div class="underbanner clearboth"></div>';
             print '<table class="border tableforfield" width="100%">';
-            
+
             // Nature
             if($object->type!= Product::TYPE_SERVICE)
             {
@@ -1722,13 +1725,13 @@ else
                 print '<tr><td class="tdtop">'.$langs->trans("NotePrivate").'</td><td colspan="'.(2+(($showphoto||$showbarcode)?1:0)).'">'.(dol_textishtml($object->note_private)?$object->note_private:dol_nl2br($object->note_private,1,true)).'</td></tr>'."\n";
                 print '<!-- End show Note --> '."\n";
 			}
-			
+
             print "</table>\n";
     		print '</div>';
-    		
+
             print '</div></div>';
             print '<div style="clear:both"></div>';
-        
+
             dol_fiche_end();
         }
 
@@ -1795,7 +1798,7 @@ if (empty($reshook))
 {
 	if ($action == '' || $action == 'view')
 	{
-	    if (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer ) || 
+	    if (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer ) ||
 	       ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer))
 	    {
 	        if (! isset($object->no_button_edit) || $object->no_button_edit <> 1) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("Modify").'</a></div>';
@@ -1940,7 +1943,7 @@ if (! empty($conf->global->PRODUCT_ADD_FORM_ADD_TO) && $object->id && ($action =
     	print '<input type="hidden" name="action" value="addin">';
 
 	    print load_fiche_titre($langs->trans("AddToDraft"),'','');
-		
+
 		dol_fiche_head('');
 
     	$html .= '<tr><td class="nowrap">'.$langs->trans("Quantity").' ';
@@ -1952,7 +1955,7 @@ if (! empty($conf->global->PRODUCT_ADD_FORM_ADD_TO) && $object->id && ($action =
     	print '<table width="100%" class="border">';
         print $html;
         print '</table>';
-		
+
         print '<div class="center">';
         print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
         print '</div>';
@@ -1979,10 +1982,10 @@ if ($action == '' || $action == 'view')
     $delallowed=$user->rights->produit->supprimer;
 
     $var=true;
-    
+
     print $formfile->showdocuments($modulepart,$object->ref,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,28,0,'',0,'',$object->default_lang, '', $object);
     $somethingshown=$formfile->numoffiles;
-    
+
     print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
     print '</div></div></div>';
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index 230a3dbee23..5f3aed85cdd 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -86,8 +86,8 @@ if ($action == 'add_prod' && ($user->rights->produit->creer || $user->rights->se
 				$action = 're-edit';
 				if ($object->error == "isFatherOfThis") {
 					setEventMessages($langs->trans("ErrorAssociationIsFatherOfThis"), null, 'errors');
-				} 
-				else 
+				}
+				else
 				{
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
@@ -204,15 +204,18 @@ if ($id > 0 || ! empty($ref))
 	if ($user->rights->produit->lire || $user->rights->service->lire)
 	{
         $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
-	    
-        dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref', '', '', '', 0, '', '', 1);
-		
+
+        $shownav = 1;
+        if ($user->societe_id && ! in_array('product', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
+
+        dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref', '', '', '', 0, '', '', 1);
+
         if ($object->type!=Product::TYPE_SERVICE || empty($conf->global->PRODUIT_MULTIPRICES))
         {
-    	    print '<div class="underbanner clearboth"></div>';	
+    	    print '<div class="underbanner clearboth"></div>';
             print '<table class="border tableforfield" width="100%">';
         }
-        
+
 		// Nature
 		if ($object->type!=Product::TYPE_SERVICE)
 		{
@@ -256,11 +259,11 @@ if ($id > 0 || ! empty($ref))
 		dol_fiche_end();
 
         print '<br>';
-        
+
 		$prodsfather = $object->getFather(); 		// Parent Products
 		$object->get_sousproduits_arbo();			// Load $object->sousprods
-		$prods_arbo=$object->get_arbo_each_prod();		
-		
+		$prods_arbo=$object->get_arbo_each_prod();
+
 		$nbofsubsubproducts=count($prods_arbo);		// This include sub sub product into nb
 		$prodschild = $object->getChildsArbo($id,1);
 		$nbofsubproducts=count($prodschild);		// This include only first level of childs
@@ -369,7 +372,7 @@ if ($id > 0 || ! empty($ref))
 
 					    $totalline=price2num($value['nb'] * ($product_fourn->fourn_unitprice * (1 - $product_fourn->fourn_remise_percent/100) + $product_fourn->fourn_unitcharges - $product_fourn->fourn_remise), 'MT');
 						$total+=$totalline;
-						
+
 						print '<td align="right">';
 						print ($notdefined?'':($value['nb']> 1 ? $value['nb'].'x' : '').price($product_fourn->fourn_unitprice,'','',0,0,-1,$conf->currency));
 						print '</td>';
@@ -385,7 +388,7 @@ if ($id > 0 || ! empty($ref))
 						print '<td align="right" colspan="2">';
 						print ($notdefined?'':($value['nb']> 1 ? $value['nb'].'x' : '').price($pricesell,'','',0,0,-1,$conf->currency));
 						print '</td>';
-						
+
 						// Stock
 						if (! empty($conf->stock->enabled)) print '<td align="right">'.$value['stock'].'</td>';	// Real stock
 
@@ -424,7 +427,7 @@ if ($id > 0 || ! empty($ref))
 						// Best selling price
 						print '<td>&nbsp;</td>';
 						print '<td>&nbsp;</td>';
-						
+
 						if (! empty($conf->stock->enabled)) print '<td></td>';	// Real stock
 						print '<td align="center">'.$value['nb'].'</td>';
 						print '<td>&nbsp;</td>';
@@ -456,7 +459,7 @@ if ($id > 0 || ! empty($ref))
 				if ($atleastonenotdefined) print $langs->trans("Unknown").' ('.$langs->trans("SomeSubProductHaveNoPrices").')';
 				print ($atleastonenotdefined?'':price($totalsell,'','',0,0,-1,$conf->currency));
 				print '</td>';
-				
+
 				// Stock
 				if (! empty($conf->stock->enabled)) print '<td class="liste_total" align="right">&nbsp;</td>';
 
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 2e241d9c156..0f1c74135b0 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -72,7 +72,7 @@ if ($id > 0 || ! empty($ref))
 
     if (! empty($conf->product->enabled)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
     elseif (! empty($conf->service->enabled)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
-    
+
 	if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))    // For backward compatiblity, we scan also old dirs
 	{
 	    if (! empty($conf->product->enabled)) $upload_dirold = $conf->product->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2),1,1).'/'.substr(substr("000".$object->id, -2),0,1).'/'.$object->id."/photos";
@@ -210,11 +210,14 @@ if ($object->id)
 
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
-    
-	dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
-    
+
+    $shownav = 1;
+    if ($user->societe_id && ! in_array('product', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
+
+    dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
+
     print '<div class="fichecenter">';
-    
+
     print '<div class="underbanner clearboth"></div>';
     print '<table class="border tableforfield" width="100%">';
 
@@ -224,14 +227,14 @@ if ($object->id)
 
     print '</div>';
     print '<div style="clear:both"></div>';
-    
+
     dol_fiche_end();
 
     $permission = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer));
     $param = '&id=' . $object->id;
     include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
 
-    
+
     // Merge propal PDF document PDF files
     if (!empty($conf->global->PRODUIT_PDF_MERGE_PROPAL))
     {
@@ -307,17 +310,17 @@ if ($object->id)
     				$checked = '';
     				$filename = $filetoadd['name'];
 
-    				if ($conf->global->MAIN_MULTILANGS) 
+    				if ($conf->global->MAIN_MULTILANGS)
     				{
-    					if (array_key_exists($filetoadd['name'] . '_' . $delauft_lang, $filetomerge->lines)) 
+    					if (array_key_exists($filetoadd['name'] . '_' . $delauft_lang, $filetomerge->lines))
     					{
     						$filename = $filetoadd['name'] . ' - ' . $langs->trans('Language_' . $delauft_lang);
     						$checked = ' checked ';
     					}
     				}
-    				else 
+    				else
     				{
-    					if (array_key_exists($filetoadd['name'], $filetomerge->lines)) 
+    					if (array_key_exists($filetoadd['name'], $filetomerge->lines))
     					{
     						$checked = ' checked ';
     					}
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 1d54495b605..5413bee8630 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -98,7 +98,7 @@ if (empty($reshook))
 		if ($id)
 		{
 			$result=$object->fetch($id);
-			$object->cost_price = price2num($cost_price); 
+			$object->cost_price = price2num($cost_price);
 			$result=$object->update($object->id, $user);
 			if ($result > 0)
 			{
@@ -112,7 +112,7 @@ if (empty($reshook))
 			}
 		}
 	}
-	
+
 	if ($action == 'confirm_remove_pf')
 	{
 		if ($rowid)	// id of product supplier price to remove
@@ -299,20 +299,23 @@ if ($id > 0 || $ref)
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $id . '&rowid=' . $rowid, $langs->trans('DeleteProductBuyPrice'), $langs->trans('ConfirmDeleteProductBuyPrice'), 'confirm_remove_pf', '', 0, 1);
 			echo $formconfirm;
 		}
-		
+
 		if ($action <> 'edit' && $action <> 're-edit')
 		{
 			$head=product_prepare_head($object);
 			$titre=$langs->trans("CardProduct".$object->type);
 			$picto=($object->type== Product::TYPE_SERVICE?'service':'product');
 			dol_fiche_head($head, 'suppliers', $titre, 0, $picto);
-			
+
 			$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
-				
-            dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
-            
+
+            $shownav = 1;
+            if ($user->societe_id && ! in_array('product', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
+
+			dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
+
             print '<div class="fichecenter">';
-            
+
             print '<div class="underbanner clearboth"></div>';
             print '<table class="border tableforfield" width="100%">';
 
@@ -337,14 +340,14 @@ if ($id > 0 || $ref)
             print '</td><td colspan="2">';
             print $form->editfieldval($text,'cost_price',$object->cost_price,$object,$user->rights->produit->creer||$user->rights->service->creer,'amount:6');
             print '</td></tr>';
-            
+
 			print '</table>';
 
             print '</div>';
             print '<div style="clear:both"></div>';
-			
+
 			dol_fiche_end();
-			
+
 
 			// Form to add or update a price
 			if (($action == 'add_price' || $action == 'updateprice' ) && ($user->rights->produit->creer || $user->rights->service->creer))
@@ -364,7 +367,7 @@ if ($id > 0 || $ref)
 				print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST">';
 				print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 				print '<input type="hidden" name="action" value="updateprice">';
-				
+
 				dol_fiche_head();
 
 				print '<table class="border" width="100%">';
@@ -449,11 +452,11 @@ if ($id > 0 || $ref)
 				$default_vat=get_default_tva($mysoc2, $mysoc, $object->id, 0);
 				$default_npr=get_default_npr($mysoc2, $mysoc, $object->id, 0);
 				if (empty($default_vat)) $default_npr=$default_vat;
-				
+
 				print '<tr><td class="fieldrequired">'.$langs->trans("VATRateForSupplierProduct").'</td>';
 				print '<td>';
 				//print $form->load_tva('tva_tx',$object->tva_tx,$supplier,$mysoc);    // Do not use list here as it may be any vat rates for any country
-				if (! empty($rowid))	// If we have a supplier, it is an update, we must show the vat of current supplier price 
+				if (! empty($rowid))	// If we have a supplier, it is an update, we must show the vat of current supplier price
 				{
 				    $tmpproductsupplier=new ProductFournisseur($db);
 				    $tmpproductsupplier->fetch_product_fournisseur_price($rowid, 1);
@@ -462,7 +465,7 @@ if ($id > 0 || $ref)
 				}
 				else
 				{
-                    if (empty($default_vat)) 
+                    if (empty($default_vat))
                     {
                         $default_vat=$object->tva_tx;
                     }
@@ -588,7 +591,7 @@ if ($id > 0 || $ref)
 				$product_fourn_list = $product_fourn->list_product_fournisseur_price($object->id, $sortfield, $sortorder);
 				$nbtotalofrecords = count($product_fourn_list);
 			    print_barre_liste($langs->trans('SupplierPrices'), $page, $_SERVEUR ['PHP_SELF'], $option, $sortfield, $sortorder, '', count($product_fourn_list), $nbtotalofrecords, 'title_accountancy.png');
-			     
+
 				// Suppliers list title
 			    print '<div class="div-table-responsive">';
 			    print '<table class="noborder" width="100%">';
@@ -607,7 +610,7 @@ if ($id > 0 || $ref)
 				print_liste_field_titre($langs->trans("DiscountQtyMin"),$_SERVER["PHP_SELF"],'','',$param,'align="right"',$sortfield,$sortorder);
 				print_liste_field_titre($langs->trans("NbDaysToDelivery"),$_SERVER["PHP_SELF"],"pfp.delivery_time_days","",$param,'align="right"',$sortfield,$sortorder);
 				print_liste_field_titre($langs->trans("ReputationForThisProduct"),$_SERVER["PHP_SELF"],"pfp.supplier_reputation","",$param,'align="center"',$sortfield,$sortorder);
-				
+
 				// Charges ????
 				if ($conf->global->PRODUCT_CHARGES)
 				{
@@ -628,7 +631,7 @@ if ($id > 0 || $ref)
 
 						// Supplier
 						print '<td>'.$productfourn->getSocNomUrl(1,'supplier').'</td>';
-						
+
 						// Supplier
 						print '<td align="left">'.$productfourn->fourn_ref.'</td>';
 
@@ -674,8 +677,8 @@ if ($id > 0 || $ref)
 						// Reputation
 						print '<td align="center">';
 						if (!empty($productfourn->supplier_reputation) && !empty($object->reputations[$productfourn->supplier_reputation])) {
-							print $object->reputations[$productfourn->supplier_reputation];	
-						}  
+							print $object->reputations[$productfourn->supplier_reputation];
+						}
 						print'</td>';
 
 						// Charges ????
diff --git a/htdocs/product/info.php b/htdocs/product/info.php
index e29d1a168cb..58e7998ad47 100644
--- a/htdocs/product/info.php
+++ b/htdocs/product/info.php
@@ -87,7 +87,7 @@ if ($id > 0 || $ref)
 
 		exit;
 	}
-	
+
 	$head=product_prepare_head($object);
     $titre=$langs->trans("CardProduct".$object->type);
     $picto=($object->type== Product::TYPE_SERVICE?'service':'product');
@@ -95,8 +95,11 @@ if ($id > 0 || $ref)
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
 
-	dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
-	
+    $shownav = 1;
+    if ($user->societe_id && ! in_array('product', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
+
+	dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
+
 	$object->info($object->id);
 
 	print '<div class="fichecenter">';
@@ -104,11 +107,11 @@ if ($id > 0 || $ref)
 	print '<div class="underbanner clearboth"></div>';
 
 	print '<br>';
-	
+
 	dol_print_object_info($object);
 
 	print '</div>';
-	
+
 	dol_fiche_end();
 }
 
diff --git a/htdocs/product/note.php b/htdocs/product/note.php
index 9a914527a83..2d71c2ff1a3 100644
--- a/htdocs/product/note.php
+++ b/htdocs/product/note.php
@@ -90,21 +90,24 @@ if ($id > 0 || ! empty($ref))
     $head = product_prepare_head($object);
     $titre=$langs->trans("CardProduct".$object->type);
     $picto=($object->type==Product::TYPE_SERVICE?'service':'product');
-    
+
     dol_fiche_head($head, 'note', $titre, 0, $picto);
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
+    $shownav = 1;
+    if ($user->societe_id && ! in_array('product', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
+
+	dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
 
     $cssclass='titlefield';
     //if ($action == 'editnote_public') $cssclass='titlefieldcreate';
     //if ($action == 'editnote_private') $cssclass='titlefieldcreate';
-    
+
     //print '<div class="fichecenter">';
-    
+
     print '<div class="underbanner clearboth"></div>';
-    
+
     include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
     dol_fiche_end();
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 607d6e07097..b18c3b8828a 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -90,9 +90,9 @@ if (empty($reshook))
 {
     if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
     {
-        $search_soc = '';        
+        $search_soc = '';
     }
-    
+
     if ($action == 'setlabelsellingprice' && $user->admin)
     {
         require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
@@ -100,7 +100,7 @@ if (empty($reshook))
         dolibarr_set_const($db, $keyforlabel, GETPOST('labelsellingprice','alpha'), 'chaine', 0, '', $conf->entity);
         $action = '';
     }
-    
+
 	if (($action == 'update_vat') && !$cancel && ($user->rights->produit->creer || $user->rights->service->creer))
 	{
 	    $tva_tx_txt = GETPOST('tva_tx', 'alpha');           // tva_tx can be '8.5'  or  '8.5*'  or  '8.5 (XXX)' or '8.5* (XXX)'
@@ -149,14 +149,14 @@ if (empty($reshook))
 	        $error++;
 	        setEventMessages($object->error, $object->errors, 'errors');
 	    }
-	    
+
 	    if ($error)
 	    {
 	        //$localtaxarray=array('0'=>$localtax1_type,'1'=>$localtax1,'2'=>$localtax2_type,'3'=>$localtax2);
 	        $localtaxarray=array();    // We do not store localtaxes into product, we will use instead the "vat code" to retreive them.
 	        $object->updatePrice(0, $object->price_base_type, $user, $tva_tx, '', 0, $npr, 0, 0, $localtaxarray, $vatratecode);
 	    }
-	    
+
 	    if (! $error)
 	    {
 	        $db->commit();
@@ -165,10 +165,10 @@ if (empty($reshook))
 	    {
 	        $db->rollback();
 	    }
-	    
+
 	    $action='';
 	}
-	    
+
 	if (($action == 'update_price') && !$cancel && $object->getRights()->creer)
     {
 		$error = 0;
@@ -208,14 +208,14 @@ if (empty($reshook))
 			//Shall we generate prices using price rules?
 			$object->price_autogen = GETPOST('usePriceRules') == 'on';
 
-			for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i ++) 
+			for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i ++)
 			{
 				if (!isset($newprice[$i])) {
 					continue;
 				}
 
 				$tva_tx_txt = $newvattx[$i];
-				
+
 				$vatratecode = '';
         	    $tva_tx = preg_replace('/[^0-9\.].*$/', '', $tva_tx_txt);     // keep remove all after the numbers and dot
         	    $npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
@@ -242,7 +242,7 @@ if (empty($reshook))
         	            $localtax2 = $obj->localtax2;
         	            $localtax1_type = $obj->localtax1_type;
         	            $localtax2_type = $obj->localtax2_type;
-        	        }        	        
+        	        }
         	    }
 
 				$pricestoupdate[$i] = array(
@@ -469,7 +469,7 @@ if (empty($reshook))
 		$prodcustprice->price_base_type = GETPOST("price_base_type", 'alpha');
 
 		$tva_tx_txt = GETPOST("tva_tx");
-		
+
 		$vatratecode = '';
 		// We must define tva_tx, npr and local taxes
 		$tva_tx = preg_replace('/[^0-9\.].*$/', '', $tva_tx_txt);     // keep remove all after the numbers and dot
@@ -496,8 +496,8 @@ if (empty($reshook))
 		        $localtax1_type = $obj->localtax1_type;
 		        $localtax2_type = $obj->localtax2_type;
 		    }
-		}		
-		
+		}
+
 		$prodcustprice->default_vat_code = $vatratecode;
 		$prodcustprice->tva_tx = $tva_tx;
 		$prodcustprice->recuperableonly = $npr;
@@ -505,7 +505,7 @@ if (empty($reshook))
 		$prodcustprice->localtax2_tx = $localtax2;
 		$prodcustprice->localtax1_type = $localtax1_type;
 		$prodcustprice->localtax2_type = $localtax2_type;
-		
+
 		if (! ($prodcustprice->fk_soc > 0))
 		{
 		    $langs->load("errors");
@@ -591,7 +591,7 @@ if (empty($reshook))
 		        $localtax2_type = $obj->localtax2_type;
 		    }
 		}
-		
+
 		$prodcustprice->default_vat_code = $vatratecode;
 		$prodcustprice->tva_tx = $tva_tx;
 		$prodcustprice->recuperableonly = $npr;
@@ -599,7 +599,7 @@ if (empty($reshook))
 		$prodcustprice->localtax2_tx = $localtax2;
 		$prodcustprice->localtax1_type = $localtax1_type;
 		$prodcustprice->localtax2_type = $localtax2_type;
-		
+
 		if ($prodcustprice->price_min < $maxpricesupplier && !empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE))
 		{
 			setEventMessages($langs->trans("MinimumPriceLimit",price($maxpricesupplier,0,'',1,-1,-1,'auto')), null, 'errors');
@@ -658,7 +658,10 @@ dol_fiche_head($head, 'price', $titre, 0, $picto);
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
 
-dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
+$shownav = 1;
+if ($user->societe_id && ! in_array('product', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
+
+dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
 
 
 print '<div class="fichecenter">';
@@ -702,7 +705,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 			print price($object->multiprices_min[$soc->price_level]) . ' ' . $langs->trans(empty($object->multiprices_base_type[$soc->price_level])?'HT':$object->multiprices_base_type[$soc->price_level]);
 		}
 		print '</td></tr>';
-        
+
 		if (! empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL))  // using this option is a bug. kept for backward compatibility
 		{
     	   // TVA
@@ -719,7 +722,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
         	else print vatrate($object->tva_tx . ($object->tva_npr ? '*' : ''), true);
         	print '</td></tr>';
 		}
-		
+
 	}
 	else
 	{
@@ -742,9 +745,9 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 	        print '</td></tr>';
 		}
 	    print '</table>';
-	    
+
 	    print '<br>';
-	    
+
 	    print '<table class="noborder tableforfield" width="100%">';
 		print '<tr class="liste_titre"><td>';
 		print $langs->trans("PriceLevel");
@@ -755,11 +758,11 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 		print '</tr>';
 
 		$var=True;
-		
+
 		for($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++)
 		{
 		    $var = ! $var;
-		    
+
 			print '<tr '.$bc[$var].'>';
 
 			// Label of price
@@ -824,7 +827,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 					print '<td align="right">' . $langs->trans("Discount") . '</td>';
 					print '<td>&nbsp;</td>';
 					print '</tr>';
-					foreach ($object->prices_by_qty_list[$i] as $ii => $prices) 
+					foreach ($object->prices_by_qty_list[$i] as $ii => $prices)
 					{
 						if ($action == 'edit_price_by_qty' && $rowid == $prices['rowid'] && ($user->rights->produit->creer || $user->rights->service->creer)) {
 							print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST">';
@@ -882,15 +885,15 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 			}
 		}
 	}
-} 
-else 
+}
+else
 {
 	// TVA
 	print '<tr><td class="titlefield">' . $langs->trans("VATRate") . '</td><td>';
 	if ($object->default_vat_code)
 	{
         print vatrate($object->tva_tx, true) . ' ('.$object->default_vat_code.')';
-	}   
+	}
 	else print vatrate($object->tva_tx, true, $object->tva_npr, true);
 	print '</td></tr>';
 
@@ -1021,18 +1024,18 @@ if (! $action || $action == 'delete' || $action == 'showlog_customer_price' || $
 	 		print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=add_customer_price&amp;id=' . $object->id . '">' . $langs->trans("AddCustomerPrice") . '</a></div>';
 	  	}
 	}
-	
+
 	if (! empty($conf->global->PRODUIT_MULTIPRICES))
 	{
 	    if ($user->rights->produit->creer || $user->rights->service->creer) {
     		print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=edit_vat&amp;id=' . $object->id . '">' . $langs->trans("UpdateVAT") . '</a></div>';
     	}
-	    
+
 	    if ($user->rights->produit->creer || $user->rights->service->creer) {
     		print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=edit_price&amp;id=' . $object->id . '">' . $langs->trans("UpdateLevelPrices") . '</a></div>';
     	}
 	}
-    
+
 	print "\n</div>\n";
 }
 
@@ -1041,7 +1044,7 @@ if (! $action || $action == 'delete' || $action == 'showlog_customer_price' || $
 /*
  * Edit price area
  */
- 
+
 if ($action == 'edit_vat' && ($user->rights->produit->creer || $user->rights->service->creer))
 {
 	print load_fiche_titre($langs->trans("UpdateVAT"), '');
@@ -1052,9 +1055,9 @@ if ($action == 'edit_vat' && ($user->rights->produit->creer || $user->rights->se
 	print '<input type="hidden" name="id" value="' . $object->id . '">';
 
 	dol_fiche_head('');
-	
+
 	print '<table class="border" width="100%">';
-	
+
 	// VAT
 	print '<tr><td>' . $langs->trans("VATRate") . '</td><td>';
 	print $form->load_tva("tva_tx", $object->default_vat_code ? $object->tva_tx.' ('.$object->default_vat_code.')' : $object->tva_tx, $mysoc, '', $object->id, $object->tva_npr, $object->type, false, 1);
@@ -1072,7 +1075,7 @@ if ($action == 'edit_vat' && ($user->rights->produit->creer || $user->rights->se
 
 	print '<br></form><br>';
 }
- 
+
 if ($action == 'edit_price' && $object->getRights()->creer)
 {
 	print load_fiche_titre($langs->trans("NewPrice"), '');
@@ -1085,7 +1088,7 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 		print '<input type="hidden" name="id" value="' . $object->id . '">';
 
 		dol_fiche_head('');
-		
+
 		print '<table class="border" width="100%">';
 
 		// VAT
@@ -1168,7 +1171,7 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 		}
 		print '</td>';
 		print '</tr>';
-		
+
 		print '</table>';
 
 		dol_fiche_end();
@@ -1213,21 +1216,21 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 		print '<input type="hidden" name="id" value="' . $object->id . '">';
 
 		dol_fiche_head('');
-		
+
 		if (! empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($conf->global->PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL)) {
 			print $langs->trans('UseMultipriceRules'). ' <input type="checkbox" id="usePriceRules" name="usePriceRules" '.($object->price_autogen ? 'checked' : '').'><br><br>';
 		}
 
 		print '<table class="noborder">';
 		print '<thead><tr class="liste_titre">';
-		
+
 		print '<td>'.$langs->trans("PriceLevel").'</td>';
 
 		if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) print '<td style="text-align: center">'.$langs->trans("VATRate").'</td>';
 		else print '<td></td>';
-		
+
 		print '<td class="center">'.$langs->trans("SellingPrice").'</td>';
-		
+
 		print '<td class="center">'.$langs->trans("MinPrice").'</td>';
 
 		if (!empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE)) {
@@ -1236,9 +1239,9 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 		print '</tr></thead>';
 
 		print '<tbody>';
-		
+
 		$var = false;
-		for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i ++) 
+		for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i ++)
 		{
 			$var = !$var;
 
@@ -1291,11 +1294,11 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 		}
 
 		print '</tbody>';
-		
+
 		print '</table>';
-		
+
 		dol_fiche_end();
-		
+
 		print '<div style="text-align: center">';
 		print '<input type="submit" class="button" value="' . $langs->trans("Save") . '">';
 		print '&nbsp;&nbsp;&nbsp;';
@@ -1321,48 +1324,48 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action=='showlog_default_
     if (! empty($socid) && ! empty($conf->global->PRODUIT_MULTIPRICES)) $sql .= " AND p.price_level = " . $soc->price_level;
     $sql .= " ORDER BY p.date_price DESC, p.rowid DESC, p.price_level ASC";
     // $sql .= $db->plimit();
-    
+
     $result = $db->query($sql);
     if ($result)
     {
     	$num = $db->num_rows($result);
-    
+
     	if (! $num)
     	{
     		$db->free($result);
-    
+
     		// Il doit au moins y avoir la ligne de prix initial.
     		// On l'ajoute donc pour remettre a niveau (pb vieilles versions)
     		$object->updatePrice($object->price, $object->price_base_type, $user, $newprice_min);
-    
+
     		$result = $db->query($sql);
     		$num = $db->num_rows($result);
     	}
-    
+
     	if ($num > 0)
     	{
     	    // Default prices or
     	    // Log of previous customer prices
     	    $backbutton='<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '">' . $langs->trans("Back") . '</a>';
-    	    	
+
     		if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) print_barre_liste($langs->trans("DefaultPrice"), 0, $_SERVER["PHP_SELF"], '', '', '', $backbutton, $num, $num, 'title_accountancy.png');
     		else print_barre_liste($langs->trans("PriceByCustomerLog"), 0, $_SERVER["PHP_SELF"], '', '', '', '', $num, $num, 'title_accountancy.png');
     	    //if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) print_barre_liste($langs->trans("DefaultPrice"),'','','','','',$backbutton, 0, 0, 'title_accountancy.png');
     		//else print_barre_liste($langs->trans("PriceByCustomerLog"),'','','','','','', 0, 0, 'title_accountancy.png');
-    
+
     		print '<div class="div-table-responsive">';
     		print '<table class="noborder" width="100%">';
-    
+
     		print '<tr class="liste_titre">';
     		print '<td>' . $langs->trans("AppliedPricesFrom") . '</td>';
-    
+
     		if (! empty($conf->global->PRODUIT_MULTIPRICES)) {
     			print '<td align="center">' . $langs->trans("PriceLevel") . '</td>';
     		}
     		if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) {
     			print '<td align="center">' . $langs->trans("Type") . '</td>';
     		}
-    
+
     		print '<td align="center">' . $langs->trans("PriceBase") . '</td>';
     		print $conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL;
     		if (empty($conf->global->PRODUIT_MULTIPRICES)) print '<td align="right">' . $langs->trans("VATRate") . '</td>';
@@ -1377,9 +1380,9 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action=='showlog_default_
     		if ($user->rights->produit->supprimer)
     			print '<td align="right">&nbsp;</td>';
     		print '</tr>';
-    
+
     		$notfirstlineforlevel=array();
-    		
+
     		$var = True;
     		$i = 0;
     		while ($i < $num)
@@ -1389,7 +1392,7 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action=='showlog_default_
     			print '<tr '. $bc[$var].'>';
     			// Date
     			print "<td>" . dol_print_date($db->jdate($objp->dp), "dayhour") . "</td>";
-    
+
     			// Price level
     			if (! empty($conf->global->PRODUIT_MULTIPRICES)) {
     				print '<td align="center">' . $objp->price_level . "</td>";
@@ -1400,9 +1403,9 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action=='showlog_default_
     				$type = ($objp->price_by_qty == 1) ? 'PriceByQuantity' : 'Standard';
     				print '<td align="center">' . $langs->trans($type) . "</td>";
     			}
-    
+
     			print '<td align="center">' . $langs->trans($objp->price_base_type) . "</td>";
-    			if (empty($conf->global->PRODUIT_MULTIPRICES)) 
+    			if (empty($conf->global->PRODUIT_MULTIPRICES))
     			{
     			    print '<td align="right">';
     			    if ($objp->default_vat_code)
@@ -1412,7 +1415,7 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action=='showlog_default_
     			    else print vatrate($objp->tva_tx, true, $objp->recuperableonly);
     			    print "</td>";
     			}
-    
+
     			// Price
     			if (! empty($objp->fk_price_expression) && ! empty($conf->dynamicprices->enabled))
     			{
@@ -1433,23 +1436,23 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action=='showlog_default_
     			}
     			print '<td align="right">' . ($objp->price_base_type != 'TTC' ? price($objp->price_min) : '') . '</td>';
     			print '<td align="right">' . ($objp->price_base_type == 'TTC' ? price($objp->price_min_ttc) : '') . '</td>';
-    
+
     			// User
     			print '<td align="right"><a href="' . DOL_URL_ROOT . '/user/card.php?id=' . $objp->user_id . '">' . img_object($langs->trans("ShowUser"), 'user') . ' ' . $objp->login . '</a></td>';
-    
+
     			// Action
     			if ($user->rights->produit->supprimer)
     			{
     			    $candelete=0;
-    			    if (! empty($conf->global->PRODUIT_MULTIPRICES)) 
+    			    if (! empty($conf->global->PRODUIT_MULTIPRICES))
     			    {
     			        if (empty($notfirstlineforlevel[$objp->price_level])) $notfirstlineforlevel[$objp->price_level]=1;
     			        else $candelete=1;
     			    }
     			    elseif ($i > 0) $candelete=1;
-    			    
+
     				print '<td align="right">';
-    				if ($candelete) 
+    				if ($candelete)
     				{
     					print '<a href="' . $_SERVER["PHP_SELF"] . '?action=delete&amp;id=' . $object->id . '&amp;lineid=' . $objp->rowid . '">';
     					print img_delete();
@@ -1458,11 +1461,11 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action=='showlog_default_
     					print '&nbsp;'; // Can not delete last price (it's current price)
     				print '</td>';
     			}
-    
+
     			print "</tr>\n";
     			$i++;
     		}
-    		
+
     		$db->free($result);
     		print "</table>";
     		print '</div>';
@@ -1511,9 +1514,9 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
 		print '<input type="hidden" name="action" value="add_customer_price_confirm">';
 		print '<input type="hidden" name="id" value="' . $object->id . '">';
-		
+
 		dol_fiche_head();
-		
+
 		print '<table class="border" width="100%">';
 		print '<tr>';
 		print '<td class="fieldrequired">' . $langs->trans('ThirdParty') . '</td>';
@@ -1575,7 +1578,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		print '</table>';
 
 		dol_fiche_end();
-		
+
 		print '<div class="center">';
 		print '<input type="submit" class="button" value="' . $langs->trans("Save") . '">';
 		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
@@ -1612,7 +1615,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		print '<tr><td>' . $langs->trans("VATRate") . '</td><td colspan="2">';
 		print $form->load_tva("tva_tx", $prodcustprice->default_vat_code ? $prodcustprice->tva_tx.' ('.$prodcustprice->default_vat_code.')' : $prodcustprice->tva_tx, $mysoc, '', $object->id, $prodcustprice->recuperableonly, $object->type, false, 1);
 		print '</td></tr>';
-		
+
 		// Price base
 		print '<tr><td width="15%">';
 		print $langs->trans('PriceBase');
@@ -1689,12 +1692,12 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 
 		$staticsoc = new Societe($db);
 		$staticsoc->fetch(GETPOST('socid', 'int'));
-		
+
 		$title=$langs->trans('PriceByCustomerLog');
 		$title.=' - '.$staticsoc->getNomUrl(1);
 
 		$backbutton='<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '">' . $langs->trans("Back") . '</a>';
-		
+
 		print_barre_liste($title, $page, $_SERVEUR['PHP_SELF'], $option, $sortfield, $sortorder, $backbutton, count($prodcustprice->lines), $nbtotalofrecords, 'title_accountancy.png');
 
 		if (count($prodcustprice->lines) > 0)
@@ -1732,7 +1735,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 				print "<td>" . dol_print_date($line->datec, "dayhour") . "</td>";
 
 				$tva_tx = $line->default_vat_code ? $line->tva_tx.' ('.$line->default_vat_code.')' : $line->tva_tx;
-				
+
 				print '<td align="center">' . $langs->trans($line->price_base_type) . "</td>";
 				print '<td align="right">' . vatrate($tva_tx, true, $line->recuperableonly) . "</td>";
 				print '<td align="right">' . price($line->price) . "</td>";
@@ -1756,7 +1759,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 	{
 		// List of all prices by customers
         print '<!-- list of prices per customer -->'."\n";
-        
+
 		// Count total nb of records
 		$nbtotalofrecords = '';
 		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
@@ -1802,15 +1805,15 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
             print '</td>';
     		print '</tr>';
 		}
-		
+
 		$var = False;
-		
-		
+
+
 		// Line for default price
 		print "<tr ".$bc[$var].">";
 		print "<td>" . $langs->trans("Default") . "</td>";
 		print "<td>" . "</td>";
-		
+
 		print '<td align="center">' . $langs->trans($object->price_base_type) . "</td>";
 		print '<td align="right">' . vatrate($object->tva_tx, true, $object->recuperableonly) . "</td>";
 		print '<td align="right">' . price($object->price) . "</td>";
@@ -1834,21 +1837,21 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		}
 		print "</tr>\n";
 
-		
+
 		if (count($prodcustprice->lines) > 0)
 		{
 		    $var = false;
 			foreach ($prodcustprice->lines as $line)
 			{
 			    $var = ! $var;
-			    
+
 				print "<tr ".$bc[$var].">";
 				// Date
 				$staticsoc = new Societe($db);
 				$staticsoc->fetch($line->fk_soc);
 
 				$tva_tx = $line->default_vat_code ? $line->tva_tx.' ('.$line->default_vat_code.')' : $line->tva_tx;
-				
+
 				print "<td>" . $staticsoc->getNomUrl(1) . "</td>";
 				print "<td>" . dol_print_date($line->datec, "dayhour") . "</td>";
 
diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php
index d0a85756c04..7272524f9e3 100644
--- a/htdocs/product/stats/card.php
+++ b/htdocs/product/stats/card.php
@@ -124,8 +124,11 @@ if (! empty($id) || ! empty($ref) || GETPOST('id') == 'all')
 		dol_fiche_head($head, 'stats', $titre, 0, $picto);
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
-		
-        dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref', '', '', '', 0, '', '', 1);
+
+        $shownav = 1;
+        if ($user->societe_id && ! in_array('product', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
+
+		dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref', '', '', '', 0, '', '', 1);
 
         dol_fiche_end();
 	}
@@ -323,15 +326,15 @@ if (! empty($id) || ! empty($ref) || GETPOST('id') == 'all')
 			foreach($graphfiles as $key => $val)
 			{
 				if (! $graphfiles[$key]['file']) continue;
-	
+
 				if ($graphfiles == 'propal' && ! $user->rights->propale->lire) continue;
 				if ($graphfiles == 'order' && ! $user->rights->commande->lire) continue;
 				if ($graphfiles == 'invoices' && ! $user->rights->facture->lire) continue;
 				if ($graphfiles == 'proposals_suppliers' && ! $user->rights->supplier_proposal->lire) continue;
 				if ($graphfiles == 'invoices_suppliers' && ! $user->rights->fournisseur->facture->lire) continue;
 				if ($graphfiles == 'orders_suppliers' && ! $user->rights->fournisseur->commande->lire) continue;
-	
-	
+
+
 				if ($i % 2 == 0)
 				{
 					print "\n".'<div class="fichecenter"><div class="fichehalfleft">'."\n";
@@ -340,7 +343,7 @@ if (! empty($id) || ! empty($ref) || GETPOST('id') == 'all')
 				{
 					print "\n".'<div class="fichehalfright"><div class="ficheaddleft">'."\n";
 				}
-	
+
 				// Date generation
 				if ($graphfiles[$key]['output'] && ! $px->isGraphKo())
 				{
@@ -352,7 +355,7 @@ if (! empty($id) || ! empty($ref) || GETPOST('id') == 'all')
 				    print $dategenerated=($mesg?'<font class="error">'.$mesg.'</font>':$langs->trans("ChartNotGenerated"));
 				}
 				$linktoregenerate='<a href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id')?GETPOST('id'):$object->id).((string) $type != ''?'&amp;type='.$type:'').'&amp;action=recalcul&amp;mode='.$mode.'">'.img_picto($langs->trans("ReCalculate").' ('.$dategenerated.')','refresh').'</a>';
-				
+
 				// Show graph
 				print '<table class="noborder" width="100%">';
 				// Label
@@ -366,7 +369,7 @@ if (! empty($id) || ! empty($ref) || GETPOST('id') == 'all')
 				print $graphfiles[$key]['output'];
 				print '</td></tr>';
 				print '</table>';
-	
+
 				if ($i % 2 == 0)
 				{
 					print "\n".'</div>'."\n";
@@ -376,7 +379,7 @@ if (! empty($id) || ! empty($ref) || GETPOST('id') == 'all')
 					print "\n".'</div></div></div>';
 					print '<div class="clear"><div class="fichecenter"><br></div></div>'."\n";
 				}
-	
+
 				$i++;
 			}
 		}
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index 192017af2a5..3792217b20f 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -82,7 +82,7 @@ if ($id > 0 || ! empty($ref))
 	$result = $product->fetch($id, $ref);
 
 	$object = $product;
-	
+
 	$parameters=array('id'=>$id);
 	$reshook=$hookmanager->executeHooks('doActions',$parameters,$product,$action);    // Note that $action and $object may have been modified by some hooks
 	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -100,11 +100,14 @@ if ($id > 0 || ! empty($ref))
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
         $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
-		
-        dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
-        
+
+        $shownav = 1;
+        if ($user->societe_id && ! in_array('product', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
+
+        dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
+
         print '<div class="fichecenter">';
-        
+
         print '<div class="underbanner clearboth"></div>';
         print '<table class="border tableforfield" width="100%">';
 
@@ -114,9 +117,9 @@ if ($id > 0 || ! empty($ref))
 
         print '</div>';
         print '<div style="clear:both"></div>';
-		
+
 		dol_fiche_end();
-		
+
 
 		if ($user->rights->commande->lire)
 		{
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index bed3be1892f..46731f3ab37 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -88,7 +88,7 @@ if ($id > 0 || ! empty($ref)) {
 	$result = $product->fetch($id, $ref);
 
 	$object = $product;
-	
+
 	$parameters = array ('id' => $id);
 	$reshook = $hookmanager->executeHooks('doActions', $parameters, $product, $action); // Note that $action and $object may have been modified by some hooks
 	if ($reshook < 0)
@@ -96,7 +96,7 @@ if ($id > 0 || ! empty($ref)) {
 
 	llxHeader("", "", $langs->trans("CardProduct" . $product->type));
 
-	if ($result > 0) 
+	if ($result > 0)
 	{
 		$head = product_prepare_head($product);
 		$titre = $langs->trans("CardProduct" . $product->type);
@@ -108,11 +108,14 @@ if ($id > 0 || ! empty($ref)) {
 			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
-				
-        dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
-        
+
+        $shownav = 1;
+        if ($user->societe_id && ! in_array('product', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
+
+		dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
+
         print '<div class="fichecenter">';
-        
+
         print '<div class="underbanner clearboth"></div>';
         print '<table class="border tableforfield" width="100%">';
 
@@ -122,9 +125,9 @@ if ($id > 0 || ! empty($ref)) {
 
         print '</div>';
         print '<div style="clear:both"></div>';
-		
+
 		dol_fiche_end();
-		
+
 
 		if ($user->rights->fournisseur->commande->lire)
 		{
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index 8c5f1a3ba86..754c299fbfd 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -72,7 +72,7 @@ if ($id > 0 || ! empty($ref))
 	$result = $product->fetch($id, $ref);
 
 	$object = $product;
-	
+
 	$parameters=array('id'=>$id);
 	$reshook=$hookmanager->executeHooks('doActions',$parameters,$product,$action);    // Note that $action and $object may have been modified by some hooks
 	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -90,11 +90,14 @@ if ($id > 0 || ! empty($ref))
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
         $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
-		
-        dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
-        
+
+        $shownav = 1;
+        if ($user->societe_id && ! in_array('product', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
+
+        dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
+
         print '<div class="fichecenter">';
-        
+
         print '<div class="underbanner clearboth"></div>';
         print '<table class="border tableforfield" width="100%">';
 
@@ -104,9 +107,9 @@ if ($id > 0 || ! empty($ref))
 
         print '</div>';
         print '<div style="clear:both"></div>';
-		
+
 		dol_fiche_end();
-		
+
 
 		$now=dol_now();
 
@@ -141,7 +144,7 @@ if ($id > 0 || ! empty($ref))
                 $option .= '&amp;search_month=' . $search_month;
             if (! empty($search_year))
                 $option .= '&amp;search_year=' . $search_year;
-            
+
             print '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?id=' . $product->id . '" name="search_form">' . "\n";
             if (! empty($sortfield))
                 print '<input type="hidden" name="sortfield" value="' . $sortfield . '"/>';
@@ -151,7 +154,7 @@ if ($id > 0 || ! empty($ref))
                 print '<input type="hidden" name="page" value="' . $page . '"/>';
                 $option .= '&amp;page=' . $page;
             }
-			                    
+
 			print_barre_liste($langs->trans("Contrats"),$page,$_SERVER["PHP_SELF"],"&amp;id=$product->id",$sortfield,$sortorder,'',$num,0,'');
 
 			$i = 0;
@@ -197,7 +200,7 @@ if ($id > 0 || ! empty($ref))
 					$i++;
 				}
 			}
-			
+
 			print '</table>';
 			print '</div>';
 			print '</form>';
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 53e5b0ab0a6..1c7b717f6d1 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -83,9 +83,9 @@ if ($id > 0 || ! empty($ref))
 {
 	$product = new Product($db);
 	$result = $product->fetch($id, $ref);
-    
+
 	$object = $product;
-    
+
 	$parameters=array('id'=>$id);
 	$reshook=$hookmanager->executeHooks('doActions',$parameters,$product,$action);    // Note that $action and $object may have been modified by some hooks
 	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -117,11 +117,14 @@ if ($id > 0 || ! empty($ref))
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
         $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
-        
-		dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
-        
+
+        $shownav = 1;
+        if ($user->societe_id && ! in_array('product', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
+
+        dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
+
         print '<div class="fichecenter">';
-        
+
         print '<div class="underbanner clearboth"></div>';
         print '<table class="border tableforfield" width="100%">';
 
@@ -131,14 +134,14 @@ if ($id > 0 || ! empty($ref))
 
         print '</div>';
         print '<div style="clear:both"></div>';
-		
+
 		dol_fiche_end();
 
 		if ($showmessage && $nboflines > 1)
 		{
 			print $langs->trans("ClinkOnALinkOfColumn", $langs->transnoentitiesnoconv("Referers"));
 		}
-        elseif ($user->rights->facture->lire) 
+        elseif ($user->rights->facture->lire)
         {
             $sql = "SELECT DISTINCT s.nom as name, s.rowid as socid, s.code_client,";
             $sql.= " f.facnumber, f.datef, f.paye, f.fk_statut as statut, f.rowid as facid,";
@@ -164,13 +167,13 @@ if ($id > 0 || ! empty($ref))
             $total_ht=0;
             $total_qty=0;
 			$totalrecords=0;
-            if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) 
+            if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
             {
             	$result = $db->query($sql);
-            	if ($result) 
+            	if ($result)
             	{
             		$totalrecords = $db->num_rows($result);
-            		while ($objp = $db->fetch_object($result)) 
+            		while ($objp = $db->fetch_object($result))
             		{
             			$total_ht+=$objp->total_ht;
             			$total_qty+=$objp->qty;
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index 6fe189c7700..f4da679fd3d 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -84,7 +84,7 @@ if ($id > 0 || ! empty($ref))
 	$result = $product->fetch($id, $ref);
 
 	$object = $product;
-	
+
 	$parameters = array('id' => $id);
 	$reshook = $hookmanager->executeHooks('doActions', $parameters, $product, $action); // Note that $action and $object may have been modified by some hooks
 	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -102,11 +102,14 @@ if ($id > 0 || ! empty($ref))
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
         $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
-		
-        dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
-        
+
+        $shownav = 1;
+        if ($user->societe_id && ! in_array('product', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
+
+        dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
+
         print '<div class="fichecenter">';
-        
+
         print '<div class="underbanner clearboth"></div>';
         print '<table class="border tableforfield" width="100%">';
 
@@ -116,9 +119,9 @@ if ($id > 0 || ! empty($ref))
 
         print '</div>';
         print '<div style="clear:both"></div>';
-		
+
 		dol_fiche_end();
-		
+
 
 		if ($user->rights->fournisseur->facture->lire)
 		{
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index 289cf3d3578..04a32e2d94e 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -82,7 +82,7 @@ if ($id > 0 || ! empty($ref))
 	$result = $product->fetch($id, $ref);
 
     $object = $product;
-    
+
 	$parameters = array ('id' => $id);
 	$reshook = $hookmanager->executeHooks('doActions', $parameters, $product, $action); // Note that $action and $object may have been modified by some hooks
 	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -100,11 +100,14 @@ if ($id > 0 || ! empty($ref))
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
         $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
-        
-		dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
-        
+
+        $shownav = 1;
+        if ($user->societe_id && ! in_array('product', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
+
+        dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
+
         print '<div class="fichecenter">';
-        
+
         print '<div class="underbanner clearboth"></div>';
         print '<table class="border tableforfield" width="100%">';
 
@@ -114,11 +117,11 @@ if ($id > 0 || ! empty($ref))
 
         print '</div>';
         print '<div style="clear:both"></div>';
-		
-		dol_fiche_end();
-		
 
-		if ($user->rights->propale->lire) 
+		dol_fiche_end();
+
+
+		if ($user->rights->propale->lire)
 		{
 			$sql = "SELECT DISTINCT s.nom as name, s.rowid as socid, p.rowid as propalid, p.ref, d.total_ht as amount,";
 			$sql .= " p.ref_client,";
@@ -239,7 +242,7 @@ if ($id > 0 || ! empty($ref))
 						}
 					}
 				}
-				
+
         		print '<tr class="liste_total">';
         		print '<td>' . $langs->trans('Total') . '</td>';
         		print '<td colspan="2"></td>';
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index eb853539e01..72b5af2f528 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -100,7 +100,7 @@ if ($action == 'add' && $user->rights->stock->creer)
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
-	else 
+	else
 	{
 		setEventMessages($langs->trans("ErrorWarehouseRefRequired"), null, 'errors');
 		$action="create";   // Force retour sur page creation
@@ -194,7 +194,7 @@ if ($action == 'create')
 	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Ref").'</td><td><input name="libelle" size="20" value=""></td></tr>';
 
 	print '<tr><td>'.$langs->trans("LocationSummary").'</td><td><input name="lieu" size="40" value="'.(!empty($object->lieu)?$object->lieu:'').'"></td></tr>';
-		
+
 	// Parent entrepot
 	print '<tr><td>'.$langs->trans("AddIn").'</td><td>';
 	print $formproduct->selectWarehouses('', 'fk_parent', '', 1);
@@ -276,7 +276,7 @@ else
 			dol_fiche_head($head, 'card', $langs->trans("Warehouse"), 0, 'stock');
 
 			$formconfirm = '';
-			
+
 			// Confirm delete third party
 			if ($action == 'delete')
 			{
@@ -300,7 +300,10 @@ else
 			$morehtmlref.=$langs->trans("LocationSummary").' : '.$object->lieu;
         	$morehtmlref.='</div>';
 
-        	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'libelle', $morehtmlref);
+            $shownav = 1;
+            if ($user->societe_id && ! in_array('stock', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
+
+        	dol_banner_tab($object, 'id', $linkback, $shownav, 'rowid', 'libelle', $morehtmlref);
 
         	print '<div class="fichecenter">';
         	print '<div class="fichehalfleft">';
@@ -315,7 +318,7 @@ else
 				print '<tr><td>'.$langs->trans("ParentWarehouse").'</td><td>';
 				print $e->getNomUrl(3);
 				print '</td></tr>';
-				
+
 			}
 
 			// Description
diff --git a/htdocs/product/stock/info.php b/htdocs/product/stock/info.php
index 7f6a9f6031b..a088ac289b8 100644
--- a/htdocs/product/stock/info.php
+++ b/htdocs/product/stock/info.php
@@ -54,9 +54,12 @@ $morehtmlref='<div class="refidno">';
 $morehtmlref.=$langs->trans("LocationSummary").' : '.$object->lieu;
 $morehtmlref.='</div>';
 
-dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'libelle', $morehtmlref);
+$shownav = 1;
+if ($user->societe_id && ! in_array('stock', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
+
+dol_banner_tab($object, 'id', $linkback, $shownav, 'rowid', 'libelle', $morehtmlref);
+
 
- 
 print '<div class="fichecenter">';
 print '<div class="underbanner clearboth"></div>';
 
diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
index de46538a037..8479d6e8bd3 100644
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -99,7 +99,7 @@ $arrayfields=array(
     //'m.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500)
 );
 
-$object = new MouvementStock($db);	// To be passed as parameter of executeHooks that need 
+$object = new MouvementStock($db);	// To be passed as parameter of executeHooks that need
 
 
 /*
@@ -164,7 +164,7 @@ if ($action == "correct_stock")
         	//$sellby=GETPOST('sellby');
         	$eatby=dol_mktime(0, 0, 0, GETPOST('eatbymonth'), GETPOST('eatbyday'), GETPOST('eatbyyear'));
         	$sellby=dol_mktime(0, 0, 0, GETPOST('sellbymonth'), GETPOST('sellbyday'), GETPOST('sellbyyear'));
-        	 
+
 	        $result=$product->correct_stock_batch(
 	            $user,
 	            $id,
@@ -210,7 +210,7 @@ if ($action == "transfert_stock" && ! $cancel)
 {
 	$product = new Product($db);
 	if (! empty($product_id)) $result=$product->fetch($product_id);
-    
+
     if (! (GETPOST("id_entrepot_destination",'int') > 0))
     {
         setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
@@ -264,7 +264,7 @@ if ($action == "transfert_stock" && ! $cancel)
             $pricesrc=0;
             if (isset($product->pmp)) $pricesrc=$product->pmp;
             $pricedest=$pricesrc;
-            
+
             if ($product->hasbatch())
             {
                 $pdluo = new Productbatch($db);
@@ -488,8 +488,8 @@ if ($resql)
     $num = $db->num_rows($resql);
 
     $arrayofselected=is_array($toselect)?$toselect:array();
-	
-	
+
+
     $i = 0;
     $help_url='EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
     $texte = $langs->trans("ListOfStockMovements");
@@ -505,20 +505,23 @@ if ($resql)
 
         dol_fiche_head($head, 'movements', $langs->trans("Warehouse"), 0, 'stock');
 
-        
+
         $linkback = '<a href="'.DOL_URL_ROOT.'/product/stock/list.php">'.$langs->trans("BackToList").'</a>';
-        
+
         $morehtmlref='<div class="refidno">';
         $morehtmlref.=$langs->trans("LocationSummary").' : '.$object->lieu;
         $morehtmlref.='</div>';
-        
-        dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'libelle', $morehtmlref);
-        
-         
+
+        $shownav = 1;
+        if ($user->societe_id && ! in_array('stock', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
+
+        dol_banner_tab($object, 'id', $linkback, $shownav, 'rowid', 'libelle', $morehtmlref);
+
+
         print '<div class="fichecenter">';
         print '<div class="fichehalfleft">';
         print '<div class="underbanner clearboth"></div>';
-         
+
         print '<table class="border" width="100%">';
 
         // Description
@@ -539,14 +542,14 @@ if ($resql)
         print "</td></tr>";
 
         print '</table>';
-        	
+
         print '</div>';
         print '<div class="fichehalfright">';
         print '<div class="ficheaddleft">';
         print '<div class="underbanner clearboth"></div>';
-        	
+
         print '<table class="border centpercent">';
-        
+
         // Value
         print '<tr><td class="titlefield">'.$langs->trans("EstimatedStockValueShort").'</td><td>';
         print price((empty($calcproducts['qty'])?'0':price2num($calcproducts['qty'],'MT')), 0, $langs, 0, -1, -1, $conf->currency);
@@ -583,9 +586,9 @@ if ($resql)
         print '</div>';
         print '</div>';
         print '</div>';
-        	
+
         print '<div class="clearboth"></div>';
-        
+
         dol_fiche_end();
     }
 
@@ -628,10 +631,10 @@ if ($resql)
         {
             print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=transfert">'.$langs->trans("StockTransfer").'</a>';
         }
-        
+
         print '</div><br>';
     }
-	
+
     $param='';
     if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
     if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
@@ -662,7 +665,7 @@ if ($resql)
 	//if ($user->rights->stock->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
 	if ($massaction == 'presend') $arrayofmassactions=array();
 	$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
-    
+
     print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -673,23 +676,23 @@ if ($resql)
     print '<input type="hidden" name="type" value="'.$type.'">';
     print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
     if ($id > 0) print '<input type="hidden" name="id" value="'.$id.'">';
-    
+
     if ($id > 0) print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,$massactionbutton,$num, $nbtotalofrecords, '', 0, '', '', $limit);
     else print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,$massactionbutton,$num, $nbtotalofrecords, 'title_generic', 0, '', '', $limit);
-    
+
 	if ($sall)
     {
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
         print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
     }
-	
+
     $moreforfilter='';
-    
+
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
 	if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
 	else $moreforfilter = $hookmanager->resPrint;
-	
+
 	if (! empty($moreforfilter))
 	{
         print '<div class="liste_titre liste_titre_bydiv centpercent">';
@@ -699,10 +702,10 @@ if ($resql)
 
     $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
     $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-	
+
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-    
+
     print "<tr class=\"liste_titre\">";
     if (! empty($arrayfields['m.rowid']['checked']))            print_liste_field_titre($arrayfields['m.rowid']['label'],$_SERVER["PHP_SELF"],'m.rowid','',$param,'',$sortfield,$sortorder);
     if (! empty($arrayfields['m.datem']['checked']))            print_liste_field_titre($arrayfields['m.datem']['label'],$_SERVER["PHP_SELF"],'m.datem','',$param,'',$sortfield,$sortorder);
@@ -720,9 +723,9 @@ if ($resql)
 	// Extra fields
 	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 	{
-	   foreach($extrafields->attribute_label as $key => $val) 
+	   foreach($extrafields->attribute_label as $key => $val)
 	   {
-           if (! empty($arrayfields["ef.".$key]['checked'])) 
+           if (! empty($arrayfields["ef.".$key]['checked']))
            {
 				$align=$extrafields->getAlignFlag($key);
 				print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
@@ -740,14 +743,14 @@ if ($resql)
 
     // Lignes des champs de filtre
     print '<tr class="liste_titre">';
-    if (! empty($arrayfields['m.rowid']['checked'])) 
+    if (! empty($arrayfields['m.rowid']['checked']))
     {
 	    // Ref
 	    print '<td class="liste_titre" align="left">';
 	    print '<input class="flat maxwidth25" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
 	    print '</td>';
     }
-    if (! empty($arrayfields['m.datem']['checked'])) 
+    if (! empty($arrayfields['m.datem']['checked']))
     {
     	print '<td class="liste_titre" valign="right">';
 	    print '<input class="flat" type="text" size="2" maxlength="2" placeholder="'.dol_escape_htmltag($langs->trans("Month")).'" name="month" value="'.$month.'">';
@@ -758,14 +761,14 @@ if ($resql)
 	    //print $formother->selectyear($syear,'year',1, 20, 5);
 	    print '</td>';
     }
-    if (! empty($arrayfields['p.ref']['checked'])) 
+    if (! empty($arrayfields['p.ref']['checked']))
     {
 	    // Product Ref
 	    print '<td class="liste_titre" align="left">';
 	    print '<input class="flat" type="text" size="6" name="search_product_ref" value="'.dol_escape_htmltag($idproduct?$product->ref:$search_product_ref).'">';
 	    print '</td>';
     }
-    if (! empty($arrayfields['p.label']['checked'])) 
+    if (! empty($arrayfields['p.label']['checked']))
     {
 	    // Product label
 	    print '<td class="liste_titre" align="left">';
@@ -773,14 +776,14 @@ if ($resql)
 	    print '</td>';
     }
     // Batch
-    if (! empty($arrayfields['m.batch']['checked'])) 
+    if (! empty($arrayfields['m.batch']['checked']))
     {
     	print '<td class="liste_titre" align="center"><input class="flat" type="text" size="5" name="search_batch" value="'.dol_escape_htmltag($search_batch).'"></td>';
 	}
     if (! empty($arrayfields['pl.eatby']['checked']))
     {
 	    print '<td class="liste_titre" align="left">';
-	    print '</td>';    	
+	    print '</td>';
     }
     if (! empty($arrayfields['pl.sellby']['checked']))
     {
@@ -788,42 +791,42 @@ if ($resql)
 	    print '</td>';
     }
     // Warehouse
-    if (! empty($arrayfields['e.label']['checked'])) 
+    if (! empty($arrayfields['e.label']['checked']))
     {
         print '<td class="liste_titre maxwidthonsmartphone" align="left">';
         //print '<input class="flat" type="text" size="8" name="search_warehouse" value="'.($search_warehouse).'">';
         print $formproduct->selectWarehouses($search_warehouse, 'search_warehouse', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, null, 'maxwidth200');
         print '</td>';
     }
-    if (! empty($arrayfields['m.fk_user_author']['checked'])) 
+    if (! empty($arrayfields['m.fk_user_author']['checked']))
     {
 	    // Author
 	    print '<td class="liste_titre" align="left">';
 	    print '<input class="flat" type="text" size="6" name="search_user" value="'.dol_escape_htmltag($search_user).'">';
 	    print '</td>';
     }
-    if (! empty($arrayfields['m.inventorycode']['checked'])) 
+    if (! empty($arrayfields['m.inventorycode']['checked']))
     {
 	    // Inventory code
 	    print '<td class="liste_titre" align="left">';
 	    print '<input class="flat" type="text" size="4" name="search_inventorycode" value="'.dol_escape_htmltag($search_inventorycode).'">';
 	    print '</td>';
     }
-    if (! empty($arrayfields['m.label']['checked'])) 
+    if (! empty($arrayfields['m.label']['checked']))
     {
 	    // Label of movement
 	    print '<td class="liste_titre" align="left">';
 	    print '<input class="flat" type="text" size="8" name="search_movement" value="'.dol_escape_htmltag($search_movement).'">';
 	    print '</td>';
     }
-    if (! empty($arrayfields['origin']['checked'])) 
+    if (! empty($arrayfields['origin']['checked']))
     {
 	    // Origin of movement
 	    print '<td class="liste_titre" align="left">';
 	    print '&nbsp; ';
 	    print '</td>';
     }
-    if (! empty($arrayfields['m.value']['checked'])) 
+    if (! empty($arrayfields['m.value']['checked']))
     {
 	    // Qty
 	    print '<td class="liste_titre" align="right">';
@@ -869,7 +872,7 @@ if ($resql)
 	    print '<td class="liste_titre">';
 	    print '</td>';
 	}
-    // Actions    
+    // Actions
     print '<td class="liste_titre" align="right">';
     $searchpitco=$form->showFilterAndCheckAddButtons(0);
     print $searchpitco;
@@ -892,11 +895,11 @@ if ($resql)
         $productlot->batch= $objp->batch;
         $productlot->eatby= $objp->eatby;
         $productlot->sellby= $objp->sellby;
-        
+
         $warehousestatic->id=$objp->entrepot_id;
         $warehousestatic->libelle=$objp->stock;
         $warehousestatic->lieu=$objp->lieu;
-        
+
         $arrayofuniqueproduct[$objp->rowid]=$objp->produit;
 		if(!empty($objp->fk_origin)) {
 			$origin = $movement->get_origin($objp->fk_origin, $objp->origintype);
@@ -998,7 +1001,7 @@ if ($resql)
         }
         print '</td>';
         if (! $i) $totalarray['nbfield']++;
-        
+
         print "</tr>\n";
         $i++;
     }
@@ -1012,7 +1015,7 @@ if ($resql)
     if (count($arrayofuniqueproduct) == 1 && is_numeric($year))
     {
         print "<br>";
-        
+
         $productidselected=0;
     	foreach ($arrayofuniqueproduct as $key => $val)
     	{
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 6bcf98e96c1..e3211b157df 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -106,10 +106,10 @@ $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if($action == 'addlimitstockwarehouse') {
-	
+
 	$seuil_stock_alerte = GETPOST('seuil_stock_alerte');
 	$desiredstock = GETPOST('desiredstock');
-	
+
 	$maj_ok = true;
 	if($seuil_stock_alerte == '') {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("StockLimit")), null, 'errors');
@@ -119,44 +119,44 @@ if($action == 'addlimitstockwarehouse') {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DesiredStock")), null, 'errors');
 		$maj_ok = false;
 	}
-	
+
 	if($maj_ok) {
-		
+
 		$pse = new ProductStockEntrepot($db);
 		if($pse->fetch('', GETPOST('id'), GETPOST('fk_entrepot')) > 0) {
-			
+
 			// Update
 			$pse->seuil_stock_alerte = $seuil_stock_alerte;
 			$pse->desiredstock  	 = $desiredstock;
 			if($pse->update($user) > 0) setEventMessage($langs->trans('ProductStockWarehouseUpdated'));
-			
+
 		} else {
-			
+
 			// Create
 			$pse->fk_entrepot 		 = GETPOST('fk_entrepot');
 			$pse->fk_product  	 	 = GETPOST('id');
 			$pse->seuil_stock_alerte = GETPOST('seuil_stock_alerte');
 			$pse->desiredstock  	 = GETPOST('desiredstock');
 			if($pse->create($user) > 0) setEventMessage($langs->trans('ProductStockWarehouseCreated'));
-			
+
 		}
-		
+
 	}
 
 	header("Location: ".$_SERVER["PHP_SELF"]."?id=".GETPOST('id'));
 	exit;
-	
+
 }
 
 if($action == 'delete_productstockwarehouse')
 {
-	
+
 	$pse = new ProductStockEntrepot($db);
 	$pse->fetch(GETPOST('fk_productstockwarehouse'));
 	if($pse->delete($user) > 0) setEventMessage($langs->trans('ProductStockWarehouseDeleted'));
-	
+
 	$action = '';
-	
+
 }
 
 // Set stock limit
@@ -299,7 +299,7 @@ if ($action == "transfert_stock" && ! $cancel)
 	{
 	    $object = new Product($db);
 	    $result=$object->fetch($id);
-	
+
 	    if ($object->hasbatch() && ! $batchnumber)
 	    {
 	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("batch_number")), null, 'errors');
@@ -307,7 +307,7 @@ if ($action == "transfert_stock" && ! $cancel)
 	        $action='transfert';
 	    }
 	}
-	
+
 	if (! $error)
 	{
 		if ($id)
@@ -323,7 +323,7 @@ if ($action == "transfert_stock" && ! $cancel)
 			$pricesrc=0;
 			if (isset($object->pmp)) $pricesrc=$object->pmp;
 			$pricedest=$pricesrc;
-			
+
 			if ($object->hasbatch())
 			{
 				$pdluo = new Productbatch($db);
@@ -496,7 +496,7 @@ if ($id > 0 || $ref)
 {
 	$object = new Product($db);
 	$result = $object->fetch($id,$ref);
-	
+
 	$object->load_stock();
 
 	$title = $langs->trans('ProductServiceCard');
@@ -525,15 +525,18 @@ if ($id > 0 || $ref)
 		dol_htmloutput_events();
 
         $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
-		
-        dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
-        
+
+        $shownav = 1;
+        if ($user->societe_id && ! in_array('stock', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
+
+        dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
+
         print '<div class="fichecenter">';
-        
+
         print '<div class="underbanner clearboth"></div>';
         print '<table class="border tableforfield" width="100%">';
-		
-		if ($conf->productbatch->enabled) 
+
+		if ($conf->productbatch->enabled)
 		{
 			print '<tr><td class="titlefield">'.$langs->trans("ManageLotSerial").'</td><td>';
 			print $object->getLibStatut(0,2);
@@ -595,11 +598,11 @@ if ($id > 0 || $ref)
         print '<tr><td>'.$form->editfieldkey("StockLimit",'seuil_stock_alerte',$object->seuil_stock_alerte,$object,$user->rights->produit->creer).'</td><td colspan="2">';
         print $form->editfieldval("StockLimit",'seuil_stock_alerte',$object->seuil_stock_alerte,$object,$user->rights->produit->creer,'string');
         print '</td></tr>';
-		
+
 		// Hook formObject
 		$parameters=array('colspan' => 3);
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-     
+
         // Desired stock
         print '<tr><td>'.$form->editfieldkey($form->textwithpicto($langs->trans("DesiredStock"), $langs->trans("DesiredStockDesc"), 1),'desiredstock',$object->desiredstock,$object,$user->rights->produit->creer);
         print '</td><td colspan="2">';
@@ -623,7 +626,7 @@ if ($id > 0 || $ref)
 		print '</tr>';
 
 		$stocktheo = price2num($object->stock_theorique, 'MS');
-		
+
         // Calculating a theorical value
         print '<tr><td>'.$langs->trans("VirtualStock").'</td>';
         print "<td>".(empty($stocktheo)?0:$stocktheo);
@@ -705,7 +708,7 @@ if ($id > 0 || $ref)
 
         print '</div>';
         print '<div style="clear:both"></div>';
-    		
+
 		dol_fiche_end();
 	}
 
@@ -744,18 +747,18 @@ if (empty($reshook))
 	if (empty($action) && $object->id)
 	{
 	    print "<div class=\"tabsAction\">\n";
-	
+
 	    if ($user->rights->stock->mouvement->creer)
 	    {
 	        print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=correction">'.$langs->trans("StockCorrection").'</a>';
 	    }
-	
+
 	    //if (($user->rights->stock->mouvement->creer) && ! $object->hasbatch())
 	    if ($user->rights->stock->mouvement->creer)
 		{
 			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=transfert">'.$langs->trans("StockTransfer").'</a>';
 		}
-	
+
 		print '</div>';
 	}
 
@@ -907,30 +910,30 @@ print "</table>";
 print '</div>';
 
 if(!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE)) {
-	
+
 	print '<br><br>';
 	print_titre($langs->trans('AddNewProductStockWarehouse'));
 	//print '<br />';
-	
+
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 	print '<input type="hidden" name="action" value="addlimitstockwarehouse">';
 	print '<input type="hidden" name="id" value="'.GETPOST('id').'">';
 	print '<table class="noborder" width="100%">';
-	
+
 	print '<tr class="liste_titre"><td width="40%" colspan="4">'.$formproduct->selectWarehouses('', 'fk_entrepot').'</td>';
 	print '<td align="right"><input name="seuil_stock_alerte" type="text" placeholder="'.$langs->trans("StockLimit").'" /></td>';
 	print '<td align="right"><input name="desiredstock" type="text" placeholder="'.$langs->trans("DesiredStock").'" /></td>';
 	print '<td align="right"><input type="submit" value="'.$langs->trans('Save').'" class="button" /></td>';
 	print '</tr>';
-	
+
 	$pse = new ProductStockEntrepot($db);
 	$lines = $pse->fetchAll(GETPOST('id'));
-	
+
 	if(!empty($lines)) {
-		
+
 		$var=false;
 		foreach($lines as $line) {
-			
+
 			$ent = new Entrepot($db);
 			$ent->fetch($line['fk_entrepot']);
 			print '<tr '.$bc[$var].'><td width="40%" colspan="4">'.$ent->getNomUrl(3).'</td>';
@@ -939,15 +942,15 @@ if(!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE)) {
 			print '<td align="right"><a href="?id='.GETPOST('id').'&fk_productstockwarehouse='.$line['id'].'&action=delete_productstockwarehouse">'.img_delete().'</a></td>';
 			print '</tr>';
 			$var=!$var;
-			
+
 		}
 
 	}
-	
+
 	print "</table>";
-	
+
 	print '</form>';
-	
+
 }
 
 llxFooter();
diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php
index 4d1b82307f8..e26dfdba905 100644
--- a/htdocs/product/stock/productlot_card.php
+++ b/htdocs/product/stock/productlot_card.php
@@ -112,21 +112,21 @@ if (empty($reshook))
 		$result = $object->setValueFrom('eatby', $newvalue, '', null, 'date', '', $user, 'PRODUCTLOT_MODIFY');
 		if ($result < 0) dol_print_error($db, $object->error);
 	}
-    
+
 	if ($action == 'setsellby' && $user->rights->stock->creer)
 	{
 	    $newvalue=dol_mktime(12, 0, 0, $_POST['sellbymonth'], $_POST['sellbyday'], $_POST['sellbyyear']);
 		$result = $object->setValueFrom('sellby', $newvalue, '', null, 'date', '', $user, 'PRODUCTLOT_MODIFY');
 		if ($result < 0) dol_print_error($db, $object->error);
 	}
-	
+
 	if ($action == 'update_extras')
     {
         // Fill array 'array_options' with data from update form
         $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
         $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
         if ($ret < 0) $error++;
-    
+
         if (! $error)
         {
             // Actions on extra fields (by external module or standard code)
@@ -142,11 +142,11 @@ if (empty($reshook))
             } else if ($reshook < 0)
                 $error++;
         }
-    
+
         if ($error)
             $action = 'edit_extras';
     }
-    
+
 	// Action to add record
 	if ($action == 'add')
 	{
@@ -160,7 +160,7 @@ if (empty($reshook))
 		$error=0;
 
 		/* object_prop_getpost_prop */
-		
+
     	$object->entity=GETPOST('entity','int');
     	$object->fk_product=GETPOST('fk_product','int');
     	$object->batch=GETPOST('batch','alpha');
@@ -204,7 +204,7 @@ if (empty($reshook))
 	if ($action == 'update' && ! GETPOST('cancel'))
 	{
 		$error=0;
-		
+
     	$object->entity=GETPOST('entity','int');
     	$object->fk_product=GETPOST('fk_product','int');
     	$object->batch=GETPOST('batch','alpha');
@@ -283,7 +283,7 @@ if ($action == 'create')
 
 	print '<table class="border centpercent">'."\n";
 	// print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input class="flat" type="text" size="36" name="label" value="'.$label.'"></td></tr>';
-	// 
+	//
     print '<tr><td class="fieldrequired">'.$langs->trans("Fieldentity").'</td><td><input class="flat" type="text" name="entity" value="'.GETPOST('entity').'"></td></tr>';
     print '<tr><td class="fieldrequired">'.$langs->trans("Fieldfk_product").'</td><td><input class="flat" type="text" name="fk_product" value="'.GETPOST('fk_product').'"></td></tr>';
     print '<tr><td class="fieldrequired">'.$langs->trans("Fieldbatch").'</td><td><input class="flat" type="text" name="batch" value="'.GETPOST('batch').'"></td></tr>';
@@ -305,28 +305,31 @@ if ($action == 'create')
 if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
 {
 	$res = $object->fetch_optionals($object->id, $extralabels);
-	
+
     //print load_fiche_titre($langs->trans("Batch"));
-    
+
     $head = productlot_prepare_head($object);
 	dol_fiche_head($head, 'card', $langs->trans("Batch"), 0, 'barcode');
-	
-	    
+
+
 	if ($action == 'delete') {
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteBatch'), $langs->trans('ConfirmDeleteBatch'), 'confirm_delete', '', 0, 1);
 		print $formconfirm;
 	}
-	
-	
+
+
 	$linkback = '<a href="' . DOL_URL_ROOT . '/product/stock/productlot_list.php' . '">' . $langs->trans("BackToList") . '</a>';
-	
-	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'batch');
-	
+
+    $shownav = 1;
+    if ($user->societe_id && ! in_array('batch', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
+
+	dol_banner_tab($object, 'id', $linkback, $shownav, 'rowid', 'batch');
+
     print '<div class="fichecenter">';
     print '<div class="underbanner clearboth"></div>';
 
     print '<table class="border centpercent">'."\n";
-	
+
 	// Product
     print '<tr><td class="titlefield">'.$langs->trans("Product").'</td><td>';
     $producttmp = new Product($db);
@@ -341,7 +344,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     print $form->editfieldval($langs->trans('Eatby'), 'eatby', $object->eatby, $object, $user->rights->stock->creer, 'datepicker');
     print '</td>';
     print '</tr>';
-    
+
     // Sell by
     print '<tr><td>';
     print $form->editfieldkey($langs->trans('Sellby'), 'sellby', $object->sellby, $object, $user->rights->stock->creer, 'datepicker');
@@ -349,15 +352,15 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     print $form->editfieldval($langs->trans('Sellby'), 'sellby', $object->sellby, $object, $user->rights->stock->creer, 'datepicker');
     print '</td>';
     print '</tr>';
-    
+
     // Other attributes
     $cols = 2;
     include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
-    
+
 	print '</table>';
-	
+
 	print '</div>';
-	
+
 	dol_fiche_end();
 
 
@@ -381,8 +384,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 */
 	}
 	print '</div>'."\n";
-	
-	
+
+
 	print '<a href="'.DOL_URL_ROOT.'/product/reassortlot.php?sref='.urlencode($producttmp->ref).'&search_batch='.urlencode($object->batch).'">'.$langs->trans("ShowCurrentStockOfLot").'</a><br>';
 	print '<br>';
 	print '<a href="'.DOL_URL_ROOT.'/product/stock/mouvement.php?search_product_ref='.urlencode($producttmp->ref).'&search_batch='.urlencode($object->batch).'">'.$langs->trans("ShowLogOfMovementIfLot").'</a><br>';
diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php
index e7986fde074..3311e228da3 100644
--- a/htdocs/product/traduction.php
+++ b/htdocs/product/traduction.php
@@ -202,7 +202,10 @@ dol_fiche_head($head, 'translation', $titre, 0, $picto);
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
 
-dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref', 'ref', '', '', 0, '', '', 1);
+$shownav = 1;
+if ($user->societe_id && ! in_array('product', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
+
+dol_banner_tab($object, 'ref', $linkback, shownav, 'ref');
 
 dol_fiche_end();
 
@@ -245,7 +248,7 @@ if ($action == 'edit')
 		{
 			$s=picto_from_langcode($key);
 			print "<br>".($s?$s.' ':'')." <b>".$langs->trans('Language_'.$key).":</b> ".'<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&langtodelete='.$key.'">'.img_delete('', '')."</a><br>";
-		    
+
 			print '<table class="border" width="100%">';
 			print '<tr><td class="tdtop titlefieldcreate fieldrequired">'.$langs->trans('Label').'</td><td><input name="libelle-'.$key.'" size="40" value="'.$object->multilangs[$key]["label"].'"></td></tr>';
 			print '<tr><td class="tdtop">'.$langs->trans('Description').'</td><td>';
@@ -275,7 +278,7 @@ if ($action == 'edit')
 else if ($action != 'add')
 {
     if ($cnt_trans) print '<div class="underbanner clearboth"></div>';
-    
+
 	if (! empty($object->multilangs))
 	{
 		foreach ($object->multilangs as $key => $value)

From 71afaaa3608e421004718fbf9d0071888e5ce259 Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Mon, 12 Jun 2017 17:24:36 +0200
Subject: [PATCH 192/438] fix : availibity refresh

---
 htdocs/comm/propal/class/propal.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index fc2cb3c94f0..d18b49b5294 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1868,7 +1868,7 @@ class Propal extends CommonObject
             {
             	$this->oldcopy= clone $this;
             	$this->fk_availability = $id;
-            	$this->availability_id = $availability_id;
+            	$this->availability_id = $id;
             }
 
             if (! $notrigger && empty($error))

From f780af305aff5298a6f34ee022de25ce432b828f Mon Sep 17 00:00:00 2001
From: alexis Algoud <alexis@atm-consulting.fr>
Date: Tue, 13 Jun 2017 10:04:05 +0200
Subject: [PATCH 193/438] NEW blocklog other things

fix minor
add view only for error
add download log as csv
add record event on bill send by mail event
---
 htdocs/blockedlog/admin/fingerprints.php      | 103 ++++++++++++++----
 htdocs/blockedlog/class/blockedlog.class.php  |  18 ++-
 ..._modBlockedlog_ActionsBlockedLog.class.php |   2 +-
 htdocs/langs/en_US/blockedlog.lang            |   5 +
 4 files changed, 101 insertions(+), 27 deletions(-)

diff --git a/htdocs/blockedlog/admin/fingerprints.php b/htdocs/blockedlog/admin/fingerprints.php
index 95117bf2c28..f585b883c65 100644
--- a/htdocs/blockedlog/admin/fingerprints.php
+++ b/htdocs/blockedlog/admin/fingerprints.php
@@ -34,6 +34,9 @@ $langs->load("blockedlog");
 if (! $user->admin) accessforbidden();
   
 $action = GETPOST('action','alpha');
+$showonlyerrors = GETPOST('showonlyerrors','int');
+
+$block_static = new BlockedLog($db);
 
 if($action === 'downloadblockchain') {
 	
@@ -49,14 +52,57 @@ if($action === 'downloadblockchain') {
 	
 	exit;
 }
-
+else if($action === 'downloadcsv') {
+	
+	$res = $db->query("SELECT rowid,tms,action,amounts,element,fk_object,date_object,ref_object,signature,fk_user
+					FROM ".MAIN_DB_PREFIX."blockedlog ORDER BY rowid ASC");
+	
+	if($res) {
+		
+		$signature = $block_static->getSignature();
+		
+		header('Content-Type: application/octet-stream');
+		header("Content-Transfer-Encoding: Binary");
+		header("Content-disposition: attachment; filename=\"" .$signature. ".csv\"");
+		
+		print $langs->transnoentities('Id')
+			.';'.$langs->transnoentities('Timestamp')
+			.';'.$langs->transnoentities('Action')
+			.';'.$langs->transnoentities('Amounts')
+			.';'.$langs->transnoentities('Element')
+			.';'.$langs->transnoentities('ObjectId')
+			.';'.$langs->transnoentities('Date')
+			.';'.$langs->transnoentities('Ref')
+			.';'.$langs->transnoentities('Fingerprint')
+			.';'.$langs->transnoentities('User')."\n";
+		
+		while($obj = $db->fetch_object($res)) {
+			
+			print $obj->rowid
+				.';'.$obj->tms
+				.';'.$obj->action
+				.';'.$obj->amounts
+				.';'.$obj->element
+				.';'.$obj->fk_object
+				.';'.$obj->date_object
+				.';'.$obj->ref_object
+				.';'.$obj->signature
+				.';'.$obj->fk_user."\n";
+			
+		}
+		
+		exit;
+	}
+	else{
+		setEventMessage($db->lasterror, 'errors');
+	}
+	
+}
 
 /*
  *	View
  */
 
-$block_static = new BlockedLog($db);
-
 $blocks = $block_static->getLog('all', 0, GETPOST('all') ? 0 : 50);
 
 $form=new Form($db);
@@ -74,8 +120,13 @@ print $langs->trans("FingerprintsDesc")."<br>\n";
 
 print '<br>';
 
-echo '<div align="right"><a href="?all=1">'.$langs->trans('ShowAllFingerPrintsMightBeTooLong').'</a> | <a href="?action=downloadblockchain">'.$langs->trans('DownloadBlockChain').'</a></div>';
-		
+print '<div align="right">';
+print ' <a href="?all=1">'.$langs->trans('ShowAllFingerPrintsMightBeTooLong').'</a>';
+print ' | <a href="?all=1&showonlyerrors=1">'.$langs->trans('ShowAllFingerPrintsErrorsMightBeTooLong').'</a>';
+print ' | <a href="?action=downloadblockchain">'.$langs->trans('DownloadBlockChain').'</a>';
+print ' | <a href="?action=downloadcsv">'.$langs->trans('DownloadLogCSV').'</a>';
+print ' </div>';
+
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
@@ -92,24 +143,30 @@ print '<td><span id="blockchainstatus"></span></td>';
 print '</tr>';
 
 foreach($blocks as &$block) {
+
+	$checksignature = $block->checkSignature();
+	$object_link = $block->getObjectLink();
 	
-   	print '<tr class="oddeven">';
-   	print '<td>'.dol_print_date($block->tms,'dayhour').'</td>';
-   	print '<td>'.$block->ref_object.'</td>';
-   	print '<td>'.$langs->trans('log'.$block->action).'</td>';
-   	print '<td>'.$block->getObject().'<a href="#" blockid="'.$block->id.'" rel="show-info">'.img_info($langs->trans('ShowDetails')).'</a></td>';
-   	print '<td align="right">'.price($block->amounts).'</td>';
-   	print '<td>'.$block->getUser().'</td>';
-   	print '<td>'.$block->signature.'</td>';
-   	print '<td>';
-   	
-   	print $block->checkSignature() ? img_picto($langs->trans('OkCheckFingerprintValidity'), 'on') : img_picto($langs->trans('KoCheckFingerprintValidity'), 'off');
-   	if(!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY) && !empty($conf->global->BLOCKEDLOG_AUTHORITY_URL)) {
-   		print ' '.($block->certified ? img_picto($langs->trans('AddedByAuthority'), 'info') :  img_picto($langs->trans('NotAddedByAuthorityYet'), 'info_black') );
-   	}
-	print '</td>';
-	print '</tr>';
-					
+	if(!$showonlyerrors || $block->error>0) {
+		
+	   	print '<tr class="oddeven">';
+	   	print '<td>'.dol_print_date($block->tms,'dayhour').'</td>';
+	   	print '<td>'.$block->ref_object.'</td>';
+	   	print '<td>'.$langs->trans('log'.$block->action).'</td>';
+	   	print '<td>'.$object_link.'<a href="#" blockid="'.$block->id.'" rel="show-info">'.img_info($langs->trans('ShowDetails')).'</a></td>';
+	   	print '<td align="right">'.price($block->amounts).'</td>';
+	   	print '<td>'.$block->getUser().'</td>';
+	   	print '<td>'.$block->signature.'</td>';
+	   	print '<td>';
+	   	
+	   	print $block->error == 0 ? img_picto($langs->trans('OkCheckFingerprintValidity'), 'on') : img_picto($langs->trans('KoCheckFingerprintValidity'), 'off');
+	   	if(!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY) && !empty($conf->global->BLOCKEDLOG_AUTHORITY_URL)) {
+	   		print ' '.($block->certified ? img_picto($langs->trans('AddedByAuthority'), 'info') :  img_picto($langs->trans('NotAddedByAuthorityYet'), 'info_black') );
+	   	}
+		print '</td>';
+		print '</tr>';
+						
+	}
 }
 
 print '</table>';
@@ -121,7 +178,7 @@ $('a[rel=show-info]').click(function() {
 	$pop = $('<div id="pop-info"><table width="100%" class="border"><thead><th width="25%"><?php echo $langs->trans('Field') ?></th><th><?php echo $langs->trans('Value') ?></th></thead><tbody></tbody></table></div>');
 	
 	$pop.dialog({
-		title:"<?php echo $langs->trans('BlockedlogInfoDialog'); ?>"
+		title:"<?php echo $langs->transnoentities('BlockedlogInfoDialog'); ?>"
 		,modal:true
 		,width:'80%'
 	});
diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index 1f93eb3cc26..4f2a37e0116 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -78,6 +78,7 @@ class BlockedLog
 	
 	public $object_data = null;
 	
+	public $error = 0;
 	
 	/**
 	 *      Constructor
@@ -91,9 +92,9 @@ class BlockedLog
 	}
 
 	/**
-	 *      try to retrieve logged object
+	 *      try to retrieve logged object link
 	 */
-	public function getObject() {
+	public function getObjectLink() {
 		global $langs;
 		
 		if($this->element === 'facture') {
@@ -103,6 +104,9 @@ class BlockedLog
 			if($object->fetch($this->fk_object)>0) {
 				return $object->getNomUrl(1);
 			}
+			else{
+				$this->error++;
+			}
 		}
 		else if($this->element === 'payment') {
 			require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
@@ -111,6 +115,9 @@ class BlockedLog
 			if($object->fetch($this->fk_object)>0) {
 				return $object->getNomUrl(1);
 			}
+			else{
+				$this->error++;
+			}
 		}
 	
 		return $langs->trans('ImpossibleToReloadObject', $this->element, $this->fk_object);
@@ -388,8 +395,13 @@ class BlockedLog
 		
 		$this->getSignatureRecursive();
 	
-		return ($signature_to_test=== $this->signature);
+		$res = ($signature_to_test === $this->signature);
 		
+		if(!$res) {
+			$this->error++;
+		}
+		
+		return $res;
 	}
 	
 	/**
diff --git a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
index 5a52777cbb9..461a277dfd4 100644
--- a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
+++ b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
@@ -51,7 +51,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 			return 0;
 		}
 		
-		if($action==='BILL_VALIDATE' || $action === 'BILL_PAYED' || $action==='BILL_UNPAYED') {
+		if($action==='BILL_VALIDATE' || $action === 'BILL_PAYED' || $action==='BILL_UNPAYED' || $action === 'BILL_SENTBYMAIL') {
 			$amounts=  (double) $object->total_ttc;
 		}
 		else if($action === 'PAYMENT_CUSTOMER_CREATE' || $action === 'PAYMENT_ADD_TO_BANK') {
diff --git a/htdocs/langs/en_US/blockedlog.lang b/htdocs/langs/en_US/blockedlog.lang
index 995801292a3..7e64bfad17f 100644
--- a/htdocs/langs/en_US/blockedlog.lang
+++ b/htdocs/langs/en_US/blockedlog.lang
@@ -3,6 +3,7 @@ BlockedLogDesc=This module store event for invoice and payments as block chain
 FingerprintsDesc=All fingerprints stored
 EntityKey=Entity Key
 ShowAllFingerPrintsMightBeTooLong=Show all fingerprints (might be long)
+ShowAllFingerPrintsErrorsMightBeTooLong=Show all fingerprints with error (might be long)
 DownloadBlockChain=Download fingerprints
 KoCheckFingerprintValidity=Fingerprint is not valid
 OkCheckFingerprintValidity=Fingerprint is valid
@@ -14,3 +15,7 @@ logPAYMENT_CUSTOMER_CREATE=Payment of customer created
 logBILL_PAYED=Customer bill payed
 logBILL_UNPAYED=Customer bill set unpayed
 logBILL_VALIDATE=Customer bill set valid from draft
+logBILL_SENTBYMAIL=Customer bill send by mail
+BlockedlogInfoDialog=Log Details
+Fingerprint=Fingerprint
+DownloadLogCSV=Download fingerprints CSV
\ No newline at end of file

From 4c424bb760c43e1d938fac74e0bddcc49b10a1fa Mon Sep 17 00:00:00 2001
From: alexis Algoud <alexis@atm-consulting.fr>
Date: Tue, 13 Jun 2017 10:09:53 +0200
Subject: [PATCH 194/438] fix current element compare amount

---
 htdocs/blockedlog/class/blockedlog.class.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index 4f2a37e0116..b0cddd66f75 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -502,8 +502,7 @@ class BlockedLog
 	 */
 	private function getCurrentValue() {
 		
-		if($this->action === 'PAYMENT_CUSTOMER_CREATE'
-		|| $this->action === 'PAYMENT_ADD_TO_BANK') {
+		if($this->element === 'payment') {
 			$sql="SELECT amount FROM ".MAIN_DB_PREFIX."paiement WHERE rowid=".$this->fk_object;
 					
 			$res = $this->db->query($sql);
@@ -512,7 +511,15 @@ class BlockedLog
 				$this->amounts = (double) $obj->amount;
 			}
 		}
-				
+		elseif($this->element === 'facture') {
+			$sql="SELECT total_ttc FROM ".MAIN_DB_PREFIX."facture WHERE rowid=".$this->fk_object;
+			
+			$res = $this->db->query($sql);
+			if($res && $obj = $this->db->fetch_object($res)) {
+				$this->amounts = (double) $obj->total_ttc;
+			}
+		}
+		
 	}
 	
 	/**

From b67a14c7d66ea68cc1b9f261e3fc9a47348516de Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Tue, 13 Jun 2017 10:20:26 +0200
Subject: [PATCH 195/438] Fix ajax search product is broken

---
 htdocs/product/ajax/products.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index 159ee6c272e..c8b81caa9fc 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -182,8 +182,10 @@ else
 	$idprod = (! empty($match[0]) ? $match[0] : '');
 
 	if (GETPOST($htmlname,'alpha') == '' && (! $idprod || ! GETPOST($idprod,'alpha')))
+	{
 		print json_encode(array());
 	    return;
+	}
 
 	// When used from jQuery, the search term is added as GET param "term".
 	$searchkey = (($idprod && GETPOST($idprod,'alpha')) ? GETPOST($idprod,'alpha') :  (GETPOST($htmlname, 'alpha') ? GETPOST($htmlname, 'alpha') : ''));

From ffdee40eb9722da1a0d43a629850b7d7d67b9833 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Jun 2017 10:58:41 +0200
Subject: [PATCH 196/438] Fix permission on recurring invoice list

---
 htdocs/core/menus/standard/eldy.lib.php | 26 ++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index b981686d7c7..ca6791475a6 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -52,7 +52,7 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$mode
 	if (empty($noout)) print_start_menu_array();
 
 	$usemenuhider = (GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER));
-	
+
 	// Show/Hide vertical menu
 	if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 	{
@@ -437,7 +437,7 @@ function print_end_menu_array()
 /**
  * Core function to output left menu eldy
  * Fill &$menu (example with $forcemainmenu='home' $forceleftmenu='all', return left menu tree of Home)
- * 
+ *
  * @param	DoliDB		$db                 Database handler
  * @param 	array		$menu_array_before  Table of menu entries to show before entries of menu handler (menu->liste filled with menu->add)
  * @param   array		$menu_array_after   Table of menu entries to show after entries of menu handler (menu->liste filled with menu->add)
@@ -445,7 +445,7 @@ function print_end_menu_array()
  * @param	Menu		$menu				Object Menu to return back list of menu entries
  * @param	int			$noout				Disable output (Initialise &$menu only).
  * @param	string		$forcemainmenu		'x'=Force mainmenu to mainmenu='x'
- * @param	string		$forceleftmenu		'all'=Force leftmenu to '' (= all). If value come being '', we change it to value in session and 'none' if not efined in session. 
+ * @param	string		$forceleftmenu		'all'=Force leftmenu to '' (= all). If value come being '', we change it to value in session and 'none' if not efined in session.
  * @param	array		$moredata			An array with more data to output
  * @return	int								nb of menu entries
  */
@@ -459,7 +459,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 	$leftmenu=($forceleftmenu?'':(empty($_SESSION["leftmenu"])?'none':$_SESSION["leftmenu"]));
 
 	$usemenuhider = (GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER));
-	
+
 	// Show logo company
 	if (empty($conf->global->MAIN_MENU_INVERT) && empty($noout) && ! empty($conf->global->MAIN_SHOW_LOGO) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 	{
@@ -596,7 +596,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 					$newmenu->add("/user/group/index.php?leftmenu=users", $langs->trans("ListOfGroups"), 2, ($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->read:$user->rights->user->user->lire) || $user->admin);
 				}
 			}
-			
+
 		}
 
 
@@ -802,7 +802,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 					$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_paid&amp;search_status=2",$langs->trans("BillShortStatusPaid"),2,$user->rights->facture->lire);
 					$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_canceled&amp;search_status=3",$langs->trans("BillShortStatusCanceled"),2,$user->rights->facture->lire);
 				}
-				$newmenu->add("/compta/facture/fiche-rec.php",$langs->trans("ListOfTemplates"),1,$user->rights->facture->lire);
+				$newmenu->add("/compta/facture/fiche-rec.php",$langs->trans("ListOfTemplates"),1,$user->rights->facture->creer);    // No need to see recurring invoices, if user has no permission to create invoice.
 
 				$newmenu->add("/compta/paiement/list.php",$langs->trans("Payments"),1,$user->rights->facture->lire);
 
@@ -945,29 +945,29 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Chartofaccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 20);
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/categories_list.php?id=32&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingCategory"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 22);
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuDefaultAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 40);
-				if (! empty($conf->facture->enabled) || ! empty($conf->fournisseur->enabled)) 
+				if (! empty($conf->facture->enabled) || ! empty($conf->fournisseur->enabled))
 				{
 				    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/admin/dict.php?id=10&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuVatAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 30);
 				}
-				if (! empty($conf->tax->enabled)) 
+				if (! empty($conf->tax->enabled))
 				{
 				    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/admin/dict.php?id=7&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuTaxAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 30);
 				}
-				if (! empty($conf->expensereport->enabled)) 
+				if (! empty($conf->expensereport->enabled))
 				{
 				    if (preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuExpenseReportAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 30);
 				}
 				/* not required yet, already supported by default account
-				if (! empty($conf->loan->enabled)) 
+				if (! empty($conf->loan->enabled))
 				{
 				    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/admin/loan.php?mainmenu=accountancy&amp;leftmenu=accountancy_admin", $langs->trans("MenuLoanAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_loan', 45);
 				}
-				if (! empty($conf->don->enabled)) 
+				if (! empty($conf->don->enabled))
 				{
 				    if (preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/don/admin/donation.php?from=accountancy&mainmenu=accountancy&amp;leftmenu=accountancy_admin", $langs->trans("MenuDonationAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_donation', 47);
 				}*/
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/productaccount.php?mainmenu=accountancy&amp;leftmenu=accountancy_admin", $langs->trans("MenuProductsAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_product', 50);
-				
+
 				// Binding
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/customer/index.php?leftmenu=accountancy_dispatch_customer&amp;mainmenu=accountancy",$langs->trans("CustomersVentilation"),1,$user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_customer');
 			    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_customer/',$leftmenu)) $newmenu->add("/accountancy/customer/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer",$langs->trans("ToBind"),2,$user->rights->accounting->bind->write);
@@ -1366,7 +1366,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				$newmenu->add("/adherents/stats/index.php?leftmenu=members",$langs->trans("MenuMembersStats"),1,$user->rights->adherent->lire);
 				if (! empty($conf->global->MEMBER_LINK_TO_HTPASSWDFILE) && ($usemenuhider || empty($leftmenu) || $leftmenu=="export")) $newmenu->add("/adherents/htpasswd.php?leftmenu=export",$langs->trans("Filehtpasswd"),1,$user->rights->adherent->export);
 				if ($usemenuhider || empty($leftmenu) || $leftmenu=="export") $newmenu->add("/adherents/cartes/carte.php?leftmenu=export",$langs->trans("MembersCards"),1,$user->rights->adherent->export);
-				
+
 				$newmenu->add("/adherents/index.php?leftmenu=members&amp;mainmenu=members",$langs->trans("Subscriptions"),0,$user->rights->adherent->cotisation->lire);
 				$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=-1,1&amp;mainmenu=members",$langs->trans("NewSubscription"),1,$user->rights->adherent->cotisation->creer);
 				$newmenu->add("/adherents/subscription/list.php?leftmenu=members",$langs->trans("List"),1,$user->rights->adherent->cotisation->lire);

From 225c17d04792fb5f9487546d7f576e455bc5207c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Jun 2017 11:02:30 +0200
Subject: [PATCH 197/438] Fix permission on menu entry

---
 htdocs/core/menus/init_menu_auguria.sql | 5 +++--
 htdocs/core/menus/standard/eldy.lib.php | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index a32d3ef6886..6115b6cff0d 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -287,8 +287,9 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3700__+MAX_llx_menu__, 'project', '', 7__+MAX_llx_menu__, '/projet/activity/index.php?leftmenu=projects', 'Activities', 0, 'projects', '$user->rights->projet->lire', '', 2, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3701__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/tasks.php?leftmenu=projects&amp;action=create', 'NewTask', 1, 'projects', '$user->rights->projet->creer', '', 2, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3702__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/tasks/list.php?leftmenu=projects', 'List', 1, 'projects', '$user->rights->projet->lire', '', 2, 2, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3703__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/activity/perweek.php?leftmenu=projects', 'NewTimeSpent', 1, 'projects', '$user->rights->projet->lire', '', 2, 3, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3704__+MAX_llx_menu__, 'project', '', 3600__+MAX_llx_menu__, '/projet/tasks/stats/index.php?leftmenu=projects', 'Statistics', 1, 'projects', '$user->rights->projet->lire', '', 2, 4, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3704__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/tasks/stats/index.php?leftmenu=projects', 'Statistics', 1, 'projects', '$user->rights->projet->lire', '', 2, 4, __ENTITY__);
+
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3400__+MAX_llx_menu__, 'project', '', 7__+MAX_llx_menu__, '/projet/activity/perweek.php?leftmenu=projects', 'NewTimeSpent', 0, 'projects', '$user->rights->projet->lire', '', 2, 3, __ENTITY__);
 
 -- Project - Categories
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->categorie->enabled', __HANDLER__, 'left', 3804__+MAX_llx_menu__, 'project', 'cat', 3__+MAX_llx_menu__, '/categories/index.php?leftmenu=cat&amp;type=6', 'Categories', 0, 'categories', '$user->rights->categorie->lire', '', 2, 4, __ENTITY__);
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 8c83435914b..7b25dbe35fb 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1322,9 +1322,10 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 					$newmenu->add("/projet/activity/index.php?leftmenu=tasks".($search_project_user?'&search_project_user='.$search_project_user:''), $langs->trans("Activities"), 0, $user->rights->projet->lire);
 					$newmenu->add("/projet/tasks.php?leftmenu=tasks&action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer);
 					$newmenu->add("/projet/tasks/list.php?leftmenu=tasks".($search_project_user?'&search_project_user='.$search_project_user:''), $langs->trans("List"), 1, $user->rights->projet->lire);
-					$newmenu->add("/projet/activity/perweek.php?leftmenu=tasks".($search_project_user?'&search_project_user='.$search_project_user:''), $langs->trans("NewTimeSpent"), 1, $user->rights->projet->lire);
 				    $newmenu->add("/projet/tasks/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->rights->projet->lire);
 
+				    $newmenu->add("/projet/activity/perweek.php?leftmenu=tasks".($search_project_user?'&search_project_user='.$search_project_user:''), $langs->trans("NewTimeSpent"), 0, $user->rights->projet->lire);
+
 					// All project i have permission on
 					/*$newmenu->add("/projet/activity/index.php", $langs->trans("Activities"), 0, $user->rights->projet->lire && $user->rights->projet->lire);
 					$newmenu->add("/projet/tasks.php?action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer && $user->rights->projet->creer);

From 5def2d2600276918d80aab9ece3c2f36af8f7bfd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Jun 2017 11:14:52 +0200
Subject: [PATCH 198/438] Add div to help debug of html content

---
 htdocs/product/price.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index b18c3b8828a..cbfe90a5a52 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1328,7 +1328,9 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action=='showlog_default_
     $result = $db->query($sql);
     if ($result)
     {
-    	$num = $db->num_rows($result);
+        print '<div class="divlogofpreviouscustomerprice">';
+
+        $num = $db->num_rows($result);
 
     	if (! $num)
     	{
@@ -1471,6 +1473,8 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action=='showlog_default_
     		print '</div>';
     		print "<br>";
     	}
+
+    	print '</div>';
     } else {
     	dol_print_error($db);
     }

From 4c0b0ef4c2b37f106d0017d3fbd21258fcaea2c5 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Tue, 13 Jun 2017 11:29:12 +0200
Subject: [PATCH 199/438] Fix display on situation invoice

---
 htdocs/compta/facture.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index c19c521ca65..59e52ac7b5d 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -3327,7 +3327,7 @@ else if ($id > 0 || ! empty($ref))
 			print $object->situation_counter;
 
 			print '</td>';
-			print '<td align="right" class="nowrap">';
+			print '<td align="left" class="nowrap">';
 
 			$prevsits_total_amount = 0;
 			foreach ($prevsits as $situation) {
@@ -3335,9 +3335,10 @@ else if ($id > 0 || ! empty($ref))
 			}
 			$prevsits_total_amount += $object->total_ht;
 
-			print price($prevsits_total_amount);
-			print '</td>';
-			print '<td>' . $langs->trans('Currency' . $conf->currency) . '</td></tr>';
+			print price($prevsits_total_amount, 0, $langs, 1, -1, -1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency) );
+			
+			print '</td></tr>';
+			
 
 			// Previous situation(s) deduction(s)
 			for ($i = 0; $i < $cprevsits; $i++) {
@@ -3348,10 +3349,10 @@ else if ($id > 0 || ! empty($ref))
 				print $prevsits[$i]->situation_counter;
 				print '</a></td>';
 
-				print '<td align="right" class="nowrap">';
-				print '- ' . price($prevsits[$i]->total_ht);
-				print '</td>';
-				print '<td>' . $langs->trans('Currency' . $conf->currency) . '</td></tr>';
+				print '<td align="left" class="nowrap">';
+				print '- ' . price($prevsits[$i]->total_ht, 0, $langs, 1, -1, -1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency) );
+				print '</td></tr>';
+				
 			}
 		}
 	}

From e4c7f584e3cf21108cad67b389eecf5b3d6b93bf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Jun 2017 11:45:21 +0200
Subject: [PATCH 200/438] Fix option STOCK_SUPPORTS_SERVICES (stock not visible
 when it should)

---
 htdocs/product/list.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 40dcd116ab4..7fd4135bd4a 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -628,9 +628,9 @@ else
                 $product_static->status     = $objp->tosell;
 				$product_static->entity = $objp->entity;
 
-				if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1)	// To optimize call of load_stock
+				if ((! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1) || ! empty($conf->global->STOCK_DISABLE_OPTIM_LOAD))	// To optimize call of load_stock
 				{
-				    if ($objp->fk_product_type != 1)    // Not a service
+				    if ($objp->fk_product_type != 1 || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))    // Not a service
 				    {
 				        $product_static->load_stock('nobatch');             // Load stock_reel + stock_warehouse. This also call load_virtual_stock()
 				    }

From f2961b8652dce6ff9cf86a3d1fb4c1ab042a7c3e Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Tue, 13 Jun 2017 12:30:30 +0200
Subject: [PATCH 201/438] Fix 6993 - supplier propal check min price on update
 line

---
 htdocs/supplier_proposal/card.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index ea0ecc12f89..55da718cebc 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -808,11 +808,6 @@ if (empty($reshook))
 				$price_min = $product->multiprices_min [$object->thirdparty->price_level];
 
 			$label = ((GETPOST('update_label') && GETPOST('product_label')) ? GETPOST('product_label') : '');
-
-			if ($price_min && (price2num($pu_ht) * (1 - price2num(GETPOST('remise_percent')) / 100) < price2num($price_min))) {
-				setEventMessages($langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency)), null, 'errors');
-				$error ++;
-			}
 		} else {
 			$type = GETPOST('type');
 			$label = (GETPOST('product_label') ? GETPOST('product_label') : '');

From c0f46834cb50a39620ec6d0dcb1cdedab7486717 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Jun 2017 13:22:05 +0200
Subject: [PATCH 202/438] Fix demo links

---
 htdocs/langs/en_US/projects.lang |  1 +
 htdocs/main.inc.php              |  4 +-
 htdocs/public/demo/index.php     | 67 +++++++++++++++++++-------------
 3 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index b3317df9c8e..d940555f206 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -64,6 +64,7 @@ TaskDescription=Task description
 NewTask=New task
 AddTask=Create task
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Activity
 Activities=Tasks/activities
 MyActivities=My tasks/activities
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 74f3698e728..6b75b957590 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -396,8 +396,8 @@ if (! defined('NOLOGIN'))
         {
             if (empty($_SERVER['HTTP_REFERER']) || ! preg_match('/public/',$_SERVER['HTTP_REFERER']))
             {
-                dol_syslog("Call index page from another url than demo page");
-				$url='';
+                dol_syslog("Call index page from another url than demo page (call is done from page ".$_SERVER['HTTP_REFERER'].")");
+                $url='';
                 $url.=($url?'&':'').($dol_hide_topmenu?'dol_hide_topmenu='.$dol_hide_topmenu:'');
                 $url.=($url?'&':'').($dol_hide_leftmenu?'dol_hide_leftmenu='.$dol_hide_leftmenu:'');
                 $url.=($url?'&':'').($dol_optimize_smallscreen?'dol_optimize_smallscreen='.$dol_optimize_smallscreen:'');
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index be844c8a2da..f9bb4db7ecf 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -54,12 +54,13 @@ $alwaysuncheckedmodules=array();
 $alwayshiddencheckedmodules=array();
 $alwayshiddenuncheckedmodules=array();
 
-$url=DOL_URL_ROOT.'/index.php?';
+$url='';
 $url.=($url?'&':'').($conf->dol_hide_topmenu?'dol_hide_topmenu='.$conf->dol_hide_topmenu:'');
 $url.=($url?'&':'').($conf->dol_hide_leftmenu?'dol_hide_leftmenu='.$conf->dol_hide_leftmenu:'');
 $url.=($url?'&':'').($conf->dol_optimize_smallscreen?'dol_optimize_smallscreen='.$conf->dol_optimize_smallscreen:'');
 $url.=($url?'&':'').($conf->dol_no_mouse_hover?'dol_no_mouse_hover='.$conf->dol_no_mouse_hover:'');
 $url.=($url?'&':'').($conf->dol_use_jmobile?'dol_use_jmobile='.$conf->dol_use_jmobile:'');
+$url=DOL_URL_ROOT.'/index.php'.($url?'?'.$url:'');
 
 $tmpaction = 'view';
 $parameters=array();
@@ -105,6 +106,7 @@ if (empty($reshook))
 	    )
 	);
 
+
 	// Visible
 	$alwayscheckedmodules=array('barcode','bookmark','categorie','externalrss','fckeditor','geoipmaxmind','gravatar','memcached','syslog','user','webservices');  // Technical module we always want
 	$alwaysuncheckedmodules=array('dynamicprices','loan','multicurrency','paybox','paypal','stripe','google','printing','scanner','workflow');  // Module we never want
@@ -202,7 +204,7 @@ asort($orders);
  * Actions
  */
 
-if (GETPOST('action','aZ09') == 'gotodemo')
+if (GETPOST('action','aZ09') == 'gotodemo')     // Action run when we click on "Start" after selection modules
 {
 	//print 'ee'.GETPOST("demochoice");
 	$disablestring='';
@@ -232,8 +234,9 @@ if (GETPOST('action','aZ09') == 'gotodemo')
     // Do redirect to login page
 	if ($disablestring)
 	{
-		if (GETPOST('urlfrom')) $url.=($url?'&':'').'urlfrom='.urlencode(GETPOST('urlfrom','alpha'));
-		$url.=($url?'&':'').'disablemodules='.$disablestring;
+		if (GETPOST('urlfrom')) $url.=(preg_match('/\?/',$url)?'&amp;':'?').'urlfrom='.urlencode(GETPOST('urlfrom','alpha'));
+		$url.=(preg_match('/\?/',$url)?'&amp;':'?').'disablemodules='.$disablestring;
+        //var_dump($url);exit;
 		header("Location: ".$url);
 		exit;
 	}
@@ -252,25 +255,25 @@ $head.='
 <script type="text/javascript">
 var openedId="";
 jQuery(document).ready(function () {
-jQuery("tr.moduleline").hide();
-// Enable this to allow personalized setup
-jQuery(".modulelineshow").attr("href","#a1profdemoall");
-jQuery(".cursorpointer").css("cursor","pointer");
-jQuery(".modulelineshow").click(function() {
-var idstring=$(this).attr("id");
-if (typeof idstring != "undefined")
-{
-var currentId = idstring.substring(2);
-jQuery("tr.moduleline").hide();
-if (currentId != openedId)
-{
-openedId=currentId;
-jQuery("#tr1"+currentId).show();
-jQuery("#tr2"+currentId).show();
-}
-else openedId = "";
-}
-});
+    jQuery("tr.moduleline").hide();
+    // Enable this to allow personalized setup
+    jQuery(".modulelineshow").attr("href","#a1profdemoall");
+    jQuery(".cursorpointer").css("cursor","pointer");
+    jQuery(".modulelineshow").click(function() {
+    var idstring=$(this).attr("id");
+    if (typeof idstring != "undefined")
+    {
+        var currentId = idstring.substring(2);
+        jQuery("tr.moduleline").hide();
+        if (currentId != openedId)
+        {
+            openedId=currentId;
+            jQuery("#tr1"+currentId).show();
+            jQuery("#tr2"+currentId).show();
+        }
+            else openedId = "";
+        }
+    });
 });
 </script>';
 
@@ -304,13 +307,23 @@ foreach ($demoprofiles as $profilearray)
 	    //print $profilearray['lang'];
 	    if (! empty($profilearray['lang'])) $langs->load($profilearray['lang']);
 
-		$url=$_SERVER["PHP_SELF"].'?action=gotodemo&amp;urlfrom='.urlencode($_SERVER["PHP_SELF"]);
+		$url=$_SERVER["PHP_SELF"].'?action=gotodemo';
 		$urlwithmod=$url.'&amp;demochoice='.$profilearray['key'];
 		// Should work with DOL_URL_ROOT='' or DOL_URL_ROOT='/dolibarr'
 		//print "xx".$_SERVER["PHP_SELF"].' '.DOL_URL_ROOT.'<br>';
-		$urlfrom=preg_replace('/^'.preg_quote(DOL_URL_ROOT,'/').'/i','',$_SERVER["PHP_SELF"]);
+
+        $urlfrom=preg_replace('/^'.preg_quote(DOL_URL_ROOT,'/').'/i','',$_SERVER["PHP_SELF"]);
 		//print $urlfrom;
-		if (! empty($profilearray['url'])) $urlwithmod=$profilearray['url'];
+
+		if (! empty($profilearray['url']))
+		{
+		    $urlwithmod=$profilearray['url'];
+		    $urlwithmod=$urlwithmod.(preg_match('/\?/',$urlwithmod)?'&amp;':'?').'urlfrom='.urlencode($urlfrom);
+		    if (! empty($profilearray['disablemodules']))
+		    {
+		          $urlwithmod=$urlwithmod.(preg_match('/\?/',$urlwithmod)?'&amp;':'?').'disablemodules='.$profilearray['disablemodules'];
+		    }
+		}
 
 		if (empty($profilearray['url']))
 		{
@@ -348,7 +361,7 @@ foreach ($demoprofiles as $profilearray)
     	print '</a>';
 
 
-        // Modules
+        // Modules (a profile you must choose modules)
         if (empty($profilearray['url']))
         {
     		print '<div id="tr1'.$profilearray['key'].'" class="moduleline hidden" style="margin-left: 8px; margin-right: 8px; text-align: justify; font-size:14px; line-height: 130%; padding-bottom: 8px">';

From 9b979e3cb765744b1c443d7c8811a0a1b9238a60 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Jun 2017 13:44:18 +0200
Subject: [PATCH 203/438] Fix wrong warning when user is disabled

---
 htdocs/user/card.php | 48 ++++++++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 2d5ace33809..a48d7e499fb 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -299,7 +299,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == 'update' && ! $cancel) 
+	if ($action == 'update' && ! $cancel)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
@@ -318,7 +318,7 @@ if (empty($reshook)) {
 				$error ++;
 			}
 
-			if (!$error) 
+			if (!$error)
 			{
 				$object->fetch($id);
 
@@ -455,7 +455,7 @@ if (empty($reshook)) {
 								setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
 							} else {
         					    // Create thumbs
-        					    $object->addThumbs($newfile);					    
+        					    $object->addThumbs($newfile);
 							}
 						} else {
 							$error ++;
@@ -464,7 +464,7 @@ if (empty($reshook)) {
 						}
 					}
 				}
-				
+
             	if (! $error && ! count($object->errors))
             	{
             		// Then we add the associated categories
@@ -475,7 +475,7 @@ if (empty($reshook)) {
 				if (!$error && !count($object->errors)) {
 					setEventMessages($langs->trans("UserModified"), null, 'mesgs');
 					$db->commit();
-					
+
 					$login = $_SESSION["dol_login"];
 					if ($login && $login == $object->oldcopy->login && $object->oldcopy->login != $object->login)    // Current user has changed its login
 					{
@@ -494,11 +494,11 @@ if (empty($reshook)) {
 		    if ($caneditpassword)    // Case we can edit only password
 		    {
 		        dol_syslog("Not allowed to change fields, only password");
-		        
+
 		        $object->fetch($id);
-		    
+
 		        $object->oldcopy = clone $object;
-		    
+
 		        $ret = $object->setPassword($user, GETPOST("password"));
 		        if ($ret < 0)
 		        {
@@ -1059,7 +1059,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
     print '<input size="8" type="text" name="weeklyhours" value="'.GETPOST('weeklyhours').'">';
     print '</td>';
     print "</tr>\n";
-	
+
     // Date employment
     print '<tr><td>'.$langs->trans("DateEmployment").'</td>';
     print '<td>';
@@ -1084,9 +1084,9 @@ if (($action == 'create') || ($action == 'adduserldap'))
 		print $formother->selectColor(GETPOST('color')?GETPOST('color'):$object->color, 'color', null, 1, '', 'hideifnotset');
 		print '</td></tr>';
 	}
-	
+
 	// Categories
-	if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire)) 
+	if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire))
 	{
 		print '<tr><td>' . fieldLabel('Categories', 'usercats') . '</td><td colspan="3">';
 		$cate_arbo = $form->select_all_categories('user', null, 'parent', null, null, 1);
@@ -1094,7 +1094,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
 			null, '90%' );
 		print "</td></tr>";
 	}
-	
+
     // Note
     print '<tr><td class="tdtop">';
     print $langs->trans("Note");
@@ -1137,10 +1137,10 @@ else
         $object->fetch($id);
         if ($res < 0) { dol_print_error($db,$object->error); exit; }
         $res=$object->fetch_optionals($object->id,$extralabels);
-		
+
 		// Check if user has rights
 		$object->getrights();
-		if(empty($object->nb_rights)) setEventMessages($langs->trans('UserHasNoPermissions'), null, 'warnings');
+		if (empty($object->nb_rights) && $object->statut != 0) setEventMessages($langs->trans('UserHasNoPermissions'), null, 'warnings');
 
         // Connexion ldap
         // pour recuperer passDoNotExpire et userChangePassNextLogon
@@ -1455,7 +1455,7 @@ else
             }
 
             // Categories
-		    if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire)) 
+		    if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire))
 	    	{
 				print '<tr><td>' . $langs->trans( "Categories" ) . '</td>';
 				print '<td colspan="3">';
@@ -1482,22 +1482,22 @@ else
 		            print "</td></tr>\n";
 		        }
 		    }
-		    
+
 		    if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file->main_authentication) && ! empty($conf->global->MAIN_OPENIDURL_PERUSER))
 		    {
 		        print '<tr><td>'.$langs->trans("OpenIDURL").'</td>';
 		        print '<td>'.$object->openid.'</td>';
 		        print "</tr>\n";
 		    }
-		    
+
 		    print '<tr><td class="titlefield">'.$langs->trans("LastConnexion").'</td>';
 		    print '<td>'.dol_print_date($object->datelastlogin,"dayhour").'</td>';
 		    print "</tr>\n";
-		    
+
 		    print '<tr><td>'.$langs->trans("PreviousConnexion").'</td>';
 		    print '<td>'.dol_print_date($object->datepreviouslogin,"dayhour").'</td>';
 		    print "</tr>\n";
-		    
+
 		    // Other attributes
 		    $parameters=array();
 		    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
@@ -1505,7 +1505,7 @@ else
 		    {
 		        print $object->showOptionals($extrafields);
 		    }
-		    
+
             // Company / Contact
             if (! empty($conf->societe->enabled))
             {
@@ -1673,7 +1673,7 @@ else
                     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
                     print '<input type="hidden" name="action" value="addgroup" />';
                 }
-                
+
                 print '<table class="noborder" width="100%">'."\n";
                 print '<tr class="liste_titre"><th class="liste_titre" width="25%">'.$langs->trans("Groups").'</th>'."\n";
                 if(! empty($conf->multicompany->enabled) && !empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
@@ -1765,7 +1765,7 @@ else
                 }
 
                 print "</table>";
-                
+
                 if ($caneditgroup)
                 {
                     print '</form>';
@@ -2237,9 +2237,9 @@ else
 		print $form->showphoto('userphoto',$object,60,0,$caneditfield,'photowithmargin','small');
 		print '</td>';
 		print '</tr>';
-		
+
 		// Categories
-		if (!empty( $conf->categorie->enabled ) && !empty( $user->rights->categorie->lire )) 
+		if (!empty( $conf->categorie->enabled ) && !empty( $user->rights->categorie->lire ))
 		{
 			print '<tr><td>' . fieldLabel( 'Categories', 'usercats' ) . '</td>';
 			print '<td>';

From c8856182a6fa51a8c34e728e522ea0a735b968fe Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Jun 2017 15:34:18 +0200
Subject: [PATCH 204/438] Fix look and feel v6

---
 htdocs/core/lib/files.lib.php          |   6 +
 htdocs/core/lib/functions.lib.php      |  13 +-
 htdocs/holiday/card.php                |  34 ++--
 htdocs/holiday/class/holiday.class.php |  24 ++-
 htdocs/holiday/define_holiday.php      | 247 ++++++++++++++++---------
 5 files changed, 204 insertions(+), 120 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 60b970fffce..21fb1be7c0d 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1891,6 +1891,12 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 	    if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed=1;
 	    $original_file=$conf->fournisseur->facture->dir_output.'/'.$original_file;
 	}
+	// Wrapping pour les apercu supplier invoice
+	elseif (($modulepart == 'apercuexpensereport') && !empty($conf->expensereport->dir_output))
+	{
+	    if ($fuser->rights->expensereport->{$lire}) $accessallowed=1;
+	    $original_file=$conf->expensereport->dir_output.'/'.$original_file;
+	}
 	// Wrapping pour les images des stats propales
 	elseif ($modulepart == 'propalstats' && !empty($conf->propal->dir_temp))
 	{
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index bc18f0984de..54f02c5feea 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1155,14 +1155,15 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 
 	if (class_exists("Imagick"))
 	{
-		if ($object->element == 'propal')    $modulepart='propal';
-		if ($object->element == 'commande')  $modulepart='commande';
-		if ($object->element == 'facture')   $modulepart='facture';
-		if ($object->element == 'fichinter') $modulepart='ficheinter';
-		if ($object->element == 'contrat')   $modulepart='contract';
+	    if ($object->element == 'propal')            $modulepart='propal';
+		if ($object->element == 'commande')          $modulepart='commande';
+		if ($object->element == 'facture')           $modulepart='facture';
+		if ($object->element == 'fichinter')         $modulepart='ficheinter';
+		if ($object->element == 'contrat')           $modulepart='contract';
 	    if ($object->element == 'supplier_proposal') $modulepart='supplier_proposal';
 		if ($object->element == 'order_supplier')    $modulepart='supplier_order';
 	    if ($object->element == 'invoice_supplier')  $modulepart='supplier_invoice';
+		if ($object->element == 'expensereport')     $modulepart='expensereport';
 	}
 
 	if ($object->element == 'product')
@@ -1192,7 +1193,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
             {
                 $phototoshow='';
                 // Check if a preview file is available
-                if (in_array($modulepart, array('propal', 'commande', 'facture', 'ficheinter', 'contract', 'supplier_order', 'supplier_proposal', 'supplier_invoice')) && class_exists("Imagick"))
+                if (in_array($modulepart, array('propal', 'commande', 'facture', 'ficheinter', 'contract', 'supplier_order', 'supplier_proposal', 'supplier_invoice', 'expensereport')) && class_exists("Imagick"))
                 {
                     $objectref = dol_sanitizeFileName($object->ref);
                     $dir_output = $conf->$modulepart->dir_output . "/";
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 6e31f1868c7..531f42fd47f 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -576,27 +576,27 @@ if ($action == 'confirm_draft' && GETPOST('confirm') == 'yes')
 {
     $object = new Holiday($db);
     $object->fetch($id);
-    
+
     $oldstatus = $object->statut;
     $object->statut = 1;
-    
+
     $result = $object->update($user);
     if ($result < 0)
     {
         $error = $langs->trans('ErrorBackToDraft');
     }
-    
+
     if (! $error)
     {
         $db->commit();
-        
+
         header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
         exit;
     }
     else
     {
         $db->rollback();
-    }    
+    }
 }
 
 // Si Validation de la demande
@@ -1029,7 +1029,7 @@ else
                 {
                     print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("TitleSetToDraft"),$langs->trans("ConfirmSetToDraft"),"confirm_draft", '', 1, 1);
                 }
-                
+
                 $head=holiday_prepare_head($object);
 
 
@@ -1041,17 +1041,17 @@ else
                     print '<input type="hidden" name="id" value="'.$object->id.'" />'."\n";
                 }
 
-                dol_fiche_head($head,'card',$langs->trans("CPTitreMenu"),0,'holiday');
+                dol_fiche_head($head, 'card', $langs->trans("CPTitreMenu"), -1, 'holiday');
 
                 $linkback='<a href="'.DOL_URL_ROOT.'/holiday/list.php">'.$langs->trans("BackToList").'</a>';
-                
+
                 dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref');
-                
-                
+
+
                 print '<div class="fichecenter">';
                 print '<div class="fichehalfleft">';
                 print '<div class="underbanner clearboth"></div>';
-                
+
                 print '<table class="border centpercent">';
                 print '<tbody>';
 
@@ -1153,9 +1153,9 @@ else
                 print '</div>';
                 print '<div class="fichehalfright">';
                 print '<div class="ficheaddleft">';
-                
+
                 print '<div class="underbanner clearboth"></div>';
-                
+
 				// Info workflow
                 print '<table class="border centpercent">'."\n";
                 print '<tbody>';
@@ -1212,12 +1212,12 @@ else
                 print '</div>';
                 print '</div>';
                 print '</div>';
-                
+
                 print '<div class="clearboth"></div>';
-                
+
                 dol_fiche_end();
 
-                
+
                 if ($action == 'edit' && $object->statut == 1)
                 {
                     print '<div align="center">';
@@ -1273,7 +1273,7 @@ else
                     {
                         print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=backtodraft" class="butAction">'.$langs->trans("SetToDraft").'</a>';
                     }
-                    
+
                     print '</div>';
                 }
 
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 15a565b04f9..9973223ba0f 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -1195,12 +1195,15 @@ class Holiday extends CommonObject
      *
      *    @param      boolean			$stringlist	    If true return a string list of id. If false, return an array
      *    @param      boolean   		$type			If true, read Dolibarr user list, if false, return vacation balance list.
+     *    @param      string            $filters        Filters
      *    @return     array|string|int      			Return an array
      */
-    function fetchUsers($stringlist=true,$type=true)
+    function fetchUsers($stringlist=true, $type=true, $filters='')
     {
     	global $conf;
 
+    	dol_syslog(get_class($this)."::fetchUsers", LOG_DEBUG);
+
         // Si vrai donc pour user Dolibarr
         if ($stringlist)
         {
@@ -1219,11 +1222,12 @@ class Holiday extends CommonObject
                 	$sql.= " OR u.admin = 1";
                 }
                 else
+                {
                 	$sql.= " WHERE u.entity IN (0,".$conf->entity.")";
-
+                }
                 $sql.= " AND u.statut > 0";
+                if ($filters) $sql.=$filters;
 
-                dol_syslog(get_class($this)."::fetchUsers", LOG_DEBUG);
                 $resql=$this->db->query($sql);
 
                 // Si pas d'erreur SQL
@@ -1261,9 +1265,10 @@ class Holiday extends CommonObject
             {
            		// We want only list of user id
                 $sql = "SELECT DISTINCT cpu.fk_user";
-                $sql.= " FROM ".MAIN_DB_PREFIX."holiday_users as cpu";
+                $sql.= " FROM ".MAIN_DB_PREFIX."holiday_users as cpu, ".MAIN_DB_PREFIX."user as u";
+                $sql.= " WHERE cpu.fk_user = u.user";
+                if ($filters) $sql.=$filters;
 
-                dol_syslog(get_class($this)."::fetchUsers", LOG_DEBUG);
                 $resql=$this->db->query($sql);
 
                 // Si pas d'erreur SQL
@@ -1318,8 +1323,8 @@ class Holiday extends CommonObject
                 	$sql.= " WHERE u.entity IN (0,".$conf->entity.")";
 
                 $sql.= " AND u.statut > 0";
+                if ($filters) $sql.=$filters;
 
-                dol_syslog(get_class($this)."::fetchUsers", LOG_DEBUG);
                 $resql=$this->db->query($sql);
 
                 // Si pas d'erreur SQL
@@ -1358,14 +1363,13 @@ class Holiday extends CommonObject
                 }
             }
             else
-           {
+            {
 				// List of vacation balance users
                 $sql = "SELECT cpu.fk_user, cpu.fk_type, cpu.nb_holiday, u.lastname, u.firstname";
-                $sql.= " FROM ".MAIN_DB_PREFIX."holiday_users as cpu,";
-                $sql.= " ".MAIN_DB_PREFIX."user as u";
+                $sql.= " FROM ".MAIN_DB_PREFIX."holiday_users as cpu, ".MAIN_DB_PREFIX."user as u";
                 $sql.= " WHERE cpu.fk_user = u.rowid";
+                if ($filters) $sql.=$filters;
 
-                dol_syslog(get_class($this)."::fetchUsers", LOG_DEBUG);
                 $resql=$this->db->query($sql);
 
                 // Si pas d'erreur SQL
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index e1b8b21a7bd..88f3438dcaf 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -30,81 +30,135 @@ require('../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php';
 
+$langs->load('users');
+$langs->load('hrm');
+
+$action=GETPOST('action','aZ09');
+
+$search_name=GETPOST('search_name', 'alpha');
+
+// 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) { $page = 0; }     // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortfield) $sortfield="t.rowid"; // Set here default search field
+if (! $sortorder) $sortorder="ASC";
+
+
 // Protection if external user
 if ($user->societe_id > 0) accessforbidden();
 
 // If the user does not have perm to read the page
 if(!$user->rights->holiday->read) accessforbidden();
 
-$action=GETPOST('action','aZ09');
+
+// Initialize technical object to manage context to save list fields
+$contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'defineholidaylist';
+
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('defineholidaylist'));
+$extrafields = new ExtraFields($db);
 
 $holiday = new Holiday($db);
 
-$langs->load('users');
-$langs->load('hrm');
-
 
 /*
  * Actions
  */
 
-// Si il y a une action de mise à jour
-if ($action == 'update' && isset($_POST['update_cp']))
+if (GETPOST('cancel')) { $action='list'; $massaction=''; }
+if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
+
+$parameters=array();
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
 {
-	$error = 0;
+    // Selection of new fields
+    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-	$typeleaves=$holiday->getTypes(1,1);
-
-    $userID = array_keys($_POST['update_cp']);
-    $userID = $userID[0];
-
-    foreach($typeleaves as $key => $val)
+    // Purge search criteria
+    if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") ||GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
     {
-	    $userValue = $_POST['nb_holiday_'.$val['rowid']];
-	    $userValue = $userValue[$userID];
-
-	    if (!empty($userValue))
-	    {
-	        $userValue = price2num($userValue,5);
-	    } else {
-	        $userValue = '';
-	    }
-
-	    //If the user set a comment, we add it to the log comment
-	    $comment = ((isset($_POST['note_holiday'][$userID]) && !empty($_POST['note_holiday'][$userID])) ? ' ('.$_POST['note_holiday'][$userID].')' : '');
-
-	    //print 'eee'.$val['rowid'].'-'.$userValue;
-		if ($userValue != '')
-		{
-			// We add the modification to the log (must be before update of sold because we read current value of sold)
-		    $result=$holiday->addLogCP($user->id, $userID, $langs->transnoentitiesnoconv('ManualUpdate').$comment, $userValue, $val['rowid']);
-			if ($result < 0)
-			{
-				setEventMessages($holiday->error, $holiday->errors, 'errors');
-				$error++;
-			}
-
-			// Update of the days of the employee
-		    $result = $holiday->updateSoldeCP($userID, $userValue, $val['rowid']);
-			if ($result < 0)
-			{
-				setEventMessages($holiday->error, $holiday->errors, 'errors');
-				$error++;
-			}
-
-		    // If it first update of balance, we set date to avoid to have sold incremented by new month
-		    /*
-			$now=dol_now();
-		    $sql = "UPDATE ".MAIN_DB_PREFIX."holiday_config SET";
-		    $sql.= " value = '".dol_print_date($now,'%Y%m%d%H%M%S')."'";
-		    $sql.= " WHERE name = 'lastUpdate' and value IS NULL";	// Add value IS NULL to be sure to update only at init.
-		    dol_syslog('define_holiday update lastUpdate entry', LOG_DEBUG);
-		    $result = $db->query($sql);
-		    */
-		}
+        $search_name='';
+        $toselect='';
+        $search_array_options=array();
     }
 
-    if (! $error) setEventMessages('UpdateConfCPOK', '', 'mesgs');
+    // Mass actions
+    /*
+    $objectclass='Skeleton';
+    $objectlabel='Skeleton';
+    $permtoread = $user->rights->skeleton->read;
+    $permtodelete = $user->rights->skeleton->delete;
+    $uploaddir = $conf->skeleton->dir_output;
+    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+    */
+
+    // Si il y a une action de mise à jour
+    if ($action == 'update' && isset($_POST['update_cp']))
+    {
+    	$error = 0;
+
+    	$typeleaves=$holiday->getTypes(1,1);
+
+        $userID = array_keys($_POST['update_cp']);
+        $userID = $userID[0];
+
+        foreach($typeleaves as $key => $val)
+        {
+    	    $userValue = $_POST['nb_holiday_'.$val['rowid']];
+    	    $userValue = $userValue[$userID];
+
+    	    if (!empty($userValue))
+    	    {
+    	        $userValue = price2num($userValue,5);
+    	    } else {
+    	        $userValue = '';
+    	    }
+
+    	    //If the user set a comment, we add it to the log comment
+    	    $comment = ((isset($_POST['note_holiday'][$userID]) && !empty($_POST['note_holiday'][$userID])) ? ' ('.$_POST['note_holiday'][$userID].')' : '');
+
+    	    //print 'eee'.$val['rowid'].'-'.$userValue;
+    		if ($userValue != '')
+    		{
+    			// We add the modification to the log (must be before update of sold because we read current value of sold)
+    		    $result=$holiday->addLogCP($user->id, $userID, $langs->transnoentitiesnoconv('ManualUpdate').$comment, $userValue, $val['rowid']);
+    			if ($result < 0)
+    			{
+    				setEventMessages($holiday->error, $holiday->errors, 'errors');
+    				$error++;
+    			}
+
+    			// Update of the days of the employee
+    		    $result = $holiday->updateSoldeCP($userID, $userValue, $val['rowid']);
+    			if ($result < 0)
+    			{
+    				setEventMessages($holiday->error, $holiday->errors, 'errors');
+    				$error++;
+    			}
+
+    		    // If it first update of balance, we set date to avoid to have sold incremented by new month
+    		    /*
+    			$now=dol_now();
+    		    $sql = "UPDATE ".MAIN_DB_PREFIX."holiday_config SET";
+    		    $sql.= " value = '".dol_print_date($now,'%Y%m%d%H%M%S')."'";
+    		    $sql.= " WHERE name = 'lastUpdate' and value IS NULL";	// Add value IS NULL to be sure to update only at init.
+    		    dol_syslog('define_holiday update lastUpdate entry', LOG_DEBUG);
+    		    $result = $db->query($sql);
+    		    */
+    		}
+        }
+
+        if (! $error) setEventMessages('UpdateConfCPOK', '', 'mesgs');
+    }
 }
 
 
@@ -117,6 +171,17 @@ $userstatic=new User($db);
 
 llxHeader('', $langs->trans('CPTitreMenu'));
 
+
+print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
+if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+print '<input type="hidden" name="action" value="list">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+
 print load_fiche_titre($langs->trans('MenuConfCP'), '', 'title_hrm.png');
 
 print '<div class="info">'.$langs->trans('LastUpdateCP').': '."\n";
@@ -137,10 +202,12 @@ if ($result < 0)
 	setEventMessages($holiday->error, $holiday->errors, 'errors');
 }
 
-$listUsers = $holiday->fetchUsers(false,true);
+$filters=natural_search(array('u.firstname','u.lastname'), $search_name);
+
+$listUsers = $holiday->fetchUsers(false,true,$filters);
 if (is_numeric($listUsers) && $listUsers < 0)
 {
-    setEventMessages($holiday->error, $holiday->errors, 'errors');    
+    setEventMessages($holiday->error, $holiday->errors, 'errors');
 }
 
 $var=true;
@@ -159,22 +226,44 @@ else
 {
     $canedit=0;
     if (! empty($user->rights->holiday->define_holiday)) $canedit=1;
-    
+
     // Get array of ids of all childs
     $userchilds=array();
     if (empty($user->rights->holiday->read_all))
     {
         $userchilds=$user->getAllChildIds();
     }
-    
-    print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
+
     print '<input type="hidden" name="action" value="update" />';
 
     $moreforfilter='';
-    
+
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'" id="tablelines3">'."\n";
-    
+
+    print '<tr class="liste_titre_filter">';
+    print '<td class="liste_titre"><input type="text" name="search_name" value="'.dol_escape_htmltag($search_name).'"></td>';
+    if (count($typeleaves))
+    {
+        foreach($typeleaves as $key => $val)
+        {
+            print '<td class="liste_titre" style="text-align:center"></td>';
+        }
+    }
+    else
+    {
+        print '<td class="liste_titre"></td>';
+    }
+    print '<td class="liste_titre"></td>';
+
+    // Action column
+    print '<td class="liste_titre" align="right">';
+    $searchpicto=$form->showFilterButtons();
+    print $searchpicto;
+    print '</td>';
+
+    print '</tr>';
+
     print '<tr class="liste_titre">';
     print_liste_field_titre($langs->trans('Employee'), $_SERVER["PHP_SELF"]);
     if (count($typeleaves))
@@ -193,35 +282,18 @@ else
     print '</th>';
     print_liste_field_titre('');
     print '</tr>';
-    print '<tr class="liste_titre">';
-    print '<td class="liste_titre"></td>';
-    if (count($typeleaves))
-    {
-        foreach($typeleaves as $key => $val)
-        {
-            print '<td class="liste_titre" style="text-align:center"></td>';
-        }
-    }
-    else
-    {
-        print '<td class="liste_titre"></td>';
-    }
-    print '<td class="liste_titre"></td>';
-    print '<td class="liste_titre"></td>';
-    print '</tr>';
-    
+
+
     foreach($listUsers as $users)
     {
-        
-
         // If user has not permission to edit/read all, we must see only subordinates
-        if (empty($user->rights->holiday->read_all))  
+        if (empty($user->rights->holiday->read_all))
         {
             if (($users['rowid'] != $user->id) && (! in_array($users['rowid'], $userchilds))) continue;     // This user is not into hierarchy of current user, we hide it.
         }
-        
+
         print '<tr class="oddeven">';
-        
+
         // User
         print '<td>';
         $userstatic->id=$users['rowid'];
@@ -252,7 +324,7 @@ else
         {
             print '<td></td>';
         }
-        
+
         // Note
         print '<td style="text-align:center">';
         if ($canedit) print '<input type="text"'.($canedit?'':' disabled="disabled"').' class="maxwidthonsmartphone" value="" name="note_holiday['.$users['rowid'].']" size="30"/>';
@@ -270,9 +342,10 @@ else
 
     print '</table>';
     print '</div>';
-    print '</form>';
 }
 
+print '</form>';
+
 llxFooter();
 
 $db->close();

From ef0907d89e6d44daa701fc4cea194451867ad368 Mon Sep 17 00:00:00 2001
From: alexis Algoud <alexis@atm-consulting.fr>
Date: Tue, 13 Jun 2017 15:55:22 +0200
Subject: [PATCH 205/438] NEW log download or preview event on a validate bill

---
 htdocs/blockedlog/ajax/block-add.php          | 19 ++++++++++++
 htdocs/compta/facture/card.php                | 31 +++++++++++++++++++
 htdocs/core/class/html.formfile.class.php     |  2 +-
 ..._modBlockedlog_ActionsBlockedLog.class.php |  3 +-
 htdocs/langs/en_US/blockedlog.lang            |  4 ++-
 5 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 htdocs/blockedlog/ajax/block-add.php

diff --git a/htdocs/blockedlog/ajax/block-add.php b/htdocs/blockedlog/ajax/block-add.php
new file mode 100644
index 00000000000..247b01186fe
--- /dev/null
+++ b/htdocs/blockedlog/ajax/block-add.php
@@ -0,0 +1,19 @@
+<?php 
+
+	require '../../main.inc.php';
+	require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
+	
+	$id = GETPOST('id','int');
+	$element = GETPOST('element','alpha');
+	$action = GETPOST('action','alpha');
+	
+	if($element === 'facture') {
+		dol_include_once('/compta/facture/class/facture.class.php');
+		
+		$facture = new Facture($db);
+		if($facture->fetch($id)>0) {
+			$facture->call_trigger($action, $user);
+		}
+		
+	}
+	
\ No newline at end of file
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index c4bf83293de..ffab33275a7 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -4248,6 +4248,37 @@ else if ($id > 0 || ! empty($ref))
 		$delallowed = $user->rights->facture->supprimer;
 
 		print $formfile->showdocuments('facture', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
+		
+		if(!empty($conf->blockedlog->enabled) && $object->statut>0) {
+			?>
+			<script type="text/javascript">
+
+			$(document).ready(function() {
+				$('a.documentpreview').click(function() {
+					$.post("<?php echo DOL_URL_ROOT."/blockedlog/ajax/block-add.php" ?>"
+							, { 
+								id:<?php echo $object->id; ?> 
+								, element:"<?php echo $object->element ?>"
+								, action:"PREVIEW_BILL" 
+							}
+					);
+				});
+				$('a.documentdownload').click(function() {
+					$.post("<?php echo DOL_URL_ROOT."/blockedlog/ajax/block-add.php" ?>"
+							, { 
+								id:<?php echo $object->id; ?> 
+								, element:"<?php echo $object->element ?>"
+								, action:"DOWNLOAD_BILL" 
+							}
+					);
+				});
+			});
+			
+			</script>
+			<?php
+		}
+		
+		
 		$somethingshown = $formfile->numoffiles;
 
 		// Show links to link elements
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 89cf70951ad..44a90794790 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -712,7 +712,7 @@ class FormFile
 					$out.= '<td class="tdoverflowmax300">';
                     $tmp = $this->showPreview($file,$modulepart,$relativepath,0,$param);
                     $out.= ($tmp?$tmp.' ':'');
-					$out.= '<a href="'.$documenturl.'?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).($param?'&'.$param:'').'"';
+					$out.= '<a class="documentdownload" href="'.$documenturl.'?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).($param?'&'.$param:'').'"';
 					$mime=dol_mimetype($relativepath,'',0);
 					if (preg_match('/text/',$mime)) $out.= ' target="_blank"';
 					$out.= ' target="_blank">';
diff --git a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
index 461a277dfd4..004c4eecd78 100644
--- a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
+++ b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
@@ -51,7 +51,8 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 			return 0;
 		}
 		
-		if($action==='BILL_VALIDATE' || $action === 'BILL_PAYED' || $action==='BILL_UNPAYED' || $action === 'BILL_SENTBYMAIL') {
+		if($action==='BILL_VALIDATE' || $action === 'BILL_PAYED' || $action==='BILL_UNPAYED' 
+				|| $action === 'BILL_SENTBYMAIL' || $action === 'DOWNLOAD_BILL' || $action === 'PREVIEW_BILL') {
 			$amounts=  (double) $object->total_ttc;
 		}
 		else if($action === 'PAYMENT_CUSTOMER_CREATE' || $action === 'PAYMENT_ADD_TO_BANK') {
diff --git a/htdocs/langs/en_US/blockedlog.lang b/htdocs/langs/en_US/blockedlog.lang
index 7e64bfad17f..fcad52508bd 100644
--- a/htdocs/langs/en_US/blockedlog.lang
+++ b/htdocs/langs/en_US/blockedlog.lang
@@ -18,4 +18,6 @@ logBILL_VALIDATE=Customer bill set valid from draft
 logBILL_SENTBYMAIL=Customer bill send by mail
 BlockedlogInfoDialog=Log Details
 Fingerprint=Fingerprint
-DownloadLogCSV=Download fingerprints CSV
\ No newline at end of file
+DownloadLogCSV=Download fingerprints CSV
+logPREVIEW_BILL=Preview of a validated customer bill in order to print or download
+logDOWNLOAD_BILL=Download of a validated customer bill in order to print or send
\ No newline at end of file

From 70c7bcc85fae6b43d1ce4e1045c63ff7f7cf100e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Jun 2017 15:57:30 +0200
Subject: [PATCH 206/438] Complete css to get value unique

---
 htdocs/core/lib/functions.lib.php          |  2 +-
 htdocs/core/menus/standard/auguria.lib.php | 33 ++++++++++++----------
 htdocs/core/menus/standard/eldy.lib.php    |  9 ++++--
 htdocs/core/menus/standard/empty.php       | 20 +++++++------
 4 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 3ed597d50e5..f0819570c10 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -611,7 +611,7 @@ function dol_string_unaccent($str)
  */
 function dol_string_nospecial($str,$newstr='_',$badcharstoreplace='')
 {
-	$forbidden_chars_to_replace=array(" ","'","/","\\",":","*","?","\"","<",">","|","[","]",",",";","=");
+	$forbidden_chars_to_replace=array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ",", ";", "=");
 	$forbidden_chars_to_remove=array();
 	if (is_array($badcharstoreplace)) $forbidden_chars_to_replace=$badcharstoreplace;
 	//$forbidden_chars_to_remove=array("(",")");
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 2c2d2c5ec63..4f8175c3fac 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -54,20 +54,20 @@ function print_auguria_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$m
 	if (empty($noout)) print_start_menu_array_auguria();
 
 	$usemenuhider = (GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER));
-	
+
 	// Show/Hide vertical menu
 	if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 	{
 	    $showmode=1;
 	    $classname = 'class="tmenu menuhider"';
 	    $idsel='menu';
-	
+
 	    if (empty($noout)) print_start_menu_entry_auguria($idsel,$classname,$showmode);
 	    if (empty($noout)) print_text_menu_entry_auguria('', 1, '#', $id, $idsel, $classname, $atarget);
 	    if (empty($noout)) print_end_menu_entry_auguria($showmode);
 	    $menu->add('#', '', 0, $showmode, $atarget, "xxx", '');
 	}
-	
+
 	$num = count($newTabMenu);
 	for($i = 0; $i < $num; $i++)
 	{
@@ -77,7 +77,7 @@ function print_auguria_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$m
 		if ($showmode == 1)
 		{
 			$url = $shorturl = $newTabMenu[$i]['url'];
-			
+
 			if (! preg_match("/^(http:\/\/|https:\/\/)/i",$newTabMenu[$i]['url']))
 			{
 			    $tmp=explode('?',$newTabMenu[$i]['url'],2);
@@ -85,11 +85,11 @@ function print_auguria_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$m
 				$param = (isset($tmp[1])?$tmp[1]:'');
 
 				// Complete param to force leftmenu to '' to closed opend menu when we click on a link with no leftmenu defined.
-			    if ((! preg_match('/mainmenu/i',$param)) && (! preg_match('/leftmenu/i',$param)) && ! empty($newTabMenu[$i]['url'])) 
+			    if ((! preg_match('/mainmenu/i',$param)) && (! preg_match('/leftmenu/i',$param)) && ! empty($newTabMenu[$i]['url']))
 			    {
 			        $param.=($param?'&':'').'mainmenu='.$newTabMenu[$i]['url'].'&leftmenu=';
 			    }
-			    if ((! preg_match('/mainmenu/i',$param)) && (! preg_match('/leftmenu/i',$param)) && empty($newTabMenu[$i]['url'])) 
+			    if ((! preg_match('/mainmenu/i',$param)) && (! preg_match('/leftmenu/i',$param)) && empty($newTabMenu[$i]['url']))
 			    {
 			        $param.=($param?'&':'').'leftmenu=';
 			    }
@@ -136,7 +136,7 @@ function print_auguria_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$m
 function print_start_menu_array_auguria()
 {
     global $conf;
-    
+
 	print '<div class="tmenudiv">';
 	print '<ul class="tmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)?'':' title="Top menu"').'>';
 }
@@ -250,7 +250,7 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 
 	$usemenuhider = (GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER));
 	global $usemenuhider;
-	
+
 	// Show logo company
 	if (empty($noout) && ! empty($conf->global->MAIN_SHOW_LOGO) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 	{
@@ -284,7 +284,7 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
         print '</div>'."\n";
         print "<!-- End SearchForm -->\n";
 	}
-	
+
 	// We update newmenu with entries found into database
 	$menuArbo = new Menubase($db,'auguria');
 	$newmenu = $menuArbo->menuLeftCharger($newmenu,$mainmenu,$leftmenu,($user->societe_id?1:0),'auguria',$tabMenu);
@@ -401,7 +401,7 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 				for($j = ($i + 1); $j < $num; $j++)
 				{
 				    if (empty($menu_array[$j]['level'])) $lastopened=false;
-				}				
+				}
 				if ($altok % 2 == 0)
 				{
 					print '<div class="blockvmenuimpair'.($lastopened?' blockvmenulast':'').($altok == 1 ? ' blockvmenufirst':'').'">'."\n";
@@ -454,9 +454,12 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 			// Menu niveau > 0
 			if ($menu_array[$i]['level'] > 0)
 			{
-				if ($menu_array[$i]['enabled'])
+				$cssmenu = '';
+				if ($menu_array[$i]['url']) $cssmenu = ' menu_contenu'.dol_string_nospecial(preg_replace('/\.php.*$/','',$menu_array[$i]['url']));
+
+			    if ($menu_array[$i]['enabled'])
 				{
-					print '<div class="menu_contenu">'.$tabstring;
+					print '<div class="menu_contenu'.$cssmenu.'">'.$tabstring;
 					if ($menu_array[$i]['url']) print '<a class="vsmenu" href="'.$url.'"'.($menu_array[$i]['target']?' target="'.$menu_array[$i]['target'].'"':'').'>';
 					else print '<span class="vsmenu">';
 					print $menu_array[$i]['titre'];
@@ -468,7 +471,7 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 				}
 				else if ($showmenu)
 				{
-					print '<div class="menu_contenu">'.$tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</font><br></div>'."\n";
+					print '<div class="menu_contenu'.$cssmenu.'">'.$tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</font><br></div>'."\n";
 				}
 			}
 
@@ -480,7 +483,7 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 				if ($blockvmenuopened) { print "</div>\n"; $blockvmenuopened=false; }
 			}
 		}
-		
+
 		if ($altok) print '<div class="blockvmenuend"></div>';
 	}
 
@@ -493,7 +496,7 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 	        print '</div>'."\n";
 	        print "<!-- End Bookmarks -->\n";
 	}
-	
+
 	return count($menu_array);
 }
 
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index ca6791475a6..66fe9f993a9 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1561,9 +1561,12 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			// Menu niveau > 0
 			if ($menu_array[$i]['level'] > 0)
 			{
-				if ($menu_array[$i]['enabled'])
+				$cssmenu = '';
+				if ($menu_array[$i]['url']) $cssmenu = ' menu_contenu'.dol_string_nospecial(preg_replace('/\.php.*$/','',$menu_array[$i]['url']));
+
+			    if ($menu_array[$i]['enabled'])
 				{
-					print '<div class="menu_contenu">'.$tabstring;
+					print '<div class="menu_contenu'.$cssmenu.'">'.$tabstring;
 					if ($menu_array[$i]['url']) print '<a class="vsmenu" href="'.$url.'"'.($menu_array[$i]['target']?' target="'.$menu_array[$i]['target'].'"':'').'>';
 					else print '<span class="vsmenu">';
 					print $menu_array[$i]['titre'];
@@ -1575,7 +1578,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				}
 				else if ($showmenu)
 				{
-					print '<div class="menu_contenu">'.$tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</font><br></div>'."\n";
+					print '<div class="menu_contenu'.$cssmenu.'">'.$tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</font><br></div>'."\n";
 				}
 			}
 
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index 6bc3df987cc..72dd10c7647 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -82,7 +82,7 @@ class MenuManager
 		{
 		    return 1;
 		}
-		
+
 		if ($mode == 'top' || $mode == 'jmobile')
 		{
 			if (empty($noout)) print_start_menu_array_empty();
@@ -98,13 +98,13 @@ class MenuManager
 			    $showmode=1;
 			    $classname = 'class="tmenu menuhider"';
 			    $idsel='menu';
-			
+
 			    if (empty($noout)) print_start_menu_entry($idsel,$classname,$showmode);
 			    if (empty($noout)) print_text_menu_entry('', 1, '#', $id, $idsel, $classname, $atarget);
 			    if (empty($noout)) print_end_menu_entry($showmode);
 			    $menu->add('#', '', 0, $showmode, $atarget, "xxx", '');
-			}			
-			
+			}
+
 			if (empty($noout)) print_start_menu_entry_empty($idsel, $classname, $showmode);
 			if (empty($noout)) print_text_menu_entry_empty($langs->trans("Home"), 1, dol_buildpath('/index.php',1).'?mainmenu=home&amp;leftmenu=', $id, $idsel, $classname, $this->atarget);
 			if (empty($noout)) print_end_menu_entry_empty($showmode);
@@ -201,8 +201,12 @@ class MenuManager
 						print '<div class="menu_top"></div>'."\n";
 					}
 
-					if ($this->menu->liste[$i]['level'] > 0) {
-						print '<div class="menu_contenu">';
+					if ($this->menu->liste[$i]['level'] > 0)
+					{
+        				$cssmenu = '';
+        				if ($this->menu->liste[$i]['url']) $cssmenu = ' menu_contenu'.dol_string_nospecial(preg_replace('/\.php.*$/','',$this->menu->liste[$i]['url']));
+
+					    print '<div class="menu_contenu'.$cssmenu.'">';
 
 						if ($this->menu->liste[$i]['enabled'])
 						{
@@ -229,7 +233,7 @@ class MenuManager
 						print "</div>\n";
 					}
 				}
-		
+
 				if ($altok) print '<div class="blockvmenuend"></div>';
 			}
 
@@ -308,7 +312,7 @@ class MenuManager
 function print_start_menu_array_empty()
 {
     global $conf;
-    
+
 	print '<div class="tmenudiv">';
 	print '<ul class="tmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)?'':' title="Top menu"').'>';
 }

From c088ccea32f98ebcdec91c11f575aea60af03e21 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Jun 2017 18:50:31 +0200
Subject: [PATCH 207/438] Fix better management of export of extrafield
 computed.

---
 htdocs/compta/facture/list.php                |  96 ++++++++--------
 htdocs/core/extrafieldsinexport.inc.php       |  23 +++-
 htdocs/core/modules/DolibarrModules.class.php |  24 ++++
 htdocs/core/modules/modProjet.class.php       |  19 ++--
 htdocs/exports/class/export.class.php         |  50 +++++----
 htdocs/exports/export.php                     | 106 ++++++++++++------
 6 files changed, 198 insertions(+), 120 deletions(-)

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 00b18c00759..cf037942324 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -213,7 +213,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter") || GETPOS
     $search_state="";
     $search_type='';
     $search_country='';
-    $search_type_thirdparty='';    
+    $search_type_thirdparty='';
     $day='';
     $year='';
     $month='';
@@ -239,17 +239,17 @@ if (empty($reshook))
 if ($massaction == 'withdrawrequest')
 {
     $langs->load("withdrawals");
-    
+
     if (!$user->rights->prelevement->bons->creer)
     {
         $error++;
         setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
     }
-    else 
+    else
     {
         //Checking error
         $error = 0;
-        	
+
 	    $arrayofselected=is_array($toselect)?$toselect:array();
         $listofbills=array();
         foreach($arrayofselected as $toselectid)
@@ -274,7 +274,7 @@ if ($massaction == 'withdrawrequest')
                     $error++;
                     setEventMessages($objecttmp->ref.' '.$langs->trans("Draft"), $objecttmp->errors, 'errors');
                 }
-                	
+
                 $rsql = "SELECT pfd.rowid, pfd.traite, pfd.date_demande as date_demande";
                 $rsql .= " , pfd.date_traite as date_traite";
                 $rsql .= " , pfd.amount";
@@ -291,7 +291,7 @@ if ($massaction == 'withdrawrequest')
                 {
                     $numprlv = $db->num_rows($result_sql);
                 }
-                	
+
                 if($numprlv>0){
                     $error++;
                     setEventMessages($objecttmp->ref.' '.$langs->trans("RequestAlreadyDone"), $objecttmp->errors, 'errors');
@@ -300,7 +300,7 @@ if ($massaction == 'withdrawrequest')
                     $error++;
                     setEventMessages($objecttmp->ref.' '.$langs->trans("BadPaymentMethod"), $objecttmp->errors, 'errors');
                 }
-                	
+
             }
         }
 
@@ -327,13 +327,13 @@ if ($massaction == 'withdrawrequest')
             if ($nbwithdrawrequestok > 0)
             {
                 setEventMessages($langs->trans("WithdrawRequestsDone", $nbwithdrawrequestok), null, 'mesgs');
-            }   
+            }
         }
     }
 
 }
 
-    
+
 
 /*
  * View
@@ -350,7 +350,7 @@ llxHeader('',$langs->trans('CustomersInvoices'),'EN:Customers_Invoices|FR:Factur
 
 $sql = 'SELECT';
 if ($sall || $search_product_category > 0) $sql = 'SELECT DISTINCT';
-$sql.= ' f.rowid as facid, f.facnumber, f.ref_client, f.type, f.note_private, f.note_public, f.increment, f.fk_mode_reglement, f.total as total_ht, f.tva as total_vat, f.total_ttc,';
+$sql.= ' f.rowid as id, f.facnumber as ref, f.ref_client, f.type, f.note_private, f.note_public, f.increment, f.fk_mode_reglement, f.total as total_ht, f.tva as total_vat, f.total_ttc,';
 $sql.= ' f.localtax1 as total_localtax1, f.localtax2 as total_localtax2,';
 $sql.= ' f.datef as df, f.date_lim_reglement as datelimite,';
 $sql.= ' f.paye as paye, f.fk_statut,';
@@ -360,7 +360,7 @@ $sql.= " typent.code as typent_code,";
 $sql.= " state.code_departement as state_code, state.nom as state_name";
 // We need dynamount_payed to be able to sort on status (value is surely wrong because we can count several lines several times due to other left join or link with contacts. But what we need is just 0 or > 0)
 // TODO Better solution to be able to sort on already payed or remain to pay is to store amount_payed in a denormalized field.
-if (! $sall) $sql.= ', SUM(pf.amount) as dynamount_payed';   
+if (! $sall) $sql.= ', SUM(pf.amount) as dynamount_payed';
 // Add fields from extrafields
 foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
 // Add fields from hooks
@@ -424,7 +424,7 @@ if ($search_company) $sql .= natural_search('s.nom', $search_company);
 if ($search_montant_ht != '') $sql.= natural_search('f.total', $search_montant_ht, 1);
 if ($search_montant_vat != '') $sql.= natural_search('f.tva', $search_montant_vat, 1);
 if ($search_montant_localtax1 != '') $sql.= natural_search('f.localtax1', $search_montant_localtax1, 1);
-if ($search_montant_localtax2 != '') $sql.= natural_search('f.localtax2', $search_montant_localtax2, 1); 
+if ($search_montant_localtax2 != '') $sql.= natural_search('f.localtax2', $search_montant_localtax2, 1);
 if ($search_montant_ttc != '') $sql.= natural_search('f.total_ttc', $search_montant_ttc, 1);
 if ($search_status != '' && $search_status >= 0)
 {
@@ -577,7 +577,7 @@ if ($resql)
 	   $langs->load("withdrawals");
 	   $arrayofmassactions['withdrawrequest']=$langs->trans("MakeWithdrawRequest");
 	}
-	if ($user->rights->facture->supprimer) 
+	if ($user->rights->facture->supprimer)
 	{
 	    //if (! empty($conf->global->STOCK_CALCULATE_ON_BILL) || empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED))
 	    if (empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED))
@@ -608,8 +608,8 @@ if ($resql)
 	if ($massaction == 'presend')
 	{
 		$langs->load("mails");
-		
-		if (! GETPOST('cancel')) 
+
+		if (! GETPOST('cancel'))
 		{
 			$objecttmp=new Facture($db);
 			$listofselectedid=array();
@@ -618,7 +618,7 @@ if ($resql)
 			foreach($arrayofselected as $toselectid)
 			{
 				$result=$objecttmp->fetch($toselectid);
-				if ($result > 0) 
+				if ($result > 0)
 				{
 					$listofselectedid[$toselectid]=$toselectid;
 					$thirdpartyid=$objecttmp->fk_soc?$objecttmp->fk_soc:$objecttmp->socid;
@@ -629,10 +629,10 @@ if ($resql)
 		}
 
 		print '<input type="hidden" name="massaction" value="confirm_presend">';
-		
+
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 		$formmail = new FormMail($db);
-		
+
 		dol_fiche_head(null, '', '');
 
 		$topicmail="SendBillRef";
@@ -700,7 +700,7 @@ if ($resql)
 		//$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
 
 		print $formmail->get_form();
-        
+
         dol_fiche_end();
 	}
 
@@ -709,7 +709,7 @@ if ($resql)
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
         print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
     }
-    
+
  	// If the user can view prospects other than his'
     $moreforfilter='';
  	if ($user->rights->societe->client->voir || $socid)
@@ -753,7 +753,7 @@ if ($resql)
     $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
     $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
     if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
-    
+
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
@@ -788,7 +788,7 @@ if ($resql)
 		print '</td>';
 	}
 	// Date invoice
-	if (! empty($arrayfields['f.date']['checked'])) 
+	if (! empty($arrayfields['f.date']['checked']))
 	{
     	print '<td class="liste_titre" align="center">';
         if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.dol_escape_htmltag($day).'">';
@@ -797,7 +797,7 @@ if ($resql)
         print '</td>';
 	}
 	// Date due
-	if (! empty($arrayfields['f.date_lim_reglement']['checked'])) 
+	if (! empty($arrayfields['f.date_lim_reglement']['checked']))
 	{
     	print '<td class="liste_titre" align="center">';
         if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day_lim" value="'.dol_escape_htmltag($day_lim).'">';
@@ -812,7 +812,7 @@ if ($resql)
 	    print '<td class="liste_titre" align="left"><input class="flat" type="text" size="6" name="search_project" value="'.$search_project.'"></td>';
 	}
 	// Thirpdarty
-	if (! empty($arrayfields['s.nom']['checked'])) 
+	if (! empty($arrayfields['s.nom']['checked']))
 	{
 	   print '<td class="liste_titre" align="left"><input class="flat" type="text" size="6" name="search_societe" value="'.$search_societe.'"></td>';
 	}
@@ -842,7 +842,7 @@ if ($resql)
 	    print '</td>';
 	}
 	// Payment mode
-	if (! empty($arrayfields['f.fk_mode_reglement']['checked'])) 
+	if (! empty($arrayfields['f.fk_mode_reglement']['checked']))
 	{
     	print '<td class="liste_titre" align="left">';
     	$form->select_types_paiements($search_paymentmode, 'search_paymentmode', '', 0, 0, 1, 10);
@@ -987,8 +987,8 @@ if ($resql)
     if (! empty($arrayfields['f.tms']['checked']))       print_liste_field_titre($arrayfields['f.tms']['label'],$_SERVER["PHP_SELF"],"f.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
     if (! empty($arrayfields['f.fk_statut']['checked'])) print_liste_field_titre($arrayfields['f.fk_statut']['label'],$_SERVER["PHP_SELF"],"fk_statut,paye,type,dynamount_payed","",$param,'align="right"',$sortfield,$sortorder);
     print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
-    print "</tr>\n";    
-    
+    print "</tr>\n";
+
     if ($num > 0)
     {
         $i=0;
@@ -998,8 +998,8 @@ if ($resql)
             $obj = $db->fetch_object($resql);
 
             $datelimit=$db->jdate($obj->datelimite);
-            $facturestatic->id=$obj->facid;
-            $facturestatic->ref=$obj->facnumber;
+            $facturestatic->id=$obj->id;
+            $facturestatic->ref=$obj->ref;
             $facturestatic->type=$obj->type;
             $facturestatic->statut=$obj->fk_statut;
             $facturestatic->date_lim_reglement=$db->jdate($obj->datelimite);
@@ -1011,28 +1011,28 @@ if ($resql)
             $totaldeposits = $facturestatic->getSumDepositsUsed();
             $totalpay = $paiement + $totalcreditnotes + $totaldeposits;
             $remaintopay = $obj->total_ttc - $totalpay;
-            
+
             print '<tr class="oddeven">';
     		if (! empty($arrayfields['f.facnumber']['checked']))
     		{
                 print '<td class="nowrap">';
 
                 print '<table class="nobordernopadding"><tr class="nocellnopadd">';
-    
+
                 print '<td class="nobordernopadding nowrap">';
                 print $facturestatic->getNomUrl(1,'',200,0,'',0,1);
                 print empty($obj->increment)?'':' ('.$obj->increment.')';
                 print '</td>';
-    
+
                 print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
-                $filename=dol_sanitizeFileName($obj->facnumber);
-                $filedir=$conf->facture->dir_output . '/' . dol_sanitizeFileName($obj->facnumber);
-                $urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->facid;
+                $filename=dol_sanitizeFileName($obj->ref);
+                $filedir=$conf->facture->dir_output . '/' . dol_sanitizeFileName($obj->ref);
+                $urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->id;
                 print $formfile->getDocumentsLink($facturestatic->element, $filename, $filedir);
     			print '</td>';
                 print '</tr>';
                 print '</table>';
-    
+
                 print "</td>\n";
     		    if (! $i) $totalarray['nbfield']++;
     		}
@@ -1089,7 +1089,7 @@ if ($resql)
     		    print '</td>';
     		    if (! $i) $totalarray['nbfield']++;
     		}
-    		
+
     		// Third party
     		if (! empty($arrayfields['s.nom']['checked']))
     		{
@@ -1256,18 +1256,18 @@ if ($resql)
                 print "</td>";
                 if (! $i) $totalarray['nbfield']++;
             }
-            
+
     		// Action column
             print '<td class="nowrap" align="center">';
             if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
             {
                 $selected=0;
-        		if (in_array($obj->facid, $arrayofselected)) $selected=1;
-        		print '<input id="cb'.$obj->facid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->facid.'"'.($selected?' checked="checked"':'').'>';
+        		if (in_array($obj->id, $arrayofselected)) $selected=1;
+        		print '<input id="cb'.$obj->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->id.'"'.($selected?' checked="checked"':'').'>';
             }
     		print '</td>' ;
     		if (! $i) $totalarray['nbfield']++;
-				
+
             print "</tr>\n";
 
             $i++;
@@ -1303,31 +1303,31 @@ if ($resql)
     		   else print '<td></td>';
     		}
     		print '</tr>';
-    		
+
     	}
     }
 
     $db->free($resql);
-	
+
 	$parameters=array('arrayfields'=>$arrayfields, 'sql'=>$sql);
 	$reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-    
+
 	print "</table>\n";
     print '</div>';
-    
+
     print "</form>\n";
-    
+
     if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
     {
         // Show list of available documents
         $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
         $urlsource.=str_replace('&amp;','&',$param);
-        
+
         $filedir=$diroutputmassaction;
         $genallowed=$user->rights->facture->lire;
         $delallowed=$user->rights->facture->lire;
-    
+
         print $formfile->showdocuments('massfilesarea_invoices','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
     }
     else
diff --git a/htdocs/core/extrafieldsinexport.inc.php b/htdocs/core/extrafieldsinexport.inc.php
index ac22841ad20..7f9cf523105 100644
--- a/htdocs/core/extrafieldsinexport.inc.php
+++ b/htdocs/core/extrafieldsinexport.inc.php
@@ -8,7 +8,7 @@ if (empty($keyforselect) || empty($keyforelement) || empty($keyforaliasextra))
 }
 
 // Add extra fields
-$sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = '".$keyforselect."' AND type != 'separate' AND entity IN (0, ".$conf->entity.')';
+$sql="SELECT name, label, type, param, fieldcomputed, fielddefault FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = '".$keyforselect."' AND type != 'separate' AND entity IN (0, ".$conf->entity.')';
 //print $sql;
 $resql=$this->db->query($sql);
 if ($resql)    // This can fail when class is used on old database (during migration for example)
@@ -42,10 +42,23 @@ if ($resql)    // This can fail when class is used on old database (during migra
 				if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter="List:".$tmp;
 				break;
 		}
-		if ($obj->type!='separate') {
-			$this->export_fields_array[$r][$fieldname]=$fieldlabel;
-			$this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
-			$this->export_entities_array[$r][$fieldname]=$keyforelement;
+		if ($obj->type!='separate')
+		{
+		    // If not a computed field
+		    if (empty($obj->fieldcomputed))
+		    {
+    			$this->export_fields_array[$r][$fieldname]=$fieldlabel;
+    			$this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
+    			$this->export_entities_array[$r][$fieldname]=$keyforelement;
+		    }
+			// If this is a computed field
+			else
+			{
+			    $this->export_fields_array[$r][$fieldname]=$fieldlabel;
+			    $this->export_TypeFields_array[$r][$fieldname]=$typeFilter.'Compute';
+			    $this->export_special_array[$r][$fieldname]=$obj->fieldcomputed;
+			    $this->export_entities_array[$r][$fieldname]=$keyforelement;
+			}
 		}
 	}
 }
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index a79f17b1fdc..37e72024e2a 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -215,6 +215,9 @@ class DolibarrModules           // Can not be abstract, because we need to insta
      */
     public $descriptionlong;
 
+
+    // For exports
+
     /**
      * @var string Module export code
      */
@@ -225,6 +228,19 @@ class DolibarrModules           // Can not be abstract, because we need to insta
      */
     public $export_label;
 
+    public $export_permission;
+    public $export_fields_array;
+    public $export_TypeFields_array;
+    public $export_entities_array;
+    public $export_special_array;           // special or computed field
+    public $export_dependencies_array;
+    public $export_sql_start;
+    public $export_sql_end;
+    public $export_sql_order;
+
+
+    // For import
+
     /**
      * @var string Module import code
      */
@@ -235,6 +251,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
      */
     public $import_label;
 
+
     /**
      * @var string Module constant name
      */
@@ -343,6 +360,13 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 	public $hidden = false;
 
 
+
+
+
+
+
+
+
 	/**
 	 * Constructor. Define names, constants, directories, boxes, permissions
 	 *
diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php
index 071912e1c00..af71ccc4360 100644
--- a/htdocs/core/modules/modProjet.class.php
+++ b/htdocs/core/modules/modProjet.class.php
@@ -116,14 +116,14 @@ class modProjet extends DolibarrModules
 		$this->const[$r][3] = "";
 		$this->const[$r][4] = 0;
 		$r++;
-		                       
+
 		$this->const[$r][0] = "PROJECT_USE_OPPORTUNITIES";
 		$this->const[$r][1] = "chaine";
 		$this->const[$r][2] = "1";
 		$this->const[$r][3] = "";
 		$this->const[$r][4] = 0;
 		$r++;
-		
+
 		$this->const[$r][0] = "MAIN_DELAY_PROJECT_TO_CLOSE";
 		$this->const[$r][1] = "chaine";
 		$this->const[$r][2] = "7";
@@ -136,7 +136,7 @@ class modProjet extends DolibarrModules
 		$this->const[$r][3] = "";
 		$this->const[$r][4] = 0;
 		$r++;
-		
+
 		// Boxes
 		$this->boxes = array();
 		$r=0;
@@ -207,7 +207,7 @@ class modProjet extends DolibarrModules
 		//-------
 		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
 
-		
+
 		//Exports
 		//--------
 		$r=1;
@@ -240,15 +240,16 @@ class modProjet extends DolibarrModules
 		    unset($this->export_fields_array[$r]['p.opp_amount']);
 		    unset($this->export_fields_array[$r]['cls.code']);
 		}
-		
+
 		// Add fields for project
 		$this->export_fields_array[$r]=array_merge($this->export_fields_array[$r], array());
+		// Add extra fields for project
 		$keyforselect='projet'; $keyforelement='project'; $keyforaliasextra='extra';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		// Add fields for tasks
         $this->export_fields_array[$r]=array_merge($this->export_fields_array[$r], array('pt.rowid'=>'RefTask','pt.label'=>'LabelTask','pt.dateo'=>"TaskDateStart",'pt.datee'=>"TaskDateEnd",'pt.duration_effective'=>"DurationEffective",'pt.planned_workload'=>"PlannedWorkload",'pt.progress'=>"Progress",'pt.description'=>"TaskDescription"));
 		$this->export_entities_array[$r]=array_merge($this->export_entities_array[$r], array('pt.rowid'=>'projecttask','pt.label'=>'projecttask','pt.dateo'=>"projecttask",'pt.datee'=>"projecttask",'pt.duration_effective'=>"projecttask",'pt.planned_workload'=>"projecttask",'pt.progress'=>"projecttask",'pt.description'=>"projecttask"));
-        // Add extra fields
+        // Add extra fields for task
 		$keyforselect='projet_task'; $keyforelement='projecttask'; $keyforaliasextra='extra2';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
         // End add extra fields
@@ -264,8 +265,8 @@ class modProjet extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX."projet_task_time as ptt ON pt.rowid = ptt.fk_task";
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON p.fk_soc = s.rowid';
 		$this->export_sql_end[$r] .=' WHERE p.entity = '.$conf->entity;
-		
-		
+
+
 		// Import list of tasks
 		if (empty($conf->global->PROJECT_HIDE_TASKS))
 		{
@@ -297,7 +298,7 @@ class modProjet extends DolibarrModules
     		//$this->import_convertvalue_array[$r]=array('s.fk_soc'=>array('rule'=>'lastrowid',table='t');
     		$this->import_regex_array[$r]=array('t.dateo'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$','t.datee'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$','t.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]( [0-9][0-9]:[0-9][0-9]:[0-9][0-9])?$');
     		$this->import_examplevalues_array[$r]=array('t.fk_projet'=>'MyProjectRef','t.ref'=>"auto or TK2010-1234",'t.label'=>"My task",'t.progress'=>"0 (not started) to 100 (finished)",'t.datec'=>'1972-10-10','t.note_private'=>"My private note",'t.note_public'=>"My public note");
-		}		
+		}
 	}
 
 
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index 298950abe8e..4c9d6eaabb4 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -38,6 +38,7 @@ class Export
 	var $array_export_sql_start=array();        // Tableau des "requetes sql"
 	var $array_export_sql_end=array();          // Tableau des "requetes sql"
 	var $array_export_sql_order=array();        // Tableau des "requetes sql"
+
 	var $array_export_fields=array();           // Tableau des listes de champ+libelle a exporter
 	var $array_export_TypeFields=array();		// Tableau des listes de champ+Type de filtre
 	var $array_export_FilterValue=array();		// Tableau des listes de champ+Valeur a filtrer
@@ -45,7 +46,7 @@ class Export
 	var $array_export_dependencies=array();     // array of list of entities that must take care of the DISTINCT if a field is added into export
 	var $array_export_special=array();          // Tableau des operations speciales sur champ
     var $array_export_examplevalues=array();    // array with examples
-    
+
 	// To store export modules
 	var $hexa;
 	var $hexafiltervalue;
@@ -178,7 +179,7 @@ class Export
 									$this->array_export_special[$i]=(! empty($module->export_special_array[$r])?$module->export_special_array[$r]:'');
             						// Array of examples
             						$this->array_export_examplevalues[$i]=$module->export_examplevalues_array[$r];
-									
+
 									// Requete sql du dataset
 									$this->array_export_sql_start[$i]=$module->export_sql_start[$r];
 									$this->array_export_sql_end[$i]=$module->export_sql_end[$r];
@@ -246,7 +247,7 @@ class Export
 			}
 			$sql.=$sqlWhere;
 		}
-		
+
 		// Add the order
 		$sql.=$this->array_export_sql_order[$indice];
 
@@ -259,7 +260,7 @@ class Export
 		        if (preg_match('/GROUP_CONCAT/i', $key) and $value != '') $sql.=" HAVING ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
 		    }
 		}
-		
+
 		return $sql;
 	}
 
@@ -281,7 +282,7 @@ class Export
 				if (! (strpos($ValueField, '%') === false))
 					$szFilterQuery.=" ".$NameField." LIKE '".$ValueField."'";
 				else
-					$szFilterQuery.=" ".$NameField."='".$ValueField."'";
+					$szFilterQuery.=" ".$NameField." = '".$ValueField."'";
 				break;
 			case 'Date':
 				if (strpos($ValueField, "+") > 0)
@@ -325,8 +326,12 @@ class Export
 			case 'List':
 				if (is_numeric($ValueField))
 					$szFilterQuery=" ".$NameField."=".$ValueField;
-				else
-					$szFilterQuery=" ".$NameField."='".$ValueField."'";
+				else {
+                    if (! (strpos($ValueField, '%') === false))
+                        $szFilterQuery=" ".$NameField." LIKE '".$ValueField."'";
+                    else
+                        $szFilterQuery=" ".$NameField." = '".$ValueField."'";
+				}
 				break;
 			default:
 			    dol_syslog("Error we try to forge an sql export request with a condition on a field with type '".$InfoFieldList[0]."' (defined into module descriptor) but this type is unknown/not supported. It looks like a bug into module descriptor.", LOG_ERR);
@@ -589,10 +594,8 @@ class Export
 
 				$var=true;
 
-				while ($objp = $this->db->fetch_object($resql))
+				while ($obj = $this->db->fetch_object($resql))
 				{
-					
-
 					// Process special operations
 					if (! empty($this->array_export_special[$indice]))
 					{
@@ -604,14 +607,14 @@ class Export
 							{
 								//$alias=$this->array_export_alias[$indice][$key];
 								$alias=str_replace(array('.', '-','(',')'),'_',$key);
-								if ($objp->$alias < 0) $objp->$alias='';
+								if ($obj->$alias < 0) $obj->$alias='';
 							}
 							// Operation ZEROIFNEG
 							elseif ($this->array_export_special[$indice][$key]=='ZEROIFNEG')
 							{
 								//$alias=$this->array_export_alias[$indice][$key];
 								$alias=str_replace(array('.', '-','(',')'),'_',$key);
-								if ($objp->$alias < 0) $objp->$alias='0';
+								if ($obj->$alias < 0) $obj->$alias='0';
 							}
 							// Operation INVOICEREMAINTOPAY
 							elseif ($this->array_export_special[$indice][$key]=='getRemainToPay')
@@ -619,29 +622,34 @@ class Export
 								//$alias=$this->array_export_alias[$indice][$key];
 								$alias=str_replace(array('.', '-','(',')'),'_',$key);
 								$remaintopay='';
-								if ($objp->f_rowid > 0)
+								if ($obj->f_rowid > 0)
 								{
 								    global $tmpobjforcomputecall;
-								    if (! is_object($tmpobjforcomputecall)) 
+								    if (! is_object($tmpobjforcomputecall))
 								    {
 								        include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 								        $tmpobjforcomputecall=new Facture($this->db);
 								    }
-								    $tmpobjforcomputecall->id = $objp->f_rowid;
-								    $tmpobjforcomputecall->total_ttc = $objp->f_total_ttc;
+								    $tmpobjforcomputecall->id = $obj->f_rowid;
+								    $tmpobjforcomputecall->total_ttc = $obj->f_total_ttc;
 								    $remaintopay=$tmpobjforcomputecall->getRemainToPay();
-								}								
-								$objp->$alias=$remaintopay;
+								}
+								$obj->$alias=$remaintopay;
 							}
 							else
 							{
-							    $this->error='Operation '.$this->array_export_special[$indice][$key].' not supported.';
+							    // TODO FIXME Export of compute field does not work. $obj containt $obj->alias_field and formulat will contains $obj->field
+							    $computestring=$this->array_export_special[$indice][$key];
+							    $tmp=dol_eval($computestring, 1, 0);
+							    $obj->$alias=$tmp;
+
+							    $this->error="ERROPNOTSUPPORTED. Operation ".$this->array_export_special[$indice][$key]." not supported. Export of 'computed' extrafields is not yet supported, please remove field.";
 							    return -1;
 							}
 						}
 					}
 					// end of special operation processing
-					$objmodel->write_record($array_selected,$objp,$outputlangs,$this->array_export_TypeFields[$indice]);
+					$objmodel->write_record($array_selected,$obj,$outputlangs,$this->array_export_TypeFields[$indice]);
 				}
 
 				// Genere en-tete
@@ -732,7 +740,7 @@ class Export
 				$this->id				= $obj->rowid;
 				$this->model_name		= $obj->label;
 				$this->datatoexport		= $obj->type;
-				
+
 				$this->hexa				= $obj->field;
 				$this->hexafiltervalue	= $obj->filter;
 
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index 43453041dfd..909db84fcb4 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -168,7 +168,7 @@ if ($action=='selectfield')     // Selection of field at step 2
         $warnings=array();
 
         $array_selected[$field]=count($array_selected)+1;    // We tag the key $field as "selected"
-        // We check if there is a dependency to activate 
+        // We check if there is a dependency to activate
         /*var_dump($field);
         var_dump($fieldsentitiesarray[$field]);
         var_dump($fieldsdependenciesarray);*/
@@ -187,7 +187,7 @@ if ($action=='selectfield')     // Selection of field at step 2
             if (is_array($tmp)) $listofdependencies=$tmp;
             else $listofdependencies=array($tmp);
         }
-        
+
         if (count($listofdependencies))
         {
             foreach($listofdependencies as $fieldid)
@@ -270,7 +270,7 @@ if ($action == 'builddoc')
     {
         @ini_set("max_execution_time", $max_execution_time_for_export); // This work only if safe mode is off. also web servers has timeout of 300
     }
-    
+
     // Build export file
 	$result=$objexport->build_file($user, GETPOST('model','alpha'), $datatoexport, $array_selected, $array_filtervalue);
 	if ($result < 0)
@@ -535,9 +535,9 @@ if ($step == 2 && $datatoexport)
 
     print '</table>';
     print '</div>';
-    
+
     dol_fiche_end();
-    
+
     print '<br>';
 
     // Combo list of export models
@@ -561,7 +561,7 @@ if ($step == 2 && $datatoexport)
     print '<td>'.$langs->trans("ExportableFields").'</td>';
     print '<td width="100" align="center">';
     print '<a class="liste_titre" title='.$langs->trans("All").' alt='.$langs->trans("All").' href="'.$_SERVER["PHP_SELF"].'?step=2&datatoexport='.$datatoexport.'&action=selectfield&field=all">'.$langs->trans("All")."</a>";
-    print '/';
+    print ' / ';
     print '<a class="liste_titre" title='.$langs->trans("None").' alt='.$langs->trans("None").' href="'.$_SERVER["PHP_SELF"].'?step=2&datatoexport='.$datatoexport.'&action=unselectfield&field=all">'.$langs->trans("None")."</a>";
     print '</td>';
     print '<td width="44%">'.$langs->trans("ExportedFields").'</td>';
@@ -585,7 +585,7 @@ if ($step == 2 && $datatoexport)
 
     foreach($fieldsarray as $code=>$label)
     {
-        
+
         print '<tr class="oddeven">';
 
         $i++;
@@ -597,7 +597,7 @@ if ($step == 2 && $datatoexport)
         print '<td class="nowrap">';
         // If value of entityicon=entitylang='icon:Label'
         //print $code.'-'.$label.'-'.$entity;
-        
+
         $tmparray=explode(':',$entityicon);
         if (count($tmparray) >=2)
         {
@@ -606,7 +606,9 @@ if ($step == 2 && $datatoexport)
         }
         print img_object('',$entityicon).' '.$langs->trans($entitylang);
         print '</td>';
-        $text=$langs->trans($label);
+
+        $text=(empty($objexport->array_export_special[0][$code])?'':'<i>').$langs->trans($label).(empty($objexport->array_export_special[0][$code])?'':'</i>');
+
         $tablename=getablenamefromfield($code,$sqlmaxforexport);
         $htmltext ='<b>'.$langs->trans("Name").":</b> ".$text.'<br>';
         if (! empty($objexport->array_export_special[0][$code]))
@@ -617,11 +619,16 @@ if ($step == 2 && $datatoexport)
         {
             $htmltext.='<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./','',$code)."<br>";
         }
-		if (! empty($objexport->array_export_examplevalues[0][$code]))
+   		if (! empty($objexport->array_export_examplevalues[0][$code]))
 		{
 		    $htmltext.=$langs->trans("SourceExample").': <b>'.$objexport->array_export_examplevalues[0][$code].'</b><br>';
 		}
-        if (isset($array_selected[$code]) && $array_selected[$code])
+    	if (! empty($objexport->array_export_TypeFields[0][$code]))
+		{
+		    $htmltext.=$langs->trans("Type").': <b>'.$objexport->array_export_TypeFields[0][$code].'</b><br>';
+		}
+
+		if (isset($array_selected[$code]) && $array_selected[$code])
         {
             // Selected fields
             print '<td>&nbsp;</td>';
@@ -649,7 +656,7 @@ if ($step == 2 && $datatoexport)
 
     print '</table>';
 
-    
+
     /*
      * Barre d'action
      */
@@ -740,7 +747,7 @@ if ($step == 3 && $datatoexport)
 
 	print '</table>';
 	print '</div>';
-	
+
 	print '<br>';
 
 	// Combo list of export models
@@ -772,7 +779,6 @@ if ($step == 3 && $datatoexport)
 	// on boucle sur les champs
 	foreach($fieldsarray as $code => $label)
 	{
-		
 		print '<tr class="oddeven">';
 
 		$i++;
@@ -794,15 +800,27 @@ if ($step == 3 && $datatoexport)
 		// Field name
 		$labelName=(! empty($fieldsarray[$code])?$fieldsarray[$code]:'');
 		$ValueFilter=(! empty($array_filtervalue[$code])?$array_filtervalue[$code]:'');
-		$text=$langs->trans($labelName);
+		$text=(empty($objexport->array_export_special[0][$code])?'':'<i>').$langs->trans($labelName).(empty($objexport->array_export_special[0][$code])?'':'</i>');
 
 		$tablename=getablenamefromfield($code,$sqlmaxforexport);
 		$htmltext ='<b>'.$langs->trans("Name").':</b> '.$text.'<br>';
-		$htmltext.='<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./','',$code)."<br>";
+			if (! empty($objexport->array_export_special[0][$code]))
+		{
+		    $htmltext.='<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
+		}
+		else
+		{
+		    $htmltext.='<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./','',$code)."<br>";
+		}
 		if (! empty($objexport->array_export_examplevalues[0][$code]))
 		{
 		    $htmltext.=$langs->trans("SourceExample").': <b>'.$objexport->array_export_examplevalues[0][$code].'</b><br>';
 		}
+		if (! empty($objexport->array_export_TypeFields[0][$code]))
+		{
+		    $htmltext.=$langs->trans("Type").': <b>'.$objexport->array_export_TypeFields[0][$code].'</b><br>';
+		}
+
 		print '<td>';
 		print $form->textwithpicto($text,$htmltext);
 		print '</td>';
@@ -849,7 +867,7 @@ if ($step == 4 && $datatoexport)
         header("Location: ".DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport);
         exit;
     }
-    
+
     asort($array_selected);
 
     llxHeader('',$langs->trans("NewExport"),'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones');
@@ -937,7 +955,7 @@ if ($step == 4 && $datatoexport)
 
     print '</table>';
     print '</div>';
-    
+
     print '<br>';
 
     // Select request if all fields are selected
@@ -957,7 +975,6 @@ if ($step == 4 && $datatoexport)
     $var=true;
     foreach($array_selected as $code=>$value)
     {
-        
         print '<tr class="oddeven">';
 
         $entity=(! empty($objexport->array_export_entities[0][$code])?$objexport->array_export_entities[0][$code]:$objexport->array_export_icon[0]);
@@ -975,15 +992,30 @@ if ($step == 4 && $datatoexport)
         print img_object('',$entityicon).' '.$langs->trans($entitylang);
         print '</td>';
 
-        print '<td>';
-        $text=$langs->trans($objexport->array_export_fields[0][$code]);
+        $labelName=$objexport->array_export_fields[0][$code];
+
+		$text=(empty($objexport->array_export_special[0][$code])?'':'<i>').$langs->trans($labelName).(empty($objexport->array_export_special[0][$code])?'':'</i>');
+
         $tablename=getablenamefromfield($code,$sqlmaxforexport);
-        $htmltext ='<b>'.$langs->trans("Name").":</b> ".$text.'<br>';
-        $htmltext.='<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./','',$code)."<br>";
-    	if (! empty($objexport->array_export_examplevalues[0][$code]))
-		{
-		    $htmltext.=$langs->trans("SourceExample").': <b>'.$objexport->array_export_examplevalues[0][$code].'</b><br>';
-		}
+        $htmltext ='<b>'.$langs->trans("Name").':</b> '.$text.'<br>';
+        if (! empty($objexport->array_export_special[0][$code]))
+        {
+            $htmltext.='<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
+        }
+        else
+        {
+            $htmltext.='<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./','',$code)."<br>";
+        }
+        if (! empty($objexport->array_export_examplevalues[0][$code]))
+        {
+            $htmltext.=$langs->trans("SourceExample").': <b>'.$objexport->array_export_examplevalues[0][$code].'</b><br>';
+        }
+        if (! empty($objexport->array_export_TypeFields[0][$code]))
+        {
+            $htmltext.=$langs->trans("Type").': <b>'.$objexport->array_export_TypeFields[0][$code].'</b><br>';
+        }
+
+        print '<td>';
         print $form->textwithpicto($text,$htmltext);
 		//print ' ('.$code.')';
         print '</td>';
@@ -1056,7 +1088,7 @@ if ($step == 4 && $datatoexport)
 			$var=false;
 			while ($i < $num)
 			{
-				
+
 				$obj = $db->fetch_object($resql);
 				print '<tr class="oddeven"><td>';
 				print $obj->label;
@@ -1085,7 +1117,7 @@ if ($step == 5 && $datatoexport)
         header("Location: ".DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport);
         exit;
     }
-    
+
 	asort($array_selected);
 
     llxHeader('',$langs->trans("NewExport"),'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones');
@@ -1135,7 +1167,7 @@ if ($step == 5 && $datatoexport)
 
     print '<div class="fichecenter">';
     print '<div class="underbanner clearboth"></div>';
-    
+
     print '<table width="100%" class="border">';
 
     // Module
@@ -1186,7 +1218,7 @@ if ($step == 5 && $datatoexport)
 
     print '</table>';
     print '</div>';
-    
+
     print '<br>';
 
     print $langs->trans("NowClickToGenerateToBuildExportFile").'<br>';
@@ -1210,7 +1242,7 @@ if ($step == 5 && $datatoexport)
     		unset($liste[$key]);
     	}
 
-        
+
         print '<tr class="oddeven">';
         print '<td width="16">'.img_picto_common($key,$objmodelexport->getPictoForKey($key)).'</td>';
 	    $text=$objmodelexport->getDriverDescForKey($key);
@@ -1222,7 +1254,7 @@ if ($step == 5 && $datatoexport)
 
     print '</div>';
 
-    
+
     print '<table width="100%">';
 
     if ($sqlusedforexport && $user->admin)
@@ -1233,7 +1265,7 @@ if ($step == 5 && $datatoexport)
     }
 	print '</table>';
 
-	
+
 	print '<div class="fichecenter"><div class="fichehalfleft">';
 
     if (! is_dir($conf->export->dir_temp)) dol_mkdir($conf->export->dir_temp);
@@ -1243,7 +1275,7 @@ if ($step == 5 && $datatoexport)
     print $formfile->showdocuments('export','',$upload_dir,$_SERVER["PHP_SELF"].'?step=5&datatoexport='.$datatoexport,$liste,1,(! empty($_POST['model'])?$_POST['model']:'csv'),1,1);
 
     print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-    
+
     print '</div></div></div>';
 }
 
@@ -1265,11 +1297,11 @@ function getablenamefromfield($code,$sqlmaxforexport)
 {
 	$alias=preg_replace('/\.(.*)$/i','',$code);         // Keep only 'Alias' and remove '.Fieldname'
 	$regexstring='/([a-zA-Z_]+) as '.preg_quote($alias).'[, \)]/i';
-    
+
 	$newsql=$sqlmaxforexport;
 	$newsql=preg_replace('/^(.*) FROM /i','',$newsql);  // Remove part before the FROM
 	$newsql=preg_replace('/WHERE (.*)$/i','',$newsql);	// Remove part after the WHERE so we have now only list of table aliases in a string. We must keep the ' ' before WHERE
-	
+
 	if (preg_match($regexstring,$newsql,$reg))
 	{
 		return $reg[1];   // The tablename

From fc5dfcda6512c267575196b11ef6a1a9199f3ab3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Jun 2017 19:46:27 +0200
Subject: [PATCH 208/438] Fix error management in POS.

---
 htdocs/cashdesk/affIndex.php         |  6 +++---
 htdocs/cashdesk/css/style.css        |  8 +++++++
 htdocs/cashdesk/tpl/menu.tpl.php     |  3 ++-
 htdocs/cashdesk/validation_verif.php | 31 +++++++++++++++-------------
 4 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/htdocs/cashdesk/affIndex.php b/htdocs/cashdesk/affIndex.php
index b5432b94eec..a2e467a35e3 100644
--- a/htdocs/cashdesk/affIndex.php
+++ b/htdocs/cashdesk/affIndex.php
@@ -27,6 +27,8 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/cashdesk/include/environnement.php';
 require_once DOL_DOCUMENT_ROOT.'/cashdesk/include/keypad.php';
 
+$error=GETPOST('error');
+
 // Test if already logged
 if ( $_SESSION['uid'] <= 0 )
 {
@@ -54,9 +56,7 @@ print '<body>'."\n";
 
 if (!empty($error))
 {
-	print $error;
-	print '</body></html>';
-	exit;
+	dol_htmloutput_events();
 }
 
 print '<div class="conteneur">'."\n";
diff --git a/htdocs/cashdesk/css/style.css b/htdocs/cashdesk/css/style.css
index ab8d660fcf1..216f53e946b 100644
--- a/htdocs/cashdesk/css/style.css
+++ b/htdocs/cashdesk/css/style.css
@@ -106,6 +106,14 @@ p {
 	padding-right: 5px;
 }
 
+/* Force values for small screen 570 */
+@media only screen and (max-width: 570px)
+{
+	.menu_choix0 {
+		max-width: 180px;
+	}
+}
+
 .menu_choix0 a {
 	font-weight: normal;
 	text-decoration: none;
diff --git a/htdocs/cashdesk/tpl/menu.tpl.php b/htdocs/cashdesk/tpl/menu.tpl.php
index 85de5ad9ab5..fd9bcbca77c 100644
--- a/htdocs/cashdesk/tpl/menu.tpl.php
+++ b/htdocs/cashdesk/tpl/menu.tpl.php
@@ -79,10 +79,11 @@ print '</form>';
 /*print $langs->trans("CashDeskBankCash").': '.$bankcashLink.'<br>';
 print $langs->trans("CashDeskBankCB").': '.$bankcbLink.'<br>';
 print $langs->trans("CashDeskBankCheque").': '.$bankchequeLink.'<br>';*/
+print '<div class="clearboth">';
 if (!empty($_SESSION["CASHDESK_ID_WAREHOUSE"]) && ! empty($conf->stock->enabled) && empty($conf->global->CASHDESK_NO_DECREASE_STOCK))
 {
 	print $langs->trans("CashDeskWarehouse").': '.$warehouseLink;
 }
-print '</li></ul>';
+print '</div></li></ul>';
 print '</div>';
 print "\n".'<!-- menu.tpl.php end -->'."\n";
diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php
index ae5d7185f40..1b870d30f73 100644
--- a/htdocs/cashdesk/validation_verif.php
+++ b/htdocs/cashdesk/validation_verif.php
@@ -32,7 +32,6 @@ require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 $obj_facturation = unserialize($_SESSION['serObjFacturation']);
-unset ($_SESSION['serObjFacturation']);
 
 $action =GETPOST('action','aZ09');
 $bankaccountid=GETPOST('cashdeskbank');
@@ -45,14 +44,14 @@ switch ($action)
 
 	case 'valide_achat':
 	    $thirdpartyid = $_SESSION['CASHDESK_ID_THIRDPARTY'];
-	    
+
 		$company=new Societe($db);
 		$company->fetch($thirdpartyid);
 
 		$invoice=new Facture($db);
 		$invoice->date=dol_now();
 		$invoice->type= Facture::TYPE_STANDARD;
-		
+
 		// To use a specific numbering module for POS, reset $conf->global->FACTURE_ADDON and other vars here
 		// and restore values just after
 		$sav_FACTURE_ADDON='';
@@ -68,7 +67,7 @@ switch ($action)
 			// To force rule only for POS with mercure
 			//...
 		}
-		
+
 		$num=$invoice->getNextNumRef($company);
 
 		// Restore save values
@@ -76,7 +75,7 @@ switch ($action)
 		{
 			$conf->global->FACTURE_ADDON = $sav_FACTURE_ADDON;
 		}
-		
+
 		$obj_facturation->numInvoice($num);
 
 		$obj_facturation->getSetPaymentMode($_POST['hdnChoix']);
@@ -129,7 +128,7 @@ switch ($action)
 			exit;
 		}
 
-		switch ( $obj_facturation->getSetPaymentMode() )
+		switch ($obj_facturation->getSetPaymentMode() )
 		{
 			case 'DIF':
 				$mode_reglement_id = 0;
@@ -159,7 +158,6 @@ switch ($action)
 		$note .= $_POST['txtaNotes'];
 		dol_syslog("obj_facturation->getSetPaymentMode()=".$obj_facturation->getSetPaymentMode()." mode_reglement_id=".$mode_reglement_id." cond_reglement_id=".$cond_reglement_id);
 
-
 		$error=0;
 
 
@@ -255,14 +253,15 @@ switch ($action)
 			}
 			else
 			{
-				$error++;
+				setEventMessage($invoice->error, $invoice->errors, 'errors');
+			    $error++;
 			}
 
 			$id = $invoice->id;
 		}
 		else
 		{
-			$resultcreate=$invoice->create($user,0,0);
+		    $resultcreate=$invoice->create($user,0,0);
 			if ($resultcreate > 0)
 			{
 				$warehouseidtodecrease=(isset($_SESSION["CASHDESK_ID_WAREHOUSE"])?$_SESSION["CASHDESK_ID_WAREHOUSE"]:0);
@@ -287,7 +286,8 @@ switch ($action)
 							if ($invoice->type == $invoice::TYPE_CREDIT_NOTE) $result=$mouvP->reception($user, $invoice->lines[$i]->fk_product, $warehouseidtodecrease, $invoice->lines[$i]->qty, $invoice->lines[$i]->subprice, $langs->trans("InvoiceValidatedInDolibarrFromPos",$invoice->newref));
 							else $result=$mouvP->livraison($user, $invoice->lines[$i]->fk_product, $warehouseidtodecrease, $invoice->lines[$i]->qty, $invoice->lines[$i]->subprice, $langs->trans("InvoiceValidatedInDolibarrFromPos",$invoice->newref));
 							if ($result < 0) {
-								$error++;
+							    setEventMessages($mouvP->error, $mouvP->errors, 'errors');
+							    $error++;
 							}
 						}
 					}
@@ -331,15 +331,18 @@ switch ($action)
 				}
 				else
 				{
-					$error++;
+				    setEventMessages($invoice->error, $invoice->errors, 'errors');
+				    $error++;
 				}
 			}
 			else
 			{
-				$error++;
+				setEventMessages($invoice->error, $invoice->errors, 'errors');
+			    $error++;
 			}
 		}
 
+
 		if (! $error)
 		{
 			$db->commit();
@@ -348,14 +351,14 @@ switch ($action)
 		else
 		{
 			$db->rollback();
-			$redirection = 'affIndex.php?facid='.$id.'&mesg=ErrorFailedToCreateInvoice';	// Ajout de l'id de la facture, pour l'inclure dans un lien pointant directement vers celle-ci dans Dolibarr
+			$redirection = 'affIndex.php?facid='.$id.'&error=1&mesg=ErrorFailedToCreateInvoice';	// Ajout de l'id de la facture, pour l'inclure dans un lien pointant directement vers celle-ci dans Dolibarr
 		}
 		break;
 
 		// End of case: valide_facture
 }
 
-
+unset ($_SESSION['serObjFacturation']);
 
 $_SESSION['serObjFacturation'] = serialize($obj_facturation);
 

From a88bafe1986a5a0f5239cfdcc1e30862c2ec0c86 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Jun 2017 20:07:28 +0200
Subject: [PATCH 209/438] Fix responsive

---
 htdocs/cashdesk/css/style.css            |  1 -
 htdocs/cashdesk/tpl/facturation1.tpl.php | 41 +++++++++++++-----------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/htdocs/cashdesk/css/style.css b/htdocs/cashdesk/css/style.css
index 216f53e946b..c34e8596f01 100644
--- a/htdocs/cashdesk/css/style.css
+++ b/htdocs/cashdesk/css/style.css
@@ -267,7 +267,6 @@ p.titre {
 
 /* --------------------- Combo lists ------------------- */
 .select_design {
-	width: 370px;
 	overflow: auto;
 }
 
diff --git a/htdocs/cashdesk/tpl/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php
index fce4df22c7a..580012847f5 100644
--- a/htdocs/cashdesk/tpl/facturation1.tpl.php
+++ b/htdocs/cashdesk/tpl/facturation1.tpl.php
@@ -38,7 +38,7 @@ $langs->load("cashdesk");
 
 		<input type="hidden" name="hdnSource" value="NULL" />
 
-		<table>
+		<table class="center">
 			<tr><th class="label1"><?php echo $langs->trans("FilterRefOrLabelOrBC"); ?></th><th class="label1"><?php echo $langs->trans("Designation"); ?></th></tr>
 			<tr>
 			<!-- Affichage de la reference et de la designation -->
@@ -89,42 +89,32 @@ $langs->load("cashdesk");
 				</select>
 			</td>
 			</tr>
-			  <tr><td><div id="resultats_dhtml"></div></td></tr>
 		</table>
 	</form>
 
 	<form id="frmQte" class="formulaire1" method="post" action="facturation_verif.php?action=ajout_article" onsubmit ="javascript: return verifSaisie();">
 		<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
-		<table>
-			<tr><th><?php echo $langs->trans("Qty"); ?></th>
-			<th><?php echo $langs->trans("Stock"); ?></th>
+		<table class="center">
+			<tr>
+			<th><?php echo $langs->trans("Qty"); ?></th>
 			<th><?php echo $langs->trans("PriceUHT"); ?></th>
-			<th></th>
 			<th><?php echo $langs->trans("Discount"); ?> (%)</th>
-			<th><?php echo $langs->trans("TotalHT"); ?></th>
-            <th>&nbsp;</th>
             <th><?php echo $langs->trans("VATRate"); ?></th>
+			<th></th>
             </tr>
 			<tr>
 				<td><input class="texte1 maxwidth50onsmartphone" type="text" id="txtQte" name="txtQte" value="1" onkeyup="javascript: modif();" onfocus="javascript: this.select();" />
 <?php print genkeypad("txtQte", "frmQte");?>
-				</td>
-				<!-- Affichage du stock pour l'article courant -->
-				<td>
-				<input class="texte1_off maxwidth50onsmartphone" type="text" name="txtStock" value="<?php echo $obj_facturation->stock() ?>" disabled />
 				</td>
 				<!-- Show unit price -->
 				<?php // TODO Remove the disabled and use this value when adding product into cart ?>
 				<td><input class="texte1_off maxwidth50onsmartphone" type="text" name="txtPrixUnit" value="<?php echo price2num($obj_facturation->prix(), 'MU'); ?>" onchange="javascript: modif();" disabled /></td>
-				<td></td>
     			<!-- Choix de la remise -->
     			<td><input class="texte1 maxwidth50onsmartphone" type="text" id="txtRemise" name="txtRemise" value="0" onkeyup="javascript: modif();" onfocus="javascript: this.select();"/>
 					<?php print genkeypad("txtRemise", "frmQte");?>
     			</td>
-    			<!-- Affichage du total HT -->
-    			<td><input class="texte1_off maxwidth50onsmartphone" type="text" name="txtTotal" value="" disabled /></td><td></td>
                 <!-- Choix du taux de TVA -->
-                <td class="select_tva">
+                <td class="select_tva center">
                 <?php
 					$vatrate = $obj_facturation->vatrate;      // To get vat rate we just have selected
 
@@ -133,7 +123,20 @@ $langs->load("cashdesk");
 					echo $form->load_tva('selTva', (isset($_POST["selTva"])?GETPOST("selTva",'alpha',2):$vatrate), $mysoc, $buyer, 0, 0, '', false, -1);
 			    ?>
                 </td>
+				<td></td>
 			</tr>
+			<tr>
+				<!-- Affichage du stock pour l'article courant -->
+			<tr>
+				<td><?php echo $langs->trans("Stock"); ?></td>
+				<td>
+				<input class="texte1_off maxwidth50onsmartphone" type="text" name="txtStock" value="<?php echo $obj_facturation->stock() ?>" disabled />
+				</td>
+				<td><?php echo $langs->trans("TotalHT"); ?></td>
+    			<!-- Affichage du total HT -->
+    			<td colspan="2"><input class="texte1_off maxwidth50onsmartphone" type="text" name="txtTotal" value="" disabled /></td><td></td>
+			</tr>
+
 		</table>
 
 		<input class="button bouton_ajout_article" type="submit" id="sbmtEnvoyer" value="<?php echo $langs->trans("AddThisArticle"); ?>" />
@@ -149,13 +152,13 @@ $langs->load("cashdesk");
 			<tr><th class="label1"><?php echo $langs->trans("TotalTicket"); ?></th><th class="label1"><?php echo $langs->trans("Received"); ?></th><th class="label1"><?php echo $langs->trans("Change"); ?></th></tr>
 			<tr>
 			<!-- Affichage du montant du -->
-			<td><input class="texte2_off maxwidthonsmartphone" type="text" name="txtDu" value="<?php echo price2num($obj_facturation->prixTotalTtc(), 'MT'); ?>" disabled /></td>
+			<td><input class="texte2_off maxwidth100onsmartphone" type="text" name="txtDu" value="<?php echo price2num($obj_facturation->prixTotalTtc(), 'MT'); ?>" disabled /></td>
 			<!-- Choix du montant encaisse -->
-			<td><input class="texte2 maxwidthonsmartphone" type="text" id="txtEncaisse" name="txtEncaisse" value="" onkeyup="javascript: verifDifference();" onfocus="javascript: this.select();" />
+			<td><input class="texte2 maxwidth100onsmartphone" type="text" id="txtEncaisse" name="txtEncaisse" value="" onkeyup="javascript: verifDifference();" onfocus="javascript: this.select();" />
 <?php print genkeypad("txtEncaisse", "frmDifference");?>
 			</td>
 			<!-- Affichage du montant rendu -->
-			<td><input class="texte2_off maxwidthonsmartphone" type="text" name="txtRendu" value="0" disabled /></td>
+			<td><input class="texte2_off maxwidth100onsmartphone" type="text" name="txtRendu" value="0" disabled /></td>
 			</tr>
 			<tr>
 		</table>

From 50aa40da3b67077476fefb70d5fdcb23d7be7714 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Wed, 14 Jun 2017 07:40:11 +0200
Subject: [PATCH 210/438] Fix: error when the project module not enabled

---
 htdocs/comm/action/card.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 60486ac6f01..5e38a85898e 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Simon TOSSER         <simon@kornog-computing.com>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2017 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2010-2013 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2013      Florian Henry        <florian.henry@open-concept.pro>
  * Copyright (C) 2014      Cedric GROSS         <c.gross@kreiz-it.fr>
@@ -585,8 +585,6 @@ if ($action == 'mupdate')
  * View
  */
 
-$formproject=new FormProjets($db);
-
 $help_url='EN:Module_Agenda_En|FR:Module_Agenda|ES:M&omodulodulo_Agenda';
 llxHeader('',$langs->trans("Agenda"),$help_url);
 

From d2db5f60a89604f2625bfc8a9111b58fa0e31478 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Wed, 14 Jun 2017 09:42:05 +0200
Subject: [PATCH 211/438] Fix css to apply "pair" and "impair" style

---
 htdocs/compta/facture.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 59e52ac7b5d..9bb97d8ff0b 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -3490,7 +3490,7 @@ else if ($id > 0 || ! empty($ref))
     if ($object->type == Facture::TYPE_SITUATION && ! empty($conf->global->INVOICE_USE_SITUATION)) 
     {
         if (count($object->tab_previous_situation_invoice) > 0 || count($object->tab_next_situation_invoice) > 0)
-            print '<table class="nobordernopadding paymenttable" width="100%">';
+            print '<table class="noborder situationstable" width="100%">';
         
         if (count($object->tab_previous_situation_invoice) > 0) {
             // List of previous invoices

From 83a5b8e078ba57ba3d4070e5f3f2cb944c28e555 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Jun 2017 10:13:33 +0200
Subject: [PATCH 212/438] FIX Can set supplier invoice to billed.

---
 htdocs/fourn/commande/card.php | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index e9b143382ad..5bfae3c955f 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -2585,19 +2585,29 @@ elseif (! empty($object->id))
 				// Create bill
 				if (! empty($conf->facture->enabled))
 				{
-					if (! empty($conf->fournisseur->enabled) && ($object->statut >= 2 && $object->billed != 1))  // 2 means accepted
+					if (! empty($conf->fournisseur->enabled) && ($object->statut >= 2 && $object->billed != 1))  // statut 2 means approved
 					{
 						if ($user->rights->fournisseur->facture->creer)
 						{
 							print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("CreateBill").'</a>';
 						}
-
-						if ($user->rights->fournisseur->commande->creer && $object->statut >= 2 && !empty($object->linkedObjectsIds['invoice_supplier']))
-						{
-							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled">'.$langs->trans("ClassifyBilled").'</a>';
-						}
 					}
+				}
 
+				// Classify billed manually (need one invoice if module invoice is on, no condition on invoice if not)
+				if ($user->rights->fournisseur->commande->creer && $object->statut >= 2 && $object->billed != 1)  // statut 2 means approved
+				{
+				    if (empty($conf->facture->enabled))
+				    {
+			            print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled">'.$langs->trans("ClassifyBilled").'</a>';
+				    }
+				    else if (!empty($object->linkedObjectsIds['invoice_supplier']))
+				    {
+						if ($user->rights->fournisseur->facture->creer)
+						{
+				            print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled">'.$langs->trans("ClassifyBilled").'</a>';
+						}
+				    }
 				}
 
 				// Create a remote order using WebService only if module is activated

From 0e867229dbd68bf0da952223677bebdb7714e037 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Jun 2017 10:28:02 +0200
Subject: [PATCH 213/438] FIX Can't create invoice if PO disapproved

---
 htdocs/fourn/commande/card.php | 56 +++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 324c352e72c..bc3c0822207 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -275,7 +275,7 @@ if (empty($reshook))
 	if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
 	{
 	    $db->begin();
-	    
+
 	    $langs->load('errors');
 	    $error = 0;
 
@@ -441,7 +441,7 @@ if (empty($reshook))
 	    		$ht = $ttc / (1 + ($tva_tx / 100));
 	    		$price_base_type = 'HT';
 	    	}
-			
+
 			$pu_ht_devise = price2num($price_ht_devise, 'MU');
 
 			$result=$object->addline($desc, $ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, 0, 0, '', $remise_percent, $price_base_type, $ttc, $type,'','', $date_start, $date_end, $array_options, $fk_unit, $pu_ht_devise);
@@ -451,7 +451,7 @@ if (empty($reshook))
 	    if (! $error && $result > 0)
 	    {
 	        $db->commit();
-	        
+
 	    	$ret=$object->fetch($object->id);    // Reload to get new records
 
 	        // Define output language
@@ -508,7 +508,7 @@ if (empty($reshook))
 		    $db->rollback();
             setEventMessages($object->error, $object->errors, 'errors');
 	    }
-	    
+
 	    $action = '';
 	}
 
@@ -543,7 +543,7 @@ if (empty($reshook))
 
 	    $localtax1_tx=get_localtax($tva_tx,1,$mysoc,$object->thirdparty);
 	    $localtax2_tx=get_localtax($tva_tx,2,$mysoc,$object->thirdparty);
-		
+
 		$pu_ht_devise = GETPOST('multicurrency_subprice');
 
 		// Extrafields Lines
@@ -1391,7 +1391,7 @@ if ($action=='create')
 	// If not defined, set default value from constant
 	if (empty($cond_reglement_id) && ! empty($conf->global->SUPPLIER_ORDER_DEFAULT_PAYMENT_TERM_ID)) $cond_reglement_id=$conf->global->SUPPLIER_ORDER_DEFAULT_PAYMENT_TERM_ID;
 	if (empty($mode_reglement_id) && ! empty($conf->global->SUPPLIER_ORDER_DEFAULT_PAYMENT_MODE_ID)) $mode_reglement_id=$conf->global->SUPPLIER_ORDER_DEFAULT_PAYMENT_MODE_ID;
-	
+
 	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="post">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="action" value="add">';
@@ -1577,7 +1577,7 @@ if ($action=='create')
 elseif (! empty($object->id))
 {
 	$result = $object->fetch($id, $ref);
-	
+
     $societe = new Fournisseur($db);
     $result=$societe->fetch($object->socid);
     if ($result < 0) dol_print_error($db);
@@ -1587,7 +1587,7 @@ elseif (! empty($object->id))
 
 	$res=$object->fetch_optionals($object->id,$extralabels);
 
-	
+
 	$head = ordersupplier_prepare_head($object);
 
 	$title=$langs->trans("SupplierOrder");
@@ -1724,11 +1724,11 @@ elseif (! empty($object->id))
 	// Print form confirm
 	print $formconfirm;
 
-	
+
 	// Supplier order card
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/fourn/commande/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
-	
+
 	$morehtmlref='<div class="refidno">';
 	// Ref supplier
 	$morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->fournisseur->commande->creer, 'string', '', 0, 1);
@@ -1768,15 +1768,15 @@ elseif (! empty($object->id))
 	    }
 	}
 	$morehtmlref.='</div>';
-	
-	
-	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);	
-	
+
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
 
 	print '<div class="fichecenter">';
 	print '<div class="fichehalfleft">';
 	print '<div class="underbanner clearboth"></div>';
-	 	
+
 	print '<table class="border" width="100%">';
 
 	// Date
@@ -1969,12 +1969,12 @@ elseif (! empty($object->id))
 	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
 	print '</table>';
-	
+
 	print '</div>';
 	print '<div class="fichehalfright">';
 	print '<div class="ficheaddleft">';
 	print '<div class="underbanner clearboth"></div>';
-	
+
 	print '<table class="border centpercent">';
 
 	if (!empty($conf->multicurrency->enabled))
@@ -1983,18 +1983,18 @@ elseif (! empty($object->id))
 	    print '<tr><td class="titlefieldmiddle">' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . '</td>';
 	    print '<td class="nowrap">' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
 	    print '</tr>';
-	
+
 	    // Multicurrency Amount VAT
 	    print '<tr><td>' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . '</td>';
 	    print '<td class="nowrap">' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
 	    print '</tr>';
-	
+
 	    // Multicurrency Amount TTC
 	    print '<tr><td>' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . '</td>';
 	    print '<td class="nowrap">' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
 	    print '</tr>';
 	}
-	
+
 	// Total
 	print '<tr><td class="titlefieldmiddle">'.$langs->trans("AmountHT").'</td>';
 	print '<td>'.price($object->total_ht,'',$langs,1,-1,-1,$conf->currency).'</td>';
@@ -2023,19 +2023,19 @@ elseif (! empty($object->id))
 	print '</tr>';
 
 	print '</table>';
-	
+
 	// Margin Infos
 	/*if (! empty($conf->margin->enabled)) {
 	    $formmargin->displayMarginInfos($object);
 	}*/
-	
-	
+
+
 	print '</div>';
 	print '</div>';
 	print '</div>';
-	
+
 	print '<div class="clearboth"></div><br>';
-	
+
 	if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
 		$blocname = 'contacts';
@@ -2591,7 +2591,7 @@ elseif (! empty($object->id))
 				// Create bill
 				if (! empty($conf->facture->enabled))
 				{
-					if (! empty($conf->fournisseur->enabled) && ($object->statut >= 2 && $object->billed != 1))  // statut 2 means approved
+					if (! empty($conf->fournisseur->enabled) && ($object->statut >= 2 && $object->statut != 7 && $object->billed != 1))  // statut 2 means approved, 7 means canceled
 					{
 						if ($user->rights->fournisseur->facture->creer)
 						{
@@ -2601,7 +2601,7 @@ elseif (! empty($object->id))
 				}
 
 				// Classify billed manually (need one invoice if module invoice is on, no condition on invoice if not)
-				if ($user->rights->fournisseur->commande->creer && $object->statut >= 2 && $object->billed != 1)  // statut 2 means approved
+				if ($user->rights->fournisseur->commande->creer && $object->statut >= 2 && $object->statut != 7 && $object->billed != 1)  // statut 2 means approved
 				{
 				    if (empty($conf->facture->enabled))
 				    {
@@ -2706,7 +2706,7 @@ elseif (! empty($object->id))
 			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 			print '<input type="hidden"	name="action" value="livraison">';
 			print load_fiche_titre($langs->trans("Receive"),'','');
-			
+
 			print '<table class="noborder" width="100%">';
 			//print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Receive").'</td></tr>';
 			print '<tr><td>'.$langs->trans("DeliveryDate").'</td><td>';

From 848f70e02638494346336b7defde28eda9088988 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Jun 2017 10:37:40 +0200
Subject: [PATCH 214/438] Fix bad merge

---
 htdocs/theme/md/style.css.php |  13 --
 htdocs/user/index.php         | 358 +---------------------------------
 2 files changed, 2 insertions(+), 369 deletions(-)

diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index f4f29695dbc..60c52e8683f 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2378,15 +2378,6 @@ table.liste, table.noborder, table.formdoc, div.noborder {
 	border-bottom-style: solid;
 
 	margin: 0px 0px 8px 0px;
-<<<<<<< HEAD
-=======
-    /*
-	-moz-box-shadow: 2px 2px 4px #CCC;
-	-webkit-box-shadow: 2px 2px 4px #CCC;
-	box-shadow: 2px 2px 4px #CCC;
-    */
-	/* box-shadow: 0 0 3px rgba(0,0,0,0.16); */
->>>>>>> branch '4.0' of git@github.com:Dolibarr/dolibarr.git
 
 	-moz-border-radius: 0.1em;
 	-webkit-border-radius: 0.1em;
@@ -4532,11 +4523,7 @@ img.demothumb {
 }
 @media only screen and (max-width: 767px)
 {
-<<<<<<< HEAD
 	.imgopensurveywizard, .imgautosize { width:95%; height: auto; }
-=======
-	.imgopensurveywizard { width:95%; height: auto; }
->>>>>>> branch '4.0' of git@github.com:Dolibarr/dolibarr.git
 
 	#tooltip {
 		position: absolute;
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 3f364fb8180..04871f110e9 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -251,89 +251,8 @@ if (! $result)
     exit;
 }
 
-<<<<<<< HEAD
 $num = $db->num_rows($result);
-=======
-    $param='';
-    if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-    if ($sall != '') $param.='&sall='.urlencode($sall);
-    if ($search_user != '') $param.="&search_user=".$search_user;
-    if ($search_login != '') $param.="&search_login=".$search_login;
-    if ($search_lastname != '') $param.="&search_lastname=".$search_lastname;
-    if ($search_firstname != '') $param.="&search_firstname=".$search_firstname;
-    if ($search_gender != '') $param.="&search_gender=".$search_gender;
-    if ($search_employee != '') $param.="&search_employee=".$search_employee;
-    if ($search_accountancy_code != '') $param.="&search_accountancy_code=".$search_accountancy_code;
-    if ($search_email != '') $param.="&search_email=".$search_email;
-    if ($search_supervisor > 0) $param.="&search_supervisor=".$search_supervisor;
-    if ($search_statut != '') $param.="&search_statut=".$search_statut;
-    if ($optioncss != '') $param.='&optioncss='.$optioncss;
-    // Add $param from extra fields
-    foreach ($search_array_options as $key => $val)
-    {
-        $crit=$val;
-        $tmpkey=preg_replace('/search_options_/','',$key);
-        if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
-    }
 
-
-    print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-
-    if ($sall)
-    {
-        foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
-        print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
-    }
-
-    $moreforfilter='';
-
-	$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
-	$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-
-    print '<table class="liste '.($moreforfilter?"listwithfilterbefore":"").'">';
-    print '<tr class="liste_titre">';
-    if (! empty($arrayfields['u.login']['checked']))          print_liste_field_titre($langs->trans("Login"),$_SERVER['PHP_SELF'],"u.login",$param,"","",$sortfield,$sortorder);
-    if (! empty($arrayfields['u.lastname']['checked']))       print_liste_field_titre($langs->trans("Lastname"),$_SERVER['PHP_SELF'],"u.lastname",$param,"","",$sortfield,$sortorder);
-    if (! empty($arrayfields['u.firstname']['checked']))      print_liste_field_titre($langs->trans("FirstName"),$_SERVER['PHP_SELF'],"u.firstname",$param,"","",$sortfield,$sortorder);
-    if (! empty($arrayfields['u.gender']['checked']))         print_liste_field_titre($langs->trans("Gender"),$_SERVER['PHP_SELF'],"u.gender",$param,"","",$sortfield,$sortorder);
-    if (! empty($arrayfields['u.employee']['checked']))       print_liste_field_titre($langs->trans("Employee"),$_SERVER['PHP_SELF'],"u.employee",$param,"","",$sortfield,$sortorder);
-    if (! empty($arrayfields['u.accountancy_code']['checked'])) print_liste_field_titre($langs->trans("AccountancyCode"),$_SERVER['PHP_SELF'],"u.accountancy_code",$param,"","",$sortfield,$sortorder);
-    if (! empty($arrayfields['u.email']['checked']))          print_liste_field_titre($langs->trans("EMail"),$_SERVER['PHP_SELF'],"u.email",$param,"","",$sortfield,$sortorder);
-    if (! empty($arrayfields['u.fk_soc']['checked']))         print_liste_field_titre($langs->trans("Company"),$_SERVER['PHP_SELF'],"u.fk_soc",$param,"","",$sortfield,$sortorder);
-    if (! empty($arrayfields['u.entity']['checked']))         print_liste_field_titre($langs->trans("Entity"),$_SERVER['PHP_SELF'],"u.entity",$param,"","",$sortfield,$sortorder);
-    if (! empty($arrayfields['u.fk_user']['checked']))        print_liste_field_titre($langs->trans("HierarchicalResponsible"),$_SERVER['PHP_SELF'],"u.fk_user",$param,"","",$sortfield,$sortorder);
-    if (! empty($arrayfields['u.datelastlogin']['checked']))  print_liste_field_titre($langs->trans("LastConnexion"),$_SERVER['PHP_SELF'],"u.datelastlogin",$param,"",'align="center"',$sortfield,$sortorder);
-    if (! empty($arrayfields['u.datepreviouslogin']['checked'])) print_liste_field_titre($langs->trans("PreviousConnexion"),$_SERVER['PHP_SELF'],"u.datepreviouslogin",$param,"",'align="center"',$sortfield,$sortorder);
-	// Extra fields
-	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-	{
-	   foreach($extrafields->attribute_label as $key => $val)
-	   {
-           if (! empty($arrayfields["ef.".$key]['checked']))
-           {
-				$align=$extrafields->getAlignFlag($key);
-				print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
-           }
-	   }
-	}
-    // Hook fields
-	$parameters=array('arrayfields'=>$arrayfields);
-    $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
-	if (! empty($arrayfields['u.datec']['checked']))  print_liste_field_titre($langs->trans("DateCreationShort"),$_SERVER["PHP_SELF"],"u.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-	if (! empty($arrayfields['u.tms']['checked']))    print_liste_field_titre($langs->trans("DateModificationShort"),$_SERVER["PHP_SELF"],"u.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-	if (! empty($arrayfields['u.statut']['checked'])) print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"u.statut","",$param,'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
-    print "</tr>\n";
->>>>>>> branch '4.0' of git@github.com:Dolibarr/dolibarr.git
-
-<<<<<<< HEAD
 if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall)
 {
     $obj = $db->fetch_object($resql);
@@ -497,69 +416,6 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
             $typeofextrafield=$extrafields->attribute_type[$key];
             print '<td class="liste_titre'.($align?' '.$align:'').'">';
 		    if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')))
-=======
-    // Search bar
-    print '<tr class="liste_titre">';
-    if (! empty($arrayfields['u.login']['checked']))
-    {
-        print '<td><input type="text" name="search_login" size="6" value="'.$search_login.'"></td>';
-    }
-    if (! empty($arrayfields['u.lastname']['checked']))
-    {
-        print '<td><input type="text" name="search_lastname" size="6" value="'.$search_lastname.'"></td>';
-    }
-    if (! empty($arrayfields['u.firstname']['checked']))
-    {
-        print '<td><input type="text" name="search_firstname" size="6" value="'.$search_firstname.'"></td>';
-    }
-    if (! empty($arrayfields['u.gender']['checked']))
-    {
-        print '<td>';
-        $arraygender=array('man'=>$langs->trans("Genderman"),'woman'=>$langs->trans("Genderwoman"));
-        print $form->selectarray('search_gender', $arraygender, $search_gender, 1);
-        print '</td>';
-    }
-    if (! empty($arrayfields['u.employee']['checked']))
-    {
-        print '<td>';
-        print $form->selectyesno('search_employee', $search_employee, 1, false, 1);
-        print '</td>';
-    }
-    if (! empty($arrayfields['u.accountancy_code']['checked']))
-    {
-        print '<td><input type="text" name="search_accountancy_code" size="4" value="'.$search_accountancy_code.'"></td>';
-    }
-    if (! empty($arrayfields['u.email']['checked']))
-    {
-        print '<td><input type="text" name="search_email" size="6" value="'.$search_email.'"></td>';
-    }
-    if (! empty($arrayfields['u.fk_soc']['checked']))
-    {
-        print '<td><input type="text" name="search_thirdparty" size="6" value="'.$search_thirdparty.'"></td>';
-    }
-    if (! empty($arrayfields['u.entity']['checked']))
-    {
-        print '<td></td>';
-    }
-    if (! empty($arrayfields['u.fk_user']['checked']))
-    {
-        print '<td></td>';
-    }
-    if (! empty($arrayfields['u.datelastlogin']['checked']))
-    {
-        print '<td></td>';
-    }
-    if (! empty($arrayfields['u.datepreviouslogin']['checked']))
-    {
-        print '<td></td>';
-    }
-	// Extra fields
-	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-	{
-	   foreach($extrafields->attribute_label as $key => $val)
-	   {
-			if (! empty($arrayfields["ef.".$key]['checked']))
->>>>>>> branch '4.0' of git@github.com:Dolibarr/dolibarr.git
 			{
 			    $crit=$val;
 				$tmpkey=preg_replace('/search_options_/','',$key);
@@ -791,222 +647,12 @@ while ($i < min($num,$limit))
       print '<td align="center">'.$userstatic->getLibStatut(3).'</td>';
     }
     // Action column
-<<<<<<< HEAD
-    print '<td></td>';
-=======
-    print '<td class="liste_titre" align="right">';
-    $searchpitco=$form->showFilterAndCheckAddButtons(0);
-    print $searchpitco;
+    print '<td>';
     print '</td>';
->>>>>>> branch '4.0' of git@github.com:Dolibarr/dolibarr.git
 
     print "</tr>\n";
-<<<<<<< HEAD
+
     $i++;
-=======
-
-    $user2=new User($db);
-
-    $var=True;
-	//while ($i < min($num,$conf->liste_limit))
-    while ($i < $num)
-    {
-        $obj = $db->fetch_object($result);
-        $var=!$var;
-
-		$userstatic->id=$obj->rowid;
-		$userstatic->ref=$obj->label;
-		$userstatic->login=$obj->login;
-		$userstatic->statut=$obj->statut;
-	    $userstatic->email=$obj->email;
-	    $userstatic->gender=$obj->gender;
-	    $userstatic->societe_id=$obj->fk_soc;
-	    $userstatic->firstname=$obj->firstname;
-		$userstatic->lastname=$obj->lastname;
-		$userstatic->employee=$obj->employee;
-		$userstatic->photo=$obj->photo;
-
-		$li=$userstatic->getNomUrl(-1,'',0,0,24,1,'login');
-
-        print "<tr ".$bc[$var].">";
-        if (! empty($arrayfields['u.login']['checked']))
-		{
-		    print '<td>';
-    		print $li;
-            if (! empty($conf->multicompany->enabled) && $obj->admin && ! $obj->entity)
-            {
-              	print img_picto($langs->trans("SuperAdministrator"),'redstar');
-            }
-            else if ($obj->admin)
-            {
-            	print img_picto($langs->trans("Administrator"),'star');
-            }
-            print '</td>';
-		}
-        if (! empty($arrayfields['u.lastname']['checked']))
-		{
-		      print '<td>'.$obj->lastname.'</td>';
-		}
-        if (! empty($arrayfields['u.firstname']['checked']))
-		{
-		  print '<td>'.$obj->firstname.'</td>';
-		}
-        if (! empty($arrayfields['u.gender']['checked']))
-		{
-		  print '<td>';
-		  if ($obj->gender) print $langs->trans("Gender".$obj->gender);
-		  print '</td>';
-		}
-        if (! empty($arrayfields['u.employee']['checked']))
-		{
-		  print '<td>'.yn($obj->employee).'</td>';
-		}
-		if (! empty($arrayfields['u.accountancy_code']['checked']))
-		{
-		  print '<td>'.$obj->accountancy_code.'</td>';
-		}
-        if (! empty($arrayfields['u.email']['checked']))
-		{
-		  print '<td>'.$obj->email.'</td>';
-		}
-		if (! empty($arrayfields['u.fk_soc']['checked']))
-		{
-    		print "<td>";
-            if ($obj->fk_soc)
-            {
-                $companystatic->id=$obj->fk_soc;
-                $companystatic->name=$obj->name;
-                $companystatic->canvas=$obj->canvas;
-                print $companystatic->getNomUrl(1);
-            }
-            else if ($obj->ldap_sid)
-            {
-            	print $langs->trans("DomainUser");
-            }
-            else
-           {
-            	print $langs->trans("InternalUser");
-            }
-            print '</td>';
-		}
-        // Multicompany enabled
-        if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))
-        {
-            if (! empty($arrayfields['u.entity']['checked']))
-    		{
-                print '<td>';
-            	if (! $obj->entity)
-            	{
-            		print $langs->trans("AllEntities");
-            	}
-            	else
-            	{
-            		// $mc is defined in conf.class.php if multicompany enabled.
-            		if (is_object($mc))
-            		{
-            			$mc->getInfo($obj->entity);
-            			print $mc->label;
-            		}
-            	}
-            	print '</td>';
-    		}
-        }
-        // Supervisor
-        if (! empty($arrayfields['u.fk_user']['checked']))
-		{
-    		// Resp
-            print '<td class="nowrap">';
-            if ($obj->login2)
-            {
-    	        $user2->id=$obj->id2;
-    	        $user2->login=$obj->login2;
-    	        $user2->lastname=$obj->lastname2;
-    	        $user2->firstname=$obj->firstname2;
-    	        $user2->gender=$obj->gender2;
-    	        $user2->photo=$obj->photo2;
-    	        $user2->admin=$obj->admin2;
-    	        $user2->email=$obj->email2;
-    	        $user2->societe_id=$obj->fk_soc2;
-    	        print $user2->getNomUrl(-1,'',0,0,24,0,'');
-                if (! empty($conf->multicompany->enabled) && $obj->admin2 && ! $obj->entity2)
-                {
-                  	print img_picto($langs->trans("SuperAdministrator"),'redstar');
-                }
-                else if ($obj->admin2)
-                {
-                	print img_picto($langs->trans("Administrator"),'star');
-                }
-            }
-            print '</td>';
-		}
-
-        // Date last login
-        if (! empty($arrayfields['u.datelastlogin']['checked']))
-    	{
-            print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($obj->datelastlogin),"dayhour").'</td>';
-    	}
-        // Date previous login
-        if (! empty($arrayfields['u.datepreviouslogin']['checked']))
-    	{
-            print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($obj->datepreviouslogin),"dayhour").'</td>';
-    	}
-
-    	// Extra fields
-		if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-		{
-		   foreach($extrafields->attribute_label as $key => $val)
-		   {
-				if (! empty($arrayfields["ef.".$key]['checked']))
-				{
-					print '<td';
-					$align=$extrafields->getAlignFlag($key);
-					if ($align) print ' align="'.$align.'"';
-					print '>';
-					$tmpkey='options_'.$key;
-					print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
-					print '</td>';
-				}
-		   }
-		}
-        // Fields from hook
-	    $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
-		$reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
-    	// Date creation
-        if (! empty($arrayfields['u.datec']['checked']))
-        {
-            print '<td align="center">';
-            print dol_print_date($db->jdate($obj->date_creation), 'dayhour');
-            print '</td>';
-        }
-        // Date modification
-        if (! empty($arrayfields['u.tms']['checked']))
-        {
-            print '<td align="center">';
-            print dol_print_date($db->jdate($obj->date_update), 'dayhour');
-            print '</td>';
-        }
-        // Status
-        if (! empty($arrayfields['u.statut']['checked']))
-        {
-		  $userstatic->statut=$obj->statut;
-          print '<td align="center">'.$userstatic->getLibStatut(3).'</td>';
-        }
-        // Action column
-        print '<td></td>';
-
-        print "</tr>\n";
-        $i++;
-    }
-
-	$parameters=array('arrayfields'=>$arrayfields, 'sql'=>$sql);
-	$reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-
-    print "</table>";
-    print "</form>\n";
-    $db->free($result);
->>>>>>> branch '4.0' of git@github.com:Dolibarr/dolibarr.git
 }
 
 $parameters=array('arrayfields'=>$arrayfields, 'sql'=>$sql);

From 2d571bf097188e258f59725bc0b057c8ed256822 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Jun 2017 10:50:43 +0200
Subject: [PATCH 215/438] Fix bad merge

---
 htdocs/theme/md/style.css.php | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 28119a00aff..5fbd8455919 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2362,15 +2362,6 @@ table.liste, table.noborder, table.formdoc, div.noborder {
 	border-bottom-style: solid;
 
 	margin: 0px 0px 8px 0px;
-<<<<<<< HEAD
-=======
-    /*
-	-moz-box-shadow: 2px 2px 4px #CCC;
-	-webkit-box-shadow: 2px 2px 4px #CCC;
-	box-shadow: 2px 2px 4px #CCC;
-    */
-	/* box-shadow: 0 0 3px rgba(0,0,0,0.16); */
->>>>>>> branch '4.0' of git@github.com:Dolibarr/dolibarr.git
 
 	-moz-border-radius: 0.1em;
 	-webkit-border-radius: 0.1em;
@@ -4641,11 +4632,7 @@ border-top-right-radius: 6px;
 }
 @media only screen and (max-width: 767px)
 {
-<<<<<<< HEAD
 	.imgopensurveywizard, .imgautosize { width:95%; height: auto; }
-=======
-	.imgopensurveywizard { width:95%; height: auto; }
->>>>>>> branch '4.0' of git@github.com:Dolibarr/dolibarr.git
 
 	#tooltip {
 		position: absolute;

From b8dd7fb9588b55052a30fe8bb285d61d54fc6bf9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Jun 2017 10:53:04 +0200
Subject: [PATCH 216/438] Fix phpcs

---
 htdocs/modulebuilder/template/class/actions_mymodule.class.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/modulebuilder/template/class/actions_mymodule.class.php b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
index a3ba3baeaad..c6ebcae40e8 100644
--- a/htdocs/modulebuilder/template/class/actions_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
@@ -56,6 +56,8 @@ class ActionsMyModule
 
 	/**
 	 * Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
 	 */
 	public function __construct($db)
 	{

From 1b56e4a01c244505fa4ee9881c8ce5eba3ab84dc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Jun 2017 11:28:42 +0200
Subject: [PATCH 217/438] Fix look and feel v6

---
 htdocs/comm/propal/list.php                | 104 ++++++++--------
 htdocs/commande/list.php                   |   6 +-
 htdocs/compta/facture/list.php             |   8 +-
 htdocs/contrat/list.php                    |  48 ++++----
 htdocs/core/class/html.formother.class.php |  13 +-
 htdocs/core/menus/init_menu_auguria.sql    |   9 +-
 htdocs/core/menus/standard/auguria.lib.php |   2 +
 htdocs/expensereport/list.php              |  26 ++--
 htdocs/fourn/commande/list.php             | 131 ++++++++++-----------
 htdocs/fourn/facture/list.php              | 112 +++++++++---------
 htdocs/holiday/list.php                    |  12 +-
 htdocs/projet/list.php                     |   6 +-
 htdocs/projet/tasks/list.php               |   6 +-
 13 files changed, 241 insertions(+), 242 deletions(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 220422a6404..47a35ff47a1 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -161,7 +161,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
     }
 }
 
-$object = new Propal($db);	// To be passed as parameter of executeHooks that need 
+$object = new Propal($db);	// To be passed as parameter of executeHooks that need
 
 
 /*
@@ -359,12 +359,12 @@ if ($resql)
 	else
 	{
 	    $title = $langs->trans('ListOfProposals');
-	}	
+	}
 
 	$num = $db->num_rows($resql);
-	
+
 	$arrayofselected=is_array($toselect)?$toselect:array();
-	
+
 	$param='&viewstatut='.$viewstatut;
     if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
@@ -389,7 +389,7 @@ if ($resql)
 	    $tmpkey=preg_replace('/search_options_/','',$key);
 	    if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
 	}
-	
+
 	// List of mass actions available
 	$arrayofmassactions =  array(
 	    'presend'=>$langs->trans("SendByMail"),
@@ -398,7 +398,7 @@ if ($resql)
 	if ($user->rights->propal->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
 	if ($massaction == 'presend') $arrayofmassactions=array();
 	$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
-	
+
 	// Lignes des champs de filtre
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -408,13 +408,13 @@ if ($resql)
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
-	
+
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit);
-	
+
 	if ($massaction == 'presend')
 	{
 	    $langs->load("mails");
-	
+
 	    if (! GETPOST('cancel'))
 	    {
 	        $objecttmp=new Propal($db);
@@ -433,17 +433,17 @@ if ($resql)
 	            }
 	        }
 	    }
-	
+
 	    print '<input type="hidden" name="massaction" value="confirm_presend">';
-	
+
 	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 	    $formmail = new FormMail($db);
-	
+
 	    dol_fiche_head(null, '', '');
-	
+
 	    $topicmail="SendSupplierProposalRef";
 	    $modelmail="supplier_proposal_send";
-	
+
 	    // Cree l'objet formulaire mail
 	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 	    $formmail = new FormMail($db);
@@ -496,25 +496,25 @@ if ($resql)
 	    $formmail->substit['__REFCLIENT__']='__REFCLIENT__';	// We want to keep the tag
 	    $formmail->substit['__PERSONALIZED__']='';
 	    $formmail->substit['__CONTACTCIVNAME__']='';
-	
+
 	    // Tableau des parametres complementaires du post
 	    $formmail->param['action']=$action;
 	    $formmail->param['models']=$modelmail;
 	    $formmail->param['models_id']=GETPOST('modelmailselected','int');
 	    $formmail->param['id']=join(',',$arrayofselected);
 	    //$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-	
+
 	    print $formmail->get_form();
-	
+
 	    dol_fiche_end();
 	}
-	
+
 	if ($sall)
     {
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
         print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
     }
-	
+
 	$i = 0;
 
 	$moreforfilter='';
@@ -525,7 +525,7 @@ if ($resql)
  		$langs->load("commercial");
 	 	$moreforfilter.='<div class="divsearchfield">';
  		$moreforfilter.=$langs->trans('ThirdPartiesOfSaleRepresentative'). ': ';
-		$moreforfilter.=$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth300');
+		$moreforfilter.=$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth200');
 	 	$moreforfilter.='</div>';
  	}
 	// If the user can view prospects other than his'
@@ -533,7 +533,7 @@ if ($resql)
 	{
 	 	$moreforfilter.='<div class="divsearchfield">';
 		$moreforfilter.=$langs->trans('LinkedToSpecificUsers'). ': ';
-	    $moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+	    $moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
 	    $moreforfilter.='</div>';
 	}
 	// If the user can view products
@@ -550,7 +550,7 @@ if ($resql)
 	$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
 	if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
 	else $moreforfilter = $hookmanager->resPrint;
-	
+
 	if (! empty($moreforfilter))
 	{
         print '<div class="liste_titre liste_titre_bydiv centpercent">';
@@ -561,12 +561,12 @@ if ($resql)
     $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
     $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
     if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
-    
+
     print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
 	print '<tr class="liste_titre_filter">';
-	if (! empty($arrayfields['p.ref']['checked']))            
+	if (! empty($arrayfields['p.ref']['checked']))
 	{
 	    print '<td class="liste_titre">';
     	print '<input class="flat" size="6" type="text" name="search_ref" value="'.$search_ref.'">';
@@ -608,7 +608,7 @@ if ($resql)
     	print '</td>';
     }
 	// Date
-	if (! empty($arrayfields['p.date']['checked'])) 
+	if (! empty($arrayfields['p.date']['checked']))
 	{
 	    print '<td class="liste_titre" colspan="1" align="center">';
     	//print $langs->trans('Month').': ';
@@ -620,7 +620,7 @@ if ($resql)
     	print '</td>';
 	}
 	// Date end
-	if (! empty($arrayfields['p.fin_validite']['checked'])) 
+	if (! empty($arrayfields['p.fin_validite']['checked']))
 	{
 	   print '<td class="liste_titre" colspan="1">&nbsp;</td>';
 	}
@@ -703,10 +703,10 @@ if ($resql)
 	$searchpicto=$form->showFilterButtons();
 	print $searchpicto;
 	print '</td>';
-	
+
 	print "</tr>\n";
 
-	
+
 	// Fields title
 	print '<tr class="liste_titre">';
 	if (! empty($arrayfields['p.ref']['checked']))            print_liste_field_titre($arrayfields['p.ref']['label'],$_SERVER["PHP_SELF"],'p.ref','',$param,'',$sortfield,$sortorder);
@@ -726,9 +726,9 @@ if ($resql)
 	// Extra fields
 	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 	{
-	   foreach($extrafields->attribute_label as $key => $val) 
+	   foreach($extrafields->attribute_label as $key => $val)
 	   {
-           if (! empty($arrayfields["ef.".$key]['checked'])) 
+           if (! empty($arrayfields["ef.".$key]['checked']))
            {
 				$align=$extrafields->getAlignFlag($key);
 				print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
@@ -744,24 +744,24 @@ if ($resql)
 	if (! empty($arrayfields['p.fk_statut']['checked'])) print_liste_field_titre($arrayfields['p.fk_statut']['label'],$_SERVER["PHP_SELF"],"p.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 	print '</tr>'."\n";
-	
+
 	$now = dol_now();
 	$i=0;
 	$totalarray=array();
 	while ($i < min($num,$limit))
 	{
 		$obj = $db->fetch_object($resql);
-		
-		
+
+
     	$objectstatic->id=$obj->rowid;
     	$objectstatic->ref=$obj->ref;
-    		
+
 		print '<tr class="oddeven">';
-		
+
 		if (! empty($arrayfields['p.ref']['checked']))
 		{
     		print '<td class="nowrap">';
-    
+
     		print '<table class="nobordernopadding"><tr class="nocellnopadd">';
             // Picto + Ref
     		print '<td class="nobordernopadding nowrap">';
@@ -790,11 +790,11 @@ if ($resql)
     		$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
     		print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
     		print '</td></tr></table>';
-    
+
     		print "</td>\n";
     		if (! $i) $totalarray['nbfield']++;
 		}
-		
+
 		if (! empty($arrayfields['p.ref_client']['checked']))
 		{
     		// Customer ref
@@ -803,12 +803,12 @@ if ($resql)
     		print '</td>';
     		if (! $i) $totalarray['nbfield']++;
 		}
-		
+
 		$companystatic->id=$obj->socid;
 		$companystatic->name=$obj->name;
 		$companystatic->client=$obj->client;
 		$companystatic->code_client=$obj->code_client;
-		
+
 		// Thirdparty
 		if (! empty($arrayfields['s.nom']['checked']))
 		{
@@ -817,7 +817,7 @@ if ($resql)
     		print '</td>';
     		if (! $i) $totalarray['nbfield']++;
 		}
-		
+
 		// Town
         if (! empty($arrayfields['s.town']['checked']))
         {
@@ -858,7 +858,7 @@ if ($resql)
             print '</td>';
             if (! $i) $totalarray['nbfield']++;
         }
-        
+
 		// Date proposal
         if (! empty($arrayfields['p.date']['checked']))
         {
@@ -867,7 +867,7 @@ if ($resql)
     		print "</td>\n";
     		if (! $i) $totalarray['nbfield']++;
         }
-        
+
 		// Date end validity
         if (! empty($arrayfields['p.fin_validite']['checked']))
         {
@@ -882,7 +882,7 @@ if ($resql)
     		}
     		if (! $i) $totalarray['nbfield']++;
         }
-        
+
         // Amount HT
         if (! empty($arrayfields['p.total_ht']['checked']))
         {
@@ -907,7 +907,7 @@ if ($resql)
 		    if (! $i) $totalarray['totalttcfield']=$totalarray['nbfield'];
 		    $totalarray['totalttc'] += $obj->total_ttc;
         }
-        
+
         $userstatic->id=$obj->fk_user_author;
 		$userstatic->login=$obj->login;
 
@@ -920,7 +920,7 @@ if ($resql)
     		print "</td>\n";
     		if (! $i) $totalarray['nbfield']++;
         }
-        
+
         // Extra fields
         if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
         {
@@ -1008,16 +1008,16 @@ if ($resql)
 	}
 
 	$db->free($resql);
-	
+
 	$parameters=array('arrayfields'=>$arrayfields, 'sql'=>$sql);
 	$reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-				
+
 	print '</table>'."\n";
     print '</div>'."\n";
 
 	print '</form>'."\n";
-	
+
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
 	{
 	    /*
@@ -1025,18 +1025,18 @@ if ($resql)
 	     */
 	    $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
 	    $urlsource.=str_replace('&amp;','&',$param);
-	
+
 	    $filedir=$diroutputmassaction;
 	    $genallowed=$user->rights->propal->lire;
 	    $delallowed=$user->rights->propal->lire;
-	
+
 	    print $formfile->showdocuments('massfilesarea_proposals','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,'','');
 	}
 	else
 	{
 	    print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
 	}
-	
+
 }
 else
 {
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index c49c1b18a4a..daefc3c4cce 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -803,7 +803,7 @@ if ($resql)
  		$langs->load("commercial");
 		$moreforfilter.='<div class="divsearchfield">';
  		$moreforfilter.=$langs->trans('ThirdPartiesOfSaleRepresentative'). ': ';
-		$moreforfilter.=$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth300');
+		$moreforfilter.=$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth200');
 	 	$moreforfilter.='</div>';
  	}
 	// If the user can view other users
@@ -811,7 +811,7 @@ if ($resql)
 	{
 		$moreforfilter.='<div class="divsearchfield">';
 		$moreforfilter.=$langs->trans('LinkedToSpecificUsers'). ': ';
-	    $moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+	    $moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
 	 	$moreforfilter.='</div>';
 	}
 	// If the user can view prospects other than his'
@@ -821,7 +821,7 @@ if ($resql)
 		$moreforfilter.='<div class="divsearchfield">';
 		$moreforfilter.=$langs->trans('IncludingProductWithTag'). ': ';
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
-		$moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, '', 1);
+		$moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
 		$moreforfilter.='</div>';
 	}
 	$parameters=array();
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index cf037942324..2716e3a87b1 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -191,7 +191,7 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 // Do we click on purge search criteria ?
-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter") || GETPOST("button_removefilter.x")) // Both test are required to be compatible with all browsers
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter") || GETPOST("button_removefilter.x")) // All tests are required to be compatible with all browsers
 {
     $search_user='';
     $search_sale='';
@@ -717,7 +717,7 @@ if ($resql)
  		$langs->load("commercial");
  		$moreforfilter.='<div class="divsearchfield">';
  		$moreforfilter.=$langs->trans('ThirdPartiesOfSaleRepresentative'). ': ';
-		$moreforfilter.=$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth300');
+		$moreforfilter.=$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth200');
 	 	$moreforfilter.='</div>';
  	}
     // If the user can view prospects other than his'
@@ -725,7 +725,7 @@ if ($resql)
     {
 		$moreforfilter.='<div class="divsearchfield">';
     	$moreforfilter.=$langs->trans('LinkedToSpecificUsers'). ': ';
-        $moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+        $moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
 	 	$moreforfilter.='</div>';
     }
 	// If the user can view prospects other than his'
@@ -735,7 +735,7 @@ if ($resql)
 		$moreforfilter.='<div class="divsearchfield">';
 		$moreforfilter.=$langs->trans('IncludingProductWithTag'). ': ';
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
-		$moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, '', 1);
+		$moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
 		$moreforfilter.='</div>';
 	}
     $parameters=array();
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 29e13412892..a82535bfbb7 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -305,7 +305,7 @@ if ($resql)
     $i = 0;
 
     $arrayofselected=is_array($toselect)?$toselect:array();
-    
+
     $param='';
     if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
     if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
@@ -323,7 +323,7 @@ if ($resql)
         $tmpkey=preg_replace('/search_options_/','',$key);
         if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
     }
-    
+
     // List of mass actions available
     $arrayofmassactions =  array(
         //'presend'=>$langs->trans("SendByMail"),
@@ -332,7 +332,7 @@ if ($resql)
     if ($user->rights->contrat->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
     if ($massaction == 'presend') $arrayofmassactions=array();
     $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
-    
+
     print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -341,7 +341,7 @@ if ($resql)
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
-	
+
     print_barre_liste($langs->trans("ListOfContracts"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $totalnboflines, 'title_commercial.png', 0, '', '', $limit);
 
 	if ($sall)
@@ -349,16 +349,16 @@ if ($resql)
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
         print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
     }
-    
+
     $moreforfilter='';
-    
+
     // If the user can view prospects other than his'
     if ($user->rights->societe->client->voir || $socid)
     {
     	$langs->load("commercial");
     	$moreforfilter.='<div class="divsearchfield">';
     	$moreforfilter.=$langs->trans('ThirdPartiesOfSaleRepresentative'). ': ';
-    	$moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user,0,1,'maxwidth300');
+    	$moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user,0,1,'maxwidth200');
     	$moreforfilter.='</div>';
     }
 	// If the user can view other users
@@ -366,7 +366,7 @@ if ($resql)
 	{
 		$moreforfilter.='<div class="divsearchfield">';
 		$moreforfilter.=$langs->trans('LinkedToSpecificUsers'). ': ';
-	    $moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+	    $moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
 	 	$moreforfilter.='</div>';
 	}
 	// If the user can view categories of products
@@ -376,15 +376,15 @@ if ($resql)
 		$moreforfilter.='<div class="divsearchfield">';
 		$moreforfilter.=$langs->trans('IncludingProductWithTag'). ': ';
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
-		$moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, '', 1);
+		$moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
 		$moreforfilter.='</div>';
 	}
-    
+
     $parameters=array();
     $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
 	if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
 	else $moreforfilter = $hookmanager->resPrint;
-    
+
     if (! empty($moreforfilter))
     {
         print '<div class="liste_titre liste_titre_bydiv centpercent">';
@@ -395,7 +395,7 @@ if ($resql)
     $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
     $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
 	if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
-    
+
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
@@ -514,7 +514,7 @@ if ($resql)
     print $searchpicto;
     print '</td>';
     print "</tr>\n";
-    
+
     print '<tr class="liste_titre">';
     if (! empty($arrayfields['c.ref']['checked']))               print_liste_field_titre($arrayfields['c.ref']['label'], $_SERVER["PHP_SELF"], "c.ref","","$param",'',$sortfield,$sortorder);
     if (! empty($arrayfields['c.ref_customer']['checked']))      print_liste_field_titre($arrayfields['c.ref_customer']['label'], $_SERVER["PHP_SELF"], "c.ref_customer","","$param",'',$sortfield,$sortorder);
@@ -530,9 +530,9 @@ if ($resql)
 	// Extra fields
 	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 	{
-	   foreach($extrafields->attribute_label as $key => $val) 
+	   foreach($extrafields->attribute_label as $key => $val)
 	   {
-           if (! empty($arrayfields["ef.".$key]['checked'])) 
+           if (! empty($arrayfields["ef.".$key]['checked']))
            {
 				$align=$extrafields->getAlignFlag($key);
 				print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
@@ -558,12 +558,12 @@ if ($resql)
     while ($i < min($num,$limit))
     {
         $obj = $db->fetch_object($resql);
-        
+
         $contracttmp->ref=$obj->ref;
         $contracttmp->id=$obj->rowid;
         $contracttmp->ref_customer=$obj->ref_customer;
         $contracttmp->ref_supplier=$obj->ref_supplier;
-        
+
         print '<tr class="oddeven">';
         if (! empty($arrayfields['c.ref']['checked']))
         {
@@ -578,15 +578,15 @@ if ($resql)
             }
             print '</td>';
         }
-        if (! empty($arrayfields['c.ref_customer']['checked'])) 
+        if (! empty($arrayfields['c.ref_customer']['checked']))
         {
             print '<td>'.$obj->ref_customer.'</td>';
         }
-        if (! empty($arrayfields['c.ref_supplier']['checked'])) 
+        if (! empty($arrayfields['c.ref_supplier']['checked']))
         {
             print '<td>'.$obj->ref_supplier.'</td>';
         }
-        if (! empty($arrayfields['s.nom']['checked'])) 
+        if (! empty($arrayfields['s.nom']['checked']))
         {
             print '<td><a href="../comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.'</a></td>';
         }
@@ -629,7 +629,7 @@ if ($resql)
             print $typenArray[$obj->typent_code];
             print '</td>';
             if (! $i) $totalarray['nbfield']++;
-        }        
+        }
         if (! empty($arrayfields['sale_representative']['checked']))
         {
             // Sales representatives
@@ -713,7 +713,7 @@ if ($resql)
             if (! $i) $totalarray['nbfield']++;
         }
         // Status
-        if (! empty($arrayfields['status']['checked'])) 
+        if (! empty($arrayfields['status']['checked']))
         {
             print '<td align="center">'.($obj->nb_initial>0?$obj->nb_initial:'').'</td>';
             print '<td align="center">'.($obj->nb_running>0?$obj->nb_running:'').'</td>';
@@ -730,7 +730,7 @@ if ($resql)
         }
         print '</td>';
         if (! $i) $totalarray['nbfield']++;
-        
+
         print "</tr>\n";
         $i++;
     }
@@ -738,7 +738,7 @@ if ($resql)
 
     print '</table>';
     print '</div>';
-    
+
     print '</form>';
 }
 else
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index c5344ab467a..5af4024f9c2 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -309,10 +309,11 @@ class FormOther
      * @param   string	$htmlname      	Name of combo list
      * @param	int		$nocateg		Show also an entry "Not categorized"
      * @param   int     $showempty      Add also an empty line
-     * @return string		        	Html combo list code
+     * @param   string  $morecss        More CSS
+     * @return  string		        	Html combo list code
      * @see	select_all_categories
      */
-    function select_categories($type,$selected=0,$htmlname='search_categ',$nocateg=0,$showempty=1)
+    function select_categories($type, $selected=0, $htmlname='search_categ', $nocateg=0, $showempty=1, $morecss='')
     {
         global $conf, $langs;
         require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
@@ -328,18 +329,16 @@ class FormOther
         $tab_categs = $static_categs->get_full_arbo($type);
 
         $moreforfilter = '';
-        $nodatarole = '';
         // Enhance with select2
         if ($conf->use_javascript_ajax)
         {
             include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
             $comboenhancement = ajax_combobox('select_categ_'.$htmlname);
             $moreforfilter.=$comboenhancement;
-            $nodatarole=($comboenhancement?' data-role="none"':'');
         }
 
         // Print a select with each of them
-        $moreforfilter.='<select class="flat minwidth100" id="select_categ_'.$htmlname.'" name="'.$htmlname.'"'.$nodatarole.'>';
+        $moreforfilter.='<select class="flat minwidth100'.($morecss?' '.$morecss:'').'" id="select_categ_'.$htmlname.'" name="'.$htmlname.'">';
         if ($showempty) $moreforfilter.='<option value="0">&nbsp;</option>';	// Should use -1 to say nothing
 
         if (is_array($tab_categs))
@@ -379,7 +378,6 @@ class FormOther
         $langs->load('users');
 
         $out = '';
-        $nodatarole = '';
         // Enhance with select2
         if ($conf->use_javascript_ajax)
         {
@@ -389,11 +387,10 @@ class FormOther
             if ($comboenhancement)
             {
             	$out.=$comboenhancement;
-            	$nodatarole=($comboenhancement?' data-role="none"':'');
             }
         }
         // Select each sales and print them in a select input
-        $out.='<select class="flat'.($morecss?' '.$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'"'.$nodatarole.'>';
+        $out.='<select class="flat'.($morecss?' '.$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'">';
         if ($showempty) $out.='<option value="0">&nbsp;</option>';
 
         // Get list of users allowed to be viewed
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 6115b6cff0d..c1de978d2df 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -166,8 +166,9 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 -- Accountancy - Supplier invoice
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->supplier_invoice->enabled', __HANDLER__, 'left', 1600__+MAX_llx_menu__, 'accountancy', 'supplier_bills', 6__+MAX_llx_menu__, '/fourn/facture/list.php?leftmenu=suppliers_bills', 'BillsSuppliers', 0, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 3, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->supplier_invoice->enabled', __HANDLER__, 'left', 1601__+MAX_llx_menu__, 'accountancy', '', 1600__+MAX_llx_menu__, '/fourn/facture/card.php?action=create&amp;leftmenu=suppliers_bills', 'NewBill', 1, 'bills', '$user->rights->fournisseur->facture->creer', '', 2, 0, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->supplier_invoice->enabled', __HANDLER__, 'left', 1602__+MAX_llx_menu__, 'accountancy', '', 1600__+MAX_llx_menu__, '/fourn/facture/impayees.php?leftmenu=suppliers_bills', 'Unpaid', 1, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 1, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->supplier_invoice->enabled', __HANDLER__, 'left', 1602__+MAX_llx_menu__, 'accountancy', '', 1600__+MAX_llx_menu__, '/fourn/facture/list.php?leftmenu=suppliers_bills', 'List', 1, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->supplier_invoice->enabled', __HANDLER__, 'left', 1603__+MAX_llx_menu__, 'accountancy', '', 1600__+MAX_llx_menu__, '/fourn/facture/paiement.php?leftmenu=suppliers_bills', 'Payments', 1, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 2, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->supplier_invoice->enabled', __HANDLER__, 'left', 1605__+MAX_llx_menu__, 'accountancy', '', 1603__+MAX_llx_menu__, '/fourn/facture/rapport.php?leftmenu=suppliers_bills', 'Reporting', 2, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->supplier_invoice->enabled', __HANDLER__, 'left', 1604__+MAX_llx_menu__, 'accountancy', '', 1600__+MAX_llx_menu__, '/compta/facture/stats/index.php?leftmenu=customers_bills&mode=supplier', 'Statistics', 1, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 8, __ENTITY__);
 -- Accountancy - Customer invoice
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1700__+MAX_llx_menu__, 'accountancy', 'customer_bills', 6__+MAX_llx_menu__, '/compta/facture/list.php?leftmenu=customers_bills', 'BillsCustomers', 0, 'bills', '$user->rights->facture->lire', '', 2, 3, __ENTITY__);
@@ -275,9 +276,9 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled && ($leftmenu=="bank" || $leftmenu=="checks" || $leftmenu=="withdraw")', __HANDLER__, 'left', 2603__+MAX_llx_menu__, 'accountancy', '', 2600__+MAX_llx_menu__, '/compta/bank/bankentries.php?leftmenu=bank', 'ListTransactions', 1, 'banks', '$user->rights->banque->lire', '', 0, 2, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled && ($leftmenu=="bank" || $leftmenu=="checks" || $leftmenu=="withdraw")', __HANDLER__, 'left', 2604__+MAX_llx_menu__, 'accountancy', '', 2600__+MAX_llx_menu__, '/compta/bank/budget.php?leftmenu=bank', 'ListTransactionsByCategory', 1, 'banks', '$user->rights->banque->lire', '', 0, 3, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled && ($leftmenu=="bank" || $leftmenu=="checks" || $leftmenu=="withdraw")', __HANDLER__, 'left', 2606__+MAX_llx_menu__, 'accountancy', '', 2600__+MAX_llx_menu__, '/compta/bank/transfer.php?leftmenu=bank', 'BankTransfers', 1, 'banks', '$user->rights->banque->transfer', '', 0, 5, __ENTITY__);
--- Account - Categories
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->categorie->enabled', __HANDLER__, 'left', 2650__+MAX_llx_menu__, 'accountancy', 'cat', 14__+MAX_llx_menu__, '/categories/index.php?leftmenu=cat&amp;type=5', 'Categories', 0, 'categories', '$user->rights->categorie->lire', '', 2, 4, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->categorie->enabled', __HANDLER__, 'left', 2651__+MAX_llx_menu__, 'accountancy', '', 2650__+MAX_llx_menu__, '/categories/card.php?action=create&amp;type=5', 'NewCategory', 1, 'categories', '$user->rights->categorie->creer', '', 2, 0, __ENTITY__);
+-- Bank - Categories
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->categorie->enabled', __HANDLER__, 'left', 2650__+MAX_llx_menu__, 'accountancy', 'cat', 14__+MAX_llx_menu__, '/categories/index.php?leftmenu=bank&amp;type=5', 'Categories', 0, 'categories', '$user->rights->categorie->lire', '', 2, 4, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->categorie->enabled', __HANDLER__, 'left', 2651__+MAX_llx_menu__, 'accountancy', '', 2650__+MAX_llx_menu__, '/categories/card.php?leftmenu=bank&amp;action=create&amp;type=5', 'NewCategory', 1, 'categories', '$user->rights->categorie->creer', '', 2, 0, __ENTITY__);
 -- Project
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3600__+MAX_llx_menu__, 'project', 'projects', 7__+MAX_llx_menu__, '/projet/index.php?leftmenu=projects', 'Projects', 0, 'projects', '$user->rights->projet->lire', '', 2, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3601__+MAX_llx_menu__, 'project', '', 3600__+MAX_llx_menu__, '/projet/card.php?leftmenu=projects&amp;action=create', 'NewProject', 1, 'projects', '$user->rights->projet->creer', '', 2, 1, __ENTITY__);
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 21761216f65..bbe41dbab10 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -300,6 +300,8 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 	// We update newmenu for special dynamic menus
 	if ($conf->banque->enabled && $user->rights->banque->lire && $mainmenu == 'bank')	// Entry for each bank account
 	{
+	    include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';     // Required for to get Account::TYPE_CASH for example
+
 		$sql = "SELECT rowid, label, courant, rappro, courant";
 		$sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
 		$sql.= " WHERE entity = ".$conf->entity;
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 8a8014edcb6..bbf2266ab13 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -127,7 +127,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 
 
 /*
- * Actions 
+ * Actions
  */
 
 if (GETPOST('cancel')) { $action='list'; $massaction=''; }
@@ -320,7 +320,7 @@ if ($resql)
 
 	$title = $langs->trans("ListTripsAndExpenses");
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_generic.png', 0, '', '', $limit);
-	
+
 	if ($sall)
     {
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
@@ -333,7 +333,7 @@ if ($resql)
 	$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
 	if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
 	else $moreforfilter = $hookmanager->resPrint;
-	
+
 	if (! empty($moreforfilter))
 	{
 	    print '<div class="liste_titre liste_titre_bydiv centpercent">';
@@ -344,10 +344,10 @@ if ($resql)
 	$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
 	$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
 	if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
-	
+
     print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-	
+
 	// Filters
 	print '<tr class="liste_titre_filter">';
 	if (! empty($arrayfields['d.ref']['checked']))
@@ -362,7 +362,7 @@ if ($resql)
         if ($user->rights->expensereport->readall || $user->rights->expensereport->lire_tous)
     	{
     		print '<td class="liste_titre maxwidthonspartphone" align="left">';
-    		print $form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+    		print $form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
     		print '</td>';
     	} else {
     		print '<td class="liste_titre">&nbsp;</td>';
@@ -452,7 +452,7 @@ if ($resql)
 	{
 	    print '<td class="liste_titre">';
 	    print '</td>';
-	}	
+	}
 	// Status
 	if (! empty($arrayfields['d.fk_statut']['checked']))
 	{
@@ -498,7 +498,7 @@ if ($resql)
 	if (! empty($arrayfields['d.tms']['checked']))       print_liste_field_titre($arrayfields['d.tms']['label'],$_SERVER["PHP_SELF"],"d.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
 	if (! empty($arrayfields['d.fk_statut']['checked'])) print_liste_field_titre($arrayfields['d.fk_statut']['label'],$_SERVER["PHP_SELF"],"d.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
-	print "</tr>\n";	
+	print "</tr>\n";
 
 	$total_total_ht = 0;
 	$total_total_ttc = 0;
@@ -527,8 +527,8 @@ if ($resql)
 			$expensereportstatic->date_approve=$db->jdate($obj->date_approve);
 			$expensereportstatic->note_private=$obj->note_private;
 			$expensereportstatic->note_public=$obj->note_public;
-				
-			
+
+
 			print '<tr class="oddeven">';
 			// Ref
 			if (! empty($arrayfields['d.ref']['checked'])) {
@@ -615,7 +615,7 @@ if ($resql)
     		    if (! $i) $totalarray['totalttcfield']=$totalarray['nbfield'];
     		    $totalarray['totalttc'] += $obj->total_ttc;
             }
-    		
+
             // Extra fields
             if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
             {
@@ -723,11 +723,11 @@ if ($resql)
 	    // Show list of available documents
 	    $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
 	    $urlsource.=str_replace('&amp;','&',$param);
-	
+
 	    $filedir=$diroutputmassaction;
 	    $genallowed=$user->rights->expensereport->lire;
 	    $delallowed=$user->rights->expensereport->lire;
-	
+
 	    print $formfile->showdocuments('massfilesarea_expensereport','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
 	}
 	else
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 9e8d841e976..bafdeeab4db 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -218,7 +218,7 @@ if (empty($reshook))
         $toselect='';
     	$search_project_ref='';
         $search_array_options=array();
-    
+
         // Mass actions
         $objectclass='Commande';
         $objectlabel='Orders';
@@ -235,54 +235,54 @@ if (empty($reshook))
     $permtodelete = $user->rights->fournisseur->commande->supprimer;
     $uploaddir = $conf->fournisseur->commande->dir_output;
     include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
-    
+
     // TODO Move this into mass action include
-    if ($massaction == 'confirm_createbills') 
+    if ($massaction == 'confirm_createbills')
     {
         $orders = GETPOST('toselect');
         $createbills_onebythird = GETPOST('createbills_onebythird', 'int');
         $validate_invoices = GETPOST('valdate_invoices', 'int');
-         
+
         $TFact = array();
         $TFactThird = array();
-         
+
         $nb_bills_created = 0;
-         
+
         $db->begin();
-         
+
         foreach($orders as $id_order) {
-    
+
             $cmd = new Commande($db);
             if($cmd->fetch($id_order) <= 0) continue;
-    
+
             $object = new Facture($db);
             if(!empty($createbills_onebythird) && !empty($TFactThird[$cmd->socid])) $object = $TFactThird[$cmd->socid]; // If option "one bill per third" is set, we use already created order.
             else {
-                 
+
                 $object->socid = $cmd->socid;
                 $object->type = Facture::TYPE_STANDARD;
                 $object->cond_reglement_id	= $cmd->cond_reglement_id;
                 $object->mode_reglement_id	= $cmd->mode_reglement_id;
                 $object->fk_project			= $cmd->fk_project;
-                 
+
                 $datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
                 if (empty($datefacture))
                 {
                     $datefacture = dol_mktime(date("h"), date("M"), 0, date("m"), date("d"), date("Y"));
                 }
-                 
+
                 $object->date = $datefacture;
                 $object->origin    = 'commande';
                 $object->origin_id = $id_order;
-                 
+
                 $res = $object->create($user);
-                 
+
                 if($res > 0) $nb_bills_created++;
-                 
+
             }
-    
+
             if($object->id > 0) {
-                 
+
                 $db->begin();
                 $sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
                 $sql.= "fk_source";
@@ -295,7 +295,7 @@ if (empty($reshook))
                 $sql.= ", ".$object->id;
                 $sql.= ", '".$object->element."'";
                 $sql.= ")";
-    
+
                 if ($db->query($sql))
                 {
                     $db->commit();
@@ -304,17 +304,17 @@ if (empty($reshook))
                 {
                     $db->rollback();
                 }
-                 
+
                 $lines = $cmd->lines;
                 if (empty($lines) && method_exists($cmd, 'fetch_lines'))
                 {
                     $cmd->fetch_lines();
                     $lines = $cmd->lines;
                 }
-                 
+
                 $fk_parent_line=0;
                 $num=count($lines);
-                 
+
                 for ($i=0;$i<$num;$i++)
                 {
                     $desc=($lines[$i]->desc?$lines[$i]->desc:$lines[$i]->libelle);
@@ -404,42 +404,42 @@ if (empty($reshook))
                         }
                     }
                 }
-                 
+
             }
-             
+
             $cmd->classifyBilled($user);
-    
+
             if(!empty($createbills_onebythird) && empty($TFactThird[$cmd->socid])) $TFactThird[$cmd->socid] = $object;
             else $TFact[$object->id] = $object;
         }
-         
+
         // Build doc with all invoices
         $TAllFact = empty($createbills_onebythird) ? $TFact : $TFactThird;
         $toselect = array();
-         
+
         if(!empty($validate_invoices)) {
-    
+
             $massaction = $action = 'builddoc';
-    
+
             foreach($TAllFact as &$object) {
                 $object->validate($user);
                 $toselect[] = $object->id; // For builddoc action
-                 
+
                 // Fac builddoc
                 $upload_dir = $conf->facture->dir_output;
                 $permissioncreate=$user->rights->facture->creer;
                 include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
             }
-    
+
             $objectclass='Facture';
             $objectlabel='Invoice';
             $permtoread = $user->rights->facture->lire;
             $permtodelete = $user->rights->facture->supprimer;
             $uploaddir = $conf->facture->dir_output;
             include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
-    
+
         }
-         
+
         if (! $error)
         {
             $db->commit();
@@ -537,12 +537,11 @@ if ($billed != '' && $billed >= 0) $sql .= " AND cf.billed = ".$billed;
 //Required triple check because statut=0 means draft filter
 if (GETPOST('statut', 'alpha') !== '')
 {
-	$sql .= " AND cf.fk_statut IN (".GETPOST('statut', 'alpha').")";
+	$sql .= " AND cf.fk_statut IN (".$db->escape(GETPOST('statut', 'alpha')).")";
 }
 if ($search_status != '' && $search_status >= 0)
 {
-	if (strstr($search_status, ',')) $sql.=" AND cf.fk_statut IN (".$db->escape($search_status).")";
-	else $sql.=" AND cf.fk_statut = ".$search_status;
+	$sql.=" AND cf.fk_statut IN (".$db->escape($search_status).")";
 }
 if ($ordermonth > 0)
 {
@@ -573,11 +572,11 @@ else if ($deliveryyear > 0)
 if ($search_town)  $sql.= natural_search('s.town', $search_town);
 if ($search_zip)   $sql.= natural_search("s.zip",$search_zip);
 if ($search_state) $sql.= natural_search("state.nom",$search_state);
-if ($search_country) $sql .= " AND s.fk_pays IN (".$search_country.')';
-if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
+if ($search_country) $sql .= " AND s.fk_pays IN (".$db->escape($search_country).')';
+if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$db->escape($search_type_thirdparty).')';
 if ($search_company) $sql .= natural_search('s.nom', $search_company);
-if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$search_sale;
-if ($search_user > 0) $sql.= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='supplier_order' AND tc.source='internal' AND ec.element_id = cf.rowid AND ec.fk_socpeople = ".$search_user;
+if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$db->escape($search_sale);
+if ($search_user > 0) $sql.= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='supplier_order' AND tc.source='internal' AND ec.element_id = cf.rowid AND ec.fk_socpeople = ".$db->escape($search_user);
 if ($search_total_ht != '') $sql.= natural_search('cf.total_ht', $search_total_ht, 1);
 if ($search_total_vat != '') $sql.= natural_search('cf.tva', $search_total_vat, 1);
 if ($search_total_ttc != '') $sql.= natural_search('cf.total_ttc', $search_total_ttc, 1);
@@ -629,7 +628,7 @@ if ($resql)
 	$num = $db->num_rows($resql);
 
 	$arrayofselected=is_array($toselect)?$toselect:array();
-	
+
 	$param='';
 	if ($socid > 0)             $param.='&socid='.$socid;
     if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
@@ -670,7 +669,7 @@ if ($resql)
 	if ($user->rights->fournisseur->commande->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
 	if ($massaction == 'presend' || $massaction == 'createbills') $arrayofmassactions=array();
 	$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
-	
+
 	// Lignes des champs de filtre
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -688,7 +687,7 @@ if ($resql)
 	if ($massaction == 'presend')
 	{
 	    $langs->load("mails");
-	
+
 	    if (! GETPOST('cancel'))
 	    {
 	        $objecttmp=new CommandeFournisseur($db);
@@ -707,23 +706,23 @@ if ($resql)
 	            }
 	        }
 	    }
-	
+
 	    print '<input type="hidden" name="massaction" value="confirm_presend">';
-	
+
 	    dol_fiche_head(null, '', '');
-	
+
 	    $topicmail="SendOrderRef";
 	    $modelmail="order_send";
-	
+
 	    // Cree l'objet formulaire mail
 	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 	    $formmail = new FormMail($db);
 	    $formmail->withform=-1;
 	    $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
-	
+
 	    if($formmail->fromtype === 'user'){
 	        $formmail->fromid = $user->id;
-	
+
 	    }
 	    if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 1))	// If bit 1 is set
 	    {
@@ -767,23 +766,23 @@ if ($resql)
 	    $formmail->substit['__REFCLIENT__']='__REFCLIENT__';	// We want to keep the tag
 	    $formmail->substit['__PERSONALIZED__']='';
 	    $formmail->substit['__CONTACTCIVNAME__']='';
-	
+
 	    // Tableau des parametres complementaires du post
 	    $formmail->param['action']=$action;
 	    $formmail->param['models']=$modelmail;
 	    $formmail->param['models_id']=GETPOST('modelmailselected','int');
 	    $formmail->param['id']=join(',',$arrayofselected);
 	    //$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-	
+
 	    print $formmail->get_form();
-	
+
 	    dol_fiche_end();
 	}
 	elseif ($massaction == 'createbills')
 	{
 	    //var_dump($_REQUEST);
 	    print '<input type="hidden" name="massaction" value="confirm_createbills">';
-	
+
 	    print '<table class="border" width="100%" >';
 	    print '<tr>';
 	    print '<td class="titlefieldmiddle">';
@@ -810,7 +809,7 @@ if ($resql)
 	    print '</td>';
 	    print '</tr>';
 	    print '</table>';
-	
+
 	    print '<br>';
 	    print '<div class="center">';
 	    print '<input type="submit" class="button" id="createbills" name="createbills" value="'.$langs->trans('CreateInvoiceForThisCustomer').'">  ';
@@ -818,7 +817,7 @@ if ($resql)
 	    print '</div>';
 	    print '<br>';
 	}
-	
+
 	if ($sall)
     {
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
@@ -833,7 +832,7 @@ if ($resql)
         $langs->load("commercial");
         $moreforfilter.='<div class="divsearchfield">';
         $moreforfilter.=$langs->trans('ThirdPartiesOfSaleRepresentative'). ': ';
-        $moreforfilter.=$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth300');
+        $moreforfilter.=$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth200');
         $moreforfilter.='</div>';
     }
     // If the user can view other users
@@ -841,7 +840,7 @@ if ($resql)
     {
         $moreforfilter.='<div class="divsearchfield">';
         $moreforfilter.=$langs->trans('LinkedToSpecificUsers'). ': ';
-        $moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+        $moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
         $moreforfilter.='</div>';
     }
     // If the user can view prospects other than his'
@@ -851,14 +850,14 @@ if ($resql)
         $moreforfilter.='<div class="divsearchfield">';
         $moreforfilter.=$langs->trans('IncludingProductWithTag'). ': ';
         $cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
-        $moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, '', 1);
+        $moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
         $moreforfilter.='</div>';
     }
     $parameters=array();
     $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
     if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
     else $moreforfilter = $hookmanager->resPrint;
-    
+
     if (! empty($moreforfilter))
     {
         print '<div class="liste_titre liste_titre_bydiv centpercent">';
@@ -1065,8 +1064,8 @@ if ($resql)
 	if (! empty($arrayfields['cf.billed']['checked']))    print_liste_field_titre($arrayfields['cf.billed']['label'],$_SERVER["PHP_SELF"],'cf.billed','',$param,'align="center"',$sortfield,$sortorder,'');
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";
-	
-	
+
+
 	$total=0;
 	$subtotal=0;
     $productstat_cache=array();
@@ -1081,7 +1080,7 @@ if ($resql)
 	while ($i < min($num,$limit))
 	{
 		$obj = $db->fetch_object($resql);
-		
+
 
         $objectstatic->id=$obj->rowid;
         $objectstatic->ref=$obj->ref;
@@ -1098,7 +1097,7 @@ if ($resql)
         if (! empty($arrayfields['cf.ref']['checked']))
         {
             print '<td class="nowrap">';
-            
+
             print '<table class="nobordernopadding"><tr class="nocellnopadd">';
             // Picto + Ref
             print '<td class="nobordernopadding nowrap">';
@@ -1113,7 +1112,7 @@ if ($resql)
 			$filedir=$conf->fournisseur->dir_output.'/commande' . '/' . dol_sanitizeFileName($obj->ref);
 			print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
 			print '</td></tr></table>';
-			
+
 			print '</td>'."\n";
             if (! $i) $totalarray['nbfield']++;
         }
@@ -1319,18 +1318,18 @@ if ($resql)
 	     */
 	    $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
 	    $urlsource.=str_replace('&amp;','&',$param);
-	
+
 	    $filedir=$diroutputmassaction;
 	    $genallowed=$user->rights->fournisseur->commande->lire;
 	    $delallowed=$user->rights->fournisseur->commande->lire;
-	
+
 	    print $formfile->showdocuments('massfilesarea_supplier_order','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
 	}
 	else
 	{
 	    print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
 	}
-	
+
 	$db->free($resql);
 }
 else
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 0e19c73615b..30d31c0ea02 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -193,7 +193,7 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 if (empty($reshook))
 {
     include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
-    
+
     if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter") || GETPOST("button_removefilter.x"))		// All test must be present to be compatible with all browsers
     {
         $search_all="";
@@ -232,7 +232,7 @@ if (empty($reshook))
         $filter='';
         $option='';
     }
-    
+
     // Mass actions
     $objectclass='FactureFournisseur';
     $objectlabel='SupplierInvoices';
@@ -242,7 +242,7 @@ if (empty($reshook))
     include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
-    
+
 /*
  * View
  */
@@ -267,7 +267,7 @@ $sql.= " state.code_departement as state_code, state.nom as state_name,";
 $sql.= " p.rowid as project_id, p.ref as project_ref";
 // We need dynamount_payed to be able to sort on status (value is surely wrong because we can count several lines several times due to other left join or link with contacts. But what we need is just 0 or > 0)
 // TODO Better solution to be able to sort on already payed or remain to pay is to store amount_payed in a denormalized field.
-if (! $search_all) $sql.= ', SUM(pf.amount) as dynamount_payed';   
+if (! $search_all) $sql.= ', SUM(pf.amount) as dynamount_payed';
 // Add fields from extrafields
 foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
 // Add fields from hooks
@@ -396,7 +396,7 @@ if (! $search_all)
     foreach ($extrafields->attribute_label as $key => $val) //prevent error with sql_mode=only_full_group_by
     {
         $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key : '');
-    }   
+    }
 }
 else
 {
@@ -421,7 +421,7 @@ if ($resql)
 	$num = $db->num_rows($resql);
 
 	$arrayofselected=is_array($toselect)?$toselect:array();
-	
+
 	if ($socid)
 	{
 		$soc = new Societe($db);
@@ -460,7 +460,7 @@ if ($resql)
 	    $tmpkey=preg_replace('/search_options_/','',$key);
 	    if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
 	}
-	
+
 	// List of mass actions available
 	$arrayofmassactions =  array(
 	    //'presend'=>$langs->trans("SendByMail"),
@@ -470,7 +470,7 @@ if ($resql)
 	if ($user->rights->fournisseur->facture->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
 	//if ($massaction == 'presend' || $massaction == 'createbills') $arrayofmassactions=array();
 	$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
-	
+
 	$i = 0;
 	print '<form method="POST" name="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -484,11 +484,11 @@ if ($resql)
 	print '<input type="hidden" name="socid" value="'.$socid.'">';
 
 	print_barre_liste($langs->trans("BillsSuppliers").($socid?' '.$soc->name:''), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
-	
+
 	if ($massaction == 'presend')
 	{
 	    $langs->load("mails");
-	
+
 	    if (! GETPOST('cancel'))
 	    {
 	        $objecttmp=new FactureFourn($db);
@@ -507,26 +507,26 @@ if ($resql)
 	            }
 	        }
 	    }
-	
+
 	    print '<input type="hidden" name="massaction" value="confirm_presend">';
-	
+
 	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 	    $formmail = new FormMail($db);
-	
+
 	    dol_fiche_head(null, '', '');
-	
+
 	    $topicmail="SendBillRef";
 	    $modelmail="supplier_invoice_send";
-	
+
 	    // Cree l'objet formulaire mail
 	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 	    $formmail = new FormMail($db);
 	    $formmail->withform=-1;
 	    $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
-	
+
 	    if($formmail->fromtype === 'user'){
 	        $formmail->fromid = $user->id;
-	
+
 	    }
 	    if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 1))	// If bit 1 is set
 	    {
@@ -570,23 +570,23 @@ if ($resql)
 	    $formmail->substit['__REFCLIENT__']='__REFCLIENT__';	// We want to keep the tag
 	    $formmail->substit['__PERSONALIZED__']='';
 	    $formmail->substit['__CONTACTCIVNAME__']='';
-	
+
 	    // Tableau des parametres complementaires du post
 	    $formmail->param['action']=$action;
 	    $formmail->param['models']=$modelmail;
 	    $formmail->param['models_id']=GETPOST('modelmailselected','int');
 	    $formmail->param['id']=join(',',$arrayofselected);
 	    //$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-	
+
 	    print $formmail->get_form();
-	
+
 	    dol_fiche_end();
 	}
 	elseif ($massaction == 'createbills')
 	{
 	    //var_dump($_REQUEST);
 	    print '<input type="hidden" name="massaction" value="confirm_createbills">';
-	
+
 	    print '<table class="border" width="100%" >';
 	    print '<tr>';
 	    print '<td class="titlefieldmiddle">';
@@ -613,7 +613,7 @@ if ($resql)
 	    print '</td>';
 	    print '</tr>';
 	    print '</table>';
-	
+
 	    print '<br>';
 	    print '<div class="center">';
 	    print '<input type="submit" class="button" id="createbills" name="createbills" value="'.$langs->trans('CreateInvoiceForThisCustomer').'">  ';
@@ -621,13 +621,13 @@ if ($resql)
 	    print '</div>';
 	    print '<br>';
 	}
-	
+
 	if ($search_all)
     {
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
         print $langs->trans("FilterOnInto", $search_all) . join(', ',$fieldstosearchall);
     }
-    
+
  	// If the user can view prospects other than his'
     $moreforfilter='';
  	if ($user->rights->societe->client->voir || $socid)
@@ -635,7 +635,7 @@ if ($resql)
  		$langs->load("commercial");
  		$moreforfilter.='<div class="divsearchfield">';
  		$moreforfilter.=$langs->trans('ThirdPartiesOfSaleRepresentative'). ': ';
-		$moreforfilter.=$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth300');
+		$moreforfilter.=$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth200');
 	 	$moreforfilter.='</div>';
  	}
     // If the user can view prospects other than his'
@@ -643,7 +643,7 @@ if ($resql)
     {
 		$moreforfilter.='<div class="divsearchfield">';
     	$moreforfilter.=$langs->trans('LinkedToSpecificUsers'). ': ';
-        $moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+        $moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
 	 	$moreforfilter.='</div>';
     }
 	// If the user can view prospects other than his'
@@ -653,7 +653,7 @@ if ($resql)
 		$moreforfilter.='<div class="divsearchfield">';
 		$moreforfilter.=$langs->trans('IncludingProductWithTag'). ': ';
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
-		$moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, '', 1);
+		$moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
 		$moreforfilter.='</div>';
 	}
     $parameters=array();
@@ -671,7 +671,7 @@ if ($resql)
     $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
     $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
     if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
-    
+
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
@@ -900,12 +900,12 @@ if ($resql)
 	if (! empty($arrayfields['f.tms']['checked']))       print_liste_field_titre($arrayfields['f.tms']['label'],$_SERVER["PHP_SELF"],"f.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
 	if (! empty($arrayfields['f.fk_statut']['checked'])) print_liste_field_titre($arrayfields['f.fk_statut']['label'],$_SERVER["PHP_SELF"],"fk_statut,paye","",$param,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
-	print "</tr>\n";	
-	
+	print "</tr>\n";
+
     $facturestatic=new FactureFournisseur($db);
 	$supplierstatic=new Fournisseur($db);
 	$projectstatic=new Project($db);
-	
+
 	if ($num > 0)
     {
 		$i=0;
@@ -915,7 +915,7 @@ if ($resql)
 		while ($i < min($num,$limit))
 		{
 			$obj = $db->fetch_object($resql);
-			
+
 			$datelimit=$db->jdate($obj->datelimite);
 			$facturestatic->id=$obj->facid;
 			$facturestatic->ref=$obj->ref;
@@ -929,7 +929,7 @@ if ($resql)
 			$totaldeposits = $facturestatic->getSumDepositsUsed();
 			$totalpay = $paiement + $totalcreditnotes + $totaldeposits;
 			$remaintopay = $obj->total_ttc - $totalpay;
-				
+
             print '<tr class="oddeven">';
     		if (! empty($arrayfields['f.ref']['checked']))
     		{
@@ -950,11 +950,11 @@ if ($resql)
 				$subdir = get_exdir($obj->facid,2,0,0,$facturestatic,'invoice_supplier').dol_sanitizeFileName($obj->ref);
 				print $formfile->getDocumentsLink('facture_fournisseur', $subdir, $filedir);
 				print '</td></tr></table>';
-				
+
                 print "</td>\n";
 				if (! $i) $totalarray['nbfield']++;
     		}
-    		
+
 			// Customer ref
     		if (! empty($arrayfields['f.ref_supplier']['checked']))
     		{
@@ -963,7 +963,7 @@ if ($resql)
     			print '</td>';
     		    if (! $i) $totalarray['nbfield']++;
     		}
-    		
+
 			// Label
     		if (! empty($arrayfields['f.label']['checked']))
     		{
@@ -972,7 +972,7 @@ if ($resql)
     			print '</td>';
     		    if (! $i) $totalarray['nbfield']++;
     		}
-    		
+
 			// Date
     		if (! empty($arrayfields['f.datef']['checked']))
     		{
@@ -981,7 +981,7 @@ if ($resql)
                 print '</td>';
     		    if (! $i) $totalarray['nbfield']++;
     		}
-    		
+
             // Date limit
     		if (! empty($arrayfields['f.date_lim_reglement']['checked']))
     		{
@@ -993,7 +993,7 @@ if ($resql)
                 print '</td>';
     		    if (! $i) $totalarray['nbfield']++;
     		}
-    		
+
     		// Project
     		if (! empty($arrayfields['p.ref']['checked']))
     		{
@@ -1007,7 +1007,7 @@ if ($resql)
     		    print '</td>';
     		    if (! $i) $totalarray['nbfield']++;
     		}
-    		
+
     		// Third party
     		if (! empty($arrayfields['s.nom']['checked']))
     		{
@@ -1061,7 +1061,7 @@ if ($resql)
     		    print '</td>';
     		    if (! $i) $totalarray['nbfield']++;
     		}
-    		
+
             // Payment mode
     		if (! empty($arrayfields['f.fk_mode_reglement']['checked']))
     		{
@@ -1070,7 +1070,7 @@ if ($resql)
                 print '</td>';
     		    if (! $i) $totalarray['nbfield']++;
     		}
-    		
+
             // Amount HT
             if (! empty($arrayfields['f.total_ht']['checked']))
             {
@@ -1127,8 +1127,8 @@ if ($resql)
     		    if (! $i) $totalarray['totalrtpfield']=$totalarray['nbfield'];
     		    $totalarray['totalrtp'] += $remaintopay;
             }
-            
-            
+
+
             // Extra fields
             if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
             {
@@ -1176,7 +1176,7 @@ if ($resql)
                 print "</td>";
                 if (! $i) $totalarray['nbfield']++;
             }
-            
+
     		// Action column
             print '<td class="nowrap" align="center">';
             if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
@@ -1187,12 +1187,12 @@ if ($resql)
             }
             print '</td>';
     		if (! $i) $totalarray['nbfield']++;
-    		
+
 			print "</tr>\n";
-			
+
 			$i++;
 		}
-		
+
 	    // Show total line
     	if (isset($totalarray['totalhtfield'])
  	   || isset($totalarray['totalvatfield'])
@@ -1215,7 +1215,7 @@ if ($resql)
     	       }
     		   elseif ($totalarray['totalhtfield'] == $i)  print '<td align="right">'.price($totalarray['totalht']).'</td>';
     		   elseif ($totalarray['totalvatfield'] == $i) print '<td align="right">'.price($totalarray['totalvat']).'</td>';
-    		   elseif ($totalarray['totallocaltax1field'] == $i) print '<td align="right">'.price($totalarray['totallocaltax1']).'</td>'; 
+    		   elseif ($totalarray['totallocaltax1field'] == $i) print '<td align="right">'.price($totalarray['totallocaltax1']).'</td>';
     		   elseif ($totalarray['totallocaltax2field'] == $i) print '<td align="right">'.price($totalarray['totallocaltax2']).'</td>';
     		   elseif ($totalarray['totalttcfield'] == $i) print '<td align="right">'.price($totalarray['totalttc']).'</td>';
     		   elseif ($totalarray['totalamfield'] == $i)  print '<td align="right">'.price($totalarray['totalam']).'</td>';
@@ -1223,32 +1223,32 @@ if ($resql)
     		   else print '<td></td>';
     		}
     		print '</tr>';
-    		
+
     	}
 	}
 
 	$db->free($resql);
-	
+
 	$parameters=array('arrayfields'=>$arrayfields, 'sql'=>$sql);
 	$reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-	
+
 	print "</table>\n";
     print '</div>';
-    
+
 	print "</form>\n";
-    
+
     /*
     if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
     {
         // Show list of available documents
         $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
         $urlsource.=str_replace('&amp;','&',$param);
-        
+
         $filedir=$diroutputmassaction;
         $genallowed=$user->rights->facture->lire;
         $delallowed=$user->rights->facture->lire;
-    
+
         print $formfile->showdocuments('massfilesarea_invoices','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
     }
     else
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 30d3dc14f69..fa77287cbf4 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -66,7 +66,7 @@ $year_end        = GETPOST('year_end');
 $search_employe  = GETPOST('search_employe');
 $search_valideur = GETPOST('search_valideur');
 $search_statut   = GETPOST('select_statut');
-$type            = GETPOST('type','int'); 
+$type            = GETPOST('type','int');
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
@@ -310,14 +310,14 @@ print '</td>';
 if ($user->rights->holiday->write_all)
 {
     print '<td class="liste_titre maxwidthonsmartphone" align="left">';
-    print $form->select_dolusers($search_employe,"search_employe",1,"",0,'','',0,32,0,'',0,'','maxwidth200');
+    print $form->select_dolusers($search_employe,"search_employe",1,"",0,'','',0,0,0,'',0,'','maxwidth200');
     print '</td>';
 }
 else
 {
     //print '<td class="liste_titre">&nbsp;</td>';
     print '<td class="liste_titre maxwidthonsmartphone" align="left">';
-    print $form->select_dolusers($user->id,"search_employe",1,"",1,'','',0,32,0,'',0,'','maxwidth200');
+    print $form->select_dolusers($user->id,"search_employe",1,"",1,'','',0,0,0,'',0,'','maxwidth200');
     print '</td>';
 }
 
@@ -331,7 +331,7 @@ if($user->rights->holiday->write_all)
     $valideurobjects = $validator->listUsersForGroup($excludefilter);
     $valideurarray = array();
     foreach($valideurobjects as $val) $valideurarray[$val->id]=$val->id;
-    print $form->select_dolusers($search_valideur,"search_valideur",1,"",0,$valideurarray,'', 0, 32,0,'',0,'','maxwidth200');
+    print $form->select_dolusers($search_valideur,"search_valideur",1,"",0,$valideurarray,'', 0, 0, 0, '', 0, '', 'maxwidth200');
     print '</td>';
 }
 else
@@ -408,7 +408,7 @@ if (! empty($holiday->holiday))
 		$userstatic->login=$infos_CP['user_login'];
 		$userstatic->statut=$infos_CP['user_statut'];
 		$userstatic->photo=$infos_CP['user_photo'];
-		
+
 		// Valideur
 		$approbatorstatic->id=$infos_CP['fk_validator'];
 		$approbatorstatic->lastname=$infos_CP['validator_lastname'];
@@ -416,7 +416,7 @@ if (! empty($holiday->holiday))
 		$approbatorstatic->login=$infos_CP['validator_login'];
 		$approbatorstatic->statut=$infos_CP['validator_statut'];
 		$approbatorstatic->photo=$infos_CP['validator_photo'];
-		
+
 		$date = $infos_CP['date_create'];
 
 		print '<tr class="oddeven">';
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 0c638f8dd6b..9c78387f95b 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -444,7 +444,7 @@ if (! empty($conf->categorie->enabled))
     require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
     $moreforfilter.='<div class="divsearchfield">';
     $moreforfilter.=$langs->trans('ProjectCategories'). ': ';
-    $moreforfilter.=$formother->select_categories('project',$search_categ,'search_categ',1);
+    $moreforfilter.=$formother->select_categories('project', $search_categ, 'search_categ', 1, 1, 'maxwidth300');
     $moreforfilter.='</div>';
 }
 
@@ -453,7 +453,7 @@ $moreforfilter.='<div class="divsearchfield">';
 $moreforfilter.=$langs->trans('ProjectsWithThisUserAsContact'). ': ';
 $includeonly='';
 if (empty($user->rights->user->user->lire)) $includeonly=array($user->id);
-$moreforfilter.=$form->select_dolusers($search_project_user?$search_project_user:'', 'search_project_user', 1, '', 0, $includeonly, '', 0, 0, 0, '', 0, '', 'maxwidth300');
+$moreforfilter.=$form->select_dolusers($search_project_user?$search_project_user:'', 'search_project_user', 1, '', 0, $includeonly, '', 0, 0, 0, '', 0, '', 'maxwidth200');
 $moreforfilter.='</div>';
 
 // If the user can view thirdparties other than his'
@@ -462,7 +462,7 @@ if ($user->rights->societe->client->voir || $socid)
 	$langs->load("commercial");
 	$moreforfilter.='<div class="divsearchfield">';
 	$moreforfilter.=$langs->trans('ThirdPartiesOfSaleRepresentative'). ': ';
-	$moreforfilter.=$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth300');
+	$moreforfilter.=$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth200');
 	$moreforfilter.='</div>';
 }
 
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 47387ec625a..7bff02fa864 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -442,7 +442,7 @@ if (! empty($conf->categorie->enabled))
     require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
     $moreforfilter.='<div class="divsearchfield">';
     $moreforfilter.=$langs->trans('ProjectCategories'). ': ';
-    $moreforfilter.=$formother->select_categories('project',$search_categ,'search_categ',1);
+    $moreforfilter.=$formother->select_categories('project', $search_categ, 'search_categ', 1, 'maxwidth300');
     $moreforfilter.='</div>';
 }
 
@@ -451,7 +451,7 @@ $moreforfilter.='<div class="divsearchfield">';
 $moreforfilter.=$langs->trans('ProjectsWithThisUserAsContact'). ' ';
 $includeonly='';
 if (empty($user->rights->user->user->lire)) $includeonly=array($user->id);
-$moreforfilter.=$form->select_dolusers($search_project_user?$search_project_user:'', 'search_project_user', 1, '', 0, $includeonly, '', 0, 0, 0, '', 0, '', 'maxwidth300');
+$moreforfilter.=$form->select_dolusers($search_project_user?$search_project_user:'', 'search_project_user', 1, '', 0, $includeonly, '', 0, 0, 0, '', 0, '', 'maxwidth200');
 $moreforfilter.='</div>';
 
 // If the user can view users
@@ -459,7 +459,7 @@ $moreforfilter.='<div class="divsearchfield">';
 $moreforfilter.=$langs->trans('TasksWithThisUserAsContact'). ': ';
 $includeonly='';
 if (empty($user->rights->user->user->lire)) $includeonly=array($user->id);
-$moreforfilter.=$form->select_dolusers($search_task_user, 'search_task_user', 1, '', 0, $includeonly, '', 0, 0, 0, '', 0, '', 'maxwidth300');
+$moreforfilter.=$form->select_dolusers($search_task_user, 'search_task_user', 1, '', 0, $includeonly, '', 0, 0, 0, '', 0, '', 'maxwidth200');
 $moreforfilter.='</div>';
 
 if (! empty($moreforfilter))

From faabdd3f99fb923661485364c3a6c9dd0852c48c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Jun 2017 11:34:35 +0200
Subject: [PATCH 218/438] Missing filter field

---
 htdocs/user/index.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 76d3385dd65..9c82216d5be 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2017 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2015      Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2016      Marcos García        <marcosgdf@gmail.com>
@@ -204,7 +204,7 @@ else
 }
 if ($socid > 0) $sql.= " AND u.fk_soc = ".$socid;
 //if ($search_user != '')       $sql.=natural_search(array('u.login', 'u.lastname', 'u.firstname'), $search_user);
-if ($search_supervisor > 0)   $sql.= " AND u.fk_user = ".$db->escape($search_supervisor);
+if ($search_supervisor > 0)   $sql.= " AND u.fk_user IN (".$db->escape($search_supervisor).")";
 if ($search_thirdparty != '') $sql.= natural_search(array('s.nom'), $search_thirdparty);
 if ($search_login != '')      $sql.= natural_search("u.login", $search_login);
 if ($search_lastname != '')   $sql.= natural_search("u.lastname", $search_lastname);
@@ -360,9 +360,12 @@ if (! empty($arrayfields['u.entity']['checked']))
 {
     print '<td class="liste_titre"></td>';
 }
+// Supervisor
 if (! empty($arrayfields['u.fk_user']['checked']))
 {
-    print '<td class="liste_titre"></td>';
+    print '<td class="liste_titre">';
+    print $form->select_dolusers($search_supervisor, 'search_supervisor', 1, array(), 0, '', 0, 0, 0, 0, '', 0, '', 'maxwidth200');
+    print '</td>';
 }
 if (! empty($arrayfields['u.datelastlogin']['checked']))
 {

From ce9e1dfb98701836af7006c37eb4aa85276024b6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Jun 2017 11:37:04 +0200
Subject: [PATCH 219/438] Fix tag non closed

---
 htdocs/modulebuilder/template/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/modulebuilder/template/README.md b/htdocs/modulebuilder/template/README.md
index ba723bf5195..3d2d8f6102b 100644
--- a/htdocs/modulebuilder/template/README.md
+++ b/htdocs/modulebuilder/template/README.md
@@ -3,4 +3,4 @@
 ## Features
 MyModuleDescription
 
-Other modules are available on <a href="https://www.dolistore.com target="_new">Dolistore.com</a>.
+Other modules are available on <a href="https://www.dolistore.com" target="_new">Dolistore.com</a>.

From 0b6d7a5b575f2ddb74607659d85adff363c2d6da Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Jun 2017 11:44:12 +0200
Subject: [PATCH 220/438] Modulebuilder

---
 htdocs/admin/modules.php                      |  11 +++-
 htdocs/langs/en_US/modulebuilder.lang         |   9 ++-
 htdocs/modulebuilder/index.php                |  62 +++++++++++++++---
 htdocs/modulebuilder/template/admin/about.php |   6 +-
 htdocs/modulebuilder/template/admin/setup.php |   4 +-
 ...{object_mytest.png => object_mymodule.png} | Bin
 6 files changed, 73 insertions(+), 19 deletions(-)
 rename htdocs/modulebuilder/template/img/{object_mytest.png => object_mymodule.png} (100%)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 57ed97c9b20..8bea1c6dcb7 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -865,6 +865,7 @@ if ($mode == 'deploy')
     	print '<br>';
     }
 
+    print '<br>';
 
     if ($allowfromweb >= 0)
     {
@@ -885,12 +886,20 @@ if ($mode == 'deploy')
     	if ($allowfromweb == 1)
     	{
     		print $langs->trans("UnpackPackageInModulesRoot",$dirins).'<br>';
-    		print '<form enctype="multipart/form-data" method="POST" class="noborder" action="'.$_SERVER["PHP_SELF"].'" name="forminstall">';
+
+    		print '<br>';
+
+            print '<form enctype="multipart/form-data" method="POST" class="noborder" action="'.$_SERVER["PHP_SELF"].'" name="forminstall">';
     		print '<input type="hidden" name="action" value="install">';
     		print '<input type="hidden" name="mode" value="deploy">';
     		print $langs->trans("YouCanSubmitFile").' <input type="file" name="fileinstall"> ';
     		print '<input type="submit" name="send" value="'.dol_escape_htmltag($langs->trans("Send")).'" class="button">';
     		print '</form>';
+
+            print '<br>';
+            print '<br>';
+
+            print '<div class="center"><div class="logo_setup"></div></div>';
     	}
     	else
     	{
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index b717bafc57c..adce0950b88 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -11,7 +11,14 @@ ModuleBuilderDescobjects=Define here the new objects you want to manage with you
 ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
 ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with your module.
 ModuleBuilderDesctriggers=This is the view of triggers provided by your module. To include code executed when a triggered business event is launched, just edit this file with your IDE.
+ModuleBuilderDeschooks=This tab is dedicated to hooks.
+ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module. Just click on button to get your module package file.
+ModuleBuilderDescdangerzone=You can delete your module. WARNING: All files of module will be definetly lost !
+DangerZone=Danger zone
 BuildPackage=Build package
 ModuleIsNotActive=This module was not activated yet (go into Home-Setup-Module to make it live)
-ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
\ No newline at end of file
+ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
+DescriptionLong=Long description
+EditorName=Name of editor
+EditorUrl=URL of editor
\ No newline at end of file
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 5b3a33c9d41..8cabec1bdfb 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -113,6 +113,19 @@ if ($dirins && $action == 'initmodule' && $modulename)
     }
 }
 
+if ($dirins && $action == 'confirm_delete')
+{
+    $modulelowercase=strtolower($module);
+
+    // Dir for module
+    $dir = $dirins.'/'.$modulelowercase;
+
+    dol_delete_dir_recursive($dir);
+
+    header("Location: ".DOL_URL_ROOT.'/modulebuilder/index.php?module=initmodule');
+    exit;
+}
+
 if ($dirins && $action == 'generatepackage')
 {
     $modulelowercase=strtolower($module);
@@ -373,16 +386,31 @@ elseif (! empty($module))
         $head2[$h][2] = 'permissions';
         $h++;
 
+        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=hooks&module='.$module;
+        $head2[$h][1] = $langs->trans("Hooks");
+        $head2[$h][2] = 'hooks';
+        $h++;
+
         $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=triggers&module='.$module;
         $head2[$h][1] = $langs->trans("Triggers");
         $head2[$h][2] = 'triggers';
         $h++;
 
+        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=widgets&module='.$module;
+        $head2[$h][1] = $langs->trans("Widgets");
+        $head2[$h][2] = 'widgets';
+        $h++;
+
         $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=buildpackage&module='.$module;
         $head2[$h][1] = $langs->trans("BuildPackage");
         $head2[$h][2] = 'buildpackage';
         $h++;
 
+        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=dangerzone&module='.$module;
+        $head2[$h][1] = $langs->trans("DangerZone");
+        $head2[$h][2] = 'dangerzone';
+        $h++;
+
         print $modulestatusinfo.'<br><br>';
 
         dol_fiche_head($head2, $tab, '', -1, '');
@@ -421,7 +449,7 @@ elseif (! empty($module))
 
         	print '<tr><td>';
         	print $langs->trans("Family");
-        	print "<br>'crm','financial','hr','projects','products','ecm','technic','interface','other'";
+        	//print "<br>'crm','financial','hr','projects','products','ecm','technic','interface','other'";
         	print '</td><td>';
         	print $moduleobj->family;
         	print '</td></tr>';
@@ -445,7 +473,7 @@ elseif (! empty($module))
         	print '</td></tr>';
 
         	print '<tr><td>';
-        	print $langs->trans("LongDescription");
+        	print $langs->trans("DescriptionLong");
         	print '</td><td>';
         	print $moduleobj->getDescLong();
         	print '</td></tr>';
@@ -453,14 +481,6 @@ elseif (! empty($module))
         	print '</table>';
 
         	print '</div>';
-
-        	print '<br><br>';
-        	print '<form name="delete">';
-        	print '<input type="hidden" name="action" value="confirm_delete">';
-        	print '<input type="hidden" name="tab" value="'.dol_escape_htmltag($tab).'">';
-        	print '<input type="hidden" name="module" value="'.dol_escape_htmltag($module).'">';
-        	print '<input type="submit" class="buttonDelete" value="'.$langs->trans("Delete").'"'.($dirins?'':' disabled="disabled"').'>';
-        	print '</form>';
         }
 
         if ($tab == 'objects')
@@ -483,6 +503,12 @@ elseif (! empty($module))
 
         }
 
+        if ($tab == 'hooks')
+        {
+            print $langs->trans("FeatureNotYetAvailable");
+
+        }
+
         if ($tab == 'triggers')
         {
         	require_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
@@ -520,6 +546,12 @@ elseif (! empty($module))
 			print '</div>';
         }
 
+        if ($tab == 'widget')
+        {
+    		print $langs->trans("FeatureNotYetAvailable");
+
+        }
+
         if ($tab == 'buildpackage')
         {
             if (! class_exists('ZipArchive') && ! defined('ODTPHP_PATHTOPCLZIP'))
@@ -536,6 +568,16 @@ elseif (! empty($module))
         	print '</form>';
         }
 
+        if ($tab == 'dangerzone')
+        {
+            print '<form name="delete">';
+            print '<input type="hidden" name="action" value="confirm_delete">';
+            print '<input type="hidden" name="tab" value="'.dol_escape_htmltag($tab).'">';
+            print '<input type="hidden" name="module" value="'.dol_escape_htmltag($module).'">';
+            print '<input type="submit" class="buttonDelete" value="'.$langs->trans("Delete").'"'.($dirins?'':' disabled="disabled"').'>';
+            print '</form>';
+        }
+
         dol_fiche_end();
     }
 }
diff --git a/htdocs/modulebuilder/template/admin/about.php b/htdocs/modulebuilder/template/admin/about.php
index 844c444bad2..1306b0aef6a 100644
--- a/htdocs/modulebuilder/template/admin/about.php
+++ b/htdocs/modulebuilder/template/admin/about.php
@@ -20,8 +20,6 @@
  * \file    htdocs/modulebuilder/template/admin/about.php
  * \ingroup mymodule
  * \brief   About page of module MyModule.
- *
- * MyModuleDescription.
  */
 
 // Load Dolibarr environment
@@ -84,8 +82,8 @@ echo $langs->trans("MyModuleAboutPage");
 
 echo '<br>';
 
-require_once '../core/modulebuilder/mymodule/core/modules/modMyModule.class.php';
-$tmpmodule = new MyModule($db);
+dol_include_once('/mymodule/core/modules/modMyModule.class.php');
+$tmpmodule = new modMyModule($db);
 print $tmpmodule->getDescLong();
 
 // Page end
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index b3f2cc87d73..421452f06e8 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -19,9 +19,7 @@
 /**
  * \file    htdocs/modulebuilder/template/admin/setup.php
  * \ingroup mymodule
- * \brief   Example module setup page.
- *
- * Put detailed description here.
+ * \brief   MyModule setup page.
  */
 
 // Load Dolibarr environment
diff --git a/htdocs/modulebuilder/template/img/object_mytest.png b/htdocs/modulebuilder/template/img/object_mymodule.png
similarity index 100%
rename from htdocs/modulebuilder/template/img/object_mytest.png
rename to htdocs/modulebuilder/template/img/object_mymodule.png

From 73977639ac44215c6680110fc3d5f4babdf761fa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Jun 2017 18:34:39 +0200
Subject: [PATCH 221/438] Update doc

---
 README-FR.md | 31 ++++++++++++++++++++++++++++---
 README.md    | 14 ++++++++++++--
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/README-FR.md b/README-FR.md
index 4129e2b7452..8e6a2c5aac0 100644
--- a/README-FR.md
+++ b/README-FR.md
@@ -98,7 +98,10 @@ Voir fichier ChangeLog.
 - Rapports
 - Imports/Exports des données
 - Connectivité LDAP
-- De nombreuses autres fonctionnalités issues de modules officiels ou non (AWStats, Bittorrent, Gravatar, Google, Webcalendar...) 
+- Intégratn de ClickToDial
+- Intégration RSS
+- Intégation Skype
+- Intégration de système de paiements (Paypal, Strip, Paybox...)
 - …
 
 ### Divers:
@@ -114,17 +117,39 @@ Voir fichier ChangeLog.
 - Code simple et facilement personnalisable (pas de framework lourd; mécanisme de hook et triggers).
 - APIs.
 - Génération PDF et ODT des éléments (factures, propositions commerciales, commandes, bons expéditions, etc...)
+- …
+
+### Extension
+
+Dolibarr peut aussi être étendu à volonté avec l'ajout de module/applications externes développées par des développeus tiers, disponible sur [DoliStore](https://www.dolistore.com).
 
 
-## CE QUE DOLIBARR NE PEUT PAS FAIRE (TACHES A FAIRE)
+## CE QUE DOLIBARR NE PEUT PAS (ENCORE) FAIRE
 
 Voici un liste de fonctionnalites pas encore gérées par Dolibarr:
 - Dolibarr ne contient pas de module de Gestion de la paie.
 - Les tâches du module de gestion de projets n'ont pas de dépendances entre elle.
-- Dolibarr ne contient pas de Webmail.
+- Dolibarr n'embarque pas de Webmail intégré nativement.
 - Dolibarr ne fait pas le café (pas encore). 
 
 
+## DOCUMENTATION
+
+Les documentations utilisateur, développeur et traducteur sont disponible sous forme de ressources de la communautés via la site [Wiki](https://wiki.dolibarr.org).
+
+
+## CONTRIBUTING
+
+Voir le fichier [CONTRIBUTING](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)
+
+
+## CREDITS
+
+Dolibarr est le résultat du travail de nombreux contributeurs depuis des années et utilise des librairies d'autres contributeurs.
+
+Voir le fichier [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT)
+
+
 ## ACTUALITES ET RESEAUX SOCIAUX
 
 Suivez le projet Dolibarr project sur les réseaux francophones
diff --git a/README.md b/README.md
index 29a7d4f9545..fbbbdddf665 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,7 @@ You can use it as a standalone application or as a web application to be able to
 
 ![ScreenShot](https://www.dolibarr.org/images/dolibarr_screenshot1_640x400.png)
 
+
 ## LICENSE
 
 Dolibarr is released under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version (GPL-3+).
@@ -20,6 +21,7 @@ See the [COPYING](https://github.com/Dolibarr/dolibarr/blob/develop/COPYING) fil
 
 Other licenses apply for some included dependencies. See [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT) for a full list.
 
+
 ## INSTALLING
 
 ### Download
@@ -67,6 +69,7 @@ You can use a Web server and a supported database (MariaDb, MySql or Postgresql)
    
 - Follow the installer instructions
 
+
 ## UPGRADING
 
 - Overwrite all old files from 'dolibarr' directory with files provided into the new version's package.
@@ -75,10 +78,12 @@ You can use a Web server and a supported database (MariaDb, MySql or Postgresql)
 
 *Note: migration process can safely be done multiple times by calling the page /install/index.php*
 
+
 ## WHAT'S NEW
 
 See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog) file.
 
+
 ## FEATURES
 
 ### Main application/modules (all optional)
@@ -120,7 +125,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 - ClickToDial integration
 - RSS integration
 - Skype integration
-- Payment platforms integration (PayBox, PayPal)
+- Payment platforms integration (PayPal, Stripe, Paybox...)
 - …
 
 ### Other general features
@@ -149,29 +154,34 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 
 Dolibarr can be extended with a lot of other external application or modules from third party developers available at the [DoliStore](https://www.dolistore.com).
 
+
 ## FUTURE
 
 These are features that Dolibarr does **not** yet fully support:
 
 - Tasks dependencies in projects
 - Payroll module
-- Webmail
+- No native embedded Webmail
 - Dolibarr can't do coffee (yet)
 
+
 ## DOCUMENTATION
 
 Administrator, user, developer and translator's documentations are available along with other community resources on the [Wiki](https://wiki.dolibarr.org).
 
+
 ## CONTRIBUTING
 
 See file [CONTRIBUTING](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)
 
+
 ## CREDITS
 
 Dolibarr is the work of many contributors over the years and uses some fine libraries.
 
 See [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT) file.
 
+
 ## NEWS AND SOCIAL NETWORKS
 
 Follow Dolibarr project on:

From 71c0be20b972d0fd3efac0da60a2980d92bb83a5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Jun 2017 10:30:32 +0200
Subject: [PATCH 222/438] Change data structure for bookkeeping v6

---
 dev/translation/erp_comparison_translation.txt        |  4 ++--
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql        | 11 ++++++++++-
 .../mysql/tables/llx_accounting_bookkeeping.sql       |  5 +++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/dev/translation/erp_comparison_translation.txt b/dev/translation/erp_comparison_translation.txt
index daa1bc79e92..fb96c17e3f9 100644
--- a/dev/translation/erp_comparison_translation.txt
+++ b/dev/translation/erp_comparison_translation.txt
@@ -8,7 +8,7 @@ Contact/address		Contact person		Partner/Contact (individual)
 Financial			??					Invoicing
 
 Income / Expense	??					Profit / Loss
-Balance									Net profit
-
+Balance				??					Net profit
+Subledger account	Subledger account	??
 
 
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index bc09bf25ca3..46e3b698100 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -188,9 +188,18 @@ ALTER TABLE llx_bank_account ADD CONSTRAINT fk_bank_account_accountancy_journal
 
 --Update general ledger for FEC format & harmonization
 ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN code_tiers varchar(32);
+ALTER TABLE llx_accounting_bookkeeping CHANGE COLUMN code_tiers thirdparty_code varchar(32);
+
+--Subledger account
+ALTER TABLE llx_accounting_bookkeeping ADD COLUMN subledger_account varchar(32);
+ALTER TABLE llx_accounting_bookkeeping CHANGE COLUMN thirdparty_label subledger_label varchar(255);    	-- If field was already created, rename it	
+ALTER TABLE llx_accounting_bookkeeping ADD COLUMN subledger_label varchar(255) AFTER subledger_account;	-- If field dod not exists yet
+
+update llx_accounting_bookkeeping set subledger_account = numero_compte where subledger_account IS NULL;
+
 ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN label_compte varchar(255);
 ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN code_journal varchar(32);
-ALTER TABLE llx_accounting_bookkeeping ADD COLUMN thirdparty_label varchar(255) AFTER code_tiers;
+
 ALTER TABLE llx_accounting_bookkeeping ADD COLUMN label_operation varchar(255) AFTER label_compte;
 ALTER TABLE llx_accounting_bookkeeping ADD COLUMN multicurrency_amount double AFTER sens;
 ALTER TABLE llx_accounting_bookkeeping ADD COLUMN multicurrency_code varchar(255) AFTER multicurrency_amount;
diff --git a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
index 651fee6c339..ad1160c356d 100644
--- a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
@@ -26,8 +26,9 @@ CREATE TABLE llx_accounting_bookkeeping
   doc_ref               varchar(300) NOT NULL,		-- 					| facture_client/reglement_client/... reference number
   fk_doc                integer NOT NULL,			-- 					| facture_client/reglement_client/... rowid
   fk_docdet             integer NOT NULL,			-- 					| facture_client/reglement_client/... line rowid
-  code_tiers            varchar(32),				-- FEC:CompAuxNum	| account number of auxiliary account
-  thirdparty_label      varchar(255),				-- FEC:CompAuxLib	| label of auxiliary account
+  thirdparty_code       varchar(32),                -- Third party code (customer or supplier) when record is saved (may help debug) 
+  subledger_account     varchar(32),				-- FEC:CompAuxNum	| account number of subledger account
+  subledger_label       varchar(255),				-- FEC:CompAuxLib	| label of subledger account
   numero_compte         varchar(32) NOT NULL,		-- FEC:CompteNum	| account number
   label_compte          varchar(255) NOT NULL,		-- FEC:CompteLib	| label of account
   label_operation       varchar(255),				-- FEC:EcritureLib	| label of the operation

From 333304934102fd3afec2ccf5e2d2ff6e400a7205 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Thu, 15 Jun 2017 11:11:49 +0200
Subject: [PATCH 223/438] Fix total aren't aligned

---
 htdocs/compta/facture.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 9bb97d8ff0b..2d0208d0c2b 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -3524,7 +3524,7 @@ else if ($id > 0 || ! empty($ref))
             }
             
             print '<tr ' . $bc[$var] . '>';
-            print '<td colspan="2" align="right"></td>';
+            print '<td colspan="3" align="right"></td>';
             print '<td align="right"><b>' . price($total_prev_ht) . '</b></td>';
             print '<td align="right"><b>' . price($total_prev_ttc) . '</b></td>';
             print '<td width="18">&nbsp;</td>';
@@ -3564,7 +3564,7 @@ else if ($id > 0 || ! empty($ref))
             }
             
             print '<tr ' . $bc[$var] . '>';
-            print '<td colspan="2" align="right"></td>';
+            print '<td colspan="3" align="right"></td>';
             print '<td align="right"><b>' . price($total_next_ht) . '</b></td>';
             print '<td align="right"><b>' . price($total_next_ttc) . '</b></td>';
             print '<td width="18">&nbsp;</td>';

From 4009b1837cf1db251c8c5bab6fe185a1960be279 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Jun 2017 11:17:02 +0200
Subject: [PATCH 224/438] Fix permissions

---
 htdocs/societe/class/api_contacts.class.php | 55 ++++++++++++---------
 1 file changed, 33 insertions(+), 22 deletions(-)

diff --git a/htdocs/societe/class/api_contacts.class.php b/htdocs/societe/class/api_contacts.class.php
index ad82db3e008..58fe15cf282 100644
--- a/htdocs/societe/class/api_contacts.class.php
+++ b/htdocs/societe/class/api_contacts.class.php
@@ -22,14 +22,14 @@ use Luracast\Restler\RestException;
 /**
  * API class for contacts
  *
- * @access protected 
+ * @access protected
  * @class  DolibarrApiAccess {@requires user,external}
  */
 class Contacts extends DolibarrApi
 {
 	/**
 	 *
-	 * @var array   $FIELDS     Mandatory fields, checked when create and update object 
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
 	 */
 	static $FIELDS = array(
 		'lastname'
@@ -56,13 +56,13 @@ class Contacts extends DolibarrApi
 	 *
 	 * @param 	int 	$id ID of contact
 	 * @return 	array|mixed data without useless information
-	 * 
+	 *
 	 * @throws 	RestException
 	 */
 	function get($id) {
 		if (!DolibarrApiAccess::$user->rights->societe->contact->lire)
 		{
-			throw new RestException(401);
+			throw new RestException(401, 'No permission to read contacts');
 		}
 
 		$result = $this->contact->fetch($id);
@@ -81,9 +81,9 @@ class Contacts extends DolibarrApi
 
 	/**
 	 * List contacts
-	 * 
+	 *
 	 * Get a list of contacts
-	 * 
+	 *
 	 * @param string	$sortfield	        Sort field
 	 * @param string	$sortorder	        Sort order
 	 * @param int		$limit		        Limit for list
@@ -91,7 +91,7 @@ class Contacts extends DolibarrApi
      * @param string   	$thirdparty_ids	    Thirdparty ids to filter projects of. {@example '1' or '1,2,3'} {@pattern /^[0-9,]*$/i}
      * @param string    $sqlfilters         Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
 	 * @return array                        Array of contact objects
-     * 
+     *
 	 * @throws RestException
 	 */
 	function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 0, $page = 0, $thirdparty_ids = '', $sqlfilters = '') {
@@ -99,6 +99,11 @@ class Contacts extends DolibarrApi
 
 		$obj_ret = array();
 
+		if (!DolibarrApiAccess::$user->rights->societe->contact->lire)
+		{
+		    throw new RestException(401, 'No permission to read contacts');
+		}
+
         // case of external user, $thirdparty_ids param is ignored and replaced by user's socid
 		$socids = DolibarrApiAccess::$user->societe_id ? DolibarrApiAccess::$user->societe_id : $thirdparty_ids;
 
@@ -111,7 +116,7 @@ class Contacts extends DolibarrApi
 		$sql.= " FROM " . MAIN_DB_PREFIX . "socpeople as t";
 		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
 			// We need this table joined to the select in order to filter by sale
-			$sql.= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc"; 
+			$sql.= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
 		}
 		$sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s ON t.fk_soc = s.rowid";
 		$sql.= ' WHERE t.entity IN (' . getEntity('socpeople') . ')';
@@ -127,7 +132,7 @@ class Contacts extends DolibarrApi
 			$sql .= " AND sc.fk_user = " . $search_sale;
 		}
 	    // Add sql filters
-        if ($sqlfilters) 
+        if ($sqlfilters)
         {
             if (! DolibarrApi::_checkFilters($sqlfilters))
             {
@@ -136,7 +141,7 @@ class Contacts extends DolibarrApi
 	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
             $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
-		
+
 		$sql.= $db->order($sortfield, $sortorder);
 
 		if ($limit)
@@ -164,7 +169,7 @@ class Contacts extends DolibarrApi
 				}
 				$i++;
 			}
-		} 
+		}
 		else {
 			throw new RestException(503, 'Error when retreive contacts : ' . $sql);
 		}
@@ -184,7 +189,7 @@ class Contacts extends DolibarrApi
 	function post($request_data = NULL) {
 		if (!DolibarrApiAccess::$user->rights->societe->contact->creer)
 		{
-			throw new RestException(401);
+			throw new RestException(401, 'No permission to create/update contacts');
 		}
 		// Check mandatory fields
 		$result = $this->_validate($request_data);
@@ -203,13 +208,13 @@ class Contacts extends DolibarrApi
 	 * Update contact
 	 *
 	 * @param int   $id             Id of contact to update
-	 * @param array $request_data   Datas   
-	 * @return int 
+	 * @param array $request_data   Datas
+	 * @return int
 	 */
 	function put($id, $request_data = NULL) {
 		if (!DolibarrApiAccess::$user->rights->societe->contact->creer)
 		{
-			throw new RestException(401);
+			throw new RestException(401, 'No permission to create/update contacts');
 		}
 
 		$result = $this->contact->fetch($id);
@@ -244,7 +249,7 @@ class Contacts extends DolibarrApi
 	function delete($id) {
 		if (!DolibarrApiAccess::$user->rights->societe->contact->supprimer)
 		{
-			throw new RestException(401);
+			throw new RestException(401, 'No permission to delete contacts');
 		}
 		$result = $this->contact->fetch($id);
 		if (!$result)
@@ -273,23 +278,29 @@ class Contacts extends DolibarrApi
 	    //if (!DolibarrApiAccess::$user->rights->user->user->creer) {
 	    //throw new RestException(401);
 	    //}
-	
+
 	    if (!isset($request_data["login"]))
 	    				throw new RestException(400, "login field missing");
 	    if (!isset($request_data["password"]))
 	    				throw new RestException(400, "password field missing");
+
 	    if (!DolibarrApiAccess::$user->rights->societe->contact->lire) {
-	        throw new RestException(401);
+	        throw new RestException(401, 'No permission to read contacts');
 	    }
+	    if (!DolibarrApiAccess::$user->rights->user->user->creer) {
+	        throw new RestException(401, 'No permission to create user');
+	    }
+
 	    $contact = new Contact($this->db);
 	    $contact->fetch($id);
 	    if ($contact->id <= 0) {
 	        throw new RestException(404, 'Contact not found');
 	    }
-	
+
 	    if (!DolibarrApi::_checkAccessToResource('contact', $contact->id, 'socpeople&societe')) {
 	        throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
 	    }
+
 	    // Check mandatory fields
 	    $login = $request_data["login"];
 	    $password = $request_data["password"];
@@ -300,10 +311,10 @@ class Contacts extends DolibarrApi
 	    }
 	    // password parameter not used in create_from_contact
 	    $useraccount->setPassword($useraccount,$password);
-	
+
 	    return $result;
 	}
-	
+
     /**
      * Get categories for a contact
      *
@@ -324,7 +335,7 @@ class Contacts extends DolibarrApi
 
 	/**
 	 * Validate fields before create or update object
-     * 
+     *
 	 * @param   array|null     $data   Data to validate
 	 * @return  array
 	 * @throws RestException

From 097be322a60c9365f12dd364ac1bd878f15d6e55 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Jun 2017 19:29:00 +0200
Subject: [PATCH 225/438] Modify code to match new v6 structure.

---
 htdocs/accountancy/admin/categories_list.php  |  22 +-
 htdocs/accountancy/admin/defaultaccounts.php  |  94 +++++--
 htdocs/accountancy/admin/journals_list.php    |  27 +-
 htdocs/accountancy/bookkeeping/card.php       |  46 ++--
 htdocs/accountancy/bookkeeping/list.php       |  38 +--
 .../accountancy/bookkeeping/listbyaccount.php |  37 ++-
 htdocs/accountancy/bookkeeping/listbyyear.php |  58 +++--
 .../class/accountancycategory.class.php       |  20 +-
 .../class/accountancyexport.class.php         |  34 +--
 .../class/accountingjournal.class.php         |  16 +-
 .../accountancy/class/bookkeeping.class.php   | 234 +++++++++++-------
 htdocs/accountancy/index.php                  |   2 -
 htdocs/accountancy/journal/bankjournal.php    |  28 +--
 .../journal/expensereportsjournal.php         |  15 +-
 .../accountancy/journal/purchasesjournal.php  |  21 +-
 htdocs/accountancy/journal/sellsjournal.php   |  24 +-
 htdocs/core/modules/modAccounting.class.php   |  12 +-
 .../install/mysql/migration/5.0.0-6.0.0.sql   |   1 +
 htdocs/langs/en_US/accountancy.lang           |  24 +-
 htdocs/langs/en_US/compta.lang                |   6 +-
 20 files changed, 433 insertions(+), 326 deletions(-)

diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index 1bf9a693efd..b10015baa6c 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -151,7 +151,7 @@ $sourceList=array();
 
 if (GETPOST('button_removefilter') || GETPOST('button_removefilter.x') || GETPOST('button_removefilter_x'))
 {
-    $search_country_id = '';    
+    $search_country_id = '';
 }
 
 // Actions add or modify an entry into a dictionary
@@ -479,7 +479,7 @@ if ($id)
         else $sql.=" WHERE ";
         $sql.= " c.rowid = ".$search_country_id;
     }
-    
+
     if ($sortfield)
     {
         // If sort order is "country", we use country_code instead
@@ -506,7 +506,7 @@ if ($id)
     print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from','alpha')).'">';
-    
+
     print '<table class="noborder" width="100%">';
 
     // Form to add a new line
@@ -546,9 +546,9 @@ if ($id)
             if ($fieldlist[$field]=='accountancy_code_buy'){ $valuetoshow=$langs->trans("AccountancyCodeBuy"); }
             if ($fieldlist[$field]=='pcg_version' || $fieldlist[$field]=='fk_pcg_version') { $valuetoshow=$langs->trans("Pcg_version"); }
             if ($fieldlist[$field]=='range_account')   { $valuetoshow=$langs->trans("Range"); }
-			if ($fieldlist[$field]=='sens')            { $valuetoshow=$langs->trans("Sens"); }
+			if ($fieldlist[$field]=='sens')            { $valuetoshow=$langs->trans("Direction"); }
 			if ($fieldlist[$field]=='category_type')   { $valuetoshow=$langs->trans("Calculated"); }
-				
+
             if ($valuetoshow != '')
             {
                 print '<td align="'.$align.'">';
@@ -617,7 +617,7 @@ if ($id)
         if ($sortorder) $paramwithsearch.= '&sortorder='.$sortorder;
         if ($sortfield) $paramwithsearch.= '&sortfield='.$sortfield;
         if (GETPOST('from')) $paramwithsearch.= '&from='.GETPOST('from','alpha');
-        
+
         // There is several pages
         if ($num > $listlimit)
         {
@@ -632,9 +632,9 @@ if ($id)
         foreach ($fieldlist as $field => $value)
         {
             $showfield=1;							  	// By defaut
-            
+
             if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='country_id') { $showfield=0; }
-            
+
             if ($showfield)
             {
                 if ($value == 'country')
@@ -661,7 +661,7 @@ if ($id)
     	}
     	print '</td>';
     	print '</tr>';
-    	
+
     	// Title of lines
         print '<tr class="liste_titre">';
         foreach ($fieldlist as $field => $value)
@@ -700,7 +700,7 @@ if ($id)
             if ($fieldlist[$field]=='pcg_subtype')     { $valuetoshow=$langs->trans("Pcg_subtype"); }
         	if ($fieldlist[$field]=='type_template')   { $valuetoshow=$langs->trans("TypeOfTemplate"); }
 			if ($fieldlist[$field]=='range_account')   { $valuetoshow=$langs->trans("Range"); }
-			if ($fieldlist[$field]=='sens')            { $valuetoshow=$langs->trans("Sens"); }
+			if ($fieldlist[$field]=='sens')            { $valuetoshow=$langs->trans("Direction"); }
 			if ($fieldlist[$field]=='category_type')   { $valuetoshow=$langs->trans("Calculated"); }
             // Affiche nom du champ
             if ($showfield)
@@ -754,7 +754,7 @@ if ($id)
                     {
                         foreach ($fieldlist as $field => $value)
                         {
-                            
+
                             $showfield=1;
                         	$align="left";
                             $valuetoshow=$obj->{$fieldlist[$field]};
diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php
index aaf98a0fa8b..ef39252ff87 100644
--- a/htdocs/accountancy/admin/defaultaccounts.php
+++ b/htdocs/accountancy/admin/defaultaccounts.php
@@ -50,23 +50,26 @@ if (! empty($user->rights->accountancy->chartofaccount))
 $action = GETPOST('action', 'alpha');
 
 
+$list_account_main = array (
+    'ACCOUNTING_ACCOUNT_SUPPLIER',
+    'ACCOUNTING_ACCOUNT_CUSTOMER',
+);
+
 $list_account = array (
-		'ACCOUNTING_ACCOUNT_SUPPLIER',
-		'ACCOUNTING_ACCOUNT_CUSTOMER',
-		'SALARIES_ACCOUNTING_ACCOUNT_PAYMENT',
-		'ACCOUNTING_PRODUCT_BUY_ACCOUNT',
-		'ACCOUNTING_PRODUCT_SOLD_ACCOUNT',
-		'ACCOUNTING_SERVICE_BUY_ACCOUNT',
-		'ACCOUNTING_SERVICE_SOLD_ACCOUNT',
-		'ACCOUNTING_VAT_BUY_ACCOUNT',
-		'ACCOUNTING_VAT_SOLD_ACCOUNT',
-		'ACCOUNTING_VAT_PAY_ACCOUNT',
-		'ACCOUNTING_ACCOUNT_SUSPENSE',
-		'ACCOUNTING_ACCOUNT_TRANSFER_CASH',
-		'DONATION_ACCOUNTINGACCOUNT',
-		'LOAN_ACCOUNTING_ACCOUNT_CAPITAL',
-		'LOAN_ACCOUNTING_ACCOUNT_INTEREST',
-		'LOAN_ACCOUNTING_ACCOUNT_INSURANCE'
+    'SALARIES_ACCOUNTING_ACCOUNT_PAYMENT',
+    'ACCOUNTING_PRODUCT_BUY_ACCOUNT',
+    'ACCOUNTING_PRODUCT_SOLD_ACCOUNT',
+    'ACCOUNTING_SERVICE_BUY_ACCOUNT',
+    'ACCOUNTING_SERVICE_SOLD_ACCOUNT',
+    'ACCOUNTING_VAT_BUY_ACCOUNT',
+    'ACCOUNTING_VAT_SOLD_ACCOUNT',
+    'ACCOUNTING_VAT_PAY_ACCOUNT',
+    'ACCOUNTING_ACCOUNT_SUSPENSE',
+    'ACCOUNTING_ACCOUNT_TRANSFER_CASH',
+    'DONATION_ACCOUNTINGACCOUNT',
+    'LOAN_ACCOUNTING_ACCOUNT_CAPITAL',
+    'LOAN_ACCOUNTING_ACCOUNT_INTEREST',
+    'LOAN_ACCOUNTING_ACCOUNT_INSURANCE'
 );
 
 
@@ -93,15 +96,23 @@ if (GETPOST('change_chart'))
 
 if ($action == 'update') {
 	$error = 0;
-	
-	foreach ( $list_account as $constname ) {
+
+	foreach ( $list_account_main as $constname ) {
 		$constvalue = GETPOST($constname, 'alpha');
-		
+
 		if (! dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
 			$error ++;
 		}
 	}
-	
+
+	foreach ( $list_account as $constname ) {
+	    $constvalue = GETPOST($constname, 'alpha');
+
+	    if (! dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
+	        $error ++;
+	    }
+	}
+
 	if (! $error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -114,11 +125,11 @@ if ($action == 'update') {
  * View
  */
 
-llxHeader();
-
 $form = new Form($db);
 $formaccounting = new FormAccounting($db);
 
+llxHeader();
+
 $linkback = '';
 print load_fiche_titre($langs->trans('MenuDefaultAccounts'), $linkback, 'title_accountancy');
 
@@ -129,18 +140,47 @@ print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">';
 print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 print '<input type="hidden" name="action" value="update">';
 
-// Define Chart of accounts
+
+// Define main accounts for thirdparty
 
 print '<table class="noborder" width="100%">';
 
-foreach ( $list_account as $key ) {
-	
+foreach ($list_account_main as $key) {
+
+    print '<tr class="oddeven value">';
+    // Param
+    $label = $langs->trans($key);
+    $keydesc=$key.'_Desc';
+
+    $htmltext = $langs->trans($keydesc);
+    print '<td class="fieldrequired" width="50%">';
+    print $form->textwithpicto($label, $htmltext);
+    print '</td>';
+    // Value
+    print '<td>';  // Do not force align=right, or it align also the content of the select box
+    print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
+    print '</td>';
+    print '</tr>';
+}
+
+
+print "</table>\n";
+
+
+print '<br>';
+
+// Define default accounts
+
+print '<table class="noborder" width="100%">';
+
+foreach ($list_account as $key) {
+
 	print '<tr class="oddeven value">';
 	// Param
 	$label = $langs->trans($key);
-	print '<td>' . $label . '</td>';
+	print '<td width="50%">' . $label . '</td>';
 	// Value
-	print '<td>';  // Do not force align=right, or it align also the content of the select box 
+	print '<td>';  // Do not force align=right, or it align also the content of the select box
 	print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
 	print '</td>';
 	print '</tr>';
diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index 68d5e5af5c0..dd1982d057c 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -127,7 +127,7 @@ complete_dictionary_with_modules($taborder,$tabname,$tablib,$tabsql,$tabsqlsort,
 
 // Define elementList and sourceList (used for dictionary type of contacts "llx_c_type_contact")
 $elementList = array();
-    // Must match ids defined into eldy.lib.php 
+    // Must match ids defined into eldy.lib.php
     $sourceList = array(
 			'1' => $langs->trans('AccountingJournalType1'),
 			'2' => $langs->trans('AccountingJournalType2'),
@@ -142,7 +142,7 @@ $elementList = array();
 
 if (GETPOST('button_removefilter') || GETPOST('button_removefilter.x') || GETPOST('button_removefilter_x'))
 {
-    $search_country_id = '';    
+    $search_country_id = '';
 }
 
 // Actions add or modify an entry into a dictionary
@@ -371,13 +371,6 @@ if ($id)
 
 print load_fiche_titre($titre,$linkback,$titlepicto);
 
-if (empty($id))
-{
-    print $langs->trans("DictionaryDesc");
-    print " ".$langs->trans("OnlyActiveElementsAreShown")."<br>\n";
-}
-print "<br>\n";
-
 
 // Confirmation de la suppression de la ligne
 if ($action == 'delete')
@@ -400,7 +393,7 @@ if ($id)
         else $sql.=" WHERE ";
         $sql.= " c.rowid = ".$search_country_id;
     }
-    
+
     if ($sortfield)
     {
         // If sort order is "country", we use country_code instead
@@ -427,7 +420,7 @@ if ($id)
     print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from','alpha')).'">';
-    
+
     print '<table class="noborder" width="100%">';
 
     // Form to add a new line
@@ -453,7 +446,7 @@ if ($id)
             	$valuetoshow=$langs->trans("Label");
             }
             if ($fieldlist[$field]=='nature')          { $valuetoshow=$langs->trans("Nature"); }
-				
+
             if ($valuetoshow != '')
             {
                 print '<td align="'.$align.'">';
@@ -522,7 +515,7 @@ if ($id)
         if ($sortorder) $paramwithsearch.= '&sortorder='.$sortorder;
         if ($sortfield) $paramwithsearch.= '&sortfield='.$sortfield;
         if (GETPOST('from')) $paramwithsearch.= '&from='.GETPOST('from','alpha');
-        
+
         // There is several pages
         if ($num > $listlimit)
         {
@@ -582,7 +575,7 @@ if ($id)
     	}
     	print '</td>';
     	print '</tr>';
-            
+
         if ($num)
         {
             // Lines with values
@@ -621,7 +614,7 @@ if ($id)
                     {
                         foreach ($fieldlist as $field => $value)
                         {
-                            
+
                             $showfield=1;
                         	$align="left";
                             $valuetoshow=$obj->{$fieldlist[$field]};
@@ -682,10 +675,10 @@ if ($id)
                     else print '<td>&nbsp;</td>';
 
                     print '<td></td>';
-                                         
+
                     print '</td>';
                 }
-                
+
                 print "</tr>\n";
                 $i++;
             }
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 4443fb959b2..3ef418e2e20 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -48,9 +48,9 @@ $piece_num = GETPOST("piece_num");
 $mesg = '';
 
 $account_number = GETPOST('account_number');
-$code_tiers = GETPOST('code_tiers');
-if ($code_tiers == - 1) {
-	$code_tiers = null;
+$subledger_account = GETPOST('subledger_account');
+if ($subledger_account == - 1) {
+	$subledger_account = null;
 }
 $label_compte = GETPOST('label_compte');
 $debit = price2num(GETPOST('debit'));
@@ -82,7 +82,7 @@ if ($action == "confirm_update") {
 			setEventMessages($book->error, $book->errors, 'errors');
 		} else {
 			$book->numero_compte = $account_number;
-			$book->code_tiers = $code_tiers;
+			$book->subledger_account = $subledger_account;
 			$book->label_compte = $label_compte;
 			$book->debit = $debit;
 			$book->credit = $credit;
@@ -119,7 +119,7 @@ else if ($action == "add") {
 		$book = new BookKeeping($db);
 
 		$book->numero_compte = $account_number;
-		$book->code_tiers = $code_tiers;
+		$book->subledger_account = $subledger_account;
 		$book->label_compte = $label_compte;
 		$book->debit = $debit;
 		$book->credit = $credit;
@@ -171,7 +171,7 @@ else if ($action == "confirm_delete") {
 
 else if ($action == "confirm_create") {
     $error = 0;
-    
+
     $book = new BookKeeping($db);
 
 	if (! GETPOST('next_num_mvt'))
@@ -179,7 +179,7 @@ else if ($action == "confirm_create") {
 	    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NumPiece")), null, 'errors');
 	    $error++;
 	}
-	
+
 	if (! $error)
 	{
     	$book->label_compte = '';
@@ -192,9 +192,9 @@ else if ($action == "confirm_create") {
     	$book->code_journal = GETPOST('code_journal');
     	$book->fk_doc = 0;
     	$book->fk_docdet = 0;
-    
+
     	$book->montant = 0;
-    
+
     	$result = $book->createStd($user);
     	if ($result < 0) {
     		setEventMessages($book->error, $book->errors, 'errors');
@@ -289,9 +289,9 @@ if ($action == 'create') {
 		print load_fiche_titre($langs->trans("UpdateMvts"), '<a href="list.php">' . $langs->trans('BackToList') . '</a>');
 
 		dol_fiche_head();
-		
+
 		print '<div class="fichecenter">';
-		
+
 		print '<table class="border" width="100%">';
 
 		print '<tr class="pair">';
@@ -306,12 +306,12 @@ if ($action == 'create') {
 
 		print '<tr class="pair">';
 		print '<td>' . $langs->trans("Codejournal") . '</td>';
-		print '<td>';	
+		print '<td>';
 		$accountingjournal = new AccountingJournal($db);
 		$accountingjournal->fetch('',$book->code_journal);
-		print $accountingjournal->getNomUrl(0,1,1,'',1);	
+		print $accountingjournal->getNomUrl(0,1,1,'',1);
 		print '</td></tr>';
-		
+
 		print '<tr class="impair">';
 		print '<td>' . $langs->trans("Docref") . '</td>';
 		print '<td>' . $book->doc_ref . '</td>';
@@ -335,13 +335,13 @@ if ($action == 'create') {
 		print '<td>' . $typelabel . '</td>';
 		print '</tr>';
 		print '</table>';
-		
+
 		print '</div>';
-		
+
 		dol_fiche_end();
 
 		print '<br>';
-		
+
 		$result = $book->fetch_all_per_mvt($piece_num);
 		if ($result < 0) {
 			setEventMessages($book->error, $book->errors, 'errors');
@@ -358,7 +358,7 @@ if ($action == 'create') {
 			print '<input type="hidden" name="fk_docdet" value="' . $book->fk_docdet . '">' . "\n";
 
 			$var=False;
-			
+
 			print "<table class=\"noborder\" width=\"100%\">";
 			if (count($book->linesmvt) > 0) {
 
@@ -368,7 +368,7 @@ if ($action == 'create') {
 				print '<tr class="liste_titre">';
 
 				print_liste_field_titre($langs->trans("AccountAccountingShort"));
-				print_liste_field_titre($langs->trans("Code_tiers"));
+				print_liste_field_titre($langs->trans("subledger_account"));
 				print_liste_field_titre($langs->trans("Labelcompte"));
 				print_liste_field_titre($langs->trans("Debit"), "", "", "", "", 'align="right"');
 				print_liste_field_titre($langs->trans("Credit"), "", "", "", "", 'align="right"');
@@ -390,7 +390,7 @@ if ($action == 'create') {
 						print $formaccounting->select_account($line->numero_compte, 'account_number', 0, array (), 1, 1, '');
 						print '</td>';
 						print '<td>';
-						print $formaccounting->select_auxaccount($line->code_tiers, 'code_tiers', 1);
+						print $formaccounting->select_auxaccount($line->subledger_account, 'subledger_account', 1);
 						print '</td>';
 						print '<td><input type="text" size="15" name="label_compte" value="' . $line->label_compte . '"/></td>';
 						print '<td align="right"><input type="text" size="6" name="debit" value="' . price($line->debit) . '"/></td>';
@@ -403,7 +403,7 @@ if ($action == 'create') {
 						print '</td>';
 					} else {
 						print '<td>' . length_accountg($line->numero_compte) . '</td>';
-						print '<td>' . length_accounta($line->code_tiers) . '</td>';
+						print '<td>' . length_accounta($line->subledger_account) . '</td>';
 						print '<td>' . $line->label_compte . '</td>';
 						print '<td align="right">' . price($line->debit) . '</td>';
 						print '<td align="right">' . price($line->credit) . '</td>';
@@ -423,7 +423,7 @@ if ($action == 'create') {
 					print "</tr>\n";
 				}
 
-				if ($total_debit != $total_credit) 
+				if ($total_debit != $total_credit)
 				{
 					setEventMessages(null, array($langs->trans('MvtNotCorrectlyBalanced', $total_credit, $total_debit)), 'warnings');
 				}
@@ -434,7 +434,7 @@ if ($action == 'create') {
 					print $formaccounting->select_account($account_number, 'account_number', 0, array (), 1, 1, '');
 					print '</td>';
 					print '<td>';
-					print $formaccounting->select_auxaccount($code_tiers, 'code_tiers', 1);
+					print $formaccounting->select_auxaccount($subledger_account, 'subledger_account', 1);
 					print '</td>';
 					print '<td><input type="text" size="15" name="label_compte" value="' . $label_compte . '"/></td>';
 					print '<td align="right"><input type="text" class="right maxwidth50" name="debit" value="' . price($debit) . '"/></td>';
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 26ab0fa4c4d..b6685248ca7 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -171,15 +171,15 @@ if (! empty($search_accountancy_code_end)) {
     $param .= '&search_accountancy_code_end=' . $search_accountancy_code_end;
 }
 if (! empty($search_accountancy_aux_code)) {
-    $filter['t.code_tiers'] = $search_accountancy_aux_code;
+    $filter['t.subledger_account'] = $search_accountancy_aux_code;
     $param .= '&search_accountancy_aux_code=' . $search_accountancy_aux_code;
 }
 if (! empty($search_accountancy_aux_code_start)) {
-    $filter['t.code_tiers>='] = $search_accountancy_aux_code_start;
+    $filter['t.subledger_account>='] = $search_accountancy_aux_code_start;
     $param .= '&search_accountancy_aux_code_start=' . $search_accountancy_aux_code_start;
 }
 if (! empty($search_accountancy_aux_code_end)) {
-    $filter['t.code_tiers<='] = $search_accountancy_aux_code_end;
+    $filter['t.subledger_account<='] = $search_accountancy_aux_code_end;
     $param .= '&search_accountancy_aux_code_end=' . $search_accountancy_aux_code_end;
 }
 if (! empty($search_mvt_label)) {
@@ -223,7 +223,7 @@ if ($action == 'delbookkeepingyearconfirm') {
 		$deljournal=0;
 	}
 
-	if (! empty($delyear) || ! empty($deljournal)) 
+	if (! empty($delyear) || ! empty($deljournal))
 	{
 		$result = $object->deleteByYearAndJournal($delyear,$deljournal);
 		if ($result < 0) {
@@ -365,7 +365,7 @@ $groupby = ' <a class="nohover" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/l
 
 print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $button, $result, $nbtotalofrecords, 'title_accountancy', 0, $groupby, '', $limit);
 
-print '<div class="tabsAction">' . "\n";
+print '<div class="tabsAction tabsActionNoBottom">' . "\n";
 print '<div class="inline-block divButAction"><a class="butAction" href="./card.php?action=create">' . $langs->trans("NewAccountingMvt") . '</a></div>';
 print '<div class="inline-block divButAction"><a class="butActionDelete" name="button_delmvt" href="'.$_SERVER["PHP_SELF"].'?action=delbookkeepingyear'.($param?'&'.$param:'').'">' . $langs->trans("DelBookKeeping") . '</a></div>';
 
@@ -376,26 +376,35 @@ print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre_filter">';
 print '<td class="liste_titre"><input type="text" name="search_mvt_num" size="6" value="' . dol_escape_htmltag($search_mvt_num) . '"></td>';
 print '<td class="liste_titre center">';
+print '<div class="nowrap">';
 print $langs->trans('From') . ': ';
 print $form->select_date($search_date_start, 'date_start', 0, 0, 1);
-print '<br>';
+print '</div>';
+print '<div class="nowrap">';
 print $langs->trans('to') . ': ';
 print $form->select_date($search_date_end, 'date_end', 0, 0, 1);
+print '</div>';
 print '</td>';
 print '<td class="liste_titre"><input type="text" name="search_doc_ref" size="8" value="' . dol_escape_htmltag($search_doc_ref) . '"></td>';
 print '<td class="liste_titre">';
+print '<div class="nowrap">';
 print $langs->trans('From');
 print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, '');
-print '<br>';
+print '</div>';
+print '<div class="nowrap">';
 print $langs->trans('to');
 print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array (), 1, 1, '');
+print '</div>';
 print '</td>';
 print '<td class="liste_titre">';
+print '<div class="nowrap">';
 print $langs->trans('From');
 print $formaccounting->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
-print '<br>';
+print '</div>';
+print '<div class="nowrap">';
 print $langs->trans('to');
 print $formaccounting->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
+print '</div>';
 print '</td>';
 print '<td class="liste_titre">';
 print '<input type="text" size="7" class="flat" name="search_mvt_label" value="' . $search_mvt_label . '"/>';
@@ -414,7 +423,7 @@ print_liste_field_titre($langs->trans("TransactionNumShort"), $_SERVER['PHP_SELF
 print_liste_field_titre($langs->trans("Docdate"), $_SERVER['PHP_SELF'], "t.doc_date", "", $param, 'align="center"', $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("Docref"), $_SERVER['PHP_SELF'], "t.doc_ref", "", $param, "", $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("AccountAccountingShort"), $_SERVER['PHP_SELF'], "t.numero_compte", "", $param, "", $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("Code_tiers"), $_SERVER['PHP_SELF'], "t.code_tiers", "", $param, "", $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("SubledgerAccount"), $_SERVER['PHP_SELF'], "t.subledger_account", "", $param, "", $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("Label"), $_SERVER['PHP_SELF'], "t.label_compte", "", $param, "", $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("Debit"), $_SERVER['PHP_SELF'], "t.debit", "", $param, 'align="right"', $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("Credit"), $_SERVER['PHP_SELF'], "t.credit", "", $param, 'align="right"', $sortfield, $sortorder);
@@ -440,14 +449,15 @@ foreach ($object->lines as $line ) {
 	print '<td align="center">' . dol_print_date($line->doc_date, 'day') . '</td>';
 	print '<td class="nowrap">' . $line->doc_ref . '</td>';
 	print '<td>' . length_accountg($line->numero_compte) . '</td>';
-	print '<td>' . length_accounta($line->code_tiers) . '</td>';
+	print '<td>' . length_accounta($line->subledger_account) . '</td>';
 	print '<td>' . $line->label_compte . '</td>';
-	print '<td align="right">' . price($line->debit) . '</td>';
-	print '<td align="right">' . price($line->credit) . '</td>';
+	print '<td align="right">' . ($line->debit ? price($line->debit) : ''). '</td>';
+	print '<td align="right">' . ($line->credit ? price($line->credit) : '') . '</td>';
 
 	$accountingjournal = new AccountingJournal($db);
-	$accountingjournal->fetch('',$line->code_journal);
-	print '<td align="center">' . $accountingjournal->getNomUrl(0,0,0,'',0) . '</td>';
+	$result = $accountingjournal->fetch('',$line->code_journal);
+	$journaltoshow = (($result > 0)?$accountingjournal->getNomUrl(0,0,0,'',0) : $line->code_journal);
+	print '<td align="center">' . $journaltoshow . '</td>';
 
 	print '<td align="center">';
 	print '<a href="./card.php?piece_num=' . $line->piece_num . '">' . img_edit() . '</a>&nbsp;';
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index b9a5526a7ab..7d0ba2280ea 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -75,10 +75,6 @@ if (empty($search_date_end)) $search_date_end = dol_mktime(0, 0, 0, 12, 31, dol_
 
 $object = new BookKeeping($db);
 
-$formaccounting = new FormAccounting($db);
-$formother = new FormOther($db);
-$form = new Form($db);
-
 
 $options = '';
 $filter = array ();
@@ -126,7 +122,7 @@ if (!GETPOST("button_removefilter_x") && !GETPOST("button_removefilter")) // Bot
  * Action
  */
 
-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All test are required to be compatible with all browsers
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
 {
 	$search_doc_date = '';
 	$search_accountancy_code = '';
@@ -156,6 +152,10 @@ if ($action == 'delmouvconfirm') {
  * View
  */
 
+$formaccounting = new FormAccounting($db);
+$formother = new FormOther($db);
+$form = new Form($db);
+
 $title_page = $langs->trans("Bookkeeping") . ' ' . strtolower($langs->trans("By")) . ' ' . $langs->trans("AccountAccounting");
 
 llxHeader('', $title_page);
@@ -217,7 +217,7 @@ if ( preg_match('/^asc/i', $sortorder) )
 else
   $sortorder = "desc";
 
-print '<div class="tabsAction">' . "\n";
+print '<div class="tabsAction tabsActionNoBottom">' . "\n";
 print '<div class="inline-block divButAction"><a class="butAction" href="./card.php?action=create">' . $langs->trans("NewAccountingMvt") . '</a></div>';
 print '</div>';
 
@@ -257,13 +257,12 @@ print "</tr>\n";
 
 print '</tr>';
 
-$var = True;
 
 $total_debit = 0;
 $total_credit = 0;
 $sous_total_debit = 0;
 $sous_total_credit = 0;
-$displayed_account_number = null;       // Start with undefined to be able to distinguish with empty 
+$displayed_account_number = null;       // Start with undefined to be able to distinguish with empty
 
 foreach ( $object->lines as $line ) {
 
@@ -272,10 +271,10 @@ foreach ( $object->lines as $line ) {
 
     $accountg = length_accountg($line->numero_compte);
 	//if (empty($accountg)) $accountg = '-';
-	
+
 	// Is it a break ?
     if ($accountg != $displayed_account_number || ! isset($displayed_account_number)) {
-        
+
         // Affiche un Sous-Total par compte comptable
         if (isset($displayed_account_number)) {
             print '<tr class="liste_total"><td align="right" colspan="5">'.$langs->trans("SubTotal").':</td><td class="nowrap" align="right">'.price($sous_total_debit).'</td><td class="nowrap" align="right">'.price($sous_total_credit).'</td>';
@@ -283,7 +282,7 @@ foreach ( $object->lines as $line ) {
             print "<td>&nbsp;</td>\n";
             print '</tr>';
         }
-        
+
         // Show the break account
         $colspan = 9;
         print "<tr>";
@@ -292,7 +291,7 @@ foreach ( $object->lines as $line ) {
         else print '<span class="error">'.$langs->trans("Unknown").'</span>';
         print '</td>';
         print '</tr>';
-        
+
         $displayed_account_number = $accountg;
         //if (empty($displayed_account_number)) $displayed_account_number='-';
         $sous_total_debit = 0;
@@ -303,24 +302,24 @@ foreach ( $object->lines as $line ) {
 	print '<td>&nbsp;</td>';
 	print '<td align="right"><a href="./card.php?piece_num=' . $line->piece_num . '">'.$line->piece_num.'</a></td>';
 	print '<td align="center">' . dol_print_date($line->doc_date, 'day') . '</td>';
-	
+
 	// TODO Add a link according to doc_type and fk_doc
 	print '<td class="nowrap">';
     //if ($line->doc_type == 'supplier_invoice')
     //if ($line->doc_type == 'customer_invoice')
 	print $line->doc_ref;
     print '</td>';
-    
+
     // Affiche un lien vers la facture client/fournisseur
     $doc_ref = preg_replace('/\(.*\)/', '', $line->doc_ref);
-    print strlen(length_accounta($line->code_tiers)) == 0 ? '<td>' . $line->label_compte . '</td>' : '<td>' . $line->label_compte . '<br /><span style="font-size:0.8em">(' . length_accounta($line->code_tiers) . ')</span></td>';
+    print strlen(length_accounta($line->subledger_account)) == 0 ? '<td>' . $line->label_compte . '</td>' : '<td>' . $line->label_compte . '<br /><span style="font-size:0.8em">(' . length_accounta($line->subledger_account) . ')</span></td>';
 
 
-	print '<td align="right">' . price($line->debit) . '</td>';
-	print '<td align="right">' . price($line->credit) . '</td>';
+	print '<td align="right">' . ($line->debit ? price($line->debit) :''). '</td>';
+	print '<td align="right">' . ($line->credit ? price($line->credit) : '') . '</td>';
 	print '<td align="center">' . $line->code_journal . '</td>';
 	print '<td align="center">';
-	print '<a href="./card.php?piece_num=' . $line->piece_num . '">' . img_edit() . '</a>&nbsp;';
+	print '<a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num=' . $line->piece_num . '">' . img_edit() . '</a>&nbsp;';
 	print '<a href="' . $_SERVER['PHP_SELF'] . '?action=delmouv&mvt_num=' . $line->piece_num . $options . '&page=' . $page . '">' . img_delete() . '</a>';
 	print '</td>';
 	print "</tr>\n";
@@ -355,6 +354,4 @@ print "</table>";
 print '</form>';
 
 llxFooter();
-
-
 $db->close();
diff --git a/htdocs/accountancy/bookkeeping/listbyyear.php b/htdocs/accountancy/bookkeeping/listbyyear.php
index f4134a2e028..e7e51ae67e0 100644
--- a/htdocs/accountancy/bookkeeping/listbyyear.php
+++ b/htdocs/accountancy/bookkeeping/listbyyear.php
@@ -52,14 +52,14 @@ $search_numero_compte_end = GETPOST('search_numero_compte_end', 'alpha');
 if ($search_numero_compte_end == - 1) {
 	$search_numero_compte_end = '';
 }
-$search_code_tiers = GETPOST('search_code_tiers', 'alpha');
-$search_code_tiers_start = GETPOST('search_code_tiers_start', 'alpha');
-if ($search_code_tiers_start == - 1) {
-	$search_code_tiers_start = '';
+$search_subledger_account = GETPOST('search_subledger_account', 'alpha');
+$search_subledger_account_start = GETPOST('search_subledger_account_start', 'alpha');
+if ($search_subledger_account_start == - 1) {
+	$search_subledger_account_start = '';
 }
-$search_code_tiers_end = GETPOST('search_code_tiers_end', 'alpha');
-if ($search_code_tiers_end == - 1) {
-	$search_code_tiers_end = '';
+$search_subledger_account_end = GETPOST('search_subledger_account_end', 'alpha');
+if ($search_subledger_account_end == - 1) {
+	$search_subledger_account_end = '';
 }
 $search_label_compte = GETPOST('search_label_compte', 'alpha');
 $search_sens = GETPOST('search_sens', 'alpha');
@@ -81,15 +81,18 @@ if ($sortfield == "")
 
 $offset = $limit * $page;
 
-llxHeader('', $langs->trans("Bookkeeping"));
 
-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+/*
+ * Actions
+ */
+
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
 {
 	$search_doc_type = "";
 	$search_doc_date = "";
 	$search_doc_ref = "";
 	$search_numero_compte = "";
-	$search_code_tiers = "";
+	$search_subledger_account = "";
 	$search_label_compte = "";
 	$search_sens = "";
 	$search_code_journal = "";
@@ -129,17 +132,17 @@ if (! empty($search_numero_compte_end)) {
 	$filter['t.numero_compte<='] = $search_numero_compte_end;
 	$options .= '&amp;search_numero_compte_end=' . $search_numero_compte_end;
 }
-if (! empty($search_code_tiers)) {
-	$filter['t.code_tiers'] = $search_code_tiers;
-	$options .= '&amp;search_code_tiers=' . $search_code_tiers;
+if (! empty($search_subledger_account)) {
+	$filter['t.subledger_account'] = $search_subledger_account;
+	$options .= '&amp;search_subledger_account=' . $search_subledger_account;
 }
-if (! empty($search_code_tiers_start)) {
-	$filter['t.code_tiers>='] = $search_code_tiers_start;
-	$options .= '&amp;search_code_tiers_start=' . $search_code_tiers_start;
+if (! empty($search_subledger_account_start)) {
+	$filter['t.subledger_account>='] = $search_subledger_account_start;
+	$options .= '&amp;search_subledger_account_start=' . $search_subledger_account_start;
 }
-if (! empty($search_code_tiers_end)) {
-	$filter['t.code_tiers<='] = $search_code_tiers_end;
-	$options .= '&amp;search_code_tiers_end=' . $search_code_tiers_end;
+if (! empty($search_subledger_account_end)) {
+	$filter['t.subledger_account<='] = $search_subledger_account_end;
+	$options .= '&amp;search_subledger_account_end=' . $search_subledger_account_end;
 }
 if (! empty($search_label_compte)) {
 	$filter['t.label_compte'] = $search_label_compte;
@@ -154,10 +157,13 @@ if (! empty($search_code_journal)) {
 	$options .= '&amp;search_code_journal=' . $search_code_journal;
 }
 
+
 /*
- * Mode List
+ * Actions
  */
 
+llxHeader('', $langs->trans("Bookkeeping"));
+
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$nbtotalofrecords = $object->fetchAll($sortorder, $sortfield, 0, 0);
@@ -188,9 +194,9 @@ print $formaccounting->select_account($search_numero_compte_end, 'search_numero_
 print '</div>';
 print '<div class="liste_titre">';
 print $langs->trans('From') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
-print $formaccounting->select_auxaccount($search_code_tiers_start, 'search_code_tiers_start', 1);
+print $formaccounting->select_auxaccount($search_subledger_account_start, 'search_subledger_account_start', 1);
 print $langs->trans('To') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
-print $formaccounting->select_auxaccount($search_code_tiers_end, 'searchcode_tiers_end', 1);
+print $formaccounting->select_auxaccount($search_subledger_account_end, 'search_subledger_account_end', 1);
 print '</div>';
 print "<table class=\"noborder\" width=\"100%\">";
 
@@ -200,7 +206,7 @@ print_liste_field_titre($langs->trans("Doctype"), $_SERVER['PHP_SELF'], "t.doc_t
 print_liste_field_titre($langs->trans("Date"), $_SERVER['PHP_SELF'], "t.doc_date", "", $options, 'align="center"', $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("Docref"), $_SERVER['PHP_SELF'], "t.doc_ref", "", $options, "", $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("AccountAccounting"), $_SERVER['PHP_SELF'], "t.numero_compte", "", $options, "", $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("ThirdPartyAccount"), $_SERVER['PHP_SELF'], "t.code_tiers", "", $options, "", $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("ThirdPartyAccount"), $_SERVER['PHP_SELF'], "t.subledger_account", "", $options, "", $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("Label"), $_SERVER['PHP_SELF'], "t.label_compte", "", $options, "", $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("Debit"), $_SERVER['PHP_SELF'], "t.debit", "", $options, "", $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("Credit"), $_SERVER['PHP_SELF'], "t.credit", "", $options, 'align="center"', $sortfield, $sortorder);
@@ -232,7 +238,7 @@ print '<input type="text" size=6 class="flat" name="search_numero_compte" value=
 print '</td>';
 
 print '<td class="liste_titre">';
-print '<input type="text" size=6 class="flat" name="search_code_tiers" value="' . $search_code_tiers . '"/>';
+print '<input type="text" size=6 class="flat" name="search_subledger_account" value="' . $search_subledger_account . '"/>';
 print '</td>';
 
 print '<td class="liste_titre">';
@@ -264,8 +270,6 @@ print '</td>';
 
 print "</tr>\n";
 
-$var = True;
-
 foreach ( $object->lines as $line ) {
 
 	print '<tr class="oddeven">';
@@ -274,7 +278,7 @@ foreach ( $object->lines as $line ) {
 	print '<td align="center">' . dol_print_date($line->doc_date) . '</td>';
 	print '<td>' . $line->doc_ref . '</td>';
 	print '<td>' . length_accountg($line->numero_compte) . '</td>';
-	print '<td>' . length_accounta($line->code_tiers) . '</td>';
+	print '<td>' . length_accounta($line->subledger_account) . '</td>';
 	print '<td>' . $line->label_compte . '</td>';
 	print '<td align="right">' . price($line->debit) . '</td>';
 	print '<td align="right">' . price($line->credit) . '</td>';
diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index 139498bd0b2..e4e3017ab15 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -138,7 +138,7 @@ class AccountancyCategory
 	 */
 	public function getAccountsWithNoCategory($id) {
 	    global $conf;
-	
+
 	    $sql = "SELECT aa.account_number as numero_compte, aa.label as label_compte";
 	    $sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";
 	    $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
@@ -147,9 +147,9 @@ class AccountancyCategory
 	    $sql .= " AND aa.active = 1";
 	    $sql .= " GROUP BY aa.account_number, aa.label";
 	    $sql .= " ORDER BY aa.account_number, aa.label";
-	
+
 	    $this->lines_CptBk = array ();
-	
+
 	    dol_syslog(__METHOD__, LOG_DEBUG);
 	    $resql = $this->db->query($sql);
 	    if ($resql) {
@@ -159,17 +159,17 @@ class AccountancyCategory
 	                $this->lines_cptbk[] = $obj;
 	            }
 	        }
-	
+
 	        return $num;
 	    } else {
 	        $this->error = "Error " . $this->db->lasterror();
 	        $this->errors[] = $this->error;
 	        dol_syslog(__METHOD__ . " " . implode(',' . $this->errors), LOG_ERR);
-	
+
 	        return - 1;
 	    }
 	}
-	
+
 	/**
 	 * Function to add an accounting account in an accounting category
 	 *
@@ -191,7 +191,7 @@ class AccountancyCategory
 		$sql .= " AND aa.active = 1";
 
 		$this->db->begin();
-		
+
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (! $resql) {
@@ -201,9 +201,9 @@ class AccountancyCategory
 			return -1;
 		}
 
-		while ( $obj = $this->db->fetch_object($resql)) 
+		while ( $obj = $this->db->fetch_object($resql))
 		{
-			if (array_key_exists(length_accountg($obj->account_number), $cpts)) 
+			if (array_key_exists(length_accountg($obj->account_number), $cpts))
 			{
 				$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_account";
 				$sql .= " SET fk_accounting_category=" . $id_cat;
@@ -332,7 +332,7 @@ class AccountancyCategory
 	}
 
 	/**
-	 * Function to show result of an accounting account from the general ledger with a sens and a period
+	 * Function to show result of an accounting account from the ledger with a direction and a period
 	 *
 	 * @param int $cpt Id accounting account
 	 * @param string $month Specifig month - Can be empty
diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 1af9e5d1a6b..dc2b3195ee3 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -172,7 +172,7 @@ class AccountancyExport
 			print $date . $this->separator;
 			print $line->doc_ref . $this->separator;
 			print length_accountg($line->numero_compte) . $this->separator;
-			print length_accounta($line->code_tiers) . $this->separator;
+			print length_accounta($line->subledger_account) . $this->separator;
 			print price($line->debit) . $this->separator;
 			print price($line->credit) . $this->separator;
 			print $line->code_journal . $this->separator;
@@ -195,7 +195,7 @@ class AccountancyExport
 			print $date . $separator;
 			print $line->code_journal . $separator;
 			print length_accountg($line->numero_compte) . $separator;
-			print length_accounta($line->code_tiers) . $separator;
+			print length_accounta($line->subledger_account) . $separator;
 			print $line->sens . $separator;
 			print price($line->montant) . $separator;
 			print $line->label_compte . $separator;
@@ -254,7 +254,7 @@ class AccountancyExport
 			print price($line->debit) . $this->separator;
 			print price($line->credit) . $this->separator;
 			print 'E' . $this->separator;
-			print length_accountg($line->code_tiers) . $this->separator;
+			print length_accountg($line->subledger_account) . $this->separator;
 			print $this->end_line;
 		}
 	}
@@ -274,7 +274,7 @@ class AccountancyExport
 			$date = dol_print_date($line->doc_date, '%d/%m/%Y');
 			print $date . $this->separator;
 
-			if (empty($line->code_tiers)) {
+			if (empty($line->subledger_account)) {
 				print 'G' . $this->separator;
 				print length_accounta($line->numero_compte) . $this->separator;
 			} else {
@@ -284,7 +284,7 @@ class AccountancyExport
 				if (substr($line->numero_compte, 0, 3) == '401') {
 					print 'F' . $this->separator;
 				}
-				print length_accountg($line->code_tiers) . $this->separator;
+				print length_accountg($line->subledger_account) . $this->separator;
 			}
 
 			print price($line->debit) . $this->separator;
@@ -307,11 +307,11 @@ class AccountancyExport
 		$this->end_line ="\r\n";
 
 		$i = 1;
-		$date_ecriture = dol_print_date(time(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be yyyymmdd
+		$date_ecriture = dol_print_date(dol_now(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be yyyymmdd
 		foreach ( $TData as $data ) {
 			$code_compta = $data->numero_compte;
-			if (! empty($data->code_tiers))
-				$code_compta = $data->code_tiers;
+			if (! empty($data->subledger_account))
+				$code_compta = $data->subledger_account;
 
 			$Tab = array ();
 			$Tab['num_ecriture'] = str_pad($i, 5);
@@ -349,8 +349,8 @@ class AccountancyExport
 		$date_ecriture = dol_print_date(time(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be ddmmyy
 		foreach ( $TData as $data ) {
 			$code_compta = $data->numero_compte;
-			if (! empty($data->code_tiers))
-				$code_compta = $data->code_tiers;
+			if (! empty($data->subledger_account))
+				$code_compta = $data->subledger_account;
 
 			$Tab = array ();
 			$Tab['type_ligne'] = 'M';
@@ -436,19 +436,21 @@ class AccountancyExport
 			print '"'.dol_trunc($line->piece_num,15,'right','UTF-8',1).'"'.$this->separator;
 			print $date . $this->separator;
 			print '"'.dol_trunc($line->piece_num,15,'right','UTF-8',1).'"'.$this->separator;
-			
-			if (empty($line->code_tiers)) {
+
+			if (empty($line->subledger_account)) {
 				print length_accountg($line->numero_compte) . $this->separator;
 			} else {
+			    // FIXME Because the subledger_account is already an accounting account, does we really need
+			    // to concat 4011 or 401 to it ?
 				if (substr($line->numero_compte, 0, 1) == 'C' || substr($line->numero_compte, 0, 1) == '9') {
-					print '411' . substr(str_replace(" ", "", $line->code_tiers), 0, 5) . $this->separator;
+					print '411' . substr(str_replace(" ", "", $line->subledger_account), 0, 5) . $this->separator;
 				}
 				if (substr($line->numero_compte, 0, 1) == 'F' || substr($line->numero_compte, 0, 1) == '0') {
-					print '401' . substr(str_replace(" ", "", $line->code_tiers), 0, 5) . $this->separator;
+					print '401' . substr(str_replace(" ", "", $line->subledger_account), 0, 5) . $this->separator;
 				}
 			}
-			
-			print length_accounta($line->code_tiers) . $this->separator;
+
+			print length_accounta($line->subledger_account) . $this->separator;
 			print price($line->debit) . $this->separator;
 			print price($line->credit) . $this->separator;
 			print price($line->montant).$this->separator;
diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
index 168934ee5a5..f47715ace58 100644
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -46,7 +46,7 @@ class AccountingJournal extends CommonObject
 	function __construct($db) {
 		$this->db = $db;
 	}
-	
+
 	/**
 	 * Load an object from database
 	 *
@@ -62,9 +62,9 @@ class AccountingJournal extends CommonObject
 			$sql.= " FROM ".MAIN_DB_PREFIX."accounting_journal";
 			$sql .= " WHERE";
 			if ($rowid) {
-				$sql .= " rowid = '" . $rowid . "'";
+				$sql .= " rowid = " . (int) $rowid;
 			} elseif ($journal_code) {
-				$sql .= " code = '" . $journal_code . "'";
+				$sql .= " code = '" . $this->db->escape($journal_code) . "'";
 			}
 
 			dol_syslog(get_class($this)."::fetch sql=" . $sql, LOG_DEBUG);
@@ -96,7 +96,7 @@ class AccountingJournal extends CommonObject
 		}
 		return -1;
 	}
-	
+
 	/**
 	 * Return clicable name (with picto eventually)
 	 *
@@ -147,7 +147,7 @@ class AccountingJournal extends CommonObject
 		{
 			$linkstart = '';
 			$linkclose = '';
-			$linkend = '';			
+			$linkend = '';
 		}
 
 		$label_link = $this->code;
@@ -158,7 +158,7 @@ class AccountingJournal extends CommonObject
 		if ($withpicto != 2) $result.=$linkstart . $label_link . $linkend;
 		return $result;
 	}
-	
+
 	/**
 	 *  Retourne le libelle du statut d'un user (actif, inactif)
 	 *
@@ -169,7 +169,7 @@ class AccountingJournal extends CommonObject
 	{
 	    return $this->LibType($this->nature,$mode);
 	}
-	
+
 	/**
 	 *  Return type of an accounting journal
 	 *
@@ -182,7 +182,7 @@ class AccountingJournal extends CommonObject
 	    global $langs;
 
 		$langs->load("accountancy");
-	
+
 	    if ($mode == 0)
 	    {
 	        $prefix='';
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 0fc4a936117..f7c1b4d8b89 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -20,14 +20,14 @@
 /**
  *	\file       htdocs/accountancy/class/bookkeeping.class.php
  *	\ingroup    Advanced accountancy
- *	\brief      File of class to manage general ledger
+ *	\brief      File of class to manage Ledger (General Ledger and Subledger)
  */
 
 // Class
 require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
 
 /**
- * Class to manage general ledger
+ * Class to manage Ledger (General Ledger and Subledger)
  */
 class BookKeeping extends CommonObject
 {
@@ -53,7 +53,7 @@ class BookKeeping extends CommonObject
 	 *
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element = 'accounting_bookkeeping';  
+	public $table_element = 'accounting_bookkeeping';
 
 	public $entity = 1;
 
@@ -75,7 +75,9 @@ class BookKeeping extends CommonObject
 	public $doc_ref;
 	public $fk_doc;
 	public $fk_docdet;
-	public $code_tiers;
+	public $thirdparty_code;
+	public $subledger_account;
+	public $subledger_label;
 	public $numero_compte;
 	public $label_compte;
 	public $debit;
@@ -127,8 +129,14 @@ class BookKeeping extends CommonObject
 		if (isset($this->fk_docdet)) {
 			$this->fk_docdet = trim($this->fk_docdet);
 		}
-		if (isset($this->code_tiers)) {
-			$this->code_tiers = trim($this->code_tiers);
+		if (isset($this->thirdparty_code)) {
+			$this->thirdparty_code = trim($this->thirdparty_code);
+		}
+		if (isset($this->subledger_account)) {
+			$this->subledger_account = trim($this->subledger_account);
+		}
+		if (isset($this->subledger_label)) {
+			$this->subledger_label = trim($this->subledger_label);
 		}
 		if (isset($this->numero_compte)) {
 			$this->numero_compte = trim($this->numero_compte);
@@ -165,7 +173,7 @@ class BookKeeping extends CommonObject
 		}
 		if (empty($this->debit)) $this->debit = 0;
 		if (empty($this->credit)) $this->credit = 0;
-		
+
 		// Check parameters
 		if (empty($this->numero_compte) || $this->numero_compte == '-1')
 		{
@@ -176,7 +184,7 @@ class BookKeeping extends CommonObject
             }
             else
             {
-                $this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForInvoiceLine', $this->fk_doc,  $this->doc_type);		    
+                $this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForInvoiceLine', $this->fk_doc,  $this->doc_type);
             }
 
 		    return -1;
@@ -191,7 +199,7 @@ class BookKeeping extends CommonObject
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql .= " WHERE doc_type = '" . $this->db->escape($this->doc_type) . "'";
 		$sql .= " AND fk_doc = " . $this->fk_doc;
-		$sql .= " AND fk_docdet = " . $this->fk_docdet;                   // This field can be 0 is record is for several lines 
+		$sql .= " AND fk_docdet = " . $this->fk_docdet;                   // This field can be 0 is record is for several lines
 		$sql .= " AND numero_compte = '" . $this->db->escape($this->numero_compte) . "'";
 		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
 
@@ -199,12 +207,12 @@ class BookKeeping extends CommonObject
 
 		if ($resql) {
 			$row = $this->db->fetch_object($resql);
-			if ($row->nb == 0) 
+			if ($row->nb == 0)
 			{
 				// Determine piece_num
 				$sqlnum = "SELECT piece_num";
 				$sqlnum .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
-				$sqlnum .= " WHERE doc_type = '" . $this->db->escape($this->doc_type) . "'";		// For example doc_type = 'bank' 
+				$sqlnum .= " WHERE doc_type = '" . $this->db->escape($this->doc_type) . "'";		// For example doc_type = 'bank'
 				$sqlnum .= " AND fk_docdet = " . $this->db->escape($this->fk_docdet);       		// fk_docdet is rowid into llx_bank or llx_facturedet or llx_facturefourndet, or ...
 				$sqlnum .= " AND doc_ref = '" . $this->db->escape($this->doc_ref) . "'";			// ref of source object
 				$sqlnum .= " AND entity IN (" . getEntity('accountancy') . ")";
@@ -244,7 +252,9 @@ class BookKeeping extends CommonObject
 				$sql .= ", doc_ref";
 				$sql .= ", fk_doc";
 				$sql .= ", fk_docdet";
-				$sql .= ", code_tiers";
+				$sql .= ", thirdparty_code";
+				$sql .= ", subledger_account";
+				$sql .= ", subledger_label";
 				$sql .= ", numero_compte";
 				$sql .= ", label_compte";
 				$sql .= ", debit";
@@ -256,25 +266,27 @@ class BookKeeping extends CommonObject
 				$sql .= ", code_journal";
 				$sql .= ", journal_label";
 				$sql .= ", piece_num";
-				$sql .= ', entity';				
+				$sql .= ', entity';
 				$sql .= ") VALUES (";
 				$sql .= "'" . $this->db->idate($this->doc_date) . "'";
-				$sql .= ",'" . $this->doc_type . "'";
-				$sql .= ",'" . $this->doc_ref . "'";
+				$sql .= ",'" . $this->db->escape($this->doc_type) . "'";
+				$sql .= ",'" . $this->db->escape($this->doc_ref) . "'";
 				$sql .= "," . $this->fk_doc;
 				$sql .= "," . $this->fk_docdet;
-				$sql .= ",'" . $this->code_tiers . "'";
-				$sql .= ",'" . $this->numero_compte . "'";
+				$sql .= ",'" . $this->db->escape($this->thirdparty_code) . "'";
+				$sql .= ",'" . $this->db->escape($this->subledger_account) . "'";
+				$sql .= ",'" . $this->db->escape($this->subledger_label) . "'";
+				$sql .= ",'" . $this->db->escape($this->numero_compte) . "'";
 				$sql .= ",'" . $this->db->escape($this->label_compte) . "'";
 				$sql .= "," . $this->debit;
 				$sql .= "," . $this->credit;
 				$sql .= "," . $this->montant;
-				$sql .= ",'" . $this->sens . "'";
-				$sql .= ",'" . $this->fk_user_author . "'";
+				$sql .= ",'" . $this->db->escape($this->sens) . "'";
+				$sql .= ",'" . $this->db->escape($this->fk_user_author) . "'";
 				$sql .= ",'" . $this->db->idate($this->date_create). "'";
-				$sql .= ",'" . $this->code_journal . "'";
-				$sql .= ",'" . $this->journal_label . "'";
-				$sql .= "," . $this->piece_num;
+				$sql .= ",'" . $this->db->escape($this->code_journal) . "'";
+				$sql .= ",'" . $this->db->escape($this->journal_label) . "'";
+				$sql .= "," . $this->db->escape($this->piece_num);
 				$sql .= ", " . (! isset($this->entity) ? '1' : $this->entity);
 				$sql .= ")";
 
@@ -282,7 +294,7 @@ class BookKeeping extends CommonObject
 				$resql = $this->db->query($sql);
 				if ($resql) {
 					$id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
-					
+
 					if ($id > 0) {
 						$this->id = $id;
 						$result = 0;
@@ -312,11 +324,11 @@ class BookKeeping extends CommonObject
 		}
 
 		if (! $error) {
-			
+
 			if (! $notrigger) {
 				// Uncomment this and change MYOBJECT to your own tag if you
 				// want this action to call a trigger.
-				
+
 				// // Call triggers
 				// $result=$this->call_trigger('MYOBJECT_CREATE',$user);
 				// if ($result < 0) $error++;
@@ -360,8 +372,14 @@ class BookKeeping extends CommonObject
 		if (isset($this->fk_docdet)) {
 			$this->fk_docdet = trim($this->fk_docdet);
 		}
-		if (isset($this->code_tiers)) {
-			$this->code_tiers = trim($this->code_tiers);
+		if (isset($this->thirdparty_code)) {
+			$this->thirdparty_code = trim($this->thirdparty_code);
+		}
+		if (isset($this->subledger_account)) {
+			$this->subledger_account = trim($this->subledger_account);
+		}
+		if (isset($this->subledger_label)) {
+			$this->subledger_label = trim($this->subledger_label);
 		}
 		if (isset($this->numero_compte)) {
 			$this->numero_compte = trim($this->numero_compte);
@@ -409,7 +427,9 @@ class BookKeeping extends CommonObject
 		$sql .= 'doc_ref,';
 		$sql .= 'fk_doc,';
 		$sql .= 'fk_docdet,';
-		$sql .= 'code_tiers,';
+		$sql .= 'thirdparty,';
+		$sql .= 'subledger_account,';
+		$sql .= 'subledger_label,';
 		$sql .= 'numero_compte,';
 		$sql .= 'label_compte,';
 		$sql .= 'debit,';
@@ -428,7 +448,9 @@ class BookKeeping extends CommonObject
 		$sql .= ' ' . (! isset($this->doc_ref) ? 'NULL' : "'" . $this->db->escape($this->doc_ref) . "'") . ',';
 		$sql .= ' ' . (empty($this->fk_doc) ? '0' : $this->fk_doc) . ',';
 		$sql .= ' ' . (empty($this->fk_docdet) ? '0' : $this->fk_docdet) . ',';
-		$sql .= ' ' . (! isset($this->code_tiers) ? 'NULL' : "'" . $this->db->escape($this->code_tiers) . "'") . ',';
+		$sql .= ' ' . (! isset($this->thirdparty_code) ? 'NULL' : "'" . $this->db->escape($this->thirdparty_code) . "'") . ',';
+		$sql .= ' ' . (! isset($this->subledger_account) ? 'NULL' : "'" . $this->db->escape($this->subledger_account) . "'") . ',';
+		$sql .= ' ' . (! isset($this->subledger_label) ? 'NULL' : "'" . $this->db->escape($this->subledger_label) . "'") . ',';
 		$sql .= ' ' . (! isset($this->numero_compte) ? "'NotDefined'" : "'" . $this->db->escape($this->numero_compte) . "'") . ',';
 		$sql .= ' ' . (! isset($this->label_compte) ? 'NULL' : "'" . $this->db->escape($this->label_compte) . "'") . ',';
 		$sql .= ' ' . (! isset($this->debit) ? 'NULL' : $this->debit ). ',';
@@ -458,7 +480,7 @@ class BookKeeping extends CommonObject
 			if (! $notrigger) {
 				// Uncomment this and change MYOBJECT to your own tag if you
 				// want this action to call a trigger.
-				
+
 				// // Call triggers
 				// $result=$this->call_trigger('MYOBJECT_CREATE',$user);
 				// if ($result < 0) $error++;
@@ -483,7 +505,7 @@ class BookKeeping extends CommonObject
 	 *
 	 * @param int $id Id object
 	 * @param string $ref Ref
-	 * 
+	 *
 	 * @return int <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null) {
@@ -498,7 +520,9 @@ class BookKeeping extends CommonObject
 		$sql .= " t.doc_ref,";
 		$sql .= " t.fk_doc,";
 		$sql .= " t.fk_docdet,";
-		$sql .= " t.code_tiers,";
+		$sql .= " t.thirdparty_code,";
+		$sql .= " t.subledger_account,";
+		$sql .= " t.subledger_label,";
 		$sql .= " t.numero_compte,";
 		$sql .= " t.label_compte,";
 		$sql .= " t.debit,";
@@ -532,7 +556,9 @@ class BookKeeping extends CommonObject
 				$this->doc_ref = $obj->doc_ref;
 				$this->fk_doc = $obj->fk_doc;
 				$this->fk_docdet = $obj->fk_docdet;
-				$this->code_tiers = $obj->code_tiers;
+				$this->thirdparty_code = $obj->thirdparty_code;
+				$this->subledger_account = $obj->subledger_account;
+				$this->subledger_label = $obj->subledger_label;
 				$this->numero_compte = $obj->numero_compte;
 				$this->label_compte = $obj->label_compte;
 				$this->debit = $obj->debit;
@@ -555,11 +581,11 @@ class BookKeeping extends CommonObject
 		} else {
 			$this->errors[] = 'Error ' . $this->db->lasterror();
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
-			
+
 			return - 1;
 		}
 	}
-  
+
   /**
 	 * Load object in memory from the database
 	 *
@@ -569,7 +595,7 @@ class BookKeeping extends CommonObject
 	 * @param int $offset offset limit
 	 * @param array $filter filter array
 	 * @param string $filtermode filter mode (AND or OR)
-	 *       
+	 *
 	 * @return int <0 if KO, >0 if OK
 	 */
 	public function fetchAllByAccount($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND') {
@@ -584,7 +610,9 @@ class BookKeeping extends CommonObject
 		$sql .= " t.doc_ref,";
 		$sql .= " t.fk_doc,";
 		$sql .= " t.fk_docdet,";
-		$sql .= " t.code_tiers,";
+		$sql .= " t.thirdparty_code,";
+		$sql .= " t.subledger_account,";
+		$sql .= " t.subledger_label,";
 		$sql .= " t.numero_compte,";
 		$sql .= " t.label_compte,";
 		$sql .= " t.debit,";
@@ -604,11 +632,11 @@ class BookKeeping extends CommonObject
 					$sqlwhere[] = $key . '=\'' . $this->db->idate($value) . '\'';
 				} elseif ($key == 't.doc_date>=' || $key == 't.doc_date<=') {
 					$sqlwhere[] = $key . '\'' . $this->db->idate($value) . '\'';
-				} elseif ($key == 't.numero_compte>=' || $key == 't.numero_compte<=' || $key == 't.code_tiers>=' || $key == 't.code_tiers<=') {
+				} elseif ($key == 't.numero_compte>=' || $key == 't.numero_compte<=' || $key == 't.subledger_account>=' || $key == 't.subledger_account<=') {
 					$sqlwhere[] = $key . '\'' . $this->db->escape($value) . '\'';
 				} elseif ($key == 't.fk_doc' || $key == 't.fk_docdet' || $key == 't.piece_num') {
 					$sqlwhere[] = $key . '=' . $value;
-				} elseif ($key == 't.code_tiers' || $key == 't.numero_compte') {
+				} elseif ($key == 't.subledger_account' || $key == 't.numero_compte') {
 					$sqlwhere[] = $key . ' LIKE \'' . $this->db->escape($value) . '%\'';
 				} elseif ($key == 't.label_compte') {
 					$sqlwhere[] = $key . ' LIKE \'' . $this->db->escape($value) . '%\'';
@@ -630,7 +658,7 @@ class BookKeeping extends CommonObject
 		}
 		if (! empty($limit)) {
 			$sql .= ' ' . $this->db->plimit($limit + 1, $offset);
-		} 
+		}
 		$this->lines = array ();
 
 		$resql = $this->db->query($sql);
@@ -647,7 +675,9 @@ class BookKeeping extends CommonObject
 				$line->doc_ref = $obj->doc_ref;
 				$line->fk_doc = $obj->fk_doc;
 				$line->fk_docdet = $obj->fk_docdet;
-				$line->code_tiers = $obj->code_tiers;
+				$line->thirdparty_code = $obj->thirdparty_code;
+				$line->subledger_account = $obj->subledger_account;
+				$line->subledger_label = $obj->subledger_label;
 				$line->numero_compte = $obj->numero_compte;
 				$line->label_compte = $obj->label_compte;
 				$line->debit = $obj->debit;
@@ -672,8 +702,8 @@ class BookKeeping extends CommonObject
 			return - 1;
 		}
 	}
-  
-	
+
+
 	/**
 	 * Load object in memory from the database
 	 *
@@ -683,7 +713,7 @@ class BookKeeping extends CommonObject
 	 * @param int $offset offset limit
 	 * @param array $filter filter array
 	 * @param string $filtermode filter mode (AND or OR)
-	 *       
+	 *
 	 * @return int <0 if KO, >0 if OK
 	 */
 	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND') {
@@ -698,7 +728,9 @@ class BookKeeping extends CommonObject
 		$sql .= " t.doc_ref,";
 		$sql .= " t.fk_doc,";
 		$sql .= " t.fk_docdet,";
-		$sql .= " t.code_tiers,";
+		$sql .= " t.thirdparty_code,";
+		$sql .= " t.subledger_account,";
+		$sql .= " t.subledger_label,";
 		$sql .= " t.numero_compte,";
 		$sql .= " t.label_compte,";
 		$sql .= " t.debit,";
@@ -719,11 +751,11 @@ class BookKeeping extends CommonObject
 					$sqlwhere[] = $key . '=\'' . $this->db->idate($value) . '\'';
 				} elseif ($key == 't.doc_date>=' || $key == 't.doc_date<=') {
 					$sqlwhere[] = $key . '\'' . $this->db->idate($value) . '\'';
-				} elseif ($key == 't.numero_compte>=' || $key == 't.numero_compte<=' || $key == 't.code_tiers>=' || $key == 't.code_tiers<=') {
+				} elseif ($key == 't.numero_compte>=' || $key == 't.numero_compte<=' || $key == 't.subledger_account>=' || $key == 't.subledger_account<=') {
 					$sqlwhere[] = $key . '\'' . $this->db->escape($value) . '\'';
 				} elseif ($key == 't.fk_doc' || $key == 't.fk_docdet' || $key == 't.piece_num') {
 					$sqlwhere[] = $key . '=' . $value;
-				} elseif ($key == 't.code_tiers' || $key == 't.numero_compte') {
+				} elseif ($key == 't.subledger_account' || $key == 't.numero_compte') {
 					$sqlwhere[] = $key . ' LIKE \'' . $this->db->escape($value) . '%\'';
 				} else {
 					$sqlwhere[] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
@@ -758,7 +790,9 @@ class BookKeeping extends CommonObject
 				$line->doc_ref = $obj->doc_ref;
 				$line->fk_doc = $obj->fk_doc;
 				$line->fk_docdet = $obj->fk_docdet;
-				$line->code_tiers = $obj->code_tiers;
+				$line->thirdparty_code = $obj->thirdparty_code;
+				$line->subledger_account = $obj->subledger_account;
+				$line->subledger_label = $obj->subledger_label;
 				$line->numero_compte = $obj->numero_compte;
 				$line->label_compte = $obj->label_compte;
 				$line->debit = $obj->debit;
@@ -814,11 +848,11 @@ class BookKeeping extends CommonObject
 					$sqlwhere[] = $key . '=\'' . $this->db->idate($value) . '\'';
 				} elseif ($key == 't.doc_date>=' || $key == 't.doc_date<=') {
 					$sqlwhere[] = $key . '\'' . $this->db->idate($value) . '\'';
-				} elseif ($key == 't.numero_compte>=' || $key == 't.numero_compte<=' || $key == 't.code_tiers>=' || $key == 't.code_tiers<=') {
+				} elseif ($key == 't.numero_compte>=' || $key == 't.numero_compte<=' || $key == 't.subledger_account>=' || $key == 't.subledger_account<=') {
 					$sqlwhere[] = $key . '\'' . $this->db->escape($value) . '\'';
 				} elseif ($key == 't.fk_doc' || $key == 't.fk_docdet' || $key == 't.piece_num') {
 					$sqlwhere[] = $key . '=' . $value;
-				} elseif ($key == 't.code_tiers' || $key == 't.numero_compte') {
+				} elseif ($key == 't.subledger_account' || $key == 't.numero_compte') {
 					$sqlwhere[] = $key . ' LIKE \'' . $this->db->escape($value) . '%\'';
 				} else {
 					$sqlwhere[] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
@@ -834,7 +868,7 @@ class BookKeeping extends CommonObject
 		$sql .= ' GROUP BY t.numero_compte';
 
 		if (! empty($sortfield)) {
-			$sql .= $this->db->order($sortfield, $sortorder); 
+			$sql .= $this->db->order($sortfield, $sortorder);
 		}
 		if (! empty($limit)) {
 			$sql .= ' ' . $this->db->plimit($limit + 1, $offset);
@@ -869,7 +903,7 @@ class BookKeeping extends CommonObject
 	 *
 	 * @param User $user User that modifies
 	 * @param bool $notrigger false=launch triggers after, true=disable triggers
-	 *       
+	 *
 	 * @return int <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false) {
@@ -890,8 +924,14 @@ class BookKeeping extends CommonObject
 		if (isset($this->fk_docdet)) {
 			$this->fk_docdet = trim($this->fk_docdet);
 		}
-		if (isset($this->code_tiers)) {
-			$this->code_tiers = trim($this->code_tiers);
+		if (isset($this->thirdparty_code)) {
+			$this->thirdparty_code = trim($this->thirdparty_code);
+		}
+		if (isset($this->subledger_account)) {
+			$this->subledger_account = trim($this->subledger_account);
+		}
+		if (isset($this->subledger_label)) {
+			$this->subledger_label = trim($this->subledger_label);
 		}
 		if (isset($this->numero_compte)) {
 			$this->numero_compte = trim($this->numero_compte);
@@ -937,7 +977,9 @@ class BookKeeping extends CommonObject
 		$sql .= ' doc_ref = ' . (isset($this->doc_ref) ? "'" . $this->db->escape($this->doc_ref) . "'" : "null") . ',';
 		$sql .= ' fk_doc = ' . (isset($this->fk_doc) ? $this->fk_doc : "null") . ',';
 		$sql .= ' fk_docdet = ' . (isset($this->fk_docdet) ? $this->fk_docdet : "null") . ',';
-		$sql .= ' code_tiers = ' . (isset($this->code_tiers) ? "'" . $this->db->escape($this->code_tiers) . "'" : "null") . ',';
+		$sql .= ' thirdparty_code = ' . (isset($this->thirdparty_code) ? "'" . $this->db->escape($this->thirdparty_code) . "'" : "null") . ',';
+		$sql .= ' subledger_account = ' . (isset($this->subledger_account) ? "'" . $this->db->escape($this->subledger_account) . "'" : "null") . ',';
+		$sql .= ' subledger_label = ' . (isset($this->subledger_label) ? "'" . $this->db->escape($this->subledger_label) . "'" : "null") . ',';
 		$sql .= ' numero_compte = ' . (isset($this->numero_compte) ? "'" . $this->db->escape($this->numero_compte) . "'" : "null") . ',';
 		$sql .= ' label_compte = ' . (isset($this->label_compte) ? "'" . $this->db->escape($this->label_compte) . "'" : "null") . ',';
 		$sql .= ' debit = ' . (isset($this->debit) ? $this->debit : "null") . ',';
@@ -963,7 +1005,7 @@ class BookKeeping extends CommonObject
 		if (! $error && ! $notrigger) {
 			// Uncomment this and change MYOBJECT to your own tag if you
 			// want this action calls a trigger.
-			
+
 			// // Call triggers
 			// $result=$this->call_trigger('MYOBJECT_MODIFY',$user);
 			// if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
@@ -987,7 +1029,7 @@ class BookKeeping extends CommonObject
 	 *
 	 * @param User $user User that deletes
 	 * @param bool $notrigger false=launch triggers after, true=disable triggers
-	 *       
+	 *
 	 * @return int <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false) {
@@ -1070,7 +1112,7 @@ class BookKeeping extends CommonObject
 	function deleteByYearAndJournal($delyear='', $journal='') {
 	    global $conf;
 
-	    if (empty($delyear) && empty($journal)) 
+	    if (empty($delyear) && empty($journal))
 	    {
 	        return -1;
 	    }
@@ -1137,7 +1179,7 @@ class BookKeeping extends CommonObject
 	 * Load an object from its id and create a new one in database
 	 *
 	 * @param int $fromid Id of object to clone
-	 *       
+	 *
 	 * @return int New id of clone
 	 */
 	public function createFromClone($fromid) {
@@ -1196,8 +1238,10 @@ class BookKeeping extends CommonObject
 		$this->doc_ref = '';
 		$this->fk_doc = '';
 		$this->fk_docdet = '';
-		$this->code_tiers = '';
-		$this->numero_compte = '';
+		$this->thirdparty_code = 'CU001';
+		$this->subledger_account = '410CU001';
+		$this->subledger_label = 'My customer company';
+		$this->numero_compte = '410';
 		$this->label_compte = '';
 		$this->debit = 99.9;
 		$this->credit = '';
@@ -1205,8 +1249,8 @@ class BookKeeping extends CommonObject
 		$this->sens = '';
 		$this->fk_user_author = $user->id;
 		$this->import_key = '';
-		$this->code_journal = '';
-		$this->journal_label = '';
+		$this->code_journal = 'VT';
+		$this->journal_label = 'Journal de vente';
 		$this->piece_num = '';
 	}
 
@@ -1249,7 +1293,7 @@ class BookKeeping extends CommonObject
 	 *
 	 * @return string      Next numero to use
 	 */
-	public function getNextNumMvt() 
+	public function getNextNumMvt()
 	{
 		global $conf;
 
@@ -1281,7 +1325,7 @@ class BookKeeping extends CommonObject
 		global $conf;
 
 		$sql = "SELECT rowid, doc_date, doc_type,";
-		$sql .= " doc_ref, fk_doc, fk_docdet, code_tiers,";
+		$sql .= " doc_ref, fk_doc, fk_docdet, thirdparty_code, subledger_account, subledger_label,";
 		$sql .= " numero_compte, label_compte, debit, credit,";
 		$sql .= " montant, sens, fk_user_author, import_key, code_journal, journal_label, piece_num";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
@@ -1303,7 +1347,9 @@ class BookKeeping extends CommonObject
 				$line->doc_ref = $obj->doc_ref;
 				$line->fk_doc = $obj->fk_doc;
 				$line->fk_docdet = $obj->fk_docdet;
-				$line->code_tiers = $obj->code_tiers;
+				$line->thirdparty_code = $obj->thirdparty_code;
+				$line->subledger_account = $obj->subledger_account;
+				$line->subledger_label = $obj->subledger_label;
 				$line->numero_compte = $obj->numero_compte;
 				$line->label_compte = $obj->label_compte;
 				$line->debit = $obj->debit;
@@ -1335,7 +1381,7 @@ class BookKeeping extends CommonObject
 		global $conf;
 
 		$sql = "SELECT rowid, doc_date, doc_type,";
-		$sql .= " doc_ref, fk_doc, fk_docdet, code_tiers,";
+		$sql .= " doc_ref, fk_doc, fk_docdet, thirdparty_code, subledger_account, subledger_label,";
 		$sql .= " numero_compte, label_compte, debit, credit,";
 		$sql .= " montant, sens, fk_user_author, import_key, code_journal, piece_num";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
@@ -1359,7 +1405,9 @@ class BookKeeping extends CommonObject
 				$line->doc_ref = $obj->doc_ref;
 				$line->fk_doc = $obj->fk_doc;
 				$line->fk_docdet = $obj->fk_docdet;
-				$line->code_tiers = $obj->code_tiers;
+				$line->thirdparty_code = $obj->thirdparty_code;
+				$line->subledger_account = $obj->subledger_account;
+				$line->subledger_label = $obj->subledger_label;
 				$line->numero_compte = $obj->numero_compte;
 				$line->label_compte = $obj->label_compte;
 				$line->debit = $obj->debit;
@@ -1380,9 +1428,9 @@ class BookKeeping extends CommonObject
 			return - 1;
 		}
 	}
-  
-  
-  
+
+
+
     /**
     * Return list of accounts with label by chart of accounts
     *
@@ -1397,11 +1445,11 @@ class BookKeeping extends CommonObject
     */
     function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $aabase = '') {
         global $conf;
-        
+
         require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-        
+
         $pcgver = $conf->global->CHARTOFACCOUNTS;
-        
+
         $sql = "SELECT DISTINCT ab.numero_compte as account_number, aa.label as label, aa.rowid as rowid, aa.fk_pcg_version";
         $sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab";
         $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.account_number = ab.numero_compte";
@@ -1410,43 +1458,43 @@ class BookKeeping extends CommonObject
         $sql .= " AND asy.rowid = " . $pcgver;
 	    $sql .= " AND ab.entity IN (" . getEntity('accountancy') . ")";
         $sql .= " ORDER BY account_number ASC";
-        
+
         dol_syslog(get_class($this) . "::select_account", LOG_DEBUG);
         $resql = $this->db->query($sql);
-        
+
         if (! $resql) {
             $this->error = "Error " . $this->db->lasterror();
             dol_syslog(get_class($this) . "::select_account " . $this->error, LOG_ERR);
             return - 1;
         }
-        
+
         $out = ajax_combobox($htmlname, $event);
-        
+
         $options = array();
         $selected = null;
-        
+
         while ($obj = $this->db->fetch_object($resql)) {
             $label = length_accountg($obj->account_number) . ' - ' . $obj->label;
-            
+
             $select_value_in = $obj->rowid;
             $select_value_out = $obj->rowid;
-            
+
             if ($select_in == 1) {
                 $select_value_in = $obj->account_number;
             }
             if ($select_out == 1) {
                 $select_value_out = $obj->account_number;
             }
-            
+
             // Remember guy's we store in database llx_facturedet the rowid of accounting_account and not the account_number
             // Because same account_number can be share between different accounting_system and do have the same meaning
             if (($selectid != '') && $selectid == $select_value_in) {
                 $selected = $select_value_out;
             }
-            
+
             $options[$select_value_out] = $label;
         }
-        
+
         $out .= Form::selectarray($htmlname, $options, $selected, $showempty, 0, 0, '', 0, 0, 0, '', 'maxwidth300');
         $this->db->free($resql);
         return $out;
@@ -1454,7 +1502,7 @@ class BookKeeping extends CommonObject
 
 
 	/**
-	* Description of a root accounting account 
+	* Description of a root accounting account
 	*
 	* @param 	string 	$account	Accounting account
 	* @return 	string 	            Root account
@@ -1470,7 +1518,7 @@ class BookKeeping extends CommonObject
         $sql .= " AND asy.rowid = " . $pcgver;
         $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as parent ON aa.account_parent = parent.rowid";
         $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as root ON parent.account_parent = root.rowid";
-        $sql .= " WHERE aa.account_number = '" . $account . "'";  
+        $sql .= " WHERE aa.account_number = '" . $account . "'";
         $sql .= " AND parent.active = 1";
         $sql .= " AND root.active = 1";
         $sql .= " AND aa.entity IN (" . getEntity('accountancy') . ")";
@@ -1480,7 +1528,7 @@ class BookKeeping extends CommonObject
 		if ($resql) {
 			$obj = '';
 			if ($this->db->num_rows($resql)) {
-				$obj = $this->db->fetch_object($resql);	
+				$obj = $this->db->fetch_object($resql);
 			}
 
 			return $obj->label;
@@ -1492,8 +1540,8 @@ class BookKeeping extends CommonObject
 			return -1;
 		}
 	}
-  
-  
+
+
   /**
 	* Description of accounting account
 	*
@@ -1519,7 +1567,7 @@ class BookKeeping extends CommonObject
 		if ($resql) {
 			$obj = '';
 			if ($this->db->num_rows($resql)) {
-				$obj = $this->db->fetch_object($resql);	
+				$obj = $this->db->fetch_object($resql);
 			}
 			if(empty($obj->category)){
 				return $obj->label;
@@ -1532,7 +1580,7 @@ class BookKeeping extends CommonObject
 			return -1;
 		}
 	}
-	
+
 }
 
 
@@ -1547,7 +1595,9 @@ class BookKeepingLine
 	public $doc_ref;
 	public $fk_doc;
 	public $fk_docdet;
-	public $code_tiers;
+	public $thirdparty_code;
+	public $subledger_account;
+	public $subledger_label;
 	public $numero_compte;
 	public $label_compte;
 	public $debit;
diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php
index 02549be2a94..bf3e80fe866 100644
--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -63,8 +63,6 @@ print load_fiche_titre($langs->trans("AccountancyArea"), '', 'title_accountancy'
 
 $step = 0;
 
-print "<br>\n";
-
 print $langs->trans("AccountancyAreaDescIntro")."<br>\n";
 print "<br>\n";print "<br>\n";
 
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 9eae2072243..6c391531662 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -364,7 +364,7 @@ if (! $error && $action == 'writebookkeeping') {
 					$bookkeeping->date_create = $now;
 
 					if ($tabtype[$key] == 'payment') {
-						$bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
+						$bookkeeping->subledger_account = $tabcompany[$key]['code_compta'];
 
 						$sqlmid = 'SELECT fac.facnumber';
 						$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac";
@@ -378,7 +378,7 @@ if (! $error && $action == 'writebookkeeping') {
 							$bookkeeping->doc_ref = $objmid->facnumber;	// Ref of invoice
 						}
 					} else if ($tabtype[$key] == 'payment_supplier') {
-						$bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
+						$bookkeeping->subledger_account = $tabcompany[$key]['code_compta'];
 
 						$sqlmid = 'SELECT facf.ref_supplier, facf.ref';
 						$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf";
@@ -392,7 +392,7 @@ if (! $error && $action == 'writebookkeeping') {
 							$bookkeeping->doc_ref = $objmid->ref_supplier . ' (' . $objmid->ref . ')'; // Ref on invoice
 						}
 					} else if ($tabtype[$key] == 'payment_expensereport') {
-						$bookkeeping->code_tiers = $tabuser[$key]['accountancy_code'];
+						$bookkeeping->subledger_account = $tabuser[$key]['accountancy_code'];
 
 						$sqlmid = 'SELECT e.ref';
 						$sqlmid .= " FROM " . MAIN_DB_PREFIX . "expensereport as e";
@@ -405,13 +405,13 @@ if (! $error && $action == 'writebookkeeping') {
 							$bookkeeping->doc_ref = $objmid->ref; // Ref of expensereport
 						}
 					} else if ($tabtype[$key] == 'payment_vat') {
-						$bookkeeping->code_tiers = '';
+						$bookkeeping->subledger_account = '';
 						$bookkeeping->doc_ref = $langs->trans("PaymentVat") . ' (' . $val["paymentvatid"] . ')'; // Rowid of vat payment
 					} else if ($tabtype[$key] == 'payment_donation') {
-						$bookkeeping->code_tiers = '';
+						$bookkeeping->subledger_account = '';
 						$bookkeeping->doc_ref = $langs->trans("Donation") . ' (' . $val["paymentdonationid"] . ')'; // Rowid of donation
 					} else if ($tabtype[$key] == 'payment_salary') {
-						$bookkeeping->code_tiers = '';
+						$bookkeeping->subledger_account = '';
 						$bookkeeping->label_compte = $tabuser[$key]['name'];
 						$bookkeeping->doc_ref = $langs->trans("SalaryPayment") . ' (' . $val["paymentsalid"] . ')'; // Ref of salary payment
 					}
@@ -458,7 +458,7 @@ if (! $error && $action == 'writebookkeeping') {
 					$bookkeeping->date_create = $now;
 
 					if (in_array($tabtype[$key], array('sc', 'payment_sc'))) {   // If payment is payment of social contribution
-						$bookkeeping->code_tiers = '';
+						$bookkeeping->subledger_account = '';
 						$bookkeeping->numero_compte = $k;
 					} else if ($tabtype[$key] == 'payment') {	// If payment is payment of customer invoice, we get ref of invoice
 						$sqlmid = 'SELECT fac.facnumber';
@@ -472,7 +472,7 @@ if (! $error && $action == 'writebookkeeping') {
 							$objmid = $db->fetch_object($resultmid);
 							$bookkeeping->doc_ref = $objmid->facnumber;
 						}
-						$bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
+						$bookkeeping->subledger_account = $tabcompany[$key]['code_compta'];
 						$bookkeeping->numero_compte = $k;
 					} else if ($tabtype[$key] == 'payment_supplier') {		   // If payment is payment of supplier invoice, we get ref of invoice
 						$sqlmid = 'SELECT facf.ref_supplier,facf.ref';
@@ -486,23 +486,23 @@ if (! $error && $action == 'writebookkeeping') {
 							$objmid = $db->fetch_object($resultmid);
 							$bookkeeping->doc_ref = $objmid->ref_supplier . ' (' . $objmid->ref . ')';
 						}
-						$bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
+						$bookkeeping->subledger_account = $tabcompany[$key]['code_compta'];
 						$bookkeeping->numero_compte = $k;
 					} else if ($tabtype[$key] == 'payment_vat') {
-						$bookkeeping->code_tiers = '';
+						$bookkeeping->subledger_account = '';
 						$bookkeeping->numero_compte = $k;
 						$bookkeeping->doc_ref = $langs->trans("PaymentVat") . ' (' . $val["paymentvatid"] . ')'; // Rowid of vat
 					} else if ($tabtype[$key] == 'payment_donation') {
-						$bookkeeping->code_tiers = '';
+						$bookkeeping->subledger_account = '';
 						$bookkeeping->numero_compte = $k;
 						$bookkeeping->doc_ref = $langs->trans("Donation") . ' (' . $val["paymentdonationid"] . ')'; // Rowid of donation
 					} else if ($tabtype[$key] == 'payment_salary') {
-						$bookkeeping->code_tiers = $tabuser[$key]['accountancy_code'];
+						$bookkeeping->subledger_account = $tabuser[$key]['accountancy_code'];
 						$bookkeeping->numero_compte = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
 						$bookkeeping->label_compte = $tabuser[$key]['name'];
 						$bookkeeping->doc_ref = $langs->trans("SalaryPayment") . ' (' . $val["paymentsalid"] . ')'; // Rowid of salary payment
 					} else if ($tabtype[$key] == 'banktransfert') {
-						$bookkeeping->code_tiers = '';
+						$bookkeeping->subledger_account = '';
 						$bookkeeping->numero_compte = $k;
 					} else {
 						// FIXME Should be a temporary account ???
@@ -758,7 +758,7 @@ if (empty($action) || $action == 'view') {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
 	}*/
 
-	print '<div class="tabsAction">';
+	print '<div class="tabsAction tabsActionNoBottom">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
 	print '</div>';
 
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index 557218a0ee6..759dca8dae9 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -62,7 +62,7 @@ if ($user->societe_id > 0)
 /*
  * Actions
  */
- 
+
 // Get informations of journal
 $accountingjournalstatic = new AccountingJournal($db);
 $accountingjournalstatic->fetch($id_journal);
@@ -175,7 +175,8 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->doc_type = 'expense_report';
 					$bookkeeping->fk_doc = $key;
 					$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
-					$bookkeeping->code_tiers = $tabuser[$key]['user_accountancy_code'];
+					$bookkeeping->subledger_account = $tabuser[$key]['user_accountancy_code'];
+					$bookkeeping->subledger_label = $tabuser[$key]['user_accountancy_code'];
 					$bookkeeping->label_compte = $tabuser[$key]['name'];
 					$bookkeeping->numero_compte = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
 					$bookkeeping->montant = $mt;
@@ -222,7 +223,8 @@ if ($action == 'writebookkeeping') {
 						$bookkeeping->doc_type = 'expense_report';
 						$bookkeeping->fk_doc = $key;
 						$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
-						$bookkeeping->code_tiers = '';
+						$bookkeeping->subledger_account = '';
+						$bookkeeping->subledger_label = '';
 						$bookkeeping->label_compte = $accountingaccount->label;
 						$bookkeeping->numero_compte = $k;
 						$bookkeeping->montant = $mt;
@@ -267,7 +269,8 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->doc_type = 'expense_report';
 					$bookkeeping->fk_doc = $key;
 					$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
-					$bookkeeping->code_tiers = '';
+					$bookkeeping->subledger_account = '';
+					$bookkeeping->subledger_label = '';
 					$bookkeeping->label_compte = $langs->trans("VAT"). ' '.$def_tva[$key];
 					$bookkeeping->numero_compte = $k;
 					$bookkeeping->montant = $mt;
@@ -462,7 +465,7 @@ if (empty($action) || $action == 'view') {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
 	}*/
 
-	print '<div class="tabsAction">';
+	print '<div class="tabsAction tabsActionNoBottom">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
 	print '</div>';
 
@@ -576,7 +579,7 @@ if (empty($action) || $action == 'view') {
 			}
 			else print $accountoshow;
 			print "</td>";
-			print "<td>" . $userstatic->getNomUrl(0, 'user', 16) . ' - ' . $langs->trans("Code_tiers") . "</td>";
+			print "<td>" . $userstatic->getNomUrl(0, 'user', 16) . ' - ' . $langs->trans("subledger_account") . "</td>";
 			print '<td align="right">' . ($mt < 0 ? - price(- $mt) : '') . "</td>";
 			print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
 			print "</tr>";
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 3729860d29d..506c5517821 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -131,7 +131,7 @@ if ($result) {
 
 		// contrôles
 		$compta_soc = (! empty($obj->code_compta_fournisseur)) ? $obj->code_compta_fournisseur : $cptfour;
-		
+
 		$compta_prod = $obj->compte;
 		if (empty($compta_prod)) {
 			if ($obj->product_type == 0)
@@ -214,9 +214,10 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->doc_type = 'supplier_invoice';
 					$bookkeeping->fk_doc = $key;
 					$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
-					$bookkeeping->code_tiers = $tabcompany[$key]['code_fournisseur'];
-					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("Code_tiers");
-					$bookkeeping->numero_compte = $tabcompany[$key]['code_compta_fournisseur'];
+					$bookkeeping->thirdparty_code = $tabcompany[$key]['code_fournisseur'];
+					$bookkeeping->subledger_account = $tabcompany[$key]['code_compta_fournisseur'];
+					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("subledger_account");
+					$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER;
 					$bookkeeping->montant = $mt;
 					$bookkeeping->sens = ($mt >= 0) ? 'C' : 'D';
 					$bookkeeping->debit = ($mt <= 0) ? $mt : 0;
@@ -261,7 +262,8 @@ if ($action == 'writebookkeeping') {
 						$bookkeeping->doc_type = 'supplier_invoice';
 						$bookkeeping->fk_doc = $key;
 						$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
-						$bookkeeping->code_tiers = '';
+						$bookkeeping->subledger_account = '';
+						$bookkeeping->subledger_label = '';
 						$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $accountingaccount->label;
 						$bookkeeping->numero_compte = $k;
 						$bookkeeping->montant = $mt;
@@ -306,7 +308,8 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->doc_type = 'supplier_invoice';
 					$bookkeeping->fk_doc = $key;
 					$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
-					$bookkeeping->code_tiers = '';
+					$bookkeeping->subledger_account = '';
+					$bookkeeping->subledger_label = '';
 					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("VAT"). ' '.$def_tva[$key];
 					$bookkeeping->numero_compte = $k;
 					$bookkeeping->montant = $mt;
@@ -479,7 +482,7 @@ $companystatic = new Fournisseur($db);
 				print '"' . $date . '"' . $sep;
 				print '"' . $val["ref"] . '"' . $sep;
 				print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
-				print '"' . dol_trunc($companystatic->name, 16) . ' - ' . $val["refsuppliersologest"] . ' - ' . $langs->trans("Code_tiers") . '"' . $sep;
+				print '"' . dol_trunc($companystatic->name, 16) . ' - ' . $val["refsuppliersologest"] . ' - ' . $langs->trans("subledger_account") . '"' . $sep;
 				print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
 				print '"' . ($mt >= 0 ? price($mt) : '') . '"';
 			}
@@ -518,7 +521,7 @@ if (empty($action) || $action == 'view') {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
 	}*/
 
-	print '<div class="tabsAction">';
+	print '<div class="tabsAction tabsActionNoBottom">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
 	print '</div>';
 
@@ -635,7 +638,7 @@ if (empty($action) || $action == 'view') {
 			}
 			else print $accountoshow;
 			print "</td>";
-			print "<td>" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("Code_tiers") . "</td>";
+			print "<td>" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("subledger_account") . "</td>";
 			// print "</td><td>" . $langs->trans("ThirdParty");
 			// print ' (' . $companystatic->getNomUrl(0, 'supplier', 16) . ')';
 			// print "</td>";
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 0d2e7ac19cc..8506b2a480b 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -231,10 +231,10 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->doc_type = 'customer_invoice';
 					$bookkeeping->fk_doc = $key;
 					$bookkeeping->fk_docdet = 0;	// Useless, can be several lines that are source of this record to add
-					$bookkeeping->code_tiers = $tabcompany[$key]['code_client'];
-					$bookkeeping->numero_compte = $tabcompany[$key]['code_compta'];
-					// $bookkeeping->label_compte = $tabcompany[$key]['name'];
-					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers");
+					$bookkeeping->thirdparty_code = $tabcompany[$key]['code_client'];
+					$bookkeeping->subledger_account = $tabcompany[$key]['code_compta'];
+					$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
+					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("subledger_account");
 					$bookkeeping->montant = $mt;
 					$bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
 					$bookkeeping->debit = ($mt >= 0) ? $mt : 0;
@@ -277,7 +277,8 @@ if ($action == 'writebookkeeping') {
 						$bookkeeping->doc_type = 'customer_invoice';
 						$bookkeeping->fk_doc = $key;
 						$bookkeeping->fk_docdet = 0;	// Useless, can be several lines that are source of this record to add;
-						$bookkeeping->code_tiers = '';
+						$bookkeeping->subledger_account = '';
+						$bookkeeping->subledger_label = '';
 						$bookkeeping->numero_compte = $k;
 						$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $accountingaccount->label;
 						$bookkeeping->montant = $mt;
@@ -321,7 +322,8 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->doc_type = 'customer_invoice';
 					$bookkeeping->fk_doc = $key;
 					$bookkeeping->fk_docdet = 0;	// Useless, can be several lines that are source of this record to add
-					$bookkeeping->code_tiers = '';
+					$bookkeeping->subledger_account = '';
+					$bookkeeping->subledger_label = '';
 					$bookkeeping->numero_compte = $k;
 					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT").' '.$def_tva[$key];
 					$bookkeeping->montant = $mt;
@@ -373,7 +375,7 @@ if ($action == 'writebookkeeping') {
 	{
 		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
 	}
-	
+
 	$action='';
 }
 
@@ -416,7 +418,7 @@ $form = new Form($db);
 				print length_accounta(html_entity_decode($k)) . $sep;
 				print ($mt < 0 ? 'C' : 'D') . $sep;
 				print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
-				print dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers") . $sep;
+				print dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("subledger_account") . $sep;
 				print $val["ref"];
 				print "\n";
 			}
@@ -469,7 +471,7 @@ $form = new Form($db);
 				print '"' . $date . '"' . $sep;
 				print '"' . $val["ref"] . '"' . $sep;
 				print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
-				print '"' . dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers") . '"' . $sep;
+				print '"' . dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("subledger_account") . '"' . $sep;
 				print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
 				print '"' . ($mt < 0 ? price(- $mt) : '') . '"';
 				print "\n";
@@ -535,7 +537,7 @@ if (empty($action) || $action == 'view') {
 	} else {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
 	}*/
-	print '<div class="tabsAction">';
+	print '<div class="tabsAction tabsActionNoBottom">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
 	print '</div>';
 
@@ -602,7 +604,7 @@ if (empty($action) || $action == 'view') {
 			// print "</td><td>" . $langs->trans("ThirdParty");
 			// print ' (' . $companystatic->getNomUrl(0, 'customer', 16) . ')';
 			print '</td>';
-			print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers") . "</td>";
+			print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("subledger_account") . "</td>";
 			print "<td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
 			print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
 			print "</tr>";
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index 1780da06456..af0874b8c30 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -224,7 +224,7 @@ class modAccounting extends DolibarrModules
 		$this->rights[$r][4] = 'chartofaccount';
 		$this->rights[$r][5] = '';
 		$r++;
-		
+
 		$this->rights[$r][0] = 50401;
 		$this->rights[$r][1] = 'Bind products and invoices with accounting accounts';
 		$this->rights[$r][2] = 'r';
@@ -242,9 +242,9 @@ class modAccounting extends DolibarrModules
 		$this->rights[$r][5] = 'dispatch_advanced';
 		$r++;
         */
-		
+
 		$this->rights[$r][0] = 50411;
-		$this->rights[$r][1] = 'Read operations in General Ledger';
+		$this->rights[$r][1] = 'Read operations in Ledger';
 		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'mouvements';
@@ -252,7 +252,7 @@ class modAccounting extends DolibarrModules
 		$r++;
 
 		$this->rights[$r][0] = 50412;
-		$this->rights[$r][1] = 'Write/Edit operations in General Ledger';
+		$this->rights[$r][1] = 'Write/Edit operations in Ledger';
 		$this->rights[$r][2] = 'w';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'mouvements';
@@ -260,7 +260,7 @@ class modAccounting extends DolibarrModules
 		$r++;
 
 		$this->rights[$r][0] = 50420;
-		$this->rights[$r][1] = 'Report and export reports (turnover, balance, journals, general ledger)';
+		$this->rights[$r][1] = 'Report and export reports (turnover, balance, journals, ledger)';
 		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'comptarapport';
@@ -279,7 +279,7 @@ class modAccounting extends DolibarrModules
 		// Menus
 		//-------
 		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-		
+
 		// Exports
         //--------
         $r=0;
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 46e3b698100..e5ee1866567 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -187,6 +187,7 @@ UPDATE llx_bank_account as ba set fk_accountancy_journal = (SELECT rowid FROM ll
 ALTER TABLE llx_bank_account ADD CONSTRAINT fk_bank_account_accountancy_journal FOREIGN KEY (fk_accountancy_journal) REFERENCES llx_accounting_journal (rowid);
 
 --Update general ledger for FEC format & harmonization
+
 ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN code_tiers varchar(32);
 ALTER TABLE llx_accounting_bookkeeping CHANGE COLUMN code_tiers thirdparty_code varchar(32);
 
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 5f3d4eef2da..8ff65371fa5 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -49,8 +49,8 @@ AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. F
 AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %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 General Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>. 
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>. 
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -61,6 +61,8 @@ ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
@@ -77,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=General ledger
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
@@ -141,16 +143,16 @@ TransactionNumShort=Num. transaction
 AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -192,7 +194,7 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
+GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
 NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
@@ -261,4 +263,4 @@ NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so does not contains transaction modified manualy in the General ledger. It will be replaced by a more complete report in a next version. 
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version. 
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index c85a2671c21..6f8a1b5e301 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -190,8 +190,10 @@ AccountancyJournal=Accountancy code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month

From f39fb5187a4f490378d672a88794f254af27c055 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Jun 2017 20:27:40 +0200
Subject: [PATCH 226/438] Fix component to select journal

---
 htdocs/accountancy/bookkeeping/card.php         |  2 +-
 htdocs/accountancy/bookkeeping/list.php         |  6 +++---
 htdocs/compta/bank/card.php                     |  4 ++--
 htdocs/core/class/html.formaccounting.class.php | 17 +++++++----------
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 3ef418e2e20..f40bfda856f 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -256,7 +256,7 @@ if ($action == 'create') {
 	print '<tr>';
 	print '<td class="fieldrequired">'.$langs->trans("AccountancyJournal").'</td>';
 	print '<td>';
-	print $formaccountancy->select_journal('', 'code_journal', '', 0, '', 1, 1, 1, 1);
+	print $formaccountancy->select_journal('', 'code_journal', '', 0, 1, 1, 1, 1);
 	print '</td></tr>';
 
 	print '<tr>';
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index b6685248ca7..cd93b1142f8 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -322,7 +322,7 @@ if ($action == 'delbookkeepingyear') {
 		$delyear = dol_print_date(dol_now(), '%Y');
 	}
 	$year_array = $formaccounting->selectyear_accountancy_bookkepping($delyear, 'delyear', 0, 'array');
-	$journal_array = $formaccounting->selectjournal($deljournal, 'deljournal', '', 1, 'array', 1, 1);
+	$journal_array = $formaccounting->select_journal($deljournal, 'deljournal', '', 1, 1, 1, '', 0, 1);
 
 	$form_question['delyear'] = array (
 			'name' => 'delyear',
@@ -333,9 +333,9 @@ if ($action == 'delbookkeepingyear') {
 	);
 	$form_question['deljournal'] = array (
 			'name' => 'deljournal',
-			'type' => 'select',
+			'type' => 'other',       // We don't use select here, the journal_array is already a select html component
 			'label' => $langs->trans('DelJournal'),
-			'values' => $journal_array,
+			'value' => $journal_array,
 			'default' => $deljournal
 	);
 
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 06918ff2846..1f55698d13f 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -524,7 +524,7 @@ if ($action == 'create')
 	{
 		print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
 	    print '<td>';
-		print $formaccounting->select_journal($object->fk_accountancy_journal, 'fk_accountancy_journal', 4, 1, '', 0, 0);
+		print $formaccounting->select_journal($object->fk_accountancy_journal, 'fk_accountancy_journal', 4, 1, 0, 0);
 		print '</td></tr>';
 	}
 
@@ -982,7 +982,7 @@ else
 		{
 			print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
 			print '<td>';
-			print $formaccounting->select_journal($object->fk_accountancy_journal, 'fk_accountancy_journal', 4, 1, '', 0, 0);
+			print $formaccounting->select_journal($object->fk_accountancy_journal, 'fk_accountancy_journal', 4, 1, 0, 0);
 			print '</td></tr>';
 		}
 
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index 2d444c1aefe..e37e1690ca2 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -54,15 +54,14 @@ class FormAccounting extends Form
 	 * @param	string	$htmlname	Name of field in html form
 	 * @param	int		$nature		Limit the list to a particular type of journals (1:various operations / 2:sale / 3:purchase / 4:bank / 9: has-new)
 	 * @param	int		$showempty	Add an empty field
-	 * @param	array	$event		Event options
 	 * @param	int		$select_in	0=selectid value is the journal rowid (default) or 1=selectid is journal code
 	 * @param	int		$select_out	Set value returned by select. 0=rowid (default), 1=code
 	 * @param	string	$morecss	More css non HTML object
 	 * @param	string	$usecache	Key to use to store result into a cache. Next call with same key will reuse the cache.
-	 *
+	 * @param   int     $disabledajaxcombo Disable ajax combo box.
 	 * @return	string				String with HTML select
 	 */
-	function select_journal($selectid, $htmlname = 'journal', $nature=0, $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $morecss='maxwidth300 maxwidthonsmartphone', $usecache='')
+	function select_journal($selectid, $htmlname = 'journal', $nature=0, $showempty = 0, $select_in = 0, $select_out = 0, $morecss='maxwidth300 maxwidthonsmartphone', $usecache='', $disabledajaxcombo=0)
 	{
 		global $conf;
 
@@ -92,8 +91,6 @@ class FormAccounting extends Form
 				return -1;
 			}
 
-			$out = ajax_combobox($htmlname, $event);
-
     		$selected = 0;
 			while ($obj = $this->db->fetch_object($resql))
 			{
@@ -125,7 +122,7 @@ class FormAccounting extends Form
 			}
 		}
 
-		$out .= Form::selectarray($htmlname, $options, $selected, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, 1);
+		$out .= Form::selectarray($htmlname, $options, $selected, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, ($disabledajaxcombo?0:1));
 
 		return $out;
 	}
@@ -204,9 +201,9 @@ class FormAccounting extends Form
         {
             dol_print_error($db,$db->lasterror());
         }
-        
-        $out .= ajax_combobox($htmlname, $event);
-        
+
+        $out .= ajax_combobox($htmlname, array());
+
         print $out;
     }
 
@@ -260,7 +257,7 @@ class FormAccounting extends Form
 		require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 
 		$out = '';
-		
+
     	$options = array();
 		if ($usecache && ! empty($this->options_cache[$usecache]))
 		{

From 78d5520741746af4874f0a628d48996a83e95094 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Thu, 15 Jun 2017 21:23:35 +0200
Subject: [PATCH 227/438] Fix: missing _cleanObjectDatas function

---
 htdocs/admin/agenda.php                       |  3 +-
 htdocs/admin/agenda_other.php                 |  1 +
 .../action/class/api_agendaevents.class.php   | 58 +++++++++++++++++++
 3 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index 22679ca697b..a30ebad4703 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -33,6 +33,7 @@ if (!$user->admin)
 
 $langs->load("admin");
 $langs->load("other");
+$langs->load("agenda");
 
 $action = GETPOST('action','alpha');
 $cancel = GETPOST('cancel','alpha');
@@ -172,7 +173,7 @@ if (! empty($triggers))
 			if ($trigger['code'] == 'FICHINTER_CLASSIFY_BILLED' && empty($conf->global->FICHINTER_CLASSIFY_BILLED)) continue;
 			if ($trigger['code'] == 'FICHINTER_CLASSIFY_UNBILLED' && empty($conf->global->FICHINTER_CLASSIFY_BILLED)) continue;
 
-			
+
 			print '<tr class="oddeven">';
 			print '<td>'.$trigger['code'].'</td>';
 			print '<td>'.$trigger['label'].'</td>';
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 44ec3ade889..31bcf1077e6 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -36,6 +36,7 @@ if (!$user->admin)
 
 $langs->load("admin");
 $langs->load("other");
+$langs->load("agenda");
 
 $action = GETPOST('action','alpha');
 $value = GETPOST('value','alpha');
diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index f32c721a826..40737a83799 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -111,8 +111,11 @@ class AgendaEvents extends DolibarrApi
         if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
 
         $sql = "SELECT t.id as rowid";
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
         $sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as t";
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
         $sql.= ' WHERE t.entity IN ('.getEntity('agenda').')';
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
         if ($user_ids) $sql.=" AND t.fk_user_action IN (".$user_ids.")";
         if ($socid > 0) $sql.= " AND t.fk_soc = ".$socid;
         // Insert sale filter
@@ -298,4 +301,59 @@ class AgendaEvents extends DolibarrApi
         }
         return $event;
     }
+
+    /**
+     * Clean sensible object datas
+     *
+     * @param	object	$object		Object to clean
+     * @return	array				Array of cleaned object properties
+     */
+    function _cleanObjectDatas($object) {
+
+    	$object = parent::_cleanObjectDatas($object);
+
+    	unset($object->import_key);
+    	unset($object->array_options);
+    	unset($object->linkedObjectsIds);
+    	unset($object->context);
+    	unset($object->canvas);
+    	unset($object->fk_project);
+    	unset($object->contact);
+    	unset($object->contact_id);
+    	unset($object->thirdparty);
+    	unset($object->user);
+    	unset($object->origin);
+    	unset($object->origin_id);
+    	unset($object->ref_ext);
+    	unset($object->statut);
+    	unset($object->country);
+    	unset($object->country_id);
+    	unset($object->country_code);
+    	unset($object->barcode_type);
+    	unset($object->barcode_type_code);
+    	unset($object->barcode_type_label);
+    	unset($object->barcode_type_coder);
+    	unset($object->mode_reglement_id);
+    	unset($object->cond_reglement_id);
+    	unset($object->cond_reglement);
+    	unset($object->fk_delivery_address);
+    	unset($object->shipping_method_id);
+    	unset($object->fk_account);
+    	unset($object->total_ht);
+    	unset($object->total_tva);
+    	unset($object->total_localtax1);
+    	unset($object->total_localtax2);
+    	unset($object->total_ttc);
+    	unset($object->fk_incoterms);
+    	unset($object->libelle_incoterms);
+    	unset($object->location_incoterms);
+    	unset($object->name);
+    	unset($object->lastname);
+    	unset($object->firstname);
+    	unset($object->civility_id);
+    	unset($object->contact);
+    	unset($object->societe);
+
+    	return $object;
+    }
 }

From 8b7ca1f280e5b6f1465caddd1cd4d9c12adf920f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Jun 2017 21:27:20 +0200
Subject: [PATCH 228/438] Fix missing vat_src_code into table of expense report

---
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql        | 3 +++
 htdocs/install/mysql/tables/llx_expensereport_det.sql | 1 +
 2 files changed, 4 insertions(+)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index e5ee1866567..a66ef47fba6 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -90,6 +90,8 @@ ALTER TABLE llx_expedition ADD COLUMN fk_projet integer DEFAULT NULL after fk_so
 ALTER TABLE llx_expensereport ADD COLUMN import_key			varchar(14);
 ALTER TABLE llx_expensereport ADD COLUMN extraparams		varchar(255);	
 
+
+
 ALTER TABLE llx_bank_account ADD COLUMN extraparams		varchar(255);	
 
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_CREATE','Product or service created','Executed when a product or sevice is created','product',30);
@@ -230,6 +232,7 @@ ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_invoic
 ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_invoice_supplier_source FOREIGN KEY (fk_invoice_supplier)      REFERENCES llx_facture_fourn (rowid);
 
 ALTER TABLE llx_facture_rec ADD COLUMN vat_src_code	varchar(10) DEFAULT '';
+ALTER TABLE llx_expensereport_det ADD COLUMN vat_src_code varchar(10)  DEFAULT '';
 
 DELETE FROM llx_const WHERE name = __ENCRYPT('ADHERENT_BANK_USE_AUTO')__;
 
diff --git a/htdocs/install/mysql/tables/llx_expensereport_det.sql b/htdocs/install/mysql/tables/llx_expensereport_det.sql
index 069cd534e4f..8d01f29de68 100644
--- a/htdocs/install/mysql/tables/llx_expensereport_det.sql
+++ b/htdocs/install/mysql/tables/llx_expensereport_det.sql
@@ -27,6 +27,7 @@ CREATE TABLE llx_expensereport_det
    qty real NOT NULL,
    value_unit real NOT NULL,
    remise_percent real,
+   vat_src_code					varchar(10)  DEFAULT '',		-- Vat code used as source of vat fields. Not strict foreign key here.
    tva_tx						double(6,3),					-- Vat rate
    localtax1_tx               	double(6,3)  DEFAULT 0,    		-- localtax1 rate
    localtax1_type			 	varchar(10)	  	 NULL, 			-- localtax1 type

From 9410466d727f94f6e2b99c390f43a2e4a4bc8e00 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Thu, 15 Jun 2017 21:51:31 +0200
Subject: [PATCH 229/438] Fix: better check and security

---
 .../action/class/api_agendaevents.class.php   | 31 ++++++++++---------
 htdocs/core/lib/security.lib.php              |  4 +--
 htdocs/societe/class/api_contacts.class.php   | 10 +++---
 3 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index 40737a83799..40fce1fd640 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -63,20 +63,20 @@ class AgendaEvents extends DolibarrApi
      */
     function get($id)
     {
-        if(! DolibarrApiAccess::$user->rights->agenda->myactions->read) {
+        if (! DolibarrApiAccess::$user->rights->agenda->myactions->read) {
             throw new RestException(401, "Insuffisant rights to read an event");
         }
 
         $result = $this->actioncomm->fetch($id);
-        if( ! $result ) {
+        if ( ! $result ) {
             throw new RestException(404, 'Agenda Events not found');
         }
 
-        if(! DolibarrApiAccess::$user->rights->agenda->allactions->read && $this->actioncomm->ownerid != DolibarrApiAccess::$user->id) {
+        if (! DolibarrApiAccess::$user->rights->agenda->allactions->read && $this->actioncomm->ownerid != DolibarrApiAccess::$user->id) {
             throw new RestException(401, "Insuffisant rights to read event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
         }
 
-		if( ! DolibarrApi::_checkAccessToResource('agenda',$this->actioncomm->id)) {
+		if ( ! DolibarrApi::_checkAccessToResource('agenda',$this->actioncomm->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -102,6 +102,10 @@ class AgendaEvents extends DolibarrApi
 
         $obj_ret = array();
 
+        if (! DolibarrApiAccess::$user->rights->agenda->myactions->read) {
+        	throw new RestException(401, "Insuffisant rights to read events");
+        }
+
         // case of external user
         $socid = 0;
         if (! empty(DolibarrApiAccess::$user->socid)) $socid = DolibarrApiAccess::$user->socid;
@@ -155,7 +159,7 @@ class AgendaEvents extends DolibarrApi
             {
                 $obj = $db->fetch_object($result);
                 $actioncomm_static = new ActionComm($db);
-                if($actioncomm_static->fetch($obj->rowid)) {
+                if ($actioncomm_static->fetch($obj->rowid)) {
                     $obj_ret[] = $this->_cleanObjectDatas($actioncomm_static);
                 }
                 $i++;
@@ -164,7 +168,7 @@ class AgendaEvents extends DolibarrApi
         else {
             throw new RestException(503, 'Error when retrieve Agenda Event list : '.$db->lasterror());
         }
-        if( ! count($obj_ret)) {
+        if ( ! count($obj_ret)) {
             throw new RestException(404, 'No Agenda Event found');
         }
 		return $obj_ret;
@@ -178,10 +182,10 @@ class AgendaEvents extends DolibarrApi
      */
     function post($request_data = NULL)
     {
-      if(! DolibarrApiAccess::$user->rights->agenda->myactions->create) {
+      if (! DolibarrApiAccess::$user->rights->agenda->myactions->create) {
 			  throw new RestException(401, "Insuffisant rights to create your Agenda Event");
 		  }
-      if(! DolibarrApiAccess::$user->rights->agenda->allactions->create && DolibarrApiAccess::$user->id != $request_data['userownerid']) {
+      if (! DolibarrApiAccess::$user->rights->agenda->allactions->create && DolibarrApiAccess::$user->id != $request_data['userownerid']) {
 		      throw new RestException(401, "Insuffisant rights to create an Agenda Event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
 		  }
 
@@ -216,19 +220,19 @@ class AgendaEvents extends DolibarrApi
      */
     /*
     function put($id, $request_data = NULL) {
-      if(! DolibarrApiAccess::$user->rights->agenda->myactions->create) {
+      if (! DolibarrApiAccess::$user->rights->agenda->myactions->create) {
 			  throw new RestException(401, "Insuffisant rights to create your Agenda Event");
 		  }
-      if(! DolibarrApiAccess::$user->rights->agenda->allactions->create && DolibarrApiAccess::$user->id != $request_data['userownerid']) {
+      if (! DolibarrApiAccess::$user->rights->agenda->allactions->create && DolibarrApiAccess::$user->id != $request_data['userownerid']) {
 		      throw new RestException(401, "Insuffisant rights to create an Agenda Event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
 		  }
 
         $result = $this->expensereport->fetch($id);
-        if( ! $result ) {
+        if ( ! $result ) {
             throw new RestException(404, 'expensereport not found');
         }
 
-		if( ! DolibarrApi::_checkAccessToResource('expensereport',$this->expensereport->id)) {
+		if ( ! DolibarrApi::_checkAccessToResource('expensereport',$this->expensereport->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
         foreach($request_data as $field => $value) {
@@ -236,7 +240,7 @@ class AgendaEvents extends DolibarrApi
             $this->expensereport->$field = $value;
         }
 
-        if($this->expensereport->update($id, DolibarrApiAccess::$user,1,'','','update'))
+        if ($this->expensereport->update($id, DolibarrApiAccess::$user,1,'','','update'))
             return $this->get($id);
 
         return false;
@@ -314,7 +318,6 @@ class AgendaEvents extends DolibarrApi
 
     	unset($object->import_key);
     	unset($object->array_options);
-    	unset($object->linkedObjectsIds);
     	unset($object->context);
     	unset($object->canvas);
     	unset($object->fk_project);
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 9a9e78513c3..d3250263a6f 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -403,9 +403,9 @@ function checkUserAccessToObject($user, $featuresarray, $objectid=0, $tableandsh
 		else if (in_array($feature,$checksoc))	// We check feature = checksoc
 		{
 			// If external user: Check permission for external users
-			if ($user->societe_id > 0)
+			if ($user->socid > 0)
 			{
-				if ($user->societe_id <> $objectid) return false;
+				if ($user->socid <> $objectid) return false;
 			}
 			// If internal user: Check permission for internal users that are restricted on their objects
 			else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
diff --git a/htdocs/societe/class/api_contacts.class.php b/htdocs/societe/class/api_contacts.class.php
index 58fe15cf282..f136d6895b2 100644
--- a/htdocs/societe/class/api_contacts.class.php
+++ b/htdocs/societe/class/api_contacts.class.php
@@ -43,7 +43,8 @@ class Contacts extends DolibarrApi
 	/**
 	 * Constructor
 	 */
-	function __construct() {
+	function __construct()
+	{
 		global $db, $conf;
 		$this->db = $db;
 		$this->contact = new Contact($this->db);
@@ -59,7 +60,8 @@ class Contacts extends DolibarrApi
 	 *
 	 * @throws 	RestException
 	 */
-	function get($id) {
+	function get($id)
+	{
 		if (!DolibarrApiAccess::$user->rights->societe->contact->lire)
 		{
 			throw new RestException(401, 'No permission to read contacts');
@@ -105,7 +107,7 @@ class Contacts extends DolibarrApi
 		}
 
         // case of external user, $thirdparty_ids param is ignored and replaced by user's socid
-		$socids = DolibarrApiAccess::$user->societe_id ? DolibarrApiAccess::$user->societe_id : $thirdparty_ids;
+		$socids = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $thirdparty_ids;
 
 		// If the internal user must only see his customers, force searching by him
 		$search_sale = 0;
@@ -171,7 +173,7 @@ class Contacts extends DolibarrApi
 			}
 		}
 		else {
-			throw new RestException(503, 'Error when retreive contacts : ' . $sql);
+			throw new RestException(503, 'Error when retrieve contacts : ' . $sql);
 		}
 		if (!count($obj_ret))
 		{

From 8149bf62a89ca60b0dfd44ec88bff6b600121ea1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Jun 2017 23:47:19 +0200
Subject: [PATCH 230/438] Fix ajaxcombo broken on accouting account edition on
 vat dictionary.

---
 htdocs/admin/dict.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index c83a3aa39be..f920b04bf62 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1502,9 +1502,12 @@ if ($id)
                             }
 
                             $class='tddict';
+                            if ($fieldlist[$field] == 'note' && $id == 10) $class.=' tdoverflowmax200';
                             if ($fieldlist[$field] == 'tracking') $class.=' tdoverflowauto';
                             if ($fieldlist[$field] == 'code') $class.=' width100';
                             if ($fieldlist[$field] == 'position') $class.=' right';
+                            if ($fieldlist[$field] == 'localtax1_type') $class.=' nowrap';
+                            if ($fieldlist[$field] == 'localtax2_type') $class.=' nowrap';
                             // Show value for field
 							if ($showfield) print '<!-- '.$fieldlist[$field].' --><td align="'.$align.'" class="'.$class.'">'.$valuetoshow.'</td>';
                         }
@@ -1694,7 +1697,7 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 			}	// For state page, we do not show the country input (we link to region, not country)
 			print '<td>';
 			$fieldname='country';
-			print $form->select_country((! empty($obj->country_code)?$obj->country_code:(! empty($obj->country)?$obj->country:'')), $fieldname, '', 28, 'maxwidth200 maxwidthonsmartphone');
+			print $form->select_country((! empty($obj->country_code)?$obj->country_code:(! empty($obj->country)?$obj->country:'')), $fieldname, '', 28, 'maxwidth150 maxwidthonsmartphone');
 			print '</td>';
 		}
 		elseif ($fieldlist[$field] == 'country_id')
@@ -1820,7 +1823,7 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 			{
 			    $fieldname = $fieldlist[$field];
 				$accountancy_account = (! empty($obj->$fieldname) ? $obj->$fieldname : 0);
-				print $formaccounting->select_account($accountancy_account, $fieldlist[$field], 1, '', 1, 1, 'maxwidth200 maxwidthonsmartphone');
+				print $formaccounting->select_account($accountancy_account, '.'.$fieldlist[$field], 1, '', 1, 1, 'maxwidth200 maxwidthonsmartphone');
 			}
 			else
 			{

From ac708a8ee993457e43da17b7ddbcb1a06cd1e296 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Jun 2017 23:58:56 +0200
Subject: [PATCH 231/438] Debug accounting module with new structure v6 Make
 accounting module compatible with the new vat code to identify 2 vat code
 with same rate.

---
 .../accountancy/class/bookkeeping.class.php   |  7 +-
 htdocs/accountancy/journal/bankjournal.php    | 10 ++-
 .../journal/expensereportsjournal.php         | 28 ++++---
 .../accountancy/journal/purchasesjournal.php  | 47 ++++++++----
 htdocs/accountancy/journal/sellsjournal.php   | 48 +++++++-----
 .../core/class/html.formaccounting.class.php  |  4 +-
 htdocs/core/lib/functions.lib.php             | 73 ++++++++++++-------
 htdocs/langs/en_US/errors.lang                |  2 +
 8 files changed, 142 insertions(+), 77 deletions(-)

diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index f7c1b4d8b89..9ed4ef29ac1 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -184,7 +184,8 @@ class BookKeeping extends CommonObject
             }
             else
             {
-                $this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForInvoiceLine', $this->fk_doc,  $this->doc_type);
+                //$this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForInvoiceLine', $this->doc_ref,  $this->label_compte);
+                $this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForLine', $this->label_compte);
             }
 
 		    return -1;
@@ -451,7 +452,7 @@ class BookKeeping extends CommonObject
 		$sql .= ' ' . (! isset($this->thirdparty_code) ? 'NULL' : "'" . $this->db->escape($this->thirdparty_code) . "'") . ',';
 		$sql .= ' ' . (! isset($this->subledger_account) ? 'NULL' : "'" . $this->db->escape($this->subledger_account) . "'") . ',';
 		$sql .= ' ' . (! isset($this->subledger_label) ? 'NULL' : "'" . $this->db->escape($this->subledger_label) . "'") . ',';
-		$sql .= ' ' . (! isset($this->numero_compte) ? "'NotDefined'" : "'" . $this->db->escape($this->numero_compte) . "'") . ',';
+		$sql .= ' ' . (! isset($this->numero_compte) ? "NULL" : "'" . $this->db->escape($this->numero_compte) . "'") . ',';
 		$sql .= ' ' . (! isset($this->label_compte) ? 'NULL' : "'" . $this->db->escape($this->label_compte) . "'") . ',';
 		$sql .= ' ' . (! isset($this->debit) ? 'NULL' : $this->debit ). ',';
 		$sql .= ' ' . (! isset($this->credit) ? 'NULL' : $this->credit ). ',';
@@ -461,7 +462,7 @@ class BookKeeping extends CommonObject
 		$sql .= ' ' . (! isset($this->import_key) ? 'NULL' : "'" . $this->db->escape($this->import_key) . "'") . ',';
 		$sql .= ' ' . (empty($this->code_journal) ? 'NULL' : "'" . $this->db->escape($this->code_journal) . "'") . ',';
 		$sql .= ' ' . (empty($this->journal_label) ? 'NULL' : "'" . $this->db->escape($this->journal_label) . "'") . ',';
-		$sql .= ' ' . (empty($this->piece_num) ? 'NULL' : $this->piece_num).',';
+		$sql .= ' ' . (empty($this->piece_num) ? 'NULL' : $this->db->escape($this->piece_num)).',';
 		$sql .= ' ' . (! isset($this->entity) ? '1' : $this->entity);
 		$sql .= ')';
 
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 6c391531662..568edf051ff 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -103,8 +103,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 	$date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
 }
 
-$p = explode(":", $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
-$idpays = $p[0];
+$idpays = $mysoc->country_id;
 
 $sql  = "SELECT b.rowid, b.dateo as do, b.datev as dv, b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type,";
 $sql .= " ba.courant, ba.ref as baref, ba.account_number, ba.fk_accountancy_journal,";
@@ -144,6 +143,7 @@ $result = $db->query($sql);
 if ($result) {
 
 	$num = $db->num_rows($result);
+
 	// Variables
 	$account_supplier = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : $langs->trans("CodeNotDef"));
 	$account_customer = (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef"));
@@ -537,6 +537,12 @@ if (! $error && $action == 'writebookkeeping') {
 		else
 		{
 			$db->rollback();
+
+			if ($error >= 10)
+			{
+			    setEventMessages($langs->trans("ErrorTooManyErrorsProcessStopped"), null, 'errors');
+			    break;  // Break in the foreach
+			}
 		}
 	}
 
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index 759dca8dae9..ca9d05e7e93 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -86,13 +86,13 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 	$date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
 }
 
-$p = explode(":", $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
-$idpays = $p[0];
+$idpays = $mysoc->country_id;
 
 $sql = "SELECT er.rowid, er.ref, er.date_debut as de,";
-$sql .= " erd.rowid as erdid, erd.comments, erd.total_ttc, erd.tva_tx, erd.total_ht, erd.total_tva, erd.fk_code_ventilation,";
+$sql .= " erd.rowid as erdid, erd.comments, erd.total_ttc, erd.tva_tx, erd.total_ht, erd.total_tva, erd.fk_code_ventilation, erd.vat_src_code, ";
 $sql .= " u.rowid as uid, u.firstname, u.lastname, u.accountancy_code as user_accountancy_account,";
-$sql .= " f.accountancy_code, ct.accountancy_code_buy as account_tva, aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte";
+$sql .= " f.accountancy_code, aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte,";
+$sql .= " ct.accountancy_code_buy as account_tva";
 $sql .= " FROM " . MAIN_DB_PREFIX . "expensereport_det as erd";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_tva as ct ON erd.tva_tx = ct.taux AND ct.fk_pays = '" . $idpays . "'";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_type_fees as f ON f.id = erd.fk_c_type_fees";
@@ -110,7 +110,8 @@ dol_syslog('accountancy/journal/expensereportsjournal.php:: $sql=' . $sql);
 $result = $db->query($sql);
 if ($result) {
 	$num = $db->num_rows($result);
-	// les variables
+
+	// Variables
 	$account_salary = (! empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT)) ? $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT : $langs->trans("CodeNotDef");
 	$account_vat = (! empty($conf->global->ACCOUNTING_VAT_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_BUY_ACCOUNT : $langs->trans("CodeNotDef");
 
@@ -130,8 +131,11 @@ if ($result) {
 		$compta_fees = $obj->compte;
 		$compta_tva = (! empty($obj->account_tva) ? $obj->account_tva : $account_vat);
 
-		// Define array for display vat tx
-		$def_tva[$obj->rowid]=price($obj->tva_tx);
+		// Define array to display all VAT rates that use this accounting account $compta_tva
+		if (! empty(price2num($obj->tva_tx)) || ! empty($obj->vat_src_code))
+		{
+            $def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':'')]=(vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':''));
+		}
 
 		$taber[$obj->rowid]["date"] = $db->jdate($obj->de);
 		$taber[$obj->rowid]["ref"] = $obj->ref;
@@ -271,7 +275,7 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
 					$bookkeeping->subledger_account = '';
 					$bookkeeping->subledger_label = '';
-					$bookkeeping->label_compte = $langs->trans("VAT"). ' '.$def_tva[$key];
+					$bookkeeping->label_compte = $langs->trans("VAT"). ' '.join(', ',$def_tva[$key][$k]);
 					$bookkeeping->numero_compte = $k;
 					$bookkeeping->montant = $mt;
 					$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
@@ -307,6 +311,12 @@ if ($action == 'writebookkeeping') {
 		else
 		{
 			$db->rollback();
+
+			if ($error >= 10)
+			{
+			    setEventMessages($langs->trans("ErrorTooManyErrorsProcessStopped"), null, 'errors');
+			    break;  // Break in the foreach
+			}
 		}
 	}
 
@@ -556,7 +566,7 @@ if (empty($action) || $action == 'view') {
 				}
 				else print $accountoshow;
 				print "</td>";
-				print "<td>" . $userstatic->getNomUrl(0, 'user', 16) . ' - ' . $langs->trans("VAT"). ' '.$def_tva[$key]. "</td>";
+				print "<td>" . $userstatic->getNomUrl(0, 'user', 16) . ' - ' . $langs->trans("VAT"). ' '.join(', ',$def_tva[$key][$k]). "</td>";
 				print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
 				print '<td align="right">' . ($mt < 0 ? price(- $mt) : '') . "</td>";
 				print "</tr>";
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 506c5517821..b5f763fe2b1 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -85,26 +85,27 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 	$date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
 }
 
-$p = explode(":", $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
-$idpays = $p[0];
+$idpays = $mysoc->country_id;
 
 $sql = "SELECT f.rowid, f.ref, f.type, f.datef as df, f.libelle,f.ref_supplier,";
-$sql .= " fd.rowid as fdid, fd.description, fd.total_ttc, fd.tva_tx, fd.total_ht, fd.tva as total_tva, fd.product_type,";
+$sql .= " fd.rowid as fdid, fd.description, fd.total_ttc, fd.tva_tx, fd.total_ht, fd.tva as total_tva, fd.product_type, fd.vat_src_code,";
 $sql .= " s.rowid as socid, s.nom as name, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
-$sql .= " p.accountancy_code_buy , ct.accountancy_code_buy as account_tva, aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte";
+$sql .= " p.accountancy_code_buy , aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte,";
+$sql .= " ct.accountancy_code_buy as account_tva";
 $sql .= " FROM " . MAIN_DB_PREFIX . "facture_fourn_det as fd";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_tva as ct ON fd.tva_tx = ct.taux AND ct.fk_pays = '" . $idpays . "'";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = fd.fk_product";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
 $sql .= " JOIN " . MAIN_DB_PREFIX . "facture_fourn as f ON f.rowid = fd.fk_facture_fourn";
 $sql .= " JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
-$sql .= " WHERE f.fk_statut > 0 ";
+$sql .= " WHERE f.fk_statut > 0"; // TODO Facture annulée ?
 $sql .= " AND fd.fk_code_ventilation > 0 ";
 $sql .= " AND f.entity IN (" . getEntity('facture_fourn', 0) . ")";  // We don't share object for accountancy
-if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
-	$sql .= " AND f.type IN (0,1,2)";
-else
-	$sql .= " AND f.type IN (0,1,2,3)";
+if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+    $sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
+} else {
+    $sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
+}
 if ($date_start && $date_end)
 	$sql .= " AND f.datef >= '" . $db->idate($date_start) . "' AND f.datef <= '" . $db->idate($date_end) . "'";
 $sql .= " ORDER BY f.datef";
@@ -114,7 +115,7 @@ $result = $db->query($sql);
 if ($result) {
 	$num = $db->num_rows($result);
 
-	// les variables
+	// Variables
 	$cptfour = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER)) ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : $langs->trans("CodeNotDef");
 	$cpttva = (! empty($conf->global->ACCOUNTING_VAT_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_BUY_ACCOUNT : $langs->trans("CodeNotDef");
 
@@ -139,10 +140,15 @@ if ($result) {
 			else
 				$compta_prod = (! empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef");
 		}
-		$compta_tva = (! empty($obj->account_tva) ? $obj->account_tva : $cpttva);
 
-		//Define array for display vat tx
-		$def_tva[$obj->rowid]=price($obj->tva_tx);
+		$vatdata = getTaxesFromId($obj->tva_tx.($obj->vat_src_code?' ('.$obj->vat_src_code.')':''), $mysoc, $mysoc, 0);
+		$compta_tva = (! empty($vatdata['accountancy_code_buy']) ? $vatdata['accountancy_code_buy'] : $cpttva);
+
+		// Define array to display all VAT rates that use this accounting account $compta_tva
+		if (! empty(price2num($obj->tva_tx)) || ! empty($obj->vat_src_code))
+		{
+            $def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':'')]=(vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':''));
+		}
 
 		$tabfac[$obj->rowid]["date"] = $db->jdate($obj->df);
 		$tabfac[$obj->rowid]["ref"] = $obj->ref_supplier . ' (' . $obj->ref . ')';
@@ -214,8 +220,9 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->doc_type = 'supplier_invoice';
 					$bookkeeping->fk_doc = $key;
 					$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
-					$bookkeeping->thirdparty_code = $tabcompany[$key]['code_fournisseur'];
+					$bookkeeping->thirdparty_code = $companystatic->code_fournisseur;
 					$bookkeeping->subledger_account = $tabcompany[$key]['code_compta_fournisseur'];
+					$bookkeeping->subledger_label = '';    // TODO To complete
 					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("subledger_account");
 					$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER;
 					$bookkeeping->montant = $mt;
@@ -262,6 +269,7 @@ if ($action == 'writebookkeeping') {
 						$bookkeeping->doc_type = 'supplier_invoice';
 						$bookkeeping->fk_doc = $key;
 						$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
+					    $bookkeeping->thirdparty_code = $companystatic->code_fournisseur;
 						$bookkeeping->subledger_account = '';
 						$bookkeeping->subledger_label = '';
 						$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $accountingaccount->label;
@@ -308,9 +316,10 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->doc_type = 'supplier_invoice';
 					$bookkeeping->fk_doc = $key;
 					$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
+					$bookkeeping->thirdparty_code = $companystatic->code_fournisseur;
 					$bookkeeping->subledger_account = '';
 					$bookkeeping->subledger_label = '';
-					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("VAT"). ' '.$def_tva[$key];
+					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("VAT"). ' '.join(', ',$def_tva[$key][$k]);
 					$bookkeeping->numero_compte = $k;
 					$bookkeeping->montant = $mt;
 					$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
@@ -346,6 +355,12 @@ if ($action == 'writebookkeeping') {
 		else
 		{
 			$db->rollback();
+
+			if ($error >= 10)
+			{
+			    setEventMessages($langs->trans("ErrorTooManyErrorsProcessStopped"), null, 'errors');
+			    break;  // Break in the foreach
+			}
 		}
 	}
 
@@ -615,7 +630,7 @@ if (empty($action) || $action == 'view') {
 				}
 				else print $accountoshow;
 				print "</td>";
-				print "<td>" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("VAT"). ' '.$def_tva[$key]. "</td>";
+				print "<td>" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("VAT"). ' '.join(', ',$def_tva[$key][$k]). "</td>";
 				print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
 				print '<td align="right">' . ($mt < 0 ? price(- $mt) : '') . "</td>";
 				print "</tr>";
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 8506b2a480b..24f5ae6e7aa 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -89,27 +89,26 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 	$date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
 }
 
-$p = explode(":", $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
-$idpays = $p[0];
+$idpays = $mysoc->country_id;
 
 $sql = "SELECT f.rowid, f.facnumber, f.type, f.datef as df, f.ref_client,";
-$sql .= " fd.rowid as fdid, fd.description, fd.product_type, fd.total_ht, fd.total_tva, fd.tva_tx, fd.total_ttc,";
+$sql .= " fd.rowid as fdid, fd.description, fd.product_type, fd.total_ht, fd.total_tva, fd.tva_tx, fd.total_ttc, fd.situation_percent, fd.vat_src_code,";
 $sql .= " s.rowid as socid, s.nom as name, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
-$sql .= " p.rowid as pid, p.ref as pref, p.accountancy_code_sell, aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte,";
-$sql .= " fd.situation_percent,ct.accountancy_code_sell as account_tva";
+$sql .= " p.rowid as pid, p.ref as pref, p.accountancy_code_sell, aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte";
+//$sql .= " ct.accountancy_code_sell as account_tva";
 $sql .= " FROM " . MAIN_DB_PREFIX . "facturedet as fd";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = fd.fk_product";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
 $sql .= " JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_facture";
 $sql .= " JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_tva as ct ON fd.tva_tx = ct.taux AND ct.fk_pays = '" . $idpays . "'";
+//$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_tva as ct ON ((fd.vat_src_code <> '' AND fd.vat_src_code = ct.code) OR (fd.vat_src_code = '' AND fd.tva_tx = ct.taux)) AND ct.fk_pays = '" . $idpays . "'";
 $sql .= " WHERE fd.fk_code_ventilation > 0";
 $sql .= " AND f.entity IN (".getEntity('facture', 0).')';	// We don't share object for accountancy
 $sql .= " AND f.fk_statut > 0"; // TODO Facture annulée ?
 if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
 } else {
-	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_STANDARD . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
+	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
 }
 $sql .= " AND fd.product_type IN (0,1)";
 if ($date_start && $date_end)
@@ -127,29 +126,33 @@ if ($result) {
 	$tabcompany = array ();
 
 	$num = $db->num_rows($result);
-	$i = 0;
 
+	// Variables
 	$cptcli = (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER)) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef");
+	$cpttva = (! empty($conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT : $langs->trans("CodeNotDef");
 
+	$i = 0;
 	while ( $i < $num ) {
 		$obj = $db->fetch_object($result);
 
-		// les variables
 		$compta_soc = (! empty($obj->code_compta)) ? $obj->code_compta : $cptcli;
 
 		$compta_prod = $obj->compte;
 		if (empty($compta_prod)) {
 			if ($obj->product_type == 0)
 				$compta_prod = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef");
-				else
-					$compta_prod = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef");
+			else
+				$compta_prod = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef");
 		}
-		$cpttva = (! empty($conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT : $langs->trans("CodeNotDef");
-		$compta_tva = (! empty($obj->account_tva) ? $obj->account_tva : $cpttva);
 
+		$vatdata = getTaxesFromId($obj->tva_tx.($obj->vat_src_code?' ('.$obj->vat_src_code.')':''), $mysoc, $mysoc, 0);
+		$compta_tva = (! empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $cpttva);
 
-		//Define array for display vat tx
-		$def_tva[$obj->rowid]=price($obj->tva_tx);
+		// Define array to display all VAT rates that use this accounting account $compta_tva
+		if (! empty(price2num($obj->tva_tx)) || ! empty($obj->vat_src_code))
+		{
+            $def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':'')]=(vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':''));
+		}
 
 		// Situation invoices handling
 		$line = new FactureLigne($db);
@@ -231,8 +234,9 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->doc_type = 'customer_invoice';
 					$bookkeeping->fk_doc = $key;
 					$bookkeeping->fk_docdet = 0;	// Useless, can be several lines that are source of this record to add
-					$bookkeeping->thirdparty_code = $tabcompany[$key]['code_client'];
+					$bookkeeping->thirdparty_code = $companystatic->code_client;
 					$bookkeeping->subledger_account = $tabcompany[$key]['code_compta'];
+					$bookkeeping->subledger_label = '';    // TODO To complete
 					$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
 					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("subledger_account");
 					$bookkeeping->montant = $mt;
@@ -277,6 +281,7 @@ if ($action == 'writebookkeeping') {
 						$bookkeeping->doc_type = 'customer_invoice';
 						$bookkeeping->fk_doc = $key;
 						$bookkeeping->fk_docdet = 0;	// Useless, can be several lines that are source of this record to add;
+					    $bookkeeping->thirdparty_code = $companystatic->code_client;
 						$bookkeeping->subledger_account = '';
 						$bookkeeping->subledger_label = '';
 						$bookkeeping->numero_compte = $k;
@@ -322,10 +327,11 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->doc_type = 'customer_invoice';
 					$bookkeeping->fk_doc = $key;
 					$bookkeeping->fk_docdet = 0;	// Useless, can be several lines that are source of this record to add
+					$bookkeeping->thirdparty_code = $companystatic->code_client;
 					$bookkeeping->subledger_account = '';
 					$bookkeeping->subledger_label = '';
 					$bookkeeping->numero_compte = $k;
-					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT").' '.$def_tva[$key];
+					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT").' '.join(', ',$def_tva[$key][$k]);
 					$bookkeeping->montant = $mt;
 					$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
 					$bookkeeping->debit = ($mt < 0) ? $mt : 0;
@@ -360,6 +366,12 @@ if ($action == 'writebookkeeping') {
 		else
 		{
 			$db->rollback();
+
+			if ($error >= 10)
+			{
+                setEventMessages($langs->trans("ErrorTooManyErrorsProcessStopped"), null, 'errors');
+                break;  // Break in the foreach
+			}
 		}
 
 	}
@@ -651,7 +663,7 @@ if (empty($action) || $action == 'view') {
 				}
 				else print $accountoshow;
 				print "</td>";
-				print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT") . ' '.$def_tva[$key]. "</td>";
+				print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT") . ' '.join(', ',$def_tva[$key][$k]). "</td>";
 				// print "<td>" . $langs->trans("VAT") . "</td>";
 				print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
 				print "<td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index e37e1690ca2..7248c4bda3a 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -241,7 +241,7 @@ class FormAccounting extends Form
 	 * Return list of accounts with label by chart of accounts
 	 *
 	 * @param string   $selectid           Preselected id or code of accounting accounts (depends on $select_in)
-	 * @param string   $htmlname           Name of field in html form
+	 * @param string   $htmlname           Name of HTML field id. If name start with '.', it is name of HTML css class, so several component with same name in different forms can be used.
 	 * @param int      $showempty          Add an empty field
 	 * @param array    $event              Event options
 	 * @param int      $select_in          0=selectid value is a aa.rowid (default) or 1=selectid is aa.account_number
@@ -284,8 +284,6 @@ class FormAccounting extends Form
     			return -1;
     		}
 
-    		$out .= ajax_combobox($htmlname, $event);
-
     		$selected = 0;
     		while ($obj = $this->db->fetch_object($resql))
     		{
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 49bcc265050..a582263185b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4099,29 +4099,49 @@ function get_localtax_by_third($local)
 
 
 /**
- *  Get vat rate and npr from id.
- *  You can call getLocalTaxesFromRate after to get other fields
+ *  Get vat main information from Id.
+ *  You can call getLocalTaxesFromRate after to get other fields.
  *
- *  @param	int      $vatrowid			Line ID into vat rate table.
- *  @return	array    	  				array(localtax_type1(1-6 / 0 if not found), rate of localtax1, ...)
+ *  @param	int|string  $vatrate		    VAT ID or Rate. Value can be value or the string with code into parenthesis or rowid if $firstparamisid is 1. Example: '8.5' or '8.5 (8.5NPR)' or 123.
+ *  @param	Societe	    $buyer         		Company object
+ *  @param	Societe	    $seller        		Company object
+ *  @param  int         $firstparamisid     1 if first param is id into table (use this if you can)
+ *  @return	array       	  				array('rowid'=> , 'code'=> ...)
+ *  @see getLocalTaxesFromRate
  */
-function getTaxesFromId($vatrowid)
+function getTaxesFromId($vatrate, $buyer=null, $seller=null, $firstparamisid=1)
 {
     global $db, $mysoc;
 
-    dol_syslog("getTaxesFromId vatrowid=".$vatrowid);
+    dol_syslog("getTaxesFromId vatrowid=".$vatrate);
 
     // Search local taxes
-    $sql = "SELECT t.rowid, t.code, t.taux as rate, t.recuperableonly as npr";
+    $sql = "SELECT t.rowid, t.code, t.taux as rate, t.recuperableonly as npr, t.accountancy_code_sell, t.accountancy_code_buy";
     $sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t";
-    $sql.= " WHERE t.rowid ='".$vatrowid."'";
+    if ($firstparamisid) $sql.= " WHERE t.rowid = ".(int) $vatrate;
+    else
+    {
+        $vatratecleaned = $vatrate;
+        $vatratecode = '';
+        if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg))      // If vat is "xx (yy)"
+        {
+            $vatratecleaned = $reg[1];
+            $vatratecode = $reg[2];
+        }
+
+        $sql.=", ".MAIN_DB_PREFIX."c_country as c";
+        if ($mysoc->country_code == 'ES') $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$buyer->country_code."'";    // local tax in spain use the buyer country ??
+        else $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'";
+        $sql.= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";
+        if ($vatratecode) $sql.= " AND t.code = '".$vatratecode."'";
+    }
 
     $resql=$db->query($sql);
     if ($resql)
     {
         $obj = $db->fetch_object($resql);
-
-        return array('rowid'=>$obj->rowid, 'code'=>$obj->code, 'rate'=>$obj->rate, 'npr'=>$obj->npr);
+        if ($obj) return array('rowid'=>$obj->rowid, 'code'=>$obj->code, 'rate'=>$obj->rate, 'npr'=>$obj->npr, 'accountancy_code_sell'=>$obj->accountancy_code_sell, 'accountancy_code_buy'=>$obj->accountancy_code_buy);
+        else return array();
     }
     else dol_print_error($db);
 
@@ -4135,12 +4155,13 @@ function getTaxesFromId($vatrowid)
  *  Instead this function must be called when adding a line to get the array of localtax and type, and then
  *  provide it to the function calcul_price_total.
  *
- *  @param	string  $vatrate			VAT Rate. Value can be value or the string with code into parenthesis or rowid if $firstparamisid is 1. Example: '8.5' or '8.5 (8.5NPR)' or 123.
- *  @param	int		$local              Number of localtax (1 or 2, or 0 to return 1 & 2)
- *  @param	Societe	$buyer         		Company object
- *  @param	Societe	$seller        		Company object
- *  @param  int     $firstparamisid     1 if first param is id into table (use this if you can)
- *  @return	array    	  				array(localtax_type1(1-6 / 0 if not found), rate of localtax1, ...)
+ *  @param	int|string  $vatrate			VAT ID or Rate. Value can be value or the string with code into parenthesis or rowid if $firstparamisid is 1. Example: '8.5' or '8.5 (8.5NPR)' or 123.
+ *  @param	int		    $local              Number of localtax (1 or 2, or 0 to return 1 & 2)
+ *  @param	Societe	    $buyer         		Company object
+ *  @param	Societe	    $seller        		Company object
+ *  @param  int         $firstparamisid     1 if first param is id into table (use this if you can)
+ *  @return	array    	    				array(localtax_type1(1-6 / 0 if not found), rate of localtax1, ...)
+ *  @see getTaxesFromId
  */
 function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisid=0)
 {
@@ -4148,25 +4169,25 @@ function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisi
 
 	dol_syslog("getLocalTaxesFromRate vatrate=".$vatrate." local=".$local);
 
-	$vatratecleaned = $vatrate;
-	$vatratecode = '';
-	if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg))      // If vat is "xx (yy)"
-	{
-	    $vatratecleaned = $reg[1];
-	    $vatratecode = $reg[2];
-	}
-
 	// Search local taxes
 	$sql  = "SELECT t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.accountancy_code_sell, t.accountancy_code_buy";
 	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t";
-	if ($firstparamisid) $sql.= " WHERE t.rowid ='".$vatrate."'";
+	if ($firstparamisid) $sql.= " WHERE t.rowid = ".(int) $vatrate;
 	else
 	{
+	    $vatratecleaned = $vatrate;
+	    $vatratecode = '';
+	    if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg))      // If vat is "xx (yy)"
+	    {
+	        $vatratecleaned = $reg[1];
+	        $vatratecode = $reg[2];
+	    }
+
 	    $sql.=", ".MAIN_DB_PREFIX."c_country as c";
     	if ($mysoc->country_code == 'ES') $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$buyer->country_code."'";    // local tax in spain use the buyer country ??
     	else $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'";
     	$sql.= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";
-    	if ($vatratecode) $sql.= " AND t.code ='".$vatratecode."'";
+    	if ($vatratecode) $sql.= " AND t.code = '".$vatratecode."'";
 	}
 
 	$resql=$db->query($sql);
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 0f49bd832d6..0f57a23d23c 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -182,6 +182,7 @@ ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
 ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
 ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
@@ -191,6 +192,7 @@ ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<st
 ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
 ErrorNoWarehouseDefined=Error, no warehouses defined.
 ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid. 
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # 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.  

From 343e8d8498bf38837f90c8a483efa6aba9f991b5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 16 Jun 2017 00:49:52 +0200
Subject: [PATCH 232/438] Debug accounting module with new structure v6 Make
 accounting module compatible with the new vat code to identify 2 vat code
 with same rate.

---
 htdocs/accountancy/admin/defaultaccounts.php  |  2 +-
 htdocs/accountancy/bookkeeping/card.php       |  8 +++---
 htdocs/accountancy/bookkeeping/list.php       |  4 +--
 .../accountancy/class/bookkeeping.class.php   |  7 ++++-
 .../journal/expensereportsjournal.php         | 12 +++++----
 .../accountancy/journal/purchasesjournal.php  | 26 +++++++++++++------
 htdocs/accountancy/journal/sellsjournal.php   | 14 +++++++++-
 .../core/class/html.formaccounting.class.php  | 16 +++++-------
 htdocs/langs/en_US/accountancy.lang           |  1 +
 9 files changed, 59 insertions(+), 31 deletions(-)

diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php
index ef39252ff87..227949a3c1c 100644
--- a/htdocs/accountancy/admin/defaultaccounts.php
+++ b/htdocs/accountancy/admin/defaultaccounts.php
@@ -51,8 +51,8 @@ $action = GETPOST('action', 'alpha');
 
 
 $list_account_main = array (
-    'ACCOUNTING_ACCOUNT_SUPPLIER',
     'ACCOUNTING_ACCOUNT_CUSTOMER',
+    'ACCOUNTING_ACCOUNT_SUPPLIER',
 );
 
 $list_account = array (
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index f40bfda856f..5c558ca0a90 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -387,10 +387,10 @@ if ($action == 'create') {
 					if ($action == 'update' && $line->id == $id) {
 
 						print '<td>';
-						print $formaccounting->select_account($line->numero_compte, 'account_number', 0, array (), 1, 1, '');
+						print $formaccounting->select_account($line->numero_compte, 'account_number', 0, array (), 1, 1, 'maxwidth300');
 						print '</td>';
 						print '<td>';
-						print $formaccounting->select_auxaccount($line->subledger_account, 'subledger_account', 1);
+						print $formaccounting->select_auxaccount($line->subledger_account, 'subledger_account', 1, 'maxwidth300');
 						print '</td>';
 						print '<td><input type="text" size="15" name="label_compte" value="' . $line->label_compte . '"/></td>';
 						print '<td align="right"><input type="text" size="6" name="debit" value="' . price($line->debit) . '"/></td>';
@@ -431,10 +431,10 @@ if ($action == 'create') {
 				if ($action == "" || $action == 'add') {
 					print '<tr class="oddeven">';
 					print '<td>';
-					print $formaccounting->select_account($account_number, 'account_number', 0, array (), 1, 1, '');
+					print $formaccounting->select_account($account_number, 'account_number', 0, array (), 1, 1, 'maxwidth300');
 					print '</td>';
 					print '<td>';
-					print $formaccounting->select_auxaccount($subledger_account, 'subledger_account', 1);
+					print $formaccounting->select_auxaccount($subledger_account, 'subledger_account', 1, 'maxwidth300');
 					print '</td>';
 					print '<td><input type="text" size="15" name="label_compte" value="' . $label_compte . '"/></td>';
 					print '<td align="right"><input type="text" class="right maxwidth50" name="debit" value="' . price($debit) . '"/></td>';
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index cd93b1142f8..4a7bca5e1b7 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -389,11 +389,11 @@ print '<td class="liste_titre"><input type="text" name="search_doc_ref" size="8"
 print '<td class="liste_titre">';
 print '<div class="nowrap">';
 print $langs->trans('From');
-print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, '');
+print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, 'maxwidth200');
 print '</div>';
 print '<div class="nowrap">';
 print $langs->trans('to');
-print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array (), 1, 1, '');
+print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array (), 1, 1, 'maxwidth200');
 print '</div>';
 print '</td>';
 print '<td class="liste_titre">';
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 9ed4ef29ac1..d607c1dc287 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -185,7 +185,12 @@ class BookKeeping extends CommonObject
             else
             {
                 //$this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForInvoiceLine', $this->doc_ref,  $this->label_compte);
-                $this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForLine', $this->label_compte);
+                $mesg=$this->doc_ref.', '.$langs->trans("AccountAccounting").': '.$this->numero_compte;
+                if ($this->subledger_account && $this->subledger_account != $this->numero_compte)
+                {
+                    $mesg.=', '.$langs->trans("SubledgerAccount").': '.$this->subledger_account;
+                }
+                $this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForLine', $mesg);
             }
 
 		    return -1;
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index ca9d05e7e93..f73596c5aa4 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -92,15 +92,15 @@ $sql = "SELECT er.rowid, er.ref, er.date_debut as de,";
 $sql .= " erd.rowid as erdid, erd.comments, erd.total_ttc, erd.tva_tx, erd.total_ht, erd.total_tva, erd.fk_code_ventilation, erd.vat_src_code, ";
 $sql .= " u.rowid as uid, u.firstname, u.lastname, u.accountancy_code as user_accountancy_account,";
 $sql .= " f.accountancy_code, aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte,";
-$sql .= " ct.accountancy_code_buy as account_tva";
+//$sql .= " ct.accountancy_code_buy as account_tva";
 $sql .= " FROM " . MAIN_DB_PREFIX . "expensereport_det as erd";
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_tva as ct ON erd.tva_tx = ct.taux AND ct.fk_pays = '" . $idpays . "'";
+//$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_tva as ct ON erd.tva_tx = ct.taux AND ct.fk_pays = '" . $idpays . "'";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_type_fees as f ON f.id = erd.fk_c_type_fees";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = erd.fk_code_ventilation";
 $sql .= " JOIN " . MAIN_DB_PREFIX . "expensereport as er ON er.rowid = erd.fk_expensereport";
 $sql .= " JOIN " . MAIN_DB_PREFIX . "user as u ON u.rowid = er.fk_user_author";
-$sql .= " WHERE er.fk_statut > 0 ";
-$sql .= " AND erd.fk_code_ventilation > 0 ";
+$sql .= " WHERE er.fk_statut > 0";
+$sql .= " AND erd.fk_code_ventilation > 0";
 $sql .= " AND er.entity IN (" . getEntity('expensereport', 0) . ")";  // We don't share object for accountancy
 if ($date_start && $date_end)
 	$sql .= " AND er.date_debut >= '" . $db->idate($date_start) . "' AND er.date_debut <= '" . $db->idate($date_end) . "'";
@@ -129,7 +129,9 @@ if ($result) {
 		// Controls
 		$compta_user = (! empty($obj->user_accountancy_account)) ? $obj->user_accountancy_account : $account_salary;
 		$compta_fees = $obj->compte;
-		$compta_tva = (! empty($obj->account_tva) ? $obj->account_tva : $account_vat);
+
+		$vatdata = getTaxesFromId($obj->tva_tx.($obj->vat_src_code?' ('.$obj->vat_src_code.')':''), $mysoc, $mysoc, 0);
+		$compta_tva = (! empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $account_vat);
 
 		// Define array to display all VAT rates that use this accounting account $compta_tva
 		if (! empty(price2num($obj->tva_tx)) || ! empty($obj->vat_src_code))
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index b5f763fe2b1..27dfd532981 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -90,21 +90,21 @@ $idpays = $mysoc->country_id;
 $sql = "SELECT f.rowid, f.ref, f.type, f.datef as df, f.libelle,f.ref_supplier,";
 $sql .= " fd.rowid as fdid, fd.description, fd.total_ttc, fd.tva_tx, fd.total_ht, fd.tva as total_tva, fd.product_type, fd.vat_src_code,";
 $sql .= " s.rowid as socid, s.nom as name, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
-$sql .= " p.accountancy_code_buy , aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte,";
-$sql .= " ct.accountancy_code_buy as account_tva";
+$sql .= " p.accountancy_code_buy , aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte";
+//$sql .= " ct.accountancy_code_buy as account_tva";
 $sql .= " FROM " . MAIN_DB_PREFIX . "facture_fourn_det as fd";
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_tva as ct ON fd.tva_tx = ct.taux AND ct.fk_pays = '" . $idpays . "'";
+//$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_tva as ct ON fd.tva_tx = ct.taux AND ct.fk_pays = '" . $idpays . "'";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = fd.fk_product";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
 $sql .= " JOIN " . MAIN_DB_PREFIX . "facture_fourn as f ON f.rowid = fd.fk_facture_fourn";
 $sql .= " JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
 $sql .= " WHERE f.fk_statut > 0"; // TODO Facture annulée ?
-$sql .= " AND fd.fk_code_ventilation > 0 ";
+$sql .= " AND fd.fk_code_ventilation > 0";
 $sql .= " AND f.entity IN (" . getEntity('facture_fourn', 0) . ")";  // We don't share object for accountancy
 if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-    $sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
+    $sql .= " AND f.type IN (" . FactureFournisseur::TYPE_STANDARD . "," . FactureFournisseur::TYPE_REPLACEMENT . "," . FactureFournisseur::TYPE_CREDIT_NOTE . "," . FactureFournisseur::TYPE_SITUATION . ")";
 } else {
-    $sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
+    $sql .= " AND f.type IN (" . FactureFournisseur::TYPE_STANDARD . "," . FactureFournisseur::TYPE_REPLACEMENT . "," . FactureFournisseur::TYPE_CREDIT_NOTE . "," . FactureFournisseur::TYPE_DEPOSIT . "," . FactureFournisseur::TYPE_SITUATION . ")";
 }
 if ($date_start && $date_end)
 	$sql .= " AND f.datef >= '" . $db->idate($date_start) . "' AND f.datef <= '" . $db->idate($date_end) . "'";
@@ -130,7 +130,7 @@ if ($result) {
 	while ( $i < $num ) {
 		$obj = $db->fetch_object($result);
 
-		// contrôles
+		// Controls
 		$compta_soc = (! empty($obj->code_compta_fournisseur)) ? $obj->code_compta_fournisseur : $cptfour;
 
 		$compta_prod = $obj->compte;
@@ -536,8 +536,18 @@ if (empty($action) || $action == 'view') {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
 	}*/
 
+	// Button to write into Ledger
+	if (empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) || $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == '-1') {
+	    print img_warning().' '.$langs->trans("SomeMandatoryStepsOfSetupWereNotDone");
+	    print ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
+	}
 	print '<div class="tabsAction tabsActionNoBottom">';
-	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
+	if (empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1') {
+	    print '<input type="button" class="butActionRefused" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="' . $langs->trans("WriteBookKeeping") . '" />';
+	}
+	else {
+	    print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
+	}
 	print '</div>';
 
 	print '
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 24f5ae6e7aa..3150b74e9bd 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -135,6 +135,7 @@ if ($result) {
 	while ( $i < $num ) {
 		$obj = $db->fetch_object($result);
 
+		// Controls
 		$compta_soc = (! empty($obj->code_compta)) ? $obj->code_compta : $cptcli;
 
 		$compta_prod = $obj->compte;
@@ -549,8 +550,19 @@ if (empty($action) || $action == 'view') {
 	} else {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
 	}*/
+
+	// Button to write into Ledger
+	if (empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1') {
+	    print img_warning().' '.$langs->trans("SomeMandatoryStepsOfSetupWereNotDone");
+	    print ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
+	}
 	print '<div class="tabsAction tabsActionNoBottom">';
-	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
+	if (empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1') {
+	    print '<input type="button" class="butActionRefused" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="' . $langs->trans("WriteBookKeeping") . '" />';
+	}
+	else {
+	   print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
+	}
 	print '</div>';
 
 	print '
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index 7248c4bda3a..8a348dba57a 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -325,14 +325,13 @@ class FormAccounting extends Form
 	/**
 	 * Return list of auxilary thirdparty accounts
 	 *
-	 * @param string $selectid Preselected pcg_type
-	 * @param string $htmlname Name of field in html form
-	 * @param int $showempty Add an empty field
-	 * @param array $event Event options
-	 *
-	 * @return string String with HTML select
+	 * @param string   $selectid       Preselected pcg_type
+	 * @param string   $htmlname       Name of field in html form
+	 * @param int      $showempty      Add an empty field
+	 * @param string   $morecss        More css
+	 * @return string                  String with HTML select
 	 */
-	function select_auxaccount($selectid, $htmlname = 'account_num_aux', $showempty = 0, $event = array()) {
+	function select_auxaccount($selectid, $htmlname='account_num_aux', $showempty=0, $morecss='maxwidth200') {
 
 		$aux_account = array();
 
@@ -377,8 +376,7 @@ class FormAccounting extends Form
 		$this->db->free($resql);
 
 		// Build select
-		$out = ajax_combobox($htmlname, $event);
-		$out .= Form::selectarray($htmlname, $aux_account, $selectid, $showempty, 0, 0, '', 0, 0, 0, '', 'maxwidth300');
+		$out .= Form::selectarray($htmlname, $aux_account, $selectid, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, 1);
 
 		return $out;
 	}
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 8ff65371fa5..64744eedf4a 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -256,6 +256,7 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping

From 07b676792a26886170eb657e23410686c0f2236a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 16 Jun 2017 01:02:53 +0200
Subject: [PATCH 233/438] Fix do not show localtax info if not used.

---
 htdocs/comm/card.php    | 12 +++++++-----
 htdocs/societe/card.php |  3 ++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index b8906bd1038..a51ef902eb6 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -175,7 +175,7 @@ if (empty($reshook))
 		$result=$object->update($object->id, $user);
 		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 	}
-	
+
 	if ($action == 'update_extras') {
         $object->fetch($id);
 
@@ -262,21 +262,23 @@ if ($id > 0)
 		print '</tr>';
 	}
 
-	// Assujeti a TVA ou pas
+	// VAT is used
 	print '<tr>';
-	print '<td class="nowrap">'.$langs->trans('VATIsUsed').'</td><td>';
+	print '<td class="nowrap">'.$langs->trans('VATIsUsed').'</td>';
+	print '<td>';
 	print yn($object->tva_assuj);
 	print '</td>';
 	print '</tr>';
 
 	// Local Taxes
-	if ($mysoc->useLocalTax(1))
+	// TODO Move this on same record than VATIsUsed
+	if ($mysoc->localtax1_assuj=="1")
 	{
 		print '<tr><td class="nowrap">'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td>';
 		print yn($object->localtax1_assuj);
 		print '</td></tr>';
 	}
-	if ($mysoc->useLocalTax(2))
+	if ($mysoc->localtax1_assuj=="1")
 	{
 		print '<tr><td class="nowrap">'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td>';
 		print yn($object->localtax2_assuj);
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index b5afba996b8..46e6366bba1 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1766,8 +1766,9 @@ else
                     $formcompany->select_localtax(1,$object->localtax1_value, "lt1");
                     print '</span>';
                 }
+                print '</td>';
 
-                print '</td><td>'.fieldLabel($langs->transcountry("LocalTax2IsUsed",$mysoc->country_code),'localtax2assuj_value').'</td><td>';
+                print '<td>'.fieldLabel($langs->transcountry("LocalTax2IsUsed",$mysoc->country_code),'localtax2assuj_value').'</td><td>';
                 print $form->selectyesno('localtax2assuj_value',$object->localtax2_assuj,1);
                 if  (! isOnlyOneLocalTax(2))
                 {

From b1945daf6c7eaa1d57d5bd1bf52f2c973d7b4d57 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 16 Jun 2017 01:07:44 +0200
Subject: [PATCH 234/438] Fix alignement

---
 htdocs/societe/consumption.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 1fcd73f0ddc..834131a86a8 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -365,7 +365,7 @@ if ($sql_select)
     print '<td class="liste_titre" align="left">';
     print '<input class="flat" type="text" name="sref" size="8" value="'.$sref.'">';
     print '</td>';
-    print '<td class="liste_titre nowrap">'; // date
+    print '<td class="liste_titre nowrap center">'; // date
     print $formother->select_month($month?$month:-1,'month',1);
     $formother->select_year($year?$year:-1,'year',1, 20, 1);
     print '</td>';

From b416b22bcc00d198ff3ddfdc9e90ebd7187eaf69 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 16 Jun 2017 01:27:28 +0200
Subject: [PATCH 235/438] Fix phpcs

---
 htdocs/accountancy/journal/expensereportsjournal.php | 2 +-
 htdocs/accountancy/journal/purchasesjournal.php      | 2 +-
 htdocs/accountancy/journal/sellsjournal.php          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index f73596c5aa4..3da9e09aeda 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -134,7 +134,7 @@ if ($result) {
 		$compta_tva = (! empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $account_vat);
 
 		// Define array to display all VAT rates that use this accounting account $compta_tva
-		if (! empty(price2num($obj->tva_tx)) || ! empty($obj->vat_src_code))
+		if ((! price2num($obj->tva_tx)) || ! empty($obj->vat_src_code))
 		{
             $def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':'')]=(vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':''));
 		}
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 27dfd532981..9ef1afdac38 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -145,7 +145,7 @@ if ($result) {
 		$compta_tva = (! empty($vatdata['accountancy_code_buy']) ? $vatdata['accountancy_code_buy'] : $cpttva);
 
 		// Define array to display all VAT rates that use this accounting account $compta_tva
-		if (! empty(price2num($obj->tva_tx)) || ! empty($obj->vat_src_code))
+		if ((! price2num($obj->tva_tx)) || ! empty($obj->vat_src_code))
 		{
             $def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':'')]=(vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':''));
 		}
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 3150b74e9bd..4eb4dc72171 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -150,7 +150,7 @@ if ($result) {
 		$compta_tva = (! empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $cpttva);
 
 		// Define array to display all VAT rates that use this accounting account $compta_tva
-		if (! empty(price2num($obj->tva_tx)) || ! empty($obj->vat_src_code))
+		if ((! price2num($obj->tva_tx)) || ! empty($obj->vat_src_code))
 		{
             $def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':'')]=(vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':''));
 		}

From f424f96589b6d43d2a0abb4631470717c9a464b3 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Fri, 16 Jun 2017 05:15:00 +0200
Subject: [PATCH 236/438] Fix SPEC #7013 : use database type "numeric" to store
 monetary values

---
 .../install/mysql/migration/6.0.0-7.0.0.sql   | 64 +++++++++++++++++++
 .../tables/llx_accounting_bookkeeping.sql     | 10 +--
 .../install/mysql/tables/llx_blockedlog.sql   |  2 +-
 .../mysql/tables/llx_chargesociales.sql       |  2 +-
 htdocs/install/mysql/tables/llx_commande.sql  |  2 +-
 .../mysql/tables/llx_commande_fournisseur.sql |  2 +-
 htdocs/install/mysql/tables/llx_don.sql       |  2 +-
 .../mysql/tables/llx_loan_schedule.sql        |  6 +-
 .../mysql/tables/llx_paiementcharge.sql       |  2 +-
 .../mysql/tables/llx_paiementfourn.sql        |  2 +-
 .../mysql/tables/llx_payment_donation.sql     |  2 +-
 .../tables/llx_payment_expensereport.sql      |  2 +-
 .../install/mysql/tables/llx_payment_loan.sql |  6 +-
 .../mysql/tables/llx_payment_salary.sql       |  4 +-
 .../mysql/tables/llx_prelevement_bons.sql     |  2 +-
 .../llx_prelevement_facture_demande.sql       |  2 +-
 .../mysql/tables/llx_prelevement_lignes.sql   |  2 +-
 htdocs/install/mysql/tables/llx_societe.sql   |  2 +-
 htdocs/install/mysql/tables/llx_tva.sql       |  4 +-
 19 files changed, 92 insertions(+), 28 deletions(-)
 create mode 100644 htdocs/install/mysql/migration/6.0.0-7.0.0.sql

diff --git a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
new file mode 100644
index 00000000000..545b52ea4a7
--- /dev/null
+++ b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
@@ -0,0 +1,64 @@
+--
+-- Be carefull to requests order.
+-- This file must be loaded by calling /install/index.php page
+-- when current version is 6.0.0 or higher.
+--
+-- To rename a table:       ALTER TABLE llx_table RENAME TO llx_table_new;
+-- To add a column:         ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol;
+-- To rename a column:      ALTER TABLE llx_table CHANGE COLUMN oldname newname varchar(60);
+-- To drop a column:        ALTER TABLE llx_table DROP COLUMN oldname;
+-- To change type of field: ALTER TABLE llx_table MODIFY COLUMN name varchar(60);
+-- To drop a foreign key:   ALTER TABLE llx_table DROP FOREIGN KEY fk_name;
+-- To drop an index:        -- VMYSQL4.0 DROP INDEX nomindex on llx_table
+-- To drop an index:        -- VPGSQL8.0 DROP INDEX nomindex
+-- To restrict request to Mysql version x.y minimum use -- VMYSQLx.y
+-- To restrict request to Pgsql version x.y minimum use -- VPGSQLx.y
+-- To make pk to be auto increment (mysql):    -- VMYSQL4.3 ALTER TABLE llx_c_shipment_mode CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
+-- To make pk to be auto increment (postgres): -- VPGSQL8.2 NOT POSSIBLE. MUST DELETE/CREATE TABLE
+-- To set a field as NULL:                     -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NULL;
+-- To set a field as NULL:                     -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name DROP NOT NULL;
+-- To set a field as NOT NULL:                 -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NOT NULL;
+-- To set a field as NOT NULL:                 -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET NOT NULL;
+-- To set a field as default NULL:             -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET DEFAULT NULL;
+-- Note: fields with type BLOB/TEXT can't have default value.
+-- -- VPGSQL8.2 DELETE FROM llx_usergroup_user      WHERE fk_user      NOT IN (SELECT rowid from llx_user);
+-- -- VMYSQL4.1 DELETE FROM llx_usergroup_user      WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
+
+
+-- Clean corrupted values for tms
+-- VMYSQL4.1 SET sql_mode = 'ALLOW_INVALID_DATES';
+-- VMYSQL4.1 update llx_opensurvey_sondage set tms = date_fin where DATE(STR_TO_DATE(tms, '%Y-%m-%d')) IS NULL;
+-- VMYSQL4.1 SET sql_mode = 'NO_ZERO_DATE';
+-- VMYSQL4.1 update llx_opensurvey_sondage set tms = date_fin where DATE(STR_TO_DATE(tms, '%Y-%m-%d')) IS NULL;
+-- Remove default not null on date_fin
+-- VMYSQL4.3 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN date_fin DATETIME NULL DEFAULT NULL;
+-- VPGSQL8.2 ALTER TABLE llx_opensurvey_sondage ALTER COLUMN date_fin DROP NOT NULL;
+
+-- Move real to numeric for more precision for storing monetary amounts (no rouding)
+-- https://wiki.dolibarr.org/index.php/Langages_et_normes#Structure_des_tables_et_champs
+ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN debit numeric(24,8);
+ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN credit numeric(24,8);
+ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN montant numeric(24,8);
+ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN multicurrency_amount numeric(24,8);
+ALTER TABLE llx_blockedlog MODIFY COLUMN amounts numeric(24,8);
+ALTER TABLE llx_chargessociales MODIFY COLUMN amount numeric(24,8);
+ALTER TABLE llx_commande MODIFY COLUMN amount_ht numeric(24,8);
+ALTER TABLE llx_commande_fournisseur MODIFY COLUMN amount_ht numeric(24,8);
+ALTER TABLE llx_don MODIFY COLUMN amount numeric(24,8);
+ALTER TABLE llx_loan_schedule MODIFY COLUMN amount_capital numeric(24,8);
+ALTER TABLE llx_loan_schedule MODIFY COLUMN amount_insurance numeric(24,8);
+ALTER TABLE llx_loan_schedule MODIFY COLUMN amount_interest numeric(24,8);
+ALTER TABLE llx_paiementcharge MODIFY COLUMN amount numeric(24,8);
+ALTER TABLE llx_paiementfourn MODIFY COLUMN amount numeric(24,8);
+ALTER TABLE llx_payment_donation MODIFY COLUMN amount numeric(24,8);
+ALTER TABLE llx_payment_expensereport MODIFY COLUMN amount numeric(24,8);
+ALTER TABLE llx_payment_loan MODIFY COLUMN amount_capital numeric(24,8);
+ALTER TABLE llx_payment_loan MODIFY COLUMN amount_insurance numeric(24,8);
+ALTER TABLE llx_payment_loan MODIFY COLUMN amount_interest numeric(24,8);
+ALTER TABLE llx_payment_salary MODIFY COLUMN salary numeric(24,8);
+ALTER TABLE llx_payment_salary MODIFY COLUMN amount numeric(24,8);
+ALTER TABLE llx_prelevement_bons MODIFY COLUMN amount numeric(24,8);
+ALTER TABLE llx_prelevement_facture_demande MODIFY COLUMN amount numeric(24,8);
+ALTER TABLE llx_prelevement_lignes MODIFY COLUMN amount numeric(24,8);
+ALTER TABLE llx_societe MODIFY COLUMN capital numeric(24,8);
+ALTER TABLE llx_tva MODIFY COLUMN amount numeric(24,8);
diff --git a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
index ad1160c356d..01ced5b07f4 100644
--- a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
@@ -26,17 +26,17 @@ CREATE TABLE llx_accounting_bookkeeping
   doc_ref               varchar(300) NOT NULL,		-- 					| facture_client/reglement_client/... reference number
   fk_doc                integer NOT NULL,			-- 					| facture_client/reglement_client/... rowid
   fk_docdet             integer NOT NULL,			-- 					| facture_client/reglement_client/... line rowid
-  thirdparty_code       varchar(32),                -- Third party code (customer or supplier) when record is saved (may help debug) 
+  thirdparty_code       varchar(32),				-- Third party code (customer or supplier) when record is saved (may help debug) 
   subledger_account     varchar(32),				-- FEC:CompAuxNum	| account number of subledger account
   subledger_label       varchar(255),				-- FEC:CompAuxLib	| label of subledger account
   numero_compte         varchar(32) NOT NULL,		-- FEC:CompteNum	| account number
   label_compte          varchar(255) NOT NULL,		-- FEC:CompteLib	| label of account
   label_operation       varchar(255),				-- FEC:EcritureLib	| label of the operation
-  debit                 double NOT NULL,			-- FEC:Debit
-  credit                double NOT NULL,			-- FEC:Credit
-  montant               double NOT NULL,			-- FEC:Montant (Not necessary)
+  debit                 numeric(24,8) NOT NULL,		-- FEC:Debit
+  credit                numeric(24,8) NOT NULL,		-- FEC:Credit
+  montant               numeric(24,8) NOT NULL,		-- FEC:Montant (Not necessary)
   sens                  varchar(1) DEFAULT NULL,	-- FEC:Sens (Not necessary)
-  multicurrency_amount  double,						-- FEC:Montantdevise
+  multicurrency_amount  numeric(24,8),				-- FEC:Montantdevise
   multicurrency_code    varchar(255),				-- FEC:Idevise
   lettering_code        varchar(255),				-- FEC:EcritureLet
   date_lettering        datetime,					-- FEC:DateLet
diff --git a/htdocs/install/mysql/tables/llx_blockedlog.sql b/htdocs/install/mysql/tables/llx_blockedlog.sql
index ae696a0d6d1..59c8e262817 100644
--- a/htdocs/install/mysql/tables/llx_blockedlog.sql
+++ b/htdocs/install/mysql/tables/llx_blockedlog.sql
@@ -4,7 +4,7 @@ CREATE TABLE llx_blockedlog
 	rowid integer AUTO_INCREMENT PRIMARY KEY, 
 	tms	timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	action varchar(50), 
-	amounts real NOT NULL, 
+	amounts numeric(24,8) NOT NULL, 
 	signature varchar(100) NOT NULL, 
 	signature_line varchar(100) NOT NULL, 
 	element varchar(50), 
diff --git a/htdocs/install/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql
index 519ceacc9e5..093b635a964 100644
--- a/htdocs/install/mysql/tables/llx_chargesociales.sql
+++ b/htdocs/install/mysql/tables/llx_chargesociales.sql
@@ -34,7 +34,7 @@ create table llx_chargesociales
   fk_type			integer NOT NULL,
   fk_account		integer,                       -- bank account
   fk_mode_reglement	integer,                -- mode de reglement
-  amount			real     default 0 NOT NULL,
+  amount			numeric(24,8) default 0 NOT NULL,
   paye				smallint default 0 NOT NULL,
   periode			date,
   fk_projet			integer DEFAULT NULL,
diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql
index 98740c232ac..6964abdcd57 100644
--- a/htdocs/install/mysql/tables/llx_commande.sql
+++ b/htdocs/install/mysql/tables/llx_commande.sql
@@ -42,7 +42,7 @@ create table llx_commande
   fk_user_cloture		integer,						-- user closing
   source				smallint,						-- not used, except by setting this to 42 for orders coming for replenishment and 0 in other case ?
   fk_statut				smallint  default 0,
-  amount_ht				real      default 0,
+  amount_ht				numeric(24,8)  default 0,
   remise_percent		real      default 0,
   remise_absolue		real      default 0,
   remise				real      default 0,
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
index 6d291dcfa00..24158903eb1 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
@@ -46,7 +46,7 @@ create table llx_commande_fournisseur
   source				smallint NOT NULL,			-- not used, except by setting this to 42 for orders coming for replenishment and 0 in other case ?
   fk_statut				smallint  default 0,
   billed				smallint  default 0,
-  amount_ht				real      default 0,
+  amount_ht				numeric(24,8)  default 0,
   remise_percent		real      default 0,
   remise				real      default 0,
   tva					double(24,8)      default 0,
diff --git a/htdocs/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql
index b7b7c89f9cd..63b2cd111ea 100644
--- a/htdocs/install/mysql/tables/llx_don.sql
+++ b/htdocs/install/mysql/tables/llx_don.sql
@@ -28,7 +28,7 @@ create table llx_don
   tms             timestamp,
   fk_statut       smallint NOT NULL DEFAULT 0,  -- Status of donation promise or validate
   datedon         datetime,                     -- Date of the donation/promise
-  amount          real DEFAULT 0,
+  amount          numeric(24,8) DEFAULT 0,
   fk_payment      integer,
   paid            smallint default 0 NOT NULL,
   firstname       varchar(50),
diff --git a/htdocs/install/mysql/tables/llx_loan_schedule.sql b/htdocs/install/mysql/tables/llx_loan_schedule.sql
index c682b22f276..eb43238255a 100644
--- a/htdocs/install/mysql/tables/llx_loan_schedule.sql
+++ b/htdocs/install/mysql/tables/llx_loan_schedule.sql
@@ -24,9 +24,9 @@ create table llx_loan_schedule
   datec				datetime,         -- creation date
   tms				timestamp,
   datep				datetime,         -- payment date
-  amount_capital	real DEFAULT 0,
-  amount_insurance	real DEFAULT 0,
-  amount_interest	real DEFAULT 0,
+  amount_capital	numeric(24,8) DEFAULT 0,
+  amount_insurance	numeric(24,8) DEFAULT 0,
+  amount_interest	numeric(24,8) DEFAULT 0,
   fk_typepayment	integer NOT NULL,
   num_payment		varchar(50),
   note_private      text,
diff --git a/htdocs/install/mysql/tables/llx_paiementcharge.sql b/htdocs/install/mysql/tables/llx_paiementcharge.sql
index 2efca933dba..086bafae0fa 100644
--- a/htdocs/install/mysql/tables/llx_paiementcharge.sql
+++ b/htdocs/install/mysql/tables/llx_paiementcharge.sql
@@ -23,7 +23,7 @@ create table llx_paiementcharge
   datec           datetime,           -- date de creation
   tms             timestamp,
   datep           datetime,           -- payment date
-  amount          real DEFAULT 0,
+  amount          numeric(24,8) DEFAULT 0,
   fk_typepaiement integer NOT NULL,
   num_paiement    varchar(50),
   note            text,
diff --git a/htdocs/install/mysql/tables/llx_paiementfourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn.sql
index 0e9b1885c97..16d63a32076 100644
--- a/htdocs/install/mysql/tables/llx_paiementfourn.sql
+++ b/htdocs/install/mysql/tables/llx_paiementfourn.sql
@@ -25,7 +25,7 @@ create table llx_paiementfourn
   tms               timestamp,
   datec             datetime,          -- date de creation de l'enregistrement
   datep             datetime,          -- date de paiement
-  amount            real DEFAULT 0,    -- montant
+  amount            numeric(24,8) DEFAULT 0,      -- montant
   multicurrency_amount double(24,8) DEFAULT 0,    -- multicurrency amount
   fk_user_author    integer,           -- auteur
   fk_paiement       integer NOT NULL,  -- moyen de paiement
diff --git a/htdocs/install/mysql/tables/llx_payment_donation.sql b/htdocs/install/mysql/tables/llx_payment_donation.sql
index afa5075cd4e..1859c7aa796 100644
--- a/htdocs/install/mysql/tables/llx_payment_donation.sql
+++ b/htdocs/install/mysql/tables/llx_payment_donation.sql
@@ -23,7 +23,7 @@ create table llx_payment_donation
   datec           datetime,           -- date de creation
   tms             timestamp,
   datep           datetime,           -- payment date
-  amount          real DEFAULT 0,
+  amount          numeric(24,8) DEFAULT 0,
   fk_typepayment  integer NOT NULL,
   num_payment     varchar(50),
   note            text,
diff --git a/htdocs/install/mysql/tables/llx_payment_expensereport.sql b/htdocs/install/mysql/tables/llx_payment_expensereport.sql
index 40e39771978..1857246e22e 100644
--- a/htdocs/install/mysql/tables/llx_payment_expensereport.sql
+++ b/htdocs/install/mysql/tables/llx_payment_expensereport.sql
@@ -23,7 +23,7 @@ create table llx_payment_expensereport
   datec                   datetime,           -- date de creation
   tms                     timestamp,
   datep                   datetime,           -- payment date
-  amount                  real DEFAULT 0,
+  amount                  numeric(24,8) DEFAULT 0,
   fk_typepayment          integer NOT NULL,
   num_payment             varchar(50),
   note                    text,
diff --git a/htdocs/install/mysql/tables/llx_payment_loan.sql b/htdocs/install/mysql/tables/llx_payment_loan.sql
index d023c039391..3b6111a7b2f 100644
--- a/htdocs/install/mysql/tables/llx_payment_loan.sql
+++ b/htdocs/install/mysql/tables/llx_payment_loan.sql
@@ -24,9 +24,9 @@ create table llx_payment_loan
   datec				datetime,         -- creation date
   tms				timestamp,
   datep				datetime,         -- payment date
-  amount_capital	real DEFAULT 0,
-  amount_insurance	real DEFAULT 0,
-  amount_interest	real DEFAULT 0,
+  amount_capital	numeric(24,8) DEFAULT 0,
+  amount_insurance	numeric(24,8) DEFAULT 0,
+  amount_interest	numeric(24,8) DEFAULT 0,
   fk_typepayment	integer NOT NULL,
   num_payment		varchar(50),
   note_private      text,
diff --git a/htdocs/install/mysql/tables/llx_payment_salary.sql b/htdocs/install/mysql/tables/llx_payment_salary.sql
index 38364c6812e..3b6da16b9cb 100644
--- a/htdocs/install/mysql/tables/llx_payment_salary.sql
+++ b/htdocs/install/mysql/tables/llx_payment_salary.sql
@@ -24,8 +24,8 @@ create table llx_payment_salary
   fk_user         integer NOT NULL,
   datep           date,                       -- date de paiement
   datev           date,                       -- date de valeur (this field should not be here, only into bank tables)
-  salary          real,						  -- salary of user when payment was done
-  amount          real NOT NULL DEFAULT 0,
+  salary          numeric(24,8),              -- salary of user when payment was done
+  amount          numeric(24,8) NOT NULL DEFAULT 0,
   fk_typepayment  integer NOT NULL,
   num_payment     varchar(50),				  -- ref
   label           varchar(255),
diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.sql
index e92342eb001..40fff2e842d 100644
--- a/htdocs/install/mysql/tables/llx_prelevement_bons.sql
+++ b/htdocs/install/mysql/tables/llx_prelevement_bons.sql
@@ -29,7 +29,7 @@ create table llx_prelevement_bons
   ref            varchar(12),        -- reference
   entity         integer DEFAULT 1 NOT NULL, -- multi company id
   datec          datetime,           -- date de creation
-  amount         real DEFAULT 0,     -- montant total du prelevement
+  amount         numeric(24,8) DEFAULT 0,    -- montant total du prelevement
   statut         smallint DEFAULT 0, -- statut
   credite        smallint DEFAULT 0, -- indique si le prelevement a ete credite
   note           text,
diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql
index 3bdc0e2ed81..1d1b59bf3f5 100644
--- a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql
+++ b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql
@@ -21,7 +21,7 @@ create table llx_prelevement_facture_demande
 (
   rowid               integer AUTO_INCREMENT PRIMARY KEY,
   fk_facture          integer NOT NULL,
-  amount              real NOT NULL,
+  amount              numeric(24,8) NOT NULL,
   date_demande        datetime NOT NULL,
   traite              smallint DEFAULT 0,
   date_traite         datetime,
diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql
index 04b6e1ebf5e..448b3846d71 100644
--- a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql
+++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql
@@ -24,7 +24,7 @@ create table llx_prelevement_lignes
   statut              smallint DEFAULT 0,
 
   client_nom          varchar(255),
-  amount              real DEFAULT 0,
+  amount              numeric(24,8) DEFAULT 0,
   code_banque         varchar(128),
   code_guichet        varchar(6),
   number              varchar(255),
diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql
index 20440b692d7..7c88a74de07 100644
--- a/htdocs/install/mysql/tables/llx_societe.sql
+++ b/htdocs/install/mysql/tables/llx_societe.sql
@@ -64,7 +64,7 @@ create table llx_societe
   idprof5                  varchar(128),                         		-- IDProf5: nu for france
   idprof6                  varchar(128),                         		-- IDProf6: nu for france
   tva_intra                varchar(20),                         		-- tva
-  capital                  real,                                		-- capital de la societe
+  capital                  numeric(24,8),                       		-- capital de la societe
   fk_stcomm                integer        DEFAULT 0 NOT NULL,      	-- commercial statut
   note_private             text,                                		--
   note_public              text,                                        --
diff --git a/htdocs/install/mysql/tables/llx_tva.sql b/htdocs/install/mysql/tables/llx_tva.sql
index 9abf63d6ad9..d2a7b67c835 100644
--- a/htdocs/install/mysql/tables/llx_tva.sql
+++ b/htdocs/install/mysql/tables/llx_tva.sql
@@ -24,11 +24,11 @@ create table llx_tva
   datec           datetime,                   -- Create date
   datep           date,                       -- date de paiement
   datev           date,                       -- date de valeur
-  amount          real NOT NULL DEFAULT 0,
+  amount          numeric(24,8) NOT NULL DEFAULT 0,
   fk_typepayment  integer NULL,
   num_payment     varchar(50),
   label           varchar(255),
-  entity          integer DEFAULT 1 NOT NULL,	-- multi company id
+  entity          integer DEFAULT 1 NOT NULL, -- multi company id
   note            text,
   fk_bank         integer,  
   fk_user_creat   integer,                    -- utilisateur who create record

From c2901ae8cda0ec59b5ff61327e60112077eb1558 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Fri, 16 Jun 2017 11:01:58 +0200
Subject: [PATCH 237/438] Fix: add/remove unset unsused fields

---
 htdocs/comm/action/class/api_agendaevents.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index 40fce1fd640..a607998cfa8 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -316,11 +316,12 @@ class AgendaEvents extends DolibarrApi
 
     	$object = parent::_cleanObjectDatas($object);
 
+    	unset($object->usermod);
+    	unset($object->libelle);
     	unset($object->import_key);
     	unset($object->array_options);
     	unset($object->context);
     	unset($object->canvas);
-    	unset($object->fk_project);
     	unset($object->contact);
     	unset($object->contact_id);
     	unset($object->thirdparty);

From 1c8daf9700676064bd7adaac2dcee8e30cec2f65 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 16 Jun 2017 11:51:33 +0200
Subject: [PATCH 238/438] Standardize and debug code of module BlockedLog

---
 htdocs/blockedlog/admin/blockedlog.php        |  13 +-
 htdocs/blockedlog/admin/fingerprints.php      | 103 ++++---
 htdocs/blockedlog/ajax/authority.php          | 112 +++++---
 htdocs/blockedlog/ajax/block-add.php          |  64 +++--
 htdocs/blockedlog/ajax/block-info.php         |  58 +++-
 htdocs/blockedlog/ajax/check_signature.php    |  83 ++++--
 htdocs/blockedlog/class/blockedlog.class.php  | 262 +++++++++---------
 htdocs/blockedlog/lib/blockedlog.lib.php      |   8 +-
 htdocs/compta/facture/card.php                |  31 ---
 htdocs/core/modules/modBlockedLog.class.php   |   6 +-
 ..._modBlockedlog_ActionsBlockedLog.class.php |  24 +-
 htdocs/langs/en_US/admin.lang                 |   4 +-
 htdocs/langs/en_US/blockedlog.lang            |  23 +-
 htdocs/main.inc.php                           |  36 ++-
 14 files changed, 486 insertions(+), 341 deletions(-)

diff --git a/htdocs/blockedlog/admin/blockedlog.php b/htdocs/blockedlog/admin/blockedlog.php
index f77c6e9edd8..b3822a9acb7 100644
--- a/htdocs/blockedlog/admin/blockedlog.php
+++ b/htdocs/blockedlog/admin/blockedlog.php
@@ -17,7 +17,7 @@
 
 /**
  *	\file       htdocs/blockedlog/admin/blockedlog.php
- *  \ingroup    system
+ *  \ingroup    blockedlog
  *  \brief      Page setup for blockedlog module
  */
 
@@ -31,12 +31,13 @@ $langs->load("other");
 $langs->load("blockedlog");
 
 if (! $user->admin) accessforbidden();
-  
+
 $action = GETPOST('action','alpha');
 
 /*
  * Actions
  */
+
 if (preg_match('/set_(.*)/',$action,$reg))
 {
 	$code=$reg[1];
@@ -77,7 +78,7 @@ $form=new Form($db);
 llxHeader('',$langs->trans("BlockedLogSetup"));
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("ModuleSetup").' BlockedLog',$linkback);
+print load_fiche_titre($langs->trans("ModuleSetup").' '.$langs->trans('BlockedLog'),$linkback);
 
 $head=blockedlogadmin_prepare_head();
 
@@ -95,13 +96,11 @@ print "</tr>\n";
 
 print '<tr class="oddeven">';
 print '<td class="titlefield">';
-print $langs->trans("EntityKey").'</td><td align="center">';
-
+print $langs->trans("CompanyInitialKey").'</td><td>';
 print $block_static->getSignature();
-
 print '</td></tr>';
 
-if(!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY)) {
+if (!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY)) {
 	// Example with a yes / no select
 	$var=!$var;
 	print '<tr '.$bc[$var].'>';
diff --git a/htdocs/blockedlog/admin/fingerprints.php b/htdocs/blockedlog/admin/fingerprints.php
index f585b883c65..da149d4340d 100644
--- a/htdocs/blockedlog/admin/fingerprints.php
+++ b/htdocs/blockedlog/admin/fingerprints.php
@@ -16,8 +16,8 @@
  */
 
 /**
- *	\file       htdocs/blockedlog/admin/blockedlog.php
- *  \ingroup    system
+ *	\file       htdocs/blockedlog/admin/fingerprints.php
+ *  \ingroup    blockedlog
  *  \brief      Page setup for blockedlog module
  */
 
@@ -32,39 +32,39 @@ $langs->load("other");
 $langs->load("blockedlog");
 
 if (! $user->admin) accessforbidden();
-  
+
 $action = GETPOST('action','alpha');
 $showonlyerrors = GETPOST('showonlyerrors','int');
 
 $block_static = new BlockedLog($db);
 
 if($action === 'downloadblockchain') {
-	
+
 	$auth = new BlockedLogAuthority($db);
-	
+
 	$bc = $auth->getLocalBlockChain();
-	
+
 	header('Content-Type: application/octet-stream');
 	header("Content-Transfer-Encoding: Binary");
-	header("Content-disposition: attachment; filename=\"" .$auth->signature. ".certif\""); 
-	
+	header("Content-disposition: attachment; filename=\"" .$auth->signature. ".certif\"");
+
 	echo $bc;
-	
+
 	exit;
 }
 else if($action === 'downloadcsv') {
-	
+
 	$res = $db->query("SELECT rowid,tms,action,amounts,element,fk_object,date_object,ref_object,signature,fk_user
 					FROM ".MAIN_DB_PREFIX."blockedlog ORDER BY rowid ASC");
-	
+
 	if($res) {
-		
+
 		$signature = $block_static->getSignature();
-		
+
 		header('Content-Type: application/octet-stream');
 		header("Content-Transfer-Encoding: Binary");
 		header("Content-disposition: attachment; filename=\"" .$signature. ".csv\"");
-		
+
 		print $langs->transnoentities('Id')
 			.';'.$langs->transnoentities('Timestamp')
 			.';'.$langs->transnoentities('Action')
@@ -75,9 +75,9 @@ else if($action === 'downloadcsv') {
 			.';'.$langs->transnoentities('Ref')
 			.';'.$langs->transnoentities('Fingerprint')
 			.';'.$langs->transnoentities('User')."\n";
-		
+
 		while($obj = $db->fetch_object($res)) {
-			
+
 			print $obj->rowid
 				.';'.$obj->tms
 				.';'.$obj->action
@@ -88,15 +88,15 @@ else if($action === 'downloadcsv') {
 				.';'.$obj->ref_object
 				.';'.$obj->signature
 				.';'.$obj->fk_user."\n";
-			
+
 		}
-		
+
 		exit;
 	}
 	else{
 		setEventMessage($db->lasterror, 'errors');
 	}
-	
+
 }
 
 /*
@@ -110,7 +110,7 @@ $form=new Form($db);
 llxHeader('',$langs->trans("BlockedLogSetup"));
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("ModuleSetup").' BlockedLog',$linkback);
+print load_fiche_titre($langs->trans("ModuleSetup").' '.$langs->trans('BlockedLog'),$linkback);
 
 $head=blockedlogadmin_prepare_head();
 
@@ -131,52 +131,63 @@ print ' </div>';
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 
-print '<td>'.$langs->trans('Date').'</td>';
-print '<td>'.$langs->trans('Ref').'</td>';
+print '<td class="minwidth50">'.$langs->trans('#').'</td>';
+print '<td class="center">'.$langs->trans('Date').'</td>';
+print '<td>'.$langs->trans('Author').'</td>';
 print '<td>'.$langs->trans('Action').'</td>';
+print '<td>'.$langs->trans('Ref').'</td>';
 print '<td>'.$langs->trans('Element').'</td>';
 print '<td>'.$langs->trans('Amount').'</td>';
-print '<td>'.$langs->trans('Author').'</td>';
+print '<td class="center">'.$langs->trans('DataOfArchivedEvent').'</td>';
 print '<td>'.$langs->trans('Fingerprint').'</td>';
 print '<td><span id="blockchainstatus"></span></td>';
-				
+
 print '</tr>';
 
 foreach($blocks as &$block) {
 
 	$checksignature = $block->checkSignature();
 	$object_link = $block->getObjectLink();
-	
+
 	if(!$showonlyerrors || $block->error>0) {
-		
+
 	   	print '<tr class="oddeven">';
+	   	print '<td>'.$block->id.'</td>';
 	   	print '<td>'.dol_print_date($block->tms,'dayhour').'</td>';
-	   	print '<td>'.$block->ref_object.'</td>';
-	   	print '<td>'.$langs->trans('log'.$block->action).'</td>';
-	   	print '<td>'.$object_link.'<a href="#" blockid="'.$block->id.'" rel="show-info">'.img_info($langs->trans('ShowDetails')).'</a></td>';
-	   	print '<td align="right">'.price($block->amounts).'</td>';
 	   	print '<td>'.$block->getUser().'</td>';
-	   	print '<td>'.$block->signature.'</td>';
+	   	print '<td>'.$langs->trans('log'.$block->action).'</td>';
+	   	print '<td>'.$block->ref_object.'</td>';
+	   	print '<td>'.$object_link.'</td>';
+	   	print '<td align="right">'.price($block->amounts).'</td>';
+	   	print '<td align="center"><a href="#" blockid="'.$block->id.'" rel="show-info">'.img_info($langs->trans('ShowDetails')).'</a></td>';
+
 	   	print '<td>';
-	   	
-	   	print $block->error == 0 ? img_picto($langs->trans('OkCheckFingerprintValidity'), 'on') : img_picto($langs->trans('KoCheckFingerprintValidity'), 'off');
+	   	print $form->textwithpicto(dol_trunc($block->signature, '12'), $block->signature);
+	   	print '</td>';
+
+	   	print '<td>';
+	   	print $block->error == 0 ? img_picto($langs->trans('OkCheckFingerprintValidity'), 'tick') : img_picto($langs->trans('KoCheckFingerprintValidity'), 'statut8');
+
 	   	if(!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY) && !empty($conf->global->BLOCKEDLOG_AUTHORITY_URL)) {
 	   		print ' '.($block->certified ? img_picto($langs->trans('AddedByAuthority'), 'info') :  img_picto($langs->trans('NotAddedByAuthorityYet'), 'info_black') );
 	   	}
 		print '</td>';
+
 		print '</tr>';
-						
+
 	}
 }
 
 print '</table>';
 
+
+
 ?>
 <script type="text/javascript">
 $('a[rel=show-info]').click(function() {
 
 	$pop = $('<div id="pop-info"><table width="100%" class="border"><thead><th width="25%"><?php echo $langs->trans('Field') ?></th><th><?php echo $langs->trans('Value') ?></th></thead><tbody></tbody></table></div>');
-	
+
 	$pop.dialog({
 		title:"<?php echo $langs->transnoentities('BlockedlogInfoDialog'); ?>"
 		,modal:true
@@ -184,16 +195,16 @@ $('a[rel=show-info]').click(function() {
 	});
 
 	var fk_block = $(this).attr("blockid");
-	
+
 	$.ajax({
 		url:"../ajax/block-info.php?id="+fk_block
 		,dataType:'json'
 	}).done(function(data) {
 
 		drawData(data,'');
-		
+
 	});
-	
+
 });
 
 function drawData(data, prefix) {
@@ -203,41 +214,41 @@ function drawData(data, prefix) {
 		value = data[x];
 
 		$('#pop-info table tbody').append('<tr><td>'+prefix+x+'</td><td>'+value+'</td></tr>');
-		
+
 		if( (typeof value === "object") && (value !== null) ) {
 			drawData(value, prefix+x+' &gt;&gt; ');
 		}
 
 	}
-	
+
 }
 
 </script>
 
-<?php 
+<?php
 
 
 if(!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY) && !empty($conf->global->BLOCKEDLOG_AUTHORITY_URL)) {
 
 ?>
 				<script type="text/javascript">
-					
+
 					$.ajax({
 						url : "<?php echo dol_buildpath('/blockedlog/ajax/check_signature.php',1) ?>"
 						,dataType:"html"
 					}).done(function(data) {
-						
+
 						if(data == 'hashisok') {
 							$('#blockchainstatus').html('<?php echo $langs->trans('AuthorityReconizeFingerprintConformity'). ' '. img_picto($langs->trans('SignatureOK'), 'on') ?>');
 						}
 						else{
 							$('#blockchainstatus').html('<?php echo $langs->trans('AuthorityDidntReconizeFingerprintConformity'). ' '.img_picto($langs->trans('SignatureKO'), 'off') ?>');
 						}
-						
+
 					});
-					
+
 				</script>
-				
+
 <?php
 
 }
diff --git a/htdocs/blockedlog/ajax/authority.php b/htdocs/blockedlog/ajax/authority.php
index 12584b2bace..929fd8401d5 100644
--- a/htdocs/blockedlog/ajax/authority.php
+++ b/htdocs/blockedlog/ajax/authority.php
@@ -1,45 +1,77 @@
 <?php
-	
-	require '../../master.inc.php';
-	
-	require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
-	require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/authority.class.php';
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2017 ATM Consulting       <contact@atm-consulting.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 
-	$user=new User($db);
-	$user->fetch(1); //TODO conf user authority
-	
-	$auth = new BlockedLogAuthority($db);
-	
-	$signature = GETPOST('s');
-	$newblock = GETPOST('b');
-	$hash = GETPOST('h');
-	
-	if($auth->fetch(0, $signature)<=0) {
-		$auth->signature = $signature;
-		$auth->create($user);
-	}
-	
-	
-	if(!empty($hash)) {
-		
-		echo $auth->checkBlockchain($hash) ? 'hashisok' : 'hashisjunk';
-			
-	}
-	elseif(!empty($newblock)){
-		if($auth->checkBlock($newblock)) {
-			$auth->addBlock($newblock);
-			$auth->update($user);
-			
-			echo 'blockadded';
-		}
-		else{
-				
-			echo 'blockalreadyadded';
-				
-		}
+/**
+ *      \file       htdocs/blockedlog/ajax/authority.php
+ *      \ingroup    blockedlog
+ *      \brief      authority
+ */
+
+
+// This script is called with a POST method.
+// Directory to scan (full path) is inside POST['dir'].
+
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
+//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');
+if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1');
+if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1');
+//if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
+
+$res=require '../../master.inc.php';
+
+require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
+require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/authority.class.php';
+
+$user=new User($db);
+$user->fetch(1); //TODO conf user authority
+
+$auth = new BlockedLogAuthority($db);
+
+$signature = GETPOST('s');
+$newblock = GETPOST('b');
+$hash = GETPOST('h');
+
+if($auth->fetch(0, $signature)<=0) {
+	$auth->signature = $signature;
+	$auth->create($user);
+}
+
+
+if(!empty($hash)) {
+
+	echo $auth->checkBlockchain($hash) ? 'hashisok' : 'hashisjunk';
+
+}
+elseif(!empty($newblock)){
+	if($auth->checkBlock($newblock)) {
+		$auth->addBlock($newblock);
+		$auth->update($user);
+
+		echo 'blockadded';
 	}
 	else{
-		echo 'idontunderstandwhatihavetodo';
+
+		echo 'blockalreadyadded';
+
 	}
-	
-	
+}
+else{
+	echo 'idontunderstandwhatihavetodo';
+}
+
+
diff --git a/htdocs/blockedlog/ajax/block-add.php b/htdocs/blockedlog/ajax/block-add.php
index 247b01186fe..c82eac81e7b 100644
--- a/htdocs/blockedlog/ajax/block-add.php
+++ b/htdocs/blockedlog/ajax/block-add.php
@@ -1,19 +1,49 @@
-<?php 
+<?php
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2017 ATM Consulting       <contact@atm-consulting.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 
-	require '../../main.inc.php';
-	require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
-	
-	$id = GETPOST('id','int');
-	$element = GETPOST('element','alpha');
-	$action = GETPOST('action','alpha');
-	
-	if($element === 'facture') {
-		dol_include_once('/compta/facture/class/facture.class.php');
-		
-		$facture = new Facture($db);
-		if($facture->fetch($id)>0) {
-			$facture->call_trigger($action, $user);
-		}
-		
+/**
+ *      \file       htdocs/blockedlog/ajax/block-add.php
+ *      \ingroup    blockedlog
+ *      \brief      Block-add
+ */
+
+
+// This script is called with a POST method.
+// Directory to scan (full path) is inside POST['dir'].
+
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
+//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');
+if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1');
+if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1');
+//if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
+
+$res=require '../../main.inc.php';
+
+$id = GETPOST('id','int');
+$element = GETPOST('element','alpha');
+$action = GETPOST('action','alpha');
+
+if ($element === 'facture') {
+    require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+
+	$facture = new Facture($db);
+	if($facture->fetch($id)>0) {
+		$facture->call_trigger($action, $user);
 	}
-	
\ No newline at end of file
+}
diff --git a/htdocs/blockedlog/ajax/block-info.php b/htdocs/blockedlog/ajax/block-info.php
index 7a5f531e8f1..83317f33d57 100644
--- a/htdocs/blockedlog/ajax/block-info.php
+++ b/htdocs/blockedlog/ajax/block-info.php
@@ -1,15 +1,47 @@
 <?php
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2017 ATM Consulting       <contact@atm-consulting.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 
-	require '../../main.inc.php';
-	require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
-	
-	$id = GETPOST('id');
-	
-	$block = new BlockedLog($db);
-	if($block->fetch($id)>0) {
-		echo json_encode($block->object_data);
-	}
-	else {
-		echo json_encode(false);
-	}
-	
\ No newline at end of file
+/**
+ *      \file       htdocs/blockedlog/ajax/block-info.php
+ *      \ingroup    blockedlog
+ *      \brief      block-info
+ */
+
+
+// This script is called with a POST method.
+// Directory to scan (full path) is inside POST['dir'].
+
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
+//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');
+if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1');
+if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1');
+//if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
+
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
+
+$id = GETPOST('id');
+
+$block = new BlockedLog($db);
+if($block->fetch($id)>0) {
+	echo json_encode($block->object_data);
+}
+else {
+	echo json_encode(false);
+}
diff --git a/htdocs/blockedlog/ajax/check_signature.php b/htdocs/blockedlog/ajax/check_signature.php
index bb018508a31..170693a2ece 100644
--- a/htdocs/blockedlog/ajax/check_signature.php
+++ b/htdocs/blockedlog/ajax/check_signature.php
@@ -1,30 +1,63 @@
 <?php
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2017 ATM Consulting       <contact@atm-consulting.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 
-	require '../../main.inc.php';
+/**
+ *      \file       htdocs/blockedlog/ajax/block-info.php
+ *      \ingroup    blockedlog
+ *      \brief      block-info
+ */
 
-	if(empty($conf->global->BLOCKEDLOG_AUTHORITY_URL)) exit('BLOCKEDLOG_AUTHORITY_URL not set');
-	
-	require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
-	require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/authority.class.php';
-	
-	$auth=new BlockedLogAuthority($db);
-	$auth->syncSignatureWithAuthority();
-	
-	$block_static = new BlockedLog($db);
-	
-	$blocks = $block_static->getLog('just_certified', 0, 0, 1) ;
 
-	$auth->signature = $block_static->getSignature();
-	
-	foreach($blocks as &$b) {
-		$auth->blockchain.=$b->signature;	
-			
-	}
-	
-	$hash = $auth->getBlockchainHash();
-	
-	$url = $conf->global->BLOCKEDLOG_AUTHORITY_URL.'/blockedlog/ajax/authority.php?s='.$auth->signature.'&h='.$hash;
+// This script is called with a POST method.
+// Directory to scan (full path) is inside POST['dir'].
 
-	$res = file_get_contents($url);
-	//echo $url;
-	echo $res;
\ No newline at end of file
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
+//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');
+if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1');
+if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1');
+//if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
+
+
+require '../../main.inc.php';
+
+if(empty($conf->global->BLOCKEDLOG_AUTHORITY_URL)) exit('BLOCKEDLOG_AUTHORITY_URL not set');
+
+require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
+require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/authority.class.php';
+
+$auth=new BlockedLogAuthority($db);
+$auth->syncSignatureWithAuthority();
+
+$block_static = new BlockedLog($db);
+
+$blocks = $block_static->getLog('just_certified', 0, 0, 1) ;
+
+$auth->signature = $block_static->getSignature();
+
+foreach($blocks as &$b) {
+	$auth->blockchain.=$b->signature;
+
+}
+
+$hash = $auth->getBlockchainHash();
+
+$url = $conf->global->BLOCKEDLOG_AUTHORITY_URL.'/blockedlog/ajax/authority.php?s='.$auth->signature.'&h='.$hash;
+
+$res = file_get_contents($url);
+//echo $url;
+echo $res;
\ No newline at end of file
diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index b0cddd66f75..8a1508b7a04 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -21,65 +21,65 @@
 
 class BlockedLog
 {
-	
+
 	/**
 	 * Id of the log
 	 * @var int
 	 */
 	public $id;
-	
+
 	/**
 	 * Unique fingerprint of the log
 	 * @var string
 	 */
 	public $signature = '';
-	
+
 	/**
 	 * Unique fingerprint of the line log content
 	 * @var string
 	 */
 	public $signature_line = '';
-	
+
 	public $amounts = null;
-	
+
 	/**
 	 * trigger action
 	 * @var string
 	 */
 	public $action = '';
-	
+
 	/**
 	 * Object element
 	 * @var string
 	 */
 	public $element = '';
-	
+
 	/**
 	 * Object id
 	 * @var int
 	 */
 	public $fk_object = 0;
-	
+
 	/**
 	 * Log certified by remote authority or not
 	 * @var boolean
 	 */
 	public $certified = false;
-	
+
 	/**
 	 * Author
 	 * @var int
 	 */
 	public $fk_user = 0;
-	
+
 	public $date_object = 0;
-	
+
 	public $ref_object = '';
-	
+
 	public $object_data = null;
-	
+
 	public $error = 0;
-	
+
 	/**
 	 *      Constructor
 	 *
@@ -88,7 +88,7 @@ class BlockedLog
 	public function __construct(DoliDB $db)
 	{
 		$this->db = $db;
-		
+
 	}
 
 	/**
@@ -96,10 +96,10 @@ class BlockedLog
 	 */
 	public function getObjectLink() {
 		global $langs;
-		
+
 		if($this->element === 'facture') {
 			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-			
+
 			$object = new Facture($this->db);
 			if($object->fetch($this->fk_object)>0) {
 				return $object->getNomUrl(1);
@@ -110,7 +110,7 @@ class BlockedLog
 		}
 		else if($this->element === 'payment') {
 			require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
-			
+
 			$object = new Paiement($this->db);
 			if($object->fetch($this->fk_object)>0) {
 				return $object->getNomUrl(1);
@@ -119,61 +119,61 @@ class BlockedLog
 				$this->error++;
 			}
 		}
-	
+
 		return $langs->trans('ImpossibleToReloadObject', $this->element, $this->fk_object);
-		
+
 	}
-	
+
 	/**
 	 *      try to retrieve user author
 	*/
 	public function getUser() {
 		global $langs, $cachedUser;
-		
+
 		if(empty($cachedUser))$cachedUser=array();
-		
+
 		if(empty($cachedUser[$this->fk_user])) {
 			$u=new User($this->db);
 			if($u->fetch($this->fk_user)>0) {
 				$cachedUser[$this->fk_user] = $u;
 			}
 		}
-		
+
 		if(!empty($cachedUser[$this->fk_user])) {
 			return $cachedUser[$this->fk_user]->getNomUrl(1);
 		}
-		
+
 		return $langs->trans('ImpossibleToRetrieveUser', $this->fk_user);
 	}
-	
+
 	/**
 	 *      populate log by object
 	 *
 	 *      @param		payment|facture		$object      object to store
 	 */
 	public function setObjectData(&$object) {
-		
+
 		if($object->element=='payment') {
 			$this->date_object = $object->datepaye;
 		}
 		else{
 			$this->date_object = $object->date;
 		}
-		
+
 		$this->ref_object = $object->ref;
 		$this->element = $object->element;
 		$this->fk_object = $object->id;
-		
+
 		$this->object_data=new stdClass();
-		
+
 		if($this->element === 'facture') {
 			if(empty($object->thirdparty))$object->fetch_thirdparty();
 			$this->object_data->thirdparty = new stdClass();
-			
+
 			foreach($object->thirdparty as $key=>$value) {
 				if(!is_object($value)) $this->object_data->thirdparty->{$key} = $value;
 			}
-			
+
 			$this->object_data->total_ht 	= (double) $object->total_ht;
 			$this->object_data->total_tva	= (double) $object->total_tva;
 			$this->object_data->total_ttc	= (double) $object->total_ttc;
@@ -181,17 +181,17 @@ class BlockedLog
 			$this->object_data->total_localtax2= (double) $object->total_localtax2;
 			$this->object_data->note_public	= (double) $object->note_public;
 			$this->object_data->note_private= (double) $object->note_private;
-						
+
 		}
 		elseif($this->element==='payment'){
-			
+
 			$this->object_data->amounts = $object->amounts;
-			
+
 		}
-		
-		
+
+
 	}
-	
+
 	/**
 	 *	Get object from database
 	 *
@@ -199,50 +199,50 @@ class BlockedLog
 	 *	@return     int         			>0 if OK, <0 if KO, 0 if not found
 	 */
 	public function fetch($id) {
-		
+
 		global $langs;
-		
+
 		dol_syslog(get_class($this)."::fetch id=".$id, LOG_DEBUG);
-		
+
 		if (empty($id))
 		{
 			$this->error='BadParameter';
 			return -1;
 		}
-		
+
 		$langs->load("blockedlog");
-		
+
 		$sql = "SELECT b.rowid, b.signature, b.amounts, b.action, b.element, b.fk_object, b.certified, b.tms, b.fk_user, b.date_object, b.ref_object, b.object_data";
 		$sql.= " FROM ".MAIN_DB_PREFIX."blockedlog as b";
 		if ($id) $sql.= " WHERE b.rowid = ". $id;
-		
+
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
 			if ($this->db->num_rows($resql))
 			{
 				$obj = $this->db->fetch_object($resql);
-				
+
 				$this->id				= $obj->rowid;
 				$this->ref				= $obj->rowid;
-				
+
 				$this->signature		= $obj->signature;
 				$this->amounts			= (double) $obj->amounts;
 				$this->action			= $obj->action;
 				$this->element			= $obj->element;
-				
+
 				$this->fk_object		= trim($obj->fk_object);
 				$this->date_object		= $this->db->jdate($obj->date_object);
 				$this->ref_object		= $obj->ref_object;
-				
+
 				$this->certified		= ($obj->certified == 1);
-				
+
 				$this->fk_user 			= $obj->fk_user;
-				
+
 				$this->tms				= $this->db->jdate($obj->tms);
-				
+
 				$this->object_data		= unserialize($obj->object_data);
-				
+
 				return 1;
 			}
 			else
@@ -256,24 +256,24 @@ class BlockedLog
 			$this->error=$this->db->error();
 			return -1;
 		}
-		
+
 	}
-	
+
 	/**
 	 *	Set block certified by authority
 	 *
 	 *	@return	boolean
 	 */
 	public function setCertified() {
-		
+
 		$res = $this->db->query("UPDATE ".MAIN_DB_PREFIX."blockedlog SET certified=1 WHERE rowid=".$this->id);
 		if($res===false) return false;
-		
+
 		return true;
-		
-		
+
+
 	}
-	
+
 	/**
 	 *	Create blocked log in database.
 	 *
@@ -281,31 +281,31 @@ class BlockedLog
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
 	public function create($user) {
-		
+
 		global $conf,$langs,$hookmanager;
-		
+
 		$langs->load('blockedlog');
-		
+
 		$error=0;
-		
+
 		dol_syslog(get_class($this).'::create', LOG_DEBUG);
-		
+
 		$this->getSignatureRecursive();
-		
-		
+
+
 		if (is_null($this->amounts))
 		{
 			$this->error=$langs->trans("BlockLogNeedAmountsValue");
 			dol_syslog($this->error, LOG_WARNING);
 			return -1;
 		}
-		
+
 		if(empty($this->element)) {
 			$this->error=$langs->trans("BlockLogNeedElement");
 			dol_syslog($this->error, LOG_WARNING);
 			return -2;
 		}
-		
+
 		if(empty($this->action)) {
 			$this->error=$langs->trans("BlockLogNeedAction");
 			dol_syslog($this->error, LOG_WARNING);
@@ -313,9 +313,9 @@ class BlockedLog
 		}
 
 		$this->fk_user = $user->id;
-		
+
 		$this->db->begin();
-		
+
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."blockedlog (";
 		$sql.= "action,";
 		$sql.= " amounts,";
@@ -343,18 +343,18 @@ class BlockedLog
 		$sql.= "".$user->id.",";
 		$sql.= $conf->entity;
 		$sql.= ")";
-		
+
 		$res = $this->db->query($sql);
 		if ($res)
 		{
 			$id = $this->db->last_insert_id(MAIN_DB_PREFIX."blockedlog");
-			
+
 			if ($id > 0)
 			{
 				$this->id = $id;
-				
+
 				$this->db->commit();
-				
+
 				return $this->id;
 			}
 			else
@@ -369,9 +369,9 @@ class BlockedLog
 			$this->db->rollback();
 			return -1;
 		}
-		
+
 	}
-	
+
 	/**
 	 *	return crypted value.
 	 *
@@ -379,56 +379,56 @@ class BlockedLog
 	 *	@return	string					crypted string
 	 */
 	private function crypt($value) {
-		
+
 		return hash('sha256',$value);
-		
+
 	}
-	
+
 	/**
 	 *	check if current signature still correct compare to the chain
 	 *
-	 *	@return	boolean					
+	 *	@return	boolean
 	 */
 	public function checkSignature() {
-		
+
 		$signature_to_test = $this->signature;
-		
+
 		$this->getSignatureRecursive();
-	
+
 		$res = ($signature_to_test === $this->signature);
-		
+
 		if(!$res) {
 			$this->error++;
 		}
-		
+
 		return $res;
 	}
-	
+
 	/**
-	 *	set current signatures 
+	 *	set current signatures
 	 */
 	 private function getSignatureRecursive(){
-		
+
 		$this->signature_line = $this->crypt( $this->action . $this->getSignature() . $this->amounts . print_r($this->object_data, true) );
 		/*if($this->signature=='d6320580a02c1ab67fcc0a6d49d453c7d96dda0148901736f7f55725bfe1b900' || $this->signature=='ea65d435ff12ca929936a406aa9d707d99fb334c127878d256b602a5541bbbc9') {
 			var_dump($this->signature_line,$this->action ,$this->getSignature() , $this->amounts , $this->object_data);
 		}*/
 		$this->signature = $this->signature_line;
-		
+
 		$logs = $this->getLog('all', 0, 0, 1) ;
 		if($logs!==false) {
 			foreach($logs as &$b) {
-			
+
 				if($this->id>0 && $b->id == $this->id) break; // on arrête sur un enregistrement précis pour recalculer une signature
-				
+
 				$b->getCurrentValue(); // on récupère la valeur actuelle en base de l'élément enregistré
-				
+
 				$this->signature = $this->crypt($this->signature. $this->action . $b->signature . $b->amounts);
 			}
 		}
-		
+
 	}
-	
+
 	/**
 	 *	return log object for a element.
 	 *
@@ -439,110 +439,110 @@ class BlockedLog
 	 *	@return	array					array of object log
 	 */
 	public function getLog($element, $fk_object, $limit = 0, $order = -1) {
-		global $conf,$cachedlogs ; 
-		
+		global $conf,$cachedlogs ;
+
 		/* $cachedlogs allow fastest search */
 		if(empty($cachedlogs)) $cachedlogs=array();
-	
-		
+
+
 		if($element=='all') {
-		
+
 	 		$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
 	         WHERE entity=".$conf->entity;
-	    	
+
 		}
 		else if($element=='not_certified') {
 			$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
 	         WHERE entity=".$conf->entity." AND certified = 0";
-			
+
 		}
 		else if($element=='just_certified') {
 			$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
 	         WHERE entity=".$conf->entity." AND certified = 1";
-			
+
 		}
 		else{
 			$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
 	         WHERE element='".$element."' AND fk_object=".(int) $fk_object;
-			
+
 		}
-		
+
 		$sql.=($order<0 ? ' ORDER BY rowid DESC ' : ' ORDER BY rowid ASC ');
-		
+
 		if($limit > 0 )$sql.=' LIMIT '.$limit;
-		
+
 		$res = $this->db->query($sql);
-		
+
 		if($res) {
-		
+
 			$results=array();
-			
+
 			while($obj = $this->db->fetch_object($res)) {
-				
+
 				if(!isset($cachedlogs[$obj->rowid])) {
 					$b=new BlockedLog($this->db);
 					$b->fetch($obj->rowid);
-					
+
 					$cachedlogs[$obj->rowid] = $b;
 				}
-				
+
 				$results[] = $cachedlogs[$obj->rowid];
-				
+
 			}
-			
+
 			return $results;
 		}
 		else{
 			return false;
 		}
 	}
-	
+
 	/**
 	 *	set amounts of log from current element value in order to compare signature.
 	 */
 	private function getCurrentValue() {
-		
+
 		if($this->element === 'payment') {
 			$sql="SELECT amount FROM ".MAIN_DB_PREFIX."paiement WHERE rowid=".$this->fk_object;
-					
+
 			$res = $this->db->query($sql);
-			
+
 			if($res && $obj = $this->db->fetch_object($res)) {
 				$this->amounts = (double) $obj->amount;
 			}
 		}
 		elseif($this->element === 'facture') {
 			$sql="SELECT total_ttc FROM ".MAIN_DB_PREFIX."facture WHERE rowid=".$this->fk_object;
-			
+
 			$res = $this->db->query($sql);
 			if($res && $obj = $this->db->fetch_object($res)) {
 				$this->amounts = (double) $obj->total_ttc;
 			}
 		}
-		
+
 	}
-	
+
 	/**
-	 *	return and set the entity signature included into line signature
+	 *	Return and set the entity signature included into line signature
 	 *
 	 *	@return	string					current entity signature
 	 */
 	public function getSignature() {
 		global $db,$conf,$mysoc;
-		
-		if(empty($conf->global->BLOCKEDLOG_ENTITY_FINGERPRINT)) { // creation of a unique fingerprint
-			
+
+		if (empty($conf->global->BLOCKEDLOG_ENTITY_FINGERPRINT)) { // creation of a unique fingerprint
+
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-			
+
 			$fingerprint = $this->crypt(print_r($mysoc,true).time().rand(0,1000));
-			
+
 			dolibarr_set_const($db, 'BLOCKEDLOG_ENTITY_FINGERPRINT', $fingerprint, 'chaine',0,'Numeric Unique Fingerprint', $conf->entity);
-			
-			$conf->global->BLOCKEDLOG_ENTITY_FINGERPRINT= $fingerprint;
+
+			$conf->global->BLOCKEDLOG_ENTITY_FINGERPRINT=$fingerprint;
 		}
-		
+
 		return $conf->global->BLOCKEDLOG_ENTITY_FINGERPRINT;
 	}
-	
+
 }
 
diff --git a/htdocs/blockedlog/lib/blockedlog.lib.php b/htdocs/blockedlog/lib/blockedlog.lib.php
index a7fca40d116..cffac7cbff9 100644
--- a/htdocs/blockedlog/lib/blockedlog.lib.php
+++ b/htdocs/blockedlog/lib/blockedlog.lib.php
@@ -32,17 +32,17 @@ function blockedlogadmin_prepare_head()
 
 	$h = 0;
 	$head = array();
-	
+
 	$head[$h][0] = DOL_URL_ROOT."/blockedlog/admin/blockedlog.php";
-	$head[$h][1] = $langs->trans("BlockedLog");
+	$head[$h][1] = $langs->trans("Setup");
 	$head[$h][2] = 'blockedlog';
 	$h++;
-	
+
 	$head[$h][0] = DOL_URL_ROOT."/blockedlog/admin/fingerprints.php";
 	$head[$h][1] = $langs->trans("Fingerprints");
 	$head[$h][2] = 'fingerprints';
 	$h++;
-	
+
 	$object=new stdClass();
 
     // Show more tabs from modules
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index ce16d6b9931..223acb91fb3 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -4247,37 +4247,6 @@ else if ($id > 0 || ! empty($ref))
 		$delallowed = $user->rights->facture->supprimer;
 
 		print $formfile->showdocuments('facture', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
-		
-		if(!empty($conf->blockedlog->enabled) && $object->statut>0) {
-			?>
-			<script type="text/javascript">
-
-			$(document).ready(function() {
-				$('a.documentpreview').click(function() {
-					$.post("<?php echo DOL_URL_ROOT."/blockedlog/ajax/block-add.php" ?>"
-							, { 
-								id:<?php echo $object->id; ?> 
-								, element:"<?php echo $object->element ?>"
-								, action:"PREVIEW_BILL" 
-							}
-					);
-				});
-				$('a.documentdownload').click(function() {
-					$.post("<?php echo DOL_URL_ROOT."/blockedlog/ajax/block-add.php" ?>"
-							, { 
-								id:<?php echo $object->id; ?> 
-								, element:"<?php echo $object->element ?>"
-								, action:"DOWNLOAD_BILL" 
-							}
-					);
-				});
-			});
-			
-			</script>
-			<?php
-		}
-		
-		
 		$somethingshown = $formfile->numoffiles;
 
 		// Show links to link elements
diff --git a/htdocs/core/modules/modBlockedLog.class.php b/htdocs/core/modules/modBlockedLog.class.php
index b149471cd20..f3f3be971b5 100644
--- a/htdocs/core/modules/modBlockedLog.class.php
+++ b/htdocs/core/modules/modBlockedLog.class.php
@@ -43,15 +43,15 @@ class modBlockedLog extends DolibarrModules
 
 		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
 		// It is used to group modules in module setup page
-        $this->family = "technic";
+        $this->family = "base";
         // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
         $this->name = preg_replace('/^mod/i','',get_class($this));
-        $this->description = "Enable a log on some business events into a reserved log. This module may be mandatory for some countries.";
+        $this->description = "Enable a log on some business events into a non reversible log. This module may be mandatory for some countries.";
         $this->version = 'development';                        // 'development', 'experimental' or 'dolibarr' or version
         // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
         $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
         // Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
-        $this->special = 1;
+        $this->special = 2;
         // Name of image file used for this module.
         $this->picto='technic';
 
diff --git a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
index 004c4eecd78..6759d18ba5d 100644
--- a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
+++ b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
@@ -50,9 +50,9 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 		if (empty($conf->blockedlog->enabled)) {
 			return 0;
 		}
-		
-		if($action==='BILL_VALIDATE' || $action === 'BILL_PAYED' || $action==='BILL_UNPAYED' 
-				|| $action === 'BILL_SENTBYMAIL' || $action === 'DOWNLOAD_BILL' || $action === 'PREVIEW_BILL') {
+
+		if($action==='BILL_VALIDATE' || $action === 'BILL_PAYED' || $action==='BILL_UNPAYED'
+				|| $action === 'BILL_SENTBYMAIL' || $action === 'DOC_DOWNLOAD' || $action === 'DOC_PREVIEW') {
 			$amounts=  (double) $object->total_ttc;
 		}
 		else if($action === 'PAYMENT_CUSTOMER_CREATE' || $action === 'PAYMENT_ADD_TO_BANK') {
@@ -62,8 +62,8 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 					$amounts+= price2num($amount);
 				}
 			}
-			
-			
+
+
 		}
 		else if(strpos($action,'PAYMENT')!==false) {
 			$amounts= (double) $object->amount;
@@ -71,25 +71,25 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 		else {
 			return 0; // not implemented action log
 		}
-		
+
 		$b=new BlockedLog($this->db);
 		$b->action = $action;
 		$b->amounts= $amounts;
 		$b->setObjectData($object);
-		
+
 		$res = $b->create($user);
-		
+
 		if($res<0) {
 			setEventMessage($b->error,'errors');
-			
+
 			return -1;
 		}
 		else {
-			
+
 			return 1;
 		}
-		
-		
+
+
     }
 
 }
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 695373e22b5..1aa79c2dced 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -467,7 +467,7 @@ Module30Desc=Invoice and credit note management for customers. Invoice managemen
 Module40Name=Suppliers
 Module40Desc=Supplier management and buying (orders and invoices)
 Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes. For legal purpose, see instead module 'Non Reversible Logs'.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Products
@@ -565,6 +565,8 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table that can be then exported. This module may be mandatory for some countries.
 Module4000Name=HRM
 Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi-company
diff --git a/htdocs/langs/en_US/blockedlog.lang b/htdocs/langs/en_US/blockedlog.lang
index fcad52508bd..7129b65257d 100644
--- a/htdocs/langs/en_US/blockedlog.lang
+++ b/htdocs/langs/en_US/blockedlog.lang
@@ -1,12 +1,14 @@
+BlockedLog=Non Reversible Logs
 Field=Field
-BlockedLogDesc=This module store event for invoice and payments as block chain
-FingerprintsDesc=All fingerprints stored
-EntityKey=Entity Key
-ShowAllFingerPrintsMightBeTooLong=Show all fingerprints (might be long)
-ShowAllFingerPrintsErrorsMightBeTooLong=Show all fingerprints with error (might be long)
+BlockedLogDesc=This module store event for invoice and payments into a block chain
+Fingerprints=Archived events and fingerprints
+FingerprintsDesc=Archived business events and fingerprints
+CompanyInitialKey=Company initial key
+ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
+ShowAllFingerPrintsErrorsMightBeTooLong=Show all archive logs with error (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Fingerprint is not valid
-OkCheckFingerprintValidity=Fingerprint is valid
+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).
+OkCheckFingerprintValidity=Archived log is valid. It means all data on this line were not modified and record follow the previous one.
 AddedByAuthority=Stored into remote authority
 NotAddedByAuthorityYet=Not yet stored into remote authority
 ShowDetails=Show stored details
@@ -18,6 +20,7 @@ logBILL_VALIDATE=Customer bill set valid from draft
 logBILL_SENTBYMAIL=Customer bill send by mail
 BlockedlogInfoDialog=Log Details
 Fingerprint=Fingerprint
-DownloadLogCSV=Download fingerprints CSV
-logPREVIEW_BILL=Preview of a validated customer bill in order to print or download
-logDOWNLOAD_BILL=Download of a validated customer bill in order to print or send
\ No newline at end of file
+DownloadLogCSV=Download archive logs (CSV)
+logDOC_PREVIEW=Preview of a validated document in order to print or download
+logDOC_DOWNLOAD=Download of a validated document in order to print or send
+DataOfArchivedEvent=Full datas of archived event
\ No newline at end of file
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 6b75b957590..33b155bb64c 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1891,7 +1891,7 @@ if (! function_exists("llxFooter"))
      */
     function llxFooter($comment='',$zone='private')
     {
-        global $conf, $langs, $user;
+        global $conf, $langs, $user, $object;
         global $delayedhtmlcontent;
 
         // Global html output events ($mesgs, $errors, $warnings)
@@ -2026,6 +2026,40 @@ if (! function_exists("llxFooter"))
                 </script>';
         }
 
+        // Wrapper to add log when clicking on download or preview
+        if (! empty($conf->blockedlog->enabled) && is_object($object) && $object->id > 0 && $object->statut > 0)
+        {
+            if (in_array($object->element, array('facture')))       // Restrict for the moment to element 'facture'
+            {
+                print "\n<!-- JS CODE TO ENABLE log when making a download or a preview of a document -->\n";
+                ?>
+    			<script type="text/javascript">
+    			jQuery(document).ready(function () {
+    				$('a.documentpreview').click(function() {
+    					$.post('<?php echo DOL_URL_ROOT."/blockedlog/ajax/block-add.php" ?>'
+    							, {
+    								id:<?php echo $object->id; ?>
+    								, element:'<?php echo $object->element ?>'
+    								, action:'DOC_PREVIEW'
+    							}
+    					);
+    				});
+    				$('a.documentdownload').click(function() {
+    					$.post('<?php echo DOL_URL_ROOT."/blockedlog/ajax/block-add.php" ?>'
+    							, {
+    								id:<?php echo $object->id; ?>
+    								, element:'<?php echo $object->element ?>'
+    								, action:'DOC_DOWNLOAD'
+    							}
+    					);
+    				});
+    			});
+    			</script>
+				<?php
+    		}
+       	}
+
+
 		// A div for the address popup
 		print "\n<!-- A div to allow dialog popup -->\n";
 		print '<div id="dialogforpopup" style="display: none;"></div>'."\n";

From e813fd2dfa69d3ce67ab5aec2af6df34970e3c16 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 16 Jun 2017 12:57:30 +0200
Subject: [PATCH 239/438] Fix missing key import_key and extraparams

---
 htdocs/adherents/class/api_memberstypes.class.php   | 1 -
 htdocs/comm/action/class/api_agendaevents.class.php | 1 -
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql      | 7 +++++--
 htdocs/install/mysql/tables/llx_actioncomm.sql      | 4 +++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/htdocs/adherents/class/api_memberstypes.class.php b/htdocs/adherents/class/api_memberstypes.class.php
index 9457b910c5d..ff8064d80fb 100644
--- a/htdocs/adherents/class/api_memberstypes.class.php
+++ b/htdocs/adherents/class/api_memberstypes.class.php
@@ -274,7 +274,6 @@ class MembersTypes extends DolibarrApi
         unset($object->cotisation);
         unset($object->libelle);
 
-        unset($object->import_key);
         unset($object->array_options);
         unset($object->linkedObjectsIds);
         unset($object->context);
diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index a607998cfa8..4edd656da53 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -318,7 +318,6 @@ class AgendaEvents extends DolibarrApi
 
     	unset($object->usermod);
     	unset($object->libelle);
-    	unset($object->import_key);
     	unset($object->array_options);
     	unset($object->context);
     	unset($object->canvas);
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index a66ef47fba6..5e46393768a 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -82,14 +82,17 @@ ALTER TABLE llx_ecm_files ADD UNIQUE INDEX uk_ecm_files (filepath, filename, ent
 ALTER TABLE llx_ecm_files ADD INDEX idx_ecm_files_label (label);
 
 
+ALTER TABLE llx_expedition ADD COLUMN fk_projet integer DEFAULT NULL after fk_soc;
+
+
 ALTER TABLE llx_holiday ADD COLUMN import_key				varchar(14);
 ALTER TABLE llx_holiday ADD COLUMN extraparams				varchar(255);	
 
-ALTER TABLE llx_expedition ADD COLUMN fk_projet integer DEFAULT NULL after fk_soc;
-
 ALTER TABLE llx_expensereport ADD COLUMN import_key			varchar(14);
 ALTER TABLE llx_expensereport ADD COLUMN extraparams		varchar(255);	
 
+ALTER TABLE llx_actioncomm ADD COLUMN import_key			varchar(14);
+ALTER TABLE llx_actioncomm ADD COLUMN extraparams			varchar(255);	
 
 
 ALTER TABLE llx_bank_account ADD COLUMN extraparams		varchar(255);	
diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql
index 4849aacb690..48b73bcaa65 100644
--- a/htdocs/install/mysql/tables/llx_actioncomm.sql
+++ b/htdocs/install/mysql/tables/llx_actioncomm.sql
@@ -69,8 +69,10 @@ create table llx_actioncomm
   recurdateend      datetime,						-- no more recurring event after this date
      
   fk_element		integer DEFAULT NULL,			-- For link to an element (proposal, invoice, order, ...)
-  elementtype		varchar(255) DEFAULT NULL		-- For link to an element (proposal, invoice, order, ...)
+  elementtype		varchar(255) DEFAULT NULL,		-- For link to an element (proposal, invoice, order, ...)
 
+  import_key		varchar(14),
+  extraparams		varchar(255)					-- for other parameters with json format
 )ENGINE=innodb;
 
 

From 81f1a341120a85e97c718571ca5bf447a74c08c8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 16 Jun 2017 13:06:35 +0200
Subject: [PATCH 240/438] Revert "Fix SPEC #7013 : use database type "numeric"
 to store monetary values"

---
 .../install/mysql/migration/6.0.0-7.0.0.sql   | 64 -------------------
 .../tables/llx_accounting_bookkeeping.sql     | 10 +--
 .../install/mysql/tables/llx_blockedlog.sql   |  2 +-
 .../mysql/tables/llx_chargesociales.sql       |  2 +-
 htdocs/install/mysql/tables/llx_commande.sql  |  2 +-
 .../mysql/tables/llx_commande_fournisseur.sql |  2 +-
 htdocs/install/mysql/tables/llx_don.sql       |  2 +-
 .../mysql/tables/llx_loan_schedule.sql        |  6 +-
 .../mysql/tables/llx_paiementcharge.sql       |  2 +-
 .../mysql/tables/llx_paiementfourn.sql        |  2 +-
 .../mysql/tables/llx_payment_donation.sql     |  2 +-
 .../tables/llx_payment_expensereport.sql      |  2 +-
 .../install/mysql/tables/llx_payment_loan.sql |  6 +-
 .../mysql/tables/llx_payment_salary.sql       |  4 +-
 .../mysql/tables/llx_prelevement_bons.sql     |  2 +-
 .../llx_prelevement_facture_demande.sql       |  2 +-
 .../mysql/tables/llx_prelevement_lignes.sql   |  2 +-
 htdocs/install/mysql/tables/llx_societe.sql   |  2 +-
 htdocs/install/mysql/tables/llx_tva.sql       |  4 +-
 19 files changed, 28 insertions(+), 92 deletions(-)
 delete mode 100644 htdocs/install/mysql/migration/6.0.0-7.0.0.sql

diff --git a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
deleted file mode 100644
index 545b52ea4a7..00000000000
--- a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
+++ /dev/null
@@ -1,64 +0,0 @@
---
--- Be carefull to requests order.
--- This file must be loaded by calling /install/index.php page
--- when current version is 6.0.0 or higher.
---
--- To rename a table:       ALTER TABLE llx_table RENAME TO llx_table_new;
--- To add a column:         ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol;
--- To rename a column:      ALTER TABLE llx_table CHANGE COLUMN oldname newname varchar(60);
--- To drop a column:        ALTER TABLE llx_table DROP COLUMN oldname;
--- To change type of field: ALTER TABLE llx_table MODIFY COLUMN name varchar(60);
--- To drop a foreign key:   ALTER TABLE llx_table DROP FOREIGN KEY fk_name;
--- To drop an index:        -- VMYSQL4.0 DROP INDEX nomindex on llx_table
--- To drop an index:        -- VPGSQL8.0 DROP INDEX nomindex
--- To restrict request to Mysql version x.y minimum use -- VMYSQLx.y
--- To restrict request to Pgsql version x.y minimum use -- VPGSQLx.y
--- To make pk to be auto increment (mysql):    -- VMYSQL4.3 ALTER TABLE llx_c_shipment_mode CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
--- To make pk to be auto increment (postgres): -- VPGSQL8.2 NOT POSSIBLE. MUST DELETE/CREATE TABLE
--- To set a field as NULL:                     -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NULL;
--- To set a field as NULL:                     -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name DROP NOT NULL;
--- To set a field as NOT NULL:                 -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NOT NULL;
--- To set a field as NOT NULL:                 -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET NOT NULL;
--- To set a field as default NULL:             -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET DEFAULT NULL;
--- Note: fields with type BLOB/TEXT can't have default value.
--- -- VPGSQL8.2 DELETE FROM llx_usergroup_user      WHERE fk_user      NOT IN (SELECT rowid from llx_user);
--- -- VMYSQL4.1 DELETE FROM llx_usergroup_user      WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
-
-
--- Clean corrupted values for tms
--- VMYSQL4.1 SET sql_mode = 'ALLOW_INVALID_DATES';
--- VMYSQL4.1 update llx_opensurvey_sondage set tms = date_fin where DATE(STR_TO_DATE(tms, '%Y-%m-%d')) IS NULL;
--- VMYSQL4.1 SET sql_mode = 'NO_ZERO_DATE';
--- VMYSQL4.1 update llx_opensurvey_sondage set tms = date_fin where DATE(STR_TO_DATE(tms, '%Y-%m-%d')) IS NULL;
--- Remove default not null on date_fin
--- VMYSQL4.3 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN date_fin DATETIME NULL DEFAULT NULL;
--- VPGSQL8.2 ALTER TABLE llx_opensurvey_sondage ALTER COLUMN date_fin DROP NOT NULL;
-
--- Move real to numeric for more precision for storing monetary amounts (no rouding)
--- https://wiki.dolibarr.org/index.php/Langages_et_normes#Structure_des_tables_et_champs
-ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN debit numeric(24,8);
-ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN credit numeric(24,8);
-ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN montant numeric(24,8);
-ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN multicurrency_amount numeric(24,8);
-ALTER TABLE llx_blockedlog MODIFY COLUMN amounts numeric(24,8);
-ALTER TABLE llx_chargessociales MODIFY COLUMN amount numeric(24,8);
-ALTER TABLE llx_commande MODIFY COLUMN amount_ht numeric(24,8);
-ALTER TABLE llx_commande_fournisseur MODIFY COLUMN amount_ht numeric(24,8);
-ALTER TABLE llx_don MODIFY COLUMN amount numeric(24,8);
-ALTER TABLE llx_loan_schedule MODIFY COLUMN amount_capital numeric(24,8);
-ALTER TABLE llx_loan_schedule MODIFY COLUMN amount_insurance numeric(24,8);
-ALTER TABLE llx_loan_schedule MODIFY COLUMN amount_interest numeric(24,8);
-ALTER TABLE llx_paiementcharge MODIFY COLUMN amount numeric(24,8);
-ALTER TABLE llx_paiementfourn MODIFY COLUMN amount numeric(24,8);
-ALTER TABLE llx_payment_donation MODIFY COLUMN amount numeric(24,8);
-ALTER TABLE llx_payment_expensereport MODIFY COLUMN amount numeric(24,8);
-ALTER TABLE llx_payment_loan MODIFY COLUMN amount_capital numeric(24,8);
-ALTER TABLE llx_payment_loan MODIFY COLUMN amount_insurance numeric(24,8);
-ALTER TABLE llx_payment_loan MODIFY COLUMN amount_interest numeric(24,8);
-ALTER TABLE llx_payment_salary MODIFY COLUMN salary numeric(24,8);
-ALTER TABLE llx_payment_salary MODIFY COLUMN amount numeric(24,8);
-ALTER TABLE llx_prelevement_bons MODIFY COLUMN amount numeric(24,8);
-ALTER TABLE llx_prelevement_facture_demande MODIFY COLUMN amount numeric(24,8);
-ALTER TABLE llx_prelevement_lignes MODIFY COLUMN amount numeric(24,8);
-ALTER TABLE llx_societe MODIFY COLUMN capital numeric(24,8);
-ALTER TABLE llx_tva MODIFY COLUMN amount numeric(24,8);
diff --git a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
index 01ced5b07f4..ad1160c356d 100644
--- a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
@@ -26,17 +26,17 @@ CREATE TABLE llx_accounting_bookkeeping
   doc_ref               varchar(300) NOT NULL,		-- 					| facture_client/reglement_client/... reference number
   fk_doc                integer NOT NULL,			-- 					| facture_client/reglement_client/... rowid
   fk_docdet             integer NOT NULL,			-- 					| facture_client/reglement_client/... line rowid
-  thirdparty_code       varchar(32),				-- Third party code (customer or supplier) when record is saved (may help debug) 
+  thirdparty_code       varchar(32),                -- Third party code (customer or supplier) when record is saved (may help debug) 
   subledger_account     varchar(32),				-- FEC:CompAuxNum	| account number of subledger account
   subledger_label       varchar(255),				-- FEC:CompAuxLib	| label of subledger account
   numero_compte         varchar(32) NOT NULL,		-- FEC:CompteNum	| account number
   label_compte          varchar(255) NOT NULL,		-- FEC:CompteLib	| label of account
   label_operation       varchar(255),				-- FEC:EcritureLib	| label of the operation
-  debit                 numeric(24,8) NOT NULL,		-- FEC:Debit
-  credit                numeric(24,8) NOT NULL,		-- FEC:Credit
-  montant               numeric(24,8) NOT NULL,		-- FEC:Montant (Not necessary)
+  debit                 double NOT NULL,			-- FEC:Debit
+  credit                double NOT NULL,			-- FEC:Credit
+  montant               double NOT NULL,			-- FEC:Montant (Not necessary)
   sens                  varchar(1) DEFAULT NULL,	-- FEC:Sens (Not necessary)
-  multicurrency_amount  numeric(24,8),				-- FEC:Montantdevise
+  multicurrency_amount  double,						-- FEC:Montantdevise
   multicurrency_code    varchar(255),				-- FEC:Idevise
   lettering_code        varchar(255),				-- FEC:EcritureLet
   date_lettering        datetime,					-- FEC:DateLet
diff --git a/htdocs/install/mysql/tables/llx_blockedlog.sql b/htdocs/install/mysql/tables/llx_blockedlog.sql
index 59c8e262817..ae696a0d6d1 100644
--- a/htdocs/install/mysql/tables/llx_blockedlog.sql
+++ b/htdocs/install/mysql/tables/llx_blockedlog.sql
@@ -4,7 +4,7 @@ CREATE TABLE llx_blockedlog
 	rowid integer AUTO_INCREMENT PRIMARY KEY, 
 	tms	timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	action varchar(50), 
-	amounts numeric(24,8) NOT NULL, 
+	amounts real NOT NULL, 
 	signature varchar(100) NOT NULL, 
 	signature_line varchar(100) NOT NULL, 
 	element varchar(50), 
diff --git a/htdocs/install/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql
index 093b635a964..519ceacc9e5 100644
--- a/htdocs/install/mysql/tables/llx_chargesociales.sql
+++ b/htdocs/install/mysql/tables/llx_chargesociales.sql
@@ -34,7 +34,7 @@ create table llx_chargesociales
   fk_type			integer NOT NULL,
   fk_account		integer,                       -- bank account
   fk_mode_reglement	integer,                -- mode de reglement
-  amount			numeric(24,8) default 0 NOT NULL,
+  amount			real     default 0 NOT NULL,
   paye				smallint default 0 NOT NULL,
   periode			date,
   fk_projet			integer DEFAULT NULL,
diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql
index 6964abdcd57..98740c232ac 100644
--- a/htdocs/install/mysql/tables/llx_commande.sql
+++ b/htdocs/install/mysql/tables/llx_commande.sql
@@ -42,7 +42,7 @@ create table llx_commande
   fk_user_cloture		integer,						-- user closing
   source				smallint,						-- not used, except by setting this to 42 for orders coming for replenishment and 0 in other case ?
   fk_statut				smallint  default 0,
-  amount_ht				numeric(24,8)  default 0,
+  amount_ht				real      default 0,
   remise_percent		real      default 0,
   remise_absolue		real      default 0,
   remise				real      default 0,
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
index 24158903eb1..6d291dcfa00 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
@@ -46,7 +46,7 @@ create table llx_commande_fournisseur
   source				smallint NOT NULL,			-- not used, except by setting this to 42 for orders coming for replenishment and 0 in other case ?
   fk_statut				smallint  default 0,
   billed				smallint  default 0,
-  amount_ht				numeric(24,8)  default 0,
+  amount_ht				real      default 0,
   remise_percent		real      default 0,
   remise				real      default 0,
   tva					double(24,8)      default 0,
diff --git a/htdocs/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql
index 63b2cd111ea..b7b7c89f9cd 100644
--- a/htdocs/install/mysql/tables/llx_don.sql
+++ b/htdocs/install/mysql/tables/llx_don.sql
@@ -28,7 +28,7 @@ create table llx_don
   tms             timestamp,
   fk_statut       smallint NOT NULL DEFAULT 0,  -- Status of donation promise or validate
   datedon         datetime,                     -- Date of the donation/promise
-  amount          numeric(24,8) DEFAULT 0,
+  amount          real DEFAULT 0,
   fk_payment      integer,
   paid            smallint default 0 NOT NULL,
   firstname       varchar(50),
diff --git a/htdocs/install/mysql/tables/llx_loan_schedule.sql b/htdocs/install/mysql/tables/llx_loan_schedule.sql
index eb43238255a..c682b22f276 100644
--- a/htdocs/install/mysql/tables/llx_loan_schedule.sql
+++ b/htdocs/install/mysql/tables/llx_loan_schedule.sql
@@ -24,9 +24,9 @@ create table llx_loan_schedule
   datec				datetime,         -- creation date
   tms				timestamp,
   datep				datetime,         -- payment date
-  amount_capital	numeric(24,8) DEFAULT 0,
-  amount_insurance	numeric(24,8) DEFAULT 0,
-  amount_interest	numeric(24,8) DEFAULT 0,
+  amount_capital	real DEFAULT 0,
+  amount_insurance	real DEFAULT 0,
+  amount_interest	real DEFAULT 0,
   fk_typepayment	integer NOT NULL,
   num_payment		varchar(50),
   note_private      text,
diff --git a/htdocs/install/mysql/tables/llx_paiementcharge.sql b/htdocs/install/mysql/tables/llx_paiementcharge.sql
index 086bafae0fa..2efca933dba 100644
--- a/htdocs/install/mysql/tables/llx_paiementcharge.sql
+++ b/htdocs/install/mysql/tables/llx_paiementcharge.sql
@@ -23,7 +23,7 @@ create table llx_paiementcharge
   datec           datetime,           -- date de creation
   tms             timestamp,
   datep           datetime,           -- payment date
-  amount          numeric(24,8) DEFAULT 0,
+  amount          real DEFAULT 0,
   fk_typepaiement integer NOT NULL,
   num_paiement    varchar(50),
   note            text,
diff --git a/htdocs/install/mysql/tables/llx_paiementfourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn.sql
index 16d63a32076..0e9b1885c97 100644
--- a/htdocs/install/mysql/tables/llx_paiementfourn.sql
+++ b/htdocs/install/mysql/tables/llx_paiementfourn.sql
@@ -25,7 +25,7 @@ create table llx_paiementfourn
   tms               timestamp,
   datec             datetime,          -- date de creation de l'enregistrement
   datep             datetime,          -- date de paiement
-  amount            numeric(24,8) DEFAULT 0,      -- montant
+  amount            real DEFAULT 0,    -- montant
   multicurrency_amount double(24,8) DEFAULT 0,    -- multicurrency amount
   fk_user_author    integer,           -- auteur
   fk_paiement       integer NOT NULL,  -- moyen de paiement
diff --git a/htdocs/install/mysql/tables/llx_payment_donation.sql b/htdocs/install/mysql/tables/llx_payment_donation.sql
index 1859c7aa796..afa5075cd4e 100644
--- a/htdocs/install/mysql/tables/llx_payment_donation.sql
+++ b/htdocs/install/mysql/tables/llx_payment_donation.sql
@@ -23,7 +23,7 @@ create table llx_payment_donation
   datec           datetime,           -- date de creation
   tms             timestamp,
   datep           datetime,           -- payment date
-  amount          numeric(24,8) DEFAULT 0,
+  amount          real DEFAULT 0,
   fk_typepayment  integer NOT NULL,
   num_payment     varchar(50),
   note            text,
diff --git a/htdocs/install/mysql/tables/llx_payment_expensereport.sql b/htdocs/install/mysql/tables/llx_payment_expensereport.sql
index 1857246e22e..40e39771978 100644
--- a/htdocs/install/mysql/tables/llx_payment_expensereport.sql
+++ b/htdocs/install/mysql/tables/llx_payment_expensereport.sql
@@ -23,7 +23,7 @@ create table llx_payment_expensereport
   datec                   datetime,           -- date de creation
   tms                     timestamp,
   datep                   datetime,           -- payment date
-  amount                  numeric(24,8) DEFAULT 0,
+  amount                  real DEFAULT 0,
   fk_typepayment          integer NOT NULL,
   num_payment             varchar(50),
   note                    text,
diff --git a/htdocs/install/mysql/tables/llx_payment_loan.sql b/htdocs/install/mysql/tables/llx_payment_loan.sql
index 3b6111a7b2f..d023c039391 100644
--- a/htdocs/install/mysql/tables/llx_payment_loan.sql
+++ b/htdocs/install/mysql/tables/llx_payment_loan.sql
@@ -24,9 +24,9 @@ create table llx_payment_loan
   datec				datetime,         -- creation date
   tms				timestamp,
   datep				datetime,         -- payment date
-  amount_capital	numeric(24,8) DEFAULT 0,
-  amount_insurance	numeric(24,8) DEFAULT 0,
-  amount_interest	numeric(24,8) DEFAULT 0,
+  amount_capital	real DEFAULT 0,
+  amount_insurance	real DEFAULT 0,
+  amount_interest	real DEFAULT 0,
   fk_typepayment	integer NOT NULL,
   num_payment		varchar(50),
   note_private      text,
diff --git a/htdocs/install/mysql/tables/llx_payment_salary.sql b/htdocs/install/mysql/tables/llx_payment_salary.sql
index 3b6da16b9cb..38364c6812e 100644
--- a/htdocs/install/mysql/tables/llx_payment_salary.sql
+++ b/htdocs/install/mysql/tables/llx_payment_salary.sql
@@ -24,8 +24,8 @@ create table llx_payment_salary
   fk_user         integer NOT NULL,
   datep           date,                       -- date de paiement
   datev           date,                       -- date de valeur (this field should not be here, only into bank tables)
-  salary          numeric(24,8),              -- salary of user when payment was done
-  amount          numeric(24,8) NOT NULL DEFAULT 0,
+  salary          real,						  -- salary of user when payment was done
+  amount          real NOT NULL DEFAULT 0,
   fk_typepayment  integer NOT NULL,
   num_payment     varchar(50),				  -- ref
   label           varchar(255),
diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.sql
index 40fff2e842d..e92342eb001 100644
--- a/htdocs/install/mysql/tables/llx_prelevement_bons.sql
+++ b/htdocs/install/mysql/tables/llx_prelevement_bons.sql
@@ -29,7 +29,7 @@ create table llx_prelevement_bons
   ref            varchar(12),        -- reference
   entity         integer DEFAULT 1 NOT NULL, -- multi company id
   datec          datetime,           -- date de creation
-  amount         numeric(24,8) DEFAULT 0,    -- montant total du prelevement
+  amount         real DEFAULT 0,     -- montant total du prelevement
   statut         smallint DEFAULT 0, -- statut
   credite        smallint DEFAULT 0, -- indique si le prelevement a ete credite
   note           text,
diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql
index 1d1b59bf3f5..3bdc0e2ed81 100644
--- a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql
+++ b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql
@@ -21,7 +21,7 @@ create table llx_prelevement_facture_demande
 (
   rowid               integer AUTO_INCREMENT PRIMARY KEY,
   fk_facture          integer NOT NULL,
-  amount              numeric(24,8) NOT NULL,
+  amount              real NOT NULL,
   date_demande        datetime NOT NULL,
   traite              smallint DEFAULT 0,
   date_traite         datetime,
diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql
index 448b3846d71..04b6e1ebf5e 100644
--- a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql
+++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql
@@ -24,7 +24,7 @@ create table llx_prelevement_lignes
   statut              smallint DEFAULT 0,
 
   client_nom          varchar(255),
-  amount              numeric(24,8) DEFAULT 0,
+  amount              real DEFAULT 0,
   code_banque         varchar(128),
   code_guichet        varchar(6),
   number              varchar(255),
diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql
index 7c88a74de07..20440b692d7 100644
--- a/htdocs/install/mysql/tables/llx_societe.sql
+++ b/htdocs/install/mysql/tables/llx_societe.sql
@@ -64,7 +64,7 @@ create table llx_societe
   idprof5                  varchar(128),                         		-- IDProf5: nu for france
   idprof6                  varchar(128),                         		-- IDProf6: nu for france
   tva_intra                varchar(20),                         		-- tva
-  capital                  numeric(24,8),                       		-- capital de la societe
+  capital                  real,                                		-- capital de la societe
   fk_stcomm                integer        DEFAULT 0 NOT NULL,      	-- commercial statut
   note_private             text,                                		--
   note_public              text,                                        --
diff --git a/htdocs/install/mysql/tables/llx_tva.sql b/htdocs/install/mysql/tables/llx_tva.sql
index d2a7b67c835..9abf63d6ad9 100644
--- a/htdocs/install/mysql/tables/llx_tva.sql
+++ b/htdocs/install/mysql/tables/llx_tva.sql
@@ -24,11 +24,11 @@ create table llx_tva
   datec           datetime,                   -- Create date
   datep           date,                       -- date de paiement
   datev           date,                       -- date de valeur
-  amount          numeric(24,8) NOT NULL DEFAULT 0,
+  amount          real NOT NULL DEFAULT 0,
   fk_typepayment  integer NULL,
   num_payment     varchar(50),
   label           varchar(255),
-  entity          integer DEFAULT 1 NOT NULL, -- multi company id
+  entity          integer DEFAULT 1 NOT NULL,	-- multi company id
   note            text,
   fk_bank         integer,  
   fk_user_creat   integer,                    -- utilisateur who create record

From b228fe6a2ae6aa5ac265fcb1aca90c5247c2d4d4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 16 Jun 2017 16:06:20 +0200
Subject: [PATCH 241/438] Fix auto focus on module page

---
 htdocs/admin/modules.php          | 4 +++-
 htdocs/core/lib/functions.lib.php | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 8bea1c6dcb7..5d5886b5415 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -430,6 +430,8 @@ print "<br>\n";
 
 if ($mode == 'common')
 {
+    dol_set_focus('#search_keyword');
+
     print '<form method="GET" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -441,7 +443,7 @@ if ($mode == 'common')
 
     $moreforfilter = '';
     $moreforfilter.='<div class="divsearchfield">';
-    $moreforfilter.= $langs->trans('Keyword') . ': <input type="text" name="search_keyword" value="'.dol_escape_htmltag($search_keyword).'">';
+    $moreforfilter.= $langs->trans('Keyword') . ': <input type="text" id="search_keyword" name="search_keyword" value="'.dol_escape_htmltag($search_keyword).'">';
     $moreforfilter.= '</div>';
     $moreforfilter.='<div class="divsearchfield">';
     $moreforfilter.= $langs->trans('Origin') . ': '.$form->selectarray('search_nature', $arrayofnatures, dol_escape_htmltag($search_nature), 1);
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index a582263185b..fd3b0012165 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6089,12 +6089,12 @@ function dolExplodeIntoArray($string, $delimiter = ';', $kv = '=')
 /**
  * Set focus onto field with selector
  *
- * @param 	string	$selector	Selector ('#id')
+ * @param 	string	$selector	Selector ('#id') to use to find the HTML input field that must get the autofocus. You must use a CSS selector, so unique id preceding with the '#' char.
  * @return	string				HTML code to set focus
  */
 function dol_set_focus($selector)
 {
-	print '<!-- Set focus onto a specific field -->'."\n";
+	print "\n".'<!-- Set focus onto a specific field -->'."\n";
 	print '<script type="text/javascript" language="javascript">jQuery(document).ready(function() { jQuery("'.$selector.'").focus(); });</script>'."\n";
 }
 

From f0e234eef2e2fbc9c2425bdc7311d64f0768a1f0 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Fri, 16 Jun 2017 17:01:43 +0200
Subject: [PATCH 242/438] Fix: missing hookmanager init

---
 htdocs/admin/defaultvalues.php |  6 +++++-
 htdocs/admin/modules.php       | 36 ++++++++++++++++++++++------------
 htdocs/admin/translation.php   |  7 +++++--
 htdocs/user/group/index.php    |  2 +-
 htdocs/user/perms.php          | 12 ++++++------
 5 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 94682cd502f..53c22353b92 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2017	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2017	Regis Houssin		<regis.houssin@capnetworks.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
@@ -60,6 +61,9 @@ $urlpage = GETPOST('urlpage');
 $key = GETPOST('key');
 $value = GETPOST('value');
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('admindefaultvalues','globaladmin'));
+
 
 /*
  * Actions
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 8bea1c6dcb7..1aebae10947 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -1,12 +1,12 @@
 <?php
-/* Copyright (C) 2003-2007  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
- * Copyright (C) 2003       Jean-Louis Bergamo      <jlb@j1b.org>
- * Copyright (C) 2004-2017  Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2004       Eric Seigne             <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@capnetworks.com>
- * Copyright (C) 2011       Juanjo Menent           <jmenent@2byte.es>
- * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
- * Copyright (C) 2015       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
+/* Copyright (C) 2003-2007	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2003		Jean-Louis Bergamo		<jlb@j1b.org>
+ * Copyright (C) 2004-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2004		Eric Seigne				<eric.seigne@ryxeo.com>
+ * Copyright (C) 2005-2017	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2011		Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2015		Jean-François Ferry		<jfefe@aternatik.fr>
+ * Copyright (C) 2015		Raphaël Doursenaud		<rdoursenaud@gpcsolutions.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -75,11 +75,18 @@ if ($search_version) $param.='&search_version='.urlencode($search_version);
 $dirins=DOL_DOCUMENT_ROOT.'/custom';
 $urldolibarrmodules='https://www.dolistore.com/';
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('adminmodules','globaladmin'));
+
 
 /*
  * Actions
  */
 
+$parameters=array();
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
 if (GETPOST('buttonreset'))
 {
     $search_keyword='';
@@ -204,7 +211,7 @@ if ($action == 'set' && $user->admin)
     		setEventMessages($msg, null, 'warnings');
 	    }
 	}
-    header("Location: modules.php?mode=".$mode.$param.($page_y?'&page_y='.$page_y:''));
+    header("Location: ".$_SERVER["PHP_SELF"]."?mode=".$mode.$param.($page_y?'&page_y='.$page_y:''));
 	exit;
 }
 
@@ -212,7 +219,7 @@ if ($action == 'reset' && $user->admin)
 {
     $result=unActivateModule($value);
     if ($result) setEventMessages($result, null, 'errors');
-    header("Location: modules.php?mode=".$mode.$param.($page_y?'&page_y='.$page_y:''));
+    header("Location: ".$_SERVER["PHP_SELF"]."?mode=".$mode.$param.($page_y?'&page_y='.$page_y:''));
 	exit;
 }
 
@@ -474,10 +481,13 @@ if ($mode == 'common')
         print $hookmanager->resPrint;
     }
 
+    $moreforfilter='';
 
     print '<div class="clearboth"></div><br>';
 
-    $moreforfilter='';
+    $parameters=array();
+    $reshook=$hookmanager->executeHooks('insertExtraHeader',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+    if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
     // Show list of modules
 
@@ -657,7 +667,7 @@ if ($mode == 'common')
         	}
         	else
         	{
-        		print '<a class="reposition" href="modules.php?id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=reset&amp;value=' . $modName . '&amp;mode=' . $mode . $param . '">';
+        		print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=reset&amp;value=' . $modName . '&amp;mode=' . $mode . $param . '">';
         		print img_picto($langs->trans("Activated"),'switch_on');
         		print '</a>';
         	}
@@ -749,7 +759,7 @@ if ($mode == 'common')
 	        	    }
 	        	}
         	    print '<!-- Message to show: '.$warningmessage.' -->'."\n";
-	        	print '<a class="reposition" href="modules.php?id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=set&amp;value=' . $modName . '&amp;mode=' . $mode . $param . '"';
+	        	print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=set&amp;value=' . $modName . '&amp;mode=' . $mode . $param . '"';
 	        	if ($warningmessage) print ' onclick="return confirm(\''.dol_escape_js($warningmessage).'\');"';
 	        	print '>';
 	        	print img_picto($langs->trans("Disabled"),'switch_off');
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 8a6c38ffe46..be48bd0c8f4 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2007-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2009      Regis Houssin        <regis.houssin@capnetworks.com>
+/* Copyright (C) 2007-2016	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2009-2017	Regis Houssin		<regis.houssin@capnetworks.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
@@ -56,6 +56,9 @@ $pagenext = $page + 1;
 if (! $sortfield) $sortfield='lang,transkey';
 if (! $sortorder) $sortorder='ASC';
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('admintranslation','globaladmin'));
+
 
 /*
  * Actions
diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php
index 06e11caced9..e8d37801998 100644
--- a/htdocs/user/group/index.php
+++ b/htdocs/user/group/index.php
@@ -203,7 +203,7 @@ if ($resql)
     print '</div>';
     print "</form>\n";
 
-    $db->free();
+    $db->free($resql);
 }
 else
 {
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index 5d87232c928..6f89e49af5e 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -1,10 +1,10 @@
 <?php
-/* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2002-2003 Jean-Louis Bergamo   <jlb@j1b.org>
- * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2017 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2012      Juanjo Menent        <jmenent@2byte.es>
+/* Copyright (C) 2002-2005	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2002-2003	Jean-Louis Bergamo		<jlb@j1b.org>
+ * Copyright (C) 2004-2015	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2004		Eric Seigne				<eric.seigne@ryxeo.com>
+ * Copyright (C) 2005-2017	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2012		Juanjo Menent			<jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

From 1d91ce90d33b3909c6a5e968ad0152c2b6b05735 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 17 Jun 2017 00:13:09 +0200
Subject: [PATCH 243/438] FIX image from medias directory into PDF free text

---
 htdocs/admin/chequereceipts.php    | 2 +-
 htdocs/admin/commande.php          | 2 +-
 htdocs/admin/contract.php          | 2 +-
 htdocs/admin/expedition.php        | 2 +-
 htdocs/admin/expensereport.php     | 2 +-
 htdocs/admin/facture.php           | 2 +-
 htdocs/admin/fichinter.php         | 2 +-
 htdocs/admin/livraison.php         | 2 +-
 htdocs/admin/propal.php            | 2 +-
 htdocs/admin/supplier_invoice.php  | 2 +-
 htdocs/admin/supplier_order.php    | 2 +-
 htdocs/admin/supplier_proposal.php | 2 +-
 htdocs/core/lib/pdf.lib.php        | 7 +++++++
 13 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/htdocs/admin/chequereceipts.php b/htdocs/admin/chequereceipts.php
index f88dfc6f5a6..3d3db2451d2 100644
--- a/htdocs/admin/chequereceipts.php
+++ b/htdocs/admin/chequereceipts.php
@@ -274,7 +274,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 else
 {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_details');
+    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_notes');
     print $doleditor->Create();
 }
 print '</td><td align="right">';
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index f4104e2007f..e9ad5ab6ed6 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -559,7 +559,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 else
 {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_details');
+    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_notes');
     print $doleditor->Create();
 }
 print '</td><td align="right">';
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index e2f865f61f6..427b3a531c4 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -493,7 +493,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 else
 {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_details');
+    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_notes');
     print $doleditor->Create();
 }
 print '</td></tr>'."\n";
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 12d0b7951d5..af932b94b45 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -493,7 +493,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 else
 {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_details');
+    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_notes');
     print $doleditor->Create();
 }
 print "</td></tr>\n";
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index 24aaeede5b4..cd14d472057 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -497,7 +497,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 else
 {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_details');
+    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_notes');
     print $doleditor->Create();
 }
 print '</td></tr>'."\n";
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 57ff2321a12..85ee8c09934 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -731,7 +731,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 else
 {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_details');
+    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_notes');
     print $doleditor->Create();
 }
 print '</td><td align="right">';
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 68d2d87800a..926a3651362 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -525,7 +525,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 else
 {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_details');
+    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_notes');
     print $doleditor->Create();
 }
 print '</td><td align="right">';
diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
index 0136f6cc9d9..fe41afabfb8 100644
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -474,7 +474,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 else
 {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_details');
+    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_notes');
     print $doleditor->Create();
 }
 print '</td><td align="right">';
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index 8acbf19f939..2f90145f3cc 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -564,7 +564,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 else
 {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_details');
+    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_notes');
     print $doleditor->Create();
 }
 print '</td><td align="right">';
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index 17501cdb4f9..6d65af336b9 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -487,7 +487,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 else
 {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_details');
+    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_notes');
     print $doleditor->Create();
 }
 print '</td><td align="right">';
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index 13499af551a..21b3de68835 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -553,7 +553,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 else
 {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_details');
+    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_notes');
     print $doleditor->Create();
 }
 print '</td><td align="right">';
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index 8c52ee83dda..4e7efa4d922 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -520,7 +520,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 else
 {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_details');
+    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_notes');
     print $doleditor->Create();
 }
 print '</td><td align="right">';
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 9220725dc8e..a9fb8e52734 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -861,6 +861,13 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
 		$substitutionarray['__FROM_EMAIL__']=$fromcompany->email;
 		complete_substitutions_array($substitutionarray, $outputlangs, $object);
 		$newfreetext=make_substitutions($conf->global->$paramfreetext, $substitutionarray, $outputlangs);
+
+		// Make a change into HTML code to allow to include images from medias directory.
+		// <img alt="" src="/dolibarr_dev/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
+		// become
+		// <img src="'.DOL_DATA_ROOT.'/media/image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
+		$newfreetext=preg_replace('/(<img.*src=")[^\"]*viewimage\.php[^\"]*modulepart=medias[^\"]*file=([^\"]*)("[^\/]*\/>)/', '\1'.DOL_DATA_ROOT.'/medias/\2\3', $newfreetext);
+
 		$line.=$outputlangs->convToOutputCharset($newfreetext);
 	}
 

From b240f536b5e121ac8a54bbf16ddf579ca593b3fe Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sat, 17 Jun 2017 07:54:35 +0200
Subject: [PATCH 244/438] Fix : Accountancy - Debug and add information in
 database

---
 htdocs/accountancy/admin/accountmodel.php     |   2 +-
 htdocs/accountancy/admin/card.php             |   2 +-
 htdocs/accountancy/admin/categories_list.php  |   2 +-
 htdocs/accountancy/admin/export.php           |   2 +-
 htdocs/accountancy/admin/fiscalyear_info.php  |   2 +-
 htdocs/accountancy/admin/importaccounts.php   |   2 +-
 htdocs/accountancy/admin/productaccount.php   |   2 +-
 htdocs/accountancy/bookkeeping/balance.php    | 273 +++++++++---------
 .../bookkeeping/balancebymonth.php            |   6 +-
 htdocs/accountancy/bookkeeping/card.php       |  18 +-
 htdocs/accountancy/bookkeeping/list.php       |   6 +-
 .../accountancy/bookkeeping/listbyaccount.php |  15 +-
 htdocs/accountancy/bookkeeping/listbyyear.php |  18 +-
 .../class/accountancycategory.class.php       |   4 +-
 .../class/accountancyexport.class.php         |  20 +-
 .../class/accountancysystem.class.php         |   2 +-
 .../class/accountingaccount.class.php         |   2 +-
 .../accountancy/class/bookkeeping.class.php   |  43 ++-
 htdocs/accountancy/customer/card.php          |   2 +-
 htdocs/accountancy/customer/index.php         |   2 +-
 htdocs/accountancy/customer/lines.php         |   2 +-
 htdocs/accountancy/customer/list.php          |   2 +-
 htdocs/accountancy/journal/bankjournal.php    |  77 ++++-
 .../journal/expensereportsjournal.php         |  15 +-
 .../accountancy/journal/purchasesjournal.php  |  10 +-
 htdocs/accountancy/journal/sellsjournal.php   |  14 +-
 htdocs/accountancy/report/result.php          |   2 +-
 htdocs/accountancy/supplier/card.php          |   2 +-
 htdocs/accountancy/supplier/index.php         |   2 +-
 htdocs/accountancy/supplier/lines.php         |   2 +-
 htdocs/accountancy/supplier/list.php          |   2 +-
 htdocs/accountancy/tpl/export_journal.tpl.php |   2 +-
 .../bank/class/paymentvarious.class.php       |  25 +-
 htdocs/compta/bank/ligne.php                  |   2 +-
 34 files changed, 326 insertions(+), 258 deletions(-)

diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index e22e993796f..aa6c4a71551 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2011       Remy Younes             <ryounes@gmail.com>
  * Copyright (C) 2012-2015  Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2012       Christophe Battarel     <christophe.battarel@ltairis.fr>
- * Copyright (C) 2011-2016  Alexandre Spangaro      <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2011-2016  Alexandre Spangaro      <aspangaro@zendsi.com>
  * Copyright (C) 2015       Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2016       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  *
diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php
index 73e3fdf6dd9..fa3adf1301b 100644
--- a/htdocs/accountancy/admin/card.php
+++ b/htdocs/accountancy/admin/card.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013-2017 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2017 Alexandre Spangaro   <aspangaro@zendsi.com>
  * Copyright (C) 2014      Florian Henry        <florian.henry@open-concept.pro>
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index b10015baa6c..7c658d2661c 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2011       Remy Younes             <ryounes@gmail.com>
  * Copyright (C) 2012-2015  Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2012       Christophe Battarel     <christophe.battarel@ltairis.fr>
- * Copyright (C) 2011-2016  Alexandre Spangaro      <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2011-2016  Alexandre Spangaro      <aspangaro@zendsi.com>
  * Copyright (C) 2015       Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2016       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  *
diff --git a/htdocs/accountancy/admin/export.php b/htdocs/accountancy/admin/export.php
index eaf69f34f1f..cdec35415fd 100644
--- a/htdocs/accountancy/admin/export.php
+++ b/htdocs/accountancy/admin/export.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2013-2015 Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2015 Alexandre Spangaro	<aspangaro@zendsi.com>
  * Copyright (C) 2014	   Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
diff --git a/htdocs/accountancy/admin/fiscalyear_info.php b/htdocs/accountancy/admin/fiscalyear_info.php
index 3596d73d751..baadbdc0828 100644
--- a/htdocs/accountancy/admin/fiscalyear_info.php
+++ b/htdocs/accountancy/admin/fiscalyear_info.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2014-2016	Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
+/* Copyright (C) 2014-2016	Alexandre Spangaro	<aspangaro@zendsi.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/htdocs/accountancy/admin/importaccounts.php b/htdocs/accountancy/admin/importaccounts.php
index 6ae94dc8ce2..93d41b3cbc6 100644
--- a/htdocs/accountancy/admin/importaccounts.php
+++ b/htdocs/accountancy/admin/importaccounts.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013-2017 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com> 
+ * Copyright (C) 2013-2017 Alexandre Spangaro   <aspangaro@zendsi.com> 
  * Copyright (C) 2014      Florian Henry        <florian.henry@open-concept.pro>
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index 33bf067fa9e..5b614061dbc 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013-2016 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2016 Alexandre Spangaro   <aspangaro@zendsi.com>
  * Copyright (C) 2014 	   Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2014 	   Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2015      Ari Elbaz (elarifr)	<github@accedinfo.com>
diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 3f2c472cc58..a32b739752a 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -1,7 +1,7 @@
 <?php
-/* Copyright (C) 2016 		Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2016 		Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2016 		Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
+/* Copyright (C) 2016		Olivier Geffroy		<jeff@jeffinfo.com>
+ * Copyright (C) 2016		Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2016		Alexandre Spangaro	<aspangaro@zendsi.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -100,10 +100,10 @@ if (! empty($search_accountancy_code_end)) {
 
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
 {
-    $search_accountancy_code_start = '';
-    $search_accountancy_code_end = '';
-    $search_date_start = '';
-    $search_date_end = '';
+	$search_accountancy_code_start = '';
+	$search_accountancy_code_end = '';
+	$search_date_start = '';
+	$search_date_end = '';
 }
 
 
@@ -137,140 +137,137 @@ if ($action == 'export_csv') {
 }
 
 else {
-    $title_page = $langs->trans("AccountBalance") . (($search_date_start || $search_date_end) ? ' ' . dol_print_date($search_date_start) . '-' . dol_print_date($search_date_end) : '');
-    
-    llxHeader('', $title_page);
-    
-    // List
+	$title_page = $langs->trans("AccountBalance") . (($search_date_start || $search_date_end) ? ' ' . dol_print_date($search_date_start) . '-' . dol_print_date($search_date_end) : '');
 
-    $nbtotalofrecords = '';
-    if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
-        $nbtotalofrecords = $object->fetchAllBalance($sortorder, $sortfield, 0, 0, $filter);
-        if ($nbtotalofrecords < 0) {
-            setEventMessages($object->error, $object->errors, 'errors');
-        }
-    }
-    
-    $result = $object->fetchAllBalance($sortorder, $sortfield, $limit, $offset, $filter);
-    if ($result < 0) {
-        setEventMessages($object->error, $object->errors, 'errors');
-    }
-    
-    
-    print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-    
-    $button = '<input type="submit" name="button_export_csv" class="butAction" value="' . $langs->trans("Export") . '" />';
-    print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $options, $sortfield, $sortorder, '', $result, $result, 'title_accountancy', 0, $button);
-    
-    
-    $moreforfilter = '';
-    
-    $moreforfilter .= '<div class="divsearchfield">';
-    $moreforfilter .= $langs->trans('DateStart') . ': ';
-    $moreforfilter .= $form->select_date($search_date_start, 'date_start', 0, 0, 1, '', 1, 0, 1);
-    $moreforfilter .= $langs->trans('DateEnd') . ': ';
-    $moreforfilter .= $form->select_date($search_date_end, 'date_end', 0, 0, 1, '', 1, 0, 1);
-    $moreforfilter .= '</div>';
-    
-    if (! empty($moreforfilter)) {
-        print '<div class="liste_titre liste_titre_bydiv centpercent">';
-        print $moreforfilter;
-        $parameters = array();
-        $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
-        print '</div>';
-    }
-    
-    print '<table class="liste ' . ($moreforfilter ? "listwithfilterbefore" : "") . '">';
+	llxHeader('', $title_page);
 
-    print '<tr class="liste_titre_filter">';
-    print '<td class="liste_titre" colspan="5">';
-    print $langs->trans('From');
-    print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array(), 1, 1, '');
-    print ' ';
-    print $langs->trans('to');
-    print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array(), 1, 1, '');
-    print '</td>';
-    print '<td align="right" class="liste_titre">';
+	// List
+	$nbtotalofrecords = '';
+	if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
+		$nbtotalofrecords = $object->fetchAllBalance($sortorder, $sortfield, 0, 0, $filter);
+		if ($nbtotalofrecords < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
+
+	$result = $object->fetchAllBalance($sortorder, $sortfield, $limit, $offset, $filter);
+	if ($result < 0) {
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
+
+	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
+
+	$button = '<input type="submit" name="button_export_csv" class="butAction" value="' . $langs->trans("Export") . '" />';
+	print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $options, $sortfield, $sortorder, '', $result, $result, 'title_accountancy', 0, $button);
+
+	$moreforfilter = '';
+
+	$moreforfilter .= '<div class="divsearchfield">';
+	$moreforfilter .= $langs->trans('DateStart') . ': ';
+	$moreforfilter .= $form->select_date($search_date_start, 'date_start', 0, 0, 1, '', 1, 0, 1);
+	$moreforfilter .= $langs->trans('DateEnd') . ': ';
+	$moreforfilter .= $form->select_date($search_date_end, 'date_end', 0, 0, 1, '', 1, 0, 1);
+	$moreforfilter .= '</div>';
+
+	if (! empty($moreforfilter)) {
+		print '<div class="liste_titre liste_titre_bydiv centpercent">';
+		print $moreforfilter;
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+		print '</div>';
+	}
+
+	print '<table class="liste ' . ($moreforfilter ? "listwithfilterbefore" : "") . '">';
+
+	print '<tr class="liste_titre_filter">';
+	print '<td class="liste_titre" colspan="5">';
+	print $langs->trans('From');
+	print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array(), 1, 1, '');
+	print ' ';
+	print $langs->trans('to');
+	print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array(), 1, 1, '');
+	print '</td>';
+	print '<td align="right" class="liste_titre">';
 	$searchpicto=$form->showFilterAndCheckAddButtons(0);
 	print $searchpicto;
-    print '</td>';
-    
-    print '</tr>';
-    
-    print '<tr class="liste_titre">';
-    print_liste_field_titre($langs->trans("AccountAccounting"), $_SERVER['PHP_SELF'], "t.numero_compte", "", $options, "", $sortfield, $sortorder);
-    print_liste_field_titre($langs->trans("Label"), $_SERVER['PHP_SELF'], "t.label_compte", "", $options, "", $sortfield, $sortorder);
-    print_liste_field_titre($langs->trans("Debit"), $_SERVER['PHP_SELF'], "t.debit", "", $options, 'align="right"', $sortfield, $sortorder);
-    print_liste_field_titre($langs->trans("Credit"), $_SERVER['PHP_SELF'], "t.credit", "", $options, 'align="right"', $sortfield, $sortorder);
-    print_liste_field_titre($langs->trans("Solde"), $_SERVER["PHP_SELF"], "", $options, "", 'align="right"', $sortfield, $sortorder);
-    print_liste_field_titre('', $_SERVER["PHP_SELF"], "", $options, "", 'width="60" align="center"', $sortfield, $sortorder);
-    print "</tr>\n";
-    
-    $total_debit = 0;
-    $total_credit = 0;
-    $sous_total_debit = 0;
-    $sous_total_credit = 0;
-    $displayed_account = "";
-    
-    foreach ($object->lines as $line) {
-        $link = '';
-        $total_debit += $line->debit;
-        $total_credit += $line->credit;
-        $description = $object->get_compte_desc($line->numero_compte); // Search description of the account
-        $root_account_description = $object->get_compte_racine($line->numero_compte);
-        if (empty($description)) {
-            $link = '<a href="../admin/card.php?action=create&compte=' . length_accountg($line->numero_compte) . '">' . img_edit_add() . '</a>';
-        }
-        print '<tr class="oddeven">';
-        
-        // Permet d'afficher le compte comptable
-        if ($root_account_description != $displayed_account) {
-            
-            // 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 "<td>&nbsp;</td>\n";
-                print '</tr>';
-            }
-            
-            // Affiche le compte comptable en d�but de ligne
-            print "<tr>";
-            print '<td colspan="6" style="font-weight:bold; border-bottom: 1pt solid black;">' . $root_account_description . '</td>';
-            print '</tr>';
-            
-            $displayed_account = $root_account_description;
-            $sous_total_debit = 0;
-            $sous_total_credit = 0;
-        }
-        
-        // $object->get_compte_racine($line->numero_compte);
-        
-        print '<td>' . length_accountg($line->numero_compte) . '</td>';
-        print '<td>' . $description . '</td>';
-        print '<td align="right">' . price($line->debit) . '</td>';
-        print '<td align="right">' . price($line->credit) . '</td>';
-        print '<td align="right">' . price($line->credit - $line->debit) . '</td>';
-        print '<td align="center">' . $link;
-        print '</td>';
-        print "</tr>\n";
-        
-        // Comptabilise le sous-total
-        $sous_total_debit += $line->debit;
-        $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 "<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 "<td>&nbsp;</td>\n";
-    print '</tr>';
-    
-    print "</table>";
-    print '</form>';
-    
-    llxFooter();
+	print '</td>';
+
+	print '</tr>';
+
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans("AccountAccounting"), $_SERVER['PHP_SELF'], "t.numero_compte", "", $options, "", $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Label"), $_SERVER['PHP_SELF'], "t.label_operation", "", $options, "", $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Debit"), $_SERVER['PHP_SELF'], "t.debit", "", $options, 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Credit"), $_SERVER['PHP_SELF'], "t.credit", "", $options, 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Solde"), $_SERVER["PHP_SELF"], "", $options, "", 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre('', $_SERVER["PHP_SELF"], "", $options, "", 'width="60" align="center"', $sortfield, $sortorder);
+	print "</tr>\n";
+
+	$total_debit = 0;
+	$total_credit = 0;
+	$sous_total_debit = 0;
+	$sous_total_credit = 0;
+	$displayed_account = "";
+
+	foreach ($object->lines as $line) {
+		$link = '';
+		$total_debit += $line->debit;
+		$total_credit += $line->credit;
+		$description = $object->get_compte_desc($line->numero_compte); // Search description of the account
+		$root_account_description = $object->get_compte_racine($line->numero_compte);
+		if (empty($description)) {
+			$link = '<a href="../admin/card.php?action=create&compte=' . length_accountg($line->numero_compte) . '">' . img_edit_add() . '</a>';
+		}
+		print '<tr class="oddeven">';
+
+		// Permet d'afficher le compte comptable
+		if ($root_account_description != $displayed_account) {
+
+			// 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 "<td>&nbsp;</td>\n";
+				print '</tr>';
+			}
+
+			// Affiche le compte comptable en d�but de ligne
+			print "<tr>";
+			print '<td colspan="6" style="font-weight:bold; border-bottom: 1pt solid black;">' . $root_account_description . '</td>';
+			print '</tr>';
+
+			$displayed_account = $root_account_description;
+			$sous_total_debit = 0;
+			$sous_total_credit = 0;
+		}
+
+		// $object->get_compte_racine($line->numero_compte);
+
+		print '<td>' . length_accountg($line->numero_compte) . '</td>';
+		print '<td>' . $description . '</td>';
+		print '<td align="right">' . price($line->debit) . '</td>';
+		print '<td align="right">' . price($line->credit) . '</td>';
+		print '<td align="right">' . price($line->credit - $line->debit) . '</td>';
+		print '<td align="center">' . $link;
+		print '</td>';
+		print "</tr>\n";
+
+		// Comptabilise le sous-total
+		$sous_total_debit += $line->debit;
+		$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 "<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 "<td>&nbsp;</td>\n";
+	print '</tr>';
+
+	print "</table>";
+	print '</form>';
+
+	llxFooter();
 }
 $db->close();
\ No newline at end of file
diff --git a/htdocs/accountancy/bookkeeping/balancebymonth.php b/htdocs/accountancy/bookkeeping/balancebymonth.php
index 83908f72172..1d746b4d4df 100644
--- a/htdocs/accountancy/bookkeeping/balancebymonth.php
+++ b/htdocs/accountancy/bookkeeping/balancebymonth.php
@@ -1,8 +1,8 @@
 <?php
 /* Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2013-2014 Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
- * Copyright (C) 2014	   Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2015	Jean-François Ferry		<jfefe@aternatik.fr>
+ * Copyright (C) 2013-2014 Alexandre Spangaro	<aspangaro@zendsi.com>
+ * Copyright (C) 2014      Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 5c558ca0a90..660248a46a3 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -52,7 +52,7 @@ $subledger_account = GETPOST('subledger_account');
 if ($subledger_account == - 1) {
 	$subledger_account = null;
 }
-$label_compte = GETPOST('label_compte');
+$label_operation = GETPOST('label_operation');
 $debit = price2num(GETPOST('debit'));
 $credit = price2num(GETPOST('credit'));
 
@@ -83,7 +83,7 @@ if ($action == "confirm_update") {
 		} else {
 			$book->numero_compte = $account_number;
 			$book->subledger_account = $subledger_account;
-			$book->label_compte = $label_compte;
+			$book->label_operation = $label_operation;
 			$book->debit = $debit;
 			$book->credit = $credit;
 
@@ -120,7 +120,7 @@ else if ($action == "add") {
 
 		$book->numero_compte = $account_number;
 		$book->subledger_account = $subledger_account;
-		$book->label_compte = $label_compte;
+		$book->label_operation = $label_operation;
 		$book->debit = $debit;
 		$book->credit = $credit;
 		$book->doc_date = GETPOST('doc_date');
@@ -182,7 +182,7 @@ else if ($action == "confirm_create") {
 
 	if (! $error)
 	{
-    	$book->label_compte = '';
+    	$book->label_operation = '';
     	$book->debit = 0;
     	$book->credit = 0;
     	$book->doc_date = $date_start = dol_mktime(0, 0, 0, GETPOST('doc_datemonth'), GETPOST('doc_dateday'), GETPOST('doc_dateyear'));
@@ -392,7 +392,7 @@ if ($action == 'create') {
 						print '<td>';
 						print $formaccounting->select_auxaccount($line->subledger_account, 'subledger_account', 1, 'maxwidth300');
 						print '</td>';
-						print '<td><input type="text" size="15" name="label_compte" value="' . $line->label_compte . '"/></td>';
+						print '<td><input type="text" size="15" name="label_operation" value="' . $line->label_operation . '"/></td>';
 						print '<td align="right"><input type="text" size="6" name="debit" value="' . price($line->debit) . '"/></td>';
 						print '<td align="right"><input type="text" size="6" name="credit" value="' . price($line->credit) . '"/></td>';
 						print '<td align="right">' . price($line->montant) . '</td>';
@@ -404,17 +404,17 @@ if ($action == 'create') {
 					} else {
 						print '<td>' . length_accountg($line->numero_compte) . '</td>';
 						print '<td>' . length_accounta($line->subledger_account) . '</td>';
-						print '<td>' . $line->label_compte . '</td>';
+						print '<td>' . $line->label_operation . '</td>';
 						print '<td align="right">' . price($line->debit) . '</td>';
 						print '<td align="right">' . price($line->credit) . '</td>';
 						print '<td align="right">' . price($line->montant) . '</td>';
 						print '<td align="center">' . $line->sens . '</td>';
 
 						print '<td align="center">';
-						print '<a href="./card.php?action=update&amp;id=' . $line->id . '&amp;piece_num=' . $line->piece_num . '">';
+						print '<a href="' . $_SERVER['PHP_SELF'] . '?action=update&amp;id=' . $line->id . '&amp;piece_num=' . $line->piece_num . '">';
 						print img_edit();
 						print '</a>&nbsp;';
-						print '<a href="./card.php?action=delete&amp;id=' . $line->id . '&amp;piece_num=' . $line->piece_num . '">';
+						print '<a href="' . $_SERVER['PHP_SELF'] . '?action=delete&amp;id=' . $line->id . '&amp;piece_num=' . $line->piece_num . '">';
 						print img_delete();
 						print '</a>';
 
@@ -436,7 +436,7 @@ if ($action == 'create') {
 					print '<td>';
 					print $formaccounting->select_auxaccount($subledger_account, 'subledger_account', 1, 'maxwidth300');
 					print '</td>';
-					print '<td><input type="text" size="15" name="label_compte" value="' . $label_compte . '"/></td>';
+					print '<td><input type="text" size="15" name="label_operation" value="' . $label_operation . '"/></td>';
 					print '<td align="right"><input type="text" class="right maxwidth50" name="debit" value="' . price($debit) . '"/></td>';
 					print '<td align="right"><input type="text" class="right maxwidth50" name="credit" value="' . price($credit) . '"/></td>';
 					print '<td></td>';
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 4a7bca5e1b7..65e615cecaf 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -183,7 +183,7 @@ if (! empty($search_accountancy_aux_code_end)) {
     $param .= '&search_accountancy_aux_code_end=' . $search_accountancy_aux_code_end;
 }
 if (! empty($search_mvt_label)) {
-    $filter['t.label_compte'] = $search_mvt_label;
+    $filter['t.label_operation'] = $search_mvt_label;
     $param .= '&search_mvt_label=' . $search_mvt_label;
 }
 if (! empty($search_direction)) {
@@ -424,7 +424,7 @@ print_liste_field_titre($langs->trans("Docdate"), $_SERVER['PHP_SELF'], "t.doc_d
 print_liste_field_titre($langs->trans("Docref"), $_SERVER['PHP_SELF'], "t.doc_ref", "", $param, "", $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("AccountAccountingShort"), $_SERVER['PHP_SELF'], "t.numero_compte", "", $param, "", $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("SubledgerAccount"), $_SERVER['PHP_SELF'], "t.subledger_account", "", $param, "", $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("Label"), $_SERVER['PHP_SELF'], "t.label_compte", "", $param, "", $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("Label"), $_SERVER['PHP_SELF'], "t.label_operation", "", $param, "", $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("Debit"), $_SERVER['PHP_SELF'], "t.debit", "", $param, 'align="right"', $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("Credit"), $_SERVER['PHP_SELF'], "t.credit", "", $param, 'align="right"', $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("Codejournal"), $_SERVER['PHP_SELF'], "t.code_journal", "", $param, 'align="center"', $sortfield, $sortorder);
@@ -450,7 +450,7 @@ foreach ($object->lines as $line ) {
 	print '<td class="nowrap">' . $line->doc_ref . '</td>';
 	print '<td>' . length_accountg($line->numero_compte) . '</td>';
 	print '<td>' . length_accounta($line->subledger_account) . '</td>';
-	print '<td>' . $line->label_compte . '</td>';
+	print '<td>' . $line->label_operation . '</td>';
 	print '<td align="right">' . ($line->debit ? price($line->debit) : ''). '</td>';
 	print '<td align="right">' . ($line->credit ? price($line->credit) : '') . '</td>';
 
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 7d0ba2280ea..a1398df6fb2 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -1,9 +1,8 @@
 <?php
-/*
- * Copyright (C) 2016 Neil Orley	<neil.orley@oeris.fr> largely based on the great work of :
- *  - Copyright (C) 2013-2016 Olivier Geffroy		<jeff@jeffinfo.com>
- *  - Copyright (C) 2013-2016 Florian Henry		<florian.henry@open-concept.pro>
- *  - Copyright (C) 2013-2016 Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
+/* Copyright (C) 2016       Neil Orley			<neil.orley@oeris.fr>
+ * Copyright (C) 2013-2016  Olivier Geffroy		<jeff@jeffinfo.com>
+ * Copyright (C) 2013-2016  Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2017  Alexandre Spangaro	<aspangaro@zendsi.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -100,11 +99,11 @@ if (!GETPOST("button_removefilter_x") && !GETPOST("button_removefilter")) // Bot
   	$options .= '&amp;search_accountancy_code_start=' . $search_accountancy_code_start;
   }
   if (! empty($search_label_account)) {
-  	$filter['t.label_compte'] = $search_label_account;
+  	$filter['t.label_operation'] = $search_label_account;
   	$options .= '&amp;search_label_account=' . $search_label_account;
   }
   if (! empty($search_mvt_label)) {
-  	$filter['t.label_compte'] = $search_mvt_label;
+  	$filter['t.label_operation'] = $search_mvt_label;
   	$options .= '&amp;search_mvt_label=' . $search_mvt_label;
   }
   if (! empty($search_direction)) {
@@ -312,7 +311,7 @@ foreach ( $object->lines as $line ) {
 
     // Affiche un lien vers la facture client/fournisseur
     $doc_ref = preg_replace('/\(.*\)/', '', $line->doc_ref);
-    print strlen(length_accounta($line->subledger_account)) == 0 ? '<td>' . $line->label_compte . '</td>' : '<td>' . $line->label_compte . '<br /><span style="font-size:0.8em">(' . length_accounta($line->subledger_account) . ')</span></td>';
+    print strlen(length_accounta($line->subledger_account)) == 0 ? '<td>' . $line->label_operation . '</td>' : '<td>' . $line->label_operation . '<br /><span style="font-size:0.8em">(' . length_accounta($line->subledger_account) . ')</span></td>';
 
 
 	print '<td align="right">' . ($line->debit ? price($line->debit) :''). '</td>';
diff --git a/htdocs/accountancy/bookkeeping/listbyyear.php b/htdocs/accountancy/bookkeeping/listbyyear.php
index e7e51ae67e0..becb700761a 100644
--- a/htdocs/accountancy/bookkeeping/listbyyear.php
+++ b/htdocs/accountancy/bookkeeping/listbyyear.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2013-2016 Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2013-2016 Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2017 Alexandre Spangaro	<aspangaro@zendsi.com>
  * Copyright (C) 2013-2016 Florian Henry		<florian.henry@open-concept.pro>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -61,7 +61,7 @@ $search_subledger_account_end = GETPOST('search_subledger_account_end', 'alpha')
 if ($search_subledger_account_end == - 1) {
 	$search_subledger_account_end = '';
 }
-$search_label_compte = GETPOST('search_label_compte', 'alpha');
+$search_label_operation = GETPOST('search_label_operation', 'alpha');
 $search_sens = GETPOST('search_sens', 'alpha');
 $search_code_journal = GETPOST('search_code_journal', 'alpha');
 
@@ -93,7 +93,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
 	$search_doc_ref = "";
 	$search_numero_compte = "";
 	$search_subledger_account = "";
-	$search_label_compte = "";
+	$search_label_operation = "";
 	$search_sens = "";
 	$search_code_journal = "";
 }
@@ -144,9 +144,9 @@ if (! empty($search_subledger_account_end)) {
 	$filter['t.subledger_account<='] = $search_subledger_account_end;
 	$options .= '&amp;search_subledger_account_end=' . $search_subledger_account_end;
 }
-if (! empty($search_label_compte)) {
-	$filter['t.label_compte'] = $search_label_compte;
-	$options .= '&amp;search_label_compte=' . $search_label_compte;
+if (! empty($search_label_operation)) {
+	$filter['t.label_operation'] = $search_label_operation;
+	$options .= '&amp;search_label_operation=' . $search_label_operation;
 }
 if (! empty($search_sens)) {
 	$filter['t.sens'] = $search_sens;
@@ -207,7 +207,7 @@ print_liste_field_titre($langs->trans("Date"), $_SERVER['PHP_SELF'], "t.doc_date
 print_liste_field_titre($langs->trans("Docref"), $_SERVER['PHP_SELF'], "t.doc_ref", "", $options, "", $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("AccountAccounting"), $_SERVER['PHP_SELF'], "t.numero_compte", "", $options, "", $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("ThirdPartyAccount"), $_SERVER['PHP_SELF'], "t.subledger_account", "", $options, "", $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("Label"), $_SERVER['PHP_SELF'], "t.label_compte", "", $options, "", $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("Label"), $_SERVER['PHP_SELF'], "t.label_operation", "", $options, "", $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("Debit"), $_SERVER['PHP_SELF'], "t.debit", "", $options, "", $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("Credit"), $_SERVER['PHP_SELF'], "t.credit", "", $options, 'align="center"', $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("Amount"), $_SERVER['PHP_SELF'], "t.montant", "", $options, 'align="center"', $sortfield, $sortorder);
@@ -242,7 +242,7 @@ print '<input type="text" size=6 class="flat" name="search_subledger_account" va
 print '</td>';
 
 print '<td class="liste_titre">';
-print '<input type="text" size=6 class="flat" name="search_label_compte" value="' . $search_label_compte . '"/>';
+print '<input type="text" size=6 class="flat" name="search_label_operation" value="' . $search_label_operation . '"/>';
 print '</td>';
 
 print '<td class="liste_titre">';
@@ -279,7 +279,7 @@ foreach ( $object->lines as $line ) {
 	print '<td>' . $line->doc_ref . '</td>';
 	print '<td>' . length_accountg($line->numero_compte) . '</td>';
 	print '<td>' . length_accounta($line->subledger_account) . '</td>';
-	print '<td>' . $line->label_compte . '</td>';
+	print '<td>' . $line->label_operation . '</td>';
 	print '<td align="right">' . price($line->debit) . '</td>';
 	print '<td align="right">' . price($line->credit) . '</td>';
 	print '<td align="right">' . price($line->montant) . '</td>';
diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index e4e3017ab15..db75947771e 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -92,7 +92,7 @@ class AccountancyCategory
 	public function getCptBK($id) {
 		global $conf;
 
-		$sql = "SELECT t.numero_compte, t.label_compte, t.doc_ref";
+		$sql = "SELECT t.numero_compte, t.label_operation, t.doc_ref";
 		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as t";
 		$sql .= " WHERE t.numero_compte NOT IN (";
 		$sql .= " SELECT t.account_number";
@@ -104,7 +104,7 @@ class AccountancyCategory
 		$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
 		$sql .= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
 		$sql .= " AND aa.active = 1)";
-		$sql .= " GROUP BY t.numero_compte, t.label_compte, t.doc_ref";
+		$sql .= " GROUP BY t.numero_compte, t.label_operation, t.doc_ref";
 		$sql .= " ORDER BY t.numero_compte";
 
 		$this->lines_CptBk = array ();
diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index dc2b3195ee3..a3358337889 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2015		Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2015		Raphaël Doursenaud	<rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2016		Pierre-Henry Favre	<phf@atm-consulting.fr>
- * Copyright (C) 2016		Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2016-2017	Alexandre Spangaro	<aspangaro@zendsi.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
@@ -198,7 +198,7 @@ class AccountancyExport
 			print length_accounta($line->subledger_account) . $separator;
 			print $line->sens . $separator;
 			print price($line->montant) . $separator;
-			print $line->label_compte . $separator;
+			print $line->label_operation . $separator;
 			print $line->doc_ref;
 			print $this->end_line;
 		}
@@ -220,7 +220,7 @@ class AccountancyExport
 			print $line->piece_num . $this->separator;
 			print length_accountg($line->numero_compte) . $this->separator;
 			print '' . $this->separator;
-			print $line->label_compte . $this->separator;
+			print $line->label_operation . $this->separator;
 			print $date . $this->separator;
 			if ($line->sens=='D') {
 				print price($line->montant) . $this->separator;
@@ -230,7 +230,7 @@ class AccountancyExport
 				print price($line->montant) . $this->separator;
 			}
 			print $line->doc_ref . $this->separator;
-			print $line->label_compte . $this->separator;
+			print $line->label_operation . $this->separator;
 			print $this->end_line;
 		}
 	}
@@ -289,7 +289,7 @@ class AccountancyExport
 
 			print price($line->debit) . $this->separator;
 			print price($line->credit) . $this->separator;
-			print dol_trunc($line->label_compte, 32) . $this->separator;
+			print dol_trunc($line->label_operation, 32) . $this->separator;
 			print $this->end_line;
 		}
 	}
@@ -320,11 +320,11 @@ class AccountancyExport
 			$Tab['date_ope'] = dol_print_date($data->doc_date, $conf->global->ACCOUNTING_EXPORT_DATE);
 			$Tab['num_piece'] = str_pad(self::trunc($data->piece_num, 12), 12);
 			$Tab['num_compte'] = str_pad(self::trunc($code_compta, 11), 11);
-			$Tab['libelle_ecriture'] = str_pad(self::trunc($data->doc_ref . $data->label_compte, 25), 25);
+			$Tab['libelle_ecriture'] = str_pad(self::trunc($data->doc_ref . $data->label_operation, 25), 25);
 			$Tab['montant'] = str_pad(abs($data->montant), 13, ' ', STR_PAD_LEFT);
 			$Tab['type_montant'] = str_pad($data->sens, 1);
 			$Tab['vide'] = str_repeat(' ', 18);
-			$Tab['intitule_compte'] = str_pad(self::trunc($data->label_compte, 34), 34);
+			$Tab['intitule_compte'] = str_pad(self::trunc($data->label_operation, 34), 34);
 			$Tab['end'] = 'O2003';
 
 			$Tab['end_line'] = $this->end_line;
@@ -359,7 +359,7 @@ class AccountancyExport
 			$Tab['folio'] = '000';
 			$Tab['date_ecriture'] = $date_ecriture;
 			$Tab['filler'] = ' ';
-			$Tab['libelle_ecriture'] = str_pad(self::trunc($data->doc_ref . ' ' . $data->label_compte, 20), 20);
+			$Tab['libelle_ecriture'] = str_pad(self::trunc($data->doc_ref . ' ' . $data->label_operation, 20), 20);
 			$Tab['sens'] = $data->sens; // C or D
 			$Tab['signe_montant'] = '+';
 			$Tab['montant'] = str_pad(abs($data->montant), 12, '0', STR_PAD_LEFT); // TODO manage negative amount
@@ -375,7 +375,7 @@ class AccountancyExport
 			$Tab['devis'] = str_pad($conf->currency, 3);
 			$Tab['code_journal2'] = str_pad(self::trunc($data->code_journal, 3), 3);
 			$Tab['filler3'] = str_repeat(' ', 3);
-			$Tab['libelle_ecriture2'] = str_pad(self::trunc($data->doc_ref . ' ' . $data->label_compte, 32), 32);
+			$Tab['libelle_ecriture2'] = str_pad(self::trunc($data->doc_ref . ' ' . $data->label_operation, 32), 32);
 			$Tab['num_piece3'] = str_pad(self::trunc($data->piece_num, 10), 10);
 			$Tab['filler4'] = str_repeat(' ', 73);
 
@@ -406,7 +406,7 @@ class AccountancyExport
 			print $line->code_journal . $this->separator;
 			print length_accountg($line->numero_compte) . $this->separator;
 			print substr(length_accountg($line->numero_compte),0,2) . $this->separator;
-			print '"'.dol_trunc($line->label_compte,40,'right','UTF-8',1).'"' . $this->separator;
+			print '"'.dol_trunc($line->label_operation,40,'right','UTF-8',1).'"' . $this->separator;
 			print '"'.dol_trunc($line->piece_num,15,'right','UTF-8',1).'"'.$this->separator;
 			print price2num($line->montant).$this->separator;
 			print $line->sens.$this->separator;
diff --git a/htdocs/accountancy/class/accountancysystem.class.php b/htdocs/accountancy/class/accountancysystem.class.php
index a1c90a97b5b..87d1ccd663c 100644
--- a/htdocs/accountancy/class/accountancysystem.class.php
+++ b/htdocs/accountancy/class/accountancysystem.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2013-2014 Olivier Geffroy       <jeff@jeffinfo.com>
- * Copyright (C) 2013-2014 Alexandre Spangaro    <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2014 Alexandre Spangaro    <aspangaro@zendsi.com>
  * Copyright (C) 2013-2014 Florian Henry		<florian.henry@open-concept.pro>
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index a526f9171a6..1dad83512e3 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013-2016 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2016 Alexandre Spangaro   <aspangaro@zendsi.com>
  * Copyright (C) 2013-2014 Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2014 	   Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2015      Ari Elbaz (elarifr)  <github@accedinfo.com>
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index d607c1dc287..2e826b55e08 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2014-2016 Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2015-2016 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+/* Copyright (C) 2014-2016 Olivier Geffroy		<jeff@jeffinfo.com>
+ * Copyright (C) 2015-2017 Alexandre Spangaro	<aspangaro@zendsi.com>
  * Copyright (C) 2015-2016 Florian Henry		<florian.henry@open-concept.pro>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -80,6 +80,7 @@ class BookKeeping extends CommonObject
 	public $subledger_label;
 	public $numero_compte;
 	public $label_compte;
+	public $label_operation;
 	public $debit;
 	public $credit;
 	public $montant;
@@ -144,6 +145,9 @@ class BookKeeping extends CommonObject
 		if (isset($this->label_compte)) {
 			$this->label_compte = trim($this->label_compte);
 		}
+		if (isset($this->label_operation)) {
+			$this->label_operation = trim($this->label_operation);
+		}
 		if (isset($this->debit)) {
 			$this->debit = trim($this->debit);
 		}
@@ -263,6 +267,7 @@ class BookKeeping extends CommonObject
 				$sql .= ", subledger_label";
 				$sql .= ", numero_compte";
 				$sql .= ", label_compte";
+				$sql .= ", label_operation";
 				$sql .= ", debit";
 				$sql .= ", credit";
 				$sql .= ", montant";
@@ -284,6 +289,7 @@ class BookKeeping extends CommonObject
 				$sql .= ",'" . $this->db->escape($this->subledger_label) . "'";
 				$sql .= ",'" . $this->db->escape($this->numero_compte) . "'";
 				$sql .= ",'" . $this->db->escape($this->label_compte) . "'";
+				$sql .= ",'" . $this->db->escape($this->label_operation) . "'";
 				$sql .= "," . $this->debit;
 				$sql .= "," . $this->credit;
 				$sql .= "," . $this->montant;
@@ -393,6 +399,9 @@ class BookKeeping extends CommonObject
 		if (isset($this->label_compte)) {
 			$this->label_compte = trim($this->label_compte);
 		}
+		if (isset($this->label_operation)) {
+			$this->label_operation = trim($this->label_operation);
+		}
 		if (isset($this->debit)) {
 			$this->debit = trim($this->debit);
 		}
@@ -438,6 +447,7 @@ class BookKeeping extends CommonObject
 		$sql .= 'subledger_label,';
 		$sql .= 'numero_compte,';
 		$sql .= 'label_compte,';
+		$sql .= 'label_operation,';
 		$sql .= 'debit,';
 		$sql .= 'credit,';
 		$sql .= 'montant,';
@@ -459,6 +469,7 @@ class BookKeeping extends CommonObject
 		$sql .= ' ' . (! isset($this->subledger_label) ? 'NULL' : "'" . $this->db->escape($this->subledger_label) . "'") . ',';
 		$sql .= ' ' . (! isset($this->numero_compte) ? "NULL" : "'" . $this->db->escape($this->numero_compte) . "'") . ',';
 		$sql .= ' ' . (! isset($this->label_compte) ? 'NULL' : "'" . $this->db->escape($this->label_compte) . "'") . ',';
+		$sql .= ' ' . (! isset($this->label_operation) ? 'NULL' : "'" . $this->db->escape($this->label_operation) . "'") . ',';
 		$sql .= ' ' . (! isset($this->debit) ? 'NULL' : $this->debit ). ',';
 		$sql .= ' ' . (! isset($this->credit) ? 'NULL' : $this->credit ). ',';
 		$sql .= ' ' . (! isset($this->montant) ? 'NULL' : $this->montant ). ',';
@@ -531,6 +542,7 @@ class BookKeeping extends CommonObject
 		$sql .= " t.subledger_label,";
 		$sql .= " t.numero_compte,";
 		$sql .= " t.label_compte,";
+		$sql .= " t.label_operation,";
 		$sql .= " t.debit,";
 		$sql .= " t.credit,";
 		$sql .= " t.montant,";
@@ -567,6 +579,7 @@ class BookKeeping extends CommonObject
 				$this->subledger_label = $obj->subledger_label;
 				$this->numero_compte = $obj->numero_compte;
 				$this->label_compte = $obj->label_compte;
+				$this->label_operation = $obj->label_operation;
 				$this->debit = $obj->debit;
 				$this->credit = $obj->credit;
 				$this->montant = $obj->montant;
@@ -621,6 +634,7 @@ class BookKeeping extends CommonObject
 		$sql .= " t.subledger_label,";
 		$sql .= " t.numero_compte,";
 		$sql .= " t.label_compte,";
+		$sql .= " t.label_operation,";
 		$sql .= " t.debit,";
 		$sql .= " t.credit,";
 		$sql .= " t.montant,";
@@ -644,9 +658,9 @@ class BookKeeping extends CommonObject
 					$sqlwhere[] = $key . '=' . $value;
 				} elseif ($key == 't.subledger_account' || $key == 't.numero_compte') {
 					$sqlwhere[] = $key . ' LIKE \'' . $this->db->escape($value) . '%\'';
-				} elseif ($key == 't.label_compte') {
+				} elseif ($key == 't.label_operation') {
 					$sqlwhere[] = $key . ' LIKE \'' . $this->db->escape($value) . '%\'';
-				}else {
+				} else {
 					$sqlwhere[] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
 				}
 			}
@@ -686,6 +700,7 @@ class BookKeeping extends CommonObject
 				$line->subledger_label = $obj->subledger_label;
 				$line->numero_compte = $obj->numero_compte;
 				$line->label_compte = $obj->label_compte;
+				$line->label_operation = $obj->label_operation;
 				$line->debit = $obj->debit;
 				$line->credit = $obj->credit;
 				$line->montant = $obj->montant;
@@ -725,7 +740,7 @@ class BookKeeping extends CommonObject
 	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND') {
 		global $conf;
 
-	    dol_syslog(__METHOD__, LOG_DEBUG);
+		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$sql = 'SELECT';
 		$sql .= ' t.rowid,';
@@ -739,6 +754,7 @@ class BookKeeping extends CommonObject
 		$sql .= " t.subledger_label,";
 		$sql .= " t.numero_compte,";
 		$sql .= " t.label_compte,";
+		$sql .= " t.label_operation,";
 		$sql .= " t.debit,";
 		$sql .= " t.credit,";
 		$sql .= " t.montant,";
@@ -801,6 +817,7 @@ class BookKeeping extends CommonObject
 				$line->subledger_label = $obj->subledger_label;
 				$line->numero_compte = $obj->numero_compte;
 				$line->label_compte = $obj->label_compte;
+				$line->label_operation = $obj->label_operation;
 				$line->debit = $obj->debit;
 				$line->credit = $obj->credit;
 				$line->montant = $obj->montant;
@@ -945,6 +962,9 @@ class BookKeeping extends CommonObject
 		if (isset($this->label_compte)) {
 			$this->label_compte = trim($this->label_compte);
 		}
+		if (isset($this->label_operation)) {
+			$this->label_operation = trim($this->label_operation);
+		}
 		if (isset($this->debit)) {
 			$this->debit = trim($this->debit);
 		}
@@ -988,6 +1008,7 @@ class BookKeeping extends CommonObject
 		$sql .= ' subledger_label = ' . (isset($this->subledger_label) ? "'" . $this->db->escape($this->subledger_label) . "'" : "null") . ',';
 		$sql .= ' numero_compte = ' . (isset($this->numero_compte) ? "'" . $this->db->escape($this->numero_compte) . "'" : "null") . ',';
 		$sql .= ' label_compte = ' . (isset($this->label_compte) ? "'" . $this->db->escape($this->label_compte) . "'" : "null") . ',';
+		$sql .= ' label_operation = ' . (isset($this->label_operation) ? "'" . $this->db->escape($this->label_operation) . "'" : "null") . ',';
 		$sql .= ' debit = ' . (isset($this->debit) ? $this->debit : "null") . ',';
 		$sql .= ' credit = ' . (isset($this->credit) ? $this->credit : "null") . ',';
 		$sql .= ' montant = ' . (isset($this->montant) ? $this->montant : "null") . ',';
@@ -1245,14 +1266,15 @@ class BookKeeping extends CommonObject
 		$this->fk_doc = '';
 		$this->fk_docdet = '';
 		$this->thirdparty_code = 'CU001';
-		$this->subledger_account = '410CU001';
+		$this->subledger_account = '41100001';
 		$this->subledger_label = 'My customer company';
-		$this->numero_compte = '410';
-		$this->label_compte = '';
+		$this->numero_compte = '411';
+		$this->label_compte = 'Customer';
+		$this->label_operation = 'Sales of pea';
 		$this->debit = 99.9;
 		$this->credit = '';
 		$this->montant = '';
-		$this->sens = '';
+		$this->sens = 'D';
 		$this->fk_user_author = $user->id;
 		$this->import_key = '';
 		$this->code_journal = 'VT';
@@ -1358,6 +1380,7 @@ class BookKeeping extends CommonObject
 				$line->subledger_label = $obj->subledger_label;
 				$line->numero_compte = $obj->numero_compte;
 				$line->label_compte = $obj->label_compte;
+				$line->label_operation = $obj->label_operation;
 				$line->debit = $obj->debit;
 				$line->credit = $obj->credit;
 				$line->montant = $obj->montant;
@@ -1416,6 +1439,7 @@ class BookKeeping extends CommonObject
 				$line->subledger_label = $obj->subledger_label;
 				$line->numero_compte = $obj->numero_compte;
 				$line->label_compte = $obj->label_compte;
+				$line->label_operation = $obj->label_operation;
 				$line->debit = $obj->debit;
 				$line->credit = $obj->credit;
 				$line->montant = $obj->montant;
@@ -1606,6 +1630,7 @@ class BookKeepingLine
 	public $subledger_label;
 	public $numero_compte;
 	public $label_compte;
+	public $label_operation;
 	public $debit;
 	public $credit;
 	public $montant;
diff --git a/htdocs/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php
index c436fdfd088..a10cd24adc4 100644
--- a/htdocs/accountancy/customer/card.php
+++ b/htdocs/accountancy/customer/card.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
  * Copyright (C) 2013-2014 Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2013-2017 Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2017 Alexandre Spangaro	<aspangaro@zendsi.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index deca83b6f12..24e066917bc 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013      Olivier Geffroy		<jeff@jeffinfo.com>
  * Copyright (C) 2013-2014 Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2013-2016 Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2016 Alexandre Spangaro	<aspangaro@zendsi.com>
  * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2015      Jean-François Ferry  <jfefe@aternatik.fr>
  *
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index a5dfa3941d1..b5778ce86f2 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2013-2016 Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2013-2016 Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2016 Alexandre Spangaro	<aspangaro@zendsi.com>
  * Copyright (C) 2014-2015 Ari Elbaz (elarifr)	<github@accedinfo.com>
  * Copyright (C) 2014-2016 Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 56765e1ba4f..85a97fb3a1e 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2013-2014	Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2013-2016	Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2016	Alexandre Spangaro	<aspangaro@zendsi.com>
  * Copyright (C) 2014-2015	Ari Elbaz (elarifr)	<github@accedinfo.com>
  * Copyright (C) 2013-2014	Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2014	  	Juanjo Menent		<jmenent@2byte.es>
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 568edf051ff..bc27ebfa24f 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -50,6 +50,7 @@ require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
 require_once DOL_DOCUMENT_ROOT . '/societe/class/client.class.php';
 require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
 require_once DOL_DOCUMENT_ROOT . '/expensereport/class/paymentexpensereport.class.php';
+require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/paymentvarious.class.php';
 
 $langs->load("companies");
 $langs->load("other");
@@ -60,6 +61,7 @@ $langs->load('donations');
 $langs->load("accountancy");
 $langs->load("trips");
 $langs->load("salaries");
+$langs->load("hrm");
 
 // Multi journal
 $id_journal = GETPOST('id_journal', 'int');
@@ -131,6 +133,7 @@ $paymentdonstatic = new PaymentDonation($db);
 $paymentvatstatic = new TVA($db);
 $paymentsalstatic = new PaymentSalary($db);
 $paymentexpensereportstatic = new PaymentExpenseReport($db);
+$paymentvariousstatic = new PaymentVarious($db);
 
 // Get code of finance journal
 $accountingjournalstatic = new AccountingJournal($db);
@@ -208,7 +211,7 @@ if ($result) {
 			// Now loop on each link of record in bank.
 			foreach ( $links as $key => $val ) {
 
-				if (in_array($links[$key]['type'], array('sc', 'payment_sc', 'payment', 'payment_supplier', 'payment_vat', 'payment_expensereport', 'banktransfert', 'payment_donation', 'payment_salary')))	 // So we excluded 'company' here
+				if (in_array($links[$key]['type'], array('sc', 'payment_sc', 'payment', 'payment_supplier', 'payment_vat', 'payment_expensereport', 'banktransfert', 'payment_donation', 'payment_salary', 'payment_various')))	 // So we excluded 'company' here
 				{
 					// We save tabtype for a future use, to remember what kind of payment it is
 					$tabtype[$obj->rowid] = $links[$key]['type'];
@@ -250,9 +253,9 @@ if ($result) {
 
 					$sqlmid = 'SELECT cchgsoc.accountancy_code';
 					$sqlmid .= " FROM " . MAIN_DB_PREFIX . "c_chargesociales cchgsoc ";
-					$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "chargesociales as chgsoc ON  chgsoc.fk_type=cchgsoc.id";
-					$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementcharge as paycharg ON  paycharg.fk_charge=chgsoc.rowid";
-					$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "bank_url as bkurl ON  bkurl.url_id=paycharg.rowid";
+					$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "chargesociales as chgsoc ON chgsoc.fk_type=cchgsoc.id";
+					$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementcharge as paycharg ON paycharg.fk_charge=chgsoc.rowid";
+					$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "bank_url as bkurl ON bkurl.url_id=paycharg.rowid";
 					$sqlmid .= " WHERE bkurl.fk_bank=" . $obj->rowid;
 
 					dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
@@ -285,6 +288,15 @@ if ($result) {
 					$paymentexpensereportstatic->fk_expensereport = $links[$key]['url_id'];
 					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentexpensereportstatic->getNomUrl(2);
 					$tabpay[$obj->rowid]["fk_expensereport"] = $paymentexpensereportstatic->id;
+				} else if ($links[$key]['type'] == 'payment_various') {
+					$paymentvariousstatic->id = $links[$key]['url_id'];
+					$paymentvariousstatic->ref = $links[$key]['url_id'];
+					$paymentvariousstatic->label = $links[$key]['label'];
+					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentvariousstatic->getNomUrl(2);
+					$tabpay[$obj->rowid]["paymentvariousid"] = $paymentvariousstatic->id;
+					$paymentvariousstatic->fetch($paymentvariousstatic->id);
+					$account_various = (! empty($paymentvariousstatic->accountancy_code) ? $paymentvariousstatic->accountancy_code : $langs->trans("CodeNotDef"));
+					$tabtp[$obj->rowid][$account_various] += $obj->amount;
 				} else if ($links[$key]['type'] == 'banktransfert') {
 					$tabpay[$obj->rowid]["lib"] .= ' ' . $langs->trans("BankTransfer");
 					$tabtp[$obj->rowid][$account_transfer] += $obj->amount;
@@ -353,7 +365,7 @@ if (! $error && $action == 'writebookkeeping') {
 					$bookkeeping->fk_doc = $key;
 					$bookkeeping->fk_docdet = $val["fk_bank"];
 					$bookkeeping->numero_compte = $k;
-					$bookkeeping->label_compte = $compte->label;
+					$bookkeeping->label_operation = $val["label"];
 					$bookkeeping->montant = ($mt < 0 ? - $mt : $mt);
 					$bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
 					$bookkeeping->debit = ($mt >= 0 ? $mt : 0);
@@ -412,8 +424,11 @@ if (! $error && $action == 'writebookkeeping') {
 						$bookkeeping->doc_ref = $langs->trans("Donation") . ' (' . $val["paymentdonationid"] . ')'; // Rowid of donation
 					} else if ($tabtype[$key] == 'payment_salary') {
 						$bookkeeping->subledger_account = '';
-						$bookkeeping->label_compte = $tabuser[$key]['name'];
+						$bookkeeping->label_operation = $tabuser[$key]['name'];
 						$bookkeeping->doc_ref = $langs->trans("SalaryPayment") . ' (' . $val["paymentsalid"] . ')'; // Ref of salary payment
+					} else if ($tabtype[$key] == 'payment_various') {
+						$bookkeeping->subledger_account = '';
+						$bookkeeping->doc_ref = $langs->trans("VariousPayment") . ' (' . $val["paymentvariousid"] . ')'; // Ref of various payment
 					}
 
 					$result = $bookkeeping->create($user);
@@ -447,7 +462,7 @@ if (! $error && $action == 'writebookkeeping') {
 					$bookkeeping->doc_type = 'bank';
 					$bookkeeping->fk_doc = $key;
 					$bookkeeping->fk_docdet = $val["fk_bank"];
-					$bookkeeping->label_compte = $tabcompany[$key]['name'];
+					$bookkeeping->label_operation = $tabcompany[$key]['name'];
 					$bookkeeping->montant = ($mt < 0 ? - $mt : $mt);
 					$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
 					$bookkeeping->debit = ($mt < 0 ? - $mt : 0);
@@ -473,7 +488,8 @@ if (! $error && $action == 'writebookkeeping') {
 							$bookkeeping->doc_ref = $objmid->facnumber;
 						}
 						$bookkeeping->subledger_account = $tabcompany[$key]['code_compta'];
-						$bookkeeping->numero_compte = $k;
+						$bookkeeping->subledger_label = $tabcompany[$key]['name'];
+						$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
 					} else if ($tabtype[$key] == 'payment_supplier') {		   // If payment is payment of supplier invoice, we get ref of invoice
 						$sqlmid = 'SELECT facf.ref_supplier,facf.ref';
 						$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf ";
@@ -487,7 +503,23 @@ if (! $error && $action == 'writebookkeeping') {
 							$bookkeeping->doc_ref = $objmid->ref_supplier . ' (' . $objmid->ref . ')';
 						}
 						$bookkeeping->subledger_account = $tabcompany[$key]['code_compta'];
-						$bookkeeping->numero_compte = $k;
+						$bookkeeping->subledger_label = $tabcompany[$key]['name'];
+						$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER;
+					} else if ($tabtype[$key] == 'payment_expensereport') {
+						$bookkeeping->subledger_account = $tabuser[$key]['accountancy_code'];
+						$bookkeeping->subledger_label = $tabuser[$key]['name'];
+						$bookkeeping->numero_compte = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
+						$bookkeeping->label_operation = $tabuser[$key]['name'];
+						$sqlmid = 'SELECT e.ref';
+						$sqlmid .= " FROM " . MAIN_DB_PREFIX . "expensereport as e";
+						$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "payment_expensereport as payer ON payer.fk_expensereport=e.rowid";
+						$sqlmid .= " WHERE payer.fk_expensereport=" . $val["fk_expensereport"];
+						dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+						$resultmid = $db->query($sqlmid);
+						if ($resultmid) {
+							$objmid = $db->fetch_object($resultmid);
+							$bookkeeping->doc_ref = $objmid->ref; // Ref of expensereport
+						}
 					} else if ($tabtype[$key] == 'payment_vat') {
 						$bookkeeping->subledger_account = '';
 						$bookkeeping->numero_compte = $k;
@@ -499,16 +531,19 @@ if (! $error && $action == 'writebookkeeping') {
 					} else if ($tabtype[$key] == 'payment_salary') {
 						$bookkeeping->subledger_account = $tabuser[$key]['accountancy_code'];
 						$bookkeeping->numero_compte = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
-						$bookkeeping->label_compte = $tabuser[$key]['name'];
+						$bookkeeping->label_operation = $tabuser[$key]['name'];
 						$bookkeeping->doc_ref = $langs->trans("SalaryPayment") . ' (' . $val["paymentsalid"] . ')'; // Rowid of salary payment
+					} else if ($tabtype[$key] == 'payment_various') {
+						$bookkeeping->subledger_account = '';
+						$bookkeeping->numero_compte = $k;
+						$bookkeeping->doc_ref = $langs->trans("VariousPayment") . ' (' . $val["paymentvariousid"] . ')'; // Rowid of various payment
 					} else if ($tabtype[$key] == 'banktransfert') {
 						$bookkeeping->subledger_account = '';
 						$bookkeeping->numero_compte = $k;
 					} else {
-						// FIXME Should be a temporary account ???
+						// Temporary account
 						$bookkeeping->doc_ref = $k;
-						//$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
-						$bookkeeping->numero_compte = 'CodeNotDef';
+						$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE;
 					}
 
 					$result = $bookkeeping->create($user);
@@ -745,6 +780,7 @@ if (empty($action) || $action == 'view') {
 	$vatstatic = new Tva($db);
 	$donationstatic = new Don($db);
 	$salarystatic = new PaymentSalary($db);
+	$variousstatic = new PaymentVarious($db);
 
 	llxHeader('', $langs->trans("FinanceJournal"));
 
@@ -913,7 +949,20 @@ if (empty($action) || $action == 'view') {
 			}
 			else dol_print_error($db);
 		}
-
+		elseif ($tabtype[$key] == 'payment_various')
+		{
+			$sqlmid = 'SELECT v.rowid as id';
+			$sqlmid .= " FROM " . MAIN_DB_PREFIX . "payment_various as v";
+			$sqlmid .= " WHERE v.rowid=" . $val["paymentvariousid"];
+			dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
+			$resultmid = $db->query($sqlmid);
+			if ($resultmid) {
+				$objmid = $db->fetch_object($resultmid);
+				$variousstatic->fetch($objmid->id);
+				$ref=$variousstatic->getNomUrl(1);
+			}
+			else dol_print_error($db);
+		}
 
 		/*$invoicestatic->id = $key;
 		$invoicestatic->ref = $val["ref"];
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index 3da9e09aeda..6dba1443ae1 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -136,7 +136,7 @@ if ($result) {
 		// Define array to display all VAT rates that use this accounting account $compta_tva
 		if ((! price2num($obj->tva_tx)) || ! empty($obj->vat_src_code))
 		{
-            $def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':'')]=(vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':''));
+			$def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':'')]=(vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':''));
 		}
 
 		$taber[$obj->rowid]["date"] = $db->jdate($obj->de);
@@ -148,7 +148,7 @@ if ($result) {
 		$tabtva[$obj->rowid][$compta_tva] += $obj->total_tva;
 		$tabuser[$obj->rowid] = array (
 				'id' => $obj->uid,
-				'name' => $obj->firstname.' '.$obj->lastname,
+				'name' => dolGetFirstLastname($obj->firstname, $obj->lastname),
 				'user_accountancy_code' => $obj->user_accountancy_account
 		);
 
@@ -169,6 +169,7 @@ if ($action == 'writebookkeeping') {
 
 		$db->begin();
 
+		// Thirdparty
 		if (! $errorforline)
 		{
 			foreach ( $tabttc[$key] as $k => $mt ) {
@@ -183,7 +184,7 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
 					$bookkeeping->subledger_account = $tabuser[$key]['user_accountancy_code'];
 					$bookkeeping->subledger_label = $tabuser[$key]['user_accountancy_code'];
-					$bookkeeping->label_compte = $tabuser[$key]['name'];
+					$bookkeeping->label_operation = $tabuser[$key]['name'];
 					$bookkeeping->numero_compte = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
 					$bookkeeping->montant = $mt;
 					$bookkeeping->sens = ($mt >= 0) ? 'C' : 'D';
@@ -212,9 +213,9 @@ if ($action == 'writebookkeeping') {
 			}
 		}
 
+		// Fees
 		if (! $errorforline)
 		{
-			// Fees
 			foreach ( $tabht[$key] as $k => $mt ) {
 				$accountingaccount = new AccountingAccount($db);
 				$accountingaccount->fetch(null, $k, true);
@@ -231,7 +232,7 @@ if ($action == 'writebookkeeping') {
 						$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
 						$bookkeeping->subledger_account = '';
 						$bookkeeping->subledger_label = '';
-						$bookkeeping->label_compte = $accountingaccount->label;
+						$bookkeeping->label_operation = $accountingaccount->label;
 						$bookkeeping->numero_compte = $k;
 						$bookkeeping->montant = $mt;
 						$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
@@ -261,9 +262,9 @@ if ($action == 'writebookkeeping') {
 			}
 		}
 
+		// VAT
 		if (! $errorforline)
 		{
-			// VAT
 			// var_dump($tabtva);
 			foreach ( $tabtva[$key] as $k => $mt ) {
 				if ($mt) {
@@ -277,7 +278,7 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
 					$bookkeeping->subledger_account = '';
 					$bookkeeping->subledger_label = '';
-					$bookkeeping->label_compte = $langs->trans("VAT"). ' '.join(', ',$def_tva[$key][$k]);
+					$bookkeeping->label_operation = $langs->trans("VAT"). ' '.join(', ',$def_tva[$key][$k]);
 					$bookkeeping->numero_compte = $k;
 					$bookkeeping->montant = $mt;
 					$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 9ef1afdac38..e80ae3ba059 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2007-2010  Jean Heimburger		<jean@tiaris.info>
  * Copyright (C) 2011       Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2012       Regis Houssin		<regis@dolibarr.fr>
- * Copyright (C) 2013-2015  Alexandre Spangaro	<aspangaro@zendsi.com>
+ * Copyright (C) 2013-2017  Alexandre Spangaro	<aspangaro@zendsi.com>
  * Copyright (C) 2013-2016  Olivier Geffroy		<jeff@jeffinfo.com>
  * Copyright (C) 2013-2016  Florian Henry		<florian.henry@open-concept.pro>
  *
@@ -208,10 +208,10 @@ if ($action == 'writebookkeeping') {
 		$companystatic->code_fournisseur = $tabcompany[$key]['code_fournisseur'];
 		$companystatic->client = $tabcompany[$key]['code_client'];
 
+		// Thirdparty
 		if (! $errorforline)
 		{
 			foreach ( $tabttc[$key] as $k => $mt ) {
-				// get compte id and label
 				if ($mt) {
 					$bookkeeping = new BookKeeping($db);
 					$bookkeeping->doc_date = $val["date"];
@@ -223,7 +223,7 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->thirdparty_code = $companystatic->code_fournisseur;
 					$bookkeeping->subledger_account = $tabcompany[$key]['code_compta_fournisseur'];
 					$bookkeeping->subledger_label = '';    // TODO To complete
-					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("subledger_account");
+					$bookkeeping->label_operation = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("subledger_account");
 					$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER;
 					$bookkeeping->montant = $mt;
 					$bookkeeping->sens = ($mt >= 0) ? 'C' : 'D';
@@ -272,7 +272,7 @@ if ($action == 'writebookkeeping') {
 					    $bookkeeping->thirdparty_code = $companystatic->code_fournisseur;
 						$bookkeeping->subledger_account = '';
 						$bookkeeping->subledger_label = '';
-						$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $accountingaccount->label;
+						$bookkeeping->label_operation = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $accountingaccount->label;
 						$bookkeeping->numero_compte = $k;
 						$bookkeeping->montant = $mt;
 						$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
@@ -319,7 +319,7 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->thirdparty_code = $companystatic->code_fournisseur;
 					$bookkeeping->subledger_account = '';
 					$bookkeeping->subledger_label = '';
-					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("VAT"). ' '.join(', ',$def_tva[$key][$k]);
+					$bookkeeping->label_operation = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("VAT"). ' '.join(', ',$def_tva[$key][$k]);
 					$bookkeeping->numero_compte = $k;
 					$bookkeeping->montant = $mt;
 					$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 4eb4dc72171..a50f8be7fb9 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -1,13 +1,13 @@
 <?php
 /* Copyright (C) 2007-2010  Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2007-2010  Jean Heimburger			<jean@tiaris.info>
- * Copyright (C) 2011	   Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2012	   Regis Houssin			<regis@dolibarr.fr>
- * Copyright (C) 2013	   Christophe Battarel		<christophe.battarel@altairis.fr>
+ * Copyright (C) 2011       Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2012       Regis Houssin			<regis@dolibarr.fr>
+ * Copyright (C) 2013       Christophe Battarel		<christophe.battarel@altairis.fr>
  * Copyright (C) 2013-2017  Alexandre Spangaro		<aspangaro@zendsi.com>
  * Copyright (C) 2013-2016  Florian Henry			<florian.henry@open-concept.pro>
  * Copyright (C) 2013-2016  Olivier Geffroy			<jeff@jeffinfo.com>
- * Copyright (C) 2014	   Raphaël Doursenaud		<rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2014       Raphaël Doursenaud		<rdoursenaud@gpcsolutions.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -239,7 +239,7 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->subledger_account = $tabcompany[$key]['code_compta'];
 					$bookkeeping->subledger_label = '';    // TODO To complete
 					$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
-					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("subledger_account");
+					$bookkeeping->label_operation = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("subledger_account");
 					$bookkeeping->montant = $mt;
 					$bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
 					$bookkeeping->debit = ($mt >= 0) ? $mt : 0;
@@ -286,7 +286,7 @@ if ($action == 'writebookkeeping') {
 						$bookkeeping->subledger_account = '';
 						$bookkeeping->subledger_label = '';
 						$bookkeeping->numero_compte = $k;
-						$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $accountingaccount->label;
+						$bookkeeping->label_operation = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $accountingaccount->label;
 						$bookkeeping->montant = $mt;
 						$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
 						$bookkeeping->debit = ($mt < 0) ? $mt : 0;
@@ -332,7 +332,7 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->subledger_account = '';
 					$bookkeeping->subledger_label = '';
 					$bookkeeping->numero_compte = $k;
-					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT").' '.join(', ',$def_tva[$key][$k]);
+					$bookkeeping->label_operation = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT").' '.join(', ',$def_tva[$key][$k]);
 					$bookkeeping->montant = $mt;
 					$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
 					$bookkeeping->debit = ($mt < 0) ? $mt : 0;
diff --git a/htdocs/accountancy/report/result.php b/htdocs/accountancy/report/result.php
index aa31185604a..801ba0a2007 100644
--- a/htdocs/accountancy/report/result.php
+++ b/htdocs/accountancy/report/result.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2016		Jamal Elbaz			<jamelbaz@gmail.pro>
- * Copyright (C) 2016 		Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2016 		Alexandre Spangaro	<aspangaro@zendsi.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/htdocs/accountancy/supplier/card.php b/htdocs/accountancy/supplier/card.php
index 69a7855dfd2..b73c40ced74 100644
--- a/htdocs/accountancy/supplier/card.php
+++ b/htdocs/accountancy/supplier/card.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2004       Rodolphe Quiedeville  <rodolphe@quiedeville.org>
  * Copyright (C) 2005       Simon TOSSER          <simon@kornog-computing.com>
- * Copyright (C) 2013-2017  Alexandre Spangaro    <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2017  Alexandre Spangaro    <aspangaro@zendsi.com>
  * Copyright (C) 2013-2014  Olivier Geffroy       <jeff@jeffinfo.com>
  * Copyright (C) 2013-2014  Florian Henry         <florian.henry@open-concept.pro>
  * Copyright (C) 2014       Juanjo Menent         <jmenent@2byte.es>
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index 805c5e40420..3aa8e501bb9 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
  * Copyright (C) 2013-2014 Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2013-2015 Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2015 Alexandre Spangaro	<aspangaro@zendsi.com>
  * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 164525d5214..dc6b5e7ec20 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2013-2016 Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2013-2017 Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2017 Alexandre Spangaro	<aspangaro@zendsi.com>
  * Copyright (C) 2014-2015 Ari Elbaz (elarifr)	<github@accedinfo.com>  
  * Copyright (C) 2013-2016 Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2014      Juanjo Menent		<jmenent@2byte.es>
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 26000c3fb66..93aeb1746f5 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2013-2014	Olivier Geffroy			<jeff@jeffinfo.com>
- * Copyright (C) 2013-2017	Alexandre Spangaro		<aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2017	Alexandre Spangaro		<aspangaro@zendsi.com>
  * Copyright (C) 2014-2015	Ari Elbaz (elarifr)		<github@accedinfo.com>
  * Copyright (C) 2013-2014	Florian Henry			<florian.henry@open-concept.pro>
  * Copyright (C) 2014		Juanjo Menent			<jmenent@2byte.es>s
diff --git a/htdocs/accountancy/tpl/export_journal.tpl.php b/htdocs/accountancy/tpl/export_journal.tpl.php
index f69b47a8017..b5b6920e853 100644
--- a/htdocs/accountancy/tpl/export_journal.tpl.php
+++ b/htdocs/accountancy/tpl/export_journal.tpl.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2015  Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
+/* Copyright (C) 2015  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
diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index d0c0d61a954..939872ce7fd 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2017 		Alexandre Spangaro   <aspangaro@zendsi.com>
+/* Copyright (C) 2017		Alexandre Spangaro   <aspangaro@zendsi.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,9 +16,9 @@
  */
 
 /**
- *      \file       htdocs/compta/bank/class/paymentvarious.class.php
- *      \ingroup    salaries
- *      \brief		Class for salaries module payment
+ *  \file		htdocs/compta/bank/class/paymentvarious.class.php
+ *  \ingroup	bank
+ *  \brief		Class for various payment
  */
 
 // Put here all includes required by your class file
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
  */
 class PaymentVarious extends CommonObject
 {
-	//public $element='payment_various';			//!< Id that identify managed objects
+	//public $element='payment_various';		//!< Id that identify managed objects
 	//public $table_element='payment_various';	//!< Name of table without prefix where object is stored
 
 	var $tms;
@@ -74,7 +74,6 @@ class PaymentVarious extends CommonObject
 		$error=0;
 
 		// Clean parameters
-		$this->fk_user=trim($this->fk_user);
 		$this->amount=trim($this->amount);
 		$this->label=trim($this->label);
 		$this->note=trim($this->note);
@@ -85,10 +84,9 @@ class PaymentVarious extends CommonObject
 		$this->db->begin();
 
 		// Update request
-		$sql = "UPDATE ".MAIN_DB_PREFIX."payment_salary SET";
+		$sql = "UPDATE ".MAIN_DB_PREFIX."payment_various SET";
 
 		$sql.= " tms=".$this->db->idate($this->tms).",";
-		$sql.= " fk_user=".$this->fk_user.",";
 		$sql.= " datep=".$this->db->idate($this->datep).",";
 		$sql.= " datev=".$this->db->idate($this->datev).",";
 		$sql.= " sens=".$this->sens.",";
@@ -114,10 +112,10 @@ class PaymentVarious extends CommonObject
 
 		if (! $notrigger)
 		{
-            // Call trigger
-            $result=$this->call_trigger('PAYMENT_SALARY_MODIFY',$user);
-            if ($result < 0) $error++;
-            // End call triggers
+			// Call trigger
+			$result=$this->call_trigger('PAYMENT_VARIOUS_MODIFY',$user);
+			if ($result < 0) $error++;
+			// End call triggers
 		}
 
 		if (! $error)
@@ -178,7 +176,6 @@ class PaymentVarious extends CommonObject
 				$this->id				= $obj->rowid;
 				$this->ref				= $obj->rowid;
 				$this->tms				= $this->db->jdate($obj->tms);
-				$this->fk_user			= $obj->fk_user;
 				$this->datep			= $this->db->jdate($obj->datep);
 				$this->datev			= $this->db->jdate($obj->datev);
 				$this->sens				= $obj->sens;
@@ -252,12 +249,12 @@ class PaymentVarious extends CommonObject
 		$this->id=0;
 
 		$this->tms='';
-		$this->fk_user='';
 		$this->datep='';
 		$this->datev='';
 		$this->sens='';
 		$this->amount='';
 		$this->label='';
+		$this->accountancy_code='';
 		$this->note='';
 		$this->fk_bank='';
 		$this->fk_user_author='';
diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php
index b50bf07d31a..99362167a07 100644
--- a/htdocs/compta/bank/ligne.php
+++ b/htdocs/compta/bank/ligne.php
@@ -49,7 +49,7 @@ $confirm=GETPOST('confirm','alpha');
 $rowid=GETPOST("rowid",'int');
 $orig_account=GETPOST("orig_account");
 $backtopage=GETPOST('backtopage');
-$cancel=GETPOSt('cancel');
+$cancel=GETPOST('cancel');
 
 // Security check
 $fieldvalue = (! empty($id) ? $id : (! empty($ref) ? $ref :''));

From 5320ebc0515e865553004f2febe718b3a46b9620 Mon Sep 17 00:00:00 2001
From: BENKE Charlene <charles.fr@benke.fr>
Date: Sat, 17 Jun 2017 10:16:52 +0200
Subject: [PATCH 245/438] getTotalWeightVolume : add conversion Lb & oz to KG

New conversion value : Oz once
Little az a wizzard...
---
 htdocs/core/class/commonobject.class.php | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 3ac7cb6ffb3..bd5d8a6b831 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3097,9 +3097,18 @@ abstract class CommonObject
                 $trueWeightUnit=pow(10, $weightUnit);
                 $totalWeight += $weight * $qty * $trueWeightUnit;
             }
-            else
-            {
-                $totalWeight += $weight * $qty;   // This may be wrong if we mix different units
+            else {
+		if ($weight_units == 99) {
+			// conversion 1 Livre = 0.45359237 KG
+			$trueWeightUnit = 0.45359237;
+			$totalWeight += $weight * $qty * $trueWeightUnit;
+		} elseif ($weight_units == 98) {
+			// conversion 1 once = 0.0283495 KG
+			$trueWeightUnit = 0.0283495;
+			$totalWeight += $weight * $qty * $trueWeightUnit;
+		}
+		else
+                	$totalWeight += $weight * $qty;   // This may be wrong if we mix different units
             }
             if ($volume_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
             {

From 5b7a8e9c90f82b4abe7c0a4dff84603b16f5884f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 17 Jun 2017 10:17:36 +0200
Subject: [PATCH 246/438] Fix missing signature when sending email from user
 card

---
 htdocs/commande/card.php                  | 25 ++++++++-----
 htdocs/core/class/html.formmail.class.php |  6 ++--
 htdocs/langs/en_US/other.lang             |  1 +
 htdocs/user/card.php                      | 43 ++++-------------------
 4 files changed, 28 insertions(+), 47 deletions(-)

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 83135a8c0f5..f837119730c 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -2621,6 +2621,19 @@ if ($action == 'create' && $user->rights->commande->creer)
 				$outputlangs->load('commercial');
 			}
 
+			// Show email form
+
+			// By default if $action=='presend'
+			$titreform='SendOrderByMail';
+			$topicmail='';
+			if (empty($object->ref_client)) {
+			    $topicmail = $outputlangs->trans('SendOrderRef', '__ORDERREF__');
+			} else if (! empty($object->ref_client)) {
+			    $topicmail = $outputlangs->trans('SendOrderRef', '__ORDERREF__ (__REFCLIENT__)');
+			}
+			$action='send';
+			$modelmail='order_send';
+
 			// Build document if it not exists
 			if (! $file || ! is_readable($file)) {
 				$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
@@ -2635,7 +2648,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 			print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
 			print '<div class="clearboth"></div>';
 			print '<br>';
-			print load_fiche_titre($langs->trans('SendOrderByMail'));
+			print load_fiche_titre($langs->trans($titreform));
 
 			dol_fiche_head('');
 
@@ -2662,11 +2675,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 			$formmail->withto = GETPOST('sendto') ? GETPOST('sendto') : $liste;
 			$formmail->withtocc = $liste;
 			$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
-			if (empty($object->ref_client)) {
-				$formmail->withtopic = $outputlangs->trans('SendOrderRef', '__ORDERREF__');
-			} else if (! empty($object->ref_client)) {
-				$formmail->withtopic = $outputlangs->trans('SendOrderRef', '__ORDERREF__ (__REFCLIENT__)');
-			}
+			$formmail->withtopic = $topicmail;
 			$formmail->withfile = 2;
 			$formmail->withbody = 1;
 			$formmail->withdeliveryreceipt = 1;
@@ -2696,8 +2705,8 @@ if ($action == 'create' && $user->rights->commande->creer)
 			}
 
 			// Tableau des parametres complementaires
-			$formmail->param['action'] = 'send';
-			$formmail->param['models'] = 'order_send';
+			$formmail->param['action'] = $action;
+			$formmail->param['models'] = $modelmail;
 			$formmail->param['models_id']=GETPOST('modelmailselected','int');
 			$formmail->param['orderid'] = $object->id;
 			$formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 860d3fcfb1c..d59ac6c25af 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -288,14 +288,15 @@ class FormMail extends Form
 				$outputlangs->load('other');
 			}
 
-        	// Get message template
+        	// Get message template for $this->param["models"] into c_email_templates
 			$model_id=0;
         	if (array_key_exists('models_id',$this->param))
         	{
         		$model_id=$this->param["models_id"];
         	}
         	$arraydefaultmessage=$this->getEMailTemplate($this->db, $this->param["models"], $user, $outputlangs, $model_id);
-			//var_dump($arraydefaultmessage);
+			//var_dump($this->param["models"]);
+        	//var_dump($arraydefaultmessage);
 
         	$out.= "\n".'<!-- Begin form mail --><div id="mailformdiv"></div>'."\n";
         	if ($this->withform == 1)
@@ -876,6 +877,7 @@ class FormMail extends Form
 	        	elseif ($type_template=='shipping_send')			{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendShipping"); }
 	        	elseif ($type_template=='fichinter_send')			{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendFichInter"); }
 	        	elseif ($type_template=='thirdparty')				{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentThirdparty"); }
+	        	elseif ($type_template=='user')				        { $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentUser"); }
 
 	        	$ret['label']='default';
 	        	$ret['topic']='';
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index a14bfffffb6..b151614ce3c 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -81,6 +81,7 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find her
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 089820da442..a2938a89712 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1659,13 +1659,11 @@ else
             }
             if ($action == 'presend')
             {
-                /*
-                 * Affiche formulaire mail
-                 */
+                // Show email form
 
                 // By default if $action=='presend'
                 $titreform='SendMail';
-                $topicmail='';
+                $topicmail=1;
                 $action='send';
                 $modelmail='user';
 
@@ -1680,9 +1678,8 @@ else
                 $newlang = '';
                 if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
                     $newlang = $_REQUEST['lang_id'];
-
-                if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-                    $newlang = $object->default_lang;
+                //if ($conf->global->MAIN_MULTILANGS && empty($newlang))
+                //    $newlang = $object->thirdparty->default_lang;
 
                 // Cree l'objet formulaire mail
                 include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
@@ -1701,7 +1698,7 @@ else
                     $formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'thi'.$object->id);
                 }
                 $formmail->withfrom=1;
-                $formmail->withtopic=1;
+                $formmail->withtopic=$topicmail;
                 $formmail->withto=GETPOST('sendto')?GETPOST('sendto'):$object->email;
                 $formmail->withtofree=1;
                 $formmail->withtocc=1;
@@ -1711,37 +1708,9 @@ else
                 $formmail->withdeliveryreceipt=1;
                 $formmail->withcancel=1;
                 // Tableau des substitutions
-                //$formmail->setSubstitFromObject($object);
+                $formmail->setSubstitFromObject($object);
                 $formmail->substit['__LASTNAME__']=$object->lastname;
                 $formmail->substit['__FIRSTNAME__']=$object->firstname;
-                $formmail->substit['__SIGNATURE__']=$user->signature;
-                $formmail->substit['__PERSONALIZED__']='';
-
-                //Find the good contact adress
-                /*
-                $custcontact='';
-                $contactarr=array();
-                $contactarr=$object->liste_contact(-1,'external');
-
-                if (is_array($contactarr) && count($contactarr)>0)
-                {
-                foreach($contactarr as $contact)
-                {
-                if ($contact['libelle']==$langs->trans('TypeContact_facture_external_BILLING')) {
-
-                require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
-
-                $contactstatic=new Contact($db);
-                $contactstatic->fetch($contact['id']);
-                $custcontact=$contactstatic->getFullName($langs,1);
-                }
-                }
-
-                if (!empty($custcontact)) {
-                $formmail->substit['__CONTACTCIVNAME__']=$custcontact;
-                }
-                }*/
-
 
                 // Tableau des parametres complementaires du post
                 $formmail->param['action']=$action;

From e98bc90489b8c9085904ffc7762cd0b63e48ada8 Mon Sep 17 00:00:00 2001
From: BENKE Charlene <charles.fr@benke.fr>
Date: Sat, 17 Jun 2017 10:18:59 +0200
Subject: [PATCH 247/438] introduce OZ : once weight

---
 htdocs/product/class/html.formproduct.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index 01064c8ffa3..1dbfbc7662f 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -307,7 +307,7 @@ class FormProduct
 		$return='';
 
 		$measuring_units=array();
-		if ($measuring_style == 'weight') $measuring_units=array(-6=>1,-3=>1,0=>1,3=>1,99=>1);
+		if ($measuring_style == 'weight') $measuring_units=array(-6=>1,-3=>1,0=>1,3=>1,98=>1,99=>1);
 		else if ($measuring_style == 'size') $measuring_units=array(-3=>1,-2=>1,-1=>1,0=>1,98=>1,99=>1);
         else if ($measuring_style == 'surface') $measuring_units=array(-6=>1,-4=>1,-2=>1,0=>1,98=>1,99=>1);
 		else if ($measuring_style == 'volume') $measuring_units=array(-9=>1,-6=>1,-3=>1,0=>1,88=>1,89=>1,97=>1,99=>1,/* 98=>1 */);  // Liter is not used as already available with dm3

From 17247c64f0fbe50c0720e5c13c70965892ae18e9 Mon Sep 17 00:00:00 2001
From: BENKE Charlene <charles.fr@benke.fr>
Date: Sat, 17 Jun 2017 10:26:01 +0200
Subject: [PATCH 248/438] add WeightUnitonce

---
 htdocs/core/lib/product.lib.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index 5aec64f3ce0..16bedc4d346 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -441,7 +441,8 @@ function measuring_units_string($unit,$measuring_style='')
 		$measuring_units[0] = $langs->transnoentitiesnoconv("WeightUnitkg");
 		$measuring_units[-3] = $langs->transnoentitiesnoconv("WeightUnitg");
 		$measuring_units[-6] = $langs->transnoentitiesnoconv("WeightUnitmg");
-        $measuring_units[99] = $langs->transnoentitiesnoconv("WeightUnitpound");
+		$measuring_units[98] = $langs->transnoentitiesnoconv("WeightUnitonce");
+		$measuring_units[99] = $langs->transnoentitiesnoconv("WeightUnitpound");
 	}
 	else if ($measuring_style == 'size')
 	{

From f0bc72cda4aa3864dcfaba252537a3005027bad8 Mon Sep 17 00:00:00 2001
From: BENKE Charlene <charles.fr@benke.fr>
Date: Sat, 17 Jun 2017 10:27:00 +0200
Subject: [PATCH 249/438] WeightUnitonce translation

---
 htdocs/langs/en_US/other.lang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index a14bfffffb6..120b1dcd790 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -123,6 +123,7 @@ WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
 WeightUnitpound=pound
+WeightUnitonce=once
 Length=Length
 LengthUnitm=m
 LengthUnitdm=dm

From bebe7baa80990fa25f37b25c5ac8620cbf90ea6c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 17 Jun 2017 10:44:08 +0200
Subject: [PATCH 250/438] Fix images into medias not reabable into send emails

---
 htdocs/core/actions_sendmails.inc.php | 31 ++++++++++++++++++---------
 htdocs/core/lib/pdf.lib.php           |  2 +-
 htdocs/langs/en_US/errors.lang        |  1 +
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index dded23e6cbf..7bb3e8aec49 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -31,7 +31,7 @@
 
 /*
  * Add file in email form
-*/
+ */
 if (GETPOST('addfile'))
 {
 	$trackid = GETPOST('trackid','aZ09');
@@ -137,7 +137,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 				{
 					$sendtosocid=$possibleaccounts[1]['id'];
 					$result=$object->fetch($sendtosocid);
-						
+
 					setEventMessages($langs->trans('ErrorFoundMoreThanOneRecordWithEmail',$_POST['sendto'],$object->name), null, 'mesgs');
 				}
 				else
@@ -229,7 +229,12 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 
 		if (dol_strlen($sendto))
 		{
-			require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+            // Define $urlwithroot
+            $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+            $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+            //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+
+		    require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 
 			$langs->load("commercial");
 
@@ -254,11 +259,17 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 
 			$replyto = $_POST['replytoname']. ' <' . $_POST['replytomail'].'>';
 			$message = $_POST['message'];
-				
+
+			// Make a change into HTML code to allow to include images from medias directory with an external reabable URL.
+			// <img alt="" src="/dolibarr_dev/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
+			// become
+			// <img alt="" src="'.$urlwithroot.'viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
+			$message=preg_replace('/(<img.*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^\/]*\/>)/', '\1'.$urlwithroot.'/viewimage.php\2modulepart=medias\3file=\4\5', $message);
+
 			$sendtobcc= GETPOST('sendtoccc');
-			if ($mode == 'emailfromproposal') $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO));
-			if ($mode == 'emailfromorder')    $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO));
-			if ($mode == 'emailfrominvoice')  $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO));
+			if ($mode == 'emailfromproposal')         $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO));
+			if ($mode == 'emailfromorder')            $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO));
+			if ($mode == 'emailfrominvoice')          $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO));
 			if ($mode == 'emailfromsupplierproposal') $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO));
 			if ($mode == 'emailfromsupplierorder')    $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO));
 			if ($mode == 'emailfromsupplierinvoice')  $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO));
@@ -371,7 +382,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 					if (is_object($object))
 					{
 					    if (empty($actiontypecode)) $actiontypecode='AC_OTH_AUTO'; // Event insert into agenda automatically
-					    
+
 						$object->socid			= $sendtosocid;	   // To link to a company
 						$object->sendtoid		= $sendtoid;	   // To link to contacts/addresses. This is an array.
 						$object->actiontypecode	= $actiontypecode; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
@@ -392,7 +403,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
     						}
 						}
 					}
-						
+
 					if ($error)
 					{
 						dol_print_error($db);
@@ -403,7 +414,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 						// This avoid sending mail twice if going out and then back to page
 						$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2));
 						setEventMessages($mesg, null, 'mesgs');
-						if ($conf->dolimail->enabled) 
+						if ($conf->dolimail->enabled)
 						{
 						    header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname?$paramname:'id').'='.(is_object($object)?$object->id:'').'&'.($paramname2?$paramname2:'mid').'='.$parm2val);
 						    exit;
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index a9fb8e52734..3c771220c70 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -865,7 +865,7 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
 		// Make a change into HTML code to allow to include images from medias directory.
 		// <img alt="" src="/dolibarr_dev/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
 		// become
-		// <img src="'.DOL_DATA_ROOT.'/media/image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
+		// <img alt="" src="'.DOL_DATA_ROOT.'/media/image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
 		$newfreetext=preg_replace('/(<img.*src=")[^\"]*viewimage\.php[^\"]*modulepart=medias[^\"]*file=([^\"]*)("[^\/]*\/>)/', '\1'.DOL_DATA_ROOT.'/medias/\2\3', $newfreetext);
 
 		$line.=$outputlangs->convToOutputCharset($newfreetext);
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 0f57a23d23c..ac982973ef3 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -44,6 +44,7 @@ ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Some required fields were not filled.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.

From 7c41c9a3e4aedb97742ab505afe957281e9527e2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 17 Jun 2017 11:43:00 +0200
Subject: [PATCH 251/438] Fix activation of dependency for a dedicated country.
 BlockedLog depends now on CashDesk only.

---
 htdocs/admin/modules.php                      |  8 +++--
 htdocs/core/lib/admin.lib.php                 | 20 ++++++------
 htdocs/core/modules/modBlockedLog.class.php   |  6 ++--
 htdocs/core/modules/modCashDesk.class.php     |  6 ++--
 htdocs/core/modules/modFacture.class.php      | 31 +++++++++----------
 htdocs/langs/en_US/admin.lang                 |  6 ++--
 htdocs/langs/en_US/main.lang                  |  3 +-
 .../core/modules/modMyModule.class.php        |  2 ++
 htdocs/theme/md/style.css.php                 |  1 -
 9 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 5d5886b5415..d3221f40505 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -80,7 +80,7 @@ $urldolibarrmodules='https://www.dolistore.com/';
  * Actions
  */
 
-if (GETPOST('buttonreset'))
+if (GETPOST('buttonreset','alpha'))
 {
     $search_keyword='';
     $search_status='';
@@ -738,13 +738,17 @@ if ($mode == 'common')
 	        	    print '<!-- This module is an external module and it may have a warning to show (note: your country is '.$mysoc->country_code.') -->'."\n";
 	        	    foreach ($arrayofwarningsext as $keymodule => $arrayofwarningsextbycountry)
 	        	    {
-	        	        if (! empty($modules[$keymodule]->const_name))    // If module that request warning is on
+                        $keymodulelowercase=strtolower(preg_replace('/^mod/','',$keymodule));
+                        if (in_array($keymodulelowercase, $conf->modules))    // If module that request warning is on
 	        	        {
         	        	    foreach ($arrayofwarningsextbycountry as $keycountry => $cursorwarningmessage)
         	        	    {
         	        	        if ($keycountry == 'always' || $keycountry == $mysoc->country_code)
         	        	        {
         	        	            $warningmessage .= ($warningmessage?"\n":"").$langs->trans($cursorwarningmessage, $objMod->getName(), $mysoc->country_code, $modules[$keymodule]->getName());
+        	        	            $warningmessage .= ($warningmessage?"\n":"").($warningmessage?"\n":"").$langs->trans("Module").' : '.$objMod->getName();
+        	        	            if (! empty($objMod->editor_name)) $warningmessage .= ($warningmessage?"\n":"").$langs->trans("Publisher").' : '.$objMod->editor_name;
+        	        	            if (! empty($objMod->editor_name)) $warningmessage .= ($warningmessage?"\n":"").$langs->trans("ModuleTriggeringThisWarning").' : '.$modules[$keymodule]->getName();
         	        	        }
         	        	    }
 	        	        }
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index ba5f099365c..e90f006ac7e 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -756,7 +756,7 @@ function purgeSessions($mysessionid)
  */
 function activateModule($value,$withdeps=1)
 {
-    global $db, $modules, $langs, $conf;
+    global $db, $modules, $langs, $conf, $mysoc;
 
 	// Check parameters
 	if (empty($value)) {
@@ -813,7 +813,7 @@ function activateModule($value,$withdeps=1)
     }
 
     $result=$objMod->init();    // Enable module
-    if ($result <= 0) 
+    if ($result <= 0)
     {
         $ret['errors'][]=$objMod->error;
     }
@@ -848,19 +848,19 @@ function activateModule($value,$withdeps=1)
     						break;
                 		}
                 	}
-    				
+
     				if ($activate)
     				{
     				    $ret['nbmodules']+=$resarray['nbmodules'];
     				    $ret['nbperms']+=$resarray['nbperms'];
     				}
-    				else 
+    				else
     				{
     				    $ret['errors'][] = $langs->trans('activateModuleDependNotSatisfied', $objMod->name, $modulestring);
     				}
                 }
             }
-    
+
             if (isset($objMod->conflictwith) && is_array($objMod->conflictwith) && ! empty($objMod->conflictwith))
             {
                 // Desactivation des modules qui entrent en conflit
@@ -879,12 +879,12 @@ function activateModule($value,$withdeps=1)
         }
     }
 
-    if (! count($ret['errors'])) 
+    if (! count($ret['errors']))
     {
         $ret['nbmodules']++;
         $ret['nbperms']+=count($objMod->rights);
     }
-    
+
     return $ret;
 }
 
@@ -1221,7 +1221,7 @@ function form_constantes($tableau, $strictw3c=0, $helptext='')
         if ($result)
         {
             $obj = $db->fetch_object($result);	// Take first result of select
-            
+
 
             // For avoid warning in strict mode
             if (empty($obj)) {
@@ -1360,7 +1360,7 @@ function showModulesExludedForExternal($modules)
 			//if (empty($conf->global->$moduleconst)) continue;
 			if (! in_array($modulename,$listofmodules)) continue;
 			//var_dump($modulename.'eee'.$langs->trans('Module'.$module->numero.'Name'));
-				
+
 			if ($i > 0) $text.=', ';
 			else $text.=' ';
 			$i++;
@@ -1391,7 +1391,7 @@ function addDocumentModel($name, $type, $label='', $description='')
     $sql.= ($label?"'".$db->escape($label)."'":'null').", ";
     $sql.= (! empty($description)?"'".$db->escape($description)."'":"null");
     $sql.= ")";
-	
+
     dol_syslog("admin.lib::addDocumentModel", LOG_DEBUG);
 	$resql=$db->query($sql);
 	if ($resql)
diff --git a/htdocs/core/modules/modBlockedLog.class.php b/htdocs/core/modules/modBlockedLog.class.php
index f3f3be971b5..3125627c007 100644
--- a/htdocs/core/modules/modBlockedLog.class.php
+++ b/htdocs/core/modules/modBlockedLog.class.php
@@ -65,9 +65,9 @@ class modBlockedLog extends DolibarrModules
         // Dependancies
         //-------------
 	    $this->hidden = false;	// A condition to disable module
-	    $this->depends = array('modFacture');		// List of modules id that must be enabled if this module is enabled
-        $this->requiredby = array();	// List of modules id to disable if this one is disabled
-	    $this->conflictwith = array();	// List of modules id this module is in conflict with
+	    $this->depends = array('always'=>'modFacture');	   // List of modules id that must be enabled if this module is enabled
+        $this->requiredby = array();	                   // List of modules id to disable if this one is disabled
+	    $this->conflictwith = array();	                   // List of modules id this module is in conflict with
         $this->langfiles = array();
 
         // Constants
diff --git a/htdocs/core/modules/modCashDesk.class.php b/htdocs/core/modules/modCashDesk.class.php
index ec8764c9017..e5ba473c1c7 100644
--- a/htdocs/core/modules/modCashDesk.class.php
+++ b/htdocs/core/modules/modCashDesk.class.php
@@ -65,11 +65,13 @@ class modCashDesk extends DolibarrModules
 		$this->config_page_url = array("cashdesk.php@cashdesk");
 
 		// Dependencies
-		$this->depends = array("modBanque","modFacture","modProduct");	// List of modules id that must be enabled if this module is enabled
-		$this->requiredby = array();			// List of modules id to disable if this one is disabled
+		$this->depends = array('always'=>"modBanque", 'always'=>"modFacture", 'always'=>"modProduct", 'FR'=>'modBlockedLog');	// List of modules id that must be enabled if this module is enabled
+		$this->requiredby = array();			    // List of modules id to disable if this one is disabled
 		$this->phpmin = array(4,1);					// Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(2,4);	// Minimum version of Dolibarr required by module
 		$this->langfiles = array("cashdesk");
+		$this->warnings_activation = array('FR'=>'WarningNoteModulePOSForFrenchLaw');                     // Warning to show when we activate module. array('always'='text') or array('FR'='text')
+		$this->warnings_activation_ext = array('FR'=>'WarningInstallationMayBecomeNotCompliantWithLaw');  // Warning to show when we activate an external module. array('always'='text') or array('FR'='text')
 
 		// Constants
 		$this->const = array();
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index 3af85a1944d..40e2a03d161 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -64,14 +64,13 @@ class modFacture extends DolibarrModules
 		$this->dirs = array("/facture/temp");
 
 		// Dependencies
-		$this->depends = array('always'=>"modSociete", 'FR'=>'modBlockedLog');
+		$this->depends = array('always'=>"modSociete");
 		$this->requiredby = array("modComptabilite","modAccounting");
 		$this->conflictwith = array();
 		$this->langfiles = array("bills","companies","compta","products");
-		$this->warnings_activation = array('FR'=>'WarningNoteModuleInvoiceForFrenchLaw');                              // Warning to show when we activate module. array('always'='text') or array('FR'='text')
-		$this->warnings_activation = array();
-		$this->warnings_activation_ext = array('FR'=>'WarningInstallationMayBecomeNotCompliantWithLaw');  // Warning to show when we activate an external module. array('always'='text') or array('FR'='text')
-		
+		$this->warnings_activation = array();                              // Warning to show when we activate module. array('always'='text') or array('FR'='text')
+		$this->warnings_activation_ext = array();                          // Warning to show when we activate an external module. array('always'='text') or array('FR'='text')
+
 		// Config pages
 		$this->config_page_url = array("facture.php");
 
@@ -99,7 +98,7 @@ class modFacture extends DolibarrModules
 		$this->const[$r][3] = "";
 		$this->const[$r][4] = 0;
 		$r++;
-		
+
 		/*$this->const[$r][0] = "FACTURE_DRAFT_WATERMARK";
 		$this->const[$r][1] = "chaine";
 		$this->const[$r][2] = "__(Draft)__";
@@ -107,7 +106,7 @@ class modFacture extends DolibarrModules
 		$this->const[$r][4] = 0;
 		$r++;*/
 
-		
+
 		// Boxes
 		//$this->boxes = array(0=>array(1=>'box_factures_imp.php'),1=>array(1=>'box_factures.php'));
 		$this->boxes = array(
@@ -116,16 +115,16 @@ class modFacture extends DolibarrModules
 				2=>array('file'=>'box_graph_invoices_permonth.php','enabledbydefaulton'=>'Home')
 		);
 
-        // Cronjobs 
+        // Cronjobs
         $this->cronjobs = array(
-            0=>array('label'=>'RecurringInvoices', 'jobtype'=>'method', 'class'=>'compta/facture/class/facture-rec.class.php', 'objectname'=>'FactureRec', 'method'=>'createRecurringInvoices', 'parameters'=>'', 'comment'=>'Generate recurring invoices', 'frequency'=>1, 'unitfrequency'=>3600*24), 
+            0=>array('label'=>'RecurringInvoices', 'jobtype'=>'method', 'class'=>'compta/facture/class/facture-rec.class.php', 'objectname'=>'FactureRec', 'method'=>'createRecurringInvoices', 'parameters'=>'', 'comment'=>'Generate recurring invoices', 'frequency'=>1, 'unitfrequency'=>3600*24),
             // 1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>3600, 'unitfrequency'=>3600)
-        ); 
-        // List of cron jobs entries to add 
-        // Example: 
+        );
+        // List of cron jobs entries to add
+        // Example:
         // $this->cronjobs=array(
-        //              0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600), 
-        //              1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600) 
+        //              0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600),
+        //              1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600)
         // );
 
         // Permissions
@@ -206,8 +205,8 @@ class modFacture extends DolibarrModules
 		// Menus
 		//-------
 		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-		
-		
+
+
 		// Exports
 		//--------
 		$r=1;
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 1aa79c2dced..0ba5ab270bc 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -104,7 +104,7 @@ MenuIdParent=Parent menu ID
 DetailMenuIdParent=ID of parent menu (empty for a top menu)
 DetailPosition=Sort number to define menu position
 AllMenus=All
-NotConfigured=Module not configured
+NotConfigured=Module/Application not configured
 Active=Active
 SetupShort=Setup
 OtherOptions=Other options
@@ -114,7 +114,6 @@ CurrentValueSeparatorThousand=Thousand separator
 Destination=Destination
 IdModule=Module ID
 IdPermissions=Permissions ID
-Modules=Modules
 LanguageBrowserParameter=Parameter %s
 LocalisationDolibarrParameters=Localisation parameters
 ClientTZ=Client Time Zone (user)
@@ -1700,7 +1699,8 @@ UserHasNoPermissions=This user has no permission defined
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
 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). 
-WarningInstallationMayBecomeNotCompliantWithLaw=You try to install the module %s that is an external module. Activating an external module means you trust the editor of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.   
+WarningNoteModulePOSForFrenchLaw=This module %s is compliant with french laws (Loi Finance 2016) because module Non Reversible Logs is automatically activated. 
+WarningInstallationMayBecomeNotCompliantWithLaw=You try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.   
 ##### Resource ####
 ResourceSetup=Configuration du module Resource 
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 8ea14fdb305..a35342f2af9 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -366,7 +366,8 @@ VATRate=Tax Rate
 Average=Average
 Sum=Sum
 Delta=Delta
-Module=Module
+Module=Module/Application
+Modules=Modules/Applications
 Option=Option
 List=List
 FullList=Full list
diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
index dc98c327cb3..60889bdf279 100644
--- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
+++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
@@ -114,6 +114,8 @@ class modMyModule extends DolibarrModules
 		$this->phpmin = array(5,0);					// Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
 		$this->langfiles = array("mymodule@mymodule");
+		$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'...)
 
 		// Constants
 		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 5fbd8455919..e96fa032538 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2528,7 +2528,6 @@ div.pagination li.noborder a:hover {
 div.pagination li a,
 div.pagination li span {
   background-color: #fff;
-  border: 1px solid #ddd;
 }
 div.pagination li:first-child a,
 div.pagination li:first-child span {

From a4f34539ea92cf634c49a98904c6aa92eb0015b1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 17 Jun 2017 11:46:45 +0200
Subject: [PATCH 252/438] Fix translation

---
 htdocs/langs/en_US/admin.lang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 0ba5ab270bc..e2b5825f14f 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -466,7 +466,7 @@ Module30Desc=Invoice and credit note management for customers. Invoice managemen
 Module40Name=Suppliers
 Module40Desc=Supplier management and buying (orders and invoices)
 Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes. For legal purpose, see instead module 'Non Reversible Logs'.
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Products
@@ -565,7 +565,7 @@ Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
 Module3200Name=Non Reversible Logs
-Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table that can be then exported. This module may be mandatory for some countries.
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
 Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi-company

From 8a1de52f3c5b80c10c290c6028e0cc61cdf003f0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 17 Jun 2017 12:00:33 +0200
Subject: [PATCH 253/438] Fix translation

---
 htdocs/admin/index.php        |  6 +++---
 htdocs/langs/en_US/admin.lang | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php
index a1ac45244e1..9ac33f1cc3d 100644
--- a/htdocs/admin/index.php
+++ b/htdocs/admin/index.php
@@ -70,13 +70,13 @@ if (! empty($conf->global->MAIN_MOTD_SETUPPAGE))
 
 print $langs->trans("SetupDescription1").' ';
 print $langs->trans("AreaForAdminOnly").' ';
-print $langs->trans("SetupDescription2")."<br><br>";
+print $langs->trans("SetupDescription2", $langs->trans("MenuCompanySetup"), $langs->trans("Modules"))."<br><br>";
 
 print '<br>';
 
 // Show info setup company
 if (empty($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY)) $setupcompanynotcomplete=1;
-print img_picto('','puce').' '.$langs->trans("SetupDescription3",DOL_URL_ROOT.'/admin/company.php?mainmenu=home'.(empty($setupcompanynotcomplete)?'':'&action=edit'));
+print img_picto('','puce').' '.$langs->trans("SetupDescription3", DOL_URL_ROOT.'/admin/company.php?mainmenu=home'.(empty($setupcompanynotcomplete)?'':'&action=edit'), $langs->trans("Setup"), $langs->trans("MenuCompanySetup"));
 if (! empty($setupcompanynotcomplete))
 {
 	$langs->load("errors");
@@ -88,7 +88,7 @@ print '<br>';
 print '<br>';
 
 // Show info setup module
-print img_picto('','puce').' '.$langs->trans("SetupDescription4",DOL_URL_ROOT.'/admin/modules.php?mainmenu=home');
+print img_picto('','puce').' '.$langs->trans("SetupDescription4", DOL_URL_ROOT.'/admin/modules.php?mainmenu=home', $langs->trans("Setup"), $langs->trans("Modules"));
 if (count($conf->modules) <= (empty($conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING)?1:$conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING))	// If only user module enabled
 {
 	$langs->load("errors");
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index e2b5825f14f..23b207b4fea 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -190,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after enabling module. Click on button on/off to enable an application/module.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -270,7 +270,7 @@ FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your
 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/
 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 setup
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -997,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/Organisation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/Organisation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Other menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Audit
@@ -1015,7 +1015,7 @@ BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
 LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)

From 240e9637fa03e1bf03add7712f050b26d2d20e7e Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Sat, 17 Jun 2017 14:43:15 +0200
Subject: [PATCH 254/438] New: add extrafields API REST

---
 .../class/api_dictionaryextrafields.class.php | 112 ++++++++++++++++++
 1 file changed, 112 insertions(+)
 create mode 100644 htdocs/api/class/api_dictionaryextrafields.class.php

diff --git a/htdocs/api/class/api_dictionaryextrafields.class.php b/htdocs/api/class/api_dictionaryextrafields.class.php
new file mode 100644
index 00000000000..69f574797c7
--- /dev/null
+++ b/htdocs/api/class/api_dictionaryextrafields.class.php
@@ -0,0 +1,112 @@
+<?php
+/* Copyright (C) 2017	Regis Houssin	<regis.houssin@capnetworks.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/>.
+ */
+
+use Luracast\Restler\RestException;
+
+//require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
+
+/**
+ * API class for extra fields (content of the extrafields)
+ *
+ * @access protected
+ * @class DolibarrApiAccess {@requires user,external}
+ */
+class DictionaryExtraFields extends DolibarrApi
+{
+    /**
+     * Constructor
+     */
+    function __construct()
+    {
+        global $db;
+        $this->db = $db;
+    }
+
+    /**
+     * Get the list of extra fields.
+     *
+     * @param string	$sortfield	Sort field
+     * @param string	$sortorder	Sort order
+     * @param string    $type       Type of element ('adherent', 'commande', 'thirdparty', 'facture', 'propal', 'product', ...)
+     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.label:like:'SO-%')"
+     * @return List of events types
+     *
+     * @throws RestException
+     */
+    function index($sortfield = "t.pos", $sortorder = 'ASC', $type = '', $sqlfilters = '')
+    {
+        $list = array();
+
+        if ($type == 'thirdparty') $type='societe';
+        if ($type == 'contact') $type='socpeople';
+
+        $sql = "SELECT t.rowid, t.name, t.label, t.type, t.size, t.elementtype, t.fieldunique, t.fieldrequired, t.param, t.pos, t.alwayseditable, t.perms, t.list, t.ishidden, t.fielddefault, t.fieldcomputed";
+        $sql.= " FROM ".MAIN_DB_PREFIX."extrafields as t";
+        $sql.= " WHERE t.entity IN (".getEntity('extrafields').")";
+        if (! empty($type)) $sql.= " AND t.elementtype = '".$this->db->escape($type)."'";
+        // Add sql filters
+        if ($sqlfilters)
+        {
+        	if (! DolibarrApi::_checkFilters($sqlfilters))
+        	{
+        		throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+        	}
+        	$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+        	$sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+        }
+
+        $sql.= $this->db->order($sortfield, $sortorder);
+
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+        	if ($this->db->num_rows($resql))
+        	{
+        		while ($tab = $this->db->fetch_object($resql))
+        		{
+        			// New usage
+        			$list[$tab->elementtype][$tab->name]['type']=$tab->type;
+        			$list[$tab->elementtype][$tab->name]['label']=$tab->label;
+        			$list[$tab->elementtype][$tab->name]['size']=$tab->size;
+        			$list[$tab->elementtype][$tab->name]['elementtype']=$tab->elementtype;
+        			$list[$tab->elementtype][$tab->name]['default']=$tab->fielddefault;
+        			$list[$tab->elementtype][$tab->name]['computed']=$tab->fieldcomputed;
+        			$list[$tab->elementtype][$tab->name]['unique']=$tab->fieldunique;
+        			$list[$tab->elementtype][$tab->name]['required']=$tab->fieldrequired;
+        			$list[$tab->elementtype][$tab->name]['param']=($tab->param ? unserialize($tab->param) : '');
+        			$list[$tab->elementtype][$tab->name]['pos']=$tab->pos;
+        			$list[$tab->elementtype][$tab->name]['alwayseditable']=$tab->alwayseditable;
+        			$list[$tab->elementtype][$tab->name]['perms']=$tab->perms;
+        			$list[$tab->elementtype][$tab->name]['list']=$tab->list;
+        			$list[$tab->elementtype][$tab->name]['ishidden']=$tab->ishidden;
+        		}
+        	}
+        }
+        else
+        {
+            throw new RestException(503, 'Error when retrieving list of extra fields : '.$this->db->lasterror());
+        }
+
+        if (! count($list))
+        {
+        	throw new RestException(404, 'No extrafield found');
+        }
+
+        return $list;
+    }
+
+}

From 48866f07325c1374c1f8112382674f1160b3a74c Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Sat, 17 Jun 2017 14:43:31 +0200
Subject: [PATCH 255/438] Fix: wrong array format

---
 htdocs/core/class/extrafields.class.php | 46 ++++++++++++-------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 4b5f151ec72..24be010ff4c 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1,13 +1,13 @@
 <?php
-/* Copyright (C) 2002-2003  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
- * Copyright (C) 2002-2003  Jean-Louis Bergamo      <jlb@j1b.org>
- * Copyright (C) 2004       Sebastien Di Cintio     <sdicintio@ressource-toi.org>
- * Copyright (C) 2004       Benoit Mortier          <benoit.mortier@opensides.be>
- * Copyright (C) 2009-2012  Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2009-2012  Regis Houssin           <regis.houssin@capnetworks.com>
- * Copyright (C) 2013       Florian Henry           <forian.henry@open-concept.pro>
- * Copyright (C) 2015       Charles-Fr BENKE        <charles.fr@benke.fr>
- * Copyright (C) 2016       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
+/* Copyright (C) 2002-2003	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2002-2003	Jean-Louis Bergamo		<jlb@j1b.org>
+ * Copyright (C) 2004		Sebastien Di Cintio		<sdicintio@ressource-toi.org>
+ * Copyright (C) 2004		Benoit Mortier			<benoit.mortier@opensides.be>
+ * Copyright (C) 2009-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2009-2017	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2013		Florian Henry			<forian.henry@open-concept.pro>
+ * Copyright (C) 2015		Charles-Fr BENKE		<charles.fr@benke.fr>
+ * Copyright (C) 2016		Raphaël Doursenaud		<rdoursenaud@gpcsolutions.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -702,20 +702,20 @@ class ExtraFields
 					$this->attribute_hidden[$tab->name]=$tab->ishidden;
 
 					// New usage
-					$this->attributes[$tab->elementtype]['type'][$tab->name]=$tab->type;
-					$this->attributes[$tab->elementtype]['label'][$tab->name]=$tab->label;
-					$this->attributes[$tab->elementtype]['size'][$tab->name]=$tab->size;
-					$this->attributes[$tab->elementtype]['elementtype'][$tab->name]=$tab->elementtype;
-					$this->attributes[$tab->elementtype]['default'][$tab->name]=$tab->fielddefault;
-					$this->attributes[$tab->elementtype]['computed'][$tab->name]=$tab->fieldcomputed;
-					$this->attributes[$tab->elementtype]['unique'][$tab->name]=$tab->fieldunique;
-					$this->attributes[$tab->elementtype]['required'][$tab->name]=$tab->fieldrequired;
-					$this->attributes[$tab->elementtype]['param'][$tab->name]=($tab->param ? unserialize($tab->param) : '');
-					$this->attributes[$tab->elementtype]['pos'][$tab->name]=$tab->pos;
-					$this->attributes[$tab->elementtype]['alwayseditable'][$tab->name]=$tab->alwayseditable;
-					$this->attributes[$tab->elementtype]['perms'][$tab->name]=$tab->perms;
-					$this->attributes[$tab->elementtype]['list'][$tab->name]=$tab->list;
-					$this->attributes[$tab->elementtype]['ishidden'][$tab->name]=$tab->ishidden;
+					$this->attributes[$tab->elementtype][$tab->name]['type']=$tab->type;
+					$this->attributes[$tab->elementtype][$tab->name]['label']=$tab->label;
+					$this->attributes[$tab->elementtype][$tab->name]['size']=$tab->size;
+					$this->attributes[$tab->elementtype][$tab->name]['elementtype']=$tab->elementtype;
+					$this->attributes[$tab->elementtype][$tab->name]['default']=$tab->fielddefault;
+					$this->attributes[$tab->elementtype][$tab->name]['computed']=$tab->fieldcomputed;
+					$this->attributes[$tab->elementtype][$tab->name]['unique']=$tab->fieldunique;
+					$this->attributes[$tab->elementtype][$tab->name]['required']=$tab->fieldrequired;
+					$this->attributes[$tab->elementtype][$tab->name]['param']=($tab->param ? unserialize($tab->param) : '');
+					$this->attributes[$tab->elementtype][$tab->name]['pos']=$tab->pos;
+					$this->attributes[$tab->elementtype][$tab->name]['alwayseditable']=$tab->alwayseditable;
+					$this->attributes[$tab->elementtype][$tab->name]['perms']=$tab->perms;
+					$this->attributes[$tab->elementtype][$tab->name]['list']=$tab->list;
+					$this->attributes[$tab->elementtype][$tab->name]['ishidden']=$tab->ishidden;
 				}
 			}
 			if ($elementtype) $this->attributes[$elementtype]['loaded']=1;

From 12cab2dfe08695f75199afb84779c84b897101e9 Mon Sep 17 00:00:00 2001
From: BENKE Charlene <charles.fr@benke.fr>
Date: Sat, 17 Jun 2017 16:30:03 +0200
Subject: [PATCH 256/438] Once to Ounce

---
 htdocs/core/lib/product.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index 16bedc4d346..7048b8570c6 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -441,7 +441,7 @@ function measuring_units_string($unit,$measuring_style='')
 		$measuring_units[0] = $langs->transnoentitiesnoconv("WeightUnitkg");
 		$measuring_units[-3] = $langs->transnoentitiesnoconv("WeightUnitg");
 		$measuring_units[-6] = $langs->transnoentitiesnoconv("WeightUnitmg");
-		$measuring_units[98] = $langs->transnoentitiesnoconv("WeightUnitonce");
+		$measuring_units[98] = $langs->transnoentitiesnoconv("WeightUnitounce");
 		$measuring_units[99] = $langs->transnoentitiesnoconv("WeightUnitpound");
 	}
 	else if ($measuring_style == 'size')

From db173632674e7fd6ae22c0965ae8e9361b607502 Mon Sep 17 00:00:00 2001
From: BENKE Charlene <charles.fr@benke.fr>
Date: Sat, 17 Jun 2017 16:30:37 +0200
Subject: [PATCH 257/438] Update other.lang

---
 htdocs/langs/en_US/other.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 120b1dcd790..bf01ba734f3 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -123,7 +123,7 @@ WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
 WeightUnitpound=pound
-WeightUnitonce=once
+WeightUnitounce=ounce
 Length=Length
 LengthUnitm=m
 LengthUnitdm=dm

From fcdf68db6a1175f2faa5e9a95afef05398c29fb5 Mon Sep 17 00:00:00 2001
From: BENKE Charlene <charles.fr@benke.fr>
Date: Sat, 17 Jun 2017 16:31:54 +0200
Subject: [PATCH 258/438] Update commonobject.class.php

---
 htdocs/core/class/commonobject.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index bd5d8a6b831..b87b3d28ea8 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3099,11 +3099,11 @@ abstract class CommonObject
             }
             else {
 		if ($weight_units == 99) {
-			// conversion 1 Livre = 0.45359237 KG
+			// conversion 1 Pound = 0.45359237 KG
 			$trueWeightUnit = 0.45359237;
 			$totalWeight += $weight * $qty * $trueWeightUnit;
 		} elseif ($weight_units == 98) {
-			// conversion 1 once = 0.0283495 KG
+			// conversion 1 Ounce = 0.0283495 KG
 			$trueWeightUnit = 0.0283495;
 			$totalWeight += $weight * $qty * $trueWeightUnit;
 		}

From 04821376200381ef232947147b8063bf189c2f9b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 17 Jun 2017 18:03:53 +0200
Subject: [PATCH 259/438] Fix warning

---
 htdocs/install/inc.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index dc7e29b19f5..b9efc4eb8a4 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -385,12 +385,12 @@ function pHeader($subtitle,$next,$action='set',$param='',$forcejqueryurl='',$css
     // We force the content charset
     header("Content-type: text/html; charset=".$conf->file->character_set_client);
     header("X-Content-Type-Options: nosniff");
-    
+
     print '<!DOCTYPE HTML>'."\n";
     print '<html>'."\n";
     print '<head>'."\n";
     print '<meta charset='.$conf->file->character_set_client.'">'."\n";
-    print '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n";  
+    print '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n";
     print '<link rel="stylesheet" type="text/css" href="default.css">'."\n";
 
     print '<!-- Includes CSS for JQuery -->'."\n";
@@ -453,7 +453,7 @@ function pFooter($nonext=0,$setuplang='',$jscheckfunction='', $withpleasewait=0)
         print '<div class="nextbutton" id="nextbutton">';
         if ($nonext == '2')
 		{
-			print $langs->trans("ErrorFoundDuringMigration", $_SERVER["REQUEST_URI"].'&ignoreerrors=1').'<br><br>';
+			print $langs->trans("ErrorFoundDuringMigration", isset($_SERVER["REQUEST_URI"])?$_SERVER["REQUEST_URI"].'&ignoreerrors=1':'').'<br><br>';
 		}
 
         print '<input type="submit" '.($nonext == '2' ? 'disabled="disabled" ':'').'value="'.$langs->trans("NextStep").' ->"';

From 285b5563d66cb0cde3f20ad86e23641a0f4bf4dd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 17 Jun 2017 18:23:26 +0200
Subject: [PATCH 260/438] Update changelog

---
 ChangeLog | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 78793b9d419..c43fd92f676 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,22 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------
 
+***** ChangeLog for 5.0.4 compared to 5.0.3 *****
+FIX: #6880
+FIX: #6925
+FIX: #6926
+FIX: Can set supplier invoice to billed.
+FIX: Can't create invoice if PO disapproved
+FIX: contratligne update
+FIX: CVE-2017-7886
+FIX: default param
+FIX: Line of invoices not inserted when using POS module and VAT NPR.
+FIX: origin & originid on supplierproposal
+FIX: Redirect to payment page from member subscription page failed if a unique security key was defined.
+FIX: REST api to get project when user has permission to read all.
+FIX: situation_progress param default value must be 100 and not 0
+FIX: SQL injection on user/index.php parameter search_statut.
+FIX: Warnings
 
 ***** ChangeLog for 5.0.3 compared to 5.0.2 *****
 FIX: #6677 Expired contracts dashboard box does not show the name of the thirdparty

From fd9c30fd11ca2faa2b838977fd81219273d4d362 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Sat, 17 Jun 2017 18:30:11 +0200
Subject: [PATCH 261/438] Revert "Fix: wrong array format"

This reverts commit 48866f07325c1374c1f8112382674f1160b3a74c.
---
 htdocs/core/class/extrafields.class.php | 46 ++++++++++++-------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 24be010ff4c..4b5f151ec72 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1,13 +1,13 @@
 <?php
-/* Copyright (C) 2002-2003	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2002-2003	Jean-Louis Bergamo		<jlb@j1b.org>
- * Copyright (C) 2004		Sebastien Di Cintio		<sdicintio@ressource-toi.org>
- * Copyright (C) 2004		Benoit Mortier			<benoit.mortier@opensides.be>
- * Copyright (C) 2009-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2009-2017	Regis Houssin			<regis.houssin@capnetworks.com>
- * Copyright (C) 2013		Florian Henry			<forian.henry@open-concept.pro>
- * Copyright (C) 2015		Charles-Fr BENKE		<charles.fr@benke.fr>
- * Copyright (C) 2016		Raphaël Doursenaud		<rdoursenaud@gpcsolutions.fr>
+/* Copyright (C) 2002-2003  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2002-2003  Jean-Louis Bergamo      <jlb@j1b.org>
+ * Copyright (C) 2004       Sebastien Di Cintio     <sdicintio@ressource-toi.org>
+ * Copyright (C) 2004       Benoit Mortier          <benoit.mortier@opensides.be>
+ * Copyright (C) 2009-2012  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2009-2012  Regis Houssin           <regis.houssin@capnetworks.com>
+ * Copyright (C) 2013       Florian Henry           <forian.henry@open-concept.pro>
+ * Copyright (C) 2015       Charles-Fr BENKE        <charles.fr@benke.fr>
+ * Copyright (C) 2016       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -702,20 +702,20 @@ class ExtraFields
 					$this->attribute_hidden[$tab->name]=$tab->ishidden;
 
 					// New usage
-					$this->attributes[$tab->elementtype][$tab->name]['type']=$tab->type;
-					$this->attributes[$tab->elementtype][$tab->name]['label']=$tab->label;
-					$this->attributes[$tab->elementtype][$tab->name]['size']=$tab->size;
-					$this->attributes[$tab->elementtype][$tab->name]['elementtype']=$tab->elementtype;
-					$this->attributes[$tab->elementtype][$tab->name]['default']=$tab->fielddefault;
-					$this->attributes[$tab->elementtype][$tab->name]['computed']=$tab->fieldcomputed;
-					$this->attributes[$tab->elementtype][$tab->name]['unique']=$tab->fieldunique;
-					$this->attributes[$tab->elementtype][$tab->name]['required']=$tab->fieldrequired;
-					$this->attributes[$tab->elementtype][$tab->name]['param']=($tab->param ? unserialize($tab->param) : '');
-					$this->attributes[$tab->elementtype][$tab->name]['pos']=$tab->pos;
-					$this->attributes[$tab->elementtype][$tab->name]['alwayseditable']=$tab->alwayseditable;
-					$this->attributes[$tab->elementtype][$tab->name]['perms']=$tab->perms;
-					$this->attributes[$tab->elementtype][$tab->name]['list']=$tab->list;
-					$this->attributes[$tab->elementtype][$tab->name]['ishidden']=$tab->ishidden;
+					$this->attributes[$tab->elementtype]['type'][$tab->name]=$tab->type;
+					$this->attributes[$tab->elementtype]['label'][$tab->name]=$tab->label;
+					$this->attributes[$tab->elementtype]['size'][$tab->name]=$tab->size;
+					$this->attributes[$tab->elementtype]['elementtype'][$tab->name]=$tab->elementtype;
+					$this->attributes[$tab->elementtype]['default'][$tab->name]=$tab->fielddefault;
+					$this->attributes[$tab->elementtype]['computed'][$tab->name]=$tab->fieldcomputed;
+					$this->attributes[$tab->elementtype]['unique'][$tab->name]=$tab->fieldunique;
+					$this->attributes[$tab->elementtype]['required'][$tab->name]=$tab->fieldrequired;
+					$this->attributes[$tab->elementtype]['param'][$tab->name]=($tab->param ? unserialize($tab->param) : '');
+					$this->attributes[$tab->elementtype]['pos'][$tab->name]=$tab->pos;
+					$this->attributes[$tab->elementtype]['alwayseditable'][$tab->name]=$tab->alwayseditable;
+					$this->attributes[$tab->elementtype]['perms'][$tab->name]=$tab->perms;
+					$this->attributes[$tab->elementtype]['list'][$tab->name]=$tab->list;
+					$this->attributes[$tab->elementtype]['ishidden'][$tab->name]=$tab->ishidden;
 				}
 			}
 			if ($elementtype) $this->attributes[$elementtype]['loaded']=1;

From a6b4b15e07a29934b483c93b8487eb6b7dee0218 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 17 Jun 2017 19:40:48 +0200
Subject: [PATCH 262/438] Work on modulebuilder

---
 htdocs/langs/en_US/modulebuilder.lang         |   6 +-
 htdocs/modulebuilder/index.php                | 142 +++++++++++++++++-
 .../modulebuilder/template/class/MyObject.txt |   1 +
 ...class.class.php => api_myobject.class.php} |   0
 .../template/class/myobject.class.php         |   4 +-
 ...bject_mymodule.png => object_myobject.png} | Bin
 6 files changed, 148 insertions(+), 5 deletions(-)
 create mode 100644 htdocs/modulebuilder/template/class/MyObject.txt
 rename htdocs/modulebuilder/template/class/{myobject_api_class.class.php => api_myobject.class.php} (100%)
 rename htdocs/modulebuilder/template/img/{myobject_mymodule.png => object_myobject.png} (100%)

diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index adce0950b88..b8300182b05 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -1,11 +1,15 @@
 # Dolibarr language file - Source file is en_US - loan
 ModuleBuilderDesc=This tools give you utilites to build or edit your own module.
-EnterNameOfModuleDesc=Enter name of the module to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
+EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
+EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...)
 ModuleBuilderDesc2=Path were modules are generated/edited (first alternative directory defined into %s): <strong>%s</strong>
 ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong> (they are detected as editable when the file <strong>%s</strong> exists in root of module directory). 
 NewModule=New module
+NewObject=New object
 ModuleKey=Key for new module
+ObjectKey=Key for new object
 ModuleInitialized=Module initialized
+FilesForObjectInitialized=Files for new object initialized
 ModuleBuilderDescdescription=Enter here all general information that describe your module
 ModuleBuilderDescobjects=Define here the new objects you want to manage with your module. A page to list them and a page to create/edit/view a card will be generated.
 ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 8cabec1bdfb..0f60d76ca4f 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -33,11 +33,13 @@ $action=GETPOST('action','aZ09');
 $confirm=GETPOST('confirm','alpha');
 $module=GETPOST('module','alpha');
 $tab=GETPOST('tab','aZ09');
+$tabobj=GETPOST('tabobj','alpha');
 if (empty($module)) $module='initmodule';
 if (empty($tab)) $tab='description';
+if (empty($tabobj)) $tabobj='newobject';
 
 $modulename=dol_sanitizeFileName(GETPOST('modulename','alpha'));
-
+$objectname=dol_sanitizeFileName(GETPOST('objectname','alpha'));
 
 // Security check
 if (! $user->admin && empty($conf->global->MODULEBUILDER_FOREVERYONE)) accessforbidden('ModuleBuilderNotAllowed');
@@ -80,6 +82,18 @@ if ($dirins && $action == 'initmodule' && $modulename)
     	}
     }
 
+    // Delete some files
+    dol_delete_file($destdir.'/myobject_card.php');
+    dol_delete_file($destdir.'/myobject_list.php');
+    dol_delete_file($destdir.'/test/phpunit/MyObjectTest.php');
+    dol_delete_file($destdir.'/sql/llx_myobject.key.sql');
+    dol_delete_file($destdir.'/sql/llx_myobject.sql');
+    dol_delete_file($destdir.'/scripts/myobject.php');
+    dol_delete_file($destdir.'/img/object_myobject.png');
+    dol_delete_file($destdir.'/class/myobject.class.php');
+    dol_delete_file($destdir.'/class/api_myobject.class.php');
+    dol_delete_file($destdir.'/class/MyObject.txt');
+
     // Edit PHP files
     if (! $error)
     {
@@ -113,6 +127,86 @@ if ($dirins && $action == 'initmodule' && $modulename)
     }
 }
 
+if ($dirins && $action == 'initobject' && $module && $objectname)
+{
+    $srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
+    $destdir = $dirins.'/'.strtolower($module);
+
+    $arrayreplacement=array(
+        'mymodule'=>strtolower($module),
+        'MyModule'=>$module,
+        'myobject'=>strtolower($objectname),
+        'MyObject'=>$objectname
+    );
+
+
+    // Delete some files
+    $filetogenerate = array(
+        'myobject_card.php'=>strtolower($objectname).'_card.php',
+        'myobject_list.php'=>strtolower($objectname).'_list.php',
+        'test/phpunit/MyObjectTest.php'=>'test/phpunit/'.$objectname.'Test.php',
+        'sql/llx_myobject.key.sql'=>'sql/llx_'.strtolower($objectname).'.key.sql',
+        'sql/llx_myobject.sql'=>'sql/llx_'.strtolower($objectname).'.sql',
+        'scripts/myobject.php'=>'scripts/'.strtolower($objectname).'.php',
+        'img/object_myobject.png'=>'img/object_'.strtolower($objectname).'.png',
+        'class/myobject.class.php'=>'class/'.strtolower($objectname).'.class.php',
+        'class/api_myobject.class.php'=>'class/api_'.strtolower($objectname).'.class.php',
+        'class/MyObject.txt'=>'class/'.$objectname.'.txt'
+    );
+
+    foreach($filetogenerate as $srcfile => $destfile)
+    {
+        $result = dol_copy($srcdir.'/'.$srcfile, $destdir.'/'.$destfile);
+        if ($result <= 0)
+        {
+            if ($result < 0)
+            {
+                $error++;
+                $langs->load("errors");
+                setEventMessages($langs->trans("ErrorFailToCopyFile", $srcdir.'/'.$srcfile, $destdir.'/'.$destfile), null, 'errors');
+            }
+            else	// $result == 0
+            {
+                setEventMessages($langs->trans("FileAlreadyExists", $srcdir.'/'.$srcfile, $destdir.'/'.$destfile), null, 'warnings');
+            }
+        }
+        else
+        {
+            // Copy is ok
+        }
+    }
+
+    // Edit PHP files
+    foreach($filetogenerate as $destfile)
+    {
+        $phpfileval['fullname'] = $destdir.'/'.$destfile;
+
+        //var_dump($phpfileval['fullname']);
+        $arrayreplacement=array(
+            'mymodule'=>strtolower($modulename),
+            'MyModule'=>$modulename,
+            'MYMODULE'=>strtoupper($modulename),
+            'My module'=>$modulename,
+            'htdocs/modulebuilder/template/'=>'',
+            'myobject'=>strtolower($objectname),
+            'MyObject'=>$objectname
+        );
+
+        $result=dolReplaceInFile($phpfileval['fullname'], $arrayreplacement);
+        //var_dump($result);
+        if ($result < 0)
+        {
+            setEventMessages($langs->trans("ErrorFailToMakeReplacementInto", $phpfileval['fullname']), null, 'errors');
+        }
+    }
+
+    if (! $error)
+    {
+        setEventMessages('FilesForObjectInitialized', null);
+    }
+}
+
+
 if ($dirins && $action == 'confirm_delete')
 {
     $modulelowercase=strtolower($module);
@@ -485,9 +579,53 @@ elseif (! empty($module))
 
         if ($tab == 'objects')
         {
-    		print $langs->trans("FeatureNotYetAvailable");
 
+            $head3 = array();
+            $h=0;
 
+            $modulelowercase=strtolower($module);
+
+            // Dir for module
+            $dir = $dirins.'/'.$modulelowercase.'/class';
+
+            $head3[$h][0] = $_SERVER["PHP_SELF"].'?tab=objects&module='.$module.'&tabobj=newobject';
+            $head3[$h][1] = $langs->trans("NewObject");
+            $head3[$h][2] = 'newobject';
+            $h++;
+
+            $listofobject = dol_dir_list($dir , 'files', 0, '\.txt$');
+            foreach($listofobject as $fileobj)
+            {
+                $objectname = preg_replace('/\.txt$/', '', $fileobj['name']);
+
+                $head3[$h][0] = $_SERVER["PHP_SELF"].'?tab=objects&module='.$module.'&tabobj='.$objectname;
+                $head3[$h][1] = $objectname;
+                $head3[$h][2] = $objectname;
+                $h++;
+            }
+
+            dol_fiche_head($head3, $tabobj, '', -1, '');
+
+            if ($tabobj == 'newobject')
+            {
+                // New module
+                print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+                print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                print '<input type="hidden" name="action" value="initobject">';
+                print '<input type="hidden" name="tab" value="objects">';
+                print '<input type="hidden" name="module" value="'.dol_escape_htmltag($module).'">';
+
+                print $langs->trans("EnterNameOfObjectDesc").'<br><br>';
+
+                print '<input type="text" name="objectname" value="'.dol_escape_htmltag($modulename).'" placeholder="'.dol_escape_htmltag($langs->trans("ObjectKey")).'">';
+                print '<input type="submit" class="button" name="create" value="'.dol_escape_htmltag($langs->trans("Create")).'"'.($dirins?'':' disabled="disabled"').'>';
+                print '</form>';
+            }
+
+            if ($tabobj == 'fields')
+            {
+                print $langs->trans("FeatureNotYetAvailable").'<br><br>';
+            }
         }
 
         if ($tab == 'menus')
diff --git a/htdocs/modulebuilder/template/class/MyObject.txt b/htdocs/modulebuilder/template/class/MyObject.txt
new file mode 100644
index 00000000000..37ccaca81ed
--- /dev/null
+++ b/htdocs/modulebuilder/template/class/MyObject.txt
@@ -0,0 +1 @@
+# If this file exists, it means the class and file for object MyOjbect was generated by ModuleBuilder.
\ No newline at end of file
diff --git a/htdocs/modulebuilder/template/class/myobject_api_class.class.php b/htdocs/modulebuilder/template/class/api_myobject.class.php
similarity index 100%
rename from htdocs/modulebuilder/template/class/myobject_api_class.class.php
rename to htdocs/modulebuilder/template/class/api_myobject.class.php
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index f2d4daee8d4..9e66b9410f6 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -31,11 +31,11 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
 //require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 
 /**
- * Class MyModuleObject
+ * Class MyObject
  *
  * Put here description of your class.
  */
-class MyModuleObject extends CommonObject
+class MyObject extends CommonObject
 {
 	/**
 	 * @var string Id to identify managed object
diff --git a/htdocs/modulebuilder/template/img/myobject_mymodule.png b/htdocs/modulebuilder/template/img/object_myobject.png
similarity index 100%
rename from htdocs/modulebuilder/template/img/myobject_mymodule.png
rename to htdocs/modulebuilder/template/img/object_myobject.png

From 69b26dcb4ebea5a36cd6dcfb9fbf4ced48a910de Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 17 Jun 2017 21:23:52 +0200
Subject: [PATCH 263/438] Work on modulebuilder

---
 htdocs/langs/en_US/modulebuilder.lang         |  10 +-
 htdocs/modulebuilder/index.php                | 152 ++++++++++++++++--
 .../template/class/myobject.class.php         |  22 ++-
 3 files changed, 159 insertions(+), 25 deletions(-)

diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index b8300182b05..8d9a31cfdf7 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -17,7 +17,7 @@ ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions
 ModuleBuilderDesctriggers=This is the view of triggers provided by your module. To include code executed when a triggered business event is launched, just edit this file with your IDE.
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
-ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module. Just click on button to get your module package file.
+ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module. Just click on button to build the module package file.
 ModuleBuilderDescdangerzone=You can delete your module. WARNING: All files of module will be definetly lost !
 DangerZone=Danger zone
 BuildPackage=Build package
@@ -25,4 +25,10 @@ ModuleIsNotActive=This module was not activated yet (go into Home-Setup-Module t
 ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
 DescriptionLong=Long description
 EditorName=Name of editor
-EditorUrl=URL of editor
\ No newline at end of file
+EditorUrl=URL of editor
+DescriptorFile=Descriptor file of module
+ClassFile=File for PHP class
+ApiClassFile=File for PHP API class
+PageForList=PHP page for list of record
+PageForCreateEditView=PHP page to create/edit/view a record
+PathToModulePackage=Path to zip of module/application package
\ No newline at end of file
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 0f60d76ca4f..d9ae491b654 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -454,7 +454,9 @@ elseif (! empty($module))
         $head2 = array();
         $h=0;
 
-       	$modulestatusinfo=img_info('').' '.$langs->trans("ModuleIsNotActive");
+        $modulelowercase=strtolower($module);
+
+        $modulestatusinfo=img_info('').' '.$langs->trans("ModuleIsNotActive");
         if (! empty($conf->$module->enabled))
         {
         	$modulestatusinfo=img_warning().' '.$langs->trans("ModuleIsLive");
@@ -513,7 +515,12 @@ elseif (! empty($module))
 
         if ($tab == 'description')
         {
-        	print '<div class="underbanner clearboth"></div>';
+            $pathtofile = $modulelowercase.'/core/modules/mod'.$module.'.class.php';
+
+            print '<span class="fa fa-file"></span> '.$langs->trans("DescriptorFile").' : <strong>'.$pathtofile.'</strong><br>';
+            print '<br>';
+
+            print '<div class="underbanner clearboth"></div>';
         	print '<div class="fichecenter">';
 
         	print '<table class="border centpercent">';
@@ -579,12 +586,9 @@ elseif (! empty($module))
 
         if ($tab == 'objects')
         {
-
             $head3 = array();
             $h=0;
 
-            $modulelowercase=strtolower($module);
-
             // Dir for module
             $dir = $dirins.'/'.$modulelowercase.'/class';
 
@@ -621,10 +625,92 @@ elseif (! empty($module))
                 print '<input type="submit" class="button" name="create" value="'.dol_escape_htmltag($langs->trans("Create")).'"'.($dirins?'':' disabled="disabled"').'>';
                 print '</form>';
             }
-
-            if ($tabobj == 'fields')
+            else
             {
-                print $langs->trans("FeatureNotYetAvailable").'<br><br>';
+                try {
+                    $pathtoclass = strtolower($module).'/class/'.strtolower($tabobj).'.class.php';
+                    $pathtoapi = strtolower($module).'/class/api_'.strtolower($tabobj).'.class.php';
+                    $pathtolist = strtolower($module).'/'.strtolower($tabobj).'_list.class.php';
+                    $pathtocard = strtolower($module).'/'.strtolower($tabobj).'_card.class.php';
+                    print '<span class="fa fa-file"></span> '.$langs->trans("ClassFile").' : <strong>'.$pathtoclass.'</strong><br>';
+                    print '<span class="fa fa-file"></span> '.$langs->trans("ApiClassFile").' : <strong>'.$pathtoapi.'</strong><br>';
+                    print '<span class="fa fa-file"></span> '.$langs->trans("PageForList").' : <strong>'.$pathtolist.'</strong><br>';
+                    print '<span class="fa fa-file"></span> '.$langs->trans("PageForCreateEditView").' : <strong>'.$pathtocard.'</strong><br>';
+
+                    $result = dol_include_once($pathtoclass);
+                    $tmpobjet = new $tabobj($db);
+
+                    $reflector = new ReflectionClass($tabobj);
+                    $properties = $reflector->getProperties();
+                    $propdefault = $reflector->getDefaultProperties();
+
+                    print load_fiche_titre($langs->trans("Properties"), '', '');
+
+                    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+                    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                    print '<input type="hidden" name="action" value="initobject">';
+                    print '<input type="hidden" name="tab" value="objects">';
+                    print '<input type="hidden" name="module" value="'.dol_escape_htmltag($module).'">';
+                    print '<input type="hidden" name="tabobj" value="'.dol_escape_htmltag($tabobj).'">';
+
+                    print '<table class="noborder">';
+                    print '<tr class="liste_titre">';
+                    print '<td>'.$langs->trans("Property").'</td>';
+                    print '<td>'.$langs->trans("Description").'</td>';
+                    print '<td>'.$langs->trans("Type").'</td>';
+                    print '<td>'.$langs->trans("DefaultValue").'</td>';
+                    print '<td></td>';
+                    print '</tr>';
+                    print '<tr>';
+                    print '<td><input class="text" name="propname" value=""></td>';
+                    print '<td><input class="text" name="propname" value=""></td>';
+                    print '<td><input class="text" name="propname" value=""></td>';
+                    print '<td><input class="text" name="propname" value=""></td>';
+                    print '<td align="center">';
+                    print '<input class="button" type="submit" name="add" value="'.$langs->trans("Add").'">';
+                    print '</td></tr>';
+                    foreach($properties as $propkey => $propval)
+                    {
+                        if ($propval->class == $tabobj)
+                        {
+                            $propname=$propval->getName();
+
+                            // Discard generic properties
+                            if (in_array($propname, array('element', 'table_element', 'table_element_line', 'class_element_line', 'ismultientitymanaged'))) continue;
+
+                            // Keep or not lines
+                            if (in_array($propname, array('fk_element', 'lines'))) continue;
+
+
+                            print '<tr class="oddeven"><td>';
+                            print $propname;
+                            print '</td>';
+                            print '<td>';
+
+                            print '</td>';
+
+                            print '<td>';
+
+                            print '</td>';
+
+                            print '<td>';
+                            print $propdefault[$propname];
+                            print '</td>';
+
+                            print '<td>';
+
+                            print '</td>';
+                            print '</tr>';
+                        }
+                    }
+                    print '</table>';
+
+                    print '</form>';
+                }
+                catch(Exception $e)
+                {
+                    print $e->getMessage();
+                }
             }
         }
 
@@ -666,10 +752,9 @@ elseif (! empty($module))
 			$var=True;
 			foreach ($triggers as $trigger)
 			{
-
 				print '<tr class="oddeven">';
 				print '<td valign="top" width="14" align="center">'.$trigger['picto'].'</td>';
-				print '<td class="tdtop">'.$trigger['file'].'</td>';
+				print '<td class="tdtop">'.$trigger['relpath'].'</td>';
 				print '<td valign="top" align="center">'.$trigger['status'].'</td>';
 				print '<td class="tdtop">';
 				$text=$trigger['info'];
@@ -698,11 +783,56 @@ elseif (! empty($module))
                 print '<br>';
             }
 
+            $modulelowercase=strtolower($module);
+
+            // Zip file to build
+            $FILENAMEZIP='';
+
+            // Load module
+            dol_include_once($modulelowercase.'/core/modules/mod'.$module.'.class.php');
+            $class='mod'.$module;
+
+            if (class_exists($class))
+            {
+                try {
+                    $moduleobj = new $class($db);
+                }
+                catch(Exception $e)
+                {
+                    $error++;
+                    dol_print_error($e->getMessage());
+                }
+            }
+            else
+            {
+                $error++;
+                $langs->load("errors");
+                dol_print_error($langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module));
+                exit;
+            }
+
+            $arrayversion=explode('.',$moduleobj->version,3);
+            if (count($arrayversion))
+            {
+                $FILENAMEZIP="module_".$modulelowercase.'-'.$arrayversion[0].'.'.$arrayversion[1].($arrayversion[2]?".".$arrayversion[2]:"").".zip";
+                $outputfile = $conf->admin->dir_temp.'/'.$FILENAMEZIP;
+            }
+
+            print '<span class="fa fa-file"></span> '. $langs->trans("PathToModulePackage") . ' : ';
+            if (! dol_is_file($outputfile)) print '<strong>'.$langs->trans("PackageFileNotYetGenerated").'</strong>';
+            else {
+                print '<strong>'.$outputfile.'</strong>';
+                print ' ('.$langs->trans("GeneratedOn").' '.dol_print_date(dol_filemtime($outputfile), 'dayhour').')';
+            }
+            print '</strong><br>';
+
+            print '<br><br>';
+
         	print '<form name="generatepackage">';
         	print '<input type="hidden" name="action" value="generatepackage">';
         	print '<input type="hidden" name="tab" value="'.dol_escape_htmltag($tab).'">';
         	print '<input type="hidden" name="module" value="'.dol_escape_htmltag($module).'">';
-        	print '<input type="submit" class="button" value="'.$langs->trans("Generate").'">';
+        	print '<input type="submit" class="button" value="'.$langs->trans("BuildPackage").'">';
         	print '</form>';
         }
 
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 9e66b9410f6..4993f60f83c 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -21,8 +21,8 @@
 
 /**
  * \file        htdocs/modulebuilder/template/class/myobject.class.php
- * \ingroup     mymodule othermodule1 othermodule2
- * \brief       This file is an example for a CRUD class file (Create/Read/Update/Delete)
+ * \ingroup     mymodule
+ * \brief       This file is a CRUD class file for MyObject (Create/Read/Update/Delete)
  */
 
 // Put here all includes required by your class file
@@ -31,24 +31,22 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
 //require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 
 /**
- * Class MyObject
- *
- * Put here description of your class.
+ * Class for MyObject
  */
 class MyObject extends CommonObject
 {
 	/**
 	 * @var string Id to identify managed object
 	 */
-	public $element = 'mymoduleobject';
+	public $element = 'myobject';
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element = 'mymoduleobject';
+	public $table_element = 'myobject';
     /**
      * @var array Array with all fields and their property
      */
-	public $picto = 'generic';
+	public $picto = 'myobject';
     /**
      * @var array Array with all fields and their property
      */
@@ -67,12 +65,12 @@ class MyObject extends CommonObject
 
 	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 
-	public $table_element_line = 'mymoduleobjectdet';
-    public $class_element_line = 'MyModuleObjectline';
-    public $fk_element = 'fk_mymoduleobject';
+	public $table_element_line = 'myobjectdet';
+    public $class_element_line = 'MyObjectline';
+    public $fk_element = 'fk_myobject';
 
     /**
-	 * @var MyModuleObjectLine[] Lines
+	 * @var MyObjectLine[] Lines
 	 */
 	public $lines = array();
 

From 862b12abfd4bef2915abf492dd6fb7790657d234 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 17 Jun 2017 21:28:29 +0200
Subject: [PATCH 264/438] Fix responsive

---
 htdocs/opensurvey/card.php | 42 +++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php
index 18326321a4b..c634ca1ceaa 100644
--- a/htdocs/opensurvey/card.php
+++ b/htdocs/opensurvey/card.php
@@ -67,48 +67,48 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 if (empty($reshook))
 {
     if ($cancel) $action='';
-    
+
     // Delete
     if ($action == 'delete_confirm')
     {
     	// Security check
     	if (!$user->rights->opensurvey->write) accessforbidden();
-    
+
     	$result=$object->delete($user,'',$numsondage);
-    
+
     	header('Location: '.dol_buildpath('/opensurvey/list.php',1));
     	exit();
     }
-    
+
     // Close
     if ($action == 'close')
     {
         $object->status = Opensurveysondage::STATUS_CLOSED;
         $object->update($user);
     }
-    
+
     // Reopend
     if ($action == 'reopen')
     {
         $object->status = Opensurveysondage::STATUS_VALIDATED;
         $object->update($user);
     }
-    
+
     // Update
     if ($action == 'update')
     {
     	// Security check
     	if (!$user->rights->opensurvey->write) accessforbidden();
-    
+
     	$error=0;
-    
+
     	if (! GETPOST('nouveautitre'))
     	{
     		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Title")), null, 'errors');
     		$error++;
     		$action = 'edit';
     	}
-    
+
     	if (! $error)
     	{
     		$object->titre = GETPOST('nouveautitre');
@@ -118,7 +118,7 @@ if (empty($reshook))
     		$object->allow_comments = GETPOST('cancomment') == 'on' ? true : false;
     		$object->allow_spy = GETPOST('canseeothersvote') == 'on' ? true : false;
     		$object->mailsonde = GETPOST('mailsonde') == 'on' ? true : false;
-    
+
     		$res=$object->update($user);
     		if ($res < 0)
     		{
@@ -132,7 +132,7 @@ if (empty($reshook))
     if (GETPOST('ajoutcomment'))
     {
     	$error=0;
-    
+
     	if (! GETPOST('comment'))
     	{
     		$error++;
@@ -143,33 +143,33 @@ if (empty($reshook))
     		$error++;
     		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("User")), null, 'errors');
     	}
-    
+
     	if (! $error)
     	{
     		$comment = GETPOST("comment");
     		$comment_user = GETPOST('commentuser');
-    
+
     		$resql = $object->addComment($comment, $comment_user);
-    
+
     		if (! $resql)
     		{
     			setEventMessages($langs->trans('ErrorInsertingComment'), null, 'errors');
     		}
     	}
     }
-    
+
     // Delete comment
     $idcomment=GETPOST('deletecomment','int');
     if ($idcomment)
     {
     	// Security check
     	if (!$user->rights->opensurvey->write) accessforbidden();
-    
+
     	$resql = $object->deleteComment($idcomment);
     }
-    
+
     if ($action == 'edit') {
-    
+
     	// Security check
     	if (!$user->rights->opensurvey->write) accessforbidden();
     }
@@ -307,7 +307,7 @@ print '</td></tr>';
 // Expire date
 print '<tr><td>'.$langs->trans('ExpireDate').'</td><td colspan="2">';
 if ($action == 'edit') print $form->select_date($expiredate?$expiredate:$object->date_fin,'expire',0,0,0,'',1,0,1);
-else 
+else
 {
     print dol_print_date($object->date_fin,'day');
     if ($object->date_fin && $object->date_fin < dol_now()) print img_warning($langs->trans("Expired"));
@@ -377,7 +377,7 @@ if ($action != 'edit' && $user->rights->opensurvey->write) {
         //Opened button
         print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=reopen&id=' . $numsondage . '">'.$langs->trans("ReOpen") . '</a>';
     }
-    
+
 	//Delete button
 	print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?suppressionsondage=1&id='.$numsondage.'&amp;action=delete">'.$langs->trans('Delete').'</a>';
 }
@@ -420,7 +420,7 @@ print '<br>';
 // Add comment
 if ($object->allow_comments) {
 	print $langs->trans("AddACommentForPoll") . '<br>';
-	print '<textarea name="comment" rows="2" cols="80"></textarea><br>'."\n";
+	print '<textarea name="comment" rows="2" class="quatrevingtpercent"></textarea><br>'."\n";
 	print $langs->trans("Name") .': <input type="text" size="50" name="commentuser" value="'.$user->getFullName($langs).'"><br>'."\n";
 	print '<input type="submit" class="button" name="ajoutcomment" value="'.dol_escape_htmltag($langs->trans("AddComment")).'"><br>'."\n";
 	if (isset($erreur_commentaire_vide) && $erreur_commentaire_vide=="yes") {

From 787d6946b220453e6337d56e1b6859ac266dcee9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 18 Jun 2017 12:30:18 +0200
Subject: [PATCH 265/438] Continue work started on module builder

---
 htdocs/langs/en_US/modulebuilder.lang         |  14 +-
 htdocs/modulebuilder/index.php                | 361 ++++++++++++------
 .../modulebuilder/template/class/MyObject.txt |   3 +-
 .../template/class/myobject.class.php         |  62 ++-
 .../modulebuilder/template/modulebuilder.txt  |   5 +-
 5 files changed, 294 insertions(+), 151 deletions(-)

diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index 8d9a31cfdf7..fe636fd4f2d 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -1,24 +1,25 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tools give you utilites to build or edit your own module.
+ModuleBuilderDesc=This tools give you utilites to build or edit your own module (<a href="%s" target="_blank">More information here</a>).
 EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...)
 ModuleBuilderDesc2=Path were modules are generated/edited (first alternative directory defined into %s): <strong>%s</strong>
 ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong> (they are detected as editable when the file <strong>%s</strong> exists in root of module directory). 
 NewModule=New module
 NewObject=New object
-ModuleKey=Key for new module
-ObjectKey=Key for new object
+ModuleKey=Module key
+ObjectKey=Object key
 ModuleInitialized=Module initialized
 FilesForObjectInitialized=Files for new object initialized
 ModuleBuilderDescdescription=Enter here all general information that describe your module
-ModuleBuilderDescobjects=Define here the new objects you want to manage with your module. A page to list them and a page to create/edit/view a card will be generated.
+ModuleBuilderDescobjects=Define here the objects you want to manage with your module. A sql file, a page to list them, to create/edit/view a card and an API will be generated.
 ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
 ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with your module.
 ModuleBuilderDesctriggers=This is the view of triggers provided by your module. To include code executed when a triggered business event is launched, just edit this file with your IDE.
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module. Just click on button to build the module package file.
-ModuleBuilderDescdangerzone=You can delete your module. WARNING: All files of module will be definetly lost !
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All files of module will be definitly lost !
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be definitly lost !
 DangerZone=Danger zone
 BuildPackage=Build package
 ModuleIsNotActive=This module was not activated yet (go into Home-Setup-Module to make it live)
@@ -31,4 +32,5 @@ ClassFile=File for PHP class
 ApiClassFile=File for PHP API class
 PageForList=PHP page for list of record
 PageForCreateEditView=PHP page to create/edit/view a record
-PathToModulePackage=Path to zip of module/application package
\ No newline at end of file
+PathToModulePackage=Path to zip of module/application package
+SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
\ No newline at end of file
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index d9ae491b654..7aa3440b8a8 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -58,41 +58,50 @@ $FILEFLAG='modulebuilder.txt';
 
 if ($dirins && $action == 'initmodule' && $modulename)
 {
-    $srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
-    $destdir = $dirins.'/'.strtolower($modulename);
-
-    $arrayreplacement=array(
-        'mymodule'=>strtolower($modulename),
-     	'MyModule'=>$modulename
-    );
-
-    $result = dolCopyDir($srcdir, $destdir, 0, 0, $arrayreplacement);
-    //dol_mkdir($destfile);
-    if ($result <= 0)
+    if (preg_match('/\s/', $modulename))
     {
-    	if ($result < 0)
-    	{
-        	$error++;
-        	$langs->load("errors");
-        	setEventMessages($langs->trans("ErrorFailToCopyDir", $srcdir, $destdir), null, 'errors');
-    	}
-    	else	// $result == 0
-    	{
-        	setEventMessages($langs->trans("AllFilesDidAlreadyExist", $srcdir, $destdir), null, 'warnings');
-    	}
+        $error++;
+        setEventMessages($langs->trans("SpaceOrSpecialCharAreNotAllowed"), null, 'errors');
     }
 
-    // Delete some files
-    dol_delete_file($destdir.'/myobject_card.php');
-    dol_delete_file($destdir.'/myobject_list.php');
-    dol_delete_file($destdir.'/test/phpunit/MyObjectTest.php');
-    dol_delete_file($destdir.'/sql/llx_myobject.key.sql');
-    dol_delete_file($destdir.'/sql/llx_myobject.sql');
-    dol_delete_file($destdir.'/scripts/myobject.php');
-    dol_delete_file($destdir.'/img/object_myobject.png');
-    dol_delete_file($destdir.'/class/myobject.class.php');
-    dol_delete_file($destdir.'/class/api_myobject.class.php');
-    dol_delete_file($destdir.'/class/MyObject.txt');
+    if (! $error)
+    {
+        $srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
+        $destdir = $dirins.'/'.strtolower($modulename);
+
+        $arrayreplacement=array(
+            'mymodule'=>strtolower($modulename),
+         	'MyModule'=>$modulename
+        );
+
+        $result = dolCopyDir($srcdir, $destdir, 0, 0, $arrayreplacement);
+        //dol_mkdir($destfile);
+        if ($result <= 0)
+        {
+        	if ($result < 0)
+        	{
+            	$error++;
+            	$langs->load("errors");
+            	setEventMessages($langs->trans("ErrorFailToCopyDir", $srcdir, $destdir), null, 'errors');
+        	}
+        	else	// $result == 0
+        	{
+            	setEventMessages($langs->trans("AllFilesDidAlreadyExist", $srcdir, $destdir), null, 'warnings');
+        	}
+        }
+
+        // Delete some files
+        dol_delete_file($destdir.'/myobject_card.php');
+        dol_delete_file($destdir.'/myobject_list.php');
+        dol_delete_file($destdir.'/test/phpunit/MyObjectTest.php');
+        dol_delete_file($destdir.'/sql/llx_myobject.key.sql');
+        dol_delete_file($destdir.'/sql/llx_myobject.sql');
+        dol_delete_file($destdir.'/scripts/myobject.php');
+        dol_delete_file($destdir.'/img/object_myobject.png');
+        dol_delete_file($destdir.'/class/myobject.class.php');
+        dol_delete_file($destdir.'/class/api_myobject.class.php');
+        dol_delete_file($destdir.'/class/MyObject.txt');
+    }
 
     // Edit PHP files
     if (! $error)
@@ -129,74 +138,86 @@ if ($dirins && $action == 'initmodule' && $modulename)
 
 if ($dirins && $action == 'initobject' && $module && $objectname)
 {
-    $srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
-    $destdir = $dirins.'/'.strtolower($module);
-
-    $arrayreplacement=array(
-        'mymodule'=>strtolower($module),
-        'MyModule'=>$module,
-        'myobject'=>strtolower($objectname),
-        'MyObject'=>$objectname
-    );
-
-
-    // Delete some files
-    $filetogenerate = array(
-        'myobject_card.php'=>strtolower($objectname).'_card.php',
-        'myobject_list.php'=>strtolower($objectname).'_list.php',
-        'test/phpunit/MyObjectTest.php'=>'test/phpunit/'.$objectname.'Test.php',
-        'sql/llx_myobject.key.sql'=>'sql/llx_'.strtolower($objectname).'.key.sql',
-        'sql/llx_myobject.sql'=>'sql/llx_'.strtolower($objectname).'.sql',
-        'scripts/myobject.php'=>'scripts/'.strtolower($objectname).'.php',
-        'img/object_myobject.png'=>'img/object_'.strtolower($objectname).'.png',
-        'class/myobject.class.php'=>'class/'.strtolower($objectname).'.class.php',
-        'class/api_myobject.class.php'=>'class/api_'.strtolower($objectname).'.class.php',
-        'class/MyObject.txt'=>'class/'.$objectname.'.txt'
-    );
-
-    foreach($filetogenerate as $srcfile => $destfile)
+    if (preg_match('/\s/', $objectname))
     {
-        $result = dol_copy($srcdir.'/'.$srcfile, $destdir.'/'.$destfile);
-        if ($result <= 0)
-        {
-            if ($result < 0)
-            {
-                $error++;
-                $langs->load("errors");
-                setEventMessages($langs->trans("ErrorFailToCopyFile", $srcdir.'/'.$srcfile, $destdir.'/'.$destfile), null, 'errors');
-            }
-            else	// $result == 0
-            {
-                setEventMessages($langs->trans("FileAlreadyExists", $srcdir.'/'.$srcfile, $destdir.'/'.$destfile), null, 'warnings');
-            }
-        }
-        else
-        {
-            // Copy is ok
-        }
+        $error++;
+        setEventMessages($langs->trans("SpaceOrSpecialCharAreNotAllowed"), null, 'errors');
     }
 
-    // Edit PHP files
-    foreach($filetogenerate as $destfile)
+    if (! $error)
     {
-        $phpfileval['fullname'] = $destdir.'/'.$destfile;
+        $srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
+        $destdir = $dirins.'/'.strtolower($module);
 
-        //var_dump($phpfileval['fullname']);
         $arrayreplacement=array(
-            'mymodule'=>strtolower($modulename),
-            'MyModule'=>$modulename,
-            'MYMODULE'=>strtoupper($modulename),
-            'My module'=>$modulename,
-            'htdocs/modulebuilder/template/'=>'',
+            'mymodule'=>strtolower($module),
+            'MyModule'=>$module,
             'myobject'=>strtolower($objectname),
             'MyObject'=>$objectname
         );
 
-        $result=dolReplaceInFile($phpfileval['fullname'], $arrayreplacement);
-        //var_dump($result);
-        if ($result < 0)
+
+        // Delete some files
+        $filetogenerate = array(
+            'myobject_card.php'=>strtolower($objectname).'_card.php',
+            'myobject_list.php'=>strtolower($objectname).'_list.php',
+            'test/phpunit/MyObjectTest.php'=>'test/phpunit/'.$objectname.'Test.php',
+            'sql/llx_myobject.key.sql'=>'sql/llx_'.strtolower($objectname).'.key.sql',
+            'sql/llx_myobject.sql'=>'sql/llx_'.strtolower($objectname).'.sql',
+            'scripts/myobject.php'=>'scripts/'.strtolower($objectname).'.php',
+            'img/object_myobject.png'=>'img/object_'.strtolower($objectname).'.png',
+            'class/myobject.class.php'=>'class/'.strtolower($objectname).'.class.php',
+            'class/api_myobject.class.php'=>'class/api_'.strtolower($objectname).'.class.php',
+            'class/MyObject.txt'=>'class/'.$objectname.'.txt'
+        );
+
+        foreach($filetogenerate as $srcfile => $destfile)
         {
-            setEventMessages($langs->trans("ErrorFailToMakeReplacementInto", $phpfileval['fullname']), null, 'errors');
+            $result = dol_copy($srcdir.'/'.$srcfile, $destdir.'/'.$destfile);
+            if ($result <= 0)
+            {
+                if ($result < 0)
+                {
+                    $error++;
+                    $langs->load("errors");
+                    setEventMessages($langs->trans("ErrorFailToCopyFile", $srcdir.'/'.$srcfile, $destdir.'/'.$destfile), null, 'errors');
+                }
+                else	// $result == 0
+                {
+                    setEventMessages($langs->trans("FileAlreadyExists", $srcdir.'/'.$srcfile, $destdir.'/'.$destfile), null, 'warnings');
+                }
+            }
+            else
+            {
+                // Copy is ok
+            }
+        }
+    }
+
+    if (! $error)
+    {
+        // Edit PHP files
+        foreach($filetogenerate as $destfile)
+        {
+            $phpfileval['fullname'] = $destdir.'/'.$destfile;
+
+            //var_dump($phpfileval['fullname']);
+            $arrayreplacement=array(
+                'mymodule'=>strtolower($modulename),
+                'MyModule'=>$modulename,
+                'MYMODULE'=>strtoupper($modulename),
+                'My module'=>$modulename,
+                'htdocs/modulebuilder/template/'=>'',
+                'myobject'=>strtolower($objectname),
+                'MyObject'=>$objectname
+            );
+
+            $result=dolReplaceInFile($phpfileval['fullname'], $arrayreplacement);
+            //var_dump($result);
+            if ($result < 0)
+            {
+                setEventMessages($langs->trans("ErrorFailToMakeReplacementInto", $phpfileval['fullname']), null, 'errors');
+            }
         }
     }
 
@@ -206,18 +227,90 @@ if ($dirins && $action == 'initobject' && $module && $objectname)
     }
 }
 
-
 if ($dirins && $action == 'confirm_delete')
 {
-    $modulelowercase=strtolower($module);
+    if (preg_match('/\s/', $module))
+    {
+        $error++;
+        setEventMessages($langs->trans("SpaceOrSpecialCharAreNotAllowed"), null, 'errors');
+    }
 
-    // Dir for module
-    $dir = $dirins.'/'.$modulelowercase;
+    if (! $error)
+    {
+        $modulelowercase=strtolower($module);
 
-    dol_delete_dir_recursive($dir);
+        // Dir for module
+        $dir = $dirins.'/'.$modulelowercase;
 
-    header("Location: ".DOL_URL_ROOT.'/modulebuilder/index.php?module=initmodule');
-    exit;
+        $result = dol_delete_dir_recursive($dir);
+
+        if ($result > 0)
+        {
+            setEventMessages($langs->trans("DirDeleted"), null);
+        }
+        else
+        {
+            setEventMessages($langs->trans("NothingDeleted"), null, 'warnings');
+        }
+    }
+
+    //header("Location: ".DOL_URL_ROOT.'/modulebuilder/index.php?module=initmodule');
+    //exit;
+    $action = '';
+    $module = 'deletemodule';
+}
+
+if ($dirins && $action == 'confirm_deleteobject' && $objectname)
+{
+    if (preg_match('/\s/', $objectname))
+    {
+        $error++;
+        setEventMessages($langs->trans("SpaceOrSpecialCharAreNotAllowed"), null, 'errors');
+    }
+
+    if (! $error)
+    {
+        $modulelowercase=strtolower($module);
+        $objectlowercase=strtolower($objectname);
+
+        // Dir for module
+        $dir = $dirins.'/'.$modulelowercase;
+
+        // Delete some files
+        $filetogenerate = array(
+            'myobject_card.php'=>strtolower($objectname).'_card.php',
+            'myobject_list.php'=>strtolower($objectname).'_list.php',
+            'test/phpunit/MyObjectTest.php'=>'test/phpunit/'.$objectname.'Test.php',
+            'sql/llx_myobject.key.sql'=>'sql/llx_'.strtolower($objectname).'.key.sql',
+            'sql/llx_myobject.sql'=>'sql/llx_'.strtolower($objectname).'.sql',
+            'scripts/myobject.php'=>'scripts/'.strtolower($objectname).'.php',
+            'img/object_myobject.png'=>'img/object_'.strtolower($objectname).'.png',
+            'class/myobject.class.php'=>'class/'.strtolower($objectname).'.class.php',
+            'class/api_myobject.class.php'=>'class/api_'.strtolower($objectname).'.class.php',
+            'class/MyObject.txt'=>'class/'.$objectname.'.txt'
+        );
+
+        $resultko = 0;
+        foreach($filetogenerate as $filetodelete)
+        {
+            $resulttmp = dol_delete_file($dir.'/'.$filetodelete, 0, 0, 1);
+            if (! $resulttmp) $resultko++;
+        }
+
+        if ($resultko == 0)
+        {
+            setEventMessages($langs->trans("FilesDeleted"), null);
+        }
+        else
+        {
+            setEventMessages($langs->trans("ErrorSomeFilesCouldNotBeDeleted"), null, 'warnings');
+        }
+    }
+
+    //header("Location: ".DOL_URL_ROOT.'/modulebuilder/index.php?module=initmodule');
+    //exit;
+    $action = '';
+    $tabobj = 'deleteobject';
 }
 
 if ($dirins && $action == 'generatepackage')
@@ -341,7 +434,7 @@ if (!empty($conf->modulebuilder->enabled) && $mainmenu == 'modulebuilder')	// En
 // Show description of content
 $newdircustom=$dirins;
 if (empty($newdircustom)) $newdircustom=img_warning();
-print $langs->trans("ModuleBuilderDesc").'<br>';
+print $langs->trans("ModuleBuilderDesc", 'https://wiki.dolibarr.org/index.php/Module_development#Create_your_module').'<br>';
 print $langs->trans("ModuleBuilderDesc2", 'conf/conf.php', $newdircustom).'<br>';
 
 $message='';
@@ -381,7 +474,7 @@ print $langs->trans("ModuleBuilderDesc3", count($listofmodules), $FILEFLAG).'<br
 $error=0;
 $moduleobj = null;
 
-if (! empty($module) && $module != 'initmodule')
+if (! empty($module) && $module != 'initmodule' && $module != 'deletemodule')
 {
 	$modulelowercase=strtolower($module);
 
@@ -428,6 +521,10 @@ foreach($listofmodules as $tmpmodule => $tmpmodulewithcase)
     $h++;
 }
 
+$head[$h][0] = $_SERVER["PHP_SELF"].'?module=deletemodule';
+$head[$h][1] = $langs->trans("DangerZone");
+$head[$h][2] = 'deletemodule';
+$h++;
 
 
 dol_fiche_head($head, $module, $langs->trans("Modules"), -1, 'generic');
@@ -446,6 +543,19 @@ if ($module == 'initmodule')
     print '<input type="submit" class="button" name="create" value="'.dol_escape_htmltag($langs->trans("Create")).'"'.($dirins?'':' disabled="disabled"').'>';
     print '</form>';
 }
+elseif ($module == 'deletemodule')
+{
+    print '<form name="delete">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="action" value="confirm_delete">';
+    print '<input type="hidden" name="module" value="deletemodule">';
+
+    print $langs->trans("EnterNameOfModuleToDeleteDesc").'<br><br>';
+
+    print '<input type="text" name="module" placeholder="'.dol_escape_htmltag($langs->trans("ModuleKey")).'" value="">';
+    print '<input type="submit" class="buttonDelete" value="'.$langs->trans("Delete").'"'.($dirins?'':' disabled="disabled"').'>';
+    print '</form>';
+}
 elseif (! empty($module))
 {
     // Tabs for module
@@ -502,11 +612,6 @@ elseif (! empty($module))
         $head2[$h][2] = 'buildpackage';
         $h++;
 
-        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=dangerzone&module='.$module;
-        $head2[$h][1] = $langs->trans("DangerZone");
-        $head2[$h][2] = 'dangerzone';
-        $h++;
-
         print $modulestatusinfo.'<br><br>';
 
         dol_fiche_head($head2, $tab, '', -1, '');
@@ -532,6 +637,7 @@ elseif (! empty($module))
 
         	print '<tr><td>';
         	print $langs->trans("Numero");
+        	print ' (<a href="https://wiki.dolibarr.org/index.php/List_of_modules_id" target="_blank">'.$langs->trans("SeeHere").'</a>)';
         	print '</td><td>';
         	print $moduleobj->numero;
         	print '</td></tr>';
@@ -608,6 +714,12 @@ elseif (! empty($module))
                 $h++;
             }
 
+            $head3[$h][0] = $_SERVER["PHP_SELF"].'?tab=objects&module='.$module.'&tabobj=deleteobject';
+            $head3[$h][1] = $langs->trans("DangerZone");
+            $head3[$h][2] = 'deleteobject';
+            $h++;
+
+
             dol_fiche_head($head3, $tabobj, '', -1, '');
 
             if ($tabobj == 'newobject')
@@ -625,6 +737,21 @@ elseif (! empty($module))
                 print '<input type="submit" class="button" name="create" value="'.dol_escape_htmltag($langs->trans("Create")).'"'.($dirins?'':' disabled="disabled"').'>';
                 print '</form>';
             }
+            elseif ($tabobj == 'deleteobject')
+            {
+                // New module
+                print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+                print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                print '<input type="hidden" name="action" value="confirm_deleteobject">';
+                print '<input type="hidden" name="tab" value="objects">';
+                print '<input type="hidden" name="module" value="'.dol_escape_htmltag($module).'">';
+
+                print $langs->trans("EnterNameOfObjectToDeleteDesc").'<br><br>';
+
+                print '<input type="text" name="objectname" value="'.dol_escape_htmltag($modulename).'" placeholder="'.dol_escape_htmltag($langs->trans("ObjectKey")).'">';
+                print '<input type="submit" class="buttonDelete" name="delete" value="'.dol_escape_htmltag($langs->trans("Delete")).'"'.($dirins?'':' disabled="disabled"').'>';
+                print '</form>';
+            }
             else
             {
                 try {
@@ -641,8 +768,9 @@ elseif (! empty($module))
                     $tmpobjet = new $tabobj($db);
 
                     $reflector = new ReflectionClass($tabobj);
-                    $properties = $reflector->getProperties();
-                    $propdefault = $reflector->getDefaultProperties();
+                    $properties = $reflector->getProperties();          // Can also use get_object_vars
+                    $propdefault = $reflector->getDefaultProperties();  // Can also use get_object_vars
+                    //$propstat = $reflector->getStaticProperties();
 
                     print load_fiche_titre($langs->trans("Properties"), '', '');
 
@@ -655,8 +783,10 @@ elseif (! empty($module))
 
                     print '<table class="noborder">';
                     print '<tr class="liste_titre">';
-                    print '<td>'.$langs->trans("Property").'</td>';
-                    print '<td>'.$langs->trans("Description").'</td>';
+                    print '<td>'.$langs->trans("Property");
+                    print ' (<a href="https://wiki.dolibarr.org/index.php/Language_and_development_rules#Table_and_fields_structures" target="_blank">'.$langs->trans("Example").'</a>)';
+                    print '</td>';
+                    print '<td>'.$langs->trans("Comment").'</td>';
                     print '<td>'.$langs->trans("Type").'</td>';
                     print '<td>'.$langs->trans("DefaultValue").'</td>';
                     print '<td></td>';
@@ -676,7 +806,7 @@ elseif (! empty($module))
                             $propname=$propval->getName();
 
                             // Discard generic properties
-                            if (in_array($propname, array('element', 'table_element', 'table_element_line', 'class_element_line', 'ismultientitymanaged'))) continue;
+                            if (in_array($propname, array('element', 'childtables', 'table_element', 'table_element_line', 'class_element_line', 'isnolinkedbythird', 'ismultientitymanaged'))) continue;
 
                             // Keep or not lines
                             if (in_array($propname, array('fk_element', 'lines'))) continue;
@@ -686,11 +816,10 @@ elseif (! empty($module))
                             print $propname;
                             print '</td>';
                             print '<td>';
-
+                            print $propval->getDocComment();
                             print '</td>';
-
                             print '<td>';
-
+                            print gettype($tmpobjet->$propname);
                             print '</td>';
 
                             print '<td>';
@@ -836,16 +965,6 @@ elseif (! empty($module))
         	print '</form>';
         }
 
-        if ($tab == 'dangerzone')
-        {
-            print '<form name="delete">';
-            print '<input type="hidden" name="action" value="confirm_delete">';
-            print '<input type="hidden" name="tab" value="'.dol_escape_htmltag($tab).'">';
-            print '<input type="hidden" name="module" value="'.dol_escape_htmltag($module).'">';
-            print '<input type="submit" class="buttonDelete" value="'.$langs->trans("Delete").'"'.($dirins?'':' disabled="disabled"').'>';
-            print '</form>';
-        }
-
         dol_fiche_end();
     }
 }
diff --git a/htdocs/modulebuilder/template/class/MyObject.txt b/htdocs/modulebuilder/template/class/MyObject.txt
index 37ccaca81ed..e86e7cdf5c6 100644
--- a/htdocs/modulebuilder/template/class/MyObject.txt
+++ b/htdocs/modulebuilder/template/class/MyObject.txt
@@ -1 +1,2 @@
-# If this file exists, it means the class and file for object MyOjbect was generated by ModuleBuilder.
\ No newline at end of file
+# DO NOT DELETE THIS FILE MANUALLY
+# If this file exists, it means the class and file for object MyOjbect was generated by ModuleBuilder. Use ModuleBuilder if you want to delete object. 
\ No newline at end of file
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 4993f60f83c..c66110fddf6 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -36,43 +36,63 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
 class MyObject extends CommonObject
 {
 	/**
-	 * @var string Id to identify managed object
+	 * @var string ID to identify managed object
 	 */
 	public $element = 'myobject';
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element = 'myobject';
-    /**
-     * @var array Array with all fields and their property
+
+	/**
+	 * @var array  Does this field is linked to a thirdparty ?
+	 */
+	protected $isnolinkedbythird=1;
+	/**
+	 * @var array  Does myobject support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	 */
+	protected $ismultientitymanaged = 1;
+
+
+	/**
+     * @var string String with name of icon for myobject
      */
 	public $picto = 'myobject';
-    /**
-     * @var array Array with all fields and their property
+
+	/**
+	 * @var int    Entity Id
+	 */
+	public $entity;
+
+	/**
+     * @var array  Array with all fields and their property
      */
 	public $fields;
 
+
+
+	// If this object has a subtable with lines
+
 	/**
-	 * @var mixed Sample property 1
+	 * @var int    Name of subtable line
 	 */
-	public $prop1;
+	//public $table_element_line = 'myobjectdet';
 	/**
-	 * @var mixed Sample property 2
+	 * @var int    Field with ID of parent key if this field has a parent
 	 */
-	public $prop2;
-
-	//...
-
-	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-
-	public $table_element_line = 'myobjectdet';
-    public $class_element_line = 'MyObjectline';
-    public $fk_element = 'fk_myobject';
-
-    /**
-	 * @var MyObjectLine[] Lines
+	//public $fk_element = 'fk_myobject';
+	/**
+	 * @var int    Name of subtable class that manage subtable lines
 	 */
-	public $lines = array();
+	//public $class_element_line = 'MyObjectline';
+	/**
+	 * @var array  Array of child tables (child tables to delete before deleting a record)
+	 */
+	//protected $childtables=array('myobjectdet');
+	/**
+	 * @var MyObjectLine[]     Array of subtable lines
+	 */
+	//public $lines = array();
 
 
 
diff --git a/htdocs/modulebuilder/template/modulebuilder.txt b/htdocs/modulebuilder/template/modulebuilder.txt
index 5cdb6c6e6e8..24ea0d6eac5 100644
--- a/htdocs/modulebuilder/template/modulebuilder.txt
+++ b/htdocs/modulebuilder/template/modulebuilder.txt
@@ -1,2 +1,3 @@
-File to flag module built using official module template.
-When this file is present into a module directory, you can edit it with the module builder tool.
\ No newline at end of file
+# DO NOT DELETE THIS FILE MANUALLY
+# File to flag module built using official module template.
+# When this file is present into a module directory, you can edit it with the module builder tool. Use ModuleBuilder if you want to delete module. 
\ No newline at end of file

From cde0da6e1286febe81523590c3cbb693187ee1af Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 18 Jun 2017 12:48:58 +0200
Subject: [PATCH 266/438] Fix responsive

---
 htdocs/public/demo/index.php       | 2 +-
 htdocs/public/opensurvey/studs.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index f9bb4db7ecf..60559eb7aed 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -291,7 +291,7 @@ print '</div>';
 print '<div class="demobantext" style="max-width: 1024px;">';
 print '<div style="font-size: 20px; padding: 40px;">';
 print '<div style="text-align: justify;">'.$langs->trans("DemoDesc").'</div><br>';
-print '<font color="#555577"><b>'.$langs->trans("ChooseYourDemoProfil").'</b></font>';
+print '<div class="titre"><font style="font-size: 20px">'.$langs->trans("ChooseYourDemoProfil").'</font></div>';
 print '</div>';
 print '</div>';
 
diff --git a/htdocs/public/opensurvey/studs.php b/htdocs/public/opensurvey/studs.php
index 8e769452ec1..5f4c7a1fb03 100644
--- a/htdocs/public/opensurvey/studs.php
+++ b/htdocs/public/opensurvey/studs.php
@@ -113,14 +113,14 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x"))		// bout
 		}
 
 		$nom=substr(GETPOST("nom"),0,64);
-		
+
 		// Check if vote already exists
 		$sql = 'SELECT id_users, nom as name';
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'opensurvey_user_studs';
 		$sql.= " WHERE id_sondage='".$db->escape($numsondage)."' AND nom = '".$db->escape($nom)."' ORDER BY id_users";
 		$resql = $db->query($sql);
 		if (! $resql) dol_print_error($db);
-		
+
 		$num_rows = $db->num_rows($resql);
 		if ($num_rows > 0)
 		{
@@ -739,7 +739,7 @@ if ($comments)
 if ($object->allow_comments) {
 	print '<div class="addcomment">' .$langs->trans("AddACommentForPoll") . "<br>\n";
 
-	print '<textarea name="comment" rows="2" cols="60"></textarea><br>'."\n";
+	print '<textarea name="comment" rows="'.ROWS_2.'" class="quatrevingtpercent"></textarea><br>'."\n";
 	print $langs->trans("Name") .': ';
 	print '<input type="text" name="commentuser" maxlength="64" /> &nbsp; '."\n";
 	print '<input type="submit" class="button" name="ajoutcomment" value="'.dol_escape_htmltag($langs->trans("AddComment")).'"><br>'."\n";

From abe736c6a6080589fe03d6f7026af0a5b1c7561a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 18 Jun 2017 19:42:59 +0200
Subject: [PATCH 267/438] Escape hml tags

---
 htdocs/admin/tools/index.php                 |  2 +-
 htdocs/bookmarks/bookmarks.lib.php           |  2 +-
 htdocs/core/ajax/ajaxdirpreview.php          |  2 +-
 htdocs/core/ajax/bankconciliate.php          |  2 +-
 htdocs/core/ajax/box.php                     |  2 +-
 htdocs/core/ajax/constantonoff.php           |  2 +-
 htdocs/core/ajax/contacts.php                |  8 ++++----
 htdocs/core/ajax/extraparams.php             | 18 +++++++++---------
 htdocs/core/ajax/loadinplace.php             |  2 +-
 htdocs/core/ajax/objectonoff.php             |  2 +-
 htdocs/core/ajax/price.php                   |  2 +-
 htdocs/core/ajax/row.php                     |  6 +++---
 htdocs/core/ajax/saveinplace.php             |  2 +-
 htdocs/core/ajax/security.php                |  6 +++---
 htdocs/core/ajax/vatrates.php                |  2 +-
 htdocs/core/ajax/ziptown.php                 |  2 +-
 htdocs/core/class/html.formother.class.php   |  4 ++--
 htdocs/core/lib/functions.lib.php            |  7 ++-----
 htdocs/core/lib/security2.lib.php            |  6 +-----
 htdocs/core/tpl/ajax/fileupload_main.tpl.php |  2 +-
 htdocs/core/tpl/login.tpl.php                |  6 +++++-
 htdocs/core/tpl/passwordforgotten.tpl.php    |  7 +++++--
 htdocs/ecm/ajax/ecmdatabase.php              |  2 +-
 htdocs/expensereport/ajax/ajaxprojet.php     |  2 +-
 htdocs/externalsite/frames.php               |  4 ++--
 htdocs/fourn/ajax/getSupplierPrices.php      | 18 +++++++++---------
 htdocs/holiday/list.php                      | 12 ++++++------
 htdocs/main.inc.php                          | 11 ++++++-----
 htdocs/product/ajax/products.php             |  2 +-
 htdocs/product/stats/card.php                |  2 +-
 htdocs/public/paybox/paymentko.php           |  2 +-
 htdocs/public/paybox/paymentok.php           |  2 +-
 htdocs/public/paypal/paymentko.php           |  6 +++---
 htdocs/public/paypal/paymentok.php           |  2 +-
 htdocs/societe/ajax/company.php              |  4 ++--
 htdocs/societe/ajaxcompanies.php             |  2 +-
 htdocs/societe/ajaxcountries.php             |  2 +-
 htdocs/user/passwordforgotten.php            |  3 ---
 38 files changed, 84 insertions(+), 86 deletions(-)

diff --git a/htdocs/admin/tools/index.php b/htdocs/admin/tools/index.php
index 8da041d05da..b8dfad44e8f 100644
--- a/htdocs/admin/tools/index.php
+++ b/htdocs/admin/tools/index.php
@@ -38,7 +38,7 @@ if (! $user->admin)
 $form = new Form($db);
 
 $title=$langs->trans("SystemToolsArea");
-if (GETPOST('leftmenu') == 'admintools') $title=$langs->trans("ModulesSystemTools");
+if (GETPOST('leftmenu',"aZ09") == 'admintools') $title=$langs->trans("ModulesSystemTools");
 
 llxHeader('', $title);
 
diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index 3cee534e797..e6d3125abed 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -40,7 +40,7 @@ function printBookmarksList($aDb, $aLangs)
 
 	$langs->load("bookmarks");
 
-	$url= $_SERVER["PHP_SELF"].(! empty($_SERVER["QUERY_STRING"])?'?'.$_SERVER["QUERY_STRING"]:'');
+	$url= $_SERVER["PHP_SELF"].(dol_escape_htmltag($_SERVER["QUERY_STRING"])?'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]):'');
 
 	$ret = '';
 	// Menu bookmark
diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index 28f78e22ef4..bbc7647c802 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -139,7 +139,7 @@ if (! dol_is_dir($upload_dir))
 }
 
 print '<!-- ajaxdirpreview type='.$type.' -->'."\n";
-print '<!-- Page called with mode='.(isset($mode)?$mode:'').' type='.$type.' module='.$module.' url='.$url.' '.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].' -->'."\n";
+//print '<!-- Page called with mode='.dol_escape_htmltag(isset($mode)?$mode:'').' type='.dol_escape_htmltag($type).' module='.dol_escape_htmltag($module).' url='.dol_escape_htmltag($url).' '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 $param=($sortfield?'&sortfield='.$sortfield:'').($sortorder?'&sortorder='.$sortorder:'');
 
diff --git a/htdocs/core/ajax/bankconciliate.php b/htdocs/core/ajax/bankconciliate.php
index 3a8a3e30687..76ab3045f93 100644
--- a/htdocs/core/ajax/bankconciliate.php
+++ b/htdocs/core/ajax/bankconciliate.php
@@ -45,7 +45,7 @@ $action=GETPOST('action');
 //top_htmlhead("", "", 1);  // Replaced with top_httphead. An ajax page does not need html header.
 top_httphead();
 
-//print '<!-- Ajax page called with url '.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].' -->'."\n";
+//print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $action == 'dvnext')
 {
diff --git a/htdocs/core/ajax/box.php b/htdocs/core/ajax/box.php
index 63f96a0c513..106822f998b 100644
--- a/htdocs/core/ajax/box.php
+++ b/htdocs/core/ajax/box.php
@@ -50,7 +50,7 @@ $userid=GETPOST('userid','int');
 //top_htmlhead("", "", 1);  // Replaced with top_httphead. An ajax page does not need html header.
 top_httphead();
 
-print '<!-- Ajax page called with url '.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].' -->'."\n";
+print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Add a box
 if ($boxid > 0 && $zone !='' && $userid > 0)
diff --git a/htdocs/core/ajax/constantonoff.php b/htdocs/core/ajax/constantonoff.php
index 331a5e87513..f79753260d7 100644
--- a/htdocs/core/ajax/constantonoff.php
+++ b/htdocs/core/ajax/constantonoff.php
@@ -45,7 +45,7 @@ $name=GETPOST('name','alpha');
 //top_htmlhead("", "", 1);  // Replaced with top_httphead. An ajax page does not need html header.
 top_httphead();
 
-print '<!-- Ajax page called with url '.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].' -->'."\n";
+//print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Registering the location of boxes
 if (! empty($action) && ! empty($name))
diff --git a/htdocs/core/ajax/contacts.php b/htdocs/core/ajax/contacts.php
index c3788a8baeb..1c7c7a56e4b 100644
--- a/htdocs/core/ajax/contacts.php
+++ b/htdocs/core/ajax/contacts.php
@@ -41,20 +41,20 @@ $showempty	= GETPOST('showempty','int');
 
 top_httphead();
 
-//print '<!-- Ajax page called with url '.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].' -->'."\n";
+//print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Load original field value
 if (! empty($id) && ! empty($action) && ! empty($htmlname))
 {
 	$form = new Form($db);
-	
+
 	$return=array();
 	if (empty($showempty)) $showempty=0;
-	
+
 	$return['value']	= $form->selectcontacts($id,'',$htmlname,$showempty,'','',0,'',true);
 	$return['num']		= $form->num;
 	$return['error']	= $form->error;
-	
+
 	echo json_encode($return);
 }
 
diff --git a/htdocs/core/ajax/extraparams.php b/htdocs/core/ajax/extraparams.php
index 510ef8a1cf8..f8a636e52a5 100644
--- a/htdocs/core/ajax/extraparams.php
+++ b/htdocs/core/ajax/extraparams.php
@@ -40,17 +40,17 @@ $type = GETPOST('type', 'alpha');
 
 top_httphead();
 
-print '<!-- Ajax page called with url '.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].' -->'."\n";
+print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 if(! empty($id) && ! empty($element) && ! empty($htmlelement) && ! empty($type))
 {
 	$value = GETPOST('value','alpha');
 	$params=array();
-	
+
 	dol_syslog("AjaxSetExtraParameters id=".$id." element=".$element." htmlelement=".$htmlelement." type=".$type." value=".$value, LOG_DEBUG);
-	
+
 	$classpath = $subelement = $element;
-	
+
 	// For compatibility
 	if ($element == 'order' || $element == 'commande')    { $classpath = $subelement = 'commande'; }
 	else if ($element == 'propal')				{ $classpath = 'comm/propal'; $subelement = 'propal'; }
@@ -60,19 +60,19 @@ if(! empty($id) && ! empty($element) && ! empty($htmlelement) && ! empty($type))
 	else if ($element == 'deplacement')			{ $classpath = 'compta/deplacement'; $subelement = 'deplacement'; }
 	else if ($element == 'order_supplier')		{ $classpath = 'fourn'; $subelement = 'fournisseur.commande'; }
 	else if ($element == 'invoice_supplier')	{ $classpath = 'fourn'; $subelement = 'fournisseur.facture'; }
-	
+
 	dol_include_once('/'.$classpath.'/class/'.$subelement.'.class.php');
-	
+
 	if ($element == 'order_supplier')			{ $classname = 'CommandeFournisseur'; }
 	else if ($element == 'invoice_supplier')	{ $classname = 'FactureFournisseur'; }
 	else $classname = ucfirst($subelement);
-	
+
 	$object	= new $classname($db);
 	$object->fetch($id);
-	
+
 	$params[$htmlelement] = array($type => $value);
 	$object->extraparams = array_merge($object->extraparams, $params);
-	
+
 	$result=$object->setExtraParameters();
 }
 
diff --git a/htdocs/core/ajax/loadinplace.php b/htdocs/core/ajax/loadinplace.php
index de3a4e57d19..7e9e541c768 100644
--- a/htdocs/core/ajax/loadinplace.php
+++ b/htdocs/core/ajax/loadinplace.php
@@ -41,7 +41,7 @@ $fk_element		= GETPOST('fk_element','alpha');
 
 top_httphead();
 
-//print '<!-- Ajax page called with url '.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].' -->'."\n";
+//print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Load original field value
 if (! empty($field) && ! empty($element) && ! empty($table_element) && ! empty($fk_element))
diff --git a/htdocs/core/ajax/objectonoff.php b/htdocs/core/ajax/objectonoff.php
index 6ac5abd3bbb..37173ed9943 100644
--- a/htdocs/core/ajax/objectonoff.php
+++ b/htdocs/core/ajax/objectonoff.php
@@ -42,7 +42,7 @@ $object = new GenericObject($db);
 
 top_httphead();
 
-print '<!-- Ajax page called with url '.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].' -->'."\n";
+print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Registering new values
 if (($action == 'set') && ! empty($id))
diff --git a/htdocs/core/ajax/price.php b/htdocs/core/ajax/price.php
index 5c891df14d5..d4a101fb497 100644
--- a/htdocs/core/ajax/price.php
+++ b/htdocs/core/ajax/price.php
@@ -39,7 +39,7 @@ $tva_tx		= str_replace('*','',GETPOST('tva_tx','alpha'));
 
 top_httphead();
 
-//print '<!-- Ajax page called with url '.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].' -->'."\n";
+//print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Load original field value
 if (! empty($output) && isset($amount) && isset($tva_tx))
diff --git a/htdocs/core/ajax/row.php b/htdocs/core/ajax/row.php
index 41d411f01fd..827ee92d525 100644
--- a/htdocs/core/ajax/row.php
+++ b/htdocs/core/ajax/row.php
@@ -17,8 +17,8 @@
 
 /**
  *       \file       htdocs/core/ajax/row.php
- *       \brief      File to return Ajax response on Row move. 
- *                   This ajax page is called when doing an up or down drag and drop. 
+ *       \brief      File to return Ajax response on Row move.
+ *                   This ajax page is called when doing an up or down drag and drop.
  */
 
 if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disable token renewal
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
 
 top_httphead();
 
-print '<!-- Ajax page called with url '.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].' -->'."\n";
+print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Registering the location of boxes
 if ((isset($_POST['roworder']) && ! empty($_POST['roworder'])) && (isset($_POST['table_element_line']) && ! empty($_POST['table_element_line']))
diff --git a/htdocs/core/ajax/saveinplace.php b/htdocs/core/ajax/saveinplace.php
index 48797dd0432..eb04379a778 100644
--- a/htdocs/core/ajax/saveinplace.php
+++ b/htdocs/core/ajax/saveinplace.php
@@ -54,7 +54,7 @@ savemethodname:
 
 top_httphead();
 
-//print '<!-- Ajax page called with url '.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].' -->'."\n";
+//print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 //print_r($_POST);
 
 // Load original field value
diff --git a/htdocs/core/ajax/security.php b/htdocs/core/ajax/security.php
index 28a53a87679..cc7335618d0 100644
--- a/htdocs/core/ajax/security.php
+++ b/htdocs/core/ajax/security.php
@@ -17,8 +17,8 @@
 
 /**
  *       \file       htdocs/core/ajax/security.php
- *       \brief      This ajax component is used to generated has keys for security purposes 
- *                   like key to use into URL to protect them. 
+ *       \brief      This ajax component is used to generated has keys for security purposes
+ *                   like key to use into URL to protect them.
  */
 
 if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
@@ -38,7 +38,7 @@ require '../../main.inc.php';
 //top_htmlhead("", "", 1);  // Replaced with top_httphead. An ajax page does not need html header.
 top_httphead();
 
-//print '<!-- Ajax page called with url '.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].' -->'."\n";
+//print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Registering the location of boxes
 if (isset($_GET['action']) && ! empty($_GET['action']))
diff --git a/htdocs/core/ajax/vatrates.php b/htdocs/core/ajax/vatrates.php
index fc30a13afec..ac9691bfa25 100644
--- a/htdocs/core/ajax/vatrates.php
+++ b/htdocs/core/ajax/vatrates.php
@@ -41,7 +41,7 @@ $productid	= (GETPOST('productid','int')?GETPOST('productid','int'):0);
 
 top_httphead();
 
-//print '<!-- Ajax page called with url '.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].' -->'."\n";
+//print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Load original field value
 if (! empty($id) && ! empty($action) && ! empty($htmlname))
diff --git a/htdocs/core/ajax/ziptown.php b/htdocs/core/ajax/ziptown.php
index 30e0211ece1..9fa475039d9 100644
--- a/htdocs/core/ajax/ziptown.php
+++ b/htdocs/core/ajax/ziptown.php
@@ -45,7 +45,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 //top_htmlhead("", "", 1);  // Replaced with top_httphead. An ajax page does not need html header.
 top_httphead();
 
-//print '<!-- Ajax page called with url '.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].' -->'."\n";
+//print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 dol_syslog("GET is ".join(',',$_GET).', MAIN_USE_ZIPTOWN_DICTIONNARY='.(empty($conf->global->MAIN_USE_ZIPTOWN_DICTIONNARY)?'':$conf->global->MAIN_USE_ZIPTOWN_DICTIONNARY));
 //var_dump($_GET);
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 98720d335b9..1771b6f7a4c 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -1062,7 +1062,7 @@ class FormOther
 	        			async: false
 	        		});
 	        		// We force reload to be sure to get all boxes into list
-	        		window.location.search=\'mainmenu='.GETPOST("mainmenu").'&leftmenu='.GETPOST('leftmenu').'&action=delbox\';
+	        		window.location.search=\'mainmenu='.GETPOST("mainmenu","aZ09").'&leftmenu='.GETPOST('leftmenu',"aZ09").'&action=delbox\';
 	        	}
 	        	else
 	        	{
@@ -1084,7 +1084,7 @@ class FormOther
 	    					url: \''.DOL_URL_ROOT.'/core/ajax/box.php?boxorder=\'+boxorder+\'&boxid=\'+boxid+\'&zone='.$areacode.'&userid='.$user->id.'\',
 	    			        async: false
 	    		        });
-	        			window.location.search=\'mainmenu='.GETPOST("mainmenu").'&leftmenu='.GETPOST('leftmenu').'&action=addbox&boxid=\'+boxid;
+	        			window.location.search=\'mainmenu='.GETPOST("mainmenu","aZ09").'&leftmenu='.GETPOST('leftmenu',"aZ09").'&action=addbox&boxid=\'+boxid;
 	                }
 	        	});';
 	        	if (! count($arrayboxtoactivatelabel)) $selectboxlist.='jQuery("#boxcombo").hide();';
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 97ce3c4f698..f9f9c8557ee 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -289,9 +289,6 @@ function GETPOST($paramname,$check='',$method=0,$filter=NULL,$options=NULL)
 	        case 'intcomma':
 	            if (preg_match('/[^0-9,]+/i',$out)) $out='';
 	            break;
-	        case 'intcomma':
-	            if (preg_match('/[^0-9,]+/i',$out)) $out='';
-	            break;
 	        case 'alpha':
 	            $out=trim($out);
 	            // '"' is dangerous because param in url can close the href= or src= and add javascript functions.
@@ -2931,8 +2928,8 @@ function dol_print_error($db='',$error='',$errors=null)
 		$out.="<b>".$langs->trans("Referer").":</b> ".(isset($_SERVER["HTTP_REFERER"])?dol_htmlentities($_SERVER["HTTP_REFERER"],ENT_COMPAT,'UTF-8'):'')."<br>\n";
 		$out.="<b>".$langs->trans("MenuManager").":</b> ".(isset($conf->standard_menu)?$conf->standard_menu:'')."<br>\n";
 		$out.="<br>\n";
-		$syslog.="url=".$_SERVER["REQUEST_URI"];
-		$syslog.=", query_string=".$_SERVER["QUERY_STRING"];
+		$syslog.="url=".dol_escape_htmltag($_SERVER["REQUEST_URI"]);
+		$syslog.=", query_string=".dol_escape_htmltag($_SERVER["QUERY_STRING"]);
 	}
 	else                              // Mode CLI
 	{
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index fc05e2c9194..8c16ae8309a 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -144,10 +144,6 @@ function dol_loginfunction($langs,$conf,$mysoc)
 
 	$dol_url_root = DOL_URL_ROOT;
 
-	$php_self = $_SERVER['PHP_SELF'];
-	$php_self.= $_SERVER["QUERY_STRING"]?'?'.$_SERVER["QUERY_STRING"]:'';
-	if (! preg_match('/mainmenu=/',$php_self)) $php_self.=(preg_match('/\?/',$php_self)?'&':'?').'mainmenu=home';
-
 	// Title
 	$appli=constant('DOL_APPLICATION_TITLE');
 	$title=$appli.' '.DOL_VERSION;
@@ -422,7 +418,7 @@ function encodedecode_dbpassconf($level=0)
 			fflush($fp);
 			fclose($fp);
 			clearstatcache();
-			
+
 			// It's config file, so we set read permission for creator only.
 			// Should set permission to web user and groups for users used by batch
 			//@chmod($file, octdec('0600'));
diff --git a/htdocs/core/tpl/ajax/fileupload_main.tpl.php b/htdocs/core/tpl/ajax/fileupload_main.tpl.php
index b7437af4616..034e9ebc3fc 100644
--- a/htdocs/core/tpl/ajax/fileupload_main.tpl.php
+++ b/htdocs/core/tpl/ajax/fileupload_main.tpl.php
@@ -45,7 +45,7 @@ $(function () {
 	// Events
 	$('#fileupload').fileupload({
 		stop: function (e, data) {
-			location.href='<?php echo $_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"]; ?>';
+			location.href='<?php echo dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]); ?>';
 		},
 		destroy: function (e, data) {
 			var that = $(this).data('fileupload');
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 3772b44c9fc..608e508d717 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -31,6 +31,10 @@ if (GETPOST('dol_use_jmobile')) $conf->dol_use_jmobile=1;
 // If we force to use jmobile, then we reenable javascript
 if (! empty($conf->dol_use_jmobile)) $conf->use_javascript_ajax=1;
 
+$php_self = dol_escape_htmltag($_SERVER['PHP_SELF']);
+$php_self.= dol_escape_htmltag($_SERVER["QUERY_STRING"])?'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]):'';
+if (! preg_match('/mainmenu=/',$php_self)) $php_self.=(preg_match('/\?/',$php_self)?'&':'?').'mainmenu=home';
+
 // Javascript code on logon page only to detect user tz, dst_observed, dst_first, dst_second
 $arrayofjs=array(
 	'/includes/jstz/jstz.min.js'.(empty($conf->dol_use_jmobile)?'':'?version='.urlencode(DOL_VERSION)),
@@ -80,7 +84,7 @@ $(document).ready(function () {
 <tr class="vmenu"><td class="center">
 <?php
 if ($disablenofollow) echo '<a class="login_table_title" href="https://www.dolibarr.org" target="_blank">';
-echo dol_escape_htmltag($title); 
+echo dol_escape_htmltag($title);
 if ($disablenofollow) echo '</a>';
 ?>
 </td></tr>
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index b641627b789..c05916d55a7 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -28,6 +28,9 @@ if (GETPOST('dol_use_jmobile')) $conf->dol_use_jmobile=1;
 // If we force to use jmobile, then we reenable javascript
 if (! empty($conf->dol_use_jmobile)) $conf->use_javascript_ajax=1;
 
+$php_self = dol_escape_htmltag($_SERVER['PHP_SELF']);
+$php_self.= dol_escape_htmltag($_SERVER["QUERY_STRING"])?'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]):'';
+
 print top_htmlhead('',$langs->trans('SendNewPassword'));
 ?>
 <!-- BEGIN PHP TEMPLATE PASSWORDFORGOTTEN.TPL.PHP -->
@@ -94,7 +97,7 @@ if (! empty($hookmanager->resArray['options'])) {
 }
 ?>
 
-<?php if ($captcha) { 
+<?php if ($captcha) {
 		// Add a variable param to force not using cache (jmobile)
 		$php_self = preg_replace('/[&\?]time=(\d+)/','',$php_self);	// Remove param time
 		if (preg_match('/\?/',$php_self)) $php_self.='&time='.dol_print_date(dol_now(),'dayhourlog');
@@ -129,7 +132,7 @@ if (! empty($hookmanager->resArray['options'])) {
 <div id="login_line2" style="clear: both">
 
 <!-- Button Send password -->
-<br><input id="password" type="submit" <?php echo $disabled; ?> class="button" name="password" value="<?php echo $langs->trans('SendNewPassword'); ?>" tabindex="4" />
+<br><input type="submit" <?php echo $disabled; ?> class="button" name="password" value="<?php echo $langs->trans('SendNewPassword'); ?>" tabindex="4" />
 
 <br>
 <div align="center" style="margin-top: 8px;">
diff --git a/htdocs/ecm/ajax/ecmdatabase.php b/htdocs/ecm/ajax/ecmdatabase.php
index ac3a45d5683..6753a4299b0 100644
--- a/htdocs/ecm/ajax/ecmdatabase.php
+++ b/htdocs/ecm/ajax/ecmdatabase.php
@@ -39,7 +39,7 @@ $element = GETPOST('element', 'alpha');
 
 top_httphead();
 
-//print '<!-- Ajax page called with url '.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].' -->'."\n";
+//print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Load original field value
 if (isset($action) && ! empty($action))
diff --git a/htdocs/expensereport/ajax/ajaxprojet.php b/htdocs/expensereport/ajax/ajaxprojet.php
index 6b9dd7e062f..423677c5da5 100644
--- a/htdocs/expensereport/ajax/ajaxprojet.php
+++ b/htdocs/expensereport/ajax/ajaxprojet.php
@@ -46,7 +46,7 @@ require '../../main.inc.php';
 //top_htmlhead("", "", 1);  // Replaced with top_httphead. An ajax page does not need html header.
 top_httphead();
 
-//print '<!-- Ajax page called with url '.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].' -->'."\n";
+//print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 dol_syslog(join(',',$_GET));
 
diff --git a/htdocs/externalsite/frames.php b/htdocs/externalsite/frames.php
index adf9d547073..6005b8e55b6 100644
--- a/htdocs/externalsite/frames.php
+++ b/htdocs/externalsite/frames.php
@@ -34,8 +34,8 @@ if (empty($conf->global->EXTERNALSITE_URL))
 	llxFooter();
 }
 
-$mainmenu=GETPOST('mainmenu', 'alpha');
-$leftmenu=GETPOST('leftmenu', 'alpha');
+$mainmenu=GETPOST('mainmenu', "aZ09");
+$leftmenu=GETPOST('leftmenu', "aZ09");
 $idmenu=GETPOST('idmenu', 'int');
 $theme=GETPOST('theme', 'alpha');
 $codelang=GETPOST('lang', 'aZ09');
diff --git a/htdocs/fourn/ajax/getSupplierPrices.php b/htdocs/fourn/ajax/getSupplierPrices.php
index af3d728dc78..9a8c24c4eba 100644
--- a/htdocs/fourn/ajax/getSupplierPrices.php
+++ b/htdocs/fourn/ajax/getSupplierPrices.php
@@ -46,7 +46,7 @@ $langs->load('margins');
 
 top_httphead();
 
-//print '<!-- Ajax page called with url '.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].' -->'."\n";
+//print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 if ($idprod > 0)
 {
@@ -55,7 +55,7 @@ if ($idprod > 0)
 
 	$sorttouse = 's.nom, pfp.quantity, pfp.price';
 	if (GETPOST('bestpricefirst')) $sorttouse = 'pfp.unitprice, s.nom, pfp.quantity, pfp.price';
-	
+
 	$productSupplierArray = $producttmp->list_product_fournisseur_price($idprod, $sorttouse);    // We list all price per supplier, and then firstly with the lower quantity. So we can choose first one with enough quantity into list.
 	if ( is_array($productSupplierArray))
 	{
@@ -63,15 +63,15 @@ if ($idprod > 0)
 		{
 			$price = $productSupplier->fourn_price * (1 - $productSupplier->fourn_remise_percent / 100);
 			$unitprice = $productSupplier->fourn_unitprice * (1 - $productSupplier->fourn_remise_percent / 100);
-			
+
 			$title = $productSupplier->fourn_name.' - '.$productSupplier->fourn_ref.' - ';
-			
+
 			if ($productSupplier->fourn_qty == 1)
 			{
 				$title.= price($price,0,$langs,0,0,-1,$conf->currency)."/";
 			}
 			$title.= $productSupplier->fourn_qty.' '.($productSupplier->fourn_qty == 1 ? $langs->trans("Unit") : $langs->trans("Units"));
-			
+
 			if ($productSupplier->fourn_qty > 1)
 			{
 				$title.=" - ";
@@ -84,19 +84,19 @@ if ($idprod > 0)
 				$title.= price($productSupplier->fourn_unitcharges,0,$langs,0,0,-1,$conf->currency);
 				$price += $productSupplier->fourn_unitcharges;
 			}
-			
+
 			$label = price($price,0,$langs,0,0,-1,$conf->currency)."/".$langs->trans("Unit");
 			if ($productSupplier->fourn_ref) $label.=' ('.$productSupplier->fourn_ref.')';
-			
+
 			$prices[] = array("id" => $productSupplier->product_fourn_price_id, "price" => price2num($price,0,'',0), "label" => $label, "title" => $title);  // For price field, we must use price2num(), for label or title, price()
 		}
 	}
-	
+
 	// Add price for costprice
 	$price=$producttmp->cost_price;
 	$prices[] = array("id" => 'costprice', "price" => price2num($price), "label" => $langs->trans("CostPrice").': '.price($price,0,$langs,0,0,-1,$conf->currency), "title" => $langs->trans("PMPValueShort").': '.price($price,0,$langs,0,0,-1,$conf->currency));  // For price field, we must use price2num(), for label or title, price()
 
-	if(!empty($conf->stock->enabled)) 
+	if(!empty($conf->stock->enabled))
 	{
 		// Add price for pmp
 		$price=$producttmp->pmp;
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 1ab8fbd785f..9523d489256 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -66,7 +66,7 @@ $year_end        = GETPOST('year_end');
 $search_employe  = GETPOST('search_employe');
 $search_valideur = GETPOST('search_valideur');
 $search_statut   = GETPOST('select_statut');
-$type            = GETPOST('type','int'); 
+$type            = GETPOST('type','int');
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
@@ -82,7 +82,7 @@ $fieldstosearchall = array(
  * Actions
  */
 
-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
 {
 	$search_ref="";
 	$month_create="";
@@ -168,7 +168,7 @@ if($year_create > 0) {
     }
 } else {
     if($month_create > 0) {
-        $filter.= " AND date_format(cp.date_create, '%m') = '$month_create'";
+        $filter.= " AND date_format(cp.date_create, '%m') = '".$db->escape($month_create)."'";
     }
 }
 
@@ -313,7 +313,7 @@ print '</td>';
 
 // DATE CREATE
 print '<td class="liste_titre" align="center">';
-print '<input class="flat" type="text" size="1" maxlength="2" name="month_create" value="'.$month_create.'">';
+print '<input class="flat" type="text" size="1" maxlength="2" name="month_create" value="'.dol_escape_htmltag($month_create).'">';
 $formother->select_year($year_create,'year_create',1, $min_year, 0);
 print '</td>';
 
@@ -409,7 +409,7 @@ if (! empty($holiday->holiday))
 		$userstatic->login=$infos_CP['user_login'];
 		$userstatic->statut=$infos_CP['user_statut'];
 		$userstatic->photo=$infos_CP['user_photo'];
-		
+
 		// Valideur
 		$approbatorstatic->id=$infos_CP['fk_validator'];
 		$approbatorstatic->lastname=$infos_CP['validator_lastname'];
@@ -417,7 +417,7 @@ if (! empty($holiday->holiday))
 		$approbatorstatic->login=$infos_CP['validator_login'];
 		$approbatorstatic->statut=$infos_CP['validator_statut'];
 		$approbatorstatic->photo=$infos_CP['validator_photo'];
-		
+
 		$date = $infos_CP['date_create'];
 
 		print '<tr '.$bc[$var].'>';
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 7e52b454f97..2806f2d06a0 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -97,8 +97,9 @@ function test_sql_and_script_inject($val, $type)
     $sql_inj += preg_match('/<script/i', $val);
     if (! defined('NOSTYLECHECK')) $sql_inj += preg_match('/<style/i', $val);
     $sql_inj += preg_match('/base[\s]+href/si', $val);
-    $sql_inj += preg_match('/<.*onmouse/si', $val);       // onmousexxx can be set on img or any html tag like <img title='>' onmouseover=alert(1)>
-    $sql_inj += preg_match('/onerror\s*=/i', $val);       // onerror can be set on img or any html tag like <img title='>' onerror = alert(1)>
+    $sql_inj += preg_match('/<.*onmouse/si', $val);       // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
+    $sql_inj += preg_match('/onerror\s*=/i', $val);       // onerror can be set on img or any html tag like <img title='...' onerror = alert(1)>
+//    $sql_inj += preg_match('/onfocus\s*=/i', $val);       // onfocus can be set on input text html tag like <input type='text' value='...' onfocus = alert(1)>
     if ($type == 1)
     {
         $sql_inj += preg_match('/javascript:/i', $val);
@@ -1477,14 +1478,14 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 	    // Link to print main content area
 	    if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && empty($conf->browser->phone))
 	    {
-	        $qs=$_SERVER["QUERY_STRING"];
+	        $qs=dol_escape_htmltag($_SERVER["QUERY_STRING"]);
 
 			foreach($_POST as $key=>$value) {
-				if($key!=='action' && !is_array($value))$qs.='&'.$key.'='.urlencode($value);
+				if ($key!=='action' && !is_array($value)) $qs.='&'.$key.'='.urlencode($value);
 			}
 
 			$qs.=(($qs && $morequerystring)?'&':'').$morequerystring;
-	        $text ='<a href="'.$_SERVER["PHP_SELF"].'?'.$qs.($qs?'&':'').'optioncss=print" target="_blank">';
+	        $text ='<a href="'.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.$qs.($qs?'&':'').'optioncss=print" target="_blank">';
 	        $text.= img_picto(":".$langs->trans("PrintContentArea"), 'printer_top.png', 'class="printer"');
 	        $text.='</a>';
 	        $toprightmenu.=@Form::textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text,'login_block_elem',2);
diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index 15541016963..8015f6f1172 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -57,7 +57,7 @@ $warehouseStatus = GETPOST('warehousestatus', 'alpha');
  * View
  */
 
-// print '<!-- Ajax page called with url '.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].' -->'."\n";
+// print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 dol_syslog(join(',', $_GET));
 // print_r($_GET);
diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php
index 7272524f9e3..76a4ce02b6e 100644
--- a/htdocs/product/stats/card.php
+++ b/htdocs/product/stats/card.php
@@ -69,7 +69,7 @@ if (! empty($id) || ! empty($ref) || GETPOST('id') == 'all')
     {
         llxHeader("",$langs->trans("ProductStatistics"));
 
-   	    $type = GETPOST('type');
+   	    $type = GETPOST('type', 'intcomma');
 
        	$helpurl='';
         if ($type == '0')
diff --git a/htdocs/public/paybox/paymentko.php b/htdocs/public/paybox/paymentko.php
index 09de4525b39..e4faf370126 100644
--- a/htdocs/public/paybox/paymentko.php
+++ b/htdocs/public/paybox/paymentko.php
@@ -62,7 +62,7 @@ $langs->load("paypal");
  * View
  */
 
-dol_syslog("Callback url when a PayBox payment was canceled. query_string=".(empty($_SERVER["QUERY_STRING"])?'':$_SERVER["QUERY_STRING"])." script_uri=".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]), LOG_DEBUG, 0, '_paybox');
+dol_syslog("Callback url when a PayBox payment was canceled. query_string=".(dol_escape_htmltag($_SERVER["QUERY_STRING"])?dol_escape_htmltag($_SERVER["QUERY_STRING"]):'')." script_uri=".(dol_escape_htmltag($_SERVER["SCRIPT_URI"])?dol_escape_htmltag($_SERVER["SCRIPT_URI"]):''), LOG_DEBUG, 0, '_paybox');
 
 $tracepost = "";
 foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
diff --git a/htdocs/public/paybox/paymentok.php b/htdocs/public/paybox/paymentok.php
index 9c3030a86ba..bc3993560c6 100644
--- a/htdocs/public/paybox/paymentok.php
+++ b/htdocs/public/paybox/paymentok.php
@@ -70,7 +70,7 @@ if (empty($PAYBOXFULLTAG)) $PAYBOXFULLTAG=GETPOST('fulltag');
  * View
  */
 
-dol_syslog("Callback url when a PayBox payment was done. query_string=".(empty($_SERVER["QUERY_STRING"])?'':$_SERVER["QUERY_STRING"])." script_uri=".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]), LOG_DEBUG, 0, '_paybox');
+dol_syslog("Callback url when a PayBox payment was done. query_string=".(dol_escape_htmltag($_SERVER["QUERY_STRING"])?dol_escape_htmltag($_SERVER["QUERY_STRING"]):'')." script_uri=".(dol_escape_htmltag($_SERVER["SCRIPT_URI"])?dol_escape_htmltag($_SERVER["SCRIPT_URI"]):''), LOG_DEBUG, 0, '_paybox');
 
 $tracepost = "";
 foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
diff --git a/htdocs/public/paypal/paymentko.php b/htdocs/public/paypal/paymentko.php
index 4bad572ed8b..c4b98843fa7 100644
--- a/htdocs/public/paypal/paymentko.php
+++ b/htdocs/public/paypal/paymentko.php
@@ -70,7 +70,7 @@ if (empty($PAYPALFULLTAG)) $PAYPALFULLTAG=GETPOST('fulltag');
  * View
  */
 
-dol_syslog("Callback url when a PayPal payment was canceled. query_string=".(empty($_SERVER["QUERY_STRING"])?'':$_SERVER["QUERY_STRING"])." script_uri=".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]), LOG_DEBUG, 0, '_paypal');
+dol_syslog("Callback url when a PayPal payment was canceled. query_string=".(dol_escape_htmltag($_SERVER["QUERY_STRING"])?dol_escape_htmltag($_SERVER["QUERY_STRING"]):'')." script_uri=".(dol_escape_htmltag($_SERVER["SCRIPT_URI"])?dol_escape_htmltag($_SERVER["SCRIPT_URI"]):''), LOG_DEBUG, 0, '_paypal');
 
 $tracepost = "";
 foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
@@ -90,8 +90,8 @@ if (! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL))
     $FinalPaymentAmt    = $_SESSION["Payment_Amount"];
     // From env
     $ipaddress          = $_SESSION['ipaddress'];
-    
-    
+
+
 	$sendto=$conf->global->PAYPAL_PAYONLINE_SENDEMAIL;
 	$from=$conf->global->MAILING_EMAIL_FROM;
 
diff --git a/htdocs/public/paypal/paymentok.php b/htdocs/public/paypal/paymentok.php
index 90f13aa6f17..8c9e8471195 100644
--- a/htdocs/public/paypal/paymentok.php
+++ b/htdocs/public/paypal/paymentok.php
@@ -100,7 +100,7 @@ if (empty($PAYPALFULLTAG)) $PAYPALFULLTAG=GETPOST('fulltag');
  * View
  */
 
-dol_syslog("Callback url when a PayPal payment was done. query_string=".(empty($_SERVER["QUERY_STRING"])?'':$_SERVER["QUERY_STRING"])." script_uri=".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]), LOG_DEBUG, 0, '_paypal');
+dol_syslog("Callback url when a PayPal payment was done. query_string=".(dol_escape_htmltag($_SERVER["QUERY_STRING"])?dol_escape_htmltag($_SERVER["QUERY_STRING"]):'')." script_uri=".(dol_escape_htmltag($_SERVER["SCRIPT_URI"])?dol_escape_htmltag($_SERVER["SCRIPT_URI"]):''), LOG_DEBUG, 0, '_paypal');
 
 $tracepost = "";
 foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
diff --git a/htdocs/societe/ajax/company.php b/htdocs/societe/ajax/company.php
index 32f57f73c25..36751b709c0 100644
--- a/htdocs/societe/ajax/company.php
+++ b/htdocs/societe/ajax/company.php
@@ -43,7 +43,7 @@ $id=GETPOST('id', 'int');
  * View
  */
 
-//print '<!-- Ajax page called with url '.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].' -->'."\n";
+//print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 dol_syslog(join(',', $_GET));
 //print_r($_GET);
@@ -62,7 +62,7 @@ if (! empty($action) && $action == 'fetch' && ! empty($id))
 		$outlabel = '';
 		$outdesc = '';
 		$outtype = $object->type;
-		
+
 		$outjson = array('ref' => $outref,'name' => $outname,'desc' => $outdesc,'type' => $outtype);
 	}
 
diff --git a/htdocs/societe/ajaxcompanies.php b/htdocs/societe/ajaxcompanies.php
index b3565a2ca26..0a7ea058ba7 100644
--- a/htdocs/societe/ajaxcompanies.php
+++ b/htdocs/societe/ajaxcompanies.php
@@ -44,7 +44,7 @@ require '../main.inc.php';
 //top_htmlhead("", "", 1);  // Replaced with top_httphead. An ajax page does not need html header.
 top_httphead();
 
-//print '<!-- Ajax page called with url '.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].' -->'."\n";
+//print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 dol_syslog(join(',',$_GET));
 
diff --git a/htdocs/societe/ajaxcountries.php b/htdocs/societe/ajaxcountries.php
index 7eb22035d6b..b9d1bf5fc8c 100644
--- a/htdocs/societe/ajaxcountries.php
+++ b/htdocs/societe/ajaxcountries.php
@@ -45,7 +45,7 @@ $country=GETPOST('country', 'alpha');
 //top_htmlhead("", "", 1);  // Replaced with top_httphead. An ajax page does not need html header.
 top_httphead();
 
-print '<!-- Ajax page called with url '.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].' -->'."\n";
+print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 dol_syslog(join(',',$_POST));
 
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index cb38d1c9e49..92144f4be69 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -152,9 +152,6 @@ if ($action == 'buildnewpassword' && $username)
  * View
  */
 
-$php_self = $_SERVER['PHP_SELF'];
-$php_self.= $_SERVER["QUERY_STRING"]?'?'.$_SERVER["QUERY_STRING"]:'';
-
 $dol_url_root = DOL_URL_ROOT;
 
 // Title

From 819656bd89726bd7974748f88b113dc1d5b4b905 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 18 Jun 2017 21:27:49 +0200
Subject: [PATCH 268/438] Fix security: Check _SERVER["QUERY_STRING"] is
 escaped.

---
 htdocs/accountancy/admin/accountmodel.php |  2 +-
 htdocs/main.inc.php                       |  2 +-
 test/phpunit/CodingPhpTest.php            | 19 ++++++++++++++++++-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index 80dcd2b1807..736338d1b88 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -599,7 +599,7 @@ if ($id)
 
     $fieldlist=explode(',',$tabfield[$id]);
 
-    print '<form action="'.dol_escape_htmltag($_SERVER['PHP_SELF']).'?id='.$id.'" method="POST">';
+    print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
     print '<table class="noborder" width="100%">';
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 407a0dbb1d0..022aa4d5e44 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -99,7 +99,7 @@ function test_sql_and_script_inject($val, $type)
     $sql_inj += preg_match('/base[\s]+href/si', $val);
     $sql_inj += preg_match('/<.*onmouse/si', $val);       // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
     $sql_inj += preg_match('/onerror\s*=/i', $val);       // onerror can be set on img or any html tag like <img title='...' onerror = alert(1)>
-//    $sql_inj += preg_match('/onfocus\s*=/i', $val);       // onfocus can be set on input text html tag like <input type='text' value='...' onfocus = alert(1)>
+    $sql_inj += preg_match('/onfocus\s*=/i', $val);       // onfocus can be set on input text html tag like <input type='text' value='...' onfocus = alert(1)>
     if ($type == 1)
     {
         $sql_inj += preg_match('/javascript:/i', $val);
diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php
index 581d5cdda89..5df31da812c 100644
--- a/test/phpunit/CodingPhpTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -172,9 +172,25 @@ class CodingPhpTest extends PHPUnit_Framework_TestCase
             $this->assertTrue($ok, 'Found non escaped string in building of a sql request '.$file['fullname'].' ('.$val[0].'). Bad.');
             //exit;
 
+            // Test that output of $_SERVER\[\'QUERY_STRING\'\] is escaped.
             $ok=true;
             $matches=array();
             // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
+            preg_match_all('/(...................)\$_SERVER\[\'QUERY_STRING\'\]/', $filecontent, $matches, PREG_SET_ORDER);
+            foreach($matches as $key => $val)
+            {
+                if ($val[1] != 'dol_escape_htmltag(')
+                {
+                    $ok=false;
+                    break;
+                }
+            }
+            $this->assertTrue($ok, 'Found a $_SERVER[\'QUERY_STRING\'] without dol_escape_htmltag around in file '.$file['fullname'].' ('.$val[1].'$_SERVER[\'QUERY_STRING\']). Bad.');
+
+            // Test that output of $_SERVER\[\'PHP_SELF\'\] is escaped (not done for the moment, did not found a way to forge value of $_SERVER['PHP_SELF'] by extern access).
+            /*$ok=true;
+            $matches=array();
+            // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
             preg_match_all('/(...................)\$_SERVER\[\'PHP_SELF\'\]/', $filecontent, $matches, PREG_SET_ORDER);
             foreach($matches as $key => $val)
             {
@@ -184,7 +200,8 @@ class CodingPhpTest extends PHPUnit_Framework_TestCase
                     break;
                 }
             }
-            $this->assertTrue($ok, 'Found a $_SERVER[\'QUERY_STRING\'] without dol_escape_htmltag around in file '.$file['fullname'].' ('.$val[1].'$_SERVER[\'QUERY_STRING\']). Bad.');
+            $this->assertTrue($ok, 'Found a $_SERVER[\'PHP_SELF\'] without dol_escape_htmltag around in file '.$file['fullname'].' ('.$val[1].'$_SERVER[\'PHP_SELF\']). Bad.');
+            */
         }
 
         return;

From 0ef507ae7fd609ef90af4cf035c2e3fe4c27e21e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 18 Jun 2017 21:52:51 +0200
Subject: [PATCH 269/438] Fix rename of file to remove .noexe extension.

---
 htdocs/comm/propal/document.php         | 39 +++++++++++++------------
 htdocs/core/actions_linkedfiles.inc.php | 19 ++++++++----
 htdocs/core/lib/files.lib.php           |  6 ++--
 3 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index 9b875e434f7..aef0ade7c84 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2003-2004 Rodolphe Quiedeville  <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2009 Laurent Destailleur   <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2017 Laurent Destailleur   <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
  * Copyright (C) 2005-2012 Regis Houssin         <regis.houssin@capnetworks.com>
  * Copyright (C) 2013      Cédric Salvador       <csalvador@gpcsolutions.fr>
@@ -63,17 +63,18 @@ if (! $sortfield) $sortfield="name";
 
 $object = new Propal($db);
 $object->fetch($id,$ref);
-if ($object->id > 0)
-{
-	$object->fetch_thirdparty();
-	$upload_dir = $conf->propal->dir_output.'/'.dol_sanitizeFileName($object->ref);
-	include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
-}
+
 
 /*
  * Actions
  */
 
+if ($object->id > 0)
+{
+    $object->fetch_thirdparty();
+    $upload_dir = $conf->propal->dir_output.'/'.dol_sanitizeFileName($object->ref);
+    include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
+}
 
 
 /*
@@ -101,10 +102,10 @@ if ($object->id > 0)
 
 
 	// Proposal card
-	
+
 	$linkback = '<a href="' . DOL_URL_ROOT . '/comm/propal/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
-	
-	
+
+
 	$morehtmlref='<div class="refidno">';
 	// Ref customer
 	$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
@@ -145,24 +146,24 @@ if ($object->id > 0)
 	    }
 	}
 	$morehtmlref.='</div>';
-	
+
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-	
-	
+
+
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
-	
+
 	print '<table class="border" width="100%">';
-	
+
 	// Files infos
 	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td>'.count($filearray).'</td></tr>';
 	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td>'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
-	
+
 	print "</table>\n";
-	
+
 	print '</div>';
-	
-	
+
+
 	dol_fiche_end();
 
 	$modulepart = 'propal';
diff --git a/htdocs/core/actions_linkedfiles.inc.php b/htdocs/core/actions_linkedfiles.inc.php
index 672da011a79..fb9f44edcfb 100644
--- a/htdocs/core/actions_linkedfiles.inc.php
+++ b/htdocs/core/actions_linkedfiles.inc.php
@@ -71,7 +71,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
 
             $ret = dol_delete_file($file, 0, 0, 0, $object);
             if (! empty($fileold)) dol_delete_file($fileold, 0, 0, 0, $object);     // Delete file using old path
-            
+
 	        // Si elle existe, on efface la vignette
 	        if (preg_match('/(\.jpg|\.jpeg|\.bmp|\.gif|\.png|\.tiff)$/i',$file,$regs))
 	        {
@@ -150,19 +150,28 @@ elseif ($action == 'renamefile' && GETPOST('renamefilesave'))
         {
             $filenamefrom=dol_sanitizeFileName(GETPOST('renamefilefrom'));
             $filenameto=dol_sanitizeFileName(GETPOST('renamefileto'));
+
+            // Security:
+            // Disallow file with some extensions. We rename them.
+            // Because if we put the documents directory into a directory inside web root (very bad), this allows to execute on demand arbitrary code.
+            if (preg_match('/\.htm|\.html|\.php|\.pl|\.cgi$/i',$filenameto) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED))
+            {
+                $filenameto.= '.noexe';
+            }
+
             if ($filenamefrom && $filenameto)
             {
                 $srcpath = $upload_dir.'/'.$filenamefrom;
                 $destpath = $upload_dir.'/'.$filenameto;
-    
+
                 $result = dol_move($srcpath, $destpath);
-                if ($result) 
+                if ($result)
                 {
                     $object->addThumbs($destpath);
-                    
+
                     // TODO Add revert function of addThumbs
                     //$object->delThumbs($srcpath);
-                    
+
                     setEventMessages($langs->trans("FileRenamed"), null);
                 }
                 else setEventMessages($langs->trans("ErrorFailToRenameFile", $filenamefrom, $filenameto), null, 'errors');
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index a4680ca81e2..29706e15341 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -634,9 +634,9 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
 			}
 		}
 
-		// Security:
-		// Disallow file with some extensions. We renamed them.
-		// Car si on a mis le rep documents dans un rep de la racine web (pas bien), cela permet d'executer du code a la demande.
+        // Security:
+        // Disallow file with some extensions. We rename them.
+        // Because if we put the documents directory into a directory inside web root (very bad), this allows to execute on demand arbitrary code.
 		if (preg_match('/\.htm|\.html|\.php|\.pl|\.cgi$/i',$dest_file) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED))
 		{
 			$file_name.= '.noexe';

From 8debefa8ad6404ec434a6d77efa85d275fa33eb9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 18 Jun 2017 21:53:06 +0200
Subject: [PATCH 270/438] Fix php sanitazing

---
 htdocs/don/card.php     | 87 ++++++++++-------------------------------
 htdocs/holiday/list.php |  8 ++--
 2 files changed, 24 insertions(+), 71 deletions(-)

diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 0ace5c88e76..f2e7ade706d 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -50,7 +50,7 @@ $cancel=GETPOST('cancel');
 $amount=GETPOST('amount');
 $donation_date=dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
 $projectid = (GETPOST('projectid') ? GETPOST('projectid', 'int') : 0);
-    
+
 $object = new Don($db);
 $extrafields = new ExtraFields($db);
 
@@ -316,17 +316,17 @@ if ($action == 'create')
 	print '</td>';
 
     // Amount
-    print "<tr>".'<td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="amount" value="'.GETPOST("amount").'" size="10"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
+    print "<tr>".'<td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="amount" value="'.dol_escape_htmltag(GETPOST("amount")).'" size="10"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
 
 	print '<tr><td class="fieldrequired">'.$langs->trans("PublicDonation")."</td><td>";
 	print $form->selectyesno("public",isset($_POST["public"])?$_POST["public"]:1,1);
 	print "</td></tr>\n";
 
-	print "<tr>".'<td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" value="'.GETPOST("societe").'" size="40"></td></tr>';
-	print "<tr>".'<td>'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" value="'.GETPOST("lastname").'" size="40"></td></tr>';
-	print "<tr>".'<td>'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" value="'.GETPOST("firstname").'" size="40"></td></tr>';
+	print "<tr>".'<td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" value="'.dol_escape_htmltag(GETPOST("societe")).'" size="40"></td></tr>';
+	print "<tr>".'<td>'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" value="'.dol_escape_htmltag(GETPOST("lastname")).'" size="40"></td></tr>';
+	print "<tr>".'<td>'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" value="'.dol_escape_htmltag(GETPOST("firstname")).'" size="40"></td></tr>';
 	print "<tr>".'<td>'.$langs->trans("Address").'</td><td>';
-	print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="3">'.GETPOST("address").'</textarea></td></tr>';
+	print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="3">'.dol_escape_htmltag(GETPOST("address")).'</textarea></td></tr>';
 
     // Zip / Town
     print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
@@ -341,7 +341,7 @@ if ($action == 'create')
     if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
     print '</td></tr>';
 
-	print "<tr>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" value="'.GETPOST("email").'" size="40"></td></tr>';
+	print "<tr>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" value="'.dol_escape_htmltag(GETPOST("email")).'" size="40"></td></tr>';
 
 	// Public note
 	print '<tr>';
@@ -384,9 +384,9 @@ if ($action == 'create')
 	dol_fiche_end();
 
 	print '<div class="center">';
-	print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+	print '<input type="submit" class="button" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="button" class="button" value="' . $langs->trans("Cancel") . '" onClick="javascript:history.go(-1)">';
+	print '<input type="button" class="button" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" onClick="javascript:history.go(-1)">';
 	print '</div>';
 
 	print "</form>\n";
@@ -438,7 +438,7 @@ if (! empty($id) && $action == 'edit')
 	// Amount
 	if ($object->statut == 0)
 	{
-		print "<tr>".'<td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="amount" size="10" value="'.$object->amount.'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
+		print "<tr>".'<td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="amount" size="10" value="'.dol_escape_htmltag($object->amount).'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
 	}
 	else
 	{
@@ -453,11 +453,11 @@ if (! empty($id) && $action == 'edit')
 	print "</tr>\n";
 
 	$langs->load("companies");
-	print '<tr><td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" size="40" value="'.$object->societe.'"></td></tr>';
-	print '<tr><td>'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" size="40" value="'.$object->lastname.'"></td></tr>';
-	print '<tr><td>'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" size="40" value="'.$object->firstname.'"></td></tr>';
+	print '<tr><td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" size="40" value="'.dol_escape_htmltag($object->societe).'"></td></tr>';
+	print '<tr><td>'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" size="40" value="'.dol_escape_htmltag($object->lastname).'"></td></tr>';
+	print '<tr><td>'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" size="40" value="'.dol_escape_htmltag($object->firstname).'"></td></tr>';
 	print '<tr><td>'.$langs->trans("Address").'</td><td>';
-	print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.$object->address.'</textarea></td></tr>';
+	print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag($object->address).'</textarea></td></tr>';
 
     // Zip / Town
     print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
@@ -472,7 +472,7 @@ if (! empty($id) && $action == 'edit')
 	if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
 	print '</td></tr>';
 
-	print "<tr>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" size="40" value="'.$object->email.'"></td></tr>';
+	print "<tr>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" size="40" value="'.dol_escape_htmltag($object->email).'"></td></tr>';
 
     print "<tr><td>".$langs->trans("PaymentMode")."</td><td>\n";
 
@@ -544,9 +544,9 @@ if (! empty($id) && $action != 'edit')
 
 	// Print form confirm
 	print $formconfirm;
-	
+
 	$linkback = '<a href="'.DOL_URL_ROOT.'/don/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
-	
+
 	$morehtmlref='<div class="refidno">';
 	// Project
 	if (! empty($conf->projet->enabled))
@@ -581,8 +581,8 @@ if (! empty($id) && $action != 'edit')
 	    }
 	}
 	$morehtmlref.='</div>';
-	
-	
+
+
     dol_banner_tab($object, 'rowid', $linkback, 1, 'rowid', 'ref', $morehtmlref);
 
 
@@ -592,13 +592,6 @@ if (! empty($id) && $action != 'edit')
 
     print '<table class="border" width="100%">';
 
-	// Ref
-	/*
-	print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td colspan="2">';
-	print $form->showrefnav($object, 'rowid', $linkback, 1, 'rowid', 'ref', '');
-	print '</td>';
-	print '</tr>';
-    */
 	// Date
 	print '<tr><td class="titlefield">'.$langs->trans("Date").'</td><td colspan="2">';
 	print dol_print_date($object->date,"day");
@@ -615,52 +608,12 @@ if (! empty($id) && $action != 'edit')
 	print '<tr><td>'.$langs->trans("Company").'</td><td colspan="2">'.$object->societe.'</td></tr>';
 	print '<tr><td>'.$langs->trans("Lastname").'</td><td colspan="2">'.$object->lastname.'</td></tr>';
 	print '<tr><td>'.$langs->trans("Firstname").'</td><td colspan="2">'.$object->firstname.'</td></tr>';
-	/*print '<tr><td>'.$langs->trans("Address").'</td><td>'.dol_nl2br($object->address).'</td>';
 
-	// Zip / Town
-	print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
-	print $object->zip.($object->zip && $object->town?' / ':'').$object->town.'</td></tr>';
-	
-	// Country
-	print '<tr><td>'.$langs->trans('Country').'</td><td>';
-	if (! empty($object->country_code))
-	{
-	    $img=picto_from_langcode($object->country_code);
-	    print ($img?$img.' ':'');
-	    print $object->country;
-	}
-	else
-	{
-	    print $object->country_olddata;
-	}
-	print '</td></tr>';
-	
-	// EMail
-	print "<tr>".'<td>'.$langs->trans("EMail").'</td><td>'.dol_print_email($object->email).'</td></tr>';
-	*/
-	
 	// Payment mode
 	print "<tr><td>".$langs->trans("PaymentMode")."</td><td>";
 	$form->form_modes_reglement(null, $object->modepaymentid,'none');
 	print "</td></tr>\n";
-	
-	//print "<tr>".'<td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
-	
-	// Project
-	/*
-	if (! empty($conf->projet->enabled))
-	{
-	    print '<tr>';
-	    print '<td>'.$langs->trans("Project").'</td>';
-	    print '<td>';
-	    $projettmp=new Project($db);
-	    $projettmp->id=$object->fk_projet;
-	    $projettmp->ref=$object->project;
-	    if(! empty($object->fk_projet)) print $projettmp->getNomUrl(1);
-	    print '</td>';
-	    print '</tr>';
-	}*/
-	
+
 	// Other attributes
 	$cols = 2;
 	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 9523d489256..90db40fd2e7 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -138,7 +138,7 @@ if($year_start > 0) {
     }
 } else {
     if($month_start > 0) {
-        $filter.= " AND date_format(cp.date_debut, '%m') = '$month_start'";
+        $filter.= " AND date_format(cp.date_debut, '%m') = '".$db->escape($month_start)."'";
     }
 }
 
@@ -153,7 +153,7 @@ if($year_end > 0) {
     }
 } else {
     if($month_end > 0) {
-        $filter.= " AND date_format(cp.date_fin, '%m') = '$month_end'";
+        $filter.= " AND date_format(cp.date_fin, '%m') = '".$db->escape($month_end)."'";
     }
 }
 
@@ -368,13 +368,13 @@ print '<td class="liste_titre">&nbsp;</td>';
 
 // DATE DEBUT
 print '<td class="liste_titre" align="center">';
-print '<input class="flat" type="text" size="1" maxlength="2" name="month_start" value="'.$month_start.'">';
+print '<input class="flat" type="text" size="1" maxlength="2" name="month_start" value="'.dol_escape_htmltag($month_start).'">';
 $formother->select_year($year_start,'year_start',1, $min_year, $max_year);
 print '</td>';
 
 // DATE FIN
 print '<td class="liste_titre" align="center">';
-print '<input class="flat" type="text" size="1" maxlength="2" name="month_end" value="'.$month_end.'">';
+print '<input class="flat" type="text" size="1" maxlength="2" name="month_end" value="'.dol_escape_htmltag($month_end).'">';
 $formother->select_year($year_end,'year_end',1, $min_year, $max_year);
 print '</td>';
 

From f3a5975cf861ef4bf315d71e197db97cece1f36e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 18 Jun 2017 21:58:56 +0200
Subject: [PATCH 271/438] Fix sql injection

---
 htdocs/comm/propal/list.php | 122 ++++++++++++++++++------------------
 1 file changed, 61 insertions(+), 61 deletions(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index efb72afb7b7..b8267feb5bc 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -161,7 +161,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
     }
 }
 
-$object = new Propal($db);	// To be passed as parameter of executeHooks that need 
+$object = new Propal($db);	// To be passed as parameter of executeHooks that need
 
 
 /*
@@ -273,25 +273,25 @@ if (! $user->rights->societe->client->voir && ! $socid) //restriction
 	$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 }
 if ($search_town)  $sql.= natural_search('s.town', $search_town);
-if ($search_zip)   $sql.= natural_search("s.zip",$search_zip);
-if ($search_state) $sql.= natural_search("state.nom",$search_state);
-if ($search_country) $sql .= " AND s.fk_pays IN (".$search_country.')';
-if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
-if ($search_ref)   $sql .= natural_search('p.ref', $search_ref);
+if ($search_zip)   $sql.= natural_search("s.zip", $search_zip);
+if ($search_state) $sql.= natural_search("state.nom", $search_state);
+if ($search_country) $sql .= " AND s.fk_pays IN (".$db->escape($search_country).')';
+if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$db->escape($search_type_thirdparty).')';
+if ($search_ref)         $sql .= natural_search('p.ref', $search_ref);
 if ($search_refcustomer) $sql .= natural_search('p.ref_client', $search_refcustomer);
-if ($search_societe) $sql .= natural_search('s.nom', $search_societe);
-if ($search_login) $sql.= " AND u.login LIKE '%".$db->escape(trim($search_login))."%'";
+if ($search_societe)     $sql .= natural_search('s.nom', $search_societe);
+if ($search_login)       $sql .= natural_search("u.login", $search_login);
 if ($search_montant_ht != '')  $sql.= natural_search("p.total_ht", $search_montant_ht, 1);
 if ($search_montant_vat != '') $sql.= natural_search("p.tva", $search_montant_vat, 1);
 if ($search_montant_ttc != '') $sql.= natural_search("p.total", $search_montant_ttc, 1);
 if ($sall) {
     $sql .= natural_search(array_keys($fieldstosearchall), $sall);
 }
-if ($search_product_category > 0) $sql.=" AND cp.fk_categorie = ".$search_product_category;
+if ($search_product_category > 0) $sql.=" AND cp.fk_categorie = ".$db->escape($search_product_category);
 if ($socid > 0) $sql.= ' AND s.rowid = '.$socid;
 if ($viewstatut != '' && $viewstatut != '-1')
 {
-	$sql.= ' AND p.fk_statut IN ('.$viewstatut.')';
+	$sql.= ' AND p.fk_statut IN ('.$db->escape($viewstatut).')';
 }
 if ($month > 0)
 {
@@ -300,16 +300,16 @@ if ($month > 0)
     else if ($year > 0 && ! empty($day))
     $sql.= " AND p.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."'";
     else
-    $sql.= " AND date_format(p.datep, '%m') = '".$month."'";
+    $sql.= " AND date_format(p.datep, '%m') = '".$db->escape($month)."'";
 }
 else if ($year > 0)
 {
 	$sql.= " AND p.datep BETWEEN '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
 }
-if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$search_sale;
+if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$db->escape($search_sale);
 if ($search_user > 0)
 {
-    $sql.= " AND c.fk_c_type_contact = tc.rowid AND tc.element='propal' AND tc.source='internal' AND c.element_id = p.rowid AND c.fk_socpeople = ".$search_user;
+    $sql.= " AND c.fk_c_type_contact = tc.rowid AND tc.element='propal' AND tc.source='internal' AND c.element_id = p.rowid AND c.fk_socpeople = ".$db->escape($search_user);
 }
 // Add where from extra fields
 foreach ($search_array_options as $key => $val)
@@ -357,12 +357,12 @@ if ($resql)
 	else
 	{
 	    $title = $langs->trans('ListOfProposals');
-	}	
+	}
 
 	$num = $db->num_rows($resql);
-	
+
 	$arrayofselected=is_array($toselect)?$toselect:array();
-	
+
 	$param='&viewstatut='.$viewstatut;
     if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
@@ -386,7 +386,7 @@ if ($resql)
 	    $tmpkey=preg_replace('/search_options_/','',$key);
 	    if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
 	}
-	
+
 	// List of mass actions available
 	$arrayofmassactions =  array(
 	    'presend'=>$langs->trans("SendByMail"),
@@ -395,7 +395,7 @@ if ($resql)
 	if ($user->rights->propal->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
 	if ($massaction == 'presend') $arrayofmassactions=array();
 	$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
-	
+
 	// Lignes des champs de filtre
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -406,11 +406,11 @@ if ($resql)
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit);
-	
+
 	if ($massaction == 'presend')
 	{
 	    $langs->load("mails");
-	
+
 	    if (! GETPOST('cancel'))
 	    {
 	        $objecttmp=new Propal($db);
@@ -429,17 +429,17 @@ if ($resql)
 	            }
 	        }
 	    }
-	
+
 	    print '<input type="hidden" name="massaction" value="confirm_presend">';
-	
+
 	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 	    $formmail = new FormMail($db);
-	
+
 	    dol_fiche_head(null, '', '');
-	
+
 	    $topicmail="SendSupplierProposalRef";
 	    $modelmail="supplier_proposal_send";
-	
+
 	    // Cree l'objet formulaire mail
 	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 	    $formmail = new FormMail($db);
@@ -492,25 +492,25 @@ if ($resql)
 	    $formmail->substit['__REFCLIENT__']='__REFCLIENT__';	// We want to keep the tag
 	    $formmail->substit['__PERSONALIZED__']='';
 	    $formmail->substit['__CONTACTCIVNAME__']='';
-	
+
 	    // Tableau des parametres complementaires du post
 	    $formmail->param['action']=$action;
 	    $formmail->param['models']=$modelmail;
 	    $formmail->param['models_id']=GETPOST('modelmailselected','int');
 	    $formmail->param['id']=join(',',$arrayofselected);
 	    //$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-	
+
 	    print $formmail->get_form();
-	
+
 	    dol_fiche_end();
 	}
-	
+
 	if ($sall)
     {
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
         print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
     }
-	
+
 	$i = 0;
 
 	$moreforfilter='';
@@ -546,7 +546,7 @@ if ($resql)
 	$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
 	if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
 	else $moreforfilter = $hookmanager->resPrint;
-	
+
 	if (! empty($moreforfilter))
 	{
         print '<div class="liste_titre liste_titre_bydiv centpercent">';
@@ -556,10 +556,10 @@ if ($resql)
 
     $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
     $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-	
+
     print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-	
+
 	// Fields title
 	print '<tr class="liste_titre">';
 	if (! empty($arrayfields['p.ref']['checked']))            print_liste_field_titre($arrayfields['p.ref']['label'],$_SERVER["PHP_SELF"],'p.ref','',$param,'',$sortfield,$sortorder);
@@ -579,9 +579,9 @@ if ($resql)
 	// Extra fields
 	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 	{
-	   foreach($extrafields->attribute_label as $key => $val) 
+	   foreach($extrafields->attribute_label as $key => $val)
 	   {
-           if (! empty($arrayfields["ef.".$key]['checked'])) 
+           if (! empty($arrayfields["ef.".$key]['checked']))
            {
 				$align=$extrafields->getAlignFlag($key);
 				print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
@@ -597,9 +597,9 @@ if ($resql)
 	if (! empty($arrayfields['p.fk_statut']['checked'])) print_liste_field_titre($arrayfields['p.fk_statut']['label'],$_SERVER["PHP_SELF"],"p.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
 	print '</tr>'."\n";
-	
+
 	print '<tr class="liste_titre">';
-	if (! empty($arrayfields['p.ref']['checked']))            
+	if (! empty($arrayfields['p.ref']['checked']))
 	{
 	    print '<td class="liste_titre">';
     	print '<input class="flat" size="6" type="text" name="search_ref" value="'.$search_ref.'">';
@@ -641,7 +641,7 @@ if ($resql)
     	print '</td>';
     }
 	// Date
-	if (! empty($arrayfields['p.date']['checked'])) 
+	if (! empty($arrayfields['p.date']['checked']))
 	{
 	    print '<td class="liste_titre" colspan="1" align="center">';
     	//print $langs->trans('Month').': ';
@@ -653,7 +653,7 @@ if ($resql)
     	print '</td>';
 	}
 	// Date end
-	if (! empty($arrayfields['p.fin_validite']['checked'])) 
+	if (! empty($arrayfields['p.fin_validite']['checked']))
 	{
 	   print '<td class="liste_titre" colspan="1">&nbsp;</td>';
 	}
@@ -736,7 +736,7 @@ if ($resql)
 	$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
 	print $searchpitco;
 	print '</td>';
-	
+
 	print "</tr>\n";
 
 	$now = dol_now();
@@ -747,16 +747,16 @@ if ($resql)
 	{
 		$obj = $db->fetch_object($resql);
 		$var=!$var;
-		
+
     	$objectstatic->id=$obj->rowid;
     	$objectstatic->ref=$obj->ref;
-    		
+
 		print '<tr '.$bc[$var].'>';
-		
+
 		if (! empty($arrayfields['p.ref']['checked']))
 		{
     		print '<td class="nowrap">';
-    
+
     		print '<table class="nobordernopadding"><tr class="nocellnopadd">';
             // Picto + Ref
     		print '<td class="nobordernopadding nowrap">';
@@ -785,11 +785,11 @@ if ($resql)
     		$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
     		print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
     		print '</td></tr></table>';
-    
+
     		print "</td>\n";
     		if (! $i) $totalarray['nbfield']++;
 		}
-		
+
 		if (! empty($arrayfields['p.ref_client']['checked']))
 		{
     		// Customer ref
@@ -798,12 +798,12 @@ if ($resql)
     		print '</td>';
     		if (! $i) $totalarray['nbfield']++;
 		}
-		
+
 		$companystatic->id=$obj->socid;
 		$companystatic->name=$obj->name;
 		$companystatic->client=$obj->client;
 		$companystatic->code_client=$obj->code_client;
-		
+
 		// Thirdparty
 		if (! empty($arrayfields['s.nom']['checked']))
 		{
@@ -812,7 +812,7 @@ if ($resql)
     		print '</td>';
     		if (! $i) $totalarray['nbfield']++;
 		}
-		
+
 		// Town
         if (! empty($arrayfields['s.town']['checked']))
         {
@@ -853,7 +853,7 @@ if ($resql)
             print '</td>';
             if (! $i) $totalarray['nbfield']++;
         }
-        
+
 		// Date proposal
         if (! empty($arrayfields['p.date']['checked']))
         {
@@ -862,7 +862,7 @@ if ($resql)
     		print "</td>\n";
     		if (! $i) $totalarray['nbfield']++;
         }
-        
+
 		// Date end validity
         if (! empty($arrayfields['p.fin_validite']['checked']))
         {
@@ -877,7 +877,7 @@ if ($resql)
     		}
     		if (! $i) $totalarray['nbfield']++;
         }
-        
+
         // Amount HT
         if (! empty($arrayfields['p.total_ht']['checked']))
         {
@@ -902,7 +902,7 @@ if ($resql)
 		    if (! $i) $totalarray['totalttcfield']=$totalarray['nbfield'];
 		    $totalarray['totalttc'] += $obj->total_ttc;
         }
-        
+
         $userstatic->id=$obj->fk_user_author;
 		$userstatic->login=$obj->login;
 
@@ -915,7 +915,7 @@ if ($resql)
     		print "</td>\n";
     		if (! $i) $totalarray['nbfield']++;
         }
-        
+
         // Extra fields
         if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
         {
@@ -1000,20 +1000,20 @@ if ($resql)
 		   else print '<td></td>';
 		}
 		print '</tr>';
-		
+
 	}
 
 	$db->free($resql);
-	
+
 	$parameters=array('arrayfields'=>$arrayfields, 'sql'=>$sql);
 	$reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-				
+
 	print '</table>'."\n";
     print '</div>'."\n";
 
 	print '</form>'."\n";
-	
+
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
 	{
 	    /*
@@ -1021,18 +1021,18 @@ if ($resql)
 	     */
 	    $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
 	    $urlsource.=str_replace('&amp;','&',$param);
-	
+
 	    $filedir=$diroutputmassaction;
 	    $genallowed=$user->rights->propal->lire;
 	    $delallowed=$user->rights->propal->lire;
-	
+
 	    print $formfile->showdocuments('massfilesarea_proposals','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,'','');
 	}
 	else
 	{
 	    print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
 	}
-	
+
 }
 else
 {

From 317ab64d7c4be7a090ec0de70f816c4392798622 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 18 Jun 2017 22:03:25 +0200
Subject: [PATCH 272/438] Fix escapement

---
 htdocs/comm/propal/list.php | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index b8267feb5bc..93c93850652 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -363,22 +363,22 @@ if ($resql)
 
 	$arrayofselected=is_array($toselect)?$toselect:array();
 
-	$param='&viewstatut='.$viewstatut;
-    if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-	if ($sall)				 $param.='&sall='.$sall;
-	if ($month)              $param.='&month='.$month;
-	if ($year)               $param.='&year='.$year;
-    if ($search_ref)         $param.='&search_ref=' .$search_ref;
-    if ($search_refcustomer) $param.='&search_refcustomer=' .$search_refcustomer;
-    if ($search_societe)     $param.='&search_societe=' .$search_societe;
-	if ($search_user > 0)    $param.='&search_user='.$search_user;
-	if ($search_sale > 0)    $param.='&search_sale='.$search_sale;
-	if ($search_montant_ht)  $param.='&search_montant_ht='.$search_montant_ht;
-	if ($search_login)  	 $param.='&search_login='.$search_login;
-	if ($search_town)		 $param.='&search_town='.$search_town;
-	if ($socid > 0)          $param.='&socid='.$socid;
-	if ($optioncss != '') $param.='&optioncss='.$optioncss;
+	$param='&viewstatut='.urlencode($viewstatut);
+    if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
+	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
+	if ($sall)				 $param.='&sall='.urlencode($sall);
+	if ($month)              $param.='&month='.urlencode($month);
+	if ($year)               $param.='&year='.urlencode($year);
+    if ($search_ref)         $param.='&search_ref='.urlencode($search_ref);
+    if ($search_refcustomer) $param.='&search_refcustomer='.urlencode($search_refcustomer);
+    if ($search_societe)     $param.='&search_societe='.urlencode($search_societe);
+	if ($search_user > 0)    $param.='&search_user='.urlencode($search_user);
+	if ($search_sale > 0)    $param.='&search_sale='.urlencode($search_sale);
+	if ($search_montant_ht)  $param.='&search_montant_ht='.urlencode($search_montant_ht);
+	if ($search_login)  	 $param.='&search_login='.urlencode($search_login);
+	if ($search_town)		 $param.='&search_town='.urlencode($search_town);
+	if ($socid > 0)          $param.='&socid='.urlencode($socid);
+	if ($optioncss != '') $param.='&optioncss='.urlencode($optioncss);
 	// Add $param from extra fields
 	foreach ($search_array_options as $key => $val)
 	{

From e9b6afd2aa2fe2086665fcdd1c435737a2aeb596 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sun, 18 Jun 2017 22:17:32 +0200
Subject: [PATCH 273/438] Add last session coding - Add temporaly ledger

---
 htdocs/accountancy/bookkeeping/card.php       | 405 ++++++++-------
 htdocs/accountancy/bookkeeping/list.php       |   2 +-
 .../class/accountingjournal.class.php         | 136 +++--
 .../accountancy/class/bookkeeping.class.php   | 466 +++++++++++-------
 htdocs/core/menus/standard/auguria.lib.php    |  53 +-
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  40 ++
 .../llx_accounting_bookkeeping_tmp.key.sql    |  22 +
 .../tables/llx_accounting_bookkeeping_tmp.sql |  53 ++
 htdocs/langs/en_US/accountancy.lang           |   1 +
 9 files changed, 795 insertions(+), 383 deletions(-)
 create mode 100644 htdocs/install/mysql/tables/llx_accounting_bookkeeping_tmp.key.sql
 create mode 100644 htdocs/install/mysql/tables/llx_accounting_bookkeeping_tmp.sql

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 660248a46a3..0df46f21740 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -1,7 +1,7 @@
 <?php
-/* Copyright (C) 2013-2016 Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013-2016 Florian Henry        <florian.henry@open-concept.pro>
- * Copyright (C) 2013-2017 Alexandre Spangaro   <aspangaro@zendsi.com>
+/* Copyright (C) 2013-2017 Olivier Geffroy      <jeff@jeffinfo.com>
+ * Copyright (C) 2013-2017 Florian Henry        <florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2017 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,46 +16,40 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 /**
- * \file	htdocs/accountancy/bookkeeping/card.php
- * \ingroup Advanced accountancy
- * \brief	Page to show book-entry
+ * \file		htdocs/accountancy/bookkeeping/card.php
+ * \ingroup		Advanced accountancy
+ * \brief		Page to show book-entry
  */
 require '../../main.inc.php';
 
-// Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
+require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
 
-// Langs
 $langs->load("accountancy");
-$langs->load("bank");
-$langs->load("bills");
-$langs->load("trips");
 
 // Security check
 $id = GETPOST('id', 'int');
 if ($user->societe_id > 0) {
 	accessforbidden();
 }
-
-$action = GETPOST('action','aZ09');
+$action = GETPOST('action');
+$mode = GETPOST('mode');
 $piece_num = GETPOST("piece_num");
-
 $mesg = '';
-
 $account_number = GETPOST('account_number');
-$subledger_account = GETPOST('subledger_account');
-if ($subledger_account == - 1) {
-	$subledger_account = null;
+$code_tiers = GETPOST('code_tiers');
+if ($code_tiers == - 1) {
+	$code_tiers = null;
 }
-$label_operation = GETPOST('label_operation');
+$label_compte = GETPOST('label_compte');
+$label_operation= GETPOST('label_operation');
 $debit = price2num(GETPOST('debit'));
 $credit = price2num(GETPOST('credit'));
-
 $save = GETPOST('save');
 if (! empty($save)) {
 	$action = 'add';
@@ -64,29 +58,25 @@ $update = GETPOST('update');
 if (! empty($update)) {
 	$action = 'confirm_update';
 }
-
+$object = new BookKeeping($db);
 if ($action == "confirm_update") {
-
 	$error = 0;
-
 	if ((floatval($debit) != 0.0) && (floatval($credit) != 0.0)) {
 		setEventMessages($langs->trans('ErrorDebitCredit'), null, 'errors');
 		$error ++;
 	}
-
 	if (empty($error)) {
 		$book = new BookKeeping($db);
-
-		$result = $book->fetch($id);
+		$result = $book->fetch($id, null, $mode);
 		if ($result < 0) {
 			setEventMessages($book->error, $book->errors, 'errors');
 		} else {
 			$book->numero_compte = $account_number;
-			$book->subledger_account = $subledger_account;
-			$book->label_operation = $label_operation;
+			$book->code_tiers = $code_tiers;
+			$book->label_compte = $label_compte;
+			$book->label_operation= $label_operation;
 			$book->debit = $debit;
 			$book->credit = $credit;
-
 			if (floatval($debit) != 0.0) {
 				$book->montant = $debit;
 				$book->sens = 'D';
@@ -95,8 +85,7 @@ if ($action == "confirm_update") {
 				$book->montant = $credit;
 				$book->sens = 'C';
 			}
-
-			$result = $book->update($user);
+			$result = $book->update($user, false, $mode);
 			if ($result < 0) {
 				setEventMessages($book->error, $book->errors, 'errors');
 			} else {
@@ -106,21 +95,18 @@ if ($action == "confirm_update") {
 		}
 	}
 }
-
 else if ($action == "add") {
 	$error = 0;
-
 	if ((floatval($debit) != 0.0) && (floatval($credit) != 0.0)) {
 		setEventMessages($langs->trans('ErrorDebitCredit'), null, 'errors');
 		$error ++;
 	}
-
 	if (empty($error)) {
 		$book = new BookKeeping($db);
-
 		$book->numero_compte = $account_number;
-		$book->subledger_account = $subledger_account;
-		$book->label_operation = $label_operation;
+		$book->code_tiers = $code_tiers;
+		$book->label_compte = $label_compte;
+		$book->label_operation= $label_operation;
 		$book->debit = $debit;
 		$book->credit = $credit;
 		$book->doc_date = GETPOST('doc_date');
@@ -130,18 +116,15 @@ else if ($action == "add") {
 		$book->code_journal = GETPOST('code_journal');
 		$book->fk_doc = GETPOST('fk_doc');
 		$book->fk_docdet = GETPOST('fk_docdet');
-
 		if (floatval($debit) != 0.0) {
 			$book->montant = $debit;
 			$book->sens = 'D';
 		}
-
 		if (floatval($credit) != 0.0) {
 			$book->montant = $credit;
 			$book->sens = 'C';
 		}
-
-		$result = $book->createStd($user);
+		$result = $book->createStd($user, false, $mode);
 		if ($result < 0) {
 			setEventMessages($book->error, $book->errors, 'errors');
 		} else {
@@ -150,39 +133,31 @@ else if ($action == "add") {
 		}
 	}
 }
-
 else if ($action == "confirm_delete") {
 	$book = new BookKeeping($db);
-
-	$result = $book->fetch($id);
-
+	$result = $book->fetch($id, null, $mode);
 	$piece_num = $book->piece_num;
-
 	if ($result < 0) {
 		setEventMessages($book->error, $book->errors, 'errors');
 	} else {
-		$result = $book->delete($user);
+		$result = $book->delete($user, false, $mode);
 		if ($result < 0) {
 			setEventMessages($book->error, $book->errors, 'errors');
 		}
 	}
 	$action = '';
 }
-
 else if ($action == "confirm_create") {
     $error = 0;
-
     $book = new BookKeeping($db);
-
 	if (! GETPOST('next_num_mvt'))
 	{
 	    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NumPiece")), null, 'errors');
 	    $error++;
 	}
-
 	if (! $error)
 	{
-    	$book->label_operation = '';
+    	$book->label_compte = '';
     	$book->debit = 0;
     	$book->credit = 0;
     	$book->doc_date = $date_start = dol_mktime(0, 0, 0, GETPOST('doc_datemonth'), GETPOST('doc_dateday'), GETPOST('doc_dateyear'));
@@ -192,163 +167,258 @@ else if ($action == "confirm_create") {
     	$book->code_journal = GETPOST('code_journal');
     	$book->fk_doc = 0;
     	$book->fk_docdet = 0;
-
     	$book->montant = 0;
-
-    	$result = $book->createStd($user);
+    	$result = $book->createStd($user,0, $mode);
     	if ($result < 0) {
     		setEventMessages($book->error, $book->errors, 'errors');
     	} else {
     		setEventMessages($langs->trans('Saved'), null, 'mesgs');
-    		$action = '';
+    		$action = 'update';
+    		$id=$book->id;
     		$piece_num = $book->piece_num;
     	}
 	}
 }
-
-
+if ($action == 'setdate') {
+	$datedoc = dol_mktime(0, 0, 0, GETPOST('doc_datemonth'), GETPOST('doc_dateday'), GETPOST('doc_dateyear'));
+	$result = $object->upddateByMvt($piece_num,'doc_date',$db->idate($datedoc),$mode);
+	if ($result < 0) {
+		setEventMessages($object->error, $object->errors, 'errors');
+	} else {
+		setEventMessages($langs->trans('Saved'), null, 'mesgs');
+		$action = '';
+	}
+}
+if ($action == 'setjournal') {
+	$journaldoc = trim(GETPOST('code_journal'));
+	if (!empty($journaldoc)) {
+		$journaldoc='\''.$journaldoc.'\'';
+	}
+	$result = $object->upddateByMvt($piece_num,'code_journal',$journaldoc,$mode);
+	if ($result < 0) {
+		setEventMessages($object->error, $object->errors, 'errors');
+	} else {
+		setEventMessages($langs->trans('Saved'), null, 'mesgs');
+		$action = '';
+	}
+}
+if ($action == 'setdocref') {
+	$refdoc = trim(GETPOST('doc_ref'));
+	if (!empty($refdoc)) {
+		$refdoc='\''.$refdoc.'\'';
+	}
+	$result = $object->upddateByMvt(doc_ref,'code_journal',$refdoc,$mode);
+	if ($result < 0) {
+		setEventMessages($object->error, $object->errors, 'errors');
+	} else {
+		setEventMessages($langs->trans('Saved'), null, 'mesgs');
+		$action = '';
+	}
+}
+if ($action == 'valid') {
+	$result = $object->transformTransaction(0,$piece_num);
+	if ($result < 0) {
+		setEventMessages($object->error, $object->errors, 'errors');
+	} else {
+		header("Location: list.php?sortfield=t.piece_num&sortorder=asc");
+		exit;
+	}
+}
 /*
  * View
  */
-
 llxHeader();
-
 $html = new Form($db);
-$formaccountancy = new FormAccounting($db);
-
+$formaccounting = new FormAccounting($db);
+$accountjournal = new AccountingJournal($db);
 /*
  *  Confirmation to delete the command
  */
 if ($action == 'delete') {
-	$formconfirm = $html->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $id, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt'), 'confirm_delete', '', 0, 1);
+	$formconfirm = $html->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $id.'&mode='. $mode , $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt'), 'confirm_delete', '', 0, 1);
 	print $formconfirm;
 }
-
 if ($action == 'create') {
 	print load_fiche_titre($langs->trans("CreateMvts"));
-
 	$book = new BookKeeping($db);
-	$next_num_mvt = $book->getNextNumMvt();
+	$next_num_mvt = $book->getNextNumMvt('_tmp');
     if (empty($next_num_mvt))
     {
         dol_print_error('', 'Failed to get next piece number');
     }
-
 	print '<form action="' . $_SERVER["PHP_SELF"] . '" name="create_mvt" method="POST">';
 	print '<input type="hidden" name="action" value="confirm_create">' . "\n";
 	print '<input type="hidden" name="next_num_mvt" value="' . $next_num_mvt . '">' . "\n";
-
+	print '<input type="hidden" name="mode" value="_tmp">' . "\n";
 	dol_fiche_head();
-
 	print '<table class="border" width="100%">';
 	print '<tr>';
 	print '<td class="titlefieldcreate fieldrequired">' . $langs->trans("NumPiece") . '</td>';
 	print '<td>' . $next_num_mvt . '</td>';
 	print '</tr>';
-
 	print '<tr>';
 	print '<td class="fieldrequired">' . $langs->trans("Docdate") . '</td>';
 	print '<td>';
 	print $html->select_date('', 'doc_date', '', '', '', "create_mvt", 1, 1);
 	print '</td>';
 	print '</tr>';
-
 	print '<tr>';
-	print '<td class="fieldrequired">'.$langs->trans("AccountancyJournal").'</td>';
-	print '<td>';
-	print $formaccountancy->select_journal('', 'code_journal', '', 0, 1, 1, 1, 1);
-	print '</td></tr>';
-
+	print '<td class="fieldrequired">' . $langs->trans("Codejournal") . '</td>';
+	print '<td>' . $formaccounting->select_journal(GETPOST('code_journal'),'code_journal',0,0,array(),1,1) . '</td>';
+	print '</tr>';
 	print '<tr>';
 	print '<td>' . $langs->trans("Docref") . '</td>';
-	print '<td><input type="text" class="minwidth200" name="doc_ref" value=""/></td>';
+	print '<td><input type="text" size="20" name="doc_ref" value=""/></td>';
 	print '</tr>';
-
 	print '<tr>';
 	print '<td>' . $langs->trans("Doctype") . '</td>';
-	print '<td><input type="text" class="minwidth200" name="doc_type" value=""/></td>';
+	print '<td><input type="text" size="20" name="doc_type" value=""/></td>';
 	print '</tr>';
-
 	print '</table>';
-
 	dol_fiche_end();
-
 	print '<div align="center"><input type="submit" class="button" value="' . $langs->trans("Create") . '">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="button" value="' . $langs->trans("Cancel") . '" class="button" onclick="history.go(-1)" />';
 	print '</div>';
-
 	print '</form>';
 } else {
 	$book = new BookKeeping($db);
-	$result = $book->fetchPerMvt($piece_num);
+	$result = $book->fetchPerMvt($piece_num, $mode);
 	if ($result < 0) {
 		setEventMessages($book->error, $book->errors, 'errors');
 	}
 	if (! empty($book->piece_num)) {
-
 		print load_fiche_titre($langs->trans("UpdateMvts"), '<a href="list.php">' . $langs->trans('BackToList') . '</a>');
-
 		dol_fiche_head();
-
-		print '<div class="fichecenter">';
-
+		print '<div class="fichehalfleft">';
+		print '<div class="underbanner clearboth"></div>';
 		print '<table class="border" width="100%">';
-
+		// account mouvment
 		print '<tr class="pair">';
 		print '<td class="titlefield">' . $langs->trans("NumMvts") . '</td>';
 		print '<td>' . $book->piece_num . '</td>';
 		print '</tr>';
-
-		print '<tr class="impair">';
-		print '<td>' . $langs->trans("Docdate") . '</td>';
-		print '<td>' . dol_print_date($book->doc_date, 'daytextshort') . '</td>';
+		// date
+		print '<tr class="impair"><td>';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print $langs->trans('Docdate');
+		print '</td>';
+		if ($action != 'editdate')
+		print '<a href="'.$_SERVER["PHP_SELF"].'?action=editdate&amp;piece_num='. $book->piece_num .'&amp;mode='. $mode .'">'.img_edit($langs->transnoentitiesnoconv('SetDate'),1).'</a></td>';
+		print '</tr></table>';
+		print '</td><td colspan="3">';
+		if ($action == 'editdate') {
+			print '<form name="setdate" action="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $book->piece_num . '" method="post">';
+			print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
+			print '<input type="hidden" name="action" value="setdate">';
+			print '<input type="hidden" name="mode" value="'.$mode.'">';
+			$form->select_date($book->doc_date ? $book->doc_date : - 1, 'doc_date', '', '', '', "setdate");
+			print '<input type="submit" class="button" value="' . $langs->trans('Modify') . '">';
+			print '</form>';
+			} else {
+		print $book->doc_date ? dol_print_date($book->doc_date, 'daytext') : '&nbsp;';
+		}
+		print '</td>';
 		print '</tr>';
-
-		print '<tr class="pair">';
-		print '<td>' . $langs->trans("Codejournal") . '</td>';
-		print '<td>';
-		$accountingjournal = new AccountingJournal($db);
-		$accountingjournal->fetch('',$book->code_journal);
-		print $accountingjournal->getNomUrl(0,1,1,'',1);
-		print '</td></tr>';
-
-		print '<tr class="impair">';
-		print '<td>' . $langs->trans("Docref") . '</td>';
-		print '<td>' . $book->doc_ref . '</td>';
+		//journal
+		print '<tr class="pair"><td>';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print $langs->trans('Codejournal');
+		print '</td>';
+		if ($action != 'editjournal')
+		print '<a href="'.$_SERVER["PHP_SELF"].'?action=editjournal&amp;piece_num='.$book->piece_num.'&amp;mode='. $mode .'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</a></td>';
+		print '</tr></table>';
+		print '</td><td>';
+		if ($action == 'editjournal') {
+			print '<form name="setjournal" action="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $book->piece_num . '" method="post">';
+			print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
+			print '<input type="hidden" name="action" value="setjournal">';
+			print '<input type="hidden" name="mode" value="'.$mode.'">';
+			print $formaccounting->select_journal($book->code_journal,'code_journal',0,0,array(),1,1);
+			print '<input type="submit" class="button" value="' . $langs->trans('Modify') . '">';
+			print '</form>';
+		} else {
+		print $book->code_journal ;
+		}
+		print '</td>';
 		print '</tr>';
-
-		$typelabel = $book->doc_type;
-		if ($typelabel == 'bank') {
-			$typelabel = $langs->trans('Bank');
-		}
-		if ($typelabel == 'customer_invoice') {
-			$typelabel = $langs->trans('CustomerInvoice');
-		}
-		if ($typelabel == 'supplier_invoice') {
-			$typelabel = $langs->trans('SupplierInvoice');
-		}
-		if ($typelabel == 'expense_report') {
-			$typelabel = $langs->trans('ExpenseReport');
+		//docref
+		print '<tr class="impair"><td>';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print $langs->trans('Docref');
+		print '</td>';
+		if ($action != 'editdocref')
+		print '<a href="'.$_SERVER["PHP_SELF"].'?action=editdocref&amp;piece_num='.$book->piece_num.'&amp;mode='. $mode .'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</a></td>';
+		print '</tr></table>';
+		print '</td><td>';
+		if ($action == 'editdocref') {
+			print '<form name="setdocref" action="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $book->piece_num . '" method="post">';
+			print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
+			print '<input type="hidden" name="action" value="setdocref">';
+			print '<input type="hidden" name="mode" value="'.$mode.'">';
+			print '<input type="text" size="20" name="doc_ref" value="'.$book->doc_ref.'">';
+			print '<input type="submit" class="button" value="' . $langs->trans('Modify') . '">';
+			print '</form>';
+		} else {
+		print $book->doc_ref ;
 		}
+		print '</td>';
+		print '</tr>';
+		//doctype
 		print '<tr class="pair">';
 		print '<td>' . $langs->trans("Doctype") . '</td>';
-		print '<td>' . $typelabel . '</td>';
+		print '<td>' . $book->doc_type . '</td>';
 		print '</tr>';
 		print '</table>';
-
 		print '</div>';
-
-		dol_fiche_end();
-
+		print '<div class="fichehalfright"><div class="ficheaddleft">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border tableforfield" width="100%">';
+		//Validate
+		print '<tr class="pair">';
+		print '<td class="titlefield">' . $langs->trans("Status") . '</td>';
+		print '<td>';
+			if (empty($book->validated)) {
+				print '<a href="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $line->rowid . '&action=enable">';
+				print img_picto($langs->trans("Disabled"), 'switch_off');
+				print '</a>';
+			} else {
+				print '<a href="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $line->rowid . '&action=disable">';
+				print img_picto($langs->trans("Activated"), 'switch_on');
+				print '</a>';
+			}
+			print '</td>';
+		print '</tr>';
+		// check data
+		print '<tr class="impair">';
+		print '<td class="titlefield">' . $langs->trans("Control") . '</td>';
+		/*
+		if ($book->doc_type == 'customer_invoice')
+		{
+		 $sqlmid = 'SELECT rowid as ref';
+		    $sqlmid .= " FROM ".MAIN_DB_PREFIX."facture as fac";
+		    $sqlmid .= " WHERE fac.rowid=" . $book->fk_doc;
+		    dol_syslog("accountancy/bookkeeping/card.php::sqlmid=" . $sqlmid, LOG_DEBUG);
+		    $resultmid = $db->query($sqlmid);
+		    if ($resultmid) {
+		        $objmid = $db->fetch_object($resultmid);
+		        $invoicestatic = new Facture($db);
+		        $invoicestatic->fetch($objmid->ref);
+		        $ref=$langs->trans("Invoice").' '.$invoicestatic->getNomUrl(1);
+		    }
+		    else dol_print_error($db);
+		}
+		*/
+		print '<td>' . $ref .'</td>';
+		print "</table>\n";
+		print '</div>';
+		print '</div></div>';
+		print '<div style="clear:both"></div>';
 		print '<br>';
-
-		$result = $book->fetch_all_per_mvt($piece_num);
+		$result = $book->fetchAllPerMvt($piece_num, $mode);
 		if ($result < 0) {
 			setEventMessages($book->error, $book->errors, 'errors');
 		} else {
-
 			print load_fiche_titre($langs->trans("ListeMvts"), '', '');
-
 			print '<form action="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $book->piece_num . '" method="post">';
 			print '<input type="hidden" name="doc_date" value="' . $book->doc_date . '">' . "\n";
 			print '<input type="hidden" name="doc_type" value="' . $book->doc_type . '">' . "\n";
@@ -356,95 +426,84 @@ if ($action == 'create') {
 			print '<input type="hidden" name="code_journal" value="' . $book->code_journal . '">' . "\n";
 			print '<input type="hidden" name="fk_doc" value="' . $book->fk_doc . '">' . "\n";
 			print '<input type="hidden" name="fk_docdet" value="' . $book->fk_docdet . '">' . "\n";
-
-			$var=False;
-
+			print '<input type="hidden" name="mode" value="' . $mode . '">' . "\n";
 			print "<table class=\"noborder\" width=\"100%\">";
 			if (count($book->linesmvt) > 0) {
-
 				$total_debit = 0;
 				$total_credit = 0;
-
 				print '<tr class="liste_titre">';
-
 				print_liste_field_titre($langs->trans("AccountAccountingShort"));
-				print_liste_field_titre($langs->trans("subledger_account"));
+				print_liste_field_titre($langs->trans("Code_tiers"));
 				print_liste_field_titre($langs->trans("Labelcompte"));
-				print_liste_field_titre($langs->trans("Debit"), "", "", "", "", 'align="right"');
-				print_liste_field_titre($langs->trans("Credit"), "", "", "", "", 'align="right"');
-				print_liste_field_titre($langs->trans("Amount"), "", "", "", "", 'align="right"');
-				print_liste_field_titre($langs->trans("Sens"), "", "", "", "", 'align="center"');
+				print_liste_field_titre($langs->trans("Labeloperation"));
+				print_liste_field_titre($langs->trans("Debit"), "", "", "", "", 'align="center"');
+				print_liste_field_titre($langs->trans("Credit"), "", "", "", "", 'align="center"');
 				print_liste_field_titre($langs->trans("Action"), "", "", "", "", 'width="60" align="center"');
-
 				print "</tr>\n";
-
-				foreach ($book->linesmvt as $line) {
-					print '<tr class="oddeven">';
-
+				foreach ( $book->linesmvt as $line ) {
+					$var = ! $var;
+					print '<tr' . $bc[$var] . '>';
 					$total_debit += $line->debit;
 					$total_credit += $line->credit;
-
 					if ($action == 'update' && $line->id == $id) {
-
 						print '<td>';
-						print $formaccounting->select_account($line->numero_compte, 'account_number', 0, array (), 1, 1, 'maxwidth300');
+						print $formaccounting->select_account($line->numero_compte, 'account_number', 0, array (), 1, 1, '');
 						print '</td>';
 						print '<td>';
-						print $formaccounting->select_auxaccount($line->subledger_account, 'subledger_account', 1, 'maxwidth300');
+						print $formaccounting->select_auxaccount($line->code_tiers, 'code_tiers', 1);
 						print '</td>';
-						print '<td><input type="text" size="15" name="label_operation" value="' . $line->label_operation . '"/></td>';
+						print '<td><input type="text" size="15" name="label_compte" value="' . $line->label_compte . '"/></td>';
+						print '<td><input type="text" size="15" name="label_operation" value="' . $line->label_operation. '"/></td>';
 						print '<td align="right"><input type="text" size="6" name="debit" value="' . price($line->debit) . '"/></td>';
 						print '<td align="right"><input type="text" size="6" name="credit" value="' . price($line->credit) . '"/></td>';
-						print '<td align="right">' . price($line->montant) . '</td>';
-						print '<td align="center">' . $line->sens . '</td>';
 						print '<td>';
 						print '<input type="hidden" name="id" value="' . $line->id . '">' . "\n";
 						print '<input type="submit" class="button" name="update" value="' . $langs->trans("Update") . '">';
 						print '</td>';
 					} else {
 						print '<td>' . length_accountg($line->numero_compte) . '</td>';
-						print '<td>' . length_accounta($line->subledger_account) . '</td>';
-						print '<td>' . $line->label_operation . '</td>';
+						print '<td>' . length_accounta($line->code_tiers) . '</td>';
+						print '<td>' . $line->label_compte . '</td>';
+						print '<td>' . $line->label_operation. '</td>';
 						print '<td align="right">' . price($line->debit) . '</td>';
 						print '<td align="right">' . price($line->credit) . '</td>';
-						print '<td align="right">' . price($line->montant) . '</td>';
-						print '<td align="center">' . $line->sens . '</td>';
-
 						print '<td align="center">';
-						print '<a href="' . $_SERVER['PHP_SELF'] . '?action=update&amp;id=' . $line->id . '&amp;piece_num=' . $line->piece_num . '">';
+						print '<a href="./card.php?action=update&amp;id=' . $line->id . '&amp;piece_num=' . $line->piece_num . '&amp;mode='.$mode.'">';
 						print img_edit();
 						print '</a>&nbsp;';
-						print '<a href="' . $_SERVER['PHP_SELF'] . '?action=delete&amp;id=' . $line->id . '&amp;piece_num=' . $line->piece_num . '">';
+						print '<a href="./card.php?action=delete&amp;id=' . $line->id . '&amp;piece_num=' . $line->piece_num . '&amp;mode='.$mode.'">';
 						print img_delete();
 						print '</a>';
-
 						print '</td>';
 					}
 					print "</tr>\n";
 				}
-
 				if ($total_debit != $total_credit)
 				{
 					setEventMessages(null, array($langs->trans('MvtNotCorrectlyBalanced', $total_credit, $total_debit)), 'warnings');
 				}
-
 				if ($action == "" || $action == 'add') {
-					print '<tr class="oddeven">';
+					$var = ! $var;
+					print '<tr' . $bc[$var] . '>';
 					print '<td>';
-					print $formaccounting->select_account($account_number, 'account_number', 0, array (), 1, 1, 'maxwidth300');
+					print $formaccounting->select_account($account_number, 'account_number', 0, array (), 1, 1, '');
 					print '</td>';
 					print '<td>';
-					print $formaccounting->select_auxaccount($subledger_account, 'subledger_account', 1, 'maxwidth300');
+					print $formaccounting->select_auxaccount($code_tiers, 'code_tiers', 1);
 					print '</td>';
-					print '<td><input type="text" size="15" name="label_operation" value="' . $label_operation . '"/></td>';
-					print '<td align="right"><input type="text" class="right maxwidth50" name="debit" value="' . price($debit) . '"/></td>';
-					print '<td align="right"><input type="text" class="right maxwidth50" name="credit" value="' . price($credit) . '"/></td>';
-					print '<td></td>';
-					print '<td></td>';
+					print '<td><input type="text" size="15" name="label_compte" value="' . $line->label_compte . '"/></td>';
+					print '<td><input type="text" size="15" name="label_operation" value="' . $line->label_operation. '"/></td>';
+					print '<td align="right"><input type="text" size="6" name="debit" value="' . price($debit) . '"/></td>';
+					print '<td align="right"><input type="text" size="6" name="credit" value="' . price($credit) . '"/></td>';
 					print '<td><input type="submit" class="button" name="save" value="' . $langs->trans("Add") . '"></td>';
 					print '</tr>';
 				}
 				print '</table>';
+				if ($mode=='_tmp' && $total_debit == $total_credit && $action=='') {
+					print '<div class="tabsAction">';
+					print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $book->piece_num . '&action=valid">'.$langs->trans("ValidTransaction").'</a>';
+					print "</div>";
+				}
 				print '</form>';
 			}
 		}
@@ -452,6 +511,6 @@ if ($action == 'create') {
 		print load_fiche_titre($langs->trans("NoRecords"));
 	}
 }
-
+dol_fiche_end();
 llxFooter();
-$db->close();
+$db->close();
\ No newline at end of file
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 65e615cecaf..1062fd50d87 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -99,7 +99,7 @@ $formother = new FormOther($db);
 $form = new Form($db);
 
 
-if ($action != 'export_csv' && ! isset($_POST['begin']) && ! isset($_GET['begin']) && ! isset($_POST['formfilteraction'])) {
+if ($action != 'export_csv' && ! isset($_POST['begin']) && ! isset($_GET['begin']) && ! isset($_POST['formfilteraction']) && empty($page)) {
     $search_date_start = dol_mktime(0, 0, 0, 1, 1, dol_print_date(dol_now(), '%Y'));
     $search_date_end = dol_mktime(0, 0, 0, 12, 31, dol_print_date(dol_now(), '%Y'));
 }
diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
index f47715ace58..cb72c321118 100644
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -33,10 +33,12 @@ class AccountingJournal extends CommonObject
 
 	var $rowid;
 
-	var $code;
-	var $label;
-	var $nature;		// 0:various operations, 1:sale, 2:purchase, 3:bank, 9: has-new
-	var $active;
+	public $code;
+	public $label;
+	public $nature;		// 0:various operations, 1:sale, 2:purchase, 3:bank, 4:expense-report, 9: has-new
+	public $active;
+
+	public $lines;
 
 	/**
 	 * Constructor
@@ -80,7 +82,7 @@ class AccountingJournal extends CommonObject
 					$this->code			= $obj->code;
 					$this->ref			= $obj->code;
 					$this->label		= $obj->label;
-					$this->nature	    = $obj->nature;
+					$this->nature		= $obj->nature;
 					$this->active		= $obj->active;
 
 					return $this->id;
@@ -97,6 +99,74 @@ class AccountingJournal extends CommonObject
 		return -1;
 	}
 
+	/**
+	 * Load object in memory from the database
+	 *
+	 * @param string $sortorder Sort Order
+	 * @param string $sortfield Sort field
+	 * @param int $limit offset limit
+	 * @param int $offset offset limit
+	 * @param array $filter filter array
+	 * @param string $filtermode filter mode (AND or OR)
+	 *
+	 * @return int <0 if KO, >0 if OK
+	 */
+	function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND') {
+		$sql = "SELECT rowid, code, label, nature, active";
+		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
+		// Manage filter
+		$sqlwhere = array();
+		if (count($filter) > 0) {
+			foreach ( $filter as $key => $value ) {
+				if ($key == 't.code' || $key == 't.label' || $key == 't.nature') {
+					$sqlwhere[] = $key . '\'' . $this->db->escape($value) . '\'';
+				} elseif ($key == 't.rowid' || $key == 't.active') {
+					$sqlwhere[] = $key . '=' . $value;
+				}
+			}
+		}
+		$sql .= ' WHERE 1 = 1';
+		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
+		if (count($sqlwhere) > 0) {
+			$sql .= ' AND ' . implode(' ' . $filtermode . ' ', $sqlwhere);
+		}
+
+		if (! empty($sortfield)) {
+			$sql .= $this->db->order($sortfield, $sortorder);
+		}
+		if (! empty($limit)) {
+			$sql .= ' ' . $this->db->plimit($limit + 1, $offset);
+		}
+		$this->lines = array();
+
+		dol_syslog(get_class($this) . "::fetch sql=" . $sql, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+
+			while ( $obj = $this->db->fetch_object($resql) ) {
+				$line = new self($this->db);
+
+				$line->id = $obj->rowid;
+				$line->code = $obj->code;
+				$line->label = $obj->label;
+				$line->nature = $obj->nature;
+				$line->active = $obj->active;
+
+				$this->lines[] = $line;
+			}
+
+			$this->db->free($resql);
+
+			return $num;
+		} else {
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+
+			return - 1;
+		}
+	}
+
 	/**
 	 * Return clicable name (with picto eventually)
 	 *
@@ -130,17 +200,17 @@ class AccountingJournal extends CommonObject
 		$linkclose='';
 		if (empty($notooltip))
 		{
-		    if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-		    {
-		        $label=$langs->trans("ShowAccoutingJournal");
-		        $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
-		    }
-		    $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-		    $linkclose.=' class="classfortooltip"';
+			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label=$langs->trans("ShowAccoutingJournal");
+				$linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose.=' class="classfortooltip"';
 		}
 
-        $linkstart='<a href="'.$url.'"';
-        $linkstart.=$linkclose.'>';
+		$linkstart='<a href="'.$url.'"';
+		$linkstart.=$linkclose.'>';
 		$linkend='</a>';
 
 		if ($nourl)
@@ -162,43 +232,45 @@ class AccountingJournal extends CommonObject
 	/**
 	 *  Retourne le libelle du statut d'un user (actif, inactif)
 	 *
-	 *  @param	int		$mode          0=libelle long, 1=libelle court
-	 *  @return	string 			       Label of type
+	 *  @param	int		$mode		  0=libelle long, 1=libelle court
+	 *  @return	string 				   Label of type
 	 */
 	function getLibType($mode=0)
 	{
-	    return $this->LibType($this->nature,$mode);
+		return $this->LibType($this->nature,$mode);
 	}
 
 	/**
 	 *  Return type of an accounting journal
 	 *
-	 *  @param	int		$nature        	Id type
-	 *  @param  int		$mode          	0=libelle long, 1=libelle court
-	 *  @return string 			       	Label of type
+	 *  @param	int		$nature			Id type
+	 *  @param  int		$mode		  	0=libelle long, 1=libelle court
+	 *  @return string 				   	Label of type
 	 */
 	function LibType($nature,$mode=0)
 	{
-	    global $langs;
+		global $langs;
 
 		$langs->load("accountancy");
 
-	    if ($mode == 0)
-	    {
-	        $prefix='';
+		if ($mode == 0)
+		{
+			$prefix='';
 			if ($nature == 9) return $langs->trans('AccountingJournalType9');
+			if ($nature == 5) return $langs->trans('AccountingJournalType5');
 			if ($nature == 4) return $langs->trans('AccountingJournalType4');
 			if ($nature == 3) return $langs->trans('AccountingJournalType3');
-	        if ($nature == 2) return $langs->trans('AccountingJournalType2');
-	        if ($nature == 1) return $langs->trans('AccountingJournalType1');
-	    }
-	    if ($mode == 1)
-	    {
+			if ($nature == 2) return $langs->trans('AccountingJournalType2');
+			if ($nature == 1) return $langs->trans('AccountingJournalType1');
+		}
+		if ($mode == 1)
+		{
 			if ($nature == 9) return $langs->trans('AccountingJournalType9');
+			if ($nature == 5) return $langs->trans('AccountingJournalType5');
 			if ($nature == 4) return $langs->trans('AccountingJournalType4');
 			if ($nature == 3) return $langs->trans('AccountingJournalType3');
-	        if ($nature == 2) return $langs->trans('AccountingJournalType2');
-	        if ($nature == 1) return $langs->trans('AccountingJournalType1');
-	    }
+			if ($nature == 2) return $langs->trans('AccountingJournalType2');
+			if ($nature == 1) return $langs->trans('AccountingJournalType1');
+		}
 	}
 }
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 2e826b55e08..88e67b42735 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -1,7 +1,7 @@
 <?php
-/* Copyright (C) 2014-2016 Olivier Geffroy		<jeff@jeffinfo.com>
+/* Copyright (C) 2014-2017 Olivier Geffroy		<jeff@jeffinfo.com>
  * Copyright (C) 2015-2017 Alexandre Spangaro	<aspangaro@zendsi.com>
- * Copyright (C) 2015-2016 Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2015-2017 Florian Henry		<florian.henry@open-concept.pro>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,9 +18,9 @@
  */
 
 /**
- *	\file       htdocs/accountancy/class/bookkeeping.class.php
- *	\ingroup    Advanced accountancy
- *	\brief      File of class to manage Ledger (General Ledger and Subledger)
+ *	\file		htdocs/accountancy/class/bookkeeping.class.php
+ *	\ingroup	Advanced accountancy
+ *	\brief		File of class to manage Ledger (General Ledger and Subledger)
  */
 
 // Class
@@ -91,9 +91,6 @@ class BookKeeping extends CommonObject
 	public $journal_label;
 	public $piece_num;
 
-	/**
-	 */
-
 	/**
 	 * Constructor
 	 *
@@ -106,9 +103,9 @@ class BookKeeping extends CommonObject
 	/**
 	 * Create object into database
 	 *
-	 * @param  User    $user       User that creates
-	 * @param  bool    $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int                 <0 if KO, Id of created object if OK
+	 * @param  User	$user		User that creates
+	 * @param  bool	$notrigger	false=launch triggers after, true=disable triggers
+	 * @return int				<0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false) {
 		global $conf, $langs;
@@ -181,23 +178,23 @@ class BookKeeping extends CommonObject
 		// Check parameters
 		if (empty($this->numero_compte) || $this->numero_compte == '-1')
 		{
-		    $langs->load("errors");
-            if (in_array($this->doc_type, array('bank', 'expense_report')))
-            {
-		        $this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForBankLine', $this->fk_docdet,  $this->doc_type);
-            }
-            else
-            {
-                //$this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForInvoiceLine', $this->doc_ref,  $this->label_compte);
-                $mesg=$this->doc_ref.', '.$langs->trans("AccountAccounting").': '.$this->numero_compte;
-                if ($this->subledger_account && $this->subledger_account != $this->numero_compte)
-                {
-                    $mesg.=', '.$langs->trans("SubledgerAccount").': '.$this->subledger_account;
-                }
-                $this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForLine', $mesg);
-            }
+			$langs->load("errors");
+			if (in_array($this->doc_type, array('bank', 'expense_report')))
+			{
+				$this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForBankLine', $this->fk_docdet,  $this->doc_type);
+			}
+			else
+			{
+				//$this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForInvoiceLine', $this->doc_ref,  $this->label_compte);
+				$mesg=$this->doc_ref.', '.$langs->trans("AccountAccounting").': '.$this->numero_compte;
+				if ($this->subledger_account && $this->subledger_account != $this->numero_compte)
+				{
+					$mesg.=', '.$langs->trans("SubledgerAccount").': '.$this->subledger_account;
+				}
+				$this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForLine', $mesg);
+			}
 
-		    return -1;
+			return -1;
 		}
 
 		$this->db->begin();
@@ -209,7 +206,7 @@ class BookKeeping extends CommonObject
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql .= " WHERE doc_type = '" . $this->db->escape($this->doc_type) . "'";
 		$sql .= " AND fk_doc = " . $this->fk_doc;
-		$sql .= " AND fk_docdet = " . $this->fk_docdet;                   // This field can be 0 is record is for several lines
+		$sql .= " AND fk_docdet = " . $this->fk_docdet;					// This field can be 0 is record is for several lines
 		$sql .= " AND numero_compte = '" . $this->db->escape($this->numero_compte) . "'";
 		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
 
@@ -223,7 +220,7 @@ class BookKeeping extends CommonObject
 				$sqlnum = "SELECT piece_num";
 				$sqlnum .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 				$sqlnum .= " WHERE doc_type = '" . $this->db->escape($this->doc_type) . "'";		// For example doc_type = 'bank'
-				$sqlnum .= " AND fk_docdet = " . $this->db->escape($this->fk_docdet);       		// fk_docdet is rowid into llx_bank or llx_facturedet or llx_facturefourndet, or ...
+				$sqlnum .= " AND fk_docdet = " . $this->db->escape($this->fk_docdet);				// fk_docdet is rowid into llx_bank or llx_facturedet or llx_facturefourndet, or ...
 				$sqlnum .= " AND doc_ref = '" . $this->db->escape($this->doc_ref) . "'";			// ref of source object
 				$sqlnum .= " AND entity IN (" . getEntity('accountancy') . ")";
 
@@ -322,7 +319,7 @@ class BookKeeping extends CommonObject
 					$this->errors[] = 'Error ' . $this->db->lasterror();
 					dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 				}
-			} else {     // Already exists
+			} else {	// Already exists
 				$result = -3;
 				$error++;
 				$this->error='BookkeepingRecordAlreadyExists';
@@ -361,11 +358,12 @@ class BookKeeping extends CommonObject
 	/**
 	 * Create object into database
 	 *
-	 * @param  User    $user       User that creates
-	 * @param  bool    $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int                 <0 if KO, Id of created object if OK
+	 * @param  User	$user	   User that creates
+	 * @param  bool	$notrigger  false=launch triggers after, true=disable triggers
+	 * @param  string  $mode 	   Mode
+	 * @return int				 <0 if KO, Id of created object if OK
 	 */
-	public function createStd(User $user, $notrigger = false) {
+	public function createStd(User $user, $notrigger = false, $mode='') {
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$error = 0;
@@ -436,13 +434,13 @@ class BookKeeping extends CommonObject
 		// Put here code to add control on parameters values
 
 		// Insert request
-		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
+		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . $mode.'(';
 		$sql .= 'doc_date,';
 		$sql .= 'doc_type,';
 		$sql .= 'doc_ref,';
 		$sql .= 'fk_doc,';
 		$sql .= 'fk_docdet,';
-		$sql .= 'thirdparty,';
+		$sql .= 'thirdparty_code,';
 		$sql .= 'subledger_account,';
 		$sql .= 'subledger_label,';
 		$sql .= 'numero_compte,';
@@ -467,7 +465,7 @@ class BookKeeping extends CommonObject
 		$sql .= ' ' . (! isset($this->thirdparty_code) ? 'NULL' : "'" . $this->db->escape($this->thirdparty_code) . "'") . ',';
 		$sql .= ' ' . (! isset($this->subledger_account) ? 'NULL' : "'" . $this->db->escape($this->subledger_account) . "'") . ',';
 		$sql .= ' ' . (! isset($this->subledger_label) ? 'NULL' : "'" . $this->db->escape($this->subledger_label) . "'") . ',';
-		$sql .= ' ' . (! isset($this->numero_compte) ? "NULL" : "'" . $this->db->escape($this->numero_compte) . "'") . ',';
+		$sql .= ' ' . (! isset($this->numero_compte) ? 'NULL' : "'" . $this->db->escape($this->numero_compte) . "'") . ',';
 		$sql .= ' ' . (! isset($this->label_compte) ? 'NULL' : "'" . $this->db->escape($this->label_compte) . "'") . ',';
 		$sql .= ' ' . (! isset($this->label_operation) ? 'NULL' : "'" . $this->db->escape($this->label_operation) . "'") . ',';
 		$sql .= ' ' . (! isset($this->debit) ? 'NULL' : $this->debit ). ',';
@@ -522,10 +520,11 @@ class BookKeeping extends CommonObject
 	 *
 	 * @param int $id Id object
 	 * @param string $ref Ref
+	 * @param string $mode 	Mode
 	 *
 	 * @return int <0 if KO, 0 if not found, >0 if OK
 	 */
-	public function fetch($id, $ref = null) {
+	public function fetch($id, $ref = null, $mode='') {
 		global $conf;
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
@@ -552,9 +551,9 @@ class BookKeeping extends CommonObject
 		$sql .= " t.code_journal,";
 		$sql .= " t.journal_label,";
 		$sql .= " t.piece_num";
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
+		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element.$mode. ' as t';
 		$sql .= ' WHERE 1 = 1';
-	    $sql .= " AND entity IN (" . getEntity('accountancy') . ")";
+		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
 		if (null !== $ref) {
 			$sql .= ' AND t.ref = ' . '\'' . $ref . '\'';
 		} else {
@@ -605,7 +604,7 @@ class BookKeeping extends CommonObject
 		}
 	}
 
-  /**
+	/**
 	 * Load object in memory from the database
 	 *
 	 * @param string $sortorder Sort Order
@@ -667,14 +666,14 @@ class BookKeeping extends CommonObject
 		}
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
 		$sql .= ' WHERE 1 = 1';
-	    $sql .= " AND entity IN (" . getEntity('accountancy') . ")";
+		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
 		if (count($sqlwhere) > 0) {
 			$sql .= ' AND ' . implode(' ' . $filtermode . ' ', $sqlwhere);
 		}
-        // Affichage par compte comptable
-        $sql .= ' ORDER BY t.numero_compte ASC';
+		// Affichage par compte comptable
+		$sql .= ' ORDER BY t.numero_compte ASC';
 		if (! empty($sortfield)) {
-            $sql .= ', ' . $sortfield . ' ' .$sortorder;
+			$sql .= ', ' . $sortfield . ' ' .$sortorder;
 		}
 		if (! empty($limit)) {
 			$sql .= ' ' . $this->db->plimit($limit + 1, $offset);
@@ -724,7 +723,6 @@ class BookKeeping extends CommonObject
 		}
 	}
 
-
 	/**
 	 * Load object in memory from the database
 	 *
@@ -785,7 +783,7 @@ class BookKeeping extends CommonObject
 			}
 		}
 		$sql.= ' WHERE 1 = 1';
-	    $sql .= " AND entity IN (" . getEntity('accountancy') . ")";
+		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
 		if (count($sqlwhere) > 0) {
 			$sql .= ' AND ' . implode(' ' . $filtermode . ' ', $sqlwhere);
 		}
@@ -856,7 +854,7 @@ class BookKeeping extends CommonObject
 	public function fetchAllBalance($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND') {
 		global $conf;
 
-	    dol_syslog(__METHOD__, LOG_DEBUG);
+		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$sql = 'SELECT';
 		$sql .= " t.numero_compte,";
@@ -877,13 +875,15 @@ class BookKeeping extends CommonObject
 					$sqlwhere[] = $key . '=' . $value;
 				} elseif ($key == 't.subledger_account' || $key == 't.numero_compte') {
 					$sqlwhere[] = $key . ' LIKE \'' . $this->db->escape($value) . '%\'';
+				} elseif ($key == 't.subledger_label') {
+					$sqlwhere[] = $key . ' LIKE \'' . $this->db->escape($value) . '%\'';
 				} else {
 					$sqlwhere[] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
 				}
 			}
 		}
 		$sql.= ' WHERE 1 = 1';
-	    $sql .= " AND entity IN (" . getEntity('accountancy') . ")";
+		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
 		if (count($sqlwhere) > 0) {
 			$sql .= ' AND ' . implode(' ' . $filtermode . ' ', $sqlwhere);
 		}
@@ -926,10 +926,11 @@ class BookKeeping extends CommonObject
 	 *
 	 * @param User $user User that modifies
 	 * @param bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param string $mode Mode
 	 *
 	 * @return int <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false) {
+	public function update(User $user, $notrigger = false, $mode='') {
 		$error = 0;
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
@@ -955,7 +956,6 @@ class BookKeeping extends CommonObject
 		}
 		if (isset($this->subledger_label)) {
 			$this->subledger_label = trim($this->subledger_label);
-		}
 		if (isset($this->numero_compte)) {
 			$this->numero_compte = trim($this->numero_compte);
 		}
@@ -997,7 +997,7 @@ class BookKeeping extends CommonObject
 		// Put here code to add a control on parameters values
 
 		// Update request
-		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
+		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . $mode.' SET';
 		$sql .= ' doc_date = ' . (! isset($this->doc_date) || dol_strlen($this->doc_date) != 0 ? "'" . $this->db->idate($this->doc_date) . "'" : 'null') . ',';
 		$sql .= ' doc_type = ' . (isset($this->doc_type) ? "'" . $this->db->escape($this->doc_type) . "'" : "null") . ',';
 		$sql .= ' doc_ref = ' . (isset($this->doc_ref) ? "'" . $this->db->escape($this->doc_ref) . "'" : "null") . ',';
@@ -1051,15 +1051,47 @@ class BookKeeping extends CommonObject
 		}
 	}
 
+	/**
+	 * Update movement
+	 *
+	 * @param string $piece_num
+	 * @param string $field
+	 * @param string $value
+	 * @param string $mode
+	 * @return number
+	 */
+	public function upddateByMvt($piece_num='', $field='', $value='', $mode='') {
+		$this->db->begin();
+		$sql = "UPDATE " . MAIN_DB_PREFIX .  $this->table_element.$mode." as ab";
+		$sql .= ' SET ab.'.$field.'=' . $value;
+		$sql .= ' WHERE ab.piece_num=' . $piece_num ;
+		$resql = $this->db->query($sql);
+		if (! $resql) {
+			$error ++;
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+		}
+		if ($error) {
+			$this->db->rollback();
+
+			return - 1 * $error;
+		} else {
+			$this->db->commit();
+
+			return 1;
+		}
+	}
+
 	/**
 	 * Delete object in database
 	 *
 	 * @param User $user User that deletes
 	 * @param bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param string $mode Mode
 	 *
 	 * @return int <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false) {
+	public function delete(User $user, $notrigger = false, $mode='') {
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$error = 0;
@@ -1079,7 +1111,7 @@ class BookKeeping extends CommonObject
 		}
 
 		if (! $error) {
-			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
+			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element.$mode;
 			$sql .= ' WHERE rowid=' . $this->id;
 
 			$resql = $this->db->query($sql);
@@ -1105,7 +1137,7 @@ class BookKeeping extends CommonObject
 	/**
 	 * Delete bookkepping by importkey
 	 *
-	 * @param  string       $importkey      Import key
+	 * @param  string		$importkey		Import key
 	 * @return int Result
 	 */
 	function deleteByImportkey($importkey) {
@@ -1132,25 +1164,26 @@ class BookKeeping extends CommonObject
 	/**
 	 * Delete bookkepping by year
 	 *
-	 * @param  string $delyear      Year to delete
-	 * @param  string $journal      Journal to delete
-	 * @return int                  <0 if KO, >0 if OK
+	 * @param  string $delyear		Year to delete
+	 * @param  string $journal		Journal to delete
+	 * @param  string $mode 		Mode
+	 * @return int					<0 if KO, >0 if OK
 	 */
-	function deleteByYearAndJournal($delyear='', $journal='') {
-	    global $conf;
+	function deleteByYearAndJournal($delyear='', $journal='', $mode='') {
+		global $conf;
 
-	    if (empty($delyear) && empty($journal))
-	    {
-	        return -1;
-	    }
+		if (empty($delyear) && empty($journal))
+		{
+			return -1;
+		}
 
 		$this->db->begin();
 
 		// first check if line not yet in bookkeeping
 		$sql = "DELETE";
-		$sql.= " FROM " . MAIN_DB_PREFIX . $this->table_element;
+		$sql.= " FROM " . MAIN_DB_PREFIX . $this->table_element.$mode;
 		$sql.= " WHERE 1 = 1";
-		if (! empty($delyear)) $sql.= " AND YEAR(doc_date) = " . $delyear;         // FIXME Must use between
+		if (! empty($delyear)) $sql.= " AND YEAR(doc_date) = " . $delyear;		 // FIXME Must use between
 		if (! empty($journal)) $sql.= " AND code_journal = '".$journal."'";
 		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
 		$resql = $this->db->query($sql);
@@ -1173,16 +1206,17 @@ class BookKeeping extends CommonObject
 	 * Delete bookkepping by piece number
 	 *
 	 * @param int $piecenum peicenum to delete
+	 * @param string $mode Mode
 	 * @return int Result
 	 */
-	function deleteMvtNum($piecenum) {
-	    global $conf;
+	function deleteMvtNum($piecenum, $mode) {
+		global $conf;
 
 		$this->db->begin();
 
 		// first check if line not yet in bookkeeping
 		$sql = "DELETE";
-		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
+		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element. $mode;
 		$sql .= " WHERE piece_num = " . $piecenum;
 		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
 
@@ -1286,13 +1320,14 @@ class BookKeeping extends CommonObject
 	 * Load an accounting document into memory from database
 	 *
 	 * @param int $piecenum Accounting document to get
+	 * @param string $mode Mode
 	 * @return int <0 if KO, >0 if OK
 	 */
-	public function fetchPerMvt($piecenum) {
+	public function fetchPerMvt($piecenum, $mode='') {
 		global $conf;
 
 		$sql = "SELECT piece_num,doc_date,code_journal,journal_label,doc_ref,doc_type";
-		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
+		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element.$mode;
 		$sql .= " WHERE piece_num = " . $piecenum;
 		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
 
@@ -1319,14 +1354,15 @@ class BookKeeping extends CommonObject
 	/**
 	 * Return next number movement
 	 *
-	 * @return string      Next numero to use
+	 * @param	string	$mode	Mode
+	 * @return	string			Next numero to use
 	 */
-	public function getNextNumMvt()
+	public function getNextNumMvt($mode='')
 	{
 		global $conf;
 
-		$sql = "SELECT MAX(piece_num)+1 as max FROM " . MAIN_DB_PREFIX . $this->table_element;
-	    $sql .= " WHERE entity IN (" . getEntity('accountancy') . ")";
+		$sql = "SELECT MAX(piece_num)+1 as max FROM " . MAIN_DB_PREFIX . $this->table_element.$mode;
+		$sql .= " WHERE entity IN (" . getEntity('accountancy') . ")";
 
 		dol_syslog(get_class($this) . "getNextNumMvt sql=" . $sql, LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -1349,14 +1385,14 @@ class BookKeeping extends CommonObject
 	 * @param int $piecenum id of line to get
 	 * @return int <0 if KO, >0 if OK
 	 */
-	function fetch_all_per_mvt($piecenum) {
+	function fetchAllPerMvt($piecenum, $mode='') {
 		global $conf;
 
 		$sql = "SELECT rowid, doc_date, doc_type,";
 		$sql .= " doc_ref, fk_doc, fk_docdet, thirdparty_code, subledger_account, subledger_label,";
-		$sql .= " numero_compte, label_compte, debit, credit,";
+		$sql .= " numero_compte, label_compte, label_operation, debit, credit,";
 		$sql .= " montant, sens, fk_user_author, import_key, code_journal, journal_label, piece_num";
-		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
+		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element.$mode;
 		$sql .= " WHERE piece_num = " . $piecenum;
 		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
 
@@ -1403,15 +1439,15 @@ class BookKeeping extends CommonObject
 	/**
 	 * Export bookkeping
 	 *
-	 * @param string $model Model
-	 * @return int Result
+	 * @param	string	$model	Model
+	 * @return	int				Result
 	 */
 	function export_bookkeping($model = 'ebp') {
 		global $conf;
 
 		$sql = "SELECT rowid, doc_date, doc_type,";
 		$sql .= " doc_ref, fk_doc, fk_docdet, thirdparty_code, subledger_account, subledger_label,";
-		$sql .= " numero_compte, label_compte, debit, credit,";
+		$sql .= " numero_compte, label_compte, label_operation, debit, credit,";
 		$sql .= " montant, sens, fk_user_author, import_key, code_journal, piece_num";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql .= " WHERE entity IN (" . getEntity('accountancy') . ")";
@@ -1459,99 +1495,180 @@ class BookKeeping extends CommonObject
 		}
 	}
 
-
-
-    /**
-    * Return list of accounts with label by chart of accounts
-    *
-    * @param string  $selectid   Preselected chart of accounts
-    * @param string  $htmlname   Name of field in html form
-    * @param int     $showempty  Add an empty field
-    * @param array   $event      Event options
-    * @param int     $select_in  Value is a aa.rowid (0 default) or aa.account_number (1)
-    * @param int     $select_out Set value returned by select 0=rowid (default), 1=account_number
-    * @param int     $aabase     Set accounting_account base class to display empty=all or from 1 to 8 will display only account beginning by this number
-    * @return string String with HTML select
-    */
-    function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $aabase = '') {
-        global $conf;
-
-        require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-
-        $pcgver = $conf->global->CHARTOFACCOUNTS;
-
-        $sql = "SELECT DISTINCT ab.numero_compte as account_number, aa.label as label, aa.rowid as rowid, aa.fk_pcg_version";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab";
-        $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.account_number = ab.numero_compte";
-        $sql .= " AND aa.active = 1";
-        $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
-        $sql .= " AND asy.rowid = " . $pcgver;
-	    $sql .= " AND ab.entity IN (" . getEntity('accountancy') . ")";
-        $sql .= " ORDER BY account_number ASC";
-
-        dol_syslog(get_class($this) . "::select_account", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-
-        if (! $resql) {
-            $this->error = "Error " . $this->db->lasterror();
-            dol_syslog(get_class($this) . "::select_account " . $this->error, LOG_ERR);
-            return - 1;
-        }
-
-        $out = ajax_combobox($htmlname, $event);
-
-        $options = array();
-        $selected = null;
-
-        while ($obj = $this->db->fetch_object($resql)) {
-            $label = length_accountg($obj->account_number) . ' - ' . $obj->label;
-
-            $select_value_in = $obj->rowid;
-            $select_value_out = $obj->rowid;
-
-            if ($select_in == 1) {
-                $select_value_in = $obj->account_number;
-            }
-            if ($select_out == 1) {
-                $select_value_out = $obj->account_number;
-            }
-
-            // Remember guy's we store in database llx_facturedet the rowid of accounting_account and not the account_number
-            // Because same account_number can be share between different accounting_system and do have the same meaning
-            if (($selectid != '') && $selectid == $select_value_in) {
-                $selected = $select_value_out;
-            }
-
-            $options[$select_value_out] = $label;
-        }
-
-        $out .= Form::selectarray($htmlname, $options, $selected, $showempty, 0, 0, '', 0, 0, 0, '', 'maxwidth300');
-        $this->db->free($resql);
-        return $out;
-    }
-
+	/**
+	 * Transform transaction
+	 *
+	 * @param number $direction if 0 tmp => real, if 1 real => tmp
+	 * @param unknown $piecenum
+	 */
+	public function transformTransaction($direction=0,$piece_num='') {
+		$this->db->begin();
+		if ($direction==0) {
+			$next_piecenum=$this->getNextNumMvt();
+			if ($result < 0) {
+				$error++;
+			}
+			$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element.'(doc_date, doc_type,';
+			$sql .= ' doc_ref, fk_doc, fk_docdet, thirdparty_code, subledger_account, subledger_label,';
+			$sql .= ' numero_compte, label_compte, label_operation, debit, credit,';
+			$sql .= ' montant, sens, fk_user_author, import_key, code_journal, journal_label, piece_num)';
+			$sql .= 'SELECT doc_date, doc_type,';
+			$sql .= ' doc_ref, fk_doc, fk_docdet, thirdparty_code, subledger_account, subledger_label,';
+			$sql .= ' numero_compte, label_compte, label_operation, debit, credit,';
+			$sql .= ' montant, sens, fk_user_author, import_key, code_journal, journal_label, '.$next_piecenum.'';
+			$sql .= ' FROM '.MAIN_DB_PREFIX . $this->table_element.'_tmp WHERE piece_num = '.$piece_num;
+			$resql = $this->db->query($sql);
+			if (! $resql) {
+				$error ++;
+				$this->errors[] = 'Error ' . $this->db->lasterror();
+				dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+			}
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX . $this->table_element.'_tmp WHERE piece_num = '.$piece_num;
+			$resql = $this->db->query($sql);
+			if (! $resql) {
+				$error ++;
+				$this->errors[] = 'Error ' . $this->db->lasterror();
+				dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+			}
+		}
+		if ($direction==1) {
+			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element.'_tmp WHERE piece_num = '.$piece_num;
+			$resql = $this->db->query($sql);
+			if (! $resql) {
+				$error ++;
+				$this->errors[] = 'Error ' . $this->db->lasterror();
+				dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+			}
+			$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element.'_tmp(doc_date, doc_type,';
+			$sql .= ' doc_ref, fk_doc, fk_docdet, thirdparty_code, subledger_account, subledger_label,';
+			$sql .= ' numero_compte, label_compte, label_operation, debit, credit,';
+			$sql .= ' montant, sens, fk_user_author, import_key, code_journal, journal_label, piece_num)';
+			$sql .= 'SELECT doc_date, doc_type,';
+			$sql .= ' doc_ref, fk_doc, fk_docdet, thirdparty_code, subledger_account, subledger_label,';
+			$sql .= ' numero_compte, label_compte, label_operation, debit, credit,';
+			$sql .= ' montant, sens, fk_user_author, import_key, code_journal, journal_label, piece_num';
+			$sql .= ' FROM '.MAIN_DB_PREFIX . $this->table_element.' WHERE piece_num = '.$piece_num;
+			$resql = $this->db->query($sql);
+			if (! $resql) {
+				$error ++;
+				$this->errors[] = 'Error ' . $this->db->lasterror();
+				dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+			}
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX . $this->table_element.'_tmp WHERE piece_num = '.$piece_num;
+			$resql = $this->db->query($sql);
+			if (! $resql) {
+				$error ++;
+				$this->errors[] = 'Error ' . $this->db->lasterror();
+				dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+			}
+		}
+		if (! $error) {
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return - 1;
+		}
+		$sql = "DELETE FROM ";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab";
+		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.account_number = ab.numero_compte";
+		$sql .= " AND aa.active = 1";
+		$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
+		$sql .= " AND asy.rowid = " . $pcgver;
+		$sql .= " AND ab.entity IN (" . getEntity('accountancy') . ")";
+		$sql .= " ORDER BY account_number ASC";
+	}
 
 	/**
-	* Description of a root accounting account
+	* Return list of accounts with label by chart of accounts
 	*
-	* @param 	string 	$account	Accounting account
-	* @return 	string 	            Root account
+	* @param string		$selectid	Preselected chart of accounts
+	* @param string		$htmlname	Name of field in html form
+	* @param int		$showempty	Add an empty field
+	* @param array		$event		Event options
+	* @param int		$select_in	Value is a aa.rowid (0 default) or aa.account_number (1)
+	* @param int		$select_out	Set value returned by select 0=rowid (default), 1=account_number
+	* @param int		$aabase		Set accounting_account base class to display empty=all or from 1 to 8 will display only account beginning by this number
+	* @return string	String with HTML select
 	*/
+	function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $aabase = '') {
+		global $conf;
+
+		require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+
+		$pcgver = $conf->global->CHARTOFACCOUNTS;
+
+		$sql = "SELECT DISTINCT ab.numero_compte as account_number, aa.label as label, aa.rowid as rowid, aa.fk_pcg_version";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab";
+		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.account_number = ab.numero_compte";
+		$sql .= " AND aa.active = 1";
+		$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
+		$sql .= " AND asy.rowid = " . $pcgver;
+		$sql .= " AND ab.entity IN (" . getEntity('accountancy') . ")";
+		$sql .= " ORDER BY account_number ASC";
+
+		dol_syslog(get_class($this) . "::select_account", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+
+		if (! $resql) {
+			$this->error = "Error " . $this->db->lasterror();
+			dol_syslog(get_class($this) . "::select_account " . $this->error, LOG_ERR);
+			return - 1;
+		}
+
+		$out = ajax_combobox($htmlname, $event);
+
+		$options = array();
+		$selected = null;
+
+		while ($obj = $this->db->fetch_object($resql)) {
+			$label = length_accountg($obj->account_number) . ' - ' . $obj->label;
+
+			$select_value_in = $obj->rowid;
+			$select_value_out = $obj->rowid;
+
+			if ($select_in == 1) {
+				$select_value_in = $obj->account_number;
+			}
+			if ($select_out == 1) {
+				$select_value_out = $obj->account_number;
+			}
+
+			// Remember guy's we store in database llx_facturedet the rowid of accounting_account and not the account_number
+			// Because same account_number can be share between different accounting_system and do have the same meaning
+			if (($selectid != '') && $selectid == $select_value_in) {
+				$selected = $select_value_out;
+			}
+
+			$options[$select_value_out] = $label;
+		}
+
+		$out .= Form::selectarray($htmlname, $options, $selected, $showempty, 0, 0, '', 0, 0, 0, '', 'maxwidth300');
+		$this->db->free($resql);
+		return $out;
+	}
+
+	/**
+	 * Description of a root accounting account
+	 *
+	 * @param 	string 	$account	Accounting account
+	 * @return 	string 				Root account
+	 */
 	function get_compte_racine($account = null)
 	{
 		global $conf;
 		$pcgver = $conf->global->CHARTOFACCOUNTS;
 
-        $sql  = "SELECT root.account_number, root.label as label";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";
-        $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
-        $sql .= " AND asy.rowid = " . $pcgver;
-        $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as parent ON aa.account_parent = parent.rowid";
-        $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as root ON parent.account_parent = root.rowid";
-        $sql .= " WHERE aa.account_number = '" . $account . "'";
-        $sql .= " AND parent.active = 1";
-        $sql .= " AND root.active = 1";
-        $sql .= " AND aa.entity IN (" . getEntity('accountancy') . ")";
+		$sql  = "SELECT root.account_number, root.label as label";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";
+		$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
+		$sql .= " AND asy.rowid = " . $pcgver;
+		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as parent ON aa.account_parent = parent.rowid";
+		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as root ON parent.account_parent = root.rowid";
+		$sql .= " WHERE aa.account_number = '" . $account . "'";
+		$sql .= " AND parent.active = 1";
+		$sql .= " AND root.active = 1";
+		$sql .= " AND aa.entity IN (" . getEntity('accountancy') . ")";
 
 		dol_syslog(get_class($this) . "::select_account sql=" . $sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -1571,13 +1688,12 @@ class BookKeeping extends CommonObject
 		}
 	}
 
-
-  /**
-	* Description of accounting account
-	*
-	* @param 	string 	$account	Accounting account
-	* @return 	string 	            Account desc
-	*/
+	/**
+	 * Description of accounting account
+	 *
+	 * @param	string	$account	Accounting account
+	 * @return	string				Account desc
+	 */
 	function get_compte_desc($account = null)
 	{
 		global $conf;
@@ -1590,7 +1706,7 @@ class BookKeeping extends CommonObject
 		$sql .= " AND asy.rowid = " . $pcgver;
 		$sql .= " AND aa.active = 1";
 		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_accounting_category as cat ON aa.fk_accounting_category = cat.rowid";
-	    $sql .= " WHERE aa.entity IN (" . getEntity('accountancy') . ")";
+		$sql .= " WHERE aa.entity IN (" . getEntity('accountancy') . ")";
 
 		dol_syslog(get_class($this) . "::select_account sql=" . $sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -1610,10 +1726,8 @@ class BookKeeping extends CommonObject
 			return -1;
 		}
 	}
-
 }
 
-
 /**
  * Class BookKeepingLine
  */
@@ -1640,4 +1754,4 @@ class BookKeepingLine
 	public $code_journal;
 	public $journal_label;
 	public $piece_num;
-}
+}
\ No newline at end of file
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index bbe41dbab10..b51d303765b 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -333,8 +333,58 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 
 	if (! empty($conf->accounting->enabled) && !empty($user->rights->accounting->mouvements->lire) && $mainmenu == 'accountancy') 	// Entry in accountancy journal for each bank account
 	{
-		$newmenu->add('',$langs->trans("Journalization"),0,$user->rights->accounting->comptarapport->lire,'','accountancy','accountancy');
+		if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add('',$langs->trans("Journalization"),0,$user->rights->accounting->comptarapport->lire,'','accountancy','accountancy');
 
+		// Multi journal
+		$sql = "SELECT rowid, code, label, nature";
+		$sql.= " FROM ".MAIN_DB_PREFIX."accounting_journal";
+		$sql.= " WHERE entity = ".$conf->entity;
+		$sql.= " ORDER BY label";
+
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$numr = $db->num_rows($resql);
+			$i = 0;
+
+			if ($numr > 0)
+			{
+				while ($i < $numr)
+				{
+					$objp = $db->fetch_object($resql);
+
+					$nature='';
+					// Must match array $sourceList defined into journals_list.php
+					if ($objp->nature == 2) $nature="sells";
+					if ($objp->nature == 3) $nature="purchases";
+					if ($objp->nature == 4) $nature="bank";
+					if ($objp->nature == 5) $nature="expensereports";
+					if ($objp->nature == 1) $nature="various";
+					if ($objp->nature == 9) $nature="hasnew";
+
+					// To enable when page exists
+					if (empty($conf->global->MAIN_FEATURES_LEVEL))
+					{
+						if ($nature == 'various' || $nature == 'hasnew') $nature='';
+					}
+
+					if ($nature)
+					{
+						if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid,dol_trunc($objp->label,25),2,$user->rights->accounting->comptarapport->lire);
+					}
+					$i++;
+				}
+			}
+			else
+			{
+				// Should not happend. Entries are added
+				$newmenu->add('',$langs->trans("NoJournalDefined"), 2, $user->rights->accounting->comptarapport->lire);
+			}
+		}
+		else dol_print_error($db);
+		$db->free($resql);
+
+		/*
 		$sql = "SELECT rowid, label, accountancy_journal";
 		$sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
 		$sql.= " WHERE entity = ".$conf->entity;
@@ -362,6 +412,7 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 		$newmenu->add("/accountancy/journal/sellsjournal.php?leftmenu=journal",$langs->trans("SellsJournal"),1,$user->rights->accounting->comptarapport->lire,'','accountancy','accountancy_journal');
 		$newmenu->add("/accountancy/journal/purchasesjournal.php?leftmenu=journal",$langs->trans("PurchasesJournal"),1,$user->rights->accounting->comptarapport->lire,'','accountancy','accountancy_journal');
 		$newmenu->add("/accountancy/journal/expensereportsjournal.php?leftmenu=journal",$langs->trans("ExpenseReportsJournal"),1,$user->rights->accounting->comptarapport->lire,'','accountancy','accountancy_journal');
+		*/
 	}
 
 	if ($conf->ftp->enabled && $mainmenu == 'ftp')	// Entry for FTP
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 5e46393768a..fd75ad95472 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -214,6 +214,46 @@ ALTER TABLE llx_accounting_bookkeeping ADD COLUMN date_lettering datetime AFTER
 ALTER TABLE llx_accounting_bookkeeping ADD COLUMN journal_label varchar(255) AFTER code_journal;
 ALTER TABLE llx_accounting_bookkeeping ADD COLUMN date_validated datetime AFTER validated;
 
+CREATE TABLE llx_accounting_bookkeeping_tmp 
+(
+  rowid                 integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  entity                integer DEFAULT 1 NOT NULL,	-- 					| multi company id
+  doc_date              date NOT NULL,				-- FEC:PieceDate
+  doc_type              varchar(30) NOT NULL,		-- FEC:PieceRef		| facture_client/reglement_client/facture_fournisseur/reglement_fournisseur
+  doc_ref               varchar(300) NOT NULL,		-- 					| facture_client/reglement_client/... reference number
+  fk_doc                integer NOT NULL,			-- 					| facture_client/reglement_client/... rowid
+  fk_docdet             integer NOT NULL,			-- 					| facture_client/reglement_client/... line rowid
+  thirdparty_code       varchar(32),				-- Third party code (customer or supplier) when record is saved (may help debug) 
+  subledger_account     varchar(32),				-- FEC:CompAuxNum	| account number of subledger account
+  subledger_label       varchar(255),				-- FEC:CompAuxLib	| label of subledger account
+  numero_compte         varchar(32) NOT NULL,		-- FEC:CompteNum	| account number
+  label_compte          varchar(255) NOT NULL,		-- FEC:CompteLib	| label of account
+  label_operation       varchar(255),				-- FEC:EcritureLib	| label of the operation
+  debit                 numeric(24,8) NOT NULL,		-- FEC:Debit
+  credit                numeric(24,8) NOT NULL,		-- FEC:Credit
+  montant               numeric(24,8) NOT NULL,		-- FEC:Montant (Not necessary)
+  sens                  varchar(1) DEFAULT NULL,	-- FEC:Sens (Not necessary)
+  multicurrency_amount  numeric(24,8),				-- FEC:Montantdevise
+  multicurrency_code    varchar(255),				-- FEC:Idevise
+  lettering_code        varchar(255),				-- FEC:EcritureLet
+  date_lettering        datetime,					-- FEC:DateLet
+  fk_user_author        integer NOT NULL,			-- 					| user creating
+  fk_user_modif         integer,					-- 					| user making last change
+  date_creation         datetime,					-- FEC:EcritureDate	| creation date
+  tms                   timestamp,					--					| date last modification 
+  import_key            varchar(14),
+  code_journal          varchar(32) NOT NULL,		-- FEC:JournalCode
+  journal_label         varchar(255),				-- FEC:JournalLib
+  piece_num             integer NOT NULL,			-- FEC:EcritureNum
+  validated             tinyint DEFAULT 0 NOT NULL,	-- 					| 0 line not validated / 1 line validated (No deleting / No modification) 
+  date_validated        datetime					-- FEC:ValidDate
+) ENGINE=innodb;
+
+ALTER TABLE llx_accounting_bookkeeping_tmp ADD INDEX idx_accounting_bookkeeping_doc_date (doc_date);
+ALTER TABLE llx_accounting_bookkeeping_tmp ADD INDEX idx_accounting_bookkeeping_fk_docdet (fk_docdet);
+ALTER TABLE llx_accounting_bookkeeping_tmp ADD INDEX idx_accounting_bookkeeping_numero_compte (numero_compte);
+ALTER TABLE llx_accounting_bookkeeping_tmp ADD INDEX idx_accounting_bookkeeping_code_journal (code_journal);
+
 ALTER TABLE llx_paiementfourn ADD COLUMN model_pdf varchar(255);
 
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_CREATE','Expense report created','Executed when an expense report is created','expensereport',201);
diff --git a/htdocs/install/mysql/tables/llx_accounting_bookkeeping_tmp.key.sql b/htdocs/install/mysql/tables/llx_accounting_bookkeeping_tmp.key.sql
new file mode 100644
index 00000000000..95a15ca0a0d
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_accounting_bookkeeping_tmp.key.sql
@@ -0,0 +1,22 @@
+-- ============================================================================
+-- Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ============================================================================
+
+ALTER TABLE llx_accounting_bookkeeping_tmp ADD INDEX idx_accounting_bookkeeping_doc_date (doc_date);
+ALTER TABLE llx_accounting_bookkeeping_tmp ADD INDEX idx_accounting_bookkeeping_fk_docdet (fk_docdet);
+ALTER TABLE llx_accounting_bookkeeping_tmp ADD INDEX idx_accounting_bookkeeping_numero_compte (numero_compte);
+ALTER TABLE llx_accounting_bookkeeping_tmp ADD INDEX idx_accounting_bookkeeping_code_journal (code_journal);
diff --git a/htdocs/install/mysql/tables/llx_accounting_bookkeeping_tmp.sql b/htdocs/install/mysql/tables/llx_accounting_bookkeeping_tmp.sql
new file mode 100644
index 00000000000..79954769cef
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_accounting_bookkeeping_tmp.sql
@@ -0,0 +1,53 @@
+-- ============================================================================
+-- Copyright (C) 2013-2017 Olivier Geffroy      <jeff@jeffinfo.com>
+-- Copyright (C) 2013-2017 Alexandre Spangaro   <aspangaro@zendsi.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/>.
+--
+-- ============================================================================
+
+CREATE TABLE llx_accounting_bookkeeping_tmp 
+(
+  rowid                 integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  entity                integer DEFAULT 1 NOT NULL,	-- 					| multi company id
+  doc_date              date NOT NULL,				-- FEC:PieceDate
+  doc_type              varchar(30) NOT NULL,		-- FEC:PieceRef		| facture_client/reglement_client/facture_fournisseur/reglement_fournisseur
+  doc_ref               varchar(300) NOT NULL,		-- 					| facture_client/reglement_client/... reference number
+  fk_doc                integer NOT NULL,			-- 					| facture_client/reglement_client/... rowid
+  fk_docdet             integer NOT NULL,			-- 					| facture_client/reglement_client/... line rowid
+  thirdparty_code       varchar(32),				-- Third party code (customer or supplier) when record is saved (may help debug) 
+  subledger_account     varchar(32),				-- FEC:CompAuxNum	| account number of subledger account
+  subledger_label       varchar(255),				-- FEC:CompAuxLib	| label of subledger account
+  numero_compte         varchar(32) NOT NULL,		-- FEC:CompteNum	| account number
+  label_compte          varchar(255) NOT NULL,		-- FEC:CompteLib	| label of account
+  label_operation       varchar(255),				-- FEC:EcritureLib	| label of the operation
+  debit                 numeric(24,8) NOT NULL,		-- FEC:Debit
+  credit                numeric(24,8) NOT NULL,		-- FEC:Credit
+  montant               numeric(24,8) NOT NULL,		-- FEC:Montant (Not necessary)
+  sens                  varchar(1) DEFAULT NULL,	-- FEC:Sens (Not necessary)
+  multicurrency_amount  numeric(24,8),				-- FEC:Montantdevise
+  multicurrency_code    varchar(255),				-- FEC:Idevise
+  lettering_code        varchar(255),				-- FEC:EcritureLet
+  date_lettering        datetime,					-- FEC:DateLet
+  fk_user_author        integer NOT NULL,			-- 					| user creating
+  fk_user_modif         integer,					-- 					| user making last change
+  date_creation         datetime,					-- FEC:EcritureDate	| creation date
+  tms                   timestamp,					--					| date last modification 
+  import_key            varchar(14),
+  code_journal          varchar(32) NOT NULL,		-- FEC:JournalCode
+  journal_label         varchar(255),				-- FEC:JournalLib
+  piece_num             integer NOT NULL,			-- FEC:EcritureNum
+  validated             tinyint DEFAULT 0 NOT NULL,	-- 					| 0 line not validated / 1 line validated (No deleting / No modification) 
+  date_validated        datetime					-- FEC:ValidDate
+) ENGINE=innodb;
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 64744eedf4a..f9ec68a1689 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -214,6 +214,7 @@ AccountingJournalType1=Various operation
 AccountingJournalType2=Sales
 AccountingJournalType3=Purchases
 AccountingJournalType4=Bank
+AccountingJournalType5=Expenses report
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
 

From a1f08be4791c48462933f31c0d60a2a59553c300 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 18 Jun 2017 22:21:42 +0200
Subject: [PATCH 274/438] Fix phpcs

---
 htdocs/modulebuilder/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 7aa3440b8a8..4e8f1c323ee 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -703,7 +703,7 @@ elseif (! empty($module))
             $head3[$h][2] = 'newobject';
             $h++;
 
-            $listofobject = dol_dir_list($dir , 'files', 0, '\.txt$');
+            $listofobject = dol_dir_list($dir, 'files', 0, '\.txt$');
             foreach($listofobject as $fileobj)
             {
                 $objectname = preg_replace('/\.txt$/', '', $fileobj['name']);

From 8d84277e8c4b31a65e35f0da093cdfc6ee342183 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Jun 2017 02:18:04 +0200
Subject: [PATCH 275/438] Complete repair script

---
 htdocs/install/mysql/migration/repair.sql | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index 991212c7d22..fe8915fbf09 100755
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -339,6 +339,11 @@ drop table tmp_c_shipment_mode;
 -- VMYSQL4.1 update llx_expensereport_det as ed set date = (select date_debut from llx_expensereport as e where ed.fk_expensereport = e.rowid) where DATE(STR_TO_DATE(date, '%Y-%m-%d')) < '1000-00-00';
 -- VMYSQL4.1 SET sql_mode = 'NO_ZERO_DATE';
 
+-- VMYSQL4.1 SET sql_mode = 'ALLOW_INVALID_DATES';
+-- VMYSQL4.1 update llx_bank set tms = datec where DATE(STR_TO_DATE(tms, '%Y-%m-%d')) IS NULL;
+-- VMYSQL4.1 SET sql_mode = 'NO_ZERO_DATE';
+-- VMYSQL4.1 update llx_bank set tms = datec where DATE(STR_TO_DATE(tms, '%Y-%m-%d')) IS NULL;
+
 
 -- Backport a change of value into the hourly rate. 
 -- update llx_projet_task_time as ptt set ptt.thm = (SELECT thm from llx_user as u where ptt.fk_user = u.rowid) where (ptt.thm is null)

From 6fc4dacd425493d1aeaaf1a35a2ba4aab547ca3b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Jun 2017 02:55:33 +0200
Subject: [PATCH 276/438] Fix migration opensurvey

---
 htdocs/install/mysql/migration/3.5.0-3.6.0.sql | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/htdocs/install/mysql/migration/3.5.0-3.6.0.sql b/htdocs/install/mysql/migration/3.5.0-3.6.0.sql
index 0e7a226d0bd..bd04766eebf 100644
--- a/htdocs/install/mysql/migration/3.5.0-3.6.0.sql
+++ b/htdocs/install/mysql/migration/3.5.0-3.6.0.sql
@@ -62,6 +62,21 @@ ALTER TABLE llx_societe MODIFY COLUMN fk_currency varchar(3) NULL;
 ALTER TABLE llx_bookmark ADD COLUMN entity integer DEFAULT 1 NOT NULL;
 ALTER TABLE llx_bookmark MODIFY COLUMN url varchar(255) NOT NULL;
 
+
+ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN tms timestamp DEFAULT '2001-01-01 00:00:00';
+
+-- Clean corrupted values for tms
+-- VMYSQL4.1 SET sql_mode = 'ALLOW_INVALID_DATES';
+-- VMYSQL4.1 update llx_opensurvey_sondage set tms = date_fin where DATE(STR_TO_DATE(tms, '%Y-%m-%d')) IS NULL;
+-- VMYSQL4.1 SET sql_mode = 'NO_ZERO_DATE';
+-- VMYSQL4.1 update llx_opensurvey_sondage set tms = date_fin where DATE(STR_TO_DATE(tms, '%Y-%m-%d')) IS NULL;
+-- Remove default not null on date_fin
+-- VMYSQL4.3 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN date_fin DATETIME NULL DEFAULT NULL;
+-- VPGSQL8.2 ALTER TABLE llx_opensurvey_sondage ALTER COLUMN date_fin DROP NOT NULL;
+
+ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP;
+
+
 ALTER TABLE llx_opensurvey_sondage ADD COLUMN entity integer DEFAULT 1 NOT NULL;
 ALTER TABLE llx_opensurvey_sondage ADD COLUMN allow_comments tinyint NOT NULL DEFAULT 1;
 -- ALTER TABLE llx_opensurvey_sondage DROP COLUMN survey_link_visible;

From 52eeeebac9b1f804d5707fac543b727f9fbd3a6d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Jun 2017 02:31:55 +0200
Subject: [PATCH 277/438] Fix bad data in sql dump

---
 dev/initdemo/initdemo.sh                       |  2 +-
 dev/initdemo/mysqldump_dolibarr_3.5.0.sql      |  2 +-
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql | 14 ++++++++------
 htdocs/install/mysql/migration/repair.sql      |  5 +++++
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/dev/initdemo/initdemo.sh b/dev/initdemo/initdemo.sh
index 940f0b59467..ddba2ea6fd9 100755
--- a/dev/initdemo/initdemo.sh
+++ b/dev/initdemo/initdemo.sh
@@ -155,7 +155,7 @@ fi
 #echo "mysql -P$port -u$admin $passwd $base < $mydir/$dumpfile"
 #mysql -P$port -u$admin $passwd $base < $mydir/$dumpfile
 #echo "drop old table"
-echo "drop table llx_accounting_account;" | mysql -P$port -u$admin $passwd $base
+echo "drop table if exists llx_accounting_account;" | mysql -P$port -u$admin $passwd $base
 echo "mysql -P$port -u$admin -p***** $base < $mydir/$dumpfile"
 mysql -P$port -u$admin $passwd $base < $mydir/$dumpfile
 export res=$?
diff --git a/dev/initdemo/mysqldump_dolibarr_3.5.0.sql b/dev/initdemo/mysqldump_dolibarr_3.5.0.sql
index dba6263dde3..ab03e6054c1 100644
--- a/dev/initdemo/mysqldump_dolibarr_3.5.0.sql
+++ b/dev/initdemo/mysqldump_dolibarr_3.5.0.sql
@@ -528,7 +528,7 @@ CREATE TABLE `llx_bank` (
 
 LOCK TABLES `llx_bank` WRITE;
 /*!40000 ALTER TABLE `llx_bank` DISABLE KEYS */;
-INSERT INTO `llx_bank` VALUES (1,'2010-07-08 23:56:14','2013-03-07 21:28:51','2010-07-08','2010-07-08',2000.00000000,'(Initial balance)',1,NULL,1,'SOLD','201210',NULL,1,NULL,0,NULL,NULL,NULL),(2,'2010-07-09 00:00:24','0000-00-00 00:00:00','2010-07-09','2010-07-09',500.00000000,'(Initial balance)',2,NULL,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(3,'2010-07-10 13:33:42','0000-00-00 00:00:00','2010-07-10','2010-07-10',0.00000000,'(Solde initial)',3,NULL,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(4,'2010-07-10 14:59:41','0000-00-00 00:00:00','2010-07-10','2010-07-10',0.02000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,'Client salon invidivdu',NULL),(5,'2011-07-18 20:50:24','0000-00-00 00:00:00','2011-07-08','2011-07-08',20.00000000,'(CustomerInvoicePayment)',1,1,NULL,'CB','201107',NULL,1,NULL,0,NULL,NULL,NULL),(6,'2011-07-18 20:50:47','0000-00-00 00:00:00','2011-07-08','2011-07-08',10.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(8,'2011-08-01 03:34:11','2013-03-07 21:28:51','2011-08-01','2011-08-01',5.63000000,'(CustomerInvoicePayment)',1,1,1,'CB','201210',NULL,1,NULL,0,NULL,NULL,NULL),(12,'2011-08-05 23:11:37','2013-03-07 21:33:57','2011-08-05','2011-08-05',-10.00000000,'(SocialContributionPayment)',1,1,1,'VIR','201210',NULL,1,NULL,0,NULL,NULL,NULL),(13,'2011-08-06 20:33:54','0000-00-00 00:00:00','2011-08-06','2011-08-06',5.98000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(14,'2011-08-08 02:53:40','0000-00-00 00:00:00','2011-08-08','2011-08-08',26.10000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(15,'2011-08-08 02:55:58','2013-03-07 21:39:20','2011-08-08','2011-08-08',26.96000000,'(CustomerInvoicePayment)',1,1,1,'TIP','201211',NULL,1,NULL,0,NULL,NULL,NULL),(16,'2012-12-09 15:28:44','2012-12-09 14:28:44','2012-12-09','2012-12-09',2.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(17,'2012-12-09 15:28:53','2012-12-09 14:33:07','2012-12-09','2012-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(18,'2012-12-09 17:35:55','2012-12-09 16:35:55','2012-12-09','2012-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(19,'2012-12-09 17:37:02','2012-12-09 16:37:02','2012-12-09','2012-12-09',2.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(20,'2012-12-09 18:35:07','2012-12-09 17:35:07','2012-12-09','2012-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(21,'2012-12-12 18:54:33','2013-03-07 21:28:51','2012-12-12','2012-12-12',1.00000000,'(CustomerInvoicePayment)',1,1,1,'TIP','201210',NULL,1,NULL,0,NULL,NULL,NULL),(22,'2013-03-06 16:48:16','2013-03-06 15:48:16','2013-03-06','2013-03-06',20.00000000,'(SubscriptionPayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(23,'2013-03-20 14:30:11','2013-03-20 13:30:11','2013-03-20','2013-03-20',10.00000000,'(SubscriptionPayment)',1,1,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL);
+INSERT INTO `llx_bank` VALUES (1,'2010-07-08 23:56:14','2013-03-07 21:28:51','2010-07-08','2010-07-08',2000.00000000,'(Initial balance)',1,NULL,1,'SOLD','201210',NULL,1,NULL,0,NULL,NULL,NULL),(2,'2010-07-09 00:00:24','2010-07-09 00:00:24','2010-07-09','2010-07-09',500.00000000,'(Initial balance)',2,NULL,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(3,'2010-07-10 13:33:42','2010-07-10 13:33:42','2010-07-10','2010-07-10',0.00000000,'(Solde initial)',3,NULL,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(4,'2010-07-10 14:59:41','2010-07-10 14:59:41','2010-07-10','2010-07-10',0.02000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,'Client salon invidivdu',NULL),(5,'2011-07-18 20:50:24','2011-07-18 20:50:24','2011-07-08','2011-07-08',20.00000000,'(CustomerInvoicePayment)',1,1,NULL,'CB','201107',NULL,1,NULL,0,NULL,NULL,NULL),(6,'2011-07-18 20:50:47','2011-07-18 20:50:47','2011-07-08','2011-07-08',10.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(8,'2011-08-01 03:34:11','2013-03-07 21:28:51','2011-08-01','2011-08-01',5.63000000,'(CustomerInvoicePayment)',1,1,1,'CB','201210',NULL,1,NULL,0,NULL,NULL,NULL),(12,'2011-08-05 23:11:37','2013-03-07 21:33:57','2011-08-05','2011-08-05',-10.00000000,'(SocialContributionPayment)',1,1,1,'VIR','201210',NULL,1,NULL,0,NULL,NULL,NULL),(13,'2011-08-06 20:33:54','2011-08-06 20:33:54','2011-08-06','2011-08-06',5.98000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(14,'2011-08-08 02:53:40','2011-08-08 02:53:40','2011-08-08','2011-08-08',26.10000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(15,'2011-08-08 02:55:58','2013-03-07 21:39:20','2011-08-08','2011-08-08',26.96000000,'(CustomerInvoicePayment)',1,1,1,'TIP','201211',NULL,1,NULL,0,NULL,NULL,NULL),(16,'2012-12-09 15:28:44','2012-12-09 14:28:44','2012-12-09','2012-12-09',2.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(17,'2012-12-09 15:28:53','2012-12-09 14:33:07','2012-12-09','2012-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(18,'2012-12-09 17:35:55','2012-12-09 16:35:55','2012-12-09','2012-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(19,'2012-12-09 17:37:02','2012-12-09 16:37:02','2012-12-09','2012-12-09',2.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(20,'2012-12-09 18:35:07','2012-12-09 17:35:07','2012-12-09','2012-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(21,'2012-12-12 18:54:33','2013-03-07 21:28:51','2012-12-12','2012-12-12',1.00000000,'(CustomerInvoicePayment)',1,1,1,'TIP','201210',NULL,1,NULL,0,NULL,NULL,NULL),(22,'2013-03-06 16:48:16','2013-03-06 15:48:16','2013-03-06','2013-03-06',20.00000000,'(SubscriptionPayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(23,'2013-03-20 14:30:11','2013-03-20 13:30:11','2013-03-20','2013-03-20',10.00000000,'(SubscriptionPayment)',1,1,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_bank` ENABLE KEYS */;
 UNLOCK TABLES;
 
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 5e46393768a..18349872d72 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -25,6 +25,8 @@
 -- -- VMYSQL4.1 DELETE FROM llx_usergroup_user      WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
 
 
+ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN tms timestamp DEFAULT '2001-01-01 00:00:00';
+
 -- Clean corrupted values for tms
 -- VMYSQL4.1 SET sql_mode = 'ALLOW_INVALID_DATES';
 -- VMYSQL4.1 update llx_opensurvey_sondage set tms = date_fin where DATE(STR_TO_DATE(tms, '%Y-%m-%d')) IS NULL;
@@ -34,12 +36,6 @@
 -- VMYSQL4.3 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN date_fin DATETIME NULL DEFAULT NULL;
 -- VPGSQL8.2 ALTER TABLE llx_opensurvey_sondage ALTER COLUMN date_fin DROP NOT NULL;
 
-
-ALTER TABLE llx_extrafields ADD COLUMN fieldcomputed text;
-ALTER TABLE llx_extrafields ADD COLUMN fielddefault varchar(255);
-
-ALTER TABLE llx_c_typent MODIFY COLUMN libelle varchar(64); 
-
 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP;
 
 ALTER TABLE llx_opensurvey_sondage ADD COLUMN fk_user_creat integer NOT NULL DEFAULT 0;
@@ -50,6 +46,12 @@ ALTER TABLE llx_opensurvey_sondage ADD COLUMN allow_spy tinyint NOT NULL DEFAULT
 ALTER TABLE llx_opensurvey_sondage ADD COLUMN sujet TEXT;
 
 
+ALTER TABLE llx_extrafields ADD COLUMN fieldcomputed text;
+ALTER TABLE llx_extrafields ADD COLUMN fielddefault varchar(255);
+
+ALTER TABLE llx_c_typent MODIFY COLUMN libelle varchar(64); 
+
+
 create table llx_notify_def_object
 (
   id				integer AUTO_INCREMENT PRIMARY KEY,
diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index fe8915fbf09..567bd3aef85 100755
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -344,6 +344,11 @@ drop table tmp_c_shipment_mode;
 -- VMYSQL4.1 SET sql_mode = 'NO_ZERO_DATE';
 -- VMYSQL4.1 update llx_bank set tms = datec where DATE(STR_TO_DATE(tms, '%Y-%m-%d')) IS NULL;
 
+-- VMYSQL4.1 SET sql_mode = 'ALLOW_INVALID_DATES';
+-- VMYSQL4.1 update llx_opensurvey_sondage set tms = date_fin where DATE(STR_TO_DATE(tms, '%Y-%m-%d')) IS NULL;
+-- VMYSQL4.1 SET sql_mode = 'NO_ZERO_DATE';
+-- VMYSQL4.1 update llx_opensurvey_sondage set tms = date_fin where DATE(STR_TO_DATE(tms, '%Y-%m-%d')) IS NULL;
+
 
 -- Backport a change of value into the hourly rate. 
 -- update llx_projet_task_time as ptt set ptt.thm = (SELECT thm from llx_user as u where ptt.fk_user = u.rowid) where (ptt.thm is null)

From b331176bf77ab8883c6bca2fff092eb533b41f64 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Jun 2017 02:58:09 +0200
Subject: [PATCH 278/438] Fix bad data

---
 dev/initdemo/mysqldump_dolibarr_3.5.0.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/initdemo/mysqldump_dolibarr_3.5.0.sql b/dev/initdemo/mysqldump_dolibarr_3.5.0.sql
index ab03e6054c1..28b05e920d8 100644
--- a/dev/initdemo/mysqldump_dolibarr_3.5.0.sql
+++ b/dev/initdemo/mysqldump_dolibarr_3.5.0.sql
@@ -4844,7 +4844,7 @@ CREATE TABLE `llx_opensurvey_sondage` (
 
 LOCK TABLES `llx_opensurvey_sondage` WRITE;
 /*!40000 ALTER TABLE `llx_opensurvey_sondage` DISABLE KEYS */;
-INSERT INTO `llx_opensurvey_sondage` VALUES ('m4467s2mtk6khmxc','m4467s2mtk6khmxci2ysw682','fdffdshfghfj jhgjgh','aaa@aaa.com','fdfds','fdffds','2013-03-06 23:00:00','D+','1',1,'dolibarr','0000-00-00 00:00:00');
+INSERT INTO `llx_opensurvey_sondage` VALUES ('m4467s2mtk6khmxc','m4467s2mtk6khmxci2ysw682','fdffdshfghfj jhgjgh','aaa@aaa.com','fdfds','fdffds','2013-03-06 23:00:00','D+','1',1,'dolibarr','2000-01-01 00:00:00');
 /*!40000 ALTER TABLE `llx_opensurvey_sondage` ENABLE KEYS */;
 UNLOCK TABLES;
 

From 9352ecca1faf21d632250c16e14c74b4e8bd51bf Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Wed, 16 Dec 2015 13:32:44 +0100
Subject: [PATCH 279/438] Fix: PHP 7 - Fatal error: 'break' not in the 'loop'
 or 'switch' context

---
 htdocs/includes/adodbtime/adodb-time.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/includes/adodbtime/adodb-time.inc.php b/htdocs/includes/adodbtime/adodb-time.inc.php
index 1be5f4cd607..88d05d2f2b1 100644
--- a/htdocs/includes/adodbtime/adodb-time.inc.php
+++ b/htdocs/includes/adodbtime/adodb-time.inc.php
@@ -1006,7 +1006,7 @@ function adodb_tz_offset($gmt,$isphp5)
 		return sprintf('%s%02d%02d',($gmt<=0)?'+':'-',floor($zhrs),($zhrs-$hrs)*60);
 	else
 		return sprintf('%s%02d%02d',($gmt<0)?'+':'-',floor($zhrs),($zhrs-$hrs)*60);
-	break;
+	//break;
 }
 
 

From f0df9b8d23a00dbad77cbf244f7c86e4cc6af59d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Jun 2017 05:06:50 +0200
Subject: [PATCH 280/438] Update package file

---
 build/debian/source/lintian-overrides | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build/debian/source/lintian-overrides b/build/debian/source/lintian-overrides
index c878035b482..e64eae84887 100644
--- a/build/debian/source/lintian-overrides
+++ b/build/debian/source/lintian-overrides
@@ -10,6 +10,8 @@ source-is-missing htdocs/includes/ckeditor/ckeditor/lang/*.js
 source-is-missing htdocs/includes/ckeditor/ckeditor/plugins/*/dialogs/*.js
 source-is-missing htdocs/includes/ckeditor/ckeditor/plugins/*/filter/*.js
 source-is-missing htdocs/includes/ckeditor/ckeditor/plugins/templates/templates/default.js
-source-is-missing htdocs/includes/mobiledetect/mobiledetectlib/Mobile_Detect.json
 source-is-missing htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/*.js
+# Those are false positives, the files are their own sources since
+# they are data files
+source-is-missing htdocs/includes/mobiledetect/mobiledetectlib/Mobile_Detect.json
 

From d2371946ba040aeab84bd1ca81c03d6dabf4ebb9 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Mon, 19 Jun 2017 09:50:13 +0200
Subject: [PATCH 281/438] Fix: for avoid warning

---
 htdocs/core/class/conf.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 8a96e18bf7d..a7a7540ca18 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -325,9 +325,9 @@ class Conf
 		// Exception: Some dir are not the name of module. So we keep exception here for backward compatibility.
 
 		// Sous module bons d'expedition
-		$this->expedition_bon->enabled=$this->global->MAIN_SUBMODULE_EXPEDITION?$this->global->MAIN_SUBMODULE_EXPEDITION:0;
+		$this->expedition_bon->enabled=(! empty($this->global->MAIN_SUBMODULE_EXPEDITION)?$this->global->MAIN_SUBMODULE_EXPEDITION:0);
 		// Sous module bons de livraison
-		$this->livraison_bon->enabled=$this->global->MAIN_SUBMODULE_LIVRAISON?$this->global->MAIN_SUBMODULE_LIVRAISON:0;
+		$this->livraison_bon->enabled=(! empty($this->global->MAIN_SUBMODULE_LIVRAISON)?$this->global->MAIN_SUBMODULE_LIVRAISON:0);
 
 		// Module fournisseur
 		if (! empty($this->fournisseur))

From 5f187f851f0bb2a01e86912fefa55b7ad175c088 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Jun 2017 10:34:22 +0200
Subject: [PATCH 282/438] Fix doc

---
 build/debian/README.howto | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/debian/README.howto b/build/debian/README.howto
index 1632e954237..52239176c60 100644
--- a/build/debian/README.howto
+++ b/build/debian/README.howto
@@ -174,7 +174,7 @@ or
 Puis pour se connecter et préparer l'environnement 
 > schroot -c name_of_chroot  (exemple schroot -c unstable-amd64-sbuild)
 > cat /etc/debian_chroot       to check which debian branch we are into
-> apt-get install vi dialog
+> apt-get install vim dialog
 > vi /usr/sbin/policy-rc.d     and replace return code 101 (not allowed) into 0 (ok)
 > apt-get update
 > apt-get upgrade

From 85efe6ef74e37b70bebb7992cd144a5bdf97ebe3 Mon Sep 17 00:00:00 2001
From: Inovea Conseil <inoveaconseil@users.noreply.github.com>
Date: Mon, 19 Jun 2017 11:32:11 +0200
Subject: [PATCH 283/438] Add import fields for societe rib

Add import fields for rib account, this fields are used in a new external module bankwire for supplier invoice.

But we must copy the translation of banks.lang in bills.lang are there an other solution  ?
---
 htdocs/core/modules/modSociete.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index c4c93537444..0861dea4a1d 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -416,7 +416,7 @@ class modSociete extends DolibarrModules
 		$this->import_tables_array[$r]=array('sr'=>MAIN_DB_PREFIX.'societe_rib');
 		$this->import_fields_array[$r]=array('sr.fk_soc'=>"ThirdPartyName*",'sr.bank'=>"Bank",
 				'sr.code_banque'=>"BankCode*",'sr.code_guichet'=>"DeskCode*",'sr.number'=>"BankAccountNumber*",
-				'sr.cle_rib'=>"BankAccountNumberKey*",'sr.bic'=>"BIC",'sr.iban_prefix'=>"IBAN"
+				'sr.cle_rib'=>"BankAccountNumberKey*",'sr.bic'=>"BIC",'sr.iban_prefix'=>"IBAN", 'sr.domiciliation'=>"BankAccountDomiciliation",'sr.proprio' => "BankAccountOwner", 'sr.owner_address' => "BankAccountOwnerAddress", 'sr.default_rib' => 'Default'
 		);
 
 		$this->import_convertvalue_array[$r]=array(
@@ -424,7 +424,7 @@ class modSociete extends DolibarrModules
 		);
 		$this->import_examplevalues_array[$r]=array('sr.fk_soc'=>"MyBigCompany",'sr.bank'=>"ING",
 				'sr.code_banque'=>"0000", 'sr.code_guichet'=>"1111",'sr.number'=>"3333333333",
-				'sr.cle_rib'=>"22",'sr.bic'=>"USHINGMMXXX",'sr.iban_prefix'=>"US00 0000 1111 22 3333 3333"
+				'sr.cle_rib'=>"22",'sr.bic'=>"USHINGMMXXX",'sr.iban_prefix'=>"US00 0000 1111 22 3333 3333",'sr.domiciliation'=>"PARIS",'sr.proprio' => "Name of owner", 'sr.owner_address' => "15 paris street 75000 Paris", 'sr.default_rib' => '1 or 0'
 		);
 
 		// Import Company Salesman

From a2ca6d5ef96d936fe15ef583c742ab6a6e869527 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Jun 2017 12:50:13 +0200
Subject: [PATCH 284/438] Add warning in log if conf file setup not correct

---
 htdocs/main.inc.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 022aa4d5e44..dc3467a185d 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -654,7 +654,11 @@ if (! defined('NOLOGIN'))
 	           if (constant('DOL_MAIN_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_MAIN_URL_ROOT'),'/').'/', '', $relativepathstring);
 	           $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
                $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
-               if (! empty($_SESSION['lastsearch_values_tmp_'.$relativepathstring]))
+               if (preg_match('/^https?:/', $relativepathstring))
+               {
+                   dol_syslog('Failted to save the search criteria. Calculation of relative page fails (check parameter $dolibarr_main_url_root in conf file match the URL you use in your browser).', LOG_WARNING);
+               }
+               elseif (! empty($_SESSION['lastsearch_values_tmp_'.$relativepathstring]))
                {
                    $_SESSION['lastsearch_values_'.$relativepathstring]=$_SESSION['lastsearch_values_tmp_'.$relativepathstring];
                    unset($_SESSION['lastsearch_values_tmp_'.$relativepathstring]);

From 287e727e714418ce2ecf334f1960eaa411fb2d4d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Jun 2017 13:47:25 +0200
Subject: [PATCH 285/438] Fix detection of relative URL

---
 htdocs/core/lib/functions.lib.php |  4 +++-
 htdocs/main.inc.php               | 14 +++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index ca3d0587905..50e3ecfb33f 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -276,9 +276,11 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 	if (empty($method) || $method == 3 || $method == 4)
 	{
     	$relativepathstring = $_SERVER["PHP_SELF"];
+    	// Clean $relativepathstring
     	if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
-    	$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
     	$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
+    	$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
+    	//var_dump($relativepathstring);
 
         // Code for search criteria persistence.
     	// Retrieve values if restore_lastsearch_values is set and there is saved values
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index dc3467a185d..78f5d9d4f1e 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -651,14 +651,14 @@ if (! defined('NOLOGIN'))
 	       if (! empty($_GET['save_lastsearch_values']))    // Keep $_GET here
 	       {
                $relativepathstring = preg_replace('/\?.*$/','',$_SERVER["HTTP_REFERER"]);
-	           if (constant('DOL_MAIN_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_MAIN_URL_ROOT'),'/').'/', '', $relativepathstring);
-	           $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
+               $relativepathstring = preg_replace('/^https?:\/\/[^\/]*/','',$relativepathstring);     // Get full path except host server
+               // Clean $relativepathstring
+   	           if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
                $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
-               if (preg_match('/^https?:/', $relativepathstring))
-               {
-                   dol_syslog('Failted to save the search criteria. Calculation of relative page fails (check parameter $dolibarr_main_url_root in conf file match the URL you use in your browser).', LOG_WARNING);
-               }
-               elseif (! empty($_SESSION['lastsearch_values_tmp_'.$relativepathstring]))
+               $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
+               //var_dump($relativepathstring);
+
+               if (! empty($_SESSION['lastsearch_values_tmp_'.$relativepathstring]))
                {
                    $_SESSION['lastsearch_values_'.$relativepathstring]=$_SESSION['lastsearch_values_tmp_'.$relativepathstring];
                    unset($_SESSION['lastsearch_values_tmp_'.$relativepathstring]);

From bb2d27280b0687be03db4dc00295612bbd305ee8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Jun 2017 14:31:08 +0200
Subject: [PATCH 286/438] Fix sort link must be disabled for computed field

---
 htdocs/adherents/list.php                |  4 +-
 htdocs/comm/propal/list.php              |  4 +-
 htdocs/commande/list.php                 |  4 +-
 htdocs/compta/bank/bankentries.php       | 48 ++++++------
 htdocs/compta/bank/index.php             | 40 +++++-----
 htdocs/compta/facture/list.php           |  4 +-
 htdocs/contrat/list.php                  |  4 +-
 htdocs/contrat/services.php              | 34 +++++----
 htdocs/expedition/list.php               | 56 +++++++-------
 htdocs/expensereport/list.php            |  4 +-
 htdocs/fichinter/list.php                | 62 ++++++++--------
 htdocs/fourn/commande/list.php           |  4 +-
 htdocs/fourn/facture/list.php            |  4 +-
 htdocs/product/list.php                  |  4 +-
 htdocs/product/stock/mouvement.php       |  4 +-
 htdocs/product/stock/productlot_list.php | 70 +++++++++---------
 htdocs/projet/tasks/time.php             |  4 +-
 htdocs/resource/list.php                 |  4 +-
 htdocs/supplier_proposal/list.php        | 94 ++++++++++++------------
 htdocs/user/index.php                    |  4 +-
 20 files changed, 248 insertions(+), 208 deletions(-)

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index ec6bb85710c..20f36189862 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -609,7 +609,9 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
         if (! empty($arrayfields["ef.".$key]['checked']))
         {
             $align=$extrafields->getAlignFlag($key);
-            print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+            $sortonfield = "ef.".$key;
+            if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+            print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
         }
     }
 }
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index a8e3d23565f..39ee93fd9cd 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -732,7 +732,9 @@ if ($resql)
            if (! empty($arrayfields["ef.".$key]['checked']))
            {
 				$align=$extrafields->getAlignFlag($key);
-				print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+    			$sortonfield = "ef.".$key;
+    			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+    			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
            }
 	   }
 	}
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index daefc3c4cce..73fa9c5b66e 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -1019,7 +1019,9 @@ if ($resql)
            if (! empty($arrayfields["ef.".$key]['checked']))
            {
 				$align=$extrafields->getAlignFlag($key);
-				print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+    			$sortonfield = "ef.".$key;
+    			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+    			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
            }
 	   }
 	}
diff --git a/htdocs/compta/bank/bankentries.php b/htdocs/compta/bank/bankentries.php
index 5f50bf74c1b..d9dd8241248 100644
--- a/htdocs/compta/bank/bankentries.php
+++ b/htdocs/compta/bank/bankentries.php
@@ -407,7 +407,7 @@ if ($id > 0 || ! empty($ref))
     dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
 
     dol_fiche_end();
- 
+
     /*
      * Buttons actions
      */
@@ -521,10 +521,10 @@ if (($id > 0 || ! empty($ref)) && ((string) $page == ''))
     $offset = $limit * $page;
     if ($page < 0) $page = 0;
 }
-if ($page >= $nbtotalofpages) 
+if ($page >= $nbtotalofpages)
 {
     // If we made a search and result has low page than the page number we were on
-    $page = ($nbtotalofpages -1); 
+    $page = ($nbtotalofpages -1);
     $offset = $limit * $page;
     if ($page < 0) $page = 0;
 }
@@ -598,7 +598,7 @@ if ($resql)
 	    print '<input class="button" name="confirm_reconcile" type="submit" value="'.$langs->trans("Conciliate").'">';
 	    print ' '.$langs->trans("or").' ';
 	    print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
-	    
+
 	    // Show last bank statements
 	    $nbmax=15;      // We accept to show last 15 receipts (so we can have more than one year)
 	    $liste="";
@@ -703,8 +703,8 @@ if ($resql)
 	$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
 	if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
 	else $moreforfilter = $hookmanager->resPrint;
-	
-	if ($moreforfilter) 
+
+	if ($moreforfilter)
 	{
 		print '<div class="liste_titre liste_titre_bydiv centpercent">';
 		print $moreforfilter;
@@ -718,7 +718,7 @@ if ($resql)
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
 	print '<tr class="liste_titre_filter">';
-	if (! empty($arrayfields['b.rowid']['checked']))            
+	if (! empty($arrayfields['b.rowid']['checked']))
 	{
 	    print '<td class="liste_titre">';
     	print '<input type="text" class="flat" name="search_ref" size="2" value="'.dol_escape_htmltag($search_ref).'">';
@@ -821,7 +821,9 @@ if ($resql)
 	        if (! empty($arrayfields["ef.".$key]['checked']))
 	        {
 	            $align=$extrafields->getAlignFlag($key);
-	            print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+    			$sortonfield = "ef.".$key;
+    			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+    			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
 	        }
 	    }
 	}
@@ -840,19 +842,19 @@ if ($resql)
 	$sign = 1;
 
     $totalarray=array();
-    while ($i < min($num,$limit)) 
+    while ($i < min($num,$limit))
     {
         $objp = $db->fetch_object($resql);
 
         // If we are in a situation where we need/can show balance, we calculate the start of balance
         if (! $balancecalculated && ! empty($arrayfields['balance']['checked']) && $mode_balance_ok)
         {
-            if (! $account) 
+            if (! $account)
             {
                 dol_print_error('', 'account is not defined but $mode_balance_ok is true');
                 exit;
             }
-            
+
             //Loop on each record
             $sign = 1;
             $i = 0;
@@ -875,7 +877,7 @@ if ($resql)
                 }
             }
             else dol_print_error($db);
-            
+
             $balancecalculated=true;
         }
 
@@ -896,7 +898,7 @@ if ($resql)
         print '<tr class="oddeven">';
 
         // Ref
-    	if (! empty($arrayfields['b.rowid']['checked']))            
+    	if (! empty($arrayfields['b.rowid']['checked']))
     	{
                 print '<td align="left" class="nowrap">';
                 print "<a href=\"ligne.php?rowid=".$objp->rowid.'">'.img_object($langs->trans("ShowPayment").': '.$objp->rowid, 'account', 'class="classfortooltip"').' '.$objp->rowid."</a> &nbsp; ";
@@ -908,14 +910,14 @@ if ($resql)
     	if (! empty($arrayfields['description']['checked']))
     	{
     	    print "<td>";
-    	
+
     	    //print "<a href=\"ligne.php?rowid=".$objp->rowid."&amp;account=".$objp->fk_account."\">";
     	    $reg=array();
     	    preg_match('/\((.+)\)/i',$objp->label,$reg);	// Si texte entoure de parenthee on tente recherche de traduction
     	    if ($reg[1] && $langs->trans($reg[1])!=$reg[1]) print $langs->trans($reg[1]);
     	    else print dol_trunc($objp->label,40);
     	    //print "</a>&nbsp;";
-    	
+
     	    // Add links after description
     	    $links = $bankaccountstatic->get_url($objp->rowid);
     	    $cachebankaccount=array();
@@ -1040,14 +1042,14 @@ if ($resql)
     	}
 
         // Date ope
-    	if (! empty($arrayfields['b.dateo']['checked']))            
+    	if (! empty($arrayfields['b.dateo']['checked']))
     	{
     	   print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($objp->do),"day")."</td>\n";
                 if (! $i) $totalarray['nbfield']++;
     	}
 
         // Date value
-    	if (! empty($arrayfields['b.datev']['checked']))            
+    	if (! empty($arrayfields['b.datev']['checked']))
     	{
     	   print '<td align="center" class="nowrap">';
     	   print '<span id="datevalue_'.$objp->rowid.'">'.dol_print_date($db->jdate($objp->dv),"day")."</span>";
@@ -1063,7 +1065,7 @@ if ($resql)
     	}
 
         // Payment type
-    	if (! empty($arrayfields['type']['checked']))            
+    	if (! empty($arrayfields['type']['checked']))
     	{
         	print '<td align="center" class="nowrap">';
 	        $labeltype=($langs->trans("PaymentTypeShort".$objp->fk_type)!="PaymentTypeShort".$objp->fk_type)?$langs->trans("PaymentTypeShort".$objp->fk_type):$langs->getLabelFromKey($db,$objp->fk_type,'c_paiement','code','libelle');
@@ -1081,7 +1083,7 @@ if ($resql)
     	}
 
 		// Third party
-    	if (! empty($arrayfields['bu.label']['checked']))            
+    	if (! empty($arrayfields['bu.label']['checked']))
     	{
         	print "<td>";
 			if ($objp->url_id)
@@ -1106,7 +1108,7 @@ if ($resql)
     	}
 
     	// Bank account
-    	if (! empty($arrayfields['ba.ref']['checked']))            
+    	if (! empty($arrayfields['ba.ref']['checked']))
     	{
         	print '<td align="right" class="nowrap">';
 			print $bankaccount->getNomUrl(1);
@@ -1174,7 +1176,7 @@ if ($resql)
             	    print '<a href="releve.php?num='.$objp->num_releve.'&amp;account='.$objp->bankid.'">'.$objp->num_releve.'</a>';
             	}
             	else if ($action == 'reconcile')
-            	{ 
+            	{
             	    print '<input class="flat" name="rowid['.$objp->rowid.']" type="checkbox" value="'.$objp->rowid.'" size="1"'.(! empty($_POST['rowid'][$objp->rowid])?' checked':'').'>';
             	}
         	}
@@ -1229,8 +1231,8 @@ if ($resql)
     	    }
     	}
     	print '</td>';
-    	if (! $i) $totalarray['nbfield']++;    	
-    	
+    	if (! $i) $totalarray['nbfield']++;
+
     	// Action column
     	print '<td class="nowrap" align="center">';
     	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index 0c24d25e064..9d8cf29ee39 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -129,9 +129,9 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
     $search_number='';
     $search_statut='';
 }
-    
-    
-    
+
+
+
 /*
  * View
  */
@@ -416,7 +416,9 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
         if (! empty($arrayfields["ef.".$key]['checked']))
         {
             $align=$extrafields->getAlignFlag($key);
-            print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+			$sortonfield = "ef.".$key;
+			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
         }
     }
 }
@@ -437,7 +439,7 @@ $var=true;
 foreach ($accounts as $key=>$type)
 {
 	if ($i >= $limit) break;
-	
+
     $found++;
 
 	$acc = new Account($db);
@@ -454,7 +456,7 @@ foreach ($accounts as $key=>$type)
 	{
 		$lastcurrencycode=$acc->currency_code;
 	}
-	
+
 	print '<tr class="oddeven">';
 
     // Ref
@@ -463,14 +465,14 @@ foreach ($accounts as $key=>$type)
         print '<td>'.$acc->getNomUrl(1).'</td>';
 	    if (! $i) $totalarray['nbfield']++;
     }
-    
+
     // Label
     if (! empty($arrayfields['b.label']['checked']))
     {
 		print '<td>'.$acc->label.'</td>';
         if (! $i) $totalarray['nbfield']++;
     }
-    
+
     // Account type
     if (! empty($arrayfields['accountype']['checked']))
     {
@@ -479,14 +481,14 @@ foreach ($accounts as $key=>$type)
 		print '</td>';
         if (! $i) $totalarray['nbfield']++;
     }
-    
+
     // Number
     if (! empty($arrayfields['b.number']['checked']))
     {
         print '<td>'.$acc->number.'</td>';
 	    if (! $i) $totalarray['nbfield']++;
     }
-    
+
     // Account number
     if (! empty($arrayfields['b.account_number']['checked']))
     {
@@ -499,7 +501,7 @@ foreach ($accounts as $key=>$type)
 
 	    if (! $i) $totalarray['nbfield']++;
     }
-    
+
     // Accountancy journal
     if (! empty($arrayfields['b.fk_accountancy_journal']['checked']))
     {
@@ -509,7 +511,7 @@ foreach ($accounts as $key=>$type)
 		print '<td>'.$accountingjournal->getNomUrl(0,1,1,'',1).'</td>';
 		if (! $i) $totalarray['nbfield']++;
     }
-    
+
     // Transactions to reconcile
     if (! empty($arrayfields['toreconcile']['checked']))
     {
@@ -528,13 +530,13 @@ foreach ($accounts as $key=>$type)
 	    print '</td>';
 	    if (! $i) $totalarray['nbfield']++;
     }
-    
+
 	// Extra fields
 	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 	{
-	   foreach($extrafields->attribute_label as $key => $val) 
+	   foreach($extrafields->attribute_label as $key => $val)
 	   {
-			if (! empty($arrayfields["ef.".$key]['checked'])) 
+			if (! empty($arrayfields["ef.".$key]['checked']))
 			{
 				print '<td';
 				$align=$extrafields->getAlignFlag($key);
@@ -567,14 +569,14 @@ foreach ($accounts as $key=>$type)
         print '</td>';
 	    if (! $i) $totalarray['nbfield']++;
     }
-    
+
     // Statut
     if (! empty($arrayfields['b.clos']['checked']))
     {
 		print '<td align="center">'.$acc->getLibStatut(5).'</td>';
 	    if (! $i) $totalarray['nbfield']++;
     }
-    
+
     // Balance
     if (! empty($arrayfields['balance']['checked']))
     {
@@ -585,7 +587,7 @@ foreach ($accounts as $key=>$type)
 		if (! $i) $totalarray['totalbalancefield']=$totalarray['nbfield'];
 	    $totalarray['totalbalance'] += $solde;
     }
-    
+
 	// Action column
 	print '<td class="nowrap" align="center">';
 	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
@@ -596,7 +598,7 @@ foreach ($accounts as $key=>$type)
 	}
 	print '</td>';
 	if (! $i) $totalarray['nbfield']++;
-	
+
 	print '</tr>';
 
 	$total[$acc->currency_code] += $solde;
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 2716e3a87b1..513c6854eb8 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -975,7 +975,9 @@ if ($resql)
             if (! empty($arrayfields["ef.".$key]['checked']))
             {
                 $align=$extrafields->getAlignFlag($key);
-                print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+    			$sortonfield = "ef.".$key;
+    			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+    			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
             }
         }
     }
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index a82535bfbb7..a526a9bd78c 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -535,7 +535,9 @@ if ($resql)
            if (! empty($arrayfields["ef.".$key]['checked']))
            {
 				$align=$extrafields->getAlignFlag($key);
-				print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+    			$sortonfield = "ef.".$key;
+    			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+    			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
            }
 	   }
 	}
diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php
index 3d5db42495a..aea03a73df5 100644
--- a/htdocs/contrat/services.php
+++ b/htdocs/contrat/services.php
@@ -372,7 +372,9 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
         if (! empty($arrayfields["ef.".$key]['checked']))
         {
             $align=$extrafields->getAlignFlag($key);
-            print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+			$sortonfield = "ef.".$key;
+			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
         }
     }
 }
@@ -516,23 +518,23 @@ $var=True; $i=0;
 while ($i < min($num,$limit))
 {
 	$obj = $db->fetch_object($resql);
-	
+
 	$contractstatic->id=$obj->cid;
 	$contractstatic->ref=$obj->ref?$obj->ref:$obj->cid;
-	
-	
+
+
 
 	print '<tr class="oddeven">';
-	
+
 	// Ref
-    if (! empty($arrayfields['c.ref']['checked'])) 
+    if (! empty($arrayfields['c.ref']['checked']))
     {
         print '<td>';
 		print $contractstatic->getNomUrl(1,16);
 		print '</td>';
     }
 	// Service
-    if (! empty($arrayfields['p.description']['checked'])) 
+    if (! empty($arrayfields['p.description']['checked']))
     {
         print '<td>';
 		if ($obj->pid)
@@ -552,9 +554,9 @@ while ($i < min($num,$limit))
 		}
 		print '</td>';
     }
-    
+
 	// Third party
-    if (! empty($arrayfields['s.nom']['checked'])) 
+    if (! empty($arrayfields['s.nom']['checked']))
     {
         print '<td>';
 		$companystatic->id=$obj->socid;
@@ -563,9 +565,9 @@ while ($i < min($num,$limit))
 		print $companystatic->getNomUrl(1,'customer',28);
 		print '</td>';
     }
-    
+
 	// Start date
-    if (! empty($arrayfields['cd.date_ouverture_prevue']['checked'])) 
+    if (! empty($arrayfields['cd.date_ouverture_prevue']['checked']))
     {
 		print '<td align="center">';
 		print ($obj->date_ouverture_prevue?dol_print_date($db->jdate($obj->date_ouverture_prevue)):'&nbsp;');
@@ -574,15 +576,15 @@ while ($i < min($num,$limit))
 		else print '&nbsp;&nbsp;&nbsp;&nbsp;';
 		print '</td>';
 	}
-    if (! empty($arrayfields['cd.date_ouverture']['checked'])) 
+    if (! empty($arrayfields['cd.date_ouverture']['checked']))
     {
 	    print '<td align="center">'.($obj->date_ouverture?dol_print_date($db->jdate($obj->date_ouverture)):'&nbsp;').'</td>';
 	}
 	// End date
-    if (! empty($arrayfields['cd.date_fin_validite']['checked'])) 
+    if (! empty($arrayfields['cd.date_fin_validite']['checked']))
     {
 	    print '<td align="center">'.($obj->date_fin_validite?dol_print_date($db->jdate($obj->date_fin_validite)):'&nbsp;');
-		if ($obj->date_fin_validite && $db->jdate($obj->date_fin_validite) < ($now - $conf->contrat->services->expires->warning_delay) && $obj->statut < 5) 
+		if ($obj->date_fin_validite && $db->jdate($obj->date_fin_validite) < ($now - $conf->contrat->services->expires->warning_delay) && $obj->statut < 5)
 		{
 		    $warning_delay=$conf->contrat->services->expires->warning_delay / 3600 / 24;
             $textlate = $langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($warning_delay) >= 0 ? '+' : '').ceil($warning_delay).' '.$langs->trans("days");
@@ -591,7 +593,7 @@ while ($i < min($num,$limit))
 		else print '&nbsp;&nbsp;&nbsp;&nbsp;';
 	    print '</td>';
     }
-    if (! empty($arrayfields['cd.date_cloture']['checked'])) 
+    if (! empty($arrayfields['cd.date_cloture']['checked']))
     {
         print '<td align="center">'.dol_print_date($db->jdate($obj->date_cloture)).'</td>';
     }
@@ -658,7 +660,7 @@ while ($i < min($num,$limit))
 	}
 	print '</td>';
 	if (! $i) $totalarray['nbfield']++;
-	
+
 	print "</tr>\n";
 	$i++;
 }
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index c4a07580a9a..22e11e6fd1e 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -158,9 +158,9 @@ if (empty($reshook))
     }
 
 }
-    
-    
-    
+
+
+
 
 /*
  * View
@@ -271,9 +271,9 @@ if ($resql)
 	    $tmpkey=preg_replace('/search_options_/','',$key);
 	    if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
 	}
-	
+
 	//$massactionbutton=$form->selectMassAction('', $massaction == 'presend' ? array() : array('presend'=>$langs->trans("SendByMail"), 'builddoc'=>$langs->trans("PDFMerge")));
-	
+
 	$i = 0;
     print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -283,7 +283,7 @@ if ($resql)
     print '<input type="hidden" name="page" value="'.$page.'">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    
+
 	print_barre_liste($langs->trans('ListOfSendings'), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num, $nbtotalofrecords, '', 0, '', '', $limit);
 
     if ($sall)
@@ -291,7 +291,7 @@ if ($resql)
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
         print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
     }
-    
+
     $moreforfilter='';
     if (! empty($moreforfilter))
     {
@@ -305,28 +305,28 @@ if ($resql)
 
     $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
     $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-	
+
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
 	// Lignes des champs de filtre
 	print '<tr class="liste_titre_filter">';
 	// Ref
-	if (! empty($arrayfields['e.ref']['checked']))            
+	if (! empty($arrayfields['e.ref']['checked']))
 	{
 	    print '<td class="liste_titre">';
     	print '<input class="flat" size="6" type="text" name="search_ref_exp" value="'.$search_ref_exp.'">';
         print '</td>';
 	}
 	// Ref customer
-	if (! empty($arrayfields['e.ref_customer']['checked']))            
+	if (! empty($arrayfields['e.ref_customer']['checked']))
 	{
 	    print '<td class="liste_titre">';
     	print '<input class="flat" size="6" type="text" name="search_ref_customer" value="'.$search_ref_customer.'">';
         print '</td>';
 	}
 	// Thirdparty
-	if (! empty($arrayfields['s.nom']['checked']))            
+	if (! empty($arrayfields['s.nom']['checked']))
 	{
     	print '<td class="liste_titre" align="left">';
     	print '<input class="flat" type="text" size="8" name="search_company" value="'.dol_escape_htmltag($search_company).'">';
@@ -358,18 +358,18 @@ if ($resql)
     	print '</td>';
     }
 	// Date delivery planned
-	if (! empty($arrayfields['e.date_delivery']['checked']))            
+	if (! empty($arrayfields['e.date_delivery']['checked']))
 	{
     	print '<td class="liste_titre">&nbsp;</td>';
 	}
-	if (! empty($arrayfields['l.ref']['checked']))            
+	if (! empty($arrayfields['l.ref']['checked']))
 	{
     	// Delivery ref
 		print '<td class="liste_titre">';
 		print '<input class="flat" size="10" type="text" name="search_ref_liv" value="'.$search_ref_liv.'"';
 		print '</td>';
 	}
-	if (! empty($arrayfields['l.date_delivery']['checked']))            
+	if (! empty($arrayfields['l.date_delivery']['checked']))
 	{
 	    // Date received
 		print '<td class="liste_titre">&nbsp;</td>';
@@ -447,7 +447,9 @@ if ($resql)
 	        if (! empty($arrayfields["ef.".$key]['checked']))
 	        {
 	            $align=$extrafields->getAlignFlag($key);
-	            print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+    			$sortonfield = "ef.".$key;
+    			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+    			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
 	        }
 	    }
 	}
@@ -461,7 +463,7 @@ if ($resql)
 	if (! empty($arrayfields['l.fk_statut']['checked'])) print_liste_field_titre($arrayfields['l.fk_statut']['label'], $_SERVER["PHP_SELF"],"l.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";
-	
+
 	$i=0;
 	$var=true;
 	$totalarray=array();
@@ -471,15 +473,15 @@ if ($resql)
 
     	$shipment->id=$obj->rowid;
     	$shipment->ref=$obj->ref;
-    	
+
     	$companystatic->id=$obj->socid;
     	$companystatic->ref=$obj->name;
     	$companystatic->name=$obj->name;
-		
-		
+
+
 
     	print '<tr class="oddeven">';
-    	 
+
 		// Ref
 		if (! empty($arrayfields['e.ref']['checked']))
 		{
@@ -488,7 +490,7 @@ if ($resql)
     		print "</td>\n";
     		if (! $i) $totalarray['nbfield']++;
 		}
-		
+
 		// Ref customer
 		if (! empty($arrayfields['e.ref_customer']['checked']))
 		{
@@ -496,8 +498,8 @@ if ($resql)
 		    print $obj->ref_customer;
 		    print "</td>\n";
 		    if (! $i) $totalarray['nbfield']++;
-		}		
-		
+		}
+
 		// Third party
 		if (! empty($arrayfields['s.nom']['checked']))
 		{
@@ -546,7 +548,7 @@ if ($resql)
 		    print '</td>';
 		    if (! $i) $totalarray['nbfield']++;
 		}
-		
+
 		// Date delivery planed
 		if (! empty($arrayfields['e.date_delivery']['checked']))
 		{
@@ -558,7 +560,7 @@ if ($resql)
     		}*/
     		print "</td>\n";
 		}
-		
+
 		if (! empty($arrayfields['l.ref']['checked']) || ! empty($arrayfields['l.date_delivery']['checked']))
         {
 		    $shipment->fetchObjectLinked($shipment->id,$shipment->element);
@@ -572,7 +574,7 @@ if ($resql)
                 print !empty($receiving) ? $receiving->getNomUrl($db) : '';
                 print '</td>';
             }
-            
+
     		if (! empty($arrayfields['l.date_delivery']['checked']))
             {
                 // Date received
@@ -629,7 +631,7 @@ if ($resql)
 		// Action column
 		print '<td></td>';
 		if (! $i) $totalarray['nbfield']++;
-		
+
 		print "</tr>\n";
 
 		$i++;
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index bbf2266ab13..d2c5db3426d 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -486,7 +486,9 @@ if ($resql)
 	        if (! empty($arrayfields["ef.".$key]['checked']))
 	        {
 	            $align=$extrafields->getAlignFlag($key);
-	            print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+    			$sortonfield = "ef.".$key;
+    			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+    			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
 	        }
 	    }
 	}
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 0404f976328..78fd59ecb22 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -117,7 +117,7 @@ $arrayfields=array(
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
-   foreach($extrafields->attribute_label as $key => $val) 
+   foreach($extrafields->attribute_label as $key => $val)
    {
        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
    }
@@ -224,7 +224,7 @@ foreach ($search_array_options as $key => $val)
     $typ=$extrafields->attribute_type[$tmpkey];
     $mode=0;
     if (in_array($typ, array('int','double'))) $mode=1;    // Search on a numeric
-    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit))) 
+    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit)))
     {
         $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
     }
@@ -252,7 +252,7 @@ if ($resql)
 	$num = $db->num_rows($resql);
 
 	$arrayofselected=is_array($toselect)?$toselect:array();
-	
+
 	$param='';
     if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
@@ -270,7 +270,7 @@ if ($resql)
         $crit=$val;
         $tmpkey=preg_replace('/search_options_/','',$key);
         if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
-    } 	
+    }
 
     // List of mass actions available
     $arrayofmassactions =  array(
@@ -281,7 +281,7 @@ if ($resql)
     if ($user->rights->ficheinter->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
     //if ($massaction == 'presend' || $massaction == 'createbills') $arrayofmassactions=array();
     $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
-    
+
 	// Lines of title fields
     print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -292,9 +292,9 @@ if ($resql)
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
     print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
-    
+
 	print_barre_liste($title, $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit);
-	
+
 	if ($sall)
     {
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
@@ -302,23 +302,23 @@ if ($resql)
     }
 
     $moreforfilter='';
-    
+
     $parameters=array();
     $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
     if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
     else $moreforfilter = $hookmanager->resPrint;
-    
+
     if (! empty($moreforfilter))
     {
         print '<div class="liste_titre liste_titre_bydiv centpercent">';
         print $moreforfilter;
         print '</div>';
     }
-    
+
 	$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
 	$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
 	if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
-	
+
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
@@ -357,9 +357,9 @@ if ($resql)
 	// Extra fields
 	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 	{
-	   foreach($extrafields->attribute_label as $key => $val) 
+	   foreach($extrafields->attribute_label as $key => $val)
 	   {
-			if (! empty($arrayfields["ef.".$key]['checked'])) 
+			if (! empty($arrayfields["ef.".$key]['checked']))
 			{
                 $align=$extrafields->getAlignFlag($key);
                 $typeofextrafield=$extrafields->attribute_type[$key];
@@ -406,7 +406,7 @@ if ($resql)
 	$searchpicto=$form->showFilterButtons();
 	print $searchpicto;
 	print '</td>';
-	
+
     print "</tr>\n";
 
     print '<tr class="liste_titre">';
@@ -424,7 +424,9 @@ if ($resql)
             if (! empty($arrayfields["ef.".$key]['checked']))
             {
                 $align=$extrafields->getAlignFlag($key);
-                print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+    			$sortonfield = "ef.".$key;
+    			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+    			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
             }
         }
     }
@@ -437,24 +439,24 @@ if ($resql)
     if (! empty($arrayfields['f.fk_statut']['checked'])) print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"f.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
     print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
     print "</tr>\n";
-    
+
 	$total = 0;
 	$i = 0;
 	$totalarray=array();
 	while ($i < min($num, $limit))
 	{
 		$obj = $db->fetch_object($resql);
-		
+
 		$objectstatic->id=$obj->rowid;
 		$objectstatic->ref=$obj->ref;
 		$objectstatic->statut=$obj->fk_statut;
-		
+
 		print '<tr class="oddeven">';
-		
+
         if (! empty($arrayfields['f.ref']['checked']))
 		{
 			print "<td>";
-			
+
 			print '<table class="nobordernopadding"><tr class="nocellnopadd">';
             // Picto + Ref
     		print '<td class="nobordernopadding nowrap">';
@@ -484,7 +486,7 @@ if ($resql)
     		$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
     		print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
     		print '</td></tr></table>';
-			
+
 			print "</td>\n";
         	if (! $i) $totalarray['nbfield']++;
 		}
@@ -525,9 +527,9 @@ if ($resql)
     	// Extra fields
 		if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 		{
-		   foreach($extrafields->attribute_label as $key => $val) 
+		   foreach($extrafields->attribute_label as $key => $val)
 		   {
-				if (! empty($arrayfields["ef.".$key]['checked'])) 
+				if (! empty($arrayfields["ef.".$key]['checked']))
 				{
 					print '<td';
 					$align=$extrafields->getAlignFlag($key);
@@ -576,7 +578,7 @@ if ($resql)
         }
         print '</td>';
         if (! $i) $totalarray['nbfield']++;
-        
+
 		print "</tr>\n";
 
 		$total += $obj->duree;
@@ -603,14 +605,14 @@ if ($resql)
 	}
 
 	$db->free($resql);
-	
+
 	$parameters=array('arrayfields'=>$arrayfields, 'sql'=>$sql);
 	$reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-				
+
 	print '</table>'."\n";
 	print '</div>';
-	
+
 	print "</form>\n";
 
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
@@ -620,18 +622,18 @@ if ($resql)
 	     */
 	    $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
 	    $urlsource.=str_replace('&amp;','&',$param);
-	
+
 	    $filedir=$diroutputmassaction;
 	    $genallowed=$user->rights->ficheinter->lire;
 	    $delallowed=$user->rights->ficheinter->supprimer;
-	
+
 	    print $formfile->showdocuments('massfilesarea_interventions','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
 	}
 	else
 	{
 	    print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
 	}
-	
+
 }
 else
 {
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index bafdeeab4db..0b988e4d96b 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -1050,7 +1050,9 @@ if ($resql)
 	        if (! empty($arrayfields["ef.".$key]['checked']))
 	        {
 	            $align=$extrafields->getAlignFlag($key);
-	            print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+    			$sortonfield = "ef.".$key;
+    			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+    			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
 	        }
 	    }
 	}
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 30d31c0ea02..a9e372a9709 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -888,7 +888,9 @@ if ($resql)
 	        if (! empty($arrayfields["ef.".$key]['checked']))
 	        {
 	            $align=$extrafields->getAlignFlag($key);
-	            print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+    			$sortonfield = "ef.".$key;
+    			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+    			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
 	        }
 	    }
 	}
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 1512fda7b4f..8a8eda5b65a 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -654,7 +654,9 @@ else
     		        if (! empty($arrayfields["ef.".$key]['checked']))
     		        {
     		            $align=$extrafields->getAlignFlag($key);
-    		            print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+            			$sortonfield = "ef.".$key;
+            			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+            			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
     		        }
     		    }
     		}
diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
index 469c2f292e7..23df5282435 100644
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -892,7 +892,9 @@ if ($resql)
            if (! empty($arrayfields["ef.".$key]['checked']))
            {
 				$align=$extrafields->getAlignFlag($key);
-				print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+    			$sortonfield = "ef.".$key;
+    			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+    			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
            }
 	   }
 	}
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index 61e9438c929..ef4a9bf70c9 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -112,7 +112,7 @@ $arrayfields=array(
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
-   foreach($extrafields->attribute_label as $key => $val) 
+   foreach($extrafields->attribute_label as $key => $val)
    {
        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
    }
@@ -129,7 +129,7 @@ if (($id > 0 || ! empty($ref)) && $action != 'add')
 
 
 /*
- * Actions 
+ * Actions
  */
 
 if (GETPOST('cancel')) { $action='list'; $massaction=''; }
@@ -245,7 +245,7 @@ foreach ($search_array_options as $key => $val)
     $typ=$extrafields->attribute_type[$tmpkey];
     $mode=0;
     if (in_array($typ, array('int','double'))) $mode=1;    // Search on a numeric
-    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit))) 
+    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit)))
     {
         $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
     }
@@ -263,7 +263,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
-}	
+}
 
 $sql.= $db->plimit($limit+1, $offset);
 
@@ -275,7 +275,7 @@ if ($resql)
     $num = $db->num_rows($resql);
 
     $arrayofselected=is_array($toselect)?$toselect:array();
-    
+
     $param='';
     if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
     if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
@@ -292,7 +292,7 @@ if ($resql)
         $crit=$val;
         $tmpkey=preg_replace('/search_options_/','',$key);
         if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
-    } 
+    }
 
     $arrayofmassactions =  array(
         //'presend'=>$langs->trans("SendByMail"),
@@ -310,25 +310,25 @@ if ($resql)
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
-	
+
     print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies', 0, '', '', $limit);
-	
+
 	if ($sall)
     {
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
         print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
     }
-    
+
     /*$moreforfilter = '';
     $moreforfilter.='<div class="divsearchfield">';
     $moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_myfield" value="'.dol_escape_htmltag($search_myfield).'">';
     $moreforfilter.= '</div>';*/
-    
+
     $parameters=array();
     $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
     if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
     else $moreforfilter = $hookmanager->resPrint;
-    
+
     if (! empty($moreforfilter))
 	{
 		print '<div class="liste_titre liste_titre_bydiv centpercent">';
@@ -338,7 +338,7 @@ if ($resql)
 
     $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
     $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-	
+
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
@@ -404,7 +404,7 @@ if ($resql)
     print $searchpicto;
     print '</td>';
     print '</tr>'."\n";
-    
+
     // Fields title
     print '<tr class="liste_titre">';
     if (! empty($arrayfields['t.entity']['checked']))        print_liste_field_titre($arrayfields['t.entity']['label'],$_SERVER['PHP_SELF'],'t.entity','',$param,'',$sortfield,$sortorder);
@@ -418,12 +418,14 @@ if ($resql)
 	// Extra fields
 	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 	{
-	   foreach($extrafields->attribute_label as $key => $val) 
+	   foreach($extrafields->attribute_label as $key => $val)
 	   {
-           if (! empty($arrayfields["ef.".$key]['checked'])) 
+           if (! empty($arrayfields["ef.".$key]['checked']))
            {
 				$align=$extrafields->getAlignFlag($key);
-				print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+    			$sortonfield = "ef.".$key;
+    			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+    			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
            }
 	   }
 	}
@@ -438,7 +440,7 @@ if ($resql)
     print '</tr>'."\n";
 
 	$productlot = new Productlot($db);
-	
+
 	$i=0;
 	$var=true;
 	$totalarray=array();
@@ -448,23 +450,23 @@ if ($resql)
         if ($obj)
         {
             $var = !$var;
-            
+
             $productlot->id = $obj->rowid;
             $productlot->batch = $obj->batch;
-            
+
             // You can use here results
             print '<tr class="oddeven">';
-            if (! empty($arrayfields['t.entity']['checked'])) 
+            if (! empty($arrayfields['t.entity']['checked']))
             {
                 print '<td>'.$obj->entity.'</td>';
     		    if (! $i) $totalarray['nbfield']++;
             }
-            if (! empty($arrayfields['t.batch']['checked'])) 
+            if (! empty($arrayfields['t.batch']['checked']))
             {
                 print '<td>'.$productlot->getNomUrl(1).'</td>';
     		    if (! $i) $totalarray['nbfield']++;
             }
-            if (! empty($arrayfields['t.fk_product']['checked'])) 
+            if (! empty($arrayfields['t.fk_product']['checked']))
             {
                 $productstatic->id=$obj->fk_product;
                 $productstatic->type=$obj->product_type;
@@ -473,22 +475,22 @@ if ($resql)
                 print '<td>'.$productstatic->getNomUrl(1).'</td>';
     		    if (! $i) $totalarray['nbfield']++;
             }
-            if (! empty($arrayfields['t.eatby']['checked'])) 
+            if (! empty($arrayfields['t.eatby']['checked']))
             {
                 print '<td>'.dol_print_date($db->jdate($obj->eatby), 'day').'</td>';
     		    if (! $i) $totalarray['nbfield']++;
             }
-            if (! empty($arrayfields['t.sellby']['checked'])) 
+            if (! empty($arrayfields['t.sellby']['checked']))
             {
                 print '<td>'.dol_print_date($db->jdate($obj->sellby), 'day').'</td>';
     		    if (! $i) $totalarray['nbfield']++;
             }
-            if (! empty($arrayfields['t.fk_user_creat']['checked'])) 
+            if (! empty($arrayfields['t.fk_user_creat']['checked']))
             {
                 print '<td>'.$obj->fk_user_creat.'</td>';
     		    if (! $i) $totalarray['nbfield']++;
             }
-            if (! empty($arrayfields['t.fk_user_modif']['checked'])) 
+            if (! empty($arrayfields['t.fk_user_modif']['checked']))
             {
                 print '<td>'.$obj->fk_user_modif.'</td>';
     		    if (! $i) $totalarray['nbfield']++;
@@ -497,13 +499,13 @@ if ($resql)
             {
                 print '<td>'.$obj->import_key.'</td>';
                 if (! $i) $totalarray['nbfield']++;
-            }            
+            }
             // Extra fields
     		if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
     		{
-    		   foreach($extrafields->attribute_label as $key => $val) 
+    		   foreach($extrafields->attribute_label as $key => $val)
     		   {
-    				if (! empty($arrayfields["ef.".$key]['checked'])) 
+    				if (! empty($arrayfields["ef.".$key]['checked']))
     				{
     					print '<td';
     					$align=$extrafields->getAlignFlag($key);
@@ -580,7 +582,7 @@ if ($resql)
         }
         print '</tr>';
     }
-    
+
     $db->free($resql);
 
 	$parameters=array('arrayfields'=>$arrayfields, 'sql'=>$sql);
@@ -589,20 +591,20 @@ if ($resql)
 
 	print '</table>'."\n";
     print '</div>';
-    
+
 	print '</form>'."\n";
-	
+
 	/*
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
 	{
 	    // Show list of available documents
 	    $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
 	    $urlsource.=str_replace('&amp;','&',$param);
-	
+
 	    $filedir=$diroutputmassaction;
 	    $genallowed=$user->rights->facture->lire;
 	    $delallowed=$user->rights->facture->lire;
-	
+
 	    print $formfile->showdocuments('massfilesarea_orders','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
 	}
 	else
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 2ace6736889..37331b000ab 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -805,7 +805,9 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
                if (! empty($arrayfields["ef.".$key]['checked']))
                {
     				$align=$extrafields->getAlignFlag($key);
-    				print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+        			$sortonfield = "ef.".$key;
+        			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+        			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
                }
     	   }
     	}*/
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index 5ec9eabbfb1..11405d15acc 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -245,7 +245,9 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
         if (! empty($arrayfields["ef.".$key]['checked']))
         {
             $align=$extrafields->getAlignFlag($key);
-            print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+			$sortonfield = "ef.".$key;
+			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
         }
     }
 }
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index e401fdbe710..f6d9c9510a0 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -363,11 +363,11 @@ if ($resql)
 	{
 	    $title = $langs->trans('ListOfSupplierProposals');
 	}
-	
+
 	$num = $db->num_rows($resql);
 
 	$arrayofselected=is_array($toselect)?$toselect:array();
-	
+
 	$param='';
     if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
@@ -401,7 +401,7 @@ if ($resql)
 	if ($user->rights->supplier_proposal->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
 	if ($massaction == 'presend') $arrayofmassactions=array();
 	$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
-	
+
 	// Lignes des champs de filtre
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
 	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -411,13 +411,13 @@ if ($resql)
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
-	
+
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit);
 
 	if ($massaction == 'presend')
 	{
 	    $langs->load("mails");
-	
+
 	    if (! GETPOST('cancel'))
 	    {
 	        $objecttmp=new SupplierProposal($db);
@@ -436,17 +436,17 @@ if ($resql)
 	            }
 	        }
 	    }
-	
+
 	    print '<input type="hidden" name="massaction" value="confirm_presend">';
-	
+
 	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 	    $formmail = new FormMail($db);
-	
+
 	    dol_fiche_head(null, '', '');
-	
+
 	    $topicmail="SendProposalRef";
 	    $modelmail="propal_send";
-	
+
 	    // Cree l'objet formulaire mail
 	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 	    $formmail = new FormMail($db);
@@ -499,25 +499,25 @@ if ($resql)
 	    $formmail->substit['__REFCLIENT__']='__REFCLIENT__';	// We want to keep the tag
 	    $formmail->substit['__PERSONALIZED__']='';
 	    $formmail->substit['__CONTACTCIVNAME__']='';
-	
+
 	    // Tableau des parametres complementaires du post
 	    $formmail->param['action']=$action;
 	    $formmail->param['models']=$modelmail;
 	    $formmail->param['models_id']=GETPOST('modelmailselected','int');
 	    $formmail->param['id']=join(',',$arrayofselected);
 	    //$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-	
+
 	    print $formmail->get_form();
-	
+
 	    dol_fiche_end();
 	}
-	
+
 	if ($sall)
 	{
 	    foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
 	    print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
 	}
-	
+
 	$i = 0;
 
 	$moreforfilter='';
@@ -553,30 +553,30 @@ if ($resql)
 	$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
 	if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
 	else $moreforfilter = $hookmanager->resPrint;
-	
+
 	if (! empty($moreforfilter))
     {
         print '<div class="liste_titre liste_titre_bydiv centpercent">';
         print $moreforfilter;
         print '</div>';
     }
-	
+
     $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
     $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
     if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
-    
+
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-    
+
 	print '<tr class="liste_titre_filter">';
-	if (! empty($arrayfields['sp.ref']['checked']))            
+	if (! empty($arrayfields['sp.ref']['checked']))
 	{
 		print '<td class="liste_titre">';
 		print '<input class="flat" size="6" type="text" name="search_ref" value="'.$search_ref.'">';
 		print '</td>';
 	}
 	if (! empty($arrayfields['s.nom']['checked']))
-	{	
+	{
 		print '<td class="liste_titre" align="left">';
 		print '<input class="flat" type="text" size="12" name="search_societe" value="'.$search_societe.'">';
 		print '</td>';
@@ -605,7 +605,7 @@ if ($resql)
     	print '</td>';
     }
 	// Date
-	if (! empty($arrayfields['sp.date_valid']['checked'])) 
+	if (! empty($arrayfields['sp.date_valid']['checked']))
 	{
 		print '<td class="liste_titre" colspan="1" align="center">';
 		//print $langs->trans('Month').': ';
@@ -613,10 +613,10 @@ if ($resql)
 		//print '&nbsp;'.$langs->trans('Year').': ';
 		$syearvalid = $yearvalid;
 		$formother->select_year($syearvalid,'yearvalid',1, 20, 5);
-		print '</td>';	
+		print '</td>';
 	}
 	// Date
-	if (! empty($arrayfields['sp.date_livraison']['checked'])) 
+	if (! empty($arrayfields['sp.date_livraison']['checked']))
 	{
 		print '<td class="liste_titre" colspan="1" align="center">';
 		//print $langs->trans('Month').': ';
@@ -654,7 +654,7 @@ if ($resql)
 	    print '<td class="liste_titre" align="center">';
 	    print '<input class="flat" size="4" type="text" name="search_login" value="'.$search_author.'">';
 	    print '</td>';
-	}	
+	}
 	// Extra fields
 	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 	{
@@ -693,7 +693,7 @@ if ($resql)
 	{
 	    print '<td class="liste_titre">';
 	    print '</td>';
-	}	
+	}
 	// Status
 	if (! empty($arrayfields['sp.fk_statut']['checked']))
 	{
@@ -727,12 +727,14 @@ if ($resql)
 	// Extra fields
 	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 	{
-	   foreach($extrafields->attribute_label as $key => $val) 
+	   foreach($extrafields->attribute_label as $key => $val)
 	   {
-           if (! empty($arrayfields["ef.".$key]['checked'])) 
+           if (! empty($arrayfields["ef.".$key]['checked']))
            {
 				$align=$extrafields->getAlignFlag($key);
-				print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+    			$sortonfield = "ef.".$key;
+    			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+    			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
            }
 	   }
 	}
@@ -745,7 +747,7 @@ if ($resql)
 	if (! empty($arrayfields['sp.fk_statut']['checked'])) print_liste_field_titre($arrayfields['sp.fk_statut']['label'],$_SERVER["PHP_SELF"],"sp.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 	print '</tr>'."\n";
-	
+
 	$now = dol_now();
 	$i=0;
 	$total=0;
@@ -754,12 +756,12 @@ if ($resql)
 	while ($i < min($num,$limit))
 	{
 		$obj = $db->fetch_object($resql);
-		
+
 		$objectstatic->id=$obj->rowid;
 		$objectstatic->ref=$obj->ref;
 
 		print '<tr class="oddeven">';
-		
+
 		if (! empty($arrayfields['sp.ref']['checked']))
 		{
 			print '<td class="nowrap">';
@@ -792,11 +794,11 @@ if ($resql)
 			$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
 			print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
 			print '</td></tr></table>';
-	
+
 			print "</td>\n";
 			if (! $i) $totalarray['nbfield']++;
 		}
-		
+
 		$url = DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid;
 
 		// Company
@@ -854,7 +856,7 @@ if ($resql)
             print '</td>';
             if (! $i) $totalarray['nbfield']++;
         }
-        
+
 		// Date proposal
         if (! empty($arrayfields['sp.date_valid']['checked']))
         {
@@ -863,7 +865,7 @@ if ($resql)
 			print "</td>\n";
 			if (! $i) $totalarray['nbfield']++;
         }
-		
+
 		// Date delivery
         if (! empty($arrayfields['sp.date_livraison']['checked']))
         {
@@ -897,7 +899,7 @@ if ($resql)
 		    if (! $i) $totalarray['totalttcfield']=$totalarray['nbfield'];
 		    $totalarray['totalttc'] += $obj->total_ttc;
         }
-        
+
 		$userstatic->id=$obj->fk_user_author;
 		$userstatic->login=$obj->login;
 
@@ -910,7 +912,7 @@ if ($resql)
 			print "</td>\n";
     		if (! $i) $totalarray['nbfield']++;
         }
-        
+
         // Extra fields
         if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
         {
@@ -951,7 +953,7 @@ if ($resql)
         }
         // Status
         if (! empty($arrayfields['sp.fk_statut']['checked']))
-        {	
+        {
             print '<td align="right">'.$objectstatic->LibStatut($obj->fk_statut,5)."</td>\n";
             if (! $i) $totalarray['nbfield']++;
         }
@@ -966,7 +968,7 @@ if ($resql)
         }
         print '</td>';
         if (! $i) $totalarray['nbfield']++;
-        
+
 		print "</tr>\n";
 
 		$total += $obj->total_ht;
@@ -1002,16 +1004,16 @@ if ($resql)
 	}
 
 	$db->free($resql);
-	
+
 	$parameters=array('arrayfields'=>$arrayfields, 'sql'=>$sql);
 	$reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-	
+
 	print '</table>'."\n";
     print '</div>'."\n";
 
 	print '</form>'."\n";
-	
+
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
 	{
 	    /*
@@ -1019,18 +1021,18 @@ if ($resql)
 	     */
 	    $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
 	    $urlsource.=str_replace('&amp;','&',$param);
-	
+
 	    $filedir=$diroutputmassaction;
 	    $genallowed=$user->rights->supplier_proposal->lire;
 	    $delallowed=$user->rights->supplier_proposal->lire;
-	
+
 	    print $formfile->showdocuments('massfilesarea_supplier_proposal','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,'','');
 	}
 	else
 	{
 	    print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
 	}
-	
+
 }
 else
 {
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 9c82216d5be..54fffcd3fb7 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -451,7 +451,9 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
         if (! empty($arrayfields["ef.".$key]['checked']))
         {
             $align=$extrafields->getAlignFlag($key);
-            print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+			$sortonfield = "ef.".$key;
+			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
         }
     }
 }

From 241ec01adfea29fd6003e97f3c2f6f3bef6ce29f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Jun 2017 15:07:55 +0200
Subject: [PATCH 287/438] FIX #7031 missing change column "state_id" since
 dolibarr 3.5 !!

---
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 18349872d72..7d2d76e6d08 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -98,6 +98,11 @@ ALTER TABLE llx_actioncomm ADD COLUMN extraparams			varchar(255);
 
 
 ALTER TABLE llx_bank_account ADD COLUMN extraparams		varchar(255);	
+ALTER TABLE llx_bank_account MODIFY COLUMN state_id integer DEFAULT NULL;
+
+ALTER TABLE llx_adherent MODIFY COLUMN state_id integer DEFAULT NULL;
+ALTER TABLE llx_adherent MODIFY COLUMN country integer DEFAULT NULL;
+
 
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_CREATE','Product or service created','Executed when a product or sevice is created','product',30);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_MODIFY','Product or service modified','Executed when a product or sevice is modified','product',30);

From 3d247abe795d35f1640a727173188c4d9a79b5a2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Jun 2017 15:30:55 +0200
Subject: [PATCH 288/438] Test #7029 without switching to trustry for the
 moment.

---
 .travis.yml | 47 ++++++++++++++++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bf34c86bd58..657972a31de 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,16 +17,22 @@ php:
 
 addons:
   mariadb: '10.0'
-  # FIXME: find a way to import a MySQL dump into PostgreSQL
-  #postgresql: '9.3'
+  postgresql: '9.3'
   apt:
+    sources:
+    # To use the last version of pgloader, we add repo of postgresql
+    - postgresql
+    - sourceline: 'deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main'
+    - key_url: 'https://www.postgresql.org/media/keys/ACCC4CF8.asc'  
     packages:
     # We need a webserver to test the webservices
     # Let's install Apache with.
     - apache2
     # mod_php is not supported by Travis. Add fcgi. We install FPM later on.
     - libapache2-mod-fastcgi
-
+    # We need pgloader for import mysql database into pgsql
+    - pgloader
+ 
 # Start on every boot
 services:
 - memcached
@@ -39,8 +45,7 @@ env:
   # MariaDB overrides MySQL installation so it's not possible to test both yet
   #- DB=mysql
   - DB=mariadb
-  # FIXME: find a way to import a MySQL dump into PostgreSQL
-  #- DB=postgresql
+  - DB=postgresql
   # TODO
   #- DB=sqlite
   # See https://docs.travis-ci.com/user/languages/php/#Apache-%2B-PHP
@@ -77,6 +82,13 @@ before_install:
   phpenv config-rm xdebug.ini
   echo
 
+- |
+  if [ "$DB" = 'postgresql' ]; then
+    echo "Check pgloader version"
+    pgloader --version
+    echo
+  fi
+ 
 install:
 - |
   echo "Updating Composer"
@@ -132,10 +144,10 @@ before_script:
   echo "Set timezone"
   echo 'date.timezone = "Europe/Paris"' >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
   if [ "$TRAVIS_PHP_VERSION" = '5.3' ] || [ "$TRAVIS_PHP_VERSION" = '5.4' ]; then
-    echo
-    echo "Enabling APC for PHP <= 5.4"
+    #echo
+    #echo "Enabling APC for PHP <= 5.4"
     #   Documentation says it should be available for PHP <= 5.6 but it's not for 5.5 and 5.6!
-    echo 'extension = apc.so' >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
+    #echo 'extension = apc.so' >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
     echo
     echo "Enabling Memcached for PHP <= 5.4"
     #   Documentation says it should be available for all PHP versions but it's not for 5.5 and 5.6, 7.0, 7.1 and nightly!
@@ -164,16 +176,18 @@ before_script:
   
 - |
   echo "Setting up database"
-  if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ]; then
+  if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ] || [ "$DB" = 'postgresql' ]; then
     echo "MySQL"
     mysql -e 'DROP DATABASE IF EXISTS travis;'
     mysql -e 'CREATE DATABASE IF NOT EXISTS travis;'
+    mysql -e 'GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1;'
+    mysql -e 'FLUSH PRIVILEGES;'    
     mysql -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
   fi
-  # FIXME: find a way to import a MySQL dump into PostgreSQL
-  #if [ "$DB" = 'postgresql' ]; then
-  #  pgsql travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
-  #fi
+  if [ "$DB" = 'postgresql' ]; then
+    #pgsql travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
+    pgloader mysql://root@127.0.0.1/travis postgresql:///travis
+  fi
   # TODO: SQLite
   echo
 
@@ -190,10 +204,9 @@ before_script:
   if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ]; then
     echo '$'dolibarr_main_db_type=\'mysqli\'';' >> $CONF_FILE
   fi
-  # FIXME
-  #if [ "$DB" = 'postgresql' ]; then
-  #  echo '$'dolibarr_main_db_type=\'pgsql\'';' >> $CONF_FILE
-  #fi
+  if [ "$DB" = 'postgresql' ]; then
+    echo '$'dolibarr_main_db_type=\'pgsql\'';' >> $CONF_FILE
+  fi
   # TODO: SQLite
   echo '$'dolibarr_main_authentication=\'dolibarr\'';' >> $CONF_FILE
   cat $CONF_FILE

From 8f6e756249f12755bc4c34db8d88d7e07606d068 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Jun 2017 15:37:22 +0200
Subject: [PATCH 289/438] Fix PHPCS

---
 .../accountancy/class/bookkeeping.class.php   | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 88e67b42735..a441b79dbb2 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -924,11 +924,10 @@ class BookKeeping extends CommonObject
 	/**
 	 * Update object into database
 	 *
-	 * @param User $user User that modifies
-	 * @param bool $notrigger false=launch triggers after, true=disable triggers
-	 * @param string $mode Mode
-	 *
-	 * @return int <0 if KO, >0 if OK
+	 * @param  User    $user       User that modifies
+	 * @param  bool    $notrigger  false=launch triggers after, true=disable triggers
+	 * @param  string  $mode       Mode
+	 * @return int                 <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false, $mode='') {
 		$error = 0;
@@ -956,6 +955,7 @@ class BookKeeping extends CommonObject
 		}
 		if (isset($this->subledger_label)) {
 			$this->subledger_label = trim($this->subledger_label);
+		}
 		if (isset($this->numero_compte)) {
 			$this->numero_compte = trim($this->numero_compte);
 		}
@@ -1054,11 +1054,11 @@ class BookKeeping extends CommonObject
 	/**
 	 * Update movement
 	 *
-	 * @param string $piece_num
-	 * @param string $field
-	 * @param string $value
-	 * @param string $mode
-	 * @return number
+	 * @param  string  $piece_num      Piece num
+	 * @param  string  $field          Field
+	 * @param  string  $value          Value
+	 * @param  string  $mode           Mode
+	 * @return number                  <0 if KO, >0 if OK
 	 */
 	public function upddateByMvt($piece_num='', $field='', $value='', $mode='') {
 		$this->db->begin();
@@ -1382,8 +1382,9 @@ class BookKeeping extends CommonObject
 	/**
 	 * Load all informations of accountancy document
 	 *
-	 * @param int $piecenum id of line to get
-	 * @return int <0 if KO, >0 if OK
+	 * @param  int     $piecenum   Id of line to get
+	 * @param  string  $mode       Mode
+	 * @return int                 <0 if KO, >0 if OK
 	 */
 	function fetchAllPerMvt($piecenum, $mode='') {
 		global $conf;
@@ -1498,8 +1499,9 @@ class BookKeeping extends CommonObject
 	/**
 	 * Transform transaction
 	 *
-	 * @param number $direction if 0 tmp => real, if 1 real => tmp
-	 * @param unknown $piecenum
+	 * @param  number   $direction     If 0 tmp => real, if 1 real => tmp
+	 * @param  string   $piece_num     Piece num
+	 * @return void
 	 */
 	public function transformTransaction($direction=0,$piece_num='') {
 		$this->db->begin();

From 6fe96b322abf55f677a94e97eaf31cf31b8a0f1b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Jun 2017 16:18:07 +0200
Subject: [PATCH 290/438] Fix PHPCS

---
 htdocs/accountancy/bookkeeping/card.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 0df46f21740..680a2d25470 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -231,11 +231,10 @@ llxHeader();
 $html = new Form($db);
 $formaccounting = new FormAccounting($db);
 $accountjournal = new AccountingJournal($db);
-/*
- *  Confirmation to delete the command
- */
+
+// Confirmation to delete the command
 if ($action == 'delete') {
-	$formconfirm = $html->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $id.'&mode='. $mode , $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt'), 'confirm_delete', '', 0, 1);
+	$formconfirm = $html->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $id.'&mode='. $mode, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt'), 'confirm_delete', '', 0, 1);
 	print $formconfirm;
 }
 if ($action == 'create') {

From 758d8cef23d2005b6d0c624204431a91043ba2c1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Jun 2017 16:55:15 +0200
Subject: [PATCH 291/438] Test

---
 .travis.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 657972a31de..54fe804efb3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,15 +8,15 @@ language: php
 
 php:
 - '5.3'
-- '5.4'
-- '5.5'
-- '5.6'
-- '7.0'
-- '7.1'
-- nightly
+#- '5.4'
+#- '5.5'
+#- '5.6'
+#- '7.0'
+#- '7.1'
+#- nightly
 
 addons:
-  mariadb: '10.0'
+  #mariadb: '10.0'
   postgresql: '9.3'
   apt:
     sources:
@@ -261,7 +261,7 @@ script:
   echo "Checking PHP syntax errors"
   # Ensure we catch errors
   set -e
-  parallel-lint --exclude htdocs/includes --blame .
+  #parallel-lint --exclude htdocs/includes --blame .
   set +e
   echo
 
@@ -272,7 +272,7 @@ script:
   # Ensure we catch errors
   set -e
   # Exclusions are defined in the ruleset.xml file
-  phpcs -s -n -p -d memory_limit=-1 --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 .
+  #phpcs -s -n -p -d memory_limit=-1 --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 .
   set +e
   echo
 

From 5bb717e31925429f4769f53c7a4d7f26545dfce7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Jun 2017 17:00:56 +0200
Subject: [PATCH 292/438] Test

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 54fe804efb3..e4c6548eaf4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -295,6 +295,7 @@ script:
   php step5.php 3.6.0 3.7.0 > $TRAVIS_BUILD_DIR/upgrade360370-3.log
   php upgrade.php 3.7.0 3.8.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade370380.log
   php upgrade2.php 3.7.0 3.8.0 > $TRAVIS_BUILD_DIR/upgrade370380-2.log
+  cat $TRAVIS_BUILD_DIR/upgrade370380-2.log
   php step5.php 3.7.0 3.8.0 > $TRAVIS_BUILD_DIR/upgrade370380-3.log
   php upgrade.php 3.8.0 3.9.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade380390.log
   php upgrade2.php 3.8.0 3.9.0 > $TRAVIS_BUILD_DIR/upgrade380390-2.log

From ec890ff81629e9525ce6868dd8cbfe63d3e4f885 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Jun 2017 17:31:58 +0200
Subject: [PATCH 293/438] Test

---
 .travis.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index e4c6548eaf4..62c3dc12777 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -293,9 +293,14 @@ script:
   php upgrade.php 3.6.0 3.7.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade360370.log
   php upgrade2.php 3.6.0 3.7.0 > $TRAVIS_BUILD_DIR/upgrade360370-2.log
   php step5.php 3.6.0 3.7.0 > $TRAVIS_BUILD_DIR/upgrade360370-3.log
+  rm /tmp/dolibarr_install.log
   php upgrade.php 3.7.0 3.8.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade370380.log
+  cat $TRAVIS_BUILD_DIR/upgrade370380.log
+  cat /tmp/dolibarr_install.log
+  rm /tmp/dolibarr_install.log
   php upgrade2.php 3.7.0 3.8.0 > $TRAVIS_BUILD_DIR/upgrade370380-2.log
   cat $TRAVIS_BUILD_DIR/upgrade370380-2.log
+  cat /tmp/dolibarr_install.log
   php step5.php 3.7.0 3.8.0 > $TRAVIS_BUILD_DIR/upgrade370380-3.log
   php upgrade.php 3.8.0 3.9.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade380390.log
   php upgrade2.php 3.8.0 3.9.0 > $TRAVIS_BUILD_DIR/upgrade380390-2.log

From 0071632a06e11c046fb8ad17fb9721760ee55918 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Jun 2017 17:38:52 +0200
Subject: [PATCH 294/438] Test

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 62c3dc12777..f4dfb09f5a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ php:
 #- nightly
 
 addons:
-  #mariadb: '10.0'
+  mariadb: '10.0'
   postgresql: '9.3'
   apt:
     sources:
@@ -44,7 +44,7 @@ env:
   matrix:
   # MariaDB overrides MySQL installation so it's not possible to test both yet
   #- DB=mysql
-  - DB=mariadb
+  #- DB=mariadb
   - DB=postgresql
   # TODO
   #- DB=sqlite

From ba87549124c4579b4fd6736655d4abd5720ab0aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garc=C3=ADa?= <marcosgdf@gmail.com>
Date: Mon, 19 Jun 2017 18:07:43 +0200
Subject: [PATCH 295/438] FIX #5640 Prices of a predefined product/service were
 incorrect under certain circumstances

---
 htdocs/core/tpl/objectline_create.tpl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index d9b5b37d8f3..5e9786f2ba4 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -725,7 +725,7 @@ function setforpredef() {
 	jQuery("#select_type").val(-1);
 	jQuery("#prod_entry_mode_free").prop('checked',false);
 	jQuery("#prod_entry_mode_predef").prop('checked',true);
-	jQuery("#price_ht").hide();
+	jQuery("#price_ht").val('').hide();
 	jQuery("#multicurrency_price_ht").hide();
 	jQuery("#price_ttc").hide();	// May no exists
 	jQuery("#tva_tx").hide();

From 3c73b426d7f4031683380d2a1b6810af17ee33fd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Jun 2017 17:41:54 +0200
Subject: [PATCH 296/438] Fix migration. Must make reload only on last version
 step.

---
 .../install/mysql/migration/3.7.0-3.8.0.sql   |  12 +-
 .../install/mysql/migration/3.8.0-3.9.0.sql   |   4 +-
 .../install/mysql/migration/3.9.0-4.0.0.sql   |   6 +-
 htdocs/install/upgrade2.php                   | 116 ++++++------------
 4 files changed, 48 insertions(+), 90 deletions(-)

diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
index 9669fe89e54..5fcf6725e9d 100755
--- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
+++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
@@ -156,12 +156,12 @@ ALTER TABLE llx_facturedet ADD COLUMN situation_percent real;
 ALTER TABLE llx_facturedet ADD COLUMN fk_prev_id integer;
 
 -- Convert SMTP config to main entity, so new entities don't get the old values
-UPDATE llx_const SET entity = __ENCRYPT('1')__ WHERE __DECRYPT('entity')__ = 0 AND __DECRYPT('name')__ = "MAIN_MAIL_SENDMODE";
-UPDATE llx_const SET entity = __ENCRYPT('1')__ WHERE __DECRYPT('entity')__ = 0 AND __DECRYPT('name')__ = "MAIN_MAIL_SMTP_PORT";
-UPDATE llx_const SET entity = __ENCRYPT('1')__ WHERE __DECRYPT('entity')__ = 0 AND __DECRYPT('name')__ = "MAIN_MAIL_SMTP_SERVER";
-UPDATE llx_const SET entity = __ENCRYPT('1')__ WHERE __DECRYPT('entity')__ = 0 AND __DECRYPT('name')__ = "MAIN_MAIL_SMTPS_ID";
-UPDATE llx_const SET entity = __ENCRYPT('1')__ WHERE __DECRYPT('entity')__ = 0 AND __DECRYPT('name')__ = "MAIN_MAIL_SMTPS_PW";
-UPDATE llx_const SET entity = __ENCRYPT('1')__ WHERE __DECRYPT('entity')__ = 0 AND __DECRYPT('name')__ = "MAIN_MAIL_EMAIL_TLS";
+UPDATE llx_const SET entity = __ENCRYPT('1')__ WHERE __DECRYPT('entity')__ = 0 AND __DECRYPT('name')__ = 'MAIN_MAIL_SENDMODE';
+UPDATE llx_const SET entity = __ENCRYPT('1')__ WHERE __DECRYPT('entity')__ = 0 AND __DECRYPT('name')__ = 'MAIN_MAIL_SMTP_PORT';
+UPDATE llx_const SET entity = __ENCRYPT('1')__ WHERE __DECRYPT('entity')__ = 0 AND __DECRYPT('name')__ = 'MAIN_MAIL_SMTP_SERVER';
+UPDATE llx_const SET entity = __ENCRYPT('1')__ WHERE __DECRYPT('entity')__ = 0 AND __DECRYPT('name')__ = 'MAIN_MAIL_SMTPS_ID';
+UPDATE llx_const SET entity = __ENCRYPT('1')__ WHERE __DECRYPT('entity')__ = 0 AND __DECRYPT('name')__ = 'MAIN_MAIL_SMTPS_PW';
+UPDATE llx_const SET entity = __ENCRYPT('1')__ WHERE __DECRYPT('entity')__ = 0 AND __DECRYPT('name')__ = 'MAIN_MAIL_EMAIL_TLS';
 
 -- This option with this value is not compatible with 3.8. Value must be set to 'mutiselect', 'select2'...
 DELETE from llx_const where name = 'MAIN_USE_JQUERY_MULTISELECT' and value = '1';
diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
index d747d5098f5..03ff8c76d93 100644
--- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
+++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
@@ -292,7 +292,7 @@ create table llx_budget_lines
 (
   rowid			integer AUTO_INCREMENT PRIMARY KEY,
   fk_budget     integer NOT NULL,
-  fk_project_ids	varchar(255) NOT NULL,		-- List of project ids related to this budget. If budget is dedicated to projects not yet started, we recommand to create a project "Projects to come".
+  fk_project_ids	varchar(255) NOT NULL,		-- List of project ids related to this budget. If budget is dedicated to projects not yet started, we recommand to create a project 'Projects to come'.
   amount		double(24,8) NOT NULL,
   datec         datetime,
   tms           timestamp,
@@ -600,7 +600,7 @@ ALTER TABLE llx_holiday ADD INDEX idx_holiday_entity (entity);
 
 -- Fix Argentina provences
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2326', 2305, '', 0, 'MISIONES', 'Misiones', 1);
-UPDATE llx_c_departements SET ncc = "FORMOSA", nom = "Formosa" WHERE nom = "Formosa Misiones";
+UPDATE llx_c_departements SET ncc = 'FORMOSA', nom = 'Formosa' WHERE nom = 'Formosa Misiones';
 
 -- MALTA VATS (id country=148)
 INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (1481,  148, '18','0','VAT standard rate',1);
diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
index f66d03a917a..bb603d83aec 100644
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@@ -393,9 +393,9 @@ CREATE TABLE llx_c_accounting_category (
 
 ALTER TABLE llx_c_accounting_category ADD UNIQUE INDEX uk_c_accounting_category(code);
 
-INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES (  1,'VTE',"Ventes de marchandises", '707xxx', 0, 0, '', '10', 1, 1);
-INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES (  2,'MAR',"Coût d'achats marchandises vendues", '603xxx | 607xxx | 609xxx', 0, 0, '', '20', 1, 1);
-INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES (  3,'MARGE',"Marge commerciale", '', 0, 1, '1 + 2', '30', 1, 1);
+INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES (  1,'VTE','Ventes de marchandises', '707xxx', 0, 0, '', '10', 1, 1);
+INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES (  2,'MAR','Coût d'achats marchandises vendues', '603xxx | 607xxx | 609xxx', 0, 0, '', '20', 1, 1);
+INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES (  3,'MARGE','Marge commerciale', '', 0, 1, '1 + 2', '30', 1, 1);
 
 UPDATE llx_accounting_account SET account_parent = '0' WHERE account_parent = '';
 -- VMYSQL4.1 ALTER TABLE llx_accounting_account MODIFY COLUMN account_parent varchar(32) DEFAULT '0';
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 6beeb7ca7b2..79b6df8d14f 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -184,6 +184,7 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
         // dans la 4eme colonne, le texte 'OK' si fait ou 'AlreadyDone' si rien n'est fait ou 'Error'
 
         $versiontoarray=explode('.',$versionto);
+        $versionranarray=explode('.',DOL_VERSION);
 
         $afterversionarray=explode('.','2.0.0');
         $beforeversionarray=explode('.','2.7.9');
@@ -245,12 +246,6 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
             migrate_directories($db,$langs,$conf,'/compta','/banque');
 
             migrate_directories($db,$langs,$conf,'/societe','/mycompany');
-
-            // Reload modules
-            migrate_reload_modules($db,$langs,$conf);
-
-            // Reload menus
-            migrate_reload_menu($db,$langs,$conf,$versionto);
         }
 
         // Script for VX (X<2.8) -> V2.8
@@ -278,12 +273,6 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
             migrate_project_user_resp($db,$langs,$conf);
 
             migrate_project_task_actors($db,$langs,$conf);
-
-            // Reload modules
-            migrate_reload_modules($db,$langs,$conf);
-
-            // Reload menus
-            migrate_reload_menu($db,$langs,$conf,$versionto);
         }
 
         // Script for VX (X<2.9) -> V2.9
@@ -298,12 +287,6 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
             migrate_shipping_delivery($db,$langs,$conf);
 
             migrate_shipping_delivery2($db,$langs,$conf);
-
-            // Reload modules
-            migrate_reload_modules($db,$langs,$conf);
-
-            // Reload menus
-            migrate_reload_menu($db,$langs,$conf,$versionto);
         }
 
         // Script for VX (X<3.0) -> V3.0
@@ -311,11 +294,7 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
         $beforeversionarray=explode('.','3.0.9');
         if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0)
         {
-            // Reload modules
-            migrate_reload_modules($db,$langs,$conf);
-
-            // Reload menus
-            migrate_reload_menu($db,$langs,$conf,$versionto);
+            // No particular code
         }
 
         // Script for VX (X<3.1) -> V3.1
@@ -326,12 +305,6 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
             migrate_directories($db,$langs,$conf,'/rss','/externalrss');
 
             migrate_actioncomm_element($db,$langs,$conf);
-
-            // Reload modules
-            migrate_reload_modules($db,$langs,$conf);
-
-            // Reload menus
-            migrate_reload_menu($db,$langs,$conf,$versionto);
         }
 
         // Script for VX (X<3.2) -> V3.2
@@ -344,12 +317,6 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
         	migrate_mode_reglement($db,$langs,$conf);
 
         	migrate_clean_association($db,$langs,$conf);
-
-            // Reload modules
-            migrate_reload_modules($db,$langs,$conf);
-
-            // Reload menus
-            migrate_reload_menu($db,$langs,$conf,$versionto);
         }
 
         // Script for VX (X<3.3) -> V3.3
@@ -376,29 +343,7 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
         $beforeversionarray=explode('.','3.8.9');
         if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0)
         {
-        	// Reload modules (this must be always and only into last targeted version)
-			$listofmodule=array(
-				    	'MAIN_MODULE_AGENDA'=>'newboxdefonly',
-						'MAIN_MODULE_BARCODE'=>'newboxdefonly',
-						'MAIN_MODULE_CRON'=>'newboxdefonly',
-				    	'MAIN_MODULE_COMMANDE'=>'newboxdefonly',
-				    	'MAIN_MODULE_DEPLACEMENT'=>'newboxdefonly',
-				    	'MAIN_MODULE_DON'=>'newboxdefonly',
-				    	'MAIN_MODULE_ECM'=>'newboxdefonly',
-				    	'MAIN_MODULE_FACTURE'=>'newboxdefonly',
-				    	'MAIN_MODULE_FOURNISSEUR'=>'newboxdefonly',
-						'MAIN_MODULE_HOLIDAY'=>'newboxdefonly',
-						'MAIN_MODULE_OPENSURVEY'=>'newboxdefonly',
-						'MAIN_MODULE_PAYBOX'=>'newboxdefonly',
-						'MAIN_MODULE_PRODUIT'=>'newboxdefonly',
-						'MAIN_MODULE_SOCIETE'=>'newboxdefonly',
-				    	'MAIN_MODULE_SERVICE'=>'newboxdefonly',
-						'MAIN_MODULE_USER'=>'newboxdefonly'
-			);
-        	migrate_reload_modules($db,$langs,$conf,$listofmodule);
-
-        	// Reload menus (this must be always and only into last targeted version)
-        	migrate_reload_menu($db,$langs,$conf,$versionto);
+        	// No particular code
         }
 
         // Scripts for last version
@@ -419,19 +364,6 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
 
             // Migrate to add entity value into llx_societe_remise_except
             migrate_remise_except_entity($db,$langs,$conf);
-
-            // Reload modules (this must be always and only into last targeted version)
-            $listofmodule=array(
-                'MAIN_MODULE_ACCOUNTING'=>'newboxdefonly',
-                'MAIN_MODULE_BARCODE'=>'newboxdefonly',
-                'MAIN_MODULE_CRON'=>'newboxdefonly',
-                'MAIN_MODULE_FACTURE'=>'newboxdefonly',
-                'MAIN_MODULE_PRINTING'=>'newboxdefonly',
-            );
-            migrate_reload_modules($db,$langs,$conf,$listofmodule);
-
-            // Reload menus (this must be always and only into last targeted version)
-            migrate_reload_menu($db,$langs,$conf,$versionto);
         }
 
         // Scripts for last version
@@ -439,17 +371,43 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
         $beforeversionarray=explode('.','6.0.9');
         if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0)
         {
-            // Reload modules (this must be always and only into last targeted version)
-            $listofmodule=array(
-                'MAIN_MODULE_USER'=>'newboxdefonly',
-            );
-            migrate_reload_modules($db,$langs,$conf,$listofmodule);
-
-            // Reload menus (this must be always and only into last targeted version)
-            migrate_reload_menu($db,$langs,$conf,$versionto);
+            // No particular code
         }
     }
 
+    // Code executed only if migrate is LAST ONE. Must always be done.
+    if (versioncompare($versiontoarray,$versionranarray) >= 0 || versioncompare($versiontoarray,$versionranarray) <= -3)
+    {
+        // Reload modules (this must be always done and only into last targeted version, because code to reload module may need table structure of last version)
+        $listofmodule=array(
+            'MAIN_MODULE_AGENDA'=>'newboxdefonly',
+            'MAIN_MODULE_BARCODE'=>'newboxdefonly',
+            'MAIN_MODULE_CRON'=>'newboxdefonly',
+            'MAIN_MODULE_COMMANDE'=>'newboxdefonly',
+            'MAIN_MODULE_DEPLACEMENT'=>'newboxdefonly',
+            'MAIN_MODULE_DON'=>'newboxdefonly',
+            'MAIN_MODULE_ECM'=>'newboxdefonly',
+            'MAIN_MODULE_FACTURE'=>'newboxdefonly',
+            'MAIN_MODULE_FOURNISSEUR'=>'newboxdefonly',
+            'MAIN_MODULE_HOLIDAY'=>'newboxdefonly',
+            'MAIN_MODULE_OPENSURVEY'=>'newboxdefonly',
+            'MAIN_MODULE_PAYBOX'=>'newboxdefonly',
+            'MAIN_MODULE_PRODUIT'=>'newboxdefonly',
+            'MAIN_MODULE_SOCIETE'=>'newboxdefonly',
+            'MAIN_MODULE_SERVICE'=>'newboxdefonly',
+            'MAIN_MODULE_USER'=>'newboxdefonly',
+            'MAIN_MODULE_ACCOUNTING'=>'newboxdefonly',
+            'MAIN_MODULE_BARCODE'=>'newboxdefonly',
+            'MAIN_MODULE_CRON'=>'newboxdefonly',
+            'MAIN_MODULE_PRINTING'=>'newboxdefonly',
+
+            'MAIN_MODULE_USER'=>'newboxdefonly',        //This one must be always done and only into last targeted version)
+        );
+        migrate_reload_modules($db,$langs,$conf,$listofmodule);
+
+        // Reload menus (this must be always and only into last targeted version)
+        migrate_reload_menu($db,$langs,$conf,$versionto);
+    }
 
     // Can force activation of some module during migration with paramater 'enablemodules=MAIN_MODULE_XXX,MAIN_MODULE_YYY,...'
     if (! $error && $enablemodules)

From 41d82b0ffa6db4de85a095232a22b43e4b592f56 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Jun 2017 18:52:13 +0200
Subject: [PATCH 297/438] Enable pgsql test

---
 .travis.yml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f4dfb09f5a3..d5cf09bc4e7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,12 +8,12 @@ language: php
 
 php:
 - '5.3'
-#- '5.4'
-#- '5.5'
-#- '5.6'
-#- '7.0'
-#- '7.1'
-#- nightly
+- '5.4'
+- '5.5'
+- '5.6'
+- '7.0'
+- '7.1'
+- nightly
 
 addons:
   mariadb: '10.0'
@@ -44,7 +44,7 @@ env:
   matrix:
   # MariaDB overrides MySQL installation so it's not possible to test both yet
   #- DB=mysql
-  #- DB=mariadb
+  - DB=mariadb
   - DB=postgresql
   # TODO
   #- DB=sqlite
@@ -58,8 +58,7 @@ matrix:
   allow_failures:
   - php: 7.1
   - php: nightly
-  # FIXME
-  #- env: DB=postgresql
+  - env: DB=postgresql
   # TODO
   #- env: DB=sqlite
 

From eaaee59f92abba096890ee867d968c0dfe20e3fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garc=C3=ADa?= <marcosgdf@gmail.com>
Date: Mon, 19 Jun 2017 19:23:00 +0200
Subject: [PATCH 298/438] FIX #6541 since 4.0.4 to 5.0.0 autofill zip/town not
 working

---
 htdocs/core/class/conf.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index dc06bfe9ffa..203d41571a9 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -489,8 +489,8 @@ class Conf
 		// By default, we propagate contacts
 		if (! isset($this->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN)) $this->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN='*';  // Can be also '*' or '^(BILLING|SHIPPING|CUSTOMER|.*)$' (regex not yet implemented)
 
-		// By default, we use the zip town autofill
-		if (! isset($this->global->MAIN_USE_ZIPTOWN_DICTIONNARY)) $this->global->MAIN_USE_ZIPTOWN_DICTIONNARY=1;
+		// By default, we do not use the zip town autofill
+		if (! isset($this->global->MAIN_USE_ZIPTOWN_DICTIONNARY)) $this->global->MAIN_USE_ZIPTOWN_DICTIONNARY=0;
 
 		// Define list of limited modules (value must be key found for "name" property of module, so for example 'supplierproposal' for Module "Supplier Proposal"
 		if (! isset($this->global->MAIN_MODULES_FOR_EXTERNAL)) $this->global->MAIN_MODULES_FOR_EXTERNAL='user,societe,propal,commande,facture,categorie,supplierproposal,fournisseur,contact,projet,contrat,ficheinter,expedition,agenda,resource,adherent';	// '' means 'all'. Note that contact is added here as it should be a module later.

From bdeddd36174a88614980273034827475cfee4e25 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Jun 2017 19:48:19 +0200
Subject: [PATCH 299/438] Fix pgsql migration

---
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index e9c16d6a5fd..6469a47b4c7 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -25,7 +25,7 @@
 -- -- VMYSQL4.1 DELETE FROM llx_usergroup_user      WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
 
 
-ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN tms timestamp DEFAULT '2001-01-01 00:00:00';
+-- VMYSQL4.1 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN tms timestamp DEFAULT '2001-01-01 00:00:00';
 
 -- Clean corrupted values for tms
 -- VMYSQL4.1 SET sql_mode = 'ALLOW_INVALID_DATES';
@@ -36,7 +36,7 @@ ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN tms timestamp DEFAULT '2001-01-
 -- VMYSQL4.3 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN date_fin DATETIME NULL DEFAULT NULL;
 -- VPGSQL8.2 ALTER TABLE llx_opensurvey_sondage ALTER COLUMN date_fin DROP NOT NULL;
 
-ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP;
+-- VMYSQL4.1 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP;
 
 ALTER TABLE llx_opensurvey_sondage ADD COLUMN fk_user_creat integer NOT NULL DEFAULT 0;
 ALTER TABLE llx_opensurvey_sondage ADD COLUMN status integer DEFAULT 1 after date_fin;

From 22ef8557b820c1d8f69c4e89c0310de41b2083f6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Jun 2017 19:49:27 +0200
Subject: [PATCH 300/438] Fix travis

---
 .travis.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d5cf09bc4e7..fc892b7178b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -185,6 +185,7 @@ before_script:
   fi
   if [ "$DB" = 'postgresql' ]; then
     #pgsql travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
+    #pgloader mysql://root:pass@127.0.0.1/base postgresql://dolibarrowner@127.0.0.1/dolibarr
     pgloader mysql://root@127.0.0.1/travis postgresql:///travis
   fi
   # TODO: SQLite
@@ -292,14 +293,8 @@ script:
   php upgrade.php 3.6.0 3.7.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade360370.log
   php upgrade2.php 3.6.0 3.7.0 > $TRAVIS_BUILD_DIR/upgrade360370-2.log
   php step5.php 3.6.0 3.7.0 > $TRAVIS_BUILD_DIR/upgrade360370-3.log
-  rm /tmp/dolibarr_install.log
   php upgrade.php 3.7.0 3.8.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade370380.log
-  cat $TRAVIS_BUILD_DIR/upgrade370380.log
-  cat /tmp/dolibarr_install.log
-  rm /tmp/dolibarr_install.log
   php upgrade2.php 3.7.0 3.8.0 > $TRAVIS_BUILD_DIR/upgrade370380-2.log
-  cat $TRAVIS_BUILD_DIR/upgrade370380-2.log
-  cat /tmp/dolibarr_install.log
   php step5.php 3.7.0 3.8.0 > $TRAVIS_BUILD_DIR/upgrade370380-3.log
   php upgrade.php 3.8.0 3.9.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade380390.log
   php upgrade2.php 3.8.0 3.9.0 > $TRAVIS_BUILD_DIR/upgrade380390-2.log

From 099ef585b2e8291ec964ea16e93d451b3c8307ff Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Jun 2017 20:07:33 +0200
Subject: [PATCH 301/438] Fix pgsql

---
 .../install/mysql/migration/5.0.0-6.0.0.sql   | 11 +++++++----
 .../install/mysql/tables/llx_blockedlog.sql   | 19 ++++++++++++++++++-
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 6469a47b4c7..360a91d0fe3 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -98,11 +98,14 @@ ALTER TABLE llx_actioncomm ADD COLUMN extraparams			varchar(255);
 
 
 ALTER TABLE llx_bank_account ADD COLUMN extraparams		varchar(255);	
-ALTER TABLE llx_bank_account MODIFY COLUMN state_id integer DEFAULT NULL;
 
-ALTER TABLE llx_adherent MODIFY COLUMN state_id integer DEFAULT NULL;
-ALTER TABLE llx_adherent MODIFY COLUMN country integer DEFAULT NULL;
+-- VMYSQL4.1 ALTER TABLE llx_bank_account MODIFY COLUMN state_id integer DEFAULT NULL;
+-- VPGSQL8.2 ALTER TABLE llx_bank_account MODIFY COLUMN state_id integer USING state_id::integer;
 
+-- VMYSQL4.1 ALTER TABLE llx_adherent MODIFY COLUMN state_id integer DEFAULT NULL;
+-- VPGSQL8.2 ALTER TABLE llx_adherent MODIFY COLUMN state_id integer USING state_id::integer;
+-- VMYSQL4.1 ALTER TABLE llx_adherent MODIFY COLUMN country integer DEFAULT NULL;
+-- VPGSQL8.2 ALTER TABLE llx_adherent MODIFY COLUMN country integer USING country::integer;
 
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_CREATE','Product or service created','Executed when a product or sevice is created','product',30);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_MODIFY','Product or service modified','Executed when a product or sevice is modified','product',30);
@@ -463,7 +466,7 @@ ALTER TABLE llx_usergroup_rights ADD CONSTRAINT fk_usergroup_rights_fk_usergroup
 CREATE TABLE llx_blockedlog 
 ( 
 	rowid integer AUTO_INCREMENT PRIMARY KEY, 
-	tms	timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+	tms	timestamp,
 	action varchar(50), 
 	amounts real NOT NULL, 
 	signature varchar(100) NOT NULL, 
diff --git a/htdocs/install/mysql/tables/llx_blockedlog.sql b/htdocs/install/mysql/tables/llx_blockedlog.sql
index ae696a0d6d1..2e2710c300c 100644
--- a/htdocs/install/mysql/tables/llx_blockedlog.sql
+++ b/htdocs/install/mysql/tables/llx_blockedlog.sql
@@ -1,8 +1,25 @@
+-- ===================================================================
+-- Copyright (C) 2007 Laurent Destailleur  <eldy@users.sourceforge.net>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ===================================================================
 
 CREATE TABLE llx_blockedlog 
 ( 
 	rowid integer AUTO_INCREMENT PRIMARY KEY, 
-	tms	timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+	tms	timestamp,
 	action varchar(50), 
 	amounts real NOT NULL, 
 	signature varchar(100) NOT NULL, 

From 64d8b97afe3406dea19ff5797bb387860f7e530e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Jun 2017 20:35:14 +0200
Subject: [PATCH 302/438] Fix sql syntax errors

---
 htdocs/install/mysql/data/llx_accounting_category.sql | 4 ++--
 htdocs/install/mysql/migration/3.9.0-4.0.0.sql        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_accounting_category.sql b/htdocs/install/mysql/data/llx_accounting_category.sql
index 8e69ca6331e..0659bd38a0a 100644
--- a/htdocs/install/mysql/data/llx_accounting_category.sql
+++ b/htdocs/install/mysql/data/llx_accounting_category.sql
@@ -24,6 +24,6 @@
 -- Categories compte de résultat Français
 --
 
-INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES (  1,'VTE','Ventes de marchandises', '707xxx', 0, 0, '', '10', 1, 1);
-INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES (  2,'MAR','Coût d achats marchandises vendues', '603xxx | 607xxx | 609xxx', 0, 0, '', '20', 1, 1);
+INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES (  1,'VTE',  'Ventes de marchandises', '707xxx', 0, 0, '', '10', 1, 1);
+INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES (  2,'MAR',  'Coût achats marchandises vendues', '603xxx | 607xxx | 609xxx', 0, 0, '', '20', 1, 1);
 INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES (  3,'MARGE','Marge commerciale', '', 0, 1, '1 + 2', '30', 1, 1);
\ No newline at end of file
diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
index bb603d83aec..7ed89ebb173 100644
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@@ -393,8 +393,8 @@ CREATE TABLE llx_c_accounting_category (
 
 ALTER TABLE llx_c_accounting_category ADD UNIQUE INDEX uk_c_accounting_category(code);
 
-INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES (  1,'VTE','Ventes de marchandises', '707xxx', 0, 0, '', '10', 1, 1);
-INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES (  2,'MAR','Coût d'achats marchandises vendues', '603xxx | 607xxx | 609xxx', 0, 0, '', '20', 1, 1);
+INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES (  1,'VTE',  'Ventes de marchandises', '707xxx', 0, 0, '', '10', 1, 1);
+INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES (  2,'MAR',  'Coût achats marchandises vendues', '603xxx | 607xxx | 609xxx', 0, 0, '', '20', 1, 1);
 INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES (  3,'MARGE','Marge commerciale', '', 0, 1, '1 + 2', '30', 1, 1);
 
 UPDATE llx_accounting_account SET account_parent = '0' WHERE account_parent = '';

From 8064659398c7c860ea121d1e42693d51aa89c9ad Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Jun 2017 20:49:57 +0200
Subject: [PATCH 303/438] Fix phpunit

---
 test/phpunit/AdminLibTest.php    | 14 ++++++++++----
 test/phpunit/LangTest.php        |  2 +-
 test/phpunit/RestAPIUserTest.php | 18 ++++++++++--------
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/test/phpunit/AdminLibTest.php b/test/phpunit/AdminLibTest.php
index d7f3d17a583..7c9033fe2a6 100644
--- a/test/phpunit/AdminLibTest.php
+++ b/test/phpunit/AdminLibTest.php
@@ -142,21 +142,27 @@ class AdminLibTest extends PHPUnit_Framework_TestCase
 
         return $result;
     }
-    
+
     /**
      * testEnableModule
-     * 
+     *
      * @return  void
      */
     public function testEnableModule()
     {
     	global $conf, $db, $langs, $user;
-    	
+
 		require_once dirname(__FILE__).'/../../htdocs/core/modules/modExpenseReport.class.php';
 		print "Enable module modExpenseReport";
 		$moduledescriptor=new modExpenseReport($db);
 		$moduledescriptor->init();
 		$conf->setValues($db);
+
+		require_once dirname(__FILE__).'/../../htdocs/core/modules/modApi.class.php';
+		print "Enable module modAPI";
+		$moduledescriptor=new modApi($db);
+		$moduledescriptor->init();
+		$conf->setValues($db);
     }
-    
+
 }
diff --git a/test/phpunit/LangTest.php b/test/phpunit/LangTest.php
index 4487568c1d6..76c7a17d779 100644
--- a/test/phpunit/LangTest.php
+++ b/test/phpunit/LangTest.php
@@ -129,7 +129,7 @@ class LangTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * testBank
+     * testLang
      *
      * @return string
      */
diff --git a/test/phpunit/RestAPIUserTest.php b/test/phpunit/RestAPIUserTest.php
index a79739fef43..d38eb53c5b5 100644
--- a/test/phpunit/RestAPIUserTest.php
+++ b/test/phpunit/RestAPIUserTest.php
@@ -71,6 +71,8 @@ class RestAPIUserTest extends PHPUnit_Framework_TestCase
         $this->savlangs=$langs;
         $this->savdb=$db;
 
+        if (empty($conf->api->enabled)) { print __METHOD__." module api must be enabled.\n"; die(); }
+
         print __METHOD__." db->type=".$db->type." user->id=".$user->id;
         //print " - db ".$db->db;
         print "\n";
@@ -106,7 +108,7 @@ class RestAPIUserTest extends PHPUnit_Framework_TestCase
         $user=$this->savuser;
         $langs=$this->savlangs;
         $db=$this->savdb;
-        
+
         $this->api_url=DOL_MAIN_URL_ROOT.'/api/index.php';
 
         $login='admin';
@@ -149,7 +151,7 @@ class RestAPIUserTest extends PHPUnit_Framework_TestCase
 
       $url = $this->api_url.'/users/123456789?api_key='.$this->api_key;
       //$addheaders=array('Content-Type: application/json');
-      
+
       print __METHOD__." Request GET url=".$url."\n";
       $result=getURLContent($url, 'GET', '', 1, array());
       //print __METHOD__." Result for unexisting user: ".var_export($result, true)."\n";
@@ -158,7 +160,7 @@ class RestAPIUserTest extends PHPUnit_Framework_TestCase
       $object=json_decode($result['content'], true);
       $this->assertNotNull($object, "Parsing of json result must no be null");
       $this->assertEquals(404, $object['error']['code']);
-      
+
       $url = $this->api_url.'/users/1?api_key='.$this->api_key;
 
       print __METHOD__." Request GET url=".$url."\n";
@@ -172,18 +174,18 @@ class RestAPIUserTest extends PHPUnit_Framework_TestCase
     }
 
     public function testRestCreateUser() {
-      
+
       // attemp to create without mandatory fields :
       $url = $this->api_url.'/users?api_key='.$this->api_key;
       $addheaders=array('Content-Type: application/json');
-      
+
       $bodyobj = array(
         "lastname"=>"testRestUser",
         "password"=>"testRestPassword",
         "email"=>"test@restuser.com"
       );
       $body = json_encode($bodyobj);
-      
+
       print __METHOD__." Request POST url=".$url."\n";
       $result=getURLContent($url, 'POST', $body, 1, $addheaders);
       //print __METHOD__." Result for creating incomplete user".var_export($result, true)."\n";
@@ -210,14 +212,14 @@ class RestAPIUserTest extends PHPUnit_Framework_TestCase
       $resid=json_decode($result['content'], true);
       $this->assertNotNull($resid, "Parsing of json result must no be null");
       $this->assertGreaterThan(0, $resid, $object['error']['code'].' '.$object['error']['message']);
-      
+
       // attempt to create duplicated user
       print __METHOD__." Request POST url=".$url."\n";
       $result=getURLContent($url, 'POST', $body, 1, $addheaders);
       //print __METHOD__." Result for creating duplicate user".var_export($result, true)."\n";
       print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
       $this->assertEquals($result['curl_error_no'],'');
-      $object=json_decode($result['content'], true);      
+      $object=json_decode($result['content'], true);
       $this->assertNotNull($object, "Parsing of json result must no be null");
       $this->assertEquals(500, $object['error']['code'], $object['error']['code'].' '.$object['error']['message']);
     }

From 24f712874214cd778b161377cf218dbbff22b041 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Jun 2017 21:04:46 +0200
Subject: [PATCH 304/438] Fix pb with postgresql

---
 .../core/modules/modReceiptPrinter.class.php  |  4 +--
 .../install/mysql/migration/3.7.0-3.8.0.sql   | 25 ++++++++++++-------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/htdocs/core/modules/modReceiptPrinter.class.php b/htdocs/core/modules/modReceiptPrinter.class.php
index f1520cf698f..2fc7d10fe5a 100644
--- a/htdocs/core/modules/modReceiptPrinter.class.php
+++ b/htdocs/core/modules/modReceiptPrinter.class.php
@@ -137,8 +137,8 @@ class modReceiptPrinter extends DolibarrModules
         // Clean before activation
         $this->remove($options);
         $sql = array(
-            "CREATE TABLE IF NOT EXISTS llx_printer_receipt (rowid int(11) NOT NULL AUTO_INCREMENT, name varchar(128), fk_type int(11), fk_profile int(11), parameter varchar(128), entity int(11), PRIMARY KEY (rowid)) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;",
-            "CREATE TABLE IF NOT EXISTS llx_printer_receipt_template (rowid int(11) NOT NULL AUTO_INCREMENT, name varchar(128), template text, entity int(11), PRIMARY KEY (rowid)) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;",
+            "CREATE TABLE IF NOT EXISTS llx_printer_receipt (rowid integer AUTO_INCREMENT PRIMARY KEY, name varchar(128), fk_type integer, fk_profile integer, parameter varchar(128), entity integer) ENGINE=innodb;",
+            "CREATE TABLE IF NOT EXISTS llx_printer_receipt_template (rowid integer AUTO_INCREMENT PRIMARY KEY, name varchar(128), template text, entity integer) ENGINE=innodb;",
             );
         return $this->_init($sql,$options);
     }
diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
index 5fcf6725e9d..041a253a545 100755
--- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
+++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
@@ -1,7 +1,7 @@
 --
 -- Be carefull to requests order.
 -- This file must be loaded by calling /install/index.php page
--- when current version is 3.8.0 or higher.
+-- when current version is 5.0.0 or higher.
 --
 -- To rename a table:       ALTER TABLE llx_table RENAME TO llx_table_new;
 -- To add a column:         ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol;
@@ -9,14 +9,20 @@
 -- To drop a column:        ALTER TABLE llx_table DROP COLUMN oldname;
 -- To change type of field: ALTER TABLE llx_table MODIFY COLUMN name varchar(60);
 -- To drop a foreign key:   ALTER TABLE llx_table DROP FOREIGN KEY fk_name;
--- To restrict request to Mysql version x.y or more: -- VMYSQLx.y
--- To restrict request to Pgsql version x.y or more: -- VPGSQLx.y
--- To make pk to be auto increment (mysql):    VMYSQL4.3 ALTER TABLE llx_c_shipment_mode CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
--- To make pk to be auto increment (postgres): VPGSQL8.2 NOT POSSIBLE. MUST DELETE/CREATE TABLE
--- To set a field as NULL:                     VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name DROP NOT NULL;
--- To set a field as DEFAULT NULL:             VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET DEFAULT NULL;
--- To delete orphelins:                        VMYSQL4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
--- To delete orphelins:                        VPGSQL8.2 DELETE FROM llx_usergroup_user WHERE fk_user NOT IN (SELECT rowid from llx_user);
+-- To drop an index:        -- VMYSQL4.0 DROP INDEX nomindex on llx_table
+-- To drop an index:        -- VPGSQL8.0 DROP INDEX nomindex
+-- To restrict request to Mysql version x.y minimum use -- VMYSQLx.y
+-- To restrict request to Pgsql version x.y minimum use -- VPGSQLx.y
+-- To make pk to be auto increment (mysql):    -- VMYSQL4.3 ALTER TABLE llx_c_shipment_mode CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
+-- To make pk to be auto increment (postgres): -- VPGSQL8.2 NOT POSSIBLE. MUST DELETE/CREATE TABLE
+-- To set a field as NULL:                     -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NULL;
+-- To set a field as NULL:                     -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name DROP NOT NULL;
+-- To set a field as NOT NULL:                 -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NOT NULL;
+-- To set a field as NOT NULL:                 -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET NOT NULL;
+-- To set a field as default NULL:             -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET DEFAULT NULL;
+-- Note: fields with type BLOB/TEXT can't have default value.
+-- -- VPGSQL8.2 DELETE FROM llx_usergroup_user      WHERE fk_user      NOT IN (SELECT rowid from llx_user);
+-- -- VMYSQL4.1 DELETE FROM llx_usergroup_user      WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
 
 
 UPDATE llx_facture_fourn set ref=rowid where ref IS NULL;
@@ -35,6 +41,7 @@ ALTER TABLE llx_societe_rib ADD COLUMN frstrecur varchar(16) DEFAULT 'FRST' AFTE
 
 ALTER TABLE llx_cronjob ADD COLUMN entity integer DEFAULT 0;
 ALTER TABLE llx_cronjob MODIFY COLUMN params text NULL;
+-- VPGSQL8.2 ALTER TABLE llx_cronjob ALTER COLUMN params DROP NOT NULL;
 
 -- Loan
 create table llx_loan

From 2695cc416ef3c0e05afb788ab3d318f6727fc850 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Jun 2017 21:06:16 +0200
Subject: [PATCH 305/438] Fix comment

---
 htdocs/install/mysql/migration/3.7.0-3.8.0.sql | 2 +-
 htdocs/install/mysql/migration/4.0.0-5.0.0.sql | 2 +-
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
index 041a253a545..c997d511fdb 100755
--- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
+++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
@@ -1,7 +1,7 @@
 --
 -- Be carefull to requests order.
 -- This file must be loaded by calling /install/index.php page
--- when current version is 5.0.0 or higher.
+-- when current version is 3.8.0 or higher.
 --
 -- To rename a table:       ALTER TABLE llx_table RENAME TO llx_table_new;
 -- To add a column:         ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol;
diff --git a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
index e3c8223d587..95bcc21740b 100644
--- a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
+++ b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
@@ -1,7 +1,7 @@
 --
 -- Be carefull to requests order.
 -- This file must be loaded by calling /install/index.php page
--- when current version is 4.0.0 or higher.
+-- when current version is 5.0.0 or higher.
 --
 -- To rename a table:       ALTER TABLE llx_table RENAME TO llx_table_new;
 -- To add a column:         ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol;
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 360a91d0fe3..3acf312bae1 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -1,7 +1,7 @@
 --
 -- Be carefull to requests order.
 -- This file must be loaded by calling /install/index.php page
--- when current version is 5.0.0 or higher.
+-- when current version is 6.0.0 or higher.
 --
 -- To rename a table:       ALTER TABLE llx_table RENAME TO llx_table_new;
 -- To add a column:         ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol;

From de423e531c490832aac392116943263318dbaabb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Jun 2017 21:24:55 +0200
Subject: [PATCH 306/438] Sync nb_NO

---
 htdocs/langs/nb_NO/accountancy.lang   | 126 +++++++++-------
 htdocs/langs/nb_NO/admin.lang         | 203 ++++++++++++++++----------
 htdocs/langs/nb_NO/agenda.lang        |   7 +-
 htdocs/langs/nb_NO/banks.lang         |   9 +-
 htdocs/langs/nb_NO/bills.lang         |  72 ++++-----
 htdocs/langs/nb_NO/bookmarks.lang     |   6 +-
 htdocs/langs/nb_NO/boxes.lang         |  16 +-
 htdocs/langs/nb_NO/commercial.lang    |   1 +
 htdocs/langs/nb_NO/compta.lang        |  30 ++--
 htdocs/langs/nb_NO/contracts.lang     |   2 +
 htdocs/langs/nb_NO/cron.lang          |  20 +--
 htdocs/langs/nb_NO/errors.lang        |  27 +++-
 htdocs/langs/nb_NO/exports.lang       |   8 +-
 htdocs/langs/nb_NO/loan.lang          |   4 +-
 htdocs/langs/nb_NO/mails.lang         |  34 +++--
 htdocs/langs/nb_NO/main.lang          |  62 +++++---
 htdocs/langs/nb_NO/margins.lang       |   2 +-
 htdocs/langs/nb_NO/modulebuilder.lang |  24 +++
 htdocs/langs/nb_NO/multicurrency.lang |  18 +++
 htdocs/langs/nb_NO/other.lang         |  54 ++++---
 htdocs/langs/nb_NO/paypal.lang        |  10 +-
 htdocs/langs/nb_NO/products.lang      | 101 ++++++++-----
 htdocs/langs/nb_NO/projects.lang      |  37 +++--
 htdocs/langs/nb_NO/resource.lang      |   5 +
 htdocs/langs/nb_NO/sendings.lang      |   9 +-
 htdocs/langs/nb_NO/stocks.lang        |  74 ++++++++--
 htdocs/langs/nb_NO/stripe.lang        |  42 ++++++
 htdocs/langs/nb_NO/trips.lang         |  11 +-
 htdocs/langs/nb_NO/users.lang         |   4 +-
 htdocs/langs/nb_NO/website.lang       |   4 +-
 30 files changed, 667 insertions(+), 355 deletions(-)
 create mode 100644 htdocs/langs/nb_NO/modulebuilder.lang
 create mode 100644 htdocs/langs/nb_NO/multicurrency.lang
 create mode 100644 htdocs/langs/nb_NO/stripe.lang

diff --git a/htdocs/langs/nb_NO/accountancy.lang b/htdocs/langs/nb_NO/accountancy.lang
index 44ae492ef12..c08c6733062 100644
--- a/htdocs/langs/nb_NO/accountancy.lang
+++ b/htdocs/langs/nb_NO/accountancy.lang
@@ -20,33 +20,37 @@ Journaux=Journaler
 JournalFinancial=Finasielle journaler
 BackToChartofaccounts=Returner kontotabell
 Chartofaccounts=Diagram over kontoer
-CurrentDedicatedAccountingAccount=Current dedicated account
-AssignDedicatedAccountingAccount=New account to assign
+CurrentDedicatedAccountingAccount=Nåværende dedikert konto
+AssignDedicatedAccountingAccount=Ny konto å tildele
 InvoiceLabel=Fakturaetikett
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
+OverviewOfAmountOfLinesNotBound=Oversikt over antall linjer som ikke er bundet til regnskapskonto
+OverviewOfAmountOfLinesBound=Oversikt over antall linjer som allerede er bundet til regnskapskonto
 OtherInfo=Annen informasjon
+DeleteCptCategory=Fjern regnskapskonto fra gruppe
+ConfirmDeleteCptCategory=Er du sikker på at du vil fjerne denne regnskapskontoen fra gruppen?
 
 AccountancyArea=Område for regnskap
 AccountancyAreaDescIntro=Bruk av regnskapsmodulen er gjort i flere skritt:
 AccountancyAreaDescActionOnce=Følgende tiltak blir vanligvis utført en gang, eller en gang i året ...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=De neste skrittene bør gjøres for å spare tid i fremtiden ved å foreslå deg riktig standardregnskapskonto når du foretar journalføringen (skriv inn post i journaler og hovedbok)
 AccountancyAreaDescActionFreq=Følgende tiltak blir vanligvis utført hver måned, uke eller dag for svært store selskaper ...
+
+AccountancyAreaDescJournalSetup=TRINN %s: Lag eller kontroller innholdet i din journalliste fra menyen %s
 AccountancyAreaDescChartModel=TRINN %s: Lag en kontomodell fra menyen %s
 AccountancyAreaDescChart=TRINN %s: Opprett eller kontroller innhold i din kontoplan fra meny %s
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=TRINN %s: Skriv transaksjoner inn i hovedboken. For å gjøre dette, kan du gå inn i hver journal, og klikk på knappen "Journalfør transaksjoner i hovedbok".
+AccountancyAreaDescVat=TRINN %s: Definer regnskapskonto for hver MVA-sats. Bruk menyoppføringen %s.
+AccountancyAreaDescExpenseReport=TRINN %s: Definer standard regnskapskontoer for hver type kostnadsrapport. Bruk menyoppføringen %s.
+AccountancyAreaDescSal=TRINN %s: Definer standard regnskapskonto for betaling av lønn. Bruk menyoppføring %s.
+AccountancyAreaDescContrib=TRINN %s: Definer standard regnskapskonto for spesialutgifter (diverse avgifter). Bruk menyoppføringen %s.
+AccountancyAreaDescDonation=TRINN %s: Definer standard regnskapskonto for donasjoner. Bruk menyoppføringen %s.
+AccountancyAreaDescMisc=TRINN %s: Definer standard regnskapskontoer for diverse transaksjoner. Bruk menyoppføringen %s.
+AccountancyAreaDescLoan=TRINN %s: Definer standard regnskapskonto for lån. Bruk menyoppføringen %s.
+AccountancyAreaDescBank=TRINN %s: Definer regnskapskontoer for hver bank- og finanskonto. Gå til kortet for hver finansiell konto for å gjøre dette. Du kan starte fra side %s.
+AccountancyAreaDescProd=TRINN %s: Definer regnskapskontoer for dine varer/tjenester. Bruk menyoppføringen %s.
+
+AccountancyAreaDescBind=TRINN %s: Kontroller at bindingen mellom eksisterende %s linjer og regnskapskonto er ferdig, slik at applikasjonen vil kunne journalføre transaksjoner i hovedboken med ett klikk. Fullfør manglende bindinger. Bruk menyen %s.
+AccountancyAreaDescWriteRecords=TRINN %s: Skriv transaksjoner inn i hovedboken. For dette, gå til menyen <strong> %s</strong>, og klikk på knappen <strong>%s</strong>.
 AccountancyAreaDescAnalyze=TRINN %s: Legg til eller endre eksisterende transaksjoner, generer rapporter og utfør eksport
 
 AccountancyAreaDescClosePeriod=TRINN %s: Lukk perioden slik at ingen endringer kan bli gjort.
@@ -57,6 +61,10 @@ ChangeAndLoad=Endre og last inn
 Addanaccount=Legg til regnskapskonto
 AccountAccounting=Regnskapskonto
 AccountAccountingShort=Konto
+SubledgerAccount=Konto i sub-hovedbok
+subledger_account=Konto i sub-hovedbok
+ShowAccountingAccount=Vis regnskapskonto
+ShowAccountingJournal=Vis regnskapsjournal
 AccountAccountingSuggest=Foreslått regnskapskonto
 MenuDefaultAccounts=Standard kontoer
 MenuVatAccounts=MVA-kontoer
@@ -68,19 +76,19 @@ ProductsBinding=Varekontoer
 Ventilation=Binding til kontoer
 CustomersVentilation=Binding av kundefakturaer
 SuppliersVentilation=Binding av leverandørfakturaer
-ExpenseReportsVentilation=Expense report binding
+ExpenseReportsVentilation=Utgiftsrapport-binding
 CreateMvts=Opprett ny transaksjon
 UpdateMvts=Endre en transaksjon
-WriteBookKeeping=Journalfør transaksjoner i hovedboken
+WriteBookKeeping=Før transaksjoner inn i hovedboken
 Bookkeeping=Hovedbok
 AccountBalance=Kontobalanse
 
 CAHTF=Totalt leverandørkjøp eks. MVA
-TotalExpenseReport=Total expense report
+TotalExpenseReport=Total utgiftsrapport
 InvoiceLines=Binding av fakturalinjer
 InvoiceLinesDone=Bundne fakturalinjer
-ExpenseReportLines=Lines of expense reports to bind
-ExpenseReportLinesDone=Bound lines of expense reports
+ExpenseReportLines=Utgiftsrapport-linjer som skal bindes
+ExpenseReportLinesDone=Bundne utgiftsrapport-linjer
 IntoAccount=Bind linje med regnskapskonto
 
 
@@ -90,7 +98,7 @@ Processing=Behandler
 EndProcessing=Prosess terminert.
 SelectedLines=Valgte linjer
 Lineofinvoice=Fakturalinje
-LineOfExpenseReport=Line of expense report
+LineOfExpenseReport=Utgiftsrapport-linje
 NoAccountSelected=Ingen regnskapskonto valgt
 VentilatedinAccount=Bundet til regnskapskontoen
 NotVentilatedinAccount=Ikke bundet til regnskapskontoen
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begynn sortering av siden "Bindinger utfø
 
 ACCOUNTING_LENGTH_DESCRIPTION=Avkort vare- og produktbeskrivelser i lister etter x karakterer (Anbefalt = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Avkort vare- og produkt kontobeskrivelser i lister etter x karakterer (Anbefalt = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Lengde på hovedbokskontoer
-ACCOUNTING_LENGTH_AACCOUNT=Lengde på tredjepartskontoer
-ACCOUNTING_MANAGE_ZERO=Håndter nullen på slutten av en regnskapskonto. Trengs i noen land. Deaktivert som standard. Du må også sette de 2 følgende parametre (ellers blir de ignorert)
+ACCOUNTING_LENGTH_GACCOUNT=Lengden på de generelle regnskapskontoene (Hvis du setter verdien til 6 her, vil kontoen '706' vises som '706000' på skjermen)
+ACCOUNTING_LENGTH_AACCOUNT=Lengden på tredjeparts regnskapskontoer (Hvis du angir verdien til 6 her, vil kontoen '401' vises som '401000' på skjermen)
+ACCOUNTING_MANAGE_ZERO=Tillat å administrere forskjellig antall nuller på slutten av en regnskapskonto. Nødvendig for enkelte land (som Sveits). Hvis du holder den av (standard), kan du angi de 2 følgende parametrene for å be om å legge til virtuell null.
 BANK_DISABLE_DIRECT_INPUT=Deaktiver direkteregistrering av transaksjoner på bankkonto
 
 ACCOUNTING_SELL_JOURNAL=Salgsjournal
@@ -132,23 +140,23 @@ Sens=som betyr
 Codejournal=Journal
 NumPiece=Del nummer
 TransactionNumShort=Transaksjonsnummer
-AccountingCategory=Regnskapskategori
+AccountingCategory=Regnskapskonto-grupper
 GroupByAccountAccounting=Grupper etter regnskapskonto
 NotMatch=Ikke valgt
-DeleteMvt=Slett linjer i hovedboken
+DeleteMvt=Slett linjer fra hovedboken
 DelYear=År som skal slettes
 DelJournal=Journal som skal slettes
-ConfirmDeleteMvt=Dette vil slette alle linjer i hovedboken for året og/eller fra en spesifikk journal. Minst ett kriterie er påkrevet
-ConfirmDeleteMvtPartial=Dette vil slette valgt linje(r) i hovedboken
-DelBookKeeping=Slett post i hovedboken
+ConfirmDeleteMvt=Dette vil slette alle linjene i hovedboken for år og/eller fra en bestemt journal. Minst ett kriterium kreves.
+ConfirmDeleteMvtPartial=Dette vil slette den valgte linjen(e) i hovedboken
+DelBookKeeping=Slett post fra hovedboken
 FinanceJournal=Finansjournal
-ExpenseReportsJournal=Expense reports journal
+ExpenseReportsJournal=Journal for utgiftsrapporter
 DescFinanceJournal=Finansjournal med alle typer betalinger etter bankkonto
-DescJournalOnlyBindedVisible=Her vises poster som er bundet til vare-/tjenestekontoer og kan registreres i hovedboken.
+DescJournalOnlyBindedVisible=Dette er en oversikt over posten som er bundet til varer-/tjenester-regnskapskontoen og kan registreres i regnskapsboken.
 VATAccountNotDefined=MVA-konto er ikke definert
 ThirdpartyAccountNotDefined=Konto for tredjepart er ikke definert
 ProductAccountNotDefined=Konto for vare er ikke definert
-FeeAccountNotDefined=Account for fee not defined
+FeeAccountNotDefined=Konto for honorar ikke definert
 BankAccountNotDefined=Konto for bank er ikke definert
 CustomerInvoicePayment=Betaling av kundefaktura
 ThirdPartyAccount=Tredjepart-konto
@@ -156,13 +164,13 @@ NewAccountingMvt=Ny transaksjon
 NumMvts=Transaksjonsnummer
 ListeMvts=Liste over bevegelser
 ErrorDebitCredit=Debet og kredit kan ikke ha en verdi samtidig
-
+AddCompteFromBK=Legg til regnskapskontoer til gruppen
 ReportThirdParty=List tredjepartskonto
 DescThirdPartyReport=Liste over kunder og leverandører og deres regnskapskontoer
 ListAccounts=Liste over regnskapskontoer
 
 Pcgtype=Kontoklasse
-Pcgsubtype=Underklasse av konto
+Pcgsubtype=Subklasse av konto
 
 TotalVente=Total omsetning før skatt
 TotalMarge=Total salgsmargin
@@ -175,10 +183,10 @@ ChangeAccount=Endre regnskapskonto for valgte vare-/tjenestelinjer til følgende
 Vide=-
 DescVentilSupplier=Liste over leverandørfaktura-linjer bundet eller ikke bundet til en vare-regnskapskonto
 DescVentilDoneSupplier=Liste over leverandørfakturalinjer og tilhørende regnskapskonto
-DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
-DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
-DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
-DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
+DescVentilTodoExpenseReport=Bind utgiftsrapport-linjer til en gebyr-regnskapskonto
+DescVentilExpenseReport=Liste over utgiftsrapport-linjer bundet (eller ikke) til en gebyr-regnskapskonto
+DescVentilExpenseReportMore=Hvis du setter opp regnskapskonto med type utgiftsrapport-linjer, vil programmet være i stand til å gjøre alle bindinger mellom utgiftsrapport-linjer og regnskapskontoer med et klikk på knappen <strong>"%s"</strong>. Hvis du fortsatt har noen linjer som ikke er bundet til en konto, må du foreta en manuell binding fra menyen "<strong>%s</strong>".
+DescVentilDoneExpenseReport=Liste over utgiftsrapport-linjer og tilhørende gebyr-regnskapskonto
 
 ValidateHistory=Bind automatisk
 AutomaticBindingDone=Automatisk binding utført
@@ -186,16 +194,28 @@ AutomaticBindingDone=Automatisk binding utført
 ErrorAccountancyCodeIsAlreadyUse=Feil, du kan ikke slette denne regnskapskontoen fordi den er i bruk
 MvtNotCorrectlyBalanced=Bevegelse er ikke korrekt balansert. Kredit=%s. Debet=%s
 FicheVentilation=Binding-kort
-GeneralLedgerIsWritten=Transaksjoner er ført inn i hovedboken
-GeneralLedgerSomeRecordWasNotRecorded=Noen av transaksjonene kunne ikke registreres
-NoNewRecordSaved=Ingen nye poster lagret
+GeneralLedgerIsWritten=Transaksjoner blir skrevet inn i hovedboken
+GeneralLedgerSomeRecordWasNotRecorded=Noen av transaksjonene kunne ikke sendes. Hvis det ikke er noen annen feilmelding, er dette trolig fordi de allerede var sendt.
+NoNewRecordSaved=Ingen ny poster sendt
 ListOfProductsWithoutAccountingAccount=Liste over varer som ikke bundet til en regnskapskonto
 ChangeBinding=Endre bindingen
 
 ## Admin
 ApplyMassCategories=Masseinnlegging av kategorier
-AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
-CategoryDeleted=Category for the accounting account has been removed
+AddAccountFromBookKeepingWithNoCategories=Legg til allerede brukt konto, uten kategorier
+CategoryDeleted=Kategori for regnskapskontoen er blitt slettet
+AccountingJournals=Regnskapsjournaler
+AccountingJournal=Regnskapsjournal
+NewAccountingJournal=Ny regnskapsjourna
+ShowAccoutingJournal=Vis regnskapsjournal
+Code=Kode
+Nature=Natur
+AccountingJournalType1=Ulike operasjoner
+AccountingJournalType2=Salg
+AccountingJournalType3=Innkjøp
+AccountingJournalType4=Bank
+AccountingJournalType9=Har nye
+ErrorAccountingJournalIsAlreadyUse=Denne journalen er allerede i bruk
 
 ## Export
 Exports=Eksporter
@@ -211,7 +231,8 @@ Modelcsv_ciel=Eksport til Sage Ciel Compta eller Compta Evolution
 Modelcsv_quadratus=Eksport til Quadratus QuadraCompta
 Modelcsv_ebp=Eksporter mot EBP
 Modelcsv_cogilog=Eksport mot Cogilog
-ChartofaccountsId=Chart of accounts Id
+Modelcsv_agiris=Eksport mot Agiris (Test)
+ChartofaccountsId=Kontoplan ID
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Initier regnskap
@@ -225,9 +246,9 @@ OptionModeProductBuyDesc=Vis alle varer for kjøp, med regnskapskonto
 CleanFixHistory=Fjern regnskapskode fra linjer som ikke finnes i kontodiagram
 CleanHistory=Nullstill alle bindinger for valgt år
 
-WithoutValidAccount=Without valid dedicated account
-WithValidAccount=With valid dedicated account
-ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
+WithoutValidAccount=Uten gyldig dedikert konto
+WithValidAccount=Med gyldig dedikert konto
+ValueNotIntoChartOfAccount=Denne verdien av regnskapskonto eksisterer ikke i kontoplanen
 
 ## Dictionary
 Range= Oversikt over regnskapskonto
@@ -235,11 +256,12 @@ Calculated=Kalkulert
 Formula=Formel
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=Ingen kontokategori tilgjengelig for landet %s (se Hjem - Oppsett - Ordlister)
+SomeMandatoryStepsOfSetupWereNotDone=Noen obligatoriske trinn for oppsett ble ikke gjort, vennligst fullfør disse
+ErrorNoAccountingCategoryForThisCountry=Ingen regnskapskonto-gruppe tilgjengelig for land %s (Se Hjem - Oppsett - Ordbøker)
 ExportNotSupported=Eksportformatet som er satt  opp støttes ikke på denne siden
 BookeppingLineAlreayExists=Linjene eksisterer allerede i bokføringen
-
+NoJournalDefined=Ingen journal definert
 Binded=Bundne linjer
 ToBind=Linjer som skal bindes
 
-WarningReportNotReliable=Advarsel! Denne rapporten er ikke basert på hovedboken, så den er ikke pålitelig enda. Den vil erstattes av en korrekt rapport i neste versjon
+WarningReportNotReliable=Advarsel, denne rapporten er ikke basert på hovedboken, så den inneholder ikke manuelt endrede transaksjoner i hovedboken. Den blir erstattet av en mer komplett rapport i en neste versjon.
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index a9fbede41aa..1d10f9ae053 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -9,10 +9,10 @@ VersionDevelopment=Utviklingsversjon
 VersionUnknown=Ukjent
 VersionRecommanded=Anbefalt
 FileCheck=Filintegritetssjekker
-FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. Value of some setup constants may also be checked. You can use this tool to detect if some files were modified by a hacker for example.
-FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+FileCheckDesc=Dette verktøyet lar deg sjekke integriteten av filer og oppsett av programmet ved å sammenligne hver fil med de offisielle. Verdien av noen konstanter kan også sjekkes. Du kan bruke dette verktøyet til å oppdage om noen filer ble endret av f.eks hackere
+FileIntegrityIsStrictlyConformedWithReference=Filintegriteter er strengt dannet med referansen.
+FileIntegrityIsOkButFilesWereAdded=Fil-integritetssjekk ble godkjent, men noen nye filer ble lagt til.
+FileIntegritySomeFilesWereRemovedOrModified=Filintegritetssjekk mislyktes. Noen filer ble endret, fjernet eller lagt til.
 GlobalChecksum=Global sjekksum
 MakeIntegrityAnalysisFrom=Opprett integritetsanalyse av applikasjonsfiler fra
 LocalSignature=Innebygget lokal signatur (mindre pålitelig)
@@ -22,7 +22,7 @@ FilesUpdated=Oppdaterte filer
 FilesModified=Endrede filer
 FilesAdded=Filer lagt til
 FileCheckDolibarr=Integritetssjekk av applikasjonsfilene
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
+AvailableOnlyOnPackagedVersions=Den lokale filen for integritetssjekking er bare tilgjengelig når programmet er installert fra en offisiell pakke
 XmlNotFound=Xml Integritetsfilen til applikasjonen ble ikke funnet
 SessionId=Økt-ID
 SessionSaveHandler=Håndterer for å lagre sesjoner
@@ -48,6 +48,7 @@ InternalUsers=Interne brukere
 ExternalUsers=Eksterne brukere
 GUISetup=Visning
 SetupArea=Oppsettsområde
+UploadNewTemplate=Last opp ny mal(er)
 FormToTestFileUploadForm=Skjema for å teste opplasting (i henhold til oppsett)
 IfModuleEnabled=Merk: Ja er bare effektiv hvis modulen <b>%s</b> er aktivert
 RemoveLock=Fjern filen <b>%s</b> , hvis den finnes, for å tillate bruk av oppdateringsverktøyet.
@@ -64,8 +65,8 @@ ErrorCodeCantContainZero=Koden kan ikke inneholde verdien 0
 DisableJavascript=Deaktiver JavaScript og Ajax funksjoner (Anbefalt for tekstbaserte nettlesere og blinde)
 UseSearchToSelectCompanyTooltip=Hvis du har et stort antall tredjeparter (> 100 000), kan du øke hastigheten ved å sette konstant COMPANY_DONOTSEARCH_ANYWHERE til 1 i Oppsett-> Annet. Søket vil da være begrenset til starten av strengen.
 UseSearchToSelectContactTooltip=Hvis du har et stort antall tredjeparter (> 100 000), kan du øke hastigheten ved å sette konstant CONTACT_DONOTSEARCH_ANYWHERE til 1 i Oppsett-> Annet. Søket vil da være begrenset til starten av strengen.
-DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties, but it is less convenient)
-DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact, but it is less convenient)
+DelaiedFullListToSelectCompany=Vent med å trykke på en tast før innholdet av tredjepart-kombinasjonslisten er lastet (Dette kan øke ytelsen hvis du har mange tredjeparter)
+DelaiedFullListToSelectContact=Vent med å trykke på en tast før innholdet av kontakt-kombinasjonslisten er lastet (Dette kan øke ytelsen hvis du har mange kontakter)
 NumberOfKeyToSearch=Antall tegn for å starte søk: %s
 NotAvailableWhenAjaxDisabled=Ikke tilgjengelig når Ajax er slått av
 AllowToSelectProjectFromOtherCompany=På elementer av en tredjepart, kan du velge et prosjekt knyttet til en annen tredjepart
@@ -85,7 +86,7 @@ Mask=Maske
 NextValue=Neste verdi
 NextValueForInvoices=Neste verdi (fakturaer)
 NextValueForCreditNotes=Neste verdi (kreditnotaer)
-NextValueForDeposit=Neste beløp (innskudd)
+NextValueForDeposit=Neste verdi (nedbetaling)
 NextValueForReplacements=Neste verdi (erstatninger)
 MustBeLowerThanPHPLimit=Merk: PHP begrenser hver filopplastning til <b>%s</b> %s, uansett hva som er angitt her
 NoMaxSizeByPHPLimit=Merk: Det er ikke satt noen begrensninger i din PHP-konfigurasjon på denne serveren
@@ -103,7 +104,7 @@ MenuIdParent=ID foreldremeny
 DetailMenuIdParent=ID foreldremeny (tom for toppmeny)
 DetailPosition=Sorteringsnummer i meny
 AllMenus=Alle
-NotConfigured=Modulen er Ikke konfigurert
+NotConfigured=Modul/applikasjon ikke konfigurert
 Active=Aktiv
 SetupShort=Oppsett
 OtherOptions=Andre innstillinger
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Tusenskille
 Destination=Mål
 IdModule=Modul ID
 IdPermissions=Rettigheter ID
-Modules=Moduler
 LanguageBrowserParameter=Parameter %s
 LocalisationDolibarrParameters=Språkparametere for Dolibarr
 ClientTZ=Tidssone (bruker)
@@ -123,7 +123,8 @@ PHPTZ=Tidssone PHP-server
 DaylingSavingTime=Sommertid
 CurrentHour=PHP tid (server)
 CurrentSessionTimeOut=Gjeldende økt-timeout
-YouCanEditPHPTZ=Hvis du vil angi en annen PHP tidssone (ikke nødvendig), kan du prøve å legge til filen  .htacces meddenne linjen "SetEnv TZ Europe/Oslo"
+YouCanEditPHPTZ=For å angi en annen PHP tidssone (ikke nødvendig), kan du prøve å legge til en fil .htaccess med en linje som denne "SetEnv TZ Europe/Oslo"
+HoursOnThisPageAreOnServerTZ=Advarsel, i motsetning til andre skjermer, er timer på denne siden ikke i din lokale tidssone, men i tidssonen til serveren.
 Box=Widget
 Boxes=Widgeter
 MaxNbOfLinesForBoxes=Maks. antall linjer for widgeter
@@ -189,11 +190,11 @@ FeatureAvailableOnlyOnStable=Egenskapen er kun tilgjengelig på offisielle, stab
 Rights=Tillatelser
 BoxesDesc=Widgeter er komponenter som viser litt informasjon som du kan legge til for å tilpasse enkelte sider. Du kan velge mellom å vise widgeten eller ikke ved å velge målside og klikke på 'Aktiver', eller ved å klikke på søppelkassen for å deaktivere den.
 OnlyActiveElementsAreShown=Bare elementer fra <a href="%s">aktiverte moduler</a> vises.
-ModulesDesc=Dolibarr-moduler definerer hvilke funksjonaliteter som er aktivert i programmet. Noen moduler krever tillatelser du må gi for brukerne, etter å ha aktivert modulen. Klikk på knappen på/av for å aktivere en modul/funksjon.
+ModulesDesc=Dolibarr-moduler definerer hvilken applikasjon/funksjon som er aktivert i programvaren. Enkelte applikasjoner/moduler krever tillatelser du må gi til brukere, etter at du har aktivert dem. Klikk på knappen på/av for å aktivere en modul/applikasjon.
 ModulesMarketPlaceDesc=Du kan finne flere moduler for nedlasting på eksterne nettsteder.
-ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesDeployDesc=Hvis tillatelser for filsystemet tillater det, kan du bruke dette verktøyet til å distribuere en ekstern modul. Modulen vil da være synlig under fanen <strong>%s</strong>.
 ModulesMarketPlaces=Finn eksterne moduler.
-GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
+GoModuleSetupArea=For å distribuere/installere en ny modul, gå til området for Moduloppsett på <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, den offisielle markedsplassen for eksterne moduler til Dolibarr ERP/CRM 
 DoliPartnersDesc=Liste over selskaper som tilbyr spesialtilpassede moduler og funksjoner (Merk: Erfarne PHP-programmerere kan gi tilpasset utvikling for åpen kildekode)
 WebSiteDesc=Referansesider for å finne flere moduler.
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Databasepassord kryptert i conf.php (Aktivering
 InstrucToEncodePass=For å kryptere passordet i <b>conf.php</b> , bytt ut linjen <br><b>$dolibarr_main_db_pass="...";</b><br>med<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=For passord i klartekst(helst ikke) i <b>conf.php</b> , bytt ut linjen <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>med<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Beskytt genererte pdf-filer (anbefales ikke, fjerner mulighet for massegenerering av PDF'er)
-ProtectAndEncryptPdfFilesDesc=Beskyttede PDF-filer kan fortsatt leses og skrives ut med alle PDF-lesere. De kan derimot ikke redigeres eller kopieres fra. Når du bruker denne funksjonen vil det ikke være mulig å lage globale akkumulerte PDF-filer (som for eksempel ubetalte fakturaer).
+ProtectAndEncryptPdfFilesDesc=Beskyttelse av et PDF-dokument gjør det tilgjengelig for å lese og skrive det ut med hvilken som helst PDF-leser. Det er imidlertid ikke mulig å redigere og kopiere. Legg merke til at bruk av denne funksjonen gjør det mulig å bygge en globalt sammensatt PDF-fil som ikke fungerer.
 Feature=Funksjon
 DolibarrLicense=Lisens
 Developpers=Utviklere/bidragsytere
@@ -225,6 +226,8 @@ OfficialMarketPlace=Offisiell markedsplass for eksterne moduler/tillegg
 OfficialWebHostingService=Referert webhosting service (Cloud hosting)
 ReferencedPreferredPartners=Foretrukne Partnere
 OtherResources=Andre ressurser
+ExternalResources=Eksterne ressurser
+SocialNetworks=Sosiale nettverk
 ForDocumentationSeeWiki=For bruker- eller utviklerdokumentasjon (Doc, FAQs ...), <br> ta en titt på Dolibarr Wiki: <br> <a href="%s" target="_blank"><b>%s</b></a>
 ForAnswersSeeForum=For andre spørsmål/hjelp, kan du bruke Dolibarr forumet: <br> <a href="%s" target="_blank"><b>%s</b></a>
 HelpCenterDesc1=Dette området kan hjelpe deg å få support-tjeneste med Dolibarr.
@@ -235,12 +238,12 @@ LeftMargin=Venstremarg
 TopMargin=Toppmarg
 PaperSize=Papirtype
 Orientation=Orientering
-SpaceX=Space X
-SpaceY=Space Y
+SpaceX=Mellomrom X
+SpaceY=Mellomrom Y
 FontSize=Fontstørrelse
 Content=Innhold
 NoticePeriod=Oppsigelsestid
-NewByMonth=New by month
+NewByMonth=Ny etter måned
 Emails=E-poster
 EMailsSetup=E-postinnstillinger
 EMailsDesc=Denne siden lar deg overstyre PHP-innstillingene for å sende e-post. I de fleste tilfeller på Unix/Linuxservere er PHP-innstillingene korrekte, slik at disse innstillingene er unødvendige.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=Funksjonen er ikke tilgjengelig på Unix/Linux. Test
 SubmitTranslation=Hvis oversettelsen for dette språket ikke er fullstendig eller du finner feil, kan du rette opp dette ved å redigere filene i katalogen <b>langs/%s</b> og sende endrede filer til www.transifex.com/dolibarr-association/dolibarr/
 SubmitTranslationENUS=Hvis oversettelse for dette språket ikke er fullstendig eller du finner feil, kan du korrigere dette ved å redigere filer i katalogen <b>langs/%s</b> og sende endrede filer på dolibarr.org/forum eller for utviklere på github.com/Dolibarr/dolibarr.
 ModuleSetup=Modulinnstillinger
-ModulesSetup=Modulinnstillinger
+ModulesSetup=Moduler/Applikasjonsoppsett
 ModuleFamilyBase=System
 ModuleFamilyCrm=Kunderelasjonshåndtering (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -285,29 +288,32 @@ MenuHandlers=Menyhåndtering
 MenuAdmin=Menyredigering
 DoNotUseInProduction=Ikke bruk i produksjon
 ThisIsProcessToFollow=Disse skrittene må gjennomføres:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
+ThisIsAlternativeProcessToFollow=Dette er et alternativt oppsett for manuell behandling:
 StepNb=Trinn %s
 FindPackageFromWebSite=Finn en pakke som inneholder funksjonen du vil bruke (for eksempel på nettsider %s).
 DownloadPackageFromWebSite=Last ned pakke (for eksempel fra den offisielle websiden %s).
-UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <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>.
-NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+UnpackPackageInDolibarrRoot=Pakk ut filene til serverkatalogen til Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=For å distribuere/installere en ekstern modul, pakk ut filene i servermappen dedikert for moduler: <b>%s</b>
+SetupIsReadyForUse=Moduldistribusjon er ferdig. Du må imidlertid aktivere og sette opp modulen i programmet ved å gå til siden: <a href="%s">%s</a>.
+NotExistsDirect=Alternativ rotkatalog er ikke definert til en eksisterende katalog.<br>
 InfDirAlt=Fra versjon 3 er det mulig å definere en alternativ rotkatalog. Dette gjør det mulig å lagre plug-ins og egendefinerte maler.<br>Opprett en katalog i roten til Dolibarr (f.eks min katalog).<br>
-InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/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.
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>Hvis disse linjene er markert med "#", er de deaktivert. For å aktivere dem er det bare å fjerne "#".
 YouCanSubmitFile=I dette trinnet kan du sende pakken med dette verktøyet: Velg modulfil
 CurrentVersion=Gjeldende versjon av Dolibarr 
 CallUpdatePage=Gå til siden som oppdaterer data og databasestruktur: %s.
 LastStableVersion=Siste stabile versjon
-LastActivationDate=Latest activation date
+LastActivationDate=Siste aktiveringsdato
+LastActivationAuthor=Siste aktiveringsforfatter
+LastActivationIP=Siste aktivering IP
 UpdateServerOffline=Oppdater serveren offline
+WithCounter=Administrer en teller
 GenericMaskCodes=Her kan du legge inn nummereringsmal. I malen kan du bruke følgende tagger:<br><b>{000000}</b> tilsvarer et tall som økes ved hver %s. Angi så mange nuller som du ønsker at lengden på telleren skal være. Telleren vil ha ledende nuller i henhold til malens lengde. <br><b>{000000+000}</b> samme som forrige, men med en forskyvning til høyre for + tegnet, starter fra første %s. <br><b>{000000@x}</b> samme som forrige, men telleren starter fra null når måned x nås (x mellom 1 og 12). Hvis dette valget brukes og x er 2 eller mer kreves også sekvensen {yy}{mm} eller {yyyy}{mm} kreves også. <br><b>{dd}</b> dag (01 til 31).<br><b>{mm}</b> måned (01 til 12).<br><b>{yy}</b>, <b>{yyyy}</b> eller <b>{y}</b> årstall over 2, 4 eller 1 siffer. <br> <b>{cccc000}</b> klientkoden på n tegn etterfulgt av en klientreferanse uten forskyvning og nullet med den globale telleren.<br><br>Alle andre tegn i malen vil forbli intakte.<br>Mellomrom er ikke tillatt.<br><br><u>Eksempel på den 99de %s av tredjeparten blir 31/01/2007:</u><br><b>ABC{yy}{mm}-{000000}</b> vil gi <b>ABC0701-000099</b><br><b>{0000+100}-ZZZ/{dd}/XXX</b> vil gi <b>0199-ZZZ/31/XXX</b><br>
-GenericMaskCodes2=<b>{cccc}</b> klientkoden på n tegn<br><b>{cccc000}</b> klientkoden på n tegn etterfølges av en teller dedikert til kunden. Denne telleren blir tilbakestilt til samtidig som den globale telleren.<br><b>{tttt}</b> Koden av tredjeparts type på n tegn (se ordbok-tredjepartstyper). <br>
+GenericMaskCodes2=<B> {cccc} </b> klientkoden på n tegn <br> <b> {cccc000} </b> klientkoden på n tegn etterfølges av en teller dedikert til kunden. Denne telleren tilbakestilles samtidig med global teller. <br> <b> {tttt} </b> Koden til tredjepartstype på n tegn (se menyen Hjem - Oppsett - Ordbok - Typer av tredjeparter) . Hvis du legger til denne taggen, vil telleren være forskjellig for hver type tredjepart. <br>
 GenericMaskCodes3=Alle andre tegn i masken vil være intakt. <br> Mellomrom er ikke tillatt. <br>
-GenericMaskCodes4a=<u>Eksempel på 99. %s av tredjeparten TheCompany gjort 31.01.2007:</u><br>
+GenericMaskCodes4a=<u>Eksempel på 99. %s fra tredjepart TheCompany, med dato 2007-01-31: </u> <br>
 GenericMaskCodes4b=<u>Eksempel på tredjepart opprettet på 2007-03-01:</u> <br>
 GenericMaskCodes4c=<u>Eksempel på vare opprettet 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> vil gi <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> vil gi <b>0199-ZZZ/31/XXX</b>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> vil gi <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> vil gi <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> vil giv <b>IN0701-0099-A</b> hvis firmatypen er 'Responsable Inscripto' med typekode som er  'A_RI'
 GenericNumRefModelDesc=Gir et egendefinert nummer etter en definert mal.
 ServerAvailableOnIPOrPort=Serveren er tilgjengelig på adressen <b>%s</b> på port <b>%s</b>
 ServerNotAvailableOnIPOrPort=Serveren er ikke tilgjengelig på adressen  <b>%s</b> på port <b>%s</b>
@@ -369,24 +375,26 @@ Int=Integer
 Float=Float
 DateAndTime=Dato og tid
 Unique=Unik
-Boolean=Boolean (Avmerkingsboks)
+Boolean=Boolsk (en avkrysningsboks)
 ExtrafieldPhone = Telefon
 ExtrafieldPrice = Pris
 ExtrafieldMail = E-post
 ExtrafieldUrl = Url
 ExtrafieldSelect = Velg liste
 ExtrafieldSelectList = Velg fra tabell
-ExtrafieldSeparator=Separator
+ExtrafieldSeparator=Separator (ikke et felt)
 ExtrafieldPassword=Passord
-ExtrafieldCheckBox=Avmerkingsboks
-ExtrafieldRadio=Radio-knapp
-ExtrafieldCheckBoxFromList= Avkrysningsboks fra tabell
+ExtrafieldRadio=Radioknapper (kun på valg)
+ExtrafieldCheckBox=Sjekkbokser
+ExtrafieldCheckBoxFromList=Avkrysningsbokser fra tabell
 ExtrafieldLink=Lenke til et objekt
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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
+ComputedFormula=Beregnet felt
+ComputedFormulaDesc=Her kan du skrive inn en formel ved hjelp av andre objektegenskaper eller PHP-koding for å få en dynamisk beregningnet verdi. Du kan bruke PHP-kompatible formler, inkludert "?" operator og følgende globale objekt: <strong> $db, $conf, $langs, $mysoc, $user, $objekt </strong>. <br><br><Strong> ADVARSEL </strong>: Kanskje bare noen egenskaper på $objekt er tilgjengelig. Hvis du trenger egenskaper som ikke er lastet, kan du bare hente objektet i formelen din som i det andre eksempelet. <br> Ved å bruke et beregnet felt betyr det at du ikke selv kan angi noen verdi fra grensesnittet. Også, hvis det er en syntaksfeil, kan det hende formelen ikke returnerer noe. <br> <br> Eksempel på formel: <br> $objekt->id<10? round ($object->id / 2, 2) : ($object-> id + 2 *$user->id) * (int) substr($mysoc->zip, 1, 2) <br> <br> Eksempel på å ny innlasting av objekt <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> Annet eksempel på formel for å tvinge lasting av objekt og dets overordnede objekt: <br> (($reloadedobj = Ny oppgave ($db)) && ($reloadedobj->fetch($objekt->id)> 0) && ($secondloadedobj = nytt prosjekt ($db)) && ($secondloadedobj->fetch($reloadedobj-> fk_project )> 0))? $secondloadedobj-> ref: 'Foreldreprosjekt ikke funnet'
+ExtrafieldParamHelpselect=Parameterliste må være nøkkel,verdi <br> for eksempel: <br>1,verdi1<br>2,verdi2<br>3,verdi3<br>...<br>For å ha listen avhengig av en annen attributtliste: <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=Parameterlisten må settes opp med nøkkel,verdi<br><br> for eksempel: <br>1,verdi1<br>2,verdi2<br>3,verdi3<br>...
 ExtrafieldParamHelpradio=Parameterlisten må settes opp med nøkkel,verdi<br><br> for eksempel: <br>1,verdi1<br>2,verdi2<br>3,verdi3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=Parameterlisten kommer fra en tabell<br>Syntax : table_name:label_field:id_field::filter<br>Eksempel : c_typent:libelle:id::filter<br><br> et filter kan være en enkel test (f.eks active=1) for å vise kun aktive verdier<br>Du kan også bruke $ID$ i filtre, som er gjeldende ID av gjeldende objekt<br>For å utføre SELECT i filtre, bruk $SEL$<br>hvis du vil filtrere på ekstrafelter, bruk syntaks  extra.fieldcode=...(der feltkode er koden til ekstrafeltet)<br><br>For å få listen til å avhenge av en komplementær attributtliste:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>For å få listen til å avhenge av en annen liste:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameterlisten kommer fra en tabell<br>Syntax : table_name:label_field:id_field::filter<br>Eksempel : c_typent:libelle:id::filter<br><br> et filter kan være en enkel test (f.eks active=1) for å vise kun aktive verdier<br>Du kan også bruke $ID$ i filtre, som er gjeldende ID av gjeldende objekt<br>For å utføre SELECT i filtre, bruk $SEL$<br>hvis du vil filtrere på ekstrafelter, bruk syntaks  extra.fieldcode=...(der feltkode er koden til ekstrafeltet)<br><br>For å få listen til å avhenge av en komplementær attributtliste:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>For å få listen til å avhenge av en annen liste:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parametre må være ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Eksempel : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Bibliotek brukt for PDF-generering
 WarningUsingFPDF=Advarsel! <b>conf.php</b> inneholder direktivet <b>dolibarr_pdf_force_fpdf=1</b>. Dette betyr at du bruker FPDF biblioteket for å generere PDF-filer. Dette biblioteket er gammelt og støtter ikke en rekke funksjoner (Unicode, bilde-transparens, kyrillisk, arabiske og asiatiske språk, ...), så du kan oppleve feil under PDF generering. <br> For å løse dette, og ha full støtte ved PDF generering, kan du laste ned <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, deretter kommentere eller fjerne linjen <b>$dolibarr_pdf_force_fpdf=1</b>, og i stedet legge inn <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
@@ -418,13 +426,27 @@ EnableAndSetupModuleCron=Hvis du ønsker at gjentakende fakturaer skal genereres
 ModuleCompanyCodeAquarium=Velger en regnskapskode bygget av: <br>%s etterfulgt av tredjeparts leverandørkode for en leverandør-regnskap kode,<br>%s etterfulgt av tredjepart kundekode for en kunde- regnskapkode.
 ModuleCompanyCodePanicum=Velg en tom regnskapskode
 ModuleCompanyCodeDigitaria=Regnskapskode avhenger av tredjepartskode. Koden består av karakteren "C" i første posisjon, etterfulgt av de første 5 tegnene i tredjepartskoden.
-Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
+Use3StepsApproval=Som standard må innkjøpsordrer opprettes og godkjennes av 2 forskjellige brukere (ett trinn/bruker for å opprette og ett trinn/bruker for å godkjenne. Merk at hvis brukeren har både tillatelse til å opprette og godkjenne, vil ett trinn/ bruker vil være nok). Du kan bruke dette alternativet for å innføre et tredje trinn/bruker godkjenning, hvis beløpet er høyere enn en spesifisert verdi (så vil 3 trinn være nødvendig: 1=validering, 2=første godkjenning og 3=andre godkjenning dersom beløpet er høyt nok). <br> Sett denne tom en godkjenning (2 trinn) er nok, sett den til en svært lav verdi (0,1) hvis det alltid kreves en andre godkjenning (3 trinn).
 UseDoubleApproval=Bruk 3-trinns godkjennelse når beløpet (eks. MVA) er høyere enn...
 WarningPHPMail=ADVARSEL: Noen e-postleverandører (som Yahoo) tillater deg ikke å sende en e-post fra en annen server enn Yahoo-serveren hvis e-postadressen benyttes som avsender er din Yahoo e-post (som myemail@yahoo.com, myemail@yahoo.fr, ...). Ditt nåværende oppsett bruker serveren til programmet til å sende e-post, så noen mottakere (det ene er kompatible med den restriktive DMARC protokollen), vil be Yahoo om de kan ta imot e-post og Yahoo vil svare "nei" fordi serveren er ikke en server eid av Yahoo, så flere av dine sendte e-poster kan ikke aksepteres. <br> Hvis e-postleverandøren (som Yahoo) har denne begrensningen, må du endre e-post-oppsett for å velge den andre metoden "SMTP server" og skriv inn SMTP-server og legitimasjon som tilbys av e-postleverandøren (be e-postleverandøren om å få SMTP-legitimasjon for kontoen din).
 ClickToShowDescription=Klikk for å vise beskrivelse
+DependsOn=Denne modulen trenger modulen(ene)
+RequiredBy=Denne modulen er påkrevd av modul(ene)
+TheKeyIsTheNameOfHtmlField=Dette er navnet på HTML-feltet. Dette må ha tekniske egenskaper for å lese innholdet på HTML-siden for å få nøkkelnavnet til et felt.
+PageUrlForDefaultValues=Du må skrive inn den relative nettadressen til siden. Hvis du inkluderer parametere i URL, vil standardverdiene være effektive hvis alle parametere er satt til samme verdi. Eksempler:
+PageUrlForDefaultValuesCreate=<br> For skjema for å opprette en ny tredjepart, er den <strong> %s</strong>
+PageUrlForDefaultValuesList=<br> For side som viser tredjeparter, er den <strong> %s</strong>
+EnableDefaultValues=Aktiver bruk av personlige standardverdier
+EnableOverwriteTranslation=Aktiver bruk av overskrivende oversettelse
+GoIntoTranslationMenuToChangeThis=En oversettelse har blitt funnet for nøkkelen med denne koden, så for å endre denne verdien må du redigere den fra Home-Setup-Oversettelse.
+WarningSettingSortOrder=Advarsel, å angi en standard sorteringsrekkefølge kan føre til en teknisk feil når du går på listesiden dersom feltet er et ukjent felt. Hvis du opplever en slik feil, kan du komme tilbake til denne siden for å fjerne standard sorteringsrekkefølge og gjenopprette standardoppførsel.
+Field=Felt
+ProductDocumentTemplates=Dokumentmaler for å generere produktdokument
+FreeLegalTextOnExpenseReports=Fri juridisk tekst på utgiftsrapporter
+WatermarkOnDraftExpenseReports=Vannmerke på utgiftsrapport-maler
 # Modules
 Module0Name=Brukere & grupper
-Module0Desc=Users / Employees and Groups management
+Module0Desc=Håndtering av Brukere/Ansatte og Grupper
 Module1Name=Tredjeparter
 Module1Desc=Behandling av bedrifter og kontaktpersoner
 Module2Name=Handel
@@ -444,7 +466,7 @@ Module30Desc=Behandling av fakturaer og kreditnotaer for kunder. Fakturabehandli
 Module40Name=Leverandører
 Module40Desc=Behandling av innkjøp og leverandører (ordre og fakturaer)
 Module42Name=Logger
-Module42Desc=Loggefunksjoner (fil,syslog,...)
+Module42Desc=Loggfunksjoner (fil, syslog, ...). Slike logger er for tekniske/feilsøkingsformål.
 Module49Name=Redigeringsprogram
 Module49Desc=Behandling av redigeringsprogram
 Module50Name=Varer
@@ -499,8 +521,8 @@ Module410Name=Webkalender
 Module410Desc=Integrasjon med webkalender
 Module500Name=Spesielle utgifter
 Module500Desc=Behandling av spesielle utgifter (skatter og avgifter, utbytte mm)
-Module510Name=Arbeidskontrakter og lønn
-Module510Desc=Håndtering av arbeidskontrakter, lønn og utbetalinger
+Module510Name=Betaling av lønn til ansatte
+Module510Desc=Legg inn og følg betalingen av ansattes lønn
 Module520Name=Lån
 Module520Desc=Administrering av lån
 Module600Name=Varselmeldinger
@@ -526,7 +548,7 @@ Module2200Desc=Aktiver mulighet for matematiske utrykk for å beregne priser
 Module2300Name=Cron
 Module2300Desc=Behandling av planlagte oppgaver
 Module2400Name=Hendelser/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Desc=Følg utførte og kommende hendelser. La applikasjonen logge hendelser automatisk for sporingsformål .
 Module2500Name=Elektronisk Innholdshåndtering-ECM
 Module2500Desc=Lagre og dele dokumenter
 Module2600Name=API/Web tjenseter(SOAP server)
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind konverteringsegenskaper
 Module3100Name=Skype
 Module3100Desc=Legg til en Skype-knapp i brukere/tredjeparter/kontakter/medlemskort
+Module3200Name=Ikke reversible logger
+Module3200Desc=Aktiver logg av enkelte forretningshendelser i en ikke reversibel logg. Hendelser arkiveres i sanntid. Loggen er en tabell med kjedede hendelser som kan leses og eksporteres. Denne modulen kan være obligatorisk for enkelte land.
 Module4000Name=HRM
-Module4000Desc=Human resources management
+Module4000Desc=HRM (avdeling av avdeling, arbeidskontrakter og følelser)
 Module5000Name=Multi-selskap
 Module5000Desc=Lar deg administrere flere selskaper
 Module6000Name=Arbeidsflyt
@@ -591,8 +615,8 @@ Permission32=Opprett/endre varer
 Permission34=Slett varer
 Permission36=Se/administrer skjulte varer
 Permission38=Eksporter varer
-Permission41=Les prosjekter og oppgaver (delte prosjekter og de jeg er kontakt for). Her kan du også legge inn tidsbruk på tildelte oppgaver (timelister)
-Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
+Permission41=Les prosjekter og oppgaver (delt prosjekt og prosjekter jeg er kontakt for). Kan også skrive inn tidsforbruk for meg eller mitt hierarki, på tildelte oppgaver (Tidsskjema)
+Permission42=Opprett/endre prosjekter (delte prosjekter og de jeg er kontakt for). Kan også opprette oppgaver og tildele prosjekter og oppgaver til brukere.
 Permission44=Slett prosjekter (delte og mine egne)
 Permission45=Eksporter prosjekter
 Permission61=Vis intervensjoner
@@ -695,7 +719,7 @@ PermissionAdvanced253=Opprett/endre interne/eksterne brukere og tillatelser
 Permission254=Slette eller deaktivere andre brukere
 Permission255=Opprett/endre egen brukerinformasjon
 Permission256=Slett eller deaktiver andre brukere
-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 assignement matters).
+Permission262=Utvid tilgangen til alle tredjeparter (ikke bare tredjeparter der brukeren er en salgsrepresentant).<br>Virker ikke på eksterne brukere (alltid begrenset til egne tilbud, ordre, fakturaer, kontrakter mm).<br>Virker ikke på prosjekter (kun regler for prosjekttillatelser, synlighet og tildeling gjelder).
 Permission271=Vis CA
 Permission272=Vis fakturaer
 Permission273=Opprett fakturaer
@@ -842,14 +866,16 @@ DictionaryStaff=Stab
 DictionaryAvailability=Leveringsforsinkelse
 DictionaryOrderMethods=Ordremetoder
 DictionarySource=Tilbud/ordre-opprinnelse
-DictionaryAccountancyCategory=Accounting account groups
+DictionaryAccountancyCategory=Regnskapskonto-grupper
 DictionaryAccountancysystem=Diagram-modeller for kontoer
+DictionaryAccountancyJournal=Regnskapsjournaler
 DictionaryEMailTemplates=E-postmaler
 DictionaryUnits=Enheter
 DictionaryProspectStatus=Prospektstatus
 DictionaryHolidayTypes=Ferietyper
 DictionaryOpportunityStatus=Mulighet-status for prosjekt
 SetupSaved=Innstillinger lagret
+SetupNotSaved=Oppsettet er ikke lagret
 BackToModuleList=Tilbake til moduloversikt
 BackToDictionaryList=Tilbake til ordliste
 VATManagement=MVA-håndtering
@@ -897,7 +923,7 @@ Offset=Forskyvning
 AlwaysActive=Alltid aktiv
 Upgrade=Oppgrader
 MenuUpgrade=Oppgrader/Utvid
-AddExtensionThemeModuleOrOther=Deploy/install external module
+AddExtensionThemeModuleOrOther=Installer ekstern modul
 WebServer=Webserver
 DocumentRootServer=Webserverens rotkatalog
 DataRootServer=Mappe for datafiler
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Standard maks.lengde for lister
 DefaultMaxSizeShortList=Standard maxlengde for korte lister (f.eks på kundekort)
 MessageOfDay=Dagens melding
 MessageLogin=Meldingstekst på innloggingsbildet
+LoginPage=Innloggingsside
+BackgroundImageLogin=Bakgrunnsbilde
 PermanentLeftSearchForm=Permanent søkeskjema i venstre meny
 DefaultLanguage=Ønsket standardspråk (språkkode)
 EnableMultilangInterface=Aktiver flerspråklig grensesnitt
 EnableShowLogo=Vis logo i venstre meny
-CompanyInfo=Firma/organisasjonsinformasjon
-CompanyIds=Firma/organisasjons IDer
+CompanyInfo=Firma-/organisasjonsinformasjon
+CompanyIds=Firma-/organisasjonsidentiteter
 CompanyName=Navn
 CompanyAddress=Adresse
 CompanyZip=Postnummer
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Forsinkelsestoleranse (i dager) før varsel om forsink
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Forsinkelsestoleranse (i dager) før varsel om sjekker som må settes inn i bank
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tillatt forsinkelse (i dager) før varsel om at utgiftsrapport skal godkjennes
 SetupDescription1=Oppsettområdet er for førstegangsparametre før du begynner å bruke Dolibarr.
-SetupDescription2=De to viktigste konfigureringstrinnene er de to første i oppsettmenyen til venstre: Firma/Organisasjon-oppsettside og siden for moduloppsett:
-SetupDescription3=Parametre i menyen <a href="%s"> Oppsett -> Firma/Organisasjon</a> er nødvendig fordi innsendte data brukes i Dolibarr-visninger og for å tilpasse standard virkemåte for programvaren (for lands-relaterte funksjoner for eksempel) .
-SetupDescription4=Parametre i menyen <a href="%s"> Oppsett -> Moduler </a> kreves fordi Dolibarr ikke er en monolittisk ERP/CRM, men en samling av flere moduler, alle mer eller mindre uavhengig. Nye funksjoner vil bli lagt til menyer for hver modul du aktiverer.
+SetupDescription2=De to obligatoriske oppsettstrinnene er de to første i oppsettmenyen til venstre: %s oppsettside og %s oppsettside:
+SetupDescription3=Parametre i menyen <a href="%s"> %s -> %s </a> kreves fordi definerte data brukes på Dolibarr-skjermer og for å tilpasse standardoppførselen til programvaren (for eksempel landrelaterte funksjoner).
+SetupDescription4=Parametre i menyen <a href="%s"> %s -> %s </a> kreves fordi Dolibarr ERP/CRM er en samling av flere moduler/applikasjoner, alle mer eller mindre uavhengige. Nye funksjoner blir lagt til i menyene for hver modul du vil aktivere.
 SetupDescription5=Administrere andre menyoppføringers valgfrie parametre.
 LogEvents=Hendelser relatert til sikkerhet
 Audit=Revisjon
@@ -987,7 +1015,7 @@ BrowserOS=Nettleserens operativsystem
 ListOfSecurityEvents=Oversikt over sikkerhetshendelser i Dolibarr
 SecurityEventsPurged=Sikkerhetshendelser renset
 LogEventDesc=Her kan du slå på loggen for sikkerhetshendelser i Dolibarr. Administratorer kan da se innholdet i loggene via menyen <b>Systemverktøy - Revisjon</b>. OBS! Denne funksjonen kan ta opp mye plass i databasen!
-AreaForAdminOnly=Disse funksjonene kan bare brukes av <b>administratorer</b>.
+AreaForAdminOnly=Oppsettparametere kan bare angis av <b> administratorbrukere </b>.
 SystemInfoDesc=Systeminformasjon er diverse teknisk informasjon som kun vises i skrivebeskyttet modus, og som kun er synlig for administratorer.
 SystemAreaForAdminOnly=Dette området er bare tilgjengelig for administratorer. Ingen av tillatelsene i Dolibarr kan senke denne grensen.
 CompanyFundationDesc=Her kan du legge inn informasjon om firmaet eller organisasjonen din (klikk på "Endre"- eller "Lagre"-knappen i bunnen av siden)
@@ -1004,7 +1032,7 @@ TriggerAlwaysActive=Utløserne i denne filen er alltid slått på, uansett hvilk
 TriggerActiveAsModuleActive=Utløserne i denne filen er slått på ettersom modulen <b>%s</b> er slått på.
 GeneratedPasswordDesc=Her angir du hvilken regel som skal generere nye passord dersom du ber om å ha automatisk opprettede passord
 DictionaryDesc=Sett alle referansedata. Du kan legge til dine verdier som standard.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">check here</a>.
+ConstDesc=Denne siden lar deg redigere alle andre parametere som ikke finnes på foregående sidene. Disse er stort sett forbeholdt parametere for utviklere eller avansert feilsøking. For en liste over alternativer <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">klikk her</a>.
 MiscellaneousDesc=Alle andre sikkerhetsrelaterte parametre er definert her.
 LimitsSetup=Grenser/presisjon
 LimitsDesc=Her angir du grenser og presisjon som skal brukes i programmet
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Gjeldende oversettelsesstreng
 WarningAtLeastKeyOrTranslationRequired=Et søkekriterie er nødvendig for nøkkel eller oversettelsesstreng
 NewTranslationStringToShow=Ny oversettelsesstreng som skal vises
 OriginalValueWas=Den originale oversettelsen er overskrevet. Original verdi var:<br><br>%s
-TotalNumberOfActivatedModules=Totalt antall aktiverte moduler: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=Du tvang en ny oversettelse for oversettelsesnøkkelen '<strong> %s</strong>' som ikke finnes i noen språkfiler
+TotalNumberOfActivatedModules=Aktiverte applikasjoner/moduler: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Du må minst aktivere en modul
 ClassNotFoundIntoPathWarning=Klasse %s ikke funnet i PHP banen
 YesInSummer=Ja i sommer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Merk, bare følgende moduler blir åpnet for eksterne brukere (uansett tidligere tillatelser gitt disse brukerene) og bare hvis tillatelser ble gitt:
 SuhosinSessionEncrypt=Session lagring kryptert av Suhosin
 ConditionIsCurrently=Tilstand er for øyeblikket %s
 YouUseBestDriver=Du bruker driveren %s, som er den beste tilgjengelige for øyeblikket.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Regler for profesjonell ID
 MustBeUnique=Må være unik?
 MustBeMandatory=Obligatorisk å opprette tredjeparter?
 MustBeInvoiceMandatory=Obligatorisk å validere fakturaer?
+TechnicalServicesProvided=Tekniske tjenester som tilbys
 ##### Webcal setup #####
 WebCalUrlForVCalExport=En eksportlenke til <b>%s</b> formatet er tilgjengelig på følgende lenke: %s
 ##### Invoices #####
 BillsSetup=Innstillinger for fakturamodul
 BillsNumberingModule=Nummereringsmodul for fakturaer og kreditnotaer
 BillsPDFModules=Fakturamaler
+PaymentsPDFModules=Betalingsdokumentmodeller
 CreditNote=Kreditnota
 CreditNotes=Kreditnotaer
 ForceInvoiceDate=Tving fakturadato til godkjenningsdato
@@ -1162,7 +1193,7 @@ WatermarkOnDraftSupplierProposal=Vannmerke på kladder på prisforespørsler lev
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Spør om bankkonto på prisforespørsel
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Spør om Lagerkilde for ordre
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Be om bankkonto for leverandørordre
 ##### Orders #####
 OrdersSetup=Innstillinger for ordre
 OrdersNumberingModules=Nummereringsmodul for ordre
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Filtypene %s er ikke cachet av HTTP-server
 FilesOfTypeCompressed=Filtypene %s er undertrykket av HTTP-server
 FilesOfTypeNotCompressed=Filtypene %s er ikke undertrykket av HTTP-server
 CacheByServer=Server-cache
+CacheByServerDesc=For eksempel ved å bruk Apache-direktivet "ExpiresByType image/gif A2592000"
 CacheByClient=Nettleser-cache
 CompressionOfResources=Undertrykkelse av HTTP-respons
+CompressionOfResourcesDesc=For eksempel ved bruk av Apache-direktivet "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=En slik automatisk deteksjon er ikke mulig med nåværende nettlesere
+DefaultValuesDesc=Her kan du definere/tvinge standardverdien du vil ha når du oppretter en ny post, og/eller standardfiltre eller sorteringsrekkefølge når du lister poster.
+DefaultCreateForm=Standardverdier for nye objekter
+DefaultSearchFilters=Standard søkefiltre
+DefaultSortOrder=Standard sorteringsorden
+DefaultFocus=Standard fokusfelt
 ##### Products #####
 ProductSetup=Innstillinger for varemodul
 ServiceSetup=Oppsett av tjenester-modulen
@@ -1339,7 +1377,7 @@ ViewProductDescInFormAbility=Visualisering av varebeskrivelser i skjemaer (eller
 MergePropalProductCard=I "Vedlagte filer"-fanen i "Varer og tjenester" kan du aktivere en opsjon for å flette PDF-varedokument til tilbud PDF-azur hvis varen/tjenesten er i tilbudet
 ViewProductDescInThirdpartyLanguageAbility=Visualisering av varebeskrivelser i tredjepartens språk
 UseSearchToSelectProductTooltip=Hvis du har mange varer (>100 000), kan du øke hastigeten ved å sette konstanten PRODUCT_DONOTSEARCH_ANYWHERE til 1 i Oppsett->Annet. Søket vil da begrenses til starten av søkestrengen
-UseSearchToSelectProduct=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=Vent med å trykke på en tast før innholdet av vare-kombinasjonslisten er lastet (Dette kan øke ytelsen hvis du har mange varer)
 SetDefaultBarcodeTypeProducts=Standard strekkodetype for varer
 SetDefaultBarcodeTypeThirdParties=Standard strekkodetype for tredjeparter
 UseUnits=Definer måleenhet for kvantitet ved opprettelse av ordre, tilbud eller faktura
@@ -1397,7 +1435,7 @@ SendingsSetup=Oppsett av forsendelsesmodulen
 SendingsReceiptModel=Modell for forsendelseskvitteringer
 SendingsNumberingModules=Nummereringsmodell for for sendelser
 SendingsAbility=Støtt forsendelsesskjemaer for kundeleveranser
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
+NoNeedForDeliveryReceipts=I de fleste tilfeller er forsendelsesskjemaer bruket både som skjema for kundeleveranser (liste over varer som skal sendes) og skjema som er mottatt og signert av kunden. Så produktleveranse-kvitteringer er en duplisert funksjon og er sjelden aktivert.
 FreeLegalTextOnShippings=Fritekst på leveringer
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Nummereringsmodul for vareleveringskvitteringer
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Fakturadatoen brukes
 Buy=Kjøp
 Sell=Selg
 InvoiceDateUsed=Fakturadatoen brukes
-YourCompanyDoesNotUseVAT=Firmaet ditt har blitt definert for å ikke bruke moms (Home - Setup - Firma / Foundation), så det er ingen moms alternativer for oppsett.
+YourCompanyDoesNotUseVAT=Ditt firma er definert for å ikke bruke MVA (Hjem - Oppsett - Firma / Organisasjon), så det er ingen MVA-alternativer å sette opp.
 AccountancyCode=Regnskapskode
 AccountancyCodeSell=Kontokode for salg
 AccountancyCodeBuy=Kontokode for innkjøp
@@ -1477,11 +1515,12 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Sett denne standardverdien automatisk for hendelse
 AGENDA_DEFAULT_FILTER_TYPE=Sett denne hendelsestypen automatisk i søkefilteret til Agenda-visning
 AGENDA_DEFAULT_FILTER_STATUS=Sett denne statustypen automatisk i søkefilteret til Agenda-visning
 AGENDA_DEFAULT_VIEW=Hvilken fane vil åpne som standard når du velger Agenda-menyen?
-AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
+AGENDA_NOTIFICATION=Aktiver hendelsesvarsling på brukernes nettlesere når hendelsesdatoen er nådd (hver bruker kan nekte dette fra sin nettleser)
 AGENDA_NOTIFICATION_SOUND=Aktiver lydvarsler
+AGENDA_SHOW_LINKED_OBJECT=Vis koblet objekt i agendavisning
 ##### Clicktodial #####
 ClickToDialSetup='Click To Dial' modul
-ClickToDialUrlDesc=URL som kalles når man klikker på telefonikonet. I URL, kan du bruke koder <br> <b> __ PHONETO __ </b> som vil bli erstattet med telefonnummeret til personen du vil ringe <br> <b> __ PHONEFROM __ </b> som vil bli erstattet med telefonnummer for å ringe person (din) <br> <b> __ lOGG __ </b> som vil bli erstattet med clicktodial innlogging (definert på brukerkort ) <br> <b> __ PASS __ </b> som vil bli erstattet med clicktodial passord (defineres på brukerkort ).
+ClickToDialUrlDesc=Url som kalles når man klikker på telefonpiktogrammet. I URL kan du bruke koder <br> <b> __ PHONETO __ </b> som blir erstattet med telefonnummeret til personen som skal ringes <br> <b> __ PHONEFROM __ </b> som blir erstattet med telefonnummeret til den som ringer(din) <br> <b> __ LOGIN __ </b> som vil bli erstattet med clicktodial login (definert på brukerkort) <br> <b> __ PASS __ </b> som vil bli erstattet med clicktodial passord (definert på brukerkort).
 ClickToDialDesc=Denne modulen gjør telefonnumre klikkbare. Ved å klikke på dette ikonet vil telefonen din ringe opp nummeret.
 ClickToDialUseTelLink=Bruk kun en lenke "tlf:" for telefonnumre
 ClickToDialUseTelLinkDesc=Bruk denne metoden hvis brukerne har en softphone eller et programvaregrensesnitt installert på samme datamaskin som nettleseren, og kalles når du klikker på en link i nettleseren din som starter med "tel:". Hvis du trenger en full server-løsning (uten behov for lokal installasjon av programvare), må du sette denne på "Nei" og fylle neste felt.
@@ -1509,11 +1548,11 @@ EndPointIs=SOAP-klienter må sende sine forespørsler til Dolibarr endepunkt til
 ##### API ####
 ApiSetup=Oppsett av API-modul
 ApiDesc=Ved å  aktivere denne modulen, blir Dolibarr en REST-server for diverse web-tjenester
-ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=Du kan utforske API'ene i URL
+ApiProductionMode=Aktiver produksjonsmodus (dette vil aktivere bruk av en buffer for tjenestehåndtering)
+ApiExporerIs=Du kan utforske og teste API'ene på URL
 OnlyActiveElementsAreExposed=Bare elementer fra aktiverte moduler er vist
 ApiKey=API-nøkkel
-WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
+WarningAPIExplorerDisabled=API utforsker er deaktivert. API utforsker er ikke nødvendig for bruke API tjenester. Det er et verktøy for utviklere å finne/teste REST API-er. Hvis du trenger dette verktøyet, kan du gå inn i oppsett av modulen API REST og aktivere den.
 ##### Bank #####
 BankSetupModule=Oppsett av Bankmodulen
 FreeLegalTextOnChequeReceipts=Fritekst på å sjekkvitteringer
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=Generell visningsrekkefølge
 BankOrderES=Spansk
 BankOrderESDesc=Spansk visningsrekkefølge
 ChequeReceiptsNumberingModule=Nummereringsmodul for sjekk-kvitteringer
-
 ##### Multicompany #####
 MultiCompanySetup=Oppsett av multi-selskap-modulen
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ BackupDumpWizard=Veiviser for å bygge database-backup dumpfil
 SomethingMakeInstallFromWebNotPossible=Installasjon av ekstern modul er ikke mulig fra webgrensesnittet på grunn av:
 SomethingMakeInstallFromWebNotPossible2=På grunn av dette, er prosessen for å oppgradere beskrevet her, bare manuelle trinn en privilegert bruker kan gjøre.
 InstallModuleFromWebHasBeenDisabledByFile=Administrator har deaktivert muligheten for å installere eksterne moduler. Administrator må fjerne filen <strong>%s</strong> for å tillate dette.
-ConfFileMuseContainCustom=Installing 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=Ved installering eller bygging av en ekstern modul fra programmet må modulfilene lagres i katalogen <strong> %s</strong>. Hvis du vil ha denne katalogen behandlet av Dolibarr, må du sette opp <strong> conf/conf.php</strong> for å legge til 2 direktivlinjer: <br><strong> $dolibarr_main_url_root_alt = '/custom'; </strong><br><strong> $dolibarr_main_document_root_alt = '%s/custom'; </strong>
 HighlightLinesOnMouseHover=Fremhev tabellinjer når musen flyttes over
 HighlightLinesColor=Uthev fargen på linjen når musen føres over (holdes tom for ingen uthevning)
 TextTitleColor=Farge på sidetittel
 LinkColor=Farge på lenker
-PressF5AfterChangingThis=Trykk F5 eller slett nettleserens cache for at endringene skal tre i kraft
+PressF5AfterChangingThis=Trykk CTRL+F5 på tastaturet eller tøm nettlesercache når du har endret denne verdien for å få den til å fungere effektivt
 NotSupportedByAllThemes=Vil virke med kjernetemaer, vil kanskje ikke virke med eksterne temaer
 BackgroundColor=Bakgrunnsfarge
 TopMenuBackgroundColor=Bakgrunnsfarge for toppmeny
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Frist for beskjed (Feriesøknaden må sendes inn før denne
 NbAddedAutomatically=Antall dager pr. måned som blir lagt til av brukerenes tellere(automatisk)
 EnterAnyCode=Dette feltet inneholder en referanse til identifikasjon av linje. Bruk kun verdier uten spesialkarakterer
 UnicodeCurrency=Her legger du inn en liste med Ascii-verdier, som representerer et valutasymbol. For eksempel: $ = [36], Brasilsk real R$ = [82,36], € = [8364]
+ColorFormat=RGB-fargen er i HEX-format, for eksempel: FF0000
 PositionIntoComboList=Plassering av linje i kombinasjonslister
 SellTaxRate=Salgs-skattesats
 RecuperableOnly=Ja for MVA "Non Perçue Récupérable", gjelder kun Frankrike. Nei i alle andre tilfeller.
@@ -1612,7 +1651,7 @@ FixTZ=Tidssone offset
 FillFixTZOnlyIfRequired=Eksempel: +2 (fylles kun ut ved problemer)
 ExpectedChecksum=Forventet sjekksum
 CurrentChecksum=Gjeldende sjekksum
-ForcedConstants=Required constant values
+ForcedConstants=Obligatoriske konstante verdier
 MailToSendProposal=For å sende tilbud
 MailToSendOrder=For å sende kundeordre
 MailToSendInvoice=For å sende kundefaktura
@@ -1624,11 +1663,11 @@ MailToSendSupplierInvoice=For å sende leverandørfaktura
 MailToSendContract=For å sende en kontrakt
 MailToThirdparty=For å sende epost fra tredjepart-side
 ByDefaultInList=Vis som standard for liste
-YouUseLastStableVersion=You use the latest stable version
+YouUseLastStableVersion=Du bruker siste stabile versjon
 TitleExampleForMajorRelease=Eksempel på melding du kan bruke for å annonsere større oppdateringer (du kan bruke denne på dine websider)
 TitleExampleForMaintenanceRelease=Eksempel på beskjed du kan bruke for å annonsere denne vedlikeholdsversjonen (du kan bruke den på dine websider)
-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.
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s er tilgjengelig. Versjon %s er en stor utgivelse med en rekke nye funksjoner for både brukere og utviklere. Du kan laste ned fra nedlastingsområdet https://www.dolibarr.org portal (underkatalog Stabile versjoner). Du kan lese <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">Endringslogg</a> for en komplett liste over endringer.
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s er tilgjengelig. Versjon %s er en vedlikeholdsversjon, så den inneholder bare reparasjoner av bugs. Vi anbefaler alle å bruke en eldre versjon for å oppgradere til denne. Som enhver vedlikeholdsutgivelse, er det ingen nye funksjoner, eller datastruktur-endringer i denne versjonen. Du kan laste ned fra nedlastingsområdet https://www.dolibarr.org portal (underkatalog Stabile versjoner). Du kan lese <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">Endringslogg</a> for en komplett liste over endringer.
 MultiPriceRuleDesc=Når alternativet "Flere prisnivået per vare/tjeneste" er på, kan du definere forskjellige priser (ett pr prisnivå) for hvert produkt. For å spare tid, kan du lage en regel som gir pris for hvert nivå autokalkulert i forhold til prisen på første nivå, slik at du bar legger inn en pris for hvert produkt. Denne siden er laget for å spare tid og kan være nyttig hvis prisene for hvert nivå står i forhold til første nivå. Du kan ignorere denne siden i de fleste tilfeller.
 ModelModulesProduct=Maler for produkt-dokumenter
 ToGenerateCodeDefineAutomaticRuleFirst=For å være i stand til å generere automatiske koder, må du først definere program for å automatisk definere strekkodenummer.
@@ -1649,17 +1688,21 @@ AddOtherPagesOrServices=Legg til andre sider eller tjenester
 AddModels=Legg til dokument eller nummereringsmaler
 AddSubstitutions=Legg til tast-erstatninger
 DetectionNotPossible=Detektering ikke mulig
-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 til API-nøkkel (når nøkkel er mottatt blir den lagret på databasebruker-tabell og må brukes for hvert API-kall)
 ListOfAvailableAPIs=Liste over tilgjengelige API'er
 activateModuleDependNotSatisfied=Modul "%s" avhenger av modulen "%s", som mangler, slik at modulen "%1$s" kanskje ikke virker korrekt. Installer modulen "%2$s" eller deaktiver modulen "%1$s" hvis du vil unngå ubehagelige overraskelser
 CommandIsNotInsideAllowedCommands=Kommandoen du prøver å kjøre er ikke i listen over tillatte kommandoer definert i parameter <strong>$dolibarr_main_restrict_os_commands</strong> i <strong>conf.php</strong> filen.
 LandingPage=Landingsside
 SamePriceAlsoForSharedCompanies=Hvis du bruker en multiselskapsmodul, og har valgt "En pris", vil prisen være den samme for alle selskaper om varene er delt mellom miljøer
-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.
+ModuleEnabledAdminMustCheckRights=Modulen er aktivert. Tillatelser for aktiverte module(r) ble kun gitt til admin-brukere. Du må kanskje gi tillatelser til andre brukere eller grupper manuelt om nødvendig.
 UserHasNoPermissions=Denne brukeren har ingen tillatelser
 TypeCdr=Bruk "Ingen" hvis dato for betalingsfrist er fakturadato pluss en delta i dager (delta er feltet "Antall dager")<br>Bruk "På slutten av måneden", dersom det etter delta, at dato må økes for å komme til slutten av måneden (+ en valgfri "Offset" i dager)<br>Bruk "Nåværene/Neste" for å få betalingsdato til å være den første N-te i måneden (N lagres i feltet "Antall dager")
+BaseCurrency=Referansevaluta for selskapet (gå inn i oppsett av firma for å endre dette)
+WarningNoteModuleInvoiceForFrenchLaw=Denne modulen %s er i samsvar med franske lover (Loi Finance 2016).
+WarningNoteModulePOSForFrenchLaw=Denne modulen %s er i samsvar med franske lover (Loi Finance 2016) fordi modulen Ikke reversible logger er automatisk aktivert.
+WarningInstallationMayBecomeNotCompliantWithLaw=Du prøver å installere modulen %s som er en ekstern modul. Aktivering av en ekstern modul betyr at du stoler på utgiveren av modulen, og at du er sikker på at denne modulen ikke endrer oppførselen til applikasjonen din negativt, og er i overensstemmelse med lovene i ditt land (%s). Hvis modulen gir en ulovlig funksjon, blir du ansvarlig for bruken av en ulovlig programvare.
 ##### Resource ####
-ResourceSetup=Configuration du module Resource
-UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+ResourceSetup=Oppsett av Ressursmodulen
+UseSearchToSelectResource=Bruk et søkeskjema for å velge en ressurs (i stedet for en nedtrekksliste).
+DisabledResourceLinkUser=Deaktivert ressurslink til bruker
+DisabledResourceLinkContact=Deaktivert ressurslink til kontakt
diff --git a/htdocs/langs/nb_NO/agenda.lang b/htdocs/langs/nb_NO/agenda.lang
index f8492204fa1..879be9bcce2 100644
--- a/htdocs/langs/nb_NO/agenda.lang
+++ b/htdocs/langs/nb_NO/agenda.lang
@@ -2,6 +2,7 @@
 IdAgenda=Hendelses-ID
 Actions=Handlinger
 Agenda=Agenda
+TMenuAgenda=Agenda
 Agendas=Agendaer
 LocalAgenda=Intern kalender
 ActionsOwnedBy=Hendelse tilhører
@@ -47,12 +48,13 @@ InvoiceDeleteDolibarr=Faktura %s slettet
 InvoicePaidInDolibarr=Faktura %s endret til betalt
 InvoiceCanceledInDolibarr=Faktura %s kansellert
 MemberValidatedInDolibarr=Medlem %s validert
+MemberModifiedInDolibarr=Medlem %s endret
 MemberResiliatedInDolibarr=Medlem %s terminert
 MemberDeletedInDolibarr=Medlem %s slettet
 MemberSubscriptionAddedInDolibarr=Abonnement for medlem %s lagt til
 ShipmentValidatedInDolibarr=Leveranse %s validert
-ShipmentClassifyClosedInDolibarr=Levering %s klassifisert som fakturert
-ShipmentUnClassifyCloseddInDolibarr=Levering %s klassifisert som gjenåpnet
+ShipmentClassifyClosedInDolibarr=Forsendelse %s klassifisert fakturert
+ShipmentUnClassifyCloseddInDolibarr=Forsendelse %s klassifisert gjenåpnet
 ShipmentDeletedInDolibarr=Leveranse %s slettet
 OrderCreatedInDolibarr=Ordre %s opprettet
 OrderValidatedInDolibarr=Ordre %s validert
@@ -74,6 +76,7 @@ ProposalDeleted=Tilbud slettet
 OrderDeleted=Ordre slettet
 InvoiceDeleted=Faktura slettet
 ##### End agenda events #####
+AgendaModelModule=Dokumentmaler for hendelse
 DateActionStart=Startdato
 DateActionEnd=Sluttdato
 AgendaUrlOptions1=Du kan også bruke følgende parametere til å filtrere listen:
diff --git a/htdocs/langs/nb_NO/banks.lang b/htdocs/langs/nb_NO/banks.lang
index e2af0d1a3c2..2caee4fc8b8 100644
--- a/htdocs/langs/nb_NO/banks.lang
+++ b/htdocs/langs/nb_NO/banks.lang
@@ -66,6 +66,7 @@ RemoveFromRubriqueConfirm=Er du sikker på at du vil fjerne lenken mellom oppfø
 ListBankTransactions=Liste over bankoppføringer
 IdTransaction=Transaksjons-ID
 BankTransactions=Bankoppføringer
+BankTransaction=Bankoppføring
 ListTransactions=List oppføringer
 ListTransactionsByCategory=List oppføringer/kategori
 TransactionsToConciliate=Oppføringer til avstemming
@@ -74,13 +75,13 @@ Conciliate=Avstem
 Conciliation=Avstemming
 ReconciliationLate=Avstemming forsinket
 IncludeClosedAccount=Ta med lukkede konti
-OnlyOpenedAccount=Bare åpne konti
+OnlyOpenedAccount=Kun åpne konti
 AccountToCredit=Konto å kreditere
 AccountToDebit=Konto å debitere
 DisableConciliation=Slå av avstemmingsfunksjon for denne kontoen
 ConciliationDisabled=Avstemmingsfunksjon slått av
 LinkedToAConciliatedTransaction=Lenket til en avstemt oppføring
-StatusAccountOpened=Åpnet
+StatusAccountOpened=Åpent
 StatusAccountClosed=Lukket
 AccountIdShort=Nummer
 LineRecord=Transaksjon
@@ -150,3 +151,7 @@ CheckRejectedAndInvoicesReopened=Returnert sjekk og faktura gjenåpnet
 BankAccountModelModule=Dokumentmaler for bankkontoer
 DocumentModelSepaMandate=Mal for SEPA-mandat. Gjelder kun EU.
 DocumentModelBan=Mal for å skrive ut en side med BAN-informasjon
+NewVariousPayment=Ny varierende betaling
+VariousPayment=Varierende betaling
+VariousPayments=Varierende betalinger
+ShowVariousPayment=Vis varierende betaling
diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang
index b2ad2eb4d96..6f6766ee038 100644
--- a/htdocs/langs/nb_NO/bills.lang
+++ b/htdocs/langs/nb_NO/bills.lang
@@ -5,9 +5,9 @@ BillsCustomers=Kundefakturaer
 BillsCustomer=Kundefaktura
 BillsSuppliers=Leverandørfakturaer
 BillsCustomersUnpaid=Ubetalte kundefakturaer
-BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsCustomersUnpaidForCompany=Ubetalte kundefakturaer for %s
 BillsSuppliersUnpaid=Ubetalte leverandørfakturaer
-BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
+BillsSuppliersUnpaidForCompany=Ubetalte leverandørfakturaer for %s
 BillsLate=Forfalte betalinger
 BillsStatistics=Kunde fakturastatistikker
 BillsStatisticsSuppliers=Leverandør fakturastatistikker
@@ -15,9 +15,9 @@ DisabledBecauseNotErasable=Deaktivert fordi den ikke kan slettes
 InvoiceStandard=Standardfaktura
 InvoiceStandardAsk=Standardfaktura
 InvoiceStandardDesc=Denne fakturatypen er den vanligste fakturaen.
-InvoiceDeposit=Innskuddsfaktura
-InvoiceDepositAsk=Innskuddsfaktura
-InvoiceDepositDesc=Denne typen faktura lages når et innskudd har blitt mottatt.
+InvoiceDeposit=Nedbetalingsfaktura
+InvoiceDepositAsk=Nedbetalingsfaktura
+InvoiceDepositDesc=Denne typen faktura lages når en forskuddsbetaling er mottatt.
 InvoiceProForma=Proforma faktura
 InvoiceProFormaAsk=Proforma faktura
 InvoiceProFormaDesc=<b>Proforma faktura</b> er et bilde av en ekte faktura, men har ingen verdi i regnskapsføring.
@@ -63,7 +63,7 @@ paymentInInvoiceCurrency=i faktura-valuta
 PaidBack=Tilbakebetalt
 DeletePayment=Slett betaling
 ConfirmDeletePayment=Er du sikker på at du vil slette denne betalingen?
-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.
+ConfirmConvertToReduc=Ønsker du å konvertere denne %s til en absolutt rabatt? <br> Beløpet vil bli lagret og kan brukes som en rabatt på en nåværende eller fremtidig faktura for denne kunden.
 SupplierPayments=Leverandørbetalinger
 ReceivedPayments=Mottatte betalinger
 ReceivedCustomersPayments=Betalinger mottatt fra kunder
@@ -78,7 +78,7 @@ PaymentMode=Betalingsmåte
 PaymentTypeDC=Debet/kredit-kort
 PaymentTypePP=PayPal
 IdPaymentMode=Betalingstype (ID)
-CodePaymentMode=Payment type (code)
+CodePaymentMode=Betalingstype (kode)
 LabelPaymentMode=Betalingstype (etikett)
 PaymentModeShort=Betalingstype
 PaymentTerm=Betalingsbetingelser
@@ -106,7 +106,7 @@ SendRemindByMail=E-postpåminnelse
 DoPayment=Legg inn betaling
 DoPaymentBack=Legg inn tilbakebetaling
 ConvertToReduc=Konverter til framtidig rabatt
-ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessReceivedToReduc=Konverterer for mye innbetalt til fremtidig rabatt
 EnterPaymentReceivedFromCustomer=Legg inn betaling mottatt fra kunde
 EnterPaymentDueToCustomer=Lag purring til kunde
 DisabledBecauseRemainderToPayIsZero=Slått av fordi restbeløpet er null
@@ -115,7 +115,7 @@ BillStatus=Fakturastatus
 StatusOfGeneratedInvoices=Status for genererte fakturaer
 BillStatusDraft=Kladd (må valideres)
 BillStatusPaid=Betalt
-BillStatusPaidBackOrConverted=Refund or converted into discount
+BillStatusPaidBackOrConverted=Kreditnota refusjon eller konvertert til rabatt
 BillStatusConverted=Betalt (klar for siste faktura)
 BillStatusCanceled=Tapsført
 BillStatusValidated=Validert (må betales)
@@ -126,8 +126,8 @@ BillStatusClosedUnpaid=Lukket (ubetalt)
 BillStatusClosedPaidPartially=Delbetalt
 BillShortStatusDraft=Kladd
 BillShortStatusPaid=Betalt
-BillShortStatusPaidBackOrConverted=Refund or converted
-BillShortStatusConverted=Behandlet
+BillShortStatusPaidBackOrConverted=Refundert eller konvertert
+BillShortStatusConverted=Betalt
 BillShortStatusCanceled=Tapsført
 BillShortStatusValidated=Validert
 BillShortStatusStarted=Startet
@@ -154,13 +154,13 @@ FoundXQualifiedRecurringInvoiceTemplate=Fant %s gjentagende-fakturamal(er) kvali
 NotARecurringInvoiceTemplate=Ikke en mal for gjentagende faktura
 NewBill=Ny faktura
 LastBills=Siste %s fakturaer
-LastCustomersBills=Latest %s customer invoices
-LastSuppliersBills=Latest %s supplier invoices
+LastCustomersBills=Siste %s kundefakturaer
+LastSuppliersBills=Siste %s leverandørfakturaer
 AllBills=Alle fakturaer
 OtherBills=Andre fakturaer
 DraftBills=Fakturakladder
 CustomersDraftInvoices=Kunde fakturamal
-SuppliersDraftInvoices=Supplier draft invoices
+SuppliersDraftInvoices=Leverandør-fakturamal
 Unpaid=Ubetalt
 ConfirmDeleteBill=Er du sikker på at du vil slette denne fakturaen?
 ConfirmValidateBill=Er du sikker på at du vil validere denne fakturaen med referanse <b>%s</b>?
@@ -198,16 +198,16 @@ ShowBill=Vis faktura
 ShowInvoice=Vis faktura
 ShowInvoiceReplace=Vis erstatningsfaktura
 ShowInvoiceAvoir=Vis kreditnota
-ShowInvoiceDeposit=Vis innskuddsfaktura
+ShowInvoiceDeposit=Vis nedbetalingsfaktura
 ShowInvoiceSituation=Vis delfaktura
 ShowPayment=Vis betaling
 AlreadyPaid=Allerede betalt
 AlreadyPaidBack=Allerede tilbakebetalt
-AlreadyPaidNoCreditNotesNoDeposits=Allerede betalt (uten kreditnotater og innskudd)
+AlreadyPaidNoCreditNotesNoDeposits=Allerede betalt (uten kreditnotater og nedbetalinger)
 Abandoned=Tapsført
 RemainderToPay=Restbeløp
 RemainderToTake=Restbeløp
-RemainderToPayBack=Remaining amount to refund
+RemainderToPayBack=Restbeløp å refundere
 Rest=Venter
 AmountExpected=Beløp purret
 ExcessReceived=Overskytende
@@ -270,11 +270,11 @@ RelativeDiscount=Relativ rabatt
 GlobalDiscount=Global rabatt
 CreditNote=Kreditnota
 CreditNotes=Kreditnotaer
-Deposit=Innskudd
-Deposits=Innskudd
+Deposit=Nedbetaling
+Deposits=Nedbetalinger
 DiscountFromCreditNote=Rabatt fra kreditnota %s
-DiscountFromDeposit=Betalinger fra innskuddsfaktura %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromDeposit=Nedbetalinger fra faktura %s
+DiscountFromExcessReceived=Overbetaling mottatt for faktura %s
 AbsoluteDiscountUse=Denne typen kreditt kan brukes på faktura før den godkjennes
 CreditNoteDepositUse=Fakturaen m valideres for å kunne bruke denne typen kredit
 NewGlobalDiscount=Ny absolutt rabatt
@@ -282,8 +282,8 @@ NewRelativeDiscount=Ny relativ rabatt
 NoteReason=Notat/Årsak
 ReasonDiscount=Årsak
 DiscountOfferedBy=Innrømmet av
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Rabatter tilgjengelig
+DiscountAlreadyCounted=Rabatter allerede gitt
 BillAddress=Fakturaadresse
 HelpEscompte=Denne rabatten er gitt fordi kunden betalte før forfall.
 HelpAbandonBadCustomer=Dette beløpet er tapsført (dårlig kunde) og betraktes som tap.
@@ -326,7 +326,7 @@ ListOfNextSituationInvoices=Liste over kommende delfakturaer
 FrequencyPer_d=Hver %s dag
 FrequencyPer_m=Hver %s måned
 FrequencyPer_y=Hver %s år
-toolTipFrequency=Examples:<br /><b>Set 7, Day</b>: give a new invoice every 7 days<br /><b>Set 3, Month</b>: give a new invoice every 3 month
+toolTipFrequency=Eksempler:<br /><b>Sett 7, Dag</b>: gir en faktura hver 7. dag<br /><b>Sett 3, Måned</b>: gir en ny faktura hver 3. måned
 NextDateToExecution=Dato for neste fakturagenerering
 DateLastGeneration=Dato for siste generering
 MaxPeriodNumber=Maks ant for fakturagenerering
@@ -336,12 +336,12 @@ InvoiceAutoValidate=Valider fakturaer automatisk
 GeneratedFromRecurringInvoice=Generert fra gjentagende-fakturamal %s
 DateIsNotEnough=Dato ikke nådd enda
 InvoiceGeneratedFromTemplate=Faktura %s generert fra gjentagende-fakturamal %s
-WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
-WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
+WarningInvoiceDateInFuture=Advarsel, fakturadato er høyere enn dagens dato
+WarningInvoiceDateTooFarInFuture=Advarsel, er fakturadato for langt fra dagens dato
 # PaymentConditions
 Statut=Status
-PaymentConditionShortRECEP=Due Upon Receipt
-PaymentConditionRECEP=Due Upon Receipt
+PaymentConditionShortRECEP=Forfall ved mottak
+PaymentConditionRECEP=Forfall ved mottak
 PaymentConditionShort30D=30 dager
 PaymentCondition30D=30 dager
 PaymentConditionShort30DENDMONTH=30 dager etter månedsslutt
@@ -358,12 +358,12 @@ PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% i forskudd, 50%% ved levering
 PaymentConditionShort10D=10 dager
 PaymentCondition10D=10 dager
-PaymentConditionShort10DENDMONTH=10 days of month-end
-PaymentCondition10DENDMONTH=Within 10 days following the end of the month
+PaymentConditionShort10DENDMONTH=10 dager etter månedens slutt
+PaymentCondition10DENDMONTH=Innen 10 dager etter slutten av måneden
 PaymentConditionShort14D=14 dager
 PaymentCondition14D=14 dager
-PaymentConditionShort14DENDMONTH=14 days of month-end
-PaymentCondition14DENDMONTH=Within 14 days following the end of the month
+PaymentConditionShort14DENDMONTH=14 dager etter månedens slutt
+PaymentCondition14DENDMONTH=Innen 14 dager etter slutten av måneden
 FixAmount=Fast beløp
 VarAmount=Variabelt beløp
 # PaymentType
@@ -433,7 +433,7 @@ ChequeDeposits=Sjekkinnskudd
 Cheques=Sjekker
 DepositId=Innskudds-ID
 NbCheque=Antall sjekker
-CreditNoteConvertedIntoDiscount=This %s has been converted into %s
+CreditNoteConvertedIntoDiscount=Denne%s er blitt konvertert til %s
 UsBillingContactAsIncoiveRecipientIfExist=Bruk kontaktpersonens adresse i stedet for tredjepartens adresse
 ShowUnpaidAll=Vis alle ubetalte fakturaer
 ShowUnpaidLateOnly=Vis kun forfalte fakturaer
@@ -447,7 +447,7 @@ CantRemovePaymentWithOneInvoicePaid=Kan ikke fjerne betalingen siden det er mins
 ExpectedToPay=Forventet innbetaling
 CantRemoveConciliatedPayment=Kan ikke fjerne avtalt beløp
 PayedByThisPayment=Betales av denne innbetalingen
-ClosePaidInvoicesAutomatically=Klassifiser alle fakturaer (alle typer) som betalt
+ClosePaidInvoicesAutomatically=Klassifiser "Betalt" alle standard-, forskuddsbetalings- eller erstatningsfakturaer som er fullstendig betalt.
 ClosePaidCreditNotesAutomatically=Klassifiser alle fakturaer som betalt
 ClosePaidContributionsAutomatically=Klassifiser alle fullt betalte sosial- og regnskapsbidrag som "betalt"
 AllCompletelyPayedInvoiceWillBeClosed=Alle faktura uten restbeløp vil bli automatisk satt til &quot;betalt&quot;.
@@ -462,9 +462,9 @@ YouMustCreateStandardInvoiceFirstDesc=Du må først lage en standardfaktura og s
 PDFCrabeDescription=Fakturamal Crabe. En komplett mal (Støtter MVA, rabatter, betalingsbetingelser, logo, osv...)
 PDFCrevetteDescription=PDF fakturamal Crevette. En komplett mal for delfaktura
 TerreNumRefModelDesc1=Returnerer nummer med format %syymm-nnnn for standardfaktura og %syymm-nnnn for kreditnota, der yy er året, mm måned og nnnn er et løpenummer som starter på 0+1.
-MarsNumRefModelDesc1=Returnerer et nummer med formatet %sååmm-nnnn for vanlige fakturaer, %sååmm-nnnn for erstatningsfakturaer, %sååmm-nnnn for innskuddsfakturaer og %sååmm-nnnn for kreditnotaer der åå er året, mm måned og nnnn er en sekvens uten brudd og ingen retur til 0
+MarsNumRefModelDesc1=Returnerer et nummer med format %syymm-nnnn for standardfakturaer, %syymm-nnnn for erstatningsfakturaer, %syymm-nnnn for nedbetalingsfakturaer og %syymm-nnnn for kreditnotater hvor yy er år, mm er måned og nnnn er en sekvens uten pause og ingen retur til 0
 TerreNumRefModelError=En faktura som starter med $sååmm finnes allerede og er ikke kompatibel med denne nummereringsmodulen. Du må slette den eller gi den ett nytt navn for å aktivere denne modulen.
-CactusNumRefModelDesc1=Returnerer et nummer med formatet %syymm-nnnn for standardfakturaer, %syymm-nnnn for kreditnotaer og %syymm-nnnn for innskuddsfakturaer der yy er året, mm måned og nnnn er en sekvens med ingen opphold og ingen retur til 0
+CactusNumRefModelDesc1=Returnerer et nummer med format %syymm-nnnn for standardfakturaer, %syymm-nnnn for kreditnotater og %syymm-nnnn for nedbetalingsfakturaer hvor yy er år, mm er måned og nnnn er en sekvens uten pause og ingen retur til 0
 ##### Types de contacts #####
 TypeContact_facture_internal_SALESREPFOLL=Representant for oppfølging av kundefaktura
 TypeContact_facture_external_BILLING=Kundens fakturakontakt
diff --git a/htdocs/langs/nb_NO/bookmarks.lang b/htdocs/langs/nb_NO/bookmarks.lang
index d5e0bd37b98..19b49f9cac3 100644
--- a/htdocs/langs/nb_NO/bookmarks.lang
+++ b/htdocs/langs/nb_NO/bookmarks.lang
@@ -1,7 +1,9 @@
 # Dolibarr language file - Source file is en_US - marque pages
-AddThisPageToBookmarks=Legg denne siden til bokmerker
+AddThisPageToBookmarks=Legg til nåværende side i bokmerker
 Bookmark=Bokmerke
 Bookmarks=Bokmerker
+ListOfBookmarks=Oversikt over bokmerker
+EditBookmarks=Vis/rediger bokmerker
 NewBookmark=Legg til bokmerke
 ShowBookmark=Vis bokmerke
 OpenANewWindow=Åpne et nytt vindu
@@ -10,7 +12,7 @@ BookmarkTargetNewWindowShort=Nytt vindu
 BookmarkTargetReplaceWindowShort=Gjeldende vindu
 BookmarkTitle=Bokmerketittel
 UrlOrLink=URL
-BehaviourOnClick=Oppførsel når en URL blir klikket på
+BehaviourOnClick=Oppførsel når et bokmerke-URL er valgt
 CreateBookmark=Opprett bokmerke
 SetHereATitleForLink=Angi tittel for bokmerket
 UseAnExternalHttpLinkOrRelativeDolibarrLink=Bruk en ekstern http URL eller en relativ Dolibarr URL
diff --git a/htdocs/langs/nb_NO/boxes.lang b/htdocs/langs/nb_NO/boxes.lang
index 03f98fb9f3e..62178b378f9 100644
--- a/htdocs/langs/nb_NO/boxes.lang
+++ b/htdocs/langs/nb_NO/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxLoginInformation=Innloggingsinformasjon
 BoxLastRssInfos=Rss informasjon
 BoxLastProducts=Siste %s produkter/tjenester
 BoxProductsAlertStock=Varsling for lavt lagernivå
@@ -25,8 +26,8 @@ BoxTitleLastSuppliers=Siste %s registrerte leverandører
 BoxTitleLastModifiedSuppliers=Siste %s endrede leverandører
 BoxTitleLastModifiedCustomers=Siste %s endrede kunder
 BoxTitleLastCustomersOrProspects=Siste %s endrede kunder eller prospekter
-BoxTitleLastCustomerBills=Latest %s customer invoices
-BoxTitleLastSupplierBills=Latest %s supplier invoices
+BoxTitleLastCustomerBills=Siste %s kundefakturaer
+BoxTitleLastSupplierBills=Siste %s leverandørfakturaer
 BoxTitleLastModifiedProspects=Siste %s endrede prospekter
 BoxTitleLastModifiedMembers=Siste %s medlemmer
 BoxTitleLastFicheInter=Siste %s endrede intervensjoner
@@ -51,12 +52,12 @@ ClickToAdd=Klikk her for å legge til.
 NoRecordedCustomers=Ingen registrerte kunder
 NoRecordedContacts=Ingen registrerte kontakter
 NoActionsToDo=Ingen åpne handlinger
-NoRecordedOrders=No recorded customer orders
+NoRecordedOrders=Ingen registrerte kundeordre
 NoRecordedProposals=Ingen registrerte tilbud
-NoRecordedInvoices=No recorded customer invoices
-NoUnpaidCustomerBills=No unpaid customer invoices
-NoUnpaidSupplierBills=No unpaid supplier invoices
-NoModifiedSupplierBills=No recorded supplier invoices
+NoRecordedInvoices=Ingen registrerte kundefakturaer
+NoUnpaidCustomerBills=Ingen ubetalte kundefakturaer
+NoUnpaidSupplierBills=Ingen ubetalte leverandørfakturaer
+NoModifiedSupplierBills=Ingen registrerte leverandørfakturaer
 NoRecordedProducts=Ingen registrerte varer/tjenester
 NoRecordedProspects=Ingen registrerte prospekter
 NoContractedProducts=Ingen innleide varer/tjenester
@@ -82,3 +83,4 @@ ForCustomersOrders=Kundeordrer
 ForProposals=Tilbud
 LastXMonthRolling=De siste %s måneders omsetning
 ChooseBoxToAdd=Legg widget til i kontrollpanelet
+BoxAdded=Widget ble lagt til i kontrollpanelet ditt
diff --git a/htdocs/langs/nb_NO/commercial.lang b/htdocs/langs/nb_NO/commercial.lang
index 04c4e14c19d..f9adec632f4 100644
--- a/htdocs/langs/nb_NO/commercial.lang
+++ b/htdocs/langs/nb_NO/commercial.lang
@@ -19,6 +19,7 @@ ShowTask=Vis oppgave
 ShowAction=Vis handling
 ActionsReport=Handlingsrapport
 ThirdPartiesOfSaleRepresentative=Tredjeparter med salgsrepresentant
+SaleRepresentativesOfThirdParty=Salgsrepresentanter fra tredjepart
 SalesRepresentative=Salgsrepresentant
 SalesRepresentatives=Salgsrepresentanter
 SalesRepresentativeFollowUp=Salgsrepresentant (oppfølging)
diff --git a/htdocs/langs/nb_NO/compta.lang b/htdocs/langs/nb_NO/compta.lang
index b7db78f3f7c..888cfd798cd 100644
--- a/htdocs/langs/nb_NO/compta.lang
+++ b/htdocs/langs/nb_NO/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Beløpene vist her er kalkulert ved hjelp
 Param=Oppsett
 RemainingAmountPayment=Restbeløp:
 Account=Konto
-Accountparent=Overordnet konto
-Accountsparent=Overordnede kontoer
+Accountparent=Foreldrekonto
+Accountsparent=Foreldrekontoer
 Income=Inntekt
 Outcome=Utgift
 ReportInOut=Inntekt/Utgifter
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Skatter og utbytte
 MenuSocialContributions=Skatter/avgifter
 MenuNewSocialContribution=Ny skatt/avgift
 NewSocialContribution=Ny skatt/avgift
+AddSocialContribution=Legg til sosiale utgifter eller skatter
 ContributionsToPay=Skatter og avgifter som skal betales
 AccountancyTreasuryArea=Regnskap/kapital-område
 NewPayment=Ny betaling
@@ -82,12 +83,12 @@ LT2PaymentES=IRPF Betaling
 LT2PaymentsES=IRPF Betalinger
 VATPayment=MVA.betaling
 VATPayments=MVA.betalinger
-VATRefund=Sales tax refund
+VATRefund=Mva-betaling
 Refund=Refusjon
 SocialContributionsPayments=Skatter- og avgiftsbetalinger
 ShowVatPayment=Vis MVA betaling
 TotalToPay=Sum å betale
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balanse er synlig i denne listen bare hvis tabellen er sortert stigende etter %s og filtrert for en bankkonto
 CustomerAccountancyCode=Kundens regnskapskode
 SupplierAccountancyCode=Leverandørens regnskapskode
 CustomerAccountancyCodeShort=Kundens regnskapskode
@@ -134,8 +135,8 @@ RulesResultDue=- Inkluderer utestående fakturaer, utgifter, MVA og donasjoner,
 RulesResultInOut=- Inkluderer betalinger gjort mot fakturaer, utgifter, MVA og lønn. <br> Basert på betalingsdato. Donasjonsdato for donasjoner
 RulesCADue=- Inkluderer kundens forfalte fakturaer, enten de er betalt eller ikke.<br> Basert på valideringsdatoen til disse fakturaene.<br>
 RulesCAIn=- Inkluderer alle betalinger av fakturaer mottatt fra klienter. <br> - Er basert på betalingsdatoen for disse fakturaene <br>
-DepositsAreNotIncluded=- Innskuddsfakturaer er ikke inkludert
-DepositsAreIncluded=- Innskuddsfakturaer er inkludert
+DepositsAreNotIncluded=- Nedbetalingsfakturaer er ikke inkludert
+DepositsAreIncluded=- Nedbetalingsfakturaer er inkludert
 LT2ReportByCustomersInInputOutputModeES=Rapport over tredjepart IRPF
 LT1ReportByCustomersInInputOutputModeES=Rapport etter tredjepart RE
 VATReport=MVA rapport
@@ -169,7 +170,7 @@ DescSellsJournal=Salgsjournal
 DescPurchasesJournal=Kjøpsjournal
 InvoiceRef=Faktura ref.
 CodeNotDef=Ikke definert
-WarningDepositsNotIncluded=Innskuddsfakturaer er ikke inkludert i denne versjonen med denne regnskapsmodulen.
+WarningDepositsNotIncluded=Nedbetalingsfakturaer er ikke inkludert i denne versjonen med denne regnskapsmodulen.
 DatePaymentTermCantBeLowerThanObjectDate=Betalingsdato kan ikke være før objektdato
 Pcg_version=Kontomodeller
 Pcg_type=Kontoplan type
@@ -186,22 +187,25 @@ CalculationRuleDescSupplier=Velg utregningsmetode som gir leverandør forventet
 TurnoverPerProductInCommitmentAccountingNotRelevant=Omsetningsrapport pr. produkt, er ikke relevant når du bruker en <b>kontantregnskap</b>-modus. Denne rapporten er bare tilgjengelig når du bruker <b>engasjement regnskap</b> modus (se oppsett av regnskap modul).
 CalculationMode=Kalkuleringsmodus
 AccountancyJournal=Regnskapskode journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Standard regnskapskonto for å utgående MVA - MVA på salg (brukes hvis ikke definert i oppsett av MVA-ordboken)
+ACCOUNTING_VAT_BUY_ACCOUNT=Standard regnskapskonto for å inngående MVA - MVA på kjøp (brukes hvis ikke definert i oppsett av MVA-ordboken)
 ACCOUNTING_VAT_PAY_ACCOUNT=Standard regnskapskonto for MVA.betaling
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Regnskapskonto brukt til kunde-tredjepart
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedikert regnskapskonto definert på tredjepartskort som vil bli brukt til regnskapsføring i sub-hovedbok, denne er for hovedboken eller som standardverdi av sub-hovedboksregnskap hvis dedikert kunde-regnskapskonto på tredjepart ikke er definert
+ACCOUNTING_ACCOUNT_SUPPLIER=Regnskapskonto brukt til leverandør-tredjepart
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedikert regnskapskonto definert på tredjepartskort som vil bli brukt til regnskapsføring i sub-hovedbok, denne er for hovedboken eller som standardverdi av sub-hovedboksregnskap hvis dedikert leverandør-regnskapskonto på tredjepart ikke er definert
 CloneTax=Klon skatt/avgift
 ConfirmCloneTax=Bekreft kloning av skatt/avgiftsbetaling
 CloneTaxForNextMonth=Klon for neste måned
 SimpleReport=Enkel rapport
-AddExtraReport=Extra reports (add foreign and national customer report)
+AddExtraReport=Ekstrarapporter (legg til internasjonale og nasjonale kunderapporter)
 OtherCountriesCustomersReport=Rapport over utenlandske kunder
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Basert på de at to første bokstavene i MVA-nummeret er ulik ditt eget selskaps landskode
 SameCountryCustomersWithVAT=Rapport over nasjonale kunder
 BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Basert på de at to første bokstavene i MVA-nummeret er det samme som ditt eget selskaps landskode
 LinkedFichinter=Knytt til en intervensjon
 ImportDataset_tax_contrib=Skatter/avgifter
-ImportDataset_tax_vat=Vat payments
+ImportDataset_tax_vat=Mva-betalinger
 ErrorBankAccountNotFound=Feil: Bankkonto ikke funnet
 FiscalPeriod=Regnskapsperiode
+ListSocialContributionAssociatedProject=Liste over sosiale bidrag knyttet til prosjektet
diff --git a/htdocs/langs/nb_NO/contracts.lang b/htdocs/langs/nb_NO/contracts.lang
index 737492bd6aa..289ab915595 100644
--- a/htdocs/langs/nb_NO/contracts.lang
+++ b/htdocs/langs/nb_NO/contracts.lang
@@ -83,6 +83,8 @@ NoteListOfYourExpiredServices=Denne listen inneholder kun tjenester av kontrakte
 StandardContractsTemplate=Standard kontraktskjema
 ContactNameAndSignature=For %s, navn og signatur:
 OnlyLinesWithTypeServiceAreUsed=Kun linjer med type "Service" vi bli klonet.
+CloneContract=Klon kontrakt
+ConfirmCloneContract=Er du sikker på at du vil klone kontrakten <b>%s</b>?
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Salgsrepresentant som signerer kontrakten
diff --git a/htdocs/langs/nb_NO/cron.lang b/htdocs/langs/nb_NO/cron.lang
index 80a425cbd67..bcd00b25a15 100644
--- a/htdocs/langs/nb_NO/cron.lang
+++ b/htdocs/langs/nb_NO/cron.lang
@@ -17,15 +17,15 @@ CronMethodDoesNotExists=Klasse %s inneholder ingen metode %s
 # Menu
 EnabledAndDisabled=Aktivert og deaktivert
 # Page list
-CronLastOutput=Latest run output
-CronLastResult=Latest result code
+CronLastOutput=Siste kjøreresultat
+CronLastResult=Siste resultatkode
 CronCommand=Kommando
 CronList=Planlagte jobber
 CronDelete=Slett planlagte jobber
 CronConfirmDelete=Er du sikker på at du vil slette disse planlagte jobbene?
 CronExecute=Start planlagt jobb
 CronConfirmExecute=Er du sikker på at du vil kjøre disse planlagte jobbene nå?
-CronInfo=Planlagte jobber-modulen gir deg mulighet til å utføre jobber til ønsket tid
+CronInfo=Planlagt jobb -modul gjør det mulig å planlegge jobber for å utføre dem automatisk. Jobber kan også startes manuelt.
 CronTask=Jobb
 CronNone=Ingen
 CronDtStart=Ikke før
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Aktiver
 CronStatusInactiveBtn=Deaktiver
 CronTaskInactive=Denne jobben er deaktivert
 CronId=ID
-CronClassFile=Klasser (filnavn.klasse.php)
-CronModuleHelp=Navn på Dolibarr-modul katalogen (også arbeid med ekstern Dolibarr-modul). <BR> For eksempel hente-metode for Dolibarr Product objekt /htdocs/<u>product</u>/class/product.class.php, er verdien av modulen <i>vare</i>
-CronClassFileHelp=Filnavn å laste. <BR> For eksempel hente metode for Dolibarr Vare object/htdocs/vare/klasse/<u>product.class.php</u>, er verdien av klassen filnavnet <i> product.class.php </i>
-CronObjectHelp=Objektnavn som skal lastes.<BR> For eksempel metode for å hente Dolibarr Product object /htdocs/product/class/product.class.php, er verdien av klasse-filnavn <i>Product</i>
-CronMethodHelp=Objekt-metode for å starte. <BR> For eksempel hente Dolibarr Vare objekt /htdocs/product/class/product.class.php, er verdien av metoden <i> fecth </i>
-CronArgsHelp=Metode argumenter. <BR> For eksempel hent Dolibarr Product object /htdocs/product/class/product.class.php, kan parameterverdien være <i>0, ProductRef</i>
+CronClassFile=Filnavn med klasse
+CronModuleHelp=Navn på Dolibarr-modulkatalogen (også arbeid med ekstern Dolibarr-modul). <BR> For eksempel å kalle hente-metoden for Dolibarr Product-objektet /htdocs/<u>product</u>/class/product.class.php, er verdien for modulen <i> produkt </i>
+CronClassFileHelp=Den relative banen og filnavnet som skal lastes (banen er i forhold til webserverens rotkatalog). <BR> For eksempel å kalle Dolibarr Produkt objekt htdocs/product/class/<u> product.class.php </u>, er verdien for klassefilnavn <i> produkt/klasse/product.class.php </i>
+CronObjectHelp=Objektnavnet som skal lastes inn. <BR> For eksempel å kalle hente-metoden for Dolibarr Product-objektet /htdocs/product/class/product.class.php, er verdien for klassefilenavnet <i> Produkt </i>
+CronMethodHelp=Objektmetoden som skal startes. <BR> For eksempel å kalle hente-metoden for Dolibarr Product-objektet /htdocs/product/class/product.class.php, er verdien for metoden <i> fecth </i>
+CronArgsHelp=Metode-argumenter. <BR> For eksempel å kalle hente-metoden for Dolibarr Product-objektet /htdocs/product/class/product.class.php, kan verdien for parametre være <i> 0, ProductRef </i>
 CronCommandHelp=System kommandolinje som skal kjøres
 CronCreateJob=Opprett ny planlagt jobb
 CronFrom=Fra
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Gå til menyen "Hjem - Administrative verktøy -
 JobDisabled=Jobb deaktivert
 MakeLocalDatabaseDumpShort=Backup av lokal database
 MakeLocalDatabaseDump=Opprett lokal databasedump
-WarningCronDelayed=NB! Pga ytelseshensyn, kan aktive jobber utsettes maksimum %s timer før de kjøres, uavhengig av dato de er satt opp.
+WarningCronDelayed=NB, for ytelsesformål, uansett neste utførelsesdato for aktiverte jobber, kan jobbene dine forsinkes til maksimalt %s timer før de kjøres.
diff --git a/htdocs/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang
index 3e0d32e672c..3a9bd9b18f9 100644
--- a/htdocs/langs/nb_NO/errors.lang
+++ b/htdocs/langs/nb_NO/errors.lang
@@ -11,13 +11,15 @@ ErrorLoginAlreadyExists=brukernavnet %s eksisterer allerede.
 ErrorGroupAlreadyExists=Gruppen %s eksisterer allerede.
 ErrorRecordNotFound=Posten ble ikke funnet.
 ErrorFailToCopyFile=Klarte ikke å kopiere filen '<b>«%s</b>' til '<b>%s</b>'.
-ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCopyDir=Klarte ikke å kopiere katalogen '<b>%s</b>' til '<b>%s</b>'.
 ErrorFailToRenameFile=Kunne ikke omdøpe filen '<b>%s</b>' til '<b>%s</b>'
 ErrorFailToDeleteFile=Kunne ikke fjerne filen '<b>%s</b>'.
 ErrorFailToCreateFile=Kunne ikke opprette filen '<b>%s</b>'.
 ErrorFailToRenameDir=Kunne ikke endre navnet på mappen '<b>%s</b>' til '<b>%s</b>'.
 ErrorFailToCreateDir=Kunne ikke opprette mappen '<b>%s</b>'.
 ErrorFailToDeleteDir=Klarte ikke å slette katalogen <b>«%s</b> '.
+ErrorFailToMakeReplacementInto=Kunne ikke erstatte i filen '<b>%s</b>'.
+ErrorFailToGenerateFile=Kunne ikke generere filen '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=Denne kontaktperson er allerede definert for denne typen.
 ErrorCashAccountAcceptsOnlyCashMoney=Dette er en kassekonto, så det er kun mulig med kontantinnskudd på den.
 ErrorFromToAccountsMustDiffers=Kilde- og målkonto må være forskjellig.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Kan ikke skrive til mappen %s
 ErrorFoundBadEmailInFile=Feil e-postsyntaks for %s linjer i filen (for eksempel linje %s med e-post=%s)
 ErrorUserCannotBeDelete=Bruker kan ikke slettes. Kan være knyttet til Dolibarr-enheter.
 ErrorFieldsRequired=Noen påkrevde felt er ikke fylt ut.
+ErrorSubjectIsRequired=Epost-emnet er påkrevd
 ErrorFailedToCreateDir=Kunne ikke opprette mappen. Kontroller at webserverbrukeren har skriverettigheter i dokumentmappen i Dolibarr. Hvis <b>safe_mode</b> er akivert i PHP, sjekk at webserveren eier eller er med i gruppen(eller bruker) for Dolibarr php-filer.
 ErrorNoMailDefinedForThisUser=Ingen e-post angitt for denne brukeren.
 ErrorFeatureNeedJavascript=Denne funksjonen krever javascript for å virke. Endre dette i Oppsett - Visning.
@@ -114,9 +117,9 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Kvantum på linjer i kundefakturaer kan
 ErrorWebServerUserHasNotPermission=Brukerkonto <b>%s</b> som brukes til å kjøre web-server har ikke tillatelse til det
 ErrorNoActivatedBarcode=Ingen strekkodetype aktivert
 ErrUnzipFails=Klarte ikke å pakke ut %s med ZipArchive
-ErrNoZipEngine=Ingen applikasjon som kan pakke ut %s i denne PHP
+ErrNoZipEngine=Ingen motor til zip/unzip %s filen i dette PHP-miljøet
 ErrorFileMustBeADolibarrPackage=Filen %s må være en Dolibarr zip-pakke
-ErrorModuleFileRequired=You must select a Dolibarr module package file
+ErrorModuleFileRequired=Du må velge en Dolibarr modulpakke-fil
 ErrorPhpCurlNotInstalled=PHP CURL er ikke installert. Denne må være installert for å kommunisere med Paypal
 ErrorFailedToAddToMailmanList=Klarte ikke å legge post %s til Mailman-liste %s eller SPIP-base
 ErrorFailedToRemoveToMailmanList=Klarte ikke å fjerne post %s fra Mailman-liste %s eller SPIP-base
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=Ingen global variabel valgt
 ErrorFieldMustBeANumeric=Feltet <b>%s</b> må være en numerisk verdi
 ErrorMandatoryParametersNotProvided=Obligatorisk(e) parametre ikke angitt
 ErrorOppStatusRequiredIfAmount=Sett inn et estimert beløp for denne muligheten. Status må også settes
+ErrorFailedToLoadModuleDescriptorForXXX=Kunne ikke laste moduldeskriptorklassen for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=En feil oppsto under lagring av endringer
 ErrorWarehouseRequiredIntoShipmentLine=Lager er obligatorisk for å kunne levere
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Lagernivå er for lavt for å legge
 ErrorStockIsNotEnoughToAddProductOnProposal=Lagernivå er for lavt for å legge %s til i et nytt tilbud
 ErrorFailedToLoadLoginFileForMode=Klarte ikke å hente innloggingsnøkkel for modus '%s'.
 ErrorModuleNotFound=Modulfilen ble ikke funnet.
-ErrorFieldAccountNotDefinedForBankLine=Verdi for regnskapskode er ikke definert bankkonto linje %s
+ErrorFieldAccountNotDefinedForBankLine=Verdi for regnskapskonto ikke definert for kildelinje-id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Verdi for regnskapskonto ikke definert for faktura id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Verdi for regnskapskonto ikke definert for linjen (%s)
 ErrorBankStatementNameMustFollowRegex=Feil, navn på kontoutskrift må følge syntaksregelen %s
-ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
-ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
+ErrorPhpMailDelivery=Kontroller at du ikke bruker et for høyt antall mottakere og at epost-innhold ikke ligner spam. Spør også administratoren om å sjekke brannmuren og server-loggfilene for mer fullstendig informasjon.
+ErrorUserNotAssignedToTask=Bruker må tilordnes til en oppgave for å være i stand til å angi tidsforbruk.
 ErrorTaskAlreadyAssigned=Oppgaven er allerede tildelt bruker
-ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
-ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorModuleFileSeemsToHaveAWrongFormat=Modulpakken ser ut til å ha feil format.
+ErrorFilenameDosNotMatchDolibarrPackageRules=Navnet på modulpakken (<strong>%s</strong>) passer ikke forventet navn-syntaks: <strong>%s</strong>
+ErrorDuplicateTrigger=Feil, duplikat utløsernavn %s. Allerede lastet fra %s.
+ErrorNoWarehouseDefined=Feil, ingen lagre definert.
+ErrorBadLinkSourceSetButBadValueForRef=Lenken du bruker er ikke gyldig. En 'kilde' for betaling er definert, men verdien for 'ref' er ikke gyldig.
+ErrorTooManyErrorsProcessStopped=For mange feil. Prosessen ble stoppet.
 
 # Warnings
 WarningPasswordSetWithNoAccount=Et passord ble satt for dette medlemmet, men ingen brukerkonto ble opprettet. Det fører til at passordet ikke kan benyttes for å logge inn på Dolibarr. Det kan brukes av en ekstern modul/grensesnitt, men hvis du ikke trenger å definere noen innlogging eller passord for et medlem, kan du deaktivere alternativet "opprett en pålogging for hvert medlem" fra medlemsmodul-oppsettet. Hvis du trenger å administrere en pålogging, men ikke trenger noe passord, kan du holde dette feltet tomt for å unngå denne advarselen. Merk: E-post kan også brukes som en pålogging dersom medlemmet er knyttet til en bruker.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Betalingsdato (%s) er tidligere enn faktu
 WarningTooManyDataPleaseUseMoreFilters=For mange data (mer enn %s linjer). Bruk flere filtre eller sett konstanten %s til en høyere grense.
 WarningSomeLinesWithNullHourlyRate=Noen tider ble registrert av noen brukere mens deres timepris ikke var definert. En verdi på 0 %s pr. time ble brukt, men dette kan føre til feil verdivurdering av tidsbruk.
 WarningYourLoginWasModifiedPleaseLogin=Din innlogging er blitt endret. Av sikkerhetsgrunner må du logge inn på nytt før du kan gjøre noe.
+WarningAnEntryAlreadyExistForTransKey=En oppføring eksisterer allerede for oversettelsesnøkkel for dette språket
diff --git a/htdocs/langs/nb_NO/exports.lang b/htdocs/langs/nb_NO/exports.lang
index cc08e1e8d30..d86952c7293 100644
--- a/htdocs/langs/nb_NO/exports.lang
+++ b/htdocs/langs/nb_NO/exports.lang
@@ -110,11 +110,17 @@ Enclosure=Innbygging
 SpecialCode=Spesialkode
 ExportStringFilter=%% tillater at at en eller flere karakterer i teksten kan erstattes
 ExportDateFilter=ÅÅÅÅ, ÅÅÅÅMM, ÅÅÅÅMMDD : filtrert etter år/måned/dag<br>ÅÅÅÅ+ÅÅÅÅ, ÅÅÅÅMM+ÅÅÅÅMM, ÅÅÅÅMMDD+ÅÅÅÅMMDD: filtrerer en tidsperiode<br> > ÅÅÅÅ, > ÅÅÅÅMM, > ÅÅÅÅMMDD: filteret velger alle påfølgende år<br> < ÅÅÅÅ, < ÅÅÅÅMM, < ÅÅÅÅMMDD: filteret velger alle foregående år
-ExportNumericFilter=NNNNN filters by one value<br>NNNNN+NNNNN filters over a range of values<br>< NNNNN filters by lower values<br>> NNNNN filters by higher values
+ExportNumericFilter=NNNNN filtrer etter en verdi<br>NNNNN+NNNNN filtrerer etter et verdiområde<br>< NNNNN filtrerer etter lavere verdier<br>> NNNNN filtrerer etter høyere verdier
 ImportFromLine=Import starter fra linjenummer
 EndAtLineNb=Slutter på linjenummer
+ImportFromToLine=Importer linjenumre (fra - til)
 SetThisValueTo2ToExcludeFirstLine=For eksempel, sett denne verdien til 3 for å eksludere de 2 første linjene
 KeepEmptyToGoToEndOfFile=Hold dette feltet tomt for å få med alt til slutten av filen
+SelectPrimaryColumnsForUpdateAttempt=Velg kolonne (r) som skal brukes som primærnøkkel for oppdateringsforsøk
+UpdateNotYetSupportedForThisImport=Oppdatering støttes ikke for denne typen import (bare innsetting)
+NoUpdateAttempt=Ingen oppdateringsforsøk ble utført, bare innsetting
+ImportDataset_user_1=Brukere (ansatte eller ikke) og egenskaper
+ComputedField=Beregnet felt
 ## filters
 SelectFilterFields=Hvis du vil filtrere etter noen verdier, kan du endre dem her
 FilteredFields=Filtrerte felt
diff --git a/htdocs/langs/nb_NO/loan.lang b/htdocs/langs/nb_NO/loan.lang
index ed27f6c5024..4426c55220f 100644
--- a/htdocs/langs/nb_NO/loan.lang
+++ b/htdocs/langs/nb_NO/loan.lang
@@ -43,9 +43,11 @@ LoanCalcDesc=Denne <b>boliglånskalkulatoren</b> kan brukes til å finne ut mån
 GoToInterest=%s vil gå mot INTEREST
 GoToPrincipal=%s vil gå mot PRINCIPAL
 YouWillSpend=Du kommer til å bruke %s i år %s
-ListLoanAssociatedProject=List of loan associated with the project
+ListLoanAssociatedProject=Liste over lån tilknyttet prosjektet
+AddLoan=Opprett lån
 # Admin
 ConfigLoan=Oppset av lån-modulen
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Standard regnskapskonto kapital
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Standard regnskapskonto  rente
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Standard regnskapskonto forsikring
+CreateCalcSchedule=Opprett/endre låneplan
diff --git a/htdocs/langs/nb_NO/mails.lang b/htdocs/langs/nb_NO/mails.lang
index 66f4697840e..8b5c674558f 100644
--- a/htdocs/langs/nb_NO/mails.lang
+++ b/htdocs/langs/nb_NO/mails.lang
@@ -35,7 +35,7 @@ MailingStatusSentPartialy=Delvis sendt
 MailingStatusSentCompletely=Utsendelse komplett
 MailingStatusError=Feil
 MailingStatusNotSent=Ikke sendt
-MailSuccessfulySent=Email successfully accepted for delivery (from %s to %s)
+MailSuccessfulySent=E-post (fra %s til %s) akseptert for levering
 MailingSuccessfullyValidated=Utsendelse validert
 MailUnsubcribe=Avmelding
 MailingStatusNotContact=Skal ikke kontaktes flere ganger
@@ -74,18 +74,22 @@ ResultOfMailSending=Resultat av masseutsendelse av epost
 NbSelected=Ant. valgt
 NbIgnored=Ant. ignorert
 NbSent=Ant. sent
-ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
-MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
-MailingModuleDescContactsByCompanyCategory=Contacts by third party category
-MailingModuleDescContactsByCategory=Contacts by categories
-MailingModuleDescContactsByFunction=Contacts by position
+ConfirmUnvalidateEmailing=Er du sikker på at du vil endre status på epost <b>%s</b> til kladd?
+MailingModuleDescContactsWithThirdpartyFilter=Kontakt med kundefilter
+MailingModuleDescContactsByCompanyCategory=Kontakter etter tredjeparts-kategori
+MailingModuleDescContactsByCategory=Kontakter etter kategorier
+MailingModuleDescContactsByFunction=Kontakter etter stilling
+MailingModuleDescEmailsFromFile=E-poster fra fil
+MailingModuleDescEmailsFromUser=E-postmeldinger innlagt av bruker
+MailingModuleDescDolibarrUsers=Brukere med e-post
+MailingModuleDescThirdPartiesByCategories=Tredjeparter (etter kategorier)
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Antall linjer i filen: %s
 RecipientSelectionModules=Forespørsel om lesebekreftelse
 MailSelectedRecipients=Valgte mottagere
 MailingArea=Område for e-postutsendelser
-LastMailings=Latest %s emailings
+LastMailings=Siste %s epostutsendelser
 TargetsStatistics=Statistikk over målgruppe
 NbOfCompaniesContacts=Unike kontakter/adresser
 MailNoChangePossible=Du kan ikke endre mottagere når utsendelsen er godkjent
@@ -93,9 +97,9 @@ SearchAMailing=Finn utsendelse
 SendMailing=Send utesendelse
 SendMail=Send e-post
 SentBy=Sendt av
-MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
+MailingNeedCommand=Å sende en epost kan utføres fra kommandolinjen. Spør din server-administrator å kjøre følgende kommando for å sende e-post til alle mottakere:
 MailingNeedCommand2=Du kan imidlertid sende dem online ver å sette parameteret MAILING_LIMIT_SENDBYWEB til en verdi tilsvarende den maksimale antalle e-poster du ønsker å sende i en økt.
-ConfirmSendingEmailing=If you want to send emailing directly from this screen, please confirm you are sure you want to send emailing now from your browser ?
+ConfirmSendingEmailing=Hvis du ønsker å sende epost direkte fra denne siden, må du bekrefte at du er sikker på at du vil sende epost nå fra nettleseren
 LimitSendingEmailing=Merk: E-postutsendelser fra web-grensenitt er delt opp i flere omganger av sikkerhets-/timeout-hensyn.<b>%s</b> mottakere for hver utsendelse.
 TargetsReset=Tøm liste
 ToClearAllRecipientsClickHere=Trykk på knappen for å tømme mottagerlisten
@@ -116,16 +120,16 @@ Notifications=Varsler
 NoNotificationsWillBeSent=Ingen e-postvarsler er planlagt for denne hendelsen/firmaet
 ANotificationsWillBeSent=1 e-postvarsel vil bli sendt med e-post
 SomeNotificationsWillBeSent=%s e-postvarsler vil bli sendt med e-post
-AddNewNotification=Aktiver ny målgruppe for epost
-ListOfActiveNotifications=List alle aktive mål for e-postnotifikajon
+AddNewNotification=Aktiver en ny e-postvarsling mål/hendelse
+ListOfActiveNotifications=List alle aktive mål/hendelser for e-postvarsling
 ListOfNotificationsDone=List alle e-postmeldinger sendt
 MailSendSetupIs=E-postutsendelser er  blitt satt opp til '%s'. Denne modusen kan ikke brukes ved masseutsendelser
 MailSendSetupIs2=Logg på som administrator, gå til menyen %sHjem - Oppsett - E-post%s for å endre parameter <strong>'%s'</strong> for å bruke '%s' modus. I denne modusen for du tilgang til oppsett av SMTP-server og muligheten til å bruke masseutsendelser.
 MailSendSetupIs3=Ved spørsmål om hvordan du skal sette opp SMTP-serveren din, kontakt %s
 YouCanAlsoUseSupervisorKeyword=Du kan også bruke nøkkelordet <strong>__SUPERVISOREMAIL__</strong> for å sende e-post til brukerens supervisor (supervisoren måha e-postadresse)
 NbOfTargetedContacts=Nåværende antall kontakter på mailinglisten
-UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
-UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
+UseFormatFileEmailToTarget=Importert fil må følge formatet <strong>epost;navn;fornavn:annet</strong>
+UseFormatInputEmailToTarget=Tast inn en streng med format <strong>epost;navn;fornavn;annet</strong>
 MailAdvTargetRecipients=Mottakere (avansert utvalg)
 AdvTgtTitle=Fyll inn i feltene for å forhåndsvelge tredjeparter eller kontakter/adresser til målet
 AdvTgtSearchTextHelp=Bruk %% som blindkarakterer. For eksempel å finne alle element som <b> jean, joe, jim </ b>, kan du skrive<b> j%% </b>. Du kan også bruke ; som separator for verdi, og bruke ! for bortsett fra denne verdien. For eksempel <b> jean, joe, jim %%;! jimo;! jima% </b> vil finne alle jean, joe, de som starter med jim men ikke jimo og ikke det som starter med jima
@@ -150,6 +154,6 @@ AdvTgtCreateFilter=Opprett filter
 AdvTgtOrCreateNewFilter=Navn på nytt filter
 NoContactWithCategoryFound=Ingen kontakter/adresser med kategori funnet
 NoContactLinkedToThirdpartieWithCategoryFound=Ingen kontakter/adresser med kategori funnet
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
+OutGoingEmailSetup=Oppsett for utgående epost
+InGoingEmailSetup=Oppsett for innkommende epost
 
diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang
index 1190bfdeafd..dc801db39b0 100644
--- a/htdocs/langs/nb_NO/main.lang
+++ b/htdocs/langs/nb_NO/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=Parameter %s er ikke definert
 ErrorUnknown=Ukjent feil
 ErrorSQL=SQL-feil
 ErrorLogoFileNotFound=Fant ikke logofilen '%s'
-ErrorGoToGlobalSetup=Gå til 'Firma/Organisasjon' innstillinger for å rette dette
+ErrorGoToGlobalSetup=Gå til 'Firma/Organisasjon' for å ordne dette
 ErrorGoToModuleSetup=Gå til Modul oppsett for å rette dette
 ErrorFailedToSendMail=Klarte ikke å sende epost (avsender=%s, mottager=%s)
 ErrorFileNotUploaded=Filen ble ikke lastet oppp. Sjekk at den ikke er større en maksimumsgrensen, at det er plass igjen på disken og at det ikke ligger en fil med samme navn i katalogen.
@@ -62,7 +62,7 @@ ErrorCantLoadUserFromDolibarrDatabase=Fant ikke brukeren <b>%s</b> i databasen.
 ErrorNoVATRateDefinedForSellerCountry=Feil: Det er ikke definert noen MVA-satser for landet '%s'.
 ErrorNoSocialContributionForSellerCountry=Feil! Ingen skatter og avgifter definert for landet '%s'
 ErrorFailedToSaveFile=Feil: Klarte ikke å lagre filen.
-ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
+ErrorCannotAddThisParentWarehouse=Du prøver å legge til en forelder-lager som allerede er et barn av nåværende
 MaxNbOfRecordPerPage=Maks. antall poster pr side
 NotAuthorized=Du er ikke autorisert for å gjøre dette.
 SetDate=Still dato
@@ -88,7 +88,7 @@ Undefined=Udefinert
 PasswordForgotten=Glemt passordet?
 SeeAbove=Se ovenfor
 HomeArea=Hjemmeområde
-LastConnexion=Latest connection
+LastConnexion=Siste forbindelse
 PreviousConnexion=Forrige tilkobling
 PreviousValue=Forrige verdi
 ConnectedOnMultiCompany=Tilkoblet miljø
@@ -153,6 +153,7 @@ Edit=Rediger
 Validate=Valider
 ValidateAndApprove=Valider og godkjenn
 ToValidate=Å validere
+NotValidated=Ikke validert
 Save=Lagre
 SaveAs=Lagre som
 TestConnection=Test tilkobling
@@ -207,7 +208,7 @@ Info=Logg
 Family=Familie
 Description=Beskrivelse
 Designation=Beskrivelse
-Model=Doc template
+Model=Dokumentmal
 DefaultModel=Standard dokumentmal
 Action=Handling
 About=Om
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=Ingen anvendbar frakoblingsfunksjon med godkjennings
 Connection=Tilkobling
 Setup=Innstillinger
 Alert=Varsel
+MenuWarnings=Varsler
 Previous=Forrige
 Next=Neste
 Cards=Kort
@@ -238,7 +240,7 @@ DateCreation=Opprettet den
 DateCreationShort=Oppr. dato
 DateModification=Endret den
 DateModificationShort=Mod. dato
-DateLastModification=Latest modification date
+DateLastModification=Siste endringsdato
 DateValidation=Validert den
 DateClosing=Lukket den
 DateDue=Forfallsdato
@@ -308,6 +310,7 @@ Copy=Kopier
 Paste=Lim inn
 Default=Standard
 DefaultValue=Standardverdi
+DefaultValues=Standardverdier
 Price=Pris
 UnitPrice=Enhetspris
 UnitPriceHT=Enhetspris (netto)
@@ -324,9 +327,9 @@ AmountTTCShort=Beløp (inkl. MVA)
 AmountHT=Beløp (eksl. MVA)
 AmountTTC=Beløp (inkl. MVA)
 AmountVAT=MVA beløp
-MulticurrencyAlreadyPaid=Already payed, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
+MulticurrencyAlreadyPaid=Allerede betalt, original valuta
+MulticurrencyRemainderToPay=Gjenstår å betale, original valuta
+MulticurrencyPaymentAmount=Beløp, original valuta
 MulticurrencyAmountHT=Beløp (eks. MVA), original valuta
 MulticurrencyAmountTTC=Beløp (ink. MVA), original valuta
 MulticurrencyAmountVAT=MVA-beløp, original valuta
@@ -363,7 +366,8 @@ VATRate=MVA-sats
 Average=Gjennomsnitt
 Sum=Sum
 Delta=Delta
-Module=Modul
+Module=Modul/Applikasjon
+Modules=Moduler/Applikasjoner
 Option=Opsjon
 List=Liste
 FullList=Full liste
@@ -387,7 +391,7 @@ ActionRunningNotStarted=Ikke startet
 ActionRunningShort=Pågår
 ActionDoneShort=Fullført
 ActionUncomplete=Ikke komplett
-CompanyFoundation=Firma/Organisasjon
+CompanyFoundation=Firma/organisasjon
 ContactsForCompany=Kontakter for denne tredjeparten
 ContactsAddressesForCompany=Kontakter/adresser for denne tredjepart
 AddressesForCompany=Adresser for tredjepart
@@ -405,8 +409,9 @@ Generate=Generer
 Duration=Varighet
 TotalDuration=Total varighet
 Summary=Oppsummering
-DolibarrStateBoard=Statistikk
-DolibarrWorkBoard=Arbeidsoppgaver
+DolibarrStateBoard=Databasestatistikk
+DolibarrWorkBoard=Kontrollpanel for åpne elementer
+NoOpenedElementToProcess=Ingen åpne elementer å behandle
 Available=Tilgjengelig
 NotYetAvailable=Ikke tilgjengelig ennå
 NotAvailable=Ikke tilgjengelig
@@ -434,7 +439,7 @@ Reportings=Rapportering
 Draft=Kladd
 Drafts=Kladder
 Validated=Validert
-Opened=Åpnet
+Opened=Åpent
 New=Ny
 Discount=Rabatt
 Unknown=Ukjent
@@ -453,6 +458,7 @@ NextStep=Neste trinn
 Datas=Data
 None=Ingen
 NoneF=Ingen
+NoneOrSeveral=Ingen eller flere
 Late=Forsinket
 LateDesc=Forsinkelse for å bestemme om en post er forsinket eller ikke bestemmes i oppsettet. Kontakt Admin for å endre dette i Hjem - Oppsett - Varslinger.
 Photo=Bilde
@@ -600,13 +606,14 @@ SessionName=Sesjonnavn
 Method=Metode
 Receive=Motta
 CompleteOrNoMoreReceptionExpected=Komplett eller ingenting mer forventet
-ExpectedValue=Expected Value
+ExpectedValue=Forventet verdi
 CurrentValue=Gjeldende verdi
 PartialWoman=Delvis
 TotalWoman=Total
 NeverReceived=Aldri mottatt
 Canceled=Kansellert
-YouCanChangeValuesForThisListFromDictionarySetup=Du kan endre verdier for denne listen fra menyen setup - ordbok
+YouCanChangeValuesForThisListFromDictionarySetup=Du kan endre verdier for denne listen fra menyen Oppsett - Ordbøker
+YouCanChangeValuesForThisListFrom=Du kan endre verdier for denne listen fra menyen %s
 YouCanSetDefaultValueInModuleSetup=Du kan sette standardverdi for nye poster i Oppsett-modulen
 Color=Farge
 Documents=Tilknyttede filer
@@ -642,6 +649,7 @@ FreeLineOfType=Type fritekst
 CloneMainAttributes=Klon objektet med de viktigste attributtene
 PDFMerge=PDF Flett
 Merge=Flett
+DocumentModelStandardPDF=Standard PDF-mal
 PrintContentArea=Vis nettstedet for å skrive ut innholdet på hovedområdet
 MenuManager=Menymanager
 WarningYouAreInMaintenanceMode=Advarsel, du er i vedlikeholds-modus, så bare <b>%s</b> har lov til å bruke programmet for øyeblikket.
@@ -708,6 +716,7 @@ from=fra
 toward=mot
 Access=Tilgang
 SelectAction=Velg handling
+SelectTargetUser=Velg målbruker/-ansatt
 HelpCopyToClipboard=Bruk Ctrl + C for å kopiere til utklippstavle
 SaveUploadedFileWithMask=Lagre filen på serveren med navnet <strong>"%s"</strong> (ellers "%s")
 OriginFileName=Originalt filnavn
@@ -718,9 +727,9 @@ ViewPrivateNote=Vis notater
 XMoreLines=%s linje(r) skjult
 PublicUrl=Offentlig URL
 AddBox=Legg til boks
-SelectElementAndClickRefresh=Velg et element og klikk Oppfrisk
+SelectElementAndClick=Velg et element og klikk %s
 PrintFile=Skriv fil %s
-ShowTransaction=Show entry on bank account
+ShowTransaction=Vis oppføring på bankkonto
 GoIntoSetupToChangeLogo=Gå til Hjem - Oppsett - Firma for å skifte logo eller Hjem - Oppsett -  Display for å skjule.
 Deny=Avvis
 Denied=Avvist
@@ -734,8 +743,8 @@ Hello=Hei
 Sincerely=Med vennlig hilsen
 DeleteLine=Slett linje
 ConfirmDeleteLine=Er du sikker på at du vil slette denne linjen?
-NoPDFAvailableForDocGenAmongChecked=Ingen PDF-generering var tilgjengelig for avkryssede dokumenter
-TooManyRecordForMassAction=For mange poster valgt for masseutførelse. Denne handlingen er begrenset til %s poster.
+NoPDFAvailableForDocGenAmongChecked=Ingen PDF var tilgjengelig for dokumentgenerering blant kontrollerte poster
+TooManyRecordForMassAction=For mange poster valgt for massehandling. Handlingen er begrenset til en liste på%s poster.
 NoRecordSelected=Ingen poster valgt
 MassFilesArea= Filområde bygget av massehandlinger
 ShowTempMassFilesArea=Vis filområde bygget av massehandlinger
@@ -755,11 +764,20 @@ Calendar=Kalender
 GroupBy=Grupper etter...
 ViewFlatList=Vis liste
 RemoveString=Fjern strengen '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Noen språk kan delvis oversettes eller kan inneholde feil. Hvis du oppdager feil, kan du fikse språkfiler ved å registrere deg på <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Link for direktenedlasning
 Download=Last ned
 ActualizeCurrency=Oppdater valutakurs
 Fiscalyear=Regnskapsår
+ModuleBuilder=Modulbygger
+SetMultiCurrencyCode=Angi valuta
+BulkActions=Massehandlinger
+ClickToShowHelp=Klikk for å vise verktøytipshjelp
+HR=HR
+HRAndBank=HR og Bank
+AutomaticallyCalculated=Automatisk beregnet
+TitleSetToDraft=Gå tilbake til utkast
+ConfirmSetToDraft=Er du sikker på at du vil gå tilbake til utkaststatus?
 # Week day
 Monday=Mandag
 Tuesday=Tirsdag
@@ -796,7 +814,7 @@ Select2NotFound=Ingen resultater funnet
 Select2Enter=Tast inn
 Select2MoreCharacter=eller flere karakterer
 Select2MoreCharacters=eller flere tegn
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharactersMore=<strong>Søkesyntaks:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Tilfeldig karakter</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Starter med</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> Ender på</kbd> (ab$)<br />
 Select2LoadingMoreResults=Laster flere resultater...
 Select2SearchInProgress=Søk pågår...
 SearchIntoThirdparties=Tredjeparter
@@ -817,5 +835,3 @@ SearchIntoContracts=Kontrakter
 SearchIntoCustomerShipments=Kundeforsendelser
 SearchIntoExpenseReports=Utgiftsrapporter
 SearchIntoLeaves=Ferier
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/nb_NO/margins.lang b/htdocs/langs/nb_NO/margins.lang
index 05155594ce1..ffb7e2f075a 100644
--- a/htdocs/langs/nb_NO/margins.lang
+++ b/htdocs/langs/nb_NO/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Sats må ha en numerisk verdi
 markRateShouldBeLesserThan100=Dekningsbidrag skal være lavere enn 100
 ShowMarginInfos=Vis info om marginer
 CheckMargins=Margindetaljer
-MarginPerSaleRepresentativeWarning=Rapporten margin pr. bruker: bruk lenken mellom tredjeparter og salgsrepresentanter til å beregne margin for hver bruker. Fordi noen tredjeparter ikke kan være knyttet til en eventuell salgsrepresentant og noen tredjeparter kan knyttes til flere brukere, kan det hende at noen marginer ikke vises i rapporten eller vises på flere forskjellige linjer.
+MarginPerSaleRepresentativeWarning=Rapporten for margin per bruker benytter koblingen mellom tredjeparter og salgsrepresentanter for å beregne marginen til hver salgsrepresentant. Fordi noen tredjeparter kanskje ikke har noen dedikert salgsrepresentant og noen tredjeparter kan være knyttet til flere, kan noen beløp bli ekskludert i denne rapporten (hvis det ikke er salgsrepresentant), og noen kan vises på forskjellige linjer (for hver salgsrepresentant).
diff --git a/htdocs/langs/nb_NO/modulebuilder.lang b/htdocs/langs/nb_NO/modulebuilder.lang
new file mode 100644
index 00000000000..9b5a9f6ff9a
--- /dev/null
+++ b/htdocs/langs/nb_NO/modulebuilder.lang
@@ -0,0 +1,24 @@
+# Dolibarr language file - Source file is en_US - loan
+ModuleBuilderDesc=Disse verktøyene gir deg verktøy til å bygge eller redigere din egen modul.
+EnterNameOfModuleDesc=Skriv inn navnet på modulen uten bruk av mellomrom. Bruk stor bokstav til å skille ord (For eksempel: MyModule, EcommerceForShop, SyncWithMySystem ...)
+ModuleBuilderDesc2=Sti hvor modulene er generert/redigert (første alternative katalog definert i %s): <strong> %s</strong>
+ModuleBuilderDesc3=Genererte / redigerbare moduler funnet: <strong> %s</strong> (de oppdages som redigerbare når filen <strong> %s</strong> eksisterer i roten av modulkatalogen).
+NewModule=Ny modul
+ModuleKey=Nøkkel for ny modul
+ModuleInitialized=Modul initialisert
+ModuleBuilderDescdescription=Her skriver du inn all generell informasjon som beskriver modulen din
+ModuleBuilderDescobjects=Definer de nye objektene du vil administrere med modulen din her. En side for å liste dem og en side for å opprette/redigere/vise et kort vil bli generert.
+ModuleBuilderDescmenus=Denne fanen er dedikert for å definere menyoppføringer som tilbys av modulen din.
+ModuleBuilderDescpermissions=Denne fanener dedikert til å definere de nye tillatelsene du vil gi med modulen din.
+ModuleBuilderDesctriggers=Dette er visningen av utløsere som tilbys av modulen din. Hvis du vil inkludere kode som kjøres når en forretningsaktivitet er startet, kan du redigere denne filen med din IDE.
+ModuleBuilderDeschooks=Denne fanen er til kroker.
+ModuleBuilderDescwidgets=Denne fanen er for å administrere/bygge widgeter.
+ModuleBuilderDescbuildpackage=Du kan generere en "klar til å distribuere" pakkefil (en normalisert .zip-fil) av modulen din her. Bare klikk på knappen for å få modulpakkefilen din.
+ModuleBuilderDescdangerzone=Du kan slette modulen din. ADVARSEL: Alle filer i modulen vil gå tapt!
+DangerZone=Faresone
+BuildPackage=Bygg pakke
+ModuleIsNotActive=Denne modulen er ikke aktivert ennå (gå inn i Home-Setup-modulen for å aktivere)
+ModuleIsLive=Denne modulen er blitt aktivert. Enhver endring på den kan ødelegge en gjeldende aktiv funksjon.
+DescriptionLong=Lang beskrivelse
+EditorName=Navn på editor
+EditorUrl=URL til editor
diff --git a/htdocs/langs/nb_NO/multicurrency.lang b/htdocs/langs/nb_NO/multicurrency.lang
new file mode 100644
index 00000000000..9f3fc646c57
--- /dev/null
+++ b/htdocs/langs/nb_NO/multicurrency.lang
@@ -0,0 +1,18 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multivaluta
+ErrorAddRateFail=Feil i ny rate
+ErrorAddCurrencyFail=Feil i ny valuta
+ErrorDeleteCurrencyFail=Feil, sletting mislykkes
+multicurrency_syncronize_error=Synkroniseringsfeil: %s
+multicurrency_useOriginTx=Når et objekt er opprettet fra et annet, behold den opprinnelige raten til kildeobjektet (ellers bruk den nye kjente rate)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=Du må opprette en konto på deres nettside for å bruke denne funksjonaliteten. <br /> Få din <b> API-nøkkel </b> <br /> Hvis du bruker en gratis konto, kan du ikke endre <b> valutakilden </b> (USD som standard) <br /> Men hvis hovedvalutaen din ikke er USD, kan du bruke <b> alternativ valutakilde </b> for å tvinge annen hovedvaluta <br /> <br /> Du er begrenset til 1000 synkroniseringer per måned
+multicurrency_appId=API-nøkkel
+multicurrency_appCurrencySource=Valutakilde
+multicurrency_alternateCurrencySource= Alternativ valutakilde
+CurrenciesUsed=Valutaer brukt
+CurrenciesUsed_help_to_add=Legg til de forskjellige valutaer og priser du må bruke i dine <b> tilbud </b>, <b> bestillinger </b>, osv.
+rate=rate
+MulticurrencyReceived=Mottatt, originalvaluta
+MulticurrencyRemainderToTake=Restbeløp, opprinnelig valuta
+MulticurrencyPaymentAmount=Beløp, original valuta
diff --git a/htdocs/langs/nb_NO/other.lang b/htdocs/langs/nb_NO/other.lang
index 28b1f6a7468..3b38f4f1368 100644
--- a/htdocs/langs/nb_NO/other.lang
+++ b/htdocs/langs/nb_NO/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Fødselsdag
 DateToBirth=Fødselsdag
 BirthdayAlertOn=fødselsdagsvarsling aktiv
 BirthdayAlertOff=fødselsdagsvarsling inaktiv
+TransKey=Oversettelse av nøkkelen TransKey
+MonthOfInvoice=Måned (nummer 1-12) på fakturadato
+TextMonthOfInvoice=Måned (tex) på fakturadato
+PreviousMonthOfInvoice=Forrige måned (nummer 1-12) på fakturadato
+TextPreviousMonthOfInvoice=Forrige måned (tekst) av fakturadato
+NextMonthOfInvoice=Følgende måned (nummer 1-12) på fakturadato
+TextNextMonthOfInvoice=Følgende måned (tekst) på fakturadato
+ZipFileGeneratedInto=Zip-fil generert til <b> %s</b>.
+
+YearOfInvoice=År av fakturadato
+PreviousYearOfInvoice=Forrige års fakturadato
+NextYearOfInvoice=Følgende år av fakturadato
+
 Notify_FICHINTER_ADD_CONTACT=Kontakt lagt til intervensjon
 Notify_FICHINTER_VALIDATE=Intervensjon validert
 Notify_FICHINTER_SENTBYMAIL=Intervensjon sendt med post
@@ -61,22 +74,23 @@ PredefinedMailTestHtml=Dette er en <b>test</b> e-post (ordet test må være i fe
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nVedlagt følger faktura __REF__\n\n__PERSONALIZED__Med vennlig hilsen\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nFaktura  __REF__ står fortsatt ubetalt etter forfall. Kan dere sjekke dette hos dere? \nFaktura vedlagt.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nVedlagt følger tilbud__PROPREF__\n\n__PERSONALIZED__med vennlig hilsen\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nVedlagt følger prisforespørsel __ASKREF__\n\n__PERSONALIZED__Med vennlig hilsen\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nHer finner du prisforespørselen __REF__\n\n__PERSONALIZED__Med vennlig hilsen\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nVedlagt følger ordrenummer __ORDERREF__\n\n__PERSONALIZED__med vennlig hilsen\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nVedlagt følger ordrenummer __ORDERREF__\n\n__PERSONALIZED__med vennlig hilsen\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nVedlagt følger faktura __REF__\n\n__PERSONALIZED__Med vennlig hilsen\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nVedlagt følger leveranse __SHIPPINGREF__\n\n__PERSONALIZED__med vennlig hilsen\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nVedlagt følger intervensjon __FICHINTERREF__\n\n__PERSONALIZED__med vennlig hilsen\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
+DemoDesc=Dolibarr er en kompakt ERP/CRM med støtte for flere forretningsmoduler. En demo som viser alle moduler gir ingen mening da dette scenariet aldri skjer (flere hundre tilgjengelig). Derforer flere demoprofiler er tilgjengelig.
 ChooseYourDemoProfil=Velg en demoprofil som passer best til dine krav
-ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
+ChooseYourDemoProfilMore=... eller bygg din egen profil<br>(manuell utvelgelse av moduler)
 DemoFundation=Håndtere medlemmer i en organisasjon
 DemoFundation2=Håndtere medlemmer og bankkonti i en organisasjon
-DemoCompanyServiceOnly=Company or freelance selling service only
+DemoCompanyServiceOnly=Firma som kun selger tjenester
 DemoCompanyShopWithCashDesk=Administrer en butikk med kontantomsetning/kasse
-DemoCompanyProductAndStocks=Company selling products with a shop
-DemoCompanyAll=Company with multiple activities (all main modules)
+DemoCompanyProductAndStocks=Firma som selger varer via butikk
+DemoCompanyAll=Firma med mange aktiviteter (alle hovedmoduler)
 CreatedBy=Laget av %s
 ModifiedBy=Endret av %s
 ValidatedBy=Validertav %s
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Autentiseringsmetode er <b>%s</b>.<br
 EnableGDLibraryDesc=Installer eller aktiver GD-bibliotek i din PHP-installasjon for å bruke denne opsjonen.
 ProfIdShortDesc=<b>Prof-ID %s</b> er avhengig av tredjepartens land.<br>For eksempel er det for <b>%s</b>, koden <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Statistikk i antall varer / tjenester enheter
-StatsByNumberOfEntities=Statistikk i antall henvisende enheter
-NumberOfProposals=Antall tilbud siste 12 måneder
-NumberOfCustomerOrders=Antall kundeordre siste 12 måneder
-NumberOfCustomerInvoices=Antall kundefakturaer siste 12 måneder
-NumberOfSupplierProposals=Antall leverandørtilbud siste 12 måneder
-NumberOfSupplierOrders=Antall leverandørordre siste 12 måneder
-NumberOfSupplierInvoices=Antall leverandørfakturaer siste 12 måneder
-NumberOfUnitsProposals=Antall enheter i tilbud siste 12 måneder
-NumberOfUnitsCustomerOrders=Antall enheter i kundeordre siste 12 måneder
-NumberOfUnitsCustomerInvoices=Antall enheter i kundefakturaer siste 12 måneder
-NumberOfUnitsSupplierProposals=Antall enheter i leverandørtilbud siste 12 måneder
-NumberOfUnitsSupplierOrders=Antall enheter i leverandørordre siste 12 måneder
-NumberOfUnitsSupplierInvoices=Antall enheter i leverandørfakturaer siste 12 måneder
+StatsByNumberOfUnits=Statistikk over summen av produkter/tjenester
+StatsByNumberOfEntities=Statistikk i antall henvisende enheter (antall fakturaer, eller ordre...)
+NumberOfProposals=Antall tilbud
+NumberOfCustomerOrders=Antall kundeordre
+NumberOfCustomerInvoices=Antall kundefakturaer
+NumberOfSupplierProposals=Antall leverandørtilbud
+NumberOfSupplierOrders=Antall leverandørordre
+NumberOfSupplierInvoices=Antall leverandørfakturaer
+NumberOfUnitsProposals=Antall enheter i tilbud
+NumberOfUnitsCustomerOrders=Antall enheter i kundeordre
+NumberOfUnitsCustomerInvoices=Antall enheter i kundefakturaer
+NumberOfUnitsSupplierProposals=Antall enheter på leverandørtilbud
+NumberOfUnitsSupplierOrders=Antall enheter på leverandørordre
+NumberOfUnitsSupplierInvoices=Antall enheter i leverandørfakturaer
 EMailTextInterventionAddedContact=En ny intervensjon %s er blitt tildelt deg.
 EMailTextInterventionValidated=Intervensjonen %s har blitt validert.
 EMailTextInvoiceValidated=Fakturaen %s har blitt validert.
diff --git a/htdocs/langs/nb_NO/paypal.lang b/htdocs/langs/nb_NO/paypal.lang
index 3a6aaee0eaf..93f796cbb25 100644
--- a/htdocs/langs/nb_NO/paypal.lang
+++ b/htdocs/langs/nb_NO/paypal.lang
@@ -16,15 +16,17 @@ ThisIsTransactionId=Transaksjons-ID: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Legg til url av Paypal-betaling når du sender et dokument i posten
 PredefinedMailContentLink=Du kan klikke på den sikre linken nedenfor for å betale (PayPal) hvis det ikke allerede er gjort. \n\n\n%s\n\n
 YouAreCurrentlyInSandboxMode=Du er for øyeblikket i "sandbox"-modus
-NewPaypalPaymentReceived=Ny Paypal betaling mottatt
-NewPaypalPaymentFailed=Ny Paypal betaling mislyktes
+NewOnlinePaymentReceived=Ny online betaling mottatt
+NewOnlinePaymentFailed=Ny online betaling forsøkt, men mislyktes
 PAYPAL_PAYONLINE_SENDEMAIL=E-post-varsel etter en betaling (vellykket eller ikke)
 ReturnURLAfterPayment=Retur-URL etter betaling
-ValidationOfPaypalPaymentFailed=Validering av Paypal betaling mislyktes
-PaypalConfirmPaymentPageWasCalledButFailed=Betalingsbekreftelse ble forsøkt hentet av Paypal, men mislyktes
+ValidationOfOnlinePaymentFailed=Validering av online betaling mislyktes
+PaymentSystemConfirmPaymentPageWasCalledButFailed=Bekreftelsesside for betaling ble kalt etter at betalingssystemet returnerte en feil
 SetExpressCheckoutAPICallFailed=SetExpressCheckout API oppkall feilet.
 DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API oppkall feilet.
 DetailedErrorMessage=Detaljert feilmelding
 ShortErrorMessage=Kort feilmelding
 ErrorCode=Feilkode
 ErrorSeverityCode=Feilkode alvorlighetsgrad
+OnlinePaymentSystem=Nettbasert betalingssystem
+PaypalLiveEnabled=Paypal Live aktivert (ellers test/sandbox modus)
diff --git a/htdocs/langs/nb_NO/products.lang b/htdocs/langs/nb_NO/products.lang
index 9ce6464242b..84b062ee40c 100644
--- a/htdocs/langs/nb_NO/products.lang
+++ b/htdocs/langs/nb_NO/products.lang
@@ -25,11 +25,13 @@ ProductAccountancySellCode=Regnskapskode (salg)
 ProductOrService=Vare eller tjeneste
 ProductsAndServices=Varer og tjenester
 ProductsOrServices=Varer eller tjenester
-ProductsOnSell=Vare for salg eller innkjøp
+ProductsOnSaleOnly=Varer kun til salgs
+ProductsOnPurchaseOnly=Varer kun for kjøp
 ProductsNotOnSell=Vare ikke for salg og ikke for innkjøp
 ProductsOnSellAndOnBuy=Varer for kjøp og salg
-ServicesOnSell=Tjenester for salg eller innkjøp
-ServicesNotOnSell=Tjenester ikke for salg
+ServicesOnSaleOnly=Tjenester kun til salgs
+ServicesOnPurchaseOnly=Tjenester kun for kjøp
+ServicesNotOnSell=Tjenester ikke til salgs og ikke for kjøp
 ServicesOnSellAndOnBuy=Tjenester for kjøp og salg
 LastModifiedProductsAndServices=Siste %s endrede varer/tjenester
 LastRecordedProducts=Siste %s registrerte varer
@@ -60,7 +62,7 @@ SellingPrice=Salgspris
 SellingPriceHT=Salgspris (eks. MVA)
 SellingPriceTTC=Salgspris (inkl. MVA)
 CostPriceDescription=Denne prisen (eks. MVA) kan brukes til å lagre det gjennomsnittlige beløpet dette produktet koster din bedrift. Det kan være en hvilken som helst pris du beregner selv, for eksempel fra gjennomsnittlig kjøpskurs pluss gjennomsnittlig produksjon og distribusjonkostnader.
-CostPriceUsage=This value could be used for margin calculation.
+CostPriceUsage=Denne verdien kan brukes for kalkulering av marginer
 SoldAmount=Mengde solgt
 PurchasedAmount=Mengde kjøpt
 NewPrice=Ny pris
@@ -142,7 +144,7 @@ ConfirmCloneProduct=Er du sikker på at du vil klone vare eller tjeneste <b>%s</
 CloneContentProduct=Klon alle de viktigste informasjoner av vare/tjeneste
 ClonePricesProduct=Klon viktigste informasjon og priser
 CloneCompositionProduct=Klon komponentvare/tjeneste
-CloneCombinationsProduct=Clone product variants
+CloneCombinationsProduct=Klon produktvarianter
 ProductIsUsed=Denne varen brukes
 NewRefForClone=Ref. av nye vare/tjeneste
 SellingPrices=Utsalgspris
@@ -175,6 +177,18 @@ m2=m²
 m3=m³
 liter=liter
 l=l
+unitP=Stykk
+unitSET=Sett
+unitS=Sekund
+unitH=Time
+unitD=Dag
+unitKG=Kilogram
+unitG=Gram
+unitM=Meter
+unitLM=Lineær meter
+unitM2=Kvadratmeter
+unitM3=Kubikkmeter
+unitL=Liter
 ProductCodeModel=Vare ref.mal
 ServiceCodeModel=Tjeneste ref.mal
 CurrentProductPrice=Gjeldende pris
@@ -186,6 +200,7 @@ MultipriceRules=Prissegment-regler
 UseMultipriceRules=Bruk prissegment-regler (definert i oppsettet i Varemodulen) for automatisk å kalkulere prisene til alle andre segmenter i forhold til første segment
 PercentVariationOver=%% variasjon over %s
 PercentDiscountOver=%% rabatt på %s
+KeepEmptyForAutoCalculation=Hold tom for å få dette beregnet automatisk fra vekt eller volum av produkter
 ### composition fabrication
 Build=Produser
 ProductsMultiPrice=Varer og priser for hvert prissegment
@@ -239,7 +254,7 @@ GlobalVariables=Globale variabler
 VariableToUpdate=Variabel å oppdatere
 GlobalVariableUpdaters=Oppdatering av globale variabler
 UpdateInterval=Oppdateringsintervall (minutter)
-LastUpdated=Latest update
+LastUpdated=Siste oppdatering
 CorrectlyUpdated=Korrekt oppdatert
 PropalMergePdfProductActualFile=Filer brukt for å legge til i PDF Azur er
 PropalMergePdfProductChooseFile=Velg PDF-filer
@@ -259,41 +274,47 @@ VolumeUnits=Volumenhet
 SizeUnits=Størrelseenhet
 DeleteProductBuyPrice=Slett innkjøpspris
 ConfirmDeleteProductBuyPrice=Er du sikker på at du vil slette denne innkjøpsprisen?
-SubProduct=Sub product
+SubProduct=Sub-vare
+ProductSheet=Produktark
+ServiceSheet=Serviceark
 
 #Attributes
-VariantAttributes=Variant attributes
-ProductAttributes=Variant attributes for products
-ProductAttributeName=Variant attribute %s
-ProductAttribute=Variant attribute
-ProductAttributeDeleteDialog=Are you sure you want to delete this attribute? All values will be deleted
-ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with reference "%s" of this attribute?
-ProductCombinationDeleteDialog=Are you sure want to delete the variant of the product "<strong>%s</strong>"?
-ProductCombinationAlreadyUsed=There was an error while deleting the variant. Please check it is not being used in any object
-ProductCombinations=Variants
-HideProductCombinations=Hide products variant in the products selector
+VariantAttributes=Variantattributter
+ProductAttributes=Variantattributter for varer
+ProductAttributeName=Variantattributt %s
+ProductAttribute=Variantattributt
+ProductAttributeDeleteDialog=Er du sikker på at du vil slette denne attributten? Alle verdier vil bli slettet.
+ProductAttributeValueDeleteDialog=Er du sikker på at du vil slette verdien "%s" med referanse "%s" til denne attributten?
+ProductCombinationDeleteDialog=Er du sikker på at du vil slette varevarianten "<strong>%s</strong>"?
+ProductCombinationAlreadyUsed=Det oppsto en feil ved sletting av varianten. Kontroller at den ikke blir brukt av noen objekter
+ProductCombinations=Varianter
+PropagateVariant=Propager varianter
+HideProductCombinations=Skjul varevarianter i varevelgeren
 ProductCombination=Variant
-NewProductCombination=New variant
-EditProductCombination=Editing variant
-ProductCombinationGenerator=Variants generator
-Features=Features
-PriceImpact=Price impact
-WeightImpact=Weight impact
+NewProductCombination=Ny variant
+EditProductCombination=Endre variant
+NewProductCombinations=Nye varianter
+EditProductCombinations=Redigerer varianter
+SelectCombination=Velg kombinasjon
+ProductCombinationGenerator=Variantgenerator
+Features=Egenskaper
+PriceImpact=Prisinnvirkning
+WeightImpact=Vektinnvirkning
 NewProductAttribute=Ny attributt
-NewProductAttributeValue=New attribute value
-ErrorCreatingProductAttributeValue=There was an error while creating the attribute value. It could be because there is already an existing value with that reference
-ProductCombinationGeneratorWarning=If you continue, before generating new variants, all previous ones will be DELETED. Already existing ones will be updated with the new values
-TooMuchCombinationsWarning=Generating lots of variants may result in high CPU, memory usage and Dolibarr not able to create them. Enabling the option "%s" may help reduce memory usage.
-DoNotRemovePreviousCombinations=Do not remove previous variants
-UsePercentageVariations=Use percentage variations
-PercentageVariation=Percentage variation
-ErrorDeletingGeneratedProducts=There was an error while trying to delete existing product variants
-NbOfDifferentValues=Nb of different values
-NbProducts=Nb. of products
-ParentProduct=Parent product
-HideChildProducts=Hide child products
-ConfirmCloneProductCombinations=Would you like to copy all the product variant to the product with the given reference?
-CloneDestinationReference=Destination product reference
-ErrorCopyProductCombinations=There was an error while copying the product variants
-ErrorDestinationProductNotFound=Destination product not found
-ErrorProductCombinationNotFound=Product variant not found
+NewProductAttributeValue=Ny attributtverdi
+ErrorCreatingProductAttributeValue=Det oppstod en feil under oppretting av attributtverdien . Det kan være fordi det allerede er en eksisterende verdi med den referansen
+ProductCombinationGeneratorWarning=Hvis du fortsetter, før du genererer nye varianter, vil alle foregående bli slettet. Eksisterende vil bli oppdatert med de nye verdiene
+TooMuchCombinationsWarning=Generering av mange varianter kan resultere i høy CPU- og minnebruk og gjøre Dolibarr ute av stand til å lage dem. Aktiver alternativet "%s" for å bidra til å redusere minnebruken .
+DoNotRemovePreviousCombinations=Ikke fjern tidligere varevarianter
+UsePercentageVariations=Brok prosentvise variasjoner
+PercentageVariation=Variasjonsprosent
+ErrorDeletingGeneratedProducts=Det oppsto en feil under sletting av eksisterende varevarianter
+NbOfDifferentValues=Antall ulike verdier
+NbProducts=Antall varer
+ParentProduct=Komponent-vare
+HideChildProducts=Skjul variantprodukter
+ConfirmCloneProductCombinations=Vil du kopiere alle produktvarianter til det andre overordnede produktet med den oppgitte referansen?
+CloneDestinationReference=Varereferanse-destinasjon
+ErrorCopyProductCombinations=Det oppstod en feil under kopiering av produktvarianter
+ErrorDestinationProductNotFound=Varereferanse-destinasjon ikke funnet
+ErrorProductCombinationNotFound=Varevariant ikke funnet
diff --git a/htdocs/langs/nb_NO/projects.lang b/htdocs/langs/nb_NO/projects.lang
index 743eddda24e..12951f3afbf 100644
--- a/htdocs/langs/nb_NO/projects.lang
+++ b/htdocs/langs/nb_NO/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Prosjektområde
 ProjectStatus=Prosjektstatus
 SharedProject=Alle
 PrivateProject=Prosjektkontakter
+ProjectsImContactFor=Prosjekter jeg er eksplisitt kontakt til
+AllAllowedProjects=Alt prosjekter jeg kan lese (min + offentlig)
+AllProjects=Alle prosjekter
 MyProjectsDesc=Denne visningen er begrenset til prosjekter du er en kontakt for (uansett type).
 ProjectsPublicDesc=Denne visningen presenterer alle prosjektene du har lov til å lese.
 TasksOnProjectsPublicDesc=Her vises alle prosjektoppgaver du har lov til å se
@@ -20,23 +23,25 @@ OnlyOpenedProject=Kun åpne prosjekter er synlige (prosjektkladder og lukkede pr
 ClosedProjectsAreHidden=Lukkede prosjekter er ikke synlige
 TasksPublicDesc=Denne visningen presenterer alle prosjekter og oppgaver du har lov til å lese.
 TasksDesc=Denne visningen presenterer alle prosjekter og oppgaver (dine brukertillatelser gir deg tillatelse til å vise alt).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+AllTaskVisibleButEditIfYouAreAssigned=Alle oppgaver for et slikt prosjekt er synlige, men du kan angi tid bare for oppgaven tildelt deg. Tildel oppgaven til deg selv hvis du må angi tid på det.
+OnlyYourTaskAreVisible=Bare oppgaver til deg er synlig. Tildel oppgaven til deg selv om den ikke er synlig, og du må angi tid på den.
 ImportDatasetTasks=Oppgaver fra prosjekter
+ProjectCategories=Prosjekt etiketter/kategorier
 NewProject=Nytt prosjekt
 AddProject=Opprett prosjekt
 DeleteAProject=Slett et prosjekt
 DeleteATask=Slett en oppgave
 ConfirmDeleteAProject=Er du sikker på at du vil slette dette prosjektet?
 ConfirmDeleteATask=Er du sikker på at du vil slette denne oppgaven?
-OpenedProjects=Åpnede prosjekter
-OpenedTasks=Åpnede oppgaver
-OpportunitiesStatusForOpenedProjects=Beløp på muligheter i åpnede prosjekter, etter status
+OpenedProjects=Åpne prosjekter
+OpenedTasks=Åpne oppgaver
+OpportunitiesStatusForOpenedProjects=Mulighet-beløp på åpne prosjekter etter status
 OpportunitiesStatusForProjects=Mulighet - beløp på prosjekter etter status
 ShowProject=Vis prosjekt
 SetProject=Sett prosjekt
 NoProject=Ingen prosjekter definert
 NbOfProjects=Antall prosjekter
+NbOfTasks=Antall oppgaver
 TimeSpent=Tid brukt
 TimeSpentByYou=Tid bruk av deg
 TimeSpentByUser=Tid brukt av bruker
@@ -47,9 +52,9 @@ TaskTimeSpent=Tid brukt på oppgaver
 TaskTimeUser=Bruker
 TaskTimeNote=Notat
 TaskTimeDate=Dato
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Oppgaver i åpne prosjekter
 WorkloadNotDefined=Arbeidsmengde ikke definert
-NewTimeSpent=Ny tid brukt
+NewTimeSpent=Tid brukt
 MyTimeSpent=Mitt tidsforbruk
 Tasks=Oppgaver
 Task=Oppgave
@@ -59,6 +64,7 @@ TaskDescription=Oppgave beskrivelse
 NewTask=Ny oppgave
 AddTask=Opprett oppgave
 AddTimeSpent=Opprett tidsforbruk
+AddHereTimeSpentForDay=Legg til tid brukt til denne dagen/oppgaven
 Activity=Aktivitet
 Activities=Oppgaver/aktiviteter
 MyActivities=Mine oppgaver/aktiviteter
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=Liste over kundefaktura-maler tilknyttet
 ListSupplierOrdersAssociatedProject=Liste over leverandørordre tilknyttet prosjektet
 ListSupplierInvoicesAssociatedProject=Liste over leverandørfakturaer tilknyttet prosjektet
 ListContractAssociatedProject=Liste over kontrakter knyttet til prosjektet
+ListShippingAssociatedProject=Liste over forsendelser som er knyttet til prosjektet
 ListFichinterAssociatedProject=Liste over intervensjoner knyttet til prosjektet
 ListExpenseReportsAssociatedProject=Liste over utgiftsrapporter tilknyttet prosjektet
 ListDonationsAssociatedProject=Liste over donasjoner tilknyttet prosjektet
@@ -96,12 +103,13 @@ ValidateProject=Valider prosjekt
 ConfirmValidateProject=Er du sikker på at du vil validere dette prosjektet?
 CloseAProject=Lukk prosjektet
 ConfirmCloseAProject=Er du sikker på at du vil lukke dette prosjektet?
-AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
+AlsoCloseAProject=Lukk prosjekt også (hold det åpent hvis du fortsatt trenger å følge produksjonsoppgaver på det)
 ReOpenAProject=Åpne prosjekt
 ConfirmReOpenAProject=Er du sikker på at du vil gjenåpne dette prosjektet?
 ProjectContact=Prosjekt kontakter
 ActionsOnProject=Handlinger i prosjektet
 YouAreNotContactOfProject=Du er ikke en kontakt tilhørende dette private prosjektet
+UserIsNotContactOfProject=Brukeren er ikke en kontakt i dette private prosjektet
 DeleteATimeSpent=Slett tidsbruk
 ConfirmDeleteATimeSpent=Er du sikker på at du vil slette dette tidsforbruket?
 DoNotShowMyTasksOnly=Se oppgaver som tilhører andre, også
@@ -110,7 +118,7 @@ TaskRessourceLinks=Ressurser
 ProjectsDedicatedToThisThirdParty=Prosjekter dedikert til denne tredjepart
 NoTasks=Ingen oppgaver for dette prosjektet
 LinkedToAnotherCompany=Knyttet opp til annen tredjepart
-TaskIsNotAffectedToYou=Oppgave tilhører ikke deg
+TaskIsNotAssignedToUser=Oppgave ikke tildelt bruker. Bruk knappen '<strong> %s</strong>' for å tilordne oppgaven nå.
 ErrorTimeSpentIsEmpty=Tidsbruk er tom
 ThisWillAlsoRemoveTasks=Denne handlingen vil også slette alle oppgaver i prosjektet (<b>%s</b> oppgaver for øyeblikket), og all tidsregistrering slettes
 IfNeedToUseOhterObjectKeepEmpty=Dersom noen objekter (faktura, ordre, ...), tilhørende en annen tredjepart, må tilknyttes prosjektet, behold denne tom. Prosjektet kan da knyttes til flere tredjeparter.
@@ -122,7 +130,7 @@ CloneProjectFiles=Klon prosjekt-tilknyttede filer
 CloneTaskFiles=Klon oppgave-tilknyttede fil(er) (hvis oppgave(r) er klonet)
 CloneMoveDate=Oppdater prosjekter/oppgaver fra nå?
 ConfirmCloneProject=Er du sikker på at du vil klone dette prosjektet?
-ProjectReportDate=Change task dates according to new project start date
+ProjectReportDate=Endre oppgavedatoer i henhold til ny prosjekt-startdato
 ErrorShiftTaskDate=Kan ikke skifte oppgave-dato etter nytt prosjekt-startdato
 ProjectsAndTasksLines=Prosjekter og oppgaver
 ProjectCreatedInDolibarr=Prosjekt %s opprettet
@@ -161,25 +169,30 @@ FirstAddRessourceToAllocateTime=Tilknytt brukerressurs til oppgave for å tildel
 InputPerDay=Tidsbruk pr. dag
 InputPerWeek=Tidsbruk pr. uke
 InputPerAction=Tidsbruk pr. aktivitet
-TimeAlreadyRecorded=Allerede registrert tidsforbruk for denne oppgaven/dagen og bruker %s
+TimeAlreadyRecorded=Dette tidsrommet er allerede registrert for denne oppgaven/dag og bruker %s
 ProjectsWithThisUserAsContact=Prosjekter med denne brukeren som kontakt
 TasksWithThisUserAsContact=Oppgaver tildelt denne brukeren
 ResourceNotAssignedToProject=Ikke tildelt til prosjekt
 ResourceNotAssignedToTheTask=Ikke tildelt oppgaven
+TasksAssignedTo=Oppgaver tildelt
 AssignTaskToMe=Tildel oppgaven til meg
+AssignTaskToUser=Tildel oppgave til %s
+SelectTaskToAssign=Velg oppgave å tildele...
 AssignTask=Tildel
 ProjectOverview=Oversikt
 ManageTasks=Bruk prosjekter for å følge oppgaver og tidsbruk
 ManageOpportunitiesStatus=Bruk prosjekter for å følge muligheter
 ProjectNbProjectByMonth=Antall prosjekter opprettet etter måned
+ProjectNbTaskByMonth=Antall opprettede oppgaver etter måned
 ProjectOppAmountOfProjectsByMonth=Tilbudsbeløp etter måned
 ProjectWeightedOppAmountOfProjectsByMonth=Gjennomsnittsbeløp på muligheter etter måned
 ProjectOpenedProjectByOppStatus=Åpne prosjekter etter mulighet-status
 ProjectsStatistics=Statistikk over muligheter
+TasksStatistics=Statistikk over prosjekter/hovedoppgaver
 TaskAssignedToEnterTime=Oppgave tildelt. Tidsbruk kan legges til
 IdTaskTime=Oppgave-tid ID
 YouCanCompleteRef=Hvis du ønsker å tilføre referansen med litt informasjon (for å bruke det som søkefiltre ), er det anbefalt å legge til et - tegn for å skille den, så den automatiske nummereringen fortsatt fungerer korrekt for neste prosjekt. For eksempel %s-ABC. Du kan også foretrekke å legge søkenøkler til etiketten. Men beste praksis kan være å legge et dedikert felt, også kalt komplementære egenskaper.
-OpenedProjectsByThirdparties=Prosjekter åpnet av tredjeparter
+OpenedProjectsByThirdparties=Åpne prosjekter etter tredjeparter
 OnlyOpportunitiesShort=Kun muligheter
 OpenedOpportunitiesShort=Åpne muligheter
 NotAnOpportunityShort=Ikke en mulighet
diff --git a/htdocs/langs/nb_NO/resource.lang b/htdocs/langs/nb_NO/resource.lang
index 74aede2d46a..2fabc89415f 100644
--- a/htdocs/langs/nb_NO/resource.lang
+++ b/htdocs/langs/nb_NO/resource.lang
@@ -29,3 +29,8 @@ RessourceSuccessfullyDeleted=Vellykket sletting av ressurs
 DictionaryResourceType=Ressurstype
 
 SelectResource=Velg ressurs
+
+IdResource=ID ressurs
+AssetNumber=Serienummer
+ResourceTypeCode=Ressurskode
+ImportDataset_resource_1=Ressurser
diff --git a/htdocs/langs/nb_NO/sendings.lang b/htdocs/langs/nb_NO/sendings.lang
index b7c91daac39..6ee1692bdfb 100644
--- a/htdocs/langs/nb_NO/sendings.lang
+++ b/htdocs/langs/nb_NO/sendings.lang
@@ -37,7 +37,6 @@ SendingSheet=Pakkseddel
 ConfirmDeleteSending=Er du sikker på at du vil slette denne forsendelsen?
 ConfirmValidateSending=Er du sikker på at du vil validere denne forsendelsen med referanse <b>%s</b>?
 ConfirmCancelSending=Er du sikker på at du vil kansellere denne forsendelsen?
-DocumentModelSimple=Enkel dokumentmodell
 DocumentModelMerou=Merou A5 modell
 WarningNoQtyLeftToSend=Advarsel, ingen varer venter på å sendes.
 StatsOnShipmentsOnlyValidated=Statistikk utført bare på validerte forsendelser. Dato for validering av forsendelsen brukes (planlagt leveringsdato er ikke alltid kjent).
@@ -51,10 +50,10 @@ ActionsOnShipping=Hendelser for forsendelse
 LinkToTrackYourPackage=Lenke for å spore pakken
 ShipmentCreationIsDoneFromOrder=For øyeblikket er opprettelsen av en ny forsendelse gjort fra ordrekortet.
 ShipmentLine=Forsendelseslinje
-ProductQtyInCustomersOrdersRunning=Varekvantum i åpnede kundeordre
-ProductQtyInSuppliersOrdersRunning=Varekvantum i åpnede leverandørordre
-ProductQtyInShipmentAlreadySent=Varekvantum i åpnede kundeordre som er sendt
-ProductQtyInSuppliersShipmentAlreadyRecevied=Varekvantum i åpnede leverandørordre som er mottatt
+ProductQtyInCustomersOrdersRunning=Varekvantum i åpne kundeordre
+ProductQtyInSuppliersOrdersRunning=Varekvantum i åpne leverandørordre
+ProductQtyInShipmentAlreadySent=Varekvantitet fra åpen kundeordre som allerede er sendt
+ProductQtyInSuppliersShipmentAlreadyRecevied=Varekvantitet fra åpen leverandørordre som allerede er mottatt
 NoProductToShipFoundIntoStock=Ingen varer for utsendelse funnet på lager <b>%s</b>. Korriger varebeholdning eller gå tilbake for å velge et annet lager.
 WeightVolShort=Vekt/volum
 ValidateOrderFirstBeforeShipment=Du må validere ordren før du kan utføre forsendelser
diff --git a/htdocs/langs/nb_NO/stocks.lang b/htdocs/langs/nb_NO/stocks.lang
index 6c00292f6e2..8fa1e554d85 100644
--- a/htdocs/langs/nb_NO/stocks.lang
+++ b/htdocs/langs/nb_NO/stocks.lang
@@ -22,15 +22,15 @@ Movements=Bevegelser
 ErrorWarehouseRefRequired=Du må angi et navn på lageret
 ListOfWarehouses=Oversikt over lagre
 ListOfStockMovements=Oversikt over bevegelser
-StockMovementForId=Movement ID %d
-ListMouvementStockProject=List of stock movements associated to project
+StockMovementForId=Bevegelse ID %d
+ListMouvementStockProject=Liste over varebevegelser tilknyttet prosjekt
 StocksArea=Område for lager
 Location=Lokasjon
 LocationSummary=Kort navn på lokasjon
 NumberOfDifferentProducts=Antall forskjellige varer
 NumberOfProducts=Totalt antall varer
-LastMovement=Latest movement
-LastMovements=Latest movements
+LastMovement=Siste bevegelse
+LastMovements=Siste bevegelser
 Units=Enheter
 Unit=Enhet
 StockCorrection=Korriger lagerbeholdning
@@ -42,13 +42,13 @@ LabelMovement=Bevegelse-etikett
 NumberOfUnit=Antall enheter
 UnitPurchaseValue=Enhets innkjøpspris
 StockTooLow=For lav beholdning
-StockLowerThanLimit=Lagerbeholdning lavere en varslingsgrense
+StockLowerThanLimit=Lager lavere enn varslingsgrense (%s)
 EnhancedValue=Verdi
 PMPValue=Vektet gjennomsnittspris
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Lagerverdi
 UserWarehouseAutoCreate=Opprett lager automatisk når en bruker opprettes
-AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
+AllowAddLimitStockByWarehouse=Tillat å legge til grense og ønsket lager pr. par (vare, lager) i stedet for pr. produkt
 IndependantSubProductStock=Varelager og sub-varelager er uavhengig av hverandre
 QtyDispatched=Antall sendt
 QtyDispatchedShort=Mengde utsendt
@@ -62,16 +62,19 @@ DeStockOnShipment=Minsk fysisk lager ved validering av forsendelse
 DeStockOnShipmentOnClosing=Reduser reell varebeholdning når levering klassifiseres som lukket
 ReStockOnBill=Øk virkelig beholdning ut fra faktura/kreditnota
 ReStockOnValidateOrder=Øk virkelig beholdning ut fra ordre
-ReStockOnDispatchOrder=Øk virkelig lager ved manuell utsendelse til lager, etter mottak av leverandørordre
+ReStockOnDispatchOrder=Øk reell varebeholdning ved manuell forsendelse til lager, etter mottak av leverandørordre
 OrderStatusNotReadyToDispatch=Ordre har enda ikke, eller ikke lenger, status som tillater utsendelse av varer
-StockDiffPhysicTeoric=Forklaring av differanse mellom fysisk og teoretisk lagerbeholdning
+StockDiffPhysicTeoric=Forklaring for forskjell mellom fysisk og virtuelt lager
 NoPredefinedProductToDispatch=Ingen forhåndsdefinerte varer for dette objektet. Så ingen lagerutsending er nødvendig.
 DispatchVerb=Send ut
 StockLimitShort=Varslingsgrense
 StockLimit=Varslingsgrense for lagerbeholdning
 PhysicalStock=Fysisk beholdning
 RealStock=Virkelig beholdning
+RealStockDesc=Fysisk eller reelt lager er beholdningen du for øyeblikket har i dine interne varehus.
+RealStockWillAutomaticallyWhen=Den reelle varebeholdningen endres automatisk i henhold til disse reglene (se lagermoduloppsett for å endre dette):
 VirtualStock=Virtuell beholdning
+VirtualStockDesc=Virtuell aksje er beholdningen du vil få når alle åpne ventende handlinger som påvirker lager, lukkes (leverandørordre mottatt, kundeordre sendt, ...)
 IdWarehouse=Lager-ID
 DescWareHouse=Beskrivelse av lager
 LieuWareHouse=Lagerlokasjon
@@ -116,7 +119,7 @@ NbOfProductBeforePeriod=Beholdning av varen %s før valgte periode (< %s)
 NbOfProductAfterPeriod=Beholdning av varen %s før etter periode (< %s)
 MassMovement=Massebevegelse
 SelectProductInAndOutWareHouse=Velg en vare, etnkvantum, et kildelager og et mållager, og klikk deretter på "%s". Når dette er gjort for alle nødvendige bevegelser, klikk på "%s".
-RecordMovement=Post overført
+RecordMovement=Postoverføring
 ReceivingForSameOrder=Kvitteringer for denne ordren
 StockMovementRecorded=Registrerte varebevegelser
 RuleForStockAvailability=Regler og krav for lagerbeholdning
@@ -135,11 +138,58 @@ InventoryCodeShort=Lag./bev.-kode
 NoPendingReceptionOnSupplierOrder=Ingen ventende mottak grunnet åpen leverandørordre
 ThisSerialAlreadyExistWithDifferentDate=Dette lot/serienummeret (<strong>%s</strong>) finnes allerede, men med ulik "best før" og "siste forbruksdag" (funnet <strong>%s</strong> , men tastet inn <strong>%s</strong>).
 OpenAll=Åpen for alle handlinger
-OpenInternal=Open only for internal actions
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on supplier order reception
+OpenInternal=Kun åpen for interne hendelser
+UseDispatchStatus=Bruk en utsendelses-status (godkjenn/avslå) for varelinjer på leverandør ordremottak
 OptionMULTIPRICESIsOn=Opsjonen "Flere priser pr. segment" er slått på. Det betyr at en vare har flere utsalgspriser og salgsverdi ikke kan kalkuleres
 ProductStockWarehouseCreated=Varsel for nedre og ønsket varebeholdning opprettet
 ProductStockWarehouseUpdated=Varsel for nedre og ønsket varebeholdning oppdatert
 ProductStockWarehouseDeleted=Varsel for nedre og ønsket varebeholdning slettet
 AddNewProductStockWarehouse=Sett ny grense for nedre og ønsket varebeholdning 
-AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
+AddStockLocationLine=Reduser mengden, legg deretter til et annet lager for dette produktet
+InventoryDate=Lagerdato
+NewInventory=Ny oversikt
+inventorySetup = Oppsett av varetelling
+inventoryCreatePermission=Opprett ny varetelling
+inventoryReadPermission=Vis varetellinger
+inventoryWritePermission=Oppdater oversikt
+inventoryValidatePermission=Valider varetelling
+inventoryTitle=Varetelling
+inventoryListTitle=Varetellinger
+inventoryListEmpty=Ingen varetelling pågår
+inventoryCreateDelete=Opprett/slett varetelling
+inventoryCreate=Opprett ny
+inventoryEdit=Endre
+inventoryValidate=Validert
+inventoryDraft=Løpende
+inventorySelectWarehouse=Lagervalg
+inventoryConfirmCreate=Opprett
+inventoryOfWarehouse=Oversiktfor lager: %s
+inventoryErrorQtyAdd=Feil: en mengde er mindre enn null
+inventoryMvtStock=Etter varetelling
+inventoryWarningProductAlreadyExists=Denne varen er allerede på listen
+SelectCategory=Kategorifilter
+SelectFournisseur=Leverandørfilter
+inventoryOnDate=Varetelling
+INVENTORY_DISABLE_VIRTUAL=Tillat å ikke redusere subvare fra et sett på lager
+INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Bruk innkjøpspris hvis ingen siste innkjøpspris finnes
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Lagerbevegelse har dato for varetelling
+inventoryChangePMPPermission=Tillat å endre PMP-verdi for en vare
+ColumnNewPMP=Ny enhet PMP
+OnlyProdsInStock=Ikke legg til vare uten lager
+TheoricalQty=Teoretisk antall
+TheoricalValue=Teoretisk antall
+LastPA=Siste BP
+CurrentPA=Gjeldende BP
+RealQty=Virkelig antall
+RealValue=Virkelig verdi
+RegulatedQty=Regulert antall
+AddInventoryProduct=Legg til vare i varetelling
+AddProduct=Legg til
+ApplyPMP=Legg til PMP
+FlushInventory=Tøm varetelling
+ConfirmFlushInventory=Bekrefter du denne handlingen?
+InventoryFlushed=Varetelling tømt
+ExitEditMode=Avslutt endring
+inventoryDeleteLine=Slett linje
+RegulateStock=Reguler lager
+ListInventory=Liste
diff --git a/htdocs/langs/nb_NO/stripe.lang b/htdocs/langs/nb_NO/stripe.lang
new file mode 100644
index 00000000000..370e76ddd50
--- /dev/null
+++ b/htdocs/langs/nb_NO/stripe.lang
@@ -0,0 +1,42 @@
+# Dolibarr language file - Source file is en_US - stripe
+StripeSetup=Stripe-moduloppsett
+StripeDesc=Denne modulen tilbyr sider for å tillate betaling på <a href="http://www.stripe.com" target="_blank"> Stripe </a> av kunder. Dette kan brukes til gratis betaling eller for betaling på et bestemt Dolibarr-objekt (faktura, bestilling, ...)
+StripeOrCBDoPayment=Betal med kredittkort eller Stripe
+FollowingUrlAreAvailableToMakePayments=Følgende nettadresser er tilgjengelige for kundene til å foreta betalinger for Dolibarr objekter
+PaymentForm=Betalingskjema
+WelcomeOnPaymentPage=Velkommen på våre elektroniske betalingstjenester
+ThisScreenAllowsYouToPay=I detteskjermbildet kan du foreta en online betaling til %s.
+ThisIsInformationOnPayment=Betalingsinformasjon
+ToComplete=For å fullføre
+YourEMail=E-post for betalingsbekreftelsen
+STRIPE_PAYONLINE_SENDEMAIL=E-post-varsel etter en betaling (vellykket eller ikke)
+Creditor=Kreditor
+PaymentCode=Betalingskode
+StripeDoPayment=Gå til betaling
+YouWillBeRedirectedOnStripe=Du blir omdirigert til en sikret Stripeside for å legge inn kredittkortinformasjon
+Continue=Neste
+ToOfferALinkForOnlinePayment=URL for %s betaling
+ToOfferALinkForOnlinePaymentOnOrder=URL for å tilby et %s brukergrensesnitt for online betaling av kundeordre
+ToOfferALinkForOnlinePaymentOnInvoice=URL for å tilby et %s brukergrensesnitt for online betaling av kundefaktura
+ToOfferALinkForOnlinePaymentOnContractLine=URL for å tilby et %s brukergrensesnitt for online betaling av en kontraktlinje
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL for å tilby et %s brukergrensesnitt for online betaling av et fribeløp beløp
+ToOfferALinkForOnlinePaymentOnMemberSubscription=URL for å tilby et %s brukergrensesnitt for online betaling av medlemsabonnement
+YouCanAddTagOnUrl=Du kan også legge til URL-parameter <b>&tag=<i>verdier</i></b> til noen av disse URLene (kreves kun ved betaling av fribeløp) for å legge til dine egne merknader til betalingen kommentar.
+SetupStripeToHavePaymentCreatedAutomatically=Sett opp Stripe med url <b> %s</b> for å få betaling opprettet automatisk når den er validert av Stripe.
+YourPaymentHasBeenRecorded=Denne siden bekrefter at din betaling er registrert. Takk.
+YourPaymentHasNotBeenRecorded=Din betaling ble ikke registrert og transaksjonen har blitt kansellert.
+AccountParameter=Kontoparametre
+UsageParameter=Parametre for bruk
+InformationToFindParameters=Hjelp til å finne din %s kontoinformasjon
+STRIPE_CGI_URL_V2=Url av Stripe CGI-modul for betaling
+VendorName=Navn på leverandøren
+CSSUrlForPaymentForm=URL til CSS-stilark for betalingsskjema
+MessageOK=Returside for melding om validert betaling
+MessageKO=Returside for melding om avbrutt betaling
+NewStripePaymentReceived=Ny Stripe betaling mottatt
+NewStripePaymentFailed=Ny Stripe betaling prøvd men mislyktes
+STRIPE_TEST_SECRET_KEY=Hemmelig testnøkkel
+STRIPE_TEST_PUBLISHABLE_KEY=Publiserbar testnøkkel
+STRIPE_LIVE_SECRET_KEY=Hemmelig live-nøkkel
+STRIPE_LIVE_PUBLISHABLE_KEY=Publiserbar live-nøkkel
+StripeLiveEnabled=Stripe live aktivert (ellers test/sandbox modus)
diff --git a/htdocs/langs/nb_NO/trips.lang b/htdocs/langs/nb_NO/trips.lang
index a9297977a60..c2bbaab5985 100644
--- a/htdocs/langs/nb_NO/trips.lang
+++ b/htdocs/langs/nb_NO/trips.lang
@@ -12,7 +12,7 @@ ListOfFees=Oversikt over avgifter
 TypeFees=Avgiftstyper
 ShowTrip=Vis utgiftsrapport
 NewTrip=Ny reiseregning
-CompanyVisited=Firma/organiasjon besøkt
+CompanyVisited=Firma/organisasjon besøkt
 FeesKilometersOrAmout=Beløp eller kilometer
 DeleteTrip=Slett reiseregning
 ConfirmDeleteTrip=Er du sikker på at du vil slette denne utgiftsrapporten?
@@ -21,9 +21,9 @@ ListToApprove=Venter på godkjenning
 ExpensesArea=Område for reiseregninger
 ClassifyRefunded=Klassifisert 'refundert'
 ExpenseReportWaitingForApproval=En ny reiseregning er sendt inn for godkjenning
-ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
-ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForApprovalMessage=En ny utgiftsrapport er blitt sendt inn og venter på godkjenning.\n-Bruker: %s\n-Periode: %s\nKlikk her for å validere: %s
+ExpenseReportWaitingForReApproval=En utgiftsrapport er blitt sendt inn for ny godkjenning
+ExpenseReportWaitingForReApprovalMessage=En utgiftsrapport er blitt sendt inn og venter på ny godkjenning.\n%s, du godkjente ikke rapporten på grunn av: %s\nEn ny versjon er blitt sendt inn og venter på din godkjenning.\n- Bruker: %s\n- Periode: %s\nKlikk her for å validere: %s
 ExpenseReportApproved=En utgiftsrapport ble godkjent
 ExpenseReportApprovedMessage=Utgiftrapport %s ble godkjent.\n- Bruker: %s\n- Godkjent av: %s\nKlikk her for å vise utgiftsrapporten: %s
 ExpenseReportRefused=En utgiftsrapport ble avvist
@@ -70,6 +70,7 @@ DATE_SAVE=Godkjennelsesdato
 DATE_CANCEL=Kansellert dato
 DATE_PAIEMENT=Betalt dato
 BROUILLONNER=Gjenåpne
+ExpenseReportRef=Ref. utgiftsrapport
 ValidateAndSubmit=Valider og send til godkjenning
 ValidatedWaitingApproval=Validert (venter på godkjenning)
 NOT_AUTHOR=Reiseregningener ikke opprettet av deg. Operasjonen avbrutt.
@@ -87,5 +88,5 @@ NoTripsToExportCSV=Ingen reiseregning å eksportere for denne perioden
 ExpenseReportPayment=Betaling av utgiftsrapport
 ExpenseReportsToApprove=Utgiftsrapporter for godkjenning
 ExpenseReportsToPay=Utgiftsrapport å betale
-CloneExpenseReport=Klon utgiftsrapport
+CloneExpenseReport=Klon kostnadsrapport
 ConfirmCloneExpenseReport=Er du sikker på at du vil klone denne utgiftsrapporten?
diff --git a/htdocs/langs/nb_NO/users.lang b/htdocs/langs/nb_NO/users.lang
index 25974e60c54..0bb7b019a0e 100644
--- a/htdocs/langs/nb_NO/users.lang
+++ b/htdocs/langs/nb_NO/users.lang
@@ -66,8 +66,8 @@ InternalUser=Intern bruker
 ExportDataset_user_1=Dolibarr brukere og egenskaper
 DomainUser=Domenebruker %s
 Reactivate=Reaktiver
-CreateInternalUserDesc=Med dette skjemaet kan du opprette en intern bruker til din bedrift/organisasjon. For å lage en ekstern bruker (kunde, leverandør, osv), bruk knappen 'Lag Dolibarr bruker' fra tredjeparts kontaktkort
-InternalExternalDesc=En <b>intern</b> bruker er er en som er en del av firmaet/organisasjonen.<br>En <b>ekstern</b> bruker er en kunde, leverandør eller annen tredjeperson.<br><br>I begge tilfelle styres brukeren av Dolibarr-rettigheter. Dessuten kan eksterne brukere ha en annen menybehandler enn interne brukere (Se Hjem - Oppsett - Visning)
+CreateInternalUserDesc=Dette skjemaet gir deg mulighet til å opprette en intern bruker til din bedrift/organisasjon. For å opprette en ekstern bruker (kunde, leverandør, ...), bruk knappen "Opprett Dolibarr-bruker" fra tredjeparts kontaktkort.
+InternalExternalDesc=En <b> intern </b> bruker er en bruker som er en del av firmaet / organisasjonen. <br> En <b> ekstern </b> bruker er en kunde, leverandør eller annen. <br><br>Begge tilfeller definerer rettigheter i Dolibarr. Også eksterne brukere kan ha en annen menybehandling enn interne brukere (Se Hjem - Oppsett - Skjerm)
 PermissionInheritedFromAGroup=Rettigheter innvilget fordi de er arvet av en brukegruppe.
 Inherited=Arvet
 UserWillBeInternalUser=Opprettet bruker vil være en intern bruker (fordi ikke knyttet til en bestemt tredjepart)
diff --git a/htdocs/langs/nb_NO/website.lang b/htdocs/langs/nb_NO/website.lang
index aa3e3a60f61..2b1eef2ec38 100644
--- a/htdocs/langs/nb_NO/website.lang
+++ b/htdocs/langs/nb_NO/website.lang
@@ -24,5 +24,5 @@ SetAsHomePage=Sett som startside
 RealURL=Virkelig URL
 ViewWebsiteInProduction=Vis webside ved hjelp av  hjemme-URL
 SetHereVirtualHost=Hvis du kan sette opp en dedikert virtuell vert med en rotkatalog på <strong>%s</strong> på webserveren din, kan du definere det virtuelle vertsnavnet her, slik at forhåndsvisningen også kan gjøres ved hjelp av denne direkte webserver-adgangen og ikke bare ved bruk av Dolibarr serveren.
-PreviewSiteServedByWebServer=Forhåndsvis %s i en ny fane. %s will bli håndtert av en ekstern webserver (som Apache, Nginx, IIS). Du må installere og sette opp denne serveren først.<br>URL'en til %s håndtert av ekstern server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Forhåndsvis %s i en ny fane. %s vil håndteres av Dolibarr-serveren slik at det ikke er behov for en ekstern webserver (som Apache, Nginx, IIS).<br>Det upraktiske er at URL til websider bruker banen til Dolibarr.<br> URL'en til %s håndtert av Dolibarr:<br><strong>%s</strong>
+PreviewSiteServedByWebServer=Forhåndsvis %s i en ny fane. <br> <br> %s vil bli kjørt på en ekstern webserver (som Apache, Nginx, IIS). Du må installere og sette opp denne serveren før du peker på katalogen: <br> <strong>%s</strong>  <br> URL til ekstern server: <br> <strong> %s</strong>
+PreviewSiteServedByDolibarr=Forhåndsvisning %s i en ny fane. <br> <br> %s vil bli kjørt av Dolibarr-serveren, slik at det ikke trengs noen ekstra webserver (som Apache, Nginx, IIS). <br> Bakdelen er at nettadressen til sidene er ikke brukervennlige og starter med banen til Dolibarr. <br> URL kjørt av Dolibarr: <br> <strong> %s</strong> <br> <br> For å bruke din egen eksterne webserver til å betjene denne websiden, opprett en virtuell vert på webserveren din som peker på katalogen <br> <strong> %s</strong><br> og skriv deretter inn navnet på denne virtuelle serveren og klikk på den andre forhåndsvisningsknappen.

From 504d376f843e1cc933f8ac46bd51aa6423cb370e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Jun 2017 21:34:33 +0200
Subject: [PATCH 307/438] Sync transifex

---
 htdocs/langs/ar_SA/accountancy.lang       |   92 +-
 htdocs/langs/ar_SA/admin.lang             |  115 +-
 htdocs/langs/ar_SA/compta.lang            |   18 +-
 htdocs/langs/ar_SA/cron.lang              |   16 +-
 htdocs/langs/ar_SA/errors.lang            |   15 +-
 htdocs/langs/ar_SA/main.lang              |   42 +-
 htdocs/langs/ar_SA/other.lang             |   44 +-
 htdocs/langs/ar_SA/projects.lang          |   31 +-
 htdocs/langs/bg_BG/accountancy.lang       |   86 +-
 htdocs/langs/bg_BG/admin.lang             |  115 +-
 htdocs/langs/bg_BG/compta.lang            |   18 +-
 htdocs/langs/bg_BG/cron.lang              |   16 +-
 htdocs/langs/bg_BG/errors.lang            |   15 +-
 htdocs/langs/bg_BG/main.lang              |   42 +-
 htdocs/langs/bg_BG/other.lang             |   44 +-
 htdocs/langs/bg_BG/projects.lang          |   31 +-
 htdocs/langs/bn_BD/accountancy.lang       |   86 +-
 htdocs/langs/bn_BD/admin.lang             |  115 +-
 htdocs/langs/bn_BD/compta.lang            |   18 +-
 htdocs/langs/bn_BD/cron.lang              |   16 +-
 htdocs/langs/bn_BD/errors.lang            |   15 +-
 htdocs/langs/bn_BD/main.lang              |   42 +-
 htdocs/langs/bn_BD/other.lang             |   44 +-
 htdocs/langs/bn_BD/projects.lang          |   31 +-
 htdocs/langs/bs_BA/accountancy.lang       |  140 +-
 htdocs/langs/bs_BA/admin.lang             |  249 ++-
 htdocs/langs/bs_BA/banks.lang             |  139 +-
 htdocs/langs/bs_BA/bills.lang             |  214 +-
 htdocs/langs/bs_BA/boxes.lang             |    6 +-
 htdocs/langs/bs_BA/companies.lang         |  211 +-
 htdocs/langs/bs_BA/compta.lang            |   82 +-
 htdocs/langs/bs_BA/contracts.lang         |    2 +
 htdocs/langs/bs_BA/cron.lang              |   20 +-
 htdocs/langs/bs_BA/ecm.lang               |    4 +-
 htdocs/langs/bs_BA/errors.lang            |   15 +-
 htdocs/langs/bs_BA/holiday.lang           |    6 +-
 htdocs/langs/bs_BA/install.lang           |   29 +-
 htdocs/langs/bs_BA/main.lang              | 1434 ++++++-------
 htdocs/langs/bs_BA/members.lang           |   10 +-
 htdocs/langs/bs_BA/orders.lang            |    6 +-
 htdocs/langs/bs_BA/other.lang             |   44 +-
 htdocs/langs/bs_BA/printing.lang          |    6 +-
 htdocs/langs/bs_BA/products.lang          |   35 +-
 htdocs/langs/bs_BA/projects.lang          |   37 +-
 htdocs/langs/bs_BA/propal.lang            |    6 +-
 htdocs/langs/bs_BA/resource.lang          |    7 +-
 htdocs/langs/bs_BA/stocks.lang            |   58 +-
 htdocs/langs/bs_BA/supplier_proposal.lang |   12 +-
 htdocs/langs/bs_BA/suppliers.lang         |    1 +
 htdocs/langs/bs_BA/trips.lang             |   13 +-
 htdocs/langs/bs_BA/users.lang             |   76 +-
 htdocs/langs/bs_BA/withdrawals.lang       |    7 +-
 htdocs/langs/ca_ES/accountancy.lang       |   92 +-
 htdocs/langs/ca_ES/admin.lang             |  159 +-
 htdocs/langs/ca_ES/agenda.lang            |    6 +-
 htdocs/langs/ca_ES/compta.lang            |   16 +-
 htdocs/langs/ca_ES/contracts.lang         |    2 +
 htdocs/langs/ca_ES/cron.lang              |   18 +-
 htdocs/langs/ca_ES/errors.lang            |   23 +-
 htdocs/langs/ca_ES/main.lang              |   52 +-
 htdocs/langs/ca_ES/members.lang           |    8 +-
 htdocs/langs/ca_ES/other.lang             |   50 +-
 htdocs/langs/ca_ES/projects.lang          |   23 +-
 htdocs/langs/ca_ES/resource.lang          |    5 +
 htdocs/langs/ca_ES/stocks.lang            |   58 +-
 htdocs/langs/cs_CZ/accountancy.lang       |  370 ++--
 htdocs/langs/cs_CZ/admin.lang             |  867 ++++----
 htdocs/langs/cs_CZ/compta.lang            |  124 +-
 htdocs/langs/cs_CZ/cron.lang              |   52 +-
 htdocs/langs/cs_CZ/errors.lang            |  183 +-
 htdocs/langs/cs_CZ/main.lang              |  282 +--
 htdocs/langs/cs_CZ/other.lang             |  102 +-
 htdocs/langs/cs_CZ/projects.lang          |  175 +-
 htdocs/langs/da_DK/accountancy.lang       |   86 +-
 htdocs/langs/da_DK/admin.lang             |  115 +-
 htdocs/langs/da_DK/compta.lang            |   18 +-
 htdocs/langs/da_DK/cron.lang              |   16 +-
 htdocs/langs/da_DK/errors.lang            |   15 +-
 htdocs/langs/da_DK/main.lang              |   42 +-
 htdocs/langs/da_DK/other.lang             |   44 +-
 htdocs/langs/da_DK/projects.lang          |   31 +-
 htdocs/langs/de_AT/accountancy.lang       |    2 -
 htdocs/langs/de_AT/admin.lang             | 1567 +-------------
 htdocs/langs/de_AT/banks.lang             |    1 -
 htdocs/langs/de_AT/compta.lang            |    2 +-
 htdocs/langs/de_AT/main.lang              |  757 +------
 htdocs/langs/de_AT/paypal.lang            |    2 -
 htdocs/langs/de_CH/accountancy.lang       |    1 -
 htdocs/langs/de_CH/admin.lang             | 1453 +------------
 htdocs/langs/de_CH/bills.lang             |    2 -
 htdocs/langs/de_CH/companies.lang         |    1 -
 htdocs/langs/de_CH/cron.lang              |    1 -
 htdocs/langs/de_CH/main.lang              |  708 +------
 htdocs/langs/de_CH/projects.lang          |    1 -
 htdocs/langs/de_DE/accountancy.lang       |  150 +-
 htdocs/langs/de_DE/admin.lang             |  275 +--
 htdocs/langs/de_DE/agenda.lang            |   20 +-
 htdocs/langs/de_DE/banks.lang             |   65 +-
 htdocs/langs/de_DE/bills.lang             |  138 +-
 htdocs/langs/de_DE/bookmarks.lang         |    6 +-
 htdocs/langs/de_DE/boxes.lang             |   18 +-
 htdocs/langs/de_DE/categories.lang        |    5 +-
 htdocs/langs/de_DE/commercial.lang        |    5 +-
 htdocs/langs/de_DE/companies.lang         |   23 +-
 htdocs/langs/de_DE/compta.lang            |   28 +-
 htdocs/langs/de_DE/contracts.lang         |    4 +-
 htdocs/langs/de_DE/cron.lang              |   20 +-
 htdocs/langs/de_DE/errors.lang            |   45 +-
 htdocs/langs/de_DE/exports.lang           |   16 +-
 htdocs/langs/de_DE/holiday.lang           |    6 +-
 htdocs/langs/de_DE/install.lang           |    3 +-
 htdocs/langs/de_DE/mails.lang             |   40 +-
 htdocs/langs/de_DE/main.lang              |  102 +-
 htdocs/langs/de_DE/members.lang           |   24 +-
 htdocs/langs/de_DE/other.lang             |   56 +-
 htdocs/langs/de_DE/paypal.lang            |   10 +-
 htdocs/langs/de_DE/products.lang          |  115 +-
 htdocs/langs/de_DE/projects.lang          |   69 +-
 htdocs/langs/de_DE/sendings.lang          |   21 +-
 htdocs/langs/de_DE/stocks.lang            |   68 +-
 htdocs/langs/de_DE/users.lang             |    8 +-
 htdocs/langs/de_DE/workflow.lang          |    4 +-
 htdocs/langs/el_CY/accountancy.lang       |    2 -
 htdocs/langs/el_CY/admin.lang             | 1665 +--------------
 htdocs/langs/el_CY/main.lang              |  800 -------
 htdocs/langs/el_GR/accountancy.lang       |   86 +-
 htdocs/langs/el_GR/admin.lang             |  115 +-
 htdocs/langs/el_GR/compta.lang            |   20 +-
 htdocs/langs/el_GR/cron.lang              |   16 +-
 htdocs/langs/el_GR/errors.lang            |   15 +-
 htdocs/langs/el_GR/main.lang              |   44 +-
 htdocs/langs/el_GR/other.lang             |   44 +-
 htdocs/langs/el_GR/projects.lang          |   29 +-
 htdocs/langs/en_AU/accountancy.lang       |    4 -
 htdocs/langs/en_AU/admin.lang             | 1652 +--------------
 htdocs/langs/en_AU/bills.lang             |    2 -
 htdocs/langs/en_AU/cashdesk.lang          |    1 -
 htdocs/langs/en_AU/main.lang              |  778 -------
 htdocs/langs/en_AU/trips.lang             |    2 -
 htdocs/langs/en_CA/accountancy.lang       |    4 -
 htdocs/langs/en_CA/admin.lang             | 1660 +--------------
 htdocs/langs/en_CA/cashdesk.lang          |    2 -
 htdocs/langs/en_CA/main.lang              |  793 -------
 htdocs/langs/en_CA/trips.lang             |    2 -
 htdocs/langs/en_GB/accountancy.lang       |    4 -
 htdocs/langs/en_GB/admin.lang             | 1630 +--------------
 htdocs/langs/en_GB/bills.lang             |    2 -
 htdocs/langs/en_GB/cashdesk.lang          |    2 -
 htdocs/langs/en_GB/main.lang              |  770 -------
 htdocs/langs/en_GB/stocks.lang            |    1 -
 htdocs/langs/en_GB/trips.lang             |    1 -
 htdocs/langs/en_IN/accountancy.lang       |    4 -
 htdocs/langs/en_IN/admin.lang             | 1665 +--------------
 htdocs/langs/en_IN/cashdesk.lang          |    2 -
 htdocs/langs/en_IN/main.lang              |  800 -------
 htdocs/langs/en_IN/trips.lang             |    2 -
 htdocs/langs/es_AR/accountancy.lang       |    4 -
 htdocs/langs/es_AR/admin.lang             | 1665 +--------------
 htdocs/langs/es_AR/main.lang              |  800 -------
 htdocs/langs/es_BO/accountancy.lang       |    4 -
 htdocs/langs/es_BO/admin.lang             | 1665 +--------------
 htdocs/langs/es_BO/main.lang              |  800 -------
 htdocs/langs/es_CL/accountancy.lang       |    4 -
 htdocs/langs/es_CL/admin.lang             | 1647 +--------------
 htdocs/langs/es_CL/main.lang              |  794 +------
 htdocs/langs/es_CL/other.lang             |    1 +
 htdocs/langs/es_CO/accountancy.lang       |    4 -
 htdocs/langs/es_CO/admin.lang             | 1657 +--------------
 htdocs/langs/es_CO/compta.lang            |    1 +
 htdocs/langs/es_CO/main.lang              |  784 -------
 htdocs/langs/es_DO/accountancy.lang       |    4 -
 htdocs/langs/es_DO/admin.lang             | 1645 +--------------
 htdocs/langs/es_DO/main.lang              |  800 -------
 htdocs/langs/es_EC/accountancy.lang       |    4 -
 htdocs/langs/es_EC/admin.lang             | 1665 +--------------
 htdocs/langs/es_EC/main.lang              |  800 -------
 htdocs/langs/es_ES/accountancy.lang       |   86 +-
 htdocs/langs/es_ES/admin.lang             |   99 +-
 htdocs/langs/es_ES/compta.lang            |   14 +-
 htdocs/langs/es_ES/cron.lang              |   16 +-
 htdocs/langs/es_ES/errors.lang            |   15 +-
 htdocs/langs/es_ES/main.lang              |   38 +-
 htdocs/langs/es_ES/other.lang             |   44 +-
 htdocs/langs/es_ES/projects.lang          |   23 +-
 htdocs/langs/es_MX/accountancy.lang       |  234 +--
 htdocs/langs/es_MX/admin.lang             | 1633 +--------------
 htdocs/langs/es_MX/companies.lang         |    1 -
 htdocs/langs/es_MX/compta.lang            |    1 +
 htdocs/langs/es_MX/main.lang              |  529 +----
 htdocs/langs/es_MX/other.lang             |    1 +
 htdocs/langs/es_PA/accountancy.lang       |    4 -
 htdocs/langs/es_PA/admin.lang             | 1666 +--------------
 htdocs/langs/es_PA/main.lang              |  800 -------
 htdocs/langs/es_PE/accountancy.lang       |    4 +-
 htdocs/langs/es_PE/admin.lang             | 1655 +--------------
 htdocs/langs/es_PE/main.lang              |  794 -------
 htdocs/langs/es_PY/accountancy.lang       |    4 -
 htdocs/langs/es_PY/admin.lang             | 1665 +--------------
 htdocs/langs/es_PY/main.lang              |  800 -------
 htdocs/langs/es_VE/accountancy.lang       |    4 -
 htdocs/langs/es_VE/admin.lang             | 1650 ---------------
 htdocs/langs/es_VE/main.lang              |  787 +------
 htdocs/langs/es_VE/other.lang             |    1 -
 htdocs/langs/es_VE/supplier_proposal.lang |    1 -
 htdocs/langs/et_EE/accountancy.lang       |   86 +-
 htdocs/langs/et_EE/admin.lang             |  115 +-
 htdocs/langs/et_EE/compta.lang            |   18 +-
 htdocs/langs/et_EE/cron.lang              |   16 +-
 htdocs/langs/et_EE/errors.lang            |   15 +-
 htdocs/langs/et_EE/main.lang              |   42 +-
 htdocs/langs/et_EE/other.lang             |   44 +-
 htdocs/langs/et_EE/projects.lang          |   31 +-
 htdocs/langs/eu_ES/accountancy.lang       |   86 +-
 htdocs/langs/eu_ES/admin.lang             |  115 +-
 htdocs/langs/eu_ES/compta.lang            |   18 +-
 htdocs/langs/eu_ES/cron.lang              |   16 +-
 htdocs/langs/eu_ES/errors.lang            |   15 +-
 htdocs/langs/eu_ES/main.lang              |   42 +-
 htdocs/langs/eu_ES/other.lang             |   44 +-
 htdocs/langs/eu_ES/projects.lang          |   31 +-
 htdocs/langs/fa_IR/accountancy.lang       |   86 +-
 htdocs/langs/fa_IR/admin.lang             |  115 +-
 htdocs/langs/fa_IR/compta.lang            |   18 +-
 htdocs/langs/fa_IR/cron.lang              |   16 +-
 htdocs/langs/fa_IR/errors.lang            |   15 +-
 htdocs/langs/fa_IR/main.lang              |   42 +-
 htdocs/langs/fa_IR/other.lang             |   44 +-
 htdocs/langs/fa_IR/projects.lang          |   31 +-
 htdocs/langs/fi_FI/accountancy.lang       |  126 +-
 htdocs/langs/fi_FI/admin.lang             |  163 +-
 htdocs/langs/fi_FI/compta.lang            |   20 +-
 htdocs/langs/fi_FI/cron.lang              |   16 +-
 htdocs/langs/fi_FI/errors.lang            |   15 +-
 htdocs/langs/fi_FI/main.lang              |  196 +-
 htdocs/langs/fi_FI/other.lang             |   44 +-
 htdocs/langs/fi_FI/projects.lang          |   33 +-
 htdocs/langs/fr_BE/accountancy.lang       |    4 -
 htdocs/langs/fr_BE/admin.lang             | 1640 +--------------
 htdocs/langs/fr_BE/cashdesk.lang          |    2 -
 htdocs/langs/fr_BE/main.lang              |  793 -------
 htdocs/langs/fr_CA/accountancy.lang       |  142 +-
 htdocs/langs/fr_CA/admin.lang             | 1784 +++-------------
 htdocs/langs/fr_CA/agenda.lang            |   13 +
 htdocs/langs/fr_CA/banks.lang             |   41 +
 htdocs/langs/fr_CA/bills.lang             |   82 +-
 htdocs/langs/fr_CA/boxes.lang             |   44 +
 htdocs/langs/fr_CA/cashdesk.lang          |    2 +-
 htdocs/langs/fr_CA/categories.lang        |   11 +
 htdocs/langs/fr_CA/commercial.lang        |    8 +-
 htdocs/langs/fr_CA/companies.lang         |   32 +
 htdocs/langs/fr_CA/compta.lang            |   47 +
 htdocs/langs/fr_CA/contracts.lang         |   63 +
 htdocs/langs/fr_CA/cron.lang              |   46 +
 htdocs/langs/fr_CA/deliveries.lang        |   20 +
 htdocs/langs/fr_CA/donations.lang         |   23 +
 htdocs/langs/fr_CA/ecm.lang               |   30 +
 htdocs/langs/fr_CA/errors.lang            |  169 ++
 htdocs/langs/fr_CA/exports.lang           |  110 +
 htdocs/langs/fr_CA/holiday.lang           |   74 +
 htdocs/langs/fr_CA/install.lang           |   17 +-
 htdocs/langs/fr_CA/interventions.lang     |   47 +
 htdocs/langs/fr_CA/ldap.lang              |   19 +
 htdocs/langs/fr_CA/mails.lang             |  125 ++
 htdocs/langs/fr_CA/main.lang              |  877 ++------
 htdocs/langs/fr_CA/margins.lang           |   32 +
 htdocs/langs/fr_CA/members.lang           |  148 ++
 htdocs/langs/fr_CA/oauth.lang             |   22 +-
 htdocs/langs/fr_CA/opensurvey.lang        |   44 +
 htdocs/langs/fr_CA/orders.lang            |  102 +
 htdocs/langs/fr_CA/other.lang             |  162 ++
 htdocs/langs/fr_CA/paybox.lang            |   30 +
 htdocs/langs/fr_CA/printing.lang          |   36 +-
 htdocs/langs/fr_CA/products.lang          |  199 +-
 htdocs/langs/fr_CA/projects.lang          |  143 ++
 htdocs/langs/fr_CA/propal.lang            |   20 +
 htdocs/langs/fr_CA/salaries.lang          |    5 +-
 htdocs/langs/fr_CA/sendings.lang          |   49 +
 htdocs/langs/fr_CA/sms.lang               |   33 +
 htdocs/langs/fr_CA/stocks.lang            |  106 +
 htdocs/langs/fr_CA/supplier_proposal.lang |   38 +
 htdocs/langs/fr_CA/suppliers.lang         |    7 +
 htdocs/langs/fr_CA/trips.lang             |   63 +
 htdocs/langs/fr_CA/users.lang             |   14 +
 htdocs/langs/fr_CA/website.lang           |   20 +
 htdocs/langs/fr_CA/withdrawals.lang       |   85 +
 htdocs/langs/fr_CA/workflow.lang          |    3 +
 htdocs/langs/fr_CH/accountancy.lang       |    4 -
 htdocs/langs/fr_CH/admin.lang             | 1665 +--------------
 htdocs/langs/fr_CH/cashdesk.lang          |    2 -
 htdocs/langs/fr_CH/main.lang              |  800 -------
 htdocs/langs/fr_FR/accountancy.lang       |   86 +-
 htdocs/langs/fr_FR/admin.lang             |  111 +-
 htdocs/langs/fr_FR/bills.lang             |   24 +-
 htdocs/langs/fr_FR/companies.lang         |   23 +-
 htdocs/langs/fr_FR/compta.lang            |   12 +-
 htdocs/langs/fr_FR/cron.lang              |   18 +-
 htdocs/langs/fr_FR/errors.lang            |   15 +-
 htdocs/langs/fr_FR/exports.lang           |    6 +
 htdocs/langs/fr_FR/main.lang              |   77 +-
 htdocs/langs/fr_FR/other.lang             |   44 +-
 htdocs/langs/fr_FR/projects.lang          |   22 +-
 htdocs/langs/fr_NC/projects.lang          |  192 --
 htdocs/langs/fr_NC/sendings.lang          |   71 -
 htdocs/langs/he_IL/accountancy.lang       |   86 +-
 htdocs/langs/he_IL/admin.lang             |  115 +-
 htdocs/langs/he_IL/compta.lang            |   18 +-
 htdocs/langs/he_IL/cron.lang              |   16 +-
 htdocs/langs/he_IL/errors.lang            |   15 +-
 htdocs/langs/he_IL/main.lang              |   42 +-
 htdocs/langs/he_IL/other.lang             |   44 +-
 htdocs/langs/he_IL/projects.lang          |   31 +-
 htdocs/langs/hr_HR/accountancy.lang       |   86 +-
 htdocs/langs/hr_HR/admin.lang             |  115 +-
 htdocs/langs/hr_HR/compta.lang            |   18 +-
 htdocs/langs/hr_HR/cron.lang              |   16 +-
 htdocs/langs/hr_HR/errors.lang            |   15 +-
 htdocs/langs/hr_HR/main.lang              |   42 +-
 htdocs/langs/hr_HR/other.lang             |   44 +-
 htdocs/langs/hr_HR/projects.lang          |   31 +-
 htdocs/langs/hu_HU/accountancy.lang       |   90 +-
 htdocs/langs/hu_HU/admin.lang             |  115 +-
 htdocs/langs/hu_HU/compta.lang            |   18 +-
 htdocs/langs/hu_HU/cron.lang              |   40 +-
 htdocs/langs/hu_HU/errors.lang            |   15 +-
 htdocs/langs/hu_HU/main.lang              |   42 +-
 htdocs/langs/hu_HU/other.lang             |   44 +-
 htdocs/langs/hu_HU/projects.lang          |   31 +-
 htdocs/langs/id_ID/accountancy.lang       |   86 +-
 htdocs/langs/id_ID/admin.lang             |  115 +-
 htdocs/langs/id_ID/compta.lang            |   18 +-
 htdocs/langs/id_ID/cron.lang              |   16 +-
 htdocs/langs/id_ID/errors.lang            |   15 +-
 htdocs/langs/id_ID/main.lang              |   42 +-
 htdocs/langs/id_ID/other.lang             |   44 +-
 htdocs/langs/id_ID/projects.lang          |   31 +-
 htdocs/langs/is_IS/accountancy.lang       |   86 +-
 htdocs/langs/is_IS/admin.lang             |  115 +-
 htdocs/langs/is_IS/compta.lang            |   18 +-
 htdocs/langs/is_IS/cron.lang              |   16 +-
 htdocs/langs/is_IS/errors.lang            |   15 +-
 htdocs/langs/is_IS/main.lang              |   42 +-
 htdocs/langs/is_IS/other.lang             |   44 +-
 htdocs/langs/is_IS/projects.lang          |   31 +-
 htdocs/langs/it_IT/accountancy.lang       |   94 +-
 htdocs/langs/it_IT/admin.lang             |  285 +--
 htdocs/langs/it_IT/banks.lang             |   61 +-
 htdocs/langs/it_IT/compta.lang            |  108 +-
 htdocs/langs/it_IT/cron.lang              |   16 +-
 htdocs/langs/it_IT/errors.lang            |   15 +-
 htdocs/langs/it_IT/main.lang              |  130 +-
 htdocs/langs/it_IT/other.lang             |   68 +-
 htdocs/langs/it_IT/projects.lang          |  103 +-
 htdocs/langs/ja_JP/accountancy.lang       |   86 +-
 htdocs/langs/ja_JP/admin.lang             |  117 +-
 htdocs/langs/ja_JP/compta.lang            |   18 +-
 htdocs/langs/ja_JP/cron.lang              |   16 +-
 htdocs/langs/ja_JP/errors.lang            |   15 +-
 htdocs/langs/ja_JP/main.lang              |   42 +-
 htdocs/langs/ja_JP/other.lang             |   44 +-
 htdocs/langs/ja_JP/projects.lang          |   31 +-
 htdocs/langs/ka_GE/accountancy.lang       |   86 +-
 htdocs/langs/ka_GE/admin.lang             |  115 +-
 htdocs/langs/ka_GE/compta.lang            |   18 +-
 htdocs/langs/ka_GE/cron.lang              |   16 +-
 htdocs/langs/ka_GE/errors.lang            |   15 +-
 htdocs/langs/ka_GE/main.lang              |   42 +-
 htdocs/langs/ka_GE/other.lang             |   44 +-
 htdocs/langs/ka_GE/projects.lang          |   31 +-
 htdocs/langs/km_KH/accountancy.lang       |   86 +-
 htdocs/langs/km_KH/admin.lang             |  115 +-
 htdocs/langs/km_KH/compta.lang            |   18 +-
 htdocs/langs/km_KH/cron.lang              |   16 +-
 htdocs/langs/km_KH/errors.lang            |   15 +-
 htdocs/langs/km_KH/main.lang              |   42 +-
 htdocs/langs/km_KH/other.lang             |   44 +-
 htdocs/langs/km_KH/projects.lang          |   31 +-
 htdocs/langs/kn_IN/accountancy.lang       |   86 +-
 htdocs/langs/kn_IN/admin.lang             |  115 +-
 htdocs/langs/kn_IN/compta.lang            |   18 +-
 htdocs/langs/kn_IN/cron.lang              |   16 +-
 htdocs/langs/kn_IN/errors.lang            |   15 +-
 htdocs/langs/kn_IN/main.lang              |   42 +-
 htdocs/langs/kn_IN/other.lang             |   44 +-
 htdocs/langs/kn_IN/projects.lang          |   31 +-
 htdocs/langs/ko_KR/accountancy.lang       |   86 +-
 htdocs/langs/ko_KR/admin.lang             |  115 +-
 htdocs/langs/ko_KR/compta.lang            |   18 +-
 htdocs/langs/ko_KR/cron.lang              |   16 +-
 htdocs/langs/ko_KR/errors.lang            |   15 +-
 htdocs/langs/ko_KR/main.lang              |   42 +-
 htdocs/langs/ko_KR/other.lang             |   44 +-
 htdocs/langs/ko_KR/projects.lang          |   31 +-
 htdocs/langs/lo_LA/accountancy.lang       |   86 +-
 htdocs/langs/lo_LA/admin.lang             |  115 +-
 htdocs/langs/lo_LA/compta.lang            |   18 +-
 htdocs/langs/lo_LA/cron.lang              |   16 +-
 htdocs/langs/lo_LA/errors.lang            |   15 +-
 htdocs/langs/lo_LA/main.lang              |   42 +-
 htdocs/langs/lo_LA/other.lang             |   44 +-
 htdocs/langs/lo_LA/projects.lang          |   31 +-
 htdocs/langs/lt_LT/accountancy.lang       |   86 +-
 htdocs/langs/lt_LT/admin.lang             |  115 +-
 htdocs/langs/lt_LT/compta.lang            |   18 +-
 htdocs/langs/lt_LT/cron.lang              |   16 +-
 htdocs/langs/lt_LT/errors.lang            |   15 +-
 htdocs/langs/lt_LT/main.lang              |   40 +-
 htdocs/langs/lt_LT/other.lang             |   44 +-
 htdocs/langs/lt_LT/projects.lang          |   31 +-
 htdocs/langs/lv_LV/accountancy.lang       |   86 +-
 htdocs/langs/lv_LV/admin.lang             |  115 +-
 htdocs/langs/lv_LV/compta.lang            |   18 +-
 htdocs/langs/lv_LV/cron.lang              |   16 +-
 htdocs/langs/lv_LV/errors.lang            |   15 +-
 htdocs/langs/lv_LV/main.lang              |   40 +-
 htdocs/langs/lv_LV/other.lang             |   44 +-
 htdocs/langs/lv_LV/projects.lang          |   29 +-
 htdocs/langs/mk_MK/accountancy.lang       |   86 +-
 htdocs/langs/mk_MK/admin.lang             |  115 +-
 htdocs/langs/mk_MK/compta.lang            |   18 +-
 htdocs/langs/mk_MK/cron.lang              |   16 +-
 htdocs/langs/mk_MK/errors.lang            |   15 +-
 htdocs/langs/mk_MK/main.lang              |   42 +-
 htdocs/langs/mk_MK/other.lang             |   44 +-
 htdocs/langs/mk_MK/projects.lang          |   31 +-
 htdocs/langs/mn_MN/accountancy.lang       |   86 +-
 htdocs/langs/mn_MN/admin.lang             |  115 +-
 htdocs/langs/mn_MN/compta.lang            |   18 +-
 htdocs/langs/mn_MN/cron.lang              |   16 +-
 htdocs/langs/mn_MN/errors.lang            |   15 +-
 htdocs/langs/mn_MN/main.lang              |   42 +-
 htdocs/langs/mn_MN/other.lang             |   44 +-
 htdocs/langs/mn_MN/projects.lang          |   31 +-
 htdocs/langs/nl_BE/accountancy.lang       |    4 +-
 htdocs/langs/nl_BE/admin.lang             | 1673 +--------------
 htdocs/langs/nl_BE/compta.lang            |    3 -
 htdocs/langs/nl_BE/main.lang              |  764 -------
 htdocs/langs/nl_BE/other.lang             |    1 -
 htdocs/langs/nl_BE/products.lang          |    1 -
 htdocs/langs/nl_NL/accountancy.lang       |  100 +-
 htdocs/langs/nl_NL/admin.lang             |  115 +-
 htdocs/langs/nl_NL/agenda.lang            |    3 +
 htdocs/langs/nl_NL/compta.lang            |   18 +-
 htdocs/langs/nl_NL/cron.lang              |   16 +-
 htdocs/langs/nl_NL/errors.lang            |   15 +-
 htdocs/langs/nl_NL/main.lang              |   42 +-
 htdocs/langs/nl_NL/other.lang             |   44 +-
 htdocs/langs/nl_NL/projects.lang          |   31 +-
 htdocs/langs/pl_PL/accountancy.lang       |  106 +-
 htdocs/langs/pl_PL/admin.lang             |  257 ++-
 htdocs/langs/pl_PL/compta.lang            |   18 +-
 htdocs/langs/pl_PL/cron.lang              |   42 +-
 htdocs/langs/pl_PL/errors.lang            |   29 +-
 htdocs/langs/pl_PL/main.lang              |   98 +-
 htdocs/langs/pl_PL/other.lang             |  120 +-
 htdocs/langs/pl_PL/projects.lang          |   31 +-
 htdocs/langs/pt_BR/accountancy.lang       |   44 +-
 htdocs/langs/pt_BR/admin.lang             |  458 +---
 htdocs/langs/pt_BR/banks.lang             |    6 +-
 htdocs/langs/pt_BR/bookmarks.lang         |    6 -
 htdocs/langs/pt_BR/boxes.lang             |    1 -
 htdocs/langs/pt_BR/companies.lang         |    3 -
 htdocs/langs/pt_BR/compta.lang            |    5 -
 htdocs/langs/pt_BR/cron.lang              |    9 -
 htdocs/langs/pt_BR/errors.lang            |    3 +-
 htdocs/langs/pt_BR/main.lang              |  427 +---
 htdocs/langs/pt_BR/other.lang             |   13 -
 htdocs/langs/pt_BR/paypal.lang            |    3 -
 htdocs/langs/pt_BR/products.lang          |    2 -
 htdocs/langs/pt_BR/projects.lang          |   10 +-
 htdocs/langs/pt_BR/supplier_proposal.lang |    1 -
 htdocs/langs/pt_PT/accountancy.lang       |  402 ++--
 htdocs/langs/pt_PT/admin.lang             | 2311 +++++++++++----------
 htdocs/langs/pt_PT/bills.lang             |   78 +-
 htdocs/langs/pt_PT/bookmarks.lang         |   28 +-
 htdocs/langs/pt_PT/boxes.lang             |   30 +-
 htdocs/langs/pt_PT/companies.lang         |   45 +-
 htdocs/langs/pt_PT/compta.lang            |   20 +-
 htdocs/langs/pt_PT/cron.lang              |   24 +-
 htdocs/langs/pt_PT/errors.lang            |   21 +-
 htdocs/langs/pt_PT/main.lang              |   52 +-
 htdocs/langs/pt_PT/other.lang             |   46 +-
 htdocs/langs/pt_PT/projects.lang          |   31 +-
 htdocs/langs/ro_RO/accountancy.lang       |   86 +-
 htdocs/langs/ro_RO/admin.lang             |  115 +-
 htdocs/langs/ro_RO/compta.lang            |   18 +-
 htdocs/langs/ro_RO/cron.lang              |   16 +-
 htdocs/langs/ro_RO/errors.lang            |   15 +-
 htdocs/langs/ro_RO/main.lang              |   40 +-
 htdocs/langs/ro_RO/other.lang             |   44 +-
 htdocs/langs/ro_RO/paybox.lang            |    1 +
 htdocs/langs/ro_RO/projects.lang          |   31 +-
 htdocs/langs/ru_RU/accountancy.lang       |   86 +-
 htdocs/langs/ru_RU/admin.lang             |  227 +-
 htdocs/langs/ru_RU/compta.lang            |   18 +-
 htdocs/langs/ru_RU/cron.lang              |   16 +-
 htdocs/langs/ru_RU/errors.lang            |   15 +-
 htdocs/langs/ru_RU/main.lang              |   98 +-
 htdocs/langs/ru_RU/other.lang             |   44 +-
 htdocs/langs/ru_RU/projects.lang          |   31 +-
 htdocs/langs/sk_SK/accountancy.lang       |   86 +-
 htdocs/langs/sk_SK/admin.lang             |  115 +-
 htdocs/langs/sk_SK/compta.lang            |   18 +-
 htdocs/langs/sk_SK/cron.lang              |   16 +-
 htdocs/langs/sk_SK/errors.lang            |   15 +-
 htdocs/langs/sk_SK/main.lang              |   42 +-
 htdocs/langs/sk_SK/other.lang             |   44 +-
 htdocs/langs/sk_SK/projects.lang          |   31 +-
 htdocs/langs/sl_SI/accountancy.lang       |   92 +-
 htdocs/langs/sl_SI/admin.lang             |  115 +-
 htdocs/langs/sl_SI/compta.lang            |   18 +-
 htdocs/langs/sl_SI/cron.lang              |   16 +-
 htdocs/langs/sl_SI/dict.lang              |    2 +-
 htdocs/langs/sl_SI/errors.lang            |   15 +-
 htdocs/langs/sl_SI/main.lang              |   40 +-
 htdocs/langs/sl_SI/other.lang             |   44 +-
 htdocs/langs/sl_SI/projects.lang          |   31 +-
 htdocs/langs/sq_AL/accountancy.lang       |   86 +-
 htdocs/langs/sq_AL/admin.lang             |  115 +-
 htdocs/langs/sq_AL/compta.lang            |   18 +-
 htdocs/langs/sq_AL/cron.lang              |   16 +-
 htdocs/langs/sq_AL/errors.lang            |   15 +-
 htdocs/langs/sq_AL/main.lang              |   42 +-
 htdocs/langs/sq_AL/other.lang             |   44 +-
 htdocs/langs/sq_AL/projects.lang          |   31 +-
 htdocs/langs/sr_RS/accountancy.lang       |   86 +-
 htdocs/langs/sr_RS/admin.lang             |  115 +-
 htdocs/langs/sr_RS/compta.lang            |   18 +-
 htdocs/langs/sr_RS/cron.lang              |   16 +-
 htdocs/langs/sr_RS/errors.lang            |   15 +-
 htdocs/langs/sr_RS/main.lang              |   42 +-
 htdocs/langs/sr_RS/other.lang             |   44 +-
 htdocs/langs/sr_RS/projects.lang          |   31 +-
 htdocs/langs/sv_SE/accountancy.lang       |   86 +-
 htdocs/langs/sv_SE/admin.lang             |  115 +-
 htdocs/langs/sv_SE/compta.lang            |   18 +-
 htdocs/langs/sv_SE/cron.lang              |   16 +-
 htdocs/langs/sv_SE/errors.lang            |   15 +-
 htdocs/langs/sv_SE/main.lang              |   42 +-
 htdocs/langs/sv_SE/other.lang             |   44 +-
 htdocs/langs/sv_SE/projects.lang          |   31 +-
 htdocs/langs/sw_SW/accountancy.lang       |   86 +-
 htdocs/langs/sw_SW/admin.lang             |  115 +-
 htdocs/langs/sw_SW/compta.lang            |   18 +-
 htdocs/langs/sw_SW/cron.lang              |   16 +-
 htdocs/langs/sw_SW/errors.lang            |   15 +-
 htdocs/langs/sw_SW/main.lang              |   42 +-
 htdocs/langs/sw_SW/other.lang             |   44 +-
 htdocs/langs/sw_SW/projects.lang          |   31 +-
 htdocs/langs/th_TH/accountancy.lang       |   86 +-
 htdocs/langs/th_TH/admin.lang             |  115 +-
 htdocs/langs/th_TH/compta.lang            |   18 +-
 htdocs/langs/th_TH/cron.lang              |   16 +-
 htdocs/langs/th_TH/errors.lang            |   15 +-
 htdocs/langs/th_TH/main.lang              |   42 +-
 htdocs/langs/th_TH/other.lang             |   44 +-
 htdocs/langs/th_TH/projects.lang          |   31 +-
 htdocs/langs/tr_TR/accountancy.lang       |  154 +-
 htdocs/langs/tr_TR/admin.lang             |  137 +-
 htdocs/langs/tr_TR/compta.lang            |   18 +-
 htdocs/langs/tr_TR/cron.lang              |   16 +-
 htdocs/langs/tr_TR/errors.lang            |   15 +-
 htdocs/langs/tr_TR/main.lang              |   40 +-
 htdocs/langs/tr_TR/other.lang             |   44 +-
 htdocs/langs/tr_TR/projects.lang          |   23 +-
 htdocs/langs/uk_UA/accountancy.lang       |   86 +-
 htdocs/langs/uk_UA/admin.lang             |  115 +-
 htdocs/langs/uk_UA/compta.lang            |   18 +-
 htdocs/langs/uk_UA/cron.lang              |   16 +-
 htdocs/langs/uk_UA/errors.lang            |   15 +-
 htdocs/langs/uk_UA/main.lang              |   42 +-
 htdocs/langs/uk_UA/other.lang             |   44 +-
 htdocs/langs/uk_UA/projects.lang          |   31 +-
 htdocs/langs/uz_UZ/accountancy.lang       |   86 +-
 htdocs/langs/uz_UZ/admin.lang             |  115 +-
 htdocs/langs/uz_UZ/compta.lang            |   18 +-
 htdocs/langs/uz_UZ/cron.lang              |   16 +-
 htdocs/langs/uz_UZ/errors.lang            |   15 +-
 htdocs/langs/uz_UZ/main.lang              |   42 +-
 htdocs/langs/uz_UZ/other.lang             |   44 +-
 htdocs/langs/uz_UZ/projects.lang          |   31 +-
 htdocs/langs/vi_VN/accountancy.lang       |   86 +-
 htdocs/langs/vi_VN/admin.lang             |  115 +-
 htdocs/langs/vi_VN/compta.lang            |   18 +-
 htdocs/langs/vi_VN/cron.lang              |   16 +-
 htdocs/langs/vi_VN/errors.lang            |   15 +-
 htdocs/langs/vi_VN/main.lang              |   42 +-
 htdocs/langs/vi_VN/other.lang             |   44 +-
 htdocs/langs/vi_VN/projects.lang          |   31 +-
 htdocs/langs/zh_CN/accountancy.lang       |   86 +-
 htdocs/langs/zh_CN/admin.lang             |  119 +-
 htdocs/langs/zh_CN/compta.lang            |   18 +-
 htdocs/langs/zh_CN/cron.lang              |   16 +-
 htdocs/langs/zh_CN/errors.lang            |   17 +-
 htdocs/langs/zh_CN/main.lang              |   58 +-
 htdocs/langs/zh_CN/other.lang             |   44 +-
 htdocs/langs/zh_CN/projects.lang          |   31 +-
 htdocs/langs/zh_TW/accountancy.lang       |   86 +-
 htdocs/langs/zh_TW/admin.lang             |  115 +-
 htdocs/langs/zh_TW/compta.lang            |   18 +-
 htdocs/langs/zh_TW/cron.lang              |   16 +-
 htdocs/langs/zh_TW/errors.lang            |   15 +-
 htdocs/langs/zh_TW/main.lang              |   42 +-
 htdocs/langs/zh_TW/other.lang             |   44 +-
 htdocs/langs/zh_TW/projects.lang          |   31 +-
 604 files changed, 19999 insertions(+), 65100 deletions(-)
 delete mode 100644 htdocs/langs/de_AT/accountancy.lang
 delete mode 100644 htdocs/langs/el_CY/accountancy.lang
 delete mode 100644 htdocs/langs/en_AU/accountancy.lang
 delete mode 100644 htdocs/langs/en_AU/trips.lang
 delete mode 100644 htdocs/langs/en_CA/accountancy.lang
 delete mode 100644 htdocs/langs/en_CA/cashdesk.lang
 delete mode 100644 htdocs/langs/en_CA/trips.lang
 delete mode 100644 htdocs/langs/en_GB/accountancy.lang
 delete mode 100644 htdocs/langs/en_GB/cashdesk.lang
 delete mode 100644 htdocs/langs/en_IN/accountancy.lang
 delete mode 100644 htdocs/langs/en_IN/cashdesk.lang
 delete mode 100644 htdocs/langs/en_IN/trips.lang
 delete mode 100644 htdocs/langs/es_AR/accountancy.lang
 delete mode 100644 htdocs/langs/es_BO/accountancy.lang
 delete mode 100644 htdocs/langs/es_CO/accountancy.lang
 delete mode 100644 htdocs/langs/es_DO/accountancy.lang
 delete mode 100644 htdocs/langs/es_EC/accountancy.lang
 delete mode 100644 htdocs/langs/es_PA/accountancy.lang
 delete mode 100644 htdocs/langs/es_PY/accountancy.lang
 delete mode 100644 htdocs/langs/es_VE/accountancy.lang
 delete mode 100644 htdocs/langs/fr_BE/cashdesk.lang
 delete mode 100644 htdocs/langs/fr_CH/accountancy.lang
 delete mode 100644 htdocs/langs/fr_CH/cashdesk.lang
 delete mode 100644 htdocs/langs/fr_NC/sendings.lang

diff --git a/htdocs/langs/ar_SA/accountancy.lang b/htdocs/langs/ar_SA/accountancy.lang
index 039b124e30b..7e3daf418cc 100644
--- a/htdocs/langs/ar_SA/accountancy.lang
+++ b/htdocs/langs/ar_SA/accountancy.lang
@@ -3,8 +3,8 @@ ACCOUNTING_EXPORT_SEPARATORCSV=فاصل العمود لملف التصدير
 ACCOUNTING_EXPORT_DATE=تنسيق التاريخ لملف التصدير
 ACCOUNTING_EXPORT_PIECE=تصدير عدد القطعة
 ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=تصدير مع الحساب العام
-ACCOUNTING_EXPORT_LABEL=Export label
-ACCOUNTING_EXPORT_AMOUNT=Export amount
+ACCOUNTING_EXPORT_LABEL=تصدير التسمية
+ACCOUNTING_EXPORT_AMOUNT=تصدير الكمية
 ACCOUNTING_EXPORT_DEVISE=Export currency
 Selectformat=حدد تنسيق للملف
 ACCOUNTING_EXPORT_PREFIX_SPEC=تحديد بادئة لاسم الملف
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=إضافة حساب محاسبي
 AccountAccounting=حساب محاسبي
 AccountAccountingShort=حساب
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -66,13 +74,13 @@ MenuLoanAccounts=Loan accounts
 MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=Binding to accounts
-CustomersVentilation=Customer invoice binding
+CustomersVentilation=ربط فاتورة الزبون 
 SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=دفتر الأستاذ العام
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Account balance
 
 CAHTF=إجمالي شراء المورد قبل الضريبة
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=دفتر البيع اليومي
@@ -132,19 +140,19 @@ Sens=السيناتور
 Codejournal=دفتر اليومية
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=دفتر المالية اليومي
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=دفتر المالية اليومي المتضمن لجميع الدفعات عن طريق الحساب المصرفي
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=الدائن والمدين لا يمكن أن يكون لهم قيمة في الوقت نفسه
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=قائمة الحسابات المحاسبية
 
 Pcgtype=فئة الحساب
-Pcgsubtype=تحت فئة الحساب
+Pcgsubtype=Subclass of account
 
 TotalVente=المبيعات الإجمالية قبل الضريبة
 TotalMarge=إجمالي هامش المبيعات
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=خطأ، لا يمكنك حذف هذا الحساب المحاسبي لأنه مستخدم
 MvtNotCorrectlyBalanced=الحركة غير متوازنة\nالدائن =%s\nالمدين =%s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=رمز
+Nature=طبيعة
+AccountingJournalType1=Various operation
+AccountingJournalType2=مبيعات
+AccountingJournalType3=مشتريات
+AccountingJournalType4=بنك
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=صادرات
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index 545f8e03803..652a819b883 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=مستخدمين داخليين
 ExternalUsers=مستخدمين خارجيين
 GUISetup=العرض
 SetupArea=منطقة الإعداد
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=نموذج لاختبار تحميل ملف (وفقا لبرنامج الإعداد)
 IfModuleEnabled=ملاحظة : نعم فعالة فقط في حال كان النموذج <b>%s</b> مفعل
 RemoveLock=قم بحذف الملف <b>%s</b> إذا كان موجوداً لتمكين اداة التحديث
@@ -85,7 +86,7 @@ Mask=القناع
 NextValue=القيمة التالية
 NextValueForInvoices=القيمة التالية (الفواتير)
 NextValueForCreditNotes=القيمة التالية (ملاحظات دائن)
-NextValueForDeposit=القيمة التالية (وديعة)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=القيمة التالية (استبدال)
 MustBeLowerThanPHPLimit=ملاحظة : البي إتش بي الخاص بك يحد من حجم الملفات المرفوعة <b>%s</b> %s, مهما كان الحجم المدخل
 NoMaxSizeByPHPLimit=ملاحظة : لم يتم وضح حد في إعدادات الـ PHP الخاص بك
@@ -103,7 +104,7 @@ MenuIdParent=رمز القائمة العليا
 DetailMenuIdParent=رمز القائمة العليا (فراغ للقائمة العليا)
 DetailPosition=رتب الرقم لتعريف موقع القائمة
 AllMenus=الكل
-NotConfigured=النموذج غير مهيء
+NotConfigured=Module/Application not configured
 Active=نشطة
 SetupShort=الإعداد
 OtherOptions=الخيارات الأخرى
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=ألفاصلة الألفية
 Destination=المقصد
 IdModule=ID حدة
 IdPermissions=ضوابط ID
-Modules=النموذج
 LanguageBrowserParameter=الوحدة %s
 LocalisationDolibarrParameters=الوحدات المحلية
 ClientTZ=المنطقة الزمنية للعميل (المستخدم)
@@ -123,7 +123,8 @@ PHPTZ=المنطقة الزمنية خادم PHP
 DaylingSavingTime=التوقيت الصيفي
 CurrentHour=PHP خادم ساعة
 CurrentSessionTimeOut=إنتها مدة التصفح الحالية
-YouCanEditPHPTZ=لضبط توقيت PHP مختلفة (غير مطلوب)، يمكنك محاولة إضافة .htacces الملف مع مثل هذا الخط "ابق ضاغطا TZ أوروبا / باريس"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max number of lines for widgets
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=الصلاحيات
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=فقط العناصر من <a href="%s">النماذج المفعلة </a> سوف تظهر.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=كلمة السر في قاعدة بيانات 
 InstrucToEncodePass=لديك كلمة السر المشفرة في ملف <b>conf.php،</b> استبدال الخط <br> <b>$ dolibarr_main_db_pass = "..."؛</b> <br> بواسطة <br> <b>$ dolibarr_main_db_pass = "crypted:٪ ليالي".</b>
 InstrucToClearPass=لديك كلمة مرور فك الشفرة (واضح) في ملف <b>conf.php،</b> استبدال الخط <br> <b>$ dolibarr_main_db_pass = "crypted: ...".</b> <br> بواسطة <br> <b>$ dolibarr_main_db_pass = "%s".</b>
 ProtectAndEncryptPdfFiles=حماية الملفات ولدت الشعبي (لا recommandd ، تقتحم الجماهيري الشعبي وتوليد)
-ProtectAndEncryptPdfFilesDesc=حماية وجود وثيقة من وثائق وتبقي الشعبي توفيرها لقراءة وطباعة أي متصفح الشعبي. ومع ذلك ، وتحريرها ونسخها وليس من الممكن بعد الآن. علما أن استخدام هذه الميزة تجعل بناء عالمي لا يعمل المتراكمة الشعبي (مثل الفواتير غير المدفوعة).
+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=ميزة
 DolibarrLicense=الترخيص
 Developpers=مطوري / المساهمين
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr الانترنت التجريبي
 OfficialMarketPlace=المسؤول عن وحدات السوق الخارجية / أدونس
 OfficialWebHostingService=المشار خدمات استضافة المواقع (سحابة استضافة)
 ReferencedPreferredPartners=الشركاء المفضلين
-OtherResources=RESSOURCES AUTRES
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=للمستخدم أو وثائق المطور (الوثيقة، أسئلة وأجوبة ...)، <br> نلقي نظرة على Dolibarr يكي: <br> <b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=عن أي أسئلة أخرى / مساعدة، يمكنك استخدام المنتدى Dolibarr: <br> <b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=هذا المجال يمكن أن تساعدك في الحصول على مساعدة لتقديم خدمات الدعم على Dolibarr.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=ميزة لا تتوفر على مثل أنظمة ي
 SubmitTranslation=إذا ترجمة لهذه اللغة ليست كاملة أو تجد الأخطاء، يمكنك تصحيح هذا عن طريق تحرير الملفات إلى دليل <b>LANGS /%s</b> وتقديم التغيير إلى www.transifex.com/dolibarr-association/dolibarr/~~V
 SubmitTranslationENUS=إذا ترجمة لهذه اللغة ليست كاملة أو تجد الأخطاء، يمكنك تصحيح هذا عن طريق تحرير الملفات إلى دليل <b>LANGS /%s</b> وتقديم الملفات التي تم تعديلها على dolibarr.org/forum أو للمطورين على github.com/Dolibarr/dolibarr.
 ModuleSetup=إعداد وحدة
-ModulesSetup=نمائط الإعداد
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=نظام
 ModuleFamilyCrm=إدارة علاقات العملاء (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=Dolibarr النسخة الحالية
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=خادم التحديث متواجد حاليا
+WithCounter=Manage a counter
 GenericMaskCodes=يمكنك إدخال أي قناع الترقيم. في هذا القناع ، وبعد ويمكن استخدام العلامات : <br> <b>(000000)</b> يطابق عدد الذي سيكون على كل يزداد ٪ s. كما تدخل العديد من أصفار على النحو المنشود طول المضادة. المضاد وسيتم الانتهاء من اصفار من اليسار من أجل الحصول على أكبر عدد اصفار كما القناع. <br> <b>000000 +000) (نفس</b> السابقة ولكن يقابل المقابلة لعدد للحق من علامة + يطبق اعتبارا من أول ٪ s. <br> <b>000000 @ (س)</b> نفس السابقة ولكن المضاد هو إعادة الصفر عندما يتم التوصل إلى الشهر خ خ ما بين 1 و 12). إذا كان هذا الخيار هو المستخدمة وس 2 أو أعلى ، ثم تسلسل (ذ ذ م م)) ((سنة أو ملم)) (مطلوب أيضا. <br> <b>(ب)</b> اليوم (01 الى 31). <br> <b>() ملم</b> في الشهر (01 الى 12). <br> <b>(كذا)</b> ، <b>(سنة))</b> أو <b>(ذ</b> السنة أكثر من 2 أو 4 أو 1 الأرقام. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=جميع الشخصيات الاخرى في قناع سوف تظل سليمة. <br> المساحات غير مسموح بها. <br>
-GenericMaskCodes4a=<u>ومثال على 99th %s من طرف ثالث TheCompany عمله 2007-01-31 :</u> <br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>ومثال على طرف ثالث على إنشاء 2007-03-01 :</u> <br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
+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=العودة للتخصيص وفقا لعدد محدد القناع.
 ServerAvailableOnIPOrPort=الخدمة متاحة في معالجة <b>٪ ق %s</b> على الميناء
 ServerNotAvailableOnIPOrPort=الخدمة غير متاحة في التصدي <b>٪ ق %s</b> على الميناء
@@ -369,19 +375,21 @@ Int=عدد صحيح
 Float=Float
 DateAndTime=Date and hour
 Unique=Unique
-Boolean=Boolean (Checkbox)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = هاتف
 ExtrafieldPrice = الأسعار
 ExtrafieldMail = Email
 ExtrafieldUrl = Url
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=الرمز السري
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= مربع من الجدول
+ExtrafieldRadio=Radio buttons (on choice only)
+ExtrafieldCheckBox=Checkboxes
+ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=رابط إلى كائن
+ComputedFormula=Computed field
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=حقل
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=& مجموعات المستخدمين
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=ويلاحظ اعتماد الفواتير وإدارة العمل
 Module40Name=الموردين
 Module40Desc=الموردين وإدارة وشراء (الأوامر والفواتير)
 Module42Name=Syslog
-Module42Desc=قطع الأشجار مرافق (syslog)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=المحررين
 Module49Desc=المحررين إدارة
 Module50Name=المنتجات
@@ -499,8 +521,8 @@ Module410Name=Webcalendar
 Module410Desc=التكامل Webcalendar
 Module500Name=المصروفات الخاصة
 Module500Desc=إدارة المصروفات الخاصة (الضرائب، الضرائب الاجتماعية أو المالية وتوزيعات الأرباح)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=قرض
 Module520Desc=إدارة القروض
 Module600Name=الإخطارات
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP التحويلات Maxmind القدرات
 Module3100Name=سكايب
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
-Module4000Desc=إدارة الموارد البشرية
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=شركة متعددة
 Module5000Desc=يسمح لك لإدارة الشركات المتعددة
 Module6000Name=سير العمل
@@ -591,7 +615,7 @@ Permission32=إنشاء / تعديل المنتجات
 Permission34=حذف المنتجات
 Permission36=انظر / إدارة المنتجات المخفية
 Permission38=منتجات التصدير
-Permission41=مشاريع القراءة والمهام (مشروع مشترك ومشاريع انا اتصال ل). كما يمكن أن يدخل الوقت المستهلك في المهام الموكلة (الجدول الزمني)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=حذف مشاريع
 Permission45=Export projects
@@ -844,12 +868,14 @@ DictionaryOrderMethods=طرق ترتيب
 DictionarySource=أصل مقترحات / أوامر
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=نماذج للتخطيط للحسابات
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=رسائل البريد الإلكتروني قوالب
 DictionaryUnits=الوحدات
 DictionaryProspectStatus=حالة التنقيب
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=الوضع فرصة للمشروع / الرصاص
 SetupSaved=الإعداد المحفوظة
+SetupNotSaved=Setup not saved
 BackToModuleList=العودة إلى قائمة الوحدات
 BackToDictionaryList=العودة إلى قائمة القواميس
 VATManagement=إدارة الضريبة على القيمة المضافة
@@ -921,7 +947,7 @@ Host=الخادم
 DriverType=سائق نوع
 SummarySystem=نظام معلومات موجزة
 SummaryConst=قائمة بجميع Dolibarr الإعداد البارامترات
-MenuCompanySetup=الشركة / المؤسسة
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= معيار مدير القائمة
 DefaultMenuSmartphoneManager=الهاتف الذكي القائمة مدير
 Skin=موضوع الجلد
@@ -931,12 +957,14 @@ DefaultMaxSizeList=افتراضي الطول الاقصى للقوائم
 DefaultMaxSizeShortList=طول الأقصى الافتراضي للقوائم قصيرة (أي في بطاقة العميل)
 MessageOfDay=رسالة اليوم
 MessageLogin=ادخل صفحة الرسالة
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=دائم البحث عن شكل القائمة اليمنى
 DefaultLanguage=اللغة الافتراضية لاستخدام (شفرة اللغة)
 EnableMultilangInterface=تتيح واجهة متعددة اللغات
 EnableShowLogo=عرض الشعار على اليسار القائمة
-CompanyInfo=الشركة / المؤسسة المعلومات
-CompanyIds=الشركة / المؤسسة الهويات
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=اسم
 CompanyAddress=عنوان
 CompanyZip=الرمز البريدي
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=تأخير التسامح (في يوم) في حالة
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=تأخير التسامح (في يوم) في حالة تأهب قبل لإيداع الشيكات للقيام
 Delays_MAIN_DELAY_EXPENSEREPORTS=تأخير التسامح (بالأيام) قبل حالة تأهب لتقارير النفقات الموافقة
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=القيود الأخرى القائمة في إدارة اختياري البارامترات.
 LogEvents=مراجعة الحسابات الأحداث الأمنية
 Audit=المراجعة
@@ -987,7 +1015,7 @@ BrowserOS=متصفح OS
 ListOfSecurityEvents=قائمة الأحداث الأمنية Dolibarr
 SecurityEventsPurged=تطهير الاحداث الامنية
 LogEventDesc=هنا يمكنك تمكين قطع الأشجار لDolibarr الأحداث الأمنية. يمكن للمشرفين ثم انظر مضمونه عبر <b>نظام</b> القائمة <b>أدوات -- لمراجعة الحسابات.</b> محذرا من أن هذه الميزة يمكن أن تستهلك كمية كبيرة من البيانات في قاعدة البيانات.
-AreaForAdminOnly=هذه الميزات يمكن أن تستخدم من قبل <b>مدير المستخدمين</b> فقط.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=نظام المعلومات المتنوعة المعلومات التقنية تحصل في قراءة فقط وواضحة للمشرفين فقط.
 SystemAreaForAdminOnly=هذا المجال المتاح لمدير المستخدمين فقط. أيا من Dolibarr أذونات يمكن أن تقلل من هذا الحد.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists in any language files
+TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=يجب على الأقل تمكين 1 وحدة
 ClassNotFoundIntoPathWarning=لم يتم العثور على  %s في مسار PHP
 YesInSummer=نعم في الصيف
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=تخزين جلسة المشفرة بواسطة Suhosin
 ConditionIsCurrently=الشرط هو حاليا %s
 YouUseBestDriver=استخدام سائق %s التي هو أفضل سائق المتاحة حاليا.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=المهنية معرف فريد
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=تصدير صلة <b>%s </b> شكل متاح على الوصلة التالية : %s
 ##### Invoices #####
 BillsSetup=وحدة إعداد الفواتير
 BillsNumberingModule=الفواتير والقروض وتلاحظ وحدة الترقيم
 BillsPDFModules=فاتورة نماذج الوثائق
+PaymentsPDFModules=Payment documents models
 CreditNote=علما الائتمان
 CreditNotes=ويلاحظ الائتمان
 ForceInvoiceDate=قوة تاريخ الفاتورة تاريخ المصادقة على
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=لا يتم التخزين المؤقت الملفات من
 FilesOfTypeCompressed=يتم ضغط الملفات من نوع %s من قبل خادم HTTP
 FilesOfTypeNotCompressed=لا يتم ضغط الملفات من نوع %s من قبل خادم HTTP
 CacheByServer=ذاكرة التخزين المؤقت من قبل خادم
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=الذاكرة المخبئية من خلال متصفح
 CompressionOfResources=ضغط الردود HTTP
+CompressionOfResourcesDesc=For exemple using the Apache directive "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=مثل هذا الكشف التلقائي غير ممكن مع المتصفحات الحالية
+DefaultValuesDesc=You can define/force here the default value you want to get when your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=المنتجات وحدة الإعداد
 ServiceSetup=خدمات وحدة الإعداد
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=فاتورة تاريخ المستخدمة
 Buy=يشتري
 Sell=يبيع
 InvoiceDateUsed=فاتورة تاريخ المستخدمة
-YourCompanyDoesNotUseVAT=وقد تم تسجيل شركة محددة لعدم استخدام ضريبة القيمة المضافة (الصفحة الرئيسية -- إعداد -- شركة / مؤسسة) ، لذلك لا يوجد خيارات لضريبة القيمة المضافة الإعداد.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=قانون المحاسبة
 AccountancyCodeSell=حساب بيع. رمز
 AccountancyCodeBuy=شراء الحساب. رمز
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=تلقائيا تعيين هذه الحالة مع
 AGENDA_DEFAULT_VIEW=علامة التبويب التي تريد فتح افتراضيا عند اختيار القائمة جدول الأعمال
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=انقر لإعداد وحدة الاتصال الهاتفي
-ClickToDialUrlDesc=ودعا الموقع عندما تنقر على الهاتف picto ذلك. Dans l' رابط ، vous pouvez utiliser ليه balises <br> <b>٪ ٪ 1 $ ق</b> qui الأمصال remplacé قدم المساواة جنيه téléphone دي l' appelé <br> <b>٪ ٪</b> 2 $ <b>ق</b> qui الأمصال remplacé لو قدم المساواة téléphone دي l' appelant جنيه مصري vôtre) <br> <b>٪ ٪ ل 3</b> دولار qui الأمصال remplacé vôtre ادخل clicktodial الفقرة (défini سور vôtre فيشه utilisateur) <br> <b>٪ ٪</b> 4 <b>$</b> ق qui الأمصال remplacé الفقرة vôtre يذكره دي clicktodial عتيق (défini سور vôtre فيشه utilisateur).
+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=هذه الوحدة تسمح لجعل أرقام هواتف يمكن النقر عليها. وهناك انقر على هذه الأيقونة دعوة تجعل هاتفك إلى الاتصال برقم الهاتف. وهذا يمكن أن تستخدم لاستدعاء نظام مركز الاتصال من Dolibarr يمكن أن نسميه ورقم الهاتف على نظام SIP على سبيل المثال.
 ClickToDialUseTelLink=مجرد استخدام الرابط "الهاتف:" على أرقام الهواتف
 ClickToDialUseTelLinkDesc=استخدام هذا الأسلوب إذا كان المستخدمون يكون الهاتف الرقمي أو واجهة البرامج المثبتة على الكمبيوتر نفسه من المتصفح، ويسمى عند النقر على رابط في المتصفح التي تبدأ ب "الهاتف". إذا كنت في حاجة الى حل خادم الكامل (لا حاجة لتثبيت البرامج المحلية)، يجب عليك تعيين هذا إلى "لا" وملء الحقل التالي.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API وحدة الإعداد
 ApiDesc=من خلال تمكين هذه الوحدة، Dolibarr يصبح الخادم REST لتوفير خدمات الإنترنت المتنوعة.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+ApiExporerIs=You can explore and test the APIs at URL
 OnlyActiveElementsAreExposed=ويتعرض عناصر فقط من وحدات تمكين
 ApiKey=مفتاح API
 WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=عرض عام النظام
 BankOrderES=الأسبانية
 BankOrderESDesc=الأسبانية عرض النظام
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=نموذج متعدد شركة الإعداد
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ BackupDumpWizard=المعالج لبناء قاعدة بيانات النسخ ا
 SomethingMakeInstallFromWebNotPossible=تركيب وحدة خارجية غير ممكن من واجهة ويب للسبب التالي:
 SomethingMakeInstallFromWebNotPossible2=لهذا السبب، عملية لترقية وصفت هنا هو دليل على بعد خطوات قليلة يمكن للمستخدم متميز القيام به.
 InstallModuleFromWebHasBeenDisabledByFile=تثبيت وحدة خارجية من التطبيق قد تم تعطيلها من قبل المسؤول. يجب أن يطلب منه إزالة <strong>الملف٪ s</strong> للسماح هذه الميزة.
-ConfFileMuseContainCustom=Installing 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=تسليط الضوء على خطوط الجدول عندما يمر تحرك الماوس فوق
 HighlightLinesColor=تسليط الضوء على لون الخط عند تمرير الماوس فوق (الحفاظ فارغة دون تمييز)
 TextTitleColor=Color of page title
 LinkColor=لون الروابط
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=لون الخلفية
 TopMenuBackgroundColor=لون الخلفية لقائمة الأعلى
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=الحد الأدنى لمدة إشعار (يجب أن يت
 NbAddedAutomatically=عدد الأيام تضاف إلى العدادات من المستخدمين (تلقائيا) كل شهر
 EnterAnyCode=يحتوي هذا الحقل على إشارة لتحديد الخط. أدخل أي قيمة من اختيارك، ولكن من دون أحرف خاصة.
 UnicodeCurrency=أدخل هنا بين الأقواس، وقائمة من عدد البايت التي تمثل رمز العملة. لexemple: ل$، أدخل [36] - للبرازيل R الحقيقي $ [82،36] - ل€، أدخل [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=موقف خط في قوائم السرد
 SellTaxRate=بيع معدل الضريبة
 RecuperableOnly=نعم لضريبة القيمة المضافة "غير مستردة Perçue" مخصصة لبعض الدول في فرنسا. إبقاء القيمة إلى "لا" في جميع الحالات الأخرى.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/ar_SA/compta.lang b/htdocs/langs/ar_SA/compta.lang
index 173c282060a..fa147c7919b 100644
--- a/htdocs/langs/ar_SA/compta.lang
+++ b/htdocs/langs/ar_SA/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=وتحسب المبالغ المبينة
 Param=الإعداد
 RemainingAmountPayment=دفع المبلغ المتبقي :
 Account=حساب
-Accountparent=الوالد حساب
-Accountsparent=حسابات الأم
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=الدخل
 Outcome=نتائج
 ReportInOut=دخل / نتائج
@@ -56,6 +56,7 @@ MenuTaxAndDividends=الضرائب وعوائد
 MenuSocialContributions=الضرائب الاجتماعية / المالية
 MenuNewSocialContribution=الضريبة الاجتماعية / مالية جديدة
 NewSocialContribution=الضريبة الاجتماعية / مالية جديدة
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=الضرائب الاجتماعية / المالية لدفع
 AccountancyTreasuryArea=المحاسبة / الخزانة المنطقة
 NewPayment=دفع جديدة
@@ -134,8 +135,8 @@ RulesResultDue=- وتتضمن الفواتير غير المسددة، والن
 RulesResultInOut=- ويشمل المدفوعات الحقيقية المحرز في الفواتير والمصاريف والضريبة على القيمة المضافة والرواتب. <br> - لأنه يقوم على مواعيد دفع الفواتير والمصاريف والضريبة على القيمة المضافة والرواتب. تاريخ التبرع للتبرع.
 RulesCADue=- ويشمل الفواتير المستحقة على العميل سواء كانت بأجر أو لا. <br> - وهو يستند إلى تاريخ التحقق من هذه الفواتير. <br>
 RulesCAIn=-- ويشمل جميع الفعال دفع الفواتير الواردة من العملاء. <br> -- يقوم على دفع هذه الفواتير تاريخ <br>
-DepositsAreNotIncluded=- يتم ولا تشمل ودائع الفواتير
-DepositsAreIncluded=- وترد الفواتير ودائع
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=تقرير من قبل طرف ثالث IRPF
 LT1ReportByCustomersInInputOutputModeES=تقرير RE طرف ثالث
 VATReport=VAT report
@@ -169,7 +170,7 @@ DescSellsJournal=مبيعات المجلة
 DescPurchasesJournal=شراء مجلة
 InvoiceRef=فاتورة المرجع.
 CodeNotDef=لم يتم تعريف
-WarningDepositsNotIncluded=لا يتم تضمين فواتير الودائع في هذا الإصدار مع هذه الوحدة المحاسبة.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=تاريخ الدفع الأجل لا يمكن أن يكون أقل من تاريخ الكائن.
 Pcg_version=Chart of accounts models
 Pcg_type=نوع PCG
@@ -189,8 +190,10 @@ AccountancyJournal=كود المحاسبة مجلة
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=استنساخ ضريبة اجتماعية / مالية
 ConfirmCloneTax=تأكيد استنساخ ل/ دفع الضرائب المالية الاجتماعي
 CloneTaxForNextMonth=استنساخ لشهر المقبل
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=الضرائب الاجتماعية / المالية
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/ar_SA/cron.lang b/htdocs/langs/ar_SA/cron.lang
index 2b96553e327..a03a0a3a417 100644
--- a/htdocs/langs/ar_SA/cron.lang
+++ b/htdocs/langs/ar_SA/cron.lang
@@ -25,7 +25,7 @@ CronDelete=حذف المهام المجدولة
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=وحدة مهمة مجدولة تسمح لتنفيذ المهمة التي تم التخطيط لها
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=وظيفة
 CronNone=بلا
 CronDtStart=Not before
@@ -57,12 +57,12 @@ CronStatusActiveBtn=تمكين
 CronStatusInactiveBtn=يعطل
 CronTaskInactive=تم تعطيل هذه الوظائف
 CronId=هوية شخصية
-CronClassFile=فصول (filename.class.php)
-CronModuleHelp=اسم Dolibarr وحدة الدليل (يعمل أيضا مع وحدة Dolibarr الخارجية). <BR> لexemple لجلب طريقة الكائن المنتج Dolibarr / htdocs / <u>المنتج</u> /class/product.class.php، وقيمة الوحدة هي <i>المنتج</i>
-CronClassFileHelp=اسم الملف لتحميل. <BR> لexemple لجلب طريقة الكائن المنتج Dolibarr / htdocs / المنتج / فئة / <u>product.class.php،</u> وقيمة اسم ملف فئة هي <i>product.class.php</i>
-CronObjectHelp=اسم الكائن لتحميل. <BR> لexemple لجلب طريقة Dolibarr /htdocs/product/class/product.class.php الكائن المنتج، وقيمة اسم ملف فئة هي <i>المنتج</i>
-CronMethodHelp=طريقة كائن لإطلاق. <BR> لexemple لجلب طريقة Dolibarr /htdocs/product/class/product.class.php الكائن المنتج، وقيمة الأسلوب هو <i>fecth</i>
-CronArgsHelp=الحجج الأسلوب. <BR> لexemple لجلب طريقة Dolibarr /htdocs/product/class/product.class.php الكائن المنتج، وقيمة paramters يمكن أن يكون <i>0، ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=سطر الأوامر لتنفيذ النظام.
 CronCreateJob=إنشاء مهمة مجدولة جديدة
 CronFrom=من عند
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=تعطيل وظيفة
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/ar_SA/errors.lang b/htdocs/langs/ar_SA/errors.lang
index dd0d710929c..46eb89f55e9 100644
--- a/htdocs/langs/ar_SA/errors.lang
+++ b/htdocs/langs/ar_SA/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=فشل إنشاء الملف <b>'٪ ق.</b>
 ErrorFailToRenameDir=فشل إعادة تسمية الدليل <b>'٪ ق'</b> الى <b>'٪ ق.</b>
 ErrorFailToCreateDir=فشل إنشاء الدليل <b>'٪ ق.</b>
 ErrorFailToDeleteDir=فشل حذف الدليل <b>'٪ ق.</b>
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=هذا الاتصال هو اتصال بالفعل تعريف لهذا النوع.
 ErrorCashAccountAcceptsOnlyCashMoney=هذا الحساب المصرفي هو الحساب النقدي ، وذلك ما وافق على نوع من المدفوعات النقدية فقط.
 ErrorFromToAccountsMustDiffers=المصدر والأهداف يجب أن تكون الحسابات المصرفية المختلفة.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=لم يكتب في دليل ٪ ق
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=العثور على بريد إلكتروني صحيح لتركيب خطوط ق ٪ في ملف (على سبيل المثال خط ٪ ق= ٪ مع البريد الإلكتروني)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=تتطلب بعض المجالات لم تملأ.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=فشل إنشاء دليل. تأكد من أن خادم الويب المستخدم أذونات لكتابة وثائق Dolibarr في الدليل. إذا تم تمكين المعلم <b>safe_mode</b> على هذا PHP ، تحقق من أن ملفات Dolibarr php تملك لخدمة الويب المستخدم (أو مجموعة).
 ErrorNoMailDefinedForThisUser=البريد لا يعرف لهذا المستخدم
 ErrorFeatureNeedJavascript=هذه الميزة تحتاج إلى تفعيل جافا سكريبت في العمل. هذا التغيير في البنية -- عرض.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=كمية لخط في فواتير ال
 ErrorWebServerUserHasNotPermission=<b>%s</b> تستخدم حساب مستخدم لتنفيذ خادم الويب لا يوجد لديه إذن لذلك
 ErrorNoActivatedBarcode=لا يوجد نوع الباركود تفعيلها
 ErrUnzipFails=فشل بفك٪ الصورة مع ZipArchive
-ErrNoZipEngine=لا المحرك لبفك الصورة ملف٪ في هذا PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=يجب أن يكون الملف٪ s حزمة البريدي Dolibarr
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=وPHP الضفيرة لم يتم تثبيت، وهذا أمر ضروري لاجراء محادثات مع باي بال
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=لا متغير عمومي مختارة
 ErrorFieldMustBeANumeric=يجب أن يكون <b>حقل٪ الصورة</b> قيمة رقمية
 ErrorMandatoryParametersNotProvided=معيار إلزامي (ق) لم تقدم
 ErrorOppStatusRequiredIfAmount=قمت بتعيين المبلغ المقدر لهذه الفرصة / الرصاص. لذلك يجب عليك أيضا إدخال مكانتها
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=سيئة تعريف القائمة صفيف في الوحدة واصف (القيمة سيئة لfk_menu مفتاح)
 ErrorSavingChanges=وقد ocurred لخطأ عند حفظ التغييرات
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # Warnings
 WarningPasswordSetWithNoAccount=تم تعيين كلمة مرور لهذا العضو. ومع ذلك، تم إنشاء أي حساب المستخدم. لذلك يتم تخزين كلمة المرور هذه ولكن لا يمكن استخدامها للدخول إلى Dolibarr. ويمكن استخدامه من قبل وحدة / واجهة خارجية ولكن إذا كنت لا تحتاج إلى تعريف أي تسجيل دخول أو كلمة المرور لأحد أفراد، يمكنك تعطيل خيار "إدارة تسجيل دخول لكل عضو" من إعداد وحدة الأعضاء. إذا كنت بحاجة إلى إدارة تسجيل الدخول ولكن لا تحتاج إلى أي كلمة المرور، يمكنك الحفاظ على هذا الحقل فارغا لتجنب هذا التحذير. ملاحظة: يمكن أيضا أن تستخدم البريد الإلكتروني لتسجيل الدخول إذا تم ربط عضو إلى المستخدم.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=تاريخ الدفع (٪ ق) هو أقد
 WarningTooManyDataPleaseUseMoreFilters=عدد كبير جدا من البيانات (أكثر من خطوط%s). يرجى استخدام المزيد من المرشحات أو تعيين ثابت٪ الصورة إلى حد أعلى.
 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/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang
index d1838a21b1a..cfdf0efd5b5 100644
--- a/htdocs/langs/ar_SA/main.lang
+++ b/htdocs/langs/ar_SA/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=المعلمة٪ S غير معرف
 ErrorUnknown=خطأ غير معروف
 ErrorSQL=خطأ SQL
 ErrorLogoFileNotFound=لم يتم العثور على ملف شعار '٪ ق'
-ErrorGoToGlobalSetup=اذهب إلى 'شركة / مؤسسة' الإعداد لإصلاح هذه
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=الذهاب إلى الوحدة الإعداد لإصلاح هذه
 ErrorFailedToSendMail=فشل في إرسال البريد (المرسل =٪ ق، استقبال =٪ ق)
 ErrorFileNotUploaded=ويتم تحميل الملف. تحقق لا يتجاوز هذا الحجم الأقصى المسموح به، أن المساحة الحرة المتوفرة على القرص والتي لا يوجد بالفعل ملف بنفس الاسم في هذا الدليل.
@@ -153,6 +153,7 @@ Edit=تحرير
 Validate=التحقق من صحة
 ValidateAndApprove=التحقق من صحة والموافقة
 ToValidate=للتحقق من صحة
+NotValidated=Not validated
 Save=حفظ
 SaveAs=حفظ باسم
 TestConnection=اختبار الاتصال
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=أي ميزة قطع تطبيقية مع وضع <b>
 Connection=الاتصال
 Setup=التثبيت
 Alert=إنذار
+MenuWarnings=تنبيهات
 Previous=سابق
 Next=التالى
 Cards=بطاقات
@@ -308,6 +310,7 @@ Copy=نسخ
 Paste=لصق
 Default=افتراضي
 DefaultValue=القيمة الافتراضية
+DefaultValues=Default values
 Price=السعر
 UnitPrice=سعر الوحدة
 UnitPriceHT=سعر الوحدة (صافي)
@@ -363,7 +366,8 @@ VATRate=معدل الضريبة
 Average=متوسط
 Sum=مجموع
 Delta=دلتا
-Module=وحدة
+Module=Module/Application
+Modules=Modules/Applications
 Option=خيار
 List=قائمة
 FullList=القائمة الكاملة
@@ -387,7 +391,7 @@ ActionRunningNotStarted=لبدء
 ActionRunningShort=In progress
 ActionDoneShort=تم الانتهاء من
 ActionUncomplete=Uncomplete
-CompanyFoundation=شركة / مؤسسة
+CompanyFoundation=Company/Organisation
 ContactsForCompany=اتصالات لهذا الطرف الثالث
 ContactsAddressesForCompany=اتصالات / عناوين لهذا الطرف الثالث
 AddressesForCompany=عناوين لهذا الطرف الثالث
@@ -405,8 +409,9 @@ Generate=توليد
 Duration=المدة الزمنية
 TotalDuration=المدة الإجمالية
 Summary=ملخص
-DolibarrStateBoard=إحصائيات
-DolibarrWorkBoard=مهام العمل متنها
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=متاح
 NotYetAvailable=لم تتوفر بعد
 NotAvailable=غير متوفر
@@ -434,7 +439,7 @@ Reportings=التقارير
 Draft=مسودة
 Drafts=الداما
 Validated=التحقق من صحة
-Opened=Opened
+Opened=فتح
 New=جديد
 Discount=تخفيض السعر
 Unknown=غير معروف
@@ -453,6 +458,7 @@ NextStep=الخطوة التالية
 Datas=البيانات
 None=لا شيء
 NoneF=لا شيء
+NoneOrSeveral=None or several
 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.
 Photo=صورة
@@ -606,7 +612,8 @@ PartialWoman=جزئي
 TotalWoman=المجموع
 NeverReceived=لم يتلق
 Canceled=ألغى
-YouCanChangeValuesForThisListFromDictionarySetup=يمكنك تغيير قيم هذه القائمة من إعداد القائمة - القاموس
+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
 Color=لون
 Documents=ربط الملفات
@@ -642,6 +649,7 @@ FreeLineOfType=دخول مجاني من نوع
 CloneMainAttributes=استنساخ وجوه مع السمات الرئيسية
 PDFMerge=دمج الشعبي
 Merge=دمج
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=وتظهر الصفحة الرئيسية لطباعة ناحية المحتوى
 MenuManager=مدير القائمة
 WarningYouAreInMaintenanceMode=انذار ، كنت في وضع الصيانة ، <b>%s</b> الدخول فقط بحيث يتم السماح لاستخدام التطبيق في الوقت الراهن.
@@ -708,6 +716,7 @@ from=من عند
 toward=نحو
 Access=وصول
 SelectAction=حدد العمل
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=استخدم Ctrl + C لنسخ إلى الحافظة
 SaveUploadedFileWithMask=حفظ الملف على الخادم مع اسم <strong>"%s"</strong> (otherwise "%s")
 OriginFileName=اسم الملف الأصلي
@@ -718,7 +727,7 @@ ViewPrivateNote=عرض الملاحظات
 XMoreLines=٪ ق خط (ق) مخبأة
 PublicUrl=URL العام
 AddBox=إضافة مربع
-SelectElementAndClickRefresh=حدد عنصر وانقر فوق تحديث
+SelectElementAndClick=Select an element and click %s
 PrintFile=طباعة ملف٪ الصورة
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=اذهب إلى الصفحة الرئيسية - إعداد - شركة لتغيير شعار أو الذهاب إلى الصفحة الرئيسية - إعداد - عرض للاختباء.
@@ -734,8 +743,8 @@ Hello=أهلا
 Sincerely=بإخلاص
 DeleteLine=حذف الخط
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
@@ -755,11 +764,20 @@ Calendar=التقويم
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=السنة المالية
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=يوم الاثنين
 Tuesday=الثلاثاء
@@ -817,5 +835,3 @@ SearchIntoContracts=عقود
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=تقارير المصاريف
 SearchIntoLeaves=أوراق
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/ar_SA/other.lang b/htdocs/langs/ar_SA/other.lang
index 184c1f4b849..cceb260f27d 100644
--- a/htdocs/langs/ar_SA/other.lang
+++ b/htdocs/langs/ar_SA/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=تاريخ الميلاد
 BirthdayAlertOn=عيد ميلاد النشطة في حالة تأهب
 BirthdayAlertOff=عيد الميلاد فى حالة تأهب الخاملة
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=تدخل المصادق
 Notify_FICHINTER_SENTBYMAIL=تدخل ترسل عن طريق البريد
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=هذا هو البريد <b>الاختبار</b> (الا
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ سوف تجد هنا الفاتورة __REF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ نود أن نحذر لكم أن __REF__ فاتورة يبدو أن لا يتم سيولي. لذلك هذا هو الفاتورة في المرفق مرة أخرى، بمثابة تذكير. __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__ سوف تجد هنا اقتراح التجاري __PROPREF__ __PERSONALIZED__Sincerely __SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__ سوف تجد هنا طلب السعر __ASKREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__ سوف تجد هنا ترتيب __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ سوف تجد هنا نظامنا __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ سوف تجد هنا الفاتورة __REF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__ سوف تجد هنا الشحن __SHIPPINGREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__ سوف تجد هنا تدخل __FICHINTERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__ __PERSONALIZED__ __SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>الأستاذ عيد ٪ ق</b> هي المعلومات التي تعتمد على طرف ثالث. <br> على سبيل المثال ، لبلد <b>ق ٪</b> انها رمز <b>٪ ق.</b>
 DolibarrDemo=Dolibarr تخطيط موارد المؤسسات وإدارة علاقات العملاء التجريبي
-StatsByNumberOfUnits=إحصاءات في عدد من المنتجات / الخدمات وحدات
-StatsByNumberOfEntities=إحصاءات في عدد من الكيانات في اشارة
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=التدخل ٪ ق المصادق
 EMailTextInvoiceValidated=فاتورة ٪ ق المصادق
diff --git a/htdocs/langs/ar_SA/projects.lang b/htdocs/langs/ar_SA/projects.lang
index dedfa88ea39..f5b26e3f3de 100644
--- a/htdocs/langs/ar_SA/projects.lang
+++ b/htdocs/langs/ar_SA/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=حالة المشروع
 SharedProject=مشاريع مشتركة
 PrivateProject=مشروع اتصالات
+ProjectsImContactFor=Projects I'm explicitely a contact of
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=جميع المشاريع
 MyProjectsDesc=ويقتصر هذا الرأي على المشاريع التي تقوم على الاتصال (كل ما هو نوع).
 ProjectsPublicDesc=هذا الرأي يعرض جميع المشاريع ويسمح لك قراءة.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=هذا الرأي يعرض جميع المشاريع والمهام (
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=مشروع جديد
 AddProject=إنشاء مشروع
 DeleteAProject=حذف مشروع
 DeleteATask=حذف مهمة
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=مشاريع فتح
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=فرص كمية من المشاريع فتحت حسب الحالة
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=وتبين للمشروع
 SetProject=وضع المشروع
 NoProject=لا يعرف أو المملوكة للمشروع
 NbOfProjects=ملاحظة : للمشاريع
+NbOfTasks=Nb of tasks
 TimeSpent=الوقت الذي تستغرقه
 TimeSpentByYou=الوقت الذي يقضيه من قبلك
 TimeSpentByUser=الوقت الذي يقضيه المستخدم
@@ -47,9 +52,9 @@ TaskTimeSpent=الوقت المستغرق في المهام
 TaskTimeUser=المستعمل
 TaskTimeNote=ملاحظة
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=المهام على المشاريع المفتوحة
 WorkloadNotDefined=عبء العمل غير محددة
-NewTimeSpent=جديد الوقت الذي يقضيه
+NewTimeSpent=قضى وقتا
 MyTimeSpent=وقتي قضى
 Tasks=المهام
 Task=مهمة
@@ -59,6 +64,7 @@ TaskDescription=وصف المهمة
 NewTask=مهمة جديدة
 AddTask=إنشاء مهمة
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=النشاط
 Activities=المهام والأنشطة
 MyActivities=بلدي المهام والأنشطة
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=قائمة العقود المرتبطة بالمشروع.
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=قائمة التدخلات المرتبطة بالمشروع
 ListExpenseReportsAssociatedProject=قائمة تقارير المصاريف المرتبطة بالمشروع
 ListDonationsAssociatedProject=قائمة التبرعات المرتبطة بالمشروع
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=مشروع اتصالات
 ActionsOnProject=الإجراءات على المشروع
 YouAreNotContactOfProject=كنت لا اتصال لهذا المشروع الخاص
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=قضى الوقت حذف
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=انظر أيضا المهام  الغير موكلة الي
@@ -110,7 +118,7 @@ TaskRessourceLinks=مصادر
 ProjectsDedicatedToThisThirdParty=مشاريع مخصصة لهذا الطرف الثالث
 NoTasks=أية مهام لهذا المشروع
 LinkedToAnotherCompany=ربط طرف ثالث آخر
-TaskIsNotAffectedToYou=مهمة غيرموكلة اليك
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=الوقت الذي يقضيه فارغة
 ThisWillAlsoRemoveTasks=وهذا العمل أيضا حذف كافة مهام المشروع <b>(%s</b> المهام في الوقت الحاضر) وجميع المدخلات من الوقت الذي تستغرقه.
 IfNeedToUseOhterObjectKeepEmpty=إذا كانت بعض الكائنات (فاتورة، والنظام، ...)، الذين ينتمون إلى طرف ثالث آخر، يجب أن تكون مرتبطة بمشروع لإنشاء، والحفاظ على هذا فارغة لديها مشروع كونها متعددة الأطراف الثالثة.
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=إدخال يوميا
 InputPerWeek=مساهمة في الأسبوع
 InputPerAction=مساهمة في عمل
-TimeAlreadyRecorded=الوقت الذي يقضيه سجلت بالفعل لهذه المهمة / يوم والمستخدم٪ الصورة
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=مشاريع مع هذا العضو عن الاتصال
 TasksWithThisUserAsContact=المهام الموكلة إلى هذا المستخدم
 ResourceNotAssignedToProject=لم يتم تعيين إلى المشروع
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=تعيين مهمة بالنسبة لي
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=عين
 ProjectOverview=نظرة عامة
 ManageTasks=استخدام المشاريع لمتابعة المهام والوقت
 ManageOpportunitiesStatus=استخدام مشاريع متابعة القرائن / opportinuties
 ProjectNbProjectByMonth=ملحوظة من المشاريع التي تم إنشاؤها من قبل شهر
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=كمية الفرص الشهر
 ProjectWeightedOppAmountOfProjectsByMonth=كمية المرجح الفرص من قبل شهر
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=إحصاءات عن المشاريع / يؤدي
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=المهمة الموكلة. يجب دخول الوقت على هذه المهمة يكون ممكنا.
 IdTaskTime=الوقت مهمة معرف
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=مشاريع افتتحه thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=فرص المبلغ الإجمالي
 OpportunityPonderatedAmount=كمية الفرص المرجحة
diff --git a/htdocs/langs/bg_BG/accountancy.lang b/htdocs/langs/bg_BG/accountancy.lang
index 862fb0a64e8..963e270fef1 100644
--- a/htdocs/langs/bg_BG/accountancy.lang
+++ b/htdocs/langs/bg_BG/accountancy.lang
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Сметка
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=General ledger
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
@@ -132,19 +140,19 @@ Sens=Sens
 Codejournal=Дневник
 NumPiece=Номер на част
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=List of the accounting accounts
 
 Pcgtype=Class of account
-Pcgsubtype=Under class of account
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Възникна грешка, вие не можете да изтриете тази счетоводна сметка, защото се използва.
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Код
+Nature=Същност
+AccountingJournalType1=Various operation
+AccountingJournalType2=Sales
+AccountingJournalType3=Purchases
+AccountingJournalType4=Банка
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Exports
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index 215f9bada11..ec3f94ae075 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=Вътрешни потребители
 ExternalUsers=Външни потребители
 GUISetup=Екран
 SetupArea=Настройки
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Форма за тестване качване на файлове (за настройка)
 IfModuleEnabled=Забележка: Ефективно е само ако модула <b>%s</b> е активиран
 RemoveLock=Премахнете файла <b>%s</b> ако съществува, за да се позволи използването на инструмента за актуализация.
@@ -85,7 +86,7 @@ Mask=Маска
 NextValue=Следваща стойност
 NextValueForInvoices=Следваща стойност (фактури)
 NextValueForCreditNotes=Следваща стойност (кредитни известия)
-NextValueForDeposit=Next value (deposit)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Next value (replacements)
 MustBeLowerThanPHPLimit=Забележка: PHP ограничава размера на всяко качване на файлове на <b>%s</b> %s, независимо от стойността на този параметър е
 NoMaxSizeByPHPLimit=Забележка: Не срокът се определя в конфигурацията на вашия PHP
@@ -103,7 +104,7 @@ MenuIdParent=ID майка меню
 DetailMenuIdParent=ID на основното меню (0 за горното меню)
 DetailPosition=Брой Сортиране, за да определи позицията на менюто
 AllMenus=Всички
-NotConfigured=Модула не е конфигуриран
+NotConfigured=Module/Application not configured
 Active=Активен
 SetupShort=Настройки
 OtherOptions=Други опции
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Thousand сепаратор
 Destination=Destination
 IdModule=Module ID
 IdPermissions=Permissions ID
-Modules=Модули
 LanguageBrowserParameter=Параметър %s
 LocalisationDolibarrParameters=Локализация параметри
 ClientTZ=Часова зона на клиента (потребител)
@@ -123,7 +123,8 @@ PHPTZ=Часова зона на PHP Сървъра
 DaylingSavingTime=Лятното часово време
 CurrentHour=Час на PHP (сървър)
 CurrentSessionTimeOut=Продължителност на текущата сесия
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max number of lines for widgets
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Права
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Показани са само елементи от <a href="%s">активирани модули</a>.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Парола за базата данни, ко
 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=Защита на генерираните PDF файлове (активиран не се препоръчва, почивки поколение на маса PDF)
-ProtectAndEncryptPdfFilesDesc=Защита на PDF документ продължава да прочетете и отпечатате с всеки PDF браузър. Въпреки това, редактиране и копиране не е възможно повече. Имайте предвид, че използването на тази функция изграждането на глобална сборен PDF не работи (като неплатени фактури).
+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=Особеност
 DolibarrLicense=Лиценз
 Developpers=Разработчици/сътрудници
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr онлайн демо
 OfficialMarketPlace=Официален магазин за външни модули/добавки
 OfficialWebHostingService=Препоръчителен уеб хостинг услуги (хостинг в интернет облак)
 ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=Документация за потребител или разработчик (Doc, често задавани въпроси ...), <br> можете да намерите в Dolibarr Wiki: <br> <a href="%s" target="_blank"><b>%s</b></a>
 ForAnswersSeeForum=За всякакви други въпроси / Помощ, можете да използвате форума Dolibarr: <br> <a href="%s" target="_blank"><b>%s</b></a>
 HelpCenterDesc1=Тази област може да ви помогне да получите помощ и поддръжка за Dolibarr.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=Функцията не е на разположен
 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/
 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=Настройки на модул
-ModulesSetup=Настройки на модули
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Система
 ModuleFamilyCrm=Управление на Връзки с клиенти (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=Текуща версия на Dolibarr
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Update server offline
+WithCounter=Manage a counter
 GenericMaskCodes=Можете да въведете всяка маска за номериране. В тази маска, могат да се използват следните тагове: <br> <b>{000000}</b> съответства на номер, който се увеличава на всеки %s. Влез като много нули като желаната дължина на брояча. Броячът ще бъде завършен с нули от ляво, за да има колкото се може повече нули като маска. <br> <b>{000000 000}</b> същата като предишната, но компенсира, съответстваща на броя на правото на знака + се прилага започва на първи %s. <br> <b>{000000 @}</b> същата като предишната, но броячът се нулира, когато месеца Х е достигнал (Х между 1 и 12, или 0, за да използвате началото на месеца на фискалната година, определени в вашата конфигурация). Ако тази опция се използва и х е 2 или по-висока, тогава последователност {гг} {mm} или {гггг} {mm} също е задължително. <br> <b>{DD}</b> ден (01 до 31). <br> <b>{Mm}</b> месец (01 до 12). <br> <b>{Гг} {гггг}</b> или <b>{Y}</b> година над 2, 4 или 1 брой. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Всички други символи на маската ще останат непокътнати. <br> Интервалите не са разрешени. <br>
-GenericMaskCodes4a=<u>Пример за използване на 99 %s на третата страна КОМПАНИЯТА извършва 2007-01-31:</u> <br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Пример за контрагент е създаден на 2007-03-01:</u> <br>
 GenericMaskCodes4c=<u>Пример за продукт, създаден на 2007-03-01:</u> <br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> ще даде <b>ABC0701-000099</b> <br> <b>{0000+100@1}-ZZZ/{dd} / XXX</b> ще даде <b>0199-ZZZ/31/XXX</b>
+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=Върнете адаптивни номер според определен маска.
 ServerAvailableOnIPOrPort=Сървъра е достъпен на адрес <b>%s</b> , порт <b>%s</b>
 ServerNotAvailableOnIPOrPort=Сървъра не е достъпен на адрес <b>%s</b> , порт <b>%s</b>
@@ -369,19 +375,21 @@ Int=Цяло число
 Float=Десетично число
 DateAndTime=Дата и час
 Unique=Уникално
-Boolean=Логическо (Отметка)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Телефон
 ExtrafieldPrice = Цена
 ExtrafieldMail = Имейл
 ExtrafieldUrl = Url
 ExtrafieldSelect = Избор лист
 ExtrafieldSelectList = Избор от таблица
-ExtrafieldSeparator=Разделител
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Парола
-ExtrafieldCheckBox=Отметка
-ExtrafieldRadio=Радио бутон
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldRadio=Radio buttons (on 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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Област
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Потребители и групи
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=Фактура и управление на кредитно изв
 Module40Name=Доставчици
 Module40Desc=Управление и изкупуване на доставчика (нареждания и фактури)
 Module42Name=Дневник
-Module42Desc=Влизане съоръжения (файл, Syslog, ...)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Редактори
 Module49Desc=Управление на редактор
 Module50Name=Продукти
@@ -499,8 +521,8 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar интеграция
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Известия
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP MaxMind реализации възможности
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=ЧР
-Module4000Desc=Управление на човешки ресурси
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Няколко фирми
 Module5000Desc=Позволява ви да управлявате няколко фирми
 Module6000Name=Workflow
@@ -591,7 +615,7 @@ Permission32=Създаване / промяна на продукти
 Permission34=Изтриване на продукти
 Permission36=Преглед / управление на скрити продукти
 Permission38=Износ на продукти
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Изтриване на проекти (общи проекти и проекти съм се с нас за)
 Permission45=Export projects
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Emails templates
 DictionaryUnits=Units
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Setup спаси
+SetupNotSaved=Setup not saved
 BackToModuleList=Обратно към списъка с модули
 BackToDictionaryList=Back to dictionaries list
 VATManagement=Управление на ДДС
@@ -921,7 +947,7 @@ Host=Сървър
 DriverType=Шофьор тип
 SummarySystem=Резюме на информационна система
 SummaryConst=Списък на всички параметри за настройка Dolibarr
-MenuCompanySetup=Фирма/Организация
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= Стандартно меню мениджър
 DefaultMenuSmartphoneManager=Smartphone Menu Manager
 Skin=Кожата тема
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Макс. дължина за списъци по подра
 DefaultMaxSizeShortList=Макс. дължина по подразбиране за кратки списъци (т.е. в клиентската карта)  
 MessageOfDay=Послание на деня
 MessageLogin=Съобщение на страницата за вход
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Постоянна форма за търсене в лявото меню
 DefaultLanguage=Език по подразбиране (код на езика)
 EnableMultilangInterface=Разрешаване на многоезичен интерфейс
 EnableShowLogo=Показване на логото в лявото меню
-CompanyInfo=Информация за фирмата/организацията
-CompanyIds=Идентичност на фирмата/организацията
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=Име
 CompanyAddress=Адрес
 CompanyZip=П. код
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Толерантност закъснение (в дн
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Толерантност закъснение (в дни), преди сигнал за проверки депозит
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Другите записи от менюто управляват допълнителни параметри.
 LogEvents=Събития одит на сигурността
 Audit=Проверка
@@ -987,7 +1015,7 @@ BrowserOS=Browser OS
 ListOfSecurityEvents=Списък на събитията Dolibarr сигурност
 SecurityEventsPurged=Събития по сигурността прочиства
 LogEventDesc=Можете да разрешите тук сеч за събития Dolibarr сигурност. Администраторите могат да видите неговото съдържание чрез меню <b>&quot;Системни инструменти - Одит.</b> Внимание, тази функция може да се консумира голямо количество данни в база данни.
-AreaForAdminOnly=Тези функции могат да се използват само от <b>администратори</b>.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Информационна система Разни техническа информация можете да получите в режим само за четене и видими само за администратори.
 SystemAreaForAdminOnly=Тази област е достъпна само за администратори. Никой не може да промени това ограничение.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Общ брой на активираните модули: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists in any language files
+TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Трябва да даде възможност на най-малко 1 модул
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Професионална Id уникален
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=За износ на линк към <b>%s</b> формат е на разположение на следния линк: %s
 ##### Invoices #####
 BillsSetup=Фактури модул за настройка
 BillsNumberingModule=Фактури и кредитни известия, номериране модул
 BillsPDFModules=Фактура модели документи
+PaymentsPDFModules=Payment documents models
 CreditNote=Кредитно известие
 CreditNotes=Кредитни известия
 ForceInvoiceDate=Принудително датата на фактурата датата на валидиране
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
 FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
 FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
 CacheByServer=Cache by server
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
+CompressionOfResourcesDesc=For exemple 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 your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Настройка на модул Продукти
 ServiceSetup=Услуги модул за настройка
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Дата на фактура използва
 Buy=Купувам
 Sell=Продажба
 InvoiceDateUsed=Дата на фактура използва
-YourCompanyDoesNotUseVAT=Вашата фирма е настроена да не се използва ДДС (Начало - Настройки - Фирма/Организация), така че е без опции за настройка на ДДС.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=Счетоводен код
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Кликнете, за да наберете настройка модул
-ClickToDialUrlDesc=Адреса нарича, когато се извършва едно кликване на телефона пиктограма. URL, можете да използвате маркери <br> <b>__PHONETO__,</b> Които ще бъдат заменени с телефонния номер на лицето, да се обадите <br> <b>__PHONEFROM__,</b> Че ще бъде заменен с телефонния номер на повикващата лице (твое) <br> <b>__LOGIN__,</b> Които ще бъдат заменени с clicktodial вход (определено на вашето потребителско карта) <br> <b>__PASS__,</b> Които ще бъдат заменени с clicktodial вашата парола (определено на вашето потребителско карта).
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=Този модул позволява телефонните номера да могат да се кликват. Кликване върху тази икона ще предизвика вашият телефон да набере телефонния номер. Това може да бъде използвано за обаждане към кол център система, която може да набере телефония номер на SIP система например.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Използвайте този метод ако вашите потребители имат софт-телефон или софтуерен интерфейс на същия компютър, на който е браузера, и повиквани с клик на линк във вашия браузер, който започва с "tel:". Ако се нуждаете от пълно сървърно решение (без нужда за локална софтуерна инсталация), трябва да зададете на това "Не" или да попълните следващото поле.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+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.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=Обща дисплей за
 BankOrderES=Испански
 BankOrderESDesc=Испански дисплей за
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=Multi-модул за настройка компания
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ 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.
 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.
-ConfFileMuseContainCustom=Installing 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=Цвят за подчертаване на линията, когато мишката мине отгоре (оставете празно за без подчертаване)
 TextTitleColor=Цвят на заглавието на страницата
 LinkColor=Цвят на връзките
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/bg_BG/compta.lang b/htdocs/langs/bg_BG/compta.lang
index 2546627fd1d..1098b2e07f8 100644
--- a/htdocs/langs/bg_BG/compta.lang
+++ b/htdocs/langs/bg_BG/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Сумите показани тук са
 Param=Структура
 RemainingAmountPayment=Остатъчна сума за плащане:
 Account=Сметка
-Accountparent=Сметка родител
-Accountsparent=Сметки родител
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=Доход
 Outcome=Разход
 ReportInOut=Приходи/разходи
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Данъци и дивиденти
 MenuSocialContributions=Social/fiscal taxes
 MenuNewSocialContribution=New social/fiscal tax
 NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Секция Счетоводство/ценности
 NewPayment=Ново плащане
@@ -134,8 +135,8 @@ RulesResultDue=- Показани Сумите са с включени всич
 RulesResultInOut=- It includes the real payments made on invoices, expenses and VAT. <br>- It is based on the payment dates of the invoices, expenses and VAT.
 RulesCADue=- Тя включва дължимите на клиента фактури, независимо дали са платени или не. <br> - Тя се основава на датата на валидиране тези фактури. <br>
 RulesCAIn=- То включва всички ефективни плащания на фактурите, получени от клиенти. <br> - Тя се основава на датата на плащане на тези фактури <br>
-DepositsAreNotIncluded=- Депозит фактури не са включени
-DepositsAreIncluded=- Депозит фактури са включени
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Доклад от контрагент IRPF
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
 VATReport=VAT report
@@ -169,7 +170,7 @@ DescSellsJournal=Продажби вестник
 DescPurchasesJournal=Покупките вестник
 InvoiceRef=Фактура с реф.
 CodeNotDef=Не е определена
-WarningDepositsNotIncluded=Депозити фактури не са включени в тази версия с този модул за счетоводството.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
 Pcg_version=Chart of accounts models
 Pcg_type=PCG тип
@@ -189,8 +190,10 @@ AccountancyJournal=Accountancy code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Клониране за следващ месец
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/bg_BG/cron.lang b/htdocs/langs/bg_BG/cron.lang
index 2728b1877af..30e5701e5ad 100644
--- a/htdocs/langs/bg_BG/cron.lang
+++ b/htdocs/langs/bg_BG/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Изтриване на планирани задачи
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Модул Планирана задача позволява да се изпълни задача, която е била планирана
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Задача
 CronNone=Няма
 CronDtStart=Not before
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Активирайте
 CronStatusInactiveBtn=Деактивирай
 CronTaskInactive=Тази задача е неактивирана
 CronId=Id
-CronClassFile=Класове (filename.class.php)
-CronModuleHelp=Име на Dolibarr модулна директория (работи също така с външен Dolibarr модул).<BR> Например, за да издърпате метод на обект Dolibarr Product /htdocs/<u>product</u>/class/product.class.php, стойността на модула е <i>product</i>
-CronClassFileHelp=Име на файл да се зареди.<BR> Например, за да издърпате метод на обект Dolibarrr Product /htdocs/product/class/<u>product.class.php</u>, стойността на името на файла за класа е <i>product.class.php</i>
-CronObjectHelp=Името на обекът, който да се зареди.<BR> Например, за да издърпате метод на обект Dolibarr Product /htdocs/product/class/product.class.php, стойността на името на файла за класа е <i>Product</i>
-CronMethodHelp=Методът на обекта да се зареди.<BR> Например, за да издърпате метод на обект Dolibarr Product /htdocs/product/class/product.class.php, стойността на метода е <i>fecth</i>
-CronArgsHelp=Аргументите за метода.<BR> Например, за да издърпате метод на обект Dolibarr Product /htdocs/product/class/product.class.php, стойността на параметрите може да бъде <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=Системният команден ред за стартиране.
 CronCreateJob=Създаване на нова Планирана задача
 CronFrom=От
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Неактивирани задачи
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/bg_BG/errors.lang b/htdocs/langs/bg_BG/errors.lang
index d8c83462084..d1e9ea2e582 100644
--- a/htdocs/langs/bg_BG/errors.lang
+++ b/htdocs/langs/bg_BG/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Грешка при създаване на файл <b>&q
 ErrorFailToRenameDir=Неуспешно да преименувате директория <b>&quot;%s&quot;</b> в <b>&quot;%s&quot;.</b>
 ErrorFailToCreateDir=Неуспешно създаване на директория <b>&quot;%s&quot;.</b>
 ErrorFailToDeleteDir=Грешка при изтриване на директория <b>&quot;%s&quot;.</b>
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=Този контакт е вече определен контакт за този тип.
 ErrorCashAccountAcceptsOnlyCashMoney=Тази банкова сметка е разплащателна сметка, така че приема плащания пари само от тип.
 ErrorFromToAccountsMustDiffers=Източника и целите на банкови сметки трябва да бъде различен.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Неуспех при запис в директория
 ErrorFoundBadEmailInFile=Намерени неправилен синтаксис имейл за %s линии във файла (%s например съответствие с имейл = %s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Някои задължителни полета не са запълнени.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Неуспешно създаване на директория. Уверете се, че уеб сървър потребител има разрешение да пишат в Dolibarr документи. Ако параметър <b>safe_mode</b> е разрешен в тази PHP, проверете дали Dolibarr PHP файлове притежава за потребителя на уеб сървъра (или група).
 ErrorNoMailDefinedForThisUser=Не поща, определена за този потребител
 ErrorFeatureNeedJavascript=Тази функция трябва ДжаваСкрипт да се активира, за да работят. Променете тази настройка - дисплей.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Количество за ред в к
 ErrorWebServerUserHasNotPermission=Потребителски акаунт <b>%s</b> използват за извършване на уеб сървър не разполага с разрешение за това
 ErrorNoActivatedBarcode=Не е тип баркод активира
 ErrUnzipFails=Неуспех да разархивирате %s с ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=Файла %s трябва да бъде Dolibarr zip архив
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=PHP навийте не е инсталиран, това е от съществено значение, за да разговаря с Paypal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=Няма избрана глобална проме
 ErrorFieldMustBeANumeric=Поле <b>%s</b> трябва да бъде числена стойност
 ErrorMandatoryParametersNotProvided=Задължителен параметър(и) не е даден
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # Warnings
 WarningPasswordSetWithNoAccount=Парола е зададено за този член. Обаче, няма създаден потребителски акаунт. Следователно тази парола е записана, но не може да бъде използвана за влизане в Dolibarr. Може да бъде използвана от външен модул/интерфейс, но ако нямате нужда да определите нито потребителско име нито парола за член, можете да деактивирате тази опция. Ако имате нужда да управлявате потребителско име, но нямата нужда от парола, можете да оставите това поле празно, за да избегнете това предупреждение. Забележка: Имейл също може да бъде използван като потребителско име ако члена с свързан към потребител.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Датата на плащане (%s) е
 WarningTooManyDataPleaseUseMoreFilters=Прекалено много информация (повече от %s линии). Моля използвайте повече филтри или задайте за константата %s по-висок лимит.
 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/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang
index 8ab7c73ec8e..fa6c4510953 100644
--- a/htdocs/langs/bg_BG/main.lang
+++ b/htdocs/langs/bg_BG/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=Параметър %s не е дефиниран
 ErrorUnknown=Неизвестна грешка
 ErrorSQL=Грешка в SQL
 ErrorLogoFileNotFound=Файлът с лого '%s' не е открит
-ErrorGoToGlobalSetup=Отидете в настройки на 'Фирма/Организация', за да коригирате това
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=Отидете в настройки на Модули, за да коригирате това
 ErrorFailedToSendMail=Неуспешно изпращане на имейл (подател = %s, получател = %s)
 ErrorFileNotUploaded=Файлът не беше качен. Уверете се, че размерът му не надвишава максимално допустимия, че е на разположение свободно пространство на диска и че няма файл със същото име в тази директория.
@@ -153,6 +153,7 @@ Edit=Редактиране
 Validate=Валидирай
 ValidateAndApprove=Валидирай и одобри
 ToValidate=За валидиране
+NotValidated=Not validated
 Save=Запис
 SaveAs=Запис като
 TestConnection=Проверка на връзката
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=Не се прилага функция за изк
 Connection=Вход
 Setup=Настройки
 Alert=Предупреждение
+MenuWarnings=Сигнали
 Previous=Предишен
 Next=Следващ
 Cards=Карти
@@ -308,6 +310,7 @@ Copy=Копиране
 Paste=Поставяне
 Default=По подразбиране
 DefaultValue=Стойност по подразбиране
+DefaultValues=Default values
 Price=Цена
 UnitPrice=Единична цена
 UnitPriceHT=Единична цена (нето)
@@ -363,7 +366,8 @@ VATRate=Данъчна ставка
 Average=Средно
 Sum=Сума
 Delta=Делта
-Module=Модул
+Module=Module/Application
+Modules=Modules/Applications
 Option=Опция
 List=Списък
 FullList=Пълен списък
@@ -387,7 +391,7 @@ ActionRunningNotStarted=За започване
 ActionRunningShort=In progress
 ActionDoneShort=Завършено
 ActionUncomplete=Незавършено
-CompanyFoundation=Фирма/Организация
+CompanyFoundation=Company/Organisation
 ContactsForCompany=Контакти за този контрагент
 ContactsAddressesForCompany=Контакти/адреси за този контрагент
 AddressesForCompany=Адреси за този контрагент
@@ -405,8 +409,9 @@ Generate=Генерирай
 Duration=Продължителност
 TotalDuration=Обща продължителност
 Summary=Резюме
-DolibarrStateBoard=Статистика
-DolibarrWorkBoard=Табло с текущи задачи
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=Налично
 NotYetAvailable=Все още не е налично
 NotAvailable=Не е налично
@@ -434,7 +439,7 @@ Reportings=Справки
 Draft=Чернова
 Drafts=Чернови
 Validated=Валидиран
-Opened=Отворен
+Opened=Отворено
 New=Нов
 Discount=Отстъпка
 Unknown=Неизвестно
@@ -453,6 +458,7 @@ NextStep=Следваща стъпка
 Datas=Данни
 None=Няма
 NoneF=Няма
+NoneOrSeveral=None or several
 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.
 Photo=Снимка
@@ -606,7 +612,8 @@ PartialWoman=Частична
 TotalWoman=Обща
 NeverReceived=Никога не получено
 Canceled=Отменен
-YouCanChangeValuesForThisListFromDictionarySetup=Можете да промените стойностите за този списък от меню Настройки - речник
+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
 Color=Цвят
 Documents=Свързани файлове
@@ -642,6 +649,7 @@ FreeLineOfType=Свободен вход с тип
 CloneMainAttributes=Клонира обекта с неговите основни атрибути
 PDFMerge=PDF обединяване
 Merge=Обединяване
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Показване на страница за печат само с основното съдържание
 MenuManager=Меню менажер
 WarningYouAreInMaintenanceMode=Внимание, вие сте в режим на поддръжка, така че само вход <b>%s</b> се разрешава за използване приложение в момента.
@@ -708,6 +716,7 @@ from=от
 toward=към
 Access=Достъп
 SelectAction=Избиране на действие
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Използвайте Ctrl+C за да копирате в клипборда
 SaveUploadedFileWithMask=Запишете файла на сървъра с име "<strong>%s</strong>" (иначе "%s")
 OriginFileName=Оригинално име на файла
@@ -718,7 +727,7 @@ ViewPrivateNote=Биж бележки
 XMoreLines=%s ред(а) скрити
 PublicUrl=Публичен URL
 AddBox=Добави поле
-SelectElementAndClickRefresh=Изберете елемент и натиснете Обнови
+SelectElementAndClick=Select an element and click %s
 PrintFile=Печат на файл %s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Отидете на Начало - Настройки - Фирма/Организация, за да промените логото или отидете на Начало - Настройки- Екран, за да го скриете.
@@ -734,8 +743,8 @@ Hello=Здравейте
 Sincerely=Искрено
 DeleteLine=Изтриване на линия
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
@@ -755,11 +764,20 @@ Calendar=Календар
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Понеделник
 Tuesday=Вторник
@@ -817,5 +835,3 @@ SearchIntoContracts=Договори
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Опис разходи
 SearchIntoLeaves=Отпуски
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/bg_BG/other.lang b/htdocs/langs/bg_BG/other.lang
index 7f406309764..47a6d21ead8 100644
--- a/htdocs/langs/bg_BG/other.lang
+++ b/htdocs/langs/bg_BG/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=Дата на раждане
 BirthdayAlertOn=Известяването за рожден ден е активно
 BirthdayAlertOff=Известяването за рожден ден е неактивно
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=Интервенцията е валидирана
 Notify_FICHINTER_SENTBYMAIL=Интервенцията е изпратена по пощата
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=Това е <b>тестов</b> имейл (думата
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nТук ще намерите фактура __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nБихме искали да ви предопредим, че фактура __REF__  изглежда не е платена. Затова това фактурата е в прикачения файл, за напомняне.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nЩе намерите запитването за цена тук __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nТук ще намерите фактура __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Проф. Id %s</b> е информация, в зависимост от трета държава, която е страна. <br> Например, за страната <b>%s,</b> това е код <b>%s.</b>
 DolibarrDemo=Dolibarr ERP/CRM демо
-StatsByNumberOfUnits=Статистика в брой на единици продукти/услуги
-StatsByNumberOfEntities=Статистиката в брой на референции
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=Намесата %s е потвърдена.
 EMailTextInvoiceValidated=Фактура %s е потвърдена.
diff --git a/htdocs/langs/bg_BG/projects.lang b/htdocs/langs/bg_BG/projects.lang
index 34f5845b318..2765e6bfbb4 100644
--- a/htdocs/langs/bg_BG/projects.lang
+++ b/htdocs/langs/bg_BG/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=Статус на проект
 SharedProject=Всички
 PrivateProject=ПРОЕКТА Контакти
+ProjectsImContactFor=Projects I'm explicitely a contact of
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=Всички проекти
 MyProjectsDesc=Тази гледна точка е ограничена до проекти, които са за контакт (какъвто и да е тип).
 ProjectsPublicDesc=Този възглед представя всички проекти, по които могат да се четат.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=Този възглед представя всички проекти
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=Нов проект
 AddProject=Създаване на проект
 DeleteAProject=Изтриване на проект
 DeleteATask=Изтриване на задача
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Отворени проекти
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Покажи проект
 SetProject=Задайте проект
 NoProject=Нито един проект няма определени или собственост
 NbOfProjects=Nb на проекти
+NbOfTasks=Nb of tasks
 TimeSpent=Времето, прекарано
 TimeSpentByYou=Време отделено от вас
 TimeSpentByUser=Време отделено от потребител
@@ -47,9 +52,9 @@ TaskTimeSpent=Време отдадено на задачи
 TaskTimeUser=Потребител
 TaskTimeNote=Бележка
 TaskTimeDate=Дата
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Задачи на отворени проекти
 WorkloadNotDefined=Работна натовареност не е определена
-NewTimeSpent=Времето, прекарано на
+NewTimeSpent=Времето, прекарано
 MyTimeSpent=Времето, прекарано
 Tasks=Задачи
 Task=Задача
@@ -59,6 +64,7 @@ TaskDescription=Описание на задача
 NewTask=Нова задача
 AddTask=Създаване на задача
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Дейност
 Activities=Задачите / дейностите
 MyActivities=Моите задачи / дейности
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Списък на договори, свързани с проекта
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=Списък на интервенциите, свързани с проекта
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=Списък на даренията асоциирани със този проект
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=ПРОЕКТА Контакти
 ActionsOnProject=Събития по проекта
 YouAreNotContactOfProject=Вие не сте контакт на този частен проект
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Изтриване на времето, прекарано
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=Показване също на задачи, които не са възложени на мен
@@ -110,7 +118,7 @@ TaskRessourceLinks=Ресурси
 ProjectsDedicatedToThisThirdParty=Проекти, насочени към този контрагент
 NoTasks=Няма задачи за този проект
 LinkedToAnotherCompany=Свързано с друг контрагент
-TaskIsNotAffectedToYou=Задача, която не е възложена на вас
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=Изразходваното време е празна
 ThisWillAlsoRemoveTasks=Това действие ще изтрие всички задачи на проекта <b>(%s</b> задачи в момента) и всички входове на времето, прекарано.
 IfNeedToUseOhterObjectKeepEmpty=Ако някои обекти (фактура, поръчка, ...), принадлежащи към друга трета страна, трябва да бъдат свързани с проекта за създаване, запазете тази празна да има проект е мулти трети страни.
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
-TimeAlreadyRecorded=Вече записано отделено време за тази задача/ден и потребител %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Проекти с този потребител като контакт
 TasksWithThisUserAsContact=Задачи възложени на този потребител
 ResourceNotAssignedToProject=Не е зададено към проект
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Възлагане на задача към мен
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Възлагане
 ProjectOverview=Общ преглед
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Бр. на създадените проекти по месец
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Статистики за проекти/инициативи
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Задачата е възложена. Въвеждането на време на тази задача би трябвало да е възможно
 IdTaskTime=Ид. време на задача
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Отворени проекти от трети лица
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/bn_BD/accountancy.lang b/htdocs/langs/bn_BD/accountancy.lang
index 4c2336b97b0..31b54e83c5b 100644
--- a/htdocs/langs/bn_BD/accountancy.lang
+++ b/htdocs/langs/bn_BD/accountancy.lang
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=General ledger
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
@@ -132,19 +140,19 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=List of the accounting accounts
 
 Pcgtype=Class of account
-Pcgsubtype=Under class of account
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Code
+Nature=Nature
+AccountingJournalType1=Various operation
+AccountingJournalType2=Sales
+AccountingJournalType3=Purchases
+AccountingJournalType4=Bank
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Exports
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/bn_BD/admin.lang b/htdocs/langs/bn_BD/admin.lang
index 9602601e241..6851d698625 100644
--- a/htdocs/langs/bn_BD/admin.lang
+++ b/htdocs/langs/bn_BD/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=Internal users
 ExternalUsers=External users
 GUISetup=Display
 SetupArea=Setup area
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form to test file upload (according to setup)
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
@@ -85,7 +86,7 @@ Mask=Mask
 NextValue=Next value
 NextValueForInvoices=Next value (invoices)
 NextValueForCreditNotes=Next value (credit notes)
-NextValueForDeposit=Next value (deposit)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Next value (replacements)
 MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to <b>%s</b> %s, whatever this parameter's value is
 NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
@@ -103,7 +104,7 @@ MenuIdParent=Parent menu ID
 DetailMenuIdParent=ID of parent menu (empty for a top menu)
 DetailPosition=Sort number to define menu position
 AllMenus=All
-NotConfigured=Module not configured
+NotConfigured=Module/Application not configured
 Active=Active
 SetupShort=Setup
 OtherOptions=Other options
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Thousand separator
 Destination=Destination
 IdModule=Module ID
 IdPermissions=Permissions ID
-Modules=Modules
 LanguageBrowserParameter=Parameter %s
 LocalisationDolibarrParameters=Localisation parameters
 ClientTZ=Client Time Zone (user)
@@ -123,7 +123,8 @@ PHPTZ=PHP server Time Zone
 DaylingSavingTime=Daylight saving time
 CurrentHour=PHP Time (server)
 CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max number of lines for widgets
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activat
 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 (Activated 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 make building of a global cumulated pdf not working (like unpaid invoices).
+ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature makes building of a global merged PDFs not working.
 Feature=Feature
 DolibarrLicense=License
 Developpers=Developers/contributors
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr online demo
 OfficialMarketPlace=Official market place for external modules/addons
 OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
 ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your
 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/
 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 setup
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Update server offline
+WithCounter=Manage a counter
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
 ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
 ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
@@ -369,19 +375,21 @@ Int=Integer
 Float=Float
 DateAndTime=Date and hour
 Unique=Unique
-Boolean=Boolean (Checkbox)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Phone
 ExtrafieldPrice = Price
 ExtrafieldMail = Email
 ExtrafieldUrl = Url
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Password
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldRadio=Radio buttons (on 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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Field
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=Invoice and credit note management for customers. Invoice managemen
 Module40Name=Suppliers
 Module40Desc=Supplier management and buying (orders and invoices)
 Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Products
@@ -499,8 +521,8 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Notifications
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
-Module4000Desc=Human resources management
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow
@@ -591,7 +615,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects i'm contact for)
 Permission45=Export projects
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Emails templates
 DictionaryUnits=Units
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Setup saved
+SetupNotSaved=Setup not saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
 VATManagement=VAT Management
@@ -921,7 +947,7 @@ Host=Server
 DriverType=Driver type
 SummarySystem=System information summary
 SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Foundation
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= Standard menu manager
 DefaultMenuSmartphoneManager=Smartphone menu manager
 Skin=Skin theme
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Default max length for lists
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=Message of the day
 MessageLogin=Login page message
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/foundation information
-CompanyIds=Company/foundation identities
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=Name
 CompanyAddress=Address
 CompanyZip=Zip
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Other menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Audit
@@ -987,7 +1015,7 @@ BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
 LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists 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
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Rules on Professional Ids
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####
 BillsSetup=Invoices module setup
 BillsNumberingModule=Invoices and credit notes numbering model
 BillsPDFModules=Invoice documents models
+PaymentsPDFModules=Payment documents models
 CreditNote=Credit note
 CreditNotes=Credit notes
 ForceInvoiceDate=Force invoice date to validation date
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
 FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
 FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
 CacheByServer=Cache by server
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
+CompressionOfResourcesDesc=For exemple 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 your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Products module setup
 ServiceSetup=Services module setup
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Invoice date used
 Buy=Buy
 Sell=Sell
 InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=Accountancy Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+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 your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
+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.
 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 same computer than 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.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+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.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=General display order
 BankOrderES=Spanish
 BankOrderESDesc=Spanish display order
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ 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.
 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.
-ConfFileMuseContainCustom=Installing 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)
 TextTitleColor=Color of page title
 LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/bn_BD/compta.lang b/htdocs/langs/bn_BD/compta.lang
index 5e9814369ec..94a3bd671ef 100644
--- a/htdocs/langs/bn_BD/compta.lang
+++ b/htdocs/langs/bn_BD/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using r
 Param=Setup
 RemainingAmountPayment=Amount payment remaining :
 Account=Account
-Accountparent=Account parent
-Accountsparent=Accounts parent
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=Income
 Outcome=Expense
 ReportInOut=Income / Expense
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Taxes and dividends
 MenuSocialContributions=Social/fiscal taxes
 MenuNewSocialContribution=New social/fiscal tax
 NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Accountancy/Treasury area
 NewPayment=New payment
@@ -134,8 +135,8 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from clients.<br>- It is based on the payment date of these invoices<br>
-DepositsAreNotIncluded=- Deposit invoices are nor included
-DepositsAreIncluded=- Deposit invoices are included
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
 VATReport=VAT report
@@ -169,7 +170,7 @@ DescSellsJournal=Sales Journal
 DescPurchasesJournal=Purchases Journal
 InvoiceRef=Invoice ref.
 CodeNotDef=Not defined
-WarningDepositsNotIncluded=Deposits invoices are not included in this version with this accountancy module.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
 Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
@@ -189,8 +190,10 @@ AccountancyJournal=Accountancy code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/bn_BD/cron.lang b/htdocs/langs/bn_BD/cron.lang
index b1e8bcb36d2..245fefe7af1 100644
--- a/htdocs/langs/bn_BD/cron.lang
+++ b/htdocs/langs/bn_BD/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allow to execute job that have been planned
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Job
 CronNone=None
 CronDtStart=Not before
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
-CronClassFile=Classes (filename.class.php)
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=From
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/bn_BD/errors.lang b/htdocs/langs/bn_BD/errors.lang
index 9e2eb6817ef..feada2d1b5a 100644
--- a/htdocs/langs/bn_BD/errors.lang
+++ b/htdocs/langs/bn_BD/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
 ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
 ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
 ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
 ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Some required fields were not filled.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoice
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # 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.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice
 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/bn_BD/main.lang b/htdocs/langs/bn_BD/main.lang
index 9ffa398137f..d7dde34acbb 100644
--- a/htdocs/langs/bn_BD/main.lang
+++ b/htdocs/langs/bn_BD/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=Parameter %s not defined
 ErrorUnknown=Unknown error
 ErrorSQL=SQL Error
 ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=Go to Module setup to fix this
 ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
 ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
@@ -153,6 +153,7 @@ Edit=Edit
 Validate=Validate
 ValidateAndApprove=Validate and Approve
 ToValidate=To validate
+NotValidated=Not validated
 Save=Save
 SaveAs=Save As
 TestConnection=Test connection
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=No applicative disconnect feature with authenticatio
 Connection=Connection
 Setup=Setup
 Alert=Alert
+MenuWarnings=Alerts
 Previous=Previous
 Next=Next
 Cards=Cards
@@ -308,6 +310,7 @@ Copy=Copy
 Paste=Paste
 Default=Default
 DefaultValue=Default value
+DefaultValues=Default values
 Price=Price
 UnitPrice=Unit price
 UnitPriceHT=Unit price (net)
@@ -363,7 +366,8 @@ VATRate=Tax Rate
 Average=Average
 Sum=Sum
 Delta=Delta
-Module=Module
+Module=Module/Application
+Modules=Modules/Applications
 Option=Option
 List=List
 FullList=Full list
@@ -387,7 +391,7 @@ ActionRunningNotStarted=To start
 ActionRunningShort=In progress
 ActionDoneShort=Finished
 ActionUncomplete=Uncomplete
-CompanyFoundation=Company/Foundation
+CompanyFoundation=Company/Organisation
 ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
@@ -405,8 +409,9 @@ Generate=Generate
 Duration=Duration
 TotalDuration=Total duration
 Summary=Summary
-DolibarrStateBoard=Statistics
-DolibarrWorkBoard=Work tasks board
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=Available
 NotYetAvailable=Not yet available
 NotAvailable=Not available
@@ -434,7 +439,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Opened
+Opened=Open
 New=New
 Discount=Discount
 Unknown=Unknown
@@ -453,6 +458,7 @@ NextStep=Next step
 Datas=Data
 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.
 Photo=Picture
@@ -606,7 +612,8 @@ PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
 Canceled=Canceled
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
+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
 Color=Color
 Documents=Linked files
@@ -642,6 +649,7 @@ FreeLineOfType=Free entry of type
 CloneMainAttributes=Clone object with its main attributes
 PDFMerge=PDF Merge
 Merge=Merge
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Show page to print main content area
 MenuManager=Menu manager
 WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only login <b>%s</b> is allowed to use application at the moment.
@@ -708,6 +716,7 @@ from=from
 toward=toward
 Access=Access
 SelectAction=Select action
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
 SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
 OriginFileName=Original filename
@@ -718,7 +727,7 @@ ViewPrivateNote=View notes
 XMoreLines=%s line(s) hidden
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
+SelectElementAndClick=Select an element and click %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
@@ -734,8 +743,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
@@ -755,11 +764,20 @@ Calendar=Calendar
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -817,5 +835,3 @@ SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/bn_BD/other.lang b/htdocs/langs/bn_BD/other.lang
index ab937ff3bab..b151614ce3c 100644
--- a/htdocs/langs/bn_BD/other.lang
+++ b/htdocs/langs/bn_BD/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=Date of birth
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Statistics in number of products/services units
-StatsByNumberOfEntities=Statistics in number of referring entities
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=The intervention %s has been validated.
 EMailTextInvoiceValidated=The invoice %s has been validated.
diff --git a/htdocs/langs/bn_BD/projects.lang b/htdocs/langs/bn_BD/projects.lang
index f9c603ce113..f40af2b963b 100644
--- a/htdocs/langs/bn_BD/projects.lang
+++ b/htdocs/langs/bn_BD/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
 PrivateProject=Project contacts
+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 (whatever is the type).
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=New project
 AddProject=Create project
 DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Opened projects
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
 SetProject=Set project
 NoProject=No project defined or owned
 NbOfProjects=Nb of projects
+NbOfTasks=Nb of tasks
 TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
@@ -47,9 +52,9 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
-NewTimeSpent=New time spent
+NewTimeSpent=Time spent
 MyTimeSpent=My time spent
 Tasks=Tasks
 Task=Task
@@ -59,6 +64,7 @@ TaskDescription=Task description
 NewTask=New task
 AddTask=Create task
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Activity
 Activities=Tasks/activities
 MyActivities=My tasks/activities
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=List of contracts associated with the project
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
 ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
@@ -110,7 +118,7 @@ TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
-TaskIsNotAffectedToYou=Task not assigned to you
+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.
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
 ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/bs_BA/accountancy.lang b/htdocs/langs/bs_BA/accountancy.lang
index 2f7dbbeefa0..1fe2d5d28c5 100644
--- a/htdocs/langs/bs_BA/accountancy.lang
+++ b/htdocs/langs/bs_BA/accountancy.lang
@@ -1,24 +1,24 @@
 # Dolibarr language file - en_US - Accounting Expert
-ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
-ACCOUNTING_EXPORT_DATE=Date format for export file
-ACCOUNTING_EXPORT_PIECE=Export the number of piece
-ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account
-ACCOUNTING_EXPORT_LABEL=Export label
-ACCOUNTING_EXPORT_AMOUNT=Export amount
-ACCOUNTING_EXPORT_DEVISE=Export currency
-Selectformat=Select the format for the file
-ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
+ACCOUNTING_EXPORT_SEPARATORCSV=Odvajanje kolona za izvoznu datoteku
+ACCOUNTING_EXPORT_DATE=Format datuma za izvoznu datoteku
+ACCOUNTING_EXPORT_PIECE=Izvoz broja komada
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Izvoz sa globalnim računom
+ACCOUNTING_EXPORT_LABEL=Izvoz naziva
+ACCOUNTING_EXPORT_AMOUNT=Izvoz iznosa
+ACCOUNTING_EXPORT_DEVISE=Izvoz valute
+Selectformat=Odaberi format za datoteku
+ACCOUNTING_EXPORT_PREFIX_SPEC=Odredi prefiks za naziv datoteke
 ThisService=This service
 ThisProduct=This product
 DefaultForService=Default for service
 DefaultForProduct=Default for product
 CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Configuration of the module accounting expert
-Journalization=Journalization
-Journaux=Journals
-JournalFinancial=Financial journals
-BackToChartofaccounts=Return chart of accounts
+ConfigAccountingExpert=Podešavanje modula eksperta računovodstva
+Journalization=Prenos u dnevnik
+Journaux=Dnevnici
+JournalFinancial=Finansijski dnevnici
+BackToChartofaccounts=Vraćanje na pregled računa
 Chartofaccounts=Chart of accounts
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
@@ -26,38 +26,46 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
 MenuAccountancy=Računovodstvo
-Selectchartofaccounts=Select active chart of accounts
+Selectchartofaccounts=Odaberi aktivnog pregleda računa
 ChangeAndLoad=Change and load
-Addanaccount=Add an accounting account
-AccountAccounting=Accounting account
+Addanaccount=Dodaj računovodstveni račun
+AccountAccounting=Računovodstveni račun
 AccountAccountingShort=Account
-AccountAccountingSuggest=Accounting account suggested
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
+AccountAccountingSuggest=Predloženi računovodstveni račun
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
 MenuTaxAccounts=Tax accounts
@@ -70,12 +78,12 @@ CustomersVentilation=Customer invoice binding
 SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
-UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=General ledger
+UpdateMvts=Modifikacija transakcije
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Account balance
 
-CAHTF=Total purchase supplier before tax
+CAHTF=Ukupno nabavke od dobavljača prije poreza
 TotalExpenseReport=Total expense report
 InvoiceLines=Lines of invoices to bind
 InvoiceLinesDone=Bound lines of invoices
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
@@ -132,19 +140,19 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=List of the accounting accounts
 
 Pcgtype=Class of account
-Pcgsubtype=Under class of account
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,21 +204,34 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Kod
+Nature=Nature
+AccountingJournalType1=Various operation
+AccountingJournalType2=Sales
+AccountingJournalType3=Purchases
+AccountingJournalType4=Banka
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
-Exports=Exports
-Export=Export
-Modelcsv=Model of export
-OptionsDeactivatedForThisExportModel=For this export model, options are deactivated
-Selectmodelcsv=Select a model of export
-Modelcsv_normal=Classic export
-Modelcsv_CEGID=Export towards CEGID Expert Comptabilité
+Exports=Izvozi
+Export=Izvoz
+Modelcsv=Model izvoza
+OptionsDeactivatedForThisExportModel=Za ovaj model izvoza, opcije su onemogućene
+Selectmodelcsv=Odaberi model izvoza
+Modelcsv_normal=Klasični izvoz
+Modelcsv_CEGID=Izvoz prema CEGID Expert Comptabilité
 Modelcsv_COALA=Export towards Sage Coala
 Modelcsv_bob50=Export towards Sage BOB 50
 Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
index b2556683c91..e116e82843b 100644
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - admin
-Foundation=Foundation
+Foundation=Fondacija
 Version=Verzija
 VersionProgram=Verzija programa
-VersionLastInstall=Initial install version
-VersionLastUpgrade=Latest version upgrade
+VersionLastInstall=Prvobitno instalirana verzija
+VersionLastUpgrade=Verzija zadnje nadogradnje
 VersionExperimental=Eksperimentalno
 VersionDevelopment=Razvoj
 VersionUnknown=Nepoznato
@@ -28,26 +28,27 @@ SessionId=ID sesije
 SessionSaveHandler=Rukovatelj snimanje sesija
 SessionSavePath=Lokalizacija snimanja sesije
 PurgeSessions=Očistiti sesije
-ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
+ConfirmPurgeSessions=Da li zaista želite očistiti sve sesije? Ovo će uzrokovati odjavu svih korisnika (osim Vas).
 NoSessionListWithThisHandler=Rukovatelj snimanja sesija konfigurisan u PHP-u ne dopušta da se prikažu sve pokrenute sesije.
 LockNewSessions=Zaključaj nove konekcije
-ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself. Only user <b>%s</b> will be able to connect after that.
-UnlockNewSessions=Remove connection lock
-YourSession=Your session
-Sessions=Users session
+ConfirmLockNewSessions=Da li ste sigurni da želite onemogućiti bilo koju novu Dolibarr konekciju sebi. Nakon toga samo će korisnik <b>%s</b> moći se prijaviti.
+UnlockNewSessions=Ukloni zaključavanje veze
+YourSession=Vaša sesija
+Sessions=Korisničke sesije
 WebUserGroup=Web server user/group
 NoSessionFound=Your PHP seems to not allow to list active sessions. Directory used to save sessions (<b>%s</b>) might be protected (For example, by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
-WarningModuleNotActive=Module <b>%s</b> must be enabled
+WarningModuleNotActive=Modul <b>%s</b> mora biti omogućen
 WarningOnlyPermissionOfActivatedModules=Samo dozvole koje se odnose na aktivirane module su prikazane ovdje. Možete aktivirati druge module u Početna>Postavke>Stranice modula.
-DolibarrSetup=Dolibarr install or upgrade
+DolibarrSetup=Dolibarr instalacija ili unapređenje
 InternalUser=Interni korisnik
-ExternalUser=External user
-InternalUsers=Internal users
-ExternalUsers=External users
-GUISetup=Display
+ExternalUser=Vanjski korisnik
+InternalUsers=Interni korisnici
+ExternalUsers=Vanjski korisnici
+GUISetup=Prikaz
 SetupArea=Podrčje za postavke
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Forma za testiranje uploada fajlova (prema postavkama)
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
@@ -60,32 +61,32 @@ ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is n
 DictionarySetup=Postavke rječnika
 Dictionary=Dictionaries
 ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
-ErrorCodeCantContainZero=Code can't contain value 0
-DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
+ErrorCodeCantContainZero=Kod ne može sadržavati vrijednost 0
+DisableJavascript=Onemogući JavaScript i Ajax funkcije (preporučeno za slijepe osobe ili tekstualne preglednike)
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties, but it is less convenient)
 DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact, but it is less convenient)
-NumberOfKeyToSearch=Nbr of characters to trigger search: %s
-NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
+NumberOfKeyToSearch=Broj znakova za početak pretrage: %s
+NotAvailableWhenAjaxDisabled=Nije moguće kada je Ajax isključen
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
-JavascriptDisabled=JavaScript disabled
-UsePreviewTabs=Use preview tabs
-ShowPreview=Show preview
-PreviewNotAvailable=Preview not available
-ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
+JavascriptDisabled=Onemogućena JavaScript
+UsePreviewTabs=Koristi kartice pretpregleda
+ShowPreview=Prikaži pretpregled
+PreviewNotAvailable=Pretpregled nije moguć
+ThemeCurrentlyActive=Trenutno aktivna tema
+CurrentTimeZone=Vremenska zona PHP (servera)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
-Space=Space
-Table=Table
-Fields=Fields
-Index=Index
-Mask=Mask
-NextValue=Next value
-NextValueForInvoices=Next value (invoices)
-NextValueForCreditNotes=Next value (credit notes)
-NextValueForDeposit=Slijedeća vrijednost (depozita)
+Space=Razmak
+Table=Tabela
+Fields=Polja
+Index=Indeks
+Mask=Maska
+NextValue=Sljedeća vrijednost
+NextValueForInvoices=Sljedeća vrijednost (fakture)
+NextValueForCreditNotes=Sljedeća vrijednost (KO)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Slijedeća vrijednost (zamjene)
 MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to <b>%s</b> %s, whatever this parameter's value is
 NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
@@ -93,28 +94,27 @@ MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any uploa
 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
-AntiVirusParam= More parameters on command line
+AntiVirusParam= Više parametara preko komandne linije
 AntiVirusParamExample= Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Postavke modula za računovodstvo
 UserSetup=Postavke upravljanja korisnika
 MultiCurrencySetup=Multi-currency setup
-MenuLimits=Limits and accuracy
+MenuLimits=Ograničenja i preciznost
 MenuIdParent=Parent menu ID
 DetailMenuIdParent=ID of parent menu (empty for a top menu)
 DetailPosition=Sort number to define menu position
-AllMenus=All
-NotConfigured=Module not configured
-Active=Active
+AllMenus=Sve
+NotConfigured=Module/Application not configured
+Active=Aktivan
 SetupShort=Postavke
-OtherOptions=Other options
+OtherOptions=Druge opcije
 OtherSetup=Ostale postavke
-CurrentValueSeparatorDecimal=Decimal separator
-CurrentValueSeparatorThousand=Thousand separator
+CurrentValueSeparatorDecimal=Odvajanje decimala
+CurrentValueSeparatorThousand=Odvajanje hiljada
 Destination=Destination
 IdModule=Module ID
 IdPermissions=Permissions ID
-Modules=Modules
-LanguageBrowserParameter=Parameter %s
+LanguageBrowserParameter=Parametar %s
 LocalisationDolibarrParameters=Localisation parameters
 ClientTZ=Client Time Zone (user)
 ClientHour=Client time (user)
@@ -123,19 +123,20 @@ PHPTZ=PHP server Time Zone
 DaylingSavingTime=Daylight saving time
 CurrentHour=PHP Time (server)
 CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=Da biste postavili različite PHP vremenske zonu (nije potrebno), možete pokušati dodati fajl .htacces sa linijom kao što je ova "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max number of lines for widgets
-PositionByDefault=Default order
+PositionByDefault=Pretpostavljeni red
 Position=Pozicija
 MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
 MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br />Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
-MenuForUsers=Menu for users
+MenuForUsers=Meni za korisnike
 LangFile=.lang file
-System=System
-SystemInfo=System information
-SystemToolsArea=System tools area
+System=Sistem
+SystemInfo=Sistemske informacije
+SystemToolsArea=Područje sistemskih alata
 SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for.
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
@@ -183,13 +184,13 @@ NoLockBeforeInsert=No lock commands around INSERT
 DelayedInsert=Delayed insert
 EncodeBinariesInHexa=Encode binary data in hexadecimal
 IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
-AutoDetectLang=Automatsko otkrivanje (browser jezik)
+AutoDetectLang=Automatsko otkrivanje (jezik preglednika)
 FeatureDisabledInDemo=Feature disabled in demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Dozvole
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activat
 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 (Activated NOT recommended, breaks mass pdf generation)
-ProtectAndEncryptPdfFilesDesc=Zaštita PDF dokument drži ga na raspolaganju za čitanje i printanje za bilo kojiPDF preglednikom. Međutim, uređivanje i kopiranje nije moguće. Imajte na umu da koristite ovu funkciju čine izgradnju globalne kumulirane pdf fajlove ne radi (kao što su neplaćeni računi).
+ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature makes building of a global merged PDFs not working.
 Feature=Feature
 DolibarrLicense=License
 Developpers=Developers/contributors
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr online demo
 OfficialMarketPlace=Official market place for external modules/addons
 OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
 ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
@@ -243,7 +246,7 @@ NoticePeriod=Notice period
 NewByMonth=New by month
 Emails=E-mails
 EMailsSetup=Postavke e-mailova
-EMailsDesc=Ova stranica vam omogućava da prebriše PHP parametre za slanje e-mailova. U većini slučajeva na Unix / Linux OS, PHP postavke si ispravne i ovi parametri su beskorisni.
+EMailsDesc=Ova stranica vam omogućava da prebriše PHP parametre za slanje e-mailova. U većini slučajeva na Unix / Linux OS, PHP postavke su ispravne i ovi parametri su beskorisni.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (By default in php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
@@ -267,8 +270,8 @@ FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your
 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/
 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=Postavke modula
-ModulesSetup=Postavke modula
-ModuleFamilyBase=System
+ModulesSetup=Modules/Application setup
+ModuleFamilyBase=Sistem
 ModuleFamilyCrm=Customer Relation Management (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Products Management (PM)
@@ -300,14 +303,17 @@ CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Update server offline
+WithCounter=Manage a counter
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
 ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
 ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
@@ -367,21 +373,23 @@ String=String
 TextLong=Long text
 Int=Integer
 Float=Float
-DateAndTime=Date and hour
+DateAndTime=Datum i vrijeme
 Unique=Unique
-Boolean=Boolean (Checkbox)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Telefon
-ExtrafieldPrice = Price
-ExtrafieldMail = Email
+ExtrafieldPrice = Cijena
+ExtrafieldMail = email
 ExtrafieldUrl = Url
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
-ExtrafieldPassword=Password
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldSeparator=Separator (not a field)
+ExtrafieldPassword=Šifra
+ExtrafieldRadio=Radio buttons (on 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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -398,7 +406,7 @@ LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone nu
 KeepEmptyToUseDefault=Keep empty to use default value
 DefaultLink=Default link
 SetAsDefault=Set as default
-ValueOverwrittenByUserSetup=Upozorenje, ova vrijednost se može prebrisati posebnim postabkama korisnika (svaki korisnik može postaviti svoj clicktodial URL)
+ValueOverwrittenByUserSetup=Upozorenje, ova vrijednost se može prebrisati posebnim postavkama korisnika (svaki korisnik može postaviti svoj clicktodial URL)
 ExternalModule=Eksterni moduli - Instalirani u direktorij %s
 BarcodeInitForThirdparties=Mass barcode init for thirdparties
 BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Field
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=Invoice and credit note management for customers. Invoice managemen
 Module40Name=Dobavljači
 Module40Desc=Supplier management and buying (orders and invoices)
 Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Proizvodi
@@ -487,7 +509,7 @@ Module240Name=Data exports
 Module240Desc=Tool to export Dolibarr data (with assistants)
 Module250Name=Data imports
 Module250Desc=Tool to import data in Dolibarr  (with assistants)
-Module310Name=Members
+Module310Name=Članovi
 Module310Desc=Foundation members management
 Module320Name=RSS Feed
 Module320Desc=Add RSS feed inside Dolibarr screen pages
@@ -499,15 +521,15 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Notifikacije
 Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Donacije
 Module700Desc=Donation management
-Module770Name=Expense reports
+Module770Name=Izvještaj o troškovima
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=Kadrovska služba
-Module4000Desc=Human resources management
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow - Tok rada
@@ -570,7 +594,7 @@ Module59000Name=Margins
 Module59000Desc=Module to manage margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
-Module63000Name=Resources
+Module63000Name=Resursi
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
 Permission11=Read customer invoices
 Permission12=Create/modify customer invoices
@@ -591,7 +615,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects i'm contact for)
 Permission45=Export projects
@@ -830,7 +854,7 @@ DictionaryActions=Types of agenda events
 DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of revenue stamps
-DictionaryPaymentConditions=Payment terms
+DictionaryPaymentConditions=Uslovi plaćanja
 DictionaryPaymentModes=Payment modes
 DictionaryTypeContact=Contact/Address types
 DictionaryEcotaxe=Ecotax (WEEE)
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Emails templates
 DictionaryUnits=Jedinice
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Postavke snimljene
+SetupNotSaved=Setup not saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
 VATManagement=VAT Management
@@ -858,7 +884,7 @@ VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases li
 VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
 VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
-LTRate=Rate
+LTRate=Stopa
 LocalTax1IsNotUsed=Do not use second tax
 LocalTax1IsUsedDesc=Use a second type of tax (other than VAT)
 LocalTax1IsNotUsedDesc=Do not use other type of tax (other than VAT)
@@ -921,7 +947,7 @@ Host=Server
 DriverType=Driver type
 SummarySystem=System information summary
 SummaryConst=Lista svih parametara postavki za Dolibarr
-MenuCompanySetup=Kompanija/Fondacija
+MenuCompanySetup=Kompanija/organizacija
 DefaultMenuManager= Standard menu manager
 DefaultMenuSmartphoneManager=Smartphone menu manager
 Skin=Skin theme
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Default max length for lists
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=Message of the day
 MessageLogin=Login page message
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/foundation information
-CompanyIds=Company/foundation identities
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=Naziv
 CompanyAddress=Adresa
 CompanyZip=Zip
@@ -950,7 +978,7 @@ NoActiveBankAccountDefined=No active bank account defined
 OwnerOfBankAccount=Owner of bank account %s
 BankModuleNotActive=Bank accounts module not enabled
 ShowBugTrackLink=Show link "<strong>%s</strong>"
-Alerts=Alerts
+Alerts=Upozorenja
 DelaysOfToleranceBeforeWarning=Tolerance delays before warning
 DelaysOfToleranceDesc=This screen allows you to define the tolerated delays before an alert is reported on screen with picto %s for each late element.
 Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned events (agenda events) not completed yet
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Other menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Audit
@@ -987,7 +1015,7 @@ BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
 LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists 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
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=Možete koristiti driver %s koji je trenutno najbolji.
@@ -1129,14 +1158,16 @@ CompanyIdProfChecker=Rules on Professional Ids
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####
 BillsSetup=Invoices module setup
 BillsNumberingModule=Invoices and credit notes numbering model
 BillsPDFModules=Invoice documents models
-CreditNote=Dobropis
-CreditNotes=Dobropisi
+PaymentsPDFModules=Payment documents models
+CreditNote=Knjižna obavijest
+CreditNotes=Knjižne obavijesti
 ForceInvoiceDate=Force invoice date to validation date
 SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
 SuggestPaymentByRIBOnAccount=Suggest payment by withdraw on account
@@ -1191,11 +1222,11 @@ AdherentMailRequired=EMail required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
 ##### LDAP setup #####
 LDAPSetup=LDAP Setup
-LDAPGlobalParameters=Global parameters
-LDAPUsersSynchro=Users
+LDAPGlobalParameters=Globalni parametri
+LDAPUsersSynchro=Korisnici
 LDAPGroupsSynchro=Grupe
-LDAPContactsSynchro=Contacts
-LDAPMembersSynchro=Members
+LDAPContactsSynchro=Kontakti
+LDAPMembersSynchro=Članovi
 LDAPSynchronization=LDAP synchronisation
 LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP
 LDAPToDolibarr=LDAP -> Dolibarr
@@ -1302,7 +1333,7 @@ LDAPFieldCompanyExample=Example : o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Example : objectsid
 LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Job position
+LDAPFieldTitle=Pozicija
 LDAPFieldTitleExample=Example: title
 LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Fajlovi tipa %s nisu keširani na HTTP serveru
 FilesOfTypeCompressed=Fajlovi tipa %s su kompresovani od strane HTTP servera
 FilesOfTypeNotCompressed=Fajlovi tipa %s nisu kompresovani od strane HTTP servera
 CacheByServer=Keširanje na serveru
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Keširanje u browser-u
 CompressionOfResources=Kompresija HTTP odgovora
+CompressionOfResourcesDesc=For exemple 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 your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Products module setup
 ServiceSetup=Services module setup
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Invoice date used
 Buy=Buy
 Sell=Sell
 InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=Accountancy Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+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 your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
+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.
 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 same computer than 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.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+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.
@@ -1518,12 +1557,11 @@ WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is n
 BankSetupModule=Bank module setup
 FreeLegalTextOnChequeReceipts=Free text on cheque receipts
 BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
-BankOrderGlobal=General
+BankOrderGlobal=Opće
 BankOrderGlobalDesc=General display order
 BankOrderES=Španski
 BankOrderESDesc=Spanish display order
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ 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.
 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.
-ConfFileMuseContainCustom=Installing 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)
 TextTitleColor=Color of page title
 LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/bs_BA/banks.lang b/htdocs/langs/bs_BA/banks.lang
index dcfd1f41866..bb23b2539ef 100644
--- a/htdocs/langs/bs_BA/banks.lang
+++ b/htdocs/langs/bs_BA/banks.lang
@@ -5,14 +5,14 @@ BankName=Naziv banke
 FinancialAccount=Račun
 BankAccount=Žiro račun
 BankAccounts=Žiro računi
-ShowAccount=Show Account
-AccountRef=Financijski računa ref
-AccountLabel=Naziv za financijski račun
+ShowAccount=Prikaži račun
+AccountRef=Finansijski račun ref
+AccountLabel=Naziv za finansijski račun
 CashAccount=Gotovinski račun
 CashAccounts=Gotovinski računi
 CurrentAccounts=Tekući računi
 SavingAccounts=Štedni računi
-ErrorBankLabelAlreadyExists=Naziv za financijski račun već postoji
+ErrorBankLabelAlreadyExists=Naziv za finansijski račun već postoji
 BankBalance=Stanje
 BankBalanceBefore=Stanje prije
 BankBalanceAfter=Stanje poslije
@@ -28,12 +28,12 @@ Reconciliation=Izmirenje
 RIB=Broj bankovnog računa
 IBAN=IBAN broj
 BIC=BIC / SWIFT broj
-SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
-IbanValid=BAN valid
-IbanNotValid=BAN not valid
-StandingOrders=Direct Debit orders
-StandingOrder=Direct debit order
+SwiftValid=BIC/SWIFT valjan
+SwiftVNotalid=BIC/SWIFT nije valjan
+IbanValid=BAN valjan
+IbanNotValid=BAN nije valjan
+StandingOrders=Nalozi za plaćanje
+StandingOrder=Nalog za plaćanje
 AccountStatement=Izvod računa
 AccountStatementShort=Izvod
 AccountStatements=Izvodi računa
@@ -43,7 +43,7 @@ BankAccountDomiciliation=Adresa računa
 BankAccountCountry=Zemlja računa
 BankAccountOwner=Ime vlasnika računa
 BankAccountOwnerAddress=Adresa vlasnika računa
-RIBControlError=Integrity check of values fails. This means information for this account number are not complete or wrong (check country, numbers and IBAN).
+RIBControlError=Provjera integriteta vrijednosti neuspješna. To znači da podaci za ovaj broj računa nisu tačni ili nepotpuni (provjerite državu, brojeve i IBAN).
 CreateAccount=Kreiraj račun
 NewBankAccount=Novi račun
 NewFinancialAccount=Novi finansijski račun
@@ -57,96 +57,101 @@ BankType2=Gotovinski račun
 AccountsArea=Područje za račune
 AccountCard=Kartica računa
 DeleteAccount=Obriši račun
-ConfirmDeleteAccount=Are you sure you want to delete this account?
+ConfirmDeleteAccount=Da li ste sigurni da želite obrisati ovaj račun?
 Account=Račun
-BankTransactionByCategories=Bank entries by categories
-BankTransactionForCategory=Bank entries for category <b>%s</b>
+BankTransactionByCategories=Bankovne transakcije po kategorijama
+BankTransactionForCategory=Bankovne transakcije za kategoriju <b>%s</b>
 RemoveFromRubrique=Uklonite vezu sa kategorijom
-RemoveFromRubriqueConfirm=Are you sure you want to remove link between the entry and the category?
-ListBankTransactions=List of bank entries
+RemoveFromRubriqueConfirm=Da li ste sigurni da želite ukloniti vezu između transakcije i kategorije?
+ListBankTransactions=Spisak bankovnih transakcija
 IdTransaction=ID transakcije
-BankTransactions=Bank entries
-ListTransactions=List entries
-ListTransactionsByCategory=List entries/category
-TransactionsToConciliate=Entries to reconcile
+BankTransactions=Bankovne transakcije
+BankTransaction=Bankovna transakcija
+ListTransactions=Spisak transakcija
+ListTransactionsByCategory=Spisak transakcija/kategorija
+TransactionsToConciliate=Transakcije za izmirivanje
 Conciliable=Može se izmiriti
 Conciliate=Izmiriti
 Conciliation=Podmirivanje
-ReconciliationLate=Reconciliation late
+ReconciliationLate=Kašnjenje s izmirivanjem
 IncludeClosedAccount=Uključiti zatvorene račune
 OnlyOpenedAccount=Samo otvoreni računi
 AccountToCredit=Račun za potraživanja
 AccountToDebit=Račun za zaduživanje
 DisableConciliation=Isključi opciju podmirenja za ovaj račun
 ConciliationDisabled=Opcija podmirivanja isključena
-LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=Otvoreno
-StatusAccountClosed=Zatvoreno
+LinkedToAConciliatedTransaction=Spojeno na izmirenu transakciju
+StatusAccountOpened=Otvoren
+StatusAccountClosed=Zatvoren
 AccountIdShort=Broj
 LineRecord=Transakcija
-AddBankRecord=Add entry
-AddBankRecordLong=Add entry manually
+AddBankRecord=Dodaj unos
+AddBankRecordLong=Dodaj unos ručno
 ConciliatedBy=Izmireno od strane
 DateConciliating=Datum izmirivanja
-BankLineConciliated=Entry reconciled
-Reconciled=Reconciled
-NotReconciled=Not reconciled
-CustomerInvoicePayment=Uplata mušterije
-SupplierInvoicePayment=Plaćanje dobavljača
-SubscriptionPayment=Subscription payment
+BankLineConciliated=Transakcija izmirena
+Reconciled=Izmireno
+NotReconciled=Nije izmireno
+CustomerInvoicePayment=Uplata kupca
+SupplierInvoicePayment=Plaćanje dobavljaču
+SubscriptionPayment=Plaćanje preplate
 WithdrawalPayment=Povlačenje uplate
-SocialContributionPayment=Social/fiscal tax payment
-BankTransfer=Bankovna transakcija
-BankTransfers=Bankovne transakcije
-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)
+SocialContributionPayment=Plaćanje socijalnog/fiskalnog poreza
+BankTransfer=Prenos između banaka
+BankTransfers=Prenosi između banaka
+MenuBankInternalTransfer=Interni transfer
+TransferDesc=Prebacivanje s jednog računa na drugi, Dolibarr zapisuje dva unosa (potražuje račun sa kojeg se prenosi i duguje ciljni račun. Isti iznos (osim predznaka), oznaka i datum će se koristiti za ovu transakciju)
 TransferFrom=Od strane
 TransferTo=Prema
 TransferFromToDone=Transfer sa <b>%s</b> na <b>%s</b> u iznosu od <b>%s</b> %s je zapisan.
 CheckTransmitter=Otpremnik
-ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure you want to validate this check receipt, no change will be possible once this is done?
-DeleteCheckReceipt=Delete this check receipt?
-ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
+ValidateCheckReceipt=Odobrite ovaj ispis čeka?
+ConfirmValidateCheckReceipt=Da li ste sigurni da želite odobriti ovaj prijem čeka, kada to uradite nećete moći više vršiti promjene?
+DeleteCheckReceipt=Obrišite ovaj izvod čeka?
+ConfirmDeleteCheckReceipt=Da li ste sigurni da želite obrisati ovaj izvod od čeka?
 BankChecks=Bankovni ček
-BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceipt=Čekovi koji čekaju na depozit
 ShowCheckReceipt=Prikaži priznanicu depozita čeka
 NumberOfCheques=Broj čeka
-DeleteTransaction=Delete entry
-ConfirmDeleteTransaction=Are you sure you want to delete this entry?
-ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
+DeleteTransaction=Obriši unos
+ConfirmDeleteTransaction=Da li ste sigurni da želite obrisati ovaj unos?
+ThisWillAlsoDeleteBankRecord=Ovim će se također obrisati i generisana bankovna transakcija
 BankMovements=Promet
-PlannedTransactions=Planned entries
+PlannedTransactions=Planirane transakcije
 Graph=Grafika
-ExportDataset_banque_1=Bank entries and account statement
-ExportDataset_banque_2=Deposit slip
+ExportDataset_banque_1=Bankovne transakcije i izvod s računa
+ExportDataset_banque_2=Priznanica depozita
 TransactionOnTheOtherAccount=Transakcija na drugom računu
-PaymentNumberUpdateSucceeded=Payment number updated successfully
+PaymentNumberUpdateSucceeded=Broj uplate uspješno ažuriran
 PaymentNumberUpdateFailed=Broj uplate nije ažuriran
-PaymentDateUpdateSucceeded=Payment date updated successfully
+PaymentDateUpdateSucceeded=Datum uplate uspješno ažuriran
 PaymentDateUpdateFailed=Datum uplate nije ažuriran
 Transactions=Transakcije
-BankTransactionLine=Bank entry
+BankTransactionLine=Bankovna transakcija
 AllAccounts=Svi bankovni/novčani računi
 BackToAccount=Nazad na račun
 ShowAllAccounts=Pokaži za sve račune
-FutureTransaction=Transakcije u budućnosti. Nema šanse da se izmiri.
+FutureTransaction=Transakcija u budućnosti. Ne može se izmiriti.
 SelectChequeTransactionAndGenerate=Izaberite/filtrirajte čekove za uključivanje u priznanicu za depozit i kliknite na "Kreiraj".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
+InputReceiptNumber=Izaberite izvod iz banke za izmirivanje. Koristite brojevne vrijednosti koje se mogu sortirati: YYYYMM ili YYYYMMDD
 EventualyAddCategory=Na kraju, navesti kategoriju u koju će se svrstati zapisi
-ToConciliate=To reconcile?
+ToConciliate=Za izmirenje?
 ThenCheckLinesAndConciliate=Zatim, provjerite tekst prisutan u izvodu banke i kliknite
 DefaultRIB=Uobičajeni BAN
-AllRIB=All BAN
-LabelRIB=BAN Label
-NoBANRecord=No BAN record
-DeleteARib=Delete BAN record
-ConfirmDeleteRib=Are you sure you want to delete this BAN record?
-RejectCheck=Check returned
-ConfirmRejectCheck=Are you sure you want to mark this check as rejected?
-RejectCheckDate=Date the check was returned
-CheckRejected=Check returned
-CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
-BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
-DocumentModelBan=Template to print a page with BAN information.
+AllRIB=Svi BAN
+LabelRIB=Oznaka BAN
+NoBANRecord=Nema BAN zapisa
+DeleteARib=Brisanje BAN zapisa
+ConfirmDeleteRib=Da li ste sigurni da želite obrisati ovaj BAN zapis?
+RejectCheck=Ček vraćen
+ConfirmRejectCheck=Da li ste sigurni da želite označiti ovaj ček kao odbijen?
+RejectCheckDate=Datum vraćanja čeka
+CheckRejected=Ček vraćen
+CheckRejectedAndInvoicesReopened=Ček vraćen i fakture ponovno otvorene
+BankAccountModelModule=Šabloni dokumenata za bankovne račune
+DocumentModelSepaMandate=Šablon za SEPA mandat. Koristan je samo za evropske zemlje članice EU.
+DocumentModelBan=Šablon za štampanje stranice sa BAN podacima.
+NewVariousPayment=Novo ostalo plaćanje
+VariousPayment=Razno plaćanje
+VariousPayments=Razna plaćanja
+ShowVariousPayment=Pokaži ostala plaćanja
diff --git a/htdocs/langs/bs_BA/bills.lang b/htdocs/langs/bs_BA/bills.lang
index 5e1ce554937..7653062f4a3 100644
--- a/htdocs/langs/bs_BA/bills.lang
+++ b/htdocs/langs/bs_BA/bills.lang
@@ -1,32 +1,32 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Faktura
 Bills=Fakture
-BillsCustomers=Customer invoices
+BillsCustomers=Fakture kupaca
 BillsCustomer=Faktura kupca
-BillsSuppliers=Supplier invoices
-BillsCustomersUnpaid=Unpaid customer invoices
-BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
-BillsSuppliersUnpaid=Unpaid supplier invoices
-BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
+BillsSuppliers=Fakture dobavljača
+BillsCustomersUnpaid=Nenaplaćene fakture od kupca
+BillsCustomersUnpaidForCompany=Neplaćene fakture kupca za %s
+BillsSuppliersUnpaid=Neplaćene fakture dobavljača
+BillsSuppliersUnpaidForCompany=Neplaćene fakture dobavljača za %s
 BillsLate=Zakašnjela plaćanja
-BillsStatistics=Customers invoices statistics
-BillsStatisticsSuppliers=Suppliers invoices statistics
-DisabledBecauseNotErasable=Disabled because cannot be erased
+BillsStatistics=Statistika faktura kupaca
+BillsStatisticsSuppliers=Statistika faktura dobavljača
+DisabledBecauseNotErasable=Onemogućeno jer se ne može brisati
 InvoiceStandard=Standardna faktura
 InvoiceStandardAsk=Standardna faktura
 InvoiceStandardDesc=Ova vrsta fakture je uobičajena faktura.
-InvoiceDeposit=Faktura za avans
-InvoiceDepositAsk=Faktura za avans
-InvoiceDepositDesc=Ova vrsta fakture se izdaje kada se primi avans
+InvoiceDeposit=Račun za akontaciju
+InvoiceDepositAsk=Račun za akontaciju
+InvoiceDepositDesc=Ova vrsta fakture se pravi kada je uplaćena akontacija.
 InvoiceProForma=Predračun
 InvoiceProFormaAsk=Predračun
-InvoiceProFormaDesc=<b>Predračun</b> izgleda isto kao račun, vendar nima računaodske vrednosti.
+InvoiceProFormaDesc=<b>Predračun</b> izgleda isto kao račun, ali nema računovodstvene vrijednosti.
 InvoiceReplacement=Zamjenska faktura
 InvoiceReplacementAsk=Zamjenska faktura za fakturu
 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'.
-InvoiceAvoir=Dobropis
-InvoiceAvoirAsk=Dobropis za korekcijo računa
-InvoiceAvoirDesc=<b>Dobropis</b> je negativni račun, ki se uporabi za rešitev problema, ko je iznos na računu drugačen od dejansko plačanega zneska (ker je kupec pomotoma plačal preveč, ali ne bo plačal v celoti, ker je na primer vrnil nekatere proizvode).
+InvoiceAvoir=Knjižna obavijest
+InvoiceAvoirAsk=Knjižna obavijest za korekciju računa
+InvoiceAvoirDesc=<b>Knjižna obavijest</b> je negativni račun, koji se koristi za rješavanje činjenice da računa ima iznos različit od iznosa koji je zaista plaćen (jer je kupac platio greškom više, ili neće da plati ostatak jer je vratio neke robe naprimjer).
 invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
 invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
 invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
@@ -39,9 +39,9 @@ CorrectionInvoice=Ispravak fakture
 UsedByInvoice=Upotrebljeno za plaćanje fakture %s
 ConsumedBy=Utrošeno od strane
 NotConsumed=Nije utrošeno
-NoReplacableInvoice=Ni nadomestnega računa
+NoReplacableInvoice=Nema zamjenskih računa
 NoInvoiceToCorrect=Nema fakture za ispravljanje
-InvoiceHasAvoir=Was source of one or several credit notes
+InvoiceHasAvoir=je bila izvor jedne ili više knjižnih obavijesti
 CardBill=Kartica fakture
 PredefinedInvoices=Predefinisane fakture
 Invoice=Faktura
@@ -59,11 +59,11 @@ PaymentBack=Povrat uplate
 CustomerInvoicePaymentBack=Povrat uplate
 Payments=Uplate
 PaymentsBack=Povrat uplata
-paymentInInvoiceCurrency=in invoices currency
+paymentInInvoiceCurrency=u valuti faktura
 PaidBack=Uplaćeno nazad
 DeletePayment=Obriši uplatu
-ConfirmDeletePayment=Jeste li sigurni da želite obrisati ovu uplatu?
-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.
+ConfirmDeletePayment=Da li ste sigurni da želite obrisati ovu uplatu?
+ConfirmConvertToReduc=Da li želite ovo %s pretvoriti u apsolutni popust ?<br>Iznos će biti spremljen među sve popuste i može se koristiti kao poput za trenutnu ili neke buduće fakture za ovog kupca.
 SupplierPayments=Uplate dobavljača
 ReceivedPayments=Primljene uplate
 ReceivedCustomersPayments=Primljene uplate od kupaca
@@ -75,76 +75,76 @@ PaymentsAlreadyDone=Izvršene uplate
 PaymentsBackAlreadyDone=Izvršeni povrati uplata
 PaymentRule=Pravilo plaćanja
 PaymentMode=Način plaćanja
-PaymentTypeDC=Debit/Credit Card
+PaymentTypeDC=Debitna/kreditna kartica
 PaymentTypePP=PayPal
 IdPaymentMode=Payment type (id)
-CodePaymentMode=Payment type (code)
+CodePaymentMode=Vrsta plaćanja (šifra)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=Način plaćanja
 PaymentTerm=Rok plaćanja
-PaymentConditions=Payment terms
-PaymentConditionsShort=Payment terms
+PaymentConditions=Uslovi plaćanja
+PaymentConditionsShort=Uslovi plaćanja
 PaymentAmount=Iznos plaćanja
 ValidatePayment=Potvrditi uplatu
 PaymentHigherThanReminderToPay=Uplata viša od zaostalog duga
-HelpPaymentHigherThanReminderToPay=Pozor, plačilo zneska enega ali več računa  je višje od preostanka za plačilo. <br> Popravite vaš vnos, ali potrdite iznos in pripravite dobropise za prekoračene zneske za vsak preveč plačan račun.
+HelpPaymentHigherThanReminderToPay=Upozorenje, plaćanje iznosa jedne ili više faktura je veće od ostatka duga. <br> Izmijenite vaš unos, u suprotnom potvrdite i napravite knjižnu obavijest za višak primljen za svaku više plaćenu fakturu.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm.
 ClassifyPaid=Označi kao 'Plaćeno'
 ClassifyPaidPartially=Označi kao 'Djelimično plaćeno'
 ClassifyCanceled=Označi kao 'Otkazano'
 ClassifyClosed=Označi kao 'Zaključeno'
-ClassifyUnBilled=Classify 'Unbilled'
+ClassifyUnBilled=Klasificiraj 'nefakturisano'
 CreateBill=Kreiraj predračun
 CreateCreditNote=Ustvari dobropis
-AddBill=Create invoice or credit note
+AddBill=Napravi račun ili knjižnu obavijest
 AddToDraftInvoices=Dodaj na uzorak fakture
 DeleteBill=Obriši fakturu
 SearchACustomerInvoice=Traži fakturu kupca
 SearchASupplierInvoice=Traži fakturu dobavljača
 CancelBill=Otkaži fakturu
 SendRemindByMail=Pošalji opomenu na E-Mail
-DoPayment=Enter payment
-DoPaymentBack=Enter refund
+DoPayment=Unesi uplatu
+DoPaymentBack=Unesi refundaciju
 ConvertToReduc=Pretvori u budući popust
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Unesi uplate primljene od kupca
-EnterPaymentDueToCustomer=Vnesi Rok plaćanja za kupca
-DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
+EnterPaymentDueToCustomer=Unesi rok plaćanja za kupca
+DisabledBecauseRemainderToPayIsZero=Onemogućeno jer je ostatak duga nula
 PriceBase=Osnova cijene
 BillStatus=Status fakture
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Uzorak (Potrebna je potvrda)
 BillStatusPaid=Plaćeno
-BillStatusPaidBackOrConverted=Refund or converted into discount
-BillStatusConverted=Spremenjeno v popust
+BillStatusPaidBackOrConverted=Refundacija knjiž.obavijesti ili pretvoreno u popust
+BillStatusConverted=Plaćeno (spremno za konačnu fakturu)
 BillStatusCanceled=Otkazano
 BillStatusValidated=Potvrđeno (Potrebno platiti)
 BillStatusStarted=Započeto
 BillStatusNotPaid=Nije plaćeno
-BillStatusNotRefunded=Not refunded
+BillStatusNotRefunded=Nije vraćeno
 BillStatusClosedUnpaid=Zaključeno (neplaćeno)
 BillStatusClosedPaidPartially=Plaćeno (djelimično)
 BillShortStatusDraft=Uzorak
 BillShortStatusPaid=Plaćeno
-BillShortStatusPaidBackOrConverted=Refund or converted
-BillShortStatusConverted=Spremenjeno
+BillShortStatusPaidBackOrConverted=Refundirano ili preplaćeno
+BillShortStatusConverted=Plaćeno
 BillShortStatusCanceled=Otkazano
 BillShortStatusValidated=Potvrđeno
 BillShortStatusStarted=Započeto
 BillShortStatusNotPaid=Neplaćeno
-BillShortStatusNotRefunded=Not refunded
+BillShortStatusNotRefunded=Nije vraćeno
 BillShortStatusClosedUnpaid=Zaključeno
 BillShortStatusClosedPaidPartially=Plaćeno (djelimično)
 PaymentStatusToValidShort=Za potvrdu
 ErrorVATIntraNotConfigured=PDV broj nije definisan
-ErrorNoPaiementModeConfigured=Ni določen privzet način plačila. Pojdite na nastavitve modula za račune.
-ErrorCreateBankAccount=Kreirajte bančni račun, zatem pojdite na področje Nastavitve za definiranje načina plačila
+ErrorNoPaiementModeConfigured=Nema definisanog načina plaćanja. Idite u postavke modula faktura da popravite ovo.
+ErrorCreateBankAccount=Napravite bankovni račun, zatim idite u panel postavki modula računa za definiranje načina plaćanja
 ErrorBillNotFound=Faktura %s ne postoji
-ErrorInvoiceAlreadyReplaced=Greška, poskusili ste potrditi račun za zamenjavo račuuna %s. Vendar je ta že bil nadomeščen z računom %s.
+ErrorInvoiceAlreadyReplaced=Greška, pokušavate odobriti fakturu za zamjenu fakture %s. Ali je ona već zamijenjena fakturom %s.
 ErrorDiscountAlreadyUsed=Greška, popust se već koristi
 ErrorInvoiceAvoirMustBeNegative=Greška, na popravljenem računu mora biti negativni iznos
-ErrorInvoiceOfThisTypeMustBePositive=Greška, ovaj tup fakture mora imati pozitivnu količinu
-ErrorCantCancelIfReplacementInvoiceNotValidated=Greška, ne morete preklicati računa, ki je bil zamenjan z drugim računom, ki je še v statusu osnutka
+ErrorInvoiceOfThisTypeMustBePositive=Greška, ovaj tip fakture mora imati pozitivnu količinu
+ErrorCantCancelIfReplacementInvoiceNotValidated=Greška, ne možete poništiti fakturu koju je zamijenila druga faktura a koja je još u statusu nacrta
 BillFrom=Od
 BillTo=Račun za
 ActionsOnBill=Aktivnosti na fakturi
@@ -153,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=Nova faktura
-LastBills=Latest %s invoices
-LastCustomersBills=Latest %s customer invoices
-LastSuppliersBills=Latest %s supplier invoices
+LastBills=Posljednjih %s faktura
+LastCustomersBills=Posljednjih %s faktura kupaca
+LastSuppliersBills=Posljednjih %s faktura dobavljača
 AllBills=Sve fakture
 OtherBills=Ostale fakture
 DraftBills=Uzorak faktura
-CustomersDraftInvoices=Customer draft invoices
-SuppliersDraftInvoices=Supplier draft invoices
+CustomersDraftInvoices=Nacrti faktura kupcima
+SuppliersDraftInvoices=Nacrti faktura dobavljačima
 Unpaid=Neplaćeno
 ConfirmDeleteBill=Are you sure you want to delete this invoice?
 ConfirmValidateBill=Are you sure you want to validate this invoice with reference <b>%s</b>?
@@ -174,14 +174,14 @@ ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a dis
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Loš kupac
-ConfirmClassifyPaidPartiallyReasonProductReturned=Proizvodi djelomično vraćeni
+ConfirmClassifyPaidPartiallyReasonProductReturned=Proizvodi djelimično vraćeni
 ConfirmClassifyPaidPartiallyReasonOther=Iznos otkazan zbog drugog razloga
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Ovaj izbor je moguć ako faktura sadrži odgovarajući komentar. (Primjer << Imate pravo na odbitak, samo ako je plaćen porez koji odgovara cijeni>>)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=U nekim državama je ovaj izbor moguć samo ako faktura sadrži ispavne bilješke
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Ovaj izbor je moguć ako faktura sadrži odgovarajući komentar. (Primjer «Imate pravo na odbitak, samo ako je plaćen porez koji odgovara cijeni»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=U nekim državama je ovaj izbor moguć samo ako faktura sadrži ispravne bilješke
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Koristiti ovaj izbor samo ako nije drugi nije zadovoljavajući
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>Loš kupac</b> je kupac koji je odbija platiti svoj dug.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Ovaj izbor se koristi kada uplata nije završena zbog povrata nekih proizvoda
-ConfirmClassifyPaidPartiallyReasonOtherDesc=To izbiro uporabite, če nobena druga ne ustreza, na primer v naslednji situaciji:<br>- plačilo ni izvršeno v celoti, ker so bili nekateri proizvodi vrnjeni<br>- iznos je bil reklamiran, ker ni bil obračunan popust<br>V vseh primerih mora biti reklamiran iznos popravljen v računaodskem sistemu s kreiranjem dobropisa.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Koristite ovaj izbor ako bilo koji drugi ne odgovara, naprimjer u sljedećoj situaciji:<br>- plaćanje nije izvršeno jer su neki proizvodi vraćeni<br>- iznos je bio reklamiran, jer nije obračunat popust<br>U svim slučajevima, iznos koji je reklamiran mora biti ispravljen u računovodstvenom sistemu kreiranjem knjižne obavijesti.
 ConfirmClassifyAbandonReasonOther=Ostalo
 ConfirmClassifyAbandonReasonOtherDesc=Ovaj izbor se koristi u svim drugih slučajevima. Naprimjer, zbog toga sto planiranje kreirati zamjensku fakturu.
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
@@ -198,16 +198,16 @@ ShowBill=Prikaži fakturu
 ShowInvoice=Prikaži fakturu
 ShowInvoiceReplace=Prikaži zamjensku fakturu
 ShowInvoiceAvoir=Prikaži dobropis
-ShowInvoiceDeposit=Prikaži fakture za avans
+ShowInvoiceDeposit=Show down payment invoice
 ShowInvoiceSituation=Show situation invoice
 ShowPayment=Prikaži uplatu
 AlreadyPaid=Već plaćeno
 AlreadyPaidBack=Već izvršen povrat uplate
-AlreadyPaidNoCreditNotesNoDeposits=Že plačano (brez dobropisa in avansa)
+AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
 Abandoned=Otkazano
-RemainderToPay=Remaining unpaid
-RemainderToTake=Remaining amount to take
-RemainderToPayBack=Remaining amount to refund
+RemainderToPay=Ostalo neplaćeno
+RemainderToTake=Ostatak iznosa za naplatu
+RemainderToPayBack=Ostatak iznosa za povrat
 Rest=Čekanje
 AmountExpected=Iznos za potraživati
 ExcessReceived=Višak primljen
@@ -216,7 +216,7 @@ EscompteOfferedShort=Popust
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Direct debit orders
-StandingOrder=Direct debit order
+StandingOrder=Nalog za plaćanje
 NoDraftBills=Nema uzoraka faktura
 NoOtherDraftBills=Nema drugih uzoraka faktura
 NoDraftInvoices=Nema uzoraka faktura
@@ -233,10 +233,10 @@ DateInvoice=Datum fakture
 DatePointOfTax=Point of tax
 NoInvoice=Nema fakture
 ClassifyBill=Označi fakturu
-SupplierBillsToPay=Unpaid supplier invoices
-CustomerBillsUnpaid=Unpaid customer invoices
+SupplierBillsToPay=Neplaćene fakture dobavljača
+CustomerBillsUnpaid=Nenaplaćene fakture od kupca
 NonPercuRecuperable=Nepovratno
-SetConditions=Postaviti uslova plaćanja
+SetConditions=Postaviti uslove plaćanja
 SetMode=Postaviti način plaćanja
 SetRevenuStamp=Set revenue stamp
 Billed=Fakturisano
@@ -270,10 +270,10 @@ RelativeDiscount=Relativni popust
 GlobalDiscount=Globalni popust
 CreditNote=Dobropis
 CreditNotes=Dobropisi
-Deposit=Avans
-Deposits=Avansi
+Deposit=Down payment
+Deposits=Down payments
 DiscountFromCreditNote=Popust z dobropisa %s
-DiscountFromDeposit=Uplata sa fakture za avans %s
+DiscountFromDeposit=Down payments from invoice %s
 DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=Ova vrsta kredita može se koristiti na fakturi prije potvrde
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
@@ -314,8 +314,8 @@ ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=Povezana faktura
 RelatedBills=Povezane fakture
 RelatedCustomerInvoices=Related customer invoices
-RelatedSupplierInvoices=Related supplier invoices
-LatestRelatedBill=Latest related invoice
+RelatedSupplierInvoices=Povezane fakture dobavljača
+LatestRelatedBill=Posljednje povezane fakture
 WarningBillExist=Warning, one or more invoice already exist
 MergingPDFTool=Merging PDF tool
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
@@ -323,9 +323,9 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-FrequencyPer_d=Every %s days
-FrequencyPer_m=Every %s months
-FrequencyPer_y=Every %s years
+FrequencyPer_d=Svakih %s dana
+FrequencyPer_m=Svakih %s mjeseci
+FrequencyPer_y=Svakih %s godina
 toolTipFrequency=Examples:<br /><b>Set 7, Day</b>: give a new invoice every 7 days<br /><b>Set 3, Month</b>: give a new invoice every 3 month
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of latest generation
@@ -340,28 +340,28 @@ WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 # PaymentConditions
 Statut=Status
-PaymentConditionShortRECEP=Due Upon Receipt
-PaymentConditionRECEP=Due Upon Receipt
+PaymentConditionShortRECEP=Rok po preuzimanju
+PaymentConditionRECEP=Rok po preuzimanju
 PaymentConditionShort30D=30 dana
 PaymentCondition30D=30 dana
-PaymentConditionShort30DENDMONTH=30 days of month-end
-PaymentCondition30DENDMONTH=Within 30 days following the end of the month
+PaymentConditionShort30DENDMONTH=30 dana do kraja mjeseca
+PaymentCondition30DENDMONTH=Unutar 30 dana nakon isteka mjeseca
 PaymentConditionShort60D=60 dana
 PaymentCondition60D=60 dana
-PaymentConditionShort60DENDMONTH=60 days of month-end
-PaymentCondition60DENDMONTH=Within 60 days following the end of the month
+PaymentConditionShort60DENDMONTH=60 dana do kraja mjeseca
+PaymentCondition60DENDMONTH=Unutar 60 dana nakon isteka mjeseca
 PaymentConditionShortPT_DELIVERY=Isporuka
 PaymentConditionPT_DELIVERY=Na isporuci
-PaymentConditionShortPT_ORDER=Order
+PaymentConditionShortPT_ORDER=Narudžba
 PaymentConditionPT_ORDER=Na narudžbi
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% unaprijed, 50%% na isporuci
-PaymentConditionShort10D=10 days
-PaymentCondition10D=10 days
+PaymentConditionShort10D=10 dana
+PaymentCondition10D=10 dana
 PaymentConditionShort10DENDMONTH=10 days of month-end
 PaymentCondition10DENDMONTH=Within 10 days following the end of the month
-PaymentConditionShort14D=14 days
-PaymentCondition14D=14 days
+PaymentConditionShort14D=14 dana
+PaymentCondition14D=14 dana
 PaymentConditionShort14DENDMONTH=14 days of month-end
 PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Fiksni iznos
@@ -369,19 +369,19 @@ VarAmount=Varijabilni iznos (%% tot.)
 # PaymentType
 PaymentTypeVIR=Bankovna transakcija
 PaymentTypeShortVIR=Bankovna transakcija
-PaymentTypePRE=Direct debit payment order
-PaymentTypeShortPRE=Debit payment order
+PaymentTypePRE=Direktni nalog za plaćanje
+PaymentTypeShortPRE=Nalog za plaćanje
 PaymentTypeLIQ=Gotovina
 PaymentTypeShortLIQ=Gotovina
 PaymentTypeCB=Kreditna kartica
 PaymentTypeShortCB=Kreditna kartica
 PaymentTypeCHQ=Ček
 PaymentTypeShortCHQ=Ček
-PaymentTypeTIP=TIP (Documents against Payment)
-PaymentTypeShortTIP=TIP Payment
+PaymentTypeTIP=Akreditiv (Akreditivno pismo)
+PaymentTypeShortTIP=Plaćanje akreditivom
 PaymentTypeVAD=Elektronska uplata
 PaymentTypeShortVAD=Elektronska uplata
-PaymentTypeTRA=Bank draft
+PaymentTypeTRA=Povlačenje banke
 PaymentTypeShortTRA=Nacrt
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
@@ -390,7 +390,7 @@ BankCode=Kod banke
 DeskCode=Kod blagajne
 BankAccountNumber=Kod računa
 BankAccountNumberKey=Ključ
-Residence=Direct debit
+Residence=Nalog za plaćanje
 IBANNumber=IBAN broj
 IBAN=IBAN
 BIC=BIC/SWIFT
@@ -439,7 +439,7 @@ ShowUnpaidAll=Prikaži sve neplaćene fakture
 ShowUnpaidLateOnly=Prikaži samo zakašnjele neplaćene fakture
 PaymentInvoiceRef=Faktura za plaćanje %s
 ValidateInvoice=Potvrdi fakturu
-ValidateInvoices=Validate invoices
+ValidateInvoices=Potvrdi račune
 Cash=Gotovina
 Reported=Odgođeno
 DisabledBecausePayments=Nije moguće jer ima nekoliko uplata
@@ -447,7 +447,7 @@ CantRemovePaymentWithOneInvoicePaid=Ne može se obrisati uplata jer ima bar jedn
 ExpectedToPay=Očekivano plaćanje
 CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Plaćeno ovom uplatom
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
 ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=Sve fakture bez preostalog iznosa za uplatu će atuomatski biti zatvorene uz status "Plaćeno".
@@ -460,11 +460,11 @@ YouMustCreateInvoiceFromThird=This option is only available when creating invoic
 YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice 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=Predloga računa Crabe. Predloga kompletnega računa (Podpora PDV opcije, popusti, pogoji plačila, logo, itd...)
-PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
+PDFCrevetteDescription=PDF šablon Crevette za račune. Kompletan šablon za situiranje privremenih situacija
 TerreNumRefModelDesc1=Predlaga številko v formatu %syymm-nnnn za standardne račune in %syymm-nnnn za dobropise kjer je yy leto, mm mesec in nnnn zaporedna broj brez presledkov in večja od 0
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for deposit invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
 TerreNumRefModelError=Račun z začetkom $syymm že obstaja in ni kompatibilen s tem modelom zaporedja. Odstranite ga ali ga preimenujte za aktiviranje tega modula.
-CactusNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for deposit invoices where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+CactusNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
 ##### Types de contacts #####
 TypeContact_facture_internal_SALESREPFOLL=Predstavnik za kontrolu fakture kupca
 TypeContact_facture_external_BILLING=Kontakt za fakturu kupca
@@ -475,32 +475,32 @@ TypeContact_invoice_supplier_external_BILLING=Kontakt za fakturu dobavljača
 TypeContact_invoice_supplier_external_SHIPPING=Kontakt za otpremanje dobavljaču
 TypeContact_invoice_supplier_external_SERVICE=Kontakt službe za korisnike
 # Situation invoices
-InvoiceFirstSituationAsk=First situation invoice
+InvoiceFirstSituationAsk=Prva privremena situacija
 InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
-InvoiceSituation=Situation invoice
-InvoiceSituationAsk=Invoice following the situation
+InvoiceSituation=Privremena situacija
+InvoiceSituationAsk=Faktura nakon situacije
 InvoiceSituationDesc=Create a new situation following an already existing one
 SituationAmount=Situation invoice amount(net)
-SituationDeduction=Situation subtraction
-ModifyAllLines=Modify all lines
-CreateNextSituationInvoice=Create next situation
+SituationDeduction=Oduzimanje situacije
+ModifyAllLines=Izmijeni sve redove
+CreateNextSituationInvoice=Napravi sljedeću situaciju
 NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
-DisabledBecauseNotLastInCycle=The next situation already exists.
-DisabledBecauseFinal=This situation is final.
+DisabledBecauseNotLastInCycle=Sljedeća situacija već postoji.
+DisabledBecauseFinal=Ova situacija je konačna.
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No open situations
+NoSituations=Nema otvorenih situacija
 InvoiceSituationLast=Final and general invoice
-PDFCrevetteSituationNumber=Situation N°%s
-PDFCrevetteSituationInvoiceLineDecompte=Situation invoice - COUNT
-PDFCrevetteSituationInvoiceTitle=Situation invoice
-PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
-TotalSituationInvoice=Total situation
-invoiceLineProgressError=Invoice line progress can't be greater than or equal to the next invoice line
+PDFCrevetteSituationNumber=Situacija br.%s
+PDFCrevetteSituationInvoiceLineDecompte=Privremena situacija - broj
+PDFCrevetteSituationInvoiceTitle=Privremena situacija
+PDFCrevetteSituationInvoiceLine=Situacija br%s : fakt. br°%s od %s
+TotalSituationInvoice=Ukupna situacija
+invoiceLineProgressError=Red prethodno fakturisanog ne može biti veće ili jednako sljedećem redu u fakturi
 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.
-DeleteRepeatableInvoice=Delete template invoice
+DeleteRepeatableInvoice=Obriši šablon fakture
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
 BillCreated=%s bill(s) created
diff --git a/htdocs/langs/bs_BA/boxes.lang b/htdocs/langs/bs_BA/boxes.lang
index bc83ee5c55c..a847b2474cd 100644
--- a/htdocs/langs/bs_BA/boxes.lang
+++ b/htdocs/langs/bs_BA/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxLoginInformation=Login information
 BoxLastRssInfos=Rss informacije
 BoxLastProducts=Latest %s products/services
 BoxProductsAlertStock=Stock alerts for products
@@ -25,8 +26,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Latest %s modified customers
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer invoices
-BoxTitleLastSupplierBills=Latest %s supplier invoices
+BoxTitleLastCustomerBills=Posljednjih %s faktura kupaca
+BoxTitleLastSupplierBills=Posljednjih %s faktura dobavljača
 BoxTitleLastModifiedProspects=Latest %s modified prospects
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -82,3 +83,4 @@ ForCustomersOrders=Narudžbe kupaca
 ForProposals=Prijedlozi
 LastXMonthRolling=The latest %s month rolling
 ChooseBoxToAdd=Add widget to your dashboard
+BoxAdded=Widget was added in your dashboard
diff --git a/htdocs/langs/bs_BA/companies.lang b/htdocs/langs/bs_BA/companies.lang
index 51d727d5f08..9243913458e 100644
--- a/htdocs/langs/bs_BA/companies.lang
+++ b/htdocs/langs/bs_BA/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Ime kompanije %s već postoji. Izaberite neko drugo.
 ErrorSetACountryFirst=Odberite prvo zemlju
 SelectThirdParty=Odaberite subjekt
-ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+ConfirmDeleteCompany=Da li ste sigurni da želite obrisati ovu kompaniju i sve podatke vezane za istu?
 DeleteContact=Obrisati kontakt/uslugu
-ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+ConfirmDeleteContact=Da li ste sigurni da želite obrisati ovaj kontakt i sve podatke vezane za istog?
 MenuNewThirdParty=Novi subjekt
 MenuNewCustomer=Novi kupac
 MenuNewProspect=Novi mogući klijent
@@ -12,9 +12,9 @@ MenuNewSupplier=Novi dobavljač
 MenuNewPrivateIndividual=Novo fizičko lice
 NewCompany=Nova kompanija (mogući klijent, kupac, dobavljač)
 NewThirdParty=Novi subjekt (mogući klijent, kupac, dobavljač)
-CreateDolibarrThirdPartySupplier=Create a third party (supplier)
-CreateThirdPartyOnly=Create thirdpary
-CreateThirdPartyAndContact=Create a third party + a child contact
+CreateDolibarrThirdPartySupplier=Napravi subjekt (dobavljač)
+CreateThirdPartyOnly=Napravi novi subjekt
+CreateThirdPartyAndContact=Napravi subjekt + podređeni kontakt
 ProspectionArea=Područje za moguće kupce
 IdThirdParty=ID subjekta
 IdCompany=ID kompanije
@@ -24,8 +24,8 @@ ThirdPartyContacts=Kontakti subjekta
 ThirdPartyContact=Kontakt/Adresa subjekta
 Company=Kompanija
 CompanyName=Ime kompanije
-AliasNames=Alias name (commercial, trademark, ...)
-AliasNameShort=Alias name
+AliasNames=Nadimak (komercijalni, trgovačkim, ...)
+AliasNameShort=Nadimak
 Companies=Kompanije
 CountryIsInEEC=Zemlja je unutar Evropske ekonomske zajednice
 ThirdPartyName=Ime subjekta
@@ -38,22 +38,21 @@ ThirdPartyCustomersStats=Kupci
 ThirdPartyCustomersWithIdProf12=Kupci sa %s ili %s
 ThirdPartySuppliers=Dobavljači
 ThirdPartyType=Tip subjekta
-Company/Fundation=Kompanija/Fondacija
 Individual=Fizičko lice
-ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
+ToCreateContactWithSameName=Automatski pravi kontakt/adresu sa istim informacijama kao i subjekt ispod. U većini slučajeva, čak i kada je subjekt fizička osoba, samo pravljenje subjekta je dovoljno.
 ParentCompany=Matična kompanija
 Subsidiaries=Podružnice
 ReportByCustomers=Izvještaj po kupcima
 ReportByQuarter=Izvještaj po stopama
-CivilityCode=Civility code
+CivilityCode=Pravila ponašanja
 RegisteredOffice=Registrovan ured
 Lastname=Prezime
 Firstname=Ime
-PostOrFunction=Job position
+PostOrFunction=Pozicija
 UserTitle=Titula
 Address=Adresa
 State=Država/Provincija
-StateShort=State
+StateShort=Pokrajina
 Region=Region
 Country=Država
 CountryCode=Šifra države
@@ -66,7 +65,7 @@ Chat=Chat
 PhonePro=Službeni telefon
 PhonePerso=Privatni telefon
 PhoneMobile=Mobitel
-No_Email=Refuse mass e-mailings
+No_Email=Odbija masovno slanje emaila
 Fax=Fax
 Zip=Poštanski broj
 Town=Grad
@@ -75,51 +74,51 @@ Poste= Pozicija
 DefaultLang=Defaultni jezik
 VATIsUsed=Oporeziva osoba
 VATIsNotUsed=Neoporeziva osoba
-CopyAddressFromSoc=Fill address with third party address
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
-PaymentBankAccount=Payment bank account
-OverAllProposals=Total proposals
-OverAllOrders=Total orders
-OverAllInvoices=Total invoices
-OverAllSupplierProposals=Total price requests
+CopyAddressFromSoc=Popuni adresu sa adresom subjekta
+ThirdpartyNotCustomerNotSupplierSoNoRef=Subjekt nije kupac niti dobavljač, nema dostupnih referentnih objekata
+PaymentBankAccount=Bankovni račun za plaćanje
+OverAllProposals=Prijedlozi
+OverAllOrders=Narudžbe
+OverAllInvoices=Fakture
+OverAllSupplierProposals=Zahtjevi za cijena
 ##### Local Taxes #####
-LocalTax1IsUsed=Use second tax
-LocalTax1IsUsedES= RE is used
-LocalTax1IsNotUsedES= RE is not used
-LocalTax2IsUsed=Use third tax
-LocalTax2IsUsedES= IRPF is used
-LocalTax2IsNotUsedES= IRPF is not used
+LocalTax1IsUsed=Koristi drugu stopu poreza
+LocalTax1IsUsedES= Koristi se RE
+LocalTax1IsNotUsedES= Ne koristi se RE
+LocalTax2IsUsed=Koristi treću stopu poreza
+LocalTax2IsUsedES= Koristi se IRPF
+LocalTax2IsNotUsedES= Ne koristi se IRPF
 LocalTax1ES=RE
 LocalTax2ES=IRPF
-TypeLocaltax1ES=RE Type
-TypeLocaltax2ES=IRPF Type
+TypeLocaltax1ES=Vrsta RE
+TypeLocaltax2ES=Vrsta IRPF
 WrongCustomerCode=Nevažeća šifra kupca
 WrongSupplierCode=Nevažeća šifra dobavljača
 CustomerCodeModel=Model šifre kupca
 SupplierCodeModel=Model šifre dobavljača
 Gencod=Barkod
 ##### Professional ID #####
-ProfId1Short=Prof. id 1
-ProfId2Short=Prof. id 2
-ProfId3Short=Prof. id 3
-ProfId4Short=Prof. id 4
-ProfId5Short=Prof. id 5
-ProfId6Short=Prof. id 6
-ProfId1=Professional ID 1
-ProfId2=Professional ID 2
-ProfId3=Professional ID 3
-ProfId4=Professional ID 4
-ProfId5=Professional ID 5
-ProfId6=Professional ID 6
+ProfId1Short=ID broj 1
+ProfId2Short=ID broj 2
+ProfId3Short=ID broj 3
+ProfId4Short=ID broj 4
+ProfId5Short=ID broj 5
+ProfId6Short=ID broj 6
+ProfId1=Profesionalni ID 1
+ProfId2=Profesionalni ID 2
+ProfId3=Profesionalni ID 3
+ProfId4=Profesionalni ID 4
+ProfId5=Profesionalni ID 5
+ProfId6=Profesionalni ID 6
 ProfId1AR=Prof Id 1 (CUIT / CUIL)
 ProfId2AR=Prof Id 2 (Revenu brutes)
 ProfId3AR=-
 ProfId4AR=-
 ProfId5AR=-
 ProfId6AR=-
-ProfId1AT=Prof Id 1 (USt.-IdNr)
-ProfId2AT=Prof Id 2 (USt.-Nr)
-ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
+ProfId1AT=Prof Id 1 (USt.-Id br.)
+ProfId2AT=Prof Id 2 (USt.-br.)
+ProfId3AT=Prof Id 3 (br. trgovačkog registra)
 ProfId4AT=-
 ProfId5AT=-
 ProfId6AT=-
@@ -143,8 +142,8 @@ ProfId4BR=CPF
 #ProfId6BR=INSS
 ProfId1CH=-
 ProfId2CH=-
-ProfId3CH=Prof Id 1 (Federal number)
-ProfId4CH=Prof Id 2 (Commercial Record number)
+ProfId3CH=Prof Id 1 (Federalni broj)
+ProfId4CH=Prof Id 2 (Broj komercijalnog zapisa)
 ProfId5CH=-
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
@@ -159,21 +158,21 @@ ProfId3CO=-
 ProfId4CO=-
 ProfId5CO=-
 ProfId6CO=-
-ProfId1DE=Prof Id 1 (USt.-IdNr)
-ProfId2DE=Prof Id 2 (USt.-Nr)
-ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
+ProfId1DE=Prof Id 1 (USt.-Id br.)
+ProfId2DE=Prof Id 2 (USt.-br.)
+ProfId3DE=Prof Id 3 (br. trgovačkog registra)
 ProfId4DE=-
 ProfId5DE=-
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
-ProfId2ES=Prof Id 2 (Social security number)
+ProfId2ES=Prof Id 2 (broj socijalnog osiguranja)
 ProfId3ES=Prof Id 3 (CNAE)
-ProfId4ES=Prof Id 4 (Collegiate number)
+ProfId4ES=Prof Id 4 (broj udruženja)
 ProfId5ES=-
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
-ProfId3FR=Prof Id 3 (NAF, old APE)
+ProfId3FR=Prof Id 3 (NAF, stari APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
 ProfId5FR=-
 ProfId6FR=-
@@ -191,38 +190,38 @@ ProfId5HN=-
 ProfId6HN=-
 ProfId1IN=Prof Id 1 (TIN)
 ProfId2IN=Prof Id 2 (PAN)
-ProfId3IN=Prof Id 3 (SRVC TAX)
+ProfId3IN=Prof Id 3 (SRVC porez)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
-ProfId2LU=Id. prof. 2 (Business permit)
+ProfId1LU=Id. prof. 1 (R.C.S. Luksemburg)
+ProfId2LU=Id. prof. 2 (dozvola za rad)
 ProfId3LU=-
 ProfId4LU=-
 ProfId5LU=-
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
-ProfId2MA=Id prof. 2 (Patente)
+ProfId2MA=Id prof. 2 (Patent)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
 ProfId5MA=Id. prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
-ProfId3MX=Prof Id 3 (Profesional Charter)
+ProfId3MX=Prof Id 3 (profesionalna povelja)
 ProfId4MX=-
 ProfId5MX=-
 ProfId6MX=-
-ProfId1NL=KVK nummer
+ProfId1NL=KVK broj
 ProfId2NL=-
 ProfId3NL=-
-ProfId4NL=Burgerservicenummer (BSN)
+ProfId4NL=Broj usluga građanima (BSN)
 ProfId5NL=-
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
-ProfId2PT=Prof Id 2 (Social security number)
-ProfId3PT=Prof Id 3 (Commercial Record number)
-ProfId4PT=Prof Id 4 (Conservatory)
+ProfId2PT=Prof Id 2 (broj socijalnog osiguranja)
+ProfId3PT=Prof Id 3 (broj komercijalnog zapisa)
+ProfId4PT=Prof Id 4 (konzervator)
 ProfId5PT=-
 ProfId6PT=-
 ProfId1SN=RC
@@ -232,11 +231,17 @@ ProfId4SN=-
 ProfId5SN=-
 ProfId6SN=-
 ProfId1TN=Prof Id 1 (RC)
-ProfId2TN=Prof Id 2 (Fiscal matricule)
-ProfId3TN=Prof Id 3 (Douane code)
+ProfId2TN=Prof Id 2 (fiskalni broj)
+ProfId3TN=Prof Id 3 (carinski broj)
 ProfId4TN=Prof Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
+ProfId1US=Prof Id
+ProfId2US=-
+ProfId3US=-
+ProfId4US=-
+ProfId5US=-
+ProfId6US=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
 ProfId3RU=Prof Id 3 (KPP)
@@ -259,28 +264,28 @@ CustomerRelativeDiscountShort=Relativni popust
 CustomerAbsoluteDiscountShort=Fiksni popust
 CompanyHasRelativeDiscount=Ovaj kupca ima defaultni popust od <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Ovaj kupac nema relativnog popusta po defaultu
-CompanyHasAbsoluteDiscount=Ovaj kupac još uvijek ima zasluga za popust ili depozit za <b>%s</b> %s
-CompanyHasCreditNote=This customer still has credit notes for <b>%s</b> %s
+CompanyHasAbsoluteDiscount=Ovaj kupac ima dostupno odobrenje (Knjižne obavijesti ili avansno plaćanje) za <b>%s</b> %s
+CompanyHasCreditNote=Ovaj kupac i dalje ima knjižno odobrenje za <b>%s</b> %s
 CompanyHasNoAbsoluteDiscount=Ovaj kupac nema zasluga za popust
 CustomerAbsoluteDiscountAllUsers=Fiksni popust (odobren od strane svih korisnika)
 CustomerAbsoluteDiscountMy=Fiksni popust (odobren od strane sebe)
 DiscountNone=Ništa
 Supplier=Dobavljač
-AddContact=Create contact
-AddContactAddress=Create contact/address
+AddContact=Napravi kontakt
+AddContactAddress=Napravi kontakt/adresu
 EditContact=Uredi kontakt
 EditContactAddress=Uredi kontakt/adresu
 Contact=Kontakt
-ContactId=Contact id
+ContactId=Id kontakta
 ContactsAddresses=Kontakti/Adrese
-FromContactName=Name:
+FromContactName=Naziv:
 NoContactDefinedForThirdParty=Nema definiranih kontakata za ovaj subjekt
 NoContactDefined=Nijedan kontakt definiran
 DefaultContact=Defaultni kontakt/adresa
-AddThirdParty=Create third party
+AddThirdParty=Napravi novi subjekt
 DeleteACompany=Obrisati kompaniju
 PersonalInformations=Osobni podaci
-AccountancyCode=Accounting account
+AccountancyCode=Računovodstveni račun
 CustomerCode=Šifra kupca
 SupplierCode=Šifra dobavljača
 CustomerCodeShort=Šifra kupca
@@ -296,17 +301,17 @@ CompanyDeleted=Kompanija"%s" obrisana iz baze podataka
 ListOfContacts=Lista kontakta/adresa
 ListOfContactsAddresses=Lista kontakta/adresa
 ListOfThirdParties=Lista subjekata
-ShowCompany=Show third party
+ShowCompany=Pokaži subjekt
 ShowContact=Prikaži kontakt
 ContactsAllShort=Svi (bez filtera)
 ContactType=Tip kontakta
 ContactForOrders=Kontakt narudžbe
-ContactForOrdersOrShipments=Order's or shipment's contact
+ContactForOrdersOrShipments=Kontakt za narudžbu ili slanje
 ContactForProposals=Kontakt prijedloga
 ContactForContracts=Kontakt ugovora
 ContactForInvoices=Kontakt fakture
 NoContactForAnyOrder=Ovaj kontakt nije kontakt za bilo koju narudžbu
-NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
+NoContactForAnyOrderOrShipments=Ovaj kontakt nije kontakt za bilo koju narudžbu ili slanje
 NoContactForAnyProposal=Ovaj kontakt nije kontakt za bilo koji poslovni prijedlog
 NoContactForAnyContract=Ovaj kontakt nije kontakt za bilo koji ugovor
 NoContactForAnyInvoice=Ovaj kontakt nije kontakt za bilo koju fakturu
@@ -316,15 +321,15 @@ MyContacts=Moji kontakti
 Capital=Kapital
 CapitalOf=Kapital od %s
 EditCompany=Uredi kompaniju
-ThisUserIsNot=OVaj korisnik nije mogući klijent, kupac niti dobavljač
+ThisUserIsNot=Ovaj korisnik nije mogući klijent, kupac niti dobavljač
 VATIntraCheck=Provjeri
 VATIntraCheckDesc=Link <b>%s</b> dozvoljava upit za evopski PDV servis za provjeru. Potrebno je imati pristup internetu na serveru za ovu uslugu.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
-VATIntraCheckableOnEUSite=Check Intracomunnautary VAT on European commision site
-VATIntraManualCheck=You can also check manually from european web site <a href="%s" target="_blank">%s</a>
+VATIntraCheckableOnEUSite=Provjeri PDV broj na stranici Evropske komisije
+VATIntraManualCheck=Također možete ručno provjeriti sa evropske web stranice <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Provjera nije moguća. Servis za provjeru nije naveden od stran države članice (%s).
 NorProspectNorCustomer=Niti mogući klijent, niti kupac
-JuridicalStatus=Legal form
+JuridicalStatus=Pravni status
 Staff=Osoblje
 ProspectLevelShort=Potencijal
 ProspectLevel=Potencijal mogućeg klijenta
@@ -351,12 +356,12 @@ TE_PRIVATE=Fizičko lice
 TE_OTHER=Ostalo
 StatusProspect-1=Ne kontaktirati
 StatusProspect0=Nikada kontaktirano
-StatusProspect1=To be contacted
+StatusProspect1=Kontaktirat će se
 StatusProspect2=Kontaktiranje u toku
 StatusProspect3=Kontaktirano
 ChangeDoNotContact=Promijeni status u 'Ne kontaktirati'
 ChangeNeverContacted=Promjeni status na 'Nikada kontaktirano'
-ChangeToContact=Change status to 'To be contacted'
+ChangeToContact=Promijeni status na 'Treba kontaktirati'
 ChangeContactInProcess=Promjeni status na 'Kontaktiranje u toku'
 ChangeContactDone=Promjeni status na 'Kontaktirano'
 ProspectsByStatus=Mogući klijenti po statusu
@@ -365,47 +370,47 @@ ExportCardToFormat=Izvod podataka u formatu
 ContactNotLinkedToCompany=Kontakt nije povezan sa nekim od subjekata
 DolibarrLogin=Dolibarr login
 NoDolibarrAccess=Nema Dolibarr pristupa
-ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
+ExportDataset_company_1=Subjekti (kompanije/fondacije/fizička lica) i svojstva
 ExportDataset_company_2=Kontakti i osobine
-ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
+ImportDataset_company_1=Subjekti (kompanije/fondacije/fizička lica) i svojstva
 ImportDataset_company_2=Kontakti/Adrese (od subjekata ili ne) i atributi
 ImportDataset_company_3=Detalji banke
-ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
+ImportDataset_company_4=Subjekti/predstavnici prodaje (Odnosi se na predstavnike prodaje korisnike u kompanijama)
 PriceLevel=Visina cijene
 DeliveryAddress=Adresa za dostavu
 AddAddress=Dodaj adresu
 SupplierCategory=Kategorija dobavljača
-JuridicalStatus200=Independent
+JuridicalStatus200=Nezavisni
 DeleteFile=Obriši fajl
 ConfirmDeleteFile=Jeste li sigurni da želite obrisati ovaj fajl?
-AllocateCommercial=Assigned to sales representative
+AllocateCommercial=Dodijeljen predstavniku prodaje
 Organization=Organizacija
 FiscalYearInformation=Informacije o fiskalnoj godini
 FiscalMonthStart=Početni mjesec fiskalne godine
-YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
-YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
+YouMustAssignUserMailFirst=Morate najprije napraviti email za ovog korisnika da biste mogli dodati email notifikacije
+YouMustCreateContactFirst=Da bi mogli dodati e-mail obavještenja, prvo morate definirati kontakte s važećom e-poštom za subjekte
 ListSuppliersShort=Lista dobavljača
 ListProspectsShort=Lista mogućih klijenata
 ListCustomersShort=Lista kupaca
-ThirdPartiesArea=Third parties and contact area
-LastModifiedThirdParties=Latest %s modified third parties
+ThirdPartiesArea=Područje za subjekte i kontakte
+LastModifiedThirdParties=Zadnjih %s izmijenjenih subjekata
 UniqueThirdParties=Ukupno unikatnih subjekata
-InActivity=Otvoreno
+InActivity=Otvori
 ActivityCeased=Zatvoreno
-ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=List of products/services into %s
+ThirdPartyIsClosed=Subjekat je zatvoren
+ProductsIntoElements=Spisak proizvoda/usluga u %s
 CurrentOutstandingBill=Trenutni neplaćeni račun
 OutstandingBill=Max. za neplaćeni račun
-OutstandingBillReached=Max. for outstanding bill reached
+OutstandingBillReached=Dostignut maksimum za neplaćene račune
 MonkeyNumRefModelDesc=Vratiti broj sa formatom %syymm-nnnn za šifru kupca i $syymm-nnnn za šifru dobavljača gdje je yy godina, mm mjesec i nnnn niz bez prekida i bez vraćanja za 0.
 LeopardNumRefModelDesc=Ova šifra je slobodna. Ova šifra se može mijenjati bilo kad.
-ManagingDirectors=Manager(s) name (CEO, director, president...)
-MergeOriginThirdparty=Duplicate third party (third party you want to delete)
-MergeThirdparties=Merge third parties
-ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
-ThirdpartiesMergeSuccess=Thirdparties have been merged
-SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=First name of sales representative
-SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+ManagingDirectors=Ime menadžer(a) (CEO, direktor, predsjednik...)
+MergeOriginThirdparty=Umnoži subjekta (subjekt kojeg želite obrisati)
+MergeThirdparties=Spoji subjekte
+ConfirmMergeThirdparties=Da li ste sigurni da želite spojiti ovaj subjekt u trenutno prikazani? Svi povezani objekti (fakture, narudžbe, ...) će biti premještene trenutnom subjektu, a zatim će prethodni subjekt biti obrisan.
+ThirdpartiesMergeSuccess=Subjekti su spojeni
+SaleRepresentativeLogin=Pristup za predstavnika prodaje
+SaleRepresentativeFirstname=Ime predstavnika prodaje
+SaleRepresentativeLastname=Prezime predstavnika prodaje
+ErrorThirdpartiesMerge=Nastala greška pri brisanju subjekta. Molimo provjeriti zapisnik. Promjene su vraćene.
+NewCustomerSupplierCodeProposed=Kod novog kupca ili dobavljača predložen za duplikat koda
diff --git a/htdocs/langs/bs_BA/compta.lang b/htdocs/langs/bs_BA/compta.lang
index 19498b768dc..db2ed3d9ec4 100644
--- a/htdocs/langs/bs_BA/compta.lang
+++ b/htdocs/langs/bs_BA/compta.lang
@@ -13,37 +13,37 @@ LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using r
 Param=Postavke
 RemainingAmountPayment=Iznos preostale uplate :
 Account=Račun
-Accountparent=Account parent
-Accountsparent=Accounts parent
-Income=Income
-Outcome=Expense
-ReportInOut=Income / Expense
-ReportTurnover=Turnover
-PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to any third party
-PaymentsNotLinkedToUser=Payments not linked to any user
-Profit=Profit
+Accountparent=Glavni račun
+Accountsparent=Glavni računi
+Income=Prihod
+Outcome=Rashod
+ReportInOut=Prihodi / Rashodi
+ReportTurnover=Promet
+PaymentsNotLinkedToInvoice=Plaćanja nisu povezana ni sa jednom fakturom, niti su povezana sa nekim subjektom
+PaymentsNotLinkedToUser=Plaćanja nisu povezana ni sa jednim korisnikom
+Profit=Dobit
 AccountingResult=Accounting result
 Balance=Stanje
-Debit=Debit
-Credit=Credit
+Debit=Duguje
+Credit=Potražuje
 Piece=Accounting Doc.
-AmountHTVATRealReceived=Net collected
-AmountHTVATRealPaid=Net paid
-VATToPay=VAT sells
-VATReceived=VAT received
-VATToCollect=VAT purchases
-VATSummary=VAT Balance
-LT2SummaryES=IRPF Balance
+AmountHTVATRealReceived=Neto prikupljeno
+AmountHTVATRealPaid=Neto plaćeno
+VATToPay=PDV izlazni
+VATReceived=PDV ulazni
+VATToCollect=VAT na čekanju
+VATSummary=PDV stanje
+LT2SummaryES=IRPF stanje
 LT1SummaryES=RE Balance
-VATPaid=VAT paid
-LT2PaidES=IRPF Paid
+VATPaid=PDV plaćen
+LT2PaidES=IRPF plaćen
 LT1PaidES=RE Paid
-LT2CustomerES=IRPF sales
-LT2SupplierES=IRPF purchases
+LT2CustomerES=IRPF prodajni
+LT2SupplierES=IRPF kupovni
 LT1CustomerES=RE sales
 LT1SupplierES=RE purchases
-VATCollected=VAT collected
-ToPay=To pay
+VATCollected=PDV prikupljeni
+ToPay=Za plaćanje
 SpecialExpensesArea=Area for all special payments
 SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
@@ -56,15 +56,16 @@ MenuTaxAndDividends=Taxes and dividends
 MenuSocialContributions=Social/fiscal taxes
 MenuNewSocialContribution=New social/fiscal tax
 NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Accountancy/Treasury area
-NewPayment=New payment
+NewPayment=Novo plaćanje
 Payments=Uplate
-PaymentCustomerInvoice=Customer invoice payment
-PaymentSocialContribution=Social/fiscal tax payment
-PaymentVat=VAT payment
-ListPayment=List of payments
-ListOfCustomerPayments=List of customer payments
+PaymentCustomerInvoice=Plaćanje računa kupca
+PaymentSocialContribution=Plaćanje socijalnog/fiskalnog poreza
+PaymentVat=Plaćanje PDVa
+ListPayment=Spisak plaćanja
+ListOfCustomerPayments=Spisak uplata kupca
 ListOfSupplierPayments=List of supplier payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
@@ -75,7 +76,7 @@ LT1Payments=Tax 2 payments
 LT2Payment=Tax 3 payment
 LT2Payments=Tax 3 payments
 newLT1PaymentES=New RE payment
-newLT2PaymentES=New IRPF payment
+newLT2PaymentES=Novo IRPF plaćanje
 LT1PaymentES=RE Payment
 LT1PaymentsES=RE Payments
 LT2PaymentES=IRPF Payment
@@ -97,7 +98,7 @@ NewAccountingAccount=Novi račun
 SalesTurnover=Sales turnover
 SalesTurnoverMinimum=Minimum sales turnover
 ByExpenseIncome=By expenses & incomes
-ByThirdParties=By third parties
+ByThirdParties=Po subjektu
 ByUserAuthorOfInvoice=By invoice author
 CheckReceipt=Check deposit
 CheckReceiptShort=Check deposit
@@ -134,8 +135,8 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from clients.<br>- It is based on the payment date of these invoices<br>
-DepositsAreNotIncluded=- Deposit invoices are nor included
-DepositsAreIncluded=- Deposit invoices are included
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
 VATReport=VAT report
@@ -168,8 +169,8 @@ PurchasesJournal=Purchases Journal
 DescSellsJournal=Sales Journal
 DescPurchasesJournal=Purchases Journal
 InvoiceRef=Referenca fakture
-CodeNotDef=Not defined
-WarningDepositsNotIncluded=Deposits invoices are not included in this version with this accountancy module.
+CodeNotDef=Nije definirano
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
 Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
@@ -178,7 +179,7 @@ InvoiceLinesToDispatch=Invoice lines to dispatch
 ByProductsAndServices=By products and services
 RefExt=External ref
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
-LinkedOrder=Link to order
+LinkedOrder=Link ka narudžbi
 Mode1=Method 1
 Mode2=Method 2
 CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
@@ -189,8 +190,10 @@ AccountancyJournal=Accountancy code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/bs_BA/contracts.lang b/htdocs/langs/bs_BA/contracts.lang
index d8342051a96..d3e9ba66d36 100644
--- a/htdocs/langs/bs_BA/contracts.lang
+++ b/htdocs/langs/bs_BA/contracts.lang
@@ -83,6 +83,8 @@ NoteListOfYourExpiredServices=This list contains only services of contracts for
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
 OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
+CloneContract=Clone contract
+ConfirmCloneContract=Are you sure you want to clone the contract <b>%s</b>?
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Predstavnik prodaje koji potpisuje ugovor
diff --git a/htdocs/langs/bs_BA/cron.lang b/htdocs/langs/bs_BA/cron.lang
index 1ca2bee6c19..808c036be73 100644
--- a/htdocs/langs/bs_BA/cron.lang
+++ b/htdocs/langs/bs_BA/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allow to execute job that have been planned
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Job
 CronNone=Ništa
 CronDtStart=Not before
@@ -33,13 +33,13 @@ CronDtEnd=Not after
 CronDtNextLaunch=Sljedeće izvršenje
 CronDtLastLaunch=Start date of latest execution
 CronDtLastResult=End date of latest execution
-CronFrequency=Frequency
+CronFrequency=Frekvencija
 CronClass=Class
 CronMethod=Metoda
 CronModule=Modul
 CronNoJobs=Nema registrovanih poslova
 CronPriority=Prioritet
-CronLabel=Label
+CronLabel=Oznaka
 CronNbRun=Broj pokretanja
 CronMaxRun=Max nb. launch
 CronEach=Every
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Iskljući
 CronTaskInactive=This job is disabled
 CronId=ID
-CronClassFile=Classes (filename.class.php)
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=Sistemska komanda za izvršenje
 CronCreateJob=Create new Scheduled Job
 CronFrom=Od
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/bs_BA/ecm.lang b/htdocs/langs/bs_BA/ecm.lang
index 1f617be5121..0dbb39dbb5a 100644
--- a/htdocs/langs/bs_BA/ecm.lang
+++ b/htdocs/langs/bs_BA/ecm.lang
@@ -30,13 +30,13 @@ ECMDocsByContracts=Dokumenti vezani za ugovore
 ECMDocsByInvoices=Dokumenti vezani za fakture klijenata
 ECMDocsByProducts=Dokumenti vezani za proizvode
 ECMDocsByProjects=Dokumenti vezani za projekte
-ECMDocsByUsers=Documents linked to users
+ECMDocsByUsers=Dokumenti povezani s korisnicima
 ECMDocsByInterventions=Documents linked to interventions
 ECMDocsByExpenseReports=Documents linked to expense reports
 ECMNoDirectoryYet=Nema kreiranih direktorija
 ShowECMSection=Prikaži direktorij
 DeleteSection=Ukloni direktorij
-ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
+ConfirmDeleteSection=Možete li potvrditi da želite obrisati direktorij <b>%s</b>?
 ECMDirectoryForFiles=Relativni direktorij za fajlove
 CannotRemoveDirectoryContainsFiles=Nemoguće ukloniti jer sadrži fajlove
 ECMFileManager=Updavljanje fajlovima
diff --git a/htdocs/langs/bs_BA/errors.lang b/htdocs/langs/bs_BA/errors.lang
index 0a339accbc8..f9603e851d0 100644
--- a/htdocs/langs/bs_BA/errors.lang
+++ b/htdocs/langs/bs_BA/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
 ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
 ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
 ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
 ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Some required fields were not filled.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoice
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # 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.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice
 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/bs_BA/holiday.lang b/htdocs/langs/bs_BA/holiday.lang
index a3a406d8cb1..1d45a3e7aff 100644
--- a/htdocs/langs/bs_BA/holiday.lang
+++ b/htdocs/langs/bs_BA/holiday.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=Kadrovska služba
-Holidays=Leaves
-CPTitreMenu=Leaves
+Holidays=Odlasci
+CPTitreMenu=Odlasci
 MenuReportMonth=Mjesečni izvještaj
 MenuAddCP=New leave request
 NotActiveModCP=You must enable the module Leaves to view this page.
@@ -16,7 +16,7 @@ CancelCP=Otkazan
 RefuseCP=Odbijen
 ValidatorCP=Osoba koja odobrava
 ListeCP=List of leaves
-ReviewedByCP=Bit će pregledano od strane
+ReviewedByCP=Will be approved by
 DescCP=Opis
 SendRequestCP=Create leave request
 DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
diff --git a/htdocs/langs/bs_BA/install.lang b/htdocs/langs/bs_BA/install.lang
index 2659f506094..48fec99a553 100644
--- a/htdocs/langs/bs_BA/install.lang
+++ b/htdocs/langs/bs_BA/install.lang
@@ -1,19 +1,19 @@
 # Dolibarr language file - Source file is en_US - install
-InstallEasy=Just follow the instructions step by step.
-MiscellaneousChecks=Prerequisites check
-ConfFileExists=Configuration file <b>%s</b> exists.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created !
-ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
-ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
-ConfFileIsWritable=Configuration file <b>%s</b> is writable.
-ConfFileReload=Reload all information from configuration file.
-PHPSupportSessions=This PHP supports sessions.
-PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
-PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP support GD graphical functions.
+InstallEasy=Pratite instrukcije korak po korak.
+MiscellaneousChecks=Provjera preduvjeta
+ConfFileExists=Konfiguracijska datoteka<b>%s</b> postoji.
+ConfFileDoesNotExistsAndCouldNotBeCreated=Konfiguracijska datoteka <b>%s</b> ne postoji i ne može biti napravljena !
+ConfFileCouldBeCreated=Konfiguracijska datoteka <b>%s</b> se može napraviti.
+ConfFileIsNotWritable=Po konfiguracijskoj datoteci <b>%s</b> se ne može pisati. Provjerite dozvole. Za prvu instalaciju, vaš web server mora dopustiti pisanje u ovu datoteku tokom procesa konfiguracije ("chmod 666" naprimjer na OS poput Unixa).
+ConfFileIsWritable=Konfiguracijska datoteka <b>%s</b> je slobodna za pisanje.
+ConfFileReload=Napuni sve informacije iz konfiguracijske datoteke.
+PHPSupportSessions=Ovaj PHP podržava sesije.
+PHPSupportPOSTGETOk=Ovaj PHP podržava varijable POST i GET.
+PHPSupportPOSTGETKo=Moguće je da vaše PHP postavke ne podržavaju varijable POST i/ili GET. Provjerite vaš parametar <b>variables_order</b> u php.ini.
+PHPSupportGD=Ovaj PHP podržava GD grafičke funkcije.
 PHPSupportCurl=This PHP support Curl.
-PHPSupportUTF8=This PHP support UTF8 functions.
-PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
+PHPSupportUTF8=Ovaj PHP podržava UTF8 funkcije.
+PHPMemoryOK=Vaša maksimalna memorija za PHP  sesiju je postavljena na <b>%s</b>. To bi trebalo biti dovoljno.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
 Recheck=Click here for a more significative test
 ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
@@ -138,6 +138,7 @@ KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values
 KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
 KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
 KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
+UpgradeExternalModule=Run dedicated upgrade process of external modules
 
 #########
 # upgrade
diff --git a/htdocs/langs/bs_BA/main.lang b/htdocs/langs/bs_BA/main.lang
index 00bf4ec0c6d..3032b1b7582 100644
--- a/htdocs/langs/bs_BA/main.lang
+++ b/htdocs/langs/bs_BA/main.lang
@@ -8,814 +8,830 @@ FONTFORPDF=DejaVuSans
 FONTSIZEFORPDF=8
 SeparatorDecimal=,
 SeparatorThousand=Space
-FormatDateShort=%m/%d/%Y
-FormatDateShortInput=%m/%d/%Y
-FormatDateShortJava=MM/dd/yyyy
-FormatDateShortJavaInput=MM/dd/yyyy
-FormatDateShortJQuery=mm/dd/yy
-FormatDateShortJQueryInput=mm/dd/yy
+FormatDateShort=%d/%m/%Y
+FormatDateShortInput=%d/%m/%Y
+FormatDateShortJava=dd/MM/yyyy
+FormatDateShortJavaInput=dd/MM/yyyy
+FormatDateShortJQuery=dd/mm/yy
+FormatDateShortJQueryInput=dd/mm/yy
 FormatHourShortJQuery=HH:MI
 FormatHourShort=%I:%M %p
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%b %d, %Y
 FormatDateText=%B %d, %Y
-FormatDateHourShort=%m/%d/%Y %I:%M %p
-FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
+FormatDateHourShort=%d/%m/%Y %I:%M %p
+FormatDateHourSecShort=%d/%m/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
-DatabaseConnection=Database connection
-NoTemplateDefined=No template defined for this email type
-AvailableVariables=Available substitution variables
-NoTranslation=No translation
-NoRecordFound=No record found
-NoRecordDeleted=No record deleted
-NotEnoughDataYet=Not enough data
-NoError=No error
+DatabaseConnection=Veza baze podataka
+NoTemplateDefined=Za ovaj tip emaila nije definiran šablon
+AvailableVariables=Dostupne zamjenske varijable
+NoTranslation=Nema prevoda
+NoRecordFound=Nije pronađen zapis
+NoRecordDeleted=Nijedan zapis nije obrisan
+NotEnoughDataYet=Nema dovoljno podataka
+NoError=Nema greške
 Error=Greška
-Errors=Errors
-ErrorFieldRequired=Field '%s' is required
-ErrorFieldFormat=Field '%s' has a bad value
-ErrorFileDoesNotExists=File %s does not exist
-ErrorFailedToOpenFile=Failed to open file %s
-ErrorCanNotCreateDir=Cannot create dir %s
-ErrorCanNotReadDir=Cannot read dir %s
-ErrorConstantNotDefined=Parameter %s not defined
-ErrorUnknown=Unknown error
-ErrorSQL=SQL Error
-ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this
-ErrorGoToModuleSetup=Go to Module setup to fix this
-ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
-ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
-ErrorInternalErrorDetected=Error detected
-ErrorWrongHostParameter=Wrong host parameter
-ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post again the form.
-ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child records.
-ErrorWrongValue=Wrong value
-ErrorWrongValueForParameterX=Wrong value for parameter %s
-ErrorNoRequestInError=No request in error
-ErrorServiceUnavailableTryLater=Service not available for 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>.
-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 nb of record per page
-NotAuthorized=You are not authorized to do that.
+Errors=Greške
+ErrorFieldRequired=Polje '%s' je obavezno
+ErrorFieldFormat=Polje '%s' ima nevaljanu vrijednost
+ErrorFileDoesNotExists=Datoteka %s ne postoji
+ErrorFailedToOpenFile=Neuspjelo otvaranje datoteke %s
+ErrorCanNotCreateDir=Greška pri pravljenju direktorija %s
+ErrorCanNotReadDir=Ne mogu pročitati direktorij %s
+ErrorConstantNotDefined=Parametar %s nije definiran
+ErrorUnknown=Nepoznata greška
+ErrorSQL=SQL greška
+ErrorLogoFileNotFound=Datoteka logotipa '%s' nije pronađena
+ErrorGoToGlobalSetup=Idite u postavke 'Kompanija/Organizacija' da popravite ovo
+ErrorGoToModuleSetup=Idite u postavke modula da popravite ovo
+ErrorFailedToSendMail=Neuspjeh pri slanju maila (pošiljalac=%s, primalac=%s)
+ErrorFileNotUploaded=Datoteka nije postavljena. Provjerite da li joj je veličina iznad dozvoljene, da li ima dovoljno slobodnog mjesta na disku i da li već postoji datoteka istog imena u ovom direktoriju.
+ErrorInternalErrorDetected=Pronađena greška
+ErrorWrongHostParameter=Pogrešan parametar hosta
+ErrorYourCountryIsNotDefined=Vaša država nije definirana. Idite u postavke Početna-Postavke-Uredi i pošaljite ponovno obrazac.
+ErrorRecordIsUsedByChild=Neuspjelo brisanje ovog unosa. Ovaj unos je korišten najmanje jednom u drugom podunosu.
+ErrorWrongValue=Pogrešna vrijednost
+ErrorWrongValueForParameterX=Pogrešna vrijednost za parametar %s
+ErrorNoRequestInError=Nema greške u zahtjevu
+ErrorServiceUnavailableTryLater=Usluga trenutno nije dostupna. Pokušajte kasnije.
+ErrorDuplicateField=Duplicirana vrijednost u unikatnom polju
+ErrorSomeErrorWereFoundRollbackIsDone=Pronađene određene greške. Vraćam promjene.
+ErrorConfigParameterNotDefined=Parametar <b>%s</b> nije definiran unutar Dolibarr konfiguracijske datoteke <b>conf.php</b>.
+ErrorCantLoadUserFromDolibarrDatabase=Neuspjelo traženje korisnika <b>%s</b> u Dolibarr bazi podataka.
+ErrorNoVATRateDefinedForSellerCountry=Greška, nije definirana PDV stopa za državu '%s'.
+ErrorNoSocialContributionForSellerCountry=Greška, nisu definirane vrste doprinosa i poreza za državu '%s'.
+ErrorFailedToSaveFile=Greška, neuspjelo spremanje datoteke.
+ErrorCannotAddThisParentWarehouse=Pokušavate dodati nadređeno skladište koje je već podređeno skladište ovom trenutnom
+MaxNbOfRecordPerPage=Maks. br. unosa po stranici
+NotAuthorized=Niste ovlašteni da to uradite.
 SetDate=Postavi datum
 SelectDate=Odaberi datum
-SeeAlso=See also %s
-SeeHere=See here
+SeeAlso=Također pogledajte %s
+SeeHere=Pogledaj ovdje
 Apply=Primijeniti
-BackgroundColorByDefault=Default background color
-FileRenamed=The file was successfully renamed
-FileUploaded=The file was successfully uploaded
-FileGenerated=The file was successfully generated
-FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
-NbOfEntries=Nb of entries
-GoToWikiHelpPage=Read online help (Internet access needed)
-GoToHelpPage=Read help
-RecordSaved=Record saved
-RecordDeleted=Record deleted
-LevelOfFeature=Level of features
-NotDefined=Not defined
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
+BackgroundColorByDefault=Osnovna boja pozadine
+FileRenamed=Datoteka je uspješno preimenovana
+FileUploaded=Datoteka je uspješno postavljena
+FileGenerated=Datoteka je uspješno generirana
+FileWasNotUploaded=Datoteka je odabrana za prilog ali nije još postavljena. Kliknite na "Dodaj datoteku" da bi ste to uradili.
+NbOfEntries=Broj unosa
+GoToWikiHelpPage=Pročitajte online pomoć (neophodan pristup internetu)
+GoToHelpPage=Pročitaj pomoć
+RecordSaved=Unos spremljen
+RecordDeleted=Unos obrisan
+LevelOfFeature=Nivo osobina
+NotDefined=Nije definirano
+DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr način odobrenja je postavljen na <b>%s</b> u datoteci postavki <b>conf.php</b>.<br>To znači da je baza podataka šifri izvan Dolibarra, pa mjenjanje ovog polja nema efekta.
 Administrator=Administrator
-Undefined=Undefined
-PasswordForgotten=Password forgotten?
-SeeAbove=See above
-HomeArea=Home area
-LastConnexion=Latest connection
-PreviousConnexion=Previous connection
-PreviousValue=Previous value
-ConnectedOnMultiCompany=Connected on environment
-ConnectedSince=Connected since
-AuthenticationMode=Authentication mode
-RequestedUrl=Requested URL
-DatabaseTypeManager=Database type manager
-RequestLastAccessInError=Latest database access request error
-ReturnCodeLastAccessInError=Return code for latest database access request error
-InformationLastAccessInError=Information for latest database access request error
-DolibarrHasDetectedError=Dolibarr has detected a technical error
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes
-MoreInformation=More information
-TechnicalInformation=Technical information
-TechnicalID=Technical ID
-NotePublic=Note (public)
-NotePrivate=Note (private)
-PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
+Undefined=Nedefinirano
+PasswordForgotten=Zaboravljena šifra?
+SeeAbove=Vidi iznad
+HomeArea=Početno područje
+LastConnexion=Posljednje veze
+PreviousConnexion=Prethodna veza
+PreviousValue=Prethodna vrijednost
+ConnectedOnMultiCompany=Spojeno na okruženje
+ConnectedSince=Spojen od
+AuthenticationMode=Način autentifikacije
+RequestedUrl=Zahtijevani URL
+DatabaseTypeManager=Vrsta menadžera baze podataka
+RequestLastAccessInError=Posljednja greška pristupa bazi podataka
+ReturnCodeLastAccessInError=Vraća kod za posljednju grešku pristupa bazi podataka
+InformationLastAccessInError=Informacija za posljednju grešku pristupa bazi podataka
+DolibarrHasDetectedError=Dolibarr je otkrio tehničku grešku
+InformationToHelpDiagnose=Ova informacija može biti korisna u dijagnostičke svrhe
+MoreInformation=Više informacija
+TechnicalInformation=Tehničke informacije
+TechnicalID=Tehnički ID
+NotePublic=Napomena (javna)
+NotePrivate=Napomena (privatna)
+PrecisionUnitIsLimitedToXDecimals=Dolibarr je podešen za ograniči preciznost cijena stavki na <b>%s</b> decimala.
 DoTest=Test
 ToFilter=Filter
-NoFilter=No filter
-WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance delay.
-yes=yes
-Yes=Yes
-no=no
-No=No
-All=All
-Home=Home
-Help=Help
-OnlineHelp=Online help
-PageWiki=Wiki page
-MediaBrowser=Media browser
-Always=Always
-Never=Never
-Under=under
+NoFilter=Nema filtera
+WarningYouHaveAtLeastOneTaskLate=Upozorenje, imate najmanje jedan element koji je prekoračio rok za rješavanje.
+yes=da
+Yes=Da
+no=ne
+No=Ne
+All=Sve
+Home=Početna
+Help=Pomoć
+OnlineHelp=Online pomoć
+PageWiki=Wiki stranica
+MediaBrowser=Pregledač medija
+Always=Uvijek
+Never=Nikad
+Under=ispod
 Period=Period
-PeriodEndDate=End date for period
-Activate=Activate
-Activated=Activated
+PeriodEndDate=Krajnji datum perioda
+Activate=Aktiviranje
+Activated=Aktivirano
 Closed=Zatvoreno
 Closed2=Zatvoreno
-NotClosed=Not closed
-Enabled=Enabled
-Deprecated=Deprecated
-Disable=Iskljući
-Disabled=Disabled
-Add=Add
-AddLink=Add link
-RemoveLink=Remove link
-AddToDraft=Add to draft
+NotClosed=Nije zatvoreno
+Enabled=Omogućeno
+Deprecated=Prevaziđeno
+Disable=Isključi
+Disabled=Isključeno
+Add=Dodaj
+AddLink=Dodaj link
+RemoveLink=Ukloni link
+AddToDraft=Dodaj u nacrt
 Update=Ažuriraj
-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>?
+Close=Zatvori
+CloseBox=Ukloni kutijicu sa svoje nadzorne ploče
+Confirm=Potvrdi
+ConfirmSendCardByMail=Da li zaista želiš poslati sadržaj ove kartice mailom za <b>%s</b>?
 Delete=Obriši
-Remove=Remove
-Resiliate=Terminate
+Remove=Ukloni
+Resiliate=Deaktiviraj
 Cancel=Poništi
-Modify=Modify
+Modify=Izmijeni
 Edit=Izmjena
 Validate=Potvrdi
-ValidateAndApprove=Validate and Approve
+ValidateAndApprove=Provjeri i odobri
 ToValidate=Za potvrdu
-Save=Save
-SaveAs=Save As
-TestConnection=Test connection
-ToClone=Clone
-ConfirmClone=Choose data you want to clone :
-NoCloneOptionsSpecified=No data to clone defined.
-Of=of
-Go=Go
-Run=Run
-CopyOf=Copy of
-Show=Show
-Hide=Hide
-ShowCardHere=Show card
-Search=Search
-SearchOf=Search
-Valid=Valid
-Approve=Approve
-Disapprove=Disapprove
-ReOpen=Re-Open
-Upload=Send file
+NotValidated=Nije odobreno
+Save=Sačuvaj
+SaveAs=Sačuvaj kao
+TestConnection=Test konekcije
+ToClone=Kloniraj
+ConfirmClone=Izaberi podatke koje želite klonirati:
+NoCloneOptionsSpecified=Nije definiran podatak za kloniranje.
+Of=od
+Go=Idi
+Run=Kreni
+CopyOf=Kopija od
+Show=Prikaži
+Hide=Sakrij
+ShowCardHere=Prikaži karticu
+Search=Traži
+SearchOf=Traži
+Valid=Valjan
+Approve=Odobriti
+Disapprove=Odbij
+ReOpen=Opet otvori
+Upload=Postavi datoteku
 ToLink=Link
-Select=Select
-Choose=Choose
-Resize=Resize
-Recenter=Recenter
-Author=Author
+Select=Odaberi
+Choose=Izaberi
+Resize=Promjena veličine
+Recenter=Postavi centar
+Author=Autor
 User=Korisnik
-Users=Users
-Group=Group
+Users=Korisnici
+Group=Grupa
 Groups=Grupe
-NoUserGroupDefined=No user group defined
-Password=Password
-PasswordRetype=Retype your password
-NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
+NoUserGroupDefined=Nije definirana korisnička grupa
+Password=Šifra
+PasswordRetype=Ponovno upišite šifru
+NoteSomeFeaturesAreDisabled=Mnoge osobine/moduli su onemogućeni pri ovoj demostraciji.
 Name=Naziv
-Person=Person
-Parameter=Parameter
-Parameters=PArametri
+Person=Osoba
+Parameter=Parametar
+Parameters=Parametri
 Value=Vrijednost
-PersonalValue=Personal value
-NewValue=New value
-CurrentValue=Current value
-Code=Code
+PersonalValue=Lična vrijednost
+NewValue=Nova vrijednost
+CurrentValue=Trenutna vrijednost
+Code=Kod
 Type=Tip
-Language=Language
-MultiLanguage=Multi-language
-Note=Note
+Language=Jezik
+MultiLanguage=Višejezično
+Note=Napomena
 Title=Titula
-Label=Label
-RefOrLabel=Ref. or label
-Info=Log
-Family=Family
+Label=Oznaka
+RefOrLabel=Ref. oznake
+Info=Zapisnik
+Family=Porodica
 Description=Opis
 Designation=Opis
-Model=Doc template
-DefaultModel=Default doc template
-Action=Event
+Model=Šablon dokumenta
+DefaultModel=Defaultni šablon dokumenta
+Action=Događaj
 About=O programu
 Number=Broj
 NumberByMonth=Broj po mjesecu
-AmountByMonth=Amount by month
+AmountByMonth=Iznos po mjesecu
 Numero=Broj
 Limit=Ograničenje
-Limits=Limits
-Logout=Logout
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Connection
+Limits=Ograničenja
+Logout=Odjava
+NoLogoutProcessWithAuthMode=Nema moguće osobine odspajanja sa načinom autentifikacije <b>%s</b>
+Connection=Konekcija
 Setup=Postavke
-Alert=Alert
-Previous=Previous
-Next=Next
-Cards=Cards
-Card=Card
-Now=Now
-HourStart=Start hour
-Date=Date
-DateAndHour=Date and hour
-DateToday=Today's date
-DateReference=Reference date
+Alert=Uzbuna
+MenuWarnings=Upozorenja
+Previous=Prethodni
+Next=Sljedeće
+Cards=Kartice
+Card=Kartica
+Now=Sada
+HourStart=Početno vrijeme
+Date=Datum
+DateAndHour=Datum i vrijeme
+DateToday=Današnji datum
+DateReference=Referentni datum
 DateStart=Datum početka
 DateEnd=Datum završetka
 DateCreation=Datum kreiranja
-DateCreationShort=Creat. date
-DateModification=Modification date
-DateModificationShort=Modif. date
-DateLastModification=Latest modification date
-DateValidation=Validation date
-DateClosing=Closing date
-DateDue=Due date
-DateValue=Value date
-DateValueShort=Value date
-DateOperation=Operation date
-DateOperationShort=Oper. Date
-DateLimit=Limit date
-DateRequest=Request date
-DateProcess=Process date
-DateBuild=Report build date
-DatePayment=Date of payment
-DateApprove=Approving date
-DateApprove2=Approving date (second approval)
-UserCreation=Creation user
-UserModification=Modification user
-UserCreationShort=Creat. user
-UserModificationShort=Modif. user
-DurationYear=year
-DurationMonth=month
-DurationWeek=week
-DurationDay=day
-DurationYears=years
-DurationMonths=months
-DurationWeeks=weeks
-DurationDays=days
-Year=Year
-Month=Month
-Week=Week
-WeekShort=Week
-Day=Day
-Hour=Hour
-Minute=Minute
-Second=Second
-Years=Years
-Months=Months
-Days=Days
-days=days
-Hours=Hours
-Minutes=Minutes
-Seconds=Seconds
-Weeks=Weeks
-Today=Today
-Yesterday=Yesterday
-Tomorrow=Tomorrow
-Morning=Morning
-Afternoon=Afternoon
-Quadri=Quadri
-MonthOfDay=Month of the day
-HourShort=H
-MinuteShort=mn
-Rate=Rate
-CurrencyRate=Currency conversion rate
-UseLocalTax=Include tax
-Bytes=Bytes
-KiloBytes=Kilobytes
-MegaBytes=Megabytes
-GigaBytes=Gigabytes
-TeraBytes=Terabytes
+DateCreationShort=Datum pravlj.
+DateModification=Datum izmjene
+DateModificationShort=Datum izmj.
+DateLastModification=Datum zadnje izmjene
+DateValidation=Datum potvrde
+DateClosing=Datum zatvaranja
+DateDue=Datum roka plaćanja
+DateValue=Datum valute
+DateValueShort=Datum valute
+DateOperation=Datum operacije
+DateOperationShort=Datum oper.
+DateLimit=Datum ograničenja
+DateRequest=Datum zahtjeva
+DateProcess=Datum obrade
+DateBuild=Datum izrade izvještaja
+DatePayment=Datum plaćanja
+DateApprove=Datum odobrenja
+DateApprove2=Datum odobrenja (drugo odobrenje)
+UserCreation=Kreiranje korisnika
+UserModification=Izmjena korisnika
+UserCreationShort=Napr. korisnika
+UserModificationShort=Izmj. korisnika
+DurationYear=godina
+DurationMonth=mjesec
+DurationWeek=sedmica
+DurationDay=dan
+DurationYears=godina
+DurationMonths=mjeseci
+DurationWeeks=sedmice
+DurationDays=dana
+Year=Godina
+Month=Mjesec
+Week=Sedmica
+WeekShort=Sedmica
+Day=Dan
+Hour=Sat
+Minute=Minuta
+Second=Sekunda
+Years=Godine
+Months=Mjeseci
+Days=Dani
+days=dana
+Hours=Sati
+Minutes=Minute
+Seconds=Sekunde
+Weeks=Sedmice
+Today=Danas
+Yesterday=Jučer
+Tomorrow=Sutra
+Morning=Jutro
+Afternoon=Večer
+Quadri=Četvoro
+MonthOfDay=Mjesec dana
+HourShort=h
+MinuteShort=min
+Rate=Stopa
+CurrencyRate=Kurs konverzije valuta
+UseLocalTax=Uključujući porez
+Bytes=bajta
+KiloBytes=kilobajta
+MegaBytes=megabajta
+GigaBytes=gigabajta
+TeraBytes=terabajta
 b=b.
 Kb=Kb
 Mb=Mb
 Gb=Gb
 Tb=Tb
-Cut=Cut
-Copy=Copy
-Paste=Paste
-Default=Default
-DefaultValue=Default value
-Price=Price
-UnitPrice=Unit price
-UnitPriceHT=Unit price (net)
-UnitPriceTTC=Unit price
-PriceU=U.P.
-PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (currency)
-PriceUTTC=U.P. (inc. tax)
+Cut=Isijeci
+Copy=Kopiraj
+Paste=Zalijepi
+Default=Uobičajeni
+DefaultValue=Uobičajena vrijednost
+DefaultValues=Podrazumijevane vrijednosti
+Price=Cijena
+UnitPrice=Jedinična cijena
+UnitPriceHT=Jedinična cijena (neto)
+UnitPriceTTC=Jedinična cijena
+PriceU=J.C.
+PriceUHT=J.C. (neto)
+PriceUHTCurrency=J.C (valuta)
+PriceUTTC=J.C. (uklj. PDV)
 Amount=Iznos
-AmountInvoice=Invoice amount
+AmountInvoice=Iznos fakture
 AmountPayment=Iznos plaćanja
-AmountHTShort=Amount (net)
-AmountTTCShort=Amount (inc. tax)
-AmountHT=Amount (net of tax)
-AmountTTC=Amount (inc. tax)
-AmountVAT=Amount tax
-MulticurrencyAlreadyPaid=Already payed, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
-MulticurrencyAmountHT=Amount (net of tax), original currency
-MulticurrencyAmountTTC=Amount (inc. of tax), original currency
-MulticurrencyAmountVAT=Amount tax, original currency
-AmountLT1=Amount tax 2
-AmountLT2=Amount tax 3
-AmountLT1ES=Amount RE
-AmountLT2ES=Amount IRPF
-AmountTotal=Total amount
-AmountAverage=Average amount
-PriceQtyMinHT=Price quantity min. (net of tax)
-Percentage=Percentage
-Total=Total
-SubTotal=Subtotal
-TotalHTShort=Total (net)
-TotalHTShortCurrency=Total (net in currency)
-TotalTTCShort=Total (inc. tax)
-TotalHT=Total (net of tax)
-TotalHTforthispage=Total (net of tax) for this page
-Totalforthispage=Total for this page
-TotalTTC=Total (inc. tax)
-TotalTTCToYourCredit=Total (inc. tax) to your credit
-TotalVAT=Total tax
-TotalLT1=Total tax 2
-TotalLT2=Total tax 3
-TotalLT1ES=Total RE
-TotalLT2ES=Total IRPF
-HT=Net of tax
-TTC=Inc. tax
-VAT=Sales tax
-VATs=Sales taxes
+AmountHTShort=Iznos (neto)
+AmountTTCShort=Iznos (uklj. PDV)
+AmountHT=Iznos (neto bez PDV)
+AmountTTC=Iznos (uklj. PDV)
+AmountVAT=Iznos poreza
+MulticurrencyAlreadyPaid=Već plaćeno, orig. valuta
+MulticurrencyRemainderToPay=Ostatak za plaćanje, orig. valuta
+MulticurrencyPaymentAmount=Iznos za plaćanje, orig. valuta
+MulticurrencyAmountHT=Iznos (bez poreza), orig. valuta
+MulticurrencyAmountTTC=Iznos (uklj. porez), origin. valuta
+MulticurrencyAmountVAT=Iznos poreza, orig. valuta
+AmountLT1=Iznos poreza 2
+AmountLT2=Iznos poreza 3
+AmountLT1ES=Iznos RE
+AmountLT2ES=Iznos IRPF
+AmountTotal=Ukupni iznos
+AmountAverage=Prosječni iznos
+PriceQtyMinHT=Min. cijena jedinice (neto porez)
+Percentage=Postotak
+Total=Ukupno
+SubTotal=Međuzbir
+TotalHTShort=Ukupno (neto)
+TotalHTShortCurrency=Ukupno (neto u valuti)
+TotalTTCShort=Ukupno (uklj. PDV)
+TotalHT=Ukupno (neto PDV)
+TotalHTforthispage=Ukupno (neto poreza) za ovu stranicu
+Totalforthispage=Ukupno za ovu stranicu
+TotalTTC=Ukupno (uklj. PDV)
+TotalTTCToYourCredit=Ukupno (uklj. PDV) u vašu korist
+TotalVAT=Ukupan porez
+TotalLT1=Ukupan porez 2
+TotalLT2=Ukupan porez 3
+TotalLT1ES=Ukupno RE
+TotalLT2ES=Ukupno IRPF
+HT=Neto porez
+TTC=Uklj. porez
+VAT=Porez na promet
+VATs=PDV
 LT1ES=RE
 LT2ES=IRPF
-VATRate=Tax Rate
-Average=Average
-Sum=Sum
+VATRate=Stopa poreza
+Average=Prosjek
+Sum=Zbir
 Delta=Delta
-Module=Modul
-Option=Option
-List=List
-FullList=Full list
+Module=Module/Application
+Modules=Modules/Applications
+Option=Opcija
+List=Spisak
+FullList=Potpuni spisak
 Statistics=Statistika
-OtherStatistics=Other statistics
+OtherStatistics=Druge statistike
 Status=Status
-Favorite=Favorite
+Favorite=Omiljeni
 ShortInfo=Info.
 Ref=Ref.
-ExternalRef=Ref. extern
+ExternalRef=Ref. vanjski
 RefSupplier=Ref. dobavljač
-RefPayment=Ref. payment
+RefPayment=Ref. plaćanje
 CommercialProposalsShort=Poslovni prijedlozi
 Comment=Komentar
-Comments=Comments
-ActionsToDo=Events to do
-ActionsToDoShort=To do
-ActionsDoneShort=Done
-ActionNotApplicable=Not applicable
-ActionRunningNotStarted=To start
-ActionRunningShort=In progress
-ActionDoneShort=Finished
-ActionUncomplete=Uncomplete
-CompanyFoundation=Kompanija/Fondacija
-ContactsForCompany=Contacts 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
-NActionsLate=%s late
-RequestAlreadyDone=Request already recorded
+Comments=Komentari
+ActionsToDo=Događanja za uraditi
+ActionsToDoShort=Za uraditi
+ActionsDoneShort=Završeno
+ActionNotApplicable=Nije primjenjivo
+ActionRunningNotStarted=Treba započeti
+ActionRunningShort=U toku
+ActionDoneShort=Završeno
+ActionUncomplete=Nedovršeno
+CompanyFoundation=Kompanija/organizacija
+ContactsForCompany=Kontakti za ovaj subjekt
+ContactsAddressesForCompany=Kontakti/adrese za ovaj subjekt
+AddressesForCompany=Adrese za ovaj subjekt
+ActionsOnCompany=Događaji o ovom subjektu
+ActionsOnMember=Događaji o ovom članu
+NActionsLate=%s kasne
+RequestAlreadyDone=Zahtjev već zapisan
 Filter=Filter
-FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
-RemoveFilter=Remove filter
-ChartGenerated=Chart generated
-ChartNotGenerated=Chart not generated
-GeneratedOn=Build on %s
-Generate=Generate
-Duration=Duration
-TotalDuration=Total duration
-Summary=Summary
-DolibarrStateBoard=Statistika
-DolibarrWorkBoard=Work tasks board
-Available=Available
-NotYetAvailable=Not yet available
-NotAvailable=Not available
-Categories=Tags/categories
-Category=Tag/category
-By=By
+FilterOnInto=Pretraži kriterij '<strong>%s</strong>' u poljima %s
+RemoveFilter=Ukloni filter
+ChartGenerated=Pregled napravljen
+ChartNotGenerated=Pregled nije napravljen
+GeneratedOn=Napravljeno %s
+Generate=Napravi
+Duration=Trajanje
+TotalDuration=Ukupno trajanje
+Summary=Sažetak
+DolibarrStateBoard=Statistike baze podataka
+DolibarrWorkBoard=Pregled otvorenih predmeta
+NoOpenedElementToProcess=Nema otvorenih elemenata za obradu
+Available=Dostupno
+NotYetAvailable=Još uvijek nedostupno
+NotAvailable=Nije dostupno
+Categories=Oznake/kategorije
+Category=Oznaka/kategorija
+By=Od
 From=Od
-to=to
-and=and
-or=or
+to=za
+and=i
+or=ili
 Other=Ostalo
-Others=Others
-OtherInformations=Other informations
-Quantity=Quantity
-Qty=Qty
-ChangedBy=Changed by
-ApprovedBy=Approved by
-ApprovedBy2=Approved by (second approval)
+Others=Drugi
+OtherInformations=Ostale informacije
+Quantity=Količina
+Qty=Kol
+ChangedBy=Izmijenio
+ApprovedBy=Odobrio
+ApprovedBy2=Odobrio (drugo odobrenje)
 Approved=Odobreno
 Refused=Odbijen
-ReCalculate=Recalculate
-ResultKo=Failure
-Reporting=Reporting
-Reportings=Reporting
+ReCalculate=Ponovni preračun
+ResultKo=Greška
+Reporting=Izvještavanje
+Reportings=Izvještavanja
 Draft=Nacrt
-Drafts=Drafts
+Drafts=Uzorak
 Validated=Potvrđeno
-Opened=Otvoreno
-New=New
+Opened=Otvori
+New=Novo
 Discount=Popust
-Unknown=Nepoznat potencijal
-General=General
-Size=Size
-Received=Primljena donacija
+Unknown=Nepoznat
+General=Opće
+Size=Veličina
+Received=Primljeno
 Paid=Plaćeno
-Topic=Subject
-ByCompanies=By third parties
-ByUsers=By users
-Links=Links
-Link=Link
-Rejects=Rejects
-Preview=Preview
-NextStep=Next step
-Datas=Data
+Topic=Tema
+ByCompanies=Po subjektu
+ByUsers=od korisnika
+Links=Veze
+Link=Veza
+Rejects=Odbijeno
+Preview=Pretpregled
+NextStep=Sljedeći korak
+Datas=Podaci
 None=Ništa
 NoneF=Ništa
-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.
-Photo=Picture
-Photos=Pictures
-AddPhoto=Add picture
-DeletePicture=Picture delete
-ConfirmDeletePicture=Confirm picture deletion?
-Login=Login
-CurrentLogin=Current login
-EnterLoginDetail=Enter login details
-January=January
-February=February
-March=March
-April=April
-May=May
-June=June
-July=July
-August=August
-September=September
-October=October
-November=November
-December=December
-JanuaryMin=Jan
-FebruaryMin=Feb
-MarchMin=Mar
-AprilMin=Apr
-MayMin=May
-JuneMin=Jun
-JulyMin=Jul
-AugustMin=Aug
-SeptemberMin=Sep
-OctoberMin=Oct
-NovemberMin=Nov
-DecemberMin=Dec
-Month01=January
-Month02=February
-Month03=March
-Month04=April
-Month05=May
-Month06=June
-Month07=July
-Month08=August
-Month09=September
-Month10=October
-Month11=November
-Month12=December
-MonthShort01=Jan
-MonthShort02=Feb
-MonthShort03=Mar
-MonthShort04=Apr
-MonthShort05=May
-MonthShort06=Jun
-MonthShort07=Jul
-MonthShort08=Aug
-MonthShort09=Sep
-MonthShort10=Oct
-MonthShort11=Nov
-MonthShort12=Dec
-AttachedFiles=Attached files and documents
-FileTransferComplete=File was uploaded successfuly
-DateFormatYYYYMM=YYYY-MM
-DateFormatYYYYMMDD=YYYY-MM-DD
-DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
-ReportName=Report name
-ReportPeriod=Report period
+NoneOrSeveral=Nijedan ili više
+Late=Kasno
+LateDesc=Kašnjenje za definiranje ako je zapis zakasnio ili nije zavisan u vašem podešenju. Pitajte administratora za promjenu kašnjenja u meniju Početan - Postavke - Upozorenja.
+Photo=Slika
+Photos=Slike
+AddPhoto=Dodaj sliku
+DeletePicture=Obriši sliku
+ConfirmDeletePicture=Potvrdi brisanje slike?
+Login=Pristup
+CurrentLogin=Trenutni pristup
+EnterLoginDetail=Unesi detalje prijave
+January=januar
+February=februar
+March=mart
+April=april
+May=maj
+June=juni
+July=juli
+August=august
+September=septembar
+October=oktobar
+November=novembar
+December=decembar
+JanuaryMin=jan
+FebruaryMin=feb
+MarchMin=mar
+AprilMin=apr
+MayMin=maj
+JuneMin=jun
+JulyMin=jul
+AugustMin=aug
+SeptemberMin=sep
+OctoberMin=okt
+NovemberMin=nov
+DecemberMin=dec
+Month01=Januar
+Month02=februar
+Month03=mart
+Month04=april
+Month05=maj
+Month06=juni
+Month07=juli
+Month08=august
+Month09=septembar
+Month10=oktobar
+Month11=novembar
+Month12=decembar
+MonthShort01=jan
+MonthShort02=feb
+MonthShort03=mar
+MonthShort04=apr
+MonthShort05=maj
+MonthShort06=jun
+MonthShort07=jul
+MonthShort08=aug
+MonthShort09=sep
+MonthShort10=okt
+MonthShort11=nov
+MonthShort12=dec
+AttachedFiles=Priložene datoteke i dokumenti
+FileTransferComplete=Datoteka je uspješno postavljena
+DateFormatYYYYMM=MM-YYYY
+DateFormatYYYYMMDD=DD-MM-YYYY
+DateFormatYYYYMMDDHHMM=DD-MM-YYYY HH:SS
+ReportName=Naziv izvještaja
+ReportPeriod=Period izvještaja
 ReportDescription=Opis
-Report=Report
-Keyword=Keyword
-Origin=Origin
-Legend=Legend
-Fill=Fill
-Reset=Reset
-File=Fajl
-Files=Files
-NotAllowed=Not allowed
-ReadPermissionNotAllowed=Read permission not allowed
-AmountInCurrency=Amount in %s currency
-Example=Example
-Examples=Examples
-NoExample=No example
-FindBug=Report a bug
-NbOfThirdParties=Number of third parties
-NbOfLines=Number of lines
-NbOfObjects=Number of objects
-NbOfObjectReferers=Number of related items
-Referers=Related items
-TotalQuantity=Total quantity
-DateFromTo=From %s to %s
-DateFrom=From %s
-DateUntil=Until %s
+Report=Izvještaj
+Keyword=Ključna riječ
+Origin=Porijeklo
+Legend=Objašnjenje
+Fill=Popuni
+Reset=Poništi
+File=Datoteka
+Files=Datoteke
+NotAllowed=Nije dopušteno
+ReadPermissionNotAllowed=Dozvola za čitanje nije data
+AmountInCurrency=Iznos u valuti %s
+Example=Primjer
+Examples=Primjeri
+NoExample=Nema primjera
+FindBug=Javi o greški
+NbOfThirdParties=Broj subjekata
+NbOfLines=Broj linija
+NbOfObjects=Broj objekata
+NbOfObjectReferers=Broj povezanih stavki
+Referers=Povezane stavke
+TotalQuantity=Ukupna količina
+DateFromTo=Od %s do %s
+DateFrom=Od%s
+DateUntil=Do %s
 Check=Provjeri
-Uncheck=Uncheck
-Internal=Internal
-External=External
-Internals=Internal
-Externals=External
-Warning=Warning
-Warnings=Warnings
-BuildDoc=Build Doc
-Entity=Environment
-Entities=Entities
-CustomerPreview=Customer preview
-SupplierPreview=Supplier preview
-ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show supplier preview
-RefCustomer=Ref. customer
-Currency=Currency
-InfoAdmin=Information for administrators
-Undo=Undo
-Redo=Redo
-ExpandAll=Expand all
-UndoExpandAll=Undo expand
+Uncheck=Otkači
+Internal=Interno
+External=Vanjsko
+Internals=Interni
+Externals=Vanjski
+Warning=Upozorenje
+Warnings=Upozorenja
+BuildDoc=Napravi dok.
+Entity=Okruženje
+Entities=entiteti
+CustomerPreview=Pregled kupca
+SupplierPreview=Pregled dobavljača
+ShowCustomerPreview=Pokaži sažetak kupca
+ShowSupplierPreview=Pokaži sažetak dobavljača
+RefCustomer=Ref. kupca
+Currency=valuta
+InfoAdmin=Informacije za administratore
+Undo=vrati
+Redo=ponovi
+ExpandAll=Proširi sve
+UndoExpandAll=Vrati proširenje
 Reason=Razlog
-FeatureNotYetSupported=Feature not yet supported
-CloseWindow=Close window
-Response=Response
+FeatureNotYetSupported=Osobina još nije podržana
+CloseWindow=Zatvori prozor
+Response=Odgovor
 Priority=Prioritet
-SendByMail=Send by EMail
-MailSentBy=Email sent by
-TextUsedInTheMessageBody=Email body
-SendAcknowledgementByMail=Send confirmation email
-EMail=E-mail
-NoEMail=No email
-Email=Email
-NoMobilePhone=No mobile phone
-Owner=Owner
-FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
-Refresh=Refresh
-BackToList=Back to list
-GoBack=Go back
-CanBeModifiedIfOk=Can be modified if valid
-CanBeModifiedIfKo=Can be modified if not valid
+SendByMail=Pošalji emailom
+MailSentBy=Email je poslao
+TextUsedInTheMessageBody=Tekst emaila
+SendAcknowledgementByMail=Pošalji konfirmacijski email
+EMail=Email
+NoEMail=nema emaila
+Email=email
+NoMobilePhone=Nema broj mobitela
+Owner=Vlasnik
+FollowingConstantsWillBeSubstituted=Sljedeće konstante će se zamijeniti sa odgovarajućim vrijednostima.
+Refresh=Osvježi
+BackToList=Nazad na spisak
+GoBack=Idi nazad
+CanBeModifiedIfOk=Može se mijenjati ako je valjan
+CanBeModifiedIfKo=Može biti promijenjeno ako nije valjano
 ValueIsValid=Vrijednost je važeća
-ValueIsNotValid=Value is not valid
-RecordCreatedSuccessfully=Record created successfully
-RecordModifiedSuccessfully=Record modified successfully
-RecordsModified=%s record modified
-RecordsDeleted=%s record deleted
-AutomaticCode=Automatic code
-FeatureDisabled=Feature disabled
-MoveBox=Move widget
-Offered=Offered
-NotEnoughPermissions=You don't have permission for this action
-SessionName=Session name
+ValueIsNotValid=Vrijednost nije valjana
+RecordCreatedSuccessfully=Zapis je uspješno napravljen
+RecordModifiedSuccessfully=Zapis uspješno promijenjen
+RecordsModified=%s zapis promijenjen
+RecordsDeleted=%s zapis obrisan
+AutomaticCode=Automatski kod
+FeatureDisabled=Osobina onemogućena
+MoveBox=Pomjeri prikaz
+Offered=Ponuđeno
+NotEnoughPermissions=Nemate dozvolu za ovu akciju
+SessionName=Naziv sesije
 Method=Metoda
-Receive=Receive
-CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
-ExpectedValue=Expected Value
-CurrentValue=Current value
-PartialWoman=Partial
-TotalWoman=Total
-NeverReceived=Never received
+Receive=Primiti
+CompleteOrNoMoreReceptionExpected=Završeno ili se ne očekuje više
+ExpectedValue=Očekivana vrijednost
+CurrentValue=Trenutna vrijednost
+PartialWoman=Djelimično
+TotalWoman=Ukupno
+NeverReceived=Nikad primljeno
 Canceled=Otkazan
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
-Color=Color
-Documents=Linked files
+YouCanChangeValuesForThisListFromDictionarySetup=Možete promijeniti vrijednosti na ovom spisku u meniju Postavke-Rječnici
+YouCanChangeValuesForThisListFrom=Možete promijeniti vrijednosti za ovaj spisak u meniju %s
+YouCanSetDefaultValueInModuleSetup=Možete postaviti podrazumijevane vrijednosti koje će se koristiti pri pravljenju novog zapisa u postavkama modula
+Color=Boja
+Documents=Povezane datoteke
 Documents2=Dokumenti
-UploadDisabled=Upload disabled
+UploadDisabled=Postavljanje isključeno
 MenuECM=Dokumenti
 MenuAWStats=AWStats
-MenuMembers=Members
-MenuAgendaGoogle=Google agenda
-ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=No documents saved in this directory
-CurrentUserLanguage=Current language
-CurrentTheme=Current theme
-CurrentMenuManager=Current menu manager
+MenuMembers=Članovi
+MenuAgendaGoogle=Google kalendar
+ThisLimitIsDefinedInSetup=Dolibarr ograničenje (Meni Početna-Postavke-Sigurnost): %s Kb, PHP ograničenje: %s Kb
+NoFileFound=Nema dokumenata spremljenih u ovom direktoriju
+CurrentUserLanguage=Trenutni jezik
+CurrentTheme=Trenutna tema
+CurrentMenuManager=Trenutni upravljač menija
 Browser=Browser
-Layout=Layout
-Screen=Screen
-DisabledModules=Disabled modules
-For=For
-ForCustomer=For customer
-Signature=Signature
-DateOfSignature=Date of signature
-HidePassword=Show command with password hidden
-UnHidePassword=Show real command with clear password
+Layout=Izgled
+Screen=Ekran
+DisabledModules=Onemogućeni moduli
+For=Za
+ForCustomer=Za kupca
+Signature=Potpis
+DateOfSignature=Datum potpisa
+HidePassword=Pokaži komandu sa skrivenom šifrom
+UnHidePassword=Pokaži stvarnu komandu sa pokazanom šifrom
 Root=Root
-Informations=Informations
-Page=Page
-Notes=Notes
-AddNewLine=Add new line
-AddFile=Add file
-FreeZone=Free entry
-FreeLineOfType=Free entry of type
-CloneMainAttributes=Clone object with its main attributes
-PDFMerge=PDF Merge
-Merge=Merge
-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 application at the moment.
-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.
+Informations=Informacije
+Page=Stranica
+Notes=Napomene
+AddNewLine=Dodaj novi red
+AddFile=Dodaj datoteku
+FreeZone=Slobodni unos
+FreeLineOfType=Unos slobodnog tipa
+CloneMainAttributes=Kloniraj objekt sa njegovim osnovnim osobinama
+PDFMerge=PDF spajanje
+Merge=Spajanje
+DocumentModelStandardPDF=Standardni šablon PDFa
+PrintContentArea=Pokaži stranicu za štampu glavnog područja
+MenuManager=Upravljanje menijima
+WarningYouAreInMaintenanceMode=Upozorenje, sada ste u modu za održavanje, tako da samo korisniku <b>%s</b> je dopušteno korištenje aplikacije u ovom trenutku.
+CoreErrorTitle=Sistemska greška
+CoreErrorMessage=Žao nam je, desila se greška. Kontaktirajte sistemskog administratora da provjeri zapisnik ili onemogući $dolibarr_main_prod=1 za dobijanje više informacija.
 CreditCard=Kreditna kartica
-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.
-AccordingToGeoIPDatabase=(according to GeoIP convertion)
-Line=Line
-NotSupported=Not supported
-RequiredField=Required field
-Result=Result
+FieldsWithAreMandatory=Polja sa <b>%s</b> su obavezna
+FieldsWithIsForPublic=Polja sa <b>%s</b> su prikazana na javnom spisku članova. Ako ovo ne želite, deaktivirajte kućicu "javno".
+AccordingToGeoIPDatabase=(prema GeoIP konverziji)
+Line=Red
+NotSupported=Nije podržano
+RequiredField=Obavezno polje
+Result=Rezultat
 ToTest=Test
-ValidateBefore=Card must be validated before using this feature
+ValidateBefore=Kartica se mora odobriti prije korištenja ove osobine
 Visibility=Vidljivost
 Private=Privatno
-Hidden=Hidden
-Resources=Resources
-Source=Source
-Prefix=Prefix
-Before=Before
-After=After
-IPAddress=IP address
-Frequency=Frequency
-IM=Instant messaging
-NewAttribute=New attribute
-AttributeCode=Attribute code
-URLPhoto=URL of photo/logo
-SetLinkToAnotherThirdParty=Link to another third party
-LinkTo=Link to
-LinkToProposal=Link to proposal
-LinkToOrder=Link to order
-LinkToInvoice=Link to invoice
-LinkToSupplierOrder=Link to supplier order
-LinkToSupplierProposal=Link to supplier proposal
-LinkToSupplierInvoice=Link to supplier invoice
-LinkToContract=Link to contract
-LinkToIntervention=Link to intervention
+Hidden=Sakriveno
+Resources=Resursi
+Source=Izvor
+Prefix=Prefiks
+Before=Prije
+After=Nakon
+IPAddress=IP adresa
+Frequency=Frekvencija
+IM=Poruke uživo
+NewAttribute=Novi atribut
+AttributeCode=Kod atributa
+URLPhoto=URL fotografije/logotipa
+SetLinkToAnotherThirdParty=Link prema drugom subjektu
+LinkTo=Link ka
+LinkToProposal=Link ka prijedlogu
+LinkToOrder=Link ka narudžbi
+LinkToInvoice=Link na fakturu
+LinkToSupplierOrder=Link ka narudžbi kupcu
+LinkToSupplierProposal=Link ka ponudi dobavljača
+LinkToSupplierInvoice=Link na fakturu dobavljača
+LinkToContract=Link ka kontaktima
+LinkToIntervention=Link ka intervencijama
 CreateDraft=Kreiraj nacrt
-SetToDraft=Back to draft
-ClickToEdit=Click to edit
-ObjectDeleted=Object %s deleted
-ByCountry=By country
-ByTown=By town
-ByDate=By date
-ByMonthYear=By month/year
-ByYear=By year
-ByMonth=By month
-ByDay=By day
-BySalesRepresentative=By sales representative
-LinkedToSpecificUsers=Linked to a particular user contact
-NoResults=No results
-AdminTools=Admin tools
-SystemTools=System tools
-ModulesSystemTools=Modules tools
+SetToDraft=Nazad na nacrt
+ClickToEdit=Klikni za uređivanje
+ObjectDeleted=Objekat %s je obrisan
+ByCountry=Po državi
+ByTown=Po gradu
+ByDate=Po datumu
+ByMonthYear=Po mjesecu/godini
+ByYear=Po godini
+ByMonth=Po mjesecu
+ByDay=Po danu
+BySalesRepresentative=Po predstavniku prodaje
+LinkedToSpecificUsers=Spojeno sa određenim kontaktom korisnika
+NoResults=Nema rezultata
+AdminTools=Adminski alati
+SystemTools=Sistemski alati
+ModulesSystemTools=Alati modula
 Test=Test
 Element=Element
-NoPhotoYet=No pictures available yet
-Dashboard=Dashboard
-MyDashboard=My dashboard
-Deductible=Deductible
-from=from
-toward=toward
-Access=Access
-SelectAction=Select action
-HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
-SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
-OriginFileName=Original filename
-SetDemandReason=Set source
-SetBankAccount=Define Bank Account
-AccountCurrency=Account Currency
-ViewPrivateNote=View notes
-XMoreLines=%s line(s) hidden
-PublicUrl=Public URL
-AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
-PrintFile=Print File %s
-ShowTransaction=Show entry on bank account
-GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
-Deny=Deny
-Denied=Denied
-ListOfTemplates=List of templates
-Gender=Gender
-Genderman=Man
-Genderwoman=Woman
+NoPhotoYet=Još nema dostupne slike
+Dashboard=Komandna tabla
+MyDashboard=Moja nadzorna ploča
+Deductible=Može se odbiti
+from=od
+toward=prema
+Access=Pristup
+SelectAction=Odaberi akciju
+SelectTargetUser=Odaberi ciljnog korisnika/zaposlenika
+HelpCopyToClipboard=Koristite Ctrl+C za kopiranje u međuspremnik copy to clipboard
+SaveUploadedFileWithMask=Spremi datoteku na server pod imenom "<strong>%s</strong>" (inače "%s")
+OriginFileName=Originalno ime datoteke
+SetDemandReason=Postavi izvor
+SetBankAccount=Definiraj bankovni račun
+AccountCurrency=Valuta računa
+ViewPrivateNote=Vidi zabilješke
+XMoreLines=%s red(ova) skriveno
+PublicUrl=Javni URL
+AddBox=Dodaj kutijicu
+SelectElementAndClick=Odaberite element i kliknite %s
+PrintFile=Štampa datoteke %s
+ShowTransaction=Pokaži unos u bankovni račun
+GoIntoSetupToChangeLogo=Idite u  Početna - Postavke - Kompanija za promjenu logotipa ili Početna - Postavke - Prikaz za sakrivanje.
+Deny=Zabrani
+Denied=Zabranjeno
+ListOfTemplates=Spisak šablona
+Gender=Spol
+Genderman=Muškarac
+Genderwoman=Žena
 ViewList=Lista
-Mandatory=Mandatory
+Mandatory=Obavezno
 Hello=Zdravo
-Sincerely=Sincerely
-DeleteLine=Delete line
-ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
-NoRecordSelected=No record selected
-MassFilesArea=Area for files built by mass actions
-ShowTempMassFilesArea=Show area of files built by mass actions
-RelatedObjects=Related Objects
-ClassifyBilled=Classify billed
+Sincerely=S poštovanjem
+DeleteLine=Obriši red
+ConfirmDeleteLine=Da li ste sigurni da želite obrisati ovaj red?
+NoPDFAvailableForDocGenAmongChecked=Nijedan PDF nije dostupan za kreiranje dokumenata među provjerenim zapisima
+TooManyRecordForMassAction=Previše zapisa odabrano za masovnu akciju. Akcija je ograničena na spisak od %s zapisa.
+NoRecordSelected=Nijedan zapis nije odabran
+MassFilesArea=Područje za datoteke napravljeno masovnim akcijama
+ShowTempMassFilesArea=Pokaži područje datoteka napravljeno masovnim akcijama
+RelatedObjects=Povezani objekti
+ClassifyBilled=Klasificiraj kao fakturisano
 Progress=Napredak
 ClickHere=Klikni ovdje
-FrontOffice=Front office
+FrontOffice=Izlog
 BackOffice=Administracija
-View=View
+View=Pogled
 Export=Export
 Exports=Exports
-ExportFilteredList=Export filtered list
-ExportList=Export list
-Miscellaneous=Miscellaneous
+ExportFilteredList=Izvezi filtrirani spisak
+ExportList=Spisak za izvoz
+Miscellaneous=Razno
 Calendar=Kalendar
-GroupBy=Group by...
-ViewFlatList=View flat list
-RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Direct download link
-Download=Download
-ActualizeCurrency=Update currency rate
-Fiscalyear=Fiscal year
+GroupBy=Grupiranje po...
+ViewFlatList=Vidi čisti spisak
+RemoveString=Ukloni pojam '%s'
+SomeTranslationAreUncomplete=Neki jezici su možda djelimično prevedeni ili mogu sadržavati greške. Ako nađete neke, možete popraviti jezičke datoteke tako što ćete ih postaviti na <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
+DirectDownloadLink=Direktni link za skidanje
+Download=Skidanje
+ActualizeCurrency=Ažuriraj kurs valute
+Fiscalyear=Fiskalna godina
+ModuleBuilder=Kreator modula
+SetMultiCurrencyCode=Postavi valutu
+BulkActions=Masovne akcije
+ClickToShowHelp=Klikni za prikaz pomoći
+HR=LJR
+HRAndBank=LJR i banka
+AutomaticallyCalculated=Automatski izračunato
+TitleSetToDraft=Nazad na nacrt
+ConfirmSetToDraft=Da li ste sigurni da želite se vratiti u stanje nacrta?
 # Week day
-Monday=Monday
-Tuesday=Tuesday
-Wednesday=Wednesday
-Thursday=Thursday
-Friday=Friday
-Saturday=Saturday
-Sunday=Sunday
-MondayMin=Mo
-TuesdayMin=Tu
-WednesdayMin=We
-ThursdayMin=Th
-FridayMin=Fr
-SaturdayMin=Sa
-SundayMin=Su
-Day1=Monday
-Day2=Tuesday
-Day3=Wednesday
-Day4=Thursday
-Day5=Friday
-Day6=Saturday
-Day0=Sunday
-ShortMonday=M
-ShortTuesday=T
-ShortWednesday=W
-ShortThursday=T
-ShortFriday=F
+Monday=Ponedjeljak
+Tuesday=Utorak
+Wednesday=Srijeda
+Thursday=Četvrtak
+Friday=Petak
+Saturday=Subota
+Sunday=Nedjelja
+MondayMin=Po
+TuesdayMin=Ut
+WednesdayMin=Sr
+ThursdayMin=Če
+FridayMin=Pe
+SaturdayMin=Su
+SundayMin=Ne
+Day1=Ponedjeljak
+Day2=Utorak
+Day3=Srijeda
+Day4=Četvrtak
+Day5=Petak
+Day6=Subota
+Day0=Nedjelja
+ShortMonday=P
+ShortTuesday=U
+ShortWednesday=S
+ShortThursday=Č
+ShortFriday=P
 ShortSaturday=S
-ShortSunday=S
-SelectMailModel=Select email template
-SetRef=Set ref
-Select2ResultFoundUseArrows=Some results found. Use arrows to select.
-Select2NotFound=No result found
-Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
-Select2LoadingMoreResults=Loading more results...
-Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
-SearchIntoContacts=Contacts
-SearchIntoMembers=Members
-SearchIntoUsers=Users
-SearchIntoProductsOrServices=Products or services
+ShortSunday=N
+SelectMailModel=Odaberi šablon emaila
+SetRef=Postavi ref.
+Select2ResultFoundUseArrows=Pronađeni neki rezultati. Koristite strelice za odabir.
+Select2NotFound=Nije pronađen rezultat
+Select2Enter=Potvrdi
+Select2MoreCharacter=ili više karaktera
+Select2MoreCharacters=ili više karaktera
+Select2MoreCharactersMore=<strong>Traži sintaksu:</strong><br /><kbd><strong> |</strong></kbd><kbd> ili</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Bilo koji znak</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Počni sa</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> Završi sa</kbd> (ab$)<br />
+Select2LoadingMoreResults=Učitavam više rezultata...
+Select2SearchInProgress=Pretraga u toku...
+SearchIntoThirdparties=Subjekti
+SearchIntoContacts=Kontakti
+SearchIntoMembers=Članovi
+SearchIntoUsers=Korisnici
+SearchIntoProductsOrServices=Proizvodi ili usluge
 SearchIntoProjects=Projekti
 SearchIntoTasks=Zadaci
-SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
-SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
-SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
+SearchIntoCustomerInvoices=Fakture kupaca
+SearchIntoSupplierInvoices=Fakture dobavljača
+SearchIntoCustomerOrders=Narudžbe kupaca
+SearchIntoSupplierOrders=Narudžbe dobavljačima
+SearchIntoCustomerProposals=Ponude kupcima
+SearchIntoSupplierProposals=Ponude dobavljača
 SearchIntoInterventions=Intervencije
 SearchIntoContracts=Ugovori
-SearchIntoCustomerShipments=Customer shipments
-SearchIntoExpenseReports=Expense reports
-SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
+SearchIntoCustomerShipments=Slanje kupcu
+SearchIntoExpenseReports=Izvještaj o troškovima
+SearchIntoLeaves=Odlasci
diff --git a/htdocs/langs/bs_BA/members.lang b/htdocs/langs/bs_BA/members.lang
index 09062a7534f..0cf38ddc642 100644
--- a/htdocs/langs/bs_BA/members.lang
+++ b/htdocs/langs/bs_BA/members.lang
@@ -3,7 +3,7 @@ MembersArea=Members area
 MemberCard=Member card
 SubscriptionCard=Subscription card
 Member=Member
-Members=Members
+Members=Članovi
 ShowMember=Show member card
 UserNotLinkedToMember=User not linked to a member
 ThirdpartyNotLinkedToMember=Third-party not linked to a member
@@ -61,7 +61,7 @@ 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.
 Subscription=Subscription
 Subscriptions=Subscriptions
-SubscriptionLate=Late
+SubscriptionLate=Kasno
 SubscriptionNotReceived=Subscription never received
 ListOfSubscriptions=List of subscriptions
 SendCardByMail=Send card by Email
@@ -90,8 +90,9 @@ PublicMemberList=Public member list
 BlankSubscriptionForm=Public auto-subscription form
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided.
 EnablePublicSubscriptionForm=Enable the public auto-subscription form
+ForceMemberType=Force the member type
 ExportDataset_member_1=Members and subscriptions
-ImportDataset_member_1=Members
+ImportDataset_member_1=Članovi
 LastMembersModified=Latest %s modified members
 LastSubscriptionsModified=Latest %s modified subscriptions
 String=String
@@ -135,7 +136,7 @@ LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with busin
 DocForAllMembersCards=Generate business cards for all members
 DocForOneMemberCards=Generate business cards for a particular member
 DocForLabels=Generate address sheets
-SubscriptionPayment=Subscription payment
+SubscriptionPayment=Plaćanje preplate
 LastSubscriptionDate=Latest subscription date
 LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Members statistics by country
@@ -150,6 +151,7 @@ MembersByTownDesc=This screen show you statistics on members by town.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistika
 LastMemberDate=Latest member date
+LatestSubscriptionDate=Latest subscription date
 Nature=Nature
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
diff --git a/htdocs/langs/bs_BA/orders.lang b/htdocs/langs/bs_BA/orders.lang
index 8b7b56f7a31..477e9210b67 100644
--- a/htdocs/langs/bs_BA/orders.lang
+++ b/htdocs/langs/bs_BA/orders.lang
@@ -3,8 +3,8 @@ OrdersArea=Customers orders area
 SuppliersOrdersArea=Suppliers orders area
 OrderCard=Order card
 OrderId=Order Id
-Order=Order
-Orders=Orders
+Order=Narudžba
+Orders=Narudžbe
 OrderLine=Order line
 OrderDate=Datum narudžbe
 OrderDateShort=Datum narudžbe
@@ -16,7 +16,7 @@ SupplierOrder=Supplier order
 SuppliersOrders=Suppliers orders
 SuppliersOrdersRunning=Current suppliers orders
 CustomerOrder=Customer order
-CustomersOrders=Customer orders
+CustomersOrders=Narudžbe kupaca
 CustomersOrdersRunning=Current customer orders
 CustomersOrdersAndOrdersLines=Customer orders and order lines
 OrdersDeliveredToBill=Customer orders delivered to bill
diff --git a/htdocs/langs/bs_BA/other.lang b/htdocs/langs/bs_BA/other.lang
index 9f09e215d8f..195c8948d3b 100644
--- a/htdocs/langs/bs_BA/other.lang
+++ b/htdocs/langs/bs_BA/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=Date of birth
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Statistics in number of products/services units
-StatsByNumberOfEntities=Statistics in number of referring entities
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=The intervention %s has been validated.
 EMailTextInvoiceValidated=The invoice %s has been validated.
diff --git a/htdocs/langs/bs_BA/printing.lang b/htdocs/langs/bs_BA/printing.lang
index 5d2ea3a9219..f46d6d6178e 100644
--- a/htdocs/langs/bs_BA/printing.lang
+++ b/htdocs/langs/bs_BA/printing.lang
@@ -29,8 +29,8 @@ GCP_Type=Printer Type
 PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed.
 PRINTIPP_HOST=Print server
 PRINTIPP_PORT=Port
-PRINTIPP_USER=Login
-PRINTIPP_PASSWORD=Password
+PRINTIPP_USER=Ulaz
+PRINTIPP_PASSWORD=Šifra
 NoDefaultPrinterDefined=No default printer defined
 DefaultPrinter=Default printer
 Printer=Printer
@@ -40,7 +40,7 @@ IPP_State=Printer State
 IPP_State_reason=State reason
 IPP_State_reason1=State reason1
 IPP_BW=BW
-IPP_Color=Color
+IPP_Color=Boja
 IPP_Device=Device
 IPP_Media=Printer media
 IPP_Supported=Type of media
diff --git a/htdocs/langs/bs_BA/products.lang b/htdocs/langs/bs_BA/products.lang
index 3b908572021..2c82f2f134b 100644
--- a/htdocs/langs/bs_BA/products.lang
+++ b/htdocs/langs/bs_BA/products.lang
@@ -25,11 +25,13 @@ ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=Proizvod ili usluga
 ProductsAndServices=Proizvodi i usluge
 ProductsOrServices=Proizvodi ili usluge
-ProductsOnSell=Product for sale or for purchase
+ProductsOnSaleOnly=Products for sale only
+ProductsOnPurchaseOnly=Product for purchase only
 ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Products for sale and for purchase
-ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services not for sale
+ServicesOnSaleOnly=Services for sale only
+ServicesOnPurchaseOnly=Services for purchase only
+ServicesNotOnSell=Services not for sale and not for purchase
 ServicesOnSellAndOnBuy=Services for sale and for purchase
 LastModifiedProductsAndServices=Latest %s modified products/services
 LastRecordedProducts=Latest %s recorded products
@@ -162,7 +164,7 @@ second=second
 s=s
 hour=hour
 h=h
-day=day
+day=dan
 d=d
 kilogram=kilogram
 kg=Kg
@@ -175,6 +177,18 @@ m2=m²
 m3=m³
 liter=liter
 l=L
+unitP=Piece
+unitSET=Set
+unitS=Sekunda
+unitH=Sat
+unitD=Dan
+unitKG=Kilogram
+unitG=Gram
+unitM=Meter
+unitLM=Linear meter
+unitM2=Square meter
+unitM3=Cubic meter
+unitL=Liter
 ProductCodeModel=Product ref template
 ServiceCodeModel=Service ref template
 CurrentProductPrice=Current price
@@ -186,6 +200,7 @@ MultipriceRules=Price segment rules
 UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
+KeepEmptyForAutoCalculation=Keep empty to have this calculated automatically from weight or volume of products
 ### composition fabrication
 Build=Produce
 ProductsMultiPrice=Products and prices for each price segment
@@ -260,6 +275,8 @@ SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
 SubProduct=Sub product
+ProductSheet=Product sheet
+ServiceSheet=Service sheet
 
 #Attributes
 VariantAttributes=Variant attributes
@@ -271,15 +288,19 @@ ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s"
 ProductCombinationDeleteDialog=Are you sure want to delete the variant of the product "<strong>%s</strong>"?
 ProductCombinationAlreadyUsed=There was an error while deleting the variant. Please check it is not being used in any object
 ProductCombinations=Variants
+PropagateVariant=Propagate variants
 HideProductCombinations=Hide products variant in the products selector
 ProductCombination=Variant
 NewProductCombination=New variant
 EditProductCombination=Editing variant
+NewProductCombinations=New variants
+EditProductCombinations=Editing variants
+SelectCombination=Select combination
 ProductCombinationGenerator=Variants generator
 Features=Features
 PriceImpact=Price impact
 WeightImpact=Weight impact
-NewProductAttribute=New attribute
+NewProductAttribute=Novi atribut
 NewProductAttributeValue=New attribute value
 ErrorCreatingProductAttributeValue=There was an error while creating the attribute value. It could be because there is already an existing value with that reference
 ProductCombinationGeneratorWarning=If you continue, before generating new variants, all previous ones will be DELETED. Already existing ones will be updated with the new values
@@ -291,8 +312,8 @@ ErrorDeletingGeneratedProducts=There was an error while trying to delete existin
 NbOfDifferentValues=Nb of different values
 NbProducts=Nb. of products
 ParentProduct=Parent product
-HideChildProducts=Hide child products
-ConfirmCloneProductCombinations=Would you like to copy all the product variant to the product with the given reference?
+HideChildProducts=Hide variant products
+ConfirmCloneProductCombinations=Would you like to copy all the product variants to the other parent product with the given reference?
 CloneDestinationReference=Destination product reference
 ErrorCopyProductCombinations=There was an error while copying the product variants
 ErrorDestinationProductNotFound=Destination product not found
diff --git a/htdocs/langs/bs_BA/projects.lang b/htdocs/langs/bs_BA/projects.lang
index 446d268919a..2ee89593a8e 100644
--- a/htdocs/langs/bs_BA/projects.lang
+++ b/htdocs/langs/bs_BA/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Zajednički projekti
 PrivateProject=Kontakti projekta
+ProjectsImContactFor=Projects I'm explicitely a contact of
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=Svi projekti
 MyProjectsDesc=Ovaj pregled je limitiran na projekte u kojima ste stavljeni kao kontakt (bilo koji tip).
 ProjectsPublicDesc=Ovaj pregled predstavlja sve projekte koje možete čitati.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=Ovaj pregled predstavlja sve projekte i zadatke (postavke vaših koris
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=Novi projekat
 AddProject=Create project
 DeleteAProject=Obisati projekat
 DeleteATask=Obrisati zadatak
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Opened projects
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Prikaži projekt
 SetProject=Postavi projekat
 NoProject=Nema definisanog ili vlastitog projekta
 NbOfProjects=Broj projekata
+NbOfTasks=Nb of tasks
 TimeSpent=Vrijeme provedeno
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
@@ -45,11 +50,11 @@ RefTask=Ref. zadatka
 LabelTask=Oznaka zadatka
 TaskTimeSpent=Time spent on tasks
 TaskTimeUser=Korisnik
-TaskTimeNote=Note
+TaskTimeNote=Napomena
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
-NewTimeSpent=Nova provedeno vrijeme
+NewTimeSpent=Vrijeme provedeno
 MyTimeSpent=Moje provedeno vrijeme
 Tasks=Zadaci
 Task=Zadatak
@@ -59,6 +64,7 @@ TaskDescription=Task description
 NewTask=Novi zadatak
 AddTask=Create task
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Aktivnost
 Activities=Zadaci/aktivnosti
 MyActivities=Moji zadaci/aktivnosti
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Lista ugovora u vezi s projektom
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=Lista intervencija u vezi s projektom
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
@@ -102,15 +109,16 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Kontakti projekta
 ActionsOnProject=Događaji na projektu
 YouAreNotContactOfProject=Vi niste kontakt ovog privatnog projekta
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Brisanje provedenog vremena
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Resources
+TaskRessourceLinks=Resursi
 ProjectsDedicatedToThisThirdParty=Projekti posvećeni ovom subjektu
 NoTasks=Nema zadataka za ovaj projekat
 LinkedToAnotherCompany=U vezi sa drugim subjektom
-TaskIsNotAffectedToYou=Task not assigned to you
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=Vrijeme provedeno je prazno
 ThisWillAlsoRemoveTasks=Ova akcija će također izbrisati sve zadatke projekta (<b>%s</b> zadataka u ovom trenutku) i sve unose provedenog vremena.
 IfNeedToUseOhterObjectKeepEmpty=Ako neki objekti (faktura, narudžbe, ...), pripadaju drugom subjektu, mora biti u vezi sa projektom za kreiranje, ostavite ovo prazno da bi imali projekat što više subjekata.
@@ -155,33 +163,38 @@ DocumentModelBeluga=Project template for linked objects overview
 DocumentModelBaleine=Project report template for tasks
 PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
-ProjectReferers=Related items
+ProjectReferers=Povezane stavke
 ProjectMustBeValidatedFirst=Project must be validated first
 FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
 ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/bs_BA/propal.lang b/htdocs/langs/bs_BA/propal.lang
index a46228a3fb6..d932ada9211 100644
--- a/htdocs/langs/bs_BA/propal.lang
+++ b/htdocs/langs/bs_BA/propal.lang
@@ -3,7 +3,7 @@ Proposals=Poslovni prijedlozi
 Proposal=Poslovni prijedlog
 ProposalShort=Prijedlog
 ProposalsDraft=Nacrti poslovnih prijedloga
-ProposalsOpened=Otvoreni poslovni prijedlozi
+ProposalsOpened=Open commercial proposals
 Prop=Poslovni prijedlozi
 CommercialProposal=Poslovni prijedlog
 ProposalCard=Kartica prijedloga
@@ -25,8 +25,8 @@ NumberOfProposalsByMonth=Broj po mjesecu
 AmountOfProposalsByMonthHT=Amount by month (net of tax)
 NbOfProposals=Broj poslovnih prijedloga
 ShowPropal=Show proposal
-PropalsDraft=Drafts
-PropalsOpened=Otvoreno
+PropalsDraft=Uzorak
+PropalsOpened=Otvori
 PropalStatusDraft=Uzorak (Potrebna je potvrda)
 PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Signed (needs billing)
diff --git a/htdocs/langs/bs_BA/resource.lang b/htdocs/langs/bs_BA/resource.lang
index f95121db351..cd3208760a6 100644
--- a/htdocs/langs/bs_BA/resource.lang
+++ b/htdocs/langs/bs_BA/resource.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - resource
-MenuResourceIndex=Resources
+MenuResourceIndex=Resursi
 MenuResourceAdd=New resource
 DeleteResource=Delete resource
 ConfirmDeleteResourceElement=Confirm delete the resource for this element
@@ -29,3 +29,8 @@ RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
 SelectResource=Select resource
+
+IdResource=Id resource
+AssetNumber=Serial number
+ResourceTypeCode=Resource type code
+ImportDataset_resource_1=Resursi
diff --git a/htdocs/langs/bs_BA/stocks.lang b/htdocs/langs/bs_BA/stocks.lang
index 3418e86532e..301ddce8641 100644
--- a/htdocs/langs/bs_BA/stocks.lang
+++ b/htdocs/langs/bs_BA/stocks.lang
@@ -42,7 +42,7 @@ LabelMovement=Oznaka za kretanje
 NumberOfUnit=Broj jedinica
 UnitPurchaseValue=Kupovna cijena jedinice
 StockTooLow=Zaliha preniska
-StockLowerThanLimit=Zaliha manja od granice za upozorenje
+StockLowerThanLimit=Stock lower than alert limit (%s)
 EnhancedValue=Vrijednost
 PMPValue=Ponderirana/vagana aritmetička sredina - PAS
 PMPValueShort=PAS
@@ -62,16 +62,19 @@ DeStockOnShipment=Decrease real stocks on shipping validation
 DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
 ReStockOnBill=Increase real stocks on suppliers invoices/credit notes validation
 ReStockOnValidateOrder=Povećaj stvarne zalihe na odobrenju narudžbe dobavljaču
-ReStockOnDispatchOrder=Povećaj stvarne zalihe na ručnom otpremanju u skladište, nakon primanja narudžbe dobavljača
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
 OrderStatusNotReadyToDispatch=Narudžna jos uvijek nema ili nema više status koji dozvoljava otpremanje proizvoda u zalihu skladišta
-StockDiffPhysicTeoric=Explanation for difference between physical and theoretical stock
+StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
 NoPredefinedProductToDispatch=Nema predefinisanih proizvoda za ovaj objekat. Dakle, nema potrebe za otpremanje na zalihu.
 DispatchVerb=Otpremiti
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
 PhysicalStock=Fizička zaliha
 RealStock=Stvarna zaliha
+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=Viruelna zaliha
+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, ...)
 IdWarehouse=ID skladišta
 DescWareHouse=Opis skladišta
 LieuWareHouse=Lokalizacija skladišta
@@ -116,7 +119,7 @@ NbOfProductBeforePeriod=Količina proizvoda %s u zalihi prije odabranog perioda
 NbOfProductAfterPeriod=Količina proizvoda %s u zalihi poslije odabranog perioda (> %s)
 MassMovement=Mass movement
 SelectProductInAndOutWareHouse=Odaberite proizvod, kolilinu, izvordno skladište i ciljano skladište. zatim kliknite "%s". Kada je ovo završeno za sva potrebna kretanja, kliknite "%s".
-RecordMovement=Zapiši transfer
+RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Kretanja zalihe zapisana
 RuleForStockAvailability=Rules on stock requirements
@@ -143,3 +146,50 @@ ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock cor
 ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock correctly deleted
 AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock
 AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
+InventoryDate=Inventory date
+NewInventory=New inventory
+inventorySetup = Inventory Setup
+inventoryCreatePermission=Create new inventory
+inventoryReadPermission=View inventories
+inventoryWritePermission=Update inventories
+inventoryValidatePermission=Validate inventory
+inventoryTitle=Inventory
+inventoryListTitle=Inventories
+inventoryListEmpty=No inventory in progress
+inventoryCreateDelete=Create/Delete inventory
+inventoryCreate=Create new
+inventoryEdit=Izmjena
+inventoryValidate=Potvrđeno
+inventoryDraft=Aktivan
+inventorySelectWarehouse=Warehouse choice
+inventoryConfirmCreate=Create
+inventoryOfWarehouse=Inventory for warehouse : %s
+inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryMvtStock=By inventory
+inventoryWarningProductAlreadyExists=This product is already into list
+SelectCategory=Category filter
+SelectFournisseur=Supplier filter
+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 mouvment have date of inventory
+inventoryChangePMPPermission=Allow to change PMP value for a product
+ColumnNewPMP=New unit PMP
+OnlyProdsInStock=Do not add product without stock
+TheoricalQty=Theorique qty
+TheoricalValue=Theorique qty
+LastPA=Last BP
+CurrentPA=Curent BP
+RealQty=Real Qty
+RealValue=Real Value
+RegulatedQty=Regulated Qty
+AddInventoryProduct=Add product to inventory
+AddProduct=Dodaj
+ApplyPMP=Apply PMP
+FlushInventory=Flush inventory
+ConfirmFlushInventory=Do you confirm this action ?
+InventoryFlushed=Inventory flushed
+ExitEditMode=Exit edition
+inventoryDeleteLine=Obriši red
+RegulateStock=Regulate Stock
+ListInventory=Spisak
diff --git a/htdocs/langs/bs_BA/supplier_proposal.lang b/htdocs/langs/bs_BA/supplier_proposal.lang
index fac46908d08..1795c4b6b8d 100644
--- a/htdocs/langs/bs_BA/supplier_proposal.lang
+++ b/htdocs/langs/bs_BA/supplier_proposal.lang
@@ -3,16 +3,16 @@ SupplierProposal=Supplier commercial proposals
 supplier_proposalDESC=Manage price requests to suppliers
 SupplierProposalNew=New request
 CommRequest=Price request
-CommRequests=Price requests
+CommRequests=Zahtjev za cijenu
 SearchRequest=Find a request
 DraftRequests=Draft requests
 SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Opened price requests
+RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
 SupplierProposalShort=Supplier proposal
-SupplierProposals=Supplier proposals
-SupplierProposalsShort=Supplier proposals
+SupplierProposals=Ponude dobavljača
+SupplierProposalsShort=Ponude dobavljača
 NewAskPrice=New price request
 ShowSupplierProposal=Show price request
 AddSupplierProposal=Create a price request
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=Delete request
 ValidateAsk=Validate request
 SupplierProposalStatusDraft=Uzorak (Potrebna je potvrda)
-SupplierProposalStatusValidated=Validated (request is opened)
+SupplierProposalStatusValidated=Validated (request is open)
 SupplierProposalStatusClosed=Zatvoreno
 SupplierProposalStatusSigned=Accepted
 SupplierProposalStatusNotSigned=Odbijen
@@ -47,7 +47,7 @@ CommercialAsk=Price request
 DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposal=List of supplier proposal requests
+ListOfSupplierProposals=List of supplier proposal requests
 ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/bs_BA/suppliers.lang b/htdocs/langs/bs_BA/suppliers.lang
index 42c63efe327..5503303e717 100644
--- a/htdocs/langs/bs_BA/suppliers.lang
+++ b/htdocs/langs/bs_BA/suppliers.lang
@@ -14,6 +14,7 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Neki podproizvodi nemaju definisanu cijenu
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
+SupplierPrices=Supplier prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Ova referentni dobavljač je već povezan sa referencom: %s
 NoRecordedSuppliers=Nijedan dobavljač snimljen
 SupplierPayment=Plaćanje dobavljača
diff --git a/htdocs/langs/bs_BA/trips.lang b/htdocs/langs/bs_BA/trips.lang
index e50ab9b931b..8ff1923958f 100644
--- a/htdocs/langs/bs_BA/trips.lang
+++ b/htdocs/langs/bs_BA/trips.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - trips
 ExpenseReport=Expense report
-ExpenseReports=Expense reports
+ExpenseReports=Izvještaj o troškovima
 ShowExpenseReport=Show expense report
-Trips=Expense reports
+Trips=Izvještaj o troškovima
 TripsAndExpenses=Expenses reports
 TripsAndExpensesStatistics=Expense reports statistics
 TripCard=Expense report card
@@ -12,7 +12,7 @@ ListOfFees=Lista naknada
 TypeFees=Types of fees
 ShowTrip=Show expense report
 NewTrip=New expense report
-CompanyVisited=Posjeta kompaniji/fondaciji
+CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Iznos ili kilometri
 DeleteTrip=Delete expense report
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -56,7 +56,7 @@ AucuneLigne=There is no expense report declared yet
 ModePaiement=Payment mode
 
 VALIDATOR=User responsible for approval
-VALIDOR=Approved by
+VALIDOR=Odobrio
 AUTHOR=Recorded by
 AUTHORPAIEMENT=Paid by
 REFUSEUR=Denied by
@@ -66,10 +66,11 @@ MOTIF_REFUS=Razlog
 MOTIF_CANCEL=Razlog
 
 DATE_REFUS=Deny date
-DATE_SAVE=Validation date
+DATE_SAVE=Datum potvrde
 DATE_CANCEL=Cancelation date
 DATE_PAIEMENT=Datum uplate
 BROUILLONNER=Reopen
+ExpenseReportRef=Ref. expense report
 ValidateAndSubmit=Validate and submit for approval
 ValidatedWaitingApproval=Validated (waiting for approval)
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
@@ -87,5 +88,5 @@ NoTripsToExportCSV=No expense report to export for this period.
 ExpenseReportPayment=Expense report payment
 ExpenseReportsToApprove=Expense reports to approve
 ExpenseReportsToPay=Expense reports to pay
-CloneExpenseReport=Clone expese report
+CloneExpenseReport=Clone expense report
 ConfirmCloneExpenseReport=Are you sure you want to clone this expense report ?
diff --git a/htdocs/langs/bs_BA/users.lang b/htdocs/langs/bs_BA/users.lang
index be3fdad87ae..af51b0ebbf6 100644
--- a/htdocs/langs/bs_BA/users.lang
+++ b/htdocs/langs/bs_BA/users.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - users
-HRMArea=HRM area
+HRMArea=Područje upravljanja LJR
 UserCard=Korisnička kartica
 GroupCard=Grupna kartica
 Permission=Dozvola
@@ -8,33 +8,33 @@ EditPassword=Uredi šifru
 SendNewPassword=Ponovo generiši i pošalji šifru
 ReinitPassword=Ponovo generiši šifru
 PasswordChangedTo=Šifra promijenjena na: %s
-SubjectNewPassword=Your new password for %s
+SubjectNewPassword=Vaša šifra za %s
 GroupRights=Grupne dozvole
 UserRights=Korisničke dozvole
 UserGUISetup=Postavke korisničkog prikaza
-DisableUser=Iskljući
+DisableUser=Isključi
 DisableAUser=Isključi korisnika
 DeleteUser=Obrisati
 DeleteAUser=Obrisati korisnika
-EnableAUser=Uljuči korisnika
+EnableAUser=Uključi korisnika
 DeleteGroup=Obrisati
 DeleteAGroup=Obrisati grupu
-ConfirmDisableUser=Are you sure you want to disable user <b>%s</b>?
-ConfirmDeleteUser=Are you sure you want to delete user <b>%s</b>?
-ConfirmDeleteGroup=Are you sure you want to delete group <b>%s</b>?
-ConfirmEnableUser=Are you sure you want to enable user <b>%s</b>?
-ConfirmReinitPassword=Are you sure you want to generate a new password for user <b>%s</b>?
-ConfirmSendNewPassword=Are you sure you want to generate and send new password for user <b>%s</b>?
+ConfirmDisableUser=Da li ste sigurni da želite onemogućiti korisnika <b>%s</b>?
+ConfirmDeleteUser=Da li ste sigurni da želite obrisati korisnika <b>%s</b>?
+ConfirmDeleteGroup=Da li ste sigurni da želite obrisati grupu <b>%s</b>?
+ConfirmEnableUser=Da li ste sigurni da želite omogućiti korisnika <b>%s</b>?
+ConfirmReinitPassword=Da li ste sigurni da želite generisati novu šifru za korisnika <b>%s</b>?
+ConfirmSendNewPassword=Da li ste sigurni da želite generisati i poslati novu šifru za korisnika <b>%s</b>?
 NewUser=Novi korisnik
 CreateUser=Kreiraj korisnika
 LoginNotDefined=Prijava nije definisan.
 NameNotDefined=Ime nije definisano.
 ListOfUsers=Lista korisnika
 SuperAdministrator=Super Administrator
-SuperAdministratorDesc=Global administrator
+SuperAdministratorDesc=Globalni administrator
 AdministratorDesc=Administrator
 DefaultRights=Defaultne dozvole
-DefaultRightsDesc=Definišite ovdje <u>defaultne</u> dozvole koje se automatski odobravaju <u>novokreiranom</u> korisniku (Otiđite na karticdu korisnika za mijenjanje dozvola postojećeg korisnika).
+DefaultRightsDesc=Definišite ovdje <u>defaultne</u> dozvole koje se automatski odobravaju <u>novokreiranom</u> korisniku (Otiđite na karticu korisnika za mijenjanje dozvola postojećeg korisnika).
 DolibarrUsers=Dolibarr korisnici
 LastName=Prezime
 FirstName=Ime
@@ -45,33 +45,33 @@ RemoveFromGroup=Ukloni iz grupe
 PasswordChangedAndSentTo=Šifra promijenjena i poslana korisniku <b>%s</b>.
 PasswordChangeRequestSent=Zahtjev za promjenu šifre za <b>%s</b> poslana na <b>%s</b>.
 MenuUsersAndGroups=Korisnici i grupe
-LastGroupsCreated=Latest %s created groups
-LastUsersCreated=Latest %s users created
+LastGroupsCreated=Posljednjih %s napravljenih grupa
+LastUsersCreated=Posljednjih %s napravljenih korisnika
 ShowGroup=Prikaži grupu
 ShowUser=Prikaži korisnika
-NonAffectedUsers=Nedodijeljen korisnici
+NonAffectedUsers=Nedodijeljeni korisnici
 UserModified=Korisnik uspješno izmijenjen
-PhotoFile=Foto fajl
+PhotoFile=Foto datoteka
 ListOfUsersInGroup=Lista korisnika u ovoj grupi
 ListOfGroupsForUser=Popis grupa za ovog korisnika
-LinkToCompanyContact=Link to third party / contact
+LinkToCompanyContact=Link na subjekat / kontakt
 LinkedToDolibarrMember=Link na člana
 LinkedToDolibarrUser=Link na Dolibarr korisnika
-LinkedToDolibarrThirdParty=Link to Dolibarr third party
+LinkedToDolibarrThirdParty=Link na Dolibarr subjekt
 CreateDolibarrLogin=Kreiraj korisnika
-CreateDolibarrThirdParty=Create a third party
-LoginAccountDisableInDolibarr=Račun isključen u Dolibarr-u.
+CreateDolibarrThirdParty=Napravi subjekat
+LoginAccountDisableInDolibarr=Račun isključen u Dolibarru.
 UsePersonalValue=Koristite lične vrijednosti
 InternalUser=Interni korisnik
 ExportDataset_user_1=Dolibarr korisnici i svojstva
 DomainUser=Korisnik domene %s
 Reactivate=Reaktivirati
-CreateInternalUserDesc=This form allows you to create an user internal to your company/foundation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=<b>Interni</b> korisnik je dio vaše kompanije/fondacije. <b>Eksterni</b> korisnik je kupac, dobavljač ili drugo. <br><br> U oba slučaja, dozvole definišu prava na Dolibarr, također, eksterni korisnik može imati drugačiji meni menadžer od internog korisnika (pogledaj Početna->postavke->Display).
+CreateInternalUserDesc=Ovaj obrazac omogućava da se napravi interni korisnik za vašu kompaniju/organizaciju. Da biste napravili eksternog korisnika (kupca, dobavljača, ...), koristite dugme  'Napravi Dolibarr korisnika' iz kartice za kontakte subjekta.
+InternalExternalDesc= <b>Interni</b> korisnik je korisnik koji je dio vaše kompanije/organizacije.<br> <b>Vanjski</b> korisnik je kupac, dobavljač ili neko drugi.<br><br>U oba slučaja, dozvole definiraju prava u Dolibarru, također vanjski korisnik može imati drugačiji meni od internog korisnika (Vidi Početna - Postavke - Prikaz)
 PermissionInheritedFromAGroup=Dozvola je prenesena od jedne korisničke grupe.
 Inherited=Preneseno
-UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
-UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party)
+UserWillBeInternalUser=Kreirani korisnik će biti interni korisnik (jer nije povezan sa nekim subjektom)
+UserWillBeExternalUser=Napravljeni korisnik će biti vanjski korisnik (jer je povezan s određenim subjektom)
 IdPhoneCaller=Id telefonskog pozivatelja
 NewUserCreated=Korisnik %s kreiran
 NewUserPassword=Promjena šifre za %s
@@ -80,26 +80,26 @@ UserDisabled=Korisnik %s isključen
 UserEnabled=Korisnik %s aktiviran
 UserDeleted=Korisnik %s uklonjen
 NewGroupCreated=Grupa %s kreirana
-GroupModified=Group %s modified
+GroupModified=Grupa %s izmijenjena
 GroupDeleted=Grupa %s uklonjena
-ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact?
-ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member?
-ConfirmCreateThirdParty=Are you sure you want to create a third party for this member?
+ConfirmCreateContact=Da li ste sigurni da želite napraviti Dolibarr račun za ovaj kontakt?
+ConfirmCreateLogin=Da li ste sigurni da želite napraviti Dolibarr račun za ovog člana?
+ConfirmCreateThirdParty=Da li ste sigurni da želite napraviti subjekt za ovog člana?
 LoginToCreate=Kreirati login
-NameToCreate=Name of third party to create
-YourRole=Vaše uloga
+NameToCreate=Naziv subjekta za kreiranje
+YourRole=Vaše uloge
 YourQuotaOfUsersIsReached=Vaša kvota aktivnih korisnika je postignuta!
 NbOfUsers=Broj korisnika
 DontDowngradeSuperAdmin=Samo superadmin može unazaditi superadmina
-HierarchicalResponsible=Supervisor
+HierarchicalResponsible=Nadzornik
 HierarchicView=Hijerarhijski prikaz
 UseTypeFieldToChange=Koristite polja Tip za promjene
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Koristiti OpenID za login
-WeeklyHours=Weekly hours
-ColorUser=Color of the user
-DisabledInMonoUserMode=Disabled in maintenance mode
-UserAccountancyCode=User accountancy code
-UserLogoff=User logout
-UserLogged=User logged
-DateEmployment=Date of Employment
+WeeklyHours=Sedmični sati
+ColorUser=Boja korisnika
+DisabledInMonoUserMode=Onemogućeno u načinu održavanja
+UserAccountancyCode=Konto korisnika u kontnom planu
+UserLogoff=Odjava korisnika
+UserLogged=Korisnik prijavljen
+DateEmployment=Datum zaposlenja
diff --git a/htdocs/langs/bs_BA/withdrawals.lang b/htdocs/langs/bs_BA/withdrawals.lang
index c5e535030f7..75ac43d865f 100644
--- a/htdocs/langs/bs_BA/withdrawals.lang
+++ b/htdocs/langs/bs_BA/withdrawals.lang
@@ -2,11 +2,11 @@
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
 StandingOrders=Direct debit payment orders
-StandingOrder=Direct debit payment order
+StandingOrder=Direktni nalog za plaćanje
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=Za obradu
 WithdrawalsReceipts=Direct debit orders
-WithdrawalReceipt=Direct debit order
+WithdrawalReceipt=Nalog za plaćanje
 LastWithdrawalReceipts=Latest %s direct debit files
 WithdrawalsLines=Direct debit order lines
 RequestStandingOrderToTreat=Request for direct debit payment order to process
@@ -17,7 +17,7 @@ NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Iznos za podizanje
 WithdrawsRefused=Direct debit refused
-NoInvoiceToWithdraw=Nijedna fakture kupca u modu plaćanje "podizanje" nema na čekanju. Idi na tab "Podizanje" na kartici fakture da napravite zahtjev.
+NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
 ResponsibleUser=Odgovorni korisnik
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Direct debit payment statistics
@@ -41,6 +41,7 @@ RefusedReason=Razlog za odbijanje
 RefusedInvoicing=Naplate odbijanja
 NoInvoiceRefused=Ne naplatiti odbijanje
 InvoiceRefused=Invoice refused (Charge the rejection to customer)
+StatusDebitCredit=Status debit/credit
 StatusWaiting=Čekanje
 StatusTrans=Poslano
 StatusCredited=Pripisano
diff --git a/htdocs/langs/ca_ES/accountancy.lang b/htdocs/langs/ca_ES/accountancy.lang
index dd7d83bd840..85f24e647c1 100644
--- a/htdocs/langs/ca_ES/accountancy.lang
+++ b/htdocs/langs/ca_ES/accountancy.lang
@@ -26,27 +26,31 @@ InvoiceLabel=Etiqueta de factura
 OverviewOfAmountOfLinesNotBound=Visió general de quantitat de línies no comptabilitzades al compte comptable
 OverviewOfAmountOfLinesBound=Visió general de quantitat de línies ja comptabilitzades al compte comptable
 OtherInfo=Altra informació
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Àrea de comptabilitat
 AccountancyAreaDescIntro=L'ús del mòdul de comptabilitat es realitza en diverses etapes:
 AccountancyAreaDescActionOnce=Les següents accions s'executen normalment per una sola vegada, o un cop l'any ...
-AccountancyAreaDescActionOnceBis=Les properes passes es faran per a estalviar el teu temps en un futur suggerint-te el correcte compte comptable per defecte mentre escrius als llibres (Diari i Major)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=Les següents accions s'executen normalment cada mes, setmana o dia per empreses molt grans ...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=PAS %s: Crear un model de pla de comptes des del menú %s
 AccountancyAreaDescChart=PAS %s: Crear o comprovar el contingut del seu pla de comptes des del menú %s
-AccountancyAreaDescBank=PAS %s: S'ha fet la comprovació del vincle entre comptes bancaris i compte comptable. Completar els vincles que falten. Per fer això, ves a la fitxa de cada compte financer. Pots començar a partir de la pàgina %s. 
-AccountancyAreaDescVat=PAS %s: S'ha fet la comprovació del vincle entre els percentatges d'iva i compte comptable. Completar els vincles que falten. Pots posar els comptes comptables a utilitzar per a cada IVA a partir de la pàgina %s. 
-AccountancyAreaDescExpenseReport=PAS %s: S'ha fet la comprovació del vincle entre l'informe per tipus de despesa i comptes comptables. Completar els vincles que falten. Pots posar el compte a utilitzar per cada IVA a partir de la pàgina %s. 
-AccountancyAreaDescSal=PAS %s: S'ha fet la comprovació del vincle entre pagament de salaris i compte comptable. Completar els vincles que falten. Per fer això, pots utilitzar l'entrada de menú %s. 
-AccountancyAreaDescContrib=PAS %s: S'ha fet la comprovació del vincle entre despeses especials (taxes diverses) i comptes comptables. Completar els vincles que falten. Per fer això, pots utilitzar l'entrada de menú %s. 
-AccountancyAreaDescDonation=PAS %s: S'ha fet la comprovació del vincle entre donacions i compte comptable. Completar els vincles que falten. Pots posar el compte dedicat a aquest concepte a partir de l'entrada de menú %s. 
-AccountancyAreaDescMisc=PAS %s: S'ha fet la comprovació del vincle per defecte entre línies de transaccions diverses i comptes comptables. Completar els vincles que falten. Per fer això, pots utilitzar l'entrada de menú %s. 
-AccountancyAreaDescProd=PAS %s: S'ha fet la comprovació del vincle entre productes/serveis i compte comptable. Completar els vincles que falten. Per fer això, pots utilitzar l'entrada de menú %s. 
-AccountancyAreaDescLoan=PAS %s: S'ha fet la comprovació del vincle entre els pagaments de préstecs i comptes comptables. Completar els vincles que falten. Per fer això, pots utilitzar l'entrada de menú %s. 
 
-AccountancyAreaDescCustomer=PAS %s: S'ha fet la comprovació del vincle entre les línies de factures de client i comptes comptables, així l'aplicació serà capaç de registrar al llibre major amb un sol clic. Completar els vincles que falten. Per fer això, pots utilitzar l'entrada de menú %s. 
-AccountancyAreaDescSupplier=PAS %s: S'ha fet la comprovació del vincle entre les línies de factures de proveïdor i comptes comptables, així l'aplicació serà capaç de registrar al llibre major amb un sol clic. Completar els vincles que falten. Per fer això, pots utilitzar l'entrada de menú %s. 
-AccountancyAreaDescWriteRecords=PAS %s: Escriure les transaccions en el llibre major. Per a això, entra a cada Diari, i feu clic al botó de "Passar del llibre diari al major".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=PAS %s: Definir els comptes comptables per a cada banc i compte financer. Per a això, aneu a la fitxa de cada compte financer. Vostè pot comnçar a la pàgina %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=PAS %s: Afegir o editar transaccions existents i generar informes i exportacions.
 
 AccountancyAreaDescClosePeriod=PAS %s: Tancar el període de forma que no pot fer modificacions en un futur.
@@ -57,6 +61,10 @@ ChangeAndLoad=Canviar i carregar
 Addanaccount=Afegir un compte comptable
 AccountAccounting=Compte comptable
 AccountAccountingShort=Compte
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Compte comptable suggerit
 MenuDefaultAccounts=Comptes per defecte
 MenuVatAccounts=Comptes d'IVA
@@ -71,8 +79,8 @@ SuppliersVentilation=Comptabilització de factura de proveïdor
 ExpenseReportsVentilation=Comptabilització d'informes de despeses
 CreateMvts=Crea una nova transacció
 UpdateMvts=Modificació d'una transacció
-WriteBookKeeping=Passar llibre diari al llibre major
-Bookkeeping=Llibre major
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Compte saldo
 
 CAHTF=Total purchase supplier before tax
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Comença l'ordenació de la pàgina "Compt
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncar descripcions de producte i serveis en llistes de x caràcters (Millor = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncar descripcions de comptes de producte i serveis en llistes de x caràcters (Millor = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Longitud dels comptes de la Comptabilitat General
-ACCOUNTING_LENGTH_AACCOUNT=Longitud de les comptes de la comptabilitat de tercers
-ACCOUNTING_MANAGE_ZERO=Gestionar el zero al final d'un compte de comptabilitat. Necessària per alguns països. Desactivada per defecte. Si està en on, també ha d'establir els 2 següents paràmetres (o s'ignoren)
+ACCOUNTING_LENGTH_GACCOUNT=Longitud dels comptes generals (Si s'estableix el valor a 6 aquí, el compte '706' apareixerà com '706000' a la pantalla)
+ACCOUNTING_LENGTH_AACCOUNT=Longitud dels subcomptes (Si s'estableix el valor a 6 aquí, el compte '401' apareixerà com '401000' a la pantalla)
+ACCOUNTING_MANAGE_ZERO=Gestiona un nombre diferent de zero al final d'un compte comptable. Necessària per alguns països (com Suïssa). Si es manté apagat (per defecte), pot configurar els següents 2 paràmetres per a demanar a l'aplicació afegir un zero virtual.
 BANK_DISABLE_DIRECT_INPUT=Des-habilitar l'enregistrament directe de transaccions al compte bancari 
 
 ACCOUNTING_SELL_JOURNAL=Diari de venda
@@ -132,19 +140,19 @@ Sens=Significat
 Codejournal=Diari
 NumPiece=Número de peça
 TransactionNumShort=Número de transacció
-AccountingCategory=Categoria de comptabilitat
+AccountingCategory=Grups comptes contables
 GroupByAccountAccounting=Agrupar per compte comptable
 NotMatch=No definit
-DeleteMvt=Elimina línies del llibre major
+DeleteMvt=Delete Ledger lines
 DelYear=Any a eliminar
 DelJournal=Diari per esborrar
-ConfirmDeleteMvt=Això eliminarà totes les línies del llibre major per a tot un any i/o per a un específic diari. És requereix al menys un dels dos criteris.
-ConfirmDeleteMvtPartial=Això eliminarà les línies o línia seleccionada del llibre major 
-DelBookKeeping=Elimina el registre del libre major
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Informe-diari de despeses
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=Aquesta és una vista de registres que han comptabilitzat a comptes comptables de productes/serveis i que poden registrar-se al Llibre major
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Comptes comptables de IVA sense definir
 ThirdpartyAccountNotDefined=Comptes comptables de tercers (clients o proveïdors) sense definir
 ProductAccountNotDefined=Comptes comptables per al producte sense definir
@@ -156,13 +164,13 @@ NewAccountingMvt=Nova transacció
 NumMvts=Número de transacció
 ListeMvts=Llista de moviments
 ErrorDebitCredit=El dèbit i el crèdit no poden tenir valors alhora
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=Llista el compte del tercer
 DescThirdPartyReport=Consulti aquí la llista de tercers (cliente i proveïdors) i els seus corresponents comptes  comptables
 ListAccounts=Llistat dels comptes comptables
 
 Pcgtype=Classe de compte
-Pcgsubtype=Sota la classe de compte
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Marge total de vendes
@@ -186,16 +194,28 @@ AutomaticBindingDone=Comptabilització automàtica realitzada
 ErrorAccountancyCodeIsAlreadyUse=Error, no pots eliminar aquest compte comptable perquè està en ús
 MvtNotCorrectlyBalanced=Moviment no balancejat correctament. Crèdit = %s. Dèbit = %s
 FicheVentilation=Fitxa de comptabilització
-GeneralLedgerIsWritten=Les transaccions han estat escrites al llibre major
-GeneralLedgerSomeRecordWasNotRecorded=Alguna de les transaccions podria no ser gravada.
-NoNewRecordSaved=No cap nou registre guardat
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=Llista de productes no comptabilitzats en cap compte comptable
 ChangeBinding=Canvia la comptabilització
 
 ## Admin
 ApplyMassCategories=Aplica categories massives
-AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
-CategoryDeleted=Category for the accounting account has been removed
+AddAccountFromBookKeepingWithNoCategories=Afegir compte ja utilitzada sense categories
+CategoryDeleted=La categoria per al compte contable ha sigut eliminada
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Codi
+Nature=Caràcter
+AccountingJournalType1=Various operation
+AccountingJournalType2=Vendes
+AccountingJournalType3=Compres
+AccountingJournalType4=Banc
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Exportacions
@@ -211,7 +231,8 @@ Modelcsv_ciel=Exporta cap a Sage Ciel Compta o Compta Evolution
 Modelcsv_quadratus=Exporta cap a Quadratus QuadraCompta
 Modelcsv_ebp=Exporta cap a EBP
 Modelcsv_cogilog=Exporta cap a Cogilog
-ChartofaccountsId=Chart of accounts Id
+Modelcsv_agiris=Export towards Agiris (Test)
+ChartofaccountsId=Id pla comptable
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Inicialitza la comptabilitat
@@ -235,11 +256,12 @@ Calculated=Calculat
 Formula=Fórmula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=Categoria comptable no disponible per país %s (Veure Inici - Configuració - Diccionaris)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No hi ha cap grup comptable disponible per al país %s (Veure Inici - Configuració - Diccionaris)
 ExportNotSupported=El format d'exportació configurat no està suportat en aquesta pàgina
 BookeppingLineAlreayExists=Les línies ja existeixen en la comptabilitat
-
+NoJournalDefined=No journal defined
 Binded=Línies comptabilitzades
 ToBind=Línies a comptabilitzar
 
-WarningReportNotReliable=Advertència, aquest informe no es basa en el llibre major, pel que no és fiable fins a la data. Se substitueix per un informe correcte en una versió següent.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index b9e02b95adc..c5738bf9e2e 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -9,10 +9,10 @@ VersionDevelopment=Desenvolupament
 VersionUnknown=Desconeguda
 VersionRecommanded=Recomanada
 FileCheck=Comprovador de integritat de arxius
-FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. Value of some setup constants may also be checked. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=Aquesta ferramenta li permet comprobar la integritat dels arxius de l'aplicació, comparant cada arxiu amb els oficials. Es pot utilitzar aquesta ferrametna per detectar si alguns arxius han sigut modificats per un hacker per exemple.
 FileIntegrityIsStrictlyConformedWithReference=La integritat dels arxius està estrictament conforme amb la referència.
-FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+FileIntegrityIsOkButFilesWereAdded=La comprovació de la integritat dels arxius ha resultat exitosa, no obstant s'han afegit alguns arxius nous.
+FileIntegritySomeFilesWereRemovedOrModified=La comprovació d'integritat d'arxius ha fallat. Alguns arxius han sigut modificats, eliminats o afegits.
 GlobalChecksum=Checksum global
 MakeIntegrityAnalysisFrom=Fer anàlisi de la integritat dels arxius de l'aplicació de
 LocalSignature=Firma local incrustada (menys fiables)
@@ -22,7 +22,7 @@ FilesUpdated=Arxius actualitzats
 FilesModified=Fitxers modificats
 FilesAdded=Fitxers afegits
 FileCheckDolibarr=Comprovar l'integritat dels arxius de l'aplicació
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
+AvailableOnlyOnPackagedVersions=L'arxiu local per a la comprobació de integritat sols està disponible quan l'aplicació s'instal·la desde un paquet certificat
 XmlNotFound=No es troba l'arxiu xml
 SessionId=ID de sessió
 SessionSaveHandler=Modalitat de desar sessions
@@ -48,6 +48,7 @@ InternalUsers=Usuaris interns
 ExternalUsers=Usuaris externs
 GUISetup=Entorn
 SetupArea=Àrea configuració
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Formulari de prova de càrrega de fitxer (segons opcions escollides)
 IfModuleEnabled=Nota: sí només és eficaç si el mòdul <b>%s</b> està activat
 RemoveLock=Esborreu el fitxer <b>%s</b>, si existeix, per permetre la utilitat d'actualització.
@@ -85,7 +86,7 @@ Mask=Màscara
 NextValue=Pròxim valor
 NextValueForInvoices=Pròxim valor (factures)
 NextValueForCreditNotes=Pròxim valor (abonaments)
-NextValueForDeposit=Pròxim valor (dipòsit)
+NextValueForDeposit=Següent valor (bestreta)
 NextValueForReplacements=Pròxim valor (rectificatives)
 MustBeLowerThanPHPLimit=Observació: El seu PHP limita la mida a <b>%s</b> %s de màxim, qualsevol que sigui el valor d'aquest paràmetre
 NoMaxSizeByPHPLimit=Cap limitació interna en el seu servidor PHP
@@ -103,7 +104,7 @@ MenuIdParent=Id del menú pare
 DetailMenuIdParent=IDr del menú pare (buit per a un menú superior)
 DetailPosition=Número d'ordre per a la posició del menú
 AllMenus=Tots
-NotConfigured=No configurat
+NotConfigured=Module/Application not configured
 Active=Actiu
 SetupShort=Configuració
 OtherOptions=Altres opcions
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Separador milers
 Destination=Destinació
 IdModule=ID del modul
 IdPermissions=ID de permisos
-Modules=Mòduls
 LanguageBrowserParameter=Variable %s
 LocalisationDolibarrParameters=Paràmetres de localització
 ClientTZ=Zona horària client (usuari)
@@ -123,7 +123,8 @@ PHPTZ=Zona horària Servidor PHP
 DaylingSavingTime=Horari d'estiu (usuari)
 CurrentHour=Hora PHP (servidor)
 CurrentSessionTimeOut=Timeout sessió actual
-YouCanEditPHPTZ=Per definir una zona horària PHP diferent (no és necessari), provi a afegir un arxiu. Htacces amb una línia com aquesta "SetEnvTZ Europe/Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Panell
 Boxes=Panells
 MaxNbOfLinesForBoxes=Màxim número de línies per panell
@@ -189,11 +190,11 @@ FeatureAvailableOnlyOnStable=Funcionalitat disponible únicament en versions est
 Rights=Permisos
 BoxesDesc=Els panells són components que mostren alguna informació que pots afegir per personalitzar algunes pàgines. Pots triar entre mostrar el panell o no seleccionant la pàgina de destí i fent clic a 'Activa', o fent clic al cubell d'escombraries per desactivar.
 OnlyActiveElementsAreShown=Només els elements de <a href="%s"> mòduls activats</a> són mostrats
-ModulesDesc=Els mòduls Dolibarr defineixen les funcionalitats disponibles en l'aplicació. Alguns mòduls requereixen permisos que hauràs d'indicar, i després habilitar el mòdul. Fes clic en el botó On/off per habilitar un mòdul/funcionalitat.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=Pots trobar més mòduls per descarregar en pàgines web externes per internet...
-ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesDeployDesc=Si els permisos en el seu sistema d'arxius ho permiteixen, pot utilitzar aquesta ferramente per instal·lar un mòdul extern. El mòdul estarà aleshores visible en la pestanya <strong>%s</strong>
 ModulesMarketPlaces=Busca mòduls externs...
-GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
+GoModuleSetupArea=Per instal·lar un nou mòdul, vaja al àrea de configuració de mòduls en <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, el lloc oficial de mòduls complementaris per Dolibarr ERP / CRM
 DoliPartnersDesc=Llista d'empreses que proporcionen desenvolupament a mida de mòduls o funcionalitats (Nota: qualsevol empresa amb experiència amb programació PHP pot proporcionar desenvolupament a mida per un projecte de codi obert)
 WebSiteDesc=Llocs web de referència per trobar més mòduls...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Encriptar la contrasenya de la base en l'arxiu c
 InstrucToEncodePass=Per tenir la contrasenya encriptada al fitxer <b>conf.php</b> reemplaça la línia<br><b>$dolibarr_main_db_pass="...";</b><br>per<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=Per tenir la contrasenya descodificada en el fitxer de configuració <b> conf.php </b>, reemplaça en aquest fitxer la línia <br><b>$dolibarr_main_db_pass="crypted:..."</b><br> per <br><b>$dolibarr_main_db_pass="%s"</b>
 ProtectAndEncryptPdfFiles=Protecció i encriptació dels pdf generats
-ProtectAndEncryptPdfFilesDesc=La protecció d'un document pdf deixa el document lliure a la lectura ia la impressió a qualsevol lector de PDF. Per contra, la modificació i la còpia resulten impossibles.
+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=Funció
 DolibarrLicense=Llicència
 Developpers=Desenvolupadors/col·laboradors
@@ -225,6 +226,8 @@ OfficialMarketPlace=Lloc oficial de mòduls complementaris i extensions
 OfficialWebHostingService=Serveis d'allotjament web (cloud hosting)
 ReferencedPreferredPartners=Soci preferent
 OtherResources=Altres recursos
+ExternalResources=Recursos externs
+SocialNetworks=Xarxes socials
 ForDocumentationSeeWiki=Per a la documentació d'usuari, desenvolupador o Preguntes Freqüents (FAQ), consulteu el wiki Dolibarr: <br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=Per altres qüestions o realitzar les seves pròpies consultes, pot utilitzar el fòrum Dolibarr: <br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Aquesta àrea et pot ajudar a obtenir un servei de suport de Dolibarr.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=Funcionalitat no disponible en sistemes Unix. Proveu
 SubmitTranslation=Si la traducció d'aquest idioma no està completa o trobes errors, pots corregir-ho editant els arxius en el directori<b>langs/%s</b> i enviant els canvis a www.transifex.com/dolibarr-association/dolibarr/
 SubmitTranslationENUS=Si la traducció d'aquest idioma no està completa o trobes errors, pots corregir-ho editant els fitxers en el directori<b>langs/%s</b> i enviant els fitxers modificats al fòrum de www.dolibarr.es o pels desenvolupadors a github.com/Dolibarr/dolibarr.
 ModuleSetup=Configuració del mòdul
-ModulesSetup=Configuració dels mòduls
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Sistema
 ModuleFamilyCrm=Gestió client (CRM)
 ModuleFamilySrm=Gestió de seguiment de proveïdors (SRM)
@@ -287,10 +290,10 @@ DoNotUseInProduction=No utilitzar en producció
 ThisIsProcessToFollow=Aquests són els passos per al procés:
 ThisIsAlternativeProcessToFollow=Aquesta és una configuració alternativa per processar manualment:
 StepNb=Pas %s
-FindPackageFromWebSite=Cercar el paquet que respon a la seva necessitat (per exemple en el lloc web %s)
+FindPackageFromWebSite=Busca el paquet que t'ofereix les característiques que vols (per exemple en la web oficial %s)
 DownloadPackageFromWebSite=Descarrega el paquet (per exemple del lloc web oficial %s).
 UnpackPackageInDolibarrRoot=Descomprimeix els fitxers empaquetats en en el directori del servidor dedicat a Dolibarr: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+UnpackPackageInModulesRoot=Per instal·lar un mòdul extern, descomprimir l'arxiu en el directori del servidor dedicat als mòduls: <b>%s</b>
 SetupIsReadyForUse=La instal·lació del mòdul ha finalitzat. No obstant, ha d'habilitar i configurar el mòdul en la seva aplicació, aneu a la pàgina per configurar els mòduls: <a href="%s">%s</a>.
 NotExistsDirect=No s'ha definit el directori arrel alternatiu a un directori existent.<br>
 InfDirAlt=Des de la versió 3, és possible definir un directori arrel alternatiu. Això li permet emmagatzemar, en un directori dedicat, plug-ins i plantilles personalitzades.<br>Només ha de crear un directori a l'arrel de Dolibarr (per exemple: custom).<br>
@@ -300,14 +303,17 @@ CurrentVersion=Versió actual de Dolibarr
 CallUpdatePage=Ves a la pàgina que actualitza l'estructura de base de dades i les dades: %s
 LastStableVersion=Última versió estable
 LastActivationDate=Data de l'última activació
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Actualitzacións del servidor fora de línia
+WithCounter=Gestiona un comptador
 GenericMaskCodes=Podeu introduir qualsevol màscara numèrica. En aquesta màscara, pot utilitzar les següents etiquetes:<br><b>{000000}</b> correspon a un número que s'incrementa en cadascun %s. Introduïu tants zeros com longuitud desitgi mostrar. El comptador es completarà a partir de zeros per l'esquerra per tal de tenir tants zeros com la màscara. <br><b>{000000+000}</b>Igual que l'anterior, amb una compensació corresponent al número a la dreta del signe + s'aplica a partir del primer %s.<br><b>{000000@x}</b>igual que l'anterior, però el comptador es restableix a zero quan s'arriba a x mesos (x entre 1 i 12). Si aquesta opció s'utilitza i x és de 2 o superior, llavors la seqüència {yy}{mm} ó {yyyy}{mm} també és necessària.<br><b>  {dd}  </b> dies (01 a 31).<br><b> {mm}</b> mes (01 a 12).<br><b> {yy} </ b>, <b> {yyyy</ b> ó <b>{y} </b> any en 2, 4 ó 1 xifra.<br>
-GenericMaskCodes2=<b>{cccc}</b> el codi de client de n caràcters<br><b>{cccc000}</b> el codi de client en n caràcters és seguit per un comptador dedicat per al client. Aquest comptador dedicat del client es reinicia al mateix temps que el comptador global.<br><b>{tttt}</b> El codi de tipus de tercer en n caràcters (veure el diccionari de tipus de tercers).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Qualsevol altre caràcter a la màscara es quedarà sense canvis. <br> No es permeten espais<br>
-GenericMaskCodes4a=<u>Exemple a la 99ª %s del tercer L'Empresa realitzada el 31/03/2007: </u> <br>
+GenericMaskCodes4a=<u>Exemple en el 99 %s del tercer L'Empresa, amb data 31/01/2007:</u><br>
 GenericMaskCodes4b=<u>Exemple sobre un tercer creat el 31/03/2007: </u> <br>
 GenericMaskCodes4c=<u>Exemple en un producte/servei creat el 31/03/2007:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> donarà <b>ABC0703-000099</b><br><b>{0000+100@1}-XXX/{dd}/YYY</b> donarà <b>0199-XXX/31/YYY</b>
+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=Retorna un nombre creat d'acord amb una màscara definida.
 ServerAvailableOnIPOrPort=Servidor disponible a l'adreça <b>%s</b> al port <b>%s</b>
 ServerNotAvailableOnIPOrPort=Servidor no disponible en l'adreça <b>%s</b> al port <b>%s</b>
@@ -369,24 +375,26 @@ Int=Enter
 Float=Decimal
 DateAndTime=Data i hora
 Unique=Unic
-Boolean=Boleà (Casella de verificació)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Telèfon
 ExtrafieldPrice = Preu
 ExtrafieldMail = Correu
 ExtrafieldUrl = Url
 ExtrafieldSelect = Llista de selecció
 ExtrafieldSelectList = Llista de selecció de table
-ExtrafieldSeparator=Separador
+ExtrafieldSeparator=Separador (no és un camp)
 ExtrafieldPassword=Contrasenya
-ExtrafieldCheckBox=Casella de verificació
-ExtrafieldRadio=Botó de selecció excloent
-ExtrafieldCheckBoxFromList= Casella de verificació des de taula
+ExtrafieldRadio=Botons d'opció (només una opció)
+ExtrafieldCheckBox=Caselles de verificació
+ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Enllaç a un objecte
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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
+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'
+ExtrafieldParamHelpselect=El llistat de paràmetres ha de ser key,valor<br><br> per exemple:\\n<br>1,value1<br>2,value2<br>3,value3<br>...<br><br>Per a tindre una llista en funció d'atributs complementaris de llista:\n<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>Per a tindre la llista en funció d'altra:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=La llista ha de ser en forma clau, valor<br><br> per exemple : <br>1,text1<br>2,text2<br>3,text3<br>...
 ExtrafieldParamHelpradio=La llista ha de ser en forma clau, valor<br><br> per exemple : <br>1,text1<br>2,text2<br>3,text3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=Llista de paràmetres prové d'una tabla <br> Sintaxi: nombre_tabla: etiqueta_field: id_field :: filtro <br> Exemple: c_typent: libelle: id :: filtre <br> <br> filtre pot ser una prova simple (per exemple, active=1) per a mostrar sols el valor actiu <br> També pot utilitzar $ ID $ en el filtro on és el id actual del objecte actual <br> Per a fer un SELECT en el filtre utilitze $ SEL $ <br> si desitja filtrar en extrafields utilitza la sintaxi extra.fieldcode=... (on el codi del camp és el codi del extrafield) <br> <br> Per a que la llista depenga d'un altra llista d'atributs complementaris: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: filter <br> <br> Per a que la llista depenga d'un altra llista: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: filter
+ExtrafieldParamHelpchkbxlst=Llista de paràmetres que prové d'una tabla <br> Sintaxi: nombre_tabla: etiqueta_field: id_field :: filtro <br> Exemple: c_typent: libelle: id :: filtro <br> <br> filtro pot ser una prova simple (per exemple, active=1) Per a mostrar sols el valor actiu <br> Tambié pot utilitzar $ ID $ en el filtre on és el id actual del objeto actual <br> Per a fer un SELECT en el filtre utilitze $ SEL $ <br> si desitja filtrar en extrafields utilitzar la sintaxi extra.fieldcode=... (on el codi del camp és el codi del extrafield) <br> <br> Per a que la llista depenga d'un altra llista d'atributs complementaris: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: filter <br> <br> Per a que la llista depenga d'un altra lista: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: filter
 ExtrafieldParamHelplink=Els paràmetres han de ser Nom del Objecte:Url de la Clase<br>Sintàxi: Nom Object:Url Clase<br>Exemple: Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Llibreria utilitzada per generar PDF
 WarningUsingFPDF=Atenció: El seu arxiu <b>conf.php</b> conté la directiva <b>dolibarr_pdf_force_fpdf=1</b>. Això fa que s'usi la llibreria FPDF per generar els seus arxius PDF. Aquesta llibreria és antiga i no cobreix algunes funcionalitats (Unicode, transparència d'imatges, idiomes ciríl · lics, àrabs o asiàtics, etc.), Pel que pot tenir problemes en la generació dels PDF.<br> Per resoldre-ho, i disposar d'un suport complet de PDF, pot descarregar la <a href="http://www.tcpdf.org/" target="_blank"> llibreria TCPDF </a>, i a continuació comentar o eliminar la línia <b>$dolibarr_pdf_force_fpdf=1</b>, i afegir al seu lloc <b>$dolibarr_lib_TCPDF_PATH='ruta_a_TCPDF'</b>
@@ -422,6 +430,20 @@ Use3StepsApproval=Per defecte, les comandes de compra necessiten ser creades i a
 UseDoubleApproval=Utilitza una aprovació en 3 passos quan l'import (sense impostos) sigui més gran que...
 WarningPHPMail=ADVERTÈNCIA: Alguns proveïdors de correu electrònic (com Yahoo) no li permeten enviar un correu electrònic des d'un altre servidor que no sigui el servidor de Yahoo si l'adreça de correu electrònic utilitzada com a remitent és el seu correu correu electrònic de Yahoo (com myemail@yahoo.com, myemail@yahoo.fr, ...). La seva configuració actual utilitza el servidor de l'aplicació per enviar correu electrònic, de manera que alguns destinataris (compatibles amb el protocol restrictiu DMARC) li preguntaran a Yahoo si poden acceptar el seu e-mail i Yahoo respondrà "no" perquè el servidor no és un servidor Propietat de Yahoo, pel que alguns dels seus e-mails enviats poden no ser acceptats.<br>Si el proveïdor de correu electrònic (com Yahoo) té aquesta restricció, ha de canviar la configuració de correu electrònic per a triar el mètode "servidor SMTP" i introdudir el servidor SMTP i credencials proporcionades pel seu proveïdor de correu electrònic (pregunti al seu proveïdor de correu electrònic les credencials SMTP per al seu compte).
 ClickToShowDescription=Clica per mostrar la descripció
+DependsOn=Aquest mòdul necesita el/s mòdul/s
+RequiredBy=Aquest mòdul és requerit pel/s mòdul/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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Camp
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Usuaris i grups
 Module0Desc=Gestió d'usuaris / empleats i grups
@@ -444,7 +466,7 @@ Module30Desc=Gestió de factures i abonaments de clients. Gestió factures de pr
 Module40Name=Proveïdors
 Module40Desc=Gestió de proveïdors
 Module42Name=Syslog
-Module42Desc=Generació de logs (arxius, syslog,...)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Editors
 Module49Desc=Gestió d'editors
 Module50Name=Productes
@@ -499,8 +521,8 @@ Module410Name=Webcalendar
 Module410Desc=Interface amb el calendari webcalendar
 Module500Name=Pagaments especials
 Module500Desc=Gestió de despeses especials (impostos varis, dividends)
-Module510Name=Contractes d'empleats i salaris
-Module510Desc=Gestió dels contractes d'empleats, salaris i pagaments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Préstec
 Module520Desc=Gestió de préstecs
 Module600Name=Notificacions
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=Capacitats de conversió GeoIP Maxmind
 Module3100Name=Skype
 Module3100Desc=Afegeix un botó d'Skype a les fitxes dels usuaris / tercers / contactes / socis
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=RRHH
-Module4000Desc=Gestió de recursos humans
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi-empresa
 Module5000Desc=Permet gestionar diverses empreses
 Module6000Name=Workflow
@@ -591,7 +615,7 @@ Permission32=Crear/modificar productes
 Permission34=Elimina productes
 Permission36=Veure/gestionar els productes ocults
 Permission38=Exportar productes
-Permission41=Consulta projectes i tasques (els projectes compartits i els projectes en que sóc el contacte). També pots entrar els temps consumits en tasques asignades (timesheet)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Crea/modifica projectes (projectes compartits i projectes dels que sóc contacte). També pot crear tasques i assignar usuaris a projectes i tasques
 Permission44=Elimina projectes (projectes compartits i projectes dels que en sóc contacte)
 Permission45=Exporta projectes
@@ -695,7 +719,7 @@ PermissionAdvanced253=Crear/modificar usuaris interns/externs i els seus permiso
 Permission254=Crea/modifica només usuaris externs
 Permission255=Eliminar o desactivar altres usuaris
 Permission256=Consultar els seus permisos
-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 assignement matters).
+Permission262=Ampliar l'accés a tots els tercers (no sols als tercers dels quals l'usuari és comercial).<br>No efectiu per a usuaris externs (sempre limitat a ells mateix per a pressupostos, comandes, factures, contractes, etc).<br>No efectiu per a projectes (sols permisos de visió i asignació dels projectes).
 Permission271=Consultar el CA
 Permission272=Consultar les factures
 Permission273=Emetre les factures
@@ -828,7 +852,7 @@ DictionaryCurrency=Monedes
 DictionaryCivility=Títols personals i professionals
 DictionaryActions=Tipus d'esdeveniments de l'agenda
 DictionarySocialContributions=Tipus d'impostos varis
-DictionaryVAT=Taxa d'IVA (Impost sobre vendes als EEUU)
+DictionaryVAT=Taxa d'IVA o Impost de vendes
 DictionaryRevenueStamp=Imports de segells fiscals
 DictionaryPaymentConditions=Condicions de pagament
 DictionaryPaymentModes=Modes de pagament
@@ -842,14 +866,16 @@ DictionaryStaff=Empleats
 DictionaryAvailability=Temps de lliurament
 DictionaryOrderMethods=Mètodes de comanda
 DictionarySource=Orígens de pressupostos/comandes
-DictionaryAccountancyCategory=Accounting account groups
+DictionaryAccountancyCategory=Grups comptes contables
 DictionaryAccountancysystem=Models de plans comptables
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Models d'emails
 DictionaryUnits=Unitats
 DictionaryProspectStatus=Estat del client potencial
 DictionaryHolidayTypes=Tipus de dies lliures
 DictionaryOpportunityStatus=Estat de l'oportunitat pel projecte/lead
 SetupSaved=Configuració desada
+SetupNotSaved=Configuració no desada
 BackToModuleList=Retornar llista de mòduls
 BackToDictionaryList=Tornar a la llista de diccionaris
 VATManagement=Gestió IVA
@@ -921,7 +947,7 @@ Host=Servidor
 DriverType=Tipus de driver
 SummarySystem=Resum de la informació de sistemes Dolibarr
 SummaryConst=Llista de tots els paràmetres de configuració Dolibarr
-MenuCompanySetup=Empresa/Entitat
+MenuCompanySetup=Empresa/Organització
 DefaultMenuManager= Gestor del menú estàndard
 DefaultMenuSmartphoneManager=Gestor de menú smartphone
 Skin=Tema visual
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Longitud màxima per defecte per a les llistes
 DefaultMaxSizeShortList=Longitud màxima per defecte en llistes curtes (per exemple, en la fitxa de client)
 MessageOfDay=Missatge del dia
 MessageLogin=Missatge del login
+LoginPage=Pàgina de login
+BackgroundImageLogin=Imatge de fons
 PermanentLeftSearchForm=Zona de recerca permanent del menú de l'esquerra
 DefaultLanguage=Idioma per defecte a utilitzar (codi d'idioma)
 EnableMultilangInterface=Activar interface multiidioma
 EnableShowLogo=Mostra el logotip en el menú de l'esquerra
-CompanyInfo=Informació de l'empresa/entitat
-CompanyIds=Identificació de l'empresa/entitat
+CompanyInfo=Informació de l'empresa/organització
+CompanyIds=Identitats de l'empresa/organització
 CompanyName=Nom/Raó social
 CompanyAddress=Adreça
 CompanyZip=Codi postal
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerància de retard abans de l'alerta (en dies) sobr
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerància de retard abans de l'alerta (en dies) sobre xecs a ingressar
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerància de retard (en dies) abans d'alertar d'informes de despeses pendents d'aprovar
 SetupDescription1=L'àrea de configuració són pels paràmetres de configuració inicials abans de començar a utilitzar Dolibarr.
-SetupDescription2=Els 2 passos més importants de la configuració són les 2 primeres opcions del menú esquerre: la pàgina de configuració Empresa/entitat i la pàgina de configuració Mòduls:
-SetupDescription3=Els paràmetres en el menú <a href="%s">Configuració -> Empresa/entitat</a> són obligatoris ja que la informació entrada s'utilitza per mostrar pantalles de Dolibarr i per modificar el comportament de Dolibarr (per exemple per funcions relacionades amb el país).
-SetupDescription4=Els paràmetres en el menú <a href="%s">Configuració -> Mòduls</a> són obligatoris ja que Dolibarr no és un ERP/CRM monolític, és un conjunt de mòduls més o menys independent. Per cada nou mòdul que s'activi s'afegiran noves funcionalitats en els menús.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Les altres entrades de configuració gestionen paràmetres opcionals.
 LogEvents=Auditoria de la seguretat d'esdeveniments
 Audit=Auditoria
@@ -987,7 +1015,7 @@ BrowserOS=S.O. del navegador
 ListOfSecurityEvents=Llistat d'esdeveniments de seguretat Dolibarr
 SecurityEventsPurged=Esdeveniments de seguretat purgats
 LogEventDesc=Podeu habilitar el registre d'esdeveniments de seguretat Dolibarr aquí. Els administradors poden veure el seu contingut a través de menú <b>Eines del sistema->Auditoria</b>. Atenció, aquesta característica pot consumir una gran quantitat de dades a la base de dades.
-AreaForAdminOnly=Aquestes funcions només són accessibles a un usuari administrador.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=La informació del sistema és informació tècnica accessible només en només lectura als administradors.
 SystemAreaForAdminOnly=Aquesta àrea només és accessible als usuaris de tipus administradors. Cap permís Dolibarr permet estendre el cercle de usuaris autoritzats a aquesta áera.
 CompanyFundationDesc=Edita en aquesta pàgina tota la informació coneguda sobre l'empresa o entitat a administrar (Fes clic al botó "Modificar" o "Desar" a peu de pàgina)
@@ -1076,26 +1104,27 @@ TranslationOverwriteDesc=També pot reemplaçar cadenes omplint la taula següen
 TranslationOverwriteDesc2=Podeu utilitzar un altra pestanya per ajudar a saber quina clau de conversió utilitzar
 TranslationString=Cadena de traducció
 CurrentTranslationString=Cadena de traducció actual
-WarningAtLeastKeyOrTranslationRequired=Es necessita un criteri de recerca com a mínim per cadena de clau o traducció
+WarningAtLeastKeyOrTranslationRequired=Es necessita un criteri de cerca com a mínim per cadena o clau de traducció
 NewTranslationStringToShow=Nova cadena de traducció a mostrar
 OriginalValueWas=La traducció original s'ha sobreescrit. El valor original era: <br><br>%s
-TotalNumberOfActivatedModules=Número total de mòduls activats: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists in any language files
+TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Ha d'activar almenys 1 mòdul.
 ClassNotFoundIntoPathWarning=No s'ha trobat la classe %s en el seu path PHP
 YesInSummer=Sí a l'estiu
-OnlyFollowingModulesAreOpenedToExternalUsers=Només els següents moduls estan oberts a usuaris externs (segons els permisos de cada usuari)
+OnlyFollowingModulesAreOpenedToExternalUsers=Només els següents moduls estan oberts a usuaris externs (segons els permisos de cada usuari) i només si tenen permisos:
 SuhosinSessionEncrypt=Emmagatzematge de sessions xifrades per Suhosin
 ConditionIsCurrently=Actualment la condició és %s
 YouUseBestDriver=Està utilitzant el driver %s, actualment és el millor driver disponible.
 YouDoNotUseBestDriver=Està utilitzant el driver %s però és recomanat l'ús del driver %s.
 NbOfProductIsLowerThanNoPb=Té %s productes/serveis a la base de dades. No és necessària cap optimització en particular.
-SearchOptim=Cercar optimització
+SearchOptim=Cerca optimització
 YouHaveXProductUseSearchOptim=Té %s productes a la base de dades. Hauria afegir la constant PRODUCT_DONOTSEARCH_ANYWHERE a 1 a Inici-Configuració-Varis, limitant la cerca al principi de la cadena que fa possible que la base de dades usi l'índex i s'obtingui una resposta immediata.
 BrowserIsOK=Utilitza el navegador web %s. Aquest navegador està optimitzat per a la seguretat i el rendiment.
 BrowserIsKO=Utilitza el navegador web %s. Aquest navegador és una mala opció per a la seguretat, rendiment i fiabilitat. Aconsellem fer servir Firefox, Chrome, Opera o Safari.
 XDebugInstalled=XDebug està carregat.
 XCacheInstalled=XCache cau està carregat.
-AddRefInList=Mostra codi de client/proveïdor en el llistat (i selectors) i enllaços. Els tercers apareixeran amb el nom "CC12345 - SC45678 - The big comany coorp", en comptes de "The big comany coorp".
+AddRefInList=Mostra el codi de client/proveïdor en llistats (selectors o combobox) i en la majoria d'enllaços. Els tercers apareixeran amb el nom "CC12345 - SC45678 - The big company coorp", en comptes de "The big company coorp".
 AskForPreferredShippingMethod=Pregunta pel mètode d'enviament preferit pels tercers.
 FieldEdition=Edició del camp %s
 FillThisOnlyIfRequired=Exemple: +2 (Completi només si es registre una desviació del temps en l'exportació)
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Règles sobre els ID professionals
 MustBeUnique=Ha de ser únic?
 MustBeMandatory=Obligatori per a crear tercers?
 MustBeInvoiceMandatory=Obligatori per validar factures?
+TechnicalServicesProvided=Prestació de serveis tècnics
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Un vincle d'exportació del calendari en format <b>%s</b> estarà disponible a la url: %s
 ##### Invoices #####
 BillsSetup=Configuració del mòdul Factures
 BillsNumberingModule=Mòdul de numeració de factures i abonaments
 BillsPDFModules=Models de documents de factures
+PaymentsPDFModules=Payment documents models
 CreditNote=Abonament
 CreditNotes=Abonaments
 ForceInvoiceDate=Forçar la data de factura a la data de validació
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Fitxers de tipus %s no s'emmagatzemen en memòria cau pel s
 FilesOfTypeCompressed=Fitxers de tipus %s són comprimits pel servidor HTTP
 FilesOfTypeNotCompressed=Fitxers de tipus %s no són comprimits pel servidor HTTP
 CacheByServer=Memòria cau amb el servidor
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Memòria cau del navegador
 CompressionOfResources=Compressió de les respostes HTTP
+CompressionOfResourcesDesc=For exemple using the Apache directive "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=La detecció automàtica no és possible amb els navegadors actuals
+DefaultValuesDesc=You can define/force here the default value you want to get when your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Valors per defecte pels nous objectes
+DefaultSearchFilters=Filtres de cerca per defecte
+DefaultSortOrder=Tipus d'ordenació per defecte
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Configuració del mòdul Productes
 ServiceSetup=Configuració del mòdul Serveis
@@ -1397,7 +1435,7 @@ SendingsSetup=Configuració del mòdul Expedicions
 SendingsReceiptModel=Model de rebut de lliurament
 SendingsNumberingModules=Mòduls de numeració de notes de lliurament
 SendingsAbility=Suport en fulles d'expedició per entregues de clients
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
+NoNeedForDeliveryReceipts=En la majoria dels casos, les notes d'entrega (llista de productes enviats) també actua com a nota de recepció i son firmades per el client. La gestió de les notes de recepció és per tant redundant i rara vegada s'activarà.
 FreeLegalTextOnShippings=Text lliure en els enviaments
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Mòdul de numeració de rebut de lliuraments de productes
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Data de factura utilitzada
 Buy=Compra
 Sell=Venda
 InvoiceDateUsed=Data utilitzada de factura
-YourCompanyDoesNotUseVAT=L'empresa s'ha configurat com no subjecta a l'IVA (Inici - Configuració - Empresa/Entitat), per la qual cosa no hi ha opció per a la configuració de l'IVA.
+YourCompanyDoesNotUseVAT=L'empresa s'ha configurat com a no subjecta a IVA (Inici - Configuració - Empresa/Organització), per tant no hi ha opcions per configurar l'IVA.
 AccountancyCode=Codi comptable
 AccountancyCodeSell=Codi comptable vendes
 AccountancyCodeBuy=Codi comptable compres
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Establir per defecte aquest estat de esdeveniments
 AGENDA_DEFAULT_VIEW=Establir la pestanya per defecte al seleccionar el menú Agenda
 AGENDA_NOTIFICATION=Activa la notificació de events en els navegadors dels usuaris quan s'arriba a la data de l'esdeveniment (cada usuari és capaç de rebutjar-ho des de la pregunta de confirmació del navegador)
 AGENDA_NOTIFICATION_SOUND=Habilita les notificacions sonores
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Configuració del mòdul Click To Dial
-ClickToDialUrlDesc=Url executada quan es fa clic en un picto de telèfon. En la URL pots utilitzar etiquetes<br><b>__PHONETO__</b> que seran substituides amb el número de telèfon de la persona a trucar<br><b>__PHONEFROM__</b> que serà substituit pel número de telèfon de la persona que truca (el teu)<br><b>__LOGIN__</b> que serà substituit amb el teu usuari de clicktodial (definit en la teva fitxa d'usuari)<br><b>__PASS__</b> que serà substituit amb el teu password de clicktodial (definit en la teva fitxa d'usuari).
+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=Aquest mòdul permet afegir una icona després del número de telèfon de contactes Dolibarr. Un clic en aquesta icona, truca a un servidor amb un URL que s'indica a continuació. Això pot ser usat per anomenar al sistema centre de Dolibarr que pot trucar al número de telèfon en un sistema SIP, per exemple.
 ClickToDialUseTelLink=Utilitzar sols l'enllaç "tel:" als números de telèfon
 ClickToDialUseTelLinkDesc=Utilitza aquest mètode si els teus usuaris tenen un softphone o una interfície de software instal·lat en el mateix ordinador del navegador, i et truca quan fas clic en un enllaç del navegador que comença amb "tel:". Si necessites una solució amb un servidor complet (sense necessitat de instal·lació de programari en local), hauries de posar "No" i omplir el següent camp.
@@ -1509,11 +1548,11 @@ EndPointIs=Els clients SOAP hauran d'enviar les seves solicituds al punt final e
 ##### API ####
 ApiSetup=Configuració del mòdul API
 ApiDesc=Habilitant aquest mòdul, Dolibarr serà un servidor REST per oferir varis serveis web.
-ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=Pots explorar les API en la url
+ApiProductionMode=Activar el mode producció (actvarà l'ús de cachés per a la gestió dels servicis)
+ApiExporerIs=Pots explorar i provar les API en la URL
 OnlyActiveElementsAreExposed=Només s'exposen els elements de mòduls habilitats
 ApiKey=Clau per l'API
-WarningAPIExplorerDisabled=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=S'ha deshabilitat l'explorador de API. No és necessari API Explorer per a proporcionar serveis API. És una ferramenta per a que el desenvolupador trobe/probe API REST. Si necessita aquesta ferramenta, vaja a la configuració del mòdul API REST per activar-la.
 ##### Bank #####
 BankSetupModule=Configuració del mòdul Banc
 FreeLegalTextOnChequeReceipts=Text complementari en remeses de xecs
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=Ordre de visualització general
 BankOrderES=Espanyol
 BankOrderESDesc=Ordre de visualització espanyol
 ChequeReceiptsNumberingModule=Mòdul de numeració de rebut de xec
-
 ##### Multicompany #####
 MultiCompanySetup=Configuració del mòdul Multi-empresa
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ BackupDumpWizard=Asistent per crear una copia de seguretat de la base de dades
 SomethingMakeInstallFromWebNotPossible=No és possible la instal·lació de mòduls externs des de la interfície web per la següent raó:
 SomethingMakeInstallFromWebNotPossible2=Per aquesta raó, explicarem aquí els passos del procés d'actualització manual que pot realitzar un usuari amb privilegis
 InstallModuleFromWebHasBeenDisabledByFile=La instal·lació de mòduls externs des de l'aplicació es troba desactivada per l'administrador. Ha de requerir que elimini l'arxiu <strong>%s</strong> per habilitar aquesta funció
-ConfFileMuseContainCustom=Installing 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=Remarca línies de la taula quan el ratolí passi per sobre
 HighlightLinesColor=Remarca el color de la línia quan el ratolí hi passa per sobre (deixa-ho buit per a no remarcar)
 TextTitleColor=Color de títol de pàgina
 LinkColor=Color dels enllaços
-PressF5AfterChangingThis=Prem la tecla F5 o neteja la memòria del navegador un cop has canviat aquest valor per a tenir-ho disponible  
+PressF5AfterChangingThis=Prem CTRL+F5 en el teclat o neteja la memòria cau del navegador després de canviar aquest valor per fer-ho efectiu
 NotSupportedByAllThemes=Funcionarà amb els temes del nucli, però pot no estar suportat per temes externs
 BackgroundColor=Color de fons
 TopMenuBackgroundColor=Color de fons pel menú superior
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Període mínim de notificació (La solicitud de dia lliure
 NbAddedAutomatically=Número de dies afegits en comptadors d'usuaris (automàticament) cada mes
 EnterAnyCode=Aquest camp conté una referència a un identificador de línia. Introdueix qualsevol valor però sense caràcters especials.
 UnicodeCurrency=Introduïu aquí entre claus, la llista de nombre de bytes que representen el símbol de moneda. Per Exemple: per $, introdueix [36] - per als reals de Brasil R$ [82,36] - per € , introdueix [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Posició de la línia en llistes combo
 SellTaxRate=Valor de l'IVA
 RecuperableOnly=Sí per l'IVA "Non Perçue Récupérable" dedicat a algun estat a França. Mantingui el valor a "No" en els altres casos.
@@ -1612,7 +1651,7 @@ FixTZ=Fixar zona horaria
 FillFixTZOnlyIfRequired=Exemple: +2 (omple'l només si tens problemes)
 ExpectedChecksum=Checksum esperat
 CurrentChecksum=Checksum actual
-ForcedConstants=Required constant values
+ForcedConstants=Valors de constants requerits
 MailToSendProposal=Enviar pressupost de client
 MailToSendOrder=Enviar comanda de client
 MailToSendInvoice=Enviar factura de client
@@ -1621,7 +1660,7 @@ MailToSendIntervention=Enviar intervenció
 MailToSendSupplierRequestForQuotation=Enviar pressupost de proveïdor
 MailToSendSupplierOrder=Enviar comanda de proveïdor
 MailToSendSupplierInvoice=Enviar factura de proveïdor
-MailToSendContract=To send a contract
+MailToSendContract=Per a enviar un contracte
 MailToThirdparty=Per enviar correu electrònic des de la pàgina del tercer
 ByDefaultInList=Mostra per defecte en la vista del llistat
 YouUseLastStableVersion=Estàs utilitzant l'última versió estable
@@ -1658,8 +1697,12 @@ SamePriceAlsoForSharedCompanies=Si utilitzes el mòdul Multiempresa, amb l'elecc
 ModuleEnabledAdminMustCheckRights=S'ha activat el mòdul. Els permisos per als mòdul(s) activats es donen només als usuaris administradors. Podria ser necessari concedir permisos a altres usuaris o grups de forma manual si és necessari.
 UserHasNoPermissions=Aquest usuari no té permisos definits
 TypeCdr=Utilitze "Cap" si la data de termini de pagament és la data de la factura més un delta en dies (delta és el camp "Nº de dies")<br>Utilitze "A final de mes", si, després del delta, la data ha d'aumentar-se per arribar a final de mes (+ "Offset" opcional en dies)<br>Utilitze "Actual/Següent" per tindre la data de termini de pagament sent el primer N de cada mes (N es guarda en el camp "Nº de dies")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuració del mòdul Recurs
-UseSearchToSelectResource=Utilitzar un formulari de recerca per a seleccionar un recurs (millor que una llista desplegable)
+UseSearchToSelectResource=Utilitza un formulari de cerca per a seleccionar un recurs (millor que una llista desplegable)
 DisabledResourceLinkUser=Recurs d'enllaç a usuari deshabilitat
 DisabledResourceLinkContact=Recurs d'enllaç a contacte deshabilitat
diff --git a/htdocs/langs/ca_ES/agenda.lang b/htdocs/langs/ca_ES/agenda.lang
index 967b252e9de..0e2f931a2dc 100644
--- a/htdocs/langs/ca_ES/agenda.lang
+++ b/htdocs/langs/ca_ES/agenda.lang
@@ -48,12 +48,13 @@ InvoiceDeleteDolibarr=Factura %s eliminada
 InvoicePaidInDolibarr=Factura %s passada a pagada
 InvoiceCanceledInDolibarr=Factura %s cancel·lada
 MemberValidatedInDolibarr=Soci %s validat
+MemberModifiedInDolibarr=Soci %s modificat
 MemberResiliatedInDolibarr=Membre %s acabat
 MemberDeletedInDolibarr=Soci %s eliminat
 MemberSubscriptionAddedInDolibarr=Subscripció del soci %s afegida
 ShipmentValidatedInDolibarr=Expedició %s validada
-ShipmentClassifyClosedInDolibarr=Entrega %s classificada com a facturada
-ShipmentUnClassifyCloseddInDolibarr=Entrega %s classificada com a reoberta
+ShipmentClassifyClosedInDolibarr=Expedició %s classificada com a facturada
+ShipmentUnClassifyCloseddInDolibarr=Expedició %s classificada com a reoberta
 ShipmentDeletedInDolibarr=Expedició %s eliminada
 OrderCreatedInDolibarr=Comanda %s creada
 OrderValidatedInDolibarr=Comanda %s validada
@@ -75,6 +76,7 @@ ProposalDeleted=Pressupost esborrat
 OrderDeleted=Comanda esborrada
 InvoiceDeleted=Factura esborrada
 ##### End agenda events #####
+AgendaModelModule=Plantilles de documents per esdeveniments
 DateActionStart=Data d'inici
 DateActionEnd=Data finalització
 AgendaUrlOptions1=Podeu també afegir aquests paràmetres al filtre de sortida:
diff --git a/htdocs/langs/ca_ES/compta.lang b/htdocs/langs/ca_ES/compta.lang
index b3932e98e5e..6e3a8ecbd22 100644
--- a/htdocs/langs/ca_ES/compta.lang
+++ b/htdocs/langs/ca_ES/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Els imports obtinguts es calculen segons
 Param=Configuració
 RemainingAmountPayment=Import restant del pagament :
 Account=Compte
-Accountparent=Arrel del compte
-Accountsparent=Arrel dels comptes
+Accountparent=Compte pare
+Accountsparent=Comptes pare
 Income=Ingressos
 Outcome=Despeses
 ReportInOut=Resultat / Exercici
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Impostos i càrregues
 MenuSocialContributions=Impostos varis
 MenuNewSocialContribution=Nou impost varis
 NewSocialContribution=Nou impost varis
+AddSocialContribution=Afegeix un impost varis
 ContributionsToPay=Impostos varis a pagar
 AccountancyTreasuryArea=Àrea comptabilitat/tresoreria
 NewPayment=Nou pagament
@@ -82,7 +83,7 @@ LT2PaymentES=Pagament IRPF
 LT2PaymentsES=Pagaments IRPF
 VATPayment=Pagament d'impost de vendes
 VATPayments=Pagaments d'impost de vendes
-VATRefund=Sales tax refund
+VATRefund=Devolució IVA
 Refund=Devolució
 SocialContributionsPayments=Pagaments d'impostos varis
 ShowVatPayment=Veure pagaments IVA
@@ -169,7 +170,7 @@ DescSellsJournal=Diari de vendes
 DescPurchasesJournal=Diari de compres
 InvoiceRef=Ref. factura
 CodeNotDef=No definit
-WarningDepositsNotIncluded=Les factures de bestreta encara no estan incloses en aquesta versió en el mòdul de comptabilitat.
+WarningDepositsNotIncluded=Les factures de bestreta no estan incloses en aquesta versió amb aquest mòdul de comptabilitat.
 DatePaymentTermCantBeLowerThanObjectDate=La data límit de pagament no pot ser inferior a la data de l'objecte
 Pcg_version=Models de pla de comptes
 Pcg_type=Tipus de compte
@@ -189,8 +190,10 @@ AccountancyJournal=Codi comptable diari
 ACCOUNTING_VAT_SOLD_ACCOUNT=Compte comptable per defecte per a IVA repercutit - IVA a les vendes (utilitzat si no ha estat definit al diccionari de IVA)
 ACCOUNTING_VAT_BUY_ACCOUNT=Compte comptable per defecte per a IVA suportat - IVA a les compres (utilitzat si no ha estat definit al diccionari de IVA)
 ACCOUNTING_VAT_PAY_ACCOUNT=Compte comptable per defecte per IVA pagat
-ACCOUNTING_ACCOUNT_CUSTOMER=Compte comptable per defecte per a clients (utilitzat si no definit a la fitxa de tercers) 
-ACCOUNTING_ACCOUNT_SUPPLIER=Compte comptable per defecte per a proveïdor (utilitzat si no definit a la fitxa de tercers)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Duplica un impost varis
 ConfirmCloneTax=Confirma la duplicació del pagament de l'impost varis
 CloneTaxForNextMonth=Clonar-la pel pròxim mes
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Impostos varis
 ImportDataset_tax_vat=Pagaments IVA
 ErrorBankAccountNotFound=Error: no s'ha trobat el compte bancari
 FiscalPeriod=Període comptable
+ListSocialContributionAssociatedProject=Llista de contribucions socials associades al projecte
diff --git a/htdocs/langs/ca_ES/contracts.lang b/htdocs/langs/ca_ES/contracts.lang
index bc110b7a58a..087193d0acb 100644
--- a/htdocs/langs/ca_ES/contracts.lang
+++ b/htdocs/langs/ca_ES/contracts.lang
@@ -83,6 +83,8 @@ NoteListOfYourExpiredServices=Aquest llistat només conté els serveis de contra
 StandardContractsTemplate=Plantilla de contracte Standard
 ContactNameAndSignature=Per %s, nom i signatura:
 OnlyLinesWithTypeServiceAreUsed=Només les línies amb tipus "Servei" seran clonades.
+CloneContract=Clona el contracte
+ConfirmCloneContract=Are you sure you want to clone the contract <b>%s</b>?
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Agent comercial signant del contracte
diff --git a/htdocs/langs/ca_ES/cron.lang b/htdocs/langs/ca_ES/cron.lang
index bf086981b51..64a2f019ae2 100644
--- a/htdocs/langs/ca_ES/cron.lang
+++ b/htdocs/langs/ca_ES/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Elimina les tasques programades
 CronConfirmDelete=Vols eliminar aquests treballs programats?
 CronExecute=Llança la tasca programada
 CronConfirmExecute=Esteu segur que voleu executar aquestes tasques programades ara?
-CronInfo=Tasques programades li permet executar tasques que han sigut programades
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Tasca
 CronNone=Ningún
 CronDtStart=No abans
@@ -35,7 +35,7 @@ CronDtLastLaunch=Data d'inici de l'última execució
 CronDtLastResult=Data del final de l'última execució
 CronFrequency=Freqüència
 CronClass=Classe
-CronMethod=Mètod
+CronMethod=Mètode
 CronModule=Mòdul
 CronNoJobs=Sense treballs actualment
 CronPriority=Prioritat
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Activar
 CronStatusInactiveBtn=Desactivar
 CronTaskInactive=Aquesta tasca es troba desactivada
 CronId=Id
-CronClassFile=Classe (arxiu)
-CronModuleHelp=Nombre del directorio del módulo Dolibarr (funciona automáticamente con los módulos externos Dolibarr). <BR> Por ejemplo para llamar al método fetch del objeto Product de Dolibarr /htdocs/<u>product</u>/class/product.class.php, el valor del módulo es <i>product</i>
-CronClassFileHelp=El archivo archivo que contiene el objeto. <BR> Por ejemplo para llamar el método fetch del objeto Product de Dolibarr /htdocs/product/class/<u>product.class.php</u>, el valor de la clase es <i>product.class.php</i>
-CronObjectHelp=El nombre del objeto a crear. <BR> Por ejemplo para llamar el método fetch del objeto Product de Dolibarr /htdocs/product/class/product.class.php, el valor del objeto es <i>Product</i>
-CronMethodHelp=El método a lanzar. <BR> Por ejemplo para llamar el método fetch del objeto Product de Dolibarr  /htdocs/product/class/product.class.php, el valor del método es <i>fecth</i>
-CronArgsHelp=Los argumentos del método. <BR> Por ejemplo para usar el método fetch del objeto Product deDolibarr /htdocs/product/class/product.class.php, el valor del parámetro podría ser <i>0, RefProduit</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=El comando del sistema a executar
 CronCreateJob=Crear nova tasca programada
 CronFrom=De
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Ves a menú "Inici - Utilitats de sistema - Tasq
 JobDisabled=Tasca desactivada
 MakeLocalDatabaseDumpShort=Còpia de seguretat de la base de dades local
 MakeLocalDatabaseDump=Crea un bolcat de base de dades local
-WarningCronDelayed=Atenció, per motius de rendiment, qualsevol tasca activa prevista per la propera execució, es pot retardar fins a un màxim de %s hores abans de començar a executar-se.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang
index e9bdf1d8183..3d5fa68b252 100644
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@@ -11,13 +11,15 @@ ErrorLoginAlreadyExists=El login %s ja existeix.
 ErrorGroupAlreadyExists=El grup %s ja existeix.
 ErrorRecordNotFound=Registre no trobat
 ErrorFailToCopyFile=Error al copiar l'arxiu '<b>%s</b>' a '<b>%s</b>'.
-ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCopyDir=Error al copiar el directori '<b>%s</b>' en '<b>%s</b>'.
 ErrorFailToRenameFile=Error al renomenar l'arxiu '<b>%s</b>' a '<b>%s</b>'.
 ErrorFailToDeleteFile=Error al suprimir el fitxer '<b>%s</b>'.
 ErrorFailToCreateFile=Error al crear l'arxiu  '<b>%s</b>'
 ErrorFailToRenameDir=Error al renomenar la carpeta '<b>%s</b>' a '<b>%s</b>'.
 ErrorFailToCreateDir=Error al crear la carpeta '<b>%s</b>'
 ErrorFailToDeleteDir=Error en eliminar la carpeta '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=Aquest contacte ja està definit com a contacte per a aquest tipus.
 ErrorCashAccountAcceptsOnlyCashMoney=Aquesta compte bancari és de tipus caixa i només accepta el mètode de pagament de tipus <b>espècie</b>.
 ErrorFromToAccountsMustDiffers=El compte origen i destinació han de ser diferents.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=No es pot escriure a la carpeta %s
 ErrorFoundBadEmailInFile=Trobada sintaxi incorrecta en email a %s línies en fitxer (exemple linia %s amb email=%s)
 ErrorUserCannotBeDelete=No es pot eliminar l'usuari. És possible que estigui relacionat amb entitats de Dolibarr.
 ErrorFieldsRequired=No s'han indicat alguns camps obligatoris
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Error en la creació d'una carpeta. Comprovi que l'usuari del servidor web té drets d'escriptura en les carpetes de documents de Dolibarr. Si el paràmetre <b>safe_mode</b> està actiu en aquest PHP, Comproveu que els fitxers php dolibarr pertanyen a l'usuari del servidor web.
 ErrorNoMailDefinedForThisUser=E-Mail no definit per a aquest usuari
 ErrorFeatureNeedJavascript=Aquesta funcionalitat requereix javascript actiu per funcionar. Modifiqueu en configuració->entorn.
@@ -114,9 +117,9 @@ ErrorQtyForCustomerInvoiceCantBeNegative=La quantitat a les línies de factures
 ErrorWebServerUserHasNotPermission=El compte d'execució del servidor web <b>%s</b> no disposa dels permisos per això
 ErrorNoActivatedBarcode=No hi ha activat cap tipus de codi de barres
 ErrUnzipFails=No s'ha pogut descomprimir el fitxer %s amb ZipArchive
-ErrNoZipEngine=En aquest PHP no hi ha motor per descomprimir l'arxiu %s
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=El fitxer %s ha de ser un paquet Dolibarr en format zip
-ErrorModuleFileRequired=You must select a Dolibarr module package file
+ErrorModuleFileRequired=Ha de seleccionar un arxiu del paquet del mòdul de Dolibarr
 ErrorPhpCurlNotInstalled=L'extensió PHP CURL no es troba instal·lada, és indispensable per dialogar amb Paypal.
 ErrorFailedToAddToMailmanList=S'ha produït un error en intentar afegir un registre a la llista Mailman o base de dades SPIP
 ErrorFailedToRemoveToMailmanList=Error en l'eliminació de %s de la llista Mailmain %s o base SPIP
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=Sense variable global seleccionada
 ErrorFieldMustBeANumeric=El camp <b>%s</b> ha de ser un valor numèric
 ErrorMandatoryParametersNotProvided=Paràmetre/s obligatori/s no definits
 ErrorOppStatusRequiredIfAmount=S'estableix una quantitat estimada per aquesta oportunitat/prospecte. Així que també has d'introduir el seu estat
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Definició incorrecta del menú Array en el descriptor del mòdul (valor incorrecte per a la clau fk_menu)
 ErrorSavingChanges=Hi ha hagut un error al salvar els canvis
 ErrorWarehouseRequiredIntoShipmentLine=El magatzem és obligatori en la línia a enviar
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=No hi ha suficient estoc del product
 ErrorStockIsNotEnoughToAddProductOnProposal=No hi ha suficient estoc del producte %s per afegir-ho en un nou pressupost
 ErrorFailedToLoadLoginFileForMode=No s'ha pogut obtenir la clau d'inici de sessió pel mode '%s'.
 ErrorModuleNotFound=No s'ha trobat el fitxer del mòdul.
-ErrorFieldAccountNotDefinedForBankLine=Valor pel compte comptable no definit per la línia del banc d'origen %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, el nom del comunicat del banc deu de seguir la regla de sintaxis %s
 ErrorPhpMailDelivery=Comproveu que no faci servir un nombre massa alt de destinataris i que el seu contingut de correu electrònic no sigui similar a un Spam. Demani també al seu administrador que verifiqui el tallafocs i els arxius dels registres del servidor per obtenir una informació més completa.
 ErrorUserNotAssignedToTask=L'usuari ha d'estar assignat a la tasca per poder introduir el temps consumit.
 ErrorTaskAlreadyAssigned=La tasca també està assignada a l'usuari
-ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
-ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorModuleFileSeemsToHaveAWrongFormat=Pareix que el mòdul té un format incorrecte.
+ErrorFilenameDosNotMatchDolibarrPackageRules=El nom de l'arxiu del mòdul (<strong>%s</strong>) no coincideix amb la sintaxi del nom esperat: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, nom de disparador %s duplicat. Ja es troba carregat des de %s. 
+ErrorNoWarehouseDefined=Error, no hi ha magatzems definits.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # Warnings
 WarningPasswordSetWithNoAccount=S'ha indicat una contrasenya per aquest soci. En canvi, no s'ha creat cap compte d'usuari, de manera que aquesta contrasenya s'ha desat però no pot ser utilitzada per entrar a Dolibarr. Es pot utilitzar per un mòdul/interfície extern, però si no cal definir cap usuari i contrasenya per un soci, pots deshabilitar la opció "Gestiona l'entrada per tots els socis" des de la configuració del mòdul Socis. Si necessites gestionar una entrada sense contrasenya, pots mantenir aquest camp buit i permetre aquest avís. Nota: El correu electrònic es pot utilitzar per entrar si el soci està enllaçat a un usuarí
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=La data de pagament (%s) és anterior a l
 WarningTooManyDataPleaseUseMoreFilters=Massa dades (més de %s línies). Utilitza més filtres o indica la constant %s amb un límit superior.
 WarningSomeLinesWithNullHourlyRate=Algunes vegades es van registrar per alguns usuaris quan no s'havia definit el seu preu per hora. Es va utilitzar un valor de 0 %s per hora, però això pot resultar una valoració incorrecta del temps dedicat.
 WarningYourLoginWasModifiedPleaseLogin=El teu login s'ha modificat. Per seguretat has de fer login amb el nou login abans de la següent acció.
+WarningAnEntryAlreadyExistForTransKey=Ja existeix una entrada per la clau de traducció d'aquest idioma
diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index fe83f52309b..77f929e7d0d 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=Parámetre %s no definit
 ErrorUnknown=Error desconegut
 ErrorSQL=Error de SQL
 ErrorLogoFileNotFound=El arxiu logo '%s' no es troba
-ErrorGoToGlobalSetup=Ves a la configuració 'Empresa/Entitat' per corregir-ho
+ErrorGoToGlobalSetup=Ves a la configuració 'Empresa/Organització' per corregir-ho
 ErrorGoToModuleSetup=Ves a la configuració del mòdul per corregir-ho
 ErrorFailedToSendMail=Error en l'enviament de l'e-mail (emissor =%s, destinatairo =%s)
 ErrorFileNotUploaded=El fitxer no s'ha pogut transferir
@@ -153,6 +153,7 @@ Edit=Editar
 Validate=Validar
 ValidateAndApprove=Validar i aprovar
 ToValidate=A validar
+NotValidated=No validat
 Save=Desa
 SaveAs=Desa com
 TestConnection=Provar la connexió
@@ -166,8 +167,8 @@ CopyOf=Còpia de
 Show=Veure
 Hide=Ocult
 ShowCardHere=Veure la fitxa aquí
-Search=Cercar
-SearchOf=Cerca de
+Search=Cerca
+SearchOf=Cerca
 Valid=Validar
 Approve=Aprovar
 Disapprove=Desaprovar
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=No s'ha pogut desconnectar amb el mètode de autenti
 Connection=Connexió
 Setup=Configuració
 Alert=Alerta
+MenuWarnings=Alertes
 Previous=Anterior
 Next=Següent
 Cards=Fitxes
@@ -308,6 +310,7 @@ Copy=Copiar
 Paste=Pegar
 Default=Defecte
 DefaultValue=Valor per defecte
+DefaultValues=Valors per defecte
 Price=Preu
 UnitPrice=Preu unitari
 UnitPriceHT=Preu base
@@ -321,7 +324,7 @@ AmountInvoice=Import factura
 AmountPayment=Import pagament
 AmountHTShort=Base imp.
 AmountTTCShort=Import
-AmountHT=Base imponible
+AmountHT=Base imposable
 AmountTTC=Import total
 AmountVAT=Import IVA
 MulticurrencyAlreadyPaid=Ja pagat, moneda original
@@ -343,7 +346,7 @@ SubTotal=Subtotal
 TotalHTShort=Import
 TotalHTShortCurrency=Import (en divisa)
 TotalTTCShort=Total
-TotalHT=Base imponible
+TotalHT=Base imposable
 TotalHTforthispage=Base imposable a la pagina
 Totalforthispage=Total per aquesta pàgina
 TotalTTC=Total
@@ -363,7 +366,8 @@ VATRate=Taxa IVA
 Average=Mitja
 Sum=Suma
 Delta=Diferència
-Module=Mòdul
+Module=Module/Application
+Modules=Modules/Applications
 Option=Opció
 List=Llistat
 FullList=Llista completa
@@ -387,7 +391,7 @@ ActionRunningNotStarted=No començat
 ActionRunningShort=En progrés
 ActionDoneShort=Acabat
 ActionUncomplete=Incomplet
-CompanyFoundation=Empresa/Entitat
+CompanyFoundation=Empresa/Organització
 ContactsForCompany=Contactes d'aquest tercer
 ContactsAddressesForCompany=Contactes/adreces d'aquest tercer
 AddressesForCompany=Adreces d'aquest tercer
@@ -405,8 +409,9 @@ Generate=Generar
 Duration=Duració
 TotalDuration=Duració total
 Summary=Resum
-DolibarrStateBoard=Estadístiques
-DolibarrWorkBoard=Indicadors de treball
+DolibarrStateBoard=Estadístiques de base de dades
+DolibarrWorkBoard=Taula de control de indicadors oberts
+NoOpenedElementToProcess=No opened element to process
 Available=Disponible
 NotYetAvailable=Encara no disponible
 NotAvailable=No disponible
@@ -434,7 +439,7 @@ Reportings=Informes
 Draft=Esborrany
 Drafts=Esborranys
 Validated=Validat
-Opened=Obert
+Opened=Actiu
 New=Nou
 Discount=Descompte
 Unknown=Desconegut
@@ -453,6 +458,7 @@ NextStep=Següent pas
 Datas=Dades
 None=Res
 NoneF=Ninguna
+NoneOrSeveral=Cap o diversos
 Late=Retard
 LateDesc=El retard que defineix si un registre arriba tard o no depèn de la configuració. Pregunti al seu administrador per canviar de retard des del menú Inici - Configuració - Alertes.
 Photo=Foto
@@ -606,7 +612,8 @@ PartialWoman=Parcial
 TotalWoman=Total
 NeverReceived=Mai rebut
 Canceled=Anul·lada
-YouCanChangeValuesForThisListFromDictionarySetup=Pot canviar aquestos valors al menú configuració->diccionaris
+YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu Setup - Dictionaries
+YouCanChangeValuesForThisListFrom=You can change values for this list from menu %s
 YouCanSetDefaultValueInModuleSetup=Pots indicar el valor per defecte utilitzat en la creació de nous registres en el mòdul de configuració
 Color=Color
 Documents=Documents
@@ -642,6 +649,7 @@ FreeLineOfType=Tipus de zona lliure
 CloneMainAttributes=Clonar l'objecte amb aquests atributs principals
 PDFMerge=Fussió PDF
 Merge=Fussió
+DocumentModelStandardPDF=Plantilla PDF estàndard
 PrintContentArea=Mostrar pàgina d'impressió de la zona central
 MenuManager=Gestor de menú
 WarningYouAreInMaintenanceMode=Atenció, està en mode manteniment, així que només el login <b>%s</b> està autoritzat per utilitzar l'aplicació en aquest moment.
@@ -708,6 +716,7 @@ from=de
 toward=cap a
 Access=Accés
 SelectAction=Selecciona acció
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Utilitzeu Ctrl+C per copiar al portapapers
 SaveUploadedFileWithMask=Desa el fitxer al servidor amb el nom "<strong>%s</strong>" (del contrari "%s")
 OriginFileName=Nom original de l'arxiu
@@ -718,7 +727,7 @@ ViewPrivateNote=Veure notes
 XMoreLines=%s línia(es)  oculta(es)
 PublicUrl=URL pública
 AddBox=Afegir quadre
-SelectElementAndClickRefresh=Seleccioneu un element i feu clic a Actualitza
+SelectElementAndClick=Select an element and click %s
 PrintFile=%s arxius a imprimir
 ShowTransaction=Mostra la transacció en el compte bancari
 GoIntoSetupToChangeLogo=Ves a Inici - Configuració - Empresa per canviar el logo o ves a Inici - Configuració - Entorn per ocultar-lo.
@@ -734,8 +743,8 @@ Hello=Hola
 Sincerely=Sincerament
 DeleteLine=Elimina la línia
 ConfirmDeleteLine=Esteu segur de voler eliminar aquesta línia ?
-NoPDFAvailableForDocGenAmongChecked=No hi havia PDF disponibles per la generació de document entre els registres validats.
-TooManyRecordForMassAction=S'ha seleccionat massa registres per a l'acció massiva. L'acció està restringida a una llista de %s registres.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No s'han seleccionat registres
 MassFilesArea=Àrea de fitxers generats per accions massives
 ShowTempMassFilesArea=Mostra l'àrea de fitxers generats per accions massives
@@ -755,11 +764,20 @@ Calendar=Calendari
 GroupBy=Agrupat per...
 ViewFlatList=Veure llista plana
 RemoveString=Eliminar cadena '%s'
-SomeTranslationAreUncomplete=Alguns idiomes poden estar traduïts parcialment o poden tenir errors. Si detectes alguns, pots arreglar els arxius d'idiomes registrant-te a <a href="http://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Enllaç de descàrrega directa
 Download=Descarrega
 ActualizeCurrency=Actualitza el canvi de divisa
 Fiscalyear=Any fiscal
+ModuleBuilder=Creador de mòdul
+SetMultiCurrencyCode=Set currency
+BulkActions=Accions massives
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Calculat automàticament
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Dilluns
 Tuesday=Dimarts
@@ -796,7 +814,7 @@ Select2NotFound=No s'han trobat resultats
 Select2Enter=Entrar
 Select2MoreCharacter=o més caràcter
 Select2MoreCharacters=o més caràcters
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharactersMore=<strong>Sintaxi de búsqueda:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Qualsevol caracter</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd>Començar amb</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd>Acabar amb </kbd> (ab$)<br />
 Select2LoadingMoreResults=Carregant més resultats
 Select2SearchInProgress=Busqueda en progrés...
 SearchIntoThirdparties=Tercers
@@ -817,5 +835,3 @@ SearchIntoContracts=Contractes
 SearchIntoCustomerShipments=Enviaments de client
 SearchIntoExpenseReports=Informes de despeses
 SearchIntoLeaves=Dies lliures
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/ca_ES/members.lang b/htdocs/langs/ca_ES/members.lang
index 9a439f4b0c8..fddf6160b79 100644
--- a/htdocs/langs/ca_ES/members.lang
+++ b/htdocs/langs/ca_ES/members.lang
@@ -7,7 +7,7 @@ Members=Socis
 ShowMember=Mostra la fitxa de soci
 UserNotLinkedToMember=Usuari no enllaçat a un soci
 ThirdpartyNotLinkedToMember=Tercer no enllaçat a un soci
-MembersTickets=Tiquets de socis
+MembersTickets=Etiquetes de socis
 FundationMembers=Socis de l'entitat
 ListOfValidatedPublicMembers=Llistat de socis públics validats
 ErrorThisMemberIsNotPublic=Aquest soci no és públic
@@ -47,7 +47,7 @@ MemberStatusActive=Validat (en espera d'afiliació)
 MemberStatusActiveShort=Validat
 MemberStatusActiveLate=Afiliació no al dia
 MemberStatusActiveLateShort=No al dia
-MemberStatusPaid=Afiliació al dia
+MemberStatusPaid=Afiliacions al dia
 MemberStatusPaidShort=Al dia
 MemberStatusResiliated=Soci donat de baixa
 MemberStatusResiliatedShort=Baixa
@@ -90,6 +90,7 @@ PublicMemberList=Llistat públic de socis
 BlankSubscriptionForm=Formulari públic d'auto-inscripció
 BlankSubscriptionFormDesc=Dolibarr pot proporcionar una URL de pàgina pública perquè els visitants externs demanin afiliar-se. Si es troba actiu un mòdul de pagament en línia, es proposarà automàticament un formulari de pagament.
 EnablePublicSubscriptionForm=Activar el formulari públic d'auto-inscripció
+ForceMemberType=Força el tipus de soci
 ExportDataset_member_1=Socis i quotes
 ImportDataset_member_1=Socis
 LastMembersModified=Últims %s socis modificats
@@ -135,7 +136,7 @@ LinkToGeneratedPagesDesc=Aquesta pantalla li permet generar fitxers PDF amb els
 DocForAllMembersCards=Generació de targetes per a tots els socis
 DocForOneMemberCards=Generació de targetes per a un soci en particular
 DocForLabels=Generació d'etiquetes d'adreces (Format de plantilla configurat actualment: <b>%s</b>)
-SubscriptionPayment=Pagament quota
+SubscriptionPayment=Pagament de quota
 LastSubscriptionDate=Data de l'última afiliació
 LastSubscriptionAmount=Últim import de subscripció
 MembersStatisticsByCountries=Estadístiques de socis per país
@@ -150,6 +151,7 @@ MembersByTownDesc=Aquesta pantalla presenta una estadística del nombre de socis
 MembersStatisticsDesc=Tria les estadístiques que vols consultar...
 MenuMembersStats=Estadístiques
 LastMemberDate=Data de l'últim soci
+LatestSubscriptionDate=Data de l'última afiliació
 Nature=Caràcter
 Public=Informació pública
 NewMemberbyWeb=S'ha afegit un nou soci. A l'espera d'aprovació
diff --git a/htdocs/langs/ca_ES/other.lang b/htdocs/langs/ca_ES/other.lang
index 79bdd3ee161..76e61d80865 100644
--- a/htdocs/langs/ca_ES/other.lang
+++ b/htdocs/langs/ca_ES/other.lang
@@ -3,12 +3,25 @@ SecurityCode=Codi de seguretat
 NumberingShort=N°
 Tools=Utilitats
 TMenuTools=Utilitats
-ToolsDesc=Totes les útilitats vàries no incloses en altres entrades de menú estan recollides aquí.<br /><br />Totes les utilitats es poden trobar en el menú de l'esquerra.
+ToolsDesc=En aquest apartat es recullen les utilitats diverses no incloses en altres entrades de menú.<br /><br />Totes les utilitats es poden trobar en el menú de l'esquerra.
 Birthday=Aniversari
 BirthdayDate=Data d'aniversari
 DateToBirth=Data de naixement
 BirthdayAlertOn=alerta aniversari activada
 BirthdayAlertOff=alerta aniversari desactivada
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Mes (text) de la data de factura
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Any de la data de factura
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Contacte afegit a la intervenció
 Notify_FICHINTER_VALIDATE=Validació fitxa intervenció
 Notify_FICHINTER_SENTBYMAIL=Enviament fitxa intervenció per e-mail
@@ -61,16 +74,17 @@ PredefinedMailTestHtml=Això és un e-mail de <b>prova</b> (la paraula prova ha
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nAquí tens la factura __REF__\n\n__PERSONALIZED__Salutacions\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nVolem comentar que no hem rebut cap notificació de la factura __REF__ que indiqui que ha estat pagada. És per això que li adjuntem de nou la factura com a recordatori.\n\n__PERSONALIZED__Salutacions\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nLi adjuntem el pressupost __PROPREF__\n\n__PERSONALIZED__Cordialment\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nLi adjuntem la sol·licitud de preus __ASKREF__\n\n__PERSONALIZED__Cordialment\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nLi adjuntem la comanda __ORDERREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nLi adjuntem la nostre comanda __ORDERREF__\n\n__PERSONALIZED__Cordialment\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nAquí tens la factura __REF__\n\n__PERSONALIZED__Salutacions\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nLi adjuntem l'enviament __SHIPPINGREF__\n\n__PERSONALIZED__Cordialment\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nLi adjuntem l'intervenció __FICHINTERREF__\n\n__PERSONALIZED__Cordialment\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
+DemoDesc=Dolibarr és un ERP/CRM per a la gestió de negocis (professionals o associacions), compost de mòduls funcionals independents i opcionals. Una demostració que incloga tots aquests mòduls no té sentit perquè no utilitzarà tots els mòduls al mateix temps. Per això, hi han disponibles diferents tipus de perfils de demostració.
 ChooseYourDemoProfil=Selecciona el perfil de demo que cobreixi millor les teves necessitats...
-ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
+ChooseYourDemoProfilMore=o construeix el teu perfil<br>(selecció de mòduls manual)
 DemoFundation=Gestió de socis d'una entitat
 DemoFundation2=Gestió de socis i tresoreria d'una entitat
 DemoCompanyServiceOnly=Empresa o autònom només amb venda de serveis
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=El mode d'autenticació és <b>%s</b>.
 EnableGDLibraryDesc=Instala o habilita la llibreria GD en la teva instal·lació PHP per poder utilitzar aquesta opció.
 ProfIdShortDesc=<b>Prof Id %s </b> és una informació que depèn del país del tercer. <br>Per exemple, per al país <b>%s</b>, és el codi <b>%s</b>.
 DolibarrDemo=Demo de Dolibarr ERP/CRM
-StatsByNumberOfUnits=Estadístiques en nombre d'unitats de producte/servei
-StatsByNumberOfEntities=Estadístiques en nombre d'identitats referents
-NumberOfProposals=Número de pressupostos en els passats 12 mesos
-NumberOfCustomerOrders=Número de comandes de client en els passats 12 mesos
-NumberOfCustomerInvoices=Número de factures de client en els passats 12 mesos
-NumberOfSupplierProposals=Número de pressupostos de proveïdor en els passats 12 mesos
-NumberOfSupplierOrders=Número de comandes de proveïdor en els passats 12 mesos
-NumberOfSupplierInvoices=Número de factures de proveïdor en els passats 12 mesos
-NumberOfUnitsProposals=Nombre d'unitats en pressupostos en els darrers 12 mesos
-NumberOfUnitsCustomerOrders=Nombre d'unitats en comandes a clients en els darrers 12 mesos
-NumberOfUnitsCustomerInvoices=Nombre d'unitats en factures a clients en els darrers 12 mesos
-NumberOfUnitsSupplierProposals=Número d'unitats en pressupostos de proveïdor en els passats 12 mesos
-NumberOfUnitsSupplierOrders=Número d'unitats en comandes de proveïdor en els passats 12 mesos
-NumberOfUnitsSupplierInvoices=Nombre d'unitats en factures de proveïdors en els darrers 12 mesos
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Número de pressupostos
+NumberOfCustomerOrders=Número de comandes de client
+NumberOfCustomerInvoices=Número de factures de client
+NumberOfSupplierProposals=Número de pressupostos de proveïdor
+NumberOfSupplierOrders=Número de comandes de proveïdor
+NumberOfSupplierInvoices=Número de factures de proveïdor
+NumberOfUnitsProposals=Número d'unitats en pressupostos
+NumberOfUnitsCustomerOrders=Número d'unitats en comandes de client
+NumberOfUnitsCustomerInvoices=Número d'unitats en factures de client
+NumberOfUnitsSupplierProposals=Número d'unitats en pressupostos de proveïdor
+NumberOfUnitsSupplierOrders=Número d'unitats en comandes de proveïdor
+NumberOfUnitsSupplierInvoices=Número d'unitats en factures de proveïdor
 EMailTextInterventionAddedContact=La nova intervenció %s t'ha sigut assignada.
 EMailTextInterventionValidated=Fitxa intervenció %s validada
 EMailTextInvoiceValidated=Factura %s validada
diff --git a/htdocs/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang
index 74e659272d0..b4a9a340d75 100644
--- a/htdocs/langs/ca_ES/projects.lang
+++ b/htdocs/langs/ca_ES/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Àrea de projectes
 ProjectStatus=Estat el projecte
 SharedProject=Projecte compartit
 PrivateProject=Contactes del projecte
+ProjectsImContactFor=Projects I'm explicitely a contact of
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=Tots els projectes
 MyProjectsDesc=Aquesta vista està limitada als projectes en que estàs com a contacte afectat (per a qualsevol tipus).
 ProjectsPublicDesc=Aquesta vista mostra tots els projectes en els que vostè té dret a tenir visibilitat.
 TasksOnProjectsPublicDesc=Aquesta vista mostra totes les tasques en projectes en els que tens permisos de lectura.
@@ -23,6 +26,7 @@ TasksDesc=Aquesta vista mostra tots els projectes i tasques (les sevas autoritza
 AllTaskVisibleButEditIfYouAreAssigned=Totes les tasques de cada projecte són visibles, però només pots entrar les hores per les tasques que tens assignades. Assigna't tasques si vols afegir-hi les hores.
 OnlyYourTaskAreVisible=Només són visibles les tasques que tens assignades. Assigna't tasques si no són visibles i vols afegir-hi les hores.
 ImportDatasetTasks=Tasques de projectes
+ProjectCategories=Etiquetes de projecte
 NewProject=Nou projecte
 AddProject=Crear projecte
 DeleteAProject=Eliminar un projecte
@@ -31,12 +35,13 @@ ConfirmDeleteAProject=Vols eliminar aquest projecte?
 ConfirmDeleteATask=Vols eliminar aquesta tasca?
 OpenedProjects=Projectes oberts
 OpenedTasks=Tasques obertes
-OpportunitiesStatusForOpenedProjects=Quantitat d'oportunitats de projectes oberts per estat
+OpportunitiesStatusForOpenedProjects=Import d'oportunitats de projectes oberts per estat
 OpportunitiesStatusForProjects=Import d'oportunitats de projectes per estat
 ShowProject=Veure projecte
 SetProject=Indica el projecte
 NoProject=Cap projecte definit
 NbOfProjects=Nº de projectes
+NbOfTasks=Nº de tasques
 TimeSpent=Temps dedicat
 TimeSpentByYou=Temps dedicat per vostè
 TimeSpentByUser=Temps dedicat per usuari
@@ -49,7 +54,7 @@ TaskTimeNote=Nota
 TaskTimeDate=Data
 TasksOnOpenedProject=Tasques en projectes oberts
 WorkloadNotDefined=Càrrega de treball no definida
-NewTimeSpent=Nou temps dedicat
+NewTimeSpent=Temps dedicat
 MyTimeSpent=El meu temps dedicat
 Tasks=Tasques
 Task=Tasca
@@ -59,6 +64,7 @@ TaskDescription=Descripció de tasca
 NewTask=Nova tasca
 AddTask=Crear tasca
 AddTimeSpent=Crea temps dedicat
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Activitat
 Activities=Tasques/activitats
 MyActivities=Les meves tasques/activitats
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=Llista de plantilles de factures de clie
 ListSupplierOrdersAssociatedProject=Llista de comandes a proveïdors associades al projecte
 ListSupplierInvoicesAssociatedProject=Llista de factures a proveïdors associades al projecte
 ListContractAssociatedProject=Llistatde contractes associats al projecte
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=Llistat d'intervencions associades al projecte
 ListExpenseReportsAssociatedProject=Llistat d'informes de despeses associades al projecte
 ListDonationsAssociatedProject=Llistat de donacions associades al projecte
@@ -96,12 +103,13 @@ ValidateProject=Validar projecte
 ConfirmValidateProject=Vols validar aquest projecte?
 CloseAProject=Tancar projecte
 ConfirmCloseAProject=Vols tancar aquest projecte?
-AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
+AlsoCloseAProject=Tancar també el projecte (mantindre obert si encara necessita seguir les tasques de producció en ell)
 ReOpenAProject=Reobrir projecte
 ConfirmReOpenAProject=Vols reobrir aquest projecte?
 ProjectContact=Contactes projecte
 ActionsOnProject=Esdeveniments del projecte
 YouAreNotContactOfProject=Vostè no és contacte d'aquest projecte privat
+UserIsNotContactOfProject=L'usuari no és un contacte d'aquest objecte privat
 DeleteATimeSpent=Elimina el temps dedicat
 ConfirmDeleteATimeSpent=Estàs segur que vols suprimir aquest temps emprat?
 DoNotShowMyTasksOnly=Veure també tasques no assignades a mi
@@ -110,7 +118,7 @@ TaskRessourceLinks=Recursos
 ProjectsDedicatedToThisThirdParty=Projectes dedicats a aquest tercer
 NoTasks=Cap tasca per a aquest projecte
 LinkedToAnotherCompany=Enllaçat a una altra empresa
-TaskIsNotAffectedToYou=Tasca no assignada a vostè
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=El temps dedicat està buit
 ThisWillAlsoRemoveTasks=Aquesta operació també destruirà les tasques del projecte (<b>%s</b> tasques en aquest moment) i tots els seus temps dedicats.
 IfNeedToUseOhterObjectKeepEmpty=Si els elements (factura, comanda, ...) pertanyen a un tercer que no és el seleccionat, havent aquests estar lligats al projecte a crear, deixeu buit per permetre el projecte a multi-tercers.
@@ -161,21 +169,26 @@ FirstAddRessourceToAllocateTime=Associa un recurs d'usuari per reservar el temps
 InputPerDay=Entrada per dia
 InputPerWeek=Entrada per setmana
 InputPerAction=Entrada per acció
-TimeAlreadyRecorded=Temps dedicat ja registrat per aquesta tasca/dia i usuari %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projectes amb aquest usuari com a contacte
 TasksWithThisUserAsContact=Tasques asignades a l'usuari
 ResourceNotAssignedToProject=No assignat a cap projecte
 ResourceNotAssignedToTheTask=No assignat a la tasca
+TasksAssignedTo=Tasques assignades a
 AssignTaskToMe=Assignar-me una tasca
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Assigna
 ProjectOverview=Informació general
 ManageTasks=Utilitza els projectes per seguir tasques i temps
 ManageOpportunitiesStatus=Utilitza els projectes per seguir oportunitats
 ProjectNbProjectByMonth=Nº de projectes creats per mes
+ProjectNbTaskByMonth=Nº de tasques creades per mes
 ProjectOppAmountOfProjectsByMonth=Import d'oportunitats per mes
 ProjectWeightedOppAmountOfProjectsByMonth=Quantitat ponderada d'oportunitats per mes
 ProjectOpenedProjectByOppStatus=Projectes oberts per estats d'oportunitat
 ProjectsStatistics=Estadístiques en projectes/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Tasca assignada. És possible entrar els temps en aquesta tasca.
 IdTaskTime=Id de temps de tasca
 YouCanCompleteRef=Si vols completar la referència amb més informació (per utilitzar-la als filtres de cerca), es recomana afegir el caràcter - per separar-ho, així la numeració automàtica funcionarà correctament pels propers projectes. Per exemple %s-ABC. També pots preferir afegir claus de cerca en l'etiqueta. Però la millor pràctica pot ser afegir un camp dedicat, també anomenat Atributs complementaris.
diff --git a/htdocs/langs/ca_ES/resource.lang b/htdocs/langs/ca_ES/resource.lang
index 3a6f8da7941..40dec371160 100644
--- a/htdocs/langs/ca_ES/resource.lang
+++ b/htdocs/langs/ca_ES/resource.lang
@@ -29,3 +29,8 @@ RessourceSuccessfullyDeleted=Recurs eliminat correctament
 DictionaryResourceType=Tipus de recurs
 
 SelectResource=Seleccionar recurs
+
+IdResource=Id resource
+AssetNumber=Número de serie
+ResourceTypeCode=Resource type code
+ImportDataset_resource_1=Recursos
diff --git a/htdocs/langs/ca_ES/stocks.lang b/htdocs/langs/ca_ES/stocks.lang
index 4c918d4e46a..06def4d849e 100644
--- a/htdocs/langs/ca_ES/stocks.lang
+++ b/htdocs/langs/ca_ES/stocks.lang
@@ -42,7 +42,7 @@ LabelMovement=Etiqueta del moviment
 NumberOfUnit=Nombre de peces
 UnitPurchaseValue=Preu de compra unitari
 StockTooLow=Estoc insuficient
-StockLowerThanLimit=L'estoc és menor que el límit de l'alerta
+StockLowerThanLimit=L'estoc és menor que el límit de l'alerta (%s)
 EnhancedValue=Valor
 PMPValue=Valor (PMP)
 PMPValueShort=PMP
@@ -62,16 +62,19 @@ DeStockOnShipment=Disminueix l'estoc real al validar l'enviament
 DeStockOnShipmentOnClosing=Disminueix els estocs reals en tancar l'expedició
 ReStockOnBill=Incrementar els estocs físics sobre les factures/abonaments de proveïdors
 ReStockOnValidateOrder=Incrementar els estocs físics sobre les comandes a proveïdors
-ReStockOnDispatchOrder=Incrementa els estocs físics en el desglossament manual de la recepció de les comandes a proveïdors en els magatzems
+ReStockOnDispatchOrder=Augmenta els estocs reals en l'entrega manual als magatzems, després de la recepció dels productes de la comanda proveïdor
 OrderStatusNotReadyToDispatch=La comanda encara no està o no té un estat que permeti un desglossament d'estoc.
-StockDiffPhysicTeoric=Motiu de la diferència entre valors físics i teòrics
+StockDiffPhysicTeoric=Motiu de la diferència entre l'estoc físic i virtual
 NoPredefinedProductToDispatch=No hi ha productes predefinits en aquest objecte. Per tant no es pot realitzar un desglossament d'estoc.
 DispatchVerb=Desglossar
 StockLimitShort=Límit per l'alerta
 StockLimit=Estoc límit per les alertes
 PhysicalStock=Estoc físic
 RealStock=Estoc real
+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=Estoc virtual
+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, ...)
 IdWarehouse=Id. magatzem
 DescWareHouse=Descripció magatzem
 LieuWareHouse=Localització magatzem
@@ -116,7 +119,7 @@ NbOfProductBeforePeriod=Quantitat del producte %s en estoc abans del periode sel
 NbOfProductAfterPeriod=Quantitat del producte %s en estoc despres del periode seleccionat (> %s)
 MassMovement=Moviments en massa
 SelectProductInAndOutWareHouse=Seleccioni un producte, una quantitat, un magatzem origen i un magatzem destí, seguidament faci clic "%s". Una vegada seleccionats tots els moviments, faci clic en "%s".
-RecordMovement=Registrar transferencies
+RecordMovement=Record transfer
 ReceivingForSameOrder=Recepcions d'aquesta comanda
 StockMovementRecorded=Moviments d'estoc registrat
 RuleForStockAvailability=Regles de requeriment d'estoc
@@ -143,3 +146,50 @@ ProductStockWarehouseUpdated=Estoc límit per llançar una alerta i estoc òptim
 ProductStockWarehouseDeleted=S'ha eliminat correctament el límit d'estoc per alerta i l'estoc òptim desitjat.
 AddNewProductStockWarehouse=Posar nou estoc límit per alertar i nou estoc òptim desitjat
 AddStockLocationLine=Decrementa quantitat i a continuació fes clic per afegir un altre magatzem per aquest producte
+InventoryDate=Inventory date
+NewInventory=New inventory
+inventorySetup = Inventory Setup
+inventoryCreatePermission=Create new inventory
+inventoryReadPermission=View inventories
+inventoryWritePermission=Update inventories
+inventoryValidatePermission=Validate inventory
+inventoryTitle=Inventory
+inventoryListTitle=Inventories
+inventoryListEmpty=No inventory in progress
+inventoryCreateDelete=Create/Delete inventory
+inventoryCreate=Create new
+inventoryEdit=Edita
+inventoryValidate=Validat
+inventoryDraft=En servei
+inventorySelectWarehouse=Warehouse choice
+inventoryConfirmCreate=Crear
+inventoryOfWarehouse=Inventory for warehouse : %s
+inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryMvtStock=By inventory
+inventoryWarningProductAlreadyExists=This product is already into list
+SelectCategory=Filtre per categoria
+SelectFournisseur=Supplier filter
+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 mouvment have date of inventory
+inventoryChangePMPPermission=Allow to change PMP value for a product
+ColumnNewPMP=New unit PMP
+OnlyProdsInStock=Do not add product without stock
+TheoricalQty=Theorique qty
+TheoricalValue=Theorique qty
+LastPA=Last BP
+CurrentPA=Curent BP
+RealQty=Qtat. real
+RealValue=Valor real
+RegulatedQty=Regulated Qty
+AddInventoryProduct=Add product to inventory
+AddProduct=Afegir
+ApplyPMP=Apply PMP
+FlushInventory=Flush inventory
+ConfirmFlushInventory=Confirmes aquesta acció?
+InventoryFlushed=Inventory flushed
+ExitEditMode=Exit edition
+inventoryDeleteLine=Elimina la línia
+RegulateStock=Regulate Stock
+ListInventory=Llistat
diff --git a/htdocs/langs/cs_CZ/accountancy.lang b/htdocs/langs/cs_CZ/accountancy.lang
index bbe888dfbf6..28a0a58805e 100644
--- a/htdocs/langs/cs_CZ/accountancy.lang
+++ b/htdocs/langs/cs_CZ/accountancy.lang
@@ -1,112 +1,120 @@
 # Dolibarr language file - en_US - Accounting Expert
 ACCOUNTING_EXPORT_SEPARATORCSV=Oddělovač sloupců pro export souboru
 ACCOUNTING_EXPORT_DATE=Formát data pro export souboru
-ACCOUNTING_EXPORT_PIECE=Export the number of piece
-ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account
-ACCOUNTING_EXPORT_LABEL=Export label
-ACCOUNTING_EXPORT_AMOUNT=Export amount
-ACCOUNTING_EXPORT_DEVISE=Export currency
-Selectformat=Select the format for the file
-ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
-ThisService=This service
-ThisProduct=This product
-DefaultForService=Default for service
-DefaultForProduct=Default for product
-CantSuggest=Can't suggest
-AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
+ACCOUNTING_EXPORT_PIECE=Exportovat počet kusů
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export s globálním účtem
+ACCOUNTING_EXPORT_LABEL=Exportovat štítek
+ACCOUNTING_EXPORT_AMOUNT=Exportovat částku
+ACCOUNTING_EXPORT_DEVISE=Export měny
+Selectformat=Vyberte formát souboru
+ACCOUNTING_EXPORT_PREFIX_SPEC=Určete předponu pro název souboru
+ThisService=Tato služba
+ThisProduct=Tento výrobek
+DefaultForService=Výchozí nastavení pro službu
+DefaultForProduct=Výchozí produkt
+CantSuggest=Nelze navrhnout
+AccountancySetupDoneFromAccountancyMenu=Většina nastavení účetnictví se provádí z nabídky %s
 ConfigAccountingExpert=Konfigurace modulu účetního experta
 Journalization=Journalization
 Journaux=Deníky
 JournalFinancial=Finanční deníky
 BackToChartofaccounts=Návrat účtové osnovy
 Chartofaccounts=Graf účtů
-CurrentDedicatedAccountingAccount=Current dedicated account
-AssignDedicatedAccountingAccount=New account to assign
-InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
-OtherInfo=Other information
+CurrentDedicatedAccountingAccount=Aktuální vyhrazený účet
+AssignDedicatedAccountingAccount=Nový účet přiřadit
+InvoiceLabel=faktura štítek
+OverviewOfAmountOfLinesNotBound=Přehled množství linek není vázán na účetnictví účtu
+OverviewOfAmountOfLinesBound=Přehled množství linek již vázán na účetnictví účtu
+OtherInfo=Jiná informace
+DeleteCptCategory=Odebrat účtování účet ze skupiny
+ConfirmDeleteCptCategory=Jste si jisti, že chcete odstranit tento účetní účet ze skupiny účetního účtu?
 
-AccountancyArea=Accountancy area
-AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
-AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
-AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
-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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
+AccountancyArea=Oblast účetnictví
+AccountancyAreaDescIntro=Využití evidence modulu se provádí v několika kroku:
+AccountancyAreaDescActionOnce=Tyto akce jsou obvykle prováděny pouze jednou, nebo jednou za rok ...
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionFreq=Tyto akce jsou proto zpravidla prováděny každý měsíc, týden nebo den pro velmi velké společnosti ...
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
-AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
+AccountancyAreaDescChartModel=STEP %s: Vytvořte model účtové osnovy z menu %s
+AccountancyAreaDescChart=STEP %s: Vytvořte nebo zkontrolovat obsah grafu účtu z menu %s
 
-AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=KROK %s: Definovat účetní účty pro každou banku a finančních účtů. Za tímto účelem přejděte na kartu každého finančního účtu. Můžete začít od strana %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
+AccountancyAreaDescAnalyze=KROK %s: Přidat nebo upravit stávající transakce a generovat reporty a exporty.
+
+AccountancyAreaDescClosePeriod=KROK %s: Uzavřené období, takže nemůžeme udělat změny v budoucnosti.
 
 MenuAccountancy=Účetnictví
-Selectchartofaccounts=Select active chart of accounts
-ChangeAndLoad=Change and load
+Selectchartofaccounts=Vybrat aktivní účtové osnovy
+ChangeAndLoad=Změna a load
 Addanaccount=Přidat účetní účet
 AccountAccounting=Účetní účet
 AccountAccountingShort=Účet
-AccountAccountingSuggest=Accounting account suggested
-MenuDefaultAccounts=Default accounts
-MenuVatAccounts=Vat accounts
-MenuTaxAccounts=Tax accounts
-MenuExpenseReportAccounts=Expense report accounts
-MenuLoanAccounts=Loan accounts
-MenuProductsAccounts=Product accounts
-ProductsBinding=Products accounts
-Ventilation=Binding to accounts
-CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Supplier invoice binding
-ExpenseReportsVentilation=Expense report binding
-CreateMvts=Create new transaction
-UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=Hlavní účetní kniha
-AccountBalance=Account balance
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Zobrazit účetní deník
+AccountAccountingSuggest=Účetní účet navrhl
+MenuDefaultAccounts=výchozí účty
+MenuVatAccounts=Účty DPH
+MenuTaxAccounts=daňové účty
+MenuExpenseReportAccounts=Náklady zpráva účty
+MenuLoanAccounts=úvěrových účtů
+MenuProductsAccounts=produktové účty
+ProductsBinding=Produkty účty
+Ventilation=Vazba na účetní závěrky
+CustomersVentilation=Zákazník faktura závazná
+SuppliersVentilation=Dodavatelská faktura je závazná
+ExpenseReportsVentilation=Náklady zpráva vázání
+CreateMvts=Vytvořit novou transakci
+UpdateMvts=Modifikace transakce
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
+AccountBalance=Zůstatek na účtu
 
-CAHTF=Total purchase supplier before tax
-TotalExpenseReport=Total expense report
-InvoiceLines=Lines of invoices to bind
-InvoiceLinesDone=Bound lines of invoices
-ExpenseReportLines=Lines of expense reports to bind
-ExpenseReportLinesDone=Bound lines of expense reports
-IntoAccount=Bind line with the accounting account
+CAHTF=Celkový nákup dodavatele před zdaněním
+TotalExpenseReport=Celkové náklady zpráva
+InvoiceLines=Řádky faktury, které mají být prověřeny
+InvoiceLinesDone=Prověřené řádky faktury
+ExpenseReportLines=Linky výkazů výdajů navázat
+ExpenseReportLinesDone=Vázané linie vyúčtování výdajů
+IntoAccount=Prověřit řádky v účetním účtu
 
 
-Ventilate=Bind
-LineId=Id line
-Processing=Dřu jako kůň  .....
-EndProcessing=Process terminated.
+Ventilate=Prověřit
+LineId=id řádku
+Processing=Dřu jako kůň  ..... sorry jako .......
+EndProcessing=Proces ukončen.
 SelectedLines=Vybrané řádky
 Lineofinvoice=Řádky faktury
-LineOfExpenseReport=Line of expense report
-NoAccountSelected=No accounting account selected
-VentilatedinAccount=Binded successfully to the accounting account
-NotVentilatedinAccount=Not bound to the accounting account
-XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
-XLineFailedToBeBinded=%s products/services were not bound to any accounting account
+LineOfExpenseReport=Zpráva o výdajích
+NoAccountSelected=Není vybrán žádný účetní účet
+VentilatedinAccount=Úspěšně prověření v účetním účtu
+NotVentilatedinAccount=Neprověřeno v účetním účtu
+XLineSuccessfullyBinded=%s produkty / služby úspěšně vázána k účetnímu účtu
+XLineFailedToBeBinded=%s produkty / služby nebyly vázány na kterémkoli účetním účtu
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Počet prvků pro kontrolu zobrazených na stránce (maximální doporučeno: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Zahájit třídění na stránce „Provést prověření“ nejnovějšími prvky
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Zahájit třídění na stránce „Prověření hotovo“ od nejnovějších prvků
 
-ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
-BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
+ACCOUNTING_LENGTH_DESCRIPTION=Zkrátit popis  produktů a služeb v seznamech po x znaků (Nejlepší = 50)
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Zkrátit popis výrobků & účtu služeb formu výpisů po x znaků (Nejlepší = 50)
+ACCOUNTING_LENGTH_GACCOUNT=Délka znaků obecných účetních účtů (Nastavíte-li zde hodnotu 6, bude účet ‚706‘ zobrazovat jako ‚706000‘)
+ACCOUNTING_LENGTH_AACCOUNT=Délka účtů třetích stran (Nastavíte-li zde hodnotu 6, bude účet ‚401‘ zobrazovat jako ‚401000‘)
+ACCOUNTING_MANAGE_ZERO=Umožňují řídit jiný počet nulu na konci účetního účtu. Zapotřebí v některých zemích (jako Švýcarsko). -Li se držet off (výchozí), můžete nastavit 2 následující parametry požádat aplikace přidat virtuální nula.
+BANK_DISABLE_DIRECT_INPUT=Zakázat přímé nahrávání transakce v bankovním účtu
 
 ACCOUNTING_SELL_JOURNAL=Prodejní deník
 ACCOUNTING_PURCHASE_JOURNAL=Nákupní deník
@@ -114,14 +122,14 @@ ACCOUNTING_MISCELLANEOUS_JOURNAL=Ostatní deník
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Rozšířený výpis deníku
 ACCOUNTING_SOCIAL_JOURNAL=Sociální deník
 
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
-ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
-DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Účtování v převodním účtu
+ACCOUNTING_ACCOUNT_SUSPENSE=Čekající účet
+DONATION_ACCOUNTINGACCOUNT=Účtování účet registrovaných darů
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Účetní účet ve výchozím nastavení pro zakoupené výrobky (použít, pokud není definován v listu produktu)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Účetní účet ve výchozím nastavení pro prodané produkty (použít, pokud není definován v listu produktu)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Účetní účet ve výchozím nastavení pro zakoupené služby (použít, pokud není definován v servisním listu)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Účetní účet ve výchozím nastavení pro prodané služby (použít, pokud není definován v servisním listu)
 
 Doctype=Typ dokumentu
 Docdate=Datum
@@ -130,72 +138,84 @@ Code_tiers=Třetí strana
 Labelcompte=Štítek účtu
 Sens=Sens
 Codejournal=Deník
-NumPiece=Piece number
-TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
-GroupByAccountAccounting=Group by accounting account
-NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
-DelYear=Year to delete
-DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
-FinanceJournal=Finance journal
-ExpenseReportsJournal=Expense reports journal
-DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
-VATAccountNotDefined=Account for VAT not defined
-ThirdpartyAccountNotDefined=Account for third party not defined
-ProductAccountNotDefined=Account for product not defined
-FeeAccountNotDefined=Account for fee not defined
-BankAccountNotDefined=Account for bank not defined
+NumPiece=počet kusů
+TransactionNumShort=Num. transakce
+AccountingCategory=Skupiny účetnictví účtů
+GroupByAccountAccounting=Skupina účetním účtu
+NotMatch=Nenastaveno
+DeleteMvt=Delete Ledger lines
+DelYear=Odstrannění roku
+DelJournal=Journal odstranit
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
+FinanceJournal=Finanční deník
+ExpenseReportsJournal=Výdajové zprávy journal
+DescFinanceJournal=Finanční deník včetně všech typů plateb prostřednictvím bankovního účtu
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
+VATAccountNotDefined=Účet pro DPH není definován
+ThirdpartyAccountNotDefined=Účet pro třetí stranu není definováno
+ProductAccountNotDefined=Účet pro výrobek není definován
+FeeAccountNotDefined=Účet za poplatek není definováno
+BankAccountNotDefined=Účet pro banku není definováno
 CustomerInvoicePayment=Platba zákaznické faktury
 ThirdPartyAccount=Účet třetí strany
-NewAccountingMvt=New transaction
-NumMvts=Numero of transaction
-ListeMvts=List of movements
+NewAccountingMvt=nová transakce
+NumMvts=Číslo transakce
+ListeMvts=Seznam pohybů
 ErrorDebitCredit=Debetní a kreditní nemůže mít hodnotu ve stejnou dobu
-
-ReportThirdParty=List third party account
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+AddCompteFromBK=Přidat účetní účty do skupiny
+ReportThirdParty=Seznam účtů třetí strany
+DescThirdPartyReport=Konzultujte zde seznam třetích stran, zákazníky a dodavateli a jejich účetní účty
 ListAccounts=Seznam účetních účtů
 
 Pcgtype=Třída účtu
-Pcgsubtype=Podle třídy účtu
+Pcgsubtype=Subclass of account
 
-TotalVente=Total turnover before tax
+TotalVente=Celkový obrat před zdaněním
 TotalMarge=Celkové tržby marže
 
-DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
-DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
-DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
-ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
+DescVentilCustomer=Zde naleznete seznam zákaznických fakturačních řádků vázaných (nebo nikoliv) na účet účetnictví produktu
+DescVentilMore=Ve většině případů, pokud používáte předdefinované produkty nebo služby a nastavíte číslo účtu na výrobek / služebního průkazu, žádost bude schopen provést všechny vazby mezi svými faktuře řádky a účetní evidence grafu účtů jen v jedno kliknutí na tlačítko <strong> "%s" </ strong>. Je-li účet nebyl nastaven na výrobku / služby karty, nebo pokud má stále některé řádky není vázán na jiný účet, budete muset provést ruční vazby z menu „<strong> %s </ strong>“.
+DescVentilDoneCustomer=Seznamte se zde se seznamem řádků faktur zákazníků a jejich účetních účtů
+DescVentilTodoCustomer=Prověřit fakturační řádky, které již nejsou vázány účtem účetnictví produktu
+ChangeAccount=Změnit výrobek/službu na účetnm účtu ve vybraných řádcích s následujícím účetním účtem:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Poraďte se zde se seznamem linek faktur dodavatele a jejich účetních účtů
-DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
-DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
-DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
-DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
+DescVentilSupplier=Konzultujte zde seznam řádků dodavatelské faktury vázaných nebo nevázaných na účetní produkt účtu
+DescVentilDoneSupplier=Konzultujte zde seznam řádků faktur dodavatele a jejich účetnho účtu
+DescVentilTodoExpenseReport=Bind zpráva náklad linky již nejsou vázány s účetním poplatek účtu
+DescVentilExpenseReport=Zde si přečtěte seznam výkazů výdajů vázaných (nebo ne) na účty účtování poplatků
+DescVentilExpenseReportMore=Máte-li nastavit účtování účtu na typ zprávy náklady linek, bude aplikace moci provádět všechny vazby mezi vaše náklady sestavy linek a účetní evidence grafu účtů jen jedním kliknutím pomocí tlačítka <strong> „%s“ </ strong>. Je-li účet nebyl nastaven na poplatcích slovníku nebo pokud má stále některé řádky není vázán na jiný účet, budete muset provést ruční vazby z menu „<strong> %s </ strong>“.
+DescVentilDoneExpenseReport=Poraďte se zde seznam v souladu se zprávami výdajů a jejich poplatků účtování účtu
 
-ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+ValidateHistory=Ověřit automaticky
+AutomaticBindingDone=Automatická vazba provádí
 
 ErrorAccountancyCodeIsAlreadyUse=Chyba, nelze odstranit tento účetní účet, protože ho zrovna používáte
-MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
-ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
-ChangeBinding=Change the binding
+MvtNotCorrectlyBalanced=Pohyb není správně vyrovnán. Kredit = %s. Debet = %s
+FicheVentilation=Ověřovací karta
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
+ListOfProductsWithoutAccountingAccount=Seznam výrobků, které nejsou vázány na kterémkoli účetním účtu
+ChangeBinding=Změnit vazby
 
 ## Admin
-ApplyMassCategories=Apply mass categories
-AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
-CategoryDeleted=Category for the accounting account has been removed
+ApplyMassCategories=Aplikovat hmotnostní kategorie
+AddAccountFromBookKeepingWithNoCategories=Přidejte acccount již použit s žádnými kategoriemi
+CategoryDeleted=Kategorie účetního účtu byla odstraněna
+AccountingJournals=účetní deníky
+AccountingJournal=Účetní deník
+NewAccountingJournal=Nový účetní deník
+ShowAccoutingJournal=Zobrazit účetní deník
+Code=Kód
+Nature=Příroda
+AccountingJournalType1=Různé operace
+AccountingJournalType2=Odbyt
+AccountingJournalType3=Nákupy
+AccountingJournalType4=Banka
+AccountingJournalType9=Má-new
+ErrorAccountingJournalIsAlreadyUse=Tento deník se již používá
 
 ## Export
 Exports=Exporty
@@ -204,42 +224,44 @@ Modelcsv=Model exportu
 OptionsDeactivatedForThisExportModel=Možnosti pro tento exportní model jsou deaktivovány
 Selectmodelcsv=Vyberte způsob exportu
 Modelcsv_normal=Klasický export
-Modelcsv_CEGID=Export towards CEGID Expert Comptabilité
-Modelcsv_COALA=Export towards Sage Coala
-Modelcsv_bob50=Export towards Sage BOB 50
-Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
-Modelcsv_quadratus=Export towards Quadratus QuadraCompta
-Modelcsv_ebp=Export towards EBP
-Modelcsv_cogilog=Export towards Cogilog
-ChartofaccountsId=Chart of accounts Id
+Modelcsv_CEGID=Export směrem CEGID Expert Comptabilité
+Modelcsv_COALA=Export na Sage Coala
+Modelcsv_bob50=Export na Sage BOB 50
+Modelcsv_ciel=Export na Sage Ciel Compta nebo Compta Evolution
+Modelcsv_quadratus=Export směrem quadratus QuadraCompta
+Modelcsv_ebp=Export na EBP
+Modelcsv_cogilog=Export směrem Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
+ChartofaccountsId=Schéma Id účtů
 
 ## Tools - Init accounting account on product / service
-InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases.
-DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-Options=Options
-OptionModeProductSell=Mode sales
-OptionModeProductBuy=Mode purchases
-OptionModeProductSellDesc=Show all products with accounting account for sales.
-OptionModeProductBuyDesc=Show all products with accounting account for purchases.
-CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
-CleanHistory=Reset all bindings for selected year
+InitAccountancy=init účetnictví
+InitAccountancyDesc=Tato stránka může být použita k inicializaci účetnictví u produktů a služeb, které nemají účetní účet definovaný pro prodej a nákup.
+DefaultBindingDesc=Tato stránka může být použit k nastavení výchozí účet použít k propojení transakcí záznam o platebních platy, darování, daní a DPH, pokud se žádný zvláštní účetní účet již nastaven.
+Options=možnosti
+OptionModeProductSell=prodejní režim
+OptionModeProductBuy=Nákupní režim
+OptionModeProductSellDesc=Zobrazit všechny produkty s vyúčtováním pro přímý prodej.
+OptionModeProductBuyDesc=Zobrazit všechny produkty které připadají v úvahu pro nákupy.
+CleanFixHistory=Odstraňte evidenční skupiny kód z řádků, které neexistují do map z účtu
+CleanHistory=Obnovit všechny vazby pro vybraný rok
 
-WithoutValidAccount=Without valid dedicated account
-WithValidAccount=With valid dedicated account
-ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
+WithoutValidAccount=Bez platného zvláštním účtu
+WithValidAccount=S platným zvláštním účtu
+ValueNotIntoChartOfAccount=Tato hodnota účetního účtu neexistuje v účtu
 
 ## Dictionary
-Range=Range of accounting account
-Calculated=Calculated
-Formula=Formula
+Range=Řada účetních účtu
+Calculated=počítáno
+Formula=Vzorec
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
-ExportNotSupported=The export format setuped is not supported into this page
-BookeppingLineAlreayExists=Lines already existing into bookeeping
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=Účetnictví skupiny účtů není k dispozici pro země %s (viz Home - instalace - slovníky)
+ExportNotSupported=Exportní formát setuped není podporován na této stránce
+BookeppingLineAlreayExists=Linky již existující do bookeeping
+NoJournalDefined=No journal defined
+Binded=linky vázané
+ToBind=Linky k vazbě
 
-Binded=Lines bound
-ToBind=Lines to bind
-
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index cbbc3f243bd..816a6e4ef38 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -2,33 +2,33 @@
 Foundation=Nadace
 Version=Verze
 VersionProgram=Verze programu
-VersionLastInstall=Initial install version
-VersionLastUpgrade=Latest version upgrade
+VersionLastInstall=Verze počáteční instalace
+VersionLastUpgrade=Nejnovější verze upgrade
 VersionExperimental=Experimentální
 VersionDevelopment=Vývoj
 VersionUnknown=Neznámý
 VersionRecommanded=Doporučené
-FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. Value of some setup constants may also be checked. You can use this tool to detect if some files were modified by a hacker for example.
-FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
-GlobalChecksum=Global checksum
-MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
-LocalSignature=Embedded local signature (less reliable)
-RemoteSignature=Remote distant signature (more reliable)
+FileCheck=Kontrola integrity souborů
+FileCheckDesc=Tento nástroj vám umožňuje zkontrolovat integritu souborů a nastavení aplikace a porovnávat jednotlivé soubory s oficiálními. Je také možné zkontrolovat hodnotu některých konstant nastavení. Pomocí tohoto nástroje můžete zjistit, zda některé soubory byly například modifikovány hackerem.
+FileIntegrityIsStrictlyConformedWithReference=integrity souborů je přísně přizpůsobena s odkazem.
+FileIntegrityIsOkButFilesWereAdded=Kontrola souborů integrity prošel, ale byly přidány některé nové soubory.
+FileIntegritySomeFilesWereRemovedOrModified=Kontrola souborů integrity selhal. Některé soubory byly změněny, odstraněny nebo přidány.
+GlobalChecksum=Global kontrolní součet
+MakeIntegrityAnalysisFrom=Udělat analýzu integrity souborů aplikací od
+LocalSignature=Vložený místní podpis (méně spolehlivé)
+RemoteSignature=Remote vzdálený podpis (spolehlivější)
 FilesMissing=Chybějící soubory
 FilesUpdated=Aktualizované soubory
 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
-XmlNotFound=Xml Integrity File of application not found
+FilesAdded=přidané soubory
+FileCheckDolibarr=Zkontrolovat integritu souborů aplikací
+AvailableOnlyOnPackagedVersions=Místní soubor pro kontrolu integrity je k dispozici pouze tehdy, pokud je nainstalována aplikace z oficiálního balíčku
+XmlNotFound=Xml Integrity souboru aplikace nebyly načteny
 SessionId=ID relace
 SessionSaveHandler=Manipulátor uložených relací
 SessionSavePath=Místo uložení relace
 PurgeSessions=Vyčistit relace
-ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
+ConfirmPurgeSessions=Opravdu chcete, vyčistit všechny relace? Tím dojde k odpojení všech přihlášených uživatelů (kromě vás).
 NoSessionListWithThisHandler=Nastavení Vašeho PHP neumožňuje vypsat běžící relace.
 LockNewSessions=Uzamknout nové spojení
 ConfirmLockNewSessions=Určitěchcete omezit všechna nová Dolibarr spojení? Pouze uživatel<b>%s</b> bude mít možnost se připojit.
@@ -48,12 +48,13 @@ InternalUsers=Interní uživatelé
 ExternalUsers=Externí uživatelé
 GUISetup=Zobrazení
 SetupArea=Modul nastavení
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Formulář pro testování uploadu souborů (dle nastavení)
 IfModuleEnabled=Poznámka: Ano má efekt pouze tehdy, pokud je aktivní modul <b>%s</b>
 RemoveLock=Odstraňte soubor <b>%s</b> (pokud existuje), pro povolení použití aktualizačního nástroje.
 RestoreLock=Obnovte soubor <b>%s,</b> pouze s opravněním ke čtení, chcete-li zakázat jakékoliv použití aktualizačního nástroje.
 SecuritySetup=Bezpečnostní nastavení
-SecurityFilesDesc=Define here options related to security about uploading files.
+SecurityFilesDesc=Definujte zde možnosti týkající se zabezpečení o nahrávání souborů.
 ErrorModuleRequirePHPVersion=Chyba, tento modul vyžaduje PHP verze %s nebo vyšší
 ErrorModuleRequireDolibarrVersion=Chyba, tento modul vyžaduje Dolibarr verze %s nebo vyšší
 ErrorDecimalLargerThanAreForbidden=Chyba, přesnost vyšší než <b>%s</b> není podporována.
@@ -62,13 +63,13 @@ Dictionary=Slovníky
 ErrorReservedTypeSystemSystemAuto=Hodnota &quot;system&quot; a &quot;systemauto&quot; je vyhrazena. Můžete použít &quot;user&quot; k pŕidání vlastního záznamu
 ErrorCodeCantContainZero=Kód nemůže obsahovat hodnotu 0
 DisableJavascript=Vypnout JavaScript a Ajax funkce (Doporučuje se pro nevidomého či textové prohlížeče)
-UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties, but it is less convenient)
-DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact, but it is less convenient)
+UseSearchToSelectCompanyTooltip=Také, pokud máte velký počet subjektů (> 100 000), můžete zvýšit rychlost nastavením konstantní COMPANY_DONOTSEARCH_ANYWHERE 1 v Setup-> Ostatní. Vyhledávání pak bude omezena na začátek řetězce.
+UseSearchToSelectContactTooltip=Také, pokud máte velký počet subjektů (> 100 000), můžete zvýšit rychlost nastavením konstantní CONTACT_DONOTSEARCH_ANYWHERE 1 v Setup-> Ostatní. Vyhledávání pak bude omezena na začátek řetězce.
+DelaiedFullListToSelectCompany=Počkat stisknutí klávesy před vložením obsahu seznamu subjektů combo (To může zvýšit výkon, pokud máte velké množství subjektů, ale je to méně pohodlné)
+DelaiedFullListToSelectContact=Počkat stisknutí klávesy před vložením obsahu seznamu kontaktů combo (To může zvýšit výkon, pokud máte velký počet kontaktů, ale je to méně pohodlné)
 NumberOfKeyToSearch=Počet charakterů nutných k spuštění hledání: %s
 NotAvailableWhenAjaxDisabled=Není k dispozici při vypnutém Ajaxu
-AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
+AllowToSelectProjectFromOtherCompany=Na dokumentu třetí osoby, mohou vybrat projekt spojený s jinou třetí stranou
 JavascriptDisabled=JavaScript zablokován
 UsePreviewTabs=Použijte náhled
 ShowPreview=Zobrazit náhled
@@ -76,7 +77,7 @@ PreviewNotAvailable=Náhled není k dispozici
 ThemeCurrentlyActive=Téma aktivní
 CurrentTimeZone=Časové pásmo PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
-TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
+TZHasNoEffect=Termíny jsou uloženy a vráceny databázového serveru, jako kdyby byly vedeny jako odeslán řetězec. Časové pásmo má vliv pouze při použití funkce UNIX_TIMESTAMP (které by neměly být používány Dolibarr, takže databáze TZ by nemělo mít žádný vliv, i když se změnila po byla zadána data).
 Space=Mezera
 Table=Tabulka
 Fields=Pole
@@ -85,7 +86,7 @@ Mask=Maska
 NextValue=Další hodnota
 NextValueForInvoices=Další hodnota (faktury)
 NextValueForCreditNotes=Další hodnota (dobropisů)
-NextValueForDeposit=Další hodnota (záloha)
+NextValueForDeposit=Další hodnota (akontace)
 NextValueForReplacements=Další hodnota (náhrady)
 MustBeLowerThanPHPLimit=Poznámka: Nastavení Vašeho PHP omezuje velikost nahrávaného souboru na <b>%s</b> %s, nehledě na nastavení tohoto parametru
 NoMaxSizeByPHPLimit=Poznámka: Ve Vaší PHP konfiguraci není nastaven limit
@@ -97,13 +98,13 @@ AntiVirusParam= Další parametry příkazového řádku
 AntiVirusParamExample= Příklad ClamWin: - databáze = &quot;C: \\ Program Files (x86) \\ ClamWin \\ lib&quot;
 ComptaSetup=Nastavení účetního modulu
 UserSetup=Nastavení správy uživatelů
-MultiCurrencySetup=Multi-currency setup
+MultiCurrencySetup=setup Multi-currency
 MenuLimits=Limity a přesnost
 MenuIdParent=ID nadřazeného menu
 DetailMenuIdParent=ID nadřazeného menu (nechte prázdný pro top menu)
 DetailPosition=Řadicí číslo pro nastavení pozice v menu
 AllMenus=Vše
-NotConfigured=Modul není nakonfigurován
+NotConfigured=Module/Application not configured
 Active=Aktivní
 SetupShort=Nastavení
 OtherOptions=Další možnosti
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Oddělovač tisíců
 Destination=Destinace
 IdModule=Modul ID
 IdPermissions=Oprávnění ID
-Modules=Moduly
 LanguageBrowserParameter=Parametr %s
 LocalisationDolibarrParameters=Lokalizační parametry
 ClientTZ=Časové pásmo klienta (uživatele)
@@ -123,14 +123,15 @@ PHPTZ=Časové pásmo PHP serveru
 DaylingSavingTime=Letní čas
 CurrentHour=PHP Čas (server)
 CurrentSessionTimeOut=Aktuální časový limit relace
-YouCanEditPHPTZ=Chcete-li nastavit jiné časové pásmo PHP (není podmínkou), můžete zkusit přidat soubor. Htacces s linkou, jako je tento &quot;TZ SetEnv Europe / Paris&quot;
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
-Boxes=Widgets
-MaxNbOfLinesForBoxes=Max number of lines for widgets
+Boxes=Boxy
+MaxNbOfLinesForBoxes=Maximální počet řádků pro widgety
 PositionByDefault=Výchozí pořadí
 Position=Pozice
-MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
-MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br />Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
+MenusDesc=V nastavení menu nastavíte obsah obou panelů nabídek (horizontální i vertikální).
+MenusEditorDesc=Editor menu vám umožní upravovat položky v menu. Používejte jej opatrně, při nesprávném použití může dojít k nestabilnímu chodu systému Dolibarr nebo ke ztrátě některých položek v menu. <br> Některé moduly přidají položky v menu. Pokud jste omylem odstranili některé z těchto položek, můžete je obnovit vypnutím a opětovným zapnutím modulu.
 MenuForUsers=Menu pro uživatele
 LangFile=soubor .lang
 System=Systém
@@ -138,16 +139,16 @@ SystemInfo=Informace o systému
 SystemToolsArea=Sekce systémových nástrojů
 SystemToolsAreaDesc=Tato sekce poskytuje správu uživatelských funkcí. V menu vyberte funkci, kterou hledáte.
 Purge=Očistit
-PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
-PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeAreaDesc=Tato stránka vám umožňuje odstranit všechny postavené nebo uložené soubory Dolibarr (dočasné soubory nebo všechny soubory v adresáři <b>%s</b>). Použití této funkce není nutné. Je k dispozici pro uživatele, jejichž Dolibarr je provozován u poskytovatele, který neposkytuje oprávnění k odstranění souborů na webovém serveru.
+PurgeDeleteLogFile=Vymažte log <b>%s</b>, definovaný pro modul Syslog (bez rizika ztráty)
+PurgeDeleteTemporaryFiles=Vymažte všechny dočasné soubory (bez rizika ztráty dat)
+PurgeDeleteTemporaryFilesShort=Odstranit dočasné soubory
 PurgeDeleteAllFilesInDocumentsDir=Odstraňte všechny soubory v adresáři <b>%s.</b> Dočasné soubory, zálohy databáze, soubory přiložené k prvkům (třetí strany, faktury, ...) a  uploady do modulu ECM budou vymazány.
 PurgeRunNow=Vyčistit nyní
-PurgeNothingToDelete=No directory or files to delete.
+PurgeNothingToDelete=Žádný adresář nebo soubor k odstranění
 PurgeNDirectoriesDeleted=<b>%s</b> soubory nebo adresáře odstraněny.
 PurgeAuditEvents=Vyčistit všechny bezpečnostní události
-ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
+ConfirmPurgeAuditEvents=Jste si jisti, že chcete vyčistit všechny bezpečnostní události? Všechny bezpečnostní záznamy budou odstraněny, žádná další data nebudou odstraněna.
 GenerateBackup=Vytvořit zálohu
 Backup=Zálohování
 Restore=Obnovit
@@ -182,65 +183,67 @@ ExtendedInsert=Rozšířený INSERT
 NoLockBeforeInsert=Žádné lock příkazy okolo příkazu INSERT
 DelayedInsert=Zpožděné vložení
 EncodeBinariesInHexa=Zakódovat binární data v hexadecimálním tvaru
-IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
+IgnoreDuplicateRecords=Ignorovat chyby duplicitních záznamů (INSERT IGNORE)
 AutoDetectLang=Autodetekce (jazyku prohlížeče)
 FeatureDisabledInDemo=Funkce zakázána v demu
-FeatureAvailableOnlyOnStable=Feature only available on official stable versions
+FeatureAvailableOnlyOnStable=Funkce je k dispozici pouze v oficiálních stabilních verzích
 Rights=Oprávnění
-BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
+BoxesDesc=Widgety jsou oblasti obrazovky, které ukazují krátké informace na některých stránkách. Můžete si vybrat mezi zobrazením/schováním boxu zvolením cílové stránky a kliknutím na 'Aktivovat' nebo kliknutím na popelnici ji zakázat.
 OnlyActiveElementsAreShown=Pouze prvky z <a href="%s">povolených modulů</a> jsou uvedeny.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
-ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external modules...
-GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
+ModulesMarketPlaceDesc=Více modulů naleznete ke stažení na externích webových stránkách ...
+ModulesDeployDesc=Pokud oprávnění na souborovém systému dovolí, můžete použít tento nástroj k nasazení externího modulu. Modul wil pak bude viditelný na kartě <strong> %s </ strong>.
+ModulesMarketPlaces=Najít externí moduly ...
+GoModuleSetupArea=Nasadit / instalovat nový modul, přejděte na nastavení plochy modulu na <a href="%s"> %s </a>.
 DoliStoreDesc=DoliStore, oficiální trh pro download externích modulů Dolibarr ERP / CRM
-DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
-WebSiteDesc=Reference websites to find more modules...
+DoliPartnersDesc=Seznam firem poskytujících zakázku vyvinuté moduly nebo funkce (Poznámka: někdo se zkušenostmi v programování v PHP může poskytnout zakázkový vývoj pro open source projekt)
+WebSiteDesc=Referenční webové stránky, kde naleznete další moduly ...
 URL=Odkaz
-BoxesAvailable=Widgets available
-BoxesActivated=Widgets activated
+BoxesAvailable=widgety k dispozici
+BoxesActivated=Widgety aktivovány
 ActivateOn=Aktivace na
 ActiveOn=Aktivováno
 SourceFile=Zdrojový soubor
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Dostupné pouze v případě, že není zakázán JavaScript
 Required=Potřebný
-UsedOnlyWithTypeOption=Used by some agenda option only
+UsedOnlyWithTypeOption=Používaný některými volby programu jednání pouze
 Security=Zabezpečení
 Passwords=Hesla
 DoNotStoreClearPassword=Ukládat hesla v databázi pouze šifrovaně (Doporučeno)
 MainDbPasswordFileConfEncrypted=Šifrovat přístupové heslo databáze v conf.php (Doporučeno)
-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>
+InstrucToEncodePass=Pro uložení zašifrovaného hesla do <b>conf.php</b>, nahraďte řádku <br> <b>$dolibarr_main_db_pass="..."</b> <br> hodnotou <br> <b>$dolibarr_main_db_pass="crypted:%s"</b>
+InstrucToClearPass=Pro uložení nezašifrovaného hesla do <b>conf.php</b>, nahraďte řádku <br> <b>$dolibarr_main_db_pass="crypted:..."</b> <br> hodnotou <br> <b>$dolibarr_main_db_pass="%s"</b>
 ProtectAndEncryptPdfFiles=Přidat ochranu generovaných souborů PDF (Nedoporučuje se, zablokuje hromadné generování PDF)
 ProtectAndEncryptPdfFilesDesc=Ochrana dokumentů PDF neomezí možnost otevírání dokumentů jakýmkoliv prohlížečem. Nicméně, editace a kopírování přestane být možná. Zapnutím této ochrany přijdete o možnost vytváření kumulovaných PDF (např. nezaplacených faktur)
 Feature=Funkce
 DolibarrLicense=Licence
 Developpers=Vývojáři / přispěvatelé
 OfficialWebSite=Mezinárodní oficiální internetové stránky Dolibarr
-OfficialWebSiteLocal=Local web site (%s)
+OfficialWebSiteLocal=Místní webové stránky (%s)
 OfficialWiki=Dolibarr dokumentace na Wiki
 OfficialDemo=Dolibarr on-line demo
 OfficialMarketPlace=Oficiální trh pro externí moduly / addons
 OfficialWebHostingService=Odkazované webhostingové služby (Cloud hosting)
 ReferencedPreferredPartners=Preferovaní partneři
-OtherResources=Autres ressources
+OtherResources=jiné zdroje
+ExternalResources=Cizí zdroje
+SocialNetworks=Sociální sítě
 ForDocumentationSeeWiki=Pro uživatelskou nebo vývojářskou dokumentaci (Doc, FAQs ...) <br> navštivte Dolibarr Wiki: <br> <a href="%s" target="_blank"><b>%s</b></a>
 ForAnswersSeeForum=V případě jakýchkoliv dalších dotazů nebo nápovědy použijte fórum Dolibarr: <br> <a href="%s" target="_blank"><b>%s</b></a>
 HelpCenterDesc1=Tato oblast slouží k získání nápovědy a podpory systému Dolibarr.
 HelpCenterDesc2=Některé části této služby jsou k dispozici <b>pouze</b> v <b>angličtině.</b>
 CurrentMenuHandler=Aktuální handler menu
 MeasuringUnit=Měrná jednotka
-LeftMargin=Left margin
-TopMargin=Top margin
-PaperSize=Paper type
-Orientation=Orientation
-SpaceX=Space X
-SpaceY=Space Y
-FontSize=Font size
-Content=Content
-NoticePeriod=Notice period
-NewByMonth=New by month
+LeftMargin=levý okraj
+TopMargin=Horní okraj
+PaperSize=Typ papíru
+Orientation=Orientace
+SpaceX=space X
+SpaceY=space Y
+FontSize=Velikost písma
+Content=Obsah
+NoticePeriod=Výpovědní lhůta
+NewByMonth=New podle měsíce
 Emails=E-maily
 EMailsSetup=E-maily nastavení
 EMailsDesc=Tato stránka umožňuje přepsat PHP parametry odesílaných e-mailů. Ve většině případů je na platformě Unix / Linux OS PHP nastavení správné, a tyto parametry jsou k ničemu.
@@ -256,53 +259,56 @@ MAIN_MAIL_SENDMODE=Metoda odesílání e-mailů
 MAIN_MAIL_SMTPS_ID=SMTP ID je-li vyžadováno ověření
 MAIN_MAIL_SMTPS_PW=SMTP heslo je-li vyžadováno ověření
 MAIN_MAIL_EMAIL_TLS= Použít TLS (SSL) šifrování
-MAIN_MAIL_EMAIL_STARTTLS= Use TLS (STARTTLS) encrypt
+MAIN_MAIL_EMAIL_STARTTLS= Použít TLS (STARTTLS) šifrování
 MAIN_DISABLE_ALL_SMS=Zakázat všechny odesílané SMS (pro testovací účely apod.)
 MAIN_SMS_SENDMODE=Použitá metoda pro odesílání SMS
 MAIN_MAIL_SMS_FROM=Výchozí telefonní číslo odesílatele SMS
-MAIN_MAIL_DEFAULT_FROMTYPE=Sender e-mail by default for manual sendings (User email or Company email)
-UserEmail=User email
-CompanyEmail=Company email
+MAIN_MAIL_DEFAULT_FROMTYPE=E-mail odesílatele ve výchozím nastavení pro manuální sendings (uživatel e-mailu nebo e-mailu společnosti)
+UserEmail=Uživatelský e-mail
+CompanyEmail=email Firma
 FeatureNotAvailableOnLinux=Funkce není k dispozici na Unixových systémech. Otestujte svůj sendmail program lokálně.
-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/
-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.
+SubmitTranslation=Pokud překlad pro tento jazyk je neúplný, nebo chybný, můžete jej opravit editací souborů v adresáři <b>langs/%s</b> a předložit změněné soubory na fóru www.dolibarr.org.\n\nAktuální překlady získáte na https://www.transifex.com/dolibarr-association/dolibarr/dashboard/ kde se také můžete po vytvoření účtu na překladech podílet.
+SubmitTranslationENUS=Pokud překlad pro tento jazyk není úplný nebo najdete chyby, můžete to opravit úpravou souborů do adresáře <b> langs / %s </ b> a odeslat modifikované soubory na stránkách dolibarr.org/forum nebo pro vývojáře na adrese github.com/ Dolibarr / dolibarr.
 ModuleSetup=Nastavení modulu
-ModulesSetup=Nastavení modulů
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Systém
 ModuleFamilyCrm=Řízení vztahů se zákazníky (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
-ModuleFamilyProducts=Products Management (PM)
-ModuleFamilyHr=Human Resource Management (HR)
+ModuleFamilySrm=Dodavatel Vztah Management (SRM)
+ModuleFamilyProducts=Řízení produktů
+ModuleFamilyHr=Řízení lidských zdrojů (HRM)
 ModuleFamilyProjects=Projekty / Týmové práce
 ModuleFamilyOther=Ostatní
 ModuleFamilyTechnic=Multi-modulové nastavení
 ModuleFamilyExperimental=Experimentální moduly
 ModuleFamilyFinancial=Finanční moduly (Účetnictví / Finance)
 ModuleFamilyECM=Elektronická správa obsahu (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
-ModuleFamilyInterface=Interfaces with external systems
+ModuleFamilyPortal=Webové stránky a další čelní aplikací
+ModuleFamilyInterface=Rozhraní s externími systémy
 MenuHandlers=Menu handlery
 MenuAdmin=Menu editor
 DoNotUseInProduction=Nepoužívejte ve výrobě
-ThisIsProcessToFollow=This is steps to process:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
+ThisIsProcessToFollow=Nastaveno na proces:
+ThisIsAlternativeProcessToFollow=Jedná se o alternativní nastavení zpracovávat ručně:
 StepNb=Krok %s
 FindPackageFromWebSite=Nalezni balíček, obsahující funkci jež chcete (např. na oficiálních stránkách %s).
-DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <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>.
-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='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
-YouCanSubmitFile=For this step, you can send package using this tool: Select module file
+DownloadPackageFromWebSite=Download balíčku (například z oficiálních webových stránek %s).
+UnpackPackageInDolibarrRoot=Rozbalte soubor balíčku do adresáře, vyhrazenému pro externí moduly: <b>%s</b>
+UnpackPackageInModulesRoot=Nasadit / instalovat externí modul, rozbalit zabalené soubory do adresáře serveru věnovaného modulů: <b> %s </ b>
+SetupIsReadyForUse=Nasazení modulu je dokončeno. Musíte však povolit a nastavit modul ve své administraci tím, že jdete na stránku nastavení modulů: <a href="%s"> %s </a>.
+NotExistsDirect=Alternativní kořenový adresář není definován. <br>
+InfDirAlt=Od verze 3 je možné definovat alternativní kořenovou složku. To umožňuje ukládat na stejné místo plug-iny a vlastní šablony. <br> Stačí vytvořit adresář v kořenovém adresáři Dolibarr (např.: custom). <br>
+InfDirExample=<br>Pak je deklarujte v souboru conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*Řádky jsou zakomentovány znakem "#", pro odkomentování tento znak odmažte.
+YouCanSubmitFile=Pro tento krok můžete posílat balíček pomocí tohoto nástroje: Vyberte soubor modulu
 CurrentVersion=Dolibarr aktuální verze
-CallUpdatePage=Go to the page that updates the database structure and data: %s.
-LastStableVersion=Latest stable version
-LastActivationDate=Latest activation date
+CallUpdatePage=Přejděte na stránku, která aktualizuje strukturu databáze a data: %s.
+LastStableVersion=Poslední stabilní verze
+LastActivationDate=Nejzazší datum aktivace
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Aktualizace serveru v režimu offline
+WithCounter=Správa počítadlo
 GenericMaskCodes=Můžete zadat jakoukoliv masku číselné řady. V masce můžete použít následující značky: <br><b>{000000}</b> číslo, automaticky inkrementované o 1 při každým %s. Počet nul odpovídá požadovanému počtu číslic. Číslo se zleva doplní nulami pro dosažení požadovaného počtu číslic. <br><b>{000000+000}</b> stejné jako předchozí, ale ofset odpovídající číslu napravo od znaku + bude použit pro první %s. <br><b>{000000@x}</b> stejné jako předchozí, ale počítadlo se resetuje na nulu, když je dosaženo měsíce x (x je v rozmezí 1 ~ 12, nebo 0 pro použití prvního měsíce fiskálního roku definované ve vaší konfiguraci, nebo 99 pro vynulování každý měsíc ). Pokud se tato volba používá, a x je 2 nebo vyšší, pak je rovněž požadovaná posloupnost {yy}{mm} či {yyyy}{mm}. <br><b>{dd}</b> den (01 až 31).<br><b>{mm}</b> měsíc (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> nebo <b>{y}</b> rok, 2, 4 nebo 1 číslo. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> Zákaznický kód s n znaky<br><b>{cccc000}</b> Zákaznický kód s n znaky je sledován počítadlem určeným pro zákazníka. Toto počítadlo se resetuje ve stejný čas, jako globální počítadlo<br><b>{tttt}</b> Kód společnosti s n znaky (viz. seznam typů společností). <br>
 GenericMaskCodes3=Všechny ostatní znaky v masce zůstanou nedotčeny. <br> Mezery nejsou povoleny. <br>
 GenericMaskCodes4a=<u>Příklad na 99. %s třetí strany TheCompany proveden 2007-01-31:</u> <br>
 GenericMaskCodes4b=<u>Příklad třetí osoby vytvořené 03.01.2007:</u> <br>
@@ -321,14 +327,14 @@ UMaskExplanation=Tento parametr umožňuje definovat výchozí oprávnění soub
 SeeWikiForAllTeam=Podívejte se na wiki stránku pro kompletní seznam všech účastníků a jejich organizaci
 UseACacheDelay= Zpoždění pro ukládání výsledku exportu do mezipaměti v sekundách (0 nebo prázdné pro neukládání)
 DisableLinkToHelpCenter=Skrýt odkaz <b>&quot;Potřebujete pomoc či podporu&quot;</b> na přihlašovací stránce
-DisableLinkToHelp=Hide link to online help "<b>%s</b>"
+DisableLinkToHelp=Skrýt odkaz na on-line nápovědě "<b> %s </ b>"
 AddCRIfTooLong=Neexistuje žádný automatický balení, takže pokud linka je mimo stránky na dokumentech, protože příliš dlouho, musíte přidat sami návrat vozíku do textového pole.
-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...).
+ConfirmPurge=Jste si jisti, že chcete spustit tuto očistu? <br> Toto smaže definitivně všechny datové soubory a nelze je žádným způsobem je obnovit (ECM soubory, přiložené soubory ...).
 MinLength=Minimální délka
 LanguageFilesCachedIntoShmopSharedMemory=Soubory. Lang vložen do sdílené paměti
 ExamplesWithCurrentSetup=Příklady s aktuálním systémem nastavení
 ListOfDirectories=Seznam OpenDocument šablony seznamů
-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=Seznam adresářů obsahující soubory šablon s formátem OpenDocument <br> <br> Přidejte adresář modulu GED <br> <br> Přidejte adresář modulu GED. > DOL_DATA_ROOT / ecm / yourdirectoryname </ b>. Soubory v těchto adresářích musí končit znakem <b> .odt </ b> nebo <b> .ods </ b>.
 NumberOfModelFilesFound=Počet ODT / ODS šablony souborů naleznete v těchto adresářích
 ExampleOfDirectoriesForModelGen=Příklady syntaxe: <br> c: \\ mydir <br> / Home / mydir <br> DOL_DATA_ROOT / ECM / ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> Chcete-li vědět, jak vytvořit své ODT šablony dokumentů před jejich uložením do těchto adresářů, přečtěte si wiki dokumentace:
@@ -342,7 +348,7 @@ ThemeDir=Skins adresář
 ConnectionTimeout=Connexion timeout
 ResponseTimeout=Reakce timeout
 SmsTestMessage=Zkušební zpráva od __ PHONEFROM__ do __ PHONETO__
-ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
+ModuleMustBeEnabledFirst=Modul <b> %s </ b> musí být napřed povolen, pokud budete potřebovat tuto funkci.
 SecurityToken=Klíč k zabezpečené URL
 NoSmsEngine=Ne odesílatel SMS manažer k dispozici. SMS odesílatele manažer nejsou nainstalovány s výchozí rozložení (protože závisí na externím dodavatelem), ale můžete najít některé z %s
 PDF=PDF
@@ -351,14 +357,14 @@ PDFAddressForging=Pravidla se budují adresy boxy
 HideAnyVATInformationOnPDF=Skrýt všechny informace týkající se DPH na generované PDF
 HideDescOnPDF=Skrýt popis produktů z vytvořeného PDF
 HideRefOnPDF=Skrýt produkty čj. na vytvořené PDF
-HideDetailsOnPDF=Hide product lines details on generated PDF
-PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
+HideDetailsOnPDF=Skrýt produktové řady podrobnosti o generované PDF
+PlaceCustomerAddressToIsoLocation=Použijte francouzský standardní pozice (La Poste) o pozici zákazníka adresy
 Library=Knihovna
 UrlGenerationParameters=Parametry k zajištění URL
 SecurityTokenIsUnique=Používáme unikátní securekey parametr pro každou adresu URL
 EnterRefToBuildUrl=Zadejte odkaz na objekt %s
 GetSecuredUrl=Získejte vypočtenou URL
-ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Skrýt tlačítka pro uživatele mimo administrátora k neautorizovaným zásahům místo zobrazení zapadlý tlačítek bez funkce
 OldVATRates=Staré Sazba DPH
 NewVATRates=Nová sazba DPH
 PriceBaseTypeToChange=Změnit na cenách s hodnotou základního odkazu uvedeného na
@@ -369,62 +375,78 @@ Int=Celé číslo
 Float=Vznášet se
 DateAndTime=Datum a hodina
 Unique=Unikátní
-Boolean=Boolean (checkbox)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Telefon
 ExtrafieldPrice = Cena
 ExtrafieldMail = E-mail
 ExtrafieldUrl = Url
 ExtrafieldSelect = Vyberte seznam
 ExtrafieldSelectList = Vyberte z tabulky
-ExtrafieldSeparator=Oddělovač
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Heslo
-ExtrafieldCheckBox=Zaškrtávací políčko
-ExtrafieldRadio=Přepínač
-ExtrafieldCheckBoxFromList= Kontrolní pole z tabulky
+ExtrafieldRadio=Radio buttons (on choice only)
+ExtrafieldCheckBox=Checkboxes
+ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Odkaz na objekt
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
-LibraryToBuildPDF=Library used for PDF generation
+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'
+ExtrafieldParamHelpselect=Parametry Seznam musí být jako klíč, hodnota <br> například: <br> 1, value1 <br> 2 value2 Sims 3, value3 <br> ... <br> Aby mít přehled v závislosti na dalším doplňkovém seznamu atributů: <br> 1, value1 | options_ <i> parent_list_code </ i>: parent_key <br> 2, value2 | options_ <i> parent_list_code </ i>: parent_key <br> <br> Chcete-li mít seznam v závislosti na jiném seznamu: <br> 1, value1 | <i> parent_list_code </ i>: parent_key <br> 2, hodnota2 | <i> parent_list_code </ i>: parent_key
+ExtrafieldParamHelpcheckbox=Parametry Seznam musí být jako klíč, hodnota <br> například: <br> 1, VALUE1 <br> 2, hodnota2 Sims 3, value3 <br> ...
+ExtrafieldParamHelpradio=Parametry Seznam musí být jako klíč, hodnota <br> například: <br> 1, VALUE1 <br> 2, hodnota2 Sims 3, value3 <br> ...
+ExtrafieldParamHelpsellist=Seznam parametrů pochází z tabulky<br><br> například : <br>c_typent:libelle:id::filter<br><br>Za účelem mít seznam v závislosti na jiném:<br>c_typent:libelle:id:parent_list_code|parent_column:filter <br> filtr může být jednoduchým testem (např. active=1 zobrazí pouze aktivní hodnotu) <br> Chcete-li filtrovat další pole, použijte syntaxi: extra.fieldcode = ... (v případě pole kód je kód extrafield)
+ExtrafieldParamHelpchkbxlst=Seznam parametrů pochází z tabulky <br> syntaxi: TABLE_NAME: label_field: id_field :: filtru <br> Příklad: c_typent: Libelle: id :: filtr <br> filtru může být jednoduchý test (např aktivní = 1) zobrazit pouze aktivní hodnoty <br> můžete také použít $ ID $ ve filtračním čarodějnice je aktuální id aktuálního objektu <br> Chcete-li SELECT v použití filtru $ SEL $ <br> pokud chcete filtrovat extrafields použít syntax extra.fieldcode = ... (v případě pole kód je kód extrafield) <br> Za účelem získání seznamu v závislosti na dalším doplňkovém seznamu atributů: <br> c_typent: libelle: id: options_ <i> parent_list_code </ i> | parent_column: filtr <br> Chcete-li mít seznam v závislosti na jiném seznamu: <br> c_typent: libelle: id: <i> parent_list_code </ i> | parent_column: filtrační
+ExtrafieldParamHelplink=Parametry musí být objectname: Classpath <br> Syntaxe: objectname: Classpath <br> Příklad: Societe: Societe / třída / societe.class.php
+LibraryToBuildPDF=Knihovna používaná pro generování PDF
 WarningUsingFPDF=Upozornění: Váš <b>conf.php</b> obsahuje direktivu <b>dolibarr_pdf_force_fpdf = 1.</b> To znamená, že můžete používat knihovnu FPDF pro generování PDF souborů. Tato knihovna je stará a nepodporuje mnoho funkcí (Unicode, obraz transparentnost, azbuka, arabské a asijské jazyky, ...), takže může dojít k chybám při generování PDF. <br> Chcete-li vyřešit tento a mají plnou podporu generování PDF, stáhněte si <a href="http://www.tcpdf.org/" target="_blank">TCPDF knihovny</a> , pak komentář nebo odebrat řádek <b>$ dolibarr_pdf_force_fpdf = 1,</b> a místo něj doplnit <b>$ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir &quot;</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Některé země uplatňovat 2 nebo 3 daně na každé faktuře řádek. Pokud se jedná o tento případ, zvolit typ pro druhé a třetí daňové a jeho rychlosti. Možné typ jsou: <br> 1: místní daň vztahovat na výrobky a služby bez DPH (localtax je vypočtena na částku bez daně) <br> 2: místní daň platí o produktech a službách, včetně DPH (localtax je vypočtena na částku + hlavní daně) <br> 3: místní daň vztahovat na výrobky bez DPH (localtax je vypočtena na částku bez daně) <br> 4: místní daň vztahovat na produkty, včetně DPH (DPH se vypočítá na množství + hlavní DPH) <br> 5: místní daň platí o službách bez DPH (localtax je vypočtena na částku bez daně) <br> 6: místní daň platí o službách, včetně DPH (localtax je vypočtena na částku + daň)
 SMS=SMS
 LinkToTestClickToDial=Zadejte telefonní číslo pro volání ukázat odkaz na test ClickToDial URL pro <strong>%s</strong>
 RefreshPhoneLink=Obnovit odkaz
 LinkToTest=Klikací odkaz generovány pro uživatele <strong>%s</strong> (klikněte na telefonní číslo pro testování)
 KeepEmptyToUseDefault=Mějte prázdný použít výchozí hodnoty
 DefaultLink=Výchozí odkaz
-SetAsDefault=Set as default
+SetAsDefault=Nastavit jako výchozí
 ValueOverwrittenByUserSetup=Pozor, tato hodnota může být přepsána uživatelem specifické nastavení (každý uživatel může nastavit vlastní clicktodial url)
 ExternalModule=Externí modul - instalován do adresáře %s
 BarcodeInitForThirdparties=Mass čárový kód init pro thirdparties
 BarcodeInitForProductsOrServices=Mass init čárový kód nebo reset pro výrobky nebo služby
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
+CurrentlyNWithoutBarCode=V současné době máte <strong> %s </ strong> záznam na <strong> %s </ strong> %s bez čárového kódu definovaného.
 InitEmptyBarCode=Init hodnota pro příští %s prázdnými záznamů
 EraseAllCurrentBarCode=Vymazat všechny aktuální hodnoty čárových kódů
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
+ConfirmEraseAllCurrentBarCode=Jste si jisti, že chcete vymazat všechny aktuální hodnoty čárových kódů?
 AllBarcodeReset=Byly odstraněny všechny hodnoty čárových kódů
 NoBarcodeNumberingTemplateDefined=Žádné šablony číslování čárových kódů aktivované v nastavení modulu čárových kódů.
-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
-DisplayCompanyInfo=Display company address
-DisplayCompanyManagers=Display manager names
-DisplayCompanyInfoAndManagers=Display company address and manager names
-EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
+EnableFileCache=Aktivovat mezipaměť souborů
+ShowDetailsInPDFPageFoot=Přidat další podrobnosti do zápatí PDF souborů, jako vaše firemní adresy nebo názvy manažer (k dokončení profesionální IDS společnost kapitálové a číslo DPH).
+NoDetails=Žádné další podrobnosti v zápatí
+DisplayCompanyInfo=Zobrazit adresu společnosti
+DisplayCompanyManagers=Jména display manažer
+DisplayCompanyInfoAndManagers=Zobrazte adresu firmy a jména správce
+EnableAndSetupModuleCron=Chcete-li mít tento opakující faktury soupisky generovány automaticky, modul * %s * musí být povoleno a správně nastaveny. V opačném případě, generování faktur musí být provedeno manuálně z této šablony s tlačítkem * Vytvořit *. Všimněte si, že i když jste povolili automatické generování, stále se můžete bezpečně spustit manuální generaci. Duplikáty generace za stejné období nejsou možné.
 ModuleCompanyCodeAquarium=Vrátit evidence kód postavený podle: <br> %s následuje třetí strany dodavatele kódu na kód dodavatele účetnictví, <br> %s následuje třetí strany zákazníků kód Přístupový kód zákazníka účetnictví.
 ModuleCompanyCodePanicum=Zpět prázdný evidence kód.
 ModuleCompanyCodeDigitaria=Účetnictví kód závisí na kódu třetích stran. Kód se skládá ze znaku &quot;C&quot; na prvním místě následuje prvních 5 znaků kódu třetích stran.
-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: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-ClickToShowDescription=Click to show description
+Use3StepsApproval=Ve výchozím nastavení musí být nákupní objednávky vytvořeny a schváleny dvěma různými uživateli (jeden krok / uživatel k vytvoření a jeden krok / uživatel ke schválení. Všimněte si, že pokud má uživatel oprávnění k vytvoření a schválení, stačí jeden krok / uživatel) . Touto volbou můžete požádat o zavedení třetího schvalovacího kroku / schválení uživatele, pokud je částka vyšší než určená hodnota (potřebujete tedy 3 kroky: 1 = ověření, 2 = první schválení a 3 = druhé schválení, pokud je dostatečné množství). <br> Pokud je zapotřebí jedno schvalování (2 kroky), nastavte jej na velmi malou hodnotu (0,1), pokud je vždy požadováno druhé schválení (3 kroky).
+UseDoubleApproval=Použijte schválení 3 kroky, kdy částka (bez DPH) je vyšší než ...
+WarningPHPMail=Upozornění: Někteří poskytovatelé e-mailu (například Yahoo) neumožňuje odeslat e-mail z jiného serveru, než server Yahoo v případě, že e-mailová adresa použita jako odesílatel je vaše Yahoo e-mail (jako myemail@yahoo.com, myemail@yahoo.fr, ...). Vaše aktuální nastavení použít server aplikace pro odesílání e-mailů, takže někteří příjemci (jeden kompatibilní s restriktivním DMARC protokolu), požádá Yahoo, pokud mohou přijímat e-maily a Yahoo odpoví „ne“, protože server není server vlastněná společností Yahoo, takže některé z vašich odeslané e-maily nemusí být přijaty. <br> má-li váš poskytovatel e-mail (jako je Yahoo) toto omezení, je nutné změnit nastavení e-mailu zvolit jiný způsob „SMTP serveru“ a zadat server SMTP a pověření poskytované vašeho poskytovatele e-mailu (zeptejte se svého poskytovatele e-mailových získat pověření SMTP pro váš účet).
+ClickToShowDescription=Kliknutím zobrazíte popis
+DependsOn=Tento modul je třeba modul (y)
+RequiredBy=Tento modul je vyžadováno modulu (modulů)
+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:
+PageUrlForDefaultValuesCreate=Apartmán V formulář pro vytvoření nového subjektu je <strong> %s </ strong>
+PageUrlForDefaultValuesList=Apartmán V straně tento seznam subjektů je <strong> %s </ strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=Překlad byl nalezen na klíče s tímto kódem, takže tuto hodnotu změnit, musíte upravit jej FOM Home-Setup-překlad.
+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=Pole
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Uživatelé a skupiny
-Module0Desc=Users / Employees and Groups management
+Module0Desc=Uživatelé / zaměstnanci a vedení Skupiny
 Module1Name=Třetí strany
 Module1Desc=Firmy a správu kontaktů (zákazníci, vyhlídky ...)
 Module2Name=Obchodní
@@ -444,7 +466,7 @@ Module30Desc=Faktura a dobropis řízení pro zákazníky. Faktura řízení pro
 Module40Name=Dodavatelé
 Module40Desc=Dodavatel řízení a nákupu (objednávky a faktury)
 Module42Name=Záznamy
-Module42Desc=Těžební zařízení (soubor, syslog, ...)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Redakce
 Module49Desc=Editor pro správu
 Module50Name=Produkty
@@ -461,8 +483,8 @@ Module55Name=Čárové kódy
 Module55Desc=Barcode řízení
 Module56Name=Telefonie
 Module56Desc=Telefonie integrace
-Module57Name=Direct bank payment orders
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
+Module57Name=Přímé bankovní platební příkazy
+Module57Desc=Správa platebních příkazů přímého inkasa. Zahrnuje generování souboru SEPA pro evropské země.
 Module58Name=ClickToDial
 Module58Desc=Integrace ClickToDial systému (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -484,9 +506,9 @@ Module200Desc=LDAP synchronizace adresářů
 Module210Name=PostNuke
 Module210Desc=PostNuke integrace
 Module240Name=Exporty dat
-Module240Desc=Tool to export Dolibarr data (with assistants)
+Module240Desc=Nástroj pro export dat Dolibarr (s asistenty)
 Module250Name=Import dat
-Module250Desc=Tool to import data in Dolibarr  (with assistants)
+Module250Desc=Nástroj pro import dat v Dolibarr (s asistenty)
 Module310Name=Členové
 Module310Desc=Nadace členové vedení
 Module320Name=RSS Feed
@@ -498,80 +520,82 @@ Module400Desc=Řízení projektů, příležitostí nebo vedení. Můžete při
 Module410Name=WebCalendar
 Module410Desc=WebCalendar integrace
 Module500Name=Zvláštní výdaje
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module500Desc=Řízení zvláštních výdajů, jako jsou daně, sociální příspěvky, divideny a platy
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Půjčka
 Module520Desc=Správa úvěrů
 Module600Name=Upozornění
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
+Module600Desc=Poslat upozornění e-mailem (spouštěné některých firemních akcí) pro uživatele (nastavení definovaná na každého uživatele), kontakty třetích stran (setup je definována na každé třetí osobě) nebo pevnými e-maily
 Module700Name=Dary
 Module700Desc=Darování řízení
 Module770Name=Zpráva výdajů
-Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module770Desc=Management a reklamace vyúčtování výdajů (doprava, jídlo, ...)
 Module1120Name=Dodavatel obchodní nabídky
-Module1120Desc=Request supplier commercial proposal and prices
+Module1120Desc=Požadavek dodavatel obchodní návrh a ceny
 Module1200Name=Mantis
 Module1200Desc=Mantis integrace
 Module1400Name=Účetnictví
 Module1400Desc=Vedení účetnictví (dvojité strany)
 Module1520Name=Dokument Generation
-Module1520Desc=Mass mail document generation
+Module1520Desc=Hromadná pošta generování dokumentů
 Module1780Name=Tagy/Kategorie
 Module1780Desc=Vytvořit tagy/kategorie (produkty, zákazníci, dodavatelé, kontakty nebo členi)
 Module2000Name=WYSIWYG editor
-Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
+Module2000Desc=Umožňují upravit některá textové pole přes pokročilý editor (na základě CKEditor)
 Module2200Name=Dynamické ceny
 Module2200Desc=Povolit použití matematických výrazů pro ceny
 Module2300Name=Cron
 Module2300Desc=Plánovaná správa úloh
-Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Name=Události / Agenda
+Module2400Desc=Postupujte udělal a nadcházející události. Nechť Aplikační protokoly automatických akcí pro účely sledování nebo zaznamenávat manuální akce či Rendez-vous.
 Module2500Name=Elektronický Redakční
 Module2500Desc=Uložit a sdílet dokumenty
-Module2600Name=API/Web services (SOAP server)
-Module2600Desc=Enable the Dolibarr SOAP server providing API services
-Module2610Name=API/Web services (REST server)
-Module2610Desc=Enable the Dolibarr REST server providing API services
-Module2660Name=Call WebServices (SOAP client)
-Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
+Module2600Name=API / Webové služby (SOAP server)
+Module2600Desc=Povolit Dolibarr SOAP serveru poskytující služby API
+Module2610Name=API / webové služby REST (server)
+Module2610Desc=Povolit služby API serveru poskytující Dolibarr REST
+Module2660Name=Call WebServices (SOAP klient)
+Module2660Desc=Povolit webové služby klienta Dolibarr (lze použít, aby se zasadila data / žádosti o externí servery. Dodavatel objednávky podporované jen na chvíli)
 Module2700Name=Gravatar
 Module2700Desc=Pomocí on-line služby (Gravatar www.gravatar.com) ukázat fotku uživatelů / členů (nalezen s jejich e-maily). Potřebujete přístup k internetu
 Module2800Desc=FTP klient
 Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind konverze možnosti
 Module3100Name=Skype
-Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3100Desc=Přidání tlačítka Skype na uživatele /subjekty/ Kontakty / členy karet
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
-Module4000Desc=Human resources management
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi-společnost
 Module5000Desc=Umožňuje spravovat více společností
 Module6000Name=Workflow
 Module6000Desc=Workflow management
-Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Name=Webové stránky
+Module10000Desc=Vytvoření veřejné internetové stránky s editorem WYSIWG. Jen nastavit web serveru, aby odkazovaly na specializované adresáře, aby si to on-line na internetu.
 Module20000Name=Nechte řízení požadavků
 Module20000Desc=Deklarovat a dodržovat zaměstnanci opustí požadavky
 Module39000Name=Množství produktu
-Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
+Module39000Desc=Šarže nebo sériové číslo, jíst-by a sell-managementem data o produktech
 Module50000Name=Paybox
 Module50000Desc=Modul nabídnout on-line platby kreditní kartou stránku s Paybox
 Module50100Name=Bod prodeje
-Module50100Desc=Point of sales module (POS).
+Module50100Desc=Bod prodejního modulu (POS).
 Module50200Name=Paypal
 Module50200Desc=Modul nabídnout on-line platby kreditní kartou stránku s Paypal
 Module50400Name=Účetnictví (pokročilé)
 Module50400Desc=Manažerské účetnictví (dvojité strany)
 Module54000Name=PrintIPP
 Module54000Desc=Přímý tisk (bez otevření dokumentů) pomocí poháry IPP rozhraní (tiskárna musí být viditelné ze serveru, a CUPS musí být installe na serveru).
-Module55000Name=Poll, Survey or Vote
-Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
+Module55000Name=Anketa, průzkum nebo hlasování
+Module55000Desc=Modul pro tvorbu on-line průzkumů a anket (jako Doodle, šroub, Rdvz, ...)
 Module59000Name=Okraje
 Module59000Desc=Modul pro správu marže
 Module60000Name=Provize
 Module60000Desc=Modul pro správu provize
 Module63000Name=Zdroje
-Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
+Module63000Desc=Spravovat zdroje (tiskárny, auta, prostor, ...), pak můžete sdílet na akcích
 Permission11=Přečtěte si zákazníků faktury
 Permission12=Vytvořit / upravit zákazníků faktur
 Permission13=Unvalidate zákazníků faktury
@@ -591,10 +615,10 @@ Permission32=Vytvořit / upravit produktů
 Permission34=Odstranit produkty
 Permission36=Viz / správa skryté produkty
 Permission38=Export produktů
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
+Permission42=Vytvořit/upravit projekty (společný projekt a projekty Jsem kontakt). Je také možné vytvořit úkoly a přiřazovat uživatelům projekt a úkoly
 Permission44=Odstranit projektů (společné projekty, projekt a já jsem kontakt pro)
-Permission45=Export projects
+Permission45=Export projekty
 Permission61=Přečtěte intervence
 Permission62=Vytvořit / upravit zásahy
 Permission64=Odstranit intervence
@@ -603,7 +627,7 @@ Permission71=Přečtěte členů
 Permission72=Vytvořit / upravit členů
 Permission74=Smazat členů
 Permission75=Nastavení typu uživatele
-Permission76=Export data
+Permission76=Exportovat data
 Permission78=Přečtěte si předplatné
 Permission79=Vytvořit / upravit předplatné
 Permission81=Přečtěte objednávky odběratelů
@@ -613,10 +637,10 @@ Permission86=Poslat objednávky odběratelů
 Permission87=Zavřít zákazníky objednávky
 Permission88=Storno objednávky odběratelů
 Permission89=Odstranit objednávky odběratelů
-Permission91=Read social or fiscal taxes and vat
-Permission92=Create/modify social or fiscal taxes and vat
-Permission93=Delete social or fiscal taxes and vat
-Permission94=Export social or fiscal taxes
+Permission91=Číst sociální nebo fiskální daně a DPH
+Permission92=Vytvořit/upravit sociální nebo fiskální daně a DPH
+Permission93=Odstranit sociální nebo fiskální daně a DPH
+Permission94=Export sociální nebo fiskální daně
 Permission95=Přečtěte si zprávy
 Permission101=Přečtěte si sendings
 Permission102=Vytvořit / upravit sendings
@@ -634,22 +658,22 @@ Permission121=Přečtěte třetí strany v souvislosti s uživateli
 Permission122=Vytvořit / modifikovat třetí strany spojené s uživateli
 Permission125=Odstranění třetí strany v souvislosti s uživateli
 Permission126=Export třetí strany
-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)
-Permission144=Delete all projects and tasks (also private projects i am not contact for)
+Permission141=Přečtěte si všechny projekty a úkoly (také soukromých záměrů nejsem kontaktovat)
+Permission142=Vytvořit / upravit všechny projekty a úkoly (také na soukromé záměry nejsem v kontaktu pro)
+Permission144=Smazat všechny projekty a úkoly (také soukromé projekty, pro které nejsem kontakt)
 Permission146=Přečtěte si poskytovatelé
 Permission147=Přečtěte si statistiky
-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
+Permission151=Číst přímé debetní platební příkazy
+Permission152=Vytvořit / upravit inkasní příkazy k úhradě
+Permission153=Odeslat / vysílat přímý debetní platební příkazy
+Permission154=Záznam Credits / odmítá inkasa platebních příkazů
 Permission161=Přečtené smlouvy/předplatné
-Permission162=Create/modify contracts/subscriptions
+Permission162=Vytvořit / upravit zakázky / předplatné
 Permission163=Aktivace služby / předplatné smlouvy
 Permission164=Zakázat servisní / předplatné smlouvy
 Permission165=Smazat zakázky / předplatné
-Permission167=Export contracts
-Permission171=Read trips and expenses (yours and your subordinates)
+Permission167=Export zakázky
+Permission171=Číst výlety a výdaje (vy a vaše podřízené)
 Permission172=Vytvořit / upravit výlety a výdaje
 Permission173=Odstranění výlety a výdaje
 Permission174=Přečtěte si všechny výlety a výdaje
@@ -695,7 +719,7 @@ PermissionAdvanced253=Vytvořit / upravit interní / externí uživatele a oprá
 Permission254=Vytvořit / upravit externí uživatelé pouze
 Permission255=Upravit ostatním uživatelům heslo
 Permission256=Odstranit nebo zakázat ostatním uživatelům
-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 assignement matters).
+Permission262=Rozšířit přístup ke všem subjektům (nejen třetích stran, které uživatel je prodej zástupce). <BR> neúčelné pro externí uživatele (vždy omezeny na sebe k předkládání žádostí, objednávky, faktury, smlouvy atd.) <BR> neúčelné pro projekty (pouze pravidla týkající se oprávnění projektů, viditelnost a přiřazení záležitostí).
 Permission271=Přečtěte CA
 Permission272=Přečtěte si faktury
 Permission273=Vydání faktury
@@ -744,7 +768,7 @@ Permission538=Export služeb
 Permission701=Přečtěte si dary
 Permission702=Vytvořit / upravit dary
 Permission703=Odstranit dary
-Permission771=Read expense reports (yours and your subordinates)
+Permission771=Číst zprávy o výdajích (vy a vaši podřízení)
 Permission772=Vytvořit/upravit vyúčtování výdajů
 Permission773=Smazat zprávy o výdajích
 Permission774=Přečtěte si všechny zprávy o výdajích (a to i pro uživatele, ne podřízení)
@@ -780,14 +804,14 @@ Permission1236=Export dodavatelské faktury, atributy a platby
 Permission1237=Export dodavatelské objednávky a informace o nich
 Permission1251=Spustit Hmotné dovozy externích dat do databáze (načítání dat)
 Permission1321=Export zákazníků faktury, atributy a platby
-Permission1322=Reopen a paid bill
+Permission1322=Znovu otevřít placené účet
 Permission1421=Export objednávek zákazníků a atributy
-Permission20001=Read leave requests (yours and your subordinates)
+Permission20001=Číst opuštěné požadavky (vy a vaši podřízení)
 Permission20002=Vytvořit/upravit vaše požadavky na dovolenou
 Permission20003=Smazat žádosti o dovolenou
-Permission20004=Read all leave requests (even user not subordinates)
+Permission20004=Přečtěte si všechny opuštěné požadavky (i když uživatel není podřízení)
 Permission20005=Vytvořit/upravit žádosti o dovolenou pro každého
-Permission20006=Admin leave requests (setup and update balance)
+Permission20006=Žádosti admin opuštěné požadavky (setup a aktualizovat bilance)
 Permission23001=Čtení naplánovaných úloh
 Permission23002=Vytvoření/aktualizace naplánované úlohy
 Permission23003=Smazat naplánovanou úlohu
@@ -798,7 +822,7 @@ Permission2403=Odstranit akce (události nebo úkoly) které souvisí s jeho ú
 Permission2411=Přečtěte akce (události nebo úkoly) a další
 Permission2412=Vytvořit / upravit akce (události nebo úkoly) dalších
 Permission2413=Odstranit akce (události nebo úkoly) dalších
-Permission2414=Export actions/tasks of others
+Permission2414=Export akce / úkoly druhých
 Permission2501=Čtení / Dokumenty ke stažení
 Permission2502=Dokumenty ke stažení
 Permission2503=Vložte nebo odstraňovat dokumenty
@@ -814,20 +838,20 @@ Permission55002=Vytvořit/upravit ankety
 Permission59001=Přečtěte si obchodní marže
 Permission59002=Definovat obchodní marže
 Permission59003=Přečtěte si všechny marže uživatele
-Permission63001=Read resources
-Permission63002=Create/modify resources
-Permission63003=Delete resources
-Permission63004=Link resources to agenda events
-DictionaryCompanyType=Types of thirdparties
-DictionaryCompanyJuridicalType=Legal forms of thirdparties
+Permission63001=číst zdroje
+Permission63002=Vytvořit / upravit zdroje
+Permission63003=Odstranit zdroje
+Permission63004=Propojení zdroje s Plánem akcí
+DictionaryCompanyType=Druhy subjektů
+DictionaryCompanyJuridicalType=Právní formy subjektů
 DictionaryProspectLevel=Potencionální úroveň cílů
 DictionaryCanton=Stát/Okres
 DictionaryRegion=Regiony
 DictionaryCountry=Země
 DictionaryCurrency=Měny
-DictionaryCivility=Personal and professional titles
-DictionaryActions=Types of agenda events
-DictionarySocialContributions=Social or fiscal taxes types
+DictionaryCivility=Osobní a profesionální tituly
+DictionaryActions=Typ agendy událostí
+DictionarySocialContributions=Typy sociální nebo fiskální daně
 DictionaryVAT=Sazby DPH nebo daň z prodeje
 DictionaryRevenueStamp=Výše příjmů známek
 DictionaryPaymentConditions=Platební podmínky
@@ -835,25 +859,27 @@ DictionaryPaymentModes=Platební režimy
 DictionaryTypeContact=Typy kontaktů/adres
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Formáty papíru
-DictionaryFormatCards=Cards formats
-DictionaryFees=Types of fees
+DictionaryFormatCards=Karty formáty
+DictionaryFees=Druhy poplatků
 DictionarySendingMethods=Metody dopravy
 DictionaryStaff=Zaměstnanci
 DictionaryAvailability=Zpoždění dodávky
 DictionaryOrderMethods=Metody objednávání
 DictionarySource=Původ nabídky/objednávky
-DictionaryAccountancyCategory=Accounting account groups
+DictionaryAccountancyCategory=Skupiny účetnictví účtů
 DictionaryAccountancysystem=Modely pro účetní osnovy
+DictionaryAccountancyJournal=účetní deníky
 DictionaryEMailTemplates=E-maily šablony
 DictionaryUnits=Jednotky
-DictionaryProspectStatus=Prospection status
-DictionaryHolidayTypes=Types of leaves
-DictionaryOpportunityStatus=Opportunity status for project/lead
+DictionaryProspectStatus=stav prospekce
+DictionaryHolidayTypes=Typy listů
+DictionaryOpportunityStatus=Stav příležitost k projektu / olovo
 SetupSaved=Nastavení uloženo
+SetupNotSaved=Setup not saved
 BackToModuleList=Zpět na seznam modulů
 BackToDictionaryList=Zpět k seznamu slovníků
 VATManagement=DPH řízení
-VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
+VATIsUsedDesc=Ve výchozím nastavení při vytváření vyhlídky, faktury, objednávky atd sazba DPH se řídí pravidlem aktivní standardní:. <br> Je-li prodávající nepodléhá dani z přidané hodnoty, pak výchozí DPH na 0. Konec vlády <br> li (prodejní země = kupovat zemi), pak se DPH standardně rovná DPH výrobku v prodejním zemi. Konec pravidla. <br> Pokud prodávající a kupující jsou oba v Evropském společenství a zboží přepravní zařízení (auto, loď, letadlo), výchozí DPH je 0 (DPH by měla být hradí kupující na customoffice své země, a nikoli na prodávající). Konec pravidla. <br> Pokud prodávající a kupující jsou oba v Evropském společenství a kupující není společnost, pak se DPH prodlením k DPH z prodaného produktu. Konec pravidla. <br> Pokud prodávající a kupující jsou oba v Evropském společenství a kupujícím je společnost, pak je daň 0 ve výchozím nastavení. Konec pravidla. <br> V každém čiš případě navrhované default je DPH = 0. Konec pravidla.
 VATIsNotUsedDesc=Ve výchozím nastavení je navrhovaná DPH 0, který lze použít v případech, jako je sdružení jednotlivců ou malých podniků.
 VATIsUsedExampleFR=Ve Francii, to znamená, že podniky a organizace, které mají skutečnou fiskální systém (zjednodušený reálný nebo normální reálné). Systém, v němž je deklarován DPH.
 VATIsNotUsedExampleFR=Ve Francii, to znamená, asociace, které jsou bez DPH prohlášené nebo společnosti, organizace nebo svobodných povolání, které se rozhodly pro Micro Enterprise daňového systému (s DPH v povolení) a placenými franšízové ​​DPH bez DPH prohlášení. Tato volba se zobrazí odkaz &quot;nepoužitelné DPH - art-293B CGI&quot; na fakturách.
@@ -883,24 +909,24 @@ LocalTax2IsUsedExampleES= Ve Španělsku, na volné noze a nezávislí odborníc
 LocalTax2IsNotUsedExampleES= Ve Španělsku jsou bussines, které nejsou předmětem daňového systému modulů.
 CalcLocaltax=Zprávy o místních daních
 CalcLocaltax1=Prodej - Nákupy
-CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
+CalcLocaltax1Desc=Místní zprávy Daně jsou počítány s rozdílem mezi prodejem localtaxes a localtaxes nákupů
 CalcLocaltax2=Nákupy
 CalcLocaltax2Desc=Místní zprávy Daně jsou celkem localtaxes nákupů
 CalcLocaltax3=Odbyt
-CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
+CalcLocaltax3Desc=Místní taxy zprávy jsou celkové prodeje localtaxes
 LabelUsedByDefault=Label používá ve výchozím nastavení, pokud není překlad lze nalézt kód
 LabelOnDocuments=Štítek na dokumenty
 NbOfDays=Nb dní
 AtEndOfMonth=Na konci měsíce
-CurrentNext=Current/Next
+CurrentNext=Aktuální / Next
 Offset=Ofset
 AlwaysActive=Vždy aktivní
 Upgrade=Vylepšit
 MenuUpgrade=Aktualizujte / prodloužit
-AddExtensionThemeModuleOrOther=Deploy/install external module
+AddExtensionThemeModuleOrOther=Nasazení / instalace externího modulu
 WebServer=Webový server
-DocumentRootServer=Webového serveru kořenový adresář
-DataRootServer=Dat adresáře souborů
+DocumentRootServer=Kořenový adresář webového serveru
+DataRootServer=Adresář souboru dat
 IP=IP
 Port=Přístav
 VirtualServerName=Název virtuálního serveru
@@ -911,7 +937,7 @@ Server=Server
 Database=Databáze
 DatabaseServer=Databáze hostitele
 DatabaseName=Název databáze
-DatabasePort=Databáze portu
+DatabasePort=Port databáze
 DatabaseUser=Databáze uživatel
 DatabasePassword=Databáze heslo
 Tables=Tabulky
@@ -921,43 +947,45 @@ Host=Server
 DriverType=Typ ovladače
 SummarySystem=Systém souhrn informací
 SummaryConst=Seznam všech nastavených parametrů Dolibarr
-MenuCompanySetup=Společnosti / Nadace
+MenuCompanySetup=Společnost / Organizace
 DefaultMenuManager= Standardní nabídka manažer
 DefaultMenuSmartphoneManager=Smartphone Nabídka manažer
 Skin=Skin téma
 DefaultSkin=Default skin téma
 MaxSizeList=Maximální délka seznamu
-DefaultMaxSizeList=Default max length for lists
-DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
+DefaultMaxSizeList=Výchozí maximální délka pro seznamy
+DefaultMaxSizeShortList=Výchozí maximální délka pro krátké seznamy (tj. V kartě zákazníka)
 MessageOfDay=Zpráva dne
 MessageLogin=Přihlašovací stránka zprávu
+LoginPage=přihlašovací stránka
+BackgroundImageLogin=obrázek na pozadí
 PermanentLeftSearchForm=Permanentní vyhledávací formulář na levém menu
 DefaultLanguage=Výchozí jazyk používat (kód jazyka)
 EnableMultilangInterface=Povolit vícejazyčné rozhraní
 EnableShowLogo=Zobrazit logo na levém menu
-CompanyInfo=Společnosti / Nadace informace
-CompanyIds=Společnost / nadace identity
+CompanyInfo=Společnost/organizace informace
+CompanyIds=Firma / organizace identity
 CompanyName=Název
 CompanyAddress=Adresa
 CompanyZip=Zip
 CompanyTown=Město
 CompanyCountry=Země
 CompanyCurrency=Hlavní měna
-CompanyObject=Object of the company
+CompanyObject=Cílem firmy
 Logo=Logo
 DoNotSuggestPaymentMode=Nenaznačují
 NoActiveBankAccountDefined=Žádný aktivní bankovní účet definován
 OwnerOfBankAccount=Majitel %s bankovních účtů
 BankModuleNotActive=Účty v bankách modul není povolen,
-ShowBugTrackLink=Show link "<strong>%s</strong>"
+ShowBugTrackLink=Ukázat odkaz "<strong> %s </ strong>"
 Alerts=Upozornění
 DelaysOfToleranceBeforeWarning=Tolerance zpoždění před varování
 DelaysOfToleranceDesc=Tato obrazovka umožňuje definovat tolerovat zpoždění před upozornění je hlášen na obrazovce s %s Piktogram pro každý pozdní prvek.
-Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned events (agenda events) not completed yet
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Delay tolerance (in days) before alert on project not closed in time
-Delays_MAIN_DELAY_TASKS_TODO=Delay tolerance (in days) before alert on planned tasks (project tasks) not completed yet
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on orders not processed yet
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on suppliers orders not processed yet
+Delays_MAIN_DELAY_ACTIONS_TODO=Tolerance zpoždění (ve dnech) před záznamem o plánovaných akcích (Agenda akce) dosud nerealizovaných
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Tolerance zpoždění (ve dnech) před záznam o projektu není uzavřeno v čase
+Delays_MAIN_DELAY_TASKS_TODO=Zpozdit toleranci (ve dnech) před záznamem o plánovaných úkolů (projektové úkoly) dosud nebyly dokončeny
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Tolerance zpoždění (ve dnech) před záznamem na objednávkách dosud nezpracovaných
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Tolerance zpoždění (ve dnech) před záznamem na dodavatele zakázky dosud nezpracovaných
 Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Zpoždění tolerance (ve dnech) před záznam o návrzích zavřete
 Delays_MAIN_DELAY_PROPALS_TO_BILL=Zpoždění tolerance (ve dnech) před záznam o návrzích účtovány
 Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerance zpoždění (ve dnech) před záznam o službách aktivovat
@@ -967,30 +995,30 @@ Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Toleranci zpoždění (ve dnech) před
 Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerance zpoždění (ve dnech) před probíhajícím záznamu o bankovním smíření
 Delays_MAIN_DELAY_MEMBERS=Tolerance zpoždění (ve dnech) před záznam o zpoždění členského poplatku
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance zpoždění (ve dnech) před pohotovosti pro kontrolu vklad dělat
-Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
-SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance zpoždění (ve dnech) před záznamem pro výkazů o výdajích schválit
+SetupDescription1=Oblast nastavení je pro počáteční nastavení parametrů ještě před začátkem užívání Dolibarr.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Ostatní položky menu spravovat volitelné parametry.
 LogEvents=Události bezpečnostní audit
 Audit=Audit
-InfoDolibarr=About Dolibarr
-InfoBrowser=About Browser
-InfoOS=About OS
-InfoWebServer=About Web Server
-InfoDatabase=About Database
-InfoPHP=About PHP
-InfoPerf=About Performances
+InfoDolibarr=o Dolibarr
+InfoBrowser=O prohlížeči
+InfoOS=o OS
+InfoWebServer=O webovém serveru
+InfoDatabase=o databázi
+InfoPHP=o PHP
+InfoPerf=o výkonech
 BrowserName=Název prohlížeče
 BrowserOS=Prohlížeč OS
 ListOfSecurityEvents=Seznam Dolibarr událostí zabezpečení
 SecurityEventsPurged=Bezpečnostní akce očistil
 LogEventDesc=Můžete povolit zde protokolování událostí Dolibarr zabezpečení. Správci mohou potom vidět jeho obsah pomocí <b>nástrojů systému</b> menu <b>- audit.</b> Pozor, tato funkce může spotřebovat velké množství dat v databázi.
-AreaForAdminOnly=Tyto vlastnosti mohou být použity <b>správcem uživatele.</b>
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Systémové informace je různé technické informace získáte v režimu pouze pro čtení a viditelné pouze pro správce.
 SystemAreaForAdminOnly=Tato oblast je k dispozici pro správce uživatele. Žádný z Dolibarr oprávnění může snížit tento limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+CompanyFundationDesc=Úpravy na této stránce všechny známé informace o společnosti nebo nadace, které potřebujete spravovat (K tomu, klikněte na „Upravit“ nebo tlačítko „uložit“ v dolní části stránky)
 DisplayDesc=Můžete si vybrat každý parametr týkající se vzhledu Dolibarr a cítit se zde
 AvailableModules=Dostupné moduly
 ToActivateModule=Pro aktivaci modulů, přejděte na nastavení prostoru (Domů-&gt; Nastavení-&gt; Modules).
@@ -1003,15 +1031,15 @@ TriggerDisabledAsModuleDisabled=Trigger v tomto souboru jsou zakázány jako mod
 TriggerAlwaysActive=Trigger v tomto souboru jsou vždy aktivní, ať už jsou aktivované Dolibarr moduly.
 TriggerActiveAsModuleActive=Trigger v tomto souboru jsou aktivní jako modul <b>%s</b> je povoleno.
 GeneratedPasswordDesc=Definujte zde pravidlo, které chcete použít k vytvoření nového hesla, pokud se zeptáte mít automaticky generované heslo
-DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">check here</a>.
-MiscellaneousDesc=All other security related parameters are defined here.
+DictionaryDesc=Vložit všechny referenční data. Můžete přidat své hodnoty na výchozí hodnoty.
+ConstDesc=Na této stránce můžete upravovat všechny ostatní parametry které nejsou k dispozici v předchozích stránkách. Ty jsou většinou vyhrazeny parametry pro vývojáře a pokročilé řešení problémů. Pro seznam možnosti <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site-otevře v novém window" target="_blank"> kontrole zde </ a>.
+MiscellaneousDesc=Všechny ostatní parametry spojené s bezpečností definujete zde.
 LimitsSetup=Limity / Přesné nastavení
 LimitsDesc=Můžete definovat limity, upřesnění a optimalizace používané Dolibarr zde
 MAIN_MAX_DECIMALS_UNIT=Max desetinná pro jednotkových cen
 MAIN_MAX_DECIMALS_TOT=Max desetinná místa pro celkové ceny
 MAIN_MAX_DECIMALS_SHOWN=Max desetinná pro ceny zobrazeny na obrazovce (Přidat <b>...</b> po této řady, chcete-li vidět <b>...</b> když je číslo zkrácena při zobrazení na obrazovce)
-MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
+MAIN_ROUNDING_RULE_TOT=Krok zaokrouhlování (pro země, kde se zaokrouhlení provádí na něčem jiném, než je základna 10. Například položte 0,05, pokud se zaokrouhlení provede o 0,05 kroků)
 UnitPriceOfProduct=Čistá jednotková cena produktu
 TotalPriceAfterRounding=Celková cena (bez DPH / s DPH / s DPH) po zaokrouhlení
 ParameterActiveForNextInputOnly=Parametr efektivní pro další vstup pouze
@@ -1019,7 +1047,7 @@ NoEventOrNoAuditSetup=Žádná událost zabezpečení byl zaznamenán ještě. T
 NoEventFoundWithCriteria=Žádná událost zabezpečení byl nalezen na těchto vyhledávacích kritérii.
 SeeLocalSendMailSetup=Podívejte se na místní sendmail nastavení
 BackupDesc=Chcete-li provést kompletní zálohu Dolibarr, musíte:
-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).
+BackupDesc2=Uložte obsah adresáře dokumentů (<b> %s </ b>), který obsahuje všechny nahrané a generované soubory (tedy obsahuje všechny soubory výpisu generovaných v kroku 1).
 BackupDesc3=Uložte obsah databáze <b>(%s),</b> do souboru výpisu. K tomu můžete použít následující asistenta.
 BackupDescX=Archivní adresář by měl být skladován na bezpečném místě.
 BackupDescY=Vygenerovaný soubor výpisu by měl být skladován na bezpečném místě.
@@ -1068,22 +1096,23 @@ SendmailOptionNotComplete=Upozornění na některých operačních systémech Li
 PathToDocuments=Cesta k dokumentům
 PathDirectory=Adresář
 SendmailOptionMayHurtBuggedMTA=Funkce se odesílat e-maily pomocí metody "PHP mail direct" bude generovat e-mailové zprávy, které by mohly být není správně analyzovat některými dostávají poštovní servery. Výsledkem je, že některé maily nelze číst lidé hostovaných těmito platformami odposloucháván. To je případ některých poskytovatelů služeb Internetu (Ex: Orange ve Francii). To není problém do Dolibarr ani do PHP, ale na přijímání e-mailový server. Můžete však přidat možnost MAIN_FIX_FOR_BUGGED_MTA do 1 do nastavení - jiné upravovat Dolibarr k tomu nedošlo. Nicméně, může dojít k problému s jinými servery, které respektují přísně standard SMTP. Jiné řešení (doporučeno), je použít metodu "SMTP socket knihovnu", které nemá žádné nevýhody.
-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: <strong>User display setup</strong> tab of 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
-TranslationString=Translation string
-CurrentTranslationString=Current translation string
-WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
-NewTranslationStringToShow=New translation string to show
-OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TranslationSetup=Nastavení překladu
+TranslationKeySearch=Hledat klíč překlad nebo řetězec
+TranslationOverwriteKey=Přepsat překlad řetězec
+TranslationDesc=Jak nastavit zobrazený jazyk aplikace: <br> * systémovou: nabídku <strong> Domů - Nastavení - zobrazení </ strong> <br> * Per uživatele: Nastavení zobrazení <strong> uživatelů </ strong> na kartě uživatele (klikněte na uživatelské jméno v horní části obrazovky).
+TranslationOverwriteDesc=Můžete také přepsat řetězce čerpacích následující tabulky. Vyberte si svůj jazyk „%s“ rozbalené, vložte klíč řetězec překlad do „%s“ a svým novým překladem do „%s“
+TranslationOverwriteDesc2=Můžete použít kartu další, které vám pomohou vědět, klíč překlad používat
+TranslationString=překlad string
+CurrentTranslationString=Aktuální překladový řetězec
+WarningAtLeastKeyOrTranslationRequired=A kritéria vyhledávání je zapotřebí alespoň na klíče nebo překladu řetězce
+NewTranslationStringToShow=Nový překlad řetězec ukázat
+OriginalValueWas=Původní překlad je přepsán. Původní hodnota byla: <br> %s
+TransKeyWithoutOriginalValue=nucen vám nový překlad pro klíč překladu ‚<strong> %s </ strong>‘, která nemá v žádném jazykové soubory nejsou existuje
+TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Musíte povolit alespoň jeden modul
 ClassNotFoundIntoPathWarning=Třída %s nenašli cestu do PHP
 YesInSummer=Ano v létě
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Všimněte si, pouze tyto moduly jsou otevřeny pro externí uživatele (ať mají povolení těchto uživatelů) a pouze tehdy, pokud bylo uděleno oprávnění:
 SuhosinSessionEncrypt=Úložiště relace šifrována Suhosin
 ConditionIsCurrently=Podmínkou je v současné době %s
 YouUseBestDriver=Pomocí ovladače %s, že je nejlepší řidič současné době k dispozici.
@@ -1096,45 +1125,47 @@ BrowserIsKO=Používáte %s webovém prohlížeči. Tento prohlížeč je známo
 XDebugInstalled=Xdebug je načten.
 XCacheInstalled=XCache načten.
 AddRefInList=Displej zákazník / dodavatel ref do seznamu (vyberte seznam nebo ComboBox) a většina z hypertextový odkaz. Třetí strany budou zobrazí s názvem "CC12345 - SC45678 - Velké firmy coorp", namísto "The velké společnosti coorp".
-AskForPreferredShippingMethod=Ask for preferred Sending Method for Third Parties.
+AskForPreferredShippingMethod=Požádat o přednostní způsob odeslání pro subjekty
 FieldEdition=Editace položky %s
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
+FillThisOnlyIfRequired=Příklad: 2 (vyplnit pouze v případě časové pásmo kompenzovat problémy jsou zkušení)
 GetBarCode=Získat čárový kód
 ##### Module password generation
 PasswordGenerationStandard=Zpět heslo generované podle interního algoritmu Dolibarr: 8 znaků obsahující sdílené čísla a znaky malými písmeny.
-PasswordGenerationNone=Do not suggest any 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
+PasswordGenerationNone=Nenaznačují žádnou vygenerované heslo. Heslo musí být zadány ručně.
+PasswordGenerationPerso=Vrátit hesla dle Vašeho osobně definované konfiguraci.
+SetupPerso=Podle konfigurace
+PasswordPatternDesc=Popis popisu hesla
 ##### Users setup #####
 RuleForGeneratedPasswords=Pravidlo pro generování hesel navrhovaná nebo ověřování hesla
 DisableForgetPasswordLinkOnLogonPage=Nezobrazovat na odkaz &quot;Zapomněli jste heslo&quot; na přihlašovací stránce
 UsersSetup=Uživatelé modul nastavení
 UserMailRequired=EMail nutné vytvořit nového uživatele
 ##### HRM setup #####
-HRMSetup=HRM module setup
+HRMSetup=setup HRM Modul
 ##### Company setup #####
 CompanySetup=Firmy modul nastavení
 CompanyCodeChecker=Modul pro generování kódu třetích stran a přezkušování (zákazník nebo dodavatel)
 AccountCodeManager=Modul pro generování kódu účetnictví (zákazník nebo dodavatel)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
-NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
-NotificationsDescGlobal=* or by setting global target emails in module setup page.
+NotificationsDesc=E-maily oznámení funkce vám umožní tiše odesílat automatické poštu, pro některé události Dolibarr. Cíle oznámení mohou být definovány:
+NotificationsDescUser=* Uživatelé na jeden uživatel v čase.
+NotificationsDescContact=* Za subjekty kontakty (zákazníci nebo dodavatelé), jeden kontakt v době.
+NotificationsDescGlobal=* Nebo nastavením globálních cílových e-mailů na stránce nastavení modulu.
 ModelModules=Dokumenty šablony
 DocumentModelOdt=Generování dokumentů z OpenDocuments šablon (. ODT nebo ODS. Soubory OpenOffice, KOffice, TextEdit, ...)
 WatermarkOnDraft=Vodoznak na návrhu dokumentu
-JSOnPaimentBill=Activate feature to autofill payment lines on payment form
+JSOnPaimentBill=Aktivovat funkci pro automatické vyplňování platebních řádků na formuláři platby
 CompanyIdProfChecker=Pravidla pro profesionální IDs
-MustBeUnique=Must be unique?
-MustBeMandatory=Mandatory to create third parties?
-MustBeInvoiceMandatory=Mandatory to validate invoices?
+MustBeUnique=Musí být jedinečný?
+MustBeMandatory=Povinné k vytvoření subjektu?
+MustBeInvoiceMandatory=Povinné ověřování faktur?
+TechnicalServicesProvided=Technické služby poskytované
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Export odkaz na <b>%s</b> formátu je k dispozici na následujícím odkazu: %s
 ##### Invoices #####
 BillsSetup=Faktury modul nastavení
 BillsNumberingModule=Faktury a dobropisy číslování modelu
 BillsPDFModules=Fakturační doklady modely
+PaymentsPDFModules=Payment documents models
 CreditNote=Dobropis
 CreditNotes=Dobropisy
 ForceInvoiceDate=Force faktury datum Datum ověření
@@ -1143,9 +1174,9 @@ SuggestPaymentByRIBOnAccount=Navrhnout platbu odstoupit z důvodu
 SuggestPaymentByChequeToAddress=Navrhnout platbu šekem na
 FreeLegalTextOnInvoices=Volný text na fakturách
 WatermarkOnDraftInvoices=Vodoznak k návrhům faktur (pokud žádný prázdný)
-PaymentsNumberingModule=Payments numbering model
+PaymentsNumberingModule=Platby modelu číslování
 SuppliersPayment=Platby dodavatelům
-SupplierPaymentSetup=Suppliers payments setup
+SupplierPaymentSetup=setup Dodavatelé platby
 ##### Proposals #####
 PropalSetup=Obchodní návrhy modul nastavení
 ProposalsNumberingModules=Komerční návrh číslování modely
@@ -1155,21 +1186,21 @@ WatermarkOnDraftProposal=Vodoznak na předloh návrhů komerčních (none-li pr
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Zeptejte se na umístění bankovního účtu nabídky
 ##### SupplierProposal #####
 SupplierProposalSetup=Cena požaduje nastavení dodavatelé modul
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
+SupplierProposalNumberingModules=Cena žádosti dodavatele číslování modelů
+SupplierProposalPDFModules=Cena požaduje dodavatelé dokumenty modely
 FreeLegalTextOnSupplierProposal=Volný text na žádosti o cenový dodavatele
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+WatermarkOnDraftSupplierProposal=Vodoznak na předem požadovaných cenách dodavatelé (žádný není prázdný)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Zeptejte se na bankovní účet destinaci nabídce ceny
-WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
+WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Zadat zdroj datového skladu pro objednávku
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Požádat o bankovní účet určení dodavatele objednávku
 ##### Orders #####
 OrdersSetup=Objednat řízení nastavení
 OrdersNumberingModules=Objednávky číslování modelů
 OrdersModelModule=Objednat dokumenty modely
 FreeLegalTextOnOrders=Volný text o objednávkách
 WatermarkOnDraftOrders=Vodoznak na konceptech objednávek (pokud žádný prázdný)
-ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
+ShippableOrderIconInList=Přidejte ikonu v seznamu objednávek, které určí, zda objednávka je možné doručit
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Zeptejte se na bankovní účet destinaci objednávky
 ##### Interventions #####
 InterventionsSetup=Intervence modul nastavení
@@ -1214,7 +1245,7 @@ LDAPServerUseTLS=Použít TLS
 LDAPServerUseTLSExample=Váš server LDAP použití TLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
+LDAPAdminDnExample=Kompletní DN (ex: cn = admin, dc = example, dc = com nebo CN = správce, CN = Uživatelé, dc = example, dc = com pro aktivní adresář)
 LDAPPassword=Heslo správce
 LDAPUserDn=DN uživatelů
 LDAPUserDnExample=Kompletní DN (ex: ou = uživatelé, dc = priklad, dc = com)
@@ -1302,7 +1333,7 @@ LDAPFieldCompanyExample=Příklad: o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Příklad: objectSID
 LDAPFieldEndLastSubscription=Datum ukončení předplatného
-LDAPFieldTitle=Job position
+LDAPFieldTitle=Pracovní pozice
 LDAPFieldTitleExample=Příklad: title
 LDAPSetupNotComplete=Nastavení LDAP není úplná (přejděte na záložku Ostatní)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Žádný správce nebo heslo k dispozici. LDAP přístup budou anonymní a pouze pro čtení.
@@ -1327,25 +1358,32 @@ FilesOfTypeNotCached=Soubory typu %s nejsou ukládány do mezipaměti serveru HT
 FilesOfTypeCompressed=Soubory typu %s jsou zkomprimovány serveru HTTP
 FilesOfTypeNotCompressed=Soubory typu %s nekomprimuje serveru HTTP
 CacheByServer=Cache serverem
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache v prohlížeči
 CompressionOfResources=Komprese odpovědí HTTP
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
+CompressionOfResourcesDesc=For exemple using the Apache directive "AddOutputFilterByType DEFLATE"
+TestNotPossibleWithCurrentBrowsers=Taková automatická detekce není možné u současných prohlížečů
+DefaultValuesDesc=Můžete definovat / sílu zde výchozí hodnotu, kterou chcete získat, když si vytvořit nový rekord, a / nebo défaut filtry nebo pořadí řazení, když váš seznam záznamů.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Produkty modul nastavení
 ServiceSetup=Služby modul nastavení
 ProductServiceSetup=Produkty a služby moduly nastavení
 NumberOfProductShowInSelect=Maximální počet výrobků ve komba vyberte seznamy (0 = bez omezení)
 ViewProductDescInFormAbility=Vizualizace popisy produktů ve formách (jinak jako vyskakovací bublině)
-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 third party language
-UseSearchToSelectProductTooltip=Also if you have a large number of product (> 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)
+MergePropalProductCard=Aktivovat v servisním / Attached kartě výrobku Soubory možnost sloučit produkt PDF dokument k návrhu PDF Azur-li výrobek / služba je v návrhu
+ViewProductDescInThirdpartyLanguageAbility=Vizualizace popisů výrobků v jazyce subjektu
+UseSearchToSelectProductTooltip=Také pokud máte velký počet produktů (> 100 000), můžete zvýšit rychlost nastavením konstantního PRODUCT_DONOTSEARCH_ANYWHERE na 1 v položce Setup-> Other. Hledání bude omezeno na začátek řetězce.
+UseSearchToSelectProduct=Počkat stisknutí klávesy před vložením obsahu seznamu produktů combo (To může zvýšit výkon, pokud máte velké množství výrobků, ale je to méně pohodlné)
 SetDefaultBarcodeTypeProducts=Výchozí typ čárového kódu použít pro produkty
 SetDefaultBarcodeTypeThirdParties=Výchozí typ čárového kódu použít k třetím osobám
-UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
+UseUnits=Vymezují měrnou jednotku pro Množství v průběhu objednávky, návrh nebo faktura linky edition
 ProductCodeChecker= Modul pro generování kódu produktu a přezkušování (výrobku nebo služby)
 ProductOtherConf= Katalog / Konfigurace služby
-IsNotADir=is not a directory!
+IsNotADir=není adresář!
 ##### Syslog #####
 SyslogSetup=Záznamy modul nastavení
 SyslogOutput=Záznamy výstupy
@@ -1371,13 +1409,13 @@ BarcodeDescUPC=Čárových kódů typu UPC
 BarcodeDescISBN=Čárový kód typu ISBN
 BarcodeDescC39=Čárový kód typu C39
 BarcodeDescC128=Čárový kód typu C128
-BarcodeDescDATAMATRIX=Barcode of type Datamatrix
-BarcodeDescQRCODE=Barcode of type QR code
+BarcodeDescDATAMATRIX=Čárový kód typu Datamatrix
+BarcodeDescQRCODE=Čárových kódů typu QR kódu
 GenbarcodeLocation=Čárový kód generování nástroj pro příkazovou řádku (používaný vnitřním motorem u některých typů čárových kódů). Musí být v souladu s "genbarcode". <br> Například: / usr / local / bin / genbarcode
 BarcodeInternalEngine=Vnitřní motor
 BarCodeNumberManager=Manažer automatického definování čísel čárových kódů
 ##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct debit payment orders
+WithdrawalsSetup=Nastavení modulu Direct debetních platebních příkazů
 ##### ExternalRSS #####
 ExternalRSSSetup=Externí RSS dovoz Nastavení
 NewRSS=New RSS Feed
@@ -1396,8 +1434,8 @@ FixedEmailTarget=Pevná emailový cíl
 SendingsSetup=Odeslání Nastavení modulu
 SendingsReceiptModel=Odeslání stvrzenky modelu
 SendingsNumberingModules=Sendings číslování moduly
-SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
+SendingsAbility=Podpora zásilka listy pro dodávky zákazníkům
+NoNeedForDeliveryReceipts=Ve většině případů, dodacích listů jsou používány i jako listů pro dodávky zákazníkům (seznam produktů pro odeslání) a listů, které jsou přijímány a podepsané zákazníkem. Takže dodávky produktů příjmy je duplicitní funkce a je zřídka aktivován.
 FreeLegalTextOnShippings=Volný text o přepravě
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Produkty dodávky příjem číslování modul
@@ -1412,7 +1450,7 @@ FCKeditorForProduct=WYSIWIG vytvoření / edice produktů / služeb popis a pozn
 FCKeditorForProductDetails=WYSIWIG tvorba / vydání z výrobků Detaily linky pro všechny subjekty (návrhy, objednávky, faktury, atd ...). <font class="warning">Upozornění: Použití této možnosti pro tento případ je vážně nedoporučuje, protože to může způsobit problémy se speciálními znaky a formátování stránky při vytváření PDF soubory.</font>
 FCKeditorForMailing= WYSIWIG vytvoření / edice pro hromadné eMailings (Nástroje-&gt; e-mailem)
 FCKeditorForUserSignature=WYSIWIG vytvoření / edice uživatelského podpisu
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
+FCKeditorForMail=Vytvoření WYSIWIG / edition pro veškerou poštu (s výjimkou Nástroje-> e-mailem)
 ##### OSCommerce 1 #####
 OSCommerceErrorConnectOkButWrongDatabase=Připojení úspěšné, ale databáze nevypadá, že databáze OsCommerce (Klíčové %s nenašli v tabulce %s).
 OSCommerceTestOk=Připojení k serveru &quot;%s&quot; na databázi &quot;%s&quot; s úspěšní uživatel &quot;%s.
@@ -1420,12 +1458,12 @@ OSCommerceTestKo1=Připojení k &quot;%s&quot; serveru úspěšná, ale databáz
 OSCommerceTestKo2=Připojení k serveru &quot;%s&quot; s uživatelem &quot;%s 'se nezdařilo.
 ##### Stock #####
 StockSetup=Konfigurace modulu Sklady
-IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
+IfYouUsePointOfSaleCheckModule=Pokud použijete místě prodeje (POS modulu modulu stanoveného ve výchozím nebo jiným externím modulu), může být toto nastavení ignorováno vaší místě prodeje modulu. Most na prodejních místech moduly jsou navrženy tak, aby vytvořit ihned fakturu a snížit zásoby standardně bez ohledu jsou možnosti zde. Takže, pokud potřebujete mít či nemít pokles zásoby při registraci prodat ze svého Point of Sale, zkontrolujte také váš POS modul nastavit.
 ##### Menu #####
 MenuDeleted=Menu smazán
 Menus=Nabídky
 TreeMenuPersonalized=Personalizované menu
-NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
+NotTopTreeMenuPersonalized=Personalizované menu nejsou spojeny s horní položku nabídky
 NewMenu=Nová nabídka
 Menu=Výběr z jídelního lístku
 MenuHandler=Menu handler
@@ -1446,10 +1484,10 @@ DetailTarget=Cíl pro odkazy (_blank nahoře otevře nové okno)
 DetailLevel=Úroveň (-1: hlavní menu, 0: header menu&gt; 0 Menu a dílčí menu)
 ModifMenu=Menu změna
 DeleteMenu=Smazat položku nabídky
-ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
-FailedToInitializeMenu=Failed to initialize menu
+ConfirmDeleteMenu=Jste si jisti, že chcete smazat položku v nabídce <b> %s </ b>?
+FailedToInitializeMenu=Nepodařilo se inicializovat nabídku
 ##### Tax #####
-TaxSetup=Taxes, social or fiscal taxes and dividends module setup
+TaxSetup=Daně, sociální a fiskální daně a dividendy nastavení modulu
 OptionVatMode=DPH z důvodu
 OptionVATDefault=Cash základ
 OptionVATDebitOption=Akruální báze
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Faktura použita data
 Buy=Koupit
 Sell=Prodávat
 InvoiceDateUsed=Faktura použita data
-YourCompanyDoesNotUseVAT=Vaše společnost byla definována nepoužívat DPH (Home - Nastavení - Firma / Foundation), takže není DPH na možnosti nastavení.
+YourCompanyDoesNotUseVAT=Vaše společnost byla definována tak, aby nepoužívá DPH (Home - Setup - Firma / organizace), takže neexistují žádné možnosti DPH na nastavení.
 AccountancyCode=Účetnictví kód
 AccountancyCodeSell=Prodej účtu. kód
 AccountancyCodeBuy=Nákup účet. kód
@@ -1472,19 +1510,20 @@ AccountancyCodeBuy=Nákup účet. kód
 AgendaSetup=Akce a agenda Nastavení modulu
 PasswordTogetVCalExport=Klíč povolit export odkaz
 PastDelayVCalExport=Neexportovat události starší než
-AGENDA_USE_EVENT_TYPE=Use events types (managed into menu Setup -> Dictionary -> Type of agenda events)
-AGENDA_USE_EVENT_TYPE_DEFAULT=Set automatically this default value for type of event into event create form
+AGENDA_USE_EVENT_TYPE=Typy použití akce (řízený do menu Nastavení -> Slovník -> typ pořadu událostí)
+AGENDA_USE_EVENT_TYPE_DEFAULT=Nastaví automaticky tuto výchozí hodnotu pro typ akce do akce vytvářet formuláře
 AGENDA_DEFAULT_FILTER_TYPE=Nastavit automaticky tento typ události do vyhledávacího filtru pohledu agendy
 AGENDA_DEFAULT_FILTER_STATUS=Nastavit automaticky tento stav pro události do vyhledávacího filtru pohledu agendy
 AGENDA_DEFAULT_VIEW=Karta, kterou chcete otevřít ve výchozím nastavení při výběru v menu Agenda
-AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
-AGENDA_NOTIFICATION_SOUND=Enable sound notification
+AGENDA_NOTIFICATION=Povolit oznámení události na uživatelských prohlížečů, když je dosaženo datum události (každý uživatel má možnost odmítnout to z potvrzovacího prohlížeč otázky o)
+AGENDA_NOTIFICATION_SOUND=Povolit zvukové upozornění
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Klikněte pro Dial Nastavení modulu
-ClickToDialUrlDesc=Url volána, když se provádí kliknutím na tel. Piktogram. Do pole URL můžete použít značky <br> <b>__PHONETO__</b> Který bude nahrazen s telefonním číslem osoby volat <br> <b>__PHONEFROM__</b> Který bude nahrazen tel. číslo volajícího (vaše) <br> <b>__LOGIN__</b> Který bude nahrazen s clicktodial přihlášení (definované na kartě uživatele) <br> <b>__PASS__</b> Který bude nahrazen s clicktodial heslo (definované na kartě uživatele).
-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.
-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 same computer than 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.
+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=Tento modul umožňuje kliknutí na telefonní číslo. Kliknutím na tuto ikonu bude volat, aby váš telefon pro volání na telefonní číslo. Toho lze využít k volání call centra systému z Dolibarr které mohou volat na telefonní číslo SIP systému, například.
+ClickToDialUseTelLink=Na telefonních číslech použijte pouze odkaz "tel:"
+ClickToDialUseTelLinkDesc=Tuto metodu použijte, pokud uživatelé mají softwarový telefon nebo softwarové rozhraní nainstalován na stejném počítači, než prohlížeče, a volal, když kliknete na odkaz ve vašem prohlížeči, které začínají „tel“. Pokud potřebujete komplexní řešení serveru (bez nutnosti lokální instalace softwaru), musíte toto nastavit na „Ne“ a vyplňte následující pole.
 ##### Point Of Sales (CashDesk) #####
 CashDesk=Bod prodeje
 CashDeskSetup=Místě prodeje modulu nastavení
@@ -1492,11 +1531,11 @@ CashDeskThirdPartyForSell=Výchozí obecná třetí strana použitá pro prodej
 CashDeskBankAccountForSell=Výchozí účet použít pro příjem plateb v hotovosti
 CashDeskBankAccountForCheque= Výchozí účet použít pro příjem plateb šekem
 CashDeskBankAccountForCB= Výchozí účet použít pro příjem plateb prostřednictvím kreditní karty
-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=Zakážete pokles akcií, pokud je prodej uskutečněn z prodejního místa (pokud je to "ne", u každého prodeje provedeného z POS se sníží akcie, ať už je nastavena volba do modulu Akcie).
 CashDeskIdWareHouse=Vynutit a omezit sklad používat pro pokles zásob
-StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
-StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot management
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
+StockDecreaseForPointOfSaleDisabled=Sklad pokles od Point of Sale zakázán
+StockDecreaseForPointOfSaleDisabledbyBatch=Sklad pokles POS není kompatibilní s řízením šarží
+CashDeskYouDidNotDisableStockDecease=Jste nezakázali nutnosti snížení při provádění sell od Point of Sale. Takže je zapotřebí sklad.
 ##### Bookmark #####
 BookmarkSetup=Záložka Nastavení modulu
 BookmarkDesc=Tento modul umožňuje spravovat záložky. Můžete také přidat zástupce pro všechny Dolibarr stránky nebo externale webových stránek na vašem levém menu.
@@ -1505,15 +1544,15 @@ NbOfBoomarkToShow=Maximální počet záložek zobrazí v levém menu
 WebServicesSetup=Webservices modul nastavení
 WebServicesDesc=Tím, že tento modul, Dolibarr stal webový server služby poskytovat různé webové služby.
 WSDLCanBeDownloadedHere=WSDL deskriptor soubory poskytovaných služeb lze stáhnout zde
-EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
+EndPointIs=SOAP klienti musí poslat své požadavky na Dolibarr koncový bod je k dispozici na adrese
 ##### API ####
-ApiSetup=API module setup
-ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
-OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
-ApiKey=Key for API
-WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
+ApiSetup=setup API modul
+ApiDesc=Povolením tohoto modulu Dolibarr stal REST server poskytovat různé webové služby.
+ApiProductionMode=Povolení režimu výroby (to bude aktivovat použití cache pro správu služeb)
+ApiExporerIs=Si můžete prohlédnout a vyzkoušet API na adrese
+OnlyActiveElementsAreExposed=Jediné prvky z povolených modulů jsou vystaveny
+ApiKey=Klíčem k API
+WarningAPIExplorerDisabled=Průzkumník API byla zakázána. explorer API není povinen poskytovat služby API. Jedná se o nástroj pro vývojáře najít / testovací REST API. Potřebujete-li tento nástroj, přejděte do nastavení modulu API REST pro jeho aktivaci.
 ##### Bank #####
 BankSetupModule=Bankovní modul nastavení
 FreeLegalTextOnChequeReceipts=Volný text na kontroly příjmů
@@ -1522,8 +1561,7 @@ BankOrderGlobal=Obecný
 BankOrderGlobalDesc=Obecné pořadí zobrazení
 BankOrderES=Španělština
 BankOrderESDesc=Španělská pořadí zobrazení
-ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
+ChequeReceiptsNumberingModule=Zkontrolujte, zda příjmy číslování modul
 ##### Multicompany #####
 MultiCompanySetup=Společnost Multi-modul nastavení
 ##### Suppliers #####
@@ -1545,121 +1583,126 @@ ProjectsSetup=Projekt modul nastavení
 ProjectsModelModule=Projekt zprávy Vzor dokladu
 TasksNumberingModules=Úkoly číslování modul
 TaskModelModule=Úkoly zprávy Vzor dokladu
-UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
+UseSearchToSelectProject=Použít automatické dokončování polí pro výběr projektu (namísto použití pole se seznamem)
 ##### ECM (GED) #####
 ##### Fiscal Year #####
-AccountingPeriods=Accounting periods
-AccountingPeriodCard=Accounting period
-NewFiscalYear=New accounting period
-OpenFiscalYear=Open accounting period
-CloseFiscalYear=Close accounting period
-DeleteFiscalYear=Delete accounting period
-ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
-ShowFiscalYear=Show accounting period
+AccountingPeriods=účetní období
+AccountingPeriodCard=Účetní období
+NewFiscalYear=Nové účetní období
+OpenFiscalYear=Otevřené účetní období
+CloseFiscalYear=Uzavřené účetní období
+DeleteFiscalYear=Smazat účetní období
+ConfirmDeleteFiscalYear=Opravdu chcete smazat toto účetní období?
+ShowFiscalYear=Show účetní období
 AlwaysEditable=Může být vždy upraveno
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+MAIN_APPLICATION_TITLE=Nutit viditelný název aplikace (upozornění: nastavení své jméno zde může dojít ke zlomení automatického vyplňování přihlašovacích funkci při používání mobilní aplikace DoliDroid)
 NbMajMin=Minimální počet velkých písmen
 NbNumMin=Minimální počet číselných znaků
 NbSpeMin=Minimální počet speciálních znaků
 NbIteConsecutive=Maximální počet opakování stejných znaků
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+NoAmbiCaracAutoGeneration=Nepoužívejte nejednoznačné znaky ( "1", "L", "i", "|", "0", "O") pro automatické generování
 SalariesSetup=Nastavení modulu platů
 SortOrder=Řazení objedávek
 Format=Formát
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0: Zákazník typ platby, 1: Dodavatel typ platby, 2: Oba zákazníci a dodavatelé typ platby
 IncludePath=Zahrnout cestu (definováno v proměnné% s)
 ExpenseReportsSetup=Nastavení modulu Expense Reports
 TemplatePDFExpenseReports=Šablon dokumentů ke generování dokumentu sestavy výdajů
-NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
-YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of notifications per user*
-ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
+NoModueToManageStockIncrease=Žádný modul schopen řídit automatické zvýšení zásoby byl aktivován. Zvýšení fond bude probíhat pouze na ruční vstup.
+YouMayFindNotificationsFeaturesIntoModuleNotification=Můžete najít možnosti pro oznamování e-mailu aktivaci a konfiguraci modulu „oznámením“.
+ListOfNotificationsPerUser=Seznam oznámení na uživatele *
+ListOfNotificationsPerUserOrContact=Seznam oznámení na jednoho uživatele * nebo na kontakt **
 ListOfFixedNotifications=Seznam pevných oznámení
-GoOntoUserCardToAddMore=Go on 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 contacts/addresses
+GoOntoUserCardToAddMore=Přejít na záložku „oznámení“ o uživateli přidat nebo odebrat oznámení pro uživatele
+GoOntoContactCardToAddMore=Přejít na záložku „Oznámení“ třetí strany přidat nebo odebrat oznámení pro kontakty / adresy
 Threshold=Práh
 BackupDumpWizard=Průvodce vybudovat záložní databázi soubor s výpisem
 SomethingMakeInstallFromWebNotPossible=Instalace externího modulu není možné z webového rozhraní z tohoto důvodu:
 SomethingMakeInstallFromWebNotPossible2=Z tohoto důvodu, proces upgradovat popsáno zde je pouze ruční kroky privilegovaný uživatel může dělat.
-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.
-ConfFileMuseContainCustom=Installing 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)
-TextTitleColor=Color of page title
-LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
-NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
-BackgroundColor=Background color
-TopMenuBackgroundColor=Background color for Top menu
-TopMenuDisableImages=Hide images in Top menu
-LeftMenuBackgroundColor=Background color for Left menu
-BackgroundTableTitleColor=Background color for Table title line
-BackgroundTableLineOddColor=Background color for odd table lines
-BackgroundTableLineEvenColor=Background color for even table lines
-MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
-NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
-UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
-PositionIntoComboList=Position of line into combo lists
-SellTaxRate=Sale tax rate
-RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
-UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipping, you can enter it here. You can use the key {TRACKID} into URL parameters so the system will replace it with value of tracking number user entered into shipment card.
-OpportunityPercent=When you create an opportunity, you will defined an estimated amount of project/lead. According to status of opportunity, this amount may be multiplicated 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
+InstallModuleFromWebHasBeenDisabledByFile=Instalace externí modul z aplikace byl zakázán správcem. Musíte ho požádat, aby odstranit soubor <strong> %s </ strong>, aby tuto funkci povolil.
+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=Označte řádky tabulky, když tah myš vynechá
+HighlightLinesColor=Zvýrazněte barvu čáry, když myší prochází (držte prázdné, aby nebylo zvýrazněno)
+TextTitleColor=Barva názvu stránky
+LinkColor=Barva odkazů
+PressF5AfterChangingThis=Stisknutím klávesy CTRL + F5 na klávesnici nebo vymazat mezipaměť prohlížeče Po změně této hodnoty, aby bylo účinné
+NotSupportedByAllThemes=Se pracuje s stěžejních témat, nemusí být podporována externími tématy
+BackgroundColor=Barva pozadí
+TopMenuBackgroundColor=barva pozadí pro Top nabídky
+TopMenuDisableImages=Skrýt obrázky v Top nabídky
+LeftMenuBackgroundColor=barva pozadí na levé menu
+BackgroundTableTitleColor=Barva pozadí pro tabulku názvu linky
+BackgroundTableLineOddColor=Barva pozadí pro liché řádky tabulky
+BackgroundTableLineEvenColor=barva pozadí pro sudé řádky tabulky
+MinimumNoticePeriod=Minimální výpovědní lhůta (Vaše žádost dovolená musí být provedeno před tímto zpožděním)
+NbAddedAutomatically=Počet dnů, přidány do čítače uživatelů (automaticky) každý měsíc
+EnterAnyCode=Toto pole obsahuje odkaz k identifikaci řádku. Zadat libovolnou hodnotu dle vlastního výběru, ale bez speciálních znaků.
+UnicodeCurrency=mezi závorkami, seznam počtu bajtů, které představují symbol měny zadejte zde. Pro exemple: za $, zadejte [36] - pro Brazílii real R $ [82,36] - pro €, zadejte [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
+PositionIntoComboList=Postavení linky do seznamů combo
+SellTaxRate=Prodej sazba daně
+RecuperableOnly=Ano pro DPH „Non Perçue druhotných“ určený pro nějaký stát ve Francii. Udržovat hodnotu „Ne“ ve všech ostatních případech.
+UrlTrackingDesc=V případě, že poskytovatel nebo dopravy nabízejí stránky nebo webové stránky, zkontrolovat stav vašeho dopravou, můžete ji zadat zde. Můžete použít tlačítko {} TrackID do parametrů URL, takže systém bude jej nahradit hodnota sledovací číslo uživatele uzavřela odeslání karty.
+OpportunityPercent=Při vytváření příležitostí, budete definoval odhadované částky projektu / olovo. V závislosti na stavu příležitosti, může být tato částka vícenásobných tímto tempem zhodnotit celkovou částku všechny své možnosti, může generovat. Hodnota je procento (mezi 0 a 100).
+TemplateForElement=Tento záznam šablona je určena ke kterému element
+TypeOfTemplate=Typ šablony
+TemplateIsVisibleByOwnerOnly=Šablona je viditelná pouze vlastníkovi
 FixTZ=TimeZone fix
-FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
-ExpectedChecksum=Expected Checksum
-CurrentChecksum=Current Checksum
-ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the latest stable version
-TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
-TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so 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 usefull only if your prices for each leve 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.
-SeeSubstitutionVars=See * note for list of possible substitution variables
-AllPublishers=All publishers
-UnknownPublishers=Unknown publishers
-AddRemoveTabs=Add or remove tabs
-AddDictionaries=Add dictionaries
-AddBoxes=Add widgets
-AddSheduledJobs=Add scheduled jobs
-AddHooks=Add hooks
-AddTriggers=Add triggers
-AddMenus=Add menus
-AddPermissions=Add permissions
-AddExportProfiles=Add export profiles
-AddImportProfiles=Add import profiles
-AddOtherPagesOrServices=Add other pages or services
-AddModels=Add document or numbering templates
-AddSubstitutions=Add keys substitutions
-DetectionNotPossible=Detection not possible
-UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved on 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 correclty. 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 inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <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
-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
-TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+FillFixTZOnlyIfRequired=Příklad: 2 (vyplnit pouze tehdy, pokud problém týkal)
+ExpectedChecksum=očekává Kontrolní součet
+CurrentChecksum=Aktuální Kontrolní
+ForcedConstants=Potřebné konstanty
+MailToSendProposal=Chcete-li poslat návrh zákazníka
+MailToSendOrder=Pro odeslání objednávky zákazníka
+MailToSendInvoice=Chcete-li poslat zákazníkům faktury
+MailToSendShipment=Chcete-li poslat zásilku
+MailToSendIntervention=Chcete-li poslat zásah
+MailToSendSupplierRequestForQuotation=Chcete-li odeslat žádost o kotace pro dodavatele
+MailToSendSupplierOrder=Chcete-li poslat dodavatele objednávku
+MailToSendSupplierInvoice=Chcete-li poslat dodavatelské faktury
+MailToSendContract=Chcete-li poslat smlouvu
+MailToThirdparty=Chcete-li poslat e-mail ze strany subjektů
+ByDefaultInList=Zobrazit výchozí zobrazení seznamu
+YouUseLastStableVersion=Používáte nejnovější stabilní verzi
+TitleExampleForMajorRelease=Příklad zprávy, kterou lze použít k oznámit tuto hlavní verzi (bez obav používat na svých webových stránkách)
+TitleExampleForMaintenanceRelease=Příklad zprávy, kterou lze použít k oznámit toto uvolnění do provozu (bez obav používat na svých webových stránkách)
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP a CRM %s je k dispozici. Verze %s je hlavní verze s mnoha novými funkcemi pro uživatele i vývojáře. Můžete jej stáhnout z oblasti stahování https://www.dolibarr.org portálu (podadresář Stable verze). Pro úplný seznam změn můžete přečíst <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a>.
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s je k dispozici. Verze %s je verze údržby, takže obsahuje pouze opravy o chybách. Doporučujeme všem používáte starší verzi pro upgrade na tento jeden. Jako každá vydání údržby, žádné nové funkce, ani změna struktury dat je přítomna v této verzi. Můžete si jej stáhnout z stažení části https://www.dolibarr.org portál (podadresář stabilní verze). Můžete si přečíst <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> Úplný seznam změn.
+MultiPriceRuleDesc=Když volba „Několik úroveň cen za produkt / službu“ zapnutá, můžete definovat různé ceny (jeden na cenové hladině) pro každý výrobek. Chcete-li ušetřit čas, můžete zadat zde vládnout mít cenu pro každou úroveň autocalculated podle ceny první úrovni, takže budete muset zadat pouze cenu pro první stupeň na každém výrobku. Tato stránka je zde, aby vám ušetří čas a může být užitečná pouze v případě, ceny pro každou Leve jsou vzhledem k první úrovni. Můžete ignorovat tato stránka ve většině případů.
+ModelModulesProduct=Šablony pro dokumenty produktů
+ToGenerateCodeDefineAutomaticRuleFirst=Aby bylo možné automaticky generovat kódy, musíte nejprve definovat správce na auto definovat číslo čárového kódu.
+SeeSubstitutionVars=Viz * Poznámka k seznamu možných substitučních proměnných
+AllPublishers=Všichni majitelé stránek
+UnknownPublishers=Neznámé nakladatelství
+AddRemoveTabs=Přidání nebo odebrání záložky
+AddDictionaries=Přidat slovníky
+AddBoxes=Přidejte widgety
+AddSheduledJobs=Přidat naplánované úlohy
+AddHooks=Přidat háčky
+AddTriggers=Přidat spouštěče
+AddMenus=Přidejte menu
+AddPermissions=Přidat oprávnění
+AddExportProfiles=Přidejte export profilů
+AddImportProfiles=Přidat import profilů
+AddOtherPagesOrServices=Přidávat další stránky nebo služby
+AddModels=Přidat dokument nebo číslování šablony
+AddSubstitutions=Přidat klíče substituce
+DetectionNotPossible=Detekce není možná
+UrlToGetKeyToUseAPIs=Url dostat tokenu používat API (jednou známka byla obdržena je uložena na uživatele databáze tabulce a musí být k dispozici na každé volání API)
+ListOfAvailableAPIs=Seznam dostupných rozhraní API
+activateModuleDependNotSatisfied=Modul „%s“ závisí na modulu „%s“, který chybí, takže modul „%1$s“ nemusí fungovat correclty. Prosím, nainstalujte modul „%2$s“ nebo zakázat modul „%1$s“, pokud chcete být v bezpečí z jakéhokoliv překvapení
+CommandIsNotInsideAllowedCommands=Příkaz pokusu o spuštění není uvnitř seznam povolených příkazů definovaných v parametru <strong> $ dolibarr_main_restrict_os_commands </ strong> do <strong> conf.php </ strong> souboru.
+LandingPage=vstupní stránka
+SamePriceAlsoForSharedCompanies=Pokud použijete multicompany modul, s volbou „Single cen“, bude cena by také být stejná pro všechny společnosti, pokud výrobky jsou sdíleny mezi prostředími
+ModuleEnabledAdminMustCheckRights=Modul byl aktivován. Oprávnění pro aktivovaný modul (y) byly dány pouze pro uživatele admin. Možná budete muset udělit oprávnění pro ostatní uživatele nebo skupiny ručně v případě potřeby.
+UserHasNoPermissions=Tento uživatel nemá žádné oprávnění definované
+TypeCdr=Použijte „Žádný“ v případě, že datum platebního termínu je datum faktury plus delta ve dnech (delta je pole „Nb dnů“) <br> použití „Na konci měsíce“, pokud se po delty, musí být datum zvýšena se dostanete na konec měsíce (+ volitelná „Offset“ ve dnech) <br> použití „Current / Next“ mít platební termín datum jako první n-tého v měsíci (N se uloží do pole „Nb dnů“)
+BaseCurrency=Referenční měna společnosti (jít do nastavení firmy to změnit)
+WarningNoteModuleInvoiceForFrenchLaw=Tento modul %s je v souladu s francouzskými zákony (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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
-ResourceSetup=Configuration du module Resource
-UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+ResourceSetup=Konfigurace modulu Zdroje
+UseSearchToSelectResource=Použijte vyhledávací formulář k výběru zdroje (spíše než rozevírací seznam).
+DisabledResourceLinkUser=Disabled odkaz zdroj, který uživatele
+DisabledResourceLinkContact=Zakázán link zdrojů do kontaktu
diff --git a/htdocs/langs/cs_CZ/compta.lang b/htdocs/langs/cs_CZ/compta.lang
index 2226078b362..9ad184c485d 100644
--- a/htdocs/langs/cs_CZ/compta.lang
+++ b/htdocs/langs/cs_CZ/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Částky se zde uvedené jsou vypočítá
 Param=Nastavení
 RemainingAmountPayment=Zbývající částka platby:
 Account=Účet
-Accountparent=Účet rodič
-Accountsparent=Účty rodič
+Accountparent=Parent účet
+Accountsparent=mateřské účty
 Income=Příjem
 Outcome=Výdaj
 ReportInOut=Výnosy/náklady
@@ -45,74 +45,75 @@ LT1SupplierES=RE nákupy
 VATCollected=Vybraná DPH
 ToPay=Zaplatit
 SpecialExpensesArea=Oblast pro všechny speciální platby
-SocialContribution=Social or fiscal tax
-SocialContributions=Social or fiscal taxes
-SocialContributionsDeductibles=Deductible social or fiscal taxes
-SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
-LabelContrib=Label contribution
-TypeContrib=Type contribution
+SocialContribution=Sociální nebo daňová daň
+SocialContributions=Sociální nebo daně za
+SocialContributionsDeductibles=Odečitatelné sociální či daně za
+SocialContributionsNondeductibles=Nondeductible sociální či daně za
+LabelContrib=Příspěvek štítek
+TypeContrib=Typ příspěvek
 MenuSpecialExpenses=Zvláštní výdaje
 MenuTaxAndDividends=Daně a dividendy
-MenuSocialContributions=Social/fiscal taxes
-MenuNewSocialContribution=New social/fiscal tax
-NewSocialContribution=New social/fiscal tax
-ContributionsToPay=Social/fiscal taxes to pay
+MenuSocialContributions=Sociální / daňové daně
+MenuNewSocialContribution=Nová sociální / fiskální daň
+NewSocialContribution=Nová sociální / fiskální daň
+AddSocialContribution=Přidejte sociální / fiskální daň
+ContributionsToPay=Sociální / daně za náhradu
 AccountancyTreasuryArea=Oblast Účetnictví/Pokladna
 NewPayment=Nová platba
 Payments=Platby
 PaymentCustomerInvoice=Platba zákaznické faktury
-PaymentSocialContribution=Social/fiscal tax payment
+PaymentSocialContribution=Sociální / fiskální placení daní
 PaymentVat=Platba DPH
 ListPayment=Seznam plateb
 ListOfCustomerPayments=Seznam zákaznických plateb
 ListOfSupplierPayments=Seznam plateb dodavatelům
 DateStartPeriod=Datum zahájení období
 DateEndPeriod=Datum konce období
-newLT1Payment=New tax 2 payment
-newLT2Payment=New tax 3 payment
-LT1Payment=Tax 2 payment
-LT1Payments=Tax 2 payments
-LT2Payment=Tax 3 payment
-LT2Payments=Tax 3 payments
+newLT1Payment=Nová platba daň Obecné podmínky 2
+newLT2Payment=Nová daň 3 platba
+LT1Payment=Tax 2 platba
+LT1Payments=Daňové 2 Platby
+LT2Payment=Daň 3 platba
+LT2Payments=Daňové 3 platby
 newLT1PaymentES=Nová RE platba
 newLT2PaymentES=Nová platba IRPF
 LT1PaymentES=RE Platba
 LT1PaymentsES=RE Platby
 LT2PaymentES=IRPF platba
 LT2PaymentsES=IRPF Platby
-VATPayment=Sales tax payment
-VATPayments=Sales tax payments
-VATRefund=Sales tax refund
-Refund=Refund
-SocialContributionsPayments=Social/fiscal taxes payments
+VATPayment=Prodejní daň platba
+VATPayments=Daň z prodeje platby
+VATRefund=Vrácení daně z prodeje
+Refund=Vrácení
+SocialContributionsPayments=Sociální / platby daně za
 ShowVatPayment=Zobrazit platbu DPH
 TotalToPay=Celkem k zaplacení
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=pouze tehdy, pokud je řazen tabulka vzestupně na %s a filtrován 1 bankovního účtu je vidět v tomto seznamu Balance
 CustomerAccountancyCode=Kód účetnictví zákazník
 SupplierAccountancyCode=Kód účetnictví dodavatel
-CustomerAccountancyCodeShort=Cust. account. code
-SupplierAccountancyCodeShort=Sup. account. code
+CustomerAccountancyCodeShort=Cust. účet. kód
+SupplierAccountancyCodeShort=Sup. účet. kód
 AccountNumber=Číslo účtu
 NewAccountingAccount=Nový účet
 SalesTurnover=Obrat
 SalesTurnoverMinimum=Minimální obrat z prodeje
-ByExpenseIncome=By expenses & incomes
+ByExpenseIncome=Podle nákladů & příjmy
 ByThirdParties=Třetími stranami
 ByUserAuthorOfInvoice=Fakturu vystavil
 CheckReceipt=Zkontrolujte vklad
 CheckReceiptShort=Zkontrolujte vklad
-LastCheckReceiptShort=Latest %s check receipts
+LastCheckReceiptShort=Poslední %s kontrola příjmu
 NewCheckReceipt=Nová sleva
 NewCheckDeposit=Nová kontrola zálohy
 NewCheckDepositOn=Vytvořte potvrzení o vkladu na účet: %s
-NoWaitingChecks=No checks awaiting deposit.
+NoWaitingChecks=Žádné kontroly čeká na vklad.
 DateChequeReceived=Zkontrolujte datum příjmu
 NbOfCheques=Nb kontroly
-PaySocialContribution=Pay a social/fiscal tax
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
-DeleteSocialContribution=Delete a social or fiscal tax payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
-ExportDataset_tax_1=Social and fiscal taxes and payments
+PaySocialContribution=Platit sociální / fiskální daň
+ConfirmPaySocialContribution=Jste si jisti, že chcete zařadit tento sociální nebo fiskální daň jako zaplaceno?
+DeleteSocialContribution=Odstranit sociální a fiskální platbu daně
+ConfirmDeleteSocialContribution=Opravdu chcete vymazat tuto sociální / daňovou daň?
+ExportDataset_tax_1=Sociální a fiskální daně a platby
 CalcModeVATDebt=Režim <b>%sDPH zápočtu na závazky%s.</b>
 CalcModeVATEngagement=Režim <b>%sDPH z rozšířených příjmů%s.</b>
 CalcModeDebt=Režim <b>%sPohledávky-závazky%s</b> zobrazí <b>Závazky účetnictví.</b>
@@ -130,15 +131,15 @@ AnnualByCompaniesInputOutputMode=Bilance příjmů a výdajů, detail třetích
 SeeReportInInputOutputMode=Viz zpráva <b>%s Příjmy-Výdaje %s </b> řekl <b>hotovostní účetnictví</b> pro výpočet na skutečných platbách
 SeeReportInDueDebtMode=Viz zpráva <b>%s Pohledávky-Závazky %s</b> řekl <b>účtování závazků</b> pro výpočet na vystavených fakturách
 RulesAmountWithTaxIncluded=- Uvedené částky jsou se všemi daněmi
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the validation date of invoices and VAT and on the due date for expenses. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
-RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
+RulesResultDue=- To zahrnuje neuhrazené faktury, výdaje a DPH, zda byly zaplaceny či nikoliv. <br> - Je založen na ověřených datech faktur a DPH a ke dni splatnosti pro náklady. Platy definované s plat modulem, použije se datum splatnosti platby.
+RulesResultInOut=- To zahrnuje skutečné platby na fakturách, nákladů, DPH a platů. <br> - Je založen na datech plateb faktur, náklady, DPH a platů. Datum daru pro dárcovství.
+RulesCADue=- To zahrnuje splatné faktury klienta, zda byly zaplaceny či nikoliv. <br> - Je založen na datum ověření těchto faktur <br>.
 RulesCAIn=- Obsahuje všechny účinné platby faktury přijaté od klientů. <br> - Je založen na datu úhrady těchto faktur <br>
 DepositsAreNotIncluded=- Zálohové faktury nejsou zahrnuty
 DepositsAreIncluded=- Zálohové faktury jsou zahrnuty
 LT2ReportByCustomersInInputOutputModeES=Zpráva o třetí straně IRPF
 LT1ReportByCustomersInInputOutputModeES=Zpráva třetí strany RE
-VATReport=VAT report
+VATReport=zpráva DPH
 VATReportByCustomersInInputOutputMode=Zpráva o vybrané a zaplacené DPH zákazníka
 VATReportByCustomersInDueDebtMode=Zpráva o vybrané a zaplacené DPH zákazníka
 VATReportByQuartersInInputOutputMode=Zpráva o sazbách DPH vybrané a odvedené
@@ -171,37 +172,40 @@ InvoiceRef=Faktura čj.
 CodeNotDef=Není definováno
 WarningDepositsNotIncluded=Zálohové faktury nejsou zahrnuty v této verzi tohoto modulu účetnictví.
 DatePaymentTermCantBeLowerThanObjectDate=Datum termínu platby nemůže být nižší než datum objektu.
-Pcg_version=Chart of accounts models
+Pcg_version=Graf modelů účtů
 Pcg_type=Pcg typ
 Pcg_subtype=Pcg podtyp
 InvoiceLinesToDispatch=Řádky faktury pro odeslání
 ByProductsAndServices=Výrobky a služby
 RefExt=Externí ref
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+ToCreateAPredefinedInvoice=Chcete-li vytvořit šablonu faktury, vytvořit standardní faktury, pak bez ověřování jej, klikněte na tlačítko „%s“.
 LinkedOrder=Odkaz na objednávku
 Mode1=Metoda 1
 Mode2=Metoda 2
 CalculationRuleDesc=Chcete-li vypočítat celkovou částku DPH, jsou k dispozici dvě metody: <br> Metoda 1 je zaokrouhlení DPH na každém řádku, částky se sečtou. <br> Metoda 2 je součtem všech sum na každém řádku, pak se výsledek zaokrouhlí. <br> Konečný výsledek může se liší od několika haléřů. Výchozí režim je režim <b>%s.</b>
-CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
+CalculationRuleDescSupplier=podle dodavatele zvolte vhodnou metodu použití stejného pravidla pro výpočet a dostanete stejný výsledek, který očekáváte od svého dodavatele.
 TurnoverPerProductInCommitmentAccountingNotRelevant=Obratová zpráva za zboží při použití režimu <b>hotovostního účetnictví</b> není relevantní. Tato zpráva je k dispozici pouze při použití režimu <b>zapojeného účetnictví</b>  (viz nastavení účetního modulu).
 CalculationMode=Výpočetní režim
 AccountancyJournal=Deník účetnických kódů
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
-CloneTax=Clone a social/fiscal tax
-ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
+ACCOUNTING_VAT_SOLD_ACCOUNT=Účtování účet ve výchozím nastavení výběru daně - DPH při prodeji (používá pokud není definována v nastavení slovníku DPH)
+ACCOUNTING_VAT_BUY_ACCOUNT=Účtování v úvahu jako výchozí pro obnoveného DPH - DPH při nákupu (používá pokud není definována v nastavení slovníku DPH)
+ACCOUNTING_VAT_PAY_ACCOUNT=Účtovací účet pro platby DPH
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
+CloneTax=Klonovat sociální / fiskální daň
+ConfirmCloneTax=Potvrdí klon sociálního / fiskální zaplacení daně
 CloneTaxForNextMonth=Kopírovat pro příští měsíc
-SimpleReport=Simple report
-AddExtraReport=Extra reports (add foreign and national customer report)
-OtherCountriesCustomersReport=Foreign customers report
-BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Based on the two first letters of the VAT number being different from your own company's country code
-SameCountryCustomersWithVAT=National customers report
-BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Based on the two first letters of the VAT number being the same as your own company's country code
-LinkedFichinter=Link to an intervention
-ImportDataset_tax_contrib=Social/fiscal taxes
-ImportDataset_tax_vat=Vat payments
-ErrorBankAccountNotFound=Error: Bank account not found
-FiscalPeriod=Accounting period
+SimpleReport=jednoduchá zpráva
+AddExtraReport=Další zprávy (přidat zahraniční a národní zprávy od zákazníka)
+OtherCountriesCustomersReport=Zahraniční zákazníci nahlásit
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Na prvních dvou písmen čísla DPH je odlišný od kódu země vaší vlastní společnosti založené
+SameCountryCustomersWithVAT=Národní zákazníci nahlásit
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Na prvních dvou písmen čísla DPH je stejný jako kód země vaší vlastní společnosti založené
+LinkedFichinter=Odkaz na intervenci
+ImportDataset_tax_contrib=Sociální / daňové daně
+ImportDataset_tax_vat=platby DPH
+ErrorBankAccountNotFound=Chyba: bankovní účet nebyl nalezen
+FiscalPeriod=Účetní období
+ListSocialContributionAssociatedProject=Seznam příspěvků na sociální zabezpečení v souvislosti s projektem
diff --git a/htdocs/langs/cs_CZ/cron.lang b/htdocs/langs/cs_CZ/cron.lang
index 41ceea2bd3a..6c989cb6158 100644
--- a/htdocs/langs/cs_CZ/cron.lang
+++ b/htdocs/langs/cs_CZ/cron.lang
@@ -7,32 +7,32 @@ Permission23103 = Smazat naplánovanou úlohu
 Permission23104 = Provést naplánovanou úlohu
 # Admin
 CronSetup= Nastavení naplánovaných úloh
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
+URLToLaunchCronJobs=URL ke kontrole a spuštění úlohy v případě potřeby
 OrToLaunchASpecificJob=Nebo zkontrolovat a zahájit konkrétní práci
 KeyForCronAccess=Bezpečnostní klíč URL spuštění úlohy
 FileToLaunchCronJobs=Příkazový řádek pro spuštění úlohy
 CronExplainHowToRunUnix=Na Unixových systémech by jste měli použít následující položku crontab ke spuštění příkazového řádku každých 5 minut 
 CronExplainHowToRunWin=Na Microsoft Windows systémech můžete použít naplánováné nástroje úloh ke spuštění příkazového řádku každých 5 minut
-CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodDoesNotExists=Třída %s neobsahuje žádné metody %s
 # Menu
-EnabledAndDisabled=Enabled and disabled
+EnabledAndDisabled=Zapínat a vypínat
 # Page list
-CronLastOutput=Latest run output
-CronLastResult=Latest result code
+CronLastOutput=Výstup poslední úlohy
+CronLastResult=Výstup posledního kódu
 CronCommand=Příkaz
 CronList=Naplánované úlohy
 CronDelete=Smazat naplánované úlohy
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
-CronExecute=Launch scheduled job
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Plánovací modul úloh umožňují provádět úlohy, které byly plánované
+CronConfirmDelete=Jste si jisti, že chcete odstranit tyto naplánované úlohy?
+CronExecute=Spuštění naplánovaných úloh
+CronConfirmExecute=Jste si jisti, že chcete provést tyto naplánované úlohy nyní?
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Práce
 CronNone=Nikdo
-CronDtStart=Not before
-CronDtEnd=Not after
+CronDtStart=Ne předtím
+CronDtEnd=nikoli po
 CronDtNextLaunch=Další provedení
-CronDtLastLaunch=Start date of latest execution
-CronDtLastResult=End date of latest execution
+CronDtLastLaunch=Počáteční datum posledního provedení
+CronDtLastResult=datum ukončení posledního výkonu
 CronFrequency=Frekvence
 CronClass=Třída
 CronMethod=Metoda
@@ -41,15 +41,15 @@ CronNoJobs=Žádné registrované úkoly
 CronPriority=Priorita
 CronLabel=Štítek
 CronNbRun=Nb. zahájit
-CronMaxRun=Max nb. launch
+CronMaxRun=Max nb. zahájení
 CronEach=Každý
 JobFinished=Práce zahájena a dokončena
 #Page card
 CronAdd= Přidat práci
-CronEvery=Execute job each
+CronEvery=Vykonat práci každý
 CronObject=Vytvoření Instance/objektu 
 CronArgs=Parametry
-CronSaveSucess=Save successfully
+CronSaveSucess=Úspěšně uloženo
 CronNote=Komentář
 CronFieldMandatory=Pole %s je povinné
 CronErrEndDateStartDt=Datum ukončení nemůže být před datem zahájení
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Umožnit
 CronStatusInactiveBtn=Zakázat
 CronTaskInactive=Tato úloha je zakázána
 CronId=Id
-CronClassFile=Třídy (filename.class.php)
-CronModuleHelp=Název adresáře modulu Dalibor (pracuje i s externími moduly). <BR> Např načíst metody objektu produktu ../htdocs/<u>product</u>/class/product.class.php, hodnota modulu je <i>product</i>
-CronClassFileHelp=Načíst název souboru. <BR> Např načíst metody objektu výrobku .../htdocs/product/class/<u>product.class.php</u> hodnota název třídy souboru je <i>product.class.php</i>
-CronObjectHelp=NNačíst název objektu. <BR> Např načíst metody objektu výrobku .../htdocs/product/class/product.class.php, hodnota název třídy souboru je <i>výrobek</i>
-CronMethodHelp=Objekt způsob startu. <BR> Např načíst metody objektu .../htdocs/product/class/product.class.php, hodnota metody je <i>fecth</i>
-CronArgsHelp=Metoda argumenty. <BR> Např načíst metody objektu výrobku .../htdocs/product/class/product.class.php, hodnota paramteru může být <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=Spustit příkazový řádek. 
 CronCreateJob=Vytvořit novou naplánovanou úlohu
 CronFrom=Z
@@ -72,8 +72,8 @@ CronType=Typ úlohy
 CronType_method=Volání metody třídy Dolibarr
 CronType_command=Shell příkaz
 CronCannotLoadClass=Nelze načíst třídu nebo objekt %s %s
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+UseMenuModuleToolsToAddCronJobs=Jděte do menu "Home- Moduly nářadí- Seznam úloh" kde vidíte a upravujete naplánované úlohy.
 JobDisabled=Úloha vypnuta
-MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+MakeLocalDatabaseDumpShort=Záloha lokální databáze
+MakeLocalDatabaseDump=Vytvořit výpis lokální databáze
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/cs_CZ/errors.lang b/htdocs/langs/cs_CZ/errors.lang
index 8f9647bcf78..0da4c3c5123 100644
--- a/htdocs/langs/cs_CZ/errors.lang
+++ b/htdocs/langs/cs_CZ/errors.lang
@@ -1,47 +1,50 @@
 # Dolibarr language file - Source file is en_US - errors
 
 # No errors
-NoErrorCommitIsDone=Žádná chyba se zavazujeme
+NoErrorCommitIsDone=Žádná chyba, jsme se zavázali
 # Errors
-ErrorButCommitIsDone=Byly nalezeny chyby, ale my ověřit i přes to
+ErrorButCommitIsDone=Byly nalezeny chyby, ale přesto jsme provedli ověření. Snad to pojede ....\n
 ErrorBadEMail=EMail %s je špatně
 ErrorBadUrl=Url %s je špatně
-ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorBadValueForParamNotAString=Špatná hodnota pro parametr. To připojí obecně, když chybí překlad.
 ErrorLoginAlreadyExists=Přihlášení %s již existuje.
 ErrorGroupAlreadyExists=Skupina %s již existuje.
 ErrorRecordNotFound=Záznam není nalezen.
 ErrorFailToCopyFile=Nepodařilo se zkopírovat soubor <b>&quot;%s&quot;</b> na <b>&quot;%s&quot;.</b>
-ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCopyDir=Nepodařilo se zkopírovat složku '<b> %s </ b>' do '<b> %s </ b>.
 ErrorFailToRenameFile=Nepodařilo se přejmenovat soubor <b>&quot;%s&quot;</b> na <b>&quot;%s&quot;.</b>
 ErrorFailToDeleteFile=Nepodařilo se odstranit soubor <b>&quot;%s&quot;.</b>
 ErrorFailToCreateFile=Nepodařilo se vytvořit soubor <b>&quot;%s&quot;.</b>
 ErrorFailToRenameDir=Nepodařilo se přejmenovat adresář <b>&quot;%s&quot;</b> na <b>&quot;%s&quot;.</b>
 ErrorFailToCreateDir=Nepodařilo se vytvořit adresář <b>&quot;%s&quot;.</b>
 ErrorFailToDeleteDir=Nepodařilo se smazat adresář <b>&quot;%s&quot;.</b>
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=Tento kontakt je již definován jako kontakt pro tento typ.
 ErrorCashAccountAcceptsOnlyCashMoney=Tento bankovní účet peněžní účet, takže přijímá platby typu pouze v hotovosti.
 ErrorFromToAccountsMustDiffers=Zdrojové a cílové bankovní účty musí být jiný.
 ErrorBadThirdPartyName=Nesprávná hodnota pro třetí strany jménem
 ErrorProdIdIsMandatory=%s je povinné
-ErrorBadCustomerCodeSyntax=Bad syntaxe pro zákazníka kódu
-ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
+ErrorBadCustomerCodeSyntax=Špatná syntaxe kódu zákazníka
+ErrorBadBarCodeSyntax=Špatná syntaxe pro čárový kód. Může být nastavení špatný typ čárového kódu, nebo jste definovali čárového kódu maska ​​pro číslování, která neodpovídá hodnotě naskenovat.
 ErrorCustomerCodeRequired=Zákazník požadoval kód
-ErrorBarCodeRequired=Bar code required
+ErrorBarCodeRequired=Je zapotřebí čárový kód
 ErrorCustomerCodeAlreadyUsed=Zákaznický kód již používán
-ErrorBarCodeAlreadyUsed=Bar code already used
+ErrorBarCodeAlreadyUsed=Čárový kód je již používán
 ErrorPrefixRequired=Prefix nutné
 ErrorBadSupplierCodeSyntax=Bad syntaxe pro kód dodavatele
 ErrorSupplierCodeRequired=Dodavatel povinen kód
 ErrorSupplierCodeAlreadyUsed=Dodavatel kód již používán
-ErrorBadParameters=Bad parametry
-ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
-ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
+ErrorBadParameters=Špatné parametry. Tak takto opravdu ne ......
+ErrorBadValueForParameter=Chybná hodnota ‚%s‘ parametru ‚%s‘
+ErrorBadImageFormat=Obrázek nemá podporovaný formát (Váš PHP nepodporuje funkce pro převod obrázků z tohoto formátu)
 ErrorBadDateFormat=Hodnota &quot;%s&quot; má nesprávný formát data
-ErrorWrongDate=Date is not correct!
+ErrorWrongDate=Datum není správné!
 ErrorFailedToWriteInDir=Nepodařilo se zapsat do adresáře %s
 ErrorFoundBadEmailInFile=Nalezeno nesprávné email syntaxe %s řádků v souboru (%s příklad souladu s emailem = %s)
-ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
+ErrorUserCannotBeDelete=Uživatel nemůže být odstraněn. Může být, že je spojena s Dolibarr entity.
 ErrorFieldsRequired=Některé požadované pole se nevyplňuje.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Nepodařilo se vytvořit adresář. Ujistěte se, že webový server má uživatel oprávnění k zápisu do adresáře dokumentů Dolibarr. Pokud je parametr <b>safe_mode</b> je povoleno na tomto PHP, zkontrolujte, zda Dolibarr php soubory, vlastní pro uživatele webového serveru (nebo skupina).
 ErrorNoMailDefinedForThisUser=Žádná pošta definované pro tohoto uživatele
 ErrorFeatureNeedJavascript=Tato funkce potřebujete mít Java scripty být aktivován do práce. Změnit v nastavení - displej.
@@ -61,18 +64,18 @@ ErrorSizeTooLongForVarcharType=Velikost příliš dlouho typu string (%s znaků
 ErrorNoValueForSelectType=Vyplňte, prosím, hodnotu seznamu vyberte
 ErrorNoValueForCheckBoxType=Vyplňte, prosím, hodnotu checkbox seznamu
 ErrorNoValueForRadioType=Prosím vyplňte hodnotu pro rozhlasové seznamu
-ErrorBadFormatValueList=The list value cannot have more than one comma: <u>%s</u>, but need at least one: key,value
+ErrorBadFormatValueList=Hodnota Seznam nemůže mít více než jednu čárku: <u> %s </ u>, ale potřebují alespoň jednu možnost: klíč, hodnota
 ErrorFieldCanNotContainSpecialCharacters=Terénní <b>%s</b> nesmí obsahuje speciální znaky.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Pole <b> %s </ b> nesmí obsahovat speciální znaky, ani na velká písmena a nesmí obsahovat pouze čísla.
 ErrorNoAccountancyModuleLoaded=Ne účetnictví modul aktivován
-ErrorExportDuplicateProfil=This profile name already exists for this export set.
+ErrorExportDuplicateProfil=Tento název profilu již existuje pro tento export sady.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP shoda není úplná.
 ErrorLDAPMakeManualTest=. LDIF soubor byl vytvořen v adresáři %s. Zkuste načíst ručně z příkazového řádku získat více informací o chybách.
 ErrorCantSaveADoneUserWithZeroPercentage=Nelze uložit akci s &quot;Statut nezačal&quot;, pokud pole &quot;provádí&quot; je také vyplněna.
 ErrorRefAlreadyExists=Ref používá pro tvorbu již existuje.
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
-ErrorRecordHasChildren=Failed to delete record since it has some childs.
-ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object.
+ErrorPleaseTypeBankTransactionReportName=Prosím, zadejte název banky prohlášení, kde je hlášeno záznam (ve formátu RRRRMM nebo RRRRMMDD)
+ErrorRecordHasChildren=Nepodařilo se odstranit záznam, protože má nějaké Childs.
+ErrorRecordIsUsedCantDelete=Nelze odstranit záznam. Ten se již používá, nebo je zahrnut do jiných objektů.
 ErrorModuleRequireJavascript=Javascript musí být vypnuta, že tato funkce pracovat. Chcete-li povolit / zakázat Javascript, přejděte do nabídky Home-&gt; Nastavení-&gt; Zobrazení.
 ErrorPasswordsMustMatch=Oba napsaný hesla se musí shodovat se navzájem
 ErrorContactEMail=Technické chybě. Prosím, obraťte se na správce, aby e-mailovou <b>%s</b> en poskytovat <b>%s</b> kód chyby ve zprávě, nebo ještě lépe přidáním obrazovky kopii této stránky.
@@ -84,18 +87,18 @@ ErrorFileIsInfectedWithAVirus=Antivirový program nebyl schopen ověřit soubor
 ErrorSpecialCharNotAllowedForField=Speciální znaky nejsou povoleny pro pole &quot;%s&quot;
 ErrorNumRefModel=Existuje odkaz do databáze (%s) a není kompatibilní s tímto pravidlem číslování. Odebrat záznam nebo přejmenovat odkaz na aktivaci tohoto modulu.
 ErrorQtyTooLowForThisSupplier=Nedostatečné množství tohoto podniku, nebo není definována cena k tomuto produktu tohoto podniku
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=Nastavení modulu jeví nekompletní. Jdi domů - Nastavení - Moduly dokončit.
 ErrorBadMask=Chyba na masku
 ErrorBadMaskFailedToLocatePosOfSequence=Chyba maska ​​bez pořadovým číslem
 ErrorBadMaskBadRazMonth=Chyba, špatná hodnota po resetu
-ErrorMaxNumberReachForThisMask=Max number reach for this mask
-ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits
+ErrorMaxNumberReachForThisMask=Maximální počet dosah této masce
+ErrorCounterMustHaveMoreThan3Digits=Počítadlo musí mít více než 3 číslice
 ErrorSelectAtLeastOne=Chyba. Vyberte alespoň jednu položku.
 ErrorDeleteNotPossibleLineIsConsolidated=Odstranění není možné, protože záznam je spojena s bankovním transakčního který smířil
 ErrorProdIdAlreadyExist=%s je přiřazen do jiné třetí
 ErrorFailedToSendPassword=Nepodařilo se odeslat heslo
 ErrorFailedToLoadRSSFile=Nedokáže dostat RSS feed. Zkuste přidat konstantní MAIN_SIMPLEXMLLOAD_DEBUG případě chybových hlášení neposkytuje dostatek informací.
-ErrorForbidden=Access denied.<br>You try to access to a page, area or feature of a disabled module or without being in an authenticated session or that is not allowed to your user.
+ErrorForbidden=Přístup byl odepřen. <br> Došlo k pokusu o přístup na stránku, oblasti nebo funkce postiženého modulu nebo aniž by byl v ověřeném relaci nebo že není dovoleno vašeho uživatele.
 ErrorForbidden2=Povolení pro toto přihlášení může být definována správcem Dolibarr z nabídky %s-&gt; %s.
 ErrorForbidden3=Zdá se, že Dolibarr není využita prostřednictvím ověřené relace. Podívejte se na dokumentaci k nastavení Dolibarr vědět, jak řídit autentizace (htaccess, mod_auth nebo jiné ...).
 ErrorNoImagickReadimage=Třída Imagick není nalezen v této PHP. Náhled není mohou být k dispozici. Správci mohou zakázat tuto kartu z menu Nastavení - Zobrazení.
@@ -110,13 +113,13 @@ ErrorLoginDoesNotExists=Uživatel s přihlášením <b>%s</b> nebyl nalezen.
 ErrorLoginHasNoEmail=Tento uživatel nemá žádnou e-mailovou adresu. Proces přerušena.
 ErrorBadValueForCode=Bad hodnota bezpečnostního kódu. Zkuste to znovu s novou hodnotou ...
 ErrorBothFieldCantBeNegative=Pole %s a %s nemohou být negativní
-ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
+ErrorQtyForCustomerInvoiceCantBeNegative=Množství pro linku do odběratelských faktur nemůže být záporná
 ErrorWebServerUserHasNotPermission=Uživatelský účet <b>%s</b> použít ke spuštění webový server nemá oprávnění pro které
 ErrorNoActivatedBarcode=Žádný čárový kód aktivován typ
 ErrUnzipFails=Nepodařilo se rozbalit %s s ZipArchive
-ErrNoZipEngine=No motor rozbalit %s soubor v tomto PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=Souborů %s musí být zip Dolibarr balíček
-ErrorModuleFileRequired=You must select a Dolibarr module package file
+ErrorModuleFileRequired=Musíte vybrat modul balíček soubor Dolibarr
 ErrorPhpCurlNotInstalled=PHP CURL není nainstalován, je to nezbytné mluvit s Paypal
 ErrorFailedToAddToMailmanList=Nepodařilo se přidat záznam do %s %s pošťák seznamu nebo SPIP základny
 ErrorFailedToRemoveToMailmanList=Nepodařilo se odstranit záznam %s %s na seznam pošťák nebo SPIP základny
@@ -124,69 +127,76 @@ ErrorNewValueCantMatchOldValue=Nová hodnota nemůže být rovno staré
 ErrorFailedToValidatePasswordReset=Nepodařilo se Reinit heslo. Může být reinit již byla provedena (tento odkaz lze použít pouze jednou). Pokud ne, zkuste restartovat reinit procesu.
 ErrorToConnectToMysqlCheckInstance=Připojení k databázi se nezdaří. Zkontrolujte, MySQL server běží (ve většině případů, můžete ji spustit z příkazového řádku: sudo / etc / init.d / mysql start ').
 ErrorFailedToAddContact=Nepodařilo se přidat kontakt
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=Datum nemůže být větší než dnešní. Nejsme v SSSR.
 ErrorPaymentModeDefinedToWithoutSetup=Platební režim byl nastaven na typ %s ale nastavení modulu Faktury nebyla dokončena definovat informace, které se pro tento platební režim.
 ErrorPHPNeedModule=Chyba, musí mít PHP modul <b>%s</b> nainstalovat tuto funkci používat.
 ErrorOpenIDSetupNotComplete=Můžete nastavení Dolibarr konfigurační soubor, aby OpenID ověřování, ale URL OpenID služby není definován do stálých %s
 ErrorWarehouseMustDiffers=Zdrojové a cílové sklady musí se liší
-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
-ErrorPriceExpression1=Cannot assign to constant '%s'
-ErrorPriceExpression2=Cannot redefine built-in function '%s'
-ErrorPriceExpression3=Undefined variable '%s' in function definition
-ErrorPriceExpression4=Illegal character '%s'
-ErrorPriceExpression5=Unexpected '%s'
-ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
-ErrorPriceExpression8=Unexpected operator '%s'
-ErrorPriceExpression9=An unexpected error occured
-ErrorPriceExpression10=Iperator '%s' lacks operand
-ErrorPriceExpression11=Expecting '%s'
-ErrorPriceExpression14=Division by zero
-ErrorPriceExpression17=Undefined variable '%s'
-ErrorPriceExpression19=Expression not found
-ErrorPriceExpression20=Empty expression
-ErrorPriceExpression21=Empty result '%s'
-ErrorPriceExpression22=Negative result '%s'
-ErrorPriceExpressionInternal=Internal error '%s'
-ErrorPriceExpressionUnknown=Unknown error '%s'
+ErrorBadFormat=Špatný formát!
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Chyba Tento člen zatím není spojen s žádným subjektem. Spojovací člen ke stávajícímu subjektu nebo vytvořit nový subjekt před vytvořením odběru s fakturou.
+ErrorThereIsSomeDeliveries=Chyba, existuje nějaké dodávky spojené s touto přepravou. Odstranění zamítnuto. Máte smůlu ....
+ErrorCantDeletePaymentReconciliated=Nelze odstranit platbu, který generovaný položku banky, který byl odsouhlasen
+ErrorCantDeletePaymentSharedWithPayedInvoice=Nelze odstranit platbu sdílejí alespoň jednu fakturu se statusem platí
+ErrorPriceExpression1=Nelze přiřadit k neustálému ‚%s‘
+ErrorPriceExpression2=Nelze předefinovat vestavěnou funkci ‚%s‘
+ErrorPriceExpression3=Nedefinovaná proměnná ‚%s‘ v definici funkce
+ErrorPriceExpression4=Neplatný znak ‚%s‘
+ErrorPriceExpression5=Nečekané ‚%s‘ Kdo by to byl řekl .....
+ErrorPriceExpression6=Nesprávný počet argumentů (%s uvedeny, %s očekávaný) Argumentujte lépe !!!!
+ErrorPriceExpression8=Neočekávaný operátor '%s'
+ErrorPriceExpression9=Došlo k neočekávané chybě. Poklekněte a poručte svou duši bohu ....
+ErrorPriceExpression10=Iperator '%s' chybí operand
+ErrorPriceExpression11=Očekával ‚%s‘
+ErrorPriceExpression14=Dělíte nulou!! To si snad fakt děláte srandu .....
+ErrorPriceExpression17=Nedefinovaná proměnná ‚%s‘
+ErrorPriceExpression19=Výraz nenalezen
+ErrorPriceExpression20=Prázdný výraz. Něčím ho naplňte .....
+ErrorPriceExpression21=Nenalezeno ‚%s‘
+ErrorPriceExpression22=Negativní výsledek ‚%s‘
+ErrorPriceExpressionInternal=Internal error '%s'  Použijte osmikilové kladivo, nebo hledejte na netu ....
+ErrorPriceExpressionUnknown=Neznámá chyba ‚%s‘ Zkuste jasnovidce ....
 ErrorSrcAndTargetWarehouseMustDiffers=Zdrojové a cílové sklady musí se liší
-ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information
-ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified (approved or denied) before being allowed to do this action
-ErrorCantSetReceptionToTotalDoneWithReceptionDenied=All recorded receptions must first be verified (approved) before being allowed to do this action
-ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
-ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
-ErrorGlobalVariableUpdater2=Missing parameter '%s'
-ErrorGlobalVariableUpdater3=The requested data was not found in result
-ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
-ErrorGlobalVariableUpdater5=No global variable selected
-ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
-ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
-ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
-ErrorSavingChanges=An error has ocurred when saving the changes
-ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
-ErrorFileMustHaveFormat=File must have format %s
+ErrorTryToMakeMoveOnProductRequiringBatchData=Chyba, se snaží vydělat na pohyb zásob bez šarže / sériových informace o produktu, který vyžaduje hodně / sériové informací
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=Všechny zaznamenané recepce musí být nejprve ověřeny (schváleny nebo odepřen), než bude moci provést tuto akci
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=Všechna zaznamenaná recepce musí být před provedením této akce nejprve ověřena (schválena)
+ErrorGlobalVariableUpdater0=Požadavek HTTP se nezdařilo s chybou ‚%s‘
+ErrorGlobalVariableUpdater1=Neplatný formát JSON ‚%s‘
+ErrorGlobalVariableUpdater2=Chybí parametr '%s'
+ErrorGlobalVariableUpdater3=Požadovaná data nebyla nalezena v důsledku
+ErrorGlobalVariableUpdater4=SOAP klient se nezdařilo s chybou ‚%s‘
+ErrorGlobalVariableUpdater5=Žádné globální proměnná vybraná
+ErrorFieldMustBeANumeric=Pole <b> %s </ b> musí být číselná hodnota
+ErrorMandatoryParametersNotProvided=Povinné parametr (y) není k dispozici
+ErrorOppStatusRequiredIfAmount=Nastavíte odhadovanou částku za tuto příležitost / olovo. Takže musíte zadat svůj status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
+ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definice Array Menu V modulu popisovač (špatná hodnota za klíčový fk_menu)
+ErrorSavingChanges=Došlo k ocurred při ukládání změn
+ErrorWarehouseRequiredIntoShipmentLine=Sklad je zapotřebí na lince na dopravu
+ErrorFileMustHaveFormat=Soubor musí mít formát %s
 ErrorSupplierCountryIsNotDefined=Země tohoto dodavatele není definována. Napravte jako první.
-ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
-ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
-ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
-ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
-ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
-ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
-ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
-ErrorTaskAlreadyAssigned=Task already assigned to user
-ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
-ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorsThirdpartyMerge=Nepodařilo se sloučit dva záznamy. Požadavek zrušen.
+ErrorStockIsNotEnoughToAddProductOnOrder=Sklad nestačí %s produkt přidat do nové objednávky.
+ErrorStockIsNotEnoughToAddProductOnInvoice=Sklad nestačí %s produkt přidat do nové faktury.
+ErrorStockIsNotEnoughToAddProductOnShipment=Sklad nestačí %s produkt přidat do nové zásilky.
+ErrorStockIsNotEnoughToAddProductOnProposal=Sklad nestačí %s produkt přidat do nového návrhu.
+ErrorFailedToLoadLoginFileForMode=Nepodařilo se získat přihlašovací tlačítko pro režim ‚%s‘.
+ErrorModuleNotFound=Soubor modulu nebyl nalezen. Zkuste křišťálovou kouli .....
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
+ErrorBankStatementNameMustFollowRegex=Chyba, název banky prohlášení musí dodržovat následující pravidla syntaxe %s
+ErrorPhpMailDelivery=Zkontrolujte, zda nechcete použít příliš vysoký počet příjemců a že vaše e-mailová obsah není podobný Spam. Zeptejte se také na správce zkontrolovat firewall a serverové protokoly soubory pro více kompletní informace.
+ErrorUserNotAssignedToTask=Uživatel musí být přiřazen k úkolu, aby mohli vstoupit čas spotřebovaný.
+ErrorTaskAlreadyAssigned=Úkolem již přiřazena k uživateli
+ErrorModuleFileSeemsToHaveAWrongFormat=Balíček modul vypadá, že má chybný formát.
+ErrorFilenameDosNotMatchDolibarrPackageRules=Název balíčku modulu (<strong> %s </ strong>) neodpovídá očekávané syntaxi název: <strong> %s </ strong> Nemůžete sem cpát všechno, co vás napadne ......
+ErrorDuplicateTrigger=Chyba, spoušť název %s duplikát. Již vložen z %s.
+ErrorNoWarehouseDefined=Chyba, nejsou definovány žádné sklady.
+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.
 
 # 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=Heslo bylo nastaveno pro tohoto člena. Nicméně, žádný uživatelský účet byl vytvořen. Takže toto heslo uloženo, ale nemůže být použit pro přihlášení do Dolibarr. Může být použit externí modulu / rozhraní, ale pokud nepotřebujete definovat libovolné přihlašovací jméno ani heslo pro členem, můžete možnost vypnout „Správa přihlášení pro každého člena“ z nastavení člen modulu. Pokud potřebujete ke správě přihlášení, ale nepotřebují žádné heslo, můžete mít toto pole prázdné, aby se zabránilo toto upozornění. Poznámka: E-mail může být také použit jako přihlášení v případě, že člen je připojen k uživateli.
 WarningMandatorySetupNotComplete=Povinné parametry jsou dosud stanoveny
 WarningSafeModeOnCheckExecDir=Pozor, PHP <b>safe_mode</b> volba je na to příkaz musí být uloženy uvnitř adresáře deklarované <b>safe_mode_exec_dir</b> parametrů php.
 WarningBookmarkAlreadyExists=Záložka s tímto názvem, nebo tento cíl (URL) již existuje.
@@ -199,8 +209,9 @@ WarningUntilDirRemoved=Všechny bezpečnostní pokyny (viditelné admin uživate
 WarningCloseAlways=Pozor, zavírání se provádí, i když částka liší zdrojových a cílových prvků. Povolte tuto funkci se zvýšenou opatrností.
 WarningUsingThisBoxSlowDown=Upozornění Při použití tohoto políčka zpomalit vážně všechny stránky zobrazující krabici.
 WarningClickToDialUserSetupNotComplete=Nastavení ClickToDial informací pro uživatele si nejsou kompletní (viz tab ClickToDial na vaše uživatelské karty).
-WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
-WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
-WarningTooManyDataPleaseUseMoreFilters=Too many data (more than %s lines). Please use more filters or set the constant %s to a higher limit.
-WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while their hourly rate was not defined. A value of 0 %s per hour was used but this may result in wrong valuation of time spent.
-WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Funkce deaktivována, když je nastavení displeje optimalizovaný pro nevidomého nebo textových prohlížečů.
+WarningPaymentDateLowerThanInvoiceDate=Datum platby (%s) je starší než data vystavení faktury (%s) pro faktury %s. Popíráte tak přírodní zákony.
+WarningTooManyDataPleaseUseMoreFilters=Příliš mnoho dat (více než %s linek). Použijte další filtry nebo nastavit konstantní %s na vyšší limit. Kdo to má pořád zpracovávat !!!!
+WarningSomeLinesWithNullHourlyRate=Někdy byly zaznamenány u některých uživatelů, zatímco jejich hodinová sazba nebyla definována. Hodnota 0 %s za hodinu byl použit, ale to může mít za následek nesprávné oceňování času stráveného.
+WarningYourLoginWasModifiedPleaseLogin=Vaše přihlašovací byla upravena. Z bezpečnostních účel budete muset přihlásit pomocí nových přihlašovacích údajů před další akci.
+WarningAnEntryAlreadyExistForTransKey=Položka již existuje pro překladatelské klíč pro tento jazyk
diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang
index 65e2c840c6b..f0428f9b514 100644
--- a/htdocs/langs/cs_CZ/main.lang
+++ b/htdocs/langs/cs_CZ/main.lang
@@ -24,12 +24,12 @@ FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=Připojení k databázi
-NoTemplateDefined=No template defined for this email type
-AvailableVariables=Available substitution variables
+NoTemplateDefined=Žádná šablona je definována v tomto e-mailu typ
+AvailableVariables=K dispozici substituční proměnné
 NoTranslation=Překlad není
 NoRecordFound=Nebyl nalezen žádný záznam
-NoRecordDeleted=No record deleted
-NotEnoughDataYet=Not enough data
+NoRecordDeleted=Žádný záznam smazán
+NotEnoughDataYet=Není dostatek údajů
 NoError=Žádná chyba
 Error=Chyba
 Errors=Chyby
@@ -37,8 +37,8 @@ ErrorFieldRequired=Pole '%s' je povinné
 ErrorFieldFormat=Pole '%s' obsahuje špatnou hodnotu
 ErrorFileDoesNotExists=Soubor %s neexistuje
 ErrorFailedToOpenFile=Nepodařilo se otevřít soubor %s
-ErrorCanNotCreateDir=Cannot create dir %s
-ErrorCanNotReadDir=Cannot read dir %s
+ErrorCanNotCreateDir=Nelze vytvořit složku %s
+ErrorCanNotReadDir=Nelze číst složku %s
 ErrorConstantNotDefined=Parametr %s není definován
 ErrorUnknown=Neznámá chyba
 ErrorSQL=Chyba SQL
@@ -60,56 +60,56 @@ ErrorSomeErrorWereFoundRollbackIsDone=Byly nalezeny nějaké chyby. Veškeré zm
 ErrorConfigParameterNotDefined=Parametr <b>%s</b> není definován v konfiguračním souboru Dolibarr <b>conf.php.</b>
 ErrorCantLoadUserFromDolibarrDatabase=Nepodařilo se najít uživatele <b>%s</b> v databázi Dolibarr.
 ErrorNoVATRateDefinedForSellerCountry=Chyba, pro zemi '%s' nejsou definovány žádné sazby DPH.
-ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
+ErrorNoSocialContributionForSellerCountry=Chyba, žádná společenská / daně typ fiskální definován pro země ‚%s‘.
 ErrorFailedToSaveFile=Chyba, nepodařilo se uložit soubor.
-ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
-NotAuthorized=You are not authorized to do that.
+ErrorCannotAddThisParentWarehouse=Snažíte se přidat nadřazené sklad, který je již dítě aktuálního
+MaxNbOfRecordPerPage=Max nb záznamu na stránku
+NotAuthorized=Nejste oprávněni k tomu, že.
 SetDate=Nastavení datumu
 SelectDate=Výběr datumu
 SeeAlso=Viz také %s
 SeeHere=Nahlédněte zde
 Apply=Aplikovat
 BackgroundColorByDefault=Výchozí barva pozadí
-FileRenamed=The file was successfully renamed
+FileRenamed=Soubor byl úspěšně přejmenován
 FileUploaded=Soubor byl úspěšně nahrán
-FileGenerated=The file was successfully generated
+FileGenerated=Soubor byl úspěšně vygenerován
 FileWasNotUploaded=Soubor vybrán pro připojení, ale ještě nebyl nahrán. Klikněte na "Přiložit soubor".
 NbOfEntries=Počet záznamů
-GoToWikiHelpPage=Read online help (Internet access needed)
+GoToWikiHelpPage=Přečtěte si online nápovědu (přístup k internetu je potřeba)
 GoToHelpPage=Přečíst nápovědu
 RecordSaved=Záznam uložen
 RecordDeleted=Záznam smazán
 LevelOfFeature=Úroveň vlastností
 NotDefined=Není definováno
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
+DolibarrInHttpAuthenticationSoPasswordUseless=Režim ověřování Dolibarr je nastaven na <b> %s </ b> v konfiguračním souboru <b> conf.php </ b>. <br> To znamená, že databáze hesel je externí, takže změna tohoto pole nemusí mít žádný účinek.
 Administrator=Správce
 Undefined=Nedefinováno
-PasswordForgotten=Password forgotten?
+PasswordForgotten=Zapomněli jste heslo?
 SeeAbove=Viz výše
 HomeArea=Hlavní oblast
-LastConnexion=Latest connection
+LastConnexion=poslední připojení
 PreviousConnexion=Předchozí připojení
-PreviousValue=Previous value
+PreviousValue=Předchozí hodnota
 ConnectedOnMultiCompany=Připojeno na rozhraní
 ConnectedSince=Připojen od
-AuthenticationMode=Authentication mode
-RequestedUrl=Requested URL
+AuthenticationMode=režim ověřování
+RequestedUrl=požadovaná adresa URL
 DatabaseTypeManager=Správce typu databáze
-RequestLastAccessInError=Latest database access request error
-ReturnCodeLastAccessInError=Return code for latest database access request error
-InformationLastAccessInError=Information for latest database access request error
+RequestLastAccessInError=Žádost o poslední přístup do databáze v případě chyby
+ReturnCodeLastAccessInError=Návratový kód pro přístup k databázi v případě chyby
+InformationLastAccessInError=Informace pro poslední přístup do databáze v případě chyby
 DolibarrHasDetectedError=Dolibarr zjistil technickou chybu
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes
+InformationToHelpDiagnose=Tyto informace mohou být užitečné pro diagnostické účely
 MoreInformation=Více informací
 TechnicalInformation=Technická informace
-TechnicalID=Technical ID
+TechnicalID=Technické ID
 NotePublic=Poznámka (veřejné)
 NotePrivate=Poznámka (soukromé)
 PrecisionUnitIsLimitedToXDecimals=Dolibarr byl nastaven pro limit přesnosti jednotkových cen na <b>%s</b> desetinných míst.
 DoTest=Test
 ToFilter=Filtr
-NoFilter=No filter
+NoFilter=Žádný filtr
 WarningYouHaveAtLeastOneTaskLate=Pozor, máte alespoň jeden prvek, který překročil tolerance zpoždění.
 yes=ano
 Yes=Ano
@@ -130,29 +130,30 @@ Activate=Aktivovat
 Activated=Aktivované
 Closed=Zavřeno
 Closed2=Zavřeno
-NotClosed=Not closed
+NotClosed=není uzavřen
 Enabled=Povoleno
 Deprecated=Zastaralá
 Disable=Zakázat
 Disabled=Invalidní
 Add=Přidat
 AddLink=Přidat odkaz
-RemoveLink=Remove link
-AddToDraft=Add to draft
+RemoveLink=Odebrat odkaz
+AddToDraft=Přidat k návrhům
 Update=Aktualizovat
 Close=Zavřít
-CloseBox=Remove widget from your dashboard
+CloseBox=Odebrat widget z panelu
 Confirm=Potvrdit
-ConfirmSendCardByMail=Do you really want to send content of this card by mail to <b>%s</b>?
+ConfirmSendCardByMail=Opravdu chcete poslat obsah této karty mailem na <b>%s?</b>
 Delete=Vymazat
 Remove=Odstranit
-Resiliate=Terminate
+Resiliate=přerušit
 Cancel=Zrušit
 Modify=Upravit
 Edit=Upravit
 Validate=Potvrdit
 ValidateAndApprove=Ověřeno a schváleno
 ToValidate=Chcete-li ověřit
+NotValidated=Neověřeno
 Save=Uložit
 SaveAs=Uložit jako
 TestConnection=Zkušební připojení
@@ -164,7 +165,7 @@ Go=Jít
 Run=Běh
 CopyOf=Kopie
 Show=Ukázat
-Hide=Hide
+Hide=Skrýt
 ShowCardHere=Zobrazit kartu
 Search=Vyhledávání
 SearchOf=Vyhledávání
@@ -207,8 +208,8 @@ Info=Přihlásit
 Family=Rodina
 Description=Popis
 Designation=Popis
-Model=Doc template
-DefaultModel=Default doc template
+Model=doc šablona
+DefaultModel=Výchozí šablona doc
 Action=Událost
 About=O
 Number=Číslo
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=Žádná aplikovaná odpojená funkce s režimem ov
 Connection=Spojení
 Setup=Nastavení
 Alert=Upozornění
+MenuWarnings=Upozornění
 Previous=Předchozí
 Next=Další
 Cards=Karty
@@ -230,15 +232,15 @@ Now=Nyní
 HourStart=Startovní hodina
 Date=Datum
 DateAndHour=Datum a hodina
-DateToday=Today's date
-DateReference=Reference date
+DateToday=Dnešní datum
+DateReference=referenční datum
 DateStart=Datum zahájení
 DateEnd=Datum ukončení
 DateCreation=Datum vytvoření
-DateCreationShort=Creat. date
+DateCreationShort=Vytvořit datum
 DateModification=Datum změny
 DateModificationShort=Datum úpravy
-DateLastModification=Latest modification date
+DateLastModification=Poslední datum změny
 DateValidation=Datum ověření
 DateClosing=Uzávěrka
 DateDue=Datum splatnosti
@@ -253,10 +255,10 @@ DateBuild=Zpráva data vzniku
 DatePayment=Datum platby
 DateApprove=Schválené datum
 DateApprove2=Schválené datum (druhé schválení)
-UserCreation=Creation user
-UserModification=Modification user
-UserCreationShort=Creat. user
-UserModificationShort=Modif. user
+UserCreation=Vytvořit uživatele
+UserModification=Upravit uživatele
+UserCreationShort=Creat. uživatel
+UserModificationShort=Modif. uživatel
 DurationYear=rok
 DurationMonth=měsíc
 DurationWeek=týden
@@ -291,7 +293,7 @@ MonthOfDay=Měsíce ode dne
 HourShort=H
 MinuteShort=mn
 Rate=Sazba
-CurrencyRate=Currency conversion rate
+CurrencyRate=Míra konverze měny
 UseLocalTax=Včetně DPH
 Bytes=Bytů
 KiloBytes=Kilobajty
@@ -308,14 +310,15 @@ Copy=Kopírovat
 Paste=Vložit
 Default=Standardní
 DefaultValue=Výchozí hodnota
+DefaultValues=výchozí hodnoty
 Price=Cena
 UnitPrice=Jednotková cena
 UnitPriceHT=Jednotková cena (bez DPH)
 UnitPriceTTC=Jednotková cena
 PriceU=UP
 PriceUHT=UP (bez DPH)
-PriceUHTCurrency=U.P (currency)
-PriceUTTC=U.P. (inc. tax)
+PriceUHTCurrency=U.P (měna)
+PriceUTTC=U.P. (Včetně daně)
 Amount=Množství
 AmountInvoice=Fakturovaná částka
 AmountPayment=Částka platby
@@ -324,12 +327,12 @@ AmountTTCShort=Částka (vč. DPH)
 AmountHT=Částka (bez DPH)
 AmountTTC=Částka (vč. DPH)
 AmountVAT=Částka daně
-MulticurrencyAlreadyPaid=Already payed, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
-MulticurrencyAmountHT=Amount (net of tax), original currency
-MulticurrencyAmountTTC=Amount (inc. of tax), original currency
-MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencyAlreadyPaid=Platba již byla zaplacena, původní měna
+MulticurrencyRemainderToPay=I nadále platit, původní měnu
+MulticurrencyPaymentAmount=Výše platby, původní měna
+MulticurrencyAmountHT=Částka (po zdanění), původní měně
+MulticurrencyAmountTTC=Částka (vč. Daně), původní měně
+MulticurrencyAmountVAT=Výše daní, původní měna
 AmountLT1=Částka daně z 2
 AmountLT2=Částka daně 3
 AmountLT1ES=Množství RE
@@ -341,11 +344,11 @@ Percentage=Procento
 Total=Celkový
 SubTotal=Mezisoučet
 TotalHTShort=Celkem (bez DPH)
-TotalHTShortCurrency=Total (net in currency)
+TotalHTShortCurrency=Total (netto v měně)
 TotalTTCShort=Celkem (vč. DPH)
 TotalHT=Celkem (bez daně)
 TotalHTforthispage=Celkem (po zdanění) pro tuto stránku
-Totalforthispage=Total for this page
+Totalforthispage=Celkový pro tuto stránku
 TotalTTC=Celkem (vč. DPH)
 TotalTTCToYourCredit=Celkem (vč. DPH) na Váš účet
 TotalVAT=Daň celkem
@@ -356,14 +359,15 @@ TotalLT2ES=Celkem IRPF
 HT=Po odečtení daně
 TTC=Inc daň
 VAT=Daň z obratu
-VATs=Sales taxes
+VATs=Daň z prodeje
 LT1ES=RE
 LT2ES=IRPF
 VATRate=Daňová sazba
 Average=Průměr
 Sum=Součet
 Delta=Delta
-Module=Modul
+Module=Module/Application
+Modules=Modules/Applications
 Option=Volba
 List=Seznam
 FullList=Plný seznam
@@ -384,10 +388,10 @@ ActionsToDoShort=Dělat
 ActionsDoneShort=Hotový
 ActionNotApplicable=Nevztahuje se
 ActionRunningNotStarted=Chcete-li začít
-ActionRunningShort=In progress
+ActionRunningShort=probíhá
 ActionDoneShort=Ukončený
 ActionUncomplete=Nekompletní
-CompanyFoundation=Společnost/Nadace
+CompanyFoundation=Společnost / Organizace
 ContactsForCompany=Kontakty pro tuto třetí stranu
 ContactsAddressesForCompany=Kontakty/adresy pro tuto třetí stranu
 AddressesForCompany=Adresy pro tuto třetí stranu
@@ -396,7 +400,7 @@ ActionsOnMember=Akce u tohoto uživatele
 NActionsLate=%s pozdě
 RequestAlreadyDone=Poptávka je již zaznamenaná
 Filter=Filtr
-FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
+FilterOnInto=Kritéria hledání '<strong> %s </ strong>' do polí %s
 RemoveFilter=Vyjměte filtr
 ChartGenerated=Generovaný graf
 ChartNotGenerated=Graf není generován
@@ -405,8 +409,9 @@ Generate=Generovat
 Duration=Trvání
 TotalDuration=Celková doba trvání
 Summary=Shrnutí
-DolibarrStateBoard=Statistika
+DolibarrStateBoard=Statistika databází
 DolibarrWorkBoard=Plocha pracovních úkolů
+NoOpenedElementToProcess=No otevřel prvek zpracovávat
 Available=Dostupný
 NotYetAvailable=Zatím není k dispozici
 NotAvailable=Není k dispozici
@@ -442,7 +447,7 @@ General=Obecný
 Size=Velikost
 Received=Přijaté
 Paid=Placený
-Topic=Subject
+Topic=Předmět
 ByCompanies=Třetími stranami
 ByUsers=Od uživatelů
 Links=Odkazy
@@ -453,8 +458,9 @@ NextStep=Další krok
 Datas=Údaje
 None=Nikdo
 NoneF=Nikdo
+NoneOrSeveral=Žádný nebo několik
 Late=Pozdě
-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=Zpoždění se definovat, zda záznam je pozdě, nebo ne, závisí na vašem nastavení. Požádejte svého administrátora pro změnu zpoždění z menu Home - nastavení - Výstrahy.
 Photo=Obrázek
 Photos=Obrázky
 AddPhoto=Přidat obrázek
@@ -462,7 +468,7 @@ DeletePicture=Odstranit obrázek
 ConfirmDeletePicture=Potvrdit odstranění obrázku?
 Login=Přihlášení
 CurrentLogin=Aktuální přihlášení
-EnterLoginDetail=Enter login details
+EnterLoginDetail=Zadejte přihlašovací údaje
 January=Leden
 February=Únor
 March=Březen
@@ -520,8 +526,8 @@ ReportName=Název zprávy
 ReportPeriod=Zpráva za období
 ReportDescription=Popis
 Report=Zpráva
-Keyword=Keyword
-Origin=Origin
+Keyword=Klíčové slovo
+Origin=Původ
 Legend=Legenda
 Fill=Vyplnit
 Reset=Obnovit
@@ -537,8 +543,8 @@ FindBug=Nahlásit chybu
 NbOfThirdParties=Počet třetích stran
 NbOfLines=Počet řádků
 NbOfObjects=Počet objektů
-NbOfObjectReferers=Number of related items
-Referers=Related items
+NbOfObjectReferers=Počet souvisejících položek
+Referers=Související zboží
 TotalQuantity=Celkové množství
 DateFromTo=Od %s na %s
 DateFrom=Od %s
@@ -573,8 +579,8 @@ Priority=Priorita
 SendByMail=Poslat e-mailem
 MailSentBy=E-mail odeslán
 TextUsedInTheMessageBody=E-mail obsah
-SendAcknowledgementByMail=Send confirmation email
-EMail=E-mail
+SendAcknowledgementByMail=Zaslat potvrzovací e-mail
+EMail=E-mailem
 NoEMail=Žádný e-mail
 Email=E-mail
 NoMobilePhone=Žádné telefonní číslo
@@ -586,28 +592,29 @@ GoBack=Návrat
 CanBeModifiedIfOk=Může být změněn, pokud platí
 CanBeModifiedIfKo=Může být změněn, pokud není platný
 ValueIsValid=Hodnota je platná
-ValueIsNotValid=Value is not valid
-RecordCreatedSuccessfully=Record created successfully
+ValueIsNotValid=Hodnota není platná
+RecordCreatedSuccessfully=Záznam byl úspěšně vytvořen
 RecordModifiedSuccessfully=Nahrávání bylo úspěšně upraveno
-RecordsModified=%s record modified
-RecordsDeleted=%s record deleted
+RecordsModified=Záznam %s změněn
+RecordsDeleted=%s záznam smazán
 AutomaticCode=Automatický kód
 FeatureDisabled=Funkce vypnuta
-MoveBox=Move widget
+MoveBox=Přesun widgetu
 Offered=Nabízené
 NotEnoughPermissions=Nemáte oprávnění pro tuto akci
 SessionName=Název relace
 Method=Metoda
 Receive=Přijmout
-CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
-ExpectedValue=Expected Value
+CompleteOrNoMoreReceptionExpected=Kompletní nebo nic víc očekávat
+ExpectedValue=Očekávaná hodnota
 CurrentValue=Současná hodnota
 PartialWoman=Částečný
 TotalWoman=Celkový
 NeverReceived=Nikdy nedostal
 Canceled=Zrušený
-YouCanChangeValuesForThisListFromDictionarySetup=Můžete změnit hodnoty pro tento seznam z nastavení v menu - slovník
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
+YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu Setup - Dictionaries
+YouCanChangeValuesForThisListFrom=You can change values for this list from menu %s
+YouCanSetDefaultValueInModuleSetup=Můžete nastavit výchozí hodnotu použitou při vytváření nového záznamu do nastavení modulu
 Color=Barva
 Documents=Připojené soubory
 Documents2=Dokumenty
@@ -623,12 +630,12 @@ CurrentTheme=Aktuální téma
 CurrentMenuManager=Manager aktuální nabídky
 Browser=Prohlížeč
 Layout=Layout
-Screen=Screen
+Screen=Obrazovka
 DisabledModules=Zakázané moduly
 For=Pro
 ForCustomer=Pro zákazníky
 Signature=Podpis
-DateOfSignature=Date of signature
+DateOfSignature=Datum podpisu
 HidePassword=Zobrazit příkaz s heslem skryté
 UnHidePassword=Zobrazit skutečný příkaz s odstraněným heslem
 Root=Kořen
@@ -642,11 +649,12 @@ FreeLineOfType=Volný vstup typu
 CloneMainAttributes=Duplikovat objekt s jeho hlavními atributy
 PDFMerge=Spojit PDF
 Merge=Spojit
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Zobrazit stránku pro tisk hlavní obsahové části
 MenuManager=Manager nabídky
 WarningYouAreInMaintenanceMode=Pozor, jste v režimu údržby, jen pro přihlášené <b>%s</b> je dovoleno v tuto chvíli používat aplikace.
 CoreErrorTitle=Systémová chyba
-CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
+CoreErrorMessage=Je nám líto, došlo k chybě. Obraťte se na správce systému a zkontrolujte protokoly nebo zakázat $ dolibarr_main_prod=1 pro získání více informací.
 CreditCard=Kreditní karta
 FieldsWithAreMandatory=Pole označená * jsou povinná <b>%s</b>
 FieldsWithIsForPublic=Pole s <b>%s</b> jsou uvedeny na veřejném seznamu členů. Pokud si to nepřejete, zaškrtněte "veřejný" box.
@@ -672,15 +680,15 @@ NewAttribute=Nový atribut
 AttributeCode=Kód atributu
 URLPhoto=URL obrázku/loga
 SetLinkToAnotherThirdParty=Odkaz na jinou třetí stranu
-LinkTo=Link to
-LinkToProposal=Link to proposal
+LinkTo=odkaz na
+LinkToProposal=Odkaz na návrh
 LinkToOrder=Odkaz na objednávku
-LinkToInvoice=Link to invoice
-LinkToSupplierOrder=Link to supplier order
-LinkToSupplierProposal=Link to supplier proposal
-LinkToSupplierInvoice=Link to supplier invoice
-LinkToContract=Link to contract
-LinkToIntervention=Link to intervention
+LinkToInvoice=Odkaz na fakturu
+LinkToSupplierOrder=Odkaz na dodavatele objednávku
+LinkToSupplierProposal=Odkaz na návrh dodavatele
+LinkToSupplierInvoice=Odkaz na dodavatelské faktury
+LinkToContract=Odkaz na smlouvu
+LinkToIntervention=Odkaz na intervenci
 CreateDraft=Vytvořte návrh
 SetToDraft=Zrušit návrh
 ClickToEdit=Klepnutím lze upravit
@@ -695,19 +703,20 @@ ByDay=Podle dne
 BySalesRepresentative=Podle obchodního zástupce
 LinkedToSpecificUsers=Souvisí s konkrétním uživatelem kontaktu
 NoResults=Žádné výsledky
-AdminTools=Admin tools
+AdminTools=admin nástroje
 SystemTools=Systémové nástroje
 ModulesSystemTools=Moduly nástrojů
 Test=Test
 Element=Prvek
 NoPhotoYet=Momentálně žádné fotografie k dispozici
-Dashboard=Dashboard
+Dashboard=Plocha
 MyDashboard=My dashboard
 Deductible=Spoluúčast
 from=z
 toward=k
 Access=Přístup
-SelectAction=Select action
+SelectAction=Vybrat akci
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Použijte Ctrl + C pro zkopírování do schránky
 SaveUploadedFileWithMask=Uložit soubor na server s názvem "<strong>%s</strong>" (iinak "%s")
 OriginFileName=Originální název sounoru
@@ -718,48 +727,57 @@ ViewPrivateNote=Zobrazit poznámky
 XMoreLines=%s řádky(ů) skryto
 PublicUrl=Veřejná URL
 AddBox=Přidejte box
-SelectElementAndClickRefresh=Vyberte element a klikněte na Obnovit
+SelectElementAndClick=Select an element and click %s
 PrintFile=Tisk souboru %s
-ShowTransaction=Show entry on bank account
+ShowTransaction=Ukázat záznam o bankovním účtu
 GoIntoSetupToChangeLogo=Jděte na Domů-Nastavení-Společnost pro změnu loga, nebo je v nastavení skryjte.
 Deny=Odmítnout
 Denied=Odmítnuto
 ListOfTemplates=Seznam šablon
-Gender=Gender
+Gender=Pohlaví
 Genderman=Muž
 Genderwoman=Žena
 ViewList=Zobrazení seznamu
-Mandatory=Mandatory
+Mandatory=povinné
 Hello=Ahoj
-Sincerely=Sincerely
+Sincerely=S pozdravem
 DeleteLine=Odstranění řádku
-ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
-NoRecordSelected=No record selected
-MassFilesArea=Area for files built by mass actions
-ShowTempMassFilesArea=Show area of files built by mass actions
-RelatedObjects=Related Objects
+ConfirmDeleteLine=Jste si jisti, že chcete smazat tento řádek?
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
+NoRecordSelected=Nevybrán žádný záznam
+MassFilesArea=Plocha pro soubory postavený masových akcí
+ShowTempMassFilesArea=Show area souborů postavený masových akcí
+RelatedObjects=Související objekty
 ClassifyBilled=Označit jako účtováno
 Progress=Pokrok
 ClickHere=Klikněte zde
-FrontOffice=Front office
+FrontOffice=Přední kancelář
 BackOffice=Back office
-View=View
+View=Pohled
 Export=Export
 Exports=Exporty
-ExportFilteredList=Export filtered list
-ExportList=Export list
+ExportFilteredList=Export filtrován seznam
+ExportList=seznam export
 Miscellaneous=Smíšený
 Calendar=Kalendář
-GroupBy=Group by...
-ViewFlatList=View flat list
-RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Direct download link
-Download=Download
-ActualizeCurrency=Update currency rate
+GroupBy=Skupina vytvořená...
+ViewFlatList=Zobrazit seznam plochý
+RemoveString=Odstraňte řetězec ‚%s‘
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
+DirectDownloadLink=Přímý odkaz ke stažení
+Download=Stažení
+ActualizeCurrency=Aktualizovat měnovou sazbu
 Fiscalyear=Fiskální rok
+ModuleBuilder=module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Hromadné akce
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Pondělí
 Tuesday=Úterý
@@ -790,32 +808,30 @@ ShortFriday=PÁ
 ShortSaturday=S
 ShortSunday=N
 SelectMailModel=Vybrat šablonu e-mailu
-SetRef=Set ref
-Select2ResultFoundUseArrows=Some results found. Use arrows to select.
-Select2NotFound=No result found
-Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
-Select2LoadingMoreResults=Loading more results...
-Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
+SetRef=nastavit ref
+Select2ResultFoundUseArrows=zjištěno, že některé výsledky. Pomocí šipek vyberte.
+Select2NotFound=nalezen žádný výsledek
+Select2Enter=Zadejte
+Select2MoreCharacter=nebo více znaků
+Select2MoreCharacters=nebo více znaků
+Select2MoreCharactersMore=<Strong> Vyhledávání syntax: </ strong> <br /> <kbd> <strong> | </ strong> </ kbd> <kbd> nebo </ kbd> (a | b) <br /> <kbd> < strong> * </ strong> </ kbd> <kbd> Jakýkoliv znak </ kbd> (a * b) <br /> <kbd> <strong> ^ </ strong> </ kbd> <kbd> Začít s < / kbd> (^ ab) <br /> <kbd> <strong> $ </ strong> </ kbd> <kbd> Ukončit s </ kbd> (ab $) <br />
+Select2LoadingMoreResults=Načítání dalších výsledků ...
+Select2SearchInProgress=Probíhá vyhledávání ...
+SearchIntoThirdparties=Subjekty
 SearchIntoContacts=Kontakty
 SearchIntoMembers=Členové
 SearchIntoUsers=Uživatelé
-SearchIntoProductsOrServices=Products or services
+SearchIntoProductsOrServices=Produkty nebo služby
 SearchIntoProjects=Projekty
 SearchIntoTasks=Úkoly
-SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
+SearchIntoCustomerInvoices=faktury zákazníků
+SearchIntoSupplierInvoices=Dodavatelské faktury
 SearchIntoCustomerOrders=Objednávky zákazníků
-SearchIntoSupplierOrders=Supplier orders
-SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
+SearchIntoSupplierOrders=Dodavatel objednávky
+SearchIntoCustomerProposals=návrhy zákazníků
+SearchIntoSupplierProposals=Návrhy dodavatele
 SearchIntoInterventions=Intervence
 SearchIntoContracts=Smlouvy
-SearchIntoCustomerShipments=Customer shipments
+SearchIntoCustomerShipments=zásilky zákazník
 SearchIntoExpenseReports=Zpráva výdajů
 SearchIntoLeaves=Dovolená
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/cs_CZ/other.lang b/htdocs/langs/cs_CZ/other.lang
index 5a3875e23e0..68acf5ad4e8 100644
--- a/htdocs/langs/cs_CZ/other.lang
+++ b/htdocs/langs/cs_CZ/other.lang
@@ -3,13 +3,26 @@ SecurityCode=Bezpečnostní kód
 NumberingShort=N°
 Tools=Nástroje
 TMenuTools=Nástroje
-ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.<br /><br />All the tools can be reached in the left menu.
+ToolsDesc=Tato oblast je určena pro skupiny různých nástrojů, které nejsou k dispozici v jiných položkách menu. <br><br> Na tyto nástroje se dostanete z levého bočního menu
 Birthday=Narozeniny
-BirthdayDate=Birthday date
+BirthdayDate=datum narozenin
 DateToBirth=Datum narození
 BirthdayAlertOn=Připomenutí narozenin aktivní
 BirthdayAlertOff=Připomenutí narozenin neaktivní
-Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
+Notify_FICHINTER_ADD_CONTACT=Přidá kontakt intervence
 Notify_FICHINTER_VALIDATE=Intervence ověřena
 Notify_FICHINTER_SENTBYMAIL=Intervence přes mail
 Notify_ORDER_VALIDATE=Objednávka zákazníka ověřena
@@ -43,7 +56,7 @@ Notify_SHIPPING_SENTBYMAIL=Doprava odeslána mailem
 Notify_MEMBER_VALIDATE=Uživatel ověřen
 Notify_MEMBER_MODIFY=Uživatel upraven
 Notify_MEMBER_SUBSCRIPTION=Uživatel zapsaný
-Notify_MEMBER_RESILIATE=Member terminated
+Notify_MEMBER_RESILIATE=Členské ukončeno
 Notify_MEMBER_DELETE=Uživatel smazán
 Notify_PROJECT_CREATE=Vytvoření projektu
 Notify_TASK_CREATE=Úkol vytvořen
@@ -58,43 +71,44 @@ LinkedObject=Propojený objekt
 NbOfActiveNotifications=Počet hlášení (několik z příjemců e-mailů)
 PredefinedMailTest=Toto je testovací e-mail. \nTyto dva řádky jsou odděleny znakem konce řádku. \n\n __SIGNATURE__
 PredefinedMailTestHtml=Toto je <b>testovací</b> mail (slovo testovací musí být tučně). <br> Dva řádky jsou odděleny znakem konce řádku. <br><br> __SIGNATURE__
-PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nNajdete zde fakturu __FACREF__\n\n__PERSONALIZED__S pozdravem\n\n__SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nDovolujeme si vás upozornit, že faktura __FACREF__ pravděpodobně nebyla uhrazena. Jako upomínku vám ji v příloze zasíláme znovu.\n\n__PERSONALIZED__S pozdravem\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nNajdete zde obchodní návrh __PROPREF__\n\n__PERSONALIZED__S pozdravem\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nNajdete zde cenový požadavek __ASKREF__\n\n__PERSONALIZED__S pozdravem\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nNajdete zde objednávku  __ORDERREF__\n\n__PERSONALIZED__S pozdravem\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nNajdete zde naši objednávku __ORDERREF__\n\n__PERSONALIZED__S pozdravem\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nNajdete zde fakturu __FACREF__\n\n__PERSONALIZED__S pozdravem\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nNajdete zde dopravu __SHIPPINGREF__\n\n__PERSONALIZED__S pozdravem\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nNajdete zde intervenci __FICHINTERREF__\n\n__PERSONALIZED__S pozdravem\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
-ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
-ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
+DemoDesc=Dolibarr je kompaktní ERP/CRM systém, který se  skládá z více funkčních modulů. Demo, které obsahuje všechny moduly vám nepředstaví všechny možnosti, protože v reálné situaci všechny moduly najednou používat nebudete. Pro lepší a snadnější seznámení s celým systémem máte k dispozici několik demo profilů lépe vystihujících vaše požadavky. 
+ChooseYourDemoProfil=Vyberte demo profil, který nejlépe odpovídá vaší činnosti, nebo zaměření ...
+ChooseYourDemoProfilMore=... nebo vytvořit vlastní profil <br> (manuální výběr modul)
 DemoFundation=Spravovat nadaci, nebo neziskovou organizaci a její členy
 DemoFundation2=Správa členů a bankovních účtů nadace nebo neziskové organizace
-DemoCompanyServiceOnly=Company or freelance selling service only
+DemoCompanyServiceOnly=Správa pouze prodejní činnosti malé firmy nebo nadace
 DemoCompanyShopWithCashDesk=Správa obchodu s pokladnou, e-shopu nebo obchodní činnost
-DemoCompanyProductAndStocks=Company selling products with a shop
-DemoCompanyAll=Company with multiple activities (all main modules)
+DemoCompanyProductAndStocks=Správa malého nebo středního podniku, který prodává své výrobky
+DemoCompanyAll=Správa malé nebo střední firmy s více činnostmi (všechny hlavní moduly)
 CreatedBy=Vytvořil %s
 ModifiedBy=Změnil %s
 ValidatedBy=Ověřil %s
 ClosedBy=Uzavřel %s
 CreatedById=Uživatel id, který vytvořil
-ModifiedById=User id who made latest change
+ModifiedById=ID uživatele, který udělal poslední změnu
 ValidatedById=Uživatel id který ověřil
 CanceledById=Uživatel id který zrušil
 ClosedById=Uživatel id který uzavřel
 CreatedByLogin=Uživatelské přihlášení, které vytvořil
-ModifiedByLogin=User login who made latest change
+ModifiedByLogin=přihlášení uživatele, který provedl poslední změnu
 ValidatedByLogin=Přihlášený uživatel, který ověřil
 CanceledByLogin=Přihlášený uživatel, který zrušil
 ClosedByLogin=Přihlášený uživatel, který uzavřel
 FileWasRemoved=Soubor %s byl odstraněn
 DirWasRemoved=Adresář %s byl odstraněn
-FeatureNotYetAvailable=Feature not yet available in the current version
-FeaturesSupported=Supported features
+FeatureNotYetAvailable=Funkce zatím není k dispozici v aktuální verzi
+FeaturesSupported=Podporované funkce
 Width=Šířka
 Height=Výška
 Depth=Hloubka
@@ -105,7 +119,7 @@ Right=Pravý
 CalculatedWeight=Vypočtená hmotnost
 CalculatedVolume=Vypočtený objem
 Weight=Hmotnost
-WeightUnitton=tonne
+WeightUnitton=tuna
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -120,7 +134,7 @@ SurfaceUnitm2=m²
 SurfaceUnitdm2=dm²
 SurfaceUnitcm2=cm²
 SurfaceUnitmm2=mm²
-SurfaceUnitfoot2=ft²
+SurfaceUnitfoot2=ft?
 SurfaceUnitinch2=in²
 Volume=Objem
 VolumeUnitm3=m³
@@ -140,27 +154,27 @@ SizeUnitinch=palec
 SizeUnitfoot=stopa
 SizeUnitpoint=bod
 BugTracker=Hlášení chyb
-SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address.<br />Change will become effective once you click on the confirmation link in the email.<br />Check your inbox.
+SendNewPasswordDesc=Tento formulář umožňuje požádat o nové heslo. To bude zasláno na vaši e-mailovou adresu. <br> Změna se projeví až po kliknutí na potvrzovací odkaz uvnitř tohoto e-mailu. <br> Zkontrolujte vašeho mailového klienta, zaa vám mail dorazil
 BackToLoginPage=Zpět na přihlašovací stránku
-AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br />In this mode, Dolibarr can't know nor change your password.<br />Contact your system administrator if you want to change your password.
-EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
+AuthenticationDoesNotAllowSendNewPassword=Režim ověřování je <b>%s.</b> <br> V tomto režimu Dolibarr nepozná, zda může změnit vaše heslo. <br> Obraťte se na správce systému, pokud chcete heslo změnit.
+EnableGDLibraryDesc=Nainstalujte nebo povolte GD knihovnu ve vaší PHP pro využití této možnosti
 ProfIdShortDesc=<b>Prof Id %s</b> je informace v závislosti na třetích stranách země. <br> Například pro země <b>%s,</b> je to kód <b>%s.</b>
 DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Statistika v počtu produktů/služeb jednotek
-StatsByNumberOfEntities=Statistika v počtu odkazujících subjektů
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
-EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
+EMailTextInterventionAddedContact=New intervention %s byla přiřazena k vám.
 EMailTextInterventionValidated=Zásah %s byl ověřen.
 EMailTextInvoiceValidated=Faktura %s byla ověřena.
 EMailTextProposalValidated=Nabídka %s byla ověřena.
@@ -198,19 +212,19 @@ ClickHereToGoTo=Klikněte zde pro přechod na %s
 YouMustClickToChange=Musíte však nejprve kliknout na následující odkaz pro potvrzení této změny hesla
 ForgetIfNothing=Pokud jste o tuto změnu nežádali, stačí pouze odstranit tento e-mail. Vaše přihlašovací údaje jsou v bezpečí.
 IfAmountHigherThan=je-li množství vyšší než <strong>%s</strong>
-SourcesRepository=Repository for sources
-Chart=Chart
+SourcesRepository=Úložiště pro zdroje
+Chart=Schéma
 
 ##### Export #####
 ExportsArea=Exportní plocha
 AvailableFormats=Dostupné formáty
 LibraryUsed=Použitá knihovna
-LibraryVersion=Library version
+LibraryVersion=verze knihovny
 ExportableDatas=Exportovatelné údaje
 NoExportableData=Žádná data pro export (žádné moduly s exportovatelnými daty, nebo chybějící oprávnění)
 ##### External sites #####
-WebsiteSetup=Setup of module website
-WEBSITE_PAGEURL=URL of page
+WebsiteSetup=Nastavení webových stránek modulu
+WEBSITE_PAGEURL=URL stránky
 WEBSITE_TITLE=Titul
 WEBSITE_DESCRIPTION=Popis
-WEBSITE_KEYWORDS=Keywords
+WEBSITE_KEYWORDS=Klíčová slova
diff --git a/htdocs/langs/cs_CZ/projects.lang b/htdocs/langs/cs_CZ/projects.lang
index d526372dbe8..d30248d6edc 100644
--- a/htdocs/langs/cs_CZ/projects.lang
+++ b/htdocs/langs/cs_CZ/projects.lang
@@ -1,42 +1,47 @@
 # Dolibarr language file - Source file is en_US - projects
 RefProject=Číslo projektu
-ProjectRef=Project ref.
+ProjectRef=Projekt ref.
 ProjectId=Id projektu
-ProjectLabel=Project label
+ProjectLabel=štítek projekt
 Project=Projekt
 Projects=Projekty
-ProjectsArea=Projects Area
+ProjectsArea=Oblast projektů
 ProjectStatus=Stav projektu
 SharedProject=Všichni
 PrivateProject=Kontakty projektu
+ProjectsImContactFor=Projekty Jsem výslovně kontakt of
+AllAllowedProjects=All projekt mohu číst (důlní + veřejné)
+AllProjects=Všechny projekty
 MyProjectsDesc=Tento pohled je omezen na projekty u kterých jste uveden jako kontakt (jakéhokoliv typu)
 ProjectsPublicDesc=Tento pohled zobrazuje všechny projekty které máte oprávnění číst.
-TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
+TasksOnProjectsPublicDesc=Tento pohled představuje všechny úkoly na projektech jsou povoleny číst.
 ProjectsPublicTaskDesc=Tento pohled představuje všechny projekty a úkoly, které mají povoleno číst.
 ProjectsDesc=Tento pohled zobrazuje všechny projekty (vaše uživatelské oprávnění vám umožňuje vidět vše).
-TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
+TasksOnProjectsDesc=Tento pohled představuje všechny úkoly na všech projektech (vaše uživatelská oprávnění udělit oprávnění ke shlédnutí vše).
 MyTasksDesc=Tento pohled je omezen na projekty či úkoly u kterých jste uveden jako kontakt (jakéhokoliv typu)
 OnlyOpenedProject=Pouze otevřené projekty jsou viditelné (projekty v návrhu ani v uzavřeném stavu nejsou viditelné).
-ClosedProjectsAreHidden=Closed projects are not visible.
+ClosedProjectsAreHidden=Uzavřené projekty nejsou viditelné.
 TasksPublicDesc=Tento pohled zobrazuje všechny projekty a úkoly které máte oprávnění číst.
 TasksDesc=Tento pohled zobrazuje všechny projekty a úkoly (vaše uživatelské oprávnění vám umožňuje vidět vše).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
-ImportDatasetTasks=Tasks of projects
+AllTaskVisibleButEditIfYouAreAssigned=Všechny úkoly takového projektu jsou viditelné, ale můžete zadat čas pouze u úkolů, které vás. Přiřadit úkol sami, zda je nutné zadat čas na to.
+OnlyYourTaskAreVisible=Pouze úkoly, které vám jsou viditelné. Přiřadit úkol sami, pokud to není vidět a je nutné zadat čas na to.
+ImportDatasetTasks=Úkoly projektů
+ProjectCategories=Štítky projektu / kategorie
 NewProject=Nový projekt
 AddProject=Vytvořit projekt
 DeleteAProject=Odstranit projekt
 DeleteATask=Odstranit úkol
-ConfirmDeleteAProject=Are you sure you want to delete this project?
-ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Opened projects
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
-OpportunitiesStatusForProjects=Opportunities amount of projects by status
+ConfirmDeleteAProject=Opravdu chcete tento projekt smazat?
+ConfirmDeleteATask=Jste si jisti, že chcete smazat tento úkol?
+OpenedProjects=otevřené projekty
+OpenedTasks=otevřené úkoly
+OpportunitiesStatusForOpenedProjects=Příležitosti množství otevřených projektů stavu
+OpportunitiesStatusForProjects=Příležitosti počet projektů podle stavu
 ShowProject=Zobrazit projekt
 SetProject=Nastavit projekt
 NoProject=Žádný projekt nedefinován či vlastněn
 NbOfProjects=Počet projektů
+NbOfTasks=Nb of tasks
 TimeSpent=Strávený čas
 TimeSpentByYou=Váš strávený čas
 TimeSpentByUser=Čas strávený uživatelem
@@ -47,9 +52,9 @@ TaskTimeSpent=Čas strávený na úkolech
 TaskTimeUser=Uživatel
 TaskTimeNote=Poznámka
 TaskTimeDate=Datum
-TasksOnOpenedProject=Úkoly otevřených projektů
+TasksOnOpenedProject=Úkoly na otevřených projektech
 WorkloadNotDefined=Pracovní zátěž není definována
-NewTimeSpent=Nový strávený čas
+NewTimeSpent=Strávený čas
 MyTimeSpent=Můj strávený čas
 Tasks=Úkoly
 Task=Úkol
@@ -58,33 +63,35 @@ TaskDateEnd=Datum ukončení úkolu
 TaskDescription=Popis úkolu
 NewTask=Nový úkol
 AddTask=Vytvořit úkol
-AddTimeSpent=Create time spent
+AddTimeSpent=Vytvořit čas strávený
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Činnost
 Activities=Úkoly / činnosti
 MyActivities=Moje úkoly / činnosti
 MyProjects=Moje projekty
-MyProjectsArea=My projects Area
+MyProjectsArea=Moje projekty Oblast
 DurationEffective=Efektivní doba trvání
 ProgressDeclared=Hlášený progres
 ProgressCalculated=Vypočítaný progres
 Time=Čas
-ListOfTasks=List of tasks
-GoToListOfTimeConsumed=Go to list of time consumed
-GoToListOfTasks=Go to list of tasks
+ListOfTasks=Seznam úkolů
+GoToListOfTimeConsumed=Přejít na seznam času spotřebovaného
+GoToListOfTasks=Přejít na seznam úkolů
 ListProposalsAssociatedProject=Seznam obchodních návrhů spojených s projektem
-ListOrdersAssociatedProject=List of customer orders associated with the project
-ListInvoicesAssociatedProject=List of customer invoices associated with the project
-ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
-ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
-ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
+ListOrdersAssociatedProject=Seznam zákaznických objednávek související s projektem
+ListInvoicesAssociatedProject=Seznam zákaznických faktur souvisejících s projektem
+ListPredefinedInvoicesAssociatedProject=Seznam předpřipravených zákaznických faktur spojených s projektem
+ListSupplierOrdersAssociatedProject=Seznam dodavatelských objednávek souvisejících s projektem
+ListSupplierInvoicesAssociatedProject=Seznam dodavatelských faktur spojených s projektem
 ListContractAssociatedProject=Seznam zakázek souvisejících s projektem
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=Seznam zákroků spojených s projektem
 ListExpenseReportsAssociatedProject=Seznam vyúčtování výdajů souvisejících s projektem
 ListDonationsAssociatedProject=Seznam darů spojených s projektem
 ListActionsAssociatedProject=Seznam událostí spojených s projektem
-ListTaskTimeUserProject=List of time consumed on tasks of project
-ActivityOnProjectToday=Activity on project today
-ActivityOnProjectYesterday=Activity on project yesterday
+ListTaskTimeUserProject=Seznam času spotřebována na úkolech projektu
+ActivityOnProjectToday=Aktivita na projektu dnes
+ActivityOnProjectYesterday=Aktivita na projektu včera
 ActivityOnProjectThisWeek=Týdenní projektová aktivita
 ActivityOnProjectThisMonth=Měsíční projektová aktivita
 ActivityOnProjectThisYear=Roční projektová aktivita
@@ -93,24 +100,25 @@ NotOwnerOfProject=Není vlastníkem privátního projektu
 AffectedTo=Přiděleno
 CantRemoveProject=Tento projekt nelze odstranit, neboť se na něj odkazují některé jiné objekty (faktury, objednávky či jiné). Viz záložku "Připojené objekty"
 ValidateProject=Ověřit projekt
-ConfirmValidateProject=Are you sure you want to validate this project?
+ConfirmValidateProject=Opravdu chcete tento projekt ověřit?
 CloseAProject=Zavřít projekt
-ConfirmCloseAProject=Are you sure you want to close this project?
-AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
+ConfirmCloseAProject=Jste si jisti, že chcete ukončit tento projekt?
+AlsoCloseAProject=Také v blízkosti projektu (držet to otevřený, pokud ještě je třeba dodržovat výrobní úkoly na něj)
 ReOpenAProject=Otevřít projekt
-ConfirmReOpenAProject=Are you sure you want to re-open this project?
+ConfirmReOpenAProject=Jste si jisti, že chcete znovu otevřít tento projekt?
 ProjectContact=Kontakty projektu
 ActionsOnProject=Události na projektu
 YouAreNotContactOfProject=Nejste kontakt tohoto privátního projektu
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Odstranit strávený čas
-ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
+ConfirmDeleteATimeSpent=Jste si jisti, že chcete smazat tento strávený čas?
 DoNotShowMyTasksOnly=Viz také úkoly mě nepřidělené
 ShowMyTasksOnly=Zobrazit pouze úkoly mě přidělené
 TaskRessourceLinks=Zdroje
 ProjectsDedicatedToThisThirdParty=Projekty této třetí strany
 NoTasks=Žádné úkoly na tomto projektu
 LinkedToAnotherCompany=Připojené k jiné třetí straně
-TaskIsNotAffectedToYou=Úkol vám není přidělený
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=Čas strávený je prázdný
 ThisWillAlsoRemoveTasks=Tato akce rovněž odstraní všechny úkoly projektu (<b>%s</b> úkolů v tuto chvíli) a všechny strávené časy vstupující do projektu.
 IfNeedToUseOhterObjectKeepEmpty=Pokud je k projektu třeba připojit některé objekty jiných třetích stran (faktury, objednávky, ...), ponechte toto prázdné (projekt bude moci obsahovat více třetích stran)
@@ -120,25 +128,25 @@ CloneContacts=Duplikovat kontakty
 CloneNotes=Duplikovat poznámky
 CloneProjectFiles=Duplikovat připojené soubory projektu
 CloneTaskFiles=Duplikovat připojené soubory úkolu/ů (pokud úkol(y) klonován(y))
-CloneMoveDate=Update project/tasks dates from now?
-ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Change task dates according to new project start date
+CloneMoveDate=Aktualizace data projektu/úkolu od nyní?
+ConfirmCloneProject=Opravdu chcete naklonovat tento projekt?
+ProjectReportDate=Změnit datum úkolu dle data zahájení projektu
 ErrorShiftTaskDate=Nelze přesunout datum úkolu dle nového data zahájení projektu
 ProjectsAndTasksLines=Projekty a úkoly
 ProjectCreatedInDolibarr=Projekt %s vytvořen
-ProjectModifiedInDolibarr=Project %s modified
+ProjectModifiedInDolibarr=Projekt %s modifikované
 TaskCreatedInDolibarr=Úkol %s vytvořen
 TaskModifiedInDolibarr=Úkol %s upraven
 TaskDeletedInDolibarr=Úkol %s smazán
-OpportunityStatus=Opportunity status
-OpportunityStatusShort=Opp. status
-OpportunityProbability=Opportunity probability
+OpportunityStatus=stav příležitost
+OpportunityStatusShort=Opp. postavení
+OpportunityProbability=příležitost pravděpodobnost
 OpportunityProbabilityShort=Opp. probab.
-OpportunityAmount=Opportunity amount
-OpportunityAmountShort=Opp. amount
-OpportunityAmountAverageShort=Average Opp. amount
-OpportunityAmountWeigthedShort=Weighted Opp. amount
-WonLostExcluded=Won/Lost excluded
+OpportunityAmount=množství příležitostí
+OpportunityAmountShort=Opp. množství
+OpportunityAmountAverageShort=Průměrná Opp. množství
+OpportunityAmountWeigthedShort=Vážený Opp. množství
+WonLostExcluded=Won / Lost vyloučeny
 ##### Types de contacts #####
 TypeContact_project_internal_PROJECTLEADER=Vedoucí projektu
 TypeContact_project_external_PROJECTLEADER=Vedoucí projektu
@@ -151,46 +159,51 @@ TypeContact_project_task_external_TASKCONTRIBUTOR=Přispěvatel
 SelectElement=Vyberte prvek
 AddElement=Odkaz na prvek
 # Documents models
-DocumentModelBeluga=Project template for linked objects overview
-DocumentModelBaleine=Project report template for tasks
+DocumentModelBeluga=Šablona projektu pro přehled propojených objektů
+DocumentModelBaleine=Projekt zpráva šablony pro úkoly
 PlannedWorkload=Plánované vytížení
 PlannedWorkloadShort=Pracovní zátěž
-ProjectReferers=Related items
+ProjectReferers=Související zboží
 ProjectMustBeValidatedFirst=Projekt musí být nejdříve ověřen
-FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
+FirstAddRessourceToAllocateTime=Přiřadit zdroj k vyčlenění času
 InputPerDay=Vstup za den
 InputPerWeek=Vstup za týden
 InputPerAction=Vstup za akci
-TimeAlreadyRecorded=Strávený čas již zaznamenána pro tento úkol/den a uživatele %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projekty s tímto uživatelem jako kontakt
 TasksWithThisUserAsContact=Úkoly přidělené tomuto uživateli
-ResourceNotAssignedToProject=Not assigned to project
-ResourceNotAssignedToTheTask=Not assigned to the task
-AssignTaskToMe=Assign task to me
-AssignTask=Assign
-ProjectOverview=Overview
-ManageTasks=Use projects to follow tasks and time
-ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
-ProjectNbProjectByMonth=Nb of created projects by month
-ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
-ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
-ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
-ProjectsStatistics=Statistics on projects/leads
-TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
-IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
-OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
-NotAnOpportunityShort=Not an opportunity
-OpportunityTotalAmount=Opportunities total amount
-OpportunityPonderatedAmount=Opportunities weighted amount
-OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
-OppStatusPROSP=Prospection
-OppStatusQUAL=Qualification
+ResourceNotAssignedToProject=Není přiřazen k projektu
+ResourceNotAssignedToTheTask=Není přiřazen k úkolu
+TasksAssignedTo=Úkolům, které jsou
+AssignTaskToMe=Přiřadit úkol mně
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
+AssignTask=Přiřadit
+ProjectOverview=Přehled
+ManageTasks=Projektově řídit úkoly a čas
+ManageOpportunitiesStatus=Projektově řídit tuhy / opportinuties
+ProjectNbProjectByMonth=Nb vytvořených projektů měsíc
+ProjectNbTaskByMonth=Nb of created tasks by month
+ProjectOppAmountOfProjectsByMonth=Množství příležitostí podle měsíce
+ProjectWeightedOppAmountOfProjectsByMonth=Vážené příležitostí v jednotlivých měsících
+ProjectOpenedProjectByOppStatus=Otevřít projekt / vedení podle stavu příležitosti
+ProjectsStatistics=Statistiky týkající se projektů / vodičů
+TasksStatistics=Statistics on project/lead tasks
+TaskAssignedToEnterTime=Úkol přidělen. Zadání času na tomto úkolu by mělo být možné.
+IdTaskTime=Doba úkol Id
+YouCanCompleteRef=Chcete-li doplnit ref některé informace (použít jej jako vyhledávací filtry), doporučujeme přidat znak - aby se oddělil, takže automatické číslování bude fungovat správně pro další projekty. Například %s-ABC. Můžete také preferovat přidání vyhledávacích klíčů do štítku. Nejlepším postupem může být přidání specializovaného pole, nazývaného také doplňkové atributy.
+OpenedProjectsByThirdparties=Open projects by third parties
+OnlyOpportunitiesShort=pouze příležitosti
+OpenedOpportunitiesShort=otevřené příležitosti
+NotAnOpportunityShort=Není to příležitost
+OpportunityTotalAmount=Příležitosti celková částka
+OpportunityPonderatedAmount=Příležitosti vážené
+OpportunityPonderatedAmountDesc=Příležitosti vážené s pravděpodobností
+OppStatusPROSP=Prospektiva
+OppStatusQUAL=Kvalifikace
 OppStatusPROPO=Nabídka
-OppStatusNEGO=Negociation
+OppStatusNEGO=vyjednávání
 OppStatusPENDING=Čeká
-OppStatusWON=Won
-OppStatusLOST=Lost
-Budget=Budget
+OppStatusWON=Vyhrál
+OppStatusLOST=Ztracený
+Budget=Rozpočet
diff --git a/htdocs/langs/da_DK/accountancy.lang b/htdocs/langs/da_DK/accountancy.lang
index 7a216a76742..de519af0d19 100644
--- a/htdocs/langs/da_DK/accountancy.lang
+++ b/htdocs/langs/da_DK/accountancy.lang
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=Tilføj en regnskabsmæssig konto
 AccountAccounting=Regnskabsmæssig konto
 AccountAccountingShort=Konto
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=Kontoplan
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Salgskladde
@@ -132,19 +140,19 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Debet og kredit kan ikke have en værdi på samme tid
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=Liste over de regnskabsmæssige konti
 
 Pcgtype=Kontoens klasse
-Pcgsubtype=Kontoens underklasse
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Samlet salgsforskel
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Fejl, kan du ikke slette denne regnskabsmæssige konto, fordi den bruges
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Kode
+Nature=Natur
+AccountingJournalType1=Various operation
+AccountingJournalType2=Salg
+AccountingJournalType3=Køb
+AccountingJournalType4=Bank
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Eksporter
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index ccdc6487f08..b1d7bc816a3 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=Interne brugere
 ExternalUsers=Eksterne brugere
 GUISetup=Vise
 SetupArea=Setup område
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form til test-fil upload (ifølge setup)
 IfModuleEnabled=Note: ja er kun effektivt, hvis <b>modul %s</b> er aktiveret
 RemoveLock=Fjern <b>fil %s,</b> hvis det er oprettet for at tillade opdateringen værktøj.
@@ -85,7 +86,7 @@ Mask=Maske
 NextValue=Næste værdi
 NextValueForInvoices=Næste værdi (fakturaer)
 NextValueForCreditNotes=Næste værdi (kreditnotaer)
-NextValueForDeposit=Next value (deposit)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Next value (replacements)
 MustBeLowerThanPHPLimit=BEMÆRK: Din PHP grænser hver fil upload størrelse <b>til %s %s,</b> uanset denne parameter værdi er
 NoMaxSizeByPHPLimit=Bemærk: Ingen grænse er sat i din PHP-konfiguration
@@ -103,7 +104,7 @@ MenuIdParent=Moderselskab menuen ID
 DetailMenuIdParent=ID for moder menu (0 for en top-menuen)
 DetailPosition=Sorter antallet at definere menuen holdning
 AllMenus=Alle
-NotConfigured=Ikke konfigureret
+NotConfigured=Module/Application not configured
 Active=Aktiv
 SetupShort=Setup
 OtherOptions=Andre valgmuligheder
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Tusind separator
 Destination=Destination
 IdModule=Module ID
 IdPermissions=Permissions ID
-Modules=Moduler
 LanguageBrowserParameter=Parameter %s
 LocalisationDolibarrParameters=Lokalisering parametre
 ClientTZ=Client Time Zone (user)
@@ -123,7 +123,8 @@ PHPTZ=Tidszone Server PHP
 DaylingSavingTime=Sommertid (bruger)
 CurrentHour=Nuværende time
 CurrentSessionTimeOut=Aktuelle session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max number of lines for widgets
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Tilladelser
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Database adgangskode krypteres i conf.php
 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=Beskyttelse af genereret pdf-filer (ikke recommandd, pauser masse pdf generation)
-ProtectAndEncryptPdfFilesDesc=Beskyttelse af et PDF-dokument holder den til rådighed for at læse og udskrive med alle PDF browser. Men, redigering og kopiering er ikke muligt længere. Bemærk, at du bruger denne funktion gør opbygningen af et globalt kumulerede pdf virker ikke (som ubetalte fakturaer).
+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=Funktion
 DolibarrLicense=Licens
 Developpers=Udviklere / bidragydere
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr online demo
 OfficialMarketPlace=Officielle markedsplads for eksterne moduler / addons
 OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
 ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=For brugerens eller bygherren dokumentation (doc, FAQs ...), <br> tage et kig på Dolibarr Wiki: <br> <a href="%s" target="_blank"><b> %s</b></a>
 ForAnswersSeeForum=For alle andre spørgsmål / hjælpe, kan du bruge Dolibarr forum: <br> <a href="%s" target="_blank"><b> %s</b></a>
 HelpCenterDesc1=Dette område kan hjælpe dig med at få et Hjælp støtte tjeneste på Dolibarr.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=Funktionen ikke til rådighed på Unix-lignende syste
 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/
 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=Modul setup
-ModulesSetup=Moduler setup
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Kunden ressource Management (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=Dolibarr aktuelle version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Update server offline
+WithCounter=Manage a counter
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Alle andre tegn i maske vil forblive intakt. <br> Mellemrum er ikke tilladt. <br>
-GenericMaskCodes4a=<u>Eksempel på 99. %s af den tredje part TheCompany gøres 2007-01-31:</u> <br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Eksempel på tredjemand oprettet den 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>
+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=Retur en tilpasselig antal henhold til en bestemt maske.
 ServerAvailableOnIPOrPort=Server findes på <b>adressen %s port %s</b>
 ServerNotAvailableOnIPOrPort=Serveren er ikke tilgængelig på <b>adressen %s port %s</b>
@@ -369,19 +375,21 @@ Int=Integer
 Float=Float
 DateAndTime=Dato og tid
 Unique=Unik
-Boolean=Boolean (Checkbox)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Telefon
 ExtrafieldPrice = Pris
 ExtrafieldMail = EMail
 ExtrafieldUrl = Url
 ExtrafieldSelect = Vælg liste
 ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Password
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldRadio=Radio buttons (on 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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Field
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Brugere og grupper
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=Fakturaer og kreditnotaer 'forvaltning for kunderne. Faktura 'forva
 Module40Name=Leverandører
 Module40Desc=Suppliers' ledelse og opkøb (ordrer og fakturaer)
 Module42Name=Syslog
-Module42Desc=Logføring faciliteter (syslog)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Redaktion
 Module49Desc=Editors' ledelse
 Module50Name=Produkter
@@ -499,8 +521,8 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Adviséringer
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind konverteringer kapaciteter
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
-Module4000Desc=Human resources management
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi-selskab
 Module5000Desc=Giver dig mulighed for at administrere flere selskaber
 Module6000Name=Workflow
@@ -591,7 +615,7 @@ Permission32=Opret / ændre produkter / ydelser
 Permission34=Slet produkter / ydelser
 Permission36=Eksportere produkter / ydelser
 Permission38=Eksportere produkter
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Slet projekter
 Permission45=Export projects
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Bestilling af metoder
 DictionarySource=Oprindelse af forslag / ordrer
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=E-mail skabeloner
 DictionaryUnits=Enheder
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Setup gemt
+SetupNotSaved=Setup not saved
 BackToModuleList=Tilbage til moduler liste
 BackToDictionaryList=Tilbage til ordbøger liste
 VATManagement=Moms Management
@@ -921,7 +947,7 @@ Host=Server
 DriverType=Driver type
 SummarySystem=System oplysninger resumé
 SummaryConst=Liste over alle Dolibarr setup parametre
-MenuCompanySetup=Company / Fundation
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= Standard menu manager
 DefaultMenuSmartphoneManager=Smartphone menu manager
 Skin=Hud tema
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Default max length for lists
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=Budskab om dagen
 MessageLogin=Loginsiden besked
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Faste search form på venstre menu
 DefaultLanguage=Standard sprog til brug (sprog code)
 EnableMultilangInterface=Aktiver flersproget grænseflade
 EnableShowLogo=Vis logo på venstre menu
-CompanyInfo=Company / fundament oplysninger
-CompanyIds=Company / fundament identiteter
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=Navn
 CompanyAddress=Adresse
 CompanyZip=Zip
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance forsinkelse (i dag), inden indberetning om f
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance forsinkelse (i dage) før alarm for checks depositum til at gøre
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Andre menupunkter forvalte valgfri parametre.
 LogEvents=Sikkerhed revision arrangementer
 Audit=Audit
@@ -987,7 +1015,7 @@ BrowserOS=Browser OS
 ListOfSecurityEvents=Liste over Dolibarr sikkerhed begivenheder
 SecurityEventsPurged=Sikkerhed begivenheder renset
 LogEventDesc=Du kan gøre det muligt at logge for Dolibarr sikkerhed begivenheder her. Administratorer kan derefter se dens indhold via menuen <b>Systemværktøjer - Revision.</b> Advarsel, denne funktion kan forbruge en stor mængde data i databasen.
-AreaForAdminOnly=Disse funktioner kan anvendes af <b>administrator brugere.</b> Administrator funktioner og hjælpe er identificeret i Dolibarr af følgende picto:
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System oplysninger er diverse tekniske oplysninger du får i read only mode og synlig kun for administratorer.
 SystemAreaForAdminOnly=Dette område er til rådighed for administratoren brugere. Ingen af de Dolibarr permissions kan reducere denne grænse.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists 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
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Professionel Id unikke
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=En eksportgaranti link <b>til %s</b> format er tilgængelig på følgende link: %s
 ##### Invoices #####
 BillsSetup=Fakturaer modul opsætning
 BillsNumberingModule=Fakturaer og kreditnotaer nummerressourcer modul
 BillsPDFModules=Faktura dokumenter modeller
+PaymentsPDFModules=Payment documents models
 CreditNote=Credit note
 CreditNotes=Credit noter
 ForceInvoiceDate=Force fakturadatoen til validering dato
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
 FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
 FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
 CacheByServer=Cache by server
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
+CompressionOfResourcesDesc=For exemple 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 your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Produkter modul opsætning
 ServiceSetup=Services modul opsætning
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Faktura, som anvendes dato
 Buy=Købe
 Sell=Sælge
 InvoiceDateUsed=Faktura, som anvendes dato
-YourCompanyDoesNotUseVAT=Din virksomhed er blevet defineret til ikke at bruge moms (Home - Setup - Company / Foundation), så der er ingen moms optioner til opsætningen.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=Regnskab Kode
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Klik for at ringe modul opsætning
-ClickToDialUrlDesc=Url called when a click on phone picto is done. Dans l'url, vous pouvez utiliser les balises<br><b>__PHONETO__</b> qui sera remplacé par le téléphone de l'appelé<br><b>__PHONEFROM__</b> qui sera remplacé par le téléphone de l'appelant (le votre)<br><b>__LOGIN__</b> qui sera remplacé par votre login clicktodial (défini sur votre fiche utilisateur)<br><b>__PASS__</b> qui sera remplacé par votre mot de passe clicktodial (défini sur votre fiche utilisateur).
+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.
 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 same computer than 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.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+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.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=General display for
 BankOrderES=Spansk
 BankOrderESDesc=Spansk display for
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=Multi-selskab modul opsætning
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ 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.
 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.
-ConfFileMuseContainCustom=Installing 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)
 TextTitleColor=Color of page title
 LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/da_DK/compta.lang b/htdocs/langs/da_DK/compta.lang
index bd999586e7a..821d6408f2b 100644
--- a/htdocs/langs/da_DK/compta.lang
+++ b/htdocs/langs/da_DK/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using r
 Param=Setup
 RemainingAmountPayment=Beløb resterende indbetaling:
 Account=Konto
-Accountparent=Konto forældre
-Accountsparent=Konti forældre
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=Indkomst
 Outcome=Udgift
 ReportInOut=Indkomst / Udgift
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Skatter og udbytter
 MenuSocialContributions=Social/fiscal taxes
 MenuNewSocialContribution=New social/fiscal tax
 NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Regnskabsmæssig / Treasury område
 NewPayment=Ny betaling
@@ -134,8 +135,8 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- Den omfatter alle de faktiske betalinger af fakturaer modtaget fra kunder. <br> - Det er baseret på betaling dato med disse fakturaer <br>
-DepositsAreNotIncluded=- Depositum fakturaer eller inkluderet
-DepositsAreIncluded=- Depositum fakturaer er inkluderet
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Rapport fra tredjepart IRPF
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
 VATReport=VAT report
@@ -169,7 +170,7 @@ DescSellsJournal=Salg Journal
 DescPurchasesJournal=Køb Journal
 InvoiceRef=Faktura ref.
 CodeNotDef=Ikke defineret
-WarningDepositsNotIncluded=Indskud fakturaer er ikke inkluderet i denne version med denne bogføring modul.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
 Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
@@ -189,8 +190,10 @@ AccountancyJournal=Accountancy code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/da_DK/cron.lang b/htdocs/langs/da_DK/cron.lang
index e45ee62e37d..56ca14c084e 100644
--- a/htdocs/langs/da_DK/cron.lang
+++ b/htdocs/langs/da_DK/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allow to execute job that have been planned
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Job
 CronNone=Ingen
 CronDtStart=Not before
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Deaktivere
 CronTaskInactive=This job is disabled
 CronId=Id
-CronClassFile=Classes (filename.class.php)
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=Fra
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/da_DK/errors.lang b/htdocs/langs/da_DK/errors.lang
index d796b06c300..39f7c9b2fd4 100644
--- a/htdocs/langs/da_DK/errors.lang
+++ b/htdocs/langs/da_DK/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Kunne ikke oprette filen <b>' %s'.</b>
 ErrorFailToRenameDir=Kunne ikke omdøbe mappe <b>' %s' i' %s'.</b>
 ErrorFailToCreateDir=Kunne ikke oprette mappen <b>' %s'.</b>
 ErrorFailToDeleteDir=Det lykkedes ikke at slette mappen <b>' %s'.</b>
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=Denne kontaktperson er allerede defineret som kontaktperson for denne type.
 ErrorCashAccountAcceptsOnlyCashMoney=Denne bankkonto er et kontant-konto, så det accepterer betaling af type cash only.
 ErrorFromToAccountsMustDiffers=Kilde og mål bankkonti skal være anderledes.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Det lykkedes ikke at skrive i mappen %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=Fundet forkerte e-mail-syntaks for %s linjer i filen (f.eks line %s med email= %s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Nogle krævede felter ikke var fyldt.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Det lykkedes ikke at oprette en mappe. Kontroller, at web-serveren bruger har tilladelse til at skrive i Dolibarr dokumenter bibliotek. Hvis parameter <b>safe_mode</b> er aktiveret på dette PHP, kontrollere, at Dolibarr php filer ejer til web-serveren bruger (eller gruppe).
 ErrorNoMailDefinedForThisUser=Nr. mail defineret for denne bruger
 ErrorFeatureNeedJavascript=Denne funktion skal have Javascript skal aktiveres for at arbejde. Ændre dette i opsætningen - displayet.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoice
 ErrorWebServerUserHasNotPermission=Brugerkonto <b>%s</b> anvendes til at udføre web-server har ikke tilladelse til at
 ErrorNoActivatedBarcode=Ingen stregkode aktiveret typen
 ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # 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.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice
 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/da_DK/main.lang b/htdocs/langs/da_DK/main.lang
index 5af931595eb..aa4c661f05d 100644
--- a/htdocs/langs/da_DK/main.lang
+++ b/htdocs/langs/da_DK/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=Parameter %s ikke defineret
 ErrorUnknown=Ukendt fejl
 ErrorSQL=SQL Fejl
 ErrorLogoFileNotFound=Logo fil ' %s' blev ikke fundet
-ErrorGoToGlobalSetup=Gå til 'Company / Foundation "-opsætningen til at løse dette
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=Gå til Modul setup at rette dette
 ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=Det lykkedes ikke at sende e-mails (afsender= %s, receiver= %s)
 ErrorFileNotUploaded=Filen blev ikke uploadet. Kontroller, at størrelse ikke overstiger den maksimalt tilladte, at den frie plads der er til rådighed på disken, og at der ikke allerede en fil med samme navn i denne mappe.
@@ -153,6 +153,7 @@ Edit=Redigér
 Validate=Validate
 ValidateAndApprove=Validate and Approve
 ToValidate=At validere
+NotValidated=Not validated
 Save=Gemme
 SaveAs=Gem som
 TestConnection=Test forbindelse
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=No applicative disconnect feature with authenticatio
 Connection=Forbindelsesstyring
 Setup=Setup
 Alert=Alarm
+MenuWarnings=Indberetninger
 Previous=Forrige
 Next=Næste
 Cards=Postkort
@@ -308,6 +310,7 @@ Copy=Kopier
 Paste=Paste
 Default=Standard
 DefaultValue=Standardværdi
+DefaultValues=Default values
 Price=Pris
 UnitPrice=Enhedspris
 UnitPriceHT=Enhedspris (netto)
@@ -363,7 +366,8 @@ VATRate=Momssats
 Average=Gennemsnit
 Sum=Sum
 Delta=Delta
-Module=Modul
+Module=Module/Application
+Modules=Modules/Applications
 Option=Option
 List=Liste
 FullList=Fuldstændig liste
@@ -387,7 +391,7 @@ ActionRunningNotStarted=Ikke startet
 ActionRunningShort=In progress
 ActionDoneShort=Finished
 ActionUncomplete=Uncomplete
-CompanyFoundation=Company / Foundation
+CompanyFoundation=Company/Organisation
 ContactsForCompany=Kontakter til denne tredjepart
 ContactsAddressesForCompany=Kontakter/adresser for denne trediepart
 AddressesForCompany=Adresse for denne trediepart
@@ -405,8 +409,9 @@ Generate=Generer
 Duration=Varighed
 TotalDuration=Samlet varighed
 Summary=Resumé
-DolibarrStateBoard=Statistik
-DolibarrWorkBoard=Arbejdsopgaver bord
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=Tilgængelig
 NotYetAvailable=Endnu ikke tilgængelig
 NotAvailable=Ikke til rådighed
@@ -434,7 +439,7 @@ Reportings=Rapportering
 Draft=Udkast
 Drafts=Drafts
 Validated=Valideret
-Opened=Åbnet
+Opened=Åbent
 New=Ny
 Discount=Discount
 Unknown=Ukendt
@@ -453,6 +458,7 @@ NextStep=Næste skridt
 Datas=Oplysningerne
 None=Ingen
 NoneF=Ingen
+NoneOrSeveral=None or several
 Late=Sen
 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.
 Photo=Billede
@@ -606,7 +612,8 @@ PartialWoman=Delvis
 TotalWoman=Total
 NeverReceived=Aldrig modtaget
 Canceled=Annulleret
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
+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
 Color=Color
 Documents=Forbundet filer
@@ -642,6 +649,7 @@ FreeLineOfType=Free entry of type
 CloneMainAttributes=Klon formål med sine vigtigste attributter
 PDFMerge=PDF Sammenflet
 Merge=Merge
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Vis side for at udskrive hovedindhold område
 MenuManager=Menu manager
 WarningYouAreInMaintenanceMode=Advarsel, du er i en vedligeholdelses mode, så kun login <b>%s</b> er tilladt at bruge ansøgningen på i øjeblikket.
@@ -708,6 +716,7 @@ from=from
 toward=toward
 Access=Access
 SelectAction=Select action
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
 SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
 OriginFileName=Original filename
@@ -718,7 +727,7 @@ ViewPrivateNote=View notes
 XMoreLines=%s line(s) hidden
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
+SelectElementAndClick=Select an element and click %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
@@ -734,8 +743,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Slet linie
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
@@ -755,11 +764,20 @@ Calendar=Kalender
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Mandag
 Tuesday=Tirsdag
@@ -817,5 +835,3 @@ SearchIntoContracts=Kontrakter
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/da_DK/other.lang b/htdocs/langs/da_DK/other.lang
index 3907188fdec..a39ee5c599a 100644
--- a/htdocs/langs/da_DK/other.lang
+++ b/htdocs/langs/da_DK/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=Dato for fødsel
 BirthdayAlertOn=fødselsdag alarm aktive
 BirthdayAlertOff=fødselsdag alarm inaktive
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=Valider intervention
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=Dette er en <b>test</b> mail (ordet test skal være i fed
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Prof Id %s</b> er en information afhængigt tredjepart land. <br> For eksempel, for <b>land %s,</b> er det <b>kode %s.</b>
 DolibarrDemo=Dolibarr ERP / CRM demo
-StatsByNumberOfUnits=Statistik i antallet af enheder
-StatsByNumberOfEntities=Statistik i antallet af enheder
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=Intervention %s valideret
 EMailTextInvoiceValidated=Faktura %s valideret
diff --git a/htdocs/langs/da_DK/projects.lang b/htdocs/langs/da_DK/projects.lang
index 02171a27ddd..c342201d9b0 100644
--- a/htdocs/langs/da_DK/projects.lang
+++ b/htdocs/langs/da_DK/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Fælles projekt
 PrivateProject=Projekt kontakter
+ProjectsImContactFor=Projects I'm explicitely a contact of
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=Alle projekter
 MyProjectsDesc=Dette synspunkt er begrænset til projekter, du er en kontaktperson for (hvad der er den type).
 ProjectsPublicDesc=Dette synspunkt præsenterer alle projekter du får lov til at læse.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=Dette synspunkt præsenterer alle projekter og opgaver (din brugertill
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=Nyt projekt
 AddProject=Create project
 DeleteAProject=Slet et projekt
 DeleteATask=Slet en opgave
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Opened projects
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Vis projekt
 SetProject=Indstil projekt
 NoProject=Nr. projektet defineret
 NbOfProjects=Nb af projekter
+NbOfTasks=Nb of tasks
 TimeSpent=Tid brugt
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
@@ -47,9 +52,9 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=Bruger
 TaskTimeNote=Note
 TaskTimeDate=Dato
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
-NewTimeSpent=Ny tid
+NewTimeSpent=Tid brugt
 MyTimeSpent=Min tid
 Tasks=Opgaver
 Task=Opgave
@@ -59,6 +64,7 @@ TaskDescription=Task description
 NewTask=Ny opgave
 AddTask=Create task
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Aktivitet
 Activities=Opgaver / aktiviteter
 MyActivities=Mine opgaver / aktiviteter
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Liste over kontrakter i forbindelse med projektet
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=Liste over interventioner i forbindelse med projektet
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Projekt kontakter
 ActionsOnProject=Initiativer på projektet
 YouAreNotContactOfProject=Du er ikke en kontakt af denne private projekt
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Slet tid
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
@@ -110,7 +118,7 @@ TaskRessourceLinks=Ressourcer
 ProjectsDedicatedToThisThirdParty=Projekter dedikeret til denne tredjepart
 NoTasks=Ingen opgaver for dette projekt
 LinkedToAnotherCompany=Knyttet til tredjemand
-TaskIsNotAffectedToYou=Task not assigned to you
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=Tilbragte Tiden er tom
 ThisWillAlsoRemoveTasks=Denne handling vil også slette alle opgaver i projektet <b>(%s</b> opgaver i øjeblikket), og alle indgange af tid.
 IfNeedToUseOhterObjectKeepEmpty=Hvis nogle objekter (faktura, ordre, ...), der tilhører en anden tredjepart, skal knyttet til projektet for at skabe, holde denne tomme for at få projektet er flere tredjeparter.
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
 ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/de_AT/accountancy.lang b/htdocs/langs/de_AT/accountancy.lang
deleted file mode 100644
index 473582c566a..00000000000
--- a/htdocs/langs/de_AT/accountancy.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-AccountingCategory=Accounting category
diff --git a/htdocs/langs/de_AT/admin.lang b/htdocs/langs/de_AT/admin.lang
index cef52b33fe9..bdccd4e6180 100644
--- a/htdocs/langs/de_AT/admin.lang
+++ b/htdocs/langs/de_AT/admin.lang
@@ -1,668 +1,41 @@
 # Dolibarr language file - Source file is en_US - admin
-Foundation=Foundation
-Version=Version
 VersionProgram=Versionsnummer
-VersionLastInstall=Initial install version
-VersionLastUpgrade=Latest version upgrade
-VersionExperimental=Experimental
 VersionDevelopment=Entwickler
-VersionUnknown=Unbekannt
-VersionRecommanded=Empfohlen
-FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. Value of some setup constants may also be checked. You can use this tool to detect if some files were modified by a hacker for example.
-FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
-GlobalChecksum=Global checksum
-MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
-LocalSignature=Embedded local signature (less reliable)
-RemoteSignature=Remote distant signature (more reliable)
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FilesModified=Modified Files
-FilesAdded=Added Files
-FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
-XmlNotFound=Xml Integrity File of application not found
 SessionId=Sitzungsnummer
 SessionSaveHandler=Sessionmanager
-SessionSavePath=Storage session localization
-PurgeSessions=Purge of sessions
-ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
-NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow to list all running sessions.
-LockNewSessions=Lock new connections
-ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself. Only user <b>%s</b> will be able to connect after that.
-UnlockNewSessions=Remove connection lock
 YourSession=Ihre Anmeldung
 Sessions=Benutzeranmeldung
-WebUserGroup=Web server user/group
-NoSessionFound=Your PHP seems to not allow to list active sessions. Directory used to save sessions (<b>%s</b>) might be protected (For example, by OS permissions or by PHP directive open_basedir).
-DBStoringCharset=Database charset to store data
-DBSortingCharset=Database charset to sort data
-WarningModuleNotActive=Module <b>%s</b> must be enabled
-WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page.
-DolibarrSetup=Dolibarr install or upgrade
 InternalUser=interner Nutzer
 ExternalUser=externer Nutzer
 InternalUsers=interne Nutzer
 ExternalUsers=externe Nutzer
 GUISetup=Anischt
 SetupArea=Einstellungen
-FormToTestFileUploadForm=Form to test file upload (according to setup)
-IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
-RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
-RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any usage of update tool.
-SecuritySetup=Sicherheitseinstellungen
-SecurityFilesDesc=Define here options related to security about uploading files.
-ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
-ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
-ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is not supported.
-DictionarySetup=Dictionary setup
-Dictionary=Dictionaries
-ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
-ErrorCodeCantContainZero=Code can't contain value 0
-DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
-UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties, but it is less convenient)
-DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact, but it is less convenient)
-NumberOfKeyToSearch=Nbr of characters to trigger search: %s
-NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
-AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
-JavascriptDisabled=JavaScript disabled
-UsePreviewTabs=Use preview tabs
-ShowPreview=Show preview
-PreviewNotAvailable=Preview not available
-ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
-MySQLTimeZone=TimeZone MySql (database)
-TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
-Space=Space
-Table=Table
-Fields=Fields
-Index=Index
-Mask=Mask
 NextValue=Nächste Wert
-NextValueForInvoices=Next value (invoices)
-NextValueForCreditNotes=Next value (credit notes)
-NextValueForDeposit=Next value (deposit)
-NextValueForReplacements=Next value (replacements)
-MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to <b>%s</b> %s, whatever this parameter's value is
-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= Beispiel für ClamWin: c:\\Program Files (x86)\\ClamWin\\bin\\clamscan.exe <br>Beispiel für ClamAV: /usr/bin/clamscan
-AntiVirusParam= More parameters on command line
-AntiVirusParamExample= Beispiel für ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
-ComptaSetup=Accounting module setup
-UserSetup=User management setup
-MultiCurrencySetup=Multi-currency setup
-MenuLimits=Limits and accuracy
-MenuIdParent=Parent menu ID
-DetailMenuIdParent=ID of parent menu (empty for a top menu)
-DetailPosition=Sort number to define menu position
-AllMenus=All
-NotConfigured=Module not configured
-Active=Active
-SetupShort=Setup
-OtherOptions=Other options
-OtherSetup=Other setup
-CurrentValueSeparatorDecimal=Decimal separator
-CurrentValueSeparatorThousand=Thousand separator
-Destination=Destination
-IdModule=Module ID
-IdPermissions=Permissions ID
-Modules=Modules
-LanguageBrowserParameter=Parameter %s
-LocalisationDolibarrParameters=Localisation parameters
-ClientTZ=Client Time Zone (user)
-ClientHour=Client time (user)
-OSTZ=Server OS Time Zone
-PHPTZ=PHP server Time Zone
-DaylingSavingTime=Daylight saving time
-CurrentHour=PHP Time (server)
-CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
-Box=Widget
-Boxes=Widgets
-MaxNbOfLinesForBoxes=Max number of lines for widgets
-PositionByDefault=Default order
-Position=Position
-MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
-MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br />Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
-MenuForUsers=Menu for users
-LangFile=.lang file
-System=System
-SystemInfo=System information
-SystemToolsArea=System tools area
-SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for.
-Purge=Purge
-PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
-PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
-PurgeDeleteTemporaryFilesShort=Delete temporary files
-PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory <b>%s</b>. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted.
-PurgeRunNow=Purge now
-PurgeNothingToDelete=No directory or files to delete.
-PurgeNDirectoriesDeleted=<b>%s</b> files or directories deleted.
-PurgeAuditEvents=Purge all security events
-ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
-GenerateBackup=Generate backup
-Backup=Backup
-Restore=Restore
-RunCommandSummary=Backup has been launched with the following command
-BackupResult=Backup result
-BackupFileSuccessfullyCreated=Backup file successfully generated
-YouCanDownloadBackupFile=Generated files can now be downloaded
-NoBackupFileAvailable=No backup files available.
-ExportMethod=Export method
-ImportMethod=Import method
-ToBuildBackupFileClickHere=To build a backup file, click <a href="%s">here</a>.
+AntiVirusCommandExample=Beispiel für ClamWin: c:\\Program Files (x86)\\ClamWin\\bin\\clamscan.exe <br>Beispiel für ClamAV: /usr/bin/clamscan
+AntiVirusParamExample=Beispiel für ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ImportMySqlDesc=Zum Wiederherstellen einer Sicherungsdatei müssen Sie folgenden Befehl über die Kommandozeile ausführen:
-ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line:
-ImportMySqlCommand=%s %s < mybackupfile.sql
-ImportPostgreSqlCommand=%s %s mybackupfile.sql
-FileNameToGenerate=File name to generate
-Compression=Compression
-CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
-CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
-ExportCompatibility=Compatibility of generated export file
-MySqlExportParameters=MySQL export parameters
-PostgreSqlExportParameters= PostgreSQL export parameters
-UseTransactionnalMode=Use transactional mode
-FullPathToMysqldumpCommand=Full path to mysqldump command
-FullPathToPostgreSQLdumpCommand=Full path to pg_dump command
-ExportOptions=Export Options
-AddDropDatabase=Add DROP DATABASE command
-AddDropTable=Add DROP TABLE command
-ExportStructure=Structure
-NameColumn=Name columns
-ExtendedInsert=Extended INSERT
-NoLockBeforeInsert=No lock commands around INSERT
-DelayedInsert=Delayed insert
-EncodeBinariesInHexa=Encode binary data in hexadecimal
-IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
-AutoDetectLang=Autodetect (browser language)
-FeatureDisabledInDemo=Feature disabled in demo
-FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Permissions
-BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
-OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
-ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external modules...
-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 (Note: anyone experienced in PHP programming can provide custom development for an open source project)
-WebSiteDesc=Reference websites to find more modules...
-URL=Link
-BoxesAvailable=Widgets available
-BoxesActivated=Widgets activated
-ActivateOn=Activate on
-ActiveOn=Activated on
-SourceFile=Source file
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
-Required=Required
-UsedOnlyWithTypeOption=Used by some agenda option only
-Security=Security
-Passwords=Passwords
-DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
-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 (Activated 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 make building of a global cumulated pdf not working (like unpaid invoices).
-Feature=Feature
-DolibarrLicense=License
-Developpers=Developers/contributors
-OfficialWebSite=Dolibarr international official web site
-OfficialWebSiteLocal=Local web site (%s)
-OfficialWiki=Dolibarr documentation on Wiki
-OfficialDemo=Dolibarr online demo
-OfficialMarketPlace=Official market place for external modules/addons
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
-ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
-HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
-HelpCenterDesc2=Some part of this service are available in <b>english only</b>.
-CurrentMenuHandler=Current menu handler
-MeasuringUnit=Measuring unit
-LeftMargin=Left margin
-TopMargin=Top margin
-PaperSize=Paper type
-Orientation=Orientation
-SpaceX=Space X
-SpaceY=Space Y
-FontSize=Font size
-Content=Content
-NoticePeriod=Notice period
-NewByMonth=New by month
-Emails=E-mails
-EMailsSetup=E-mails setup
-EMailsDesc=This page allows you to overwrite your PHP parameters for e-mails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless.
-MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
-MAIN_MAIL_EMAIL_FROM=Sender e-mail for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Sender e-mail used for error returns emails sent
-MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
-MAIN_DISABLE_ALL_MAILS=Disable all e-mails sendings (for test purposes or demos)
-MAIN_MAIL_SENDMODE=Method to use to send EMails
-MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
-MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
-MAIN_MAIL_EMAIL_TLS= Use TLS (SSL) encrypt
-MAIN_MAIL_EMAIL_STARTTLS= Use TLS (STARTTLS) encrypt
-MAIN_DISABLE_ALL_SMS=Disable all SMS sendings (for test purposes or demos)
-MAIN_SMS_SENDMODE=Method to use to send SMS
-MAIN_MAIL_SMS_FROM=Default sender phone number for Sms sending
-MAIN_MAIL_DEFAULT_FROMTYPE=Sender e-mail by default for manual sendings (User email or Company email)
-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/
-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 setup
-ModuleFamilyBase=System
-ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
-ModuleFamilyProducts=Products Management (PM)
-ModuleFamilyHr=Human Resource Management (HR)
-ModuleFamilyProjects=Projects/Collaborative work
-ModuleFamilyOther=Other
-ModuleFamilyTechnic=Multi-modules tools
-ModuleFamilyExperimental=Experimental modules
-ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
-ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
-ModuleFamilyInterface=Interfaces with external systems
-MenuHandlers=Menu handlers
-MenuAdmin=Menu editor
-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).
-DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <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>.
-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='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
-YouCanSubmitFile=For this step, you can send package using this tool: Select module file
-CurrentVersion=Dolibarr current version
-CallUpdatePage=Go to the page that updates the database structure and data: %s.
-LastStableVersion=Latest stable version
-LastActivationDate=Latest activation date
-UpdateServerOffline=Update server offline
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
-GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC (yy) (mm) - (000000)</b> wird <b>ABC0701-000099</b> <br> <b>(0000 +100)-ZZZ / tt () / XXX</b> wird <b>0199-ZZZ/31/XXX</b>
-GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
-ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
-ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
-DoTestServerAvailability=Test server connectivity
-DoTestSend=Test sending
-DoTestSendHTML=Test sending HTML
-ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
-ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
-UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
-UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
-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...).
-MinLength=Minimum length
-LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
-ExamplesWithCurrentSetup=Examples with current running setup
-ListOfDirectories=List of OpenDocument templates directories
-ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Anzahl der in diesen Verzeichnissen gefundenen .odt-Dokumentvorlagen
-ExampleOfDirectoriesForModelGen=Beispiele für 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.
-ThemeDir=Skins directory
-ConnectionTimeout=Connexion timeout
-ResponseTimeout=Response timeout
-SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__
-ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
-SecurityToken=Key to secure URLs
-NoSmsEngine=No SMS sender manager available. SMS sender manager are not installed with default distribution (because they depends on an external supplier) but you can find some on %s
-PDF=PDF
-PDFDesc=You can set each global options related to the PDF generation
-PDFAddressForging=Rules to forge address boxes
-HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF
-HideDescOnPDF=Hide products description on generated PDF
-HideRefOnPDF=Hide products ref. on generated PDF
-HideDetailsOnPDF=Hide product lines details on generated PDF
-PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
-Library=Library
-UrlGenerationParameters=Parameters to secure URLs
-SecurityTokenIsUnique=Use a unique securekey parameter for each URL
-EnterRefToBuildUrl=Enter reference for object %s
-GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons to 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
-MassConvert=Launch mass convert
-String=String
-TextLong=Long text
-Int=Integer
-Float=Float
-DateAndTime=Date and hour
-Unique=Unique
-Boolean=Boolean (Checkbox)
-ExtrafieldPhone = Phone
-ExtrafieldPrice = Price
-ExtrafieldMail = Email
-ExtrafieldUrl = Url
-ExtrafieldSelect = Select list
-ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
-ExtrafieldPassword=Password
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
-ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
-LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
-SMS=SMS
-LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
-RefreshPhoneLink=Refresh link
-LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
-KeepEmptyToUseDefault=Keep empty to use default value
-DefaultLink=Default link
-SetAsDefault=Set as default
-ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
-BarcodeInitForThirdparties=Mass barcode init for thirdparties
-BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Init value for next %s empty records
-EraseAllCurrentBarCode=Erase all current barcode values
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
-AllBarcodeReset=All barcode values have been removed
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into 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
-DisplayCompanyInfo=Display company address
-DisplayCompanyManagers=Display manager names
-DisplayCompanyInfoAndManagers=Display company address and manager names
-EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
-ModuleCompanyCodePanicum=Return an empty accountancy code.
-ModuleCompanyCodeDigitaria=Accountancy 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: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-ClickToShowDescription=Click to show description
-# Modules
-Module0Name=Users & groups
-Module0Desc=Users / Employees and Groups management
-Module1Name=Third parties
-Module1Desc=Companies and contact management (customers, prospects...)
-Module2Name=Commercial
-Module2Desc=Commercial management
-Module10Name=Accounting
-Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
-Module20Name=Proposals
-Module20Desc=Commercial proposal management
-Module22Name=Mass E-mailings
-Module22Desc=Mass E-mailing management
-Module23Name=Energy
-Module23Desc=Monitoring the consumption of energies
-Module25Name=Customer Orders
-Module25Desc=Customer order management
-Module30Name=Rechnungen
-Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
-Module40Name=Suppliers
-Module40Desc=Supplier management and buying (orders and invoices)
-Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
-Module49Name=Editors
-Module49Desc=Editor management
 Module50Name=Produkte und Services
-Module50Desc=Product management
-Module51Name=Mass mailings
-Module51Desc=Mass paper mailing management
-Module52Name=Stocks
-Module52Desc=Stock management (products)
-Module53Name=Services
+Module53Name=Dienstleistung
 Module53Desc=Services-Verwaltung
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
-Module55Name=Barcodes
-Module55Desc=Barcode management
-Module56Name=Telephony
-Module56Desc=Telephony integration
-Module57Name=Direct bank payment orders
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
-Module58Name=ClickToDial
-Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
 Module70Name=Eingriffe
 Module70Desc=Eingriffsverwaltung
-Module75Name=Expense and trip notes
-Module75Desc=Expense and trip notes management
 Module80Name=Sendungen
-Module80Desc=Shipments and delivery order management
-Module85Name=Banks and cash
-Module85Desc=Management of bank or cash accounts
-Module100Name=External site
-Module100Desc=This module include an external web site or page into Dolibarr menus and view it into a Dolibarr frame
-Module105Name=Mailman and SPIP
-Module105Desc=Mailman or SPIP interface for member module
-Module200Name=LDAP
-Module200Desc=LDAP directory synchronisation
-Module210Name=PostNuke
-Module210Desc=PostNuke integration
-Module240Name=Data exports
-Module240Desc=Tool to export Dolibarr data (with assistants)
-Module250Name=Data imports
-Module250Desc=Tool to import data in Dolibarr  (with assistants)
-Module310Name=Members
 Module310Desc=Mitgliederverwaltun
-Module320Name=RSS Feed
-Module320Desc=Add RSS feed inside Dolibarr screen pages
-Module330Name=Lesezeichen
 Module330Desc=Bookmarks-Verwaltung
-Module400Name=Projects/Opportunities/Leads
-Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
-Module410Name=Webcalendar
-Module410Desc=Webcalendar integration
 Module500Name=Steuern, Sozialbeiträge und Dividenden
 Module500Desc=Steuer-, Sozialbeitrags- und Dividendenverwaltung
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
-Module520Name=Loan
-Module520Desc=Management of loans
-Module600Name=Notifications
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
-Module700Name=Donations
-Module700Desc=Donation management
-Module770Name=Expense reports
-Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
-Module1200Name=Mantis
-Module1200Desc=Mantis integration
-Module1400Name=Accounting
-Module1400Desc=Accounting management (double parties)
-Module1520Name=Document Generation
-Module1520Desc=Mass mail document generation
-Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
-Module2000Name=WYSIWYG editor
-Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
-Module2200Name=Dynamic Prices
-Module2200Desc=Enable the usage of math expressions for prices
-Module2300Name=Cron
-Module2300Desc=Scheduled job management
-Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
-Module2500Name=Electronic Content Management
-Module2500Desc=Save and share documents
-Module2600Name=API/Web services (SOAP server)
-Module2600Desc=Enable the Dolibarr SOAP server providing API services
-Module2610Name=API/Web services (REST server)
-Module2610Desc=Enable the Dolibarr REST server providing API services
-Module2660Name=Call WebServices (SOAP client)
-Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
-Module2700Name=Gravatar
-Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
-Module2800Desc=FTP Client
-Module2900Name=GeoIPMaxmind
-Module2900Desc=GeoIP Maxmind conversions capabilities
-Module3100Name=Skype
-Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
-Module4000Name=HRM
-Module4000Desc=Human resources management
-Module5000Name=Multi-company
-Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management
-Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
-Module20000Name=Leave Requests management
-Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Product lot
-Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
-Module50000Name=PayBox
-Module50000Desc=Module to offer an online payment page by credit card with PayBox
 Module50100Name=Kassa
-Module50100Desc=Point of sales module (POS).
-Module50200Name=Paypal
-Module50200Desc=Module to offer an online payment page by credit card with Paypal
-Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double parties)
-Module54000Name=PrintIPP
-Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
-Module55000Name=Poll, Survey or Vote
-Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
-Module59000Name=Margins
-Module59000Desc=Module to manage margins
-Module60000Name=Commissions
-Module60000Desc=Module to manage commissions
-Module63000Name=Resources
-Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
-Permission11=Read customer invoices
-Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
-Permission14=Validate customer invoices
-Permission15=Send customer invoices by email
-Permission16=Create payments for customer invoices
-Permission19=Delete customer invoices
-Permission21=Read commercial proposals
-Permission22=Create/modify commercial proposals
-Permission24=Validate commercial proposals
-Permission25=Send commercial proposals
-Permission26=Close commercial proposals
-Permission27=Delete commercial proposals
-Permission28=Export commercial proposals
 Permission31=Produkte/Services einsehen
 Permission32=Produkte/Services erstellen/bearbeiten
 Permission34=Produkte/Services löschen
 Permission36=Projekte/Services exportieren
-Permission38=Export products
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
-Permission44=Delete projects (shared project and projects i'm contact for)
-Permission45=Export projects
 Permission61=Eingriffe ansehen
 Permission62=Eingriffe erstellen/bearbeiten
 Permission64=Eingriffe löschen
 Permission67=Eingriffe exportieren
-Permission71=Read members
-Permission72=Create/modify members
-Permission74=Delete members
-Permission75=Setup types of membership
-Permission76=Export data
-Permission78=Read subscriptions
-Permission79=Create/modify subscriptions
-Permission81=Read customers orders
-Permission82=Create/modify customers orders
-Permission84=Validate customers orders
-Permission86=Send customers orders
-Permission87=Close customers orders
-Permission88=Cancel customers orders
-Permission89=Delete customers orders
-Permission91=Read social or fiscal taxes and vat
-Permission92=Create/modify social or fiscal taxes and vat
-Permission93=Delete social or fiscal taxes and vat
-Permission94=Export social or fiscal taxes
-Permission95=Read reports
-Permission101=Read sendings
-Permission102=Create/modify sendings
-Permission104=Validate sendings
-Permission106=Export sendings
-Permission109=Delete sendings
-Permission111=Read financial accounts
-Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
-Permission114=Reconciliate transactions
-Permission115=Export transactions and account statements
-Permission116=Transfers between accounts
-Permission117=Manage cheques dispatching
-Permission121=Read third parties linked to user
-Permission122=Create/modify third parties linked to user
-Permission125=Delete third parties linked to user
-Permission126=Export third parties
-Permission141=Read all projects and tasks (also private projects i am not contact for)
-Permission142=Create/modify all projects and tasks (also private projects i am not 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
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
-Permission167=Export contracts
-Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Reisen löschen
-Permission173=Delete trips and expenses
-Permission174=Read all trips and expenses
-Permission178=Export trips and expenses
-Permission180=Read suppliers
-Permission181=Read supplier orders
-Permission182=Create/modify supplier orders
-Permission183=Validate supplier orders
-Permission184=Approve supplier orders
-Permission185=Order or cancel supplier orders
-Permission186=Receive supplier orders
-Permission187=Close supplier orders
-Permission188=Cancel supplier orders
 Permission192=Leitungen anlegen
 Permission193=Leitungen verwerfen
 Permission194=Breitbandverbindungen einsehen
@@ -676,66 +49,17 @@ Permission212=Leitungen bestellen
 Permission213=Leitungen aktivieren
 Permission214=Telefonie einstellen
 Permission215=Anbieter einstellen
-Permission221=Read emailings
-Permission222=Create/modify emailings (topic, recipients...)
-Permission223=Validate emailings (allows sending)
-Permission229=Delete emailings
-Permission237=View recipients and info
-Permission238=Manually send mailings
-Permission239=Delete mailings after validation or sent
-Permission241=Read categories
-Permission242=Create/modify categories
-Permission243=Delete categories
-Permission244=See the contents of the hidden categories
-Permission251=Read other users and groups
-PermissionAdvanced251=Read other users
 Permission252=Andere Benutzer und Gruppen erstellen/bearbeiten (inkl. Rechteverwaltung)
 Permission253=Passwörter anderer Benutzer ändern
-PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Andere Benutzer löschen oder deaktivieren
 Permission255=Eigene Benutzereinstellungen setzen/bearbeiten
 Permission256=Eigenes Passwort ändern
-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 assignement matters).
 Permission271=CA einsehen
 Permission272=Rechnungen einsehen
 Permission273=Rechnungen erstellen
-Permission281=Read contacts
-Permission282=Create/modify contacts
-Permission283=Delete contacts
-Permission286=Export contacts
-Permission291=Read tariffs
 Permission292=Festlegen von Berechtigungen für die Tarife
-Permission293=Modify costumers tariffs
-Permission300=Read bar codes
-Permission301=Create/modify bar codes
-Permission302=Delete bar codes
 Permission311=Services einsehen
 Permission312=Services Verträgen zuweisen
-Permission331=Read bookmarks
-Permission332=Create/modify bookmarks
-Permission333=Delete bookmarks
-Permission341=Read its own permissions
-Permission342=Create/modify his own user information
-Permission343=Modify his own password
-Permission344=Modify its own permissions
-Permission351=Read groups
-Permission352=Read groups permissions
-Permission353=Create/modify groups
-Permission354=Delete or disable groups
-Permission358=Export users
-Permission401=Read discounts
-Permission402=Create/modify discounts
-Permission403=Validate discounts
-Permission404=Delete discounts
-Permission510=Read Salaries
-Permission512=Create/modify salaries
-Permission514=Delete salaries
-Permission517=Export salaries
-Permission520=Read Loans
-Permission522=Create/modify loans
-Permission524=Delete loans
-Permission525=Access loan calculator
-Permission527=Export loans
 Permission531=Services einsehen
 Permission532=Services erstellen/bearbeiten
 Permission534=Services löschen
@@ -743,923 +67,38 @@ Permission536=Versteckte Services einsehen/verwalten
 Permission538=Services exportieren
 Permission701=Spenden erstellen/bearbeiten
 Permission702=Spenden löschen
-Permission703=Delete donations
-Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
-Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
-Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission779=Export expense reports
-Permission1001=Read stocks
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
-Permission1004=Read stock movements
-Permission1005=Create/modify stock movements
-Permission1101=Read delivery orders
-Permission1102=Create/modify delivery orders
-Permission1104=Validate delivery orders
-Permission1109=Delete delivery orders
-Permission1181=Read suppliers
-Permission1182=Read supplier orders
-Permission1183=Create/modify supplier orders
-Permission1184=Validate supplier orders
-Permission1185=Approve supplier orders
-Permission1186=Order supplier orders
-Permission1187=Acknowledge receipt of supplier orders
-Permission1188=Delete supplier orders
-Permission1190=Approve (second approval) supplier orders
-Permission1201=Get result of an export
-Permission1202=Create/Modify an export
-Permission1231=Read supplier invoices
-Permission1232=Create/modify supplier invoices
-Permission1233=Validate supplier invoices
-Permission1234=Delete supplier invoices
-Permission1235=Send supplier invoices by email
-Permission1236=Export supplier invoices, attributes and payments
-Permission1237=Export supplier orders and their details
 Permission1251=Massenimport von Daten in die Datenbank (Systemlast!)
-Permission1321=Export customer invoices, attributes and payments
-Permission1322=Reopen a paid bill
 Permission1421=Kundenbestellungen und -attribute exportieren
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
-Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
-Permission20006=Admin leave requests (setup and update balance)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
-Permission2401=Read actions (events or tasks) linked to his account
-Permission2402=Create/modify actions (events or tasks) linked to his account
 Permission2403=Maßnahmen (Termine/Aufgaben) Anderer einsehen
 Permission2411=Maßnahmen (Termine oder Aufgaben) Anderer einsehen
 Permission2412=Maßnahmen (Termine oder Aufgaben) Anderer erstellen/bearbeiten
 Permission2413=Maßnahmen (Termine oder Aufgaben) Anderer löschen
-Permission2414=Export actions/tasks of others
 Permission2501=Dokumente hochladen oder löschen
-Permission2502=Download documents
-Permission2503=Submit or delete documents
-Permission2515=Setup documents directories
-Permission2801=Use FTP client in read mode (browse and download only)
-Permission2802=Use FTP client in write mode (delete or upload files)
-Permission50101=Use Point of sales
-Permission50201=Read transactions
-Permission50202=Import transactions
-Permission54001=Print
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
-Permission59003=Read every user margin
-Permission63001=Read resources
-Permission63002=Create/modify resources
-Permission63003=Delete resources
-Permission63004=Link resources to agenda events
-DictionaryCompanyType=Types of thirdparties
-DictionaryCompanyJuridicalType=Legal forms of thirdparties
-DictionaryProspectLevel=Prospect potential level
-DictionaryCanton=State/Province
-DictionaryRegion=Regions
-DictionaryCountry=Countries
-DictionaryCurrency=Currencies
-DictionaryCivility=Personal and professional titles
-DictionaryActions=Types of agenda events
-DictionarySocialContributions=Social or fiscal taxes types
-DictionaryVAT=VAT Rates or Sales Tax Rates
-DictionaryRevenueStamp=Amount of revenue stamps
-DictionaryPaymentConditions=Payment terms
-DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact/Address types
-DictionaryEcotaxe=Ecotax (WEEE)
-DictionaryPaperFormat=Paper formats
-DictionaryFormatCards=Cards formats
-DictionaryFees=Types of fees
-DictionarySendingMethods=Shipping methods
-DictionaryStaff=Staff
-DictionaryAvailability=Delivery delay
-DictionaryOrderMethods=Ordering methods
-DictionarySource=Origin of proposals/orders
-DictionaryAccountancyCategory=Accounting account groups
-DictionaryAccountancysystem=Models for chart of accounts
-DictionaryEMailTemplates=Emails templates
-DictionaryUnits=Units
-DictionaryProspectStatus=Prospection status
-DictionaryHolidayTypes=Types of leaves
-DictionaryOpportunityStatus=Opportunity status for project/lead
-SetupSaved=Setup saved
-BackToModuleList=Back to modules list
-BackToDictionaryList=Back to dictionaries list
-VATManagement=VAT Management
-VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=Die vorgeschlagene MwSt. ist standardmäßig 0 für alle Fälle wie Stiftungen, Einzelpersonen oder Kleinunternehmen-
-VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
-##### Local Taxes #####
-LTRate=Rate
-LocalTax1IsNotUsed=Do not use second tax
-LocalTax1IsUsedDesc=Use a second type of tax (other than VAT)
-LocalTax1IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax1Management=Second type of tax
-LocalTax1IsUsedExample=
-LocalTax1IsNotUsedExample=
-LocalTax2IsNotUsed=Do not use third tax
-LocalTax2IsUsedDesc=Use a third type of tax (other than VAT)
-LocalTax2IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax2Management=Third type of tax
-LocalTax2IsUsedExample=
-LocalTax2IsNotUsedExample=
-LocalTax1ManagementES= RE Management
-LocalTax1IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If te buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
-LocalTax1IsNotUsedDescES= By default the proposed RE is 0. End of rule.
-LocalTax1IsUsedExampleES= In Spain they are professionals subject to some specific sections of the Spanish IAE.
-LocalTax1IsNotUsedExampleES= In Spain they are professional and societies and subject to certain sections of the Spanish IAE.
-LocalTax2ManagementES= IRPF Management
-LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
-LocalTax2IsNotUsedDescES= By default the proposed IRPF is 0. End of rule.
-LocalTax2IsUsedExampleES= In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
-LocalTax2IsNotUsedExampleES= In Spain they are bussines not subject to tax system of modules.
-CalcLocaltax=Reports on local taxes
-CalcLocaltax1=Sales - Purchases
-CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2=Purchases
-CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3=Sales
-CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
-LabelUsedByDefault=Label used by default if no translation can be found for code
-LabelOnDocuments=Label on documents
-NbOfDays=Nb of days
-AtEndOfMonth=At end of month
-CurrentNext=Current/Next
-Offset=Offset
-AlwaysActive=Always active
-Upgrade=Upgrade
-MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Deploy/install external module
-WebServer=Web server
-DocumentRootServer=Web server's root directory
-DataRootServer=Data files directory
-IP=IP
-Port=Port
 VirtualServerName=Virtual Server Name
-OS=OS
 PhpWebLink=Php Web-Link
-Browser=Browser
 Server=Host
-Database=Database
-DatabaseServer=Database host
 DatabaseName=Datenbankname
 DatabasePort=Datenbank-Port
 DatabaseUser=Datenbankbenutzer
 DatabasePassword=Datenbankpasswort
-Tables=Tables
-TableName=Table name
-NbOfRecord=Nb of records
 Host=Host
 DriverType=Driver Typ
-SummarySystem=System information summary
 SummaryConst=Liste aller Systemeinstellungen
-MenuCompanySetup=Company/Foundation
-DefaultMenuManager= Standard menu manager
-DefaultMenuSmartphoneManager=Smartphone menu manager
 Skin=Oberfläche
 DefaultSkin=Standardoberfläche
-MaxSizeList=Max length for list
-DefaultMaxSizeList=Default max length for lists
-DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
-MessageOfDay=Message of the day
-MessageLogin=Login page message
-PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Standardsprache (Sprachcode)
-EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Logo über dem linken Menüs anzeigen
-CompanyInfo=Company/foundation information
-CompanyIds=Company/foundation identities
-CompanyName=Name
-CompanyAddress=Address
-CompanyZip=Zip
-CompanyTown=Town
-CompanyCountry=Country
 CompanyCurrency=Firmenwährung
-CompanyObject=Object of the company
-Logo=Logo
-DoNotSuggestPaymentMode=Do not suggest
-NoActiveBankAccountDefined=No active bank account defined
-OwnerOfBankAccount=Owner of bank account %s
-BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show link "<strong>%s</strong>"
-Alerts=Alerts
 DelaysOfToleranceBeforeWarning=Verspätungstoleranz vor Benachrichtigungen
-DelaysOfToleranceDesc=This screen allows you to define the tolerated delays before an alert is reported on screen with picto %s for each late element.
-Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned events (agenda events) not completed yet
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Delay tolerance (in days) before alert on project not closed in time
-Delays_MAIN_DELAY_TASKS_TODO=Delay tolerance (in days) before alert on planned tasks (project tasks) not completed yet
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on orders not processed yet
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on suppliers orders not processed yet
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Delay tolerance (in days) before alert on proposals to close
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Delay tolerance (in days) before alert on proposals not billed
 Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Verzögerungstoleranz (in Tagen) vor  Benachrichtigung über zu aktivierende Services
 Delays_MAIN_DELAY_RUNNING_SERVICES=Verzögerungstoleranz (in Tagen) vor Benachrichtigung zu überfälligen Services
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerance delay (in days) before alert on unpaid supplier invoices
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerence delay (in days) before alert on unpaid client invoices
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerance delay (in days) before alert on pending bank reconciliation
-Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed membership fee
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
-Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
-SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
-SetupDescription5=Other menu entries manage optional parameters.
-LogEvents=Security audit events
-Audit=Audit
-InfoDolibarr=About Dolibarr
-InfoBrowser=About Browser
-InfoOS=About OS
-InfoWebServer=About Web Server
-InfoDatabase=About Database
-InfoPHP=About PHP
-InfoPerf=About Performances
-BrowserName=Browser name
-BrowserOS=Browser OS
-ListOfSecurityEvents=List of Dolibarr security events
-SecurityEventsPurged=Security events purged
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
-SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
-SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
-DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
-AvailableModules=Available 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.
-TriggersAvailable=Available triggers
-TriggersDesc=Triggers are files that will modify the behaviour of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realised new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
-TriggerDisabledByName=Triggers in this file are disabled by the <b>-NORUN</b> suffix in their name.
-TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module <b>%s</b> is disabled.
-TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules.
-TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
-GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password
-DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">check here</a>.
-MiscellaneousDesc=All other security related parameters are defined here.
-LimitsSetup=Limits/Precision setup
-LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here
-MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices
-MAIN_MAX_DECIMALS_TOT=Max decimals for total prices
-MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add <b>...</b> after this number if you want to see <b>...</b> when number is truncated when shown on screen)
-MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
-UnitPriceOfProduct=Net unit price of a product
-TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
-ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
-NoEventFoundWithCriteria=No security event has been found for such search criterias.
-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.
-BackupDescX=Archived directory should be stored in a secure place.
-BackupDescY=The generated dump file should be stored in a secure place.
-BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one
-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 directoy (<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=Available database backup dump files
-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
-DownloadMoreSkins=More skins to download
-SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence without hole and with no reset
-ShowProfIdInAddress=Show professionnal id with addresses on documents
-ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents
-TranslationUncomplete=Partial translation
-MAIN_DISABLE_METEO=Disable meteo view
-TestLoginToAPI=Test login to API
-ProxyDesc=Some features of Dolibarr need to have an Internet access to work. Define here parameters for this. If the Dolibarr server is behind a Proxy server, those parameters tells Dolibarr how to access Internet through it.
-ExternalAccess=External access
-MAIN_PROXY_USE=Use a proxy server (otherwise direct access to internet)
-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 all attributes, not already available by default, and that you want to be supported for %s.
-ExtraFields=Complementary attributes
-ExtraFieldsLines=Complementary attributes (lines)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
-ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact/address)
-ExtraFieldsMember=Complementary attributes (member)
-ExtraFieldsMemberType=Complementary attributes (member type)
-ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
-ExtraFieldsSupplierOrders=Complementary attributes (orders)
-ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
-ExtraFieldsProject=Complementary attributes (projects)
-ExtraFieldsProjectTask=Complementary attributes (tasks)
-ExtraFieldHasWrongValue=Attribute %s has a wrong value.
-AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
-SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
-PathToDocuments=Path to documents
-PathDirectory=Directory
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might 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.
-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: <strong>User display setup</strong> tab of 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
-TranslationString=Translation string
-CurrentTranslationString=Current translation string
-WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
-NewTranslationStringToShow=New translation string to show
-OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
-YouMustEnableOneModule=You must at least enable 1 module
-ClassNotFoundIntoPathWarning=Class %s not found into PHP path
-YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
-SuhosinSessionEncrypt=Session storage encrypted by Suhosin
-ConditionIsCurrently=Condition is currently %s
-YouUseBestDriver=You use driver %s that is best driver available currently.
-YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required 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.
-BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance.
-BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
-AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp".
-AskForPreferredShippingMethod=Ask for preferred Sending Method for Third Parties.
-FieldEdition=Edition of field %s
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
-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.
-PasswordGenerationPerso=Return a password according to your personally defined configuration.
-SetupPerso=According to your configuration
-PasswordPatternDesc=Password pattern description
-##### Users setup #####
-RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passwords
-DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page
-UsersSetup=Users module setup
-UserMailRequired=EMail required to create a new user
-##### HRM setup #####
-HRMSetup=HRM module setup
-##### Company setup #####
-CompanySetup=Companies module setup
-CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier)
-AccountCodeManager=Module for accountancy code generation (customer or supplier)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
-NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
-NotificationsDescGlobal=* or by setting global target emails in module setup page.
-ModelModules=Documents templates
 DocumentModelOdt=Erstellen von Dokumentvorlagen im OpenDocuments-Format (.odt-Dateien für OpenOffice, KOffice, TextEdit, ...)
-WatermarkOnDraft=Watermark on draft document
-JSOnPaimentBill=Activate feature to autofill payment lines on payment form
-CompanyIdProfChecker=Rules on Professional Ids
-MustBeUnique=Must be unique?
-MustBeMandatory=Mandatory to create third parties?
-MustBeInvoiceMandatory=Mandatory to validate invoices?
-##### Webcal setup #####
-WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
-##### Invoices #####
-BillsSetup=Invoices module setup
-BillsNumberingModule=Invoices and credit notes numbering model
-BillsPDFModules=Invoice documents models
-CreditNote=Gutschrift
-CreditNotes=Credit notes
-ForceInvoiceDate=Force invoice date to validation date
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
-SuggestPaymentByRIBOnAccount=Suggest payment by withdraw on account
-SuggestPaymentByChequeToAddress=Suggest payment by cheque to
-FreeLegalTextOnInvoices=Free text on invoices
 WatermarkOnDraftInvoices=Wasserzeichen auf Rechnungsentwürfen (alle, falls leer)
-PaymentsNumberingModule=Payments numbering model
-SuppliersPayment=Suppliers payments
-SupplierPaymentSetup=Suppliers payments setup
-##### Proposals #####
-PropalSetup=Commercial proposals module setup
-ProposalsNumberingModules=Commercial proposal numbering models
-ProposalsPDFModules=Commercial proposal documents models
-FreeLegalTextOnProposal=Free text on commercial proposals
 WatermarkOnDraftProposal=Wasserzeichen für Angebotsentwürfe (alle, falls leer)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
-WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
-##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
-##### Orders #####
-OrdersSetup=Order management setup
-OrdersNumberingModules=Orders numbering models
-OrdersModelModule=Order documents models
-FreeLegalTextOnOrders=Free text on orders
 WatermarkOnDraftOrders=Wasserzeichen zu den Entwürfen von Aufträgen (alle, wenn leer)
-ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Interventions #####
 InterventionsSetup=Eingriffsmoduleinstellungen
 FreeLegalTextOnInterventions=Freier Rechtstext für Eingriffe
-FicheinterNumberingModules=Intervention numbering models
-TemplatePDFInterventions=Intervention card documents models
 WatermarkOnDraftInterventionCards=Wasserzeichen auf Intervention Karte Dokumente (alle, wenn leer)
-##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
-ContractsNumberingModules=Contracts numbering modules
-TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
-##### Members #####
-MembersSetup=Members module setup
-MemberMainOptions=Main options
-AdherentLoginRequired= Manage a Login for each member
-AdherentMailRequired=EMail required to create a new member
-MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
-##### LDAP setup #####
-LDAPSetup=LDAP Setup
-LDAPGlobalParameters=Global parameters
-LDAPUsersSynchro=Users
-LDAPGroupsSynchro=Groups
-LDAPContactsSynchro=Contacts
-LDAPMembersSynchro=Members
-LDAPSynchronization=LDAP synchronisation
-LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP
-LDAPToDolibarr=LDAP -> Dolibarr
-DolibarrToLDAP=Dolibarr -> LDAP
-LDAPNamingAttribute=Key in LDAP
-LDAPSynchronizeUsers=Organization of users in LDAP
-LDAPSynchronizeGroups=Organization of groups in LDAP
-LDAPSynchronizeContacts=Organization of contacts in LDAP
-LDAPSynchronizeMembers=Organization of foundation's members in LDAP
-LDAPPrimaryServer=Primary server
-LDAPSecondaryServer=Secondary server
-LDAPServerPort=Server port
-LDAPServerPortExample=Default port : 389
-LDAPServerProtocolVersion=Protocol version
-LDAPServerUseTLS=Use TLS
-LDAPServerUseTLSExample=Your LDAP server use TLS
-LDAPServerDn=Server DN
-LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
-LDAPPassword=Administrator password
-LDAPUserDn=Users' DN
-LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
-LDAPGroupDn=Groups' DN
-LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com)
-LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
-LDAPServerDnExample=Complete DN (ex: dc=example,dc=com)
-LDAPDnSynchroActive=Users and groups synchronization
-LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization
-LDAPDnContactActive=Contacts' synchronization
-LDAPDnContactActiveExample=Activated/Unactivated synchronization
-LDAPDnMemberActive=Members' synchronization
-LDAPDnMemberActiveExample=Activated/Unactivated synchronization
-LDAPContactDn=Dolibarr contacts' DN
-LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com)
-LDAPMemberDn=Dolibarr members DN
-LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com)
-LDAPMemberObjectClassList=List of objectClass
-LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPUserObjectClassList=List of objectClass
-LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPGroupObjectClassList=List of objectClass
-LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
-LDAPContactObjectClassList=List of objectClass
-LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPTestConnect=Test LDAP connection
-LDAPTestSynchroContact=Test contacts synchronization
-LDAPTestSynchroUser=Test user synchronization
-LDAPTestSynchroGroup=Test group synchronization
-LDAPTestSynchroMember=Test member synchronization
-LDAPTestSearch= Test a LDAP search
-LDAPSynchroOK=Synchronization test successful
-LDAPSynchroKO=Failed synchronization test
-LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that connexion to server is correctly configured and allows LDAP udpates
-LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s)
-LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s)
-LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPBindKO=Connect/Authentificate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPSetupForVersion3=LDAP server configured for version 3
-LDAPSetupForVersion2=LDAP server configured for version 2
-LDAPDolibarrMapping=Dolibarr Mapping
-LDAPLdapMapping=LDAP Mapping
-LDAPFieldLoginUnix=Login (unix)
-LDAPFieldLoginExample=Example : uid
-LDAPFilterConnection=Search filter
-LDAPFilterConnectionExample=Example : &(objectClass=inetOrgPerson)
-LDAPFieldLoginSamba=Login (samba, activedirectory)
-LDAPFieldLoginSambaExample=Example : samaccountname
-LDAPFieldFullname=Full name
-LDAPFieldFullnameExample=Example : cn
-LDAPFieldPasswordNotCrypted=Password not crypted
-LDAPFieldPasswordCrypted=Password crypted
-LDAPFieldPasswordExample=Example : userPassword
-LDAPFieldCommonNameExample=Example : cn
-LDAPFieldName=Name
-LDAPFieldNameExample=Example : sn
-LDAPFieldFirstName=First name
-LDAPFieldFirstNameExample=Example : givenName
-LDAPFieldMail=Email address
-LDAPFieldMailExample=Example : mail
-LDAPFieldPhone=Professional phone number
-LDAPFieldPhoneExample=Example : telephonenumber
-LDAPFieldHomePhone=Personal phone number
-LDAPFieldHomePhoneExample=Example : homephone
-LDAPFieldMobile=Cellular phone
-LDAPFieldMobileExample=Example : mobile
-LDAPFieldFax=Fax number
-LDAPFieldFaxExample=Example : facsimiletelephonenumber
-LDAPFieldAddress=Street
-LDAPFieldAddressExample=Example : street
-LDAPFieldZip=Zip
-LDAPFieldZipExample=Example : postalcode
-LDAPFieldTown=Town
-LDAPFieldTownExample=Example : l
-LDAPFieldCountry=Country
-LDAPFieldDescription=Description
-LDAPFieldDescriptionExample=Example : description
-LDAPFieldNotePublic=Public Note
-LDAPFieldNotePublicExample=Example : publicnote
-LDAPFieldGroupMembers= Group members
-LDAPFieldGroupMembersExample= Example : uniqueMember
-LDAPFieldBirthdate=Birthdate
-LDAPFieldCompany=Company
-LDAPFieldCompanyExample=Example : o
-LDAPFieldSid=SID
-LDAPFieldSidExample=Example : objectsid
-LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Job position
-LDAPFieldTitleExample=Example: title
-LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
-LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
-LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts.
-LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users.
-LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups.
-LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module.
-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 advices related to performance.
-NotInstalled=Not installed, so your server is not slow 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.
-MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
-MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
-OPCodeCache=OPCode cache
-NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad).
-HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
-FilesOfTypeCached=Files of type %s are cached by HTTP server
-FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
-FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
-FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
-CacheByServer=Cache by server
-CacheByClient=Cache by browser
-CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
-##### Products #####
-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)
-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 third party language
-UseSearchToSelectProductTooltip=Also if you have a large number of product (> 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)
-SetDefaultBarcodeTypeProducts=Default barcode type to use for products
-SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
-ProductCodeChecker= Module for product code generation and checking (product or service)
-ProductOtherConf= Product / Service configuration
-IsNotADir=is not a directory!
-##### Syslog #####
-SyslogSetup=Logs module setup
-SyslogOutput=Logs outputs
-SyslogFacility=Facility
-SyslogLevel=Level
-SyslogFilename=File name and path
-YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
-ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
-##### Donations #####
-DonationsSetup=Donation module setup
-DonationsReceiptModel=Template of donation receipt
-##### Barcode #####
-BarcodeSetup=Barcode setup
-PaperFormatModule=Print format module
-BarcodeEncodeModule=Barcode encoding type
-CodeBarGenerator=Barcode generator
-ChooseABarCode=No generator defined
-FormatNotSupportedByGenerator=Format not supported by this generator
-BarcodeDescEAN8=Barcode of type EAN8
-BarcodeDescEAN13=Barcode of type EAN13
-BarcodeDescUPC=Barcode of type UPC
-BarcodeDescISBN=Barcode of type ISBN
-BarcodeDescC39=Barcode of type C39
-BarcodeDescC128=Barcode of type C128
-BarcodeDescDATAMATRIX=Barcode of type Datamatrix
-BarcodeDescQRCODE=Barcode of type QR code
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
-BarcodeInternalEngine=Internal engine
-BarCodeNumberManager=Manager to auto define barcode numbers
-##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct debit payment orders
-##### ExternalRSS #####
-ExternalRSSSetup=External RSS imports setup
-NewRSS=New RSS Feed
-RSSUrl=RSS URL
-RSSUrlExample=An interesting RSS feed
-##### Mailing #####
-MailingSetup=EMailing module setup
-MailingEMailFrom=Sender EMail (From) for emails sent by emailing module
-MailingEMailError=Return EMail (Errors-to) for emails with errors
-MailingDelay=Seconds to wait after sending next message
-##### Notification #####
-NotificationSetup=EMail notification module setup
-NotificationEMailFrom=Sender EMail (From) for emails sent for notifications
-FixedEmailTarget=Fixed email target
-##### Sendings #####
-SendingsSetup=Sending module setup
-SendingsReceiptModel=Sending receipt model
-SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
-FreeLegalTextOnShippings=Free text on shipments
-##### Deliveries #####
-DeliveryOrderNumberingModules=Products deliveries receipt numbering module
-DeliveryOrderModel=Products deliveries receipt model
-DeliveriesOrderAbility=Support products deliveries receipts
-FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
-##### FCKeditor #####
-AdvancedEditor=Advanced editor
-ActivateFCKeditor=Activate advanced editor for:
-FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
-FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files.</font>
-FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
-FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
-##### OSCommerce 1 #####
-OSCommerceErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be an OSCommerce database (Key %s not found in table %s).
-OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' successfull.
-OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
-OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
-##### Stock #####
-StockSetup=Warehouse module setup
-IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
-##### Menu #####
-MenuDeleted=Menu deleted
-Menus=Menus
-TreeMenuPersonalized=Personalized menus
-NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
-NewMenu=New menu
-Menu=Selection of menu
-MenuHandler=Menu handler
-MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
-DetailId=Id menu
-DetailMenuHandler=Menu handler where to show new menu
-DetailMenuModule=Module name if menu entry come from a module
-DetailType=Type of menu (top or left)
-DetailTitre=Menu label or label code for translation
-DetailUrl=URL where menu send you (Absolute URL link or external link with http://)
-DetailEnabled=Condition to show or not entry
-DetailRight=Condition to display unauthorized grey menus
-DetailLangs=Lang file name for label code translation
-DetailUser=Intern / Extern / All
-Target=Target
-DetailTarget=Target for links (_blank top open a new window)
-DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu)
-ModifMenu=Menu change
-DeleteMenu=Delete menu entry
-ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
-FailedToInitializeMenu=Failed to initialize menu
-##### Tax #####
-TaxSetup=Taxes, social or fiscal taxes and dividends module setup
-OptionVatMode=VAT due
-OptionVATDefault=Cash basis
-OptionVATDebitOption=Accrual basis
-OptionVatDefaultDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on payments for services
-OptionVatDebitOptionDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on invoice (debit) for services
-SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
-OnDelivery=On delivery
-OnPayment=On payment
-OnInvoice=On invoice
-SupposedToBePaymentDate=Payment date used
-SupposedToBeInvoiceDate=Invoice date used
-Buy=Buy
-Sell=Sell
-InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
-AccountancyCode=Accountancy Code
-AccountancyCodeSell=Sale 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 -> Dictionary -> 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_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
-AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### Clicktodial #####
 ClickToDialSetup=Click-to-Dial-Moduleinstellungen
-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 your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your 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.
-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 same computer than 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.
-##### Point Of Sales (CashDesk) #####
-CashDesk=Kassa
-CashDeskSetup=Point of sales module setup
-CashDeskThirdPartyForSell=Default generic third party to use for sells
-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).
-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
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
-##### Bookmark #####
-BookmarkSetup=Bookmark module setup
-BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu.
-NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu
-##### WebServices #####
-WebServicesSetup=Webservices module setup
-WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
-WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
-EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
-##### API ####
-ApiSetup=API module setup
-ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
-OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
-ApiKey=Key for API
-WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
-##### Bank #####
-BankSetupModule=Bank module setup
-FreeLegalTextOnChequeReceipts=Free text on cheque receipts
-BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
-BankOrderGlobal=General
-BankOrderGlobalDesc=General display order
-BankOrderES=Spanish
-BankOrderESDesc=Spanish display order
-ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
-##### Multicompany #####
-MultiCompanySetup=Multi-company module setup
-##### Suppliers #####
-SuppliersSetup=Supplier module setup
-SuppliersCommandModel=Complete template of supplier order (logo...)
-SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
-SuppliersInvoiceNumberingModel=Supplier invoices numbering models
-IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
-##### GeoIPMaxmind #####
-GeoIPMaxmindSetup=GeoIP Maxmind module setup
 PathToGeoIPMaxmindCountryDataFile=Pfad zur Datei mit Maxmind IP to Country Übersetzung. <br> Beispiel: / usr / local / share / GeoIP / GeoIP.dat
-NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
-YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
-YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
-TestGeoIPResult=Test of a conversion IP -> country
-##### Projects #####
-ProjectsNumberingModules=Projects numbering module
-ProjectsSetup=Project module setup
-ProjectsModelModule=Project reports document model
-TasksNumberingModules=Tasks numbering module
-TaskModelModule=Tasks reports document model
-UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
-##### ECM (GED) #####
-##### Fiscal Year #####
-AccountingPeriods=Accounting periods
-AccountingPeriodCard=Accounting period
-NewFiscalYear=New accounting period
-OpenFiscalYear=Open accounting period
-CloseFiscalYear=Close accounting period
-DeleteFiscalYear=Delete accounting period
-ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
-ShowFiscalYear=Show accounting period
-AlwaysEditable=Can always be edited
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
-Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
-IncludePath=Include path (defined into variable %s)
-ExpenseReportsSetup=Setup of module Expense Reports
-TemplatePDFExpenseReports=Document templates to generate expense report document
-NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
-YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of 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
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/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.
-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.
-ConfFileMuseContainCustom=Installing 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)
-TextTitleColor=Color of page title
-LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
-NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
-BackgroundColor=Background color
-TopMenuBackgroundColor=Background color for Top menu
-TopMenuDisableImages=Hide images in Top menu
-LeftMenuBackgroundColor=Background color for Left menu
-BackgroundTableTitleColor=Background color for Table title line
-BackgroundTableLineOddColor=Background color for odd table lines
-BackgroundTableLineEvenColor=Background color for even table lines
-MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
-NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
-UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
-PositionIntoComboList=Position of line into combo lists
-SellTaxRate=Sale tax rate
-RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
-UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipping, you can enter it here. You can use the key {TRACKID} into URL parameters so the system will replace it with value of tracking number user entered into shipment card.
-OpportunityPercent=When you create an opportunity, you will defined an estimated amount of project/lead. According to status of opportunity, this amount may be multiplicated 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
-FixTZ=TimeZone fix
-FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
-ExpectedChecksum=Expected Checksum
-CurrentChecksum=Current Checksum
-ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the latest stable version
-TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
-TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so 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 usefull only if your prices for each leve 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.
-SeeSubstitutionVars=See * note for list of possible substitution variables
-AllPublishers=All publishers
-UnknownPublishers=Unknown publishers
-AddRemoveTabs=Add or remove tabs
-AddDictionaries=Add dictionaries
-AddBoxes=Add widgets
-AddSheduledJobs=Add scheduled jobs
-AddHooks=Add hooks
-AddTriggers=Add triggers
-AddMenus=Add menus
-AddPermissions=Add permissions
-AddExportProfiles=Add export profiles
-AddImportProfiles=Add import profiles
-AddOtherPagesOrServices=Add other pages or services
-AddModels=Add document or numbering templates
-AddSubstitutions=Add keys substitutions
-DetectionNotPossible=Detection not possible
-UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved on 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 correclty. 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 inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <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
-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
-TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
-##### Resource ####
-ResourceSetup=Configuration du module Resource
-UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
diff --git a/htdocs/langs/de_AT/banks.lang b/htdocs/langs/de_AT/banks.lang
index 9f8f89018ff..436ba439ea6 100644
--- a/htdocs/langs/de_AT/banks.lang
+++ b/htdocs/langs/de_AT/banks.lang
@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - banks
 MenuBankCash=Überweisung/Bar
 BankName=Banknamen
-FinancialAccount=Konto
 BankAccount=Kontonummer
 BankAccounts=Kontonummern
 AccountRef=Referenznummer
diff --git a/htdocs/langs/de_AT/compta.lang b/htdocs/langs/de_AT/compta.lang
index 9ec9d2f810c..3a18e7f06f9 100644
--- a/htdocs/langs/de_AT/compta.lang
+++ b/htdocs/langs/de_AT/compta.lang
@@ -7,6 +7,7 @@ VATReceived=Eingehobene MwSt.
 VATToCollect=Einzuhebende MwSt.
 VATSummary=MwSt. Zahllast
 VATCollected=Eingehobene MwSt.
+ToPay=To pay
 MenuSpecialExpenses=Steuern, Sozialbeiträge und Dividenden
 AnnualSummaryDueDebtMode=Die Jahresbilanz der Einnahmen/Ausgaben im Modus<b>%sForderungen-Verbindlichkeiten%s</b> meldet <b>Kameralistik</b>.
 AnnualSummaryInputOutputMode=Die Jahresbilanz der Einnahmen/Ausgaben im Modus <b>%sEinkünfte-Ausgaben%s</b> meldet <b>Ist-Besteuerung</b>.
@@ -21,4 +22,3 @@ SellsJournal=Vertrieb Journal
 PurchasesJournal=Käufe Journal
 DescSellsJournal=Vertrieb Journal
 DescPurchasesJournal=Käufe Journal
-WarningDepositsNotIncluded=Einlagen Rechnungen sind in dieser Version nicht mit diesem Rechnungswesen-Modul enthalten.
diff --git a/htdocs/langs/de_AT/main.lang b/htdocs/langs/de_AT/main.lang
index 70759251863..e4e649378dc 100644
--- a/htdocs/langs/de_AT/main.lang
+++ b/htdocs/langs/de_AT/main.lang
@@ -1,9 +1,5 @@
 # Dolibarr language file - Source file is en_US - main
 DIRECTION=ltr
-# Note for Chinese:
-# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
-# stsongstdlight or cid0cs are for simplified Chinese
-# To read Chinese pdf with Linux: sudo apt-get install poppler-data
 FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=,
@@ -23,799 +19,50 @@ FormatDateHourShort=%d/%m/%Y %H:%M
 FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
-DatabaseConnection=Database connection
-NoTemplateDefined=No template defined for this email type
-AvailableVariables=Available substitution variables
-NoTranslation=No translation
-NoRecordFound=No record found
-NoRecordDeleted=No record deleted
-NotEnoughDataYet=Not enough data
 NoError=Kein Fehler
-Error=Error
-Errors=Errors
-ErrorFieldRequired=Field '%s' is required
-ErrorFieldFormat=Field '%s' has a bad value
-ErrorFileDoesNotExists=File %s does not exist
-ErrorFailedToOpenFile=Failed to open file %s
-ErrorCanNotCreateDir=Cannot create dir %s
-ErrorCanNotReadDir=Cannot read dir %s
-ErrorConstantNotDefined=Parameter %s not defined
-ErrorUnknown=Unknown error
-ErrorSQL=SQL Error
 ErrorLogoFileNotFound=Logo-Datei '%s' kann nicht gefunden werden
-ErrorGoToGlobalSetup=Bitte wechseln Sie zu den 'Firma/Stiftung"-Einstellungen um das Problem zu beheben
-ErrorGoToModuleSetup=Go to Module setup to fix this
 ErrorFailedToSendMail=Fehler beim Senden des Mails (Absender=%s, Empfänger=%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.
-ErrorWrongValue=Wrong value
-ErrorWrongValueForParameterX=Wrong value for parameter %s
-ErrorNoRequestInError=No request in error
-ErrorServiceUnavailableTryLater=Service not available for the moment. Try again later.
 ErrorDuplicateField=Dieser Wert muß einzigartig sein
-ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. We rollback changes.
-ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined inside 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 nb of record per page
-NotAuthorized=You are not authorized to do that.
-SetDate=Set date
-SelectDate=Select a date
-SeeAlso=See also %s
-SeeHere=See here
-Apply=Apply
-BackgroundColorByDefault=Default background color
-FileRenamed=The file was successfully renamed
-FileUploaded=The file was successfully uploaded
-FileGenerated=The file was successfully generated
-FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
-NbOfEntries=Nb of entries
-GoToWikiHelpPage=Read online help (Internet access needed)
-GoToHelpPage=Read help
-RecordSaved=Record saved
-RecordDeleted=Record deleted
 LevelOfFeature=Funktions-Level
-NotDefined=Not defined
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
-Administrator=Administrator
-Undefined=Undefined
-PasswordForgotten=Password forgotten?
-SeeAbove=See above
-HomeArea=Home area
-LastConnexion=Latest connection
 PreviousConnexion=Vorherige Verbindung
-PreviousValue=Previous value
-ConnectedOnMultiCompany=Connected on environment
-ConnectedSince=Connected since
-AuthenticationMode=Authentication mode
-RequestedUrl=Requested URL
-DatabaseTypeManager=Database type manager
-RequestLastAccessInError=Latest database access request error
-ReturnCodeLastAccessInError=Return code for latest database access request error
-InformationLastAccessInError=Information for latest database access request error
-DolibarrHasDetectedError=Dolibarr has detected a technical error
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes
-MoreInformation=More information
-TechnicalInformation=Technical information
-TechnicalID=Technical ID
-NotePublic=Note (public)
-NotePrivate=Note (private)
-PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
-DoTest=Test
-ToFilter=Filter
-NoFilter=No filter
-WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance delay.
-yes=yes
-Yes=Yes
-no=no
-No=No
-All=All
-Home=Home
-Help=Help
-OnlineHelp=Online help
-PageWiki=Wiki page
-MediaBrowser=Media browser
-Always=Always
-Never=Never
-Under=under
-Period=Period
-PeriodEndDate=End date for period
-Activate=Activate
-Activated=Activated
-Closed=Closed
-Closed2=Closed
-NotClosed=Not closed
-Enabled=Enabled
-Deprecated=Deprecated
-Disable=Disable
-Disabled=Disabled
-Add=Add
-AddLink=Add link
-RemoveLink=Remove link
-AddToDraft=Add to draft
-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>?
-Delete=Delete
-Remove=Remove
-Resiliate=Terminate
-Cancel=Cancel
-Modify=Modify
-Edit=Edit
-Validate=Validate
-ValidateAndApprove=Validate and Approve
-ToValidate=To validate
-Save=Save
-SaveAs=Save As
-TestConnection=Test connection
-ToClone=Clone
-ConfirmClone=Choose data you want to clone :
-NoCloneOptionsSpecified=No data to clone defined.
+Closed=geschlossen
+Closed2=geschlossen
 Of=Von
-Go=Go
-Run=Run
-CopyOf=Copy of
-Show=Show
-Hide=Hide
-ShowCardHere=Show card
 Search=Suche
 SearchOf=Suche
-Valid=Valid
-Approve=Approve
-Disapprove=Disapprove
-ReOpen=Re-Open
 Upload=Upload
-ToLink=Link
-Select=Select
-Choose=Choose
-Resize=Resize
-Recenter=Recenter
-Author=Author
-User=User
-Users=Users
-Group=Group
-Groups=Groups
-NoUserGroupDefined=No user group defined
-Password=Password
 PasswordRetype=Geben Sie das Passwort erneut ein
-NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
-Name=Name
-Person=Person
-Parameter=Parameter
-Parameters=Parameters
-Value=Value
-PersonalValue=Personal value
-NewValue=New value
-CurrentValue=Current value
-Code=Code
-Type=Type
-Language=Language
-MultiLanguage=Multi-language
-Note=Note
-Title=Titel
-Label=Label
-RefOrLabel=Ref. or label
-Info=Log
-Family=Family
-Description=Description
-Designation=Description
-Model=Doc template
-DefaultModel=Default doc template
-Action=Event
-About=About
-Number=Number
-NumberByMonth=Number by month
-AmountByMonth=Amount by month
-Numero=Number
-Limit=Limit
-Limits=Limits
-Logout=Logout
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Connection
-Setup=Setup
-Alert=Alert
-Previous=Previous
-Next=Next
-Cards=Cards
-Card=Card
-Now=Now
-HourStart=Start hour
-Date=Date
-DateAndHour=Date and hour
-DateToday=Today's date
-DateReference=Reference date
 DateStart=Start-Datum
 DateEnd=End-Datum
-DateCreation=Creation date
-DateCreationShort=Creat. date
-DateModification=Modification date
-DateModificationShort=Modif. date
-DateLastModification=Latest modification date
-DateValidation=Validation date
-DateClosing=Closing date
-DateDue=Due date
-DateValue=Value date
-DateValueShort=Value date
-DateOperation=Operation date
-DateOperationShort=Oper. Date
-DateLimit=Limit date
 DateRequest=Verlange Datum
-DateProcess=Process date
-DateBuild=Report build date
-DatePayment=Date of payment
-DateApprove=Approving date
-DateApprove2=Approving date (second approval)
-UserCreation=Creation user
-UserModification=Modification user
-UserCreationShort=Creat. user
-UserModificationShort=Modif. user
-DurationYear=year
-DurationMonth=month
-DurationWeek=week
-DurationDay=day
-DurationYears=years
-DurationMonths=months
-DurationWeeks=weeks
 DurationDays=Tag
-Year=Year
-Month=Month
-Week=Week
-WeekShort=Week
-Day=Day
-Hour=Hour
-Minute=Minute
-Second=Second
-Years=Years
-Months=Months
-Days=Days
 days=Tag
-Hours=Hours
-Minutes=Minutes
-Seconds=Seconds
-Weeks=Weeks
-Today=Today
-Yesterday=Yesterday
-Tomorrow=Tomorrow
-Morning=Morning
-Afternoon=Afternoon
-Quadri=Quadri
-MonthOfDay=Month of the day
-HourShort=H
-MinuteShort=mn
-Rate=Rate
-CurrencyRate=Currency conversion rate
-UseLocalTax=Include tax
-Bytes=Bytes
-KiloBytes=Kilobytes
-MegaBytes=Megabytes
-GigaBytes=Gigabytes
-TeraBytes=Terabytes
-b=b.
-Kb=Kb
-Mb=Mb
-Gb=Gb
-Tb=Tb
-Cut=Cut
-Copy=Copy
-Paste=Paste
-Default=Default
-DefaultValue=Default value
-Price=Price
 UnitPrice=Bruttopreis (Stk.)
 UnitPriceHT=Nettopreis (Stk.)
 UnitPriceTTC=Bruttopreis (Stk.)
-PriceU=U.P.
-PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (currency)
-PriceUTTC=U.P. (inc. tax)
-Amount=Amount
-AmountInvoice=Invoice amount
-AmountPayment=Payment amount
-AmountHTShort=Amount (net)
-AmountTTCShort=Amount (inc. tax)
-AmountHT=Amount (net of tax)
-AmountTTC=Amount (inc. tax)
-AmountVAT=Amount tax
-MulticurrencyAlreadyPaid=Already payed, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
-MulticurrencyAmountHT=Amount (net of tax), original currency
-MulticurrencyAmountTTC=Amount (inc. of tax), original currency
-MulticurrencyAmountVAT=Amount tax, original currency
-AmountLT1=Amount tax 2
-AmountLT2=Amount tax 3
-AmountLT1ES=Amount RE
-AmountLT2ES=Amount IRPF
-AmountTotal=Total amount
 AmountAverage=Durchnschnittsbetrag
-PriceQtyMinHT=Price quantity min. (net of tax)
-Percentage=Percentage
-Total=Total
-SubTotal=Subtotal
-TotalHTShort=Total (net)
-TotalHTShortCurrency=Total (net in currency)
-TotalTTCShort=Total (inc. tax)
-TotalHT=Nettosumme
-TotalHTforthispage=Total (net of tax) for this page
-Totalforthispage=Total for this page
-TotalTTC=Total (inc. tax)
-TotalTTCToYourCredit=Total (inc. tax) to your credit
 TotalVAT=Steuer gesamt
-TotalLT1=Total tax 2
-TotalLT2=Total tax 3
-TotalLT1ES=Total RE
-TotalLT2ES=Total IRPF
-HT=Net of tax
-TTC=Inc. tax
-VAT=Sales tax
-VATs=Sales taxes
-LT1ES=RE
-LT2ES=IRPF
-VATRate=Tax Rate
-Average=Average
-Sum=Sum
-Delta=Delta
-Module=Module
-Option=Option
-List=List
-FullList=Full list
-Statistics=Statistics
-OtherStatistics=Other statistics
-Status=Status
-Favorite=Favorite
-ShortInfo=Info.
 Ref=Bezeichnung
-ExternalRef=Ref. extern
 RefSupplier=Lieferanten Nr.
 RefPayment=Zahlungs Nr.
-CommercialProposalsShort=Commercial proposals
-Comment=Comment
-Comments=Comments
-ActionsToDo=Events to do
-ActionsToDoShort=To do
-ActionsDoneShort=Done
-ActionNotApplicable=Not applicable
-ActionRunningNotStarted=To start
-ActionRunningShort=In progress
-ActionDoneShort=Finished
-ActionUncomplete=Uncomplete
-CompanyFoundation=Company/Foundation
-ContactsForCompany=Contacts 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
-NActionsLate=%s late
-RequestAlreadyDone=Request already recorded
-Filter=Filter
-FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
-RemoveFilter=Remove filter
-ChartGenerated=Chart generated
-ChartNotGenerated=Chart not generated
-GeneratedOn=Build on %s
-Generate=Generate
-Duration=Duration
-TotalDuration=Total duration
-Summary=Summary
-DolibarrStateBoard=Statistics
-DolibarrWorkBoard=Work tasks board
-Available=Available
-NotYetAvailable=Not yet available
-NotAvailable=Not available
-Categories=Tags/categories
-Category=Tag/category
-By=By
-From=From
-to=to
-and=and
-or=or
-Other=Other
-Others=Others
-OtherInformations=Other informations
-Quantity=Quantity
-Qty=Qty
-ChangedBy=Changed by
-ApprovedBy=Approved by
-ApprovedBy2=Approved by (second approval)
-Approved=Approved
-Refused=Refused
-ReCalculate=Recalculate
-ResultKo=Failure
-Reporting=Reporting
-Reportings=Reporting
-Draft=Draft
 Drafts=Entwurf
-Validated=Validated
-Opened=Opened
-New=New
-Discount=Discount
-Unknown=Unbekannt
-General=General
-Size=Size
-Received=Received
-Paid=Paid
-Topic=Subject
-ByCompanies=By third parties
-ByUsers=By users
-Links=Links
-Link=Link
-Rejects=Rejects
-Preview=Preview
-NextStep=Next step
-Datas=Data
-None=None
-NoneF=None
 Late=Versätet
-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.
-Photo=Picture
-Photos=Pictures
-AddPhoto=Add picture
-DeletePicture=Picture delete
-ConfirmDeletePicture=Confirm picture deletion?
-Login=Login
-CurrentLogin=Current login
-EnterLoginDetail=Enter login details
 January=Jänner
-February=February
-March=March
-April=April
-May=May
-June=June
-July=July
-August=August
-September=September
-October=October
-November=November
-December=December
-JanuaryMin=Jan
-FebruaryMin=Feb
-MarchMin=Mar
-AprilMin=Apr
-MayMin=May
-JuneMin=Jun
-JulyMin=Jul
-AugustMin=Aug
-SeptemberMin=Sep
-OctoberMin=Oct
-NovemberMin=Nov
-DecemberMin=Dec
 Month01=Jänner
-Month02=February
-Month03=March
-Month04=April
-Month05=May
-Month06=June
-Month07=July
-Month08=August
-Month09=September
-Month10=October
-Month11=November
-Month12=December
-MonthShort01=Jan
-MonthShort02=Feb
-MonthShort03=Mar
-MonthShort04=Apr
-MonthShort05=May
-MonthShort06=Jun
-MonthShort07=Jul
-MonthShort08=Aug
-MonthShort09=Sep
-MonthShort10=Oct
-MonthShort11=Nov
-MonthShort12=Dec
-AttachedFiles=Attached files and documents
-FileTransferComplete=File was uploaded successfuly
-DateFormatYYYYMM=YYYY-MM
-DateFormatYYYYMMDD=YYYY-MM-DD
-DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
 ReportName=Berichtname
-ReportPeriod=Report period
-ReportDescription=Description
-Report=Report
-Keyword=Keyword
-Origin=Origin
-Legend=Legend
-Fill=Fill
-Reset=Reset
-File=File
-Files=Files
-NotAllowed=Not allowed
-ReadPermissionNotAllowed=Read permission not allowed
-AmountInCurrency=Amount in %s currency
-Example=Example
-Examples=Examples
-NoExample=No example
-FindBug=Report a bug
-NbOfThirdParties=Number of third parties
-NbOfLines=Number of lines
-NbOfObjects=Number of objects
-NbOfObjectReferers=Number of related items
-Referers=Related items
-TotalQuantity=Total quantity
-DateFromTo=From %s to %s
-DateFrom=From %s
-DateUntil=Until %s
-Check=Check
-Uncheck=Uncheck
-Internal=Internal
-External=External
-Internals=Internal
-Externals=External
-Warning=Warning
-Warnings=Warnings
-BuildDoc=Build Doc
-Entity=Environment
-Entities=Entities
-CustomerPreview=Customer preview
-SupplierPreview=Supplier preview
-ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show supplier preview
 RefCustomer=Kunden Nr.
-Currency=Currency
-InfoAdmin=Information for administrators
-Undo=Undo
-Redo=Redo
-ExpandAll=Expand all
-UndoExpandAll=Undo expand
-Reason=Reason
-FeatureNotYetSupported=Feature not yet supported
-CloseWindow=Close window
-Response=Response
-Priority=Priority
 SendByMail=Per E-Mail senden
 MailSentBy=E-Mail-Absender
 TextUsedInTheMessageBody=E-Mail-Text
-SendAcknowledgementByMail=Send confirmation email
-EMail=E-mail
 NoEMail=Keine E-Mails
-Email=Email
-NoMobilePhone=No mobile phone
-Owner=Owner
-FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
-Refresh=Refresh
-BackToList=Back to list
-GoBack=Go back
-CanBeModifiedIfOk=Can be modified if valid
-CanBeModifiedIfKo=Can be modified if not valid
-ValueIsValid=Value is valid
-ValueIsNotValid=Value is not valid
-RecordCreatedSuccessfully=Record created successfully
-RecordModifiedSuccessfully=Record modified successfully
-RecordsModified=%s record modified
-RecordsDeleted=%s record deleted
-AutomaticCode=Automatic code
-FeatureDisabled=Feature disabled
-MoveBox=Move widget
 Offered=Angeboten
-NotEnoughPermissions=You don't have permission for this action
-SessionName=Session name
-Method=Method
 Receive=Erhalte
-CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
-ExpectedValue=Expected Value
-CurrentValue=Current value
-PartialWoman=Partial
-TotalWoman=Total
-NeverReceived=Never received
-Canceled=Canceled
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
-Color=Color
-Documents=Linked files
-Documents2=Documents
-UploadDisabled=Upload disabled
-MenuECM=Documents
-MenuAWStats=AWStats
-MenuMembers=Members
-MenuAgendaGoogle=Google agenda
 ThisLimitIsDefinedInSetup=Gesetzte System-Limits (Menü Home-Einstellungen-Sicherheit): %s Kb, PHP Limit: %s Kb
-NoFileFound=No documents saved in this directory
-CurrentUserLanguage=Current language
-CurrentTheme=Current theme
-CurrentMenuManager=Current menu manager
-Browser=Browser
-Layout=Layout
-Screen=Screen
-DisabledModules=Disabled modules
-For=For
-ForCustomer=For customer
-Signature=Signature
-DateOfSignature=Date of signature
-HidePassword=Show command with password hidden
 UnHidePassword=Passwort-Zeichen anzeigen
-Root=Root
-Informations=Informations
-Page=Page
-Notes=Notes
-AddNewLine=Add new line
-AddFile=Add file
-FreeZone=Free entry
-FreeLineOfType=Free entry of type
 CloneMainAttributes=Duplikat mit den Haupteigenschaften
-PDFMerge=PDF Merge
-Merge=Merge
-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 application at the moment.
-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
-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.
-AccordingToGeoIPDatabase=(according to GeoIP convertion)
-Line=Line
-NotSupported=Not supported
-RequiredField=Required field
-Result=Result
-ToTest=Test
-ValidateBefore=Card must be validated before using this feature
-Visibility=Visibility
-Private=Private
-Hidden=Hidden
-Resources=Resources
-Source=Source
-Prefix=Prefix
-Before=Before
-After=After
-IPAddress=IP address
-Frequency=Frequency
-IM=Instant messaging
-NewAttribute=New attribute
 AttributeCode=Attribut-Code
-URLPhoto=URL of photo/logo
-SetLinkToAnotherThirdParty=Link to another third party
-LinkTo=Link to
-LinkToProposal=Link to proposal
-LinkToOrder=Link to order
-LinkToInvoice=Link to invoice
-LinkToSupplierOrder=Link to supplier order
-LinkToSupplierProposal=Link to supplier proposal
-LinkToSupplierInvoice=Link to supplier invoice
-LinkToContract=Link to contract
-LinkToIntervention=Link to intervention
 CreateDraft=Erstelle Entwurf
-SetToDraft=Back to draft
-ClickToEdit=Click to edit
-ObjectDeleted=Object %s deleted
-ByCountry=By country
-ByTown=By town
-ByDate=By date
-ByMonthYear=By month/year
-ByYear=By year
-ByMonth=By month
-ByDay=By day
-BySalesRepresentative=By sales representative
-LinkedToSpecificUsers=Linked to a particular user contact
-NoResults=No results
-AdminTools=Admin tools
-SystemTools=System tools
-ModulesSystemTools=Modules tools
-Test=Test
-Element=Element
 NoPhotoYet=Es wurde noch kein Bild hochgeladen
-Dashboard=Dashboard
-MyDashboard=My dashboard
-Deductible=Deductible
-from=from
-toward=toward
-Access=Access
-SelectAction=Select action
-HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
-SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
-OriginFileName=Original filename
-SetDemandReason=Set source
-SetBankAccount=Define Bank Account
-AccountCurrency=Account Currency
-ViewPrivateNote=View notes
-XMoreLines=%s line(s) hidden
-PublicUrl=Public URL
-AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
-PrintFile=Print File %s
-ShowTransaction=Show entry on bank account
-GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
-Deny=Deny
-Denied=Denied
-ListOfTemplates=List of templates
-Gender=Gender
-Genderman=Man
-Genderwoman=Woman
 ViewList=Liste anzeigen
-Mandatory=Mandatory
-Hello=Hello
-Sincerely=Sincerely
-DeleteLine=Delete line
-ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
-NoRecordSelected=No record selected
-MassFilesArea=Area for files built by mass actions
-ShowTempMassFilesArea=Show area of files built by mass actions
-RelatedObjects=Related Objects
-ClassifyBilled=Classify billed
-Progress=Progress
-ClickHere=Click here
-FrontOffice=Front office
-BackOffice=Back office
-View=View
-Export=Export
-Exports=Exports
-ExportFilteredList=Export filtered list
-ExportList=Export list
-Miscellaneous=Miscellaneous
 Calendar=Kalender
-GroupBy=Group by...
-ViewFlatList=View flat list
-RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Direct download link
-Download=Download
-ActualizeCurrency=Update currency rate
-Fiscalyear=Fiscal year
-# Week day
-Monday=Monday
-Tuesday=Tuesday
-Wednesday=Wednesday
-Thursday=Thursday
-Friday=Friday
-Saturday=Saturday
-Sunday=Sunday
-MondayMin=Mo
-TuesdayMin=Tu
-WednesdayMin=We
-ThursdayMin=Th
-FridayMin=Fr
-SaturdayMin=Sa
-SundayMin=Su
-Day1=Monday
-Day2=Tuesday
-Day3=Wednesday
-Day4=Thursday
-Day5=Friday
-Day6=Saturday
-Day0=Sunday
-ShortMonday=M
-ShortTuesday=T
-ShortWednesday=W
-ShortThursday=T
-ShortFriday=F
-ShortSaturday=S
-ShortSunday=S
-SelectMailModel=Select email template
-SetRef=Set ref
-Select2ResultFoundUseArrows=Some results found. Use arrows to select.
-Select2NotFound=No result found
-Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
-Select2LoadingMoreResults=Loading more results...
-Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
-SearchIntoContacts=Contacts
-SearchIntoMembers=Members
-SearchIntoUsers=Users
-SearchIntoProductsOrServices=Products or services
-SearchIntoProjects=Projects
-SearchIntoTasks=Tasks
-SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
-SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
-SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
 SearchIntoInterventions=Eingriffe
-SearchIntoContracts=Contracts
-SearchIntoCustomerShipments=Customer shipments
-SearchIntoExpenseReports=Expense reports
-SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/de_AT/paypal.lang b/htdocs/langs/de_AT/paypal.lang
index 051b980ecc1..341fdf56696 100644
--- a/htdocs/langs/de_AT/paypal.lang
+++ b/htdocs/langs/de_AT/paypal.lang
@@ -11,8 +11,6 @@ PAYPAL_CSS_URL=optionale Url eines CSS style sheets auf der Payment-Seite
 ThisIsTransactionId=Dies ist id Geschäftsart: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Fügen Sie die URL der Paypal Zahlung, wenn Sie ein Dokument per E-Mail senden
 YouAreCurrentlyInSandboxMode=Sie befinden sich derzeit im "Sandkasten-Modus"
-NewPaypalPaymentReceived=Paypal Eingang erhalten
-NewPaypalPaymentFailed=Paypal-Zahlungsvorgang ist fehlgeschlagen
 ReturnURLAfterPayment=Rückkehr zur URL nach der Zahlung
 DetailedErrorMessage=genaue Fehlermeldung
 ShortErrorMessage=kurze Fehlermeldung
diff --git a/htdocs/langs/de_CH/accountancy.lang b/htdocs/langs/de_CH/accountancy.lang
index 64ddac1527b..95c98153fff 100644
--- a/htdocs/langs/de_CH/accountancy.lang
+++ b/htdocs/langs/de_CH/accountancy.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - accountancy
 MenuAccountancy=Rechnungswesen
-AccountingCategory=Accounting category
 Vide=Id. Prof. 6
diff --git a/htdocs/langs/de_CH/admin.lang b/htdocs/langs/de_CH/admin.lang
index bab02cc82a6..89ca7ecc041 100644
--- a/htdocs/langs/de_CH/admin.lang
+++ b/htdocs/langs/de_CH/admin.lang
@@ -1,1640 +1,215 @@
 # Dolibarr language file - Source file is en_US - admin
 Foundation=Verein
-Version=Version
-VersionProgram=Programmversion
 VersionLastInstall=Erste installierte Version
 VersionLastUpgrade=Version der letzten Aktualisierung
-VersionExperimental=Experimentell
-VersionDevelopment=Entwicklung
-VersionUnknown=Unbekannt
-VersionRecommanded=Empfohlen
-FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. Value of some setup constants may also be checked. You can use this tool to detect if some files were modified by a hacker for example.
-FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
-GlobalChecksum=Global checksum
-MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
-LocalSignature=Embedded local signature (less reliable)
-RemoteSignature=Remote distant signature (more reliable)
-FilesMissing=Fehlende Dateien
-FilesUpdated=Dateien ersetzt
-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
-XmlNotFound=Xml Integrity File of application not found
-SessionId=ID Session
-SessionSaveHandler=Handler für Sitzungsspeicherung
-SessionSavePath=Pfad für Sitzungsdatenspeicherung
-PurgeSessions=Bereinigung von Sessions
-ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
-NoSessionListWithThisHandler=Anzeige der aktiven Sitzungen mit Ihrer PHP-Konfiguration nicht möglich.
-LockNewSessions=Keine neuen Sitzungen zulassen
-ConfirmLockNewSessions=Möchten Sie wirklich alle Sitzungen bis auf Ihre eigene blocken? Nur Benutzer <b>%s</b> kann danach noch eine Verbindung aufbauen.
-UnlockNewSessions=Sperrung neuer Sitzungen aufheben
-YourSession=Ihre Sitzung
-Sessions=Benutzer-Sessions
-WebUserGroup=WebServer Benutzer/Gruppen
-NoSessionFound=Ihre PHP -Konfiguration scheint keine Liste aktiver Sitzungen zuzulassen. Eventuell ist die Speicherung im Verzeichnis (<b>%s</b>) aktiviert und fehlerhafte Dateizugriffsberechtigungen blockieren den Zugriff (z.B. open_basedir-Beschränkungen).
-DBStoringCharset=Zeichensatz der Datenbank-Speicherung
-DBSortingCharset=Zeichensatz der Datenbank-Sortierung
-WarningModuleNotActive=Modul <b>%s</b> muss aktiviert sein
-WarningOnlyPermissionOfActivatedModules=Achtung, hier werden nur Berechtigungen im Zusammenhang mit aktivierten Module angezeigt. Weitere Module können Sie unter Start->Einstellungen-Module aktivieren.
-DolibarrSetup=dolibarr Installation oder Upgrade
-InternalUser=Interner Benutzer
-ExternalUser=Externer Benutzer
-InternalUsers=Interne Benutzer
-ExternalUsers=Externe Benutzer
-GUISetup=Anzeige
-SetupArea=Einstellungen - Übersicht
 FormToTestFileUploadForm=Formular für das Testen von Datei-Uplads (je nach Konfiguration)
-IfModuleEnabled=Anmerkung: Ist nur wirksam wenn Modul <b>%s</b> aktiviert ist
-RemoveLock=Entfernen Sie die Datei <b>%s</b> falls vorhanden, um das Aktualisierungs-Tool auszuführen
-RestoreLock=Ersetzen Sie die Datei <b>%s</b> mit einer Datei ohne Schreibberechtigung um jegliche Nutzung des Aktualisierungs-Tools zu verhindern.
-SecuritySetup=Sicherheitseinstellungen
 SecurityFilesDesc=Sicherheitseinstellungen für den Dateiupload definieren.
 ErrorModuleRequirePHPVersion=Fehler: Dieses Modul benötigt PHP Version %s oder höher
 ErrorModuleRequireDolibarrVersion=Fehler: Dieses Moduls erfordert Dolibarr Version %s oder höher
-ErrorDecimalLargerThanAreForbidden=Fehler: Eine höhere Genauigkeit als <b>%s</b> wird nicht unterstützt.
 DictionarySetup=Wörterbuch Einstellungen
 Dictionary=Wörterbücher
-ErrorReservedTypeSystemSystemAuto=Die Werte 'system' und 'systemauto' für Typ sind reserviert. Sie können 'user' als Wert verwenden, um Ihren eigenen Datensatz hinzuzufügen
 ErrorCodeCantContainZero=Code darf keinen Wert 0 enthalten
-DisableJavascript=JavaScript- und Ajax-Funktionen deaktivieren (empfohlen für Blinde und Text-Browser)
 UseSearchToSelectCompanyTooltip=Wenn Sie eine grosse Anzahl von Geschäftspartnern (> 100'000) haben, können Sie die Geschwindigkeit verbessern, indem Sie in Einstellungen -> Andere die Konstante COMPANY_DONOTSEARCH_ANYWHERE auf 1 setzen. Die Suche startet dann am Beginn des Strings.
 UseSearchToSelectContactTooltip=Wenn Sie eine grosse Anzahl von Kontakten (> 100.000) haben, können Sie die Geschwindigkeit verbessern, indem Sie in Einstellungen -> Andere die Konstante CONTACT_DONOTSEARCH_ANYWHERE auf 1 setzen. Die Suche startet dann am Beginn des Strings.
-DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties, but it is less convenient)
-DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact, but it is less convenient)
-NumberOfKeyToSearch=Anzahl der Buchstaben um eine Suche auszulösen: %s
-NotAvailableWhenAjaxDisabled=Nicht verfügbar, wenn Ajax deaktiviert
-AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
-JavascriptDisabled=JavaScript deaktiviert
-UsePreviewTabs=Vorschautabs verwenden
-ShowPreview=Vorschau anzeigen
-PreviewNotAvailable=Vorschau nicht verfügbar
-ThemeCurrentlyActive=derzeit aktivierte grafische Oberfläche
-CurrentTimeZone=Aktuelle Zeitzone des PHP-Servers
-MySQLTimeZone=Aktuelle Zeitzone von MySql (Datenbank)
-TZHasNoEffect=Daten werden vom Datenbank-Server gespeichert und zurückgeliefert, als würde der eingegebene String abgelegt werden. Die Zeitzone hat nur dann eine Auswirkung, wenn die UNIX_TIMESTAMP-Funktion benutzt wird (Dolibarr nutzt diese nicht, daher sollte die Datenbank-TZ keine Rolle spielen, selbst wenn diese nach Dateneingabe geändert wird).
 Space=Raum
-Table=Tabelle
-Fields=Felder
-Index=Index
-Mask=Maske
-NextValue=Nächster Wert
-NextValueForInvoices=Nächster Wert (Rechnungen)
-NextValueForCreditNotes=Nächster Wert (Gutschriften)
-NextValueForDeposit=Nächster Wert (Scheck)
-NextValueForReplacements=Nächster Wert (Ersatz)
 MustBeLowerThanPHPLimit=Hinweis: Ihre PHP-Einstellungen beschränken die Grösse für Dateiuploads auf <b>%s</b>%s
 NoMaxSizeByPHPLimit=Hinweis: In Ihren PHP-Einstellungen sind keine Grössenbeschränkungen hinterlegt
 MaxSizeForUploadedFiles=Maximale Grösse für Dateiuploads (0 verbietet jegliche Uploads)
-UseCaptchaCode=Captcha-Code auf der Anmeldeseite verwenden
-AntiVirusCommand= Vollständiger Pfad zum installierten Virenschutz
-AntiVirusCommandExample= Beispiel für ClamWin: c:\\Program Files (x86)\\ClamWin\\bin\\clamscan.exe <br>Beispiel für ClamAV: /usr/bin/clamscan
-AntiVirusParam= Weitere Parameter auf der Kommandozeile
-AntiVirusParamExample= Beispiel für ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
-ComptaSetup=Buchhaltungsmoduls-Einstellungen
-UserSetup=Benutzerverwaltung Einstellungen
+AntiVirusCommandExample=Beispiel für ClamWin: c:\\Program Files (x86)\\ClamWin\\bin\\clamscan.exe <br>Beispiel für ClamAV: /usr/bin/clamscan
+AntiVirusParamExample=Beispiel für ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 MultiCurrencySetup=Mehrfachwährungen konfigurieren
-MenuLimits=Genauigkeit - Toleranz
 MenuIdParent=Eltern-Menü-ID
-DetailMenuIdParent=ID des übergeordneten Menüs (0 für einen Eltern-Menü)
 DetailPosition=Reihungsnummer für definition der Menüposition
-AllMenus=Alle
-NotConfigured=Nicht konfiguriert
-Active=Aktiv
-SetupShort=Einstellungen
-OtherOptions=Andere Optionen
-OtherSetup=Andere Einstellungen
-CurrentValueSeparatorDecimal=Dezimaltrennzeichen
-CurrentValueSeparatorThousand=Tausendertrennzeichen
-Destination=Ziel
-IdModule=Modul ID
-IdPermissions=Berechtigungs-ID
-Modules=Module
-LanguageBrowserParameter=Parameter %s
-LocalisationDolibarrParameters=Länderspezifische Parameter
-ClientTZ=Zeitzone Kunde (Benutzer)
-ClientHour=Uhrzeit (Benutzer)
-OSTZ=Zeitzone des Serverbetriebssystems
-PHPTZ=Zeitzone der PHP-Version
-DaylingSavingTime=Sommerzeit (Benutzer)
-CurrentHour=PHP-Zeit (Server)
-CurrentSessionTimeOut=Aktuelle Session timeout
-YouCanEditPHPTZ=Um eine andere PHP-Zeitzone zu setzen (nicht erforderlich), können Sie versuchen, eine .htaccess-Datei mit einer Zeile wie  "SetEnv TZ Europe / Paris" hinzuzufügen.
-Box=Box
-Boxes=Boxen
 MaxNbOfLinesForBoxes=Maximale Zeilenanzahl für Boxen
-PositionByDefault=Standardposition
-Position=Position
 MenusDesc=In der Menüverwaltung können Sie den Inhalt der beiden Menüleisten (Horizontal und Vertikal) festlegen
 MenusEditorDesc=Über den Menü-Editor können Sie Ihre Menüeinträge personalisieren. Gehen Sie dabei sorgfältig vor um die Stabilität des Systems zu gewährleisten und zu verhindern, dass einzelne Module gänzlich unerreichbar werden.<br>Einige Module erzeugen einen Menüeintrag (in den meisten Fällen im Menü <b>Alle</b>). Sollten Sie einen oder mehrere dieser Einträge unabsichtlich entfernt haben, können Sie diese durch das Deaktivieren und neuerliche Aktivieren des Moduls beheben.
-MenuForUsers=Benutzermenü
-LangFile=Datei .lang
-System=System
-SystemInfo=Systeminformationen
-SystemToolsArea=Systemwerkzeugsübersicht
-SystemToolsAreaDesc=In diesem Bereich finden Sie die Verwaltungsfunktionen. Verwenden Sie das linke Menü zur Auswahl der gesuchten Funktion.
-Purge=Säubern
 PurgeAreaDesc=Hier können Sie alle vom System erzeugten und gespeicherten Dateien löschen (temporäre Dateien oder alle Dateien im Verzeichnis <b>%s</b>). Diese Funktion ist richtet sich vorwiegend an Benutzer ohne Zugriff auf das Dateisystem des Webservers (z.B. Hostingpakete)
 PurgeDeleteLogFile=Löschen der Protokolldatei <b>%s</b> des Systemprotokollmoduls (kein Risiko des Datenverlusts)
 PurgeDeleteTemporaryFiles=Alle temporären Dateien löschen (kein Datenverlustrisiko)
 PurgeDeleteTemporaryFilesShort=Temporärdateien löschen
 PurgeDeleteAllFilesInDocumentsDir=Alle Datein im Verzeichnis <b>%s</b> löschen. Dies beinhaltet temporäre Dateien ebenso wie Datenbanksicherungen, Dokumente (Geschäftspartner, Rechnungen, ...) und alle Inhalte des ECM-Moduls.
-PurgeRunNow=Jetzt bereinigen
 PurgeNothingToDelete=Keine zu löschenden Verzeichnisse oder Dateien
-PurgeNDirectoriesDeleted=<b>%s</b> Dateien oder Verzeichnisse gelöscht.
-PurgeAuditEvents=Bereinige alle Sicherheitsereignisse
-ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
-GenerateBackup=Sicherung erzeugen
-Backup=Sichern
-Restore=Wiederherstellen
-RunCommandSummary=Die Sicherung wird über folgenden Befehl ausgeführt
-BackupResult=Sicherung Ergebnisse
-BackupFileSuccessfullyCreated=Sicherungsdatei erfolgreich erzeugt
-YouCanDownloadBackupFile=Sie können die erstellte Sicherungsdatei jetzt herunterladen
-NoBackupFileAvailable=Keine verfügbare Sicherungsdatei
 ExportMethod=Export-Methode
 ImportMethod=Import-Methode
-ToBuildBackupFileClickHere=Um eine Sicherungsdatei zu erstellen klicken Sie bitte <a href="%s">hier</a>.
-ImportMySqlDesc=Zum Wiederherstellen einer Sicherungsdatei müssen Sie folgenden MySql Befehl über die Kommandozeile ausführen:
-ImportPostgreSqlDesc=Zum Wiederherstellen einer Sicherungsdatei müssen Sie folgenden pg_restore Befehl über die Kommandozeile ausführen:
-ImportMySqlCommand=%s %s < mybackupfile.sql
-ImportPostgreSqlCommand=%s %s mybackupfile.sql
-FileNameToGenerate=Name der zu erstellenden Datei
-Compression=Komprimierung
-CommandsToDisableForeignKeysForImport=Befehl, um Fremdschlüssel beim Import zu deaktivieren
-CommandsToDisableForeignKeysForImportWarning=Zwingend erforderlich, wenn Sie den SQL-Dump später wiederherstellen möchten
-ExportCompatibility=Kompatibilität der erzeugten Exportdatei
-MySqlExportParameters=MySQL-Exportparameter
-PostgreSqlExportParameters= PostgreSQL Export-Parameter
-UseTransactionnalMode=Transaktionsmodus verwenden
-FullPathToMysqldumpCommand=Vollständiger Pfad zum mysqldump-Befehl
-FullPathToPostgreSQLdumpCommand=Vollständiger Pfad zum pg_dump-Befehl
-ExportOptions=Exportoptionen
-AddDropDatabase=DROP DATABASE Befehl hinzufügen
-AddDropTable=DROP TABLE Befehl hinzufügen
-ExportStructure=Struktur
-NameColumn=Name der Spalten
-ExtendedInsert=Erweiterte INSERTS
-NoLockBeforeInsert=Keine Sperrebefehle für INSERT
-DelayedInsert=Verzögerte INSERTS
-EncodeBinariesInHexa=Hexadezimal-Verschlüsselung für Binärdateien
-IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
-AutoDetectLang=Automatische Erkennung (Browser-Sprache)
-FeatureDisabledInDemo=Funktion in der Demoversion deaktiviert
-FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Berechtigungen
 BoxesDesc=Boxen sind auf manchen Seiten angezeigte Informationsbereiche. Sie können die Anzeige einer Box einstellen, indem Sie auf die Zielseite klicken und 'Aktivieren' wählen. Zum Ausblenden einer Box klicken Sie einfach auf den Papierkorb.
-OnlyActiveElementsAreShown=Nur Elemente aus <a href="%s">aktiven Module</a> werden angezeigt.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=Sie finden weitere Module auf externen Websites
-ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external modules...
-GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
-DoliStoreDesc=DoliStore, der offizielle Marktplatz für dolibarr Module/Erweiterungen
 DoliPartnersDesc=Unternehmensliste, die Zusatzmodule oder Funktionen entwicklen können. (Hinweis: Alle Entwickler mit PHP Kentinissen können Dolibarr erweitern)
 WebSiteDesc=Webseite für die Suche nach weiteren Modulen
-URL=Link
-BoxesAvailable=Verfügbare Boxen
 BoxesActivated=Aktivierte Boxen
-ActivateOn=Aktiv ab
-ActiveOn=Aktiviert am
-SourceFile=Quelldatei
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=Nur bei aktiviertem JavaScript und AJAX verfügbar
-Required=Erforderlich
-UsedOnlyWithTypeOption=verwendet nur von einigen Agenda-Optionen
-Security=Sicherheit
-Passwords=Passwörter
-DoNotStoreClearPassword=Passwörter in der Datenbank nicht im Klartext speichern (Empfohlene Einstellung)
-MainDbPasswordFileConfEncrypted=Datenbankpasswort in der Konfigurationsdatei verschlüsselt speichern (Empfohlene Einstellung)
-InstrucToEncodePass=Um das Kennwort in der Konfigurationsdatei <b>conf.php</b> verschlüsselt zu speichern, ersetzen Sie die Zeile <br><b>$dolibarr_main_db_pass="...";</b><br>durch<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
-InstrucToClearPass=Um das Kennwort unverschlüsselt (im Klartext) in der Konfigurationsdatei <b>conf.php</b> zu speichern, ersetzen Sie die Zeile<br><b>$dolibarr_main_db_pass="crypted:...";</b><br>durch<br><b>$dolibarr_main_db_pass="%s";</b>
-ProtectAndEncryptPdfFiles=PDF-Dokumentschutz aktivieren (Die Aktivierung ist nicht empfohlen, weil dadurch die Stapelerzeugung von PDFs nicht mehr funktioniert)
-ProtectAndEncryptPdfFilesDesc=Die Aktivierung des PDF-Dokumentschutzes erhält die Lesbarkeit und Druckfähigkeit des Dokuments, Bearbeitung und Kopien sind jedoch nicht mehr möglich. Bitte beachten Sie, dass über die Aktivierung dieser Funktion auch die Stapelverarbeitung von PDF-Dokumenten (z.B. aller offenen Rechnungen) nicht mehr funktioniert
-Feature=Funktion
-DolibarrLicense=Lizenz
-Developpers=Entwickler/Mitwirkende
 OfficialWebSite=Offizielle Website
-OfficialWebSiteLocal=Lokale Webseite (%s)
-OfficialWiki=Dolibarr Wiki
-OfficialDemo=Dolibarr Offizielle Demo
-OfficialMarketPlace=Offizieller Marktplatz für Module/Erweiterungen
-OfficialWebHostingService=Offizielle Web-Hosting-Services (Cloud Hosting)
 ReferencedPreferredPartners=Bevorzugte Geschäftspartner
-OtherResources=Andere Ressourcen
-ForDocumentationSeeWiki=Für Benutzer-und Entwickler-Dokumentation (DOC, ...), FAQs <br> Werfen Sie einen Blick auf die Dolibarr Wiki: <br> <a href="%s" target="_blank"><b> %s</b></a>
 ForAnswersSeeForum=Für alle anderen Fragen / Hilfe, können Sie die Dolibarr Forum: <br> <a href="%s" target="_blank"><b> %s</b></a>
 HelpCenterDesc1=In diesem Bereich können Sie sich ein Hilfe-Support-Service auf Dolibarr.
-HelpCenterDesc2=Ein Teil dieses Dienstes sind <b>nur</b> in <b>Englisch</b> verfügbar.
-CurrentMenuHandler=Aktuelle Menü-Handler
 MeasuringUnit=Masseinheit
-LeftMargin=Left margin
-TopMargin=Top margin
-PaperSize=Paper type
-Orientation=Orientation
-SpaceX=Space X
-SpaceY=Space Y
-FontSize=Font size
-Content=Content
-NoticePeriod=Kündigungsfrist
-NewByMonth=New by month
-Emails=E-Mails
-EMailsSetup=E-Mail-Adressen einrichten
-EMailsDesc=Auf dieser Seite können Sie Ihre PHP-Parameter für den E-Mail-Versand überschreiben. In den meisten Unix/Linux-Umgebungen mit korrekter PHP-Konfiguration sind diese Einstellungen nutzlos.
 MAIN_MAIL_SMTP_PORT=SMTP-Port (standardmässig in der php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_SERVER=SMTP-Host (standardmässig in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS-Port (nicht in PHP definiert in Unix-Umgebungen)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP-Host (nicht in PHP definiert auf Unix-Umgebungen)
 MAIN_MAIL_EMAIL_FROM=E-Mail-Absender für automatisch erzeugte Mails (standardmässig in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=E-Mail-Absender für rückkehrende fehlerhafte E-Mails
-MAIN_MAIL_AUTOCOPY_TO= Senden Sie automatisch eine Blindkopie aller gesendeten Mails an
-MAIN_DISABLE_ALL_MAILS=Alle E-Mail-Funktionen abschalten (für Test- oder Demozwecke)
-MAIN_MAIL_SENDMODE=Methode zum Senden von E-Mails
-MAIN_MAIL_SMTPS_ID=SMTP ID, wenn Authentifizierung erforderlich
-MAIN_MAIL_SMTPS_PW=SMTP Passwort, wenn Authentifizierung erforderlich
-MAIN_MAIL_EMAIL_TLS= TLS (SSL)-Verschlüsselung verwenden
-MAIN_MAIL_EMAIL_STARTTLS= TLS (STARTTLS) Verschlüsselung verwenden
-MAIN_DISABLE_ALL_SMS=Alle SMS-Funktionen abschalten (für Test- oder Demozwecke)
-MAIN_SMS_SENDMODE=Methode zum Senden von SMS
-MAIN_MAIL_SMS_FROM=Standard Versendetelefonnummer der SMS-Funktion
-MAIN_MAIL_DEFAULT_FROMTYPE=Sender e-mail by default for manual sendings (User email or Company email)
-UserEmail=User email
-CompanyEmail=Company email
-FeatureNotAvailableOnLinux=Diese Funktion ist auf Unix-Umgebungen nicht verfügbar. Testen Sie Ihr Programm sendmail lokal.
+MAIN_MAIL_EMAIL_STARTTLS=TLS (STARTTLS) Verschlüsselung verwenden
 SubmitTranslation=Wenn die Übersetzung der Sprache unvollständig ist oder wenn Sie Fehler finden, können Sie können Sie die entsprechenden Sprachdateien im Verzeichnis <b>langs/%s</b> korrigieren und und anschliessend Ihre Änderungen unter  www.transifex.com/dolibarr-association/dolibarr/ teilen.
 SubmitTranslationENUS=Sollte die Übersetzung für eine Sprache nicht vollständig sein oder Fehler beinhalten, können Sie die entsprechenden Sprachdateien im Verzeichnis <b>langs/%s</b>  bearbeiten und anschliessend Ihre Änderungen an dolibarr.org/forum oder für Entwickler auf github.com/Dolibarr/dolibarr. übertragen.
-ModuleSetup=Moduleinstellung
-ModulesSetup=Moduleinstellungen
-ModuleFamilyBase=System
 ModuleFamilyCrm=Kundenverwaltung (CRM)
 ModuleFamilySrm=Lieferantenverwaltung (SRM)
-ModuleFamilyProducts=Products Management (PM)
-ModuleFamilyHr=Personalverwaltung (PM)
-ModuleFamilyProjects=Projektverwaltung/Zusammenarbeit
-ModuleFamilyOther=Andere
-ModuleFamilyTechnic=Multi-Module Werkzeuge
-ModuleFamilyExperimental=Experimentelle Module
-ModuleFamilyFinancial=Finanzmodule (Rechnungswesen/Finanzen)
-ModuleFamilyECM=Inhaltsverwaltung (ECM)
-ModuleFamilyPortal=Websites und weitere Frontal-Anwendung
-ModuleFamilyInterface=Schnittstellen zu externen Systemen
-MenuHandlers=Menü-Handler
-MenuAdmin=Menü-Editor
-DoNotUseInProduction=Nicht in Produktion nutzen
-ThisIsProcessToFollow=This is steps to process:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
-StepNb=Schritt %s
-FindPackageFromWebSite=Finden Sie ein Paket, das die gewünschten Funktionen beinhaltet (zum Beispiel auf der offiziellen Website %s).
-DownloadPackageFromWebSite=Installationspaket herunterladen (z.B. von offizieller Webseite %s).
-UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <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>.
-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='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
-YouCanSubmitFile=Durch diesen Schritt, können Sie das Paket mit diesem Tool senden: Wähle Modul Datei
-CurrentVersion=Aktuelle dolibarr-Version
 CallUpdatePage=Zur Aktualisierung der Daten und der Datenbankstruktur gehen Sie zur Seite %s.
-LastStableVersion=Letzte stabile Version
-LastActivationDate=Latest activation date
-UpdateServerOffline=Update-Server offline
 GenericMaskCodes=Sie können ein beliebiges Numerierungsschema wählen. Dieses Schema könnte z.B. so aussehen:<br><b>{000000}</b> steht für eine 6-stellige Nummer, die sich bei jedem neuen %s automatisch erhöht. Wählen Sie die Anzahl der Nullen je nach gewünschter Nummernlänge. Der Zähler füllt sich automatisch bis zum linken Ende mit Nullen um das gewünschte Format abzubilden. <br><b>{000000+000}</b> führt zu einem ähnlichen Ergebnis, allerdings mit einem Wertsprung in Höhe des Werts rechts des Pluszeichens, der beim ersten %s angewandt wird. <br><b>{000000@x}</b> wie zuvor, jedoch stellt sich der Zähler bei Erreichen des Monats x (zwischen 1 und 12) automatisch auf 0 zurück. Ist diese Option gewählt und x hat den Wert 2 oder höher, ist die Folge {mm}{yy} or {mm}{yyyy} ebenfalls erfoderlich. <br><b>{dd}</b> Tag (01 bis 31).<br><b>{mm}</b> Monat (01 bis 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> Jahreszahl 1-, 2- oder 4-stellig. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
-GenericMaskCodes3=Alle anderen Zeichen in der Maske bleiben. <br> Leerzeichen sind nicht zulässig. <br>
-GenericMaskCodes4a=<u>Beispiel auf der 99. %s des Dritten thecompany Geschehen 2007-01-31:</u> <br>
 GenericMaskCodes4b=<u>Beispiel für Dritte erstellt am 2007-03-01:</u> <br>
-GenericMaskCodes4c=<u>Beispiel für ein Produkt erstellt am 2007-03-01:</u> <br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> ergibt <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> ergibt <b>0199-ZZZ/31/XXX</b>
-GenericNumRefModelDesc=Liefert eine anpassbare Nummer nach vordefiniertem Schema
-ServerAvailableOnIPOrPort=Server ist verfügbar unter der Adresse <b>%s</b> auf Port <b>%s</b>
-ServerNotAvailableOnIPOrPort=Server nicht verfügbar unter Adresse <b>%s</b> auf Port <b>%s</b>
-DoTestServerAvailability=Serververfügbarkeit testen
-DoTestSend=Test senden
-DoTestSendHTML=HTML-Test senden
-ErrorCantUseRazIfNoYearInMask=Fehler: die Option @ kann nicht benutzt werden, um den Zähler jährlich zurück zu setzen, wenn die Sequenz {yy} oder {yyyy} in der Maske fehlt.
-ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Fehler: Kann Option @ nicht verwenden, wenn Sequenz {mm}{yy} oder {mm}{yyyy} nicht im Schema verwendet werden.
-UMask=Umask Parameter für neue Dateien auf Unix/Linux/BSD-Dateisystemen.
 UMaskExplanation=Über diesen Parameter können Sie die standardmässigen Dateiberechtigungen für vom System erzeugte/verwaltete Inhalte festlegen. <br>Erforderlich ist ein Oktalwert (0666 bedeutet z.B. Lesen und Schreiben für alle). <br>Auf Windows-Umgebungen haben diese Einstellungen keinen Effekt.
-SeeWikiForAllTeam=Werfen Sie einen Blick auf die Wiki-Seite für eine vollständige Liste aller Akteure und deren Organisationen
-UseACacheDelay= Verzögerung für den Export der Cache-Antwort in Sekunden (0 oder leer für kein Caching)
-DisableLinkToHelpCenter=Link mit "<b>Benötigen Sie Hilfe oder Unterstützung</b>" auf der Anmeldeseite ausblenden
-DisableLinkToHelp=Hide link to online help "<b>%s</b>"
-AddCRIfTooLong=Kein automatischer Zeilenumbruch. Entsprechend müssen Sie, falls die Länge Ihrer Zeilen die Dokumentenbreite übersteigt, manuelle Zeilenschaltungen im Textbereich einfügen.
-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...).
-MinLength=Mindestlänge
-LanguageFilesCachedIntoShmopSharedMemory=.lang-Sprachdateien in gemeinsamen Cache geladen
-ExamplesWithCurrentSetup=Beispiele mit der derzeitigen Systemkonfiguration
-ListOfDirectories=Liste der OpenDocument-Vorlagenverzeichnisse
-ListOfDirectoriesForModelGenODT=Liste der Verzeichnisse mit Vorlagendateien mit OpenDocument-Format.<br><br>Fügen Sie hier den vollständigen Pfad der Verzeichnisse ein.<br>Trennen Sie jedes Verzeichnis mit einer Zeilenschaltung<br>Verzeichnisse des ECM-Moduls fügen Sie z.B. so ein <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br> Dateien in diesen Verzeichnissen müssen mit <b>.odt</b>  oder <b>.ods</b> enden.
-NumberOfModelFilesFound=Anzahl der in diesen Verzeichnissen gefundenen .odt/.ods-Dokumentvorlagen
-ExampleOfDirectoriesForModelGen=Beispiele für Syntax:<br>c:\\mydir<br>/Home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
-FollowingSubstitutionKeysCanBeUsed=<br>Lesen Sie die Wiki Dokumentation um zu wissen, wie Sie Ihre odt Dokumentenvorlage erstellen, bevor Sie diese in den Kategorien speichern:
-FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
-FirstnameNamePosition=Reihenfolge von Vor- und Nachname
 DescWeather=Die folgenden Diagramme werden auf der Übersicht Startseite angezeigt, wenn die entsprechenden Toleranzwerte erreicht werden:
-KeyForWebServicesAccess=Schlüssel um Web Services (Parameter "dolibarrkey" in webservices) zu benützen
-TestSubmitForm=Formular Eingabeüberprüfung
-ThisForceAlsoTheme=Bei Verwendung dieser Menü-Verwaltung wird die eigene Layout-Vorlage verwendet unabhängig von der Layout Einstellung des Benutzers. Auch wenn diese Menü-Verwaltung für Smartphones ausgelegt ist kann er nicht auf allen Smartphones angezeigt werden. Verwenden Sie eine andere Menü-Verwaltung, wenn Sie Probleme bemerken.
-ThemeDir=Verzeichnis Layout-Vorlagen
-ConnectionTimeout=Verbindung Timeout
-ResponseTimeout=Antwort Timeout
-SmsTestMessage=Test Nachricht von __PHONEFROM__ zu __PHONETO__
-ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
-SecurityToken=Schlüssel um die URLs zu entschlüsseln
-NoSmsEngine=Kein SMS Sende Manager verfügbar. SMS Sende Manager sind nicht installiert (weil diese von externen Lieferanten abhängig sind) aber Sie können welche auf http://www.dolistore.com finden.
-PDF=PDF
-PDFDesc=Sie können jede globale Optionen im Zusammenhang mit der PDF-Erzeugung einstellen
-PDFAddressForging=Regeln zum Formen der Adresse-Boxen
 HideAnyVATInformationOnPDF=Unterdrücken aller MwSt.-Informationen auf dem generierten PDF
-HideDescOnPDF=Unterdrücke Produktbeschreibungen in generierten PDF
-HideRefOnPDF=Unterdrücke Produkt-Referenzen in generierten PDF
 HideDetailsOnPDF=Unterdrücke Produktzeilen in generierten PDF
 PlaceCustomerAddressToIsoLocation=ISO Position für die Kundenadresse verwenden
-Library=Bibliothek
-UrlGenerationParameters=Parameter zum Sichern von URLs
-SecurityTokenIsUnique=Verwenden Sie einen eindeutigen Sicherheitsschlüssel für jede URL
-EnterRefToBuildUrl=Geben Sie eine Referenz für das Objekt %s ein
-GetSecuredUrl=Holen der berechneten URL
-ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Alter MwSt. Satz
 NewVATRates=Neuer MwSt. Satz
-PriceBaseTypeToChange=Ändern Sie den Basispreis definierte nach
-MassConvert=Starte Massenkonvertierung
-String=Zeichenkette
-TextLong=Langer Text
-Int=Ganzzahl
 Float=Gleitkommazahl
-DateAndTime=Datum und Uhrzeit
-Unique=Einmalig
-Boolean=Boolean (Checkbox)
-ExtrafieldPhone = Telefon
-ExtrafieldPrice = Preis
-ExtrafieldMail = E-Mail
-ExtrafieldUrl = Url
-ExtrafieldSelect = Wähle Liste
-ExtrafieldSelectList = Wähle von Tabelle
-ExtrafieldSeparator=Trennzeichen
-ExtrafieldPassword=Passwort
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox von Tabelle
-ExtrafieldLink=Verknüpftes Objekt
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameterlisten müssen das Format Schlüssel,Wert haben<br><br> zum Beispiel:<br>1,Wert1<br>2,Wert2<br>3,Wert3<br>...
-ExtrafieldParamHelpradio=Parameterlisten müssen das Format Schlüssel,Wert haben<br><br> zum Beispiel:<br>1,Wert1<br>2,Wert2<br>3,Wert3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Verwendete Bibliothek zur PDF-Erzeugung
-WarningUsingFPDF=Achtung: Ihre <b>conf.php</b> enthält <b>$dolibarr_pdf_force_fpdf=1</b> Dies bedeutet, dass Sie die FPDF-Bibliothek verwenden, um PDF-Dateien zu erzeugen. Diese Bibliothek ist alt und unterstützt viele Funktionen nicht (Unicode-, Bild-Transparenz, kyrillische, arabische und asiatische Sprachen, ...), so dass es zu Fehlern bei der PDF-Erstellung kommen kann. <br> Um dieses Problem zu beheben und volle Unterstützung der PDF-Erzeugung zu erhalten, laden Sie bitte die <a href="http://www.tcpdf.org/" target="_blank">TCPDF Bibliothek</a> , dann kommentieren Sie die Zeile <b>$dolibarr_pdf_force_fpdf=1</b> aus oder entfernen diese und fügen statt dessen <b>$dolibarr_lib_TCPDF_PATH='Pfad_zum_TCPDF_Verzeichnisr'</b> ein
-LocalTaxDesc=In einigen Ländern gelten zwei oder drei Steuern auf jeder Rechnungszeile. Wenn dies der Fall ist, wählen Sie den Typ für die zweite und dritte Steuer und den Steuersatz. Mögliche Arten sind: <br> 1: Ortsteuer gelten für Produkte und Dienstleistungen, ohne Mehrwertsteuer (Ortssteuer wird ohne Berücksichtigung der MwSt berechnet) <br> 2: Ortssteuer gilt für Produkte und Dienstleistungen mit Mehrwertsteuer (Ortssteuer wird mit Berücksichtigung det MwSt berechnet) <br> 3: Ortstaxe gilt für Produkte ohne Mehrwertsteuer (Ortssteuer wird ohne Berücksichtigung der MwSt berechnet) <br> 4: Ortssteuer gilt für Produkte, mit Mehrwertsteuer (Ortssteuer wird mit Berücksichtigung der MwSt berechnet) <br> 5: Ortssteuer gilt für Dienstleistungen, ohne Mehrwertsteuer (Ortssteuer wird ohne Berücksichtigung der MwSt berechnet) <br> 6: Ortssteuer gilt für Dienstleistungen mit Mehrwertsteuer (Ortssteuer wird mit Berücksichtigung der MwSt berechnet)
-SMS=SMS
-LinkToTestClickToDial=Geben Sie die anzurufende Telefonnr ein, um einen Link zu zeigen, mit dem die ClickToDial-URL für den Benutzer <strong>%s</strong> getestet werden kann
-RefreshPhoneLink=Aktualisierungslink
-LinkToTest=Anklickbarer Link für Benutzer <strong>%s</strong> erzeugt (Telefonnr. anklicken zum Testen)
-KeepEmptyToUseDefault=Leer lassen für Standardwert
-DefaultLink=Standardlink
 SetAsDefault=Als Standard definieren
-ValueOverwrittenByUserSetup=Achtung, dieser Wert kann durch den Benutzer überschrieben werden (jeder kann seine eigene ClickToDial-URL setzen)
-ExternalModule=Externes Modul - im Verzeichnis %s installiert
-BarcodeInitForThirdparties=Alle Strichcodes für Drittanbieter initialisieren
-BarcodeInitForProductsOrServices=Alle Strichcodes für Produkte oder Services initialisieren oder zurücksetzen
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Startwert für die nächsten %s leeren Datensätze
-EraseAllCurrentBarCode=Alle aktuellen Barcode-Werte löschen
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
-AllBarcodeReset=Alle Barcode-Werte wurden entfernt
-NoBarcodeNumberingTemplateDefined=Im Barcode-Modul wurde kein Numerierungs-Schema aktiviert.
-EnableFileCache=Dateicache aktivieren
-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=Keine weiteren Details in der Fusszeile
-DisplayCompanyInfo=Firmenadresse anzeigen
-DisplayCompanyManagers=Display manager names
-DisplayCompanyInfoAndManagers=Display company address and manager names
-EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Generiert einen Kontierungscode %s, gefolgt von der Lieferantenummer für einen Lieferanten-Kontierungscode und %s, gefolgt vom Kundencontierungscode für einen Kundenkontierungscode.
 ModuleCompanyCodePanicum=Generiert einen leeren Kontierungscode.
 ModuleCompanyCodeDigitaria=Kontierungscode hängt vom Geschäftspartner Code ab. Der Code setzt sich aus dem Buchstaben 'C' und den ersten 5 Stellen des Geschäftspartner Codes zusammen.
-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: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-ClickToShowDescription=Click to show description
-# Modules
-Module0Name=Benutzer und Gruppen
-Module0Desc=Users / Employees and Groups management
 Module1Name=Geschäftspartner
 Module1Desc=Geschäftspartner- und Kontakteverwaltung (Kunden, Leads, ...)
-Module2Name=Vertrieb
-Module2Desc=Vertriebsverwaltung
-Module10Name=Buchhaltung
-Module10Desc=Einfache Buchhaltungsverwaltung (Rechnungen und Zahlungen)
-Module20Name=Angebote
 Module20Desc=Angeboteverwaltung
-Module22Name=E-Mail-Kampagnen
-Module22Desc=E-Mail-Kampagnenverwaltung
-Module23Name=Energie
-Module23Desc=Überwachung des Energieverbrauchs
-Module25Name=Kundenaufträge
-Module25Desc=Kundenauftragsverwaltung
-Module30Name=Rechnungen
-Module30Desc=Rechnungs- und Gutschriftsverwaltung für Kunden. Rechnungsverwaltung für Lieferanten
-Module40Name=Lieferanten
-Module40Desc=Lieferantenverwaltung und Einkauf (Bestellungen und Rechnungen)
-Module42Name=Systemprotokoll
-Module42Desc=Protokollierungsdienste (Syslog)
-Module49Name=Bearbeiter
 Module49Desc=Bearbeiterverwaltung
-Module50Name=Produkte
-Module50Desc=Produktverwaltung
-Module51Name=Postwurfsendungen
-Module51Desc=Verwaltung von Postwurf-/Massensendungen
-Module52Name=Produktbestände
-Module52Desc=Produktbestandsverwaltung
-Module53Name=Leistungen
-Module53Desc=Leistungs-Verwaltung
-Module54Name=Verträge/Abonnements
-Module54Desc=Vertragsverwaltung (Services oder sich wiederholende Abos)
-Module55Name=Barcodes
-Module55Desc=Barcode-Verwaltung
-Module56Name=Telefonie
-Module56Desc=Telefonie-Integration
-Module57Name=Direct bank payment orders
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
-Module58Name=ClickToDial
-Module58Desc=ClickToDial-Integration
-Module59Name=Bookmark4u
-Module59Desc=Neues Bookmark4u Konto zu Systembenutzerkonto hinzufügen
 Module70Name=Arbeitseinsätze
-Module70Desc=Serviceverwaltung
-Module75Name=Spesen- und Reiseaufzeichnungen
-Module75Desc=Reise- und Fahrtspesenverwaltung
 Module80Name=Auslieferungen
-Module80Desc=Versand und Lieferauftragsverwaltung
-Module85Name=Banken und Kassen
-Module85Desc=Verwaltung von Bank- oder Bargeldkonten
-Module100Name=Externe Website
-Module100Desc=Erlaubt die Einbindung einer externen Website in die Menüs von dolibarr und die Anzeige der Seite innerhalb eines Frames
-Module105Name=Mailman und SPIP
-Module105Desc=Mailman oder SPIP Schnittstelle für die Mitgliedsmodul
-Module200Name=LDAP
-Module200Desc=LDAP-Verzeichnissynchronisation
-Module210Name=PostNuke
-Module210Desc=PostNuke-Integration
-Module240Name=Daten Exporte
 Module240Desc=Werkzeug zum Datenexport (mit Assistent)
-Module250Name=Daten Importe
 Module250Desc=Werkzeug zum Dateninport (mit Assistent)
-Module310Name=Mitglieder
-Module310Desc=Management von Mitglieder einer Stiftung/Vereins
-Module320Name=RSS Feed
-Module320Desc=RSS-Feed-Bildschirm innerhalb des Systems anzeigen
-Module330Name=Lesezeichen
 Module330Desc=Lesezeichenverwaltung
-Module400Name=Projekte / Chancen / Leads
 Module400Desc=Projektmanagement, Aufträge oder Leads. Anschliessend können Sie ein beliebiges Element (Rechnung, Bestellung, Angebot, Intervention, ...) einem Projekt zuordnen und eine Queransicht von der Projektanzeige bekommen.
-Module410Name=Webkalender
-Module410Desc=Webkalenderintegration
-Module500Name=Sonderausgaben
-Module500Desc=Verwalten von speziellen Ausgaben (Steuern, Sozialabgaben, Dividenden)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
-Module520Name=Darlehen
-Module520Desc=Verwaltung von Darlehen
-Module600Name=Benachrichtigungen
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
-Module700Name=Spenden
-Module700Desc=Spendenverwaltung
-Module770Name=Spesenabrechnungen
-Module770Desc=Management und Reporting von Reise- und Spesenabrechnungen (Transport, Essen, ...)
-Module1120Name=Lieferant-Angebote
-Module1120Desc=Anfordern von Lieferanten-Angeboten und Preise
-Module1200Name=Mantis
 Module1200Desc=Mantis-Integation
-Module1400Name=Buchhaltung
-Module1400Desc=Buchhaltung für Experten (doppelte Buchhaltung)
-Module1520Name=Dokumente erstellen
-Module1520Desc=Mailings Dokumente erstellen
-Module1780Name=Kategorien/#tags
-Module1780Desc=Kategorien erstellen (Produkte, Kunden, Lieferanten, Kontakte oder Mitglieder)
-Module2000Name=FCKeditor
 Module2000Desc=Texte mit dem WYSIWYG Editor bearbeiten (Basierend auf CKEditor)
-Module2200Name=Dynamische Preise
-Module2200Desc=Mathematische Ausdrücke für Preise aktivieren
-Module2300Name=Cron
-Module2300Desc=CronJob Verwaltung
-Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
-Module2500Name=Inhaltsverwaltung(ECM)
-Module2500Desc=Speicherung und Verteilung von Dokumenten
-Module2600Name=API/Web services (SOAP server)
-Module2600Desc=Aktivieren Sie Dolibarr SOAP Server,  unterstütztes API-Service.
-Module2610Name=API/Web Services (REST Server)
-Module2610Desc=Aktiviere der Dolibarr REST Serverdienst
-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)
-Module2700Name=Gravatar
-Module2700Desc=Verwenden Sie den online Gravatar-Dienst (www.gravatar.com) für die Anzeige von Benutzer- und Mitgliederbildern (Zuordnung über E-Mail-Adressen). Hierfür benötigen Sie eine aktive Internetverbindung
-Module2800Desc=FTP-Client
-Module2900Name=GeoIPMaxmind
-Module2900Desc=GeoIP Maxmind Konvertierung
-Module3100Name=Skype
 Module3100Desc=Skypebutton bei Kontakten / Drittparteien / Mitgliedern hinzufügen
-Module4000Name=HRM
-Module4000Desc=Human resources management
-Module5000Name=Mandantenfähigkeit
-Module5000Desc=Ermöglicht Ihnen die Verwaltung mehrerer Firmen
-Module6000Name=Workflow
-Module6000Desc=Workflow management
-Module10000Name=Websites
 Module10000Desc=Erstellen Sie öffentliche Webauftritte mit einem WYSIWIG Editor. Konfigurieren Sie dazu Ihren Webserver so, dass es auf das dedizierte Verzeichnis zeigt um den Webauftritt öffentlich zugänglich zu machen.
-Module20000Name=Urlaubsantrags-Verwaltung
-Module20000Desc=Definieren und beobachten sie die Urlaubsanträge Ihrer Angestellten.
-Module39000Name=Chargen-/ Seriennummern
-Module39000Desc=Chargen oder Seriennummer, Haltbarkeitsdatum und Verfallsdatum Management für Produkte
-Module50000Name=PayBox
-Module50000Desc=Über dieses Modul können Sie online Kreditkartenzahlungen entgegennehmen
-Module50100Name=Kasse
 Module50100Desc=Kassenmodul
-Module50200Name=Paypal
-Module50200Desc=Mit diesem Modul können Sie via PayPal Online Kreditkartenzahlungen entgegennehmen
-Module50400Name=Buchhaltung (erweitert)
-Module50400Desc=Buchhaltung für Experten (doppelte Buchhaltung)
-Module54000Name=PrintIPP
-Module54000Desc=Direktdruck (ohne die Dokumente zu öffnen) mittels CUPS IPP (Drucker muss vom Server aus sichtbar sein und auf dem Server muss CUPS installiert sein)
-Module55000Name=Befragung, Umfrage oder Abstimmung
-Module55000Desc=Modul zur Online-Umfragen, Umfragen oder Abstimmungen zu machen (wie Doodle, Studs, Rdvz, ...)
-Module59000Name=Gewinnspannen
-Module59000Desc=Modul zur Verwaltung von Gewinnspannen
-Module60000Name=Kommissionen
-Module60000Desc=Modul zur Verwaltung von Kommissionen
-Module63000Name=Ressourcen
 Module63000Desc=Resourcen verwalten(Drucker, Autos, Räume,...) diese können dann im Kalender verwendet werden
-Permission11=Rechnungen einsehen
-Permission12=Rechnungen erstellen/bearbeiten
-Permission13=Rechnungsfreigabe aufheben
-Permission14=Rechnungen freigeben
-Permission15=Rechnungen per E-Mail versenden
-Permission16=Rechnungszahlungen erstellen
-Permission19=Kundenrechnungen löschen
-Permission21=Angebote einsehen
-Permission22=Angebote erstellen/bearbeiten
-Permission24=Angebote freigeben
-Permission25=Angebote per E-Mail versenden
 Permission26=Angebote schliessen
-Permission27=Angebote löschen
-Permission28=Angebote exportieren
-Permission31=Produkte/Leistungen einsehen
-Permission32=Produkte/Leistungen erstellen/bearbeiten
-Permission34=Produkte/Leistungen löschen
-Permission36=Projekte/Leistungen exportieren
-Permission38=Produkte exportieren
-Permission41=Projekte und Aufgaben lesen (Geteilte Projekte und Projekte in denen ich Kontakt bin).  Es kann auch Zeitaufwand auf zugewiesenen Aufgaben gebucht werden.
-Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Projekte und Aufgaben löschen (gemeinsame Projekte und Projekte, in welchen ich Ansprechpartner bin)
-Permission45=Projekte exportieren
 Permission61=Leistungen ansehen
 Permission62=Leistungen erstellen/bearbeiten
 Permission64=Interventionen löschen
-Permission67=Leistungen exportieren
-Permission71=Mitglieder einsehen
-Permission72=Mitglieder erstellen/bearbeiten
-Permission74=Mitglieder löschen
-Permission75=Erstellen Typen von Mitgliedschaft
 Permission76=Daten exportieren
-Permission78=Abonnements einsehen
-Permission79=Abonnements erstellen/bearbeiten
-Permission81=Kundenaufträge einsehen
-Permission82=Kundenaufträge erstellen/bearbeiten
-Permission84=Kundenaufträge freigeben
-Permission86=Kundenaufträge per E-Mail versenden
 Permission87=Kundenaufträge abschliessen
-Permission88=Kundenaufträge verwerfen
-Permission89=Kundenaufträge löschen
-Permission91=Sozialabgaben, Steuern und Mehrwertsteuer einsehen
-Permission92=Sozialabgaben, Steuern und Mehrwertsteuer erstellen/bearbeiten
-Permission93=Sozialabgaben, Steuern und Mehrwertsteuer löschen
-Permission94=Sozialabgaben, Steuern und Mehrwertsteuer erstellen/bearbeiten
-Permission95=Buchhaltung einsehen
-Permission101=Auslieferungen einsehen
-Permission102=Auslieferungen erstellen/bearbeiten
-Permission104=Auslieferungen freigeben
-Permission106=Auslieferungen exportieren
-Permission109=Sendungen löschen
-Permission111=Finanzkonten einsehen
-Permission112=Transaktionen erstellen/ändern/löschen und vergleichen
-Permission113=Einstellungen Finanzkonten (erstellen, Kategorien verwalten)
-Permission114=Transaktionen ausgleichen
-Permission115=Transaktionen und Kontoauszüge exportieren
-Permission116=Transfers zwischen Konten
-Permission117=Scheckeinlösungen verwalten
 Permission121=Mit Benutzer verbundene Geschäftspartner einsehen
 Permission122=Mit Benutzer verbundene Geschäftspartner erstellen/bearbeiten
 Permission125=Mit Benutzer verbundene Geschäftspartner löschen
 Permission126=Geschäftspartner exportieren
-Permission141=Alle Projekte und Aufgaben lesen (Auch private Projekte in denen ich nicht Kontakt bin)
-Permission142=Projekte und Aufgaben erstellen und ändern (Auch private Projekte in denen ich nicht Kontakt bin)
 Permission144=Löschen Sie alle Projekte und Aufgaben (einschliesslich privater Projekte in denen ich kein Kontakt bin)
-Permission146=Lieferanten einsehen
-Permission147=Statistiken einsehen
-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
-Permission161=Verträge/Abonnements einsehen
-Permission162=Verträge/Abonnements erstellen/bearbeiten
-Permission163=Service/Abonnement in einem Vertrag aktivieren
-Permission164=Service/Abonnement in einem Vertrag deaktivieren
-Permission165=Verträge/Abonnement löschen
-Permission167=Verträge exportieren
-Permission171=Reise- und Spesenabrechnung einsehen (Eigene und von Untergebenen)
 Permission172=Reise- und Spesenabrechnung erstellen/ändern
-Permission173=Reise- und Spesenabrechnung verwerfen
-Permission174=Alle Reise- und Spesenabrechnung einsehen
-Permission178=Reise- und Spesenabrechnung exportieren
-Permission180=Lieferanten einsehen
-Permission181=Lieferantenbestellungen einsehen
-Permission182=Lieferantenbestellungen erstellen/bearbeiten
-Permission183=Lieferantenbestellungen freigeben
-Permission184=Lieferantenbestellungen bestätigen
-Permission185=Lieferantenbestellungen bestellen oder verwerfen
-Permission186=Lieferantenbestellungen empfangen
 Permission187=Lieferantenbestellungen schliessen
 Permission188=Lieferantenbestellungen verwerfen
-Permission192=Leitungen erstellen
 Permission193=Leitungen abbrechen
-Permission194=Leitungen einsehen
-Permission202=ADSL Verbindungen erstellen
 Permission203=Bestellungsverbindungen Bestellungen
-Permission204=Bestell-Verbindungen
-Permission205=Verbindungen verwalten
-Permission206=Verbindungen lesen
-Permission211=Telefonie lesen
-Permission212=Auftragszeilen
-Permission213=Leitung aktivieren
-Permission214=Telefonie einrichten
-Permission215=Anbieter einrichten
-Permission221=E-Mail-Kampagnen einsehen
-Permission222=E-Mail-Kampagnen erstellen/bearbeiten (Thema, Empfänger, ...)
-Permission223=E-Mail-Kampagnen freigeben (erlaubt das Senden)
-Permission229=E-Mail-Kampagnen löschen
-Permission237=Zeige Empfänger und Info
-Permission238=Mails manuell senden
-Permission239=Postausgang löschen nachdem die Gültigkeit ausgelaufen ist oder die Nachricht gesendet wurde.
-Permission241=Kategorien einsehen
-Permission242=Kategorien erstellen/bearbeiten
-Permission243=Kategorien löschen
-Permission244=Inhalte versteckter Kategorien einsehen
-Permission251=Andere Benutzer und Gruppen einsehen
-PermissionAdvanced251=Andere Benutzer einsehen
-Permission252=Berechtigungen andere Benutzer einsehen
-Permission253=Andere Benutzer und Gruppen erstellen/bearbeiten (inkl. Rechteverwaltung)
-PermissionAdvanced253=Andere interne/externe Benutzer und Gruppen erstellen/bearbeiten (inkl. Rechteverwaltung)
-Permission254=Nur externe Benutzer erstellen/bearbeiten
-Permission255=Andere Passwörter ändern
-Permission256=Andere Benutzer löschen oder deaktivieren
-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 assignement matters).
-Permission271=Read CA
-Permission272=Rechnungen anzeigen
-Permission273=Ausgabe Rechnungen
-Permission281=Kontakte einsehen
-Permission282=Kontakte erstellen/bearbeiten
-Permission283=Kontakte löschen
-Permission286=Kontakte exportieren
-Permission291=Tarife einsehen
-Permission292=Berechtigungen der Tarife einstellen
-Permission293=Kundentarife ändern
-Permission300=Barcodes einsehen
-Permission301=Barcodes erstellen/bearbeiten
-Permission302=Barcodes löschen
-Permission311=Leistungen einsehen
-Permission312=Leistung/Abonnement einem Vertrag zuordnen
-Permission331=Lesezeichen einsehen
-Permission332=Lesezeichen erstellen/bearbeiten
-Permission333=Lesezeichen löschen
-Permission341=Eigene Berechtigungen einsehen
-Permission342=Eigene Benutzerinformationen erstellen/bearbeiten
-Permission343=Eigenes Passwort ändern
-Permission344=Eigene Berechtigungen bearbeiten
-Permission351=Gruppen einsehen
-Permission352=Gruppenberechtigungen einsehen
-Permission353=Gruppen erstellen/bearbeiten
-Permission354=Gruppen löschen oder deaktivieren
-Permission358=Benutzer exportieren
-Permission401=Rabatte einsehen
-Permission402=Rabatte erstellen/bearbeiten
-Permission403=Rabatte freigeben
-Permission404=Rabatte löschen
-Permission510=Löhne einsehen
-Permission512=Löhne erstellen/bearbeiten
-Permission514=Löhne löschen
-Permission517=Löhne exportieren
-Permission520=Darlehen einsehen
-Permission522=Darlehen erstellen/bearbeiten
-Permission524=Lösche Darlehen
 Permission525=Darlehens-rechner
-Permission527=Exportiere Darlehen
-Permission531=Leistungen einsehen
-Permission532=Leistungen erstellen/bearbeiten
-Permission534=Leistungen löschen
-Permission536=Versteckte Leistungen einsehen/verwalten
-Permission538=Leistungen exportieren
-Permission701=Spenden einsehen
-Permission702=Spenden erstellen/bearbeiten
-Permission703=Spenden löschen
-Permission771=Spesenabrechnungen einsehen (eigene und die der Untergebenen)
-Permission772=Spesenabrechnung erstellen/ändern
-Permission773=Spesenabrechnung löschen
-Permission774=Spesenabrechnungen einsehen  (Alle Benutzer auch die nicht Untergebenen)
-Permission775=Spesenabrechnung genehmigen
-Permission776=Spesenabrechnung bezahlen
-Permission779=Spesenabrechnung exportieren
-Permission1001=Warenbestände einsehen
-Permission1002=Warenlager erstellen/ändern
-Permission1003=Warenlager löschen
-Permission1004=Lagerbewegungen einsehen
-Permission1005=Lagerbewegungen erstellen/bearbeiten
-Permission1101=Lieferscheine einsehen
-Permission1102=Lieferscheine erstellen/bearbeiten
-Permission1104=Lieferscheine freigeben
-Permission1109=Lieferscheine löschen
-Permission1181=Lieferanten einsehen
-Permission1182=Lieferantenbestellungen einsehen
-Permission1183=Lieferantenbestellungen erstellen/bearbeiten
-Permission1184=Lieferantenbestellungen freigeben
-Permission1185=Lieferantenbestellungen bestätigen
-Permission1186=Lieferantenbestellungen übermitteln
-Permission1187=Eingang von Lieferantenbestellungen bestätigen
 Permission1188=Lieferantenbestellungen schliessen
-Permission1190=Lieferantenbestellungen bestätigen (zweite Bestätigung)
-Permission1201=Exportresultate einsehen
-Permission1202=Export erstellen/bearbeiten
-Permission1231=Lieferantenrechnungen einsehen
-Permission1232=Lieferantenrechnungen erstellen/bearbeiten
-Permission1233=Lieferantenrechnungen freigeben
-Permission1234=Lieferantenrechnungen löschen
-Permission1235=Lieferantenrechnungen per E-Mail versenden
-Permission1236=Lieferantenrechnungen, -attribute und zahlungen exportieren
-Permission1237=Lieferantenbestellungen mit Details exportieren
-Permission1251=Massenimports von externen Daten ausführen (data load)
-Permission1321=Kundenrechnungen, -attribute und -zahlungen exportieren
-Permission1322=Reopen a paid bill
-Permission1421=Exportieren von Kundenaufträge und Attribute
-Permission20001=Urlaubsanträge einsehen (eigene und die der Untergebenen)
-Permission20002=Ihre eigenen Urlaubsanträge erstellen/bearbeiten
-Permission20003=Urlaubsanträge löschen
-Permission20004=Spesenabrechnungen einsehen  (Alle Benutzer)
-Permission20005=Urlaubsanträge für Jeden erstellen/bearbeiten
-Permission20006=Urlaubstage Administrieren (Setup- und Aktualisierung)
-Permission23001=anzeigen cronjobs
-Permission23002=erstellen/ändern cronjobs
-Permission23003=cronjobs löschen
-Permission23004=cronjobs ausführen
-Permission2401=Ereignisse (Termine/Aufgaben) in Verbindung mit eigenem Konto einsehen
-Permission2402=Ereignisse (Termine/Aufgaben) in Verbindung mit eigenem Konto erstellen/bearbeiten
-Permission2403=Ereignisse  (Termine/Aufgaben) in Verbindung mit eigenem Konto löschen
-Permission2411=Ereignisse (Termine/Aufgaben) Anderer einsehen
-Permission2412=Ereignisse (Termine/Aufgaben) Anderer erstellen/bearbeiten
-Permission2413=Ereignisse (Termine/Aufgaben) Anderer löschen
 Permission2414=Aktionen und Aufgaben anderer exportieren
-Permission2501=Dokumente herunterladen oder einsehen
-Permission2502=Dokumente herunterladen
-Permission2503=Dokumente bestätigen oder löschen
-Permission2515=Dokumentverzeichnisse verwalten
-Permission2801=FTP-Client im Lesemodus nutzen (nur ansehen und herunterladen)
-Permission2802=FTP-Client im Schreibmodus nutzen (Dateien löschen oder hochladen)
-Permission50101=Benutze Kassen
-Permission50201=Transaktionen einsehen
-Permission50202=Transaktionen importieren
-Permission54001=Drucken
-Permission55001=Abstimmungen einsehen
-Permission55002=Abstimmung erstellen/ändern
-Permission59001=Gewinnspanne einsehen
 Permission59002=Gewinspanne definieren
-Permission59003=Lesen aller Benutzer Margen
-Permission63001=Read resources
-Permission63002=Create/modify resources
-Permission63003=Delete resources
-Permission63004=Link resources to agenda events
 DictionaryCompanyType=Geschäftspartnertyp
 DictionaryCompanyJuridicalType=Gesellschafts- und Unternehmensformen
-DictionaryProspectLevel=Potenzialstufen von Geschäftsaussicht
-DictionaryCanton=Bundesländer/Provinzen/Kantone
-DictionaryRegion=Regionen
-DictionaryCountry=Länder
-DictionaryCurrency=Währungen
 DictionaryCivility=Anrede Bezeichnungen
 DictionaryActions=Arten von Kalenderereignissen
-DictionarySocialContributions=Arten von Sozialabgaben/Unternehmenssteuern
 DictionaryVAT=MwSt.-Sätze
-DictionaryRevenueStamp=Steuermarken Beträge
-DictionaryPaymentConditions=Zahlungsbedingungen
-DictionaryPaymentModes=Zahlungsarten
-DictionaryTypeContact=Kontaktarten
-DictionaryEcotaxe=Ökosteuern (WEEE)
-DictionaryPaperFormat=Papierformate
-DictionaryFormatCards=Cards formats
 DictionaryFees=Spesen- und Kostenarten
-DictionarySendingMethods=Versandarten
-DictionaryStaff=Mitarbeiter
-DictionaryAvailability=Lieferverzug
-DictionaryOrderMethods=Bestellmethoden
-DictionarySource=Quelle der Angebote/Aufträge
-DictionaryAccountancyCategory=Accounting account groups
-DictionaryAccountancysystem=Kontenplan Modul
 DictionaryEMailTemplates=Textvorlagen für Emails
-DictionaryUnits=Einheiten
-DictionaryProspectStatus=Geschäftsanbahnungsarten
 DictionaryHolidayTypes=Absenzarten
-DictionaryOpportunityStatus=Verkaufschancen für Projekt/Lead
 SetupSaved=Setup gespeichert
-BackToModuleList=Zurück zur Modulübersicht
 BackToDictionaryList=Zurück zur Wörterbuchübersicht
 VATManagement=MwSt-Verwaltung
 VATIsUsedDesc=Der standardmässige MwSt.-Satz für die Erstellung von Leads, Rechnungen, Bestellungen, etc. folgt der folgenden, aktiven Regel:<br>Ist der Verkäufer mehrwertsteuerpflichtig, ist die MwSt. standardmässig 0. Ende der Regel.<br>Ist das Verkaufsland gleich dem Einkaufsland, ist die MwSt. standardmässig die MwSt. des Produkts im Verkaufsland. Ende der Regel. <br>Sind Verkäufer und Käufer beide aus Europäischen Mitgliedsstaaten und die Produkte physisch transportfähig (Auto, Schiff, Flugzeug), ist die MwSt. standardmässig 0. (Die MwSt. sollte durch den Käufer beim eigenen Zollamt entrichtet werden, nicht durch den Verkäufer. Ende der Regel.<br>Sind Verkäufer und Käufer beide aus Europäischen Mitgliedsstaaten, der Käufer jedoch kein Unternehmen so ist die MwSt. standardmässig die MwSt. des verkauften Produkts. Ende der Regel.<br>Sind Verkäufer und Käufer beide Unternehmen im Europäischen Gemeinschaftsraum, so ist die MwSt. standardmässig 0. Ende der Regel.<br>Trifft keine der obigen Regeln zu, ist die MwSt. standardmässig 0.
 VATIsNotUsedDesc=Die vorgeschlagene MwSt. ist standardmässig 0 für alle Fälle wie Stiftungen, Einzelpersonen oder Kleinunternehmen.
-VATIsUsedExampleFR=-
-VATIsNotUsedExampleFR=-
-##### Local Taxes #####
-LTRate=Rate
-LocalTax1IsNotUsed=Zweite Steuer nicht nutzen
-LocalTax1IsUsedDesc=Benutzen sie eine zweite Art von Steuer (andere als Mehrwertsteuer)
-LocalTax1IsNotUsedDesc=Benutzen sie keine andere Art von Steuer (anders als Mehrwertsteuer)
-LocalTax1Management=Zweite Steuer-Art
-LocalTax1IsUsedExample=
-LocalTax1IsNotUsedExample=
-LocalTax2IsNotUsed=Dritte Steuer nicht nutzen
-LocalTax2IsUsedDesc=Benutzen Sie eine dritte Art von Steuer (anders als Mehrwertsteuer)
-LocalTax2IsNotUsedDesc=Benutzen sie keine andere Art von Steuer (anders als Mehrwertsteuer)
-LocalTax2Management=Dritte Steuer-Art
-LocalTax2IsUsedExample=
-LocalTax2IsNotUsedExample=
-LocalTax1ManagementES= RE Management
-LocalTax1IsUsedDescES= Die RE Rate standardmässig beim Erstellen Aussichten, Rechnungen, Bestellungen etc. folgen die aktive Standard-Regel: <br> Wenn te Käufer ist nicht unterworfen RE, RE standardmässig = 0 ist. Ende der Regel. <br> Ist der Käufer unterzogen, um dann die RE RE standardmässig. Ende der Regel. <br>
-LocalTax1IsNotUsedDescES= Standardmässig werden die vorgeschlagenen RE 0 ist. Ende der Regel.
-LocalTax1IsUsedExampleES= In Spanien sind sie Profis unterliegen bestimmten Abschnitten der spanischen IAE.
-LocalTax1IsNotUsedExampleES= In Spanien sind sie professionelle und Gesellschaften und vorbehaltlich bestimmter Abschnitte der spanischen IAE.
-LocalTax2ManagementES= EKSt. Management
-LocalTax2IsUsedDescES= Die RE Rate standardmässig beim Erstellen Aussichten, Rechnungen, Bestellungen etc. folgen die aktive Standard-Regel: <br> Ist der Verkäufer nicht zu IRPF ausgesetzt, dann durch IRPF default = 0. Ende der Regel. <br> Ist der Verkäufer zur IRPF dann der Einkommenssteuer unterworfen standardmässig. Ende der Regel. <br>
-LocalTax2IsNotUsedDescES= Standardmässig werden die vorgeschlagenen IRPF 0 ist. Ende der Regel.
-LocalTax2IsUsedExampleES= In Spanien, Freiberufler und unabhängigen Fachleuten, die ihre Dienstleistungen und Unternehmen, die das Steuersystem von Modulen gewählt haben.
-LocalTax2IsNotUsedExampleES= In Spanien sind sie bussines nicht der Steuer unterliegen System von Modulen.
-CalcLocaltax=Berichte über lokale Steuern
-CalcLocaltax1=Sales - Käufe
-CalcLocaltax1Desc=Lokale Steuer-Reports werden mit der Differenz von lokalen Verkaufs- und Einkaufs-Steuern berechnet
-CalcLocaltax2=Einkauf
-CalcLocaltax2Desc=Lokale Steuer-Reports sind die Summe der lokalen Steuern auf Einkäufe
-CalcLocaltax3=Verkauf
-CalcLocaltax3Desc=Lokale Steuer-Reports sind die Summe der lokalen Steuern auf Verkäufe
-LabelUsedByDefault=Bezeichnung wird verwendet falls keine Übersetzung für den Code vorhanden ist.
-LabelOnDocuments=Bezeichnung auf Dokumenten
-NbOfDays=Anzahl der Tage
-AtEndOfMonth=Am Ende des Monats
-CurrentNext=Current/Next
-Offset=Wertsprung
-AlwaysActive=Immer aktiv
-Upgrade=Aktualisierung
-MenuUpgrade=Aktualisierung/Erweiterung
-AddExtensionThemeModuleOrOther=Deploy/install external module
-WebServer=Webserver
-DocumentRootServer=Dokumenten-Stammordner des Webservers
-DataRootServer=Daten-Verzeichnis
-IP=IP
-Port=Port
-VirtualServerName=Name des virtuellen Servers
-OS=OS
-PhpWebLink=PHP Web-Link
-Browser=Browser
-Server=Server
-Database=Datenbank
-DatabaseServer=Datenbankserver
-DatabaseName=Name der Datenbank
-DatabasePort=Port für Datenbank
-DatabaseUser=DB Benutzername
-DatabasePassword=DB Passwort
-Tables=Tabellen
-TableName=Tabellenname
-NbOfRecord=Anzahl der Einträge
-Host=Server
-DriverType=Treiber Typ
-SummarySystem=Zusammenfassung der Systeminformationen
-SummaryConst=Liste aller Systemeinstellungen von Dolibarr
-MenuCompanySetup=Firma/Stiftung
-DefaultMenuManager= Standard Menü-Verwaltung
-DefaultMenuSmartphoneManager=Smartphone Menü-Verwaltung
-Skin=grafische Oberfläche
-DefaultSkin=Standardvorlage grafische Oberfläche
-MaxSizeList=Maximale Listenlänge
-DefaultMaxSizeList=Default max length for lists
-DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
-MessageOfDay=Nachricht des Tages
-MessageLogin=Nachricht auf der Anmeldeseite
-PermanentLeftSearchForm=Ständiges Suchfeld auf der linken Seite
-DefaultLanguage=Standardsprache der Anwendung (Sprachcode)
-EnableMultilangInterface=Mehrsprachigkeit aktivieren
-EnableShowLogo=Logo über dem linken Menü anzeigen
-CompanyInfo=Information über die Firma/Institution
-CompanyIds=Firmen-/Stiftungs-IDs
-CompanyName=Firmenname
-CompanyAddress=Firmenadresse
-CompanyZip=Postleitzahl
-CompanyTown=Stadt
-CompanyCountry=Land
-CompanyCurrency=Hauptwährung
-CompanyObject=Gegenstand des Unternehmens
-Logo=Logo
-DoNotSuggestPaymentMode=Nicht vorschlagen
-NoActiveBankAccountDefined=Keine aktiven Finanzkonten definiert
-OwnerOfBankAccount=Kontoinhaber %s
-BankModuleNotActive=Finanzkontenmodul nicht aktiv
-ShowBugTrackLink=Zeige Link  <strong>%s</strong>
-Alerts=Benachrichtigungen
-DelaysOfToleranceBeforeWarning=Verzögerungstoleranz vor Warnung
-DelaysOfToleranceDesc=Hier können Sie die Verspätungstoleranz einstellen, bevor eine Benachrichtigung auf dem Bildschirm für jedes verspätete Element mit dem Symbol %s ausgegeben wird.
+LocalTax1IsUsedDescES=Die RE Rate standardmässig beim Erstellen Aussichten, Rechnungen, Bestellungen etc. folgen die aktive Standard-Regel: <br> Wenn te Käufer ist nicht unterworfen RE, RE standardmässig = 0 ist. Ende der Regel. <br> Ist der Käufer unterzogen, um dann die RE RE standardmässig. Ende der Regel. <br>
+LocalTax1IsNotUsedDescES=Standardmässig werden die vorgeschlagenen RE 0 ist. Ende der Regel.
+LocalTax2IsUsedDescES=Die RE Rate standardmässig beim Erstellen Aussichten, Rechnungen, Bestellungen etc. folgen die aktive Standard-Regel: <br> Ist der Verkäufer nicht zu IRPF ausgesetzt, dann durch IRPF default = 0. Ende der Regel. <br> Ist der Verkäufer zur IRPF dann der Einkommenssteuer unterworfen standardmässig. Ende der Regel. <br>
+LocalTax2IsNotUsedDescES=Standardmässig werden die vorgeschlagenen IRPF 0 ist. Ende der Regel.
+LocalTax2IsNotUsedExampleES=In Spanien sind sie bussines nicht der Steuer unterliegen System von Modulen.
 Delays_MAIN_DELAY_ACTIONS_TODO=Verzögerungstoleranz (in Tagen) vor Warnung für nicht erledigte Ereignisse
 Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Verzögerungstoleranz (in Tagen) vor Warnung für nicht fristgerecht geschlossene Projekte
 Delays_MAIN_DELAY_TASKS_TODO=Verzögerungstoleranz (in Tagen) vor Warnung für nicht erledigte Projektaufgaben
 Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Verzögerungstoleranz (in Tagen), vor Warnung für nicht bearbeitete Bestellungen
 Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Verzögerungstoleranz (in Tagen), vor Warnung für nicht bearbeitete Lieferantenbestellungen
 Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Verzögerungstoleranz (in Tagen) vor  Warnung für abzuschliessende Angebote
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Verzögerungstoleranz (in Tagen) vor Warnung für nicht in Rechnung gestellte Angebote
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Verzögerungstoleranz (in Tagen) vor Warnung für zu aktivierende Leistungen
-Delays_MAIN_DELAY_RUNNING_SERVICES=Verzögerungstoleranz (in Tagen) vor Warnung für überfällige Vertrags-Leistungen
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Verzögerungstoleranz (in Tagen) vor Benachrichtigung über unbezahlte Lieferantenrechnungen
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Verzögerungstoleranz (in Tagen) vor Benachrichtigung über unbezahlte Kundenrechnungen
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Verzögerungstoleranz (in Tagen) vor Benachrichtigung über Bankkontenabgleich
-Delays_MAIN_DELAY_MEMBERS=Verzögerungstoleranz (in Tagen) vor Benachrichtigung über verspätete Mitgliedsbeiträge
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Verzögerungstoleranz (in Tagen) vor der Benachrichtigung über einzulösende Schecks
-Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=Der Setupbereich erlaubt das konfigurieren ihrer Dolibarr Installation vor der ersten Verwendung.
-SetupDescription2=Die 2 wichtigsten Schritte zur Grundkonfiguration finden Sie in den ersten beiden Zeilen des Einstellungen-Menüs auf der linken Seite. Dies sind die 'Unternehmen/Stiftung'- und die 'Moduleinstellungen'-Menüpunkte:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
-SetupDescription5=Andere Einträge verwalten optionale Parameter.
-LogEvents=Protokollierte Ereignisse
-Audit=Protokoll
 InfoDolibarr=Infos Dolibarr
 InfoBrowser=Infos Browser
 InfoOS=Infos OS
 InfoWebServer=Infos Webserver
 InfoDatabase=Infos Datenbank
 InfoPHP=Infos PHP
-InfoPerf=Leistungs-Informationen
-BrowserName=Browser Name
-BrowserOS=Betriebssystem des Browsers
-ListOfSecurityEvents=Liste der sicherheitsrelevanten Ereignisse
-SecurityEventsPurged=Security-Ereignisse gelöscht
-LogEventDesc=Hier können Sie die Protokollierungseinstellungen für sicherheitsrelevante Ereignisse anpassen. Administratoren können die entsprechenden Inhalte unter <b>Systemwerkzeuge-Protokoll</b> einsehen. Achtung: Diese Funktion kann zu erhöhtem Datenaufkommen in der Datenbank führen.
-AreaForAdminOnly=Diese Funktionen stehen ausschliesslich <b>Administratoren</b> zur Verfügung. Administrationsfunktionen und -hilfe werden in dolibarr durch die folgenden Symbole dargestellt:
-SystemInfoDesc=Verschiedene systemrelevante, technische Informationen - Lesemodus und nur für Administratoren sichtbar.
 SystemAreaForAdminOnly=Dieser Bereich steht ausschliesslich Administratoren zur Verfügung. Keine der Benutzerberechtigungen kann dies ändern.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
-DisplayDesc=Hier können Sie die Oberfläche, sowie das allgemeine 'Look and Feel' des Systems anpassen
-AvailableModules=Verfügbare Module
-ToActivateModule=Zum Aktivieren von Modulen gehen Sie zu Start->Einstellungen->Module
-SessionTimeOut=Sitzungszeitbegrenzung
-SessionExplanation=Dieser Wert garantiert, dass eine Sitzung nie vor Zeitablauf beendet wird. Die PHP-Sitzungsverwaltung garantiert jedoch nicht, dass eine Sitzung wirklich nach Ablauf dieser Zeit beendet wird. Hierzu kann es kommen, wenn ein System zur Sitzungscache-Bereinigung im Einsatz ist.<br>Hinweis: ohne spezielles System wird PHP die Sitzung nach etwa <b>%s/%s</b> beenden - allerdings erst nach dem Start einer anderen Sitzung.
-TriggersAvailable=Verfügbare Trigger
 TriggersDesc=Trigger sind Dateien, die nach einem Kopieren in das Verzeichnis <b>htdocs/core/triggers</b> das Workflow-Verhalten des Systems beeinflussen. Diese stellen neue, mit Systemereignissen verbundene, Ereignisse dar (Neuer Geschäftspartner angelegt, Rechnung freigegeben, ...).
 TriggerDisabledByName=Trigger in dieser Datei sind durch das <b>-NORUN</b>-Suffix in ihrem Namen deaktviert.
-TriggerDisabledAsModuleDisabled=Trigger in dieser Datei sind durch das übergeordnete Modul <b>%s</b> deaktiviert.
-TriggerAlwaysActive=Trigger in dieser Datei sind unabhängig der Modulkonfiguration immer aktiviert.
-TriggerActiveAsModuleActive=Trigger in dieser Datei sind durch das übergeordnete Modul <b>%s</b> aktiviert.
-GeneratedPasswordDesc=Definieren Sie hier das Schema nach dem automatisch generierte Passwörter erstellt werden sollen.
 DictionaryDesc=Definieren Sie hier alle Defaultwerte. Sie können die vordefinierten Werte mit ihren eigenen ergänzen.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">check here</a>.
 MiscellaneousDesc=Alle anderen sicherheitsrelevanten Parameter werden hier definiert.
-LimitsSetup=Limits und Genauigkeit Einstellungen
-LimitsDesc=Hier können Sie Grenzwerte, Genauigkeitseinstellungen und das Rundungsverhalten einstellen.
-MAIN_MAX_DECIMALS_UNIT=Dezimalstellen max. für Stückpreise
-MAIN_MAX_DECIMALS_TOT=Dezimalstellen max. für Gesamtsummen
-MAIN_MAX_DECIMALS_SHOWN=Dezimalstellen max. für auf dem Bildschirm angezeigte Preise (Fügen Sie <b>...</b> nach dieser Nummer ein, wenn Sie <b>...</b> sehen wollen, falls ein Bildschirmpreis abgeschnitten wurde.
 MAIN_ROUNDING_RULE_TOT=Rundungseinstellung (Für Länder in denen nicht auf 10er basis Gerundet wird. zB. 0.05 damit in 0.05 Schritten gerundet wirb)
-UnitPriceOfProduct=Nettostückpreis
 TotalPriceAfterRounding=Gesamtpreis (Netto/MwSt./Brutto) gerundet
-ParameterActiveForNextInputOnly=Die Einstellungen werden erst bei der nächsten Eingabe wirksam
 NoEventOrNoAuditSetup=Keine sicherheitsrelevanten Protokollereignisse. Überprüfen Sie die Aktivierung dieser Funktionen unter 'Einstellunge-Sicherheit-Protokoll'.
-NoEventFoundWithCriteria=Kein sicherheitsrelevantes Protokollereignis zu Ihren Suchkriterien gefunden
-SeeLocalSendMailSetup=Lokale sendmail-Einstellungen anzeigen
-BackupDesc=Um eine vollständige Systemsicherung durchzuführen müssen Sie:
-BackupDesc2=Sichern des Dokumenten-Verzeichnis (<b>%s</b>;) welches alle hochgeladenen und erzeugten Dateien enthält (dies beinhaltet alle Dump-Dateien die in Schritt 1 erzeugt wurden).
-BackupDesc3=Sicherung der Datenbank  (<b>%s</b>) über Dump-Befehl anlegen. Dafür können Sie folgende Assistenten verwenden.
-BackupDescX=Bewahren Sie die archivierten Verzeichnisse an einem sicheren Ort auf.
-BackupDescY=Bewahren Sie den Datenbank-Dump an einem sicheren Ort auf.
-BackupPHPWarning=Datensicherung kann mit dieser Methode nicht garantiert werden. Bevorzugen Sie die vorherige.
-RestoreDesc=Um eine Systemsicherung wiederherzustellen, müssen Sie:
 RestoreDesc2=Wiederherstellung von Archive Datei (zip Datei zum Beispiel)\nvom documents Verzeichnis um den documents Datei-Baum im documents verzeichnis in eine neue Dolibarr Installation oder in ein bestehendes Dolibarr Verzeichnis (<b>%s</b>).
-RestoreDesc3=* Die Datenbanksicherung aus dem Dump in eine neue Dolibarr-Installation oder das bestehende System (<b>%s</b>) zurückspielen. Achtung: Nach Beendigung dieses Vorganges müssen Sie sich mit dem Benutzernamen/Passwort-Paar zum Zeitpunkt der Sicherung am System anmelden. Zur Wiederherstellung der Datenbank steht Ihnen der folgende Assistent zur Verfügung:
-RestoreMySQL=MySQL Import
-ForcedToByAModule= Diese Regel wird <b>%s</b> durch ein aktiviertes Modul aufgezwungen
-PreviousDumpFiles=Vorige Datenbanksicherungen
-WeekStartOnDay=Wochenstart
-RunningUpdateProcessMayBeRequired=Eine Systemaktualisierung scheint erforderlich (Programmversion %s unterscheidet sich von Datenbankversion %s)
-YouMustRunCommandFromCommandLineAfterLoginToUser=Diesen Befehl müssen Sie auf der Kommandozeile (nach Login auf der Shell mit Benutzer <b>%s</b>) ausführen.
-YourPHPDoesNotHaveSSLSupport=Ihre PHP-Konfiguration unterstützt keine SSL-Verschlüsselung
 DownloadMoreSkins=Weitere grafische Oberflächen/Themes herunterladen
-SimpleNumRefModelDesc=Liefere eine Nummer im Format %syymm-nnnn zurück, wobei YY für das Jahr, MM für das Monat und nnnn für eine 4-stellige, nicht unterbrochene Zahlensequenz steht
-ShowProfIdInAddress=Zeige professionnal ID mit Adressen auf Dokumente
 ShowVATIntaInAddress=Ausblenden MwSt. Nummer in Adressen auf Dokumenten.
-TranslationUncomplete=Teilweise Übersetzung
-MAIN_DISABLE_METEO=Deaktivere Wetteransicht
-TestLoginToAPI=Testen Sie sich anmelden, um API
-ProxyDesc=Einige Features von Dolibarr müssen einen Internet-Zugang zu Arbeit haben. Definieren Sie hier Parameter für diese. Wenn die Dolibarr Server hinter einem Proxy-Server, erzählt jene Parameter Dolibarr wie man Internet über ihn zugreifen.
-ExternalAccess=Externer Zugriff
-MAIN_PROXY_USE=Verwenden Sie einen Proxy-Server (sonst direkten Zugang zum Internet)
-MAIN_PROXY_HOST=Name / Anschrift des Proxy-Servers
-MAIN_PROXY_PORT=Port of Proxy-Server
-MAIN_PROXY_USER=Passwort an, um den Proxy-Server verwenden
-MAIN_PROXY_PASS=Kennwort ein, um den Proxy-Server verwenden
 DefineHereComplementaryAttributes=Definieren Sie hier alle Attribute, die nicht standardmässig vorhanden sind, und in %s unterstützt werden sollen.
-ExtraFields=Ergänzende Attribute
-ExtraFieldsLines=Ergänzende Attribute (Zeilen)
 ExtraFieldsSupplierOrdersLines=Ergänzende Attribute (in Bestellungszeile)
-ExtraFieldsSupplierInvoicesLines=Ergänzende Attribute (in Rechnungszeile)
 ExtraFieldsThirdParties=Ergänzende Attribute (Geschäftspartner)
-ExtraFieldsContacts=Ergänzende Attribute (Kontakt)
-ExtraFieldsMember=Ergänzende Attribute (Mitglied)
-ExtraFieldsMemberType=Ergänzende Attribute (Mitglied)
-ExtraFieldsCustomerInvoices=Ergänzende Attribute (Rechnungen)
-ExtraFieldsSupplierOrders=Ergänzende Attribute (Bestellungen)
-ExtraFieldsSupplierInvoices=Ergänzende Attribute (Rechnungen)
-ExtraFieldsProject=Ergänzende Attribute (Projekte)
-ExtraFieldsProjectTask=Ergänzende Attribute (Aufgaben)
-ExtraFieldHasWrongValue=Attribut %s hat einen falschen Wert.
-AlphaNumOnlyLowerCharsAndNoSpace=nur Kleinbuchstaben und Zahlen, keine Leerzeichen
 SendmailOptionNotComplete=Achtung, auf einigen Linux-Systemen, E-Mails von Ihrem E-Mail zu senden, sendmail Ausführung Setup muss conatins Option-ba (Parameter mail.force_extra_parameters in Ihre php.ini-Datei). Wenn einige Empfänger niemals E-Mails erhalten, versuchen, diese Parameter mit PHP mail.force_extra_parameters =-ba) zu bearbeiten.
-PathToDocuments=Dokumentenpfad
-PathDirectory=Verzeichnispfad
-SendmailOptionMayHurtBuggedMTA=Feature-Mails mit der Methode "PHP mail direkt" senden generiert eine Mail-Nachricht, die nicht korrekt möglicherweise von einigen Mail-Servern empfangen analysiert werden. Ergebnis ist, dass manche Mails nicht von Menschen, die von thoose abgehört Plattformen gehostet gelesen werden. Es ist bei einigen Internet-Providern (Ex: Orange in Frankreich). Dies ist nicht ein Problem in Dolibarr noch in PHP aber auf empfangende Mail-Server. Sie können jedoch hinzuzufügen MAIN_FIX_FOR_BUGGED_MTA Option auf 1 in die Setup - andere zu Dolibarr ändern, um dies zu vermeiden. Sie können jedoch Probleme mit anderen Servern, dass die Achtung streng dem SMTP-Standard zu erleben. Die andere Lösung (empfohlen) ist es, die Methode "SMTP-Socket-Bibliothek", die keine Nachteile hat benutzen.
-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: <strong>User display setup</strong> tab of 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
-TranslationString=Translation string
-CurrentTranslationString=Current translation string
-WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
-NewTranslationStringToShow=New translation string to show
-OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Summe aktivierter Module: <b>%s</b> / <b>%s</b>
-YouMustEnableOneModule=Sie müssen mindestens 1 Modul aktivieren
-ClassNotFoundIntoPathWarning=Klasse %s nicht innerhalb PHP-Pfad gefunden
-YesInSummer=Ja im Sommer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
-SuhosinSessionEncrypt=Sitzungsspeicher durch Suhosin verschlüsselt
-ConditionIsCurrently=Einstellung ist aktuell %s
-YouUseBestDriver=Sie verwenden den Treiber %s, dies ist derzeit der beste verfügbare.
-YouDoNotUseBestDriver=Sie verwenden Treiber %s, aber der Treiber %s wird empfohlen.
-NbOfProductIsLowerThanNoPb=Sie haben nur %s Produkte/Leistungen in der Datenbank. Daher ist keine bestimmte Optimierung erforderlich.
-SearchOptim=Such Optimierung
-YouHaveXProductUseSearchOptim=Sie haben %s Produkte/Leistungen in die Datenbank. Sie sollten die Konstante PRODUCT_DONOTSEARCH_ANYWHERE auf 1 unter  Start-Einstellungen-Andere Einstellungen hinzufügen, wodurch das Suchlimit in der Datenbank von  Anfang des Strings möglich gemacht wird,  und der Index verwendet wird, dadurch sollten sie sofort Antwort auf Ihre suche bekommen.
-BrowserIsOK=Sie benutzen den Webbrowser %s. Dieser ist hinsichtlich Sicherheit und Leistung ok.
-BrowserIsKO=Sie benutzen den Webbrowser %s. Dieser ist bekannt für Sicherheitsprobleme, schlechte Leistung und Zuverlässigkeit. Wir empfehlen Ihnen, Firefox, Chrome, Opera oder Safari zu nutzen.
-XDebugInstalled=XDebug installiert.
-XCacheInstalled=XCache installiert.
 AddRefInList=Darstellung Kunden- /Lieferanten- Nr. in Listen (Listbox oder ComboBox) und die meisten von Hyperlinks. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp".
 AskForPreferredShippingMethod=Bevorzugte Kontaktmethode bei Partnern fragen.
-FieldEdition=Bearbeitung von Feld %s
-FillThisOnlyIfRequired=Beispiel: +2 (nur ausfüllen, wenn Sie Probleme mit der Zeitzone haben)
-GetBarCode=Erhalten Sie einen Barcode
-##### Module password generation
-PasswordGenerationStandard=Generiere ein Passwort nach dem internen Systemalgorithmus: 8 Zeichen, Zahlen und Kleinbuchstaben.
 PasswordGenerationNone=Keine automatische Passwortvorschläge, das Passwort muss manuell eingegeben werden.
-PasswordGenerationPerso=Return a password according to your personally defined configuration.
-SetupPerso=According to your configuration
-PasswordPatternDesc=Password pattern description
-##### Users setup #####
-RuleForGeneratedPasswords=Regel für automatisch erstellte Passwörter
-DisableForgetPasswordLinkOnLogonPage='Passwort vergessen'-Link nicht auf der Anmeldeseite anzeigen
-UsersSetup=Benutzermoduleinstellungen
-UserMailRequired=Für das Erstellen eines neuen Benutzers ist dessen E-Mail-Adresse erforderlich
-##### HRM setup #####
-HRMSetup=HRM module setup
-##### Company setup #####
-CompanySetup=Unternehmenseinstellungen
 CompanyCodeChecker=Modul für Geschäftspartner-Code-Erstellung (Kunden oder Lieferanten)
-AccountCodeManager=Modul für Kontierungs-Code-Erstellung (Kunden oder Lieferanten)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
-NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
-NotificationsDescGlobal=* or by setting global target emails in module setup page.
-ModelModules=Dokumentvorlagenmodul
-DocumentModelOdt=Erstellen von Dokumentvorlagen im OpenDocuments-Format (.odt- oder .ods-Dateien für OpenOffice, KOffice, TextEdit, ...)
-WatermarkOnDraft=Wasserzeichen auf Entwurf
-JSOnPaimentBill=Feature aktivieren, um Zahlungs-Zeilen in Zahlungs-Formularen automatisch zu füllen
 CompanyIdProfChecker=Berufs-Identifikation einzigartige
-MustBeUnique=Must be unique?
-MustBeMandatory=Mandatory to create third parties?
-MustBeInvoiceMandatory=Mandatory to validate invoices?
-##### Webcal setup #####
-WebCalUrlForVCalExport=Ein Eportlink für das Format <b>%s</b> findet sich unter folgendem Link: %s
-##### Invoices #####
-BillsSetup=Rechnungsmoduleinstellungen
-BillsNumberingModule=Rechnungs- und Gutschriftsnumerierungsmodul
-BillsPDFModules=PDF-Rechnungsvorlagen
-CreditNote=Gutschrift
-CreditNotes=Gutschriften
-ForceInvoiceDate=Rechnungsdatum ist zwingend Freigabedatum
-SuggestedPaymentModesIfNotDefinedInInvoice=Empfohlene Zahlungsart für Rechnung falls nicht in gesondert definiert
 SuggestPaymentByRIBOnAccount=Zahlung per Lastschrift vorschlagen
 SuggestPaymentByChequeToAddress=Zahlung per Scheck vorschlagen
-FreeLegalTextOnInvoices=Freier Rechtstext für Rechnungen
-WatermarkOnDraftInvoices=Wasserzeichen auf Rechnungs-Entwurf (keines, falls leer)
-PaymentsNumberingModule=Zahlungen Nummerierungs Module
-SuppliersPayment=Lieferantenzahlungen
 SupplierPaymentSetup=Lieferantenzahlungen einrichten
-##### Proposals #####
-PropalSetup=Angebotsmoduleinstellungen
-ProposalsNumberingModules=Angebotsnumerierungs-Module
 ProposalsPDFModules=PDF-Anbebotsmodule
 FreeLegalTextOnProposal=Freier Rechtstext für Angebote
-WatermarkOnDraftProposal=Wasserzeichen auf Angebots-Entwurf (keines, falls leer)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Fragen Sie nach dem Bankkonto bei einem Angebot
-##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
-WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
-##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
-##### Orders #####
-OrdersSetup=Bestellverwaltungseinstellungen
-OrdersNumberingModules=Bestellnumerierungs-Module
-OrdersModelModule=Bestellvorlagenmodule
-FreeLegalTextOnOrders=Freier Rechtstext auf Bestellungen
 WatermarkOnDraftOrders=Wasserzeichen auf Bestellungs-Entwurf (keines, wenn leer)
-ShippableOrderIconInList=In Auftragsliste ein entsprechendes Icon zufügen, wenn die Bestellung versandbereit ist
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Fragen Sie nach der Ziel-Bankverbindung
-##### Interventions #####
 InterventionsSetup=Servicemoduleinstellungen
 FreeLegalTextOnInterventions=Freier Rechtstext auf Interventions Dokument
 FicheinterNumberingModules=Intervention Nummerierung Module
 TemplatePDFInterventions=Intervention Karte Dokumenten Modelle
 WatermarkOnDraftInterventionCards=Wasserzeichen auf Interventionskarte Dokumente (keines, wenn leer)
-##### Contracts #####
-ContractsSetup=Verträge/Abonnements-Modul Einstellungen
-ContractsNumberingModules=Verträge Nummerierung Module
-TemplatePDFContracts=Vertragsvorlagen
-FreeLegalTextOnContracts=Freier Text in Verträgen
-WatermarkOnDraftContractCards=Wasserzeichen auf Vertrags-Entwurf (keines, wenn leer)
-##### Members #####
 MembersSetup=Mitglieder-Modul Setup
-MemberMainOptions=Haupteinstellungen
-AdherentLoginRequired= Verwalten Sie eine Anmeldung für jedes Mitglied
-AdherentMailRequired=Für das Anlegen eines neuen Mitglieds ist eine E-Mail-Adresse erforderlich
 MemberSendInformationByMailByDefault=Das Kontrollkästchen für den automatischen Mail-Bestätigungsversand an Mitglieder (bei Freigabe oder neuem Abonnement) ist standardmässig aktiviert
-##### LDAP setup #####
-LDAPSetup=LDAP-Einstellungen
-LDAPGlobalParameters=Globale LDAP-Parameter
-LDAPUsersSynchro=Benutzer
-LDAPGroupsSynchro=Gruppen
-LDAPContactsSynchro=Kontakte
-LDAPMembersSynchro=Mitglieder
-LDAPSynchronization=LDAP-Synchronisation
-LDAPFunctionsNotAvailableOnPHP=LDAP-Funktionen in Ihrer PHP-Konfiguration nicht vrefügbar
-LDAPToDolibarr=LDAP->Dolibarr
-DolibarrToLDAP=Dolibarr->LDAP
-LDAPNamingAttribute=Schlüssel in LDAP
-LDAPSynchronizeUsers=dolibarr-Benutzer mit LDAP synchronisieren
-LDAPSynchronizeGroups=dolibarr-Gruppen mit LDAP synchronisieren
-LDAPSynchronizeContacts=dolibarr-Kontakte mit LDAP synchronisieren
-LDAPSynchronizeMembers=dolibarr-Stiftungsmitglieder mit LDAP synchronisieren
-LDAPPrimaryServer=Primärer LDAP-Server
-LDAPSecondaryServer=Sekundärer LDAP-Server
-LDAPServerPort=Server-Port
-LDAPServerPortExample=Standard-Port: 389
-LDAPServerProtocolVersion=Protokoll-Version
-LDAPServerUseTLS=TLS
-LDAPServerUseTLSExample=Ihr LDAP-Server TLS
-LDAPServerDn=Server DN
-LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
-LDAPPassword=Administrator-Passwort
-LDAPUserDn=Benutzer DN
-LDAPUserDnExample=Vollständige DN (zB: ou=users,dc=society,dc=com)
-LDAPGroupDn=Gruppen DN
-LDAPGroupDnExample=Vollständige DN (zB: ou=users,dc=society,dc=com)
-LDAPServerExample=Server-Adresse (zB: localhost, 192.168.0.2, ldaps://ldap.example.com/)
 LDAPServerDnExample=Complete DN (zB: dc=company,dc=com)
-LDAPDnSynchroActive=Benutzer und Gruppensynchronisation
-LDAPDnSynchroActiveExample=LDAP zu dolibarr oder dolibarr zu LDAP-Synchronisation
-LDAPDnContactActive=Kontaktesynchronisation
-LDAPDnContactActiveExample=Aktivierte/Deaktivierte Synchronisation
-LDAPDnMemberActive=Mitgliedersynchronisation
-LDAPDnMemberActiveExample=Aktivierte/Deaktivierte Synchronisation
-LDAPContactDn=Dolibarr Kontakte DN
-LDAPContactDnExample=Vollständige DN (zB: ou=users,dc=society,dc=com)
-LDAPMemberDn=Dolibarr Mitglieder DN
 LDAPMemberDnExample=Complete DN (ex: ou=members,dc=society,dc=Vollständige DN (zB: ou=users,dc=society,dc=com)
-LDAPMemberObjectClassList=Liste der objectClass
-LDAPMemberObjectClassListExample=Liste der objectClass-definierenden Eintragsattribute (z.B.: top,inetOrgPerson oder top,user für ActiveDirectory)
-LDAPUserObjectClassList=Liste der objectClass
-LDAPUserObjectClassListExample=Liste der objectClass-definierenden Eintragsattribute (z.B.: top,inetOrgPerson oder top,user für ActiveDirectory)
-LDAPGroupObjectClassList=Liste der objectClass
-LDAPGroupObjectClassListExample=Liste der objectClass-definierenden Eintragsattribute(z.B.: top, groupOfUniqueNames)
-LDAPContactObjectClassList=Liste der objectClass
-LDAPContactObjectClassListExample=Liste der objectClass-definierenden Eintragsattribute (z.B.: top,inetOrgPerson oder top,user für ActiveDirectory)
-LDAPTestConnect=LDAP-Verbindung testen
-LDAPTestSynchroContact=Kontaktsynchronisation testen
-LDAPTestSynchroUser=Benutzersynchronisation testen
 LDAPTestSynchroGroup=Gruppenynchronisation testen
 LDAPTestSynchroMember=Mitgliederynchronisation testen
-LDAPTestSearch= LDAP-Suche testen
-LDAPSynchroOK=Synchronisationstest erfolgreich
-LDAPSynchroKO=Synchronisationstest fehlgeschlagen
-LDAPSynchroKOMayBePermissions=Synchronisationstest fehlgeschlagen. Überprüfen Sie die richtige Konfiguration der Serververbindung und die Erlaubnis für LDAP-Updates
-LDAPTCPConnectOK=TCP-Verbindung zum LDAP-Server erfolgreich (Server=%s, Port=%s)
-LDAPTCPConnectKO=TCP-Verbindung zum LDAP-Server fehlgeschlagen (Server= %s, Port= %s)
-LDAPBindOK=Verbindung/Authentifizierung am LDAP-Server erfolgreich (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPBindKO=Verbindung/Authentifizierung am LDAP-Server fehlgeschlagen (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPSetupForVersion3=LDAP-Server für Version 3 konfiguriert
-LDAPSetupForVersion2=LDAP-Server für Version 2 konfiguriert
-LDAPDolibarrMapping=Dolibarr Mapping
-LDAPLdapMapping=LDAP-Mapping
-LDAPFieldLoginUnix=Benutzername (Unix)
-LDAPFieldLoginExample=Beispiel: uid
-LDAPFilterConnection=Suchfilter
-LDAPFilterConnectionExample=Example : &(objectClass=inetOrgPerson)
-LDAPFieldLoginSamba=Benutzername (Samba,Active Directory)
-LDAPFieldLoginSambaExample=Beispiel : samaccountname
-LDAPFieldFullname=Vorname Nachname
-LDAPFieldFullnameExample=Beispiel : cn
-LDAPFieldPasswordNotCrypted=Passwort nicht verschlüsselt
-LDAPFieldPasswordCrypted=Passwort verschlüsselt
-LDAPFieldPasswordExample=Beispiel : userPassword
-LDAPFieldCommonNameExample=Beispiel: cn
-LDAPFieldName=Name
-LDAPFieldNameExample=Beispiel: sn
-LDAPFieldFirstName=Vorname
-LDAPFieldFirstNameExample=Beispiel: givenname
-LDAPFieldMail=E-Mail-Adresse
-LDAPFieldMailExample=Beispiel: E-Mail
-LDAPFieldPhone=Telefonnummer, Beruf.
-LDAPFieldPhoneExample=Beispiel : Telefonnummer
-LDAPFieldHomePhone=Privatnummer
-LDAPFieldHomePhoneExample=Beispiel : Telefon Privat
-LDAPFieldMobile=Handy
-LDAPFieldMobileExample=Beispiel : Handynummer
-LDAPFieldFax=Faxnummer
-LDAPFieldFaxExample=Beispiel : Faxnummer
 LDAPFieldAddress=Strasse
 LDAPFieldAddressExample=Beispiel : Strasse
-LDAPFieldZip=PLZ
-LDAPFieldZipExample=Beispiel : plz
-LDAPFieldTown=Stadt
 LDAPFieldTownExample=Beispiel: stadt
-LDAPFieldCountry=Land
-LDAPFieldDescription=Beschreibung
-LDAPFieldDescriptionExample=Beispiel : Beschreibung
-LDAPFieldNotePublic=öffentlicher Hinweis
-LDAPFieldNotePublicExample=Beispiel : Beschreibung
-LDAPFieldGroupMembers= Gruppenmitglieder
-LDAPFieldGroupMembersExample= Beispiel: uniqueMember
-LDAPFieldBirthdate=Geburtsdatum
-LDAPFieldCompany=Firma
-LDAPFieldCompanyExample=Beispiel: firma
-LDAPFieldSid=SID
-LDAPFieldSidExample=Beispiel : objectsid
-LDAPFieldEndLastSubscription=Auslaufdatum des Abonnements
-LDAPFieldTitle=Position
-LDAPFieldTitleExample=Beispiel: Titel
-LDAPSetupNotComplete=LDAP-Setup nicht vollständig (siehe andere Tabs)
-LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Kein Administrator oder Passwort gefunden. LDAP-Zugang wird anonym und im Lese-Modus ausgeführt.
-LDAPDescContact=Auf dieser Seite definieren Sie die LDAP-Attribute im LDAP-Baum für jeden Datensatz zu dolibarr-Kontakten .
-LDAPDescUsers=Auf dieser Seite definieren Sie die LDAP-Attribute im LDAP-Baum für jeden Datensatz zu dolibarr-Benutzern.
-LDAPDescGroups=Auf dieser Seite definieren Sie die LDAP-Attribute im LDAP-Baum für jeden Datensatz zu dolibarr-Gruppen.
-LDAPDescMembers=Auf dieser Seite definieren Sie die LDAP-Attribute im LDAP-Baum für jeden Datensatz zu dolibarr-Mitgliedern.
 LDAPDescValues=Die Beispielwerte für <b>OpenLDAP</b> verfügen über folgende Muster: <b>core.schema, cosine.schema, inetorgperson.schema</b>. Wenn Sie diese Werte für OpenLDAP verwenden möchten, passen Sie bitte die LDAP-Konfigurationsdateu <b>slapd.conf</b> entsprechend an, damit all diese Muster geladen werden.
-ForANonAnonymousAccess=Für einen authentifizierten Zugang (z.B. für Schreibzugriff)
-PerfDolibarr=Leistungs-Einstellungen/Optimierungsreport
-YouMayFindPerfAdviceHere=Auf dieser Seite finden Sie einige Überprüfungen oder Hinweise zur Leistung.
-NotInstalled=Nicht installiert, Ihr Server wird dadurch nicht verlangsamt.
 ApplicativeCache=Applicative Cache
 MemcachedNotAvailable=Kein Cache Anwendung gefunden. \nSie können die Leistung durch die Installation des Cache-Server Memcached und die Aktivierung des Anwendungs Cache Modul\n<br>hier mehr Informationen <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>\nverbessern.\nBeachten Sie, dass viele Billig-Provider keine solche Cache-Server in ihrer Infrastruktur anbieten.
 MemcachedModuleAvailableButNotSetup=Module memcached für applicative Cache gefunden, aber Setup-Modul ist nicht vollständig.
 MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled..
-OPCodeCache=OPCode Cache
-NoOPCodeCacheFound=Kein OPCode Cache gefunden.Vielleicht sind Sie mit einem anderen  OPCode Cache wie XCache oder eAccelerator (gut), vielleicht haben Sie keinen OPCode Cache (sehr schlecht) .
-HTTPCacheStaticResources=HTTP Cache für statische Ressourcen (CSS, img, Javascript)
-FilesOfTypeCached=Dateien vom Typ %s werden vom HTTP Server zwischengespeichert
-FilesOfTypeNotCached=Dateien vom Typ %s werden vom HTTP Server nicht zwischengespeichert
-FilesOfTypeCompressed=Dateien vom Typ %s werden vom HTTP Server komprimiert
-FilesOfTypeNotCompressed=Dateien vom Typ %s werden vom HTTP Server nicht komprimiert
-CacheByServer=Vom Server zwischengespeichert
-CacheByClient=Vom Browser zwischengespeichert
-CompressionOfResources=Komprimierung von HTTP Antworten
-TestNotPossibleWithCurrentBrowsers=Automatische Erkennung mit den aktuellen Browsern nicht möglich
-##### Products #####
-ProductSetup=Produktmoduleinstellungen
 ServiceSetup=Leistungen Modul Setup
-ProductServiceSetup=Produkte und Leistungen Module Einstellungen
-NumberOfProductShowInSelect=Max. Anzahl der Produkte in Mehrfachauswahllisten (0=kein Limit)
-ViewProductDescInFormAbility=Anzeige der Produktbeschreibungen in Formularen (sonst als ToolTip-  Popup)
-MergePropalProductCard=Aktivieren einer Option unter Produkte/Leistungen  Registerkarte verknüpfte Dateien, um Produkt-PDF-Dokumente um Angebots PDF azur zusammenzuführen, wenn Produkte/Leistungen in dem Angebot sind.
-ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Wenn Sie eine grosse Anzahl von Produkten (> 100.000) haben, können Sie die Geschwindigkeit verbessern, indem Sie in Einstellungen -> Andere die Konstante PRODUCT_DONOTSEARCH_ANYWHERE auf 1 setzen. Die Suche startet dann am Beginn des Strings.
-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)
-SetDefaultBarcodeTypeProducts=Standard-Barcode-Typ für Produkte
 SetDefaultBarcodeTypeThirdParties=Standard-Barcode-Typ für Geschäftspartner
 UseUnits=Definieren Sie eine Masseinheit für die Menge während der Auftrags-, Auftragsbestätigungs- oder Rechnungszeilen-Ausgabe
-ProductCodeChecker= Modul für Produktcode-Erstellung und -Überprüfung (Produkt oder Service)
-ProductOtherConf= Konfiguration Produkt-/Services
-IsNotADir=is not a directory!
-##### Syslog #####
-SyslogSetup=Protokollierungsmodul-Einstellungen
-SyslogOutput=Protokollausgabe
-SyslogFacility=Einrichtung
-SyslogLevel=Level
-SyslogFilename=Dateiname und-pfad
-YouCanUseDOL_DATA_ROOT=Sie können DOL_DATA_ROOT/dolibarr.log als Protokolldatei in Ihrem Dokumentenverzeichnis verwenden. Bei Bedarf können Sie auch den Pfad der Datei anpassen.
 ErrorUnknownSyslogConstant=Konstante %s ist nicht als Protkoll-Konstante definiert
-OnlyWindowsLOG_USER=Windows unterstützt nur LOG_USER
-##### Donations #####
-DonationsSetup=Spendenmoduleinstellungen
-DonationsReceiptModel=Vorlage für Spendenquittungen
-##### Barcode #####
-BarcodeSetup=Barcode-Einstellungen
-PaperFormatModule=Papierformatmodul
-BarcodeEncodeModule=Barcode-Erstellungsmodul
-CodeBarGenerator=Barcode-Generator
-ChooseABarCode=Wählen sie einen Barcode
-FormatNotSupportedByGenerator=Dieses Format wird von gewählten Barcode-Generator nicht unterstützt
-BarcodeDescEAN8=Barcode vom Typ EAN8
-BarcodeDescEAN13=Barcode vom Typ EAN13
-BarcodeDescUPC=Barcode vom Typ UPC
-BarcodeDescISBN=Barcode vom Typ ISBN
-BarcodeDescC39=Barcode vom Typ C39
-BarcodeDescC128=Barcode vom Typ C128
-BarcodeDescDATAMATRIX=Barcodeformat Datamatrix
-BarcodeDescQRCODE=Barcodetyp QR Code
-GenbarcodeLocation=Bar Code Kommandozeilen-Tool (verwendet interne Engine für  einige Barcodetypen)  Muss mit "genbarcode" kompatibel sein. <br> Zum Beispiel: /usr/local/bin/genbarcode
-BarcodeInternalEngine=interne Engine
-BarCodeNumberManager=Manager für die automatische Generierung von Barcode-Nummer
-##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct debit payment orders
-##### ExternalRSS #####
-ExternalRSSSetup=Externe RSS-Einbindungseinstellungen
-NewRSS=Neuer RSS-Feed
-RSSUrl=RSS URL
-RSSUrlExample=Ein interessanter RSS Feed
-##### Mailing #####
-MailingSetup=E-Mail-Kampagnenmodul-Einstellungen
-MailingEMailFrom=E-Mail-Absender (für ausgehende Mails) des E-Mail-Moduls
-MailingEMailError=Antwort-E-Mail-Adresse für unzustellbare E-Mails
-MailingDelay=Wartezeit in Sekunden, bevor die nächste Nachricht gesendet wird
-##### Notification #####
-NotificationSetup=E-Mail Benachrichtigungs-Einstellungen
-NotificationEMailFrom=E-Mail-Absender (für ausgehende Mails) des Benachrichtigungsmoduls
-FixedEmailTarget=Festes E-Mail-Ziel
-##### Sendings #####
-SendingsSetup=Versandmoduleinstellungen
-SendingsReceiptModel=Versandbelegsvorlage
-SendingsNumberingModules=Nummerierungsmodell Auslieferungen
-SendingsAbility=Unterstützung von Versand-Dokumenten für Kundenlieferungen
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
-FreeLegalTextOnShippings=Freier Text auf Lieferungen
-##### Deliveries #####
-DeliveryOrderNumberingModules=Zustellscheinnumerierungs-Module
-DeliveryOrderModel=Zustellscheinnumerierung
-DeliveriesOrderAbility=Unterstütze Zustellscheine für Produkte
-FreeLegalTextOnDeliveryReceipts=Freier Rechtstext auf Empfangsbelegen
-##### FCKeditor #####
-AdvancedEditor=Erweiterter Editor
-ActivateFCKeditor=FCKEditor aktivieren für:
 FCKeditorForCompany=WYSIWIG Erstellung/Bearbeitung der Firmennformationen und Notizen (ausser Produkte/Services)
-FCKeditorForProduct=WYSIWIG Erstellung/Bearbeitung von Produkt-/Serviceinformationen und Notizen
-FCKeditorForProductDetails=WYSIWG Erstellung/Bearbeitung der Produktdetails für alle Dokumente( Angebote, Bestellungen, Rechnungen etc...) Achtung: Die Option führt potentiell zu Problemen mit Umlauten und Sonderzeichen und wird daher nicht empfohlen.
-FCKeditorForMailing= WYSIWIG Erstellung/Bearbeitung von E-Mails
-FCKeditorForUserSignature=WYSIWIG Erstellung/Bearbeitung von Benutzer-Signaturen
 FCKeditorForMail=WYSIWYG Erstellung/Bearbeitung für gesamte Mail (ausser Werkzeuge->Massenmaling)
-##### OSCommerce 1 #####
-OSCommerceErrorConnectOkButWrongDatabase=Datenbank-Verbindung erfolgreich, es scheint sich allerdings nicht um eine OSCommerce-Datenbank zu handeln (Key %s nicht gefunden in der Tabelle %s).
-OSCommerceTestOk=Verbindung zum Server '%s' für Datenbank '%s' mit Benutzer '%s' erfolgreich.
-OSCommerceTestKo1=Verbindung zum Server '%s' erfolgreich, aber Datenbank '%s' konnte nicht erreicht werden.
-OSCommerceTestKo2=Verbindung zum Server '%s' mit dem Benutzer '%s' fehlgeschlagen.
-##### Stock #####
-StockSetup=Warenlager-Modul Einstellungen
 IfYouUsePointOfSaleCheckModule=Wenn Sie ein Point of Sale-Modul (POS-Modul Standard oder andere externe POS-Module) verwenden, kann diese Einstellung von Ihrem Point Of Sale-Modul übersteuert werden. \nDie meisten POS -Module wurden entwickelt, um sofort eine Rechnung zu erstellen und das Lager standardmässig zu verringern, egal welche Optionen hier ausgewählt wurde. \nAlso, wenn Sie während einem Verkauf einen Lagerabgang in Ihrem Point of Sale möchten oder nicht, so müssen sie auch die Konfiguration des POS-Modules überprüfen.
-##### Menu #####
-MenuDeleted=Menü gelöscht
-Menus=Menüs
-TreeMenuPersonalized=Personalisierte Baumansicht
-NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
-NewMenu=Neues Menü
-Menu=Menüauswahl
-MenuHandler=Menü-Handler
-MenuModule=Quellmodul
-HideUnauthorizedMenu= Hide unbefugte Menüs (grau)
-DetailId=Menü ID
-DetailMenuHandler=Menü-Handler für die Anzeige des neuen Menüs
-DetailMenuModule=Modulname falls Menüeintrag aus einem Modul stimmt
-DetailType=Art des Menüs (Top oder Links)
 DetailTitre=Menübezeichner oder Bezeichnungs-Code für Übersetzung
-DetailUrl=Ziel-URL für Menüeintrag (Absolute URL oder externer Link mit http://)
-DetailEnabled=Einstellungen für die Anzeige der Einträge
-DetailRight=Zustand für die Anzeige nicht-authorisierter, grauer Menüs
 DetailLangs=Sprachdateiname für Bezeichnungsübersetzung
-DetailUser=Intern/Extern/Alle
-Target=Ziel
-DetailTarget=Linkziel (_blank und top öffnen ein neues Fenster)
-DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu)
-ModifMenu=Menü bearbeiten
-DeleteMenu=Menüeintrag löschen
-ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
-FailedToInitializeMenu=Failed to initialize menu
-##### Tax #####
-TaxSetup=Steuer-, Sozialabgaben- und Dividendenmodul-Einstellungen
 OptionVatMode=MwSt. fällig
-OptionVATDefault=Barbestandsbasis
-OptionVATDebitOption=Rückstellungsbasis
-OptionVatDefaultDesc=Mehrwertsteuerschuld entsteht: <br>- Bei Lieferung/Zahlung für Waren<br>- Bei Zahlung für Leistungen
-OptionVatDebitOptionDesc=Mehrwertsteuerschuld entsteht: <br>- Bei Lieferung/Zahlung für Waren<br>- Bei Rechnungslegung (Lastschrift) für Dienstleistungen
 SummaryOfVatExigibilityUsedByDefault=Standardmässiger Zeitpunkt der MwSt.-Fälligkeit in Abhängigkeit zur derzeit gewählten Option:
-OnDelivery=Bei Lieferung
-OnPayment=Bei Zahlung
-OnInvoice=Bei Rechnungslegung
-SupposedToBePaymentDate=Zahlungsdatum in Verwendung falls Lieferdatum unbekannt
-SupposedToBeInvoiceDate=Rechnungsdatum verwendet
-Buy=Kaufen
-Sell=Verkaufen
-InvoiceDateUsed=Rechnungsdatum verwendet
-YourCompanyDoesNotUseVAT=Für Ihr Unternehmen wurde keine MwSt.-Verwendung definiert (Start-Einstellungen-Unternehmen/Stiftung), entsprechend stehen in der Konfiguration keine MwSt.-Optionen zur Verfügung.
-AccountancyCode=Kontierungs-Code
-AccountancyCodeSell=Verkaufskonto-Code
-AccountancyCodeBuy=Einkaufskonto-Code
-##### Agenda #####
-AgendaSetup=Aufgaben/Termine-Modul Einstellungen
-PasswordTogetVCalExport=Passwort für den VCal-Export
-PastDelayVCalExport=Keine Termine exportieren die älter sind als
 AGENDA_USE_EVENT_TYPE=Verwenden der Termintypen \nEinstellen unter (Start -> Einstellungen -> Wörterbücher -> Ereignistypen)
-AGENDA_USE_EVENT_TYPE_DEFAULT=Diesen Standardwert automatisch als Ereignistyp im  Ereignis Erstell-Formular verwenden.
-AGENDA_DEFAULT_FILTER_TYPE=Diesen Ereignistyp automatisch in den Suchfilter für die Agenda-Ansicht übernehmen
-AGENDA_DEFAULT_FILTER_STATUS=Diesen Ereignisstatus automatisch in den Suchfilter für die Agenda-Ansicht übernehmen
-AGENDA_DEFAULT_VIEW=Welchen Reiter möchten Sie beim Öffnen der Agenda automatisch anzeigen
-AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
-AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### Clicktodial #####
-ClickToDialSetup=Click-to-Dial Moduleinstellungen
-ClickToDialUrlDesc=Definieren Sie hier die URL, die bei einem Klick auf das Telefonsymbol aufgerufen werden soll. In dieser URL können Sie Tags verwenden<br><b>%%1$s</b> wird durch die Telefonnummer des Angerufenen ersetzt<br><b>%%2$s</b> wird durch die Telefonnummer des Anrufers (Ihre) ersetzt<br><b>%%3$s</b> wird durch Ihren Benutzernamen für Click-to-Dial ersetzt (siehe Benutzerdatenblatt)<br><b>%%4$s</b> wird durch Ihr Click-to-Dial-Passwort ersetzt (siehe Benutzerdatenblatt).
-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.
-ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Verwenden Sie diese Methode wenn ein Softphone oder eine andere Telefonielösung auf dem Computer ist. Es wird ein "tel:" Link generiert. Wenn Sie eine Serverbasierte Lösung benötigen, setzen Sie dieses Feld auf Nein und geben die notwendigen Daten im nächsten Feld ein.
-##### Point Of Sales (CashDesk) #####
-CashDesk=Point of Sales
-CashDeskSetup=Kassenmoduleinstellungen
 CashDeskThirdPartyForSell=Standardgeschäftspartner für Kassenverkäufe
-CashDeskBankAccountForSell=Standard-Bargeldkonto für Kassenverkäufe (erforderlich)
-CashDeskBankAccountForCheque= Finanzkonto für Scheckeinlösungen
-CashDeskBankAccountForCB= Finanzkonto für die Einlösung von Bargeldzahlungen via Kreditkarte
-CashDeskDoNotDecreaseStock=Deaktiviere Lagerabgangsbuchung wenn ein Verkauf auf einem Point of Sale durchgeführt wird\n (wenn "Nein", wird die Lagerabgangsbuchung immer durchgeführt , auch wann im Modul Produktbestandsverwaltung was anderes ausgewählt wurde).
-CashDeskIdWareHouse=Lager für Entnahmen festlegen und und erzwingen
 StockDecreaseForPointOfSaleDisabled=Lagerrückgang bei Verwendung von Point of Sale deaktivert
-StockDecreaseForPointOfSaleDisabledbyBatch=Lagerrückgang in POS-Modul ist noch nicht mit dem Chargen- /Seriennummern Management kompatibel.
-CashDeskYouDidNotDisableStockDecease=Sie haben die Reduzierung der Lagerbestände nicht deaktiviert, wenn Sie einen Verkauf auf dem  POS durchführen.\nAuch ist ein Lager/Standort notwendig.
-##### Bookmark #####
-BookmarkSetup=Lesezeichenmoduleinstellungen
 BookmarkDesc=Dieses Modul ermöglicht die Verwaltung von Lesezeichen. Ausserdem können Sie hiermit Verknüpfungen zu internen und externen Seiten im linken Menü anlegen.
-NbOfBoomarkToShow=Maximale Anzeigeanzahl Lesezeichen im linken Menü
-##### WebServices #####
-WebServicesSetup=Webservices-Moduleinstellungen
-WebServicesDesc=Über Aktivierung dieses Moduls können Sie dolibarr zur Anbindung an externe Webservices konfigurieren
-WSDLCanBeDownloadedHere=Die WSDL-Datei der verfügbaren Webservices können Sie hier herunterladen
-EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
-##### API ####
 ApiSetup=API-Modul-Setup
-ApiDesc=Wenn dieses Modul aktiviert ist, wird Dolibarr zum REST Server für diverse web services.
-ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=Sie können das API unter dieser URL verwenden
-OnlyActiveElementsAreExposed=Nur Elemente aus aktiven Modulen sind ungeschützt
-ApiKey=Schlüssel für API
-WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
-##### Bank #####
-BankSetupModule=Bankmoduleinstellungen
-FreeLegalTextOnChequeReceipts=Freier Rechtstext für Scheckbelege
-BankOrderShow=Anzeige Reihenfolge der Bankkonten für Länder mit &quot;detaillierten Bank-Nummer&quot;
-BankOrderGlobal=General
-BankOrderGlobalDesc=Allgemeine Anzeige-Reihenfolge
-BankOrderES=Spanisch
-BankOrderESDesc=Spanisch Anzeigereihenfolge
 ChequeReceiptsNumberingModule=Checknumerierungsmodul
-
-##### Multicompany #####
 MultiCompanySetup=Multi-Company-Moduleinstellungen
-##### Suppliers #####
-SuppliersSetup=Lieferantenmoduleinstellungen
-SuppliersCommandModel=Vollständige Vorlage für Lieferantenbestellungen (Logo, ...)
-SuppliersInvoiceModel=Vollständige Vorlage der Lieferantenrechnung (logo. ..)
-SuppliersInvoiceNumberingModel=Lieferantenrechnungen Zähl-Modell
-IfSetToYesDontForgetPermission=Wenn auf Ja gesetzt, vergessen Sie nicht, die Berechtigungen den dafür erlaubten Gruppen oder Benutzern auch das Recht für die zweite Zustimmung zu geben.
-##### GeoIPMaxmind #####
-GeoIPMaxmindSetup=GeoIP-Maxmind Moduleinstellungen
-PathToGeoIPMaxmindCountryDataFile=Pfad zur Datei mit Maxmind IP-zu-Land Übersetzung. <br>Beispiele:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoOP.dat
-NoteOnPathLocation=Bitte beachten Sie, dass Ihre IP-Länder-Datei in einem von PHP lesbaren Verzeichnis liegen muss (Überprüfen Sie Ihre PHP open_basedir-Einstellungen und die Dateisystem-Berechtigungen).
-YouCanDownloadFreeDatFileTo=Eine <b>kostenlose Demo-Version</b> der Maxmind-GeoIP Datei finden Sie hier: %s
-YouCanDownloadAdvancedDatFileTo=Eine <b>vollständigere Version mit Updates</b> der Maxmind-GeoIP Datei können Sie hier herunterladen: %s
-TestGeoIPResult=Test einer Umwandlung IP -> Land
-##### Projects #####
-ProjectsNumberingModules=Projektnumerierungsmodul
-ProjectsSetup=Projekteinstellungenmodul
-ProjectsModelModule=Projektvorlagenmodul
 TasksNumberingModules=Aufgaben-Nummerierungs-Modul
-TaskModelModule=Vorlage für Arbeitsberichte
-UseSearchToSelectProject=Feld mit Autovervollständigung zur Projektwahl verwenden (Anstelle einer Listbox)
-##### ECM (GED) #####
-##### Fiscal Year #####
-AccountingPeriods=Accounting periods
-AccountingPeriodCard=Accounting period
-NewFiscalYear=New accounting period
-OpenFiscalYear=Open accounting period
-CloseFiscalYear=Close accounting period
-DeleteFiscalYear=Delete accounting period
-ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
-ShowFiscalYear=Show accounting period
-AlwaysEditable=kann immer bearbeitet werden
-MAIN_APPLICATION_TITLE=Erzwinge sichtbaren Anwendungsnamen (Warnung: Setzen Ihres eigenen Namen hier, kann Autofill Login-Funktion abbrechen, wenn Sie DoliDroid Anwendung nutzen)
 NbMajMin=Mindestanzahl Grossbuchstaben
-NbNumMin=Mindestanzahl Ziffern
-NbSpeMin=Mindestanzahl Sonderzeichen
-NbIteConsecutive=Maximale Anzahl sich wiederholender Zeichen
-NoAmbiCaracAutoGeneration=Verwende keine mehrdeutigen Zeichen ("1", "l", "i", "|", "0", "O") für die automatische Generierung
-SalariesSetup=Einstellungen des Gehaltsmodul
-SortOrder=Sortierreihenfolge
-Format=Format
-TypePaymentDesc=0:Kunden-Zahlungs-Typ, 1:Lieferanten-Zahlungs-Typ, 2:Sowohl Kunden- als auch Lieferanten-Zahlungs-Typ
-IncludePath=Include-Pfad (in Variable '%s' definiert)
-ExpenseReportsSetup=Einstellungen des Moduls Spesenabrechnung
 TemplatePDFExpenseReports=Dokumentvorlagen zur Spesenabrechnung Dokument erstellen
-NoModueToManageStockIncrease=Kein Modul zur automatische Bestandserhöhung ist aktiviert. Lager Bestandserhöhung kann nur durch manuelle Eingabe erfolgen.
-YouMayFindNotificationsFeaturesIntoModuleNotification=Sie können Optionen für E-Mail-Benachrichtigungen von Aktivierung und Konfiguration des Moduls "Benachrichtigung" finden.
-ListOfNotificationsPerUser=List of notifications per user*
-ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
-ListOfFixedNotifications=Liste von ausbesserten Benachrichtigungen
-GoOntoUserCardToAddMore=Go on 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 contacts/addresses
-Threshold=Schwellenwert
-BackupDumpWizard=Assistenten zum erstellen der Datenbank-Backup Dump-Datei
-SomethingMakeInstallFromWebNotPossible=Die Installation von dem externen Modul ist aus folgenden Gründen vom Web-Interface nicht möglich:
-SomethingMakeInstallFromWebNotPossible2=Aus diesem Grund wird die Prozess hier beschriebenen Upgrade ist nur manuelle Schritte ein privilegierter Benutzer tun kann.
-InstallModuleFromWebHasBeenDisabledByFile=Installieren von externen Modul aus der Anwendung wurde von Ihrem Administrator deaktiviert. \nSie müssen ihn bitten, die Datei<strong>%s</strong> zu entfernen, um diese Funktion zu ermöglichen.
-ConfFileMuseContainCustom=Installing 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=Zeilen hervorheben bei Mouseover
 HighlightLinesColor=Farbe des Highlight Effekt bei Mausbewegung (wählen sie keine für keinen Highlight Effekt)
 TextTitleColor=Farbe des Seitentitels
 LinkColor=Linkfarbe
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
-NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
-BackgroundColor=Hintergrundfarbe
-TopMenuBackgroundColor=Hintergrundfarbe für Hauptmenü
-TopMenuDisableImages=Hide images in Top menu
-LeftMenuBackgroundColor=Hintergrundfarbe für Menü Links
-BackgroundTableTitleColor=Hintergrundfarbe für Titelzeilen in Tabellen
-BackgroundTableLineOddColor=Hintergrundfarbe für ungerade Tabellenzeilen
-BackgroundTableLineEvenColor=Hintergrundfarbe für gerade Tabellenzeilen
-MinimumNoticePeriod=Kündigungsfrist (Ihre Kündigung muss vor dieser Zeit erfolgen)
 NbAddedAutomatically=Anzahl Tage die den Benutzern jeden Monat automatisch dazuaddiert werden
-EnterAnyCode=Dieses Feld enthält eine Referenz um die Zeile zu identifizieren. Geben Sie einen beliebigen Wert ohne Sonderzeichen ein.
-UnicodeCurrency=Fügen sie zwischen den eckigen Klammern die Unicode Zeichenwerte für das Währungssymbol ein. Beispiele: Für $ den Wert [36], für brasilianische Real R$ [82,36], für € den Wert [8364]
-PositionIntoComboList=Zeilenposition in der Combo-Listen
-SellTaxRate=Mehrwertsteuersatz
 RecuperableOnly=Ja für MwSt. "Wahrgenommene nicht Erstattungsfähig" für einige Regionen in Frankreich. Nein für alle anderen Fälle.
-UrlTrackingDesc=Falls der Liefer- bzw. Transportdienst eine Website für die Statusüberprüfung anbietet, kann die URL hier angegeben werden. Sie können die Zeichenfolge {TRACKID}  in URL-Parameter verwenden,  damit das System den Wert von Tracking-Nummer des Benutzers in die Lieferkarte ersetzen kann.
-OpportunityPercent=Wenn Sie eine Verkaufschance erfassen, wird ein geschätzter Betrag an einem Projekt / Lead definiert. Entsprechend der Chance kann diese Menge durch diese Rate multipliziert werden, um die Gesamtmenge, die alle ihre Möglichkeiten erzeugen, generieren kann. Ist der Prozentwert (zwischen 0 und 100).
-TemplateForElement=Diese Vorlage gehört zu diesem Element
-TypeOfTemplate=Type der Vorlage
-TemplateIsVisibleByOwnerOnly=Vorlage ist nur vom Besitzer sichtbar
-FixTZ=Zeitzonen-Korrektur
-FillFixTZOnlyIfRequired=Beispiel: +2 (nur ausfüllen, wenn Sie Probleme haben)
-ExpectedChecksum=Erwartete Prüfsumme
-CurrentChecksum=Aktuelle Prüfsumme
-ForcedConstants=Required constant values
-MailToSendProposal=Um Angebot zu schicken
-MailToSendOrder=Um Kundenauftrag zu schicken
-MailToSendInvoice=Um Kundenrechnung zu schicken
-MailToSendShipment=Um Lieferschein zu schicken
 MailToSendIntervention=Um Interventions zu schicken
-MailToSendSupplierRequestForQuotation=Um Anfrage an den Lieferanten schicken
-MailToSendSupplierOrder=Um Lieferantenbestellung zu schicken
-MailToSendSupplierInvoice=Um Lieferantenrechnung zu schicken
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-ByDefaultInList=Standardanzeige als Listenansicht
-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 usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Vorlage für Produktdokumente
 ToGenerateCodeDefineAutomaticRuleFirst=Um automatisch Barcodenummern zu generieren, muss zuerst ein Nummerierungmodul im Barcodemodul definiert werden.
 SeeSubstitutionVars=Siehe * für eine Liste der Verfügbaren Variablen
-AllPublishers=All publishers
-UnknownPublishers=Unknown publishers
 AddRemoveTabs=Tab hinzufügen oder entfernen
 AddDictionaries=Wörterbücher hinzufügen
 AddBoxes=Box hinzufügen
@@ -1648,18 +223,6 @@ AddImportProfiles=Importprofil hinzufügen
 AddOtherPagesOrServices=Andere Seite oder Dienst hinzufügen
 AddModels=Dokument- oder Nummerierungvorlage hinzufügen
 AddSubstitutions=Schlüsselersatzwerte hinzufügen
-DetectionNotPossible=Erkennung nicht möglich
-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)
 ListOfAvailableAPIs=Liste der verfügbaren API's
 activateModuleDependNotSatisfied=Modul "%s" hängt vom Modul "%s" ab, welches fehlt. Dadurch funktioniert Modul "%1$s" vermutlich nicht richtig. Installieren Sie sicherheitshalber zuerst das Modul "%2$s" oder deaktivieren Sie das Modul "%1$s"
 CommandIsNotInsideAllowedCommands=Das Kommando ist nicht in der Liste der erlaubten Kommandos, die unter <strong>$dolibarr_main_restrict_os_commands</strong> in der Datei <strong>conf.php</strong> definiert sind.
-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
-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
-TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
-##### Resource ####
-ResourceSetup=Configuration du module Resource
-UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
diff --git a/htdocs/langs/de_CH/bills.lang b/htdocs/langs/de_CH/bills.lang
index 22d195b6695..36416d8d12a 100644
--- a/htdocs/langs/de_CH/bills.lang
+++ b/htdocs/langs/de_CH/bills.lang
@@ -61,8 +61,6 @@ AbsoluteDiscountUse=Diese Art von Krediten verwendet werden kann auf der Rechnun
 AmountPaymentDistributedOnInvoice=Zahlungsbetrag auf Rechnungen verteilen
 PaymentOnDifferentThirdBills=Erlaube Zahlungen an andere Partner, aber mit gleicher übergeordnetem Unternehmung
 FrequencyPer_d=Alle %s Tage
-FrequencyPer_m=Alle %s Monate
-FrequencyPer_y=Alle %s Jahre
 NextDateToExecution=Datum der nächsten Rechnungsstellung
 DateLastGeneration=Datum der letzten Rechnungsstellung
 MaxPeriodNumber=Maximal Anzahl der generierten Rechnungen
diff --git a/htdocs/langs/de_CH/companies.lang b/htdocs/langs/de_CH/companies.lang
index faebfaa8761..a927d99f576 100644
--- a/htdocs/langs/de_CH/companies.lang
+++ b/htdocs/langs/de_CH/companies.lang
@@ -13,7 +13,6 @@ ThirdPartyName=Name des Geschäftspartners
 ThirdParty=Geschäftspartner
 ThirdParties=Geschäftspartner
 ThirdPartyType=Typ des Geschäftspartners
-Company/Fundation=Firma/Verein
 PostOrFunction=Position
 PhoneShort=Telefon
 No_Email=Keine E-Mail-Kampagnen
diff --git a/htdocs/langs/de_CH/cron.lang b/htdocs/langs/de_CH/cron.lang
index ee84919c879..4b8d60d4b28 100644
--- a/htdocs/langs/de_CH/cron.lang
+++ b/htdocs/langs/de_CH/cron.lang
@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - cron
 CronMethodDoesNotExists=Klasse %s hat keine %s Methode
 EnabledAndDisabled=Aktiviert und deaktiviert
-CronInfo=Das Schedule Cron-Jobs Module  erlaubt die geplanten Cron-Jobs die programmiert wurden durchzuführen.
 CronDtStart=Nicht vor
 CronDtEnd=Nicht nach
 CronMaxRun=Max. Anzahl Starts
diff --git a/htdocs/langs/de_CH/main.lang b/htdocs/langs/de_CH/main.lang
index f8b6b5a3067..06f474ced2a 100644
--- a/htdocs/langs/de_CH/main.lang
+++ b/htdocs/langs/de_CH/main.lang
@@ -1,9 +1,5 @@
 # Dolibarr language file - Source file is en_US - main
 DIRECTION=ltr
-# Note for Chinese:
-# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
-# stsongstdlight or cid0cs are for simplified Chinese
-# To read Chinese pdf with Linux: sudo apt-get install poppler-data
 FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=.
@@ -23,799 +19,97 @@ FormatDateHourShort=%d.%m.%Y %H:%M
 FormatDateHourSecShort=%d.%m.%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
-DatabaseConnection=Datenbankverbindung
 NoTemplateDefined=Keine Vorlage für diese E-Mailart definiert
 AvailableVariables=Verfügbare Ersatzvariablen
-NoTranslation=Keine Übersetzung
-NoRecordFound=Keinen Eintrag gefunden
-NoRecordDeleted=No record deleted
 NotEnoughDataYet=Nicht genügend Daten
-NoError=kein Fehler
-Error=Fehler
-Errors=Fehler
-ErrorFieldRequired=Feld '%s' ist erforderlich
-ErrorFieldFormat=Der Wert in Feld '%s' ist ungültig
-ErrorFileDoesNotExists=Die Datei %s existiert nicht
-ErrorFailedToOpenFile=Fehler beim Öffnen der Datei %s
 ErrorCanNotCreateDir=Kann Verzeichnis %s nicht erstellen
-ErrorCanNotReadDir=Kann Verzeichnis %s nicht lesen
-ErrorConstantNotDefined=Parameter %s nicht definiert
-ErrorUnknown=Unbekannter Fehler
-ErrorSQL=SQL-Fehler
-ErrorLogoFileNotFound=Logo-Datei '%s' nicht gefunden
-ErrorGoToGlobalSetup=Bitte wechseln Sie zu den 'Firma/Stiftung'-Einstellungen um das Problem zu beheben
-ErrorGoToModuleSetup=Bitte wechseln Sie zu den Moduleinstellungen um das Problem zu beheben
-ErrorFailedToSendMail=Fehler beim Senden der E-Mail (Absender=%s, Empfänger=%s)
 ErrorFileNotUploaded=Die Datei konnte nicht hochgeladen werden. Stellen Sie sicher dass die Dateigrösse nicht den gesetzten Maximalwert übersteigt, das Zielverzeichnis über genügend freien Speicherplatz verfügt und noch keine Datei mit gleichem Namen existiert.
-ErrorInternalErrorDetected=Interner Fehler entdeckt
-ErrorWrongHostParameter=Ungültige Host-Parameter
-ErrorYourCountryIsNotDefined=Ihr Land ist nicht definiert. Bitte vervollständigen Sie das Profil unter Start - Einstellungen - Firma/Stiftung
 ErrorRecordIsUsedByChild=Kann diesen Eintrag nicht löschen. Dieser Eintrag wird von mindestens einem untegeordneten Datensatz verwendet.
-ErrorWrongValue=Ungültiger Wert
-ErrorWrongValueForParameterX=Ungültiger Wert für den Parameter %s
-ErrorNoRequestInError=Keine Anfrage im Fehler
-ErrorServiceUnavailableTryLater=Dieser Service steht derzeit nicht zur Verfügung. Bitte versuchen Sie es später erneut.
 ErrorDuplicateField=Dieser Wert ist nicht einzigartig (schon vorhanden)
 ErrorSomeErrorWereFoundRollbackIsDone=Einige Fehler wurden gefunden. Änderungen rückgängig gemacht.
-ErrorConfigParameterNotDefined=Parameter <b>%s</b> innerhalb der Konfigurationsdatei <b>conf.php.</b> nicht definiert.
 ErrorCantLoadUserFromDolibarrDatabase=Kann Benutzer <b>%s</b> nicht aus der Systemdatenbank laden.
-ErrorNoVATRateDefinedForSellerCountry=Fehler, keine MwSt.-Sätze für Land  '%s' definiert.
 ErrorNoSocialContributionForSellerCountry=Fehler, keine Definition für Sozialabgaben/Steuerwerte definiert für Land '%s'.
-ErrorFailedToSaveFile=Fehler, konnte Datei nicht speichern.
-ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
-NotAuthorized=Sie haben keine Berechtigung dazu.
-SetDate=Datum
-SelectDate=Wählen Sie ein Datum
-SeeAlso=Siehe auch %s
-SeeHere=Sehen Sie hier
-Apply=Übernehmen
-BackgroundColorByDefault=Standard-Hintergrundfarbe
-FileRenamed=The file was successfully renamed
-FileUploaded=Datei wurde erfolgreich hochgeladen
-FileGenerated=The file was successfully generated
-FileWasNotUploaded=Ein Dateianhang wurde gewählt aber noch nicht hochgeladen. Klicken Sie auf "Datei anhängen" um den Vorgang zu starten.
-NbOfEntries=Anzahl der Einträge
 GoToWikiHelpPage=Onlinehilfe (Internetzugang notwendig)
-GoToHelpPage=Hilfe lesen
-RecordSaved=Eintrag gespeichert
-RecordDeleted=Eintrag gelöscht
-LevelOfFeature=Funktionslevel
-NotDefined=Nicht definiert
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
-Administrator=Administrator
-Undefined=Nicht definiert
-PasswordForgotten=Password forgotten?
-SeeAbove=Siehe oben
-HomeArea=Startseite
-LastConnexion=Latest connection
-PreviousConnexion=Letzte Anmeldung
-PreviousValue=Vorheriger Wert
-ConnectedOnMultiCompany=Mit Entität verbunden
-ConnectedSince=Angemeldet seit
-AuthenticationMode=Authentication mode
-RequestedUrl=Requested URL
-DatabaseTypeManager=Datenbank Type Manager
 RequestLastAccessInError=Letzter Datenbankfehler
 ReturnCodeLastAccessInError=Rückgabewert des letzten Datenbankfehlers
 InformationLastAccessInError=Informationen zum letzten Datenbankfehler
-DolibarrHasDetectedError=Das System hat einen technischen Fehler festgestellt
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes
-MoreInformation=Weitere Informationen
-TechnicalInformation=Technische Information
-TechnicalID=Technische ID
-NotePublic=Anmerkung (öffentlich)
-NotePrivate=Anmerkung (privat)
-PrecisionUnitIsLimitedToXDecimals=Stückpreisgenauigkeit im System auf <b>%s</b> Dezimalstellen beschränkt.
-DoTest=Testen
-ToFilter=Filtern
-NoFilter=Kein Filter
-WarningYouHaveAtLeastOneTaskLate=Achtung: Bei mindestens einem Element wurde die Toleranz der Zeitverzögerung überschritten.
-yes=ja
-Yes=Ja
-no=nein
-No=Nein
-All=Alle
-Home=Start
-Help=Hilfe
-OnlineHelp=Online-Hilfe
-PageWiki=Wiki-Seite
 MediaBrowser=Mediabrowser
-Always=Immer
-Never=Nie
-Under=Unter
-Period=Zeitraum
-PeriodEndDate=Enddatum für Zeitraum
-Activate=Aktivieren
-Activated=Aktiviert
-Closed=Geschlossen
-Closed2=Geschlossen
-NotClosed=Not closed
-Enabled=Aktiviert
-Deprecated=Veraltet
-Disable=Deaktivieren
-Disabled=Deaktiviert
-Add=Hinzufügen
-AddLink=Link hinzufügen
-RemoveLink=Entferne Link
 AddToDraft=Zu Entwurf hinzufügen
-Update=Aktualisieren
 Close=Schliessen
 CloseBox=Box vom Startbildschirm entfernen
-Confirm=Bestätigen
-ConfirmSendCardByMail=Do you really want to send content of this card by mail to <b>%s</b>?
-Delete=Löschen
-Remove=Entfernen
-Resiliate=Terminate
-Cancel=Abbrechen
-Modify=Ändern
-Edit=Bearbeiten
-Validate=Bestätigen
 ValidateAndApprove=Freigeben und bestätigen
-ToValidate=Freizugeben
-Save=Speichern
-SaveAs=Speichern unter
-TestConnection=Verbindung testen
-ToClone=Duplizieren
-ConfirmClone=Wählen Sie die zu duplizierenden Daten:
-NoCloneOptionsSpecified=Keine Duplikationsoptionen ausgewählt.
-Of=von
-Go=Weiter
-Run=bearbeiten
-CopyOf=Duplikat von
-Show=Zeige
-Hide=Hide
-ShowCardHere=Zeige Karte
-Search=Suchen
-SearchOf=Suche nach
-Valid=Freigabe
-Approve=Genehmigen
-Disapprove=Abgelehnt
-ReOpen=Wiedereröffnen
-Upload=Datei laden
-ToLink=Link
-Select=Wählen Sie
-Choose=Wählen
-Resize=Skalieren
-Recenter=Zentrieren
-Author=Autor
-User=Benutzer
-Users=Benutzer
-Group=Gruppe
-Groups=Gruppen
-NoUserGroupDefined=Keine Benutzergruppe definiert
-Password=Passwort
-PasswordRetype=Geben Sie das Passwort noch einmal ein
-NoteSomeFeaturesAreDisabled=Bitte beachten Sie, dass viele Funktionen/Module in dieser Demo deaktiviert sind
-Name=Name
-Person=Person
-Parameter=Parameter
-Parameters=Parameter
-Value=Wert
-PersonalValue=Persönlicher Wert
-NewValue=Neuer Wert
-CurrentValue=Aktueller Wert
-Code=Code
-Type=Typ
-Language=Sprache
-MultiLanguage=Mehrsprachig
-Note=Hinweis
-Title=Titel
-Label=Bezeichnung
-RefOrLabel=Nr. oder Bezeichnung
-Info=Protokoll
-Family=Familie
-Description=Beschreibung
-Designation=Beschreibung
-Model=Doc template
-DefaultModel=Default doc template
-Action=Ereignis
-About=Über
-Number=Anzahl
-NumberByMonth=Anzahl nach Monat
-AmountByMonth=Umsatz nach Monat
-Numero=Nummer
-Limit=Limit
-Limits=Limits
-Logout=Abmelden
-NoLogoutProcessWithAuthMode=Keine Anwendung Trennungsfunktion mit Authentifizierungsmodus <b>% s </ b>
-Connection=Verbindung
-Setup=Einstellungen
-Alert=Warnung
-Previous=Voriger
-Next=Nächster
-Cards=Karten
-Card=Karte
-Now=Jetzt
-HourStart=Startzeit
-Date=Datum
-DateAndHour=Datum und Uhrzeit
 DateToday=Aktuelles Datum
-DateReference=Referenzdatum
 DateStart=Startdatum
 DateEnd=Enddatum
-DateCreation=Erstellungsdatum
-DateCreationShort=Erstelldatum
-DateModification=Änderungsdatum
 DateModificationShort=Änd.Datum
-DateLastModification=Latest modification date
-DateValidation=Freigabedatum
 DateClosing=Schliessungsdatum
-DateDue=Fälligkeitsdatum
-DateValue=Valutadatum
-DateValueShort=Valutadatum
-DateOperation=Ausführungsdatum
 DateOperationShort=Ausf.Datum
-DateLimit=Frist
-DateRequest=Anfragedatum
-DateProcess=Verarbeite Datum
-DateBuild=Datum der Berichterstellung
-DatePayment=Zahlungsziel
-DateApprove=Genehmigungsdatum
-DateApprove2=Genehmigungsdatum (zweite Genehmigung)
-UserCreation=Creation user
-UserModification=Modification user
-UserCreationShort=Creat. user
-UserModificationShort=Modif. user
-DurationYear=Jahr
-DurationMonth=Monat
-DurationWeek=Woche
-DurationDay=Tag
-DurationYears=Jahre
-DurationMonths=Monate
-DurationWeeks=Wochen
-DurationDays=Tage
-Year=Jahr
-Month=Monat
-Week=Woche
-WeekShort=Woche
-Day=Tag
-Hour=Stunden
-Minute=Minute
-Second=Zweitens
-Years=Jahre
-Months=Monate
-Days=Tage
-days=Tage
-Hours=Stunden
-Minutes=Minuten
-Seconds=Sekunden
-Weeks=Wochen
-Today=Heute
-Yesterday=Gestern
-Tomorrow=Morgen
-Morning=Morgen
-Afternoon=Nachmittag
-Quadri=vierfach
-MonthOfDay=Tag des Monats
-HourShort=H
 MinuteShort=min
-Rate=Rate
-CurrencyRate=Currency conversion rate
-UseLocalTax=inkl. MwSt.
-Bytes=Bytes
-KiloBytes=Kilobyte
-MegaBytes=Megabyte
-GigaBytes=Gigabyte
-TeraBytes=Terabyte
-b=b.
-Kb=Kb
-Mb=Mb
-Gb=Gb
-Tb=Tb
-Cut=Ausschneiden
-Copy=Kopieren
-Paste=Einfügen
-Default=Standard
-DefaultValue=Standardwert
-Price=Preis
-UnitPrice=Stückpreis
-UnitPriceHT=Stückpreis (netto)
-UnitPriceTTC=Stückpreis (brutto)
-PriceU=VP
-PriceUHT=VP (netto)
-PriceUHTCurrency=Nettopreis (Währung)
 PriceUTTC=E.P. (inkl. Steuern)
-Amount=Betrag
-AmountInvoice=Rechnungsbetrag
-AmountPayment=Zahlungsbetrag
-AmountHTShort=Nettobetrag
-AmountTTCShort=Bruttobetrag
 AmountHT=Betrag (exkl. MwSt.)
-AmountTTC=Bruttobetrag
 AmountVAT=MwSt.-Betrag
-MulticurrencyAlreadyPaid=Already payed, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
 MulticurrencyAmountHT=Nettobetrag, in Währung
 MulticurrencyAmountTTC=Bruttobetrag, in Währung
 MulticurrencyAmountVAT=Steuerbetrag, in Währung
 AmountLT1=MwSt.-Betrag 2
 AmountLT2=MwSt.-Betrag 3
-AmountLT1ES=RE Betrag
-AmountLT2ES=Betrag IRPF
-AmountTotal=Gesamtbetrag
-AmountAverage=Durchschnittsbetrag
-PriceQtyMinHT=Mindestmengenpreis (netto)
 Percentage=Prozentangabe
-Total=Total
-SubTotal=Zwischensumme
-TotalHTShort=Nettosumme
 TotalHTShortCurrency=Totalbetrag (In Währung)
 TotalTTCShort=Totalbetrag (inkl. MwSt.)
 TotalHT=Totalbetrag
 TotalHTforthispage=Totalbetrag für diese Seite
 Totalforthispage=Total für diese Seite
-TotalTTC=Bruttosumme
 TotalTTCToYourCredit=Bruttosumme
 TotalVAT=MwSt.
 TotalLT1=Gesamte MwSt. 2
 TotalLT2=Gesamte MwSt. 3
-TotalLT1ES=Summe RE
-TotalLT2ES=Summe IRPF
-HT=Netto
-TTC=Brutto
 VAT=MwSt.
-VATs=Mehrwertsteuern
-LT1ES=RE
-LT2ES=EKSt.
-VATRate=Steuersatz
-Average=Durchschnitt
-Sum=Summe
-Delta=Delta
-Module=Modul
-Option=Option
-List=Liste
-FullList=Vollständige Liste
-Statistics=Statistik
-OtherStatistics=Weitere Statistiken
-Status=Status
-Favorite=Favorit
-ShortInfo=Info.
 Ref=Nummer
-ExternalRef=Externe-ID
-RefSupplier=Lieferanten-Nr.
 RefPayment=Zahlungs-Nr.
-CommercialProposalsShort=Angebote
-Comment=Kommentar
-Comments=Kommentare
 ActionsToDo=unvollständige Ereignisse
 ActionsToDoShort=Zu erledigen
-ActionsDoneShort=Erledigt
-ActionNotApplicable=Nicht anwendbar
 ActionRunningNotStarted=Nicht begonnen
-ActionRunningShort=In progress
-ActionDoneShort=Abgeschlossen
-ActionUncomplete=unvollständig
-CompanyFoundation=Firma oder Institution
 ContactsForCompany=Ansprechpartner/Adressen dieses Geschäftspartners
 ContactsAddressesForCompany=Ansprechpartner / Adressen zu diesem Geschäftspartner
 AddressesForCompany=Adressen für den Geschäftspartner
 ActionsOnCompany=Ereignisse zu diesem Geschäftspartner
-ActionsOnMember=Aktionen zu diesem Mitglied
-NActionsLate=%s verspätet
-RequestAlreadyDone=Anfrage bereits bekannt
-Filter=Filter
-FilterOnInto=Suchkriterium '<strong>%s</strong>'  ist in den Feldern %s
-RemoveFilter=Filter entfernen
-ChartGenerated=Diagramm erstellt
-ChartNotGenerated=Diagramm nicht erstellt
-GeneratedOn=Erstellt am %s
 Generate=Erstelle
-Duration=Dauer
-TotalDuration=Gesamtdauer
-Summary=Zusammenfassung
-DolibarrStateBoard=Statistik
-DolibarrWorkBoard=Aufgabenübersicht
-Available=Verfügbar
-NotYetAvailable=Noch nicht verfügbar
-NotAvailable=Nicht verfügbar
-Categories=Suchwörter/Kategorien
-Category=Suchwort/Kategorie
-By=Durch
-From=Von
-to=An
-and=und
-or=oder
-Other=Andere
-Others=Andere
-OtherInformations=Zusatzinformationen
-Quantity=Menge
-Qty=Anz.
-ChangedBy=Geändert von
-ApprovedBy=genehmigt von
-ApprovedBy2=Genehmige von (zweite Genehmigung)
-Approved=genehmigt
 Refused=zurückgewiesen
-ReCalculate=Neuberechnung
-ResultKo=Fehlschlag
-Reporting=Berichterstattung
-Reportings=Berichte
-Draft=Entwurf
-Drafts=Entwürfe
 Validated=Freigegeben
-Opened=Opened
-New=Neu
-Discount=Rabatt
-Unknown=Unbekannt
-General=Allgemein
+Opened=Offen
 Size=Grösse
-Received=Erhalten
-Paid=Bezahlt
-Topic=Thema
 ByCompanies=Von Geschäftspartnern
-ByUsers=Von Benutzern
-Links=Links
-Link=Link
-Rejects=Ablehnungen
-Preview=Vorschau
-NextStep=Nächster Schritt
-Datas=Daten
-None=Keine
-NoneF=Keine
-Late=Verspätet
 LateDesc=Die anzahl Tage die einen Datensatz verspätet markiert, hängt von ihren Einstellungen ab. Fragen sie den Administrator umd die Einstellung unter Home-Setup-Alerts zu ändern.
-Photo=Bild
-Photos=Bilder
-AddPhoto=Bild hinzufügen
-DeletePicture=Bild löschen
-ConfirmDeletePicture=Bild wirklich löschen?
-Login=Anmeldung
-CurrentLogin=Aktuelle Anmeldung
-EnterLoginDetail=Enter login details
-January=Januar
-February=Februar
-March=März
-April=April
-May=Mai
-June=Juni
-July=Juli
-August=August
-September=September
-October=Oktober
-November=November
-December=Dezember
-JanuaryMin=Jan
-FebruaryMin=Feb
-MarchMin=Mar
-AprilMin=Apr
-MayMin=Mai
-JuneMin=Jun
-JulyMin=Jul
-AugustMin=Aug
-SeptemberMin=Sep
-OctoberMin=Okt
-NovemberMin=Nov
-DecemberMin=Dez
-Month01=Januar
-Month02=Februar
-Month03=März
-Month04=April
-Month05=Mai
-Month06=Juni
-Month07=Juli
-Month08=August
-Month09=September
-Month10=Oktober
-Month11=November
-Month12=Dezember
-MonthShort01=Jan
-MonthShort02=Feb
-MonthShort03=Mär
-MonthShort04=Apr
-MonthShort05=Mai
-MonthShort06=Jun
-MonthShort07=Jul
-MonthShort08=Aug
-MonthShort09=Sep
-MonthShort10=Okt
-MonthShort11=Nov
-MonthShort12=Dez
-AttachedFiles=Angehängte Dateien und Dokumente
-FileTransferComplete=Datei wurde erfolgreich hochgeladen
-DateFormatYYYYMM=MM-YYYY
-DateFormatYYYYMMDD=DD-MM-YYYY
-DateFormatYYYYMMDDHHMM=DD-MM-YYYY HH:SS
-ReportName=Berichtsname
-ReportPeriod=Berichtszeitraum
-ReportDescription=Beschreibung
-Report=Bericht
 Keyword=Stichwort
-Origin=Origin
-Legend=Legende
-Fill=Eintragen
-Reset=Zurücksetzen
-File=Datei
-Files=Dateien
-NotAllowed=Nicht erlaubt
-ReadPermissionNotAllowed=Sie haben keine Berechtigung
-AmountInCurrency=Betrag in %s
-Example=Beispiel
-Examples=Beispiele
-NoExample=Kein Beispiel
-FindBug=Fehler melden
 NbOfThirdParties=Anzahl der Geschäftspartner
-NbOfLines=Anzahl der Positionen
-NbOfObjects=Anzahl der Objekte
 NbOfObjectReferers=Anzahl verknüpfter Objekte
 Referers=Verknüpfte Objekte
-TotalQuantity=Gesamtmenge
-DateFromTo=Von %s bis %s
-DateFrom=Von %s
-DateUntil=Bis %s
-Check=Prüfen
 Uncheck=nicht gewählt
-Internal=Intern
-External=Extern
-Internals=Interne
-Externals=Externe
-Warning=Warnung
-Warnings=Warnungen
-BuildDoc=Erstelle Doc
-Entity=Entität
-Entities=Entitäten
-CustomerPreview=Kundenvorschau
-SupplierPreview=Lieferantenvorschau
-ShowCustomerPreview=Zeige Kundenvorschau
-ShowSupplierPreview=Zeige Lieferantenvorschau
-RefCustomer=Ihr Zeichen
-Currency=Währung
-InfoAdmin=Hinweise für Administratoren
-Undo=Rückgängig
-Redo=Wiederherstellen
-ExpandAll=Alle ausklappen
-UndoExpandAll=Ausklappen rückgängig machen
-Reason=Grund
-FeatureNotYetSupported=Diese Funktion wird (noch) nicht unterstützt
 CloseWindow=Fenster schliessen
-Response=Antwort
-Priority=Wichtigkeit
-SendByMail=Per E-Mail versenden
-MailSentBy=E-Mail Absender
-TextUsedInTheMessageBody=E-Mail Text
 SendAcknowledgementByMail=Bestätigungsemail senden
-EMail=E-Mail
-NoEMail=Keine E-Mail
-Email=E-Mail
 NoMobilePhone=Kein Mobiltelefon
-Owner=Eigentümer
-FollowingConstantsWillBeSubstituted=Nachfolgende Konstanten werden durch entsprechende Werte ersetzt.
-Refresh=Aktualisieren
-BackToList=Zurück zur Liste
-GoBack=Zurück
-CanBeModifiedIfOk=Änderung möglich falls gültig
-CanBeModifiedIfKo=Änderung möglich falls ungültig
-ValueIsValid=Der Wert ist gültig
-ValueIsNotValid=Value is not valid
-RecordCreatedSuccessfully=Record created successfully
-RecordModifiedSuccessfully=Wert erfolgreich geändert
-RecordsModified=%s record modified
-RecordsDeleted=%s record deleted
-AutomaticCode=Automatischer Code
-FeatureDisabled=Funktion deaktiviert
-MoveBox=Box verschieben
-Offered=angeboten
-NotEnoughPermissions=Ihre Berechtigungen reichen hierfür nicht aus
-SessionName=Sitzungsname
-Method=Methode
-Receive=Erhalten
-CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
-ExpectedValue=Expected Value
-CurrentValue=Aktueller Wert
-PartialWoman=Teilweise
-TotalWoman=Vollständig
-NeverReceived=Nie erhalten
-Canceled=Storniert
-YouCanChangeValuesForThisListFromDictionarySetup=Sie können die Listenoptionen in den Wörterbuch-Einstellungen anpassen
 YouCanSetDefaultValueInModuleSetup=Standardwerte für neue Datensätzen können im Modulsetup eingestellt werden
-Color=Farbe
-Documents=Verknüpfte Dokumente
-Documents2=Dokumente
-UploadDisabled=Upload deaktiviert
-MenuECM=Dokumente
-MenuAWStats=Statistiken
-MenuMembers=Mitglieder
-MenuAgendaGoogle=Google-Agenda
-ThisLimitIsDefinedInSetup=Gesetzte Dolibarr-Limits (Menü Start-Einstellungen-Sicherheit): %s Kb, PHP Limit: %s Kb
-NoFileFound=Keine Dokumente in diesem Verzeichnis
-CurrentUserLanguage=Aktuelle Benutzersprache
 CurrentTheme=Aktuelle Oberfläche
-CurrentMenuManager=Aktuelle Menüverwaltung
-Browser=Browser
-Layout=Layout
-Screen=Screen
-DisabledModules=Deaktivierte Module
-For=Für
-ForCustomer=Für Kunden
-Signature=E-Mail-Signatur
-DateOfSignature=Date of signature
-HidePassword=Sichere Passworteingabe (Zeichen nicht angezeigt)
-UnHidePassword=Passwort in Klartext anzeigen
-Root=Stammordner
-Informations=Informationen
-Page=Seite
-Notes=Hinweise
-AddNewLine=Neue Zeile hinzufügen
-AddFile=Datei hinzufügen
-FreeZone=Freier Text
 FreeLineOfType=Freitext vom Typ
-CloneMainAttributes=Objekt mit Haupteigenschaften duplizieren
-PDFMerge=PDFs verbinden
-Merge=Verbinden
-PrintContentArea=Zeige Druckansicht für Seiteninhalt
-MenuManager=Menüverwaltung
-WarningYouAreInMaintenanceMode=Achtung: Die Anwendung befindet sich im Wartungsmodus und kann derzeit nur von Benutzer <b>%s</b> verwendet werden.
-CoreErrorTitle=Systemfehler
-CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=Kreditkarte
-FieldsWithAreMandatory=Felder mit <b>%s</b> sind Pflichtfelder
 FieldsWithIsForPublic=Felder mit <b>%s</b> sind für Mitglieder öffentlich sichtbar. Über die "Öffentlich"-Checkbox können Sie dies ändern.
-AccordingToGeoIPDatabase=(nach GeoIP-Auflösung)
-Line=Zeile
-NotSupported=Nicht unterstützt
-RequiredField=Pflichtfeld
-Result=Ergebnis
-ToTest=Test
-ValidateBefore=Vor Verwendung dieser Funktion müssen Sie die Karte überprüfen
-Visibility=Sichtbarkeit
-Private=Privat
-Hidden=Versteckt
-Resources=Ressourcen
-Source=Quelle
-Prefix=Präfix
-Before=Davor
-After=Danach
-IPAddress=IP Adresse
-Frequency=Frequenz
-IM=Instant Messaging
-NewAttribute=Neues Attribut
-AttributeCode=Attribut Code
-URLPhoto=URL für Foto/Bild
-SetLinkToAnotherThirdParty=Link zu einem anderen Partner
-LinkTo=Link to
-LinkToProposal=Link to proposal
-LinkToOrder=Link zur Bestellung
-LinkToInvoice=Link to invoice
-LinkToSupplierOrder=Link to supplier order
-LinkToSupplierProposal=Link to supplier proposal
-LinkToSupplierInvoice=Link to supplier invoice
-LinkToContract=Link to contract
-LinkToIntervention=Link to intervention
-CreateDraft=Entwurf erstellen
-SetToDraft=Auf Entwurf zurücksetzen
-ClickToEdit=Klicken zum Bearbeiten
-ObjectDeleted=Objekt %s gelöscht
-ByCountry=Nach Land
-ByTown=Nach Ort
-ByDate=Nach Datum
 ByMonthYear=Von Monat / Jahr
-ByYear=Bis zum Jahresende
-ByMonth=Nach Monat
-ByDay=Bei Tag
-BySalesRepresentative=Nach Vertriebsmitarbeiter
-LinkedToSpecificUsers=Mit Kontakt verknüpft
-NoResults=Keine Ergebnisse
 AdminTools=Adminwerkzeuge
-SystemTools=Systemwerkzeuge
-ModulesSystemTools=Module Hilfsprogramme
-Test=Testen
-Element=Element
-NoPhotoYet=Noch keine Bilder verfügbar
-Dashboard=Startseite
-MyDashboard=My dashboard
-Deductible=absetzbar
-from=von
-toward=zu
-Access=Zugriff
 SelectAction=Aktion auswählen
-HelpCopyToClipboard=Benutze Ctrl+C für Kopie in Zwischenablage
-SaveUploadedFileWithMask=Datei auf dem Server speichern mit dem Namen "<strong>%s</strong>" (oder "%s")
-OriginFileName=Original Dateiname
-SetDemandReason=Quelle definieren
-SetBankAccount=Bankkonto angeben
-AccountCurrency=Kontowährung
-ViewPrivateNote=Zeige Hinweise
-XMoreLines=%s Zeile(n) versteckt
-PublicUrl=Öffentliche URL
-AddBox=Box anfügen
-SelectElementAndClickRefresh=Wählen Sie einen Eintrag und klicken Sie aktualisieren
-PrintFile=Drucke Datei %s
-ShowTransaction=Show entry on bank account
-GoIntoSetupToChangeLogo=Gehen Sie zu Start - Einstellungen - Firma/Stiftung um das Logo zu ändern oder gehen Sie in Start -> Einstellungen -> Anzeige um es zu verstecken.
-Deny=ablehnen
-Denied=abgelehnt
-ListOfTemplates=Liste der Vorlagen
-Gender=Geschlecht
-Genderman=männlich
-Genderwoman=weiblich
-ViewList=Listenansicht
-Mandatory=Pflichtfeld
-Hello=Hallo
 Sincerely=Mit freundlichen Grüssen
-DeleteLine=Zeile löschen
-ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=Für die ausgewählten Datensätze waren keine PDF für die Dokumentengenerierung verfügbar
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
-NoRecordSelected=No record selected
 MassFilesArea=Bereich für Dateien, die durch Massenaktionen erstellt werden
 ShowTempMassFilesArea=Bereich für Dateien anzeigen, die durch Massenaktionen erstellt wurden
-RelatedObjects=Verknüpfte Objekte
 ClassifyBilled=Verrechnet
 Progress=Fortschritt
-ClickHere=Hier klicken
-FrontOffice=Front office
 BackOffice=Dolibarr
-View=View
-Export=Export
-Exports=Exporte
-ExportFilteredList=Export filtered list
-ExportList=Export list
-Miscellaneous=Verschiedenes
 Calendar=Kalender
-GroupBy=Group by...
-ViewFlatList=View flat list
-RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Direct download link
-Download=Download
-ActualizeCurrency=Update currency rate
-Fiscalyear=Fiskalisches Jahr
-# Week day
-Monday=Montag
-Tuesday=Dienstag
-Wednesday=Mittwoch
-Thursday=Donnerstag
-Friday=Freitag
-Saturday=Samstag
-Sunday=Sonntag
-MondayMin=Mo
-TuesdayMin=Di
-WednesdayMin=Mi
-ThursdayMin=Do
-FridayMin=Fr
-SaturdayMin=Sa
-SundayMin=So
-Day1=Montag
-Day2=Dienstag
-Day3=Mittwoch
-Day4=Donnerstag
-Day5=Freitag
-Day6=Samstag
-Day0=Sonntag
-ShortMonday=M
 ShortTuesday=D
 ShortWednesday=M
 ShortThursday=D
-ShortFriday=F
-ShortSaturday=S
-ShortSunday=S
-SelectMailModel=Wähle E-Mail-Vorlage
-SetRef=Set Ref
-Select2ResultFoundUseArrows=Some results found. Use arrows to select.
-Select2NotFound=Kein Ergebnis gefunden
 Select2Enter=Eingabe
-Select2MoreCharacter=oder mehr Zeichen
-Select2MoreCharacters=oder mehr Zeichen
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
-Select2LoadingMoreResults=Weitere Ergebnisse werden geladen ...
-Select2SearchInProgress=Suche läuft ...
 SearchIntoThirdparties=Drittparteien
-SearchIntoContacts=Kontakte
-SearchIntoMembers=Mitglieder
-SearchIntoUsers=Benutzer
-SearchIntoProductsOrServices=Produkte oder Dienstleistungen
-SearchIntoProjects=Projekte
-SearchIntoTasks=Aufgaben
-SearchIntoCustomerInvoices=Kundenrechnungen
-SearchIntoSupplierInvoices=Lieferantenrechnungen
-SearchIntoCustomerOrders=Kundenaufträge
-SearchIntoSupplierOrders=Lieferantenbestellungen
 SearchIntoCustomerProposals=Angebote Kunde
-SearchIntoSupplierProposals=Angebote Lieferant
 SearchIntoInterventions=Arbeitseinsätze
-SearchIntoContracts=Verträge
 SearchIntoCustomerShipments=Kundenlieferungen
 SearchIntoExpenseReports=Spesenrapporte
 SearchIntoLeaves=Ferien
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/de_CH/projects.lang b/htdocs/langs/de_CH/projects.lang
index 37d6bcbca4f..60fd8444198 100644
--- a/htdocs/langs/de_CH/projects.lang
+++ b/htdocs/langs/de_CH/projects.lang
@@ -18,5 +18,4 @@ ThisWillAlsoRemoveTasks=Diese Aktion löscht ebenfalls alle Aufgaben zum Projekt
 CloneTaskFiles=Aufgabe (n) clonen beigetreten Dateien (falls Aufgabe (n) geklont)
 ProjectReferers=Verknüpfte Objekte
 ResourceNotAssignedToTheTask=Nicht der Aufgabe zugewiesen
-OpenedProjectsByThirdparties=Offene Projekte nach Geschäftspartner
 OpportunityPonderatedAmount=Verkaufschancen geschätzer Betrag
diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang
index 991f4b2dc82..04106060d16 100644
--- a/htdocs/langs/de_DE/accountancy.lang
+++ b/htdocs/langs/de_DE/accountancy.lang
@@ -13,7 +13,7 @@ ThisProduct=Dieses Produkt
 DefaultForService=Standard für Leistung
 DefaultForProduct=Standard für Produkt
 CantSuggest=Kann keines vorschlagen
-AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
+AccountancySetupDoneFromAccountancyMenu=Die wichtigste Teil der Konfiguration der Buchhaltung aus dem Menü %s wurde erledigt
 ConfigAccountingExpert=Konfiguration des Experten-Buchhaltungsmoduls
 Journalization=Journalisieren
 Journaux=Journale
@@ -26,37 +26,45 @@ InvoiceLabel=Rechnungsanschrift
 OverviewOfAmountOfLinesNotBound=Übersicht über die Anzahl der nicht an ein Buchhaltungskonto zugeordneten Zeilen
 OverviewOfAmountOfLinesBound=Übersicht über die Anzahl der bereits an ein Buchhaltungskonto zugeordneten Zeilen
 OtherInfo=Zusatzinformationen
+DeleteCptCategory=Buchhaltungskonto aus Gruppe entfernen
+ConfirmDeleteCptCategory=Soll dieses Buchhaltungskonto wirklich aus der Gruppe entfernt werden?
 
 AccountancyArea=Buchhaltung
 AccountancyAreaDescIntro=Die Verwendung des Buchhaltungsmoduls erfolgt in mehreren Schritten:
-AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionOnce=Die folgenden Aktionen werden üblicherweise nur ein Mal ausgeführt, oder jährlich...
 AccountancyAreaDescActionOnceBis=Die nächsten Schritte sollten getan werden, um Ihnen in Zukunft  Zeit zu sparen, indem Sie Ihnen das korrekte Standardbuchhaltungskonto vorschlagen, wenn Sie die Journalisierung (Schreiben des Buchungsjournal und des Hauptbuchs) machen.
-AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescActionFreq=Die folgende Aktionen werden in der Regel jeden Monat, Woche oder Tag für sehr großes Unternehmen durchgeführt ...
+
+AccountancyAreaDescJournalSetup=SCHRITT %s: Buchhaltungsjournal erstellen oder kontrollieren via Menü  %s
 AccountancyAreaDescChartModel=SCHRITT %s: Erstellen Sie ein Modell des Kontenplans im Menü %s
 AccountancyAreaDescChart=SCHRITT %s: Erstellen oder überprüfen des Inhalts Ihres Kontenplans im Menü %s
-AccountancyAreaDescBank=SCHRITT %s: Überprüfen Sie die Zuordnung die zwischen Bankkonten und dem Buchhaltungskonto erstellt wurden.  Vervollständigen Sie die fehlenden Zuordnungen. Dazu gehen Sie auf die Karte jedes Finanzkontos.  Sie können beginnen bei der Seite %s.
-AccountancyAreaDescVat=SCHRITT %s: Überprüfen Sie die Zuordnung die zwischen Steuersatz und Buchhaltungskonto erstellt wurde. Vervollständigen Sie die fehlenden Zuordnungen. Sie können Buchhaltungskonten zu verwenden für jede MwSt. festlegen, von der Seite %s.
-AccountancyAreaDescExpenseReport=SCHRITT %s: Überprüfen Sie die Zuordnung die zwischen Arten der Spesenabrechnung und dem Buchhaltungskonto erstellt wurden. Vervollständigen Sie die fehlenden Zuordnungen.  Sie können Buchhaltungskonten zur Verwendung für jede MwSt. festlegen, von der Seite %s.
-AccountancyAreaDescSal=SCHRITT %s: Überprüfen Sie die Zuordnung die zwischen Lohn-Zahlungen und dem Buchhaltungskonto erstellt wurden. Vervollständigen Sie die fehlenden Zuordnungen. Dazu können Sie den Menüeintrag %s verwenden.
-AccountancyAreaDescContrib=SCHRITT %s: Überprüfen Sie die Zuordnung die zwischen besondere Aufwendungen (Sonstige Steuern)  und dem Buchhaltungskonto erstellt wurden. Vervollständigen Sie die fehlenden Zuordnungen. Dafür können Sie das Menü %s verwenden.
-AccountancyAreaDescDonation=SCHRITT %s: Überprüfen Sie die Zuordnung die zwischen Spenden  und dem Buchhaltungskonto erstellt wurden. Vervollständigen Sie die fehlenden Zuordnungen. Über das Menü %s können Sie das entsprechende Konto festlegen.
-AccountancyAreaDescMisc=SCHRITT %s: Überprüfen der Standard-Zuordnung zwischen verschiedener Transaktionszeilen und dem Buchhaltungskonto erstellt wurden. Vervollständigen Sie die fehlenden Zuordnungen.  Dafür können Sie das Menü %s verwenden.
-AccountancyAreaDescProd=SCHRITT %s: Überprüfen Sie die Zuordnung die zwischen Produkt/Dienstleistung und dem Buchhaltungskonto erstellt wurde. Vervollständigen Sie die fehlenden Zuordnungen. Dazu können Sie den Menüeintrag %s verwenden.
-AccountancyAreaDescLoan=SCHRITT %s: Überprüfen Sie die Zuordnung die zwischen Darlehenszahlungen   und dem Buchhaltungskonto erstellt wurden. Vervollständigen Sie die fehlenden Zuordnungen. Dafür können Sie das Menü %s verwenden.
 
-AccountancyAreaDescCustomer=SCHRITT %s: Überprüfen Sie die Zuordnung die zwischen den Ausgangs-Rechnungspositionen und dem Buchhaltungskonto erstellt wurden, so wird die Anwendung in der Lage sein, mit einem Klick die Transaktionen in das Hauptbuch zu journalisieren. Vervollständigen Sie die fehlenden Zuordnungen. Dazu können Sie das Menü %s verwenden.
-AccountancyAreaDescSupplier=SCHRITT %s: Überprüfen Sie die Zuordnung die zwischen den Eingangs-Rechnungspositionen und dem Buchhaltungskonto erstellt wurden, so wird die Anwendung in der Lage sein, mit einem Klick die Transaktionen in das Hauptbuch zu journalisieren. Vervollständigen Sie die fehlenden Zuordnungen. Dazu können Sie das Menü %s verwenden.
-AccountancyAreaDescWriteRecords=SCHRITT %s: Schreiben Sie die Transaktionen in das Hauptbuch. Dazu gehen Sie in jedes Journal, und klicken Sie auf die Schaltfläche "Buchungen ins Hauptbuch übernehmen"
+AccountancyAreaDescVat=SCHRITT %s: Definition des Buchhaltungskonto für jeden Steuersatz. Kann im Menü %s geändert werden.
+AccountancyAreaDescExpenseReport=SCHRITT %s: Definition der Buchhaltungskonten für die verschiedenen Arten der Spesenabrechnung. Kann im Menü %s geändert werden.
+AccountancyAreaDescSal=SCHRITT %s: Buchhaltungskonto für Lohnzahlungen definieren. Kann im Menü %s geändert werden.
+AccountancyAreaDescContrib=SCHRITT %s: Definition der Buchhaltungskonten für besondere Aufwendungen (Sonstige Steuern) . Kann im Menü %s geändert werden.
+AccountancyAreaDescDonation=SCHRITT %s: Definition der Buchhaltungskonten für Spenden. Kann im Menü %s geändert werden.
+AccountancyAreaDescMisc=SCHRITT %s: Buchhaltungskonto für nicht zugeordnete Buchungen. Kann im Menü %s geändert werden.
+AccountancyAreaDescLoan=SCHRITT %s: Definitiond der Buchhaltungskonten für Darlehenszahlungen. Kann im Menü %s geändert werden.
+AccountancyAreaDescBank=SCHRITT %s: Definition der Buchhaltungskonten für jede Bank und Finanzkonten. Gehen Sie zum jeweiligen Finanzkonto. Kann im Menü %s geändert werden.
+AccountancyAreaDescProd=SCHRITT %s: Definition der Buchhaltungskonten für Ihre Produkte/Dienstleistungen. Kann im Menü %s geändert werden.
+
+AccountancyAreaDescBind=SCHRITT %s: Kontrolle der Zuweisung zwischen bestehenden %s Buchungszeilen und Konten ist erledigt damit die Anwendung die übernahme der Buchungen ins Hauptbuch mit einem klick erfolgen kann. Wir im Menü %s eingestellt.
+AccountancyAreaDescWriteRecords=SCHRITT %s: Schreiben Sie die Buchungen in das Hauptbuch. Dazu gehen Sie ins Menü <strong>%s</strong>, und klicken Sie auf die Schaltfläche <strong>%s</strong>
 AccountancyAreaDescAnalyze=SCHRITT %s: Vorhandene Transaktionen hinzufügen oder bearbeiten sowie Berichte und Exporte generieren.
 
 AccountancyAreaDescClosePeriod=SCHRITT %s: Schließen Sie die Periode, damit wir in Zukunft keine Veränderungen vornehmen können.
 
 MenuAccountancy=Buchführung
 Selectchartofaccounts=Kontenplan wählen
-ChangeAndLoad=Change and load
+ChangeAndLoad=Ändere und Lade
 Addanaccount=Fügen Sie ein Buchhaltungskonto hinzu
 AccountAccounting=Buchhaltungskonto
 AccountAccountingShort=Konto
+SubledgerAccount=Nebenbuch Konto
+subledger_account=Nebenbuch Konto
+ShowAccountingAccount=Buchhaltungskonten anzeigen
+ShowAccountingJournal=Buchhaltungsjournal anzeigen
 AccountAccountingSuggest=Buchhaltungskonto Vorschlag
 MenuDefaultAccounts=Standardkonten
 MenuVatAccounts=Mwst. Konten
@@ -76,16 +84,16 @@ Bookkeeping=Hauptbuch
 AccountBalance=Saldo Sachkonto
 
 CAHTF=Einkaufssume pro Lieferant ohne Steuer
-TotalExpenseReport=Total expense report
+TotalExpenseReport=Gesamtausgaben Bericht
 InvoiceLines=Zeilen der Rechnungen zu verbinden
 InvoiceLinesDone=Verbundene Rechnungszeilen
-ExpenseReportLines=Lines of expense reports to bind
-ExpenseReportLinesDone=Bound lines of expense reports
+ExpenseReportLines=Zeilen von Spesenabrechnungen zu verbinden
+ExpenseReportLinesDone=Gebundene Zeile von Spesenabrechnungen
 IntoAccount=mit dem Buchhaltungskonto verbundene Zeilen
 
 
 Ventilate=zusammenfügen
-LineId=Id line
+LineId=Zeile ID
 Processing=Bearbeitung
 EndProcessing=Prozess abgeschlossen.
 SelectedLines=Gewählte Zeilen
@@ -97,15 +105,15 @@ NotVentilatedinAccount=Nicht zugeordnet, zu einem Buchhaltungskonto
 XLineSuccessfullyBinded=%s Produkte/Leistungen erfolgreich an ein Buchhaltungskonto zugeordnet
 XLineFailedToBeBinded=%s Produkte/Leistungen waren an kein Buchhaltungskonto zugeordnet
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Anzahl der Elemente, die beim Kontieren angezeigt werden  (empfohlen Max.: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Beginnen Sie die Sortierung der Seite "Link zu realisieren“ durch die neuesten Elemente
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Beginnen die Sortierung auf der Seite "Zuordnung erledigt " durch die neuesten Elemente\n\n\n\n\n\n\n78/5000\n\nStarten Sie die „made-Links“ Seite durch neuere Elemente Sortier
 
-ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Länge des allgemeinen Buchführungskonto
-ACCOUNTING_LENGTH_AACCOUNT=Länge von den Partner Buchhaltungskonten
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_DESCRIPTION=Länge für die Anzeige der Beschreibung von Produkten und Leistungen in Listen (optimal = 50)
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Länge für die Anzeige der Beschreibung von Produkte und Leistungen in den Listen (Ideal = 50)
+ACCOUNTING_LENGTH_GACCOUNT=Länge der Kontonummern der Buchhaltung (Wenn dieser Wert auf 6 gesetzt ist, wird Konto '706' als '706000' am Bildschirm angezeigt)
+ACCOUNTING_LENGTH_AACCOUNT=Länge von den Partner Buchhaltungskonten (Wenn dieser Wert auf 6 gesetzt ist, wird das Konto '401' als '401000' am Bildschirm angezeigt)
+ACCOUNTING_MANAGE_ZERO=Verwalten der Null am Ende eines Buchhaltungskontos. In einigen Ländern notwendig (zB. Schweiz). Standardmäßig deaktiviert. Wenn ausgeschaltet, können die folgenden 2 Parameter konfigurieren werden um virtuelle Nullen anzuhängen
 BANK_DISABLE_DIRECT_INPUT=Deaktivieren der direkte Aufzeichnung von Transaktion auf dem Bankkonto
 
 ACCOUNTING_SELL_JOURNAL=Ausgangsrechnungen
@@ -116,12 +124,12 @@ ACCOUNTING_SOCIAL_JOURNAL=Sozial-Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Buchhaltungskonten für Transferierung
 ACCOUNTING_ACCOUNT_SUSPENSE=Buchhaltungskonten in Wartestellung
-DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
+DONATION_ACCOUNTINGACCOUNT=Buchhaltungskonto für die Buchung von Spenden
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Buchhaltungskonto standardmäßig für die gekauften Produkte (wenn nicht im Produktblatt definiert)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Standard-Buchhaltungskonto für die verkauften Produkte (wenn nicht anders im Produktblatt definiert)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Standard-Buchhaltungskonto für die gekauften Leistungen (wenn nicht anders im Produktblatt definiert)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Standard-Buchhaltungskonto für die verkauften Leistungen (wenn nicht anders im Produktblatt definiert)
 
 Doctype=Dokumententyp
 Docdate=Datum
@@ -132,19 +140,19 @@ Sens=Zweck
 Codejournal=Journal
 NumPiece=Teilenummer
 TransactionNumShort=Anz. Buchungen
-AccountingCategory=Buchhaltungskategorie
+AccountingCategory=Gruppen Buchungskonten
 GroupByAccountAccounting=Gruppieren nach Buchhaltungskonto
 NotMatch=undefiniert
-DeleteMvt=Lösche Hauptbuch Datensätze
+DeleteMvt=Zeilen im Hauptbuch löschen
 DelYear=Jahr zu entfernen
 DelJournal=Journal zu entfernen
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvt=Es werden alle Zeilen des Hauptbuchs für Jahr und/oder eines bestimmten Journals gelöscht. Mindestens ein Kriterium ist erforderlich.
 ConfirmDeleteMvtPartial=Dadurch wird die ausgewählte(n) Zeile(n) aus dem Hauptbuch gelöscht
-DelBookKeeping=Löschen Sie den Eintrag im Hauptbuch
-FinanceJournal=Finance journal
-ExpenseReportsJournal=Expense reports journal
+DelBookKeeping=Eintrag im Hauptbuch löschen
+FinanceJournal=Finanzjournal
+ExpenseReportsJournal=Spesenabrechnungsjournal
 DescFinanceJournal=Finanzjournal inklusive aller Arten von Zahlungen mit Bankkonto
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=Dies ist eine Ansicht der Datensätze, die an ein Produkt- / Dienstleistungskonto gebunden sind und in das Hauptbuch übernommen werden können.
 VATAccountNotDefined=Steuerkonto nicht definiert
 ThirdpartyAccountNotDefined=Konto für Adresse nicht definiert
 ProductAccountNotDefined=Konto für Produkt nicht definiert
@@ -156,9 +164,9 @@ NewAccountingMvt=Erstelle Transaktion
 NumMvts=Transaktionsnummer
 ListeMvts=Liste der Bewegungen
 ErrorDebitCredit=Soll und Haben können nicht gleichzeitig eingegeben werden
-
+AddCompteFromBK=Buchhaltungskonten zur Gruppe hinzufügen
 ReportThirdParty=Zeige Partner
-DescThirdPartyReport=Konsultieren Sie hier die Liste der Kunden- und Lieferantenadressen und ihre Buchhaltungskonten
+DescThirdPartyReport=Kontieren Sie hier die Liste der Kunden und Lieferanten zu Ihrem Buchhaltungs-Konten
 ListAccounts=Liste der Abrechnungskonten
 
 Pcgtype=Kontenklasse
@@ -167,18 +175,18 @@ Pcgsubtype=Unterkontenklasse
 TotalVente=Verkaufssumme ohne Steuer
 TotalMarge=Gesamt-Spanne
 
-DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
-DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
-DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
-ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
+DescVentilCustomer=Kontieren Sie hier in die Liste Kundenrechnungszeilen gebunden (oder nicht), zu ihren Erlös Buchhaltungs-Konten
+DescVentilMore=In den meisten Fällen, wenn Sie vordefinierte Produkte oder Dienstleistungen verwenden und Sie die Kontonummer stellen auf der Produkt / Service-Karte, wird die Anwendung in der Lage sein, alle Kontierungen zwischen den Rechnungspositionen und dem Buchhaltungskonto auf Ihrer Konto  zu machen, nur in ein Klick mit der Taste <strong> "%s" </strong>. Wenn das Buchhaltungs-Konto nicht auf Produkt / Service-Karten festgelegt wurde oder wenn Sie noch ein paar Zeilen hat nicht auf jedes Konto kontiert, werden Sie manuelle Kontierungen in dem Menü "<strong> %s </strong>" machen müssen.
+DescVentilDoneCustomer=Kontieren Sie hier die Liste der Kundenrechnungszeilen zu einem Buchhaltungs-Konto
+DescVentilTodoCustomer=Kontiere nicht bereits kontierte Rechnungspositionen mit einem  Buchhaltung Erlös-Konto
+ChangeAccount=Ändere das Artikel Buchhaltungskonto für die ausgewählten Zeilen mit dem folgenden Buchhaltungskonto:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Konsultieren Sie hier die Liste der Zeilen der Rechnungs-Kunden und deren Abrechnungskonto
-DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
-DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
-DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
-DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
+DescVentilSupplier=Kontieren Sie hier die Liste der Lieferantenrechnungszeilen gebunden oder nicht, zu einem Buchhaltungs-Konto 
+DescVentilDoneSupplier=Kontieren Sie hier die Liste der Zeilen von Lieferantenrechnungen zu ihren Buchhaltungs-Konten
+DescVentilTodoExpenseReport=Binde Spesenabrechnungspositionen die nicht gebunden mit einem Buchhaltungs-Konto
+DescVentilExpenseReport=Kontieren Sie hier in der Liste Spesenabrechnungszeilen  gebunden (oder nicht) zu Ihren Buchhaltungs-Konten
+DescVentilExpenseReportMore=Wenn Sie beim Buchhaltungskonto den Typen Spesenabrechnungpositionen eingestellt haben, wird die Applikation alle Kontierungen zwischen den Spesenabrechnungspositionen und dem Buchhaltungskonto von Ihrem Kontenrahmen verwenden, durch einen einzigen Klick auf die Schaltfläche <strong> "%s" </strong>. Wenn kein Konto definiert wurde unter Stammdaten / Gebührenarten oder wenn Sie einige Zeilen nicht zu irgendeinem automatischen Konto gebunden haben, müssen Sie die Zuordnung manuell aus dem Menü  "<strong> %s </strong>“ machen.
+DescVentilDoneExpenseReport=Hier finden Sie die Liste der Aufwendungsposten und ihr Gebühren Buchhaltungskonto
 
 ValidateHistory=automatisch verbinden
 AutomaticBindingDone=automatische Zuordnung erledigt
@@ -187,15 +195,27 @@ ErrorAccountancyCodeIsAlreadyUse=Fehler, Sie können dieses Buchhaltungskonto ni
 MvtNotCorrectlyBalanced=Der Saldo der Buchung ist nicht ausgeglichen. Haben = %s. Soll = %s
 FicheVentilation=Zuordnungs Karte
 GeneralLedgerIsWritten=Operationen werden ins Hauptbuch geschrieben
-GeneralLedgerSomeRecordWasNotRecorded=Einige der Buchungen konnten nicht verbucht werden.
+GeneralLedgerSomeRecordWasNotRecorded=Einige der Buchungen konnten nicht übernommen werden. Es gab keine Fehler, vermutlich wurden diese Buchungen schon früher übernommen.
 NoNewRecordSaved=Keine neuen Einträge gespeichert
 ListOfProductsWithoutAccountingAccount=Liste der Produkte, die nicht an ein Buchhaltungskonto gebunden sind
 ChangeBinding=Ändern der Zuordnung
 
 ## Admin
 ApplyMassCategories=Massenaktualisierung der Kategorien
-AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
-CategoryDeleted=Category for the accounting account has been removed
+AddAccountFromBookKeepingWithNoCategories=Anfügen bereits genutzter Konten ohne Gruppen
+CategoryDeleted=Die Gruppe für das Buchhaltungskonto wurde entfernt
+AccountingJournals=Buchhaltungsjournale
+AccountingJournal=Buchhaltungsjournal
+NewAccountingJournal=Neues Buchhaltungsjournal
+ShowAccoutingJournal=Buchhaltungsjournal anzeigen
+Code=Code
+Nature=Art
+AccountingJournalType1=Verschiedene Aktionen
+AccountingJournalType2=Verkauf
+AccountingJournalType3=Einkauf
+AccountingJournalType4=Bank
+AccountingJournalType9=Hat neue
+ErrorAccountingJournalIsAlreadyUse=Dieses Journal wird bereits verwendet
 
 ## Export
 Exports=Exporte
@@ -211,23 +231,24 @@ Modelcsv_ciel=Export zu Sage Ciel Compta oder Compta Evolution
 Modelcsv_quadratus=Export zu Quadratus QuadraCompta
 Modelcsv_ebp=Export zu EBP
 Modelcsv_cogilog=Export zu Cogilog
-ChartofaccountsId=Chart of accounts Id
+Modelcsv_agiris=Nach Agiris exportieren (Test)
+ChartofaccountsId=Kontenplan ID
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Rechnungswesen initialisieren
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases.
+InitAccountancyDesc=Auf dieser Seite kann ein Sachkonto für Artikel und Dienstleistungen vorgegeben werden, wenn noch kein Buchhaltungs-Konto für Ein- und Verkäufe definiert ist.
 DefaultBindingDesc=Diese Seite kann verwendet werden, um ein Standardkonto festzulegen, das für die Verknüpfung von Transaktionsdatensätzen zu Lohnzahlungen, Spenden, Steuern und Mwst. verwendet werden soll, wenn kein bestimmtes Konto angegeben wurde.
 Options=Optionen
 OptionModeProductSell=Modus Verkauf
 OptionModeProductBuy=Modus Einkäufe
-OptionModeProductSellDesc=Show all products with accounting account for sales.
-OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductSellDesc=Alle Artikel mit Sachkonten für Vertrieb anzeigen
+OptionModeProductBuyDesc=Alle Artikel mit Sachkonten für Einkauf anzeigen
 CleanFixHistory=Bereinige Buchhaltungs-Konten von Positionen, die nicht in Kontenplänen existieren.
 CleanHistory=Aller Zuordungen für das selektierte Jahr zurücksetzen
 
 WithoutValidAccount=Mit keinem gültigen dedizierten Konto
 WithValidAccount=Mit gültigen dedizierten Konto
-ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
+ValueNotIntoChartOfAccount=Dieser Wert für das Buchhaltungs-Konto existiert nicht im Kontenplan
 
 ## Dictionary
 Range=Bereich von Sachkonten
@@ -235,11 +256,12 @@ Calculated=berechnet
 Formula=Formel
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Einige zwingende Einstellungen wurden nicht gemacht, bitte vervollständigen sie die Einrichtung
+ErrorNoAccountingCategoryForThisCountry=Keine Buchhaltung Kategorie für das Land %s verfügbar (siehe Startseite - Einstellungen - Stammdaten)
 ExportNotSupported=Das eingestellte Exportformat wird von deiser Seite nicht unterstützt
 BookeppingLineAlreayExists=Datensätze existieren bereits in der Buchhaltung
-
+NoJournalDefined=Kein Journal definiert
 Binded=Zeilen verbunden
 ToBind=Zeilen für Zuordnung
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warnung: Dieser Bericht basiert nicht auf dem Hauptbuch, wodurch keine im Hauptbuch veränderten Buchungen berücksichtigt werden. In einer neuer Version wird das behoben werden.
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index 7c78b5644c5..7beccc23d52 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -9,20 +9,20 @@ VersionDevelopment=Entwicklung
 VersionUnknown=Unbekannt
 VersionRecommanded=Empfohlen
 FileCheck=Dateien Integritätsprüfung
-FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. Value of some setup constants may also be checked. You can use this tool to detect if some files were modified by a hacker for example.
-FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
-GlobalChecksum=Global checksum
-MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
-LocalSignature=Embedded local signature (less reliable)
-RemoteSignature=Remote distant signature (more reliable)
+FileCheckDesc=Dieses Tool ermöglicht es Ihnen, die Integrität von Dateien und das Setup der Anwendung zu überprüfen, indem jede Datei mit den offiziellen Versionen verglichen wird. Der Wert einiger Setup-Konstanten kann auch überprüft werden. Sie können dieses Tool z.B. verwenden, um festzustellen, ob Dateien von einem Hacker geändert wurden.
+FileIntegrityIsStrictlyConformedWithReference=Datei-Integrität entspricht genau der Referenz.
+FileIntegrityIsOkButFilesWereAdded=Datei-Integrität bestätigt, allerdings wurden zusätzliche Dateien gefunden.
+FileIntegritySomeFilesWereRemovedOrModified=Datei-Integrität konnte NICHT bestätigt werden. Dateien wurden modifiziert, entfernt oder zugefügt.
+GlobalChecksum=globale Prüfsumme
+MakeIntegrityAnalysisFrom=Mache Integrität Analyse von Anwendungsdateien aus
+LocalSignature=Eingebettete lokale Signatur (weniger zuverlässig)
+RemoteSignature=Remote entfernte Unterschrift (mehr zuverlässig)
 FilesMissing=Fehlende Dateien
 FilesUpdated=Dateien ersetzt
-FilesModified=Modified Files
-FilesAdded=Added Files
+FilesModified=Geänderte Dateien
+FilesAdded=Angehängte Dateien
 FileCheckDolibarr=Überprüfen Sie die Integrität von Anwendungsdateien
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
+AvailableOnlyOnPackagedVersions=Die lokale Datei für die Integritätsprüfung ist nur dann verfügbar, wenn die Anwendung von einem offiziellen Paket installiert ist
 XmlNotFound=Xml Integrität Datei der Anwendung ​​nicht gefunden
 SessionId=ID Session
 SessionSaveHandler=Handler für Sitzungsspeicherung
@@ -48,6 +48,7 @@ InternalUsers=Interne Benutzer
 ExternalUsers=Externe Benutzer
 GUISetup=Anzeige
 SetupArea=Einstellungen - Übersicht
+UploadNewTemplate=Neue Vorlage(n) hochladen
 FormToTestFileUploadForm=Formular für das Testen von Datei-Uploads (je nach Konfiguration)
 IfModuleEnabled=Anmerkung: Ist nur wirksam wenn Modul <b>%s</b> aktiviert ist
 RemoveLock=Entfernen Sie die Datei <b>%s</b> falls vorhanden, um das Aktualisierungs-Tool auszuführen
@@ -64,11 +65,11 @@ ErrorCodeCantContainZero=Fehler, Code darf keinen Wert 0 enthalten
 DisableJavascript=JavaScript- und Ajax-Funktionen deaktivieren (empfohlen für Blinde und Text-Browser)
 UseSearchToSelectCompanyTooltip=Wenn Sie eine große Anzahl von Partnern (> 100.000) haben, können Sie die Geschwindigkeit verbessern, indem Sie in Einstellungen -> Andere die Konstante COMPANY_DONOTSEARCH_ANYWHERE auf 1 setzen. Die Suche startet dann am Beginn des Strings.
 UseSearchToSelectContactTooltip=Wenn Sie eine große Anzahl von Kontakten (> 100.000) haben, können Sie die Geschwindigkeit verbessern, indem Sie in Einstellungen -> Andere die Konstante CONTACT_DONOTSEARCH_ANYWHERE auf 1 setzen. Die Suche startet dann am Beginn des Strings.
-DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties, but it is less convenient)
-DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact, but it is less convenient)
+DelaiedFullListToSelectCompany=Warte auf Tastendruck, bevor der Inhalt der Partner-Combo-Liste geladen wird (Dies kann die Leistung verbessern, wenn Sie eine große Anzahl von Partnern haben).
+DelaiedFullListToSelectContact=Warte auf Tastendruck, bevor der Inhalt der Kontakt-Combo-Liste geladen wird (Dies kann die Leistung verbessern, wenn Sie eine große Anzahl von Kontakten haben).
 NumberOfKeyToSearch=Anzahl der Buchstaben um eine Suche auszulösen: %s
 NotAvailableWhenAjaxDisabled=Nicht verfügbar, wenn Ajax deaktiviert
-AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
+AllowToSelectProjectFromOtherCompany=Bei den Elementen eines Partners, ist es möglich Projekte von anderen Partnern zu verlinken
 JavascriptDisabled=JavaScript deaktiviert
 UsePreviewTabs=Vorschautabs verwenden
 ShowPreview=Vorschau anzeigen
@@ -85,7 +86,7 @@ Mask=Maske
 NextValue=Nächster Wert
 NextValueForInvoices=Nächster Wert (Rechnungen)
 NextValueForCreditNotes=Nächster Wert (Gutschriften)
-NextValueForDeposit=Nächster Wert (Scheck)
+NextValueForDeposit=Nächster Wert (Anzahlung)
 NextValueForReplacements=Nächster Wert (Ersatz)
 MustBeLowerThanPHPLimit=Hinweis: Ihre PHP-Einstellungen beschränken die Größe für Dateiuploads auf <b>%s</b>%s
 NoMaxSizeByPHPLimit=Hinweis: In Ihren PHP-Einstellungen sind keine Größenbeschränkungen hinterlegt
@@ -103,7 +104,7 @@ MenuIdParent=übergeordnete Menü-ID
 DetailMenuIdParent=ID des übergeordneten Menüs (0 für einen Eltern-Menü)
 DetailPosition=Sortierungsnummer für die Position des Menüpunktes
 AllMenus=Alle
-NotConfigured=Nicht konfiguriert
+NotConfigured=Modul/Applikation nicht konfiguriert
 Active=Aktiv
 SetupShort=Einstellungen
 OtherOptions=Andere Optionen
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Tausendertrennzeichen
 Destination=Ziel
 IdModule=Modul ID
 IdPermissions=Berechtigungs-ID
-Modules=Module
 LanguageBrowserParameter=Parameter %s
 LocalisationDolibarrParameters=Länderspezifische Parameter
 ClientTZ=Zeitzone Kunde (Benutzer)
@@ -123,7 +123,8 @@ PHPTZ=Zeitzone der PHP-Version
 DaylingSavingTime=Sommerzeit (Benutzer)
 CurrentHour=PHP-Zeit (Server)
 CurrentSessionTimeOut=Aktuelle Session timeout
-YouCanEditPHPTZ=Um eine andere PHP-Zeitzone zu setzen (nicht erforderlich), können Sie versuchen, eine .htaccess-Datei mit einer Zeile wie  "SetEnv TZ Europe / Paris" hinzuzufügen. 
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Box
 Boxes=Boxen
 MaxNbOfLinesForBoxes=Maximale Zeilenanzahl in Boxen\n
@@ -185,15 +186,15 @@ EncodeBinariesInHexa=Hexadezimal-Verschlüsselung für Binärdateien
 IgnoreDuplicateRecords=Doppelte Zeilen Fehler ignorieren (INSERT IGNORE)
 AutoDetectLang=Automatische Erkennung (Browser-Sprache)
 FeatureDisabledInDemo=Funktion in der Demoversion deaktiviert
-FeatureAvailableOnlyOnStable=Feature only available on official stable versions
+FeatureAvailableOnlyOnStable=Diese Funktion steht nur in offiziellen stabilen Versionen zur Verfügung
 Rights=Berechtigungen
 BoxesDesc=Boxen sind auf einigen Seiten angezeigte Informationsbereiche. Sie können die Anzeige einer Box einstellen, indem Sie auf die Zielseite klicken und 'Aktivieren' wählen. Zum Ausblenden einer Box klicken Sie einfach auf den Papierkorb.
 OnlyActiveElementsAreShown=Nur Elemente aus <a href="%s">aktiven Module</a> werden angezeigt.
-ModulesDesc=Die Module bestimmen, welche Funktionalität in Dolibarr verfügbar ist. Manche Module erfordern zusätzlich Berechtigungen die Benutzern die das Modul nutzen sollen gewährt werden muss, nachdem das Modul aktiviert wurde. \nKlicken Sie auf die Schaltfläche on/off, um ein Modul zu aktivieren. 
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=Sie finden weitere Module auf externen Web-Sites...
-ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesDeployDesc=Wenn die Rechte Ihres Dateisystems es zulassen, können Sie mit diesem Werkzeug ein externes Modul installieren. Es wird dann im Reiter <strong>%s</strong> erscheinen.
 ModulesMarketPlaces=Suche externe Module ...
-GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
+GoModuleSetupArea=Um ein neues Modul zu installieren, gehen Sie auf die Modul-Setup Seite <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, der offizielle Marktplatz für dolibarr Module/Erweiterungen
 DoliPartnersDesc=Firmenliste die Kundenspezifische Module oder Funktionen entwickeln. (Hinweis: Jedermann mit PHP Erfahrung kann Kundenspezifische Funktionen für Opensource Projekte Entwickeln)
 WebSiteDesc=Anbieter für weitere Module...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Datenbankpasswort in der Konfigurationsdatei ver
 InstrucToEncodePass=Um das Kennwort in der Konfigurationsdatei <b>conf.php</b> verschlüsselt zu speichern, ersetzen Sie die Zeile <br><b>$dolibarr_main_db_pass="...";</b><br>durch<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=Um das Kennwort unverschlüsselt (im Klartext) in der Konfigurationsdatei <b>conf.php</b> zu speichern, ersetzen Sie die Zeile<br><b>$dolibarr_main_db_pass="crypted:...";</b><br>durch<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=PDF-Dokumentschutz aktivieren (Die Aktivierung ist nicht empfohlen, weil dadurch die Stapelerzeugung von PDFs nicht mehr funktioniert)
-ProtectAndEncryptPdfFilesDesc=Die Aktivierung des PDF-Dokumentschutzes erhält die Lesbarkeit und Druckfähigkeit des Dokuments, Bearbeitung und Kopien sind jedoch nicht mehr möglich. Bitte beachten Sie, dass über die Aktivierung dieser Funktion auch die Stapelverarbeitung von PDF-Dokumenten (z.B. aller offenen Rechnungen) nicht mehr funktioniert
+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=Funktion
 DolibarrLicense=Lizenz
 Developpers=Entwickler/Mitwirkende
@@ -225,22 +226,24 @@ OfficialMarketPlace=Offizieller Marktplatz für Module/Erweiterungen
 OfficialWebHostingService=Offizielle Web-Hosting-Services (Cloud Hosting)
 ReferencedPreferredPartners=Bevorzugte Partner
 OtherResources=Andere Ressourcen
+ExternalResources=Externe Resourcen
+SocialNetworks=Soziale Netzwerke
 ForDocumentationSeeWiki=Für Benutzer-und Entwickler-Dokumentation (DOC, ...), FAQs <br> Werfen Sie einen Blick auf die Dolibarr Wiki: <br> <a href="%s" target="_blank"><b> %s</b></a>
 ForAnswersSeeForum=Für alle anderen Fragen, können Sie das Dolibarr Forum: <br> <a href="%s" target="_blank"><b> %s</b></a> benutzen.
 HelpCenterDesc1=In diesem Bereich erwartet Sie eine Übersicht von Hilfe und Support-Services für Dolibarr.
 HelpCenterDesc2=Ein Teil dieses Dienstes sind <b>nur</b> in <b>Englisch</b> verfügbar.
 CurrentMenuHandler=Aktuelle Menü-Handler
 MeasuringUnit=Maßeinheit
-LeftMargin=Left margin
-TopMargin=Top margin
-PaperSize=Paper type
-Orientation=Orientation
-SpaceX=Space X
-SpaceY=Space Y
-FontSize=Font size
-Content=Content
+LeftMargin=Linker Rand
+TopMargin=Oberer Rand
+PaperSize=Papiersorte
+Orientation=Orientierung
+SpaceX=Leerraum X
+SpaceY=Leerraum Y
+FontSize=Schriftgröße
+Content=Inhalt
 NoticePeriod=Kündigungsfrist
-NewByMonth=New by month
+NewByMonth=Neu nach Monat
 Emails=E-Mails
 EMailsSetup=E-Mail-Adressen einrichten
 EMailsDesc=Auf dieser Seite können Sie Ihre PHP-Parameter für den E-Mail-Versand überschreiben. In den meisten Unix/Linux-Umgebungen mit korrekter PHP-Konfiguration sind diese Einstellungen nutzlos.
@@ -260,14 +263,14 @@ MAIN_MAIL_EMAIL_STARTTLS= TLS (STARTTLS)-Verschlüsselung verwenden
 MAIN_DISABLE_ALL_SMS=Alle SMS-Funktionen abschalten (für Test- oder Demozwecke)
 MAIN_SMS_SENDMODE=Methode zum Senden von SMS
 MAIN_MAIL_SMS_FROM=Standard Versendetelefonnummer der SMS-Funktion
-MAIN_MAIL_DEFAULT_FROMTYPE=Sender e-mail by default for manual sendings (User email or Company email)
+MAIN_MAIL_DEFAULT_FROMTYPE=E-Mail Absender standardmäßig für den manuellen Versandt (Benutzer E-Mail oder Firmen E-Mail)
 UserEmail=Email des Benutzers
 CompanyEmail=Email der Firma
 FeatureNotAvailableOnLinux=Diese Funktion ist auf Unix-Umgebungen nicht verfügbar. Testen Sie Ihr Programm sendmail lokal.
 SubmitTranslation=Wenn die Übersetzung der Sprache unvollständig ist oder wenn Sie Fehler finden, können Sie können Sie die entsprechenden Sprachdateien im Verzeichnis <b>langs/%s</b> korrigieren und und anschließend Ihre Änderungen unter  www.transifex.com/dolibarr-association/dolibarr/ teilen.
 SubmitTranslationENUS=Sollte die Übersetzung für eine Sprache nicht vollständig sein oder Fehler beinhalten, können Sie die entsprechenden Sprachdateien im Verzeichnis <b>langs/%s</b> bearbeiten und anschließend Ihre Änderungen mit der Entwicklergemeinschaft auf www.dolibarr.org teilen.
 ModuleSetup=Moduleinstellung
-ModulesSetup=Moduleinstellungen
+ModulesSetup=Modul-/Applikationseinstellung
 ModuleFamilyBase=System
 ModuleFamilyCrm=Kunden-Beziehungs-Management (CRM)
 ModuleFamilySrm=Lieferantenmanagement (SRM)
@@ -285,29 +288,32 @@ MenuHandlers=Menü-Handler
 MenuAdmin=Menü-Editor
 DoNotUseInProduction=Nicht in Produktion nutzen
 ThisIsProcessToFollow=Hier sind die Schritte des Prozesses:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
+ThisIsAlternativeProcessToFollow=Dies ist ein alternativer Setup-Prozess:
 StepNb=Schritt %s
 FindPackageFromWebSite=Finden Sie ein Paket, das die gewünschten Funktionen beinhaltet (zum Beispiel auf der offiziellen Website %s).
 DownloadPackageFromWebSite=Installationspaket herunterladen (z.B. von offizieller Webseite %s).
-UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <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>.
-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='http://myserver/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.
+UnpackPackageInDolibarrRoot=Entpacke die Paketdatei in das Dolibarr Serververzeichnis für externe Module: <b>%s</b>
+UnpackPackageInModulesRoot=Um eine externes Modul bereit zu stellen, entpacken Sie die gepackten Dateien in das Serververzeichnis für Module: <b>%s</b>
+SetupIsReadyForUse=Modul-Installation abgeschlossen, es muss aber noch aktiviert und konfiguriert werden: <a href="%s">%s</a>.
+NotExistsDirect=Das alternative Stammverzeichnis ist nicht zu einem existierenden Verzeichnis definiert.<br>
+InfDirAlt=Seit Version 3 ist es möglich, ein alternatives Stammverzeichnis anzugeben. Dies ermöglicht, Erweiterungen und eigene Templates am gleichen Ort zu speichern.<br>Erstellen Sie einfach ein Verzeichis im Hauptverzeichnis von Dolibarr an (z.B. "custom").<br>
+InfDirExample=<br>Danach in der Datei <strong>conf.php</strong> deklarieren<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>Wenn diese Zeilen mit "#" auskommentiert sind, um sie zu aktivieren, einfach das Zeichen "#" entfernen.
 YouCanSubmitFile=Durch diesen Schritt, können Sie das Paket mit diesem Tool senden: Wähle Modul Datei
 CurrentVersion=Aktuelle dolibarr-Version
 CallUpdatePage=Zur Aktualisierung der Daten und Datenbankstrukturen zur Seite %s gehen.
 LastStableVersion=Letzte stabile Version
-LastActivationDate=Latest activation date
+LastActivationDate=Datum der letzten Aktivierung
+LastActivationAuthor=Benutzer der letzten Aktivierung
+LastActivationIP=IP der letzten Aktivierung
 UpdateServerOffline=Update-Server offline
+WithCounter=Zähler verwalten
 GenericMaskCodes=Sie können ein beliebiges Numerierungsschema wählen. Dieses Schema könnte z.B. so aussehen:<br><b>{000000}</b> steht für eine 6-stellige Nummer, die sich bei jedem neuen %s automatisch erhöht. Wählen Sie die Anzahl der Nullen je nach gewünschter Nummernlänge. Der Zähler füllt sich automatisch bis zum linken Ende mit Nullen um das gewünschte Format abzubilden. <br><b>{000000+000}</b> führt zu einem ähnlichen Ergebnis, allerdings mit einem Wertsprung in Höhe des Werts rechts des Pluszeichens, der beim ersten %s angewandt wird. <br><b>{000000@x}</b> wie zuvor, jedoch stellt sich der Zähler bei Erreichen des Monats x (zwischen 1 und 12) automatisch auf 0 zurück. Ist diese Option gewählt und x hat den Wert 2 oder höher, ist die Folge {mm}{yy} or {mm}{yyyy} ebenfalls erforderlich. <br><b>{dd}</b> Tag (01 bis 31).<br><b>{mm}</b> Monat (01 bis 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> Jahreszahl 1-, 2- oder 4-stellig. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Alle anderen Zeichen in der Maske bleiben. <br> Leerzeichen sind nicht zulässig. <br>
-GenericMaskCodes4a=<u>Beispiel auf der 99. %s des Partners DieFirma erstellt am 2007-01-31:</u> <br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Beispiel für Partner erstellt am 2007-03-01:</u> <br>
 GenericMaskCodes4c=<u>Beispiel für ein Produkt erstellt am 2007-03-01:</u> <br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> ergibt <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> ergibt <b>0199-ZZZ/31/XXX</b>
+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=Liefert eine anpassbare Nummer nach vordefiniertem Schema
 ServerAvailableOnIPOrPort=Server ist verfügbar unter der Adresse <b>%s</b> auf Port <b>%s</b>
 ServerNotAvailableOnIPOrPort=Server nicht verfügbar unter Adresse <b>%s</b> auf Port <b>%s</b>
@@ -369,24 +375,26 @@ Int=Ganzzahl
 Float=Fließkommazahl
 DateAndTime=Datum und Uhrzeit
 Unique=Einmalig
-Boolean=Boolean (Kontrollkästchen)
+Boolean=Boolean (Ein Kontrollkästchen)
 ExtrafieldPhone = Telefon
 ExtrafieldPrice = Preis
 ExtrafieldMail = E-Mail
-ExtrafieldUrl = Url
+ExtrafieldUrl = URL
 ExtrafieldSelect = Wähle Liste
 ExtrafieldSelectList = Wähle von Tabelle
-ExtrafieldSeparator=Trennzeichen
+ExtrafieldSeparator=Trennzeichen (kein Feld)
 ExtrafieldPassword=Passwort
+ExtrafieldRadio=Radio button (Nur eine Auswahl möglich)
 ExtrafieldCheckBox=Kontrollkästchen
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Kontrollkästchen von Tabelle
+ExtrafieldCheckBoxFromList=Kontrollkästchen aus Tabelle
 ExtrafieldLink=Verknüpftes Objekt
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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
+ComputedFormula=Berechnetes Feld
+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'
+ExtrafieldParamHelpselect=Parameterlisten müssen das Format Schlüssel,Wert haben<br><br> zum Beispiel:<br>1,Wert1<br>2,Wert2<br>3,Wert3<br>...<br><br>Um die Liste in Abhängigkeit zu einer anderen zu haben:<br>1,Wert1|parent_list_code:parent_key<br>2,Wert2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameterlisten müssen das Format Schlüssel,Wert haben<br><br> zum Beispiel:<br>1,Wert1<br>2,Wert2<br>3,Wert3<br>...
 ExtrafieldParamHelpradio=Parameterlisten müssen das Format Schlüssel,Wert haben<br><br> zum Beispiel:<br>1,Wert1<br>2,Wert2<br>3,Wert3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=Die Parameterliste stammt aus einer Tabelle<br>Syntax: \ntable_name: label_field: id_field::filter<br>Beispiel: c_typent: libelle:id::filter<br><br>Filter kann ein einfacher Test sein (z.B. active=1) um nur aktive Werte anzuzeigen<br>Benutzen Sie $ID$  für die ID des aktuellen Objekts im Filter<br>Benutzen Sie $SEL$<br>Wenn Sie ein SELECT<br>Benutzen Sie zur Abfrage von Extra-Feldern(Attributen) die extra.fieldcode = ... \n(wo Feldcode ist der Code von extrafield)<br><br>um auf einer anderen komplementären Attributliste, die Liste zu haben je c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter<br>um die Liste zu haben, auf einer anderen Liste abhängig:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter\n
+ExtrafieldParamHelpchkbxlst=Die Parameterliste stammt aus einer Tabelle <br>:\nSyntax:  tabellen_name:label_field:id_field::filter<br>\nBeispiele: c_typent:libelle:id::filter<br><br> der Filter kann ein einfacher Test sein(z.B. aktiv=1) um nur die aktiven Werte zu zeigen.<br>\nBenutzen Sie $ID$ um die ID des aktuellen Objekts im Filter zu nutzen<br>\nUm ein SELECT in einem Filter zu verwenden, verwenden Sie $SEL$ <br>\nUm in der Abfrage die zusätzlichen Attribute zu filtern, verwenden Sie den Syntax \nextra.fieldcode=... (fieldcode bezeichnet den Feldcode des zusätzlichen Feldes)<br><br>eine Liste abhängig von einem anderen zusätzlichen Attribute anzuzeigen<br>\nc_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter \n<br><br>Um eine Liste anzuzeigen auf einer anderen Liste je <br>c_typent:libelle:id:<i>code_liste_parente</i>|colonne_parente:filter
 ExtrafieldParamHelplink=Parameter müssen folgendes Format haben ObjektName:Klassenpfad<br>Syntax: ObjektName:Klassenpfad<br> Beispiel: Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Bibliothek zum erstellen von PDF
 WarningUsingFPDF=Achtung: Ihre <b>conf.php</b> enthält <b>$dolibarr_pdf_force_fpdf=1</b> Dies bedeutet, dass Sie die FPDF-Bibliothek verwenden, um PDF-Dateien zu erzeugen. Diese Bibliothek ist alt und unterstützt viele Funktionen nicht (Unicode-, Bild-Transparenz, kyrillische, arabische und asiatische Sprachen, ...), so dass es zu Fehlern bei der PDF-Erstellung kommen kann. <br> Um dieses Problem zu beheben und volle Unterstützung der PDF-Erzeugung zu erhalten, laden Sie bitte die <a href="http://www.tcpdf.org/" target="_blank">TCPDF Bibliothek</a> , dann kommentieren Sie die Zeile <b>$dolibarr_pdf_force_fpdf=1</b> aus oder entfernen diese und fügen statt dessen <b>$dolibarr_lib_TCPDF_PATH='Pfad_zum_TCPDF_Verzeichnisr'</b> ein
@@ -402,7 +410,7 @@ ValueOverwrittenByUserSetup=Achtung, dieser Wert kann durch den Benutzer übersc
 ExternalModule=Externes Modul - im Verzeichnis %s installiert
 BarcodeInitForThirdparties=Alle Strichcodes für Drittanbieter initialisieren
 BarcodeInitForProductsOrServices=Alle Strichcodes für Produkte oder Services initialisieren oder zurücksetzen
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
+CurrentlyNWithoutBarCode=Zur Zeit gibt es <strong>%s</strong> Datensätze in <strong>%s</strong> %s ohne Barcode.
 InitEmptyBarCode=Startwert für die nächsten %s leeren Datensätze
 EraseAllCurrentBarCode=Alle aktuellen Barcode-Werte löschen
 ConfirmEraseAllCurrentBarCode=Wirklich alle aktuellen Barcode-Werte löschen
@@ -418,13 +426,27 @@ EnableAndSetupModuleCron=Um wiederkehrende Rechnungen automatisch zu generieren,
 ModuleCompanyCodeAquarium=Generiert einen Kontierungscode %s, gefolgt von der Lieferantenummer für einen Lieferanten-Kontierungscode und %s, gefolgt vom Kundenkontierungscode für einen Kundenkontierungscode.
 ModuleCompanyCodePanicum=Leeren Kontierungscode zurückgeben.
 ModuleCompanyCodeDigitaria=Kontierungscode hängt vom Partnercode ab. Der Code setzt sich aus dem Buchstaben 'C' und den ersten 5 Stellen des Partnercodes zusammen.
-Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
+Use3StepsApproval=Standardmäßig, Einkaufsaufträge müssen durch zwei unterschiedlichen Benutzer erstellt und freigegeben werden (ein Schritt/Benutzer zu erstellen und ein Schritt/Benutzer für die Freigabe). Beachten Sie wenn ein Benutzer beide Rechte hat - zum erstellen und freigeben, dann reicht ein Benutzer für diesen Vorgang. Optional können Sie ein zusätzlicher Schritt/User für die Freigabe einrichten, wenn der Betrag einen bestimmten dedizierten Wert übersteigt (wenn der Betrag übersteigt wird, werden 3 Stufen notwendig: 1=Validierung, 2=erste Freigabe und 3=Gegenfreigabe.<br>Lassen Sie den Feld leer wenn eine Freigabe (2 Schritte) ausreicht; Tragen Sie einen sehr niedrigen Wert (0.1) wenn eine zweite Freigabe notwendig ist.
 UseDoubleApproval=3-Fach Verarbeitungsschritte verwenden wenn der Betrag (ohne Steuer) höher ist als ...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-ClickToShowDescription=Click to show description
+WarningPHPMail=Achtung: Einige Mail-Server (Yahoo) erlaubt keine E-Mails von einem anderen Server als ihre Postadresse zu senden, wenn verwendet wird, ist eine Yahoo-Adresse (myemail@yahoo.fr, myemail@yahoo.com. Ihre aktuelle Konfiguration com ...) verwendet den Anwendungsserver für die E-Mails zu senden. Der Server von einigen Empfängern (kompatibel mit dem restriktiven Protokoll DMARC) fragt Yahoo-Servern Erlaubnis E-Mails und Yahoo erhalten zu verweigern, da der Server nicht ein Server von Yahoo gehört, als Teil Ihrer e- werden nicht gesendet Mails reçus.<br>\nWenn Ihr E-Mail-Provider (wie Yahoo) Diese Einschränkung auferlegt, müssen Sie Ihre Konfiguration ändern und ein anderes Verfahren zum Senden von „SMTP-Server“ wählen, indem das SMTP-Kennwort von Ihrer ISP eingeben (fragen Ihre Mail-Flex Gehäuse)
+ClickToShowDescription=Klicke um die Beschreibung zu sehen
+DependsOn=Diese Modul benötigt die folgenden Module
+RequiredBy=Diese Modul wird durch folgende Module verwendet
+TheKeyIsTheNameOfHtmlField=Das ist der Name des HTML Feldes. Sie benötigen HTML Kenntnisse um den Namen des Feldes aus der HTML Seite zu ermitteln.
+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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Persönliche Standardwerte erlauben
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=Eine Übersetzung wurde für diesen Schlüssel gefunden, um die Übersetzung anzupassen, gehen Sie in Menü "Home->Setup->Überseztungen"
+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=Feld
+ProductDocumentTemplates=Dokumentvorlagen zur Erstellung von Produktdokumenten
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Wasserzeichen auf Entwurf von Ausgabenbelegen
 # Modules
 Module0Name=Benutzer und Gruppen
-Module0Desc=Users / Employees and Groups management
+Module0Desc=Benutzer / Mitarbeiter und Gruppen Administration
 Module1Name=Partner
 Module1Desc=Partner- und Kontakteverwaltung
 Module2Name=Vertrieb
@@ -444,7 +466,7 @@ Module30Desc=Rechnungs- und Gutschriftsverwaltung für Kunden. Rechnungsverwaltu
 Module40Name=Lieferanten
 Module40Desc=Lieferantenverwaltung und Einkauf (Bestellungen und Rechnungen)
 Module42Name=Systemprotokoll
-Module42Desc=Protokollierungsdienste (Syslog)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Bearbeiter
 Module49Desc=Editorverwaltung
 Module50Name=Produkte
@@ -499,12 +521,12 @@ Module410Name=Webkalender
 Module410Desc=Webkalenderintegration
 Module500Name=Sonderausgaben
 Module500Desc=Verwalten von speziellen Ausgaben (Steuern, Sozialabgaben, Dividenden)
-Module510Name=Liste von Arbeitsverträgen und Löhnen
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Darlehen
 Module520Desc=Verwaltung von Darlehen
 Module600Name=Benachrichtigungen
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
+Module600Desc=Email-Benachrichtigung (ausgelößt durch einige Ereignisse) zu Benutzern (seperate Einstellungen je Benutzer), Partner-Kontakte (seperate Einstellung für jeden Partner) oder festen Email-Adressen.
 Module700Name=Spenden
 Module700Desc=Spendenverwaltung
 Module770Name=Spesenabrechnungen
@@ -526,7 +548,7 @@ Module2200Desc=Mathematische Ausdrücke für Preise aktivieren
 Module2300Name=Cron
 Module2300Desc=CronJob Verwaltung
 Module2400Name=Ereignisse/Termine
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Desc=Folgeereignisse oder Termine. Ereignisse manuell in der Agenda erfassen oder Applikationen erlauben Termine zur Nachverfolgung zu erstellen.
 Module2500Name=Inhaltsverwaltung(ECM)
 Module2500Desc=Speicherung und Verteilung von Dokumenten
 Module2600Name=API/Webservice (SOAP Server)
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind Konvertierung
 Module3100Name=Skype
 Module3100Desc=Skype-Button zu Karten von Benutzer-/Partner-/Kontakt-/Mitglieder-Karten hinzufügen
+Module3200Name=Unveränderbare Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=PV
-Module4000Desc=Personalverwaltung
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Mandantenfähigkeit
 Module5000Desc=Ermöglicht Ihnen die Verwaltung mehrerer Firmen
 Module6000Name=Workflow
@@ -591,8 +615,8 @@ Permission32=Produkte/Leistungen erstellen/bearbeiten
 Permission34=Produkte/Leistungen löschen
 Permission36=Projekte/Leistungen exportieren
 Permission38=Produkte exportieren
-Permission41=Projekte und Aufgaben lesen (Geteilte Projekte und Projekte in denen ich Kontakt bin).  Es kann auch Zeitaufwand auf zugewiesenen Aufgaben gebucht werden.
-Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
+Permission42=Erstellen und Ändern von Projekten (geteilte Projekte und solche, in denen ich Kontakt bin). Kann auch Aufgaben erstellen und Benutzer dem Projekt und den Aufgaben zuweisen.
 Permission44=Projekte und Aufgaben löschen (gemeinsame Projekte und Projekte in welchen ich Ansprechpartner bin)
 Permission45=Projekte exportieren
 Permission61=Serviceaufträge ansehen
@@ -640,9 +664,9 @@ Permission144=Löschen Sie alle Projekte und Aufgaben (einschließlich privater
 Permission146=Lieferanten einsehen
 Permission147=Statistiken einsehen
 Permission151=Bestellung mit Zahlart Lastschrift 
-Permission152=Create/modify a direct debit payment orders
+Permission152=Lastschriftaufträge erstellen/bearbeiten
 Permission153=Bestellungen mit Zahlart Lastschrift übertragen
-Permission154=Record Credits/Rejects of direct debit payment orders
+Permission154=Lastschriftaufträge genehmigen/ablehnen
 Permission161=Verträge/Abonnements einsehen
 Permission162=Verträge/Abonnements erstellen/bearbeiten
 Permission163=Service/Abonnement in einem Vertrag aktivieren
@@ -695,7 +719,7 @@ PermissionAdvanced253=Andere interne/externe Benutzer und Gruppen erstellen/bear
 Permission254=Nur externe Benutzer erstellen/bearbeiten
 Permission255=Andere Passwörter ändern
 Permission256=Andere Benutzer löschen oder deaktivieren
-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 assignement matters).
+Permission262=Zugang auf alle Partner erweitern (Nicht nur  Partner wo der Benutzer der Handelsvertreter ist) <br>Nicht wirksam für externe Nutzer (Immer beschränkt auf sich selbst für Angebote, Bestellungen, Rechnungen, Verträge, etc).<br>Nicht wirksam für Projekte(Nur Regeln für Projektberechtigungen, Sichtbarkeits- und Zuordnungsfragen)
 Permission271=Read CA
 Permission272=Rechnungen anzeigen
 Permission273=Ausgabe Rechnungen
@@ -780,7 +804,7 @@ Permission1236=Lieferantenrechnungen, -attribute und zahlungen exportieren
 Permission1237=Lieferantenbestellungen mit Details exportieren
 Permission1251=Massenimports von externen Daten ausführen (data load)
 Permission1321=Kundenrechnungen, -attribute und -zahlungen exportieren
-Permission1322=Reopen a paid bill
+Permission1322=Eine bezahlte Rechnung wieder öffnen
 Permission1421=Exportieren von Kundenaufträge und Attribute
 Permission20001=Urlaubsanträge einsehen (eigene und die der Untergebenen)
 Permission20002=Ihre eigenen Urlaubsanträge erstellen/bearbeiten
@@ -835,21 +859,23 @@ DictionaryPaymentModes=Zahlungsarten
 DictionaryTypeContact=Kontaktarten
 DictionaryEcotaxe=Ökosteuern (WEEE)
 DictionaryPaperFormat=Papierformate
-DictionaryFormatCards=Cards formats
+DictionaryFormatCards=Karten Formate
 DictionaryFees=Gebührenarten
 DictionarySendingMethods=Versandarten
 DictionaryStaff=Mitarbeiter
 DictionaryAvailability=Lieferverzug
 DictionaryOrderMethods=Bestellmethoden
 DictionarySource=Quelle der Angebote/Aufträge
-DictionaryAccountancyCategory=Accounting account groups
+DictionaryAccountancyCategory=Gruppen Buchungskonten
 DictionaryAccountancysystem=Kontenplan Modul
+DictionaryAccountancyJournal=Buchhaltungsjournale
 DictionaryEMailTemplates=Textvorlagen für E-Mails
 DictionaryUnits=Einheiten
 DictionaryProspectStatus=Geschäftsanbahnungsarten
 DictionaryHolidayTypes=Urlaubsarten
 DictionaryOpportunityStatus=Verkaufschancen für Projekt/Lead
 SetupSaved=Einstellungen gespeichert
+SetupNotSaved=Einstellungen nicht gespeichert
 BackToModuleList=Zurück zur Modulübersicht
 BackToDictionaryList=Zurück zur der Stammdatenübersicht
 VATManagement=USt-Verwaltung
@@ -892,12 +918,12 @@ LabelUsedByDefault=Bezeichnung wird verwendet falls keine Übersetzung für den
 LabelOnDocuments=Bezeichnung auf Dokumenten
 NbOfDays=Anzahl der Tage
 AtEndOfMonth=Am Ende des Monats
-CurrentNext=Current/Next
+CurrentNext=Aktueller/ Nächster
 Offset=Wertsprung
 AlwaysActive=Immer aktiv
 Upgrade=Aktualisierung
 MenuUpgrade=Aktualisierung/Erweiterung
-AddExtensionThemeModuleOrOther=Deploy/install external module
+AddExtensionThemeModuleOrOther=Externes Modul hinzufügen
 WebServer=Webserver
 DocumentRootServer=Dokumenten-Stammordner des Webservers
 DataRootServer=Daten-Verzeichnis
@@ -931,11 +957,13 @@ DefaultMaxSizeList=Voreinstellung maximale Anzahl Zeilen für Listen
 DefaultMaxSizeShortList=Standard für maximale Länge bei kurzen Listen (z.B. Kundenkarte)
 MessageOfDay=Nachricht des Tages
 MessageLogin=Nachricht auf der Anmeldeseite
+LoginPage=Anmeldeseite
+BackgroundImageLogin=Hintergrundbild
 PermanentLeftSearchForm=Ständiges Suchfeld auf der linken Seite
 DefaultLanguage=Standardsprache der Anwendung (Sprachcode)
 EnableMultilangInterface=Mehrsprachigkeit aktivieren
 EnableShowLogo=Logo über dem linken Menü anzeigen
-CompanyInfo=Information über die Firma/Institution
+CompanyInfo=Firmen-/Stiftungsinformationen
 CompanyIds=Firmen-/Stiftungs-IDs
 CompanyName=Firmenname
 CompanyAddress=Firmenadresse
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Verzögerungstoleranz (in Tagen) vor Benachrichtigung
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Verzögerungstoleranz (in Tagen) vor der Benachrichtigung über einzulösende Schecks
 Delays_MAIN_DELAY_EXPENSEREPORTS=Toleranz in Tagen vor der Benachrichtigung zur Genehmigung einer Spesenabrechnung
 SetupDescription1=Die Einstellungsübersicht dient zum initialen Einrichten before mit der Verwendung von Dolibarr begonnen wird.
-SetupDescription2=Die zwei wichtigsten Einstellungsschritte sind die ersten zwei Zeilen im Einstellungsmenü auf der linken Seite: Firma/Stiftung-Einstellungsseite und die Module-Einstellungsseite.
-SetupDescription3=Parameter im Menü <a href="%s">Setup -> Firma/Stifitung</a> sind notwendig, da die eingeben Daten für Dolibarr-Anzeigen und zum Einstellen des Standardverhaltens der Software notwendig sind (für länderabhängige Funktionen zum Beispiel).
-SetupDescription4=Parameter im Menü <a href="%s">Setup -> Modules</a> sind notwenig, da Dolibarr kein monolithisches ERP/CRM-System ist, sondern eine Zusammenstellung von mehren Modulen, welche mehr oder weniger unabhängig arbeiten. Neue Funktionen werden für jedes Modul, das Sie aktivieren, den Menüs hinzugefügt.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Andere Einträge verwalten optionale Parameter.
 LogEvents=Protokollierte Ereignisse
 Audit=Protokoll
@@ -987,7 +1015,7 @@ BrowserOS=Betriebssystem des Browsers
 ListOfSecurityEvents=Liste der sicherheitsrelevanten Ereignisse
 SecurityEventsPurged=Security-Ereignisse gelöscht
 LogEventDesc=Hier können Sie die Protokollierungseinstellungen für sicherheitsrelevante Ereignisse anpassen. Administratoren können die entsprechenden Inhalte unter <b>Systemwerkzeuge-Protokoll</b> einsehen. Achtung: Diese Funktion kann zu erhöhtem Datenaufkommen in der Datenbank führen.
-AreaForAdminOnly=Diese Funktionen stehen ausschließlich <b>Administratoren</b> zur Verfügung. Administrationsfunktionen und -hilfe werden in dolibarr durch die folgenden Symbole dargestellt:
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Verschiedene systemrelevante, technische Informationen - Lesemodus und nur für Administratoren sichtbar.
 SystemAreaForAdminOnly=Dieser Bereich steht ausschließlich Administratoren zur Verfügung. Keine der Benutzerberechtigungen kann dies ändern.
 CompanyFundationDesc=Tragen Sie hier alle Informationen zum Unternehmen ein, das Sie verwalten möchten (Zum Bearbeiten auf den Button "Bearbeiten" oder "Speichern" am Schluss der Seite klicken)
@@ -1004,14 +1032,14 @@ TriggerAlwaysActive=Trigger in dieser Datei sind unabhängig der Modulkonfigurat
 TriggerActiveAsModuleActive=Trigger in dieser Datei sind durch das übergeordnete Modul <b>%s</b> aktiviert.
 GeneratedPasswordDesc=Definieren Sie hier das Schema nach dem automatisch generierte Passwörter erstellt werden sollen.
 DictionaryDesc=Alle Standardwerte einfügen. Sie können eigene Werte zu den Standartwerten hinzufügen.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">check here</a>.
+ConstDesc=Diese Seite erlaubt es alle anderen Parameter einzustellen, die auf den vorherigen Seiten nicht verfügbar sind. Dies sind meist reservierte Parameter für Entwickler oder für die erweiterte Fehlersuche. Für eine Liste von Optionen <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site-öffnet sich in einem neuen Fenster" target="_blank"> hier überprüfen </ </a>.
 MiscellaneousDesc=Alle anderen sicherheitsrelevanten Parameter werden hier eingestellt.
 LimitsSetup=Limits und Genauigkeit Einstellungen
 LimitsDesc=Hier können Sie Grenzwerte, Genauigkeitseinstellungen und das Rundungsverhalten einstellen.
 MAIN_MAX_DECIMALS_UNIT=Dezimalstellen max. für Stückpreise
 MAIN_MAX_DECIMALS_TOT=Dezimalstellen max. für Gesamtsummen
 MAIN_MAX_DECIMALS_SHOWN=Dezimalstellen max. für auf dem Bildschirm angezeigte Preise (Fügen Sie <b>...</b> nach dieser Nummer ein, wenn Sie <b>...</b> sehen wollen, falls ein Bildschirmpreis abgeschnitten wurde.
-MAIN_ROUNDING_RULE_TOT=Rundungseinstellung (Für Länder in denen nicht auf 10er Basis Gerundet wird. z.B. 0.05 damit in 0.05 Schritten gerundet wirb)
+MAIN_ROUNDING_RULE_TOT=Rundungseinstellung (Für Länder in denen nicht auf 10er Basis gerundet wird. z.B. 0,05 damit in 0,05 Schritten gerundet wird)
 UnitPriceOfProduct=Nettostückpreis
 TotalPriceAfterRounding=Gesamtpreis (Netto/USt./Brutto) gerundet
 ParameterActiveForNextInputOnly=Die Einstellungen werden erst bei der nächsten Eingabe wirksam
@@ -1072,18 +1100,19 @@ TranslationSetup=Konfiguration der Übersetzung
 TranslationKeySearch=Übersetzungsschlüssel oder -Zeichenkette suchen
 TranslationOverwriteKey=Überschreiben der Übersetzung
 TranslationDesc=Angezeichten Systemsprachen einstellen:<br>* Systemweit: Menü <strong>Start - Konfiguration - Anzeigen</strong><br>* Nach Benutzer: <strong>Benutzer konfigurieren</strong>Benutzer Karteireiter (Benutzername anklicken ganz oben auf dem Bildschirm).
-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
+TranslationOverwriteDesc=Sie können Zeichenketten durch Füllen der folgenden Tabelle überschreiben. Wählen Sie Ihre Sprache aus dem "%s" Drop-Down und tragen Sie den Schlüssel in "%s" und Ihre neue Übersetzung in "%s" ein.
+TranslationOverwriteDesc2=Sie können die andere Registerkarte verwenden, um Ihnen zu helfen, den Übersetzungsschlüssel zu verwenden
 TranslationString=Übersetzung Zeichenkette
 CurrentTranslationString=Aktuelle Übersetzung 
-WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+WarningAtLeastKeyOrTranslationRequired=Es sind mindestens ein Suchkriterium erforderlich für eine Schlüssel- oder Übersetzungszeichenfolge
 NewTranslationStringToShow=Neue Übersetzungen anzeigen
-OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Anzahl aktivierterter Module: <b>%s</b> / <b>%s</b>
+OriginalValueWas=Original-Übersetzung überschrieben. Der frühere Wert war:<br><br>%s
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists in any language files
+TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Sie müssen mindestens 1 Modul aktivieren
 ClassNotFoundIntoPathWarning=Klasse %s nicht innerhalb PHP-Pfad gefunden
 YesInSummer=Ja im Sommer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Sitzungsspeicher durch Suhosin verschlüsselt
 ConditionIsCurrently=Einstellung ist aktuell %s
 YouUseBestDriver=Sie verwenden den Treiber %s, dies ist derzeit der beste verfügbare.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Regeln für Identifikationsnummern
 MustBeUnique=Muss es eindeutig sein ?
 MustBeMandatory=Erforderlich zur Anlage von Partnern ?
 MustBeInvoiceMandatory=Erforderlich, um Rechnungen freizugeben ?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Ein Eportlink für das Format <b>%s</b> findet sich unter folgendem Link: %s
 ##### Invoices #####
 BillsSetup=Rechnungsmoduleinstellungen
 BillsNumberingModule=Rechnungs- und Gutschriftsnumerierungsmodul
 BillsPDFModules=PDF-Rechnungsvorlagen
+PaymentsPDFModules=Payment documents models
 CreditNote=Gutschrift
 CreditNotes=Gutschriften
 ForceInvoiceDate=Rechnungsdatum ist zwingend Freigabedatum
@@ -1162,7 +1193,7 @@ WatermarkOnDraftSupplierProposal=Wasserzeichen auf vorbereiteten Preisanfrage f
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Frage nach Bankkonto für Preisanfragen
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Frage nach Lager für Aufträge
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Frage nach der Ziel-Bankverbindung der Lieferantenbestellung
 ##### Orders #####
 OrdersSetup=Bestellverwaltungseinstellungen
 OrdersNumberingModules=Bestellnumerierungs-Module
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Dateien vom Typ %s werden vom HTTP Server nicht zwischenges
 FilesOfTypeCompressed=Dateien vom Typ %s werden vom HTTP Server komprimiert
 FilesOfTypeNotCompressed=Dateien vom Typ %s werden vom HTTP Server nicht komprimiert
 CacheByServer=Vom Server zwischengespeichert
+CacheByServerDesc=Verwenden sie zB. den Apache Konfigurationsbefehl "ExpiresByType image/gif A2592000"
 CacheByClient=Vom Browser zwischengespeichert
 CompressionOfResources=Komprimierung von HTTP Antworten
+CompressionOfResourcesDesc=Zum Beispiel mit der Apache Anweisung "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Automatische Erkennung mit den aktuellen Browsern nicht möglich
+DefaultValuesDesc=You can define/force here the default value you want to get when your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Standard Suchfilter
+DefaultSortOrder=Standardsortierreihenfolge
+DefaultFocus=Standardfokusfeld
 ##### Products #####
 ProductSetup=Produktmoduleinstellungen
 ServiceSetup=Modul Leistungen - Einstellungen
@@ -1339,7 +1377,7 @@ ViewProductDescInFormAbility=Anzeige der Produktbeschreibungen in Formularen (so
 MergePropalProductCard=Aktivieren einer Option unter Produkte/Leistungen  Registerkarte verknüpfte Dateien, um Produkt-PDF-Dokumente um Angebots PDF azur zusammenzuführen, wenn Produkte/Leistungen in dem Angebot sind.
 ViewProductDescInThirdpartyLanguageAbility=Anzeige der Produktbeschreibungen in der Sprache des Partners
 UseSearchToSelectProductTooltip=Wenn Sie eine große Anzahl von Produkten (> 100.000) haben, können Sie die Geschwindigkeit verbessern, indem Sie in Einstellungen -> Andere die Konstante PRODUCT_DONOTSEARCH_ANYWHERE auf 1 setzen. Die Suche startet dann am Beginn des Strings.
-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=Warte auf Tastendruck, bevor der Inhalt der Produkt-Combo-Liste geladen wird (Dies kann die Leistung verbessern, wenn Sie eine große Anzahl von Produkten haben).
 SetDefaultBarcodeTypeProducts=Standard-Barcode-Typ für Produkte
 SetDefaultBarcodeTypeThirdParties=Standard-Barcode-Typ für Partner
 UseUnits=Definieren Sie eine Maßeinheit für die Menge während der Auftrags-, Auftragsbestätigungs- oder Rechnungszeilen-Ausgabe
@@ -1397,7 +1435,7 @@ SendingsSetup=Versandmoduleinstellungen
 SendingsReceiptModel=Versandbelegsvorlage
 SendingsNumberingModules=Nummerierungsmodell Auslieferungen
 SendingsAbility=Unterstützung von Versand-Dokumenten für Kundenlieferungen
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
+NoNeedForDeliveryReceipts=In den meisten Fällen werden Lieferscheine sowohl als Versanddokument (für die Zusammenstellung der Auslieferung), als auch als Zustellscheine, die vom Kunden zu unterschreiben sind, verwendet. Entsprechend sind Empfangsbelege meist eine doppelte und daher nicht verwendete Option.
 FreeLegalTextOnShippings=Freier Text auf Lieferungen
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Zustellscheinnumerierungs-Module
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Rechnungsdatum verwendet
 Buy=Kaufen
 Sell=Verkaufen
 InvoiceDateUsed=Rechnungsdatum verwendet
-YourCompanyDoesNotUseVAT=Für Ihr Unternehmen wurde keine USt.-Verwendung definiert (Start-Einstellungen-Unternehmen/Stiftung), entsprechend stehen in der Konfiguration keine USt.-Optionen zur Verfügung.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=Kontierungs-Code
 AccountancyCodeSell=Verkaufskonto-Code
 AccountancyCodeBuy=Einkaufskonto-Code
@@ -1477,11 +1515,12 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Diesen Standardwert automatisch als Ereignistyp im
 AGENDA_DEFAULT_FILTER_TYPE=Diesen Ereignistyp automatisch in den Suchfilter für die Agenda-Ansicht übernehmen
 AGENDA_DEFAULT_FILTER_STATUS=Diesen Ereignisstatus automatisch in den Suchfilter für die Agenda-Ansicht übernehmen
 AGENDA_DEFAULT_VIEW=Welchen Reiter möchten Sie beim Öffnen der Agenda automatisch anzeigen
-AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
-AGENDA_NOTIFICATION_SOUND=Enable sound notification
+AGENDA_NOTIFICATION=Aktivieren Sie die Ereignisbenachrichtigung auf Benutzerbrowsern, wenn das Ereignisdatum erreicht ist (jeder Benutzer kann dies aus der Browser-Bestätigungsfrage verweigern)
+AGENDA_NOTIFICATION_SOUND=Aktiviere Tonbenachrichtigung
+AGENDA_SHOW_LINKED_OBJECT=Verknüpfte Objekte in Agenda anzeigen
 ##### Clicktodial #####
 ClickToDialSetup=Click-to-Dial Moduleinstellungen
-ClickToDialUrlDesc=Definieren Sie hier die URL, die bei einem Klick auf das Telefonsymbol aufgerufen werden soll. In dieser URL können Sie Tags verwenden<br><b>%%1$s</b> wird durch die Telefonnummer des Angerufenen ersetzt<br><b>%%2$s</b> wird durch die Telefonnummer des Anrufers (Ihre) ersetzt<br><b>%%3$s</b> wird durch Ihren Benutzernamen für Click-to-Dial ersetzt (siehe Benutzerdatenblatt)<br><b>%%4$s</b> wird durch Ihr Click-to-Dial-Passwort ersetzt (siehe Benutzerdatenblatt).
+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=Dieses Modul fügt ein Symbol nach Telefonnummern ein. Durch einen Klick auf dieses Symbol kann Dolibarr z.B. durch ein SIP System eine Telefonanlage anweisen, diese Telefonnummer zu wählen.
 ClickToDialUseTelLink=Nur einen Link "Tel:" bei Telefonnummern verwenden
 ClickToDialUseTelLinkDesc=Benutzen Sie diese Methode, wenn Ihre Benutzer ein Software-Telefon oder ein Interface für ein Telefon auf demselben Computer wie der Browser installiert haben. Dieses Telefon/Interface wird aufgerufen, wenn Sie auf einen Link klicken, der mit "tel:" beginnt. Wenn Sie eine vollständige Server-Lösung nutzen wollen (ohne lokale Software-Installation), wählen Sie hier "Nein" und füllen das nächste Feld.
@@ -1509,11 +1548,11 @@ EndPointIs=SOAP-Clients müssen ihre Anfragen an den Dolibarr Endpunkt verfügba
 ##### API ####
 ApiSetup=Modul API - Einstellungen
 ApiDesc=Wenn dieses Modul aktiviert ist, wird Dolibarr zum REST Server für diverse web services.
-ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=Sie können das API unter dieser URL anschauen
+ApiProductionMode=Echtbetrieb aktivieren (dadurch wird ein Cache für Service-Management aktiviert)
+ApiExporerIs=You can explore and test the APIs at URL
 OnlyActiveElementsAreExposed=Nur Elemente aus aktiven Modulen sind ungeschützt
 ApiKey=Schlüssel für 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=Der API-Explorer wurde deaktiviert. Der API-Explorer ist nicht notwendig um die API-Dienste zu bieten. Es ist ein Werkzeug für Entwickler zu finden / Test-REST-APIs. Wenn Sie dieses Tool benötigen, gehen Sie in Setup von Modul-API REST um es zu aktivieren.
 ##### Bank #####
 BankSetupModule=Bankmoduleinstellungen
 FreeLegalTextOnChequeReceipts=Freier Rechtstext für Scheckbelege
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=Allgemeine Anzeige-Reihenfolge
 BankOrderES=Spanisch
 BankOrderESDesc=Spanisch Anzeigereihenfolge
 ChequeReceiptsNumberingModule=Checknummerierungsmodul
-
 ##### Multicompany #####
 MultiCompanySetup=Einstellungen des Modul Mandanten
 ##### Suppliers #####
@@ -1576,18 +1614,18 @@ ListOfNotificationsPerUser=Liste der Benachrichtigungen nach Benutzer*
 ListOfNotificationsPerUserOrContact=Liste der Benachrichtigungen nach Benutzer oder Kontakt**
 ListOfFixedNotifications=Liste von ausbesserten Benachrichtigungen
 GoOntoUserCardToAddMore=Gehen Sie auf die Registerkarte "Hinweise" eines Benutzers, um Benachrichtigungen für Benutzer zu erstellen/entfernen
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Gehen Sie auf die Registerkarte "Hinweise" des Partners, um Hinweise für Kontakte/Adressen zu erstellen oder zu entfernen
 Threshold=Schwellenwert
 BackupDumpWizard=Assistenten zum erstellen der Datenbank-Backup Dump-Datei 
 SomethingMakeInstallFromWebNotPossible=Die Installation von dem externen Modul ist aus folgenden Gründen vom Web-Interface nicht möglich:
 SomethingMakeInstallFromWebNotPossible2=Aus diesem Grund wird die Prozess hier beschriebenen Upgrade ist nur manuelle Schritte ein privilegierter Benutzer tun kann.
 InstallModuleFromWebHasBeenDisabledByFile=Installieren von externen Modul aus der Anwendung wurde von Ihrem Administrator deaktiviert. \nSie müssen ihn bitten, die Datei<strong>%s</strong> zu entfernen, um diese Funktion zu ermöglichen.
-ConfFileMuseContainCustom=Installing 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=Zeilen hervorheben bei Mouseover
 HighlightLinesColor=Farbe der Zeile hervorheben, wenn die Maus darüberfährt (leer lassen, um den Effekt zu deaktivieren)
 TextTitleColor=Farbe des Seitenkopfs
 LinkColor=Farbe für Hyperlinks
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Funktioniert mit dem Standard-Designvorlagen: wird möglicherweise nicht von externen Designvorlagen unterstützt
 BackgroundColor=Hintergrundfarbe
 TopMenuBackgroundColor=Hintergrundfarbe für Hauptmenü
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Kündigungsfrist (Ihre Kündigung muss vor dieser Zeit erfol
 NbAddedAutomatically=Anzahl Tage die den Benutzern jeden Monat (automatisch) hinzuaddiert werden
 EnterAnyCode=Dieses Feld enthält eine Referenz um die Zeile zu identifizieren. Geben Sie einen beliebigen Wert ohne Sonderzeichen ein.
 UnicodeCurrency=Fügen sie zwischen den eckigen Klammern die Unicode Zeichenwerte für das Währungssymbol ein. Beispiele: Für $ den Wert [36], für brasilianische Real R$ [82,36], für € den Wert [8364]
+ColorFormat=Die RGB Farben sind im Hexformat, zB. FF0000
 PositionIntoComboList=Zeilenposition in der Combo-Listen
 SellTaxRate=Mehrwertsteuersatz
 RecuperableOnly=Ja für USt. "Wahrgenommene nicht Erstattungsfähig" für einige Regionen in Frankreich. Nein für alle anderen Fälle.
@@ -1612,7 +1651,7 @@ FixTZ=Zeitzonen-Korrektur
 FillFixTZOnlyIfRequired=Beispiel: +2 (nur ausfüllen, wenn Sie Probleme haben)
 ExpectedChecksum=Erwartete Prüfsumme
 CurrentChecksum=Aktuelle Prüfsumme
-ForcedConstants=Required constant values
+ForcedConstants=Erforderliche Parameter Werte
 MailToSendProposal=Um Angebot zu schicken
 MailToSendOrder=Um Kundenauftrag zu schicken
 MailToSendInvoice=Um Kundenrechnung zu schicken
@@ -1621,14 +1660,14 @@ MailToSendIntervention=Um Serviceauftrag zu schicken
 MailToSendSupplierRequestForQuotation=Um Anfrage an den Lieferanten schicken
 MailToSendSupplierOrder=Um Lieferantenbestellung zu schicken
 MailToSendSupplierInvoice=Um Lieferantenrechnung zu schicken
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
+MailToSendContract=um den Vertrag zu senden
+MailToThirdparty=Um E-Mail von Partner zu schicken
 ByDefaultInList=Standardanzeige als Listenansicht
-YouUseLastStableVersion=You use the latest stable version
+YouUseLastStableVersion=Sie verwenden die letzte stabile Version
 TitleExampleForMajorRelease=Beispielnachricht, die Sie nutzen können, um eine Hauptversion anzukündigen. Sie können diese auf Ihrer Website verwenden.
 TitleExampleForMaintenanceRelease=Beispielnachricht, die Sie nutzen können, um ein Wartungsupdate anzukündigen. Sie können diese auf Ihrer Website verwenden.
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s 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.
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s ist verfügbar. Version %s ist eine Hauptversion mit vielen neuen Features für Benutzer und Entwickler. Sie können die Version aus dem Downloadbereich des Portals http://www.dolibarr.org laden (Unterverzeichnis "stabile Versionen"). Lesen Sie die komplette Liste der <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">Änderungen</a>.
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s ist verfügbar. Version %s ist ein Wartungsupdate , das Fehlerbereinigungen enthält. Es wird allen Nutzern einer älteren Version empfohlen, auf diese zu wechseln. Wie bei jedem Wartungsupdate sind keinen neuen Features oder Änderungen in den Datenstrukturen enthalten. Sie können die Version aus dem Downloadbereich des Portals http://www.dolibarr.org laden (Unterverzeichnis "stabile Versionen"). Lesen Sie die komplette Liste der <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">Änderungen</a>.
 MultiPriceRuleDesc=Wenn die Option "mehrere Preisebenen pro Artikel/Dienstleistung" aktiviert ist, können Sie verschiedene Preis (einen pro Ebene) für jeden artikel definieren. Um Zeit zu sparen, können Sie eine Regel anlegen, mit der der Preis pro Ebene automatisch anhand des Preise in der ersten Ebene kalkuliert wird, so dass Sie nur einen Preis in der ersten Ebene eingeben müssen. Diese Seite kann Ihnen nur Zeit sparen und nützlich sein, wenn die Preise anderer Ebenen vom Preis der ersten Ebene abhängig sind. Ansonsten können Sie diese Seite ignorieren.
 ModelModulesProduct=Vorlagen für Produktdokumente
 ToGenerateCodeDefineAutomaticRuleFirst=Um Barcode automatisch zu erstellen, müssen Sie zuerst einen Manager definieren, der die Barcode-Nummern erstellt.
@@ -1649,17 +1688,21 @@ AddOtherPagesOrServices=Andere Seiten oder Dienste hinzufügen
 AddModels=Dokumente oder Nummerierungsvorlagen hinzufügen
 AddSubstitutions=Ersatzwerte hinzufügen
 DetectionNotPossible=Erkennung nicht möglich
-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 um ein Token für die API Nutzung zu erhalten (Erhaltene Token werden in der Benutzertabelle gespeichert und bei jedem Zugriff validiert)
 ListOfAvailableAPIs=Liste von verfügbaren APIs
 activateModuleDependNotSatisfied=Modul "%s" benötigt Modul "%s" welches fehlt, dadurch funktioniert Modul "%1$s" möglicherweise nicht korrekt. Installieren Sie Modul "%2$s" oder deaktivieren Sie Modul "%1$s" um auf der sicheren Seite zu sein
 CommandIsNotInsideAllowedCommands=Das Kommando ist nicht in der Liste der erlaubten Kommandos, definiert in <strong>$dolibarr_main_restrict_os_commands</strong> in der <strong>conf.php</strong> Datei.
 LandingPage=Einstiegsseite
-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
-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
-TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+SamePriceAlsoForSharedCompanies=Wenn Sie das Mehrfirmenmodul mit der Einstellung "Einzelner Preis" verwenden, dann ist der Preis für die Produkte identisch, die zwischen den Unternehmen geteilt werden.
+ModuleEnabledAdminMustCheckRights=Das Modul wurde aktiviert. Rechte wurden nur Admin-Benutzern gewährt. Wenn nötig, müssen Sie anderen Benutzern oder Gruppen Rechte manuell zuweisen.
+UserHasNoPermissions=Dieser Benutzer hat keine Rechte
+TypeCdr=Verwenden Sie „Nein“, wenn das Datum der Zahlungsfrist ist das Rechnungsdatum plus ein Delta in Tagen (Delta ist die „Anzahl der Tage“) <br> Use „Am Ende des Monats“, wenn nach dem Delta das Datum muss bis zum Ende des Monats erhöht werden (+ ein „Offset“ optional Tage) <br> „Aktueller/ Nächster“, um das Datum der Zahlungsfrist verwenden ist der erste n-ten Tag des Monats nach (N ist in der „Anzahl der Tage“ Feld gespeichert)
+BaseCurrency=Reference currency of the company (go into setup of company to change this)
+WarningNoteModuleInvoiceForFrenchLaw=Dieses Modul %s erfüllt die Französische Gesetzgebung (Loi Finance 2016).
+WarningNoteModulePOSForFrenchLaw=Modul %s entspricht der französischen Gesetzgebung (Loi Finance 2016) weil das Modul "Unveränderbare Logs" automatisch aktiviert wird.
+WarningInstallationMayBecomeNotCompliantWithLaw=You try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
-ResourceSetup=Configuration du module Resource
-UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+ResourceSetup=Konfiguration des Modul Ressourcen
+UseSearchToSelectResource=Verwende ein Suchformular um eine Ressource zu wählen (eher als eine Dropdown-Liste) zu wählen.
+DisabledResourceLinkUser=Deaktivierter Ressource Link zu Benutzer
+DisabledResourceLinkContact=Deaktivierter Ressource Link zu Kontakt
diff --git a/htdocs/langs/de_DE/agenda.lang b/htdocs/langs/de_DE/agenda.lang
index 504702ada72..b3dc983996a 100644
--- a/htdocs/langs/de_DE/agenda.lang
+++ b/htdocs/langs/de_DE/agenda.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - agenda
 IdAgenda=ID Veranstaltung
 Actions=Ereignisse
-Agenda=Terminplanung
+Agenda=Terminplan
 TMenuAgenda=Terminplanung
 Agendas=Tagesordnungen
 LocalAgenda=interne Kalender
@@ -12,7 +12,7 @@ Event=Ereignis
 Events=Ereignisse
 EventsNb=Anzahl der Ereignisse
 ListOfActions=Liste Ereignisse
-Location=Standort
+Location=Ort
 ToUserOfGroup=Für jeden Benutzer in der Gruppe
 EventOnFullDay=Ganztägig
 MenuToDoActions=Alle unvollst. Termine
@@ -24,10 +24,10 @@ ActionsAskedBy=Termine eingetragen von
 ActionsToDoBy=Ereignisse zugewiesen an
 ActionsDoneBy=Termine erledigt von
 ActionAssignedTo=Ereignis zugewiesen an
-ViewCal=Kalenderansicht
+ViewCal=Monatsansicht
 ViewDay=Tagesansicht
 ViewWeek=Wochenansicht
-ViewPerUser=Benutzeransicht
+ViewPerUser=Ansicht pro Benutzer
 ViewPerType=Anzeige pro Typ
 AutoActions= Automatische Befüllung der Tagesordnung
 AgendaAutoActionDesc= Definieren sie hier Ereignisse für die Dolibarr automatisch Termine in der Agende erstellen soll. Wenn nichts aktiviert ist, werden nur manuelle Aktionen in der Agenda erfasst und angezeigt. Automatische Protokollierung von Ereignissen auf Objekten (Validierung, Statuswechsel) werden nicht gespeichert
@@ -48,14 +48,15 @@ InvoiceDeleteDolibarr=Rechnung %s gelöscht
 InvoicePaidInDolibarr=Rechnung %s bezahlt
 InvoiceCanceledInDolibarr=Rechnung %s storniert
 MemberValidatedInDolibarr=Mitglied %s freigegeben
-MemberResiliatedInDolibarr=Member %s terminated
+MemberModifiedInDolibarr=Mitglied %s geändert
+MemberResiliatedInDolibarr=Mitglied %s aufgehoben
 MemberDeletedInDolibarr=Mitglied %s gelöscht
 MemberSubscriptionAddedInDolibarr=Abonnement für Mitglied %s hinzugefügt
 ShipmentValidatedInDolibarr=Lieferung %s freigegeben
-ShipmentClassifyClosedInDolibarr=Lieferung %s als verrechnet markieren
-ShipmentUnClassifyCloseddInDolibarr=Lieferung %s als wiedereröffnet markieren
+ShipmentClassifyClosedInDolibarr=Lieferung %s als verrechnet markiert
+ShipmentUnClassifyCloseddInDolibarr=Lieferung %s als wiedereröffnet markiert
 ShipmentDeletedInDolibarr=Lieferung %s gelöscht
-OrderCreatedInDolibarr=Order %s created
+OrderCreatedInDolibarr= Auftragserteilung %s erstellt
 OrderValidatedInDolibarr=Auftrag %s freigegeben
 OrderDeliveredInDolibarr=Bestellung %s als geliefert markieren
 OrderCanceledInDolibarr=Auftrag %s storniert
@@ -75,6 +76,7 @@ ProposalDeleted=Angebot gelöscht
 OrderDeleted=Bestellung gelöscht
 InvoiceDeleted=Rechnung gelöscht
 ##### End agenda events #####
+AgendaModelModule=Dokumentvorlagen für Ereignisse
 DateActionStart=Beginnt
 DateActionEnd=Endet
 AgendaUrlOptions1=Sie können die Ausgabe über folgende Parameter filtern:
@@ -103,7 +105,7 @@ MyAvailability=Meine Verfügbarkeit
 ActionType=Ereignistyp
 DateActionBegin=Startzeit des Ereignis
 CloneAction=Dupliziere Ereignis
-ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
+ConfirmCloneEvent=Möchten Sie dieses Ereignis <b>%s</b> wirklich duplizieren?
 RepeatEvent=Wiederhole Ereignis
 EveryWeek=Jede Woche
 EveryMonth=Jeden Monat
diff --git a/htdocs/langs/de_DE/banks.lang b/htdocs/langs/de_DE/banks.lang
index a6b05d53542..6dfca4eef1b 100644
--- a/htdocs/langs/de_DE/banks.lang
+++ b/htdocs/langs/de_DE/banks.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Bank
-MenuBankCash=Finanzen
+MenuBankCash=Bank/Kassa
 BankName=Name der Bank
-FinancialAccount=Finanzkonto
+FinancialAccount=Konto
 BankAccount=Bankkonto
-BankAccounts=Kontenübersicht
+BankAccounts=Bank Konten
 ShowAccount=Zeige Konto
-AccountRef=Konto-Referenz
+AccountRef=Buchhaltungs-Konto Nr.
 AccountLabel=Kontobezeichnung
-CashAccount=Kasse
+CashAccount=Konto Kassa
 CashAccounts=Kassen
 CurrentAccounts=Girokonten
 SavingAccounts=Sparkonten
@@ -24,14 +24,14 @@ CurrentBalance=Aktueller Kontostand
 FutureBalance=Zukünftiger Kontostand
 ShowAllTimeBalance=Zeige Kontostand seit Eröffnung
 AllTime=Vom Start
-Reconciliation=Zahlungsabgleich
-RIB=Kontonummer
+Reconciliation=Zahlungsausgleich
+RIB=Bank Kontonummer
 IBAN=IBAN Nummer
 BIC=BIC/Swift Code
-SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
-IbanValid=BAN valid
-IbanNotValid=BAN not valid
+SwiftValid=BIC/SWIFT gültig
+SwiftVNotalid=BIC/SWIFT ungültig
+IbanValid=Bankkonto gültig
+IbanNotValid=Bankkonto nicht gültig
 StandingOrders=Lastschriften
 StandingOrder=Lastschrift
 AccountStatement=Kontoauszug
@@ -59,36 +59,37 @@ AccountCard=Konto - Karte
 DeleteAccount=Konto löschen
 ConfirmDeleteAccount=Sind Sie sicher, dass Sie dieses Konto löschen wollen?
 Account=Konto
-BankTransactionByCategories=Bank entries by categories
-BankTransactionForCategory=Bank entries for category <b>%s</b>
+BankTransactionByCategories=Banktransaktionen nach Kategorien
+BankTransactionForCategory=Banktransaktionen aus #tags/Kategorie <b>%s</b>
 RemoveFromRubrique=Aus Kostenstelle entfernen
-RemoveFromRubriqueConfirm=Are you sure you want to remove link between the entry and the category?
-ListBankTransactions=List of bank entries
+RemoveFromRubriqueConfirm=Möchten Sie die Verknüpfung zwischen dieser Transaktion und der Kategorie entfernen?
+ListBankTransactions=Liste von Bank-Transaktionen
 IdTransaction=Transaktions-ID
-BankTransactions=Bank entries
+BankTransactions=Bank-Transaktionen
+BankTransaction=Bank-Transaktionen
 ListTransactions=Liste Einträge
-ListTransactionsByCategory=List entries/category
-TransactionsToConciliate=Entries to reconcile
+ListTransactionsByCategory=Liste Einträge/Kategorie
+TransactionsToConciliate=Transaktionen zum ausgleichen
 Conciliable=kann ausgeglichen werden
 Conciliate=Ausgleichen
 Conciliation=Ausgleich
-ReconciliationLate=Reconciliation late
+ReconciliationLate=Zahlungsausgleich spät
 IncludeClosedAccount=Geschlossene Konten miteinbeziehen
-OnlyOpenedAccount=Nur geöffnete Konten
+OnlyOpenedAccount=Nur offene Konten
 AccountToCredit=Konto für Gutschrift
 AccountToDebit=Zu belastendes Konto
 DisableConciliation=Zahlungsausgleich für dieses Konto deaktivieren
 ConciliationDisabled=Zahlungsausgleich deaktiviert
-LinkedToAConciliatedTransaction=Linked to a conciliated entry
+LinkedToAConciliatedTransaction=Verknüpft mit einer beschwichtigen Transaktion
 StatusAccountOpened=Geöffnet
 StatusAccountClosed=Geschlossen
 AccountIdShort=Nummer
 LineRecord=Transaktion
-AddBankRecord=Add entry
-AddBankRecordLong=Add entry manually
+AddBankRecord=Erstelle Transaktion
+AddBankRecordLong=Eintrag manuell hinzufügen
 ConciliatedBy=Ausgeglichen durch
 DateConciliating=Ausgleichsdatum
-BankLineConciliated=Entry reconciled
+BankLineConciliated=Transaktion ausgeglichen
 Reconciled=ausgelichen
 NotReconciled=nicht ausgeglichen
 CustomerInvoicePayment=Kundenzahlung
@@ -112,13 +113,13 @@ BankChecks=Bankschecks
 BankChecksToReceipt=Schecks warten auf Einlösung
 ShowCheckReceipt=Zeige Scheck Einzahlungsbeleg
 NumberOfCheques=Anzahl der Schecks
-DeleteTransaction=Delete entry
-ConfirmDeleteTransaction=Are you sure you want to delete this entry?
-ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
+DeleteTransaction=Transaktion löschen
+ConfirmDeleteTransaction=Sind Sie sicher, dass Sie diese Transaktion löschen wollen?
+ThisWillAlsoDeleteBankRecord=Dadurch werden auch erzeugte Kontoauszüge gelöscht
 BankMovements=Bankbewegungen
-PlannedTransactions=Planned entries
+PlannedTransactions=Geplante Transaktionen
 Graph=Grafiken
-ExportDataset_banque_1=Bank entries and account statement
+ExportDataset_banque_1=Transaktionen und Kontoauszug
 ExportDataset_banque_2=Einzahlungsbeleg
 TransactionOnTheOtherAccount=Transaktion auf dem anderem Konto
 PaymentNumberUpdateSucceeded=Zahlungsnummer erfolgreich aktualisiert
@@ -126,7 +127,7 @@ PaymentNumberUpdateFailed=Zahlungsnummer konnte nicht aktualisiert werden
 PaymentDateUpdateSucceeded=Zahlungsdatum erforlgreich aktualisiert
 PaymentDateUpdateFailed=Zahlungsdatum konnte nicht aktualisiert werden
 Transactions=Transaktionen
-BankTransactionLine=Bank entry
+BankTransactionLine=Bank-Transaktionen
 AllAccounts=Alle Finanzkonten
 BackToAccount=Zurück zum Konto
 ShowAllAccounts=Alle Finanzkonten
@@ -150,3 +151,7 @@ CheckRejectedAndInvoicesReopened=Scheck zurückgewiesen und Rechnungen wieder ge
 BankAccountModelModule=Dokumentvorlagen für Bankkonten
 DocumentModelSepaMandate=Vorlage für SEPA Mandate. Nur sinnvoll in Ländern der EU.
 DocumentModelBan=Template für den Druck von Seiten mit Bankkonto-Nummern Eintrag.
+NewVariousPayment=Neue "Verschiedenes" Zahlung
+VariousPayment=Diverse Zahlung
+VariousPayments=Diverse Zahlungen
+ShowVariousPayment=Zeige "Verschiedenes" Zahlung
diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang
index 2667f3087f2..d792244d8d8 100644
--- a/htdocs/langs/de_DE/bills.lang
+++ b/htdocs/langs/de_DE/bills.lang
@@ -5,9 +5,9 @@ BillsCustomers=Kundenrechnungen
 BillsCustomer=Kundenrechnung
 BillsSuppliers=Lieferantenrechnungen
 BillsCustomersUnpaid=Offene Kundenrechnungen
-BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsCustomersUnpaidForCompany=Offene Kundenrechnungen von %s
 BillsSuppliersUnpaid=Unbezahlte Lieferantenrechnungen
-BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
+BillsSuppliersUnpaidForCompany=Unbezahlte Lieferantenrechnungen für %s
 BillsLate=Verspätete Zahlungen
 BillsStatistics=Statistik Kundenrechnungen
 BillsStatisticsSuppliers=Statistik Lieferantenrechnungen
@@ -41,7 +41,7 @@ ConsumedBy=Verbraucht von
 NotConsumed=Nicht verbrauchte
 NoReplacableInvoice=Keine ersatzfähige Rechnungsnummer
 NoInvoiceToCorrect=Keine zu korrigierende Rechnung
-InvoiceHasAvoir=Was source of one or several credit notes
+InvoiceHasAvoir=Diese Rechnung ist bereits Gegenstand einer oder mehrerer Gutschriften.
 CardBill=Rechnung - Karte
 PredefinedInvoices=Vordefinierte Rechnungen
 Invoice=Rechnung
@@ -63,7 +63,7 @@ paymentInInvoiceCurrency=in Rechnungswährung
 PaidBack=Zurück bezahlt
 DeletePayment=Lösche Zahlung
 ConfirmDeletePayment=Möchten Sie diese Zahlung wirklich löschen?
-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.
+ConfirmConvertToReduc=Möchten Sie dieses %s in einen absoluten Rabatt konvertieren? <br> Der Betrag wird so unter allen Rabatten gespeichert und kann als Rabatt für ein aktuelle oder zukünftige Rechnung für diese Kunden verwendet werden.
 SupplierPayments=Lieferantenzahlungen
 ReceivedPayments=Erhaltene Zahlungen
 ReceivedCustomersPayments=Erhaltene Anzahlungen von Kunden
@@ -75,10 +75,10 @@ PaymentsAlreadyDone=Bereits getätigte Zahlungen
 PaymentsBackAlreadyDone=Rückzahlungen bereits erledigt
 PaymentRule=Zahlungsregel
 PaymentMode=Zahlungsart
-PaymentTypeDC=Debit/Credit Card
+PaymentTypeDC=Debit- / Kreditkarte
 PaymentTypePP=PayPal
 IdPaymentMode=Zahlungsart (ID)
-CodePaymentMode=Payment type (code)
+CodePaymentMode=Zahlungsart (Code)
 LabelPaymentMode=Zahlungsart (Label)
 PaymentModeShort=Zahlungsart
 PaymentTerm=Zahlungskonditionen
@@ -87,7 +87,7 @@ PaymentConditionsShort=Zahlungsziel
 PaymentAmount=Zahlungsbetrag
 ValidatePayment=Zahlung freigeben
 PaymentHigherThanReminderToPay=Zahlungsbetrag übersteigt Zahlungserinnerung
-HelpPaymentHigherThanReminderToPay=Achtung, die Zahlung eines oder mehrerer Rechnungen ist höher als der Rest zu zahlen. <br> Bearbeiten Sie Ihre Eingabe, sonst bestätigen und denken über die Schaffung einer Gutschrift von mehr als der für jede overpaid Rechnungen.
+HelpPaymentHigherThanReminderToPay=Achtung, der Zahlungsbetrag einer oder mehrerer Rechnungen ist höher als der offene Restbetrag.<br>Bearbeiten Sie Ihre Eingabe oder bestätigen Sie die Überzahlung und erstellen Sie ggf eine Gutschrift für jede überzahlte Rechnung.
 HelpPaymentHigherThanReminderToPaySupplier=Achtung, der Zahlungsbetrag einer oder mehrerer Rechnungen ist höher als der offene Restbetrag.<br>Bearbeiten Sie Ihre Eingabe oder bestätigen Sie die Überzahlung.
 ClassifyPaid=Als 'bezahlt' markieren
 ClassifyPaidPartially=Als 'teilweise bezahlt' markieren
@@ -104,9 +104,9 @@ SearchASupplierInvoice=Lieferantenrechnung suchen
 CancelBill=Rechnung stornieren
 SendRemindByMail=Zahlungserinnerung per E-Mail versenden
 DoPayment=Zahlung eingeben
-DoPaymentBack=Enter refund
+DoPaymentBack=Rückerstattung eingeben
 ConvertToReduc=In Rabatt umwandeln
-ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessReceivedToReduc=Konvertieren des Überschuss in einen Rabatt
 EnterPaymentReceivedFromCustomer=Geben Sie die vom Kunden erhaltene Zahlung ein
 EnterPaymentDueToCustomer=Kundenzahlung fällig stellen
 DisabledBecauseRemainderToPayIsZero=Deaktiviert, da Zahlungserinnerung auf null steht
@@ -115,24 +115,24 @@ BillStatus=Rechnung Status
 StatusOfGeneratedInvoices=Status der erstellten Rechnungen
 BillStatusDraft=Entwurf (freizugeben)
 BillStatusPaid=Bezahlt
-BillStatusPaidBackOrConverted=Refund or converted into discount
+BillStatusPaidBackOrConverted=In Gutschrift oder Rabatt umgewandelt
 BillStatusConverted=Umgerechnet auf Rabatt
 BillStatusCanceled=Aufgegeben
 BillStatusValidated=Freigegeben (zu bezahlen)
 BillStatusStarted=Begonnen
 BillStatusNotPaid=nicht bezahlt
-BillStatusNotRefunded=Not refunded
+BillStatusNotRefunded=nicht zurückerstattet
 BillStatusClosedUnpaid=Geschlossen (unbezahlt)
 BillStatusClosedPaidPartially=Bezahlt (teilweise)
 BillShortStatusDraft=Entwurf
 BillShortStatusPaid=Bezahlt
-BillShortStatusPaidBackOrConverted=Refund or converted
-BillShortStatusConverted=Verarbeitete
+BillShortStatusPaidBackOrConverted=Rückerstattet oder umgewandelt
+BillShortStatusConverted=Bezahlt
 BillShortStatusCanceled=Storniert
 BillShortStatusValidated=Freigegeben
 BillShortStatusStarted=Begonnen
 BillShortStatusNotPaid=Offen
-BillShortStatusNotRefunded=Not refunded
+BillShortStatusNotRefunded=nicht zurückerstattet
 BillShortStatusClosedUnpaid=Geschlossen
 BillShortStatusClosedPaidPartially=Bezahlt (teilweise)
 PaymentStatusToValidShort=zu bestätigen
@@ -149,18 +149,18 @@ BillFrom=Von
 BillTo=An
 ActionsOnBill=Ereignisse zu dieser Rechnung
 RecurringInvoiceTemplate=Vorlage/Wiederkehrende Rechnung
-NoQualifiedRecurringInvoiceTemplateFound=Keine Vorlagen zur Erstellung von wiederkehrende Rechnungen gefunden.
-FoundXQualifiedRecurringInvoiceTemplate=Es wurden %s Vorlagen zur Erstellung von wiederkehrende Rechnung(en) gefunden.
+NoQualifiedRecurringInvoiceTemplateFound=Keine Vorlagen zur Erstellung von wiederkehrenden Rechnungen gefunden.
+FoundXQualifiedRecurringInvoiceTemplate=Es wurden %s Vorlage(n) zur Erstellung von wiederkehrenden Rechnungen gefunden.
 NotARecurringInvoiceTemplate=keine Vorlage für wiederkehrende Rechnung
 NewBill=Neue Rechnung
-LastBills=Latest %s invoices
-LastCustomersBills=Latest %s customer invoices
-LastSuppliersBills=Latest %s supplier invoices
+LastBills=Neueste %s Rechnungen
+LastCustomersBills=Neueste %s Kundenrechnungen
+LastSuppliersBills=Neueste %s Lieferantenrechnungen
 AllBills=Alle Rechnungen
 OtherBills=Weitere Rechnungen
 DraftBills=Rechnungsentwürfe
-CustomersDraftInvoices=Customer draft invoices
-SuppliersDraftInvoices=Supplier draft invoices
+CustomersDraftInvoices=Kundenrechnungen Entwürfe
+SuppliersDraftInvoices=Entwürfe Lieferantenrechnungen
 Unpaid=Unbezahlte
 ConfirmDeleteBill=Möchten Sie diese Rechnung wirklich löschen?
 ConfirmValidateBill=Möchten Sie diese Rechnung mit der referenz <b>%s</b> wirklich freigeben?
@@ -198,27 +198,27 @@ ShowBill=Zeige Rechnung
 ShowInvoice=Zeige Rechnung
 ShowInvoiceReplace=Zeige Ersatzrechnung
 ShowInvoiceAvoir=Zeige Gutschrift
-ShowInvoiceDeposit=Show Anzahlung Rechnung
-ShowInvoiceSituation=Situation Rechnung anzeigen
+ShowInvoiceDeposit=Anzahlungsrechnungen anzeigen
+ShowInvoiceSituation=Zeige Fortschritt-Rechnung
 ShowPayment=Zeige Zahlung
 AlreadyPaid=Bereits bezahlt
 AlreadyPaidBack=Bereits zurückbezahlt
-AlreadyPaidNoCreditNotesNoDeposits=Bereits bezahlte (ohne Gutschriften und Einlagen)
+AlreadyPaidNoCreditNotesNoDeposits=Bereits bezahlt (ohne Gutschriften und Anzahlungen)
 Abandoned=Aufgegeben
 RemainderToPay=Offener Zahlbetrag
 RemainderToTake=Verbleibender Restbetrag
-RemainderToPayBack=Remaining amount to refund
+RemainderToPayBack=Restschulden zum zurückzahlen
 Rest=Ausstehend
 AmountExpected=Höhe der Forderung
 ExcessReceived=Erhaltener Überschuss
 EscompteOffered=Rabatt angeboten (Skonto)
 EscompteOfferedShort=Rabatt
-SendBillRef=Ihre Rechnung %s
+SendBillRef=Im Anhang Ihre Rechnung %s
 SendReminderBillRef=Erinnerung für unsere Rechnung %s 
 StandingOrders=Lastschriften
 StandingOrder=Lastschrift
 NoDraftBills=Keine Rechnungsentwürfe
-NoOtherDraftBills=Keine Rechnungsentwürfe Anderer
+NoOtherDraftBills=Keine weiteren Rechnungsentwürfe
 NoDraftInvoices=Keine Rechnungsentwürfe
 RefBill=Rechnungs Nr.
 ToBill=Zu verrechnen
@@ -271,10 +271,10 @@ GlobalDiscount=Rabattregel
 CreditNote=Gutschrift
 CreditNotes=Gutschriften
 Deposit=Anzahlung
-Deposits=Einlagen
+Deposits=Anzahlungen
 DiscountFromCreditNote=Rabatt aus Gutschrift %s
-DiscountFromDeposit=Die Zahlungen aus Anzahlung Rechnung %s
-DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromDeposit=Anzahlung für Rechnung %s
+DiscountFromExcessReceived=Überzahlungen von der Rechnung %s empfangen
 AbsoluteDiscountUse=Diese Art von Guthaben kann verwendet werden auf der Rechnung vor der Validierung
 CreditNoteDepositUse=Die Rechnung muss bestätigt werden, um Gutschriften zu erstellen
 NewGlobalDiscount=Neue Rabattregel
@@ -282,15 +282,15 @@ NewRelativeDiscount=Neuer relativer Rabatt
 NoteReason=Anmerkung/Begründung
 ReasonDiscount=Rabattgrund
 DiscountOfferedBy=Rabatt angeboten von
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Rabatte verfügbar
+DiscountAlreadyCounted=Rabatte bereits berücksichtigt
 BillAddress=Rechnungsanschrift
 HelpEscompte=Bei diesem Rabatt handelt es sich um einen Skonto.
 HelpAbandonBadCustomer=Dieser Betrag wurde aufgegeben (Kundenverschulden) ist als uneinbringlich zu werten.
 HelpAbandonOther=Dieser Betrag wurde auf Grund eines Fehlers aufgegeben (falsche Rechnung oder an falschen Kunden)
 IdSocialContribution=Sozialabgaben/Unternehmenssteuer Zahlungs-ID
 PaymentId=Zahlung id
-PaymentRef=Zahlungsreferenz
+PaymentRef=Zahlung Nr.
 InvoiceId=Rechnungs ID
 InvoiceRef=Rechnungs Nr.
 InvoiceDateCreation=Datum der Rechnungserstellung
@@ -306,11 +306,11 @@ ConfirmCloneInvoice=Möchten Sie diese Rechnung <b>%s</b> wirklich duplizieren?
 DisabledBecauseReplacedInvoice=Aktion unzulässig, da die betreffende Rechnung ersetzt wurde
 DescTaxAndDividendsArea=Dieser Bereich zeigt eine Zusammenfassung aller Zahlungen auf spezielle Ausgaben. Nur Zeilen mit Zahlungen in dem Geschäftsjahr werden angezeigt.
 NbOfPayments=Anzahl der Zahlungen
-SplitDiscount=Split Rabatt in zwei
+SplitDiscount=Rabatt in zwei aufteilen
 ConfirmSplitDiscount=Möchten Sie wirklich den Rabatt von  <b>%s</b> %s in zwei kleinere Rabatte aufteilen ?
-TypeAmountOfEachNewDiscount=Input für jeden der zwei Teile:
-TotalOfTwoDiscountMustEqualsOriginal=Insgesamt zwei neue Rabatt muss gleich zu den ursprünglichen Betrag Rabatt.
-ConfirmRemoveDiscount=Sind Sie sicher, dass sie dieses Konto löschen wollen?
+TypeAmountOfEachNewDiscount=Geben Sie den Betrag für jeden der zwei Teile ein:
+TotalOfTwoDiscountMustEqualsOriginal=Summe der beiden neuen Rabatte muss gleich dem ursprünglichen Rabattbetrag sein.
+ConfirmRemoveDiscount=Sind Sie sicher, dass sie diesen Rabatt löschen wollen?
 RelatedBill=Ähnliche Rechnung
 RelatedBills=Ähnliche Rechnungen
 RelatedCustomerInvoices=Ähnliche Kundenrechnungen
@@ -323,10 +323,10 @@ PaymentOnDifferentThirdBills=Erlaube Zahlungen für Rechnungen an verschiedene P
 PaymentNote=Zahlungshinweis
 ListOfPreviousSituationInvoices=Liste der vorherigen Fortschrittsrechnungen
 ListOfNextSituationInvoices=Liste der nächsten Fortschrittsrechnungen
-FrequencyPer_d=jeden %s Tag
-FrequencyPer_m=Jeden %s Monat
-FrequencyPer_y=Jedes %s Jahr
-toolTipFrequency=Examples:<br /><b>Set 7, Day</b>: give a new invoice every 7 days<br /><b>Set 3, Month</b>: give a new invoice every 3 month
+FrequencyPer_d=alle %s Tage
+FrequencyPer_m=Alle %s Monate
+FrequencyPer_y=Alle %s Jahre
+toolTipFrequency=Beispiele: <br /> <b> Wähle  7 / Tage</b>: eine neue Rechnung alle 7 Tage erstellen <br /> <b> Wähle 3 / Monate </b>: ergibt eine neue Rechnung alle 3 Monate
 NextDateToExecution=Datum der nächsten Rechnungserstellung
 DateLastGeneration=Datum der letzten Generierung
 MaxPeriodNumber=max. Anzahl an Rechnungen
@@ -336,20 +336,20 @@ InvoiceAutoValidate=Rechnungen automatisch freigeben
 GeneratedFromRecurringInvoice=Erstelle wiederkehrende Rechnung %s aus Vorlage
 DateIsNotEnough=Datum noch nicht erreicht
 InvoiceGeneratedFromTemplate=Rechnung %s erstellt aus Vorlage für wiederkehrende Rechnung %s
-WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
-WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
+WarningInvoiceDateInFuture=Achtung, das Rechnungsdatum ist höher als das aktuelle Datum
+WarningInvoiceDateTooFarInFuture=Achtung, das Rechnungsdatum ist zu weit entfernt vom aktuellen Datum
 # PaymentConditions
 Statut=Status
-PaymentConditionShortRECEP=Due Upon Receipt
-PaymentConditionRECEP=Due Upon Receipt
+PaymentConditionShortRECEP=sofort
+PaymentConditionRECEP=Sofort nach Erhalt
 PaymentConditionShort30D=30 Tage
 PaymentCondition30D=30 Tage netto
 PaymentConditionShort30DENDMONTH=30 Tage ab Monatsende
-PaymentCondition30DENDMONTH=Innerhalb von 30 Tagen, nach Monatsende
+PaymentCondition30DENDMONTH=Innerhalb von 30 Tagen nach Monatsende
 PaymentConditionShort60D=60 Tage
 PaymentCondition60D=60 Tage
 PaymentConditionShort60DENDMONTH=60 Tage ab Monatsende
-PaymentCondition60DENDMONTH=Innerhalb von 60 Tagen, nach Monatsende
+PaymentCondition60DENDMONTH=Innerhalb von 60 Tagen nach Monatsende
 PaymentConditionShortPT_DELIVERY=Lieferung
 PaymentConditionPT_DELIVERY=Bei Lieferung
 PaymentConditionShortPT_ORDER=Bestellung
@@ -357,20 +357,20 @@ PaymentConditionPT_ORDER=Bei Bestellung
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% im Voraus, 50%% bei Lieferung
 PaymentConditionShort10D=10 Tage
-PaymentCondition10D=10 Tage netto
-PaymentConditionShort10DENDMONTH=10 Tage ab Monatsende
-PaymentCondition10DENDMONTH=Innerhalb von 10 Tagen, nach Monatsende
+PaymentCondition10D=10 Tage
+PaymentConditionShort10DENDMONTH=10 Tage nach Monatsende
+PaymentCondition10DENDMONTH=Innerhalb von 10 Tagen nach Monatsende
 PaymentConditionShort14D=14 Tage
-PaymentCondition14D=14 Tage netto
-PaymentConditionShort14DENDMONTH=14 Tage ab Monatsende
-PaymentCondition14DENDMONTH=Innerhalb von 14 Tagen, nach Monatsende
+PaymentCondition14D=14 Tage
+PaymentConditionShort14DENDMONTH=14 Tage nach Monatsende
+PaymentCondition14DENDMONTH=Innerhalb von 14 Tagen nach Monatsende
 FixAmount=Fester Betrag
 VarAmount=Variabler Betrag (%% tot.)
 # PaymentType
 PaymentTypeVIR=Banküberweisung
 PaymentTypeShortVIR=Banküberweisung
-PaymentTypePRE=Bestellung mit Zahlart Lastschrift 
-PaymentTypeShortPRE=Bestellung mit Zahlart Lastschrift 
+PaymentTypePRE=Lastschrift
+PaymentTypeShortPRE=Lastschrift
 PaymentTypeLIQ=Bar
 PaymentTypeShortLIQ=Bar
 PaymentTypeCB=Kreditkarte
@@ -407,7 +407,7 @@ NetToBePaid=Netto Zahlbetrag
 PhoneNumber=Tel
 FullPhoneNumber=Telefon
 TeleFax=Fax
-PrettyLittleSentence=Nehmen Sie die Höhe der Zahlungen, die aufgrund von Schecks, die in meinem Namen als Mitglied eines Accounting Association, die von der Steuerverwaltung.
+PrettyLittleSentence=Akzeptiere die Höhe der Zahlungen,  der fälligen Beträge per Scheck an meinen Namen in meiner Eigenschaft als Mitglied der Buchhaltung, genehmigt von der Steuerverwaltung.
 IntracommunityVATNumber=Innergemeinschaftliche USt-Nummer
 PaymentByChequeOrderedTo=Zahlung per Scheck zu zahlen sind, um %s an
 PaymentByChequeOrderedToShort=Zahlung per Scheck zu zahlen sind, um
@@ -433,13 +433,13 @@ ChequeDeposits=Scheckeinlagen
 Cheques=Schecks
 DepositId=Scheck Nr.
 NbCheque=Schecknummer
-CreditNoteConvertedIntoDiscount=This %s has been converted into %s
+CreditNoteConvertedIntoDiscount=Diese Gutschrift %s wurde in %s umgewandelt
 UsBillingContactAsIncoiveRecipientIfExist=Verwenden Sie Kunden Abrechnung Kontakt-Adresse anstelle von Dritten als Empfänger-Adresse für Rechnungen
 ShowUnpaidAll=Zeige alle unbezahlten Rechnungen
 ShowUnpaidLateOnly=Zeige nur verspätete unbezahlte Rechnung
 PaymentInvoiceRef=Die Zahlung der Rechnung %s
 ValidateInvoice=Rechnung freigeben
-ValidateInvoices=Validate invoices
+ValidateInvoices=Rechnungen freigeben
 Cash=Bar
 Reported=Verzögert
 DisabledBecausePayments=Nicht möglich, da es Zahlungen gibt
@@ -447,7 +447,7 @@ CantRemovePaymentWithOneInvoicePaid=Die Zahlung kann nicht entfernt werden, da e
 ExpectedToPay=Erwartete Zahlung
 CantRemoveConciliatedPayment=Zugeordnete Zahlung kann nicht gelöscht werden.
 PayedByThisPayment=mit dieser Zahlung beglichen
-ClosePaidInvoicesAutomatically=Markiert alle Standard- oder Ersatzrechnungen als "bezahlt", wenn diese vollständig beglichen sind.
+ClosePaidInvoicesAutomatically=Markiert alle Standard-, Anzahlungs- oder Ersatzrechnungen als "bezahlt", wenn diese vollständig beglichen sind.
 ClosePaidCreditNotesAutomatically=Markiert alle Gutschriften als "bezahlt", wenn diese vollständig beglichen sind.
 ClosePaidContributionsAutomatically=Vollständig beglichenen Sozialabgaben oder Steuerbeträge als "bezahlt" kennzeichnen.
 AllCompletelyPayedInvoiceWillBeClosed=Alle Rechnungen ohne ausstehende Zahlungen werden automatisch geschlossen und als "bezahlt" markiert.
@@ -464,7 +464,7 @@ PDFCrevetteDescription=PDF Rechnungsvorlage Crevette. Vollständige Rechnungsvol
 TerreNumRefModelDesc1=Liefert eine Nummer mit dem Format %syymm-nnnn für Standard-Rechnungen und %syymm-nnnn für Gutschriften, wobei yy=Jahr, mm=Monat und nnnn eine lückenlose Folge ohne Überlauf auf 0 ist
 MarsNumRefModelDesc1=Liefere Nummer im Format  %syymm-nnnn für Standardrechnungen %syymm-nnnn für Ersatzrechnung,  %syymm-nnnn für Anzahlungsrechnung und %syymm-nnnn für Gutschriften wobei  yy Jahr, mm Monat und nnnn eine laufende Nummer ohne Unterbrechung und ohne Rückkehr zu 0 ist.
 TerreNumRefModelError=Eine Rechnung, beginnend mit $ syymm existiert bereits und ist nicht kompatibel mit diesem Modell der Reihe. Entfernen oder umbenennen, um dieses Modul.
-CactusNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for deposit invoices where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+CactusNumRefModelDesc1=Rückgabenummer mit Format %syymm-nnnn für Standard-Rechnungen, %syymm-nnnn für Gutschriften und %syymm-nnnn für Anzahlungsrechnungen wo yy Jahr ist, mm ist der Monat und nnnn eine lückenlose Folge ohne Überlauf auf 0 ist
 ##### Types de contacts #####
 TypeContact_facture_internal_SALESREPFOLL=Repräsentative Follow-up Kundenrechnung
 TypeContact_facture_external_BILLING=Kundenrechnung Kontakt
@@ -475,26 +475,26 @@ TypeContact_invoice_supplier_external_BILLING=Lieferantenrechnung Kontakt
 TypeContact_invoice_supplier_external_SHIPPING=Lieferantenversand Kontakt
 TypeContact_invoice_supplier_external_SERVICE=Lieferantenservice Kontakt
 # Situation invoices
-InvoiceFirstSituationAsk=Erste Situation Rechnung
+InvoiceFirstSituationAsk=Erste Fortschritt-Rechnung
 InvoiceFirstSituationDesc=Die <b>Situation Rechnungen</b> auf Situationen zu einer Progression bezogen gebunden, beispielsweise das Fortschreiten einer Konstruktion. Jede Situation ist mit einer Rechnung gebunden.
-InvoiceSituation=Situation Rechnung
+InvoiceSituation=Rechnung nach Fortschritt
 InvoiceSituationAsk=Rechnung folgende Situation
 InvoiceSituationDesc=Erstellen Sie eine neue Situation im Anschluss an eine bereits bestehende
 SituationAmount=Situation Rechnungsbetrag (ohne USt.)
 SituationDeduction=Situation Subtraktion
 ModifyAllLines=Bearbeite alle Zeilen
-CreateNextSituationInvoice=Erstelle nächsten Position
+CreateNextSituationInvoice=Erstelle nächsten Fortschritt-Rechnung
 NotLastInCycle=Diese Rechnung ist nicht die letzte im Zyklus und darf nicht geändert werden.
-DisabledBecauseNotLastInCycle=Der folgende Situation ist bereits vorhanden.
+DisabledBecauseNotLastInCycle=Die nächste Situation existiert bereits.
 DisabledBecauseFinal=Dieser Status ist endgültig.
 CantBeLessThanMinPercent=Der Fortschritt kann nicht kleiner als sein bisheriger Wert werden.
 NoSituations=Keine offenen Positionen
 InvoiceSituationLast=Allgemeine Endrechnung
-PDFCrevetteSituationNumber=Situation Nr. %s
+PDFCrevetteSituationNumber=Fortschritt-Rechnung Nr. %s
 PDFCrevetteSituationInvoiceLineDecompte=Fortschrittsrechnungen - Anzahl
 PDFCrevetteSituationInvoiceTitle=Rechnung nach Fortschritt
-PDFCrevetteSituationInvoiceLine=Fortschritt Nr. %s: Rechnung Nr. %s nach %s
-TotalSituationInvoice=Gesamtsituation
+PDFCrevetteSituationInvoiceLine=Fortschritt ReNr. %s: Rechnung ReNr. %s nach %s
+TotalSituationInvoice=Gesamt Fortschrittrechnung
 invoiceLineProgressError=Fortschritt der Rechnungsposition kann nicht größer oder gleich sein wie der Status der nächsten Rechnungsposition
 updatePriceNextInvoiceErrorUpdateline=Fehler: Preis der Rechnungsposition %s aktualisieren
 ToCreateARecurringInvoice=Um eine wiederkehrende Rechnung für diesen Vertrag zu erstellen, legen Sie zuerst einen Rechnungsentwurf an, wandeln diesen dann in eine Rechnungsvorlage um und definieren die Häufigkeit der Erstellung der zukünftigen Rechnungen.
@@ -502,5 +502,5 @@ ToCreateARecurringInvoiceGene=Um zukünftige Rechnungen regelmäßig und manuell
 ToCreateARecurringInvoiceGeneAuto=Wollen Sie diese Rechnungen automatisch generieren lassen, fragen Sie Ihren Administrator das Modul <strong>%s</strong> zu aktivieren und einzurichten. Sie können beide Methoden (manuell und automatisch) ohne Risiko von doppelten Rechnungen zusammen verwenden.
 DeleteRepeatableInvoice=Rechnungs-Template löschen
 ConfirmDeleteRepeatableInvoice=Möchten Sie diese Rechnungsvorlage wirklich löschen?
-CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
+CreateOneBillByThird=Erstelle eine Rechnung pro Partner (andernfalls, eine Rechnung pro Bestellung)
+BillCreated=%s Rechnung(en) erstellt
diff --git a/htdocs/langs/de_DE/bookmarks.lang b/htdocs/langs/de_DE/bookmarks.lang
index cf273d8952c..25634d7a2d0 100644
--- a/htdocs/langs/de_DE/bookmarks.lang
+++ b/htdocs/langs/de_DE/bookmarks.lang
@@ -1,7 +1,9 @@
 # Dolibarr language file - Source file is en_US - marque pages
-AddThisPageToBookmarks=Anfügen dieser Seite zu den Lesezeichen
+AddThisPageToBookmarks=Diese Seite zu den Lesezeichen hinzufügen
 Bookmark=Lesezeichen
 Bookmarks=Lesezeichen
+ListOfBookmarks=Liste der Lesezeichen
+EditBookmarks=Lesezeichen auslisten/ändern
 NewBookmark=Neues Lesezeichen
 ShowBookmark=Zeige Lesezeichen
 OpenANewWindow=Neues Fenster öffnen
@@ -10,7 +12,7 @@ BookmarkTargetNewWindowShort=Neues Fenster
 BookmarkTargetReplaceWindowShort=Aktuelles Fenster
 BookmarkTitle=Titel des Lesezeichens
 UrlOrLink=Link
-BehaviourOnClick=Verhalten wenn ein Link geklickt wird
+BehaviourOnClick=Verhalten wenn ein Lesezeichen angewählt wird
 CreateBookmark=Lesezeichen erstellen
 SetHereATitleForLink=Erfasse hier einen Titel für das Lesezeichen
 UseAnExternalHttpLinkOrRelativeDolibarrLink=Verwenden Sie eine absolute externe URL oder eine relative Dolibarr URL
diff --git a/htdocs/langs/de_DE/boxes.lang b/htdocs/langs/de_DE/boxes.lang
index de619147a95..c37a67ea7d5 100644
--- a/htdocs/langs/de_DE/boxes.lang
+++ b/htdocs/langs/de_DE/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxLoginInformation=Logininformationen
 BoxLastRssInfos=Informationen RSS Feed
 BoxLastProducts=Neueste %s Produkte/Leistungen
 BoxProductsAlertStock=Bestandeswarnungen für Produkte
@@ -25,8 +26,8 @@ BoxTitleLastSuppliers=%s neueste Lieferanten
 BoxTitleLastModifiedSuppliers=%s zuletzt bearbeitete Lieferanten
 BoxTitleLastModifiedCustomers=%s zuletzt bearbeitete Kunden
 BoxTitleLastCustomersOrProspects=%s neueste Kunden oder Interessenten
-BoxTitleLastCustomerBills=Latest %s customer invoices
-BoxTitleLastSupplierBills=Latest %s supplier invoices
+BoxTitleLastCustomerBills=Neueste %s Kundenrechnungen
+BoxTitleLastSupplierBills=Neueste %s Lieferantenrechnungen
 BoxTitleLastModifiedProspects=%s zuletzt bearbeitete Leads
 BoxTitleLastModifiedMembers=%s neueste Mitglieder
 BoxTitleLastFicheInter=%s zuletzt bearbeitete Serviceaufträge
@@ -37,7 +38,7 @@ BoxTitleLastModifiedContacts=Letzte %s bearbeitete Kontakte/Adressen
 BoxMyLastBookmarks=Meine %s neuesten Lesezeichen
 BoxOldestExpiredServices=Die ältesten abgelaufenen aktiven Dienste
 BoxLastExpiredServices=Letzte %s älteste Kontake mit aktiven abgelaufenen Diensten.
-BoxTitleLastActionsToDo=%s neueste Aufgaben zu erledigen
+BoxTitleLastActionsToDo=Letzte %s Aufgaben zu erledigen
 BoxTitleLastContracts=%s zuletzt veränderte Verträge
 BoxTitleLastModifiedDonations=Letzte %s geänderte Spenden.
 BoxTitleLastModifiedExpenses=Letzte %s geänderte Spesenabrechnungen.
@@ -51,12 +52,12 @@ ClickToAdd=Hier klicken um hinzuzufügen.
 NoRecordedCustomers=Keine erfassten Kunden
 NoRecordedContacts=Keine erfassten Kontakte
 NoActionsToDo=Keine Aufgaben/Termine zu erledigen
-NoRecordedOrders=No recorded customer orders
+NoRecordedOrders=Keine erfassten Kundenaufträge
 NoRecordedProposals=Keine erfassten Angebote
-NoRecordedInvoices=No recorded customer invoices
-NoUnpaidCustomerBills=No unpaid customer invoices
-NoUnpaidSupplierBills=No unpaid supplier invoices
-NoModifiedSupplierBills=No recorded supplier invoices
+NoRecordedInvoices=Keine erfassten Kundenrechnungen
+NoUnpaidCustomerBills=Keine offenen Kundenrechnungen
+NoUnpaidSupplierBills=Keine offenen Lieferantenrechnungen
+NoModifiedSupplierBills=Keine erfassten Lieferantenrechnungen
 NoRecordedProducts=Keine erfassten Produkte/Leistungen
 NoRecordedProspects=Keine erfassten Leads
 NoContractedProducts=Keine Produkte/Leistungen im Auftrag
@@ -82,3 +83,4 @@ ForCustomersOrders=Kundenaufträge
 ForProposals=Angebote
 LastXMonthRolling=Die letzten %s Monate gleitend
 ChooseBoxToAdd=Box zu Ihrer Startseite hinzufügen...
+BoxAdded=Box wurde zu Ihrer Startseite hinzugefügt
diff --git a/htdocs/langs/de_DE/categories.lang b/htdocs/langs/de_DE/categories.lang
index a78c6a22c66..60e534f406e 100644
--- a/htdocs/langs/de_DE/categories.lang
+++ b/htdocs/langs/de_DE/categories.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - categories
 Rubrique=#tag/Kategorie
 Rubriques=#tags/Kategorien
+RubriquesTransactions=Tags/Kategorien der Transaktionen
 categories=Tags/Kategorien
 NoCategoryYet=Keine Kategorie/#tags dieser Art erstellt
 In=In
@@ -34,7 +35,7 @@ CompanyIsInSuppliersCategories=Dieser Parnter ist folgenden Lieferanten- Kategor
 MemberIsInCategories=Dieses Mitglied ist folgenden Mitglieder- Kategorien/#tags zugewiesen
 ContactIsInCategories=Dieser Kontakt ist folgenden Kontakte- Kategorien/#tags verknüpft
 ProductHasNoCategory=Dieses Produkt/Leistung ist keiner Kategorie zugewiesen.
-CompanyHasNoCategory=This third party is not in any tags/categories
+CompanyHasNoCategory=Der Partner ist in keinen Tags/Kategorien
 MemberHasNoCategory= Dieses Mitglied ist keiner Kategorie zugewiesen.
 ContactHasNoCategory= Dieser Kontakt ist keiner Kategorie zugewiesen.
 ProjectHasNoCategory=Dieses Projekt ist keiner Kategorie oder Suchwörtern zugewiesen.
@@ -44,7 +45,7 @@ CategoryExistsAtSameLevel=Diese Kategorie existiert bereits auf diesem Level
 ContentsVisibleByAllShort=Öffentlicher Inhalt
 ContentsNotVisibleByAllShort=Privater Inhalt
 DeleteCategory=Lösche Kategorie
-ConfirmDeleteCategory=Möchten Sie diese Kategorie wirklich löschen?
+ConfirmDeleteCategory=Möchten Sie dieses Tag / Kategorie wirklich löschen ?
 NoCategoriesDefined=Keine Kategorie definiert
 SuppliersCategoryShort=Lieferantenkategorien
 CustomersCategoryShort=Kunden-Kategorie/#tag
diff --git a/htdocs/langs/de_DE/commercial.lang b/htdocs/langs/de_DE/commercial.lang
index 7d8017132ba..1429836426a 100644
--- a/htdocs/langs/de_DE/commercial.lang
+++ b/htdocs/langs/de_DE/commercial.lang
@@ -12,13 +12,14 @@ AddAnAction=Erstelle Termin/Aufgabe
 AddActionRendezVous=erstelle Termin
 ConfirmDeleteAction=Möchten Sie diese Veranstaltung wirklich löschen ?
 CardAction=Ereignis - Karte
-ActionOnCompany=Verknüpfte Unternehmen
+ActionOnCompany=Verknüpftes Unternehmen
 ActionOnContact=Verknüpfter Kontakt
 TaskRDVWith=Termin mit %s
 ShowTask=Zeige Aufgabe
 ShowAction=Ereignisse anzeigen
 ActionsReport=Ereignis Journal
 ThirdPartiesOfSaleRepresentative=Partner mit Vertriebsmitarbeiter
+SaleRepresentativesOfThirdParty=Vertriebsmittarbeiter des Partners
 SalesRepresentative=Vertriebsmitarbeiter
 SalesRepresentatives=Vertreter
 SalesRepresentativeFollowUp=Vertriebsmitarbeiter (Follow-up)
@@ -28,7 +29,7 @@ ShowCustomer=Zeige Kunden
 ShowProspect=Zeige Lead
 ListOfProspects=Leads-Liste
 ListOfCustomers=Kundenliste
-LastDoneTasks=Latest %s completed actions
+LastDoneTasks=Letzte %s erledigte Aufgaben
 LastActionsToDo=%s älteste nicht erledigte Aufgaben
 DoneAndToDoActions=Abgeschlossene und zu unvollständige Ereignisse
 DoneActions=Abgeschlossene Ereignisse
diff --git a/htdocs/langs/de_DE/companies.lang b/htdocs/langs/de_DE/companies.lang
index 47557948f95..383e613d27e 100644
--- a/htdocs/langs/de_DE/companies.lang
+++ b/htdocs/langs/de_DE/companies.lang
@@ -13,7 +13,7 @@ MenuNewPrivateIndividual=Neue Privatperson
 NewCompany=Neues Unternehmen (Leads, Kunden, Lieferanten)
 NewThirdParty=Neuer Partner (Leads, Kunden, Lieferanten)
 CreateDolibarrThirdPartySupplier=Neuen Partner erstellen (Lieferant)
-CreateThirdPartyOnly=Erzeuge Partner
+CreateThirdPartyOnly=Partner erstellen
 CreateThirdPartyAndContact=Neuen Partner und Unteradresse erstellen
 ProspectionArea=Übersicht Geschäftsanbahnung
 IdThirdParty=Partner-ID
@@ -38,7 +38,6 @@ ThirdPartyCustomersStats=Kunden
 ThirdPartyCustomersWithIdProf12=Kunden mit %s oder %s
 ThirdPartySuppliers=Lieferanten
 ThirdPartyType=Typ des Partners
-Company/Fundation=Firma/Institution
 Individual=Privatperson
 ToCreateContactWithSameName=Erzeugt automatisch einen Kontakt/Adresse mit der gleichen Information wie der Partner unter dem Partner. In den meisten Fällen, auch wenn Ihr Prtner eine natürliche Person ist, reicht nur die Anlage eines Partners
 ParentCompany=Muttergesellschaft
@@ -78,10 +77,10 @@ VATIsNotUsed=Nicht USt-pflichtig
 CopyAddressFromSoc=Anschriften zu diesem Partner
 ThirdpartyNotCustomerNotSupplierSoNoRef=Partner ist weder Kunde noch Lieferant, keine verbundenen Objekte
 PaymentBankAccount=Bankkonto für Zahlungen
-OverAllProposals=Gesamt Angebote
-OverAllOrders=Gesamt Auftragseingang
-OverAllInvoices=Gesamt Rechnungen
-OverAllSupplierProposals=Gesamt Lieferanten Angebote
+OverAllProposals=Angebote
+OverAllOrders=Bestellungen
+OverAllInvoices=Rechnungen
+OverAllSupplierProposals=Preisanfragen
 ##### Local Taxes #####
 LocalTax1IsUsed=Nutze zweiten Steuersatz
 LocalTax1IsUsedES= RE wird verwendet
@@ -237,6 +236,12 @@ ProfId3TN=Douane-Code
 ProfId4TN=BAN
 ProfId5TN=-
 ProfId6TN=-
+ProfId1US=Prof Id
+ProfId2US=DVR-Nummer
+ProfId3US=DVR-Nummer
+ProfId4US=DVR-Nummer
+ProfId5US=DVR-Nummer
+ProfId6US=DVR-Nummer
 ProfId1RU=OGRN
 ProfId2RU=INN
 ProfId3RU=KPP
@@ -259,7 +264,7 @@ CustomerRelativeDiscountShort=Rabatt relativ
 CustomerAbsoluteDiscountShort=Rabatt absolut
 CompanyHasRelativeDiscount=Dieser Kunde hat einen Rabatt <b>von %s%%</b>
 CompanyHasNoRelativeDiscount=Dieser Kunde hat standardmäßig keinen relativen Rabatt
-CompanyHasAbsoluteDiscount=Dieser Kunde hat noch Rabatt-Gutschriften <b>über %s %s</b>
+CompanyHasAbsoluteDiscount=Dieser Kunde hat noch ein Guthaben (Gutschrift oder Überzahlung) über <b>%s</b> %s
 CompanyHasCreditNote=Dieser Kunde hat noch Gutschriften <b>über %s %s</b>
 CompanyHasNoAbsoluteDiscount=Dieser Kunde hat keine Rabattgutschriften zur Verfügung
 CustomerAbsoluteDiscountAllUsers=Absolute Rabatte (von allen Nutzern gewährte)
@@ -377,7 +382,7 @@ AddAddress=Adresse hinzufügen
 SupplierCategory=Lieferantenkategorie
 JuridicalStatus200=Unabhängig
 DeleteFile=Datei löschen
-ConfirmDeleteFile=Sind Sie sicher dass Sie diese Datei löschen möchten?
+ConfirmDeleteFile=Möchten Sie diese Datei wirklich löschen?
 AllocateCommercial=Dem Vertriebsmitarbeiter zugewiesen
 Organization=Partner
 FiscalYearInformation=Informationen über das Geschäftsjahr
@@ -402,7 +407,7 @@ LeopardNumRefModelDesc=Kunden / Lieferanten-Code ist frei. Dieser Code kann jede
 ManagingDirectors=Name(n) des/der Manager (CEO, Direktor, Geschäftsführer, ...)
 MergeOriginThirdparty=Partner duplizieren (Partner den Sie löschen möchten)
 MergeThirdparties=Partner zusammenlegen
-ConfirmMergeThirdparties=Möchten Sie wirklich diesen Partner mit dem aktuellen zusammenführen ? Alle verbundenen Objekte werden zusammengeführt, so das Sie die doppelten löschen können.
+ConfirmMergeThirdparties=Möchten Sie wirklich diesen Partner mit dem Aktuellen zusammenführen? Alle verbundenen Objekte (Rechnungen, Aufträge, ...) werden mit dem Aktuellen zusammengeführt, dann wird der Partner gelöscht werden.
 ThirdpartiesMergeSuccess=Partner wurden zusammengelegt
 SaleRepresentativeLogin=Login des Vertriebsmitarbeiters
 SaleRepresentativeFirstname=Vorname des Vertreter
diff --git a/htdocs/langs/de_DE/compta.lang b/htdocs/langs/de_DE/compta.lang
index 4d97901f907..ab2b2312722 100644
--- a/htdocs/langs/de_DE/compta.lang
+++ b/htdocs/langs/de_DE/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Die hier ausgewiesenen Beträge werden un
 Param=Einstellungen
 RemainingAmountPayment=Noch zu leistende Zahlung:
 Account=Konto
-Accountparent=Kontohalter
-Accountsparent=Kontohalter
+Accountparent=Übergeordnetes Konto
+Accountsparent=Übergeordnete Konten
 Income=Einnahmen
 Outcome=Ausgaben
 ReportInOut=Ergebnis / Geschäftsjahr
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Steuern und Abgaben
 MenuSocialContributions=Sozialabgaben/Steuern
 MenuNewSocialContribution=Neue Abgabe/Steuer
 NewSocialContribution=Neue Sozialabgabe / Steuersatz
+AddSocialContribution=Sozialabgabe / Steuersatz hinzufügen
 ContributionsToPay=Sozialabgaben/Unternehmenssteuern zu bezahlen
 AccountancyTreasuryArea=Rechnungswesen/Vermögensverwaltung
 NewPayment=Neue Zahlung
@@ -82,12 +83,12 @@ LT2PaymentES=EKSt. Zahlung
 LT2PaymentsES=EKSt. Zahlungen
 VATPayment=USt. Zahlung
 VATPayments=USt Zahlungen
-VATRefund=Sales tax refund
+VATRefund=Umsatzsteuer Rückerstattung
 Refund=Rückerstattung
 SocialContributionsPayments=Sozialabgaben-/Steuer Zahlungen
 ShowVatPayment=Zeige USt. Zahlung
 TotalToPay=Zu zahlender Gesamtbetrag
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Differenz ist nur in dieser Liste sichtbar, wenn die Tabelle aufsteigend nach %s sortiert ist und gefiltert mit nur 1 Bankkonto
 CustomerAccountancyCode=Kontierungscode Kunde
 SupplierAccountancyCode=Kontierungscode Lieferant
 CustomerAccountancyCodeShort=Buchh. Kunden-Konto
@@ -134,8 +135,8 @@ RulesResultDue=- Dies beinhaltet ausstehende Rechnungen, Aufwendungen, Umsatzste
 RulesResultInOut=- Es sind nur tatsächliche Zahlungen für Rechnungen, Kostenabrechnungen, USt und Gehälter enthalten. <br>- Bei Rechnungen, Kostenabrechnungen, USt und Gehälter gilt das Zahlugnsdatum. Bei Spenden gilt das Spendendatum.
 RulesCADue=- es beinhaltet alle fälligen Kundenrechnungen, unabhängig von ihrem Zahlungsstatus. <br>- Es gilt das Freigabedatum der Rechnungen. <br>
 RulesCAIn=- Beinhaltet alle tatsächlich erfolgten Zahlungen von Kunden.<br>- Es gilt das Zahlungsdatum der Rechnungen.<br>
-DepositsAreNotIncluded=- Noch sind Anzahlungsrechnungen inbegriffen
-DepositsAreIncluded=- Anzahlungsrechnungen sind inbegriffen
+DepositsAreNotIncluded=- Ohne Anzahlungsrechnungen
+DepositsAreIncluded=- Inklusive Anzahlungsrechnungen
 LT2ReportByCustomersInInputOutputModeES=Bericht von Partner EKSt.
 LT1ReportByCustomersInInputOutputModeES=Bericht von Kunden RE
 VATReport=USt-Bericht
@@ -169,7 +170,7 @@ DescSellsJournal=Verkaufsjournal
 DescPurchasesJournal=Einkaufsjournal
 InvoiceRef=Rechnungs-Nr.
 CodeNotDef=Nicht definiert
-WarningDepositsNotIncluded=Abschlagsrechnungen werden in dieser Version des Rechnungswesens nicht berücksichtigt.
+WarningDepositsNotIncluded=Anzahlungsrechnungen werden in dieser Version des Rechnungswesens nicht berücksichtigt.
 DatePaymentTermCantBeLowerThanObjectDate=Die Zahlungsfrist darf nicht kleiner als das Objektdatum sein
 Pcg_version=Kontenplan
 Pcg_type=Klasse des Kontos
@@ -186,16 +187,18 @@ CalculationRuleDescSupplier=Gemäß Ihrem Lieferanten, wählen Sie die  geeignet
 TurnoverPerProductInCommitmentAccountingNotRelevant=Umsatz Bericht pro Produkt, bei der Verwendung einer <b>Kassabuch Buchhaltung</b>  ist der Modus nicht relevant. Dieser Bericht ist nur bei Verwendung <b>Buchführungsmodus Periodenrechnung</b> (siehe Setup das Modul  Buchhaltung).
 CalculationMode=Berechnungsmodus
 AccountancyJournal=Buchhaltungscode-Journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Standard Buchhaltungs-Konto für die Erhebung der MwSt. - Mehrwertsteuer auf den Umsatz (wird verwendet, wenn nicht bei der Konfiguration des MwSt-Wörterbuch definiert)
+ACCOUNTING_VAT_BUY_ACCOUNT=Standard Buchhaltungs-Konto für Vorsteuer  - Ust bei Einkäufen (wird verwendet, wenn nicht unter Einstellungen->Stammdaten USt.-Sätze definiert)
 ACCOUNTING_VAT_PAY_ACCOUNT=Standard-Aufwandskonto, um MwSt zu bezahlen
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Standard Buchhaltungskonto für Kunden/Debitoren (wenn nicht beim Partner definiert)
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Standard Buchhaltungskonto für Lieferanten/Kreditoren (wenn nicht beim Lieferanten definiert)
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Dupliziere Sozialabgabe/Steuersatz
 ConfirmCloneTax=Bestätigen Sie die Duplizierung der Steuer-/Sozialabgaben-Zahlung
 CloneTaxForNextMonth=Für nächsten Monat duplizieren
 SimpleReport=Einfache Berichte
-AddExtraReport=Extra reports (add foreign and national customer report)
+AddExtraReport=Zusätzliche Berichte (Fügen Sie fremde und nationalen Kundenbericht hinzu)
 OtherCountriesCustomersReport=Bericht Ausländische Kunden
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Basierend auf den ersten beiden Buchstaben der Mehrwertsteuernummer die unterschiedlich ist, wie Ihr eigener Unternehmens Ländercode.
 SameCountryCustomersWithVAT=Nationale Kunden berichten
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Sozialabgaben/Steuern
 ImportDataset_tax_vat=USt.-Zahlungen
 ErrorBankAccountNotFound=Fehler: Bankkonto nicht gefunden
 FiscalPeriod=Buchhaltungs Periode
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/de_DE/contracts.lang b/htdocs/langs/de_DE/contracts.lang
index 42e69a30bad..c15654ab9f9 100644
--- a/htdocs/langs/de_DE/contracts.lang
+++ b/htdocs/langs/de_DE/contracts.lang
@@ -39,7 +39,7 @@ ConfirmCloseService=Möchten Sie diesen Service wirklich mit Datum <b>%s</b> dea
 ValidateAContract=Einen Vertrag freigeben
 ActivateService=Service aktivieren
 ConfirmActivateService=Möchten Sie dieses Service wirklich mit Datum <b>%s</b> aktivieren?
-RefContract=Vertragsnummer
+RefContract=Vertrag Nr.
 DateContract=Vertragsdatum
 DateServiceActivate=Service-Aktivierungsdatum
 ShowContract=Zeige Vertrag
@@ -83,6 +83,8 @@ NoteListOfYourExpiredServices=Diese Liste enthält nur Leistungen an Partner, be
 StandardContractsTemplate=Standard Vertragsschablone 
 ContactNameAndSignature=Für %s, Name und Unterschrift
 OnlyLinesWithTypeServiceAreUsed=Nur die Zeile der Kategorie "Service" wird kopiert.
+CloneContract=Dupliziere Vertrag
+ConfirmCloneContract=Möchten Sie den Vertrag <b>%s</b> wirklich duplizieren?
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Vertragsunterzeichnung durch Vertreter
diff --git a/htdocs/langs/de_DE/cron.lang b/htdocs/langs/de_DE/cron.lang
index 9a869bfd7e3..fbce22048e1 100644
--- a/htdocs/langs/de_DE/cron.lang
+++ b/htdocs/langs/de_DE/cron.lang
@@ -17,15 +17,15 @@ CronMethodDoesNotExists=Klasse %s enthält keine Methode %s
 # Menu
 EnabledAndDisabled=Aktiviert und Deaktiviert
 # Page list
-CronLastOutput=Latest run output
-CronLastResult=Latest result code
+CronLastOutput=Ausgabe der letzten Ausführung
+CronLastResult=Letzter Resultatcode
 CronCommand=Befehl
 CronList=Geplante Aufträge
 CronDelete=cronjobs löschen
 CronConfirmDelete=Sind Sie sicher, dass Sie diese geplante Aufträge  jetzt löschen möchten?
 CronExecute=Geplanter Auftrag jetzt ausführen 
 CronConfirmExecute=Sind Sie sicher, dass Sie diese geplante Aufträge jetzt ausführen möchten?
-CronInfo=Das Modul "Zeitgesteuerte Cron-Jobs" erlaubt die geplanten Cron-Jobs die programmiert wurden durchzuführen.
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Job
 CronNone=Keine
 CronDtStart=nicht vor
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Aktivieren
 CronStatusInactiveBtn=Deaktivieren
 CronTaskInactive=Dieser Job ist deaktiviert
 CronId=ID
-CronClassFile=Klassen (filenames.class.php)
-CronModuleHelp=Name des Dolibarr Modul (funktioniert auch mit externen Dolibarr Modul). <BR> Als Beispiel um die Funktion fetch der Dolibarr Produkt Klasse  /htdocs/<u>product</u>/class/product.class.php aufzurufen, der Wert des Modul ist <i>product.</i>
-CronClassFileHelp=Der Name der Datei zu laden<BR> Als Beispiel um die Funktion fetch der Dolibarr Produkt Klasse /htdocs/product/class/<u>product.class.php</u> aufzurufen, ist der Name der Datei <i>product.class.php</i>
-CronObjectHelp=Der Klassennamen um zu laden. <BR> Als Beispiel um die Funktion fetch der Dolibarr Produkt Klasse  /htdocs/product/class/product.class.php aufzurufen, der Klassennamen-Wert ist <i>Produkt-</i>
-CronMethodHelp=Die Objektmethode, um zu starten. <BR> Zum Beispiel um die Methode fetch vom  Dolibarr Produkt Objekt /htdocs/product/class/product.class.php aufzurufen, ist der Methoden-Wert <i>fetch</i>
-CronArgsHelp=Das Methodenargument/Input-Parameter.<BR>  Zum Beispiel um die Methode fetch vom  Dolibarr Produkt Objekt /htdocs/product/class/product.class.php aufzurufen, ist der Input-Parameter-Wert <i>0, RefProduit</i>
+CronClassFile=Dateiname mit Klasse
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=Die auszuführende System-Kommandozeile
 CronCreateJob=Erstelle neuen cronjob
 CronFrom=Von
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Gehen Sie in Menü "Start - Module Hilfsprogramm
 JobDisabled=Aufgabe deaktiviert
 MakeLocalDatabaseDumpShort=lokales Datenbankbackup
 MakeLocalDatabaseDump=erstelle einen lokalen Datenbankdump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang
index 2e20b808f45..693f4989ce6 100644
--- a/htdocs/langs/de_DE/errors.lang
+++ b/htdocs/langs/de_DE/errors.lang
@@ -11,13 +11,15 @@ ErrorLoginAlreadyExists=Benutzername %s existiert bereits.
 ErrorGroupAlreadyExists=Gruppe %s existiert bereits.
 ErrorRecordNotFound=Eintrag wurde nicht gefunden.
 ErrorFailToCopyFile=Konnte die Datei <b>'%s'</b> nicht nach <b>'%s'</b> kopieren.
-ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCopyDir=Konnte Verzeichnis '<b>%s</b>' nicht nach '<b>%s</b>' kopieren.
 ErrorFailToRenameFile=Konnte die Datei <b>'%s'</b> nicht in <b>'%s'</b> umzubenennen.
 ErrorFailToDeleteFile=Fehler beim Löschen der Datei '<b>%s</b>'.
 ErrorFailToCreateFile=Fehler beim Erstellen der Datei '<b>%s</b>'.
 ErrorFailToRenameDir=Fehler beim Umbenennen des Verzeichnisses '<b>%s</b>' in '<b>%s</b>'.
 ErrorFailToCreateDir=Fehler beim Erstellen des Verzeichnisses '<b>%s</b>'.
 ErrorFailToDeleteDir=Fehler beim Löschen des Verzeichnisses '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Konnte Datei '<b>%s</b>' nicht erstellen.
 ErrorThisContactIsAlreadyDefinedAsThisType=Dieser Kontakt ist bereits als Kontakt dieses Typs definiert.
 ErrorCashAccountAcceptsOnlyCashMoney=Dies ist ein Bargeldkonto (Kasse) und akzeptiert deshalb nur Bargeldtransaktionen.
 ErrorFromToAccountsMustDiffers=Quell- und Zielbankkonto müssen unterschiedlich sein.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Fehler beim Schreiben in das Verzeichnis %s
 ErrorFoundBadEmailInFile=Ungültige E-Mail-Adresse in %s Zeilen der Datei gefunden (z.B. Zeile %s mit E-Mail=%s)
 ErrorUserCannotBeDelete=Dieser Benutzer kann nicht gelöscht werden. Eventuell ist er noch mit einem Partner verknüpft.
 ErrorFieldsRequired=Ein oder mehrere erforderliche Felder wurden nicht ausgefüllt.
+ErrorSubjectIsRequired=Der E-Mailbetreff ist notwendig
 ErrorFailedToCreateDir=Fehler beim Erstellen eines Verzeichnisses. Vergewissern Sie sich, dass der Webserver-Benutzer Schreibberechtigungen für das Dokumentverzeichnis des Systems besitzt. Bei aktiviertem <b>safe_mode</b> sollten die Systemdateien den Webserver-Benutzer oder die -Gruppe als Besitzer haben.
 ErrorNoMailDefinedForThisUser=Für diesen Benutzer ist keine E-Mail-Adresse eingetragen.
 ErrorFeatureNeedJavascript=Diese Funktion erfordert aktiviertes JavaScript. Sie können dies unter Einstellungen-Anzeige ändern.
@@ -70,7 +73,7 @@ ErrorLDAPSetupNotComplete=Der LDAP-Abgleich für dieses System ist nicht vollst
 ErrorLDAPMakeManualTest=Eine .ldif-Datei wurde im Verzeichnis %s erstellt. Laden Sie diese Datei von der Kommandozeile aus um mehr Informationen über Fehler zu erhalten.
 ErrorCantSaveADoneUserWithZeroPercentage=Ereignisse können nicht mit Status "Nicht begonnen" gespeichert werden, wenn das Feld "Erledigt durch" ausgefüllt ist.
 ErrorRefAlreadyExists=Die Nr. für den Erstellungsvorgang ist bereits vergeben
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD)
+ErrorPleaseTypeBankTransactionReportName=Geben Sie den Kontoauszug an, in dem die Zahlung enthalten ist (Format JJJJMM oder JJJJMMTT)
 ErrorRecordHasChildren=Kann diesen Eintrag nicht löschen. Dieser Eintrag wird von mindestens einem untergeordneten Datensatz verwendet.
 ErrorRecordIsUsedCantDelete=Eintrag kann nicht gelöscht werden. Er wird bereits benutzt oder ist in einem anderen Objekt enthalten.
 ErrorModuleRequireJavascript=Diese Funktion erfordert aktiviertes JavaScript. Aktivieren/deaktivieren können Sie Javascript im Menü Start-> Einstellungen->Anzeige.
@@ -114,9 +117,9 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Mengen in Kundenrechnungen dürfen nich
 ErrorWebServerUserHasNotPermission=Der Benutzerkonto <b>%s</b> wurde verwendet um auf dem Webserver etwas auszuführen, hat aber keine Rechte dafür.
 ErrorNoActivatedBarcode=Kein Barcode aktiviert
 ErrUnzipFails=Fehler beim Entpacken von %s mit ZipArchive
-ErrNoZipEngine=Kein Entpackprogramm in PHP gefunden für Datei %s
+ErrNoZipEngine=Kein Pack/Entpackprogramm in PHP gefunden für Datei %s
 ErrorFileMustBeADolibarrPackage=Die Datei %s muss ein Dolibarr ZIP-Paket sein
-ErrorModuleFileRequired=You must select a Dolibarr module package file
+ErrorModuleFileRequired=Sie müssen eine Dolibarr Modul-Paket-Datei wählen
 ErrorPhpCurlNotInstalled=PHP CURL ist nicht installiert, aber erforderlich für Paypal
 ErrorFailedToAddToMailmanList=Fehler beim Hinzufügen von %s zur Mailman Liste %s oder SPIP basis
 ErrorFailedToRemoveToMailmanList=Fehler beim Löschen von %s von der Mailman Liste %s oder SPIP basis
@@ -132,7 +135,7 @@ ErrorWarehouseMustDiffers=Quell- und Ziel-Lager müssen unterschiedlich sein
 ErrorBadFormat=Falsches 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=Fehler: Es sind noch Auslieferungen zu diesen Versand vorhanden. Löschen deshalb nicht möglich.
-ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank entry that was reconciled
+ErrorCantDeletePaymentReconciliated=Eine Zahlung, deren Bank-Transaktion schon abgeglichen wurde, kann nicht gelöscht werden
 ErrorCantDeletePaymentSharedWithPayedInvoice=Eine Zahlung, die zu mindestens einer als bezahlt markierten Rechnung gehört, kann nicht entfernt werden
 ErrorPriceExpression1=Zur Konstanten '%s' kann nicht zugewiesen werden
 ErrorPriceExpression2=Die eingebaute Funktion '%s' kann nicht neu definiert werden
@@ -165,25 +168,32 @@ ErrorGlobalVariableUpdater5=Keine globale Variable ausgewählt
 ErrorFieldMustBeANumeric=Feld <b>%s</b> muss ein numerischer Wert sein
 ErrorMandatoryParametersNotProvided=Erforderliche(r) Parameter wird nicht angeboten
 ErrorOppStatusRequiredIfAmount=Sie legen einen geschätzten Betrag für diese Verkaufschance/Lead erfasst. Deshalb müssen Sie auch den Status eingeben
+ErrorFailedToLoadModuleDescriptorForXXX=Moduldeskriptor für Klasse %s konnte nicht geladen werden
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Falsche Definition von Menü Array in  Module Descriptor (falscher Wert für den Key  fk_menu)
 ErrorSavingChanges=Beim Speichern der Änderungen trat ein Fehler auf
 ErrorWarehouseRequiredIntoShipmentLine=Lager in der Zeile ist für die Lieferung notwendig
 ErrorFileMustHaveFormat=Die Datei muss das Format %s haben.
 ErrorSupplierCountryIsNotDefined=Land für den Lieferanten ist nicht definiert. Korrigieren Sie dies zuerst.
 ErrorsThirdpartyMerge=Fehler beim Zusammenführen der beiden Einträge. Die Anforderung wurde abgebrochen.
-ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
+ErrorStockIsNotEnoughToAddProductOnOrder=Nicht genug Bestand von Produkt %s, um es einem neuen Auftrag zuzufügen.
+ErrorStockIsNotEnoughToAddProductOnInvoice=Nicht genug Bestand von Produkt %s, um es einer neuen Rechnung zuzufügen.
+ErrorStockIsNotEnoughToAddProductOnShipment=Nicht genug Bestand von Produkt %s, um es einer neuen Sendung zuzufügen.
+ErrorStockIsNotEnoughToAddProductOnProposal=Nicht genug Bestand von Produkt %s, um es einem neuen Angebot zuzufügen.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
-ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
-ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
-ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
-ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
-ErrorTaskAlreadyAssigned=Task already assigned to user
-ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
-ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorModuleNotFound=Datei des Modul nicht gefunden.
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
+ErrorBankStatementNameMustFollowRegex=Fehler - Name des Kontoauszugs muss dieser Syntax folgen: %s
+ErrorPhpMailDelivery=Vergewissern Sie sich, dass Sie nicht zu viele Adressaten nutzen und der Inhalt Ihrer Mail nicht nach Spam aussieht. Bitten Sie Ihren Administrator, die Firewall- und Server-Logs zu prüfen, um detailliertere Informationen zu bekommen.
+ErrorUserNotAssignedToTask=Benutzer muss der Aufgabe zugeteilt sein, um Zeiten erfassen zu können.
+ErrorTaskAlreadyAssigned=Aufgabe ist dem Benutzer bereits zugeteilt
+ErrorModuleFileSeemsToHaveAWrongFormat=Das Modul-Paket scheint ein falsches Format zu haben.
+ErrorFilenameDosNotMatchDolibarrPackageRules=Der Name des Modul-Pakets (<strong>%s</strong>) entspricht nicht der erwarteten Syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Fehler, doppelter Triggername %s. Schon geladen durch %s.
+ErrorNoWarehouseDefined=Fehler, keine Warenlager definiert.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Zu viele Fehler, Verarbeitung abgebrochen.
 
 # Warnings
 WarningPasswordSetWithNoAccount=Es wurde ein Passwort für dieses Mitglied vergeben, aber kein Benutzer erstellt. Das Passwort wird gespeichert, aber kann nicht für die Anmeldung an Dolibarr verwendet werden. Es kann von einem externen Modul/einer Schnittstelle verwendet werden, aber wenn Sie kein Login oder Passwort für dieses Mitglied definiert müssen, können Sie die Option "Login für jedes Mitglied verwalten" in den Mitgliedseinstellungen deaktivieren. Wenn Sie ein Login aber kein Passwort benötige, lassen Sie dieses Feld leer, um diese Meldung zu deaktivieren. Anmerkung: Die E-Mail-Adresse kann auch zur Anmeldung verwendet werden, wenn das Mitglied mit einem Benutzer verbunden wird.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Zahlungsdatum (%s) liegt vor dem Rechnung
 WarningTooManyDataPleaseUseMoreFilters=Zu viele Ergebnisse (mehr als %s Zeilen). Bitte benutzen Sie mehr Filter oder erhöhen sie die Konstante %s auf einen höheren Wert.
 WarningSomeLinesWithNullHourlyRate=Einige erfasste Zeiten wurden von Benutzern erfasst bei denen der Stundensatz undefiniert war. Ein Stundenansatz von 0 %s pro Stunde wurde verwendet, was eine fehlerhafte Zeitauswertungen zur Folge haben kann.
 WarningYourLoginWasModifiedPleaseLogin=Ihr Login wurde verändert. Aus Sicherheitsgründen müssen Sie sich vor der nächsten Aktion mit Ihrem neuen Login anmelden.
+WarningAnEntryAlreadyExistForTransKey=Eine Übersetzung für diesen Übersetzungsschlüssel existiert schon für diese Sprache
diff --git a/htdocs/langs/de_DE/exports.lang b/htdocs/langs/de_DE/exports.lang
index 4a5e803a116..50926e7fb62 100644
--- a/htdocs/langs/de_DE/exports.lang
+++ b/htdocs/langs/de_DE/exports.lang
@@ -110,18 +110,24 @@ Enclosure=Beilage
 SpecialCode=Spezialcode
 ExportStringFilter=%% erlaubt die Ersetzung eines oder mehrerer Zeichen im Text
 ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filtert nach einem Jahr/Monat/Tag<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filtert über einen Bereich von Jahren/Monaten/Tagen<br>'>YYYY' '>YYYYMM' '>YYYYMMDD': filtert auf die folgenden Jahre/Monate/Tage<br>'<YYYY' '<YYYYMM' '<YYYYMMDD': filtert auf die vorhergehenden Jahre/Monate/Tage
-ExportNumericFilter=NNNNN filters by one value<br>NNNNN+NNNNN filters over a range of values<br>< NNNNN filters by lower values<br>> NNNNN filters by higher values
+ExportNumericFilter='NNNNN' filtert genau einen Wert<br>'NNNNN+NNNNN' filtert einen Wertebereich<br>'< NNNNN' filtert nach kleineren Werten<br>'> NNNNN' filtert nach größeren Werten
 ImportFromLine=Import beginnen bei Zeile
 EndAtLineNb=Ende bei Zeile
+ImportFromToLine=Importiere Zeilen mit Nr. (von - bis)
 SetThisValueTo2ToExcludeFirstLine=Setzen Sie beispielsweise den Wert auf 3, um die ersten beiden Zeilen auszuschliessen.
 KeepEmptyToGoToEndOfFile=Dieses Feld leer lassen, um die Datei bis zum Ende zu bearbeiten.
+SelectPrimaryColumnsForUpdateAttempt=Spalte(n) auswählen die als Primärschlüssel für Aktualisierungen beim Import verwendet werden sollen
+UpdateNotYetSupportedForThisImport=Aktualisierungen werden für diesen Importtyp nicht unterstützt (Nur neue Datensätze importieren)
+NoUpdateAttempt=Keine Aktualisierungen gemacht, nur neue Datensätze
+ImportDataset_user_1=Benutzer (Mitarbeiter und andere) sowie Eigenschaften
+ComputedField=Berechnetes Feld
 ## filters
 SelectFilterFields=Wenn Sie nach bestimmten Werten filtern wollen, geben Sie diese Werte hier ein.
 FilteredFields=Gefilterte Felder
 FilteredFieldsValues=Filter Wert
 FormatControlRule=Regel für die Formatkontrolle
 ## imports updates
-KeysToUseForUpdates=Key to use for updating data
-NbInsert=Number of inserted lines: %s
-NbUpdate=Number of updated lines: %s
-MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+KeysToUseForUpdates=Schlüssel zu verwenden, um Daten zu aktualisieren
+NbInsert=Anzahl eingefügter Zeilen: %s
+NbUpdate=Anzahl geänderter Zeilen: %s
+MultipleRecordFoundWithTheseFilters=Mehrere Ergebnisse wurden mit diesen Filtern gefunden: %s
diff --git a/htdocs/langs/de_DE/holiday.lang b/htdocs/langs/de_DE/holiday.lang
index 7294bd9a9ad..e4fd3b57871 100644
--- a/htdocs/langs/de_DE/holiday.lang
+++ b/htdocs/langs/de_DE/holiday.lang
@@ -76,9 +76,9 @@ BoxTitleLastLeaveRequests=%s zuletzt bearbeitete Urlaubsanträge
 HolidaysMonthlyUpdate=Monatliches Update
 ManualUpdate=Manuelles Update
 HolidaysCancelation=Urlaubsantrag stornieren
-EmployeeLastname=Employee last name
-EmployeeFirstname=Employee first name
-TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+EmployeeLastname=Mitarbeiter Nachname
+EmployeeFirstname=Vorname des Mitarbeiters
+TypeWasDisabledOrRemoved=Abreise-Art (Nr %s) war deaktiviert oder entfernt
 
 ## Configuration du Module ##
 LastUpdateCP=Letzte automatische Aktualisierung der Urlaubstage
diff --git a/htdocs/langs/de_DE/install.lang b/htdocs/langs/de_DE/install.lang
index 03df823a874..1e3ceccb663 100644
--- a/htdocs/langs/de_DE/install.lang
+++ b/htdocs/langs/de_DE/install.lang
@@ -138,6 +138,7 @@ KeepDefaultValuesWamp=Wenn Sie den DoliWamp-Installationsassistent verwenden, we
 KeepDefaultValuesDeb=Sie verwenden den Dolibarr-Installationsassistenten in einer Linux Umgebung (Ubuntu, Debian, Fedor...), entsprechend sind hier bereits Werte vorgeschlagenen. Sie müssen lediglich das Passwort des anzulegenden Datenbankbenutzers angeben. Bitte nehmen Sie nur Änderungen vor wenn Sie wissen was Sie tun.
 KeepDefaultValuesMamp=Sie verwenden den DoliMamp-Installationsassistent, entsprechend werden hier bereits Werte vorgeschlagen. Bitte nehmen Sie nur Änderungen vor wenn Sie wissen was Sie tun.
 KeepDefaultValuesProxmox=Sie verwenden den Dolibarr Installationsassistenten einer Proxmox "virtual appliance". Die hier vorgeschlagenen Werte sind bereits optimiert. Bitte nehmen Sie nur Änderungen vor wenn Sie wissen was Sie tun.
+UpgradeExternalModule=Dedizierten Upgradeprozess für externe Module ausführen
 
 #########
 # upgrade
@@ -175,7 +176,7 @@ MigrationReopeningContracts=Durch Fehler geschlossenen Vertrag wiedereröffnen
 MigrationReopenThisContract=Vertrag %s wiedereröffnen
 MigrationReopenedContractsNumber=%s Verträge geändert
 MigrationReopeningContractsNothingToUpdate=Keine geschlossenen Verträge zur Wiedereröffnung
-MigrationBankTransfertsUpdate=Update links between bank entry and a bank transfer
+MigrationBankTransfertsUpdate=Verknüpfung zwischen Banktransaktion und einer Überweisung aktualisieren
 MigrationBankTransfertsNothingToUpdate=Alle Banktransaktionen sind auf neuestem Stand.
 MigrationShipmentOrderMatching=Aktualisierung Versand
 MigrationDeliveryOrderMatching=Aktualisiere Lieferscheine
diff --git a/htdocs/langs/de_DE/mails.lang b/htdocs/langs/de_DE/mails.lang
index e79cfa102b5..c9a30838b02 100644
--- a/htdocs/langs/de_DE/mails.lang
+++ b/htdocs/langs/de_DE/mails.lang
@@ -35,7 +35,7 @@ MailingStatusSentPartialy=Teilweise gesendet
 MailingStatusSentCompletely=Vollständig gesendet
 MailingStatusError=Fehler beim Versand
 MailingStatusNotSent=Nicht gesendet
-MailSuccessfulySent=Email successfully accepted for delivery (from %s to %s)
+MailSuccessfulySent=E-Mail (von %s an %s) erfolgreich für die den Versand akzeptiert
 MailingSuccessfullyValidated=E-Mail erfolgreich überprüft
 MailUnsubcribe=Abmelden
 MailingStatusNotContact=Nicht mehr kontaktieren
@@ -43,7 +43,7 @@ MailingStatusReadAndUnsubscribe=Lesen und abmelden
 ErrorMailRecipientIsEmpty=Das Empfängerfeld ist leer
 WarningNoEMailsAdded=Keine neuen E-Mail-Adressen für das Hinzufügen zur Empfängerliste.
 ConfirmValidMailing=Möchten Sie diese E-Mail-Kampagne wirklich freigeben?
-ConfirmResetMailing=Warning, by reinitializing emailing <b>%s</b>, you allow to make a mass sending of this email another time. Are you sure you this is what you want to do?
+ConfirmResetMailing=Achtung, wenn Sie diese E-Mail Kampagne <b>%s</b>, können Sie diese Aktion nochmals versenden. Sind Sie sicher, das ist tun möchten?
 ConfirmDeleteMailing=Möchten Sie diese E-Mail-Kampagne wirklich löschen?
 NbOfUniqueEMails=Anzahl einzigartige E-Mail-Adressen
 NbOfEMails=Anzahl der E-Mails
@@ -74,18 +74,22 @@ ResultOfMailSending=Sende-Ergebnis der E-Mail-Kampagne
 NbSelected=Anz. gewählte
 NbIgnored=Anz. ignoriert
 NbSent=Anz. gesendet
-ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
-MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
-MailingModuleDescContactsByCompanyCategory=Contacts by third party category
-MailingModuleDescContactsByCategory=Contacts by categories
-MailingModuleDescContactsByFunction=Contacts by position
+ConfirmUnvalidateEmailing=Möchten Sie die eMail-Kampange <b>%s</b> in den Entwurf Status wechseln?
+MailingModuleDescContactsWithThirdpartyFilter=Kontakt mit Kunden Filter
+MailingModuleDescContactsByCompanyCategory=Kontakte mit Partner Kategorie
+MailingModuleDescContactsByCategory=Kontakte nach Kategorien
+MailingModuleDescContactsByFunction=Kontakte nach Position
+MailingModuleDescEmailsFromFile=E-Mailadressen aus Datei
+MailingModuleDescEmailsFromUser=E-Mailadressen Eingabe durch Benutzer
+MailingModuleDescDolibarrUsers=Benutzer mit E-Mailadresse
+MailingModuleDescThirdPartiesByCategories=Partner (nach Kategorien)
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Zeile %s in der Datei
 RecipientSelectionModules=Definiert Auswahl von Empfängern
 MailSelectedRecipients=Ausgewählte Empfänger
 MailingArea=E-Mail Kampagnenübersicht
-LastMailings=Latest %s emailings
+LastMailings=Neueste %s E-Mail Kampagnen
 TargetsStatistics=Zielstatistiken
 NbOfCompaniesContacts=Einzigartige Partnerkontakte
 MailNoChangePossible=Die Empfängerliste einer freigegebenen E-Mail Kampagne kann nicht mehr geändert werden
@@ -93,9 +97,9 @@ SearchAMailing=Suche E-Mail Kampagne
 SendMailing=E-Mail Kampagne versenden
 SendMail=sende E-Mail 
 SentBy=Gesendet von
-MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
+MailingNeedCommand=Aus Sicherheitsgründen sollten E-Mails von der Kommandozeile aus versandt werden. Bitten Sie Ihren Server Administrator um die Ausführung des folgenden Befehls, um den Versand an alle Empfänger zu starten:
 MailingNeedCommand2=Sie können den Versand jedoch auch online starten, indem Sie den Parameter MAILING_LIMIT_SENDBYWEB auf den Wert der pro Sitzung gleichzeitig zu versendenden Mails setzen. Die entsprechenden Einstellungen finden Sie unter Übersicht-Einstellungen-Andere.
-ConfirmSendingEmailing=If you want to send emailing directly from this screen, please confirm you are sure you want to send emailing now from your browser ?
+ConfirmSendingEmailing=Wenn Sie die eMail-Kampange direkt von diesem Bildschirm senden möchten, bestätigen Sie bitte,  dass Sie jetzt direkt von diesem Browser versenden möchten?
 LimitSendingEmailing=Hinweis: Aus Sicherheits- und Zeitüberschreitungsgründen ist der Online-Versand von E-Mails auf <b>%s</b> Empfänger je Sitzung beschränkt.
 TargetsReset=Liste leeren
 ToClearAllRecipientsClickHere=Klicken Sie hier, um die Empfängerliste zu leeren
@@ -103,7 +107,7 @@ ToAddRecipientsChooseHere=Fügen Sie Empfänger über die Listenauswahl hinzu
 NbOfEMailingsReceived=Empfangene E-Mail-Kampagnen
 NbOfEMailingsSend=E-Mail-Kampagne versandt
 IdRecord=Eintrag-ID
-DeliveryReceipt=Delivery Ack.
+DeliveryReceipt=Empfangsbestätigung
 YouCanUseCommaSeparatorForSeveralRecipients=Trennen Sie mehrere Empfänger mit einem <b>Komma</b>
 TagCheckMail=Öffnen der Mail verfolgen
 TagUnsubscribe=Abmelde Link
@@ -116,16 +120,16 @@ Notifications=Benachrichtigungen
 NoNotificationsWillBeSent=Für dieses Ereignis und diesen Partner sind keine Benachrichtigungen geplant
 ANotificationsWillBeSent=Eine Benachrichtigung wird per E-Mail versandt
 SomeNotificationsWillBeSent=%s Benachrichtigungen werden per E-Mail versandt
-AddNewNotification=Neues E-Mail-Benachrichtigungsziel aktivieren
-ListOfActiveNotifications=Liste aller aktive Empänger für E-Mail Benachrichtigungen
+AddNewNotification=Neues E-Mail-Benachrichtigungsziel-Event aktivieren
+ListOfActiveNotifications=Liste aller aktiven Empänger/Events für E-Mail Benachrichtigungen
 ListOfNotificationsDone=Liste aller versandten E-Mail Benachrichtigungen
 MailSendSetupIs=Der E-Mail-Versand wurde auf '%s' konfiguriert. Dieser Modus kann nicht für E-Mail-Kampagnen verwendet werden.
 MailSendSetupIs2=Sie müssen zuerst mit einem Admin-Konto im Menü %sStart - Einstellungen - E-Mails%s den Parameter <strong>'%s'</strong> auf den Modus '%s' ändern. Dann können Sie die Daten des SMTP-Servers von Ihrem Internetdienstanbieter eingeben und die E-Mail-Kampagnen-Funktion nutzen.
 MailSendSetupIs3=Bei Fragen über die Einrichtung Ihres SMTP-Servers, können Sie %s fragen.
 YouCanAlsoUseSupervisorKeyword=Sie können auch das Schlüsselwort <strong>__SUPERVISOREMAIL__</strong> um E-Mail haben, die an den Vorgesetzten des Benutzers gesendet hinzufügen (funktioniert nur, wenn eine E-Mail für dieses Supervisor definiert)
 NbOfTargetedContacts=Aktuelle Anzahl der E-Mails-Kontakte
-UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
-UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
+UseFormatFileEmailToTarget=Importierte Datei muss das Format\n<strong>email;name;firstname;other</strong> haben
+UseFormatInputEmailToTarget=Geben Sie eine Zeichenkette in dem Format <strong>email, name, firstname, other</strong> ein
 MailAdvTargetRecipients=Empfänger (Erweitere Selektion)
 AdvTgtTitle=Füllen Sie die Eingabefelder zur Vorauswahl der Partner- oder  Kontakt- / Adressen - Empänger
 AdvTgtSearchTextHelp=Tipps für die Suche:  <br>- x<b>%%</b> , um alle Wörter zu suchen, mit x beginnen, Frankreich  <b>-</b> als Trennzeichen  von Werten gesucht, Frankreich <b>-</b> ausschließen würdig <br> Beispiel: <b> jean;joe;jim%%;!jimo;!jima% </b>  werden alle Ergebnisse angezeigt werden <i> jean </i> und  <i> joe </i>,, die mit  <i> jim </i> beginnen mit Ausnahme von <i> jimo </i>  und  <i> jima </i>.
@@ -135,7 +139,7 @@ AdvTgtMaxVal=Maximalwert
 AdvTgtSearchDtHelp=Intervall verwenden um ein Datum auszuwählen
 AdvTgtStartDt=Startdatum
 AdvTgtEndDt=Enddatum
-AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
+AdvTgtTypeOfIncudeHelp=Empfänger EMail des Partners und EMail des Kontakt des Partners, oder einfach nur Partner-EMail oder einfach nur Kontakt EMail
 AdvTgtTypeOfIncude=Empfänger 
 AdvTgtContactHelp=Verwenden Sie nur, wenn Ihr Zielkontakt unter den  "Typ des E-Mail-Empfänger"
 AddAll=Alle hinzufügen
@@ -150,6 +154,6 @@ AdvTgtCreateFilter=Filter erstellen
 AdvTgtOrCreateNewFilter=Name des neuen Filters
 NoContactWithCategoryFound=Kein Kontakt/Adresse mit einer Kategorie gefunden
 NoContactLinkedToThirdpartieWithCategoryFound=Kein Kontakt/Adresse mit einer Kategorie gefunden
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
+OutGoingEmailSetup=eMail Postausgang Einstellungen
+InGoingEmailSetup=eMail Posteingang Einstellungen
 
diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang
index 05db04df69b..b905f184f29 100644
--- a/htdocs/langs/de_DE/main.lang
+++ b/htdocs/langs/de_DE/main.lang
@@ -28,7 +28,7 @@ NoTemplateDefined=Für diesen E-Mail-Typ ist keine Vorlage definiert
 AvailableVariables=verfügbare Ersatzungsvariablen
 NoTranslation=Keine Übersetzung
 NoRecordFound=Keinen Eintrag gefunden
-NoRecordDeleted=No record deleted
+NoRecordDeleted=Keine Datensätze gelöscht
 NotEnoughDataYet=nicht genügend Daten
 NoError=kein Fehler
 Error=Fehler
@@ -62,8 +62,8 @@ ErrorCantLoadUserFromDolibarrDatabase=Benutzer <b>%s</b> in der Dolibarr-Datenba
 ErrorNoVATRateDefinedForSellerCountry=Fehler, keine MwSt.-Sätze für Land  '%s' definiert.
 ErrorNoSocialContributionForSellerCountry=Fehler, Sozialabgaben/Steuerwerte für Land '%s' nicht definiert.
 ErrorFailedToSaveFile=Fehler, konnte Datei nicht speichern.
-ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+ErrorCannotAddThisParentWarehouse=Sie versuchen ein HauptLager hinzuzufügen, das bereits ein Unterlager von dem aktuellen Lagerort ist 
+MaxNbOfRecordPerPage=Max. Zeilenanzahl pro Seite
 NotAuthorized=Sie haben keine Berechtigung dazu.
 SetDate=Datum
 SelectDate=Wählen Sie ein Datum
@@ -73,7 +73,7 @@ Apply=Übernehmen
 BackgroundColorByDefault=Standard-Hintergrundfarbe
 FileRenamed=Datei wurde erfolgreich unbenannt
 FileUploaded=Datei wurde erfolgreich hochgeladen
-FileGenerated=The file was successfully generated
+FileGenerated=Die Datei wurde erfolgreich erstellt
 FileWasNotUploaded=Ein Dateianhang wurde gewählt aber noch nicht hochgeladen. Klicken Sie auf "Datei anhängen" um den Vorgang zu starten.
 NbOfEntries=Anzahl der Einträge
 GoToWikiHelpPage=Onlinehilfe lesen (Internetzugang notwendig)
@@ -88,7 +88,7 @@ Undefined=Nicht definiert
 PasswordForgotten=Passwort vergessen?
 SeeAbove=Siehe oben
 HomeArea=Startseite
-LastConnexion=Latest connection
+LastConnexion=Letzte Verbindung
 PreviousConnexion=Letzte Anmeldung
 PreviousValue=Vorheriger Wert
 ConnectedOnMultiCompany=Mit Entität verbunden
@@ -130,7 +130,7 @@ Activate=Aktivieren
 Activated=Aktiviert
 Closed=Geschlossen
 Closed2=Geschlossen
-NotClosed=Not closed
+NotClosed=nicht geschlossen
 Enabled=Aktiviert
 Deprecated=Veraltet
 Disable=Deaktivieren
@@ -153,6 +153,7 @@ Edit=Bearbeiten
 Validate=Bestätigen
 ValidateAndApprove=Freigaben bestätigen
 ToValidate=Freizugeben
+NotValidated=Nicht freigegeben
 Save=Speichern
 SaveAs=Speichern unter
 TestConnection=Verbindung testen
@@ -164,7 +165,7 @@ Go=Weiter
 Run=bearbeiten
 CopyOf=Duplikat von
 Show=Zeige
-Hide=Hide
+Hide=verstecken
 ShowCardHere=Zeige Karte
 Search=Suchen
 SearchOf=Suche nach
@@ -207,8 +208,8 @@ Info=Protokoll
 Family=Familie
 Description=Beschreibung
 Designation=Beschreibung
-Model=Doc template
-DefaultModel=Default doc template
+Model=Dokumentvorlage
+DefaultModel=Standard Dokumentvorlage
 Action=Ereignis
 About=Über
 Number=Anzahl
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=Keine Anwendung Trennungsfunktion mit Authentifizier
 Connection=Verbindung
 Setup=Einstellungen
 Alert=Warnung
+MenuWarnings=Benachrichtigungen
 Previous=Voriger
 Next=Nächster
 Cards=Karten
@@ -238,7 +240,7 @@ DateCreation=Erstellungsdatum
 DateCreationShort=Erstelldatum
 DateModification=Änderungsdatum
 DateModificationShort=Änderungsdatum
-DateLastModification=Latest modification date
+DateLastModification=Datum letzte Änderung
 DateValidation=Freigabedatum
 DateClosing=Schließungsdatum
 DateDue=Fälligkeitsdatum
@@ -308,12 +310,13 @@ Copy=Kopieren
 Paste=Einfügen
 Default=Standard
 DefaultValue=Standardwert
+DefaultValues=Standardwert
 Price=Preis
 UnitPrice=Stückpreis
 UnitPriceHT=Stückpreis (netto)
 UnitPriceTTC=Stückpreis (brutto)
 PriceU=VP
-PriceUHT=St.-Pr. (Netto)
+PriceUHT=VP (netto)
 PriceUHTCurrency=Nettopreis (Währung)
 PriceUTTC=St.-Pr. (inkl. Steuern)
 Amount=Betrag
@@ -324,9 +327,9 @@ AmountTTCShort=Bruttobetrag
 AmountHT=Betrag (exkl. USt.)
 AmountTTC=Bruttobetrag
 AmountVAT=USt.-Betrag
-MulticurrencyAlreadyPaid=Already payed, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
+MulticurrencyAlreadyPaid=Bereits bezahlte, Originalwährung
+MulticurrencyRemainderToPay=Noch zu bezahlen, Originalwährung
+MulticurrencyPaymentAmount=Zahlungsbetrag, Originalwährung
 MulticurrencyAmountHT=Betrag (Netto), Originalwährung
 MulticurrencyAmountTTC=Betrag (Brutto), Originalwährung
 MulticurrencyAmountVAT=Steuerbetrag, Originalwährung
@@ -343,7 +346,7 @@ SubTotal=Zwischensumme
 TotalHTShort=Nettosumme
 TotalHTShortCurrency=Summe (Netto in Währung)
 TotalTTCShort=Gesamt (inkl. Ust)
-TotalHT=Summe (exkl. Ust)
+TotalHT=Nettosumme
 TotalHTforthispage=Gesamtpreis (Netto) für diese Seite
 Totalforthispage=Gesamtbetrag dieser Seite
 TotalTTC=Bruttosumme
@@ -363,7 +366,8 @@ VATRate=Steuersatz
 Average=Durchschnitt
 Sum=Summe
 Delta=Delta
-Module=Modul
+Module=Modul/Applikation
+Modules=Modul/Applikation
 Option=Option
 List=Liste
 FullList=Vollständige Liste
@@ -372,7 +376,7 @@ OtherStatistics=Weitere Statistiken
 Status=Status
 Favorite=Favorit
 ShortInfo=Info.
-Ref=Referenz-Nr.
+Ref=Nr.
 ExternalRef=Externe-ID
 RefSupplier=Lieferanten-Nr.
 RefPayment=Zahlungsref.-Nr.
@@ -384,10 +388,10 @@ ActionsToDoShort=zu erledigen
 ActionsDoneShort=Erledigt
 ActionNotApplicable=Nicht anwendbar
 ActionRunningNotStarted=zu beginnen
-ActionRunningShort=In progress
+ActionRunningShort=in Bearbeitung
 ActionDoneShort=Abgeschlossen
 ActionUncomplete=unvollständig
-CompanyFoundation=Firma oder Institution
+CompanyFoundation=Firma/Stiftung
 ContactsForCompany=Ansprechpartner/Adressen dieses Partners
 ContactsAddressesForCompany=Ansprechpartner / Adressen zu diesem Partner
 AddressesForCompany=Anschriften zu diesem Partner
@@ -405,8 +409,9 @@ Generate=Erzeugen
 Duration=Dauer
 TotalDuration=Gesamtdauer
 Summary=Zusammenfassung
-DolibarrStateBoard=Statistik
+DolibarrStateBoard=Datenbank Statistik
 DolibarrWorkBoard=Aufgabenübersicht
+NoOpenedElementToProcess=Kein Element zum Verarbeiten geöffnet
 Available=Verfügbar
 NotYetAvailable=Noch nicht verfügbar
 NotAvailable=Nicht verfügbar
@@ -453,6 +458,7 @@ NextStep=Nächster Schritt
 Datas=Daten
 None=Keine
 NoneF=Keine
+NoneOrSeveral=Keine oder mehrere
 Late=Verspätet
 LateDesc=Verzögerung, die definiert, ob ein Datensatz spät ist oder nicht von der Einrichtung abhängig ist. Fragen Sie den Administrator, die Verzögerung im Menü Startseite - Einrichtung - Alarme
 Photo=Bild
@@ -462,7 +468,7 @@ DeletePicture=Bild löschen
 ConfirmDeletePicture=Bild wirklich löschen?
 Login=Anmeldung
 CurrentLogin=Aktuelle Anmeldung
-EnterLoginDetail=Enter login details
+EnterLoginDetail=Geben Sie die Login-Daten ein
 January=Januar
 February=Februar
 March=März
@@ -521,7 +527,7 @@ ReportPeriod=Berichtszeitraum
 ReportDescription=Beschreibung
 Report=Bericht
 Keyword=Schlüsselwort
-Origin=Origin
+Origin=Ursprung
 Legend=Legende
 Fill=Eintragen
 Reset=Zurücksetzen
@@ -587,7 +593,7 @@ CanBeModifiedIfOk=Änderung möglich falls gültig
 CanBeModifiedIfKo=Änderung möglich falls ungültig
 ValueIsValid=Der Wert ist gültig
 ValueIsNotValid=Der Wert ist ungültig
-RecordCreatedSuccessfully=Record created successfully
+RecordCreatedSuccessfully=Datensatz erfolgreich erstellt
 RecordModifiedSuccessfully=Wert erfolgreich geändert
 RecordsModified=%s Datensätze geändert
 RecordsDeleted=Datensatz %s gelöscht
@@ -600,13 +606,14 @@ SessionName=Sitzungsname
 Method=Methode
 Receive=Erhalten
 CompleteOrNoMoreReceptionExpected=Vollständig oder nichts mehr erwartet
-ExpectedValue=Expected Value
+ExpectedValue=Erwarteter Wert
 CurrentValue=Aktueller Wert
 PartialWoman=Teilweise
 TotalWoman=Vollständig
 NeverReceived=Nie erhalten
 Canceled=Storniert
-YouCanChangeValuesForThisListFromDictionarySetup=Sie können die Listenoptionen in den Stammdaten anpassen
+YouCanChangeValuesForThisListFromDictionarySetup=Sie können die Listenoptionen in den Wörterbuch-Einstellungen anpassen
+YouCanChangeValuesForThisListFrom=Werte für diese Liste können im Menü %s bearbeitet werden
 YouCanSetDefaultValueInModuleSetup=Sie können den Standardwert verwendet setzen, wenn ein neuer Datensatz in der Modulkonfiguration erstellt wird
 Color=Farbe
 Documents=Verknüpfte Dokumente
@@ -623,7 +630,7 @@ CurrentTheme=Aktuelles Design
 CurrentMenuManager=Aktuelle Menüverwaltung
 Browser=Browser
 Layout=Layout
-Screen=Screen
+Screen=Bildschirm
 DisabledModules=Deaktivierte Module
 For=Für
 ForCustomer=Für Kunden
@@ -642,11 +649,12 @@ FreeLineOfType=Freier Texteintrag von Typ
 CloneMainAttributes=Objekt mit Haupteigenschaften duplizieren
 PDFMerge=PDFs verbinden
 Merge=Verbinden
+DocumentModelStandardPDF=Standard PDF Vorlage
 PrintContentArea=Zeige Druckansicht für Seiteninhalt
 MenuManager=Menüverwaltung
 WarningYouAreInMaintenanceMode=Achtung: Die Anwendung befindet sich im Wartungsmodus und kann derzeit nur von Benutzer <b>%s</b> verwendet werden.
 CoreErrorTitle=Systemfehler
-CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
+CoreErrorMessage=Leider ist ein Fehler aufgetreten. Wenden Sie sich an Ihren Systemadministrator, um die Logs zu überprüfen oder deaktivieren Sie die Option $dolibarr_main_prod=1 für weitere Informationen.
 CreditCard=Kredit - Karte
 FieldsWithAreMandatory=Felder mit <b>%s</b> sind Pflichtfelder
 FieldsWithIsForPublic=Felder mit <b>%s</b> werden auf die öffentlich sichtbare Mitgliederliste angezeigt. Deaktivieren Sie bitte den "Öffentlich"-Kontrollkästchen wenn das nicht möchten.\n
@@ -702,12 +710,13 @@ Test=Testen
 Element=Element
 NoPhotoYet=Noch keine Bilder verfügbar
 Dashboard=Startseite
-MyDashboard=My dashboard
+MyDashboard=Meine Startseite
 Deductible=absetzbar
 from=von
 toward=zu
 Access=Zugriff
 SelectAction=Wähle Ereignis
+SelectTargetUser=Zielbenutzer/Mitarbeiter wählen
 HelpCopyToClipboard=Benutze Ctrl+C für Kopie in Zwischenablage
 SaveUploadedFileWithMask=Datei auf dem Server speichern mit dem Namen "<strong>%s</strong>" (oder "%s")
 OriginFileName=Original Dateiname
@@ -718,9 +727,9 @@ ViewPrivateNote=Zeige Hinweise
 XMoreLines=%s Zeile(n) versteckt
 PublicUrl=Öffentliche URL
 AddBox=Box anfügen
-SelectElementAndClickRefresh=Wählen Sie einen Eintrag und klicken Sie aktualisieren
+SelectElementAndClick=Element auswählen und %s anklicken
 PrintFile=Drucke Datei %s
-ShowTransaction=Show entry on bank account
+ShowTransaction=Transaktion auf Bankkonto anzeigen
 GoIntoSetupToChangeLogo=Gehen Sie zu Start - Einstellungen - Firma/Stiftung um das Logo zu ändern oder gehen Sie in Start -> Einstellungen -> Anzeige um es zu verstecken.
 Deny=ablehnen
 Denied=abgelehnt
@@ -735,8 +744,8 @@ Sincerely=Mit freundlichen Grüßen
 DeleteLine=Zeile löschen
 ConfirmDeleteLine=Möchten Sie diese Zeile wirklich löschen?
 NoPDFAvailableForDocGenAmongChecked=In den selektierten Datensätzen war kein PDF zur Erstellung der Dokumente vorhanden.
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
-NoRecordSelected=No record selected
+TooManyRecordForMassAction=Zu viele Datensätze für Massenaktion ausgewählt. Solche Aktionen sind auf maximal %s Zeilen beschränkt.
+NoRecordSelected=Kein Datensatz ausgewählt
 MassFilesArea=Bereich für Dateien aus Massenaktionen
 ShowTempMassFilesArea=Bereich für Dateien aus Massenaktionen zeigen
 RelatedObjects=Verknüpfte Objekte
@@ -748,18 +757,27 @@ BackOffice=Backoffice
 View=Ansicht
 Export=Exportieren
 Exports=Exporte
-ExportFilteredList=Export filtered list
-ExportList=Export list
+ExportFilteredList=Exportiere gefilterte Auswahl
+ExportList=Liste exportieren
 Miscellaneous=Verschiedenes
 Calendar=Terminkalender
-GroupBy=Group by...
-ViewFlatList=View flat list
-RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Direct download link
+GroupBy=Gruppiere nach ...
+ViewFlatList=Listenansicht zeigen
+RemoveString=Entfernen Sie die Zeichenfolge '%s'
+SomeTranslationAreUncomplete=Einige Sprachen sind nur teilweise übersetzt oder enthalten Fehler. Wenn Sie dies feststellen, können Sie die Übersetzungen unter <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a> \nverbessern bzw. ergänzen.
+DirectDownloadLink=Direkter Download Link
 Download=Download
-ActualizeCurrency=Update currency rate
+ActualizeCurrency=Update-Wechselkurs
 Fiscalyear=Fiskalisches Jahr
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Währung festlegen
+BulkActions=Massenaktionen
+ClickToShowHelp=Klicken um die Tooltiphilfe anzuzeigen
+HR=Personalabteilung
+HRAndBank=HR und Bank
+AutomaticallyCalculated=Automatisch berechnet
+TitleSetToDraft=Zurück zu Entwurf gehen
+ConfirmSetToDraft=Wirklich zurück zum Entwurfstatus gehen?
 # Week day
 Monday=Montag
 Tuesday=Dienstag
@@ -796,7 +814,7 @@ Select2NotFound=Kein Ergebnis gefunden
 Select2Enter=Enter
 Select2MoreCharacter=oder mehr Zeichen
 Select2MoreCharacters=oder mehr Zeichen
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharactersMore=<strong>Suchsyntax:</ strong><br /><kbd><strong>|</strong></kbd><kbd>ODER</kbd>(a|b)<br /><kbd><strong>*</strong></kbd><kbd>beliebiges Zeichen</kbd> (a*b)<br /><kbd><strong> ^</strong></kbd><kbd>Beginnt mit</kbd>(^ab)<br /><kbd><strong>$</strong></kbd><kbd>Endet mit</kbd> (ab$)<br />
 Select2LoadingMoreResults=Weitere Ergebnisse werden geladen ...
 Select2SearchInProgress=Suche läuft ...
 SearchIntoThirdparties=Partner
@@ -817,5 +835,3 @@ SearchIntoContracts=Verträge
 SearchIntoCustomerShipments=Kunden Lieferungen
 SearchIntoExpenseReports=Spesenabrechnungen
 SearchIntoLeaves=Urlaube
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/de_DE/members.lang b/htdocs/langs/de_DE/members.lang
index d6819b451c1..eb091095f51 100644
--- a/htdocs/langs/de_DE/members.lang
+++ b/htdocs/langs/de_DE/members.lang
@@ -25,7 +25,7 @@ MembersListUpToDate=Liste freigegebener Mitglieder mit aktuellem Abonnement
 MembersListNotUpToDate=Liste freigegebener Mitglieder mit veraltetem Abonnement
 MembersListResiliated=Liste der deaktivierten Mitglieder
 MembersListQualified=Liste der qualifizierten Mitglieder
-MenuMembersToValidate=Freizugebende Mitglieder
+MenuMembersToValidate=Freizugebende
 MenuMembersValidated=Freigegebene Mitglieder
 MenuMembersUpToDate=Aktuelle Mitglieder
 MenuMembersNotUpToDate=Deaktivierte Mitglieder
@@ -41,17 +41,17 @@ MemberType=Mitgliedsart
 MemberTypeId=ID Mitgliedsart
 MemberTypeLabel=Bezeichnung der Mitgliedsart
 MembersTypes=Mitgliedsarten
-MemberStatusDraft=Entwurf (freizugeben)
-MemberStatusDraftShort=Freizugeben
+MemberStatusDraft=Entwurf (muss noch überprüft werden)
+MemberStatusDraftShort=Scheck
 MemberStatusActive=Freigegebene (Abonnement ausstehend)
-MemberStatusActiveShort=Freigegeben
+MemberStatusActiveShort=Bestätigt
 MemberStatusActiveLate=Abonnement abgelaufen
 MemberStatusActiveLateShort=Abgelaufen
-MemberStatusPaid=Abonnement aktuell
-MemberStatusPaidShort=Aktuell
+MemberStatusPaid=Aktuelle Abonnements
+MemberStatusPaidShort=Aktuelle
 MemberStatusResiliated=Deaktivierte Mitglieder
 MemberStatusResiliatedShort=Deaktiviert
-MembersStatusToValid=Freizugebende Mitglieder
+MembersStatusToValid=Freizugebende
 MembersStatusResiliated=Deaktivierte Mitglieder
 NewCotisation=Neuer Beitrag
 PaymentSubscription=Neue Beitragszahlung
@@ -70,7 +70,7 @@ NoTypeDefinedGoToSetup=Sie haben noch keine Mitgliedsarten definiert. Sie könne
 NewMemberType=Neue Mitgliedsart
 WelcomeEMail=Willkommen E-Mail
 SubscriptionRequired=Abonnement erforderlich
-DeleteType=Mitgliedsart löschen
+DeleteType=Lösche Gruppe
 VoteAllowed=Stimmrecht
 Physical=Natürliche Person
 Moral=Juristische Person
@@ -90,6 +90,7 @@ PublicMemberList=Liste öffentlicher Mitglieder
 BlankSubscriptionForm=Leeres Abonnementformular
 BlankSubscriptionFormDesc=Dolibarr kann Ihnen eine öffentliche URL für externe Besucher anbieten um zu bezahlen. Wenn ein Online-Zahlungsmittel Modul aktiviert ist, wird ein Bezahlformular automatisch bereitgestellt.
 EnablePublicSubscriptionForm=Aktivieren Sie die Freigabe des öffentlichen Abo-Formulars
+ForceMemberType=Mitgliedsart erzwingen
 ExportDataset_member_1=Mitglieder und Abonnements
 ImportDataset_member_1=Mitglieder
 LastMembersModified=%s zuletzt bearbeitete Mitglieder
@@ -127,15 +128,15 @@ NoThirdPartyAssociatedToMember=Mit diesem Mitglied ist kein Partner verknüpft
 MembersAndSubscriptions= Mitglieder und Abonnements
 MoreActions=Ergänzende Erfassungsereignisse
 MoreActionsOnSubscription=Ergänzende Maßnahmen standardmäßig vorgeschlagen bei der Aufnahme eines Abonnements
-MoreActionBankDirect=Create a direct entry on bank account
-MoreActionBankViaInvoice=Create an invoice, and a payment on bank account
+MoreActionBankDirect=Erfassung einer direkten Eingabe auf das Bankkonto oder an Kasse
+MoreActionBankViaInvoice=Erstelle eine Rechnung und eine Zahlung auf das Bankkonto oder an Kasse
 MoreActionInvoiceOnly=Automatisch eine Rechnung (ohne Zahlung) erstellen
 LinkToGeneratedPages=Visitenkarten erstellen
 LinkToGeneratedPagesDesc=Auf dieser Seite können Sie PDF-Dateien mit Visitenkarten Ihrer Mitglieder (auf Wunsch länderspezifisch) erstellen.
 DocForAllMembersCards=Visitenkarten für alle Mitglieder erstellen (Gewähltes Ausgabeformat: <b>%s</b>)
 DocForOneMemberCards=Visitenkarten für ein bestimmtes Mitglied erstellen (Gewähltes Ausgabeformat: <b>%s</b>)
 DocForLabels=Etiketten erstellen (Gewähltes Ausgabeformat: <b>%s</b>)
-SubscriptionPayment=Abo-Zahlung
+SubscriptionPayment=Beitragszahlung 
 LastSubscriptionDate=Letztes Abo-Datum
 LastSubscriptionAmount=Letzter Abo-Betrag
 MembersStatisticsByCountries=Mitgliederstatistik nach Ländern
@@ -150,6 +151,7 @@ MembersByTownDesc=Diese Form zeigt Ihnen die Statistik der Mitglieder nach Städ
 MembersStatisticsDesc=Wählen Sie die gewünschte Statistik aus ...
 MenuMembersStats=Statistik
 LastMemberDate=Letztes Mitgliedsdatum
+LatestSubscriptionDate=Letztes Abo-Datum
 Nature=Art
 Public=Informationen sind öffentlich (Nein = Privat)
 NewMemberbyWeb=Neues Mitgliede hinzugefügt, warte auf Genehmigung.
diff --git a/htdocs/langs/de_DE/other.lang b/htdocs/langs/de_DE/other.lang
index 14edcdb19ed..1b98e1d9e73 100644
--- a/htdocs/langs/de_DE/other.lang
+++ b/htdocs/langs/de_DE/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Geburtstag
 DateToBirth=Geburtsdatum
 BirthdayAlertOn=Geburtstagserinnerung EIN
 BirthdayAlertOff=Geburtstagserinnerung AUS
+TransKey=Übersetzung des Schlüssels TransKey
+MonthOfInvoice=Monat (1-12) des Rechnungsdatum
+TextMonthOfInvoice=Monat (Text) des Rechnungsdatums
+PreviousMonthOfInvoice=Vorangehender Monat (1-12) des Rechnungsdatums
+TextPreviousMonthOfInvoice=Vorangehender Monat (Text) des Rechnungsdatums
+NextMonthOfInvoice=Folgender Monat (1-12) des Rechnungsdatums
+TextNextMonthOfInvoice=Folgender Monat (1-12) des Rechnungsdatum
+ZipFileGeneratedInto=ZIP-Datei erstellt in <b>%s</b>.
+
+YearOfInvoice=Jahr der Rechnung
+PreviousYearOfInvoice=Vorangehendes Jahr des Rechnungsdatums
+NextYearOfInvoice=Folgendes Jahr des Rechnungsdatums
+
 Notify_FICHINTER_ADD_CONTACT=Kontakt zum Serviceauftrag hinzufügen
 Notify_FICHINTER_VALIDATE=Serviceauftrag freigegeben
 Notify_FICHINTER_SENTBYMAIL=Serviceauftrag per E-Mail versendet
@@ -43,7 +56,7 @@ Notify_SHIPPING_SENTBYMAIL=Versanddaten mit E-Mail versendet
 Notify_MEMBER_VALIDATE=Mitglied bestätigt
 Notify_MEMBER_MODIFY=Mitglied bearbeitet
 Notify_MEMBER_SUBSCRIPTION=Mitglied hat unterzeichnet
-Notify_MEMBER_RESILIATE=Member terminated
+Notify_MEMBER_RESILIATE=Mitgliedschaft auflösen
 Notify_MEMBER_DELETE=Mitglied gelöscht
 Notify_PROJECT_CREATE=Projekt-Erstellung
 Notify_TASK_CREATE=Aufgabe erstellt
@@ -61,22 +74,23 @@ PredefinedMailTestHtml=Dies ist ein (HTML)-<b>Test</b> Mail (das Wort Test muss
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nAnbei erhalten Sie die Rechnung  __REF__\n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nBedauerlicherweise ist die Rechnung __REF__ bislang unbeglichen. Zur Erinnerung übersenden wir Ihnen diese nochmals als Anhang.\n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__ \n\n Bitte entnehmen Sie dem Anhang unser Angebot __PROPREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nAnbei erhalten Sie unsere Preisanfrage __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nHier die gewünschte Preisauskunft __REF__\n\n__PERSONALIZED__Mit freundlichen Grüssen\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__ \n\n Bitte entnehmen Sie dem Anhang die Bestellung __ORDERREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ \n\n Bitte entnehmen Sie dem Anhang die Bestellung __ORDERREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nAnbei erhalten Sie die Rechnung  __REF__\n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__ \n\n Als Anlage erhalten Sie unsere Lieferung __ SHIPPINGREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__ \n\n Anbei finden Sie den Serviceauftrag __ FICHINTERREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
+DemoDesc=Dolibarr ist eine Management-Software die mehrere Business-Module anbietet. Eine Demo, die alle Module beinhaltet ist nicht sinnvoll , weil der Fall nie existiert (Hunderte von verfügbaren Module). Es stehen auch einige Demo-Profile Typen zur Verfügung.
 ChooseYourDemoProfil=Bitte wählen Sie das Demo-Profil das Ihrem Anwendgsfall am ehesten entspricht
-ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
+ChooseYourDemoProfilMore=...oder bauen Sie Ihr eigenes Profil <br> (manuelle Auswahl der Module)
 DemoFundation=Verwalten Sie die Mitglieder einer Stiftung
 DemoFundation2=Verwalten Sie die Mitglieder und Bankkonten einer Stiftung
-DemoCompanyServiceOnly=Company or freelance selling service only
+DemoCompanyServiceOnly=Unternehmen oder Freiberufler der nur Leistungen verkauft
 DemoCompanyShopWithCashDesk=Verwalten Sie ein Geschäft mit Kasse
-DemoCompanyProductAndStocks=Company selling products with a shop
-DemoCompanyAll=Company with multiple activities (all main modules)
+DemoCompanyProductAndStocks=Verwalten Sie den Produktverkauf und die Lagerstandsverwaltung eines kleinen oder mittleren Unternehmen
+DemoCompanyAll=Verwalten Sie ein kleines oder mittleres Unternehmen mit mehreren Aktivitäten (alle wesentlichen Module)
 CreatedBy=Erstellt von %s
 ModifiedBy=Bearbeitet von %s
 ValidatedBy=Freigegeben von %s
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Im derzeit gewählten Authentifizierun
 EnableGDLibraryDesc=Installiere oder aktiviere die GD Bibliothek in der PHP Installtion um dieses Option zu verwenden.
 ProfIdShortDesc=<b>Prof ID %s</b> dient zur Speicherung landesabhängiger Partnerdaten. <br> Für das Land <b>%s</b> ist dies beispielsweise Code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM-Demo
-StatsByNumberOfUnits=Statistik der Zahl der Einheiten
-StatsByNumberOfEntities=Statistik der Zahl der Entitäten
-NumberOfProposals=Anzahl Angebote in den letzten 12 Monaten
-NumberOfCustomerOrders=Anzahl Kundenbestellungen in den letzten 12 Monaten
-NumberOfCustomerInvoices=Anzahl Kundenrechnungen in den letzten 12 Monaten
-NumberOfSupplierProposals=Anzahl Lieferantenangebote in den letzten 12 Monaten
-NumberOfSupplierOrders=Anzahl Lieferantenbestellungen in den letzten 12 Monaten
-NumberOfSupplierInvoices=Anzahl Lieferantenrechnungen in den letzten 12 Monaten
-NumberOfUnitsProposals=Anzahl von Einheiten in Angeboten in den letzten 12 Monaten.
-NumberOfUnitsCustomerOrders=Anzahl von Einheiten in Kundenbestellungen in den letzten 12 Monaten.
-NumberOfUnitsCustomerInvoices=Anzahl von Einheiten in Kundenrechnungen in den letzten 12 Monaten.
-NumberOfUnitsSupplierProposals=Anzahl von Einheiten in Lieferantenangeboten in den letzten 12 Monaten.
-NumberOfUnitsSupplierOrders=Anzahl von Einheiten in Lieferantenbestellungen in den letzten 12 Monaten.
-NumberOfUnitsSupplierInvoices=Anzahl von Einheiten in Lieferantenrechnungen in den letzten 12 Monaten.
+StatsByNumberOfUnits=Statistik zu den Totalstückzahlen Produkte/Dienstleistungen
+StatsByNumberOfEntities=Statistik der Zahl der referenzierten Entitäten (Anzahl Rechnungen, Bestellungen, ...)
+NumberOfProposals=Anzahl Angebote
+NumberOfCustomerOrders=Anzahl Kundenbestellungen
+NumberOfCustomerInvoices=Anzahl Kundenrechnungen
+NumberOfSupplierProposals=Anzahl Lieferantenangebote
+NumberOfSupplierOrders=Anzahl Lieferantenbestellungen
+NumberOfSupplierInvoices=Anzahl Lieferantenrechnungen
+NumberOfUnitsProposals=Anzahl von Einheiten in Angeboten
+NumberOfUnitsCustomerOrders=Anzahl von Einheiten in Kundenbestellungen
+NumberOfUnitsCustomerInvoices=Anzahl von Einheiten in Kundenrechnungen
+NumberOfUnitsSupplierProposals=Anzahl von Einheiten in Lieferantenangeboten
+NumberOfUnitsSupplierOrders=Anzahl von Einheiten in Lieferantenbestellungen
+NumberOfUnitsSupplierInvoices=Anzahl von Einheiten in Lieferantenrechnungen
 EMailTextInterventionAddedContact=Ein neuer Serviceauftrag %s wurde Ihnen zugewiesen.
 EMailTextInterventionValidated=Serviceauftrag %s wurde freigegeben
 EMailTextInvoiceValidated=Rechnung %s wurde freigegeben
diff --git a/htdocs/langs/de_DE/paypal.lang b/htdocs/langs/de_DE/paypal.lang
index fb65ba51c9d..c671e384a33 100644
--- a/htdocs/langs/de_DE/paypal.lang
+++ b/htdocs/langs/de_DE/paypal.lang
@@ -16,15 +16,17 @@ ThisIsTransactionId=Die Transaktions ID lautet: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Fügen Sie die Webadresse für Paypal Zahlungen hinzu, wenn Sie ein Dokument per E-Mail versenden.
 PredefinedMailContentLink=Sie können unten auf den sicheren Link klicken, um Ihre Zahlung mit PayPal \n\n %s \n\n zu tätigen
 YouAreCurrentlyInSandboxMode=Sie befinden sich im &quot;Sandbox&quot;-Modus
-NewPaypalPaymentReceived=Neue PayPal-Zahlung erhalten
-NewPaypalPaymentFailed=Neue Paypal-Zahlung probiert, aber fehlgeschlagen
+NewOnlinePaymentReceived=Neue Onlinezahlung erhalten
+NewOnlinePaymentFailed=Neue Onlinezahlung versucht, aber fehlgeschlagen
 PAYPAL_PAYONLINE_SENDEMAIL=Status-E-Mail nach einer Zahlung (erfolgreich oder nicht)
 ReturnURLAfterPayment=Rückkehr-URL nach Zahlung
-ValidationOfPaypalPaymentFailed=Validierung der Paypal-Zahlung gescheitert
-PaypalConfirmPaymentPageWasCalledButFailed=Zahlungsbestätigungsseite für Paypal wurde von Paypal aufgerufen, aber Bestätigung fehlgeschlagen
+ValidationOfOnlinePaymentFailed=Validierung der Onlinezahlung fehlgeschlagen
+PaymentSystemConfirmPaymentPageWasCalledButFailed=Die aufgerufene Zahlungsbestätigungsseite hat einen Fehler zurückgemeldet
 SetExpressCheckoutAPICallFailed=Aufruf des API SetExpressCheckout fehlgeschlagen
 DoExpressCheckoutPaymentAPICallFailed=Aufruf des API DoExpressCheckoutPayment fehlgeschlagen
 DetailedErrorMessage=Detaillierte Fehlermeldung
 ShortErrorMessage=verkürzte Fehlermeldung
 ErrorCode=Fehlercode
 ErrorSeverityCode=Fehlercode Schwierigkeitsgrad
+OnlinePaymentSystem=Online Zahlungssystem
+PaypalLiveEnabled=Paypal live aktiviert (Nicht im Test/Sandbox Modus)
diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang
index fb20acb70bf..90b6ff23c17 100644
--- a/htdocs/langs/de_DE/products.lang
+++ b/htdocs/langs/de_DE/products.lang
@@ -13,23 +13,25 @@ Product=Produkt
 Service=Leistung
 ProductId=Produkt/Leistungs ID
 Create=Erstelle
-Reference=Referenz
+Reference=Nummer
 NewProduct=Neues Produkt
 NewService=Neue Leistung
 ProductVatMassChange=USt-Massenänderung
 ProductVatMassChangeDesc=Mit dieser Seite kann ein Steuersatz für Produkte oder Dienstleistungen von einem Wert auf einen anderen geändert werden. Achtung: Diese Änderung erfolgt über die gesamte Datenbank!
 MassBarcodeInit=Initialisierung Barcodes
 MassBarcodeInitDesc=Hier können Objekte mit einem Barcode initialisiert werden, die noch keinen haben. Stellen Sie vor Benutzung sicher, dass die Einstellungen des Barcode-Moduls vollständig sind!
-ProductAccountancyBuyCode=Buchhaltung - Konto (Anschaffung)
-ProductAccountancySellCode=Buchhaltung - Konto (Verkauf)
+ProductAccountancyBuyCode=Buchhaltungkonto (Anschaffung)
+ProductAccountancySellCode=Buchhaltungkonto (Verkauf)
 ProductOrService=Produkt oder Leistung
 ProductsAndServices=Produkte und Leistungen
 ProductsOrServices=Produkte oder Leistungen
-ProductsOnSell=Produkte für Ein- oder Verkauf
+ProductsOnSaleOnly=Produkte nur für den Verkauf
+ProductsOnPurchaseOnly=Produkte nur für den Einkauf
 ProductsNotOnSell=Produkte weder für Ein- noch Verkauf
 ProductsOnSellAndOnBuy=Produkte für Ein- und Verkauf
-ServicesOnSell=Leistungen für Ein- oder Verkauf
-ServicesNotOnSell=Leistungen nicht für Verkauf
+ServicesOnSaleOnly=Leistungen nur für den Verkauf
+ServicesOnPurchaseOnly=Leistungen nur für den Einkauf
+ServicesNotOnSell=Services weder für Ein- noch Verkauf
 ServicesOnSellAndOnBuy=Leistungen für Ein- und Verkauf
 LastModifiedProductsAndServices=Letzte %s bearbeitete Produkte/Leistungen
 LastRecordedProducts=Letzte %s erfasste Produkte/Leistungen
@@ -60,7 +62,7 @@ SellingPrice=Verkaufspreis
 SellingPriceHT=Verkaufspreis (ohne Steuern)
 SellingPriceTTC=Verkaufspreis (inkl. USt.)
 CostPriceDescription=Der Preis (netto, ohne Steuern) kann dafür verwendet werden, die durchschnittlichen Kosten dieses Artikel zu speichern. Es kann jeder Preis verwendet werden, der kalkuliert wurde, z. B. der durchschnittliche Einkaufspreis plus durchschnittliche Produktions- und Vertriebskosten.
-CostPriceUsage=This value could be used for margin calculation.
+CostPriceUsage=Dieser Wert könnte für Margenberechnung genutzt werden.
 SoldAmount=Verkaufte Menge
 PurchasedAmount=angeschaffte Menge
 NewPrice=Neuer Preis
@@ -91,7 +93,7 @@ NoteNotVisibleOnBill=Anmerkung (nicht sichtbar auf Rechnungen, Angeboten,...)
 ServiceLimitedDuration=Ist die Erbringung einer Dienstleistung zeitlich beschränkt:
 MultiPricesAbility=Mehrere Preissegmente pro Produkt/Leistung (Jeder Kunde ist einem Segment zugeordnet)
 MultiPricesNumPrices=Anzahl Preise
-AssociatedProductsAbility=Activate the feature to manage virtual products
+AssociatedProductsAbility=Aktiviere die Funktion, um virtuelle Produkte zu verwalten
 AssociatedProducts=Unterprodukte
 AssociatedProductsNumber=Anzahl der Unterprodukte
 ParentProductsNumber=Anzahl der übergeordneten Produkte
@@ -103,7 +105,7 @@ KeywordFilter=Stichwortfilter
 CategoryFilter=Kategoriefilter
 ProductToAddSearch=Suche hinzuzufügendes Produkt
 NoMatchFound=Kein Eintrag gefunden
-ListOfProductsServices=List of products/services
+ListOfProductsServices=Liste der Produkte/Leistungen
 ProductAssociationList=Liste der Produkte/Leistungen die Komponenten von diesem Virtuellen Produkt sind
 ProductParentList=Liste der Produkte / Dienstleistungen mit diesem Produkt als ein Bestandteil
 ErrorAssociationIsFatherOfThis=Eines der ausgewählten Produkte ist Elternteil des aktuellen Produkts
@@ -142,7 +144,7 @@ ConfirmCloneProduct=Möchten Sie ddas Produkt/service <b>%s</b> wirklich duplizi
 CloneContentProduct=Allgemeine Informationen des Produkts/Leistungen duplizieren
 ClonePricesProduct=Allgemeine Informationen und Preise duplizieren
 CloneCompositionProduct=Dupliziere Produkt-/Leistungszusammenstellung
-CloneCombinationsProduct=Clone product variants
+CloneCombinationsProduct=Dupliziere Produkt-Variante
 ProductIsUsed=Produkt in Verwendung
 NewRefForClone=Artikelnummer neues Produkt/Leistung
 SellingPrices=Verkaufspreis
@@ -175,6 +177,18 @@ m2=m²
 m3=m³
 liter=Liter
 l=L
+unitP=Stück
+unitSET=Set
+unitS=Zweitens
+unitH=Stunden
+unitD=Tag
+unitKG=Kilo
+unitG=Gramm
+unitM=Meter
+unitLM=Laufmeter
+unitM2=Quadratmeter
+unitM3=Kubikmeter
+unitL=Liter
 ProductCodeModel=Vorlage für Produktreferenz
 ServiceCodeModel=Vorlage für Dienstleistungsreferenz
 CurrentProductPrice=Aktueller Preis
@@ -186,6 +200,7 @@ MultipriceRules=Regeln der Preisstufen
 UseMultipriceRules=Verwende Preissegmentregeln (Im Produkt Modul Setup definiert) um automatisch Preise für alle anderen Segmente anhand des ersten Segmentes zu berechnen
 PercentVariationOver=%%  Veränderung über %s
 PercentDiscountOver=%% Nachlass über %s
+KeepEmptyForAutoCalculation=Leer lassen um den Wert basierend auf Gewicht oder Volumen der Produkte automatisch zu berechnen
 ### composition fabrication
 Build=Produzieren
 ProductsMultiPrice=Produkte und Preise für jedes Preissegment
@@ -208,7 +223,7 @@ DefinitionOfBarCodeForProductNotComplete=Barcode-Typ oder -Wert bei Produkt %s u
 DefinitionOfBarCodeForThirdpartyNotComplete=Barcode-Typ oder -Wert beim Partner %s unvollständig.
 BarCodeDataForProduct=Barcode-Information von Produkt %s:
 BarCodeDataForThirdparty=Barcode-Information vom Partner %s:
-ResetBarcodeForAllRecords=Define barcode value for all record (this will also reset barcode value already defined with new values)
+ResetBarcodeForAllRecords=Definiere Barcode-Wert für alle Datensätze (dies überschreibt auch bereits definierte Barcodes mit neuen Werten!)
 PriceByCustomer=unterschiedliche Preise für jeden Kunden
 PriceCatalogue=Ein einziger Preis pro Produkt/Leistung
 PricingRule=Preisregel für Kundenpreise
@@ -239,7 +254,7 @@ GlobalVariables=Globale Variablen
 VariableToUpdate=Variable, die aktualisiert wird
 GlobalVariableUpdaters=Globale Variablen aktualisieren
 UpdateInterval=Update-Intervall (Minuten)
-LastUpdated=Latest update
+LastUpdated=Zuletzt aktualisiert
 CorrectlyUpdated=erfolgreich aktualisiert
 PropalMergePdfProductActualFile=verwendete Dateien, um in PDF Azur hinzuzufügen sind / ist
 PropalMergePdfProductChooseFile=Wähle PDF-Dateien
@@ -259,41 +274,47 @@ VolumeUnits=Einheit Volumen
 SizeUnits=Einheit Größe
 DeleteProductBuyPrice=Einkaufspreis löschen
 ConfirmDeleteProductBuyPrice=Möchten Sie diesen Einkaufspreis wirklich löschen?
-SubProduct=Sub product
+SubProduct=Unterprodukt
+ProductSheet=Datenblatt
+ServiceSheet=Wartungsblatt
 
 #Attributes
-VariantAttributes=Variant attributes
-ProductAttributes=Variant attributes for products
-ProductAttributeName=Variant attribute %s
-ProductAttribute=Variant attribute
-ProductAttributeDeleteDialog=Are you sure you want to delete this attribute? All values will be deleted
-ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with reference "%s" of this attribute?
-ProductCombinationDeleteDialog=Are you sure want to delete the variant of the product "<strong>%s</strong>"?
-ProductCombinationAlreadyUsed=There was an error while deleting the variant. Please check it is not being used in any object
-ProductCombinations=Variants
-HideProductCombinations=Hide products variant in the products selector
-ProductCombination=Variant
-NewProductCombination=New variant
-EditProductCombination=Editing variant
-ProductCombinationGenerator=Variants generator
-Features=Features
-PriceImpact=Price impact
-WeightImpact=Weight impact
+VariantAttributes=Variante Attribute
+ProductAttributes=Attribute der Varianten für Produkte
+ProductAttributeName=Attribut der Variante %s
+ProductAttribute=Attribut Variante
+ProductAttributeDeleteDialog=Sind Sie sicher, dass Sie dieses Attribut entfernen möchten? Alle Werte werden gelöscht werden
+ProductAttributeValueDeleteDialog=Sind Sie sicher, dass Sie den Wert „%s“ mit der Nummer „%s“ von diesem Attribut löschen möchten?
+ProductCombinationDeleteDialog=Sind Sie sicher, dass Sie die Variante von diesem Produkt „<strong>%s</strong>“ löschen möchten?
+ProductCombinationAlreadyUsed=Es ist ein Fehler während dem löschen der Variante aufgetreten. Stellen Sie sicher, dass es nicht durch ein anderes Objekt verwendet wird .
+ProductCombinations=Varianten
+PropagateVariant=Propagate variants
+HideProductCombinations=Ausblenden von Produkt-Varianten in den Produktauswahl-Listen
+ProductCombination=Variante
+NewProductCombination=Neue Variante
+EditProductCombination=Variante bearbeiten
+NewProductCombinations=Neue Varianten
+EditProductCombinations=Varianten bearbeiten
+SelectCombination=Kombination wählen
+ProductCombinationGenerator=Varianten-Generator
+Features=Funktionen
+PriceImpact=Auswirkungen auf die Preise
+WeightImpact=Auswirkungen auf Gewicht
 NewProductAttribute=Neues Attribut
-NewProductAttributeValue=New attribute value
-ErrorCreatingProductAttributeValue=There was an error while creating the attribute value. It could be because there is already an existing value with that reference
-ProductCombinationGeneratorWarning=If you continue, before generating new variants, all previous ones will be DELETED. Already existing ones will be updated with the new values
-TooMuchCombinationsWarning=Generating lots of variants may result in high CPU, memory usage and Dolibarr not able to create them. Enabling the option "%s" may help reduce memory usage.
-DoNotRemovePreviousCombinations=Do not remove previous variants
-UsePercentageVariations=Use percentage variations
-PercentageVariation=Percentage variation
-ErrorDeletingGeneratedProducts=There was an error while trying to delete existing product variants
-NbOfDifferentValues=Nb of different values
-NbProducts=Nb. of products
-ParentProduct=Parent product
-HideChildProducts=Hide child products
-ConfirmCloneProductCombinations=Would you like to copy all the product variant to the product with the given reference?
-CloneDestinationReference=Destination product reference
-ErrorCopyProductCombinations=There was an error while copying the product variants
-ErrorDestinationProductNotFound=Destination product not found
-ErrorProductCombinationNotFound=Product variant not found
+NewProductAttributeValue=Wert des neuen Attributs
+ErrorCreatingProductAttributeValue=Es ist ein Fehler bei der Erstellung des Wertes dieses Attributes aufgetreten . \nEin Wert der gleichen Nr./Ref.  wurde bereits registriert
+ProductCombinationGeneratorWarning=Wenn Sie vor der Generierung von neuen Varianten fortsetzen, werden alle vorherigen Versionen GELÖSCHT werden.  Es werden nur bestehende Varianten mit den neuen Werten aktualisiert werden.
+TooMuchCombinationsWarning=Die Erzeugung von vielen Varianten kann den Prozessor und Speicher verlangsamen. Dolibarr ist dabei vielleicht nicht in der Lage, diese zu erstellen. Das Aktivieren dieser Option „%s“ hilft den Speicherverbrauch zu reduzieren.
+DoNotRemovePreviousCombinations=Löschen Sie nicht vorhandene Varianten
+UsePercentageVariations=Verwende die prozentuale Veränderung
+PercentageVariation=prozentuale Varianten
+ErrorDeletingGeneratedProducts=Es gab einen Fehler, während Produkt Varianten entfernt wurden
+NbOfDifferentValues=Anz. verschiedene Werte
+NbProducts=Anzahl Produkte
+ParentProduct=Übergeordnetes Produkt
+HideChildProducts=Produktvarianten ausblenden
+ConfirmCloneProductCombinations=Sollen alle Produktvarianten zum anderen Produkt mit der gegebenen Referenz kopiert werden?
+CloneDestinationReference=Empfangsort Nr.
+ErrorCopyProductCombinations=Es gab einen Fehler, während Produkt Varianten kopiert wurden
+ErrorDestinationProductNotFound=Zielprodukt nicht gefunden 
+ErrorProductCombinationNotFound=Produktvariante nicht gefunden
diff --git a/htdocs/langs/de_DE/projects.lang b/htdocs/langs/de_DE/projects.lang
index c4f11d0b4b0..15e0635f7a9 100644
--- a/htdocs/langs/de_DE/projects.lang
+++ b/htdocs/langs/de_DE/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Projektübersicht
 ProjectStatus=Projekt Status
 SharedProject=Jeder
 PrivateProject=Projektkontakte
+ProjectsImContactFor=Projects I'm explicitely a contact of
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=Alle Projekte
 MyProjectsDesc=Diese Ansicht zeigt nur Projekte, bei welchen Sie als Kontakt (unabhängig vom Typ) hinzugefügt sind.
 ProjectsPublicDesc=Diese Ansicht zeigt alle Projekte, für die Sie zum Lesen berechtigt sind.
 TasksOnProjectsPublicDesc=Diese Ansicht zeigt alle Aufgaben der Projekte, für die Sie zum Lesen berechtigt sind.
@@ -20,23 +23,25 @@ OnlyOpenedProject=Nur offene Projekte sind sichtbar. (Projekte im Status Entwurf
 ClosedProjectsAreHidden=Abgeschlossene Projekte werden nicht angezeigt.
 TasksPublicDesc=Diese Ansicht ist beschränkt auf Projekt und Aufgaben bei welchen Sie über Leserechte verfügen.
 TasksDesc=Diese Ansicht zeigt alle Projekte und Aufgaben (Ihre Benutzerberechtigungen berechtigt Sie alles zu sehen).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
-ImportDatasetTasks=Tasks of projects
+AllTaskVisibleButEditIfYouAreAssigned=Alle Aufgaben dieser Projekte sind sichtbar, aber Sie können nur auf ihnen zugewiesenen Aufgaben Zeit erfassen. Weisen Sie sich die Aufgabe zu, wenn sie Zeiten erfassen müssen.
+OnlyYourTaskAreVisible=Nur Ihnen zugewiesene Aufgaben sind sichtbar. Weisen Sie sich die Aufgabe zu, wenn Sie Zeiten auf der Aufgabe erfassen müssen.
+ImportDatasetTasks=Aufgaben der Projekte
+ProjectCategories=Project tags/categories
 NewProject=Neues Projekt
 AddProject=Projekt erstellen
 DeleteAProject=Löschen eines Projekts
 DeleteATask=Löschen einer Aufgabe
-ConfirmDeleteAProject=Are you sure you want to delete this project?
-ConfirmDeleteATask=Are you sure you want to delete this task?
+ConfirmDeleteAProject=Sind Sie sicher, dass diese Vertragsposition löschen wollen?
+ConfirmDeleteATask=Sind Sie sicher, dass diese Aufgabe löschen wollen?
 OpenedProjects=Offene Projekte
-OpenedTasks=Geöffnete Aufgaben
-OpportunitiesStatusForOpenedProjects=Chancen nach Projektstatus
+OpenedTasks=Offene Aufgaben
+OpportunitiesStatusForOpenedProjects=Betrag Verkaufschancen offene Projekt nach Status
 OpportunitiesStatusForProjects=Betrag Verkaufschancen pro Projekt nach Status
 ShowProject=Zeige Projekt
 SetProject=Projekt setzen
 NoProject=Kein Projekt definiert oder keine Rechte
 NbOfProjects=Anzahl der Projekte
+NbOfTasks=Nb of tasks
 TimeSpent=Zeitaufwand
 TimeSpentByYou=Ihr Zeitaufwand
 TimeSpentByUser=Zeitaufwand von Benutzer ausgegeben
@@ -47,9 +52,9 @@ TaskTimeSpent=Zeitaufwände für Aufgaben
 TaskTimeUser=Benutzer
 TaskTimeNote=Hinweis
 TaskTimeDate=Datum
-TasksOnOpenedProject=Aufgaben für offenes Projekt
+TasksOnOpenedProject=Aufgaben in offenen Projekten
 WorkloadNotDefined=Arbeitsaufwand nicht definiert
-NewTimeSpent=Neuer Zeitaufwand
+NewTimeSpent=Zeitaufwände
 MyTimeSpent=Mein Zeitaufwand
 Tasks=Aufgaben
 Task=Aufgabe
@@ -58,7 +63,8 @@ TaskDateEnd=Enddatum der Aufgabe
 TaskDescription=Aufgaben-Beschreibung
 NewTask=Neue Aufgabe
 AddTask=Aufgabe erstellen
-AddTimeSpent=Create time spent
+AddTimeSpent=Erfassen verbrauchte Zeit 
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Tätigkeit
 Activities=Aufgaben/Tätigkeiten
 MyActivities=Meine Aufgaben/Tätigkeiten
@@ -72,12 +78,13 @@ ListOfTasks=Aufgabenliste
 GoToListOfTimeConsumed=Liste der verwendeten Zeit aufrufen
 GoToListOfTasks=Liste der Aufgaben aufrufen
 ListProposalsAssociatedProject=Liste Angebote, die mit diesem Projekt verknüpft sind
-ListOrdersAssociatedProject=List of customer orders associated with the project
-ListInvoicesAssociatedProject=List of customer invoices associated with the project
-ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
-ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
-ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
+ListOrdersAssociatedProject=Liste der mit diesem Projekt verbundenen Kunden-Bestellungen
+ListInvoicesAssociatedProject=Liste der mit diesem Projekt verbundenen Kunden-Rechnungen
+ListPredefinedInvoicesAssociatedProject=Liste von Rechnungsvorlagen, die mit diesem Projekt verknüpft sind.
+ListSupplierOrdersAssociatedProject=Liste der mit diesem Projekt verbundenen Lieferantenbestellungen
+ListSupplierInvoicesAssociatedProject=Liste der mit diesem Projekt verbundenen Lieferantenrechnungen
 ListContractAssociatedProject=Liste Verträge, die mit diesem Projekt verknüpft sind
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=Liste der Serviceaufträge, die mit diesem Projekt verknüpft sind
 ListExpenseReportsAssociatedProject=Liste Spesenabrechnungen, die mit diesem Projekt verknüpft sind
 ListDonationsAssociatedProject=Liste Spenden, die mit diesem Projekt verknüpft sind
@@ -93,24 +100,25 @@ NotOwnerOfProject=Nicht Eigner des privaten Projekts
 AffectedTo=Zugewiesen an
 CantRemoveProject=Löschen des Projekts auf Grund verbundener Elemente (Rechnungen, Bestellungen oder andere) nicht möglich. Näheres finden Sie unter dem Reiter Bezugnahmen.
 ValidateProject=Projekt freigeben
-ConfirmValidateProject=Are you sure you want to validate this project?
+ConfirmValidateProject=Möchten Sie dieses Projekt wirklich freigeben?
 CloseAProject=Projekt schließen
-ConfirmCloseAProject=Are you sure you want to close this project?
-AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
+ConfirmCloseAProject=Möchten Sie dieses Projekt wirklich schließen?
+AlsoCloseAProject=Das Projekt auch schließen (lassen Sie es offen, wenn Sie noch Produktions-Aufgaben laufen haben)
 ReOpenAProject=Projekt öffnen
-ConfirmReOpenAProject=Are you sure you want to re-open this project?
+ConfirmReOpenAProject=Möchten Sie dieses Projekt wirklich wiedereröffnen?
 ProjectContact=Projekt Kontakte
 ActionsOnProject=Projektaktionen
 YouAreNotContactOfProject=Sie sind diesem privaten Projekt nicht als Kontakt zugeordnet.
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Lösche einen Zeitaufwand
-ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
+ConfirmDeleteATimeSpent=Sind Sie sicher, dass diesen Zeitaufwand löschen wollen?
 DoNotShowMyTasksOnly=Zeige auch die Aufgaben der Anderen
 ShowMyTasksOnly=Zeige nur meine Aufgaben
 TaskRessourceLinks=Ressourcen
 ProjectsDedicatedToThisThirdParty=Mit diesem Partner verknüpfte Projekte
 NoTasks=Keine Aufgaben für dieses Projekt
 LinkedToAnotherCompany=Mit Partner verknüpft
-TaskIsNotAffectedToYou=Aufgabe nicht Ihnen zugeordnet
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=Zeitaufwand ist leer
 ThisWillAlsoRemoveTasks=Diese Aktion löscht ebenfalls alle Aufgaben zum Projekt (<b>%s</b> aktuelle Aufgaben) und alle Zeitaufwände.
 IfNeedToUseOhterObjectKeepEmpty=Wenn einige Zuordnungen (Rechnung, Bestellung, ...), einem Dritten gehören, müssen Sie erst alle mit dem Projekt verbinden, damit das Projekt auch Dritten zugänglich ist .
@@ -120,13 +128,13 @@ CloneContacts=Dupliziere Kontakte
 CloneNotes=Dupliziere Hinweise
 CloneProjectFiles=Dupliziere verbundene Projektdateien
 CloneTaskFiles=Aufgabe(n) duplizieren beigetreten Dateien (falls Aufgabe (n) dupliziert)
-CloneMoveDate=Update project/tasks dates from now?
-ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Change task dates according to new project start date
+CloneMoveDate=Datum des Projekts / der Aufgaben zum aktuellen Zeitpunkt aktualisieren?
+ConfirmCloneProject=Möchten Sie dieses Projekt wirklich duplizieren?
+ProjectReportDate=Passe Aufgaben-Datum dem neuen Projekt-Startdatum an
 ErrorShiftTaskDate=Es ist nicht möglich, das Aufgabendatum dem neuen Projektdatum anzupassen
 ProjectsAndTasksLines=Projekte und Aufgaben
 ProjectCreatedInDolibarr=Projekt %s erstellt
-ProjectModifiedInDolibarr=Project %s modified
+ProjectModifiedInDolibarr=Projekt %s geändert
 TaskCreatedInDolibarr=Aufgabe %s erstellt
 TaskModifiedInDolibarr=Aufgabe %s geändert
 TaskDeletedInDolibarr=Aufgabe %s gelöscht
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Benutzer eine Ressource pro Aufgabe zuordnen, um
 InputPerDay=Eingang pro Tag
 InputPerWeek=Eingang pro Woche
 InputPerAction=Eingang pro Aktion
-TimeAlreadyRecorded=Zeitaufwand für diese Aufgabe/Tag und Benutzer %s bereits aufgenommen
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projekte mit diesem Anwender als Kontakt
 TasksWithThisUserAsContact=Aufgaben zugeordnet zu diesem Anwender
 ResourceNotAssignedToProject=Zugewiesen zu Projekt
 ResourceNotAssignedToTheTask=nicht der Aufgabe zugewiesen
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Aufgabe mir selbst zuweisen
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Zuweisen
 ProjectOverview=Projekt-Übersicht
 ManageTasks=Verwende Projekte um Aufgaben und Zeitaufwand zu verwalten
 ManageOpportunitiesStatus=Verwende Projekte um Leads und Chancen zu verwalten
 ProjectNbProjectByMonth=Anzahl der Projekte pro Monat
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Betrag der Verkaufschancen pro Monat
 ProjectWeightedOppAmountOfProjectsByMonth=gewichteter Betrag der Verkaufschancen pro Monat
 ProjectOpenedProjectByOppStatus=Offene Projekte/Verkaufschancen nach Status
 ProjectsStatistics=Statistik über Projekte und Leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Aufgabe zugewiesen. Eingabe der Zeit zu diese Aufgabe sollte möglich sein.
 IdTaskTime=ID Zeit Aufgabe
 YouCanCompleteRef=Wenn Sie die Referenz mit Infromationen vervollständigen möchten (um diese als Suchfilter zu verwenden), wird empfohlen ein Trennzeichen einzusetzen, damit den Nummernkreis der zukünftigen Projekten weiterhin korrekt funktioniert. Zum Beispiel  %s-ABC. Sie können aber auch in den Label Suchbegriffe hinzufügen. Ein bewährtes Verfahren besteht darin, ein dedizierter Feld einzufügen, bekannt unter dem Begriff ergänzenden Attributen.
-OpenedProjectsByThirdparties=Offene Projekte nach Partner
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=nur Verkaufschancen
-OpenedOpportunitiesShort=geöffnete Verkaufschancen
+OpenedOpportunitiesShort=Offene Verkaufschancen
 NotAnOpportunityShort=keine Verkaufschance
 OpportunityTotalAmount=Verkaufschancen Gesamtbetrag
 OpportunityPonderatedAmount=Verkaufschancen geschätzter Betrag
diff --git a/htdocs/langs/de_DE/sendings.lang b/htdocs/langs/de_DE/sendings.lang
index 35a972f7a8d..6a3f0d09ad9 100644
--- a/htdocs/langs/de_DE/sendings.lang
+++ b/htdocs/langs/de_DE/sendings.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - sendings
-RefSending=Versandnr.
+RefSending=Versand-Nr.
 Sending=Auslieferung
 Sendings=Auslieferungen
 AllSendings=Alle Lieferungen
@@ -18,13 +18,13 @@ SendingCard=Lieferung - Karte
 NewSending=Neue Auslieferung
 CreateShipment=Auslieferung erstellen
 QtyShipped=Liefermenge
-QtyPreparedOrShipped=Qty prepared or shipped
+QtyPreparedOrShipped=Menge vorbereitet oder versendet
 QtyToShip=Versandmenge
 QtyReceived=Erhaltene Menge
-QtyInOtherShipments=Qty in other shipments
+QtyInOtherShipments=Menge in anderen Lieferungen
 KeepToShip=Zum Versand behalten
 OtherSendingsForSameOrder=Weitere Lieferungen zu dieser Bestellung
-SendingsAndReceivingForSameOrder=Shipments and receipts for this order
+SendingsAndReceivingForSameOrder=Warenerhalt und Versand dieser Bestellung
 SendingsToValidate=Freizugebende Auslieferungen
 StatusSendingCanceled=Storniert
 StatusSendingDraft=Entwurf
@@ -37,13 +37,12 @@ SendingSheet=Auslieferungen
 ConfirmDeleteSending=Möchten Sie diesen Versand wirklich löschen?
 ConfirmValidateSending=Möchten Sie diesen Versand mit der referenz <b>%s</b> wirklich freigeben?
 ConfirmCancelSending=Möchten Sie diesen Versand wirklich abbrechen?
-DocumentModelSimple=Einfache Dokumentvorlage
 DocumentModelMerou=Merou A5-Modell
 WarningNoQtyLeftToSend=Achtung, keine Produkte für den Versand
 StatsOnShipmentsOnlyValidated=Versandstatistik (nur freigegebene). Das Datum ist das der Freigabe (geplantes Lieferdatum ist nicht immer bekannt).
 DateDeliveryPlanned=Geplanter Liefertermin
-RefDeliveryReceipt=Ref delivery receipt
-StatusReceipt=Status delivery receipt
+RefDeliveryReceipt=Lieferschein-Nr.
+StatusReceipt=Der Status des Lieferschein
 DateReceived=Datum der Zustellung
 SendShippingByEMail=Versand per E-Mail
 SendShippingRef=Versendung der Auslieferung %s
@@ -51,10 +50,10 @@ ActionsOnShipping=Hinweis zur Lieferung
 LinkToTrackYourPackage=Link zur Paket- bzw. Sendungsverfolgung
 ShipmentCreationIsDoneFromOrder=Lieferscheine müssen aus einer Bestellung generiert werden
 ShipmentLine=Zeilen Lieferschein
-ProductQtyInCustomersOrdersRunning=Produktmenge in geöffneter Kunden Bestellungen
-ProductQtyInSuppliersOrdersRunning=Produktmenge in geöffneter Lieferantenbestellungen
-ProductQtyInShipmentAlreadySent=Produktmenge von offenem Kundenauftrag bereits geliefert
-ProductQtyInSuppliersShipmentAlreadyRecevied=Produktmenge aus Lieferantenbestellung bereits erhalten
+ProductQtyInCustomersOrdersRunning=Produktmenge in offenen Kundenbestellungen
+ProductQtyInSuppliersOrdersRunning=Produktmenge in offenen Lieferantenbestellungen
+ProductQtyInShipmentAlreadySent=Bereits gelieferte Produktmenge aus offenem Kundenauftrag
+ProductQtyInSuppliersShipmentAlreadyRecevied=Bereits erhaltene Produktmenge aus Lieferantenbestellung
 NoProductToShipFoundIntoStock=Kein Artikel zum Versenden gefunden im Lager <b>%s</b>. Korrigieren Sie den Lagerbestand oder wählen Sie ein anderes Lager.
 WeightVolShort=Gew./Vol.
 ValidateOrderFirstBeforeShipment=Sie müssen den Auftrag erst bestätigen bevor Sie eine Lieferung machen können.
diff --git a/htdocs/langs/de_DE/stocks.lang b/htdocs/langs/de_DE/stocks.lang
index 19ac89e8c91..76c6d5e83d7 100644
--- a/htdocs/langs/de_DE/stocks.lang
+++ b/htdocs/langs/de_DE/stocks.lang
@@ -2,7 +2,7 @@
 WarehouseCard=Warenlager - Karte
 Warehouse=Warenlager
 Warehouses=Warenlager
-ParentWarehouse=Parent warehouse
+ParentWarehouse=Übergeordnetes Lager
 NewWarehouse=Neues Warenlager
 WarehouseEdit=Warenlager bearbeiten
 MenuNewWarehouse=Neues Warenlager
@@ -22,15 +22,15 @@ Movements=Lagerbewegungen
 ErrorWarehouseRefRequired=Warenlager-Referenz erforderlich
 ListOfWarehouses=Liste der Warenlager
 ListOfStockMovements=Liste der Lagerbewegungen
-StockMovementForId=Movement ID %d
-ListMouvementStockProject=List of stock movements associated to project
+StockMovementForId=Lagerbewegung Nr. %d
+ListMouvementStockProject=Lagerbewegungen für Projekt
 StocksArea=Warenlager - Übersicht
 Location=Standort
 LocationSummary=Kurzbezeichnung Standort
 NumberOfDifferentProducts=Anzahl unterschiedlicher Produkte
 NumberOfProducts=Anzahl der Produkte
-LastMovement=Latest movement
-LastMovements=Latest movements
+LastMovement=Letzte Bewegung
+LastMovements=Letzte Bewegungen
 Units=Einheiten
 Unit=Einheit
 StockCorrection=Lagerstandsanpassung
@@ -42,7 +42,7 @@ LabelMovement=Lagerbewegungs-Etikett
 NumberOfUnit=Anzahl der Einheiten
 UnitPurchaseValue=Einkaufspreis pro Stück
 StockTooLow=Mindestbestand unterschritten
-StockLowerThanLimit=Bestand unterhalb der Mindestbestandsmenge
+StockLowerThanLimit=Lagerbestand unterhalb der Mindestbestandsmenge ( %s )
 EnhancedValue=Warenwert
 PMPValue=Gewichteter Warenwert
 PMPValueShort=DSWP
@@ -62,7 +62,7 @@ DeStockOnShipment=Verringere reale Bestände bei Bestädigung von Lieferungen
 DeStockOnShipmentOnClosing=Verringere Lagerbestände beim Schließen der Versanddokumente
 ReStockOnBill=Erhöhung der tatsächlichen Bestände in den Rechnungen / Gutschriften
 ReStockOnValidateOrder=Erhöhung der realen Bestände auf Bestellungen stellt fest
-ReStockOnDispatchOrder=Erhöhe Warenbestände bei manueller Lieferung in das Lager, nachdem die Bestellung eingegangen ist.
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
 OrderStatusNotReadyToDispatch=Auftrag wurde noch nicht oder nicht mehr ein Status, der Erzeugnisse auf Lager Hallen Versand ermöglicht.
 StockDiffPhysicTeoric=Begründung für Differenz  zwischen Inventurbestand und Lagerbestand
 NoPredefinedProductToDispatch=Keine vordefinierten Produkte für dieses Objekt. Also kein Versand im Lager erforderlich ist.
@@ -71,7 +71,10 @@ StockLimitShort=Grenzwert für Alarm
 StockLimit=Mindestbestand vor Warnung
 PhysicalStock=Istbestand
 RealStock=Realer Lagerbestand
+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=Theoretisches Warenlager
+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, ...)
 IdWarehouse=Warenlager ID
 DescWareHouse=Beschreibung Warenlager
 LieuWareHouse=Standort Warenlager
@@ -116,7 +119,7 @@ NbOfProductBeforePeriod=Menge des Produkts %s im Lager vor der gewählten Period
 NbOfProductAfterPeriod=Menge des Produkts %s im Lager nach der gewählten Periode (> %s)
 MassMovement=Massenbewegung
 SelectProductInAndOutWareHouse=Wählen Sie ein Produkt, eine Menge, ein Quellen- und ein Ziel-Lager und klicken Sie dann auf "%s". Sobald Sie dies für alle erforderlichen Bewegungen getan haben, klicken Sie auf "%s".
-RecordMovement=Eintrag verschoben
+RecordMovement=Umbuchung
 ReceivingForSameOrder=Empfänger zu dieser Bestellung
 StockMovementRecorded=aufgezeichnete Lagerbewegungen
 RuleForStockAvailability=Regeln für Bestands-Verfügbarkeit
@@ -135,7 +138,7 @@ InventoryCodeShort=Inv. / Mov. Kode
 NoPendingReceptionOnSupplierOrder=Keine anstehenden Liefereingänge aufgrund offener Lieferantenbestellungen
 ThisSerialAlreadyExistWithDifferentDate=Diese Charge / Seriennummer (<strong>%s</strong>) ist bereits vorhanden, jedoch mit unterschiedlichen Haltbarkeits- oder Verfallsdatum. \n(Gefunden: <strong>%s</strong> Erfasst: <strong>%s</strong>) 
 OpenAll=Verfügbar für alle Aktionen
-OpenInternal=Open only for internal actions
+OpenInternal=Verfügbar für interne Aktionen
 UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on supplier order reception
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
 ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
@@ -143,3 +146,50 @@ ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock cor
 ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock correctly deleted
 AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock
 AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
+InventoryDate=Inventardatum
+NewInventory=Neues inventar
+inventorySetup = Inventar einrichten
+inventoryCreatePermission=Neue Inventur erstellen
+inventoryReadPermission=Inventar anzeigen
+inventoryWritePermission=Inventar aktualisieren
+inventoryValidatePermission=Validate inventory
+inventoryTitle=Inventar
+inventoryListTitle=Inventuren
+inventoryListEmpty=Keine Inventarisierung in Arbeit
+inventoryCreateDelete=Inventar erstellen/löschen
+inventoryCreate=Neu erstellen
+inventoryEdit=Bearbeiten
+inventoryValidate=Bestätigt
+inventoryDraft=In Arbeit
+inventorySelectWarehouse=Lager auswählen
+inventoryConfirmCreate=Erstelle
+inventoryOfWarehouse=Inventar für Lager: %s
+inventoryErrorQtyAdd=Fehler: Menge ist <= 0
+inventoryMvtStock=By Inventar
+inventoryWarningProductAlreadyExists=Dieses Produkt ist schon in der Liste
+SelectCategory=Kategoriefilter
+SelectFournisseur=Filter nach Lieferant
+inventoryOnDate=Inventur
+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 mouvment have date of inventory
+inventoryChangePMPPermission=Allow to change PMP value for a product
+ColumnNewPMP=New unit PMP
+OnlyProdsInStock=Fügen sie kein Produkt ohne Bestand hinzu
+TheoricalQty=Sollmenge
+TheoricalValue=Sollmenge
+LastPA=Letzer Einstandpreis
+CurrentPA=Aktueller Einstandspreis
+RealQty=Echte Menge
+RealValue=Echter Wert
+RegulatedQty=Regulated Qty
+AddInventoryProduct=Produkt zu Inventar hinzufügen
+AddProduct=Hinzufügen
+ApplyPMP=Apply PMP
+FlushInventory=Flush inventory
+ConfirmFlushInventory=Aktion wirklich ausführen?
+InventoryFlushed=Inventory flushed
+ExitEditMode=Exit edition
+inventoryDeleteLine=Zeile löschen
+RegulateStock=Regulate Stock
+ListInventory=Liste
diff --git a/htdocs/langs/de_DE/users.lang b/htdocs/langs/de_DE/users.lang
index 7d9fc5535da..37527dfb7d1 100644
--- a/htdocs/langs/de_DE/users.lang
+++ b/htdocs/langs/de_DE/users.lang
@@ -8,7 +8,7 @@ EditPassword=Passwort bearbeiten
 SendNewPassword=Neues Passwort zusenden
 ReinitPassword=Passwort zurücksetzen
 PasswordChangedTo=Neues Passwort: %s
-SubjectNewPassword=Your new password for %s
+SubjectNewPassword=Ihr neues Passwort für %s
 GroupRights=Gruppenberechtigungen
 UserRights=Benutzerberechtigungen
 UserGUISetup=Benutzeroberfläche
@@ -45,7 +45,7 @@ RemoveFromGroup=Gruppenzuweisung entfernen
 PasswordChangedAndSentTo=Passwort geändert und an <b>%s</b> gesendet.
 PasswordChangeRequestSent=Kennwort-Änderungsanforderung für <b>%s</b> gesendet an <b>%s</b>.
 MenuUsersAndGroups=Benutzer & Gruppen
-LastGroupsCreated=%s neueste erstellte Gruppen
+LastGroupsCreated=Letzte %s erstellte Gruppen
 LastUsersCreated=%s neueste ertellte Benutzer
 ShowGroup=Zeige Gruppe
 ShowUser=Zeige Benutzer
@@ -66,8 +66,8 @@ InternalUser=Interne Benutzer
 ExportDataset_user_1=Benutzer und -eigenschaften
 DomainUser=Domain-Benutzer %s
 Reactivate=Reaktivieren
-CreateInternalUserDesc=Dieses Formular erlaubt Ihnen das Anlegen eines unternehmensinternen Benutzers. Zum Anlegen eines externen Benutzers (Kunden, Lieferanten, ...), verwenden Sie bitte die 'Benutzer erstellen'-Schaltfläche in der Kontaktkarte des jeweiligen Partnerkontakts.
-InternalExternalDesc=Ein <b>interner</b> Benutzer ist Teil Ihres Unternehmens/Ihrer Stiftung. <br> Ein <b>externer</b> Benutzer ist ein Kunde, Lieferant oder Anderes.
+CreateInternalUserDesc=Dieses Formular erlaubt Ihnen das Anlegen eines Internen Benutzers. Zum Anlegen eines externen Benutzers (Kunden, Lieferanten, ...), verwenden Sie bitte die 'Benutzer erstellen'-Schaltfläche in der Kontaktkarte des jeweiligen Partnerkontakts.
+InternalExternalDesc=Ein <b>interner</b> Benutzer ist Teil Ihres Unternehmens/Stiftung. <br> Ein <b>externer</b> Benutzer ist ein Kunde, Lieferant oder Anderes.<br><br>In beiden Fällen können Berechtigungen in Dolibarr definiert werden. Ein externer Benutzer kann auch ein anderes Menüsystem als interne Benutzer verwenden. (Home->Setup->Anzeige)
 PermissionInheritedFromAGroup=Berechtigung durch eine Gruppenzugehörigkeit geerbt.
 Inherited=Geerbt
 UserWillBeInternalUser=Erstellter Benutzer ist intern (mit keinem bestimmten Partner verknüpft)
diff --git a/htdocs/langs/de_DE/workflow.lang b/htdocs/langs/de_DE/workflow.lang
index bb4408d09f4..f990eb5d3d3 100644
--- a/htdocs/langs/de_DE/workflow.lang
+++ b/htdocs/langs/de_DE/workflow.lang
@@ -11,5 +11,5 @@ descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Kennzeichne verknüpfte Kundenaufträ
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Kennzeichne verknüpfte Kundenaufträge als verrechnet, wenn die Kundenrechnung bestätigt wird
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Kennzeichne das verknüpfte Angebot als abgerechnet, wenn die Kundenrechnung erstellt wurde.
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source order to shipped when a shipment is validated and quantity shipped is the same as in order
-AutomaticCreation=Automatic creation
-AutomaticClassification=Automatic classification
+AutomaticCreation=automatische Erstellung
+AutomaticClassification=Automatische Klassifikation
diff --git a/htdocs/langs/el_CY/accountancy.lang b/htdocs/langs/el_CY/accountancy.lang
deleted file mode 100644
index 473582c566a..00000000000
--- a/htdocs/langs/el_CY/accountancy.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-AccountingCategory=Accounting category
diff --git a/htdocs/langs/el_CY/admin.lang b/htdocs/langs/el_CY/admin.lang
index 9602601e241..1c53b65c99c 100644
--- a/htdocs/langs/el_CY/admin.lang
+++ b/htdocs/langs/el_CY/admin.lang
@@ -1,1665 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
-Foundation=Foundation
-Version=Version
-VersionProgram=Version program
-VersionLastInstall=Initial install version
-VersionLastUpgrade=Latest version upgrade
-VersionExperimental=Experimental
-VersionDevelopment=Development
-VersionUnknown=Unknown
-VersionRecommanded=Recommended
-FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. Value of some setup constants may also be checked. You can use this tool to detect if some files were modified by a hacker for example.
-FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
-GlobalChecksum=Global checksum
-MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
-LocalSignature=Embedded local signature (less reliable)
-RemoteSignature=Remote distant signature (more reliable)
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FilesModified=Modified Files
-FilesAdded=Added Files
-FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
-XmlNotFound=Xml Integrity File of application not found
-SessionId=Session ID
-SessionSaveHandler=Handler to save sessions
-SessionSavePath=Storage session localization
-PurgeSessions=Purge of sessions
-ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
-NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow to list all running sessions.
-LockNewSessions=Lock new connections
-ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself. Only user <b>%s</b> will be able to connect after that.
-UnlockNewSessions=Remove connection lock
-YourSession=Your session
-Sessions=Users session
-WebUserGroup=Web server user/group
-NoSessionFound=Your PHP seems to not allow to list active sessions. Directory used to save sessions (<b>%s</b>) might be protected (For example, by OS permissions or by PHP directive open_basedir).
-DBStoringCharset=Database charset to store data
-DBSortingCharset=Database charset to sort data
-WarningModuleNotActive=Module <b>%s</b> must be enabled
-WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page.
-DolibarrSetup=Dolibarr install or upgrade
-InternalUser=Internal user
-ExternalUser=External user
-InternalUsers=Internal users
-ExternalUsers=External users
-GUISetup=Display
-SetupArea=Setup area
-FormToTestFileUploadForm=Form to test file upload (according to setup)
-IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
-RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
-RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any usage of update tool.
-SecuritySetup=Security setup
-SecurityFilesDesc=Define here options related to security about uploading files.
-ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
-ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
-ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is not supported.
-DictionarySetup=Dictionary setup
-Dictionary=Dictionaries
-ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
-ErrorCodeCantContainZero=Code can't contain value 0
-DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
-UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties, but it is less convenient)
-DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact, but it is less convenient)
-NumberOfKeyToSearch=Nbr of characters to trigger search: %s
-NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
-AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
-JavascriptDisabled=JavaScript disabled
-UsePreviewTabs=Use preview tabs
-ShowPreview=Show preview
-PreviewNotAvailable=Preview not available
-ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
-MySQLTimeZone=TimeZone MySql (database)
-TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
-Space=Space
-Table=Table
-Fields=Fields
-Index=Index
-Mask=Mask
-NextValue=Next value
-NextValueForInvoices=Next value (invoices)
-NextValueForCreditNotes=Next value (credit notes)
-NextValueForDeposit=Next value (deposit)
-NextValueForReplacements=Next value (replacements)
-MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to <b>%s</b> %s, whatever this parameter's value is
-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
-AntiVirusParam= More parameters on command line
-AntiVirusParamExample= Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
-ComptaSetup=Accounting module setup
-UserSetup=User management setup
-MultiCurrencySetup=Multi-currency setup
-MenuLimits=Limits and accuracy
-MenuIdParent=Parent menu ID
-DetailMenuIdParent=ID of parent menu (empty for a top menu)
-DetailPosition=Sort number to define menu position
-AllMenus=All
-NotConfigured=Module not configured
-Active=Active
-SetupShort=Setup
-OtherOptions=Other options
-OtherSetup=Other setup
-CurrentValueSeparatorDecimal=Decimal separator
-CurrentValueSeparatorThousand=Thousand separator
-Destination=Destination
-IdModule=Module ID
-IdPermissions=Permissions ID
-Modules=Modules
-LanguageBrowserParameter=Parameter %s
-LocalisationDolibarrParameters=Localisation parameters
-ClientTZ=Client Time Zone (user)
-ClientHour=Client time (user)
-OSTZ=Server OS Time Zone
-PHPTZ=PHP server Time Zone
-DaylingSavingTime=Daylight saving time
-CurrentHour=PHP Time (server)
-CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
-Box=Widget
-Boxes=Widgets
-MaxNbOfLinesForBoxes=Max number of lines for widgets
-PositionByDefault=Default order
-Position=Position
-MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
-MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br />Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
-MenuForUsers=Menu for users
-LangFile=.lang file
-System=System
-SystemInfo=System information
-SystemToolsArea=System tools area
-SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for.
-Purge=Purge
-PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
-PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
-PurgeDeleteTemporaryFilesShort=Delete temporary files
-PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory <b>%s</b>. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted.
-PurgeRunNow=Purge now
-PurgeNothingToDelete=No directory or files to delete.
-PurgeNDirectoriesDeleted=<b>%s</b> files or directories deleted.
-PurgeAuditEvents=Purge all security events
-ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
-GenerateBackup=Generate backup
-Backup=Backup
-Restore=Restore
-RunCommandSummary=Backup has been launched with the following command
-BackupResult=Backup result
-BackupFileSuccessfullyCreated=Backup file successfully generated
-YouCanDownloadBackupFile=Generated files can now be downloaded
-NoBackupFileAvailable=No backup files available.
-ExportMethod=Export method
-ImportMethod=Import method
-ToBuildBackupFileClickHere=To build a backup file, click <a href="%s">here</a>.
-ImportMySqlDesc=To import a backup file, you must use mysql command from command line:
-ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line:
-ImportMySqlCommand=%s %s < mybackupfile.sql
-ImportPostgreSqlCommand=%s %s mybackupfile.sql
-FileNameToGenerate=File name to generate
-Compression=Compression
-CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
-CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
-ExportCompatibility=Compatibility of generated export file
-MySqlExportParameters=MySQL export parameters
-PostgreSqlExportParameters= PostgreSQL export parameters
-UseTransactionnalMode=Use transactional mode
-FullPathToMysqldumpCommand=Full path to mysqldump command
-FullPathToPostgreSQLdumpCommand=Full path to pg_dump command
-ExportOptions=Export Options
-AddDropDatabase=Add DROP DATABASE command
-AddDropTable=Add DROP TABLE command
-ExportStructure=Structure
-NameColumn=Name columns
-ExtendedInsert=Extended INSERT
-NoLockBeforeInsert=No lock commands around INSERT
-DelayedInsert=Delayed insert
-EncodeBinariesInHexa=Encode binary data in hexadecimal
-IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
-AutoDetectLang=Autodetect (browser language)
-FeatureDisabledInDemo=Feature disabled in demo
-FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Permissions
-BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
-OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
-ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external modules...
-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 (Note: anyone experienced in PHP programming can provide custom development for an open source project)
-WebSiteDesc=Reference websites to find more modules...
-URL=Link
-BoxesAvailable=Widgets available
-BoxesActivated=Widgets activated
-ActivateOn=Activate on
-ActiveOn=Activated on
-SourceFile=Source file
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
-Required=Required
-UsedOnlyWithTypeOption=Used by some agenda option only
-Security=Security
-Passwords=Passwords
-DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
-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 (Activated 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 make building of a global cumulated pdf not working (like unpaid invoices).
-Feature=Feature
-DolibarrLicense=License
-Developpers=Developers/contributors
-OfficialWebSite=Dolibarr international official web site
-OfficialWebSiteLocal=Local web site (%s)
-OfficialWiki=Dolibarr documentation on Wiki
-OfficialDemo=Dolibarr online demo
-OfficialMarketPlace=Official market place for external modules/addons
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
-ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
-HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
-HelpCenterDesc2=Some part of this service are available in <b>english only</b>.
-CurrentMenuHandler=Current menu handler
-MeasuringUnit=Measuring unit
-LeftMargin=Left margin
-TopMargin=Top margin
-PaperSize=Paper type
-Orientation=Orientation
-SpaceX=Space X
-SpaceY=Space Y
-FontSize=Font size
-Content=Content
-NoticePeriod=Notice period
-NewByMonth=New by month
-Emails=E-mails
-EMailsSetup=E-mails setup
-EMailsDesc=This page allows you to overwrite your PHP parameters for e-mails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless.
-MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
-MAIN_MAIL_EMAIL_FROM=Sender e-mail for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Sender e-mail used for error returns emails sent
-MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
-MAIN_DISABLE_ALL_MAILS=Disable all e-mails sendings (for test purposes or demos)
-MAIN_MAIL_SENDMODE=Method to use to send EMails
-MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
-MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
-MAIN_MAIL_EMAIL_TLS= Use TLS (SSL) encrypt
-MAIN_MAIL_EMAIL_STARTTLS= Use TLS (STARTTLS) encrypt
-MAIN_DISABLE_ALL_SMS=Disable all SMS sendings (for test purposes or demos)
-MAIN_SMS_SENDMODE=Method to use to send SMS
-MAIN_MAIL_SMS_FROM=Default sender phone number for Sms sending
-MAIN_MAIL_DEFAULT_FROMTYPE=Sender e-mail by default for manual sendings (User email or Company email)
-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/
-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 setup
-ModuleFamilyBase=System
-ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
-ModuleFamilyProducts=Products Management (PM)
-ModuleFamilyHr=Human Resource Management (HR)
-ModuleFamilyProjects=Projects/Collaborative work
-ModuleFamilyOther=Other
-ModuleFamilyTechnic=Multi-modules tools
-ModuleFamilyExperimental=Experimental modules
-ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
-ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
-ModuleFamilyInterface=Interfaces with external systems
-MenuHandlers=Menu handlers
-MenuAdmin=Menu editor
-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).
-DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <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>.
-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='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
-YouCanSubmitFile=For this step, you can send package using this tool: Select module file
-CurrentVersion=Dolibarr current version
-CallUpdatePage=Go to the page that updates the database structure and data: %s.
-LastStableVersion=Latest stable version
-LastActivationDate=Latest activation date
-UpdateServerOffline=Update server offline
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
-GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
-GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
-ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
-ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
-DoTestServerAvailability=Test server connectivity
-DoTestSend=Test sending
-DoTestSendHTML=Test sending HTML
-ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
-ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
-UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
-UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
-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...).
-MinLength=Minimum length
-LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
-ExamplesWithCurrentSetup=Examples with current running setup
-ListOfDirectories=List of OpenDocument templates directories
-ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
-NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories
+AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
+AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 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.
-ThemeDir=Skins directory
-ConnectionTimeout=Connexion timeout
-ResponseTimeout=Response timeout
-SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__
-ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
-SecurityToken=Key to secure URLs
-NoSmsEngine=No SMS sender manager available. SMS sender manager are not installed with default distribution (because they depends on an external supplier) but you can find some on %s
-PDF=PDF
-PDFDesc=You can set each global options related to the PDF generation
-PDFAddressForging=Rules to forge address boxes
-HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF
-HideDescOnPDF=Hide products description on generated PDF
-HideRefOnPDF=Hide products ref. on generated PDF
-HideDetailsOnPDF=Hide product lines details on generated PDF
-PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
-Library=Library
-UrlGenerationParameters=Parameters to secure URLs
-SecurityTokenIsUnique=Use a unique securekey parameter for each URL
-EnterRefToBuildUrl=Enter reference for object %s
-GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons to 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
-MassConvert=Launch mass convert
-String=String
-TextLong=Long text
-Int=Integer
-Float=Float
-DateAndTime=Date and hour
-Unique=Unique
-Boolean=Boolean (Checkbox)
-ExtrafieldPhone = Phone
-ExtrafieldPrice = Price
-ExtrafieldMail = Email
-ExtrafieldUrl = Url
-ExtrafieldSelect = Select list
-ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
-ExtrafieldPassword=Password
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
-ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
-LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
-SMS=SMS
-LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
-RefreshPhoneLink=Refresh link
-LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
-KeepEmptyToUseDefault=Keep empty to use default value
-DefaultLink=Default link
-SetAsDefault=Set as default
-ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
-BarcodeInitForThirdparties=Mass barcode init for thirdparties
-BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Init value for next %s empty records
-EraseAllCurrentBarCode=Erase all current barcode values
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
-AllBarcodeReset=All barcode values have been removed
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into 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
-DisplayCompanyInfo=Display company address
-DisplayCompanyManagers=Display manager names
-DisplayCompanyInfoAndManagers=Display company address and manager names
-EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
-ModuleCompanyCodePanicum=Return an empty accountancy code.
-ModuleCompanyCodeDigitaria=Accountancy 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: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-ClickToShowDescription=Click to show description
-# Modules
-Module0Name=Users & groups
-Module0Desc=Users / Employees and Groups management
-Module1Name=Third parties
-Module1Desc=Companies and contact management (customers, prospects...)
-Module2Name=Commercial
-Module2Desc=Commercial management
-Module10Name=Accounting
-Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
-Module20Name=Proposals
-Module20Desc=Commercial proposal management
-Module22Name=Mass E-mailings
-Module22Desc=Mass E-mailing management
-Module23Name=Energy
-Module23Desc=Monitoring the consumption of energies
-Module25Name=Customer Orders
-Module25Desc=Customer order management
-Module30Name=Invoices
-Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
-Module40Name=Suppliers
-Module40Desc=Supplier management and buying (orders and invoices)
-Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
-Module49Name=Editors
-Module49Desc=Editor management
-Module50Name=Products
-Module50Desc=Product management
-Module51Name=Mass mailings
-Module51Desc=Mass paper mailing management
-Module52Name=Stocks
-Module52Desc=Stock management (products)
-Module53Name=Services
-Module53Desc=Service management
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
-Module55Name=Barcodes
-Module55Desc=Barcode management
-Module56Name=Telephony
-Module56Desc=Telephony integration
-Module57Name=Direct bank payment orders
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
-Module58Name=ClickToDial
-Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
-Module70Name=Interventions
-Module70Desc=Intervention management
-Module75Name=Expense and trip notes
-Module75Desc=Expense and trip notes management
-Module80Name=Shipments
-Module80Desc=Shipments and delivery order management
-Module85Name=Banks and cash
-Module85Desc=Management of bank or cash accounts
-Module100Name=External site
-Module100Desc=This module include an external web site or page into Dolibarr menus and view it into a Dolibarr frame
-Module105Name=Mailman and SPIP
-Module105Desc=Mailman or SPIP interface for member module
-Module200Name=LDAP
-Module200Desc=LDAP directory synchronisation
-Module210Name=PostNuke
-Module210Desc=PostNuke integration
-Module240Name=Data exports
-Module240Desc=Tool to export Dolibarr data (with assistants)
-Module250Name=Data imports
-Module250Desc=Tool to import data in Dolibarr  (with assistants)
-Module310Name=Members
-Module310Desc=Foundation members management
-Module320Name=RSS Feed
-Module320Desc=Add RSS feed inside Dolibarr screen pages
-Module330Name=Bookmarks
-Module330Desc=Bookmarks management
-Module400Name=Projects/Opportunities/Leads
-Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
-Module410Name=Webcalendar
-Module410Desc=Webcalendar integration
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
-Module520Name=Loan
-Module520Desc=Management of loans
-Module600Name=Notifications
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
-Module700Name=Donations
-Module700Desc=Donation management
-Module770Name=Expense reports
-Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
-Module1200Name=Mantis
-Module1200Desc=Mantis integration
-Module1400Name=Accounting
-Module1400Desc=Accounting management (double parties)
-Module1520Name=Document Generation
-Module1520Desc=Mass mail document generation
-Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
-Module2000Name=WYSIWYG editor
-Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
-Module2200Name=Dynamic Prices
-Module2200Desc=Enable the usage of math expressions for prices
-Module2300Name=Cron
-Module2300Desc=Scheduled job management
-Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
-Module2500Name=Electronic Content Management
-Module2500Desc=Save and share documents
-Module2600Name=API/Web services (SOAP server)
-Module2600Desc=Enable the Dolibarr SOAP server providing API services
-Module2610Name=API/Web services (REST server)
-Module2610Desc=Enable the Dolibarr REST server providing API services
-Module2660Name=Call WebServices (SOAP client)
-Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
-Module2700Name=Gravatar
-Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
-Module2800Desc=FTP Client
-Module2900Name=GeoIPMaxmind
-Module2900Desc=GeoIP Maxmind conversions capabilities
-Module3100Name=Skype
-Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
-Module4000Name=HRM
-Module4000Desc=Human resources management
-Module5000Name=Multi-company
-Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management
-Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
-Module20000Name=Leave Requests management
-Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Product lot
-Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
-Module50000Name=PayBox
-Module50000Desc=Module to offer an online payment page by credit card with PayBox
-Module50100Name=Point of sales
-Module50100Desc=Point of sales module (POS).
-Module50200Name=Paypal
-Module50200Desc=Module to offer an online payment page by credit card with Paypal
-Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double parties)
-Module54000Name=PrintIPP
-Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
-Module55000Name=Poll, Survey or Vote
-Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
-Module59000Name=Margins
-Module59000Desc=Module to manage margins
-Module60000Name=Commissions
-Module60000Desc=Module to manage commissions
-Module63000Name=Resources
-Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
-Permission11=Read customer invoices
-Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
-Permission14=Validate customer invoices
-Permission15=Send customer invoices by email
-Permission16=Create payments for customer invoices
-Permission19=Delete customer invoices
-Permission21=Read commercial proposals
-Permission22=Create/modify commercial proposals
-Permission24=Validate commercial proposals
-Permission25=Send commercial proposals
-Permission26=Close commercial proposals
-Permission27=Delete commercial proposals
-Permission28=Export commercial proposals
-Permission31=Read products
-Permission32=Create/modify products
-Permission34=Delete products
-Permission36=See/manage hidden products
-Permission38=Export products
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
-Permission44=Delete projects (shared project and projects i'm contact for)
-Permission45=Export projects
-Permission61=Read interventions
-Permission62=Create/modify interventions
-Permission64=Delete interventions
-Permission67=Export interventions
-Permission71=Read members
-Permission72=Create/modify members
-Permission74=Delete members
-Permission75=Setup types of membership
-Permission76=Export data
-Permission78=Read subscriptions
-Permission79=Create/modify subscriptions
-Permission81=Read customers orders
-Permission82=Create/modify customers orders
-Permission84=Validate customers orders
-Permission86=Send customers orders
-Permission87=Close customers orders
-Permission88=Cancel customers orders
-Permission89=Delete customers orders
-Permission91=Read social or fiscal taxes and vat
-Permission92=Create/modify social or fiscal taxes and vat
-Permission93=Delete social or fiscal taxes and vat
-Permission94=Export social or fiscal taxes
-Permission95=Read reports
-Permission101=Read sendings
-Permission102=Create/modify sendings
-Permission104=Validate sendings
-Permission106=Export sendings
-Permission109=Delete sendings
-Permission111=Read financial accounts
-Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
-Permission114=Reconciliate transactions
-Permission115=Export transactions and account statements
-Permission116=Transfers between accounts
-Permission117=Manage cheques dispatching
-Permission121=Read third parties linked to user
-Permission122=Create/modify third parties linked to user
-Permission125=Delete third parties linked to user
-Permission126=Export third parties
-Permission141=Read all projects and tasks (also private projects i am not contact for)
-Permission142=Create/modify all projects and tasks (also private projects i am not 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
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
-Permission167=Export contracts
-Permission171=Read trips and expenses (yours and your subordinates)
-Permission172=Create/modify trips and expenses
-Permission173=Delete trips and expenses
-Permission174=Read all trips and expenses
-Permission178=Export trips and expenses
-Permission180=Read suppliers
-Permission181=Read supplier orders
-Permission182=Create/modify supplier orders
-Permission183=Validate supplier orders
-Permission184=Approve supplier orders
-Permission185=Order or cancel supplier orders
-Permission186=Receive supplier orders
-Permission187=Close supplier orders
-Permission188=Cancel supplier orders
-Permission192=Create lines
-Permission193=Cancel lines
-Permission194=Read the bandwith lines
-Permission202=Create ADSL connections
-Permission203=Order connections orders
-Permission204=Order connections
-Permission205=Manage connections
-Permission206=Read connections
-Permission211=Read Telephony
-Permission212=Order lines
-Permission213=Activate line
-Permission214=Setup Telephony
-Permission215=Setup providers
-Permission221=Read emailings
-Permission222=Create/modify emailings (topic, recipients...)
-Permission223=Validate emailings (allows sending)
-Permission229=Delete emailings
-Permission237=View recipients and info
-Permission238=Manually send mailings
-Permission239=Delete mailings after validation or sent
-Permission241=Read categories
-Permission242=Create/modify categories
-Permission243=Delete categories
-Permission244=See the contents of the hidden categories
-Permission251=Read other users and groups
-PermissionAdvanced251=Read other users
-Permission252=Read permissions of other users
-Permission253=Create/modify other users, groups and permisssions
-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 assignement matters).
-Permission271=Read CA
-Permission272=Read invoices
-Permission273=Issue invoices
-Permission281=Read contacts
-Permission282=Create/modify contacts
-Permission283=Delete contacts
-Permission286=Export contacts
-Permission291=Read tariffs
-Permission292=Set permissions on the tariffs
-Permission293=Modify costumers tariffs
-Permission300=Read bar codes
-Permission301=Create/modify bar codes
-Permission302=Delete bar codes
-Permission311=Read services
-Permission312=Assign service/subscription to contract
-Permission331=Read bookmarks
-Permission332=Create/modify bookmarks
-Permission333=Delete bookmarks
-Permission341=Read its own permissions
-Permission342=Create/modify his own user information
-Permission343=Modify his own password
-Permission344=Modify its own permissions
-Permission351=Read groups
-Permission352=Read groups permissions
-Permission353=Create/modify groups
-Permission354=Delete or disable groups
-Permission358=Export users
-Permission401=Read discounts
-Permission402=Create/modify discounts
-Permission403=Validate discounts
-Permission404=Delete discounts
-Permission510=Read Salaries
-Permission512=Create/modify salaries
-Permission514=Delete salaries
-Permission517=Export salaries
-Permission520=Read Loans
-Permission522=Create/modify loans
-Permission524=Delete loans
-Permission525=Access loan calculator
-Permission527=Export loans
-Permission531=Read services
-Permission532=Create/modify services
-Permission534=Delete services
-Permission536=See/manage hidden services
-Permission538=Export services
-Permission701=Read donations
-Permission702=Create/modify donations
-Permission703=Delete donations
-Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
-Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
-Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission779=Export expense reports
-Permission1001=Read stocks
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
-Permission1004=Read stock movements
-Permission1005=Create/modify stock movements
-Permission1101=Read delivery orders
-Permission1102=Create/modify delivery orders
-Permission1104=Validate delivery orders
-Permission1109=Delete delivery orders
-Permission1181=Read suppliers
-Permission1182=Read supplier orders
-Permission1183=Create/modify supplier orders
-Permission1184=Validate supplier orders
-Permission1185=Approve supplier orders
-Permission1186=Order supplier orders
-Permission1187=Acknowledge receipt of supplier orders
-Permission1188=Delete supplier orders
-Permission1190=Approve (second approval) supplier orders
-Permission1201=Get result of an export
-Permission1202=Create/Modify an export
-Permission1231=Read supplier invoices
-Permission1232=Create/modify supplier invoices
-Permission1233=Validate supplier invoices
-Permission1234=Delete supplier invoices
-Permission1235=Send supplier invoices by email
-Permission1236=Export supplier invoices, attributes and payments
-Permission1237=Export supplier orders and their details
-Permission1251=Run mass imports of external data into database (data load)
-Permission1321=Export customer invoices, attributes and payments
-Permission1322=Reopen a paid bill
-Permission1421=Export customer orders and attributes
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
-Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
-Permission20006=Admin leave requests (setup and update balance)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
-Permission2401=Read actions (events or tasks) linked to his account
-Permission2402=Create/modify actions (events or tasks) linked to his account
-Permission2403=Delete actions (events or tasks) linked to his account
-Permission2411=Read actions (events or tasks) of others
-Permission2412=Create/modify actions (events or tasks) of others
-Permission2413=Delete actions (events or tasks) of others
-Permission2414=Export actions/tasks of others
-Permission2501=Read/Download documents
-Permission2502=Download documents
-Permission2503=Submit or delete documents
-Permission2515=Setup documents directories
-Permission2801=Use FTP client in read mode (browse and download only)
-Permission2802=Use FTP client in write mode (delete or upload files)
-Permission50101=Use Point of sales
-Permission50201=Read transactions
-Permission50202=Import transactions
-Permission54001=Print
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
-Permission59003=Read every user margin
-Permission63001=Read resources
-Permission63002=Create/modify resources
-Permission63003=Delete resources
-Permission63004=Link resources to agenda events
-DictionaryCompanyType=Types of thirdparties
-DictionaryCompanyJuridicalType=Legal forms of thirdparties
-DictionaryProspectLevel=Prospect potential level
-DictionaryCanton=State/Province
-DictionaryRegion=Regions
-DictionaryCountry=Countries
-DictionaryCurrency=Currencies
-DictionaryCivility=Personal and professional titles
-DictionaryActions=Types of agenda events
-DictionarySocialContributions=Social or fiscal taxes types
-DictionaryVAT=VAT Rates or Sales Tax Rates
-DictionaryRevenueStamp=Amount of revenue stamps
-DictionaryPaymentConditions=Payment terms
-DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact/Address types
-DictionaryEcotaxe=Ecotax (WEEE)
-DictionaryPaperFormat=Paper formats
-DictionaryFormatCards=Cards formats
-DictionaryFees=Types of fees
-DictionarySendingMethods=Shipping methods
-DictionaryStaff=Staff
-DictionaryAvailability=Delivery delay
-DictionaryOrderMethods=Ordering methods
-DictionarySource=Origin of proposals/orders
-DictionaryAccountancyCategory=Accounting account groups
-DictionaryAccountancysystem=Models for chart of accounts
-DictionaryEMailTemplates=Emails templates
-DictionaryUnits=Units
-DictionaryProspectStatus=Prospection status
-DictionaryHolidayTypes=Types of leaves
-DictionaryOpportunityStatus=Opportunity status for project/lead
-SetupSaved=Setup saved
-BackToModuleList=Back to modules list
-BackToDictionaryList=Back to dictionaries list
-VATManagement=VAT Management
-VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
-VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies.
-VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
-##### Local Taxes #####
-LTRate=Rate
-LocalTax1IsNotUsed=Do not use second tax
-LocalTax1IsUsedDesc=Use a second type of tax (other than VAT)
-LocalTax1IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax1Management=Second type of tax
-LocalTax1IsUsedExample=
-LocalTax1IsNotUsedExample=
-LocalTax2IsNotUsed=Do not use third tax
-LocalTax2IsUsedDesc=Use a third type of tax (other than VAT)
-LocalTax2IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax2Management=Third type of tax
-LocalTax2IsUsedExample=
-LocalTax2IsNotUsedExample=
-LocalTax1ManagementES= RE Management
-LocalTax1IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If te buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
-LocalTax1IsNotUsedDescES= By default the proposed RE is 0. End of rule.
-LocalTax1IsUsedExampleES= In Spain they are professionals subject to some specific sections of the Spanish IAE.
-LocalTax1IsNotUsedExampleES= In Spain they are professional and societies and subject to certain sections of the Spanish IAE.
-LocalTax2ManagementES= IRPF Management
-LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
-LocalTax2IsNotUsedDescES= By default the proposed IRPF is 0. End of rule.
-LocalTax2IsUsedExampleES= In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
-LocalTax2IsNotUsedExampleES= In Spain they are bussines not subject to tax system of modules.
-CalcLocaltax=Reports on local taxes
-CalcLocaltax1=Sales - Purchases
-CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2=Purchases
-CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3=Sales
-CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
-LabelUsedByDefault=Label used by default if no translation can be found for code
-LabelOnDocuments=Label on documents
-NbOfDays=Nb of days
-AtEndOfMonth=At end of month
-CurrentNext=Current/Next
-Offset=Offset
-AlwaysActive=Always active
-Upgrade=Upgrade
-MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Deploy/install external module
-WebServer=Web server
-DocumentRootServer=Web server's root directory
-DataRootServer=Data files directory
-IP=IP
-Port=Port
-VirtualServerName=Virtual server name
-OS=OS
-PhpWebLink=Web-Php link
-Browser=Browser
-Server=Server
-Database=Database
-DatabaseServer=Database host
-DatabaseName=Database name
-DatabasePort=Database port
-DatabaseUser=Database user
-DatabasePassword=Database password
-Tables=Tables
-TableName=Table name
-NbOfRecord=Nb of records
-Host=Server
-DriverType=Driver type
-SummarySystem=System information summary
-SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Foundation
-DefaultMenuManager= Standard menu manager
-DefaultMenuSmartphoneManager=Smartphone menu manager
-Skin=Skin theme
-DefaultSkin=Default skin theme
-MaxSizeList=Max length for list
-DefaultMaxSizeList=Default max length for lists
-DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
-MessageOfDay=Message of the day
-MessageLogin=Login page message
-PermanentLeftSearchForm=Permanent search form on left menu
-DefaultLanguage=Default language to use (language code)
-EnableMultilangInterface=Enable multilingual interface
-EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/foundation information
-CompanyIds=Company/foundation identities
-CompanyName=Name
-CompanyAddress=Address
-CompanyZip=Zip
-CompanyTown=Town
-CompanyCountry=Country
-CompanyCurrency=Main currency
-CompanyObject=Object of the company
-Logo=Logo
-DoNotSuggestPaymentMode=Do not suggest
-NoActiveBankAccountDefined=No active bank account defined
-OwnerOfBankAccount=Owner of bank account %s
-BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show link "<strong>%s</strong>"
-Alerts=Alerts
-DelaysOfToleranceBeforeWarning=Tolerance delays before warning
-DelaysOfToleranceDesc=This screen allows you to define the tolerated delays before an alert is reported on screen with picto %s for each late element.
-Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned events (agenda events) not completed yet
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Delay tolerance (in days) before alert on project not closed in time
-Delays_MAIN_DELAY_TASKS_TODO=Delay tolerance (in days) before alert on planned tasks (project tasks) not completed yet
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on orders not processed yet
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on suppliers orders not processed yet
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Delay tolerance (in days) before alert on proposals to close
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Delay tolerance (in days) before alert on proposals not billed
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerance delay (in days) before alert on services to activate
-Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerance delay (in days) before alert on expired services
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerance delay (in days) before alert on unpaid supplier invoices
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerence delay (in days) before alert on unpaid client invoices
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerance delay (in days) before alert on pending bank reconciliation
-Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed membership fee
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
-Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
-SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
-SetupDescription5=Other menu entries manage optional parameters.
-LogEvents=Security audit events
-Audit=Audit
-InfoDolibarr=About Dolibarr
-InfoBrowser=About Browser
-InfoOS=About OS
-InfoWebServer=About Web Server
-InfoDatabase=About Database
-InfoPHP=About PHP
-InfoPerf=About Performances
-BrowserName=Browser name
-BrowserOS=Browser OS
-ListOfSecurityEvents=List of Dolibarr security events
-SecurityEventsPurged=Security events purged
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
-SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
-SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
-DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
-AvailableModules=Available 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.
-TriggersAvailable=Available triggers
-TriggersDesc=Triggers are files that will modify the behaviour of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realised new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
-TriggerDisabledByName=Triggers in this file are disabled by the <b>-NORUN</b> suffix in their name.
-TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module <b>%s</b> is disabled.
-TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules.
-TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
-GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password
-DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">check here</a>.
-MiscellaneousDesc=All other security related parameters are defined here.
-LimitsSetup=Limits/Precision setup
-LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here
-MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices
-MAIN_MAX_DECIMALS_TOT=Max decimals for total prices
-MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add <b>...</b> after this number if you want to see <b>...</b> when number is truncated when shown on screen)
-MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
-UnitPriceOfProduct=Net unit price of a product
-TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
-ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
-NoEventFoundWithCriteria=No security event has been found for such search criterias.
-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.
-BackupDescX=Archived directory should be stored in a secure place.
-BackupDescY=The generated dump file should be stored in a secure place.
-BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one
-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 directoy (<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=Available database backup dump files
-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
-DownloadMoreSkins=More skins to download
-SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence without hole and with no reset
-ShowProfIdInAddress=Show professionnal id with addresses on documents
-ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents
-TranslationUncomplete=Partial translation
-MAIN_DISABLE_METEO=Disable meteo view
-TestLoginToAPI=Test login to API
-ProxyDesc=Some features of Dolibarr need to have an Internet access to work. Define here parameters for this. If the Dolibarr server is behind a Proxy server, those parameters tells Dolibarr how to access Internet through it.
-ExternalAccess=External access
-MAIN_PROXY_USE=Use a proxy server (otherwise direct access to internet)
-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 all attributes, not already available by default, and that you want to be supported for %s.
-ExtraFields=Complementary attributes
-ExtraFieldsLines=Complementary attributes (lines)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
-ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact/address)
-ExtraFieldsMember=Complementary attributes (member)
-ExtraFieldsMemberType=Complementary attributes (member type)
-ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
-ExtraFieldsSupplierOrders=Complementary attributes (orders)
-ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
-ExtraFieldsProject=Complementary attributes (projects)
-ExtraFieldsProjectTask=Complementary attributes (tasks)
-ExtraFieldHasWrongValue=Attribute %s has a wrong value.
-AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
-SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
-PathToDocuments=Path to documents
-PathDirectory=Directory
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might 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.
-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: <strong>User display setup</strong> tab of 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
-TranslationString=Translation string
-CurrentTranslationString=Current translation string
-WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
-NewTranslationStringToShow=New translation string to show
-OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
-YouMustEnableOneModule=You must at least enable 1 module
-ClassNotFoundIntoPathWarning=Class %s not found into PHP path
-YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
-SuhosinSessionEncrypt=Session storage encrypted by Suhosin
-ConditionIsCurrently=Condition is currently %s
-YouUseBestDriver=You use driver %s that is best driver available currently.
-YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required 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.
-BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance.
-BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
-AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp".
-AskForPreferredShippingMethod=Ask for preferred Sending Method for Third Parties.
-FieldEdition=Edition of field %s
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
-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.
-PasswordGenerationPerso=Return a password according to your personally defined configuration.
-SetupPerso=According to your configuration
-PasswordPatternDesc=Password pattern description
-##### Users setup #####
-RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passwords
-DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page
-UsersSetup=Users module setup
-UserMailRequired=EMail required to create a new user
-##### HRM setup #####
-HRMSetup=HRM module setup
-##### Company setup #####
-CompanySetup=Companies module setup
-CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier)
-AccountCodeManager=Module for accountancy code generation (customer or supplier)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
-NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
-NotificationsDescGlobal=* or by setting global target emails in module setup page.
-ModelModules=Documents templates
-DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
-WatermarkOnDraft=Watermark on draft document
-JSOnPaimentBill=Activate feature to autofill payment lines on payment form
-CompanyIdProfChecker=Rules on Professional Ids
-MustBeUnique=Must be unique?
-MustBeMandatory=Mandatory to create third parties?
-MustBeInvoiceMandatory=Mandatory to validate invoices?
-##### Webcal setup #####
-WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
-##### Invoices #####
-BillsSetup=Invoices module setup
-BillsNumberingModule=Invoices and credit notes numbering model
-BillsPDFModules=Invoice documents models
-CreditNote=Credit note
-CreditNotes=Credit notes
-ForceInvoiceDate=Force invoice date to validation date
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
-SuggestPaymentByRIBOnAccount=Suggest payment by withdraw on account
-SuggestPaymentByChequeToAddress=Suggest payment by cheque to
-FreeLegalTextOnInvoices=Free text on invoices
-WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
-PaymentsNumberingModule=Payments numbering model
-SuppliersPayment=Suppliers payments
-SupplierPaymentSetup=Suppliers payments setup
-##### Proposals #####
-PropalSetup=Commercial proposals module setup
-ProposalsNumberingModules=Commercial proposal numbering models
-ProposalsPDFModules=Commercial proposal documents models
-FreeLegalTextOnProposal=Free text on commercial proposals
-WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
-WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
-##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
-##### Orders #####
-OrdersSetup=Order management setup
-OrdersNumberingModules=Orders numbering models
-OrdersModelModule=Order documents models
-FreeLegalTextOnOrders=Free text on orders
-WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
-ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Interventions #####
-InterventionsSetup=Interventions module setup
-FreeLegalTextOnInterventions=Free text on intervention documents
-FicheinterNumberingModules=Intervention numbering models
-TemplatePDFInterventions=Intervention card documents models
-WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
-##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
-ContractsNumberingModules=Contracts numbering modules
-TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
-##### Members #####
-MembersSetup=Members module setup
-MemberMainOptions=Main options
-AdherentLoginRequired= Manage a Login for each member
-AdherentMailRequired=EMail required to create a new member
-MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
-##### LDAP setup #####
-LDAPSetup=LDAP Setup
-LDAPGlobalParameters=Global parameters
-LDAPUsersSynchro=Users
-LDAPGroupsSynchro=Groups
-LDAPContactsSynchro=Contacts
-LDAPMembersSynchro=Members
-LDAPSynchronization=LDAP synchronisation
-LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP
-LDAPToDolibarr=LDAP -> Dolibarr
-DolibarrToLDAP=Dolibarr -> LDAP
-LDAPNamingAttribute=Key in LDAP
-LDAPSynchronizeUsers=Organization of users in LDAP
-LDAPSynchronizeGroups=Organization of groups in LDAP
-LDAPSynchronizeContacts=Organization of contacts in LDAP
-LDAPSynchronizeMembers=Organization of foundation's members in LDAP
-LDAPPrimaryServer=Primary server
-LDAPSecondaryServer=Secondary server
-LDAPServerPort=Server port
-LDAPServerPortExample=Default port : 389
-LDAPServerProtocolVersion=Protocol version
-LDAPServerUseTLS=Use TLS
-LDAPServerUseTLSExample=Your LDAP server use TLS
-LDAPServerDn=Server DN
-LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
-LDAPPassword=Administrator password
-LDAPUserDn=Users' DN
-LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
-LDAPGroupDn=Groups' DN
-LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com)
-LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
-LDAPServerDnExample=Complete DN (ex: dc=example,dc=com)
-LDAPDnSynchroActive=Users and groups synchronization
-LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization
-LDAPDnContactActive=Contacts' synchronization
-LDAPDnContactActiveExample=Activated/Unactivated synchronization
-LDAPDnMemberActive=Members' synchronization
-LDAPDnMemberActiveExample=Activated/Unactivated synchronization
-LDAPContactDn=Dolibarr contacts' DN
-LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com)
-LDAPMemberDn=Dolibarr members DN
-LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com)
-LDAPMemberObjectClassList=List of objectClass
-LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPUserObjectClassList=List of objectClass
-LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPGroupObjectClassList=List of objectClass
-LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
-LDAPContactObjectClassList=List of objectClass
-LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPTestConnect=Test LDAP connection
-LDAPTestSynchroContact=Test contacts synchronization
-LDAPTestSynchroUser=Test user synchronization
-LDAPTestSynchroGroup=Test group synchronization
-LDAPTestSynchroMember=Test member synchronization
-LDAPTestSearch= Test a LDAP search
-LDAPSynchroOK=Synchronization test successful
-LDAPSynchroKO=Failed synchronization test
-LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that connexion to server is correctly configured and allows LDAP udpates
-LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s)
-LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s)
-LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPBindKO=Connect/Authentificate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPSetupForVersion3=LDAP server configured for version 3
-LDAPSetupForVersion2=LDAP server configured for version 2
-LDAPDolibarrMapping=Dolibarr Mapping
-LDAPLdapMapping=LDAP Mapping
-LDAPFieldLoginUnix=Login (unix)
-LDAPFieldLoginExample=Example : uid
-LDAPFilterConnection=Search filter
-LDAPFilterConnectionExample=Example : &(objectClass=inetOrgPerson)
-LDAPFieldLoginSamba=Login (samba, activedirectory)
-LDAPFieldLoginSambaExample=Example : samaccountname
-LDAPFieldFullname=Full name
-LDAPFieldFullnameExample=Example : cn
-LDAPFieldPasswordNotCrypted=Password not crypted
-LDAPFieldPasswordCrypted=Password crypted
-LDAPFieldPasswordExample=Example : userPassword
-LDAPFieldCommonNameExample=Example : cn
-LDAPFieldName=Name
-LDAPFieldNameExample=Example : sn
-LDAPFieldFirstName=First name
-LDAPFieldFirstNameExample=Example : givenName
-LDAPFieldMail=Email address
-LDAPFieldMailExample=Example : mail
-LDAPFieldPhone=Professional phone number
-LDAPFieldPhoneExample=Example : telephonenumber
-LDAPFieldHomePhone=Personal phone number
-LDAPFieldHomePhoneExample=Example : homephone
-LDAPFieldMobile=Cellular phone
-LDAPFieldMobileExample=Example : mobile
-LDAPFieldFax=Fax number
-LDAPFieldFaxExample=Example : facsimiletelephonenumber
-LDAPFieldAddress=Street
-LDAPFieldAddressExample=Example : street
-LDAPFieldZip=Zip
-LDAPFieldZipExample=Example : postalcode
-LDAPFieldTown=Town
-LDAPFieldTownExample=Example : l
-LDAPFieldCountry=Country
-LDAPFieldDescription=Description
-LDAPFieldDescriptionExample=Example : description
-LDAPFieldNotePublic=Public Note
-LDAPFieldNotePublicExample=Example : publicnote
-LDAPFieldGroupMembers= Group members
-LDAPFieldGroupMembersExample= Example : uniqueMember
-LDAPFieldBirthdate=Birthdate
-LDAPFieldCompany=Company
-LDAPFieldCompanyExample=Example : o
-LDAPFieldSid=SID
-LDAPFieldSidExample=Example : objectsid
-LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Job position
-LDAPFieldTitleExample=Example: title
-LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
-LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
-LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts.
-LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users.
-LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups.
-LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module.
-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 advices related to performance.
-NotInstalled=Not installed, so your server is not slow 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.
-MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
-MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
-OPCodeCache=OPCode cache
-NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad).
-HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
-FilesOfTypeCached=Files of type %s are cached by HTTP server
-FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
-FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
-FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
-CacheByServer=Cache by server
-CacheByClient=Cache by browser
-CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
-##### Products #####
-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)
-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 third party language
-UseSearchToSelectProductTooltip=Also if you have a large number of product (> 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)
-SetDefaultBarcodeTypeProducts=Default barcode type to use for products
-SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
-ProductCodeChecker= Module for product code generation and checking (product or service)
-ProductOtherConf= Product / Service configuration
-IsNotADir=is not a directory!
-##### Syslog #####
-SyslogSetup=Logs module setup
-SyslogOutput=Logs outputs
-SyslogFacility=Facility
-SyslogLevel=Level
-SyslogFilename=File name and path
-YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
-ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
-##### Donations #####
-DonationsSetup=Donation module setup
-DonationsReceiptModel=Template of donation receipt
-##### Barcode #####
-BarcodeSetup=Barcode setup
-PaperFormatModule=Print format module
-BarcodeEncodeModule=Barcode encoding type
-CodeBarGenerator=Barcode generator
-ChooseABarCode=No generator defined
-FormatNotSupportedByGenerator=Format not supported by this generator
-BarcodeDescEAN8=Barcode of type EAN8
-BarcodeDescEAN13=Barcode of type EAN13
-BarcodeDescUPC=Barcode of type UPC
-BarcodeDescISBN=Barcode of type ISBN
-BarcodeDescC39=Barcode of type C39
-BarcodeDescC128=Barcode of type C128
-BarcodeDescDATAMATRIX=Barcode of type Datamatrix
-BarcodeDescQRCODE=Barcode of type QR code
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
-BarcodeInternalEngine=Internal engine
-BarCodeNumberManager=Manager to auto define barcode numbers
-##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct debit payment orders
-##### ExternalRSS #####
-ExternalRSSSetup=External RSS imports setup
-NewRSS=New RSS Feed
-RSSUrl=RSS URL
-RSSUrlExample=An interesting RSS feed
-##### Mailing #####
-MailingSetup=EMailing module setup
-MailingEMailFrom=Sender EMail (From) for emails sent by emailing module
-MailingEMailError=Return EMail (Errors-to) for emails with errors
-MailingDelay=Seconds to wait after sending next message
-##### Notification #####
-NotificationSetup=EMail notification module setup
-NotificationEMailFrom=Sender EMail (From) for emails sent for notifications
-FixedEmailTarget=Fixed email target
-##### Sendings #####
-SendingsSetup=Sending module setup
-SendingsReceiptModel=Sending receipt model
-SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
-FreeLegalTextOnShippings=Free text on shipments
-##### Deliveries #####
-DeliveryOrderNumberingModules=Products deliveries receipt numbering module
-DeliveryOrderModel=Products deliveries receipt model
-DeliveriesOrderAbility=Support products deliveries receipts
-FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
-##### FCKeditor #####
-AdvancedEditor=Advanced editor
-ActivateFCKeditor=Activate advanced editor for:
-FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
-FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files.</font>
-FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
-FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
-##### OSCommerce 1 #####
-OSCommerceErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be an OSCommerce database (Key %s not found in table %s).
-OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' successfull.
-OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
-OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
-##### Stock #####
-StockSetup=Warehouse module setup
-IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
-##### Menu #####
-MenuDeleted=Menu deleted
-Menus=Menus
-TreeMenuPersonalized=Personalized menus
-NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
-NewMenu=New menu
-Menu=Selection of menu
-MenuHandler=Menu handler
-MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
-DetailId=Id menu
-DetailMenuHandler=Menu handler where to show new menu
-DetailMenuModule=Module name if menu entry come from a module
-DetailType=Type of menu (top or left)
-DetailTitre=Menu label or label code for translation
-DetailUrl=URL where menu send you (Absolute URL link or external link with http://)
-DetailEnabled=Condition to show or not entry
-DetailRight=Condition to display unauthorized grey menus
-DetailLangs=Lang file name for label code translation
-DetailUser=Intern / Extern / All
-Target=Target
-DetailTarget=Target for links (_blank top open a new window)
-DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu)
-ModifMenu=Menu change
-DeleteMenu=Delete menu entry
-ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
-FailedToInitializeMenu=Failed to initialize menu
-##### Tax #####
-TaxSetup=Taxes, social or fiscal taxes and dividends module setup
-OptionVatMode=VAT due
-OptionVATDefault=Cash basis
-OptionVATDebitOption=Accrual basis
-OptionVatDefaultDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on payments for services
-OptionVatDebitOptionDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on invoice (debit) for services
-SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
-OnDelivery=On delivery
-OnPayment=On payment
-OnInvoice=On invoice
-SupposedToBePaymentDate=Payment date used
-SupposedToBeInvoiceDate=Invoice date used
-Buy=Buy
-Sell=Sell
-InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
-AccountancyCode=Accountancy Code
-AccountancyCodeSell=Sale 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 -> Dictionary -> 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_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
-AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### 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 your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your 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.
-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 same computer than 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.
-##### Point Of Sales (CashDesk) #####
-CashDesk=Point of sales
-CashDeskSetup=Point of sales module setup
-CashDeskThirdPartyForSell=Default generic third party to use for sells
-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).
-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
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
-##### Bookmark #####
-BookmarkSetup=Bookmark module setup
-BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu.
-NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu
-##### WebServices #####
-WebServicesSetup=Webservices module setup
-WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
-WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
-EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
-##### API ####
-ApiSetup=API module setup
-ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
-OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
-ApiKey=Key for API
-WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
-##### Bank #####
-BankSetupModule=Bank module setup
-FreeLegalTextOnChequeReceipts=Free text on cheque receipts
-BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
-BankOrderGlobal=General
-BankOrderGlobalDesc=General display order
-BankOrderES=Spanish
-BankOrderESDesc=Spanish display order
-ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
-##### Multicompany #####
-MultiCompanySetup=Multi-company module setup
-##### Suppliers #####
-SuppliersSetup=Supplier module setup
-SuppliersCommandModel=Complete template of supplier order (logo...)
-SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
-SuppliersInvoiceNumberingModel=Supplier invoices numbering models
-IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
-##### GeoIPMaxmind #####
-GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
-NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
-YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
-YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
-TestGeoIPResult=Test of a conversion IP -> country
-##### Projects #####
-ProjectsNumberingModules=Projects numbering module
-ProjectsSetup=Project module setup
-ProjectsModelModule=Project reports document model
-TasksNumberingModules=Tasks numbering module
-TaskModelModule=Tasks reports document model
-UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
-##### ECM (GED) #####
-##### Fiscal Year #####
-AccountingPeriods=Accounting periods
-AccountingPeriodCard=Accounting period
-NewFiscalYear=New accounting period
-OpenFiscalYear=Open accounting period
-CloseFiscalYear=Close accounting period
-DeleteFiscalYear=Delete accounting period
-ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
-ShowFiscalYear=Show accounting period
-AlwaysEditable=Can always be edited
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
-Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
-IncludePath=Include path (defined into variable %s)
-ExpenseReportsSetup=Setup of module Expense Reports
-TemplatePDFExpenseReports=Document templates to generate expense report document
-NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
-YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of 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
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/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.
-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.
-ConfFileMuseContainCustom=Installing 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)
-TextTitleColor=Color of page title
-LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
-NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
-BackgroundColor=Background color
-TopMenuBackgroundColor=Background color for Top menu
-TopMenuDisableImages=Hide images in Top menu
-LeftMenuBackgroundColor=Background color for Left menu
-BackgroundTableTitleColor=Background color for Table title line
-BackgroundTableLineOddColor=Background color for odd table lines
-BackgroundTableLineEvenColor=Background color for even table lines
-MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
-NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
-UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
-PositionIntoComboList=Position of line into combo lists
-SellTaxRate=Sale tax rate
-RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
-UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipping, you can enter it here. You can use the key {TRACKID} into URL parameters so the system will replace it with value of tracking number user entered into shipment card.
-OpportunityPercent=When you create an opportunity, you will defined an estimated amount of project/lead. According to status of opportunity, this amount may be multiplicated 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
-FixTZ=TimeZone fix
-FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
-ExpectedChecksum=Expected Checksum
-CurrentChecksum=Current Checksum
-ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the latest stable version
-TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
-TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so 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 usefull only if your prices for each leve 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.
-SeeSubstitutionVars=See * note for list of possible substitution variables
-AllPublishers=All publishers
-UnknownPublishers=Unknown publishers
-AddRemoveTabs=Add or remove tabs
-AddDictionaries=Add dictionaries
-AddBoxes=Add widgets
-AddSheduledJobs=Add scheduled jobs
-AddHooks=Add hooks
-AddTriggers=Add triggers
-AddMenus=Add menus
-AddPermissions=Add permissions
-AddExportProfiles=Add export profiles
-AddImportProfiles=Add import profiles
-AddOtherPagesOrServices=Add other pages or services
-AddModels=Add document or numbering templates
-AddSubstitutions=Add keys substitutions
-DetectionNotPossible=Detection not possible
-UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved on 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 correclty. 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 inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <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
-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
-TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
-##### Resource ####
-ResourceSetup=Configuration du module Resource
-UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
diff --git a/htdocs/langs/el_CY/main.lang b/htdocs/langs/el_CY/main.lang
index 9ffa398137f..2e691473326 100644
--- a/htdocs/langs/el_CY/main.lang
+++ b/htdocs/langs/el_CY/main.lang
@@ -1,9 +1,5 @@
 # Dolibarr language file - Source file is en_US - main
 DIRECTION=ltr
-# Note for Chinese:
-# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
-# stsongstdlight or cid0cs are for simplified Chinese
-# To read Chinese pdf with Linux: sudo apt-get install poppler-data
 FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=.
@@ -23,799 +19,3 @@ FormatDateHourShort=%m/%d/%Y %I:%M %p
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
-DatabaseConnection=Database connection
-NoTemplateDefined=No template defined for this email type
-AvailableVariables=Available substitution variables
-NoTranslation=No translation
-NoRecordFound=No record found
-NoRecordDeleted=No record deleted
-NotEnoughDataYet=Not enough data
-NoError=No error
-Error=Error
-Errors=Errors
-ErrorFieldRequired=Field '%s' is required
-ErrorFieldFormat=Field '%s' has a bad value
-ErrorFileDoesNotExists=File %s does not exist
-ErrorFailedToOpenFile=Failed to open file %s
-ErrorCanNotCreateDir=Cannot create dir %s
-ErrorCanNotReadDir=Cannot read dir %s
-ErrorConstantNotDefined=Parameter %s not defined
-ErrorUnknown=Unknown error
-ErrorSQL=SQL Error
-ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this
-ErrorGoToModuleSetup=Go to Module setup to fix this
-ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
-ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
-ErrorInternalErrorDetected=Error detected
-ErrorWrongHostParameter=Wrong host parameter
-ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post again the form.
-ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child records.
-ErrorWrongValue=Wrong value
-ErrorWrongValueForParameterX=Wrong value for parameter %s
-ErrorNoRequestInError=No request in error
-ErrorServiceUnavailableTryLater=Service not available for 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>.
-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 nb of record per page
-NotAuthorized=You are not authorized to do that.
-SetDate=Set date
-SelectDate=Select a date
-SeeAlso=See also %s
-SeeHere=See here
-Apply=Apply
-BackgroundColorByDefault=Default background color
-FileRenamed=The file was successfully renamed
-FileUploaded=The file was successfully uploaded
-FileGenerated=The file was successfully generated
-FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
-NbOfEntries=Nb of entries
-GoToWikiHelpPage=Read online help (Internet access needed)
-GoToHelpPage=Read help
-RecordSaved=Record saved
-RecordDeleted=Record deleted
-LevelOfFeature=Level of features
-NotDefined=Not defined
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
-Administrator=Administrator
-Undefined=Undefined
-PasswordForgotten=Password forgotten?
-SeeAbove=See above
-HomeArea=Home area
-LastConnexion=Latest connection
-PreviousConnexion=Previous connection
-PreviousValue=Previous value
-ConnectedOnMultiCompany=Connected on environment
-ConnectedSince=Connected since
-AuthenticationMode=Authentication mode
-RequestedUrl=Requested URL
-DatabaseTypeManager=Database type manager
-RequestLastAccessInError=Latest database access request error
-ReturnCodeLastAccessInError=Return code for latest database access request error
-InformationLastAccessInError=Information for latest database access request error
-DolibarrHasDetectedError=Dolibarr has detected a technical error
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes
-MoreInformation=More information
-TechnicalInformation=Technical information
-TechnicalID=Technical ID
-NotePublic=Note (public)
-NotePrivate=Note (private)
-PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
-DoTest=Test
-ToFilter=Filter
-NoFilter=No filter
-WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance delay.
-yes=yes
-Yes=Yes
-no=no
-No=No
-All=All
-Home=Home
-Help=Help
-OnlineHelp=Online help
-PageWiki=Wiki page
-MediaBrowser=Media browser
-Always=Always
-Never=Never
-Under=under
-Period=Period
-PeriodEndDate=End date for period
-Activate=Activate
-Activated=Activated
-Closed=Closed
-Closed2=Closed
-NotClosed=Not closed
-Enabled=Enabled
-Deprecated=Deprecated
-Disable=Disable
-Disabled=Disabled
-Add=Add
-AddLink=Add link
-RemoveLink=Remove link
-AddToDraft=Add to draft
-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>?
-Delete=Delete
-Remove=Remove
-Resiliate=Terminate
-Cancel=Cancel
-Modify=Modify
-Edit=Edit
-Validate=Validate
-ValidateAndApprove=Validate and Approve
-ToValidate=To validate
-Save=Save
-SaveAs=Save As
-TestConnection=Test connection
-ToClone=Clone
-ConfirmClone=Choose data you want to clone :
-NoCloneOptionsSpecified=No data to clone defined.
-Of=of
-Go=Go
-Run=Run
-CopyOf=Copy of
-Show=Show
-Hide=Hide
-ShowCardHere=Show card
-Search=Search
-SearchOf=Search
-Valid=Valid
-Approve=Approve
-Disapprove=Disapprove
-ReOpen=Re-Open
-Upload=Send file
-ToLink=Link
-Select=Select
-Choose=Choose
-Resize=Resize
-Recenter=Recenter
-Author=Author
-User=User
-Users=Users
-Group=Group
-Groups=Groups
-NoUserGroupDefined=No user group defined
-Password=Password
-PasswordRetype=Retype your password
-NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
-Name=Name
-Person=Person
-Parameter=Parameter
-Parameters=Parameters
-Value=Value
-PersonalValue=Personal value
-NewValue=New value
-CurrentValue=Current value
-Code=Code
-Type=Type
-Language=Language
-MultiLanguage=Multi-language
-Note=Note
-Title=Title
-Label=Label
-RefOrLabel=Ref. or label
-Info=Log
-Family=Family
-Description=Description
-Designation=Description
-Model=Doc template
-DefaultModel=Default doc template
-Action=Event
-About=About
-Number=Number
-NumberByMonth=Number by month
-AmountByMonth=Amount by month
-Numero=Number
-Limit=Limit
-Limits=Limits
-Logout=Logout
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Connection
-Setup=Setup
-Alert=Alert
-Previous=Previous
-Next=Next
-Cards=Cards
-Card=Card
-Now=Now
-HourStart=Start hour
-Date=Date
-DateAndHour=Date and hour
-DateToday=Today's date
-DateReference=Reference date
-DateStart=Start date
-DateEnd=End date
-DateCreation=Creation date
-DateCreationShort=Creat. date
-DateModification=Modification date
-DateModificationShort=Modif. date
-DateLastModification=Latest modification date
-DateValidation=Validation date
-DateClosing=Closing date
-DateDue=Due date
-DateValue=Value date
-DateValueShort=Value date
-DateOperation=Operation date
-DateOperationShort=Oper. Date
-DateLimit=Limit date
-DateRequest=Request date
-DateProcess=Process date
-DateBuild=Report build date
-DatePayment=Date of payment
-DateApprove=Approving date
-DateApprove2=Approving date (second approval)
-UserCreation=Creation user
-UserModification=Modification user
-UserCreationShort=Creat. user
-UserModificationShort=Modif. user
-DurationYear=year
-DurationMonth=month
-DurationWeek=week
-DurationDay=day
-DurationYears=years
-DurationMonths=months
-DurationWeeks=weeks
-DurationDays=days
-Year=Year
-Month=Month
-Week=Week
-WeekShort=Week
-Day=Day
-Hour=Hour
-Minute=Minute
-Second=Second
-Years=Years
-Months=Months
-Days=Days
-days=days
-Hours=Hours
-Minutes=Minutes
-Seconds=Seconds
-Weeks=Weeks
-Today=Today
-Yesterday=Yesterday
-Tomorrow=Tomorrow
-Morning=Morning
-Afternoon=Afternoon
-Quadri=Quadri
-MonthOfDay=Month of the day
-HourShort=H
-MinuteShort=mn
-Rate=Rate
-CurrencyRate=Currency conversion rate
-UseLocalTax=Include tax
-Bytes=Bytes
-KiloBytes=Kilobytes
-MegaBytes=Megabytes
-GigaBytes=Gigabytes
-TeraBytes=Terabytes
-b=b.
-Kb=Kb
-Mb=Mb
-Gb=Gb
-Tb=Tb
-Cut=Cut
-Copy=Copy
-Paste=Paste
-Default=Default
-DefaultValue=Default value
-Price=Price
-UnitPrice=Unit price
-UnitPriceHT=Unit price (net)
-UnitPriceTTC=Unit price
-PriceU=U.P.
-PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (currency)
-PriceUTTC=U.P. (inc. tax)
-Amount=Amount
-AmountInvoice=Invoice amount
-AmountPayment=Payment amount
-AmountHTShort=Amount (net)
-AmountTTCShort=Amount (inc. tax)
-AmountHT=Amount (net of tax)
-AmountTTC=Amount (inc. tax)
-AmountVAT=Amount tax
-MulticurrencyAlreadyPaid=Already payed, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
-MulticurrencyAmountHT=Amount (net of tax), original currency
-MulticurrencyAmountTTC=Amount (inc. of tax), original currency
-MulticurrencyAmountVAT=Amount tax, original currency
-AmountLT1=Amount tax 2
-AmountLT2=Amount tax 3
-AmountLT1ES=Amount RE
-AmountLT2ES=Amount IRPF
-AmountTotal=Total amount
-AmountAverage=Average amount
-PriceQtyMinHT=Price quantity min. (net of tax)
-Percentage=Percentage
-Total=Total
-SubTotal=Subtotal
-TotalHTShort=Total (net)
-TotalHTShortCurrency=Total (net in currency)
-TotalTTCShort=Total (inc. tax)
-TotalHT=Total (net of tax)
-TotalHTforthispage=Total (net of tax) for this page
-Totalforthispage=Total for this page
-TotalTTC=Total (inc. tax)
-TotalTTCToYourCredit=Total (inc. tax) to your credit
-TotalVAT=Total tax
-TotalLT1=Total tax 2
-TotalLT2=Total tax 3
-TotalLT1ES=Total RE
-TotalLT2ES=Total IRPF
-HT=Net of tax
-TTC=Inc. tax
-VAT=Sales tax
-VATs=Sales taxes
-LT1ES=RE
-LT2ES=IRPF
-VATRate=Tax Rate
-Average=Average
-Sum=Sum
-Delta=Delta
-Module=Module
-Option=Option
-List=List
-FullList=Full list
-Statistics=Statistics
-OtherStatistics=Other statistics
-Status=Status
-Favorite=Favorite
-ShortInfo=Info.
-Ref=Ref.
-ExternalRef=Ref. extern
-RefSupplier=Ref. supplier
-RefPayment=Ref. payment
-CommercialProposalsShort=Commercial proposals
-Comment=Comment
-Comments=Comments
-ActionsToDo=Events to do
-ActionsToDoShort=To do
-ActionsDoneShort=Done
-ActionNotApplicable=Not applicable
-ActionRunningNotStarted=To start
-ActionRunningShort=In progress
-ActionDoneShort=Finished
-ActionUncomplete=Uncomplete
-CompanyFoundation=Company/Foundation
-ContactsForCompany=Contacts 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
-NActionsLate=%s late
-RequestAlreadyDone=Request already recorded
-Filter=Filter
-FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
-RemoveFilter=Remove filter
-ChartGenerated=Chart generated
-ChartNotGenerated=Chart not generated
-GeneratedOn=Build on %s
-Generate=Generate
-Duration=Duration
-TotalDuration=Total duration
-Summary=Summary
-DolibarrStateBoard=Statistics
-DolibarrWorkBoard=Work tasks board
-Available=Available
-NotYetAvailable=Not yet available
-NotAvailable=Not available
-Categories=Tags/categories
-Category=Tag/category
-By=By
-From=From
-to=to
-and=and
-or=or
-Other=Other
-Others=Others
-OtherInformations=Other informations
-Quantity=Quantity
-Qty=Qty
-ChangedBy=Changed by
-ApprovedBy=Approved by
-ApprovedBy2=Approved by (second approval)
-Approved=Approved
-Refused=Refused
-ReCalculate=Recalculate
-ResultKo=Failure
-Reporting=Reporting
-Reportings=Reporting
-Draft=Draft
-Drafts=Drafts
-Validated=Validated
-Opened=Opened
-New=New
-Discount=Discount
-Unknown=Unknown
-General=General
-Size=Size
-Received=Received
-Paid=Paid
-Topic=Subject
-ByCompanies=By third parties
-ByUsers=By users
-Links=Links
-Link=Link
-Rejects=Rejects
-Preview=Preview
-NextStep=Next step
-Datas=Data
-None=None
-NoneF=None
-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.
-Photo=Picture
-Photos=Pictures
-AddPhoto=Add picture
-DeletePicture=Picture delete
-ConfirmDeletePicture=Confirm picture deletion?
-Login=Login
-CurrentLogin=Current login
-EnterLoginDetail=Enter login details
-January=January
-February=February
-March=March
-April=April
-May=May
-June=June
-July=July
-August=August
-September=September
-October=October
-November=November
-December=December
-JanuaryMin=Jan
-FebruaryMin=Feb
-MarchMin=Mar
-AprilMin=Apr
-MayMin=May
-JuneMin=Jun
-JulyMin=Jul
-AugustMin=Aug
-SeptemberMin=Sep
-OctoberMin=Oct
-NovemberMin=Nov
-DecemberMin=Dec
-Month01=January
-Month02=February
-Month03=March
-Month04=April
-Month05=May
-Month06=June
-Month07=July
-Month08=August
-Month09=September
-Month10=October
-Month11=November
-Month12=December
-MonthShort01=Jan
-MonthShort02=Feb
-MonthShort03=Mar
-MonthShort04=Apr
-MonthShort05=May
-MonthShort06=Jun
-MonthShort07=Jul
-MonthShort08=Aug
-MonthShort09=Sep
-MonthShort10=Oct
-MonthShort11=Nov
-MonthShort12=Dec
-AttachedFiles=Attached files and documents
-FileTransferComplete=File was uploaded successfuly
-DateFormatYYYYMM=YYYY-MM
-DateFormatYYYYMMDD=YYYY-MM-DD
-DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
-ReportName=Report name
-ReportPeriod=Report period
-ReportDescription=Description
-Report=Report
-Keyword=Keyword
-Origin=Origin
-Legend=Legend
-Fill=Fill
-Reset=Reset
-File=File
-Files=Files
-NotAllowed=Not allowed
-ReadPermissionNotAllowed=Read permission not allowed
-AmountInCurrency=Amount in %s currency
-Example=Example
-Examples=Examples
-NoExample=No example
-FindBug=Report a bug
-NbOfThirdParties=Number of third parties
-NbOfLines=Number of lines
-NbOfObjects=Number of objects
-NbOfObjectReferers=Number of related items
-Referers=Related items
-TotalQuantity=Total quantity
-DateFromTo=From %s to %s
-DateFrom=From %s
-DateUntil=Until %s
-Check=Check
-Uncheck=Uncheck
-Internal=Internal
-External=External
-Internals=Internal
-Externals=External
-Warning=Warning
-Warnings=Warnings
-BuildDoc=Build Doc
-Entity=Environment
-Entities=Entities
-CustomerPreview=Customer preview
-SupplierPreview=Supplier preview
-ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show supplier preview
-RefCustomer=Ref. customer
-Currency=Currency
-InfoAdmin=Information for administrators
-Undo=Undo
-Redo=Redo
-ExpandAll=Expand all
-UndoExpandAll=Undo expand
-Reason=Reason
-FeatureNotYetSupported=Feature not yet supported
-CloseWindow=Close window
-Response=Response
-Priority=Priority
-SendByMail=Send by EMail
-MailSentBy=Email sent by
-TextUsedInTheMessageBody=Email body
-SendAcknowledgementByMail=Send confirmation email
-EMail=E-mail
-NoEMail=No email
-Email=Email
-NoMobilePhone=No mobile phone
-Owner=Owner
-FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
-Refresh=Refresh
-BackToList=Back to list
-GoBack=Go back
-CanBeModifiedIfOk=Can be modified if valid
-CanBeModifiedIfKo=Can be modified if not valid
-ValueIsValid=Value is valid
-ValueIsNotValid=Value is not valid
-RecordCreatedSuccessfully=Record created successfully
-RecordModifiedSuccessfully=Record modified successfully
-RecordsModified=%s record modified
-RecordsDeleted=%s record deleted
-AutomaticCode=Automatic code
-FeatureDisabled=Feature disabled
-MoveBox=Move widget
-Offered=Offered
-NotEnoughPermissions=You don't have permission for this action
-SessionName=Session name
-Method=Method
-Receive=Receive
-CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
-ExpectedValue=Expected Value
-CurrentValue=Current value
-PartialWoman=Partial
-TotalWoman=Total
-NeverReceived=Never received
-Canceled=Canceled
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
-Color=Color
-Documents=Linked files
-Documents2=Documents
-UploadDisabled=Upload disabled
-MenuECM=Documents
-MenuAWStats=AWStats
-MenuMembers=Members
-MenuAgendaGoogle=Google agenda
-ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=No documents saved in this directory
-CurrentUserLanguage=Current language
-CurrentTheme=Current theme
-CurrentMenuManager=Current menu manager
-Browser=Browser
-Layout=Layout
-Screen=Screen
-DisabledModules=Disabled modules
-For=For
-ForCustomer=For customer
-Signature=Signature
-DateOfSignature=Date of signature
-HidePassword=Show command with password hidden
-UnHidePassword=Show real command with clear password
-Root=Root
-Informations=Informations
-Page=Page
-Notes=Notes
-AddNewLine=Add new line
-AddFile=Add file
-FreeZone=Free entry
-FreeLineOfType=Free entry of type
-CloneMainAttributes=Clone object with its main attributes
-PDFMerge=PDF Merge
-Merge=Merge
-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 application at the moment.
-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
-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.
-AccordingToGeoIPDatabase=(according to GeoIP convertion)
-Line=Line
-NotSupported=Not supported
-RequiredField=Required field
-Result=Result
-ToTest=Test
-ValidateBefore=Card must be validated before using this feature
-Visibility=Visibility
-Private=Private
-Hidden=Hidden
-Resources=Resources
-Source=Source
-Prefix=Prefix
-Before=Before
-After=After
-IPAddress=IP address
-Frequency=Frequency
-IM=Instant messaging
-NewAttribute=New attribute
-AttributeCode=Attribute code
-URLPhoto=URL of photo/logo
-SetLinkToAnotherThirdParty=Link to another third party
-LinkTo=Link to
-LinkToProposal=Link to proposal
-LinkToOrder=Link to order
-LinkToInvoice=Link to invoice
-LinkToSupplierOrder=Link to supplier order
-LinkToSupplierProposal=Link to supplier proposal
-LinkToSupplierInvoice=Link to supplier invoice
-LinkToContract=Link to contract
-LinkToIntervention=Link to intervention
-CreateDraft=Create draft
-SetToDraft=Back to draft
-ClickToEdit=Click to edit
-ObjectDeleted=Object %s deleted
-ByCountry=By country
-ByTown=By town
-ByDate=By date
-ByMonthYear=By month/year
-ByYear=By year
-ByMonth=By month
-ByDay=By day
-BySalesRepresentative=By sales representative
-LinkedToSpecificUsers=Linked to a particular user contact
-NoResults=No results
-AdminTools=Admin tools
-SystemTools=System tools
-ModulesSystemTools=Modules tools
-Test=Test
-Element=Element
-NoPhotoYet=No pictures available yet
-Dashboard=Dashboard
-MyDashboard=My dashboard
-Deductible=Deductible
-from=from
-toward=toward
-Access=Access
-SelectAction=Select action
-HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
-SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
-OriginFileName=Original filename
-SetDemandReason=Set source
-SetBankAccount=Define Bank Account
-AccountCurrency=Account Currency
-ViewPrivateNote=View notes
-XMoreLines=%s line(s) hidden
-PublicUrl=Public URL
-AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
-PrintFile=Print File %s
-ShowTransaction=Show entry on bank account
-GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
-Deny=Deny
-Denied=Denied
-ListOfTemplates=List of templates
-Gender=Gender
-Genderman=Man
-Genderwoman=Woman
-ViewList=List view
-Mandatory=Mandatory
-Hello=Hello
-Sincerely=Sincerely
-DeleteLine=Delete line
-ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
-NoRecordSelected=No record selected
-MassFilesArea=Area for files built by mass actions
-ShowTempMassFilesArea=Show area of files built by mass actions
-RelatedObjects=Related Objects
-ClassifyBilled=Classify billed
-Progress=Progress
-ClickHere=Click here
-FrontOffice=Front office
-BackOffice=Back office
-View=View
-Export=Export
-Exports=Exports
-ExportFilteredList=Export filtered list
-ExportList=Export list
-Miscellaneous=Miscellaneous
-Calendar=Calendar
-GroupBy=Group by...
-ViewFlatList=View flat list
-RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Direct download link
-Download=Download
-ActualizeCurrency=Update currency rate
-Fiscalyear=Fiscal year
-# Week day
-Monday=Monday
-Tuesday=Tuesday
-Wednesday=Wednesday
-Thursday=Thursday
-Friday=Friday
-Saturday=Saturday
-Sunday=Sunday
-MondayMin=Mo
-TuesdayMin=Tu
-WednesdayMin=We
-ThursdayMin=Th
-FridayMin=Fr
-SaturdayMin=Sa
-SundayMin=Su
-Day1=Monday
-Day2=Tuesday
-Day3=Wednesday
-Day4=Thursday
-Day5=Friday
-Day6=Saturday
-Day0=Sunday
-ShortMonday=M
-ShortTuesday=T
-ShortWednesday=W
-ShortThursday=T
-ShortFriday=F
-ShortSaturday=S
-ShortSunday=S
-SelectMailModel=Select email template
-SetRef=Set ref
-Select2ResultFoundUseArrows=Some results found. Use arrows to select.
-Select2NotFound=No result found
-Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
-Select2LoadingMoreResults=Loading more results...
-Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
-SearchIntoContacts=Contacts
-SearchIntoMembers=Members
-SearchIntoUsers=Users
-SearchIntoProductsOrServices=Products or services
-SearchIntoProjects=Projects
-SearchIntoTasks=Tasks
-SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
-SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
-SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
-SearchIntoInterventions=Interventions
-SearchIntoContracts=Contracts
-SearchIntoCustomerShipments=Customer shipments
-SearchIntoExpenseReports=Expense reports
-SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang
index baae64633d0..cde23e7a4ad 100644
--- a/htdocs/langs/el_GR/accountancy.lang
+++ b/htdocs/langs/el_GR/accountancy.lang
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Αλλαγή και φόρτωση
 Addanaccount=Προσθέστε ένα λογιστικό λογαριασμό
 AccountAccounting=Λογιστική λογαριασμού
 AccountAccountingShort=Λογαριασμός
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Δημιουργήστε μία νέα συναλλαγή
 UpdateMvts=Τροποποίηση συναλλαγής
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=Γενικό Καθολικό
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Ημερολόγιο πωλήσεων
@@ -132,19 +140,19 @@ Sens=Σημασία
 Codejournal=Ημερολόγιο
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Λογιστική κατηγορία
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Ημερολόγιο οικονομικών
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=Νέα συναλλαγή
 NumMvts=Αριθμός συναλλαγής
 ListeMvts=List of movements
 ErrorDebitCredit=Χρεωστικές και Πιστωτικές δεν μπορούν να χουν την ίδια αξία ταυτόχρονα
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=Λίστα των λογιστικών λογαριασμών
 
 Pcgtype=Τύπος λογαριασμού
-Pcgsubtype=Δευτερεύουσα κατηγορία λογαριασμού
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Συνολικό περιθώριο πωλήσεων
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Σφάλμα, δεν μπορείτε να διαγράψετε αυτόν τον λογιστικό λογαριασμό γιατί χρησιμοποιείται
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Κώδικας
+Nature=Nature
+AccountingJournalType1=Various operation
+AccountingJournalType2=Πωλήσεις
+AccountingJournalType3=Αγορές
+AccountingJournalType4=Τράπεζα
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Εξαγωγές
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index 1643b2e2621..0fcaa6d8b14 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=Εσωτερικοί χρήστες
 ExternalUsers=Εξωτερικοί χρήστες
 GUISetup=Εμφάνιση
 SetupArea=Περιοχή ρύθμισης
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Έντυπο για να ελέγξετε το αρχείο μεταφόρτωσης (ανάλογα με τις ρυθμίσεις)
 IfModuleEnabled=Σημείωση: ναι, είναι αποτελεσματική μόνο αν το module <b>%s</b> είναι ενεργοποιημένο
 RemoveLock=Αφαιρέστε το αρχείο <b>%s</b>, αν υπάρχει, για να επιτραπεί η χρήση του εργαλείου ενημέρωσης.
@@ -85,7 +86,7 @@ Mask=Μάσκα
 NextValue=Επόμενο
 NextValueForInvoices=Επόμενο (τιμολόγιο)
 NextValueForCreditNotes=Επόμενο (πιστωτικά τιμολόγια)
-NextValueForDeposit=Επόμενη αξία (κατάθεση)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Επόμενη αξία (αντικατάστασης)
 MustBeLowerThanPHPLimit=Σημείωση: Η PHP σας περιορίζει το μέγεθος κάθε αρχείου αποστολής σε <b>%s</ b> %s, ανεξάρτητα από το ποιά είναι η αξία αυτής της παραμέτρου.
 NoMaxSizeByPHPLimit=Σημείωση: Κανένα όριο δεν έχει οριστεί στη διαμόρφωση του PHP σας
@@ -103,7 +104,7 @@ MenuIdParent=ID Μητρικού Μενού
 DetailMenuIdParent=ID του μητρικού μενού (άδειο για το μενού κορυφής)
 DetailPosition=Αριθμός Ταξινόμησης για να καθοριστεί η θέση του μενού
 AllMenus=Όλα
-NotConfigured=Το Module δεν έχει ρυθμιστεί
+NotConfigured=Module/Application not configured
 Active=Ενεργό
 SetupShort=Ρύθμιση
 OtherOptions=Άλλες Επιλογές
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Διαχωριστικό Χιλιάδων
 Destination=Προορισμός
 IdModule=Module ID
 IdPermissions=Δικαιώματα ID
-Modules=Modules
 LanguageBrowserParameter=Παράμετρος %s
 LocalisationDolibarrParameters=Παράμετροι τοπικών ρυθμίσεων
 ClientTZ=Ζώνη Ώρας χρήστη (χρήστης)
@@ -123,7 +123,8 @@ PHPTZ=Ζώνη Ώρας PHP server
 DaylingSavingTime=Η θερινή ώρα (χρήστη)
 CurrentHour=PHP server hour
 CurrentSessionTimeOut=Χρονικό όριο περιόδου λειτουργίας τρέχουσας συνοδού
-YouCanEditPHPTZ=Για να ορίσετε μια διαφορετική ζώνη ώρας της PHP (δεν απαιτείται), μπορείτε να δοκιμάσετε να προσθέσετε ένα αρχείο .htacces με μια γραμμή σαν αυτό "TZ setenv Europe / Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Μέγιστο πλήθος γραμμών για τα widgets
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Δικαιώματα
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Μόνο στοιχεία από <a href="%s">ενεργοποιημένα modules</a> προβάλλονται.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Ο κωδικός της βάσης δεδομέ
 InstrucToEncodePass=Για κρυπτογραφημένο κωδικό στο αρχείο <b>conf.php</b>, κάντε αντικατάσταση στη γραμμή <br><b>$dolibarr_main_db_pass="...";</b><br>με<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=Προστασία παραγόμενων αρχείων pdf (Η ενεργοποίηση ΔΕΝ προτείνεται, χαλάει την μαζική δημιουργία pdf)
-ProtectAndEncryptPdfFilesDesc=Η ασφάλεια ενός αρχείου PDF επιτρέπει τα προγράμματα ανάγνωσης PDF να το ανοίξουν και να το εκτυπώσουν.  Παρ' ΄όλα αυτά, η τροποποίηση και η αντιγραφή δεν θα είναι πλέον δυνατά.  Σημειώστε πως αν χρησιμοποιήσετε αυτή την λειτουργία δεν θα μπορούν να δουλέψουν ομαδικά pdf (όπως απλήρωτα τιμολόγια).
+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=Χαρακτηριστικό
 DolibarrLicense=Άδεια χρήσης
 Developpers=Προγραμματιστές/συνεργάτες
@@ -224,7 +225,9 @@ OfficialDemo=Δοκιμαστική έκδοση Dolibarr
 OfficialMarketPlace=Επίσημη ιστοσελίδα για εξωτερικά modules/πρόσθετα
 OfficialWebHostingService=Υπηρεσίες που αναφέρονται για web hosting (Cloud hosting)
 ReferencedPreferredPartners=Preferred Partners
-OtherResources=Άλλοι πόροι
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=Για την τεκμηρίωση χρήστη ή προγραμματιστή  (Doc, FAQs...),<br>ρίξτε μια ματιά στο Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=Για οποιαδήποτε άλλη ερώτηση/βοήθεια, μπορείτε να χρησιμοποιήσετε το forum του Dolibarr:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Αυτή η περιοχή μπορεί να σας βοηθήσει να αποκτήσετε υπηρεσίες βοήθειας στο Dolibarr.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=Αυτή η λειτουργία δεν είναι δ
 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/
 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=Διαχείριση Αρθρώματος
-ModulesSetup=Διαχείριση Αρθρωμάτων
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Σύστημα
 ModuleFamilyCrm=Customer Relation Management (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=Έκδοση Dolibarr
 CallUpdatePage=Μετάβαση στη σελίδα ενημέρωσης της δομής της βάσης δεδομένων και των δεδομένων: %s.
 LastStableVersion=Τελευταία σταθερή έκδοση
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Ο διακομιστής ενημερώσεων είναι εκτός σύνδεσης
+WithCounter=Manage a counter
 GenericMaskCodes=Μπορείτε να χρησιμοποιήσετε οποιαδήποτε μάσκα αρίθμησης. Σε αυτή τη μάσκα  μπορούν να χρησιμοποιηθούν τις παρακάτω ετικέτες:<br>Το <b>{000000}</b> αντιστοιχεί σε έναν αριθμό που θα αυξάνεται σε κάθε %s. Εισάγετε όσα μηδέν επιθυμείτε ως το επιθυμητό μέγεθος για τον μετρητή. Ο μετρητής θα συμπληρωθεί με μηδενικά από τα αριστερά για να έχει όσα μηδενικά υπάρχουν στην μάσκα. <br>Η μάσκα <b>{000000+000}</b> είναι η ίδια όπως προηγουμένως αλλά ένα αντιστάθμισμα που αντιστοιχεί στον αριθμό στα δεξιά του + θα προστεθεί αρχίζοντας από το πρώτο %s. <br>Η μάσκα <b>{000000@x}</b> είναι η ίδια όπως προηγουμένως αλλά ο μετρητής επανέρχεται στο μηδέν όταν έρθει ο μήνας x  (το x είναι μεταξύ του 1 και του 12). Αν αυτή η επιλογή χρησιμοποιηθεί και το x είναι 2 ή μεγαλύτερο, τότε η ακολουθία {yy}{mm} ή {yyyy}{mm} είναι επίσης απαιραίτητη. <br>Η μάσκα <b>{dd}</b> ημέρα (01 έως 31).<br><b>{mm}</b> μήνας (01 έως 12).<br><b>{yy}</b>, <b>{yyyy}</b> ή <b>{y}</b> έτος με χρήση 2, 4 ή 1 αριθμού. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Όλοι οι άλλοι χαρακτήρες στην μάσκα θα παραμείνουν ίδιοι.<br>Κενά διαστήματα δεν επιτρέπονται.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Το παράδειγμα του τρίτου μέρους δημιουργήθηκε στις 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Παράδειγμα το προϊόν δημιουργήθηκε στις 2007-03-01:</u><br>
-GenericMaskCodes5=Η μάσκα <b>ABC{yy}{mm}-{000000}</b> θα δώσει <b>ABC0701-000099</b><br>Η μάσκα<b>{0000+100}-ZZZ/{dd}/XXX</b> θα δώσει <b>0199-ZZZ/31/XXX</b>
+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=Επιστρέφει έναν παραμετροποιήσημο αριθμό σύμφωνα με μία ορισμένη μάσκα.
 ServerAvailableOnIPOrPort=Ο διακομιστής είναι διαθέσιμος στην διεύθυνση <b>%s</b> στην θύρα <b>%s</b>
 ServerNotAvailableOnIPOrPort=Ο διακομιστής δεν είναι διαθέσιμος στην διεύθυνση <b>%s</b> στην θύρα <b>%s</b>
@@ -369,19 +375,21 @@ Int=Integer
 Float=Float
 DateAndTime=Ημερομηνία και ώρα
 Unique=Μοναδικό
-Boolean=Boolean (Checkbox)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Τηλέφωνο
 ExtrafieldPrice = Τιμή
 ExtrafieldMail = Email
 ExtrafieldUrl = Url
 ExtrafieldSelect = Επιλογή από λίστα
 ExtrafieldSelectList = Επιλογή από πίνακα
-ExtrafieldSeparator=Διαχωριστικό
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Συνθηματικό
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Πλαίσιο ελέγχου από τον πίνακα
+ExtrafieldRadio=Radio buttons (on 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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Η λίστα παραμέτρων θα πρέπει να είναι σαν το κλειδί,value<br><br> για παράδειγμα : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Η λίστα παραμέτρων θα πρέπει να είναι σαν το κλειδί,value<br><br> για παράδειγμα : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Field
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Χρήστες & Ομάδες
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=Τιμολόγιο και πιστωτικό τιμολόγιο δ
 Module40Name=Προμηθευτές
 Module40Desc=Διαχείριση προμηθευτών και παραστατικά αγοράς (παραγγελίες και τιμολόγια)
 Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Επεξεργαστές κειμένου
 Module49Desc=Διαχείριση επεξεργαστών κειμένου
 Module50Name=Προϊόντα
@@ -499,8 +521,8 @@ Module410Name=Ημερολόγιο ιστού
 Module410Desc=Διεπαφή ημερολογίου ιστού
 Module500Name=Ειδικά έξοδα
 Module500Desc=Διαχείριση ειδικών εξόδων (φόροι, δόσεις)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Δάνειο
 Module520Desc=Διαχείριση δανείων
 Module600Name=Notifications
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
-Module4000Desc=Διαχείριση ανθρώπινου δυναμικού
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Σας επιτρέπει να διαχειριστήτε πολλές εταιρείες
 Module6000Name=Ροή εργασίας
@@ -591,7 +615,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects i'm contact for)
 Permission45=Εξαγωγή έργων
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Μέθοδος Παραγγελίας
 DictionarySource=Προέλευση των προτάσεων/παραγγελιών
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Μοντέλα λογιστικού σχεδίου
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Πρότυπα email
 DictionaryUnits=Μονάδες
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Οι ρυθμίσεις αποθηκεύτηκαν
+SetupNotSaved=Setup not saved
 BackToModuleList=Πίσω στη λίστα με τα modules
 BackToDictionaryList=Επιστροφή στη λίστα λεξικών
 VATManagement=Διαχείριση Φ.Π.Α.
@@ -921,7 +947,7 @@ Host=Διακομιστής
 DriverType=Driver type
 SummarySystem=Σύνοψη πληροφοριών συστήματος
 SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Εταιρία/Οργανισμός
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= Standard menu manager
 DefaultMenuSmartphoneManager=Smartphone menu manager
 Skin=Θέμα
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Προεπιλεγμένο μέγιστο μέγεθος γι
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=Μήνυμα της ημέρας
 MessageLogin=Μήνυμα σελίδας εισόδου
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Προκαθορισμένη Γλώσσα (κωδ. γλώσσας)
 EnableMultilangInterface=Ενεργοποίησ πολυγλωσσικού περιβάλλοντος
 EnableShowLogo=Εμφάνιση λογότυπου στο αριστερό μενού
-CompanyInfo=Πληροφορίες Εταιρίας/Οργανισμού
-CompanyIds=Ταυτότητες Εταιρίας/Οργανισμού
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=Όνομα
 CompanyAddress=Διεύθυνση
 CompanyZip=Τ.Κ.
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Other menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Ιστορικό εισόδου χρηστών
@@ -987,7 +1015,7 @@ BrowserOS=Λειτουργικό σύστημα φυλλομετρητή
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Συμβάντα ασφαλείας εξαγνίζονται
 LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists 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
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=Μπορείτε να χρησιμοποιήσετε το πρόγραμμα οδήγησης %s που είναι καλύτερος οδηγός που διατίθεται σήμερα.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Επαγγελματική ταυτότητα μοναδι
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####
 BillsSetup=Invoices module setup
 BillsNumberingModule=Τιμολόγια και πιστωτικά τιμολόγια μοντέλο αρίθμησης
 BillsPDFModules=Invoice documents models
+PaymentsPDFModules=Payment documents models
 CreditNote=Πιστωτικό τιμολόγιο
 CreditNotes=Πιστωτικά τιμολόγια
 ForceInvoiceDate=Force invoice date to validation date
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Αρχεία τύπου %s δεν αποθηκεύοντα
 FilesOfTypeCompressed=Τα αρχεία τύπου %s συμπιέζονται από το διακομιστή HTTP
 FilesOfTypeNotCompressed=Αρχεία τύπου %s δεν συμπιέζονται από το διακομιστή HTTP
 CacheByServer=Cache από τον server
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache από τον browser
 CompressionOfResources=Συμπίεση HTTP απαντήσεων
+CompressionOfResourcesDesc=For exemple using the Apache directive "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Μια τέτοια αυτόματη ανίχνευση δεν είναι δυνατόν με τα τρέχουσα προγράμματα περιήγησης
+DefaultValuesDesc=You can define/force here the default value you want to get when your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Products module setup
 ServiceSetup=Υπηρεσίες εγκατάστασης μονάδας
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Invoice date used
 Buy=Αγορά
 Sell=Πώληση
 InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=Κωδικός Λογιστική
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Ορίστε αυτό το καθεστώς για
 AGENDA_DEFAULT_VIEW=Ποια καρτέλα θέλετε να ανοίξετε από προεπιλογή κατά την επιλογή του μενού Ατζέντα
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+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 your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
+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.
 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 same computer than 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.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+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.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=Γενική σειρά εμφάνισης
 BankOrderES=Ισπανικά
 BankOrderESDesc=Ισπανικά σειρά εμφάνισης
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ 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.
 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.
-ConfFileMuseContainCustom=Installing 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)
 TextTitleColor=Χρώμα τίτλου σελίδας
 LinkColor=Χρώμα σε συνδέσμους
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Χρώμα φόντου
 TopMenuBackgroundColor=Χρώμα φόντου για το επάνω μενού
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Θέση γραμμής σε σύνθετο πλαίσιο
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/el_GR/compta.lang b/htdocs/langs/el_GR/compta.lang
index c0cb883b521..f236f0314b3 100644
--- a/htdocs/langs/el_GR/compta.lang
+++ b/htdocs/langs/el_GR/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Τα ποσά που εμφανίζοντ
 Param=Παραμετροποίηση
 RemainingAmountPayment=Ποσό πληρωμής που απομένουν:
 Account=Λογαριασμός
-Accountparent=Account parent
-Accountsparent=Accounts parent
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=Έσοδα
 Outcome=Έξοδα
 ReportInOut=Έσοδα / Έξοδα
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Taxes and dividends
 MenuSocialContributions=Κοινωνικές/φορολογικές εισφορές
 MenuNewSocialContribution=Νέα Κοιν/Φορ εισφορά
 NewSocialContribution=Νέα Κοινωνική/Φορολογική εισφορά
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Κοινωνικές/Φορολογικές εισφορές προς πληρωμή
 AccountancyTreasuryArea=Περιοχή Οικονομικών/Περιουσιακών Στοιχείων
 NewPayment=Νέα Πληρωμή
@@ -134,8 +135,8 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from clients.<br>- It is based on the payment date of these invoices<br>
-DepositsAreNotIncluded=- Τα τιμολόγια ασφαλείας ούτε περιλαμβάνονται
-DepositsAreIncluded=- Περιλαμβάνονται τιμολόγια ασφαλείας
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Έκθεση του τρίτου IRPF
 LT1ReportByCustomersInInputOutputModeES=Αναφορά Πελ./Προμ. RE
 VATReport=VAT report
@@ -169,7 +170,7 @@ DescSellsJournal=Ημερολόγιο πωλήσεων
 DescPurchasesJournal=Ημερολόγιο Αγορών
 InvoiceRef=Αρ. Τιμολογίου
 CodeNotDef=Δεν προσδιορίζεται
-WarningDepositsNotIncluded=Καταθέσεις τιμολόγια δεν περιλαμβάνονται σε αυτή την έκδοση με αυτή την ενότητα λογιστικής.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
 Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
@@ -189,11 +190,13 @@ AccountancyJournal=Λογιστικος Κωδικός περιοδικό
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
-CloneTaxForNextMonth=Κλώνοποίηση στον επόμενο μήνα
+CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Απλή αναφορά
 AddExtraReport=Extra reports (add foreign and national customer report)
 OtherCountriesCustomersReport=Αναφορά για πελάτες εξωτερικού
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Κοινωνικές/φορολογικές εισφο
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/el_GR/cron.lang b/htdocs/langs/el_GR/cron.lang
index 5cb45d0d0ff..f5c8251118c 100644
--- a/htdocs/langs/el_GR/cron.lang
+++ b/htdocs/langs/el_GR/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Διαγραφή προγραμματισμένων εργασιών
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allow to execute job that have been planned
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Εργασία
 CronNone=Καμία
 CronDtStart=Όχι πριν
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Ενεργοποίηση
 CronStatusInactiveBtn=Απενεργοποίηση
 CronTaskInactive=Αυτή η εργασία είναι απενεργοποιημένη
 CronId=Id
-CronClassFile=Classes (filename.class.php)
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=Γραμμή εντολών του συστήματος προς εκτέλεση.
 CronCreateJob=Create new Scheduled Job
 CronFrom=Από
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Αντίγραφο ασφαλείας τοπικής βάσης δεδομένων
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/el_GR/errors.lang b/htdocs/langs/el_GR/errors.lang
index 0937639e4b8..769da44986d 100644
--- a/htdocs/langs/el_GR/errors.lang
+++ b/htdocs/langs/el_GR/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Απέτυχε η δημιουργία του αρχείο
 ErrorFailToRenameDir=Απέτυχε να μετονομάσετε <b>«%s»</b> κατάλογο σε <b>«%s».</b>
 ErrorFailToCreateDir=Αποτυχία δημιουργίας καταλόγου <b>%s</b>.
 ErrorFailToDeleteDir=Αποτυχία για να διαγράψετε τον κατάλογο <b>«%s».</b>
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=Η επαφή αυτή έχει ήδη οριστεί ως επαφή για αυτόν τον τύπο.
 ErrorCashAccountAcceptsOnlyCashMoney=Αυτό τραπεζικός λογαριασμός είναι ένας λογαριασμός σε μετρητά, έτσι ώστε να δέχεται πληρωμές σε μετρητά τύπου μόνο.
 ErrorFromToAccountsMustDiffers=Πηγή και τους στόχους των τραπεζικών λογαριασμών πρέπει να είναι διαφορετικό.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Αποτυχία εγγραφής στον %s φάκελ
 ErrorFoundBadEmailInFile=Βρέθηκε εσφαλμένη σύνταξη e-mail για %s γραμμές στο αρχείο (%s γραμμή παράδειγμα με e-mail = %s)
 ErrorUserCannotBeDelete=Ο χρήστης δεν μπορεί να διαγραφεί. Μπορεί να σχετίζεται με οντότητες του Dolibarr.
 ErrorFieldsRequired=Ορισμένα από τα απαιτούμενα πεδία δεν έχουν συμπληρωθεί.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Αποτυχία δημιουργίας φακέλου. Βεβαιωθείτε ότι ο Web server χρήστης έχει δικαιώματα να γράψει στο φάκελο εγγράφων του Dolibarr. Αν η <b>safe_mode</b> παράμετρος είναι ενεργοποιημένη για την PHP, ελέγξτε ότι τα αρχεία php του Dolibarr ανήκουν στον web server χρήστη (ή ομάδα).
 ErrorNoMailDefinedForThisUser=Δεν έχει οριστεί mail για αυτόν το χρήστη
 ErrorFeatureNeedJavascript=Αυτό το χαρακτηριστικό χρειάζεται ενεργοποιημένη την javascript. Αλλάξτε την ρύθμιση στο Ρυθμίσεις - Εμφάνιση.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Η ποσότητα στην γραμμ
 ErrorWebServerUserHasNotPermission=Λογαριασμό χρήστη <b>%s</b> χρησιμοποιείται για την εκτέλεση του web server δεν έχει άδεια για τη συγκεκριμένη
 ErrorNoActivatedBarcode=Δεν ενεργοποιείται τύπου barcode
 ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Το πεδίο  <b>%s</b> πρέπει να περιέχει αριθμητική τιμή
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # 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.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Η ημερομηνία πληρωμής
 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/el_GR/main.lang b/htdocs/langs/el_GR/main.lang
index 3ef9a412d08..1d08888e0e4 100644
--- a/htdocs/langs/el_GR/main.lang
+++ b/htdocs/langs/el_GR/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=Η παράμετρος %s δεν είναι καθορ
 ErrorUnknown=Άγνωστο σφάλμα
 ErrorSQL=Σφάλμα SQL
 ErrorLogoFileNotFound=Το λογότυπο  '%s' δεν βρέθηκε
-ErrorGoToGlobalSetup=Πηγαίνετε στο 'Εταιρία/Οργανισμός' Ρυθμίσεις για να το διορθώσετε
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=Πηγαίνετε στις ρυθμίσεις του αρθρώματος για να το διορθώσετε.
 ErrorFailedToSendMail=Αποτυχία αποστολής mail (αποστολέας=%s, παραλήπτης=%s)
 ErrorFileNotUploaded=Το αρχείο δεν φορτώθηκε. Βεβαιωθείτε ότι το μέγεθος δεν υπερβαίνει το μέγιστο επιτρεπόμενο όριο, ότι υπάρχει διαθέσιμος χώρος στο δίσκο και ότι δεν υπάρχει ήδη ένα αρχείο με το ίδιο όνομα σε αυτόν τον κατάλογο.
@@ -153,6 +153,7 @@ Edit=Επεξεργασία
 Validate=Επικύρωση
 ValidateAndApprove=Επικύρωση και Έγκριση
 ToValidate=Προς Επικύρωση
+NotValidated=Not validated
 Save=Αποθήκευση
 SaveAs=Αποθήκευση Ως
 TestConnection=Δοκιμή Σύνδεσης
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=Δεν εφαρμόζεται το χαρακτηρ
 Connection=Σύνδεση
 Setup=Ρυθμίσεις
 Alert=Συναγερμός
+MenuWarnings=Συναγερμοί
 Previous=Προηγούμ.
 Next=Επόμ.
 Cards=Καρτέλες
@@ -289,7 +291,7 @@ Afternoon=Απόγευμα
 Quadri=Τετραπλής
 MonthOfDay=Μήνας από την ημέρα
 HourShort=Ω
-MinuteShort=εκ
+MinuteShort=mn
 Rate=Βαθμός
 CurrencyRate=Currency conversion rate
 UseLocalTax=με Φ.Π.Α
@@ -308,6 +310,7 @@ Copy=Αντιγραφή
 Paste=Επικόλληση
 Default=Προκαθορ.
 DefaultValue=Προκαθορισμένη Τιμή
+DefaultValues=Default values
 Price=Τιμή
 UnitPrice=Τιμή Μονάδος
 UnitPriceHT=Τιμή Μονάδος (χ. Φ.Π.Α)
@@ -363,7 +366,8 @@ VATRate=Συντελεστής Φ.Π.Α.
 Average=Μ.Ο.
 Sum=Σύνολο
 Delta=Δέλτα
-Module=Άρθρωμα
+Module=Module/Application
+Modules=Modules/Applications
 Option=Επιλογή
 List=Λίστα
 FullList=Πλήρης Λίστα
@@ -387,7 +391,7 @@ ActionRunningNotStarted=Δεν έχουν ξεκινήσει
 ActionRunningShort=Σε εξέλιξη
 ActionDoneShort=Ολοκληρωμένες
 ActionUncomplete=Μη ολοκληρωμένη
-CompanyFoundation=Εταιρία/Οργανισμός
+CompanyFoundation=Company/Organisation
 ContactsForCompany=Επαφές για αυτό το στοιχείο
 ContactsAddressesForCompany=Επαφές/Διευθύνσεις για αυτό το στοιχείο.
 AddressesForCompany=Διευθύνσεις για αυτό τον Πελ./Προμ.
@@ -405,8 +409,9 @@ Generate=Δημιουργία
 Duration=Διάρκεια
 TotalDuration=Συνολική Διάρκεια
 Summary=Σύνοψη
-DolibarrStateBoard=Στατιστικά
-DolibarrWorkBoard=Πίνακας εργασιών
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=Σε διάθεση
 NotYetAvailable=Δεν είναι ακόμη σε διάθεση
 NotAvailable=Χωρίς διάθεση
@@ -434,7 +439,7 @@ Reportings=Αναφορές
 Draft=Προσχέδιο
 Drafts=Προσχέδια
 Validated=Επικυρωμένο
-Opened=Ανοίξτε
+Opened=Άνοιγμα
 New=Νέο
 Discount=Έκπτωση
 Unknown=Άγνωστο
@@ -453,6 +458,7 @@ NextStep=Επόμενο Βήμα
 Datas=Δεδομένα
 None=None
 NoneF=None
+NoneOrSeveral=None or several
 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.
 Photo=Φωτογραφία
@@ -606,7 +612,8 @@ PartialWoman=Μερική
 TotalWoman=Συνολικές
 NeverReceived=Δεν παραλήφθηκε
 Canceled=Ακυρώθηκε
-YouCanChangeValuesForThisListFromDictionarySetup=Μπορείτε να αλλάξετε τις τιμές για αυτή τη λίστα από το μενού Ρυθμίσεις - Διαχείριση Λεξικού
+YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu Setup - Dictionaries
+YouCanChangeValuesForThisListFrom=You can change values for this list from menu %s
 YouCanSetDefaultValueInModuleSetup=Μπορείτε να ορίσετε την προεπιλεγμένη τιμή που θα χρησιμοποιείται κατά τη δημιουργία μίας νέας εγγραφής στις ρυθμίσεις του module
 Color=Χρώμα
 Documents=Συνδεδεμένα Αρχεία
@@ -642,6 +649,7 @@ FreeLineOfType=Δωρεάν είσοδος του τύπου
 CloneMainAttributes=Κλωνοποίηση αντικειμένου με τα βασικά του χαρακτηριστικά
 PDFMerge=Ενσωμάτωση PDF
 Merge=Ενσωμάτωση
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Εμγάνιση σελίδας για εκτύπωση
 MenuManager=Menu manager
 WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only login <b>%s</b> is allowed to use application at the moment.
@@ -708,6 +716,7 @@ from=από
 toward=προς
 Access=Πρόσβαση
 SelectAction=Επιλογή ενέργειας
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Χρησιμοποιήστε το Ctrl + C για να αντιγράψετε στο πρόχειρο
 SaveUploadedFileWithMask=Αποθηκεύστε το αρχείο στον server με το όνομα "<strong>%s</strong>" (αλλιώς "%s")
 OriginFileName=Αρχική Ονομασία
@@ -718,7 +727,7 @@ ViewPrivateNote=Προβολή σημειώσεων
 XMoreLines=%s γραμμή (ές) κρυμμένη
 PublicUrl=Δημόσια URL
 AddBox=Προσθήκη πεδίου
-SelectElementAndClickRefresh=Επιλέξτε ένα στοιχείο και κάντε κλικ στο κουμπί Ανανέωση
+SelectElementAndClick=Select an element and click %s
 PrintFile=Εκτύπωση του αρχείου %s
 ShowTransaction=Εμφάνιση καταχώρισης σε τραπεζικό λογαριασμό
 GoIntoSetupToChangeLogo=Πηγαίνετε Αρχική - Ρυθμίσεις - Εταιρία να αλλάξει το λογότυπο ή πηγαίνετε Αρχική - Ρυθμίσεις - Προβολή για απόκρυψη.
@@ -734,8 +743,8 @@ Hello=Χαίρετε
 Sincerely=Ειλικρινώς
 DeleteLine=Διαγραφή γραμμής
 ConfirmDeleteLine=Είστε σίγουρος ότι θέλετε να διαγράψετε αυτή τη γραμμή;
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Έχουν επιλεγεί πάρα πολλές εγγραφές για μαζική τροποποίηση. Η ενέργεια έχει περιοριστεί σε μία λίστα %s εγγραφών.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
@@ -755,11 +764,20 @@ Calendar=Ημερολόγιο
 GroupBy=Ομαδοποίηση κατά...
 ViewFlatList=Προβολή λίστας
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Οικονομικό έτος
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Δευτέρα
 Tuesday=Τρίτη
@@ -817,5 +835,3 @@ SearchIntoContracts=Συμβόλαια
 SearchIntoCustomerShipments=Αποστολές Πελάτη
 SearchIntoExpenseReports=Αναφορές εξόδων
 SearchIntoLeaves=Άδειες
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/el_GR/other.lang b/htdocs/langs/el_GR/other.lang
index 083a67112da..36fdab4f121 100644
--- a/htdocs/langs/el_GR/other.lang
+++ b/htdocs/langs/el_GR/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Ημερομηνία γενεθλίων
 DateToBirth=Ημερομηνία γεννήσεως
 BirthdayAlertOn=Ειδοποίηση γενεθλίων ενεργή
 BirthdayAlertOff=Ειδοποίηση γενεθλίων ανενεργή
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Προσθήκη επαφής στην παρέμβαση
 Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Παρέμβαση αποστέλλεται μέσω ταχυδρομείου
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=Αυτό είναι ένα μήνυμα <b>δοκιμής
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε το τιμολόγιο __REF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε την προσφορά __PROPREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε το αίτημα των τιμών __ASKREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε τη παραγγελία __ORDERREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε την παραγγελία μας __ORDERREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε το τιμολόγιο __REF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε την αποστολή __SHIPPINGREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε την παρέμβαση __FICHINTERREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Καθ %s ταυτότητα</b> είναι μια ενημερωτική ανάλογα με τρίτη χώρα μέρος. <br> Για παράδειγμα, για <b>%s</b> χώρα, είναι <b>%s</b> κώδικα.
 DolibarrDemo=Dolibarr ERP / CRM demo
-StatsByNumberOfUnits=Στατιστικά στοιχεία τον αριθμό των προϊόντων / υπηρεσιών μονάδες
-StatsByNumberOfEntities=Στατιστικά στοιχεία τον αριθμό των φορέων που αναφέρονται
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=Μια νέα παρέμβαση %s έχει ανατεθεί σε εσάς
 EMailTextInterventionValidated=Η %s παρέμβαση έχει επικυρωθεί.
 EMailTextInvoiceValidated=Το τιμολόγιο %s έχει επικυρωθεί.
diff --git a/htdocs/langs/el_GR/projects.lang b/htdocs/langs/el_GR/projects.lang
index 183242493a1..3b2e9f1c3db 100644
--- a/htdocs/langs/el_GR/projects.lang
+++ b/htdocs/langs/el_GR/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Περιοχή έργων
 ProjectStatus=Κατάσταση έργου
 SharedProject=Όλοι
 PrivateProject=Αντιπρόσωποι του έργου
+ProjectsImContactFor=Projects I'm explicitely a contact of
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=Όλα τα έργα
 MyProjectsDesc=Η άποψη αυτή περιορίζονται σε έργα που είναι σε μια επαφή για την (όποια είναι ο τύπος).
 ProjectsPublicDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα σας επιτρέπεται να διαβάσετε.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,6 +26,7 @@ TasksDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα κ
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=Νέο Έργο
 AddProject=Δημιουργία έργου
 DeleteAProject=Διαγραφή Έργου
@@ -30,13 +34,14 @@ DeleteATask=Διαγραφή Εργασίας
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
 OpenedProjects=Ανοιχτά έργα
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Εμφάνιση έργου
 SetProject=Set project
 NoProject=No project defined or owned
 NbOfProjects=Αριθμός έργων
+NbOfTasks=Nb of tasks
 TimeSpent=Χρόνος που δαπανήθηκε
 TimeSpentByYou=Χρόνος που δαπανάται από εσάς
 TimeSpentByUser=Χρόνος που δαπανάται από τον χρήστη
@@ -47,9 +52,9 @@ TaskTimeSpent=Ο χρόνος που δαπανάται σε εργασίες
 TaskTimeUser=Χρήστης
 TaskTimeNote=Σημείωση
 TaskTimeDate=Ημερομηνία
-TasksOnOpenedProject=Εργασίες σχετικές με τα ανοικτά έργα
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Ο φόρτος εργασίας δεν ορίζεται
-NewTimeSpent=Νέος χρόνος που δαπανάται
+NewTimeSpent=Ο χρόνος που δαπανάται
 MyTimeSpent=Ο χρόνος μου πέρασε
 Tasks=Εργασίες
 Task=Εργασία
@@ -59,6 +64,7 @@ TaskDescription=Περιγραφή των εργασιών
 NewTask=Νέα Εργασία
 AddTask=Δημιουργία εργασίας
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Δραστηριότητα
 Activities=Εργασίες/Δραστηριότητες
 MyActivities=Οι εργασίες/δραστηρ. μου
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Κατάλογος των συμβάσεων που συνδέονται με το έργο
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=Κατάλογος των παρεμβάσεων που σχετίζονται με το έργο
 ListExpenseReportsAssociatedProject=Λίστα αναφορών των δαπανών που σχετίζονται με το έργο
 ListDonationsAssociatedProject=Λίστα των δωρεών που σχετίζονται με το έργο
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Επαφές Project
 ActionsOnProject=Δράσεις για το έργο
 YouAreNotContactOfProject=Δεν έχετε μια επαφή του ιδιωτικού έργου,
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Διαγράψτε το χρόνο που δαπανάται
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=Δείτε επίσης τα καθήκοντα που δεν ανατέθηκαν σε μένα
@@ -110,7 +118,7 @@ TaskRessourceLinks=Πόροι
 ProjectsDedicatedToThisThirdParty=Έργα που αφορούν αυτό το στοιχείο
 NoTasks=Δεν υπάρχουν εργασίες για αυτό το έργο
 LinkedToAnotherCompany=Συνδέεται με άλλο τρίτο μέρος
-TaskIsNotAffectedToYou=Εργασία που δεν έχει ανατεθεί σε εσάς
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=Χρόνος που δαπανάται είναι άδειο
 ThisWillAlsoRemoveTasks=Αυτή η ενέργεια θα διαγράψει επίσης όλα τα καθήκοντα του έργου <b>(%s</b> καθηκόντων προς το παρόν) και όλες οι είσοδοι του χρόνου.
 IfNeedToUseOhterObjectKeepEmpty=Εάν ορισμένα αντικείμενα (τιμολόγιο, προκειμένου, ...), που ανήκουν σε άλλο τρίτο μέρος, πρέπει να συνδέεται με το έργο να δημιουργήσει, διατηρήσει αυτό το κενό να έχει το έργο να είναι πολλαπλών τρίτους.
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Εισαγωγή ανά ημέρα
 InputPerWeek=Εισαγωγή ανά εβδομάδα
 InputPerAction=Εισαγωγή ανά ενέργεια
-TimeAlreadyRecorded=Ο χρόνος που δαπανάται έχει ήδη καταγραφεί για το έργο/ημέρα και ο χρήστης %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Ανάθεση εργασίας σε εμένα
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Ανάθεση
 ProjectOverview=Επισκόπηση
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Μόνο ευκαιρίες
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Ανοιχτές ευαιρίες
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/en_AU/accountancy.lang b/htdocs/langs/en_AU/accountancy.lang
deleted file mode 100644
index 527f1fd139d..00000000000
--- a/htdocs/langs/en_AU/accountancy.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-AccountingCategory=Accounting category
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
diff --git a/htdocs/langs/en_AU/admin.lang b/htdocs/langs/en_AU/admin.lang
index 291d3352a4a..c353d325e3f 100644
--- a/htdocs/langs/en_AU/admin.lang
+++ b/htdocs/langs/en_AU/admin.lang
@@ -1,1665 +1,17 @@
 # Dolibarr language file - Source file is en_US - admin
-Foundation=Foundation
-Version=Version
-VersionProgram=Version program
-VersionLastInstall=Initial install version
-VersionLastUpgrade=Latest version upgrade
-VersionExperimental=Experimental
-VersionDevelopment=Development
-VersionUnknown=Unknown
-VersionRecommanded=Recommended
-FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. Value of some setup constants may also be checked. You can use this tool to detect if some files were modified by a hacker for example.
-FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
-GlobalChecksum=Global checksum
-MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
-LocalSignature=Embedded local signature (less reliable)
-RemoteSignature=Remote distant signature (more reliable)
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FilesModified=Modified Files
-FilesAdded=Added Files
-FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
-XmlNotFound=Xml Integrity File of application not found
-SessionId=Session ID
-SessionSaveHandler=Handler to save sessions
-SessionSavePath=Storage session localization
-PurgeSessions=Purge of sessions
-ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
-NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow to list all running sessions.
-LockNewSessions=Lock new connections
-ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself. Only user <b>%s</b> will be able to connect after that.
-UnlockNewSessions=Remove connection lock
-YourSession=Your session
-Sessions=Users session
-WebUserGroup=Web server user/group
-NoSessionFound=Your PHP seems to not allow to list active sessions. Directory used to save sessions (<b>%s</b>) might be protected (For example, by OS permissions or by PHP directive open_basedir).
-DBStoringCharset=Database charset to store data
-DBSortingCharset=Database charset to sort data
-WarningModuleNotActive=Module <b>%s</b> must be enabled
-WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page.
-DolibarrSetup=Dolibarr install or upgrade
-InternalUser=Internal user
-ExternalUser=External user
-InternalUsers=Internal users
-ExternalUsers=External users
-GUISetup=Display
-SetupArea=Setup area
-FormToTestFileUploadForm=Form to test file upload (according to setup)
-IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
-RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
-RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any usage of update tool.
-SecuritySetup=Security setup
-SecurityFilesDesc=Define here options related to security about uploading files.
-ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
-ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
-ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is not supported.
-DictionarySetup=Dictionary setup
-Dictionary=Dictionaries
-ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
-ErrorCodeCantContainZero=Code can't contain value 0
-DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
-UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties, but it is less convenient)
-DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact, but it is less convenient)
-NumberOfKeyToSearch=Nbr of characters to trigger search: %s
-NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
-AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
-JavascriptDisabled=JavaScript disabled
-UsePreviewTabs=Use preview tabs
-ShowPreview=Show preview
-PreviewNotAvailable=Preview not available
-ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
-MySQLTimeZone=TimeZone MySql (database)
-TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
-Space=Space
-Table=Table
-Fields=Fields
-Index=Index
-Mask=Mask
-NextValue=Next value
-NextValueForInvoices=Next value (invoices)
-NextValueForCreditNotes=Next value (credit notes)
-NextValueForDeposit=Next value (deposit)
-NextValueForReplacements=Next value (replacements)
-MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to <b>%s</b> %s, whatever this parameter's value is
-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
-AntiVirusParam= More parameters on command line
-AntiVirusParamExample= Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
-ComptaSetup=Accounting module setup
-UserSetup=User management setup
-MultiCurrencySetup=Multi-currency setup
-MenuLimits=Limits and accuracy
-MenuIdParent=Parent menu ID
-DetailMenuIdParent=ID of parent menu (empty for a top menu)
-DetailPosition=Sort number to define menu position
-AllMenus=All
-NotConfigured=Module not configured
-Active=Active
-SetupShort=Setup
-OtherOptions=Other options
-OtherSetup=Other setup
-CurrentValueSeparatorDecimal=Decimal separator
-CurrentValueSeparatorThousand=Thousand separator
-Destination=Destination
-IdModule=Module ID
-IdPermissions=Permissions ID
-Modules=Modules
-LanguageBrowserParameter=Parameter %s
-LocalisationDolibarrParameters=Localisation parameters
-ClientTZ=Client Time Zone (user)
-ClientHour=Client time (user)
-OSTZ=Server OS Time Zone
-PHPTZ=PHP server Time Zone
-DaylingSavingTime=Daylight saving time
-CurrentHour=PHP Time (server)
-CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
-Box=Widget
-Boxes=Widgets
-MaxNbOfLinesForBoxes=Max number of lines for widgets
-PositionByDefault=Default order
-Position=Position
-MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
-MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br />Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
-MenuForUsers=Menu for users
-LangFile=.lang file
-System=System
-SystemInfo=System information
-SystemToolsArea=System tools area
-SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for.
-Purge=Purge
-PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
-PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
-PurgeDeleteTemporaryFilesShort=Delete temporary files
-PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory <b>%s</b>. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted.
-PurgeRunNow=Purge now
-PurgeNothingToDelete=No directory or files to delete.
-PurgeNDirectoriesDeleted=<b>%s</b> files or directories deleted.
-PurgeAuditEvents=Purge all security events
-ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
-GenerateBackup=Generate backup
-Backup=Backup
-Restore=Restore
-RunCommandSummary=Backup has been launched with the following command
-BackupResult=Backup result
-BackupFileSuccessfullyCreated=Backup file successfully generated
-YouCanDownloadBackupFile=Generated files can now be downloaded
-NoBackupFileAvailable=No backup files available.
-ExportMethod=Export method
-ImportMethod=Import method
-ToBuildBackupFileClickHere=To build a backup file, click <a href="%s">here</a>.
-ImportMySqlDesc=To import a backup file, you must use mysql command from command line:
-ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line:
-ImportMySqlCommand=%s %s < mybackupfile.sql
-ImportPostgreSqlCommand=%s %s mybackupfile.sql
-FileNameToGenerate=File name to generate
-Compression=Compression
-CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
-CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
-ExportCompatibility=Compatibility of generated export file
-MySqlExportParameters=MySQL export parameters
-PostgreSqlExportParameters= PostgreSQL export parameters
-UseTransactionnalMode=Use transactional mode
-FullPathToMysqldumpCommand=Full path to mysqldump command
-FullPathToPostgreSQLdumpCommand=Full path to pg_dump command
-ExportOptions=Export Options
-AddDropDatabase=Add DROP DATABASE command
-AddDropTable=Add DROP TABLE command
-ExportStructure=Structure
-NameColumn=Name columns
-ExtendedInsert=Extended INSERT
-NoLockBeforeInsert=No lock commands around INSERT
-DelayedInsert=Delayed insert
-EncodeBinariesInHexa=Encode binary data in hexadecimal
-IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
-AutoDetectLang=Autodetect (browser language)
-FeatureDisabledInDemo=Feature disabled in demo
-FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Permissions
-BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
-OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
-ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external modules...
-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 (Note: anyone experienced in PHP programming can provide custom development for an open source project)
-WebSiteDesc=Reference websites to find more modules...
-URL=Link
-BoxesAvailable=Widgets available
-BoxesActivated=Widgets activated
-ActivateOn=Activate on
-ActiveOn=Activated on
-SourceFile=Source file
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
-Required=Required
-UsedOnlyWithTypeOption=Used by some agenda option only
-Security=Security
-Passwords=Passwords
-DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
-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 (Activated 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 make building of a global cumulated pdf not working (like unpaid invoices).
-Feature=Feature
-DolibarrLicense=License
-Developpers=Developers/contributors
-OfficialWebSite=Dolibarr international official web site
-OfficialWebSiteLocal=Local web site (%s)
-OfficialWiki=Dolibarr documentation on Wiki
-OfficialDemo=Dolibarr online demo
-OfficialMarketPlace=Official market place for external modules/addons
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
-OtherResources=Other resources
-ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
-HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
-HelpCenterDesc2=Some part of this service are available in <b>english only</b>.
-CurrentMenuHandler=Current menu handler
-MeasuringUnit=Measuring unit
-LeftMargin=Left margin
-TopMargin=Top margin
-PaperSize=Paper type
-Orientation=Orientation
-SpaceX=Space X
-SpaceY=Space Y
-FontSize=Font size
-Content=Content
-NoticePeriod=Notice period
-NewByMonth=New by month
-Emails=E-mails
-EMailsSetup=E-mails setup
-EMailsDesc=This page allows you to overwrite your PHP parameters for e-mails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless.
-MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
-MAIN_MAIL_EMAIL_FROM=Sender e-mail for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Sender e-mail used for error returns emails sent
-MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
-MAIN_DISABLE_ALL_MAILS=Disable all e-mails sendings (for test purposes or demos)
-MAIN_MAIL_SENDMODE=Method to use to send EMails
-MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
-MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
-MAIN_MAIL_EMAIL_TLS= Use TLS (SSL) encrypt
-MAIN_MAIL_EMAIL_STARTTLS= Use TLS (STARTTLS) encrypt
-MAIN_DISABLE_ALL_SMS=Disable all SMS sendings (for test purposes or demos)
-MAIN_SMS_SENDMODE=Method to use to send SMS
-MAIN_MAIL_SMS_FROM=Default sender phone number for Sms sending
-MAIN_MAIL_DEFAULT_FROMTYPE=Sender e-mail by default for manual sendings (User email or Company email)
-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/
-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 setup
-ModuleFamilyBase=System
-ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
-ModuleFamilyProducts=Products Management (PM)
-ModuleFamilyHr=Human Resource Management (HR)
-ModuleFamilyProjects=Projects/Collaborative work
-ModuleFamilyOther=Other
-ModuleFamilyTechnic=Multi-modules tools
-ModuleFamilyExperimental=Experimental modules
-ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
-ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
-ModuleFamilyInterface=Interfaces with external systems
-MenuHandlers=Menu handlers
-MenuAdmin=Menu editor
-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).
-DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <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>.
-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='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
-YouCanSubmitFile=For this step, you can send package using this tool: Select module file
-CurrentVersion=Dolibarr current version
-CallUpdatePage=Go to the page that updates the database structure and data: %s.
-LastStableVersion=Latest stable version
-LastActivationDate=Latest activation date
-UpdateServerOffline=Update server offline
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
-GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
-GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
-ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
-ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
-DoTestServerAvailability=Test server connectivity
-DoTestSend=Test sending
-DoTestSendHTML=Test sending HTML
-ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
-ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
-UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
-UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
-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...).
-MinLength=Minimum length
-LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
-ExamplesWithCurrentSetup=Examples with current running setup
-ListOfDirectories=List of OpenDocument templates directories
-ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
-NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories
+AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
+AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 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.
-ThemeDir=Skins directory
-ConnectionTimeout=Connexion timeout
-ResponseTimeout=Response timeout
-SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__
-ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
-SecurityToken=Key to secure URLs
-NoSmsEngine=No SMS sender manager available. SMS sender manager are not installed with default distribution (because they depends on an external supplier) but you can find some on %s
-PDF=PDF
-PDFDesc=You can set each global options related to the PDF generation
-PDFAddressForging=Rules to forge address boxes
 HideAnyVATInformationOnPDF=Hide all information related to GST on generated PDF
-HideDescOnPDF=Hide products description on generated PDF
-HideRefOnPDF=Hide products ref. on generated PDF
-HideDetailsOnPDF=Hide product lines details on generated PDF
-PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
-Library=Library
-UrlGenerationParameters=Parameters to secure URLs
-SecurityTokenIsUnique=Use a unique securekey parameter for each URL
-EnterRefToBuildUrl=Enter reference for object %s
-GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Old GST rate
 NewVATRates=New GST rate
-PriceBaseTypeToChange=Modify on prices with base reference value defined on
-MassConvert=Launch mass convert
-String=String
-TextLong=Long text
-Int=Integer
-Float=Float
-DateAndTime=Date and hour
-Unique=Unique
-Boolean=Boolean (Checkbox)
-ExtrafieldPhone = Phone
-ExtrafieldPrice = Price
-ExtrafieldMail = Email
-ExtrafieldUrl = Url
-ExtrafieldSelect = Select list
-ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
-ExtrafieldPassword=Password
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
-ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
-LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
-SMS=SMS
-LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
-RefreshPhoneLink=Refresh link
-LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
-KeepEmptyToUseDefault=Keep empty to use default value
-DefaultLink=Default link
-SetAsDefault=Set as default
-ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
-BarcodeInitForThirdparties=Mass barcode init for thirdparties
-BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Init value for next %s empty records
-EraseAllCurrentBarCode=Erase all current barcode values
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
-AllBarcodeReset=All barcode values have been removed
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into 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
-DisplayCompanyInfo=Display company address
-DisplayCompanyManagers=Display manager names
-DisplayCompanyInfoAndManagers=Display company address and manager names
-EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
-ModuleCompanyCodePanicum=Return an empty accountancy code.
-ModuleCompanyCodeDigitaria=Accountancy 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: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-ClickToShowDescription=Click to show description
-# Modules
-Module0Name=Users & groups
-Module0Desc=Users / Employees and Groups management
-Module1Name=Third parties
-Module1Desc=Companies and contact management (customers, prospects...)
-Module2Name=Commercial
-Module2Desc=Commercial management
-Module10Name=Accounting
-Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
-Module20Name=Proposals
-Module20Desc=Commercial proposal management
-Module22Name=Mass E-mailings
-Module22Desc=Mass E-mailing management
-Module23Name=Energy
-Module23Desc=Monitoring the consumption of energies
-Module25Name=Customer Orders
-Module25Desc=Customer order management
-Module30Name=Invoices
-Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
-Module40Name=Suppliers
-Module40Desc=Supplier management and buying (orders and invoices)
-Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
-Module49Name=Editors
-Module49Desc=Editor management
-Module50Name=Products
-Module50Desc=Product management
-Module51Name=Mass mailings
-Module51Desc=Mass paper mailing management
-Module52Name=Stocks
-Module52Desc=Stock management (products)
-Module53Name=Services
-Module53Desc=Service management
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
-Module55Name=Barcodes
-Module55Desc=Barcode management
-Module56Name=Telephony
-Module56Desc=Telephony integration
-Module57Name=Direct bank payment orders
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
-Module58Name=ClickToDial
-Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
-Module70Name=Interventions
-Module70Desc=Intervention management
-Module75Name=Expense and trip notes
-Module75Desc=Expense and trip notes management
-Module80Name=Shipments
-Module80Desc=Shipments and delivery order management
-Module85Name=Banks and cash
-Module85Desc=Management of bank or cash accounts
-Module100Name=External site
-Module100Desc=This module include an external web site or page into Dolibarr menus and view it into a Dolibarr frame
-Module105Name=Mailman and SPIP
-Module105Desc=Mailman or SPIP interface for member module
-Module200Name=LDAP
-Module200Desc=LDAP directory synchronisation
-Module210Name=PostNuke
-Module210Desc=PostNuke integration
-Module240Name=Data exports
-Module240Desc=Tool to export Dolibarr data (with assistants)
-Module250Name=Data imports
-Module250Desc=Tool to import data in Dolibarr  (with assistants)
-Module310Name=Members
-Module310Desc=Foundation members management
-Module320Name=RSS Feed
-Module320Desc=Add RSS feed inside Dolibarr screen pages
-Module330Name=Bookmarks
-Module330Desc=Bookmarks management
-Module400Name=Projects/Opportunities/Leads
-Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
-Module410Name=Webcalendar
-Module410Desc=Webcalendar integration
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
-Module520Name=Loan
-Module520Desc=Management of loans
-Module600Name=Notifications
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
-Module700Name=Donations
-Module700Desc=Donation management
-Module770Name=Expense reports
-Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
-Module1200Name=Mantis
-Module1200Desc=Mantis integration
-Module1400Name=Accounting
-Module1400Desc=Accounting management (double parties)
-Module1520Name=Document Generation
-Module1520Desc=Mass mail document generation
-Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
-Module2000Name=WYSIWYG editor
-Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
-Module2200Name=Dynamic Prices
-Module2200Desc=Enable the usage of math expressions for prices
-Module2300Name=Cron
-Module2300Desc=Scheduled job management
-Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
-Module2500Name=Electronic Content Management
-Module2500Desc=Save and share documents
-Module2600Name=API/Web services (SOAP server)
-Module2600Desc=Enable the Dolibarr SOAP server providing API services
-Module2610Name=API/Web services (REST server)
-Module2610Desc=Enable the Dolibarr REST server providing API services
-Module2660Name=Call WebServices (SOAP client)
-Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
-Module2700Name=Gravatar
-Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
-Module2800Desc=FTP Client
-Module2900Name=GeoIPMaxmind
-Module2900Desc=GeoIP Maxmind conversions capabilities
-Module3100Name=Skype
-Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
-Module4000Name=HRM
-Module4000Desc=Human resources management
-Module5000Name=Multi-company
-Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management
-Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
-Module20000Name=Leave Requests management
-Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Product lot
-Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
-Module50000Name=PayBox
-Module50000Desc=Module to offer an online payment page by credit card with PayBox
-Module50100Name=Point of sales
-Module50100Desc=Point of sales module (POS).
-Module50200Name=Paypal
-Module50200Desc=Module to offer an online payment page by credit card with Paypal
-Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double parties)
-Module54000Name=PrintIPP
-Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
-Module55000Name=Poll, Survey or Vote
-Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
-Module59000Name=Margins
-Module59000Desc=Module to manage margins
-Module60000Name=Commissions
-Module60000Desc=Module to manage commissions
-Module63000Name=Resources
-Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
-Permission11=Read customer invoices
-Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
-Permission14=Validate customer invoices
-Permission15=Send customer invoices by email
-Permission16=Create payments for customer invoices
-Permission19=Delete customer invoices
-Permission21=Read commercial proposals
-Permission22=Create/modify commercial proposals
-Permission24=Validate commercial proposals
-Permission25=Send commercial proposals
-Permission26=Close commercial proposals
-Permission27=Delete commercial proposals
-Permission28=Export commercial proposals
-Permission31=Read products
-Permission32=Create/modify products
-Permission34=Delete products
-Permission36=See/manage hidden products
-Permission38=Export products
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
-Permission44=Delete projects (shared project and projects i'm contact for)
-Permission45=Export projects
-Permission61=Read interventions
-Permission62=Create/modify interventions
-Permission64=Delete interventions
-Permission67=Export interventions
-Permission71=Read members
-Permission72=Create/modify members
-Permission74=Delete members
-Permission75=Setup types of membership
-Permission76=Export data
-Permission78=Read subscriptions
-Permission79=Create/modify subscriptions
-Permission81=Read customers orders
-Permission82=Create/modify customers orders
-Permission84=Validate customers orders
-Permission86=Send customers orders
-Permission87=Close customers orders
-Permission88=Cancel customers orders
-Permission89=Delete customers orders
-Permission91=Read social or fiscal taxes and vat
-Permission92=Create/modify social or fiscal taxes and vat
-Permission93=Delete social or fiscal taxes and vat
-Permission94=Export social or fiscal taxes
-Permission95=Read reports
-Permission101=Read sendings
-Permission102=Create/modify sendings
-Permission104=Validate sendings
-Permission106=Export sendings
-Permission109=Delete sendings
-Permission111=Read financial accounts
-Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
-Permission114=Reconciliate transactions
-Permission115=Export transactions and account statements
-Permission116=Transfers between accounts
-Permission117=Manage cheques dispatching
-Permission121=Read third parties linked to user
-Permission122=Create/modify third parties linked to user
-Permission125=Delete third parties linked to user
-Permission126=Export third parties
-Permission141=Read all projects and tasks (also private projects i am not contact for)
-Permission142=Create/modify all projects and tasks (also private projects i am not 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
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
-Permission167=Export contracts
-Permission171=Read trips and expenses (yours and your subordinates)
-Permission172=Create/modify trips and expenses
-Permission173=Delete trips and expenses
-Permission174=Read all trips and expenses
-Permission178=Export trips and expenses
-Permission180=Read suppliers
-Permission181=Read supplier orders
-Permission182=Create/modify supplier orders
-Permission183=Validate supplier orders
-Permission184=Approve supplier orders
-Permission185=Order or cancel supplier orders
-Permission186=Receive supplier orders
-Permission187=Close supplier orders
-Permission188=Cancel supplier orders
-Permission192=Create lines
-Permission193=Cancel lines
-Permission194=Read the bandwith lines
-Permission202=Create ADSL connections
-Permission203=Order connections orders
-Permission204=Order connections
-Permission205=Manage connections
-Permission206=Read connections
-Permission211=Read Telephony
-Permission212=Order lines
-Permission213=Activate line
-Permission214=Setup Telephony
-Permission215=Setup providers
-Permission221=Read emailings
-Permission222=Create/modify emailings (topic, recipients...)
-Permission223=Validate emailings (allows sending)
-Permission229=Delete emailings
-Permission237=View recipients and info
-Permission238=Manually send mailings
-Permission239=Delete mailings after validation or sent
-Permission241=Read categories
-Permission242=Create/modify categories
-Permission243=Delete categories
-Permission244=See the contents of the hidden categories
-Permission251=Read other users and groups
-PermissionAdvanced251=Read other users
-Permission252=Read permissions of other users
-Permission253=Create/modify other users, groups and permisssions
-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 assignement matters).
-Permission271=Read CA
-Permission272=Read invoices
-Permission273=Issue invoices
-Permission281=Read contacts
-Permission282=Create/modify contacts
-Permission283=Delete contacts
-Permission286=Export contacts
-Permission291=Read tariffs
-Permission292=Set permissions on the tariffs
-Permission293=Modify costumers tariffs
-Permission300=Read bar codes
-Permission301=Create/modify bar codes
-Permission302=Delete bar codes
-Permission311=Read services
-Permission312=Assign service/subscription to contract
-Permission331=Read bookmarks
-Permission332=Create/modify bookmarks
-Permission333=Delete bookmarks
-Permission341=Read its own permissions
-Permission342=Create/modify his own user information
-Permission343=Modify his own password
-Permission344=Modify its own permissions
-Permission351=Read groups
-Permission352=Read groups permissions
-Permission353=Create/modify groups
-Permission354=Delete or disable groups
-Permission358=Export users
-Permission401=Read discounts
-Permission402=Create/modify discounts
-Permission403=Validate discounts
-Permission404=Delete discounts
-Permission510=Read Salaries
-Permission512=Create/modify salaries
-Permission514=Delete salaries
-Permission517=Export salaries
-Permission520=Read Loans
-Permission522=Create/modify loans
-Permission524=Delete loans
-Permission525=Access loan calculator
-Permission527=Export loans
-Permission531=Read services
-Permission532=Create/modify services
-Permission534=Delete services
-Permission536=See/manage hidden services
-Permission538=Export services
-Permission701=Read donations
-Permission702=Create/modify donations
-Permission703=Delete donations
-Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
-Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
-Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission779=Export expense reports
-Permission1001=Read stocks
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
-Permission1004=Read stock movements
-Permission1005=Create/modify stock movements
-Permission1101=Read delivery orders
-Permission1102=Create/modify delivery orders
-Permission1104=Validate delivery orders
-Permission1109=Delete delivery orders
-Permission1181=Read suppliers
-Permission1182=Read supplier orders
-Permission1183=Create/modify supplier orders
-Permission1184=Validate supplier orders
-Permission1185=Approve supplier orders
-Permission1186=Order supplier orders
-Permission1187=Acknowledge receipt of supplier orders
-Permission1188=Delete supplier orders
-Permission1190=Approve (second approval) supplier orders
-Permission1201=Get result of an export
-Permission1202=Create/Modify an export
-Permission1231=Read supplier invoices
-Permission1232=Create/modify supplier invoices
-Permission1233=Validate supplier invoices
-Permission1234=Delete supplier invoices
-Permission1235=Send supplier invoices by email
-Permission1236=Export supplier invoices, attributes and payments
-Permission1237=Export supplier orders and their details
-Permission1251=Run mass imports of external data into database (data load)
-Permission1321=Export customer invoices, attributes and payments
-Permission1322=Reopen a paid bill
-Permission1421=Export customer orders and attributes
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
-Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
-Permission20006=Admin leave requests (setup and update balance)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
-Permission2401=Read actions (events or tasks) linked to his account
-Permission2402=Create/modify actions (events or tasks) linked to his account
-Permission2403=Delete actions (events or tasks) linked to his account
-Permission2411=Read actions (events or tasks) of others
-Permission2412=Create/modify actions (events or tasks) of others
-Permission2413=Delete actions (events or tasks) of others
-Permission2414=Export actions/tasks of others
-Permission2501=Read/Download documents
-Permission2502=Download documents
-Permission2503=Submit or delete documents
-Permission2515=Setup documents directories
-Permission2801=Use FTP client in read mode (browse and download only)
-Permission2802=Use FTP client in write mode (delete or upload files)
-Permission50101=Use Point of sales
-Permission50201=Read transactions
-Permission50202=Import transactions
-Permission54001=Print
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
-Permission59003=Read every user margin
-Permission63001=Read resources
-Permission63002=Create/modify resources
-Permission63003=Delete resources
-Permission63004=Link resources to agenda events
-DictionaryCompanyType=Types of thirdparties
-DictionaryCompanyJuridicalType=Legal forms of thirdparties
-DictionaryProspectLevel=Prospect potential level
-DictionaryCanton=State/Province
-DictionaryRegion=Regions
-DictionaryCountry=Countries
-DictionaryCurrency=Currencies
-DictionaryCivility=Personal and professional titles
-DictionaryActions=Types of agenda events
-DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=GST Rates or Sales Tax Rates
-DictionaryRevenueStamp=Amount of revenue stamps
-DictionaryPaymentConditions=Payment terms
-DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact/Address types
-DictionaryEcotaxe=Ecotax (WEEE)
-DictionaryPaperFormat=Paper formats
-DictionaryFormatCards=Cards formats
-DictionaryFees=Types of fees
-DictionarySendingMethods=Shipping methods
-DictionaryStaff=Staff
-DictionaryAvailability=Delivery delay
-DictionaryOrderMethods=Ordering methods
-DictionarySource=Origin of proposals/orders
-DictionaryAccountancyCategory=Accounting account groups
-DictionaryAccountancysystem=Models for chart of accounts
-DictionaryEMailTemplates=Emails templates
-DictionaryUnits=Units
-DictionaryProspectStatus=Prospection status
-DictionaryHolidayTypes=Types of leaves
-DictionaryOpportunityStatus=Opportunity status for project/lead
-SetupSaved=Setup saved
-BackToModuleList=Back to modules list
-BackToDictionaryList=Back to dictionaries list
 VATManagement=GST Management
-VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=By default the proposed GST rate is 0 which can be used for cases like associations, individuals and small companies.
-VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
-##### Local Taxes #####
-LTRate=Rate
-LocalTax1IsNotUsed=Do not use second tax
 LocalTax1IsUsedDesc=Use a second type of tax (other than GST)
 LocalTax1IsNotUsedDesc=Do not use other type of tax (other than GST)
-LocalTax1Management=Second type of tax
-LocalTax1IsUsedExample=
-LocalTax1IsNotUsedExample=
-LocalTax2IsNotUsed=Do not use third tax
 LocalTax2IsUsedDesc=Use a third type of tax (other than GST)
 LocalTax2IsNotUsedDesc=Do not use other type of tax (other than GST)
-LocalTax2Management=Third type of tax
-LocalTax2IsUsedExample=
-LocalTax2IsNotUsedExample=
-LocalTax1ManagementES= RE Management
-LocalTax1IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If te buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
-LocalTax1IsNotUsedDescES= By default the proposed RE is 0. End of rule.
-LocalTax1IsUsedExampleES= In Spain they are professionals subject to some specific sections of the Spanish IAE.
-LocalTax1IsNotUsedExampleES= In Spain they are professional and societies and subject to certain sections of the Spanish IAE.
-LocalTax2ManagementES= IRPF Management
-LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
-LocalTax2IsNotUsedDescES= By default the proposed IRPF is 0. End of rule.
-LocalTax2IsUsedExampleES= In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
-LocalTax2IsNotUsedExampleES= In Spain they are bussines not subject to tax system of modules.
-CalcLocaltax=Reports on local taxes
-CalcLocaltax1=Sales - Purchases
-CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2=Purchases
-CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3=Sales
-CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
-LabelUsedByDefault=Label used by default if no translation can be found for code
-LabelOnDocuments=Label on documents
-NbOfDays=Nb of days
-AtEndOfMonth=At end of month
-CurrentNext=Current/Next
-Offset=Offset
-AlwaysActive=Always active
-Upgrade=Upgrade
-MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Deploy/install external module
-WebServer=Web server
-DocumentRootServer=Web server's root directory
-DataRootServer=Data files directory
-IP=IP
-Port=Port
-VirtualServerName=Virtual server name
-OS=OS
-PhpWebLink=Web-Php link
-Browser=Browser
-Server=Server
-Database=Database
-DatabaseServer=Database host
-DatabaseName=Database name
-DatabasePort=Database port
-DatabaseUser=Database user
-DatabasePassword=Database password
-Tables=Tables
-TableName=Table name
-NbOfRecord=Nb of records
-Host=Server
-DriverType=Driver type
-SummarySystem=System information summary
-SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Foundation
-DefaultMenuManager= Standard menu manager
-DefaultMenuSmartphoneManager=Smartphone menu manager
-Skin=Skin theme
-DefaultSkin=Default skin theme
-MaxSizeList=Max length for list
-DefaultMaxSizeList=Default max length for lists
-DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
-MessageOfDay=Message of the day
-MessageLogin=Login page message
-PermanentLeftSearchForm=Permanent search form on left menu
-DefaultLanguage=Default language to use (language code)
-EnableMultilangInterface=Enable multilingual interface
-EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/foundation information
-CompanyIds=Company/foundation identities
-CompanyName=Name
-CompanyAddress=Address
-CompanyZip=Zip
-CompanyTown=Town
-CompanyCountry=Country
-CompanyCurrency=Main currency
-CompanyObject=Object of the company
-Logo=Logo
-DoNotSuggestPaymentMode=Do not suggest
-NoActiveBankAccountDefined=No active bank account defined
-OwnerOfBankAccount=Owner of bank account %s
-BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show link "<strong>%s</strong>"
-Alerts=Alerts
-DelaysOfToleranceBeforeWarning=Tolerance delays before warning
-DelaysOfToleranceDesc=This screen allows you to define the tolerated delays before an alert is reported on screen with picto %s for each late element.
-Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned events (agenda events) not completed yet
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Delay tolerance (in days) before alert on project not closed in time
-Delays_MAIN_DELAY_TASKS_TODO=Delay tolerance (in days) before alert on planned tasks (project tasks) not completed yet
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on orders not processed yet
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on suppliers orders not processed yet
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Delay tolerance (in days) before alert on proposals to close
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Delay tolerance (in days) before alert on proposals not billed
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerance delay (in days) before alert on services to activate
-Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerance delay (in days) before alert on expired services
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerance delay (in days) before alert on unpaid supplier invoices
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerence delay (in days) before alert on unpaid client invoices
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerance delay (in days) before alert on pending bank reconciliation
-Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed membership fee
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
-Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
-SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
-SetupDescription5=Other menu entries manage optional parameters.
-LogEvents=Security audit events
-Audit=Audit
-InfoDolibarr=About Dolibarr
-InfoBrowser=About Browser
-InfoOS=About OS
-InfoWebServer=About Web Server
-InfoDatabase=About Database
-InfoPHP=About PHP
-InfoPerf=About Performances
-BrowserName=Browser name
-BrowserOS=Browser OS
-ListOfSecurityEvents=List of Dolibarr security events
-SecurityEventsPurged=Security events purged
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
-SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
-SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
-DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
-AvailableModules=Available 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.
-TriggersAvailable=Available triggers
-TriggersDesc=Triggers are files that will modify the behaviour of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realised new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
-TriggerDisabledByName=Triggers in this file are disabled by the <b>-NORUN</b> suffix in their name.
-TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module <b>%s</b> is disabled.
-TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules.
-TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
-GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password
-DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">check here</a>.
-MiscellaneousDesc=All other security related parameters are defined here.
-LimitsSetup=Limits/Precision setup
-LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here
-MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices
-MAIN_MAX_DECIMALS_TOT=Max decimals for total prices
-MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add <b>...</b> after this number if you want to see <b>...</b> when number is truncated when shown on screen)
-MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
-UnitPriceOfProduct=Net unit price of a product
-TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
-ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
-NoEventFoundWithCriteria=No security event has been found for such search criterias.
-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.
-BackupDescX=Archived directory should be stored in a secure place.
-BackupDescY=The generated dump file should be stored in a secure place.
-BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one
-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 directoy (<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=Available database backup dump files
-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
-DownloadMoreSkins=More skins to download
-SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence without hole and with no reset
-ShowProfIdInAddress=Show professionnal id with addresses on documents
-ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents
-TranslationUncomplete=Partial translation
-MAIN_DISABLE_METEO=Disable meteo view
-TestLoginToAPI=Test login to API
-ProxyDesc=Some features of Dolibarr need to have an Internet access to work. Define here parameters for this. If the Dolibarr server is behind a Proxy server, those parameters tells Dolibarr how to access Internet through it.
-ExternalAccess=External access
-MAIN_PROXY_USE=Use a proxy server (otherwise direct access to internet)
-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 all attributes, not already available by default, and that you want to be supported for %s.
-ExtraFields=Complementary attributes
-ExtraFieldsLines=Complementary attributes (lines)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
-ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact/address)
-ExtraFieldsMember=Complementary attributes (member)
-ExtraFieldsMemberType=Complementary attributes (member type)
-ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
-ExtraFieldsSupplierOrders=Complementary attributes (orders)
-ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
-ExtraFieldsProject=Complementary attributes (projects)
-ExtraFieldsProjectTask=Complementary attributes (tasks)
-ExtraFieldHasWrongValue=Attribute %s has a wrong value.
-AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
-SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
-PathToDocuments=Path to documents
-PathDirectory=Directory
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might 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.
-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: <strong>User display setup</strong> tab of 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
-TranslationString=Translation string
-CurrentTranslationString=Current translation string
-WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
-NewTranslationStringToShow=New translation string to show
-OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
-YouMustEnableOneModule=You must at least enable 1 module
-ClassNotFoundIntoPathWarning=Class %s not found into PHP path
-YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
-SuhosinSessionEncrypt=Session storage encrypted by Suhosin
-ConditionIsCurrently=Condition is currently %s
-YouUseBestDriver=You use driver %s that is best driver available currently.
-YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required 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.
-BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance.
-BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
-AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp".
-AskForPreferredShippingMethod=Ask for preferred Sending Method for Third Parties.
-FieldEdition=Edition of field %s
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
-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.
-PasswordGenerationPerso=Return a password according to your personally defined configuration.
-SetupPerso=According to your configuration
-PasswordPatternDesc=Password pattern description
-##### Users setup #####
-RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passwords
-DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page
-UsersSetup=Users module setup
-UserMailRequired=EMail required to create a new user
-##### HRM setup #####
-HRMSetup=HRM module setup
-##### Company setup #####
-CompanySetup=Companies module setup
-CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier)
-AccountCodeManager=Module for accountancy code generation (customer or supplier)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
-NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
-NotificationsDescGlobal=* or by setting global target emails in module setup page.
-ModelModules=Documents templates
-DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
-WatermarkOnDraft=Watermark on draft document
-JSOnPaimentBill=Activate feature to autofill payment lines on payment form
-CompanyIdProfChecker=Rules on Professional Ids
-MustBeUnique=Must be unique?
-MustBeMandatory=Mandatory to create third parties?
-MustBeInvoiceMandatory=Mandatory to validate invoices?
-##### Webcal setup #####
-WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
-##### Invoices #####
-BillsSetup=Invoices module setup
-BillsNumberingModule=Invoices and credit notes numbering model
-BillsPDFModules=Invoice documents models
-CreditNote=Credit note
-CreditNotes=Credit notes
-ForceInvoiceDate=Force invoice date to validation date
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
-SuggestPaymentByRIBOnAccount=Suggest payment by withdraw on account
-SuggestPaymentByChequeToAddress=Suggest payment by cheque to
-FreeLegalTextOnInvoices=Free text on invoices
-WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
-PaymentsNumberingModule=Payments numbering model
-SuppliersPayment=Suppliers payments
-SupplierPaymentSetup=Suppliers payments setup
-##### Proposals #####
-PropalSetup=Commercial proposals module setup
-ProposalsNumberingModules=Commercial proposal numbering models
-ProposalsPDFModules=Commercial proposal documents models
-FreeLegalTextOnProposal=Free text on commercial proposals
-WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
-WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
-##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
-##### Orders #####
-OrdersSetup=Order management setup
-OrdersNumberingModules=Orders numbering models
-OrdersModelModule=Order documents models
-FreeLegalTextOnOrders=Free text on orders
-WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
-ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Interventions #####
-InterventionsSetup=Interventions module setup
-FreeLegalTextOnInterventions=Free text on intervention documents
-FicheinterNumberingModules=Intervention numbering models
-TemplatePDFInterventions=Intervention card documents models
-WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
-##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
-ContractsNumberingModules=Contracts numbering modules
-TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
-##### Members #####
-MembersSetup=Members module setup
-MemberMainOptions=Main options
-AdherentLoginRequired= Manage a Login for each member
-AdherentMailRequired=EMail required to create a new member
-MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
-##### LDAP setup #####
-LDAPSetup=LDAP Setup
-LDAPGlobalParameters=Global parameters
-LDAPUsersSynchro=Users
-LDAPGroupsSynchro=Groups
-LDAPContactsSynchro=Contacts
-LDAPMembersSynchro=Members
-LDAPSynchronization=LDAP synchronisation
-LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP
-LDAPToDolibarr=LDAP -> Dolibarr
-DolibarrToLDAP=Dolibarr -> LDAP
-LDAPNamingAttribute=Key in LDAP
-LDAPSynchronizeUsers=Organization of users in LDAP
-LDAPSynchronizeGroups=Organization of groups in LDAP
-LDAPSynchronizeContacts=Organization of contacts in LDAP
-LDAPSynchronizeMembers=Organization of foundation's members in LDAP
-LDAPPrimaryServer=Primary server
-LDAPSecondaryServer=Secondary server
-LDAPServerPort=Server port
-LDAPServerPortExample=Default port : 389
-LDAPServerProtocolVersion=Protocol version
-LDAPServerUseTLS=Use TLS
-LDAPServerUseTLSExample=Your LDAP server use TLS
-LDAPServerDn=Server DN
-LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
-LDAPPassword=Administrator password
-LDAPUserDn=Users' DN
-LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
-LDAPGroupDn=Groups' DN
-LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com)
-LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
-LDAPServerDnExample=Complete DN (ex: dc=example,dc=com)
-LDAPDnSynchroActive=Users and groups synchronization
-LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization
-LDAPDnContactActive=Contacts' synchronization
-LDAPDnContactActiveExample=Activated/Unactivated synchronization
-LDAPDnMemberActive=Members' synchronization
-LDAPDnMemberActiveExample=Activated/Unactivated synchronization
-LDAPContactDn=Dolibarr contacts' DN
-LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com)
-LDAPMemberDn=Dolibarr members DN
-LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com)
-LDAPMemberObjectClassList=List of objectClass
-LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPUserObjectClassList=List of objectClass
-LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPGroupObjectClassList=List of objectClass
-LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
-LDAPContactObjectClassList=List of objectClass
-LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPTestConnect=Test LDAP connection
-LDAPTestSynchroContact=Test contacts synchronization
-LDAPTestSynchroUser=Test user synchronization
-LDAPTestSynchroGroup=Test group synchronization
-LDAPTestSynchroMember=Test member synchronization
-LDAPTestSearch= Test a LDAP search
-LDAPSynchroOK=Synchronization test successful
-LDAPSynchroKO=Failed synchronization test
-LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that connexion to server is correctly configured and allows LDAP udpates
-LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s)
-LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s)
-LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPBindKO=Connect/Authentificate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPSetupForVersion3=LDAP server configured for version 3
-LDAPSetupForVersion2=LDAP server configured for version 2
-LDAPDolibarrMapping=Dolibarr Mapping
-LDAPLdapMapping=LDAP Mapping
-LDAPFieldLoginUnix=Login (unix)
-LDAPFieldLoginExample=Example : uid
-LDAPFilterConnection=Search filter
-LDAPFilterConnectionExample=Example : &(objectClass=inetOrgPerson)
-LDAPFieldLoginSamba=Login (samba, activedirectory)
-LDAPFieldLoginSambaExample=Example : samaccountname
-LDAPFieldFullname=Full name
-LDAPFieldFullnameExample=Example : cn
-LDAPFieldPasswordNotCrypted=Password not crypted
-LDAPFieldPasswordCrypted=Password crypted
-LDAPFieldPasswordExample=Example : userPassword
-LDAPFieldCommonNameExample=Example : cn
-LDAPFieldName=Name
-LDAPFieldNameExample=Example : sn
-LDAPFieldFirstName=First name
-LDAPFieldFirstNameExample=Example : givenName
-LDAPFieldMail=Email address
-LDAPFieldMailExample=Example : mail
-LDAPFieldPhone=Professional phone number
-LDAPFieldPhoneExample=Example : telephonenumber
-LDAPFieldHomePhone=Personal phone number
-LDAPFieldHomePhoneExample=Example : homephone
-LDAPFieldMobile=Cellular phone
-LDAPFieldMobileExample=Example : mobile
-LDAPFieldFax=Fax number
-LDAPFieldFaxExample=Example : facsimiletelephonenumber
-LDAPFieldAddress=Street
-LDAPFieldAddressExample=Example : street
-LDAPFieldZip=Zip
-LDAPFieldZipExample=Example : postalcode
-LDAPFieldTown=Town
-LDAPFieldTownExample=Example : l
-LDAPFieldCountry=Country
-LDAPFieldDescription=Description
-LDAPFieldDescriptionExample=Example : description
-LDAPFieldNotePublic=Public Note
-LDAPFieldNotePublicExample=Example : publicnote
-LDAPFieldGroupMembers= Group members
-LDAPFieldGroupMembersExample= Example : uniqueMember
-LDAPFieldBirthdate=Birthdate
-LDAPFieldCompany=Company
-LDAPFieldCompanyExample=Example : o
-LDAPFieldSid=SID
-LDAPFieldSidExample=Example : objectsid
-LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Job position
-LDAPFieldTitleExample=Example: title
-LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
-LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
-LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts.
-LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users.
-LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups.
-LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module.
-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 advices related to performance.
-NotInstalled=Not installed, so your server is not slow 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.
-MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
-MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
-OPCodeCache=OPCode cache
-NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad).
-HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
-FilesOfTypeCached=Files of type %s are cached by HTTP server
-FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
-FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
-FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
-CacheByServer=Cache by server
-CacheByClient=Cache by browser
-CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
-##### Products #####
-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)
-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 third party language
-UseSearchToSelectProductTooltip=Also if you have a large number of product (> 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)
-SetDefaultBarcodeTypeProducts=Default barcode type to use for products
-SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
-ProductCodeChecker= Module for product code generation and checking (product or service)
-ProductOtherConf= Product / Service configuration
-IsNotADir=is not a directory!
-##### Syslog #####
-SyslogSetup=Logs module setup
-SyslogOutput=Logs outputs
-SyslogFacility=Facility
-SyslogLevel=Level
-SyslogFilename=File name and path
-YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
-ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
-##### Donations #####
-DonationsSetup=Donation module setup
-DonationsReceiptModel=Template of donation receipt
-##### Barcode #####
-BarcodeSetup=Barcode setup
-PaperFormatModule=Print format module
-BarcodeEncodeModule=Barcode encoding type
-CodeBarGenerator=Barcode generator
-ChooseABarCode=No generator defined
-FormatNotSupportedByGenerator=Format not supported by this generator
-BarcodeDescEAN8=Barcode of type EAN8
-BarcodeDescEAN13=Barcode of type EAN13
-BarcodeDescUPC=Barcode of type UPC
-BarcodeDescISBN=Barcode of type ISBN
-BarcodeDescC39=Barcode of type C39
-BarcodeDescC128=Barcode of type C128
-BarcodeDescDATAMATRIX=Barcode of type Datamatrix
-BarcodeDescQRCODE=Barcode of type QR code
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
-BarcodeInternalEngine=Internal engine
-BarCodeNumberManager=Manager to auto define barcode numbers
-##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct debit payment orders
-##### ExternalRSS #####
-ExternalRSSSetup=External RSS imports setup
-NewRSS=New RSS Feed
-RSSUrl=RSS URL
-RSSUrlExample=An interesting RSS feed
-##### Mailing #####
-MailingSetup=EMailing module setup
-MailingEMailFrom=Sender EMail (From) for emails sent by emailing module
-MailingEMailError=Return EMail (Errors-to) for emails with errors
-MailingDelay=Seconds to wait after sending next message
-##### Notification #####
-NotificationSetup=EMail notification module setup
-NotificationEMailFrom=Sender EMail (From) for emails sent for notifications
-FixedEmailTarget=Fixed email target
-##### Sendings #####
-SendingsSetup=Sending module setup
-SendingsReceiptModel=Sending receipt model
-SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
-FreeLegalTextOnShippings=Free text on shipments
-##### Deliveries #####
-DeliveryOrderNumberingModules=Products deliveries receipt numbering module
-DeliveryOrderModel=Products deliveries receipt model
-DeliveriesOrderAbility=Support products deliveries receipts
-FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
-##### FCKeditor #####
-AdvancedEditor=Advanced editor
-ActivateFCKeditor=Activate advanced editor for:
-FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
-FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files.</font>
-FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
-FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
-##### OSCommerce 1 #####
-OSCommerceErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be an OSCommerce database (Key %s not found in table %s).
-OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' successfull.
-OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
-OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
-##### Stock #####
-StockSetup=Warehouse module setup
-IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
-##### Menu #####
-MenuDeleted=Menu deleted
-Menus=Menus
-TreeMenuPersonalized=Personalized menus
-NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
-NewMenu=New menu
-Menu=Selection of menu
-MenuHandler=Menu handler
-MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
-DetailId=Id menu
-DetailMenuHandler=Menu handler where to show new menu
-DetailMenuModule=Module name if menu entry come from a module
-DetailType=Type of menu (top or left)
-DetailTitre=Menu label or label code for translation
-DetailUrl=URL where menu send you (Absolute URL link or external link with http://)
-DetailEnabled=Condition to show or not entry
-DetailRight=Condition to display unauthorized grey menus
-DetailLangs=Lang file name for label code translation
-DetailUser=Intern / Extern / All
-Target=Target
-DetailTarget=Target for links (_blank top open a new window)
-DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu)
-ModifMenu=Menu change
-DeleteMenu=Delete menu entry
-ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
-FailedToInitializeMenu=Failed to initialize menu
-##### Tax #####
-TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=GST due
-OptionVATDefault=Cash basis
-OptionVATDebitOption=Accrual basis
-OptionVatDefaultDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on payments for services
-OptionVatDebitOptionDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on invoice (debit) for services
-SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
-OnDelivery=On delivery
-OnPayment=On payment
-OnInvoice=On invoice
-SupposedToBePaymentDate=Payment date used
-SupposedToBeInvoiceDate=Invoice date used
-Buy=Buy
-Sell=Sell
-InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use GST (Home - Setup - Company/Foundation), so there is no GST options to setup.
-AccountancyCode=Accountancy Code
-AccountancyCodeSell=Sale 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 -> Dictionary -> 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_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
-AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### 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 your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your 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.
-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 same computer than 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.
-##### Point Of Sales (CashDesk) #####
-CashDesk=Point of sales
-CashDeskSetup=Point of sales module setup
-CashDeskThirdPartyForSell=Default generic third party to use for sells
-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).
-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
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
-##### Bookmark #####
-BookmarkSetup=Bookmark module setup
-BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu.
-NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu
-##### WebServices #####
-WebServicesSetup=Webservices module setup
-WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
-WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
-EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
-##### API ####
-ApiSetup=API module setup
-ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
-OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
-ApiKey=Key for API
-WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
-##### Bank #####
-BankSetupModule=Bank module setup
-FreeLegalTextOnChequeReceipts=Free text on cheque receipts
-BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
-BankOrderGlobal=General
-BankOrderGlobalDesc=General display order
-BankOrderES=Spanish
-BankOrderESDesc=Spanish display order
-ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
-##### Multicompany #####
-MultiCompanySetup=Multi-company module setup
-##### Suppliers #####
-SuppliersSetup=Supplier module setup
-SuppliersCommandModel=Complete template of supplier order (logo...)
-SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
-SuppliersInvoiceNumberingModel=Supplier invoices numbering models
-IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
-##### GeoIPMaxmind #####
-GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
-NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
-YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
-YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
-TestGeoIPResult=Test of a conversion IP -> country
-##### Projects #####
-ProjectsNumberingModules=Projects numbering module
-ProjectsSetup=Project module setup
-ProjectsModelModule=Project reports document model
-TasksNumberingModules=Tasks numbering module
-TaskModelModule=Tasks reports document model
-UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
-##### ECM (GED) #####
-##### Fiscal Year #####
-AccountingPeriods=Accounting periods
-AccountingPeriodCard=Accounting period
-NewFiscalYear=New accounting period
-OpenFiscalYear=Open accounting period
-CloseFiscalYear=Close accounting period
-DeleteFiscalYear=Delete accounting period
-ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
-ShowFiscalYear=Show accounting period
-AlwaysEditable=Can always be edited
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
-Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
-IncludePath=Include path (defined into variable %s)
-ExpenseReportsSetup=Setup of module Expense Reports
-TemplatePDFExpenseReports=Document templates to generate expense report document
-NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
-YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of 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
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/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.
-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.
-ConfFileMuseContainCustom=Installing 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)
 TextTitleColor=Colour of page title
 LinkColor=Colour of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
-NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
-BackgroundColor=Background color
-TopMenuBackgroundColor=Background color for Top menu
-TopMenuDisableImages=Hide images in Top menu
-LeftMenuBackgroundColor=Background color for Left menu
-BackgroundTableTitleColor=Background color for Table title line
-BackgroundTableLineOddColor=Background color for odd table lines
-BackgroundTableLineEvenColor=Background color for even table lines
-MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
-NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
-UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
-PositionIntoComboList=Position of line into combo lists
-SellTaxRate=Sale tax rate
-RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
-UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipping, you can enter it here. You can use the key {TRACKID} into URL parameters so the system will replace it with value of tracking number user entered into shipment card.
-OpportunityPercent=When you create an opportunity, you will defined an estimated amount of project/lead. According to status of opportunity, this amount may be multiplicated 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
-FixTZ=TimeZone fix
-FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
-ExpectedChecksum=Expected Checksum
-CurrentChecksum=Current Checksum
-ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the latest stable version
-TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
-TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so 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 usefull only if your prices for each leve 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.
-SeeSubstitutionVars=See * note for list of possible substitution variables
-AllPublishers=All publishers
-UnknownPublishers=Unknown publishers
-AddRemoveTabs=Add or remove tabs
-AddDictionaries=Add dictionaries
-AddBoxes=Add widgets
-AddSheduledJobs=Add scheduled jobs
-AddHooks=Add hooks
-AddTriggers=Add triggers
-AddMenus=Add menus
-AddPermissions=Add permissions
-AddExportProfiles=Add export profiles
-AddImportProfiles=Add import profiles
-AddOtherPagesOrServices=Add other pages or services
-AddModels=Add document or numbering templates
-AddSubstitutions=Add keys substitutions
-DetectionNotPossible=Detection not possible
-UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved on 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 correclty. 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 inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <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
-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
-TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
-##### Resource ####
-ResourceSetup=Configuration du module Resource
-UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
diff --git a/htdocs/langs/en_AU/bills.lang b/htdocs/langs/en_AU/bills.lang
index f7d30ca05d8..6174b75c61b 100644
--- a/htdocs/langs/en_AU/bills.lang
+++ b/htdocs/langs/en_AU/bills.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - bills
 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.
 PaymentTypeCHQ=Cheque
 PaymentTypeShortCHQ=Cheque
 BankCode=BSB
@@ -20,4 +19,3 @@ ChequesArea=Cheque deposits area
 ChequeDeposits=Cheque deposits
 Cheques=Cheques
 NbCheque=Number of cheques
-CreditNoteConvertedIntoDiscount=This %s has been converted into %s
diff --git a/htdocs/langs/en_AU/cashdesk.lang b/htdocs/langs/en_AU/cashdesk.lang
index 2886b0b7da4..adbd9cf9e57 100644
--- a/htdocs/langs/en_AU/cashdesk.lang
+++ b/htdocs/langs/en_AU/cashdesk.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - cashdesk
 NoVAT=No GST for this sale
-BankToPay=Account for payment
diff --git a/htdocs/langs/en_AU/main.lang b/htdocs/langs/en_AU/main.lang
index 78337a91909..5edc39f2f32 100644
--- a/htdocs/langs/en_AU/main.lang
+++ b/htdocs/langs/en_AU/main.lang
@@ -1,9 +1,5 @@
 # Dolibarr language file - Source file is en_US - main
 DIRECTION=ltr
-# Note for Chinese:
-# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
-# stsongstdlight or cid0cs are for simplified Chinese
-# To read Chinese pdf with Linux: sudo apt-get install poppler-data
 FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=.
@@ -23,799 +19,25 @@ FormatDateHourShort=%m/%d/%Y %I:%M %p
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
-DatabaseConnection=Database connection
-NoTemplateDefined=No template defined for this email type
-AvailableVariables=Available substitution variables
-NoTranslation=No translation
-NoRecordFound=No record found
-NoRecordDeleted=No record deleted
-NotEnoughDataYet=Not enough data
-NoError=No error
-Error=Error
-Errors=Errors
-ErrorFieldRequired=Field '%s' is required
-ErrorFieldFormat=Field '%s' has a bad value
-ErrorFileDoesNotExists=File %s does not exist
-ErrorFailedToOpenFile=Failed to open file %s
-ErrorCanNotCreateDir=Cannot create dir %s
-ErrorCanNotReadDir=Cannot read dir %s
-ErrorConstantNotDefined=Parameter %s not defined
-ErrorUnknown=Unknown error
-ErrorSQL=SQL Error
-ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this
-ErrorGoToModuleSetup=Go to Module setup to fix this
-ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
-ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
-ErrorInternalErrorDetected=Error detected
-ErrorWrongHostParameter=Wrong host parameter
-ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post again the form.
-ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child records.
-ErrorWrongValue=Wrong value
-ErrorWrongValueForParameterX=Wrong value for parameter %s
-ErrorNoRequestInError=No request in error
-ErrorServiceUnavailableTryLater=Service not available for 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>.
-ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr database.
 ErrorNoVATRateDefinedForSellerCountry=Error, no GST 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 nb of record per page
-NotAuthorized=You are not authorized to do that.
-SetDate=Set date
-SelectDate=Select a date
-SeeAlso=See also %s
-SeeHere=See here
-Apply=Apply
-BackgroundColorByDefault=Default background color
-FileRenamed=The file was successfully renamed
-FileUploaded=The file was successfully uploaded
-FileGenerated=The file was successfully generated
-FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
-NbOfEntries=Nb of entries
-GoToWikiHelpPage=Read online help (Internet access needed)
-GoToHelpPage=Read help
-RecordSaved=Record saved
-RecordDeleted=Record deleted
-LevelOfFeature=Level of features
-NotDefined=Not defined
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
-Administrator=Administrator
-Undefined=Undefined
-PasswordForgotten=Password forgotten?
-SeeAbove=See above
-HomeArea=Home area
-LastConnexion=Latest connection
-PreviousConnexion=Previous connection
-PreviousValue=Previous value
-ConnectedOnMultiCompany=Connected on environment
-ConnectedSince=Connected since
-AuthenticationMode=Authentication mode
-RequestedUrl=Requested URL
-DatabaseTypeManager=Database type manager
-RequestLastAccessInError=Latest database access request error
-ReturnCodeLastAccessInError=Return code for latest database access request error
-InformationLastAccessInError=Information for latest database access request error
-DolibarrHasDetectedError=Dolibarr has detected a technical error
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes
-MoreInformation=More information
-TechnicalInformation=Technical information
-TechnicalID=Technical ID
-NotePublic=Note (public)
-NotePrivate=Note (private)
-PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
-DoTest=Test
-ToFilter=Filter
-NoFilter=No filter
-WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance delay.
-yes=yes
-Yes=Yes
-no=no
-No=No
-All=All
-Home=Home
-Help=Help
-OnlineHelp=Online help
-PageWiki=Wiki page
-MediaBrowser=Media browser
-Always=Always
-Never=Never
-Under=under
-Period=Period
-PeriodEndDate=End date for period
-Activate=Activate
-Activated=Activated
-Closed=Closed
-Closed2=Closed
-NotClosed=Not closed
-Enabled=Enabled
-Deprecated=Deprecated
-Disable=Disable
-Disabled=Disabled
-Add=Add
-AddLink=Add link
-RemoveLink=Remove link
-AddToDraft=Add to draft
-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>?
-Delete=Delete
-Remove=Remove
-Resiliate=Terminate
-Cancel=Cancel
-Modify=Modify
-Edit=Edit
-Validate=Validate
-ValidateAndApprove=Validate and Approve
-ToValidate=To validate
-Save=Save
-SaveAs=Save As
-TestConnection=Test connection
-ToClone=Clone
-ConfirmClone=Choose data you want to clone :
-NoCloneOptionsSpecified=No data to clone defined.
-Of=of
-Go=Go
-Run=Run
-CopyOf=Copy of
-Show=Show
-Hide=Hide
-ShowCardHere=Show card
-Search=Search
-SearchOf=Search
-Valid=Valid
-Approve=Approve
-Disapprove=Disapprove
-ReOpen=Re-Open
-Upload=Send file
-ToLink=Link
-Select=Select
-Choose=Choose
-Resize=Resize
-Recenter=Recenter
-Author=Author
-User=User
-Users=Users
-Group=Group
-Groups=Groups
-NoUserGroupDefined=No user group defined
-Password=Password
-PasswordRetype=Retype your password
-NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
-Name=Name
-Person=Person
-Parameter=Parameter
-Parameters=Parameters
-Value=Value
-PersonalValue=Personal value
-NewValue=New value
-CurrentValue=Current value
-Code=Code
-Type=Type
-Language=Language
-MultiLanguage=Multi-language
-Note=Note
-Title=Title
-Label=Label
-RefOrLabel=Ref. or label
-Info=Log
-Family=Family
-Description=Description
-Designation=Description
-Model=Doc template
-DefaultModel=Default doc template
-Action=Event
-About=About
-Number=Number
-NumberByMonth=Number by month
-AmountByMonth=Amount by month
-Numero=Number
-Limit=Limit
-Limits=Limits
-Logout=Logout
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Connection
-Setup=Setup
-Alert=Alert
-Previous=Previous
-Next=Next
-Cards=Cards
-Card=Card
-Now=Now
-HourStart=Start hour
-Date=Date
-DateAndHour=Date and hour
-DateToday=Today's date
-DateReference=Reference date
-DateStart=Start date
-DateEnd=End date
-DateCreation=Creation date
-DateCreationShort=Creat. date
-DateModification=Modification date
-DateModificationShort=Modif. date
-DateLastModification=Latest modification date
-DateValidation=Validation date
-DateClosing=Closing date
-DateDue=Due date
-DateValue=Value date
-DateValueShort=Value date
-DateOperation=Operation date
-DateOperationShort=Oper. Date
-DateLimit=Limit date
-DateRequest=Request date
-DateProcess=Process date
-DateBuild=Report build date
-DatePayment=Date of payment
-DateApprove=Approving date
-DateApprove2=Approving date (second approval)
-UserCreation=Creation user
-UserModification=Modification user
-UserCreationShort=Creat. user
-UserModificationShort=Modif. user
-DurationYear=year
-DurationMonth=month
-DurationWeek=week
-DurationDay=day
-DurationYears=years
-DurationMonths=months
-DurationWeeks=weeks
-DurationDays=days
-Year=Year
-Month=Month
-Week=Week
-WeekShort=Week
-Day=Day
-Hour=Hour
-Minute=Minute
-Second=Second
-Years=Years
-Months=Months
-Days=Days
-days=days
-Hours=Hours
-Minutes=Minutes
-Seconds=Seconds
-Weeks=Weeks
-Today=Today
-Yesterday=Yesterday
-Tomorrow=Tomorrow
-Morning=Morning
-Afternoon=Afternoon
 Quadri=Quarter
-MonthOfDay=Month of the day
-HourShort=H
-MinuteShort=mn
-Rate=Rate
-CurrencyRate=Currency conversion rate
-UseLocalTax=Include tax
-Bytes=Bytes
-KiloBytes=Kilobytes
-MegaBytes=Megabytes
-GigaBytes=Gigabytes
-TeraBytes=Terabytes
-b=b.
-Kb=Kb
-Mb=Mb
-Gb=Gb
-Tb=Tb
-Cut=Cut
-Copy=Copy
-Paste=Paste
-Default=Default
-DefaultValue=Default value
-Price=Price
-UnitPrice=Unit price
-UnitPriceHT=Unit price (net)
-UnitPriceTTC=Unit price
-PriceU=U.P.
-PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (currency)
 PriceUTTC=U.P. (incl GST)
-Amount=Amount
-AmountInvoice=Invoice amount
-AmountPayment=Payment amount
-AmountHTShort=Amount (net)
 AmountTTCShort=Amount (inc. GST)
 AmountHT=Amount (excl GST)
 AmountTTC=Amount (incl. GST)
 AmountVAT=Amount GST
-MulticurrencyAlreadyPaid=Already payed, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
 MulticurrencyAmountHT=Amount (excl GST), original currency
 MulticurrencyAmountTTC=Amount (incl GST), original currency
 MulticurrencyAmountVAT=Amount GST, original currency
-AmountLT1=Amount tax 2
-AmountLT2=Amount tax 3
-AmountLT1ES=Amount RE
-AmountLT2ES=Amount IRPF
-AmountTotal=Total amount
-AmountAverage=Average amount
 PriceQtyMinHT=Price quantity min. (excl GST)
-Percentage=Percentage
-Total=Total
-SubTotal=Subtotal
-TotalHTShort=Total (net)
-TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Total (incl GST)
 TotalHT=Total (excl GST)
 TotalHTforthispage=Total (excl GST) for this page
-Totalforthispage=Total for this page
 TotalTTC=Total (incl GST)
 TotalTTCToYourCredit=Total (incl GST) to your credit
 TotalVAT=Total GST
-TotalLT1=Total tax 2
-TotalLT2=Total tax 3
-TotalLT1ES=Total RE
-TotalLT2ES=Total IRPF
 HT=excl GST
 TTC=Incl GST
 VAT=GST
-VATs=Sales taxes
-LT1ES=RE
-LT2ES=IRPF
 VATRate=GST Rate
-Average=Average
-Sum=Sum
-Delta=Delta
-Module=Module
-Option=Option
-List=List
-FullList=Full list
-Statistics=Statistics
-OtherStatistics=Other statistics
-Status=Status
-Favorite=Favorite
-ShortInfo=Info.
-Ref=Ref.
-ExternalRef=Ref. extern
-RefSupplier=Ref. supplier
-RefPayment=Ref. payment
-CommercialProposalsShort=Commercial proposals
-Comment=Comment
-Comments=Comments
-ActionsToDo=Events to do
-ActionsToDoShort=To do
-ActionsDoneShort=Done
-ActionNotApplicable=Not applicable
-ActionRunningNotStarted=To start
-ActionRunningShort=In progress
-ActionDoneShort=Finished
-ActionUncomplete=Uncomplete
-CompanyFoundation=Company/Foundation
-ContactsForCompany=Contacts 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
-NActionsLate=%s late
-RequestAlreadyDone=Request already recorded
-Filter=Filter
-FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
-RemoveFilter=Remove filter
-ChartGenerated=Chart generated
-ChartNotGenerated=Chart not generated
-GeneratedOn=Build on %s
-Generate=Generate
-Duration=Duration
-TotalDuration=Total duration
-Summary=Summary
-DolibarrStateBoard=Statistics
-DolibarrWorkBoard=Work tasks board
-Available=Available
-NotYetAvailable=Not yet available
-NotAvailable=Not available
-Categories=Tags/categories
-Category=Tag/category
-By=By
-From=From
-to=to
-and=and
-or=or
-Other=Other
-Others=Others
-OtherInformations=Other informations
-Quantity=Quantity
-Qty=Qty
-ChangedBy=Changed by
-ApprovedBy=Approved by
-ApprovedBy2=Approved by (second approval)
-Approved=Approved
-Refused=Refused
-ReCalculate=Recalculate
-ResultKo=Failure
-Reporting=Reporting
-Reportings=Reporting
-Draft=Draft
-Drafts=Drafts
-Validated=Validated
-Opened=Opened
-New=New
-Discount=Discount
-Unknown=Unknown
-General=General
-Size=Size
-Received=Received
-Paid=Paid
-Topic=Subject
-ByCompanies=By third parties
-ByUsers=By users
-Links=Links
-Link=Link
-Rejects=Rejects
-Preview=Preview
-NextStep=Next step
-Datas=Data
-None=None
-NoneF=None
-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.
-Photo=Picture
-Photos=Pictures
-AddPhoto=Add picture
-DeletePicture=Picture delete
-ConfirmDeletePicture=Confirm picture deletion?
-Login=Login
-CurrentLogin=Current login
-EnterLoginDetail=Enter login details
-January=January
-February=February
-March=March
-April=April
-May=May
-June=June
-July=July
-August=August
-September=September
-October=October
-November=November
-December=December
-JanuaryMin=Jan
-FebruaryMin=Feb
-MarchMin=Mar
-AprilMin=Apr
-MayMin=May
-JuneMin=Jun
-JulyMin=Jul
-AugustMin=Aug
-SeptemberMin=Sep
-OctoberMin=Oct
-NovemberMin=Nov
-DecemberMin=Dec
-Month01=January
-Month02=February
-Month03=March
-Month04=April
-Month05=May
-Month06=June
-Month07=July
-Month08=August
-Month09=September
-Month10=October
-Month11=November
-Month12=December
-MonthShort01=Jan
-MonthShort02=Feb
-MonthShort03=Mar
-MonthShort04=Apr
-MonthShort05=May
-MonthShort06=Jun
-MonthShort07=Jul
-MonthShort08=Aug
-MonthShort09=Sep
-MonthShort10=Oct
-MonthShort11=Nov
-MonthShort12=Dec
-AttachedFiles=Attached files and documents
-FileTransferComplete=File was uploaded successfuly
-DateFormatYYYYMM=YYYY-MM
-DateFormatYYYYMMDD=YYYY-MM-DD
-DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
-ReportName=Report name
-ReportPeriod=Report period
-ReportDescription=Description
-Report=Report
-Keyword=Keyword
-Origin=Origin
-Legend=Legend
-Fill=Fill
-Reset=Reset
-File=File
-Files=Files
-NotAllowed=Not allowed
-ReadPermissionNotAllowed=Read permission not allowed
-AmountInCurrency=Amount in %s currency
-Example=Example
-Examples=Examples
-NoExample=No example
-FindBug=Report a bug
-NbOfThirdParties=Number of third parties
-NbOfLines=Number of lines
-NbOfObjects=Number of objects
-NbOfObjectReferers=Number of related items
-Referers=Related items
-TotalQuantity=Total quantity
-DateFromTo=From %s to %s
-DateFrom=From %s
-DateUntil=Until %s
 Check=Cheque
-Uncheck=Uncheck
-Internal=Internal
-External=External
-Internals=Internal
-Externals=External
-Warning=Warning
-Warnings=Warnings
-BuildDoc=Build Doc
-Entity=Environment
-Entities=Entities
-CustomerPreview=Customer preview
-SupplierPreview=Supplier preview
-ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show supplier preview
-RefCustomer=Ref. customer
-Currency=Currency
-InfoAdmin=Information for administrators
-Undo=Undo
-Redo=Redo
-ExpandAll=Expand all
-UndoExpandAll=Undo expand
-Reason=Reason
-FeatureNotYetSupported=Feature not yet supported
-CloseWindow=Close window
-Response=Response
-Priority=Priority
-SendByMail=Send by EMail
-MailSentBy=Email sent by
-TextUsedInTheMessageBody=Email body
-SendAcknowledgementByMail=Send confirmation email
-EMail=E-mail
-NoEMail=No email
-Email=Email
-NoMobilePhone=No mobile phone
-Owner=Owner
-FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
-Refresh=Refresh
-BackToList=Back to list
-GoBack=Go back
-CanBeModifiedIfOk=Can be modified if valid
-CanBeModifiedIfKo=Can be modified if not valid
-ValueIsValid=Value is valid
-ValueIsNotValid=Value is not valid
-RecordCreatedSuccessfully=Record created successfully
-RecordModifiedSuccessfully=Record modified successfully
-RecordsModified=%s record modified
-RecordsDeleted=%s record deleted
-AutomaticCode=Automatic code
-FeatureDisabled=Feature disabled
-MoveBox=Move widget
-Offered=Offered
-NotEnoughPermissions=You don't have permission for this action
-SessionName=Session name
-Method=Method
-Receive=Receive
-CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
-ExpectedValue=Expected Value
-CurrentValue=Current value
-PartialWoman=Partial
-TotalWoman=Total
-NeverReceived=Never received
-Canceled=Canceled
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
-Color=Color
-Documents=Linked files
-Documents2=Documents
-UploadDisabled=Upload disabled
-MenuECM=Documents
-MenuAWStats=AWStats
-MenuMembers=Members
-MenuAgendaGoogle=Google agenda
-ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=No documents saved in this directory
-CurrentUserLanguage=Current language
-CurrentTheme=Current theme
-CurrentMenuManager=Current menu manager
-Browser=Browser
-Layout=Layout
-Screen=Screen
-DisabledModules=Disabled modules
-For=For
-ForCustomer=For customer
-Signature=Signature
-DateOfSignature=Date of signature
-HidePassword=Show command with password hidden
-UnHidePassword=Show real command with clear password
-Root=Root
-Informations=Informations
-Page=Page
-Notes=Notes
-AddNewLine=Add new line
-AddFile=Add file
-FreeZone=Free entry
-FreeLineOfType=Free entry of type
-CloneMainAttributes=Clone object with its main attributes
-PDFMerge=PDF Merge
-Merge=Merge
-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 application at the moment.
-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
-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.
-AccordingToGeoIPDatabase=(according to GeoIP convertion)
-Line=Line
-NotSupported=Not supported
-RequiredField=Required field
-Result=Result
-ToTest=Test
-ValidateBefore=Card must be validated before using this feature
-Visibility=Visibility
-Private=Private
-Hidden=Hidden
-Resources=Resources
-Source=Source
-Prefix=Prefix
-Before=Before
-After=After
-IPAddress=IP address
-Frequency=Frequency
-IM=Instant messaging
-NewAttribute=New attribute
-AttributeCode=Attribute code
-URLPhoto=URL of photo/logo
-SetLinkToAnotherThirdParty=Link to another third party
-LinkTo=Link to
-LinkToProposal=Link to proposal
-LinkToOrder=Link to order
-LinkToInvoice=Link to invoice
-LinkToSupplierOrder=Link to supplier order
-LinkToSupplierProposal=Link to supplier proposal
-LinkToSupplierInvoice=Link to supplier invoice
-LinkToContract=Link to contract
-LinkToIntervention=Link to intervention
-CreateDraft=Create draft
-SetToDraft=Back to draft
-ClickToEdit=Click to edit
-ObjectDeleted=Object %s deleted
-ByCountry=By country
-ByTown=By town
-ByDate=By date
-ByMonthYear=By month/year
-ByYear=By year
-ByMonth=By month
-ByDay=By day
-BySalesRepresentative=By sales representative
-LinkedToSpecificUsers=Linked to a particular user contact
-NoResults=No results
-AdminTools=Admin tools
-SystemTools=System tools
-ModulesSystemTools=Modules tools
-Test=Test
-Element=Element
-NoPhotoYet=No pictures available yet
-Dashboard=Dashboard
-MyDashboard=My dashboard
-Deductible=Deductible
-from=from
-toward=toward
-Access=Access
-SelectAction=Select action
-HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
-SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
-OriginFileName=Original filename
-SetDemandReason=Set source
-SetBankAccount=Define Bank Account
-AccountCurrency=Account Currency
-ViewPrivateNote=View notes
-XMoreLines=%s line(s) hidden
-PublicUrl=Public URL
-AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
-PrintFile=Print File %s
-ShowTransaction=Show entry on bank account
-GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
-Deny=Deny
-Denied=Denied
-ListOfTemplates=List of templates
-Gender=Gender
-Genderman=Man
-Genderwoman=Woman
-ViewList=List view
-Mandatory=Mandatory
-Hello=Hello
-Sincerely=Sincerely
-DeleteLine=Delete line
-ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
-NoRecordSelected=No record selected
-MassFilesArea=Area for files built by mass actions
-ShowTempMassFilesArea=Show area of files built by mass actions
-RelatedObjects=Related Objects
-ClassifyBilled=Classify billed
-Progress=Progress
-ClickHere=Click here
-FrontOffice=Front office
-BackOffice=Back office
-View=View
-Export=Export
-Exports=Exports
-ExportFilteredList=Export filtered list
-ExportList=Export list
-Miscellaneous=Miscellaneous
-Calendar=Calendar
-GroupBy=Group by...
-ViewFlatList=View flat list
-RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Direct download link
-Download=Download
-ActualizeCurrency=Update currency rate
-Fiscalyear=Fiscal year
-# Week day
-Monday=Monday
-Tuesday=Tuesday
-Wednesday=Wednesday
-Thursday=Thursday
-Friday=Friday
-Saturday=Saturday
-Sunday=Sunday
-MondayMin=Mo
-TuesdayMin=Tu
-WednesdayMin=We
-ThursdayMin=Th
-FridayMin=Fr
-SaturdayMin=Sa
-SundayMin=Su
-Day1=Monday
-Day2=Tuesday
-Day3=Wednesday
-Day4=Thursday
-Day5=Friday
-Day6=Saturday
-Day0=Sunday
-ShortMonday=M
-ShortTuesday=T
-ShortWednesday=W
-ShortThursday=T
-ShortFriday=F
-ShortSaturday=S
-ShortSunday=S
-SelectMailModel=Select email template
-SetRef=Set ref
-Select2ResultFoundUseArrows=Some results found. Use arrows to select.
-Select2NotFound=No result found
-Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
-Select2LoadingMoreResults=Loading more results...
-Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
-SearchIntoContacts=Contacts
-SearchIntoMembers=Members
-SearchIntoUsers=Users
-SearchIntoProductsOrServices=Products or services
-SearchIntoProjects=Projects
-SearchIntoTasks=Tasks
-SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
-SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
-SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
-SearchIntoInterventions=Interventions
-SearchIntoContracts=Contracts
-SearchIntoCustomerShipments=Customer shipments
-SearchIntoExpenseReports=Expense reports
-SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/en_AU/trips.lang b/htdocs/langs/en_AU/trips.lang
deleted file mode 100644
index 288b8de2315..00000000000
--- a/htdocs/langs/en_AU/trips.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - trips
-ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
diff --git a/htdocs/langs/en_CA/accountancy.lang b/htdocs/langs/en_CA/accountancy.lang
deleted file mode 100644
index 527f1fd139d..00000000000
--- a/htdocs/langs/en_CA/accountancy.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-AccountingCategory=Accounting category
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
diff --git a/htdocs/langs/en_CA/admin.lang b/htdocs/langs/en_CA/admin.lang
index be8f228c26a..9bf5497f19b 100644
--- a/htdocs/langs/en_CA/admin.lang
+++ b/htdocs/langs/en_CA/admin.lang
@@ -1,1665 +1,9 @@
 # Dolibarr language file - Source file is en_US - admin
-Foundation=Foundation
-Version=Version
-VersionProgram=Version program
-VersionLastInstall=Initial install version
-VersionLastUpgrade=Latest version upgrade
-VersionExperimental=Experimental
-VersionDevelopment=Development
-VersionUnknown=Unknown
-VersionRecommanded=Recommended
-FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. Value of some setup constants may also be checked. You can use this tool to detect if some files were modified by a hacker for example.
-FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
-GlobalChecksum=Global checksum
-MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
-LocalSignature=Embedded local signature (less reliable)
-RemoteSignature=Remote distant signature (more reliable)
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FilesModified=Modified Files
-FilesAdded=Added Files
-FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
-XmlNotFound=Xml Integrity File of application not found
-SessionId=Session ID
-SessionSaveHandler=Handler to save sessions
-SessionSavePath=Storage session localization
-PurgeSessions=Purge of sessions
-ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
-NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow to list all running sessions.
-LockNewSessions=Lock new connections
-ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself. Only user <b>%s</b> will be able to connect after that.
-UnlockNewSessions=Remove connection lock
-YourSession=Your session
-Sessions=Users session
-WebUserGroup=Web server user/group
-NoSessionFound=Your PHP seems to not allow to list active sessions. Directory used to save sessions (<b>%s</b>) might be protected (For example, by OS permissions or by PHP directive open_basedir).
-DBStoringCharset=Database charset to store data
-DBSortingCharset=Database charset to sort data
-WarningModuleNotActive=Module <b>%s</b> must be enabled
-WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page.
-DolibarrSetup=Dolibarr install or upgrade
-InternalUser=Internal user
-ExternalUser=External user
-InternalUsers=Internal users
-ExternalUsers=External users
-GUISetup=Display
-SetupArea=Setup area
-FormToTestFileUploadForm=Form to test file upload (according to setup)
-IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
-RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
-RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any usage of update tool.
-SecuritySetup=Security setup
-SecurityFilesDesc=Define here options related to security about uploading files.
-ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
-ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
-ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is not supported.
-DictionarySetup=Dictionary setup
-Dictionary=Dictionaries
-ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
-ErrorCodeCantContainZero=Code can't contain value 0
-DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
-UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties, but it is less convenient)
-DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact, but it is less convenient)
-NumberOfKeyToSearch=Nbr of characters to trigger search: %s
-NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
-AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
-JavascriptDisabled=JavaScript disabled
-UsePreviewTabs=Use preview tabs
-ShowPreview=Show preview
-PreviewNotAvailable=Preview not available
-ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
-MySQLTimeZone=TimeZone MySql (database)
-TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
-Space=Space
-Table=Table
-Fields=Fields
-Index=Index
-Mask=Mask
-NextValue=Next value
-NextValueForInvoices=Next value (invoices)
-NextValueForCreditNotes=Next value (credit notes)
-NextValueForDeposit=Next value (deposit)
-NextValueForReplacements=Next value (replacements)
-MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to <b>%s</b> %s, whatever this parameter's value is
-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
-AntiVirusParam= More parameters on command line
-AntiVirusParamExample= Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
-ComptaSetup=Accounting module setup
-UserSetup=User management setup
-MultiCurrencySetup=Multi-currency setup
-MenuLimits=Limits and accuracy
-MenuIdParent=Parent menu ID
-DetailMenuIdParent=ID of parent menu (empty for a top menu)
-DetailPosition=Sort number to define menu position
-AllMenus=All
-NotConfigured=Module not configured
-Active=Active
-SetupShort=Setup
-OtherOptions=Other options
-OtherSetup=Other setup
-CurrentValueSeparatorDecimal=Decimal separator
-CurrentValueSeparatorThousand=Thousand separator
-Destination=Destination
-IdModule=Module ID
-IdPermissions=Permissions ID
-Modules=Modules
-LanguageBrowserParameter=Parameter %s
-LocalisationDolibarrParameters=Localisation parameters
-ClientTZ=Client Time Zone (user)
-ClientHour=Client time (user)
-OSTZ=Server OS Time Zone
-PHPTZ=PHP server Time Zone
-DaylingSavingTime=Daylight saving time
-CurrentHour=PHP Time (server)
-CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
-Box=Widget
-Boxes=Widgets
-MaxNbOfLinesForBoxes=Max number of lines for widgets
-PositionByDefault=Default order
-Position=Position
-MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
-MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br />Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
-MenuForUsers=Menu for users
-LangFile=.lang file
-System=System
-SystemInfo=System information
-SystemToolsArea=System tools area
-SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for.
-Purge=Purge
-PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
-PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
-PurgeDeleteTemporaryFilesShort=Delete temporary files
-PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory <b>%s</b>. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted.
-PurgeRunNow=Purge now
-PurgeNothingToDelete=No directory or files to delete.
-PurgeNDirectoriesDeleted=<b>%s</b> files or directories deleted.
-PurgeAuditEvents=Purge all security events
-ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
-GenerateBackup=Generate backup
-Backup=Backup
-Restore=Restore
-RunCommandSummary=Backup has been launched with the following command
-BackupResult=Backup result
-BackupFileSuccessfullyCreated=Backup file successfully generated
-YouCanDownloadBackupFile=Generated files can now be downloaded
-NoBackupFileAvailable=No backup files available.
-ExportMethod=Export method
-ImportMethod=Import method
-ToBuildBackupFileClickHere=To build a backup file, click <a href="%s">here</a>.
-ImportMySqlDesc=To import a backup file, you must use mysql command from command line:
-ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line:
-ImportMySqlCommand=%s %s < mybackupfile.sql
-ImportPostgreSqlCommand=%s %s mybackupfile.sql
-FileNameToGenerate=File name to generate
-Compression=Compression
-CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
-CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
-ExportCompatibility=Compatibility of generated export file
-MySqlExportParameters=MySQL export parameters
-PostgreSqlExportParameters= PostgreSQL export parameters
-UseTransactionnalMode=Use transactional mode
-FullPathToMysqldumpCommand=Full path to mysqldump command
-FullPathToPostgreSQLdumpCommand=Full path to pg_dump command
-ExportOptions=Export Options
-AddDropDatabase=Add DROP DATABASE command
-AddDropTable=Add DROP TABLE command
-ExportStructure=Structure
-NameColumn=Name columns
-ExtendedInsert=Extended INSERT
-NoLockBeforeInsert=No lock commands around INSERT
-DelayedInsert=Delayed insert
-EncodeBinariesInHexa=Encode binary data in hexadecimal
-IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
-AutoDetectLang=Autodetect (browser language)
-FeatureDisabledInDemo=Feature disabled in demo
-FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Permissions
-BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
-OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
-ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external modules...
-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 (Note: anyone experienced in PHP programming can provide custom development for an open source project)
-WebSiteDesc=Reference websites to find more modules...
-URL=Link
-BoxesAvailable=Widgets available
-BoxesActivated=Widgets activated
-ActivateOn=Activate on
-ActiveOn=Activated on
-SourceFile=Source file
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
-Required=Required
-UsedOnlyWithTypeOption=Used by some agenda option only
-Security=Security
-Passwords=Passwords
-DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
-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 (Activated 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 make building of a global cumulated pdf not working (like unpaid invoices).
-Feature=Feature
-DolibarrLicense=License
-Developpers=Developers/contributors
-OfficialWebSite=Dolibarr international official web site
-OfficialWebSiteLocal=Local web site (%s)
-OfficialWiki=Dolibarr documentation on Wiki
-OfficialDemo=Dolibarr online demo
-OfficialMarketPlace=Official market place for external modules/addons
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
-ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
-HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
-HelpCenterDesc2=Some part of this service are available in <b>english only</b>.
-CurrentMenuHandler=Current menu handler
-MeasuringUnit=Measuring unit
-LeftMargin=Left margin
-TopMargin=Top margin
-PaperSize=Paper type
-Orientation=Orientation
-SpaceX=Space X
-SpaceY=Space Y
-FontSize=Font size
-Content=Content
-NoticePeriod=Notice period
-NewByMonth=New by month
-Emails=E-mails
-EMailsSetup=E-mails setup
-EMailsDesc=This page allows you to overwrite your PHP parameters for e-mails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless.
-MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
-MAIN_MAIL_EMAIL_FROM=Sender e-mail for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Sender e-mail used for error returns emails sent
-MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
-MAIN_DISABLE_ALL_MAILS=Disable all e-mails sendings (for test purposes or demos)
-MAIN_MAIL_SENDMODE=Method to use to send EMails
-MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
-MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
-MAIN_MAIL_EMAIL_TLS= Use TLS (SSL) encrypt
-MAIN_MAIL_EMAIL_STARTTLS= Use TLS (STARTTLS) encrypt
-MAIN_DISABLE_ALL_SMS=Disable all SMS sendings (for test purposes or demos)
-MAIN_SMS_SENDMODE=Method to use to send SMS
-MAIN_MAIL_SMS_FROM=Default sender phone number for Sms sending
-MAIN_MAIL_DEFAULT_FROMTYPE=Sender e-mail by default for manual sendings (User email or Company email)
-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/
-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 setup
-ModuleFamilyBase=System
-ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
-ModuleFamilyProducts=Products Management (PM)
-ModuleFamilyHr=Human Resource Management (HR)
-ModuleFamilyProjects=Projects/Collaborative work
-ModuleFamilyOther=Other
-ModuleFamilyTechnic=Multi-modules tools
-ModuleFamilyExperimental=Experimental modules
-ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
-ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
-ModuleFamilyInterface=Interfaces with external systems
-MenuHandlers=Menu handlers
-MenuAdmin=Menu editor
-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).
-DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <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>.
-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='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
-YouCanSubmitFile=For this step, you can send package using this tool: Select module file
-CurrentVersion=Dolibarr current version
-CallUpdatePage=Go to the page that updates the database structure and data: %s.
-LastStableVersion=Latest stable version
-LastActivationDate=Latest activation date
-UpdateServerOffline=Update server offline
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
-GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
-GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
-ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
-ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
-DoTestServerAvailability=Test server connectivity
-DoTestSend=Test sending
-DoTestSendHTML=Test sending HTML
-ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
-ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
-UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
-UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
-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...).
-MinLength=Minimum length
-LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
-ExamplesWithCurrentSetup=Examples with current running setup
-ListOfDirectories=List of OpenDocument templates directories
-ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
-NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories
+AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
+AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 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.
-ThemeDir=Skins directory
-ConnectionTimeout=Connexion timeout
-ResponseTimeout=Response timeout
-SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__
-ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
-SecurityToken=Key to secure URLs
-NoSmsEngine=No SMS sender manager available. SMS sender manager are not installed with default distribution (because they depends on an external supplier) but you can find some on %s
-PDF=PDF
-PDFDesc=You can set each global options related to the PDF generation
-PDFAddressForging=Rules to forge address boxes
-HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF
-HideDescOnPDF=Hide products description on generated PDF
-HideRefOnPDF=Hide products ref. on generated PDF
-HideDetailsOnPDF=Hide product lines details on generated PDF
-PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
-Library=Library
-UrlGenerationParameters=Parameters to secure URLs
-SecurityTokenIsUnique=Use a unique securekey parameter for each URL
-EnterRefToBuildUrl=Enter reference for object %s
-GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons to 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
-MassConvert=Launch mass convert
-String=String
-TextLong=Long text
-Int=Integer
-Float=Float
-DateAndTime=Date and hour
-Unique=Unique
-Boolean=Boolean (Checkbox)
-ExtrafieldPhone = Phone
-ExtrafieldPrice = Price
-ExtrafieldMail = Email
-ExtrafieldUrl = Url
-ExtrafieldSelect = Select list
-ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
-ExtrafieldPassword=Password
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
-ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
-LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
-SMS=SMS
-LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
-RefreshPhoneLink=Refresh link
-LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
-KeepEmptyToUseDefault=Keep empty to use default value
-DefaultLink=Default link
-SetAsDefault=Set as default
-ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
-BarcodeInitForThirdparties=Mass barcode init for thirdparties
-BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Init value for next %s empty records
-EraseAllCurrentBarCode=Erase all current barcode values
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
-AllBarcodeReset=All barcode values have been removed
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into 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
-DisplayCompanyInfo=Display company address
-DisplayCompanyManagers=Display manager names
-DisplayCompanyInfoAndManagers=Display company address and manager names
-EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
-ModuleCompanyCodePanicum=Return an empty accountancy code.
-ModuleCompanyCodeDigitaria=Accountancy 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: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-ClickToShowDescription=Click to show description
-# Modules
-Module0Name=Users & groups
-Module0Desc=Users / Employees and Groups management
-Module1Name=Third parties
-Module1Desc=Companies and contact management (customers, prospects...)
-Module2Name=Commercial
-Module2Desc=Commercial management
-Module10Name=Accounting
-Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
-Module20Name=Proposals
-Module20Desc=Commercial proposal management
-Module22Name=Mass E-mailings
-Module22Desc=Mass E-mailing management
-Module23Name=Energy
-Module23Desc=Monitoring the consumption of energies
-Module25Name=Customer Orders
-Module25Desc=Customer order management
-Module30Name=Invoices
-Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
-Module40Name=Suppliers
-Module40Desc=Supplier management and buying (orders and invoices)
-Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
-Module49Name=Editors
-Module49Desc=Editor management
-Module50Name=Products
-Module50Desc=Product management
-Module51Name=Mass mailings
-Module51Desc=Mass paper mailing management
-Module52Name=Stocks
-Module52Desc=Stock management (products)
-Module53Name=Services
-Module53Desc=Service management
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
-Module55Name=Barcodes
-Module55Desc=Barcode management
-Module56Name=Telephony
-Module56Desc=Telephony integration
-Module57Name=Direct bank payment orders
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
-Module58Name=ClickToDial
-Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
-Module70Name=Interventions
-Module70Desc=Intervention management
-Module75Name=Expense and trip notes
-Module75Desc=Expense and trip notes management
-Module80Name=Shipments
-Module80Desc=Shipments and delivery order management
-Module85Name=Banks and cash
-Module85Desc=Management of bank or cash accounts
-Module100Name=External site
-Module100Desc=This module include an external web site or page into Dolibarr menus and view it into a Dolibarr frame
-Module105Name=Mailman and SPIP
-Module105Desc=Mailman or SPIP interface for member module
-Module200Name=LDAP
-Module200Desc=LDAP directory synchronisation
-Module210Name=PostNuke
-Module210Desc=PostNuke integration
-Module240Name=Data exports
-Module240Desc=Tool to export Dolibarr data (with assistants)
-Module250Name=Data imports
-Module250Desc=Tool to import data in Dolibarr  (with assistants)
-Module310Name=Members
-Module310Desc=Foundation members management
-Module320Name=RSS Feed
-Module320Desc=Add RSS feed inside Dolibarr screen pages
-Module330Name=Bookmarks
-Module330Desc=Bookmarks management
-Module400Name=Projects/Opportunities/Leads
-Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
-Module410Name=Webcalendar
-Module410Desc=Webcalendar integration
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
-Module520Name=Loan
-Module520Desc=Management of loans
-Module600Name=Notifications
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
-Module700Name=Donations
-Module700Desc=Donation management
-Module770Name=Expense reports
-Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
-Module1200Name=Mantis
-Module1200Desc=Mantis integration
-Module1400Name=Accounting
-Module1400Desc=Accounting management (double parties)
-Module1520Name=Document Generation
-Module1520Desc=Mass mail document generation
-Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
-Module2000Name=WYSIWYG editor
-Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
-Module2200Name=Dynamic Prices
-Module2200Desc=Enable the usage of math expressions for prices
-Module2300Name=Cron
-Module2300Desc=Scheduled job management
-Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
-Module2500Name=Electronic Content Management
-Module2500Desc=Save and share documents
-Module2600Name=API/Web services (SOAP server)
-Module2600Desc=Enable the Dolibarr SOAP server providing API services
-Module2610Name=API/Web services (REST server)
-Module2610Desc=Enable the Dolibarr REST server providing API services
-Module2660Name=Call WebServices (SOAP client)
-Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
-Module2700Name=Gravatar
-Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
-Module2800Desc=FTP Client
-Module2900Name=GeoIPMaxmind
-Module2900Desc=GeoIP Maxmind conversions capabilities
-Module3100Name=Skype
-Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
-Module4000Name=HRM
-Module4000Desc=Human resources management
-Module5000Name=Multi-company
-Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management
-Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
-Module20000Name=Leave Requests management
-Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Product lot
-Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
-Module50000Name=PayBox
-Module50000Desc=Module to offer an online payment page by credit card with PayBox
-Module50100Name=Point of sales
-Module50100Desc=Point of sales module (POS).
-Module50200Name=Paypal
-Module50200Desc=Module to offer an online payment page by credit card with Paypal
-Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double parties)
-Module54000Name=PrintIPP
-Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
-Module55000Name=Poll, Survey or Vote
-Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
-Module59000Name=Margins
-Module59000Desc=Module to manage margins
-Module60000Name=Commissions
-Module60000Desc=Module to manage commissions
-Module63000Name=Resources
-Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
-Permission11=Read customer invoices
-Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
-Permission14=Validate customer invoices
-Permission15=Send customer invoices by email
-Permission16=Create payments for customer invoices
-Permission19=Delete customer invoices
-Permission21=Read commercial proposals
-Permission22=Create/modify commercial proposals
-Permission24=Validate commercial proposals
-Permission25=Send commercial proposals
-Permission26=Close commercial proposals
-Permission27=Delete commercial proposals
-Permission28=Export commercial proposals
-Permission31=Read products
-Permission32=Create/modify products
-Permission34=Delete products
-Permission36=See/manage hidden products
-Permission38=Export products
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
-Permission44=Delete projects (shared project and projects i'm contact for)
-Permission45=Export projects
-Permission61=Read interventions
-Permission62=Create/modify interventions
-Permission64=Delete interventions
-Permission67=Export interventions
-Permission71=Read members
-Permission72=Create/modify members
-Permission74=Delete members
-Permission75=Setup types of membership
-Permission76=Export data
-Permission78=Read subscriptions
-Permission79=Create/modify subscriptions
-Permission81=Read customers orders
-Permission82=Create/modify customers orders
-Permission84=Validate customers orders
-Permission86=Send customers orders
-Permission87=Close customers orders
-Permission88=Cancel customers orders
-Permission89=Delete customers orders
-Permission91=Read social or fiscal taxes and vat
-Permission92=Create/modify social or fiscal taxes and vat
-Permission93=Delete social or fiscal taxes and vat
-Permission94=Export social or fiscal taxes
-Permission95=Read reports
-Permission101=Read sendings
-Permission102=Create/modify sendings
-Permission104=Validate sendings
-Permission106=Export sendings
-Permission109=Delete sendings
-Permission111=Read financial accounts
-Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
-Permission114=Reconciliate transactions
-Permission115=Export transactions and account statements
-Permission116=Transfers between accounts
-Permission117=Manage cheques dispatching
-Permission121=Read third parties linked to user
-Permission122=Create/modify third parties linked to user
-Permission125=Delete third parties linked to user
-Permission126=Export third parties
-Permission141=Read all projects and tasks (also private projects i am not contact for)
-Permission142=Create/modify all projects and tasks (also private projects i am not 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
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
-Permission167=Export contracts
-Permission171=Read trips and expenses (yours and your subordinates)
-Permission172=Create/modify trips and expenses
-Permission173=Delete trips and expenses
-Permission174=Read all trips and expenses
-Permission178=Export trips and expenses
-Permission180=Read suppliers
-Permission181=Read supplier orders
-Permission182=Create/modify supplier orders
-Permission183=Validate supplier orders
-Permission184=Approve supplier orders
-Permission185=Order or cancel supplier orders
-Permission186=Receive supplier orders
-Permission187=Close supplier orders
-Permission188=Cancel supplier orders
-Permission192=Create lines
-Permission193=Cancel lines
-Permission194=Read the bandwith lines
-Permission202=Create ADSL connections
-Permission203=Order connections orders
-Permission204=Order connections
-Permission205=Manage connections
-Permission206=Read connections
-Permission211=Read Telephony
-Permission212=Order lines
-Permission213=Activate line
-Permission214=Setup Telephony
-Permission215=Setup providers
-Permission221=Read emailings
-Permission222=Create/modify emailings (topic, recipients...)
-Permission223=Validate emailings (allows sending)
-Permission229=Delete emailings
-Permission237=View recipients and info
-Permission238=Manually send mailings
-Permission239=Delete mailings after validation or sent
-Permission241=Read categories
-Permission242=Create/modify categories
-Permission243=Delete categories
-Permission244=See the contents of the hidden categories
-Permission251=Read other users and groups
-PermissionAdvanced251=Read other users
-Permission252=Read permissions of other users
-Permission253=Create/modify other users, groups and permisssions
-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 assignement matters).
-Permission271=Read CA
-Permission272=Read invoices
-Permission273=Issue invoices
-Permission281=Read contacts
-Permission282=Create/modify contacts
-Permission283=Delete contacts
-Permission286=Export contacts
-Permission291=Read tariffs
-Permission292=Set permissions on the tariffs
-Permission293=Modify costumers tariffs
-Permission300=Read bar codes
-Permission301=Create/modify bar codes
-Permission302=Delete bar codes
-Permission311=Read services
-Permission312=Assign service/subscription to contract
-Permission331=Read bookmarks
-Permission332=Create/modify bookmarks
-Permission333=Delete bookmarks
-Permission341=Read its own permissions
-Permission342=Create/modify his own user information
-Permission343=Modify his own password
-Permission344=Modify its own permissions
-Permission351=Read groups
-Permission352=Read groups permissions
-Permission353=Create/modify groups
-Permission354=Delete or disable groups
-Permission358=Export users
-Permission401=Read discounts
-Permission402=Create/modify discounts
-Permission403=Validate discounts
-Permission404=Delete discounts
-Permission510=Read Salaries
-Permission512=Create/modify salaries
-Permission514=Delete salaries
-Permission517=Export salaries
-Permission520=Read Loans
-Permission522=Create/modify loans
-Permission524=Delete loans
-Permission525=Access loan calculator
-Permission527=Export loans
-Permission531=Read services
-Permission532=Create/modify services
-Permission534=Delete services
-Permission536=See/manage hidden services
-Permission538=Export services
-Permission701=Read donations
-Permission702=Create/modify donations
-Permission703=Delete donations
-Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
-Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
-Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission779=Export expense reports
-Permission1001=Read stocks
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
-Permission1004=Read stock movements
-Permission1005=Create/modify stock movements
-Permission1101=Read delivery orders
-Permission1102=Create/modify delivery orders
-Permission1104=Validate delivery orders
-Permission1109=Delete delivery orders
-Permission1181=Read suppliers
-Permission1182=Read supplier orders
-Permission1183=Create/modify supplier orders
-Permission1184=Validate supplier orders
-Permission1185=Approve supplier orders
-Permission1186=Order supplier orders
-Permission1187=Acknowledge receipt of supplier orders
-Permission1188=Delete supplier orders
-Permission1190=Approve (second approval) supplier orders
-Permission1201=Get result of an export
-Permission1202=Create/Modify an export
-Permission1231=Read supplier invoices
-Permission1232=Create/modify supplier invoices
-Permission1233=Validate supplier invoices
-Permission1234=Delete supplier invoices
-Permission1235=Send supplier invoices by email
-Permission1236=Export supplier invoices, attributes and payments
-Permission1237=Export supplier orders and their details
-Permission1251=Run mass imports of external data into database (data load)
-Permission1321=Export customer invoices, attributes and payments
-Permission1322=Reopen a paid bill
-Permission1421=Export customer orders and attributes
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
-Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
-Permission20006=Admin leave requests (setup and update balance)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
-Permission2401=Read actions (events or tasks) linked to his account
-Permission2402=Create/modify actions (events or tasks) linked to his account
-Permission2403=Delete actions (events or tasks) linked to his account
-Permission2411=Read actions (events or tasks) of others
-Permission2412=Create/modify actions (events or tasks) of others
-Permission2413=Delete actions (events or tasks) of others
-Permission2414=Export actions/tasks of others
-Permission2501=Read/Download documents
-Permission2502=Download documents
-Permission2503=Submit or delete documents
-Permission2515=Setup documents directories
-Permission2801=Use FTP client in read mode (browse and download only)
-Permission2802=Use FTP client in write mode (delete or upload files)
-Permission50101=Use Point of sales
-Permission50201=Read transactions
-Permission50202=Import transactions
-Permission54001=Print
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
-Permission59003=Read every user margin
-Permission63001=Read resources
-Permission63002=Create/modify resources
-Permission63003=Delete resources
-Permission63004=Link resources to agenda events
-DictionaryCompanyType=Types of thirdparties
-DictionaryCompanyJuridicalType=Legal forms of thirdparties
-DictionaryProspectLevel=Prospect potential level
-DictionaryCanton=State/Province
-DictionaryRegion=Regions
-DictionaryCountry=Countries
-DictionaryCurrency=Currencies
-DictionaryCivility=Personal and professional titles
-DictionaryActions=Types of agenda events
-DictionarySocialContributions=Social or fiscal taxes types
-DictionaryVAT=VAT Rates or Sales Tax Rates
-DictionaryRevenueStamp=Amount of revenue stamps
-DictionaryPaymentConditions=Payment terms
-DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact/Address types
-DictionaryEcotaxe=Ecotax (WEEE)
-DictionaryPaperFormat=Paper formats
-DictionaryFormatCards=Cards formats
-DictionaryFees=Types of fees
-DictionarySendingMethods=Shipping methods
-DictionaryStaff=Staff
-DictionaryAvailability=Delivery delay
-DictionaryOrderMethods=Ordering methods
-DictionarySource=Origin of proposals/orders
-DictionaryAccountancyCategory=Accounting account groups
-DictionaryAccountancysystem=Models for chart of accounts
-DictionaryEMailTemplates=Emails templates
-DictionaryUnits=Units
-DictionaryProspectStatus=Prospection status
-DictionaryHolidayTypes=Types of leaves
-DictionaryOpportunityStatus=Opportunity status for project/lead
-SetupSaved=Setup saved
-BackToModuleList=Back to modules list
-BackToDictionaryList=Back to dictionaries list
 VATManagement=GST Management
-VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
-VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies.
-VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
-##### Local Taxes #####
-LTRate=Rate
-LocalTax1IsNotUsed=Do not use second tax
 LocalTax1IsUsedDesc=Use a second tax (PST)
 LocalTax1IsNotUsedDesc=Do not use second tax (PST)
 LocalTax1Management=PST Management
-LocalTax1IsUsedExample=
-LocalTax1IsNotUsedExample=
-LocalTax2IsNotUsed=Do not use third tax
-LocalTax2IsUsedDesc=Use a third type of tax (other than VAT)
 LocalTax2IsNotUsedDesc=Do not use second tax (PST)
-LocalTax2Management=Third type of tax
-LocalTax2IsUsedExample=
-LocalTax2IsNotUsedExample=
-LocalTax1ManagementES= RE Management
-LocalTax1IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If te buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
-LocalTax1IsNotUsedDescES= By default the proposed RE is 0. End of rule.
-LocalTax1IsUsedExampleES= In Spain they are professionals subject to some specific sections of the Spanish IAE.
-LocalTax1IsNotUsedExampleES= In Spain they are professional and societies and subject to certain sections of the Spanish IAE.
-LocalTax2ManagementES= IRPF Management
-LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
-LocalTax2IsNotUsedDescES= By default the proposed IRPF is 0. End of rule.
-LocalTax2IsUsedExampleES= In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
-LocalTax2IsNotUsedExampleES= In Spain they are bussines not subject to tax system of modules.
-CalcLocaltax=Reports on local taxes
-CalcLocaltax1=Sales - Purchases
-CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2=Purchases
-CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3=Sales
-CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
-LabelUsedByDefault=Label used by default if no translation can be found for code
-LabelOnDocuments=Label on documents
-NbOfDays=Nb of days
-AtEndOfMonth=At end of month
-CurrentNext=Current/Next
-Offset=Offset
-AlwaysActive=Always active
-Upgrade=Upgrade
-MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Deploy/install external module
-WebServer=Web server
-DocumentRootServer=Web server's root directory
-DataRootServer=Data files directory
-IP=IP
-Port=Port
-VirtualServerName=Virtual server name
-OS=OS
-PhpWebLink=Web-Php link
-Browser=Browser
-Server=Server
-Database=Database
-DatabaseServer=Database host
-DatabaseName=Database name
-DatabasePort=Database port
-DatabaseUser=Database user
-DatabasePassword=Database password
-Tables=Tables
-TableName=Table name
-NbOfRecord=Nb of records
-Host=Server
-DriverType=Driver type
-SummarySystem=System information summary
-SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Foundation
-DefaultMenuManager= Standard menu manager
-DefaultMenuSmartphoneManager=Smartphone menu manager
-Skin=Skin theme
-DefaultSkin=Default skin theme
-MaxSizeList=Max length for list
-DefaultMaxSizeList=Default max length for lists
-DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
-MessageOfDay=Message of the day
-MessageLogin=Login page message
-PermanentLeftSearchForm=Permanent search form on left menu
-DefaultLanguage=Default language to use (language code)
-EnableMultilangInterface=Enable multilingual interface
-EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/foundation information
-CompanyIds=Company/foundation identities
-CompanyName=Name
-CompanyAddress=Address
-CompanyZip=Zip
-CompanyTown=Town
-CompanyCountry=Country
-CompanyCurrency=Main currency
-CompanyObject=Object of the company
-Logo=Logo
-DoNotSuggestPaymentMode=Do not suggest
-NoActiveBankAccountDefined=No active bank account defined
-OwnerOfBankAccount=Owner of bank account %s
-BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show link "<strong>%s</strong>"
-Alerts=Alerts
-DelaysOfToleranceBeforeWarning=Tolerance delays before warning
-DelaysOfToleranceDesc=This screen allows you to define the tolerated delays before an alert is reported on screen with picto %s for each late element.
-Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned events (agenda events) not completed yet
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Delay tolerance (in days) before alert on project not closed in time
-Delays_MAIN_DELAY_TASKS_TODO=Delay tolerance (in days) before alert on planned tasks (project tasks) not completed yet
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on orders not processed yet
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on suppliers orders not processed yet
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Delay tolerance (in days) before alert on proposals to close
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Delay tolerance (in days) before alert on proposals not billed
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerance delay (in days) before alert on services to activate
-Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerance delay (in days) before alert on expired services
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerance delay (in days) before alert on unpaid supplier invoices
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerence delay (in days) before alert on unpaid client invoices
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerance delay (in days) before alert on pending bank reconciliation
-Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed membership fee
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
-Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
-SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
-SetupDescription5=Other menu entries manage optional parameters.
-LogEvents=Security audit events
-Audit=Audit
-InfoDolibarr=About Dolibarr
-InfoBrowser=About Browser
-InfoOS=About OS
-InfoWebServer=About Web Server
-InfoDatabase=About Database
-InfoPHP=About PHP
-InfoPerf=About Performances
-BrowserName=Browser name
-BrowserOS=Browser OS
-ListOfSecurityEvents=List of Dolibarr security events
-SecurityEventsPurged=Security events purged
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
-SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
-SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
-DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
-AvailableModules=Available 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.
-TriggersAvailable=Available triggers
-TriggersDesc=Triggers are files that will modify the behaviour of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realised new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
-TriggerDisabledByName=Triggers in this file are disabled by the <b>-NORUN</b> suffix in their name.
-TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module <b>%s</b> is disabled.
-TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules.
-TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
-GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password
-DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">check here</a>.
-MiscellaneousDesc=All other security related parameters are defined here.
-LimitsSetup=Limits/Precision setup
-LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here
-MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices
-MAIN_MAX_DECIMALS_TOT=Max decimals for total prices
-MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add <b>...</b> after this number if you want to see <b>...</b> when number is truncated when shown on screen)
-MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
-UnitPriceOfProduct=Net unit price of a product
-TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
-ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
-NoEventFoundWithCriteria=No security event has been found for such search criterias.
-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.
-BackupDescX=Archived directory should be stored in a secure place.
-BackupDescY=The generated dump file should be stored in a secure place.
-BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one
-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 directoy (<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=Available database backup dump files
-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
-DownloadMoreSkins=More skins to download
-SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence without hole and with no reset
-ShowProfIdInAddress=Show professionnal id with addresses on documents
-ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents
-TranslationUncomplete=Partial translation
-MAIN_DISABLE_METEO=Disable meteo view
-TestLoginToAPI=Test login to API
-ProxyDesc=Some features of Dolibarr need to have an Internet access to work. Define here parameters for this. If the Dolibarr server is behind a Proxy server, those parameters tells Dolibarr how to access Internet through it.
-ExternalAccess=External access
-MAIN_PROXY_USE=Use a proxy server (otherwise direct access to internet)
-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 all attributes, not already available by default, and that you want to be supported for %s.
-ExtraFields=Complementary attributes
-ExtraFieldsLines=Complementary attributes (lines)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
-ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact/address)
-ExtraFieldsMember=Complementary attributes (member)
-ExtraFieldsMemberType=Complementary attributes (member type)
-ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
-ExtraFieldsSupplierOrders=Complementary attributes (orders)
-ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
-ExtraFieldsProject=Complementary attributes (projects)
-ExtraFieldsProjectTask=Complementary attributes (tasks)
-ExtraFieldHasWrongValue=Attribute %s has a wrong value.
-AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
-SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
-PathToDocuments=Path to documents
-PathDirectory=Directory
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might 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.
-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: <strong>User display setup</strong> tab of 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
-TranslationString=Translation string
-CurrentTranslationString=Current translation string
-WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
-NewTranslationStringToShow=New translation string to show
-OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
-YouMustEnableOneModule=You must at least enable 1 module
-ClassNotFoundIntoPathWarning=Class %s not found into PHP path
-YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
-SuhosinSessionEncrypt=Session storage encrypted by Suhosin
-ConditionIsCurrently=Condition is currently %s
-YouUseBestDriver=You use driver %s that is best driver available currently.
-YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required 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.
-BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance.
-BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
-AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp".
-AskForPreferredShippingMethod=Ask for preferred Sending Method for Third Parties.
-FieldEdition=Edition of field %s
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
-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.
-PasswordGenerationPerso=Return a password according to your personally defined configuration.
-SetupPerso=According to your configuration
-PasswordPatternDesc=Password pattern description
-##### Users setup #####
-RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passwords
-DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page
-UsersSetup=Users module setup
-UserMailRequired=EMail required to create a new user
-##### HRM setup #####
-HRMSetup=HRM module setup
-##### Company setup #####
-CompanySetup=Companies module setup
-CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier)
-AccountCodeManager=Module for accountancy code generation (customer or supplier)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
-NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
-NotificationsDescGlobal=* or by setting global target emails in module setup page.
-ModelModules=Documents templates
-DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
-WatermarkOnDraft=Watermark on draft document
-JSOnPaimentBill=Activate feature to autofill payment lines on payment form
-CompanyIdProfChecker=Rules on Professional Ids
-MustBeUnique=Must be unique?
-MustBeMandatory=Mandatory to create third parties?
-MustBeInvoiceMandatory=Mandatory to validate invoices?
-##### Webcal setup #####
-WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
-##### Invoices #####
-BillsSetup=Invoices module setup
-BillsNumberingModule=Invoices and credit notes numbering model
-BillsPDFModules=Invoice documents models
-CreditNote=Credit note
-CreditNotes=Credit notes
-ForceInvoiceDate=Force invoice date to validation date
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
-SuggestPaymentByRIBOnAccount=Suggest payment by withdraw on account
-SuggestPaymentByChequeToAddress=Suggest payment by cheque to
-FreeLegalTextOnInvoices=Free text on invoices
-WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
-PaymentsNumberingModule=Payments numbering model
-SuppliersPayment=Suppliers payments
-SupplierPaymentSetup=Suppliers payments setup
-##### Proposals #####
-PropalSetup=Commercial proposals module setup
-ProposalsNumberingModules=Commercial proposal numbering models
-ProposalsPDFModules=Commercial proposal documents models
-FreeLegalTextOnProposal=Free text on commercial proposals
-WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
-WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
-##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
-##### Orders #####
-OrdersSetup=Order management setup
-OrdersNumberingModules=Orders numbering models
-OrdersModelModule=Order documents models
-FreeLegalTextOnOrders=Free text on orders
-WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
-ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Interventions #####
-InterventionsSetup=Interventions module setup
-FreeLegalTextOnInterventions=Free text on intervention documents
-FicheinterNumberingModules=Intervention numbering models
-TemplatePDFInterventions=Intervention card documents models
-WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
-##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
-ContractsNumberingModules=Contracts numbering modules
-TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
-##### Members #####
-MembersSetup=Members module setup
-MemberMainOptions=Main options
-AdherentLoginRequired= Manage a Login for each member
-AdherentMailRequired=EMail required to create a new member
-MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
-##### LDAP setup #####
-LDAPSetup=LDAP Setup
-LDAPGlobalParameters=Global parameters
-LDAPUsersSynchro=Users
-LDAPGroupsSynchro=Groups
-LDAPContactsSynchro=Contacts
-LDAPMembersSynchro=Members
-LDAPSynchronization=LDAP synchronisation
-LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP
-LDAPToDolibarr=LDAP -> Dolibarr
-DolibarrToLDAP=Dolibarr -> LDAP
-LDAPNamingAttribute=Key in LDAP
-LDAPSynchronizeUsers=Organization of users in LDAP
-LDAPSynchronizeGroups=Organization of groups in LDAP
-LDAPSynchronizeContacts=Organization of contacts in LDAP
-LDAPSynchronizeMembers=Organization of foundation's members in LDAP
-LDAPPrimaryServer=Primary server
-LDAPSecondaryServer=Secondary server
-LDAPServerPort=Server port
-LDAPServerPortExample=Default port : 389
-LDAPServerProtocolVersion=Protocol version
-LDAPServerUseTLS=Use TLS
-LDAPServerUseTLSExample=Your LDAP server use TLS
-LDAPServerDn=Server DN
-LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
-LDAPPassword=Administrator password
-LDAPUserDn=Users' DN
-LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
-LDAPGroupDn=Groups' DN
-LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com)
-LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
-LDAPServerDnExample=Complete DN (ex: dc=example,dc=com)
-LDAPDnSynchroActive=Users and groups synchronization
-LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization
-LDAPDnContactActive=Contacts' synchronization
-LDAPDnContactActiveExample=Activated/Unactivated synchronization
-LDAPDnMemberActive=Members' synchronization
-LDAPDnMemberActiveExample=Activated/Unactivated synchronization
-LDAPContactDn=Dolibarr contacts' DN
-LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com)
-LDAPMemberDn=Dolibarr members DN
-LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com)
-LDAPMemberObjectClassList=List of objectClass
-LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPUserObjectClassList=List of objectClass
-LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPGroupObjectClassList=List of objectClass
-LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
-LDAPContactObjectClassList=List of objectClass
-LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPTestConnect=Test LDAP connection
-LDAPTestSynchroContact=Test contacts synchronization
-LDAPTestSynchroUser=Test user synchronization
-LDAPTestSynchroGroup=Test group synchronization
-LDAPTestSynchroMember=Test member synchronization
-LDAPTestSearch= Test a LDAP search
-LDAPSynchroOK=Synchronization test successful
-LDAPSynchroKO=Failed synchronization test
-LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that connexion to server is correctly configured and allows LDAP udpates
-LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s)
-LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s)
-LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPBindKO=Connect/Authentificate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPSetupForVersion3=LDAP server configured for version 3
-LDAPSetupForVersion2=LDAP server configured for version 2
-LDAPDolibarrMapping=Dolibarr Mapping
-LDAPLdapMapping=LDAP Mapping
-LDAPFieldLoginUnix=Login (unix)
-LDAPFieldLoginExample=Example : uid
-LDAPFilterConnection=Search filter
-LDAPFilterConnectionExample=Example : &(objectClass=inetOrgPerson)
-LDAPFieldLoginSamba=Login (samba, activedirectory)
-LDAPFieldLoginSambaExample=Example : samaccountname
-LDAPFieldFullname=Full name
-LDAPFieldFullnameExample=Example : cn
-LDAPFieldPasswordNotCrypted=Password not crypted
-LDAPFieldPasswordCrypted=Password crypted
-LDAPFieldPasswordExample=Example : userPassword
-LDAPFieldCommonNameExample=Example : cn
-LDAPFieldName=Name
-LDAPFieldNameExample=Example : sn
-LDAPFieldFirstName=First name
-LDAPFieldFirstNameExample=Example : givenName
-LDAPFieldMail=Email address
-LDAPFieldMailExample=Example : mail
-LDAPFieldPhone=Professional phone number
-LDAPFieldPhoneExample=Example : telephonenumber
-LDAPFieldHomePhone=Personal phone number
-LDAPFieldHomePhoneExample=Example : homephone
-LDAPFieldMobile=Cellular phone
-LDAPFieldMobileExample=Example : mobile
-LDAPFieldFax=Fax number
-LDAPFieldFaxExample=Example : facsimiletelephonenumber
-LDAPFieldAddress=Street
-LDAPFieldAddressExample=Example : street
-LDAPFieldZip=Zip
-LDAPFieldZipExample=Example : postalcode
-LDAPFieldTown=Town
-LDAPFieldTownExample=Example : l
-LDAPFieldCountry=Country
-LDAPFieldDescription=Description
-LDAPFieldDescriptionExample=Example : description
-LDAPFieldNotePublic=Public Note
-LDAPFieldNotePublicExample=Example : publicnote
-LDAPFieldGroupMembers= Group members
-LDAPFieldGroupMembersExample= Example : uniqueMember
-LDAPFieldBirthdate=Birthdate
-LDAPFieldCompany=Company
-LDAPFieldCompanyExample=Example : o
-LDAPFieldSid=SID
-LDAPFieldSidExample=Example : objectsid
-LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Job position
-LDAPFieldTitleExample=Example: title
-LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
-LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
-LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts.
-LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users.
-LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups.
-LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module.
-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 advices related to performance.
-NotInstalled=Not installed, so your server is not slow 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.
-MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
-MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
-OPCodeCache=OPCode cache
-NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad).
-HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
-FilesOfTypeCached=Files of type %s are cached by HTTP server
-FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
-FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
-FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
-CacheByServer=Cache by server
-CacheByClient=Cache by browser
-CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
-##### Products #####
-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)
-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 third party language
-UseSearchToSelectProductTooltip=Also if you have a large number of product (> 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)
-SetDefaultBarcodeTypeProducts=Default barcode type to use for products
-SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
-ProductCodeChecker= Module for product code generation and checking (product or service)
-ProductOtherConf= Product / Service configuration
-IsNotADir=is not a directory!
-##### Syslog #####
-SyslogSetup=Logs module setup
-SyslogOutput=Logs outputs
-SyslogFacility=Facility
-SyslogLevel=Level
-SyslogFilename=File name and path
-YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
-ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
-##### Donations #####
-DonationsSetup=Donation module setup
-DonationsReceiptModel=Template of donation receipt
-##### Barcode #####
-BarcodeSetup=Barcode setup
-PaperFormatModule=Print format module
-BarcodeEncodeModule=Barcode encoding type
-CodeBarGenerator=Barcode generator
-ChooseABarCode=No generator defined
-FormatNotSupportedByGenerator=Format not supported by this generator
-BarcodeDescEAN8=Barcode of type EAN8
-BarcodeDescEAN13=Barcode of type EAN13
-BarcodeDescUPC=Barcode of type UPC
-BarcodeDescISBN=Barcode of type ISBN
-BarcodeDescC39=Barcode of type C39
-BarcodeDescC128=Barcode of type C128
-BarcodeDescDATAMATRIX=Barcode of type Datamatrix
-BarcodeDescQRCODE=Barcode of type QR code
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
-BarcodeInternalEngine=Internal engine
-BarCodeNumberManager=Manager to auto define barcode numbers
-##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct debit payment orders
-##### ExternalRSS #####
-ExternalRSSSetup=External RSS imports setup
-NewRSS=New RSS Feed
-RSSUrl=RSS URL
-RSSUrlExample=An interesting RSS feed
-##### Mailing #####
-MailingSetup=EMailing module setup
-MailingEMailFrom=Sender EMail (From) for emails sent by emailing module
-MailingEMailError=Return EMail (Errors-to) for emails with errors
-MailingDelay=Seconds to wait after sending next message
-##### Notification #####
-NotificationSetup=EMail notification module setup
-NotificationEMailFrom=Sender EMail (From) for emails sent for notifications
-FixedEmailTarget=Fixed email target
-##### Sendings #####
-SendingsSetup=Sending module setup
-SendingsReceiptModel=Sending receipt model
-SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
-FreeLegalTextOnShippings=Free text on shipments
-##### Deliveries #####
-DeliveryOrderNumberingModules=Products deliveries receipt numbering module
-DeliveryOrderModel=Products deliveries receipt model
-DeliveriesOrderAbility=Support products deliveries receipts
-FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
-##### FCKeditor #####
-AdvancedEditor=Advanced editor
-ActivateFCKeditor=Activate advanced editor for:
-FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
-FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files.</font>
-FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
-FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
-##### OSCommerce 1 #####
-OSCommerceErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be an OSCommerce database (Key %s not found in table %s).
-OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' successfull.
-OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
-OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
-##### Stock #####
-StockSetup=Warehouse module setup
-IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
-##### Menu #####
-MenuDeleted=Menu deleted
-Menus=Menus
-TreeMenuPersonalized=Personalized menus
-NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
-NewMenu=New menu
-Menu=Selection of menu
-MenuHandler=Menu handler
-MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
-DetailId=Id menu
-DetailMenuHandler=Menu handler where to show new menu
-DetailMenuModule=Module name if menu entry come from a module
-DetailType=Type of menu (top or left)
-DetailTitre=Menu label or label code for translation
-DetailUrl=URL where menu send you (Absolute URL link or external link with http://)
-DetailEnabled=Condition to show or not entry
-DetailRight=Condition to display unauthorized grey menus
-DetailLangs=Lang file name for label code translation
-DetailUser=Intern / Extern / All
-Target=Target
-DetailTarget=Target for links (_blank top open a new window)
-DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu)
-ModifMenu=Menu change
-DeleteMenu=Delete menu entry
-ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
-FailedToInitializeMenu=Failed to initialize menu
-##### Tax #####
-TaxSetup=Taxes, social or fiscal taxes and dividends module setup
-OptionVatMode=VAT due
-OptionVATDefault=Cash basis
-OptionVATDebitOption=Accrual basis
-OptionVatDefaultDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on payments for services
-OptionVatDebitOptionDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on invoice (debit) for services
-SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
-OnDelivery=On delivery
-OnPayment=On payment
-OnInvoice=On invoice
-SupposedToBePaymentDate=Payment date used
-SupposedToBeInvoiceDate=Invoice date used
-Buy=Buy
-Sell=Sell
-InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
-AccountancyCode=Accountancy Code
-AccountancyCodeSell=Sale 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 -> Dictionary -> 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_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
-AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### 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 your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your 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.
-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 same computer than 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.
-##### Point Of Sales (CashDesk) #####
-CashDesk=Point of sales
-CashDeskSetup=Point of sales module setup
-CashDeskThirdPartyForSell=Default generic third party to use for sells
-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).
-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
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
-##### Bookmark #####
-BookmarkSetup=Bookmark module setup
-BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu.
-NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu
-##### WebServices #####
-WebServicesSetup=Webservices module setup
-WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
-WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
-EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
-##### API ####
-ApiSetup=API module setup
-ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
-OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
-ApiKey=Key for API
-WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
-##### Bank #####
-BankSetupModule=Bank module setup
-FreeLegalTextOnChequeReceipts=Free text on cheque receipts
-BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
-BankOrderGlobal=General
-BankOrderGlobalDesc=General display order
-BankOrderES=Spanish
-BankOrderESDesc=Spanish display order
-ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
-##### Multicompany #####
-MultiCompanySetup=Multi-company module setup
-##### Suppliers #####
-SuppliersSetup=Supplier module setup
-SuppliersCommandModel=Complete template of supplier order (logo...)
-SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
-SuppliersInvoiceNumberingModel=Supplier invoices numbering models
-IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
-##### GeoIPMaxmind #####
-GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
-NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
-YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
-YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
-TestGeoIPResult=Test of a conversion IP -> country
-##### Projects #####
-ProjectsNumberingModules=Projects numbering module
-ProjectsSetup=Project module setup
-ProjectsModelModule=Project reports document model
-TasksNumberingModules=Tasks numbering module
-TaskModelModule=Tasks reports document model
-UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
-##### ECM (GED) #####
-##### Fiscal Year #####
-AccountingPeriods=Accounting periods
-AccountingPeriodCard=Accounting period
-NewFiscalYear=New accounting period
-OpenFiscalYear=Open accounting period
-CloseFiscalYear=Close accounting period
-DeleteFiscalYear=Delete accounting period
-ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
-ShowFiscalYear=Show accounting period
-AlwaysEditable=Can always be edited
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
-Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
-IncludePath=Include path (defined into variable %s)
-ExpenseReportsSetup=Setup of module Expense Reports
-TemplatePDFExpenseReports=Document templates to generate expense report document
-NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
-YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of 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
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/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.
-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.
-ConfFileMuseContainCustom=Installing 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)
-TextTitleColor=Color of page title
-LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
-NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
-BackgroundColor=Background color
-TopMenuBackgroundColor=Background color for Top menu
-TopMenuDisableImages=Hide images in Top menu
-LeftMenuBackgroundColor=Background color for Left menu
-BackgroundTableTitleColor=Background color for Table title line
-BackgroundTableLineOddColor=Background color for odd table lines
-BackgroundTableLineEvenColor=Background color for even table lines
-MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
-NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
-UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
-PositionIntoComboList=Position of line into combo lists
-SellTaxRate=Sale tax rate
-RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
-UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipping, you can enter it here. You can use the key {TRACKID} into URL parameters so the system will replace it with value of tracking number user entered into shipment card.
-OpportunityPercent=When you create an opportunity, you will defined an estimated amount of project/lead. According to status of opportunity, this amount may be multiplicated 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
-FixTZ=TimeZone fix
-FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
-ExpectedChecksum=Expected Checksum
-CurrentChecksum=Current Checksum
-ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the latest stable version
-TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
-TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so 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 usefull only if your prices for each leve 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.
-SeeSubstitutionVars=See * note for list of possible substitution variables
-AllPublishers=All publishers
-UnknownPublishers=Unknown publishers
-AddRemoveTabs=Add or remove tabs
-AddDictionaries=Add dictionaries
-AddBoxes=Add widgets
-AddSheduledJobs=Add scheduled jobs
-AddHooks=Add hooks
-AddTriggers=Add triggers
-AddMenus=Add menus
-AddPermissions=Add permissions
-AddExportProfiles=Add export profiles
-AddImportProfiles=Add import profiles
-AddOtherPagesOrServices=Add other pages or services
-AddModels=Add document or numbering templates
-AddSubstitutions=Add keys substitutions
-DetectionNotPossible=Detection not possible
-UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved on 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 correclty. 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 inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <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
-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
-TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
-##### Resource ####
-ResourceSetup=Configuration du module Resource
-UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
diff --git a/htdocs/langs/en_CA/cashdesk.lang b/htdocs/langs/en_CA/cashdesk.lang
deleted file mode 100644
index c3ca13bf385..00000000000
--- a/htdocs/langs/en_CA/cashdesk.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cashdesk
-BankToPay=Account for payment
diff --git a/htdocs/langs/en_CA/main.lang b/htdocs/langs/en_CA/main.lang
index 9966f094632..6d4ce6e30f2 100644
--- a/htdocs/langs/en_CA/main.lang
+++ b/htdocs/langs/en_CA/main.lang
@@ -1,9 +1,5 @@
 # Dolibarr language file - Source file is en_US - main
 DIRECTION=ltr
-# Note for Chinese:
-# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
-# stsongstdlight or cid0cs are for simplified Chinese
-# To read Chinese pdf with Linux: sudo apt-get install poppler-data
 FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=,
@@ -23,799 +19,10 @@ FormatDateHourShort=%d.%m.%Y %H:%M
 FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
-DatabaseConnection=Database connection
-NoTemplateDefined=No template defined for this email type
-AvailableVariables=Available substitution variables
-NoTranslation=No translation
-NoRecordFound=No record found
-NoRecordDeleted=No record deleted
-NotEnoughDataYet=Not enough data
-NoError=No error
-Error=Error
-Errors=Errors
-ErrorFieldRequired=Field '%s' is required
-ErrorFieldFormat=Field '%s' has a bad value
-ErrorFileDoesNotExists=File %s does not exist
-ErrorFailedToOpenFile=Failed to open file %s
-ErrorCanNotCreateDir=Cannot create dir %s
-ErrorCanNotReadDir=Cannot read dir %s
-ErrorConstantNotDefined=Parameter %s not defined
-ErrorUnknown=Unknown error
-ErrorSQL=SQL Error
-ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this
-ErrorGoToModuleSetup=Go to Module setup to fix this
-ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
-ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
-ErrorInternalErrorDetected=Error detected
-ErrorWrongHostParameter=Wrong host parameter
-ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post again the form.
-ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child records.
-ErrorWrongValue=Wrong value
-ErrorWrongValueForParameterX=Wrong value for parameter %s
-ErrorNoRequestInError=No request in error
-ErrorServiceUnavailableTryLater=Service not available for 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>.
-ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr database.
 ErrorNoVATRateDefinedForSellerCountry=Error, no vat rate 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 nb of record per page
-NotAuthorized=You are not authorized to do that.
-SetDate=Set date
-SelectDate=Select a date
-SeeAlso=See also %s
-SeeHere=See here
-Apply=Apply
-BackgroundColorByDefault=Default background color
-FileRenamed=The file was successfully renamed
-FileUploaded=The file was successfully uploaded
-FileGenerated=The file was successfully generated
-FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
-NbOfEntries=Nb of entries
-GoToWikiHelpPage=Read online help (Internet access needed)
-GoToHelpPage=Read help
-RecordSaved=Record saved
-RecordDeleted=Record deleted
-LevelOfFeature=Level of features
-NotDefined=Not defined
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
-Administrator=Administrator
-Undefined=Undefined
-PasswordForgotten=Password forgotten?
-SeeAbove=See above
-HomeArea=Home area
-LastConnexion=Latest connection
-PreviousConnexion=Previous connection
-PreviousValue=Previous value
-ConnectedOnMultiCompany=Connected on environment
-ConnectedSince=Connected since
-AuthenticationMode=Authentication mode
-RequestedUrl=Requested URL
-DatabaseTypeManager=Database type manager
-RequestLastAccessInError=Latest database access request error
-ReturnCodeLastAccessInError=Return code for latest database access request error
-InformationLastAccessInError=Information for latest database access request error
-DolibarrHasDetectedError=Dolibarr has detected a technical error
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes
-MoreInformation=More information
-TechnicalInformation=Technical information
-TechnicalID=Technical ID
-NotePublic=Note (public)
-NotePrivate=Note (private)
-PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
-DoTest=Test
-ToFilter=Filter
-NoFilter=No filter
-WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance delay.
-yes=yes
-Yes=Yes
-no=no
-No=No
-All=All
-Home=Home
-Help=Help
-OnlineHelp=Online help
-PageWiki=Wiki page
-MediaBrowser=Media browser
-Always=Always
-Never=Never
-Under=under
-Period=Period
-PeriodEndDate=End date for period
-Activate=Activate
-Activated=Activated
-Closed=Closed
-Closed2=Closed
-NotClosed=Not closed
-Enabled=Enabled
-Deprecated=Deprecated
-Disable=Disable
-Disabled=Disabled
-Add=Add
-AddLink=Add link
-RemoveLink=Remove link
-AddToDraft=Add to draft
-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>?
-Delete=Delete
-Remove=Remove
-Resiliate=Terminate
-Cancel=Cancel
-Modify=Modify
-Edit=Edit
-Validate=Validate
-ValidateAndApprove=Validate and Approve
-ToValidate=To validate
-Save=Save
-SaveAs=Save As
-TestConnection=Test connection
-ToClone=Clone
-ConfirmClone=Choose data you want to clone :
-NoCloneOptionsSpecified=No data to clone defined.
-Of=of
-Go=Go
-Run=Run
-CopyOf=Copy of
-Show=Show
-Hide=Hide
-ShowCardHere=Show card
-Search=Search
-SearchOf=Search
-Valid=Valid
-Approve=Approve
-Disapprove=Disapprove
-ReOpen=Re-Open
-Upload=Send file
-ToLink=Link
-Select=Select
-Choose=Choose
-Resize=Resize
-Recenter=Recenter
-Author=Author
-User=User
-Users=Users
-Group=Group
-Groups=Groups
-NoUserGroupDefined=No user group defined
-Password=Password
-PasswordRetype=Retype your password
-NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
-Name=Name
-Person=Person
-Parameter=Parameter
-Parameters=Parameters
-Value=Value
-PersonalValue=Personal value
-NewValue=New value
-CurrentValue=Current value
-Code=Code
-Type=Type
-Language=Language
-MultiLanguage=Multi-language
-Note=Note
-Title=Title
-Label=Label
-RefOrLabel=Ref. or label
-Info=Log
-Family=Family
-Description=Description
-Designation=Description
-Model=Doc template
-DefaultModel=Default doc template
-Action=Event
-About=About
-Number=Number
-NumberByMonth=Number by month
-AmountByMonth=Amount by month
-Numero=Number
-Limit=Limit
-Limits=Limits
-Logout=Logout
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Connection
-Setup=Setup
-Alert=Alert
-Previous=Previous
-Next=Next
-Cards=Cards
-Card=Card
-Now=Now
-HourStart=Start hour
-Date=Date
-DateAndHour=Date and hour
-DateToday=Today's date
-DateReference=Reference date
-DateStart=Start date
-DateEnd=End date
-DateCreation=Creation date
-DateCreationShort=Creat. date
-DateModification=Modification date
-DateModificationShort=Modif. date
-DateLastModification=Latest modification date
-DateValidation=Validation date
-DateClosing=Closing date
-DateDue=Due date
-DateValue=Value date
-DateValueShort=Value date
-DateOperation=Operation date
-DateOperationShort=Oper. Date
-DateLimit=Limit date
-DateRequest=Request date
-DateProcess=Process date
-DateBuild=Report build date
-DatePayment=Date of payment
-DateApprove=Approving date
-DateApprove2=Approving date (second approval)
-UserCreation=Creation user
-UserModification=Modification user
-UserCreationShort=Creat. user
-UserModificationShort=Modif. user
-DurationYear=year
-DurationMonth=month
-DurationWeek=week
-DurationDay=day
-DurationYears=years
-DurationMonths=months
-DurationWeeks=weeks
-DurationDays=days
-Year=Year
-Month=Month
-Week=Week
-WeekShort=Week
-Day=Day
-Hour=Hour
-Minute=Minute
-Second=Second
-Years=Years
-Months=Months
-Days=Days
-days=days
-Hours=Hours
-Minutes=Minutes
-Seconds=Seconds
-Weeks=Weeks
-Today=Today
-Yesterday=Yesterday
-Tomorrow=Tomorrow
-Morning=Morning
-Afternoon=Afternoon
-Quadri=Quadri
-MonthOfDay=Month of the day
-HourShort=H
-MinuteShort=mn
-Rate=Rate
-CurrencyRate=Currency conversion rate
-UseLocalTax=Include tax
-Bytes=Bytes
-KiloBytes=Kilobytes
-MegaBytes=Megabytes
-GigaBytes=Gigabytes
-TeraBytes=Terabytes
-b=b.
-Kb=Kb
-Mb=Mb
-Gb=Gb
-Tb=Tb
-Cut=Cut
-Copy=Copy
-Paste=Paste
-Default=Default
-DefaultValue=Default value
-Price=Price
-UnitPrice=Unit price
-UnitPriceHT=Unit price (net)
-UnitPriceTTC=Unit price
-PriceU=U.P.
-PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (currency)
-PriceUTTC=U.P. (inc. tax)
-Amount=Amount
-AmountInvoice=Invoice amount
-AmountPayment=Payment amount
-AmountHTShort=Amount (net)
-AmountTTCShort=Amount (inc. tax)
-AmountHT=Amount (net of tax)
-AmountTTC=Amount (inc. tax)
 AmountVAT=Amount GST
-MulticurrencyAlreadyPaid=Already payed, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
-MulticurrencyAmountHT=Amount (net of tax), original currency
-MulticurrencyAmountTTC=Amount (inc. of tax), original currency
-MulticurrencyAmountVAT=Amount tax, original currency
 AmountLT1=Amount PST
-AmountLT2=Amount tax 3
-AmountLT1ES=Amount RE
-AmountLT2ES=Amount IRPF
-AmountTotal=Total amount
-AmountAverage=Average amount
-PriceQtyMinHT=Price quantity min. (net of tax)
-Percentage=Percentage
-Total=Total
-SubTotal=Subtotal
-TotalHTShort=Total (net)
-TotalHTShortCurrency=Total (net in currency)
-TotalTTCShort=Total (inc. tax)
-TotalHT=Total (net of tax)
-TotalHTforthispage=Total (net of tax) for this page
-Totalforthispage=Total for this page
-TotalTTC=Total (inc. tax)
-TotalTTCToYourCredit=Total (inc. tax) to your credit
 TotalVAT=Total GST
 TotalLT1=Total PST
-TotalLT2=Total tax 3
-TotalLT1ES=Total RE
-TotalLT2ES=Total IRPF
-HT=Net of tax
-TTC=Inc. tax
 VAT=GST
-VATs=Sales taxes
-LT1ES=RE
-LT2ES=IRPF
 VATRate=GST rate
-Average=Average
-Sum=Sum
-Delta=Delta
-Module=Module
-Option=Option
-List=List
-FullList=Full list
-Statistics=Statistics
-OtherStatistics=Other statistics
-Status=Status
-Favorite=Favorite
-ShortInfo=Info.
-Ref=Ref.
-ExternalRef=Ref. extern
-RefSupplier=Ref. supplier
-RefPayment=Ref. payment
-CommercialProposalsShort=Commercial proposals
-Comment=Comment
-Comments=Comments
-ActionsToDo=Events to do
-ActionsToDoShort=To do
-ActionsDoneShort=Done
-ActionNotApplicable=Not applicable
-ActionRunningNotStarted=To start
-ActionRunningShort=In progress
-ActionDoneShort=Finished
-ActionUncomplete=Uncomplete
-CompanyFoundation=Company/Foundation
-ContactsForCompany=Contacts 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
-NActionsLate=%s late
-RequestAlreadyDone=Request already recorded
-Filter=Filter
-FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
-RemoveFilter=Remove filter
-ChartGenerated=Chart generated
-ChartNotGenerated=Chart not generated
-GeneratedOn=Build on %s
-Generate=Generate
-Duration=Duration
-TotalDuration=Total duration
-Summary=Summary
-DolibarrStateBoard=Statistics
-DolibarrWorkBoard=Work tasks board
-Available=Available
-NotYetAvailable=Not yet available
-NotAvailable=Not available
-Categories=Tags/categories
-Category=Tag/category
-By=By
-From=From
-to=to
-and=and
-or=or
-Other=Other
-Others=Others
-OtherInformations=Other informations
-Quantity=Quantity
-Qty=Qty
-ChangedBy=Changed by
-ApprovedBy=Approved by
-ApprovedBy2=Approved by (second approval)
-Approved=Approved
-Refused=Refused
-ReCalculate=Recalculate
-ResultKo=Failure
-Reporting=Reporting
-Reportings=Reporting
-Draft=Draft
-Drafts=Drafts
-Validated=Validated
-Opened=Opened
-New=New
-Discount=Discount
-Unknown=Unknown
-General=General
-Size=Size
-Received=Received
-Paid=Paid
-Topic=Subject
-ByCompanies=By third parties
-ByUsers=By users
-Links=Links
-Link=Link
-Rejects=Rejects
-Preview=Preview
-NextStep=Next step
-Datas=Data
-None=None
-NoneF=None
-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.
-Photo=Picture
-Photos=Pictures
-AddPhoto=Add picture
-DeletePicture=Picture delete
-ConfirmDeletePicture=Confirm picture deletion?
-Login=Login
-CurrentLogin=Current login
-EnterLoginDetail=Enter login details
-January=January
-February=February
-March=March
-April=April
-May=May
-June=June
-July=July
-August=August
-September=September
-October=October
-November=November
-December=December
-JanuaryMin=Jan
-FebruaryMin=Feb
-MarchMin=Mar
-AprilMin=Apr
-MayMin=May
-JuneMin=Jun
-JulyMin=Jul
-AugustMin=Aug
-SeptemberMin=Sep
-OctoberMin=Oct
-NovemberMin=Nov
-DecemberMin=Dec
-Month01=January
-Month02=February
-Month03=March
-Month04=April
-Month05=May
-Month06=June
-Month07=July
-Month08=August
-Month09=September
-Month10=October
-Month11=November
-Month12=December
-MonthShort01=Jan
-MonthShort02=Feb
-MonthShort03=Mar
-MonthShort04=Apr
-MonthShort05=May
-MonthShort06=Jun
-MonthShort07=Jul
-MonthShort08=Aug
-MonthShort09=Sep
-MonthShort10=Oct
-MonthShort11=Nov
-MonthShort12=Dec
-AttachedFiles=Attached files and documents
-FileTransferComplete=File was uploaded successfuly
-DateFormatYYYYMM=YYYY-MM
-DateFormatYYYYMMDD=YYYY-MM-DD
-DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
-ReportName=Report name
-ReportPeriod=Report period
-ReportDescription=Description
-Report=Report
-Keyword=Keyword
-Origin=Origin
-Legend=Legend
-Fill=Fill
-Reset=Reset
-File=File
-Files=Files
-NotAllowed=Not allowed
-ReadPermissionNotAllowed=Read permission not allowed
-AmountInCurrency=Amount in %s currency
-Example=Example
-Examples=Examples
-NoExample=No example
-FindBug=Report a bug
-NbOfThirdParties=Number of third parties
-NbOfLines=Number of lines
-NbOfObjects=Number of objects
-NbOfObjectReferers=Number of related items
-Referers=Related items
-TotalQuantity=Total quantity
-DateFromTo=From %s to %s
-DateFrom=From %s
-DateUntil=Until %s
-Check=Check
-Uncheck=Uncheck
-Internal=Internal
-External=External
-Internals=Internal
-Externals=External
-Warning=Warning
-Warnings=Warnings
-BuildDoc=Build Doc
-Entity=Environment
-Entities=Entities
-CustomerPreview=Customer preview
-SupplierPreview=Supplier preview
-ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show supplier preview
-RefCustomer=Ref. customer
-Currency=Currency
-InfoAdmin=Information for administrators
-Undo=Undo
-Redo=Redo
-ExpandAll=Expand all
-UndoExpandAll=Undo expand
-Reason=Reason
-FeatureNotYetSupported=Feature not yet supported
-CloseWindow=Close window
-Response=Response
-Priority=Priority
-SendByMail=Send by EMail
-MailSentBy=Email sent by
-TextUsedInTheMessageBody=Email body
-SendAcknowledgementByMail=Send confirmation email
-EMail=E-mail
-NoEMail=No email
-Email=Email
-NoMobilePhone=No mobile phone
-Owner=Owner
-FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
-Refresh=Refresh
-BackToList=Back to list
-GoBack=Go back
-CanBeModifiedIfOk=Can be modified if valid
-CanBeModifiedIfKo=Can be modified if not valid
-ValueIsValid=Value is valid
-ValueIsNotValid=Value is not valid
-RecordCreatedSuccessfully=Record created successfully
-RecordModifiedSuccessfully=Record modified successfully
-RecordsModified=%s record modified
-RecordsDeleted=%s record deleted
-AutomaticCode=Automatic code
-FeatureDisabled=Feature disabled
-MoveBox=Move widget
-Offered=Offered
-NotEnoughPermissions=You don't have permission for this action
-SessionName=Session name
-Method=Method
-Receive=Receive
-CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
-ExpectedValue=Expected Value
-CurrentValue=Current value
-PartialWoman=Partial
-TotalWoman=Total
-NeverReceived=Never received
-Canceled=Canceled
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
-Color=Color
-Documents=Linked files
-Documents2=Documents
-UploadDisabled=Upload disabled
-MenuECM=Documents
-MenuAWStats=AWStats
-MenuMembers=Members
-MenuAgendaGoogle=Google agenda
-ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=No documents saved in this directory
-CurrentUserLanguage=Current language
-CurrentTheme=Current theme
-CurrentMenuManager=Current menu manager
-Browser=Browser
-Layout=Layout
-Screen=Screen
-DisabledModules=Disabled modules
-For=For
-ForCustomer=For customer
-Signature=Signature
-DateOfSignature=Date of signature
-HidePassword=Show command with password hidden
-UnHidePassword=Show real command with clear password
-Root=Root
-Informations=Informations
-Page=Page
-Notes=Notes
-AddNewLine=Add new line
-AddFile=Add file
-FreeZone=Free entry
-FreeLineOfType=Free entry of type
-CloneMainAttributes=Clone object with its main attributes
-PDFMerge=PDF Merge
-Merge=Merge
-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 application at the moment.
-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
-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.
-AccordingToGeoIPDatabase=(according to GeoIP convertion)
-Line=Line
-NotSupported=Not supported
-RequiredField=Required field
-Result=Result
-ToTest=Test
-ValidateBefore=Card must be validated before using this feature
-Visibility=Visibility
-Private=Private
-Hidden=Hidden
-Resources=Resources
-Source=Source
-Prefix=Prefix
-Before=Before
-After=After
-IPAddress=IP address
-Frequency=Frequency
-IM=Instant messaging
-NewAttribute=New attribute
-AttributeCode=Attribute code
-URLPhoto=URL of photo/logo
-SetLinkToAnotherThirdParty=Link to another third party
-LinkTo=Link to
-LinkToProposal=Link to proposal
-LinkToOrder=Link to order
-LinkToInvoice=Link to invoice
-LinkToSupplierOrder=Link to supplier order
-LinkToSupplierProposal=Link to supplier proposal
-LinkToSupplierInvoice=Link to supplier invoice
-LinkToContract=Link to contract
-LinkToIntervention=Link to intervention
-CreateDraft=Create draft
-SetToDraft=Back to draft
-ClickToEdit=Click to edit
-ObjectDeleted=Object %s deleted
-ByCountry=By country
-ByTown=By town
-ByDate=By date
-ByMonthYear=By month/year
-ByYear=By year
-ByMonth=By month
-ByDay=By day
-BySalesRepresentative=By sales representative
-LinkedToSpecificUsers=Linked to a particular user contact
-NoResults=No results
-AdminTools=Admin tools
-SystemTools=System tools
-ModulesSystemTools=Modules tools
-Test=Test
-Element=Element
-NoPhotoYet=No pictures available yet
-Dashboard=Dashboard
-MyDashboard=My dashboard
-Deductible=Deductible
-from=from
-toward=toward
-Access=Access
-SelectAction=Select action
-HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
-SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
-OriginFileName=Original filename
-SetDemandReason=Set source
-SetBankAccount=Define Bank Account
-AccountCurrency=Account Currency
-ViewPrivateNote=View notes
-XMoreLines=%s line(s) hidden
-PublicUrl=Public URL
-AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
-PrintFile=Print File %s
-ShowTransaction=Show entry on bank account
-GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
-Deny=Deny
-Denied=Denied
-ListOfTemplates=List of templates
-Gender=Gender
-Genderman=Man
-Genderwoman=Woman
-ViewList=List view
-Mandatory=Mandatory
-Hello=Hello
-Sincerely=Sincerely
-DeleteLine=Delete line
-ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
-NoRecordSelected=No record selected
-MassFilesArea=Area for files built by mass actions
-ShowTempMassFilesArea=Show area of files built by mass actions
-RelatedObjects=Related Objects
-ClassifyBilled=Classify billed
-Progress=Progress
-ClickHere=Click here
-FrontOffice=Front office
-BackOffice=Back office
-View=View
-Export=Export
-Exports=Exports
-ExportFilteredList=Export filtered list
-ExportList=Export list
-Miscellaneous=Miscellaneous
-Calendar=Calendar
-GroupBy=Group by...
-ViewFlatList=View flat list
-RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Direct download link
-Download=Download
-ActualizeCurrency=Update currency rate
-Fiscalyear=Fiscal year
-# Week day
-Monday=Monday
-Tuesday=Tuesday
-Wednesday=Wednesday
-Thursday=Thursday
-Friday=Friday
-Saturday=Saturday
-Sunday=Sunday
-MondayMin=Mo
-TuesdayMin=Tu
-WednesdayMin=We
-ThursdayMin=Th
-FridayMin=Fr
-SaturdayMin=Sa
-SundayMin=Su
-Day1=Monday
-Day2=Tuesday
-Day3=Wednesday
-Day4=Thursday
-Day5=Friday
-Day6=Saturday
-Day0=Sunday
-ShortMonday=M
-ShortTuesday=T
-ShortWednesday=W
-ShortThursday=T
-ShortFriday=F
-ShortSaturday=S
-ShortSunday=S
-SelectMailModel=Select email template
-SetRef=Set ref
-Select2ResultFoundUseArrows=Some results found. Use arrows to select.
-Select2NotFound=No result found
-Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
-Select2LoadingMoreResults=Loading more results...
-Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
-SearchIntoContacts=Contacts
-SearchIntoMembers=Members
-SearchIntoUsers=Users
-SearchIntoProductsOrServices=Products or services
-SearchIntoProjects=Projects
-SearchIntoTasks=Tasks
-SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
-SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
-SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
-SearchIntoInterventions=Interventions
-SearchIntoContracts=Contracts
-SearchIntoCustomerShipments=Customer shipments
-SearchIntoExpenseReports=Expense reports
-SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/en_CA/trips.lang b/htdocs/langs/en_CA/trips.lang
deleted file mode 100644
index 288b8de2315..00000000000
--- a/htdocs/langs/en_CA/trips.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - trips
-ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
diff --git a/htdocs/langs/en_GB/accountancy.lang b/htdocs/langs/en_GB/accountancy.lang
deleted file mode 100644
index 527f1fd139d..00000000000
--- a/htdocs/langs/en_GB/accountancy.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-AccountingCategory=Accounting category
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
diff --git a/htdocs/langs/en_GB/admin.lang b/htdocs/langs/en_GB/admin.lang
index fbb430dd371..7a5a4f3a4d8 100644
--- a/htdocs/langs/en_GB/admin.lang
+++ b/htdocs/langs/en_GB/admin.lang
@@ -1,1665 +1,39 @@
 # Dolibarr language file - Source file is en_US - admin
 Foundation=Company
-Version=Version
 VersionProgram=Program Version
 VersionLastInstall=Version Initially Installed
-VersionLastUpgrade=Latest version upgrade
-VersionExperimental=Experimental
-VersionDevelopment=Development
-VersionUnknown=Unknown
-VersionRecommanded=Recommended
-FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. Value of some setup constants may also be checked. You can use this tool to detect if some files were modified by a hacker for example.
-FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
-GlobalChecksum=Global checksum
-MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
-LocalSignature=Embedded local signature (less reliable)
-RemoteSignature=Remote distant signature (more reliable)
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FilesModified=Modified Files
-FilesAdded=Added Files
-FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
-XmlNotFound=Xml Integrity File of application not found
-SessionId=Session ID
-SessionSaveHandler=Handler to save sessions
 SessionSavePath=Storage session localisation
 PurgeSessions=Purge sessions
-ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
 NoSessionListWithThisHandler=The Saved session handler configured in your PHP does not allow listing of all running sessions.
-LockNewSessions=Lock new connections
 ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connections to yourself. Only user <b>%s</b> will be able to connect after that.
-UnlockNewSessions=Remove connection lock
-YourSession=Your session
 Sessions=User session
-WebUserGroup=Web server user/group
 NoSessionFound=Your PHP does not allow listing active sessions. Directory used to save sessions (<b>%s</b>) might be protected (For example, by OS permissions or by PHP directive open_basedir).
-DBStoringCharset=Database charset to store data
-DBSortingCharset=Database charset to sort data
-WarningModuleNotActive=Module <b>%s</b> must be enabled
-WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page.
-DolibarrSetup=Dolibarr install or upgrade
-InternalUser=Internal user
-ExternalUser=External user
-InternalUsers=Internal users
-ExternalUsers=External users
-GUISetup=Display
-SetupArea=Setup area
-FormToTestFileUploadForm=Form to test file upload (according to setup)
-IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
-RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any usage of the update tool.
-SecuritySetup=Security setup
-SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=Error: This module requires PHP version %s or higher
 ErrorModuleRequireDolibarrVersion=Error: This module requires Dolibarr version %s or higher
 ErrorDecimalLargerThanAreForbidden=Error: A precision higher than <b>%s</b> is not supported.
-DictionarySetup=Dictionary setup
-Dictionary=Dictionaries
 ErrorReservedTypeSystemSystemAuto=Entry 'system' and 'systemauto' for this type is reserved. You can use 'user' as a value to add your own record
 ErrorCodeCantContainZero=Code can't contain value 0 (zero)
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for a blind person or text browsers)
-UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties, but it is less convenient)
-DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact, but it is less convenient)
 NumberOfKeyToSearch=Number of characters to trigger search: %s
-NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
-AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
-JavascriptDisabled=JavaScript disabled
-UsePreviewTabs=Use preview tabs
-ShowPreview=Show preview
-PreviewNotAvailable=Preview not available
-ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
-MySQLTimeZone=TimeZone MySql (database)
-TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
-Space=Space
-Table=Table
-Fields=Fields
-Index=Index
-Mask=Mask
-NextValue=Next value
-NextValueForInvoices=Next value (invoices)
-NextValueForCreditNotes=Next value (credit notes)
-NextValueForDeposit=Next value (deposit)
-NextValueForReplacements=Next value (replacements)
 MustBeLowerThanPHPLimit=Note: Your PHP limits each file upload's size to <b>%s</b> %s, whatever you enter here
-NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
 MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to prevent any uploads)
-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
-AntiVirusParam= More parameters on command line
-AntiVirusParamExample= Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
-ComptaSetup=Accounting module setup
-UserSetup=User management setup
-MultiCurrencySetup=Multi-currency setup
-MenuLimits=Limits and accuracy
-MenuIdParent=Parent menu ID
-DetailMenuIdParent=ID of parent menu (empty for a top menu)
-DetailPosition=Sort number to define menu position
-AllMenus=All
-NotConfigured=Module not configured
-Active=Active
-SetupShort=Setup
-OtherOptions=Other options
-OtherSetup=Other setup
-CurrentValueSeparatorDecimal=Decimal separator
+AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
+AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 CurrentValueSeparatorThousand=Thousands separator
-Destination=Destination
-IdModule=Module ID
-IdPermissions=Permissions ID
-Modules=Modules
-LanguageBrowserParameter=Parameter %s
-LocalisationDolibarrParameters=Localisation parameters
-ClientTZ=Client Time Zone (user)
-ClientHour=Client time (user)
-OSTZ=Server OS Time Zone
-PHPTZ=PHP server Time Zone
-DaylingSavingTime=Daylight saving time
-CurrentHour=PHP Time (server)
-CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
-Box=Widget
-Boxes=Widgets
-MaxNbOfLinesForBoxes=Max number of lines for widgets
 PositionByDefault=Default position
-Position=Position
 MenusDesc=Menu managers set the content of the two menu bars (horizontal and vertical).
 MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and make permanently unreachable menu entries.<br />Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them by disabling and re-enabling the module.
-MenuForUsers=Menu for users
-LangFile=.lang file
-System=System
-SystemInfo=System information
-SystemToolsArea=System tools area
-SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for.
-Purge=Purge
-PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log file <b>%s</b> defined for the Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
-PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory <b>%s</b>. All temporary files including database backup dumps, any files attached to elements (third parties, invoices, ...) and files uploaded into the ECM module will be deleted.
-PurgeRunNow=Purge now
-PurgeNothingToDelete=No directory or files to delete.
-PurgeNDirectoriesDeleted=<b>%s</b> files or directories deleted.
-PurgeAuditEvents=Purge all security events
 ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted but no other data will be removed.
-GenerateBackup=Generate backup
-Backup=Backup
-Restore=Restore
-RunCommandSummary=Backup has been launched with the following command
-BackupResult=Backup result
-BackupFileSuccessfullyCreated=Backup file successfully generated
-YouCanDownloadBackupFile=Generated files can now be downloaded
-NoBackupFileAvailable=No backup files available.
-ExportMethod=Export method
-ImportMethod=Import method
-ToBuildBackupFileClickHere=To build a backup file, click <a href="%s">here</a>.
 ImportMySqlDesc=To import a backup file, you must use the mysql command from the command line:
 ImportPostgreSqlDesc=To import a backup file, you must use the pg_restore command from the command line:
-ImportMySqlCommand=%s %s < mybackupfile.sql
-ImportPostgreSqlCommand=%s %s mybackupfile.sql
 FileNameToGenerate=File name to be generated\n
-Compression=Compression
-CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
 CommandsToDisableForeignKeysForImportWarning=This is mandatory if you want to restore your sql dumps later
-ExportCompatibility=Compatibility of generated export file
-MySqlExportParameters=MySQL export parameters
-PostgreSqlExportParameters= PostgreSQL export parameters
-UseTransactionnalMode=Use transactional mode
-FullPathToMysqldumpCommand=Full path to mysqldump command
-FullPathToPostgreSQLdumpCommand=Full path to pg_dump command
-ExportOptions=Export Options
-AddDropDatabase=Add DROP DATABASE command
-AddDropTable=Add DROP TABLE command
-ExportStructure=Structure
-NameColumn=Name columns
-ExtendedInsert=Extended INSERT
-NoLockBeforeInsert=No lock commands around INSERT
-DelayedInsert=Delayed insert
-EncodeBinariesInHexa=Encode binary data in hexadecimal
-IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
-AutoDetectLang=Autodetect (browser language)
-FeatureDisabledInDemo=Feature disabled in demo
-FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Permissions
-BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
-OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
-ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external modules...
-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 (Note: anyone experienced in PHP programming can provide custom development for an open source project)
-WebSiteDesc=Reference websites to find more modules...
-URL=Link
-BoxesAvailable=Widgets available
-BoxesActivated=Widgets activated
-ActivateOn=Activate on
-ActiveOn=Activated on
-SourceFile=Source file
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
-Required=Required
-UsedOnlyWithTypeOption=Used by some agenda option only
-Security=Security
-Passwords=Passwords
-DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
-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 (Activated 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 make building of a global cumulated pdf not working (like unpaid invoices).
-Feature=Feature
-DolibarrLicense=License
-Developpers=Developers/contributors
-OfficialWebSite=Dolibarr international official web site
-OfficialWebSiteLocal=Local web site (%s)
-OfficialWiki=Dolibarr documentation on Wiki
-OfficialDemo=Dolibarr online demo
-OfficialMarketPlace=Official market place for external modules/addons
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
-ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
-HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
-HelpCenterDesc2=Some part of this service are available in <b>english only</b>.
-CurrentMenuHandler=Current menu handler
-MeasuringUnit=Measuring unit
-LeftMargin=Left margin
-TopMargin=Top margin
-PaperSize=Paper type
-Orientation=Orientation
-SpaceX=Space X
-SpaceY=Space Y
-FontSize=Font size
-Content=Content
-NoticePeriod=Notice period
-NewByMonth=New by month
-Emails=E-mails
-EMailsSetup=E-mails setup
-EMailsDesc=This page allows you to overwrite your PHP parameters for e-mails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless.
-MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
-MAIN_MAIL_EMAIL_FROM=Sender e-mail for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Sender e-mail used for error returns emails sent
-MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
-MAIN_DISABLE_ALL_MAILS=Disable all e-mails sendings (for test purposes or demos)
-MAIN_MAIL_SENDMODE=Method to use to send EMails
-MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
-MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
-MAIN_MAIL_EMAIL_TLS= Use TLS (SSL) encrypt
-MAIN_MAIL_EMAIL_STARTTLS= Use TLS (STARTTLS) encrypt
-MAIN_DISABLE_ALL_SMS=Disable all SMS sendings (for test purposes or demos)
-MAIN_SMS_SENDMODE=Method to use to send SMS
-MAIN_MAIL_SMS_FROM=Default sender phone number for Sms sending
-MAIN_MAIL_DEFAULT_FROMTYPE=Sender e-mail by default for manual sendings (User email or Company email)
-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/
-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 setup
-ModuleFamilyBase=System
-ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
-ModuleFamilyProducts=Products Management (PM)
-ModuleFamilyHr=Human Resource Management (HR)
-ModuleFamilyProjects=Projects/Collaborative work
-ModuleFamilyOther=Other
-ModuleFamilyTechnic=Multi-modules tools
-ModuleFamilyExperimental=Experimental modules
-ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
-ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
-ModuleFamilyInterface=Interfaces with external systems
-MenuHandlers=Menu handlers
-MenuAdmin=Menu editor
-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).
-DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <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>.
-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='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
-YouCanSubmitFile=For this step, you can send package using this tool: Select module file
-CurrentVersion=Dolibarr current version
-CallUpdatePage=Go to the page that updates the database structure and data: %s.
-LastStableVersion=Latest stable version
-LastActivationDate=Latest activation date
-UpdateServerOffline=Update server offline
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
-GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
-GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
-ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
-ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
-DoTestServerAvailability=Test server connectivity
-DoTestSend=Test sending
-DoTestSendHTML=Test sending HTML
-ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
-ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
-UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
-UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
-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...).
-MinLength=Minimum length
-LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
-ExamplesWithCurrentSetup=Examples with current running setup
-ListOfDirectories=List of OpenDocument templates directories
-ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
-NumberOfModelFilesFound=Number of ODT/ODS templates files found in those 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:
-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.
-ThemeDir=Skins directory
-ConnectionTimeout=Connexion timeout
-ResponseTimeout=Response timeout
-SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__
-ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
-SecurityToken=Key to secure URLs
-NoSmsEngine=No SMS sender manager available. SMS sender manager are not installed with default distribution (because they depends on an external supplier) but you can find some on %s
-PDF=PDF
-PDFDesc=You can set each global options related to the PDF generation
-PDFAddressForging=Rules to forge address boxes
-HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF
-HideDescOnPDF=Hide products description on generated PDF
-HideRefOnPDF=Hide products ref. on generated PDF
-HideDetailsOnPDF=Hide product lines details on generated PDF
-PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
-Library=Library
-UrlGenerationParameters=Parameters to secure URLs
-SecurityTokenIsUnique=Use a unique securekey parameter for each URL
-EnterRefToBuildUrl=Enter reference for object %s
-GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons to 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
-MassConvert=Launch mass convert
-String=String
-TextLong=Long text
-Int=Integer
-Float=Float
-DateAndTime=Date and hour
-Unique=Unique
-Boolean=Boolean (Checkbox)
-ExtrafieldPhone = Phone
-ExtrafieldPrice = Price
-ExtrafieldMail = Email
-ExtrafieldUrl = Url
-ExtrafieldSelect = Select list
-ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
-ExtrafieldPassword=Password
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
-ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
-LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
-SMS=SMS
-LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
-RefreshPhoneLink=Refresh link
-LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
-KeepEmptyToUseDefault=Keep empty to use default value
-DefaultLink=Default link
-SetAsDefault=Set as default
-ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
-BarcodeInitForThirdparties=Mass barcode init for thirdparties
-BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Init value for next %s empty records
-EraseAllCurrentBarCode=Erase all current barcode values
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
-AllBarcodeReset=All barcode values have been removed
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into 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
-DisplayCompanyInfo=Display company address
-DisplayCompanyManagers=Display manager names
-DisplayCompanyInfoAndManagers=Display company address and manager names
-EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
-ModuleCompanyCodePanicum=Return an empty accountancy code.
-ModuleCompanyCodeDigitaria=Accountancy 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: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-ClickToShowDescription=Click to show description
-# Modules
-Module0Name=Users & groups
-Module0Desc=Users / Employees and Groups management
-Module1Name=Third parties
-Module1Desc=Companies and contact management (customers, prospects...)
-Module2Name=Commercial
-Module2Desc=Commercial management
-Module10Name=Accounting
-Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
-Module20Name=Proposals
-Module20Desc=Commercial proposal management
-Module22Name=Mass E-mailings
-Module22Desc=Mass E-mailing management
-Module23Name=Energy
-Module23Desc=Monitoring the consumption of energies
-Module25Name=Customer Orders
-Module25Desc=Customer order management
-Module30Name=Invoices
-Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
-Module40Name=Suppliers
-Module40Desc=Supplier management and buying (orders and invoices)
-Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
-Module49Name=Editors
-Module49Desc=Editor management
-Module50Name=Products
-Module50Desc=Product management
-Module51Name=Mass mailings
-Module51Desc=Mass paper mailing management
-Module52Name=Stocks
-Module52Desc=Stock management (products)
-Module53Name=Services
-Module53Desc=Service management
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
-Module55Name=Barcodes
-Module55Desc=Barcode management
-Module56Name=Telephony
-Module56Desc=Telephony integration
-Module57Name=Direct bank payment orders
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
-Module58Name=ClickToDial
-Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
-Module70Name=Interventions
-Module70Desc=Intervention management
-Module75Name=Expense and trip notes
-Module75Desc=Expense and trip notes management
-Module80Name=Shipments
-Module80Desc=Shipments and delivery order management
-Module85Name=Banks and cash
-Module85Desc=Management of bank or cash accounts
-Module100Name=External site
-Module100Desc=This module include an external web site or page into Dolibarr menus and view it into a Dolibarr frame
-Module105Name=Mailman and SPIP
-Module105Desc=Mailman or SPIP interface for member module
-Module200Name=LDAP
-Module200Desc=LDAP directory synchronisation
-Module210Name=PostNuke
-Module210Desc=PostNuke integration
-Module240Name=Data exports
-Module240Desc=Tool to export Dolibarr data (with assistants)
-Module250Name=Data imports
-Module250Desc=Tool to import data in Dolibarr  (with assistants)
-Module310Name=Members
-Module310Desc=Foundation members management
-Module320Name=RSS Feed
-Module320Desc=Add RSS feed inside Dolibarr screen pages
-Module330Name=Bookmarks
-Module330Desc=Bookmarks management
-Module400Name=Projects/Opportunities/Leads
-Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
-Module410Name=Webcalendar
-Module410Desc=Webcalendar integration
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
-Module520Name=Loan
-Module520Desc=Management of loans
-Module600Name=Notifications
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
-Module700Name=Donations
-Module700Desc=Donation management
-Module770Name=Expense reports
-Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
-Module1200Name=Mantis
-Module1200Desc=Mantis integration
-Module1400Name=Accounting
-Module1400Desc=Accounting management (double parties)
-Module1520Name=Document Generation
-Module1520Desc=Mass mail document generation
-Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
-Module2000Name=WYSIWYG editor
-Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
-Module2200Name=Dynamic Prices
-Module2200Desc=Enable the usage of math expressions for prices
-Module2300Name=Cron
-Module2300Desc=Scheduled job management
-Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
-Module2500Name=Electronic Content Management
-Module2500Desc=Save and share documents
-Module2600Name=API/Web services (SOAP server)
-Module2600Desc=Enable the Dolibarr SOAP server providing API services
-Module2610Name=API/Web services (REST server)
-Module2610Desc=Enable the Dolibarr REST server providing API services
-Module2660Name=Call WebServices (SOAP client)
-Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
-Module2700Name=Gravatar
-Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
-Module2800Desc=FTP Client
-Module2900Name=GeoIPMaxmind
-Module2900Desc=GeoIP Maxmind conversions capabilities
-Module3100Name=Skype
-Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
-Module4000Name=HRM
-Module4000Desc=Human resources management
-Module5000Name=Multi-company
-Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management
-Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
-Module20000Name=Leave Requests management
-Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Product lot
-Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
-Module50000Name=PayBox
-Module50000Desc=Module to offer an online payment page by credit card with PayBox
-Module50100Name=Point of sales
-Module50100Desc=Point of sales module (POS).
-Module50200Name=Paypal
-Module50200Desc=Module to offer an online payment page by credit card with Paypal
-Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double parties)
-Module54000Name=PrintIPP
-Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
-Module55000Name=Poll, Survey or Vote
-Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
-Module59000Name=Margins
-Module59000Desc=Module to manage margins
-Module60000Name=Commissions
-Module60000Desc=Module to manage commissions
-Module63000Name=Resources
-Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
-Permission11=Read customer invoices
-Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
-Permission14=Validate customer invoices
-Permission15=Send customer invoices by email
-Permission16=Create payments for customer invoices
-Permission19=Delete customer invoices
-Permission21=Read commercial proposals
-Permission22=Create/modify commercial proposals
-Permission24=Validate commercial proposals
-Permission25=Send commercial proposals
-Permission26=Close commercial proposals
-Permission27=Delete commercial proposals
-Permission28=Export commercial proposals
-Permission31=Read products
-Permission32=Create/modify products
-Permission34=Delete products
-Permission36=See/manage hidden products
-Permission38=Export products
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
-Permission44=Delete projects (shared project and projects i'm contact for)
-Permission45=Export projects
-Permission61=Read interventions
-Permission62=Create/modify interventions
-Permission64=Delete interventions
-Permission67=Export interventions
-Permission71=Read members
-Permission72=Create/modify members
-Permission74=Delete members
-Permission75=Setup types of membership
-Permission76=Export data
-Permission78=Read subscriptions
-Permission79=Create/modify subscriptions
-Permission81=Read customers orders
-Permission82=Create/modify customers orders
-Permission84=Validate customers orders
-Permission86=Send customers orders
-Permission87=Close customers orders
-Permission88=Cancel customers orders
-Permission89=Delete customers orders
-Permission91=Read social or fiscal taxes and vat
-Permission92=Create/modify social or fiscal taxes and vat
-Permission93=Delete social or fiscal taxes and vat
-Permission94=Export social or fiscal taxes
-Permission95=Read reports
-Permission101=Read sendings
-Permission102=Create/modify sendings
-Permission104=Validate sendings
-Permission106=Export sendings
-Permission109=Delete sendings
-Permission111=Read financial accounts
-Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
-Permission114=Reconciliate transactions
-Permission115=Export transactions and account statements
-Permission116=Transfers between accounts
-Permission117=Manage cheques dispatching
-Permission121=Read third parties linked to user
-Permission122=Create/modify third parties linked to user
-Permission125=Delete third parties linked to user
-Permission126=Export third parties
-Permission141=Read all projects and tasks (also private projects i am not contact for)
-Permission142=Create/modify all projects and tasks (also private projects i am not 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
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
-Permission167=Export contracts
-Permission171=Read trips and expenses (yours and your subordinates)
-Permission172=Create/modify trips and expenses
-Permission173=Delete trips and expenses
-Permission174=Read all trips and expenses
-Permission178=Export trips and expenses
-Permission180=Read suppliers
-Permission181=Read supplier orders
-Permission182=Create/modify supplier orders
-Permission183=Validate supplier orders
-Permission184=Approve supplier orders
-Permission185=Order or cancel supplier orders
-Permission186=Receive supplier orders
-Permission187=Close supplier orders
-Permission188=Cancel supplier orders
-Permission192=Create lines
-Permission193=Cancel lines
-Permission194=Read the bandwith lines
-Permission202=Create ADSL connections
-Permission203=Order connections orders
-Permission204=Order connections
-Permission205=Manage connections
-Permission206=Read connections
-Permission211=Read Telephony
-Permission212=Order lines
-Permission213=Activate line
-Permission214=Setup Telephony
-Permission215=Setup providers
-Permission221=Read emailings
-Permission222=Create/modify emailings (topic, recipients...)
-Permission223=Validate emailings (allows sending)
-Permission229=Delete emailings
-Permission237=View recipients and info
-Permission238=Manually send mailings
-Permission239=Delete mailings after validation or sent
-Permission241=Read categories
-Permission242=Create/modify categories
-Permission243=Delete categories
-Permission244=See the contents of the hidden categories
-Permission251=Read other users and groups
-PermissionAdvanced251=Read other users
-Permission252=Read permissions of other users
-Permission253=Create/modify other users, groups and permisssions
-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 assignement matters).
-Permission271=Read CA
-Permission272=Read invoices
-Permission273=Issue invoices
-Permission281=Read contacts
-Permission282=Create/modify contacts
-Permission283=Delete contacts
-Permission286=Export contacts
-Permission291=Read tariffs
-Permission292=Set permissions on the tariffs
-Permission293=Modify costumers tariffs
 Permission300=Read barcodes
 Permission301=Create/modify barcodes
 Permission302=Delete barcodes
-Permission311=Read services
-Permission312=Assign service/subscription to contract
-Permission331=Read bookmarks
-Permission332=Create/modify bookmarks
-Permission333=Delete bookmarks
-Permission341=Read its own permissions
-Permission342=Create/modify his own user information
-Permission343=Modify his own password
-Permission344=Modify its own permissions
-Permission351=Read groups
-Permission352=Read groups permissions
-Permission353=Create/modify groups
-Permission354=Delete or disable groups
-Permission358=Export users
-Permission401=Read discounts
-Permission402=Create/modify discounts
-Permission403=Validate discounts
-Permission404=Delete discounts
-Permission510=Read Salaries
-Permission512=Create/modify salaries
-Permission514=Delete salaries
-Permission517=Export salaries
-Permission520=Read Loans
-Permission522=Create/modify loans
-Permission524=Delete loans
-Permission525=Access loan calculator
-Permission527=Export loans
-Permission531=Read services
-Permission532=Create/modify services
-Permission534=Delete services
-Permission536=See/manage hidden services
-Permission538=Export services
-Permission701=Read donations
-Permission702=Create/modify donations
-Permission703=Delete donations
-Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
-Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
-Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission779=Export expense reports
-Permission1001=Read stocks
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
-Permission1004=Read stock movements
-Permission1005=Create/modify stock movements
-Permission1101=Read delivery orders
-Permission1102=Create/modify delivery orders
-Permission1104=Validate delivery orders
-Permission1109=Delete delivery orders
-Permission1181=Read suppliers
-Permission1182=Read supplier orders
-Permission1183=Create/modify supplier orders
-Permission1184=Validate supplier orders
-Permission1185=Approve supplier orders
-Permission1186=Order supplier orders
-Permission1187=Acknowledge receipt of supplier orders
-Permission1188=Delete supplier orders
-Permission1190=Approve (second approval) supplier orders
-Permission1201=Get result of an export
-Permission1202=Create/Modify an export
-Permission1231=Read supplier invoices
-Permission1232=Create/modify supplier invoices
-Permission1233=Validate supplier invoices
-Permission1234=Delete supplier invoices
-Permission1235=Send supplier invoices by email
-Permission1236=Export supplier invoices, attributes and payments
-Permission1237=Export supplier orders and their details
-Permission1251=Run mass imports of external data into database (data load)
-Permission1321=Export customer invoices, attributes and payments
-Permission1322=Reopen a paid bill
-Permission1421=Export customer orders and attributes
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
-Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
-Permission20006=Admin leave requests (setup and update balance)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
-Permission2401=Read actions (events or tasks) linked to his account
-Permission2402=Create/modify actions (events or tasks) linked to his account
-Permission2403=Delete actions (events or tasks) linked to his account
-Permission2411=Read actions (events or tasks) of others
-Permission2412=Create/modify actions (events or tasks) of others
-Permission2413=Delete actions (events or tasks) of others
-Permission2414=Export actions/tasks of others
-Permission2501=Read/Download documents
-Permission2502=Download documents
-Permission2503=Submit or delete documents
-Permission2515=Setup documents directories
-Permission2801=Use FTP client in read mode (browse and download only)
-Permission2802=Use FTP client in write mode (delete or upload files)
-Permission50101=Use Point of sales
-Permission50201=Read transactions
-Permission50202=Import transactions
-Permission54001=Print
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
-Permission59003=Read every user margin
-Permission63001=Read resources
-Permission63002=Create/modify resources
-Permission63003=Delete resources
-Permission63004=Link resources to agenda events
-DictionaryCompanyType=Types of thirdparties
-DictionaryCompanyJuridicalType=Legal forms of thirdparties
-DictionaryProspectLevel=Prospect potential level
-DictionaryCanton=State/Province
-DictionaryRegion=Regions
-DictionaryCountry=Countries
-DictionaryCurrency=Currencies
-DictionaryCivility=Personal and professional titles
-DictionaryActions=Types of agenda events
-DictionarySocialContributions=Social or fiscal taxes types
-DictionaryVAT=VAT Rates or Sales Tax Rates
-DictionaryRevenueStamp=Amount of revenue stamps
-DictionaryPaymentConditions=Payment terms
-DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact/Address types
-DictionaryEcotaxe=Ecotax (WEEE)
-DictionaryPaperFormat=Paper formats
-DictionaryFormatCards=Cards formats
-DictionaryFees=Types of fees
-DictionarySendingMethods=Shipping methods
-DictionaryStaff=Staff
-DictionaryAvailability=Delivery delay
-DictionaryOrderMethods=Ordering methods
-DictionarySource=Origin of proposals/orders
-DictionaryAccountancyCategory=Accounting account groups
-DictionaryAccountancysystem=Models for chart of accounts
-DictionaryEMailTemplates=Emails templates
-DictionaryUnits=Units
-DictionaryProspectStatus=Prospection status
-DictionaryHolidayTypes=Types of leaves
-DictionaryOpportunityStatus=Opportunity status for project/lead
-SetupSaved=Setup saved
-BackToModuleList=Back to modules list
-BackToDictionaryList=Back to dictionaries list
-VATManagement=VAT Management
-VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
-VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies.
-VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
-##### Local Taxes #####
-LTRate=Rate
-LocalTax1IsNotUsed=Do not use second tax
-LocalTax1IsUsedDesc=Use a second type of tax (other than VAT)
-LocalTax1IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax1Management=Second type of tax
-LocalTax1IsUsedExample=
-LocalTax1IsNotUsedExample=
-LocalTax2IsNotUsed=Do not use third tax
-LocalTax2IsUsedDesc=Use a third type of tax (other than VAT)
-LocalTax2IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax2Management=Third type of tax
-LocalTax2IsUsedExample=
-LocalTax2IsNotUsedExample=
-LocalTax1ManagementES= RE Management
-LocalTax1IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If te buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
-LocalTax1IsNotUsedDescES= By default the proposed RE is 0. End of rule.
-LocalTax1IsUsedExampleES= In Spain they are professionals subject to some specific sections of the Spanish IAE.
-LocalTax1IsNotUsedExampleES= In Spain they are professional and societies and subject to certain sections of the Spanish IAE.
-LocalTax2ManagementES= IRPF Management
-LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
-LocalTax2IsNotUsedDescES= By default the proposed IRPF is 0. End of rule.
-LocalTax2IsUsedExampleES= In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
-LocalTax2IsNotUsedExampleES= In Spain they are bussines not subject to tax system of modules.
-CalcLocaltax=Reports on local taxes
-CalcLocaltax1=Sales - Purchases
-CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2=Purchases
-CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3=Sales
-CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
-LabelUsedByDefault=Label used by default if no translation can be found for code
-LabelOnDocuments=Label on documents
-NbOfDays=Nb of days
-AtEndOfMonth=At end of month
-CurrentNext=Current/Next
-Offset=Offset
-AlwaysActive=Always active
-Upgrade=Upgrade
-MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Deploy/install external module
-WebServer=Web server
-DocumentRootServer=Web server's root directory
-DataRootServer=Data files directory
-IP=IP
-Port=Port
-VirtualServerName=Virtual server name
-OS=OS
-PhpWebLink=Web-Php link
-Browser=Browser
-Server=Server
-Database=Database
-DatabaseServer=Database host
-DatabaseName=Database name
-DatabasePort=Database port
-DatabaseUser=Database user
-DatabasePassword=Database password
-Tables=Tables
-TableName=Table name
-NbOfRecord=Nb of records
-Host=Server
-DriverType=Driver type
-SummarySystem=System information summary
-SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Foundation
-DefaultMenuManager= Standard menu manager
-DefaultMenuSmartphoneManager=Smartphone menu manager
-Skin=Skin theme
-DefaultSkin=Default skin theme
-MaxSizeList=Max length for list
-DefaultMaxSizeList=Default max length for lists
-DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
-MessageOfDay=Message of the day
-MessageLogin=Login page message
-PermanentLeftSearchForm=Permanent search form on left menu
-DefaultLanguage=Default language to use (language code)
-EnableMultilangInterface=Enable multilingual interface
-EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/foundation information
-CompanyIds=Company/foundation identities
-CompanyName=Name
-CompanyAddress=Address
-CompanyZip=Zip
-CompanyTown=Town
-CompanyCountry=Country
-CompanyCurrency=Main currency
-CompanyObject=Object of the company
-Logo=Logo
-DoNotSuggestPaymentMode=Do not suggest
-NoActiveBankAccountDefined=No active bank account defined
-OwnerOfBankAccount=Owner of bank account %s
-BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show link "<strong>%s</strong>"
-Alerts=Alerts
-DelaysOfToleranceBeforeWarning=Tolerance delays before warning
-DelaysOfToleranceDesc=This screen allows you to define the tolerated delays before an alert is reported on screen with picto %s for each late element.
-Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned events (agenda events) not completed yet
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Delay tolerance (in days) before alert on project not closed in time
-Delays_MAIN_DELAY_TASKS_TODO=Delay tolerance (in days) before alert on planned tasks (project tasks) not completed yet
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on orders not processed yet
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on suppliers orders not processed yet
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Delay tolerance (in days) before alert on proposals to close
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Delay tolerance (in days) before alert on proposals not billed
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerance delay (in days) before alert on services to activate
-Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerance delay (in days) before alert on expired services
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerance delay (in days) before alert on unpaid supplier invoices
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerence delay (in days) before alert on unpaid client invoices
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerance delay (in days) before alert on pending bank reconciliation
-Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed membership fee
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
-Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
-SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
-SetupDescription5=Other menu entries manage optional parameters.
-LogEvents=Security audit events
-Audit=Audit
-InfoDolibarr=About Dolibarr
-InfoBrowser=About Browser
-InfoOS=About OS
-InfoWebServer=About Web Server
-InfoDatabase=About Database
-InfoPHP=About PHP
-InfoPerf=About Performances
-BrowserName=Browser name
-BrowserOS=Browser OS
-ListOfSecurityEvents=List of Dolibarr security events
-SecurityEventsPurged=Security events purged
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
-SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
-SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
-DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
-AvailableModules=Available 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.
-TriggersAvailable=Available triggers
-TriggersDesc=Triggers are files that will modify the behaviour of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realised new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
-TriggerDisabledByName=Triggers in this file are disabled by the <b>-NORUN</b> suffix in their name.
-TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module <b>%s</b> is disabled.
-TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules.
-TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
-GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password
-DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">check here</a>.
-MiscellaneousDesc=All other security related parameters are defined here.
-LimitsSetup=Limits/Precision setup
-LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here
-MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices
-MAIN_MAX_DECIMALS_TOT=Max decimals for total prices
-MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add <b>...</b> after this number if you want to see <b>...</b> when number is truncated when shown on screen)
-MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
-UnitPriceOfProduct=Net unit price of a product
-TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
-ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
-NoEventFoundWithCriteria=No security event has been found for such search criterias.
-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.
-BackupDescX=Archived directory should be stored in a secure place.
-BackupDescY=The generated dump file should be stored in a secure place.
-BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one
-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 directoy (<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=Available database backup dump files
-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
-DownloadMoreSkins=More skins to download
-SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence without hole and with no reset
-ShowProfIdInAddress=Show professionnal id with addresses on documents
-ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents
-TranslationUncomplete=Partial translation
-MAIN_DISABLE_METEO=Disable meteo view
-TestLoginToAPI=Test login to API
-ProxyDesc=Some features of Dolibarr need to have an Internet access to work. Define here parameters for this. If the Dolibarr server is behind a Proxy server, those parameters tells Dolibarr how to access Internet through it.
-ExternalAccess=External access
-MAIN_PROXY_USE=Use a proxy server (otherwise direct access to internet)
-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 all attributes, not already available by default, and that you want to be supported for %s.
-ExtraFields=Complementary attributes
-ExtraFieldsLines=Complementary attributes (lines)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
-ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact/address)
-ExtraFieldsMember=Complementary attributes (member)
-ExtraFieldsMemberType=Complementary attributes (member type)
-ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
-ExtraFieldsSupplierOrders=Complementary attributes (orders)
-ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
-ExtraFieldsProject=Complementary attributes (projects)
-ExtraFieldsProjectTask=Complementary attributes (tasks)
-ExtraFieldHasWrongValue=Attribute %s has a wrong value.
-AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
-SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
-PathToDocuments=Path to documents
-PathDirectory=Directory
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might 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.
-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: <strong>User display setup</strong> tab of 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
-TranslationString=Translation string
-CurrentTranslationString=Current translation string
-WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
-NewTranslationStringToShow=New translation string to show
-OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
-YouMustEnableOneModule=You must at least enable 1 module
-ClassNotFoundIntoPathWarning=Class %s not found into PHP path
-YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
-SuhosinSessionEncrypt=Session storage encrypted by Suhosin
-ConditionIsCurrently=Condition is currently %s
-YouUseBestDriver=You use driver %s that is best driver available currently.
-YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required 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.
-BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance.
-BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
-AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp".
-AskForPreferredShippingMethod=Ask for preferred Sending Method for Third Parties.
-FieldEdition=Edition of field %s
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
-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.
-PasswordGenerationPerso=Return a password according to your personally defined configuration.
-SetupPerso=According to your configuration
-PasswordPatternDesc=Password pattern description
-##### Users setup #####
-RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passwords
-DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page
-UsersSetup=Users module setup
-UserMailRequired=EMail required to create a new user
-##### HRM setup #####
-HRMSetup=HRM module setup
-##### Company setup #####
-CompanySetup=Companies module setup
-CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier)
-AccountCodeManager=Module for accountancy code generation (customer or supplier)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
-NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
-NotificationsDescGlobal=* or by setting global target emails in module setup page.
-ModelModules=Documents templates
-DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
-WatermarkOnDraft=Watermark on draft document
-JSOnPaimentBill=Activate feature to autofill payment lines on payment form
-CompanyIdProfChecker=Rules on Professional Ids
-MustBeUnique=Must be unique?
-MustBeMandatory=Mandatory to create third parties?
-MustBeInvoiceMandatory=Mandatory to validate invoices?
-##### Webcal setup #####
-WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
-##### Invoices #####
-BillsSetup=Invoices module setup
-BillsNumberingModule=Invoices and credit notes numbering model
-BillsPDFModules=Invoice documents models
-CreditNote=Credit note
-CreditNotes=Credit notes
-ForceInvoiceDate=Force invoice date to validation date
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
-SuggestPaymentByRIBOnAccount=Suggest payment by withdraw on account
-SuggestPaymentByChequeToAddress=Suggest payment by cheque to
-FreeLegalTextOnInvoices=Free text on invoices
-WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
-PaymentsNumberingModule=Payments numbering model
-SuppliersPayment=Suppliers payments
-SupplierPaymentSetup=Suppliers payments setup
-##### Proposals #####
-PropalSetup=Commercial proposals module setup
-ProposalsNumberingModules=Commercial proposal numbering models
-ProposalsPDFModules=Commercial proposal documents models
-FreeLegalTextOnProposal=Free text on commercial proposals
-WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
-WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
-##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
-##### Orders #####
-OrdersSetup=Order management setup
-OrdersNumberingModules=Orders numbering models
-OrdersModelModule=Order documents models
-FreeLegalTextOnOrders=Free text on orders
-WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
-ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Interventions #####
-InterventionsSetup=Interventions module setup
-FreeLegalTextOnInterventions=Free text on intervention documents
-FicheinterNumberingModules=Intervention numbering models
-TemplatePDFInterventions=Intervention card documents models
-WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
-##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
-ContractsNumberingModules=Contracts numbering modules
-TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
-##### Members #####
-MembersSetup=Members module setup
-MemberMainOptions=Main options
-AdherentLoginRequired= Manage a Login for each member
-AdherentMailRequired=EMail required to create a new member
-MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
-##### LDAP setup #####
-LDAPSetup=LDAP Setup
-LDAPGlobalParameters=Global parameters
-LDAPUsersSynchro=Users
-LDAPGroupsSynchro=Groups
-LDAPContactsSynchro=Contacts
-LDAPMembersSynchro=Members
-LDAPSynchronization=LDAP synchronisation
-LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP
-LDAPToDolibarr=LDAP -> Dolibarr
-DolibarrToLDAP=Dolibarr -> LDAP
-LDAPNamingAttribute=Key in LDAP
-LDAPSynchronizeUsers=Organization of users in LDAP
-LDAPSynchronizeGroups=Organization of groups in LDAP
-LDAPSynchronizeContacts=Organization of contacts in LDAP
-LDAPSynchronizeMembers=Organization of foundation's members in LDAP
-LDAPPrimaryServer=Primary server
-LDAPSecondaryServer=Secondary server
-LDAPServerPort=Server port
-LDAPServerPortExample=Default port : 389
-LDAPServerProtocolVersion=Protocol version
-LDAPServerUseTLS=Use TLS
-LDAPServerUseTLSExample=Your LDAP server use TLS
-LDAPServerDn=Server DN
-LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
-LDAPPassword=Administrator password
-LDAPUserDn=Users' DN
-LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
-LDAPGroupDn=Groups' DN
-LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com)
-LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
-LDAPServerDnExample=Complete DN (ex: dc=example,dc=com)
-LDAPDnSynchroActive=Users and groups synchronization
-LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization
-LDAPDnContactActive=Contacts' synchronization
-LDAPDnContactActiveExample=Activated/Unactivated synchronization
-LDAPDnMemberActive=Members' synchronization
-LDAPDnMemberActiveExample=Activated/Unactivated synchronization
-LDAPContactDn=Dolibarr contacts' DN
-LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com)
-LDAPMemberDn=Dolibarr members DN
-LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com)
-LDAPMemberObjectClassList=List of objectClass
-LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPUserObjectClassList=List of objectClass
-LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPGroupObjectClassList=List of objectClass
-LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
-LDAPContactObjectClassList=List of objectClass
-LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPTestConnect=Test LDAP connection
-LDAPTestSynchroContact=Test contacts synchronization
-LDAPTestSynchroUser=Test user synchronization
-LDAPTestSynchroGroup=Test group synchronization
-LDAPTestSynchroMember=Test member synchronization
-LDAPTestSearch= Test a LDAP search
-LDAPSynchroOK=Synchronization test successful
-LDAPSynchroKO=Failed synchronization test
-LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that connexion to server is correctly configured and allows LDAP udpates
-LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s)
-LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s)
-LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPBindKO=Connect/Authentificate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPSetupForVersion3=LDAP server configured for version 3
-LDAPSetupForVersion2=LDAP server configured for version 2
-LDAPDolibarrMapping=Dolibarr Mapping
-LDAPLdapMapping=LDAP Mapping
-LDAPFieldLoginUnix=Login (unix)
-LDAPFieldLoginExample=Example : uid
-LDAPFilterConnection=Search filter
-LDAPFilterConnectionExample=Example : &(objectClass=inetOrgPerson)
-LDAPFieldLoginSamba=Login (samba, activedirectory)
-LDAPFieldLoginSambaExample=Example : samaccountname
-LDAPFieldFullname=Full name
-LDAPFieldFullnameExample=Example : cn
-LDAPFieldPasswordNotCrypted=Password not crypted
-LDAPFieldPasswordCrypted=Password crypted
-LDAPFieldPasswordExample=Example : userPassword
-LDAPFieldCommonNameExample=Example : cn
-LDAPFieldName=Name
-LDAPFieldNameExample=Example : sn
-LDAPFieldFirstName=First name
-LDAPFieldFirstNameExample=Example : givenName
-LDAPFieldMail=Email address
-LDAPFieldMailExample=Example : mail
-LDAPFieldPhone=Professional phone number
-LDAPFieldPhoneExample=Example : telephonenumber
-LDAPFieldHomePhone=Personal phone number
-LDAPFieldHomePhoneExample=Example : homephone
-LDAPFieldMobile=Cellular phone
-LDAPFieldMobileExample=Example : mobile
-LDAPFieldFax=Fax number
-LDAPFieldFaxExample=Example : facsimiletelephonenumber
-LDAPFieldAddress=Street
-LDAPFieldAddressExample=Example : street
-LDAPFieldZip=Zip
-LDAPFieldZipExample=Example : postalcode
-LDAPFieldTown=Town
-LDAPFieldTownExample=Example : l
-LDAPFieldCountry=Country
-LDAPFieldDescription=Description
-LDAPFieldDescriptionExample=Example : description
-LDAPFieldNotePublic=Public Note
-LDAPFieldNotePublicExample=Example : publicnote
-LDAPFieldGroupMembers= Group members
-LDAPFieldGroupMembersExample= Example : uniqueMember
-LDAPFieldBirthdate=Birthdate
-LDAPFieldCompany=Company
-LDAPFieldCompanyExample=Example : o
-LDAPFieldSid=SID
-LDAPFieldSidExample=Example : objectsid
-LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Job position
-LDAPFieldTitleExample=Example: title
-LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
-LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
-LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts.
-LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users.
-LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups.
-LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module.
-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 advices related to performance.
-NotInstalled=Not installed, so your server is not slow 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.
-MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
-MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
-OPCodeCache=OPCode cache
-NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad).
-HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
-FilesOfTypeCached=Files of type %s are cached by HTTP server
-FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
-FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
-FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
-CacheByServer=Cache by server
-CacheByClient=Cache by browser
-CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
-##### Products #####
-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)
-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 third party language
-UseSearchToSelectProductTooltip=Also if you have a large number of product (> 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)
-SetDefaultBarcodeTypeProducts=Default barcode type to use for products
-SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
-ProductCodeChecker= Module for product code generation and checking (product or service)
-ProductOtherConf= Product / Service configuration
-IsNotADir=is not a directory!
-##### Syslog #####
-SyslogSetup=Logs module setup
-SyslogOutput=Logs outputs
-SyslogFacility=Facility
-SyslogLevel=Level
-SyslogFilename=File name and path
-YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
-ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
-##### Donations #####
-DonationsSetup=Donation module setup
-DonationsReceiptModel=Template of donation receipt
-##### Barcode #####
-BarcodeSetup=Barcode setup
-PaperFormatModule=Print format module
-BarcodeEncodeModule=Barcode encoding type
-CodeBarGenerator=Barcode generator
-ChooseABarCode=No generator defined
-FormatNotSupportedByGenerator=Format not supported by this generator
-BarcodeDescEAN8=Barcode of type EAN8
-BarcodeDescEAN13=Barcode of type EAN13
-BarcodeDescUPC=Barcode of type UPC
-BarcodeDescISBN=Barcode of type ISBN
-BarcodeDescC39=Barcode of type C39
-BarcodeDescC128=Barcode of type C128
-BarcodeDescDATAMATRIX=Barcode of type Datamatrix
-BarcodeDescQRCODE=Barcode of type QR code
 GenbarcodeLocation=Barcode generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
-BarcodeInternalEngine=Internal engine
-BarCodeNumberManager=Manager to auto define barcode numbers
-##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct debit payment orders
-##### ExternalRSS #####
-ExternalRSSSetup=External RSS imports setup
-NewRSS=New RSS Feed
-RSSUrl=RSS URL
-RSSUrlExample=An interesting RSS feed
-##### Mailing #####
-MailingSetup=EMailing module setup
-MailingEMailFrom=Sender EMail (From) for emails sent by emailing module
-MailingEMailError=Return EMail (Errors-to) for emails with errors
-MailingDelay=Seconds to wait after sending next message
-##### Notification #####
-NotificationSetup=EMail notification module setup
-NotificationEMailFrom=Sender EMail (From) for emails sent for notifications
-FixedEmailTarget=Fixed email target
-##### Sendings #####
-SendingsSetup=Sending module setup
-SendingsReceiptModel=Sending receipt model
-SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
-FreeLegalTextOnShippings=Free text on shipments
-##### Deliveries #####
-DeliveryOrderNumberingModules=Products deliveries receipt numbering module
-DeliveryOrderModel=Products deliveries receipt model
-DeliveriesOrderAbility=Support products deliveries receipts
-FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
-##### FCKeditor #####
-AdvancedEditor=Advanced editor
-ActivateFCKeditor=Activate advanced editor for:
-FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
-FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files.</font>
-FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
-FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
-##### OSCommerce 1 #####
-OSCommerceErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be an OSCommerce database (Key %s not found in table %s).
-OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' successfull.
-OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
-OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
-##### Stock #####
-StockSetup=Warehouse module setup
-IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
-##### Menu #####
-MenuDeleted=Menu deleted
-Menus=Menus
-TreeMenuPersonalized=Personalized menus
-NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
-NewMenu=New menu
-Menu=Selection of menu
-MenuHandler=Menu handler
-MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
-DetailId=Id menu
-DetailMenuHandler=Menu handler where to show new menu
-DetailMenuModule=Module name if menu entry come from a module
-DetailType=Type of menu (top or left)
-DetailTitre=Menu label or label code for translation
-DetailUrl=URL where menu send you (Absolute URL link or external link with http://)
-DetailEnabled=Condition to show or not entry
-DetailRight=Condition to display unauthorized grey menus
-DetailLangs=Lang file name for label code translation
-DetailUser=Intern / Extern / All
-Target=Target
-DetailTarget=Target for links (_blank top open a new window)
-DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu)
-ModifMenu=Menu change
-DeleteMenu=Delete menu entry
-ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
-FailedToInitializeMenu=Failed to initialize menu
-##### Tax #####
-TaxSetup=Taxes, social or fiscal taxes and dividends module setup
-OptionVatMode=VAT due
-OptionVATDefault=Cash basis
-OptionVATDebitOption=Accrual basis
-OptionVatDefaultDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on payments for services
-OptionVatDebitOptionDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on invoice (debit) for services
-SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
-OnDelivery=On delivery
-OnPayment=On payment
-OnInvoice=On invoice
-SupposedToBePaymentDate=Payment date used
-SupposedToBeInvoiceDate=Invoice date used
-Buy=Buy
-Sell=Sell
-InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
-AccountancyCode=Accountancy Code
-AccountancyCodeSell=Sale 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 -> Dictionary -> 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_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
-AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### 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 your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your 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.
-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 same computer than 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.
-##### Point Of Sales (CashDesk) #####
-CashDesk=Point of sales
-CashDeskSetup=Point of sales module setup
-CashDeskThirdPartyForSell=Default generic third party to use for sells
-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).
-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
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
-##### Bookmark #####
-BookmarkSetup=Bookmark module setup
-BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu.
-NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu
-##### WebServices #####
-WebServicesSetup=Webservices module setup
-WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
-WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
-EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
-##### API ####
-ApiSetup=API module setup
-ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
-OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
-ApiKey=Key for API
-WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
-##### Bank #####
-BankSetupModule=Bank module setup
-FreeLegalTextOnChequeReceipts=Free text on cheque receipts
-BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
-BankOrderGlobal=General
-BankOrderGlobalDesc=General display order
-BankOrderES=Spanish
-BankOrderESDesc=Spanish display order
-ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
-##### Multicompany #####
-MultiCompanySetup=Multi-company module setup
-##### Suppliers #####
-SuppliersSetup=Supplier module setup
-SuppliersCommandModel=Complete template of supplier order (logo...)
-SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
-SuppliersInvoiceNumberingModel=Supplier invoices numbering models
-IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
-##### GeoIPMaxmind #####
-GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
-NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
-YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
-YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
-TestGeoIPResult=Test of a conversion IP -> country
-##### Projects #####
-ProjectsNumberingModules=Projects numbering module
-ProjectsSetup=Project module setup
-ProjectsModelModule=Project reports document model
-TasksNumberingModules=Tasks numbering module
-TaskModelModule=Tasks reports document model
-UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
-##### ECM (GED) #####
-##### Fiscal Year #####
-AccountingPeriods=Accounting periods
-AccountingPeriodCard=Accounting period
-NewFiscalYear=New accounting period
-OpenFiscalYear=Open accounting period
-CloseFiscalYear=Close accounting period
-DeleteFiscalYear=Delete accounting period
-ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
-ShowFiscalYear=Show accounting period
-AlwaysEditable=Can always be edited
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
-Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
-IncludePath=Include path (defined into variable %s)
-ExpenseReportsSetup=Setup of module Expense Reports
-TemplatePDFExpenseReports=Document templates to generate expense report document
-NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
-YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of 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
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/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.
-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.
-ConfFileMuseContainCustom=Installing 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)
-TextTitleColor=Color of page title
-LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
-NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
-BackgroundColor=Background color
-TopMenuBackgroundColor=Background color for Top menu
-TopMenuDisableImages=Hide images in Top menu
-LeftMenuBackgroundColor=Background color for Left menu
-BackgroundTableTitleColor=Background color for Table title line
-BackgroundTableLineOddColor=Background color for odd table lines
-BackgroundTableLineEvenColor=Background color for even table lines
-MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
-NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
-UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
-PositionIntoComboList=Position of line into combo lists
-SellTaxRate=Sale tax rate
-RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
-UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipping, you can enter it here. You can use the key {TRACKID} into URL parameters so the system will replace it with value of tracking number user entered into shipment card.
-OpportunityPercent=When you create an opportunity, you will defined an estimated amount of project/lead. According to status of opportunity, this amount may be multiplicated 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
-FixTZ=TimeZone fix
-FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
-ExpectedChecksum=Expected Checksum
-CurrentChecksum=Current Checksum
-ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the latest stable version
-TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
-TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so 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 usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
-ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to automatically generate codes, you must first set a rule to define the barcode number.
-SeeSubstitutionVars=See * note for list of possible substitution variables
-AllPublishers=All publishers
-UnknownPublishers=Unknown publishers
-AddRemoveTabs=Add or remove tabs
-AddDictionaries=Add dictionaries
-AddBoxes=Add widgets
-AddSheduledJobs=Add scheduled jobs
-AddHooks=Add hooks
-AddTriggers=Add triggers
-AddMenus=Add menus
-AddPermissions=Add permissions
-AddExportProfiles=Add export profiles
-AddImportProfiles=Add import profiles
-AddOtherPagesOrServices=Add other pages or services
-AddModels=Add document or numbering templates
-AddSubstitutions=Add keys substitutions
-DetectionNotPossible=Detection not possible
-UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved on 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 correclty. 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 inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <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
-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
-TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
-##### Resource ####
-ResourceSetup=Configuration du module Resource
-UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
diff --git a/htdocs/langs/en_GB/bills.lang b/htdocs/langs/en_GB/bills.lang
index 8ab8c428de3..60b6f51bc40 100644
--- a/htdocs/langs/en_GB/bills.lang
+++ b/htdocs/langs/en_GB/bills.lang
@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - bills
 InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and replace completely an invoice with no payment already received.<br><br>Note: Only an invoice with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 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.
 ErrorVATIntraNotConfigured=Intracommunitary VAT number not yet defined
 EscompteOffered=Dscnt.offered (pay.befor.term)
 PaymentTypeCHQ=Cheque
@@ -22,4 +21,3 @@ ChequesArea=Cheque deposits area
 ChequeDeposits=Cheque deposits
 Cheques=Cheques
 NbCheque=Number of cheques
-CreditNoteConvertedIntoDiscount=This %s has been converted into %s
diff --git a/htdocs/langs/en_GB/cashdesk.lang b/htdocs/langs/en_GB/cashdesk.lang
deleted file mode 100644
index c3ca13bf385..00000000000
--- a/htdocs/langs/en_GB/cashdesk.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cashdesk
-BankToPay=Account for payment
diff --git a/htdocs/langs/en_GB/main.lang b/htdocs/langs/en_GB/main.lang
index a5eed9164fa..f152c0ce69d 100644
--- a/htdocs/langs/en_GB/main.lang
+++ b/htdocs/langs/en_GB/main.lang
@@ -1,9 +1,5 @@
 # Dolibarr language file - Source file is en_US - main
 DIRECTION=ltr
-# Note for Chinese:
-# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
-# stsongstdlight or cid0cs are for simplified Chinese
-# To read Chinese pdf with Linux: sudo apt-get install poppler-data
 FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=.
@@ -23,799 +19,33 @@ FormatDateHourShort=%d/%m/%Y %H:%M
 FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
-DatabaseConnection=Database connection
-NoTemplateDefined=No template defined for this email type
-AvailableVariables=Available substitution variables
-NoTranslation=No translation
-NoRecordFound=No record found
-NoRecordDeleted=No record deleted
-NotEnoughDataYet=Not enough data
-NoError=No error
-Error=Error
-Errors=Errors
-ErrorFieldRequired=Field '%s' is required
-ErrorFieldFormat=Field '%s' has a bad value
-ErrorFileDoesNotExists=File %s does not exist
-ErrorFailedToOpenFile=Failed to open file %s
-ErrorCanNotCreateDir=Cannot create dir %s
-ErrorCanNotReadDir=Cannot read dir %s
-ErrorConstantNotDefined=Parameter %s not defined
-ErrorUnknown=Unknown error
-ErrorSQL=SQL Error
-ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this
-ErrorGoToModuleSetup=Go to Module setup to fix this
-ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
-ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
-ErrorInternalErrorDetected=Error detected
-ErrorWrongHostParameter=Wrong host parameter
 ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and modify the form.
 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.
-ErrorDuplicateField=Duplicate value in a unique field
 ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. Changes have been rolled back.
 ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined in 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 nb of record per page
 NotAuthorized=You are not authorised to do that.
-SetDate=Set date
-SelectDate=Select a date
-SeeAlso=See also %s
-SeeHere=See here
-Apply=Apply
 BackgroundColorByDefault=Default background colour
-FileRenamed=The file was successfully renamed
-FileUploaded=The file was successfully uploaded
-FileGenerated=The file was successfully generated
 FileWasNotUploaded=A file is selected for attachment but has not yet been uploaded. Click on "Attach file" for this.
 NbOfEntries=Number of entries
-GoToWikiHelpPage=Read online help (Internet access needed)
-GoToHelpPage=Read help
-RecordSaved=Record saved
-RecordDeleted=Record deleted
-LevelOfFeature=Level of features
-NotDefined=Not defined
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
-Administrator=Administrator
-Undefined=Undefined
-PasswordForgotten=Password forgotten?
-SeeAbove=See above
-HomeArea=Home area
-LastConnexion=Latest connection
-PreviousConnexion=Previous connection
-PreviousValue=Previous value
-ConnectedOnMultiCompany=Connected on environment
-ConnectedSince=Connected since
-AuthenticationMode=Authentication mode
-RequestedUrl=Requested URL
-DatabaseTypeManager=Database type manager
-RequestLastAccessInError=Latest database access request error
-ReturnCodeLastAccessInError=Return code for latest database access request error
-InformationLastAccessInError=Information for latest database access request error
-DolibarrHasDetectedError=Dolibarr has detected a technical error
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes
-MoreInformation=More information
-TechnicalInformation=Technical information
-TechnicalID=Technical ID
-NotePublic=Note (public)
-NotePrivate=Note (private)
 PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimal places.
-DoTest=Test
-ToFilter=Filter
-NoFilter=No filter
-WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance delay.
-yes=yes
-Yes=Yes
-no=no
-No=No
-All=All
-Home=Home
-Help=Help
-OnlineHelp=Online help
-PageWiki=Wiki page
-MediaBrowser=Media browser
-Always=Always
-Never=Never
-Under=under
-Period=Period
-PeriodEndDate=End date for period
-Activate=Activate
-Activated=Activated
-Closed=Closed
-Closed2=Closed
-NotClosed=Not closed
-Enabled=Enabled
-Deprecated=Deprecated
-Disable=Disable
-Disabled=Disabled
-Add=Add
-AddLink=Add link
-RemoveLink=Remove link
-AddToDraft=Add to draft
-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>?
-Delete=Delete
-Remove=Remove
 Resiliate=Deactivate
-Cancel=Cancel
-Modify=Modify
-Edit=Edit
-Validate=Validate
-ValidateAndApprove=Validate and Approve
-ToValidate=To validate
-Save=Save
 SaveAs=Save as
-TestConnection=Test connection
-ToClone=Clone
-ConfirmClone=Choose data you want to clone :
-NoCloneOptionsSpecified=No data to clone defined.
-Of=of
-Go=Go
-Run=Run
-CopyOf=Copy of
-Show=Show
-Hide=Hide
-ShowCardHere=Show card
-Search=Search
-SearchOf=Search
-Valid=Valid
-Approve=Approve
 Disapprove=Reject
-ReOpen=Re-Open
-Upload=Send file
-ToLink=Link
-Select=Select
-Choose=Choose
-Resize=Resize
 Recenter=Recentre
-Author=Author
-User=User
-Users=Users
-Group=Group
-Groups=Groups
-NoUserGroupDefined=No user group defined
-Password=Password
-PasswordRetype=Retype your password
-NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
-Name=Name
-Person=Person
-Parameter=Parameter
-Parameters=Parameters
-Value=Value
-PersonalValue=Personal value
-NewValue=New value
-CurrentValue=Current value
-Code=Code
-Type=Type
-Language=Language
-MultiLanguage=Multi-language
-Note=Note
-Title=Title
-Label=Label
-RefOrLabel=Ref. or label
-Info=Log
-Family=Family
-Description=Description
-Designation=Description
-Model=Doc template
-DefaultModel=Default doc template
-Action=Event
-About=About
-Number=Number
-NumberByMonth=Number by month
-AmountByMonth=Amount by month
-Numero=Number
-Limit=Limit
-Limits=Limits
-Logout=Logout
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Connection
-Setup=Setup
-Alert=Alert
-Previous=Previous
-Next=Next
-Cards=Cards
-Card=Card
-Now=Now
-HourStart=Start hour
-Date=Date
-DateAndHour=Date and hour
-DateToday=Today's date
-DateReference=Reference date
-DateStart=Start date
-DateEnd=End date
-DateCreation=Creation date
-DateCreationShort=Creat. date
-DateModification=Modification date
-DateModificationShort=Modif. date
-DateLastModification=Latest modification date
-DateValidation=Validation date
-DateClosing=Closing date
-DateDue=Due date
-DateValue=Value date
-DateValueShort=Value date
-DateOperation=Operation date
-DateOperationShort=Oper. Date
-DateLimit=Limit date
-DateRequest=Request date
-DateProcess=Process date
-DateBuild=Report build date
-DatePayment=Date of payment
-DateApprove=Approving date
-DateApprove2=Approving date (second approval)
-UserCreation=Creation user
-UserModification=Modification user
-UserCreationShort=Creat. user
-UserModificationShort=Modif. user
-DurationYear=year
-DurationMonth=month
-DurationWeek=week
-DurationDay=day
-DurationYears=years
-DurationMonths=months
-DurationWeeks=weeks
-DurationDays=days
-Year=Year
-Month=Month
-Week=Week
-WeekShort=Week
-Day=Day
-Hour=Hour
-Minute=Minute
-Second=Second
-Years=Years
-Months=Months
-Days=Days
-days=days
-Hours=Hours
-Minutes=Minutes
-Seconds=Seconds
-Weeks=Weeks
-Today=Today
-Yesterday=Yesterday
-Tomorrow=Tomorrow
-Morning=Morning
-Afternoon=Afternoon
-Quadri=Quadri
-MonthOfDay=Month of the day
-HourShort=H
-MinuteShort=mn
-Rate=Rate
-CurrencyRate=Currency conversion rate
-UseLocalTax=Include tax
-Bytes=Bytes
-KiloBytes=Kilobytes
-MegaBytes=Megabytes
-GigaBytes=Gigabytes
-TeraBytes=Terabytes
 b=b
-Kb=Kb
-Mb=Mb
-Gb=Gb
-Tb=Tb
-Cut=Cut
-Copy=Copy
-Paste=Paste
-Default=Default
-DefaultValue=Default value
-Price=Price
-UnitPrice=Unit price
-UnitPriceHT=Unit price (net)
-UnitPriceTTC=Unit price
-PriceU=U.P.
-PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (currency)
-PriceUTTC=U.P. (inc. tax)
-Amount=Amount
-AmountInvoice=Invoice amount
-AmountPayment=Payment amount
-AmountHTShort=Amount (net)
-AmountTTCShort=Amount (inc. tax)
-AmountHT=Amount (net of tax)
-AmountTTC=Amount (inc. tax)
 AmountVAT=Amount VAT
-MulticurrencyAlreadyPaid=Already payed, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
-MulticurrencyAmountHT=Amount (net of tax), original currency
-MulticurrencyAmountTTC=Amount (inc. of tax), original currency
-MulticurrencyAmountVAT=Amount tax, original currency
-AmountLT1=Amount tax 2
-AmountLT2=Amount tax 3
-AmountLT1ES=Amount RE
-AmountLT2ES=Amount IRPF
-AmountTotal=Total amount
-AmountAverage=Average amount
-PriceQtyMinHT=Price quantity min. (net of tax)
-Percentage=Percentage
-Total=Total
-SubTotal=Subtotal
-TotalHTShort=Total (net)
-TotalHTShortCurrency=Total (net in currency)
-TotalTTCShort=Total (inc. tax)
-TotalHT=Total (net of tax)
-TotalHTforthispage=Total (net of tax) for this page
-Totalforthispage=Total for this page
-TotalTTC=Total (inc. tax)
-TotalTTCToYourCredit=Total (inc. tax) to your credit
 TotalVAT=Total VAT
-TotalLT1=Total tax 2
-TotalLT2=Total tax 3
-TotalLT1ES=Total RE
-TotalLT2ES=Total IRPF
-HT=Net of tax
 TTC=Inc. VAT
 VAT=VAT
-VATs=Sales taxes
-LT1ES=RE
-LT2ES=IRPF
 VATRate=VAT Rate
-Average=Average
-Sum=Sum
-Delta=Delta
-Module=Module
-Option=Option
-List=List
-FullList=Full list
-Statistics=Statistics
-OtherStatistics=Other statistics
-Status=Status
 Favorite=Favourite
-ShortInfo=Info.
-Ref=Ref.
-ExternalRef=Ref. extern
-RefSupplier=Ref. supplier
-RefPayment=Ref. payment
-CommercialProposalsShort=Commercial proposals
-Comment=Comment
-Comments=Comments
-ActionsToDo=Events to do
-ActionsToDoShort=To do
-ActionsDoneShort=Done
-ActionNotApplicable=Not applicable
-ActionRunningNotStarted=To start
-ActionRunningShort=In progress
-ActionDoneShort=Finished
 ActionUncomplete=Incomplete
-CompanyFoundation=Company/Foundation
-ContactsForCompany=Contacts 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
-NActionsLate=%s late
-RequestAlreadyDone=Request already recorded
-Filter=Filter
-FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
-RemoveFilter=Remove filter
-ChartGenerated=Chart generated
-ChartNotGenerated=Chart not generated
 GeneratedOn=Built on %s
-Generate=Generate
-Duration=Duration
-TotalDuration=Total duration
-Summary=Summary
-DolibarrStateBoard=Statistics
-DolibarrWorkBoard=Work tasks board
-Available=Available
-NotYetAvailable=Not yet available
-NotAvailable=Not available
-Categories=Tags/categories
-Category=Tag/category
-By=By
-From=From
-to=to
-and=and
-or=or
-Other=Other
-Others=Others
 OtherInformations=Other information
-Quantity=Quantity
-Qty=Qty
-ChangedBy=Changed by
-ApprovedBy=Approved by
-ApprovedBy2=Approved by (second approval)
-Approved=Approved
-Refused=Refused
-ReCalculate=Recalculate
-ResultKo=Failure
-Reporting=Reporting
-Reportings=Reporting
-Draft=Draft
-Drafts=Drafts
-Validated=Validated
-Opened=Opened
-New=New
-Discount=Discount
-Unknown=Unknown
-General=General
-Size=Size
-Received=Received
-Paid=Paid
-Topic=Subject
-ByCompanies=By third parties
-ByUsers=By users
-Links=Links
-Link=Link
-Rejects=Rejects
-Preview=Preview
-NextStep=Next step
-Datas=Data
-None=None
-NoneF=None
-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.
-Photo=Picture
-Photos=Pictures
-AddPhoto=Add picture
-DeletePicture=Picture delete
-ConfirmDeletePicture=Confirm picture deletion?
-Login=Login
-CurrentLogin=Current login
-EnterLoginDetail=Enter login details
-January=January
-February=February
-March=March
-April=April
-May=May
-June=June
-July=July
-August=August
-September=September
-October=October
-November=November
-December=December
-JanuaryMin=Jan
-FebruaryMin=Feb
-MarchMin=Mar
-AprilMin=Apr
-MayMin=May
-JuneMin=Jun
-JulyMin=Jul
-AugustMin=Aug
-SeptemberMin=Sep
-OctoberMin=Oct
-NovemberMin=Nov
-DecemberMin=Dec
-Month01=January
-Month02=February
-Month03=March
-Month04=April
-Month05=May
-Month06=June
-Month07=July
-Month08=August
-Month09=September
-Month10=October
-Month11=November
-Month12=December
-MonthShort01=Jan
-MonthShort02=Feb
-MonthShort03=Mar
-MonthShort04=Apr
-MonthShort05=May
-MonthShort06=Jun
-MonthShort07=Jul
-MonthShort08=Aug
-MonthShort09=Sep
-MonthShort10=Oct
-MonthShort11=Nov
-MonthShort12=Dec
-AttachedFiles=Attached files and documents
-FileTransferComplete=File was uploaded successfuly
-DateFormatYYYYMM=YYYY-MM
-DateFormatYYYYMMDD=YYYY-MM-DD
-DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
-ReportName=Report name
-ReportPeriod=Report period
-ReportDescription=Description
-Report=Report
-Keyword=Keyword
-Origin=Origin
-Legend=Legend
-Fill=Fill
-Reset=Reset
-File=File
-Files=Files
-NotAllowed=Not allowed
-ReadPermissionNotAllowed=Read permission not allowed
-AmountInCurrency=Amount in %s currency
-Example=Example
-Examples=Examples
-NoExample=No example
-FindBug=Report a bug
-NbOfThirdParties=Number of third parties
-NbOfLines=Number of lines
-NbOfObjects=Number of objects
-NbOfObjectReferers=Number of related items
-Referers=Related items
-TotalQuantity=Total quantity
-DateFromTo=From %s to %s
-DateFrom=From %s
-DateUntil=Until %s
 Check=Cheque
-Uncheck=Uncheck
-Internal=Internal
-External=External
-Internals=Internal
-Externals=External
-Warning=Warning
-Warnings=Warnings
-BuildDoc=Build Doc
-Entity=Environment
-Entities=Entities
-CustomerPreview=Customer preview
-SupplierPreview=Supplier preview
-ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show supplier preview
-RefCustomer=Ref. customer
-Currency=Currency
-InfoAdmin=Information for administrators
-Undo=Undo
-Redo=Redo
-ExpandAll=Expand all
-UndoExpandAll=Undo expand
-Reason=Reason
-FeatureNotYetSupported=Feature not yet supported
-CloseWindow=Close window
-Response=Response
-Priority=Priority
-SendByMail=Send by EMail
-MailSentBy=Email sent by
-TextUsedInTheMessageBody=Email body
-SendAcknowledgementByMail=Send confirmation email
-EMail=E-mail
-NoEMail=No email
-Email=Email
-NoMobilePhone=No mobile phone
-Owner=Owner
-FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
-Refresh=Refresh
-BackToList=Back to list
-GoBack=Go back
-CanBeModifiedIfOk=Can be modified if valid
-CanBeModifiedIfKo=Can be modified if not valid
-ValueIsValid=Value is valid
-ValueIsNotValid=Value is not valid
-RecordCreatedSuccessfully=Record created successfully
-RecordModifiedSuccessfully=Record modified successfully
-RecordsModified=%s record modified
-RecordsDeleted=%s record deleted
-AutomaticCode=Automatic code
-FeatureDisabled=Feature disabled
-MoveBox=Move widget
-Offered=Offered
-NotEnoughPermissions=You don't have permission for this action
-SessionName=Session name
-Method=Method
-Receive=Receive
-CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
-ExpectedValue=Expected Value
-CurrentValue=Current value
-PartialWoman=Partial
-TotalWoman=Total
-NeverReceived=Never received
 Canceled=Cancelled
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
 Color=Colour
-Documents=Linked files
-Documents2=Documents
-UploadDisabled=Upload disabled
-MenuECM=Documents
-MenuAWStats=AWStats
-MenuMembers=Members
-MenuAgendaGoogle=Google agenda
-ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=No documents saved in this directory
-CurrentUserLanguage=Current language
-CurrentTheme=Current theme
-CurrentMenuManager=Current menu manager
-Browser=Browser
-Layout=Layout
-Screen=Screen
-DisabledModules=Disabled modules
-For=For
-ForCustomer=For customer
-Signature=Signature
-DateOfSignature=Date of signature
-HidePassword=Show command with password hidden
-UnHidePassword=Show real command with clear password
-Root=Root
 Informations=Information
-Page=Page
-Notes=Notes
-AddNewLine=Add new line
-AddFile=Add file
-FreeZone=Free entry
-FreeLineOfType=Free entry of type
-CloneMainAttributes=Clone object with its main attributes
-PDFMerge=PDF Merge
-Merge=Merge
-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 application at the moment.
-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
-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.
 AccordingToGeoIPDatabase=(according to GeoIP lookup)
-Line=Line
-NotSupported=Not supported
-RequiredField=Required field
-Result=Result
-ToTest=Test
-ValidateBefore=Card must be validated before using this feature
-Visibility=Visibility
-Private=Private
-Hidden=Hidden
-Resources=Resources
-Source=Source
-Prefix=Prefix
-Before=Before
-After=After
-IPAddress=IP address
-Frequency=Frequency
-IM=Instant messaging
-NewAttribute=New attribute
-AttributeCode=Attribute code
-URLPhoto=URL of photo/logo
-SetLinkToAnotherThirdParty=Link to another third party
-LinkTo=Link to
-LinkToProposal=Link to proposal
-LinkToOrder=Link to order
-LinkToInvoice=Link to invoice
-LinkToSupplierOrder=Link to supplier order
-LinkToSupplierProposal=Link to supplier proposal
-LinkToSupplierInvoice=Link to supplier invoice
-LinkToContract=Link to contract
-LinkToIntervention=Link to intervention
-CreateDraft=Create draft
-SetToDraft=Back to draft
-ClickToEdit=Click to edit
-ObjectDeleted=Object %s deleted
-ByCountry=By country
-ByTown=By town
-ByDate=By date
-ByMonthYear=By month/year
-ByYear=By year
-ByMonth=By month
-ByDay=By day
-BySalesRepresentative=By sales representative
-LinkedToSpecificUsers=Linked to a particular user contact
-NoResults=No results
-AdminTools=Admin tools
-SystemTools=System tools
-ModulesSystemTools=Modules tools
-Test=Test
-Element=Element
 NoPhotoYet=No picture available yet
-Dashboard=Dashboard
-MyDashboard=My dashboard
-Deductible=Deductible
-from=from
-toward=toward
-Access=Access
-SelectAction=Select action
-HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
-SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
-OriginFileName=Original filename
-SetDemandReason=Set source
-SetBankAccount=Define Bank Account
-AccountCurrency=Account Currency
-ViewPrivateNote=View notes
-XMoreLines=%s line(s) hidden
-PublicUrl=Public URL
-AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
-PrintFile=Print File %s
-ShowTransaction=Show entry on bank account
-GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
-Deny=Deny
-Denied=Denied
-ListOfTemplates=List of templates
-Gender=Gender
-Genderman=Man
-Genderwoman=Woman
-ViewList=List view
-Mandatory=Mandatory
-Hello=Hello
-Sincerely=Sincerely
-DeleteLine=Delete line
-ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
-NoRecordSelected=No record selected
-MassFilesArea=Area for files built by mass actions
-ShowTempMassFilesArea=Show area of files built by mass actions
-RelatedObjects=Related Objects
-ClassifyBilled=Classify billed
-Progress=Progress
-ClickHere=Click here
-FrontOffice=Front office
-BackOffice=Back office
-View=View
-Export=Export
-Exports=Exports
-ExportFilteredList=Export filtered list
-ExportList=Export list
-Miscellaneous=Miscellaneous
-Calendar=Calendar
-GroupBy=Group by...
-ViewFlatList=View flat list
-RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Direct download link
-Download=Download
-ActualizeCurrency=Update currency rate
-Fiscalyear=Fiscal year
-# Week day
-Monday=Monday
-Tuesday=Tuesday
-Wednesday=Wednesday
-Thursday=Thursday
-Friday=Friday
-Saturday=Saturday
-Sunday=Sunday
-MondayMin=Mo
-TuesdayMin=Tu
-WednesdayMin=We
-ThursdayMin=Th
-FridayMin=Fr
-SaturdayMin=Sa
-SundayMin=Su
-Day1=Monday
-Day2=Tuesday
-Day3=Wednesday
-Day4=Thursday
-Day5=Friday
-Day6=Saturday
-Day0=Sunday
-ShortMonday=M
-ShortTuesday=T
-ShortWednesday=W
-ShortThursday=T
-ShortFriday=F
-ShortSaturday=S
-ShortSunday=S
-SelectMailModel=Select email template
-SetRef=Set ref
-Select2ResultFoundUseArrows=Some results found. Use arrows to select.
-Select2NotFound=No result found
-Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
-Select2LoadingMoreResults=Loading more results...
-Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
-SearchIntoContacts=Contacts
-SearchIntoMembers=Members
-SearchIntoUsers=Users
-SearchIntoProductsOrServices=Products or services
-SearchIntoProjects=Projects
-SearchIntoTasks=Tasks
-SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
-SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
-SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
-SearchIntoInterventions=Interventions
-SearchIntoContracts=Contracts
-SearchIntoCustomerShipments=Customer shipments
-SearchIntoExpenseReports=Expense reports
-SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/en_GB/stocks.lang b/htdocs/langs/en_GB/stocks.lang
index e6f3a394dde..fc1432b5c50 100644
--- a/htdocs/langs/en_GB/stocks.lang
+++ b/htdocs/langs/en_GB/stocks.lang
@@ -13,7 +13,6 @@ VirtualDiffersFromPhysical=According to stock movement options, physical stock (
 RuleForStockReplenishment=Rule for stock replenishment
 SelectProductWithNotNullQty=Select at least one product with a quantity not null and a supplier
 ReplenishmentOrdersDesc=This is a list of all open supplier orders including predefined products. Only open orders with predefined products which may affect stocks, are visible here.
-RecordMovement=Record transfer
 StockMustBeEnoughForInvoice=Stock levels must be sufficient to add product/service to invoice. (Check it is done on current real stock when adding a line into the invoice whatever the rule is for automatic stock change)
 StockMustBeEnoughForShipment=Stock levels must be sufficient to add product/service for shipment. (Check it is done on current real stock when adding a line into Shipment whatever the rule is for automatic stock change)
 IsInPackage=Packaged
diff --git a/htdocs/langs/en_GB/trips.lang b/htdocs/langs/en_GB/trips.lang
index 538728ca85c..4b790783bd6 100644
--- a/htdocs/langs/en_GB/trips.lang
+++ b/htdocs/langs/en_GB/trips.lang
@@ -2,7 +2,6 @@
 TripsAndExpensesStatistics=Expense report statistics
 CompanyVisited=Company visited
 FeesKilometersOrAmout=Amount or Miles
-ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
 TripNDF=Information expense report
 TF_METRO=Tube
 ErrorDoubleDeclaration=You have submitted another expense report in a similar date range.
diff --git a/htdocs/langs/en_IN/accountancy.lang b/htdocs/langs/en_IN/accountancy.lang
deleted file mode 100644
index 527f1fd139d..00000000000
--- a/htdocs/langs/en_IN/accountancy.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-AccountingCategory=Accounting category
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
diff --git a/htdocs/langs/en_IN/admin.lang b/htdocs/langs/en_IN/admin.lang
index 9602601e241..1c53b65c99c 100644
--- a/htdocs/langs/en_IN/admin.lang
+++ b/htdocs/langs/en_IN/admin.lang
@@ -1,1665 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
-Foundation=Foundation
-Version=Version
-VersionProgram=Version program
-VersionLastInstall=Initial install version
-VersionLastUpgrade=Latest version upgrade
-VersionExperimental=Experimental
-VersionDevelopment=Development
-VersionUnknown=Unknown
-VersionRecommanded=Recommended
-FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. Value of some setup constants may also be checked. You can use this tool to detect if some files were modified by a hacker for example.
-FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
-GlobalChecksum=Global checksum
-MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
-LocalSignature=Embedded local signature (less reliable)
-RemoteSignature=Remote distant signature (more reliable)
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FilesModified=Modified Files
-FilesAdded=Added Files
-FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
-XmlNotFound=Xml Integrity File of application not found
-SessionId=Session ID
-SessionSaveHandler=Handler to save sessions
-SessionSavePath=Storage session localization
-PurgeSessions=Purge of sessions
-ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
-NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow to list all running sessions.
-LockNewSessions=Lock new connections
-ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself. Only user <b>%s</b> will be able to connect after that.
-UnlockNewSessions=Remove connection lock
-YourSession=Your session
-Sessions=Users session
-WebUserGroup=Web server user/group
-NoSessionFound=Your PHP seems to not allow to list active sessions. Directory used to save sessions (<b>%s</b>) might be protected (For example, by OS permissions or by PHP directive open_basedir).
-DBStoringCharset=Database charset to store data
-DBSortingCharset=Database charset to sort data
-WarningModuleNotActive=Module <b>%s</b> must be enabled
-WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page.
-DolibarrSetup=Dolibarr install or upgrade
-InternalUser=Internal user
-ExternalUser=External user
-InternalUsers=Internal users
-ExternalUsers=External users
-GUISetup=Display
-SetupArea=Setup area
-FormToTestFileUploadForm=Form to test file upload (according to setup)
-IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
-RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
-RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any usage of update tool.
-SecuritySetup=Security setup
-SecurityFilesDesc=Define here options related to security about uploading files.
-ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
-ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
-ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is not supported.
-DictionarySetup=Dictionary setup
-Dictionary=Dictionaries
-ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
-ErrorCodeCantContainZero=Code can't contain value 0
-DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
-UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties, but it is less convenient)
-DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact, but it is less convenient)
-NumberOfKeyToSearch=Nbr of characters to trigger search: %s
-NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
-AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
-JavascriptDisabled=JavaScript disabled
-UsePreviewTabs=Use preview tabs
-ShowPreview=Show preview
-PreviewNotAvailable=Preview not available
-ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
-MySQLTimeZone=TimeZone MySql (database)
-TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
-Space=Space
-Table=Table
-Fields=Fields
-Index=Index
-Mask=Mask
-NextValue=Next value
-NextValueForInvoices=Next value (invoices)
-NextValueForCreditNotes=Next value (credit notes)
-NextValueForDeposit=Next value (deposit)
-NextValueForReplacements=Next value (replacements)
-MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to <b>%s</b> %s, whatever this parameter's value is
-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
-AntiVirusParam= More parameters on command line
-AntiVirusParamExample= Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
-ComptaSetup=Accounting module setup
-UserSetup=User management setup
-MultiCurrencySetup=Multi-currency setup
-MenuLimits=Limits and accuracy
-MenuIdParent=Parent menu ID
-DetailMenuIdParent=ID of parent menu (empty for a top menu)
-DetailPosition=Sort number to define menu position
-AllMenus=All
-NotConfigured=Module not configured
-Active=Active
-SetupShort=Setup
-OtherOptions=Other options
-OtherSetup=Other setup
-CurrentValueSeparatorDecimal=Decimal separator
-CurrentValueSeparatorThousand=Thousand separator
-Destination=Destination
-IdModule=Module ID
-IdPermissions=Permissions ID
-Modules=Modules
-LanguageBrowserParameter=Parameter %s
-LocalisationDolibarrParameters=Localisation parameters
-ClientTZ=Client Time Zone (user)
-ClientHour=Client time (user)
-OSTZ=Server OS Time Zone
-PHPTZ=PHP server Time Zone
-DaylingSavingTime=Daylight saving time
-CurrentHour=PHP Time (server)
-CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
-Box=Widget
-Boxes=Widgets
-MaxNbOfLinesForBoxes=Max number of lines for widgets
-PositionByDefault=Default order
-Position=Position
-MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
-MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br />Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
-MenuForUsers=Menu for users
-LangFile=.lang file
-System=System
-SystemInfo=System information
-SystemToolsArea=System tools area
-SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for.
-Purge=Purge
-PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
-PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
-PurgeDeleteTemporaryFilesShort=Delete temporary files
-PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory <b>%s</b>. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted.
-PurgeRunNow=Purge now
-PurgeNothingToDelete=No directory or files to delete.
-PurgeNDirectoriesDeleted=<b>%s</b> files or directories deleted.
-PurgeAuditEvents=Purge all security events
-ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
-GenerateBackup=Generate backup
-Backup=Backup
-Restore=Restore
-RunCommandSummary=Backup has been launched with the following command
-BackupResult=Backup result
-BackupFileSuccessfullyCreated=Backup file successfully generated
-YouCanDownloadBackupFile=Generated files can now be downloaded
-NoBackupFileAvailable=No backup files available.
-ExportMethod=Export method
-ImportMethod=Import method
-ToBuildBackupFileClickHere=To build a backup file, click <a href="%s">here</a>.
-ImportMySqlDesc=To import a backup file, you must use mysql command from command line:
-ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line:
-ImportMySqlCommand=%s %s < mybackupfile.sql
-ImportPostgreSqlCommand=%s %s mybackupfile.sql
-FileNameToGenerate=File name to generate
-Compression=Compression
-CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
-CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
-ExportCompatibility=Compatibility of generated export file
-MySqlExportParameters=MySQL export parameters
-PostgreSqlExportParameters= PostgreSQL export parameters
-UseTransactionnalMode=Use transactional mode
-FullPathToMysqldumpCommand=Full path to mysqldump command
-FullPathToPostgreSQLdumpCommand=Full path to pg_dump command
-ExportOptions=Export Options
-AddDropDatabase=Add DROP DATABASE command
-AddDropTable=Add DROP TABLE command
-ExportStructure=Structure
-NameColumn=Name columns
-ExtendedInsert=Extended INSERT
-NoLockBeforeInsert=No lock commands around INSERT
-DelayedInsert=Delayed insert
-EncodeBinariesInHexa=Encode binary data in hexadecimal
-IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
-AutoDetectLang=Autodetect (browser language)
-FeatureDisabledInDemo=Feature disabled in demo
-FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Permissions
-BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
-OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
-ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external modules...
-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 (Note: anyone experienced in PHP programming can provide custom development for an open source project)
-WebSiteDesc=Reference websites to find more modules...
-URL=Link
-BoxesAvailable=Widgets available
-BoxesActivated=Widgets activated
-ActivateOn=Activate on
-ActiveOn=Activated on
-SourceFile=Source file
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
-Required=Required
-UsedOnlyWithTypeOption=Used by some agenda option only
-Security=Security
-Passwords=Passwords
-DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
-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 (Activated 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 make building of a global cumulated pdf not working (like unpaid invoices).
-Feature=Feature
-DolibarrLicense=License
-Developpers=Developers/contributors
-OfficialWebSite=Dolibarr international official web site
-OfficialWebSiteLocal=Local web site (%s)
-OfficialWiki=Dolibarr documentation on Wiki
-OfficialDemo=Dolibarr online demo
-OfficialMarketPlace=Official market place for external modules/addons
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
-ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
-HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
-HelpCenterDesc2=Some part of this service are available in <b>english only</b>.
-CurrentMenuHandler=Current menu handler
-MeasuringUnit=Measuring unit
-LeftMargin=Left margin
-TopMargin=Top margin
-PaperSize=Paper type
-Orientation=Orientation
-SpaceX=Space X
-SpaceY=Space Y
-FontSize=Font size
-Content=Content
-NoticePeriod=Notice period
-NewByMonth=New by month
-Emails=E-mails
-EMailsSetup=E-mails setup
-EMailsDesc=This page allows you to overwrite your PHP parameters for e-mails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless.
-MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
-MAIN_MAIL_EMAIL_FROM=Sender e-mail for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Sender e-mail used for error returns emails sent
-MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
-MAIN_DISABLE_ALL_MAILS=Disable all e-mails sendings (for test purposes or demos)
-MAIN_MAIL_SENDMODE=Method to use to send EMails
-MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
-MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
-MAIN_MAIL_EMAIL_TLS= Use TLS (SSL) encrypt
-MAIN_MAIL_EMAIL_STARTTLS= Use TLS (STARTTLS) encrypt
-MAIN_DISABLE_ALL_SMS=Disable all SMS sendings (for test purposes or demos)
-MAIN_SMS_SENDMODE=Method to use to send SMS
-MAIN_MAIL_SMS_FROM=Default sender phone number for Sms sending
-MAIN_MAIL_DEFAULT_FROMTYPE=Sender e-mail by default for manual sendings (User email or Company email)
-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/
-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 setup
-ModuleFamilyBase=System
-ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
-ModuleFamilyProducts=Products Management (PM)
-ModuleFamilyHr=Human Resource Management (HR)
-ModuleFamilyProjects=Projects/Collaborative work
-ModuleFamilyOther=Other
-ModuleFamilyTechnic=Multi-modules tools
-ModuleFamilyExperimental=Experimental modules
-ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
-ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
-ModuleFamilyInterface=Interfaces with external systems
-MenuHandlers=Menu handlers
-MenuAdmin=Menu editor
-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).
-DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <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>.
-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='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
-YouCanSubmitFile=For this step, you can send package using this tool: Select module file
-CurrentVersion=Dolibarr current version
-CallUpdatePage=Go to the page that updates the database structure and data: %s.
-LastStableVersion=Latest stable version
-LastActivationDate=Latest activation date
-UpdateServerOffline=Update server offline
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
-GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
-GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
-ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
-ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
-DoTestServerAvailability=Test server connectivity
-DoTestSend=Test sending
-DoTestSendHTML=Test sending HTML
-ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
-ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
-UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
-UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
-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...).
-MinLength=Minimum length
-LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
-ExamplesWithCurrentSetup=Examples with current running setup
-ListOfDirectories=List of OpenDocument templates directories
-ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
-NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories
+AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
+AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 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.
-ThemeDir=Skins directory
-ConnectionTimeout=Connexion timeout
-ResponseTimeout=Response timeout
-SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__
-ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
-SecurityToken=Key to secure URLs
-NoSmsEngine=No SMS sender manager available. SMS sender manager are not installed with default distribution (because they depends on an external supplier) but you can find some on %s
-PDF=PDF
-PDFDesc=You can set each global options related to the PDF generation
-PDFAddressForging=Rules to forge address boxes
-HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF
-HideDescOnPDF=Hide products description on generated PDF
-HideRefOnPDF=Hide products ref. on generated PDF
-HideDetailsOnPDF=Hide product lines details on generated PDF
-PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
-Library=Library
-UrlGenerationParameters=Parameters to secure URLs
-SecurityTokenIsUnique=Use a unique securekey parameter for each URL
-EnterRefToBuildUrl=Enter reference for object %s
-GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons to 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
-MassConvert=Launch mass convert
-String=String
-TextLong=Long text
-Int=Integer
-Float=Float
-DateAndTime=Date and hour
-Unique=Unique
-Boolean=Boolean (Checkbox)
-ExtrafieldPhone = Phone
-ExtrafieldPrice = Price
-ExtrafieldMail = Email
-ExtrafieldUrl = Url
-ExtrafieldSelect = Select list
-ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
-ExtrafieldPassword=Password
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
-ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
-LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
-SMS=SMS
-LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
-RefreshPhoneLink=Refresh link
-LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
-KeepEmptyToUseDefault=Keep empty to use default value
-DefaultLink=Default link
-SetAsDefault=Set as default
-ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
-BarcodeInitForThirdparties=Mass barcode init for thirdparties
-BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Init value for next %s empty records
-EraseAllCurrentBarCode=Erase all current barcode values
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
-AllBarcodeReset=All barcode values have been removed
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into 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
-DisplayCompanyInfo=Display company address
-DisplayCompanyManagers=Display manager names
-DisplayCompanyInfoAndManagers=Display company address and manager names
-EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
-ModuleCompanyCodePanicum=Return an empty accountancy code.
-ModuleCompanyCodeDigitaria=Accountancy 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: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-ClickToShowDescription=Click to show description
-# Modules
-Module0Name=Users & groups
-Module0Desc=Users / Employees and Groups management
-Module1Name=Third parties
-Module1Desc=Companies and contact management (customers, prospects...)
-Module2Name=Commercial
-Module2Desc=Commercial management
-Module10Name=Accounting
-Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
-Module20Name=Proposals
-Module20Desc=Commercial proposal management
-Module22Name=Mass E-mailings
-Module22Desc=Mass E-mailing management
-Module23Name=Energy
-Module23Desc=Monitoring the consumption of energies
-Module25Name=Customer Orders
-Module25Desc=Customer order management
-Module30Name=Invoices
-Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
-Module40Name=Suppliers
-Module40Desc=Supplier management and buying (orders and invoices)
-Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
-Module49Name=Editors
-Module49Desc=Editor management
-Module50Name=Products
-Module50Desc=Product management
-Module51Name=Mass mailings
-Module51Desc=Mass paper mailing management
-Module52Name=Stocks
-Module52Desc=Stock management (products)
-Module53Name=Services
-Module53Desc=Service management
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
-Module55Name=Barcodes
-Module55Desc=Barcode management
-Module56Name=Telephony
-Module56Desc=Telephony integration
-Module57Name=Direct bank payment orders
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
-Module58Name=ClickToDial
-Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
-Module70Name=Interventions
-Module70Desc=Intervention management
-Module75Name=Expense and trip notes
-Module75Desc=Expense and trip notes management
-Module80Name=Shipments
-Module80Desc=Shipments and delivery order management
-Module85Name=Banks and cash
-Module85Desc=Management of bank or cash accounts
-Module100Name=External site
-Module100Desc=This module include an external web site or page into Dolibarr menus and view it into a Dolibarr frame
-Module105Name=Mailman and SPIP
-Module105Desc=Mailman or SPIP interface for member module
-Module200Name=LDAP
-Module200Desc=LDAP directory synchronisation
-Module210Name=PostNuke
-Module210Desc=PostNuke integration
-Module240Name=Data exports
-Module240Desc=Tool to export Dolibarr data (with assistants)
-Module250Name=Data imports
-Module250Desc=Tool to import data in Dolibarr  (with assistants)
-Module310Name=Members
-Module310Desc=Foundation members management
-Module320Name=RSS Feed
-Module320Desc=Add RSS feed inside Dolibarr screen pages
-Module330Name=Bookmarks
-Module330Desc=Bookmarks management
-Module400Name=Projects/Opportunities/Leads
-Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
-Module410Name=Webcalendar
-Module410Desc=Webcalendar integration
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
-Module520Name=Loan
-Module520Desc=Management of loans
-Module600Name=Notifications
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
-Module700Name=Donations
-Module700Desc=Donation management
-Module770Name=Expense reports
-Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
-Module1200Name=Mantis
-Module1200Desc=Mantis integration
-Module1400Name=Accounting
-Module1400Desc=Accounting management (double parties)
-Module1520Name=Document Generation
-Module1520Desc=Mass mail document generation
-Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
-Module2000Name=WYSIWYG editor
-Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
-Module2200Name=Dynamic Prices
-Module2200Desc=Enable the usage of math expressions for prices
-Module2300Name=Cron
-Module2300Desc=Scheduled job management
-Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
-Module2500Name=Electronic Content Management
-Module2500Desc=Save and share documents
-Module2600Name=API/Web services (SOAP server)
-Module2600Desc=Enable the Dolibarr SOAP server providing API services
-Module2610Name=API/Web services (REST server)
-Module2610Desc=Enable the Dolibarr REST server providing API services
-Module2660Name=Call WebServices (SOAP client)
-Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
-Module2700Name=Gravatar
-Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
-Module2800Desc=FTP Client
-Module2900Name=GeoIPMaxmind
-Module2900Desc=GeoIP Maxmind conversions capabilities
-Module3100Name=Skype
-Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
-Module4000Name=HRM
-Module4000Desc=Human resources management
-Module5000Name=Multi-company
-Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management
-Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
-Module20000Name=Leave Requests management
-Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Product lot
-Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
-Module50000Name=PayBox
-Module50000Desc=Module to offer an online payment page by credit card with PayBox
-Module50100Name=Point of sales
-Module50100Desc=Point of sales module (POS).
-Module50200Name=Paypal
-Module50200Desc=Module to offer an online payment page by credit card with Paypal
-Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double parties)
-Module54000Name=PrintIPP
-Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
-Module55000Name=Poll, Survey or Vote
-Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
-Module59000Name=Margins
-Module59000Desc=Module to manage margins
-Module60000Name=Commissions
-Module60000Desc=Module to manage commissions
-Module63000Name=Resources
-Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
-Permission11=Read customer invoices
-Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
-Permission14=Validate customer invoices
-Permission15=Send customer invoices by email
-Permission16=Create payments for customer invoices
-Permission19=Delete customer invoices
-Permission21=Read commercial proposals
-Permission22=Create/modify commercial proposals
-Permission24=Validate commercial proposals
-Permission25=Send commercial proposals
-Permission26=Close commercial proposals
-Permission27=Delete commercial proposals
-Permission28=Export commercial proposals
-Permission31=Read products
-Permission32=Create/modify products
-Permission34=Delete products
-Permission36=See/manage hidden products
-Permission38=Export products
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
-Permission44=Delete projects (shared project and projects i'm contact for)
-Permission45=Export projects
-Permission61=Read interventions
-Permission62=Create/modify interventions
-Permission64=Delete interventions
-Permission67=Export interventions
-Permission71=Read members
-Permission72=Create/modify members
-Permission74=Delete members
-Permission75=Setup types of membership
-Permission76=Export data
-Permission78=Read subscriptions
-Permission79=Create/modify subscriptions
-Permission81=Read customers orders
-Permission82=Create/modify customers orders
-Permission84=Validate customers orders
-Permission86=Send customers orders
-Permission87=Close customers orders
-Permission88=Cancel customers orders
-Permission89=Delete customers orders
-Permission91=Read social or fiscal taxes and vat
-Permission92=Create/modify social or fiscal taxes and vat
-Permission93=Delete social or fiscal taxes and vat
-Permission94=Export social or fiscal taxes
-Permission95=Read reports
-Permission101=Read sendings
-Permission102=Create/modify sendings
-Permission104=Validate sendings
-Permission106=Export sendings
-Permission109=Delete sendings
-Permission111=Read financial accounts
-Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
-Permission114=Reconciliate transactions
-Permission115=Export transactions and account statements
-Permission116=Transfers between accounts
-Permission117=Manage cheques dispatching
-Permission121=Read third parties linked to user
-Permission122=Create/modify third parties linked to user
-Permission125=Delete third parties linked to user
-Permission126=Export third parties
-Permission141=Read all projects and tasks (also private projects i am not contact for)
-Permission142=Create/modify all projects and tasks (also private projects i am not 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
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
-Permission167=Export contracts
-Permission171=Read trips and expenses (yours and your subordinates)
-Permission172=Create/modify trips and expenses
-Permission173=Delete trips and expenses
-Permission174=Read all trips and expenses
-Permission178=Export trips and expenses
-Permission180=Read suppliers
-Permission181=Read supplier orders
-Permission182=Create/modify supplier orders
-Permission183=Validate supplier orders
-Permission184=Approve supplier orders
-Permission185=Order or cancel supplier orders
-Permission186=Receive supplier orders
-Permission187=Close supplier orders
-Permission188=Cancel supplier orders
-Permission192=Create lines
-Permission193=Cancel lines
-Permission194=Read the bandwith lines
-Permission202=Create ADSL connections
-Permission203=Order connections orders
-Permission204=Order connections
-Permission205=Manage connections
-Permission206=Read connections
-Permission211=Read Telephony
-Permission212=Order lines
-Permission213=Activate line
-Permission214=Setup Telephony
-Permission215=Setup providers
-Permission221=Read emailings
-Permission222=Create/modify emailings (topic, recipients...)
-Permission223=Validate emailings (allows sending)
-Permission229=Delete emailings
-Permission237=View recipients and info
-Permission238=Manually send mailings
-Permission239=Delete mailings after validation or sent
-Permission241=Read categories
-Permission242=Create/modify categories
-Permission243=Delete categories
-Permission244=See the contents of the hidden categories
-Permission251=Read other users and groups
-PermissionAdvanced251=Read other users
-Permission252=Read permissions of other users
-Permission253=Create/modify other users, groups and permisssions
-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 assignement matters).
-Permission271=Read CA
-Permission272=Read invoices
-Permission273=Issue invoices
-Permission281=Read contacts
-Permission282=Create/modify contacts
-Permission283=Delete contacts
-Permission286=Export contacts
-Permission291=Read tariffs
-Permission292=Set permissions on the tariffs
-Permission293=Modify costumers tariffs
-Permission300=Read bar codes
-Permission301=Create/modify bar codes
-Permission302=Delete bar codes
-Permission311=Read services
-Permission312=Assign service/subscription to contract
-Permission331=Read bookmarks
-Permission332=Create/modify bookmarks
-Permission333=Delete bookmarks
-Permission341=Read its own permissions
-Permission342=Create/modify his own user information
-Permission343=Modify his own password
-Permission344=Modify its own permissions
-Permission351=Read groups
-Permission352=Read groups permissions
-Permission353=Create/modify groups
-Permission354=Delete or disable groups
-Permission358=Export users
-Permission401=Read discounts
-Permission402=Create/modify discounts
-Permission403=Validate discounts
-Permission404=Delete discounts
-Permission510=Read Salaries
-Permission512=Create/modify salaries
-Permission514=Delete salaries
-Permission517=Export salaries
-Permission520=Read Loans
-Permission522=Create/modify loans
-Permission524=Delete loans
-Permission525=Access loan calculator
-Permission527=Export loans
-Permission531=Read services
-Permission532=Create/modify services
-Permission534=Delete services
-Permission536=See/manage hidden services
-Permission538=Export services
-Permission701=Read donations
-Permission702=Create/modify donations
-Permission703=Delete donations
-Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
-Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
-Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission779=Export expense reports
-Permission1001=Read stocks
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
-Permission1004=Read stock movements
-Permission1005=Create/modify stock movements
-Permission1101=Read delivery orders
-Permission1102=Create/modify delivery orders
-Permission1104=Validate delivery orders
-Permission1109=Delete delivery orders
-Permission1181=Read suppliers
-Permission1182=Read supplier orders
-Permission1183=Create/modify supplier orders
-Permission1184=Validate supplier orders
-Permission1185=Approve supplier orders
-Permission1186=Order supplier orders
-Permission1187=Acknowledge receipt of supplier orders
-Permission1188=Delete supplier orders
-Permission1190=Approve (second approval) supplier orders
-Permission1201=Get result of an export
-Permission1202=Create/Modify an export
-Permission1231=Read supplier invoices
-Permission1232=Create/modify supplier invoices
-Permission1233=Validate supplier invoices
-Permission1234=Delete supplier invoices
-Permission1235=Send supplier invoices by email
-Permission1236=Export supplier invoices, attributes and payments
-Permission1237=Export supplier orders and their details
-Permission1251=Run mass imports of external data into database (data load)
-Permission1321=Export customer invoices, attributes and payments
-Permission1322=Reopen a paid bill
-Permission1421=Export customer orders and attributes
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
-Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
-Permission20006=Admin leave requests (setup and update balance)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
-Permission2401=Read actions (events or tasks) linked to his account
-Permission2402=Create/modify actions (events or tasks) linked to his account
-Permission2403=Delete actions (events or tasks) linked to his account
-Permission2411=Read actions (events or tasks) of others
-Permission2412=Create/modify actions (events or tasks) of others
-Permission2413=Delete actions (events or tasks) of others
-Permission2414=Export actions/tasks of others
-Permission2501=Read/Download documents
-Permission2502=Download documents
-Permission2503=Submit or delete documents
-Permission2515=Setup documents directories
-Permission2801=Use FTP client in read mode (browse and download only)
-Permission2802=Use FTP client in write mode (delete or upload files)
-Permission50101=Use Point of sales
-Permission50201=Read transactions
-Permission50202=Import transactions
-Permission54001=Print
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
-Permission59003=Read every user margin
-Permission63001=Read resources
-Permission63002=Create/modify resources
-Permission63003=Delete resources
-Permission63004=Link resources to agenda events
-DictionaryCompanyType=Types of thirdparties
-DictionaryCompanyJuridicalType=Legal forms of thirdparties
-DictionaryProspectLevel=Prospect potential level
-DictionaryCanton=State/Province
-DictionaryRegion=Regions
-DictionaryCountry=Countries
-DictionaryCurrency=Currencies
-DictionaryCivility=Personal and professional titles
-DictionaryActions=Types of agenda events
-DictionarySocialContributions=Social or fiscal taxes types
-DictionaryVAT=VAT Rates or Sales Tax Rates
-DictionaryRevenueStamp=Amount of revenue stamps
-DictionaryPaymentConditions=Payment terms
-DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact/Address types
-DictionaryEcotaxe=Ecotax (WEEE)
-DictionaryPaperFormat=Paper formats
-DictionaryFormatCards=Cards formats
-DictionaryFees=Types of fees
-DictionarySendingMethods=Shipping methods
-DictionaryStaff=Staff
-DictionaryAvailability=Delivery delay
-DictionaryOrderMethods=Ordering methods
-DictionarySource=Origin of proposals/orders
-DictionaryAccountancyCategory=Accounting account groups
-DictionaryAccountancysystem=Models for chart of accounts
-DictionaryEMailTemplates=Emails templates
-DictionaryUnits=Units
-DictionaryProspectStatus=Prospection status
-DictionaryHolidayTypes=Types of leaves
-DictionaryOpportunityStatus=Opportunity status for project/lead
-SetupSaved=Setup saved
-BackToModuleList=Back to modules list
-BackToDictionaryList=Back to dictionaries list
-VATManagement=VAT Management
-VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
-VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies.
-VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
-##### Local Taxes #####
-LTRate=Rate
-LocalTax1IsNotUsed=Do not use second tax
-LocalTax1IsUsedDesc=Use a second type of tax (other than VAT)
-LocalTax1IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax1Management=Second type of tax
-LocalTax1IsUsedExample=
-LocalTax1IsNotUsedExample=
-LocalTax2IsNotUsed=Do not use third tax
-LocalTax2IsUsedDesc=Use a third type of tax (other than VAT)
-LocalTax2IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax2Management=Third type of tax
-LocalTax2IsUsedExample=
-LocalTax2IsNotUsedExample=
-LocalTax1ManagementES= RE Management
-LocalTax1IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If te buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
-LocalTax1IsNotUsedDescES= By default the proposed RE is 0. End of rule.
-LocalTax1IsUsedExampleES= In Spain they are professionals subject to some specific sections of the Spanish IAE.
-LocalTax1IsNotUsedExampleES= In Spain they are professional and societies and subject to certain sections of the Spanish IAE.
-LocalTax2ManagementES= IRPF Management
-LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
-LocalTax2IsNotUsedDescES= By default the proposed IRPF is 0. End of rule.
-LocalTax2IsUsedExampleES= In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
-LocalTax2IsNotUsedExampleES= In Spain they are bussines not subject to tax system of modules.
-CalcLocaltax=Reports on local taxes
-CalcLocaltax1=Sales - Purchases
-CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2=Purchases
-CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3=Sales
-CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
-LabelUsedByDefault=Label used by default if no translation can be found for code
-LabelOnDocuments=Label on documents
-NbOfDays=Nb of days
-AtEndOfMonth=At end of month
-CurrentNext=Current/Next
-Offset=Offset
-AlwaysActive=Always active
-Upgrade=Upgrade
-MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Deploy/install external module
-WebServer=Web server
-DocumentRootServer=Web server's root directory
-DataRootServer=Data files directory
-IP=IP
-Port=Port
-VirtualServerName=Virtual server name
-OS=OS
-PhpWebLink=Web-Php link
-Browser=Browser
-Server=Server
-Database=Database
-DatabaseServer=Database host
-DatabaseName=Database name
-DatabasePort=Database port
-DatabaseUser=Database user
-DatabasePassword=Database password
-Tables=Tables
-TableName=Table name
-NbOfRecord=Nb of records
-Host=Server
-DriverType=Driver type
-SummarySystem=System information summary
-SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Foundation
-DefaultMenuManager= Standard menu manager
-DefaultMenuSmartphoneManager=Smartphone menu manager
-Skin=Skin theme
-DefaultSkin=Default skin theme
-MaxSizeList=Max length for list
-DefaultMaxSizeList=Default max length for lists
-DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
-MessageOfDay=Message of the day
-MessageLogin=Login page message
-PermanentLeftSearchForm=Permanent search form on left menu
-DefaultLanguage=Default language to use (language code)
-EnableMultilangInterface=Enable multilingual interface
-EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/foundation information
-CompanyIds=Company/foundation identities
-CompanyName=Name
-CompanyAddress=Address
-CompanyZip=Zip
-CompanyTown=Town
-CompanyCountry=Country
-CompanyCurrency=Main currency
-CompanyObject=Object of the company
-Logo=Logo
-DoNotSuggestPaymentMode=Do not suggest
-NoActiveBankAccountDefined=No active bank account defined
-OwnerOfBankAccount=Owner of bank account %s
-BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show link "<strong>%s</strong>"
-Alerts=Alerts
-DelaysOfToleranceBeforeWarning=Tolerance delays before warning
-DelaysOfToleranceDesc=This screen allows you to define the tolerated delays before an alert is reported on screen with picto %s for each late element.
-Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned events (agenda events) not completed yet
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Delay tolerance (in days) before alert on project not closed in time
-Delays_MAIN_DELAY_TASKS_TODO=Delay tolerance (in days) before alert on planned tasks (project tasks) not completed yet
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on orders not processed yet
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on suppliers orders not processed yet
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Delay tolerance (in days) before alert on proposals to close
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Delay tolerance (in days) before alert on proposals not billed
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerance delay (in days) before alert on services to activate
-Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerance delay (in days) before alert on expired services
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerance delay (in days) before alert on unpaid supplier invoices
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerence delay (in days) before alert on unpaid client invoices
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerance delay (in days) before alert on pending bank reconciliation
-Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed membership fee
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
-Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
-SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
-SetupDescription5=Other menu entries manage optional parameters.
-LogEvents=Security audit events
-Audit=Audit
-InfoDolibarr=About Dolibarr
-InfoBrowser=About Browser
-InfoOS=About OS
-InfoWebServer=About Web Server
-InfoDatabase=About Database
-InfoPHP=About PHP
-InfoPerf=About Performances
-BrowserName=Browser name
-BrowserOS=Browser OS
-ListOfSecurityEvents=List of Dolibarr security events
-SecurityEventsPurged=Security events purged
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
-SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
-SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
-DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
-AvailableModules=Available 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.
-TriggersAvailable=Available triggers
-TriggersDesc=Triggers are files that will modify the behaviour of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realised new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
-TriggerDisabledByName=Triggers in this file are disabled by the <b>-NORUN</b> suffix in their name.
-TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module <b>%s</b> is disabled.
-TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules.
-TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
-GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password
-DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">check here</a>.
-MiscellaneousDesc=All other security related parameters are defined here.
-LimitsSetup=Limits/Precision setup
-LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here
-MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices
-MAIN_MAX_DECIMALS_TOT=Max decimals for total prices
-MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add <b>...</b> after this number if you want to see <b>...</b> when number is truncated when shown on screen)
-MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
-UnitPriceOfProduct=Net unit price of a product
-TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
-ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
-NoEventFoundWithCriteria=No security event has been found for such search criterias.
-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.
-BackupDescX=Archived directory should be stored in a secure place.
-BackupDescY=The generated dump file should be stored in a secure place.
-BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one
-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 directoy (<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=Available database backup dump files
-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
-DownloadMoreSkins=More skins to download
-SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence without hole and with no reset
-ShowProfIdInAddress=Show professionnal id with addresses on documents
-ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents
-TranslationUncomplete=Partial translation
-MAIN_DISABLE_METEO=Disable meteo view
-TestLoginToAPI=Test login to API
-ProxyDesc=Some features of Dolibarr need to have an Internet access to work. Define here parameters for this. If the Dolibarr server is behind a Proxy server, those parameters tells Dolibarr how to access Internet through it.
-ExternalAccess=External access
-MAIN_PROXY_USE=Use a proxy server (otherwise direct access to internet)
-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 all attributes, not already available by default, and that you want to be supported for %s.
-ExtraFields=Complementary attributes
-ExtraFieldsLines=Complementary attributes (lines)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
-ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact/address)
-ExtraFieldsMember=Complementary attributes (member)
-ExtraFieldsMemberType=Complementary attributes (member type)
-ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
-ExtraFieldsSupplierOrders=Complementary attributes (orders)
-ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
-ExtraFieldsProject=Complementary attributes (projects)
-ExtraFieldsProjectTask=Complementary attributes (tasks)
-ExtraFieldHasWrongValue=Attribute %s has a wrong value.
-AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
-SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
-PathToDocuments=Path to documents
-PathDirectory=Directory
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might 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.
-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: <strong>User display setup</strong> tab of 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
-TranslationString=Translation string
-CurrentTranslationString=Current translation string
-WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
-NewTranslationStringToShow=New translation string to show
-OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
-YouMustEnableOneModule=You must at least enable 1 module
-ClassNotFoundIntoPathWarning=Class %s not found into PHP path
-YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
-SuhosinSessionEncrypt=Session storage encrypted by Suhosin
-ConditionIsCurrently=Condition is currently %s
-YouUseBestDriver=You use driver %s that is best driver available currently.
-YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required 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.
-BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance.
-BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
-AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp".
-AskForPreferredShippingMethod=Ask for preferred Sending Method for Third Parties.
-FieldEdition=Edition of field %s
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
-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.
-PasswordGenerationPerso=Return a password according to your personally defined configuration.
-SetupPerso=According to your configuration
-PasswordPatternDesc=Password pattern description
-##### Users setup #####
-RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passwords
-DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page
-UsersSetup=Users module setup
-UserMailRequired=EMail required to create a new user
-##### HRM setup #####
-HRMSetup=HRM module setup
-##### Company setup #####
-CompanySetup=Companies module setup
-CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier)
-AccountCodeManager=Module for accountancy code generation (customer or supplier)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
-NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
-NotificationsDescGlobal=* or by setting global target emails in module setup page.
-ModelModules=Documents templates
-DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
-WatermarkOnDraft=Watermark on draft document
-JSOnPaimentBill=Activate feature to autofill payment lines on payment form
-CompanyIdProfChecker=Rules on Professional Ids
-MustBeUnique=Must be unique?
-MustBeMandatory=Mandatory to create third parties?
-MustBeInvoiceMandatory=Mandatory to validate invoices?
-##### Webcal setup #####
-WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
-##### Invoices #####
-BillsSetup=Invoices module setup
-BillsNumberingModule=Invoices and credit notes numbering model
-BillsPDFModules=Invoice documents models
-CreditNote=Credit note
-CreditNotes=Credit notes
-ForceInvoiceDate=Force invoice date to validation date
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
-SuggestPaymentByRIBOnAccount=Suggest payment by withdraw on account
-SuggestPaymentByChequeToAddress=Suggest payment by cheque to
-FreeLegalTextOnInvoices=Free text on invoices
-WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
-PaymentsNumberingModule=Payments numbering model
-SuppliersPayment=Suppliers payments
-SupplierPaymentSetup=Suppliers payments setup
-##### Proposals #####
-PropalSetup=Commercial proposals module setup
-ProposalsNumberingModules=Commercial proposal numbering models
-ProposalsPDFModules=Commercial proposal documents models
-FreeLegalTextOnProposal=Free text on commercial proposals
-WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
-WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
-##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
-##### Orders #####
-OrdersSetup=Order management setup
-OrdersNumberingModules=Orders numbering models
-OrdersModelModule=Order documents models
-FreeLegalTextOnOrders=Free text on orders
-WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
-ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Interventions #####
-InterventionsSetup=Interventions module setup
-FreeLegalTextOnInterventions=Free text on intervention documents
-FicheinterNumberingModules=Intervention numbering models
-TemplatePDFInterventions=Intervention card documents models
-WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
-##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
-ContractsNumberingModules=Contracts numbering modules
-TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
-##### Members #####
-MembersSetup=Members module setup
-MemberMainOptions=Main options
-AdherentLoginRequired= Manage a Login for each member
-AdherentMailRequired=EMail required to create a new member
-MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
-##### LDAP setup #####
-LDAPSetup=LDAP Setup
-LDAPGlobalParameters=Global parameters
-LDAPUsersSynchro=Users
-LDAPGroupsSynchro=Groups
-LDAPContactsSynchro=Contacts
-LDAPMembersSynchro=Members
-LDAPSynchronization=LDAP synchronisation
-LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP
-LDAPToDolibarr=LDAP -> Dolibarr
-DolibarrToLDAP=Dolibarr -> LDAP
-LDAPNamingAttribute=Key in LDAP
-LDAPSynchronizeUsers=Organization of users in LDAP
-LDAPSynchronizeGroups=Organization of groups in LDAP
-LDAPSynchronizeContacts=Organization of contacts in LDAP
-LDAPSynchronizeMembers=Organization of foundation's members in LDAP
-LDAPPrimaryServer=Primary server
-LDAPSecondaryServer=Secondary server
-LDAPServerPort=Server port
-LDAPServerPortExample=Default port : 389
-LDAPServerProtocolVersion=Protocol version
-LDAPServerUseTLS=Use TLS
-LDAPServerUseTLSExample=Your LDAP server use TLS
-LDAPServerDn=Server DN
-LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
-LDAPPassword=Administrator password
-LDAPUserDn=Users' DN
-LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
-LDAPGroupDn=Groups' DN
-LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com)
-LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
-LDAPServerDnExample=Complete DN (ex: dc=example,dc=com)
-LDAPDnSynchroActive=Users and groups synchronization
-LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization
-LDAPDnContactActive=Contacts' synchronization
-LDAPDnContactActiveExample=Activated/Unactivated synchronization
-LDAPDnMemberActive=Members' synchronization
-LDAPDnMemberActiveExample=Activated/Unactivated synchronization
-LDAPContactDn=Dolibarr contacts' DN
-LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com)
-LDAPMemberDn=Dolibarr members DN
-LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com)
-LDAPMemberObjectClassList=List of objectClass
-LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPUserObjectClassList=List of objectClass
-LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPGroupObjectClassList=List of objectClass
-LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
-LDAPContactObjectClassList=List of objectClass
-LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPTestConnect=Test LDAP connection
-LDAPTestSynchroContact=Test contacts synchronization
-LDAPTestSynchroUser=Test user synchronization
-LDAPTestSynchroGroup=Test group synchronization
-LDAPTestSynchroMember=Test member synchronization
-LDAPTestSearch= Test a LDAP search
-LDAPSynchroOK=Synchronization test successful
-LDAPSynchroKO=Failed synchronization test
-LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that connexion to server is correctly configured and allows LDAP udpates
-LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s)
-LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s)
-LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPBindKO=Connect/Authentificate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPSetupForVersion3=LDAP server configured for version 3
-LDAPSetupForVersion2=LDAP server configured for version 2
-LDAPDolibarrMapping=Dolibarr Mapping
-LDAPLdapMapping=LDAP Mapping
-LDAPFieldLoginUnix=Login (unix)
-LDAPFieldLoginExample=Example : uid
-LDAPFilterConnection=Search filter
-LDAPFilterConnectionExample=Example : &(objectClass=inetOrgPerson)
-LDAPFieldLoginSamba=Login (samba, activedirectory)
-LDAPFieldLoginSambaExample=Example : samaccountname
-LDAPFieldFullname=Full name
-LDAPFieldFullnameExample=Example : cn
-LDAPFieldPasswordNotCrypted=Password not crypted
-LDAPFieldPasswordCrypted=Password crypted
-LDAPFieldPasswordExample=Example : userPassword
-LDAPFieldCommonNameExample=Example : cn
-LDAPFieldName=Name
-LDAPFieldNameExample=Example : sn
-LDAPFieldFirstName=First name
-LDAPFieldFirstNameExample=Example : givenName
-LDAPFieldMail=Email address
-LDAPFieldMailExample=Example : mail
-LDAPFieldPhone=Professional phone number
-LDAPFieldPhoneExample=Example : telephonenumber
-LDAPFieldHomePhone=Personal phone number
-LDAPFieldHomePhoneExample=Example : homephone
-LDAPFieldMobile=Cellular phone
-LDAPFieldMobileExample=Example : mobile
-LDAPFieldFax=Fax number
-LDAPFieldFaxExample=Example : facsimiletelephonenumber
-LDAPFieldAddress=Street
-LDAPFieldAddressExample=Example : street
-LDAPFieldZip=Zip
-LDAPFieldZipExample=Example : postalcode
-LDAPFieldTown=Town
-LDAPFieldTownExample=Example : l
-LDAPFieldCountry=Country
-LDAPFieldDescription=Description
-LDAPFieldDescriptionExample=Example : description
-LDAPFieldNotePublic=Public Note
-LDAPFieldNotePublicExample=Example : publicnote
-LDAPFieldGroupMembers= Group members
-LDAPFieldGroupMembersExample= Example : uniqueMember
-LDAPFieldBirthdate=Birthdate
-LDAPFieldCompany=Company
-LDAPFieldCompanyExample=Example : o
-LDAPFieldSid=SID
-LDAPFieldSidExample=Example : objectsid
-LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Job position
-LDAPFieldTitleExample=Example: title
-LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
-LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
-LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts.
-LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users.
-LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups.
-LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module.
-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 advices related to performance.
-NotInstalled=Not installed, so your server is not slow 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.
-MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
-MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
-OPCodeCache=OPCode cache
-NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad).
-HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
-FilesOfTypeCached=Files of type %s are cached by HTTP server
-FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
-FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
-FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
-CacheByServer=Cache by server
-CacheByClient=Cache by browser
-CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
-##### Products #####
-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)
-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 third party language
-UseSearchToSelectProductTooltip=Also if you have a large number of product (> 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)
-SetDefaultBarcodeTypeProducts=Default barcode type to use for products
-SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
-ProductCodeChecker= Module for product code generation and checking (product or service)
-ProductOtherConf= Product / Service configuration
-IsNotADir=is not a directory!
-##### Syslog #####
-SyslogSetup=Logs module setup
-SyslogOutput=Logs outputs
-SyslogFacility=Facility
-SyslogLevel=Level
-SyslogFilename=File name and path
-YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
-ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
-##### Donations #####
-DonationsSetup=Donation module setup
-DonationsReceiptModel=Template of donation receipt
-##### Barcode #####
-BarcodeSetup=Barcode setup
-PaperFormatModule=Print format module
-BarcodeEncodeModule=Barcode encoding type
-CodeBarGenerator=Barcode generator
-ChooseABarCode=No generator defined
-FormatNotSupportedByGenerator=Format not supported by this generator
-BarcodeDescEAN8=Barcode of type EAN8
-BarcodeDescEAN13=Barcode of type EAN13
-BarcodeDescUPC=Barcode of type UPC
-BarcodeDescISBN=Barcode of type ISBN
-BarcodeDescC39=Barcode of type C39
-BarcodeDescC128=Barcode of type C128
-BarcodeDescDATAMATRIX=Barcode of type Datamatrix
-BarcodeDescQRCODE=Barcode of type QR code
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
-BarcodeInternalEngine=Internal engine
-BarCodeNumberManager=Manager to auto define barcode numbers
-##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct debit payment orders
-##### ExternalRSS #####
-ExternalRSSSetup=External RSS imports setup
-NewRSS=New RSS Feed
-RSSUrl=RSS URL
-RSSUrlExample=An interesting RSS feed
-##### Mailing #####
-MailingSetup=EMailing module setup
-MailingEMailFrom=Sender EMail (From) for emails sent by emailing module
-MailingEMailError=Return EMail (Errors-to) for emails with errors
-MailingDelay=Seconds to wait after sending next message
-##### Notification #####
-NotificationSetup=EMail notification module setup
-NotificationEMailFrom=Sender EMail (From) for emails sent for notifications
-FixedEmailTarget=Fixed email target
-##### Sendings #####
-SendingsSetup=Sending module setup
-SendingsReceiptModel=Sending receipt model
-SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
-FreeLegalTextOnShippings=Free text on shipments
-##### Deliveries #####
-DeliveryOrderNumberingModules=Products deliveries receipt numbering module
-DeliveryOrderModel=Products deliveries receipt model
-DeliveriesOrderAbility=Support products deliveries receipts
-FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
-##### FCKeditor #####
-AdvancedEditor=Advanced editor
-ActivateFCKeditor=Activate advanced editor for:
-FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
-FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files.</font>
-FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
-FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
-##### OSCommerce 1 #####
-OSCommerceErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be an OSCommerce database (Key %s not found in table %s).
-OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' successfull.
-OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
-OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
-##### Stock #####
-StockSetup=Warehouse module setup
-IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
-##### Menu #####
-MenuDeleted=Menu deleted
-Menus=Menus
-TreeMenuPersonalized=Personalized menus
-NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
-NewMenu=New menu
-Menu=Selection of menu
-MenuHandler=Menu handler
-MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
-DetailId=Id menu
-DetailMenuHandler=Menu handler where to show new menu
-DetailMenuModule=Module name if menu entry come from a module
-DetailType=Type of menu (top or left)
-DetailTitre=Menu label or label code for translation
-DetailUrl=URL where menu send you (Absolute URL link or external link with http://)
-DetailEnabled=Condition to show or not entry
-DetailRight=Condition to display unauthorized grey menus
-DetailLangs=Lang file name for label code translation
-DetailUser=Intern / Extern / All
-Target=Target
-DetailTarget=Target for links (_blank top open a new window)
-DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu)
-ModifMenu=Menu change
-DeleteMenu=Delete menu entry
-ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
-FailedToInitializeMenu=Failed to initialize menu
-##### Tax #####
-TaxSetup=Taxes, social or fiscal taxes and dividends module setup
-OptionVatMode=VAT due
-OptionVATDefault=Cash basis
-OptionVATDebitOption=Accrual basis
-OptionVatDefaultDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on payments for services
-OptionVatDebitOptionDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on invoice (debit) for services
-SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
-OnDelivery=On delivery
-OnPayment=On payment
-OnInvoice=On invoice
-SupposedToBePaymentDate=Payment date used
-SupposedToBeInvoiceDate=Invoice date used
-Buy=Buy
-Sell=Sell
-InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
-AccountancyCode=Accountancy Code
-AccountancyCodeSell=Sale 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 -> Dictionary -> 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_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
-AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### 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 your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your 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.
-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 same computer than 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.
-##### Point Of Sales (CashDesk) #####
-CashDesk=Point of sales
-CashDeskSetup=Point of sales module setup
-CashDeskThirdPartyForSell=Default generic third party to use for sells
-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).
-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
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
-##### Bookmark #####
-BookmarkSetup=Bookmark module setup
-BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu.
-NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu
-##### WebServices #####
-WebServicesSetup=Webservices module setup
-WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
-WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
-EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
-##### API ####
-ApiSetup=API module setup
-ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
-OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
-ApiKey=Key for API
-WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
-##### Bank #####
-BankSetupModule=Bank module setup
-FreeLegalTextOnChequeReceipts=Free text on cheque receipts
-BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
-BankOrderGlobal=General
-BankOrderGlobalDesc=General display order
-BankOrderES=Spanish
-BankOrderESDesc=Spanish display order
-ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
-##### Multicompany #####
-MultiCompanySetup=Multi-company module setup
-##### Suppliers #####
-SuppliersSetup=Supplier module setup
-SuppliersCommandModel=Complete template of supplier order (logo...)
-SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
-SuppliersInvoiceNumberingModel=Supplier invoices numbering models
-IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
-##### GeoIPMaxmind #####
-GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
-NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
-YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
-YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
-TestGeoIPResult=Test of a conversion IP -> country
-##### Projects #####
-ProjectsNumberingModules=Projects numbering module
-ProjectsSetup=Project module setup
-ProjectsModelModule=Project reports document model
-TasksNumberingModules=Tasks numbering module
-TaskModelModule=Tasks reports document model
-UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
-##### ECM (GED) #####
-##### Fiscal Year #####
-AccountingPeriods=Accounting periods
-AccountingPeriodCard=Accounting period
-NewFiscalYear=New accounting period
-OpenFiscalYear=Open accounting period
-CloseFiscalYear=Close accounting period
-DeleteFiscalYear=Delete accounting period
-ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
-ShowFiscalYear=Show accounting period
-AlwaysEditable=Can always be edited
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
-Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
-IncludePath=Include path (defined into variable %s)
-ExpenseReportsSetup=Setup of module Expense Reports
-TemplatePDFExpenseReports=Document templates to generate expense report document
-NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
-YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of 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
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/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.
-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.
-ConfFileMuseContainCustom=Installing 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)
-TextTitleColor=Color of page title
-LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
-NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
-BackgroundColor=Background color
-TopMenuBackgroundColor=Background color for Top menu
-TopMenuDisableImages=Hide images in Top menu
-LeftMenuBackgroundColor=Background color for Left menu
-BackgroundTableTitleColor=Background color for Table title line
-BackgroundTableLineOddColor=Background color for odd table lines
-BackgroundTableLineEvenColor=Background color for even table lines
-MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
-NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
-UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
-PositionIntoComboList=Position of line into combo lists
-SellTaxRate=Sale tax rate
-RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
-UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipping, you can enter it here. You can use the key {TRACKID} into URL parameters so the system will replace it with value of tracking number user entered into shipment card.
-OpportunityPercent=When you create an opportunity, you will defined an estimated amount of project/lead. According to status of opportunity, this amount may be multiplicated 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
-FixTZ=TimeZone fix
-FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
-ExpectedChecksum=Expected Checksum
-CurrentChecksum=Current Checksum
-ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the latest stable version
-TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
-TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so 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 usefull only if your prices for each leve 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.
-SeeSubstitutionVars=See * note for list of possible substitution variables
-AllPublishers=All publishers
-UnknownPublishers=Unknown publishers
-AddRemoveTabs=Add or remove tabs
-AddDictionaries=Add dictionaries
-AddBoxes=Add widgets
-AddSheduledJobs=Add scheduled jobs
-AddHooks=Add hooks
-AddTriggers=Add triggers
-AddMenus=Add menus
-AddPermissions=Add permissions
-AddExportProfiles=Add export profiles
-AddImportProfiles=Add import profiles
-AddOtherPagesOrServices=Add other pages or services
-AddModels=Add document or numbering templates
-AddSubstitutions=Add keys substitutions
-DetectionNotPossible=Detection not possible
-UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved on 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 correclty. 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 inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <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
-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
-TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
-##### Resource ####
-ResourceSetup=Configuration du module Resource
-UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
diff --git a/htdocs/langs/en_IN/cashdesk.lang b/htdocs/langs/en_IN/cashdesk.lang
deleted file mode 100644
index c3ca13bf385..00000000000
--- a/htdocs/langs/en_IN/cashdesk.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cashdesk
-BankToPay=Account for payment
diff --git a/htdocs/langs/en_IN/main.lang b/htdocs/langs/en_IN/main.lang
index 9ffa398137f..2e691473326 100644
--- a/htdocs/langs/en_IN/main.lang
+++ b/htdocs/langs/en_IN/main.lang
@@ -1,9 +1,5 @@
 # Dolibarr language file - Source file is en_US - main
 DIRECTION=ltr
-# Note for Chinese:
-# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
-# stsongstdlight or cid0cs are for simplified Chinese
-# To read Chinese pdf with Linux: sudo apt-get install poppler-data
 FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=.
@@ -23,799 +19,3 @@ FormatDateHourShort=%m/%d/%Y %I:%M %p
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
-DatabaseConnection=Database connection
-NoTemplateDefined=No template defined for this email type
-AvailableVariables=Available substitution variables
-NoTranslation=No translation
-NoRecordFound=No record found
-NoRecordDeleted=No record deleted
-NotEnoughDataYet=Not enough data
-NoError=No error
-Error=Error
-Errors=Errors
-ErrorFieldRequired=Field '%s' is required
-ErrorFieldFormat=Field '%s' has a bad value
-ErrorFileDoesNotExists=File %s does not exist
-ErrorFailedToOpenFile=Failed to open file %s
-ErrorCanNotCreateDir=Cannot create dir %s
-ErrorCanNotReadDir=Cannot read dir %s
-ErrorConstantNotDefined=Parameter %s not defined
-ErrorUnknown=Unknown error
-ErrorSQL=SQL Error
-ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this
-ErrorGoToModuleSetup=Go to Module setup to fix this
-ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
-ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
-ErrorInternalErrorDetected=Error detected
-ErrorWrongHostParameter=Wrong host parameter
-ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post again the form.
-ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child records.
-ErrorWrongValue=Wrong value
-ErrorWrongValueForParameterX=Wrong value for parameter %s
-ErrorNoRequestInError=No request in error
-ErrorServiceUnavailableTryLater=Service not available for 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>.
-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 nb of record per page
-NotAuthorized=You are not authorized to do that.
-SetDate=Set date
-SelectDate=Select a date
-SeeAlso=See also %s
-SeeHere=See here
-Apply=Apply
-BackgroundColorByDefault=Default background color
-FileRenamed=The file was successfully renamed
-FileUploaded=The file was successfully uploaded
-FileGenerated=The file was successfully generated
-FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
-NbOfEntries=Nb of entries
-GoToWikiHelpPage=Read online help (Internet access needed)
-GoToHelpPage=Read help
-RecordSaved=Record saved
-RecordDeleted=Record deleted
-LevelOfFeature=Level of features
-NotDefined=Not defined
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
-Administrator=Administrator
-Undefined=Undefined
-PasswordForgotten=Password forgotten?
-SeeAbove=See above
-HomeArea=Home area
-LastConnexion=Latest connection
-PreviousConnexion=Previous connection
-PreviousValue=Previous value
-ConnectedOnMultiCompany=Connected on environment
-ConnectedSince=Connected since
-AuthenticationMode=Authentication mode
-RequestedUrl=Requested URL
-DatabaseTypeManager=Database type manager
-RequestLastAccessInError=Latest database access request error
-ReturnCodeLastAccessInError=Return code for latest database access request error
-InformationLastAccessInError=Information for latest database access request error
-DolibarrHasDetectedError=Dolibarr has detected a technical error
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes
-MoreInformation=More information
-TechnicalInformation=Technical information
-TechnicalID=Technical ID
-NotePublic=Note (public)
-NotePrivate=Note (private)
-PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
-DoTest=Test
-ToFilter=Filter
-NoFilter=No filter
-WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance delay.
-yes=yes
-Yes=Yes
-no=no
-No=No
-All=All
-Home=Home
-Help=Help
-OnlineHelp=Online help
-PageWiki=Wiki page
-MediaBrowser=Media browser
-Always=Always
-Never=Never
-Under=under
-Period=Period
-PeriodEndDate=End date for period
-Activate=Activate
-Activated=Activated
-Closed=Closed
-Closed2=Closed
-NotClosed=Not closed
-Enabled=Enabled
-Deprecated=Deprecated
-Disable=Disable
-Disabled=Disabled
-Add=Add
-AddLink=Add link
-RemoveLink=Remove link
-AddToDraft=Add to draft
-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>?
-Delete=Delete
-Remove=Remove
-Resiliate=Terminate
-Cancel=Cancel
-Modify=Modify
-Edit=Edit
-Validate=Validate
-ValidateAndApprove=Validate and Approve
-ToValidate=To validate
-Save=Save
-SaveAs=Save As
-TestConnection=Test connection
-ToClone=Clone
-ConfirmClone=Choose data you want to clone :
-NoCloneOptionsSpecified=No data to clone defined.
-Of=of
-Go=Go
-Run=Run
-CopyOf=Copy of
-Show=Show
-Hide=Hide
-ShowCardHere=Show card
-Search=Search
-SearchOf=Search
-Valid=Valid
-Approve=Approve
-Disapprove=Disapprove
-ReOpen=Re-Open
-Upload=Send file
-ToLink=Link
-Select=Select
-Choose=Choose
-Resize=Resize
-Recenter=Recenter
-Author=Author
-User=User
-Users=Users
-Group=Group
-Groups=Groups
-NoUserGroupDefined=No user group defined
-Password=Password
-PasswordRetype=Retype your password
-NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
-Name=Name
-Person=Person
-Parameter=Parameter
-Parameters=Parameters
-Value=Value
-PersonalValue=Personal value
-NewValue=New value
-CurrentValue=Current value
-Code=Code
-Type=Type
-Language=Language
-MultiLanguage=Multi-language
-Note=Note
-Title=Title
-Label=Label
-RefOrLabel=Ref. or label
-Info=Log
-Family=Family
-Description=Description
-Designation=Description
-Model=Doc template
-DefaultModel=Default doc template
-Action=Event
-About=About
-Number=Number
-NumberByMonth=Number by month
-AmountByMonth=Amount by month
-Numero=Number
-Limit=Limit
-Limits=Limits
-Logout=Logout
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Connection
-Setup=Setup
-Alert=Alert
-Previous=Previous
-Next=Next
-Cards=Cards
-Card=Card
-Now=Now
-HourStart=Start hour
-Date=Date
-DateAndHour=Date and hour
-DateToday=Today's date
-DateReference=Reference date
-DateStart=Start date
-DateEnd=End date
-DateCreation=Creation date
-DateCreationShort=Creat. date
-DateModification=Modification date
-DateModificationShort=Modif. date
-DateLastModification=Latest modification date
-DateValidation=Validation date
-DateClosing=Closing date
-DateDue=Due date
-DateValue=Value date
-DateValueShort=Value date
-DateOperation=Operation date
-DateOperationShort=Oper. Date
-DateLimit=Limit date
-DateRequest=Request date
-DateProcess=Process date
-DateBuild=Report build date
-DatePayment=Date of payment
-DateApprove=Approving date
-DateApprove2=Approving date (second approval)
-UserCreation=Creation user
-UserModification=Modification user
-UserCreationShort=Creat. user
-UserModificationShort=Modif. user
-DurationYear=year
-DurationMonth=month
-DurationWeek=week
-DurationDay=day
-DurationYears=years
-DurationMonths=months
-DurationWeeks=weeks
-DurationDays=days
-Year=Year
-Month=Month
-Week=Week
-WeekShort=Week
-Day=Day
-Hour=Hour
-Minute=Minute
-Second=Second
-Years=Years
-Months=Months
-Days=Days
-days=days
-Hours=Hours
-Minutes=Minutes
-Seconds=Seconds
-Weeks=Weeks
-Today=Today
-Yesterday=Yesterday
-Tomorrow=Tomorrow
-Morning=Morning
-Afternoon=Afternoon
-Quadri=Quadri
-MonthOfDay=Month of the day
-HourShort=H
-MinuteShort=mn
-Rate=Rate
-CurrencyRate=Currency conversion rate
-UseLocalTax=Include tax
-Bytes=Bytes
-KiloBytes=Kilobytes
-MegaBytes=Megabytes
-GigaBytes=Gigabytes
-TeraBytes=Terabytes
-b=b.
-Kb=Kb
-Mb=Mb
-Gb=Gb
-Tb=Tb
-Cut=Cut
-Copy=Copy
-Paste=Paste
-Default=Default
-DefaultValue=Default value
-Price=Price
-UnitPrice=Unit price
-UnitPriceHT=Unit price (net)
-UnitPriceTTC=Unit price
-PriceU=U.P.
-PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (currency)
-PriceUTTC=U.P. (inc. tax)
-Amount=Amount
-AmountInvoice=Invoice amount
-AmountPayment=Payment amount
-AmountHTShort=Amount (net)
-AmountTTCShort=Amount (inc. tax)
-AmountHT=Amount (net of tax)
-AmountTTC=Amount (inc. tax)
-AmountVAT=Amount tax
-MulticurrencyAlreadyPaid=Already payed, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
-MulticurrencyAmountHT=Amount (net of tax), original currency
-MulticurrencyAmountTTC=Amount (inc. of tax), original currency
-MulticurrencyAmountVAT=Amount tax, original currency
-AmountLT1=Amount tax 2
-AmountLT2=Amount tax 3
-AmountLT1ES=Amount RE
-AmountLT2ES=Amount IRPF
-AmountTotal=Total amount
-AmountAverage=Average amount
-PriceQtyMinHT=Price quantity min. (net of tax)
-Percentage=Percentage
-Total=Total
-SubTotal=Subtotal
-TotalHTShort=Total (net)
-TotalHTShortCurrency=Total (net in currency)
-TotalTTCShort=Total (inc. tax)
-TotalHT=Total (net of tax)
-TotalHTforthispage=Total (net of tax) for this page
-Totalforthispage=Total for this page
-TotalTTC=Total (inc. tax)
-TotalTTCToYourCredit=Total (inc. tax) to your credit
-TotalVAT=Total tax
-TotalLT1=Total tax 2
-TotalLT2=Total tax 3
-TotalLT1ES=Total RE
-TotalLT2ES=Total IRPF
-HT=Net of tax
-TTC=Inc. tax
-VAT=Sales tax
-VATs=Sales taxes
-LT1ES=RE
-LT2ES=IRPF
-VATRate=Tax Rate
-Average=Average
-Sum=Sum
-Delta=Delta
-Module=Module
-Option=Option
-List=List
-FullList=Full list
-Statistics=Statistics
-OtherStatistics=Other statistics
-Status=Status
-Favorite=Favorite
-ShortInfo=Info.
-Ref=Ref.
-ExternalRef=Ref. extern
-RefSupplier=Ref. supplier
-RefPayment=Ref. payment
-CommercialProposalsShort=Commercial proposals
-Comment=Comment
-Comments=Comments
-ActionsToDo=Events to do
-ActionsToDoShort=To do
-ActionsDoneShort=Done
-ActionNotApplicable=Not applicable
-ActionRunningNotStarted=To start
-ActionRunningShort=In progress
-ActionDoneShort=Finished
-ActionUncomplete=Uncomplete
-CompanyFoundation=Company/Foundation
-ContactsForCompany=Contacts 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
-NActionsLate=%s late
-RequestAlreadyDone=Request already recorded
-Filter=Filter
-FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
-RemoveFilter=Remove filter
-ChartGenerated=Chart generated
-ChartNotGenerated=Chart not generated
-GeneratedOn=Build on %s
-Generate=Generate
-Duration=Duration
-TotalDuration=Total duration
-Summary=Summary
-DolibarrStateBoard=Statistics
-DolibarrWorkBoard=Work tasks board
-Available=Available
-NotYetAvailable=Not yet available
-NotAvailable=Not available
-Categories=Tags/categories
-Category=Tag/category
-By=By
-From=From
-to=to
-and=and
-or=or
-Other=Other
-Others=Others
-OtherInformations=Other informations
-Quantity=Quantity
-Qty=Qty
-ChangedBy=Changed by
-ApprovedBy=Approved by
-ApprovedBy2=Approved by (second approval)
-Approved=Approved
-Refused=Refused
-ReCalculate=Recalculate
-ResultKo=Failure
-Reporting=Reporting
-Reportings=Reporting
-Draft=Draft
-Drafts=Drafts
-Validated=Validated
-Opened=Opened
-New=New
-Discount=Discount
-Unknown=Unknown
-General=General
-Size=Size
-Received=Received
-Paid=Paid
-Topic=Subject
-ByCompanies=By third parties
-ByUsers=By users
-Links=Links
-Link=Link
-Rejects=Rejects
-Preview=Preview
-NextStep=Next step
-Datas=Data
-None=None
-NoneF=None
-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.
-Photo=Picture
-Photos=Pictures
-AddPhoto=Add picture
-DeletePicture=Picture delete
-ConfirmDeletePicture=Confirm picture deletion?
-Login=Login
-CurrentLogin=Current login
-EnterLoginDetail=Enter login details
-January=January
-February=February
-March=March
-April=April
-May=May
-June=June
-July=July
-August=August
-September=September
-October=October
-November=November
-December=December
-JanuaryMin=Jan
-FebruaryMin=Feb
-MarchMin=Mar
-AprilMin=Apr
-MayMin=May
-JuneMin=Jun
-JulyMin=Jul
-AugustMin=Aug
-SeptemberMin=Sep
-OctoberMin=Oct
-NovemberMin=Nov
-DecemberMin=Dec
-Month01=January
-Month02=February
-Month03=March
-Month04=April
-Month05=May
-Month06=June
-Month07=July
-Month08=August
-Month09=September
-Month10=October
-Month11=November
-Month12=December
-MonthShort01=Jan
-MonthShort02=Feb
-MonthShort03=Mar
-MonthShort04=Apr
-MonthShort05=May
-MonthShort06=Jun
-MonthShort07=Jul
-MonthShort08=Aug
-MonthShort09=Sep
-MonthShort10=Oct
-MonthShort11=Nov
-MonthShort12=Dec
-AttachedFiles=Attached files and documents
-FileTransferComplete=File was uploaded successfuly
-DateFormatYYYYMM=YYYY-MM
-DateFormatYYYYMMDD=YYYY-MM-DD
-DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
-ReportName=Report name
-ReportPeriod=Report period
-ReportDescription=Description
-Report=Report
-Keyword=Keyword
-Origin=Origin
-Legend=Legend
-Fill=Fill
-Reset=Reset
-File=File
-Files=Files
-NotAllowed=Not allowed
-ReadPermissionNotAllowed=Read permission not allowed
-AmountInCurrency=Amount in %s currency
-Example=Example
-Examples=Examples
-NoExample=No example
-FindBug=Report a bug
-NbOfThirdParties=Number of third parties
-NbOfLines=Number of lines
-NbOfObjects=Number of objects
-NbOfObjectReferers=Number of related items
-Referers=Related items
-TotalQuantity=Total quantity
-DateFromTo=From %s to %s
-DateFrom=From %s
-DateUntil=Until %s
-Check=Check
-Uncheck=Uncheck
-Internal=Internal
-External=External
-Internals=Internal
-Externals=External
-Warning=Warning
-Warnings=Warnings
-BuildDoc=Build Doc
-Entity=Environment
-Entities=Entities
-CustomerPreview=Customer preview
-SupplierPreview=Supplier preview
-ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show supplier preview
-RefCustomer=Ref. customer
-Currency=Currency
-InfoAdmin=Information for administrators
-Undo=Undo
-Redo=Redo
-ExpandAll=Expand all
-UndoExpandAll=Undo expand
-Reason=Reason
-FeatureNotYetSupported=Feature not yet supported
-CloseWindow=Close window
-Response=Response
-Priority=Priority
-SendByMail=Send by EMail
-MailSentBy=Email sent by
-TextUsedInTheMessageBody=Email body
-SendAcknowledgementByMail=Send confirmation email
-EMail=E-mail
-NoEMail=No email
-Email=Email
-NoMobilePhone=No mobile phone
-Owner=Owner
-FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
-Refresh=Refresh
-BackToList=Back to list
-GoBack=Go back
-CanBeModifiedIfOk=Can be modified if valid
-CanBeModifiedIfKo=Can be modified if not valid
-ValueIsValid=Value is valid
-ValueIsNotValid=Value is not valid
-RecordCreatedSuccessfully=Record created successfully
-RecordModifiedSuccessfully=Record modified successfully
-RecordsModified=%s record modified
-RecordsDeleted=%s record deleted
-AutomaticCode=Automatic code
-FeatureDisabled=Feature disabled
-MoveBox=Move widget
-Offered=Offered
-NotEnoughPermissions=You don't have permission for this action
-SessionName=Session name
-Method=Method
-Receive=Receive
-CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
-ExpectedValue=Expected Value
-CurrentValue=Current value
-PartialWoman=Partial
-TotalWoman=Total
-NeverReceived=Never received
-Canceled=Canceled
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
-Color=Color
-Documents=Linked files
-Documents2=Documents
-UploadDisabled=Upload disabled
-MenuECM=Documents
-MenuAWStats=AWStats
-MenuMembers=Members
-MenuAgendaGoogle=Google agenda
-ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=No documents saved in this directory
-CurrentUserLanguage=Current language
-CurrentTheme=Current theme
-CurrentMenuManager=Current menu manager
-Browser=Browser
-Layout=Layout
-Screen=Screen
-DisabledModules=Disabled modules
-For=For
-ForCustomer=For customer
-Signature=Signature
-DateOfSignature=Date of signature
-HidePassword=Show command with password hidden
-UnHidePassword=Show real command with clear password
-Root=Root
-Informations=Informations
-Page=Page
-Notes=Notes
-AddNewLine=Add new line
-AddFile=Add file
-FreeZone=Free entry
-FreeLineOfType=Free entry of type
-CloneMainAttributes=Clone object with its main attributes
-PDFMerge=PDF Merge
-Merge=Merge
-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 application at the moment.
-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
-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.
-AccordingToGeoIPDatabase=(according to GeoIP convertion)
-Line=Line
-NotSupported=Not supported
-RequiredField=Required field
-Result=Result
-ToTest=Test
-ValidateBefore=Card must be validated before using this feature
-Visibility=Visibility
-Private=Private
-Hidden=Hidden
-Resources=Resources
-Source=Source
-Prefix=Prefix
-Before=Before
-After=After
-IPAddress=IP address
-Frequency=Frequency
-IM=Instant messaging
-NewAttribute=New attribute
-AttributeCode=Attribute code
-URLPhoto=URL of photo/logo
-SetLinkToAnotherThirdParty=Link to another third party
-LinkTo=Link to
-LinkToProposal=Link to proposal
-LinkToOrder=Link to order
-LinkToInvoice=Link to invoice
-LinkToSupplierOrder=Link to supplier order
-LinkToSupplierProposal=Link to supplier proposal
-LinkToSupplierInvoice=Link to supplier invoice
-LinkToContract=Link to contract
-LinkToIntervention=Link to intervention
-CreateDraft=Create draft
-SetToDraft=Back to draft
-ClickToEdit=Click to edit
-ObjectDeleted=Object %s deleted
-ByCountry=By country
-ByTown=By town
-ByDate=By date
-ByMonthYear=By month/year
-ByYear=By year
-ByMonth=By month
-ByDay=By day
-BySalesRepresentative=By sales representative
-LinkedToSpecificUsers=Linked to a particular user contact
-NoResults=No results
-AdminTools=Admin tools
-SystemTools=System tools
-ModulesSystemTools=Modules tools
-Test=Test
-Element=Element
-NoPhotoYet=No pictures available yet
-Dashboard=Dashboard
-MyDashboard=My dashboard
-Deductible=Deductible
-from=from
-toward=toward
-Access=Access
-SelectAction=Select action
-HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
-SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
-OriginFileName=Original filename
-SetDemandReason=Set source
-SetBankAccount=Define Bank Account
-AccountCurrency=Account Currency
-ViewPrivateNote=View notes
-XMoreLines=%s line(s) hidden
-PublicUrl=Public URL
-AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
-PrintFile=Print File %s
-ShowTransaction=Show entry on bank account
-GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
-Deny=Deny
-Denied=Denied
-ListOfTemplates=List of templates
-Gender=Gender
-Genderman=Man
-Genderwoman=Woman
-ViewList=List view
-Mandatory=Mandatory
-Hello=Hello
-Sincerely=Sincerely
-DeleteLine=Delete line
-ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
-NoRecordSelected=No record selected
-MassFilesArea=Area for files built by mass actions
-ShowTempMassFilesArea=Show area of files built by mass actions
-RelatedObjects=Related Objects
-ClassifyBilled=Classify billed
-Progress=Progress
-ClickHere=Click here
-FrontOffice=Front office
-BackOffice=Back office
-View=View
-Export=Export
-Exports=Exports
-ExportFilteredList=Export filtered list
-ExportList=Export list
-Miscellaneous=Miscellaneous
-Calendar=Calendar
-GroupBy=Group by...
-ViewFlatList=View flat list
-RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Direct download link
-Download=Download
-ActualizeCurrency=Update currency rate
-Fiscalyear=Fiscal year
-# Week day
-Monday=Monday
-Tuesday=Tuesday
-Wednesday=Wednesday
-Thursday=Thursday
-Friday=Friday
-Saturday=Saturday
-Sunday=Sunday
-MondayMin=Mo
-TuesdayMin=Tu
-WednesdayMin=We
-ThursdayMin=Th
-FridayMin=Fr
-SaturdayMin=Sa
-SundayMin=Su
-Day1=Monday
-Day2=Tuesday
-Day3=Wednesday
-Day4=Thursday
-Day5=Friday
-Day6=Saturday
-Day0=Sunday
-ShortMonday=M
-ShortTuesday=T
-ShortWednesday=W
-ShortThursday=T
-ShortFriday=F
-ShortSaturday=S
-ShortSunday=S
-SelectMailModel=Select email template
-SetRef=Set ref
-Select2ResultFoundUseArrows=Some results found. Use arrows to select.
-Select2NotFound=No result found
-Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
-Select2LoadingMoreResults=Loading more results...
-Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
-SearchIntoContacts=Contacts
-SearchIntoMembers=Members
-SearchIntoUsers=Users
-SearchIntoProductsOrServices=Products or services
-SearchIntoProjects=Projects
-SearchIntoTasks=Tasks
-SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
-SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
-SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
-SearchIntoInterventions=Interventions
-SearchIntoContracts=Contracts
-SearchIntoCustomerShipments=Customer shipments
-SearchIntoExpenseReports=Expense reports
-SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/en_IN/trips.lang b/htdocs/langs/en_IN/trips.lang
deleted file mode 100644
index 288b8de2315..00000000000
--- a/htdocs/langs/en_IN/trips.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - trips
-ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
diff --git a/htdocs/langs/es_AR/accountancy.lang b/htdocs/langs/es_AR/accountancy.lang
deleted file mode 100644
index 527f1fd139d..00000000000
--- a/htdocs/langs/es_AR/accountancy.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-AccountingCategory=Accounting category
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
diff --git a/htdocs/langs/es_AR/admin.lang b/htdocs/langs/es_AR/admin.lang
index 9602601e241..1c53b65c99c 100644
--- a/htdocs/langs/es_AR/admin.lang
+++ b/htdocs/langs/es_AR/admin.lang
@@ -1,1665 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
-Foundation=Foundation
-Version=Version
-VersionProgram=Version program
-VersionLastInstall=Initial install version
-VersionLastUpgrade=Latest version upgrade
-VersionExperimental=Experimental
-VersionDevelopment=Development
-VersionUnknown=Unknown
-VersionRecommanded=Recommended
-FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. Value of some setup constants may also be checked. You can use this tool to detect if some files were modified by a hacker for example.
-FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
-GlobalChecksum=Global checksum
-MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
-LocalSignature=Embedded local signature (less reliable)
-RemoteSignature=Remote distant signature (more reliable)
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FilesModified=Modified Files
-FilesAdded=Added Files
-FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
-XmlNotFound=Xml Integrity File of application not found
-SessionId=Session ID
-SessionSaveHandler=Handler to save sessions
-SessionSavePath=Storage session localization
-PurgeSessions=Purge of sessions
-ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
-NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow to list all running sessions.
-LockNewSessions=Lock new connections
-ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself. Only user <b>%s</b> will be able to connect after that.
-UnlockNewSessions=Remove connection lock
-YourSession=Your session
-Sessions=Users session
-WebUserGroup=Web server user/group
-NoSessionFound=Your PHP seems to not allow to list active sessions. Directory used to save sessions (<b>%s</b>) might be protected (For example, by OS permissions or by PHP directive open_basedir).
-DBStoringCharset=Database charset to store data
-DBSortingCharset=Database charset to sort data
-WarningModuleNotActive=Module <b>%s</b> must be enabled
-WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page.
-DolibarrSetup=Dolibarr install or upgrade
-InternalUser=Internal user
-ExternalUser=External user
-InternalUsers=Internal users
-ExternalUsers=External users
-GUISetup=Display
-SetupArea=Setup area
-FormToTestFileUploadForm=Form to test file upload (according to setup)
-IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
-RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
-RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any usage of update tool.
-SecuritySetup=Security setup
-SecurityFilesDesc=Define here options related to security about uploading files.
-ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
-ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
-ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is not supported.
-DictionarySetup=Dictionary setup
-Dictionary=Dictionaries
-ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
-ErrorCodeCantContainZero=Code can't contain value 0
-DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
-UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties, but it is less convenient)
-DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact, but it is less convenient)
-NumberOfKeyToSearch=Nbr of characters to trigger search: %s
-NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
-AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
-JavascriptDisabled=JavaScript disabled
-UsePreviewTabs=Use preview tabs
-ShowPreview=Show preview
-PreviewNotAvailable=Preview not available
-ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
-MySQLTimeZone=TimeZone MySql (database)
-TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
-Space=Space
-Table=Table
-Fields=Fields
-Index=Index
-Mask=Mask
-NextValue=Next value
-NextValueForInvoices=Next value (invoices)
-NextValueForCreditNotes=Next value (credit notes)
-NextValueForDeposit=Next value (deposit)
-NextValueForReplacements=Next value (replacements)
-MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to <b>%s</b> %s, whatever this parameter's value is
-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
-AntiVirusParam= More parameters on command line
-AntiVirusParamExample= Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
-ComptaSetup=Accounting module setup
-UserSetup=User management setup
-MultiCurrencySetup=Multi-currency setup
-MenuLimits=Limits and accuracy
-MenuIdParent=Parent menu ID
-DetailMenuIdParent=ID of parent menu (empty for a top menu)
-DetailPosition=Sort number to define menu position
-AllMenus=All
-NotConfigured=Module not configured
-Active=Active
-SetupShort=Setup
-OtherOptions=Other options
-OtherSetup=Other setup
-CurrentValueSeparatorDecimal=Decimal separator
-CurrentValueSeparatorThousand=Thousand separator
-Destination=Destination
-IdModule=Module ID
-IdPermissions=Permissions ID
-Modules=Modules
-LanguageBrowserParameter=Parameter %s
-LocalisationDolibarrParameters=Localisation parameters
-ClientTZ=Client Time Zone (user)
-ClientHour=Client time (user)
-OSTZ=Server OS Time Zone
-PHPTZ=PHP server Time Zone
-DaylingSavingTime=Daylight saving time
-CurrentHour=PHP Time (server)
-CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
-Box=Widget
-Boxes=Widgets
-MaxNbOfLinesForBoxes=Max number of lines for widgets
-PositionByDefault=Default order
-Position=Position
-MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
-MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br />Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
-MenuForUsers=Menu for users
-LangFile=.lang file
-System=System
-SystemInfo=System information
-SystemToolsArea=System tools area
-SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for.
-Purge=Purge
-PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
-PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
-PurgeDeleteTemporaryFilesShort=Delete temporary files
-PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory <b>%s</b>. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted.
-PurgeRunNow=Purge now
-PurgeNothingToDelete=No directory or files to delete.
-PurgeNDirectoriesDeleted=<b>%s</b> files or directories deleted.
-PurgeAuditEvents=Purge all security events
-ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
-GenerateBackup=Generate backup
-Backup=Backup
-Restore=Restore
-RunCommandSummary=Backup has been launched with the following command
-BackupResult=Backup result
-BackupFileSuccessfullyCreated=Backup file successfully generated
-YouCanDownloadBackupFile=Generated files can now be downloaded
-NoBackupFileAvailable=No backup files available.
-ExportMethod=Export method
-ImportMethod=Import method
-ToBuildBackupFileClickHere=To build a backup file, click <a href="%s">here</a>.
-ImportMySqlDesc=To import a backup file, you must use mysql command from command line:
-ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line:
-ImportMySqlCommand=%s %s < mybackupfile.sql
-ImportPostgreSqlCommand=%s %s mybackupfile.sql
-FileNameToGenerate=File name to generate
-Compression=Compression
-CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
-CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
-ExportCompatibility=Compatibility of generated export file
-MySqlExportParameters=MySQL export parameters
-PostgreSqlExportParameters= PostgreSQL export parameters
-UseTransactionnalMode=Use transactional mode
-FullPathToMysqldumpCommand=Full path to mysqldump command
-FullPathToPostgreSQLdumpCommand=Full path to pg_dump command
-ExportOptions=Export Options
-AddDropDatabase=Add DROP DATABASE command
-AddDropTable=Add DROP TABLE command
-ExportStructure=Structure
-NameColumn=Name columns
-ExtendedInsert=Extended INSERT
-NoLockBeforeInsert=No lock commands around INSERT
-DelayedInsert=Delayed insert
-EncodeBinariesInHexa=Encode binary data in hexadecimal
-IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
-AutoDetectLang=Autodetect (browser language)
-FeatureDisabledInDemo=Feature disabled in demo
-FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Permissions
-BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
-OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
-ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external modules...
-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 (Note: anyone experienced in PHP programming can provide custom development for an open source project)
-WebSiteDesc=Reference websites to find more modules...
-URL=Link
-BoxesAvailable=Widgets available
-BoxesActivated=Widgets activated
-ActivateOn=Activate on
-ActiveOn=Activated on
-SourceFile=Source file
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
-Required=Required
-UsedOnlyWithTypeOption=Used by some agenda option only
-Security=Security
-Passwords=Passwords
-DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
-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 (Activated 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 make building of a global cumulated pdf not working (like unpaid invoices).
-Feature=Feature
-DolibarrLicense=License
-Developpers=Developers/contributors
-OfficialWebSite=Dolibarr international official web site
-OfficialWebSiteLocal=Local web site (%s)
-OfficialWiki=Dolibarr documentation on Wiki
-OfficialDemo=Dolibarr online demo
-OfficialMarketPlace=Official market place for external modules/addons
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
-ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
-HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
-HelpCenterDesc2=Some part of this service are available in <b>english only</b>.
-CurrentMenuHandler=Current menu handler
-MeasuringUnit=Measuring unit
-LeftMargin=Left margin
-TopMargin=Top margin
-PaperSize=Paper type
-Orientation=Orientation
-SpaceX=Space X
-SpaceY=Space Y
-FontSize=Font size
-Content=Content
-NoticePeriod=Notice period
-NewByMonth=New by month
-Emails=E-mails
-EMailsSetup=E-mails setup
-EMailsDesc=This page allows you to overwrite your PHP parameters for e-mails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless.
-MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
-MAIN_MAIL_EMAIL_FROM=Sender e-mail for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Sender e-mail used for error returns emails sent
-MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
-MAIN_DISABLE_ALL_MAILS=Disable all e-mails sendings (for test purposes or demos)
-MAIN_MAIL_SENDMODE=Method to use to send EMails
-MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
-MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
-MAIN_MAIL_EMAIL_TLS= Use TLS (SSL) encrypt
-MAIN_MAIL_EMAIL_STARTTLS= Use TLS (STARTTLS) encrypt
-MAIN_DISABLE_ALL_SMS=Disable all SMS sendings (for test purposes or demos)
-MAIN_SMS_SENDMODE=Method to use to send SMS
-MAIN_MAIL_SMS_FROM=Default sender phone number for Sms sending
-MAIN_MAIL_DEFAULT_FROMTYPE=Sender e-mail by default for manual sendings (User email or Company email)
-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/
-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 setup
-ModuleFamilyBase=System
-ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
-ModuleFamilyProducts=Products Management (PM)
-ModuleFamilyHr=Human Resource Management (HR)
-ModuleFamilyProjects=Projects/Collaborative work
-ModuleFamilyOther=Other
-ModuleFamilyTechnic=Multi-modules tools
-ModuleFamilyExperimental=Experimental modules
-ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
-ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
-ModuleFamilyInterface=Interfaces with external systems
-MenuHandlers=Menu handlers
-MenuAdmin=Menu editor
-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).
-DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <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>.
-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='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
-YouCanSubmitFile=For this step, you can send package using this tool: Select module file
-CurrentVersion=Dolibarr current version
-CallUpdatePage=Go to the page that updates the database structure and data: %s.
-LastStableVersion=Latest stable version
-LastActivationDate=Latest activation date
-UpdateServerOffline=Update server offline
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
-GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
-GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
-ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
-ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
-DoTestServerAvailability=Test server connectivity
-DoTestSend=Test sending
-DoTestSendHTML=Test sending HTML
-ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
-ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
-UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
-UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
-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...).
-MinLength=Minimum length
-LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
-ExamplesWithCurrentSetup=Examples with current running setup
-ListOfDirectories=List of OpenDocument templates directories
-ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
-NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories
+AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
+AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 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.
-ThemeDir=Skins directory
-ConnectionTimeout=Connexion timeout
-ResponseTimeout=Response timeout
-SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__
-ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
-SecurityToken=Key to secure URLs
-NoSmsEngine=No SMS sender manager available. SMS sender manager are not installed with default distribution (because they depends on an external supplier) but you can find some on %s
-PDF=PDF
-PDFDesc=You can set each global options related to the PDF generation
-PDFAddressForging=Rules to forge address boxes
-HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF
-HideDescOnPDF=Hide products description on generated PDF
-HideRefOnPDF=Hide products ref. on generated PDF
-HideDetailsOnPDF=Hide product lines details on generated PDF
-PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
-Library=Library
-UrlGenerationParameters=Parameters to secure URLs
-SecurityTokenIsUnique=Use a unique securekey parameter for each URL
-EnterRefToBuildUrl=Enter reference for object %s
-GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons to 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
-MassConvert=Launch mass convert
-String=String
-TextLong=Long text
-Int=Integer
-Float=Float
-DateAndTime=Date and hour
-Unique=Unique
-Boolean=Boolean (Checkbox)
-ExtrafieldPhone = Phone
-ExtrafieldPrice = Price
-ExtrafieldMail = Email
-ExtrafieldUrl = Url
-ExtrafieldSelect = Select list
-ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
-ExtrafieldPassword=Password
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
-ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
-LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
-SMS=SMS
-LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
-RefreshPhoneLink=Refresh link
-LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
-KeepEmptyToUseDefault=Keep empty to use default value
-DefaultLink=Default link
-SetAsDefault=Set as default
-ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
-BarcodeInitForThirdparties=Mass barcode init for thirdparties
-BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Init value for next %s empty records
-EraseAllCurrentBarCode=Erase all current barcode values
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
-AllBarcodeReset=All barcode values have been removed
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into 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
-DisplayCompanyInfo=Display company address
-DisplayCompanyManagers=Display manager names
-DisplayCompanyInfoAndManagers=Display company address and manager names
-EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
-ModuleCompanyCodePanicum=Return an empty accountancy code.
-ModuleCompanyCodeDigitaria=Accountancy 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: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-ClickToShowDescription=Click to show description
-# Modules
-Module0Name=Users & groups
-Module0Desc=Users / Employees and Groups management
-Module1Name=Third parties
-Module1Desc=Companies and contact management (customers, prospects...)
-Module2Name=Commercial
-Module2Desc=Commercial management
-Module10Name=Accounting
-Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
-Module20Name=Proposals
-Module20Desc=Commercial proposal management
-Module22Name=Mass E-mailings
-Module22Desc=Mass E-mailing management
-Module23Name=Energy
-Module23Desc=Monitoring the consumption of energies
-Module25Name=Customer Orders
-Module25Desc=Customer order management
-Module30Name=Invoices
-Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
-Module40Name=Suppliers
-Module40Desc=Supplier management and buying (orders and invoices)
-Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
-Module49Name=Editors
-Module49Desc=Editor management
-Module50Name=Products
-Module50Desc=Product management
-Module51Name=Mass mailings
-Module51Desc=Mass paper mailing management
-Module52Name=Stocks
-Module52Desc=Stock management (products)
-Module53Name=Services
-Module53Desc=Service management
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
-Module55Name=Barcodes
-Module55Desc=Barcode management
-Module56Name=Telephony
-Module56Desc=Telephony integration
-Module57Name=Direct bank payment orders
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
-Module58Name=ClickToDial
-Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
-Module70Name=Interventions
-Module70Desc=Intervention management
-Module75Name=Expense and trip notes
-Module75Desc=Expense and trip notes management
-Module80Name=Shipments
-Module80Desc=Shipments and delivery order management
-Module85Name=Banks and cash
-Module85Desc=Management of bank or cash accounts
-Module100Name=External site
-Module100Desc=This module include an external web site or page into Dolibarr menus and view it into a Dolibarr frame
-Module105Name=Mailman and SPIP
-Module105Desc=Mailman or SPIP interface for member module
-Module200Name=LDAP
-Module200Desc=LDAP directory synchronisation
-Module210Name=PostNuke
-Module210Desc=PostNuke integration
-Module240Name=Data exports
-Module240Desc=Tool to export Dolibarr data (with assistants)
-Module250Name=Data imports
-Module250Desc=Tool to import data in Dolibarr  (with assistants)
-Module310Name=Members
-Module310Desc=Foundation members management
-Module320Name=RSS Feed
-Module320Desc=Add RSS feed inside Dolibarr screen pages
-Module330Name=Bookmarks
-Module330Desc=Bookmarks management
-Module400Name=Projects/Opportunities/Leads
-Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
-Module410Name=Webcalendar
-Module410Desc=Webcalendar integration
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
-Module520Name=Loan
-Module520Desc=Management of loans
-Module600Name=Notifications
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
-Module700Name=Donations
-Module700Desc=Donation management
-Module770Name=Expense reports
-Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
-Module1200Name=Mantis
-Module1200Desc=Mantis integration
-Module1400Name=Accounting
-Module1400Desc=Accounting management (double parties)
-Module1520Name=Document Generation
-Module1520Desc=Mass mail document generation
-Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
-Module2000Name=WYSIWYG editor
-Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
-Module2200Name=Dynamic Prices
-Module2200Desc=Enable the usage of math expressions for prices
-Module2300Name=Cron
-Module2300Desc=Scheduled job management
-Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
-Module2500Name=Electronic Content Management
-Module2500Desc=Save and share documents
-Module2600Name=API/Web services (SOAP server)
-Module2600Desc=Enable the Dolibarr SOAP server providing API services
-Module2610Name=API/Web services (REST server)
-Module2610Desc=Enable the Dolibarr REST server providing API services
-Module2660Name=Call WebServices (SOAP client)
-Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
-Module2700Name=Gravatar
-Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
-Module2800Desc=FTP Client
-Module2900Name=GeoIPMaxmind
-Module2900Desc=GeoIP Maxmind conversions capabilities
-Module3100Name=Skype
-Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
-Module4000Name=HRM
-Module4000Desc=Human resources management
-Module5000Name=Multi-company
-Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management
-Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
-Module20000Name=Leave Requests management
-Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Product lot
-Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
-Module50000Name=PayBox
-Module50000Desc=Module to offer an online payment page by credit card with PayBox
-Module50100Name=Point of sales
-Module50100Desc=Point of sales module (POS).
-Module50200Name=Paypal
-Module50200Desc=Module to offer an online payment page by credit card with Paypal
-Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double parties)
-Module54000Name=PrintIPP
-Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
-Module55000Name=Poll, Survey or Vote
-Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
-Module59000Name=Margins
-Module59000Desc=Module to manage margins
-Module60000Name=Commissions
-Module60000Desc=Module to manage commissions
-Module63000Name=Resources
-Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
-Permission11=Read customer invoices
-Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
-Permission14=Validate customer invoices
-Permission15=Send customer invoices by email
-Permission16=Create payments for customer invoices
-Permission19=Delete customer invoices
-Permission21=Read commercial proposals
-Permission22=Create/modify commercial proposals
-Permission24=Validate commercial proposals
-Permission25=Send commercial proposals
-Permission26=Close commercial proposals
-Permission27=Delete commercial proposals
-Permission28=Export commercial proposals
-Permission31=Read products
-Permission32=Create/modify products
-Permission34=Delete products
-Permission36=See/manage hidden products
-Permission38=Export products
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
-Permission44=Delete projects (shared project and projects i'm contact for)
-Permission45=Export projects
-Permission61=Read interventions
-Permission62=Create/modify interventions
-Permission64=Delete interventions
-Permission67=Export interventions
-Permission71=Read members
-Permission72=Create/modify members
-Permission74=Delete members
-Permission75=Setup types of membership
-Permission76=Export data
-Permission78=Read subscriptions
-Permission79=Create/modify subscriptions
-Permission81=Read customers orders
-Permission82=Create/modify customers orders
-Permission84=Validate customers orders
-Permission86=Send customers orders
-Permission87=Close customers orders
-Permission88=Cancel customers orders
-Permission89=Delete customers orders
-Permission91=Read social or fiscal taxes and vat
-Permission92=Create/modify social or fiscal taxes and vat
-Permission93=Delete social or fiscal taxes and vat
-Permission94=Export social or fiscal taxes
-Permission95=Read reports
-Permission101=Read sendings
-Permission102=Create/modify sendings
-Permission104=Validate sendings
-Permission106=Export sendings
-Permission109=Delete sendings
-Permission111=Read financial accounts
-Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
-Permission114=Reconciliate transactions
-Permission115=Export transactions and account statements
-Permission116=Transfers between accounts
-Permission117=Manage cheques dispatching
-Permission121=Read third parties linked to user
-Permission122=Create/modify third parties linked to user
-Permission125=Delete third parties linked to user
-Permission126=Export third parties
-Permission141=Read all projects and tasks (also private projects i am not contact for)
-Permission142=Create/modify all projects and tasks (also private projects i am not 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
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
-Permission167=Export contracts
-Permission171=Read trips and expenses (yours and your subordinates)
-Permission172=Create/modify trips and expenses
-Permission173=Delete trips and expenses
-Permission174=Read all trips and expenses
-Permission178=Export trips and expenses
-Permission180=Read suppliers
-Permission181=Read supplier orders
-Permission182=Create/modify supplier orders
-Permission183=Validate supplier orders
-Permission184=Approve supplier orders
-Permission185=Order or cancel supplier orders
-Permission186=Receive supplier orders
-Permission187=Close supplier orders
-Permission188=Cancel supplier orders
-Permission192=Create lines
-Permission193=Cancel lines
-Permission194=Read the bandwith lines
-Permission202=Create ADSL connections
-Permission203=Order connections orders
-Permission204=Order connections
-Permission205=Manage connections
-Permission206=Read connections
-Permission211=Read Telephony
-Permission212=Order lines
-Permission213=Activate line
-Permission214=Setup Telephony
-Permission215=Setup providers
-Permission221=Read emailings
-Permission222=Create/modify emailings (topic, recipients...)
-Permission223=Validate emailings (allows sending)
-Permission229=Delete emailings
-Permission237=View recipients and info
-Permission238=Manually send mailings
-Permission239=Delete mailings after validation or sent
-Permission241=Read categories
-Permission242=Create/modify categories
-Permission243=Delete categories
-Permission244=See the contents of the hidden categories
-Permission251=Read other users and groups
-PermissionAdvanced251=Read other users
-Permission252=Read permissions of other users
-Permission253=Create/modify other users, groups and permisssions
-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 assignement matters).
-Permission271=Read CA
-Permission272=Read invoices
-Permission273=Issue invoices
-Permission281=Read contacts
-Permission282=Create/modify contacts
-Permission283=Delete contacts
-Permission286=Export contacts
-Permission291=Read tariffs
-Permission292=Set permissions on the tariffs
-Permission293=Modify costumers tariffs
-Permission300=Read bar codes
-Permission301=Create/modify bar codes
-Permission302=Delete bar codes
-Permission311=Read services
-Permission312=Assign service/subscription to contract
-Permission331=Read bookmarks
-Permission332=Create/modify bookmarks
-Permission333=Delete bookmarks
-Permission341=Read its own permissions
-Permission342=Create/modify his own user information
-Permission343=Modify his own password
-Permission344=Modify its own permissions
-Permission351=Read groups
-Permission352=Read groups permissions
-Permission353=Create/modify groups
-Permission354=Delete or disable groups
-Permission358=Export users
-Permission401=Read discounts
-Permission402=Create/modify discounts
-Permission403=Validate discounts
-Permission404=Delete discounts
-Permission510=Read Salaries
-Permission512=Create/modify salaries
-Permission514=Delete salaries
-Permission517=Export salaries
-Permission520=Read Loans
-Permission522=Create/modify loans
-Permission524=Delete loans
-Permission525=Access loan calculator
-Permission527=Export loans
-Permission531=Read services
-Permission532=Create/modify services
-Permission534=Delete services
-Permission536=See/manage hidden services
-Permission538=Export services
-Permission701=Read donations
-Permission702=Create/modify donations
-Permission703=Delete donations
-Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
-Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
-Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission779=Export expense reports
-Permission1001=Read stocks
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
-Permission1004=Read stock movements
-Permission1005=Create/modify stock movements
-Permission1101=Read delivery orders
-Permission1102=Create/modify delivery orders
-Permission1104=Validate delivery orders
-Permission1109=Delete delivery orders
-Permission1181=Read suppliers
-Permission1182=Read supplier orders
-Permission1183=Create/modify supplier orders
-Permission1184=Validate supplier orders
-Permission1185=Approve supplier orders
-Permission1186=Order supplier orders
-Permission1187=Acknowledge receipt of supplier orders
-Permission1188=Delete supplier orders
-Permission1190=Approve (second approval) supplier orders
-Permission1201=Get result of an export
-Permission1202=Create/Modify an export
-Permission1231=Read supplier invoices
-Permission1232=Create/modify supplier invoices
-Permission1233=Validate supplier invoices
-Permission1234=Delete supplier invoices
-Permission1235=Send supplier invoices by email
-Permission1236=Export supplier invoices, attributes and payments
-Permission1237=Export supplier orders and their details
-Permission1251=Run mass imports of external data into database (data load)
-Permission1321=Export customer invoices, attributes and payments
-Permission1322=Reopen a paid bill
-Permission1421=Export customer orders and attributes
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
-Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
-Permission20006=Admin leave requests (setup and update balance)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
-Permission2401=Read actions (events or tasks) linked to his account
-Permission2402=Create/modify actions (events or tasks) linked to his account
-Permission2403=Delete actions (events or tasks) linked to his account
-Permission2411=Read actions (events or tasks) of others
-Permission2412=Create/modify actions (events or tasks) of others
-Permission2413=Delete actions (events or tasks) of others
-Permission2414=Export actions/tasks of others
-Permission2501=Read/Download documents
-Permission2502=Download documents
-Permission2503=Submit or delete documents
-Permission2515=Setup documents directories
-Permission2801=Use FTP client in read mode (browse and download only)
-Permission2802=Use FTP client in write mode (delete or upload files)
-Permission50101=Use Point of sales
-Permission50201=Read transactions
-Permission50202=Import transactions
-Permission54001=Print
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
-Permission59003=Read every user margin
-Permission63001=Read resources
-Permission63002=Create/modify resources
-Permission63003=Delete resources
-Permission63004=Link resources to agenda events
-DictionaryCompanyType=Types of thirdparties
-DictionaryCompanyJuridicalType=Legal forms of thirdparties
-DictionaryProspectLevel=Prospect potential level
-DictionaryCanton=State/Province
-DictionaryRegion=Regions
-DictionaryCountry=Countries
-DictionaryCurrency=Currencies
-DictionaryCivility=Personal and professional titles
-DictionaryActions=Types of agenda events
-DictionarySocialContributions=Social or fiscal taxes types
-DictionaryVAT=VAT Rates or Sales Tax Rates
-DictionaryRevenueStamp=Amount of revenue stamps
-DictionaryPaymentConditions=Payment terms
-DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact/Address types
-DictionaryEcotaxe=Ecotax (WEEE)
-DictionaryPaperFormat=Paper formats
-DictionaryFormatCards=Cards formats
-DictionaryFees=Types of fees
-DictionarySendingMethods=Shipping methods
-DictionaryStaff=Staff
-DictionaryAvailability=Delivery delay
-DictionaryOrderMethods=Ordering methods
-DictionarySource=Origin of proposals/orders
-DictionaryAccountancyCategory=Accounting account groups
-DictionaryAccountancysystem=Models for chart of accounts
-DictionaryEMailTemplates=Emails templates
-DictionaryUnits=Units
-DictionaryProspectStatus=Prospection status
-DictionaryHolidayTypes=Types of leaves
-DictionaryOpportunityStatus=Opportunity status for project/lead
-SetupSaved=Setup saved
-BackToModuleList=Back to modules list
-BackToDictionaryList=Back to dictionaries list
-VATManagement=VAT Management
-VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
-VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies.
-VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
-##### Local Taxes #####
-LTRate=Rate
-LocalTax1IsNotUsed=Do not use second tax
-LocalTax1IsUsedDesc=Use a second type of tax (other than VAT)
-LocalTax1IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax1Management=Second type of tax
-LocalTax1IsUsedExample=
-LocalTax1IsNotUsedExample=
-LocalTax2IsNotUsed=Do not use third tax
-LocalTax2IsUsedDesc=Use a third type of tax (other than VAT)
-LocalTax2IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax2Management=Third type of tax
-LocalTax2IsUsedExample=
-LocalTax2IsNotUsedExample=
-LocalTax1ManagementES= RE Management
-LocalTax1IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If te buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
-LocalTax1IsNotUsedDescES= By default the proposed RE is 0. End of rule.
-LocalTax1IsUsedExampleES= In Spain they are professionals subject to some specific sections of the Spanish IAE.
-LocalTax1IsNotUsedExampleES= In Spain they are professional and societies and subject to certain sections of the Spanish IAE.
-LocalTax2ManagementES= IRPF Management
-LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
-LocalTax2IsNotUsedDescES= By default the proposed IRPF is 0. End of rule.
-LocalTax2IsUsedExampleES= In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
-LocalTax2IsNotUsedExampleES= In Spain they are bussines not subject to tax system of modules.
-CalcLocaltax=Reports on local taxes
-CalcLocaltax1=Sales - Purchases
-CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2=Purchases
-CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3=Sales
-CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
-LabelUsedByDefault=Label used by default if no translation can be found for code
-LabelOnDocuments=Label on documents
-NbOfDays=Nb of days
-AtEndOfMonth=At end of month
-CurrentNext=Current/Next
-Offset=Offset
-AlwaysActive=Always active
-Upgrade=Upgrade
-MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Deploy/install external module
-WebServer=Web server
-DocumentRootServer=Web server's root directory
-DataRootServer=Data files directory
-IP=IP
-Port=Port
-VirtualServerName=Virtual server name
-OS=OS
-PhpWebLink=Web-Php link
-Browser=Browser
-Server=Server
-Database=Database
-DatabaseServer=Database host
-DatabaseName=Database name
-DatabasePort=Database port
-DatabaseUser=Database user
-DatabasePassword=Database password
-Tables=Tables
-TableName=Table name
-NbOfRecord=Nb of records
-Host=Server
-DriverType=Driver type
-SummarySystem=System information summary
-SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Foundation
-DefaultMenuManager= Standard menu manager
-DefaultMenuSmartphoneManager=Smartphone menu manager
-Skin=Skin theme
-DefaultSkin=Default skin theme
-MaxSizeList=Max length for list
-DefaultMaxSizeList=Default max length for lists
-DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
-MessageOfDay=Message of the day
-MessageLogin=Login page message
-PermanentLeftSearchForm=Permanent search form on left menu
-DefaultLanguage=Default language to use (language code)
-EnableMultilangInterface=Enable multilingual interface
-EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/foundation information
-CompanyIds=Company/foundation identities
-CompanyName=Name
-CompanyAddress=Address
-CompanyZip=Zip
-CompanyTown=Town
-CompanyCountry=Country
-CompanyCurrency=Main currency
-CompanyObject=Object of the company
-Logo=Logo
-DoNotSuggestPaymentMode=Do not suggest
-NoActiveBankAccountDefined=No active bank account defined
-OwnerOfBankAccount=Owner of bank account %s
-BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show link "<strong>%s</strong>"
-Alerts=Alerts
-DelaysOfToleranceBeforeWarning=Tolerance delays before warning
-DelaysOfToleranceDesc=This screen allows you to define the tolerated delays before an alert is reported on screen with picto %s for each late element.
-Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned events (agenda events) not completed yet
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Delay tolerance (in days) before alert on project not closed in time
-Delays_MAIN_DELAY_TASKS_TODO=Delay tolerance (in days) before alert on planned tasks (project tasks) not completed yet
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on orders not processed yet
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on suppliers orders not processed yet
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Delay tolerance (in days) before alert on proposals to close
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Delay tolerance (in days) before alert on proposals not billed
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerance delay (in days) before alert on services to activate
-Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerance delay (in days) before alert on expired services
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerance delay (in days) before alert on unpaid supplier invoices
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerence delay (in days) before alert on unpaid client invoices
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerance delay (in days) before alert on pending bank reconciliation
-Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed membership fee
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
-Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
-SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
-SetupDescription5=Other menu entries manage optional parameters.
-LogEvents=Security audit events
-Audit=Audit
-InfoDolibarr=About Dolibarr
-InfoBrowser=About Browser
-InfoOS=About OS
-InfoWebServer=About Web Server
-InfoDatabase=About Database
-InfoPHP=About PHP
-InfoPerf=About Performances
-BrowserName=Browser name
-BrowserOS=Browser OS
-ListOfSecurityEvents=List of Dolibarr security events
-SecurityEventsPurged=Security events purged
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
-SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
-SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
-DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
-AvailableModules=Available 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.
-TriggersAvailable=Available triggers
-TriggersDesc=Triggers are files that will modify the behaviour of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realised new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
-TriggerDisabledByName=Triggers in this file are disabled by the <b>-NORUN</b> suffix in their name.
-TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module <b>%s</b> is disabled.
-TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules.
-TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
-GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password
-DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">check here</a>.
-MiscellaneousDesc=All other security related parameters are defined here.
-LimitsSetup=Limits/Precision setup
-LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here
-MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices
-MAIN_MAX_DECIMALS_TOT=Max decimals for total prices
-MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add <b>...</b> after this number if you want to see <b>...</b> when number is truncated when shown on screen)
-MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
-UnitPriceOfProduct=Net unit price of a product
-TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
-ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
-NoEventFoundWithCriteria=No security event has been found for such search criterias.
-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.
-BackupDescX=Archived directory should be stored in a secure place.
-BackupDescY=The generated dump file should be stored in a secure place.
-BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one
-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 directoy (<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=Available database backup dump files
-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
-DownloadMoreSkins=More skins to download
-SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence without hole and with no reset
-ShowProfIdInAddress=Show professionnal id with addresses on documents
-ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents
-TranslationUncomplete=Partial translation
-MAIN_DISABLE_METEO=Disable meteo view
-TestLoginToAPI=Test login to API
-ProxyDesc=Some features of Dolibarr need to have an Internet access to work. Define here parameters for this. If the Dolibarr server is behind a Proxy server, those parameters tells Dolibarr how to access Internet through it.
-ExternalAccess=External access
-MAIN_PROXY_USE=Use a proxy server (otherwise direct access to internet)
-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 all attributes, not already available by default, and that you want to be supported for %s.
-ExtraFields=Complementary attributes
-ExtraFieldsLines=Complementary attributes (lines)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
-ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact/address)
-ExtraFieldsMember=Complementary attributes (member)
-ExtraFieldsMemberType=Complementary attributes (member type)
-ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
-ExtraFieldsSupplierOrders=Complementary attributes (orders)
-ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
-ExtraFieldsProject=Complementary attributes (projects)
-ExtraFieldsProjectTask=Complementary attributes (tasks)
-ExtraFieldHasWrongValue=Attribute %s has a wrong value.
-AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
-SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
-PathToDocuments=Path to documents
-PathDirectory=Directory
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might 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.
-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: <strong>User display setup</strong> tab of 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
-TranslationString=Translation string
-CurrentTranslationString=Current translation string
-WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
-NewTranslationStringToShow=New translation string to show
-OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
-YouMustEnableOneModule=You must at least enable 1 module
-ClassNotFoundIntoPathWarning=Class %s not found into PHP path
-YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
-SuhosinSessionEncrypt=Session storage encrypted by Suhosin
-ConditionIsCurrently=Condition is currently %s
-YouUseBestDriver=You use driver %s that is best driver available currently.
-YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required 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.
-BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance.
-BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
-AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp".
-AskForPreferredShippingMethod=Ask for preferred Sending Method for Third Parties.
-FieldEdition=Edition of field %s
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
-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.
-PasswordGenerationPerso=Return a password according to your personally defined configuration.
-SetupPerso=According to your configuration
-PasswordPatternDesc=Password pattern description
-##### Users setup #####
-RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passwords
-DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page
-UsersSetup=Users module setup
-UserMailRequired=EMail required to create a new user
-##### HRM setup #####
-HRMSetup=HRM module setup
-##### Company setup #####
-CompanySetup=Companies module setup
-CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier)
-AccountCodeManager=Module for accountancy code generation (customer or supplier)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
-NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
-NotificationsDescGlobal=* or by setting global target emails in module setup page.
-ModelModules=Documents templates
-DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
-WatermarkOnDraft=Watermark on draft document
-JSOnPaimentBill=Activate feature to autofill payment lines on payment form
-CompanyIdProfChecker=Rules on Professional Ids
-MustBeUnique=Must be unique?
-MustBeMandatory=Mandatory to create third parties?
-MustBeInvoiceMandatory=Mandatory to validate invoices?
-##### Webcal setup #####
-WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
-##### Invoices #####
-BillsSetup=Invoices module setup
-BillsNumberingModule=Invoices and credit notes numbering model
-BillsPDFModules=Invoice documents models
-CreditNote=Credit note
-CreditNotes=Credit notes
-ForceInvoiceDate=Force invoice date to validation date
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
-SuggestPaymentByRIBOnAccount=Suggest payment by withdraw on account
-SuggestPaymentByChequeToAddress=Suggest payment by cheque to
-FreeLegalTextOnInvoices=Free text on invoices
-WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
-PaymentsNumberingModule=Payments numbering model
-SuppliersPayment=Suppliers payments
-SupplierPaymentSetup=Suppliers payments setup
-##### Proposals #####
-PropalSetup=Commercial proposals module setup
-ProposalsNumberingModules=Commercial proposal numbering models
-ProposalsPDFModules=Commercial proposal documents models
-FreeLegalTextOnProposal=Free text on commercial proposals
-WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
-WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
-##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
-##### Orders #####
-OrdersSetup=Order management setup
-OrdersNumberingModules=Orders numbering models
-OrdersModelModule=Order documents models
-FreeLegalTextOnOrders=Free text on orders
-WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
-ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Interventions #####
-InterventionsSetup=Interventions module setup
-FreeLegalTextOnInterventions=Free text on intervention documents
-FicheinterNumberingModules=Intervention numbering models
-TemplatePDFInterventions=Intervention card documents models
-WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
-##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
-ContractsNumberingModules=Contracts numbering modules
-TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
-##### Members #####
-MembersSetup=Members module setup
-MemberMainOptions=Main options
-AdherentLoginRequired= Manage a Login for each member
-AdherentMailRequired=EMail required to create a new member
-MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
-##### LDAP setup #####
-LDAPSetup=LDAP Setup
-LDAPGlobalParameters=Global parameters
-LDAPUsersSynchro=Users
-LDAPGroupsSynchro=Groups
-LDAPContactsSynchro=Contacts
-LDAPMembersSynchro=Members
-LDAPSynchronization=LDAP synchronisation
-LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP
-LDAPToDolibarr=LDAP -> Dolibarr
-DolibarrToLDAP=Dolibarr -> LDAP
-LDAPNamingAttribute=Key in LDAP
-LDAPSynchronizeUsers=Organization of users in LDAP
-LDAPSynchronizeGroups=Organization of groups in LDAP
-LDAPSynchronizeContacts=Organization of contacts in LDAP
-LDAPSynchronizeMembers=Organization of foundation's members in LDAP
-LDAPPrimaryServer=Primary server
-LDAPSecondaryServer=Secondary server
-LDAPServerPort=Server port
-LDAPServerPortExample=Default port : 389
-LDAPServerProtocolVersion=Protocol version
-LDAPServerUseTLS=Use TLS
-LDAPServerUseTLSExample=Your LDAP server use TLS
-LDAPServerDn=Server DN
-LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
-LDAPPassword=Administrator password
-LDAPUserDn=Users' DN
-LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
-LDAPGroupDn=Groups' DN
-LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com)
-LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
-LDAPServerDnExample=Complete DN (ex: dc=example,dc=com)
-LDAPDnSynchroActive=Users and groups synchronization
-LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization
-LDAPDnContactActive=Contacts' synchronization
-LDAPDnContactActiveExample=Activated/Unactivated synchronization
-LDAPDnMemberActive=Members' synchronization
-LDAPDnMemberActiveExample=Activated/Unactivated synchronization
-LDAPContactDn=Dolibarr contacts' DN
-LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com)
-LDAPMemberDn=Dolibarr members DN
-LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com)
-LDAPMemberObjectClassList=List of objectClass
-LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPUserObjectClassList=List of objectClass
-LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPGroupObjectClassList=List of objectClass
-LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
-LDAPContactObjectClassList=List of objectClass
-LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPTestConnect=Test LDAP connection
-LDAPTestSynchroContact=Test contacts synchronization
-LDAPTestSynchroUser=Test user synchronization
-LDAPTestSynchroGroup=Test group synchronization
-LDAPTestSynchroMember=Test member synchronization
-LDAPTestSearch= Test a LDAP search
-LDAPSynchroOK=Synchronization test successful
-LDAPSynchroKO=Failed synchronization test
-LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that connexion to server is correctly configured and allows LDAP udpates
-LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s)
-LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s)
-LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPBindKO=Connect/Authentificate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPSetupForVersion3=LDAP server configured for version 3
-LDAPSetupForVersion2=LDAP server configured for version 2
-LDAPDolibarrMapping=Dolibarr Mapping
-LDAPLdapMapping=LDAP Mapping
-LDAPFieldLoginUnix=Login (unix)
-LDAPFieldLoginExample=Example : uid
-LDAPFilterConnection=Search filter
-LDAPFilterConnectionExample=Example : &(objectClass=inetOrgPerson)
-LDAPFieldLoginSamba=Login (samba, activedirectory)
-LDAPFieldLoginSambaExample=Example : samaccountname
-LDAPFieldFullname=Full name
-LDAPFieldFullnameExample=Example : cn
-LDAPFieldPasswordNotCrypted=Password not crypted
-LDAPFieldPasswordCrypted=Password crypted
-LDAPFieldPasswordExample=Example : userPassword
-LDAPFieldCommonNameExample=Example : cn
-LDAPFieldName=Name
-LDAPFieldNameExample=Example : sn
-LDAPFieldFirstName=First name
-LDAPFieldFirstNameExample=Example : givenName
-LDAPFieldMail=Email address
-LDAPFieldMailExample=Example : mail
-LDAPFieldPhone=Professional phone number
-LDAPFieldPhoneExample=Example : telephonenumber
-LDAPFieldHomePhone=Personal phone number
-LDAPFieldHomePhoneExample=Example : homephone
-LDAPFieldMobile=Cellular phone
-LDAPFieldMobileExample=Example : mobile
-LDAPFieldFax=Fax number
-LDAPFieldFaxExample=Example : facsimiletelephonenumber
-LDAPFieldAddress=Street
-LDAPFieldAddressExample=Example : street
-LDAPFieldZip=Zip
-LDAPFieldZipExample=Example : postalcode
-LDAPFieldTown=Town
-LDAPFieldTownExample=Example : l
-LDAPFieldCountry=Country
-LDAPFieldDescription=Description
-LDAPFieldDescriptionExample=Example : description
-LDAPFieldNotePublic=Public Note
-LDAPFieldNotePublicExample=Example : publicnote
-LDAPFieldGroupMembers= Group members
-LDAPFieldGroupMembersExample= Example : uniqueMember
-LDAPFieldBirthdate=Birthdate
-LDAPFieldCompany=Company
-LDAPFieldCompanyExample=Example : o
-LDAPFieldSid=SID
-LDAPFieldSidExample=Example : objectsid
-LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Job position
-LDAPFieldTitleExample=Example: title
-LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
-LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
-LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts.
-LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users.
-LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups.
-LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module.
-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 advices related to performance.
-NotInstalled=Not installed, so your server is not slow 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.
-MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
-MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
-OPCodeCache=OPCode cache
-NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad).
-HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
-FilesOfTypeCached=Files of type %s are cached by HTTP server
-FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
-FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
-FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
-CacheByServer=Cache by server
-CacheByClient=Cache by browser
-CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
-##### Products #####
-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)
-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 third party language
-UseSearchToSelectProductTooltip=Also if you have a large number of product (> 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)
-SetDefaultBarcodeTypeProducts=Default barcode type to use for products
-SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
-ProductCodeChecker= Module for product code generation and checking (product or service)
-ProductOtherConf= Product / Service configuration
-IsNotADir=is not a directory!
-##### Syslog #####
-SyslogSetup=Logs module setup
-SyslogOutput=Logs outputs
-SyslogFacility=Facility
-SyslogLevel=Level
-SyslogFilename=File name and path
-YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
-ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
-##### Donations #####
-DonationsSetup=Donation module setup
-DonationsReceiptModel=Template of donation receipt
-##### Barcode #####
-BarcodeSetup=Barcode setup
-PaperFormatModule=Print format module
-BarcodeEncodeModule=Barcode encoding type
-CodeBarGenerator=Barcode generator
-ChooseABarCode=No generator defined
-FormatNotSupportedByGenerator=Format not supported by this generator
-BarcodeDescEAN8=Barcode of type EAN8
-BarcodeDescEAN13=Barcode of type EAN13
-BarcodeDescUPC=Barcode of type UPC
-BarcodeDescISBN=Barcode of type ISBN
-BarcodeDescC39=Barcode of type C39
-BarcodeDescC128=Barcode of type C128
-BarcodeDescDATAMATRIX=Barcode of type Datamatrix
-BarcodeDescQRCODE=Barcode of type QR code
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
-BarcodeInternalEngine=Internal engine
-BarCodeNumberManager=Manager to auto define barcode numbers
-##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct debit payment orders
-##### ExternalRSS #####
-ExternalRSSSetup=External RSS imports setup
-NewRSS=New RSS Feed
-RSSUrl=RSS URL
-RSSUrlExample=An interesting RSS feed
-##### Mailing #####
-MailingSetup=EMailing module setup
-MailingEMailFrom=Sender EMail (From) for emails sent by emailing module
-MailingEMailError=Return EMail (Errors-to) for emails with errors
-MailingDelay=Seconds to wait after sending next message
-##### Notification #####
-NotificationSetup=EMail notification module setup
-NotificationEMailFrom=Sender EMail (From) for emails sent for notifications
-FixedEmailTarget=Fixed email target
-##### Sendings #####
-SendingsSetup=Sending module setup
-SendingsReceiptModel=Sending receipt model
-SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
-FreeLegalTextOnShippings=Free text on shipments
-##### Deliveries #####
-DeliveryOrderNumberingModules=Products deliveries receipt numbering module
-DeliveryOrderModel=Products deliveries receipt model
-DeliveriesOrderAbility=Support products deliveries receipts
-FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
-##### FCKeditor #####
-AdvancedEditor=Advanced editor
-ActivateFCKeditor=Activate advanced editor for:
-FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
-FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files.</font>
-FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
-FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
-##### OSCommerce 1 #####
-OSCommerceErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be an OSCommerce database (Key %s not found in table %s).
-OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' successfull.
-OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
-OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
-##### Stock #####
-StockSetup=Warehouse module setup
-IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
-##### Menu #####
-MenuDeleted=Menu deleted
-Menus=Menus
-TreeMenuPersonalized=Personalized menus
-NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
-NewMenu=New menu
-Menu=Selection of menu
-MenuHandler=Menu handler
-MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
-DetailId=Id menu
-DetailMenuHandler=Menu handler where to show new menu
-DetailMenuModule=Module name if menu entry come from a module
-DetailType=Type of menu (top or left)
-DetailTitre=Menu label or label code for translation
-DetailUrl=URL where menu send you (Absolute URL link or external link with http://)
-DetailEnabled=Condition to show or not entry
-DetailRight=Condition to display unauthorized grey menus
-DetailLangs=Lang file name for label code translation
-DetailUser=Intern / Extern / All
-Target=Target
-DetailTarget=Target for links (_blank top open a new window)
-DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu)
-ModifMenu=Menu change
-DeleteMenu=Delete menu entry
-ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
-FailedToInitializeMenu=Failed to initialize menu
-##### Tax #####
-TaxSetup=Taxes, social or fiscal taxes and dividends module setup
-OptionVatMode=VAT due
-OptionVATDefault=Cash basis
-OptionVATDebitOption=Accrual basis
-OptionVatDefaultDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on payments for services
-OptionVatDebitOptionDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on invoice (debit) for services
-SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
-OnDelivery=On delivery
-OnPayment=On payment
-OnInvoice=On invoice
-SupposedToBePaymentDate=Payment date used
-SupposedToBeInvoiceDate=Invoice date used
-Buy=Buy
-Sell=Sell
-InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
-AccountancyCode=Accountancy Code
-AccountancyCodeSell=Sale 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 -> Dictionary -> 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_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
-AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### 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 your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your 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.
-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 same computer than 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.
-##### Point Of Sales (CashDesk) #####
-CashDesk=Point of sales
-CashDeskSetup=Point of sales module setup
-CashDeskThirdPartyForSell=Default generic third party to use for sells
-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).
-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
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
-##### Bookmark #####
-BookmarkSetup=Bookmark module setup
-BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu.
-NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu
-##### WebServices #####
-WebServicesSetup=Webservices module setup
-WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
-WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
-EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
-##### API ####
-ApiSetup=API module setup
-ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
-OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
-ApiKey=Key for API
-WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
-##### Bank #####
-BankSetupModule=Bank module setup
-FreeLegalTextOnChequeReceipts=Free text on cheque receipts
-BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
-BankOrderGlobal=General
-BankOrderGlobalDesc=General display order
-BankOrderES=Spanish
-BankOrderESDesc=Spanish display order
-ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
-##### Multicompany #####
-MultiCompanySetup=Multi-company module setup
-##### Suppliers #####
-SuppliersSetup=Supplier module setup
-SuppliersCommandModel=Complete template of supplier order (logo...)
-SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
-SuppliersInvoiceNumberingModel=Supplier invoices numbering models
-IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
-##### GeoIPMaxmind #####
-GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
-NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
-YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
-YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
-TestGeoIPResult=Test of a conversion IP -> country
-##### Projects #####
-ProjectsNumberingModules=Projects numbering module
-ProjectsSetup=Project module setup
-ProjectsModelModule=Project reports document model
-TasksNumberingModules=Tasks numbering module
-TaskModelModule=Tasks reports document model
-UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
-##### ECM (GED) #####
-##### Fiscal Year #####
-AccountingPeriods=Accounting periods
-AccountingPeriodCard=Accounting period
-NewFiscalYear=New accounting period
-OpenFiscalYear=Open accounting period
-CloseFiscalYear=Close accounting period
-DeleteFiscalYear=Delete accounting period
-ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
-ShowFiscalYear=Show accounting period
-AlwaysEditable=Can always be edited
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
-Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
-IncludePath=Include path (defined into variable %s)
-ExpenseReportsSetup=Setup of module Expense Reports
-TemplatePDFExpenseReports=Document templates to generate expense report document
-NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
-YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of 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
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/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.
-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.
-ConfFileMuseContainCustom=Installing 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)
-TextTitleColor=Color of page title
-LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
-NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
-BackgroundColor=Background color
-TopMenuBackgroundColor=Background color for Top menu
-TopMenuDisableImages=Hide images in Top menu
-LeftMenuBackgroundColor=Background color for Left menu
-BackgroundTableTitleColor=Background color for Table title line
-BackgroundTableLineOddColor=Background color for odd table lines
-BackgroundTableLineEvenColor=Background color for even table lines
-MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
-NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
-UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
-PositionIntoComboList=Position of line into combo lists
-SellTaxRate=Sale tax rate
-RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
-UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipping, you can enter it here. You can use the key {TRACKID} into URL parameters so the system will replace it with value of tracking number user entered into shipment card.
-OpportunityPercent=When you create an opportunity, you will defined an estimated amount of project/lead. According to status of opportunity, this amount may be multiplicated 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
-FixTZ=TimeZone fix
-FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
-ExpectedChecksum=Expected Checksum
-CurrentChecksum=Current Checksum
-ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the latest stable version
-TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
-TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so 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 usefull only if your prices for each leve 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.
-SeeSubstitutionVars=See * note for list of possible substitution variables
-AllPublishers=All publishers
-UnknownPublishers=Unknown publishers
-AddRemoveTabs=Add or remove tabs
-AddDictionaries=Add dictionaries
-AddBoxes=Add widgets
-AddSheduledJobs=Add scheduled jobs
-AddHooks=Add hooks
-AddTriggers=Add triggers
-AddMenus=Add menus
-AddPermissions=Add permissions
-AddExportProfiles=Add export profiles
-AddImportProfiles=Add import profiles
-AddOtherPagesOrServices=Add other pages or services
-AddModels=Add document or numbering templates
-AddSubstitutions=Add keys substitutions
-DetectionNotPossible=Detection not possible
-UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved on 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 correclty. 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 inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <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
-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
-TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
-##### Resource ####
-ResourceSetup=Configuration du module Resource
-UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
diff --git a/htdocs/langs/es_AR/main.lang b/htdocs/langs/es_AR/main.lang
index 9ffa398137f..2e691473326 100644
--- a/htdocs/langs/es_AR/main.lang
+++ b/htdocs/langs/es_AR/main.lang
@@ -1,9 +1,5 @@
 # Dolibarr language file - Source file is en_US - main
 DIRECTION=ltr
-# Note for Chinese:
-# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
-# stsongstdlight or cid0cs are for simplified Chinese
-# To read Chinese pdf with Linux: sudo apt-get install poppler-data
 FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=.
@@ -23,799 +19,3 @@ FormatDateHourShort=%m/%d/%Y %I:%M %p
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
-DatabaseConnection=Database connection
-NoTemplateDefined=No template defined for this email type
-AvailableVariables=Available substitution variables
-NoTranslation=No translation
-NoRecordFound=No record found
-NoRecordDeleted=No record deleted
-NotEnoughDataYet=Not enough data
-NoError=No error
-Error=Error
-Errors=Errors
-ErrorFieldRequired=Field '%s' is required
-ErrorFieldFormat=Field '%s' has a bad value
-ErrorFileDoesNotExists=File %s does not exist
-ErrorFailedToOpenFile=Failed to open file %s
-ErrorCanNotCreateDir=Cannot create dir %s
-ErrorCanNotReadDir=Cannot read dir %s
-ErrorConstantNotDefined=Parameter %s not defined
-ErrorUnknown=Unknown error
-ErrorSQL=SQL Error
-ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this
-ErrorGoToModuleSetup=Go to Module setup to fix this
-ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
-ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
-ErrorInternalErrorDetected=Error detected
-ErrorWrongHostParameter=Wrong host parameter
-ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post again the form.
-ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child records.
-ErrorWrongValue=Wrong value
-ErrorWrongValueForParameterX=Wrong value for parameter %s
-ErrorNoRequestInError=No request in error
-ErrorServiceUnavailableTryLater=Service not available for 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>.
-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 nb of record per page
-NotAuthorized=You are not authorized to do that.
-SetDate=Set date
-SelectDate=Select a date
-SeeAlso=See also %s
-SeeHere=See here
-Apply=Apply
-BackgroundColorByDefault=Default background color
-FileRenamed=The file was successfully renamed
-FileUploaded=The file was successfully uploaded
-FileGenerated=The file was successfully generated
-FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
-NbOfEntries=Nb of entries
-GoToWikiHelpPage=Read online help (Internet access needed)
-GoToHelpPage=Read help
-RecordSaved=Record saved
-RecordDeleted=Record deleted
-LevelOfFeature=Level of features
-NotDefined=Not defined
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
-Administrator=Administrator
-Undefined=Undefined
-PasswordForgotten=Password forgotten?
-SeeAbove=See above
-HomeArea=Home area
-LastConnexion=Latest connection
-PreviousConnexion=Previous connection
-PreviousValue=Previous value
-ConnectedOnMultiCompany=Connected on environment
-ConnectedSince=Connected since
-AuthenticationMode=Authentication mode
-RequestedUrl=Requested URL
-DatabaseTypeManager=Database type manager
-RequestLastAccessInError=Latest database access request error
-ReturnCodeLastAccessInError=Return code for latest database access request error
-InformationLastAccessInError=Information for latest database access request error
-DolibarrHasDetectedError=Dolibarr has detected a technical error
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes
-MoreInformation=More information
-TechnicalInformation=Technical information
-TechnicalID=Technical ID
-NotePublic=Note (public)
-NotePrivate=Note (private)
-PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
-DoTest=Test
-ToFilter=Filter
-NoFilter=No filter
-WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance delay.
-yes=yes
-Yes=Yes
-no=no
-No=No
-All=All
-Home=Home
-Help=Help
-OnlineHelp=Online help
-PageWiki=Wiki page
-MediaBrowser=Media browser
-Always=Always
-Never=Never
-Under=under
-Period=Period
-PeriodEndDate=End date for period
-Activate=Activate
-Activated=Activated
-Closed=Closed
-Closed2=Closed
-NotClosed=Not closed
-Enabled=Enabled
-Deprecated=Deprecated
-Disable=Disable
-Disabled=Disabled
-Add=Add
-AddLink=Add link
-RemoveLink=Remove link
-AddToDraft=Add to draft
-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>?
-Delete=Delete
-Remove=Remove
-Resiliate=Terminate
-Cancel=Cancel
-Modify=Modify
-Edit=Edit
-Validate=Validate
-ValidateAndApprove=Validate and Approve
-ToValidate=To validate
-Save=Save
-SaveAs=Save As
-TestConnection=Test connection
-ToClone=Clone
-ConfirmClone=Choose data you want to clone :
-NoCloneOptionsSpecified=No data to clone defined.
-Of=of
-Go=Go
-Run=Run
-CopyOf=Copy of
-Show=Show
-Hide=Hide
-ShowCardHere=Show card
-Search=Search
-SearchOf=Search
-Valid=Valid
-Approve=Approve
-Disapprove=Disapprove
-ReOpen=Re-Open
-Upload=Send file
-ToLink=Link
-Select=Select
-Choose=Choose
-Resize=Resize
-Recenter=Recenter
-Author=Author
-User=User
-Users=Users
-Group=Group
-Groups=Groups
-NoUserGroupDefined=No user group defined
-Password=Password
-PasswordRetype=Retype your password
-NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
-Name=Name
-Person=Person
-Parameter=Parameter
-Parameters=Parameters
-Value=Value
-PersonalValue=Personal value
-NewValue=New value
-CurrentValue=Current value
-Code=Code
-Type=Type
-Language=Language
-MultiLanguage=Multi-language
-Note=Note
-Title=Title
-Label=Label
-RefOrLabel=Ref. or label
-Info=Log
-Family=Family
-Description=Description
-Designation=Description
-Model=Doc template
-DefaultModel=Default doc template
-Action=Event
-About=About
-Number=Number
-NumberByMonth=Number by month
-AmountByMonth=Amount by month
-Numero=Number
-Limit=Limit
-Limits=Limits
-Logout=Logout
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Connection
-Setup=Setup
-Alert=Alert
-Previous=Previous
-Next=Next
-Cards=Cards
-Card=Card
-Now=Now
-HourStart=Start hour
-Date=Date
-DateAndHour=Date and hour
-DateToday=Today's date
-DateReference=Reference date
-DateStart=Start date
-DateEnd=End date
-DateCreation=Creation date
-DateCreationShort=Creat. date
-DateModification=Modification date
-DateModificationShort=Modif. date
-DateLastModification=Latest modification date
-DateValidation=Validation date
-DateClosing=Closing date
-DateDue=Due date
-DateValue=Value date
-DateValueShort=Value date
-DateOperation=Operation date
-DateOperationShort=Oper. Date
-DateLimit=Limit date
-DateRequest=Request date
-DateProcess=Process date
-DateBuild=Report build date
-DatePayment=Date of payment
-DateApprove=Approving date
-DateApprove2=Approving date (second approval)
-UserCreation=Creation user
-UserModification=Modification user
-UserCreationShort=Creat. user
-UserModificationShort=Modif. user
-DurationYear=year
-DurationMonth=month
-DurationWeek=week
-DurationDay=day
-DurationYears=years
-DurationMonths=months
-DurationWeeks=weeks
-DurationDays=days
-Year=Year
-Month=Month
-Week=Week
-WeekShort=Week
-Day=Day
-Hour=Hour
-Minute=Minute
-Second=Second
-Years=Years
-Months=Months
-Days=Days
-days=days
-Hours=Hours
-Minutes=Minutes
-Seconds=Seconds
-Weeks=Weeks
-Today=Today
-Yesterday=Yesterday
-Tomorrow=Tomorrow
-Morning=Morning
-Afternoon=Afternoon
-Quadri=Quadri
-MonthOfDay=Month of the day
-HourShort=H
-MinuteShort=mn
-Rate=Rate
-CurrencyRate=Currency conversion rate
-UseLocalTax=Include tax
-Bytes=Bytes
-KiloBytes=Kilobytes
-MegaBytes=Megabytes
-GigaBytes=Gigabytes
-TeraBytes=Terabytes
-b=b.
-Kb=Kb
-Mb=Mb
-Gb=Gb
-Tb=Tb
-Cut=Cut
-Copy=Copy
-Paste=Paste
-Default=Default
-DefaultValue=Default value
-Price=Price
-UnitPrice=Unit price
-UnitPriceHT=Unit price (net)
-UnitPriceTTC=Unit price
-PriceU=U.P.
-PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (currency)
-PriceUTTC=U.P. (inc. tax)
-Amount=Amount
-AmountInvoice=Invoice amount
-AmountPayment=Payment amount
-AmountHTShort=Amount (net)
-AmountTTCShort=Amount (inc. tax)
-AmountHT=Amount (net of tax)
-AmountTTC=Amount (inc. tax)
-AmountVAT=Amount tax
-MulticurrencyAlreadyPaid=Already payed, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
-MulticurrencyAmountHT=Amount (net of tax), original currency
-MulticurrencyAmountTTC=Amount (inc. of tax), original currency
-MulticurrencyAmountVAT=Amount tax, original currency
-AmountLT1=Amount tax 2
-AmountLT2=Amount tax 3
-AmountLT1ES=Amount RE
-AmountLT2ES=Amount IRPF
-AmountTotal=Total amount
-AmountAverage=Average amount
-PriceQtyMinHT=Price quantity min. (net of tax)
-Percentage=Percentage
-Total=Total
-SubTotal=Subtotal
-TotalHTShort=Total (net)
-TotalHTShortCurrency=Total (net in currency)
-TotalTTCShort=Total (inc. tax)
-TotalHT=Total (net of tax)
-TotalHTforthispage=Total (net of tax) for this page
-Totalforthispage=Total for this page
-TotalTTC=Total (inc. tax)
-TotalTTCToYourCredit=Total (inc. tax) to your credit
-TotalVAT=Total tax
-TotalLT1=Total tax 2
-TotalLT2=Total tax 3
-TotalLT1ES=Total RE
-TotalLT2ES=Total IRPF
-HT=Net of tax
-TTC=Inc. tax
-VAT=Sales tax
-VATs=Sales taxes
-LT1ES=RE
-LT2ES=IRPF
-VATRate=Tax Rate
-Average=Average
-Sum=Sum
-Delta=Delta
-Module=Module
-Option=Option
-List=List
-FullList=Full list
-Statistics=Statistics
-OtherStatistics=Other statistics
-Status=Status
-Favorite=Favorite
-ShortInfo=Info.
-Ref=Ref.
-ExternalRef=Ref. extern
-RefSupplier=Ref. supplier
-RefPayment=Ref. payment
-CommercialProposalsShort=Commercial proposals
-Comment=Comment
-Comments=Comments
-ActionsToDo=Events to do
-ActionsToDoShort=To do
-ActionsDoneShort=Done
-ActionNotApplicable=Not applicable
-ActionRunningNotStarted=To start
-ActionRunningShort=In progress
-ActionDoneShort=Finished
-ActionUncomplete=Uncomplete
-CompanyFoundation=Company/Foundation
-ContactsForCompany=Contacts 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
-NActionsLate=%s late
-RequestAlreadyDone=Request already recorded
-Filter=Filter
-FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
-RemoveFilter=Remove filter
-ChartGenerated=Chart generated
-ChartNotGenerated=Chart not generated
-GeneratedOn=Build on %s
-Generate=Generate
-Duration=Duration
-TotalDuration=Total duration
-Summary=Summary
-DolibarrStateBoard=Statistics
-DolibarrWorkBoard=Work tasks board
-Available=Available
-NotYetAvailable=Not yet available
-NotAvailable=Not available
-Categories=Tags/categories
-Category=Tag/category
-By=By
-From=From
-to=to
-and=and
-or=or
-Other=Other
-Others=Others
-OtherInformations=Other informations
-Quantity=Quantity
-Qty=Qty
-ChangedBy=Changed by
-ApprovedBy=Approved by
-ApprovedBy2=Approved by (second approval)
-Approved=Approved
-Refused=Refused
-ReCalculate=Recalculate
-ResultKo=Failure
-Reporting=Reporting
-Reportings=Reporting
-Draft=Draft
-Drafts=Drafts
-Validated=Validated
-Opened=Opened
-New=New
-Discount=Discount
-Unknown=Unknown
-General=General
-Size=Size
-Received=Received
-Paid=Paid
-Topic=Subject
-ByCompanies=By third parties
-ByUsers=By users
-Links=Links
-Link=Link
-Rejects=Rejects
-Preview=Preview
-NextStep=Next step
-Datas=Data
-None=None
-NoneF=None
-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.
-Photo=Picture
-Photos=Pictures
-AddPhoto=Add picture
-DeletePicture=Picture delete
-ConfirmDeletePicture=Confirm picture deletion?
-Login=Login
-CurrentLogin=Current login
-EnterLoginDetail=Enter login details
-January=January
-February=February
-March=March
-April=April
-May=May
-June=June
-July=July
-August=August
-September=September
-October=October
-November=November
-December=December
-JanuaryMin=Jan
-FebruaryMin=Feb
-MarchMin=Mar
-AprilMin=Apr
-MayMin=May
-JuneMin=Jun
-JulyMin=Jul
-AugustMin=Aug
-SeptemberMin=Sep
-OctoberMin=Oct
-NovemberMin=Nov
-DecemberMin=Dec
-Month01=January
-Month02=February
-Month03=March
-Month04=April
-Month05=May
-Month06=June
-Month07=July
-Month08=August
-Month09=September
-Month10=October
-Month11=November
-Month12=December
-MonthShort01=Jan
-MonthShort02=Feb
-MonthShort03=Mar
-MonthShort04=Apr
-MonthShort05=May
-MonthShort06=Jun
-MonthShort07=Jul
-MonthShort08=Aug
-MonthShort09=Sep
-MonthShort10=Oct
-MonthShort11=Nov
-MonthShort12=Dec
-AttachedFiles=Attached files and documents
-FileTransferComplete=File was uploaded successfuly
-DateFormatYYYYMM=YYYY-MM
-DateFormatYYYYMMDD=YYYY-MM-DD
-DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
-ReportName=Report name
-ReportPeriod=Report period
-ReportDescription=Description
-Report=Report
-Keyword=Keyword
-Origin=Origin
-Legend=Legend
-Fill=Fill
-Reset=Reset
-File=File
-Files=Files
-NotAllowed=Not allowed
-ReadPermissionNotAllowed=Read permission not allowed
-AmountInCurrency=Amount in %s currency
-Example=Example
-Examples=Examples
-NoExample=No example
-FindBug=Report a bug
-NbOfThirdParties=Number of third parties
-NbOfLines=Number of lines
-NbOfObjects=Number of objects
-NbOfObjectReferers=Number of related items
-Referers=Related items
-TotalQuantity=Total quantity
-DateFromTo=From %s to %s
-DateFrom=From %s
-DateUntil=Until %s
-Check=Check
-Uncheck=Uncheck
-Internal=Internal
-External=External
-Internals=Internal
-Externals=External
-Warning=Warning
-Warnings=Warnings
-BuildDoc=Build Doc
-Entity=Environment
-Entities=Entities
-CustomerPreview=Customer preview
-SupplierPreview=Supplier preview
-ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show supplier preview
-RefCustomer=Ref. customer
-Currency=Currency
-InfoAdmin=Information for administrators
-Undo=Undo
-Redo=Redo
-ExpandAll=Expand all
-UndoExpandAll=Undo expand
-Reason=Reason
-FeatureNotYetSupported=Feature not yet supported
-CloseWindow=Close window
-Response=Response
-Priority=Priority
-SendByMail=Send by EMail
-MailSentBy=Email sent by
-TextUsedInTheMessageBody=Email body
-SendAcknowledgementByMail=Send confirmation email
-EMail=E-mail
-NoEMail=No email
-Email=Email
-NoMobilePhone=No mobile phone
-Owner=Owner
-FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
-Refresh=Refresh
-BackToList=Back to list
-GoBack=Go back
-CanBeModifiedIfOk=Can be modified if valid
-CanBeModifiedIfKo=Can be modified if not valid
-ValueIsValid=Value is valid
-ValueIsNotValid=Value is not valid
-RecordCreatedSuccessfully=Record created successfully
-RecordModifiedSuccessfully=Record modified successfully
-RecordsModified=%s record modified
-RecordsDeleted=%s record deleted
-AutomaticCode=Automatic code
-FeatureDisabled=Feature disabled
-MoveBox=Move widget
-Offered=Offered
-NotEnoughPermissions=You don't have permission for this action
-SessionName=Session name
-Method=Method
-Receive=Receive
-CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
-ExpectedValue=Expected Value
-CurrentValue=Current value
-PartialWoman=Partial
-TotalWoman=Total
-NeverReceived=Never received
-Canceled=Canceled
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
-Color=Color
-Documents=Linked files
-Documents2=Documents
-UploadDisabled=Upload disabled
-MenuECM=Documents
-MenuAWStats=AWStats
-MenuMembers=Members
-MenuAgendaGoogle=Google agenda
-ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=No documents saved in this directory
-CurrentUserLanguage=Current language
-CurrentTheme=Current theme
-CurrentMenuManager=Current menu manager
-Browser=Browser
-Layout=Layout
-Screen=Screen
-DisabledModules=Disabled modules
-For=For
-ForCustomer=For customer
-Signature=Signature
-DateOfSignature=Date of signature
-HidePassword=Show command with password hidden
-UnHidePassword=Show real command with clear password
-Root=Root
-Informations=Informations
-Page=Page
-Notes=Notes
-AddNewLine=Add new line
-AddFile=Add file
-FreeZone=Free entry
-FreeLineOfType=Free entry of type
-CloneMainAttributes=Clone object with its main attributes
-PDFMerge=PDF Merge
-Merge=Merge
-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 application at the moment.
-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
-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.
-AccordingToGeoIPDatabase=(according to GeoIP convertion)
-Line=Line
-NotSupported=Not supported
-RequiredField=Required field
-Result=Result
-ToTest=Test
-ValidateBefore=Card must be validated before using this feature
-Visibility=Visibility
-Private=Private
-Hidden=Hidden
-Resources=Resources
-Source=Source
-Prefix=Prefix
-Before=Before
-After=After
-IPAddress=IP address
-Frequency=Frequency
-IM=Instant messaging
-NewAttribute=New attribute
-AttributeCode=Attribute code
-URLPhoto=URL of photo/logo
-SetLinkToAnotherThirdParty=Link to another third party
-LinkTo=Link to
-LinkToProposal=Link to proposal
-LinkToOrder=Link to order
-LinkToInvoice=Link to invoice
-LinkToSupplierOrder=Link to supplier order
-LinkToSupplierProposal=Link to supplier proposal
-LinkToSupplierInvoice=Link to supplier invoice
-LinkToContract=Link to contract
-LinkToIntervention=Link to intervention
-CreateDraft=Create draft
-SetToDraft=Back to draft
-ClickToEdit=Click to edit
-ObjectDeleted=Object %s deleted
-ByCountry=By country
-ByTown=By town
-ByDate=By date
-ByMonthYear=By month/year
-ByYear=By year
-ByMonth=By month
-ByDay=By day
-BySalesRepresentative=By sales representative
-LinkedToSpecificUsers=Linked to a particular user contact
-NoResults=No results
-AdminTools=Admin tools
-SystemTools=System tools
-ModulesSystemTools=Modules tools
-Test=Test
-Element=Element
-NoPhotoYet=No pictures available yet
-Dashboard=Dashboard
-MyDashboard=My dashboard
-Deductible=Deductible
-from=from
-toward=toward
-Access=Access
-SelectAction=Select action
-HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
-SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
-OriginFileName=Original filename
-SetDemandReason=Set source
-SetBankAccount=Define Bank Account
-AccountCurrency=Account Currency
-ViewPrivateNote=View notes
-XMoreLines=%s line(s) hidden
-PublicUrl=Public URL
-AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
-PrintFile=Print File %s
-ShowTransaction=Show entry on bank account
-GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
-Deny=Deny
-Denied=Denied
-ListOfTemplates=List of templates
-Gender=Gender
-Genderman=Man
-Genderwoman=Woman
-ViewList=List view
-Mandatory=Mandatory
-Hello=Hello
-Sincerely=Sincerely
-DeleteLine=Delete line
-ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
-NoRecordSelected=No record selected
-MassFilesArea=Area for files built by mass actions
-ShowTempMassFilesArea=Show area of files built by mass actions
-RelatedObjects=Related Objects
-ClassifyBilled=Classify billed
-Progress=Progress
-ClickHere=Click here
-FrontOffice=Front office
-BackOffice=Back office
-View=View
-Export=Export
-Exports=Exports
-ExportFilteredList=Export filtered list
-ExportList=Export list
-Miscellaneous=Miscellaneous
-Calendar=Calendar
-GroupBy=Group by...
-ViewFlatList=View flat list
-RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Direct download link
-Download=Download
-ActualizeCurrency=Update currency rate
-Fiscalyear=Fiscal year
-# Week day
-Monday=Monday
-Tuesday=Tuesday
-Wednesday=Wednesday
-Thursday=Thursday
-Friday=Friday
-Saturday=Saturday
-Sunday=Sunday
-MondayMin=Mo
-TuesdayMin=Tu
-WednesdayMin=We
-ThursdayMin=Th
-FridayMin=Fr
-SaturdayMin=Sa
-SundayMin=Su
-Day1=Monday
-Day2=Tuesday
-Day3=Wednesday
-Day4=Thursday
-Day5=Friday
-Day6=Saturday
-Day0=Sunday
-ShortMonday=M
-ShortTuesday=T
-ShortWednesday=W
-ShortThursday=T
-ShortFriday=F
-ShortSaturday=S
-ShortSunday=S
-SelectMailModel=Select email template
-SetRef=Set ref
-Select2ResultFoundUseArrows=Some results found. Use arrows to select.
-Select2NotFound=No result found
-Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
-Select2LoadingMoreResults=Loading more results...
-Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
-SearchIntoContacts=Contacts
-SearchIntoMembers=Members
-SearchIntoUsers=Users
-SearchIntoProductsOrServices=Products or services
-SearchIntoProjects=Projects
-SearchIntoTasks=Tasks
-SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
-SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
-SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
-SearchIntoInterventions=Interventions
-SearchIntoContracts=Contracts
-SearchIntoCustomerShipments=Customer shipments
-SearchIntoExpenseReports=Expense reports
-SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/es_BO/accountancy.lang b/htdocs/langs/es_BO/accountancy.lang
deleted file mode 100644
index 527f1fd139d..00000000000
--- a/htdocs/langs/es_BO/accountancy.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-AccountingCategory=Accounting category
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
diff --git a/htdocs/langs/es_BO/admin.lang b/htdocs/langs/es_BO/admin.lang
index 9602601e241..1c53b65c99c 100644
--- a/htdocs/langs/es_BO/admin.lang
+++ b/htdocs/langs/es_BO/admin.lang
@@ -1,1665 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
-Foundation=Foundation
-Version=Version
-VersionProgram=Version program
-VersionLastInstall=Initial install version
-VersionLastUpgrade=Latest version upgrade
-VersionExperimental=Experimental
-VersionDevelopment=Development
-VersionUnknown=Unknown
-VersionRecommanded=Recommended
-FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. Value of some setup constants may also be checked. You can use this tool to detect if some files were modified by a hacker for example.
-FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
-GlobalChecksum=Global checksum
-MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
-LocalSignature=Embedded local signature (less reliable)
-RemoteSignature=Remote distant signature (more reliable)
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FilesModified=Modified Files
-FilesAdded=Added Files
-FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
-XmlNotFound=Xml Integrity File of application not found
-SessionId=Session ID
-SessionSaveHandler=Handler to save sessions
-SessionSavePath=Storage session localization
-PurgeSessions=Purge of sessions
-ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
-NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow to list all running sessions.
-LockNewSessions=Lock new connections
-ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself. Only user <b>%s</b> will be able to connect after that.
-UnlockNewSessions=Remove connection lock
-YourSession=Your session
-Sessions=Users session
-WebUserGroup=Web server user/group
-NoSessionFound=Your PHP seems to not allow to list active sessions. Directory used to save sessions (<b>%s</b>) might be protected (For example, by OS permissions or by PHP directive open_basedir).
-DBStoringCharset=Database charset to store data
-DBSortingCharset=Database charset to sort data
-WarningModuleNotActive=Module <b>%s</b> must be enabled
-WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page.
-DolibarrSetup=Dolibarr install or upgrade
-InternalUser=Internal user
-ExternalUser=External user
-InternalUsers=Internal users
-ExternalUsers=External users
-GUISetup=Display
-SetupArea=Setup area
-FormToTestFileUploadForm=Form to test file upload (according to setup)
-IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
-RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
-RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any usage of update tool.
-SecuritySetup=Security setup
-SecurityFilesDesc=Define here options related to security about uploading files.
-ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
-ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
-ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is not supported.
-DictionarySetup=Dictionary setup
-Dictionary=Dictionaries
-ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
-ErrorCodeCantContainZero=Code can't contain value 0
-DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
-UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties, but it is less convenient)
-DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact, but it is less convenient)
-NumberOfKeyToSearch=Nbr of characters to trigger search: %s
-NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
-AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
-JavascriptDisabled=JavaScript disabled
-UsePreviewTabs=Use preview tabs
-ShowPreview=Show preview
-PreviewNotAvailable=Preview not available
-ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
-MySQLTimeZone=TimeZone MySql (database)
-TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
-Space=Space
-Table=Table
-Fields=Fields
-Index=Index
-Mask=Mask
-NextValue=Next value
-NextValueForInvoices=Next value (invoices)
-NextValueForCreditNotes=Next value (credit notes)
-NextValueForDeposit=Next value (deposit)
-NextValueForReplacements=Next value (replacements)
-MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to <b>%s</b> %s, whatever this parameter's value is
-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
-AntiVirusParam= More parameters on command line
-AntiVirusParamExample= Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
-ComptaSetup=Accounting module setup
-UserSetup=User management setup
-MultiCurrencySetup=Multi-currency setup
-MenuLimits=Limits and accuracy
-MenuIdParent=Parent menu ID
-DetailMenuIdParent=ID of parent menu (empty for a top menu)
-DetailPosition=Sort number to define menu position
-AllMenus=All
-NotConfigured=Module not configured
-Active=Active
-SetupShort=Setup
-OtherOptions=Other options
-OtherSetup=Other setup
-CurrentValueSeparatorDecimal=Decimal separator
-CurrentValueSeparatorThousand=Thousand separator
-Destination=Destination
-IdModule=Module ID
-IdPermissions=Permissions ID
-Modules=Modules
-LanguageBrowserParameter=Parameter %s
-LocalisationDolibarrParameters=Localisation parameters
-ClientTZ=Client Time Zone (user)
-ClientHour=Client time (user)
-OSTZ=Server OS Time Zone
-PHPTZ=PHP server Time Zone
-DaylingSavingTime=Daylight saving time
-CurrentHour=PHP Time (server)
-CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
-Box=Widget
-Boxes=Widgets
-MaxNbOfLinesForBoxes=Max number of lines for widgets
-PositionByDefault=Default order
-Position=Position
-MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
-MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br />Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
-MenuForUsers=Menu for users
-LangFile=.lang file
-System=System
-SystemInfo=System information
-SystemToolsArea=System tools area
-SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for.
-Purge=Purge
-PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
-PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
-PurgeDeleteTemporaryFilesShort=Delete temporary files
-PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory <b>%s</b>. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted.
-PurgeRunNow=Purge now
-PurgeNothingToDelete=No directory or files to delete.
-PurgeNDirectoriesDeleted=<b>%s</b> files or directories deleted.
-PurgeAuditEvents=Purge all security events
-ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
-GenerateBackup=Generate backup
-Backup=Backup
-Restore=Restore
-RunCommandSummary=Backup has been launched with the following command
-BackupResult=Backup result
-BackupFileSuccessfullyCreated=Backup file successfully generated
-YouCanDownloadBackupFile=Generated files can now be downloaded
-NoBackupFileAvailable=No backup files available.
-ExportMethod=Export method
-ImportMethod=Import method
-ToBuildBackupFileClickHere=To build a backup file, click <a href="%s">here</a>.
-ImportMySqlDesc=To import a backup file, you must use mysql command from command line:
-ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line:
-ImportMySqlCommand=%s %s < mybackupfile.sql
-ImportPostgreSqlCommand=%s %s mybackupfile.sql
-FileNameToGenerate=File name to generate
-Compression=Compression
-CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
-CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
-ExportCompatibility=Compatibility of generated export file
-MySqlExportParameters=MySQL export parameters
-PostgreSqlExportParameters= PostgreSQL export parameters
-UseTransactionnalMode=Use transactional mode
-FullPathToMysqldumpCommand=Full path to mysqldump command
-FullPathToPostgreSQLdumpCommand=Full path to pg_dump command
-ExportOptions=Export Options
-AddDropDatabase=Add DROP DATABASE command
-AddDropTable=Add DROP TABLE command
-ExportStructure=Structure
-NameColumn=Name columns
-ExtendedInsert=Extended INSERT
-NoLockBeforeInsert=No lock commands around INSERT
-DelayedInsert=Delayed insert
-EncodeBinariesInHexa=Encode binary data in hexadecimal
-IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
-AutoDetectLang=Autodetect (browser language)
-FeatureDisabledInDemo=Feature disabled in demo
-FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Permissions
-BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
-OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
-ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external modules...
-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 (Note: anyone experienced in PHP programming can provide custom development for an open source project)
-WebSiteDesc=Reference websites to find more modules...
-URL=Link
-BoxesAvailable=Widgets available
-BoxesActivated=Widgets activated
-ActivateOn=Activate on
-ActiveOn=Activated on
-SourceFile=Source file
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
-Required=Required
-UsedOnlyWithTypeOption=Used by some agenda option only
-Security=Security
-Passwords=Passwords
-DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
-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 (Activated 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 make building of a global cumulated pdf not working (like unpaid invoices).
-Feature=Feature
-DolibarrLicense=License
-Developpers=Developers/contributors
-OfficialWebSite=Dolibarr international official web site
-OfficialWebSiteLocal=Local web site (%s)
-OfficialWiki=Dolibarr documentation on Wiki
-OfficialDemo=Dolibarr online demo
-OfficialMarketPlace=Official market place for external modules/addons
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
-ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
-HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
-HelpCenterDesc2=Some part of this service are available in <b>english only</b>.
-CurrentMenuHandler=Current menu handler
-MeasuringUnit=Measuring unit
-LeftMargin=Left margin
-TopMargin=Top margin
-PaperSize=Paper type
-Orientation=Orientation
-SpaceX=Space X
-SpaceY=Space Y
-FontSize=Font size
-Content=Content
-NoticePeriod=Notice period
-NewByMonth=New by month
-Emails=E-mails
-EMailsSetup=E-mails setup
-EMailsDesc=This page allows you to overwrite your PHP parameters for e-mails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless.
-MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
-MAIN_MAIL_EMAIL_FROM=Sender e-mail for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Sender e-mail used for error returns emails sent
-MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
-MAIN_DISABLE_ALL_MAILS=Disable all e-mails sendings (for test purposes or demos)
-MAIN_MAIL_SENDMODE=Method to use to send EMails
-MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
-MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
-MAIN_MAIL_EMAIL_TLS= Use TLS (SSL) encrypt
-MAIN_MAIL_EMAIL_STARTTLS= Use TLS (STARTTLS) encrypt
-MAIN_DISABLE_ALL_SMS=Disable all SMS sendings (for test purposes or demos)
-MAIN_SMS_SENDMODE=Method to use to send SMS
-MAIN_MAIL_SMS_FROM=Default sender phone number for Sms sending
-MAIN_MAIL_DEFAULT_FROMTYPE=Sender e-mail by default for manual sendings (User email or Company email)
-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/
-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 setup
-ModuleFamilyBase=System
-ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
-ModuleFamilyProducts=Products Management (PM)
-ModuleFamilyHr=Human Resource Management (HR)
-ModuleFamilyProjects=Projects/Collaborative work
-ModuleFamilyOther=Other
-ModuleFamilyTechnic=Multi-modules tools
-ModuleFamilyExperimental=Experimental modules
-ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
-ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
-ModuleFamilyInterface=Interfaces with external systems
-MenuHandlers=Menu handlers
-MenuAdmin=Menu editor
-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).
-DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <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>.
-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='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
-YouCanSubmitFile=For this step, you can send package using this tool: Select module file
-CurrentVersion=Dolibarr current version
-CallUpdatePage=Go to the page that updates the database structure and data: %s.
-LastStableVersion=Latest stable version
-LastActivationDate=Latest activation date
-UpdateServerOffline=Update server offline
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
-GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
-GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
-ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
-ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
-DoTestServerAvailability=Test server connectivity
-DoTestSend=Test sending
-DoTestSendHTML=Test sending HTML
-ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
-ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
-UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
-UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
-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...).
-MinLength=Minimum length
-LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
-ExamplesWithCurrentSetup=Examples with current running setup
-ListOfDirectories=List of OpenDocument templates directories
-ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
-NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories
+AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
+AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 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.
-ThemeDir=Skins directory
-ConnectionTimeout=Connexion timeout
-ResponseTimeout=Response timeout
-SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__
-ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
-SecurityToken=Key to secure URLs
-NoSmsEngine=No SMS sender manager available. SMS sender manager are not installed with default distribution (because they depends on an external supplier) but you can find some on %s
-PDF=PDF
-PDFDesc=You can set each global options related to the PDF generation
-PDFAddressForging=Rules to forge address boxes
-HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF
-HideDescOnPDF=Hide products description on generated PDF
-HideRefOnPDF=Hide products ref. on generated PDF
-HideDetailsOnPDF=Hide product lines details on generated PDF
-PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
-Library=Library
-UrlGenerationParameters=Parameters to secure URLs
-SecurityTokenIsUnique=Use a unique securekey parameter for each URL
-EnterRefToBuildUrl=Enter reference for object %s
-GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons to 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
-MassConvert=Launch mass convert
-String=String
-TextLong=Long text
-Int=Integer
-Float=Float
-DateAndTime=Date and hour
-Unique=Unique
-Boolean=Boolean (Checkbox)
-ExtrafieldPhone = Phone
-ExtrafieldPrice = Price
-ExtrafieldMail = Email
-ExtrafieldUrl = Url
-ExtrafieldSelect = Select list
-ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
-ExtrafieldPassword=Password
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
-ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
-LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
-SMS=SMS
-LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
-RefreshPhoneLink=Refresh link
-LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
-KeepEmptyToUseDefault=Keep empty to use default value
-DefaultLink=Default link
-SetAsDefault=Set as default
-ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
-BarcodeInitForThirdparties=Mass barcode init for thirdparties
-BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Init value for next %s empty records
-EraseAllCurrentBarCode=Erase all current barcode values
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
-AllBarcodeReset=All barcode values have been removed
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into 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
-DisplayCompanyInfo=Display company address
-DisplayCompanyManagers=Display manager names
-DisplayCompanyInfoAndManagers=Display company address and manager names
-EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
-ModuleCompanyCodePanicum=Return an empty accountancy code.
-ModuleCompanyCodeDigitaria=Accountancy 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: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-ClickToShowDescription=Click to show description
-# Modules
-Module0Name=Users & groups
-Module0Desc=Users / Employees and Groups management
-Module1Name=Third parties
-Module1Desc=Companies and contact management (customers, prospects...)
-Module2Name=Commercial
-Module2Desc=Commercial management
-Module10Name=Accounting
-Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
-Module20Name=Proposals
-Module20Desc=Commercial proposal management
-Module22Name=Mass E-mailings
-Module22Desc=Mass E-mailing management
-Module23Name=Energy
-Module23Desc=Monitoring the consumption of energies
-Module25Name=Customer Orders
-Module25Desc=Customer order management
-Module30Name=Invoices
-Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
-Module40Name=Suppliers
-Module40Desc=Supplier management and buying (orders and invoices)
-Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
-Module49Name=Editors
-Module49Desc=Editor management
-Module50Name=Products
-Module50Desc=Product management
-Module51Name=Mass mailings
-Module51Desc=Mass paper mailing management
-Module52Name=Stocks
-Module52Desc=Stock management (products)
-Module53Name=Services
-Module53Desc=Service management
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
-Module55Name=Barcodes
-Module55Desc=Barcode management
-Module56Name=Telephony
-Module56Desc=Telephony integration
-Module57Name=Direct bank payment orders
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
-Module58Name=ClickToDial
-Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
-Module70Name=Interventions
-Module70Desc=Intervention management
-Module75Name=Expense and trip notes
-Module75Desc=Expense and trip notes management
-Module80Name=Shipments
-Module80Desc=Shipments and delivery order management
-Module85Name=Banks and cash
-Module85Desc=Management of bank or cash accounts
-Module100Name=External site
-Module100Desc=This module include an external web site or page into Dolibarr menus and view it into a Dolibarr frame
-Module105Name=Mailman and SPIP
-Module105Desc=Mailman or SPIP interface for member module
-Module200Name=LDAP
-Module200Desc=LDAP directory synchronisation
-Module210Name=PostNuke
-Module210Desc=PostNuke integration
-Module240Name=Data exports
-Module240Desc=Tool to export Dolibarr data (with assistants)
-Module250Name=Data imports
-Module250Desc=Tool to import data in Dolibarr  (with assistants)
-Module310Name=Members
-Module310Desc=Foundation members management
-Module320Name=RSS Feed
-Module320Desc=Add RSS feed inside Dolibarr screen pages
-Module330Name=Bookmarks
-Module330Desc=Bookmarks management
-Module400Name=Projects/Opportunities/Leads
-Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
-Module410Name=Webcalendar
-Module410Desc=Webcalendar integration
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
-Module520Name=Loan
-Module520Desc=Management of loans
-Module600Name=Notifications
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
-Module700Name=Donations
-Module700Desc=Donation management
-Module770Name=Expense reports
-Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
-Module1200Name=Mantis
-Module1200Desc=Mantis integration
-Module1400Name=Accounting
-Module1400Desc=Accounting management (double parties)
-Module1520Name=Document Generation
-Module1520Desc=Mass mail document generation
-Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
-Module2000Name=WYSIWYG editor
-Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
-Module2200Name=Dynamic Prices
-Module2200Desc=Enable the usage of math expressions for prices
-Module2300Name=Cron
-Module2300Desc=Scheduled job management
-Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
-Module2500Name=Electronic Content Management
-Module2500Desc=Save and share documents
-Module2600Name=API/Web services (SOAP server)
-Module2600Desc=Enable the Dolibarr SOAP server providing API services
-Module2610Name=API/Web services (REST server)
-Module2610Desc=Enable the Dolibarr REST server providing API services
-Module2660Name=Call WebServices (SOAP client)
-Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
-Module2700Name=Gravatar
-Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
-Module2800Desc=FTP Client
-Module2900Name=GeoIPMaxmind
-Module2900Desc=GeoIP Maxmind conversions capabilities
-Module3100Name=Skype
-Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
-Module4000Name=HRM
-Module4000Desc=Human resources management
-Module5000Name=Multi-company
-Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management
-Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
-Module20000Name=Leave Requests management
-Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Product lot
-Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
-Module50000Name=PayBox
-Module50000Desc=Module to offer an online payment page by credit card with PayBox
-Module50100Name=Point of sales
-Module50100Desc=Point of sales module (POS).
-Module50200Name=Paypal
-Module50200Desc=Module to offer an online payment page by credit card with Paypal
-Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double parties)
-Module54000Name=PrintIPP
-Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
-Module55000Name=Poll, Survey or Vote
-Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
-Module59000Name=Margins
-Module59000Desc=Module to manage margins
-Module60000Name=Commissions
-Module60000Desc=Module to manage commissions
-Module63000Name=Resources
-Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
-Permission11=Read customer invoices
-Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
-Permission14=Validate customer invoices
-Permission15=Send customer invoices by email
-Permission16=Create payments for customer invoices
-Permission19=Delete customer invoices
-Permission21=Read commercial proposals
-Permission22=Create/modify commercial proposals
-Permission24=Validate commercial proposals
-Permission25=Send commercial proposals
-Permission26=Close commercial proposals
-Permission27=Delete commercial proposals
-Permission28=Export commercial proposals
-Permission31=Read products
-Permission32=Create/modify products
-Permission34=Delete products
-Permission36=See/manage hidden products
-Permission38=Export products
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
-Permission44=Delete projects (shared project and projects i'm contact for)
-Permission45=Export projects
-Permission61=Read interventions
-Permission62=Create/modify interventions
-Permission64=Delete interventions
-Permission67=Export interventions
-Permission71=Read members
-Permission72=Create/modify members
-Permission74=Delete members
-Permission75=Setup types of membership
-Permission76=Export data
-Permission78=Read subscriptions
-Permission79=Create/modify subscriptions
-Permission81=Read customers orders
-Permission82=Create/modify customers orders
-Permission84=Validate customers orders
-Permission86=Send customers orders
-Permission87=Close customers orders
-Permission88=Cancel customers orders
-Permission89=Delete customers orders
-Permission91=Read social or fiscal taxes and vat
-Permission92=Create/modify social or fiscal taxes and vat
-Permission93=Delete social or fiscal taxes and vat
-Permission94=Export social or fiscal taxes
-Permission95=Read reports
-Permission101=Read sendings
-Permission102=Create/modify sendings
-Permission104=Validate sendings
-Permission106=Export sendings
-Permission109=Delete sendings
-Permission111=Read financial accounts
-Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
-Permission114=Reconciliate transactions
-Permission115=Export transactions and account statements
-Permission116=Transfers between accounts
-Permission117=Manage cheques dispatching
-Permission121=Read third parties linked to user
-Permission122=Create/modify third parties linked to user
-Permission125=Delete third parties linked to user
-Permission126=Export third parties
-Permission141=Read all projects and tasks (also private projects i am not contact for)
-Permission142=Create/modify all projects and tasks (also private projects i am not 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
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
-Permission167=Export contracts
-Permission171=Read trips and expenses (yours and your subordinates)
-Permission172=Create/modify trips and expenses
-Permission173=Delete trips and expenses
-Permission174=Read all trips and expenses
-Permission178=Export trips and expenses
-Permission180=Read suppliers
-Permission181=Read supplier orders
-Permission182=Create/modify supplier orders
-Permission183=Validate supplier orders
-Permission184=Approve supplier orders
-Permission185=Order or cancel supplier orders
-Permission186=Receive supplier orders
-Permission187=Close supplier orders
-Permission188=Cancel supplier orders
-Permission192=Create lines
-Permission193=Cancel lines
-Permission194=Read the bandwith lines
-Permission202=Create ADSL connections
-Permission203=Order connections orders
-Permission204=Order connections
-Permission205=Manage connections
-Permission206=Read connections
-Permission211=Read Telephony
-Permission212=Order lines
-Permission213=Activate line
-Permission214=Setup Telephony
-Permission215=Setup providers
-Permission221=Read emailings
-Permission222=Create/modify emailings (topic, recipients...)
-Permission223=Validate emailings (allows sending)
-Permission229=Delete emailings
-Permission237=View recipients and info
-Permission238=Manually send mailings
-Permission239=Delete mailings after validation or sent
-Permission241=Read categories
-Permission242=Create/modify categories
-Permission243=Delete categories
-Permission244=See the contents of the hidden categories
-Permission251=Read other users and groups
-PermissionAdvanced251=Read other users
-Permission252=Read permissions of other users
-Permission253=Create/modify other users, groups and permisssions
-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 assignement matters).
-Permission271=Read CA
-Permission272=Read invoices
-Permission273=Issue invoices
-Permission281=Read contacts
-Permission282=Create/modify contacts
-Permission283=Delete contacts
-Permission286=Export contacts
-Permission291=Read tariffs
-Permission292=Set permissions on the tariffs
-Permission293=Modify costumers tariffs
-Permission300=Read bar codes
-Permission301=Create/modify bar codes
-Permission302=Delete bar codes
-Permission311=Read services
-Permission312=Assign service/subscription to contract
-Permission331=Read bookmarks
-Permission332=Create/modify bookmarks
-Permission333=Delete bookmarks
-Permission341=Read its own permissions
-Permission342=Create/modify his own user information
-Permission343=Modify his own password
-Permission344=Modify its own permissions
-Permission351=Read groups
-Permission352=Read groups permissions
-Permission353=Create/modify groups
-Permission354=Delete or disable groups
-Permission358=Export users
-Permission401=Read discounts
-Permission402=Create/modify discounts
-Permission403=Validate discounts
-Permission404=Delete discounts
-Permission510=Read Salaries
-Permission512=Create/modify salaries
-Permission514=Delete salaries
-Permission517=Export salaries
-Permission520=Read Loans
-Permission522=Create/modify loans
-Permission524=Delete loans
-Permission525=Access loan calculator
-Permission527=Export loans
-Permission531=Read services
-Permission532=Create/modify services
-Permission534=Delete services
-Permission536=See/manage hidden services
-Permission538=Export services
-Permission701=Read donations
-Permission702=Create/modify donations
-Permission703=Delete donations
-Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
-Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
-Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission779=Export expense reports
-Permission1001=Read stocks
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
-Permission1004=Read stock movements
-Permission1005=Create/modify stock movements
-Permission1101=Read delivery orders
-Permission1102=Create/modify delivery orders
-Permission1104=Validate delivery orders
-Permission1109=Delete delivery orders
-Permission1181=Read suppliers
-Permission1182=Read supplier orders
-Permission1183=Create/modify supplier orders
-Permission1184=Validate supplier orders
-Permission1185=Approve supplier orders
-Permission1186=Order supplier orders
-Permission1187=Acknowledge receipt of supplier orders
-Permission1188=Delete supplier orders
-Permission1190=Approve (second approval) supplier orders
-Permission1201=Get result of an export
-Permission1202=Create/Modify an export
-Permission1231=Read supplier invoices
-Permission1232=Create/modify supplier invoices
-Permission1233=Validate supplier invoices
-Permission1234=Delete supplier invoices
-Permission1235=Send supplier invoices by email
-Permission1236=Export supplier invoices, attributes and payments
-Permission1237=Export supplier orders and their details
-Permission1251=Run mass imports of external data into database (data load)
-Permission1321=Export customer invoices, attributes and payments
-Permission1322=Reopen a paid bill
-Permission1421=Export customer orders and attributes
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
-Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
-Permission20006=Admin leave requests (setup and update balance)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
-Permission2401=Read actions (events or tasks) linked to his account
-Permission2402=Create/modify actions (events or tasks) linked to his account
-Permission2403=Delete actions (events or tasks) linked to his account
-Permission2411=Read actions (events or tasks) of others
-Permission2412=Create/modify actions (events or tasks) of others
-Permission2413=Delete actions (events or tasks) of others
-Permission2414=Export actions/tasks of others
-Permission2501=Read/Download documents
-Permission2502=Download documents
-Permission2503=Submit or delete documents
-Permission2515=Setup documents directories
-Permission2801=Use FTP client in read mode (browse and download only)
-Permission2802=Use FTP client in write mode (delete or upload files)
-Permission50101=Use Point of sales
-Permission50201=Read transactions
-Permission50202=Import transactions
-Permission54001=Print
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
-Permission59003=Read every user margin
-Permission63001=Read resources
-Permission63002=Create/modify resources
-Permission63003=Delete resources
-Permission63004=Link resources to agenda events
-DictionaryCompanyType=Types of thirdparties
-DictionaryCompanyJuridicalType=Legal forms of thirdparties
-DictionaryProspectLevel=Prospect potential level
-DictionaryCanton=State/Province
-DictionaryRegion=Regions
-DictionaryCountry=Countries
-DictionaryCurrency=Currencies
-DictionaryCivility=Personal and professional titles
-DictionaryActions=Types of agenda events
-DictionarySocialContributions=Social or fiscal taxes types
-DictionaryVAT=VAT Rates or Sales Tax Rates
-DictionaryRevenueStamp=Amount of revenue stamps
-DictionaryPaymentConditions=Payment terms
-DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact/Address types
-DictionaryEcotaxe=Ecotax (WEEE)
-DictionaryPaperFormat=Paper formats
-DictionaryFormatCards=Cards formats
-DictionaryFees=Types of fees
-DictionarySendingMethods=Shipping methods
-DictionaryStaff=Staff
-DictionaryAvailability=Delivery delay
-DictionaryOrderMethods=Ordering methods
-DictionarySource=Origin of proposals/orders
-DictionaryAccountancyCategory=Accounting account groups
-DictionaryAccountancysystem=Models for chart of accounts
-DictionaryEMailTemplates=Emails templates
-DictionaryUnits=Units
-DictionaryProspectStatus=Prospection status
-DictionaryHolidayTypes=Types of leaves
-DictionaryOpportunityStatus=Opportunity status for project/lead
-SetupSaved=Setup saved
-BackToModuleList=Back to modules list
-BackToDictionaryList=Back to dictionaries list
-VATManagement=VAT Management
-VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
-VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies.
-VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
-##### Local Taxes #####
-LTRate=Rate
-LocalTax1IsNotUsed=Do not use second tax
-LocalTax1IsUsedDesc=Use a second type of tax (other than VAT)
-LocalTax1IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax1Management=Second type of tax
-LocalTax1IsUsedExample=
-LocalTax1IsNotUsedExample=
-LocalTax2IsNotUsed=Do not use third tax
-LocalTax2IsUsedDesc=Use a third type of tax (other than VAT)
-LocalTax2IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax2Management=Third type of tax
-LocalTax2IsUsedExample=
-LocalTax2IsNotUsedExample=
-LocalTax1ManagementES= RE Management
-LocalTax1IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If te buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
-LocalTax1IsNotUsedDescES= By default the proposed RE is 0. End of rule.
-LocalTax1IsUsedExampleES= In Spain they are professionals subject to some specific sections of the Spanish IAE.
-LocalTax1IsNotUsedExampleES= In Spain they are professional and societies and subject to certain sections of the Spanish IAE.
-LocalTax2ManagementES= IRPF Management
-LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
-LocalTax2IsNotUsedDescES= By default the proposed IRPF is 0. End of rule.
-LocalTax2IsUsedExampleES= In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
-LocalTax2IsNotUsedExampleES= In Spain they are bussines not subject to tax system of modules.
-CalcLocaltax=Reports on local taxes
-CalcLocaltax1=Sales - Purchases
-CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2=Purchases
-CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3=Sales
-CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
-LabelUsedByDefault=Label used by default if no translation can be found for code
-LabelOnDocuments=Label on documents
-NbOfDays=Nb of days
-AtEndOfMonth=At end of month
-CurrentNext=Current/Next
-Offset=Offset
-AlwaysActive=Always active
-Upgrade=Upgrade
-MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Deploy/install external module
-WebServer=Web server
-DocumentRootServer=Web server's root directory
-DataRootServer=Data files directory
-IP=IP
-Port=Port
-VirtualServerName=Virtual server name
-OS=OS
-PhpWebLink=Web-Php link
-Browser=Browser
-Server=Server
-Database=Database
-DatabaseServer=Database host
-DatabaseName=Database name
-DatabasePort=Database port
-DatabaseUser=Database user
-DatabasePassword=Database password
-Tables=Tables
-TableName=Table name
-NbOfRecord=Nb of records
-Host=Server
-DriverType=Driver type
-SummarySystem=System information summary
-SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Foundation
-DefaultMenuManager= Standard menu manager
-DefaultMenuSmartphoneManager=Smartphone menu manager
-Skin=Skin theme
-DefaultSkin=Default skin theme
-MaxSizeList=Max length for list
-DefaultMaxSizeList=Default max length for lists
-DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
-MessageOfDay=Message of the day
-MessageLogin=Login page message
-PermanentLeftSearchForm=Permanent search form on left menu
-DefaultLanguage=Default language to use (language code)
-EnableMultilangInterface=Enable multilingual interface
-EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/foundation information
-CompanyIds=Company/foundation identities
-CompanyName=Name
-CompanyAddress=Address
-CompanyZip=Zip
-CompanyTown=Town
-CompanyCountry=Country
-CompanyCurrency=Main currency
-CompanyObject=Object of the company
-Logo=Logo
-DoNotSuggestPaymentMode=Do not suggest
-NoActiveBankAccountDefined=No active bank account defined
-OwnerOfBankAccount=Owner of bank account %s
-BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show link "<strong>%s</strong>"
-Alerts=Alerts
-DelaysOfToleranceBeforeWarning=Tolerance delays before warning
-DelaysOfToleranceDesc=This screen allows you to define the tolerated delays before an alert is reported on screen with picto %s for each late element.
-Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned events (agenda events) not completed yet
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Delay tolerance (in days) before alert on project not closed in time
-Delays_MAIN_DELAY_TASKS_TODO=Delay tolerance (in days) before alert on planned tasks (project tasks) not completed yet
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on orders not processed yet
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on suppliers orders not processed yet
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Delay tolerance (in days) before alert on proposals to close
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Delay tolerance (in days) before alert on proposals not billed
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerance delay (in days) before alert on services to activate
-Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerance delay (in days) before alert on expired services
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerance delay (in days) before alert on unpaid supplier invoices
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerence delay (in days) before alert on unpaid client invoices
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerance delay (in days) before alert on pending bank reconciliation
-Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed membership fee
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
-Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
-SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
-SetupDescription5=Other menu entries manage optional parameters.
-LogEvents=Security audit events
-Audit=Audit
-InfoDolibarr=About Dolibarr
-InfoBrowser=About Browser
-InfoOS=About OS
-InfoWebServer=About Web Server
-InfoDatabase=About Database
-InfoPHP=About PHP
-InfoPerf=About Performances
-BrowserName=Browser name
-BrowserOS=Browser OS
-ListOfSecurityEvents=List of Dolibarr security events
-SecurityEventsPurged=Security events purged
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
-SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
-SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
-DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
-AvailableModules=Available 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.
-TriggersAvailable=Available triggers
-TriggersDesc=Triggers are files that will modify the behaviour of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realised new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
-TriggerDisabledByName=Triggers in this file are disabled by the <b>-NORUN</b> suffix in their name.
-TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module <b>%s</b> is disabled.
-TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules.
-TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
-GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password
-DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">check here</a>.
-MiscellaneousDesc=All other security related parameters are defined here.
-LimitsSetup=Limits/Precision setup
-LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here
-MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices
-MAIN_MAX_DECIMALS_TOT=Max decimals for total prices
-MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add <b>...</b> after this number if you want to see <b>...</b> when number is truncated when shown on screen)
-MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
-UnitPriceOfProduct=Net unit price of a product
-TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
-ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
-NoEventFoundWithCriteria=No security event has been found for such search criterias.
-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.
-BackupDescX=Archived directory should be stored in a secure place.
-BackupDescY=The generated dump file should be stored in a secure place.
-BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one
-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 directoy (<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=Available database backup dump files
-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
-DownloadMoreSkins=More skins to download
-SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence without hole and with no reset
-ShowProfIdInAddress=Show professionnal id with addresses on documents
-ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents
-TranslationUncomplete=Partial translation
-MAIN_DISABLE_METEO=Disable meteo view
-TestLoginToAPI=Test login to API
-ProxyDesc=Some features of Dolibarr need to have an Internet access to work. Define here parameters for this. If the Dolibarr server is behind a Proxy server, those parameters tells Dolibarr how to access Internet through it.
-ExternalAccess=External access
-MAIN_PROXY_USE=Use a proxy server (otherwise direct access to internet)
-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 all attributes, not already available by default, and that you want to be supported for %s.
-ExtraFields=Complementary attributes
-ExtraFieldsLines=Complementary attributes (lines)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
-ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact/address)
-ExtraFieldsMember=Complementary attributes (member)
-ExtraFieldsMemberType=Complementary attributes (member type)
-ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
-ExtraFieldsSupplierOrders=Complementary attributes (orders)
-ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
-ExtraFieldsProject=Complementary attributes (projects)
-ExtraFieldsProjectTask=Complementary attributes (tasks)
-ExtraFieldHasWrongValue=Attribute %s has a wrong value.
-AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
-SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
-PathToDocuments=Path to documents
-PathDirectory=Directory
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might 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.
-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: <strong>User display setup</strong> tab of 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
-TranslationString=Translation string
-CurrentTranslationString=Current translation string
-WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
-NewTranslationStringToShow=New translation string to show
-OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
-YouMustEnableOneModule=You must at least enable 1 module
-ClassNotFoundIntoPathWarning=Class %s not found into PHP path
-YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
-SuhosinSessionEncrypt=Session storage encrypted by Suhosin
-ConditionIsCurrently=Condition is currently %s
-YouUseBestDriver=You use driver %s that is best driver available currently.
-YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required 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.
-BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance.
-BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
-AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp".
-AskForPreferredShippingMethod=Ask for preferred Sending Method for Third Parties.
-FieldEdition=Edition of field %s
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
-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.
-PasswordGenerationPerso=Return a password according to your personally defined configuration.
-SetupPerso=According to your configuration
-PasswordPatternDesc=Password pattern description
-##### Users setup #####
-RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passwords
-DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page
-UsersSetup=Users module setup
-UserMailRequired=EMail required to create a new user
-##### HRM setup #####
-HRMSetup=HRM module setup
-##### Company setup #####
-CompanySetup=Companies module setup
-CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier)
-AccountCodeManager=Module for accountancy code generation (customer or supplier)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
-NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
-NotificationsDescGlobal=* or by setting global target emails in module setup page.
-ModelModules=Documents templates
-DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
-WatermarkOnDraft=Watermark on draft document
-JSOnPaimentBill=Activate feature to autofill payment lines on payment form
-CompanyIdProfChecker=Rules on Professional Ids
-MustBeUnique=Must be unique?
-MustBeMandatory=Mandatory to create third parties?
-MustBeInvoiceMandatory=Mandatory to validate invoices?
-##### Webcal setup #####
-WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
-##### Invoices #####
-BillsSetup=Invoices module setup
-BillsNumberingModule=Invoices and credit notes numbering model
-BillsPDFModules=Invoice documents models
-CreditNote=Credit note
-CreditNotes=Credit notes
-ForceInvoiceDate=Force invoice date to validation date
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
-SuggestPaymentByRIBOnAccount=Suggest payment by withdraw on account
-SuggestPaymentByChequeToAddress=Suggest payment by cheque to
-FreeLegalTextOnInvoices=Free text on invoices
-WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
-PaymentsNumberingModule=Payments numbering model
-SuppliersPayment=Suppliers payments
-SupplierPaymentSetup=Suppliers payments setup
-##### Proposals #####
-PropalSetup=Commercial proposals module setup
-ProposalsNumberingModules=Commercial proposal numbering models
-ProposalsPDFModules=Commercial proposal documents models
-FreeLegalTextOnProposal=Free text on commercial proposals
-WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
-WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
-##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
-##### Orders #####
-OrdersSetup=Order management setup
-OrdersNumberingModules=Orders numbering models
-OrdersModelModule=Order documents models
-FreeLegalTextOnOrders=Free text on orders
-WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
-ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Interventions #####
-InterventionsSetup=Interventions module setup
-FreeLegalTextOnInterventions=Free text on intervention documents
-FicheinterNumberingModules=Intervention numbering models
-TemplatePDFInterventions=Intervention card documents models
-WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
-##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
-ContractsNumberingModules=Contracts numbering modules
-TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
-##### Members #####
-MembersSetup=Members module setup
-MemberMainOptions=Main options
-AdherentLoginRequired= Manage a Login for each member
-AdherentMailRequired=EMail required to create a new member
-MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
-##### LDAP setup #####
-LDAPSetup=LDAP Setup
-LDAPGlobalParameters=Global parameters
-LDAPUsersSynchro=Users
-LDAPGroupsSynchro=Groups
-LDAPContactsSynchro=Contacts
-LDAPMembersSynchro=Members
-LDAPSynchronization=LDAP synchronisation
-LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP
-LDAPToDolibarr=LDAP -> Dolibarr
-DolibarrToLDAP=Dolibarr -> LDAP
-LDAPNamingAttribute=Key in LDAP
-LDAPSynchronizeUsers=Organization of users in LDAP
-LDAPSynchronizeGroups=Organization of groups in LDAP
-LDAPSynchronizeContacts=Organization of contacts in LDAP
-LDAPSynchronizeMembers=Organization of foundation's members in LDAP
-LDAPPrimaryServer=Primary server
-LDAPSecondaryServer=Secondary server
-LDAPServerPort=Server port
-LDAPServerPortExample=Default port : 389
-LDAPServerProtocolVersion=Protocol version
-LDAPServerUseTLS=Use TLS
-LDAPServerUseTLSExample=Your LDAP server use TLS
-LDAPServerDn=Server DN
-LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
-LDAPPassword=Administrator password
-LDAPUserDn=Users' DN
-LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
-LDAPGroupDn=Groups' DN
-LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com)
-LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
-LDAPServerDnExample=Complete DN (ex: dc=example,dc=com)
-LDAPDnSynchroActive=Users and groups synchronization
-LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization
-LDAPDnContactActive=Contacts' synchronization
-LDAPDnContactActiveExample=Activated/Unactivated synchronization
-LDAPDnMemberActive=Members' synchronization
-LDAPDnMemberActiveExample=Activated/Unactivated synchronization
-LDAPContactDn=Dolibarr contacts' DN
-LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com)
-LDAPMemberDn=Dolibarr members DN
-LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com)
-LDAPMemberObjectClassList=List of objectClass
-LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPUserObjectClassList=List of objectClass
-LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPGroupObjectClassList=List of objectClass
-LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
-LDAPContactObjectClassList=List of objectClass
-LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPTestConnect=Test LDAP connection
-LDAPTestSynchroContact=Test contacts synchronization
-LDAPTestSynchroUser=Test user synchronization
-LDAPTestSynchroGroup=Test group synchronization
-LDAPTestSynchroMember=Test member synchronization
-LDAPTestSearch= Test a LDAP search
-LDAPSynchroOK=Synchronization test successful
-LDAPSynchroKO=Failed synchronization test
-LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that connexion to server is correctly configured and allows LDAP udpates
-LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s)
-LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s)
-LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPBindKO=Connect/Authentificate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPSetupForVersion3=LDAP server configured for version 3
-LDAPSetupForVersion2=LDAP server configured for version 2
-LDAPDolibarrMapping=Dolibarr Mapping
-LDAPLdapMapping=LDAP Mapping
-LDAPFieldLoginUnix=Login (unix)
-LDAPFieldLoginExample=Example : uid
-LDAPFilterConnection=Search filter
-LDAPFilterConnectionExample=Example : &(objectClass=inetOrgPerson)
-LDAPFieldLoginSamba=Login (samba, activedirectory)
-LDAPFieldLoginSambaExample=Example : samaccountname
-LDAPFieldFullname=Full name
-LDAPFieldFullnameExample=Example : cn
-LDAPFieldPasswordNotCrypted=Password not crypted
-LDAPFieldPasswordCrypted=Password crypted
-LDAPFieldPasswordExample=Example : userPassword
-LDAPFieldCommonNameExample=Example : cn
-LDAPFieldName=Name
-LDAPFieldNameExample=Example : sn
-LDAPFieldFirstName=First name
-LDAPFieldFirstNameExample=Example : givenName
-LDAPFieldMail=Email address
-LDAPFieldMailExample=Example : mail
-LDAPFieldPhone=Professional phone number
-LDAPFieldPhoneExample=Example : telephonenumber
-LDAPFieldHomePhone=Personal phone number
-LDAPFieldHomePhoneExample=Example : homephone
-LDAPFieldMobile=Cellular phone
-LDAPFieldMobileExample=Example : mobile
-LDAPFieldFax=Fax number
-LDAPFieldFaxExample=Example : facsimiletelephonenumber
-LDAPFieldAddress=Street
-LDAPFieldAddressExample=Example : street
-LDAPFieldZip=Zip
-LDAPFieldZipExample=Example : postalcode
-LDAPFieldTown=Town
-LDAPFieldTownExample=Example : l
-LDAPFieldCountry=Country
-LDAPFieldDescription=Description
-LDAPFieldDescriptionExample=Example : description
-LDAPFieldNotePublic=Public Note
-LDAPFieldNotePublicExample=Example : publicnote
-LDAPFieldGroupMembers= Group members
-LDAPFieldGroupMembersExample= Example : uniqueMember
-LDAPFieldBirthdate=Birthdate
-LDAPFieldCompany=Company
-LDAPFieldCompanyExample=Example : o
-LDAPFieldSid=SID
-LDAPFieldSidExample=Example : objectsid
-LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Job position
-LDAPFieldTitleExample=Example: title
-LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
-LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
-LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts.
-LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users.
-LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups.
-LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module.
-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 advices related to performance.
-NotInstalled=Not installed, so your server is not slow 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.
-MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
-MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
-OPCodeCache=OPCode cache
-NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad).
-HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
-FilesOfTypeCached=Files of type %s are cached by HTTP server
-FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
-FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
-FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
-CacheByServer=Cache by server
-CacheByClient=Cache by browser
-CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
-##### Products #####
-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)
-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 third party language
-UseSearchToSelectProductTooltip=Also if you have a large number of product (> 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)
-SetDefaultBarcodeTypeProducts=Default barcode type to use for products
-SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
-ProductCodeChecker= Module for product code generation and checking (product or service)
-ProductOtherConf= Product / Service configuration
-IsNotADir=is not a directory!
-##### Syslog #####
-SyslogSetup=Logs module setup
-SyslogOutput=Logs outputs
-SyslogFacility=Facility
-SyslogLevel=Level
-SyslogFilename=File name and path
-YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
-ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
-##### Donations #####
-DonationsSetup=Donation module setup
-DonationsReceiptModel=Template of donation receipt
-##### Barcode #####
-BarcodeSetup=Barcode setup
-PaperFormatModule=Print format module
-BarcodeEncodeModule=Barcode encoding type
-CodeBarGenerator=Barcode generator
-ChooseABarCode=No generator defined
-FormatNotSupportedByGenerator=Format not supported by this generator
-BarcodeDescEAN8=Barcode of type EAN8
-BarcodeDescEAN13=Barcode of type EAN13
-BarcodeDescUPC=Barcode of type UPC
-BarcodeDescISBN=Barcode of type ISBN
-BarcodeDescC39=Barcode of type C39
-BarcodeDescC128=Barcode of type C128
-BarcodeDescDATAMATRIX=Barcode of type Datamatrix
-BarcodeDescQRCODE=Barcode of type QR code
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
-BarcodeInternalEngine=Internal engine
-BarCodeNumberManager=Manager to auto define barcode numbers
-##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct debit payment orders
-##### ExternalRSS #####
-ExternalRSSSetup=External RSS imports setup
-NewRSS=New RSS Feed
-RSSUrl=RSS URL
-RSSUrlExample=An interesting RSS feed
-##### Mailing #####
-MailingSetup=EMailing module setup
-MailingEMailFrom=Sender EMail (From) for emails sent by emailing module
-MailingEMailError=Return EMail (Errors-to) for emails with errors
-MailingDelay=Seconds to wait after sending next message
-##### Notification #####
-NotificationSetup=EMail notification module setup
-NotificationEMailFrom=Sender EMail (From) for emails sent for notifications
-FixedEmailTarget=Fixed email target
-##### Sendings #####
-SendingsSetup=Sending module setup
-SendingsReceiptModel=Sending receipt model
-SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
-FreeLegalTextOnShippings=Free text on shipments
-##### Deliveries #####
-DeliveryOrderNumberingModules=Products deliveries receipt numbering module
-DeliveryOrderModel=Products deliveries receipt model
-DeliveriesOrderAbility=Support products deliveries receipts
-FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
-##### FCKeditor #####
-AdvancedEditor=Advanced editor
-ActivateFCKeditor=Activate advanced editor for:
-FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
-FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files.</font>
-FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
-FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
-##### OSCommerce 1 #####
-OSCommerceErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be an OSCommerce database (Key %s not found in table %s).
-OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' successfull.
-OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
-OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
-##### Stock #####
-StockSetup=Warehouse module setup
-IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
-##### Menu #####
-MenuDeleted=Menu deleted
-Menus=Menus
-TreeMenuPersonalized=Personalized menus
-NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
-NewMenu=New menu
-Menu=Selection of menu
-MenuHandler=Menu handler
-MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
-DetailId=Id menu
-DetailMenuHandler=Menu handler where to show new menu
-DetailMenuModule=Module name if menu entry come from a module
-DetailType=Type of menu (top or left)
-DetailTitre=Menu label or label code for translation
-DetailUrl=URL where menu send you (Absolute URL link or external link with http://)
-DetailEnabled=Condition to show or not entry
-DetailRight=Condition to display unauthorized grey menus
-DetailLangs=Lang file name for label code translation
-DetailUser=Intern / Extern / All
-Target=Target
-DetailTarget=Target for links (_blank top open a new window)
-DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu)
-ModifMenu=Menu change
-DeleteMenu=Delete menu entry
-ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
-FailedToInitializeMenu=Failed to initialize menu
-##### Tax #####
-TaxSetup=Taxes, social or fiscal taxes and dividends module setup
-OptionVatMode=VAT due
-OptionVATDefault=Cash basis
-OptionVATDebitOption=Accrual basis
-OptionVatDefaultDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on payments for services
-OptionVatDebitOptionDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on invoice (debit) for services
-SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
-OnDelivery=On delivery
-OnPayment=On payment
-OnInvoice=On invoice
-SupposedToBePaymentDate=Payment date used
-SupposedToBeInvoiceDate=Invoice date used
-Buy=Buy
-Sell=Sell
-InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
-AccountancyCode=Accountancy Code
-AccountancyCodeSell=Sale 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 -> Dictionary -> 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_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
-AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### 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 your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your 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.
-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 same computer than 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.
-##### Point Of Sales (CashDesk) #####
-CashDesk=Point of sales
-CashDeskSetup=Point of sales module setup
-CashDeskThirdPartyForSell=Default generic third party to use for sells
-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).
-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
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
-##### Bookmark #####
-BookmarkSetup=Bookmark module setup
-BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu.
-NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu
-##### WebServices #####
-WebServicesSetup=Webservices module setup
-WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
-WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
-EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
-##### API ####
-ApiSetup=API module setup
-ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
-OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
-ApiKey=Key for API
-WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
-##### Bank #####
-BankSetupModule=Bank module setup
-FreeLegalTextOnChequeReceipts=Free text on cheque receipts
-BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
-BankOrderGlobal=General
-BankOrderGlobalDesc=General display order
-BankOrderES=Spanish
-BankOrderESDesc=Spanish display order
-ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
-##### Multicompany #####
-MultiCompanySetup=Multi-company module setup
-##### Suppliers #####
-SuppliersSetup=Supplier module setup
-SuppliersCommandModel=Complete template of supplier order (logo...)
-SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
-SuppliersInvoiceNumberingModel=Supplier invoices numbering models
-IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
-##### GeoIPMaxmind #####
-GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
-NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
-YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
-YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
-TestGeoIPResult=Test of a conversion IP -> country
-##### Projects #####
-ProjectsNumberingModules=Projects numbering module
-ProjectsSetup=Project module setup
-ProjectsModelModule=Project reports document model
-TasksNumberingModules=Tasks numbering module
-TaskModelModule=Tasks reports document model
-UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
-##### ECM (GED) #####
-##### Fiscal Year #####
-AccountingPeriods=Accounting periods
-AccountingPeriodCard=Accounting period
-NewFiscalYear=New accounting period
-OpenFiscalYear=Open accounting period
-CloseFiscalYear=Close accounting period
-DeleteFiscalYear=Delete accounting period
-ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
-ShowFiscalYear=Show accounting period
-AlwaysEditable=Can always be edited
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
-Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
-IncludePath=Include path (defined into variable %s)
-ExpenseReportsSetup=Setup of module Expense Reports
-TemplatePDFExpenseReports=Document templates to generate expense report document
-NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
-YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of 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
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/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.
-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.
-ConfFileMuseContainCustom=Installing 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)
-TextTitleColor=Color of page title
-LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
-NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
-BackgroundColor=Background color
-TopMenuBackgroundColor=Background color for Top menu
-TopMenuDisableImages=Hide images in Top menu
-LeftMenuBackgroundColor=Background color for Left menu
-BackgroundTableTitleColor=Background color for Table title line
-BackgroundTableLineOddColor=Background color for odd table lines
-BackgroundTableLineEvenColor=Background color for even table lines
-MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
-NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
-UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
-PositionIntoComboList=Position of line into combo lists
-SellTaxRate=Sale tax rate
-RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
-UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipping, you can enter it here. You can use the key {TRACKID} into URL parameters so the system will replace it with value of tracking number user entered into shipment card.
-OpportunityPercent=When you create an opportunity, you will defined an estimated amount of project/lead. According to status of opportunity, this amount may be multiplicated 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
-FixTZ=TimeZone fix
-FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
-ExpectedChecksum=Expected Checksum
-CurrentChecksum=Current Checksum
-ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the latest stable version
-TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
-TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so 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 usefull only if your prices for each leve 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.
-SeeSubstitutionVars=See * note for list of possible substitution variables
-AllPublishers=All publishers
-UnknownPublishers=Unknown publishers
-AddRemoveTabs=Add or remove tabs
-AddDictionaries=Add dictionaries
-AddBoxes=Add widgets
-AddSheduledJobs=Add scheduled jobs
-AddHooks=Add hooks
-AddTriggers=Add triggers
-AddMenus=Add menus
-AddPermissions=Add permissions
-AddExportProfiles=Add export profiles
-AddImportProfiles=Add import profiles
-AddOtherPagesOrServices=Add other pages or services
-AddModels=Add document or numbering templates
-AddSubstitutions=Add keys substitutions
-DetectionNotPossible=Detection not possible
-UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved on 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 correclty. 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 inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <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
-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
-TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
-##### Resource ####
-ResourceSetup=Configuration du module Resource
-UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
diff --git a/htdocs/langs/es_BO/main.lang b/htdocs/langs/es_BO/main.lang
index 9ffa398137f..2e691473326 100644
--- a/htdocs/langs/es_BO/main.lang
+++ b/htdocs/langs/es_BO/main.lang
@@ -1,9 +1,5 @@
 # Dolibarr language file - Source file is en_US - main
 DIRECTION=ltr
-# Note for Chinese:
-# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
-# stsongstdlight or cid0cs are for simplified Chinese
-# To read Chinese pdf with Linux: sudo apt-get install poppler-data
 FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=.
@@ -23,799 +19,3 @@ FormatDateHourShort=%m/%d/%Y %I:%M %p
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
-DatabaseConnection=Database connection
-NoTemplateDefined=No template defined for this email type
-AvailableVariables=Available substitution variables
-NoTranslation=No translation
-NoRecordFound=No record found
-NoRecordDeleted=No record deleted
-NotEnoughDataYet=Not enough data
-NoError=No error
-Error=Error
-Errors=Errors
-ErrorFieldRequired=Field '%s' is required
-ErrorFieldFormat=Field '%s' has a bad value
-ErrorFileDoesNotExists=File %s does not exist
-ErrorFailedToOpenFile=Failed to open file %s
-ErrorCanNotCreateDir=Cannot create dir %s
-ErrorCanNotReadDir=Cannot read dir %s
-ErrorConstantNotDefined=Parameter %s not defined
-ErrorUnknown=Unknown error
-ErrorSQL=SQL Error
-ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this
-ErrorGoToModuleSetup=Go to Module setup to fix this
-ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
-ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
-ErrorInternalErrorDetected=Error detected
-ErrorWrongHostParameter=Wrong host parameter
-ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post again the form.
-ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child records.
-ErrorWrongValue=Wrong value
-ErrorWrongValueForParameterX=Wrong value for parameter %s
-ErrorNoRequestInError=No request in error
-ErrorServiceUnavailableTryLater=Service not available for 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>.
-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 nb of record per page
-NotAuthorized=You are not authorized to do that.
-SetDate=Set date
-SelectDate=Select a date
-SeeAlso=See also %s
-SeeHere=See here
-Apply=Apply
-BackgroundColorByDefault=Default background color
-FileRenamed=The file was successfully renamed
-FileUploaded=The file was successfully uploaded
-FileGenerated=The file was successfully generated
-FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
-NbOfEntries=Nb of entries
-GoToWikiHelpPage=Read online help (Internet access needed)
-GoToHelpPage=Read help
-RecordSaved=Record saved
-RecordDeleted=Record deleted
-LevelOfFeature=Level of features
-NotDefined=Not defined
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
-Administrator=Administrator
-Undefined=Undefined
-PasswordForgotten=Password forgotten?
-SeeAbove=See above
-HomeArea=Home area
-LastConnexion=Latest connection
-PreviousConnexion=Previous connection
-PreviousValue=Previous value
-ConnectedOnMultiCompany=Connected on environment
-ConnectedSince=Connected since
-AuthenticationMode=Authentication mode
-RequestedUrl=Requested URL
-DatabaseTypeManager=Database type manager
-RequestLastAccessInError=Latest database access request error
-ReturnCodeLastAccessInError=Return code for latest database access request error
-InformationLastAccessInError=Information for latest database access request error
-DolibarrHasDetectedError=Dolibarr has detected a technical error
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes
-MoreInformation=More information
-TechnicalInformation=Technical information
-TechnicalID=Technical ID
-NotePublic=Note (public)
-NotePrivate=Note (private)
-PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
-DoTest=Test
-ToFilter=Filter
-NoFilter=No filter
-WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance delay.
-yes=yes
-Yes=Yes
-no=no
-No=No
-All=All
-Home=Home
-Help=Help
-OnlineHelp=Online help
-PageWiki=Wiki page
-MediaBrowser=Media browser
-Always=Always
-Never=Never
-Under=under
-Period=Period
-PeriodEndDate=End date for period
-Activate=Activate
-Activated=Activated
-Closed=Closed
-Closed2=Closed
-NotClosed=Not closed
-Enabled=Enabled
-Deprecated=Deprecated
-Disable=Disable
-Disabled=Disabled
-Add=Add
-AddLink=Add link
-RemoveLink=Remove link
-AddToDraft=Add to draft
-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>?
-Delete=Delete
-Remove=Remove
-Resiliate=Terminate
-Cancel=Cancel
-Modify=Modify
-Edit=Edit
-Validate=Validate
-ValidateAndApprove=Validate and Approve
-ToValidate=To validate
-Save=Save
-SaveAs=Save As
-TestConnection=Test connection
-ToClone=Clone
-ConfirmClone=Choose data you want to clone :
-NoCloneOptionsSpecified=No data to clone defined.
-Of=of
-Go=Go
-Run=Run
-CopyOf=Copy of
-Show=Show
-Hide=Hide
-ShowCardHere=Show card
-Search=Search
-SearchOf=Search
-Valid=Valid
-Approve=Approve
-Disapprove=Disapprove
-ReOpen=Re-Open
-Upload=Send file
-ToLink=Link
-Select=Select
-Choose=Choose
-Resize=Resize
-Recenter=Recenter
-Author=Author
-User=User
-Users=Users
-Group=Group
-Groups=Groups
-NoUserGroupDefined=No user group defined
-Password=Password
-PasswordRetype=Retype your password
-NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
-Name=Name
-Person=Person
-Parameter=Parameter
-Parameters=Parameters
-Value=Value
-PersonalValue=Personal value
-NewValue=New value
-CurrentValue=Current value
-Code=Code
-Type=Type
-Language=Language
-MultiLanguage=Multi-language
-Note=Note
-Title=Title
-Label=Label
-RefOrLabel=Ref. or label
-Info=Log
-Family=Family
-Description=Description
-Designation=Description
-Model=Doc template
-DefaultModel=Default doc template
-Action=Event
-About=About
-Number=Number
-NumberByMonth=Number by month
-AmountByMonth=Amount by month
-Numero=Number
-Limit=Limit
-Limits=Limits
-Logout=Logout
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Connection
-Setup=Setup
-Alert=Alert
-Previous=Previous
-Next=Next
-Cards=Cards
-Card=Card
-Now=Now
-HourStart=Start hour
-Date=Date
-DateAndHour=Date and hour
-DateToday=Today's date
-DateReference=Reference date
-DateStart=Start date
-DateEnd=End date
-DateCreation=Creation date
-DateCreationShort=Creat. date
-DateModification=Modification date
-DateModificationShort=Modif. date
-DateLastModification=Latest modification date
-DateValidation=Validation date
-DateClosing=Closing date
-DateDue=Due date
-DateValue=Value date
-DateValueShort=Value date
-DateOperation=Operation date
-DateOperationShort=Oper. Date
-DateLimit=Limit date
-DateRequest=Request date
-DateProcess=Process date
-DateBuild=Report build date
-DatePayment=Date of payment
-DateApprove=Approving date
-DateApprove2=Approving date (second approval)
-UserCreation=Creation user
-UserModification=Modification user
-UserCreationShort=Creat. user
-UserModificationShort=Modif. user
-DurationYear=year
-DurationMonth=month
-DurationWeek=week
-DurationDay=day
-DurationYears=years
-DurationMonths=months
-DurationWeeks=weeks
-DurationDays=days
-Year=Year
-Month=Month
-Week=Week
-WeekShort=Week
-Day=Day
-Hour=Hour
-Minute=Minute
-Second=Second
-Years=Years
-Months=Months
-Days=Days
-days=days
-Hours=Hours
-Minutes=Minutes
-Seconds=Seconds
-Weeks=Weeks
-Today=Today
-Yesterday=Yesterday
-Tomorrow=Tomorrow
-Morning=Morning
-Afternoon=Afternoon
-Quadri=Quadri
-MonthOfDay=Month of the day
-HourShort=H
-MinuteShort=mn
-Rate=Rate
-CurrencyRate=Currency conversion rate
-UseLocalTax=Include tax
-Bytes=Bytes
-KiloBytes=Kilobytes
-MegaBytes=Megabytes
-GigaBytes=Gigabytes
-TeraBytes=Terabytes
-b=b.
-Kb=Kb
-Mb=Mb
-Gb=Gb
-Tb=Tb
-Cut=Cut
-Copy=Copy
-Paste=Paste
-Default=Default
-DefaultValue=Default value
-Price=Price
-UnitPrice=Unit price
-UnitPriceHT=Unit price (net)
-UnitPriceTTC=Unit price
-PriceU=U.P.
-PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (currency)
-PriceUTTC=U.P. (inc. tax)
-Amount=Amount
-AmountInvoice=Invoice amount
-AmountPayment=Payment amount
-AmountHTShort=Amount (net)
-AmountTTCShort=Amount (inc. tax)
-AmountHT=Amount (net of tax)
-AmountTTC=Amount (inc. tax)
-AmountVAT=Amount tax
-MulticurrencyAlreadyPaid=Already payed, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
-MulticurrencyAmountHT=Amount (net of tax), original currency
-MulticurrencyAmountTTC=Amount (inc. of tax), original currency
-MulticurrencyAmountVAT=Amount tax, original currency
-AmountLT1=Amount tax 2
-AmountLT2=Amount tax 3
-AmountLT1ES=Amount RE
-AmountLT2ES=Amount IRPF
-AmountTotal=Total amount
-AmountAverage=Average amount
-PriceQtyMinHT=Price quantity min. (net of tax)
-Percentage=Percentage
-Total=Total
-SubTotal=Subtotal
-TotalHTShort=Total (net)
-TotalHTShortCurrency=Total (net in currency)
-TotalTTCShort=Total (inc. tax)
-TotalHT=Total (net of tax)
-TotalHTforthispage=Total (net of tax) for this page
-Totalforthispage=Total for this page
-TotalTTC=Total (inc. tax)
-TotalTTCToYourCredit=Total (inc. tax) to your credit
-TotalVAT=Total tax
-TotalLT1=Total tax 2
-TotalLT2=Total tax 3
-TotalLT1ES=Total RE
-TotalLT2ES=Total IRPF
-HT=Net of tax
-TTC=Inc. tax
-VAT=Sales tax
-VATs=Sales taxes
-LT1ES=RE
-LT2ES=IRPF
-VATRate=Tax Rate
-Average=Average
-Sum=Sum
-Delta=Delta
-Module=Module
-Option=Option
-List=List
-FullList=Full list
-Statistics=Statistics
-OtherStatistics=Other statistics
-Status=Status
-Favorite=Favorite
-ShortInfo=Info.
-Ref=Ref.
-ExternalRef=Ref. extern
-RefSupplier=Ref. supplier
-RefPayment=Ref. payment
-CommercialProposalsShort=Commercial proposals
-Comment=Comment
-Comments=Comments
-ActionsToDo=Events to do
-ActionsToDoShort=To do
-ActionsDoneShort=Done
-ActionNotApplicable=Not applicable
-ActionRunningNotStarted=To start
-ActionRunningShort=In progress
-ActionDoneShort=Finished
-ActionUncomplete=Uncomplete
-CompanyFoundation=Company/Foundation
-ContactsForCompany=Contacts 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
-NActionsLate=%s late
-RequestAlreadyDone=Request already recorded
-Filter=Filter
-FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
-RemoveFilter=Remove filter
-ChartGenerated=Chart generated
-ChartNotGenerated=Chart not generated
-GeneratedOn=Build on %s
-Generate=Generate
-Duration=Duration
-TotalDuration=Total duration
-Summary=Summary
-DolibarrStateBoard=Statistics
-DolibarrWorkBoard=Work tasks board
-Available=Available
-NotYetAvailable=Not yet available
-NotAvailable=Not available
-Categories=Tags/categories
-Category=Tag/category
-By=By
-From=From
-to=to
-and=and
-or=or
-Other=Other
-Others=Others
-OtherInformations=Other informations
-Quantity=Quantity
-Qty=Qty
-ChangedBy=Changed by
-ApprovedBy=Approved by
-ApprovedBy2=Approved by (second approval)
-Approved=Approved
-Refused=Refused
-ReCalculate=Recalculate
-ResultKo=Failure
-Reporting=Reporting
-Reportings=Reporting
-Draft=Draft
-Drafts=Drafts
-Validated=Validated
-Opened=Opened
-New=New
-Discount=Discount
-Unknown=Unknown
-General=General
-Size=Size
-Received=Received
-Paid=Paid
-Topic=Subject
-ByCompanies=By third parties
-ByUsers=By users
-Links=Links
-Link=Link
-Rejects=Rejects
-Preview=Preview
-NextStep=Next step
-Datas=Data
-None=None
-NoneF=None
-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.
-Photo=Picture
-Photos=Pictures
-AddPhoto=Add picture
-DeletePicture=Picture delete
-ConfirmDeletePicture=Confirm picture deletion?
-Login=Login
-CurrentLogin=Current login
-EnterLoginDetail=Enter login details
-January=January
-February=February
-March=March
-April=April
-May=May
-June=June
-July=July
-August=August
-September=September
-October=October
-November=November
-December=December
-JanuaryMin=Jan
-FebruaryMin=Feb
-MarchMin=Mar
-AprilMin=Apr
-MayMin=May
-JuneMin=Jun
-JulyMin=Jul
-AugustMin=Aug
-SeptemberMin=Sep
-OctoberMin=Oct
-NovemberMin=Nov
-DecemberMin=Dec
-Month01=January
-Month02=February
-Month03=March
-Month04=April
-Month05=May
-Month06=June
-Month07=July
-Month08=August
-Month09=September
-Month10=October
-Month11=November
-Month12=December
-MonthShort01=Jan
-MonthShort02=Feb
-MonthShort03=Mar
-MonthShort04=Apr
-MonthShort05=May
-MonthShort06=Jun
-MonthShort07=Jul
-MonthShort08=Aug
-MonthShort09=Sep
-MonthShort10=Oct
-MonthShort11=Nov
-MonthShort12=Dec
-AttachedFiles=Attached files and documents
-FileTransferComplete=File was uploaded successfuly
-DateFormatYYYYMM=YYYY-MM
-DateFormatYYYYMMDD=YYYY-MM-DD
-DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
-ReportName=Report name
-ReportPeriod=Report period
-ReportDescription=Description
-Report=Report
-Keyword=Keyword
-Origin=Origin
-Legend=Legend
-Fill=Fill
-Reset=Reset
-File=File
-Files=Files
-NotAllowed=Not allowed
-ReadPermissionNotAllowed=Read permission not allowed
-AmountInCurrency=Amount in %s currency
-Example=Example
-Examples=Examples
-NoExample=No example
-FindBug=Report a bug
-NbOfThirdParties=Number of third parties
-NbOfLines=Number of lines
-NbOfObjects=Number of objects
-NbOfObjectReferers=Number of related items
-Referers=Related items
-TotalQuantity=Total quantity
-DateFromTo=From %s to %s
-DateFrom=From %s
-DateUntil=Until %s
-Check=Check
-Uncheck=Uncheck
-Internal=Internal
-External=External
-Internals=Internal
-Externals=External
-Warning=Warning
-Warnings=Warnings
-BuildDoc=Build Doc
-Entity=Environment
-Entities=Entities
-CustomerPreview=Customer preview
-SupplierPreview=Supplier preview
-ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show supplier preview
-RefCustomer=Ref. customer
-Currency=Currency
-InfoAdmin=Information for administrators
-Undo=Undo
-Redo=Redo
-ExpandAll=Expand all
-UndoExpandAll=Undo expand
-Reason=Reason
-FeatureNotYetSupported=Feature not yet supported
-CloseWindow=Close window
-Response=Response
-Priority=Priority
-SendByMail=Send by EMail
-MailSentBy=Email sent by
-TextUsedInTheMessageBody=Email body
-SendAcknowledgementByMail=Send confirmation email
-EMail=E-mail
-NoEMail=No email
-Email=Email
-NoMobilePhone=No mobile phone
-Owner=Owner
-FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
-Refresh=Refresh
-BackToList=Back to list
-GoBack=Go back
-CanBeModifiedIfOk=Can be modified if valid
-CanBeModifiedIfKo=Can be modified if not valid
-ValueIsValid=Value is valid
-ValueIsNotValid=Value is not valid
-RecordCreatedSuccessfully=Record created successfully
-RecordModifiedSuccessfully=Record modified successfully
-RecordsModified=%s record modified
-RecordsDeleted=%s record deleted
-AutomaticCode=Automatic code
-FeatureDisabled=Feature disabled
-MoveBox=Move widget
-Offered=Offered
-NotEnoughPermissions=You don't have permission for this action
-SessionName=Session name
-Method=Method
-Receive=Receive
-CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
-ExpectedValue=Expected Value
-CurrentValue=Current value
-PartialWoman=Partial
-TotalWoman=Total
-NeverReceived=Never received
-Canceled=Canceled
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
-Color=Color
-Documents=Linked files
-Documents2=Documents
-UploadDisabled=Upload disabled
-MenuECM=Documents
-MenuAWStats=AWStats
-MenuMembers=Members
-MenuAgendaGoogle=Google agenda
-ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=No documents saved in this directory
-CurrentUserLanguage=Current language
-CurrentTheme=Current theme
-CurrentMenuManager=Current menu manager
-Browser=Browser
-Layout=Layout
-Screen=Screen
-DisabledModules=Disabled modules
-For=For
-ForCustomer=For customer
-Signature=Signature
-DateOfSignature=Date of signature
-HidePassword=Show command with password hidden
-UnHidePassword=Show real command with clear password
-Root=Root
-Informations=Informations
-Page=Page
-Notes=Notes
-AddNewLine=Add new line
-AddFile=Add file
-FreeZone=Free entry
-FreeLineOfType=Free entry of type
-CloneMainAttributes=Clone object with its main attributes
-PDFMerge=PDF Merge
-Merge=Merge
-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 application at the moment.
-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
-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.
-AccordingToGeoIPDatabase=(according to GeoIP convertion)
-Line=Line
-NotSupported=Not supported
-RequiredField=Required field
-Result=Result
-ToTest=Test
-ValidateBefore=Card must be validated before using this feature
-Visibility=Visibility
-Private=Private
-Hidden=Hidden
-Resources=Resources
-Source=Source
-Prefix=Prefix
-Before=Before
-After=After
-IPAddress=IP address
-Frequency=Frequency
-IM=Instant messaging
-NewAttribute=New attribute
-AttributeCode=Attribute code
-URLPhoto=URL of photo/logo
-SetLinkToAnotherThirdParty=Link to another third party
-LinkTo=Link to
-LinkToProposal=Link to proposal
-LinkToOrder=Link to order
-LinkToInvoice=Link to invoice
-LinkToSupplierOrder=Link to supplier order
-LinkToSupplierProposal=Link to supplier proposal
-LinkToSupplierInvoice=Link to supplier invoice
-LinkToContract=Link to contract
-LinkToIntervention=Link to intervention
-CreateDraft=Create draft
-SetToDraft=Back to draft
-ClickToEdit=Click to edit
-ObjectDeleted=Object %s deleted
-ByCountry=By country
-ByTown=By town
-ByDate=By date
-ByMonthYear=By month/year
-ByYear=By year
-ByMonth=By month
-ByDay=By day
-BySalesRepresentative=By sales representative
-LinkedToSpecificUsers=Linked to a particular user contact
-NoResults=No results
-AdminTools=Admin tools
-SystemTools=System tools
-ModulesSystemTools=Modules tools
-Test=Test
-Element=Element
-NoPhotoYet=No pictures available yet
-Dashboard=Dashboard
-MyDashboard=My dashboard
-Deductible=Deductible
-from=from
-toward=toward
-Access=Access
-SelectAction=Select action
-HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
-SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
-OriginFileName=Original filename
-SetDemandReason=Set source
-SetBankAccount=Define Bank Account
-AccountCurrency=Account Currency
-ViewPrivateNote=View notes
-XMoreLines=%s line(s) hidden
-PublicUrl=Public URL
-AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
-PrintFile=Print File %s
-ShowTransaction=Show entry on bank account
-GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
-Deny=Deny
-Denied=Denied
-ListOfTemplates=List of templates
-Gender=Gender
-Genderman=Man
-Genderwoman=Woman
-ViewList=List view
-Mandatory=Mandatory
-Hello=Hello
-Sincerely=Sincerely
-DeleteLine=Delete line
-ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
-NoRecordSelected=No record selected
-MassFilesArea=Area for files built by mass actions
-ShowTempMassFilesArea=Show area of files built by mass actions
-RelatedObjects=Related Objects
-ClassifyBilled=Classify billed
-Progress=Progress
-ClickHere=Click here
-FrontOffice=Front office
-BackOffice=Back office
-View=View
-Export=Export
-Exports=Exports
-ExportFilteredList=Export filtered list
-ExportList=Export list
-Miscellaneous=Miscellaneous
-Calendar=Calendar
-GroupBy=Group by...
-ViewFlatList=View flat list
-RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Direct download link
-Download=Download
-ActualizeCurrency=Update currency rate
-Fiscalyear=Fiscal year
-# Week day
-Monday=Monday
-Tuesday=Tuesday
-Wednesday=Wednesday
-Thursday=Thursday
-Friday=Friday
-Saturday=Saturday
-Sunday=Sunday
-MondayMin=Mo
-TuesdayMin=Tu
-WednesdayMin=We
-ThursdayMin=Th
-FridayMin=Fr
-SaturdayMin=Sa
-SundayMin=Su
-Day1=Monday
-Day2=Tuesday
-Day3=Wednesday
-Day4=Thursday
-Day5=Friday
-Day6=Saturday
-Day0=Sunday
-ShortMonday=M
-ShortTuesday=T
-ShortWednesday=W
-ShortThursday=T
-ShortFriday=F
-ShortSaturday=S
-ShortSunday=S
-SelectMailModel=Select email template
-SetRef=Set ref
-Select2ResultFoundUseArrows=Some results found. Use arrows to select.
-Select2NotFound=No result found
-Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
-Select2LoadingMoreResults=Loading more results...
-Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
-SearchIntoContacts=Contacts
-SearchIntoMembers=Members
-SearchIntoUsers=Users
-SearchIntoProductsOrServices=Products or services
-SearchIntoProjects=Projects
-SearchIntoTasks=Tasks
-SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
-SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
-SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
-SearchIntoInterventions=Interventions
-SearchIntoContracts=Contracts
-SearchIntoCustomerShipments=Customer shipments
-SearchIntoExpenseReports=Expense reports
-SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/es_CL/accountancy.lang b/htdocs/langs/es_CL/accountancy.lang
index 7861a5bb087..7b3d42d1461 100644
--- a/htdocs/langs/es_CL/accountancy.lang
+++ b/htdocs/langs/es_CL/accountancy.lang
@@ -12,16 +12,12 @@ ACCOUNTING_MISCELLANEOUS_JOURNAL=Diario misceláneo
 Code_tiers=Socio de Negocio
 Labelcompte=Cuenta
 Sens=Significado
-AccountingCategory=Accounting category
 ThirdPartyAccount=Cuenta de socio de negocio
 ErrorDebitCredit=Débito y crédito no pueden tener el mismo valor
 ListAccounts=Lista de cuentas contables
 Pcgtype=Clase de cuenta
-Pcgsubtype=Bajo clase de cuenta
 TotalMarge=Margen total de ventas
 ErrorAccountancyCodeIsAlreadyUse=No puede eliminar esta cuenta porque está siendo usada
 OptionsDeactivatedForThisExportModel=Opciones desactivadas para este modelo de exportación
 Selectmodelcsv=Seleccione un modelo
 Modelcsv_normal=Exportación clasica
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
diff --git a/htdocs/langs/es_CL/admin.lang b/htdocs/langs/es_CL/admin.lang
index 5b5604b72e2..2a0da2ec1a3 100644
--- a/htdocs/langs/es_CL/admin.lang
+++ b/htdocs/langs/es_CL/admin.lang
@@ -1,584 +1,10 @@
 # Dolibarr language file - Source file is en_US - admin
-Foundation=Foundation
-Version=Version
-VersionProgram=Version program
-VersionLastInstall=Initial install version
-VersionLastUpgrade=Latest version upgrade
-VersionExperimental=Experimental
-VersionDevelopment=Development
-VersionUnknown=Unknown
-VersionRecommanded=Recommended
-FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. Value of some setup constants may also be checked. You can use this tool to detect if some files were modified by a hacker for example.
-FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
-GlobalChecksum=Global checksum
-MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
-LocalSignature=Embedded local signature (less reliable)
-RemoteSignature=Remote distant signature (more reliable)
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FilesModified=Modified Files
-FilesAdded=Added Files
-FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
-XmlNotFound=Xml Integrity File of application not found
-SessionId=Session ID
-SessionSaveHandler=Handler to save sessions
-SessionSavePath=Storage session localization
-PurgeSessions=Purge of sessions
-ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
-NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow to list all running sessions.
-LockNewSessions=Lock new connections
-ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself. Only user <b>%s</b> will be able to connect after that.
-UnlockNewSessions=Remove connection lock
-YourSession=Your session
-Sessions=Users session
-WebUserGroup=Web server user/group
-NoSessionFound=Your PHP seems to not allow to list active sessions. Directory used to save sessions (<b>%s</b>) might be protected (For example, by OS permissions or by PHP directive open_basedir).
-DBStoringCharset=Database charset to store data
-DBSortingCharset=Database charset to sort data
-WarningModuleNotActive=Module <b>%s</b> must be enabled
-WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page.
-DolibarrSetup=Dolibarr install or upgrade
-InternalUser=Internal user
-ExternalUser=External user
-InternalUsers=Internal users
-ExternalUsers=External users
-GUISetup=Display
-SetupArea=Setup area
-FormToTestFileUploadForm=Form to test file upload (according to setup)
-IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
-RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
-RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any usage of update tool.
-SecuritySetup=Security setup
-SecurityFilesDesc=Define here options related to security about uploading files.
-ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
-ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
-ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is not supported.
-DictionarySetup=Dictionary setup
-Dictionary=Dictionaries
-ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
-ErrorCodeCantContainZero=Code can't contain value 0
-DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
-UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties, but it is less convenient)
-DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact, but it is less convenient)
-NumberOfKeyToSearch=Nbr of characters to trigger search: %s
-NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
-AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
-JavascriptDisabled=JavaScript disabled
-UsePreviewTabs=Use preview tabs
-ShowPreview=Show preview
-PreviewNotAvailable=Preview not available
-ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
-MySQLTimeZone=TimeZone MySql (database)
-TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
-Space=Space
-Table=Table
-Fields=Fields
-Index=Index
-Mask=Mask
-NextValue=Next value
-NextValueForInvoices=Next value (invoices)
-NextValueForCreditNotes=Next value (credit notes)
-NextValueForDeposit=Next value (deposit)
-NextValueForReplacements=Next value (replacements)
-MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to <b>%s</b> %s, whatever this parameter's value is
-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
-AntiVirusParam= More parameters on command line
-AntiVirusParamExample= Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
-ComptaSetup=Accounting module setup
-UserSetup=User management setup
-MultiCurrencySetup=Multi-currency setup
-MenuLimits=Limits and accuracy
-MenuIdParent=Parent menu ID
-DetailMenuIdParent=ID of parent menu (empty for a top menu)
-DetailPosition=Sort number to define menu position
-AllMenus=All
-NotConfigured=Module not configured
-Active=Active
-SetupShort=Setup
-OtherOptions=Other options
-OtherSetup=Other setup
-CurrentValueSeparatorDecimal=Decimal separator
-CurrentValueSeparatorThousand=Thousand separator
-Destination=Destination
-IdModule=Module ID
-IdPermissions=Permissions ID
-Modules=Modules
-LanguageBrowserParameter=Parameter %s
-LocalisationDolibarrParameters=Localisation parameters
-ClientTZ=Client Time Zone (user)
-ClientHour=Client time (user)
-OSTZ=Server OS Time Zone
-PHPTZ=PHP server Time Zone
-DaylingSavingTime=Daylight saving time
-CurrentHour=PHP Time (server)
-CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
-Box=Widget
-Boxes=Widgets
-MaxNbOfLinesForBoxes=Max number of lines for widgets
-PositionByDefault=Default order
-Position=Position
-MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
-MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br />Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
-MenuForUsers=Menu for users
-LangFile=.lang file
-System=System
-SystemInfo=System information
-SystemToolsArea=System tools area
-SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for.
-Purge=Purge
-PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
-PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
-PurgeDeleteTemporaryFilesShort=Delete temporary files
-PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory <b>%s</b>. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted.
-PurgeRunNow=Purge now
-PurgeNothingToDelete=No directory or files to delete.
-PurgeNDirectoriesDeleted=<b>%s</b> files or directories deleted.
-PurgeAuditEvents=Purge all security events
-ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
-GenerateBackup=Generate backup
-Backup=Backup
-Restore=Restore
-RunCommandSummary=Backup has been launched with the following command
-BackupResult=Backup result
-BackupFileSuccessfullyCreated=Backup file successfully generated
-YouCanDownloadBackupFile=Generated files can now be downloaded
-NoBackupFileAvailable=No backup files available.
-ExportMethod=Export method
-ImportMethod=Import method
-ToBuildBackupFileClickHere=To build a backup file, click <a href="%s">here</a>.
-ImportMySqlDesc=To import a backup file, you must use mysql command from command line:
-ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line:
-ImportMySqlCommand=%s %s < mybackupfile.sql
-ImportPostgreSqlCommand=%s %s mybackupfile.sql
-FileNameToGenerate=File name to generate
-Compression=Compression
-CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
-CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
-ExportCompatibility=Compatibility of generated export file
-MySqlExportParameters=MySQL export parameters
-PostgreSqlExportParameters= PostgreSQL export parameters
-UseTransactionnalMode=Use transactional mode
-FullPathToMysqldumpCommand=Full path to mysqldump command
-FullPathToPostgreSQLdumpCommand=Full path to pg_dump command
-ExportOptions=Export Options
-AddDropDatabase=Add DROP DATABASE command
-AddDropTable=Add DROP TABLE command
-ExportStructure=Structure
-NameColumn=Name columns
-ExtendedInsert=Extended INSERT
-NoLockBeforeInsert=No lock commands around INSERT
-DelayedInsert=Delayed insert
-EncodeBinariesInHexa=Encode binary data in hexadecimal
-IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
-AutoDetectLang=Autodetect (browser language)
-FeatureDisabledInDemo=Feature disabled in demo
-FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Permissions
-BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
-OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
-ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external modules...
-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 (Note: anyone experienced in PHP programming can provide custom development for an open source project)
-WebSiteDesc=Reference websites to find more modules...
-URL=Link
-BoxesAvailable=Widgets available
-BoxesActivated=Widgets activated
-ActivateOn=Activate on
-ActiveOn=Activated on
-SourceFile=Source file
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
-Required=Required
-UsedOnlyWithTypeOption=Used by some agenda option only
-Security=Security
-Passwords=Passwords
-DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
-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 (Activated 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 make building of a global cumulated pdf not working (like unpaid invoices).
-Feature=Feature
-DolibarrLicense=License
-Developpers=Developers/contributors
-OfficialWebSite=Dolibarr international official web site
-OfficialWebSiteLocal=Local web site (%s)
-OfficialWiki=Dolibarr documentation on Wiki
-OfficialDemo=Dolibarr online demo
-OfficialMarketPlace=Official market place for external modules/addons
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
-ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
-HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
-HelpCenterDesc2=Some part of this service are available in <b>english only</b>.
-CurrentMenuHandler=Current menu handler
-MeasuringUnit=Measuring unit
-LeftMargin=Left margin
-TopMargin=Top margin
-PaperSize=Paper type
-Orientation=Orientation
-SpaceX=Space X
-SpaceY=Space Y
-FontSize=Font size
-Content=Content
-NoticePeriod=Notice period
-NewByMonth=New by month
-Emails=E-mails
-EMailsSetup=E-mails setup
-EMailsDesc=This page allows you to overwrite your PHP parameters for e-mails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless.
-MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
-MAIN_MAIL_EMAIL_FROM=Sender e-mail for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Sender e-mail used for error returns emails sent
-MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
-MAIN_DISABLE_ALL_MAILS=Disable all e-mails sendings (for test purposes or demos)
-MAIN_MAIL_SENDMODE=Method to use to send EMails
-MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
-MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
-MAIN_MAIL_EMAIL_TLS= Use TLS (SSL) encrypt
-MAIN_MAIL_EMAIL_STARTTLS= Use TLS (STARTTLS) encrypt
-MAIN_DISABLE_ALL_SMS=Disable all SMS sendings (for test purposes or demos)
-MAIN_SMS_SENDMODE=Method to use to send SMS
-MAIN_MAIL_SMS_FROM=Default sender phone number for Sms sending
-MAIN_MAIL_DEFAULT_FROMTYPE=Sender e-mail by default for manual sendings (User email or Company email)
-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/
-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 setup
-ModuleFamilyBase=System
-ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
-ModuleFamilyProducts=Products Management (PM)
-ModuleFamilyHr=Human Resource Management (HR)
-ModuleFamilyProjects=Projects/Collaborative work
-ModuleFamilyOther=Other
-ModuleFamilyTechnic=Multi-modules tools
-ModuleFamilyExperimental=Experimental modules
-ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
-ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
-ModuleFamilyInterface=Interfaces with external systems
-MenuHandlers=Menu handlers
-MenuAdmin=Menu editor
-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).
-DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <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>.
-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='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
-YouCanSubmitFile=For this step, you can send package using this tool: Select module file
-CurrentVersion=Dolibarr current version
-CallUpdatePage=Go to the page that updates the database structure and data: %s.
-LastStableVersion=Latest stable version
-LastActivationDate=Latest activation date
-UpdateServerOffline=Update server offline
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
-GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
-GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
-ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
-ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
-DoTestServerAvailability=Test server connectivity
-DoTestSend=Test sending
-DoTestSendHTML=Test sending HTML
-ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
-ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
-UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
-UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
-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...).
-MinLength=Minimum length
-LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
-ExamplesWithCurrentSetup=Examples with current running setup
-ListOfDirectories=List of OpenDocument templates directories
-ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
-NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories
+AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
+AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 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.
-ThemeDir=Skins directory
-ConnectionTimeout=Connexion timeout
-ResponseTimeout=Response timeout
-SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__
-ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
-SecurityToken=Key to secure URLs
-NoSmsEngine=No SMS sender manager available. SMS sender manager are not installed with default distribution (because they depends on an external supplier) but you can find some on %s
-PDF=PDF
-PDFDesc=You can set each global options related to the PDF generation
-PDFAddressForging=Rules to forge address boxes
-HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF
-HideDescOnPDF=Hide products description on generated PDF
-HideRefOnPDF=Hide products ref. on generated PDF
-HideDetailsOnPDF=Hide product lines details on generated PDF
-PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
-Library=Library
-UrlGenerationParameters=Parameters to secure URLs
-SecurityTokenIsUnique=Use a unique securekey parameter for each URL
-EnterRefToBuildUrl=Enter reference for object %s
-GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons to 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
-MassConvert=Launch mass convert
-String=String
-TextLong=Long text
-Int=Integer
-Float=Float
-DateAndTime=Date and hour
-Unique=Unique
-Boolean=Boolean (Checkbox)
-ExtrafieldPhone = Phone
-ExtrafieldPrice = Price
-ExtrafieldMail = Email
-ExtrafieldUrl = Url
-ExtrafieldSelect = Select list
-ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
-ExtrafieldPassword=Password
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
-ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
-LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
-SMS=SMS
-LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
-RefreshPhoneLink=Refresh link
-LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
-KeepEmptyToUseDefault=Keep empty to use default value
-DefaultLink=Default link
-SetAsDefault=Set as default
-ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
-BarcodeInitForThirdparties=Mass barcode init for thirdparties
-BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Init value for next %s empty records
-EraseAllCurrentBarCode=Erase all current barcode values
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
-AllBarcodeReset=All barcode values have been removed
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into 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
-DisplayCompanyInfo=Display company address
-DisplayCompanyManagers=Display manager names
-DisplayCompanyInfoAndManagers=Display company address and manager names
-EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
-ModuleCompanyCodePanicum=Return an empty accountancy code.
-ModuleCompanyCodeDigitaria=Accountancy 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: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-ClickToShowDescription=Click to show description
-# Modules
-Module0Name=Users & groups
-Module0Desc=Users / Employees and Groups management
-Module1Name=Third parties
-Module1Desc=Companies and contact management (customers, prospects...)
-Module2Name=Commercial
-Module2Desc=Commercial management
-Module10Name=Contabilidad
-Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
 Module20Name=Cotizaciones
 Module20Desc=Gestión de cotizaciones/propuestas comerciales
-Module22Name=Mass E-mailings
-Module22Desc=Mass E-mailing management
-Module23Name=Energy
-Module23Desc=Monitoring the consumption of energies
-Module25Name=Customer Orders
-Module25Desc=Customer order management
-Module30Name=Invoices
-Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
-Module40Name=Suppliers
-Module40Desc=Supplier management and buying (orders and invoices)
-Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
-Module49Name=Editors
-Module49Desc=Editor management
-Module50Name=Products
-Module50Desc=Product management
-Module51Name=Mass mailings
-Module51Desc=Mass paper mailing management
-Module52Name=Stocks
-Module52Desc=Stock management (products)
-Module53Name=Services
-Module53Desc=Service management
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
-Module55Name=Barcodes
-Module55Desc=Barcode management
-Module56Name=Telephony
-Module56Desc=Telephony integration
-Module57Name=Direct bank payment orders
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
-Module58Name=ClickToDial
-Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
-Module70Name=Interventions
-Module70Desc=Intervention management
-Module75Name=Expense and trip notes
-Module75Desc=Expense and trip notes management
-Module80Name=Shipments
-Module80Desc=Shipments and delivery order management
-Module85Name=Banks and cash
-Module85Desc=Management of bank or cash accounts
-Module100Name=External site
-Module100Desc=This module include an external web site or page into Dolibarr menus and view it into a Dolibarr frame
-Module105Name=Mailman and SPIP
-Module105Desc=Mailman or SPIP interface for member module
-Module200Name=LDAP
-Module200Desc=LDAP directory synchronisation
-Module210Name=PostNuke
-Module210Desc=PostNuke integration
-Module240Name=Data exports
-Module240Desc=Tool to export Dolibarr data (with assistants)
-Module250Name=Data imports
-Module250Desc=Tool to import data in Dolibarr  (with assistants)
-Module310Name=Members
-Module310Desc=Foundation members management
-Module320Name=RSS Feed
-Module320Desc=Add RSS feed inside Dolibarr screen pages
-Module330Name=Bookmarks
-Module330Desc=Bookmarks management
-Module400Name=Projects/Opportunities/Leads
-Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
-Module410Name=Webcalendar
-Module410Desc=Webcalendar integration
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
-Module520Name=Loan
-Module520Desc=Management of loans
-Module600Name=Notifications
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
-Module700Name=Donations
-Module700Desc=Donation management
-Module770Name=Expense reports
-Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
-Module1200Name=Mantis
-Module1200Desc=Mantis integration
 Module1400Name=Contabilidad
-Module1400Desc=Accounting management (double parties)
-Module1520Name=Document Generation
-Module1520Desc=Mass mail document generation
-Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
-Module2000Name=WYSIWYG editor
-Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
-Module2200Name=Dynamic Prices
-Module2200Desc=Enable the usage of math expressions for prices
-Module2300Name=Cron
-Module2300Desc=Scheduled job management
-Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
-Module2500Name=Electronic Content Management
-Module2500Desc=Save and share documents
-Module2600Name=API/Web services (SOAP server)
-Module2600Desc=Enable the Dolibarr SOAP server providing API services
-Module2610Name=API/Web services (REST server)
-Module2610Desc=Enable the Dolibarr REST server providing API services
-Module2660Name=Call WebServices (SOAP client)
-Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
-Module2700Name=Gravatar
-Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
-Module2800Desc=FTP Client
-Module2900Name=GeoIPMaxmind
-Module2900Desc=GeoIP Maxmind conversions capabilities
-Module3100Name=Skype
-Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
-Module4000Name=HRM
-Module4000Desc=Human resources management
-Module5000Name=Multi-company
-Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management
-Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
-Module20000Name=Leave Requests management
-Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Product lot
-Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
-Module50000Name=PayBox
-Module50000Desc=Module to offer an online payment page by credit card with PayBox
-Module50100Name=Point of sales
-Module50100Desc=Point of sales module (POS).
-Module50200Name=Paypal
-Module50200Desc=Module to offer an online payment page by credit card with Paypal
-Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double parties)
-Module54000Name=PrintIPP
-Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
-Module55000Name=Poll, Survey or Vote
-Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
-Module59000Name=Margins
-Module59000Desc=Module to manage margins
-Module60000Name=Commissions
-Module60000Desc=Module to manage commissions
-Module63000Name=Resources
-Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
-Permission11=Read customer invoices
-Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
-Permission14=Validate customer invoices
-Permission15=Send customer invoices by email
-Permission16=Create payments for customer invoices
-Permission19=Delete customer invoices
 Permission21=Consultar cotizaciones
 Permission22=Crear/modificar cotizaciones
 Permission24=Validar cotizaciones
@@ -586,1080 +12,11 @@ Permission25=Enviar las cotizaciones
 Permission26=Cerrar cotizaciones
 Permission27=Eliminar cotizaciones
 Permission28=Exportar las cotizaciones
-Permission31=Read products
-Permission32=Create/modify products
-Permission34=Delete products
-Permission36=See/manage hidden products
-Permission38=Export products
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
-Permission44=Delete projects (shared project and projects i'm contact for)
-Permission45=Export projects
-Permission61=Read interventions
-Permission62=Create/modify interventions
-Permission64=Delete interventions
-Permission67=Export interventions
-Permission71=Read members
-Permission72=Create/modify members
-Permission74=Delete members
-Permission75=Setup types of membership
-Permission76=Export data
-Permission78=Read subscriptions
-Permission79=Create/modify subscriptions
-Permission81=Read customers orders
-Permission82=Create/modify customers orders
-Permission84=Validate customers orders
-Permission86=Send customers orders
-Permission87=Close customers orders
-Permission88=Cancel customers orders
-Permission89=Delete customers orders
-Permission91=Read social or fiscal taxes and vat
-Permission92=Create/modify social or fiscal taxes and vat
-Permission93=Delete social or fiscal taxes and vat
-Permission94=Export social or fiscal taxes
-Permission95=Read reports
-Permission101=Read sendings
-Permission102=Create/modify sendings
-Permission104=Validate sendings
-Permission106=Export sendings
-Permission109=Delete sendings
-Permission111=Read financial accounts
-Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
-Permission114=Reconciliate transactions
-Permission115=Export transactions and account statements
-Permission116=Transfers between accounts
-Permission117=Manage cheques dispatching
-Permission121=Read third parties linked to user
-Permission122=Create/modify third parties linked to user
-Permission125=Delete third parties linked to user
-Permission126=Export third parties
-Permission141=Read all projects and tasks (also private projects i am not contact for)
-Permission142=Create/modify all projects and tasks (also private projects i am not 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
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
-Permission167=Export contracts
-Permission171=Read trips and expenses (yours and your subordinates)
-Permission172=Create/modify trips and expenses
-Permission173=Delete trips and expenses
-Permission174=Read all trips and expenses
-Permission178=Export trips and expenses
-Permission180=Read suppliers
-Permission181=Read supplier orders
-Permission182=Create/modify supplier orders
-Permission183=Validate supplier orders
-Permission184=Approve supplier orders
-Permission185=Order or cancel supplier orders
-Permission186=Receive supplier orders
-Permission187=Close supplier orders
-Permission188=Cancel supplier orders
-Permission192=Create lines
-Permission193=Cancel lines
-Permission194=Read the bandwith lines
-Permission202=Create ADSL connections
-Permission203=Order connections orders
-Permission204=Order connections
-Permission205=Manage connections
-Permission206=Read connections
-Permission211=Read Telephony
-Permission212=Order lines
-Permission213=Activate line
-Permission214=Setup Telephony
-Permission215=Setup providers
-Permission221=Read emailings
-Permission222=Create/modify emailings (topic, recipients...)
-Permission223=Validate emailings (allows sending)
-Permission229=Delete emailings
-Permission237=View recipients and info
-Permission238=Manually send mailings
-Permission239=Delete mailings after validation or sent
-Permission241=Read categories
-Permission242=Create/modify categories
-Permission243=Delete categories
-Permission244=See the contents of the hidden categories
-Permission251=Read other users and groups
-PermissionAdvanced251=Read other users
-Permission252=Read permissions of other users
-Permission253=Create/modify other users, groups and permisssions
-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 assignement matters).
-Permission271=Read CA
-Permission272=Read invoices
-Permission273=Issue invoices
-Permission281=Read contacts
-Permission282=Create/modify contacts
-Permission283=Delete contacts
-Permission286=Export contacts
-Permission291=Read tariffs
-Permission292=Set permissions on the tariffs
-Permission293=Modify costumers tariffs
-Permission300=Read bar codes
-Permission301=Create/modify bar codes
-Permission302=Delete bar codes
-Permission311=Read services
-Permission312=Assign service/subscription to contract
-Permission331=Read bookmarks
-Permission332=Create/modify bookmarks
-Permission333=Delete bookmarks
-Permission341=Read its own permissions
-Permission342=Create/modify his own user information
-Permission343=Modify his own password
-Permission344=Modify its own permissions
-Permission351=Read groups
-Permission352=Read groups permissions
-Permission353=Create/modify groups
-Permission354=Delete or disable groups
-Permission358=Export users
-Permission401=Read discounts
-Permission402=Create/modify discounts
-Permission403=Validate discounts
-Permission404=Delete discounts
-Permission510=Read Salaries
-Permission512=Create/modify salaries
-Permission514=Delete salaries
-Permission517=Export salaries
-Permission520=Read Loans
-Permission522=Create/modify loans
-Permission524=Delete loans
-Permission525=Access loan calculator
-Permission527=Export loans
-Permission531=Read services
-Permission532=Create/modify services
-Permission534=Delete services
-Permission536=See/manage hidden services
-Permission538=Export services
-Permission701=Read donations
-Permission702=Create/modify donations
-Permission703=Delete donations
-Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
-Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
-Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission779=Export expense reports
-Permission1001=Read stocks
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
-Permission1004=Read stock movements
-Permission1005=Create/modify stock movements
-Permission1101=Read delivery orders
-Permission1102=Create/modify delivery orders
-Permission1104=Validate delivery orders
-Permission1109=Delete delivery orders
-Permission1181=Read suppliers
-Permission1182=Read supplier orders
-Permission1183=Create/modify supplier orders
-Permission1184=Validate supplier orders
-Permission1185=Approve supplier orders
-Permission1186=Order supplier orders
-Permission1187=Acknowledge receipt of supplier orders
-Permission1188=Delete supplier orders
-Permission1190=Approve (second approval) supplier orders
-Permission1201=Get result of an export
-Permission1202=Create/Modify an export
-Permission1231=Read supplier invoices
-Permission1232=Create/modify supplier invoices
-Permission1233=Validate supplier invoices
-Permission1234=Delete supplier invoices
-Permission1235=Send supplier invoices by email
-Permission1236=Export supplier invoices, attributes and payments
-Permission1237=Export supplier orders and their details
-Permission1251=Run mass imports of external data into database (data load)
-Permission1321=Export customer invoices, attributes and payments
-Permission1322=Reopen a paid bill
-Permission1421=Export customer orders and attributes
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
-Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
-Permission20006=Admin leave requests (setup and update balance)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
-Permission2401=Read actions (events or tasks) linked to his account
-Permission2402=Create/modify actions (events or tasks) linked to his account
-Permission2403=Delete actions (events or tasks) linked to his account
-Permission2411=Read actions (events or tasks) of others
-Permission2412=Create/modify actions (events or tasks) of others
-Permission2413=Delete actions (events or tasks) of others
-Permission2414=Export actions/tasks of others
-Permission2501=Read/Download documents
-Permission2502=Download documents
-Permission2503=Submit or delete documents
-Permission2515=Setup documents directories
-Permission2801=Use FTP client in read mode (browse and download only)
-Permission2802=Use FTP client in write mode (delete or upload files)
-Permission50101=Use Point of sales
-Permission50201=Read transactions
-Permission50202=Import transactions
-Permission54001=Print
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
-Permission59003=Read every user margin
-Permission63001=Read resources
-Permission63002=Create/modify resources
-Permission63003=Delete resources
-Permission63004=Link resources to agenda events
-DictionaryCompanyType=Types of thirdparties
-DictionaryCompanyJuridicalType=Legal forms of thirdparties
-DictionaryProspectLevel=Prospect potential level
-DictionaryCanton=State/Province
-DictionaryRegion=Regions
-DictionaryCountry=Countries
-DictionaryCurrency=Currencies
-DictionaryCivility=Personal and professional titles
-DictionaryActions=Types of agenda events
-DictionarySocialContributions=Social or fiscal taxes types
-DictionaryVAT=VAT Rates or Sales Tax Rates
-DictionaryRevenueStamp=Amount of revenue stamps
-DictionaryPaymentConditions=Payment terms
-DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact/Address types
-DictionaryEcotaxe=Ecotax (WEEE)
-DictionaryPaperFormat=Paper formats
-DictionaryFormatCards=Cards formats
-DictionaryFees=Types of fees
-DictionarySendingMethods=Shipping methods
-DictionaryStaff=Staff
-DictionaryAvailability=Delivery delay
-DictionaryOrderMethods=Ordering methods
-DictionarySource=Origin of proposals/orders
-DictionaryAccountancyCategory=Accounting account groups
-DictionaryAccountancysystem=Models for chart of accounts
-DictionaryEMailTemplates=Emails templates
-DictionaryUnits=Units
-DictionaryProspectStatus=Prospection status
-DictionaryHolidayTypes=Types of leaves
-DictionaryOpportunityStatus=Opportunity status for project/lead
-SetupSaved=Setup saved
-BackToModuleList=Back to modules list
-BackToDictionaryList=Back to dictionaries list
-VATManagement=VAT Management
-VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
-VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies.
-VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
-##### Local Taxes #####
-LTRate=Rate
-LocalTax1IsNotUsed=Do not use second tax
-LocalTax1IsUsedDesc=Use a second type of tax (other than VAT)
-LocalTax1IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax1Management=Second type of tax
-LocalTax1IsUsedExample=
-LocalTax1IsNotUsedExample=
-LocalTax2IsNotUsed=Do not use third tax
-LocalTax2IsUsedDesc=Use a third type of tax (other than VAT)
-LocalTax2IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax2Management=Third type of tax
-LocalTax2IsUsedExample=
-LocalTax2IsNotUsedExample=
-LocalTax1ManagementES= RE Management
-LocalTax1IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If te buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
-LocalTax1IsNotUsedDescES= By default the proposed RE is 0. End of rule.
-LocalTax1IsUsedExampleES= In Spain they are professionals subject to some specific sections of the Spanish IAE.
-LocalTax1IsNotUsedExampleES= In Spain they are professional and societies and subject to certain sections of the Spanish IAE.
-LocalTax2ManagementES= IRPF Management
-LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
-LocalTax2IsNotUsedDescES= By default the proposed IRPF is 0. End of rule.
-LocalTax2IsUsedExampleES= In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
-LocalTax2IsNotUsedExampleES= In Spain they are bussines not subject to tax system of modules.
-CalcLocaltax=Reports on local taxes
-CalcLocaltax1=Sales - Purchases
-CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2=Purchases
-CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3=Sales
-CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
-LabelUsedByDefault=Label used by default if no translation can be found for code
-LabelOnDocuments=Label on documents
-NbOfDays=Nb of days
-AtEndOfMonth=At end of month
-CurrentNext=Current/Next
-Offset=Offset
-AlwaysActive=Always active
-Upgrade=Upgrade
-MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Deploy/install external module
-WebServer=Web server
-DocumentRootServer=Web server's root directory
-DataRootServer=Data files directory
-IP=IP
-Port=Port
-VirtualServerName=Virtual server name
-OS=OS
-PhpWebLink=Web-Php link
-Browser=Browser
-Server=Server
-Database=Database
-DatabaseServer=Database host
-DatabaseName=Database name
-DatabasePort=Database port
-DatabaseUser=Database user
-DatabasePassword=Database password
-Tables=Tables
-TableName=Table name
-NbOfRecord=Nb of records
-Host=Server
-DriverType=Driver type
-SummarySystem=System information summary
-SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Foundation
-DefaultMenuManager= Standard menu manager
-DefaultMenuSmartphoneManager=Smartphone menu manager
-Skin=Skin theme
-DefaultSkin=Default skin theme
-MaxSizeList=Max length for list
-DefaultMaxSizeList=Default max length for lists
-DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
-MessageOfDay=Message of the day
-MessageLogin=Login page message
-PermanentLeftSearchForm=Permanent search form on left menu
-DefaultLanguage=Default language to use (language code)
-EnableMultilangInterface=Enable multilingual interface
-EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/foundation information
-CompanyIds=Company/foundation identities
-CompanyName=Name
-CompanyAddress=Address
-CompanyZip=Zip
-CompanyTown=Town
-CompanyCountry=Country
-CompanyCurrency=Main currency
-CompanyObject=Object of the company
-Logo=Logo
-DoNotSuggestPaymentMode=Do not suggest
-NoActiveBankAccountDefined=No active bank account defined
-OwnerOfBankAccount=Owner of bank account %s
-BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show link "<strong>%s</strong>"
-Alerts=Alerts
-DelaysOfToleranceBeforeWarning=Tolerance delays before warning
-DelaysOfToleranceDesc=This screen allows you to define the tolerated delays before an alert is reported on screen with picto %s for each late element.
-Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned events (agenda events) not completed yet
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Delay tolerance (in days) before alert on project not closed in time
-Delays_MAIN_DELAY_TASKS_TODO=Delay tolerance (in days) before alert on planned tasks (project tasks) not completed yet
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on orders not processed yet
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on suppliers orders not processed yet
 Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Tolerancia de retraso antes de la alerta (en días) sobre cotizaciones a cerrar
 Delays_MAIN_DELAY_PROPALS_TO_BILL=Tolerancia de retraso antes de la alerta (en días) sobre cotizaciones no facturadas
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerance delay (in days) before alert on services to activate
-Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerance delay (in days) before alert on expired services
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerance delay (in days) before alert on unpaid supplier invoices
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerence delay (in days) before alert on unpaid client invoices
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerance delay (in days) before alert on pending bank reconciliation
-Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed membership fee
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
-Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
-SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
-SetupDescription5=Other menu entries manage optional parameters.
-LogEvents=Security audit events
-Audit=Audit
-InfoDolibarr=About Dolibarr
-InfoBrowser=About Browser
-InfoOS=About OS
-InfoWebServer=About Web Server
-InfoDatabase=About Database
-InfoPHP=About PHP
-InfoPerf=About Performances
-BrowserName=Browser name
-BrowserOS=Browser OS
-ListOfSecurityEvents=List of Dolibarr security events
-SecurityEventsPurged=Security events purged
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
-SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
-SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
-DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
-AvailableModules=Available 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.
-TriggersAvailable=Available triggers
-TriggersDesc=Triggers are files that will modify the behaviour of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realised new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
-TriggerDisabledByName=Triggers in this file are disabled by the <b>-NORUN</b> suffix in their name.
-TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module <b>%s</b> is disabled.
-TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules.
-TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
-GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password
-DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">check here</a>.
-MiscellaneousDesc=All other security related parameters are defined here.
-LimitsSetup=Limits/Precision setup
-LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here
-MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices
-MAIN_MAX_DECIMALS_TOT=Max decimals for total prices
-MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add <b>...</b> after this number if you want to see <b>...</b> when number is truncated when shown on screen)
-MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
-UnitPriceOfProduct=Net unit price of a product
-TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
-ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
-NoEventFoundWithCriteria=No security event has been found for such search criterias.
-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.
-BackupDescX=Archived directory should be stored in a secure place.
-BackupDescY=The generated dump file should be stored in a secure place.
-BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one
-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 directoy (<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=Available database backup dump files
-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
-DownloadMoreSkins=More skins to download
-SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence without hole and with no reset
-ShowProfIdInAddress=Show professionnal id with addresses on documents
-ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents
-TranslationUncomplete=Partial translation
-MAIN_DISABLE_METEO=Disable meteo view
-TestLoginToAPI=Test login to API
-ProxyDesc=Some features of Dolibarr need to have an Internet access to work. Define here parameters for this. If the Dolibarr server is behind a Proxy server, those parameters tells Dolibarr how to access Internet through it.
-ExternalAccess=External access
-MAIN_PROXY_USE=Use a proxy server (otherwise direct access to internet)
-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 all attributes, not already available by default, and that you want to be supported for %s.
-ExtraFields=Complementary attributes
-ExtraFieldsLines=Complementary attributes (lines)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
-ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact/address)
-ExtraFieldsMember=Complementary attributes (member)
-ExtraFieldsMemberType=Complementary attributes (member type)
-ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
-ExtraFieldsSupplierOrders=Complementary attributes (orders)
-ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
-ExtraFieldsProject=Complementary attributes (projects)
-ExtraFieldsProjectTask=Complementary attributes (tasks)
-ExtraFieldHasWrongValue=Attribute %s has a wrong value.
-AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
-SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
-PathToDocuments=Path to documents
-PathDirectory=Directory
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might 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.
-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: <strong>User display setup</strong> tab of 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
-TranslationString=Translation string
-CurrentTranslationString=Current translation string
-WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
-NewTranslationStringToShow=New translation string to show
-OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
-YouMustEnableOneModule=You must at least enable 1 module
-ClassNotFoundIntoPathWarning=Class %s not found into PHP path
-YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
-SuhosinSessionEncrypt=Session storage encrypted by Suhosin
-ConditionIsCurrently=Condition is currently %s
-YouUseBestDriver=You use driver %s that is best driver available currently.
-YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required 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.
-BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance.
-BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
-AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp".
-AskForPreferredShippingMethod=Ask for preferred Sending Method for Third Parties.
-FieldEdition=Edition of field %s
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
-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.
-PasswordGenerationPerso=Return a password according to your personally defined configuration.
-SetupPerso=According to your configuration
-PasswordPatternDesc=Password pattern description
-##### Users setup #####
-RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passwords
-DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page
-UsersSetup=Users module setup
-UserMailRequired=EMail required to create a new user
-##### HRM setup #####
-HRMSetup=HRM module setup
-##### Company setup #####
-CompanySetup=Companies module setup
-CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier)
-AccountCodeManager=Module for accountancy code generation (customer or supplier)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
-NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
-NotificationsDescGlobal=* or by setting global target emails in module setup page.
-ModelModules=Documents templates
-DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
-WatermarkOnDraft=Watermark on draft document
-JSOnPaimentBill=Activate feature to autofill payment lines on payment form
-CompanyIdProfChecker=Rules on Professional Ids
-MustBeUnique=Must be unique?
-MustBeMandatory=Mandatory to create third parties?
-MustBeInvoiceMandatory=Mandatory to validate invoices?
-##### Webcal setup #####
-WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
-##### Invoices #####
-BillsSetup=Invoices module setup
-BillsNumberingModule=Invoices and credit notes numbering model
-BillsPDFModules=Invoice documents models
-CreditNote=Credit note
-CreditNotes=Credit notes
-ForceInvoiceDate=Force invoice date to validation date
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
-SuggestPaymentByRIBOnAccount=Suggest payment by withdraw on account
-SuggestPaymentByChequeToAddress=Suggest payment by cheque to
-FreeLegalTextOnInvoices=Free text on invoices
-WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
-PaymentsNumberingModule=Payments numbering model
-SuppliersPayment=Suppliers payments
-SupplierPaymentSetup=Suppliers payments setup
-##### Proposals #####
 PropalSetup=Configuración del módulo Cotizaciones
 ProposalsNumberingModules=Módulos de numeración de cotizaciones
 ProposalsPDFModules=Modelos de documentos de cotizaciones
 FreeLegalTextOnProposal=Texto libre en cotizaciones
 WatermarkOnDraftProposal=Marca de agua en cotizaciones borrador (en caso de estar vacío)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
-WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
-##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
-##### Orders #####
-OrdersSetup=Order management setup
-OrdersNumberingModules=Orders numbering models
-OrdersModelModule=Order documents models
-FreeLegalTextOnOrders=Free text on orders
-WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
-ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Interventions #####
-InterventionsSetup=Interventions module setup
-FreeLegalTextOnInterventions=Free text on intervention documents
-FicheinterNumberingModules=Intervention numbering models
-TemplatePDFInterventions=Intervention card documents models
-WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
-##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
-ContractsNumberingModules=Contracts numbering modules
-TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
-##### Members #####
-MembersSetup=Members module setup
-MemberMainOptions=Main options
-AdherentLoginRequired= Manage a Login for each member
-AdherentMailRequired=EMail required to create a new member
-MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
-##### LDAP setup #####
-LDAPSetup=LDAP Setup
-LDAPGlobalParameters=Parámetros globales
-LDAPUsersSynchro=Users
-LDAPGroupsSynchro=Groups
-LDAPContactsSynchro=Contacts
-LDAPMembersSynchro=Members
-LDAPSynchronization=LDAP synchronisation
-LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP
-LDAPToDolibarr=LDAP -> Dolibarr
-DolibarrToLDAP=Dolibarr -> LDAP
-LDAPNamingAttribute=Key in LDAP
-LDAPSynchronizeUsers=Organization of users in LDAP
-LDAPSynchronizeGroups=Organization of groups in LDAP
-LDAPSynchronizeContacts=Organization of contacts in LDAP
-LDAPSynchronizeMembers=Organization of foundation's members in LDAP
-LDAPPrimaryServer=Primary server
-LDAPSecondaryServer=Secondary server
-LDAPServerPort=Server port
-LDAPServerPortExample=Default port : 389
-LDAPServerProtocolVersion=Protocol version
-LDAPServerUseTLS=Use TLS
-LDAPServerUseTLSExample=Your LDAP server use TLS
-LDAPServerDn=Server DN
-LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
-LDAPPassword=Administrator password
-LDAPUserDn=Users' DN
-LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
-LDAPGroupDn=Groups' DN
-LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com)
-LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
-LDAPServerDnExample=Complete DN (ex: dc=example,dc=com)
-LDAPDnSynchroActive=Users and groups synchronization
-LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization
-LDAPDnContactActive=Contacts' synchronization
-LDAPDnContactActiveExample=Activated/Unactivated synchronization
-LDAPDnMemberActive=Members' synchronization
-LDAPDnMemberActiveExample=Activated/Unactivated synchronization
-LDAPContactDn=Dolibarr contacts' DN
-LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com)
-LDAPMemberDn=Dolibarr members DN
-LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com)
-LDAPMemberObjectClassList=List of objectClass
-LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPUserObjectClassList=List of objectClass
-LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPGroupObjectClassList=List of objectClass
-LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
-LDAPContactObjectClassList=List of objectClass
-LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPTestConnect=Test LDAP connection
-LDAPTestSynchroContact=Test contacts synchronization
-LDAPTestSynchroUser=Test user synchronization
-LDAPTestSynchroGroup=Test group synchronization
-LDAPTestSynchroMember=Test member synchronization
-LDAPTestSearch= Test a LDAP search
-LDAPSynchroOK=Synchronization test successful
-LDAPSynchroKO=Failed synchronization test
-LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that connexion to server is correctly configured and allows LDAP udpates
-LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s)
-LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s)
-LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPBindKO=Connect/Authentificate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPSetupForVersion3=LDAP server configured for version 3
-LDAPSetupForVersion2=LDAP server configured for version 2
-LDAPDolibarrMapping=Dolibarr Mapping
-LDAPLdapMapping=LDAP Mapping
-LDAPFieldLoginUnix=Login (unix)
-LDAPFieldLoginExample=Example : uid
-LDAPFilterConnection=Search filter
-LDAPFilterConnectionExample=Example : &(objectClass=inetOrgPerson)
-LDAPFieldLoginSamba=Login (samba, activedirectory)
-LDAPFieldLoginSambaExample=Example : samaccountname
-LDAPFieldFullname=Full name
-LDAPFieldFullnameExample=Example : cn
-LDAPFieldPasswordNotCrypted=Password not crypted
-LDAPFieldPasswordCrypted=Password crypted
-LDAPFieldPasswordExample=Example : userPassword
-LDAPFieldCommonNameExample=Example : cn
-LDAPFieldName=Name
-LDAPFieldNameExample=Example : sn
-LDAPFieldFirstName=First name
-LDAPFieldFirstNameExample=Example : givenName
-LDAPFieldMail=Email address
-LDAPFieldMailExample=Example : mail
-LDAPFieldPhone=Professional phone number
-LDAPFieldPhoneExample=Example : telephonenumber
-LDAPFieldHomePhone=Personal phone number
-LDAPFieldHomePhoneExample=Example : homephone
-LDAPFieldMobile=Cellular phone
-LDAPFieldMobileExample=Example : mobile
-LDAPFieldFax=Fax number
-LDAPFieldFaxExample=Example : facsimiletelephonenumber
-LDAPFieldAddress=Street
-LDAPFieldAddressExample=Example : street
-LDAPFieldZip=Zip
-LDAPFieldZipExample=Example : postalcode
-LDAPFieldTown=Town
-LDAPFieldTownExample=Example : l
-LDAPFieldCountry=Country
-LDAPFieldDescription=Description
-LDAPFieldDescriptionExample=Example : description
-LDAPFieldNotePublic=Public Note
-LDAPFieldNotePublicExample=Example : publicnote
-LDAPFieldGroupMembers= Group members
-LDAPFieldGroupMembersExample= Example : uniqueMember
-LDAPFieldBirthdate=Birthdate
-LDAPFieldCompany=Company
-LDAPFieldCompanyExample=Example : o
-LDAPFieldSid=SID
-LDAPFieldSidExample=Example : objectsid
-LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Job position
-LDAPFieldTitleExample=Example: title
-LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
-LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
-LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts.
-LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users.
-LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups.
-LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module.
-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 advices related to performance.
-NotInstalled=Not installed, so your server is not slow 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.
-MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
-MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
-OPCodeCache=OPCode cache
-NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad).
-HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
-FilesOfTypeCached=Files of type %s are cached by HTTP server
-FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
-FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
-FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
-CacheByServer=Cache by server
-CacheByClient=Cache by browser
-CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
-##### Products #####
-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)
-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 third party language
-UseSearchToSelectProductTooltip=Also if you have a large number of product (> 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)
-SetDefaultBarcodeTypeProducts=Default barcode type to use for products
-SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
-ProductCodeChecker= Module for product code generation and checking (product or service)
-ProductOtherConf= Product / Service configuration
-IsNotADir=is not a directory!
-##### Syslog #####
-SyslogSetup=Logs module setup
-SyslogOutput=Logs outputs
-SyslogFacility=Facility
-SyslogLevel=Level
-SyslogFilename=File name and path
-YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
-ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
-##### Donations #####
-DonationsSetup=Donation module setup
-DonationsReceiptModel=Template of donation receipt
-##### Barcode #####
-BarcodeSetup=Barcode setup
-PaperFormatModule=Print format module
-BarcodeEncodeModule=Barcode encoding type
-CodeBarGenerator=Barcode generator
-ChooseABarCode=No generator defined
-FormatNotSupportedByGenerator=Format not supported by this generator
-BarcodeDescEAN8=Barcode of type EAN8
-BarcodeDescEAN13=Barcode of type EAN13
-BarcodeDescUPC=Barcode of type UPC
-BarcodeDescISBN=Barcode of type ISBN
-BarcodeDescC39=Barcode of type C39
-BarcodeDescC128=Barcode of type C128
-BarcodeDescDATAMATRIX=Barcode of type Datamatrix
-BarcodeDescQRCODE=Barcode of type QR code
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
-BarcodeInternalEngine=Internal engine
-BarCodeNumberManager=Manager to auto define barcode numbers
-##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct debit payment orders
-##### ExternalRSS #####
-ExternalRSSSetup=External RSS imports setup
-NewRSS=New RSS Feed
-RSSUrl=RSS URL
-RSSUrlExample=An interesting RSS feed
-##### Mailing #####
-MailingSetup=EMailing module setup
-MailingEMailFrom=Sender EMail (From) for emails sent by emailing module
-MailingEMailError=Return EMail (Errors-to) for emails with errors
-MailingDelay=Seconds to wait after sending next message
-##### Notification #####
-NotificationSetup=EMail notification module setup
-NotificationEMailFrom=Sender EMail (From) for emails sent for notifications
-FixedEmailTarget=Fixed email target
-##### Sendings #####
-SendingsSetup=Sending module setup
-SendingsReceiptModel=Sending receipt model
-SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
-FreeLegalTextOnShippings=Free text on shipments
-##### Deliveries #####
-DeliveryOrderNumberingModules=Products deliveries receipt numbering module
-DeliveryOrderModel=Products deliveries receipt model
-DeliveriesOrderAbility=Support products deliveries receipts
-FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
-##### FCKeditor #####
-AdvancedEditor=Advanced editor
-ActivateFCKeditor=Activate advanced editor for:
-FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
-FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
 FCKeditorForProductDetails=Creación/edición WYSIWIG de las líneas de detalle de los productos (en pedidos, cotizaciones, facturas, etc.)
-FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
-FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
-##### OSCommerce 1 #####
-OSCommerceErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be an OSCommerce database (Key %s not found in table %s).
-OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' successfull.
-OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
-OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
-##### Stock #####
-StockSetup=Warehouse module setup
-IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
-##### Menu #####
-MenuDeleted=Menu deleted
-Menus=Menus
-TreeMenuPersonalized=Personalized menus
-NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
-NewMenu=New menu
-Menu=Selection of menu
-MenuHandler=Menu handler
-MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
-DetailId=Id menu
-DetailMenuHandler=Menu handler where to show new menu
-DetailMenuModule=Module name if menu entry come from a module
-DetailType=Type of menu (top or left)
-DetailTitre=Menu label or label code for translation
-DetailUrl=URL where menu send you (Absolute URL link or external link with http://)
-DetailEnabled=Condition to show or not entry
-DetailRight=Condition to display unauthorized grey menus
-DetailLangs=Lang file name for label code translation
-DetailUser=Intern / Extern / All
-Target=Target
-DetailTarget=Target for links (_blank top open a new window)
-DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu)
-ModifMenu=Menu change
-DeleteMenu=Delete menu entry
-ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
-FailedToInitializeMenu=Failed to initialize menu
-##### Tax #####
-TaxSetup=Taxes, social or fiscal taxes and dividends module setup
-OptionVatMode=VAT due
-OptionVATDefault=Cash basis
-OptionVATDebitOption=Accrual basis
-OptionVatDefaultDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on payments for services
-OptionVatDebitOptionDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on invoice (debit) for services
-SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
-OnDelivery=On delivery
-OnPayment=On payment
-OnInvoice=On invoice
-SupposedToBePaymentDate=Payment date used
-SupposedToBeInvoiceDate=Invoice date used
-Buy=Buy
-Sell=Sell
-InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
-AccountancyCode=Accountancy Code
-AccountancyCodeSell=Sale 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 -> Dictionary -> 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_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
-AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### 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 your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your 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.
-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 same computer than 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.
-##### Point Of Sales (CashDesk) #####
-CashDesk=Point of sales
-CashDeskSetup=Point of sales module setup
-CashDeskThirdPartyForSell=Default generic third party to use for sells
-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).
-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
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
-##### Bookmark #####
-BookmarkSetup=Bookmark module setup
-BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu.
-NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu
-##### WebServices #####
-WebServicesSetup=Webservices module setup
-WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
-WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
-EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
-##### API ####
-ApiSetup=API module setup
-ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
-OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
-ApiKey=Key for API
-WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
-##### Bank #####
-BankSetupModule=Bank module setup
-FreeLegalTextOnChequeReceipts=Free text on cheque receipts
-BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
-BankOrderGlobal=General
-BankOrderGlobalDesc=General display order
-BankOrderES=Spanish
-BankOrderESDesc=Spanish display order
-ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
-##### Multicompany #####
-MultiCompanySetup=Multi-company module setup
-##### Suppliers #####
-SuppliersSetup=Supplier module setup
-SuppliersCommandModel=Complete template of supplier order (logo...)
-SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
-SuppliersInvoiceNumberingModel=Supplier invoices numbering models
-IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
-##### GeoIPMaxmind #####
-GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
-NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
-YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
-YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
-TestGeoIPResult=Test of a conversion IP -> country
-##### Projects #####
-ProjectsNumberingModules=Projects numbering module
-ProjectsSetup=Project module setup
-ProjectsModelModule=Project reports document model
-TasksNumberingModules=Tasks numbering module
-TaskModelModule=Tasks reports document model
-UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
-##### ECM (GED) #####
-##### Fiscal Year #####
-AccountingPeriods=Accounting periods
-AccountingPeriodCard=Accounting period
-NewFiscalYear=New accounting period
-OpenFiscalYear=Open accounting period
-CloseFiscalYear=Close accounting period
-DeleteFiscalYear=Delete accounting period
-ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
-ShowFiscalYear=Show accounting period
-AlwaysEditable=Can always be edited
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
-Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
-IncludePath=Include path (defined into variable %s)
-ExpenseReportsSetup=Setup of module Expense Reports
-TemplatePDFExpenseReports=Document templates to generate expense report document
-NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
-YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of 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
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/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.
-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.
-ConfFileMuseContainCustom=Installing 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)
-TextTitleColor=Color of page title
-LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
-NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
-BackgroundColor=Background color
-TopMenuBackgroundColor=Background color for Top menu
-TopMenuDisableImages=Hide images in Top menu
-LeftMenuBackgroundColor=Background color for Left menu
-BackgroundTableTitleColor=Background color for Table title line
-BackgroundTableLineOddColor=Background color for odd table lines
-BackgroundTableLineEvenColor=Background color for even table lines
-MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
-NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
-UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
-PositionIntoComboList=Position of line into combo lists
-SellTaxRate=Sale tax rate
-RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
-UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipping, you can enter it here. You can use the key {TRACKID} into URL parameters so the system will replace it with value of tracking number user entered into shipment card.
-OpportunityPercent=When you create an opportunity, you will defined an estimated amount of project/lead. According to status of opportunity, this amount may be multiplicated 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
-FixTZ=TimeZone fix
-FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
-ExpectedChecksum=Expected Checksum
-CurrentChecksum=Current Checksum
-ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the latest stable version
-TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
-TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so 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 usefull only if your prices for each leve 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.
-SeeSubstitutionVars=See * note for list of possible substitution variables
-AllPublishers=All publishers
-UnknownPublishers=Unknown publishers
-AddRemoveTabs=Add or remove tabs
-AddDictionaries=Add dictionaries
-AddBoxes=Add widgets
-AddSheduledJobs=Add scheduled jobs
-AddHooks=Add hooks
-AddTriggers=Add triggers
-AddMenus=Add menus
-AddPermissions=Add permissions
-AddExportProfiles=Add export profiles
-AddImportProfiles=Add import profiles
-AddOtherPagesOrServices=Add other pages or services
-AddModels=Add document or numbering templates
-AddSubstitutions=Add keys substitutions
-DetectionNotPossible=Detection not possible
-UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved on 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 correclty. 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 inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <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
-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
-TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
-##### Resource ####
-ResourceSetup=Configuration du module Resource
-UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
diff --git a/htdocs/langs/es_CL/main.lang b/htdocs/langs/es_CL/main.lang
index f676766d6c2..7712ceff6ee 100644
--- a/htdocs/langs/es_CL/main.lang
+++ b/htdocs/langs/es_CL/main.lang
@@ -1,9 +1,5 @@
 # Dolibarr language file - Source file is en_US - main
 DIRECTION=ltr
-# Note for Chinese:
-# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
-# stsongstdlight or cid0cs are for simplified Chinese
-# To read Chinese pdf with Linux: sudo apt-get install poppler-data
 FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=,
@@ -23,799 +19,11 @@ FormatDateHourShort=%d/%m/%Y %H:%M
 FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
-DatabaseConnection=Database connection
-NoTemplateDefined=No template defined for this email type
-AvailableVariables=Available substitution variables
-NoTranslation=No translation
-NoRecordFound=No record found
-NoRecordDeleted=No record deleted
-NotEnoughDataYet=Not enough data
-NoError=No error
-Error=Error
-Errors=Errors
-ErrorFieldRequired=Field '%s' is required
-ErrorFieldFormat=Field '%s' has a bad value
-ErrorFileDoesNotExists=File %s does not exist
-ErrorFailedToOpenFile=Failed to open file %s
-ErrorCanNotCreateDir=Cannot create dir %s
-ErrorCanNotReadDir=Cannot read dir %s
-ErrorConstantNotDefined=Parameter %s not defined
-ErrorUnknown=Unknown error
-ErrorSQL=SQL Error
-ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this
-ErrorGoToModuleSetup=Go to Module setup to fix this
-ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
-ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
-ErrorInternalErrorDetected=Error detected
-ErrorWrongHostParameter=Wrong host parameter
-ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post again the form.
-ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child records.
-ErrorWrongValue=Wrong value
-ErrorWrongValueForParameterX=Wrong value for parameter %s
-ErrorNoRequestInError=No request in error
-ErrorServiceUnavailableTryLater=Service not available for 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>.
-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 nb of record per page
-NotAuthorized=You are not authorized to do that.
-SetDate=Set date
-SelectDate=Select a date
-SeeAlso=See also %s
-SeeHere=See here
-Apply=Apply
-BackgroundColorByDefault=Default background color
-FileRenamed=The file was successfully renamed
-FileUploaded=The file was successfully uploaded
-FileGenerated=The file was successfully generated
-FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
-NbOfEntries=Nb of entries
-GoToWikiHelpPage=Read online help (Internet access needed)
-GoToHelpPage=Read help
-RecordSaved=Record saved
-RecordDeleted=Record deleted
-LevelOfFeature=Level of features
-NotDefined=Not defined
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
-Administrator=Administrator
-Undefined=Undefined
-PasswordForgotten=Password forgotten?
-SeeAbove=See above
-HomeArea=Home area
-LastConnexion=Latest connection
-PreviousConnexion=Previous connection
-PreviousValue=Previous value
-ConnectedOnMultiCompany=Connected on environment
-ConnectedSince=Connected since
-AuthenticationMode=Authentication mode
-RequestedUrl=Requested URL
-DatabaseTypeManager=Database type manager
-RequestLastAccessInError=Latest database access request error
-ReturnCodeLastAccessInError=Return code for latest database access request error
-InformationLastAccessInError=Information for latest database access request error
-DolibarrHasDetectedError=Dolibarr has detected a technical error
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes
-MoreInformation=More information
-TechnicalInformation=Technical information
-TechnicalID=Technical ID
-NotePublic=Note (public)
-NotePrivate=Note (private)
-PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
-DoTest=Test
-ToFilter=Filter
-NoFilter=No filter
-WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance delay.
-yes=yes
-Yes=Yes
-no=no
-No=No
-All=All
-Home=Home
-Help=Help
-OnlineHelp=Online help
-PageWiki=Wiki page
-MediaBrowser=Media browser
-Always=Always
-Never=Never
-Under=under
-Period=Period
-PeriodEndDate=End date for period
-Activate=Activate
-Activated=Activated
-Closed=Cerrado
-Closed2=Cerrado
-NotClosed=Not closed
-Enabled=Enabled
-Deprecated=Deprecated
-Disable=Disable
-Disabled=Disabled
-Add=Add
-AddLink=Add link
-RemoveLink=Remove link
-AddToDraft=Add to draft
 Update=Actualizar
-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>?
-Delete=Delete
-Remove=Remove
-Resiliate=Terminate
-Cancel=Cancel
-Modify=Modify
-Edit=Edit
-Validate=Validar
-ValidateAndApprove=Validate and Approve
-ToValidate=To validate
-Save=Save
-SaveAs=Save As
-TestConnection=Test connection
-ToClone=Clone
-ConfirmClone=Choose data you want to clone :
-NoCloneOptionsSpecified=No data to clone defined.
-Of=of
-Go=Go
-Run=Run
-CopyOf=Copy of
-Show=Show
-Hide=Hide
-ShowCardHere=Show card
-Search=Search
-SearchOf=Search
-Valid=Valid
-Approve=Approve
-Disapprove=Disapprove
-ReOpen=Re-Open
-Upload=Send file
-ToLink=Link
-Select=Select
-Choose=Choose
-Resize=Resize
-Recenter=Recenter
-Author=Author
-User=User
-Users=Users
-Group=Group
-Groups=Groups
-NoUserGroupDefined=No user group defined
-Password=Password
-PasswordRetype=Retype your password
-NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
-Name=Name
-Person=Person
-Parameter=Parameter
-Parameters=Parameters
-Value=Value
-PersonalValue=Personal value
-NewValue=New value
-CurrentValue=Current value
-Code=Code
-Type=Type
-Language=Language
-MultiLanguage=Multi-language
-Note=Note
-Title=Title
-Label=Label
-RefOrLabel=Ref. or label
-Info=Log
-Family=Family
-Description=Description
-Designation=Description
-Model=Doc template
-DefaultModel=Default doc template
-Action=Event
-About=About
-Number=Number
 NumberByMonth=Cantidad Mensual
-AmountByMonth=Amount by month
-Numero=Number
-Limit=Limit
-Limits=Limits
-Logout=Logout
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Connection
-Setup=Setup
-Alert=Alert
-Previous=Previous
-Next=Next
-Cards=Cards
-Card=Card
-Now=Now
-HourStart=Start hour
-Date=Fecha
-DateAndHour=Date and hour
-DateToday=Today's date
-DateReference=Reference date
-DateStart=Start date
-DateEnd=End date
-DateCreation=Creation date
-DateCreationShort=Creat. date
-DateModification=Modification date
-DateModificationShort=Modif. date
-DateLastModification=Latest modification date
-DateValidation=Validation date
-DateClosing=Closing date
-DateDue=Due date
-DateValue=Value date
-DateValueShort=Value date
-DateOperation=Operation date
-DateOperationShort=Oper. Date
-DateLimit=Limit date
-DateRequest=Request date
-DateProcess=Process date
-DateBuild=Report build date
-DatePayment=Date of payment
-DateApprove=Approving date
-DateApprove2=Approving date (second approval)
-UserCreation=Creation user
-UserModification=Modification user
-UserCreationShort=Creat. user
-UserModificationShort=Modif. user
-DurationYear=year
-DurationMonth=month
-DurationWeek=week
-DurationDay=day
-DurationYears=years
-DurationMonths=months
-DurationWeeks=weeks
-DurationDays=days
-Year=Year
-Month=Month
-Week=Week
-WeekShort=Week
-Day=Day
-Hour=Hour
-Minute=Minute
-Second=Second
-Years=Years
-Months=Months
-Days=Days
-days=days
-Hours=Hours
-Minutes=Minutes
-Seconds=Seconds
-Weeks=Weeks
-Today=Today
-Yesterday=Yesterday
-Tomorrow=Tomorrow
-Morning=Morning
-Afternoon=Afternoon
-Quadri=Quadri
-MonthOfDay=Month of the day
-HourShort=H
-MinuteShort=mn
-Rate=Rate
-CurrencyRate=Currency conversion rate
-UseLocalTax=Include tax
-Bytes=Bytes
-KiloBytes=Kilobytes
-MegaBytes=Megabytes
-GigaBytes=Gigabytes
-TeraBytes=Terabytes
-b=b.
-Kb=Kb
-Mb=Mb
-Gb=Gb
-Tb=Tb
-Cut=Cut
-Copy=Copy
-Paste=Paste
-Default=Default
-DefaultValue=Default value
-Price=Price
-UnitPrice=Unit price
-UnitPriceHT=Unit price (net)
-UnitPriceTTC=Unit price
-PriceU=U.P.
-PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (currency)
-PriceUTTC=U.P. (inc. tax)
 Amount=Cantidad
-AmountInvoice=Invoice amount
-AmountPayment=Payment amount
-AmountHTShort=Amount (net)
-AmountTTCShort=Amount (inc. tax)
-AmountHT=Amount (net of tax)
-AmountTTC=Amount (inc. tax)
-AmountVAT=Amount tax
-MulticurrencyAlreadyPaid=Already payed, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
-MulticurrencyAmountHT=Amount (net of tax), original currency
-MulticurrencyAmountTTC=Amount (inc. of tax), original currency
-MulticurrencyAmountVAT=Amount tax, original currency
-AmountLT1=Amount tax 2
-AmountLT2=Amount tax 3
-AmountLT1ES=Amount RE
-AmountLT2ES=Amount IRPF
-AmountTotal=Total amount
-AmountAverage=Average amount
-PriceQtyMinHT=Price quantity min. (net of tax)
-Percentage=Percentage
-Total=Total
-SubTotal=Subtotal
-TotalHTShort=Total (net)
-TotalHTShortCurrency=Total (net in currency)
-TotalTTCShort=Total (inc. tax)
-TotalHT=Total (net of tax)
-TotalHTforthispage=Total (net of tax) for this page
-Totalforthispage=Total for this page
-TotalTTC=Total (inc. tax)
-TotalTTCToYourCredit=Total (inc. tax) to your credit
-TotalVAT=Total tax
-TotalLT1=Total tax 2
-TotalLT2=Total tax 3
-TotalLT1ES=Total RE
-TotalLT2ES=Total IRPF
-HT=Net of tax
-TTC=Inc. tax
-VAT=Sales tax
-VATs=Sales taxes
-LT1ES=RE
-LT2ES=IRPF
-VATRate=Tax Rate
-Average=Average
-Sum=Sum
-Delta=Delta
-Module=Module
-Option=Option
 List=Lista
-FullList=Full list
-Statistics=Statistics
-OtherStatistics=Other statistics
-Status=Status
-Favorite=Favorite
-ShortInfo=Info.
-Ref=Ref.
-ExternalRef=Ref. extern
-RefSupplier=Ref. supplier
-RefPayment=Ref. payment
 CommercialProposalsShort=Cotizaciones
-Comment=Comment
-Comments=Comments
-ActionsToDo=Events to do
-ActionsToDoShort=To do
-ActionsDoneShort=Done
-ActionNotApplicable=Not applicable
-ActionRunningNotStarted=To start
-ActionRunningShort=In progress
-ActionDoneShort=Finished
-ActionUncomplete=Uncomplete
-CompanyFoundation=Company/Foundation
-ContactsForCompany=Contacts 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
-NActionsLate=%s late
-RequestAlreadyDone=Request already recorded
-Filter=Filter
-FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
-RemoveFilter=Remove filter
-ChartGenerated=Chart generated
-ChartNotGenerated=Chart not generated
-GeneratedOn=Build on %s
-Generate=Generate
-Duration=Duration
-TotalDuration=Total duration
-Summary=Summary
-DolibarrStateBoard=Statistics
-DolibarrWorkBoard=Work tasks board
-Available=Available
-NotYetAvailable=Not yet available
-NotAvailable=Not available
-Categories=Tags/categories
-Category=Tag/category
-By=By
-From=From
-to=to
-and=and
-or=or
-Other=Other
-Others=Others
-OtherInformations=Other informations
-Quantity=Quantity
-Qty=Qty
-ChangedBy=Changed by
-ApprovedBy=Approved by
-ApprovedBy2=Approved by (second approval)
-Approved=Approved
-Refused=Refused
-ReCalculate=Recalculate
-ResultKo=Failure
-Reporting=Reporting
-Reportings=Reporting
-Draft=Borrador
 Drafts=Borrador
-Validated=Validado
-Opened=Opened
-New=New
-Discount=Discount
-Unknown=Unknown
-General=General
-Size=Size
-Received=Received
-Paid=Paid
-Topic=Subject
-ByCompanies=By third parties
-ByUsers=By users
-Links=Links
-Link=Link
-Rejects=Rejects
-Preview=Preview
-NextStep=Next step
-Datas=Data
-None=None
-NoneF=None
-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.
-Photo=Picture
-Photos=Pictures
-AddPhoto=Add picture
-DeletePicture=Picture delete
-ConfirmDeletePicture=Confirm picture deletion?
-Login=Login
-CurrentLogin=Current login
-EnterLoginDetail=Enter login details
-January=January
-February=February
-March=March
-April=April
-May=May
-June=June
-July=July
-August=August
-September=September
-October=October
-November=November
-December=December
-JanuaryMin=Jan
-FebruaryMin=Feb
-MarchMin=Mar
-AprilMin=Apr
-MayMin=May
-JuneMin=Jun
-JulyMin=Jul
-AugustMin=Aug
-SeptemberMin=Sep
-OctoberMin=Oct
-NovemberMin=Nov
-DecemberMin=Dec
-Month01=January
-Month02=February
-Month03=March
-Month04=April
-Month05=May
-Month06=June
-Month07=July
-Month08=August
-Month09=September
-Month10=October
-Month11=November
-Month12=December
-MonthShort01=Jan
-MonthShort02=Feb
-MonthShort03=Mar
-MonthShort04=Apr
-MonthShort05=May
-MonthShort06=Jun
-MonthShort07=Jul
-MonthShort08=Aug
-MonthShort09=Sep
-MonthShort10=Oct
-MonthShort11=Nov
-MonthShort12=Dec
-AttachedFiles=Attached files and documents
-FileTransferComplete=File was uploaded successfuly
-DateFormatYYYYMM=YYYY-MM
-DateFormatYYYYMMDD=YYYY-MM-DD
-DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
-ReportName=Report name
-ReportPeriod=Report period
-ReportDescription=Description
-Report=Report
-Keyword=Keyword
-Origin=Origin
-Legend=Legend
-Fill=Fill
-Reset=Reset
-File=File
-Files=Files
-NotAllowed=Not allowed
-ReadPermissionNotAllowed=Read permission not allowed
-AmountInCurrency=Amount in %s currency
-Example=Example
-Examples=Examples
-NoExample=No example
-FindBug=Report a bug
-NbOfThirdParties=Number of third parties
-NbOfLines=Number of lines
-NbOfObjects=Number of objects
-NbOfObjectReferers=Number of related items
-Referers=Related items
-TotalQuantity=Total quantity
-DateFromTo=From %s to %s
-DateFrom=From %s
-DateUntil=Until %s
-Check=Check
-Uncheck=Uncheck
-Internal=Internal
-External=External
-Internals=Internal
-Externals=External
-Warning=Warning
-Warnings=Warnings
-BuildDoc=Build Doc
-Entity=Environment
-Entities=Entities
-CustomerPreview=Customer preview
-SupplierPreview=Supplier preview
-ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show supplier preview
-RefCustomer=Ref. customer
-Currency=Currency
-InfoAdmin=Information for administrators
-Undo=Undo
-Redo=Redo
-ExpandAll=Expand all
-UndoExpandAll=Undo expand
-Reason=Reason
-FeatureNotYetSupported=Feature not yet supported
-CloseWindow=Close window
-Response=Response
-Priority=Priority
-SendByMail=Send by EMail
-MailSentBy=Email sent by
-TextUsedInTheMessageBody=Email body
-SendAcknowledgementByMail=Send confirmation email
-EMail=E-mail
-NoEMail=No email
-Email=Email
-NoMobilePhone=No mobile phone
-Owner=Owner
-FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
-Refresh=Refresh
-BackToList=Back to list
-GoBack=Go back
-CanBeModifiedIfOk=Can be modified if valid
-CanBeModifiedIfKo=Can be modified if not valid
-ValueIsValid=Value is valid
-ValueIsNotValid=Value is not valid
-RecordCreatedSuccessfully=Record created successfully
-RecordModifiedSuccessfully=Record modified successfully
-RecordsModified=%s record modified
-RecordsDeleted=%s record deleted
-AutomaticCode=Automatic code
-FeatureDisabled=Feature disabled
-MoveBox=Move widget
-Offered=Offered
-NotEnoughPermissions=You don't have permission for this action
-SessionName=Session name
-Method=Method
-Receive=Receive
-CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
-ExpectedValue=Expected Value
-CurrentValue=Current value
-PartialWoman=Partial
-TotalWoman=Total
-NeverReceived=Never received
-Canceled=Canceled
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
-Color=Color
-Documents=Linked files
-Documents2=Documents
-UploadDisabled=Upload disabled
-MenuECM=Documents
-MenuAWStats=AWStats
-MenuMembers=Members
-MenuAgendaGoogle=Google agenda
-ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=No documents saved in this directory
-CurrentUserLanguage=Current language
-CurrentTheme=Current theme
-CurrentMenuManager=Current menu manager
-Browser=Browser
-Layout=Layout
-Screen=Screen
-DisabledModules=Disabled modules
-For=For
-ForCustomer=For customer
-Signature=Signature
-DateOfSignature=Date of signature
-HidePassword=Show command with password hidden
-UnHidePassword=Show real command with clear password
-Root=Root
-Informations=Informations
-Page=Page
-Notes=Notes
-AddNewLine=Add new line
-AddFile=Add file
-FreeZone=Free entry
-FreeLineOfType=Free entry of type
-CloneMainAttributes=Clone object with its main attributes
-PDFMerge=PDF Merge
-Merge=Merge
-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 application at the moment.
-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
-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.
-AccordingToGeoIPDatabase=(according to GeoIP convertion)
-Line=Línea
-NotSupported=Not supported
-RequiredField=Required field
-Result=Result
-ToTest=Test
-ValidateBefore=Card must be validated before using this feature
-Visibility=Visibility
-Private=Private
-Hidden=Hidden
-Resources=Resources
-Source=Source
-Prefix=Prefix
-Before=Before
-After=After
-IPAddress=IP address
-Frequency=Frequency
-IM=Instant messaging
-NewAttribute=New attribute
-AttributeCode=Attribute code
-URLPhoto=URL of photo/logo
-SetLinkToAnotherThirdParty=Link to another third party
-LinkTo=Link to
-LinkToProposal=Link to proposal
-LinkToOrder=Link to order
-LinkToInvoice=Link to invoice
-LinkToSupplierOrder=Link to supplier order
-LinkToSupplierProposal=Link to supplier proposal
-LinkToSupplierInvoice=Link to supplier invoice
-LinkToContract=Link to contract
-LinkToIntervention=Link to intervention
-CreateDraft=Create draft
-SetToDraft=Back to draft
-ClickToEdit=Click to edit
-ObjectDeleted=Object %s deleted
-ByCountry=By country
-ByTown=By town
-ByDate=By date
-ByMonthYear=By month/year
-ByYear=By year
-ByMonth=By month
-ByDay=By day
-BySalesRepresentative=By sales representative
-LinkedToSpecificUsers=Linked to a particular user contact
-NoResults=No results
-AdminTools=Admin tools
-SystemTools=System tools
-ModulesSystemTools=Modules tools
-Test=Test
-Element=Element
-NoPhotoYet=No pictures available yet
-Dashboard=Dashboard
-MyDashboard=My dashboard
-Deductible=Deductible
-from=from
-toward=toward
-Access=Access
-SelectAction=Select action
-HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
-SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
-OriginFileName=Original filename
-SetDemandReason=Set source
-SetBankAccount=Define Bank Account
-AccountCurrency=Account Currency
-ViewPrivateNote=View notes
-XMoreLines=%s line(s) hidden
-PublicUrl=Public URL
-AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
-PrintFile=Print File %s
-ShowTransaction=Show entry on bank account
-GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
-Deny=Deny
-Denied=Denied
-ListOfTemplates=List of templates
-Gender=Gender
-Genderman=Man
-Genderwoman=Woman
-ViewList=List view
-Mandatory=Mandatory
-Hello=Hello
-Sincerely=Sincerely
-DeleteLine=Delete line
-ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
-NoRecordSelected=No record selected
-MassFilesArea=Area for files built by mass actions
-ShowTempMassFilesArea=Show area of files built by mass actions
-RelatedObjects=Related Objects
+Opened=Abierto
 ClassifyBilled=Clasificar pago
-Progress=Progress
-ClickHere=Click here
-FrontOffice=Front office
-BackOffice=Back office
-View=View
-Export=Exportar
-Exports=Exportaciones
-ExportFilteredList=Export filtered list
-ExportList=Export list
-Miscellaneous=Miscellaneous
-Calendar=Calendar
-GroupBy=Group by...
-ViewFlatList=View flat list
-RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Direct download link
-Download=Download
-ActualizeCurrency=Update currency rate
-Fiscalyear=Fiscal year
-# Week day
-Monday=Monday
-Tuesday=Tuesday
-Wednesday=Wednesday
-Thursday=Thursday
-Friday=Friday
-Saturday=Saturday
-Sunday=Sunday
-MondayMin=Mo
-TuesdayMin=Tu
-WednesdayMin=We
-ThursdayMin=Th
-FridayMin=Fr
-SaturdayMin=Sa
-SundayMin=Su
-Day1=Monday
-Day2=Tuesday
-Day3=Wednesday
-Day4=Thursday
-Day5=Friday
-Day6=Saturday
-Day0=Sunday
-ShortMonday=M
-ShortTuesday=T
-ShortWednesday=W
-ShortThursday=T
-ShortFriday=F
-ShortSaturday=S
-ShortSunday=S
-SelectMailModel=Select email template
-SetRef=Set ref
-Select2ResultFoundUseArrows=Some results found. Use arrows to select.
-Select2NotFound=No result found
-Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
-Select2LoadingMoreResults=Loading more results...
-Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
-SearchIntoContacts=Contacts
-SearchIntoMembers=Members
-SearchIntoUsers=Users
-SearchIntoProductsOrServices=Products or services
-SearchIntoProjects=Projects
-SearchIntoTasks=Tasks
-SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
-SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
-SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
-SearchIntoInterventions=Interventions
-SearchIntoContracts=Contracts
-SearchIntoCustomerShipments=Customer shipments
-SearchIntoExpenseReports=Expense reports
-SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/es_CL/other.lang b/htdocs/langs/es_CL/other.lang
index 059780fce81..33cbd10f9ec 100644
--- a/htdocs/langs/es_CL/other.lang
+++ b/htdocs/langs/es_CL/other.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - other
 Tools=Herramientas
+TMenuTools=Herramientas
 Notify_PROPAL_VALIDATE=Validación cotización cliente
 Notify_PROPAL_SENTBYMAIL=Envío cotización por e-mail
 PredefinedMailContentSendProposal=Buenos días, __CONTACTCIVNAME__ \n\n Nos ponemos en contacto con usted para facilitarle la cotización __PROPREF__\n\n Ante cualquier duda, consúltenos y será atendido a la mayor brevedad posible.\n\n __PERSONALIZED__Cordialmente\n\n__SIGNATURE__
diff --git a/htdocs/langs/es_CO/accountancy.lang b/htdocs/langs/es_CO/accountancy.lang
deleted file mode 100644
index 527f1fd139d..00000000000
--- a/htdocs/langs/es_CO/accountancy.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-AccountingCategory=Accounting category
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
diff --git a/htdocs/langs/es_CO/admin.lang b/htdocs/langs/es_CO/admin.lang
index 033a4e190d7..a07b67603b4 100644
--- a/htdocs/langs/es_CO/admin.lang
+++ b/htdocs/langs/es_CO/admin.lang
@@ -1,1665 +1,12 @@
 # Dolibarr language file - Source file is en_US - admin
-Foundation=Foundation
-Version=Version
-VersionProgram=Version program
-VersionLastInstall=Initial install version
-VersionLastUpgrade=Latest version upgrade
-VersionExperimental=Experimental
-VersionDevelopment=Development
 VersionUnknown=Desconocido
-VersionRecommanded=Recommended
-FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. Value of some setup constants may also be checked. You can use this tool to detect if some files were modified by a hacker for example.
-FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
-GlobalChecksum=Global checksum
-MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
-LocalSignature=Embedded local signature (less reliable)
-RemoteSignature=Remote distant signature (more reliable)
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FilesModified=Modified Files
-FilesAdded=Added Files
-FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
-XmlNotFound=Xml Integrity File of application not found
-SessionId=Session ID
-SessionSaveHandler=Handler to save sessions
-SessionSavePath=Storage session localization
-PurgeSessions=Purge of sessions
-ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
-NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow to list all running sessions.
-LockNewSessions=Lock new connections
-ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself. Only user <b>%s</b> will be able to connect after that.
-UnlockNewSessions=Remove connection lock
-YourSession=Your session
-Sessions=Users session
-WebUserGroup=Web server user/group
-NoSessionFound=Your PHP seems to not allow to list active sessions. Directory used to save sessions (<b>%s</b>) might be protected (For example, by OS permissions or by PHP directive open_basedir).
-DBStoringCharset=Database charset to store data
-DBSortingCharset=Database charset to sort data
-WarningModuleNotActive=Module <b>%s</b> must be enabled
-WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page.
-DolibarrSetup=Dolibarr install or upgrade
-InternalUser=Internal user
-ExternalUser=External user
-InternalUsers=Internal users
-ExternalUsers=External users
-GUISetup=Display
-SetupArea=Setup area
-FormToTestFileUploadForm=Form to test file upload (according to setup)
-IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
-RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
-RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any usage of update tool.
-SecuritySetup=Security setup
-SecurityFilesDesc=Define here options related to security about uploading files.
-ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
-ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
-ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is not supported.
-DictionarySetup=Dictionary setup
-Dictionary=Dictionaries
-ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
-ErrorCodeCantContainZero=Code can't contain value 0
-DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
-UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties, but it is less convenient)
-DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact, but it is less convenient)
-NumberOfKeyToSearch=Nbr of characters to trigger search: %s
-NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
-AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
-JavascriptDisabled=JavaScript disabled
-UsePreviewTabs=Use preview tabs
-ShowPreview=Show preview
-PreviewNotAvailable=Preview not available
-ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
-MySQLTimeZone=TimeZone MySql (database)
-TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
-Space=Space
-Table=Table
-Fields=Fields
-Index=Index
-Mask=Mask
-NextValue=Next value
-NextValueForInvoices=Next value (invoices)
-NextValueForCreditNotes=Next value (credit notes)
-NextValueForDeposit=Next value (deposit)
-NextValueForReplacements=Next value (replacements)
-MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to <b>%s</b> %s, whatever this parameter's value is
-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
-AntiVirusParam= More parameters on command line
-AntiVirusParamExample= Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
-ComptaSetup=Accounting module setup
-UserSetup=User management setup
-MultiCurrencySetup=Multi-currency setup
-MenuLimits=Limits and accuracy
-MenuIdParent=Parent menu ID
-DetailMenuIdParent=ID of parent menu (empty for a top menu)
-DetailPosition=Sort number to define menu position
+AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
+AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 AllMenus=Todo
-NotConfigured=Module not configured
-Active=Active
 SetupShort=Configuración
-OtherOptions=Other options
-OtherSetup=Other setup
-CurrentValueSeparatorDecimal=Decimal separator
-CurrentValueSeparatorThousand=Thousand separator
-Destination=Destination
-IdModule=Module ID
-IdPermissions=Permissions ID
-Modules=Modules
-LanguageBrowserParameter=Parameter %s
-LocalisationDolibarrParameters=Localisation parameters
-ClientTZ=Client Time Zone (user)
-ClientHour=Client time (user)
-OSTZ=Server OS Time Zone
-PHPTZ=PHP server Time Zone
-DaylingSavingTime=Daylight saving time
-CurrentHour=PHP Time (server)
-CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
-Box=Widget
-Boxes=Widgets
-MaxNbOfLinesForBoxes=Max number of lines for widgets
-PositionByDefault=Default order
 Position=Puesto
-MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
-MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br />Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
-MenuForUsers=Menu for users
-LangFile=.lang file
-System=System
-SystemInfo=System information
-SystemToolsArea=System tools area
-SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for.
-Purge=Purge
-PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
-PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
-PurgeDeleteTemporaryFilesShort=Delete temporary files
-PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory <b>%s</b>. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted.
-PurgeRunNow=Purge now
-PurgeNothingToDelete=No directory or files to delete.
-PurgeNDirectoriesDeleted=<b>%s</b> files or directories deleted.
-PurgeAuditEvents=Purge all security events
-ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
-GenerateBackup=Generate backup
-Backup=Backup
-Restore=Restore
-RunCommandSummary=Backup has been launched with the following command
-BackupResult=Backup result
-BackupFileSuccessfullyCreated=Backup file successfully generated
-YouCanDownloadBackupFile=Generated files can now be downloaded
-NoBackupFileAvailable=No backup files available.
-ExportMethod=Export method
-ImportMethod=Import method
-ToBuildBackupFileClickHere=To build a backup file, click <a href="%s">here</a>.
-ImportMySqlDesc=To import a backup file, you must use mysql command from command line:
-ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line:
-ImportMySqlCommand=%s %s < mybackupfile.sql
-ImportPostgreSqlCommand=%s %s mybackupfile.sql
-FileNameToGenerate=File name to generate
-Compression=Compression
-CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
-CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
-ExportCompatibility=Compatibility of generated export file
-MySqlExportParameters=MySQL export parameters
-PostgreSqlExportParameters= PostgreSQL export parameters
-UseTransactionnalMode=Use transactional mode
-FullPathToMysqldumpCommand=Full path to mysqldump command
-FullPathToPostgreSQLdumpCommand=Full path to pg_dump command
-ExportOptions=Export Options
-AddDropDatabase=Add DROP DATABASE command
-AddDropTable=Add DROP TABLE command
-ExportStructure=Structure
-NameColumn=Name columns
-ExtendedInsert=Extended INSERT
-NoLockBeforeInsert=No lock commands around INSERT
-DelayedInsert=Delayed insert
-EncodeBinariesInHexa=Encode binary data in hexadecimal
-IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
-AutoDetectLang=Autodetect (browser language)
-FeatureDisabledInDemo=Feature disabled in demo
-FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Permissions
-BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
-OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
-ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external modules...
-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 (Note: anyone experienced in PHP programming can provide custom development for an open source project)
-WebSiteDesc=Reference websites to find more modules...
-URL=Enlace
-BoxesAvailable=Widgets available
-BoxesActivated=Widgets activated
-ActivateOn=Activate on
-ActiveOn=Activated on
-SourceFile=Source file
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
-Required=Required
-UsedOnlyWithTypeOption=Used by some agenda option only
-Security=Security
-Passwords=Passwords
-DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
-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 (Activated 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 make building of a global cumulated pdf not working (like unpaid invoices).
-Feature=Feature
-DolibarrLicense=License
-Developpers=Developers/contributors
-OfficialWebSite=Dolibarr international official web site
-OfficialWebSiteLocal=Local web site (%s)
-OfficialWiki=Dolibarr documentation on Wiki
-OfficialDemo=Dolibarr online demo
-OfficialMarketPlace=Official market place for external modules/addons
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
-ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
-HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
-HelpCenterDesc2=Some part of this service are available in <b>english only</b>.
-CurrentMenuHandler=Current menu handler
-MeasuringUnit=Measuring unit
-LeftMargin=Left margin
-TopMargin=Top margin
-PaperSize=Paper type
-Orientation=Orientation
-SpaceX=Space X
-SpaceY=Space Y
-FontSize=Font size
-Content=Content
-NoticePeriod=Notice period
-NewByMonth=New by month
-Emails=E-mails
-EMailsSetup=E-mails setup
-EMailsDesc=This page allows you to overwrite your PHP parameters for e-mails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless.
-MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
-MAIN_MAIL_EMAIL_FROM=Sender e-mail for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Sender e-mail used for error returns emails sent
-MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
-MAIN_DISABLE_ALL_MAILS=Disable all e-mails sendings (for test purposes or demos)
-MAIN_MAIL_SENDMODE=Method to use to send EMails
-MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
-MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
-MAIN_MAIL_EMAIL_TLS= Use TLS (SSL) encrypt
-MAIN_MAIL_EMAIL_STARTTLS= Use TLS (STARTTLS) encrypt
-MAIN_DISABLE_ALL_SMS=Disable all SMS sendings (for test purposes or demos)
-MAIN_SMS_SENDMODE=Method to use to send SMS
-MAIN_MAIL_SMS_FROM=Default sender phone number for Sms sending
-MAIN_MAIL_DEFAULT_FROMTYPE=Sender e-mail by default for manual sendings (User email or Company email)
-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/
-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 setup
-ModuleFamilyBase=System
-ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
-ModuleFamilyProducts=Products Management (PM)
-ModuleFamilyHr=Human Resource Management (HR)
-ModuleFamilyProjects=Projects/Collaborative work
-ModuleFamilyOther=Otro
-ModuleFamilyTechnic=Multi-modules tools
-ModuleFamilyExperimental=Experimental modules
-ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
-ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
-ModuleFamilyInterface=Interfaces with external systems
-MenuHandlers=Menu handlers
-MenuAdmin=Menu editor
-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).
-DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <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>.
-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='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
-YouCanSubmitFile=For this step, you can send package using this tool: Select module file
-CurrentVersion=Dolibarr current version
-CallUpdatePage=Go to the page that updates the database structure and data: %s.
-LastStableVersion=Latest stable version
-LastActivationDate=Latest activation date
-UpdateServerOffline=Update server offline
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
-GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
-GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
-ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
-ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
-DoTestServerAvailability=Test server connectivity
-DoTestSend=Test sending
-DoTestSendHTML=Test sending HTML
-ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
-ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
-UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
-UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
-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...).
-MinLength=Minimum length
-LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
-ExamplesWithCurrentSetup=Examples with current running setup
-ListOfDirectories=List of OpenDocument templates directories
-ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
-NumberOfModelFilesFound=Number of ODT/ODS templates files found in those 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:
-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.
-ThemeDir=Skins directory
-ConnectionTimeout=Connexion timeout
-ResponseTimeout=Response timeout
-SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__
-ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
-SecurityToken=Key to secure URLs
-NoSmsEngine=No SMS sender manager available. SMS sender manager are not installed with default distribution (because they depends on an external supplier) but you can find some on %s
-PDF=PDF
-PDFDesc=You can set each global options related to the PDF generation
-PDFAddressForging=Rules to forge address boxes
-HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF
-HideDescOnPDF=Hide products description on generated PDF
-HideRefOnPDF=Hide products ref. on generated PDF
-HideDetailsOnPDF=Hide product lines details on generated PDF
-PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
-Library=Library
-UrlGenerationParameters=Parameters to secure URLs
-SecurityTokenIsUnique=Use a unique securekey parameter for each URL
-EnterRefToBuildUrl=Enter reference for object %s
-GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons to 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
-MassConvert=Launch mass convert
-String=String
-TextLong=Long text
-Int=Integer
-Float=Float
-DateAndTime=Fecha y hora
-Unique=Unique
-Boolean=Boolean (Checkbox)
-ExtrafieldPhone = Teléfono
-ExtrafieldPrice = Precio
-ExtrafieldMail = Email
-ExtrafieldUrl = Url
-ExtrafieldSelect = Select list
-ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
-ExtrafieldPassword=Contraseña
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
-ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
-LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
-SMS=SMS
-LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
-RefreshPhoneLink=Refresh link
-LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
-KeepEmptyToUseDefault=Keep empty to use default value
-DefaultLink=Default link
-SetAsDefault=Set as default
-ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
-BarcodeInitForThirdparties=Mass barcode init for thirdparties
-BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Init value for next %s empty records
-EraseAllCurrentBarCode=Erase all current barcode values
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
-AllBarcodeReset=All barcode values have been removed
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into 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
-DisplayCompanyInfo=Display company address
-DisplayCompanyManagers=Display manager names
-DisplayCompanyInfoAndManagers=Display company address and manager names
-EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
-ModuleCompanyCodePanicum=Return an empty accountancy code.
-ModuleCompanyCodeDigitaria=Accountancy 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: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-ClickToShowDescription=Click to show description
-# Modules
-Module0Name=Users & groups
-Module0Desc=Users / Employees and Groups management
-Module1Name=Terceros
-Module1Desc=Companies and contact management (customers, prospects...)
-Module2Name=Commercial
-Module2Desc=Commercial management
-Module10Name=Accounting
-Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
-Module20Name=Proposals
-Module20Desc=Commercial proposal management
-Module22Name=Mass E-mailings
-Module22Desc=Mass E-mailing management
-Module23Name=Energy
-Module23Desc=Monitoring the consumption of energies
-Module25Name=Customer Orders
-Module25Desc=Customer order management
-Module30Name=Invoices
-Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
-Module40Name=Proveedores
-Module40Desc=Supplier management and buying (orders and invoices)
 Module42Name=Log
-Module42Desc=Logging facilities (file, syslog, ...)
-Module49Name=Editors
-Module49Desc=Editor management
-Module50Name=Products
-Module50Desc=Product management
-Module51Name=Mass mailings
-Module51Desc=Mass paper mailing management
-Module52Name=Stocks
-Module52Desc=Stock management (products)
-Module53Name=Services
-Module53Desc=Service management
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
-Module55Name=Barcodes
-Module55Desc=Barcode management
-Module56Name=Telephony
-Module56Desc=Telephony integration
-Module57Name=Direct bank payment orders
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
-Module58Name=ClickToDial
-Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
-Module70Name=Interventions
-Module70Desc=Intervention management
-Module75Name=Expense and trip notes
-Module75Desc=Expense and trip notes management
-Module80Name=Shipments
-Module80Desc=Shipments and delivery order management
-Module85Name=Banks and cash
-Module85Desc=Management of bank or cash accounts
-Module100Name=External site
-Module100Desc=This module include an external web site or page into Dolibarr menus and view it into a Dolibarr frame
-Module105Name=Mailman and SPIP
-Module105Desc=Mailman or SPIP interface for member module
-Module200Name=LDAP
-Module200Desc=LDAP directory synchronisation
-Module210Name=PostNuke
-Module210Desc=PostNuke integration
-Module240Name=Data exports
-Module240Desc=Tool to export Dolibarr data (with assistants)
-Module250Name=Data imports
-Module250Desc=Tool to import data in Dolibarr  (with assistants)
-Module310Name=Miembros
-Module310Desc=Foundation members management
-Module320Name=RSS Feed
-Module320Desc=Add RSS feed inside Dolibarr screen pages
-Module330Name=Bookmarks
-Module330Desc=Bookmarks management
-Module400Name=Projects/Opportunities/Leads
-Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
-Module410Name=Webcalendar
-Module410Desc=Webcalendar integration
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
-Module520Name=Loan
-Module520Desc=Management of loans
-Module600Name=Notifications
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
-Module700Name=Donations
-Module700Desc=Donation management
-Module770Name=Expense reports
-Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
-Module1200Name=Mantis
-Module1200Desc=Mantis integration
-Module1400Name=Accounting
-Module1400Desc=Accounting management (double parties)
-Module1520Name=Document Generation
-Module1520Desc=Mass mail document generation
-Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
-Module2000Name=WYSIWYG editor
-Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
-Module2200Name=Dynamic Prices
-Module2200Desc=Enable the usage of math expressions for prices
-Module2300Name=Cron
-Module2300Desc=Scheduled job management
-Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
-Module2500Name=Electronic Content Management
-Module2500Desc=Save and share documents
-Module2600Name=API/Web services (SOAP server)
-Module2600Desc=Enable the Dolibarr SOAP server providing API services
-Module2610Name=API/Web services (REST server)
-Module2610Desc=Enable the Dolibarr REST server providing API services
-Module2660Name=Call WebServices (SOAP client)
-Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
-Module2700Name=Gravatar
-Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
-Module2800Desc=FTP Client
-Module2900Name=GeoIPMaxmind
-Module2900Desc=GeoIP Maxmind conversions capabilities
-Module3100Name=Skype
-Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
-Module4000Name=HRM
-Module4000Desc=Human resources management
-Module5000Name=Multi-company
-Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management
-Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
-Module20000Name=Leave Requests management
-Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Product lot
-Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
-Module50000Name=PayBox
-Module50000Desc=Module to offer an online payment page by credit card with PayBox
-Module50100Name=Point of sales
-Module50100Desc=Point of sales module (POS).
-Module50200Name=Paypal
-Module50200Desc=Module to offer an online payment page by credit card with Paypal
-Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double parties)
-Module54000Name=PrintIPP
-Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
-Module55000Name=Poll, Survey or Vote
-Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
-Module59000Name=Margins
-Module59000Desc=Module to manage margins
-Module60000Name=Commissions
-Module60000Desc=Module to manage commissions
-Module63000Name=Recursos
-Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
-Permission11=Read customer invoices
-Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
-Permission14=Validate customer invoices
-Permission15=Send customer invoices by email
-Permission16=Create payments for customer invoices
-Permission19=Delete customer invoices
-Permission21=Read commercial proposals
-Permission22=Create/modify commercial proposals
-Permission24=Validate commercial proposals
-Permission25=Send commercial proposals
-Permission26=Close commercial proposals
-Permission27=Delete commercial proposals
-Permission28=Export commercial proposals
-Permission31=Read products
-Permission32=Create/modify products
-Permission34=Delete products
-Permission36=See/manage hidden products
-Permission38=Export products
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
-Permission44=Delete projects (shared project and projects i'm contact for)
-Permission45=Export projects
-Permission61=Read interventions
-Permission62=Create/modify interventions
-Permission64=Delete interventions
-Permission67=Export interventions
-Permission71=Read members
-Permission72=Create/modify members
-Permission74=Delete members
-Permission75=Setup types of membership
-Permission76=Export data
-Permission78=Read subscriptions
-Permission79=Create/modify subscriptions
-Permission81=Read customers orders
-Permission82=Create/modify customers orders
-Permission84=Validate customers orders
-Permission86=Send customers orders
-Permission87=Close customers orders
-Permission88=Cancel customers orders
-Permission89=Delete customers orders
-Permission91=Read social or fiscal taxes and vat
-Permission92=Create/modify social or fiscal taxes and vat
-Permission93=Delete social or fiscal taxes and vat
-Permission94=Export social or fiscal taxes
-Permission95=Read reports
-Permission101=Read sendings
-Permission102=Create/modify sendings
-Permission104=Validate sendings
-Permission106=Export sendings
-Permission109=Delete sendings
-Permission111=Read financial accounts
-Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
-Permission114=Reconciliate transactions
-Permission115=Export transactions and account statements
-Permission116=Transfers between accounts
-Permission117=Manage cheques dispatching
-Permission121=Read third parties linked to user
-Permission122=Create/modify third parties linked to user
-Permission125=Delete third parties linked to user
-Permission126=Export third parties
-Permission141=Read all projects and tasks (also private projects i am not contact for)
-Permission142=Create/modify all projects and tasks (also private projects i am not 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
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
-Permission167=Export contracts
-Permission171=Read trips and expenses (yours and your subordinates)
-Permission172=Create/modify trips and expenses
-Permission173=Delete trips and expenses
-Permission174=Read all trips and expenses
-Permission178=Export trips and expenses
-Permission180=Read suppliers
-Permission181=Read supplier orders
-Permission182=Create/modify supplier orders
-Permission183=Validate supplier orders
-Permission184=Approve supplier orders
-Permission185=Order or cancel supplier orders
-Permission186=Receive supplier orders
-Permission187=Close supplier orders
-Permission188=Cancel supplier orders
-Permission192=Create lines
-Permission193=Cancel lines
-Permission194=Read the bandwith lines
-Permission202=Create ADSL connections
-Permission203=Order connections orders
-Permission204=Order connections
-Permission205=Manage connections
-Permission206=Read connections
-Permission211=Read Telephony
-Permission212=Order lines
-Permission213=Activate line
-Permission214=Setup Telephony
-Permission215=Setup providers
-Permission221=Read emailings
-Permission222=Create/modify emailings (topic, recipients...)
-Permission223=Validate emailings (allows sending)
-Permission229=Delete emailings
-Permission237=View recipients and info
-Permission238=Manually send mailings
-Permission239=Delete mailings after validation or sent
-Permission241=Read categories
-Permission242=Create/modify categories
-Permission243=Delete categories
-Permission244=See the contents of the hidden categories
-Permission251=Read other users and groups
-PermissionAdvanced251=Read other users
-Permission252=Read permissions of other users
-Permission253=Create/modify other users, groups and permisssions
-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 assignement matters).
-Permission271=Read CA
-Permission272=Read invoices
-Permission273=Issue invoices
-Permission281=Read contacts
-Permission282=Create/modify contacts
-Permission283=Delete contacts
-Permission286=Export contacts
-Permission291=Read tariffs
-Permission292=Set permissions on the tariffs
-Permission293=Modify costumers tariffs
-Permission300=Read bar codes
-Permission301=Create/modify bar codes
-Permission302=Delete bar codes
-Permission311=Read services
-Permission312=Assign service/subscription to contract
-Permission331=Read bookmarks
-Permission332=Create/modify bookmarks
-Permission333=Delete bookmarks
-Permission341=Read its own permissions
-Permission342=Create/modify his own user information
-Permission343=Modify his own password
-Permission344=Modify its own permissions
-Permission351=Read groups
-Permission352=Read groups permissions
-Permission353=Create/modify groups
-Permission354=Delete or disable groups
-Permission358=Export users
-Permission401=Read discounts
-Permission402=Create/modify discounts
-Permission403=Validate discounts
-Permission404=Delete discounts
-Permission510=Read Salaries
-Permission512=Create/modify salaries
-Permission514=Delete salaries
-Permission517=Export salaries
-Permission520=Read Loans
-Permission522=Create/modify loans
-Permission524=Delete loans
-Permission525=Access loan calculator
-Permission527=Export loans
-Permission531=Read services
-Permission532=Create/modify services
-Permission534=Delete services
-Permission536=See/manage hidden services
-Permission538=Export services
-Permission701=Read donations
-Permission702=Create/modify donations
-Permission703=Delete donations
-Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
-Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
-Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission779=Export expense reports
-Permission1001=Read stocks
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
-Permission1004=Read stock movements
-Permission1005=Create/modify stock movements
-Permission1101=Read delivery orders
-Permission1102=Create/modify delivery orders
-Permission1104=Validate delivery orders
-Permission1109=Delete delivery orders
-Permission1181=Read suppliers
-Permission1182=Read supplier orders
-Permission1183=Create/modify supplier orders
-Permission1184=Validate supplier orders
-Permission1185=Approve supplier orders
-Permission1186=Order supplier orders
-Permission1187=Acknowledge receipt of supplier orders
-Permission1188=Delete supplier orders
-Permission1190=Approve (second approval) supplier orders
-Permission1201=Get result of an export
-Permission1202=Create/Modify an export
-Permission1231=Read supplier invoices
-Permission1232=Create/modify supplier invoices
-Permission1233=Validate supplier invoices
-Permission1234=Delete supplier invoices
-Permission1235=Send supplier invoices by email
-Permission1236=Export supplier invoices, attributes and payments
-Permission1237=Export supplier orders and their details
-Permission1251=Run mass imports of external data into database (data load)
-Permission1321=Export customer invoices, attributes and payments
-Permission1322=Reopen a paid bill
-Permission1421=Export customer orders and attributes
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
-Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
-Permission20006=Admin leave requests (setup and update balance)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
-Permission2401=Read actions (events or tasks) linked to his account
-Permission2402=Create/modify actions (events or tasks) linked to his account
-Permission2403=Delete actions (events or tasks) linked to his account
-Permission2411=Read actions (events or tasks) of others
-Permission2412=Create/modify actions (events or tasks) of others
-Permission2413=Delete actions (events or tasks) of others
-Permission2414=Export actions/tasks of others
-Permission2501=Read/Download documents
-Permission2502=Download documents
-Permission2503=Submit or delete documents
-Permission2515=Setup documents directories
-Permission2801=Use FTP client in read mode (browse and download only)
-Permission2802=Use FTP client in write mode (delete or upload files)
-Permission50101=Use Point of sales
-Permission50201=Read transactions
-Permission50202=Import transactions
-Permission54001=Print
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
-Permission59003=Read every user margin
-Permission63001=Read resources
-Permission63002=Create/modify resources
-Permission63003=Delete resources
-Permission63004=Link resources to agenda events
-DictionaryCompanyType=Types of thirdparties
-DictionaryCompanyJuridicalType=Legal forms of thirdparties
-DictionaryProspectLevel=Prospect potential level
 DictionaryCanton=Departamento
-DictionaryRegion=Regions
-DictionaryCountry=Countries
-DictionaryCurrency=Currencies
-DictionaryCivility=Personal and professional titles
-DictionaryActions=Types of agenda events
-DictionarySocialContributions=Social or fiscal taxes types
-DictionaryVAT=VAT Rates or Sales Tax Rates
-DictionaryRevenueStamp=Amount of revenue stamps
-DictionaryPaymentConditions=Payment terms
-DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact/Address types
-DictionaryEcotaxe=Ecotax (WEEE)
-DictionaryPaperFormat=Paper formats
-DictionaryFormatCards=Cards formats
-DictionaryFees=Types of fees
-DictionarySendingMethods=Shipping methods
-DictionaryStaff=Empleados
-DictionaryAvailability=Delivery delay
-DictionaryOrderMethods=Ordering methods
-DictionarySource=Origin of proposals/orders
-DictionaryAccountancyCategory=Accounting account groups
-DictionaryAccountancysystem=Models for chart of accounts
-DictionaryEMailTemplates=Emails templates
-DictionaryUnits=Units
-DictionaryProspectStatus=Prospection status
-DictionaryHolidayTypes=Types of leaves
-DictionaryOpportunityStatus=Opportunity status for project/lead
-SetupSaved=Setup saved
-BackToModuleList=Back to modules list
-BackToDictionaryList=Back to dictionaries list
-VATManagement=VAT Management
-VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
-VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies.
-VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
-##### Local Taxes #####
 LTRate=Tipo
-LocalTax1IsNotUsed=Do not use second tax
-LocalTax1IsUsedDesc=Use a second type of tax (other than VAT)
-LocalTax1IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax1Management=Second type of tax
-LocalTax1IsUsedExample=
-LocalTax1IsNotUsedExample=
-LocalTax2IsNotUsed=Do not use third tax
-LocalTax2IsUsedDesc=Use a third type of tax (other than VAT)
-LocalTax2IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax2Management=Third type of tax
-LocalTax2IsUsedExample=
-LocalTax2IsNotUsedExample=
-LocalTax1ManagementES= RE Management
-LocalTax1IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If te buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
-LocalTax1IsNotUsedDescES= By default the proposed RE is 0. End of rule.
-LocalTax1IsUsedExampleES= In Spain they are professionals subject to some specific sections of the Spanish IAE.
-LocalTax1IsNotUsedExampleES= In Spain they are professional and societies and subject to certain sections of the Spanish IAE.
-LocalTax2ManagementES= IRPF Management
-LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
-LocalTax2IsNotUsedDescES= By default the proposed IRPF is 0. End of rule.
-LocalTax2IsUsedExampleES= In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
-LocalTax2IsNotUsedExampleES= In Spain they are bussines not subject to tax system of modules.
-CalcLocaltax=Reports on local taxes
-CalcLocaltax1=Sales - Purchases
-CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2=Purchases
-CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3=Sales
-CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
-LabelUsedByDefault=Label used by default if no translation can be found for code
-LabelOnDocuments=Label on documents
-NbOfDays=Nb of days
-AtEndOfMonth=At end of month
-CurrentNext=Current/Next
-Offset=Offset
-AlwaysActive=Always active
-Upgrade=Upgrade
-MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Deploy/install external module
-WebServer=Web server
-DocumentRootServer=Web server's root directory
-DataRootServer=Data files directory
-IP=IP
-Port=Port
-VirtualServerName=Virtual server name
-OS=OS
-PhpWebLink=Web-Php link
-Browser=Browser
-Server=Server
-Database=Database
-DatabaseServer=Database host
-DatabaseName=Database name
-DatabasePort=Database port
-DatabaseUser=Database user
-DatabasePassword=Database password
-Tables=Tables
-TableName=Table name
-NbOfRecord=Nb of records
-Host=Server
-DriverType=Driver type
-SummarySystem=System information summary
-SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Empresa o institución
-DefaultMenuManager= Standard menu manager
-DefaultMenuSmartphoneManager=Smartphone menu manager
-Skin=Skin theme
-DefaultSkin=Default skin theme
-MaxSizeList=Max length for list
-DefaultMaxSizeList=Default max length for lists
-DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
-MessageOfDay=Message of the day
-MessageLogin=Login page message
-PermanentLeftSearchForm=Permanent search form on left menu
-DefaultLanguage=Default language to use (language code)
-EnableMultilangInterface=Enable multilingual interface
-EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/foundation information
-CompanyIds=Company/foundation identities
 CompanyName=Nombre
-CompanyAddress=Dirección
-CompanyZip=Zip
-CompanyTown=Town
-CompanyCountry=País
-CompanyCurrency=Main currency
-CompanyObject=Object of the company
-Logo=Logo
-DoNotSuggestPaymentMode=Do not suggest
-NoActiveBankAccountDefined=No active bank account defined
-OwnerOfBankAccount=Owner of bank account %s
-BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show link "<strong>%s</strong>"
-Alerts=Alerts
-DelaysOfToleranceBeforeWarning=Tolerance delays before warning
-DelaysOfToleranceDesc=This screen allows you to define the tolerated delays before an alert is reported on screen with picto %s for each late element.
-Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned events (agenda events) not completed yet
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Delay tolerance (in days) before alert on project not closed in time
-Delays_MAIN_DELAY_TASKS_TODO=Delay tolerance (in days) before alert on planned tasks (project tasks) not completed yet
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on orders not processed yet
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on suppliers orders not processed yet
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Delay tolerance (in days) before alert on proposals to close
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Delay tolerance (in days) before alert on proposals not billed
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerance delay (in days) before alert on services to activate
-Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerance delay (in days) before alert on expired services
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerance delay (in days) before alert on unpaid supplier invoices
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerence delay (in days) before alert on unpaid client invoices
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerance delay (in days) before alert on pending bank reconciliation
-Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed membership fee
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
-Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
-SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
-SetupDescription5=Other menu entries manage optional parameters.
-LogEvents=Security audit events
-Audit=Audit
-InfoDolibarr=About Dolibarr
-InfoBrowser=About Browser
-InfoOS=About OS
-InfoWebServer=About Web Server
-InfoDatabase=About Database
-InfoPHP=About PHP
-InfoPerf=About Performances
-BrowserName=Browser name
-BrowserOS=Browser OS
-ListOfSecurityEvents=List of Dolibarr security events
-SecurityEventsPurged=Security events purged
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
-SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
-SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
-DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
-AvailableModules=Available 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.
-TriggersAvailable=Available triggers
-TriggersDesc=Triggers are files that will modify the behaviour of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realised new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
-TriggerDisabledByName=Triggers in this file are disabled by the <b>-NORUN</b> suffix in their name.
-TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module <b>%s</b> is disabled.
-TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules.
-TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
-GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password
-DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">check here</a>.
-MiscellaneousDesc=All other security related parameters are defined here.
-LimitsSetup=Limits/Precision setup
-LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here
-MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices
-MAIN_MAX_DECIMALS_TOT=Max decimals for total prices
-MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add <b>...</b> after this number if you want to see <b>...</b> when number is truncated when shown on screen)
-MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
-UnitPriceOfProduct=Net unit price of a product
-TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
-ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
-NoEventFoundWithCriteria=No security event has been found for such search criterias.
-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.
-BackupDescX=Archived directory should be stored in a secure place.
-BackupDescY=The generated dump file should be stored in a secure place.
-BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one
-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 directoy (<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=Available database backup dump files
-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
-DownloadMoreSkins=More skins to download
-SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence without hole and with no reset
-ShowProfIdInAddress=Show professionnal id with addresses on documents
-ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents
-TranslationUncomplete=Partial translation
-MAIN_DISABLE_METEO=Disable meteo view
-TestLoginToAPI=Test login to API
-ProxyDesc=Some features of Dolibarr need to have an Internet access to work. Define here parameters for this. If the Dolibarr server is behind a Proxy server, those parameters tells Dolibarr how to access Internet through it.
-ExternalAccess=External access
-MAIN_PROXY_USE=Use a proxy server (otherwise direct access to internet)
-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 all attributes, not already available by default, and that you want to be supported for %s.
-ExtraFields=Complementary attributes
-ExtraFieldsLines=Complementary attributes (lines)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
-ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact/address)
-ExtraFieldsMember=Complementary attributes (member)
-ExtraFieldsMemberType=Complementary attributes (member type)
-ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
-ExtraFieldsSupplierOrders=Complementary attributes (orders)
-ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
-ExtraFieldsProject=Complementary attributes (projects)
-ExtraFieldsProjectTask=Complementary attributes (tasks)
-ExtraFieldHasWrongValue=Attribute %s has a wrong value.
-AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
-SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
-PathToDocuments=Path to documents
-PathDirectory=Directory
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might 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.
-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: <strong>User display setup</strong> tab of 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
-TranslationString=Translation string
-CurrentTranslationString=Current translation string
-WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
-NewTranslationStringToShow=New translation string to show
-OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
-YouMustEnableOneModule=You must at least enable 1 module
-ClassNotFoundIntoPathWarning=Class %s not found into PHP path
-YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
-SuhosinSessionEncrypt=Session storage encrypted by Suhosin
-ConditionIsCurrently=Condition is currently %s
-YouUseBestDriver=You use driver %s that is best driver available currently.
-YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required 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.
-BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance.
-BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
-AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp".
-AskForPreferredShippingMethod=Ask for preferred Sending Method for Third Parties.
-FieldEdition=Edition of field %s
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
-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.
-PasswordGenerationPerso=Return a password according to your personally defined configuration.
-SetupPerso=According to your configuration
-PasswordPatternDesc=Password pattern description
-##### Users setup #####
-RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passwords
-DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page
-UsersSetup=Users module setup
-UserMailRequired=EMail required to create a new user
-##### HRM setup #####
-HRMSetup=HRM module setup
-##### Company setup #####
-CompanySetup=Companies module setup
-CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier)
-AccountCodeManager=Module for accountancy code generation (customer or supplier)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
-NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
-NotificationsDescGlobal=* or by setting global target emails in module setup page.
-ModelModules=Documents templates
-DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
-WatermarkOnDraft=Watermark on draft document
-JSOnPaimentBill=Activate feature to autofill payment lines on payment form
-CompanyIdProfChecker=Rules on Professional Ids
-MustBeUnique=Must be unique?
-MustBeMandatory=Mandatory to create third parties?
-MustBeInvoiceMandatory=Mandatory to validate invoices?
-##### Webcal setup #####
-WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
-##### Invoices #####
-BillsSetup=Invoices module setup
-BillsNumberingModule=Invoices and credit notes numbering model
-BillsPDFModules=Invoice documents models
-CreditNote=Credit note
-CreditNotes=Credit notes
-ForceInvoiceDate=Force invoice date to validation date
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
-SuggestPaymentByRIBOnAccount=Suggest payment by withdraw on account
-SuggestPaymentByChequeToAddress=Suggest payment by cheque to
-FreeLegalTextOnInvoices=Free text on invoices
-WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
-PaymentsNumberingModule=Payments numbering model
-SuppliersPayment=Suppliers payments
-SupplierPaymentSetup=Suppliers payments setup
-##### Proposals #####
-PropalSetup=Commercial proposals module setup
-ProposalsNumberingModules=Commercial proposal numbering models
-ProposalsPDFModules=Commercial proposal documents models
-FreeLegalTextOnProposal=Free text on commercial proposals
-WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
-WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
-##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
-##### Orders #####
-OrdersSetup=Order management setup
-OrdersNumberingModules=Orders numbering models
-OrdersModelModule=Order documents models
-FreeLegalTextOnOrders=Free text on orders
-WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
-ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Interventions #####
-InterventionsSetup=Interventions module setup
-FreeLegalTextOnInterventions=Free text on intervention documents
-FicheinterNumberingModules=Intervention numbering models
-TemplatePDFInterventions=Intervention card documents models
-WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
-##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
-ContractsNumberingModules=Contracts numbering modules
-TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
-##### Members #####
-MembersSetup=Members module setup
-MemberMainOptions=Main options
-AdherentLoginRequired= Manage a Login for each member
-AdherentMailRequired=EMail required to create a new member
-MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
-##### LDAP setup #####
-LDAPSetup=LDAP Setup
-LDAPGlobalParameters=Global parameters
-LDAPUsersSynchro=Usuarios
-LDAPGroupsSynchro=Grupos
-LDAPContactsSynchro=Contacts
-LDAPMembersSynchro=Miembros
-LDAPSynchronization=LDAP synchronisation
-LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP
-LDAPToDolibarr=LDAP -> Dolibarr
-DolibarrToLDAP=Dolibarr -> LDAP
-LDAPNamingAttribute=Key in LDAP
-LDAPSynchronizeUsers=Organization of users in LDAP
-LDAPSynchronizeGroups=Organization of groups in LDAP
-LDAPSynchronizeContacts=Organization of contacts in LDAP
-LDAPSynchronizeMembers=Organization of foundation's members in LDAP
-LDAPPrimaryServer=Primary server
-LDAPSecondaryServer=Secondary server
-LDAPServerPort=Server port
-LDAPServerPortExample=Default port : 389
-LDAPServerProtocolVersion=Protocol version
-LDAPServerUseTLS=Use TLS
-LDAPServerUseTLSExample=Your LDAP server use TLS
-LDAPServerDn=Server DN
-LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
-LDAPPassword=Administrator password
-LDAPUserDn=Users' DN
-LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
-LDAPGroupDn=Groups' DN
-LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com)
-LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
-LDAPServerDnExample=Complete DN (ex: dc=example,dc=com)
-LDAPDnSynchroActive=Users and groups synchronization
-LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization
-LDAPDnContactActive=Contacts' synchronization
-LDAPDnContactActiveExample=Activated/Unactivated synchronization
-LDAPDnMemberActive=Members' synchronization
-LDAPDnMemberActiveExample=Activated/Unactivated synchronization
-LDAPContactDn=Dolibarr contacts' DN
-LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com)
-LDAPMemberDn=Dolibarr members DN
-LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com)
-LDAPMemberObjectClassList=List of objectClass
-LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPUserObjectClassList=List of objectClass
-LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPGroupObjectClassList=List of objectClass
-LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
-LDAPContactObjectClassList=List of objectClass
-LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPTestConnect=Test LDAP connection
-LDAPTestSynchroContact=Test contacts synchronization
-LDAPTestSynchroUser=Test user synchronization
-LDAPTestSynchroGroup=Test group synchronization
-LDAPTestSynchroMember=Test member synchronization
-LDAPTestSearch= Test a LDAP search
-LDAPSynchroOK=Synchronization test successful
-LDAPSynchroKO=Failed synchronization test
-LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that connexion to server is correctly configured and allows LDAP udpates
-LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s)
-LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s)
-LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPBindKO=Connect/Authentificate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPSetupForVersion3=LDAP server configured for version 3
-LDAPSetupForVersion2=LDAP server configured for version 2
-LDAPDolibarrMapping=Dolibarr Mapping
-LDAPLdapMapping=LDAP Mapping
-LDAPFieldLoginUnix=Login (unix)
-LDAPFieldLoginExample=Example : uid
-LDAPFilterConnection=Search filter
-LDAPFilterConnectionExample=Example : &(objectClass=inetOrgPerson)
-LDAPFieldLoginSamba=Login (samba, activedirectory)
-LDAPFieldLoginSambaExample=Example : samaccountname
-LDAPFieldFullname=Full name
-LDAPFieldFullnameExample=Example : cn
-LDAPFieldPasswordNotCrypted=Password not crypted
-LDAPFieldPasswordCrypted=Password crypted
-LDAPFieldPasswordExample=Example : userPassword
-LDAPFieldCommonNameExample=Example : cn
-LDAPFieldName=Nombre
-LDAPFieldNameExample=Example : sn
-LDAPFieldFirstName=Nombre
-LDAPFieldFirstNameExample=Example : givenName
-LDAPFieldMail=Email address
-LDAPFieldMailExample=Example : mail
-LDAPFieldPhone=Professional phone number
-LDAPFieldPhoneExample=Example : telephonenumber
-LDAPFieldHomePhone=Personal phone number
-LDAPFieldHomePhoneExample=Example : homephone
-LDAPFieldMobile=Cellular phone
-LDAPFieldMobileExample=Example : mobile
-LDAPFieldFax=Fax number
-LDAPFieldFaxExample=Example : facsimiletelephonenumber
-LDAPFieldAddress=Street
-LDAPFieldAddressExample=Example : street
-LDAPFieldZip=Zip
-LDAPFieldZipExample=Example : postalcode
-LDAPFieldTown=Town
-LDAPFieldTownExample=Example : l
-LDAPFieldCountry=País
-LDAPFieldDescription=Descripción
-LDAPFieldDescriptionExample=Example : description
-LDAPFieldNotePublic=Public Note
-LDAPFieldNotePublicExample=Example : publicnote
-LDAPFieldGroupMembers= Group members
-LDAPFieldGroupMembersExample= Example : uniqueMember
-LDAPFieldBirthdate=Birthdate
-LDAPFieldCompany=Empresa
-LDAPFieldCompanyExample=Example : o
-LDAPFieldSid=SID
-LDAPFieldSidExample=Example : objectsid
-LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Job position
-LDAPFieldTitleExample=Example: title
-LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
-LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
-LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts.
-LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users.
-LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups.
-LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module.
-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 advices related to performance.
-NotInstalled=Not installed, so your server is not slow 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.
-MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
-MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
-OPCodeCache=OPCode cache
-NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad).
-HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
-FilesOfTypeCached=Files of type %s are cached by HTTP server
-FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
-FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
-FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
-CacheByServer=Cache by server
-CacheByClient=Cache by browser
-CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
-##### Products #####
-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)
-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 third party language
-UseSearchToSelectProductTooltip=Also if you have a large number of product (> 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)
-SetDefaultBarcodeTypeProducts=Default barcode type to use for products
-SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
-ProductCodeChecker= Module for product code generation and checking (product or service)
-ProductOtherConf= Product / Service configuration
-IsNotADir=is not a directory!
-##### Syslog #####
-SyslogSetup=Logs module setup
-SyslogOutput=Logs outputs
-SyslogFacility=Facility
-SyslogLevel=Level
-SyslogFilename=File name and path
-YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
-ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
-##### Donations #####
-DonationsSetup=Donation module setup
-DonationsReceiptModel=Template of donation receipt
-##### Barcode #####
-BarcodeSetup=Barcode setup
-PaperFormatModule=Print format module
-BarcodeEncodeModule=Barcode encoding type
-CodeBarGenerator=Barcode generator
-ChooseABarCode=No generator defined
-FormatNotSupportedByGenerator=Format not supported by this generator
-BarcodeDescEAN8=Barcode of type EAN8
-BarcodeDescEAN13=Barcode of type EAN13
-BarcodeDescUPC=Barcode of type UPC
-BarcodeDescISBN=Barcode of type ISBN
-BarcodeDescC39=Barcode of type C39
-BarcodeDescC128=Barcode of type C128
-BarcodeDescDATAMATRIX=Barcode of type Datamatrix
-BarcodeDescQRCODE=Barcode of type QR code
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
-BarcodeInternalEngine=Internal engine
-BarCodeNumberManager=Manager to auto define barcode numbers
-##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct debit payment orders
-##### ExternalRSS #####
-ExternalRSSSetup=External RSS imports setup
-NewRSS=New RSS Feed
-RSSUrl=RSS URL
-RSSUrlExample=An interesting RSS feed
-##### Mailing #####
-MailingSetup=EMailing module setup
-MailingEMailFrom=Sender EMail (From) for emails sent by emailing module
-MailingEMailError=Return EMail (Errors-to) for emails with errors
-MailingDelay=Seconds to wait after sending next message
-##### Notification #####
-NotificationSetup=EMail notification module setup
-NotificationEMailFrom=Sender EMail (From) for emails sent for notifications
-FixedEmailTarget=Fixed email target
-##### Sendings #####
-SendingsSetup=Sending module setup
-SendingsReceiptModel=Sending receipt model
-SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
-FreeLegalTextOnShippings=Free text on shipments
-##### Deliveries #####
-DeliveryOrderNumberingModules=Products deliveries receipt numbering module
-DeliveryOrderModel=Products deliveries receipt model
-DeliveriesOrderAbility=Support products deliveries receipts
-FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
-##### FCKeditor #####
-AdvancedEditor=Advanced editor
-ActivateFCKeditor=Activate advanced editor for:
-FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
-FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files.</font>
-FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
-FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
-##### OSCommerce 1 #####
-OSCommerceErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be an OSCommerce database (Key %s not found in table %s).
-OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' successfull.
-OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
-OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
-##### Stock #####
-StockSetup=Warehouse module setup
-IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
-##### Menu #####
-MenuDeleted=Menu deleted
-Menus=Menus
-TreeMenuPersonalized=Personalized menus
-NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
-NewMenu=New menu
-Menu=Selection of menu
-MenuHandler=Menu handler
-MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
-DetailId=Id menu
-DetailMenuHandler=Menu handler where to show new menu
-DetailMenuModule=Module name if menu entry come from a module
-DetailType=Type of menu (top or left)
-DetailTitre=Menu label or label code for translation
-DetailUrl=URL where menu send you (Absolute URL link or external link with http://)
-DetailEnabled=Condition to show or not entry
-DetailRight=Condition to display unauthorized grey menus
-DetailLangs=Lang file name for label code translation
-DetailUser=Intern / Extern / All
-Target=Target
-DetailTarget=Target for links (_blank top open a new window)
-DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu)
-ModifMenu=Menu change
-DeleteMenu=Delete menu entry
-ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
-FailedToInitializeMenu=Failed to initialize menu
-##### Tax #####
-TaxSetup=Taxes, social or fiscal taxes and dividends module setup
-OptionVatMode=VAT due
-OptionVATDefault=Cash basis
-OptionVATDebitOption=Accrual basis
-OptionVatDefaultDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on payments for services
-OptionVatDebitOptionDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on invoice (debit) for services
-SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
-OnDelivery=On delivery
-OnPayment=On payment
-OnInvoice=On invoice
-SupposedToBePaymentDate=Payment date used
-SupposedToBeInvoiceDate=Invoice date used
-Buy=Buy
-Sell=Sell
-InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
-AccountancyCode=Accountancy Code
-AccountancyCodeSell=Sale 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 -> Dictionary -> 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_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
-AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### 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 your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your 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.
-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 same computer than 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.
-##### Point Of Sales (CashDesk) #####
-CashDesk=Point of sales
-CashDeskSetup=Point of sales module setup
-CashDeskThirdPartyForSell=Default generic third party to use for sells
-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).
-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
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
-##### Bookmark #####
-BookmarkSetup=Bookmark module setup
-BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu.
-NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu
-##### WebServices #####
-WebServicesSetup=Webservices module setup
-WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
-WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
-EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
-##### API ####
-ApiSetup=API module setup
-ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
-OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
-ApiKey=Key for API
-WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
-##### Bank #####
-BankSetupModule=Bank module setup
-FreeLegalTextOnChequeReceipts=Free text on cheque receipts
-BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
-BankOrderGlobal=General
-BankOrderGlobalDesc=General display order
-BankOrderES=Spanish
-BankOrderESDesc=Spanish display order
-ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
-##### Multicompany #####
-MultiCompanySetup=Multi-company module setup
-##### Suppliers #####
-SuppliersSetup=Supplier module setup
-SuppliersCommandModel=Complete template of supplier order (logo...)
-SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
-SuppliersInvoiceNumberingModel=Supplier invoices numbering models
-IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
-##### GeoIPMaxmind #####
-GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
-NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
-YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
-YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
-TestGeoIPResult=Test of a conversion IP -> country
-##### Projects #####
-ProjectsNumberingModules=Projects numbering module
-ProjectsSetup=Project module setup
-ProjectsModelModule=Project reports document model
-TasksNumberingModules=Tasks numbering module
-TaskModelModule=Tasks reports document model
-UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
-##### ECM (GED) #####
-##### Fiscal Year #####
-AccountingPeriods=Accounting periods
-AccountingPeriodCard=Accounting period
-NewFiscalYear=New accounting period
-OpenFiscalYear=Open accounting period
-CloseFiscalYear=Close accounting period
-DeleteFiscalYear=Delete accounting period
-ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
-ShowFiscalYear=Show accounting period
-AlwaysEditable=Can always be edited
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
-Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
-IncludePath=Include path (defined into variable %s)
-ExpenseReportsSetup=Setup of module Expense Reports
-TemplatePDFExpenseReports=Document templates to generate expense report document
-NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
-YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of 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
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/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.
-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.
-ConfFileMuseContainCustom=Installing 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)
-TextTitleColor=Color of page title
-LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
-NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
-BackgroundColor=Background color
-TopMenuBackgroundColor=Background color for Top menu
-TopMenuDisableImages=Hide images in Top menu
-LeftMenuBackgroundColor=Background color for Left menu
-BackgroundTableTitleColor=Background color for Table title line
-BackgroundTableLineOddColor=Background color for odd table lines
-BackgroundTableLineEvenColor=Background color for even table lines
-MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
-NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
-UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
-PositionIntoComboList=Position of line into combo lists
-SellTaxRate=Sale tax rate
-RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
-UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipping, you can enter it here. You can use the key {TRACKID} into URL parameters so the system will replace it with value of tracking number user entered into shipment card.
-OpportunityPercent=When you create an opportunity, you will defined an estimated amount of project/lead. According to status of opportunity, this amount may be multiplicated 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
-FixTZ=TimeZone fix
-FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
-ExpectedChecksum=Expected Checksum
-CurrentChecksum=Current Checksum
-ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the latest stable version
-TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
-TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so 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 usefull only if your prices for each leve 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.
-SeeSubstitutionVars=See * note for list of possible substitution variables
-AllPublishers=All publishers
-UnknownPublishers=Unknown publishers
-AddRemoveTabs=Add or remove tabs
-AddDictionaries=Add dictionaries
-AddBoxes=Add widgets
-AddSheduledJobs=Add scheduled jobs
-AddHooks=Add hooks
-AddTriggers=Add triggers
-AddMenus=Add menus
-AddPermissions=Add permissions
-AddExportProfiles=Add export profiles
-AddImportProfiles=Add import profiles
-AddOtherPagesOrServices=Add other pages or services
-AddModels=Add document or numbering templates
-AddSubstitutions=Add keys substitutions
-DetectionNotPossible=Detection not possible
-UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved on 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 correclty. 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 inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <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
-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
-TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
-##### Resource ####
-ResourceSetup=Configuration du module Resource
-UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
diff --git a/htdocs/langs/es_CO/compta.lang b/htdocs/langs/es_CO/compta.lang
index 006f13c57a0..f5efdaf4e01 100644
--- a/htdocs/langs/es_CO/compta.lang
+++ b/htdocs/langs/es_CO/compta.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - compta
 Param=Configuración
+ToPay=To pay
 ByThirdParties=Por empresa
 CodeNotDef=No definida
diff --git a/htdocs/langs/es_CO/main.lang b/htdocs/langs/es_CO/main.lang
index ac5af7a160c..7fa5872f212 100644
--- a/htdocs/langs/es_CO/main.lang
+++ b/htdocs/langs/es_CO/main.lang
@@ -1,9 +1,5 @@
 # Dolibarr language file - Source file is en_US - main
 DIRECTION=ltr
-# Note for Chinese:
-# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
-# stsongstdlight or cid0cs are for simplified Chinese
-# To read Chinese pdf with Linux: sudo apt-get install poppler-data
 FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=,
@@ -23,799 +19,19 @@ FormatDateHourShort=%d/%m/%Y %H:%M
 FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
-DatabaseConnection=Conexión a la base de datos
-NoTemplateDefined=No template defined for this email type
-AvailableVariables=Available substitution variables
-NoTranslation=Sin traducción
 NoRecordFound=No se encontraron registros
-NoRecordDeleted=No record deleted
-NotEnoughDataYet=Not enough data
-NoError=Ningún error
-Error=Error
-Errors=Errors
-ErrorFieldRequired=El campo '%s' es obligatorio
-ErrorFieldFormat=El campo '%s' tiene un valor incorrecto
-ErrorFileDoesNotExists=El archivo %s no existe
-ErrorFailedToOpenFile=Imposible abrir el archivo %s
-ErrorCanNotCreateDir=Cannot create dir %s
-ErrorCanNotReadDir=Cannot read dir %s
-ErrorConstantNotDefined=Parámetro %s no definido
-ErrorUnknown=Error desconocido
-ErrorSQL=Error de SQL
-ErrorLogoFileNotFound=El archivo logo '%s' no se encuentra
-ErrorGoToGlobalSetup=Vaya a la Configuración ' Empresa/Institución ' para corregir
-ErrorGoToModuleSetup=Vaya a la configuración del módulo para corregir
-ErrorFailedToSendMail=Error en el envío del e-mail (emisor=%s, destinatario=%s)
 ErrorFileNotUploaded=El archivo no se transifirió. Compruebe que el tamaño no supere el máximo permitido, el espacio libre disponible en el disco y que no hay un archivo con el mismo nombre en el directorio destino.
-ErrorInternalErrorDetected=Error detectado
-ErrorWrongHostParameter=Parámetro Servidor inválido
-ErrorYourCountryIsNotDefined=Su país no está definido. Corríjalo yendo a Inicio-Configuración-Empresa/Institución-Editar
-ErrorRecordIsUsedByChild=Imposible de suprimir este registro. Esta siendo utilizado como padre por al menos un registro hijo.
-ErrorWrongValue=Valor incorrecto
-ErrorWrongValueForParameterX=Valor incorrecto del parámetro %s
-ErrorNoRequestInError=Ninguna petición en error
-ErrorServiceUnavailableTryLater=Servicio no disponible actualmente. Vuélvalo a intentar más tarde.
-ErrorDuplicateField=Duplicado en un campo único
 ErrorSomeErrorWereFoundRollbackIsDone=Se encontraron algunos errores. Modificaciones sin aplicar.
-ErrorConfigParameterNotDefined=El parámetro <b>%s</b> no está definido en el archivo de configuración Dolibarr <b>conf.php</b>.
-ErrorCantLoadUserFromDolibarrDatabase=Imposible encontrar el usuario <b>%s</b> en la base de datos Dolibarr.
-ErrorNoVATRateDefinedForSellerCountry=Error, ningún tipo de IVA definido para el país '%s'.
-ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
-ErrorFailedToSaveFile=Error, el registro del archivo falló.
-ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
-NotAuthorized=You are not authorized to do that.
-SetDate=Fijar fecha
-SelectDate=Seleccione una fecha
-SeeAlso=Ver también %s
 SeeHere=Ver aquí
-Apply=Apply
-BackgroundColorByDefault=Color de fondo
-FileRenamed=The file was successfully renamed
-FileUploaded=El archivo se ha subido correctamente
-FileGenerated=The file was successfully generated
 FileWasNotUploaded=Un archivo ha sido seleccionado para adjuntarlo, pero aún no se ha subido. Haga clic en "Adjuntar este archivo".
-NbOfEntries=Nº de entradas
-GoToWikiHelpPage=Read online help (Internet access needed)
-GoToHelpPage=Consultar la ayuda
-RecordSaved=Registro guardado
-RecordDeleted=Registro eliminado
-LevelOfFeature=Nivel de funciones
-NotDefined=No definida
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
-Administrator=Administrador
-Undefined=No definido
-PasswordForgotten=Password forgotten?
 SeeAbove=Ver arriba
-HomeArea=Área inicio
-LastConnexion=Latest connection
-PreviousConnexion=Conexión anterior
-PreviousValue=Previous value
-ConnectedOnMultiCompany=Conexión a la entidad
-ConnectedSince=Conectado desde
-AuthenticationMode=Authentication mode
-RequestedUrl=Requested URL
-DatabaseTypeManager=Tipo de gestor de base de datos
-RequestLastAccessInError=Latest database access request error
-ReturnCodeLastAccessInError=Return code for latest database access request error
-InformationLastAccessInError=Information for latest database access request error
-DolibarrHasDetectedError=Dolibarr ha detectado un error técnico
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes
-MoreInformation=Más información
-TechnicalInformation=Información técnica
-TechnicalID=Technical ID
-NotePublic=Nota (pública)
-NotePrivate=Nota (privada)
-PrecisionUnitIsLimitedToXDecimals=Dolibarr está configurado para limitar la precisión de los precios unitarios a <b>%s</b> decimales.
-DoTest=Probar
-ToFilter=Filtrar
-NoFilter=No filter
-WarningYouHaveAtLeastOneTaskLate=Atención, tiene al menos un elemento que ha pasado la fecha de tolerancia.
-yes=sí
-Yes=Sí
-no=no
-No=No
-All=Todo
-Home=Inicio
-Help=Ayuda
-OnlineHelp=Ayuda en línea
-PageWiki=Página Wiki
-MediaBrowser=Media browser
-Always=Siempre
-Never=Nunca
-Under=Bajo
-Period=Periodo
-PeriodEndDate=Fecha fin periodo
-Activate=Activar
-Activated=Activado
-Closed=Cerrado
-Closed2=Cerrado
-NotClosed=Not closed
-Enabled=Activado
-Deprecated=Obsoleto
-Disable=Desactivar
-Disabled=Desactivado
-Add=Añadir
-AddLink=Enlazar
-RemoveLink=Remove link
-AddToDraft=Add to draft
-Update=Modificar
-Close=Cerrar
-CloseBox=Remove widget from your dashboard
-Confirm=Confirmar
-ConfirmSendCardByMail=Do you really want to send content of this card by mail to <b>%s</b>?
-Delete=Eliminar
-Remove=Retirar
-Resiliate=Terminate
-Cancel=Anular
-Modify=Modificar
-Edit=Editar
-Validate=Validar
 ValidateAndApprove=Validar y aprobar
-ToValidate=A validar
-Save=Grabar
-SaveAs=Grabar como
-TestConnection=Probar la conexión
-ToClone=Copiar
-ConfirmClone=Seleccione los datos que desea copiar:
-NoCloneOptionsSpecified=No hay datos definidos para copiar
-Of=de
-Go=Ir
-Run=Lanzar
-CopyOf=Copia de
-Show=Ver
-Hide=Hide
-ShowCardHere=Ver la ficha aquí
-Search=Buscar
-SearchOf=Búsqueda de
-Valid=Validar
-Approve=Aprobar
-Disapprove=Desaprobar
-ReOpen=Reabrir
-Upload=Enviar archivo
-ToLink=Enlace
-Select=Seleccionar
-Choose=Elegir
-Resize=Redimensionar
-Recenter=Encuadrar
-Author=Autor
-User=Usuario
-Users=Usuarios
-Group=Grupo
-Groups=Grupos
 NoUserGroupDefined=No hay grupo de usuario definido
-Password=Contraseña
-PasswordRetype=Repetir contraseña
-NoteSomeFeaturesAreDisabled=Atención, sólo unos pocos módulos/funcionalidades han sido activados en esta demo.
-Name=Nombre
-Person=Persona
-Parameter=Parámetro
-Parameters=Parámetros
-Value=Valor
-PersonalValue=Valor personalizado
-NewValue=Nuevo valor
-CurrentValue=Valor actual
-Code=Código
-Type=Tipo
-Language=Idioma
-MultiLanguage=Multiidioma
-Note=Nota
-Title=Título
-Label=Etiqueta
-RefOrLabel=Ref. o etiqueta
-Info=Log
-Family=Familia
-Description=Descripción
-Designation=Descripción
-Model=Doc template
-DefaultModel=Default doc template
-Action=Acción
-About=Acerca de
-Number=Número
-NumberByMonth=Número por mes
-AmountByMonth=Importe por mes
-Numero=Número
-Limit=Límite
-Limits=Límites
-Logout=Desconexión
-NoLogoutProcessWithAuthMode=Sin funcionalidades de desconexión con el modo de autenticación <b>%s</b>
-Connection=Conexión
-Setup=Configuración
-Alert=Alerta
-Previous=Anterior
-Next=Siguiente
-Cards=Fichas
-Card=Ficha
-Now=Ahora
-HourStart=Start hour
-Date=Fecha
-DateAndHour=Fecha y hora
-DateToday=Today's date
-DateReference=Reference date
-DateStart=Start date
-DateEnd=End date
-DateCreation=Fecha de creación
-DateCreationShort=Creat. date
-DateModification=Fecha de modificación
 DateModificationShort=Fecha modificación
-DateLastModification=Latest modification date
-DateValidation=Fecha de validación
-DateClosing=Fecha de cierre
-DateDue=Fecha de vencimiento
-DateValue=Fecha valor
-DateValueShort=Fecha valor
-DateOperation=Fecha operación
-DateOperationShort=Fecha op.
-DateLimit=Fecha límite
-DateRequest=Fecha consulta
-DateProcess=Fecha proceso
-DateBuild=Fecha generación del informe
-DatePayment=Fecha pago
-DateApprove=Approving date
-DateApprove2=Approving date (second approval)
-UserCreation=Creation user
-UserModification=Modification user
-UserCreationShort=Creat. user
-UserModificationShort=Modif. user
-DurationYear=año
-DurationMonth=mes
-DurationWeek=semana
-DurationDay=día
-DurationYears=años
-DurationMonths=meses
-DurationWeeks=semanas
-DurationDays=días
-Year=Año
-Month=Mes
-Week=Semana
-WeekShort=Semana
-Day=Día
-Hour=Hora
-Minute=Minuto
-Second=Segundo
-Years=Años
-Months=Meses
-Days=Días
-days=días
-Hours=Horas
-Minutes=Minutos
-Seconds=Segundos
-Weeks=Semanas
-Today=Hoy
-Yesterday=Ayer
-Tomorrow=Mañana
-Morning=Mañana
-Afternoon=Tarde
-Quadri=Trimestre
-MonthOfDay=Mes del día
-HourShort=H
-MinuteShort=mn
-Rate=Tipo
-CurrencyRate=Currency conversion rate
 UseLocalTax=Incluir impuestos
-Bytes=Bytes
-KiloBytes=Kilobytes
-MegaBytes=Megabytes
-GigaBytes=Gigabytes
-TeraBytes=Terabytes
-b=b.
-Kb=Kb
-Mb=Mb
-Gb=Gb
-Tb=Tb
-Cut=Cortar
-Copy=Copiar
-Paste=Pegar
-Default=Predeterminado
-DefaultValue=Valor por defecto
-Price=Precio
-UnitPrice=Precio unitario
-UnitPriceHT=Precio base
-UnitPriceTTC=Precio unitario total
-PriceU=P.U.
-PriceUHT=P.U.
-PriceUHTCurrency=U.P (currency)
-PriceUTTC=U.P. (inc. tax)
-Amount=Importe
-AmountInvoice=Importe factura
-AmountPayment=Importe pago
-AmountHTShort=Base imp.
-AmountTTCShort=Importe
-AmountHT=Base imponible
-AmountTTC=Importe total
-AmountVAT=Importe IVA
-MulticurrencyAlreadyPaid=Already payed, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
-MulticurrencyAmountHT=Amount (net of tax), original currency
-MulticurrencyAmountTTC=Amount (inc. of tax), original currency
-MulticurrencyAmountVAT=Amount tax, original currency
-AmountLT1=Importe Impuesto 2
-AmountLT2=Importe Impuesto 3
-AmountLT1ES=Importe RE
-AmountLT2ES=Importe IRPF
-AmountTotal=Importe total
-AmountAverage=Importe medio
-PriceQtyMinHT=Precio cantidad min. total
-Percentage=Porcentaje
-Total=Total
-SubTotal=Subtotal
-TotalHTShort=Importe
-TotalHTShortCurrency=Total (net in currency)
-TotalTTCShort=Total
-TotalHT=Base imponible
-TotalHTforthispage=Total (base imponible) de esta página
-Totalforthispage=Total for this page
-TotalTTC=Total
-TotalTTCToYourCredit=Total a crédito
-TotalVAT=Total IVA
-TotalLT1=Total Impuesto 2
-TotalLT2=Total Impuesto 3
-TotalLT1ES=Total RE
-TotalLT2ES=Total IRPF
-HT=Sin IVA
-TTC=IVA incluido
-VAT=IVA
-VATs=Sales taxes
-LT1ES=RE
-LT2ES=IRPF
-VATRate=Tasa IVA
-Average=Media
-Sum=Suma
-Delta=Diferencia
-Module=Módulo
-Option=Opción
-List=Listado
-FullList=Listado completo
-Statistics=Estadísticas
-OtherStatistics=Otras estadísticas
-Status=Estado
-Favorite=Favorito
-ShortInfo=Info.
-Ref=Ref.
-ExternalRef=Ref. extern
-RefSupplier=Ref. proveedor
-RefPayment=Ref. pago
 CommercialProposalsShort=Cotizaciones
-Comment=Comentario
-Comments=Comentarios
-ActionsToDo=Eventos a realizar
-ActionsToDoShort=A realizar
-ActionsDoneShort=Realizadas
-ActionNotApplicable=No aplicable
-ActionRunningNotStarted=No empezado
-ActionRunningShort=In progress
-ActionDoneShort=Terminado
-ActionUncomplete=Incompleto
-CompanyFoundation=Empresa o institución
-ContactsForCompany=Contactos de este tercero
-ContactsAddressesForCompany=Contactos/direcciones de este tercero
-AddressesForCompany=Direcciones de este tercero
-ActionsOnCompany=Eventos respecto a este tercero
-ActionsOnMember=Eventos respecto a este miembro
-NActionsLate=%s en retraso
 RequestAlreadyDone=La solicitud ya ha sido procesada
-Filter=Filtro
-FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
-RemoveFilter=Eliminar filtro
-ChartGenerated=Gráficos generados
-ChartNotGenerated=Gráfico no generado
-GeneratedOn=Generado el %s
-Generate=Generar
-Duration=Duración
-TotalDuration=Duración total
-Summary=Resumen
-DolibarrStateBoard=Estadísticas
-DolibarrWorkBoard=Indicadores de trabajo
-Available=Disponible
-NotYetAvailable=Aún no disponible
-NotAvailable=No disponible
-Categories=Tags/categories
-Category=Tag/category
-By=Por
-From=De
-to=a
-and=y
-or=o
-Other=Otro
-Others=Otros
-OtherInformations=Otras informaciones
-Quantity=Cantidad
-Qty=Cant.
-ChangedBy=Modificado por
-ApprovedBy=Approved by
-ApprovedBy2=Approved by (second approval)
-Approved=Approved
-Refused=Refused
-ReCalculate=Recalcular
-ResultKo=Error
-Reporting=Informe
-Reportings=Informes
-Draft=Borrador
-Drafts=Borradores
-Validated=Validado
-Opened=Abierto
-New=Nuevo
-Discount=Descuento
-Unknown=Desconocido
-General=General
-Size=Tamaño
-Received=Recibido
-Paid=Pagado
-Topic=Subject
-ByCompanies=Por empresa
-ByUsers=Por usuario
-Links=Enlaces
-Link=Enlace
-Rejects=Devoluciones
-Preview=Vista previa
-NextStep=Siguiente paso
-Datas=Datos
-None=Nada
-NoneF=Ninguna
-Late=Retraso
-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.
-Photo=Foto
-Photos=Fotos
-AddPhoto=Añadir foto
-DeletePicture=Picture delete
-ConfirmDeletePicture=Confirm picture deletion?
-Login=Login
-CurrentLogin=Login actual
-EnterLoginDetail=Enter login details
-January=enero
-February=febrero
-March=marzo
-April=abril
-May=mayo
-June=junio
-July=julio
-August=agosto
-September=septiembre
-October=octubre
-November=noviembre
 December=diciembre
-JanuaryMin=Ene
-FebruaryMin=Feb
-MarchMin=Mar
-AprilMin=Abr
-MayMin=May
-JuneMin=Jun
-JulyMin=Jul
-AugustMin=Ago
-SeptemberMin=Sep
-OctoberMin=Oct
-NovemberMin=Nov
-DecemberMin=Dec
-Month01=enero
-Month02=febrero
-Month03=marzo
-Month04=abril
-Month05=mayo
-Month06=junio
-Month07=julio
-Month08=agosto
-Month09=septiembre
-Month10=octubre
-Month11=noviembre
-Month12=diciembre
-MonthShort01=ene.
-MonthShort02=feb.
-MonthShort03=mar.
-MonthShort04=abr.
-MonthShort05=may.
-MonthShort06=jun.
-MonthShort07=jul.
-MonthShort08=ago.
-MonthShort09=sep.
-MonthShort10=oct.
-MonthShort11=nov.
-MonthShort12=dic.
-AttachedFiles=Archivos y documentos adjuntos
-FileTransferComplete=Se transfirió correctamente el archivo
-DateFormatYYYYMM=YYYY-MM
-DateFormatYYYYMMDD=YYYY-MM-DD
-DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
-ReportName=Nombre del informe
-ReportPeriod=Periodo de análisis
-ReportDescription=Descripción
-Report=Informe
-Keyword=Keyword
-Origin=Origin
-Legend=Leyenda
-Fill=Rellenar
-Reset=Vaciar
-File=Archivo
-Files=Archivos
-NotAllowed=No autorizado
-ReadPermissionNotAllowed=Lectura no autorizada
-AmountInCurrency=Importes visualizados en %s
-Example=Ejemplo
-Examples=Ejemplos
-NoExample=Sin ejemplo
 FindBug=Señalar un bug
-NbOfThirdParties=Número de terceros
-NbOfLines=Números de líneas
-NbOfObjects=Número de objetos
-NbOfObjectReferers=Number of related items
-Referers=Related items
-TotalQuantity=Cantidad total
-DateFromTo=De %s a %s
-DateFrom=A partir de %s
-DateUntil=Hasta %s
-Check=Verificar
-Uncheck=Uncheck
-Internal=Interno
-External=Externo
-Internals=Internos
-Externals=Externos
-Warning=Alerta
-Warnings=Alertas
-BuildDoc=Generar el documento
-Entity=Entidad
-Entities=Entidades
-CustomerPreview=Historial cliente
-SupplierPreview=Historial proveedor
-ShowCustomerPreview=Ver historial cliente
-ShowSupplierPreview=Ver historial proveedor
-RefCustomer=Ref. cliente
 Currency=Moneda
-InfoAdmin=Información para los administradores
-Undo=Anular
-Redo=Rehacer
-ExpandAll=Expandir todo
-UndoExpandAll=Contraer todo
-Reason=Razón
-FeatureNotYetSupported=Funcionalidad aún no soportada
-CloseWindow=Cerrar ventana
-Response=Respuesta
-Priority=Prioridad
-SendByMail=Enviar por e-mail
-MailSentBy=Mail enviado por
-TextUsedInTheMessageBody=Texto utilizado en el cuerpo del mensaje
-SendAcknowledgementByMail=Send confirmation email
-EMail=E-mail
-NoEMail=Sin e-mail
-Email=Email
-NoMobilePhone=Sin teléfono móvil
-Owner=Propietario
-FollowingConstantsWillBeSubstituted=Las siguientes constantes serán substituidas por su valor correspondiente.
-Refresh=Refrescar
-BackToList=Volver al listado
-GoBack=Volver atrás
-CanBeModifiedIfOk=Puede modificarse si es valido
-CanBeModifiedIfKo=Puede modificarse si no es valido
-ValueIsValid=Valor válido
-ValueIsNotValid=Value is not valid
-RecordCreatedSuccessfully=Record created successfully
-RecordModifiedSuccessfully=Registro modificado con éxito
-RecordsModified=%s record modified
-RecordsDeleted=%s record deleted
-AutomaticCode=Creación automática de código
-FeatureDisabled=Función desactivada
-MoveBox=Move widget
-Offered=Oferta
-NotEnoughPermissions=No tiene permisos para esta acción
-SessionName=Nombre sesión
-Method=Método
-Receive=Recepción
-CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
-ExpectedValue=Expected Value
-CurrentValue=Valor actual
-PartialWoman=Parcial
-TotalWoman=Total
-NeverReceived=Nunca recibido
-Canceled=Cancelado
-YouCanChangeValuesForThisListFromDictionarySetup=Puede cambiar estos valores en el menú configuración->diccionarios
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
-Color=Color
-Documents=Documentos
-Documents2=Documentos
-UploadDisabled=Subida desactivada
-MenuECM=Documentos
-MenuAWStats=AWStats
-MenuMembers=Miembros
-MenuAgendaGoogle=Agenda Google
-ThisLimitIsDefinedInSetup=Límite Dolibarr (Menú inicio-configuración-seguridad): %s Kb, PHP limit: %s Kb
-NoFileFound=No hay documentos guardados en este directorio
-CurrentUserLanguage=Idioma actual
-CurrentTheme=Tema actual
-CurrentMenuManager=Gestor menú actual
-Browser=Browser
-Layout=Layout
-Screen=Screen
-DisabledModules=Módulos desactivados
-For=Para
-ForCustomer=Para cliente
-Signature=Firma
-DateOfSignature=Date of signature
-HidePassword=Mostrar comando con contraseña oculta
-UnHidePassword=Mostrar comando con contraseña a la vista
-Root=Raíz
-Informations=Información
-Page=Página
-Notes=Notas
-AddNewLine=Añadir nueva línea
-AddFile=Añadir archivo
-FreeZone=Entrada libre
-FreeLineOfType=Entrada libre del tipo
-CloneMainAttributes=Clonar el objeto con estos atributos principales
-PDFMerge=Fusión PDF
-Merge=Fusión
-PrintContentArea=Mostrar página de impresión de la zona central
-MenuManager=Gestor de menú
-WarningYouAreInMaintenanceMode=Atención, está en modo mantenimiento, así que solamente el login <b>%s</b> está autorizado para utilizar la aplicación en este momento.
-CoreErrorTitle=Error del sistema
-CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
-CreditCard=Tarjeta de crédito
-FieldsWithAreMandatory=Los campos marcados por un <b>%s</b> son obligatorios
-FieldsWithIsForPublic=Los campos marcados por <b>%s</b> se mostrarán en la lista pública de miembros. Si no desea verlos, desactive la casilla "público".
-AccordingToGeoIPDatabase=(Obtenido por conversión GeoIP)
-Line=Línea
-NotSupported=No soportado
-RequiredField=Campo obligatorio
-Result=Resultado
-ToTest=Probar
-ValidateBefore=Para poder usar esta función debe validarse la ficha
-Visibility=Visibilidad
-Private=Privado
-Hidden=Caché
-Resources=Recursos
-Source=Origen
-Prefix=Prefijo
-Before=Antes
-After=Después
-IPAddress=Dirección IP
-Frequency=Frecuencia
-IM=Mensajería instantánea
-NewAttribute=Nuevo atributo
-AttributeCode=Código atributo
-URLPhoto=Url de la foto/logo
-SetLinkToAnotherThirdParty=Vincular a otro tercero
-LinkTo=Link to
-LinkToProposal=Link to proposal
-LinkToOrder=Link to order
-LinkToInvoice=Link to invoice
-LinkToSupplierOrder=Link to supplier order
-LinkToSupplierProposal=Link to supplier proposal
-LinkToSupplierInvoice=Link to supplier invoice
-LinkToContract=Link to contract
-LinkToIntervention=Link to intervention
-CreateDraft=Crear borrador
-SetToDraft=Volver a borrador
-ClickToEdit=Clic para editar
-ObjectDeleted=Objeto %s eliminado
-ByCountry=Par país
-ByTown=Por población
-ByDate=Por fecha
-ByMonthYear=Por mes/año
-ByYear=Por año
-ByMonth=Por mes
-ByDay=Por día
-BySalesRepresentative=Por comercial
-LinkedToSpecificUsers=Enlazado a un contacto de usuario particular
-NoResults=Ningún resultado
-AdminTools=Admin tools
-SystemTools=System tools
-ModulesSystemTools=Utilidades módulos
-Test=Prueba
-Element=Elemento
-NoPhotoYet=No hay fotografía disponible
-Dashboard=Dashboard
-MyDashboard=My dashboard
-Deductible=Deducible
-from=de
-toward=hacia
-Access=Acceso
-SelectAction=Select action
-HelpCopyToClipboard=Use Ctrl+C para copiar al portapapeles
-SaveUploadedFileWithMask=Guardar el archivo con el nombre "<strong>%s</strong>" (sino "%s")
-OriginFileName=Nombre del archivo origen
-SetDemandReason=Definir origen
-SetBankAccount=Definir cuenta bancaria
-AccountCurrency=Divisa de la cuenta
-ViewPrivateNote=Ver notas
-XMoreLines=%s línea(s) ocultas
-PublicUrl=URL pública
-AddBox=Añadir caja
-SelectElementAndClickRefresh=Seleccione un elemento y haga clic en Actualizar
 PrintFile=Imprimir archivo %s
-ShowTransaction=Show entry on bank account
-GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
-Deny=Deny
-Denied=Denied
-ListOfTemplates=List of templates
-Gender=Gender
-Genderman=Man
-Genderwoman=Woman
-ViewList=List view
-Mandatory=Mandatory
-Hello=Hello
-Sincerely=Sincerely
-DeleteLine=Delete line
-ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
-NoRecordSelected=No record selected
-MassFilesArea=Area for files built by mass actions
-ShowTempMassFilesArea=Show area of files built by mass actions
-RelatedObjects=Related Objects
-ClassifyBilled=Classify billed
-Progress=Progress
-ClickHere=Click here
-FrontOffice=Front office
-BackOffice=Back office
-View=View
-Export=Export
-Exports=Exports
-ExportFilteredList=Export filtered list
-ExportList=Export list
-Miscellaneous=Miscellaneous
-Calendar=Calendar
-GroupBy=Group by...
-ViewFlatList=View flat list
-RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Direct download link
-Download=Download
-ActualizeCurrency=Update currency rate
-Fiscalyear=Fiscal year
-# Week day
-Monday=Lunes
-Tuesday=Martes
-Wednesday=Miércoles
-Thursday=Jueves
-Friday=Viernes
-Saturday=Sábado
-Sunday=Domingo
-MondayMin=Lu
-TuesdayMin=Ma
-WednesdayMin=Mi
-ThursdayMin=Ju
-FridayMin=Vi
-SaturdayMin=Sa
-SundayMin=Do
-Day1=Lunes
-Day2=Martes
-Day3=Miércoles
-Day4=Jueves
-Day5=Viernes
-Day6=Sábado
-Day0=Domingo
-ShortMonday=L
-ShortTuesday=M
-ShortWednesday=Mi
-ShortThursday=J
-ShortFriday=V
-ShortSaturday=S
-ShortSunday=D
-SelectMailModel=Select email template
-SetRef=Set ref
-Select2ResultFoundUseArrows=Some results found. Use arrows to select.
-Select2NotFound=No result found
-Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
-Select2LoadingMoreResults=Loading more results...
-Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
-SearchIntoContacts=Contacts
-SearchIntoMembers=Miembros
-SearchIntoUsers=Usuarios
-SearchIntoProductsOrServices=Products or services
-SearchIntoProjects=Projects
-SearchIntoTasks=Tasks
-SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
-SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
-SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
-SearchIntoInterventions=Interventions
-SearchIntoContracts=Contracts
-SearchIntoCustomerShipments=Customer shipments
-SearchIntoExpenseReports=Expense reports
-SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/es_DO/accountancy.lang b/htdocs/langs/es_DO/accountancy.lang
deleted file mode 100644
index 527f1fd139d..00000000000
--- a/htdocs/langs/es_DO/accountancy.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-AccountingCategory=Accounting category
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
diff --git a/htdocs/langs/es_DO/admin.lang b/htdocs/langs/es_DO/admin.lang
index 774595e24a8..46365249827 100644
--- a/htdocs/langs/es_DO/admin.lang
+++ b/htdocs/langs/es_DO/admin.lang
@@ -1,1665 +1,24 @@
 # Dolibarr language file - Source file is en_US - admin
-Foundation=Foundation
-Version=Version
-VersionProgram=Version program
-VersionLastInstall=Initial install version
-VersionLastUpgrade=Latest version upgrade
-VersionExperimental=Experimental
-VersionDevelopment=Development
-VersionUnknown=Unknown
-VersionRecommanded=Recommended
-FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. Value of some setup constants may also be checked. You can use this tool to detect if some files were modified by a hacker for example.
-FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
-GlobalChecksum=Global checksum
-MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
-LocalSignature=Embedded local signature (less reliable)
-RemoteSignature=Remote distant signature (more reliable)
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FilesModified=Modified Files
-FilesAdded=Added Files
-FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
-XmlNotFound=Xml Integrity File of application not found
-SessionId=Session ID
-SessionSaveHandler=Handler to save sessions
-SessionSavePath=Storage session localization
-PurgeSessions=Purge of sessions
-ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
-NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow to list all running sessions.
-LockNewSessions=Lock new connections
-ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself. Only user <b>%s</b> will be able to connect after that.
-UnlockNewSessions=Remove connection lock
-YourSession=Your session
-Sessions=Users session
-WebUserGroup=Web server user/group
-NoSessionFound=Your PHP seems to not allow to list active sessions. Directory used to save sessions (<b>%s</b>) might be protected (For example, by OS permissions or by PHP directive open_basedir).
-DBStoringCharset=Database charset to store data
-DBSortingCharset=Database charset to sort data
-WarningModuleNotActive=Module <b>%s</b> must be enabled
-WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page.
-DolibarrSetup=Dolibarr install or upgrade
-InternalUser=Internal user
-ExternalUser=External user
-InternalUsers=Internal users
-ExternalUsers=External users
-GUISetup=Display
-SetupArea=Setup area
-FormToTestFileUploadForm=Form to test file upload (according to setup)
-IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
-RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
-RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any usage of update tool.
-SecuritySetup=Security setup
-SecurityFilesDesc=Define here options related to security about uploading files.
-ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
-ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
-ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is not supported.
-DictionarySetup=Dictionary setup
-Dictionary=Dictionaries
-ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
-ErrorCodeCantContainZero=Code can't contain value 0
-DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
-UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties, but it is less convenient)
-DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact, but it is less convenient)
-NumberOfKeyToSearch=Nbr of characters to trigger search: %s
-NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
-AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
-JavascriptDisabled=JavaScript disabled
-UsePreviewTabs=Use preview tabs
-ShowPreview=Show preview
-PreviewNotAvailable=Preview not available
-ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
-MySQLTimeZone=TimeZone MySql (database)
-TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
-Space=Space
-Table=Table
-Fields=Fields
-Index=Index
-Mask=Mask
-NextValue=Next value
-NextValueForInvoices=Next value (invoices)
-NextValueForCreditNotes=Next value (credit notes)
-NextValueForDeposit=Next value (deposit)
-NextValueForReplacements=Next value (replacements)
-MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to <b>%s</b> %s, whatever this parameter's value is
-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
-AntiVirusParam= More parameters on command line
-AntiVirusParamExample= Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
-ComptaSetup=Accounting module setup
-UserSetup=User management setup
-MultiCurrencySetup=Multi-currency setup
-MenuLimits=Limits and accuracy
-MenuIdParent=Parent menu ID
-DetailMenuIdParent=ID of parent menu (empty for a top menu)
-DetailPosition=Sort number to define menu position
-AllMenus=All
-NotConfigured=Module not configured
-Active=Active
-SetupShort=Setup
-OtherOptions=Other options
-OtherSetup=Other setup
-CurrentValueSeparatorDecimal=Decimal separator
-CurrentValueSeparatorThousand=Thousand separator
-Destination=Destination
-IdModule=Module ID
-IdPermissions=Permissions ID
-Modules=Modules
-LanguageBrowserParameter=Parameter %s
-LocalisationDolibarrParameters=Localisation parameters
-ClientTZ=Client Time Zone (user)
-ClientHour=Client time (user)
-OSTZ=Server OS Time Zone
-PHPTZ=PHP server Time Zone
-DaylingSavingTime=Daylight saving time
-CurrentHour=PHP Time (server)
-CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
-Box=Widget
-Boxes=Widgets
-MaxNbOfLinesForBoxes=Max number of lines for widgets
-PositionByDefault=Default order
-Position=Position
-MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
-MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br />Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
-MenuForUsers=Menu for users
-LangFile=.lang file
-System=System
-SystemInfo=System information
-SystemToolsArea=System tools area
-SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for.
-Purge=Purge
-PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
-PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
-PurgeDeleteTemporaryFilesShort=Delete temporary files
-PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory <b>%s</b>. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted.
-PurgeRunNow=Purge now
-PurgeNothingToDelete=No directory or files to delete.
-PurgeNDirectoriesDeleted=<b>%s</b> files or directories deleted.
-PurgeAuditEvents=Purge all security events
-ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
-GenerateBackup=Generate backup
-Backup=Backup
-Restore=Restore
-RunCommandSummary=Backup has been launched with the following command
-BackupResult=Backup result
-BackupFileSuccessfullyCreated=Backup file successfully generated
-YouCanDownloadBackupFile=Generated files can now be downloaded
-NoBackupFileAvailable=No backup files available.
-ExportMethod=Export method
-ImportMethod=Import method
-ToBuildBackupFileClickHere=To build a backup file, click <a href="%s">here</a>.
-ImportMySqlDesc=To import a backup file, you must use mysql command from command line:
-ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line:
-ImportMySqlCommand=%s %s < mybackupfile.sql
-ImportPostgreSqlCommand=%s %s mybackupfile.sql
-FileNameToGenerate=File name to generate
-Compression=Compression
-CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
-CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
-ExportCompatibility=Compatibility of generated export file
-MySqlExportParameters=MySQL export parameters
-PostgreSqlExportParameters= PostgreSQL export parameters
-UseTransactionnalMode=Use transactional mode
-FullPathToMysqldumpCommand=Full path to mysqldump command
-FullPathToPostgreSQLdumpCommand=Full path to pg_dump command
-ExportOptions=Export Options
-AddDropDatabase=Add DROP DATABASE command
-AddDropTable=Add DROP TABLE command
-ExportStructure=Structure
-NameColumn=Name columns
-ExtendedInsert=Extended INSERT
-NoLockBeforeInsert=No lock commands around INSERT
-DelayedInsert=Delayed insert
-EncodeBinariesInHexa=Encode binary data in hexadecimal
-IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
-AutoDetectLang=Autodetect (browser language)
-FeatureDisabledInDemo=Feature disabled in demo
-FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Permissions
-BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
-OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
-ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external modules...
-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 (Note: anyone experienced in PHP programming can provide custom development for an open source project)
-WebSiteDesc=Reference websites to find more modules...
-URL=Link
-BoxesAvailable=Widgets available
-BoxesActivated=Widgets activated
-ActivateOn=Activate on
-ActiveOn=Activated on
-SourceFile=Source file
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
-Required=Required
-UsedOnlyWithTypeOption=Used by some agenda option only
-Security=Security
-Passwords=Passwords
-DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
-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 (Activated 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 make building of a global cumulated pdf not working (like unpaid invoices).
-Feature=Feature
-DolibarrLicense=License
-Developpers=Developers/contributors
-OfficialWebSite=Dolibarr international official web site
-OfficialWebSiteLocal=Local web site (%s)
-OfficialWiki=Dolibarr documentation on Wiki
-OfficialDemo=Dolibarr online demo
-OfficialMarketPlace=Official market place for external modules/addons
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
-ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
-HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
-HelpCenterDesc2=Some part of this service are available in <b>english only</b>.
-CurrentMenuHandler=Current menu handler
-MeasuringUnit=Measuring unit
-LeftMargin=Left margin
-TopMargin=Top margin
-PaperSize=Paper type
-Orientation=Orientation
-SpaceX=Space X
-SpaceY=Space Y
-FontSize=Font size
-Content=Content
-NoticePeriod=Notice period
-NewByMonth=New by month
-Emails=E-mails
-EMailsSetup=E-mails setup
-EMailsDesc=This page allows you to overwrite your PHP parameters for e-mails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless.
-MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
-MAIN_MAIL_EMAIL_FROM=Sender e-mail for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Sender e-mail used for error returns emails sent
-MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
-MAIN_DISABLE_ALL_MAILS=Disable all e-mails sendings (for test purposes or demos)
-MAIN_MAIL_SENDMODE=Method to use to send EMails
-MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
-MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
-MAIN_MAIL_EMAIL_TLS= Use TLS (SSL) encrypt
-MAIN_MAIL_EMAIL_STARTTLS= Use TLS (STARTTLS) encrypt
-MAIN_DISABLE_ALL_SMS=Disable all SMS sendings (for test purposes or demos)
-MAIN_SMS_SENDMODE=Method to use to send SMS
-MAIN_MAIL_SMS_FROM=Default sender phone number for Sms sending
-MAIN_MAIL_DEFAULT_FROMTYPE=Sender e-mail by default for manual sendings (User email or Company email)
-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/
-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 setup
-ModuleFamilyBase=System
-ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
-ModuleFamilyProducts=Products Management (PM)
-ModuleFamilyHr=Human Resource Management (HR)
-ModuleFamilyProjects=Projects/Collaborative work
-ModuleFamilyOther=Other
-ModuleFamilyTechnic=Multi-modules tools
-ModuleFamilyExperimental=Experimental modules
-ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
-ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
-ModuleFamilyInterface=Interfaces with external systems
-MenuHandlers=Menu handlers
-MenuAdmin=Menu editor
-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).
-DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <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>.
-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='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
-YouCanSubmitFile=For this step, you can send package using this tool: Select module file
-CurrentVersion=Dolibarr current version
-CallUpdatePage=Go to the page that updates the database structure and data: %s.
-LastStableVersion=Latest stable version
-LastActivationDate=Latest activation date
-UpdateServerOffline=Update server offline
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
-GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
-GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
-ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
-ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
-DoTestServerAvailability=Test server connectivity
-DoTestSend=Test sending
-DoTestSendHTML=Test sending HTML
-ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
-ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
-UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
-UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
-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...).
-MinLength=Minimum length
-LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
-ExamplesWithCurrentSetup=Examples with current running setup
-ListOfDirectories=List of OpenDocument templates directories
-ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
-NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories
+AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
+AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 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.
-ThemeDir=Skins directory
-ConnectionTimeout=Connexion timeout
-ResponseTimeout=Response timeout
-SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__
-ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
-SecurityToken=Key to secure URLs
-NoSmsEngine=No SMS sender manager available. SMS sender manager are not installed with default distribution (because they depends on an external supplier) but you can find some on %s
-PDF=PDF
-PDFDesc=You can set each global options related to the PDF generation
-PDFAddressForging=Rules to forge address boxes
 HideAnyVATInformationOnPDF=Ocultar toda la información relacionada con el ITBIS en la generación de los PDF
-HideDescOnPDF=Hide products description on generated PDF
-HideRefOnPDF=Hide products ref. on generated PDF
-HideDetailsOnPDF=Hide product lines details on generated PDF
-PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
-Library=Library
-UrlGenerationParameters=Parameters to secure URLs
-SecurityTokenIsUnique=Use a unique securekey parameter for each URL
-EnterRefToBuildUrl=Enter reference for object %s
-GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Tasa de ITBIS antigua
 NewVATRates=Tasa de ITBIS nueva
-PriceBaseTypeToChange=Modify on prices with base reference value defined on
-MassConvert=Launch mass convert
-String=String
-TextLong=Long text
-Int=Integer
-Float=Float
-DateAndTime=Date and hour
-Unique=Unique
-Boolean=Boolean (Checkbox)
-ExtrafieldPhone = Phone
-ExtrafieldPrice = Price
-ExtrafieldMail = Email
-ExtrafieldUrl = Url
-ExtrafieldSelect = Select list
-ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
-ExtrafieldPassword=Password
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
-ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
-LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
-SMS=SMS
-LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
-RefreshPhoneLink=Refresh link
-LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
-KeepEmptyToUseDefault=Keep empty to use default value
-DefaultLink=Default link
-SetAsDefault=Set as default
-ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
-BarcodeInitForThirdparties=Mass barcode init for thirdparties
-BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Init value for next %s empty records
-EraseAllCurrentBarCode=Erase all current barcode values
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
-AllBarcodeReset=All barcode values have been removed
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into 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
-DisplayCompanyInfo=Display company address
-DisplayCompanyManagers=Display manager names
-DisplayCompanyInfoAndManagers=Display company address and manager names
-EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
-ModuleCompanyCodePanicum=Return an empty accountancy code.
-ModuleCompanyCodeDigitaria=Accountancy 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: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-ClickToShowDescription=Click to show description
-# Modules
-Module0Name=Users & groups
-Module0Desc=Users / Employees and Groups management
-Module1Name=Third parties
-Module1Desc=Companies and contact management (customers, prospects...)
-Module2Name=Commercial
-Module2Desc=Commercial management
-Module10Name=Accounting
-Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
-Module20Name=Proposals
-Module20Desc=Commercial proposal management
-Module22Name=Mass E-mailings
-Module22Desc=Mass E-mailing management
-Module23Name=Energy
-Module23Desc=Monitoring the consumption of energies
-Module25Name=Customer Orders
-Module25Desc=Customer order management
-Module30Name=Invoices
-Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
-Module40Name=Suppliers
-Module40Desc=Supplier management and buying (orders and invoices)
-Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
-Module49Name=Editors
-Module49Desc=Editor management
-Module50Name=Products
-Module50Desc=Product management
-Module51Name=Mass mailings
-Module51Desc=Mass paper mailing management
-Module52Name=Stocks
-Module52Desc=Stock management (products)
-Module53Name=Services
-Module53Desc=Service management
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
-Module55Name=Barcodes
-Module55Desc=Barcode management
-Module56Name=Telephony
-Module56Desc=Telephony integration
-Module57Name=Direct bank payment orders
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
-Module58Name=ClickToDial
-Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
-Module70Name=Interventions
-Module70Desc=Intervention management
-Module75Name=Expense and trip notes
-Module75Desc=Expense and trip notes management
-Module80Name=Shipments
-Module80Desc=Shipments and delivery order management
-Module85Name=Banks and cash
-Module85Desc=Management of bank or cash accounts
-Module100Name=External site
-Module100Desc=This module include an external web site or page into Dolibarr menus and view it into a Dolibarr frame
-Module105Name=Mailman and SPIP
-Module105Desc=Mailman or SPIP interface for member module
-Module200Name=LDAP
-Module200Desc=LDAP directory synchronisation
-Module210Name=PostNuke
-Module210Desc=PostNuke integration
-Module240Name=Data exports
-Module240Desc=Tool to export Dolibarr data (with assistants)
-Module250Name=Data imports
-Module250Desc=Tool to import data in Dolibarr  (with assistants)
-Module310Name=Members
-Module310Desc=Foundation members management
-Module320Name=RSS Feed
-Module320Desc=Add RSS feed inside Dolibarr screen pages
-Module330Name=Bookmarks
-Module330Desc=Bookmarks management
-Module400Name=Projects/Opportunities/Leads
-Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
-Module410Name=Webcalendar
-Module410Desc=Webcalendar integration
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
-Module520Name=Loan
-Module520Desc=Management of loans
-Module600Name=Notifications
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
-Module700Name=Donations
-Module700Desc=Donation management
-Module770Name=Expense reports
-Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
-Module1200Name=Mantis
-Module1200Desc=Mantis integration
-Module1400Name=Accounting
-Module1400Desc=Accounting management (double parties)
-Module1520Name=Document Generation
-Module1520Desc=Mass mail document generation
-Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
-Module2000Name=WYSIWYG editor
-Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
-Module2200Name=Dynamic Prices
-Module2200Desc=Enable the usage of math expressions for prices
-Module2300Name=Cron
-Module2300Desc=Scheduled job management
-Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
-Module2500Name=Electronic Content Management
-Module2500Desc=Save and share documents
-Module2600Name=API/Web services (SOAP server)
-Module2600Desc=Enable the Dolibarr SOAP server providing API services
-Module2610Name=API/Web services (REST server)
-Module2610Desc=Enable the Dolibarr REST server providing API services
-Module2660Name=Call WebServices (SOAP client)
-Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
-Module2700Name=Gravatar
-Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
-Module2800Desc=FTP Client
-Module2900Name=GeoIPMaxmind
-Module2900Desc=GeoIP Maxmind conversions capabilities
-Module3100Name=Skype
-Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
-Module4000Name=HRM
-Module4000Desc=Human resources management
-Module5000Name=Multi-company
-Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management
-Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
-Module20000Name=Leave Requests management
-Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Product lot
-Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
-Module50000Name=PayBox
-Module50000Desc=Module to offer an online payment page by credit card with PayBox
-Module50100Name=Point of sales
-Module50100Desc=Point of sales module (POS).
-Module50200Name=Paypal
-Module50200Desc=Module to offer an online payment page by credit card with Paypal
-Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double parties)
-Module54000Name=PrintIPP
-Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
-Module55000Name=Poll, Survey or Vote
-Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
-Module59000Name=Margins
-Module59000Desc=Module to manage margins
-Module60000Name=Commissions
-Module60000Desc=Module to manage commissions
-Module63000Name=Resources
-Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
-Permission11=Read customer invoices
-Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
-Permission14=Validate customer invoices
-Permission15=Send customer invoices by email
-Permission16=Create payments for customer invoices
-Permission19=Delete customer invoices
-Permission21=Read commercial proposals
-Permission22=Create/modify commercial proposals
-Permission24=Validate commercial proposals
-Permission25=Send commercial proposals
-Permission26=Close commercial proposals
-Permission27=Delete commercial proposals
-Permission28=Export commercial proposals
-Permission31=Read products
-Permission32=Create/modify products
-Permission34=Delete products
-Permission36=See/manage hidden products
-Permission38=Export products
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
-Permission44=Delete projects (shared project and projects i'm contact for)
-Permission45=Export projects
-Permission61=Read interventions
-Permission62=Create/modify interventions
-Permission64=Delete interventions
-Permission67=Export interventions
-Permission71=Read members
-Permission72=Create/modify members
-Permission74=Delete members
-Permission75=Setup types of membership
-Permission76=Export data
-Permission78=Read subscriptions
-Permission79=Create/modify subscriptions
-Permission81=Read customers orders
-Permission82=Create/modify customers orders
-Permission84=Validate customers orders
-Permission86=Send customers orders
-Permission87=Close customers orders
-Permission88=Cancel customers orders
-Permission89=Delete customers orders
 Permission91=Consultar impuestos e ITBIS
 Permission92=Crear/modificar impuestos e ITBIS
 Permission93=Eliminar impuestos e ITBIS
-Permission94=Export social or fiscal taxes
-Permission95=Read reports
-Permission101=Read sendings
-Permission102=Create/modify sendings
-Permission104=Validate sendings
-Permission106=Export sendings
-Permission109=Delete sendings
-Permission111=Read financial accounts
-Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
-Permission114=Reconciliate transactions
-Permission115=Export transactions and account statements
-Permission116=Transfers between accounts
-Permission117=Manage cheques dispatching
-Permission121=Read third parties linked to user
-Permission122=Create/modify third parties linked to user
-Permission125=Delete third parties linked to user
-Permission126=Export third parties
-Permission141=Read all projects and tasks (also private projects i am not contact for)
-Permission142=Create/modify all projects and tasks (also private projects i am not 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
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
-Permission167=Export contracts
-Permission171=Read trips and expenses (yours and your subordinates)
-Permission172=Create/modify trips and expenses
-Permission173=Delete trips and expenses
-Permission174=Read all trips and expenses
-Permission178=Export trips and expenses
-Permission180=Read suppliers
-Permission181=Read supplier orders
-Permission182=Create/modify supplier orders
-Permission183=Validate supplier orders
-Permission184=Approve supplier orders
-Permission185=Order or cancel supplier orders
-Permission186=Receive supplier orders
-Permission187=Close supplier orders
-Permission188=Cancel supplier orders
-Permission192=Create lines
-Permission193=Cancel lines
-Permission194=Read the bandwith lines
-Permission202=Create ADSL connections
-Permission203=Order connections orders
-Permission204=Order connections
-Permission205=Manage connections
-Permission206=Read connections
-Permission211=Read Telephony
-Permission212=Order lines
-Permission213=Activate line
-Permission214=Setup Telephony
-Permission215=Setup providers
-Permission221=Read emailings
-Permission222=Create/modify emailings (topic, recipients...)
-Permission223=Validate emailings (allows sending)
-Permission229=Delete emailings
-Permission237=View recipients and info
-Permission238=Manually send mailings
-Permission239=Delete mailings after validation or sent
-Permission241=Read categories
-Permission242=Create/modify categories
-Permission243=Delete categories
-Permission244=See the contents of the hidden categories
-Permission251=Read other users and groups
-PermissionAdvanced251=Read other users
-Permission252=Read permissions of other users
-Permission253=Create/modify other users, groups and permisssions
-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 assignement matters).
-Permission271=Read CA
-Permission272=Read invoices
-Permission273=Issue invoices
-Permission281=Read contacts
-Permission282=Create/modify contacts
-Permission283=Delete contacts
-Permission286=Export contacts
-Permission291=Read tariffs
-Permission292=Set permissions on the tariffs
-Permission293=Modify costumers tariffs
-Permission300=Read bar codes
-Permission301=Create/modify bar codes
-Permission302=Delete bar codes
-Permission311=Read services
-Permission312=Assign service/subscription to contract
-Permission331=Read bookmarks
-Permission332=Create/modify bookmarks
-Permission333=Delete bookmarks
-Permission341=Read its own permissions
-Permission342=Create/modify his own user information
-Permission343=Modify his own password
-Permission344=Modify its own permissions
-Permission351=Read groups
-Permission352=Read groups permissions
-Permission353=Create/modify groups
-Permission354=Delete or disable groups
-Permission358=Export users
-Permission401=Read discounts
-Permission402=Create/modify discounts
-Permission403=Validate discounts
-Permission404=Delete discounts
-Permission510=Read Salaries
-Permission512=Create/modify salaries
-Permission514=Delete salaries
-Permission517=Export salaries
-Permission520=Read Loans
-Permission522=Create/modify loans
-Permission524=Delete loans
-Permission525=Access loan calculator
-Permission527=Export loans
-Permission531=Read services
-Permission532=Create/modify services
-Permission534=Delete services
-Permission536=See/manage hidden services
-Permission538=Export services
-Permission701=Read donations
-Permission702=Create/modify donations
-Permission703=Delete donations
-Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
-Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
-Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission779=Export expense reports
-Permission1001=Read stocks
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
-Permission1004=Read stock movements
-Permission1005=Create/modify stock movements
-Permission1101=Read delivery orders
-Permission1102=Create/modify delivery orders
-Permission1104=Validate delivery orders
-Permission1109=Delete delivery orders
-Permission1181=Read suppliers
-Permission1182=Read supplier orders
-Permission1183=Create/modify supplier orders
-Permission1184=Validate supplier orders
-Permission1185=Approve supplier orders
-Permission1186=Order supplier orders
-Permission1187=Acknowledge receipt of supplier orders
-Permission1188=Delete supplier orders
-Permission1190=Approve (second approval) supplier orders
-Permission1201=Get result of an export
-Permission1202=Create/Modify an export
-Permission1231=Read supplier invoices
-Permission1232=Create/modify supplier invoices
-Permission1233=Validate supplier invoices
-Permission1234=Delete supplier invoices
-Permission1235=Send supplier invoices by email
-Permission1236=Export supplier invoices, attributes and payments
-Permission1237=Export supplier orders and their details
-Permission1251=Run mass imports of external data into database (data load)
-Permission1321=Export customer invoices, attributes and payments
-Permission1322=Reopen a paid bill
-Permission1421=Export customer orders and attributes
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
-Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
-Permission20006=Admin leave requests (setup and update balance)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
-Permission2401=Read actions (events or tasks) linked to his account
-Permission2402=Create/modify actions (events or tasks) linked to his account
-Permission2403=Delete actions (events or tasks) linked to his account
-Permission2411=Read actions (events or tasks) of others
-Permission2412=Create/modify actions (events or tasks) of others
-Permission2413=Delete actions (events or tasks) of others
-Permission2414=Export actions/tasks of others
-Permission2501=Read/Download documents
-Permission2502=Download documents
-Permission2503=Submit or delete documents
-Permission2515=Setup documents directories
-Permission2801=Use FTP client in read mode (browse and download only)
-Permission2802=Use FTP client in write mode (delete or upload files)
-Permission50101=Use Point of sales
-Permission50201=Read transactions
-Permission50202=Import transactions
-Permission54001=Print
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
-Permission59003=Read every user margin
-Permission63001=Read resources
-Permission63002=Create/modify resources
-Permission63003=Delete resources
-Permission63004=Link resources to agenda events
-DictionaryCompanyType=Types of thirdparties
-DictionaryCompanyJuridicalType=Legal forms of thirdparties
-DictionaryProspectLevel=Prospect potential level
-DictionaryCanton=State/Province
-DictionaryRegion=Regions
-DictionaryCountry=Countries
-DictionaryCurrency=Currencies
-DictionaryCivility=Personal and professional titles
-DictionaryActions=Types of agenda events
-DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=Tasa de ITBIS (Impuesto sobre ventas en EEUU)
-DictionaryRevenueStamp=Amount of revenue stamps
-DictionaryPaymentConditions=Payment terms
-DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact/Address types
-DictionaryEcotaxe=Ecotax (WEEE)
-DictionaryPaperFormat=Paper formats
-DictionaryFormatCards=Cards formats
-DictionaryFees=Types of fees
-DictionarySendingMethods=Shipping methods
-DictionaryStaff=Staff
-DictionaryAvailability=Delivery delay
-DictionaryOrderMethods=Ordering methods
-DictionarySource=Origin of proposals/orders
-DictionaryAccountancyCategory=Accounting account groups
-DictionaryAccountancysystem=Models for chart of accounts
-DictionaryEMailTemplates=Emails templates
-DictionaryUnits=Units
-DictionaryProspectStatus=Prospection status
-DictionaryHolidayTypes=Types of leaves
-DictionaryOpportunityStatus=Opportunity status for project/lead
-SetupSaved=Setup saved
-BackToModuleList=Back to modules list
-BackToDictionaryList=Back to dictionaries list
 VATManagement=Gestión ITBIS
-VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=El tipo de ITBIS propuesto por defecto es 0. Este es el caso de asociaciones, particulares o algunas pequeñas sociedades.
 VATIsUsedExampleFR=En Francia, se trata de las sociedades u organismos que eligen un régimen fiscal general (General simplificado o General normal), régimen en el cual se declara el ITBIS.
 VATIsNotUsedExampleFR=En Francia, se trata de asociaciones exentas de ITBIS o sociedades, organismos o profesiones liberales que han elegido el régimen fiscal de módulos (ITBIS en franquicia), pagando un ITBIS en franquicia sin hacer declaración de IVA. Esta elección hace aparecer la anotación  "IVA no aplicable - art-293B del CGI" en las facturas.
-##### Local Taxes #####
-LTRate=Rate
-LocalTax1IsNotUsed=Do not use second tax
 LocalTax1IsUsedDesc=Uso de un 2º tipo de impuesto (Distinto del ITBIS)
 LocalTax1IsNotUsedDesc=No usar un 2º tipo de impuesto (Distinto del ITBIS)
-LocalTax1Management=Second type of tax
-LocalTax1IsUsedExample=
-LocalTax1IsNotUsedExample=
-LocalTax2IsNotUsed=Do not use third tax
-LocalTax2IsUsedDesc=Use a third type of tax (other than VAT)
 LocalTax2IsNotUsedDesc=No usar un 2º tipo de impuesto (Distinto del ITBIS)
-LocalTax2Management=Third type of tax
-LocalTax2IsUsedExample=
-LocalTax2IsNotUsedExample=
-LocalTax1ManagementES= RE Management
-LocalTax1IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If te buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
-LocalTax1IsNotUsedDescES= By default the proposed RE is 0. End of rule.
-LocalTax1IsUsedExampleES= In Spain they are professionals subject to some specific sections of the Spanish IAE.
-LocalTax1IsNotUsedExampleES= In Spain they are professional and societies and subject to certain sections of the Spanish IAE.
-LocalTax2ManagementES= IRPF Management
-LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
-LocalTax2IsNotUsedDescES= By default the proposed IRPF is 0. End of rule.
-LocalTax2IsUsedExampleES= In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
-LocalTax2IsNotUsedExampleES= In Spain they are bussines not subject to tax system of modules.
-CalcLocaltax=Reports on local taxes
-CalcLocaltax1=Sales - Purchases
-CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2=Purchases
-CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3=Sales
-CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
-LabelUsedByDefault=Label used by default if no translation can be found for code
-LabelOnDocuments=Label on documents
-NbOfDays=Nb of days
-AtEndOfMonth=At end of month
-CurrentNext=Current/Next
-Offset=Offset
-AlwaysActive=Always active
-Upgrade=Upgrade
-MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Deploy/install external module
-WebServer=Web server
-DocumentRootServer=Web server's root directory
-DataRootServer=Data files directory
-IP=IP
-Port=Port
-VirtualServerName=Virtual server name
-OS=OS
-PhpWebLink=Web-Php link
-Browser=Browser
-Server=Server
-Database=Database
-DatabaseServer=Database host
-DatabaseName=Database name
-DatabasePort=Database port
-DatabaseUser=Database user
-DatabasePassword=Database password
-Tables=Tables
-TableName=Table name
-NbOfRecord=Nb of records
-Host=Server
-DriverType=Driver type
-SummarySystem=System information summary
-SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Foundation
-DefaultMenuManager= Standard menu manager
-DefaultMenuSmartphoneManager=Smartphone menu manager
-Skin=Skin theme
-DefaultSkin=Default skin theme
-MaxSizeList=Max length for list
-DefaultMaxSizeList=Default max length for lists
-DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
-MessageOfDay=Message of the day
-MessageLogin=Login page message
-PermanentLeftSearchForm=Permanent search form on left menu
-DefaultLanguage=Default language to use (language code)
-EnableMultilangInterface=Enable multilingual interface
-EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/foundation information
-CompanyIds=Company/foundation identities
-CompanyName=Name
-CompanyAddress=Address
-CompanyZip=Zip
-CompanyTown=Town
-CompanyCountry=Country
-CompanyCurrency=Main currency
-CompanyObject=Object of the company
-Logo=Logo
-DoNotSuggestPaymentMode=Do not suggest
-NoActiveBankAccountDefined=No active bank account defined
-OwnerOfBankAccount=Owner of bank account %s
-BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show link "<strong>%s</strong>"
-Alerts=Alerts
-DelaysOfToleranceBeforeWarning=Tolerance delays before warning
-DelaysOfToleranceDesc=This screen allows you to define the tolerated delays before an alert is reported on screen with picto %s for each late element.
-Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned events (agenda events) not completed yet
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Delay tolerance (in days) before alert on project not closed in time
-Delays_MAIN_DELAY_TASKS_TODO=Delay tolerance (in days) before alert on planned tasks (project tasks) not completed yet
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on orders not processed yet
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on suppliers orders not processed yet
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Delay tolerance (in days) before alert on proposals to close
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Delay tolerance (in days) before alert on proposals not billed
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerance delay (in days) before alert on services to activate
-Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerance delay (in days) before alert on expired services
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerance delay (in days) before alert on unpaid supplier invoices
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerence delay (in days) before alert on unpaid client invoices
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerance delay (in days) before alert on pending bank reconciliation
-Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed membership fee
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
-Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
-SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
-SetupDescription5=Other menu entries manage optional parameters.
-LogEvents=Security audit events
-Audit=Audit
-InfoDolibarr=About Dolibarr
-InfoBrowser=About Browser
-InfoOS=About OS
-InfoWebServer=About Web Server
-InfoDatabase=About Database
-InfoPHP=About PHP
-InfoPerf=About Performances
-BrowserName=Browser name
-BrowserOS=Browser OS
-ListOfSecurityEvents=List of Dolibarr security events
-SecurityEventsPurged=Security events purged
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
-SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
-SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
-DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
-AvailableModules=Available 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.
-TriggersAvailable=Available triggers
-TriggersDesc=Triggers are files that will modify the behaviour of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realised new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
-TriggerDisabledByName=Triggers in this file are disabled by the <b>-NORUN</b> suffix in their name.
-TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module <b>%s</b> is disabled.
-TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules.
-TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
-GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password
-DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">check here</a>.
-MiscellaneousDesc=All other security related parameters are defined here.
-LimitsSetup=Limits/Precision setup
-LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here
-MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices
-MAIN_MAX_DECIMALS_TOT=Max decimals for total prices
-MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add <b>...</b> after this number if you want to see <b>...</b> when number is truncated when shown on screen)
-MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=Precio unitario sin ITBIS de un producto
-TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
-ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
-NoEventFoundWithCriteria=No security event has been found for such search criterias.
-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.
-BackupDescX=Archived directory should be stored in a secure place.
-BackupDescY=The generated dump file should be stored in a secure place.
-BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one
-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 directoy (<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=Available database backup dump files
-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
-DownloadMoreSkins=More skins to download
-SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence without hole and with no reset
-ShowProfIdInAddress=Show professionnal id with addresses on documents
 ShowVATIntaInAddress=Ocultar el identificador ITBIS en las direcciones de los documentos
-TranslationUncomplete=Partial translation
-MAIN_DISABLE_METEO=Disable meteo view
-TestLoginToAPI=Test login to API
-ProxyDesc=Some features of Dolibarr need to have an Internet access to work. Define here parameters for this. If the Dolibarr server is behind a Proxy server, those parameters tells Dolibarr how to access Internet through it.
-ExternalAccess=External access
-MAIN_PROXY_USE=Use a proxy server (otherwise direct access to internet)
-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 all attributes, not already available by default, and that you want to be supported for %s.
-ExtraFields=Complementary attributes
-ExtraFieldsLines=Complementary attributes (lines)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
-ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact/address)
-ExtraFieldsMember=Complementary attributes (member)
-ExtraFieldsMemberType=Complementary attributes (member type)
-ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
-ExtraFieldsSupplierOrders=Complementary attributes (orders)
-ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
-ExtraFieldsProject=Complementary attributes (projects)
-ExtraFieldsProjectTask=Complementary attributes (tasks)
-ExtraFieldHasWrongValue=Attribute %s has a wrong value.
-AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
-SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
-PathToDocuments=Path to documents
-PathDirectory=Directory
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might 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.
-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: <strong>User display setup</strong> tab of 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
-TranslationString=Translation string
-CurrentTranslationString=Current translation string
-WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
-NewTranslationStringToShow=New translation string to show
-OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
-YouMustEnableOneModule=You must at least enable 1 module
-ClassNotFoundIntoPathWarning=Class %s not found into PHP path
-YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
-SuhosinSessionEncrypt=Session storage encrypted by Suhosin
-ConditionIsCurrently=Condition is currently %s
-YouUseBestDriver=You use driver %s that is best driver available currently.
-YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required 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.
-BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance.
-BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
-AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp".
-AskForPreferredShippingMethod=Ask for preferred Sending Method for Third Parties.
-FieldEdition=Edition of field %s
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
-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.
-PasswordGenerationPerso=Return a password according to your personally defined configuration.
-SetupPerso=According to your configuration
-PasswordPatternDesc=Password pattern description
-##### Users setup #####
-RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passwords
-DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page
-UsersSetup=Users module setup
-UserMailRequired=EMail required to create a new user
-##### HRM setup #####
-HRMSetup=HRM module setup
-##### Company setup #####
-CompanySetup=Companies module setup
-CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier)
-AccountCodeManager=Module for accountancy code generation (customer or supplier)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
-NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
-NotificationsDescGlobal=* or by setting global target emails in module setup page.
-ModelModules=Documents templates
-DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
-WatermarkOnDraft=Watermark on draft document
-JSOnPaimentBill=Activate feature to autofill payment lines on payment form
-CompanyIdProfChecker=Rules on Professional Ids
-MustBeUnique=Must be unique?
-MustBeMandatory=Mandatory to create third parties?
-MustBeInvoiceMandatory=Mandatory to validate invoices?
-##### Webcal setup #####
-WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
-##### Invoices #####
-BillsSetup=Invoices module setup
-BillsNumberingModule=Invoices and credit notes numbering model
-BillsPDFModules=Invoice documents models
-CreditNote=Credit note
-CreditNotes=Credit notes
-ForceInvoiceDate=Force invoice date to validation date
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
-SuggestPaymentByRIBOnAccount=Suggest payment by withdraw on account
-SuggestPaymentByChequeToAddress=Suggest payment by cheque to
-FreeLegalTextOnInvoices=Free text on invoices
-WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
-PaymentsNumberingModule=Payments numbering model
-SuppliersPayment=Suppliers payments
-SupplierPaymentSetup=Suppliers payments setup
-##### Proposals #####
-PropalSetup=Commercial proposals module setup
-ProposalsNumberingModules=Commercial proposal numbering models
-ProposalsPDFModules=Commercial proposal documents models
-FreeLegalTextOnProposal=Free text on commercial proposals
-WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
-WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
-##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
-##### Orders #####
-OrdersSetup=Order management setup
-OrdersNumberingModules=Orders numbering models
-OrdersModelModule=Order documents models
-FreeLegalTextOnOrders=Free text on orders
-WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
-ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Interventions #####
-InterventionsSetup=Interventions module setup
-FreeLegalTextOnInterventions=Free text on intervention documents
-FicheinterNumberingModules=Intervention numbering models
-TemplatePDFInterventions=Intervention card documents models
-WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
-##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
-ContractsNumberingModules=Contracts numbering modules
-TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
-##### Members #####
-MembersSetup=Members module setup
-MemberMainOptions=Main options
-AdherentLoginRequired= Manage a Login for each member
-AdherentMailRequired=EMail required to create a new member
-MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
-##### LDAP setup #####
-LDAPSetup=LDAP Setup
-LDAPGlobalParameters=Global parameters
-LDAPUsersSynchro=Users
-LDAPGroupsSynchro=Groups
-LDAPContactsSynchro=Contacts
-LDAPMembersSynchro=Members
-LDAPSynchronization=LDAP synchronisation
-LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP
-LDAPToDolibarr=LDAP -> Dolibarr
-DolibarrToLDAP=Dolibarr -> LDAP
-LDAPNamingAttribute=Key in LDAP
-LDAPSynchronizeUsers=Organization of users in LDAP
-LDAPSynchronizeGroups=Organization of groups in LDAP
-LDAPSynchronizeContacts=Organization of contacts in LDAP
-LDAPSynchronizeMembers=Organization of foundation's members in LDAP
-LDAPPrimaryServer=Primary server
-LDAPSecondaryServer=Secondary server
-LDAPServerPort=Server port
-LDAPServerPortExample=Default port : 389
-LDAPServerProtocolVersion=Protocol version
-LDAPServerUseTLS=Use TLS
-LDAPServerUseTLSExample=Your LDAP server use TLS
-LDAPServerDn=Server DN
-LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
-LDAPPassword=Administrator password
-LDAPUserDn=Users' DN
-LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
-LDAPGroupDn=Groups' DN
-LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com)
-LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
-LDAPServerDnExample=Complete DN (ex: dc=example,dc=com)
-LDAPDnSynchroActive=Users and groups synchronization
-LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization
-LDAPDnContactActive=Contacts' synchronization
-LDAPDnContactActiveExample=Activated/Unactivated synchronization
-LDAPDnMemberActive=Members' synchronization
-LDAPDnMemberActiveExample=Activated/Unactivated synchronization
-LDAPContactDn=Dolibarr contacts' DN
-LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com)
-LDAPMemberDn=Dolibarr members DN
-LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com)
-LDAPMemberObjectClassList=List of objectClass
-LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPUserObjectClassList=List of objectClass
-LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPGroupObjectClassList=List of objectClass
-LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
-LDAPContactObjectClassList=List of objectClass
-LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPTestConnect=Test LDAP connection
-LDAPTestSynchroContact=Test contacts synchronization
-LDAPTestSynchroUser=Test user synchronization
-LDAPTestSynchroGroup=Test group synchronization
-LDAPTestSynchroMember=Test member synchronization
-LDAPTestSearch= Test a LDAP search
-LDAPSynchroOK=Synchronization test successful
-LDAPSynchroKO=Failed synchronization test
-LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that connexion to server is correctly configured and allows LDAP udpates
-LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s)
-LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s)
-LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPBindKO=Connect/Authentificate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPSetupForVersion3=LDAP server configured for version 3
-LDAPSetupForVersion2=LDAP server configured for version 2
-LDAPDolibarrMapping=Dolibarr Mapping
-LDAPLdapMapping=LDAP Mapping
-LDAPFieldLoginUnix=Login (unix)
-LDAPFieldLoginExample=Example : uid
-LDAPFilterConnection=Search filter
-LDAPFilterConnectionExample=Example : &(objectClass=inetOrgPerson)
-LDAPFieldLoginSamba=Login (samba, activedirectory)
-LDAPFieldLoginSambaExample=Example : samaccountname
-LDAPFieldFullname=Full name
-LDAPFieldFullnameExample=Example : cn
-LDAPFieldPasswordNotCrypted=Password not crypted
-LDAPFieldPasswordCrypted=Password crypted
-LDAPFieldPasswordExample=Example : userPassword
-LDAPFieldCommonNameExample=Example : cn
-LDAPFieldName=Name
-LDAPFieldNameExample=Example : sn
-LDAPFieldFirstName=First name
-LDAPFieldFirstNameExample=Example : givenName
-LDAPFieldMail=Email address
-LDAPFieldMailExample=Example : mail
-LDAPFieldPhone=Professional phone number
-LDAPFieldPhoneExample=Example : telephonenumber
-LDAPFieldHomePhone=Personal phone number
-LDAPFieldHomePhoneExample=Example : homephone
-LDAPFieldMobile=Cellular phone
-LDAPFieldMobileExample=Example : mobile
-LDAPFieldFax=Fax number
-LDAPFieldFaxExample=Example : facsimiletelephonenumber
-LDAPFieldAddress=Street
-LDAPFieldAddressExample=Example : street
-LDAPFieldZip=Zip
-LDAPFieldZipExample=Example : postalcode
-LDAPFieldTown=Town
-LDAPFieldTownExample=Example : l
-LDAPFieldCountry=Country
-LDAPFieldDescription=Description
-LDAPFieldDescriptionExample=Example : description
-LDAPFieldNotePublic=Public Note
-LDAPFieldNotePublicExample=Example : publicnote
-LDAPFieldGroupMembers= Group members
-LDAPFieldGroupMembersExample= Example : uniqueMember
-LDAPFieldBirthdate=Birthdate
-LDAPFieldCompany=Company
-LDAPFieldCompanyExample=Example : o
-LDAPFieldSid=SID
-LDAPFieldSidExample=Example : objectsid
-LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Job position
-LDAPFieldTitleExample=Example: title
-LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
-LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
-LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts.
-LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users.
-LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups.
-LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module.
-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 advices related to performance.
-NotInstalled=Not installed, so your server is not slow 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.
-MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
-MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
-OPCodeCache=OPCode cache
-NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad).
-HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
-FilesOfTypeCached=Files of type %s are cached by HTTP server
-FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
-FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
-FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
-CacheByServer=Cache by server
-CacheByClient=Cache by browser
-CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
-##### Products #####
-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)
-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 third party language
-UseSearchToSelectProductTooltip=Also if you have a large number of product (> 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)
-SetDefaultBarcodeTypeProducts=Default barcode type to use for products
-SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
-ProductCodeChecker= Module for product code generation and checking (product or service)
-ProductOtherConf= Product / Service configuration
-IsNotADir=is not a directory!
-##### Syslog #####
-SyslogSetup=Logs module setup
-SyslogOutput=Logs outputs
-SyslogFacility=Facility
-SyslogLevel=Level
-SyslogFilename=File name and path
-YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
-ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
-##### Donations #####
-DonationsSetup=Donation module setup
-DonationsReceiptModel=Template of donation receipt
-##### Barcode #####
-BarcodeSetup=Barcode setup
-PaperFormatModule=Print format module
-BarcodeEncodeModule=Barcode encoding type
-CodeBarGenerator=Barcode generator
-ChooseABarCode=No generator defined
-FormatNotSupportedByGenerator=Format not supported by this generator
-BarcodeDescEAN8=Barcode of type EAN8
-BarcodeDescEAN13=Barcode of type EAN13
-BarcodeDescUPC=Barcode of type UPC
-BarcodeDescISBN=Barcode of type ISBN
-BarcodeDescC39=Barcode of type C39
-BarcodeDescC128=Barcode of type C128
-BarcodeDescDATAMATRIX=Barcode of type Datamatrix
-BarcodeDescQRCODE=Barcode of type QR code
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
-BarcodeInternalEngine=Internal engine
-BarCodeNumberManager=Manager to auto define barcode numbers
-##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct debit payment orders
-##### ExternalRSS #####
-ExternalRSSSetup=External RSS imports setup
-NewRSS=New RSS Feed
-RSSUrl=RSS URL
-RSSUrlExample=An interesting RSS feed
-##### Mailing #####
-MailingSetup=EMailing module setup
-MailingEMailFrom=Sender EMail (From) for emails sent by emailing module
-MailingEMailError=Return EMail (Errors-to) for emails with errors
-MailingDelay=Seconds to wait after sending next message
-##### Notification #####
-NotificationSetup=EMail notification module setup
-NotificationEMailFrom=Sender EMail (From) for emails sent for notifications
-FixedEmailTarget=Fixed email target
-##### Sendings #####
-SendingsSetup=Sending module setup
-SendingsReceiptModel=Sending receipt model
-SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
-FreeLegalTextOnShippings=Free text on shipments
-##### Deliveries #####
-DeliveryOrderNumberingModules=Products deliveries receipt numbering module
-DeliveryOrderModel=Products deliveries receipt model
-DeliveriesOrderAbility=Support products deliveries receipts
-FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
-##### FCKeditor #####
-AdvancedEditor=Advanced editor
-ActivateFCKeditor=Activate advanced editor for:
-FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
-FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files.</font>
-FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
-FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
-##### OSCommerce 1 #####
-OSCommerceErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be an OSCommerce database (Key %s not found in table %s).
-OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' successfull.
-OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
-OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
-##### Stock #####
-StockSetup=Warehouse module setup
-IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
-##### Menu #####
-MenuDeleted=Menu deleted
-Menus=Menus
-TreeMenuPersonalized=Personalized menus
-NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
-NewMenu=New menu
-Menu=Selection of menu
-MenuHandler=Menu handler
-MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
-DetailId=Id menu
-DetailMenuHandler=Menu handler where to show new menu
-DetailMenuModule=Module name if menu entry come from a module
-DetailType=Type of menu (top or left)
-DetailTitre=Menu label or label code for translation
-DetailUrl=URL where menu send you (Absolute URL link or external link with http://)
-DetailEnabled=Condition to show or not entry
-DetailRight=Condition to display unauthorized grey menus
-DetailLangs=Lang file name for label code translation
-DetailUser=Intern / Extern / All
-Target=Target
-DetailTarget=Target for links (_blank top open a new window)
-DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu)
-ModifMenu=Menu change
-DeleteMenu=Delete menu entry
-ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
-FailedToInitializeMenu=Failed to initialize menu
-##### Tax #####
-TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=Opción de carga de ITBIS
-OptionVATDefault=Cash basis
-OptionVATDebitOption=Accrual basis
 OptionVatDefaultDesc=La carga del ITBIS es: <br>-en el envío de los bienes (en la práctica se usa la fecha de la factura)<br>-sobre el pago por los servicios
 OptionVatDebitOptionDesc=La carga del ITBIS es: <br>-en el envío de los bienes (en la práctica se usa la fecha de la factura)<br>-sobre la facturación de los servicios
 SummaryOfVatExigibilityUsedByDefault=Tiempo de exigibilidad de ITBIS por defecto según la opción eligida
-OnDelivery=On delivery
-OnPayment=On payment
-OnInvoice=On invoice
-SupposedToBePaymentDate=Payment date used
-SupposedToBeInvoiceDate=Invoice date used
-Buy=Buy
-Sell=Sell
-InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Su empresa está configurada como no sujeta al ITBIS (Inicio - Configuración - Empresa/Institución), por lo que no hay opción para la paremetrización del ITBIS.
-AccountancyCode=Accountancy Code
-AccountancyCodeSell=Sale 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 -> Dictionary -> 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_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
-AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### 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 your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your 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.
-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 same computer than 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.
-##### Point Of Sales (CashDesk) #####
-CashDesk=Point of sales
-CashDeskSetup=Point of sales module setup
-CashDeskThirdPartyForSell=Default generic third party to use for sells
-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).
-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
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
-##### Bookmark #####
-BookmarkSetup=Bookmark module setup
-BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu.
-NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu
-##### WebServices #####
-WebServicesSetup=Webservices module setup
-WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
-WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
-EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
-##### API ####
-ApiSetup=API module setup
-ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
-OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
-ApiKey=Key for API
-WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
-##### Bank #####
-BankSetupModule=Bank module setup
-FreeLegalTextOnChequeReceipts=Free text on cheque receipts
-BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
-BankOrderGlobal=General
-BankOrderGlobalDesc=General display order
-BankOrderES=Spanish
-BankOrderESDesc=Spanish display order
-ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
-##### Multicompany #####
-MultiCompanySetup=Multi-company module setup
-##### Suppliers #####
-SuppliersSetup=Supplier module setup
-SuppliersCommandModel=Complete template of supplier order (logo...)
-SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
-SuppliersInvoiceNumberingModel=Supplier invoices numbering models
-IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
-##### GeoIPMaxmind #####
-GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
-NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
-YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
-YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
-TestGeoIPResult=Test of a conversion IP -> country
-##### Projects #####
-ProjectsNumberingModules=Projects numbering module
-ProjectsSetup=Project module setup
-ProjectsModelModule=Project reports document model
-TasksNumberingModules=Tasks numbering module
-TaskModelModule=Tasks reports document model
-UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
-##### ECM (GED) #####
-##### Fiscal Year #####
-AccountingPeriods=Accounting periods
-AccountingPeriodCard=Accounting period
-NewFiscalYear=New accounting period
-OpenFiscalYear=Open accounting period
-CloseFiscalYear=Close accounting period
-DeleteFiscalYear=Delete accounting period
-ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
-ShowFiscalYear=Show accounting period
-AlwaysEditable=Can always be edited
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
-Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
-IncludePath=Include path (defined into variable %s)
-ExpenseReportsSetup=Setup of module Expense Reports
-TemplatePDFExpenseReports=Document templates to generate expense report document
-NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
-YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of 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
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/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.
-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.
-ConfFileMuseContainCustom=Installing 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)
-TextTitleColor=Color of page title
-LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
-NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
-BackgroundColor=Background color
-TopMenuBackgroundColor=Background color for Top menu
-TopMenuDisableImages=Hide images in Top menu
-LeftMenuBackgroundColor=Background color for Left menu
-BackgroundTableTitleColor=Background color for Table title line
-BackgroundTableLineOddColor=Background color for odd table lines
-BackgroundTableLineEvenColor=Background color for even table lines
-MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
-NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
-UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
-PositionIntoComboList=Position of line into combo lists
-SellTaxRate=Sale tax rate
-RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
-UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipping, you can enter it here. You can use the key {TRACKID} into URL parameters so the system will replace it with value of tracking number user entered into shipment card.
-OpportunityPercent=When you create an opportunity, you will defined an estimated amount of project/lead. According to status of opportunity, this amount may be multiplicated 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
-FixTZ=TimeZone fix
-FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
-ExpectedChecksum=Expected Checksum
-CurrentChecksum=Current Checksum
-ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the latest stable version
-TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
-TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so 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 usefull only if your prices for each leve 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.
-SeeSubstitutionVars=See * note for list of possible substitution variables
-AllPublishers=All publishers
-UnknownPublishers=Unknown publishers
-AddRemoveTabs=Add or remove tabs
-AddDictionaries=Add dictionaries
-AddBoxes=Add widgets
-AddSheduledJobs=Add scheduled jobs
-AddHooks=Add hooks
-AddTriggers=Add triggers
-AddMenus=Add menus
-AddPermissions=Add permissions
-AddExportProfiles=Add export profiles
-AddImportProfiles=Add import profiles
-AddOtherPagesOrServices=Add other pages or services
-AddModels=Add document or numbering templates
-AddSubstitutions=Add keys substitutions
-DetectionNotPossible=Detection not possible
-UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved on 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 correclty. 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 inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <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
-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
-TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
-##### Resource ####
-ResourceSetup=Configuration du module Resource
-UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
diff --git a/htdocs/langs/es_DO/main.lang b/htdocs/langs/es_DO/main.lang
index 9ffa398137f..2e691473326 100644
--- a/htdocs/langs/es_DO/main.lang
+++ b/htdocs/langs/es_DO/main.lang
@@ -1,9 +1,5 @@
 # Dolibarr language file - Source file is en_US - main
 DIRECTION=ltr
-# Note for Chinese:
-# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
-# stsongstdlight or cid0cs are for simplified Chinese
-# To read Chinese pdf with Linux: sudo apt-get install poppler-data
 FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=.
@@ -23,799 +19,3 @@ FormatDateHourShort=%m/%d/%Y %I:%M %p
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
-DatabaseConnection=Database connection
-NoTemplateDefined=No template defined for this email type
-AvailableVariables=Available substitution variables
-NoTranslation=No translation
-NoRecordFound=No record found
-NoRecordDeleted=No record deleted
-NotEnoughDataYet=Not enough data
-NoError=No error
-Error=Error
-Errors=Errors
-ErrorFieldRequired=Field '%s' is required
-ErrorFieldFormat=Field '%s' has a bad value
-ErrorFileDoesNotExists=File %s does not exist
-ErrorFailedToOpenFile=Failed to open file %s
-ErrorCanNotCreateDir=Cannot create dir %s
-ErrorCanNotReadDir=Cannot read dir %s
-ErrorConstantNotDefined=Parameter %s not defined
-ErrorUnknown=Unknown error
-ErrorSQL=SQL Error
-ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this
-ErrorGoToModuleSetup=Go to Module setup to fix this
-ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
-ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
-ErrorInternalErrorDetected=Error detected
-ErrorWrongHostParameter=Wrong host parameter
-ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post again the form.
-ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child records.
-ErrorWrongValue=Wrong value
-ErrorWrongValueForParameterX=Wrong value for parameter %s
-ErrorNoRequestInError=No request in error
-ErrorServiceUnavailableTryLater=Service not available for 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>.
-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 nb of record per page
-NotAuthorized=You are not authorized to do that.
-SetDate=Set date
-SelectDate=Select a date
-SeeAlso=See also %s
-SeeHere=See here
-Apply=Apply
-BackgroundColorByDefault=Default background color
-FileRenamed=The file was successfully renamed
-FileUploaded=The file was successfully uploaded
-FileGenerated=The file was successfully generated
-FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
-NbOfEntries=Nb of entries
-GoToWikiHelpPage=Read online help (Internet access needed)
-GoToHelpPage=Read help
-RecordSaved=Record saved
-RecordDeleted=Record deleted
-LevelOfFeature=Level of features
-NotDefined=Not defined
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
-Administrator=Administrator
-Undefined=Undefined
-PasswordForgotten=Password forgotten?
-SeeAbove=See above
-HomeArea=Home area
-LastConnexion=Latest connection
-PreviousConnexion=Previous connection
-PreviousValue=Previous value
-ConnectedOnMultiCompany=Connected on environment
-ConnectedSince=Connected since
-AuthenticationMode=Authentication mode
-RequestedUrl=Requested URL
-DatabaseTypeManager=Database type manager
-RequestLastAccessInError=Latest database access request error
-ReturnCodeLastAccessInError=Return code for latest database access request error
-InformationLastAccessInError=Information for latest database access request error
-DolibarrHasDetectedError=Dolibarr has detected a technical error
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes
-MoreInformation=More information
-TechnicalInformation=Technical information
-TechnicalID=Technical ID
-NotePublic=Note (public)
-NotePrivate=Note (private)
-PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
-DoTest=Test
-ToFilter=Filter
-NoFilter=No filter
-WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance delay.
-yes=yes
-Yes=Yes
-no=no
-No=No
-All=All
-Home=Home
-Help=Help
-OnlineHelp=Online help
-PageWiki=Wiki page
-MediaBrowser=Media browser
-Always=Always
-Never=Never
-Under=under
-Period=Period
-PeriodEndDate=End date for period
-Activate=Activate
-Activated=Activated
-Closed=Closed
-Closed2=Closed
-NotClosed=Not closed
-Enabled=Enabled
-Deprecated=Deprecated
-Disable=Disable
-Disabled=Disabled
-Add=Add
-AddLink=Add link
-RemoveLink=Remove link
-AddToDraft=Add to draft
-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>?
-Delete=Delete
-Remove=Remove
-Resiliate=Terminate
-Cancel=Cancel
-Modify=Modify
-Edit=Edit
-Validate=Validate
-ValidateAndApprove=Validate and Approve
-ToValidate=To validate
-Save=Save
-SaveAs=Save As
-TestConnection=Test connection
-ToClone=Clone
-ConfirmClone=Choose data you want to clone :
-NoCloneOptionsSpecified=No data to clone defined.
-Of=of
-Go=Go
-Run=Run
-CopyOf=Copy of
-Show=Show
-Hide=Hide
-ShowCardHere=Show card
-Search=Search
-SearchOf=Search
-Valid=Valid
-Approve=Approve
-Disapprove=Disapprove
-ReOpen=Re-Open
-Upload=Send file
-ToLink=Link
-Select=Select
-Choose=Choose
-Resize=Resize
-Recenter=Recenter
-Author=Author
-User=User
-Users=Users
-Group=Group
-Groups=Groups
-NoUserGroupDefined=No user group defined
-Password=Password
-PasswordRetype=Retype your password
-NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
-Name=Name
-Person=Person
-Parameter=Parameter
-Parameters=Parameters
-Value=Value
-PersonalValue=Personal value
-NewValue=New value
-CurrentValue=Current value
-Code=Code
-Type=Type
-Language=Language
-MultiLanguage=Multi-language
-Note=Note
-Title=Title
-Label=Label
-RefOrLabel=Ref. or label
-Info=Log
-Family=Family
-Description=Description
-Designation=Description
-Model=Doc template
-DefaultModel=Default doc template
-Action=Event
-About=About
-Number=Number
-NumberByMonth=Number by month
-AmountByMonth=Amount by month
-Numero=Number
-Limit=Limit
-Limits=Limits
-Logout=Logout
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Connection
-Setup=Setup
-Alert=Alert
-Previous=Previous
-Next=Next
-Cards=Cards
-Card=Card
-Now=Now
-HourStart=Start hour
-Date=Date
-DateAndHour=Date and hour
-DateToday=Today's date
-DateReference=Reference date
-DateStart=Start date
-DateEnd=End date
-DateCreation=Creation date
-DateCreationShort=Creat. date
-DateModification=Modification date
-DateModificationShort=Modif. date
-DateLastModification=Latest modification date
-DateValidation=Validation date
-DateClosing=Closing date
-DateDue=Due date
-DateValue=Value date
-DateValueShort=Value date
-DateOperation=Operation date
-DateOperationShort=Oper. Date
-DateLimit=Limit date
-DateRequest=Request date
-DateProcess=Process date
-DateBuild=Report build date
-DatePayment=Date of payment
-DateApprove=Approving date
-DateApprove2=Approving date (second approval)
-UserCreation=Creation user
-UserModification=Modification user
-UserCreationShort=Creat. user
-UserModificationShort=Modif. user
-DurationYear=year
-DurationMonth=month
-DurationWeek=week
-DurationDay=day
-DurationYears=years
-DurationMonths=months
-DurationWeeks=weeks
-DurationDays=days
-Year=Year
-Month=Month
-Week=Week
-WeekShort=Week
-Day=Day
-Hour=Hour
-Minute=Minute
-Second=Second
-Years=Years
-Months=Months
-Days=Days
-days=days
-Hours=Hours
-Minutes=Minutes
-Seconds=Seconds
-Weeks=Weeks
-Today=Today
-Yesterday=Yesterday
-Tomorrow=Tomorrow
-Morning=Morning
-Afternoon=Afternoon
-Quadri=Quadri
-MonthOfDay=Month of the day
-HourShort=H
-MinuteShort=mn
-Rate=Rate
-CurrencyRate=Currency conversion rate
-UseLocalTax=Include tax
-Bytes=Bytes
-KiloBytes=Kilobytes
-MegaBytes=Megabytes
-GigaBytes=Gigabytes
-TeraBytes=Terabytes
-b=b.
-Kb=Kb
-Mb=Mb
-Gb=Gb
-Tb=Tb
-Cut=Cut
-Copy=Copy
-Paste=Paste
-Default=Default
-DefaultValue=Default value
-Price=Price
-UnitPrice=Unit price
-UnitPriceHT=Unit price (net)
-UnitPriceTTC=Unit price
-PriceU=U.P.
-PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (currency)
-PriceUTTC=U.P. (inc. tax)
-Amount=Amount
-AmountInvoice=Invoice amount
-AmountPayment=Payment amount
-AmountHTShort=Amount (net)
-AmountTTCShort=Amount (inc. tax)
-AmountHT=Amount (net of tax)
-AmountTTC=Amount (inc. tax)
-AmountVAT=Amount tax
-MulticurrencyAlreadyPaid=Already payed, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
-MulticurrencyAmountHT=Amount (net of tax), original currency
-MulticurrencyAmountTTC=Amount (inc. of tax), original currency
-MulticurrencyAmountVAT=Amount tax, original currency
-AmountLT1=Amount tax 2
-AmountLT2=Amount tax 3
-AmountLT1ES=Amount RE
-AmountLT2ES=Amount IRPF
-AmountTotal=Total amount
-AmountAverage=Average amount
-PriceQtyMinHT=Price quantity min. (net of tax)
-Percentage=Percentage
-Total=Total
-SubTotal=Subtotal
-TotalHTShort=Total (net)
-TotalHTShortCurrency=Total (net in currency)
-TotalTTCShort=Total (inc. tax)
-TotalHT=Total (net of tax)
-TotalHTforthispage=Total (net of tax) for this page
-Totalforthispage=Total for this page
-TotalTTC=Total (inc. tax)
-TotalTTCToYourCredit=Total (inc. tax) to your credit
-TotalVAT=Total tax
-TotalLT1=Total tax 2
-TotalLT2=Total tax 3
-TotalLT1ES=Total RE
-TotalLT2ES=Total IRPF
-HT=Net of tax
-TTC=Inc. tax
-VAT=Sales tax
-VATs=Sales taxes
-LT1ES=RE
-LT2ES=IRPF
-VATRate=Tax Rate
-Average=Average
-Sum=Sum
-Delta=Delta
-Module=Module
-Option=Option
-List=List
-FullList=Full list
-Statistics=Statistics
-OtherStatistics=Other statistics
-Status=Status
-Favorite=Favorite
-ShortInfo=Info.
-Ref=Ref.
-ExternalRef=Ref. extern
-RefSupplier=Ref. supplier
-RefPayment=Ref. payment
-CommercialProposalsShort=Commercial proposals
-Comment=Comment
-Comments=Comments
-ActionsToDo=Events to do
-ActionsToDoShort=To do
-ActionsDoneShort=Done
-ActionNotApplicable=Not applicable
-ActionRunningNotStarted=To start
-ActionRunningShort=In progress
-ActionDoneShort=Finished
-ActionUncomplete=Uncomplete
-CompanyFoundation=Company/Foundation
-ContactsForCompany=Contacts 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
-NActionsLate=%s late
-RequestAlreadyDone=Request already recorded
-Filter=Filter
-FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
-RemoveFilter=Remove filter
-ChartGenerated=Chart generated
-ChartNotGenerated=Chart not generated
-GeneratedOn=Build on %s
-Generate=Generate
-Duration=Duration
-TotalDuration=Total duration
-Summary=Summary
-DolibarrStateBoard=Statistics
-DolibarrWorkBoard=Work tasks board
-Available=Available
-NotYetAvailable=Not yet available
-NotAvailable=Not available
-Categories=Tags/categories
-Category=Tag/category
-By=By
-From=From
-to=to
-and=and
-or=or
-Other=Other
-Others=Others
-OtherInformations=Other informations
-Quantity=Quantity
-Qty=Qty
-ChangedBy=Changed by
-ApprovedBy=Approved by
-ApprovedBy2=Approved by (second approval)
-Approved=Approved
-Refused=Refused
-ReCalculate=Recalculate
-ResultKo=Failure
-Reporting=Reporting
-Reportings=Reporting
-Draft=Draft
-Drafts=Drafts
-Validated=Validated
-Opened=Opened
-New=New
-Discount=Discount
-Unknown=Unknown
-General=General
-Size=Size
-Received=Received
-Paid=Paid
-Topic=Subject
-ByCompanies=By third parties
-ByUsers=By users
-Links=Links
-Link=Link
-Rejects=Rejects
-Preview=Preview
-NextStep=Next step
-Datas=Data
-None=None
-NoneF=None
-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.
-Photo=Picture
-Photos=Pictures
-AddPhoto=Add picture
-DeletePicture=Picture delete
-ConfirmDeletePicture=Confirm picture deletion?
-Login=Login
-CurrentLogin=Current login
-EnterLoginDetail=Enter login details
-January=January
-February=February
-March=March
-April=April
-May=May
-June=June
-July=July
-August=August
-September=September
-October=October
-November=November
-December=December
-JanuaryMin=Jan
-FebruaryMin=Feb
-MarchMin=Mar
-AprilMin=Apr
-MayMin=May
-JuneMin=Jun
-JulyMin=Jul
-AugustMin=Aug
-SeptemberMin=Sep
-OctoberMin=Oct
-NovemberMin=Nov
-DecemberMin=Dec
-Month01=January
-Month02=February
-Month03=March
-Month04=April
-Month05=May
-Month06=June
-Month07=July
-Month08=August
-Month09=September
-Month10=October
-Month11=November
-Month12=December
-MonthShort01=Jan
-MonthShort02=Feb
-MonthShort03=Mar
-MonthShort04=Apr
-MonthShort05=May
-MonthShort06=Jun
-MonthShort07=Jul
-MonthShort08=Aug
-MonthShort09=Sep
-MonthShort10=Oct
-MonthShort11=Nov
-MonthShort12=Dec
-AttachedFiles=Attached files and documents
-FileTransferComplete=File was uploaded successfuly
-DateFormatYYYYMM=YYYY-MM
-DateFormatYYYYMMDD=YYYY-MM-DD
-DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
-ReportName=Report name
-ReportPeriod=Report period
-ReportDescription=Description
-Report=Report
-Keyword=Keyword
-Origin=Origin
-Legend=Legend
-Fill=Fill
-Reset=Reset
-File=File
-Files=Files
-NotAllowed=Not allowed
-ReadPermissionNotAllowed=Read permission not allowed
-AmountInCurrency=Amount in %s currency
-Example=Example
-Examples=Examples
-NoExample=No example
-FindBug=Report a bug
-NbOfThirdParties=Number of third parties
-NbOfLines=Number of lines
-NbOfObjects=Number of objects
-NbOfObjectReferers=Number of related items
-Referers=Related items
-TotalQuantity=Total quantity
-DateFromTo=From %s to %s
-DateFrom=From %s
-DateUntil=Until %s
-Check=Check
-Uncheck=Uncheck
-Internal=Internal
-External=External
-Internals=Internal
-Externals=External
-Warning=Warning
-Warnings=Warnings
-BuildDoc=Build Doc
-Entity=Environment
-Entities=Entities
-CustomerPreview=Customer preview
-SupplierPreview=Supplier preview
-ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show supplier preview
-RefCustomer=Ref. customer
-Currency=Currency
-InfoAdmin=Information for administrators
-Undo=Undo
-Redo=Redo
-ExpandAll=Expand all
-UndoExpandAll=Undo expand
-Reason=Reason
-FeatureNotYetSupported=Feature not yet supported
-CloseWindow=Close window
-Response=Response
-Priority=Priority
-SendByMail=Send by EMail
-MailSentBy=Email sent by
-TextUsedInTheMessageBody=Email body
-SendAcknowledgementByMail=Send confirmation email
-EMail=E-mail
-NoEMail=No email
-Email=Email
-NoMobilePhone=No mobile phone
-Owner=Owner
-FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
-Refresh=Refresh
-BackToList=Back to list
-GoBack=Go back
-CanBeModifiedIfOk=Can be modified if valid
-CanBeModifiedIfKo=Can be modified if not valid
-ValueIsValid=Value is valid
-ValueIsNotValid=Value is not valid
-RecordCreatedSuccessfully=Record created successfully
-RecordModifiedSuccessfully=Record modified successfully
-RecordsModified=%s record modified
-RecordsDeleted=%s record deleted
-AutomaticCode=Automatic code
-FeatureDisabled=Feature disabled
-MoveBox=Move widget
-Offered=Offered
-NotEnoughPermissions=You don't have permission for this action
-SessionName=Session name
-Method=Method
-Receive=Receive
-CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
-ExpectedValue=Expected Value
-CurrentValue=Current value
-PartialWoman=Partial
-TotalWoman=Total
-NeverReceived=Never received
-Canceled=Canceled
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
-Color=Color
-Documents=Linked files
-Documents2=Documents
-UploadDisabled=Upload disabled
-MenuECM=Documents
-MenuAWStats=AWStats
-MenuMembers=Members
-MenuAgendaGoogle=Google agenda
-ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=No documents saved in this directory
-CurrentUserLanguage=Current language
-CurrentTheme=Current theme
-CurrentMenuManager=Current menu manager
-Browser=Browser
-Layout=Layout
-Screen=Screen
-DisabledModules=Disabled modules
-For=For
-ForCustomer=For customer
-Signature=Signature
-DateOfSignature=Date of signature
-HidePassword=Show command with password hidden
-UnHidePassword=Show real command with clear password
-Root=Root
-Informations=Informations
-Page=Page
-Notes=Notes
-AddNewLine=Add new line
-AddFile=Add file
-FreeZone=Free entry
-FreeLineOfType=Free entry of type
-CloneMainAttributes=Clone object with its main attributes
-PDFMerge=PDF Merge
-Merge=Merge
-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 application at the moment.
-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
-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.
-AccordingToGeoIPDatabase=(according to GeoIP convertion)
-Line=Line
-NotSupported=Not supported
-RequiredField=Required field
-Result=Result
-ToTest=Test
-ValidateBefore=Card must be validated before using this feature
-Visibility=Visibility
-Private=Private
-Hidden=Hidden
-Resources=Resources
-Source=Source
-Prefix=Prefix
-Before=Before
-After=After
-IPAddress=IP address
-Frequency=Frequency
-IM=Instant messaging
-NewAttribute=New attribute
-AttributeCode=Attribute code
-URLPhoto=URL of photo/logo
-SetLinkToAnotherThirdParty=Link to another third party
-LinkTo=Link to
-LinkToProposal=Link to proposal
-LinkToOrder=Link to order
-LinkToInvoice=Link to invoice
-LinkToSupplierOrder=Link to supplier order
-LinkToSupplierProposal=Link to supplier proposal
-LinkToSupplierInvoice=Link to supplier invoice
-LinkToContract=Link to contract
-LinkToIntervention=Link to intervention
-CreateDraft=Create draft
-SetToDraft=Back to draft
-ClickToEdit=Click to edit
-ObjectDeleted=Object %s deleted
-ByCountry=By country
-ByTown=By town
-ByDate=By date
-ByMonthYear=By month/year
-ByYear=By year
-ByMonth=By month
-ByDay=By day
-BySalesRepresentative=By sales representative
-LinkedToSpecificUsers=Linked to a particular user contact
-NoResults=No results
-AdminTools=Admin tools
-SystemTools=System tools
-ModulesSystemTools=Modules tools
-Test=Test
-Element=Element
-NoPhotoYet=No pictures available yet
-Dashboard=Dashboard
-MyDashboard=My dashboard
-Deductible=Deductible
-from=from
-toward=toward
-Access=Access
-SelectAction=Select action
-HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
-SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
-OriginFileName=Original filename
-SetDemandReason=Set source
-SetBankAccount=Define Bank Account
-AccountCurrency=Account Currency
-ViewPrivateNote=View notes
-XMoreLines=%s line(s) hidden
-PublicUrl=Public URL
-AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
-PrintFile=Print File %s
-ShowTransaction=Show entry on bank account
-GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
-Deny=Deny
-Denied=Denied
-ListOfTemplates=List of templates
-Gender=Gender
-Genderman=Man
-Genderwoman=Woman
-ViewList=List view
-Mandatory=Mandatory
-Hello=Hello
-Sincerely=Sincerely
-DeleteLine=Delete line
-ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
-NoRecordSelected=No record selected
-MassFilesArea=Area for files built by mass actions
-ShowTempMassFilesArea=Show area of files built by mass actions
-RelatedObjects=Related Objects
-ClassifyBilled=Classify billed
-Progress=Progress
-ClickHere=Click here
-FrontOffice=Front office
-BackOffice=Back office
-View=View
-Export=Export
-Exports=Exports
-ExportFilteredList=Export filtered list
-ExportList=Export list
-Miscellaneous=Miscellaneous
-Calendar=Calendar
-GroupBy=Group by...
-ViewFlatList=View flat list
-RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Direct download link
-Download=Download
-ActualizeCurrency=Update currency rate
-Fiscalyear=Fiscal year
-# Week day
-Monday=Monday
-Tuesday=Tuesday
-Wednesday=Wednesday
-Thursday=Thursday
-Friday=Friday
-Saturday=Saturday
-Sunday=Sunday
-MondayMin=Mo
-TuesdayMin=Tu
-WednesdayMin=We
-ThursdayMin=Th
-FridayMin=Fr
-SaturdayMin=Sa
-SundayMin=Su
-Day1=Monday
-Day2=Tuesday
-Day3=Wednesday
-Day4=Thursday
-Day5=Friday
-Day6=Saturday
-Day0=Sunday
-ShortMonday=M
-ShortTuesday=T
-ShortWednesday=W
-ShortThursday=T
-ShortFriday=F
-ShortSaturday=S
-ShortSunday=S
-SelectMailModel=Select email template
-SetRef=Set ref
-Select2ResultFoundUseArrows=Some results found. Use arrows to select.
-Select2NotFound=No result found
-Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
-Select2LoadingMoreResults=Loading more results...
-Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
-SearchIntoContacts=Contacts
-SearchIntoMembers=Members
-SearchIntoUsers=Users
-SearchIntoProductsOrServices=Products or services
-SearchIntoProjects=Projects
-SearchIntoTasks=Tasks
-SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
-SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
-SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
-SearchIntoInterventions=Interventions
-SearchIntoContracts=Contracts
-SearchIntoCustomerShipments=Customer shipments
-SearchIntoExpenseReports=Expense reports
-SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/es_EC/accountancy.lang b/htdocs/langs/es_EC/accountancy.lang
deleted file mode 100644
index 527f1fd139d..00000000000
--- a/htdocs/langs/es_EC/accountancy.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-AccountingCategory=Accounting category
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
diff --git a/htdocs/langs/es_EC/admin.lang b/htdocs/langs/es_EC/admin.lang
index 9602601e241..1c53b65c99c 100644
--- a/htdocs/langs/es_EC/admin.lang
+++ b/htdocs/langs/es_EC/admin.lang
@@ -1,1665 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
-Foundation=Foundation
-Version=Version
-VersionProgram=Version program
-VersionLastInstall=Initial install version
-VersionLastUpgrade=Latest version upgrade
-VersionExperimental=Experimental
-VersionDevelopment=Development
-VersionUnknown=Unknown
-VersionRecommanded=Recommended
-FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. Value of some setup constants may also be checked. You can use this tool to detect if some files were modified by a hacker for example.
-FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
-GlobalChecksum=Global checksum
-MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
-LocalSignature=Embedded local signature (less reliable)
-RemoteSignature=Remote distant signature (more reliable)
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FilesModified=Modified Files
-FilesAdded=Added Files
-FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
-XmlNotFound=Xml Integrity File of application not found
-SessionId=Session ID
-SessionSaveHandler=Handler to save sessions
-SessionSavePath=Storage session localization
-PurgeSessions=Purge of sessions
-ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
-NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow to list all running sessions.
-LockNewSessions=Lock new connections
-ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself. Only user <b>%s</b> will be able to connect after that.
-UnlockNewSessions=Remove connection lock
-YourSession=Your session
-Sessions=Users session
-WebUserGroup=Web server user/group
-NoSessionFound=Your PHP seems to not allow to list active sessions. Directory used to save sessions (<b>%s</b>) might be protected (For example, by OS permissions or by PHP directive open_basedir).
-DBStoringCharset=Database charset to store data
-DBSortingCharset=Database charset to sort data
-WarningModuleNotActive=Module <b>%s</b> must be enabled
-WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page.
-DolibarrSetup=Dolibarr install or upgrade
-InternalUser=Internal user
-ExternalUser=External user
-InternalUsers=Internal users
-ExternalUsers=External users
-GUISetup=Display
-SetupArea=Setup area
-FormToTestFileUploadForm=Form to test file upload (according to setup)
-IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
-RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
-RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any usage of update tool.
-SecuritySetup=Security setup
-SecurityFilesDesc=Define here options related to security about uploading files.
-ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
-ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
-ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is not supported.
-DictionarySetup=Dictionary setup
-Dictionary=Dictionaries
-ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
-ErrorCodeCantContainZero=Code can't contain value 0
-DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
-UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties, but it is less convenient)
-DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact, but it is less convenient)
-NumberOfKeyToSearch=Nbr of characters to trigger search: %s
-NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
-AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
-JavascriptDisabled=JavaScript disabled
-UsePreviewTabs=Use preview tabs
-ShowPreview=Show preview
-PreviewNotAvailable=Preview not available
-ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
-MySQLTimeZone=TimeZone MySql (database)
-TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
-Space=Space
-Table=Table
-Fields=Fields
-Index=Index
-Mask=Mask
-NextValue=Next value
-NextValueForInvoices=Next value (invoices)
-NextValueForCreditNotes=Next value (credit notes)
-NextValueForDeposit=Next value (deposit)
-NextValueForReplacements=Next value (replacements)
-MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to <b>%s</b> %s, whatever this parameter's value is
-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
-AntiVirusParam= More parameters on command line
-AntiVirusParamExample= Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
-ComptaSetup=Accounting module setup
-UserSetup=User management setup
-MultiCurrencySetup=Multi-currency setup
-MenuLimits=Limits and accuracy
-MenuIdParent=Parent menu ID
-DetailMenuIdParent=ID of parent menu (empty for a top menu)
-DetailPosition=Sort number to define menu position
-AllMenus=All
-NotConfigured=Module not configured
-Active=Active
-SetupShort=Setup
-OtherOptions=Other options
-OtherSetup=Other setup
-CurrentValueSeparatorDecimal=Decimal separator
-CurrentValueSeparatorThousand=Thousand separator
-Destination=Destination
-IdModule=Module ID
-IdPermissions=Permissions ID
-Modules=Modules
-LanguageBrowserParameter=Parameter %s
-LocalisationDolibarrParameters=Localisation parameters
-ClientTZ=Client Time Zone (user)
-ClientHour=Client time (user)
-OSTZ=Server OS Time Zone
-PHPTZ=PHP server Time Zone
-DaylingSavingTime=Daylight saving time
-CurrentHour=PHP Time (server)
-CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
-Box=Widget
-Boxes=Widgets
-MaxNbOfLinesForBoxes=Max number of lines for widgets
-PositionByDefault=Default order
-Position=Position
-MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
-MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br />Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
-MenuForUsers=Menu for users
-LangFile=.lang file
-System=System
-SystemInfo=System information
-SystemToolsArea=System tools area
-SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for.
-Purge=Purge
-PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
-PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
-PurgeDeleteTemporaryFilesShort=Delete temporary files
-PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory <b>%s</b>. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted.
-PurgeRunNow=Purge now
-PurgeNothingToDelete=No directory or files to delete.
-PurgeNDirectoriesDeleted=<b>%s</b> files or directories deleted.
-PurgeAuditEvents=Purge all security events
-ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
-GenerateBackup=Generate backup
-Backup=Backup
-Restore=Restore
-RunCommandSummary=Backup has been launched with the following command
-BackupResult=Backup result
-BackupFileSuccessfullyCreated=Backup file successfully generated
-YouCanDownloadBackupFile=Generated files can now be downloaded
-NoBackupFileAvailable=No backup files available.
-ExportMethod=Export method
-ImportMethod=Import method
-ToBuildBackupFileClickHere=To build a backup file, click <a href="%s">here</a>.
-ImportMySqlDesc=To import a backup file, you must use mysql command from command line:
-ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line:
-ImportMySqlCommand=%s %s < mybackupfile.sql
-ImportPostgreSqlCommand=%s %s mybackupfile.sql
-FileNameToGenerate=File name to generate
-Compression=Compression
-CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
-CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
-ExportCompatibility=Compatibility of generated export file
-MySqlExportParameters=MySQL export parameters
-PostgreSqlExportParameters= PostgreSQL export parameters
-UseTransactionnalMode=Use transactional mode
-FullPathToMysqldumpCommand=Full path to mysqldump command
-FullPathToPostgreSQLdumpCommand=Full path to pg_dump command
-ExportOptions=Export Options
-AddDropDatabase=Add DROP DATABASE command
-AddDropTable=Add DROP TABLE command
-ExportStructure=Structure
-NameColumn=Name columns
-ExtendedInsert=Extended INSERT
-NoLockBeforeInsert=No lock commands around INSERT
-DelayedInsert=Delayed insert
-EncodeBinariesInHexa=Encode binary data in hexadecimal
-IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
-AutoDetectLang=Autodetect (browser language)
-FeatureDisabledInDemo=Feature disabled in demo
-FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Permissions
-BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
-OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
-ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external modules...
-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 (Note: anyone experienced in PHP programming can provide custom development for an open source project)
-WebSiteDesc=Reference websites to find more modules...
-URL=Link
-BoxesAvailable=Widgets available
-BoxesActivated=Widgets activated
-ActivateOn=Activate on
-ActiveOn=Activated on
-SourceFile=Source file
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
-Required=Required
-UsedOnlyWithTypeOption=Used by some agenda option only
-Security=Security
-Passwords=Passwords
-DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
-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 (Activated 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 make building of a global cumulated pdf not working (like unpaid invoices).
-Feature=Feature
-DolibarrLicense=License
-Developpers=Developers/contributors
-OfficialWebSite=Dolibarr international official web site
-OfficialWebSiteLocal=Local web site (%s)
-OfficialWiki=Dolibarr documentation on Wiki
-OfficialDemo=Dolibarr online demo
-OfficialMarketPlace=Official market place for external modules/addons
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
-ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
-HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
-HelpCenterDesc2=Some part of this service are available in <b>english only</b>.
-CurrentMenuHandler=Current menu handler
-MeasuringUnit=Measuring unit
-LeftMargin=Left margin
-TopMargin=Top margin
-PaperSize=Paper type
-Orientation=Orientation
-SpaceX=Space X
-SpaceY=Space Y
-FontSize=Font size
-Content=Content
-NoticePeriod=Notice period
-NewByMonth=New by month
-Emails=E-mails
-EMailsSetup=E-mails setup
-EMailsDesc=This page allows you to overwrite your PHP parameters for e-mails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless.
-MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
-MAIN_MAIL_EMAIL_FROM=Sender e-mail for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Sender e-mail used for error returns emails sent
-MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
-MAIN_DISABLE_ALL_MAILS=Disable all e-mails sendings (for test purposes or demos)
-MAIN_MAIL_SENDMODE=Method to use to send EMails
-MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
-MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
-MAIN_MAIL_EMAIL_TLS= Use TLS (SSL) encrypt
-MAIN_MAIL_EMAIL_STARTTLS= Use TLS (STARTTLS) encrypt
-MAIN_DISABLE_ALL_SMS=Disable all SMS sendings (for test purposes or demos)
-MAIN_SMS_SENDMODE=Method to use to send SMS
-MAIN_MAIL_SMS_FROM=Default sender phone number for Sms sending
-MAIN_MAIL_DEFAULT_FROMTYPE=Sender e-mail by default for manual sendings (User email or Company email)
-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/
-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 setup
-ModuleFamilyBase=System
-ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
-ModuleFamilyProducts=Products Management (PM)
-ModuleFamilyHr=Human Resource Management (HR)
-ModuleFamilyProjects=Projects/Collaborative work
-ModuleFamilyOther=Other
-ModuleFamilyTechnic=Multi-modules tools
-ModuleFamilyExperimental=Experimental modules
-ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
-ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
-ModuleFamilyInterface=Interfaces with external systems
-MenuHandlers=Menu handlers
-MenuAdmin=Menu editor
-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).
-DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <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>.
-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='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
-YouCanSubmitFile=For this step, you can send package using this tool: Select module file
-CurrentVersion=Dolibarr current version
-CallUpdatePage=Go to the page that updates the database structure and data: %s.
-LastStableVersion=Latest stable version
-LastActivationDate=Latest activation date
-UpdateServerOffline=Update server offline
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
-GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
-GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
-ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
-ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
-DoTestServerAvailability=Test server connectivity
-DoTestSend=Test sending
-DoTestSendHTML=Test sending HTML
-ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
-ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
-UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
-UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
-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...).
-MinLength=Minimum length
-LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
-ExamplesWithCurrentSetup=Examples with current running setup
-ListOfDirectories=List of OpenDocument templates directories
-ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
-NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories
+AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
+AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 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.
-ThemeDir=Skins directory
-ConnectionTimeout=Connexion timeout
-ResponseTimeout=Response timeout
-SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__
-ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
-SecurityToken=Key to secure URLs
-NoSmsEngine=No SMS sender manager available. SMS sender manager are not installed with default distribution (because they depends on an external supplier) but you can find some on %s
-PDF=PDF
-PDFDesc=You can set each global options related to the PDF generation
-PDFAddressForging=Rules to forge address boxes
-HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF
-HideDescOnPDF=Hide products description on generated PDF
-HideRefOnPDF=Hide products ref. on generated PDF
-HideDetailsOnPDF=Hide product lines details on generated PDF
-PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
-Library=Library
-UrlGenerationParameters=Parameters to secure URLs
-SecurityTokenIsUnique=Use a unique securekey parameter for each URL
-EnterRefToBuildUrl=Enter reference for object %s
-GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons to 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
-MassConvert=Launch mass convert
-String=String
-TextLong=Long text
-Int=Integer
-Float=Float
-DateAndTime=Date and hour
-Unique=Unique
-Boolean=Boolean (Checkbox)
-ExtrafieldPhone = Phone
-ExtrafieldPrice = Price
-ExtrafieldMail = Email
-ExtrafieldUrl = Url
-ExtrafieldSelect = Select list
-ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
-ExtrafieldPassword=Password
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
-ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
-LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
-SMS=SMS
-LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
-RefreshPhoneLink=Refresh link
-LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
-KeepEmptyToUseDefault=Keep empty to use default value
-DefaultLink=Default link
-SetAsDefault=Set as default
-ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
-BarcodeInitForThirdparties=Mass barcode init for thirdparties
-BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Init value for next %s empty records
-EraseAllCurrentBarCode=Erase all current barcode values
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
-AllBarcodeReset=All barcode values have been removed
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into 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
-DisplayCompanyInfo=Display company address
-DisplayCompanyManagers=Display manager names
-DisplayCompanyInfoAndManagers=Display company address and manager names
-EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
-ModuleCompanyCodePanicum=Return an empty accountancy code.
-ModuleCompanyCodeDigitaria=Accountancy 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: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-ClickToShowDescription=Click to show description
-# Modules
-Module0Name=Users & groups
-Module0Desc=Users / Employees and Groups management
-Module1Name=Third parties
-Module1Desc=Companies and contact management (customers, prospects...)
-Module2Name=Commercial
-Module2Desc=Commercial management
-Module10Name=Accounting
-Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
-Module20Name=Proposals
-Module20Desc=Commercial proposal management
-Module22Name=Mass E-mailings
-Module22Desc=Mass E-mailing management
-Module23Name=Energy
-Module23Desc=Monitoring the consumption of energies
-Module25Name=Customer Orders
-Module25Desc=Customer order management
-Module30Name=Invoices
-Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
-Module40Name=Suppliers
-Module40Desc=Supplier management and buying (orders and invoices)
-Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
-Module49Name=Editors
-Module49Desc=Editor management
-Module50Name=Products
-Module50Desc=Product management
-Module51Name=Mass mailings
-Module51Desc=Mass paper mailing management
-Module52Name=Stocks
-Module52Desc=Stock management (products)
-Module53Name=Services
-Module53Desc=Service management
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
-Module55Name=Barcodes
-Module55Desc=Barcode management
-Module56Name=Telephony
-Module56Desc=Telephony integration
-Module57Name=Direct bank payment orders
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
-Module58Name=ClickToDial
-Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
-Module70Name=Interventions
-Module70Desc=Intervention management
-Module75Name=Expense and trip notes
-Module75Desc=Expense and trip notes management
-Module80Name=Shipments
-Module80Desc=Shipments and delivery order management
-Module85Name=Banks and cash
-Module85Desc=Management of bank or cash accounts
-Module100Name=External site
-Module100Desc=This module include an external web site or page into Dolibarr menus and view it into a Dolibarr frame
-Module105Name=Mailman and SPIP
-Module105Desc=Mailman or SPIP interface for member module
-Module200Name=LDAP
-Module200Desc=LDAP directory synchronisation
-Module210Name=PostNuke
-Module210Desc=PostNuke integration
-Module240Name=Data exports
-Module240Desc=Tool to export Dolibarr data (with assistants)
-Module250Name=Data imports
-Module250Desc=Tool to import data in Dolibarr  (with assistants)
-Module310Name=Members
-Module310Desc=Foundation members management
-Module320Name=RSS Feed
-Module320Desc=Add RSS feed inside Dolibarr screen pages
-Module330Name=Bookmarks
-Module330Desc=Bookmarks management
-Module400Name=Projects/Opportunities/Leads
-Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
-Module410Name=Webcalendar
-Module410Desc=Webcalendar integration
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
-Module520Name=Loan
-Module520Desc=Management of loans
-Module600Name=Notifications
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
-Module700Name=Donations
-Module700Desc=Donation management
-Module770Name=Expense reports
-Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
-Module1200Name=Mantis
-Module1200Desc=Mantis integration
-Module1400Name=Accounting
-Module1400Desc=Accounting management (double parties)
-Module1520Name=Document Generation
-Module1520Desc=Mass mail document generation
-Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
-Module2000Name=WYSIWYG editor
-Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
-Module2200Name=Dynamic Prices
-Module2200Desc=Enable the usage of math expressions for prices
-Module2300Name=Cron
-Module2300Desc=Scheduled job management
-Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
-Module2500Name=Electronic Content Management
-Module2500Desc=Save and share documents
-Module2600Name=API/Web services (SOAP server)
-Module2600Desc=Enable the Dolibarr SOAP server providing API services
-Module2610Name=API/Web services (REST server)
-Module2610Desc=Enable the Dolibarr REST server providing API services
-Module2660Name=Call WebServices (SOAP client)
-Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
-Module2700Name=Gravatar
-Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
-Module2800Desc=FTP Client
-Module2900Name=GeoIPMaxmind
-Module2900Desc=GeoIP Maxmind conversions capabilities
-Module3100Name=Skype
-Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
-Module4000Name=HRM
-Module4000Desc=Human resources management
-Module5000Name=Multi-company
-Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management
-Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
-Module20000Name=Leave Requests management
-Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Product lot
-Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
-Module50000Name=PayBox
-Module50000Desc=Module to offer an online payment page by credit card with PayBox
-Module50100Name=Point of sales
-Module50100Desc=Point of sales module (POS).
-Module50200Name=Paypal
-Module50200Desc=Module to offer an online payment page by credit card with Paypal
-Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double parties)
-Module54000Name=PrintIPP
-Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
-Module55000Name=Poll, Survey or Vote
-Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
-Module59000Name=Margins
-Module59000Desc=Module to manage margins
-Module60000Name=Commissions
-Module60000Desc=Module to manage commissions
-Module63000Name=Resources
-Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
-Permission11=Read customer invoices
-Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
-Permission14=Validate customer invoices
-Permission15=Send customer invoices by email
-Permission16=Create payments for customer invoices
-Permission19=Delete customer invoices
-Permission21=Read commercial proposals
-Permission22=Create/modify commercial proposals
-Permission24=Validate commercial proposals
-Permission25=Send commercial proposals
-Permission26=Close commercial proposals
-Permission27=Delete commercial proposals
-Permission28=Export commercial proposals
-Permission31=Read products
-Permission32=Create/modify products
-Permission34=Delete products
-Permission36=See/manage hidden products
-Permission38=Export products
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
-Permission44=Delete projects (shared project and projects i'm contact for)
-Permission45=Export projects
-Permission61=Read interventions
-Permission62=Create/modify interventions
-Permission64=Delete interventions
-Permission67=Export interventions
-Permission71=Read members
-Permission72=Create/modify members
-Permission74=Delete members
-Permission75=Setup types of membership
-Permission76=Export data
-Permission78=Read subscriptions
-Permission79=Create/modify subscriptions
-Permission81=Read customers orders
-Permission82=Create/modify customers orders
-Permission84=Validate customers orders
-Permission86=Send customers orders
-Permission87=Close customers orders
-Permission88=Cancel customers orders
-Permission89=Delete customers orders
-Permission91=Read social or fiscal taxes and vat
-Permission92=Create/modify social or fiscal taxes and vat
-Permission93=Delete social or fiscal taxes and vat
-Permission94=Export social or fiscal taxes
-Permission95=Read reports
-Permission101=Read sendings
-Permission102=Create/modify sendings
-Permission104=Validate sendings
-Permission106=Export sendings
-Permission109=Delete sendings
-Permission111=Read financial accounts
-Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
-Permission114=Reconciliate transactions
-Permission115=Export transactions and account statements
-Permission116=Transfers between accounts
-Permission117=Manage cheques dispatching
-Permission121=Read third parties linked to user
-Permission122=Create/modify third parties linked to user
-Permission125=Delete third parties linked to user
-Permission126=Export third parties
-Permission141=Read all projects and tasks (also private projects i am not contact for)
-Permission142=Create/modify all projects and tasks (also private projects i am not 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
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
-Permission167=Export contracts
-Permission171=Read trips and expenses (yours and your subordinates)
-Permission172=Create/modify trips and expenses
-Permission173=Delete trips and expenses
-Permission174=Read all trips and expenses
-Permission178=Export trips and expenses
-Permission180=Read suppliers
-Permission181=Read supplier orders
-Permission182=Create/modify supplier orders
-Permission183=Validate supplier orders
-Permission184=Approve supplier orders
-Permission185=Order or cancel supplier orders
-Permission186=Receive supplier orders
-Permission187=Close supplier orders
-Permission188=Cancel supplier orders
-Permission192=Create lines
-Permission193=Cancel lines
-Permission194=Read the bandwith lines
-Permission202=Create ADSL connections
-Permission203=Order connections orders
-Permission204=Order connections
-Permission205=Manage connections
-Permission206=Read connections
-Permission211=Read Telephony
-Permission212=Order lines
-Permission213=Activate line
-Permission214=Setup Telephony
-Permission215=Setup providers
-Permission221=Read emailings
-Permission222=Create/modify emailings (topic, recipients...)
-Permission223=Validate emailings (allows sending)
-Permission229=Delete emailings
-Permission237=View recipients and info
-Permission238=Manually send mailings
-Permission239=Delete mailings after validation or sent
-Permission241=Read categories
-Permission242=Create/modify categories
-Permission243=Delete categories
-Permission244=See the contents of the hidden categories
-Permission251=Read other users and groups
-PermissionAdvanced251=Read other users
-Permission252=Read permissions of other users
-Permission253=Create/modify other users, groups and permisssions
-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 assignement matters).
-Permission271=Read CA
-Permission272=Read invoices
-Permission273=Issue invoices
-Permission281=Read contacts
-Permission282=Create/modify contacts
-Permission283=Delete contacts
-Permission286=Export contacts
-Permission291=Read tariffs
-Permission292=Set permissions on the tariffs
-Permission293=Modify costumers tariffs
-Permission300=Read bar codes
-Permission301=Create/modify bar codes
-Permission302=Delete bar codes
-Permission311=Read services
-Permission312=Assign service/subscription to contract
-Permission331=Read bookmarks
-Permission332=Create/modify bookmarks
-Permission333=Delete bookmarks
-Permission341=Read its own permissions
-Permission342=Create/modify his own user information
-Permission343=Modify his own password
-Permission344=Modify its own permissions
-Permission351=Read groups
-Permission352=Read groups permissions
-Permission353=Create/modify groups
-Permission354=Delete or disable groups
-Permission358=Export users
-Permission401=Read discounts
-Permission402=Create/modify discounts
-Permission403=Validate discounts
-Permission404=Delete discounts
-Permission510=Read Salaries
-Permission512=Create/modify salaries
-Permission514=Delete salaries
-Permission517=Export salaries
-Permission520=Read Loans
-Permission522=Create/modify loans
-Permission524=Delete loans
-Permission525=Access loan calculator
-Permission527=Export loans
-Permission531=Read services
-Permission532=Create/modify services
-Permission534=Delete services
-Permission536=See/manage hidden services
-Permission538=Export services
-Permission701=Read donations
-Permission702=Create/modify donations
-Permission703=Delete donations
-Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
-Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
-Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission779=Export expense reports
-Permission1001=Read stocks
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
-Permission1004=Read stock movements
-Permission1005=Create/modify stock movements
-Permission1101=Read delivery orders
-Permission1102=Create/modify delivery orders
-Permission1104=Validate delivery orders
-Permission1109=Delete delivery orders
-Permission1181=Read suppliers
-Permission1182=Read supplier orders
-Permission1183=Create/modify supplier orders
-Permission1184=Validate supplier orders
-Permission1185=Approve supplier orders
-Permission1186=Order supplier orders
-Permission1187=Acknowledge receipt of supplier orders
-Permission1188=Delete supplier orders
-Permission1190=Approve (second approval) supplier orders
-Permission1201=Get result of an export
-Permission1202=Create/Modify an export
-Permission1231=Read supplier invoices
-Permission1232=Create/modify supplier invoices
-Permission1233=Validate supplier invoices
-Permission1234=Delete supplier invoices
-Permission1235=Send supplier invoices by email
-Permission1236=Export supplier invoices, attributes and payments
-Permission1237=Export supplier orders and their details
-Permission1251=Run mass imports of external data into database (data load)
-Permission1321=Export customer invoices, attributes and payments
-Permission1322=Reopen a paid bill
-Permission1421=Export customer orders and attributes
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
-Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
-Permission20006=Admin leave requests (setup and update balance)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
-Permission2401=Read actions (events or tasks) linked to his account
-Permission2402=Create/modify actions (events or tasks) linked to his account
-Permission2403=Delete actions (events or tasks) linked to his account
-Permission2411=Read actions (events or tasks) of others
-Permission2412=Create/modify actions (events or tasks) of others
-Permission2413=Delete actions (events or tasks) of others
-Permission2414=Export actions/tasks of others
-Permission2501=Read/Download documents
-Permission2502=Download documents
-Permission2503=Submit or delete documents
-Permission2515=Setup documents directories
-Permission2801=Use FTP client in read mode (browse and download only)
-Permission2802=Use FTP client in write mode (delete or upload files)
-Permission50101=Use Point of sales
-Permission50201=Read transactions
-Permission50202=Import transactions
-Permission54001=Print
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
-Permission59003=Read every user margin
-Permission63001=Read resources
-Permission63002=Create/modify resources
-Permission63003=Delete resources
-Permission63004=Link resources to agenda events
-DictionaryCompanyType=Types of thirdparties
-DictionaryCompanyJuridicalType=Legal forms of thirdparties
-DictionaryProspectLevel=Prospect potential level
-DictionaryCanton=State/Province
-DictionaryRegion=Regions
-DictionaryCountry=Countries
-DictionaryCurrency=Currencies
-DictionaryCivility=Personal and professional titles
-DictionaryActions=Types of agenda events
-DictionarySocialContributions=Social or fiscal taxes types
-DictionaryVAT=VAT Rates or Sales Tax Rates
-DictionaryRevenueStamp=Amount of revenue stamps
-DictionaryPaymentConditions=Payment terms
-DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact/Address types
-DictionaryEcotaxe=Ecotax (WEEE)
-DictionaryPaperFormat=Paper formats
-DictionaryFormatCards=Cards formats
-DictionaryFees=Types of fees
-DictionarySendingMethods=Shipping methods
-DictionaryStaff=Staff
-DictionaryAvailability=Delivery delay
-DictionaryOrderMethods=Ordering methods
-DictionarySource=Origin of proposals/orders
-DictionaryAccountancyCategory=Accounting account groups
-DictionaryAccountancysystem=Models for chart of accounts
-DictionaryEMailTemplates=Emails templates
-DictionaryUnits=Units
-DictionaryProspectStatus=Prospection status
-DictionaryHolidayTypes=Types of leaves
-DictionaryOpportunityStatus=Opportunity status for project/lead
-SetupSaved=Setup saved
-BackToModuleList=Back to modules list
-BackToDictionaryList=Back to dictionaries list
-VATManagement=VAT Management
-VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
-VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies.
-VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
-##### Local Taxes #####
-LTRate=Rate
-LocalTax1IsNotUsed=Do not use second tax
-LocalTax1IsUsedDesc=Use a second type of tax (other than VAT)
-LocalTax1IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax1Management=Second type of tax
-LocalTax1IsUsedExample=
-LocalTax1IsNotUsedExample=
-LocalTax2IsNotUsed=Do not use third tax
-LocalTax2IsUsedDesc=Use a third type of tax (other than VAT)
-LocalTax2IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax2Management=Third type of tax
-LocalTax2IsUsedExample=
-LocalTax2IsNotUsedExample=
-LocalTax1ManagementES= RE Management
-LocalTax1IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If te buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
-LocalTax1IsNotUsedDescES= By default the proposed RE is 0. End of rule.
-LocalTax1IsUsedExampleES= In Spain they are professionals subject to some specific sections of the Spanish IAE.
-LocalTax1IsNotUsedExampleES= In Spain they are professional and societies and subject to certain sections of the Spanish IAE.
-LocalTax2ManagementES= IRPF Management
-LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
-LocalTax2IsNotUsedDescES= By default the proposed IRPF is 0. End of rule.
-LocalTax2IsUsedExampleES= In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
-LocalTax2IsNotUsedExampleES= In Spain they are bussines not subject to tax system of modules.
-CalcLocaltax=Reports on local taxes
-CalcLocaltax1=Sales - Purchases
-CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2=Purchases
-CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3=Sales
-CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
-LabelUsedByDefault=Label used by default if no translation can be found for code
-LabelOnDocuments=Label on documents
-NbOfDays=Nb of days
-AtEndOfMonth=At end of month
-CurrentNext=Current/Next
-Offset=Offset
-AlwaysActive=Always active
-Upgrade=Upgrade
-MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Deploy/install external module
-WebServer=Web server
-DocumentRootServer=Web server's root directory
-DataRootServer=Data files directory
-IP=IP
-Port=Port
-VirtualServerName=Virtual server name
-OS=OS
-PhpWebLink=Web-Php link
-Browser=Browser
-Server=Server
-Database=Database
-DatabaseServer=Database host
-DatabaseName=Database name
-DatabasePort=Database port
-DatabaseUser=Database user
-DatabasePassword=Database password
-Tables=Tables
-TableName=Table name
-NbOfRecord=Nb of records
-Host=Server
-DriverType=Driver type
-SummarySystem=System information summary
-SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Foundation
-DefaultMenuManager= Standard menu manager
-DefaultMenuSmartphoneManager=Smartphone menu manager
-Skin=Skin theme
-DefaultSkin=Default skin theme
-MaxSizeList=Max length for list
-DefaultMaxSizeList=Default max length for lists
-DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
-MessageOfDay=Message of the day
-MessageLogin=Login page message
-PermanentLeftSearchForm=Permanent search form on left menu
-DefaultLanguage=Default language to use (language code)
-EnableMultilangInterface=Enable multilingual interface
-EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/foundation information
-CompanyIds=Company/foundation identities
-CompanyName=Name
-CompanyAddress=Address
-CompanyZip=Zip
-CompanyTown=Town
-CompanyCountry=Country
-CompanyCurrency=Main currency
-CompanyObject=Object of the company
-Logo=Logo
-DoNotSuggestPaymentMode=Do not suggest
-NoActiveBankAccountDefined=No active bank account defined
-OwnerOfBankAccount=Owner of bank account %s
-BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show link "<strong>%s</strong>"
-Alerts=Alerts
-DelaysOfToleranceBeforeWarning=Tolerance delays before warning
-DelaysOfToleranceDesc=This screen allows you to define the tolerated delays before an alert is reported on screen with picto %s for each late element.
-Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned events (agenda events) not completed yet
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Delay tolerance (in days) before alert on project not closed in time
-Delays_MAIN_DELAY_TASKS_TODO=Delay tolerance (in days) before alert on planned tasks (project tasks) not completed yet
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on orders not processed yet
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on suppliers orders not processed yet
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Delay tolerance (in days) before alert on proposals to close
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Delay tolerance (in days) before alert on proposals not billed
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerance delay (in days) before alert on services to activate
-Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerance delay (in days) before alert on expired services
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerance delay (in days) before alert on unpaid supplier invoices
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerence delay (in days) before alert on unpaid client invoices
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerance delay (in days) before alert on pending bank reconciliation
-Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed membership fee
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
-Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
-SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
-SetupDescription5=Other menu entries manage optional parameters.
-LogEvents=Security audit events
-Audit=Audit
-InfoDolibarr=About Dolibarr
-InfoBrowser=About Browser
-InfoOS=About OS
-InfoWebServer=About Web Server
-InfoDatabase=About Database
-InfoPHP=About PHP
-InfoPerf=About Performances
-BrowserName=Browser name
-BrowserOS=Browser OS
-ListOfSecurityEvents=List of Dolibarr security events
-SecurityEventsPurged=Security events purged
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
-SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
-SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
-DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
-AvailableModules=Available 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.
-TriggersAvailable=Available triggers
-TriggersDesc=Triggers are files that will modify the behaviour of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realised new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
-TriggerDisabledByName=Triggers in this file are disabled by the <b>-NORUN</b> suffix in their name.
-TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module <b>%s</b> is disabled.
-TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules.
-TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
-GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password
-DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">check here</a>.
-MiscellaneousDesc=All other security related parameters are defined here.
-LimitsSetup=Limits/Precision setup
-LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here
-MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices
-MAIN_MAX_DECIMALS_TOT=Max decimals for total prices
-MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add <b>...</b> after this number if you want to see <b>...</b> when number is truncated when shown on screen)
-MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
-UnitPriceOfProduct=Net unit price of a product
-TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
-ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
-NoEventFoundWithCriteria=No security event has been found for such search criterias.
-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.
-BackupDescX=Archived directory should be stored in a secure place.
-BackupDescY=The generated dump file should be stored in a secure place.
-BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one
-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 directoy (<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=Available database backup dump files
-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
-DownloadMoreSkins=More skins to download
-SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence without hole and with no reset
-ShowProfIdInAddress=Show professionnal id with addresses on documents
-ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents
-TranslationUncomplete=Partial translation
-MAIN_DISABLE_METEO=Disable meteo view
-TestLoginToAPI=Test login to API
-ProxyDesc=Some features of Dolibarr need to have an Internet access to work. Define here parameters for this. If the Dolibarr server is behind a Proxy server, those parameters tells Dolibarr how to access Internet through it.
-ExternalAccess=External access
-MAIN_PROXY_USE=Use a proxy server (otherwise direct access to internet)
-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 all attributes, not already available by default, and that you want to be supported for %s.
-ExtraFields=Complementary attributes
-ExtraFieldsLines=Complementary attributes (lines)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
-ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact/address)
-ExtraFieldsMember=Complementary attributes (member)
-ExtraFieldsMemberType=Complementary attributes (member type)
-ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
-ExtraFieldsSupplierOrders=Complementary attributes (orders)
-ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
-ExtraFieldsProject=Complementary attributes (projects)
-ExtraFieldsProjectTask=Complementary attributes (tasks)
-ExtraFieldHasWrongValue=Attribute %s has a wrong value.
-AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
-SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
-PathToDocuments=Path to documents
-PathDirectory=Directory
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might 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.
-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: <strong>User display setup</strong> tab of 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
-TranslationString=Translation string
-CurrentTranslationString=Current translation string
-WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
-NewTranslationStringToShow=New translation string to show
-OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
-YouMustEnableOneModule=You must at least enable 1 module
-ClassNotFoundIntoPathWarning=Class %s not found into PHP path
-YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
-SuhosinSessionEncrypt=Session storage encrypted by Suhosin
-ConditionIsCurrently=Condition is currently %s
-YouUseBestDriver=You use driver %s that is best driver available currently.
-YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required 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.
-BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance.
-BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
-AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp".
-AskForPreferredShippingMethod=Ask for preferred Sending Method for Third Parties.
-FieldEdition=Edition of field %s
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
-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.
-PasswordGenerationPerso=Return a password according to your personally defined configuration.
-SetupPerso=According to your configuration
-PasswordPatternDesc=Password pattern description
-##### Users setup #####
-RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passwords
-DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page
-UsersSetup=Users module setup
-UserMailRequired=EMail required to create a new user
-##### HRM setup #####
-HRMSetup=HRM module setup
-##### Company setup #####
-CompanySetup=Companies module setup
-CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier)
-AccountCodeManager=Module for accountancy code generation (customer or supplier)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
-NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
-NotificationsDescGlobal=* or by setting global target emails in module setup page.
-ModelModules=Documents templates
-DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
-WatermarkOnDraft=Watermark on draft document
-JSOnPaimentBill=Activate feature to autofill payment lines on payment form
-CompanyIdProfChecker=Rules on Professional Ids
-MustBeUnique=Must be unique?
-MustBeMandatory=Mandatory to create third parties?
-MustBeInvoiceMandatory=Mandatory to validate invoices?
-##### Webcal setup #####
-WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
-##### Invoices #####
-BillsSetup=Invoices module setup
-BillsNumberingModule=Invoices and credit notes numbering model
-BillsPDFModules=Invoice documents models
-CreditNote=Credit note
-CreditNotes=Credit notes
-ForceInvoiceDate=Force invoice date to validation date
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
-SuggestPaymentByRIBOnAccount=Suggest payment by withdraw on account
-SuggestPaymentByChequeToAddress=Suggest payment by cheque to
-FreeLegalTextOnInvoices=Free text on invoices
-WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
-PaymentsNumberingModule=Payments numbering model
-SuppliersPayment=Suppliers payments
-SupplierPaymentSetup=Suppliers payments setup
-##### Proposals #####
-PropalSetup=Commercial proposals module setup
-ProposalsNumberingModules=Commercial proposal numbering models
-ProposalsPDFModules=Commercial proposal documents models
-FreeLegalTextOnProposal=Free text on commercial proposals
-WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
-WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
-##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
-##### Orders #####
-OrdersSetup=Order management setup
-OrdersNumberingModules=Orders numbering models
-OrdersModelModule=Order documents models
-FreeLegalTextOnOrders=Free text on orders
-WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
-ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Interventions #####
-InterventionsSetup=Interventions module setup
-FreeLegalTextOnInterventions=Free text on intervention documents
-FicheinterNumberingModules=Intervention numbering models
-TemplatePDFInterventions=Intervention card documents models
-WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
-##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
-ContractsNumberingModules=Contracts numbering modules
-TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
-##### Members #####
-MembersSetup=Members module setup
-MemberMainOptions=Main options
-AdherentLoginRequired= Manage a Login for each member
-AdherentMailRequired=EMail required to create a new member
-MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
-##### LDAP setup #####
-LDAPSetup=LDAP Setup
-LDAPGlobalParameters=Global parameters
-LDAPUsersSynchro=Users
-LDAPGroupsSynchro=Groups
-LDAPContactsSynchro=Contacts
-LDAPMembersSynchro=Members
-LDAPSynchronization=LDAP synchronisation
-LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP
-LDAPToDolibarr=LDAP -> Dolibarr
-DolibarrToLDAP=Dolibarr -> LDAP
-LDAPNamingAttribute=Key in LDAP
-LDAPSynchronizeUsers=Organization of users in LDAP
-LDAPSynchronizeGroups=Organization of groups in LDAP
-LDAPSynchronizeContacts=Organization of contacts in LDAP
-LDAPSynchronizeMembers=Organization of foundation's members in LDAP
-LDAPPrimaryServer=Primary server
-LDAPSecondaryServer=Secondary server
-LDAPServerPort=Server port
-LDAPServerPortExample=Default port : 389
-LDAPServerProtocolVersion=Protocol version
-LDAPServerUseTLS=Use TLS
-LDAPServerUseTLSExample=Your LDAP server use TLS
-LDAPServerDn=Server DN
-LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
-LDAPPassword=Administrator password
-LDAPUserDn=Users' DN
-LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
-LDAPGroupDn=Groups' DN
-LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com)
-LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
-LDAPServerDnExample=Complete DN (ex: dc=example,dc=com)
-LDAPDnSynchroActive=Users and groups synchronization
-LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization
-LDAPDnContactActive=Contacts' synchronization
-LDAPDnContactActiveExample=Activated/Unactivated synchronization
-LDAPDnMemberActive=Members' synchronization
-LDAPDnMemberActiveExample=Activated/Unactivated synchronization
-LDAPContactDn=Dolibarr contacts' DN
-LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com)
-LDAPMemberDn=Dolibarr members DN
-LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com)
-LDAPMemberObjectClassList=List of objectClass
-LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPUserObjectClassList=List of objectClass
-LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPGroupObjectClassList=List of objectClass
-LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
-LDAPContactObjectClassList=List of objectClass
-LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPTestConnect=Test LDAP connection
-LDAPTestSynchroContact=Test contacts synchronization
-LDAPTestSynchroUser=Test user synchronization
-LDAPTestSynchroGroup=Test group synchronization
-LDAPTestSynchroMember=Test member synchronization
-LDAPTestSearch= Test a LDAP search
-LDAPSynchroOK=Synchronization test successful
-LDAPSynchroKO=Failed synchronization test
-LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that connexion to server is correctly configured and allows LDAP udpates
-LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s)
-LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s)
-LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPBindKO=Connect/Authentificate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPSetupForVersion3=LDAP server configured for version 3
-LDAPSetupForVersion2=LDAP server configured for version 2
-LDAPDolibarrMapping=Dolibarr Mapping
-LDAPLdapMapping=LDAP Mapping
-LDAPFieldLoginUnix=Login (unix)
-LDAPFieldLoginExample=Example : uid
-LDAPFilterConnection=Search filter
-LDAPFilterConnectionExample=Example : &(objectClass=inetOrgPerson)
-LDAPFieldLoginSamba=Login (samba, activedirectory)
-LDAPFieldLoginSambaExample=Example : samaccountname
-LDAPFieldFullname=Full name
-LDAPFieldFullnameExample=Example : cn
-LDAPFieldPasswordNotCrypted=Password not crypted
-LDAPFieldPasswordCrypted=Password crypted
-LDAPFieldPasswordExample=Example : userPassword
-LDAPFieldCommonNameExample=Example : cn
-LDAPFieldName=Name
-LDAPFieldNameExample=Example : sn
-LDAPFieldFirstName=First name
-LDAPFieldFirstNameExample=Example : givenName
-LDAPFieldMail=Email address
-LDAPFieldMailExample=Example : mail
-LDAPFieldPhone=Professional phone number
-LDAPFieldPhoneExample=Example : telephonenumber
-LDAPFieldHomePhone=Personal phone number
-LDAPFieldHomePhoneExample=Example : homephone
-LDAPFieldMobile=Cellular phone
-LDAPFieldMobileExample=Example : mobile
-LDAPFieldFax=Fax number
-LDAPFieldFaxExample=Example : facsimiletelephonenumber
-LDAPFieldAddress=Street
-LDAPFieldAddressExample=Example : street
-LDAPFieldZip=Zip
-LDAPFieldZipExample=Example : postalcode
-LDAPFieldTown=Town
-LDAPFieldTownExample=Example : l
-LDAPFieldCountry=Country
-LDAPFieldDescription=Description
-LDAPFieldDescriptionExample=Example : description
-LDAPFieldNotePublic=Public Note
-LDAPFieldNotePublicExample=Example : publicnote
-LDAPFieldGroupMembers= Group members
-LDAPFieldGroupMembersExample= Example : uniqueMember
-LDAPFieldBirthdate=Birthdate
-LDAPFieldCompany=Company
-LDAPFieldCompanyExample=Example : o
-LDAPFieldSid=SID
-LDAPFieldSidExample=Example : objectsid
-LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Job position
-LDAPFieldTitleExample=Example: title
-LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
-LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
-LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts.
-LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users.
-LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups.
-LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module.
-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 advices related to performance.
-NotInstalled=Not installed, so your server is not slow 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.
-MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
-MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
-OPCodeCache=OPCode cache
-NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad).
-HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
-FilesOfTypeCached=Files of type %s are cached by HTTP server
-FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
-FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
-FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
-CacheByServer=Cache by server
-CacheByClient=Cache by browser
-CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
-##### Products #####
-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)
-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 third party language
-UseSearchToSelectProductTooltip=Also if you have a large number of product (> 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)
-SetDefaultBarcodeTypeProducts=Default barcode type to use for products
-SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
-ProductCodeChecker= Module for product code generation and checking (product or service)
-ProductOtherConf= Product / Service configuration
-IsNotADir=is not a directory!
-##### Syslog #####
-SyslogSetup=Logs module setup
-SyslogOutput=Logs outputs
-SyslogFacility=Facility
-SyslogLevel=Level
-SyslogFilename=File name and path
-YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
-ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
-##### Donations #####
-DonationsSetup=Donation module setup
-DonationsReceiptModel=Template of donation receipt
-##### Barcode #####
-BarcodeSetup=Barcode setup
-PaperFormatModule=Print format module
-BarcodeEncodeModule=Barcode encoding type
-CodeBarGenerator=Barcode generator
-ChooseABarCode=No generator defined
-FormatNotSupportedByGenerator=Format not supported by this generator
-BarcodeDescEAN8=Barcode of type EAN8
-BarcodeDescEAN13=Barcode of type EAN13
-BarcodeDescUPC=Barcode of type UPC
-BarcodeDescISBN=Barcode of type ISBN
-BarcodeDescC39=Barcode of type C39
-BarcodeDescC128=Barcode of type C128
-BarcodeDescDATAMATRIX=Barcode of type Datamatrix
-BarcodeDescQRCODE=Barcode of type QR code
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
-BarcodeInternalEngine=Internal engine
-BarCodeNumberManager=Manager to auto define barcode numbers
-##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct debit payment orders
-##### ExternalRSS #####
-ExternalRSSSetup=External RSS imports setup
-NewRSS=New RSS Feed
-RSSUrl=RSS URL
-RSSUrlExample=An interesting RSS feed
-##### Mailing #####
-MailingSetup=EMailing module setup
-MailingEMailFrom=Sender EMail (From) for emails sent by emailing module
-MailingEMailError=Return EMail (Errors-to) for emails with errors
-MailingDelay=Seconds to wait after sending next message
-##### Notification #####
-NotificationSetup=EMail notification module setup
-NotificationEMailFrom=Sender EMail (From) for emails sent for notifications
-FixedEmailTarget=Fixed email target
-##### Sendings #####
-SendingsSetup=Sending module setup
-SendingsReceiptModel=Sending receipt model
-SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
-FreeLegalTextOnShippings=Free text on shipments
-##### Deliveries #####
-DeliveryOrderNumberingModules=Products deliveries receipt numbering module
-DeliveryOrderModel=Products deliveries receipt model
-DeliveriesOrderAbility=Support products deliveries receipts
-FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
-##### FCKeditor #####
-AdvancedEditor=Advanced editor
-ActivateFCKeditor=Activate advanced editor for:
-FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
-FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files.</font>
-FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
-FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
-##### OSCommerce 1 #####
-OSCommerceErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be an OSCommerce database (Key %s not found in table %s).
-OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' successfull.
-OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
-OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
-##### Stock #####
-StockSetup=Warehouse module setup
-IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
-##### Menu #####
-MenuDeleted=Menu deleted
-Menus=Menus
-TreeMenuPersonalized=Personalized menus
-NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
-NewMenu=New menu
-Menu=Selection of menu
-MenuHandler=Menu handler
-MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
-DetailId=Id menu
-DetailMenuHandler=Menu handler where to show new menu
-DetailMenuModule=Module name if menu entry come from a module
-DetailType=Type of menu (top or left)
-DetailTitre=Menu label or label code for translation
-DetailUrl=URL where menu send you (Absolute URL link or external link with http://)
-DetailEnabled=Condition to show or not entry
-DetailRight=Condition to display unauthorized grey menus
-DetailLangs=Lang file name for label code translation
-DetailUser=Intern / Extern / All
-Target=Target
-DetailTarget=Target for links (_blank top open a new window)
-DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu)
-ModifMenu=Menu change
-DeleteMenu=Delete menu entry
-ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
-FailedToInitializeMenu=Failed to initialize menu
-##### Tax #####
-TaxSetup=Taxes, social or fiscal taxes and dividends module setup
-OptionVatMode=VAT due
-OptionVATDefault=Cash basis
-OptionVATDebitOption=Accrual basis
-OptionVatDefaultDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on payments for services
-OptionVatDebitOptionDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on invoice (debit) for services
-SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
-OnDelivery=On delivery
-OnPayment=On payment
-OnInvoice=On invoice
-SupposedToBePaymentDate=Payment date used
-SupposedToBeInvoiceDate=Invoice date used
-Buy=Buy
-Sell=Sell
-InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
-AccountancyCode=Accountancy Code
-AccountancyCodeSell=Sale 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 -> Dictionary -> 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_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
-AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### 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 your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your 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.
-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 same computer than 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.
-##### Point Of Sales (CashDesk) #####
-CashDesk=Point of sales
-CashDeskSetup=Point of sales module setup
-CashDeskThirdPartyForSell=Default generic third party to use for sells
-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).
-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
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
-##### Bookmark #####
-BookmarkSetup=Bookmark module setup
-BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu.
-NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu
-##### WebServices #####
-WebServicesSetup=Webservices module setup
-WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
-WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
-EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
-##### API ####
-ApiSetup=API module setup
-ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
-OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
-ApiKey=Key for API
-WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
-##### Bank #####
-BankSetupModule=Bank module setup
-FreeLegalTextOnChequeReceipts=Free text on cheque receipts
-BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
-BankOrderGlobal=General
-BankOrderGlobalDesc=General display order
-BankOrderES=Spanish
-BankOrderESDesc=Spanish display order
-ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
-##### Multicompany #####
-MultiCompanySetup=Multi-company module setup
-##### Suppliers #####
-SuppliersSetup=Supplier module setup
-SuppliersCommandModel=Complete template of supplier order (logo...)
-SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
-SuppliersInvoiceNumberingModel=Supplier invoices numbering models
-IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
-##### GeoIPMaxmind #####
-GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
-NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
-YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
-YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
-TestGeoIPResult=Test of a conversion IP -> country
-##### Projects #####
-ProjectsNumberingModules=Projects numbering module
-ProjectsSetup=Project module setup
-ProjectsModelModule=Project reports document model
-TasksNumberingModules=Tasks numbering module
-TaskModelModule=Tasks reports document model
-UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
-##### ECM (GED) #####
-##### Fiscal Year #####
-AccountingPeriods=Accounting periods
-AccountingPeriodCard=Accounting period
-NewFiscalYear=New accounting period
-OpenFiscalYear=Open accounting period
-CloseFiscalYear=Close accounting period
-DeleteFiscalYear=Delete accounting period
-ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
-ShowFiscalYear=Show accounting period
-AlwaysEditable=Can always be edited
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
-Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
-IncludePath=Include path (defined into variable %s)
-ExpenseReportsSetup=Setup of module Expense Reports
-TemplatePDFExpenseReports=Document templates to generate expense report document
-NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
-YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of 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
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/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.
-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.
-ConfFileMuseContainCustom=Installing 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)
-TextTitleColor=Color of page title
-LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
-NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
-BackgroundColor=Background color
-TopMenuBackgroundColor=Background color for Top menu
-TopMenuDisableImages=Hide images in Top menu
-LeftMenuBackgroundColor=Background color for Left menu
-BackgroundTableTitleColor=Background color for Table title line
-BackgroundTableLineOddColor=Background color for odd table lines
-BackgroundTableLineEvenColor=Background color for even table lines
-MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
-NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
-UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
-PositionIntoComboList=Position of line into combo lists
-SellTaxRate=Sale tax rate
-RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
-UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipping, you can enter it here. You can use the key {TRACKID} into URL parameters so the system will replace it with value of tracking number user entered into shipment card.
-OpportunityPercent=When you create an opportunity, you will defined an estimated amount of project/lead. According to status of opportunity, this amount may be multiplicated 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
-FixTZ=TimeZone fix
-FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
-ExpectedChecksum=Expected Checksum
-CurrentChecksum=Current Checksum
-ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the latest stable version
-TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
-TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so 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 usefull only if your prices for each leve 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.
-SeeSubstitutionVars=See * note for list of possible substitution variables
-AllPublishers=All publishers
-UnknownPublishers=Unknown publishers
-AddRemoveTabs=Add or remove tabs
-AddDictionaries=Add dictionaries
-AddBoxes=Add widgets
-AddSheduledJobs=Add scheduled jobs
-AddHooks=Add hooks
-AddTriggers=Add triggers
-AddMenus=Add menus
-AddPermissions=Add permissions
-AddExportProfiles=Add export profiles
-AddImportProfiles=Add import profiles
-AddOtherPagesOrServices=Add other pages or services
-AddModels=Add document or numbering templates
-AddSubstitutions=Add keys substitutions
-DetectionNotPossible=Detection not possible
-UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved on 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 correclty. 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 inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <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
-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
-TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
-##### Resource ####
-ResourceSetup=Configuration du module Resource
-UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
diff --git a/htdocs/langs/es_EC/main.lang b/htdocs/langs/es_EC/main.lang
index 2fdcb824dd1..1602d6a7ffa 100644
--- a/htdocs/langs/es_EC/main.lang
+++ b/htdocs/langs/es_EC/main.lang
@@ -1,9 +1,5 @@
 # Dolibarr language file - Source file is en_US - main
 DIRECTION=ltr
-# Note for Chinese:
-# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
-# stsongstdlight or cid0cs are for simplified Chinese
-# To read Chinese pdf with Linux: sudo apt-get install poppler-data
 FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=,
@@ -23,799 +19,3 @@ FormatDateHourShort=%d/%m/%Y %H:%M
 FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
-DatabaseConnection=Database connection
-NoTemplateDefined=No template defined for this email type
-AvailableVariables=Available substitution variables
-NoTranslation=No translation
-NoRecordFound=No record found
-NoRecordDeleted=No record deleted
-NotEnoughDataYet=Not enough data
-NoError=No error
-Error=Error
-Errors=Errors
-ErrorFieldRequired=Field '%s' is required
-ErrorFieldFormat=Field '%s' has a bad value
-ErrorFileDoesNotExists=File %s does not exist
-ErrorFailedToOpenFile=Failed to open file %s
-ErrorCanNotCreateDir=Cannot create dir %s
-ErrorCanNotReadDir=Cannot read dir %s
-ErrorConstantNotDefined=Parameter %s not defined
-ErrorUnknown=Unknown error
-ErrorSQL=SQL Error
-ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this
-ErrorGoToModuleSetup=Go to Module setup to fix this
-ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
-ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
-ErrorInternalErrorDetected=Error detected
-ErrorWrongHostParameter=Wrong host parameter
-ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post again the form.
-ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child records.
-ErrorWrongValue=Wrong value
-ErrorWrongValueForParameterX=Wrong value for parameter %s
-ErrorNoRequestInError=No request in error
-ErrorServiceUnavailableTryLater=Service not available for 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>.
-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 nb of record per page
-NotAuthorized=You are not authorized to do that.
-SetDate=Set date
-SelectDate=Select a date
-SeeAlso=See also %s
-SeeHere=See here
-Apply=Apply
-BackgroundColorByDefault=Default background color
-FileRenamed=The file was successfully renamed
-FileUploaded=The file was successfully uploaded
-FileGenerated=The file was successfully generated
-FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
-NbOfEntries=Nb of entries
-GoToWikiHelpPage=Read online help (Internet access needed)
-GoToHelpPage=Read help
-RecordSaved=Record saved
-RecordDeleted=Record deleted
-LevelOfFeature=Level of features
-NotDefined=Not defined
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
-Administrator=Administrator
-Undefined=Undefined
-PasswordForgotten=Password forgotten?
-SeeAbove=See above
-HomeArea=Home area
-LastConnexion=Latest connection
-PreviousConnexion=Previous connection
-PreviousValue=Previous value
-ConnectedOnMultiCompany=Connected on environment
-ConnectedSince=Connected since
-AuthenticationMode=Authentication mode
-RequestedUrl=Requested URL
-DatabaseTypeManager=Database type manager
-RequestLastAccessInError=Latest database access request error
-ReturnCodeLastAccessInError=Return code for latest database access request error
-InformationLastAccessInError=Information for latest database access request error
-DolibarrHasDetectedError=Dolibarr has detected a technical error
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes
-MoreInformation=More information
-TechnicalInformation=Technical information
-TechnicalID=Technical ID
-NotePublic=Note (public)
-NotePrivate=Note (private)
-PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
-DoTest=Test
-ToFilter=Filter
-NoFilter=No filter
-WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance delay.
-yes=yes
-Yes=Yes
-no=no
-No=No
-All=All
-Home=Home
-Help=Help
-OnlineHelp=Online help
-PageWiki=Wiki page
-MediaBrowser=Media browser
-Always=Always
-Never=Never
-Under=under
-Period=Period
-PeriodEndDate=End date for period
-Activate=Activate
-Activated=Activated
-Closed=Closed
-Closed2=Closed
-NotClosed=Not closed
-Enabled=Enabled
-Deprecated=Deprecated
-Disable=Disable
-Disabled=Disabled
-Add=Add
-AddLink=Add link
-RemoveLink=Remove link
-AddToDraft=Add to draft
-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>?
-Delete=Delete
-Remove=Remove
-Resiliate=Terminate
-Cancel=Cancel
-Modify=Modify
-Edit=Edit
-Validate=Validate
-ValidateAndApprove=Validate and Approve
-ToValidate=To validate
-Save=Save
-SaveAs=Save As
-TestConnection=Test connection
-ToClone=Clone
-ConfirmClone=Choose data you want to clone :
-NoCloneOptionsSpecified=No data to clone defined.
-Of=of
-Go=Go
-Run=Run
-CopyOf=Copy of
-Show=Show
-Hide=Hide
-ShowCardHere=Show card
-Search=Search
-SearchOf=Search
-Valid=Valid
-Approve=Approve
-Disapprove=Disapprove
-ReOpen=Re-Open
-Upload=Send file
-ToLink=Link
-Select=Select
-Choose=Choose
-Resize=Resize
-Recenter=Recenter
-Author=Author
-User=User
-Users=Users
-Group=Group
-Groups=Groups
-NoUserGroupDefined=No user group defined
-Password=Password
-PasswordRetype=Retype your password
-NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
-Name=Name
-Person=Person
-Parameter=Parameter
-Parameters=Parameters
-Value=Value
-PersonalValue=Personal value
-NewValue=New value
-CurrentValue=Current value
-Code=Code
-Type=Type
-Language=Language
-MultiLanguage=Multi-language
-Note=Note
-Title=Title
-Label=Label
-RefOrLabel=Ref. or label
-Info=Log
-Family=Family
-Description=Description
-Designation=Description
-Model=Doc template
-DefaultModel=Default doc template
-Action=Event
-About=About
-Number=Number
-NumberByMonth=Number by month
-AmountByMonth=Amount by month
-Numero=Number
-Limit=Limit
-Limits=Limits
-Logout=Logout
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Connection
-Setup=Setup
-Alert=Alert
-Previous=Previous
-Next=Next
-Cards=Cards
-Card=Card
-Now=Now
-HourStart=Start hour
-Date=Date
-DateAndHour=Date and hour
-DateToday=Today's date
-DateReference=Reference date
-DateStart=Start date
-DateEnd=End date
-DateCreation=Creation date
-DateCreationShort=Creat. date
-DateModification=Modification date
-DateModificationShort=Modif. date
-DateLastModification=Latest modification date
-DateValidation=Validation date
-DateClosing=Closing date
-DateDue=Due date
-DateValue=Value date
-DateValueShort=Value date
-DateOperation=Operation date
-DateOperationShort=Oper. Date
-DateLimit=Limit date
-DateRequest=Request date
-DateProcess=Process date
-DateBuild=Report build date
-DatePayment=Date of payment
-DateApprove=Approving date
-DateApprove2=Approving date (second approval)
-UserCreation=Creation user
-UserModification=Modification user
-UserCreationShort=Creat. user
-UserModificationShort=Modif. user
-DurationYear=year
-DurationMonth=month
-DurationWeek=week
-DurationDay=day
-DurationYears=years
-DurationMonths=months
-DurationWeeks=weeks
-DurationDays=days
-Year=Year
-Month=Month
-Week=Week
-WeekShort=Week
-Day=Day
-Hour=Hour
-Minute=Minute
-Second=Second
-Years=Years
-Months=Months
-Days=Days
-days=days
-Hours=Hours
-Minutes=Minutes
-Seconds=Seconds
-Weeks=Weeks
-Today=Today
-Yesterday=Yesterday
-Tomorrow=Tomorrow
-Morning=Morning
-Afternoon=Afternoon
-Quadri=Quadri
-MonthOfDay=Month of the day
-HourShort=H
-MinuteShort=mn
-Rate=Rate
-CurrencyRate=Currency conversion rate
-UseLocalTax=Include tax
-Bytes=Bytes
-KiloBytes=Kilobytes
-MegaBytes=Megabytes
-GigaBytes=Gigabytes
-TeraBytes=Terabytes
-b=b.
-Kb=Kb
-Mb=Mb
-Gb=Gb
-Tb=Tb
-Cut=Cut
-Copy=Copy
-Paste=Paste
-Default=Default
-DefaultValue=Default value
-Price=Price
-UnitPrice=Unit price
-UnitPriceHT=Unit price (net)
-UnitPriceTTC=Unit price
-PriceU=U.P.
-PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (currency)
-PriceUTTC=U.P. (inc. tax)
-Amount=Amount
-AmountInvoice=Invoice amount
-AmountPayment=Payment amount
-AmountHTShort=Amount (net)
-AmountTTCShort=Amount (inc. tax)
-AmountHT=Amount (net of tax)
-AmountTTC=Amount (inc. tax)
-AmountVAT=Amount tax
-MulticurrencyAlreadyPaid=Already payed, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
-MulticurrencyAmountHT=Amount (net of tax), original currency
-MulticurrencyAmountTTC=Amount (inc. of tax), original currency
-MulticurrencyAmountVAT=Amount tax, original currency
-AmountLT1=Amount tax 2
-AmountLT2=Amount tax 3
-AmountLT1ES=Amount RE
-AmountLT2ES=Amount IRPF
-AmountTotal=Total amount
-AmountAverage=Average amount
-PriceQtyMinHT=Price quantity min. (net of tax)
-Percentage=Percentage
-Total=Total
-SubTotal=Subtotal
-TotalHTShort=Total (net)
-TotalHTShortCurrency=Total (net in currency)
-TotalTTCShort=Total (inc. tax)
-TotalHT=Total (net of tax)
-TotalHTforthispage=Total (net of tax) for this page
-Totalforthispage=Total for this page
-TotalTTC=Total (inc. tax)
-TotalTTCToYourCredit=Total (inc. tax) to your credit
-TotalVAT=Total tax
-TotalLT1=Total tax 2
-TotalLT2=Total tax 3
-TotalLT1ES=Total RE
-TotalLT2ES=Total IRPF
-HT=Net of tax
-TTC=Inc. tax
-VAT=Sales tax
-VATs=Sales taxes
-LT1ES=RE
-LT2ES=IRPF
-VATRate=Tax Rate
-Average=Average
-Sum=Sum
-Delta=Delta
-Module=Module
-Option=Option
-List=List
-FullList=Full list
-Statistics=Statistics
-OtherStatistics=Other statistics
-Status=Status
-Favorite=Favorite
-ShortInfo=Info.
-Ref=Ref.
-ExternalRef=Ref. extern
-RefSupplier=Ref. supplier
-RefPayment=Ref. payment
-CommercialProposalsShort=Commercial proposals
-Comment=Comment
-Comments=Comments
-ActionsToDo=Events to do
-ActionsToDoShort=To do
-ActionsDoneShort=Done
-ActionNotApplicable=Not applicable
-ActionRunningNotStarted=To start
-ActionRunningShort=In progress
-ActionDoneShort=Finished
-ActionUncomplete=Uncomplete
-CompanyFoundation=Company/Foundation
-ContactsForCompany=Contacts 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
-NActionsLate=%s late
-RequestAlreadyDone=Request already recorded
-Filter=Filter
-FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
-RemoveFilter=Remove filter
-ChartGenerated=Chart generated
-ChartNotGenerated=Chart not generated
-GeneratedOn=Build on %s
-Generate=Generate
-Duration=Duration
-TotalDuration=Total duration
-Summary=Summary
-DolibarrStateBoard=Statistics
-DolibarrWorkBoard=Work tasks board
-Available=Available
-NotYetAvailable=Not yet available
-NotAvailable=Not available
-Categories=Tags/categories
-Category=Tag/category
-By=By
-From=From
-to=to
-and=and
-or=or
-Other=Other
-Others=Others
-OtherInformations=Other informations
-Quantity=Quantity
-Qty=Qty
-ChangedBy=Changed by
-ApprovedBy=Approved by
-ApprovedBy2=Approved by (second approval)
-Approved=Approved
-Refused=Refused
-ReCalculate=Recalculate
-ResultKo=Failure
-Reporting=Reporting
-Reportings=Reporting
-Draft=Draft
-Drafts=Drafts
-Validated=Validated
-Opened=Opened
-New=New
-Discount=Discount
-Unknown=Unknown
-General=General
-Size=Size
-Received=Received
-Paid=Paid
-Topic=Subject
-ByCompanies=By third parties
-ByUsers=By users
-Links=Links
-Link=Link
-Rejects=Rejects
-Preview=Preview
-NextStep=Next step
-Datas=Data
-None=None
-NoneF=None
-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.
-Photo=Picture
-Photos=Pictures
-AddPhoto=Add picture
-DeletePicture=Picture delete
-ConfirmDeletePicture=Confirm picture deletion?
-Login=Login
-CurrentLogin=Current login
-EnterLoginDetail=Enter login details
-January=January
-February=February
-March=March
-April=April
-May=May
-June=June
-July=July
-August=August
-September=September
-October=October
-November=November
-December=December
-JanuaryMin=Jan
-FebruaryMin=Feb
-MarchMin=Mar
-AprilMin=Apr
-MayMin=May
-JuneMin=Jun
-JulyMin=Jul
-AugustMin=Aug
-SeptemberMin=Sep
-OctoberMin=Oct
-NovemberMin=Nov
-DecemberMin=Dec
-Month01=January
-Month02=February
-Month03=March
-Month04=April
-Month05=May
-Month06=June
-Month07=July
-Month08=August
-Month09=September
-Month10=October
-Month11=November
-Month12=December
-MonthShort01=Jan
-MonthShort02=Feb
-MonthShort03=Mar
-MonthShort04=Apr
-MonthShort05=May
-MonthShort06=Jun
-MonthShort07=Jul
-MonthShort08=Aug
-MonthShort09=Sep
-MonthShort10=Oct
-MonthShort11=Nov
-MonthShort12=Dec
-AttachedFiles=Attached files and documents
-FileTransferComplete=File was uploaded successfuly
-DateFormatYYYYMM=YYYY-MM
-DateFormatYYYYMMDD=YYYY-MM-DD
-DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
-ReportName=Report name
-ReportPeriod=Report period
-ReportDescription=Description
-Report=Report
-Keyword=Keyword
-Origin=Origin
-Legend=Legend
-Fill=Fill
-Reset=Reset
-File=File
-Files=Files
-NotAllowed=Not allowed
-ReadPermissionNotAllowed=Read permission not allowed
-AmountInCurrency=Amount in %s currency
-Example=Example
-Examples=Examples
-NoExample=No example
-FindBug=Report a bug
-NbOfThirdParties=Number of third parties
-NbOfLines=Number of lines
-NbOfObjects=Number of objects
-NbOfObjectReferers=Number of related items
-Referers=Related items
-TotalQuantity=Total quantity
-DateFromTo=From %s to %s
-DateFrom=From %s
-DateUntil=Until %s
-Check=Check
-Uncheck=Uncheck
-Internal=Internal
-External=External
-Internals=Internal
-Externals=External
-Warning=Warning
-Warnings=Warnings
-BuildDoc=Build Doc
-Entity=Environment
-Entities=Entities
-CustomerPreview=Customer preview
-SupplierPreview=Supplier preview
-ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show supplier preview
-RefCustomer=Ref. customer
-Currency=Currency
-InfoAdmin=Information for administrators
-Undo=Undo
-Redo=Redo
-ExpandAll=Expand all
-UndoExpandAll=Undo expand
-Reason=Reason
-FeatureNotYetSupported=Feature not yet supported
-CloseWindow=Close window
-Response=Response
-Priority=Priority
-SendByMail=Send by EMail
-MailSentBy=Email sent by
-TextUsedInTheMessageBody=Email body
-SendAcknowledgementByMail=Send confirmation email
-EMail=E-mail
-NoEMail=No email
-Email=Email
-NoMobilePhone=No mobile phone
-Owner=Owner
-FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
-Refresh=Refresh
-BackToList=Back to list
-GoBack=Go back
-CanBeModifiedIfOk=Can be modified if valid
-CanBeModifiedIfKo=Can be modified if not valid
-ValueIsValid=Value is valid
-ValueIsNotValid=Value is not valid
-RecordCreatedSuccessfully=Record created successfully
-RecordModifiedSuccessfully=Record modified successfully
-RecordsModified=%s record modified
-RecordsDeleted=%s record deleted
-AutomaticCode=Automatic code
-FeatureDisabled=Feature disabled
-MoveBox=Move widget
-Offered=Offered
-NotEnoughPermissions=You don't have permission for this action
-SessionName=Session name
-Method=Method
-Receive=Receive
-CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
-ExpectedValue=Expected Value
-CurrentValue=Current value
-PartialWoman=Partial
-TotalWoman=Total
-NeverReceived=Never received
-Canceled=Canceled
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
-Color=Color
-Documents=Linked files
-Documents2=Documents
-UploadDisabled=Upload disabled
-MenuECM=Documents
-MenuAWStats=AWStats
-MenuMembers=Members
-MenuAgendaGoogle=Google agenda
-ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=No documents saved in this directory
-CurrentUserLanguage=Current language
-CurrentTheme=Current theme
-CurrentMenuManager=Current menu manager
-Browser=Browser
-Layout=Layout
-Screen=Screen
-DisabledModules=Disabled modules
-For=For
-ForCustomer=For customer
-Signature=Signature
-DateOfSignature=Date of signature
-HidePassword=Show command with password hidden
-UnHidePassword=Show real command with clear password
-Root=Root
-Informations=Informations
-Page=Page
-Notes=Notes
-AddNewLine=Add new line
-AddFile=Add file
-FreeZone=Free entry
-FreeLineOfType=Free entry of type
-CloneMainAttributes=Clone object with its main attributes
-PDFMerge=PDF Merge
-Merge=Merge
-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 application at the moment.
-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
-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.
-AccordingToGeoIPDatabase=(according to GeoIP convertion)
-Line=Line
-NotSupported=Not supported
-RequiredField=Required field
-Result=Result
-ToTest=Test
-ValidateBefore=Card must be validated before using this feature
-Visibility=Visibility
-Private=Private
-Hidden=Hidden
-Resources=Resources
-Source=Source
-Prefix=Prefix
-Before=Before
-After=After
-IPAddress=IP address
-Frequency=Frequency
-IM=Instant messaging
-NewAttribute=New attribute
-AttributeCode=Attribute code
-URLPhoto=URL of photo/logo
-SetLinkToAnotherThirdParty=Link to another third party
-LinkTo=Link to
-LinkToProposal=Link to proposal
-LinkToOrder=Link to order
-LinkToInvoice=Link to invoice
-LinkToSupplierOrder=Link to supplier order
-LinkToSupplierProposal=Link to supplier proposal
-LinkToSupplierInvoice=Link to supplier invoice
-LinkToContract=Link to contract
-LinkToIntervention=Link to intervention
-CreateDraft=Create draft
-SetToDraft=Back to draft
-ClickToEdit=Click to edit
-ObjectDeleted=Object %s deleted
-ByCountry=By country
-ByTown=By town
-ByDate=By date
-ByMonthYear=By month/year
-ByYear=By year
-ByMonth=By month
-ByDay=By day
-BySalesRepresentative=By sales representative
-LinkedToSpecificUsers=Linked to a particular user contact
-NoResults=No results
-AdminTools=Admin tools
-SystemTools=System tools
-ModulesSystemTools=Modules tools
-Test=Test
-Element=Element
-NoPhotoYet=No pictures available yet
-Dashboard=Dashboard
-MyDashboard=My dashboard
-Deductible=Deductible
-from=from
-toward=toward
-Access=Access
-SelectAction=Select action
-HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
-SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
-OriginFileName=Original filename
-SetDemandReason=Set source
-SetBankAccount=Define Bank Account
-AccountCurrency=Account Currency
-ViewPrivateNote=View notes
-XMoreLines=%s line(s) hidden
-PublicUrl=Public URL
-AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
-PrintFile=Print File %s
-ShowTransaction=Show entry on bank account
-GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
-Deny=Deny
-Denied=Denied
-ListOfTemplates=List of templates
-Gender=Gender
-Genderman=Man
-Genderwoman=Woman
-ViewList=List view
-Mandatory=Mandatory
-Hello=Hello
-Sincerely=Sincerely
-DeleteLine=Delete line
-ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
-NoRecordSelected=No record selected
-MassFilesArea=Area for files built by mass actions
-ShowTempMassFilesArea=Show area of files built by mass actions
-RelatedObjects=Related Objects
-ClassifyBilled=Classify billed
-Progress=Progress
-ClickHere=Click here
-FrontOffice=Front office
-BackOffice=Back office
-View=View
-Export=Export
-Exports=Exports
-ExportFilteredList=Export filtered list
-ExportList=Export list
-Miscellaneous=Miscellaneous
-Calendar=Calendar
-GroupBy=Group by...
-ViewFlatList=View flat list
-RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Direct download link
-Download=Download
-ActualizeCurrency=Update currency rate
-Fiscalyear=Fiscal year
-# Week day
-Monday=Monday
-Tuesday=Tuesday
-Wednesday=Wednesday
-Thursday=Thursday
-Friday=Friday
-Saturday=Saturday
-Sunday=Sunday
-MondayMin=Mo
-TuesdayMin=Tu
-WednesdayMin=We
-ThursdayMin=Th
-FridayMin=Fr
-SaturdayMin=Sa
-SundayMin=Su
-Day1=Monday
-Day2=Tuesday
-Day3=Wednesday
-Day4=Thursday
-Day5=Friday
-Day6=Saturday
-Day0=Sunday
-ShortMonday=M
-ShortTuesday=T
-ShortWednesday=W
-ShortThursday=T
-ShortFriday=F
-ShortSaturday=S
-ShortSunday=S
-SelectMailModel=Select email template
-SetRef=Set ref
-Select2ResultFoundUseArrows=Some results found. Use arrows to select.
-Select2NotFound=No result found
-Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
-Select2LoadingMoreResults=Loading more results...
-Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
-SearchIntoContacts=Contacts
-SearchIntoMembers=Members
-SearchIntoUsers=Users
-SearchIntoProductsOrServices=Products or services
-SearchIntoProjects=Projects
-SearchIntoTasks=Tasks
-SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
-SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
-SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
-SearchIntoInterventions=Interventions
-SearchIntoContracts=Contracts
-SearchIntoCustomerShipments=Customer shipments
-SearchIntoExpenseReports=Expense reports
-SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang
index 477eda5416a..5a7167903cd 100644
--- a/htdocs/langs/es_ES/accountancy.lang
+++ b/htdocs/langs/es_ES/accountancy.lang
@@ -26,27 +26,31 @@ InvoiceLabel=Etiqueta factura
 OverviewOfAmountOfLinesNotBound=Ver la cantidad de líneas no ligadas a cuentas contables
 OverviewOfAmountOfLinesBound=Ver la cantidad de líneas ligadas a cuentas contables
 OtherInfo=Otra información
+DeleteCptCategory=Eliminar la cuenta contable del grupo
+ConfirmDeleteCptCategory=¿Está seguro de querer eliminar esta cuenta contable del grupo de cuentas contables?
 
 AccountancyArea=Área contabilidad
 AccountancyAreaDescIntro=El uso del módulo de contabilidad se realiza en varios pasos:
 AccountancyAreaDescActionOnce=Las siguientes acciones se ejecutan normalmente una sola vez, o una vez al año...
-AccountancyAreaDescActionOnceBis=Los pasos siguientes deben hacerse para ahorrar tiempo en el futuro, sugiriendo la cuenta contable predeterminada correcta para realizar los diarios (escritura de los registros en los diarios y el Libro Mayor)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=Las siguientes acciones se ejecutan normalmente cada mes, semana o día en empresas muy grandes...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=PASO %s: Crear un modelo de plan general contable desde el menú %s
 AccountancyAreaDescChart=PASO %s: Crear o comprobar el contenido de su plan general contable desde el menú %s
-AccountancyAreaDescBank=PASO %s: Verificar la unión entre cuentas bancarias y sus cuentas contables. Completar las consolidaciones que faltan. Para ello vaya a la ficha de cada cuenta bancaria. Puede empezar desde la página %s.
-AccountancyAreaDescVat=PASO %s: Verificar la unión entre las tasas de IVA y sus cuentas contables. Completar las consolidaciones que faltan. Puede indicar las cuentas contables para usar en cada IVA en la página %s.
-AccountancyAreaDescExpenseReport=PASO %s: Verificar la unión entre los informes de gastos y sus cuentas contables. Completar las consolidaciones que faltan. Puede indicar las cuentas contables para usar en cada registro en la página %s.
-AccountancyAreaDescSal=PASO %s: Compruebe la unión entre los pagos de salarios y sus cuentas contables. Completar las consolidaciones que faltan.<br>Para ello puede utilizar el menú %s.
-AccountancyAreaDescContrib=PASO %s: Compruebe la unión entre los gastos especiales y sus cuentas contables. Completar las consolidaciones que faltan.<br>Para ello puede utilizar el menú %s.
-AccountancyAreaDescDonation=PASO %s: Compruebe la unión entre las donaciones y sus cuentas contables. Completar las consolidaciones que faltan.<br>Para ello puede utilizar el menú %s.
-AccountancyAreaDescMisc=PASO %s: Compruebe la unión entre líneas de registros misceláneos y cuentas contables. Completar las consolidaciones que faltan.<br>Para ello puede utilizar el menú %s.
-AccountancyAreaDescProd=PASO %s: Compruebe la unión entre los productos/servicios y sus cuentas contables. Completar las consolidaciones que faltan.<br>Para ello puede utilizar el menú %s.
-AccountancyAreaDescLoan=PASO %s: Compruebe la unión entre los pagos y sus cuentas contables. Completar las consolidaciones que faltan.<br>Para ello puede utilizar el menú %s.
 
-AccountancyAreaDescCustomer=PASO %s: Verificar la unión entre líneas de facturas a clientes y sus cuentas contables. Completar las consolidaciones que faltan. Una vez que la unión es completada, la aplicación será capaz de generar las transacciones del diario en el Libro Mayor en un solo clic. <br> Para ello puede utilizar el menú %s.
-AccountancyAreaDescSupplier=PASO %s: Verificar la unión entre líneas de facturas a proveedores y sus cuentas contables. Completar las consolidaciones que faltan. Una vez que la unión es completada, la aplicación será capaz de generar las transacciones del diario en el Libro Mayor en un solo clic. <br> Para ello puede utilizar el menú %s.
-AccountancyAreaDescWriteRecords=PASO %s: Escribir las transacciones en el Libro Mayor. Para ello, entre en cada diario, y haga clic en el botón de "Generar transacciones en el Libro Mayor".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=PASO %s: Defina las cuentas contables para cada banco y cuentas financieras. Puede empezar desde la página %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=PASO %s: Añadir o editar transacciones existentes, generar informes y exportaciones.
 
 AccountancyAreaDescClosePeriod=PASO %s: Cerrar periodo, por lo que no podrá hacer modificaciones en un futuro.
@@ -57,6 +61,10 @@ ChangeAndLoad=Cambiar y cargar
 Addanaccount=Añadir una cuenta contable
 AccountAccounting=Cuenta contable
 AccountAccountingShort=Cuenta
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Mostrar diario de cuentas
+ShowAccountingJournal=Mostrar diario contable
 AccountAccountingSuggest=Cuenta contable sugerida
 MenuDefaultAccounts=Cuentas contables por defecto
 MenuVatAccounts=Cuentas de IVA
@@ -71,8 +79,8 @@ SuppliersVentilation=Contabilizar facturas de proveedores
 ExpenseReportsVentilation=Contabilizar informes de gastos
 CreateMvts=Crear nuevo movimiento
 UpdateMvts=Modificar transacción
-WriteBookKeeping=Registrar movimientos en el Libro Mayor
-Bookkeeping=Libro Mayor
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Saldo de la cuenta
 
 CAHTF=Total purchase supplier before tax
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Ordenar las páginas de contabilización "
 
 ACCOUNTING_LENGTH_DESCRIPTION=Longitud para la visualización de la descripción de productos y servicios en los listados (Ideal = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Longitud para la visualización de la descripción de la cuenta de productos y servicios en los listados (Ideal = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Longitud de las cuentas generales
-ACCOUNTING_LENGTH_AACCOUNT=Longitud de las subcuentas
-ACCOUNTING_MANAGE_ZERO=Gestiona el cero al final de una cuenta contable. Necesario en algunos países. Desactivada por defecto. Si está activada, también debe establecer los siguientes dos parámetros (o será ignorada)
+ACCOUNTING_LENGTH_GACCOUNT=Longitud de las cuentas generales (si ajusta el valor a 6 aquí, la cuenta '706' aparecerá como '706000' en la pantalla)
+ACCOUNTING_LENGTH_AACCOUNT=Longitud de las subcuentas ( si ajusta el valor a 6 aquí, la cuenta '401' aparecerá como '401000' en la pantalla)
+ACCOUNTING_MANAGE_ZERO=Gestiona el cero al final de una cuenta contable. Necesario en algunos países (como Suiza). Si se mantiene desactivada (por defecto), puede configurar los 2 parámetros siguientes para pedir que la aplicación agregue el cero virtual
 BANK_DISABLE_DIRECT_INPUT=Desactivar transacciones directas en cuenta bancaria
 
 ACCOUNTING_SELL_JOURNAL=Diario de ventas
@@ -132,19 +140,19 @@ Sens=Sentido
 Codejournal=Diario
 NumPiece=Apunte
 TransactionNumShort=Núm. transacción
-AccountingCategory=Categoría contable
+AccountingCategory=Grupos cuentas contables
 GroupByAccountAccounting=Agrupar por cuenta contable
 NotMatch=No establecido
-DeleteMvt=Eliminar líneas del Libro Mayor
+DeleteMvt=Delete Ledger lines
 DelYear=Año a eliminar
 DelJournal=Diario a eliminar
-ConfirmDeleteMvt=Esto eliminará todas las lineas del Libro Mayor del año y/o de un diario específico. Se requiere al menos un criterio.
-ConfirmDeleteMvtPartial=Esto borrará todas las líneas seleccionadas del libro de mayor
-DelBookKeeping=Eliminar los registros del Diario Mayor
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Diario financiero
 ExpenseReportsJournal=Diario informe de gastos
 DescFinanceJournal=El diario financiero incluye todos los tipos de pagos por cuenta bancaria
-DescJournalOnlyBindedVisible=Esta es una vista de registros que están vinculados a una cuenta contable de productos/servicios y pueden ser registrados en el Libro Mayor.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Cuenta contable para IVA no definida
 ThirdpartyAccountNotDefined=Cuenta contable de tercero no definida
 ProductAccountNotDefined=Cuenta contable de producto no definida
@@ -156,13 +164,13 @@ NewAccountingMvt=Nuevo movimiento
 NumMvts=Número de movimiento
 ListeMvts=Listado de movimientos
 ErrorDebitCredit=Debe y Haber no pueden contener un valor al mismo tiempo
-
+AddCompteFromBK=Añadir cuentas contables al grupo
 ReportThirdParty=Listado de cuentas de terceros
 DescThirdPartyReport=Consulte aquí el listado de clientes y proveedores y sus códigos contables
 ListAccounts=Listado de cuentas contables
 
 Pcgtype=Tipo del plan
-Pcgsubtype=Subcuenta
+Pcgsubtype=Subclass of account
 
 TotalVente=Total facturación antes de impuestos
 TotalMarge=Total margen ventas
@@ -186,9 +194,9 @@ AutomaticBindingDone=Vinculación automática finalizada
 ErrorAccountancyCodeIsAlreadyUse=Error, no puede eliminar esta cuenta ya que está siendo usada
 MvtNotCorrectlyBalanced=Movimiento descuadrado. Debe = %s. Haber = %s
 FicheVentilation=Ficha contable
-GeneralLedgerIsWritten=Transacciones escritas en el libro mayor
-GeneralLedgerSomeRecordWasNotRecorded=Algunas de las operaciones que no podrán registrarse.
-NoNewRecordSaved=No se guardaron nuevos registros
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=Listado de productos sin cuentas contables
 ChangeBinding=Cambiar la unión
 
@@ -196,6 +204,18 @@ ChangeBinding=Cambiar la unión
 ApplyMassCategories=Aplicar categorías en masa
 AddAccountFromBookKeepingWithNoCategories=Añadir cuenta ya utilizada sin categorías
 CategoryDeleted=La categoría para la cuenta contable ha sido eliminada
+AccountingJournals=Diarios contables
+AccountingJournal=Diario contable
+NewAccountingJournal=Nuevo diario contable
+ShowAccoutingJournal=Mostrar diario contable
+Code=Código
+Nature=Naturaleza
+AccountingJournalType1=Operaciones varias
+AccountingJournalType2=Ventas
+AccountingJournalType3=Compras
+AccountingJournalType4=Banco
+AccountingJournalType9=Haber
+ErrorAccountingJournalIsAlreadyUse=Este diario ya esta siendo usado
 
 ## Export
 Exports=Exportaciones
@@ -211,6 +231,7 @@ Modelcsv_ciel=Exportar hacia Sage Ciel Compta o Compta Evolution
 Modelcsv_quadratus=Exportar hacia Quadratus QuadraCompta
 Modelcsv_ebp=Exportar a EBP
 Modelcsv_cogilog=Eportar a Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Id plan contable
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculado
 Formula=Fórmula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=Sin categorías contables para %s (Vea Inicio - Configuración - Diccionarios)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No hay grupos contables disponibles para %s (Vea Inicio - Configuración - Diccionarios)
 ExportNotSupported=El formato de exportación configurado no es soportado en esta página
 BookeppingLineAlreayExists=Lineas ya existentes en la contabilidad
-
+NoJournalDefined=No journal defined
 Binded=Líneas contabilizadas
 ToBind=Líneas a contabilizar
 
-WarningReportNotReliable=Advertencia, este informe no se basa en el libro mayor, por lo que no es fiable aún. Se sustituirá por un informe correcto en una próxima versión.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 23a18dc51a9..e07d374c999 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=Usuarios internos
 ExternalUsers=Usuarios externos
 GUISetup=Entorno
 SetupArea=Área configuración
+UploadNewTemplate=Nueva(s) plantilla(s) actualizada(s)
 FormToTestFileUploadForm=Formulario de prueba de subida de archivo (según opciones elegidas)
 IfModuleEnabled=Nota: sólo es eficaz si el módulo <b>%s</b> está activado
 RemoveLock=Elimine el archivo <b>%s</b>, si existe, para permitir la utilidad de actualización.
@@ -103,7 +104,7 @@ MenuIdParent=Id del menú padre
 DetailMenuIdParent=ID del menú padre (vacío para un menú superior)
 DetailPosition=Número de orden para la posición del menú
 AllMenus=Todos
-NotConfigured=No configurado
+NotConfigured=Module/Application not configured
 Active=Activo
 SetupShort=Config.
 OtherOptions=Otras opciones
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Separador miles
 Destination=destino
 IdModule=identificador de modulo
 IdPermissions=Identificador de permisos
-Modules=Módulos
 LanguageBrowserParameter=Variable %s
 LocalisationDolibarrParameters=Parámetros de localización
 ClientTZ=Zona horaria cliente (usuario)
@@ -123,7 +123,8 @@ PHPTZ=Zona horaria Servidor PHP
 DaylingSavingTime=Horario de verano (usuario)
 CurrentHour=Hora PHP (servidor)
 CurrentSessionTimeOut=Timeout sesión actual
-YouCanEditPHPTZ=Para definir una zona horaria PHP diferente (no es necesario), pruebe a añadir un archivo .htacces con una línea como esta "SetEnvTZ Europe/Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Panel
 Boxes=Paneles
 MaxNbOfLinesForBoxes=Número máximo de líneas para paneles
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Funcionaliad disponible únicamente en versiones of
 Rights=Permisos
 BoxesDesc=Los paneles son componentes que muestran algunos datos que pueden añadirse para personalizar algunas páginas. Puede elegir entre mostrar o no el panel mediante la selección de la página de destino y haciendo clic en 'Activar', o haciendo clic en la papelera para desactivarlo.
 OnlyActiveElementsAreShown=Sólo los elementos de <a href="%s">módulos activados</a> son mostrados.
-ModulesDesc=Los módulos de Dolibarr definen qué funcionalidad está habilitada en el software. Algunos módulos requieren permisos que se deben conceder a los usuarios después de activar el módulo. Haga clic en el botón de encendido/apagado para activar un módulo/función.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=Puede encontrar más módulos para descargar en sitios web externos en Internet ...
 ModulesDeployDesc=Si los permisos en su sistema de archivos lo permiten, puede utilizar esta herramienta para instalar un módulo externo. El módulo estará entonces visible en la pestaña <strong>%s</strong>.
 ModulesMarketPlaces=Buscar módulos externos...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Encriptar la contraseña de la base en el archiv
 InstrucToEncodePass=Para tener la contraseña codificada en el archivo <b>conf.php</b>, reemplace la línea <br><b>$dolibarr_main_db_pass = "...";</b><br>por<br> <b>$dolibarr_main_db_pass = "crypted:%s";</b>
 InstrucToClearPass=Para tener la contraseña decodificada (visible) en el archivo <b>conf.php</b>, reemplace la línea <br><b>$dolibarr_main_db_pass = "crypted:...";</b><br>por<br><b>$dolibarr_main_db_pass = "%s";</b>
 ProtectAndEncryptPdfFiles=Protección y encriptación de los pdf generados
-ProtectAndEncryptPdfFilesDesc=La protección de un documento pdf deja el documento libre a la lectura y a la impresión a cualquier lector de PDF. Por el contrario, la modificación y la copia resultan imposibles.
+ProtectAndEncryptPdfFilesDesc=La protección de un documento PDF lo mantiene disponible para leer e imprimir con cualquier navegador PDF. Sin embargo, la edición y la copia no son posibles. Tenga en cuenta que el uso de esta característica hace que la creación global de un conjunto de PDFs no funcione.
 Feature=Función
 DolibarrLicense=Licencia
 Developpers=Desarrolladores/contribuidores
@@ -225,6 +226,8 @@ OfficialMarketPlace=Sitio oficial de módulos complementarios y extensiones
 OfficialWebHostingService=Servicios de hosting web (Cloud hosting)
 ReferencedPreferredPartners=Preferred Partners
 OtherResources=Otros recursos
+ExternalResources=Recursos externos
+SocialNetworks=Redes sociales
 ForDocumentationSeeWiki=Para la documentación de usuario, desarrollador o Preguntas Frecuentes (FAQ), consulte el wiki Dolibarr: <br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=Para otras cuestiones o realizar sus propias consultas, puede utilizar el foro Dolibarr: <br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Esta aplicación, independiente de Dolibarr, le permite ayudarle a obtener un servicio de soporte de Dolibarr.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=Funcionalidad no disponible en sistemas  Unix. Pruebe
 SubmitTranslation=Si la traducción de este idioma no está completa o si encuentra errores, puede corregir esto editando los archivos en el directorio <b>langs/%s</b> y enviar su cambio a www.transifex.com/dolibarr-association/dolibarr/
 SubmitTranslationENUS=Si la traducción de este idioma es incompleta o si encuentra errores, puede corregirlos mediante la edición de los archivos en el directorio <b>langs/%s</b> y el envío los cambios al foro www.dolibarr.es o a los desarrolladores en github.com/Dolibarr/dolibarr.
 ModuleSetup=Configuración del módulo
-ModulesSetup=Configuración de los módulos
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Sistema
 ModuleFamilyCrm=Gestión de Relaciones con Clientes (CRM)
 ModuleFamilySrm=Gestión de Relaciones con Proveedores (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=Versión actual de Dolibarr
 CallUpdatePage=Ir a la página de actualización de la estructura de la base de datos y sus datos: %s.
 LastStableVersion=Última versión estable
 LastActivationDate=Última fecha de activación
+LastActivationAuthor=Latest activation author
+LastActivationIP=Última IP activa
 UpdateServerOffline=Actualizar servidor offline
+WithCounter=Gestionar un contador
 GenericMaskCodes=Puede introducir cualquier máscara numérica. En esta máscara, puede utilizar las siguientes etiquetas:<br><b>{000000} </b> corresponde a un número que se incrementa en cada uno de %s. Introduzca tantos ceros como longitud desee mostrar. El contador se completará a partir de ceros por la izquierda con el fin de tener tantos ceros como la máscara. <br> <b> {000000+000}</ b> Igual que el anterior, con una compensación correspondiente al número a la derecha del signo + se aplica a partir del primer %s. <br> <b> {000000@x}</b> igual que el anterior, pero el contador se restablece a cero cuando se llega a x meses (x entre 1 y 12). Si esta opción se utiliza y x es de 2 o superior, entonces la secuencia {yy}{mm} o {yyyy}{mm} también es necesaria. <br> <b> {dd} </b> días (01 a 31). <br><b> {mm}</b> mes (01 a 12). <br><b>{yy}</b>, <b>{yyyy}</b> ou <b>{y}</b> año en 2, 4 ó 1 cifra.<br>
 GenericMaskCodes2=<b>{cccc}</b> código de cliente con n caracteres<br><b>{cccc000}</b> código de cliente con n caracteres es seguido por un contador dedicado a clientes. Este contador dedicado a clientes se reseteará al mismo tiempo que el contador global.<br><b>{tttt}</b> El código del tipo de empresa con n caracteres (vea diccionarios->tipos de empresa).<br>
 GenericMaskCodes3=Cualquier otro carácter en la máscara se quedará sin cambios. <br>No se permiten espacios <br>
 GenericMaskCodes4a=<u>Ejemplo en la 99 ª %s del tercero La Empresa realizada el 31/03/2007: </u><br>
 GenericMaskCodes4b=<u>Ejemplo sobre un tercero creado el 31/03/2007:</u><br>
 GenericMaskCodes4c=<u>Ejemplo en un producto/servicio creado el 31/03/2007:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> dará <b>ABC0703-000099</b><br><b>{0000+100@1}-XXX/{dd}/YYY</b> daráa <b>0199-XXX/31/YYY</b>
+GenericMaskCodes5=<b>ABC {yy} {mm} - {000000} </b> dará <b> ABC0701-000099 </b><br><b> {0000+100@1}-ZZZ/{dd}/XXX</b> dará <b>0199-ZZZ/31/ XXX</b> <br><b>IN{yy}{mm}-{0000}-{t}</b> dará <b>IN0701-0099-A</b> si el tipo de empresa es 'Responsable Inscrito' con código para el tipo 'A_RI'
 GenericNumRefModelDesc=Devuelve un número creado acorde a una máscara definida.
 ServerAvailableOnIPOrPort=Servidor disponible en la dirección <b>%s</b> en el puerto <b>%s</b>
 ServerNotAvailableOnIPOrPort=Servidor no disponible en la dirección <b>%s</b> en el puerto <b>%s</b>
@@ -369,19 +375,21 @@ Int=Numérico entero
 Float=Decimal
 DateAndTime=Fecha y hora
 Unique=Único
-Boolean=Boleano (Casilla de verificación)
+Boolean=Boolean (un checkbox)
 ExtrafieldPhone = Teléfono
 ExtrafieldPrice = Precio
 ExtrafieldMail = Correo
 ExtrafieldUrl = Url
 ExtrafieldSelect = Lista de selección
 ExtrafieldSelectList = Lista desde una tabla
-ExtrafieldSeparator=Separador
+ExtrafieldSeparator=Separador (No es un campo)
 ExtrafieldPassword=Contraseña
+ExtrafieldRadio=Radio buttons (on choice only)
 ExtrafieldCheckBox=Casilla de verificación
-ExtrafieldRadio=Botón de selección excluyente
-ExtrafieldCheckBoxFromList= Casilla de selección de tabla
+ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Objeto adjuntado
+ComputedFormula=Campo combinado
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->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'
 ExtrafieldParamHelpselect=El listado de parámetros tiene que ser key,valor<br><br> por ejemplo:\\n<br>1,value1<br>2,value2<br>3,value3<br>...<br><br>Para tener una lista en funcion de atributos complementarios de lista:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>Para tener la lista en función de otra:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=El listado de parámetros tiene que ser key,valor<br><br> por ejemplo:\n<br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=El listado de parámetros tiene que ser key,valor<br><br> por ejemplo:\n<br>1,value1<br>2,value2<br>3,value3<br>...
@@ -422,6 +430,20 @@ Use3StepsApproval=De forma predeterminada, los pedidos a proveedor deben ser cre
 UseDoubleApproval=Usar 3 pasos de aprobación si el importe (sin IVA) es mayor que...
 WarningPHPMail=ADVERTENCIA: Algunos proveedores de correo electrónico (como Yahoo) no le permiten enviar un e-mail desde otro servidor que no sea el servidor de Yahoo si la dirección de correo electrónico utilizada como remitente es su correo e-mail de Yahoo (como myemail@yahoo.com, myemail@yahoo.fr, ...). Su configuración actual utiliza el servidor de la aplicación para enviar e-mail, por lo que algunos destinatarios (compatibles con el protocolo restrictivo DMARC) le preguntarán a Yahoo si pueden aceptar su e-mail y Yahoo responderá "no" porque el servidor no es un servidor Propiedad de Yahoo, por lo que algunos de sus e-mails enviados pueden no ser aceptados. Si su proveedor de correo electrónico (como Yahoo) tiene esta restricción, debe cambiar la configuración de e-mail para elegir el método "servidor SMTP" y introdudir el servidor SMTP y credenciales proporcionadas por su proveedor de correo electrónico (pregunte a su proveedor de correo electrónico las credenciales SMTP para su cuenta).
 ClickToShowDescription=Clic para ver la descripción
+DependsOn=Este módulo necesita los módulos
+RequiredBy=Este módulo es requerido por los módulos
+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:
+PageUrlForDefaultValuesCreate=<br>Para que el formulario cree un nuevo tercero, es <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Para la página que lista terceros, es <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=Se ha encontrado una traducción para la clave con este código, por lo que para cambiar este valor, debe editarlo desde Inicio-Configuración-Traducción.
+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=Campo
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Usuarios y grupos
 Module0Desc=Gestión de Usuarios / Empleados y grupos
@@ -444,7 +466,7 @@ Module30Desc=Gestión de facturas y abonos a clientes. Gestión facturas de prov
 Module40Name=Proveedores
 Module40Desc=Gestión de proveedores
 Module42Name=Syslog
-Module42Desc=Generación de logs (archivos, syslog,...)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Editores
 Module49Desc=Gestión de editores
 Module50Name=Productos
@@ -499,8 +521,8 @@ Module410Name=Webcalendar
 Module410Desc=Interfaz con el calendario Webcalendar
 Module500Name=Pagos especiales
 Module500Desc=Gestión de gastos especiales (impuestos, gastos sociales, dividendos)
-Module510Name=Contratos de empleados  y salarios
-Module510Desc=Gestión de contratos de empleados, salarios y pagos
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Crédito
 Module520Desc=Gestión de créditos
 Module600Name=Notificaciones
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=Capacidades de conversión GeoIP Maxmind
 Module3100Name=Skype
 Module3100Desc=Añadir un botón Skype en las fichas de usuarios/terceros/contactos/miembros
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=RRHH
-Module4000Desc=Departamento de Recursos Humanos
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi-empresa
 Module5000Desc=Permite gestionar varias empresas
 Module6000Name=Flujo de trabajo
@@ -591,7 +615,7 @@ Permission32=Crear/modificar productos
 Permission34=Eliminar productos
 Permission36=Ver/gestionar los productos ocultos
 Permission38=Exportar productos
-Permission41=Leer proyectos y tareas (proyectos compartidos y proyectos de los que soy contacto). También puede introducir tiempos consumidos en tareas asignadas.
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Crear/modificar proyectos (proyectos compartidos y proyectos de los que soy contacto). También puede crear tareas y asignar usuarios a proyectos y tareas
 Permission44=Eliminar proyectos y tareas (compartidos o soy contacto)
 Permission45=Exportar proyectos
@@ -692,9 +716,9 @@ PermissionAdvanced251=Consultar otros usuarios
 Permission252=Consultar los permisos de otros usuarios
 Permission253=Crear/modificar otros usuarios y sus permisos
 PermissionAdvanced253=Crear/modificar usuarios internos/externos y sus permisos
-Permission254=Modificar la contraseña de otros usuarios
-Permission255=Eliminar o desactivar otros usuarios
-Permission256=Consultar sus permisos
+Permission254=Crear/modificar únicamente usuarios externos
+Permission255=Modificar la contraseña de otros usuarios
+Permission256=Eliminar o desactivar otros usuarios
 Permission262=Ampliar el acceso a todos los terceros (no sólo a los terceros que el usuario es comercial).<br>No efectivo para usuarios externos (Solamente usuarios internos. Los externos están limitados a ellos mismos para presupuestos, facturas, contratos, etc.).<br>No efectivo para proyectos (solamente permisos de visión y asignación de los proyectos).
 Permission271=Consultar el CA
 Permission272=Consultar las facturas
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Métodos de pedido
 DictionarySource=Orígenes de presupuestos/pedidos
 DictionaryAccountancyCategory=Grupos cuentas contables
 DictionaryAccountancysystem=Modelos de planes contables
+DictionaryAccountancyJournal=Diarios contables
 DictionaryEMailTemplates=Plantillas E-Mails
 DictionaryUnits=Unidades
 DictionaryProspectStatus=Estado cliente potencial
 DictionaryHolidayTypes=Tipos de honorarios
 DictionaryOpportunityStatus=Estado de oportunidad para el proyecto/lead
 SetupSaved=Configuración guardada
+SetupNotSaved=Configuración no guardada
 BackToModuleList=Volver a la lista de módulos
 BackToDictionaryList=Volver a la lista de diccionarios
 VATManagement=Gestión IVA
@@ -931,6 +957,8 @@ DefaultMaxSizeList=Longitud máxima de registros en listados
 DefaultMaxSizeShortList=Longitud máxima de registros en listados
 MessageOfDay=Mensaje del día
 MessageLogin=Mensaje del login
+LoginPage=Página de login
+BackgroundImageLogin=Imagen de fondo
 PermanentLeftSearchForm=Zona de búsqueda permanente del menú izquierdo
 DefaultLanguage=Idioma por defecto a utilizar (código idioma)
 EnableMultilangInterface=Activar interfaz multi-idioma
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerancia de retraso entes de la alerta  (en días) s
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerancia de retraso entes de la alerta  (en días) sobre cheques a ingresar
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerancia de retraso entes de la alerta  (en días) sobre gastos a aprobar
 SetupDescription1=El área de configuración sirve para configurar los parámetros antes de empezar a usar Dolibarr
-SetupDescription2=Los dos pasos más importantes de configuración son los dos primeros en el menú de configuración de la izquierda: la página de configuración de la empresa/institución y la página de configuración de los módulos:
-SetupDescription3=Los parámetros de configuración del menú <a href="%s">Configuración -> Empresa/institución</a> son necesarios ya que los datos presentados se utilizan en las pantallas Dolibarr y para personalizar el comportamiento por defecto del software (para funciones relacionadas con el país, por ejemplo) .
-SetupDescription4=Los parámetros de configuración del menú <a href="%s">Configuración -> Módulos</a> son necesarios porque Dolibarr no es un ERP/CRM monolítico, sino una colección de varios módulos, todos más o menos independientes. Se añadirán nuevas funcionalidades a los menús por cada módulo que se active.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Las otras entradas de configuración gestionan parámetros opcionales.
 LogEvents=Auditoría de la seguridad de eventos
 Audit=Auditoría
@@ -987,7 +1015,7 @@ BrowserOS=S.O. del navegador
 ListOfSecurityEvents=Listado de eventos de seguridad Dolibarr
 SecurityEventsPurged=Eventos de seguridad purgados
 LogEventDesc=Puede habilitar el registro de eventos de seguridad Dolibarr aquí. Los administradores pueden ver su contenido a través de menú <b>Herramientas del sistema - Auditoría</b>.Atención, esta característica puede consumir una gran cantidad de datos en la base de datos.
-AreaForAdminOnly=Estas funciones solo son accesibles a un usuario administrador.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=La información del sistema es información técnica accesible solamente en solo lectura a los administradores.
 SystemAreaForAdminOnly=Esta área solo es accesible a los usuarios de tipo administradores. Ningún permiso Dolibarr permite extender el círculo de usuarios autorizados a esta área.
 CompanyFundationDesc=Edite en esta página toda la información conocida de la empresa o institución que necesita gestionar (Para ello haga click en el botón "Modificar" o "Grabar" a pie de página)
@@ -1079,7 +1107,8 @@ CurrentTranslationString=Cadena traducida actual
 WarningAtLeastKeyOrTranslationRequired=Se necesita un criterio de búsqueda al menos por cadena de clave o traducción
 NewTranslationStringToShow=Nueva cadena traducida a mostrar
 OriginalValueWas=La traducción original se ha sobreescrito. El valor original era:<br><br>%s
-TotalNumberOfActivatedModules=Número total de módulos activados: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=Forzó una nueva traducción para la clave de traducción '<strong>%s</strong>' que no existe en ningún archivo de idioma
+TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Debe activar al menos un módulo.
 ClassNotFoundIntoPathWarning=No se ha encontrado la clase %s en su path PHP
 YesInSummer=Sí en verano
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Reglas sobre los ID profesionales
 MustBeUnique=¿Debe ser único?
 MustBeMandatory=¿Obligatorio para crear terceros?
 MustBeInvoiceMandatory=¿Obligatorio para validar facturas?
+TechnicalServicesProvided=Servicios técnicos prestados
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Un vínculo de exportación del calendario en formato <b>%s</b> estará disponible en la url: %s
 ##### Invoices #####
 BillsSetup=Configuración del módulo Facturas
 BillsNumberingModule=Módulo de numeración de facturas y abonos
 BillsPDFModules=Modelo de documento de facturas
+PaymentsPDFModules=Modelo de documentos de pago
 CreditNote=Abono
 CreditNotes=Abonos
 ForceInvoiceDate=Forzar la fecha de factura a la fecha de validación
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Archivos de tipo %s no se almacenan en caché por el servid
 FilesOfTypeCompressed=Archivos de tipo %s son comprimidos por el servidor HTTP
 FilesOfTypeNotCompressed=Archivos de tipo %s no son comprimidos por el servidor HTTP
 CacheByServer=Caché mediante el servidor
+CacheByServerDesc=Por ejemplo utilizando la directiva Apache "ExpiresByType image/gif A2592000"
 CacheByClient=Caché mediante el navegador
 CompressionOfResources=Compresión de las respuestas HTTP
+CompressionOfResourcesDesc=For exemple using the Apache directive "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=La detección automática no es posible con el navegador actual
+DefaultValuesDesc=Puede definir/forzar aquí el valor predeterminado que desea obtener cuando cree un nuevo registro y/o defina filtros u ordenaciones en sus registros de listados.
+DefaultCreateForm=Valores por defecto para nuevos objetos
+DefaultSearchFilters=Filtros de búsqueda por defecto
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Configuración del módulo Productos
 ServiceSetup=Configuración del módulo Servicios
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Establecer por defecto este estado de eventos en el
 AGENDA_DEFAULT_VIEW=Establecer la pestaña por defecto al seleccionar el menú Agenda
 AGENDA_NOTIFICATION=Activar notificación de eventos en el navegador cuando se alcanza la fecha del evento (el usuario puede rechazar las notificaciones en la pregunta de confirmación del explorador)
 AGENDA_NOTIFICATION_SOUND=Activar sonido de notificación
+AGENDA_SHOW_LINKED_OBJECT=Mostrar el link en la agenda
 ##### Clicktodial #####
 ClickToDialSetup=Configuración del módulo Click To Dial
-ClickToDialUrlDesc=URL de llamada haciendo click en el icono teléfono. <br>La URL completa de llamada será: URL?login=...&password=...&caller=...&called=telellamada
+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=Este módulo permite hacer clicables los números de teléfono. Un clic en este icono hará que su teléfono llame al número de teléfono. Esto puede ser usado para llamar a un sistema de centralitas desde Dolibarr que puede llamar al número de teléfono en un sistema SIP, por ejemplo.
 ClickToDialUseTelLink=Utilice el enlace "tel:" que aparece en los números de teléfono
 ClickToDialUseTelLinkDesc=Utilice este método si los usuarios tienen un softphone o una interfaz de software instalado en mismo equipo que el navegador, y se llama al hacer clic en un enlace en el navegador que comienza con "tel:". Si necesita una solución de servidor completa (sin necesidad de instalación de software local), debe establecer este en "No" y rellenar siguiente campo.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=Orden de visualización general
 BankOrderES=Español
 BankOrderESDesc=Orden de visualización español
 ChequeReceiptsNumberingModule=Módulo de numeración de las remesas de cheques
-
 ##### Multicompany #####
 MultiCompanySetup=Configuración del módulo Multi-empresa
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ BackupDumpWizard=Asistente para crear una copia de seguridad de la base de datos
 SomethingMakeInstallFromWebNotPossible=No es posible la instalación de módulos externos desde la interfaz web por la siguiente razón:
 SomethingMakeInstallFromWebNotPossible2=Por esta razón, explicaremos aquí los pasos del proceso de actualización manual que puede realizar un usuario con privilegios. 
 InstallModuleFromWebHasBeenDisabledByFile=La instalación de módulos externos desde la aplicación se encuentra desactivada por el administrador. Debe requerirle que elimine el archivo <strong>%s</strong> para habilitar esta funcionalidad.
-ConfFileMuseContainCustom=Instalar un módulo externo desde la aplicación guarda los archivos del módulo en el directorio <strong>%s</strong>. Para permitir a Dolibarr el procesamiento de dicho directorio, debe configurar su <strong>conf/conf.php</strong> añadiento 2 líneas de directivas:<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=Resaltar líneas de los listados cuando el ratón pasa por encima de ellas
 HighlightLinesColor=Resalta el color de la línea cuando el ratón pasa por encima (mantener vacío para no resaltar)
 TextTitleColor=Color para la página de título
 LinkColor=Color para los enlaces
-PressF5AfterChangingThis=Para que sea eficaz el cambio, presione F5 en el teclado o borre la memoria caché del navegador después de cambiar este valor
+PressF5AfterChangingThis=Para que sea eficaz el cambio, presione CTRL+F5 en el teclado o borre la memoria caché del navegador después de cambiar este valor
 NotSupportedByAllThemes=Funciona con temas del core, puede no funcionar con temas externos
 BackgroundColor=Color de fondo
 TopMenuBackgroundColor=Color de fondo para el Menú superior
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Período mínimo de notificación (Su solicitud de licencia
 NbAddedAutomatically=Número de días adicionales que se añaden automáticamente a los contadores de usuarios cada mes
 EnterAnyCode=Este campo contiene una referencia para identificar la línea. Introduzca cualquier valor de su elección, pero sin caracteres especiales.
 UnicodeCurrency=Ingrese aquí entre llaves, lista con número de byte que representa el símbolo de moneda. Por ejemplo: para $, introduzca [36] - para Brasil Real R$ [82,36] - para €, introduzca [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Posición de la línea en listas de combo
 SellTaxRate=Tasa de IVA
 RecuperableOnly=Sí para el IVA "Non Perçue Récupérable" usados en algunas provincias en Francia. Mantenga el valor a "No" en los demás casos.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=Si se utiliza un módulo multi-empresa, con la o
 ModuleEnabledAdminMustCheckRights=El módulo ha sido activado. Los permisos para los módulos activados se dan solamente a los usuarios administradores. Deberá otorgar permisos manualmente a otros usuarios si es necesario.
 UserHasNoPermissions=Este usuario no tiene permisos definidos
 TypeCdr=Use "Ninguno" si la fecha del plazo de pago es la fecha de factura más un delta en días (delta es el campo "Nº de días")<br>Use "A final de mes", si, después del delta, la fecha debe aumentarse para llegar al final del mes (+ opcional "Offset" en días)<br>Use "Actual/Siguiente" para tener la fecha del plazo de pago sea el primer N de cada mes (N se almacena en el campo "Nº de días")
+BaseCurrency=Moneda de referencia de la empresa (entrar en la configuración de la empresa para cambiar esto)
+WarningNoteModuleInvoiceForFrenchLaw=Este módulo %s cumple con las leyes francesas (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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuración del módulo Recursos
 UseSearchToSelectResource=Utilice un formulario de búsqueda para elegir un recurso (en lugar de una lista desplegable).
diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang
index 456531fed7c..46ad0d6c4b5 100644
--- a/htdocs/langs/es_ES/compta.lang
+++ b/htdocs/langs/es_ES/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Los importes obtenidos se calculan según
 Param=Parametrizaje
 RemainingAmountPayment=Importe restante del pago :
 Account=Cuenta
-Accountparent=Raíz de la cuenta
-Accountsparent=Raíz de las cuentas
+Accountparent=Cuenta padre
+Accountsparent=Cuentas padre
 Income=Ingresos
 Outcome=Gastos
 ReportInOut=Resultado / Ejercicio
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Impuestos y cargas
 MenuSocialContributions=Impuestos sociales/fiscales
 MenuNewSocialContribution=Nueva tasa
 NewSocialContribution=Nueva tasa social/fiscal
+AddSocialContribution=Añadir tasa social/fiscal
 ContributionsToPay=Tasas sociales/fiscales a pagar
 AccountancyTreasuryArea=Área contabilidad/tesorería
 NewPayment=Nuevo pago
@@ -169,7 +170,7 @@ DescSellsJournal=Diario de ventas
 DescPurchasesJournal=Diario de compras
 InvoiceRef=Ref. factura
 CodeNotDef=No definido
-WarningDepositsNotIncluded=Las facturas de anticipo aún no están incluidas en esta versión en el módulo de contabilidad.
+WarningDepositsNotIncluded=Las facturas de anticipo no se encuentran incluidas en esta versión con este módulo de contabilidad
 DatePaymentTermCantBeLowerThanObjectDate=La fecha límite de pago no puede ser inferior a la fecha del objeto
 Pcg_version=Modelos de planes contables
 Pcg_type=Tipo de cuenta
@@ -189,8 +190,10 @@ AccountancyJournal=Código contable diario
 ACCOUNTING_VAT_SOLD_ACCOUNT=Cuenta contable por defecto para el IVA de ventas (usado si no se define en el diccionario de IVA)
 ACCOUNTING_VAT_BUY_ACCOUNT=Cuenta contable por defecto para el IVA de compras (usado si no se define en el diccionario de IVA)
 ACCOUNTING_VAT_PAY_ACCOUNT=Código contable por defecto para el pago de IVA
-ACCOUNTING_ACCOUNT_CUSTOMER=Cuenta contable por defecto para terceros clientes (usado si no se define en la fecha del tercero)
-ACCOUNTING_ACCOUNT_SUPPLIER=Cuenta contable por defecto para terceros proveedores (usado si no se define en la fecha del tercero)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clonar una tasa social/fiscal
 ConfirmCloneTax=Confirmar la clonación de una tasa social/fiscal
 CloneTaxForNextMonth=Clonarla para el próximo mes
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Impuestos sociales/fiscales
 ImportDataset_tax_vat=Pagos IVA
 ErrorBankAccountNotFound=Error: No se encuentra la cuenta bancaria
 FiscalPeriod=Periodo contable
+ListSocialContributionAssociatedProject=Listado de contribuciones sociales asociadas al proyecto
diff --git a/htdocs/langs/es_ES/cron.lang b/htdocs/langs/es_ES/cron.lang
index ee687c18e0c..139b0f5df66 100644
--- a/htdocs/langs/es_ES/cron.lang
+++ b/htdocs/langs/es_ES/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Borrar tareas programadas
 CronConfirmDelete=¿Está seguro de querer eliminar esta tarea programada?
 CronExecute=Ejecutar tarea programada
 CronConfirmExecute=¿Está seguro de querer ejecutar esta tarea programada ahora?
-CronInfo=Tareas programadas le permite ejecutar tareas que han sido programadas
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Tarea
 CronNone=Ninguna
 CronDtStart=No antes de
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Activo
 CronStatusInactiveBtn=Inactivo
 CronTaskInactive=Esta tarea esta inactiva
 CronId=Id
-CronClassFile=Clases (nombre archivo)
-CronModuleHelp=Nombre del directorio del módulo Dolibarr (también funciona con módulos externos). <BR> Por ejemplo, para realizar un fetch del objeto Product /htdocs/<u>product</u>/class/product.class.php, el valor del módulo es <i>product</i>
-CronClassFileHelp=El nombre del archivo a cargar. <BR> Por ejemplo para realizar un fetch del objeto Product /htdocs/product/class/<u>product.class.php</u>, el valor del nombre del archivo de la clase es <i>product.class.php</i>
-CronObjectHelp=El nombre del objeto a cargar. <BR> Por ejemplo para realizar un fetch del objeto Product /htdocs/product/class/product.class.php, el valor del nombre de la clase es <i>Product</i>
-CronMethodHelp=El métpdp a lanzar. <BR> Por ejemplo para realizar un fetch del objeto Product /htdocs/product/class/product.class.php, el valor del método es <i>fecth</i>
-CronArgsHelp=Los argumentos del método. <BR> Por ejemplo para realizar un fetch del objeto Product /htdocs/product/class/product.class.php, los valores pueden ser <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=El comando en línea del sistema a ejecutar.
 CronCreateJob=Crear nueva tarea programada
 CronFrom=De
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Vaya al menú "Inicio - Utilidades administraci
 JobDisabled=Tarea desactivada
 MakeLocalDatabaseDumpShort=Copia local de la base de datos
 MakeLocalDatabaseDump=Crear una copia local de la base de datos
-WarningCronDelayed=Atención: para mejorar el rendimiento, cualquiera que sea la próxima fecha de ejecución de las tareas activas, sus tareas pueden retrasarse un máximo de %s horas antes de ejecutarse
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang
index 7d796640d9b..cb42a47455c 100644
--- a/htdocs/langs/es_ES/errors.lang
+++ b/htdocs/langs/es_ES/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Error al crear el archivo  '<b>%s</b>'
 ErrorFailToRenameDir=Error al renombrar el directorio '<b>%s</b>' a '<b>%s</b>'.
 ErrorFailToCreateDir=Error al crear el directorio '<b>%s</b>'
 ErrorFailToDeleteDir=Error al eliminar el directorio '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=Este contacto ya está definido como contacto para este tipo.
 ErrorCashAccountAcceptsOnlyCashMoney=Esta cuenta bancaria es de tipo caja y sólo acepta pagos en efectivo.
 ErrorFromToAccountsMustDiffers=La cuenta origen y destino deben ser diferentes.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Imposible escribir en el directorio %s
 ErrorFoundBadEmailInFile=Encontrada sintaxis incorrecta en email en %s líneas en archivo (ejemplo linea %s con email=%s)
 ErrorUserCannotBeDelete=No puede eliminarse el usuario. Es posible que esté asociado a items de Dolibarr
 ErrorFieldsRequired=No se indicaron algunos campos obligatorios
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Error en la creación de un directorio. Compruebe que el usuario del servidor Web tiene derechos de escritura en los directorios de documentos de Dolibarr. Si el  parámetro <b>safe_mode</b> está activo en este PHP, Compruebe que los archivos php Dolibarr pertenecen al usuario del servidor Web.
 ErrorNoMailDefinedForThisUser=E-Mail no definido para este usuario
 ErrorFeatureNeedJavascript=Esta funcionalidad precisa de javascript activo para funcionar. Modifique en configuración->entorno.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Las cantidades en las líneas de factur
 ErrorWebServerUserHasNotPermission=La cuenta de ejecución del servidor web <b>%s</b> no dispone de los permisos para esto
 ErrorNoActivatedBarcode=No hay activado ningún tipo de código de barras
 ErrUnzipFails=No se ha podido descomprimir el archivo %s con ZipArchive
-ErrNoZipEngine=En este PHP no hay motor para descomprimir el archivo %s
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=El archivo %s debe ser un paquete Dolibarr en formato zip
 ErrorModuleFileRequired=Debe seleccionar un archivo de módulo Dolibarr
 ErrorPhpCurlNotInstalled=La extensión PHP CURL no se encuentra instalada, es indispensable para dialogar con Paypal.
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=Sin variable global seleccionada
 ErrorFieldMustBeANumeric=El campo <b>%s</b> debe contener un valor numérico
 ErrorMandatoryParametersNotProvided=Los parámetro(s) obligatorio(s) no están todavía definidos
 ErrorOppStatusRequiredIfAmount=Ha indicado un importe estimado para esta oportunidad/lead. Debe indicar también su estado
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Definición incorrecta de la matriz de menú en el descriptor del módulo (valor incorrecto para la clave fk_menu)
 ErrorSavingChanges=Ha ocurrido un error al guardar los cambios
 ErrorWarehouseRequiredIntoShipmentLine=El almacén es obligatorio en la línea a enviar
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=No hay stock suficiente del producto
 ErrorStockIsNotEnoughToAddProductOnProposal=No hay stock suficiente del producto %s para añadirlo a un nuevo presupuesto.
 ErrorFailedToLoadLoginFileForMode=Error al obtener la clave de acceso para el modo '%s'.
 ErrorModuleNotFound=No se ha encontrado el archivo del módulo.
-ErrorFieldAccountNotDefinedForBankLine=Valor para la cuenta contable no definida para la línea bancaria origen %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, el nombre de estado de la cuenta bancaria debe seguir la siguiente regla de sintaxis %s
 ErrorPhpMailDelivery=Compruebe que no use un número demasiado alto de destinatarios y que su contenido de correo electrónico no sea similar a un Spam. Pida también a su administrador que verifique el cortafuegos y los archivos  de los registros del servidor para obtener una información más completa.
 ErrorUserNotAssignedToTask=El usuario debe ser asignado a la tarea para que pueda ingresar tiempo consumido.
 ErrorTaskAlreadyAssigned=Tarea ya asignada al usuario
 ErrorModuleFileSeemsToHaveAWrongFormat=Parece que el módulo tiene un formato incorrecto.
 ErrorFilenameDosNotMatchDolibarrPackageRules=El nombre del archivo del módulo  (<strong>%s</strong>) no coincide coincide con la sintaxis del nombre esperado: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, nombre de trigger %s duplicado. Ya se encuentra cargado desde %s
+ErrorNoWarehouseDefined=Error, no hay definidos almacenes.
+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.
 
 # Warnings
 WarningPasswordSetWithNoAccount=Se fijó una contraseña para este miembro. Sin embargo, no se ha creado ninguna cuenta de usuario. Así que esta contraseña no se puede utilizar para acceder a Dolibarr. Puede ser utilizada por un módulo/interfaz externo, pero si no necesitar definir accesos de un miembro, puede desactivar la opción "Administrar un inicio de sesión para cada miembro" en la configuración del módulo miembros. Si necesita administrar un inicio de sesión, pero no necesita ninguna contraseña, puede dejar este campo vacío para evitar esta advertencia. Nota: También puede usarse el correo electrónico como inicio de sesión si el miembro está vinculada a un usuario.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=La fecha de pago (%s) es anterior a la fe
 WarningTooManyDataPleaseUseMoreFilters=Demasiados datos (más de %s líneas). Utilice más filtros o establezca la constante %s a un límite más alto.
 WarningSomeLinesWithNullHourlyRate=Algunas veces se realizaron registrod a usuarios, con su precio por hora sin definir. Se utilizó un valor de 0 %s por hora, esto puede dar lugar a la valoración incorrecta del tiempo invertido.
 WarningYourLoginWasModifiedPleaseLogin=Su cuenta de acceso ha sido modificada. Por razones de seguridad, tendrá que iniciar sesión con su nuevo acceso antes de la próxima acción.
+WarningAnEntryAlreadyExistForTransKey=Ya existe una entrada para la clave de traducción para este idioma
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index 51fb01ec308..6c2cb78990b 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -153,6 +153,7 @@ Edit=Editar
 Validate=Validar
 ValidateAndApprove=Validar y Aprobar
 ToValidate=A validar
+NotValidated=No validado
 Save=Grabar
 SaveAs=Grabar como
 TestConnection=Probar la conexión
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=Sin funcionalidades de desconexión con el modo de a
 Connection=Conexión
 Setup=Configuración
 Alert=Alerta
+MenuWarnings=Alertas
 Previous=Anterior
 Next=Siguiente
 Cards=Fichas
@@ -308,6 +310,7 @@ Copy=Copiar
 Paste=Pegar
 Default=Predeterminado
 DefaultValue=Valor por defecto
+DefaultValues=Valores por defecto
 Price=Precio
 UnitPrice=Precio unitario
 UnitPriceHT=Precio base
@@ -363,7 +366,8 @@ VATRate=Tasa IVA
 Average=Media
 Sum=Suma
 Delta=Diferencia
-Module=Módulo
+Module=Module/Application
+Modules=Modules/Applications
 Option=Opción
 List=Listado
 FullList=Listado completo
@@ -387,7 +391,7 @@ ActionRunningNotStarted=No empezado
 ActionRunningShort=En progreso
 ActionDoneShort=Terminado
 ActionUncomplete=Incompleto
-CompanyFoundation=Empresa o institución
+CompanyFoundation=Empresa/Institución
 ContactsForCompany=Contactos de este tercero
 ContactsAddressesForCompany=Contactos/direcciones de este tercero
 AddressesForCompany=Direcciones de este tercero
@@ -407,6 +411,7 @@ TotalDuration=Duración total
 Summary=Resumen
 DolibarrStateBoard=Estadísticas
 DolibarrWorkBoard=Indicadores de trabajo
+NoOpenedElementToProcess=Sin elementos a procesar
 Available=Disponible
 NotYetAvailable=Aún no disponible
 NotAvailable=No disponible
@@ -434,7 +439,7 @@ Reportings=Informes
 Draft=Borrador
 Drafts=Borradores
 Validated=Validado
-Opened=Abierto
+Opened=Activo
 New=Nuevo
 Discount=Descuento
 Unknown=Desconocido
@@ -453,6 +458,7 @@ NextStep=Siguiente paso
 Datas=Datos
 None=Nada
 NoneF=Ninguna
+NoneOrSeveral=Ninguno o varios
 Late=Retraso
 LateDesc=El retraso que indica si un registro lleva retraso o no depende de la configuración. Pregunte a su administrador para cambiar el retraso desde el menú Inicio - Configuración - Alertas.
 Photo=Foto
@@ -606,7 +612,8 @@ PartialWoman=Parcial
 TotalWoman=Total
 NeverReceived=Nunca recibido
 Canceled=Cancelado
-YouCanChangeValuesForThisListFromDictionarySetup=Puede cambiar estos valores en el menú configuración->diccionarios
+YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu Setup - Dictionaries
+YouCanChangeValuesForThisListFrom=You can change values for this list from menu %s
 YouCanSetDefaultValueInModuleSetup=Puede establecer el valor predeterminado que se utiliza cuando se crea un nuevo registro en la configuración del módulo
 Color=Color
 Documents=Documentos
@@ -642,11 +649,12 @@ FreeLineOfType=Entrada libre del tipo
 CloneMainAttributes=Clonar el objeto con estos atributos principales
 PDFMerge=Fusión PDF
 Merge=Fusión
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Mostrar página de impresión de la zona central
 MenuManager=Gestor de menú
 WarningYouAreInMaintenanceMode=Atención, está en modo mantenimiento, así que solamente el login <b>%s</b> está autorizado para utilizar la aplicación en este momento.
 CoreErrorTitle=Error del sistema
-CoreErrorMessage=Lo sentimos, pero ha ocurrido un error. Póngase en contacto con el administrador del sistema para comprobar los registros o desactivar dolibarr_main_prod $ = 1 para obtener más información.
+CoreErrorMessage=Lo sentimos, pero ha ocurrido un error. Póngase en contacto con el administrador del sistema para comprobar los registros o desactive $dolibarr_main_prod=1 para obtener más información.
 CreditCard=Tarjeta de crédito
 FieldsWithAreMandatory=Los campos marcados por un <b>%s</b> son obligatorios
 FieldsWithIsForPublic=Los campos marcados por <b>%s</b> se mostrarán en la lista pública de miembros. Si no desea verlos, desactive la casilla "público".
@@ -708,6 +716,7 @@ from=de
 toward=hacia
 Access=Acceso
 SelectAction=Seleccione acción
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Use Ctrl+C para copiar al portapapeles
 SaveUploadedFileWithMask=Guardar el archivo con el nombre "<strong>%s</strong>" (sino "%s")
 OriginFileName=Nombre del archivo origen
@@ -718,7 +727,7 @@ ViewPrivateNote=Ver notas
 XMoreLines=%s línea(s) ocultas
 PublicUrl=URL pública
 AddBox=Añadir caja
-SelectElementAndClickRefresh=Seleccione un elemento y haga clic en Refrescar
+SelectElementAndClick=Select an element and click %s
 PrintFile=Imprimir Archivo %s
 ShowTransaction=Mostrar registro en la cuenta bancaria
 GoIntoSetupToChangeLogo=Vaya a Inicio->Configuración->Empresa/Institución para cambiar el logo o vaya a Inicio->Configuración->Entorno para ocultarlo
@@ -734,8 +743,8 @@ Hello=Hola
 Sincerely=Atentamente
 DeleteLine=Eliminación de línea
 ConfirmDeleteLine=¿Está seguro de querer eliminar esta línea?
-NoPDFAvailableForDocGenAmongChecked=Sin PDF disponibles para la generación de documentos entre los registros seleccionados
-TooManyRecordForMassAction=Demasiados registros seleccionados para la acción masiva. La acción está restringida a un listado de %s registros.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=Sin registros seleccionados
 MassFilesArea=Área de archivos generados por acciones masivas
 ShowTempMassFilesArea=Mostrar área de archivos generados por acciones masivas
@@ -755,11 +764,20 @@ Calendar=Calendario
 GroupBy=Agrupado por...
 ViewFlatList=Ver lista plana
 RemoveString=Eliminar cadena '%s'
-SomeTranslationAreUncomplete=Algunos idiomas pueden estar parcialmente traducidos o pueden contener errores. Si detecta algunos, puede arreglar los archivos de idiomas registrándose en <a href="http://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Enlace de descarga directa
 Download=Descargar
 ActualizeCurrency=Actualizar el tipo de cambio
 Fiscalyear=Año fiscal
+ModuleBuilder=Módulo Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Acciones masivas
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Lunes
 Tuesday=Martes
@@ -817,5 +835,3 @@ SearchIntoContracts=Contratos
 SearchIntoCustomerShipments=Envíos a clientes
 SearchIntoExpenseReports=Informes de gastos
 SearchIntoLeaves=Permisos
-
-BulkActions=Acciones masivas
diff --git a/htdocs/langs/es_ES/other.lang b/htdocs/langs/es_ES/other.lang
index 4005a5253aa..cd4ed4facc7 100644
--- a/htdocs/langs/es_ES/other.lang
+++ b/htdocs/langs/es_ES/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Fecha de cumpleaños
 DateToBirth=Fecha de nacimiento
 BirthdayAlertOn=alerta aniversario activada
 BirthdayAlertOff=alerta aniversario desactivada
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Contacto añadido a intervención
 Notify_FICHINTER_VALIDATE=Validación ficha intervención
 Notify_FICHINTER_SENTBYMAIL=Envío ficha de intervención por e-mail
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=Esto es un e-mail de <b>prueba</b>(la palabra prueba debe
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nLe adjuntamos la factura __REF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=Buenos días, __CONTACTCIVNAME__ \n\n Nos ponemos en contacto con usted ya que la factura __REF__ parece no estar pagada.\n\n Ante cualquier duda, consúltenos y será atendido a la mayor brevedad posible.\n\n __PERSONALIZED__Cordialmente\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nLe adjuntamos el presupuesto __PROPREF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__ \n\nAquí encontrará la petición de presupuesto __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n __SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nLe adjuntamos el pedido __ORDERREF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nLe adjuntamos nuestro pedido __ORDERREF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nLe adjuntamos la factura __REF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nLe adjuntamos el envío __SHIPPINGREF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nLe adjuntamos la intervención __FICHINTERREF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr es un ERP/CRM para la gestión de negocios (profesionales o asociaciones), compuesto de módulos funcionales independientes y opcionales. Una demostración que incluya todos estos módulos no tiene sentido porque no utilizará todos los módulos. Además, tiene disponibles varios tipos de perfiles de demostración.
 ChooseYourDemoProfil=Elija el perfil de demostración que mejor se adapte a sus necesidades ...
 ChooseYourDemoProfilMore=... o construya su perfil<br>(modo de selección manual)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=El modo de autenticación es <b>%s</b>
 EnableGDLibraryDesc=Instale o active la libreria GD en su PHP para poder usar esta opción
 ProfIdShortDesc=<b>Prof Id %s</b> es una información dependiente del país del tercero.<br>Por ejemplo, para el país  <b>%s</b>, és el código <b>%s</b>.
 DolibarrDemo=Demo de Dolibarr ERP/CRM
-StatsByNumberOfUnits=Estadísticas en número de unidades de producto/servicio
-StatsByNumberOfEntities=Estadísticas en número de identidades referentes
-NumberOfProposals=Número de presupuestos ac clientes en los últimos 12 meses
-NumberOfCustomerOrders=Número de pedidos de clientes en los últimos 12 meses
-NumberOfCustomerInvoices=Número de facturas a clientes en los últimos 12 meses
-NumberOfSupplierProposals=Número de presupuestos de proveedores en los últimos 12 meses
-NumberOfSupplierOrders=Número de facturas de proveedores en los últimos 12 meses
-NumberOfSupplierInvoices=Número de facturas de proveedores en los últimos 12 meses
-NumberOfUnitsProposals=Número de unidades en los presupuestos a clientes en los últimos 12 meses
-NumberOfUnitsCustomerOrders=Número de unidades en los pedidos de clientes en los últimos 12 meses
-NumberOfUnitsCustomerInvoices=Número de unidades en las facturas a clientes en los últimos 12 meses
-NumberOfUnitsSupplierProposals=Número de unidades en los presupuestos de proveedores en los últimos 12 meses
-NumberOfUnitsSupplierOrders=Número de unidades en las facturas de proveedores en los últimos 12 meses
-NumberOfUnitsSupplierInvoices=Número de unidades en las facturas de proveedores en los últimos 12 meses
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=Se le ha asignado la intervención %s
 EMailTextInterventionValidated=Ficha intervención %s validada
 EMailTextInvoiceValidated=Factura %s validada
diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang
index 801aab5eeb5..d6dc9fc5f4a 100644
--- a/htdocs/langs/es_ES/projects.lang
+++ b/htdocs/langs/es_ES/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Área Proyectos
 ProjectStatus=Estado del proyecto
 SharedProject=Proyecto compartido
 PrivateProject=Contactos proyecto
+ProjectsImContactFor=Proyectos de los que soy contacto explícito
+AllAllowedProjects=Todos los proyectos que puedo leer (míos + públicos)
+AllProjects=Todos los proyectos
 MyProjectsDesc=Esta vista muestra aquellos proyectos en los que usted es un contacto afectado (cualquier tipo).
 ProjectsPublicDesc=Esta vista muestra todos los proyectos a los que usted tiene derecho a visualizar.
 TasksOnProjectsPublicDesc=Esta vista muestra todos los proyectos a los que tiene derecho a visualizar.
@@ -23,6 +26,7 @@ TasksDesc=Esta vista muestra todos los proyectos y tareas (sus permisos de usuar
 AllTaskVisibleButEditIfYouAreAssigned=Todas las tareas de este proyecto son visibles, pero solo puede indicar tiempos en las tareas que tenga asignadas. Asignese tareas si desea indicar tiempos en ellas.
 OnlyYourTaskAreVisible=Sólo puede ver tareas que le son asignadas. Asignese tareas si no son visibles y desea indicar tiempos en ellas.
 ImportDatasetTasks=Tareas de proyectos
+ProjectCategories=Etiquetas/categorías de proyectos
 NewProject=Nuevo proyecto
 AddProject=Crear proyecto
 DeleteAProject=Eliminar un proyecto
@@ -31,12 +35,13 @@ ConfirmDeleteAProject=¿Está seguro de querer eliminar este proyecto?
 ConfirmDeleteATask=¿Está usted seguro de querer eliminar esta tarea?
 OpenedProjects=Proyectos abiertos
 OpenedTasks=Tareas abiertas
-OpportunitiesStatusForOpenedProjects=Importe oportunidades de proyectos abiertos por estado
+OpportunitiesStatusForOpenedProjects=Importe oportunidades de proyectos por estado
 OpportunitiesStatusForProjects=Importe oportunidades de proyectos por estado
 ShowProject=Ver proyecto
 SetProject=Definir proyecto
 NoProject=Ningún proyecto definido
 NbOfProjects=Nº de proyectos
+NbOfTasks=Nb of tasks
 TimeSpent=Tiempo dedicado
 TimeSpentByYou=Tiempo dedicado por usted
 TimeSpentByUser=Tiempo dedicado por usuario
@@ -49,7 +54,7 @@ TaskTimeNote=Nota
 TaskTimeDate=Fecha
 TasksOnOpenedProject=Tareas en proyectos abiertos
 WorkloadNotDefined=Carga de trabajo no definida
-NewTimeSpent=Nuevo  tiempo dedicado
+NewTimeSpent=Tiempos dedicados
 MyTimeSpent=Mi tiempo dedicado
 Tasks=Tareas
 Task=Tarea
@@ -59,6 +64,7 @@ TaskDescription=Descripción tarea
 NewTask=Nueva tarea
 AddTask=Crear tarea
 AddTimeSpent=Añadir tiempo dedicado
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Actividad
 Activities=Tareas/actividades
 MyActivities=Mis tareas/actividades
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=Listado de facturas predefinidas asociad
 ListSupplierOrdersAssociatedProject=Listado de pedidos a proveedor asociados al proyecto
 ListSupplierInvoicesAssociatedProject=Listado de facturas de proveedores asociadas al proyecto
 ListContractAssociatedProject=Listado de contratos asociados al proyecto
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=Listado de intervenciones asociadas al proyecto
 ListExpenseReportsAssociatedProject=Listado de informes de gastos asociados al proyecto
 ListDonationsAssociatedProject=Listado de donaciones asociadas al proyecto
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Está seguro de querer reabrir este proyecto?
 ProjectContact=Contactos proyecto
 ActionsOnProject=Eventos del proyecto
 YouAreNotContactOfProject=Usted no es contacto de este proyecto privado
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Eliminación de tiempo dedicado
 ConfirmDeleteATimeSpent=¿Está seguro de querer eliminar este tiempo dedicado?
 DoNotShowMyTasksOnly=Ver también tareas no asignadas a mí
@@ -110,7 +118,7 @@ TaskRessourceLinks=Recursos
 ProjectsDedicatedToThisThirdParty=Proyectos dedicados a este tercero
 NoTasks=Ninguna tarea para este proyecto
 LinkedToAnotherCompany=Enlazado a otra empresa
-TaskIsNotAffectedToYou=Tarea no asignada a usted
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=No se ha establecido el tiempo consumido
 ThisWillAlsoRemoveTasks=Esta operación también destruirá las tareas del proyecto (<b>%s</b> tareas) y sus tiempos dedicados.
 IfNeedToUseOhterObjectKeepEmpty=Si los elementos (factura, pedido, ...) pertenecen a un tercero que no és el seleccionado, debiendo estos estar ligados al proyecto a crear, déjelo vacío para permitir el proyecto a multi-terceros.
@@ -161,25 +169,30 @@ FirstAddRessourceToAllocateTime=Asignar un usuario a la tarea para asignar tiemp
 InputPerDay=Entrada por día
 InputPerWeek=Entrada por semana
 InputPerAction=Entrada por acción
-TimeAlreadyRecorded=Tiempo dedicado ya registrado para esta tarea/día y usuario %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Proyectos con este usuario como contacto
 TasksWithThisUserAsContact=Tareas asignadas a este usuario
 ResourceNotAssignedToProject=No asignado al proyecto
 ResourceNotAssignedToTheTask=No asignado a la tarea
+TasksAssignedTo=Tareas asignadas a
 AssignTaskToMe=Asignarme tarea
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Asignar
 ProjectOverview=Resumen
 ManageTasks=Usar proyectos para seguir tareas y tiempos
 ManageOpportunitiesStatus=Usar proyectos para seguir leads/oportunidades
 ProjectNbProjectByMonth=Nº de proyectos creados por mes
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Importe de oportunidades por mes
 ProjectWeightedOppAmountOfProjectsByMonth=Importe medio oportinidades por mes
 ProjectOpenedProjectByOppStatus=Proyectos/oportunidades abiertos por estado oportunidad
 ProjectsStatistics=Estadísticas de proyectos/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Tarea asignada. Debería poder introducir tiempos en esta tarea.
 IdTaskTime=Id
 YouCanCompleteRef=Si desea completar la referencia con alguna información (para usarlo como filtros de búsqueda), se recomienda añadir un caracter - para separarlo, la numeración automática seguirá funcionando correctamente para los próximos proyectos. Por ejemplo %s-ABC. También puede preferir añadir claves de búsqueda en la etiqueta. Pero la mejor práctica puede ser añadir un campo dedicado, también llamados atributos adicionales.
-OpenedProjectsByThirdparties=Proyectos abiertos de terceros
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Solamente oportunidades
 OpenedOpportunitiesShort=Oportunidades abiertas
 NotAnOpportunityShort=No es una oportunidad
diff --git a/htdocs/langs/es_MX/accountancy.lang b/htdocs/langs/es_MX/accountancy.lang
index 3978dde395b..ccf0f375279 100644
--- a/htdocs/langs/es_MX/accountancy.lang
+++ b/htdocs/langs/es_MX/accountancy.lang
@@ -1,245 +1,39 @@
-# Dolibarr language file - en_US - Accounting Expert
+# Dolibarr language file - Source file is en_US - accountancy
 ACCOUNTING_EXPORT_SEPARATORCSV=Separador de columnas para el archivo de exportación
 ACCOUNTING_EXPORT_DATE=Formato de fecha para el archivo de exportación
 ACCOUNTING_EXPORT_PIECE=Exportar el número de pieza
 ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Exportación con cuenta global
-ACCOUNTING_EXPORT_LABEL=Exportar etiqueta
-ACCOUNTING_EXPORT_AMOUNT=Exportar importe
 ACCOUNTING_EXPORT_DEVISE=Exportar moneda
-Selectformat=Seleccione el formato del archivo
-ACCOUNTING_EXPORT_PREFIX_SPEC=Especifique el prefijo del nombre de archivo
-ThisService=This service
-ThisProduct=This product
-DefaultForService=Default for service
-DefaultForProduct=Default for product
-CantSuggest=Can't suggest
-AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Configuración del módulo contable
-Journalization=Journalization
-Journaux=Diarios
-JournalFinancial=Diarios financieros
-BackToChartofaccounts=Volver al plan contable
-Chartofaccounts=Chart of accounts
-CurrentDedicatedAccountingAccount=Current dedicated account
-AssignDedicatedAccountingAccount=New account to assign
-InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
-OtherInfo=Other information
-
-AccountancyArea=Accountancy area
-AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
-AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
-AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
-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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
-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.
-
-MenuAccountancy=Accountancy
-Selectchartofaccounts=Select active chart of accounts
-ChangeAndLoad=Change and load
-Addanaccount=Añadir una cuenta contable
-AccountAccounting=Cuenta contable
-AccountAccountingShort=Cuenta
-AccountAccountingSuggest=Cuenta contable sugerida
-MenuDefaultAccounts=Default accounts
-MenuVatAccounts=Vat accounts
-MenuTaxAccounts=Tax accounts
-MenuExpenseReportAccounts=Expense report accounts
-MenuLoanAccounts=Loan accounts
-MenuProductsAccounts=Product accounts
-ProductsBinding=Products accounts
+Selectchartofaccounts=Seleccionar gráfico activo de cuentas
 Ventilation=Agregando a cuentas
 CustomersVentilation=Agregar factura de cliente
 SuppliersVentilation=Agregar factura de proveedor
-ExpenseReportsVentilation=Expense report binding
-CreateMvts=Create new transaction
-UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=Libro mayor
-AccountBalance=Account balance
-
+CreateMvts=Crear nueva transaccion
+UpdateMvts=Modificación de una transacción
 CAHTF=Total de compra al proveedor antes de impuestos
-TotalExpenseReport=Total expense report
-InvoiceLines=Lines of invoices to bind
-InvoiceLinesDone=Bound lines of invoices
-ExpenseReportLines=Lines of expense reports to bind
-ExpenseReportLinesDone=Bound lines of expense reports
-IntoAccount=Bind line with the accounting account
-
-
-Ventilate=Bind
-LineId=Id line
+IntoAccount=Unir partida con la cuenta contable
+Ventilate=Agregar
 Processing=Procesando
-EndProcessing=Process terminated.
+EndProcessing=Proceso terminado
 SelectedLines=Partidas seleccionadas
 Lineofinvoice=Partida de factura
-LineOfExpenseReport=Line of expense report
-NoAccountSelected=No accounting account selected
-VentilatedinAccount=Binded successfully to the accounting account
-NotVentilatedinAccount=Not bound to the accounting account
-XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
-XLineFailedToBeBinded=%s products/services were not bound to any accounting account
-
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
-
-ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
-BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
-
-ACCOUNTING_SELL_JOURNAL=Diario de ventas
-ACCOUNTING_PURCHASE_JOURNAL=Diario de compras
+VentilatedinAccount=Agregado exitosamente a la cuenta contable
+NotVentilatedinAccount=No añadido a la cuenta contable
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Diario de varios
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Diario de reporte de gastos
 ACCOUNTING_SOCIAL_JOURNAL=Diario Social
-
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
-ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
-DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
-
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
-
-Doctype=Tipo de documento
-Docdate=Fecha
-Docref=Referencia
-Code_tiers=Tercero
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Cuenta contable de transferencia
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Cuenta contable por defecto para productos comprados (si no ha sido definida en la hoja producto)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Cuenta contable por defecto para los productos vendidos (si no ha sido definida en la hoja  \nproducto)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Cuenta contable por defecto para los servicios comprados (si no ha sido definida en la hoja \nservicio)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Cuenta contable por defecto para los servicios vendidos (si no ha sido definida en la hoja servicio)
 Labelcompte=Descripción de la cuenta
 Sens=Significado
-Codejournal=Diario
-NumPiece=Piece number
-TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
-GroupByAccountAccounting=Group by accounting account
-NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
-DelYear=Year to delete
-DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
-FinanceJournal=Diario financiero
-ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Diario financiero incluyendo todos los tipos de pagos por cuenta bancaria
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
-VATAccountNotDefined=Account for VAT not defined
-ThirdpartyAccountNotDefined=Account for third party not defined
-ProductAccountNotDefined=Account for product not defined
-FeeAccountNotDefined=Account for fee not defined
-BankAccountNotDefined=Account for bank not defined
-CustomerInvoicePayment=Pago de factura de cliente
-ThirdPartyAccount=Cuenta de tercero
-NewAccountingMvt=New transaction
-NumMvts=Numero of transaction
-ListeMvts=List of movements
 ErrorDebitCredit=Débito y Crédito no pueden tener un valor al mismo tiempo
-
-ReportThirdParty=List third party account
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
-ListAccounts=Listado de cuentas contables
-
 Pcgtype=Tipo de cuenta
-Pcgsubtype=Subtipo de cuenta
-
 TotalVente=Facturación total antes de impuestos
 TotalMarge=Margen de ventas total
-
-DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
-DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
-DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
-ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
-Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
 DescVentilDoneSupplier=Consulte aquí la lista de partidas de las facturas a proveedores y sus cuentas contables
-DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
-DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
-DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
-DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
-
-ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
-
 ErrorAccountancyCodeIsAlreadyUse=Error, no es posible eliminar ésta cuenta contable porque está siendo usada
 MvtNotCorrectlyBalanced=Movimiento balanceado incorrectamente. Crédito = %s. Débito = %s
-FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
-ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
-ChangeBinding=Change the binding
-
-## Admin
-ApplyMassCategories=Apply mass categories
-AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
-CategoryDeleted=Category for the accounting account has been removed
-
-## Export
-Exports=Exportaciones
-Export=Exportar
-Modelcsv=Modelo de exportación
-OptionsDeactivatedForThisExportModel=Las opciones están desactivadas para este modelo de exportación
-Selectmodelcsv=Seleccione un modelo de exportación
-Modelcsv_normal=Exportación clásica
-Modelcsv_CEGID=Export towards CEGID Expert Comptabilité
-Modelcsv_COALA=Export towards Sage Coala
-Modelcsv_bob50=Export towards Sage BOB 50
-Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
-Modelcsv_quadratus=Export towards Quadratus QuadraCompta
-Modelcsv_ebp=Export towards EBP
-Modelcsv_cogilog=Export towards Cogilog
-ChartofaccountsId=Chart of accounts Id
-
-## Tools - Init accounting account on product / service
-InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases.
-DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-Options=Options
-OptionModeProductSell=Mode sales
-OptionModeProductBuy=Mode purchases
-OptionModeProductSellDesc=Show all products with accounting account for sales.
-OptionModeProductBuyDesc=Show all products with accounting account for purchases.
-CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
-CleanHistory=Reset all bindings for selected year
-
-WithoutValidAccount=Without valid dedicated account
-WithValidAccount=With valid dedicated account
-ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
-
-## Dictionary
-Range=Range of accounting account
-Calculated=Calculated
-Formula=Formula
-
-## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
-ExportNotSupported=The export format setuped is not supported into this page
-BookeppingLineAlreayExists=Lines already existing into bookeeping
-
-Binded=Lines bound
-ToBind=Lines to bind
-
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
diff --git a/htdocs/langs/es_MX/admin.lang b/htdocs/langs/es_MX/admin.lang
index 1baa373fb4a..e905c3490f7 100644
--- a/htdocs/langs/es_MX/admin.lang
+++ b/htdocs/langs/es_MX/admin.lang
@@ -1,36 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
-Foundation=Fundación
-Version=Versión
 VersionProgram=Versión del programa
-VersionLastInstall=Versión de la instalación inicial
-VersionLastUpgrade=Versión de la última actualización
-VersionExperimental=Experimental
-VersionDevelopment=Desarrollo
-VersionUnknown=Desconocida
-VersionRecommanded=Recomendada
-FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. Value of some setup constants may also be checked. You can use this tool to detect if some files were modified by a hacker for example.
-FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
-GlobalChecksum=Global checksum
-MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
-LocalSignature=Embedded local signature (less reliable)
-RemoteSignature=Remote distant signature (more reliable)
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FilesModified=Modified Files
-FilesAdded=Added Files
-FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
-XmlNotFound=Xml Integrity File of application not found
 SessionId=ID de sesión
 SessionSaveHandler=Modalidad para guardar sesiones
 SessionSavePath=Ubicación de la sesión guardada
 PurgeSessions=Depuración de sesiones
-ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
-NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow to list all running sessions.
-LockNewSessions=Bloquear nuevas conexiones
+ConfirmPurgeSessions=¿Realmente desea depurar todas las sesiónes? Esto desconectara a todos los usuarios (excepto usted).
+NoSessionListWithThisHandler=El controlador configurado para guardar sesion en tu PHP no permite listar todas las sesiones ejecutandose.
 ConfirmLockNewSessions=¿Seguro que deseas restringir cualquier nueva conexión Dolibarr? Solamente el usuario <b>%s</b> será capaz de conectarse después de esto.
 UnlockNewSessions=Remover bloqueo de conexión
 YourSession=Tu sesión
@@ -42,1624 +17,60 @@ DBSortingCharset=Charset de la base para ordenar información
 WarningModuleNotActive=El módulo <b>%s</b> debe estar habilitado
 WarningOnlyPermissionOfActivatedModules=Sólo los permisos relacionados a los módulos activados son mostrados aquí. Puedes activar otros módulos en la página Inicio->Configuración->Módulos
 DolibarrSetup=Instalación o actualización de Dolibarr
-InternalUser=Usuario interno
-ExternalUser=Usuario externo
-InternalUsers=Usuarios internos
-ExternalUsers=Usuarios externos
-GUISetup=Entorno
 SetupArea=Área de configuración
 FormToTestFileUploadForm=Formulario para probar la carga de archivos (según la configuración)
 IfModuleEnabled=Nota: sí es efectivo sólo si el módulo <b>%s</b> está activado
 RemoveLock=Eliminar archivo <b>%s</b> si existe para permitir el uso de la herramienta para actualizar
-RestoreLock=Restablece el archivo <b>%s</b>, con permisos de sólo escritura, para deshabilitar cualquier uso de la herramienta para actualizar.
+RestoreLock=Restaurar archivo <b>%s</b>, con permisos de sólo lectura, para deshabilitar cualquier uso de la herramienta de  actualizar.
 SecuritySetup=Configuración de seguridad
-SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=Error, éste módulo requiere PHP versión %s o superior
 ErrorModuleRequireDolibarrVersion=Error, éste módulo requiere Dolibarr versión %s o superior
 ErrorDecimalLargerThanAreForbidden=Error, una precisión superior a <b>%s</b> no es soportada.
-DictionarySetup=Dictionary setup
-Dictionary=Dictionaries
 ErrorReservedTypeSystemSystemAuto=Los valores 'system' y 'systemauto' para el tipo están reservados. Puedes usar 'user' como valor para añadir tu propio registro
-ErrorCodeCantContainZero=El código no puede contener el valor 0
 DisableJavascript=Deshabilita las funciones de JavaScript y Ajax (Recomendado para personas visualmente débiles o navegadores de texto)
-UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties, but it is less convenient)
-DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact, but it is less convenient)
 NumberOfKeyToSearch=N° de caracteres para activar la búsqueda: %s
 NotAvailableWhenAjaxDisabled=No disponible cuando Ajax está desactivado
-AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript desactivado
 UsePreviewTabs=Utilizar pestañas de vista previa
 ShowPreview=Mostrar previsualización
-PreviewNotAvailable=Vista previa no disponible
 ThemeCurrentlyActive=Tema activo
 CurrentTimeZone=Zona horaria PHP (servidor)
-MySQLTimeZone=TimeZone MySql (database)
-TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Espacio
-Table=Tabla
-Fields=Campos
-Index=Índice
-Mask=Máscara
 NextValue=Valor siguiente
 NextValueForInvoices=Valor siguiente (facturas)
 NextValueForCreditNotes=Valor siguiente (notas de crédito)
-NextValueForDeposit=Next value (deposit)
-NextValueForReplacements=Next value (replacements)
 MustBeLowerThanPHPLimit=Nota: tu PHP limita el tamaño de cada carga de archivos a <b>%s</b> %s, sea cual sea el valor de este parámetro
 NoMaxSizeByPHPLimit=Nota: No hay límite establecido en la configuración de PHP
 MaxSizeForUploadedFiles=El tamaño máximo para los archivos subidos (0 para no permitir ninguna carga)
 UseCaptchaCode=Utilizar el código gráfico (CAPTCHA) en la página de inicio de sesión
-AntiVirusCommand= Ruta completa del comando del antivirus
-AntiVirusCommandExample= Ejemplo para ClamWin: c:\\ Progra~1\\ClamWin\\bin\\clamscan.exe<br>Ejemplo para ClamAV: /usr/bin/clamscan
-AntiVirusParam= Más parámetros de línea de comandos
-AntiVirusParamExample= Ejemplo para ClamWin: --database="C:\\Archivos de programa (x86)\\ClamWin\\lib"
-ComptaSetup=Accounting module setup
-UserSetup=User management setup
-MultiCurrencySetup=Multi-currency setup
-MenuLimits=Limits and accuracy
-MenuIdParent=Parent menu ID
-DetailMenuIdParent=ID of parent menu (empty for a top menu)
-DetailPosition=Sort number to define menu position
+AntiVirusCommand=Ruta completa del comando del antivirus
+AntiVirusCommandExample=Ejemplo para ClamWin: c:\\ Progra~1\\ClamWin\\bin\\clamscan.exe<br>Ejemplo para ClamAV: /usr/bin/clamscan
+AntiVirusParam=Más parámetros de línea de comandos
+AntiVirusParamExample=Ejemplo para ClamWin: --database="C:\\Archivos de programa (x86)\\ClamWin\\lib"
+ComptaSetup=Establecer modulo de Contabilidad
+UserSetup=Establecer usuario Administrador
+MenuLimits=Limites y exactitud
+MenuIdParent=ID del menu padre
+DetailMenuIdParent=ID de menú padre (vacante para un menú principal)
+DetailPosition=Clasificar cantidad para definir posición del menú
 AllMenus=Todo
-NotConfigured=Module not configured
-Active=Active
 SetupShort=Configuración
-OtherOptions=Other options
-OtherSetup=Other setup
-CurrentValueSeparatorDecimal=Decimal separator
-CurrentValueSeparatorThousand=Thousand separator
-Destination=Destination
-IdModule=Module ID
-IdPermissions=Permissions ID
-Modules=Modules
-LanguageBrowserParameter=Parameter %s
-LocalisationDolibarrParameters=Localisation parameters
-ClientTZ=Client Time Zone (user)
-ClientHour=Client time (user)
-OSTZ=Server OS Time Zone
-PHPTZ=PHP server Time Zone
-DaylingSavingTime=Daylight saving time
-CurrentHour=PHP Time (server)
-CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
-Box=Widget
-Boxes=Widgets
-MaxNbOfLinesForBoxes=Max number of lines for widgets
-PositionByDefault=Default order
+OtherSetup=Otra configuración
+CurrentValueSeparatorThousand=Separador millar
+LanguageBrowserParameter=Parámetro %s
+LocalisationDolibarrParameters=Parametros de localización
+ClientTZ=Zona Horaria cliente (usuario)
+OSTZ=Servidor OS Zona Horaria
+PHPTZ=Servidor PHP Zona Horaria
+DaylingSavingTime=Hora de verano
+CurrentSessionTimeOut=Sesión actual pausada
 Position=Puesto
-MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
-MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br />Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
-MenuForUsers=Menu for users
-LangFile=.lang file
-System=System
-SystemInfo=System information
-SystemToolsArea=System tools area
-SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for.
-Purge=Purge
-PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
-PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
-PurgeDeleteTemporaryFilesShort=Delete temporary files
-PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory <b>%s</b>. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted.
-PurgeRunNow=Purge now
-PurgeNothingToDelete=No directory or files to delete.
-PurgeNDirectoriesDeleted=<b>%s</b> files or directories deleted.
-PurgeAuditEvents=Purge all security events
-ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
-GenerateBackup=Generate backup
-Backup=Backup
-Restore=Restore
-RunCommandSummary=Backup has been launched with the following command
-BackupResult=Backup result
-BackupFileSuccessfullyCreated=Backup file successfully generated
-YouCanDownloadBackupFile=Generated files can now be downloaded
-NoBackupFileAvailable=No backup files available.
-ExportMethod=Export method
-ImportMethod=Import method
-ToBuildBackupFileClickHere=To build a backup file, click <a href="%s">here</a>.
-ImportMySqlDesc=To import a backup file, you must use mysql command from command line:
-ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line:
-ImportMySqlCommand=%s %s < mybackupfile.sql
-ImportPostgreSqlCommand=%s %s mybackupfile.sql
-FileNameToGenerate=File name to generate
-Compression=Compression
-CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
-CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
-ExportCompatibility=Compatibility of generated export file
-MySqlExportParameters=MySQL export parameters
-PostgreSqlExportParameters= PostgreSQL export parameters
-UseTransactionnalMode=Use transactional mode
-FullPathToMysqldumpCommand=Full path to mysqldump command
-FullPathToPostgreSQLdumpCommand=Full path to pg_dump command
-ExportOptions=Export Options
-AddDropDatabase=Add DROP DATABASE command
-AddDropTable=Add DROP TABLE command
-ExportStructure=Structure
-NameColumn=Name columns
-ExtendedInsert=Extended INSERT
-NoLockBeforeInsert=No lock commands around INSERT
-DelayedInsert=Delayed insert
-EncodeBinariesInHexa=Encode binary data in hexadecimal
-IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
-AutoDetectLang=Autodetect (browser language)
-FeatureDisabledInDemo=Feature disabled in demo
-FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Permissions
-BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
-OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
-ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external modules...
-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 (Note: anyone experienced in PHP programming can provide custom development for an open source project)
-WebSiteDesc=Reference websites to find more modules...
 URL=Vínculo
-BoxesAvailable=Widgets available
-BoxesActivated=Widgets activated
-ActivateOn=Activate on
-ActiveOn=Activated on
-SourceFile=Source file
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
-Required=Required
-UsedOnlyWithTypeOption=Used by some agenda option only
-Security=Security
-Passwords=Passwords
-DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
-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 (Activated 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 make building of a global cumulated pdf not working (like unpaid invoices).
-Feature=Feature
-DolibarrLicense=License
-Developpers=Developers/contributors
-OfficialWebSite=Dolibarr international official web site
-OfficialWebSiteLocal=Local web site (%s)
-OfficialWiki=Dolibarr documentation on Wiki
-OfficialDemo=Dolibarr online demo
-OfficialMarketPlace=Official market place for external modules/addons
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
-ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
-HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
-HelpCenterDesc2=Some part of this service are available in <b>english only</b>.
-CurrentMenuHandler=Current menu handler
-MeasuringUnit=Measuring unit
-LeftMargin=Left margin
-TopMargin=Top margin
-PaperSize=Paper type
-Orientation=Orientation
-SpaceX=Space X
-SpaceY=Space Y
-FontSize=Font size
-Content=Content
-NoticePeriod=Notice period
-NewByMonth=New by month
-Emails=E-mails
-EMailsSetup=E-mails setup
-EMailsDesc=This page allows you to overwrite your PHP parameters for e-mails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless.
-MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
-MAIN_MAIL_EMAIL_FROM=Sender e-mail for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Sender e-mail used for error returns emails sent
-MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
-MAIN_DISABLE_ALL_MAILS=Disable all e-mails sendings (for test purposes or demos)
-MAIN_MAIL_SENDMODE=Method to use to send EMails
-MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
-MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
-MAIN_MAIL_EMAIL_TLS= Use TLS (SSL) encrypt
-MAIN_MAIL_EMAIL_STARTTLS= Use TLS (STARTTLS) encrypt
-MAIN_DISABLE_ALL_SMS=Disable all SMS sendings (for test purposes or demos)
-MAIN_SMS_SENDMODE=Method to use to send SMS
-MAIN_MAIL_SMS_FROM=Default sender phone number for Sms sending
-MAIN_MAIL_DEFAULT_FROMTYPE=Sender e-mail by default for manual sendings (User email or Company email)
-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/
-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 setup
-ModuleFamilyBase=System
-ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
-ModuleFamilyProducts=Products Management (PM)
-ModuleFamilyHr=Human Resource Management (HR)
-ModuleFamilyProjects=Projects/Collaborative work
-ModuleFamilyOther=Otro
-ModuleFamilyTechnic=Multi-modules tools
-ModuleFamilyExperimental=Experimental modules
-ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
-ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
-ModuleFamilyInterface=Interfaces with external systems
-MenuHandlers=Menu handlers
-MenuAdmin=Menu editor
-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).
-DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <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>.
-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='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
-YouCanSubmitFile=For this step, you can send package using this tool: Select module file
-CurrentVersion=Dolibarr current version
-CallUpdatePage=Go to the page that updates the database structure and data: %s.
-LastStableVersion=Latest stable version
-LastActivationDate=Latest activation date
-UpdateServerOffline=Update server offline
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
-GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
-GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
-ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
-ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
-DoTestServerAvailability=Test server connectivity
-DoTestSend=Test sending
-DoTestSendHTML=Test sending HTML
-ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
-ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
-UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
-UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
-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...).
-MinLength=Minimum length
-LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
-ExamplesWithCurrentSetup=Examples with current running setup
-ListOfDirectories=List of OpenDocument templates directories
-ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
-NumberOfModelFilesFound=Number of ODT/ODS templates files found in those 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:
-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.
-ThemeDir=Skins directory
-ConnectionTimeout=Connexion timeout
-ResponseTimeout=Response timeout
-SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__
-ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
-SecurityToken=Key to secure URLs
-NoSmsEngine=No SMS sender manager available. SMS sender manager are not installed with default distribution (because they depends on an external supplier) but you can find some on %s
-PDF=PDF
-PDFDesc=You can set each global options related to the PDF generation
-PDFAddressForging=Rules to forge address boxes
-HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF
-HideDescOnPDF=Hide products description on generated PDF
-HideRefOnPDF=Hide products ref. on generated PDF
-HideDetailsOnPDF=Hide product lines details on generated PDF
-PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
-Library=Library
-UrlGenerationParameters=Parameters to secure URLs
-SecurityTokenIsUnique=Use a unique securekey parameter for each URL
-EnterRefToBuildUrl=Enter reference for object %s
-GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons to 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
-MassConvert=Launch mass convert
-String=String
-TextLong=Long text
-Int=Integer
-Float=Float
-DateAndTime=Fecha y hora
-Unique=Unique
-Boolean=Boolean (Checkbox)
-ExtrafieldPhone = Teléfono
-ExtrafieldPrice = Precio
-ExtrafieldMail = Email
-ExtrafieldUrl = Url
-ExtrafieldSelect = Select list
-ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
-ExtrafieldPassword=Contraseña
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
-ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
-LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
-SMS=SMS
-LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
-RefreshPhoneLink=Refresh link
-LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
-KeepEmptyToUseDefault=Keep empty to use default value
-DefaultLink=Default link
-SetAsDefault=Set as default
-ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
-BarcodeInitForThirdparties=Mass barcode init for thirdparties
-BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Init value for next %s empty records
-EraseAllCurrentBarCode=Erase all current barcode values
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
-AllBarcodeReset=All barcode values have been removed
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into 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
-DisplayCompanyInfo=Display company address
-DisplayCompanyManagers=Display manager names
-DisplayCompanyInfoAndManagers=Display company address and manager names
-EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
-ModuleCompanyCodePanicum=Return an empty accountancy code.
-ModuleCompanyCodeDigitaria=Accountancy 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: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-ClickToShowDescription=Click to show description
-# Modules
-Module0Name=Users & groups
-Module0Desc=Users / Employees and Groups management
-Module1Name=Terceros
-Module1Desc=Companies and contact management (customers, prospects...)
-Module2Name=Commercial
-Module2Desc=Commercial management
-Module10Name=Contabilidad
-Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
-Module20Name=Proposals
-Module20Desc=Commercial proposal management
-Module22Name=Mass E-mailings
-Module22Desc=Mass E-mailing management
-Module23Name=Energy
-Module23Desc=Monitoring the consumption of energies
-Module25Name=Customer Orders
-Module25Desc=Customer order management
-Module30Name=Invoices
-Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
-Module40Name=Proveedores
-Module40Desc=Supplier management and buying (orders and invoices)
-Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
-Module49Name=Editors
-Module49Desc=Editor management
 Module50Name=productos
-Module50Desc=Product management
-Module51Name=Mass mailings
-Module51Desc=Mass paper mailing management
-Module52Name=Stocks
-Module52Desc=Stock management (products)
-Module53Name=Services
-Module53Desc=Service management
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
-Module55Name=Barcodes
-Module55Desc=Barcode management
-Module56Name=Telephony
-Module56Desc=Telephony integration
-Module57Name=Direct bank payment orders
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
-Module58Name=ClickToDial
-Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
-Module70Name=Intervenciones
-Module70Desc=Intervention management
-Module75Name=Expense and trip notes
-Module75Desc=Expense and trip notes management
-Module80Name=Shipments
-Module80Desc=Shipments and delivery order management
-Module85Name=Banks and cash
-Module85Desc=Management of bank or cash accounts
-Module100Name=External site
-Module100Desc=This module include an external web site or page into Dolibarr menus and view it into a Dolibarr frame
-Module105Name=Mailman and SPIP
-Module105Desc=Mailman or SPIP interface for member module
-Module200Name=LDAP
-Module200Desc=LDAP directory synchronisation
-Module210Name=PostNuke
-Module210Desc=PostNuke integration
-Module240Name=Data exports
-Module240Desc=Tool to export Dolibarr data (with assistants)
-Module250Name=Data imports
-Module250Desc=Tool to import data in Dolibarr  (with assistants)
-Module310Name=Miembros
-Module310Desc=Foundation members management
-Module320Name=RSS Feed
-Module320Desc=Add RSS feed inside Dolibarr screen pages
-Module330Name=Bookmarks
-Module330Desc=Bookmarks management
-Module400Name=Projects/Opportunities/Leads
-Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
-Module410Name=Webcalendar
-Module410Desc=Webcalendar integration
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
-Module520Name=Loan
-Module520Desc=Management of loans
-Module600Name=Notifications
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
-Module700Name=Donations
-Module700Desc=Donation management
 Module770Name=Reporte de gastos
-Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
-Module1200Name=Mantis
-Module1200Desc=Mantis integration
 Module1400Name=Contabilidad
-Module1400Desc=Accounting management (double parties)
-Module1520Name=Document Generation
-Module1520Desc=Mass mail document generation
-Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
-Module2000Name=WYSIWYG editor
-Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
-Module2200Name=Dynamic Prices
-Module2200Desc=Enable the usage of math expressions for prices
-Module2300Name=Cron
-Module2300Desc=Scheduled job management
-Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
-Module2500Name=Electronic Content Management
-Module2500Desc=Save and share documents
-Module2600Name=API/Web services (SOAP server)
-Module2600Desc=Enable the Dolibarr SOAP server providing API services
-Module2610Name=API/Web services (REST server)
-Module2610Desc=Enable the Dolibarr REST server providing API services
-Module2660Name=Call WebServices (SOAP client)
-Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
-Module2700Name=Gravatar
-Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
-Module2800Desc=FTP Client
-Module2900Name=GeoIPMaxmind
-Module2900Desc=GeoIP Maxmind conversions capabilities
-Module3100Name=Skype
-Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
-Module4000Name=HRM
-Module4000Desc=Human resources management
-Module5000Name=Multi-company
-Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management
-Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
-Module20000Name=Leave Requests management
-Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Product lot
-Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
-Module50000Name=PayBox
-Module50000Desc=Module to offer an online payment page by credit card with PayBox
-Module50100Name=Point of sales
-Module50100Desc=Point of sales module (POS).
-Module50200Name=Paypal
-Module50200Desc=Module to offer an online payment page by credit card with Paypal
-Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double parties)
-Module54000Name=PrintIPP
-Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
-Module55000Name=Poll, Survey or Vote
-Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
-Module59000Name=Margins
-Module59000Desc=Module to manage margins
-Module60000Name=Commissions
-Module60000Desc=Module to manage commissions
-Module63000Name=Recursos
-Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
-Permission11=Read customer invoices
-Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
-Permission14=Validate customer invoices
-Permission15=Send customer invoices by email
-Permission16=Create payments for customer invoices
-Permission19=Delete customer invoices
-Permission21=Read commercial proposals
-Permission22=Create/modify commercial proposals
-Permission24=Validate commercial proposals
-Permission25=Send commercial proposals
-Permission26=Close commercial proposals
-Permission27=Delete commercial proposals
-Permission28=Export commercial proposals
-Permission31=Read products
-Permission32=Create/modify products
-Permission34=Delete products
-Permission36=See/manage hidden products
-Permission38=Export products
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
-Permission44=Delete projects (shared project and projects i'm contact for)
-Permission45=Export projects
-Permission61=Read interventions
-Permission62=Create/modify interventions
-Permission64=Delete interventions
-Permission67=Export interventions
-Permission71=Read members
-Permission72=Create/modify members
-Permission74=Delete members
-Permission75=Setup types of membership
-Permission76=Export data
-Permission78=Read subscriptions
-Permission79=Create/modify subscriptions
-Permission81=Read customers orders
-Permission82=Create/modify customers orders
-Permission84=Validate customers orders
-Permission86=Send customers orders
-Permission87=Close customers orders
-Permission88=Cancel customers orders
-Permission89=Delete customers orders
-Permission91=Read social or fiscal taxes and vat
-Permission92=Create/modify social or fiscal taxes and vat
-Permission93=Delete social or fiscal taxes and vat
-Permission94=Export social or fiscal taxes
-Permission95=Read reports
-Permission101=Read sendings
-Permission102=Create/modify sendings
-Permission104=Validate sendings
-Permission106=Export sendings
-Permission109=Delete sendings
-Permission111=Read financial accounts
-Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
-Permission114=Reconciliate transactions
-Permission115=Export transactions and account statements
-Permission116=Transfers between accounts
-Permission117=Manage cheques dispatching
-Permission121=Read third parties linked to user
-Permission122=Create/modify third parties linked to user
-Permission125=Delete third parties linked to user
-Permission126=Export third parties
-Permission141=Read all projects and tasks (also private projects i am not contact for)
-Permission142=Create/modify all projects and tasks (also private projects i am not 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
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
-Permission167=Export contracts
-Permission171=Read trips and expenses (yours and your subordinates)
-Permission172=Create/modify trips and expenses
-Permission173=Delete trips and expenses
-Permission174=Read all trips and expenses
-Permission178=Export trips and expenses
-Permission180=Read suppliers
-Permission181=Read supplier orders
-Permission182=Create/modify supplier orders
-Permission183=Validate supplier orders
-Permission184=Approve supplier orders
-Permission185=Order or cancel supplier orders
-Permission186=Receive supplier orders
-Permission187=Close supplier orders
-Permission188=Cancel supplier orders
-Permission192=Create lines
-Permission193=Cancel lines
-Permission194=Read the bandwith lines
-Permission202=Create ADSL connections
-Permission203=Order connections orders
-Permission204=Order connections
-Permission205=Manage connections
-Permission206=Read connections
-Permission211=Read Telephony
-Permission212=Order lines
-Permission213=Activate line
-Permission214=Setup Telephony
-Permission215=Setup providers
-Permission221=Read emailings
-Permission222=Create/modify emailings (topic, recipients...)
-Permission223=Validate emailings (allows sending)
-Permission229=Delete emailings
-Permission237=View recipients and info
-Permission238=Manually send mailings
-Permission239=Delete mailings after validation or sent
-Permission241=Read categories
-Permission242=Create/modify categories
-Permission243=Delete categories
-Permission244=See the contents of the hidden categories
-Permission251=Read other users and groups
-PermissionAdvanced251=Read other users
-Permission252=Read permissions of other users
-Permission253=Create/modify other users, groups and permisssions
-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 assignement matters).
-Permission271=Read CA
-Permission272=Read invoices
-Permission273=Issue invoices
-Permission281=Read contacts
-Permission282=Create/modify contacts
-Permission283=Delete contacts
-Permission286=Export contacts
-Permission291=Read tariffs
-Permission292=Set permissions on the tariffs
-Permission293=Modify costumers tariffs
-Permission300=Read bar codes
-Permission301=Create/modify bar codes
-Permission302=Delete bar codes
-Permission311=Read services
-Permission312=Assign service/subscription to contract
-Permission331=Read bookmarks
-Permission332=Create/modify bookmarks
-Permission333=Delete bookmarks
-Permission341=Read its own permissions
-Permission342=Create/modify his own user information
-Permission343=Modify his own password
-Permission344=Modify its own permissions
-Permission351=Read groups
-Permission352=Read groups permissions
-Permission353=Create/modify groups
-Permission354=Delete or disable groups
-Permission358=Export users
-Permission401=Read discounts
-Permission402=Create/modify discounts
-Permission403=Validate discounts
-Permission404=Delete discounts
-Permission510=Read Salaries
-Permission512=Create/modify salaries
-Permission514=Delete salaries
-Permission517=Export salaries
-Permission520=Read Loans
-Permission522=Create/modify loans
-Permission524=Delete loans
-Permission525=Access loan calculator
-Permission527=Export loans
-Permission531=Read services
-Permission532=Create/modify services
-Permission534=Delete services
-Permission536=See/manage hidden services
-Permission538=Export services
-Permission701=Read donations
-Permission702=Create/modify donations
-Permission703=Delete donations
-Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
-Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
-Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission779=Export expense reports
-Permission1001=Read stocks
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
-Permission1004=Read stock movements
-Permission1005=Create/modify stock movements
-Permission1101=Read delivery orders
-Permission1102=Create/modify delivery orders
-Permission1104=Validate delivery orders
-Permission1109=Delete delivery orders
-Permission1181=Read suppliers
-Permission1182=Read supplier orders
-Permission1183=Create/modify supplier orders
-Permission1184=Validate supplier orders
-Permission1185=Approve supplier orders
-Permission1186=Order supplier orders
-Permission1187=Acknowledge receipt of supplier orders
-Permission1188=Delete supplier orders
-Permission1190=Approve (second approval) supplier orders
-Permission1201=Get result of an export
-Permission1202=Create/Modify an export
-Permission1231=Read supplier invoices
-Permission1232=Create/modify supplier invoices
-Permission1233=Validate supplier invoices
-Permission1234=Delete supplier invoices
-Permission1235=Send supplier invoices by email
-Permission1236=Export supplier invoices, attributes and payments
-Permission1237=Export supplier orders and their details
-Permission1251=Run mass imports of external data into database (data load)
-Permission1321=Export customer invoices, attributes and payments
-Permission1322=Reopen a paid bill
-Permission1421=Export customer orders and attributes
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
-Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
-Permission20006=Admin leave requests (setup and update balance)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
-Permission2401=Read actions (events or tasks) linked to his account
-Permission2402=Create/modify actions (events or tasks) linked to his account
-Permission2403=Delete actions (events or tasks) linked to his account
-Permission2411=Read actions (events or tasks) of others
-Permission2412=Create/modify actions (events or tasks) of others
-Permission2413=Delete actions (events or tasks) of others
-Permission2414=Export actions/tasks of others
-Permission2501=Read/Download documents
-Permission2502=Download documents
-Permission2503=Submit or delete documents
-Permission2515=Setup documents directories
-Permission2801=Use FTP client in read mode (browse and download only)
-Permission2802=Use FTP client in write mode (delete or upload files)
-Permission50101=Use Point of sales
-Permission50201=Read transactions
-Permission50202=Import transactions
-Permission54001=Print
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
-Permission59003=Read every user margin
-Permission63001=Read resources
-Permission63002=Create/modify resources
-Permission63003=Delete resources
-Permission63004=Link resources to agenda events
-DictionaryCompanyType=Types of thirdparties
-DictionaryCompanyJuridicalType=Legal forms of thirdparties
-DictionaryProspectLevel=Prospect potential level
 DictionaryCanton=Estado/Provincia
-DictionaryRegion=Regions
-DictionaryCountry=Countries
-DictionaryCurrency=Currencies
-DictionaryCivility=Personal and professional titles
-DictionaryActions=Types of agenda events
-DictionarySocialContributions=Social or fiscal taxes types
-DictionaryVAT=VAT Rates or Sales Tax Rates
-DictionaryRevenueStamp=Amount of revenue stamps
-DictionaryPaymentConditions=Payment terms
-DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact/Address types
-DictionaryEcotaxe=Ecotax (WEEE)
-DictionaryPaperFormat=Paper formats
-DictionaryFormatCards=Cards formats
-DictionaryFees=Types of fees
-DictionarySendingMethods=Shipping methods
-DictionaryStaff=Empleados
-DictionaryAvailability=Delivery delay
-DictionaryOrderMethods=Ordering methods
-DictionarySource=Origin of proposals/orders
-DictionaryAccountancyCategory=Accounting account groups
-DictionaryAccountancysystem=Models for chart of accounts
-DictionaryEMailTemplates=Emails templates
-DictionaryUnits=Units
-DictionaryProspectStatus=Prospection status
-DictionaryHolidayTypes=Types of leaves
-DictionaryOpportunityStatus=Opportunity status for project/lead
-SetupSaved=Setup saved
-BackToModuleList=Back to modules list
-BackToDictionaryList=Back to dictionaries list
-VATManagement=VAT Management
-VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
-VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies.
-VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
-##### Local Taxes #####
-LTRate=Tasa
-LocalTax1IsNotUsed=Do not use second tax
-LocalTax1IsUsedDesc=Use a second type of tax (other than VAT)
-LocalTax1IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax1Management=Second type of tax
-LocalTax1IsUsedExample=
-LocalTax1IsNotUsedExample=
-LocalTax2IsNotUsed=Do not use third tax
-LocalTax2IsUsedDesc=Use a third type of tax (other than VAT)
-LocalTax2IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax2Management=Third type of tax
-LocalTax2IsUsedExample=
-LocalTax2IsNotUsedExample=
-LocalTax1ManagementES= RE Management
-LocalTax1IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If te buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
-LocalTax1IsNotUsedDescES= By default the proposed RE is 0. End of rule.
-LocalTax1IsUsedExampleES= In Spain they are professionals subject to some specific sections of the Spanish IAE.
-LocalTax1IsNotUsedExampleES= In Spain they are professional and societies and subject to certain sections of the Spanish IAE.
-LocalTax2ManagementES= IRPF Management
-LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
-LocalTax2IsNotUsedDescES= By default the proposed IRPF is 0. End of rule.
-LocalTax2IsUsedExampleES= In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
-LocalTax2IsNotUsedExampleES= In Spain they are bussines not subject to tax system of modules.
-CalcLocaltax=Reports on local taxes
-CalcLocaltax1=Sales - Purchases
-CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2=Purchases
-CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3=Sales
-CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
-LabelUsedByDefault=Label used by default if no translation can be found for code
-LabelOnDocuments=Label on documents
-NbOfDays=Nb of days
-AtEndOfMonth=At end of month
-CurrentNext=Current/Next
-Offset=Offset
-AlwaysActive=Always active
 Upgrade=Actualizar
-MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Deploy/install external module
-WebServer=Web server
-DocumentRootServer=Web server's root directory
-DataRootServer=Data files directory
-IP=IP
-Port=Port
-VirtualServerName=Virtual server name
-OS=OS
-PhpWebLink=Web-Php link
-Browser=Browser
-Server=Servidor
-Database=Database
-DatabaseServer=Database host
-DatabaseName=Nombre de la base de datos
-DatabasePort=Database port
-DatabaseUser=Database user
-DatabasePassword=Database password
-Tables=Tables
-TableName=Table name
-NbOfRecord=Nb of records
-Host=Servidor
-DriverType=Tipo de driver
-SummarySystem=System information summary
-SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Empresa/Fundación
-DefaultMenuManager= Standard menu manager
-DefaultMenuSmartphoneManager=Smartphone menu manager
-Skin=Skin theme
-DefaultSkin=Default skin theme
-MaxSizeList=Max length for list
-DefaultMaxSizeList=Default max length for lists
-DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
-MessageOfDay=Message of the day
-MessageLogin=Login page message
-PermanentLeftSearchForm=Permanent search form on left menu
-DefaultLanguage=Default language to use (language code)
-EnableMultilangInterface=Enable multilingual interface
-EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/foundation information
-CompanyIds=Company/foundation identities
 CompanyName=Nombre
-CompanyAddress=Dirección
-CompanyZip=Zip
-CompanyTown=Town
-CompanyCountry=País
-CompanyCurrency=Main currency
-CompanyObject=Object of the company
-Logo=Logo
-DoNotSuggestPaymentMode=Do not suggest
-NoActiveBankAccountDefined=No active bank account defined
-OwnerOfBankAccount=Owner of bank account %s
-BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show link "<strong>%s</strong>"
-Alerts=Alerts
-DelaysOfToleranceBeforeWarning=Tolerance delays before warning
-DelaysOfToleranceDesc=This screen allows you to define the tolerated delays before an alert is reported on screen with picto %s for each late element.
-Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned events (agenda events) not completed yet
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Delay tolerance (in days) before alert on project not closed in time
-Delays_MAIN_DELAY_TASKS_TODO=Delay tolerance (in days) before alert on planned tasks (project tasks) not completed yet
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on orders not processed yet
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on suppliers orders not processed yet
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Delay tolerance (in days) before alert on proposals to close
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Delay tolerance (in days) before alert on proposals not billed
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerance delay (in days) before alert on services to activate
-Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerance delay (in days) before alert on expired services
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerance delay (in days) before alert on unpaid supplier invoices
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerence delay (in days) before alert on unpaid client invoices
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerance delay (in days) before alert on pending bank reconciliation
-Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed membership fee
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
-Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
-SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
-SetupDescription5=Other menu entries manage optional parameters.
-LogEvents=Security audit events
-Audit=Audit
-InfoDolibarr=About Dolibarr
-InfoBrowser=About Browser
-InfoOS=About OS
-InfoWebServer=About Web Server
-InfoDatabase=About Database
-InfoPHP=About PHP
-InfoPerf=About Performances
-BrowserName=Browser name
-BrowserOS=Browser OS
-ListOfSecurityEvents=List of Dolibarr security events
-SecurityEventsPurged=Security events purged
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
-SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
-SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
-DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
-AvailableModules=Available 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.
-TriggersAvailable=Available triggers
-TriggersDesc=Triggers are files that will modify the behaviour of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realised new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
-TriggerDisabledByName=Triggers in this file are disabled by the <b>-NORUN</b> suffix in their name.
-TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module <b>%s</b> is disabled.
-TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules.
-TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
-GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password
-DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">check here</a>.
-MiscellaneousDesc=All other security related parameters are defined here.
-LimitsSetup=Limits/Precision setup
-LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here
-MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices
-MAIN_MAX_DECIMALS_TOT=Max decimals for total prices
-MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add <b>...</b> after this number if you want to see <b>...</b> when number is truncated when shown on screen)
-MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
-UnitPriceOfProduct=Net unit price of a product
-TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
-ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
-NoEventFoundWithCriteria=No security event has been found for such search criterias.
-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.
-BackupDescX=Archived directory should be stored in a secure place.
-BackupDescY=The generated dump file should be stored in a secure place.
-BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one
-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 directoy (<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=Available database backup dump files
-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
-DownloadMoreSkins=More skins to download
-SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence without hole and with no reset
-ShowProfIdInAddress=Show professionnal id with addresses on documents
-ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents
-TranslationUncomplete=Partial translation
-MAIN_DISABLE_METEO=Disable meteo view
-TestLoginToAPI=Test login to API
-ProxyDesc=Some features of Dolibarr need to have an Internet access to work. Define here parameters for this. If the Dolibarr server is behind a Proxy server, those parameters tells Dolibarr how to access Internet through it.
-ExternalAccess=External access
-MAIN_PROXY_USE=Use a proxy server (otherwise direct access to internet)
-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 all attributes, not already available by default, and that you want to be supported for %s.
-ExtraFields=Complementary attributes
-ExtraFieldsLines=Complementary attributes (lines)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
-ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact/address)
-ExtraFieldsMember=Complementary attributes (member)
-ExtraFieldsMemberType=Complementary attributes (member type)
-ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
-ExtraFieldsSupplierOrders=Complementary attributes (orders)
-ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
-ExtraFieldsProject=Complementary attributes (projects)
-ExtraFieldsProjectTask=Complementary attributes (tasks)
-ExtraFieldHasWrongValue=Attribute %s has a wrong value.
-AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
-SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
-PathToDocuments=Path to documents
-PathDirectory=Directory
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might 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.
-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: <strong>User display setup</strong> tab of 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
-TranslationString=Translation string
-CurrentTranslationString=Current translation string
-WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
-NewTranslationStringToShow=New translation string to show
-OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
-YouMustEnableOneModule=You must at least enable 1 module
-ClassNotFoundIntoPathWarning=Class %s not found into PHP path
-YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
-SuhosinSessionEncrypt=Session storage encrypted by Suhosin
-ConditionIsCurrently=Condition is currently %s
-YouUseBestDriver=You use driver %s that is best driver available currently.
-YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required 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.
-BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance.
-BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
-AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp".
-AskForPreferredShippingMethod=Ask for preferred Sending Method for Third Parties.
-FieldEdition=Edition of field %s
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
-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.
-PasswordGenerationPerso=Return a password according to your personally defined configuration.
-SetupPerso=According to your configuration
-PasswordPatternDesc=Password pattern description
-##### Users setup #####
-RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passwords
-DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page
-UsersSetup=Users module setup
-UserMailRequired=EMail required to create a new user
-##### HRM setup #####
-HRMSetup=HRM module setup
-##### Company setup #####
-CompanySetup=Companies module setup
-CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier)
-AccountCodeManager=Module for accountancy code generation (customer or supplier)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
-NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
-NotificationsDescGlobal=* or by setting global target emails in module setup page.
-ModelModules=Documents templates
-DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
-WatermarkOnDraft=Watermark on draft document
-JSOnPaimentBill=Activate feature to autofill payment lines on payment form
-CompanyIdProfChecker=Rules on Professional Ids
-MustBeUnique=Must be unique?
-MustBeMandatory=Mandatory to create third parties?
-MustBeInvoiceMandatory=Mandatory to validate invoices?
-##### Webcal setup #####
-WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
-##### Invoices #####
-BillsSetup=Invoices module setup
-BillsNumberingModule=Invoices and credit notes numbering model
-BillsPDFModules=Invoice documents models
-CreditNote=Credit note
-CreditNotes=Credit notes
-ForceInvoiceDate=Force invoice date to validation date
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
-SuggestPaymentByRIBOnAccount=Suggest payment by withdraw on account
-SuggestPaymentByChequeToAddress=Suggest payment by cheque to
-FreeLegalTextOnInvoices=Free text on invoices
-WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
-PaymentsNumberingModule=Payments numbering model
-SuppliersPayment=Suppliers payments
-SupplierPaymentSetup=Suppliers payments setup
-##### Proposals #####
-PropalSetup=Commercial proposals module setup
-ProposalsNumberingModules=Commercial proposal numbering models
-ProposalsPDFModules=Commercial proposal documents models
-FreeLegalTextOnProposal=Free text on commercial proposals
-WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
-WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
-##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
-##### Orders #####
-OrdersSetup=Order management setup
-OrdersNumberingModules=Orders numbering models
-OrdersModelModule=Order documents models
-FreeLegalTextOnOrders=Free text on orders
-WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
-ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Interventions #####
-InterventionsSetup=Interventions module setup
-FreeLegalTextOnInterventions=Free text on intervention documents
-FicheinterNumberingModules=Intervention numbering models
-TemplatePDFInterventions=Intervention card documents models
-WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
-##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
-ContractsNumberingModules=Contracts numbering modules
-TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
-##### Members #####
-MembersSetup=Members module setup
-MemberMainOptions=Main options
-AdherentLoginRequired= Manage a Login for each member
-AdherentMailRequired=EMail required to create a new member
-MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
-##### LDAP setup #####
-LDAPSetup=LDAP Setup
-LDAPGlobalParameters=Parámetros globales
-LDAPUsersSynchro=Usuarios
-LDAPGroupsSynchro=Grupos
-LDAPContactsSynchro=Contactos
-LDAPMembersSynchro=Miembros
-LDAPSynchronization=LDAP synchronisation
-LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP
-LDAPToDolibarr=LDAP -> Dolibarr
-DolibarrToLDAP=Dolibarr -> LDAP
-LDAPNamingAttribute=Key in LDAP
-LDAPSynchronizeUsers=Organization of users in LDAP
-LDAPSynchronizeGroups=Organization of groups in LDAP
-LDAPSynchronizeContacts=Organization of contacts in LDAP
-LDAPSynchronizeMembers=Organization of foundation's members in LDAP
-LDAPPrimaryServer=Primary server
-LDAPSecondaryServer=Secondary server
-LDAPServerPort=Server port
-LDAPServerPortExample=Default port : 389
-LDAPServerProtocolVersion=Protocol version
-LDAPServerUseTLS=Use TLS
-LDAPServerUseTLSExample=Your LDAP server use TLS
-LDAPServerDn=Server DN
-LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
-LDAPPassword=Administrator password
-LDAPUserDn=Users' DN
-LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
-LDAPGroupDn=Groups' DN
-LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com)
-LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
-LDAPServerDnExample=Complete DN (ex: dc=example,dc=com)
-LDAPDnSynchroActive=Users and groups synchronization
-LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization
-LDAPDnContactActive=Contacts' synchronization
-LDAPDnContactActiveExample=Activated/Unactivated synchronization
-LDAPDnMemberActive=Members' synchronization
-LDAPDnMemberActiveExample=Activated/Unactivated synchronization
-LDAPContactDn=Dolibarr contacts' DN
-LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com)
-LDAPMemberDn=Dolibarr members DN
-LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com)
-LDAPMemberObjectClassList=List of objectClass
-LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPUserObjectClassList=List of objectClass
-LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPGroupObjectClassList=List of objectClass
-LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
-LDAPContactObjectClassList=List of objectClass
-LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPTestConnect=Test LDAP connection
-LDAPTestSynchroContact=Test contacts synchronization
-LDAPTestSynchroUser=Test user synchronization
-LDAPTestSynchroGroup=Test group synchronization
-LDAPTestSynchroMember=Test member synchronization
-LDAPTestSearch= Test a LDAP search
-LDAPSynchroOK=Synchronization test successful
-LDAPSynchroKO=Failed synchronization test
-LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that connexion to server is correctly configured and allows LDAP udpates
-LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s)
-LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s)
-LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPBindKO=Connect/Authentificate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPSetupForVersion3=LDAP server configured for version 3
-LDAPSetupForVersion2=LDAP server configured for version 2
-LDAPDolibarrMapping=Dolibarr Mapping
-LDAPLdapMapping=LDAP Mapping
-LDAPFieldLoginUnix=Login (unix)
-LDAPFieldLoginExample=Example : uid
-LDAPFilterConnection=Search filter
-LDAPFilterConnectionExample=Example : &(objectClass=inetOrgPerson)
-LDAPFieldLoginSamba=Login (samba, activedirectory)
-LDAPFieldLoginSambaExample=Example : samaccountname
-LDAPFieldFullname=Full name
-LDAPFieldFullnameExample=Example : cn
-LDAPFieldPasswordNotCrypted=Password not crypted
-LDAPFieldPasswordCrypted=Password crypted
-LDAPFieldPasswordExample=Example : userPassword
-LDAPFieldCommonNameExample=Example : cn
-LDAPFieldName=Nombre
-LDAPFieldNameExample=Example : sn
 LDAPFieldFirstName=Nombre(s)
-LDAPFieldFirstNameExample=Example : givenName
-LDAPFieldMail=Email address
-LDAPFieldMailExample=Example : mail
-LDAPFieldPhone=Professional phone number
-LDAPFieldPhoneExample=Example : telephonenumber
-LDAPFieldHomePhone=Personal phone number
-LDAPFieldHomePhoneExample=Example : homephone
-LDAPFieldMobile=Cellular phone
-LDAPFieldMobileExample=Example : mobile
-LDAPFieldFax=Fax number
-LDAPFieldFaxExample=Example : facsimiletelephonenumber
-LDAPFieldAddress=Street
-LDAPFieldAddressExample=Example : street
-LDAPFieldZip=Zip
-LDAPFieldZipExample=Example : postalcode
-LDAPFieldTown=Town
-LDAPFieldTownExample=Example : l
-LDAPFieldCountry=País
-LDAPFieldDescription=Descripción
-LDAPFieldDescriptionExample=Example : description
-LDAPFieldNotePublic=Public Note
-LDAPFieldNotePublicExample=Example : publicnote
-LDAPFieldGroupMembers= Group members
-LDAPFieldGroupMembersExample= Example : uniqueMember
-LDAPFieldBirthdate=Birthdate
-LDAPFieldCompany=Empresa
-LDAPFieldCompanyExample=Example : o
-LDAPFieldSid=SID
-LDAPFieldSidExample=Example : objectsid
-LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Job position
-LDAPFieldTitleExample=Example: title
-LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
-LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
-LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts.
-LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users.
-LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups.
-LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module.
-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 advices related to performance.
-NotInstalled=Not installed, so your server is not slow 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.
-MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
-MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
-OPCodeCache=OPCode cache
-NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad).
-HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
-FilesOfTypeCached=Files of type %s are cached by HTTP server
-FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
-FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
-FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
-CacheByServer=Cache by server
-CacheByClient=Cache by browser
-CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
-##### Products #####
-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)
-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 third party language
-UseSearchToSelectProductTooltip=Also if you have a large number of product (> 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)
-SetDefaultBarcodeTypeProducts=Default barcode type to use for products
-SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
-ProductCodeChecker= Module for product code generation and checking (product or service)
-ProductOtherConf= Product / Service configuration
-IsNotADir=is not a directory!
-##### Syslog #####
-SyslogSetup=Logs module setup
-SyslogOutput=Logs outputs
-SyslogFacility=Facility
-SyslogLevel=Level
-SyslogFilename=File name and path
-YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
-ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
-##### Donations #####
-DonationsSetup=Donation module setup
-DonationsReceiptModel=Template of donation receipt
-##### Barcode #####
-BarcodeSetup=Barcode setup
-PaperFormatModule=Print format module
-BarcodeEncodeModule=Barcode encoding type
-CodeBarGenerator=Barcode generator
-ChooseABarCode=No generator defined
-FormatNotSupportedByGenerator=Format not supported by this generator
-BarcodeDescEAN8=Barcode of type EAN8
-BarcodeDescEAN13=Barcode of type EAN13
-BarcodeDescUPC=Barcode of type UPC
-BarcodeDescISBN=Barcode of type ISBN
-BarcodeDescC39=Barcode of type C39
-BarcodeDescC128=Barcode of type C128
-BarcodeDescDATAMATRIX=Barcode of type Datamatrix
-BarcodeDescQRCODE=Barcode of type QR code
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
-BarcodeInternalEngine=Internal engine
-BarCodeNumberManager=Manager to auto define barcode numbers
-##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct debit payment orders
-##### ExternalRSS #####
-ExternalRSSSetup=External RSS imports setup
-NewRSS=New RSS Feed
-RSSUrl=RSS URL
-RSSUrlExample=An interesting RSS feed
-##### Mailing #####
-MailingSetup=EMailing module setup
-MailingEMailFrom=Sender EMail (From) for emails sent by emailing module
-MailingEMailError=Return EMail (Errors-to) for emails with errors
-MailingDelay=Seconds to wait after sending next message
-##### Notification #####
-NotificationSetup=EMail notification module setup
-NotificationEMailFrom=Sender EMail (From) for emails sent for notifications
-FixedEmailTarget=Fixed email target
-##### Sendings #####
-SendingsSetup=Sending module setup
-SendingsReceiptModel=Sending receipt model
-SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
-FreeLegalTextOnShippings=Free text on shipments
-##### Deliveries #####
-DeliveryOrderNumberingModules=Products deliveries receipt numbering module
-DeliveryOrderModel=Products deliveries receipt model
-DeliveriesOrderAbility=Support products deliveries receipts
-FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
-##### FCKeditor #####
-AdvancedEditor=Advanced editor
-ActivateFCKeditor=Activate advanced editor for:
-FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
-FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files.</font>
-FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
-FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
-##### OSCommerce 1 #####
-OSCommerceErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be an OSCommerce database (Key %s not found in table %s).
-OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' successfull.
-OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
-OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
-##### Stock #####
-StockSetup=Warehouse module setup
-IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
-##### Menu #####
-MenuDeleted=Menu deleted
-Menus=Menus
-TreeMenuPersonalized=Personalized menus
-NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
-NewMenu=New menu
-Menu=Selection of menu
-MenuHandler=Menu handler
-MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
-DetailId=Id menu
-DetailMenuHandler=Menu handler where to show new menu
-DetailMenuModule=Module name if menu entry come from a module
-DetailType=Type of menu (top or left)
-DetailTitre=Menu label or label code for translation
-DetailUrl=URL where menu send you (Absolute URL link or external link with http://)
-DetailEnabled=Condition to show or not entry
-DetailRight=Condition to display unauthorized grey menus
-DetailLangs=Lang file name for label code translation
-DetailUser=Intern / Extern / All
-Target=Target
-DetailTarget=Target for links (_blank top open a new window)
-DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu)
-ModifMenu=Menu change
-DeleteMenu=Delete menu entry
-ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
-FailedToInitializeMenu=Failed to initialize menu
-##### Tax #####
-TaxSetup=Taxes, social or fiscal taxes and dividends module setup
-OptionVatMode=VAT due
-OptionVATDefault=Cash basis
-OptionVATDebitOption=Accrual basis
-OptionVatDefaultDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on payments for services
-OptionVatDebitOptionDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on invoice (debit) for services
-SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
-OnDelivery=On delivery
-OnPayment=On payment
-OnInvoice=On invoice
-SupposedToBePaymentDate=Payment date used
-SupposedToBeInvoiceDate=Invoice date used
-Buy=Buy
-Sell=Sell
-InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
-AccountancyCode=Accountancy Code
-AccountancyCodeSell=Sale 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 -> Dictionary -> 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_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
-AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### 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 your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your 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.
-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 same computer than 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.
-##### Point Of Sales (CashDesk) #####
-CashDesk=Point of sales
-CashDeskSetup=Point of sales module setup
-CashDeskThirdPartyForSell=Default generic third party to use for sells
-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).
-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
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
-##### Bookmark #####
-BookmarkSetup=Bookmark module setup
-BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu.
-NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu
-##### WebServices #####
-WebServicesSetup=Webservices module setup
-WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
-WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
-EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
-##### API ####
-ApiSetup=API module setup
-ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
-OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
-ApiKey=Key for API
-WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
-##### Bank #####
-BankSetupModule=Bank module setup
-FreeLegalTextOnChequeReceipts=Free text on cheque receipts
-BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
-BankOrderGlobal=General
-BankOrderGlobalDesc=General display order
-BankOrderES=Spanish
-BankOrderESDesc=Spanish display order
-ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
-##### Multicompany #####
-MultiCompanySetup=Multi-company module setup
-##### Suppliers #####
-SuppliersSetup=Supplier module setup
-SuppliersCommandModel=Complete template of supplier order (logo...)
-SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
-SuppliersInvoiceNumberingModel=Supplier invoices numbering models
-IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
-##### GeoIPMaxmind #####
-GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
-NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
-YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
-YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
-TestGeoIPResult=Test of a conversion IP -> country
-##### Projects #####
-ProjectsNumberingModules=Projects numbering module
-ProjectsSetup=Project module setup
-ProjectsModelModule=Project reports document model
-TasksNumberingModules=Tasks numbering module
-TaskModelModule=Tasks reports document model
-UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
-##### ECM (GED) #####
-##### Fiscal Year #####
-AccountingPeriods=Accounting periods
-AccountingPeriodCard=Accounting period
-NewFiscalYear=New accounting period
-OpenFiscalYear=Open accounting period
-CloseFiscalYear=Close accounting period
-DeleteFiscalYear=Delete accounting period
-ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
-ShowFiscalYear=Show accounting period
-AlwaysEditable=Can always be edited
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
-Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
-IncludePath=Include path (defined into variable %s)
-ExpenseReportsSetup=Setup of module Expense Reports
-TemplatePDFExpenseReports=Document templates to generate expense report document
-NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
-YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of 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
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/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.
-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.
-ConfFileMuseContainCustom=Installing 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)
-TextTitleColor=Color of page title
-LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
-NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
-BackgroundColor=Background color
-TopMenuBackgroundColor=Background color for Top menu
-TopMenuDisableImages=Hide images in Top menu
-LeftMenuBackgroundColor=Background color for Left menu
-BackgroundTableTitleColor=Background color for Table title line
-BackgroundTableLineOddColor=Background color for odd table lines
-BackgroundTableLineEvenColor=Background color for even table lines
-MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
-NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
-UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
-PositionIntoComboList=Position of line into combo lists
-SellTaxRate=Sale tax rate
-RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
-UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipping, you can enter it here. You can use the key {TRACKID} into URL parameters so the system will replace it with value of tracking number user entered into shipment card.
-OpportunityPercent=When you create an opportunity, you will defined an estimated amount of project/lead. According to status of opportunity, this amount may be multiplicated 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
-FixTZ=TimeZone fix
-FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
-ExpectedChecksum=Expected Checksum
-CurrentChecksum=Current Checksum
-ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the latest stable version
-TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
-TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so 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 usefull only if your prices for each leve 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.
-SeeSubstitutionVars=See * note for list of possible substitution variables
-AllPublishers=All publishers
-UnknownPublishers=Unknown publishers
-AddRemoveTabs=Add or remove tabs
-AddDictionaries=Add dictionaries
-AddBoxes=Add widgets
-AddSheduledJobs=Add scheduled jobs
-AddHooks=Add hooks
-AddTriggers=Add triggers
-AddMenus=Add menus
-AddPermissions=Add permissions
-AddExportProfiles=Add export profiles
-AddImportProfiles=Add import profiles
-AddOtherPagesOrServices=Add other pages or services
-AddModels=Add document or numbering templates
-AddSubstitutions=Add keys substitutions
-DetectionNotPossible=Detection not possible
-UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved on 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 correclty. 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 inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <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
-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
-TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
-##### Resource ####
-ResourceSetup=Configuration du module Resource
-UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
diff --git a/htdocs/langs/es_MX/companies.lang b/htdocs/langs/es_MX/companies.lang
index bd34265695a..cbb94b1a6f4 100644
--- a/htdocs/langs/es_MX/companies.lang
+++ b/htdocs/langs/es_MX/companies.lang
@@ -15,7 +15,6 @@ AliasNameShort=Nombre simple
 CountryIsInEEC=El país está dentro de la Comunidad Económica Europea
 ThirdPartyName=Nombre de tercero
 ThirdPartyCustomersWithIdProf12=Clientes con %s o %s
-Company/Fundation=Empresa/Fundación
 ParentCompany=Empresa matriz
 ReportByCustomers=Reporte por clientes
 ReportByQuarter=Reporte por tasa
diff --git a/htdocs/langs/es_MX/compta.lang b/htdocs/langs/es_MX/compta.lang
index 9c1cd218356..66056ef65fc 100644
--- a/htdocs/langs/es_MX/compta.lang
+++ b/htdocs/langs/es_MX/compta.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - compta
 Param=Configuración
+ToPay=To pay
 PaymentSocialContribution=Pago de impuesto social/fiscal
 ByThirdParties=Por terceros
diff --git a/htdocs/langs/es_MX/main.lang b/htdocs/langs/es_MX/main.lang
index 5394b514e8d..8b4d41143de 100644
--- a/htdocs/langs/es_MX/main.lang
+++ b/htdocs/langs/es_MX/main.lang
@@ -1,9 +1,5 @@
 # Dolibarr language file - Source file is en_US - main
 DIRECTION=ltr
-# Note for Chinese:
-# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
-# stsongstdlight or cid0cs are for simplified Chinese
-# To read Chinese pdf with Linux: sudo apt-get install poppler-data
 FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=.
@@ -23,37 +19,20 @@ FormatDateHourShort=%I:%M %p %d/%m/%Y
 FormatDateHourSecShort=%I:%M:%S %p %d/%m/%Y
 FormatDateHourTextShort=%I:%M %p, %d %b %Y
 FormatDateHourText=%I:%M %p, %d %B %Y
-DatabaseConnection=Conexión a la base de datos
-NoTemplateDefined=No template defined for this email type
 AvailableVariables=Variables de sustitución disponibles
-NoTranslation=Sin traducción
 NoRecordFound=Ningún registro fue encontrado
-NoRecordDeleted=No record deleted
-NotEnoughDataYet=Not enough data
 NoError=No hay error
-Error=Error
-Errors=Errores
-ErrorFieldRequired=El campo '%s' es obligatorio
 ErrorFieldFormat=El campo '%s' contiene un valor incorrecto
-ErrorFileDoesNotExists=El archivo %s no existe
-ErrorFailedToOpenFile=Imposible abrir el archivo %s
-ErrorCanNotCreateDir=Cannot create dir %s
-ErrorCanNotReadDir=Cannot read dir %s
 ErrorConstantNotDefined=El parámetro %s no ha sido definido
-ErrorUnknown=Error desconocido
-ErrorSQL=Error de SQL
 ErrorLogoFileNotFound=El archivo logo '%s' no fue encontrado
-ErrorGoToGlobalSetup=Vaya a la configuración de 'Empresa/Fundación' para solucionar esto
 ErrorGoToModuleSetup=Vaya a la configuración de Módulo para solucionar esto
 ErrorFailedToSendMail=Falló el envío del correo electrónico (remitente=%s, destinatario=%s)
 ErrorFileNotUploaded=El archivo no fue transferido. Revise que el tamaño no exceda el máximo permitido, que haya espacio disponible suficiente en disco y que no exista algún archivo con el mismo nombre en el mismo directorio.
-ErrorInternalErrorDetected=Error detectado
 ErrorWrongHostParameter=Parámetro de servidor inválido
 ErrorYourCountryIsNotDefined=Tu país no está definido. Corrígelo en Inicio-Configuración-Empresa/institución-Editar.
 ErrorRecordIsUsedByChild=Falló la eliminación de este registro. Este registro está siendo utilizado por al menos un registro hijo
 ErrorWrongValue=Valor erróneo
 ErrorWrongValueForParameterX=Valor erróneo para el parámetro %s
-ErrorNoRequestInError=Ninguna petición en error
 ErrorServiceUnavailableTryLater=El servicio no está disponible por el momento. Intente de nuevo más tarde.
 ErrorDuplicateField=Valor duplicado en un campo único
 ErrorSomeErrorWereFoundRollbackIsDone=Se encontraron algunos errores. Modificaciones revertidas.
@@ -61,524 +40,156 @@ ErrorConfigParameterNotDefined=El parámetro <b>%s</b> no está definido dentro
 ErrorCantLoadUserFromDolibarrDatabase=Imposible encontrar al usuario <b>%s</b> en la base de datos de Dolibarr
 ErrorNoVATRateDefinedForSellerCountry=Error, no se ha definido tasa para el IVA del país '%s'.
 ErrorNoSocialContributionForSellerCountry=Error, no hay tipos de impuestos sociales/fiscales definidos para el país '%s'.
-ErrorFailedToSaveFile=Error, el registro del archivo falló.
-ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
 NotAuthorized=Usted no está autorizado para realizar ésta acción.
 SetDate=Ajustar fecha
-SelectDate=Seleccione una fecha
-SeeAlso=Ver también %s
 SeeHere=Mira aquí
-Apply=Apply
 BackgroundColorByDefault=Color de fondo por defecto
-FileRenamed=The file was successfully renamed
-FileUploaded=El archivo se ha subido correctamente
-FileGenerated=The file was successfully generated
 FileWasNotUploaded=Un archivo fue seleccionado para adjuntar, sin embargo, no ha sido cargado aún. De clic en "Adjuntar archivo" para éllo.
 NbOfEntries=Número de entradas
-GoToWikiHelpPage=Read online help (Internet access needed)
-GoToHelpPage=Consultar la ayuda
-RecordSaved=Registro guardado
-RecordDeleted=Registro eliminado
 LevelOfFeature=Nivel de características
 NotDefined=No definido
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
-Administrator=Administrador
-Undefined=No definido
-PasswordForgotten=Password forgotten?
-SeeAbove=Mencionado anteriormente
 HomeArea=Área de Inicio
-LastConnexion=Latest connection
 PreviousConnexion=Conexión Anterior
-PreviousValue=Previous value
 ConnectedOnMultiCompany=Conectado a la entidad
-ConnectedSince=Conectado desde
-AuthenticationMode=Authentication mode
-RequestedUrl=Requested URL
 DatabaseTypeManager=Administrador de tipo de base de datos
-RequestLastAccessInError=Latest database access request error
-ReturnCodeLastAccessInError=Return code for latest database access request error
-InformationLastAccessInError=Information for latest database access request error
-DolibarrHasDetectedError=Dolibarr ha detectado un error técnico
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes
-MoreInformation=Más información
-TechnicalInformation=Información técnica
 TechnicalID=ID Técnico
-NotePublic=Nota (pública)
-NotePrivate=Nota (privada)
 PrecisionUnitIsLimitedToXDecimals=Dolibarr fue instalado para limitar la precisión de los precios unitarios a<b>%s</b> decimales.
-DoTest=Probar
-ToFilter=Filtrar
-NoFilter=No filter
 WarningYouHaveAtLeastOneTaskLate=Advertencia, tiene al menos un elemento que ha superado la fecha de tolerancia.
-yes=sí
-Yes=Sí
-no=no
-No=No
-All=Todo
-Home=Inicio
-Help=Ayuda
-OnlineHelp=Ayuda en línea
-PageWiki=Página Wiki
-MediaBrowser=Media browser
-Always=Siempre
-Never=Nunca
 Under=debajo
-Period=Periodo
 PeriodEndDate=Fecha final para ell periódo
-Activate=Activar
-Activated=Activado
-Closed=Cerrado
-Closed2=Cerrado
-NotClosed=Not closed
 Enabled=Habilitado
 Deprecated=Depreciado
-Disable=Desactivar
 Disabled=Deshabilitado
-Add=Añadir
 AddLink=Añadir vínculo
 RemoveLink=Remover enlace
-AddToDraft=Add to draft
 Update=Actualizar
-Close=Cerrar
-CloseBox=Remove widget from your dashboard
-Confirm=Confirmar
-ConfirmSendCardByMail=Do you really want to send content of this card by mail to <b>%s</b>?
-Delete=Eliminar
-Remove=Retirar
-Resiliate=Terminate
 Cancel=Cancelar
-Modify=Modificar
-Edit=Editar
-Validate=Validar
 ValidateAndApprove=Validar y aprobar
-ToValidate=A validar
 Save=Guardar
 SaveAs=Guardar como
 TestConnection=Probar conexión
 ToClone=Clonar
 ConfirmClone=Elige los datos que deseas clonar:
 NoCloneOptionsSpecified=No se definió información a clonar.
-Of=de
-Go=Ir
 Run=Ejecutar
-CopyOf=Copia de
-Show=Ver
-Hide=Hide
 ShowCardHere=Ver la ficha
-Search=Buscar
-SearchOf=Búsqueda de
-Valid=Validar
-Approve=Aprobar
-Disapprove=Desaprobar
-ReOpen=Reabrir
-Upload=Enviar archivo
 ToLink=Vínculo
-Select=Seleccionar
-Choose=Elegir
-Resize=Redimensionar
-Recenter=Encuadrar
-Author=Autor
-User=Usuario
-Users=Usuarios
-Group=Grupo
-Groups=Grupos
 NoUserGroupDefined=Ningún grupo definido por el usuario
-Password=Contraseña
-PasswordRetype=Repetir contraseña
 NoteSomeFeaturesAreDisabled=Atención, muchas funciones/módulos están deshabilitadas en esta demostración.
-Name=Nombre
-Person=Persona
-Parameter=Parámetro
-Parameters=Parámetros
-Value=Valor
 PersonalValue=Valor personal
-NewValue=Nuevo valor
-CurrentValue=Valor actual
-Code=Código
-Type=Tipo
-Language=Idioma
 MultiLanguage=Multi-idioma
-Note=Nota
-Title=Título
-Label=Etiqueta
-RefOrLabel=Ref. o etiqueta
-Info=Log
-Family=Familia
-Description=Descripción
-Designation=Descripción
-Model=Doc template
-DefaultModel=Default doc template
 Action=Evento
-About=Acerca de
-Number=Número
-NumberByMonth=Número por mes
 AmountByMonth=Cantidad por mes
-Numero=Número
-Limit=Límite
-Limits=Límites
-Logout=Desconexión
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Conexión
-Setup=Configuración
-Alert=Alerta
-Previous=Anterior
-Next=Siguiente
-Cards=Fichas
-Card=Ficha
-Now=Ahora
-HourStart=Hora de inicio
-Date=Fecha
-DateAndHour=Fecha y hora
-DateToday=Today's date
-DateReference=Reference date
-DateStart=Fecha de inicio
 DateEnd=Fecha de finalización
-DateCreation=Fecha de creación
 DateCreationShort=Fecha de creación
-DateModification=Fecha de modificación
 DateModificationShort=Fecha Modif.
-DateLastModification=Latest modification date
-DateValidation=Fecha de validación
-DateClosing=Fecha de cierre
-DateDue=Fecha de vencimiento
-DateValue=Fecha valor
-DateValueShort=Fecha valor
 DateOperation=Fecha de operación
 DateOperationShort=Fecha Op.
-DateLimit=Fecha límite
-DateRequest=Fecha consulta
-DateProcess=Fecha proceso
 DateBuild=Fecha de generación del informe
 DatePayment=Fecha de pago
-DateApprove=Fecha de aprobación
-DateApprove2=Fecha de aprobación (segunda aprobación)
-UserCreation=Creation user
-UserModification=Modification user
-UserCreationShort=Creat. user
-UserModificationShort=Modif. user
-DurationYear=año
-DurationMonth=mes
-DurationWeek=semana
-DurationDay=día
-DurationYears=años
-DurationMonths=meses
-DurationWeeks=semanas
-DurationDays=días
-Year=Año
-Month=Mes
-Week=Semana
-WeekShort=Semana
-Day=Día
-Hour=Hora
-Minute=Minuto
-Second=Segundo
-Years=Años
-Months=Meses
-Days=Días
-days=días
-Hours=Horas
-Minutes=Minutos
-Seconds=Segundos
-Weeks=Semanas
-Today=Hoy
-Yesterday=Ayer
-Tomorrow=Mañana
-Morning=Mañana
-Afternoon=Tarde
-Quadri=Trimestre
-MonthOfDay=Mes del día
 HourShort=Hr
-MinuteShort=min
 Rate=Tasa
-CurrencyRate=Currency conversion rate
 UseLocalTax=Incluir impuesto
-Bytes=Bytes
-KiloBytes=Kilobytes
-MegaBytes=Megabytes
-GigaBytes=Gigabytes
-TeraBytes=Terabytes
-b=b.
-Kb=Kb
-Mb=Mb
-Gb=Gb
-Tb=Tb
-Cut=Cortar
-Copy=Copiar
-Paste=Pegar
-Default=Predeterminado
 DefaultValue=Valor predeterminado
-Price=Precio
-UnitPrice=Precio unitario
-UnitPriceHT=Precio base
-UnitPriceTTC=Precio unitario total
-PriceU=P.U.
-PriceUHT=P.U.
-PriceUHTCurrency=U.P (currency)
 PriceUTTC=P.U. (IVA incl.)
-Amount=Importe
 AmountInvoice=Importe de la factura
 AmountPayment=Importe de pago
-AmountHTShort=Base imp.
-AmountTTCShort=Importe
-AmountHT=Base imponible
-AmountTTC=Importe total
-AmountVAT=Importe IVA
-MulticurrencyAlreadyPaid=Already payed, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
-MulticurrencyAmountHT=Amount (net of tax), original currency
-MulticurrencyAmountTTC=Amount (inc. of tax), original currency
-MulticurrencyAmountVAT=Amount tax, original currency
 AmountLT1=Importe impuestos 2
 AmountLT2=Importe impuestos 3
-AmountLT1ES=Importe RE
-AmountLT2ES=Importe IRPF
-AmountTotal=Importe total
 AmountAverage=Importe promedio
-PriceQtyMinHT=Precio cantidad min. total
-Percentage=Porcentaje
-Total=Total
-SubTotal=Subtotal
-TotalHTShort=Importe
-TotalHTShortCurrency=Total (net in currency)
-TotalTTCShort=Total
-TotalHT=Base imponible
 TotalHTforthispage=Total (neto de impuestos) para esta página
-Totalforthispage=Total for this page
-TotalTTC=Total
-TotalTTCToYourCredit=Total a crédito
-TotalVAT=Total IVA
 TotalLT1=Total impuesto 2
 TotalLT2=Total impuesto 3
-TotalLT1ES=Total RE
-TotalLT2ES=Total IRPF
-HT=Sin IVA
 TTC=IVA Incluido
-VAT=IVA
 VATs=Impuestos de ventas
-LT1ES=RE
-LT2ES=IRPF
 VATRate=Tasa de IVA
 Average=Promedio
-Sum=Suma
-Delta=Diferencia
-Module=Módulo
-Option=Opción
 List=Lista
 FullList=Lista completa
-Statistics=Estadísticas
-OtherStatistics=Otras estadísticas
-Status=Estado
-Favorite=Favorito
-ShortInfo=Info.
-Ref=Ref.
-ExternalRef=Ref. externa
 RefSupplier=Ref. Proveedor
 RefPayment=Ref. Pago
 CommercialProposalsShort=Propuestas comerciales
-Comment=Comentario
-Comments=Comentarios
 ActionsToDo=Eventos por realizar
 ActionsToDoShort=Por hacer
 ActionsDoneShort=Hecho
 ActionNotApplicable=No aplica
 ActionRunningNotStarted=Empezar
-ActionRunningShort=In progress
 ActionDoneShort=Finalizado
-ActionUncomplete=Incompleto
-CompanyFoundation=Empresa/Fundación
 ContactsForCompany=Contactos para ste tercero
 ContactsAddressesForCompany=Contactos/Direcciones para este tercero
 AddressesForCompany=Direcciones para este tercero
 ActionsOnCompany=Eventos relacionados a este tercero
 ActionsOnMember=Eventos relacionados a éste miembro
 NActionsLate=%s tarde
-RequestAlreadyDone=Solicitud ya registrada
 Filter=Filtrar
 FilterOnInto=Criterios de búsqueda '<strong>%s</strong>' en los campos %s
 RemoveFilter=Remover filtro
 ChartGenerated=Gráfico generado
-ChartNotGenerated=Gráfico no generado
 GeneratedOn=Generado en %s
-Generate=Generar
-Duration=Duración
-TotalDuration=Duración total
-Summary=Resumen
-DolibarrStateBoard=Estadísticas
-DolibarrWorkBoard=Tablero de tareas de trabajo
-Available=Disponible
 NotYetAvailable=No disponible aún
-NotAvailable=No disponible
-Categories=Etiquetas/Categorías
 Category=Tag/Categoría
-By=Por
-From=De
-to=a
-and=y
-or=o
-Other=Otro
-Others=Otros
-OtherInformations=Otras informaciones
-Quantity=Cantidad
-Qty=Cant.
 ChangedBy=Cambiado por
-ApprovedBy=Aprobado por
-ApprovedBy2=Aprobado por (segunda aprobación)
-Approved=Aprobado
-Refused=Rechazado
-ReCalculate=Recalcular
 ResultKo=Fallo
 Reporting=Informes
-Reportings=Informes
-Draft=Borrador
-Drafts=Borradores
-Validated=Validado
-Opened=Opened
-New=Nuevo
-Discount=Descuento
-Unknown=Desconocido
-General=General
-Size=Tamaño
-Received=Recibido
-Paid=Pagado
-Topic=Asunto
+Opened=Abierta
 ByCompanies=Por terceros
 ByUsers=Por usuarios
 Links=Vínculos
 Link=Vínculo
 Rejects=Rechazos
 Preview=Previsualización
-NextStep=Siguiente paso
-Datas=Datos
 None=Ninguno
 NoneF=Ninguno
 Late=Tarde
-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.
 Photo=Imágen
 Photos=Imágenes
 AddPhoto=Añadir imágen
-DeletePicture=Picture delete
-ConfirmDeletePicture=Confirm picture deletion?
 Login=Inicio de sesión
 CurrentLogin=Inicio de sesión actual
-EnterLoginDetail=Enter login details
-January=enero
-February=febrero
-March=marzo
-April=abril
 May=Mayo
-June=junio
-July=julio
-August=agosto
-September=septiembre
-October=octubre
-November=noviembre
 December=diciembre
-JanuaryMin=Ene
-FebruaryMin=Feb
-MarchMin=Mar
-AprilMin=Abr
 MayMin=Mayo
-JuneMin=Jun
-JulyMin=Jul
-AugustMin=Ago
-SeptemberMin=Sep
-OctoberMin=Oct
-NovemberMin=Nov
-DecemberMin=Dic
-Month01=enero
-Month02=febrero
-Month03=marzo
-Month04=abril
 Month05=Mayo
-Month06=junio
-Month07=julio
-Month08=agosto
-Month09=septiembre
-Month10=octubre
-Month11=noviembre
-Month12=diciembre
 MonthShort01=Ene
-MonthShort02=Feb
-MonthShort03=Mar
 MonthShort04=Abr
 MonthShort05=Mayo
-MonthShort06=Jun
-MonthShort07=Jul
 MonthShort08=Ago
-MonthShort09=Sep
-MonthShort10=Oct
-MonthShort11=Nov
 MonthShort12=Dic
-AttachedFiles=Archivos y documentos adjuntos
 FileTransferComplete=Archivo fue subido exitosamente
 DateFormatYYYYMM=MM-YYYY
 DateFormatYYYYMMDD=DD-MM-YYYY
 DateFormatYYYYMMDDHHMM=DD-MM-YYYY HH:SS
-ReportName=Nombre del informe
 ReportPeriod=Período del informe
-ReportDescription=Descripción
-Report=Informe
-Keyword=Keyword
-Origin=Origin
-Legend=Leyenda
 Fill=Llenar
 Reset=Reiniciar
-File=Archivo
-Files=Archivos
 NotAllowed=No permitido
 ReadPermissionNotAllowed=Permiso de lectura no permitido
 AmountInCurrency=Monto en moneda %s
-Example=Ejemplo
-Examples=Ejemplos
 NoExample=Ningún ejemplo
 FindBug=Reportar un bug
-NbOfThirdParties=Número de terceros
 NbOfLines=Número de líneas
-NbOfObjects=Número de objetos
-NbOfObjectReferers=Number of related items
-Referers=Related items
-TotalQuantity=Cantidad total
-DateFromTo=De %s a %s
 DateFrom=Desde %s
-DateUntil=Hasta %s
 Check=Cheque
 Uncheck=Desmarcar
-Internal=Interno
-External=Externo
 Internals=Interno
 Externals=Externo
 Warning=Advertencia
 Warnings=Advertencias
 BuildDoc=Generar Doc
 Entity=Ambiente
-Entities=Entidades
 CustomerPreview=Vista previa del cliente
 SupplierPreview=Vista previa de proveedores
 ShowCustomerPreview=Mostrar vista previa del cliente
 ShowSupplierPreview=Mostrar vista previa del proveedor
-RefCustomer=Ref. cliente
 Currency=Moneda
-InfoAdmin=Información para los administradores
 Undo=Deshacer
-Redo=Rehacer
-ExpandAll=Expandir todo
 UndoExpandAll=Deshacer ampliar
-Reason=Razón
 FeatureNotYetSupported=Característica aún no soportada
-CloseWindow=Cerrar ventana
-Response=Respuesta
-Priority=Prioridad
 SendByMail=Enviar por correo electrónico
 MailSentBy=Correo electrónico enviado por
 TextUsedInTheMessageBody=Cuerpo del correo electronico
-SendAcknowledgementByMail=Send confirmation email
 EMail=Email
 NoEMail=Sin correo electrónico
-Email=Email
-NoMobilePhone=Sin teléfono móvil
-Owner=Propietario
 FollowingConstantsWillBeSubstituted=Las siguientes constantes serán reemplazadas con el valor correspondiente.
 Refresh=Actualizar
 BackToList=Volver a la lista
@@ -586,58 +197,23 @@ GoBack=Regresar
 CanBeModifiedIfOk=Puede ser modificado si es válido
 CanBeModifiedIfKo=Puede ser modificado si no es válido
 ValueIsValid=El valor es válido
-ValueIsNotValid=Value is not valid
-RecordCreatedSuccessfully=Record created successfully
-RecordModifiedSuccessfully=Registro modificado con éxito
-RecordsModified=%s record modified
-RecordsDeleted=%s record deleted
 AutomaticCode=Código automático
 FeatureDisabled=Característica deshabilitada
-MoveBox=Move widget
 Offered=Presentado
 NotEnoughPermissions=Usted no tiene permiso para esta acción
 SessionName=Nombre de sesión
-Method=Método
 Receive=Recibir
-CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
-ExpectedValue=Expected Value
-CurrentValue=Valor actual
-PartialWoman=Parcial
-TotalWoman=Total
-NeverReceived=Nunca recibido
-Canceled=Cancelado
-YouCanChangeValuesForThisListFromDictionarySetup=Puede cambiar los valores para esta lista desde el menú configuración - dictionario
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
-Color=Color
 Documents=Archivos vinculados
-Documents2=Documentos
 UploadDisabled=Carga deshabilitada
-MenuECM=Documentos
-MenuAWStats=AWStats
-MenuMembers=Miembros
 MenuAgendaGoogle=Agenda de Google
 ThisLimitIsDefinedInSetup=Límite de Dolibarr (Menú inicio-configuración-seguridad): %s Kb, Límite PHP: %s Kb
-NoFileFound=No hay documentos guardados en este directorio
-CurrentUserLanguage=Idioma actual
-CurrentTheme=Tema actual
 CurrentMenuManager=Administrador de menú actual
-Browser=Browser
-Layout=Layout
-Screen=Screen
 DisabledModules=Módulos deshabilitados
-For=Para
 ForCustomer=Para el cliente
-Signature=Firma
-DateOfSignature=Date of signature
 HidePassword=Mostrar comando con la contraseña oculta
 UnHidePassword=Mostrar comando real mostrando la contraseña
-Root=Raíz
 Informations=Informaciones
-Page=Página
-Notes=Notas
-AddNewLine=Añadir nueva línea
 AddFile=Agregar archivo
-FreeZone=Entrada libre
 FreeLineOfType=Entrada libre de tipo
 CloneMainAttributes=Clonar objeto con sus principales atributos
 PDFMerge=Unir PDF
@@ -645,53 +221,21 @@ Merge=Unir
 PrintContentArea=Mostrar la página para imprimir el área de contenido principal
 MenuManager=Administrar menú
 WarningYouAreInMaintenanceMode=Advertencia, usted está en un modo de mantenimiento, solamente se permite el uso de la aplicación con el login <b>%s</b>
-CoreErrorTitle=Error del sistema
-CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
-CreditCard=Tarjeta de crédito
 FieldsWithAreMandatory=Los campos con <b>%s</b> son obligatorios
 FieldsWithIsForPublic=Los campos con <b>%s</b> se muestran en la lista pública de miembros. Si usted no desea esto, desmarque la casilla "público".
 AccordingToGeoIPDatabase=(de acuerdo con la conversión GeoIP)
-Line=Línea
-NotSupported=No soportado
 RequiredField=Campo requerido
-Result=Resultado
-ToTest=Probar
 ValidateBefore=La tarjeta debe ser validada antes de usar esta característica
-Visibility=Visibilidad
-Private=Privado
 Hidden=Oculto
-Resources=Recursos
 Source=Fuente
-Prefix=Prefijo
 Before=Antes de
-After=Después
-IPAddress=Dirección IP
-Frequency=Frecuencia
-IM=Mensajería instantánea
-NewAttribute=Nuevo atributo
 AttributeCode=Código de atributo
 URLPhoto=URL de la foto/logotipo
-SetLinkToAnotherThirdParty=Vincular a otro tercero
-LinkTo=Link to
-LinkToProposal=Link to proposal
-LinkToOrder=Link to order
-LinkToInvoice=Link to invoice
-LinkToSupplierOrder=Link to supplier order
-LinkToSupplierProposal=Link to supplier proposal
-LinkToSupplierInvoice=Link to supplier invoice
-LinkToContract=Link to contract
-LinkToIntervention=Link to intervention
-CreateDraft=Crear borrador
 SetToDraft=Regresar a borrador
 ClickToEdit=Haga clic para editar
 ObjectDeleted=Objeto %s suprimido
 ByCountry=Por país
 ByTown=Por municipio
-ByDate=Por fecha
-ByMonthYear=Por mes/año
-ByYear=Por año
-ByMonth=Por mes
-ByDay=Por día
 BySalesRepresentative=Por representante de ventas
 LinkedToSpecificUsers=Vinculado a un usuario de contacto determinado
 NoResults=No hay resultados
@@ -699,14 +243,7 @@ AdminTools=Herramientas de Administración
 SystemTools=Herramientas de sistema
 ModulesSystemTools=Módulos de herramientas
 Test=Probar
-Element=Elemento
 NoPhotoYet=No hay fotos disponibles aún
-Dashboard=Dashboard
-MyDashboard=My dashboard
-Deductible=Deducible
-from=de
-toward=hacia
-Access=Acceso
 SelectAction=Seleccione la acción
 HelpCopyToClipboard=Utilice Ctrl + C para copiar al portapapeles
 SaveUploadedFileWithMask=Guarde el archivo en el servidor con el nombre "<strong>%s</strong>" (de lo contrario "%s")
@@ -714,53 +251,16 @@ OriginFileName=Nombre original del archivo
 SetDemandReason=Seleccionar fuente
 SetBankAccount=Definir Cuenta Bancaria
 AccountCurrency=Moneda de la cuenta
-ViewPrivateNote=Ver notas
 XMoreLines=%s línea(s) oculta(s)
 PublicUrl=URL Pública
 AddBox=Añade una caja
-SelectElementAndClickRefresh=Seleccione un elemento y haga clic en Actualizar
-PrintFile=Imprimir Archivo %s
-ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Ve a Inicio - Configuración - Empresa para cambiar el logo o ve a Inicio - Configuración - Vista para ocultarlo.
-Deny=Denegar
 Denied=Denegado
 ListOfTemplates=Lista de plantillas
 Gender=Género
-Genderman=Hombre
-Genderwoman=Mujer
 ViewList=Vista de la lista
-Mandatory=Obligatorio
-Hello=Hola
 Sincerely=Sinceramente
 DeleteLine=Borrar línea
-ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
-NoRecordSelected=No record selected
-MassFilesArea=Area for files built by mass actions
-ShowTempMassFilesArea=Show area of files built by mass actions
-RelatedObjects=Related Objects
-ClassifyBilled=Classify billed
-Progress=Progress
-ClickHere=Click here
-FrontOffice=Front office
-BackOffice=Back office
-View=View
-Export=Exportar
-Exports=Exportaciones
-ExportFilteredList=Export filtered list
-ExportList=Export list
-Miscellaneous=Miscellaneous
-Calendar=Calendario
-GroupBy=Group by...
-ViewFlatList=View flat list
-RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Direct download link
-Download=Download
-ActualizeCurrency=Update currency rate
-Fiscalyear=Fiscal year
-# Week day
 Monday=lunes
 Tuesday=martes
 Wednesday=miércoles
@@ -782,40 +282,13 @@ Day4=jueves
 Day5=viernes
 Day6=sábado
 Day0=domingo
-ShortMonday=L
-ShortTuesday=M
 ShortWednesday=M
 ShortThursday=MJ
-ShortFriday=V
-ShortSaturday=S
-ShortSunday=D
 SelectMailModel=Seleccionar plantilla de correo electrónico
-SetRef=Establecer ref
-Select2ResultFoundUseArrows=Some results found. Use arrows to select.
 Select2NotFound=No se encontró ningún resultado
 Select2Enter=Entrar
-Select2MoreCharacter=or more character
-Select2MoreCharacters=o más caracteres
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
-Select2LoadingMoreResults=Cargando más resultados...
-Select2SearchInProgress=Búsqueda en progreso...
-SearchIntoThirdparties=Terceros
-SearchIntoContacts=Contactos
-SearchIntoMembers=Miembros
-SearchIntoUsers=Usuarios
-SearchIntoProductsOrServices=Productos o servicios
-SearchIntoProjects=Proyectos
-SearchIntoTasks=Tasks
 SearchIntoCustomerInvoices=Facturas de clientes
-SearchIntoSupplierInvoices=Facturas de proveedores
 SearchIntoCustomerOrders=Pedidos de los clientes
-SearchIntoSupplierOrders=Pedidos a proveedor
 SearchIntoCustomerProposals=Propuestas de clientes
 SearchIntoSupplierProposals=Propuestas de proveedores
-SearchIntoInterventions=Intervenciones
-SearchIntoContracts=Contratos
-SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Reporte de gastos
-SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/es_MX/other.lang b/htdocs/langs/es_MX/other.lang
index c444411ea1d..ac900b15595 100644
--- a/htdocs/langs/es_MX/other.lang
+++ b/htdocs/langs/es_MX/other.lang
@@ -1,3 +1,4 @@
 # Dolibarr language file - Source file is en_US - other
 Tools=Herramientas
+TMenuTools=Herramientas
 Notify_COMPANY_CREATE=Tercero creado
diff --git a/htdocs/langs/es_PA/accountancy.lang b/htdocs/langs/es_PA/accountancy.lang
deleted file mode 100644
index 527f1fd139d..00000000000
--- a/htdocs/langs/es_PA/accountancy.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-AccountingCategory=Accounting category
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
diff --git a/htdocs/langs/es_PA/admin.lang b/htdocs/langs/es_PA/admin.lang
index 9602601e241..059de87f623 100644
--- a/htdocs/langs/es_PA/admin.lang
+++ b/htdocs/langs/es_PA/admin.lang
@@ -1,1665 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
-Foundation=Foundation
-Version=Version
-VersionProgram=Version program
-VersionLastInstall=Initial install version
-VersionLastUpgrade=Latest version upgrade
-VersionExperimental=Experimental
-VersionDevelopment=Development
-VersionUnknown=Unknown
-VersionRecommanded=Recommended
-FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. Value of some setup constants may also be checked. You can use this tool to detect if some files were modified by a hacker for example.
-FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
-GlobalChecksum=Global checksum
-MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
-LocalSignature=Embedded local signature (less reliable)
-RemoteSignature=Remote distant signature (more reliable)
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FilesModified=Modified Files
-FilesAdded=Added Files
-FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
-XmlNotFound=Xml Integrity File of application not found
-SessionId=Session ID
-SessionSaveHandler=Handler to save sessions
-SessionSavePath=Storage session localization
-PurgeSessions=Purge of sessions
-ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
-NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow to list all running sessions.
-LockNewSessions=Lock new connections
-ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself. Only user <b>%s</b> will be able to connect after that.
-UnlockNewSessions=Remove connection lock
-YourSession=Your session
-Sessions=Users session
-WebUserGroup=Web server user/group
-NoSessionFound=Your PHP seems to not allow to list active sessions. Directory used to save sessions (<b>%s</b>) might be protected (For example, by OS permissions or by PHP directive open_basedir).
-DBStoringCharset=Database charset to store data
-DBSortingCharset=Database charset to sort data
-WarningModuleNotActive=Module <b>%s</b> must be enabled
-WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page.
-DolibarrSetup=Dolibarr install or upgrade
-InternalUser=Internal user
-ExternalUser=External user
-InternalUsers=Internal users
-ExternalUsers=External users
-GUISetup=Display
-SetupArea=Setup area
-FormToTestFileUploadForm=Form to test file upload (according to setup)
-IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
-RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
-RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any usage of update tool.
-SecuritySetup=Security setup
-SecurityFilesDesc=Define here options related to security about uploading files.
-ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
-ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
-ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is not supported.
-DictionarySetup=Dictionary setup
-Dictionary=Dictionaries
-ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
-ErrorCodeCantContainZero=Code can't contain value 0
-DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
-UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties, but it is less convenient)
-DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact, but it is less convenient)
-NumberOfKeyToSearch=Nbr of characters to trigger search: %s
-NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
-AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
-JavascriptDisabled=JavaScript disabled
-UsePreviewTabs=Use preview tabs
-ShowPreview=Show preview
-PreviewNotAvailable=Preview not available
-ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
-MySQLTimeZone=TimeZone MySql (database)
-TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
-Space=Space
-Table=Table
-Fields=Fields
-Index=Index
-Mask=Mask
-NextValue=Next value
-NextValueForInvoices=Next value (invoices)
-NextValueForCreditNotes=Next value (credit notes)
-NextValueForDeposit=Next value (deposit)
-NextValueForReplacements=Next value (replacements)
-MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to <b>%s</b> %s, whatever this parameter's value is
-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
-AntiVirusParam= More parameters on command line
-AntiVirusParamExample= Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
-ComptaSetup=Accounting module setup
-UserSetup=User management setup
-MultiCurrencySetup=Multi-currency setup
-MenuLimits=Limits and accuracy
-MenuIdParent=Parent menu ID
-DetailMenuIdParent=ID of parent menu (empty for a top menu)
-DetailPosition=Sort number to define menu position
-AllMenus=All
-NotConfigured=Module not configured
-Active=Active
-SetupShort=Setup
-OtherOptions=Other options
-OtherSetup=Other setup
-CurrentValueSeparatorDecimal=Decimal separator
-CurrentValueSeparatorThousand=Thousand separator
-Destination=Destination
-IdModule=Module ID
-IdPermissions=Permissions ID
-Modules=Modules
-LanguageBrowserParameter=Parameter %s
-LocalisationDolibarrParameters=Localisation parameters
-ClientTZ=Client Time Zone (user)
-ClientHour=Client time (user)
-OSTZ=Server OS Time Zone
-PHPTZ=PHP server Time Zone
-DaylingSavingTime=Daylight saving time
-CurrentHour=PHP Time (server)
-CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
-Box=Widget
-Boxes=Widgets
-MaxNbOfLinesForBoxes=Max number of lines for widgets
-PositionByDefault=Default order
-Position=Position
-MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
-MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br />Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
-MenuForUsers=Menu for users
-LangFile=.lang file
-System=System
-SystemInfo=System information
-SystemToolsArea=System tools area
-SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for.
-Purge=Purge
-PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
-PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
-PurgeDeleteTemporaryFilesShort=Delete temporary files
-PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory <b>%s</b>. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted.
-PurgeRunNow=Purge now
-PurgeNothingToDelete=No directory or files to delete.
-PurgeNDirectoriesDeleted=<b>%s</b> files or directories deleted.
-PurgeAuditEvents=Purge all security events
-ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
-GenerateBackup=Generate backup
-Backup=Backup
-Restore=Restore
-RunCommandSummary=Backup has been launched with the following command
-BackupResult=Backup result
-BackupFileSuccessfullyCreated=Backup file successfully generated
-YouCanDownloadBackupFile=Generated files can now be downloaded
-NoBackupFileAvailable=No backup files available.
-ExportMethod=Export method
-ImportMethod=Import method
-ToBuildBackupFileClickHere=To build a backup file, click <a href="%s">here</a>.
-ImportMySqlDesc=To import a backup file, you must use mysql command from command line:
-ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line:
-ImportMySqlCommand=%s %s < mybackupfile.sql
-ImportPostgreSqlCommand=%s %s mybackupfile.sql
-FileNameToGenerate=File name to generate
-Compression=Compression
-CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
-CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
-ExportCompatibility=Compatibility of generated export file
-MySqlExportParameters=MySQL export parameters
-PostgreSqlExportParameters= PostgreSQL export parameters
-UseTransactionnalMode=Use transactional mode
-FullPathToMysqldumpCommand=Full path to mysqldump command
-FullPathToPostgreSQLdumpCommand=Full path to pg_dump command
-ExportOptions=Export Options
-AddDropDatabase=Add DROP DATABASE command
-AddDropTable=Add DROP TABLE command
-ExportStructure=Structure
-NameColumn=Name columns
-ExtendedInsert=Extended INSERT
-NoLockBeforeInsert=No lock commands around INSERT
-DelayedInsert=Delayed insert
-EncodeBinariesInHexa=Encode binary data in hexadecimal
-IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
-AutoDetectLang=Autodetect (browser language)
-FeatureDisabledInDemo=Feature disabled in demo
-FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Permissions
-BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
-OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
-ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external modules...
-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 (Note: anyone experienced in PHP programming can provide custom development for an open source project)
-WebSiteDesc=Reference websites to find more modules...
-URL=Link
-BoxesAvailable=Widgets available
-BoxesActivated=Widgets activated
-ActivateOn=Activate on
-ActiveOn=Activated on
-SourceFile=Source file
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
-Required=Required
-UsedOnlyWithTypeOption=Used by some agenda option only
-Security=Security
-Passwords=Passwords
-DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
-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 (Activated 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 make building of a global cumulated pdf not working (like unpaid invoices).
-Feature=Feature
-DolibarrLicense=License
-Developpers=Developers/contributors
-OfficialWebSite=Dolibarr international official web site
-OfficialWebSiteLocal=Local web site (%s)
-OfficialWiki=Dolibarr documentation on Wiki
-OfficialDemo=Dolibarr online demo
-OfficialMarketPlace=Official market place for external modules/addons
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
-ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
-HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
-HelpCenterDesc2=Some part of this service are available in <b>english only</b>.
-CurrentMenuHandler=Current menu handler
-MeasuringUnit=Measuring unit
-LeftMargin=Left margin
-TopMargin=Top margin
-PaperSize=Paper type
-Orientation=Orientation
-SpaceX=Space X
-SpaceY=Space Y
-FontSize=Font size
-Content=Content
-NoticePeriod=Notice period
-NewByMonth=New by month
-Emails=E-mails
-EMailsSetup=E-mails setup
-EMailsDesc=This page allows you to overwrite your PHP parameters for e-mails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless.
-MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
-MAIN_MAIL_EMAIL_FROM=Sender e-mail for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Sender e-mail used for error returns emails sent
-MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
-MAIN_DISABLE_ALL_MAILS=Disable all e-mails sendings (for test purposes or demos)
-MAIN_MAIL_SENDMODE=Method to use to send EMails
-MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
-MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
-MAIN_MAIL_EMAIL_TLS= Use TLS (SSL) encrypt
-MAIN_MAIL_EMAIL_STARTTLS= Use TLS (STARTTLS) encrypt
-MAIN_DISABLE_ALL_SMS=Disable all SMS sendings (for test purposes or demos)
-MAIN_SMS_SENDMODE=Method to use to send SMS
-MAIN_MAIL_SMS_FROM=Default sender phone number for Sms sending
-MAIN_MAIL_DEFAULT_FROMTYPE=Sender e-mail by default for manual sendings (User email or Company email)
-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/
-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 setup
-ModuleFamilyBase=System
-ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
-ModuleFamilyProducts=Products Management (PM)
-ModuleFamilyHr=Human Resource Management (HR)
-ModuleFamilyProjects=Projects/Collaborative work
-ModuleFamilyOther=Other
-ModuleFamilyTechnic=Multi-modules tools
-ModuleFamilyExperimental=Experimental modules
-ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
-ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
-ModuleFamilyInterface=Interfaces with external systems
-MenuHandlers=Menu handlers
-MenuAdmin=Menu editor
-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).
-DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <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>.
-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='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
-YouCanSubmitFile=For this step, you can send package using this tool: Select module file
-CurrentVersion=Dolibarr current version
-CallUpdatePage=Go to the page that updates the database structure and data: %s.
-LastStableVersion=Latest stable version
-LastActivationDate=Latest activation date
-UpdateServerOffline=Update server offline
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
-GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
-GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
-ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
-ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
-DoTestServerAvailability=Test server connectivity
-DoTestSend=Test sending
-DoTestSendHTML=Test sending HTML
-ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
-ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
-UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
-UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
-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...).
-MinLength=Minimum length
-LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
-ExamplesWithCurrentSetup=Examples with current running setup
-ListOfDirectories=List of OpenDocument templates directories
-ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
-NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories
+VersionUnknown=Desconocido
+AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
+AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 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.
-ThemeDir=Skins directory
-ConnectionTimeout=Connexion timeout
-ResponseTimeout=Response timeout
-SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__
-ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
-SecurityToken=Key to secure URLs
-NoSmsEngine=No SMS sender manager available. SMS sender manager are not installed with default distribution (because they depends on an external supplier) but you can find some on %s
-PDF=PDF
-PDFDesc=You can set each global options related to the PDF generation
-PDFAddressForging=Rules to forge address boxes
-HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF
-HideDescOnPDF=Hide products description on generated PDF
-HideRefOnPDF=Hide products ref. on generated PDF
-HideDetailsOnPDF=Hide product lines details on generated PDF
-PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
-Library=Library
-UrlGenerationParameters=Parameters to secure URLs
-SecurityTokenIsUnique=Use a unique securekey parameter for each URL
-EnterRefToBuildUrl=Enter reference for object %s
-GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons to 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
-MassConvert=Launch mass convert
-String=String
-TextLong=Long text
-Int=Integer
-Float=Float
-DateAndTime=Date and hour
-Unique=Unique
-Boolean=Boolean (Checkbox)
-ExtrafieldPhone = Phone
-ExtrafieldPrice = Price
-ExtrafieldMail = Email
-ExtrafieldUrl = Url
-ExtrafieldSelect = Select list
-ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
-ExtrafieldPassword=Password
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
-ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
-LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
-SMS=SMS
-LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
-RefreshPhoneLink=Refresh link
-LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
-KeepEmptyToUseDefault=Keep empty to use default value
-DefaultLink=Default link
-SetAsDefault=Set as default
-ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
-BarcodeInitForThirdparties=Mass barcode init for thirdparties
-BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Init value for next %s empty records
-EraseAllCurrentBarCode=Erase all current barcode values
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
-AllBarcodeReset=All barcode values have been removed
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into 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
-DisplayCompanyInfo=Display company address
-DisplayCompanyManagers=Display manager names
-DisplayCompanyInfoAndManagers=Display company address and manager names
-EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
-ModuleCompanyCodePanicum=Return an empty accountancy code.
-ModuleCompanyCodeDigitaria=Accountancy 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: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-ClickToShowDescription=Click to show description
-# Modules
-Module0Name=Users & groups
-Module0Desc=Users / Employees and Groups management
-Module1Name=Third parties
-Module1Desc=Companies and contact management (customers, prospects...)
-Module2Name=Commercial
-Module2Desc=Commercial management
-Module10Name=Accounting
-Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
-Module20Name=Proposals
-Module20Desc=Commercial proposal management
-Module22Name=Mass E-mailings
-Module22Desc=Mass E-mailing management
-Module23Name=Energy
-Module23Desc=Monitoring the consumption of energies
-Module25Name=Customer Orders
-Module25Desc=Customer order management
-Module30Name=Invoices
-Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
-Module40Name=Suppliers
-Module40Desc=Supplier management and buying (orders and invoices)
-Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
-Module49Name=Editors
-Module49Desc=Editor management
-Module50Name=Products
-Module50Desc=Product management
-Module51Name=Mass mailings
-Module51Desc=Mass paper mailing management
-Module52Name=Stocks
-Module52Desc=Stock management (products)
-Module53Name=Services
-Module53Desc=Service management
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
-Module55Name=Barcodes
-Module55Desc=Barcode management
-Module56Name=Telephony
-Module56Desc=Telephony integration
-Module57Name=Direct bank payment orders
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
-Module58Name=ClickToDial
-Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
-Module70Name=Interventions
-Module70Desc=Intervention management
-Module75Name=Expense and trip notes
-Module75Desc=Expense and trip notes management
-Module80Name=Shipments
-Module80Desc=Shipments and delivery order management
-Module85Name=Banks and cash
-Module85Desc=Management of bank or cash accounts
-Module100Name=External site
-Module100Desc=This module include an external web site or page into Dolibarr menus and view it into a Dolibarr frame
-Module105Name=Mailman and SPIP
-Module105Desc=Mailman or SPIP interface for member module
-Module200Name=LDAP
-Module200Desc=LDAP directory synchronisation
-Module210Name=PostNuke
-Module210Desc=PostNuke integration
-Module240Name=Data exports
-Module240Desc=Tool to export Dolibarr data (with assistants)
-Module250Name=Data imports
-Module250Desc=Tool to import data in Dolibarr  (with assistants)
-Module310Name=Members
-Module310Desc=Foundation members management
-Module320Name=RSS Feed
-Module320Desc=Add RSS feed inside Dolibarr screen pages
-Module330Name=Bookmarks
-Module330Desc=Bookmarks management
-Module400Name=Projects/Opportunities/Leads
-Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
-Module410Name=Webcalendar
-Module410Desc=Webcalendar integration
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
-Module520Name=Loan
-Module520Desc=Management of loans
-Module600Name=Notifications
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
-Module700Name=Donations
-Module700Desc=Donation management
-Module770Name=Expense reports
-Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
-Module1200Name=Mantis
-Module1200Desc=Mantis integration
-Module1400Name=Accounting
-Module1400Desc=Accounting management (double parties)
-Module1520Name=Document Generation
-Module1520Desc=Mass mail document generation
-Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
-Module2000Name=WYSIWYG editor
-Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
-Module2200Name=Dynamic Prices
-Module2200Desc=Enable the usage of math expressions for prices
-Module2300Name=Cron
-Module2300Desc=Scheduled job management
-Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
-Module2500Name=Electronic Content Management
-Module2500Desc=Save and share documents
-Module2600Name=API/Web services (SOAP server)
-Module2600Desc=Enable the Dolibarr SOAP server providing API services
-Module2610Name=API/Web services (REST server)
-Module2610Desc=Enable the Dolibarr REST server providing API services
-Module2660Name=Call WebServices (SOAP client)
-Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
-Module2700Name=Gravatar
-Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
-Module2800Desc=FTP Client
-Module2900Name=GeoIPMaxmind
-Module2900Desc=GeoIP Maxmind conversions capabilities
-Module3100Name=Skype
-Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
-Module4000Name=HRM
-Module4000Desc=Human resources management
-Module5000Name=Multi-company
-Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management
-Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
-Module20000Name=Leave Requests management
-Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Product lot
-Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
-Module50000Name=PayBox
-Module50000Desc=Module to offer an online payment page by credit card with PayBox
-Module50100Name=Point of sales
-Module50100Desc=Point of sales module (POS).
-Module50200Name=Paypal
-Module50200Desc=Module to offer an online payment page by credit card with Paypal
-Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double parties)
-Module54000Name=PrintIPP
-Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
-Module55000Name=Poll, Survey or Vote
-Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
-Module59000Name=Margins
-Module59000Desc=Module to manage margins
-Module60000Name=Commissions
-Module60000Desc=Module to manage commissions
-Module63000Name=Resources
-Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
-Permission11=Read customer invoices
-Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
-Permission14=Validate customer invoices
-Permission15=Send customer invoices by email
-Permission16=Create payments for customer invoices
-Permission19=Delete customer invoices
-Permission21=Read commercial proposals
-Permission22=Create/modify commercial proposals
-Permission24=Validate commercial proposals
-Permission25=Send commercial proposals
-Permission26=Close commercial proposals
-Permission27=Delete commercial proposals
-Permission28=Export commercial proposals
-Permission31=Read products
-Permission32=Create/modify products
-Permission34=Delete products
-Permission36=See/manage hidden products
-Permission38=Export products
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
-Permission44=Delete projects (shared project and projects i'm contact for)
-Permission45=Export projects
-Permission61=Read interventions
-Permission62=Create/modify interventions
-Permission64=Delete interventions
-Permission67=Export interventions
-Permission71=Read members
-Permission72=Create/modify members
-Permission74=Delete members
-Permission75=Setup types of membership
-Permission76=Export data
-Permission78=Read subscriptions
-Permission79=Create/modify subscriptions
-Permission81=Read customers orders
-Permission82=Create/modify customers orders
-Permission84=Validate customers orders
-Permission86=Send customers orders
-Permission87=Close customers orders
-Permission88=Cancel customers orders
-Permission89=Delete customers orders
-Permission91=Read social or fiscal taxes and vat
-Permission92=Create/modify social or fiscal taxes and vat
-Permission93=Delete social or fiscal taxes and vat
-Permission94=Export social or fiscal taxes
-Permission95=Read reports
-Permission101=Read sendings
-Permission102=Create/modify sendings
-Permission104=Validate sendings
-Permission106=Export sendings
-Permission109=Delete sendings
-Permission111=Read financial accounts
-Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
-Permission114=Reconciliate transactions
-Permission115=Export transactions and account statements
-Permission116=Transfers between accounts
-Permission117=Manage cheques dispatching
-Permission121=Read third parties linked to user
-Permission122=Create/modify third parties linked to user
-Permission125=Delete third parties linked to user
-Permission126=Export third parties
-Permission141=Read all projects and tasks (also private projects i am not contact for)
-Permission142=Create/modify all projects and tasks (also private projects i am not 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
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
-Permission167=Export contracts
-Permission171=Read trips and expenses (yours and your subordinates)
-Permission172=Create/modify trips and expenses
-Permission173=Delete trips and expenses
-Permission174=Read all trips and expenses
-Permission178=Export trips and expenses
-Permission180=Read suppliers
-Permission181=Read supplier orders
-Permission182=Create/modify supplier orders
-Permission183=Validate supplier orders
-Permission184=Approve supplier orders
-Permission185=Order or cancel supplier orders
-Permission186=Receive supplier orders
-Permission187=Close supplier orders
-Permission188=Cancel supplier orders
-Permission192=Create lines
-Permission193=Cancel lines
-Permission194=Read the bandwith lines
-Permission202=Create ADSL connections
-Permission203=Order connections orders
-Permission204=Order connections
-Permission205=Manage connections
-Permission206=Read connections
-Permission211=Read Telephony
-Permission212=Order lines
-Permission213=Activate line
-Permission214=Setup Telephony
-Permission215=Setup providers
-Permission221=Read emailings
-Permission222=Create/modify emailings (topic, recipients...)
-Permission223=Validate emailings (allows sending)
-Permission229=Delete emailings
-Permission237=View recipients and info
-Permission238=Manually send mailings
-Permission239=Delete mailings after validation or sent
-Permission241=Read categories
-Permission242=Create/modify categories
-Permission243=Delete categories
-Permission244=See the contents of the hidden categories
-Permission251=Read other users and groups
-PermissionAdvanced251=Read other users
-Permission252=Read permissions of other users
-Permission253=Create/modify other users, groups and permisssions
-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 assignement matters).
-Permission271=Read CA
-Permission272=Read invoices
-Permission273=Issue invoices
-Permission281=Read contacts
-Permission282=Create/modify contacts
-Permission283=Delete contacts
-Permission286=Export contacts
-Permission291=Read tariffs
-Permission292=Set permissions on the tariffs
-Permission293=Modify costumers tariffs
-Permission300=Read bar codes
-Permission301=Create/modify bar codes
-Permission302=Delete bar codes
-Permission311=Read services
-Permission312=Assign service/subscription to contract
-Permission331=Read bookmarks
-Permission332=Create/modify bookmarks
-Permission333=Delete bookmarks
-Permission341=Read its own permissions
-Permission342=Create/modify his own user information
-Permission343=Modify his own password
-Permission344=Modify its own permissions
-Permission351=Read groups
-Permission352=Read groups permissions
-Permission353=Create/modify groups
-Permission354=Delete or disable groups
-Permission358=Export users
-Permission401=Read discounts
-Permission402=Create/modify discounts
-Permission403=Validate discounts
-Permission404=Delete discounts
-Permission510=Read Salaries
-Permission512=Create/modify salaries
-Permission514=Delete salaries
-Permission517=Export salaries
-Permission520=Read Loans
-Permission522=Create/modify loans
-Permission524=Delete loans
-Permission525=Access loan calculator
-Permission527=Export loans
-Permission531=Read services
-Permission532=Create/modify services
-Permission534=Delete services
-Permission536=See/manage hidden services
-Permission538=Export services
-Permission701=Read donations
-Permission702=Create/modify donations
-Permission703=Delete donations
-Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
-Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
-Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission779=Export expense reports
-Permission1001=Read stocks
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
-Permission1004=Read stock movements
-Permission1005=Create/modify stock movements
-Permission1101=Read delivery orders
-Permission1102=Create/modify delivery orders
-Permission1104=Validate delivery orders
-Permission1109=Delete delivery orders
-Permission1181=Read suppliers
-Permission1182=Read supplier orders
-Permission1183=Create/modify supplier orders
-Permission1184=Validate supplier orders
-Permission1185=Approve supplier orders
-Permission1186=Order supplier orders
-Permission1187=Acknowledge receipt of supplier orders
-Permission1188=Delete supplier orders
-Permission1190=Approve (second approval) supplier orders
-Permission1201=Get result of an export
-Permission1202=Create/Modify an export
-Permission1231=Read supplier invoices
-Permission1232=Create/modify supplier invoices
-Permission1233=Validate supplier invoices
-Permission1234=Delete supplier invoices
-Permission1235=Send supplier invoices by email
-Permission1236=Export supplier invoices, attributes and payments
-Permission1237=Export supplier orders and their details
-Permission1251=Run mass imports of external data into database (data load)
-Permission1321=Export customer invoices, attributes and payments
-Permission1322=Reopen a paid bill
-Permission1421=Export customer orders and attributes
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
-Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
-Permission20006=Admin leave requests (setup and update balance)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
-Permission2401=Read actions (events or tasks) linked to his account
-Permission2402=Create/modify actions (events or tasks) linked to his account
-Permission2403=Delete actions (events or tasks) linked to his account
-Permission2411=Read actions (events or tasks) of others
-Permission2412=Create/modify actions (events or tasks) of others
-Permission2413=Delete actions (events or tasks) of others
-Permission2414=Export actions/tasks of others
-Permission2501=Read/Download documents
-Permission2502=Download documents
-Permission2503=Submit or delete documents
-Permission2515=Setup documents directories
-Permission2801=Use FTP client in read mode (browse and download only)
-Permission2802=Use FTP client in write mode (delete or upload files)
-Permission50101=Use Point of sales
-Permission50201=Read transactions
-Permission50202=Import transactions
-Permission54001=Print
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
-Permission59003=Read every user margin
-Permission63001=Read resources
-Permission63002=Create/modify resources
-Permission63003=Delete resources
-Permission63004=Link resources to agenda events
-DictionaryCompanyType=Types of thirdparties
-DictionaryCompanyJuridicalType=Legal forms of thirdparties
-DictionaryProspectLevel=Prospect potential level
-DictionaryCanton=State/Province
-DictionaryRegion=Regions
-DictionaryCountry=Countries
-DictionaryCurrency=Currencies
-DictionaryCivility=Personal and professional titles
-DictionaryActions=Types of agenda events
-DictionarySocialContributions=Social or fiscal taxes types
-DictionaryVAT=VAT Rates or Sales Tax Rates
-DictionaryRevenueStamp=Amount of revenue stamps
-DictionaryPaymentConditions=Payment terms
-DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact/Address types
-DictionaryEcotaxe=Ecotax (WEEE)
-DictionaryPaperFormat=Paper formats
-DictionaryFormatCards=Cards formats
-DictionaryFees=Types of fees
-DictionarySendingMethods=Shipping methods
-DictionaryStaff=Staff
-DictionaryAvailability=Delivery delay
-DictionaryOrderMethods=Ordering methods
-DictionarySource=Origin of proposals/orders
-DictionaryAccountancyCategory=Accounting account groups
-DictionaryAccountancysystem=Models for chart of accounts
-DictionaryEMailTemplates=Emails templates
-DictionaryUnits=Units
-DictionaryProspectStatus=Prospection status
-DictionaryHolidayTypes=Types of leaves
-DictionaryOpportunityStatus=Opportunity status for project/lead
-SetupSaved=Setup saved
-BackToModuleList=Back to modules list
-BackToDictionaryList=Back to dictionaries list
-VATManagement=VAT Management
-VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
-VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies.
-VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
-##### Local Taxes #####
-LTRate=Rate
-LocalTax1IsNotUsed=Do not use second tax
-LocalTax1IsUsedDesc=Use a second type of tax (other than VAT)
-LocalTax1IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax1Management=Second type of tax
-LocalTax1IsUsedExample=
-LocalTax1IsNotUsedExample=
-LocalTax2IsNotUsed=Do not use third tax
-LocalTax2IsUsedDesc=Use a third type of tax (other than VAT)
-LocalTax2IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax2Management=Third type of tax
-LocalTax2IsUsedExample=
-LocalTax2IsNotUsedExample=
-LocalTax1ManagementES= RE Management
-LocalTax1IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If te buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
-LocalTax1IsNotUsedDescES= By default the proposed RE is 0. End of rule.
-LocalTax1IsUsedExampleES= In Spain they are professionals subject to some specific sections of the Spanish IAE.
-LocalTax1IsNotUsedExampleES= In Spain they are professional and societies and subject to certain sections of the Spanish IAE.
-LocalTax2ManagementES= IRPF Management
-LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
-LocalTax2IsNotUsedDescES= By default the proposed IRPF is 0. End of rule.
-LocalTax2IsUsedExampleES= In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
-LocalTax2IsNotUsedExampleES= In Spain they are bussines not subject to tax system of modules.
-CalcLocaltax=Reports on local taxes
-CalcLocaltax1=Sales - Purchases
-CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2=Purchases
-CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3=Sales
-CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
-LabelUsedByDefault=Label used by default if no translation can be found for code
-LabelOnDocuments=Label on documents
-NbOfDays=Nb of days
-AtEndOfMonth=At end of month
-CurrentNext=Current/Next
-Offset=Offset
-AlwaysActive=Always active
-Upgrade=Upgrade
-MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Deploy/install external module
-WebServer=Web server
-DocumentRootServer=Web server's root directory
-DataRootServer=Data files directory
-IP=IP
-Port=Port
-VirtualServerName=Virtual server name
-OS=OS
-PhpWebLink=Web-Php link
-Browser=Browser
-Server=Server
-Database=Database
-DatabaseServer=Database host
-DatabaseName=Database name
-DatabasePort=Database port
-DatabaseUser=Database user
-DatabasePassword=Database password
-Tables=Tables
-TableName=Table name
-NbOfRecord=Nb of records
-Host=Server
-DriverType=Driver type
-SummarySystem=System information summary
-SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Foundation
-DefaultMenuManager= Standard menu manager
-DefaultMenuSmartphoneManager=Smartphone menu manager
-Skin=Skin theme
-DefaultSkin=Default skin theme
-MaxSizeList=Max length for list
-DefaultMaxSizeList=Default max length for lists
-DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
-MessageOfDay=Message of the day
-MessageLogin=Login page message
-PermanentLeftSearchForm=Permanent search form on left menu
-DefaultLanguage=Default language to use (language code)
-EnableMultilangInterface=Enable multilingual interface
-EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/foundation information
-CompanyIds=Company/foundation identities
-CompanyName=Name
-CompanyAddress=Address
-CompanyZip=Zip
-CompanyTown=Town
-CompanyCountry=Country
-CompanyCurrency=Main currency
-CompanyObject=Object of the company
-Logo=Logo
-DoNotSuggestPaymentMode=Do not suggest
-NoActiveBankAccountDefined=No active bank account defined
-OwnerOfBankAccount=Owner of bank account %s
-BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show link "<strong>%s</strong>"
-Alerts=Alerts
-DelaysOfToleranceBeforeWarning=Tolerance delays before warning
-DelaysOfToleranceDesc=This screen allows you to define the tolerated delays before an alert is reported on screen with picto %s for each late element.
-Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned events (agenda events) not completed yet
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Delay tolerance (in days) before alert on project not closed in time
-Delays_MAIN_DELAY_TASKS_TODO=Delay tolerance (in days) before alert on planned tasks (project tasks) not completed yet
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on orders not processed yet
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on suppliers orders not processed yet
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Delay tolerance (in days) before alert on proposals to close
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Delay tolerance (in days) before alert on proposals not billed
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerance delay (in days) before alert on services to activate
-Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerance delay (in days) before alert on expired services
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerance delay (in days) before alert on unpaid supplier invoices
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerence delay (in days) before alert on unpaid client invoices
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerance delay (in days) before alert on pending bank reconciliation
-Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed membership fee
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
-Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
-SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
-SetupDescription5=Other menu entries manage optional parameters.
-LogEvents=Security audit events
-Audit=Audit
-InfoDolibarr=About Dolibarr
-InfoBrowser=About Browser
-InfoOS=About OS
-InfoWebServer=About Web Server
-InfoDatabase=About Database
-InfoPHP=About PHP
-InfoPerf=About Performances
-BrowserName=Browser name
-BrowserOS=Browser OS
-ListOfSecurityEvents=List of Dolibarr security events
-SecurityEventsPurged=Security events purged
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
-SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
-SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
-DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
-AvailableModules=Available 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.
-TriggersAvailable=Available triggers
-TriggersDesc=Triggers are files that will modify the behaviour of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realised new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
-TriggerDisabledByName=Triggers in this file are disabled by the <b>-NORUN</b> suffix in their name.
-TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module <b>%s</b> is disabled.
-TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules.
-TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
-GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password
-DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">check here</a>.
-MiscellaneousDesc=All other security related parameters are defined here.
-LimitsSetup=Limits/Precision setup
-LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here
-MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices
-MAIN_MAX_DECIMALS_TOT=Max decimals for total prices
-MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add <b>...</b> after this number if you want to see <b>...</b> when number is truncated when shown on screen)
-MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
-UnitPriceOfProduct=Net unit price of a product
-TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
-ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
-NoEventFoundWithCriteria=No security event has been found for such search criterias.
-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.
-BackupDescX=Archived directory should be stored in a secure place.
-BackupDescY=The generated dump file should be stored in a secure place.
-BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one
-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 directoy (<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=Available database backup dump files
-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
-DownloadMoreSkins=More skins to download
-SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence without hole and with no reset
-ShowProfIdInAddress=Show professionnal id with addresses on documents
-ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents
-TranslationUncomplete=Partial translation
-MAIN_DISABLE_METEO=Disable meteo view
-TestLoginToAPI=Test login to API
-ProxyDesc=Some features of Dolibarr need to have an Internet access to work. Define here parameters for this. If the Dolibarr server is behind a Proxy server, those parameters tells Dolibarr how to access Internet through it.
-ExternalAccess=External access
-MAIN_PROXY_USE=Use a proxy server (otherwise direct access to internet)
-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 all attributes, not already available by default, and that you want to be supported for %s.
-ExtraFields=Complementary attributes
-ExtraFieldsLines=Complementary attributes (lines)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
-ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact/address)
-ExtraFieldsMember=Complementary attributes (member)
-ExtraFieldsMemberType=Complementary attributes (member type)
-ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
-ExtraFieldsSupplierOrders=Complementary attributes (orders)
-ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
-ExtraFieldsProject=Complementary attributes (projects)
-ExtraFieldsProjectTask=Complementary attributes (tasks)
-ExtraFieldHasWrongValue=Attribute %s has a wrong value.
-AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
-SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
-PathToDocuments=Path to documents
-PathDirectory=Directory
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might 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.
-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: <strong>User display setup</strong> tab of 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
-TranslationString=Translation string
-CurrentTranslationString=Current translation string
-WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
-NewTranslationStringToShow=New translation string to show
-OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
-YouMustEnableOneModule=You must at least enable 1 module
-ClassNotFoundIntoPathWarning=Class %s not found into PHP path
-YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
-SuhosinSessionEncrypt=Session storage encrypted by Suhosin
-ConditionIsCurrently=Condition is currently %s
-YouUseBestDriver=You use driver %s that is best driver available currently.
-YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required 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.
-BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance.
-BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
-AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp".
-AskForPreferredShippingMethod=Ask for preferred Sending Method for Third Parties.
-FieldEdition=Edition of field %s
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
-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.
-PasswordGenerationPerso=Return a password according to your personally defined configuration.
-SetupPerso=According to your configuration
-PasswordPatternDesc=Password pattern description
-##### Users setup #####
-RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passwords
-DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page
-UsersSetup=Users module setup
-UserMailRequired=EMail required to create a new user
-##### HRM setup #####
-HRMSetup=HRM module setup
-##### Company setup #####
-CompanySetup=Companies module setup
-CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier)
-AccountCodeManager=Module for accountancy code generation (customer or supplier)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
-NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
-NotificationsDescGlobal=* or by setting global target emails in module setup page.
-ModelModules=Documents templates
-DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
-WatermarkOnDraft=Watermark on draft document
-JSOnPaimentBill=Activate feature to autofill payment lines on payment form
-CompanyIdProfChecker=Rules on Professional Ids
-MustBeUnique=Must be unique?
-MustBeMandatory=Mandatory to create third parties?
-MustBeInvoiceMandatory=Mandatory to validate invoices?
-##### Webcal setup #####
-WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
-##### Invoices #####
-BillsSetup=Invoices module setup
-BillsNumberingModule=Invoices and credit notes numbering model
-BillsPDFModules=Invoice documents models
-CreditNote=Credit note
-CreditNotes=Credit notes
-ForceInvoiceDate=Force invoice date to validation date
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
-SuggestPaymentByRIBOnAccount=Suggest payment by withdraw on account
-SuggestPaymentByChequeToAddress=Suggest payment by cheque to
-FreeLegalTextOnInvoices=Free text on invoices
-WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
-PaymentsNumberingModule=Payments numbering model
-SuppliersPayment=Suppliers payments
-SupplierPaymentSetup=Suppliers payments setup
-##### Proposals #####
-PropalSetup=Commercial proposals module setup
-ProposalsNumberingModules=Commercial proposal numbering models
-ProposalsPDFModules=Commercial proposal documents models
-FreeLegalTextOnProposal=Free text on commercial proposals
-WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
-WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
-##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
-##### Orders #####
-OrdersSetup=Order management setup
-OrdersNumberingModules=Orders numbering models
-OrdersModelModule=Order documents models
-FreeLegalTextOnOrders=Free text on orders
-WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
-ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Interventions #####
-InterventionsSetup=Interventions module setup
-FreeLegalTextOnInterventions=Free text on intervention documents
-FicheinterNumberingModules=Intervention numbering models
-TemplatePDFInterventions=Intervention card documents models
-WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
-##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
-ContractsNumberingModules=Contracts numbering modules
-TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
-##### Members #####
-MembersSetup=Members module setup
-MemberMainOptions=Main options
-AdherentLoginRequired= Manage a Login for each member
-AdherentMailRequired=EMail required to create a new member
-MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
-##### LDAP setup #####
-LDAPSetup=LDAP Setup
-LDAPGlobalParameters=Global parameters
-LDAPUsersSynchro=Users
-LDAPGroupsSynchro=Groups
-LDAPContactsSynchro=Contacts
-LDAPMembersSynchro=Members
-LDAPSynchronization=LDAP synchronisation
-LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP
-LDAPToDolibarr=LDAP -> Dolibarr
-DolibarrToLDAP=Dolibarr -> LDAP
-LDAPNamingAttribute=Key in LDAP
-LDAPSynchronizeUsers=Organization of users in LDAP
-LDAPSynchronizeGroups=Organization of groups in LDAP
-LDAPSynchronizeContacts=Organization of contacts in LDAP
-LDAPSynchronizeMembers=Organization of foundation's members in LDAP
-LDAPPrimaryServer=Primary server
-LDAPSecondaryServer=Secondary server
-LDAPServerPort=Server port
-LDAPServerPortExample=Default port : 389
-LDAPServerProtocolVersion=Protocol version
-LDAPServerUseTLS=Use TLS
-LDAPServerUseTLSExample=Your LDAP server use TLS
-LDAPServerDn=Server DN
-LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
-LDAPPassword=Administrator password
-LDAPUserDn=Users' DN
-LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
-LDAPGroupDn=Groups' DN
-LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com)
-LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
-LDAPServerDnExample=Complete DN (ex: dc=example,dc=com)
-LDAPDnSynchroActive=Users and groups synchronization
-LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization
-LDAPDnContactActive=Contacts' synchronization
-LDAPDnContactActiveExample=Activated/Unactivated synchronization
-LDAPDnMemberActive=Members' synchronization
-LDAPDnMemberActiveExample=Activated/Unactivated synchronization
-LDAPContactDn=Dolibarr contacts' DN
-LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com)
-LDAPMemberDn=Dolibarr members DN
-LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com)
-LDAPMemberObjectClassList=List of objectClass
-LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPUserObjectClassList=List of objectClass
-LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPGroupObjectClassList=List of objectClass
-LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
-LDAPContactObjectClassList=List of objectClass
-LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPTestConnect=Test LDAP connection
-LDAPTestSynchroContact=Test contacts synchronization
-LDAPTestSynchroUser=Test user synchronization
-LDAPTestSynchroGroup=Test group synchronization
-LDAPTestSynchroMember=Test member synchronization
-LDAPTestSearch= Test a LDAP search
-LDAPSynchroOK=Synchronization test successful
-LDAPSynchroKO=Failed synchronization test
-LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that connexion to server is correctly configured and allows LDAP udpates
-LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s)
-LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s)
-LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPBindKO=Connect/Authentificate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPSetupForVersion3=LDAP server configured for version 3
-LDAPSetupForVersion2=LDAP server configured for version 2
-LDAPDolibarrMapping=Dolibarr Mapping
-LDAPLdapMapping=LDAP Mapping
-LDAPFieldLoginUnix=Login (unix)
-LDAPFieldLoginExample=Example : uid
-LDAPFilterConnection=Search filter
-LDAPFilterConnectionExample=Example : &(objectClass=inetOrgPerson)
-LDAPFieldLoginSamba=Login (samba, activedirectory)
-LDAPFieldLoginSambaExample=Example : samaccountname
-LDAPFieldFullname=Full name
-LDAPFieldFullnameExample=Example : cn
-LDAPFieldPasswordNotCrypted=Password not crypted
-LDAPFieldPasswordCrypted=Password crypted
-LDAPFieldPasswordExample=Example : userPassword
-LDAPFieldCommonNameExample=Example : cn
-LDAPFieldName=Name
-LDAPFieldNameExample=Example : sn
-LDAPFieldFirstName=First name
-LDAPFieldFirstNameExample=Example : givenName
-LDAPFieldMail=Email address
-LDAPFieldMailExample=Example : mail
-LDAPFieldPhone=Professional phone number
-LDAPFieldPhoneExample=Example : telephonenumber
-LDAPFieldHomePhone=Personal phone number
-LDAPFieldHomePhoneExample=Example : homephone
-LDAPFieldMobile=Cellular phone
-LDAPFieldMobileExample=Example : mobile
-LDAPFieldFax=Fax number
-LDAPFieldFaxExample=Example : facsimiletelephonenumber
-LDAPFieldAddress=Street
-LDAPFieldAddressExample=Example : street
-LDAPFieldZip=Zip
-LDAPFieldZipExample=Example : postalcode
-LDAPFieldTown=Town
-LDAPFieldTownExample=Example : l
-LDAPFieldCountry=Country
-LDAPFieldDescription=Description
-LDAPFieldDescriptionExample=Example : description
-LDAPFieldNotePublic=Public Note
-LDAPFieldNotePublicExample=Example : publicnote
-LDAPFieldGroupMembers= Group members
-LDAPFieldGroupMembersExample= Example : uniqueMember
-LDAPFieldBirthdate=Birthdate
-LDAPFieldCompany=Company
-LDAPFieldCompanyExample=Example : o
-LDAPFieldSid=SID
-LDAPFieldSidExample=Example : objectsid
-LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Job position
-LDAPFieldTitleExample=Example: title
-LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
-LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
-LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts.
-LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users.
-LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups.
-LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module.
-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 advices related to performance.
-NotInstalled=Not installed, so your server is not slow 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.
-MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
-MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
-OPCodeCache=OPCode cache
-NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad).
-HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
-FilesOfTypeCached=Files of type %s are cached by HTTP server
-FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
-FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
-FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
-CacheByServer=Cache by server
-CacheByClient=Cache by browser
-CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
-##### Products #####
-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)
-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 third party language
-UseSearchToSelectProductTooltip=Also if you have a large number of product (> 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)
-SetDefaultBarcodeTypeProducts=Default barcode type to use for products
-SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
-ProductCodeChecker= Module for product code generation and checking (product or service)
-ProductOtherConf= Product / Service configuration
-IsNotADir=is not a directory!
-##### Syslog #####
-SyslogSetup=Logs module setup
-SyslogOutput=Logs outputs
-SyslogFacility=Facility
-SyslogLevel=Level
-SyslogFilename=File name and path
-YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
-ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
-##### Donations #####
-DonationsSetup=Donation module setup
-DonationsReceiptModel=Template of donation receipt
-##### Barcode #####
-BarcodeSetup=Barcode setup
-PaperFormatModule=Print format module
-BarcodeEncodeModule=Barcode encoding type
-CodeBarGenerator=Barcode generator
-ChooseABarCode=No generator defined
-FormatNotSupportedByGenerator=Format not supported by this generator
-BarcodeDescEAN8=Barcode of type EAN8
-BarcodeDescEAN13=Barcode of type EAN13
-BarcodeDescUPC=Barcode of type UPC
-BarcodeDescISBN=Barcode of type ISBN
-BarcodeDescC39=Barcode of type C39
-BarcodeDescC128=Barcode of type C128
-BarcodeDescDATAMATRIX=Barcode of type Datamatrix
-BarcodeDescQRCODE=Barcode of type QR code
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
-BarcodeInternalEngine=Internal engine
-BarCodeNumberManager=Manager to auto define barcode numbers
-##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct debit payment orders
-##### ExternalRSS #####
-ExternalRSSSetup=External RSS imports setup
-NewRSS=New RSS Feed
-RSSUrl=RSS URL
-RSSUrlExample=An interesting RSS feed
-##### Mailing #####
-MailingSetup=EMailing module setup
-MailingEMailFrom=Sender EMail (From) for emails sent by emailing module
-MailingEMailError=Return EMail (Errors-to) for emails with errors
-MailingDelay=Seconds to wait after sending next message
-##### Notification #####
-NotificationSetup=EMail notification module setup
-NotificationEMailFrom=Sender EMail (From) for emails sent for notifications
-FixedEmailTarget=Fixed email target
-##### Sendings #####
-SendingsSetup=Sending module setup
-SendingsReceiptModel=Sending receipt model
-SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
-FreeLegalTextOnShippings=Free text on shipments
-##### Deliveries #####
-DeliveryOrderNumberingModules=Products deliveries receipt numbering module
-DeliveryOrderModel=Products deliveries receipt model
-DeliveriesOrderAbility=Support products deliveries receipts
-FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
-##### FCKeditor #####
-AdvancedEditor=Advanced editor
-ActivateFCKeditor=Activate advanced editor for:
-FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
-FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files.</font>
-FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
-FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
-##### OSCommerce 1 #####
-OSCommerceErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be an OSCommerce database (Key %s not found in table %s).
-OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' successfull.
-OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
-OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
-##### Stock #####
-StockSetup=Warehouse module setup
-IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
-##### Menu #####
-MenuDeleted=Menu deleted
-Menus=Menus
-TreeMenuPersonalized=Personalized menus
-NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
-NewMenu=New menu
-Menu=Selection of menu
-MenuHandler=Menu handler
-MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
-DetailId=Id menu
-DetailMenuHandler=Menu handler where to show new menu
-DetailMenuModule=Module name if menu entry come from a module
-DetailType=Type of menu (top or left)
-DetailTitre=Menu label or label code for translation
-DetailUrl=URL where menu send you (Absolute URL link or external link with http://)
-DetailEnabled=Condition to show or not entry
-DetailRight=Condition to display unauthorized grey menus
-DetailLangs=Lang file name for label code translation
-DetailUser=Intern / Extern / All
-Target=Target
-DetailTarget=Target for links (_blank top open a new window)
-DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu)
-ModifMenu=Menu change
-DeleteMenu=Delete menu entry
-ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
-FailedToInitializeMenu=Failed to initialize menu
-##### Tax #####
-TaxSetup=Taxes, social or fiscal taxes and dividends module setup
-OptionVatMode=VAT due
-OptionVATDefault=Cash basis
-OptionVATDebitOption=Accrual basis
-OptionVatDefaultDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on payments for services
-OptionVatDebitOptionDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on invoice (debit) for services
-SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
-OnDelivery=On delivery
-OnPayment=On payment
-OnInvoice=On invoice
-SupposedToBePaymentDate=Payment date used
-SupposedToBeInvoiceDate=Invoice date used
-Buy=Buy
-Sell=Sell
-InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
-AccountancyCode=Accountancy Code
-AccountancyCodeSell=Sale 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 -> Dictionary -> 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_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
-AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### 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 your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your 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.
-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 same computer than 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.
-##### Point Of Sales (CashDesk) #####
-CashDesk=Point of sales
-CashDeskSetup=Point of sales module setup
-CashDeskThirdPartyForSell=Default generic third party to use for sells
-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).
-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
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
-##### Bookmark #####
-BookmarkSetup=Bookmark module setup
-BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu.
-NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu
-##### WebServices #####
-WebServicesSetup=Webservices module setup
-WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
-WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
-EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
-##### API ####
-ApiSetup=API module setup
-ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
-OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
-ApiKey=Key for API
-WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
-##### Bank #####
-BankSetupModule=Bank module setup
-FreeLegalTextOnChequeReceipts=Free text on cheque receipts
-BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
-BankOrderGlobal=General
-BankOrderGlobalDesc=General display order
-BankOrderES=Spanish
-BankOrderESDesc=Spanish display order
-ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
-##### Multicompany #####
-MultiCompanySetup=Multi-company module setup
-##### Suppliers #####
-SuppliersSetup=Supplier module setup
-SuppliersCommandModel=Complete template of supplier order (logo...)
-SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
-SuppliersInvoiceNumberingModel=Supplier invoices numbering models
-IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
-##### GeoIPMaxmind #####
-GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
-NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
-YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
-YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
-TestGeoIPResult=Test of a conversion IP -> country
-##### Projects #####
-ProjectsNumberingModules=Projects numbering module
-ProjectsSetup=Project module setup
-ProjectsModelModule=Project reports document model
-TasksNumberingModules=Tasks numbering module
-TaskModelModule=Tasks reports document model
-UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
-##### ECM (GED) #####
-##### Fiscal Year #####
-AccountingPeriods=Accounting periods
-AccountingPeriodCard=Accounting period
-NewFiscalYear=New accounting period
-OpenFiscalYear=Open accounting period
-CloseFiscalYear=Close accounting period
-DeleteFiscalYear=Delete accounting period
-ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
-ShowFiscalYear=Show accounting period
-AlwaysEditable=Can always be edited
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
-Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
-IncludePath=Include path (defined into variable %s)
-ExpenseReportsSetup=Setup of module Expense Reports
-TemplatePDFExpenseReports=Document templates to generate expense report document
-NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
-YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of 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
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/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.
-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.
-ConfFileMuseContainCustom=Installing 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)
-TextTitleColor=Color of page title
-LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
-NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
-BackgroundColor=Background color
-TopMenuBackgroundColor=Background color for Top menu
-TopMenuDisableImages=Hide images in Top menu
-LeftMenuBackgroundColor=Background color for Left menu
-BackgroundTableTitleColor=Background color for Table title line
-BackgroundTableLineOddColor=Background color for odd table lines
-BackgroundTableLineEvenColor=Background color for even table lines
-MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
-NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
-UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
-PositionIntoComboList=Position of line into combo lists
-SellTaxRate=Sale tax rate
-RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
-UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipping, you can enter it here. You can use the key {TRACKID} into URL parameters so the system will replace it with value of tracking number user entered into shipment card.
-OpportunityPercent=When you create an opportunity, you will defined an estimated amount of project/lead. According to status of opportunity, this amount may be multiplicated 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
-FixTZ=TimeZone fix
-FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
-ExpectedChecksum=Expected Checksum
-CurrentChecksum=Current Checksum
-ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the latest stable version
-TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
-TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so 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 usefull only if your prices for each leve 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.
-SeeSubstitutionVars=See * note for list of possible substitution variables
-AllPublishers=All publishers
-UnknownPublishers=Unknown publishers
-AddRemoveTabs=Add or remove tabs
-AddDictionaries=Add dictionaries
-AddBoxes=Add widgets
-AddSheduledJobs=Add scheduled jobs
-AddHooks=Add hooks
-AddTriggers=Add triggers
-AddMenus=Add menus
-AddPermissions=Add permissions
-AddExportProfiles=Add export profiles
-AddImportProfiles=Add import profiles
-AddOtherPagesOrServices=Add other pages or services
-AddModels=Add document or numbering templates
-AddSubstitutions=Add keys substitutions
-DetectionNotPossible=Detection not possible
-UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved on 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 correclty. 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 inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <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
-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
-TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
-##### Resource ####
-ResourceSetup=Configuration du module Resource
-UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
diff --git a/htdocs/langs/es_PA/main.lang b/htdocs/langs/es_PA/main.lang
index 2fdcb824dd1..1602d6a7ffa 100644
--- a/htdocs/langs/es_PA/main.lang
+++ b/htdocs/langs/es_PA/main.lang
@@ -1,9 +1,5 @@
 # Dolibarr language file - Source file is en_US - main
 DIRECTION=ltr
-# Note for Chinese:
-# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
-# stsongstdlight or cid0cs are for simplified Chinese
-# To read Chinese pdf with Linux: sudo apt-get install poppler-data
 FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=,
@@ -23,799 +19,3 @@ FormatDateHourShort=%d/%m/%Y %H:%M
 FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
-DatabaseConnection=Database connection
-NoTemplateDefined=No template defined for this email type
-AvailableVariables=Available substitution variables
-NoTranslation=No translation
-NoRecordFound=No record found
-NoRecordDeleted=No record deleted
-NotEnoughDataYet=Not enough data
-NoError=No error
-Error=Error
-Errors=Errors
-ErrorFieldRequired=Field '%s' is required
-ErrorFieldFormat=Field '%s' has a bad value
-ErrorFileDoesNotExists=File %s does not exist
-ErrorFailedToOpenFile=Failed to open file %s
-ErrorCanNotCreateDir=Cannot create dir %s
-ErrorCanNotReadDir=Cannot read dir %s
-ErrorConstantNotDefined=Parameter %s not defined
-ErrorUnknown=Unknown error
-ErrorSQL=SQL Error
-ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this
-ErrorGoToModuleSetup=Go to Module setup to fix this
-ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
-ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
-ErrorInternalErrorDetected=Error detected
-ErrorWrongHostParameter=Wrong host parameter
-ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post again the form.
-ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child records.
-ErrorWrongValue=Wrong value
-ErrorWrongValueForParameterX=Wrong value for parameter %s
-ErrorNoRequestInError=No request in error
-ErrorServiceUnavailableTryLater=Service not available for 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>.
-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 nb of record per page
-NotAuthorized=You are not authorized to do that.
-SetDate=Set date
-SelectDate=Select a date
-SeeAlso=See also %s
-SeeHere=See here
-Apply=Apply
-BackgroundColorByDefault=Default background color
-FileRenamed=The file was successfully renamed
-FileUploaded=The file was successfully uploaded
-FileGenerated=The file was successfully generated
-FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
-NbOfEntries=Nb of entries
-GoToWikiHelpPage=Read online help (Internet access needed)
-GoToHelpPage=Read help
-RecordSaved=Record saved
-RecordDeleted=Record deleted
-LevelOfFeature=Level of features
-NotDefined=Not defined
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
-Administrator=Administrator
-Undefined=Undefined
-PasswordForgotten=Password forgotten?
-SeeAbove=See above
-HomeArea=Home area
-LastConnexion=Latest connection
-PreviousConnexion=Previous connection
-PreviousValue=Previous value
-ConnectedOnMultiCompany=Connected on environment
-ConnectedSince=Connected since
-AuthenticationMode=Authentication mode
-RequestedUrl=Requested URL
-DatabaseTypeManager=Database type manager
-RequestLastAccessInError=Latest database access request error
-ReturnCodeLastAccessInError=Return code for latest database access request error
-InformationLastAccessInError=Information for latest database access request error
-DolibarrHasDetectedError=Dolibarr has detected a technical error
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes
-MoreInformation=More information
-TechnicalInformation=Technical information
-TechnicalID=Technical ID
-NotePublic=Note (public)
-NotePrivate=Note (private)
-PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
-DoTest=Test
-ToFilter=Filter
-NoFilter=No filter
-WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance delay.
-yes=yes
-Yes=Yes
-no=no
-No=No
-All=All
-Home=Home
-Help=Help
-OnlineHelp=Online help
-PageWiki=Wiki page
-MediaBrowser=Media browser
-Always=Always
-Never=Never
-Under=under
-Period=Period
-PeriodEndDate=End date for period
-Activate=Activate
-Activated=Activated
-Closed=Closed
-Closed2=Closed
-NotClosed=Not closed
-Enabled=Enabled
-Deprecated=Deprecated
-Disable=Disable
-Disabled=Disabled
-Add=Add
-AddLink=Add link
-RemoveLink=Remove link
-AddToDraft=Add to draft
-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>?
-Delete=Delete
-Remove=Remove
-Resiliate=Terminate
-Cancel=Cancel
-Modify=Modify
-Edit=Edit
-Validate=Validate
-ValidateAndApprove=Validate and Approve
-ToValidate=To validate
-Save=Save
-SaveAs=Save As
-TestConnection=Test connection
-ToClone=Clone
-ConfirmClone=Choose data you want to clone :
-NoCloneOptionsSpecified=No data to clone defined.
-Of=of
-Go=Go
-Run=Run
-CopyOf=Copy of
-Show=Show
-Hide=Hide
-ShowCardHere=Show card
-Search=Search
-SearchOf=Search
-Valid=Valid
-Approve=Approve
-Disapprove=Disapprove
-ReOpen=Re-Open
-Upload=Send file
-ToLink=Link
-Select=Select
-Choose=Choose
-Resize=Resize
-Recenter=Recenter
-Author=Author
-User=User
-Users=Users
-Group=Group
-Groups=Groups
-NoUserGroupDefined=No user group defined
-Password=Password
-PasswordRetype=Retype your password
-NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
-Name=Name
-Person=Person
-Parameter=Parameter
-Parameters=Parameters
-Value=Value
-PersonalValue=Personal value
-NewValue=New value
-CurrentValue=Current value
-Code=Code
-Type=Type
-Language=Language
-MultiLanguage=Multi-language
-Note=Note
-Title=Title
-Label=Label
-RefOrLabel=Ref. or label
-Info=Log
-Family=Family
-Description=Description
-Designation=Description
-Model=Doc template
-DefaultModel=Default doc template
-Action=Event
-About=About
-Number=Number
-NumberByMonth=Number by month
-AmountByMonth=Amount by month
-Numero=Number
-Limit=Limit
-Limits=Limits
-Logout=Logout
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Connection
-Setup=Setup
-Alert=Alert
-Previous=Previous
-Next=Next
-Cards=Cards
-Card=Card
-Now=Now
-HourStart=Start hour
-Date=Date
-DateAndHour=Date and hour
-DateToday=Today's date
-DateReference=Reference date
-DateStart=Start date
-DateEnd=End date
-DateCreation=Creation date
-DateCreationShort=Creat. date
-DateModification=Modification date
-DateModificationShort=Modif. date
-DateLastModification=Latest modification date
-DateValidation=Validation date
-DateClosing=Closing date
-DateDue=Due date
-DateValue=Value date
-DateValueShort=Value date
-DateOperation=Operation date
-DateOperationShort=Oper. Date
-DateLimit=Limit date
-DateRequest=Request date
-DateProcess=Process date
-DateBuild=Report build date
-DatePayment=Date of payment
-DateApprove=Approving date
-DateApprove2=Approving date (second approval)
-UserCreation=Creation user
-UserModification=Modification user
-UserCreationShort=Creat. user
-UserModificationShort=Modif. user
-DurationYear=year
-DurationMonth=month
-DurationWeek=week
-DurationDay=day
-DurationYears=years
-DurationMonths=months
-DurationWeeks=weeks
-DurationDays=days
-Year=Year
-Month=Month
-Week=Week
-WeekShort=Week
-Day=Day
-Hour=Hour
-Minute=Minute
-Second=Second
-Years=Years
-Months=Months
-Days=Days
-days=days
-Hours=Hours
-Minutes=Minutes
-Seconds=Seconds
-Weeks=Weeks
-Today=Today
-Yesterday=Yesterday
-Tomorrow=Tomorrow
-Morning=Morning
-Afternoon=Afternoon
-Quadri=Quadri
-MonthOfDay=Month of the day
-HourShort=H
-MinuteShort=mn
-Rate=Rate
-CurrencyRate=Currency conversion rate
-UseLocalTax=Include tax
-Bytes=Bytes
-KiloBytes=Kilobytes
-MegaBytes=Megabytes
-GigaBytes=Gigabytes
-TeraBytes=Terabytes
-b=b.
-Kb=Kb
-Mb=Mb
-Gb=Gb
-Tb=Tb
-Cut=Cut
-Copy=Copy
-Paste=Paste
-Default=Default
-DefaultValue=Default value
-Price=Price
-UnitPrice=Unit price
-UnitPriceHT=Unit price (net)
-UnitPriceTTC=Unit price
-PriceU=U.P.
-PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (currency)
-PriceUTTC=U.P. (inc. tax)
-Amount=Amount
-AmountInvoice=Invoice amount
-AmountPayment=Payment amount
-AmountHTShort=Amount (net)
-AmountTTCShort=Amount (inc. tax)
-AmountHT=Amount (net of tax)
-AmountTTC=Amount (inc. tax)
-AmountVAT=Amount tax
-MulticurrencyAlreadyPaid=Already payed, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
-MulticurrencyAmountHT=Amount (net of tax), original currency
-MulticurrencyAmountTTC=Amount (inc. of tax), original currency
-MulticurrencyAmountVAT=Amount tax, original currency
-AmountLT1=Amount tax 2
-AmountLT2=Amount tax 3
-AmountLT1ES=Amount RE
-AmountLT2ES=Amount IRPF
-AmountTotal=Total amount
-AmountAverage=Average amount
-PriceQtyMinHT=Price quantity min. (net of tax)
-Percentage=Percentage
-Total=Total
-SubTotal=Subtotal
-TotalHTShort=Total (net)
-TotalHTShortCurrency=Total (net in currency)
-TotalTTCShort=Total (inc. tax)
-TotalHT=Total (net of tax)
-TotalHTforthispage=Total (net of tax) for this page
-Totalforthispage=Total for this page
-TotalTTC=Total (inc. tax)
-TotalTTCToYourCredit=Total (inc. tax) to your credit
-TotalVAT=Total tax
-TotalLT1=Total tax 2
-TotalLT2=Total tax 3
-TotalLT1ES=Total RE
-TotalLT2ES=Total IRPF
-HT=Net of tax
-TTC=Inc. tax
-VAT=Sales tax
-VATs=Sales taxes
-LT1ES=RE
-LT2ES=IRPF
-VATRate=Tax Rate
-Average=Average
-Sum=Sum
-Delta=Delta
-Module=Module
-Option=Option
-List=List
-FullList=Full list
-Statistics=Statistics
-OtherStatistics=Other statistics
-Status=Status
-Favorite=Favorite
-ShortInfo=Info.
-Ref=Ref.
-ExternalRef=Ref. extern
-RefSupplier=Ref. supplier
-RefPayment=Ref. payment
-CommercialProposalsShort=Commercial proposals
-Comment=Comment
-Comments=Comments
-ActionsToDo=Events to do
-ActionsToDoShort=To do
-ActionsDoneShort=Done
-ActionNotApplicable=Not applicable
-ActionRunningNotStarted=To start
-ActionRunningShort=In progress
-ActionDoneShort=Finished
-ActionUncomplete=Uncomplete
-CompanyFoundation=Company/Foundation
-ContactsForCompany=Contacts 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
-NActionsLate=%s late
-RequestAlreadyDone=Request already recorded
-Filter=Filter
-FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
-RemoveFilter=Remove filter
-ChartGenerated=Chart generated
-ChartNotGenerated=Chart not generated
-GeneratedOn=Build on %s
-Generate=Generate
-Duration=Duration
-TotalDuration=Total duration
-Summary=Summary
-DolibarrStateBoard=Statistics
-DolibarrWorkBoard=Work tasks board
-Available=Available
-NotYetAvailable=Not yet available
-NotAvailable=Not available
-Categories=Tags/categories
-Category=Tag/category
-By=By
-From=From
-to=to
-and=and
-or=or
-Other=Other
-Others=Others
-OtherInformations=Other informations
-Quantity=Quantity
-Qty=Qty
-ChangedBy=Changed by
-ApprovedBy=Approved by
-ApprovedBy2=Approved by (second approval)
-Approved=Approved
-Refused=Refused
-ReCalculate=Recalculate
-ResultKo=Failure
-Reporting=Reporting
-Reportings=Reporting
-Draft=Draft
-Drafts=Drafts
-Validated=Validated
-Opened=Opened
-New=New
-Discount=Discount
-Unknown=Unknown
-General=General
-Size=Size
-Received=Received
-Paid=Paid
-Topic=Subject
-ByCompanies=By third parties
-ByUsers=By users
-Links=Links
-Link=Link
-Rejects=Rejects
-Preview=Preview
-NextStep=Next step
-Datas=Data
-None=None
-NoneF=None
-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.
-Photo=Picture
-Photos=Pictures
-AddPhoto=Add picture
-DeletePicture=Picture delete
-ConfirmDeletePicture=Confirm picture deletion?
-Login=Login
-CurrentLogin=Current login
-EnterLoginDetail=Enter login details
-January=January
-February=February
-March=March
-April=April
-May=May
-June=June
-July=July
-August=August
-September=September
-October=October
-November=November
-December=December
-JanuaryMin=Jan
-FebruaryMin=Feb
-MarchMin=Mar
-AprilMin=Apr
-MayMin=May
-JuneMin=Jun
-JulyMin=Jul
-AugustMin=Aug
-SeptemberMin=Sep
-OctoberMin=Oct
-NovemberMin=Nov
-DecemberMin=Dec
-Month01=January
-Month02=February
-Month03=March
-Month04=April
-Month05=May
-Month06=June
-Month07=July
-Month08=August
-Month09=September
-Month10=October
-Month11=November
-Month12=December
-MonthShort01=Jan
-MonthShort02=Feb
-MonthShort03=Mar
-MonthShort04=Apr
-MonthShort05=May
-MonthShort06=Jun
-MonthShort07=Jul
-MonthShort08=Aug
-MonthShort09=Sep
-MonthShort10=Oct
-MonthShort11=Nov
-MonthShort12=Dec
-AttachedFiles=Attached files and documents
-FileTransferComplete=File was uploaded successfuly
-DateFormatYYYYMM=YYYY-MM
-DateFormatYYYYMMDD=YYYY-MM-DD
-DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
-ReportName=Report name
-ReportPeriod=Report period
-ReportDescription=Description
-Report=Report
-Keyword=Keyword
-Origin=Origin
-Legend=Legend
-Fill=Fill
-Reset=Reset
-File=File
-Files=Files
-NotAllowed=Not allowed
-ReadPermissionNotAllowed=Read permission not allowed
-AmountInCurrency=Amount in %s currency
-Example=Example
-Examples=Examples
-NoExample=No example
-FindBug=Report a bug
-NbOfThirdParties=Number of third parties
-NbOfLines=Number of lines
-NbOfObjects=Number of objects
-NbOfObjectReferers=Number of related items
-Referers=Related items
-TotalQuantity=Total quantity
-DateFromTo=From %s to %s
-DateFrom=From %s
-DateUntil=Until %s
-Check=Check
-Uncheck=Uncheck
-Internal=Internal
-External=External
-Internals=Internal
-Externals=External
-Warning=Warning
-Warnings=Warnings
-BuildDoc=Build Doc
-Entity=Environment
-Entities=Entities
-CustomerPreview=Customer preview
-SupplierPreview=Supplier preview
-ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show supplier preview
-RefCustomer=Ref. customer
-Currency=Currency
-InfoAdmin=Information for administrators
-Undo=Undo
-Redo=Redo
-ExpandAll=Expand all
-UndoExpandAll=Undo expand
-Reason=Reason
-FeatureNotYetSupported=Feature not yet supported
-CloseWindow=Close window
-Response=Response
-Priority=Priority
-SendByMail=Send by EMail
-MailSentBy=Email sent by
-TextUsedInTheMessageBody=Email body
-SendAcknowledgementByMail=Send confirmation email
-EMail=E-mail
-NoEMail=No email
-Email=Email
-NoMobilePhone=No mobile phone
-Owner=Owner
-FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
-Refresh=Refresh
-BackToList=Back to list
-GoBack=Go back
-CanBeModifiedIfOk=Can be modified if valid
-CanBeModifiedIfKo=Can be modified if not valid
-ValueIsValid=Value is valid
-ValueIsNotValid=Value is not valid
-RecordCreatedSuccessfully=Record created successfully
-RecordModifiedSuccessfully=Record modified successfully
-RecordsModified=%s record modified
-RecordsDeleted=%s record deleted
-AutomaticCode=Automatic code
-FeatureDisabled=Feature disabled
-MoveBox=Move widget
-Offered=Offered
-NotEnoughPermissions=You don't have permission for this action
-SessionName=Session name
-Method=Method
-Receive=Receive
-CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
-ExpectedValue=Expected Value
-CurrentValue=Current value
-PartialWoman=Partial
-TotalWoman=Total
-NeverReceived=Never received
-Canceled=Canceled
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
-Color=Color
-Documents=Linked files
-Documents2=Documents
-UploadDisabled=Upload disabled
-MenuECM=Documents
-MenuAWStats=AWStats
-MenuMembers=Members
-MenuAgendaGoogle=Google agenda
-ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=No documents saved in this directory
-CurrentUserLanguage=Current language
-CurrentTheme=Current theme
-CurrentMenuManager=Current menu manager
-Browser=Browser
-Layout=Layout
-Screen=Screen
-DisabledModules=Disabled modules
-For=For
-ForCustomer=For customer
-Signature=Signature
-DateOfSignature=Date of signature
-HidePassword=Show command with password hidden
-UnHidePassword=Show real command with clear password
-Root=Root
-Informations=Informations
-Page=Page
-Notes=Notes
-AddNewLine=Add new line
-AddFile=Add file
-FreeZone=Free entry
-FreeLineOfType=Free entry of type
-CloneMainAttributes=Clone object with its main attributes
-PDFMerge=PDF Merge
-Merge=Merge
-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 application at the moment.
-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
-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.
-AccordingToGeoIPDatabase=(according to GeoIP convertion)
-Line=Line
-NotSupported=Not supported
-RequiredField=Required field
-Result=Result
-ToTest=Test
-ValidateBefore=Card must be validated before using this feature
-Visibility=Visibility
-Private=Private
-Hidden=Hidden
-Resources=Resources
-Source=Source
-Prefix=Prefix
-Before=Before
-After=After
-IPAddress=IP address
-Frequency=Frequency
-IM=Instant messaging
-NewAttribute=New attribute
-AttributeCode=Attribute code
-URLPhoto=URL of photo/logo
-SetLinkToAnotherThirdParty=Link to another third party
-LinkTo=Link to
-LinkToProposal=Link to proposal
-LinkToOrder=Link to order
-LinkToInvoice=Link to invoice
-LinkToSupplierOrder=Link to supplier order
-LinkToSupplierProposal=Link to supplier proposal
-LinkToSupplierInvoice=Link to supplier invoice
-LinkToContract=Link to contract
-LinkToIntervention=Link to intervention
-CreateDraft=Create draft
-SetToDraft=Back to draft
-ClickToEdit=Click to edit
-ObjectDeleted=Object %s deleted
-ByCountry=By country
-ByTown=By town
-ByDate=By date
-ByMonthYear=By month/year
-ByYear=By year
-ByMonth=By month
-ByDay=By day
-BySalesRepresentative=By sales representative
-LinkedToSpecificUsers=Linked to a particular user contact
-NoResults=No results
-AdminTools=Admin tools
-SystemTools=System tools
-ModulesSystemTools=Modules tools
-Test=Test
-Element=Element
-NoPhotoYet=No pictures available yet
-Dashboard=Dashboard
-MyDashboard=My dashboard
-Deductible=Deductible
-from=from
-toward=toward
-Access=Access
-SelectAction=Select action
-HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
-SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
-OriginFileName=Original filename
-SetDemandReason=Set source
-SetBankAccount=Define Bank Account
-AccountCurrency=Account Currency
-ViewPrivateNote=View notes
-XMoreLines=%s line(s) hidden
-PublicUrl=Public URL
-AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
-PrintFile=Print File %s
-ShowTransaction=Show entry on bank account
-GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
-Deny=Deny
-Denied=Denied
-ListOfTemplates=List of templates
-Gender=Gender
-Genderman=Man
-Genderwoman=Woman
-ViewList=List view
-Mandatory=Mandatory
-Hello=Hello
-Sincerely=Sincerely
-DeleteLine=Delete line
-ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
-NoRecordSelected=No record selected
-MassFilesArea=Area for files built by mass actions
-ShowTempMassFilesArea=Show area of files built by mass actions
-RelatedObjects=Related Objects
-ClassifyBilled=Classify billed
-Progress=Progress
-ClickHere=Click here
-FrontOffice=Front office
-BackOffice=Back office
-View=View
-Export=Export
-Exports=Exports
-ExportFilteredList=Export filtered list
-ExportList=Export list
-Miscellaneous=Miscellaneous
-Calendar=Calendar
-GroupBy=Group by...
-ViewFlatList=View flat list
-RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Direct download link
-Download=Download
-ActualizeCurrency=Update currency rate
-Fiscalyear=Fiscal year
-# Week day
-Monday=Monday
-Tuesday=Tuesday
-Wednesday=Wednesday
-Thursday=Thursday
-Friday=Friday
-Saturday=Saturday
-Sunday=Sunday
-MondayMin=Mo
-TuesdayMin=Tu
-WednesdayMin=We
-ThursdayMin=Th
-FridayMin=Fr
-SaturdayMin=Sa
-SundayMin=Su
-Day1=Monday
-Day2=Tuesday
-Day3=Wednesday
-Day4=Thursday
-Day5=Friday
-Day6=Saturday
-Day0=Sunday
-ShortMonday=M
-ShortTuesday=T
-ShortWednesday=W
-ShortThursday=T
-ShortFriday=F
-ShortSaturday=S
-ShortSunday=S
-SelectMailModel=Select email template
-SetRef=Set ref
-Select2ResultFoundUseArrows=Some results found. Use arrows to select.
-Select2NotFound=No result found
-Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
-Select2LoadingMoreResults=Loading more results...
-Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
-SearchIntoContacts=Contacts
-SearchIntoMembers=Members
-SearchIntoUsers=Users
-SearchIntoProductsOrServices=Products or services
-SearchIntoProjects=Projects
-SearchIntoTasks=Tasks
-SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
-SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
-SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
-SearchIntoInterventions=Interventions
-SearchIntoContracts=Contracts
-SearchIntoCustomerShipments=Customer shipments
-SearchIntoExpenseReports=Expense reports
-SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/es_PE/accountancy.lang b/htdocs/langs/es_PE/accountancy.lang
index adbb619ec03..863353289bc 100644
--- a/htdocs/langs/es_PE/accountancy.lang
+++ b/htdocs/langs/es_PE/accountancy.lang
@@ -13,7 +13,5 @@ Journaux=Revistas
 JournalFinancial=Revistas financieras
 BackToChartofaccounts=Retornar gráfico de cuentas
 Addanaccount=Agregar una cuenta contable
-AccountingCategory=Accounting category
+CreateMvts=Crear nueva transacción
 OptionsDeactivatedForThisExportModel=Para este modelo de exportación, las opciones están desactivadas
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
diff --git a/htdocs/langs/es_PE/admin.lang b/htdocs/langs/es_PE/admin.lang
index 7b0c1db3052..a0de2107bec 100644
--- a/htdocs/langs/es_PE/admin.lang
+++ b/htdocs/langs/es_PE/admin.lang
@@ -1,1665 +1,14 @@
 # Dolibarr language file - Source file is en_US - admin
-Foundation=Foundation
-Version=Version
-VersionProgram=Version program
-VersionLastInstall=Initial install version
-VersionLastUpgrade=Latest version upgrade
-VersionExperimental=Experimental
-VersionDevelopment=Development
-VersionUnknown=Unknown
-VersionRecommanded=Recommended
-FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. Value of some setup constants may also be checked. You can use this tool to detect if some files were modified by a hacker for example.
-FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
-GlobalChecksum=Global checksum
-MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
-LocalSignature=Embedded local signature (less reliable)
-RemoteSignature=Remote distant signature (more reliable)
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FilesModified=Modified Files
-FilesAdded=Added Files
-FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
-XmlNotFound=Xml Integrity File of application not found
-SessionId=Session ID
-SessionSaveHandler=Handler to save sessions
-SessionSavePath=Storage session localization
-PurgeSessions=Purge of sessions
-ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
-NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow to list all running sessions.
-LockNewSessions=Lock new connections
-ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself. Only user <b>%s</b> will be able to connect after that.
-UnlockNewSessions=Remove connection lock
-YourSession=Your session
-Sessions=Users session
-WebUserGroup=Web server user/group
-NoSessionFound=Your PHP seems to not allow to list active sessions. Directory used to save sessions (<b>%s</b>) might be protected (For example, by OS permissions or by PHP directive open_basedir).
-DBStoringCharset=Database charset to store data
-DBSortingCharset=Database charset to sort data
-WarningModuleNotActive=Module <b>%s</b> must be enabled
-WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page.
-DolibarrSetup=Dolibarr install or upgrade
-InternalUser=Internal user
-ExternalUser=External user
-InternalUsers=Internal users
-ExternalUsers=External users
-GUISetup=Display
-SetupArea=Setup area
-FormToTestFileUploadForm=Form to test file upload (according to setup)
-IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
-RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
-RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any usage of update tool.
-SecuritySetup=Security setup
-SecurityFilesDesc=Define here options related to security about uploading files.
-ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
-ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
-ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is not supported.
-DictionarySetup=Dictionary setup
-Dictionary=Dictionaries
-ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
-ErrorCodeCantContainZero=Code can't contain value 0
-DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
-UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties, but it is less convenient)
-DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact, but it is less convenient)
-NumberOfKeyToSearch=Nbr of characters to trigger search: %s
-NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
-AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
-JavascriptDisabled=JavaScript disabled
-UsePreviewTabs=Use preview tabs
-ShowPreview=Show preview
-PreviewNotAvailable=Preview not available
-ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
-MySQLTimeZone=TimeZone MySql (database)
-TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
-Space=Space
-Table=Table
-Fields=Fields
-Index=Index
-Mask=Mask
-NextValue=Next value
-NextValueForInvoices=Next value (invoices)
-NextValueForCreditNotes=Next value (credit notes)
-NextValueForDeposit=Next value (deposit)
-NextValueForReplacements=Next value (replacements)
-MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to <b>%s</b> %s, whatever this parameter's value is
-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
-AntiVirusParam= More parameters on command line
-AntiVirusParamExample= Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
-ComptaSetup=Accounting module setup
-UserSetup=User management setup
-MultiCurrencySetup=Multi-currency setup
-MenuLimits=Limits and accuracy
-MenuIdParent=Parent menu ID
-DetailMenuIdParent=ID of parent menu (empty for a top menu)
-DetailPosition=Sort number to define menu position
-AllMenus=All
-NotConfigured=Module not configured
-Active=Active
-SetupShort=Setup
-OtherOptions=Other options
-OtherSetup=Other setup
-CurrentValueSeparatorDecimal=Decimal separator
-CurrentValueSeparatorThousand=Thousand separator
-Destination=Destination
-IdModule=Module ID
-IdPermissions=Permissions ID
-Modules=Modules
-LanguageBrowserParameter=Parameter %s
-LocalisationDolibarrParameters=Localisation parameters
-ClientTZ=Client Time Zone (user)
-ClientHour=Client time (user)
-OSTZ=Server OS Time Zone
-PHPTZ=PHP server Time Zone
-DaylingSavingTime=Daylight saving time
-CurrentHour=PHP Time (server)
-CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
-Box=Widget
-Boxes=Widgets
-MaxNbOfLinesForBoxes=Max number of lines for widgets
-PositionByDefault=Default order
-Position=Position
-MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
-MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br />Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
-MenuForUsers=Menu for users
-LangFile=.lang file
-System=System
-SystemInfo=System information
-SystemToolsArea=System tools area
-SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for.
-Purge=Purge
-PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
-PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
-PurgeDeleteTemporaryFilesShort=Delete temporary files
-PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory <b>%s</b>. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted.
-PurgeRunNow=Purge now
-PurgeNothingToDelete=No directory or files to delete.
-PurgeNDirectoriesDeleted=<b>%s</b> files or directories deleted.
-PurgeAuditEvents=Purge all security events
-ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
-GenerateBackup=Generate backup
-Backup=Backup
-Restore=Restore
-RunCommandSummary=Backup has been launched with the following command
-BackupResult=Backup result
-BackupFileSuccessfullyCreated=Backup file successfully generated
-YouCanDownloadBackupFile=Generated files can now be downloaded
-NoBackupFileAvailable=No backup files available.
-ExportMethod=Export method
-ImportMethod=Import method
-ToBuildBackupFileClickHere=To build a backup file, click <a href="%s">here</a>.
-ImportMySqlDesc=To import a backup file, you must use mysql command from command line:
-ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line:
-ImportMySqlCommand=%s %s < mybackupfile.sql
-ImportPostgreSqlCommand=%s %s mybackupfile.sql
-FileNameToGenerate=File name to generate
-Compression=Compression
-CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
-CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
-ExportCompatibility=Compatibility of generated export file
-MySqlExportParameters=MySQL export parameters
-PostgreSqlExportParameters= PostgreSQL export parameters
-UseTransactionnalMode=Use transactional mode
-FullPathToMysqldumpCommand=Full path to mysqldump command
-FullPathToPostgreSQLdumpCommand=Full path to pg_dump command
-ExportOptions=Export Options
-AddDropDatabase=Add DROP DATABASE command
-AddDropTable=Add DROP TABLE command
-ExportStructure=Structure
-NameColumn=Name columns
-ExtendedInsert=Extended INSERT
-NoLockBeforeInsert=No lock commands around INSERT
-DelayedInsert=Delayed insert
-EncodeBinariesInHexa=Encode binary data in hexadecimal
-IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
-AutoDetectLang=Autodetect (browser language)
-FeatureDisabledInDemo=Feature disabled in demo
-FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Permissions
-BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
-OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
-ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external modules...
-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 (Note: anyone experienced in PHP programming can provide custom development for an open source project)
-WebSiteDesc=Reference websites to find more modules...
-URL=Link
-BoxesAvailable=Widgets available
-BoxesActivated=Widgets activated
-ActivateOn=Activate on
-ActiveOn=Activated on
-SourceFile=Source file
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
-Required=Required
-UsedOnlyWithTypeOption=Used by some agenda option only
-Security=Security
-Passwords=Passwords
-DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
-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 (Activated 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 make building of a global cumulated pdf not working (like unpaid invoices).
-Feature=Feature
-DolibarrLicense=License
-Developpers=Developers/contributors
-OfficialWebSite=Dolibarr international official web site
-OfficialWebSiteLocal=Local web site (%s)
-OfficialWiki=Dolibarr documentation on Wiki
-OfficialDemo=Dolibarr online demo
-OfficialMarketPlace=Official market place for external modules/addons
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
-ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
-HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
-HelpCenterDesc2=Some part of this service are available in <b>english only</b>.
-CurrentMenuHandler=Current menu handler
-MeasuringUnit=Measuring unit
-LeftMargin=Left margin
-TopMargin=Top margin
-PaperSize=Paper type
-Orientation=Orientation
-SpaceX=Space X
-SpaceY=Space Y
-FontSize=Font size
-Content=Content
-NoticePeriod=Notice period
-NewByMonth=New by month
-Emails=E-mails
-EMailsSetup=E-mails setup
-EMailsDesc=This page allows you to overwrite your PHP parameters for e-mails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless.
-MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
-MAIN_MAIL_EMAIL_FROM=Sender e-mail for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Sender e-mail used for error returns emails sent
-MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
-MAIN_DISABLE_ALL_MAILS=Disable all e-mails sendings (for test purposes or demos)
-MAIN_MAIL_SENDMODE=Method to use to send EMails
-MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
-MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
-MAIN_MAIL_EMAIL_TLS= Use TLS (SSL) encrypt
-MAIN_MAIL_EMAIL_STARTTLS= Use TLS (STARTTLS) encrypt
-MAIN_DISABLE_ALL_SMS=Disable all SMS sendings (for test purposes or demos)
-MAIN_SMS_SENDMODE=Method to use to send SMS
-MAIN_MAIL_SMS_FROM=Default sender phone number for Sms sending
-MAIN_MAIL_DEFAULT_FROMTYPE=Sender e-mail by default for manual sendings (User email or Company email)
-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/
-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 setup
-ModuleFamilyBase=System
-ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
-ModuleFamilyProducts=Products Management (PM)
-ModuleFamilyHr=Human Resource Management (HR)
-ModuleFamilyProjects=Projects/Collaborative work
-ModuleFamilyOther=Other
-ModuleFamilyTechnic=Multi-modules tools
-ModuleFamilyExperimental=Experimental modules
-ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
-ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
-ModuleFamilyInterface=Interfaces with external systems
-MenuHandlers=Menu handlers
-MenuAdmin=Menu editor
-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).
-DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <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>.
-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='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
-YouCanSubmitFile=For this step, you can send package using this tool: Select module file
-CurrentVersion=Dolibarr current version
-CallUpdatePage=Go to the page that updates the database structure and data: %s.
-LastStableVersion=Latest stable version
-LastActivationDate=Latest activation date
-UpdateServerOffline=Update server offline
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
-GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
-GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
-ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
-ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
-DoTestServerAvailability=Test server connectivity
-DoTestSend=Test sending
-DoTestSendHTML=Test sending HTML
-ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
-ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
-UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
-UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
-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...).
-MinLength=Minimum length
-LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
-ExamplesWithCurrentSetup=Examples with current running setup
-ListOfDirectories=List of OpenDocument templates directories
-ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
-NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories
+AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
+AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 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.
-ThemeDir=Skins directory
-ConnectionTimeout=Connexion timeout
-ResponseTimeout=Response timeout
-SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__
-ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
-SecurityToken=Key to secure URLs
-NoSmsEngine=No SMS sender manager available. SMS sender manager are not installed with default distribution (because they depends on an external supplier) but you can find some on %s
-PDF=PDF
-PDFDesc=You can set each global options related to the PDF generation
-PDFAddressForging=Rules to forge address boxes
-HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF
-HideDescOnPDF=Hide products description on generated PDF
-HideRefOnPDF=Hide products ref. on generated PDF
-HideDetailsOnPDF=Hide product lines details on generated PDF
-PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
-Library=Library
-UrlGenerationParameters=Parameters to secure URLs
-SecurityTokenIsUnique=Use a unique securekey parameter for each URL
-EnterRefToBuildUrl=Enter reference for object %s
-GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons to 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
-MassConvert=Launch mass convert
-String=String
-TextLong=Long text
-Int=Integer
-Float=Float
-DateAndTime=Date and hour
-Unique=Unique
-Boolean=Boolean (Checkbox)
-ExtrafieldPhone = Phone
-ExtrafieldPrice = Price
-ExtrafieldMail = Email
-ExtrafieldUrl = Url
-ExtrafieldSelect = Select list
-ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
-ExtrafieldPassword=Password
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
-ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
-LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
-SMS=SMS
-LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
-RefreshPhoneLink=Refresh link
-LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
-KeepEmptyToUseDefault=Keep empty to use default value
-DefaultLink=Default link
-SetAsDefault=Set as default
-ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
-BarcodeInitForThirdparties=Mass barcode init for thirdparties
-BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Init value for next %s empty records
-EraseAllCurrentBarCode=Erase all current barcode values
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
-AllBarcodeReset=All barcode values have been removed
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into 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
-DisplayCompanyInfo=Display company address
-DisplayCompanyManagers=Display manager names
-DisplayCompanyInfoAndManagers=Display company address and manager names
-EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
-ModuleCompanyCodePanicum=Return an empty accountancy code.
-ModuleCompanyCodeDigitaria=Accountancy 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: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-ClickToShowDescription=Click to show description
-# Modules
-Module0Name=Users & groups
-Module0Desc=Users / Employees and Groups management
-Module1Name=Third parties
-Module1Desc=Companies and contact management (customers, prospects...)
-Module2Name=Commercial
-Module2Desc=Commercial management
-Module10Name=Accounting
-Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
-Module20Name=Proposals
-Module20Desc=Commercial proposal management
-Module22Name=Mass E-mailings
-Module22Desc=Mass E-mailing management
-Module23Name=Energy
-Module23Desc=Monitoring the consumption of energies
-Module25Name=Customer Orders
-Module25Desc=Customer order management
-Module30Name=Invoices
-Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
-Module40Name=Suppliers
-Module40Desc=Supplier management and buying (orders and invoices)
-Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
-Module49Name=Editors
-Module49Desc=Editor management
-Module50Name=Products
-Module50Desc=Product management
-Module51Name=Mass mailings
-Module51Desc=Mass paper mailing management
-Module52Name=Stocks
-Module52Desc=Stock management (products)
-Module53Name=Services
-Module53Desc=Service management
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
-Module55Name=Barcodes
-Module55Desc=Barcode management
-Module56Name=Telephony
-Module56Desc=Telephony integration
-Module57Name=Direct bank payment orders
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
-Module58Name=ClickToDial
-Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
-Module70Name=Interventions
-Module70Desc=Intervention management
-Module75Name=Expense and trip notes
-Module75Desc=Expense and trip notes management
-Module80Name=Shipments
-Module80Desc=Shipments and delivery order management
-Module85Name=Banks and cash
-Module85Desc=Management of bank or cash accounts
-Module100Name=External site
-Module100Desc=This module include an external web site or page into Dolibarr menus and view it into a Dolibarr frame
-Module105Name=Mailman and SPIP
-Module105Desc=Mailman or SPIP interface for member module
-Module200Name=LDAP
-Module200Desc=LDAP directory synchronisation
-Module210Name=PostNuke
-Module210Desc=PostNuke integration
-Module240Name=Data exports
-Module240Desc=Tool to export Dolibarr data (with assistants)
-Module250Name=Data imports
-Module250Desc=Tool to import data in Dolibarr  (with assistants)
-Module310Name=Members
-Module310Desc=Foundation members management
-Module320Name=RSS Feed
-Module320Desc=Add RSS feed inside Dolibarr screen pages
-Module330Name=Bookmarks
-Module330Desc=Bookmarks management
-Module400Name=Projects/Opportunities/Leads
-Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
-Module410Name=Webcalendar
-Module410Desc=Webcalendar integration
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
-Module520Name=Loan
-Module520Desc=Management of loans
-Module600Name=Notifications
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
-Module700Name=Donations
-Module700Desc=Donation management
-Module770Name=Expense reports
-Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
-Module1200Name=Mantis
-Module1200Desc=Mantis integration
-Module1400Name=Accounting
-Module1400Desc=Accounting management (double parties)
-Module1520Name=Document Generation
-Module1520Desc=Mass mail document generation
-Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
-Module2000Name=WYSIWYG editor
-Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
-Module2200Name=Dynamic Prices
-Module2200Desc=Enable the usage of math expressions for prices
-Module2300Name=Cron
-Module2300Desc=Scheduled job management
-Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
-Module2500Name=Electronic Content Management
-Module2500Desc=Save and share documents
-Module2600Name=API/Web services (SOAP server)
-Module2600Desc=Enable the Dolibarr SOAP server providing API services
-Module2610Name=API/Web services (REST server)
-Module2610Desc=Enable the Dolibarr REST server providing API services
-Module2660Name=Call WebServices (SOAP client)
-Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
-Module2700Name=Gravatar
-Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
-Module2800Desc=FTP Client
-Module2900Name=GeoIPMaxmind
-Module2900Desc=GeoIP Maxmind conversions capabilities
-Module3100Name=Skype
-Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
-Module4000Name=HRM
-Module4000Desc=Human resources management
-Module5000Name=Multi-company
-Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management
-Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
-Module20000Name=Leave Requests management
-Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Product lot
-Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
-Module50000Name=PayBox
-Module50000Desc=Module to offer an online payment page by credit card with PayBox
-Module50100Name=Point of sales
-Module50100Desc=Point of sales module (POS).
-Module50200Name=Paypal
-Module50200Desc=Module to offer an online payment page by credit card with Paypal
-Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double parties)
-Module54000Name=PrintIPP
-Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
-Module55000Name=Poll, Survey or Vote
-Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
-Module59000Name=Margins
-Module59000Desc=Module to manage margins
-Module60000Name=Commissions
-Module60000Desc=Module to manage commissions
-Module63000Name=Resources
-Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
-Permission11=Read customer invoices
-Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
-Permission14=Validate customer invoices
-Permission15=Send customer invoices by email
-Permission16=Create payments for customer invoices
-Permission19=Delete customer invoices
-Permission21=Read commercial proposals
-Permission22=Create/modify commercial proposals
-Permission24=Validate commercial proposals
-Permission25=Send commercial proposals
-Permission26=Close commercial proposals
-Permission27=Delete commercial proposals
-Permission28=Export commercial proposals
-Permission31=Read products
-Permission32=Create/modify products
-Permission34=Delete products
-Permission36=See/manage hidden products
-Permission38=Export products
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
-Permission44=Delete projects (shared project and projects i'm contact for)
-Permission45=Export projects
-Permission61=Read interventions
-Permission62=Create/modify interventions
-Permission64=Delete interventions
-Permission67=Export interventions
-Permission71=Read members
-Permission72=Create/modify members
-Permission74=Delete members
-Permission75=Setup types of membership
-Permission76=Export data
-Permission78=Read subscriptions
-Permission79=Create/modify subscriptions
-Permission81=Read customers orders
-Permission82=Create/modify customers orders
-Permission84=Validate customers orders
-Permission86=Send customers orders
-Permission87=Close customers orders
-Permission88=Cancel customers orders
-Permission89=Delete customers orders
 Permission91=Consultar impuestos e IGV
 Permission92=Crear/modificar impuestos e IGV
 Permission93=Eliminar impuestos e IGV
-Permission94=Export social or fiscal taxes
-Permission95=Read reports
-Permission101=Read sendings
-Permission102=Create/modify sendings
-Permission104=Validate sendings
-Permission106=Export sendings
-Permission109=Delete sendings
-Permission111=Read financial accounts
-Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
-Permission114=Reconciliate transactions
-Permission115=Export transactions and account statements
-Permission116=Transfers between accounts
-Permission117=Manage cheques dispatching
-Permission121=Read third parties linked to user
-Permission122=Create/modify third parties linked to user
-Permission125=Delete third parties linked to user
-Permission126=Export third parties
-Permission141=Read all projects and tasks (also private projects i am not contact for)
-Permission142=Create/modify all projects and tasks (also private projects i am not 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
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
-Permission167=Export contracts
-Permission171=Read trips and expenses (yours and your subordinates)
-Permission172=Create/modify trips and expenses
-Permission173=Delete trips and expenses
-Permission174=Read all trips and expenses
-Permission178=Export trips and expenses
-Permission180=Read suppliers
-Permission181=Read supplier orders
-Permission182=Create/modify supplier orders
-Permission183=Validate supplier orders
-Permission184=Approve supplier orders
-Permission185=Order or cancel supplier orders
-Permission186=Receive supplier orders
-Permission187=Close supplier orders
-Permission188=Cancel supplier orders
-Permission192=Create lines
-Permission193=Cancel lines
-Permission194=Read the bandwith lines
-Permission202=Create ADSL connections
-Permission203=Order connections orders
-Permission204=Order connections
-Permission205=Manage connections
-Permission206=Read connections
-Permission211=Read Telephony
-Permission212=Order lines
-Permission213=Activate line
-Permission214=Setup Telephony
-Permission215=Setup providers
-Permission221=Read emailings
-Permission222=Create/modify emailings (topic, recipients...)
-Permission223=Validate emailings (allows sending)
-Permission229=Delete emailings
-Permission237=View recipients and info
-Permission238=Manually send mailings
-Permission239=Delete mailings after validation or sent
-Permission241=Read categories
-Permission242=Create/modify categories
-Permission243=Delete categories
-Permission244=See the contents of the hidden categories
-Permission251=Read other users and groups
-PermissionAdvanced251=Read other users
-Permission252=Read permissions of other users
-Permission253=Create/modify other users, groups and permisssions
-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 assignement matters).
-Permission271=Read CA
-Permission272=Read invoices
-Permission273=Issue invoices
-Permission281=Read contacts
-Permission282=Create/modify contacts
-Permission283=Delete contacts
-Permission286=Export contacts
-Permission291=Read tariffs
-Permission292=Set permissions on the tariffs
-Permission293=Modify costumers tariffs
-Permission300=Read bar codes
-Permission301=Create/modify bar codes
-Permission302=Delete bar codes
-Permission311=Read services
-Permission312=Assign service/subscription to contract
-Permission331=Read bookmarks
-Permission332=Create/modify bookmarks
-Permission333=Delete bookmarks
-Permission341=Read its own permissions
-Permission342=Create/modify his own user information
-Permission343=Modify his own password
-Permission344=Modify its own permissions
-Permission351=Read groups
-Permission352=Read groups permissions
-Permission353=Create/modify groups
-Permission354=Delete or disable groups
-Permission358=Export users
-Permission401=Read discounts
-Permission402=Create/modify discounts
-Permission403=Validate discounts
-Permission404=Delete discounts
-Permission510=Read Salaries
-Permission512=Create/modify salaries
-Permission514=Delete salaries
-Permission517=Export salaries
-Permission520=Read Loans
-Permission522=Create/modify loans
-Permission524=Delete loans
-Permission525=Access loan calculator
-Permission527=Export loans
-Permission531=Read services
-Permission532=Create/modify services
-Permission534=Delete services
-Permission536=See/manage hidden services
-Permission538=Export services
-Permission701=Read donations
-Permission702=Create/modify donations
-Permission703=Delete donations
-Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
-Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
-Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission779=Export expense reports
-Permission1001=Read stocks
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
-Permission1004=Read stock movements
-Permission1005=Create/modify stock movements
-Permission1101=Read delivery orders
-Permission1102=Create/modify delivery orders
-Permission1104=Validate delivery orders
-Permission1109=Delete delivery orders
-Permission1181=Read suppliers
-Permission1182=Read supplier orders
-Permission1183=Create/modify supplier orders
-Permission1184=Validate supplier orders
-Permission1185=Approve supplier orders
-Permission1186=Order supplier orders
-Permission1187=Acknowledge receipt of supplier orders
-Permission1188=Delete supplier orders
-Permission1190=Approve (second approval) supplier orders
-Permission1201=Get result of an export
-Permission1202=Create/Modify an export
-Permission1231=Read supplier invoices
-Permission1232=Create/modify supplier invoices
-Permission1233=Validate supplier invoices
-Permission1234=Delete supplier invoices
-Permission1235=Send supplier invoices by email
-Permission1236=Export supplier invoices, attributes and payments
-Permission1237=Export supplier orders and their details
-Permission1251=Run mass imports of external data into database (data load)
-Permission1321=Export customer invoices, attributes and payments
-Permission1322=Reopen a paid bill
-Permission1421=Export customer orders and attributes
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
-Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
-Permission20006=Admin leave requests (setup and update balance)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
-Permission2401=Read actions (events or tasks) linked to his account
-Permission2402=Create/modify actions (events or tasks) linked to his account
-Permission2403=Delete actions (events or tasks) linked to his account
-Permission2411=Read actions (events or tasks) of others
-Permission2412=Create/modify actions (events or tasks) of others
-Permission2413=Delete actions (events or tasks) of others
-Permission2414=Export actions/tasks of others
-Permission2501=Read/Download documents
-Permission2502=Download documents
-Permission2503=Submit or delete documents
-Permission2515=Setup documents directories
-Permission2801=Use FTP client in read mode (browse and download only)
-Permission2802=Use FTP client in write mode (delete or upload files)
-Permission50101=Use Point of sales
-Permission50201=Read transactions
-Permission50202=Import transactions
-Permission54001=Print
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
-Permission59003=Read every user margin
-Permission63001=Read resources
-Permission63002=Create/modify resources
-Permission63003=Delete resources
-Permission63004=Link resources to agenda events
-DictionaryCompanyType=Types of thirdparties
-DictionaryCompanyJuridicalType=Legal forms of thirdparties
-DictionaryProspectLevel=Prospect potential level
-DictionaryCanton=State/Province
-DictionaryRegion=Regions
-DictionaryCountry=Countries
-DictionaryCurrency=Currencies
-DictionaryCivility=Personal and professional titles
-DictionaryActions=Types of agenda events
-DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=Tasa de IGV (Impuesto sobre ventas en EEUU)
-DictionaryRevenueStamp=Amount of revenue stamps
-DictionaryPaymentConditions=Payment terms
-DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact/Address types
-DictionaryEcotaxe=Ecotax (WEEE)
-DictionaryPaperFormat=Paper formats
-DictionaryFormatCards=Cards formats
-DictionaryFees=Types of fees
-DictionarySendingMethods=Shipping methods
-DictionaryStaff=Staff
-DictionaryAvailability=Delivery delay
-DictionaryOrderMethods=Ordering methods
-DictionarySource=Origin of proposals/orders
-DictionaryAccountancyCategory=Accounting account groups
-DictionaryAccountancysystem=Models for chart of accounts
-DictionaryEMailTemplates=Emails templates
-DictionaryUnits=Units
-DictionaryProspectStatus=Prospection status
-DictionaryHolidayTypes=Types of leaves
-DictionaryOpportunityStatus=Opportunity status for project/lead
-SetupSaved=Setup saved
-BackToModuleList=Back to modules list
-BackToDictionaryList=Back to dictionaries list
 VATManagement=Gestión IGV
-VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=El tipo de IGV propuesto por defecto es 0. Este es el caso de asociaciones, particulares o algunas pequeñas sociedades.
-VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
-##### Local Taxes #####
-LTRate=Rate
-LocalTax1IsNotUsed=Do not use second tax
-LocalTax1IsUsedDesc=Use a second type of tax (other than VAT)
-LocalTax1IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax1Management=Second type of tax
-LocalTax1IsUsedExample=
-LocalTax1IsNotUsedExample=
-LocalTax2IsNotUsed=Do not use third tax
-LocalTax2IsUsedDesc=Use a third type of tax (other than VAT)
-LocalTax2IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax2Management=Third type of tax
-LocalTax2IsUsedExample=
-LocalTax2IsNotUsedExample=
-LocalTax1ManagementES= RE Management
-LocalTax1IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If te buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
-LocalTax1IsNotUsedDescES= By default the proposed RE is 0. End of rule.
-LocalTax1IsUsedExampleES= In Spain they are professionals subject to some specific sections of the Spanish IAE.
-LocalTax1IsNotUsedExampleES= In Spain they are professional and societies and subject to certain sections of the Spanish IAE.
-LocalTax2ManagementES= IRPF Management
-LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
-LocalTax2IsNotUsedDescES= By default the proposed IRPF is 0. End of rule.
-LocalTax2IsUsedExampleES= In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
-LocalTax2IsNotUsedExampleES= In Spain they are bussines not subject to tax system of modules.
-CalcLocaltax=Reports on local taxes
-CalcLocaltax1=Sales - Purchases
-CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2=Purchases
-CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3=Sales
-CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
-LabelUsedByDefault=Label used by default if no translation can be found for code
-LabelOnDocuments=Label on documents
-NbOfDays=Nb of days
-AtEndOfMonth=At end of month
-CurrentNext=Current/Next
-Offset=Offset
-AlwaysActive=Always active
-Upgrade=Upgrade
-MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Deploy/install external module
-WebServer=Web server
-DocumentRootServer=Web server's root directory
-DataRootServer=Data files directory
-IP=IP
-Port=Port
-VirtualServerName=Virtual server name
-OS=OS
-PhpWebLink=Web-Php link
-Browser=Browser
-Server=Server
-Database=Database
-DatabaseServer=Database host
-DatabaseName=Database name
-DatabasePort=Database port
-DatabaseUser=Database user
-DatabasePassword=Database password
-Tables=Tables
-TableName=Table name
-NbOfRecord=Nb of records
-Host=Server
-DriverType=Driver type
-SummarySystem=System information summary
-SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Foundation
-DefaultMenuManager= Standard menu manager
-DefaultMenuSmartphoneManager=Smartphone menu manager
-Skin=Skin theme
-DefaultSkin=Default skin theme
-MaxSizeList=Max length for list
-DefaultMaxSizeList=Default max length for lists
-DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
-MessageOfDay=Message of the day
-MessageLogin=Login page message
-PermanentLeftSearchForm=Permanent search form on left menu
-DefaultLanguage=Default language to use (language code)
-EnableMultilangInterface=Enable multilingual interface
-EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/foundation information
-CompanyIds=Company/foundation identities
-CompanyName=Name
-CompanyAddress=Address
-CompanyZip=Zip
-CompanyTown=Town
-CompanyCountry=Country
-CompanyCurrency=Main currency
-CompanyObject=Object of the company
-Logo=Logo
-DoNotSuggestPaymentMode=Do not suggest
-NoActiveBankAccountDefined=No active bank account defined
-OwnerOfBankAccount=Owner of bank account %s
-BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show link "<strong>%s</strong>"
-Alerts=Alerts
-DelaysOfToleranceBeforeWarning=Tolerance delays before warning
-DelaysOfToleranceDesc=This screen allows you to define the tolerated delays before an alert is reported on screen with picto %s for each late element.
-Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned events (agenda events) not completed yet
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Delay tolerance (in days) before alert on project not closed in time
-Delays_MAIN_DELAY_TASKS_TODO=Delay tolerance (in days) before alert on planned tasks (project tasks) not completed yet
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on orders not processed yet
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on suppliers orders not processed yet
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Delay tolerance (in days) before alert on proposals to close
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Delay tolerance (in days) before alert on proposals not billed
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerance delay (in days) before alert on services to activate
-Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerance delay (in days) before alert on expired services
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerance delay (in days) before alert on unpaid supplier invoices
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerence delay (in days) before alert on unpaid client invoices
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerance delay (in days) before alert on pending bank reconciliation
-Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed membership fee
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
-Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
-SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
-SetupDescription5=Other menu entries manage optional parameters.
-LogEvents=Security audit events
-Audit=Audit
-InfoDolibarr=About Dolibarr
-InfoBrowser=About Browser
-InfoOS=About OS
-InfoWebServer=About Web Server
-InfoDatabase=About Database
-InfoPHP=About PHP
-InfoPerf=About Performances
-BrowserName=Browser name
-BrowserOS=Browser OS
-ListOfSecurityEvents=List of Dolibarr security events
-SecurityEventsPurged=Security events purged
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
-SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
-SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
-DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
-AvailableModules=Available 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.
-TriggersAvailable=Available triggers
-TriggersDesc=Triggers are files that will modify the behaviour of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realised new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
-TriggerDisabledByName=Triggers in this file are disabled by the <b>-NORUN</b> suffix in their name.
-TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module <b>%s</b> is disabled.
-TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules.
-TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
-GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password
-DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">check here</a>.
-MiscellaneousDesc=All other security related parameters are defined here.
-LimitsSetup=Limits/Precision setup
-LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here
-MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices
-MAIN_MAX_DECIMALS_TOT=Max decimals for total prices
-MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add <b>...</b> after this number if you want to see <b>...</b> when number is truncated when shown on screen)
-MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=Precio unitario sin IGV de un producto
-TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
-ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
-NoEventFoundWithCriteria=No security event has been found for such search criterias.
-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.
-BackupDescX=Archived directory should be stored in a secure place.
-BackupDescY=The generated dump file should be stored in a secure place.
-BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one
-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 directoy (<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=Available database backup dump files
-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
-DownloadMoreSkins=More skins to download
-SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence without hole and with no reset
-ShowProfIdInAddress=Show professionnal id with addresses on documents
-ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents
-TranslationUncomplete=Partial translation
-MAIN_DISABLE_METEO=Disable meteo view
-TestLoginToAPI=Test login to API
-ProxyDesc=Some features of Dolibarr need to have an Internet access to work. Define here parameters for this. If the Dolibarr server is behind a Proxy server, those parameters tells Dolibarr how to access Internet through it.
-ExternalAccess=External access
-MAIN_PROXY_USE=Use a proxy server (otherwise direct access to internet)
-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 all attributes, not already available by default, and that you want to be supported for %s.
-ExtraFields=Complementary attributes
-ExtraFieldsLines=Complementary attributes (lines)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
-ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact/address)
-ExtraFieldsMember=Complementary attributes (member)
-ExtraFieldsMemberType=Complementary attributes (member type)
-ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
-ExtraFieldsSupplierOrders=Complementary attributes (orders)
-ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
-ExtraFieldsProject=Complementary attributes (projects)
-ExtraFieldsProjectTask=Complementary attributes (tasks)
-ExtraFieldHasWrongValue=Attribute %s has a wrong value.
-AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
-SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
-PathToDocuments=Path to documents
-PathDirectory=Directory
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might 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.
-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: <strong>User display setup</strong> tab of 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
-TranslationString=Translation string
-CurrentTranslationString=Current translation string
-WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
-NewTranslationStringToShow=New translation string to show
-OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
-YouMustEnableOneModule=You must at least enable 1 module
-ClassNotFoundIntoPathWarning=Class %s not found into PHP path
-YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
-SuhosinSessionEncrypt=Session storage encrypted by Suhosin
-ConditionIsCurrently=Condition is currently %s
-YouUseBestDriver=You use driver %s that is best driver available currently.
-YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required 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.
-BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance.
-BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
-AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp".
-AskForPreferredShippingMethod=Ask for preferred Sending Method for Third Parties.
-FieldEdition=Edition of field %s
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
-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.
-PasswordGenerationPerso=Return a password according to your personally defined configuration.
-SetupPerso=According to your configuration
-PasswordPatternDesc=Password pattern description
-##### Users setup #####
-RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passwords
-DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page
-UsersSetup=Users module setup
-UserMailRequired=EMail required to create a new user
-##### HRM setup #####
-HRMSetup=HRM module setup
-##### Company setup #####
-CompanySetup=Companies module setup
-CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier)
-AccountCodeManager=Module for accountancy code generation (customer or supplier)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
-NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
-NotificationsDescGlobal=* or by setting global target emails in module setup page.
-ModelModules=Documents templates
-DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
-WatermarkOnDraft=Watermark on draft document
-JSOnPaimentBill=Activate feature to autofill payment lines on payment form
-CompanyIdProfChecker=Rules on Professional Ids
-MustBeUnique=Must be unique?
-MustBeMandatory=Mandatory to create third parties?
-MustBeInvoiceMandatory=Mandatory to validate invoices?
-##### Webcal setup #####
-WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
-##### Invoices #####
-BillsSetup=Invoices module setup
-BillsNumberingModule=Invoices and credit notes numbering model
-BillsPDFModules=Invoice documents models
-CreditNote=Credit note
-CreditNotes=Credit notes
-ForceInvoiceDate=Force invoice date to validation date
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
-SuggestPaymentByRIBOnAccount=Suggest payment by withdraw on account
-SuggestPaymentByChequeToAddress=Suggest payment by cheque to
-FreeLegalTextOnInvoices=Free text on invoices
-WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
-PaymentsNumberingModule=Payments numbering model
-SuppliersPayment=Suppliers payments
-SupplierPaymentSetup=Suppliers payments setup
-##### Proposals #####
-PropalSetup=Commercial proposals module setup
-ProposalsNumberingModules=Commercial proposal numbering models
-ProposalsPDFModules=Commercial proposal documents models
-FreeLegalTextOnProposal=Free text on commercial proposals
-WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
-WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
-##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
-##### Orders #####
-OrdersSetup=Order management setup
-OrdersNumberingModules=Orders numbering models
-OrdersModelModule=Order documents models
-FreeLegalTextOnOrders=Free text on orders
-WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
-ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Interventions #####
-InterventionsSetup=Interventions module setup
-FreeLegalTextOnInterventions=Free text on intervention documents
-FicheinterNumberingModules=Intervention numbering models
-TemplatePDFInterventions=Intervention card documents models
-WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
-##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
-ContractsNumberingModules=Contracts numbering modules
-TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
-##### Members #####
-MembersSetup=Members module setup
-MemberMainOptions=Main options
-AdherentLoginRequired= Manage a Login for each member
-AdherentMailRequired=EMail required to create a new member
-MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
-##### LDAP setup #####
-LDAPSetup=LDAP Setup
-LDAPGlobalParameters=Global parameters
-LDAPUsersSynchro=Users
-LDAPGroupsSynchro=Groups
-LDAPContactsSynchro=Contacts
-LDAPMembersSynchro=Members
-LDAPSynchronization=LDAP synchronisation
-LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP
-LDAPToDolibarr=LDAP -> Dolibarr
-DolibarrToLDAP=Dolibarr -> LDAP
-LDAPNamingAttribute=Key in LDAP
-LDAPSynchronizeUsers=Organization of users in LDAP
-LDAPSynchronizeGroups=Organization of groups in LDAP
-LDAPSynchronizeContacts=Organization of contacts in LDAP
-LDAPSynchronizeMembers=Organization of foundation's members in LDAP
-LDAPPrimaryServer=Primary server
-LDAPSecondaryServer=Secondary server
-LDAPServerPort=Server port
-LDAPServerPortExample=Default port : 389
-LDAPServerProtocolVersion=Protocol version
-LDAPServerUseTLS=Use TLS
-LDAPServerUseTLSExample=Your LDAP server use TLS
-LDAPServerDn=Server DN
-LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
-LDAPPassword=Administrator password
-LDAPUserDn=Users' DN
-LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
-LDAPGroupDn=Groups' DN
-LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com)
-LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
-LDAPServerDnExample=Complete DN (ex: dc=example,dc=com)
-LDAPDnSynchroActive=Users and groups synchronization
-LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization
-LDAPDnContactActive=Contacts' synchronization
-LDAPDnContactActiveExample=Activated/Unactivated synchronization
-LDAPDnMemberActive=Members' synchronization
-LDAPDnMemberActiveExample=Activated/Unactivated synchronization
-LDAPContactDn=Dolibarr contacts' DN
-LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com)
-LDAPMemberDn=Dolibarr members DN
-LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com)
-LDAPMemberObjectClassList=List of objectClass
-LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPUserObjectClassList=List of objectClass
-LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPGroupObjectClassList=List of objectClass
-LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
-LDAPContactObjectClassList=List of objectClass
-LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPTestConnect=Test LDAP connection
-LDAPTestSynchroContact=Test contacts synchronization
-LDAPTestSynchroUser=Test user synchronization
-LDAPTestSynchroGroup=Test group synchronization
-LDAPTestSynchroMember=Test member synchronization
-LDAPTestSearch= Test a LDAP search
-LDAPSynchroOK=Synchronization test successful
-LDAPSynchroKO=Failed synchronization test
-LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that connexion to server is correctly configured and allows LDAP udpates
-LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s)
-LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s)
-LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPBindKO=Connect/Authentificate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPSetupForVersion3=LDAP server configured for version 3
-LDAPSetupForVersion2=LDAP server configured for version 2
-LDAPDolibarrMapping=Dolibarr Mapping
-LDAPLdapMapping=LDAP Mapping
-LDAPFieldLoginUnix=Login (unix)
-LDAPFieldLoginExample=Example : uid
-LDAPFilterConnection=Search filter
-LDAPFilterConnectionExample=Example : &(objectClass=inetOrgPerson)
-LDAPFieldLoginSamba=Login (samba, activedirectory)
-LDAPFieldLoginSambaExample=Example : samaccountname
-LDAPFieldFullname=Full name
-LDAPFieldFullnameExample=Example : cn
-LDAPFieldPasswordNotCrypted=Password not crypted
-LDAPFieldPasswordCrypted=Password crypted
-LDAPFieldPasswordExample=Example : userPassword
-LDAPFieldCommonNameExample=Example : cn
-LDAPFieldName=Name
-LDAPFieldNameExample=Example : sn
-LDAPFieldFirstName=First name
-LDAPFieldFirstNameExample=Example : givenName
-LDAPFieldMail=Email address
-LDAPFieldMailExample=Example : mail
-LDAPFieldPhone=Professional phone number
-LDAPFieldPhoneExample=Example : telephonenumber
-LDAPFieldHomePhone=Personal phone number
-LDAPFieldHomePhoneExample=Example : homephone
-LDAPFieldMobile=Cellular phone
-LDAPFieldMobileExample=Example : mobile
-LDAPFieldFax=Fax number
-LDAPFieldFaxExample=Example : facsimiletelephonenumber
-LDAPFieldAddress=Street
-LDAPFieldAddressExample=Example : street
-LDAPFieldZip=Zip
-LDAPFieldZipExample=Example : postalcode
-LDAPFieldTown=Town
-LDAPFieldTownExample=Example : l
-LDAPFieldCountry=Country
-LDAPFieldDescription=Description
-LDAPFieldDescriptionExample=Example : description
-LDAPFieldNotePublic=Public Note
-LDAPFieldNotePublicExample=Example : publicnote
-LDAPFieldGroupMembers= Group members
-LDAPFieldGroupMembersExample= Example : uniqueMember
-LDAPFieldBirthdate=Birthdate
-LDAPFieldCompany=Company
-LDAPFieldCompanyExample=Example : o
-LDAPFieldSid=SID
-LDAPFieldSidExample=Example : objectsid
-LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Job position
-LDAPFieldTitleExample=Example: title
-LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
-LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
-LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts.
-LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users.
-LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups.
-LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module.
-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 advices related to performance.
-NotInstalled=Not installed, so your server is not slow 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.
-MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
-MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
-OPCodeCache=OPCode cache
-NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad).
-HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
-FilesOfTypeCached=Files of type %s are cached by HTTP server
-FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
-FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
-FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
-CacheByServer=Cache by server
-CacheByClient=Cache by browser
-CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
-##### Products #####
-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)
-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 third party language
-UseSearchToSelectProductTooltip=Also if you have a large number of product (> 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)
-SetDefaultBarcodeTypeProducts=Default barcode type to use for products
-SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
-ProductCodeChecker= Module for product code generation and checking (product or service)
-ProductOtherConf= Product / Service configuration
-IsNotADir=is not a directory!
-##### Syslog #####
-SyslogSetup=Logs module setup
-SyslogOutput=Logs outputs
-SyslogFacility=Facility
-SyslogLevel=Level
-SyslogFilename=File name and path
-YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
-ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
-##### Donations #####
-DonationsSetup=Donation module setup
-DonationsReceiptModel=Template of donation receipt
-##### Barcode #####
-BarcodeSetup=Barcode setup
-PaperFormatModule=Print format module
-BarcodeEncodeModule=Barcode encoding type
-CodeBarGenerator=Barcode generator
-ChooseABarCode=No generator defined
-FormatNotSupportedByGenerator=Format not supported by this generator
-BarcodeDescEAN8=Barcode of type EAN8
-BarcodeDescEAN13=Barcode of type EAN13
-BarcodeDescUPC=Barcode of type UPC
-BarcodeDescISBN=Barcode of type ISBN
-BarcodeDescC39=Barcode of type C39
-BarcodeDescC128=Barcode of type C128
-BarcodeDescDATAMATRIX=Barcode of type Datamatrix
-BarcodeDescQRCODE=Barcode of type QR code
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
-BarcodeInternalEngine=Internal engine
-BarCodeNumberManager=Manager to auto define barcode numbers
-##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct debit payment orders
-##### ExternalRSS #####
-ExternalRSSSetup=External RSS imports setup
-NewRSS=New RSS Feed
-RSSUrl=RSS URL
-RSSUrlExample=An interesting RSS feed
-##### Mailing #####
-MailingSetup=EMailing module setup
-MailingEMailFrom=Sender EMail (From) for emails sent by emailing module
-MailingEMailError=Return EMail (Errors-to) for emails with errors
-MailingDelay=Seconds to wait after sending next message
-##### Notification #####
-NotificationSetup=EMail notification module setup
-NotificationEMailFrom=Sender EMail (From) for emails sent for notifications
-FixedEmailTarget=Fixed email target
-##### Sendings #####
-SendingsSetup=Sending module setup
-SendingsReceiptModel=Sending receipt model
-SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
-FreeLegalTextOnShippings=Free text on shipments
-##### Deliveries #####
-DeliveryOrderNumberingModules=Products deliveries receipt numbering module
-DeliveryOrderModel=Products deliveries receipt model
-DeliveriesOrderAbility=Support products deliveries receipts
-FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
-##### FCKeditor #####
-AdvancedEditor=Advanced editor
-ActivateFCKeditor=Activate advanced editor for:
-FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
-FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files.</font>
-FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
-FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
-##### OSCommerce 1 #####
-OSCommerceErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be an OSCommerce database (Key %s not found in table %s).
-OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' successfull.
-OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
-OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
-##### Stock #####
-StockSetup=Warehouse module setup
-IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
-##### Menu #####
-MenuDeleted=Menu deleted
-Menus=Menus
-TreeMenuPersonalized=Personalized menus
-NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
-NewMenu=New menu
-Menu=Selection of menu
-MenuHandler=Menu handler
-MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
-DetailId=Id menu
-DetailMenuHandler=Menu handler where to show new menu
-DetailMenuModule=Module name if menu entry come from a module
-DetailType=Type of menu (top or left)
-DetailTitre=Menu label or label code for translation
-DetailUrl=URL where menu send you (Absolute URL link or external link with http://)
-DetailEnabled=Condition to show or not entry
-DetailRight=Condition to display unauthorized grey menus
-DetailLangs=Lang file name for label code translation
-DetailUser=Intern / Extern / All
-Target=Target
-DetailTarget=Target for links (_blank top open a new window)
-DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu)
-ModifMenu=Menu change
-DeleteMenu=Delete menu entry
-ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
-FailedToInitializeMenu=Failed to initialize menu
-##### Tax #####
-TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=Opción de carga de IGV
-OptionVATDefault=Cash basis
-OptionVATDebitOption=Accrual basis
 OptionVatDefaultDesc=La carga del IGV es: <br>-en el envío de los bienes (en la práctica se usa la fecha de la factura)<br>-sobre el pago por los servicios
 OptionVatDebitOptionDesc=La carga del IGV es: <br>-en el envío de los bienes (en la práctica se usa la fecha de la factura)<br>-sobre la facturación de los servicios
-SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
-OnDelivery=On delivery
-OnPayment=On payment
-OnInvoice=On invoice
-SupposedToBePaymentDate=Payment date used
-SupposedToBeInvoiceDate=Invoice date used
-Buy=Buy
-Sell=Sell
-InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
-AccountancyCode=Accountancy Code
-AccountancyCodeSell=Sale 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 -> Dictionary -> 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_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
-AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### 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 your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your 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.
-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 same computer than 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.
-##### Point Of Sales (CashDesk) #####
-CashDesk=Point of sales
-CashDeskSetup=Point of sales module setup
-CashDeskThirdPartyForSell=Default generic third party to use for sells
-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).
-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
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
-##### Bookmark #####
-BookmarkSetup=Bookmark module setup
-BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu.
-NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu
-##### WebServices #####
-WebServicesSetup=Webservices module setup
-WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
-WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
-EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
-##### API ####
-ApiSetup=API module setup
-ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
-OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
-ApiKey=Key for API
-WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
-##### Bank #####
-BankSetupModule=Bank module setup
-FreeLegalTextOnChequeReceipts=Free text on cheque receipts
-BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
-BankOrderGlobal=General
-BankOrderGlobalDesc=General display order
-BankOrderES=Spanish
-BankOrderESDesc=Spanish display order
-ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
-##### Multicompany #####
-MultiCompanySetup=Multi-company module setup
-##### Suppliers #####
-SuppliersSetup=Supplier module setup
-SuppliersCommandModel=Complete template of supplier order (logo...)
-SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
-SuppliersInvoiceNumberingModel=Supplier invoices numbering models
-IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
-##### GeoIPMaxmind #####
-GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
-NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
-YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
-YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
-TestGeoIPResult=Test of a conversion IP -> country
-##### Projects #####
-ProjectsNumberingModules=Projects numbering module
-ProjectsSetup=Project module setup
-ProjectsModelModule=Project reports document model
-TasksNumberingModules=Tasks numbering module
-TaskModelModule=Tasks reports document model
-UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
-##### ECM (GED) #####
-##### Fiscal Year #####
-AccountingPeriods=Accounting periods
-AccountingPeriodCard=Accounting period
-NewFiscalYear=New accounting period
-OpenFiscalYear=Open accounting period
-CloseFiscalYear=Close accounting period
-DeleteFiscalYear=Delete accounting period
-ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
-ShowFiscalYear=Show accounting period
-AlwaysEditable=Can always be edited
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
-Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
-IncludePath=Include path (defined into variable %s)
-ExpenseReportsSetup=Setup of module Expense Reports
-TemplatePDFExpenseReports=Document templates to generate expense report document
-NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
-YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of 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
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/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.
-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.
-ConfFileMuseContainCustom=Installing 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)
-TextTitleColor=Color of page title
-LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
-NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
-BackgroundColor=Background color
-TopMenuBackgroundColor=Background color for Top menu
-TopMenuDisableImages=Hide images in Top menu
-LeftMenuBackgroundColor=Background color for Left menu
-BackgroundTableTitleColor=Background color for Table title line
-BackgroundTableLineOddColor=Background color for odd table lines
-BackgroundTableLineEvenColor=Background color for even table lines
-MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
-NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
-UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
-PositionIntoComboList=Position of line into combo lists
-SellTaxRate=Sale tax rate
-RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
-UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipping, you can enter it here. You can use the key {TRACKID} into URL parameters so the system will replace it with value of tracking number user entered into shipment card.
-OpportunityPercent=When you create an opportunity, you will defined an estimated amount of project/lead. According to status of opportunity, this amount may be multiplicated 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
-FixTZ=TimeZone fix
-FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
-ExpectedChecksum=Expected Checksum
-CurrentChecksum=Current Checksum
-ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the latest stable version
-TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
-TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so 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 usefull only if your prices for each leve 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.
-SeeSubstitutionVars=See * note for list of possible substitution variables
-AllPublishers=All publishers
-UnknownPublishers=Unknown publishers
-AddRemoveTabs=Add or remove tabs
-AddDictionaries=Add dictionaries
-AddBoxes=Add widgets
-AddSheduledJobs=Add scheduled jobs
-AddHooks=Add hooks
-AddTriggers=Add triggers
-AddMenus=Add menus
-AddPermissions=Add permissions
-AddExportProfiles=Add export profiles
-AddImportProfiles=Add import profiles
-AddOtherPagesOrServices=Add other pages or services
-AddModels=Add document or numbering templates
-AddSubstitutions=Add keys substitutions
-DetectionNotPossible=Detection not possible
-UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved on 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 correclty. 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 inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <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
-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
-TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
-##### Resource ####
-ResourceSetup=Configuration du module Resource
-UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
diff --git a/htdocs/langs/es_PE/main.lang b/htdocs/langs/es_PE/main.lang
index f40c071841a..6398e2fbb24 100644
--- a/htdocs/langs/es_PE/main.lang
+++ b/htdocs/langs/es_PE/main.lang
@@ -1,9 +1,5 @@
 # Dolibarr language file - Source file is en_US - main
 DIRECTION=ltr
-# Note for Chinese:
-# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
-# stsongstdlight or cid0cs are for simplified Chinese
-# To read Chinese pdf with Linux: sudo apt-get install poppler-data
 FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=,
@@ -23,799 +19,9 @@ FormatDateHourShort=%d/%m/%Y %H:%M
 FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
-DatabaseConnection=Database connection
-NoTemplateDefined=No template defined for this email type
-AvailableVariables=Available substitution variables
-NoTranslation=No translation
-NoRecordFound=No record found
-NoRecordDeleted=No record deleted
-NotEnoughDataYet=Not enough data
-NoError=No error
-Error=Error
-Errors=Errors
-ErrorFieldRequired=Field '%s' is required
-ErrorFieldFormat=Field '%s' has a bad value
-ErrorFileDoesNotExists=File %s does not exist
-ErrorFailedToOpenFile=Failed to open file %s
-ErrorCanNotCreateDir=Cannot create dir %s
-ErrorCanNotReadDir=Cannot read dir %s
-ErrorConstantNotDefined=Parameter %s not defined
-ErrorUnknown=Unknown error
-ErrorSQL=SQL Error
-ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this
-ErrorGoToModuleSetup=Go to Module setup to fix this
-ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
-ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
-ErrorInternalErrorDetected=Error detected
-ErrorWrongHostParameter=Wrong host parameter
-ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post again the form.
-ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child records.
-ErrorWrongValue=Wrong value
-ErrorWrongValueForParameterX=Wrong value for parameter %s
-ErrorNoRequestInError=No request in error
-ErrorServiceUnavailableTryLater=Service not available for 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>.
-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 nb of record per page
-NotAuthorized=You are not authorized to do that.
-SetDate=Set date
-SelectDate=Select a date
-SeeAlso=See also %s
-SeeHere=See here
-Apply=Apply
-BackgroundColorByDefault=Default background color
-FileRenamed=The file was successfully renamed
-FileUploaded=The file was successfully uploaded
-FileGenerated=The file was successfully generated
-FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
-NbOfEntries=Nb of entries
-GoToWikiHelpPage=Read online help (Internet access needed)
-GoToHelpPage=Read help
-RecordSaved=Record saved
-RecordDeleted=Record deleted
-LevelOfFeature=Level of features
-NotDefined=Not defined
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
-Administrator=Administrator
-Undefined=Undefined
-PasswordForgotten=Password forgotten?
-SeeAbove=See above
-HomeArea=Home area
-LastConnexion=Latest connection
-PreviousConnexion=Previous connection
-PreviousValue=Previous value
-ConnectedOnMultiCompany=Connected on environment
-ConnectedSince=Connected since
-AuthenticationMode=Authentication mode
-RequestedUrl=Requested URL
-DatabaseTypeManager=Database type manager
-RequestLastAccessInError=Latest database access request error
-ReturnCodeLastAccessInError=Return code for latest database access request error
-InformationLastAccessInError=Information for latest database access request error
-DolibarrHasDetectedError=Dolibarr has detected a technical error
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes
-MoreInformation=More information
-TechnicalInformation=Technical information
-TechnicalID=Technical ID
-NotePublic=Note (public)
-NotePrivate=Note (private)
-PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
-DoTest=Test
-ToFilter=Filter
-NoFilter=No filter
-WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance delay.
-yes=yes
-Yes=Yes
-no=no
-No=No
-All=All
-Home=Home
-Help=Help
-OnlineHelp=Online help
-PageWiki=Wiki page
-MediaBrowser=Media browser
-Always=Always
-Never=Never
-Under=under
-Period=Period
-PeriodEndDate=End date for period
-Activate=Activate
-Activated=Activated
-Closed=Closed
-Closed2=Closed
-NotClosed=Not closed
-Enabled=Enabled
-Deprecated=Deprecated
-Disable=Disable
-Disabled=Disabled
-Add=Add
-AddLink=Add link
-RemoveLink=Remove link
-AddToDraft=Add to draft
-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>?
-Delete=Delete
-Remove=Remove
-Resiliate=Terminate
-Cancel=Cancel
-Modify=Modify
-Edit=Edit
-Validate=Validate
-ValidateAndApprove=Validate and Approve
-ToValidate=To validate
-Save=Save
-SaveAs=Save As
-TestConnection=Test connection
-ToClone=Clone
-ConfirmClone=Choose data you want to clone :
-NoCloneOptionsSpecified=No data to clone defined.
-Of=of
-Go=Go
-Run=Run
-CopyOf=Copy of
-Show=Show
-Hide=Hide
-ShowCardHere=Show card
-Search=Search
-SearchOf=Search
-Valid=Valid
-Approve=Approve
-Disapprove=Disapprove
-ReOpen=Re-Open
-Upload=Send file
-ToLink=Link
-Select=Select
-Choose=Choose
-Resize=Resize
-Recenter=Recenter
-Author=Author
-User=User
-Users=Users
-Group=Group
-Groups=Groups
-NoUserGroupDefined=No user group defined
-Password=Password
-PasswordRetype=Retype your password
-NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
-Name=Name
-Person=Person
-Parameter=Parameter
-Parameters=Parameters
-Value=Value
-PersonalValue=Personal value
-NewValue=New value
-CurrentValue=Current value
-Code=Code
-Type=Type
-Language=Language
-MultiLanguage=Multi-language
-Note=Note
-Title=Title
-Label=Label
-RefOrLabel=Ref. or label
-Info=Log
-Family=Family
-Description=Description
-Designation=Description
-Model=Doc template
-DefaultModel=Default doc template
-Action=Event
-About=About
-Number=Number
-NumberByMonth=Number by month
-AmountByMonth=Amount by month
-Numero=Number
-Limit=Limit
-Limits=Limits
-Logout=Logout
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Connection
-Setup=Setup
-Alert=Alert
-Previous=Previous
-Next=Next
-Cards=Cards
-Card=Card
-Now=Now
-HourStart=Start hour
-Date=Date
-DateAndHour=Date and hour
-DateToday=Today's date
-DateReference=Reference date
-DateStart=Start date
-DateEnd=End date
-DateCreation=Creation date
-DateCreationShort=Creat. date
-DateModification=Modification date
-DateModificationShort=Modif. date
-DateLastModification=Latest modification date
-DateValidation=Validation date
-DateClosing=Closing date
-DateDue=Due date
-DateValue=Value date
-DateValueShort=Value date
-DateOperation=Operation date
-DateOperationShort=Oper. Date
-DateLimit=Limit date
-DateRequest=Request date
-DateProcess=Process date
-DateBuild=Report build date
-DatePayment=Date of payment
-DateApprove=Approving date
-DateApprove2=Approving date (second approval)
-UserCreation=Creation user
-UserModification=Modification user
-UserCreationShort=Creat. user
-UserModificationShort=Modif. user
-DurationYear=year
-DurationMonth=month
-DurationWeek=week
-DurationDay=day
-DurationYears=years
-DurationMonths=months
-DurationWeeks=weeks
-DurationDays=days
-Year=Year
-Month=Month
-Week=Week
-WeekShort=Week
-Day=Day
-Hour=Hour
-Minute=Minute
-Second=Second
-Years=Years
-Months=Months
-Days=Days
-days=days
-Hours=Hours
-Minutes=Minutes
-Seconds=Seconds
-Weeks=Weeks
-Today=Today
-Yesterday=Yesterday
-Tomorrow=Tomorrow
-Morning=Morning
-Afternoon=Afternoon
-Quadri=Quadri
-MonthOfDay=Month of the day
-HourShort=H
-MinuteShort=mn
-Rate=Rate
-CurrencyRate=Currency conversion rate
-UseLocalTax=Include tax
-Bytes=Bytes
-KiloBytes=Kilobytes
-MegaBytes=Megabytes
-GigaBytes=Gigabytes
-TeraBytes=Terabytes
-b=b.
-Kb=Kb
-Mb=Mb
-Gb=Gb
-Tb=Tb
-Cut=Cut
-Copy=Copy
-Paste=Paste
-Default=Default
-DefaultValue=Default value
-Price=Price
-UnitPrice=Unit price
-UnitPriceHT=Unit price (net)
-UnitPriceTTC=Unit price
-PriceU=U.P.
-PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (currency)
-PriceUTTC=U.P. (inc. tax)
-Amount=Amount
-AmountInvoice=Invoice amount
-AmountPayment=Payment amount
-AmountHTShort=Amount (net)
-AmountTTCShort=Amount (inc. tax)
-AmountHT=Amount (net of tax)
-AmountTTC=Amount (inc. tax)
 AmountVAT=Importe IGV
-MulticurrencyAlreadyPaid=Already payed, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
-MulticurrencyAmountHT=Amount (net of tax), original currency
-MulticurrencyAmountTTC=Amount (inc. of tax), original currency
-MulticurrencyAmountVAT=Amount tax, original currency
-AmountLT1=Amount tax 2
-AmountLT2=Amount tax 3
-AmountLT1ES=Amount RE
-AmountLT2ES=Amount IRPF
-AmountTotal=Total amount
-AmountAverage=Average amount
-PriceQtyMinHT=Price quantity min. (net of tax)
-Percentage=Percentage
-Total=Total
-SubTotal=Subtotal
-TotalHTShort=Total (net)
-TotalHTShortCurrency=Total (net in currency)
-TotalTTCShort=Total (inc. tax)
-TotalHT=Total (net of tax)
-TotalHTforthispage=Total (net of tax) for this page
-Totalforthispage=Total for this page
-TotalTTC=Total (inc. tax)
-TotalTTCToYourCredit=Total (inc. tax) to your credit
 TotalVAT=Total IGV
-TotalLT1=Total tax 2
-TotalLT2=Total tax 3
-TotalLT1ES=Total RE
-TotalLT2ES=Total IRPF
 HT=Sin IGV
 TTC=IGV incluido
 VAT=IGV
-VATs=Sales taxes
-LT1ES=RE
-LT2ES=IRPF
 VATRate=Tasa IGV
-Average=Average
-Sum=Sum
-Delta=Delta
-Module=Module
-Option=Option
-List=List
-FullList=Full list
-Statistics=Statistics
-OtherStatistics=Other statistics
-Status=Status
-Favorite=Favorite
-ShortInfo=Info.
-Ref=Ref.
-ExternalRef=Ref. extern
-RefSupplier=Ref. supplier
-RefPayment=Ref. payment
-CommercialProposalsShort=Commercial proposals
-Comment=Comment
-Comments=Comments
-ActionsToDo=Events to do
-ActionsToDoShort=To do
-ActionsDoneShort=Done
-ActionNotApplicable=Not applicable
-ActionRunningNotStarted=To start
-ActionRunningShort=In progress
-ActionDoneShort=Finished
-ActionUncomplete=Uncomplete
-CompanyFoundation=Company/Foundation
-ContactsForCompany=Contacts 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
-NActionsLate=%s late
-RequestAlreadyDone=Request already recorded
-Filter=Filter
-FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
-RemoveFilter=Remove filter
-ChartGenerated=Chart generated
-ChartNotGenerated=Chart not generated
-GeneratedOn=Build on %s
-Generate=Generate
-Duration=Duration
-TotalDuration=Total duration
-Summary=Summary
-DolibarrStateBoard=Statistics
-DolibarrWorkBoard=Work tasks board
-Available=Available
-NotYetAvailable=Not yet available
-NotAvailable=Not available
-Categories=Tags/categories
-Category=Tag/category
-By=By
-From=From
-to=to
-and=and
-or=or
-Other=Other
-Others=Others
-OtherInformations=Other informations
-Quantity=Quantity
-Qty=Qty
-ChangedBy=Changed by
-ApprovedBy=Approved by
-ApprovedBy2=Approved by (second approval)
-Approved=Approved
-Refused=Refused
-ReCalculate=Recalculate
-ResultKo=Failure
-Reporting=Reporting
-Reportings=Reporting
-Draft=Draft
-Drafts=Drafts
-Validated=Validated
-Opened=Opened
-New=New
-Discount=Discount
-Unknown=Unknown
-General=General
-Size=Size
-Received=Received
-Paid=Paid
-Topic=Subject
-ByCompanies=By third parties
-ByUsers=By users
-Links=Links
-Link=Link
-Rejects=Rejects
-Preview=Preview
-NextStep=Next step
-Datas=Data
-None=None
-NoneF=None
-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.
-Photo=Picture
-Photos=Pictures
-AddPhoto=Add picture
-DeletePicture=Picture delete
-ConfirmDeletePicture=Confirm picture deletion?
-Login=Login
-CurrentLogin=Current login
-EnterLoginDetail=Enter login details
-January=January
-February=February
-March=March
-April=April
-May=May
-June=June
-July=July
-August=August
-September=September
-October=October
-November=November
-December=December
-JanuaryMin=Jan
-FebruaryMin=Feb
-MarchMin=Mar
-AprilMin=Apr
-MayMin=May
-JuneMin=Jun
-JulyMin=Jul
-AugustMin=Aug
-SeptemberMin=Sep
-OctoberMin=Oct
-NovemberMin=Nov
-DecemberMin=Dec
-Month01=January
-Month02=February
-Month03=March
-Month04=April
-Month05=May
-Month06=June
-Month07=July
-Month08=August
-Month09=September
-Month10=October
-Month11=November
-Month12=December
-MonthShort01=Jan
-MonthShort02=Feb
-MonthShort03=Mar
-MonthShort04=Apr
-MonthShort05=May
-MonthShort06=Jun
-MonthShort07=Jul
-MonthShort08=Aug
-MonthShort09=Sep
-MonthShort10=Oct
-MonthShort11=Nov
-MonthShort12=Dec
-AttachedFiles=Attached files and documents
-FileTransferComplete=File was uploaded successfuly
-DateFormatYYYYMM=YYYY-MM
-DateFormatYYYYMMDD=YYYY-MM-DD
-DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
-ReportName=Report name
-ReportPeriod=Report period
-ReportDescription=Description
-Report=Report
-Keyword=Keyword
-Origin=Origin
-Legend=Legend
-Fill=Fill
-Reset=Reset
-File=File
-Files=Files
-NotAllowed=Not allowed
-ReadPermissionNotAllowed=Read permission not allowed
-AmountInCurrency=Amount in %s currency
-Example=Example
-Examples=Examples
-NoExample=No example
-FindBug=Report a bug
-NbOfThirdParties=Number of third parties
-NbOfLines=Number of lines
-NbOfObjects=Number of objects
-NbOfObjectReferers=Number of related items
-Referers=Related items
-TotalQuantity=Total quantity
-DateFromTo=From %s to %s
-DateFrom=From %s
-DateUntil=Until %s
-Check=Check
-Uncheck=Uncheck
-Internal=Internal
-External=External
-Internals=Internal
-Externals=External
-Warning=Warning
-Warnings=Warnings
-BuildDoc=Build Doc
-Entity=Environment
-Entities=Entities
-CustomerPreview=Customer preview
-SupplierPreview=Supplier preview
-ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show supplier preview
-RefCustomer=Ref. customer
-Currency=Currency
-InfoAdmin=Information for administrators
-Undo=Undo
-Redo=Redo
-ExpandAll=Expand all
-UndoExpandAll=Undo expand
-Reason=Reason
-FeatureNotYetSupported=Feature not yet supported
-CloseWindow=Close window
-Response=Response
-Priority=Priority
-SendByMail=Send by EMail
-MailSentBy=Email sent by
-TextUsedInTheMessageBody=Email body
-SendAcknowledgementByMail=Send confirmation email
-EMail=E-mail
-NoEMail=No email
-Email=Email
-NoMobilePhone=No mobile phone
-Owner=Owner
-FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
-Refresh=Refresh
-BackToList=Back to list
-GoBack=Go back
-CanBeModifiedIfOk=Can be modified if valid
-CanBeModifiedIfKo=Can be modified if not valid
-ValueIsValid=Value is valid
-ValueIsNotValid=Value is not valid
-RecordCreatedSuccessfully=Record created successfully
-RecordModifiedSuccessfully=Record modified successfully
-RecordsModified=%s record modified
-RecordsDeleted=%s record deleted
-AutomaticCode=Automatic code
-FeatureDisabled=Feature disabled
-MoveBox=Move widget
-Offered=Offered
-NotEnoughPermissions=You don't have permission for this action
-SessionName=Session name
-Method=Method
-Receive=Receive
-CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
-ExpectedValue=Expected Value
-CurrentValue=Current value
-PartialWoman=Partial
-TotalWoman=Total
-NeverReceived=Never received
-Canceled=Canceled
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
-Color=Color
-Documents=Linked files
-Documents2=Documents
-UploadDisabled=Upload disabled
-MenuECM=Documents
-MenuAWStats=AWStats
-MenuMembers=Members
-MenuAgendaGoogle=Google agenda
-ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=No documents saved in this directory
-CurrentUserLanguage=Current language
-CurrentTheme=Current theme
-CurrentMenuManager=Current menu manager
-Browser=Browser
-Layout=Layout
-Screen=Screen
-DisabledModules=Disabled modules
-For=For
-ForCustomer=For customer
-Signature=Signature
-DateOfSignature=Date of signature
-HidePassword=Show command with password hidden
-UnHidePassword=Show real command with clear password
-Root=Root
-Informations=Informations
-Page=Page
-Notes=Notes
-AddNewLine=Add new line
-AddFile=Add file
-FreeZone=Free entry
-FreeLineOfType=Free entry of type
-CloneMainAttributes=Clone object with its main attributes
-PDFMerge=PDF Merge
-Merge=Merge
-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 application at the moment.
-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
-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.
-AccordingToGeoIPDatabase=(according to GeoIP convertion)
-Line=Line
-NotSupported=Not supported
-RequiredField=Required field
-Result=Result
-ToTest=Test
-ValidateBefore=Card must be validated before using this feature
-Visibility=Visibility
-Private=Private
-Hidden=Hidden
-Resources=Resources
-Source=Source
-Prefix=Prefix
-Before=Before
-After=After
-IPAddress=IP address
-Frequency=Frequency
-IM=Instant messaging
-NewAttribute=New attribute
-AttributeCode=Attribute code
-URLPhoto=URL of photo/logo
-SetLinkToAnotherThirdParty=Link to another third party
-LinkTo=Link to
-LinkToProposal=Link to proposal
-LinkToOrder=Link to order
-LinkToInvoice=Link to invoice
-LinkToSupplierOrder=Link to supplier order
-LinkToSupplierProposal=Link to supplier proposal
-LinkToSupplierInvoice=Link to supplier invoice
-LinkToContract=Link to contract
-LinkToIntervention=Link to intervention
-CreateDraft=Create draft
-SetToDraft=Back to draft
-ClickToEdit=Click to edit
-ObjectDeleted=Object %s deleted
-ByCountry=By country
-ByTown=By town
-ByDate=By date
-ByMonthYear=By month/year
-ByYear=By year
-ByMonth=By month
-ByDay=By day
-BySalesRepresentative=By sales representative
-LinkedToSpecificUsers=Linked to a particular user contact
-NoResults=No results
-AdminTools=Admin tools
-SystemTools=System tools
-ModulesSystemTools=Modules tools
-Test=Test
-Element=Element
-NoPhotoYet=No pictures available yet
-Dashboard=Dashboard
-MyDashboard=My dashboard
-Deductible=Deductible
-from=from
-toward=toward
-Access=Access
-SelectAction=Select action
-HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
-SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
-OriginFileName=Original filename
-SetDemandReason=Set source
-SetBankAccount=Define Bank Account
-AccountCurrency=Account Currency
-ViewPrivateNote=View notes
-XMoreLines=%s line(s) hidden
-PublicUrl=Public URL
-AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
-PrintFile=Print File %s
-ShowTransaction=Show entry on bank account
-GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
-Deny=Deny
-Denied=Denied
-ListOfTemplates=List of templates
-Gender=Gender
-Genderman=Man
-Genderwoman=Woman
-ViewList=List view
-Mandatory=Mandatory
-Hello=Hello
-Sincerely=Sincerely
-DeleteLine=Delete line
-ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
-NoRecordSelected=No record selected
-MassFilesArea=Area for files built by mass actions
-ShowTempMassFilesArea=Show area of files built by mass actions
-RelatedObjects=Related Objects
-ClassifyBilled=Classify billed
-Progress=Progress
-ClickHere=Click here
-FrontOffice=Front office
-BackOffice=Back office
-View=View
-Export=Exportar
-Exports=Exportaciones
-ExportFilteredList=Export filtered list
-ExportList=Export list
-Miscellaneous=Miscellaneous
-Calendar=Calendar
-GroupBy=Group by...
-ViewFlatList=View flat list
-RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Direct download link
-Download=Download
-ActualizeCurrency=Update currency rate
-Fiscalyear=Fiscal year
-# Week day
-Monday=Monday
-Tuesday=Tuesday
-Wednesday=Wednesday
-Thursday=Thursday
-Friday=Friday
-Saturday=Saturday
-Sunday=Sunday
-MondayMin=Mo
-TuesdayMin=Tu
-WednesdayMin=We
-ThursdayMin=Th
-FridayMin=Fr
-SaturdayMin=Sa
-SundayMin=Su
-Day1=Monday
-Day2=Tuesday
-Day3=Wednesday
-Day4=Thursday
-Day5=Friday
-Day6=Saturday
-Day0=Sunday
-ShortMonday=M
-ShortTuesday=T
-ShortWednesday=W
-ShortThursday=T
-ShortFriday=F
-ShortSaturday=S
-ShortSunday=S
-SelectMailModel=Select email template
-SetRef=Set ref
-Select2ResultFoundUseArrows=Some results found. Use arrows to select.
-Select2NotFound=No result found
-Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
-Select2LoadingMoreResults=Loading more results...
-Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
-SearchIntoContacts=Contacts
-SearchIntoMembers=Members
-SearchIntoUsers=Users
-SearchIntoProductsOrServices=Products or services
-SearchIntoProjects=Projects
-SearchIntoTasks=Tasks
-SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
-SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
-SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
-SearchIntoInterventions=Interventions
-SearchIntoContracts=Contracts
-SearchIntoCustomerShipments=Customer shipments
-SearchIntoExpenseReports=Expense reports
-SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/es_PY/accountancy.lang b/htdocs/langs/es_PY/accountancy.lang
deleted file mode 100644
index 527f1fd139d..00000000000
--- a/htdocs/langs/es_PY/accountancy.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-AccountingCategory=Accounting category
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
diff --git a/htdocs/langs/es_PY/admin.lang b/htdocs/langs/es_PY/admin.lang
index 9602601e241..1c53b65c99c 100644
--- a/htdocs/langs/es_PY/admin.lang
+++ b/htdocs/langs/es_PY/admin.lang
@@ -1,1665 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
-Foundation=Foundation
-Version=Version
-VersionProgram=Version program
-VersionLastInstall=Initial install version
-VersionLastUpgrade=Latest version upgrade
-VersionExperimental=Experimental
-VersionDevelopment=Development
-VersionUnknown=Unknown
-VersionRecommanded=Recommended
-FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. Value of some setup constants may also be checked. You can use this tool to detect if some files were modified by a hacker for example.
-FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
-GlobalChecksum=Global checksum
-MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
-LocalSignature=Embedded local signature (less reliable)
-RemoteSignature=Remote distant signature (more reliable)
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FilesModified=Modified Files
-FilesAdded=Added Files
-FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
-XmlNotFound=Xml Integrity File of application not found
-SessionId=Session ID
-SessionSaveHandler=Handler to save sessions
-SessionSavePath=Storage session localization
-PurgeSessions=Purge of sessions
-ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
-NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow to list all running sessions.
-LockNewSessions=Lock new connections
-ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself. Only user <b>%s</b> will be able to connect after that.
-UnlockNewSessions=Remove connection lock
-YourSession=Your session
-Sessions=Users session
-WebUserGroup=Web server user/group
-NoSessionFound=Your PHP seems to not allow to list active sessions. Directory used to save sessions (<b>%s</b>) might be protected (For example, by OS permissions or by PHP directive open_basedir).
-DBStoringCharset=Database charset to store data
-DBSortingCharset=Database charset to sort data
-WarningModuleNotActive=Module <b>%s</b> must be enabled
-WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page.
-DolibarrSetup=Dolibarr install or upgrade
-InternalUser=Internal user
-ExternalUser=External user
-InternalUsers=Internal users
-ExternalUsers=External users
-GUISetup=Display
-SetupArea=Setup area
-FormToTestFileUploadForm=Form to test file upload (according to setup)
-IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
-RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
-RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any usage of update tool.
-SecuritySetup=Security setup
-SecurityFilesDesc=Define here options related to security about uploading files.
-ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
-ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
-ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is not supported.
-DictionarySetup=Dictionary setup
-Dictionary=Dictionaries
-ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
-ErrorCodeCantContainZero=Code can't contain value 0
-DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
-UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties, but it is less convenient)
-DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact, but it is less convenient)
-NumberOfKeyToSearch=Nbr of characters to trigger search: %s
-NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
-AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
-JavascriptDisabled=JavaScript disabled
-UsePreviewTabs=Use preview tabs
-ShowPreview=Show preview
-PreviewNotAvailable=Preview not available
-ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
-MySQLTimeZone=TimeZone MySql (database)
-TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
-Space=Space
-Table=Table
-Fields=Fields
-Index=Index
-Mask=Mask
-NextValue=Next value
-NextValueForInvoices=Next value (invoices)
-NextValueForCreditNotes=Next value (credit notes)
-NextValueForDeposit=Next value (deposit)
-NextValueForReplacements=Next value (replacements)
-MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to <b>%s</b> %s, whatever this parameter's value is
-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
-AntiVirusParam= More parameters on command line
-AntiVirusParamExample= Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
-ComptaSetup=Accounting module setup
-UserSetup=User management setup
-MultiCurrencySetup=Multi-currency setup
-MenuLimits=Limits and accuracy
-MenuIdParent=Parent menu ID
-DetailMenuIdParent=ID of parent menu (empty for a top menu)
-DetailPosition=Sort number to define menu position
-AllMenus=All
-NotConfigured=Module not configured
-Active=Active
-SetupShort=Setup
-OtherOptions=Other options
-OtherSetup=Other setup
-CurrentValueSeparatorDecimal=Decimal separator
-CurrentValueSeparatorThousand=Thousand separator
-Destination=Destination
-IdModule=Module ID
-IdPermissions=Permissions ID
-Modules=Modules
-LanguageBrowserParameter=Parameter %s
-LocalisationDolibarrParameters=Localisation parameters
-ClientTZ=Client Time Zone (user)
-ClientHour=Client time (user)
-OSTZ=Server OS Time Zone
-PHPTZ=PHP server Time Zone
-DaylingSavingTime=Daylight saving time
-CurrentHour=PHP Time (server)
-CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
-Box=Widget
-Boxes=Widgets
-MaxNbOfLinesForBoxes=Max number of lines for widgets
-PositionByDefault=Default order
-Position=Position
-MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
-MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br />Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
-MenuForUsers=Menu for users
-LangFile=.lang file
-System=System
-SystemInfo=System information
-SystemToolsArea=System tools area
-SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for.
-Purge=Purge
-PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
-PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
-PurgeDeleteTemporaryFilesShort=Delete temporary files
-PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory <b>%s</b>. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted.
-PurgeRunNow=Purge now
-PurgeNothingToDelete=No directory or files to delete.
-PurgeNDirectoriesDeleted=<b>%s</b> files or directories deleted.
-PurgeAuditEvents=Purge all security events
-ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
-GenerateBackup=Generate backup
-Backup=Backup
-Restore=Restore
-RunCommandSummary=Backup has been launched with the following command
-BackupResult=Backup result
-BackupFileSuccessfullyCreated=Backup file successfully generated
-YouCanDownloadBackupFile=Generated files can now be downloaded
-NoBackupFileAvailable=No backup files available.
-ExportMethod=Export method
-ImportMethod=Import method
-ToBuildBackupFileClickHere=To build a backup file, click <a href="%s">here</a>.
-ImportMySqlDesc=To import a backup file, you must use mysql command from command line:
-ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line:
-ImportMySqlCommand=%s %s < mybackupfile.sql
-ImportPostgreSqlCommand=%s %s mybackupfile.sql
-FileNameToGenerate=File name to generate
-Compression=Compression
-CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
-CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
-ExportCompatibility=Compatibility of generated export file
-MySqlExportParameters=MySQL export parameters
-PostgreSqlExportParameters= PostgreSQL export parameters
-UseTransactionnalMode=Use transactional mode
-FullPathToMysqldumpCommand=Full path to mysqldump command
-FullPathToPostgreSQLdumpCommand=Full path to pg_dump command
-ExportOptions=Export Options
-AddDropDatabase=Add DROP DATABASE command
-AddDropTable=Add DROP TABLE command
-ExportStructure=Structure
-NameColumn=Name columns
-ExtendedInsert=Extended INSERT
-NoLockBeforeInsert=No lock commands around INSERT
-DelayedInsert=Delayed insert
-EncodeBinariesInHexa=Encode binary data in hexadecimal
-IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
-AutoDetectLang=Autodetect (browser language)
-FeatureDisabledInDemo=Feature disabled in demo
-FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Permissions
-BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
-OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
-ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external modules...
-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 (Note: anyone experienced in PHP programming can provide custom development for an open source project)
-WebSiteDesc=Reference websites to find more modules...
-URL=Link
-BoxesAvailable=Widgets available
-BoxesActivated=Widgets activated
-ActivateOn=Activate on
-ActiveOn=Activated on
-SourceFile=Source file
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
-Required=Required
-UsedOnlyWithTypeOption=Used by some agenda option only
-Security=Security
-Passwords=Passwords
-DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
-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 (Activated 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 make building of a global cumulated pdf not working (like unpaid invoices).
-Feature=Feature
-DolibarrLicense=License
-Developpers=Developers/contributors
-OfficialWebSite=Dolibarr international official web site
-OfficialWebSiteLocal=Local web site (%s)
-OfficialWiki=Dolibarr documentation on Wiki
-OfficialDemo=Dolibarr online demo
-OfficialMarketPlace=Official market place for external modules/addons
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
-ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
-HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
-HelpCenterDesc2=Some part of this service are available in <b>english only</b>.
-CurrentMenuHandler=Current menu handler
-MeasuringUnit=Measuring unit
-LeftMargin=Left margin
-TopMargin=Top margin
-PaperSize=Paper type
-Orientation=Orientation
-SpaceX=Space X
-SpaceY=Space Y
-FontSize=Font size
-Content=Content
-NoticePeriod=Notice period
-NewByMonth=New by month
-Emails=E-mails
-EMailsSetup=E-mails setup
-EMailsDesc=This page allows you to overwrite your PHP parameters for e-mails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless.
-MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
-MAIN_MAIL_EMAIL_FROM=Sender e-mail for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Sender e-mail used for error returns emails sent
-MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
-MAIN_DISABLE_ALL_MAILS=Disable all e-mails sendings (for test purposes or demos)
-MAIN_MAIL_SENDMODE=Method to use to send EMails
-MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
-MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
-MAIN_MAIL_EMAIL_TLS= Use TLS (SSL) encrypt
-MAIN_MAIL_EMAIL_STARTTLS= Use TLS (STARTTLS) encrypt
-MAIN_DISABLE_ALL_SMS=Disable all SMS sendings (for test purposes or demos)
-MAIN_SMS_SENDMODE=Method to use to send SMS
-MAIN_MAIL_SMS_FROM=Default sender phone number for Sms sending
-MAIN_MAIL_DEFAULT_FROMTYPE=Sender e-mail by default for manual sendings (User email or Company email)
-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/
-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 setup
-ModuleFamilyBase=System
-ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
-ModuleFamilyProducts=Products Management (PM)
-ModuleFamilyHr=Human Resource Management (HR)
-ModuleFamilyProjects=Projects/Collaborative work
-ModuleFamilyOther=Other
-ModuleFamilyTechnic=Multi-modules tools
-ModuleFamilyExperimental=Experimental modules
-ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
-ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
-ModuleFamilyInterface=Interfaces with external systems
-MenuHandlers=Menu handlers
-MenuAdmin=Menu editor
-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).
-DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <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>.
-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='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
-YouCanSubmitFile=For this step, you can send package using this tool: Select module file
-CurrentVersion=Dolibarr current version
-CallUpdatePage=Go to the page that updates the database structure and data: %s.
-LastStableVersion=Latest stable version
-LastActivationDate=Latest activation date
-UpdateServerOffline=Update server offline
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
-GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
-GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
-ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
-ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
-DoTestServerAvailability=Test server connectivity
-DoTestSend=Test sending
-DoTestSendHTML=Test sending HTML
-ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
-ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
-UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
-UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
-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...).
-MinLength=Minimum length
-LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
-ExamplesWithCurrentSetup=Examples with current running setup
-ListOfDirectories=List of OpenDocument templates directories
-ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
-NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories
+AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
+AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 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.
-ThemeDir=Skins directory
-ConnectionTimeout=Connexion timeout
-ResponseTimeout=Response timeout
-SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__
-ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
-SecurityToken=Key to secure URLs
-NoSmsEngine=No SMS sender manager available. SMS sender manager are not installed with default distribution (because they depends on an external supplier) but you can find some on %s
-PDF=PDF
-PDFDesc=You can set each global options related to the PDF generation
-PDFAddressForging=Rules to forge address boxes
-HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF
-HideDescOnPDF=Hide products description on generated PDF
-HideRefOnPDF=Hide products ref. on generated PDF
-HideDetailsOnPDF=Hide product lines details on generated PDF
-PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
-Library=Library
-UrlGenerationParameters=Parameters to secure URLs
-SecurityTokenIsUnique=Use a unique securekey parameter for each URL
-EnterRefToBuildUrl=Enter reference for object %s
-GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons to 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
-MassConvert=Launch mass convert
-String=String
-TextLong=Long text
-Int=Integer
-Float=Float
-DateAndTime=Date and hour
-Unique=Unique
-Boolean=Boolean (Checkbox)
-ExtrafieldPhone = Phone
-ExtrafieldPrice = Price
-ExtrafieldMail = Email
-ExtrafieldUrl = Url
-ExtrafieldSelect = Select list
-ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
-ExtrafieldPassword=Password
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
-ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
-LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
-SMS=SMS
-LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
-RefreshPhoneLink=Refresh link
-LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
-KeepEmptyToUseDefault=Keep empty to use default value
-DefaultLink=Default link
-SetAsDefault=Set as default
-ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
-BarcodeInitForThirdparties=Mass barcode init for thirdparties
-BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Init value for next %s empty records
-EraseAllCurrentBarCode=Erase all current barcode values
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
-AllBarcodeReset=All barcode values have been removed
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into 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
-DisplayCompanyInfo=Display company address
-DisplayCompanyManagers=Display manager names
-DisplayCompanyInfoAndManagers=Display company address and manager names
-EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
-ModuleCompanyCodePanicum=Return an empty accountancy code.
-ModuleCompanyCodeDigitaria=Accountancy 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: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-ClickToShowDescription=Click to show description
-# Modules
-Module0Name=Users & groups
-Module0Desc=Users / Employees and Groups management
-Module1Name=Third parties
-Module1Desc=Companies and contact management (customers, prospects...)
-Module2Name=Commercial
-Module2Desc=Commercial management
-Module10Name=Accounting
-Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
-Module20Name=Proposals
-Module20Desc=Commercial proposal management
-Module22Name=Mass E-mailings
-Module22Desc=Mass E-mailing management
-Module23Name=Energy
-Module23Desc=Monitoring the consumption of energies
-Module25Name=Customer Orders
-Module25Desc=Customer order management
-Module30Name=Invoices
-Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
-Module40Name=Suppliers
-Module40Desc=Supplier management and buying (orders and invoices)
-Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
-Module49Name=Editors
-Module49Desc=Editor management
-Module50Name=Products
-Module50Desc=Product management
-Module51Name=Mass mailings
-Module51Desc=Mass paper mailing management
-Module52Name=Stocks
-Module52Desc=Stock management (products)
-Module53Name=Services
-Module53Desc=Service management
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
-Module55Name=Barcodes
-Module55Desc=Barcode management
-Module56Name=Telephony
-Module56Desc=Telephony integration
-Module57Name=Direct bank payment orders
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
-Module58Name=ClickToDial
-Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
-Module70Name=Interventions
-Module70Desc=Intervention management
-Module75Name=Expense and trip notes
-Module75Desc=Expense and trip notes management
-Module80Name=Shipments
-Module80Desc=Shipments and delivery order management
-Module85Name=Banks and cash
-Module85Desc=Management of bank or cash accounts
-Module100Name=External site
-Module100Desc=This module include an external web site or page into Dolibarr menus and view it into a Dolibarr frame
-Module105Name=Mailman and SPIP
-Module105Desc=Mailman or SPIP interface for member module
-Module200Name=LDAP
-Module200Desc=LDAP directory synchronisation
-Module210Name=PostNuke
-Module210Desc=PostNuke integration
-Module240Name=Data exports
-Module240Desc=Tool to export Dolibarr data (with assistants)
-Module250Name=Data imports
-Module250Desc=Tool to import data in Dolibarr  (with assistants)
-Module310Name=Members
-Module310Desc=Foundation members management
-Module320Name=RSS Feed
-Module320Desc=Add RSS feed inside Dolibarr screen pages
-Module330Name=Bookmarks
-Module330Desc=Bookmarks management
-Module400Name=Projects/Opportunities/Leads
-Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
-Module410Name=Webcalendar
-Module410Desc=Webcalendar integration
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
-Module520Name=Loan
-Module520Desc=Management of loans
-Module600Name=Notifications
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
-Module700Name=Donations
-Module700Desc=Donation management
-Module770Name=Expense reports
-Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
-Module1200Name=Mantis
-Module1200Desc=Mantis integration
-Module1400Name=Accounting
-Module1400Desc=Accounting management (double parties)
-Module1520Name=Document Generation
-Module1520Desc=Mass mail document generation
-Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
-Module2000Name=WYSIWYG editor
-Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
-Module2200Name=Dynamic Prices
-Module2200Desc=Enable the usage of math expressions for prices
-Module2300Name=Cron
-Module2300Desc=Scheduled job management
-Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
-Module2500Name=Electronic Content Management
-Module2500Desc=Save and share documents
-Module2600Name=API/Web services (SOAP server)
-Module2600Desc=Enable the Dolibarr SOAP server providing API services
-Module2610Name=API/Web services (REST server)
-Module2610Desc=Enable the Dolibarr REST server providing API services
-Module2660Name=Call WebServices (SOAP client)
-Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
-Module2700Name=Gravatar
-Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
-Module2800Desc=FTP Client
-Module2900Name=GeoIPMaxmind
-Module2900Desc=GeoIP Maxmind conversions capabilities
-Module3100Name=Skype
-Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
-Module4000Name=HRM
-Module4000Desc=Human resources management
-Module5000Name=Multi-company
-Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management
-Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
-Module20000Name=Leave Requests management
-Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Product lot
-Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
-Module50000Name=PayBox
-Module50000Desc=Module to offer an online payment page by credit card with PayBox
-Module50100Name=Point of sales
-Module50100Desc=Point of sales module (POS).
-Module50200Name=Paypal
-Module50200Desc=Module to offer an online payment page by credit card with Paypal
-Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double parties)
-Module54000Name=PrintIPP
-Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
-Module55000Name=Poll, Survey or Vote
-Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
-Module59000Name=Margins
-Module59000Desc=Module to manage margins
-Module60000Name=Commissions
-Module60000Desc=Module to manage commissions
-Module63000Name=Resources
-Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
-Permission11=Read customer invoices
-Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
-Permission14=Validate customer invoices
-Permission15=Send customer invoices by email
-Permission16=Create payments for customer invoices
-Permission19=Delete customer invoices
-Permission21=Read commercial proposals
-Permission22=Create/modify commercial proposals
-Permission24=Validate commercial proposals
-Permission25=Send commercial proposals
-Permission26=Close commercial proposals
-Permission27=Delete commercial proposals
-Permission28=Export commercial proposals
-Permission31=Read products
-Permission32=Create/modify products
-Permission34=Delete products
-Permission36=See/manage hidden products
-Permission38=Export products
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
-Permission44=Delete projects (shared project and projects i'm contact for)
-Permission45=Export projects
-Permission61=Read interventions
-Permission62=Create/modify interventions
-Permission64=Delete interventions
-Permission67=Export interventions
-Permission71=Read members
-Permission72=Create/modify members
-Permission74=Delete members
-Permission75=Setup types of membership
-Permission76=Export data
-Permission78=Read subscriptions
-Permission79=Create/modify subscriptions
-Permission81=Read customers orders
-Permission82=Create/modify customers orders
-Permission84=Validate customers orders
-Permission86=Send customers orders
-Permission87=Close customers orders
-Permission88=Cancel customers orders
-Permission89=Delete customers orders
-Permission91=Read social or fiscal taxes and vat
-Permission92=Create/modify social or fiscal taxes and vat
-Permission93=Delete social or fiscal taxes and vat
-Permission94=Export social or fiscal taxes
-Permission95=Read reports
-Permission101=Read sendings
-Permission102=Create/modify sendings
-Permission104=Validate sendings
-Permission106=Export sendings
-Permission109=Delete sendings
-Permission111=Read financial accounts
-Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
-Permission114=Reconciliate transactions
-Permission115=Export transactions and account statements
-Permission116=Transfers between accounts
-Permission117=Manage cheques dispatching
-Permission121=Read third parties linked to user
-Permission122=Create/modify third parties linked to user
-Permission125=Delete third parties linked to user
-Permission126=Export third parties
-Permission141=Read all projects and tasks (also private projects i am not contact for)
-Permission142=Create/modify all projects and tasks (also private projects i am not 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
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
-Permission167=Export contracts
-Permission171=Read trips and expenses (yours and your subordinates)
-Permission172=Create/modify trips and expenses
-Permission173=Delete trips and expenses
-Permission174=Read all trips and expenses
-Permission178=Export trips and expenses
-Permission180=Read suppliers
-Permission181=Read supplier orders
-Permission182=Create/modify supplier orders
-Permission183=Validate supplier orders
-Permission184=Approve supplier orders
-Permission185=Order or cancel supplier orders
-Permission186=Receive supplier orders
-Permission187=Close supplier orders
-Permission188=Cancel supplier orders
-Permission192=Create lines
-Permission193=Cancel lines
-Permission194=Read the bandwith lines
-Permission202=Create ADSL connections
-Permission203=Order connections orders
-Permission204=Order connections
-Permission205=Manage connections
-Permission206=Read connections
-Permission211=Read Telephony
-Permission212=Order lines
-Permission213=Activate line
-Permission214=Setup Telephony
-Permission215=Setup providers
-Permission221=Read emailings
-Permission222=Create/modify emailings (topic, recipients...)
-Permission223=Validate emailings (allows sending)
-Permission229=Delete emailings
-Permission237=View recipients and info
-Permission238=Manually send mailings
-Permission239=Delete mailings after validation or sent
-Permission241=Read categories
-Permission242=Create/modify categories
-Permission243=Delete categories
-Permission244=See the contents of the hidden categories
-Permission251=Read other users and groups
-PermissionAdvanced251=Read other users
-Permission252=Read permissions of other users
-Permission253=Create/modify other users, groups and permisssions
-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 assignement matters).
-Permission271=Read CA
-Permission272=Read invoices
-Permission273=Issue invoices
-Permission281=Read contacts
-Permission282=Create/modify contacts
-Permission283=Delete contacts
-Permission286=Export contacts
-Permission291=Read tariffs
-Permission292=Set permissions on the tariffs
-Permission293=Modify costumers tariffs
-Permission300=Read bar codes
-Permission301=Create/modify bar codes
-Permission302=Delete bar codes
-Permission311=Read services
-Permission312=Assign service/subscription to contract
-Permission331=Read bookmarks
-Permission332=Create/modify bookmarks
-Permission333=Delete bookmarks
-Permission341=Read its own permissions
-Permission342=Create/modify his own user information
-Permission343=Modify his own password
-Permission344=Modify its own permissions
-Permission351=Read groups
-Permission352=Read groups permissions
-Permission353=Create/modify groups
-Permission354=Delete or disable groups
-Permission358=Export users
-Permission401=Read discounts
-Permission402=Create/modify discounts
-Permission403=Validate discounts
-Permission404=Delete discounts
-Permission510=Read Salaries
-Permission512=Create/modify salaries
-Permission514=Delete salaries
-Permission517=Export salaries
-Permission520=Read Loans
-Permission522=Create/modify loans
-Permission524=Delete loans
-Permission525=Access loan calculator
-Permission527=Export loans
-Permission531=Read services
-Permission532=Create/modify services
-Permission534=Delete services
-Permission536=See/manage hidden services
-Permission538=Export services
-Permission701=Read donations
-Permission702=Create/modify donations
-Permission703=Delete donations
-Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
-Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
-Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission779=Export expense reports
-Permission1001=Read stocks
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
-Permission1004=Read stock movements
-Permission1005=Create/modify stock movements
-Permission1101=Read delivery orders
-Permission1102=Create/modify delivery orders
-Permission1104=Validate delivery orders
-Permission1109=Delete delivery orders
-Permission1181=Read suppliers
-Permission1182=Read supplier orders
-Permission1183=Create/modify supplier orders
-Permission1184=Validate supplier orders
-Permission1185=Approve supplier orders
-Permission1186=Order supplier orders
-Permission1187=Acknowledge receipt of supplier orders
-Permission1188=Delete supplier orders
-Permission1190=Approve (second approval) supplier orders
-Permission1201=Get result of an export
-Permission1202=Create/Modify an export
-Permission1231=Read supplier invoices
-Permission1232=Create/modify supplier invoices
-Permission1233=Validate supplier invoices
-Permission1234=Delete supplier invoices
-Permission1235=Send supplier invoices by email
-Permission1236=Export supplier invoices, attributes and payments
-Permission1237=Export supplier orders and their details
-Permission1251=Run mass imports of external data into database (data load)
-Permission1321=Export customer invoices, attributes and payments
-Permission1322=Reopen a paid bill
-Permission1421=Export customer orders and attributes
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
-Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
-Permission20006=Admin leave requests (setup and update balance)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
-Permission2401=Read actions (events or tasks) linked to his account
-Permission2402=Create/modify actions (events or tasks) linked to his account
-Permission2403=Delete actions (events or tasks) linked to his account
-Permission2411=Read actions (events or tasks) of others
-Permission2412=Create/modify actions (events or tasks) of others
-Permission2413=Delete actions (events or tasks) of others
-Permission2414=Export actions/tasks of others
-Permission2501=Read/Download documents
-Permission2502=Download documents
-Permission2503=Submit or delete documents
-Permission2515=Setup documents directories
-Permission2801=Use FTP client in read mode (browse and download only)
-Permission2802=Use FTP client in write mode (delete or upload files)
-Permission50101=Use Point of sales
-Permission50201=Read transactions
-Permission50202=Import transactions
-Permission54001=Print
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
-Permission59003=Read every user margin
-Permission63001=Read resources
-Permission63002=Create/modify resources
-Permission63003=Delete resources
-Permission63004=Link resources to agenda events
-DictionaryCompanyType=Types of thirdparties
-DictionaryCompanyJuridicalType=Legal forms of thirdparties
-DictionaryProspectLevel=Prospect potential level
-DictionaryCanton=State/Province
-DictionaryRegion=Regions
-DictionaryCountry=Countries
-DictionaryCurrency=Currencies
-DictionaryCivility=Personal and professional titles
-DictionaryActions=Types of agenda events
-DictionarySocialContributions=Social or fiscal taxes types
-DictionaryVAT=VAT Rates or Sales Tax Rates
-DictionaryRevenueStamp=Amount of revenue stamps
-DictionaryPaymentConditions=Payment terms
-DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact/Address types
-DictionaryEcotaxe=Ecotax (WEEE)
-DictionaryPaperFormat=Paper formats
-DictionaryFormatCards=Cards formats
-DictionaryFees=Types of fees
-DictionarySendingMethods=Shipping methods
-DictionaryStaff=Staff
-DictionaryAvailability=Delivery delay
-DictionaryOrderMethods=Ordering methods
-DictionarySource=Origin of proposals/orders
-DictionaryAccountancyCategory=Accounting account groups
-DictionaryAccountancysystem=Models for chart of accounts
-DictionaryEMailTemplates=Emails templates
-DictionaryUnits=Units
-DictionaryProspectStatus=Prospection status
-DictionaryHolidayTypes=Types of leaves
-DictionaryOpportunityStatus=Opportunity status for project/lead
-SetupSaved=Setup saved
-BackToModuleList=Back to modules list
-BackToDictionaryList=Back to dictionaries list
-VATManagement=VAT Management
-VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
-VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies.
-VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
-##### Local Taxes #####
-LTRate=Rate
-LocalTax1IsNotUsed=Do not use second tax
-LocalTax1IsUsedDesc=Use a second type of tax (other than VAT)
-LocalTax1IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax1Management=Second type of tax
-LocalTax1IsUsedExample=
-LocalTax1IsNotUsedExample=
-LocalTax2IsNotUsed=Do not use third tax
-LocalTax2IsUsedDesc=Use a third type of tax (other than VAT)
-LocalTax2IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax2Management=Third type of tax
-LocalTax2IsUsedExample=
-LocalTax2IsNotUsedExample=
-LocalTax1ManagementES= RE Management
-LocalTax1IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If te buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
-LocalTax1IsNotUsedDescES= By default the proposed RE is 0. End of rule.
-LocalTax1IsUsedExampleES= In Spain they are professionals subject to some specific sections of the Spanish IAE.
-LocalTax1IsNotUsedExampleES= In Spain they are professional and societies and subject to certain sections of the Spanish IAE.
-LocalTax2ManagementES= IRPF Management
-LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
-LocalTax2IsNotUsedDescES= By default the proposed IRPF is 0. End of rule.
-LocalTax2IsUsedExampleES= In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
-LocalTax2IsNotUsedExampleES= In Spain they are bussines not subject to tax system of modules.
-CalcLocaltax=Reports on local taxes
-CalcLocaltax1=Sales - Purchases
-CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2=Purchases
-CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3=Sales
-CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
-LabelUsedByDefault=Label used by default if no translation can be found for code
-LabelOnDocuments=Label on documents
-NbOfDays=Nb of days
-AtEndOfMonth=At end of month
-CurrentNext=Current/Next
-Offset=Offset
-AlwaysActive=Always active
-Upgrade=Upgrade
-MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Deploy/install external module
-WebServer=Web server
-DocumentRootServer=Web server's root directory
-DataRootServer=Data files directory
-IP=IP
-Port=Port
-VirtualServerName=Virtual server name
-OS=OS
-PhpWebLink=Web-Php link
-Browser=Browser
-Server=Server
-Database=Database
-DatabaseServer=Database host
-DatabaseName=Database name
-DatabasePort=Database port
-DatabaseUser=Database user
-DatabasePassword=Database password
-Tables=Tables
-TableName=Table name
-NbOfRecord=Nb of records
-Host=Server
-DriverType=Driver type
-SummarySystem=System information summary
-SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Foundation
-DefaultMenuManager= Standard menu manager
-DefaultMenuSmartphoneManager=Smartphone menu manager
-Skin=Skin theme
-DefaultSkin=Default skin theme
-MaxSizeList=Max length for list
-DefaultMaxSizeList=Default max length for lists
-DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
-MessageOfDay=Message of the day
-MessageLogin=Login page message
-PermanentLeftSearchForm=Permanent search form on left menu
-DefaultLanguage=Default language to use (language code)
-EnableMultilangInterface=Enable multilingual interface
-EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/foundation information
-CompanyIds=Company/foundation identities
-CompanyName=Name
-CompanyAddress=Address
-CompanyZip=Zip
-CompanyTown=Town
-CompanyCountry=Country
-CompanyCurrency=Main currency
-CompanyObject=Object of the company
-Logo=Logo
-DoNotSuggestPaymentMode=Do not suggest
-NoActiveBankAccountDefined=No active bank account defined
-OwnerOfBankAccount=Owner of bank account %s
-BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show link "<strong>%s</strong>"
-Alerts=Alerts
-DelaysOfToleranceBeforeWarning=Tolerance delays before warning
-DelaysOfToleranceDesc=This screen allows you to define the tolerated delays before an alert is reported on screen with picto %s for each late element.
-Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned events (agenda events) not completed yet
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Delay tolerance (in days) before alert on project not closed in time
-Delays_MAIN_DELAY_TASKS_TODO=Delay tolerance (in days) before alert on planned tasks (project tasks) not completed yet
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on orders not processed yet
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on suppliers orders not processed yet
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Delay tolerance (in days) before alert on proposals to close
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Delay tolerance (in days) before alert on proposals not billed
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerance delay (in days) before alert on services to activate
-Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerance delay (in days) before alert on expired services
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerance delay (in days) before alert on unpaid supplier invoices
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerence delay (in days) before alert on unpaid client invoices
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerance delay (in days) before alert on pending bank reconciliation
-Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed membership fee
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
-Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
-SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
-SetupDescription5=Other menu entries manage optional parameters.
-LogEvents=Security audit events
-Audit=Audit
-InfoDolibarr=About Dolibarr
-InfoBrowser=About Browser
-InfoOS=About OS
-InfoWebServer=About Web Server
-InfoDatabase=About Database
-InfoPHP=About PHP
-InfoPerf=About Performances
-BrowserName=Browser name
-BrowserOS=Browser OS
-ListOfSecurityEvents=List of Dolibarr security events
-SecurityEventsPurged=Security events purged
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
-SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
-SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
-DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
-AvailableModules=Available 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.
-TriggersAvailable=Available triggers
-TriggersDesc=Triggers are files that will modify the behaviour of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realised new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
-TriggerDisabledByName=Triggers in this file are disabled by the <b>-NORUN</b> suffix in their name.
-TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module <b>%s</b> is disabled.
-TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules.
-TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
-GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password
-DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">check here</a>.
-MiscellaneousDesc=All other security related parameters are defined here.
-LimitsSetup=Limits/Precision setup
-LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here
-MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices
-MAIN_MAX_DECIMALS_TOT=Max decimals for total prices
-MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add <b>...</b> after this number if you want to see <b>...</b> when number is truncated when shown on screen)
-MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
-UnitPriceOfProduct=Net unit price of a product
-TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
-ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
-NoEventFoundWithCriteria=No security event has been found for such search criterias.
-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.
-BackupDescX=Archived directory should be stored in a secure place.
-BackupDescY=The generated dump file should be stored in a secure place.
-BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one
-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 directoy (<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=Available database backup dump files
-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
-DownloadMoreSkins=More skins to download
-SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence without hole and with no reset
-ShowProfIdInAddress=Show professionnal id with addresses on documents
-ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents
-TranslationUncomplete=Partial translation
-MAIN_DISABLE_METEO=Disable meteo view
-TestLoginToAPI=Test login to API
-ProxyDesc=Some features of Dolibarr need to have an Internet access to work. Define here parameters for this. If the Dolibarr server is behind a Proxy server, those parameters tells Dolibarr how to access Internet through it.
-ExternalAccess=External access
-MAIN_PROXY_USE=Use a proxy server (otherwise direct access to internet)
-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 all attributes, not already available by default, and that you want to be supported for %s.
-ExtraFields=Complementary attributes
-ExtraFieldsLines=Complementary attributes (lines)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
-ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact/address)
-ExtraFieldsMember=Complementary attributes (member)
-ExtraFieldsMemberType=Complementary attributes (member type)
-ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
-ExtraFieldsSupplierOrders=Complementary attributes (orders)
-ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
-ExtraFieldsProject=Complementary attributes (projects)
-ExtraFieldsProjectTask=Complementary attributes (tasks)
-ExtraFieldHasWrongValue=Attribute %s has a wrong value.
-AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
-SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
-PathToDocuments=Path to documents
-PathDirectory=Directory
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might 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.
-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: <strong>User display setup</strong> tab of 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
-TranslationString=Translation string
-CurrentTranslationString=Current translation string
-WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
-NewTranslationStringToShow=New translation string to show
-OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
-YouMustEnableOneModule=You must at least enable 1 module
-ClassNotFoundIntoPathWarning=Class %s not found into PHP path
-YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
-SuhosinSessionEncrypt=Session storage encrypted by Suhosin
-ConditionIsCurrently=Condition is currently %s
-YouUseBestDriver=You use driver %s that is best driver available currently.
-YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required 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.
-BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance.
-BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
-AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp".
-AskForPreferredShippingMethod=Ask for preferred Sending Method for Third Parties.
-FieldEdition=Edition of field %s
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
-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.
-PasswordGenerationPerso=Return a password according to your personally defined configuration.
-SetupPerso=According to your configuration
-PasswordPatternDesc=Password pattern description
-##### Users setup #####
-RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passwords
-DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page
-UsersSetup=Users module setup
-UserMailRequired=EMail required to create a new user
-##### HRM setup #####
-HRMSetup=HRM module setup
-##### Company setup #####
-CompanySetup=Companies module setup
-CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier)
-AccountCodeManager=Module for accountancy code generation (customer or supplier)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
-NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
-NotificationsDescGlobal=* or by setting global target emails in module setup page.
-ModelModules=Documents templates
-DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
-WatermarkOnDraft=Watermark on draft document
-JSOnPaimentBill=Activate feature to autofill payment lines on payment form
-CompanyIdProfChecker=Rules on Professional Ids
-MustBeUnique=Must be unique?
-MustBeMandatory=Mandatory to create third parties?
-MustBeInvoiceMandatory=Mandatory to validate invoices?
-##### Webcal setup #####
-WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
-##### Invoices #####
-BillsSetup=Invoices module setup
-BillsNumberingModule=Invoices and credit notes numbering model
-BillsPDFModules=Invoice documents models
-CreditNote=Credit note
-CreditNotes=Credit notes
-ForceInvoiceDate=Force invoice date to validation date
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
-SuggestPaymentByRIBOnAccount=Suggest payment by withdraw on account
-SuggestPaymentByChequeToAddress=Suggest payment by cheque to
-FreeLegalTextOnInvoices=Free text on invoices
-WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
-PaymentsNumberingModule=Payments numbering model
-SuppliersPayment=Suppliers payments
-SupplierPaymentSetup=Suppliers payments setup
-##### Proposals #####
-PropalSetup=Commercial proposals module setup
-ProposalsNumberingModules=Commercial proposal numbering models
-ProposalsPDFModules=Commercial proposal documents models
-FreeLegalTextOnProposal=Free text on commercial proposals
-WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
-WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
-##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
-##### Orders #####
-OrdersSetup=Order management setup
-OrdersNumberingModules=Orders numbering models
-OrdersModelModule=Order documents models
-FreeLegalTextOnOrders=Free text on orders
-WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
-ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Interventions #####
-InterventionsSetup=Interventions module setup
-FreeLegalTextOnInterventions=Free text on intervention documents
-FicheinterNumberingModules=Intervention numbering models
-TemplatePDFInterventions=Intervention card documents models
-WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
-##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
-ContractsNumberingModules=Contracts numbering modules
-TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
-##### Members #####
-MembersSetup=Members module setup
-MemberMainOptions=Main options
-AdherentLoginRequired= Manage a Login for each member
-AdherentMailRequired=EMail required to create a new member
-MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
-##### LDAP setup #####
-LDAPSetup=LDAP Setup
-LDAPGlobalParameters=Global parameters
-LDAPUsersSynchro=Users
-LDAPGroupsSynchro=Groups
-LDAPContactsSynchro=Contacts
-LDAPMembersSynchro=Members
-LDAPSynchronization=LDAP synchronisation
-LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP
-LDAPToDolibarr=LDAP -> Dolibarr
-DolibarrToLDAP=Dolibarr -> LDAP
-LDAPNamingAttribute=Key in LDAP
-LDAPSynchronizeUsers=Organization of users in LDAP
-LDAPSynchronizeGroups=Organization of groups in LDAP
-LDAPSynchronizeContacts=Organization of contacts in LDAP
-LDAPSynchronizeMembers=Organization of foundation's members in LDAP
-LDAPPrimaryServer=Primary server
-LDAPSecondaryServer=Secondary server
-LDAPServerPort=Server port
-LDAPServerPortExample=Default port : 389
-LDAPServerProtocolVersion=Protocol version
-LDAPServerUseTLS=Use TLS
-LDAPServerUseTLSExample=Your LDAP server use TLS
-LDAPServerDn=Server DN
-LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
-LDAPPassword=Administrator password
-LDAPUserDn=Users' DN
-LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
-LDAPGroupDn=Groups' DN
-LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com)
-LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
-LDAPServerDnExample=Complete DN (ex: dc=example,dc=com)
-LDAPDnSynchroActive=Users and groups synchronization
-LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization
-LDAPDnContactActive=Contacts' synchronization
-LDAPDnContactActiveExample=Activated/Unactivated synchronization
-LDAPDnMemberActive=Members' synchronization
-LDAPDnMemberActiveExample=Activated/Unactivated synchronization
-LDAPContactDn=Dolibarr contacts' DN
-LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com)
-LDAPMemberDn=Dolibarr members DN
-LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com)
-LDAPMemberObjectClassList=List of objectClass
-LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPUserObjectClassList=List of objectClass
-LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPGroupObjectClassList=List of objectClass
-LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
-LDAPContactObjectClassList=List of objectClass
-LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPTestConnect=Test LDAP connection
-LDAPTestSynchroContact=Test contacts synchronization
-LDAPTestSynchroUser=Test user synchronization
-LDAPTestSynchroGroup=Test group synchronization
-LDAPTestSynchroMember=Test member synchronization
-LDAPTestSearch= Test a LDAP search
-LDAPSynchroOK=Synchronization test successful
-LDAPSynchroKO=Failed synchronization test
-LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that connexion to server is correctly configured and allows LDAP udpates
-LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s)
-LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s)
-LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPBindKO=Connect/Authentificate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPSetupForVersion3=LDAP server configured for version 3
-LDAPSetupForVersion2=LDAP server configured for version 2
-LDAPDolibarrMapping=Dolibarr Mapping
-LDAPLdapMapping=LDAP Mapping
-LDAPFieldLoginUnix=Login (unix)
-LDAPFieldLoginExample=Example : uid
-LDAPFilterConnection=Search filter
-LDAPFilterConnectionExample=Example : &(objectClass=inetOrgPerson)
-LDAPFieldLoginSamba=Login (samba, activedirectory)
-LDAPFieldLoginSambaExample=Example : samaccountname
-LDAPFieldFullname=Full name
-LDAPFieldFullnameExample=Example : cn
-LDAPFieldPasswordNotCrypted=Password not crypted
-LDAPFieldPasswordCrypted=Password crypted
-LDAPFieldPasswordExample=Example : userPassword
-LDAPFieldCommonNameExample=Example : cn
-LDAPFieldName=Name
-LDAPFieldNameExample=Example : sn
-LDAPFieldFirstName=First name
-LDAPFieldFirstNameExample=Example : givenName
-LDAPFieldMail=Email address
-LDAPFieldMailExample=Example : mail
-LDAPFieldPhone=Professional phone number
-LDAPFieldPhoneExample=Example : telephonenumber
-LDAPFieldHomePhone=Personal phone number
-LDAPFieldHomePhoneExample=Example : homephone
-LDAPFieldMobile=Cellular phone
-LDAPFieldMobileExample=Example : mobile
-LDAPFieldFax=Fax number
-LDAPFieldFaxExample=Example : facsimiletelephonenumber
-LDAPFieldAddress=Street
-LDAPFieldAddressExample=Example : street
-LDAPFieldZip=Zip
-LDAPFieldZipExample=Example : postalcode
-LDAPFieldTown=Town
-LDAPFieldTownExample=Example : l
-LDAPFieldCountry=Country
-LDAPFieldDescription=Description
-LDAPFieldDescriptionExample=Example : description
-LDAPFieldNotePublic=Public Note
-LDAPFieldNotePublicExample=Example : publicnote
-LDAPFieldGroupMembers= Group members
-LDAPFieldGroupMembersExample= Example : uniqueMember
-LDAPFieldBirthdate=Birthdate
-LDAPFieldCompany=Company
-LDAPFieldCompanyExample=Example : o
-LDAPFieldSid=SID
-LDAPFieldSidExample=Example : objectsid
-LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Job position
-LDAPFieldTitleExample=Example: title
-LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
-LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
-LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts.
-LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users.
-LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups.
-LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module.
-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 advices related to performance.
-NotInstalled=Not installed, so your server is not slow 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.
-MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
-MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
-OPCodeCache=OPCode cache
-NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad).
-HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
-FilesOfTypeCached=Files of type %s are cached by HTTP server
-FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
-FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
-FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
-CacheByServer=Cache by server
-CacheByClient=Cache by browser
-CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
-##### Products #####
-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)
-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 third party language
-UseSearchToSelectProductTooltip=Also if you have a large number of product (> 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)
-SetDefaultBarcodeTypeProducts=Default barcode type to use for products
-SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
-ProductCodeChecker= Module for product code generation and checking (product or service)
-ProductOtherConf= Product / Service configuration
-IsNotADir=is not a directory!
-##### Syslog #####
-SyslogSetup=Logs module setup
-SyslogOutput=Logs outputs
-SyslogFacility=Facility
-SyslogLevel=Level
-SyslogFilename=File name and path
-YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
-ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
-##### Donations #####
-DonationsSetup=Donation module setup
-DonationsReceiptModel=Template of donation receipt
-##### Barcode #####
-BarcodeSetup=Barcode setup
-PaperFormatModule=Print format module
-BarcodeEncodeModule=Barcode encoding type
-CodeBarGenerator=Barcode generator
-ChooseABarCode=No generator defined
-FormatNotSupportedByGenerator=Format not supported by this generator
-BarcodeDescEAN8=Barcode of type EAN8
-BarcodeDescEAN13=Barcode of type EAN13
-BarcodeDescUPC=Barcode of type UPC
-BarcodeDescISBN=Barcode of type ISBN
-BarcodeDescC39=Barcode of type C39
-BarcodeDescC128=Barcode of type C128
-BarcodeDescDATAMATRIX=Barcode of type Datamatrix
-BarcodeDescQRCODE=Barcode of type QR code
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
-BarcodeInternalEngine=Internal engine
-BarCodeNumberManager=Manager to auto define barcode numbers
-##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct debit payment orders
-##### ExternalRSS #####
-ExternalRSSSetup=External RSS imports setup
-NewRSS=New RSS Feed
-RSSUrl=RSS URL
-RSSUrlExample=An interesting RSS feed
-##### Mailing #####
-MailingSetup=EMailing module setup
-MailingEMailFrom=Sender EMail (From) for emails sent by emailing module
-MailingEMailError=Return EMail (Errors-to) for emails with errors
-MailingDelay=Seconds to wait after sending next message
-##### Notification #####
-NotificationSetup=EMail notification module setup
-NotificationEMailFrom=Sender EMail (From) for emails sent for notifications
-FixedEmailTarget=Fixed email target
-##### Sendings #####
-SendingsSetup=Sending module setup
-SendingsReceiptModel=Sending receipt model
-SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
-FreeLegalTextOnShippings=Free text on shipments
-##### Deliveries #####
-DeliveryOrderNumberingModules=Products deliveries receipt numbering module
-DeliveryOrderModel=Products deliveries receipt model
-DeliveriesOrderAbility=Support products deliveries receipts
-FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
-##### FCKeditor #####
-AdvancedEditor=Advanced editor
-ActivateFCKeditor=Activate advanced editor for:
-FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
-FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files.</font>
-FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
-FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
-##### OSCommerce 1 #####
-OSCommerceErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be an OSCommerce database (Key %s not found in table %s).
-OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' successfull.
-OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
-OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
-##### Stock #####
-StockSetup=Warehouse module setup
-IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
-##### Menu #####
-MenuDeleted=Menu deleted
-Menus=Menus
-TreeMenuPersonalized=Personalized menus
-NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
-NewMenu=New menu
-Menu=Selection of menu
-MenuHandler=Menu handler
-MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
-DetailId=Id menu
-DetailMenuHandler=Menu handler where to show new menu
-DetailMenuModule=Module name if menu entry come from a module
-DetailType=Type of menu (top or left)
-DetailTitre=Menu label or label code for translation
-DetailUrl=URL where menu send you (Absolute URL link or external link with http://)
-DetailEnabled=Condition to show or not entry
-DetailRight=Condition to display unauthorized grey menus
-DetailLangs=Lang file name for label code translation
-DetailUser=Intern / Extern / All
-Target=Target
-DetailTarget=Target for links (_blank top open a new window)
-DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu)
-ModifMenu=Menu change
-DeleteMenu=Delete menu entry
-ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
-FailedToInitializeMenu=Failed to initialize menu
-##### Tax #####
-TaxSetup=Taxes, social or fiscal taxes and dividends module setup
-OptionVatMode=VAT due
-OptionVATDefault=Cash basis
-OptionVATDebitOption=Accrual basis
-OptionVatDefaultDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on payments for services
-OptionVatDebitOptionDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on invoice (debit) for services
-SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
-OnDelivery=On delivery
-OnPayment=On payment
-OnInvoice=On invoice
-SupposedToBePaymentDate=Payment date used
-SupposedToBeInvoiceDate=Invoice date used
-Buy=Buy
-Sell=Sell
-InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
-AccountancyCode=Accountancy Code
-AccountancyCodeSell=Sale 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 -> Dictionary -> 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_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
-AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### 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 your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your 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.
-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 same computer than 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.
-##### Point Of Sales (CashDesk) #####
-CashDesk=Point of sales
-CashDeskSetup=Point of sales module setup
-CashDeskThirdPartyForSell=Default generic third party to use for sells
-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).
-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
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
-##### Bookmark #####
-BookmarkSetup=Bookmark module setup
-BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu.
-NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu
-##### WebServices #####
-WebServicesSetup=Webservices module setup
-WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
-WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
-EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
-##### API ####
-ApiSetup=API module setup
-ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
-OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
-ApiKey=Key for API
-WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
-##### Bank #####
-BankSetupModule=Bank module setup
-FreeLegalTextOnChequeReceipts=Free text on cheque receipts
-BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
-BankOrderGlobal=General
-BankOrderGlobalDesc=General display order
-BankOrderES=Spanish
-BankOrderESDesc=Spanish display order
-ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
-##### Multicompany #####
-MultiCompanySetup=Multi-company module setup
-##### Suppliers #####
-SuppliersSetup=Supplier module setup
-SuppliersCommandModel=Complete template of supplier order (logo...)
-SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
-SuppliersInvoiceNumberingModel=Supplier invoices numbering models
-IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
-##### GeoIPMaxmind #####
-GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
-NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
-YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
-YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
-TestGeoIPResult=Test of a conversion IP -> country
-##### Projects #####
-ProjectsNumberingModules=Projects numbering module
-ProjectsSetup=Project module setup
-ProjectsModelModule=Project reports document model
-TasksNumberingModules=Tasks numbering module
-TaskModelModule=Tasks reports document model
-UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
-##### ECM (GED) #####
-##### Fiscal Year #####
-AccountingPeriods=Accounting periods
-AccountingPeriodCard=Accounting period
-NewFiscalYear=New accounting period
-OpenFiscalYear=Open accounting period
-CloseFiscalYear=Close accounting period
-DeleteFiscalYear=Delete accounting period
-ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
-ShowFiscalYear=Show accounting period
-AlwaysEditable=Can always be edited
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
-Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
-IncludePath=Include path (defined into variable %s)
-ExpenseReportsSetup=Setup of module Expense Reports
-TemplatePDFExpenseReports=Document templates to generate expense report document
-NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
-YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of 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
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/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.
-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.
-ConfFileMuseContainCustom=Installing 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)
-TextTitleColor=Color of page title
-LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
-NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
-BackgroundColor=Background color
-TopMenuBackgroundColor=Background color for Top menu
-TopMenuDisableImages=Hide images in Top menu
-LeftMenuBackgroundColor=Background color for Left menu
-BackgroundTableTitleColor=Background color for Table title line
-BackgroundTableLineOddColor=Background color for odd table lines
-BackgroundTableLineEvenColor=Background color for even table lines
-MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
-NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
-UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
-PositionIntoComboList=Position of line into combo lists
-SellTaxRate=Sale tax rate
-RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
-UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipping, you can enter it here. You can use the key {TRACKID} into URL parameters so the system will replace it with value of tracking number user entered into shipment card.
-OpportunityPercent=When you create an opportunity, you will defined an estimated amount of project/lead. According to status of opportunity, this amount may be multiplicated 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
-FixTZ=TimeZone fix
-FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
-ExpectedChecksum=Expected Checksum
-CurrentChecksum=Current Checksum
-ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the latest stable version
-TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
-TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so 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 usefull only if your prices for each leve 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.
-SeeSubstitutionVars=See * note for list of possible substitution variables
-AllPublishers=All publishers
-UnknownPublishers=Unknown publishers
-AddRemoveTabs=Add or remove tabs
-AddDictionaries=Add dictionaries
-AddBoxes=Add widgets
-AddSheduledJobs=Add scheduled jobs
-AddHooks=Add hooks
-AddTriggers=Add triggers
-AddMenus=Add menus
-AddPermissions=Add permissions
-AddExportProfiles=Add export profiles
-AddImportProfiles=Add import profiles
-AddOtherPagesOrServices=Add other pages or services
-AddModels=Add document or numbering templates
-AddSubstitutions=Add keys substitutions
-DetectionNotPossible=Detection not possible
-UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved on 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 correclty. 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 inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <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
-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
-TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
-##### Resource ####
-ResourceSetup=Configuration du module Resource
-UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
diff --git a/htdocs/langs/es_PY/main.lang b/htdocs/langs/es_PY/main.lang
index 2fdcb824dd1..1602d6a7ffa 100644
--- a/htdocs/langs/es_PY/main.lang
+++ b/htdocs/langs/es_PY/main.lang
@@ -1,9 +1,5 @@
 # Dolibarr language file - Source file is en_US - main
 DIRECTION=ltr
-# Note for Chinese:
-# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
-# stsongstdlight or cid0cs are for simplified Chinese
-# To read Chinese pdf with Linux: sudo apt-get install poppler-data
 FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=,
@@ -23,799 +19,3 @@ FormatDateHourShort=%d/%m/%Y %H:%M
 FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
-DatabaseConnection=Database connection
-NoTemplateDefined=No template defined for this email type
-AvailableVariables=Available substitution variables
-NoTranslation=No translation
-NoRecordFound=No record found
-NoRecordDeleted=No record deleted
-NotEnoughDataYet=Not enough data
-NoError=No error
-Error=Error
-Errors=Errors
-ErrorFieldRequired=Field '%s' is required
-ErrorFieldFormat=Field '%s' has a bad value
-ErrorFileDoesNotExists=File %s does not exist
-ErrorFailedToOpenFile=Failed to open file %s
-ErrorCanNotCreateDir=Cannot create dir %s
-ErrorCanNotReadDir=Cannot read dir %s
-ErrorConstantNotDefined=Parameter %s not defined
-ErrorUnknown=Unknown error
-ErrorSQL=SQL Error
-ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this
-ErrorGoToModuleSetup=Go to Module setup to fix this
-ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
-ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
-ErrorInternalErrorDetected=Error detected
-ErrorWrongHostParameter=Wrong host parameter
-ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post again the form.
-ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child records.
-ErrorWrongValue=Wrong value
-ErrorWrongValueForParameterX=Wrong value for parameter %s
-ErrorNoRequestInError=No request in error
-ErrorServiceUnavailableTryLater=Service not available for 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>.
-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 nb of record per page
-NotAuthorized=You are not authorized to do that.
-SetDate=Set date
-SelectDate=Select a date
-SeeAlso=See also %s
-SeeHere=See here
-Apply=Apply
-BackgroundColorByDefault=Default background color
-FileRenamed=The file was successfully renamed
-FileUploaded=The file was successfully uploaded
-FileGenerated=The file was successfully generated
-FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
-NbOfEntries=Nb of entries
-GoToWikiHelpPage=Read online help (Internet access needed)
-GoToHelpPage=Read help
-RecordSaved=Record saved
-RecordDeleted=Record deleted
-LevelOfFeature=Level of features
-NotDefined=Not defined
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
-Administrator=Administrator
-Undefined=Undefined
-PasswordForgotten=Password forgotten?
-SeeAbove=See above
-HomeArea=Home area
-LastConnexion=Latest connection
-PreviousConnexion=Previous connection
-PreviousValue=Previous value
-ConnectedOnMultiCompany=Connected on environment
-ConnectedSince=Connected since
-AuthenticationMode=Authentication mode
-RequestedUrl=Requested URL
-DatabaseTypeManager=Database type manager
-RequestLastAccessInError=Latest database access request error
-ReturnCodeLastAccessInError=Return code for latest database access request error
-InformationLastAccessInError=Information for latest database access request error
-DolibarrHasDetectedError=Dolibarr has detected a technical error
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes
-MoreInformation=More information
-TechnicalInformation=Technical information
-TechnicalID=Technical ID
-NotePublic=Note (public)
-NotePrivate=Note (private)
-PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
-DoTest=Test
-ToFilter=Filter
-NoFilter=No filter
-WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance delay.
-yes=yes
-Yes=Yes
-no=no
-No=No
-All=All
-Home=Home
-Help=Help
-OnlineHelp=Online help
-PageWiki=Wiki page
-MediaBrowser=Media browser
-Always=Always
-Never=Never
-Under=under
-Period=Period
-PeriodEndDate=End date for period
-Activate=Activate
-Activated=Activated
-Closed=Closed
-Closed2=Closed
-NotClosed=Not closed
-Enabled=Enabled
-Deprecated=Deprecated
-Disable=Disable
-Disabled=Disabled
-Add=Add
-AddLink=Add link
-RemoveLink=Remove link
-AddToDraft=Add to draft
-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>?
-Delete=Delete
-Remove=Remove
-Resiliate=Terminate
-Cancel=Cancel
-Modify=Modify
-Edit=Edit
-Validate=Validate
-ValidateAndApprove=Validate and Approve
-ToValidate=To validate
-Save=Save
-SaveAs=Save As
-TestConnection=Test connection
-ToClone=Clone
-ConfirmClone=Choose data you want to clone :
-NoCloneOptionsSpecified=No data to clone defined.
-Of=of
-Go=Go
-Run=Run
-CopyOf=Copy of
-Show=Show
-Hide=Hide
-ShowCardHere=Show card
-Search=Search
-SearchOf=Search
-Valid=Valid
-Approve=Approve
-Disapprove=Disapprove
-ReOpen=Re-Open
-Upload=Send file
-ToLink=Link
-Select=Select
-Choose=Choose
-Resize=Resize
-Recenter=Recenter
-Author=Author
-User=User
-Users=Users
-Group=Group
-Groups=Groups
-NoUserGroupDefined=No user group defined
-Password=Password
-PasswordRetype=Retype your password
-NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
-Name=Name
-Person=Person
-Parameter=Parameter
-Parameters=Parameters
-Value=Value
-PersonalValue=Personal value
-NewValue=New value
-CurrentValue=Current value
-Code=Code
-Type=Type
-Language=Language
-MultiLanguage=Multi-language
-Note=Note
-Title=Title
-Label=Label
-RefOrLabel=Ref. or label
-Info=Log
-Family=Family
-Description=Description
-Designation=Description
-Model=Doc template
-DefaultModel=Default doc template
-Action=Event
-About=About
-Number=Number
-NumberByMonth=Number by month
-AmountByMonth=Amount by month
-Numero=Number
-Limit=Limit
-Limits=Limits
-Logout=Logout
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Connection
-Setup=Setup
-Alert=Alert
-Previous=Previous
-Next=Next
-Cards=Cards
-Card=Card
-Now=Now
-HourStart=Start hour
-Date=Date
-DateAndHour=Date and hour
-DateToday=Today's date
-DateReference=Reference date
-DateStart=Start date
-DateEnd=End date
-DateCreation=Creation date
-DateCreationShort=Creat. date
-DateModification=Modification date
-DateModificationShort=Modif. date
-DateLastModification=Latest modification date
-DateValidation=Validation date
-DateClosing=Closing date
-DateDue=Due date
-DateValue=Value date
-DateValueShort=Value date
-DateOperation=Operation date
-DateOperationShort=Oper. Date
-DateLimit=Limit date
-DateRequest=Request date
-DateProcess=Process date
-DateBuild=Report build date
-DatePayment=Date of payment
-DateApprove=Approving date
-DateApprove2=Approving date (second approval)
-UserCreation=Creation user
-UserModification=Modification user
-UserCreationShort=Creat. user
-UserModificationShort=Modif. user
-DurationYear=year
-DurationMonth=month
-DurationWeek=week
-DurationDay=day
-DurationYears=years
-DurationMonths=months
-DurationWeeks=weeks
-DurationDays=days
-Year=Year
-Month=Month
-Week=Week
-WeekShort=Week
-Day=Day
-Hour=Hour
-Minute=Minute
-Second=Second
-Years=Years
-Months=Months
-Days=Days
-days=days
-Hours=Hours
-Minutes=Minutes
-Seconds=Seconds
-Weeks=Weeks
-Today=Today
-Yesterday=Yesterday
-Tomorrow=Tomorrow
-Morning=Morning
-Afternoon=Afternoon
-Quadri=Quadri
-MonthOfDay=Month of the day
-HourShort=H
-MinuteShort=mn
-Rate=Rate
-CurrencyRate=Currency conversion rate
-UseLocalTax=Include tax
-Bytes=Bytes
-KiloBytes=Kilobytes
-MegaBytes=Megabytes
-GigaBytes=Gigabytes
-TeraBytes=Terabytes
-b=b.
-Kb=Kb
-Mb=Mb
-Gb=Gb
-Tb=Tb
-Cut=Cut
-Copy=Copy
-Paste=Paste
-Default=Default
-DefaultValue=Default value
-Price=Price
-UnitPrice=Unit price
-UnitPriceHT=Unit price (net)
-UnitPriceTTC=Unit price
-PriceU=U.P.
-PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (currency)
-PriceUTTC=U.P. (inc. tax)
-Amount=Amount
-AmountInvoice=Invoice amount
-AmountPayment=Payment amount
-AmountHTShort=Amount (net)
-AmountTTCShort=Amount (inc. tax)
-AmountHT=Amount (net of tax)
-AmountTTC=Amount (inc. tax)
-AmountVAT=Amount tax
-MulticurrencyAlreadyPaid=Already payed, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
-MulticurrencyAmountHT=Amount (net of tax), original currency
-MulticurrencyAmountTTC=Amount (inc. of tax), original currency
-MulticurrencyAmountVAT=Amount tax, original currency
-AmountLT1=Amount tax 2
-AmountLT2=Amount tax 3
-AmountLT1ES=Amount RE
-AmountLT2ES=Amount IRPF
-AmountTotal=Total amount
-AmountAverage=Average amount
-PriceQtyMinHT=Price quantity min. (net of tax)
-Percentage=Percentage
-Total=Total
-SubTotal=Subtotal
-TotalHTShort=Total (net)
-TotalHTShortCurrency=Total (net in currency)
-TotalTTCShort=Total (inc. tax)
-TotalHT=Total (net of tax)
-TotalHTforthispage=Total (net of tax) for this page
-Totalforthispage=Total for this page
-TotalTTC=Total (inc. tax)
-TotalTTCToYourCredit=Total (inc. tax) to your credit
-TotalVAT=Total tax
-TotalLT1=Total tax 2
-TotalLT2=Total tax 3
-TotalLT1ES=Total RE
-TotalLT2ES=Total IRPF
-HT=Net of tax
-TTC=Inc. tax
-VAT=Sales tax
-VATs=Sales taxes
-LT1ES=RE
-LT2ES=IRPF
-VATRate=Tax Rate
-Average=Average
-Sum=Sum
-Delta=Delta
-Module=Module
-Option=Option
-List=List
-FullList=Full list
-Statistics=Statistics
-OtherStatistics=Other statistics
-Status=Status
-Favorite=Favorite
-ShortInfo=Info.
-Ref=Ref.
-ExternalRef=Ref. extern
-RefSupplier=Ref. supplier
-RefPayment=Ref. payment
-CommercialProposalsShort=Commercial proposals
-Comment=Comment
-Comments=Comments
-ActionsToDo=Events to do
-ActionsToDoShort=To do
-ActionsDoneShort=Done
-ActionNotApplicable=Not applicable
-ActionRunningNotStarted=To start
-ActionRunningShort=In progress
-ActionDoneShort=Finished
-ActionUncomplete=Uncomplete
-CompanyFoundation=Company/Foundation
-ContactsForCompany=Contacts 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
-NActionsLate=%s late
-RequestAlreadyDone=Request already recorded
-Filter=Filter
-FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
-RemoveFilter=Remove filter
-ChartGenerated=Chart generated
-ChartNotGenerated=Chart not generated
-GeneratedOn=Build on %s
-Generate=Generate
-Duration=Duration
-TotalDuration=Total duration
-Summary=Summary
-DolibarrStateBoard=Statistics
-DolibarrWorkBoard=Work tasks board
-Available=Available
-NotYetAvailable=Not yet available
-NotAvailable=Not available
-Categories=Tags/categories
-Category=Tag/category
-By=By
-From=From
-to=to
-and=and
-or=or
-Other=Other
-Others=Others
-OtherInformations=Other informations
-Quantity=Quantity
-Qty=Qty
-ChangedBy=Changed by
-ApprovedBy=Approved by
-ApprovedBy2=Approved by (second approval)
-Approved=Approved
-Refused=Refused
-ReCalculate=Recalculate
-ResultKo=Failure
-Reporting=Reporting
-Reportings=Reporting
-Draft=Draft
-Drafts=Drafts
-Validated=Validated
-Opened=Opened
-New=New
-Discount=Discount
-Unknown=Unknown
-General=General
-Size=Size
-Received=Received
-Paid=Paid
-Topic=Subject
-ByCompanies=By third parties
-ByUsers=By users
-Links=Links
-Link=Link
-Rejects=Rejects
-Preview=Preview
-NextStep=Next step
-Datas=Data
-None=None
-NoneF=None
-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.
-Photo=Picture
-Photos=Pictures
-AddPhoto=Add picture
-DeletePicture=Picture delete
-ConfirmDeletePicture=Confirm picture deletion?
-Login=Login
-CurrentLogin=Current login
-EnterLoginDetail=Enter login details
-January=January
-February=February
-March=March
-April=April
-May=May
-June=June
-July=July
-August=August
-September=September
-October=October
-November=November
-December=December
-JanuaryMin=Jan
-FebruaryMin=Feb
-MarchMin=Mar
-AprilMin=Apr
-MayMin=May
-JuneMin=Jun
-JulyMin=Jul
-AugustMin=Aug
-SeptemberMin=Sep
-OctoberMin=Oct
-NovemberMin=Nov
-DecemberMin=Dec
-Month01=January
-Month02=February
-Month03=March
-Month04=April
-Month05=May
-Month06=June
-Month07=July
-Month08=August
-Month09=September
-Month10=October
-Month11=November
-Month12=December
-MonthShort01=Jan
-MonthShort02=Feb
-MonthShort03=Mar
-MonthShort04=Apr
-MonthShort05=May
-MonthShort06=Jun
-MonthShort07=Jul
-MonthShort08=Aug
-MonthShort09=Sep
-MonthShort10=Oct
-MonthShort11=Nov
-MonthShort12=Dec
-AttachedFiles=Attached files and documents
-FileTransferComplete=File was uploaded successfuly
-DateFormatYYYYMM=YYYY-MM
-DateFormatYYYYMMDD=YYYY-MM-DD
-DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
-ReportName=Report name
-ReportPeriod=Report period
-ReportDescription=Description
-Report=Report
-Keyword=Keyword
-Origin=Origin
-Legend=Legend
-Fill=Fill
-Reset=Reset
-File=File
-Files=Files
-NotAllowed=Not allowed
-ReadPermissionNotAllowed=Read permission not allowed
-AmountInCurrency=Amount in %s currency
-Example=Example
-Examples=Examples
-NoExample=No example
-FindBug=Report a bug
-NbOfThirdParties=Number of third parties
-NbOfLines=Number of lines
-NbOfObjects=Number of objects
-NbOfObjectReferers=Number of related items
-Referers=Related items
-TotalQuantity=Total quantity
-DateFromTo=From %s to %s
-DateFrom=From %s
-DateUntil=Until %s
-Check=Check
-Uncheck=Uncheck
-Internal=Internal
-External=External
-Internals=Internal
-Externals=External
-Warning=Warning
-Warnings=Warnings
-BuildDoc=Build Doc
-Entity=Environment
-Entities=Entities
-CustomerPreview=Customer preview
-SupplierPreview=Supplier preview
-ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show supplier preview
-RefCustomer=Ref. customer
-Currency=Currency
-InfoAdmin=Information for administrators
-Undo=Undo
-Redo=Redo
-ExpandAll=Expand all
-UndoExpandAll=Undo expand
-Reason=Reason
-FeatureNotYetSupported=Feature not yet supported
-CloseWindow=Close window
-Response=Response
-Priority=Priority
-SendByMail=Send by EMail
-MailSentBy=Email sent by
-TextUsedInTheMessageBody=Email body
-SendAcknowledgementByMail=Send confirmation email
-EMail=E-mail
-NoEMail=No email
-Email=Email
-NoMobilePhone=No mobile phone
-Owner=Owner
-FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
-Refresh=Refresh
-BackToList=Back to list
-GoBack=Go back
-CanBeModifiedIfOk=Can be modified if valid
-CanBeModifiedIfKo=Can be modified if not valid
-ValueIsValid=Value is valid
-ValueIsNotValid=Value is not valid
-RecordCreatedSuccessfully=Record created successfully
-RecordModifiedSuccessfully=Record modified successfully
-RecordsModified=%s record modified
-RecordsDeleted=%s record deleted
-AutomaticCode=Automatic code
-FeatureDisabled=Feature disabled
-MoveBox=Move widget
-Offered=Offered
-NotEnoughPermissions=You don't have permission for this action
-SessionName=Session name
-Method=Method
-Receive=Receive
-CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
-ExpectedValue=Expected Value
-CurrentValue=Current value
-PartialWoman=Partial
-TotalWoman=Total
-NeverReceived=Never received
-Canceled=Canceled
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
-Color=Color
-Documents=Linked files
-Documents2=Documents
-UploadDisabled=Upload disabled
-MenuECM=Documents
-MenuAWStats=AWStats
-MenuMembers=Members
-MenuAgendaGoogle=Google agenda
-ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=No documents saved in this directory
-CurrentUserLanguage=Current language
-CurrentTheme=Current theme
-CurrentMenuManager=Current menu manager
-Browser=Browser
-Layout=Layout
-Screen=Screen
-DisabledModules=Disabled modules
-For=For
-ForCustomer=For customer
-Signature=Signature
-DateOfSignature=Date of signature
-HidePassword=Show command with password hidden
-UnHidePassword=Show real command with clear password
-Root=Root
-Informations=Informations
-Page=Page
-Notes=Notes
-AddNewLine=Add new line
-AddFile=Add file
-FreeZone=Free entry
-FreeLineOfType=Free entry of type
-CloneMainAttributes=Clone object with its main attributes
-PDFMerge=PDF Merge
-Merge=Merge
-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 application at the moment.
-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
-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.
-AccordingToGeoIPDatabase=(according to GeoIP convertion)
-Line=Line
-NotSupported=Not supported
-RequiredField=Required field
-Result=Result
-ToTest=Test
-ValidateBefore=Card must be validated before using this feature
-Visibility=Visibility
-Private=Private
-Hidden=Hidden
-Resources=Resources
-Source=Source
-Prefix=Prefix
-Before=Before
-After=After
-IPAddress=IP address
-Frequency=Frequency
-IM=Instant messaging
-NewAttribute=New attribute
-AttributeCode=Attribute code
-URLPhoto=URL of photo/logo
-SetLinkToAnotherThirdParty=Link to another third party
-LinkTo=Link to
-LinkToProposal=Link to proposal
-LinkToOrder=Link to order
-LinkToInvoice=Link to invoice
-LinkToSupplierOrder=Link to supplier order
-LinkToSupplierProposal=Link to supplier proposal
-LinkToSupplierInvoice=Link to supplier invoice
-LinkToContract=Link to contract
-LinkToIntervention=Link to intervention
-CreateDraft=Create draft
-SetToDraft=Back to draft
-ClickToEdit=Click to edit
-ObjectDeleted=Object %s deleted
-ByCountry=By country
-ByTown=By town
-ByDate=By date
-ByMonthYear=By month/year
-ByYear=By year
-ByMonth=By month
-ByDay=By day
-BySalesRepresentative=By sales representative
-LinkedToSpecificUsers=Linked to a particular user contact
-NoResults=No results
-AdminTools=Admin tools
-SystemTools=System tools
-ModulesSystemTools=Modules tools
-Test=Test
-Element=Element
-NoPhotoYet=No pictures available yet
-Dashboard=Dashboard
-MyDashboard=My dashboard
-Deductible=Deductible
-from=from
-toward=toward
-Access=Access
-SelectAction=Select action
-HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
-SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
-OriginFileName=Original filename
-SetDemandReason=Set source
-SetBankAccount=Define Bank Account
-AccountCurrency=Account Currency
-ViewPrivateNote=View notes
-XMoreLines=%s line(s) hidden
-PublicUrl=Public URL
-AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
-PrintFile=Print File %s
-ShowTransaction=Show entry on bank account
-GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
-Deny=Deny
-Denied=Denied
-ListOfTemplates=List of templates
-Gender=Gender
-Genderman=Man
-Genderwoman=Woman
-ViewList=List view
-Mandatory=Mandatory
-Hello=Hello
-Sincerely=Sincerely
-DeleteLine=Delete line
-ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
-NoRecordSelected=No record selected
-MassFilesArea=Area for files built by mass actions
-ShowTempMassFilesArea=Show area of files built by mass actions
-RelatedObjects=Related Objects
-ClassifyBilled=Classify billed
-Progress=Progress
-ClickHere=Click here
-FrontOffice=Front office
-BackOffice=Back office
-View=View
-Export=Export
-Exports=Exports
-ExportFilteredList=Export filtered list
-ExportList=Export list
-Miscellaneous=Miscellaneous
-Calendar=Calendar
-GroupBy=Group by...
-ViewFlatList=View flat list
-RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Direct download link
-Download=Download
-ActualizeCurrency=Update currency rate
-Fiscalyear=Fiscal year
-# Week day
-Monday=Monday
-Tuesday=Tuesday
-Wednesday=Wednesday
-Thursday=Thursday
-Friday=Friday
-Saturday=Saturday
-Sunday=Sunday
-MondayMin=Mo
-TuesdayMin=Tu
-WednesdayMin=We
-ThursdayMin=Th
-FridayMin=Fr
-SaturdayMin=Sa
-SundayMin=Su
-Day1=Monday
-Day2=Tuesday
-Day3=Wednesday
-Day4=Thursday
-Day5=Friday
-Day6=Saturday
-Day0=Sunday
-ShortMonday=M
-ShortTuesday=T
-ShortWednesday=W
-ShortThursday=T
-ShortFriday=F
-ShortSaturday=S
-ShortSunday=S
-SelectMailModel=Select email template
-SetRef=Set ref
-Select2ResultFoundUseArrows=Some results found. Use arrows to select.
-Select2NotFound=No result found
-Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
-Select2LoadingMoreResults=Loading more results...
-Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
-SearchIntoContacts=Contacts
-SearchIntoMembers=Members
-SearchIntoUsers=Users
-SearchIntoProductsOrServices=Products or services
-SearchIntoProjects=Projects
-SearchIntoTasks=Tasks
-SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
-SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
-SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
-SearchIntoInterventions=Interventions
-SearchIntoContracts=Contracts
-SearchIntoCustomerShipments=Customer shipments
-SearchIntoExpenseReports=Expense reports
-SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/es_VE/accountancy.lang b/htdocs/langs/es_VE/accountancy.lang
deleted file mode 100644
index 527f1fd139d..00000000000
--- a/htdocs/langs/es_VE/accountancy.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-AccountingCategory=Accounting category
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
diff --git a/htdocs/langs/es_VE/admin.lang b/htdocs/langs/es_VE/admin.lang
index 7114cc23a9b..6079989953b 100644
--- a/htdocs/langs/es_VE/admin.lang
+++ b/htdocs/langs/es_VE/admin.lang
@@ -1,1665 +1,15 @@
 # Dolibarr language file - Source file is en_US - admin
-Foundation=Fundación
-Version=Versión
-VersionProgram=Versión programa
-VersionLastInstall=Initial install version
-VersionLastUpgrade=Latest version upgrade
-VersionExperimental=Experimental
-VersionDevelopment=Desarrollo
-VersionUnknown=Desconocida
-VersionRecommanded=Recomendada
-FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. Value of some setup constants may also be checked. You can use this tool to detect if some files were modified by a hacker for example.
-FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
-GlobalChecksum=Global checksum
-MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
-LocalSignature=Embedded local signature (less reliable)
-RemoteSignature=Remote distant signature (more reliable)
-FilesMissing=Archivos no encontrados
-FilesUpdated=Archivos actualizados
-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
-XmlNotFound=Xml Integrity File of application not found
-SessionId=ID sesión
-SessionSaveHandler=Modalidad de salvaguardado de sesiones
-SessionSavePath=Localización salvaguardado de sesiones
-PurgeSessions=Purga de sesiones
-ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
-NoSessionListWithThisHandler=El gestor de período de sesiones configurado en su PHP no enumera las sesiones en curso
-LockNewSessions=Bloquear nuevas conexiones
-ConfirmLockNewSessions=¿Está seguro de querer restringir el acceso a Dolibarr a su usuario? Solamente el login <b>%s</b> podrá conectarse si confirma.
-UnlockNewSessions=Eliminar bloqueo de conexiones
-YourSession=Su sesión
-Sessions=Sesiones de usuarios
-WebUserGroup=Servidor web usuario/grupo
-NoSessionFound=Parece que su PHP no puede listar las sesiones activas. El directorio utilizado para el guardado de sesiones (<b>%s</b>) puede estar protegido (por ejemplo, por los permisos del sistema operativo o por la directiva open_basedir de su PHP).
-DBStoringCharset=Codificación de la base de datos para el almacenamiento de datos
-DBSortingCharset=Codificación de la base de datos para clasificar los datos
-WarningModuleNotActive=El módulo <b>%s</b> debe ser activado
-WarningOnlyPermissionOfActivatedModules=Atención, solamente los permisos relacionados con los módulos activados se indican aquí. Puede activar los otros módulos en la página Configuración->Módulos
-DolibarrSetup=Instalación/Actualización de Dolibarr
-InternalUser=Usuario interno
-ExternalUser=Usuario externo
-InternalUsers=Usuarios internos
-ExternalUsers=Usuarios externos
-GUISetup=Display
-SetupArea=Área configuración
-FormToTestFileUploadForm=Formulario de prueba de subida de archivo (según opciones elegidas)
-IfModuleEnabled=Nota: sólo es eficaz si el módulo <b>%s</b> está activado
-RemoveLock=Elimine el archivo <b>%s</b>, si existe, para permitir la utilidad de actualización.
-RestoreLock=Sustituir un archivo <b>%s</b>, dándole sólo derechos de lectura a este archivo con el fin de prohibir nuevas actualizaciones.
-SecuritySetup=Configuración de la seguridad
-SecurityFilesDesc=Define here options related to security about uploading files.
-ErrorModuleRequirePHPVersion=Error, este módulo requiere una versión %s o superior de PHP
-ErrorModuleRequireDolibarrVersion=Error, este módulo requiere una versión %s o superior de Dolibarr
-ErrorDecimalLargerThanAreForbidden=Error, las precisiones superiores a <b>%s</b> no están soportadas.
-DictionarySetup=Diccionarios
-Dictionary=Diccionarios
-ErrorReservedTypeSystemSystemAuto=El uso del tipo 'system' y 'systemauto' está reservado. Puede utilizar 'user' como valor para añadir su propio registro
-ErrorCodeCantContainZero=El código no puede contener el valor 0
-DisableJavascript=Deshabilitar Javascript y funciones Ajax (Recomendado para personas ciegas o navegadores de texto)
-UseSearchToSelectCompanyTooltip=También si tiene un gran número de terceros (> 100 000), puede aumentar la velocidad mediante el establecimiento COMPANY_DONOTSEARCH_ANYWHERE constante a 1 en Configuración-> Otros. La búsqueda será limitada a la creación de cadena.
-UseSearchToSelectContactTooltip=También si usted tiene un gran número de terceros (> 100 000), puede aumentar la velocidad mediante el establecimiento CONTACT_DONOTSEARCH_ANYWHERE constante a 1 en Configuración-> Otros. La búsqueda será limitada a la creación de cadena.
-DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties, but it is less convenient)
-DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact, but it is less convenient)
-NumberOfKeyToSearch=Nº de caracteres para desencadenar la búsqueda: %s
-NotAvailableWhenAjaxDisabled=No disponible cuando Ajax esté desactivado
-AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
-JavascriptDisabled=Javascript desactivado
-UsePreviewTabs=Ver fichas "vista previa"
-ShowPreview=Ver vista previa
-PreviewNotAvailable=Vista previa no disponible
-ThemeCurrentlyActive=Tema actualmente activo
-CurrentTimeZone=Zona horaria PHP (Servidor)
-MySQLTimeZone=Zona horaria MySql (base de datos)
-TZHasNoEffect=Las fechas se guardan y devuelven por el servidor de base de datos tal y como si se las hubieran enviado como una cadena. La zona horaria solamente tiene efecto si se usa la función UNIX_TIMESTAMP (que no debe ser usada por dolibarr, por lo que la zona horaria de la base de datos no debe tener efecto, aunque se haya cambiado después de introducir los datos).
-Space=Área
-Table=Tabla
-Fields=Campos
-Index=Índice
-Mask=Máscara
-NextValue=Próximo valor
-NextValueForInvoices=Próximo valor (facturas)
-NextValueForCreditNotes=Próximo valor (abonos)
-NextValueForDeposit=Próximo valor (anticipos)
-NextValueForReplacements=Próximo valor (rectificativas)
-MustBeLowerThanPHPLimit=Observación: Su PHP limita el tamaño a <b>%s</b> %s de máximo, cualquiera que sea el valor de este parámetro
-NoMaxSizeByPHPLimit=Ninguna limitación interna en su servidor PHP
-MaxSizeForUploadedFiles=Tamaño máximo de los documentos a subir (0 para prohibir la subida)
-UseCaptchaCode=Utilización de código gráfico (CAPTCHA) en la página de inicio de sesión
-AntiVirusCommand= Ruta completa hacia el comando del antivirus
-AntiVirusCommandExample= Ejemplo para ClamWin: c:\\Program Files (x86)\\ClamWin\\bin\\clamscan.exe<br>Ejemplo para ClamAv: /usr/bin/clamscan
-AntiVirusParam= Parámetros complementarios en la línea de comandos
-AntiVirusParamExample= Ejemplo para ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
-ComptaSetup=Configuración del módulo Contabilidad
-UserSetup=Configuración gestión de los usuarios
-MultiCurrencySetup=Multi-currency setup
-MenuLimits=Límites y precisión
-MenuIdParent=Id del menú padre
-DetailMenuIdParent=ID del menú padre (vacío para un menú superior)
-DetailPosition=Número de orden para la posición del menú
-AllMenus=Todos
-NotConfigured=No configurado
-Active=Activo
-SetupShort=Config.
-OtherOptions=Otras opciones
-OtherSetup=Varios
-CurrentValueSeparatorDecimal=Separador decimal
-CurrentValueSeparatorThousand=Separador miles
-Destination=destino
-IdModule=identificador de modulo
-IdPermissions=Identificador de permisos
-Modules=Módulos
-LanguageBrowserParameter=Variable %s
-LocalisationDolibarrParameters=Parámetros de localización
-ClientTZ=Zona horaria cliente (usuario)
-ClientHour=Hora cliente (usuario)
-OSTZ=Zona horaria Servidor
-PHPTZ=Zona horaria Servidor PHP
-DaylingSavingTime=Horario de verano (usuario)
-CurrentHour=Hora PHP (servidor)
-CurrentSessionTimeOut=Timeout sesión actual
-YouCanEditPHPTZ=Para definir una zona horaria PHP diferente (no es necesario), pruebe a añadir un archivo .htacces con una línea como esta "SetEnvTZ Europe/Paris"
-Box=Widget
-Boxes=Widgets
-MaxNbOfLinesForBoxes=Max number of lines for widgets
-PositionByDefault=Posición por defecto
-Position=Posición
-MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
-MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br />Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
-MenuForUsers=Menú para los usuarios
-LangFile=archivo .lang
-System=Sistema
-SystemInfo=Info. sistema
-SystemToolsArea=Área utilidades del sistema
-SystemToolsAreaDesc=Esta área ofrece distintas funciones de administración. Utilice la menú para elegir la funcionalidad buscada.
-Purge=Purga
-PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
-PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
-PurgeDeleteTemporaryFilesShort=Delete temporary files
-PurgeDeleteAllFilesInDocumentsDir=Eliminar todos los archivos del directorio <b>%s</b>. Archivos temporales y archivos adjuntados a elementos (terceros, facturas, etc.) serán eliminados.
-PurgeRunNow=Purgar
-PurgeNothingToDelete=No directory or files to delete.
-PurgeNDirectoriesDeleted=<b>%s</b> archivos o directorios eliminados
-PurgeAuditEvents=Purgar los eventos de seguridad
-ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
-GenerateBackup=Generar copia de seguridad
-Backup=Copia de seguridad
-Restore=Restauración
-RunCommandSummary=La copia será realizada por el comando siguiente
-BackupResult=Resultado de la copia
-BackupFileSuccessfullyCreated=Archivo de copia generado correctamente
-YouCanDownloadBackupFile=Los archivos generados pueden ahora descargarse
-NoBackupFileAvailable=Ninguna copia disponible
-ExportMethod=Método de exportación
-ImportMethod=Método de importación
-ToBuildBackupFileClickHere=Para crear una copia, haga click <a href="%s">aquí</a>.
-ImportMySqlDesc=Para importar una copia, hay que utilizar el comando mysql en linea siguiente:
-ImportPostgreSqlDesc=Para importar una copia de seguridad, debe usar el comando pg_restore desde la línea de comandos:
-ImportMySqlCommand=%s %s < miarchivobackup.sql
-ImportPostgreSqlCommand=%s %s miarchivobackup.sql
-FileNameToGenerate=Nombre del archivo a generar
-Compression=Compresión
-CommandsToDisableForeignKeysForImport=Comando para desactivar las claves excluyentes a la importación
-CommandsToDisableForeignKeysForImportWarning=Obligatorio si quiere poder restaurar más tarde el dump SQL
-ExportCompatibility=Compatibilidad del archivo de exportación generado
-MySqlExportParameters=Parámetros de la exportación MySql
-PostgreSqlExportParameters= Parámetros de la exportación PostgreSQL
-UseTransactionnalMode=Utilizar el modo transaccional
-FullPathToMysqldumpCommand=Ruta completa del comando mysqldump
-FullPathToPostgreSQLdumpCommand=ruta completa hacia el comando pg_dump
-ExportOptions=Opciones de exportación
-AddDropDatabase=Añadir órdenes DROP DATABASE
-AddDropTable=Añadir órdenes DROP TABLE
-ExportStructure=Estructura
-NameColumn=Nombre las columnas
-ExtendedInsert=Instrucciones INSERT extendidas
-NoLockBeforeInsert=Sin instrucción LOCK antes del INSERT
-DelayedInsert=Inserciones con retraso
-EncodeBinariesInHexa=Codificar los campos binarios en hexadecimal
-IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
-AutoDetectLang=Autodetección (navegador)
-FeatureDisabledInDemo=Opción deshabilitada en demo
-FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Permisos
-BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
-OnlyActiveElementsAreShown=Sólo los elementos de <a href="%s">módulos activados</a> son mostrados.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
-ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external modules...
-GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
-DoliStoreDesc=DoliStore, el sitio oficial de módulos complementarios y para Dolibarr ERP/CRM
-DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
-WebSiteDesc=Reference websites to find more modules...
-URL=Enlace
-BoxesAvailable=Widgets available
-BoxesActivated=Widgets activated
-ActivateOn=Activar en
-ActiveOn=Activo en
-SourceFile=Archivo origen
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponible solamente si Javascript y Ajax están activados
-Required=Requerido
-UsedOnlyWithTypeOption=Usado solamente por alguna opción de la agenda
-Security=Seguridad
-Passwords=Contraseñas
-DoNotStoreClearPassword=No almacenar la contraseña sin cifrar en la base
-MainDbPasswordFileConfEncrypted=Encriptar la contraseña de la base en el archivo conf.php
-InstrucToEncodePass=Para tener la contraseña codificada en el archivo <b>conf.php</b>, reemplace la línea <br><b>$dolibarr_main_db_pass = "...";</b><br>por<br> <b>$dolibarr_main_db_pass = "crypted:%s";</b>
-InstrucToClearPass=Para tener la contraseña decodificada (visible) en el archivo <b>conf.php</b>, reemplace la línea <br><b>$dolibarr_main_db_pass = "crypted:...";</b><br>por<br><b>$dolibarr_main_db_pass = "%s";</b>
-ProtectAndEncryptPdfFiles=Protección y encriptación de los pdf generados
-ProtectAndEncryptPdfFilesDesc=La protección de un documento pdf deja el documento libre a la lectura y a la impresión a cualquier lector de PDF. Por el contrario, la modificación y la copia resultan imposibles.
-Feature=Función
-DolibarrLicense=Licencia
-Developpers=Desarrolladores/contribuidores
-OfficialWebSite=Sitio web oficial internacional
-OfficialWebSiteLocal=Local web site (%s)
-OfficialWiki=Wiki documentación Dolibarr
-OfficialDemo=Demo en línea Dolibarr
-OfficialMarketPlace=Sitio oficial de módulos complementarios y extensiones
-OfficialWebHostingService=Servicios de hosting web (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
-OtherResources=Otros recursos
-ForDocumentationSeeWiki=Para la documentación de usuario, desarrollador o Preguntas Frecuentes (FAQ), consulte el wiki Dolibarr: <br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=Para otras cuestiones o realizar sus propias consultas, puede utilizar el foro Dolibarr: <br><b><a href="%s" target="_blank">%s</a></b>
-HelpCenterDesc1=Esta aplicación, independiente de Dolibarr, le permite ayudarle a obtener un servicio de soporte de Dolibarr.
-HelpCenterDesc2=Algunos de estos servicios sólo están disponibles en <b>inglés</b>.
-CurrentMenuHandler=Gestor de menú
-MeasuringUnit=Unidad de medida
-LeftMargin=Left margin
-TopMargin=Top margin
-PaperSize=Paper type
-Orientation=Orientation
-SpaceX=Space X
-SpaceY=Space Y
-FontSize=Font size
-Content=Content
-NoticePeriod=Plazo de aviso
-NewByMonth=New by month
-Emails=E-Mails
-EMailsSetup=Configuración E-Mails
-EMailsDesc=Esta página permite sustituir los parámetros PHP relacionados con el envío de correos electrónicos. En la mayoría de los casos en SO como UNIX/Linux, los parámetros PHP son ya correctos y esta página es inútil.
-MAIN_MAIL_SMTP_PORT=Puerto del servidor SMTP (Por defecto en php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_SERVER=Nombre host o ip del servidor SMTP (Por defecto en php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Puerto del servidor SMTP (No definido en PHP en sistemas de tipo Unix)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Nombre servidor o ip del servidor SMTP (No definido en PHP en sistemas de tipo Unix)
-MAIN_MAIL_EMAIL_FROM=E-Mail del emisor para envíos E-Mail automáticos (Por defecto en php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=E-Mail usado para los retornos de error de los e-mails enviados
-MAIN_MAIL_AUTOCOPY_TO= Enviar automáticamente copia oculta de los e-mails enviados a
-MAIN_DISABLE_ALL_MAILS=Desactivar globalmente todo envío de correos electrónicos (para modo de pruebas o demo)
-MAIN_MAIL_SENDMODE=Método de envío de e-mails
-MAIN_MAIL_SMTPS_ID=ID de autentificación SMTP  si se requiere autenticación SMTP
-MAIN_MAIL_SMTPS_PW=Contraseña autentificación SMTP si se requiere autentificación SMTP
-MAIN_MAIL_EMAIL_TLS= Uso de encriptación TLS (SSL)
-MAIN_MAIL_EMAIL_STARTTLS= Use TLS (STARTTLS) encrypt
-MAIN_DISABLE_ALL_SMS=Desactivar globalmente todo envío de SMS (para modo de pruebas o demo)
-MAIN_SMS_SENDMODE=Método de envío de SMS
-MAIN_MAIL_SMS_FROM=Número de teléfono por defecto para los envíos SMS
-MAIN_MAIL_DEFAULT_FROMTYPE=Sender e-mail by default for manual sendings (User email or Company email)
-UserEmail=User email
-CompanyEmail=Company email
-FeatureNotAvailableOnLinux=Funcionalidad no disponible en sistemas  Unix. Pruebe su sendmail localmente.
-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/
-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=Configuración del módulo
-ModulesSetup=Configuración de los módulos
-ModuleFamilyBase=Sistema
 ModuleFamilyCrm=Gestión cliente (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
-ModuleFamilyProducts=Products Management (PM)
-ModuleFamilyHr=Human Resource Management (HR)
-ModuleFamilyProjects=Proyectos/Trabajo cooperativo
-ModuleFamilyOther=Otro
-ModuleFamilyTechnic=Módulos herramientas o Sistema
-ModuleFamilyExperimental=Módulos experimentales
-ModuleFamilyFinancial=Módulos financieros (Contabilidad/tesorería)
-ModuleFamilyECM=Gestión Electrónica de Documentos (GED)
-ModuleFamilyPortal=Web sites and other frontal application
-ModuleFamilyInterface=Interfaces with external systems
-MenuHandlers=Gestores menú
-MenuAdmin=Editor menú
-DoNotUseInProduction=No usar en producción
-ThisIsProcessToFollow=This is steps to process:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
-StepNb=Paso %s
-FindPackageFromWebSite=Buscar el paquete que responde a su necesidad (por ejemplo en el sitio web %s)
-DownloadPackageFromWebSite=Descargue el paquete (por ejemplo desde el sitio web oficial %s).
-UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <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>.
-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='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
-YouCanSubmitFile=Para este paso, puede enviar el paquete usando esta herramienta: Seleccionar el archivo del módulo
-CurrentVersion=Versión actual de Dolibarr
-CallUpdatePage=Go to the page that updates the database structure and data: %s.
-LastStableVersion=Latest stable version
-LastActivationDate=Latest activation date
-UpdateServerOffline=Actualizar servidor offline
-GenericMaskCodes=Puede introducir cualquier máscara numérica. En esta máscara, puede utilizar las siguientes etiquetas:<br><b>{000000} </b> corresponde a un número que se incrementa en cada uno de %s. Introduzca tantos ceros como longitud desee mostrar. El contador se completará a partir de ceros por la izquierda con el fin de tener tantos ceros como la máscara. <br> <b> {000000+000}</ b> Igual que el anterior, con una compensación correspondiente al número a la derecha del signo + se aplica a partir del primer %s. <br> <b> {000000@x}</b> igual que el anterior, pero el contador se restablece a cero cuando se llega a x meses (x entre 1 y 12). Si esta opción se utiliza y x es de 2 o superior, entonces la secuencia {yy}{mm} o {yyyy}{mm} también es necesaria. <br> <b> {dd} </b> días (01 a 31). <br><b> {mm}</b> mes (01 a 12). <br><b>{yy}</b>, <b>{yyyy}</b> ou <b>{y}</b> año en 2, 4 ó 1 cifra.<br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
-GenericMaskCodes3=Cualquier otro carácter en la máscara se quedará sin cambios. <br>No se permiten espacios <br>
-GenericMaskCodes4a=<u>Ejemplo en la 99 ª %s del tercero La Empresa realizada el 31/03/2007: </u><br>
-GenericMaskCodes4b=<u>Ejemplo sobre un tercero creado el 31/03/2007:</u><br>
-GenericMaskCodes4c=<u>Ejemplo en un producto/servicio creado el 31/03/2007:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> dará <b>ABC0703-000099</b><br><b>{0000+100@1}-XXX/{dd}/YYY</b> daráa <b>0199-XXX/31/YYY</b>
-GenericNumRefModelDesc=Devuelve un número creado acorde a una máscara definida.
-ServerAvailableOnIPOrPort=Servidor disponible en la dirección <b>%s</b> en el puerto <b>%s</b>
-ServerNotAvailableOnIPOrPort=Servidor no disponible en la dirección <b>%s</b> en el puerto <b>%s</b>
-DoTestServerAvailability=Probar conectividad con el servidor
-DoTestSend=Probar envío
-DoTestSendHTML=Probar envío HTML
-ErrorCantUseRazIfNoYearInMask=Error: no puede utilizar la opción @ para reiniciar el contador cada año si la secuencia {yy} o {yyyy} no se encuentra en la máscara.
-ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, no se puede usar la opción @ si la secuencia {yy}{mm} o {yyyy}{mm} no se encuentra en la máscara.
-UMask=Parámetro UMask de nuevos archivos en Unix/Linux/BSD.
-UMaskExplanation=Este parámetro determina los derechos de los archivos creados en el servidor Dolibarr (durante la subida, por ejemplo).<br>Este debe ser el valor octal (por ejemplo, 0666 significa lectura / escritura para todos).<br>Este parámetro no tiene ningún efecto sobre un servidor Windows.
-SeeWikiForAllTeam=Vea el wiki para más detalles de todos los actores y de su organización
-UseACacheDelay= Demora en caché de la exportación en segundos (0 o vacio sin caché)
-DisableLinkToHelpCenter=Ocultar el enlace "¿Necesita soporte o ayuda?" en la página de login
-DisableLinkToHelp=Hide link to online help "<b>%s</b>"
-AddCRIfTooLong=No hay líneas de corte automático, de modo que si el texto es demasiado largo en los documentos, debe agregar sus propios retornos de carro en el texto mecanografiado.
-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...).
-MinLength=Longuitud mínima
-LanguageFilesCachedIntoShmopSharedMemory=archivos .lang en memoria compartida
-ExamplesWithCurrentSetup=Ejemplos con la configuración activa actual
-ListOfDirectories=Listado de directorios de plantillas OpenDocument
-ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
-NumberOfModelFilesFound=Número de archivos de plantillas ODT encontrados en este/estos directorio(s)
-ExampleOfDirectoriesForModelGen=Ejemplos de sintaxis:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
-FollowingSubstitutionKeysCanBeUsed=Colocando los siguientes tags en la plantilla, obtendrá una sustitución con el valor personalizado al generar el documento:
-FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Crear_un_modelo_de_documento_ODT
-FirstnameNamePosition=Orden visualización nombre/apellidos
-DescWeather=Los siguientes gráficos se mostrarán en el panel si el número de elementos llegan a estos valores:
-KeyForWebServicesAccess=Clave para usar los Web Services (parámetro "dolibarrkey" en webservices)
-TestSubmitForm=Formulario de pruebas
-ThisForceAlsoTheme=Usar este gestor de menús predetermina también el tema, sea cual sea la elección del usuario. Además, este gestor de menús, especial para smartphones, solamente funciona en algunos teléfonos. Use otro gestor si observa cualquier problema.
-ThemeDir=Directorio de los temas
-ConnectionTimeout=Timeout de conexión
-ResponseTimeout=Timeout de respuesta
-SmsTestMessage=Mensaje de prueba de __PHONEFROM__ para __PHONETO__
-ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
-SecurityToken=Clave para encriptar urls
-NoSmsEngine=No hay disponible ningún gestor de envío de SMS. Los gestores de envío de SMS no se instalan por defecto ya que dependen de cada proveedor, sin embargo puede encontrarlos en la plataforma %s.
-PDF=PDF
-PDFDesc=Puede definir aquí las opciones globales para la generación de los PDF
-PDFAddressForging=Reglas de visualización de direcciones
-HideAnyVATInformationOnPDF=Ocultar toda la información relacionada con el IVA en la generación de los PDF
-HideDescOnPDF=Ocultar descripción de los productos en la generación de los PDF
-HideRefOnPDF=Ocultar referencia de los productos en la generación de los PDF
-HideDetailsOnPDF=Hide product lines details on generated PDF
-PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
-Library=Librería
-UrlGenerationParameters=Seguridad de las URLs
-SecurityTokenIsUnique=¿Usar un parámetro securekey único para cada URL?
-EnterRefToBuildUrl=Introduzca la referencia del objeto %s
-GetSecuredUrl=Obtener la URL calculada
-ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
-OldVATRates=Tasa de IVA antigua
-NewVATRates=Tasa de IVA nueva
-PriceBaseTypeToChange=Cambiar el precio cuya referencia de base es
-MassConvert=Convertir masivamente
-String=Cadena de texto
-TextLong=Texto largo
-Int=Numérico entero
-Float=Decimal
-DateAndTime=Fecha y hora
-Unique=Único
-Boolean=Boleano (Casilla de verificación)
-ExtrafieldPhone = Teléfono
-ExtrafieldPrice = Precio
-ExtrafieldMail = Correo
-ExtrafieldUrl = Url
-ExtrafieldSelect = Lista de selección
-ExtrafieldSelectList = Lista desde una tabla
-ExtrafieldSeparator=Separador
-ExtrafieldPassword=Contraseña
-ExtrafieldCheckBox=Casilla de verificación
-ExtrafieldRadio=Botón de selección excluyente
-ExtrafieldCheckBoxFromList= Casilla de selección de tabla
-ExtrafieldLink=Objeto adjuntado
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=El listado de parámetros tiene que ser key,valor<br><br> por ejemplo:\n<br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=El listado de parámetros tiene que ser key,valor<br><br> por ejemplo:\n<br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
-LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Atención: Su archivo <b>conf.php</b> contiene la directiva <b>dolibarr_pdf_force_fpdf=1</b>. Esto hace que se use la librería FPDF para generar sus archivos PDF. Esta librería es antigua y no cubre algunas funcionalidades (Unicode, transparencia de imágenes, idiomas cirílicos, árabes o asiáticos, etc.), por lo que puede tener problemas en la generación de los PDF.<br>Para resolverlo, y disponer de un soporte completo de PDF, puede descargar la <a href="http://www.tcpdf.org/" target="_blank">librería TCPDF</a> , y a continuación comentar o eliminar la línea <b>$dolibarr_pdf_force_fpdf=1</b>, y añadir en su lugar <b>$dolibarr_lib_TCPDF_PATH='ruta_a_TCPDF'</b>
-LocalTaxDesc=Algunos países aplican 2 o 3 tasas a cada línea de factura. Si es el caso, escoja el tipo de la segunda y tercera tasa y su valor. Los posibles tipos son:<br>1 : tasa local aplicable a productos y servicios sin IVA (tasa local es calculada sobre la base imponible)<br>2 : tasa local se aplica a productos y servicios incluyendo el IVA (tasa local es calculada sobre base imponible+IVA)<br>3 : tasa local se aplica a productos sin IVA (tasa local es calculada sobre la base imponible)<br>4 : tasa local se aplica a productos incluyendo el IVA (tasa local es calculada sobre base imponible+IVA)<br>5 : tasa local se aplica a servicios sin IVA (tasa local es calculada sobre base imponible)<br>6 : tasa local se aplica a servicios incluyendo el IVA (tasa local es calculada sobre base imponible+IVA)
-SMS=SMS
-LinkToTestClickToDial=Introduzca un número de teléfono al que llamar para probar el enlace de llamada ClickToDial para el usuario <strong>%s</strong>
-RefreshPhoneLink=Refrescar enlace
-LinkToTest=Enlace seleccionable para el usuario  <strong>%s</strong> (haga clic en el número para probar)
-KeepEmptyToUseDefault=Deje este campo vacío para usar el valor por defecto
-DefaultLink=Enlace por defecto
-SetAsDefault=Set as default
-ValueOverwrittenByUserSetup=Atención: Este valor puede ser sobreescrito por un valor específico de la configuración del usuario (cada usuario puede tener su propia url clicktodial)
-ExternalModule=Módulo externo - Instalado en el directorio %s
-BarcodeInitForThirdparties=Inicio masivo de código de barras para terceros
-BarcodeInitForProductsOrServices=Inicio masivo de código de barras para productos o servicios
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Iniciar valor para los %s registros vacíos
-EraseAllCurrentBarCode=Eliminar todos los valores actuales de códigos de barras
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
-AllBarcodeReset=Todos los códigos de barras han sido eliminados
-NoBarcodeNumberingTemplateDefined=No hay establecida una numeración en la configuración del módulo de códigos de barras.
-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
-DisplayCompanyInfo=Display company address
-DisplayCompanyManagers=Display manager names
-DisplayCompanyInfoAndManagers=Display company address and manager names
-EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Devuelve un código contable compuesto de<br>%s seguido del código tercero de proveedor para el código contable de proveedor,<br>%s seguido del código tercero de cliente para el código contable de cliente.
-ModuleCompanyCodePanicum=Devuelve un código contable vacío.
-ModuleCompanyCodeDigitaria=Devuelve un código contable compuesto siguiendo el código de tercero. El código está formado por carácter ' C ' en primera posición seguido de los 5 primeros caracteres del código tercero.
-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: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-ClickToShowDescription=Click to show description
-# Modules
-Module0Name=Usuarios y grupos
-Module0Desc=Users / Employees and Groups management
-Module1Name=Terceros
-Module1Desc=Gestión de terceros (empresas, particulares) y contactos
-Module2Name=Comercial
-Module2Desc=Gestión comercial
-Module10Name=Contabilidad
-Module10Desc=Activación de informes simples de contabilidad (diarios, ventas) basados en el contenido de la base de datos. Sin desgloses.
-Module20Name=Presupuestos
-Module20Desc=Gestión de presupuestos/propuestas comerciales
-Module22Name=E-Mailings
-Module22Desc=Administración y envío de E-Mails masivos
-Module23Name=Energía
-Module23Desc=Realiza el seguimiento del consumo de energías
-Module25Name=Pedidos de clientes
-Module25Desc=Gestión de pedidos de clientes
-Module30Name=Facturas y abonos
-Module30Desc=Gestión de facturas y abonos a clientes. Gestión facturas de proveedores
-Module40Name=Proveedores
-Module40Desc=Gestión de proveedores
-Module42Name=Syslog
-Module42Desc=Generación de logs (archivos, syslog,...)
-Module49Name=Editores
-Module49Desc=Gestión de editores
-Module50Name=Productos
-Module50Desc=Gestión de productos
-Module51Name=Publipostage
-Module51Desc=Administración y envío de correo de papel en masa
-Module52Name=Stocks de productos
-Module52Desc=Gestión de stocks de productos
-Module53Name=Servicios
-Module53Desc=Gestión de servicios
-Module54Name=Contratos/Suscripciones
-Module54Desc=Gestión de contratos (servicios o suscripciones recurrentes)
-Module55Name=Códigos de barras
-Module55Desc=Gestión de los códigos de barras
-Module56Name=Telefonía
-Module56Desc=Gestión de la telefonía
-Module57Name=Direct bank payment orders
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
-Module58Name=ClickToDial
-Module58Desc=Integración con ClickToDial
-Module59Name=Bookmark4u
-Module59Desc=Añade función para generar una cuenta Bookmark4u desde una cuenta Dolibarr
-Module70Name=Intervenciones
-Module70Desc=Gestión de las intervenciones a terceros
-Module75Name=Notas de gasto y desplazamientos
-Module75Desc=Gestión de las notas de gasto y desplazamientos
-Module80Name=Expediciones
-Module80Desc=Gestión de expediciones y recepciones
-Module85Name=Bancos y cajas
-Module85Desc=Gestión de las cuentas financieras de tipo cuentas bancarias, postales o efectivo
-Module100Name=Sitio web externo
-Module100Desc=Incluye cualquier sitio web externo en los menús de Dolibarr, viéndolo en un frame
-Module105Name=Mailman y SPIP
-Module105Desc=Interfaz con Mailman o SPIP para el módulo Miembros
-Module200Name=LDAP
-Module200Desc=Sincronización con un directorio LDAP
-Module210Name=PostNuke
-Module210Desc=Integración con PostNuke
-Module240Name=Exportaciones de datos
-Module240Desc=Tool to export Dolibarr data (with assistants)
-Module250Name=Importación de datos
-Module250Desc=Tool to import data in Dolibarr  (with assistants)
-Module310Name=Miembros
-Module310Desc=Gestión de miembros de una asociación
-Module320Name=Hilos RSS
-Module320Desc=Adición de hilos de información RSS en las pantallas Dolibarr
-Module330Name=Marcadores
-Module330Desc=Gestión de marcadores
-Module400Name=Proyectos/Oportunidades/Leads
-Module400Desc=Gestión de proyectos, oportunidades o leads, Puede asignar cualquier elemento (factura, pedido, presupuesto, intervención, etc.) a un proyecto y obtener una vista transversal del proyecto
-Module410Name=Webcalendar
-Module410Desc=Interfaz con el calendario Webcalendar
-Module500Name=Pagos especiales
-Module500Desc=Gestión de gastos especiales (impuestos, gastos sociales, dividendos)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
-Module520Name=Crédito
-Module520Desc=Gestión de créditos
-Module600Name=Notificaciones
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
-Module700Name=Donaciones
-Module700Desc=Gestión de donaciones
-Module770Name=Informes de gastos
-Module770Desc=Gestión de informes de gastos (transporte, dietas, etc.)
-Module1120Name=Presupuesto de proveedor
-Module1120Desc=Solicitud presupuesto y precios a proveedor
-Module1200Name=Mantis
-Module1200Desc=Interfaz con el sistema de seguimiento de incidencias Mantis
-Module1400Name=Contabilidad experta
-Module1400Desc=Gestión experta de la contabilidad (doble partida)
-Module1520Name=Generación Documento
-Module1520Desc=Generación de documentos de correo masivo
-Module1780Name=Etiquetas/Categorías
-Module1780Desc=Crear etiquetas/Categoría(Productos, clientes,proveedores,contactos y miembros)
-Module2000Name=Editor WYSIWYG
-Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
-Module2200Name=Precios dinámicos
-Module2200Desc=Activar el uso de expresiones matemáticas para precios
-Module2300Name=Programador
-Module2300Desc=Gestión del Trabajo programado
-Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
-Module2500Name=Gestión Electrónica de Documentos
-Module2500Desc=Permite administrar una base de documentos
-Module2600Name=API/Web services (SOAP server)
-Module2600Desc=Habilitar los servicios Dolibarr SOAP proporcionando servicios API
-Module2610Name=API/Web services (REST server)
-Module2610Desc=Habilitar los servicios Dolibarr REST proporcionando servicios API
-Module2660Name=Call WebServices (SOAP client)
 Module2660Desc=Habilitar los servicios web cliente de Dolibarr (puede ser utilizado para grabar datos/solicitudes de servidores externos. De momento solo se soporta pedidos a proveedor)
-Module2700Name=Gravatar
-Module2700Desc=Utiliza el servicio en línea de Gravatar (www.gravatar.com) para mostrar fotos de los usuarios/miembros (que se encuentran en sus mensajes de correo electrónico). Necesita un acceso a Internet
-Module2800Desc=Cliente FTP
-Module2900Name=GeoIPMaxmind
-Module2900Desc=Capacidades de conversión GeoIP Maxmind
-Module3100Name=Skype
-Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
-Module4000Name=RRHH
-Module4000Desc=Human resources management
-Module5000Name=Multi-empresa
-Module5000Desc=Permite gestionar varias empresas
-Module6000Name=Flujo de trabajo
-Module6000Desc=Gestión del flujo de trabajo
-Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
-Module20000Name=Gestión de días libres retribuidos
-Module20000Desc=Gestión de los días libres retribuidos de los empleados
-Module39000Name=Lotes de producto
-Module39000Desc=Gestión de lotes o series, fechas de caducidad y venta de los productos
-Module50000Name=PayBox
-Module50000Desc=Módulo para proporcionar un pago en línea con tarjeta de crédito mediante Paybox
-Module50100Name=TPV
-Module50100Desc=Point of sales module (POS).
-Module50200Name=Paypal
-Module50200Desc=Módulo para proporcionar un pago en línea con tarjeta de crédito mediante Paypal
-Module50400Name=Contabilidad (avanzada)
-Module50400Desc=Gestión contable (doble partida)
-Module54000Name=PrintIPP
-Module54000Desc=La impresión directa (sin abrir los documentos) usa el interfaz Cups IPP (La impresora debe ser visible por el servidor y CUPS debe estar instalado en el servidor)
-Module55000Name=Encuesta o Voto
-Module55000Desc=Módulo para hacer encuestas en línea o votos (como Doodle, Studs, Rdvz, ...)
-Module59000Name=Márgenes
-Module59000Desc=Módulo para gestionar los márgenes de beneficio
-Module60000Name=Comisiones
-Module60000Desc=Módulo para gestionar las comisiones de venta
-Module63000Name=Recursos
-Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
-Permission11=Consultar facturas
-Permission12=Crear/Modificar facturas
-Permission13=De-validar facturas
-Permission14=Validar facturas
-Permission15=Enviar facturas por correo
-Permission16=Emitir pagos de facturas
-Permission19=Eliminar facturas
-Permission21=Consultar presupuestos
-Permission22=Crear/modificar presupuestos
-Permission24=Validar presupuestos
-Permission25=Enviar los presupuestos
-Permission26=Cerrar presupuestos
-Permission27=Eliminar presupuestos
-Permission28=Exportar los presupuestos
-Permission31=Consultar productos
-Permission32=Crear/modificar productos
-Permission34=Eliminar productos
-Permission36=Ver/gestionar los productos ocultos
-Permission38=Exportar productos
-Permission41=Leer proyectos y tareas (proyectos compartidos y proyectos de los que soy contacto). También puede introducir tiempos consumidos en tareas asignadas.
-Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
-Permission44=Eliminar proyectos y tareas (compartidos o soy contacto)
-Permission45=Export projects
-Permission61=Consultar intervenciones
-Permission62=Crear/modificar intervenciones
-Permission64=Eliminar intervenciones
-Permission67=Exportar intervenciones
-Permission71=Consultar miembros
-Permission72=Crear/modificar miembros
-Permission74=Eliminar miembros
-Permission75=Configurar tipos de los miembros
-Permission76=Export data
-Permission78=Consultar cotizaciones
-Permission79=Crear/modificar cotizaciones
-Permission81=Consultar pedidos de clientes
-Permission82=Crear/modificar pedidos de clientes
-Permission84=Validar pedidos de clientes
-Permission86=Enviar pedidos de clientes
-Permission87=Cerrar pedidos de clientes
-Permission88=Anular pedidos de clientes
-Permission89=Eliminar pedidos de clientes
-Permission91=Leer impuestos sociales o fiscales e IVA
-Permission92=Crear/modificar impuestos sociales o fiscales e IVA
-Permission93=Eliminar impuestos sociales o fiscales e IVA
-Permission94=Exportar impuestos sociales o fiscales
-Permission95=Consultar balances y resultados
-Permission101=Consultar expediciones
-Permission102=Crear/modificar expediciones
-Permission104=Validar expediciones
-Permission106=Exportar expediciones
-Permission109=Eliminar expediciones
-Permission111=Consultar cuentas financieras (cuentas bancarias, cajas)
-Permission112=Crear/modificar cantidad/eliminar registros bancarios
-Permission113=Configurar cuentas financieras (crear, controlar las categorías)
-Permission114=Reconciliar transacciones
-Permission115=Exportar transacciones y extractos
-Permission116=Captar transferencias entre cuentas
-Permission117=Gestionar envío de cheques
-Permission121=Consultar empresas
-Permission122=Crear/modificar empresas
-Permission125=Eliminar empresas
-Permission126=Exportar las empresas
-Permission141=Leer todos los proyectos y tareas (incluidos proyectos privados de los que no soy contacto)
-Permission142=Crear/modificar todos los proyectos y tareas (incluidos proyectos privados de los que no soy contacto)
-Permission144=Eliminar todos los proyectos y tareas (incluidos los proyectos privados de los que no soy contacto)
-Permission146=Consultar proveedores
-Permission147=Consultar estadísticas
-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
-Permission161=Consultar contratos/suscripciones
-Permission162=Crear/modificar contratos/suscripciones
-Permission163=Activar un servicio/suscripción de un contrato
-Permission164=Desactivar un servicio/suscripcion de un contrato
-Permission165=Eliminar contratos/suscripciones
-Permission167=Export contracts
-Permission171=Read trips and expenses (yours and your subordinates)
-Permission172=Crear/modificar honorarios
-Permission173=Eliminar honorarios
-Permission174=Leer todos los honorarios
-Permission178=Exportar honorarios
-Permission180=Consultar proveedores
-Permission181=Consultar pedidos a proveedores
-Permission182=Crear/modificar pedidos a proveedores
-Permission183=Validar pedidos a proveedores
-Permission184=Aprobar pedidos a proveedores
-Permission185=Realizar o cancelar pedidos a proveedores
-Permission186=Recibir pedidos de proveedores
-Permission187=Cerrar pedidos a proveedores
-Permission188=Anular pedidos a proveedores
-Permission192=Crear líneas
-Permission193=Cancelar líneas
-Permission194=Consultar el ancho de banda de líneas
-Permission202=Crear conexiones ADSL
-Permission203=Realizar pedido de conexiones
-Permission204=Pedir conexiones
-Permission205=Gestionar conexiones
-Permission206=Consultar conexiones
-Permission211=Consultar telefonía
-Permission212=Pedir líneas
-Permission213=Activar una línea
-Permission214=Configurar la telefonía
-Permission215=Configurar proveedores
-Permission221=Consultar E-Mails
-Permission222=Crear/modificar E-Mails (asunto, destinatarios, etc.)
-Permission223=Validar E-Mails (permite el envío)
-Permission229=Eliminar E-Mails
-Permission237=Ver los destinatarios y la información
-Permission238=Enviar los e-mails manualmente
-Permission239=Eliminar los e-mails después de su validación o su envío
-Permission241=Consultar categorías
-Permission242=Crear/modificar categorías
-Permission243=Eliminar categorías
-Permission244=Ver contenido de categorías ocultas
-Permission251=Consultar otros usuarios
-PermissionAdvanced251=Consultar otros usuarios
-Permission252=Consultar los permisos de otros usuarios
-Permission253=Crear/modificar otros usuarios y sus permisos
-PermissionAdvanced253=Crear/modificar usuarios internos/externos y sus permisos
 Permission254=Modificar la contraseña de otros usuarios
 Permission255=Eliminar o desactivar otros usuarios
 Permission256=Consultar sus permisos
-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 assignement matters).
-Permission271=Consultar el CA
-Permission272=Consultar las facturas
-Permission273=Emitir las facturas
-Permission281=Consultar contactos
-Permission282=Crear/modificar contactos
-Permission283=Eliminar contactos
-Permission286=Exportar contactos
-Permission291=Consultar tarifas
-Permission292=Definir permisos sobre las tarifas
-Permission293=Modificar tarifas de clientes
-Permission300=Consultar códigos de barras
-Permission301=Crear/modificar códigos de barras
-Permission302=Eliminar código de barras
-Permission311=Consultar servicios
-Permission312=Asignar servicios/suscripciones a un contrato
-Permission331=Consultar marcadores
-Permission332=Crear/modificar marcadores
-Permission333=Eliminar marcadores
-Permission341=Consultar sus propios permisos
-Permission342=Crear/modificar su propia info de usuario
-Permission343=Modificar su propia contraseña
-Permission344=Modificar sus propios permisos
-Permission351=Consultar los grupos
-Permission352=Consultar los permisos de grupos
-Permission353=Crear/modificar los grupos y sus permisos
-Permission354=Eliminar o desactivar grupos
-Permission358=Exportar usuarios
-Permission401=Consultar haberes
-Permission402=Crear/modificar haberes
-Permission403=Validar haberes
-Permission404=Eliminar haberes
-Permission510=Consultar salarios
-Permission512=Crear/modificar salarios
-Permission514=Eliminar salarios
-Permission517=Exportar salarios
-Permission520=Consultar Créditos
-Permission522=Crear/modificar Créditos
-Permission524=Eliminar Crédito
-Permission525=Calculadora de crédito
-Permission527=Exportar crédito
-Permission531=Consultar servicios
-Permission532=Crear/modificar servicios
-Permission534=Eliminar servicios
-Permission536=Ver/gestionar los servicios ocultos
-Permission538=Exportar servicios
-Permission701=Consultar donaciones
-Permission702=Crear/modificar donaciones
-Permission703=Eliminar donaciones
-Permission771=Read expense reports (yours and your subordinates)
-Permission772=Crear/modificar informe de gastos
-Permission773=Eliminar informe de gastos
-Permission774=Leer todos los informes de gastos (incluidos los no subordinados)
-Permission775=Aprobar informe de gastos
-Permission776=Pagar informe de gastos
-Permission779=Exportar informe de gastos
-Permission1001=Consultar stocks
-Permission1002=Crear/modificar almacenes
-Permission1003=Eliminar almacenes
-Permission1004=Consultar movimientos de stock
-Permission1005=Crear/modificar movimientos de stock
-Permission1101=Consultar ordenes de envío
-Permission1102=Crear/modificar ordenes de envío
-Permission1104=Validar orden de envío
-Permission1109=Eliminar orden de envío
-Permission1181=Consultar proveedores
-Permission1182=Consultar pedidos a proveedores
-Permission1183=Crear pedidos a proveedores
-Permission1184=Validar pedidos a proveedores
-Permission1185=Aprobar pedidos a proveedores
-Permission1186=Enviar pedidos a proveedores
-Permission1187=Recibir pedidos de proveedores
-Permission1188=Cerrar pedidos a proveedores
-Permission1190=Aprobar (segunda aprobación) pedidos a proveedores
-Permission1201=Obtener resultado de una exportación
-Permission1202=Crear/codificar exportaciones
-Permission1231=Consultar facturas de proveedores
-Permission1232=Crear facturas de proveedores
-Permission1233=Validar facturas de proveedores
-Permission1234=Eliminar facturas de proveedores
-Permission1235=Enviar facturas de proveedores por correo
-Permission1236=Exportar facturas de proveedores, atributos y pagos
-Permission1237=Exportar pedidos de proveedores junto con sus detalles
-Permission1251=Lanzar las importaciones en masa a la base de datos (carga de datos)
-Permission1321=Exportar facturas a clientes, atributos y cobros
-Permission1322=Reopen a paid bill
-Permission1421=Exportar pedidos de clientes y atributos
-Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Crear/modificar sus días retribuidos
 Permission20003=Eliminar peticiones de días libres retribuidos
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Crear/modificar días retribuidos para todos
-Permission20006=Administrar días retribuidos (configuración y actualización de balance)
-Permission23001=Consultar Trabajo programado
-Permission23002=Crear/actualizar Trabajo programado
-Permission23003=Borrar Trabajo Programado
-Permission23004=Ejecutar Trabajo programado
-Permission2401=Leer acciones (eventos o tareas) vinculadas a su cuenta
 Permission2402=Crear/eliminar acciones (eventos o tareas) vinculadas a su cuenta
 Permission2403=Modificar acciones (eventos o tareas) vinculadas a su cuenta
-Permission2411=Leer acciones (eventos o tareas) de otros
-Permission2412=Crear/modificar acciones (eventos o tareas) de otros
-Permission2413=Eliminar acciones (eventos o tareas) de otros
-Permission2414=Export actions/tasks of others
-Permission2501=Consultar/Recuperar documentos
-Permission2502=Recuperar documentos
-Permission2503=Enviar o eliminar documentos
-Permission2515=Configuración directorios de documentos
-Permission2801=Utilizar el cliente FTP en modo lectura (sólo explorar y descargar)
-Permission2802=Utilizar el cliente FTP en modo escritura (borrar o subir archivos)
-Permission50101=Usar TPV
-Permission50201=Consultar las transacciones
-Permission50202=Importar las transacciones
-Permission54001=Imprimir
-Permission55001=Leer encuestas
-Permission55002=Crear/modificar encuestas
-Permission59001=Leer márgenes comerciales
-Permission59002=Definir márgenes comerciales
-Permission59003=Leer cualquier margen de usuario
-Permission63001=Read resources
-Permission63002=Create/modify resources
-Permission63003=Delete resources
-Permission63004=Link resources to agenda events
-DictionaryCompanyType=Types of thirdparties
-DictionaryCompanyJuridicalType=Legal forms of thirdparties
-DictionaryProspectLevel=Perspectiva nivel cliente potencial
-DictionaryCanton=Provincia
-DictionaryRegion=Regiones
-DictionaryCountry=Países
-DictionaryCurrency=Monedas
-DictionaryCivility=Personal and professional titles
-DictionaryActions=Types of agenda events
-DictionarySocialContributions=Tipos de impuestos sociales o fiscales
-DictionaryVAT=Tasa de IVA (Impuesto sobre ventas en EEUU)
-DictionaryRevenueStamp=Importes de sellos fiscales
-DictionaryPaymentConditions=Condiciones de pago
-DictionaryPaymentModes=Modos de pago
-DictionaryTypeContact=Tipos de contactos/direcciones
-DictionaryEcotaxe=Baremos CEcoParticipación (DEEE)
-DictionaryPaperFormat=Formatos de papel
-DictionaryFormatCards=Cards formats
-DictionaryFees=Types of fees
-DictionarySendingMethods=Métodos de expedición
-DictionaryStaff=Empleados
-DictionaryAvailability=Tiempos de entrega
-DictionaryOrderMethods=Métodos de pedido
-DictionarySource=Orígenes de presupuestos/pedidos
-DictionaryAccountancyCategory=Accounting account groups
-DictionaryAccountancysystem=Modelos de planes contables
-DictionaryEMailTemplates=Plantillas E-Mails
-DictionaryUnits=Unidades
-DictionaryProspectStatus=Estado cliente potencial
-DictionaryHolidayTypes=Types of leaves
-DictionaryOpportunityStatus=Estado de oportunidad para el proyecto/lead
-SetupSaved=Configuración guardada
-BackToModuleList=Volver a la lista de módulos
-BackToDictionaryList=Volver a la lista de diccionarios
-VATManagement=Gestión IVA
-VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
-VATIsNotUsedDesc=El tipo de IVA propuesto por defecto es 0. Este es el caso de asociaciones, particulares o algunas pequeñas sociedades.
-VATIsUsedExampleFR=En Francia, se trata de las sociedades u organismos que eligen un régimen fiscal general (General simplificado o General normal), régimen en el cual se declara el IVA.
-VATIsNotUsedExampleFR=En Francia, se trata de asociaciones exentas de IVA o sociedades, organismos o profesiones liberales que han elegido el régimen fiscal de módulos (IVA en franquicia), pagando un IVA en franquicia sin hacer declaración de IVA. Esta elección hace aparecer la anotación  "IVA no aplicable - art-293B del CGI" en las facturas.
-##### Local Taxes #####
-LTRate=Tasa
-LocalTax1IsNotUsed=No sujeto
-LocalTax1IsUsedDesc=Uso de un 2º tipo de impuesto (Distinto del IVA)
-LocalTax1IsNotUsedDesc=No usar un 2º tipo de impuesto (Distinto del IVA)
-LocalTax1Management=Gestión 2º tipo de impuesto
-LocalTax1IsUsedExample=
-LocalTax1IsNotUsedExample=
-LocalTax2IsNotUsed=No sujeto
-LocalTax2IsUsedDesc=Uso de un 3er. tipo de impuesto (Distinto del IVA)
-LocalTax2IsNotUsedDesc=No usar un 3er. tipo de impuesto (Distinto del IVA)
-LocalTax2Management=Gestión 3er. tipo de impuesto
-LocalTax2IsUsedExample=
-LocalTax2IsNotUsedExample=
-LocalTax1ManagementES= Gestión RE
-LocalTax1IsUsedDescES= El tipo de RE propuesto por defecto en las creaciones de presupuestos, facturas, pedidos, etc. Responde a la siguiente regla:<br>Si el comprador no está sujeto a RE, RE por defecto=0. Final de regla.<br>Si el comprador está sujeto a RE entonces se aplica valor de RE por defecto. Final de regla.<br>
-LocalTax1IsNotUsedDescES= El tipo de RE propuesto por defecto es 0. Final de regla.
-LocalTax1IsUsedExampleES= En España, se trata de personas físicas: autónomos sujetos a unos epígrafes concretos del IAE.
-LocalTax1IsNotUsedExampleES= En España, se trata de empresas jurídicas: Sociedades limitadas, anónimas, etc. y personas físicas (autónomos) sujetos a ciertos epígrafes del IAE.
-LocalTax2ManagementES= Gestión IRPF
-LocalTax2IsUsedDescES= El tipo de IRPF propuesto por defecto en las creaciones de presupuestos, facturas, pedidos, etc. Responde a la siguiente regla:<br>Si el vendedor no está sujeto a IRPF, IRPF por defecto=0. Final de regla.<br>Si el vendedor está sujeto a IRPF entonces se aplica valor de IRPF por defecto. Final de regla.<br>
-LocalTax2IsNotUsedDescES= El tipo de IRPF propuesto por defecto es 0. Final de regla.
-LocalTax2IsUsedExampleES= En España, se trata de personas físicas: autónomos y profesionales independientes que prestan servicios y empresas que han elegido el régimen fiscal de módulos.
-LocalTax2IsNotUsedExampleES= En España, se trata de empresas no sujetas al régimen fiscal de módulos.
-CalcLocaltax=Informes de impuestos locales
-CalcLocaltax1=Ventas - Compras
-CalcLocaltax1Desc=Los informes se calculan con la diferencia entre las ventas y las compras
-CalcLocaltax2=Compras
-CalcLocaltax2Desc=Los informes se basan en el total de las compras
-CalcLocaltax3=Ventas
-CalcLocaltax3Desc=Los informes se basan en el total de las ventas
-LabelUsedByDefault=Etiqueta que se utilizará si no se encuentra traducción para este código
-LabelOnDocuments=Etiqueta sobre documentos
-NbOfDays=Nº de días
-AtEndOfMonth=A fin de mes
-CurrentNext=Current/Next
-Offset=Decálogo
-AlwaysActive=Siempre activo
-Upgrade=Actualización
-MenuUpgrade=Actualización / Extensión
-AddExtensionThemeModuleOrOther=Deploy/install external module
-WebServer=Servidor web
-DocumentRootServer=Directorio raíz de las páginas web
-DataRootServer=Directorio raíz de los archivos de datos
-IP=IP
-Port=Puerto
-VirtualServerName=Nombre del servidor virtual
-OS=SO
-PhpWebLink=Vínculo Web-PHP
-Browser=Navegador
-Server=Servidor
-Database=Base de datos
-DatabaseServer=Host de la base de datos
-DatabaseName=Nombre de la base de datos
-DatabasePort=Puerto de la base de datos
-DatabaseUser=Login de la base de datos
-DatabasePassword=Contraseña de la base de datos
-Tables=Tablas
-TableName=Nombre de la tabla
-NbOfRecord=Nº Reg.
-Host=Servidor
-DriverType=Tipo de driver
-SummarySystem=Resumen de la información de sistemas Dolibarr
-SummaryConst=Lista de todos los parámetros de configuración Dolibarr
-MenuCompanySetup=Empresa/Institución
-DefaultMenuManager= Gestor del menú estándar
-DefaultMenuSmartphoneManager=Gestor de menú smartphone
-Skin=Tema visual
-DefaultSkin=Tema visual por defecto
-MaxSizeList=Longitud máxima de listados
-DefaultMaxSizeList=Default max length for lists
-DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
-MessageOfDay=Mensaje del día
-MessageLogin=Mensaje del login
-PermanentLeftSearchForm=Zona de búsqueda permanente del menú izquierdo
-DefaultLanguage=Idioma por defecto a utilizar (código idioma)
-EnableMultilangInterface=Activar interfaz multi-idioma
-EnableShowLogo=Mostrar el logotipo en el menú de la izquierda
-CompanyInfo=Información de la empresa/institución
-CompanyIds=Identificación reglamentaria
-CompanyName=Nombre/Razón social
-CompanyAddress=Dirección
-CompanyZip=Código postal
-CompanyTown=Población
-CompanyCountry=País
-CompanyCurrency=Divisa principal
-CompanyObject=Objeto de la empresa
-Logo=Logo
-DoNotSuggestPaymentMode=No sugerir
-NoActiveBankAccountDefined=Ninguna cuenta bancaria activa definida
-OwnerOfBankAccount=Titular de la cuenta %s
-BankModuleNotActive=Módulo cuentas bancarias no activado
-ShowBugTrackLink=Mostrar enlace "<strong>%s</strong>"
-Alerts=Alertas
-DelaysOfToleranceBeforeWarning=Plazos de tolerancia antes de alerta
-DelaysOfToleranceDesc=Esta pantalla permite configura los plazos de tolerancia antes de que se alerte con el símbolo %s, sobre cada elemento en retraso.
-Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned events (agenda events) not completed yet
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Delay tolerance (in days) before alert on project not closed in time
-Delays_MAIN_DELAY_TASKS_TODO=Delay tolerance (in days) before alert on planned tasks (project tasks) not completed yet
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on orders not processed yet
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on suppliers orders not processed yet
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Tolerancia de retraso antes de la alerta (en días) sobre presupuestos a cerrar
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Tolerancia de retraso antes de la alerta (en días) sobre presupuestos no facturados
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerancia de retraso antes de la alerta (en días) sobre servicios a activar
-Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerancia de retraso antes de la alerta (en días) sobre servicios expirados
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerancia de retraso antes de la alerta (en días) sobre facturas de proveedor impagadas
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerancia de retraso antes de la alerta (en días) sobre facturas a cliente impagadas
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerancia de retraso antes de la alerta (en días) sobre conciliaciones bancarias pendientes
-Delays_MAIN_DELAY_MEMBERS=Tolerancia de retraso entes de la alerta  (en días) sobre cotizaciones adherentes en retraso
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerancia de retraso entes de la alerta  (en días) sobre cheques a ingresar
-Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
-SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
-SetupDescription5=Las otras entradas de configuración gestionan parámetros opcionales.
-LogEvents=Auditoría de la seguridad de eventos
-Audit=Auditoría
-InfoDolibarr=About Dolibarr
-InfoBrowser=About Browser
-InfoOS=About OS
-InfoWebServer=About Web Server
-InfoDatabase=About Database
-InfoPHP=About PHP
-InfoPerf=About Performances
-BrowserName=Nombre del navegador
-BrowserOS=S.O. del navegador
-ListOfSecurityEvents=Listado de eventos de seguridad Dolibarr
-SecurityEventsPurged=Eventos de seguridad purgados
-LogEventDesc=Puede habilitar el registro de eventos de seguridad Dolibarr aquí. Los administradores pueden ver su contenido a través de menú <b>Herramientas del sistema - Auditoría</b>.Atención, esta característica puede consumir una gran cantidad de datos en la base de datos.
-AreaForAdminOnly=Estas funciones solo son accesibles a un usuario administrador.
-SystemInfoDesc=La información del sistema es información técnica accesible solamente en solo lectura a los administradores.
-SystemAreaForAdminOnly=Esta área solo es accesible a los usuarios de tipo administradores. Ningún permiso Dolibarr permite extender el círculo de usuarios autorizados a esta área.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
-DisplayDesc=Puede encontrar aquí todos los parámetros relacionados con la apariencia de Dolibarr
-AvailableModules=Módulos disponibles
-ToActivateModule=Para activar los módulos, vaya al área de Configuración (Inicio->Configuración->Módulos).
-SessionTimeOut=Timeout de sesiones
-SessionExplanation=Asegura que el período de sesiones no expirará antes de este momento. Sin embargo, la gestión del período de sesiones de PHP no garantiza que el período de sesiones expira después de este período: Este será el caso si un sistema de limpieza del caché de sesiones es activo. <br> Nota: Sin mecanismo especial, el mecanismo interno para limpiar el período de sesiones de PHP todos los accesos <b>%s/%s</b>, pero sólo en torno al acceso de otros períodos de sesiones.
-TriggersAvailable=Triggers disponibles
-TriggersDesc=Los triggers son archivos que, une vez depositados en el directorio <b>htdocs/core/triggers</b>, modifican el comportamiento del workflow de Dolibarr. Realizan acciones suplementarias, desencadenadas por los eventos Dolibarr (creación de empresa, validación factura, cierre contrato, etc).
-TriggerDisabledByName=Triggers de este archivo desactivados por el sufijo <b>-NORUN</b> en el nombre del archivo.
-TriggerDisabledAsModuleDisabled=Triggers de este archivo desactivados ya que el módulo <b>%s</b> no está activado.
-TriggerAlwaysActive=Triggers de este archivo siempre activos, ya que los módulos Dolibarr relacionados están activados
-TriggerActiveAsModuleActive=Triggers de este archivo activos ya que el módulo <b>%s</b> está activado
-GeneratedPasswordDesc=Indique aquí que norma quiere utilizar para generar las contraseñas cuando quiera generar una nueva contraseña
-DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">check here</a>.
-MiscellaneousDesc=All other security related parameters are defined here.
-LimitsSetup=Configuración de límites y precisiones
-LimitsDesc=Puede definir aquí los límites y precisiones utilizados por Dolibarr
-MAIN_MAX_DECIMALS_UNIT=Decimales máximos para los precios unitarios
-MAIN_MAX_DECIMALS_TOT=Decimales máximos para los precios totales
-MAIN_MAX_DECIMALS_SHOWN=Decimales máximos para los importes mostrados en pantalla (Poner <b>...</b> después del máximo si quiere ver <b>...</b> cuando el número se trunque al mostrarlo en pantalla)
-MAIN_ROUNDING_RULE_TOT=Salto de rango de redondeo (para países donde el redondeo se realiza diferente a base 10. Por ejemplo, ponga 0.05 si el redondeo se hace en saltos de 0.05)
-UnitPriceOfProduct=Precio unitario sin IVA de un producto
-TotalPriceAfterRounding=Precio total después del redondeo
-ParameterActiveForNextInputOnly=Parámetro efectivo solamente a partir de las próximas sesiones
-NoEventOrNoAuditSetup=No se han registrado eventos de seguridad. Esto puede ser normal si la auditoría no ha sido habilitada en la página "configuración->seguridad->auditoría".
-NoEventFoundWithCriteria=No se han encontrado eventos de seguridad para tales criterios de búsqueda.
-SeeLocalSendMailSetup=Ver la configuración local de sendmail
-BackupDesc=Para realizar una copia de seguridad completa de Dolibarr, usted debe:
-BackupDesc2=Guarde el contenido del directorio de documentos (<b>%s</b>), contiene todos los archivos subidos y generados  (Por lo que incluye todos los archivos de copias generados en el paso 1).
-BackupDesc3=Guardar el contenido de su base de datos (<b>%s</b>) en un archivo de volcado. Para ello puede utilizar el asistente a continuación.
-BackupDescX=El directorio archivado deberá guardarse  en un lugar seguro.
-BackupDescY=El archivo de volcado generado deberá guardarse en un lugar seguro.
-BackupPHPWarning=La copia de seguridad no puede ser garantizada con este método. Es preferible utilizar el anterior
-RestoreDesc=Para restaurar una copia de seguridad de Dolibarr, usted debe:
-RestoreDesc2=Tomar el archivo (archivo zip, por ejemplo) del directorio de los documentos y descomprimirlo en el directorio de los documentos de una nueva instalación de Dolibarr o en la carpeta de los documentos de esta instalación (<b>%s</b>).
-RestoreDesc3=Restaurar el archivo de volcado guardado en la base de datos de la nueva instalación de Dolibarr o de esta instalación (<b>%s</b>). Atención, una vez realizada la restauración, deberá utilizar un login/contraseña de administrador existente en el momento de la copia de seguridad para conectarse. Para restaurar la base de datos en la instalación actual, puede utilizar el asistente a continuación.
-RestoreMySQL=Importación MySQL
-ForcedToByAModule= Esta regla está forzada a <b>%s</b> por uno de los módulos activados
-PreviousDumpFiles=Archivos de copia de seguridad de la base de datos disponibles
-WeekStartOnDay=Primer día de la semana
-RunningUpdateProcessMayBeRequired=Parece necesario realizar el proceso de actualización (la versión del programa %s difiere de la versión de la base de datos %s)
-YouMustRunCommandFromCommandLineAfterLoginToUser=Debe ejecutar el comando desde un shell después de haber iniciado sesión con la cuenta <b>%s</b>.
-YourPHPDoesNotHaveSSLSupport=Funciones SSL no disponibles en su PHP
-DownloadMoreSkins=Más temas para descargar
-SimpleNumRefModelDesc=Devuelve el número bajo el formato %syymm-nnnn donde yy es el año, mm el mes y nnnn un contador secuencial sin ruptura y sin volver a 0
-ShowProfIdInAddress=Mostrar el identificador profesional en las direcciones de los documentos
-ShowVATIntaInAddress=Ocultar el identificador IVA en las direcciones de los documentos
-TranslationUncomplete=Traducción parcial
-MAIN_DISABLE_METEO=Deshabilitar la vista meteorológica
-TestLoginToAPI=Comprobar conexión a la API
-ProxyDesc=Algunas de las características de Dolibarr requieren que el servidor tenga acceso a Internet. Defina aqui los parámetros para dicho acceso. Si el servidor está detrás de un proxy, estos parámetros indican a Dolibarr cómo pasarlo.
-ExternalAccess=Acceso externo
-MAIN_PROXY_USE=Usar un servidor proxy (si no acceso directo a Internet)
-MAIN_PROXY_HOST=Nombre/Dirección del servidor proxy
-MAIN_PROXY_PORT=Puerto del servidor proxy
-MAIN_PROXY_USER=Login del servidor proxy
-MAIN_PROXY_PASS=Contraseña del servidor proxy
-DefineHereComplementaryAttributes=Defina aquí la lista de atributos adicionales, no disponibles por defecto, y que desea gestionar para %s.
-ExtraFields=Atributos adicionales
-ExtraFieldsLines=Atributos adicionales (líneas)
-ExtraFieldsSupplierOrdersLines=Atributos complementarios (líneas de pedido)
-ExtraFieldsSupplierInvoicesLines=Atributos complementarios (líneas de factura)
-ExtraFieldsThirdParties=Atributos adicionales (terceros)
-ExtraFieldsContacts=Atributos adicionales (contactos/direcciones)
-ExtraFieldsMember=Atributos adicionales (miembros)
-ExtraFieldsMemberType=Atributos adicionales  (tipos de miembros)
-ExtraFieldsCustomerInvoices=Atributos adicionales (facturas a clientes)
-ExtraFieldsSupplierOrders=Atributos adicionales (pedidos a proveedores)
-ExtraFieldsSupplierInvoices=Atributos adicionales (facturas)
-ExtraFieldsProject=Atributos adicionales (proyectos)
-ExtraFieldsProjectTask=Atributos adicionales (tareas)
-ExtraFieldHasWrongValue=El atributo %s tiene un valor no válido
-AlphaNumOnlyLowerCharsAndNoSpace=sólo alfanuméricos y minúsculas sin espacio
-SendmailOptionNotComplete=Atención, en algunos sistemas Linux, con este método de envio, para poder enviar mails en su nombre, la configuración de sendmail debe contener la opción <b>-ba</b> (parámetro <b>mail.force_extra_parameters</b> en el archivo <b>php.ini</b>). Si algunos de sus destinatarios no reciben sus mensajes, pruebe a modificar este parámetro PHP con <b>mail.force_extra_parameters=-ba</b>.
-PathToDocuments=Rutas de acceso a documentos
-PathDirectory=Directorio
-SendmailOptionMayHurtBuggedMTA=La funcionalidad de enviar correo electrónico a través del "correo directo PHP" genera una solicitud que puede ser mal interpretado por algunos servidores de correo. Esto se traduce en mensajes de correo electrónico ilegibles para las personas alojadas en estas plataformas. Este es el caso de clientes en ciertos proveedores de servicios de Internet (Ej: Orange). Esto no es un problema ni de Dolibarr ni de PHP, pero sí del servidor de correo. Sin embargo, puede agregar la opción MAIN_FIX_FOR_BUGGED_MTA con valor 1 en configuración-varios para tratar que Dolibarr evite el error. Otra solución (recomendada) es utilizar el método de envío por SMTP que no tiene este inconveniente.
-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: <strong>User display setup</strong> tab of 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
-TranslationString=Translation string
-CurrentTranslationString=Current translation string
-WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
-NewTranslationStringToShow=New translation string to show
-OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
-YouMustEnableOneModule=Debe activar al menos un módulo.
-ClassNotFoundIntoPathWarning=No se ha encontrado la clase %s en su path PHP
-YesInSummer=Sí en verano
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
-SuhosinSessionEncrypt=Almacenamiento de sesiones cifradas por Suhosin
-ConditionIsCurrently=Actualmente la condición es %s
-YouUseBestDriver=Está usando el driver %s, actualmente es el mejor driver disponible.
-YouDoNotUseBestDriver=Usa el driver %s aunque se recomienda usar el driver %s.
-NbOfProductIsLowerThanNoPb=Tiene %s productos/servicios en su base de datos. No es necesaria ninguna optimización en particular.
-SearchOptim=Buscar optimización
-YouHaveXProductUseSearchOptim=Tiene %s productos en su base de datos. Debería añadir la constante PRODUCT_DONOTSEARCH_ANYWHERE a 1 en Inicio-Configuración-Varios, limitando la búsqueda al principio de la cadena lo que hace posible que la base de datos use el índice y se obtenga una respuesta inmediata.
-BrowserIsOK=Usa el navegador web %s. Este navegador está optimizado para la seguridad y el rendimiento.
-BrowserIsKO=Usa el navegador web %s.  Este navegador es una mala opción para la seguridad, rendimiento y fiabilidad. Aconsejamos utilizar Firefox, Chrome, Opera o Safari.
-XDebugInstalled=XDebug está cargado.
-XCacheInstalled=XCache está cargado
-AddRefInList=Mostrar código de cliente/proveedor en los listados (y selectores) y enlaces. Los terceros aparecerán con el nombre "CC12345 - SC45678 - The big company coorp", en lugar de "The big company coorp".
-AskForPreferredShippingMethod=Ask for preferred Sending Method for Third Parties.
-FieldEdition=Edición del campo %s
-FillThisOnlyIfRequired=Ejemplo: +2 (Complete sólo si se registra una desviación del tiempo en la exportación)
-GetBarCode=Obtener código de barras
-##### Module password generation
-PasswordGenerationStandard=Devuelve una contraseña generada por el algoritmo interno Dolibarr: 8 caracteres, números y caracteres en minúsculas mezcladas.
-PasswordGenerationNone=Do not suggest any generated password. Password must be typed in manually.
-PasswordGenerationPerso=Return a password according to your personally defined configuration.
-SetupPerso=According to your configuration
-PasswordPatternDesc=Password pattern description
-##### Users setup #####
-RuleForGeneratedPasswords=Norma para la generación de las contraseñas propuestas
-DisableForgetPasswordLinkOnLogonPage=No mostrar el vínculo "Contraseña olvidada" en la página de login
-UsersSetup=Configuración del módulo usuarios
-UserMailRequired=E-Mail necesario para crear un usuario nuevo
-##### HRM setup #####
-HRMSetup=HRM module setup
-##### Company setup #####
-CompanySetup=Configuración del módulo terceros
-CompanyCodeChecker=Módulo de generación y control de los códigos de terceros (clientes/proveedores)
-AccountCodeManager=Módulo de generación de los códigos contables (clientes/proveedores)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
-NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
-NotificationsDescGlobal=* or by setting global target emails in module setup page.
-ModelModules=Modelos de documentos
-DocumentModelOdt=Generación desde los documentos OpenDocument (Archivo .ODT OpenOffice, KOffice, TextEdit,...)
-WatermarkOnDraft=Marca de agua en los documentos borrador
-JSOnPaimentBill=Activar función para autocompletar las líneas de pago en la entrada de pagos
-CompanyIdProfChecker=Reglas sobre los ID profesionales
-MustBeUnique=Must be unique?
-MustBeMandatory=Mandatory to create third parties?
-MustBeInvoiceMandatory=Mandatory to validate invoices?
-##### Webcal setup #####
-WebCalUrlForVCalExport=Un vínculo de exportación del calendario en formato <b>%s</b> estará disponible en la url: %s
-##### Invoices #####
-BillsSetup=Configuración del módulo Facturas
-BillsNumberingModule=Módulo de numeración de facturas y abonos
-BillsPDFModules=Modelo de documento de facturas
-CreditNote=Abono
-CreditNotes=Abonos
-ForceInvoiceDate=Forzar la fecha de factura a la fecha de validación
-SuggestedPaymentModesIfNotDefinedInInvoice=Formas de pago sugeridas para las facturas si no están definidas explícitamente
-SuggestPaymentByRIBOnAccount=Sugerir el pago por abono en cuenta
-SuggestPaymentByChequeToAddress=Sugerir el pago por cheque a
-FreeLegalTextOnInvoices=Texto libre en facturas
-WatermarkOnDraftInvoices=Marca de agua en las facturas borrador (en caso de estar vacío)
-PaymentsNumberingModule=Payments numbering model
-SuppliersPayment=Pagos a proveedores
-SupplierPaymentSetup=Suppliers payments setup
-##### Proposals #####
-PropalSetup=Configuración del módulo Presupuestos
-ProposalsNumberingModules=Módulos de numeración de presupuestos
-ProposalsPDFModules=Modelos de documentos de presupuestos
-FreeLegalTextOnProposal=Texto libre en presupuestos
-WatermarkOnDraftProposal=Marca de agua en presupuestos borrador (en caso de estar vacío)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Preguntar por cuenta bancaria a usar en el presupuesto
-##### SupplierProposal #####
 SupplierProposalSetup=Configuración del módulo Solicitudes a proveedor
 SupplierProposalNumberingModules=Modelos de numeración de solicitud de precios a proveedor
 SupplierProposalPDFModules=Modelos de documentos de solicitud de precios a proveedores
 FreeLegalTextOnSupplierProposal=Texto libre en solicitudes de precios a proveedores
 WatermarkOnDraftSupplierProposal=Marca de agua en solicitudes de precios a proveedor (en caso de estar vacío)
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Preguntar por cuenta bancaria a usar en el presupuesto
-WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
-##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
-##### Orders #####
-OrdersSetup=Configuración del módulo pedidos
-OrdersNumberingModules=Módulos de numeración de los pedidos
-OrdersModelModule=Modelos de documentos de pedidos
-FreeLegalTextOnOrders=Texto libre en pedidos
-WatermarkOnDraftOrders=Marca de agua en pedidos borrador (en caso de estar vacío)
-ShippableOrderIconInList=Añadir un icono en el listado de pedidos que indica si el pedido es enviable
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Preguntar por cuenta bancaria a usar en el pedido
-##### Interventions #####
-InterventionsSetup=Configuración del módulo intervenciones
-FreeLegalTextOnInterventions=Texto adicional en las fichas de intervención
-FicheinterNumberingModules=Módulos de numeración de las fichas de intervención
-TemplatePDFInterventions=Modelo de documentos de las fichas de intervención
-WatermarkOnDraftInterventionCards=Marca de agua en fichas de intervención (en caso de estar vacío)
-##### Contracts #####
-ContractsSetup=Configuración del módulo Contratos/suscripciones
-ContractsNumberingModules=Módulos de numeración de los contratos
-TemplatePDFContracts=Modelos de documento de contratos
-FreeLegalTextOnContracts=Texto libre en contratos
-WatermarkOnDraftContractCards=Marca de agua en contratos (nada si está vacía)
-##### Members #####
-MembersSetup=Configuración del módulo Asociaciones
-MemberMainOptions=Opciones principales
-AdherentLoginRequired= Gestionar un login para cada miembro
-AdherentMailRequired=E-Mail obligatorio para crear un miembro nuevo
-MemberSendInformationByMailByDefault=Casilla de verificación para enviar el correo de confirmación (validación ó nueva cotización) a los miembros es por defecto "sí"
-##### LDAP setup #####
-LDAPSetup=Configuración del módulo LDAP
-LDAPGlobalParameters=Parámetros globales
-LDAPUsersSynchro=Usuarios
-LDAPGroupsSynchro=Grupos
-LDAPContactsSynchro=Contactos
-LDAPMembersSynchro=Miembros
-LDAPSynchronization=Sincronización LDAP
-LDAPFunctionsNotAvailableOnPHP=Las funciones LDAP no están disponibles en su PHP
-LDAPToDolibarr=LDAP -> Dolibarr
-DolibarrToLDAP=Dolibarr -> LDAP
-LDAPNamingAttribute=Clave en LDAP
-LDAPSynchronizeUsers=Organización de los usuarios en LDAP
-LDAPSynchronizeGroups=Organización de los grupos en LDAP
-LDAPSynchronizeContacts=Organización de los contactos en LDAP
-LDAPSynchronizeMembers=Organización de los miembros en LDAP
-LDAPPrimaryServer=Servidor primario
-LDAPSecondaryServer=Servidor secundario
-LDAPServerPort=Puerto del servidor
-LDAPServerPortExample=Puerto por defecto : 389
-LDAPServerProtocolVersion=Versión de protocolo
-LDAPServerUseTLS=Usuario TLS
-LDAPServerUseTLSExample=Su servidor utiliza TLS
-LDAPServerDn=DN del servidor
-LDAPAdminDn=DN del administrador
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
-LDAPPassword=Contraseña del administrador
-LDAPUserDn=DN de los usuarios
-LDAPUserDnExample=DN completo (ej: ou=users,dc=example,dc=com)
-LDAPGroupDn=DN de los grupos
-LDAPGroupDnExample=DN completo (ej: ou=groups,dc=example,dc=com)
-LDAPServerExample=Dirección del servidor (ej: localhost, 192.168.0.2, ldaps://ldap.example.com/)
-LDAPServerDnExample=DN completo (ej: dc=my-domain,dc=com)
-LDAPDnSynchroActive=Sincronización de usuarios y grupos
-LDAPDnSynchroActiveExample=Sincronización LDAP hacia Dolibarr o Dolibarr hacia LDAP
-LDAPDnContactActive=Sincronización de contactos
-LDAPDnContactActiveExample=Sincronización activada/desactivada
-LDAPDnMemberActive=Sincronización de los miembros
-LDAPDnMemberActiveExample=Sincronización activada/desactivada
-LDAPContactDn=DN de los contactos Dolibarr
-LDAPContactDnExample=DN completo (ej: ou=contacts,dc=example,dc=com)
-LDAPMemberDn=DN de los miembros
-LDAPMemberDnExample=DN completo (ex: ou=members,dc=society,dc=com)
-LDAPMemberObjectClassList=Lista de objectClass
-LDAPMemberObjectClassListExample=Lista de ObjectClass que definen los atributos de un registro (ej: top,inetOrgPerson o top,user for active directory)
-LDAPUserObjectClassList=Lista de objectClass
-LDAPUserObjectClassListExample=Lista de ObjectClass que definen los atributos de un registro (ej: top,inetOrgPerson o top,user for active directory)
-LDAPGroupObjectClassList=Lista de objectClass
-LDAPGroupObjectClassListExample=Lista de ObjectClass que definen los atributos de un registro (ej: top,groupOfUniqueNames)
-LDAPContactObjectClassList=Lista de objectClass
-LDAPContactObjectClassListExample=Lista de objectClass que definen los atributos de un registro (ej: top,inetOrgPerson o top,user for active directory)
-LDAPTestConnect=Probar la conexión LDAP
-LDAPTestSynchroContact=Probar la sincronización de contactos
-LDAPTestSynchroUser=Probar la sincronización de usuarios
-LDAPTestSynchroGroup=Probar la sincronización de grupos
-LDAPTestSynchroMember=Probar la sincronización de miembros
-LDAPTestSearch= Probar una búsqueda LDAP
-LDAPSynchroOK=Prueba de sincronización realizada correctamente
-LDAPSynchroKO=Prueba de sincronización erronea
-LDAPSynchroKOMayBePermissions=Error de la prueba de sincronización. Compruebe que la conexión al servidor sea correcta y que permite las actualizaciones LDAP
-LDAPTCPConnectOK=Conexión TCP al servidor LDAP efectuada (Servidor=%s, Puerto=%s)
-LDAPTCPConnectKO=Fallo de conexión TCP al servidor LDAP (Servidor=%s, Puerto=%s)
-LDAPBindOK=Conexión/Autenticación realizada al servidor LDAP (Servidor=%s, Puerto=%s, Admin=%s, Password=%s)
-LDAPBindKO=Fallo de conexión/autentificación al servidor LDAP (Servidor=%s, Puerto=%s, Admin=%s, Password=%s)
-LDAPSetupForVersion3=Servidor LDAP configurado en versión 3
-LDAPSetupForVersion2=Servidor LDAP configurado en versión 2
-LDAPDolibarrMapping=Mapping Dolibarr
-LDAPLdapMapping=Mapping LDAP
-LDAPFieldLoginUnix=Login (unix)
-LDAPFieldLoginExample=Ejemplo : uid
-LDAPFilterConnection=Filtro de búsqueda
-LDAPFilterConnectionExample=Ejemplo : &(objectClass=inetOrgPerson)
-LDAPFieldLoginSamba=Login (samba, activedirectory)
-LDAPFieldLoginSambaExample=Ejemplo : samaccountname
-LDAPFieldFullname=Nombre completo
-LDAPFieldFullnameExample=Ejemplo : cn
-LDAPFieldPasswordNotCrypted=Contraseña no encriptada
-LDAPFieldPasswordCrypted=Contraseña encriptada
-LDAPFieldPasswordExample=Ejemplo : userPassword
-LDAPFieldCommonNameExample=Ejemplo : cn
-LDAPFieldName=Nombre
-LDAPFieldNameExample=Ejemplo : sn
-LDAPFieldFirstName=Nombre
-LDAPFieldFirstNameExample=Ejemplo : givenName
-LDAPFieldMail=E-Mail
-LDAPFieldMailExample=Ejemplo : mail
-LDAPFieldPhone=Teléfono trabajo
-LDAPFieldPhoneExample=Ejemplo : telephonenumber
-LDAPFieldHomePhone=Teléfono personal
-LDAPFieldHomePhoneExample=Ejemplo : homephone
-LDAPFieldMobile=Teléfono móvil
-LDAPFieldMobileExample=Ejemplo : mobile
-LDAPFieldFax=Fax
-LDAPFieldFaxExample=Ejemplo : facsimiletelephonenumber
-LDAPFieldAddress=Dirección
-LDAPFieldAddressExample=Ejemplo : street
-LDAPFieldZip=Código postal
-LDAPFieldZipExample=Ejemplo : postalcode
-LDAPFieldTown=Población
-LDAPFieldTownExample=Ejemplo : l
-LDAPFieldCountry=País
-LDAPFieldDescription=Descripción
-LDAPFieldDescriptionExample=Ejemplo : description
-LDAPFieldNotePublic=Nota Pública
-LDAPFieldNotePublicExample=Ejemplo: publicnote
-LDAPFieldGroupMembers= Miembros del grupo
-LDAPFieldGroupMembersExample= Ejemplo: uniqueMember
-LDAPFieldBirthdate=Fecha de nacimiento
-LDAPFieldCompany=Empresa
-LDAPFieldCompanyExample=Ejemplo : o
-LDAPFieldSid=SID
-LDAPFieldSidExample=Ejemplo : objectsid
-LDAPFieldEndLastSubscription=Fecha finalización como miembro
-LDAPFieldTitle=Job position
-LDAPFieldTitleExample=Ejemplo:titulo
-LDAPSetupNotComplete=Configuración LDAP incompleta (a completar en las otras pestañas)
-LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Administrador o contraseña no indicados. Los accesos LDAP serán anónimos y en solo lectura.
-LDAPDescContact=Esta página permite definir el nombre de los atributos del árbol LDAP para cada información de los contactos Dolibarr.
-LDAPDescUsers=Esta página permite definir el nombre de los atributos del árbol LDAP para cada información de los usuarios Dolibarr.
-LDAPDescGroups=Esta página permite definir el nombre de los atributos del árbol LDAP para cada información de los grupos usuarios Dolibarr.
-LDAPDescMembers=Esta página permite definir el nombre de los atributos del árbol LDAP para cada información de los miembros del módulo Asociaciones Dolibarr.
-LDAPDescValues=Los valores de ejemplos se adaptan a <b>OpenLDAP</b> con los schemas cargados: <b>core.schema, cosine.schema, inetorgperson.schema</b>). Si usted utiliza los a valores sugeridos y OpenLDAP, modifique su archivo de configuración LDAP <b>slapd.conf</b> para tener todos estos schemas activos.
-ForANonAnonymousAccess=Para un acceso autentificado
-PerfDolibarr=Configuración rendimiento/informe de optimización
-YouMayFindPerfAdviceHere=En esta página encontrará varias pruebas y consejos relacionados con el rendimiento.
-NotInstalled=No instalado,  por lo que su servidor no baja de rendimiento con esto.
-ApplicativeCache=Aplicación caché
-MemcachedNotAvailable=No se ha encontrado una aplicación de cache. Puede mejorar el rendimiento instalando un cache server Memcached y un módulo capaz de usar ese servidor de cache.<br>Más información aquí <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Tenga en cuenta que algunos hostings no ofrecen servidores de cache.
-MemcachedModuleAvailableButNotSetup=Módulo memcached para el caché aplicativo encontrado pero la configuración del módulo no está completa.
-MemcachedAvailableAndSetup=Memcached módulo dedicado a utilizar el servidor memcached está disponible.
-OPCodeCache=OPCode caché
-NoOPCodeCacheFound=No se ha encontrado ningún OPCode caché. Puede ser que esté usando otro OPCode como XCache o eAccelerator (mejor), o puede que no tenga OPCode caché (peor).
-HTTPCacheStaticResources=Caché HTTP para estadísticas de recursos (css, img, javascript)
-FilesOfTypeCached=Archivos de tipo %s se almacenan en caché por el servidor HTTP
-FilesOfTypeNotCached=Archivos de tipo %s no se almacenan en caché por el servidor HTTP
-FilesOfTypeCompressed=Archivos de tipo %s son comprimidos por el servidor HTTP
-FilesOfTypeNotCompressed=Archivos de tipo %s no son comprimidos por el servidor HTTP
-CacheByServer=Caché mediante el servidor
-CacheByClient=Caché mediante el navegador
-CompressionOfResources=Compresión de las respuestas HTTP
-TestNotPossibleWithCurrentBrowsers=La detección automática no es posible con el navegador actual
-##### Products #####
-ProductSetup=Configuración del módulo Productos
-ServiceSetup=Configuración del módulo Servicios
-ProductServiceSetup=Configuración de los módulos Productos y Servicios
-NumberOfProductShowInSelect=Nº de productos máx. en las listas (0=sin límite)
-ViewProductDescInFormAbility=Visualización de las descripciones de los productos en los formularios
-MergePropalProductCard=Activar en el producto/servicio la pestaña Documentos una opción para fusionar documentos PDF de productos al presupuesto PDF azur si el producto/servicio se encuentra en el presupuesto
-ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
-UseSearchToSelectProductTooltip=También si usted tiene una gran cantidad de producto (> 100 000), puede aumentar la velocidad mediante el establecimiento PRODUCT_DONOTSEARCH_ANYWHERE constante a 1 en Configuración-> Otros. La búsqueda será limitada a la creación de cadena.
-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)
-SetDefaultBarcodeTypeProducts=Tipo de código de barras utilizado por defecto para los productos
-SetDefaultBarcodeTypeThirdParties=Tipo de código de barras utilizado por defecto para los terceros
-UseUnits=Definir una unidad de medida para la Cantidad en la edición de líneas de pedidos, presupuetos o facturas
-ProductCodeChecker= Módulo para la generación y comprobación del código de un producto o servicio
-ProductOtherConf= Configuración de productos/servicios
-IsNotADir=is not a directory!
-##### Syslog #####
-SyslogSetup=Configuración del módulo Syslog
-SyslogOutput=Salida del log
-SyslogFacility=Facilidad
-SyslogLevel=Nivel
-SyslogFilename=Nombre y ruta del archivo
-YouCanUseDOL_DATA_ROOT=Puede utilizar DOL_DATA_ROOT/dolibarr.log para un registro en el directorio "documentos" de Dolibarr. Sin embargo, puede establecer un directorio diferente para guardar este archivo.
-ErrorUnknownSyslogConstant=La constante %s no es una constante syslog conocida
-OnlyWindowsLOG_USER=Windows sólo soporta LOG_USER
-##### Donations #####
-DonationsSetup=Configuración del módulo donaciones
-DonationsReceiptModel=Modelo recepción de donaciones
-##### Barcode #####
-BarcodeSetup=Configuración de los códigos de barras
-PaperFormatModule=Módulos de formatos de impresión
-BarcodeEncodeModule=Módulos de codificación de los códigos de barras
-CodeBarGenerator=Generador del código
-ChooseABarCode=Ningún generador seleccionado
-FormatNotSupportedByGenerator=Formato no generado por este generador
-BarcodeDescEAN8=Códigos de barras tipo EAN8
-BarcodeDescEAN13=Códigos de barras tipo EAN13
-BarcodeDescUPC=Códigos de barras tipo UPC
-BarcodeDescISBN=Códigos de barras tipo ISBN
-BarcodeDescC39=Códigos de barras tipo C39
-BarcodeDescC128=Códigos de barras tipo C128
-BarcodeDescDATAMATRIX=Códigos de barras tipo Datamatrix
-BarcodeDescQRCODE=Códigos de barras tipo código QR
-GenbarcodeLocation=Herramienta de generación de códigos de barras en consola (usad por el motor interno para determinados tipos de códigos de barras). Debe de ser compatible con "genbarcode".<br>Por ejemplo: /usr/local/bin/genbarcode
-BarcodeInternalEngine=Motor interno
-BarCodeNumberManager=Gestor para auto definir números de código de barras
-##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct debit payment orders
-##### ExternalRSS #####
-ExternalRSSSetup=Configuración de las importaciones del flujo RSS
-NewRSS=Sindicación de un nuevo flujo RSS
-RSSUrl=URL del RSS
-RSSUrlExample=Un flujo RSS interesante
-##### Mailing #####
-MailingSetup=Configuración del módulo E-Mailing
-MailingEMailFrom=E-Mail emisor (From) de los correos enviados por E-Mailing
-MailingEMailError=E-Mail de respuesta (Errors-to) para las respuestas acerca de envíos por e-mailing con error.
-MailingDelay=Segundos de espera después de enviar el mensaje siguiente
-##### Notification #####
-NotificationSetup=Configuración del módulo notificaciones
-NotificationEMailFrom=E-Mail emisor (From) de los correos enviados a través de notificaciones
-FixedEmailTarget=Destinatario fijo
-##### Sendings #####
-SendingsSetup=Configuración del módulo Expediciones
-SendingsReceiptModel=Modelo de notas de entrega
-SendingsNumberingModules=Módulos de numeración de notas de entrega
-SendingsAbility=Soporte de hojas de envío para entregas a clientes
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
-FreeLegalTextOnShippings=Texto libre en envíos
-##### Deliveries #####
-DeliveryOrderNumberingModules=Módulos de numeración de las notas de recepción
-DeliveryOrderModel=Modelo de notas de recepción
-DeliveriesOrderAbility=Uso de notas de recepción
-FreeLegalTextOnDeliveryReceipts=Texto libre en las notas de recepción
-##### FCKeditor #####
-AdvancedEditor=Editor avanzado
-ActivateFCKeditor=Activar editor avanzado para :
-FCKeditorForCompany=Creación/edición WYSIWIG de la descripción y notas de los terceros
-FCKeditorForProduct=Creación/edición WYSIWIG de la descripción y notas de los productos/servicios
-FCKeditorForProductDetails=Creación/edición WYSIWIG de las líneas de detalle de los productos (pedidos, presupuestos, facturas, etc.). <font class="warning">Atención: El uso de esta opción no es recomendable ya que puede crear problemas con los caracteres especiales y el formateo de página al generar archivos PDF.</font>
-FCKeditorForMailing= Creación/edición WYSIWIG de los E-Mails (Utilidades->E-Mailings)
-FCKeditorForUserSignature=Creación/edición WYSIWIG de la firma de usuarios
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
-##### OSCommerce 1 #####
-OSCommerceErrorConnectOkButWrongDatabase=La conexión se ha establecido, pero la base de datos no parece de OSCommerce.
-OSCommerceTestOk=La conexión al servidor '%s' sobre la base '%s' por el usuario '%s' es correcta.
-OSCommerceTestKo1=La conexión al servidor '%s' sobre la base '%s' por el usuario '%s' no se pudo efectuar.
-OSCommerceTestKo2=La conexión al servidor '%s' por el usuario '%s' ha fallado.
-##### Stock #####
-StockSetup=Configuración del módulo Almacenes
-IfYouUsePointOfSaleCheckModule=Si utiliza un módulo de Punto de Venta (módulo TPV por defecto u otro módulo externo), esta configuración puede ser ignorada por su módulo de Punto de Venta. La mayor parte de módulos TPV están diseñados para crear inmediatamente una factura y decrementar stocks cualquiera que sean estas opciones. Por lo tanto, si usted necesita o no decrementar stocks  en el registro de una venta de su punto de venta, controle también la configuración de su módulo TPV.
-##### Menu #####
-MenuDeleted=Menú eliminado
-Menus=Menús
-TreeMenuPersonalized=Menús personalizados
-NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
-NewMenu=Nuevo menú
-Menu=Selección de los menús
-MenuHandler=Gestor de menús
-MenuModule=Módulo origen
-HideUnauthorizedMenu= Ocultar también los menús no autorizados a usuarios internos (si no sólo atenuados)
-DetailId=Identificador del menú
-DetailMenuHandler=Nombre del gestor de menús
-DetailMenuModule=Nombre del módulo si la entrada del menú es resultante de un módulo
-DetailType=Tipo de menú (superior o izquierdo)
-DetailTitre=Etiqueta de menú
-DetailUrl=URL de la página hacia la cual el menú apunta
-DetailEnabled=Condición de mostrar o no
-DetailRight=Condición de visualización completa o restringida
-DetailLangs=Archivo .lang para la traducción del título
-DetailUser=Interno / Externo / Todos
-Target=Destinatario
-DetailTarget=Comportamiento del enlace (_blank para abrir una nueva ventana)
-DetailLevel=Nivel (-1:menú superior, 0:principal, >0 menú y submenú)
-ModifMenu=Modificación del menú
-DeleteMenu=Eliminar entrada de menú
-ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
-FailedToInitializeMenu=Failed to initialize menu
-##### Tax #####
-TaxSetup=Configuración del módulo impuestos sociales o fiscales
-OptionVatMode=Opción de carga de IVA
-OptionVATDefault=Criterio de caja
-OptionVATDebitOption=Criterio de devengo
-OptionVatDefaultDesc=La carga del IVA es: <br>-en el envío de los bienes (en la práctica se usa la fecha de la factura)<br>-sobre el pago por los servicios
-OptionVatDebitOptionDesc=La carga del IVA es: <br>-en el envío de los bienes (en la práctica se usa la fecha de la factura)<br>-sobre la facturación de los servicios
-SummaryOfVatExigibilityUsedByDefault=Tiempo de exigibilidad de IVA por defecto según la opción eligida
-OnDelivery=En la entrega
-OnPayment=En el pago
-OnInvoice=En la factura
-SupposedToBePaymentDate=Fecha de pago usada
-SupposedToBeInvoiceDate=Fecha de factura usada
-Buy=Compra
-Sell=Venta
-InvoiceDateUsed=Fecha usada de factura
-YourCompanyDoesNotUseVAT=Su empresa está configurada como no sujeta al IVA (Inicio - Configuración - Empresa/Institución), por lo que no hay opción para la paremetrización del IVA.
-AccountancyCode=Código contable
-AccountancyCodeSell=Código contable ventas
-AccountancyCodeBuy=Código contable compras
-##### Agenda #####
-AgendaSetup=Módulo configuración de acciones y agenda
-PasswordTogetVCalExport=Clave de autorización vcal export link
-PastDelayVCalExport=No exportar los eventos de más de
-AGENDA_USE_EVENT_TYPE=Usar tipos de evento (gestionados en el menú Configuración->Diccionarios->Tipos de eventos de la agenda)
-AGENDA_USE_EVENT_TYPE_DEFAULT=Set automatically this default value for type of event into event create form
-AGENDA_DEFAULT_FILTER_TYPE=Establecer por defecto este tipo de evento en el filtro de búsqueda en la vista de la agenda
-AGENDA_DEFAULT_FILTER_STATUS=Establecer por defecto este estado de eventos en el filtro de búsqueda en la vista de la agenda
-AGENDA_DEFAULT_VIEW=Establecer la pestaña por defecto al seleccionar el menú Agenda
-AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
-AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### Clicktodial #####
-ClickToDialSetup=Configuración del módulo Click To Dial
-ClickToDialUrlDesc=URL de llamada haciendo click en el icono teléfono. <br>La URL completa de llamada será: URL?login=...&password=...&caller=...&called=telellamada
-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.
-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 same computer than 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.
-##### Point Of Sales (CashDesk) #####
-CashDesk=TPV
-CashDeskSetup=Configuración del módulo Terminal Punto de Venta
-CashDeskThirdPartyForSell=Tercero genérico a usar para las ventas
-CashDeskBankAccountForSell=Cuenta por defecto a utilizar para los cobros en efectivo (caja)
-CashDeskBankAccountForCheque= Cuenta por defecto a utilizar para los cobros con cheques
-CashDeskBankAccountForCB= Cuenta por defecto a utilizar para los cobros con tarjeta de crédito
-CashDeskDoNotDecreaseStock=Desactivar decremento de stock si una venta es realizada desde un Punto de Venta (si "no", el decremento de stock es realizado desde el TPV,  cualquiera que sea la opción indicada en el módulo Stock).
-CashDeskIdWareHouse=Forzar y restringir almacén a usar para decremento de stock
-StockDecreaseForPointOfSaleDisabled=Decremento de stock desde TPV desactivado
-StockDecreaseForPointOfSaleDisabledbyBatch=El decremento de stock en TPV no es compatible con la gestión de lotes
-CashDeskYouDidNotDisableStockDecease=Usted no ha desactivado el decremento de stock al hacer una venta desde TPV. Así que se requiere un almacén.
-##### Bookmark #####
-BookmarkSetup=Configuración del módulo Marcadores
-BookmarkDesc=Este módulo le permite gestionar los enlaces y accesos directos. También permite añadir cualquier página de Dolibarr o enlace web en el menú de acceso rápido de la izquierda.
-NbOfBoomarkToShow=Número máximo de marcadores que se mostrará en el menú
-##### WebServices #####
-WebServicesSetup=Configuración del módulo Web services
-WebServicesDesc=Mediante la activación de este módulo, Dolibarr se convierte en servidor de servicios web ofreciendo diversos servicios web.
-WSDLCanBeDownloadedHere=La descripción WSDL de los servicios prestados se pueden recuperar aquí
-EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
-##### API ####
-ApiSetup=Configuración del módulo API
-ApiDesc=Mediante la activación de este módulo, Dolibarr se convierte en un servidor REST ofreciendo diversos servicios web.
-ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
-OnlyActiveElementsAreExposed=Sólo son expuestos los elementos de los módulos activos
-ApiKey=Clave para API
-WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
-##### Bank #####
-BankSetupModule=Configuración del módulo Banco
-FreeLegalTextOnChequeReceipts=Mención complementaria en las remesas de cheques
-BankOrderShow=Orden de visualización de la información bancaria al usar la "cuenta bancaria detallada"
-BankOrderGlobal=General
-BankOrderGlobalDesc=Orden de visualización general
-BankOrderES=Español
-BankOrderESDesc=Orden de visualización español
-ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
-##### Multicompany #####
-MultiCompanySetup=Configuración del módulo Multi-empresa
-##### Suppliers #####
-SuppliersSetup=Configuración del módulo Proveedores
-SuppliersCommandModel=Modelo de pedidos a proveedores completo (logo...)
-SuppliersInvoiceModel=Modelo de facturas de proveedores completo (logo...)
-SuppliersInvoiceNumberingModel=Modelos de numeración de facturas de proveedor
-IfSetToYesDontForgetPermission=Si está seleccionado, no olvides de modificar los permisos en los grupos o usuarios para permitir la segunda aprobación
-##### GeoIPMaxmind #####
-GeoIPMaxmindSetup=Configuración del módulo GeoIP Maxmind
-PathToGeoIPMaxmindCountryDataFile=Ruta del archivo Maxmind que contiene las conversiones IP->País.<br>Ejemplo: /usr/local/share/GeoIP/GeoIP.dat
-NoteOnPathLocation=Tenga en cuenta que este archivo debe estar en un directorio accesible desde su PHP (Compruebe la configuración de open_basedir de su PHP y los permisos de archivo/directorios).
-YouCanDownloadFreeDatFileTo=Puede descargarse una <b>versión demo gratuita</b> del archivo de países Maxmind GeoIP en la dirección %s.
-YouCanDownloadAdvancedDatFileTo=También puede descargarse una <b>versión más completa</b> del archivo de países Maxmind GeoIP en la dirección %s.
-TestGeoIPResult=Test de conversión IP -> País
-##### Projects #####
-ProjectsNumberingModules=Módulo de numeración para las referencias de los proyectos
-ProjectsSetup=Configuración del módulo Proyectos
-ProjectsModelModule=Modelo de documento para informes de proyectos
-TasksNumberingModules=Módulo numeración de tareas
-TaskModelModule=Módulo de documentos informes de tareas
-UseSearchToSelectProject=Utilice los campos de autocompletar para seleccionar proyectos (en lugar de utilizar un cuadro de lista).
-##### ECM (GED) #####
-##### Fiscal Year #####
-AccountingPeriods=Accounting periods
-AccountingPeriodCard=Accounting period
-NewFiscalYear=New accounting period
-OpenFiscalYear=Open accounting period
-CloseFiscalYear=Close accounting period
-DeleteFiscalYear=Delete accounting period
-ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
-ShowFiscalYear=Show accounting period
-AlwaysEditable=Puede editarse siempre
-MAIN_APPLICATION_TITLE=Forzar visibilidad del nombre de aplicación (advertencia: indicar su propio nombre aquí puede romper la característica de relleno automático de inicio de sesión al utilizar la aplicación móvil DoliDroid)
-NbMajMin=Número mínimo de caracteres en mayúsculas
-NbNumMin=Número mínimo de caracteres numéricos
-NbSpeMin=Número mínimo de caracteres especiales
-NbIteConsecutive=Número máximo de repeticiones de los mismos caracteres
-NoAmbiCaracAutoGeneration=No usar caracteres ambiguos ("1","l","i","|","0","O") para la generación automática
-SalariesSetup=Configuración del módulo salarios
-SortOrder=Ordenación
-Format=Formatear
-TypePaymentDesc=0:Pago cliente,1:Pago proveedor,2:Tanto pago de cliente como de proveedor
-IncludePath=Include path (definida en la variable %s)
-ExpenseReportsSetup=Configuración del módulo Informe de Gastos
-TemplatePDFExpenseReports=Modelos de documento para generar informes de gastos
-NoModueToManageStockIncrease=No hay activado módulo para gestionar automáticamente el incremento de stock. El incremento de stock se realizará solamente con entrada manual
-YouMayFindNotificationsFeaturesIntoModuleNotification=Puede encontrar opciones para notificaciones de e-mail activando y configurando el módulo  "Notificaciones".
-ListOfNotificationsPerUser=List of notifications per user*
-ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
-ListOfFixedNotifications=Listado de notificaciones fijas
-GoOntoUserCardToAddMore=Go on 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 contacts/addresses
-Threshold=Valor mínimo/umbral
-BackupDumpWizard=Asistente para crear una copia de seguridad de la base de datos
-SomethingMakeInstallFromWebNotPossible=No es posible la instalación de módulos externos desde la interfaz web por la siguiente razón:
-SomethingMakeInstallFromWebNotPossible2=Por esta razón, explicaremos aquí los pasos del proceso de actualización manual que puede realizar un usuario con privilegios.
-InstallModuleFromWebHasBeenDisabledByFile=La instalación de módulos externos desde la aplicación se encuentra desactivada por el administrador. Debe requerirle que elimine el archivo <strong>%s</strong> para habilitar esta funcionalidad.
-ConfFileMuseContainCustom=Installing 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=Resaltar líneas de los listados cuando el ratón pasa por encima de ellas
-HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Color of page title
-LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
-NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
-BackgroundColor=Color de fondo
-TopMenuBackgroundColor=Color de fondo para el Menú superior
-TopMenuDisableImages=Hide images in Top menu
-LeftMenuBackgroundColor=Color de fondo para el Menú izquierdo
-BackgroundTableTitleColor=Background color for Table title line
-BackgroundTableLineOddColor=Color de fondo para líneas de tabla odd
-BackgroundTableLineEvenColor=Color de fondo para todas las líneas de tabl
-MinimumNoticePeriod=Período mínimo de notificación (Su solicitud de licencia debe hacerse antes de este período)
-NbAddedAutomatically=Número de días adicionales que se añaden automáticamente a los contadores de usuarios cada mes
-EnterAnyCode=Este campo contiene una referencia para identificar la línea. Introduzca cualquier valor de su elección, pero sin caracteres especiales.
-UnicodeCurrency=Ingrese aquí entre llaves, lista con número de byte que representa el símbolo de moneda. Por ejemplo: para $, introduzca [36] - para Brasil Real R$ [82,36] - para €, introduzca [8364]
-PositionIntoComboList=Posición de la línea en listas de combo
-SellTaxRate=Tasa de IVA
-RecuperableOnly=Sí para el IVA "Non Perçue Récupérable" usados en algunas provincias en Francia. Mantenga el valor a "No" en los demás casos.
-UrlTrackingDesc=Si el proveedor o el servicio de transporte ofrecen una página o un sitio web para comprobar el estado de su envío, puede indicarlo aquí. Puede utilizar la tecla {TRACKID} en los parámetros de URL y el sistema lo reemplazará con el valor del número de seguimiento introducido en la ficha de envío.
-OpportunityPercent=Cuando crea una oportunidad, defina una cantidad estimada del proyecto/lead. De acuerdo con el estado de la oportunidad, esta cantidad puede ser multiplicateda por esta tasa para evaluar importe global que todas sus oportunidades pueden generar. El valor es por ciento (entre 0 y 100).
-TemplateForElement=Este registro de plantilla se dedica a qué elemento
-TypeOfTemplate=Tipo de plantilla
-TemplateIsVisibleByOwnerOnly=La plantilla es visible solamente por el propietario
-FixTZ=Corrección de zona horaria
-FillFixTZOnlyIfRequired=Ejemplo: +2 (complete sólo si tiene problemas)
-ExpectedChecksum=Esperando la suma de comprobación
-CurrentChecksum=Suma de comprobación actual
-ForcedConstants=Required constant values
-MailToSendProposal=Para enviar presupuesto a cliente
-MailToSendOrder=Para enviar pedido de cliente
-MailToSendInvoice=Para enviar factura a cliente
-MailToSendShipment=Para enviar envío
-MailToSendIntervention=Para enviar intervención
-MailToSendSupplierRequestForQuotation=Para enviar solicitud de presupuesto de proveedor
-MailToSendSupplierOrder=Para enviar pedido a proveedor
-MailToSendSupplierInvoice=Para enviar factura de proveedor
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the latest stable version
-TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
-TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so 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 usefull only if your prices for each leve 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.
-SeeSubstitutionVars=See * note for list of possible substitution variables
-AllPublishers=All publishers
-UnknownPublishers=Unknown publishers
-AddRemoveTabs=Add or remove tabs
-AddDictionaries=Add dictionaries
-AddBoxes=Add widgets
-AddSheduledJobs=Add scheduled jobs
-AddHooks=Add hooks
-AddTriggers=Add triggers
-AddMenus=Add menus
-AddPermissions=Add permissions
-AddExportProfiles=Add export profiles
-AddImportProfiles=Add import profiles
-AddOtherPagesOrServices=Add other pages or services
-AddModels=Add document or numbering templates
-AddSubstitutions=Add keys substitutions
-DetectionNotPossible=Detection not possible
-UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved on 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 correclty. 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 inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <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
-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
-TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
-##### Resource ####
-ResourceSetup=Configuration du module Resource
-UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
diff --git a/htdocs/langs/es_VE/main.lang b/htdocs/langs/es_VE/main.lang
index 75205265f83..749498bb3d6 100644
--- a/htdocs/langs/es_VE/main.lang
+++ b/htdocs/langs/es_VE/main.lang
@@ -1,9 +1,5 @@
 # Dolibarr language file - Source file is en_US - main
 DIRECTION=ltr
-# Note for Chinese:
-# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
-# stsongstdlight or cid0cs are for simplified Chinese
-# To read Chinese pdf with Linux: sudo apt-get install poppler-data
 FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=,
@@ -23,799 +19,18 @@ FormatDateHourShort=%d/%m/%Y %H:%M
 FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
-DatabaseConnection=Conexión a la base de datos
-NoTemplateDefined=No template defined for this email type
-AvailableVariables=Available substitution variables
-NoTranslation=Sin traducción
-NoRecordFound=No se han encontrado registros
-NoRecordDeleted=No record deleted
-NotEnoughDataYet=Not enough data
-NoError=Ningún error
-Error=Error
-Errors=Errores
-ErrorFieldRequired=El campo '%s' es obligatorio
-ErrorFieldFormat=El campo '%s' tiene un valor incorrecto
-ErrorFileDoesNotExists=El archivo %s no existe
-ErrorFailedToOpenFile=Imposible abrir el archivo %s
-ErrorCanNotCreateDir=Cannot create dir %s
-ErrorCanNotReadDir=Cannot read dir %s
-ErrorConstantNotDefined=Parámetro %s no definido
-ErrorUnknown=Error desconocido
-ErrorSQL=Error de SQL
-ErrorLogoFileNotFound=El archivo logo '%s' no se encuentra
-ErrorGoToGlobalSetup=Vaya a la Configuración ' Empresa/Institución ' para corregir
-ErrorGoToModuleSetup=Vaya a la configuración del módulo para corregir
-ErrorFailedToSendMail=Error en el envío del e-mail (emisor=%s, destinatario=%s)
-ErrorFileNotUploaded=El archivo no se ha podido transferir
-ErrorInternalErrorDetected=Error detectado
-ErrorWrongHostParameter=Parámetro Servidor inválido
-ErrorYourCountryIsNotDefined=Su país no está definido. Corríjalo yendo a Inicio-Configuración-Empresa/Institución-Editar
-ErrorRecordIsUsedByChild=Imposible de suprimir este registro. Esta siendo utilizado como padre por al menos un registro hijo.
-ErrorWrongValue=Valor incorrecto
-ErrorWrongValueForParameterX=Valor incorrecto del parámetro %s
-ErrorNoRequestInError=Ninguna petición en error
-ErrorServiceUnavailableTryLater=Servicio no disponible actualmente. Vuélvalo a intentar más tarde.
-ErrorDuplicateField=Duplicado en un campo único
-ErrorSomeErrorWereFoundRollbackIsDone=Se encontraron algunos errores. Modificaciones deshechas.
-ErrorConfigParameterNotDefined=El parámetro <b>%s</b> no está definido en el archivo de configuración Dolibarr <b>conf.php</b>.
-ErrorCantLoadUserFromDolibarrDatabase=Imposible encontrar el usuario <b>%s</b> en la base de datos Dolibarr.
-ErrorNoVATRateDefinedForSellerCountry=Error, ningún tipo de IVA definido para el país '%s'.
-ErrorNoSocialContributionForSellerCountry=Error, ningún tipo de tasa social/fiscal definida para el país '%s'.
-ErrorFailedToSaveFile=Error, el registro del archivo falló.
-ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
-NotAuthorized=You are not authorized to do that.
-SetDate=Fijar fecha
-SelectDate=Seleccione una fecha
-SeeAlso=Ver también %s
-SeeHere=Vea aquí
-Apply=Aplicar
-BackgroundColorByDefault=Color de fondo
-FileRenamed=The file was successfully renamed
-FileUploaded=El archivo se ha subido correctamente
-FileGenerated=The file was successfully generated
-FileWasNotUploaded=Un archivo ha sido seleccionado para adjuntarlo, pero aún no se ha subido. Haga clic en "Adjuntar este archivo" para ello.
-NbOfEntries=Nº de entradas
-GoToWikiHelpPage=Read online help (Internet access needed)
-GoToHelpPage=Consultar la ayuda
-RecordSaved=Registro guardado
-RecordDeleted=Registro eliminado
-LevelOfFeature=Nivel de funciones
-NotDefined=No definida
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
-Administrator=Administrador
-Undefined=No definido
-PasswordForgotten=Password forgotten?
-SeeAbove=Mencionado anteriormente
-HomeArea=Área inicio
-LastConnexion=Latest connection
-PreviousConnexion=Conexión anterior
-PreviousValue=Previous value
-ConnectedOnMultiCompany=Conexión a la entidad
-ConnectedSince=Conectado desde
-AuthenticationMode=Authentication mode
-RequestedUrl=Requested URL
-DatabaseTypeManager=Tipo de gestor de base de datos
-RequestLastAccessInError=Latest database access request error
-ReturnCodeLastAccessInError=Return code for latest database access request error
-InformationLastAccessInError=Information for latest database access request error
-DolibarrHasDetectedError=Dolibarr ha detectado un error técnico
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes
-MoreInformation=Más información
-TechnicalInformation=Información técnica
-TechnicalID=Technical ID
-NotePublic=Nota (pública)
-NotePrivate=Nota (privada)
-PrecisionUnitIsLimitedToXDecimals=Dolibarr está configurado para limitar la precisión de los precios unitarios a <b>%s</b> decimales.
-DoTest=Probar
-ToFilter=Filtrar
-NoFilter=No filter
-WarningYouHaveAtLeastOneTaskLate=Atención, tiene al menos un elemento que ha pasado la fecha de tolerancia.
-yes=sí
-Yes=Sí
-no=no
-No=No
-All=Todo
-Home=Inicio
-Help=Ayuda
-OnlineHelp=Ayuda en línea
-PageWiki=Página Wiki
-MediaBrowser=Media browser
-Always=Siempre
-Never=Nunca
-Under=Bajo
-Period=Periodo
-PeriodEndDate=Fecha fin periodo
-Activate=Activar
-Activated=Activado
-Closed=Cerrado
-Closed2=Cerrado
-NotClosed=Not closed
-Enabled=Activado
-Deprecated=Obsoleto
-Disable=Desactivar
-Disabled=Desactivado
-Add=Añadir
-AddLink=Enlazar
-RemoveLink=Eliminar enlace
-AddToDraft=Add to draft
-Update=Modificar
-Close=Cerrar
-CloseBox=Remove widget from your dashboard
-Confirm=Confirmar
-ConfirmSendCardByMail=Do you really want to send content of this card by mail to <b>%s</b>?
-Delete=Eliminar
-Remove=Retirar
-Resiliate=Terminate
-Cancel=Anular
-Modify=Modificar
-Edit=Editar
-Validate=Validar
-ValidateAndApprove=Validar y Aprobar
-ToValidate=A validar
-Save=Grabar
-SaveAs=Grabar como
-TestConnection=Probar la conexión
-ToClone=Copiar
-ConfirmClone=Seleccione los datos que desea copiar:
-NoCloneOptionsSpecified=No hay datos definidos para copiar
-Of=de
-Go=Ir
-Run=Lanzar
-CopyOf=Copia de
-Show=Ver
-Hide=Hide
-ShowCardHere=Ver la ficha aquí
-Search=Buscar
-SearchOf=Búsqueda de
-Valid=Validar
-Approve=Aprobar
-Disapprove=Desaprobar
-ReOpen=Reabrir
-Upload=Enviar archivo
-ToLink=Enlace
-Select=Seleccionar
-Choose=Elegir
-Resize=Redimensionar
-Recenter=Encuadrar
-Author=Autor
-User=Usuario
-Users=Usuarios
-Group=Grupo
-Groups=Grupos
-NoUserGroupDefined=No hay definido grupo de usuarios
-Password=Contraseña
-PasswordRetype=Repetir contraseña
-NoteSomeFeaturesAreDisabled=Atención, sólo unos pocos módulos/funcionalidades han sido activados en esta demo.
-Name=Nombre
-Person=Persona
-Parameter=Parámetro
-Parameters=Parámetros
-Value=Valor
-PersonalValue=Valor personalizado
-NewValue=Nuevo valor
-CurrentValue=Valor actual
-Code=Código
-Type=Tipo
-Language=Idioma
-MultiLanguage=Multiidioma
-Note=Nota
-Title=Título
-Label=Etiqueta
-RefOrLabel=Ref. o etiqueta
-Info=Log
-Family=Familia
-Description=Descripción
-Designation=Descripción
-Model=Doc template
-DefaultModel=Default doc template
-Action=Acción
-About=Acerca de
-Number=Número
-NumberByMonth=Número por mes
-AmountByMonth=Importe por mes
-Numero=Número
-Limit=Límite
-Limits=Límites
-Logout=Desconexión
-NoLogoutProcessWithAuthMode=Sin funcionalidades de desconexión con el modo de autenticación <b>%s</b>
-Connection=Conexión
-Setup=Configuración
-Alert=Alerta
-Previous=Anterior
-Next=Siguiente
-Cards=Fichas
-Card=Ficha
-Now=Ahora
-HourStart=Hora de inicio
-Date=Fecha
-DateAndHour=Fecha y hora
-DateToday=Today's date
-DateReference=Reference date
-DateStart=Fecha de inicio
 DateEnd=Fecha finalización
-DateCreation=Fecha de creación
-DateCreationShort=Creat. date
-DateModification=Fecha de modificación
-DateModificationShort=Fecha modif.
-DateLastModification=Latest modification date
-DateValidation=Fecha de validación
-DateClosing=Fecha de cierre
-DateDue=Fecha de vencimiento
-DateValue=Fecha valor
-DateValueShort=Fecha valor
-DateOperation=Fecha operación
-DateOperationShort=Fecha op.
-DateLimit=Fecha límite
-DateRequest=Fecha consulta
-DateProcess=Fecha proceso
-DateBuild=Fecha generación del informe
-DatePayment=Fecha pago
-DateApprove=Fecha de aprobación
-DateApprove2=Fecha de aprobación (segunda aprobación)
-UserCreation=Creation user
-UserModification=Modification user
-UserCreationShort=Creat. user
-UserModificationShort=Modif. user
-DurationYear=año
-DurationMonth=mes
-DurationWeek=semana
-DurationDay=día
-DurationYears=años
-DurationMonths=meses
-DurationWeeks=semanas
-DurationDays=días
-Year=Año
-Month=Mes
-Week=Semana
-WeekShort=Semana
-Day=Día
-Hour=Hora
-Minute=Minuto
-Second=Segundo
-Years=Años
-Months=Meses
-Days=Días
-days=días
-Hours=Horas
-Minutes=Minutos
-Seconds=Segundos
-Weeks=Semanas
-Today=Hoy
-Yesterday=Ayer
-Tomorrow=Mañana
-Morning=Mañana
-Afternoon=Tarde
-Quadri=Trimestre
-MonthOfDay=Mes del día
-HourShort=H
-MinuteShort=min
-Rate=Tipo
-CurrencyRate=Currency conversion rate
-UseLocalTax=Incluir tasas
-Bytes=Bytes
-KiloBytes=Kilobytes
-MegaBytes=Megabytes
-GigaBytes=Gigabytes
-TeraBytes=Terabytes
-b=b.
-Kb=Kb
-Mb=Mb
-Gb=Gb
-Tb=Tb
-Cut=Cortar
-Copy=Copiar
-Paste=Pegar
-Default=Predeterminado
-DefaultValue=Valor por defecto
-Price=Precio
-UnitPrice=Precio unitario
-UnitPriceHT=Precio base
-UnitPriceTTC=Precio unitario total
-PriceU=P.U.
-PriceUHT=P.U.
-PriceUHTCurrency=U.P (currency)
-PriceUTTC=P.U. (i.i.)
-Amount=Importe
-AmountInvoice=Importe factura
-AmountPayment=Importe pago
-AmountHTShort=Base imp.
-AmountTTCShort=Importe
-AmountHT=Base imponible
-AmountTTC=Importe total
-AmountVAT=Importe IVA
-MulticurrencyAlreadyPaid=Already payed, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
-MulticurrencyAmountHT=Amount (net of tax), original currency
-MulticurrencyAmountTTC=Amount (inc. of tax), original currency
-MulticurrencyAmountVAT=Amount tax, original currency
-AmountLT1=Importe Impuesto 2
-AmountLT2=Importe Impuesto 3
 AmountLT1ES=Importe de retención
 AmountLT2ES=Importe ISLR
-AmountTotal=Importe total
-AmountAverage=Importe medio
-PriceQtyMinHT=Precio cantidad min. total
-Percentage=Porcentaje
-Total=Total
-SubTotal=Subtotal
-TotalHTShort=Importe
-TotalHTShortCurrency=Total (net in currency)
-TotalTTCShort=Total
-TotalHT=Base imponible
-TotalHTforthispage=Total (base imponible) de esta página
-Totalforthispage=Total for this page
-TotalTTC=Total
-TotalTTCToYourCredit=Total a crédito
-TotalVAT=Total IVA
-TotalLT1=Total Impuesto 2
-TotalLT2=Total Impuesto 3
 TotalLT1ES=Total retenido
 TotalLT2ES=Total ISLR
-HT=Sin IVA
-TTC=IVA incluido
-VAT=IVA
-VATs=Tasas sobre ventas
 LT1ES=Retención
 LT2ES=ISLR
-VATRate=Tasa IVA
-Average=Media
-Sum=Suma
-Delta=Diferencia
-Module=Módulo
-Option=Opción
-List=Listado
-FullList=Listado completo
-Statistics=Estadísticas
-OtherStatistics=Otras estadísticas
-Status=Estado
-Favorite=Favorito
-ShortInfo=Info.
-Ref=Ref.
-ExternalRef=Ref. externa
-RefSupplier=Ref. proveedor
-RefPayment=Ref. pago
-CommercialProposalsShort=Presupuestos
-Comment=Comentario
-Comments=Comentarios
-ActionsToDo=Eventos a realizar
-ActionsToDoShort=A realizar
-ActionsDoneShort=Realizadas
-ActionNotApplicable=No aplicable
-ActionRunningNotStarted=No empezado
-ActionRunningShort=In progress
-ActionDoneShort=Terminado
-ActionUncomplete=Incompleto
-CompanyFoundation=Empresa o institución
-ContactsForCompany=Contactos de este tercero
-ContactsAddressesForCompany=Contactos/direcciones de este tercero
-AddressesForCompany=Direcciones de este tercero
-ActionsOnCompany=Eventos respecto a este tercero
-ActionsOnMember=Eventos respecto a este miembro
-NActionsLate=%s en retraso
-RequestAlreadyDone=Solicitud ya registrada
-Filter=Filtro
-FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
-RemoveFilter=Eliminar filtro
-ChartGenerated=Gráficos generados
-ChartNotGenerated=Gráfico no generado
-GeneratedOn=Generado el %s
-Generate=Generar
-Duration=Duración
-TotalDuration=Duración total
-Summary=Resumen
-DolibarrStateBoard=Estadísticas
-DolibarrWorkBoard=Indicadores de trabajo
-Available=Disponible
-NotYetAvailable=Aún no disponible
-NotAvailable=No disponible
-Categories=Etiquetas/Categorías
-Category=Etiqueta/Categoría
-By=Por
-From=De
-to=a
-and=y
-or=o
-Other=Otro
-Others=Otros
-OtherInformations=Otras informaciones
-Quantity=Cantidad
-Qty=Cant.
-ChangedBy=Modificado por
-ApprovedBy=Aprobado por
-ApprovedBy2=Aprobado por (segunda aprobación)
-Approved=Aprobado
-Refused=Rechazado
-ReCalculate=Recalcular
-ResultKo=Error
-Reporting=Informe
-Reportings=Informes
-Draft=Borrador
-Drafts=Borradores
-Validated=Validado
-Opened=Opened
-New=Nuevo
-Discount=Descuento
-Unknown=Desconocido
-General=General
-Size=Tamaño
-Received=Recibido
-Paid=Pagado
-Topic=Subject
-ByCompanies=Por empresa
-ByUsers=Por usuario
-Links=Enlaces
-Link=Enlace
-Rejects=Devoluciones
-Preview=Vista previa
-NextStep=Siguiente paso
-Datas=Datos
-None=Nada
-NoneF=Ninguna
-Late=Retraso
-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.
-Photo=Foto
-Photos=Fotos
-AddPhoto=Añadir foto
-DeletePicture=Eliminar imagen
-ConfirmDeletePicture=¿Confirma la eliminación de la imagen?
-Login=Login
-CurrentLogin=Login actual
-EnterLoginDetail=Enter login details
-January=enero
-February=febrero
-March=marzo
-April=abril
-May=mayo
-June=junio
-July=julio
-August=agosto
-September=septiembre
-October=octubre
-November=noviembre
-December=Diciembre
-JanuaryMin=Ene
-FebruaryMin=Feb
-MarchMin=Mar
-AprilMin=Abr
-MayMin=May
-JuneMin=Jun
-JulyMin=Jul
-AugustMin=Ago
-SeptemberMin=Sep
-OctoberMin=Oct
-NovemberMin=Nov
-DecemberMin=Dic
-Month01=enero
-Month02=febrero
-Month03=marzo
-Month04=abril
-Month05=mayo
-Month06=junio
-Month07=julio
-Month08=agosto
-Month09=septiembre
-Month10=octubre
-Month11=noviembre
-Month12=diciembre
-MonthShort01=ene.
-MonthShort02=feb.
-MonthShort03=mar.
-MonthShort04=abr.
-MonthShort05=may.
-MonthShort06=jun.
-MonthShort07=jul.
-MonthShort08=ago.
-MonthShort09=sep.
-MonthShort10=oct.
-MonthShort11=nov.
-MonthShort12=dic.
-AttachedFiles=Archivos y documentos adjuntos
-FileTransferComplete=Se transfirió correctamente el archivo
-DateFormatYYYYMM=YYYY-MM
-DateFormatYYYYMMDD=YYYY-MM-DD
-DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
-ReportName=Nombre del informe
-ReportPeriod=Periodo de análisis
-ReportDescription=Descripción
-Report=Informe
-Keyword=Keyword
-Origin=Origin
-Legend=Leyenda
-Fill=Rellenar
-Reset=Vaciar
-File=Archivo
-Files=Archivos
-NotAllowed=No autorizado
-ReadPermissionNotAllowed=Lectura no autorizada
-AmountInCurrency=Importes visualizados en %s
-Example=Ejemplo
-Examples=Ejemplos
-NoExample=Sin ejemplo
+Opened=Abierta
 FindBug=Señalar un bug
-NbOfThirdParties=Número de terceros
-NbOfLines=Números de líneas
-NbOfObjects=Número de objetos
-NbOfObjectReferers=Number of related items
-Referers=Related items
-TotalQuantity=Cantidad total
-DateFromTo=De %s a %s
-DateFrom=A partir de %s
-DateUntil=Hasta %s
-Check=Verificar
-Uncheck=Deseleccionar
-Internal=Interno
-External=Externo
-Internals=Internos
-Externals=Externos
-Warning=Alerta
-Warnings=Alertas
-BuildDoc=Generar el documento
-Entity=Entidad
-Entities=Entidades
-CustomerPreview=Historial cliente
-SupplierPreview=Historial proveedor
-ShowCustomerPreview=Ver historial cliente
-ShowSupplierPreview=Ver historial proveedor
-RefCustomer=Ref. cliente
-Currency=Divisa
-InfoAdmin=Información para los administradores
-Undo=Anular
-Redo=Rehacer
-ExpandAll=Expandir todo
-UndoExpandAll=Contraer todo
-Reason=Razón
-FeatureNotYetSupported=Funcionalidad aún no soportada
-CloseWindow=Cerrar ventana
-Response=Respuesta
-Priority=Prioridad
-SendByMail=Enviar por e-mail
-MailSentBy=Mail enviado por
-TextUsedInTheMessageBody=Texto utilizado en el cuerpo del mensaje
-SendAcknowledgementByMail=Send confirmation email
-EMail=E-mail
-NoEMail=Sin e-mail
-Email=Correo
-NoMobilePhone=Sin teléfono móvil
-Owner=Propietario
-FollowingConstantsWillBeSubstituted=Las siguientes constantes serán substituidas por su valor correspondiente.
-Refresh=Refrescar
-BackToList=Volver al listado
-GoBack=Volver atrás
-CanBeModifiedIfOk=Puede modificarse si es valido
-CanBeModifiedIfKo=Puede modificarse si no es valido
-ValueIsValid=Valor válido
-ValueIsNotValid=Value is not valid
-RecordCreatedSuccessfully=Record created successfully
-RecordModifiedSuccessfully=Registro modificado con éxito
-RecordsModified=%s record modified
-RecordsDeleted=%s record deleted
-AutomaticCode=Creación automática de código
-FeatureDisabled=Función desactivada
-MoveBox=Move widget
-Offered=Oferta
-NotEnoughPermissions=No tiene permisos para esta acción
-SessionName=Nombre sesión
-Method=Método
-Receive=Recepción
-CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
-ExpectedValue=Expected Value
-CurrentValue=Valor actual
-PartialWoman=Parcial
-TotalWoman=Total
-NeverReceived=Nunca recibido
-Canceled=Cancelado
-YouCanChangeValuesForThisListFromDictionarySetup=Puede cambiar estos valores en el menú configuración->diccionarios
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
-Color=Color
-Documents=Documentos
-Documents2=Documentos
-UploadDisabled=Subida desactivada
-MenuECM=Documentos
-MenuAWStats=AWStats
-MenuMembers=Miembros
-MenuAgendaGoogle=Agenda Google
-ThisLimitIsDefinedInSetup=Límite Dolibarr (Menú inicio-configuración-seguridad): %s Kb, PHP limit: %s Kb
-NoFileFound=No hay documentos guardados en este directorio
-CurrentUserLanguage=Idioma actual
-CurrentTheme=Tema actual
-CurrentMenuManager=Gestor menú actual
-Browser=Navegador
-Layout=Layout
-Screen=Screen
-DisabledModules=Módulos desactivados
-For=Para
-ForCustomer=Para cliente
-Signature=Firma
-DateOfSignature=Date of signature
-HidePassword=Mostrar comando con contraseña oculta
-UnHidePassword=Mostrar comando con contraseña a la vista
-Root=Raíz
-Informations=Información
-Page=Página
-Notes=Notas
-AddNewLine=Añadir nueva línea
-AddFile=Añadir archivo
-FreeZone=Entrada libre
-FreeLineOfType=Entrada libre del tipo
-CloneMainAttributes=Clonar el objeto con estos atributos principales
-PDFMerge=Fusión PDF
-Merge=Fusión
-PrintContentArea=Mostrar página de impresión de la zona central
-MenuManager=Gestor de menú
-WarningYouAreInMaintenanceMode=Atención, está en modo mantenimiento, así que solamente el login <b>%s</b> está autorizado para utilizar la aplicación en este momento.
-CoreErrorTitle=Error del sistema
-CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
-CreditCard=Tarjeta de crédito
-FieldsWithAreMandatory=Los campos marcados por un <b>%s</b> son obligatorios
-FieldsWithIsForPublic=Los campos marcados por <b>%s</b> se mostrarán en la lista pública de miembros. Si no desea verlos, desactive la casilla "público".
-AccordingToGeoIPDatabase=(Obtenido por conversión GeoIP)
-Line=Línea
-NotSupported=No soportado
-RequiredField=Campo obligatorio
-Result=Resultado
-ToTest=Probar
-ValidateBefore=Para poder usar esta función debe validarse la ficha
-Visibility=Visibilidad
-Private=Privado
-Hidden=Caché
-Resources=Recursos
-Source=Origen
-Prefix=Prefijo
-Before=Antes
-After=Después
-IPAddress=Dirección IP
-Frequency=Frecuencia
-IM=Mensajería instantánea
-NewAttribute=Nuevo atributo
-AttributeCode=Código atributo
-URLPhoto=Url de la foto/logo
-SetLinkToAnotherThirdParty=Vincular a otro tercero
-LinkTo=Link to
-LinkToProposal=Link to proposal
 LinkToOrder=Enlazar a un pedido
-LinkToInvoice=Link to invoice
-LinkToSupplierOrder=Link to supplier order
-LinkToSupplierProposal=Link to supplier proposal
-LinkToSupplierInvoice=Link to supplier invoice
-LinkToContract=Link to contract
-LinkToIntervention=Link to intervention
-CreateDraft=Crear borrador
-SetToDraft=Volver a borrador
-ClickToEdit=Clic para editar
-ObjectDeleted=Objeto %s eliminado
-ByCountry=Par país
-ByTown=Por población
-ByDate=Por fecha
-ByMonthYear=Por mes/año
-ByYear=Por año
-ByMonth=Por mes
-ByDay=Por día
-BySalesRepresentative=Por comercial
-LinkedToSpecificUsers=Enlazado a un contacto de usuario particular
-NoResults=Ningún resultado
-AdminTools=Admin tools
-SystemTools=Utilidades sistema
-ModulesSystemTools=Utilidades módulos
-Test=Prueba
-Element=Elemento
-NoPhotoYet=No hay fotografía disponible
-Dashboard=Dashboard
-MyDashboard=My dashboard
-Deductible=Deducible
-from=de
-toward=hacia
-Access=Acceso
-SelectAction=Select action
-HelpCopyToClipboard=Use Ctrl+C para copiar al portapapeles
-SaveUploadedFileWithMask=Guardar el archivo con el nombre "<strong>%s</strong>" (sino "%s")
-OriginFileName=Nombre del archivo origen
-SetDemandReason=Definir origen
-SetBankAccount=Definir cuenta bancaria
-AccountCurrency=Divisa de la cuenta
-ViewPrivateNote=Ver notas
-XMoreLines=%s línea(s) ocultas
-PublicUrl=URL pública
-AddBox=Añadir caja
-SelectElementAndClickRefresh=Seleccione un elemento y haga clic en Refrescar
-PrintFile=Imprimir Archivo %s
-ShowTransaction=Show entry on bank account
-GoIntoSetupToChangeLogo=Vaya a Inicio->Configuración->Empresa/Institución para cambiar el logo o vaya a Inicio->Configuración->Entorno para ocultarlo
-Deny=Denegar
-Denied=Denegada
-ListOfTemplates=Listado de plantillas
-Gender=Gender
-Genderman=Hombre
-Genderwoman=Mujer
-ViewList=Vista de listado
-Mandatory=Obligatorio
-Hello=Hola
-Sincerely=Atentamente
-DeleteLine=Eliminación de línea
-ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
-NoRecordSelected=No record selected
-MassFilesArea=Area for files built by mass actions
-ShowTempMassFilesArea=Show area of files built by mass actions
-RelatedObjects=Related Objects
-ClassifyBilled=Clasificar facturado
 Progress=Progresión
-ClickHere=Haga clic aquí
-FrontOffice=Front office
-BackOffice=Back office
-View=View
 Export=Exportación
-Exports=Exportaciones
-ExportFilteredList=Export filtered list
-ExportList=Export list
-Miscellaneous=Miscelánea
-Calendar=Calendario
-GroupBy=Group by...
-ViewFlatList=View flat list
-RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Direct download link
-Download=Download
-ActualizeCurrency=Update currency rate
-Fiscalyear=Año fiscal
-# Week day
-Monday=Lunes
-Tuesday=Martes
-Wednesday=Miércoles
-Thursday=Jueves
-Friday=Viernes
-Saturday=Sábado
-Sunday=Domingo
-MondayMin=Lu
-TuesdayMin=Ma
-WednesdayMin=Mi
-ThursdayMin=Ju
-FridayMin=Vi
-SaturdayMin=Sa
-SundayMin=Do
-Day1=Lunes
-Day2=Martes
-Day3=Miércoles
-Day4=Jueves
-Day5=Viernes
-Day6=Sábado
-Day0=Domingo
-ShortMonday=L
-ShortTuesday=M
-ShortWednesday=Mi
-ShortThursday=J
-ShortFriday=V
-ShortSaturday=S
-ShortSunday=D
-SelectMailModel=Seleccione una plantilla de e-mail
-SetRef=Set ref
-Select2ResultFoundUseArrows=Some results found. Use arrows to select.
-Select2NotFound=No result found
-Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
-Select2LoadingMoreResults=Loading more results...
-Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
-SearchIntoContacts=Contactos
-SearchIntoMembers=Miembros
-SearchIntoUsers=Usuarios
-SearchIntoProductsOrServices=Products or services
-SearchIntoProjects=Proyectos
-SearchIntoTasks=Tareas
-SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
-SearchIntoCustomerOrders=Pedidos de clientes
-SearchIntoSupplierOrders=Supplier orders
-SearchIntoCustomerProposals=Customer proposals
 SearchIntoSupplierProposals=Presupuestos de proveedores
-SearchIntoInterventions=Intervenciones
-SearchIntoContracts=Contratos
-SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Gastos
 SearchIntoLeaves=Días libres
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/es_VE/other.lang b/htdocs/langs/es_VE/other.lang
index a54f057ae0b..48f9da741b5 100644
--- a/htdocs/langs/es_VE/other.lang
+++ b/htdocs/langs/es_VE/other.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - other
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nLe adjuntamos la solicitud de precios __ASKREF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nLe adjuntamos nuestro pedido __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 SourcesRepository=Repositorio de fuentes
 WEBSITE_DESCRIPTION=Descripcion
diff --git a/htdocs/langs/es_VE/supplier_proposal.lang b/htdocs/langs/es_VE/supplier_proposal.lang
index b225441e044..57a05997e92 100644
--- a/htdocs/langs/es_VE/supplier_proposal.lang
+++ b/htdocs/langs/es_VE/supplier_proposal.lang
@@ -41,7 +41,6 @@ DocModelAuroreDescription=Modelo completo de solicitud (logo...)
 CommercialAsk=Solicitud de precio
 DefaultModelSupplierProposalToBill=Plantilla por defecto cuando cierra una solicitud de precio (aceptada)
 DefaultModelSupplierProposalClosed=Plantilla por defecto cuando cierra una solicitud de precio (rechazada)
-ListOfSupplierProposal=Lista de solicitudes de presupuestos a proveedores
 ListSupplierProposalsAssociatedProject=Lista de presupuestos a proveedor asociados con el proyecto
 SupplierProposalsToClose=Presupuestos a proveedor a cerrar
 SupplierProposalsToProcess=Presupuestos a proveedor a procesar
diff --git a/htdocs/langs/et_EE/accountancy.lang b/htdocs/langs/et_EE/accountancy.lang
index 84908682ac7..003980a7165 100644
--- a/htdocs/langs/et_EE/accountancy.lang
+++ b/htdocs/langs/et_EE/accountancy.lang
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Konto
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=General ledger
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
@@ -132,19 +140,19 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=List of the accounting accounts
 
 Pcgtype=Class of account
-Pcgsubtype=Under class of account
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Kood
+Nature=Loomus
+AccountingJournalType1=Various operation
+AccountingJournalType2=Müügid
+AccountingJournalType3=Ostud
+AccountingJournalType4=Pank
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Eksportimised
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index 625b321cbe5..6c8228bd857 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=Sisemised kasutajad
 ExternalUsers=Välised kasutajad
 GUISetup=Kuva
 SetupArea=Seadistamise ala
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Failide üleslaadimise teistimiseks kasutatav vorm (vastavalt seadistustele)
 IfModuleEnabled=Märkus: jah töötab vaid siis, kui moodul <b>%s</b> on sisse lülitatud.
 RemoveLock=Kui fail <b>%s</b> on juba olemas, siis eemalda see, et võimaldada uuendamise tööriista kasutamist.
@@ -85,7 +86,7 @@ Mask=Mask
 NextValue=Järgmine väärtus
 NextValueForInvoices=Järgmine väärtus (arved)
 NextValueForCreditNotes=Järgmine väärtus (kreeditarved)
-NextValueForDeposit=Järgmine väärtus (deposiit)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Järgmine väärtus (asendused)
 MustBeLowerThanPHPLimit=Märkus: PHP piir üleslaetava faili suuruseks on <b>%s</b> %s, sõltumata selle parameetri väärtusest
 NoMaxSizeByPHPLimit=Märkus: PHP seadistustes pole piiri määratletud
@@ -103,7 +104,7 @@ MenuIdParent=Emamenüü ID
 DetailMenuIdParent=Emamenüü ID (juurmenüü korral tühi)
 DetailPosition=Järjekorranumber menüü asukoha määratlemiseks
 AllMenus=Kõik
-NotConfigured=Moodul ei ole seadistatud
+NotConfigured=Module/Application not configured
 Active=Aktiivne
 SetupShort=Seadistamine
 OtherOptions=Muud seaded
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Tuhandete eraldaja
 Destination=Sihtkoht
 IdModule=Mooduli ID
 IdPermissions=Kasutajaõiguste ID
-Modules=Moodulid
 LanguageBrowserParameter=Parameeter %s
 LocalisationDolibarrParameters=Lokaliseerimise parameetrid
 ClientTZ=Kliendi ajavöönd (kasutaja)
@@ -123,7 +123,8 @@ PHPTZ=Time Zone PHP server
 DaylingSavingTime=Suveaeg
 CurrentHour=Tund PHP (server)
 CurrentSessionTimeOut=Praeguse sessiooni aegumine
-YouCanEditPHPTZ=PHP ajavööndi muutmiseks (pole nõutud), võid lisada .htaccess faili sellisel kujul reaga "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Vidin
 Boxes=Vidinad
 MaxNbOfLinesForBoxes=Vidinate maksimaalne ridade arv
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Õigused
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Näidatakse ainult elemente <a href="%s">sisse lülitatud moodulitest</a>.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Andmebaasi parool on conf.php failis krüpteerit
 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=Automaatselt loodud PDF failide kaitse (soovitatav välja lülitatud, kuna vastasel juhul ei tööta PDFide hulgi loomine)
-ProtectAndEncryptPdfFilesDesc=PDF dokumendi kaitse võimaldab seda ikkagi iga PDFi lugejaga vaadata ja printida. Kahjuks ei ole selle järel enam võimalik faili toimetamine ja kopeerimine. Pane tähele, et seda funktsionaalsust kasutades pole enam võimalik luua kokkuliidetud PDF faile (näiteks tasutamata arved).
+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=Funktsionaalsus
 DolibarrLicense=Litsents
 Developpers=Arendajad/toetajad
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarri online demo
 OfficialMarketPlace=Väliste moodulite ja lisade ametlik müügikoht
 OfficialWebHostingService=Viidatavad veebimajutuse pakkujad (pilveteenused)
 ReferencedPreferredPartners=Eelistatud partnerid
-OtherResources=Muud ressursid
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=Kasutaja või arendaja dokumentatsiooni (KKK jms) võid leida<br>ametlikust Dolibarri Wikist:<br><a href="%s" target="_blank"><b>%s</b></a>
 ForAnswersSeeForum=Muude küsimuste või abi küsimise tarbeks saab kasutada Dolibarri foorumit:<br><a href="%s" target="_blank"><b>%s</b></a>
 HelpCenterDesc1=See ala võib aidata saada Dolibarri tugiteenust.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=Funktsionaalsus pole kasutatav Unixi laadsel süsteem
 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/
 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=Moodulite seadistamine
-ModulesSetup=Moodulite seadistamine
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Süsteem
 ModuleFamilyCrm=Kliendihaldus (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=Dolibarri praegune versioo
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Viimane stabiilne versioon
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Update server offline
+WithCounter=Manage a counter
 GenericMaskCodes=Sa võid sisestada suvalise numeratsiooni maski. Järgnevas maskis saab kasutada järgmisi silte:<br><b>{000000}</b> vastab arvule, mida suurendatakse iga sündmuse %s korral. Sisesta niipalju nulle, kui soovid loenduri pikkuseks. Loendurile lisatakse vasakult alates niipalju nulle, et ta oleks maskiga sama pikk.<br><b>{000000+000}</b> on eelmisega sama, kuid esimesele %s lisatakse nihe, mis vastab + märgist paremal asuvale arvule.<br><b>{000000@x}</b> on eelmisega sama, ent kuuni x jõudmisel nullitakse loendur (x on 1 ja 12 vahel, või 0 seadistuses määratletud majandusaasta alguse kasutamiseks, või 99 loenduri nullimiseks iga kuu alguses). Kui kasutad seda funktsiooni ja x on 2 või kõrgem, siis on jada {yy}{mm} or {yyyy}{mm} nõutud.<br><b>{dd}</b> päev (01 kuni 31).<br><b>{mm}</b> kuu (01 kuni 12).<br><b>{yy}</b>, <b>{yyyy}</b> või <b>{y}</b> aasta 2, 4 või 1 numbri kasutamisks.<br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Kõik teised maskis olevad tähemärgid jäävad puutuamata.<br>Tühikud ei ole lubatud.<br>
-GenericMaskCodes4a=<u>Näiteks 99ndal %s tegi kolmas isik KolmasIsik 2007-01-31:</u> <br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Näiteks 2007-03-01 loodud kolmas isik:</u> <br>
 GenericMaskCodes4c=<u>Näiteks 2007-03-01 loodud toode:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> annab vastuseks <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> annab vastuseks <b>0199-ZZZ/31/XXX</b>
+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=Lisab määratletud maskile vastava kohandatava arvu.
 ServerAvailableOnIPOrPort=Server on saadaval aadressil <b>%s</b> pordil <b>%s</b>
 ServerNotAvailableOnIPOrPort=Server ei ole kättesaadav aadressil <b>%s</b> pordi <b>%s</b>
@@ -369,19 +375,21 @@ Int=Täisarv
 Float=Ujukomaarv
 DateAndTime=Kuupäev ja tund
 Unique=Unikaalne
-Boolean=Tõeväärtus (märkeruut)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Telefon
 ExtrafieldPrice = Hind
 ExtrafieldMail = E-post
 ExtrafieldUrl = Url
 ExtrafieldSelect = Valikute nimekiri
 ExtrafieldSelectList = Vali tabelist
-ExtrafieldSeparator=Eraldaja
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Salasõna
-ExtrafieldCheckBox=Märkeruut
-ExtrafieldRadio=Raadionupp
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldRadio=Radio buttons (on 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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameetrite nimekiri peab olema kujul võti,väärtus<br><br>Näiteks:<br>1,väärtus1<br>2,väärtus2<br>3,väärtus3<br>...
 ExtrafieldParamHelpradio=Parameetrite nimekiri peab olema kujul võti,väärtus<br><br>Näiteks:<br>1,väärtus1<br>2,väärtus2<br>3,väärtus3<br>...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Väli
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Kasutajad ja grupid
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=Klientide müügi- ja kreeditarvete haldamine. Hankijate arvete hal
 Module40Name=Hankijad
 Module40Desc=Hankijate haldamine ja ostmine (tellimused ja ostuarved)
 Module42Name=Logid
-Module42Desc=Logimise võimalused (fail, syslog jne)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Toimetid
 Module49Desc=Toimetite haldamine
 Module50Name=Tooted
@@ -499,8 +521,8 @@ Module410Name=Webcalendar
 Module410Desc=WebCalendari integratsioon
 Module500Name=Erikulud
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Teated
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind konverteerimise võimekus
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=Personalihaldus
-Module4000Desc=Human resources management
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi-ettevõte
 Module5000Desc=Võimaldab hallata mitut ettevõtet
 Module6000Name=Töövoog
@@ -591,7 +615,7 @@ Permission32=Toodete loomine/muutmine
 Permission34=Toodete kustutamine
 Permission36=Peidetud toodete vaatamine/haldamine
 Permission38=Toodete eksport
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Projektide kustutamine (jagatud projekt ja projektid, mille kontaktiks on kasutaja)
 Permission45=Export projects
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Tellimisviisid
 DictionarySource=Pakkumiste/tellimuste päritolu
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Kontoplaani mudelid
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Emails templates
 DictionaryUnits=Ühikud
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Seadistused salvestatud
+SetupNotSaved=Setup not saved
 BackToModuleList=Tagasi moodulite nimekirja
 BackToDictionaryList=Tagasi sõnastike nimekirja
 VATManagement=Käibemaksu haldamine
@@ -921,7 +947,7 @@ Host=Server
 DriverType=Draiveri tüüp
 SummarySystem=Süsteemiinfo kokkuvõte
 SummaryConst=Kõikide Dolibarri seadistusparameetrite nimekiri
-MenuCompanySetup=Ettevõte/ühendus
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= Standardne menüü haldaja
 DefaultMenuSmartphoneManager=Nutitelefoni menüü haldaja
 Skin=Kesta kujundus
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Default max length for lists
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=Päeva sõnu
 MessageLogin=Sisselogimise lehe sõnu
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Vasakus menüüs on alati otsingu vorm
 DefaultLanguage=Vaikimisi kasutatav keel (keele kood)
 EnableMultilangInterface=Luba mitmekeelne liides
 EnableShowLogo=Näita vasakul menüüs logo
-CompanyInfo=Ettevõtte/ühenduse info
-CompanyIds=Ettevõtte/ühenduse andmed
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=Nimi
 CompanyAddress=Aadress
 CompanyZip=Postiindeks
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Hilinemise viivitus (päevades) enne hoiatust hilinenu
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Hilinemise viivitus (päevades) enne hoiatust deponeerimata tšekkide kohta
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Teised menüükanded haldavad muid parameetreid
 LogEvents=Sündmuste turvaaudit
 Audit=Audit
@@ -987,7 +1015,7 @@ BrowserOS=Sirvija operatsioonisüsteem
 ListOfSecurityEvents=Dolibarri turvasündmuste nimekiri
 SecurityEventsPurged=Turvasündmused tühjendatud
 LogEventDesc=Siin saab sisse lülitada Dolibarri turvalisusega seotud sündmuste logimise. Administraatorid saavad seejärel vajaliku info kätte menüüst <b>Süsteemi tööristad - Audit</b>. Hoiatus: see võib võtta andmebaasis palju ruumi.
-AreaForAdminOnly=Hoiatus: neid võimalusi saavad kasutada vaid <b>administraatorid</b>.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Süsteemi info sisaldab mitmesugust tehnilist infot, mida ei saa muuta ning mis on nähtav vaid administraatoritele.
 SystemAreaForAdminOnly=Sellele alale saavad ligi ainult administraatorid. Ükski Dolibarri õigus ei saa seda piirangut eemaldada.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists in any language files
+TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Pead vähemalt 1 mooduli sisse lülitama
 ClassNotFoundIntoPathWarning=Klassi %s ei ole PHP rajas
 YesInSummer=Suviti 'jah'
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Sessiooni andmehoidla krüpteeritud Suhosini poolt
 ConditionIsCurrently=Olek on hetkel %s
 YouUseBestDriver=Kasutad draiverit %s, mis on hetkel saadaolevatest parim.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Registreerimisnumbrite reeglid
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Eksportimise link <b>%s</b> formaati on saadaval järgmisel aadressil: %s
 ##### Invoices #####
 BillsSetup=Arvete mooduli seadistamine
 BillsNumberingModule=Arvete ja kreeditarvete numeratsiooni mudel
 BillsPDFModules=Arve dokumentide mudelid
+PaymentsPDFModules=Payment documents models
 CreditNote=Kreeditarve
 CreditNotes=Kreeditarved
 ForceInvoiceDate=Sunni arve kuupäevaks arve kinnitamise kuupäev
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=%s tüüpi faile ei hoia HTTP server vahemälus
 FilesOfTypeCompressed=%s tüüpi faile pakib HTTP server kokk
 FilesOfTypeNotCompressed=%s tüüpi faile ei paki HTTP server kokk
 CacheByServer=Serveri vahemäl
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Brauseri vahemälu
 CompressionOfResources=HTTP vastuste kokku pakkimine
+CompressionOfResourcesDesc=For exemple 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 your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Toodete mooduli seadistamine
 ServiceSetup=Teenuste mooduli seadistamine
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Kasutatakse arve kuupäeva
 Buy=Ost
 Sell=Müük
 InvoiceDateUsed=Kasutatakse arve kuupäeva
-YourCompanyDoesNotUseVAT=Sinu ettevõte ei ole määratletud kasutama käibemaksu (Kodu->Seadistamine->Ettevõte/Ühendus), seega ei ole ühtki käibemaksu seadistust, mida muuta.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=Raamatupidamise kood
 AccountancyCodeSell=Müügikonto kood
 AccountancyCodeBuy=Ostukonto kood
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Seda liiki tegevuse staatus lisatakse automaatselt
 AGENDA_DEFAULT_VIEW=Vaikimisi avatav sakk päevakava avamisel
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial mooduli seadistamine
-ClickToDialUrlDesc=Url, mida kasutatakse telefoni pildi klõpsamisel. URLi sees saab kasutada järgmisi silte:<br><b>__PHONETO__</b> asendatakse helistatava inimese telefoninumbriga<br><b>__PHONEFROM__</b> asendatakse helistaja (Sinu) telefoninumbriga<br><b>__LOGIN__</b> asendatakse clicktodial kasutajanimega (määratletud Sinu kasutajakaardil)<br><b>__PASS__</b> asendatakse clicktodial parooliga (määratletud Sinu kasutajakaardil).
+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.
 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 same computer than 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.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+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.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=Üldine kuvamise järjekord
 BankOrderES=Hispaania
 BankOrderESDesc=Hispaania kuvamise järjekord
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=Mitme ettevõtte mooduli seadistamine
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ 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.
 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.
-ConfFileMuseContainCustom=Installing 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)
 TextTitleColor=Color of page title
 LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/et_EE/compta.lang b/htdocs/langs/et_EE/compta.lang
index 438e49810cf..f5ca41fd6bb 100644
--- a/htdocs/langs/et_EE/compta.lang
+++ b/htdocs/langs/et_EE/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using r
 Param=Seadistamine
 RemainingAmountPayment=Maksta jääv summa:
 Account=Konto
-Accountparent=Emakonto
-Accountsparent=Emakontod
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=Tulu
 Outcome=Kulu
 ReportInOut=Tulu/kulu
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Maksud ja dividendid
 MenuSocialContributions=Social/fiscal taxes
 MenuNewSocialContribution=New social/fiscal tax
 NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Raamatupidamise/vara ala
 NewPayment=Uus makse
@@ -134,8 +135,8 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- See sisaldab kõiki klientidelt laekunud jõustunud arvete maksmisi.<br> - See põhineb nende arvete maksekuupäevadel<br>
-DepositsAreNotIncluded=- Eelmaksuarved pole lisatud
-DepositsAreIncluded=- Eelmaksuarved on lisatud
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Kolmandate isikute IRPFi aruanne
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
 VATReport=VAT report
@@ -169,7 +170,7 @@ DescSellsJournal=Müügireskontro
 DescPurchasesJournal=Ostureskontro
 InvoiceRef=Arve viide
 CodeNotDef=Määratlemata
-WarningDepositsNotIncluded=Hoiuseid ei ole antud versiooni ja sellesse raamatupidamise moodulisse lisatud.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Maksetähtaja kuupäev ei saa olla väiksem objekti kuupäevast.
 Pcg_version=Chart of accounts models
 Pcg_type=Pcg tüü
@@ -189,8 +190,10 @@ AccountancyJournal=Accountancy code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/et_EE/cron.lang b/htdocs/langs/et_EE/cron.lang
index 63d52066ff6..2043bdc6b18 100644
--- a/htdocs/langs/et_EE/cron.lang
+++ b/htdocs/langs/et_EE/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allow to execute job that have been planned
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Tegevus
 CronNone=Mitte ükski
 CronDtStart=Not before
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Lülita sisse
 CronStatusInactiveBtn=Lülita välja
 CronTaskInactive=See tegevus on välja lülitatud
 CronId=ID
-CronClassFile=Klassid (filename.class.php)
-CronModuleHelp=Dolibarri moodulite kausta nimi (töötab ka välise Dolibarro mooduliga). <br> Näiteks Dolibarri Product objekti kasutamisel /htdocs/<u>product</u>/class/product.class.php on mooduli väärtuseks <i>product</i>.
-CronClassFileHelp=Laetava faili nimi. <BR> Näiteks Dolibarri Product objekti /htdocs/product/class/<u>product.class.php</u> meetodi kasutamisel on selle väärtuseks <i>product.class.php</i>.
-CronObjectHelp=Laetava objekti nimi. <BR> Näiteks Dolibarri Product objekti /htdocs/product/class/product.class.php kasutamisel on selle väärtuseks <i>Product</i>.
-CronMethodHelp=Kasutatava objekti korral käivitatav meetod. <BR> Näiteks Dolibarr Product objekti /htdocs/product/class/product.class.php meetodi fetch kasutamisel on meetodi väärtuseks <i>fetch</i>
-CronArgsHelp=Meetodile antavad argumendid. <BR> Näiteks Dolibarri Product objekti /htdocs/product/class/product.class.php meetodi fetch kasutamisel võivad parameetrite väärtusteks olla <i>0, ProductRef</i>.
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=Käivitatav süsteemi käsk.
 CronCreateJob=Create new Scheduled Job
 CronFrom=Kellelt
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/et_EE/errors.lang b/htdocs/langs/et_EE/errors.lang
index b20e11b3c9f..fa6e137939d 100644
--- a/htdocs/langs/et_EE/errors.lang
+++ b/htdocs/langs/et_EE/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Ei suutnud luua faili '<b>%s</b>'.
 ErrorFailToRenameDir=Ei suutnud ümber nimetada kausta '<b>%s</b>' kaustaks '<b>%s</b>'.
 ErrorFailToCreateDir=Ei suutnud luua kausta '<b>%s</b>'.
 ErrorFailToDeleteDir=Ei suutnud kustutada kausta '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=Antud kontakt on juba määratletud selle tüübi kontaktiks.
 ErrorCashAccountAcceptsOnlyCashMoney=See pangakonto on sularahakonto, seega võtab ta vastu ainult sularahamakseid.
 ErrorFromToAccountsMustDiffers=Lähtekonto ja sihtkonto pevad olema erinevad.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Ei suutnud kirjutada kausta %s
 ErrorFoundBadEmailInFile=Failis on %s real ebaõige e-posti aadressi süntaks (näiteks on rida %s aadress=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Mõned nõutud väljad on täitmata.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Kausta loomine ebaõnnestus. Kontrolli, et veebiserveri kasutajal on piisavalt õigusi Dolibarri dokumentide kausta kirjutamiseks. Kui PHP <b>safe_mode</b> parameeter on sisse lülitatud, siis kontrolli, et veebiserveri kasutaja (või grupp) on Dolibarri PHP failide omanik.
 ErrorNoMailDefinedForThisUser=Antud kasutaja e-posti aadressi pole määratletud
 ErrorFeatureNeedJavascript=See funktsioon vajab töötamiseks JavaScripti sisse lülitamist. Muuda seadeid Seadistamine->Kuva menüüs.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoice
 ErrorWebServerUserHasNotPermission=Veebiserveri käivitamiseks kasutataval kontrol <b>%s</b> ei ole selleks õigusi
 ErrorNoActivatedBarcode=Ühtki vöötkoodi tüüpi pole aktiveeritud
 ErrUnzipFails=%s lahti pakkimine ZipArchivega ebaõnnestus
-ErrNoZipEngine=Antud PHPs pole ühtki mootorit, millega faili %s lahti pakkida
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=Fail %s peab olema Dolibarri zip formaadis pakk
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=PHP CURLei ole paigaldatud, see on PayPaliga suhtlemiseks vajalik
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # 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.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice
 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/et_EE/main.lang b/htdocs/langs/et_EE/main.lang
index d63deac7c06..e348e17f27c 100644
--- a/htdocs/langs/et_EE/main.lang
+++ b/htdocs/langs/et_EE/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=Parameeter %s on määratlemata
 ErrorUnknown=Tundmatu viga
 ErrorSQL=SQLi viga
 ErrorLogoFileNotFound=Ei leidnud logo faili '%s'
-ErrorGoToGlobalSetup=Kasuta selle parandamiseks 'Ettevõte/Ühendus' halduspaneeli
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=Kasuta selle parandamiseks 'Moodulid' halduspaneeli
 ErrorFailedToSendMail=E-kirja saatmine ebaõnnestus (saatja = %s, vastuvõtja = %s)
 ErrorFileNotUploaded=Ei õnnestunud faili üles laadida. Kontrolli järgmist: fail ei ületa lubatud suurust, serveri kettal on vaba ruumi ning sama nimega faili ei oleks samas kaustas.
@@ -153,6 +153,7 @@ Edit=Toimeta
 Validate=Kinnita
 ValidateAndApprove=Valideeri ja kiida heaks
 ToValidate=Kinnitada
+NotValidated=Not validated
 Save=Salvesta
 SaveAs=Salvesta kui
 TestConnection=Kontrolli ühendust
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=Autentisrežiimiga <b>%s</b> pole seotud ühtki laht
 Connection=Logi sisse
 Setup=Seadistamine
 Alert=Hoiatus
+MenuWarnings=Häired
 Previous=Eelmine
 Next=Järgmine
 Cards=Kaardid
@@ -308,6 +310,7 @@ Copy=Kopeeri
 Paste=Kleebi
 Default=Vaikimisi
 DefaultValue=Vaikeväärtus
+DefaultValues=Default values
 Price=Hind
 UnitPrice=Ühiku hind
 UnitPriceHT=Ühiku hind (neto)
@@ -363,7 +366,8 @@ VATRate=Maksumäär
 Average=Keskmine
 Sum=Summa
 Delta=Delta
-Module=Moodul
+Module=Module/Application
+Modules=Modules/Applications
 Option=Valik
 List=Nimekiri
 FullList=Täielik nimekiri
@@ -387,7 +391,7 @@ ActionRunningNotStarted=Alustada
 ActionRunningShort=In progress
 ActionDoneShort=Lõpetatud
 ActionUncomplete=Lõpuni viimata
-CompanyFoundation=Ettevõte/ühendus
+CompanyFoundation=Company/Organisation
 ContactsForCompany=Selle kolmanda isikuga seotud kontaktid
 ContactsAddressesForCompany=Selle kolmanda isikuga seotud kontaktid/aadressid
 AddressesForCompany=Selle kolmanda isikuga seotud aadressid
@@ -405,8 +409,9 @@ Generate=Loo
 Duration=Kestus
 TotalDuration=Kogukestus
 Summary=Kokkuvõte
-DolibarrStateBoard=Statistika
-DolibarrWorkBoard=Tööülesannete tahvel
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=Saadaval
 NotYetAvailable=Pole veel saadaval
 NotAvailable=Pole saadaval
@@ -434,7 +439,7 @@ Reportings=Aruandlus
 Draft=Mustand
 Drafts=Mustandid
 Validated=Kinnitatud
-Opened=Avatud
+Opened=Ava
 New=Uus
 Discount=Allahindlus
 Unknown=Tundmatu
@@ -453,6 +458,7 @@ NextStep=Järgmine samm
 Datas=Andmed
 None=Puudub
 NoneF=Puudub
+NoneOrSeveral=None or several
 Late=Hilja
 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.
 Photo=Pilt
@@ -606,7 +612,8 @@ PartialWoman=Osaline
 TotalWoman=Täielik
 NeverReceived=Pole vastu võetud
 Canceled=Tühistatud
-YouCanChangeValuesForThisListFromDictionarySetup=Antud nimekirja väärtusi saab muuta Seadistamine->Sõnastik menüüst
+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
 Color=Värv
 Documents=Seotud failid
@@ -642,6 +649,7 @@ FreeLineOfType=Vaba sisestuse tüüp
 CloneMainAttributes=Klooni objekt selle põhiliste omadustega
 PDFMerge=PDFi ühendamine
 Merge=Ühendamine
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Kuva leht lehe sisu printimiseks
 MenuManager=Menüü haldaja
 WarningYouAreInMaintenanceMode=Hoiatus: hooldusrežiim on aktiivne, praegu on rakendusele ligipääs vaid kasutajal <b>%s</b>.
@@ -708,6 +716,7 @@ from=alates
 toward=kuni
 Access=Ligipääs
 SelectAction=Select action
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Lõikelauale kopeerimiseks kasuta Ctrl+C klahvikombinatsiooni
 SaveUploadedFileWithMask=Salvesta fail serverisse nimega "<strong>%s</strong>" (muul juhul "%s")
 OriginFileName=Faili algne nimi
@@ -718,7 +727,7 @@ ViewPrivateNote=Vaata märkmeid
 XMoreLines=%s joon(t) varjatud
 PublicUrl=Avalik link
 AddBox=Lisa kast
-SelectElementAndClickRefresh=Vali element ja klõpsa 'Värskenda'
+SelectElementAndClick=Select an element and click %s
 PrintFile=Prindi fail %s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Mine Kodu - Seadistamine - Ettevõte logo muutmiseks või mine Kodu - Seadistamine - Kuva logo peitmiseks.
@@ -734,8 +743,8 @@ Hello=Tere
 Sincerely=Sincerely
 DeleteLine=Kustuta rida
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
@@ -755,11 +764,20 @@ Calendar=Kalender
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Majandusaasta
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Esmaspäev
 Tuesday=Teisipäev
@@ -817,5 +835,3 @@ SearchIntoContracts=Lepingud
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/et_EE/other.lang b/htdocs/langs/et_EE/other.lang
index 2d280d66fdb..e331e1cc65b 100644
--- a/htdocs/langs/et_EE/other.lang
+++ b/htdocs/langs/et_EE/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=Sünniaeg
 BirthdayAlertOn=sünnipäeva hoiatus aktiivne
 BirthdayAlertOff=sünnipäeva hoiatus mitteaktiivne
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=Sekkumine kinnitatud
 Notify_FICHINTER_SENTBYMAIL=Sekkumine saadetud postiga
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=See on <b>test</b> kiri (sõna test peab olema rasvases k
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Reg kood %s</b> on info, mis sõltub kolmanda isiku riigist.<br>Näiteks riigi <b>%s</b> puhul on see kood <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Toodete/teenuste ühikute arvu statistika
-StatsByNumberOfEntities=Viitavate olemite arvude statistika
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=Sekkumine %s on kinnitatud.
 EMailTextInvoiceValidated=Arve %s on kinnitatud.
diff --git a/htdocs/langs/et_EE/projects.lang b/htdocs/langs/et_EE/projects.lang
index 8bc0cc14333..e607ec1f368 100644
--- a/htdocs/langs/et_EE/projects.lang
+++ b/htdocs/langs/et_EE/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Kõik
 PrivateProject=Projekti kontaktid
+ProjectsImContactFor=Projects I'm explicitely a contact of
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=Kõik projektid
 MyProjectsDesc=Selles vaates näidatakse vaid neid projekte, mille kontaktiks oled märgitud (hoolimata liigist)
 ProjectsPublicDesc=See vaade esitab kõik projektid, mida sul on lubatud vaadata.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=See vaade näitab kõiki projekte ja ülesandeid (sinu kasutajaõiguse
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=Uus projekt
 AddProject=Create project
 DeleteAProject=Kustuta projekt
 DeleteATask=Kustuta ülesanne
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Opened projects
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Kuva projekt
 SetProject=Määra projekt
 NoProject=Ühtki projekti pole määratletud või ei oma ühtki projekt
 NbOfProjects=Projekte
+NbOfTasks=Nb of tasks
 TimeSpent=Aega kulutatud
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
@@ -47,9 +52,9 @@ TaskTimeSpent=Ülesannetel kulutatud aeg
 TaskTimeUser=Kasutaja
 TaskTimeNote=Märkus
 TaskTimeDate=Kuupäev
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
-NewTimeSpent=Aeg kulutatud uuesti
+NewTimeSpent=Aega kulutatud
 MyTimeSpent=Minu poolt kulutatud aeg
 Tasks=Ülesanded
 Task=Ülesanne
@@ -59,6 +64,7 @@ TaskDescription=Ülesande kirjeldus
 NewTask=Uus ülesanne
 AddTask=Create task
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Aktiivsus
 Activities=Ülesanded/toimingud
 MyActivities=Minu ülesanded/aktiivsused
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Antud projektiga seotud lepingute nimekiri
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=Antud projektiga seotud sekkumiste nimekiri
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Projekti kontaktid
 ActionsOnProject=Projekti tegevused
 YouAreNotContactOfProject=Sa ei ole antud privaatse projekti kontakt
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Kustuta kulutatud aeg
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
@@ -110,7 +118,7 @@ TaskRessourceLinks=Ressursid
 ProjectsDedicatedToThisThirdParty=Selle kolmanda isikuga seotud projektid
 NoTasks=Selle projektiga ei ole seotud ühtki ülesannet
 LinkedToAnotherCompany=Seotud muu kolmanda isikuga
-TaskIsNotAffectedToYou=Task not assigned to you
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=Kulutatud aeg on tüh
 ThisWillAlsoRemoveTasks=See kustutab ka kõik projekti ülesanded (hetkel <b>%s</b> ülesannet) ja kõik kulutatud aja sisestused.
 IfNeedToUseOhterObjectKeepEmpty=Kui mingid projekti loomiseks vajalikud objektid (arve, tellimus jne) kuuluvad mõnele muule kolmandale isikule, siis jäta see tühjaks, et oleks projekti võimalik siduda mitme kolmanda isikuga.
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
 ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/eu_ES/accountancy.lang b/htdocs/langs/eu_ES/accountancy.lang
index 4c2336b97b0..bf77c5e5e7d 100644
--- a/htdocs/langs/eu_ES/accountancy.lang
+++ b/htdocs/langs/eu_ES/accountancy.lang
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=General ledger
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
@@ -132,19 +140,19 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=List of the accounting accounts
 
 Pcgtype=Class of account
-Pcgsubtype=Under class of account
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Kodea
+Nature=Nature
+AccountingJournalType1=Various operation
+AccountingJournalType2=Sales
+AccountingJournalType3=Purchases
+AccountingJournalType4=Bank
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Exports
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang
index 73deac1611f..42a098c277f 100644
--- a/htdocs/langs/eu_ES/admin.lang
+++ b/htdocs/langs/eu_ES/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=Barneko erabiltzaileak
 ExternalUsers=Kanpoko erabiltzaileak
 GUISetup=Itxura
 SetupArea=Setup area
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form to test file upload (according to setup)
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
@@ -85,7 +86,7 @@ Mask=Maskara
 NextValue=Hurrengo balioa
 NextValueForInvoices=Next value (invoices)
 NextValueForCreditNotes=Next value (credit notes)
-NextValueForDeposit=Next value (deposit)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Next value (replacements)
 MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to <b>%s</b> %s, whatever this parameter's value is
 NoMaxSizeByPHPLimit=Oharra: zure PHP konfigurazioan ez da limiterik ezarri
@@ -103,7 +104,7 @@ MenuIdParent=Parent menu ID
 DetailMenuIdParent=ID of parent menu (empty for a top menu)
 DetailPosition=Sort number to define menu position
 AllMenus=Guztiak
-NotConfigured=Konfiguratu gabeko modulua
+NotConfigured=Module/Application not configured
 Active=Aktibo
 SetupShort=Konfigurazioa
 OtherOptions=Beste aukerak
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Milakoen bereizlea
 Destination=Destination
 IdModule=Module ID
 IdPermissions=Permissions ID
-Modules=Moduluak
 LanguageBrowserParameter=%s parametroa
 LocalisationDolibarrParameters=Lokalizazio parametroak
 ClientTZ=Client Time Zone (user)
@@ -123,7 +123,8 @@ PHPTZ=PHP server Time Zone
 DaylingSavingTime=Daylight saving time
 CurrentHour=PHP Denbora (zerbitzaria)
 CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max number of lines for widgets
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Baimenak
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activat
 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 (Activated 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 make building of a global cumulated pdf not working (like unpaid invoices).
+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=Aukera
 DolibarrLicense=Lizentzia
 Developpers=Garatzaileak/laguntzaileak
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr online demo
 OfficialMarketPlace=Official market place for external modules/addons
 OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
 ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your
 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/
 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=Moduluaren konfigurazioa
-ModulesSetup=Moduluen konfigurazioa
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Sistema
 ModuleFamilyCrm=Customer Relation Management (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=Dolibarr-en uneko bertsioa
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Update server offline
+WithCounter=Manage a counter
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
 ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
 ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
@@ -369,19 +375,21 @@ Int=Zenbaki osoa
 Float=Zenbaki hamartarra
 DateAndTime=Data eta ordua
 Unique=Unique
-Boolean=Boolearra (Checkbox)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Telefonoa
 ExtrafieldPrice = Prezioa
 ExtrafieldMail = E-posta
 ExtrafieldUrl = Url
 ExtrafieldSelect = Aukeren zerrenda
 ExtrafieldSelectList = Taulatik aukeratu
-ExtrafieldSeparator=Bereizlea
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Pasahitza
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio botoia
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldRadio=Radio buttons (on 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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Field
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Erabiltzaileak & Taldeak
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=Invoice and credit note management for customers. Invoice managemen
 Module40Name=Hornitzaileak
 Module40Desc=Supplier management and buying (orders and invoices)
 Module42Name=Log
-Module42Desc=Logging facilities (file, syslog, ...)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Editoreak
 Module49Desc=Editoreak kudeatzea
 Module50Name=Produktuak
@@ -499,8 +521,8 @@ Module410Name=Web-egutegia
 Module410Desc=Web-egutegiaren integrazioa
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Jakinarazpenak
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
-Module4000Desc=Human resources management
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow
@@ -591,7 +615,7 @@ Permission32=Create/modify products
 Permission34=Produktuak ezabatu
 Permission36=See/manage hidden products
 Permission38=Produktuak esportatu
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects i'm contact for)
 Permission45=Export projects
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Emails templates
 DictionaryUnits=Units
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Setup saved
+SetupNotSaved=Setup not saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
 VATManagement=BEZ-a kudeatzea
@@ -921,7 +947,7 @@ Host=Server
 DriverType=Driver type
 SummarySystem=System information summary
 SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Foundation
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= Standard menu manager
 DefaultMenuSmartphoneManager=Smartphone menu manager
 Skin=Skin theme
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Default max length for lists
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=Message of the day
 MessageLogin=Login page message
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/foundation information
-CompanyIds=Company/foundation identities
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=Izena
 CompanyAddress=Address
 CompanyZip=Zip
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Other menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Audit
@@ -987,7 +1015,7 @@ BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
 LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists 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
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Rules on Professional Ids
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####
 BillsSetup=Invoices module setup
 BillsNumberingModule=Invoices and credit notes numbering model
 BillsPDFModules=Invoice documents models
+PaymentsPDFModules=Payment documents models
 CreditNote=Credit note
 CreditNotes=Credit notes
 ForceInvoiceDate=Force invoice date to validation date
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
 FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
 FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
 CacheByServer=Cache by server
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
+CompressionOfResourcesDesc=For exemple 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 your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Products module setup
 ServiceSetup=Services module setup
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Invoice date used
 Buy=Buy
 Sell=Sell
 InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=Accountancy Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+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 your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
+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.
 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 same computer than 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.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+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.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=General display order
 BankOrderES=Gaztelania
 BankOrderESDesc=Spanish display order
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ 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.
 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.
-ConfFileMuseContainCustom=Installing 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)
 TextTitleColor=Color of page title
 LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/eu_ES/compta.lang b/htdocs/langs/eu_ES/compta.lang
index f2f3dd5c1ac..e12d45ebc22 100644
--- a/htdocs/langs/eu_ES/compta.lang
+++ b/htdocs/langs/eu_ES/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using r
 Param=Konfigurazioa
 RemainingAmountPayment=Amount payment remaining :
 Account=Account
-Accountparent=Account parent
-Accountsparent=Accounts parent
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=Income
 Outcome=Expense
 ReportInOut=Income / Expense
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Taxes and dividends
 MenuSocialContributions=Social/fiscal taxes
 MenuNewSocialContribution=New social/fiscal tax
 NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Accountancy/Treasury area
 NewPayment=New payment
@@ -134,8 +135,8 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from clients.<br>- It is based on the payment date of these invoices<br>
-DepositsAreNotIncluded=- Deposit invoices are nor included
-DepositsAreIncluded=- Deposit invoices are included
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
 VATReport=VAT report
@@ -169,7 +170,7 @@ DescSellsJournal=Sales Journal
 DescPurchasesJournal=Purchases Journal
 InvoiceRef=Invoice ref.
 CodeNotDef=Not defined
-WarningDepositsNotIncluded=Deposits invoices are not included in this version with this accountancy module.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
 Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
@@ -189,8 +190,10 @@ AccountancyJournal=Accountancy code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/eu_ES/cron.lang b/htdocs/langs/eu_ES/cron.lang
index b1e8bcb36d2..245fefe7af1 100644
--- a/htdocs/langs/eu_ES/cron.lang
+++ b/htdocs/langs/eu_ES/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allow to execute job that have been planned
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Job
 CronNone=None
 CronDtStart=Not before
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
-CronClassFile=Classes (filename.class.php)
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=From
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/eu_ES/errors.lang b/htdocs/langs/eu_ES/errors.lang
index 9e2eb6817ef..feada2d1b5a 100644
--- a/htdocs/langs/eu_ES/errors.lang
+++ b/htdocs/langs/eu_ES/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
 ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
 ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
 ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
 ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Some required fields were not filled.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoice
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # 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.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice
 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/eu_ES/main.lang b/htdocs/langs/eu_ES/main.lang
index 6917b8eb7db..e9ad3ac707a 100644
--- a/htdocs/langs/eu_ES/main.lang
+++ b/htdocs/langs/eu_ES/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=Parameter %s not defined
 ErrorUnknown=Unknown error
 ErrorSQL=SQL Error
 ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=Go to Module setup to fix this
 ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
 ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
@@ -153,6 +153,7 @@ Edit=Editatu
 Validate=Validate
 ValidateAndApprove=Validate and Approve
 ToValidate=To validate
+NotValidated=Not validated
 Save=Gorde
 SaveAs=Gorde honela
 TestConnection=Test connection
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=No applicative disconnect feature with authenticatio
 Connection=Konexia
 Setup=Konfigurazioa
 Alert=Alert
+MenuWarnings=Alerts
 Previous=Aurrekoa
 Next=Hurrengoa
 Cards=Cards
@@ -308,6 +310,7 @@ Copy=Copy
 Paste=Paste
 Default=Default
 DefaultValue=Default value
+DefaultValues=Default values
 Price=Prezioa
 UnitPrice=Unit price
 UnitPriceHT=Unit price (net)
@@ -363,7 +366,8 @@ VATRate=Tax Rate
 Average=Average
 Sum=Sum
 Delta=Delta
-Module=Module
+Module=Module/Application
+Modules=Modules/Applications
 Option=Option
 List=List
 FullList=Full list
@@ -387,7 +391,7 @@ ActionRunningNotStarted=To start
 ActionRunningShort=In progress
 ActionDoneShort=Finished
 ActionUncomplete=Uncomplete
-CompanyFoundation=Company/Foundation
+CompanyFoundation=Company/Organisation
 ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
@@ -405,8 +409,9 @@ Generate=Generate
 Duration=Duration
 TotalDuration=Total duration
 Summary=Summary
-DolibarrStateBoard=Statistics
-DolibarrWorkBoard=Work tasks board
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=Available
 NotYetAvailable=Not yet available
 NotAvailable=Not available
@@ -434,7 +439,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Opened
+Opened=Open
 New=New
 Discount=Discount
 Unknown=Ezezaguna
@@ -453,6 +458,7 @@ NextStep=Next step
 Datas=Data
 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.
 Photo=Irudia
@@ -606,7 +612,8 @@ PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
 Canceled=Canceled
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
+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
 Color=Color
 Documents=Linked files
@@ -642,6 +649,7 @@ FreeLineOfType=Free entry of type
 CloneMainAttributes=Clone object with its main attributes
 PDFMerge=PDF Merge
 Merge=Merge
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Show page to print main content area
 MenuManager=Menu manager
 WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only login <b>%s</b> is allowed to use application at the moment.
@@ -708,6 +716,7 @@ from=from
 toward=toward
 Access=Access
 SelectAction=Select action
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
 SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
 OriginFileName=Original filename
@@ -718,7 +727,7 @@ ViewPrivateNote=View notes
 XMoreLines=%s line(s) hidden
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
+SelectElementAndClick=Select an element and click %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
@@ -734,8 +743,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
@@ -755,11 +764,20 @@ Calendar=Egutegia
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -817,5 +835,3 @@ SearchIntoContracts=Kontratuak
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/eu_ES/other.lang b/htdocs/langs/eu_ES/other.lang
index eb41a1862a4..b68133779e6 100644
--- a/htdocs/langs/eu_ES/other.lang
+++ b/htdocs/langs/eu_ES/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=Date of birth
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Statistics in number of products/services units
-StatsByNumberOfEntities=Statistics in number of referring entities
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=The intervention %s has been validated.
 EMailTextInvoiceValidated=The invoice %s has been validated.
diff --git a/htdocs/langs/eu_ES/projects.lang b/htdocs/langs/eu_ES/projects.lang
index 72f0eadeaed..9805bee3f4c 100644
--- a/htdocs/langs/eu_ES/projects.lang
+++ b/htdocs/langs/eu_ES/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
 PrivateProject=Project contacts
+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 (whatever is the type).
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=New project
 AddProject=Create project
 DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Opened projects
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
 SetProject=Set project
 NoProject=No project defined or owned
 NbOfProjects=Nb of projects
+NbOfTasks=Nb of tasks
 TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
@@ -47,9 +52,9 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=Erabiltzailea
 TaskTimeNote=Oharra
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
-NewTimeSpent=New time spent
+NewTimeSpent=Time spent
 MyTimeSpent=My time spent
 Tasks=Tasks
 Task=Task
@@ -59,6 +64,7 @@ TaskDescription=Task description
 NewTask=New task
 AddTask=Create task
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Activity
 Activities=Tasks/activities
 MyActivities=My tasks/activities
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=List of contracts associated with the project
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
 ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
@@ -110,7 +118,7 @@ TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
-TaskIsNotAffectedToYou=Task not assigned to you
+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.
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
 ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/fa_IR/accountancy.lang b/htdocs/langs/fa_IR/accountancy.lang
index 8d860a072db..7d6d08374eb 100644
--- a/htdocs/langs/fa_IR/accountancy.lang
+++ b/htdocs/langs/fa_IR/accountancy.lang
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=اضافه کردن یک حساب حسابداری
 AccountAccounting=حساب حسابداری
 AccountAccountingShort=حساب
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=حساب حسابداری پیشنهاد شده
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=شامل شدن با صورت حسابهای تامین ک
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=ایجاد نقل و انتقال جدید
 UpdateMvts=ویرایش نقل و انتقال
-WriteBookKeeping=درج نقل و انتقالات در دفتر کل
-Bookkeeping=دفتر کل
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Account balance
 
 CAHTF=جمع میزان تامین کنندۀ خرید قبل از مالیات
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
@@ -132,19 +140,19 @@ Sens=SENS
 Codejournal=روزنامه
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=بدهی و اعتبار نمی توانند بطور همزمان حاوی مقدار باشند
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=فهرست حساب های حسابداری
 
 Pcgtype=کلاس حساب
-Pcgsubtype=تحت دسته از حساب
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=حاشیه فروش کل
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=رمز
+Nature=طبیعت
+AccountingJournalType1=Various operation
+AccountingJournalType2=فروش
+AccountingJournalType3=خرید
+AccountingJournalType4=بانک
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=صادرات
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index 7763ab7e9de..c7819cd3426 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=کاربران داخلی
 ExternalUsers=کاربران خارجی
 GUISetup=نمایش
 SetupArea=منطقه راه اندازی
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=فرم برای تست آپلود فایل (با توجه به راه اندازی)
 IfModuleEnabled=توجه داشته باشید: بله موثر است تنها در صورتی که <b>بخش٪ s</b> فعال است
 RemoveLock=حذف <b>فایل٪ s</b> در صورت وجود اجازه می دهد تا استفاده از ابزار به روز رسانی.
@@ -85,7 +86,7 @@ Mask=ماسک
 NextValue=ارزش بعدی
 NextValueForInvoices=ارزش بعدی (صورت حساب)
 NextValueForCreditNotes=ارزش بعدی (یادداشت های اعتباری)
-NextValueForDeposit=ارزش بعدی (سپرده)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=ارزش بعدی (جایگزین)
 MustBeLowerThanPHPLimit=توجه: PHP خود را محدود به اندازه هر فایل آپلود را <b>به٪ s٪</b> s را، هر چه مقدار این پارامتر است
 NoMaxSizeByPHPLimit=توجه داشته باشید: هیچ محدودیتی در تنظیمات PHP شما تنظیم
@@ -103,7 +104,7 @@ MenuIdParent=منو پدر و مادر ID
 DetailMenuIdParent=ID از منو پدر و مادر (خالی برای منوی بالا)
 DetailPosition=تعداد مرتب سازی بر برای تعریف موقعیت منو
 AllMenus=همه
-NotConfigured=ماژول تنظیم نشده است
+NotConfigured=Module/Application not configured
 Active=فعال
 SetupShort=برپایی
 OtherOptions=گزینه های دیگر
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=هزار جدا
 Destination=مقصد
 IdModule=ماژول ID
 IdPermissions=مجوز های ID
-Modules=ماژول ها
 LanguageBrowserParameter=پارامتر٪ بازدید کنندگان
 LocalisationDolibarrParameters=پارامترهای محلی سازی
 ClientTZ=کارفرما منطقه زمان (کاربر)
@@ -123,7 +123,8 @@ PHPTZ=PHP سرور منطقه زمان
 DaylingSavingTime=نور روز صرفه جویی در زمان
 CurrentHour=PHP زمان (سرور)
 CurrentSessionTimeOut=فاصله را وارد نمایید کنونی
-YouCanEditPHPTZ=برای تنظیم منطقه زمانی PHP مختلف (مورد نیاز نمی باشد)، شما می توانید سعی کنید برای اضافه کردن یک فایل. htacces با یک خط مثل این "SetEnv TZ اروپا / پاریس"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max number of lines for widgets
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=مجوز
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=تنها عناصر از <a href="%s">ماژول های فعال</a> نمایش داده می شود.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=رمز عبور پایگاه داده را در
 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=حفاظت از فایل های پی دی اف ایجاد شده (فعال توصیه نمی شود، می شکند نسل پی دی اف توده)
-ProtectAndEncryptPdfFilesDesc=محافظت از یک سند PDF آن را نگه می دارد قابل مطالعه و چاپ با هر مرورگر PDF. با این حال، ویرایش و کپی امکان پذیر نیست. توجه داشته باشید که با استفاده از این ویژگی ساختمان از پی دی اف انباشت شده و متراکم جهانی کار نمی کند (مثل صورت حساب های پرداخت نشده).
+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=خصیصه
 DolibarrLicense=پروانه
 Developpers=توسعه دهندگان / همکاران
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr نسخه ی نمایشی آنلاین
 OfficialMarketPlace=بازار رسمی برای ماژول های خارجی / افزونه
 OfficialWebHostingService=خدمات وب اشاره میزبانی وب (ابر میزبانی وب)
 ReferencedPreferredPartners=ترجیحی همکاران
-OtherResources=Autres ressources
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=برای کاربر و یا اسناد و مدارک توسعه (دکتر، پرسش و ...)، <br> نگاهی به Dolibarr ویکی: <br> <a href="%s" target="_blank"><b>از٪ s</b></a>
 ForAnswersSeeForum=برای هر گونه سوال / کمک های دیگر، شما می توانید انجمن Dolibarr استفاده کنید: <br> <a href="%s" target="_blank"><b>از٪ s</b></a>
 HelpCenterDesc1=این منطقه می تواند به شما کمک کند برای دریافت خدمات پشتیبانی راهنما در Dolibarr.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=این قابلیت وجود ندارد در یونی
 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/
 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=ماژول راه اندازی
-ModulesSetup=راه اندازی ماژول ها
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=سیستم
 ModuleFamilyCrm=مدیریت ارتباط با مشتری (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=نسخه فعلی Dolibarr
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=بروزرسانی آفلاین سرور
+WithCounter=Manage a counter
 GenericMaskCodes=شما می توانید ماسک شماره را وارد کنید. در این ماسک، تگ های زیر می تواند مورد استفاده قرار گیرد: <br> <b>{000000}</b> مربوط به تعداد خواهد شد که در هر یک از٪ s را افزایش مییابد. به عنوان بسیاری از صفر را وارد کنید به عنوان طول مورد نظر از ضد. شمارنده خواهد شد صفر از سمت چپ به منظور به صفر کرده اند و بسیاری از ماسک به پایان رسید. <br> <b>{000.000 +000}</b> همان قبلی است اما جبران مربوطه را به شماره در سمت راست علامت + شروع به کار رفته در اولین٪ است. <br> <b>{000000 @ X}</b> همان قبلی است اما شمارنده به صفر زمانی که ماه X برسد (x بین 1 و 12، و یا 0 به استفاده از ماه های اولیه سال مالی تعیین شده در تنظیمات خود را، و یا 99 به صفر هر ماه ). اگر این گزینه استفاده می شود و x است 2 یا بالاتر، و سپس دنباله {YY} {میلی متر} یا {تاریخ برای ورود yyyy} {میلی متر} نیز مورد نیاز است. <br> <b>{تولد}</b> روز (01 تا 31). <br> <b>{میلی متر}</b> ماه (01 تا 12). <br> <b>{YY}، {تاریخ برای ورود yyyy}</b> یا <b>{Y}</b> سال بیش از 2، 4 و یا 1 عدد. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=تمام شخصیت های دیگر در ماسک دست نخورده باقی خواهد ماند. <br> فضاهای امکان پذیر نیست. <br>
-GenericMaskCodes4a=<u>به عنوان مثال در 99٪ از TheCompany شخص ثالث انجام می شود 2007/1/31:</u> <br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>به عنوان مثال در شخص ثالث ایجاد شده در 2007/03/01:</u> <br>
 GenericMaskCodes4c=<u>به عنوان مثال در محصول ایجاد شده در 2007/03/01:</u> <br>
-GenericMaskCodes5=<b>ABC {YY} {میلی متر} - {000000}</b> خواهد <b>ABC0701-000099</b> را <br> <b>{0000 +100 @ 1}-ZZZ / {تولد} / XXX</b> خواهد <b>0199-ZZZ/31/XXX</b> را
+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=تعداد قابل تنظیم می گرداند با توجه به ماسک تعریف شده است.
 ServerAvailableOnIPOrPort=سرور در <b>آدرس٪ s روی پورت٪</b> در <b>دسترس</b> است
 ServerNotAvailableOnIPOrPort=سرور در دسترس نیست در <b>آدرس٪ s روی پورت٪ بازدید کنندگان</b>
@@ -369,19 +375,21 @@ Int=عدد صحیح
 Float=شناور
 DateAndTime=تاریخ و ساعت
 Unique=منحصر به فرد
-Boolean=بولی (جعبه)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = تلفن
 ExtrafieldPrice = قیمت
 ExtrafieldMail = پست الکترونیک
 ExtrafieldUrl = Url
 ExtrafieldSelect = لیست انتخاب کنید
 ExtrafieldSelectList = انتخاب از جدول
-ExtrafieldSeparator=تفکیک کننده
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=رمز عبور
-ExtrafieldCheckBox=جعبه
-ExtrafieldRadio=دکمه های رادیویی
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldRadio=Radio buttons (on 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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=فهرست پارامترها را به مانند کلید، ارزش است <br><br> به عنوان مثال: <br> 1، VALUE1 <br> 2، VALUE2 <br> 3، value3 <br> ...
 ExtrafieldParamHelpradio=فهرست پارامترها را به مانند کلید، ارزش است <br><br> به عنوان مثال: <br> 1، VALUE1 <br> 2، VALUE2 <br> 3، value3 <br> ...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=رشته
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=کاربران و گروه های
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=فاکتور و مدیریت توجه داشته باشید اعت
 Module40Name=تولید کنندگان
 Module40Desc=مدیریت تامین و خرید (سفارشات و فاکتورها)
 Module42Name=گزارش ها
-Module42Desc=امکانات ورود به سیستم (فایل، syslog را، ...)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=ویراستاران
 Module49Desc=مدیریت ویرایشگر
 Module50Name=محصولات
@@ -499,8 +521,8 @@ Module410Name=Webcalendar
 Module410Desc=ادغام Webcalendar
 Module500Name=هزینه های ویژه
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=اطلاعیه ها
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP با Maxmind قابلیت تبدیل
 Module3100Name=اسکایپ
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
-Module4000Desc=Human resources management
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=چند شرکت
 Module5000Desc=اجازه می دهد تا به شما برای مدیریت شرکت های متعدد
 Module6000Name=گردش کار
@@ -591,7 +615,7 @@ Permission32=ایجاد / تغییر محصول
 Permission34=حذف محصول
 Permission36=مشاهده / مدیریت محصولات مخفی
 Permission38=محصولات صادراتی
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=حذف پروژه (پروژه مشترک و پروژه های I تماس با هستم)
 Permission45=Export projects
@@ -844,12 +868,14 @@ DictionaryOrderMethods=مرتب سازی بر روش
 DictionarySource=منبع از پیشنهادات / سفارشات
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=مدل برای نمودار حساب
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=الگوهای ایمیل
 DictionaryUnits=واحد
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=راه اندازی نجات داد
+SetupNotSaved=Setup not saved
 BackToModuleList=بازگشت به لیست ماژول ها
 BackToDictionaryList=برگشت به فهرست واژه نامه ها
 VATManagement=مدیریت مالیات بر ارزش افزوده
@@ -921,7 +947,7 @@ Host=سرور
 DriverType=نوع درایور
 SummarySystem=سیستم خلاصه اطلاعات
 SummaryConst=فهرست تمام پارامترهای راه اندازی Dolibarr
-MenuCompanySetup=شرکت / موسسه
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= مدیر منوی استاندارد
 DefaultMenuSmartphoneManager=مدیر منو گوشی های هوشمند
 Skin=تم پوست
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Default max length for lists
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=پیام روز
 MessageLogin=ارسال صفحه ورود
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=فرم جستجو دائمی در منوی سمت چپ
 DefaultLanguage=زبان پیش فرض برای استفاده از (زبان)
 EnableMultilangInterface=فعال کردن رابط کاربری چند زبانه
 EnableShowLogo=نمایش لوگو را در منوی سمت چپ
-CompanyInfo=شرکت / اطلاعات پایه
-CompanyIds=هویت شرکت / بنیاد
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=نام
 CompanyAddress=نشانی
 CompanyZip=زیپ
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=تاخیر تحمل (در روز) قبل از آماد
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=تاخیر تحمل (در روز) قبل از آماده باش برای چک سپرده به انجام
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=دیگر نوشته های منو مدیریت پارامتر اختیاری دارد.
 LogEvents=رویدادهای ممیزی امنیت
 Audit=ممیزی
@@ -987,7 +1015,7 @@ BrowserOS=مرورگر OS
 ListOfSecurityEvents=فهرست حوادث امنیتی Dolibarr
 SecurityEventsPurged=رویدادهای امنیتی پاکسازی
 LogEventDesc=شما می توانید در اینجا قادر به ورود به سیستم برای رویدادهای امنیتی Dolibarr. <b>حسابرسی -</b> مدیران پس از آن می توانید مطالب خود را از طریق <b>ابزارهای سیستم</b> منو را ببینید. اخطار، این ویژگی می تواند مقدار زیادی از داده ها در پایگاه داده مصرف می کند.
-AreaForAdminOnly=این ویژگی را می توان تنها <b>کاربران مدیر</b> استفاده می شود.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=اطلاعات سیستم اطلاعات فنی موارد دیگر شما در حالت فقط خواندنی و قابل مشاهده فقط برای مدیران دریافت می باشد.
 SystemAreaForAdminOnly=این منطقه در دسترس است فقط برای کاربران مدیر سیستم باشد. هیچ یک از مجوز Dolibarr می تواند از این حد کاهش دهد.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists in any language files
+TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=شما باید حداقل قادر می سازد 1 ماژول
 ClassNotFoundIntoPathWarning=کلاس٪ s ​​را به مسیر PHP یافت نشد
 YesInSummer=بله در فصل تابستان
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=ذخیره سازی جلسه رمز شده توسط Suhosin
 ConditionIsCurrently=وضعیت در حال حاضر از٪ s
 YouUseBestDriver=شما با استفاده از راننده٪ است که بهترین راننده های موجود در حال حاضر.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=قوانین در حرفه شناسه
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=لینک صادرات به <b>فرمت٪ s</b> در لینک زیر موجود است:٪ s
 ##### Invoices #####
 BillsSetup=راه اندازی ماژول فاکتورها
 BillsNumberingModule=فاکتورها و یادداشت های اعتباری مدل شماره
 BillsPDFModules=اسناد فاکتور مدل
+PaymentsPDFModules=Payment documents models
 CreditNote=توجه داشته باشید اعتباری
 CreditNotes=یادداشت های اعتباری
 ForceInvoiceDate=تاریخ فاکتور نیروی به تاریخ اعتبار
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=فایل های از نوع٪ s را با HTTP سرور ک
 FilesOfTypeCompressed=فایل های از نوع٪ s را با HTTP سرور فشرده
 FilesOfTypeNotCompressed=فایل های از نوع٪ s را با HTTP سرور فشرده نیست
 CacheByServer=کش سرور
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=کش شده توسط مرورگر
 CompressionOfResources=فشرده سازی از پاسخهای HTTP
+CompressionOfResourcesDesc=For exemple 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 your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=راه اندازی ماژول محصولات
 ServiceSetup=راه اندازی خدمات ماژول
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=تاریخ فاکتور استفاده می شود
 Buy=خرید
 Sell=فروش
 InvoiceDateUsed=تاریخ فاکتور استفاده می شود
-YourCompanyDoesNotUseVAT=شرکت شما تعریف شده مالیات بر ارزش افزوده (صفحه اصلی - راه اندازی - شرکت / بنیاد) استفاده نمی کند، بنابراین هیچ گزینه های مالیات بر ارزش افزوده به نصب وجود دارد.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=حسابداری کد
 AccountancyCodeSell=حساب فروش. رمز
 AccountancyCodeBuy=خرید حساب. رمز
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=تنظیم به صورت خودکار این وضع
 AGENDA_DEFAULT_VIEW=کدام زبانه می خواهید برای باز کردن به طور پیش فرض هنگام انتخاب دستور کار منو
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=کلیک کنید تا شماره گیری راه اندازی ماژول
-ClickToDialUrlDesc=آدرس نامیده می شود که با کلیک بر روی picto تلفن انجام می شود. در URL، شما می توانید برچسب ها <br> <b>__PHONETO__</b> خواهد شد که با شماره تلفن از فرد جایگزین را به تماس <br> <b>__PHONEFROM__</b> خواهد شد که با شماره تلفن تماس شخص (شما) به جای <br> <b>__LOGIN__</b> خواهد شد که با ورود clicktodial خود را جایگزین (تعریف شده در کارت کاربر شما) <br> <b>__PASS__</b> خواهد شد که با رمز عبور clicktodial شما (تعریف شده در کارت کاربر خود را) جایگزین شده است.
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 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.
 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 same computer than 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.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+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.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=ترتیب نمایش عمومی
 BankOrderES=اسپانیایی
 BankOrderESDesc=ترتیب نمایش اسپانیایی
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=چند شرکت نصب ماژول
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ 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.
 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.
-ConfFileMuseContainCustom=Installing 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)
 TextTitleColor=Color of page title
 LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/fa_IR/compta.lang b/htdocs/langs/fa_IR/compta.lang
index 2b09183ed71..5a4510ef659 100644
--- a/htdocs/langs/fa_IR/compta.lang
+++ b/htdocs/langs/fa_IR/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=مقدار در اینجا نشان دا
 Param=برپایی
 RemainingAmountPayment=پرداخت مقدار باقی مانده:
 Account=حساب
-Accountparent=حساب پدر و مادر
-Accountsparent=حساب پدر و مادر
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=درامد
 Outcome=هزینه
 ReportInOut=درآمد / هزینه
@@ -56,6 +56,7 @@ MenuTaxAndDividends=مالیات و سود سهام
 MenuSocialContributions=Social/fiscal taxes
 MenuNewSocialContribution=New social/fiscal tax
 NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=منطقه حسابداری / خزانه داری
 NewPayment=پرداخت جدید
@@ -134,8 +135,8 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- این شامل تمام پرداخت های موثر از فاکتورها دریافت شده از مشتریان. <br> - این است که در روز پرداخت از این فاکتورها بر اساس <br>
-DepositsAreNotIncluded=- صورت حساب های سپرده ها و نه شامل
-DepositsAreIncluded=- صورت حساب های سپرده را شامل می شوند
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=گزارش شده توسط شخص ثالث IRPF
 LT1ReportByCustomersInInputOutputModeES=گزارش شده توسط شخص ثالث RE
 VATReport=VAT report
@@ -169,7 +170,7 @@ DescSellsJournal=مجله فروش
 DescPurchasesJournal=مجله خرید
 InvoiceRef=کد عکس فاکتور.
 CodeNotDef=تعریف نشده
-WarningDepositsNotIncluded=سپرده فاکتورها در این نسخه با این ماژول حسابداری گنجانده نشده است.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=تاریخ مدت پرداخت نمی تواند کمتر از تاریخ شی.
 Pcg_version=Chart of accounts models
 Pcg_type=نوع PCG
@@ -189,8 +190,10 @@ AccountancyJournal=کد حسابداری مجله
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/fa_IR/cron.lang b/htdocs/langs/fa_IR/cron.lang
index 21bca90a3c6..b5c199e86e8 100644
--- a/htdocs/langs/fa_IR/cron.lang
+++ b/htdocs/langs/fa_IR/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allow to execute job that have been planned
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=کار
 CronNone=هیچ یک
 CronDtStart=Not before
@@ -57,12 +57,12 @@ CronStatusActiveBtn=قادر ساختن
 CronStatusInactiveBtn=از کار انداختن
 CronTaskInactive=این کار غیر فعال است
 CronId=شناسایی
-CronClassFile=کلاس ها (filename.class.php)
-CronModuleHelp=نام Dolibarr دایرکتوری ماژول (با ماژول Dolibarr خارجی کار می کنند). <BR> برای exemple به بهانه روش Dolibarr شی محصولات / htdocs / <u>محصول</u> / کلاس / product.class.php، ارزش ماژول <i>محصول</i>
-CronClassFileHelp=نام فایل برای بارگذاری. <BR> برای exemple به بهانه روش Dolibarr محصولات شی / htdocs / محصول / کلاس / <u>product.class.php،</u> ارزش نام فایل کلاس <i>product.class.php</i> است
-CronObjectHelp=نام شی برای بارگذاری. <BR> برای exemple به بهانه روش Dolibarr شی محصولات / htdocs / محصول / کلاس / product.class.php، ارزش نام فایل کلاس <i>محصولات</i> است
-CronMethodHelp=روش شی برای راه اندازی. <BR> برای exemple به بهانه روش Dolibarr محصولات شی / htdocs / محصول / کلاس / product.class.php، ارزش روش است <i>fecth</i>
-CronArgsHelp=استدلال از روش. <BR> برای exemple به بهانه روش Dolibarr محصولات شی / htdocs / محصول / کلاس / product.class.php، مقدار پارامترهای می تواند <i>0، ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=خط فرمان سیستم را اجرا کند.
 CronCreateJob=Create new Scheduled Job
 CronFrom=از
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/fa_IR/errors.lang b/htdocs/langs/fa_IR/errors.lang
index 3540240bd0f..276a2e9ec03 100644
--- a/htdocs/langs/fa_IR/errors.lang
+++ b/htdocs/langs/fa_IR/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=برای ایجاد پرونده <b>«٪ s»</b> شکست
 ErrorFailToRenameDir=برای تغییر نام دایرکتوری <b>'٪ s'</b> را به <b>'٪ s</b> »شکست خورد.
 ErrorFailToCreateDir=برای ایجاد دایرکتوری <b>'٪ s</b> »شکست خورد.
 ErrorFailToDeleteDir=دایرکتوری <b>'٪ s' به</b> حذف انجام نشد.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=این تماس در حال حاضر به عنوان تماس برای این نوع تعریف شده است.
 ErrorCashAccountAcceptsOnlyCashMoney=این حساب بانکی یک حساب نقدی، پس از آن پرداخت و تنها نوع پول نقد را می پذیرد.
 ErrorFromToAccountsMustDiffers=منبع و اهداف حساب های بانکی باید متفاوت باشد.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=برای نوشتن در پوشه٪ s شکست خورد
 ErrorFoundBadEmailInFile=یافت نحو ایمیل نادرست برای٪ s خط در فایل (به عنوان مثال خط٪ با ایمیل =٪ بازدید کنندگان)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=برخی از زمینه های مورد نیاز است نه شد.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=برای ایجاد یک دایرکتوری شکست خورده است. بررسی کنید که کاربر وب سرور دارای مجوز به ارسال به Dolibarr دایرکتوری اسناد. اگر <b>safe_mode</b> پارامتر در این PHP را فعال کنید، بررسی کنید که فایل های پی اچ پی Dolibarr صاحب به کاربر وب سرور (یا گروه).
 ErrorNoMailDefinedForThisUser=بدون پست تعریف شده برای این کاربر
 ErrorFeatureNeedJavascript=این قابلیت نیاز به جاوا اسکریپت را فعال شود به کار می کنند. تغییر این در نصب - صفحه نمایش.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoice
 ErrorWebServerUserHasNotPermission=حساب <b>کاربری٪ s را</b> برای اجرای وب سرور بدون اجازه که
 ErrorNoActivatedBarcode=بدون بارکد از نوع فعال
 ErrUnzipFails=برای جدا کردن٪ s با ZipArchive ناموفق
-ErrNoZipEngine=بدون موتور را از حالت زیپ خارج از٪ s فایل در این PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=پرونده٪ s باید یک بسته فشرده Dolibarr است
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=PHP CURL نصب نشده است، این ضروری است که با پی پال صحبت
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # 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.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice
 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/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang
index 7c02f6f694e..4d89cb3ed8b 100644
--- a/htdocs/langs/fa_IR/main.lang
+++ b/htdocs/langs/fa_IR/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=پارامتر٪ s را تعریف نشده
 ErrorUnknown=خطا مشخص نشده است
 ErrorSQL=خطا در SQL
 ErrorLogoFileNotFound=فایل لوگو '٪ s' یافت نشد
-ErrorGoToGlobalSetup=برو به راه اندازی "شرکت / بنیاد برای رفع این
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=برو به ماژول راه اندازی به رفع این
 ErrorFailedToSendMail=برای ارسال ایمیل (فرستنده =٪ S، گیرنده =٪ بازدید کنندگان) شکست خورد
 ErrorFileNotUploaded=فایل آپلود نشد. بررسی کنید که اندازه حداکثر مجاز تجاوز نمی کند، که فضای خالی موجود بر روی دیسک است و در حال حاضر وجود دارد یک فایل با همین نام در این شاخه.
@@ -153,6 +153,7 @@ Edit=ویرایش
 Validate=معتبر ساختن
 ValidateAndApprove=Validate and Approve
 ToValidate=به اعتبار
+NotValidated=Not validated
 Save=جویی در هزینه
 SaveAs=ذخیره به عنوان
 TestConnection=اتصال تست
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=بدون قابلیت قطع عملی با حالت
 Connection=ارتباط
 Setup=برپایی
 Alert=هوشیار
+MenuWarnings=تصویر، موسیقی
 Previous=قبلی
 Next=بعد
 Cards=کارت
@@ -308,6 +310,7 @@ Copy=نسخه
 Paste=خمیر
 Default=پیش فرض
 DefaultValue=ارزش قرار دادی
+DefaultValues=Default values
 Price=قیمت
 UnitPrice=قیمت واحد
 UnitPriceHT=قیمت واحد (خالص)
@@ -363,7 +366,8 @@ VATRate=نرخ مالیات
 Average=متوسط
 Sum=مجموع
 Delta=دلتا
-Module=واحد
+Module=Module/Application
+Modules=Modules/Applications
 Option=انتخاب
 List=فهرست
 FullList=لیست کامل
@@ -387,7 +391,7 @@ ActionRunningNotStarted=برای شروع
 ActionRunningShort=In progress
 ActionDoneShort=در دست اجرا
 ActionUncomplete=ناقص
-CompanyFoundation=شرکت / موسسه
+CompanyFoundation=Company/Organisation
 ContactsForCompany=اطلاعات تماس این شخص ثالث
 ContactsAddressesForCompany=تماس / آدرس برای این شخص ثالث
 AddressesForCompany=آدرس برای این شخص ثالث
@@ -405,8 +409,9 @@ Generate=تولید
 Duration=مدت
 TotalDuration=مدت زمان کل
 Summary=خلاصه
-DolibarrStateBoard=ارقام
-DolibarrWorkBoard=وظایف کار هیئت مدیره
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=در دسترس
 NotYetAvailable=هنوز در دسترس نیست
 NotAvailable=در دسترس نیست
@@ -434,7 +439,7 @@ Reportings=گزارش
 Draft=پیش نویس
 Drafts=نوعی بازی چکرز
 Validated=اعتبار
-Opened=افتتاح شد
+Opened=باز
 New=جدید
 Discount=تخفیف
 Unknown=ناشناخته
@@ -453,6 +458,7 @@ NextStep=گام بعدی
 Datas=اطلاعات
 None=هیچ یک
 NoneF=هیچ یک
+NoneOrSeveral=None or several
 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.
 Photo=تصویر
@@ -606,7 +612,8 @@ PartialWoman=بخشی
 TotalWoman=کل
 NeverReceived=هرگز دریافت
 Canceled=لغو شد
-YouCanChangeValuesForThisListFromDictionarySetup=شما می توانید مقادیر را برای این لیست را از تنظیمات منو را تغییر دهید - فرهنگ لغت
+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
 Color=رنگ
 Documents=فایل های مرتبط
@@ -642,6 +649,7 @@ FreeLineOfType=ورود رایگان از نوع
 CloneMainAttributes=شی کلون با ویژگی های اصلی آن
 PDFMerge=PDF ادغام
 Merge=ادغام کردن
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=نمایش صفحه به چاپ منطقه محتوای اصلی
 MenuManager=مدیریت منو
 WarningYouAreInMaintenanceMode=اخطار، شما در یک حالت تعمیر و نگهداری می باشد، بنابراین تنها ورود <b>به٪ s را</b> مجاز به استفاده از نرم افزار در حال حاضر.
@@ -708,6 +716,7 @@ from=از
 toward=نسبت به
 Access=دسترسی
 SelectAction=Select action
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=استفاده از کلیدهای Ctrl + C برای کپی به کلیپ بورد
 SaveUploadedFileWithMask=ذخیره فایل بر روی سرور با نام <strong>"٪ s"</strong> (در غیر این صورت "٪ s")
 OriginFileName=نام فایل اصلی
@@ -718,7 +727,7 @@ ViewPrivateNote=مشاهده یادداشت
 XMoreLines=٪ خط (بازدید کنندگان) پنهان
 PublicUrl=URL عمومی
 AddBox=اضافه کردن جعبه
-SelectElementAndClickRefresh=Select an element and click Refresh
+SelectElementAndClick=Select an element and click %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
@@ -734,8 +743,8 @@ Hello=سلام
 Sincerely=Sincerely
 DeleteLine=حذف خط
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
@@ -755,11 +764,20 @@ Calendar=تقویم
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=سال مالی
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=دوشنبه
 Tuesday=سهشنبه
@@ -817,5 +835,3 @@ SearchIntoContracts=قراردادها
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/fa_IR/other.lang b/htdocs/langs/fa_IR/other.lang
index 0a20729b42e..a0b0810f346 100644
--- a/htdocs/langs/fa_IR/other.lang
+++ b/htdocs/langs/fa_IR/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=تاریخ تولد
 BirthdayAlertOn=تولد هشدار فعال
 BirthdayAlertOff=تولد غیر فعال هشدار
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=مداخله اعتبار
 Notify_FICHINTER_SENTBYMAIL=مداخله با پست
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=این ایمیل <b>آزمون</b> (آزمون کلمه
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__ شما در اینجا خواهید دید پیشنهاد تجاری __ PROPREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__ شما در اینجا خواهید دید که منظور __ ORDERREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ شما در اینجا خواهید دید منظور ما __ ORDERREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__ شما در اینجا خواهید دید حمل و نقل __ SHIPPINGREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__ شما در اینجا را پیدا خواهد کرد از مداخله __ FICHINTERREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__ __ PERSONALIZED__ __ SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>پروفسور کد از٪ s</b> اطلاعات بسته به کشور های شخص ثالث است. <br> به عنوان مثال، برای <b>کشور٪، این کد٪ بازدید کنندگان</b> است.
 DolibarrDemo=Dolibarr ERP / CRM نسخه ی نمایشی
-StatsByNumberOfUnits=آمار در تعدادی از محصولات / خدمات واحد
-StatsByNumberOfEntities=آمار در تعداد اشخاص مراجعه کننده
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=مداخله٪ s را دارای اعتبار بوده است.
 EMailTextInvoiceValidated=صورتحساب٪ s را دارای اعتبار بوده است.
diff --git a/htdocs/langs/fa_IR/projects.lang b/htdocs/langs/fa_IR/projects.lang
index 71713cc130c..f0349748b47 100644
--- a/htdocs/langs/fa_IR/projects.lang
+++ b/htdocs/langs/fa_IR/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=هر کسی
 PrivateProject=تماس با ما پروژه
+ProjectsImContactFor=Projects I'm explicitely a contact of
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=همه پروژه ها
 MyProjectsDesc=این دیدگاه محدود به پروژه شما یک تماس برای (هر چه باشد نوع) می باشد.
 ProjectsPublicDesc=این دیدگاه ارائه تمام پروژه ها به شما این اجازه را بخوانید.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=این دیدگاه ارائه تمام پروژه ها و وظایف
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=پروژه های جدید
 AddProject=Create project
 DeleteAProject=حذف یک پروژه
 DeleteATask=حذف کار
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Opened projects
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=نمایش پروژه
 SetProject=تنظیم پروژه
 NoProject=هیچ پروژه تعریف شده و یا متعلق به
 NbOfProjects=Nb در پروژه
+NbOfTasks=Nb of tasks
 TimeSpent=زمان صرف شده
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
@@ -47,9 +52,9 @@ TaskTimeSpent=مدت زمان صرف شده در کارها
 TaskTimeUser=کاربر
 TaskTimeNote=یادداشت
 TaskTimeDate=تاریخ
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
-NewTimeSpent=زمان جدید به سر برد
+NewTimeSpent=زمان صرف شده
 MyTimeSpent=وقت من صرف
 Tasks=وظایف
 Task=کار
@@ -59,6 +64,7 @@ TaskDescription=شرح وظیفه
 NewTask=کار جدید
 AddTask=Create task
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=فعالیت
 Activities=وظایف / فعالیت ها
 MyActivities=کارهای من / فعالیت ها
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=فهرست قرارداد در ارتباط با پروژه
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=فهرست مداخلات مرتبط با پروژه
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=تماس با ما پروژه
 ActionsOnProject=رویدادها در پروژه
 YouAreNotContactOfProject=شما یک تماس از این پروژه خصوصی نیست
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=زمان صرف شده حذف
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
@@ -110,7 +118,7 @@ TaskRessourceLinks=منابع
 ProjectsDedicatedToThisThirdParty=پروژه ها اختصاص داده شده به این شخص ثالث
 NoTasks=بدون وظایف برای این پروژه
 LinkedToAnotherCompany=لینک به دیگر شخص ثالث
-TaskIsNotAffectedToYou=Task not assigned to you
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=مدت زمان صرف شده خالی است
 ThisWillAlsoRemoveTasks=این کار همچنین تمام کارهای پروژه <b>(وظایف٪ s</b> در حال حاضر) حذف و تمام ورودی ها از زمان صرف شده.
 IfNeedToUseOhterObjectKeepEmpty=اگر برخی از اشیاء (فاکتور، سفارش، ...)، متعلق به شخص ثالث دیگری، باید به این پروژه برای ایجاد، نگه داشتن این خالی به این پروژه که احزاب چند سوم مرتبط است.
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
 ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/fi_FI/accountancy.lang b/htdocs/langs/fi_FI/accountancy.lang
index d7118bfdea3..4a0bf16d721 100644
--- a/htdocs/langs/fi_FI/accountancy.lang
+++ b/htdocs/langs/fi_FI/accountancy.lang
@@ -19,34 +19,38 @@ Journalization=Journalization
 Journaux=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
-Chartofaccounts=Chart of accounts
+Chartofaccounts=Tilikartta
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
-AccountancyArea=Accountancy area
+AccountancyArea=Kirjanpitoalue
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,12 +61,16 @@ ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
-MenuDefaultAccounts=Default accounts
-MenuVatAccounts=Vat accounts
-MenuTaxAccounts=Tax accounts
-MenuExpenseReportAccounts=Expense report accounts
-MenuLoanAccounts=Loan accounts
+MenuDefaultAccounts=Oletustilit
+MenuVatAccounts=Arvonlisäverotili
+MenuTaxAccounts=Verotili
+MenuExpenseReportAccounts=Kuluraportti tilit
+MenuLoanAccounts=Lainatilit
 MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=Binding to accounts
@@ -71,9 +79,9 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=General ledger
-AccountBalance=Account balance
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
+AccountBalance=Tilin saldo
 
 CAHTF=Total purchase supplier before tax
 TotalExpenseReport=Total expense report
@@ -85,13 +93,13 @@ IntoAccount=Bind line with the accounting account
 
 
 Ventilate=Bind
-LineId=Id line
+LineId=Rivin tunniste
 Processing=Processing
 EndProcessing=Process terminated.
 SelectedLines=Selected lines
 Lineofinvoice=Line of invoice
 LineOfExpenseReport=Line of expense report
-NoAccountSelected=No accounting account selected
+NoAccountSelected=Kirjanpitotiliä ei ole valittu
 VentilatedinAccount=Binded successfully to the accounting account
 NotVentilatedinAccount=Not bound to the accounting account
 XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
@@ -132,37 +140,37 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
-DelYear=Year to delete
-DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+DeleteMvt=Delete Ledger lines
+DelYear=Tuhottava vuosi
+DelJournal=Tuhottava päiväkirja
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
-VATAccountNotDefined=Account for VAT not defined
-ThirdpartyAccountNotDefined=Account for third party not defined
-ProductAccountNotDefined=Account for product not defined
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
+VATAccountNotDefined=ALV tiliä ei ole määritelty
+ThirdpartyAccountNotDefined=Sidosryhmän tiliä ei ole määritetty
+ProductAccountNotDefined=Tuotteen tiliä ei ole määritetty
 FeeAccountNotDefined=Account for fee not defined
-BankAccountNotDefined=Account for bank not defined
+BankAccountNotDefined=Pankin tiliä ei ole määritetty
 CustomerInvoicePayment=Payment of invoice customer
 ThirdPartyAccount=Thirdparty account
 NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=List of the accounting accounts
 
 Pcgtype=Class of account
-Pcgsubtype=Under class of account
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Koodi
+Nature=Luonto
+AccountingJournalType1=Various operation
+AccountingJournalType2=Myynti
+AccountingJournalType3=Ostot
+AccountingJournalType4=Pankki
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Exports
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -231,15 +252,16 @@ ValueNotIntoChartOfAccount=This value of accounting account does not exist into
 
 ## Dictionary
 Range=Range of accounting account
-Calculated=Calculated
-Formula=Formula
+Calculated=Laskettu
+Formula=Kaava
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+NoJournalDefined=No journal defined
+Binded=Rivit yhdistetty
+ToBind=Yhdistettäviä rivejä
 
-Binded=Lines bound
-ToBind=Lines to bind
-
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index b705178ca0c..c49fabf9780 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - admin
-Foundation=Foundation
+Foundation=Säätiö
 Version=Versio
 VersionProgram=Ohjelmaversio
-VersionLastInstall=Initial install version
-VersionLastUpgrade=Latest version upgrade
+VersionLastInstall=Alkuperäinen versio
+VersionLastUpgrade=Viimeisin versiopäivitys
 VersionExperimental=Kokeellinen
 VersionDevelopment=Kehitys
 VersionUnknown=Tuntematon
@@ -48,6 +48,7 @@ InternalUsers=Sisäiset käyttäjät
 ExternalUsers=Ulkopuoliset käyttäjät
 GUISetup=Näyttö
 SetupArea=Asetusalue
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Lomake testata tiedostonlähetyskiintiö (mukaan setup)
 IfModuleEnabled=Huomaa: kyllä on tehokas vain, jos <b>moduuli %s</b> on käytössä
 RemoveLock=Poista <b>tiedosto %s,</b> jos se on olemassa, jotta päivitys työkalu.
@@ -60,7 +61,7 @@ ErrorDecimalLargerThanAreForbidden=Virhe, tarkkuuden suurempi <b>kuin %s</b> ei
 DictionarySetup=Sanakirja setup
 Dictionary=Dictionaries
 ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
-ErrorCodeCantContainZero=Code can't contain value 0
+ErrorCodeCantContainZero=Koodi ei voi sisältää arvoa 0
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
@@ -78,14 +79,14 @@ CurrentTimeZone=Nykyinen aikavyöhyke
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
-Table=Table
+Table=Taulu
 Fields=Kentät
-Index=Index
+Index=Indeksi
 Mask=Mask
 NextValue=Seuraava arvo
 NextValueForInvoices=Seuraava arvo (laskut)
 NextValueForCreditNotes=Seuraava arvo (hyvityslaskut)
-NextValueForDeposit=Next value (deposit)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Next value (replacements)
 MustBeLowerThanPHPLimit=Huomaa: sinun PHP rajoissa kunkin tiedoston lataa <b>koko %s%</b> s, riippumatta tämän parametrin arvo on
 NoMaxSizeByPHPLimit=Huom: Ei raja on asetettu sinun PHP kokoonpano
@@ -103,7 +104,7 @@ MenuIdParent=Emo-valikosta tunnus
 DetailMenuIdParent=ID emo-valikossa (0 ylhäältä valikosta)
 DetailPosition=Lajittele numero määritellä valikkopalkki kanta
 AllMenus=Kaikki
-NotConfigured=Ei määritetty
+NotConfigured=Module/Application not configured
 Active=Aktiivinen
 SetupShort=Setup
 OtherOptions=Muut valinnat
@@ -113,20 +114,20 @@ CurrentValueSeparatorThousand=Thousand separator
 Destination=Destination
 IdModule=Module ID
 IdPermissions=Permissions ID
-Modules=Moduulit
 LanguageBrowserParameter=Parametri %s
 LocalisationDolibarrParameters=Lokalisointi parametrit
-ClientTZ=Client Time Zone (user)
-ClientHour=Client time (user)
-OSTZ=Server OS Time Zone
+ClientTZ=Asiakkaan aikavyöhyke (käyttäjä)
+ClientHour=Asiakkaan aikavyöhyke (käyttäjä)
+OSTZ=Palvelimen OS aikavyöhyke
 PHPTZ=Aikavyöhyke Server PHP
 DaylingSavingTime=Kesäaika (käyttäjä)
 CurrentHour=Nykyinen tunti
 CurrentSessionTimeOut=Nykyinen istunnon aikakatkaisun
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
-Boxes=Widgets
-MaxNbOfLinesForBoxes=Max number of lines for widgets
+Boxes=Widgetit
+MaxNbOfLinesForBoxes=Rivien maksimimäärä widgeteille
 PositionByDefault=Oletus jotta
 Position=Asema
 MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
@@ -137,14 +138,14 @@ System=System
 SystemInfo=Järjestelmän tiedot
 SystemToolsArea=Kehitysresurssit alueella
 SystemToolsAreaDesc=Tämä alue tarjoaa hallinnon ominaisuuksia. Käytä valikosta valita ominaisuus, jota etsit.
-Purge=Purge
+Purge=Siivoa
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
-PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk of losing data)
+PurgeDeleteLogFile=Poista Syslog modulin lokitiedosto <b>%s</b> (ei vaaraa tiedon menetyksestä)
 PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
 PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Poista kaikki tiedostot <b>hakemistoon %s.</b> Väliaikaiset tiedostot, mutta myös liitetyt tiedostot elementtejä (kolmansien osapuolten, laskut, ...) ja siirretty osaksi ECM moduuli on poistettu.
 PurgeRunNow=Siivoa nyt
-PurgeNothingToDelete=No directory or files to delete.
+PurgeNothingToDelete=Ei tuhottavia hakemistoja eikä tiedostoja.
 PurgeNDirectoriesDeleted=<b> %s</b> tiedostot tai hakemistot poistetaan.
 PurgeAuditEvents=Purge kaikki tapahtumat
 ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
@@ -164,7 +165,7 @@ ImportPostgreSqlDesc=Tuo varmuuskopiotiedosto, sinun täytyy käyttää pg_resto
 ImportMySqlCommand=%s %s &lt;mybackupfile.sql
 ImportPostgreSqlCommand=%s %s mybackupfile.sql
 FileNameToGenerate=Tiedoston nimi tuottaa
-Compression=Compression
+Compression=Pakkaus
 CommandsToDisableForeignKeysForImport=Komento poistaa ulko avaimet tuontiluvista
 CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
 ExportCompatibility=Yhteensopivuutta luodaan viedä tiedosto
@@ -176,7 +177,7 @@ FullPathToPostgreSQLdumpCommand=Täysi polku pg_dump komento
 ExportOptions=Vienti Valinnat
 AddDropDatabase=Add DROP DATABASE command
 AddDropTable=Lisää DROP TAULUKON komento
-ExportStructure=Structure
+ExportStructure=Rakenne
 NameColumn=Nimi sarakkeet
 ExtendedInsert=Laajennettu INSERT
 NoLockBeforeInsert=Ei lukko komennot noin INSERT
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Oikeudet
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -199,7 +200,7 @@ DoliPartnersDesc=List of companies providing custom developed modules or feature
 WebSiteDesc=Reference websites to find more modules...
 URL=Linkki
 BoxesAvailable=Widgets available
-BoxesActivated=Widgets activated
+BoxesActivated=Widget aktivoitu
 ActivateOn=Ota annetun
 ActiveOn=Aktivoitu
 SourceFile=Lähdetiedostoa
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Tietokannan salasana salattu conf.php
 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=Suojaaminen syntyy pdf-tiedostoja (ei recommandd, taukoja massa pdf sukupolvi)
-ProtectAndEncryptPdfFilesDesc=Suojaaminen PDF asiakirja pitää saatavilla lukea ja tulostaa kaikki PDF-selaimella. Kuitenkin, editointi ja kopiointi ei ole mahdollista enää. Huomaa, että käyttäessäsi tätä ominaisuutta tehdä rakentaa maailmanlaajuinen kumuloida pdf ei toimi (kuten maksamattomat laskut).
+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=Ominaisuus
 DolibarrLicense=Lisenssi
 Developpers=Kehittäjät / vastaajat
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr online-demo
 OfficialMarketPlace=Virallinen markkinoilla ulkoisten moduulien / lisät
 OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
 ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=Käyttäjälle tai kehittäjän dokumentaatio (doc, FAQs ...), <br> katsoa, että Dolibarr Wiki: <br> <a href="%s" target="_blank"><b> %s</b></a>
 ForAnswersSeeForum=Muita kysymyksiä / apua, voit käyttää Dolibarr foorumilla: <br> <a href="%s" target="_blank"><b> %s</b></a>
 HelpCenterDesc1=Tämä alue voi auttaa sinua saamaan tukea palvelua Dolibarr.
@@ -267,12 +270,12 @@ FeatureNotAvailableOnLinux=Ominaisuus ei ole Unix-koneissa. Testaa sendmail ohje
 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/
 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=Moduuli setup
-ModulesSetup=Moduulit setup
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Asiakas Ressource Management (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
-ModuleFamilyProducts=Products Management (PM)
-ModuleFamilyHr=Human Resource Management (HR)
+ModuleFamilyProducts=Tuotehallinat (PM)
+ModuleFamilyHr=Henkilöstöhallinta (HR)
 ModuleFamilyProjects=Projektit / Yhteistyöhankkeet työn
 ModuleFamilyOther=Muu
 ModuleFamilyTechnic=Multi-modules työkalut
@@ -283,7 +286,7 @@ ModuleFamilyPortal=Web sites and other frontal application
 ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Valikko käsitteleville
 MenuAdmin=Valikko editor
-DoNotUseInProduction=Do not use in production
+DoNotUseInProduction=Älä käytä tuotannossa
 ThisIsProcessToFollow=This is steps to process:
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Vaihe %s
@@ -300,14 +303,17 @@ CurrentVersion=Dolibarr nykyinen versio
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Update server offline
+WithCounter=Manage a counter
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Kaikki muut merkit ja maski pysyy ennallaan. <br> Välilyönnit eivät ole sallittuja. <br>
-GenericMaskCodes4a=<u>Esimerkki on 99 %s on kolmannen osapuolen TheCompany tehnyt 2007-01-31:</u> <br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Esimerkki kolmannen osapuolen luotu 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>
+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=Paluu mukautettavan numeron mukaan määritelty mask.
 ServerAvailableOnIPOrPort=Server on saatavilla <b>osoitteessa %s satama %s</b>
 ServerNotAvailableOnIPOrPort=Palvelin ei ole käytettävissä <b>osoitteessa %s satama %s</b>
@@ -367,21 +373,23 @@ String=String
 TextLong=Long text
 Int=Integer
 Float=Float
-DateAndTime=Date and hour
+DateAndTime=Päivämäärä ja tunti
 Unique=Unique
-Boolean=Boolean (Checkbox)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Puhelin
 ExtrafieldPrice = Hinta
 ExtrafieldMail = Email
 ExtrafieldUrl = Url
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Salasana
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldRadio=Radio buttons (on 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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Kenttä
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Käyttäjät & ryhmät
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=Laskut ja hyvityslaskut hallinto-asiakkaille. Laskut hallinto-toimi
 Module40Name=Tavarantoimittajat
 Module40Desc=Toimittajien hallinta ja ostomenoista (tilaukset ja laskut)
 Module42Name=Syslog
-Module42Desc=Logging tilat (syslog)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Toimitus
 Module49Desc=Editors' hallinta
 Module50Name=Tuotteet
@@ -499,15 +521,15 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar yhdentyminen
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
-Module520Name=Loan
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
+Module520Name=Laina
 Module520Desc=Management of loans
 Module600Name=Ilmoitukset
 Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Lahjoitukset
 Module700Desc=Lahjoitukset hallinto
-Module770Name=Expense reports
+Module770Name=Kuluraportit
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind tulokset valmiuksia
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
-Module4000Desc=Human resources management
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi-yhtiö
 Module5000Desc=Avulla voit hallita useita yrityksiä
 Module6000Name=Workflow
@@ -591,7 +615,7 @@ Permission32=Luoda / muuttaa tuotetta / palvelua
 Permission34=Poista tuotteita / palveluita
 Permission36=Vienti tuotteet / palvelut
 Permission38=Vientituotteen
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Poista hankkeiden
 Permission45=Export projects
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Tilaaminen menetelmät
 DictionarySource=Alkuperä ehdotusten / tilaukset
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Emails templates
 DictionaryUnits=Yksiköt
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Setup tallennettu
+SetupNotSaved=Setup not saved
 BackToModuleList=Palaa moduulien luetteloon
 BackToDictionaryList=Palaa sanakirjat luettelo
 VATManagement=Alv Management
@@ -921,7 +947,7 @@ Host=Server
 DriverType=Driver tyyppi
 SummarySystem=System Information summary
 SummaryConst=Luettelo kaikista Dolibarr setup parametrit
-MenuCompanySetup=Yritys / säätiö
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= Standard valikonhallinta
 DefaultMenuSmartphoneManager=Smartphone valikonhallinta
 Skin=Ihon teema
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Default max length for lists
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=Message of the day
 MessageLogin=Kirjoita viesti
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Pysyvä hakulomake vasemmassa valikossa
 DefaultLanguage=Oletuskieltä käyttää (kieli-koodi)
 EnableMultilangInterface=Ota monikielinen käyttöliittymä
 EnableShowLogo=Show logo vasemmalla valikossa
-CompanyInfo=Yritys / säätiö tiedot
-CompanyIds=Yritys / perusta identiteettien
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=Nimi
 CompanyAddress=Osoite
 CompanyZip=Postinumero
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Suvaitsevaisuus viive (päivinä) ennen ilmoituksen my
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Suvaitsevaisuus viive (päivinä) ennen varoituksena sekit tallettaa tehdä
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Muut valikkoon rivit hallita valinnaisia parametrejä.
 LogEvents=Security Audit tapahtumat
 Audit=Audit
@@ -987,7 +1015,7 @@ BrowserOS=Browser OS
 ListOfSecurityEvents=Luettelo Dolibarr turvallisuus tapahtumat
 SecurityEventsPurged=Turvallisuus tapahtumia puhdistettava
 LogEventDesc=Voit ottaa loki Dolibarr turvallisuus tapahtumia täältä. Järjestelmänvalvojat voivat sitten nähdä sen sisällön kautta valikosta <b>System tools - Audit.</b> Varoitus, tämä ominaisuus voi kuluttaa suuren määrän tietoa tietokannasta.
-AreaForAdminOnly=Näitä toimintoja voi käyttää <b>järjestelmänvalvojan käyttäjät</b> vain. Administrator piirteet sekä auttaa todetaan Dolibarr ovat seuraavat picto:
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Järjestelmän tiedot ovat erinäiset tekniset tiedot saavat lukea vain tila ja näkyvissä vain järjestelmänvalvojat.
 SystemAreaForAdminOnly=Tämä alue on käytettävissä järjestelmänvalvojan käyttäjät vain. Ei mikään Dolibarr käyttöoikeudet voidaan vähentää tätä rajaa.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists 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
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Ammatillinen tunnus ainutlaatuinen
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=<b>Vienti-yhteys %s-muodossa</b> on saatavilla seuraavasta linkistä: %s
 ##### Invoices #####
 BillsSetup=Laskut moduulin asetukset
 BillsNumberingModule=Laskut ja hyvityslaskut numerointiin moduuli
 BillsPDFModules=Laskun asiakirjojen malleja
+PaymentsPDFModules=Payment documents models
 CreditNote=Menoilmoitus
 CreditNotes=Hyvityslaskuja
 ForceInvoiceDate=Force laskun päivämäärästä validointiin päivämäärä
@@ -1302,7 +1333,7 @@ LDAPFieldCompanyExample=Esimerkki: o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Esimerkki: objectsid
 LDAPFieldEndLastSubscription=Päiväys merkintää varten
-LDAPFieldTitle=Job position
+LDAPFieldTitle=Asema
 LDAPFieldTitleExample=Example: title
 LDAPSetupNotComplete=LDAP-asetukset ole täydellinen (go muiden välilehdet)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=N: o ylläpitäjä tai salasana tarjotaan. LDAP pääsy on nimetön ja vain luku-tilassa.
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
 FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
 FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
 CacheByServer=Cache by server
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
+CompressionOfResourcesDesc=For exemple 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 your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Tuotteet Moduuli setup
 ServiceSetup=Services-moduuli asennus
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Laskun päiväys käytetty
 Buy=Ostaa
 Sell=Myydä
 InvoiceDateUsed=Laskun päiväys käytetty
-YourCompanyDoesNotUseVAT=Yritys on määritelty saa käyttää arvonlisäveron (Home - Asetukset - Yritys / säätiö), joten ei ole mitään alv vaihtoehtoja asetukset.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=Kirjanpito koodi
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Napsauttamalla Dial-moduulin asetukset
-ClickToDialUrlDesc=Url kutsutaan kun napsautat puhelimen picto on tehty. Dans l'url, vous pouvez käytä les baliiseja <br> <b>%% 1 $ s</b> qui seerumien remplac par le tlphone de <b>l'appelbr&gt;%%</b> 2 $ s qui seerumien remplac par le tlphone de l'appelant (le votre) <br> <b>%% 3 $ s</b> qui seerumien remplac par votre sisäänkirjoittautumissivuksesi clicktodial (dfini sur votre fiche utilisateur) <br> <b>%% 4</b> $ s qui seerumien remplac par votre mot de elähtänyt clicktodial (dfini sur votre fiche utilisateur).
+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.
 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 same computer than 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.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+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.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=Yleinen näyttöjärjestys
 BankOrderES=Espanjalainen
 BankOrderESDesc=Espanjan näyttöjärjestys
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=Multi-yhtiö moduulin asetukset
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ 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.
 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.
-ConfFileMuseContainCustom=Installing 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)
 TextTitleColor=Color of page title
 LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/fi_FI/compta.lang b/htdocs/langs/fi_FI/compta.lang
index 19f6b0ce05e..b5757b3ccb9 100644
--- a/htdocs/langs/fi_FI/compta.lang
+++ b/htdocs/langs/fi_FI/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using r
 Param=Setup
 RemainingAmountPayment=Määrä maksu jäljellä:
 Account=Tili
-Accountparent=Account parent
-Accountsparent=Accounts parent
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=Tuotot
 Outcome=Tulos
 ReportInOut=Tulot / tulokset
@@ -56,12 +56,13 @@ MenuTaxAndDividends=Veroja ja osinkoja
 MenuSocialContributions=Social/fiscal taxes
 MenuNewSocialContribution=New social/fiscal tax
 NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Kirjanpito / Treasury alueella
 NewPayment=Uusi maksu
 Payments=Maksut
 PaymentCustomerInvoice=Asiakas laskun maksu
-PaymentSocialContribution=Social/fiscal tax payment
+PaymentSocialContribution=Social/fiscal veron maksu
 PaymentVat=ALV-maksu
 ListPayment=Luettelo maksut
 ListOfCustomerPayments=Luettelo asiakkaan maksut
@@ -134,8 +135,8 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- Se sisältää kaikki tehokkaan maksut laskut asiakkailta. <br> - Se perustuu maksupäivä näiden laskujen osalta <br>
-DepositsAreNotIncluded=- Talletus laskut eivät sisälly
-DepositsAreIncluded=- Talletus laskut kuuluvat
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Raportti kolmannen osapuolen IRPF
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
 VATReport=VAT report
@@ -169,7 +170,7 @@ DescSellsJournal=Myynti lehdessä
 DescPurchasesJournal=Ostot lehdessä
 InvoiceRef=Laskun ref.
 CodeNotDef=Ei määritelty
-WarningDepositsNotIncluded=Talletukset laskut eivät sisälly tähän versioon tämän kirjanpito moduulin.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
 Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
@@ -189,8 +190,10 @@ AccountancyJournal=Accountancy code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/fi_FI/cron.lang b/htdocs/langs/fi_FI/cron.lang
index 36ad552631f..5c391c13b52 100644
--- a/htdocs/langs/fi_FI/cron.lang
+++ b/htdocs/langs/fi_FI/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allow to execute job that have been planned
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Job
 CronNone=Ei mitään
 CronDtStart=Not before
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Poistaa käytöstä
 CronTaskInactive=This job is disabled
 CronId=Id
-CronClassFile=Classes (filename.class.php)
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=Mistä
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/fi_FI/errors.lang b/htdocs/langs/fi_FI/errors.lang
index 63489d7b0a8..be9b66629fd 100644
--- a/htdocs/langs/fi_FI/errors.lang
+++ b/htdocs/langs/fi_FI/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Luominen epäonnistui file <b>' %s'.</b>
 ErrorFailToRenameDir=Epäonnistui nimetä directory <b>' %s' osaksi' %s'.</b>
 ErrorFailToCreateDir=Luominen epäonnistui directory <b>' %s'.</b>
 ErrorFailToDeleteDir=Poistaminen ei onnistunut directory <b>' %s'.</b>
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=Tämä yhteys on jo määritelty yhteyttä tämän tyypin osalta.
 ErrorCashAccountAcceptsOnlyCashMoney=Tämä pankkitili on käteistä huomioon, joten se hyväksyy maksujen tyypin käteisellä vain.
 ErrorFromToAccountsMustDiffers=Lähde ja tavoitteet pankkitilit on erilainen.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Epäonnistui kirjoittaa hakemistoon %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=Löytyi virheellinen sähköposti syntaksi %s rivit tiedoston (esimerkiksi rivi %s email= %s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Jotkin vaaditut kentät eivät ole täytetty.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Luominen epäonnistui hakemiston. Tarkista, että Web-palvelin käyttäjällä on oikeudet kirjoittaa Dolibarr asiakirjat hakemistoon. Jos parametri <b>safe_mode</b> on käytössä tämän PHP, tarkista, että Dolibarr php tiedostot omistaa web-palvelimen käyttäjä (tai ryhmä).
 ErrorNoMailDefinedForThisUser=Ei postia määritelty tälle käyttäjälle
 ErrorFeatureNeedJavascript=Tätä ominaisuutta tarvitaan JavaScript on aktivoitu työstä. Muuta tämän setup - näyttö.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoice
 ErrorWebServerUserHasNotPermission=Käyttäjätili <b>%s</b> käyttää myös toteuttaa web-palvelimella ei ole lupaa, että
 ErrorNoActivatedBarcode=Ei viivakoodin tyyppi aktivoitu
 ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # 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.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice
 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/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang
index 64e62a31067..daba6808802 100644
--- a/htdocs/langs/fi_FI/main.lang
+++ b/htdocs/langs/fi_FI/main.lang
@@ -20,11 +20,11 @@ FormatHourShortDuration=%H:%M
 FormatDateTextShort=%d. %b %Y
 FormatDateText=%d. %B %Y
 FormatDateHourShort=%d.%m.%Y %H.%M
-FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
+FormatDateHourSecShort=%d.%m.%Y %H:%M:%S %p
 FormatDateHourTextShort=%d. %b %Y %H.%M
 FormatDateHourText=%d. %B %Y %H.%M
 DatabaseConnection=Tietokantayhteys
-NoTemplateDefined=No template defined for this email type
+NoTemplateDefined=Tämän tyyliselle sähköpostille ei ole määritelty pohjaa
 AvailableVariables=Available substitution variables
 NoTranslation=Ei käännöstä
 NoRecordFound=Tietueita ei löytynyt
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=Parametri %s ei ole määritelty
 ErrorUnknown=Unknown error
 ErrorSQL=SQL Error
 ErrorLogoFileNotFound=Logo-tiedoston ' %s' ei löytynyt
-ErrorGoToGlobalSetup=Siirry "Yritys / Fundation" setup vahvistaa tämän
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=Siirry Moduuli setup vahvistaa tämän
 ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=Failed to send mail (lähettäjä= %s, vastaanotin= %s)
 ErrorFileNotUploaded=Tiedosto ei ole ladattu. Tarkista, että koko ei ylitä suurinta sallittua, että vapaata tilaa on käytettävissä levyllä ja että siellä ei ole jo tiedoston samalla nimellä tähän hakemistoon.
@@ -64,11 +64,11 @@ ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type def
 ErrorFailedToSaveFile=Virhe, ei tallenna tiedosto.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
 MaxNbOfRecordPerPage=Max nb of record per page
-NotAuthorized=You are not authorized to do that.
+NotAuthorized=Oikeutesi ei riitä tähän toimintoon
 SetDate=Aseta päivä
 SelectDate=Valitse päivä
 SeeAlso=See also %s
-SeeHere=See here
+SeeHere=Katso täältä
 Apply=Apply
 BackgroundColorByDefault=Default taustaväri
 FileRenamed=The file was successfully renamed
@@ -103,13 +103,13 @@ DolibarrHasDetectedError=Dolibarr on havaittu tekninen virhe
 InformationToHelpDiagnose=This information can be useful for diagnostic purposes
 MoreInformation=Lisätietoa
 TechnicalInformation=Tekniset tiedot
-TechnicalID=Technical ID
+TechnicalID=Tekninen tunniste
 NotePublic=Huomautus (julkinen)
 NotePrivate=Huomautus (yksityinen)
 PrecisionUnitIsLimitedToXDecimals=Dolibarr oli asetettu raja tarkkuus <b>yksikköhinnat %s</b> desimaalit.
 DoTest=Testi
 ToFilter=Suodata
-NoFilter=No filter
+NoFilter=Ei suodatinta
 WarningYouHaveAtLeastOneTaskLate=Varoitus, sinulla on ainakin yksi elementti, joka on ylittänyt toleranssi viivytystä.
 yes=kyllä
 Yes=Kyllä
@@ -137,7 +137,7 @@ Disable=Poistaa käytöstä
 Disabled=Disabled
 Add=Lisää
 AddLink=Lisää linkki
-RemoveLink=Remove link
+RemoveLink=Poista linkki
 AddToDraft=Add to draft
 Update=Päivittää
 Close=Sulje
@@ -151,8 +151,9 @@ Cancel=Peruuta
 Modify=Muokkaa
 Edit=Muokkaa
 Validate=Vahvista
-ValidateAndApprove=Validate and Approve
+ValidateAndApprove=Vahvista ja hyväksy
 ToValidate=Validoida
+NotValidated=Not validated
 Save=Tallenna
 SaveAs=Tallenna nimellä
 TestConnection=Testaa yhteys
@@ -170,7 +171,7 @@ Search=Haku
 SearchOf=Haku
 Valid=Voimassa
 Approve=Hyväksy
-Disapprove=Disapprove
+Disapprove=Poista hyväksyntä
 ReOpen=Avaa uudelleen
 Upload=Lähetä tiedosto
 ToLink=Linkki
@@ -183,7 +184,7 @@ User=Käyttäjä
 Users=Käyttäjät
 Group=Ryhmä
 Groups=Ryhmät
-NoUserGroupDefined=No user group defined
+NoUserGroupDefined=Käyttäjäryhmää ei ole määritelty
 Password=Salasana
 PasswordRetype=Kirjoitta salasana uudelleen
 NoteSomeFeaturesAreDisabled=Huomaa, että monet piirteet / modules on poistettu käytöstä tämän esittelyn.
@@ -222,20 +223,21 @@ NoLogoutProcessWithAuthMode=No applicative disconnect feature with authenticatio
 Connection=Yhteys
 Setup=Asetukset
 Alert=Hälytys
+MenuWarnings=Vahtipalvelu
 Previous=Edellinen
 Next=Seuraava
 Cards=Kortit
 Card=Kortti
 Now=Nyt
-HourStart=Start hour
+HourStart=Aloitus tunti
 Date=Päivä
-DateAndHour=Date and hour
-DateToday=Today's date
-DateReference=Reference date
+DateAndHour=Päivämäärä ja tunti
+DateToday=Päivämäärä tänään
+DateReference=Viite päivämäärä
 DateStart=Aloituspäivämäärä
 DateEnd=Lopetuspäivä
 DateCreation=Luotu
-DateCreationShort=Creat. date
+DateCreationShort=Luonti päivämäärä
 DateModification=Muokattu
 DateModificationShort=Muokattu
 DateLastModification=Latest modification date
@@ -251,8 +253,8 @@ DateRequest=Pyydetty
 DateProcess=Käsitelty
 DateBuild=Raportti rakentaa päivämäärä
 DatePayment=Maksupäivä
-DateApprove=Approving date
-DateApprove2=Approving date (second approval)
+DateApprove=Hyväksytään päivämäärä
+DateApprove2=Hyväksytään päivämäärä (toinen hyväksyntä)
 UserCreation=Creation user
 UserModification=Modification user
 UserCreationShort=Creat. user
@@ -280,7 +282,7 @@ days=päivää
 Hours=Tuntia
 Minutes=Minuuttia
 Seconds=Sekuntia
-Weeks=Weeks
+Weeks=Viikkoa
 Today=Tänään
 Yesterday=Eilen
 Tomorrow=Huomenna
@@ -308,13 +310,14 @@ Copy=Kopioi
 Paste=Liitä
 Default=Oletus
 DefaultValue=Oletusarvo
+DefaultValues=Default values
 Price=Hinta
 UnitPrice=Yksikköhinta
 UnitPriceHT=Yksikköhinta (netto)
 UnitPriceTTC=Yksikköhinta
 PriceU=UP
 PriceUHT=UP (netto)
-PriceUHTCurrency=U.P (currency)
+PriceUHTCurrency=U.P (valuutta)
 PriceUTTC=U.P. (inc. tax)
 Amount=Määrä
 AmountInvoice=Laskun summa
@@ -327,9 +330,9 @@ AmountVAT=Verot
 MulticurrencyAlreadyPaid=Already payed, original currency
 MulticurrencyRemainderToPay=Remain to pay, original currency
 MulticurrencyPaymentAmount=Payment amount, original currency
-MulticurrencyAmountHT=Amount (net of tax), original currency
-MulticurrencyAmountTTC=Amount (inc. of tax), original currency
-MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencyAmountHT=Summa (veroton), alkuperäisessä valuutassa
+MulticurrencyAmountTTC=Summa (verollinen), alkuperäisessä valuutassa
+MulticurrencyAmountVAT=Veron määrä, alkuperäinen valuutta
 AmountLT1=Verot 2
 AmountLT2=Verot 3
 AmountLT1ES=Määrä RE
@@ -341,7 +344,7 @@ Percentage=Prosenttia
 Total=Yhteensä
 SubTotal=Välisumma
 TotalHTShort=Yhteensä (netto)
-TotalHTShortCurrency=Total (net in currency)
+TotalHTShortCurrency=Yhteensä (veroton valuutassa)
 TotalTTCShort=Yhteensä (sis. alv)
 TotalHT=Yhteensä (ilman veroja)
 TotalHTforthispage=Yhteensä (veroton) tällä sivulla
@@ -356,24 +359,25 @@ TotalLT2ES=Yhteensä IRPF
 HT=Veroton
 TTC=Sis. alv
 VAT=Alv
-VATs=Sales taxes
+VATs=Myyntiverot
 LT1ES=RE
 LT2ES=IRPF
 VATRate=Veroaste
 Average=Keskimääräinen
 Sum=Sum
 Delta=Delta
-Module=Moduuli
+Module=Module/Application
+Modules=Modules/Applications
 Option=Vaihtoehto
 List=Luettelo
 FullList=Täydellinen luettelo
 Statistics=Tilastot
 OtherStatistics=Muut tilastot
 Status=Tila
-Favorite=Favorite
+Favorite=Suosikki
 ShortInfo=Info.
 Ref=Viite
-ExternalRef=Ref. extern
+ExternalRef=Ulkoinen viite
 RefSupplier=Toimittajan viite
 RefPayment=Maksun viite
 CommercialProposalsShort=Kaupalliset ehdotukset
@@ -384,19 +388,19 @@ ActionsToDoShort=Tehtävät
 ActionsDoneShort=Valmis
 ActionNotApplicable=Ei sovelleta
 ActionRunningNotStarted=Aloitetaan
-ActionRunningShort=In progress
+ActionRunningShort=Käsittelyssä
 ActionDoneShort=Päättetty
 ActionUncomplete=Uncomplete
-CompanyFoundation=Yritys / säätiö
+CompanyFoundation=Company/Organisation
 ContactsForCompany=Sidosryhmien yhteystiedot
 ContactsAddressesForCompany=Sidosryhmien kontaktit/osoitteet
 AddressesForCompany=Sidosryhmien osoitteet
 ActionsOnCompany=Sidosryhmien tapahtumat
 ActionsOnMember=Jäsenen tapahtumat
 NActionsLate=%s myöhässä
-RequestAlreadyDone=Request already recorded
+RequestAlreadyDone=Pyyntö on jo rekisteröity
 Filter=Suodata
-FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
+FilterOnInto=Hakuperuste '<strong>%s</strong>' kentistä %s
 RemoveFilter=Poista suodatin
 ChartGenerated=Luo kuvio
 ChartNotGenerated=Kuviota ei ole luotu
@@ -405,13 +409,14 @@ Generate=Luo
 Duration=Kesto
 TotalDuration=Kokonaiskesto
 Summary=Yhteenveto
-DolibarrStateBoard=Tilastot
-DolibarrWorkBoard=Työtehtäväpöytä
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=Saatavissa
 NotYetAvailable=Ei vielä saatavilla
 NotAvailable=Ei saatavilla
-Categories=Tags/categories
-Category=Tag/category
+Categories=Tagit/luokat
+Category=Tagi/luokka
 By=Mennessä
 From=Mistä
 to=on
@@ -423,8 +428,8 @@ OtherInformations=Muut tiedot
 Quantity=Määrä
 Qty=Kpl
 ChangedBy=Muuttanut
-ApprovedBy=Approved by
-ApprovedBy2=Approved by (second approval)
+ApprovedBy=Hyväksynyt
+ApprovedBy2=Hyväksynyt (toinen hyväksyntä)
 Approved=Hyväksytty
 Refused=Refused
 ReCalculate=Laske uudelleen
@@ -434,7 +439,7 @@ Reportings=Raportointi
 Draft=Vedos
 Drafts=Vedokset
 Validated=Vahvistetut
-Opened=Avattu
+Opened=Avoinna
 New=Uusi
 Discount=Alennus
 Unknown=Tuntematon
@@ -442,7 +447,7 @@ General=Yleiset
 Size=Koko
 Received=Vastaanotetut
 Paid=Maksetut
-Topic=Subject
+Topic=Aihe
 ByCompanies=Sidosryhmittäin
 ByUsers=Käyttäjittäin
 Links=Linkit
@@ -453,6 +458,7 @@ NextStep=Seuraava askel
 Datas=Tiedot
 None=Ei mitään
 NoneF=Ei mitään
+NoneOrSeveral=None or several
 Late=Myöhässä
 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.
 Photo=Kuva
@@ -520,7 +526,7 @@ ReportName=Raportin nimi
 ReportPeriod=Raportointikausi
 ReportDescription=Kuvaus
 Report=Raportti
-Keyword=Keyword
+Keyword=Avainsana
 Origin=Origin
 Legend=Legend
 Fill=Täytä
@@ -538,13 +544,13 @@ NbOfThirdParties=Sidosryhmien määrä
 NbOfLines=Rivien määrä
 NbOfObjects=Kohteiden määrä
 NbOfObjectReferers=Number of related items
-Referers=Related items
+Referers=Liittyvät tuotteet
 TotalQuantity=Kokonaismäärä
 DateFromTo=Kohteesta %s %s
 DateFrom=Kohteesta %s
 DateUntil=Vasta %s
 Check=Shekki
-Uncheck=Uncheck
+Uncheck=Poista valinta
 Internal=Sisäinen
 External=Ulkoinen
 Internals=Sisäinen
@@ -573,8 +579,8 @@ Priority=Prioriteetti
 SendByMail=Lähetä sähköpostilla
 MailSentBy=Sähköpostin lähetti
 TextUsedInTheMessageBody=Sähköpostiviesti
-SendAcknowledgementByMail=Send confirmation email
-EMail=E-mail
+SendAcknowledgementByMail=Lähetä vahvistussähköposti
+EMail=Sähköposti
 NoEMail=Ei sähköpostia
 Email=Email
 NoMobilePhone=Ei matkapuhelinta
@@ -589,11 +595,11 @@ ValueIsValid=Arvo on voimassa
 ValueIsNotValid=Value is not valid
 RecordCreatedSuccessfully=Record created successfully
 RecordModifiedSuccessfully=Tietue muunnettu onnistuneesti
-RecordsModified=%s record modified
+RecordsModified=%s tietue muokattu
 RecordsDeleted=%s record deleted
 AutomaticCode=Automaattinen koodi
 FeatureDisabled=Ominaisuus pois päältä
-MoveBox=Move widget
+MoveBox=Siirrä widget
 Offered=Tarjottu
 NotEnoughPermissions=Sinulla ei ole lupaa tätä toimintaa varten
 SessionName=Istunnon nimi
@@ -606,8 +612,9 @@ PartialWoman=Osittainen
 TotalWoman=Yhteensä
 NeverReceived=Ei ole saapunut
 Canceled=Peruutettu
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
+YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu Setup - Dictionaries
+YouCanChangeValuesForThisListFrom=You can change values for this list from menu %s
+YouCanSetDefaultValueInModuleSetup=Oletusarvon uudelle luotavalle tietueelle voi määrittää modulin asetuksista
 Color=Väri
 Documents=Linkitettyjä tiedostoja
 Documents2=Asiakirjat
@@ -642,6 +649,7 @@ FreeLineOfType=Ilmaisen pääsyn tyyppi
 CloneMainAttributes=Klooni objekti sen tärkeimmät attribuutit
 PDFMerge=PDF Merge
 Merge=Merge
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Näytä sivu tulostaa päävalikkoon alue
 MenuManager=Valikkomanageri
 WarningYouAreInMaintenanceMode=Varoitus, olet ylläpitotilassa, joten vain kirjautunut <b>%s</b> saa käyttää hakemuksen tällä hetkellä.
@@ -682,7 +690,7 @@ LinkToSupplierInvoice=Link to supplier invoice
 LinkToContract=Link to contract
 LinkToIntervention=Link to intervention
 CreateDraft=Luo luonnos
-SetToDraft=Back to draft
+SetToDraft=Palaa luonnokseen
 ClickToEdit=Klikkaa muokataksesi
 ObjectDeleted=Kohde %s poistettu
 ByCountry=Maittain
@@ -701,41 +709,42 @@ ModulesSystemTools=Moduuli työkalut
 Test=Testi
 Element=Osa
 NoPhotoYet=Ei kuvaa saatavilla vielä
-Dashboard=Dashboard
+Dashboard=Kojelauta
 MyDashboard=My dashboard
-Deductible=Deductible
-from=from
+Deductible=Omavastuu
+from=mistä
 toward=eteenpäin
 Access=Käyttöoikeus
-SelectAction=Select action
+SelectAction=Valitse toiminto
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Käytä Ctrl+C kopioisaksesi leikepöydälle
 SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
 OriginFileName=Alkuperäinen tiedostonimi
 SetDemandReason=Aseta lähde
 SetBankAccount=Define Bank Account
-AccountCurrency=Account Currency
+AccountCurrency=Tilin valuutta
 ViewPrivateNote=Katso huomiot
 XMoreLines=%s rivi(ä) piilossa
 PublicUrl=Julkinen URL
-AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
-PrintFile=Print File %s
-ShowTransaction=Show entry on bank account
-GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
-Deny=Deny
-Denied=Denied
+AddBox=Lisää laatikko
+SelectElementAndClick=Select an element and click %s
+PrintFile=Tulosta tiedostoon %s
+ShowTransaction=Näytä pankkitilin kirjaus
+GoIntoSetupToChangeLogo=Vaihtaaksesi logoa mene Home - Setup - Company tai Home - Setup - Display poistaaksesi
+Deny=Kiellä
+Denied=Kielletty
 ListOfTemplates=List of templates
-Gender=Gender
-Genderman=Man
-Genderwoman=Woman
+Gender=Sukupuoli
+Genderman=Mies
+Genderwoman=Nainen
 ViewList=Näytä lista
-Mandatory=Mandatory
-Hello=Hello
-Sincerely=Sincerely
+Mandatory=Pakollinen
+Hello=Terve
+Sincerely=Vilpittömästi
 DeleteLine=Poista rivi
-ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+ConfirmDeleteLine=Halutako varmasti poistaa tämän rivin?
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
@@ -755,11 +764,20 @@ Calendar=Kalenteri
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Maanantai
 Tuesday=Tiistai
@@ -789,33 +807,31 @@ ShortThursday=TO
 ShortFriday=PE
 ShortSaturday=LA
 ShortSunday=SU
-SelectMailModel=Select email template
-SetRef=Set ref
+SelectMailModel=Valitse sähköpostipohja
+SetRef=Aseta viite
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
-Select2NotFound=No result found
-Select2Enter=Enter
+Select2NotFound=Tuloksia ei löytynyt
+Select2Enter=Syötä
 Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
+Select2MoreCharacters=tai lisää merkkejä
 Select2MoreCharactersMore=<strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
-Select2LoadingMoreResults=Loading more results...
-Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
+Select2LoadingMoreResults=Lataa lisää tuloksia...
+Select2SearchInProgress=Haku käynnissä...
+SearchIntoThirdparties=Sidosryhmät
 SearchIntoContacts=Yhteystiedot
 SearchIntoMembers=Jäsenet
 SearchIntoUsers=Käyttäjät
-SearchIntoProductsOrServices=Products or services
+SearchIntoProductsOrServices=Tuotteet tai palvelut
 SearchIntoProjects=Projektit
 SearchIntoTasks=Tehtävät
-SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
-SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
-SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
+SearchIntoCustomerInvoices=Asiakkaiden laskut
+SearchIntoSupplierInvoices=Tavarantoimittajan laskut
+SearchIntoCustomerOrders=Asiakkaan tilaukset
+SearchIntoSupplierOrders=Tavarantoimittajien tilaukset
+SearchIntoCustomerProposals=Tarjoukset asiakkaille
+SearchIntoSupplierProposals=Tavarantoimittajan tarjoukset
 SearchIntoInterventions=Interventions
 SearchIntoContracts=Sopimukset
 SearchIntoCustomerShipments=Customer shipments
-SearchIntoExpenseReports=Expense reports
+SearchIntoExpenseReports=Kuluraportit
 SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/fi_FI/other.lang b/htdocs/langs/fi_FI/other.lang
index 2acdf6fedf9..770c1702553 100644
--- a/htdocs/langs/fi_FI/other.lang
+++ b/htdocs/langs/fi_FI/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=Päiväys syntyvyyden
 BirthdayAlertOn=syntymäpäivä hälytys aktiivinen
 BirthdayAlertOff=syntymäpäivä varoituskynnysten inaktiivinen
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=Validate interventioelimen
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=Tämä on <b>testi</b> postitse (sana testi on lihavoitu)
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Prof Id %s</b> on tietojen mukaan kolmannen osapuolen maassa. <br> Esimerkiksi <b>maa %s,</b> se <b>koodi %s.</b>
 DolibarrDemo=Dolibarr ERP / CRM-demo
-StatsByNumberOfUnits=Statistics in kappalemäärä
-StatsByNumberOfEntities=Tilastot määrän yhteisöistä
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=Väliintulo %s validoitava
 EMailTextInvoiceValidated=Lasku %s validoitava
diff --git a/htdocs/langs/fi_FI/projects.lang b/htdocs/langs/fi_FI/projects.lang
index 2a82b3eda86..6ceeb06834d 100644
--- a/htdocs/langs/fi_FI/projects.lang
+++ b/htdocs/langs/fi_FI/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Yhteiset hanke
 PrivateProject=Hankkeen yhteystiedot
+ProjectsImContactFor=Projects I'm explicitely a contact of
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=Kaikki hankkeet
 MyProjectsDesc=Tämä näkemys on vain hankkeisiin olet yhteyshenkilö (mikä on tyyppi).
 ProjectsPublicDesc=Tämä näkemys esitetään kaikki hankkeet sinulla voi lukea.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=Tämä näkemys esitetään kaikki hankkeet ja tehtävät (käyttäjä
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=Uusi projekti
 AddProject=Create project
 DeleteAProject=Poista hanke
 DeleteATask=Poista tehtävä
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Opened projects
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Näytä hankkeen
 SetProject=Aseta hankkeen
 NoProject=Ei hanke määritellään
 NbOfProjects=Nb hankkeiden
+NbOfTasks=Nb of tasks
 TimeSpent=Käytetty aika
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
@@ -47,9 +52,9 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=Käyttäjä
 TaskTimeNote=Huomautus
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
-NewTimeSpent=Uusi käytetty aika
+NewTimeSpent=Käytetty aika
 MyTimeSpent=Oma käytetty aika
 Tasks=Tehtävät
 Task=Tehtävä
@@ -59,6 +64,7 @@ TaskDescription=Task description
 NewTask=Uusi tehtävä
 AddTask=Create task
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Toiminto
 Activities=Tehtävät / toiminnot
 MyActivities=Omat tehtävät / toiminnot
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Luettelo sopimukset hankkeeseen liittyvät
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=Luettelo toimien hankkeeseen liittyvän
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Hankkeen yhteystiedot
 ActionsOnProject=Toimien hanketta
 YouAreNotContactOfProject=Et ole kosketuksissa tämän yksityisen hankkeen
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Poista käytetty aika
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
@@ -110,7 +118,7 @@ TaskRessourceLinks=Resurssit
 ProjectsDedicatedToThisThirdParty=Hankkeet omistettu tälle kolmannelle
 NoTasks=Ei tehtävät hankkeen
 LinkedToAnotherCompany=Liittyy muihin kolmannen osapuolen
-TaskIsNotAffectedToYou=Task not assigned to you
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=Käytetty aika on tyhjä
 ThisWillAlsoRemoveTasks=Tämä toiminto poistaa myös kaikki tehtävät projektin <b>(%s</b> tehtävät tällä hetkellä) ja kaikki panokset käytetty aika.
 IfNeedToUseOhterObjectKeepEmpty=Jos jotkin esineet (lasku, tilaus, ...), jotka kuuluvat toiselle kolmannelle osapuolelle, on liityttävä hankkeeseen luoda, pitää tämä tyhjä saada hanke on multi kolmansille osapuolille.
@@ -155,33 +163,38 @@ DocumentModelBeluga=Project template for linked objects overview
 DocumentModelBaleine=Project report template for tasks
 PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
-ProjectReferers=Related items
+ProjectReferers=Liittyvät tuotteet
 ProjectMustBeValidatedFirst=Project must be validated first
 FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
 ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/fr_BE/accountancy.lang b/htdocs/langs/fr_BE/accountancy.lang
index 126e5734e28..41573176250 100644
--- a/htdocs/langs/fr_BE/accountancy.lang
+++ b/htdocs/langs/fr_BE/accountancy.lang
@@ -3,13 +3,9 @@ ConfigAccountingExpert=Configuration du module de compta expert
 Processing=Exécution
 Lineofinvoice=Lignes de facture
 Doctype=Type de document
-AccountingCategory=Accounting category
 ThirdPartyAccount=Compte tiers
 ErrorDebitCredit=Débit et crédit ne peuvent pas être non-nuls en même temps
 Pcgtype=Classe du compte
-Pcgsubtype=Sous-classe du compte
 TotalMarge=Marge de ventes totale
 Selectmodelcsv=Sélectionnez un modèle d'export
 Modelcsv_normal=Export classique
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
diff --git a/htdocs/langs/fr_BE/admin.lang b/htdocs/langs/fr_BE/admin.lang
index 91e1c3091f9..a994014f061 100644
--- a/htdocs/langs/fr_BE/admin.lang
+++ b/htdocs/langs/fr_BE/admin.lang
@@ -1,1665 +1,29 @@
 # Dolibarr language file - Source file is en_US - admin
 Foundation=Fondation
-Version=Version
-VersionProgram=Version program
-VersionLastInstall=Initial install version
-VersionLastUpgrade=Latest version upgrade
 VersionExperimental=Expérimentale
-VersionDevelopment=Développement
-VersionUnknown=Inconnue
 VersionRecommanded=Recommandée
-FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. Value of some setup constants may also be checked. You can use this tool to detect if some files were modified by a hacker for example.
-FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
-GlobalChecksum=Global checksum
-MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
-LocalSignature=Embedded local signature (less reliable)
-RemoteSignature=Remote distant signature (more reliable)
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FilesModified=Modified Files
-FilesAdded=Added Files
-FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
-XmlNotFound=Xml Integrity File of application not found
 SessionId=ID de session
 SessionSaveHandler=Gestionnaire de sessions
-SessionSavePath=Storage session localization
 PurgeSessions=Nettoyage des sessions
-ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
 NoSessionListWithThisHandler=Le gestionnaire de sessions configuré dans votre PHP ne permet pas de faire la liste des sessions existantes.
 LockNewSessions=Bloquer les nouvelles connexions
 ConfirmLockNewSessions=Êtes-vous certain de vouloir restreindre toute nouvelle connexion à vous seul? Seul l'utilisateur <b>%s</b> pourra se connecter après cela.
 UnlockNewSessions=Éliminer le blocage des connexions
-YourSession=Votre session
-Sessions=Sessions utilisateurs
 WebUserGroup=Utilisateur/groupe du serveur web
 NoSessionFound=Votre configuration PHP ne semble pas permettre de faire une liste des sessions actives. Le répertoire utilisé pour stocker les sessions (<b>%s</b>) pourrait être protégé (par exemple, par des permissions du système d'exploitation ou par la directive PHP open_basedir).
 DBStoringCharset=Codification de caractères de base de données pour stocker les données
 DBSortingCharset=Codification de caractères de base de données pour trier les données
 WarningModuleNotActive=Le module <b>%s</b> doit être activé
 WarningOnlyPermissionOfActivatedModules=Seules les permissions liées à des modules activés sont montrées ici. Vous pouvez activer d'autres modules sur la page Accueil->Configuration->Modules.
-DolibarrSetup=Installation ou mise à jour de Dolibarr
-InternalUser=Utilisateur interne
-ExternalUser=Utilisateur externe
-InternalUsers=Utilisateurs internes
-ExternalUsers=Utilisateurs externes
-GUISetup=Affichage
 SetupArea=Zone de configuration
 FormToTestFileUploadForm=Formulaire pour tester l'upload de fichiers (selon la configuration)
 IfModuleEnabled=Note: oui ne fonctionne que si le module <b>%s</b> est activé
 RemoveLock=Supprimez le fichier <b>%s</b> s'il existe pour autoriser l'utilisation de l'outil de mise à jour.
-RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any usage of update tool.
-SecuritySetup=Security setup
-SecurityFilesDesc=Define here options related to security about uploading files.
-ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
-ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
-ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is not supported.
-DictionarySetup=Dictionary setup
-Dictionary=Dictionaries
-ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
-ErrorCodeCantContainZero=Code can't contain value 0
-DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
-UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties, but it is less convenient)
-DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact, but it is less convenient)
-NumberOfKeyToSearch=Nbr of characters to trigger search: %s
-NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
-AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
-JavascriptDisabled=JavaScript disabled
-UsePreviewTabs=Use preview tabs
-ShowPreview=Show preview
-PreviewNotAvailable=Preview not available
-ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
-MySQLTimeZone=TimeZone MySql (database)
-TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
-Space=Space
-Table=Table
-Fields=Fields
-Index=Index
-Mask=Mask
-NextValue=Next value
-NextValueForInvoices=Next value (invoices)
-NextValueForCreditNotes=Next value (credit notes)
-NextValueForDeposit=Next value (deposit)
-NextValueForReplacements=Next value (replacements)
-MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to <b>%s</b> %s, whatever this parameter's value is
-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
-AntiVirusParam= More parameters on command line
-AntiVirusParamExample= Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
-ComptaSetup=Accounting module setup
-UserSetup=User management setup
-MultiCurrencySetup=Multi-currency setup
-MenuLimits=Limits and accuracy
-MenuIdParent=Parent menu ID
-DetailMenuIdParent=ID of parent menu (empty for a top menu)
-DetailPosition=Sort number to define menu position
-AllMenus=All
-NotConfigured=Module not configured
-Active=Active
-SetupShort=Setup
-OtherOptions=Other options
-OtherSetup=Other setup
-CurrentValueSeparatorDecimal=Decimal separator
-CurrentValueSeparatorThousand=Thousand separator
-Destination=Destination
-IdModule=Module ID
-IdPermissions=Permissions ID
-Modules=Modules
-LanguageBrowserParameter=Parameter %s
-LocalisationDolibarrParameters=Localisation parameters
-ClientTZ=Client Time Zone (user)
-ClientHour=Client time (user)
-OSTZ=Server OS Time Zone
-PHPTZ=PHP server Time Zone
-DaylingSavingTime=Daylight saving time
-CurrentHour=PHP Time (server)
-CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
-Box=Widget
-Boxes=Widgets
-MaxNbOfLinesForBoxes=Max number of lines for widgets
-PositionByDefault=Default order
-Position=Position
-MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
-MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br />Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
-MenuForUsers=Menu for users
-LangFile=.lang file
-System=System
-SystemInfo=System information
-SystemToolsArea=System tools area
-SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for.
-Purge=Purge
-PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
-PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
-PurgeDeleteTemporaryFilesShort=Delete temporary files
-PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory <b>%s</b>. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted.
-PurgeRunNow=Purge now
-PurgeNothingToDelete=No directory or files to delete.
-PurgeNDirectoriesDeleted=<b>%s</b> files or directories deleted.
-PurgeAuditEvents=Purge all security events
-ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
-GenerateBackup=Generate backup
-Backup=Backup
-Restore=Restore
-RunCommandSummary=Backup has been launched with the following command
-BackupResult=Backup result
-BackupFileSuccessfullyCreated=Backup file successfully generated
-YouCanDownloadBackupFile=Generated files can now be downloaded
-NoBackupFileAvailable=No backup files available.
-ExportMethod=Export method
-ImportMethod=Import method
-ToBuildBackupFileClickHere=To build a backup file, click <a href="%s">here</a>.
-ImportMySqlDesc=To import a backup file, you must use mysql command from command line:
-ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line:
-ImportMySqlCommand=%s %s < mybackupfile.sql
-ImportPostgreSqlCommand=%s %s mybackupfile.sql
-FileNameToGenerate=File name to generate
-Compression=Compression
-CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
-CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
-ExportCompatibility=Compatibility of generated export file
-MySqlExportParameters=MySQL export parameters
-PostgreSqlExportParameters= PostgreSQL export parameters
-UseTransactionnalMode=Use transactional mode
-FullPathToMysqldumpCommand=Full path to mysqldump command
-FullPathToPostgreSQLdumpCommand=Full path to pg_dump command
-ExportOptions=Export Options
-AddDropDatabase=Add DROP DATABASE command
-AddDropTable=Add DROP TABLE command
-ExportStructure=Structure
-NameColumn=Name columns
-ExtendedInsert=Extended INSERT
-NoLockBeforeInsert=No lock commands around INSERT
-DelayedInsert=Delayed insert
-EncodeBinariesInHexa=Encode binary data in hexadecimal
-IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
-AutoDetectLang=Autodetect (browser language)
-FeatureDisabledInDemo=Feature disabled in demo
-FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Permissions
-BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
-OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
-ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external modules...
-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 (Note: anyone experienced in PHP programming can provide custom development for an open source project)
-WebSiteDesc=Reference websites to find more modules...
-URL=Link
-BoxesAvailable=Widgets available
-BoxesActivated=Widgets activated
-ActivateOn=Activate on
-ActiveOn=Activated on
-SourceFile=Source file
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
-Required=Required
-UsedOnlyWithTypeOption=Used by some agenda option only
-Security=Security
-Passwords=Passwords
-DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
-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 (Activated 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 make building of a global cumulated pdf not working (like unpaid invoices).
-Feature=Feature
-DolibarrLicense=License
-Developpers=Developers/contributors
-OfficialWebSite=Dolibarr international official web site
-OfficialWebSiteLocal=Local web site (%s)
-OfficialWiki=Dolibarr documentation on Wiki
-OfficialDemo=Dolibarr online demo
-OfficialMarketPlace=Official market place for external modules/addons
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
-ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
-HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
-HelpCenterDesc2=Some part of this service are available in <b>english only</b>.
-CurrentMenuHandler=Current menu handler
-MeasuringUnit=Measuring unit
-LeftMargin=Left margin
-TopMargin=Top margin
-PaperSize=Paper type
-Orientation=Orientation
-SpaceX=Space X
-SpaceY=Space Y
-FontSize=Font size
-Content=Content
-NoticePeriod=Notice period
-NewByMonth=New by month
-Emails=E-mails
-EMailsSetup=E-mails setup
-EMailsDesc=This page allows you to overwrite your PHP parameters for e-mails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless.
-MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
-MAIN_MAIL_EMAIL_FROM=Sender e-mail for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Sender e-mail used for error returns emails sent
-MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
-MAIN_DISABLE_ALL_MAILS=Disable all e-mails sendings (for test purposes or demos)
-MAIN_MAIL_SENDMODE=Method to use to send EMails
-MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
-MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
-MAIN_MAIL_EMAIL_TLS= Use TLS (SSL) encrypt
-MAIN_MAIL_EMAIL_STARTTLS= Use TLS (STARTTLS) encrypt
-MAIN_DISABLE_ALL_SMS=Disable all SMS sendings (for test purposes or demos)
-MAIN_SMS_SENDMODE=Method to use to send SMS
-MAIN_MAIL_SMS_FROM=Default sender phone number for Sms sending
-MAIN_MAIL_DEFAULT_FROMTYPE=Sender e-mail by default for manual sendings (User email or Company email)
-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/
-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 setup
-ModuleFamilyBase=System
-ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
-ModuleFamilyProducts=Products Management (PM)
-ModuleFamilyHr=Human Resource Management (HR)
-ModuleFamilyProjects=Projects/Collaborative work
-ModuleFamilyOther=Other
-ModuleFamilyTechnic=Multi-modules tools
-ModuleFamilyExperimental=Experimental modules
-ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
-ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
-ModuleFamilyInterface=Interfaces with external systems
-MenuHandlers=Menu handlers
-MenuAdmin=Menu editor
-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).
-DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <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>.
-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='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
-YouCanSubmitFile=For this step, you can send package using this tool: Select module file
-CurrentVersion=Dolibarr current version
-CallUpdatePage=Go to the page that updates the database structure and data: %s.
-LastStableVersion=Latest stable version
-LastActivationDate=Latest activation date
-UpdateServerOffline=Update server offline
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
-GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
-GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
-ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
-ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
-DoTestServerAvailability=Test server connectivity
-DoTestSend=Test sending
-DoTestSendHTML=Test sending HTML
-ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
-ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
-UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
-UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
-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...).
-MinLength=Minimum length
-LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
-ExamplesWithCurrentSetup=Examples with current running setup
-ListOfDirectories=List of OpenDocument templates directories
-ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
-NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories
+AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
+AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 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.
-ThemeDir=Skins directory
-ConnectionTimeout=Connexion timeout
-ResponseTimeout=Response timeout
-SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__
-ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
-SecurityToken=Key to secure URLs
-NoSmsEngine=No SMS sender manager available. SMS sender manager are not installed with default distribution (because they depends on an external supplier) but you can find some on %s
-PDF=PDF
-PDFDesc=You can set each global options related to the PDF generation
-PDFAddressForging=Rules to forge address boxes
-HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF
-HideDescOnPDF=Hide products description on generated PDF
-HideRefOnPDF=Hide products ref. on generated PDF
-HideDetailsOnPDF=Hide product lines details on generated PDF
-PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
-Library=Library
-UrlGenerationParameters=Parameters to secure URLs
-SecurityTokenIsUnique=Use a unique securekey parameter for each URL
-EnterRefToBuildUrl=Enter reference for object %s
-GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons to 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
-MassConvert=Launch mass convert
-String=String
-TextLong=Long text
-Int=Integer
-Float=Float
-DateAndTime=Date and hour
-Unique=Unique
-Boolean=Boolean (Checkbox)
-ExtrafieldPhone = Phone
-ExtrafieldPrice = Price
-ExtrafieldMail = Email
-ExtrafieldUrl = Url
-ExtrafieldSelect = Select list
-ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
-ExtrafieldPassword=Password
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
-ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
-LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
-SMS=SMS
-LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
-RefreshPhoneLink=Refresh link
-LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
-KeepEmptyToUseDefault=Keep empty to use default value
-DefaultLink=Default link
-SetAsDefault=Set as default
-ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
-BarcodeInitForThirdparties=Mass barcode init for thirdparties
-BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Init value for next %s empty records
-EraseAllCurrentBarCode=Erase all current barcode values
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
-AllBarcodeReset=All barcode values have been removed
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into 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
-DisplayCompanyInfo=Display company address
-DisplayCompanyManagers=Display manager names
-DisplayCompanyInfoAndManagers=Display company address and manager names
-EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
-ModuleCompanyCodePanicum=Return an empty accountancy code.
-ModuleCompanyCodeDigitaria=Accountancy 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: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-ClickToShowDescription=Click to show description
-# Modules
-Module0Name=Users & groups
-Module0Desc=Users / Employees and Groups management
-Module1Name=Third parties
-Module1Desc=Companies and contact management (customers, prospects...)
-Module2Name=Commercial
-Module2Desc=Commercial management
-Module10Name=Comptabilité
-Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
 Module20Name=Propales
-Module20Desc=Commercial proposal management
-Module22Name=Mass E-mailings
-Module22Desc=Mass E-mailing management
-Module23Name=Energy
-Module23Desc=Monitoring the consumption of energies
-Module25Name=Customer Orders
-Module25Desc=Customer order management
 Module30Name=Factures
-Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
-Module40Name=Suppliers
-Module40Desc=Supplier management and buying (orders and invoices)
-Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
-Module49Name=Editors
-Module49Desc=Editor management
-Module50Name=Products
-Module50Desc=Product management
-Module51Name=Mass mailings
-Module51Desc=Mass paper mailing management
-Module52Name=Stocks
-Module52Desc=Stock management (products)
-Module53Name=Services
-Module53Desc=Service management
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
-Module55Name=Barcodes
-Module55Desc=Barcode management
-Module56Name=Telephony
-Module56Desc=Telephony integration
-Module57Name=Direct bank payment orders
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
-Module58Name=ClickToDial
-Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
-Module70Name=Interventions
-Module70Desc=Intervention management
-Module75Name=Expense and trip notes
-Module75Desc=Expense and trip notes management
-Module80Name=Shipments
-Module80Desc=Shipments and delivery order management
-Module85Name=Banks and cash
-Module85Desc=Management of bank or cash accounts
-Module100Name=External site
-Module100Desc=This module include an external web site or page into Dolibarr menus and view it into a Dolibarr frame
-Module105Name=Mailman and SPIP
-Module105Desc=Mailman or SPIP interface for member module
-Module200Name=LDAP
-Module200Desc=LDAP directory synchronisation
-Module210Name=PostNuke
-Module210Desc=PostNuke integration
-Module240Name=Data exports
-Module240Desc=Tool to export Dolibarr data (with assistants)
-Module250Name=Data imports
-Module250Desc=Tool to import data in Dolibarr  (with assistants)
-Module310Name=Members
-Module310Desc=Foundation members management
-Module320Name=RSS Feed
-Module320Desc=Add RSS feed inside Dolibarr screen pages
-Module330Name=Bookmarks
-Module330Desc=Bookmarks management
-Module400Name=Projects/Opportunities/Leads
-Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
-Module410Name=Webcalendar
-Module410Desc=Webcalendar integration
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
-Module520Name=Loan
-Module520Desc=Management of loans
-Module600Name=Notifications
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
-Module700Name=Donations
-Module700Desc=Donation management
-Module770Name=Expense reports
-Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
-Module1200Name=Mantis
-Module1200Desc=Mantis integration
-Module1400Name=Comptabilité
-Module1400Desc=Accounting management (double parties)
-Module1520Name=Document Generation
-Module1520Desc=Mass mail document generation
-Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
-Module2000Name=WYSIWYG editor
-Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
-Module2200Name=Dynamic Prices
-Module2200Desc=Enable the usage of math expressions for prices
-Module2300Name=Cron
-Module2300Desc=Scheduled job management
-Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
-Module2500Name=Electronic Content Management
-Module2500Desc=Save and share documents
-Module2600Name=API/Web services (SOAP server)
-Module2600Desc=Enable the Dolibarr SOAP server providing API services
-Module2610Name=API/Web services (REST server)
-Module2610Desc=Enable the Dolibarr REST server providing API services
-Module2660Name=Call WebServices (SOAP client)
-Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
-Module2700Name=Gravatar
-Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
-Module2800Desc=FTP Client
-Module2900Name=GeoIPMaxmind
-Module2900Desc=GeoIP Maxmind conversions capabilities
-Module3100Name=Skype
-Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
-Module4000Name=HRM
-Module4000Desc=Human resources management
-Module5000Name=Multi-company
-Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management
-Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
-Module20000Name=Leave Requests management
-Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Product lot
-Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
-Module50000Name=PayBox
-Module50000Desc=Module to offer an online payment page by credit card with PayBox
-Module50100Name=Point of sales
-Module50100Desc=Point of sales module (POS).
-Module50200Name=Paypal
-Module50200Desc=Module to offer an online payment page by credit card with Paypal
-Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double parties)
-Module54000Name=PrintIPP
-Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
-Module55000Name=Poll, Survey or Vote
-Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
-Module59000Name=Margins
-Module59000Desc=Module to manage margins
-Module60000Name=Commissions
-Module60000Desc=Module to manage commissions
-Module63000Name=Resources
-Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
-Permission11=Read customer invoices
-Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
-Permission14=Validate customer invoices
-Permission15=Send customer invoices by email
-Permission16=Create payments for customer invoices
-Permission19=Delete customer invoices
-Permission21=Read commercial proposals
-Permission22=Create/modify commercial proposals
-Permission24=Validate commercial proposals
-Permission25=Send commercial proposals
-Permission26=Close commercial proposals
-Permission27=Delete commercial proposals
-Permission28=Export commercial proposals
-Permission31=Read products
-Permission32=Create/modify products
-Permission34=Delete products
-Permission36=See/manage hidden products
-Permission38=Export products
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
-Permission44=Delete projects (shared project and projects i'm contact for)
-Permission45=Export projects
-Permission61=Read interventions
-Permission62=Create/modify interventions
-Permission64=Delete interventions
-Permission67=Export interventions
-Permission71=Read members
-Permission72=Create/modify members
-Permission74=Delete members
-Permission75=Setup types of membership
-Permission76=Export data
-Permission78=Read subscriptions
-Permission79=Create/modify subscriptions
-Permission81=Read customers orders
-Permission82=Create/modify customers orders
-Permission84=Validate customers orders
-Permission86=Send customers orders
-Permission87=Close customers orders
-Permission88=Cancel customers orders
-Permission89=Delete customers orders
-Permission91=Read social or fiscal taxes and vat
-Permission92=Create/modify social or fiscal taxes and vat
-Permission93=Delete social or fiscal taxes and vat
-Permission94=Export social or fiscal taxes
-Permission95=Read reports
-Permission101=Read sendings
-Permission102=Create/modify sendings
-Permission104=Validate sendings
-Permission106=Export sendings
-Permission109=Delete sendings
-Permission111=Read financial accounts
-Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
-Permission114=Reconciliate transactions
-Permission115=Export transactions and account statements
-Permission116=Transfers between accounts
-Permission117=Manage cheques dispatching
-Permission121=Read third parties linked to user
-Permission122=Create/modify third parties linked to user
-Permission125=Delete third parties linked to user
-Permission126=Export third parties
-Permission141=Read all projects and tasks (also private projects i am not contact for)
-Permission142=Create/modify all projects and tasks (also private projects i am not 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
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
-Permission167=Export contracts
-Permission171=Read trips and expenses (yours and your subordinates)
-Permission172=Create/modify trips and expenses
-Permission173=Delete trips and expenses
-Permission174=Read all trips and expenses
-Permission178=Export trips and expenses
-Permission180=Read suppliers
-Permission181=Read supplier orders
-Permission182=Create/modify supplier orders
-Permission183=Validate supplier orders
-Permission184=Approve supplier orders
-Permission185=Order or cancel supplier orders
-Permission186=Receive supplier orders
-Permission187=Close supplier orders
-Permission188=Cancel supplier orders
-Permission192=Create lines
-Permission193=Cancel lines
-Permission194=Read the bandwith lines
-Permission202=Create ADSL connections
-Permission203=Order connections orders
-Permission204=Order connections
-Permission205=Manage connections
-Permission206=Read connections
-Permission211=Read Telephony
-Permission212=Order lines
-Permission213=Activate line
-Permission214=Setup Telephony
-Permission215=Setup providers
-Permission221=Read emailings
-Permission222=Create/modify emailings (topic, recipients...)
-Permission223=Validate emailings (allows sending)
-Permission229=Delete emailings
-Permission237=View recipients and info
-Permission238=Manually send mailings
-Permission239=Delete mailings after validation or sent
-Permission241=Read categories
-Permission242=Create/modify categories
-Permission243=Delete categories
-Permission244=See the contents of the hidden categories
-Permission251=Read other users and groups
-PermissionAdvanced251=Read other users
-Permission252=Read permissions of other users
-Permission253=Create/modify other users, groups and permisssions
-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 assignement matters).
-Permission271=Read CA
-Permission272=Read invoices
-Permission273=Issue invoices
-Permission281=Read contacts
-Permission282=Create/modify contacts
-Permission283=Delete contacts
-Permission286=Export contacts
-Permission291=Read tariffs
-Permission292=Set permissions on the tariffs
-Permission293=Modify costumers tariffs
-Permission300=Read bar codes
-Permission301=Create/modify bar codes
-Permission302=Delete bar codes
-Permission311=Read services
-Permission312=Assign service/subscription to contract
-Permission331=Read bookmarks
-Permission332=Create/modify bookmarks
-Permission333=Delete bookmarks
-Permission341=Read its own permissions
-Permission342=Create/modify his own user information
-Permission343=Modify his own password
-Permission344=Modify its own permissions
-Permission351=Read groups
-Permission352=Read groups permissions
-Permission353=Create/modify groups
-Permission354=Delete or disable groups
-Permission358=Export users
-Permission401=Read discounts
-Permission402=Create/modify discounts
-Permission403=Validate discounts
-Permission404=Delete discounts
-Permission510=Read Salaries
-Permission512=Create/modify salaries
-Permission514=Delete salaries
-Permission517=Export salaries
-Permission520=Read Loans
-Permission522=Create/modify loans
-Permission524=Delete loans
-Permission525=Access loan calculator
-Permission527=Export loans
-Permission531=Read services
-Permission532=Create/modify services
-Permission534=Delete services
-Permission536=See/manage hidden services
-Permission538=Export services
-Permission701=Read donations
-Permission702=Create/modify donations
-Permission703=Delete donations
-Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
-Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
-Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission779=Export expense reports
-Permission1001=Read stocks
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
-Permission1004=Read stock movements
-Permission1005=Create/modify stock movements
-Permission1101=Read delivery orders
-Permission1102=Create/modify delivery orders
-Permission1104=Validate delivery orders
-Permission1109=Delete delivery orders
-Permission1181=Read suppliers
-Permission1182=Read supplier orders
-Permission1183=Create/modify supplier orders
-Permission1184=Validate supplier orders
-Permission1185=Approve supplier orders
-Permission1186=Order supplier orders
-Permission1187=Acknowledge receipt of supplier orders
-Permission1188=Delete supplier orders
-Permission1190=Approve (second approval) supplier orders
-Permission1201=Get result of an export
-Permission1202=Create/Modify an export
-Permission1231=Read supplier invoices
-Permission1232=Create/modify supplier invoices
-Permission1233=Validate supplier invoices
-Permission1234=Delete supplier invoices
-Permission1235=Send supplier invoices by email
-Permission1236=Export supplier invoices, attributes and payments
-Permission1237=Export supplier orders and their details
-Permission1251=Run mass imports of external data into database (data load)
-Permission1321=Export customer invoices, attributes and payments
-Permission1322=Reopen a paid bill
-Permission1421=Export customer orders and attributes
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
-Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
-Permission20006=Admin leave requests (setup and update balance)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
-Permission2401=Read actions (events or tasks) linked to his account
-Permission2402=Create/modify actions (events or tasks) linked to his account
-Permission2403=Delete actions (events or tasks) linked to his account
-Permission2411=Read actions (events or tasks) of others
-Permission2412=Create/modify actions (events or tasks) of others
-Permission2413=Delete actions (events or tasks) of others
-Permission2414=Export actions/tasks of others
-Permission2501=Read/Download documents
-Permission2502=Download documents
-Permission2503=Submit or delete documents
-Permission2515=Setup documents directories
-Permission2801=Use FTP client in read mode (browse and download only)
-Permission2802=Use FTP client in write mode (delete or upload files)
-Permission50101=Use Point of sales
-Permission50201=Read transactions
-Permission50202=Import transactions
-Permission54001=Print
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
-Permission59003=Read every user margin
-Permission63001=Read resources
-Permission63002=Create/modify resources
-Permission63003=Delete resources
-Permission63004=Link resources to agenda events
-DictionaryCompanyType=Types of thirdparties
-DictionaryCompanyJuridicalType=Legal forms of thirdparties
-DictionaryProspectLevel=Prospect potential level
-DictionaryCanton=State/Province
-DictionaryRegion=Regions
-DictionaryCountry=Countries
-DictionaryCurrency=Currencies
-DictionaryCivility=Personal and professional titles
-DictionaryActions=Types of agenda events
-DictionarySocialContributions=Social or fiscal taxes types
-DictionaryVAT=VAT Rates or Sales Tax Rates
-DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Conditions de paiement
-DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact/Address types
-DictionaryEcotaxe=Ecotax (WEEE)
-DictionaryPaperFormat=Paper formats
-DictionaryFormatCards=Cards formats
-DictionaryFees=Types of fees
-DictionarySendingMethods=Shipping methods
-DictionaryStaff=Staff
-DictionaryAvailability=Delivery delay
-DictionaryOrderMethods=Ordering methods
-DictionarySource=Origin of proposals/orders
-DictionaryAccountancyCategory=Accounting account groups
-DictionaryAccountancysystem=Models for chart of accounts
-DictionaryEMailTemplates=Emails templates
-DictionaryUnits=Units
-DictionaryProspectStatus=Prospection status
-DictionaryHolidayTypes=Types of leaves
-DictionaryOpportunityStatus=Opportunity status for project/lead
-SetupSaved=Setup saved
-BackToModuleList=Back to modules list
-BackToDictionaryList=Back to dictionaries list
-VATManagement=VAT Management
-VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
-VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies.
-VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
-##### Local Taxes #####
-LTRate=Rate
-LocalTax1IsNotUsed=Do not use second tax
-LocalTax1IsUsedDesc=Use a second type of tax (other than VAT)
-LocalTax1IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax1Management=Second type of tax
-LocalTax1IsUsedExample=
-LocalTax1IsNotUsedExample=
-LocalTax2IsNotUsed=Do not use third tax
-LocalTax2IsUsedDesc=Use a third type of tax (other than VAT)
-LocalTax2IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax2Management=Third type of tax
-LocalTax2IsUsedExample=
-LocalTax2IsNotUsedExample=
-LocalTax1ManagementES= RE Management
-LocalTax1IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If te buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
-LocalTax1IsNotUsedDescES= By default the proposed RE is 0. End of rule.
-LocalTax1IsUsedExampleES= In Spain they are professionals subject to some specific sections of the Spanish IAE.
-LocalTax1IsNotUsedExampleES= In Spain they are professional and societies and subject to certain sections of the Spanish IAE.
-LocalTax2ManagementES= IRPF Management
-LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
-LocalTax2IsNotUsedDescES= By default the proposed IRPF is 0. End of rule.
-LocalTax2IsUsedExampleES= In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
-LocalTax2IsNotUsedExampleES= In Spain they are bussines not subject to tax system of modules.
-CalcLocaltax=Reports on local taxes
-CalcLocaltax1=Sales - Purchases
-CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2=Purchases
-CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3=Sales
-CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
-LabelUsedByDefault=Label used by default if no translation can be found for code
-LabelOnDocuments=Label on documents
-NbOfDays=Nb of days
-AtEndOfMonth=At end of month
-CurrentNext=Current/Next
-Offset=Offset
-AlwaysActive=Always active
-Upgrade=Upgrade
-MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Deploy/install external module
-WebServer=Web server
-DocumentRootServer=Web server's root directory
-DataRootServer=Data files directory
-IP=IP
-Port=Port
-VirtualServerName=Virtual server name
-OS=OS
-PhpWebLink=Web-Php link
-Browser=Browser
-Server=Server
-Database=Database
-DatabaseServer=Database host
-DatabaseName=Database name
-DatabasePort=Database port
-DatabaseUser=Database user
-DatabasePassword=Database password
-Tables=Tables
-TableName=Table name
-NbOfRecord=Nb of records
-Host=Server
-DriverType=Driver type
-SummarySystem=System information summary
-SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Foundation
-DefaultMenuManager= Standard menu manager
-DefaultMenuSmartphoneManager=Smartphone menu manager
-Skin=Skin theme
-DefaultSkin=Default skin theme
-MaxSizeList=Max length for list
-DefaultMaxSizeList=Default max length for lists
-DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
-MessageOfDay=Message of the day
-MessageLogin=Login page message
-PermanentLeftSearchForm=Permanent search form on left menu
-DefaultLanguage=Default language to use (language code)
-EnableMultilangInterface=Enable multilingual interface
-EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/foundation information
-CompanyIds=Company/foundation identities
-CompanyName=Name
-CompanyAddress=Address
-CompanyZip=Zip
-CompanyTown=Town
-CompanyCountry=Country
-CompanyCurrency=Main currency
-CompanyObject=Object of the company
-Logo=Logo
-DoNotSuggestPaymentMode=Do not suggest
-NoActiveBankAccountDefined=No active bank account defined
-OwnerOfBankAccount=Owner of bank account %s
-BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show link "<strong>%s</strong>"
-Alerts=Alerts
-DelaysOfToleranceBeforeWarning=Tolerance delays before warning
-DelaysOfToleranceDesc=This screen allows you to define the tolerated delays before an alert is reported on screen with picto %s for each late element.
-Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned events (agenda events) not completed yet
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Delay tolerance (in days) before alert on project not closed in time
-Delays_MAIN_DELAY_TASKS_TODO=Delay tolerance (in days) before alert on planned tasks (project tasks) not completed yet
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on orders not processed yet
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on suppliers orders not processed yet
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Delay tolerance (in days) before alert on proposals to close
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Delay tolerance (in days) before alert on proposals not billed
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerance delay (in days) before alert on services to activate
-Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerance delay (in days) before alert on expired services
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerance delay (in days) before alert on unpaid supplier invoices
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerence delay (in days) before alert on unpaid client invoices
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerance delay (in days) before alert on pending bank reconciliation
-Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed membership fee
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
-Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
-SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
-SetupDescription5=Other menu entries manage optional parameters.
-LogEvents=Security audit events
-Audit=Audit
-InfoDolibarr=About Dolibarr
-InfoBrowser=About Browser
-InfoOS=About OS
-InfoWebServer=About Web Server
-InfoDatabase=About Database
-InfoPHP=About PHP
-InfoPerf=About Performances
-BrowserName=Browser name
-BrowserOS=Browser OS
-ListOfSecurityEvents=List of Dolibarr security events
-SecurityEventsPurged=Security events purged
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
-SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
-SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
-DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
-AvailableModules=Available 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.
-TriggersAvailable=Available triggers
-TriggersDesc=Triggers are files that will modify the behaviour of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realised new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
-TriggerDisabledByName=Triggers in this file are disabled by the <b>-NORUN</b> suffix in their name.
-TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module <b>%s</b> is disabled.
-TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules.
-TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
-GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password
-DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">check here</a>.
-MiscellaneousDesc=All other security related parameters are defined here.
-LimitsSetup=Limits/Precision setup
-LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here
-MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices
-MAIN_MAX_DECIMALS_TOT=Max decimals for total prices
-MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add <b>...</b> after this number if you want to see <b>...</b> when number is truncated when shown on screen)
-MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
-UnitPriceOfProduct=Net unit price of a product
-TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
-ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
-NoEventFoundWithCriteria=No security event has been found for such search criterias.
-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.
-BackupDescX=Archived directory should be stored in a secure place.
-BackupDescY=The generated dump file should be stored in a secure place.
-BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one
-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 directoy (<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=Available database backup dump files
-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
-DownloadMoreSkins=More skins to download
-SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence without hole and with no reset
-ShowProfIdInAddress=Show professionnal id with addresses on documents
-ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents
-TranslationUncomplete=Partial translation
-MAIN_DISABLE_METEO=Disable meteo view
-TestLoginToAPI=Test login to API
-ProxyDesc=Some features of Dolibarr need to have an Internet access to work. Define here parameters for this. If the Dolibarr server is behind a Proxy server, those parameters tells Dolibarr how to access Internet through it.
-ExternalAccess=External access
-MAIN_PROXY_USE=Use a proxy server (otherwise direct access to internet)
-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 all attributes, not already available by default, and that you want to be supported for %s.
-ExtraFields=Complementary attributes
-ExtraFieldsLines=Complementary attributes (lines)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
-ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact/address)
-ExtraFieldsMember=Complementary attributes (member)
-ExtraFieldsMemberType=Complementary attributes (member type)
-ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
-ExtraFieldsSupplierOrders=Complementary attributes (orders)
-ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
-ExtraFieldsProject=Complementary attributes (projects)
-ExtraFieldsProjectTask=Complementary attributes (tasks)
-ExtraFieldHasWrongValue=Attribute %s has a wrong value.
-AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
-SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
-PathToDocuments=Path to documents
-PathDirectory=Directory
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might 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.
-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: <strong>User display setup</strong> tab of 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
-TranslationString=Translation string
-CurrentTranslationString=Current translation string
-WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
-NewTranslationStringToShow=New translation string to show
-OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
-YouMustEnableOneModule=You must at least enable 1 module
-ClassNotFoundIntoPathWarning=Class %s not found into PHP path
-YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
-SuhosinSessionEncrypt=Session storage encrypted by Suhosin
-ConditionIsCurrently=Condition is currently %s
-YouUseBestDriver=You use driver %s that is best driver available currently.
-YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required 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.
-BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance.
-BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
-AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp".
-AskForPreferredShippingMethod=Ask for preferred Sending Method for Third Parties.
-FieldEdition=Edition of field %s
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
-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.
-PasswordGenerationPerso=Return a password according to your personally defined configuration.
-SetupPerso=According to your configuration
-PasswordPatternDesc=Password pattern description
-##### Users setup #####
-RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passwords
-DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page
-UsersSetup=Users module setup
-UserMailRequired=EMail required to create a new user
-##### HRM setup #####
-HRMSetup=HRM module setup
-##### Company setup #####
-CompanySetup=Companies module setup
-CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier)
-AccountCodeManager=Module for accountancy code generation (customer or supplier)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
-NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
-NotificationsDescGlobal=* or by setting global target emails in module setup page.
-ModelModules=Documents templates
-DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
-WatermarkOnDraft=Watermark on draft document
-JSOnPaimentBill=Activate feature to autofill payment lines on payment form
-CompanyIdProfChecker=Rules on Professional Ids
-MustBeUnique=Must be unique?
-MustBeMandatory=Mandatory to create third parties?
-MustBeInvoiceMandatory=Mandatory to validate invoices?
-##### Webcal setup #####
-WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
-##### Invoices #####
-BillsSetup=Invoices module setup
-BillsNumberingModule=Invoices and credit notes numbering model
-BillsPDFModules=Invoice documents models
-CreditNote=Note de crédit
-CreditNotes=Notes de crédit
-ForceInvoiceDate=Force invoice date to validation date
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
-SuggestPaymentByRIBOnAccount=Suggest payment by withdraw on account
-SuggestPaymentByChequeToAddress=Suggest payment by cheque to
-FreeLegalTextOnInvoices=Free text on invoices
-WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
-PaymentsNumberingModule=Payments numbering model
 SuppliersPayment=Paiements fournisseurs
-SupplierPaymentSetup=Suppliers payments setup
-##### Proposals #####
-PropalSetup=Commercial proposals module setup
-ProposalsNumberingModules=Commercial proposal numbering models
-ProposalsPDFModules=Commercial proposal documents models
-FreeLegalTextOnProposal=Free text on commercial proposals
-WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
-WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
-##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
-##### Orders #####
-OrdersSetup=Order management setup
-OrdersNumberingModules=Orders numbering models
-OrdersModelModule=Order documents models
-FreeLegalTextOnOrders=Free text on orders
-WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
-ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Interventions #####
-InterventionsSetup=Interventions module setup
-FreeLegalTextOnInterventions=Free text on intervention documents
-FicheinterNumberingModules=Intervention numbering models
-TemplatePDFInterventions=Intervention card documents models
-WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
-##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
-ContractsNumberingModules=Contracts numbering modules
-TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
-##### Members #####
-MembersSetup=Members module setup
-MemberMainOptions=Main options
-AdherentLoginRequired= Manage a Login for each member
-AdherentMailRequired=EMail required to create a new member
-MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
-##### LDAP setup #####
-LDAPSetup=LDAP Setup
-LDAPGlobalParameters=Paramètres globaux
-LDAPUsersSynchro=Users
-LDAPGroupsSynchro=Groups
-LDAPContactsSynchro=Contacts
-LDAPMembersSynchro=Members
-LDAPSynchronization=LDAP synchronisation
-LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP
-LDAPToDolibarr=LDAP -> Dolibarr
-DolibarrToLDAP=Dolibarr -> LDAP
-LDAPNamingAttribute=Key in LDAP
-LDAPSynchronizeUsers=Organization of users in LDAP
-LDAPSynchronizeGroups=Organization of groups in LDAP
-LDAPSynchronizeContacts=Organization of contacts in LDAP
-LDAPSynchronizeMembers=Organization of foundation's members in LDAP
-LDAPPrimaryServer=Primary server
-LDAPSecondaryServer=Secondary server
-LDAPServerPort=Server port
-LDAPServerPortExample=Default port : 389
-LDAPServerProtocolVersion=Protocol version
-LDAPServerUseTLS=Use TLS
-LDAPServerUseTLSExample=Your LDAP server use TLS
-LDAPServerDn=Server DN
-LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
-LDAPPassword=Administrator password
-LDAPUserDn=Users' DN
-LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
-LDAPGroupDn=Groups' DN
-LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com)
-LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
-LDAPServerDnExample=Complete DN (ex: dc=example,dc=com)
-LDAPDnSynchroActive=Users and groups synchronization
-LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization
-LDAPDnContactActive=Contacts' synchronization
-LDAPDnContactActiveExample=Activated/Unactivated synchronization
-LDAPDnMemberActive=Members' synchronization
-LDAPDnMemberActiveExample=Activated/Unactivated synchronization
-LDAPContactDn=Dolibarr contacts' DN
-LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com)
-LDAPMemberDn=Dolibarr members DN
-LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com)
-LDAPMemberObjectClassList=List of objectClass
-LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPUserObjectClassList=List of objectClass
-LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPGroupObjectClassList=List of objectClass
-LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
-LDAPContactObjectClassList=List of objectClass
-LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPTestConnect=Test LDAP connection
-LDAPTestSynchroContact=Test contacts synchronization
-LDAPTestSynchroUser=Test user synchronization
-LDAPTestSynchroGroup=Test group synchronization
-LDAPTestSynchroMember=Test member synchronization
-LDAPTestSearch= Test a LDAP search
-LDAPSynchroOK=Synchronization test successful
-LDAPSynchroKO=Failed synchronization test
-LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that connexion to server is correctly configured and allows LDAP udpates
-LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s)
-LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s)
-LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPBindKO=Connect/Authentificate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPSetupForVersion3=LDAP server configured for version 3
-LDAPSetupForVersion2=LDAP server configured for version 2
-LDAPDolibarrMapping=Dolibarr Mapping
-LDAPLdapMapping=LDAP Mapping
-LDAPFieldLoginUnix=Login (unix)
-LDAPFieldLoginExample=Example : uid
-LDAPFilterConnection=Search filter
-LDAPFilterConnectionExample=Example : &(objectClass=inetOrgPerson)
-LDAPFieldLoginSamba=Login (samba, activedirectory)
-LDAPFieldLoginSambaExample=Example : samaccountname
-LDAPFieldFullname=Full name
-LDAPFieldFullnameExample=Example : cn
-LDAPFieldPasswordNotCrypted=Password not crypted
-LDAPFieldPasswordCrypted=Password crypted
-LDAPFieldPasswordExample=Example : userPassword
-LDAPFieldCommonNameExample=Example : cn
-LDAPFieldName=Name
-LDAPFieldNameExample=Example : sn
-LDAPFieldFirstName=First name
-LDAPFieldFirstNameExample=Example : givenName
-LDAPFieldMail=Email address
-LDAPFieldMailExample=Example : mail
-LDAPFieldPhone=Professional phone number
-LDAPFieldPhoneExample=Example : telephonenumber
-LDAPFieldHomePhone=Personal phone number
-LDAPFieldHomePhoneExample=Example : homephone
-LDAPFieldMobile=Cellular phone
-LDAPFieldMobileExample=Example : mobile
-LDAPFieldFax=Fax number
-LDAPFieldFaxExample=Example : facsimiletelephonenumber
-LDAPFieldAddress=Street
-LDAPFieldAddressExample=Example : street
-LDAPFieldZip=Zip
-LDAPFieldZipExample=Example : postalcode
-LDAPFieldTown=Town
-LDAPFieldTownExample=Example : l
-LDAPFieldCountry=Country
-LDAPFieldDescription=Description
-LDAPFieldDescriptionExample=Example : description
-LDAPFieldNotePublic=Public Note
-LDAPFieldNotePublicExample=Example : publicnote
-LDAPFieldGroupMembers= Group members
-LDAPFieldGroupMembersExample= Example : uniqueMember
-LDAPFieldBirthdate=Birthdate
-LDAPFieldCompany=Company
-LDAPFieldCompanyExample=Example : o
-LDAPFieldSid=SID
-LDAPFieldSidExample=Example : objectsid
-LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Job position
-LDAPFieldTitleExample=Example: title
-LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
-LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
-LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts.
-LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users.
-LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups.
-LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module.
-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 advices related to performance.
-NotInstalled=Not installed, so your server is not slow 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.
-MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
-MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
-OPCodeCache=OPCode cache
-NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad).
-HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
-FilesOfTypeCached=Files of type %s are cached by HTTP server
-FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
-FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
-FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
-CacheByServer=Cache by server
-CacheByClient=Cache by browser
-CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
-##### Products #####
-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)
-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 third party language
-UseSearchToSelectProductTooltip=Also if you have a large number of product (> 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)
-SetDefaultBarcodeTypeProducts=Default barcode type to use for products
-SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
-ProductCodeChecker= Module for product code generation and checking (product or service)
-ProductOtherConf= Product / Service configuration
-IsNotADir=is not a directory!
-##### Syslog #####
-SyslogSetup=Logs module setup
-SyslogOutput=Logs outputs
-SyslogFacility=Facility
-SyslogLevel=Level
-SyslogFilename=File name and path
-YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
-ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
-##### Donations #####
-DonationsSetup=Donation module setup
-DonationsReceiptModel=Template of donation receipt
-##### Barcode #####
-BarcodeSetup=Barcode setup
-PaperFormatModule=Print format module
-BarcodeEncodeModule=Barcode encoding type
-CodeBarGenerator=Barcode generator
-ChooseABarCode=No generator defined
-FormatNotSupportedByGenerator=Format not supported by this generator
-BarcodeDescEAN8=Barcode of type EAN8
-BarcodeDescEAN13=Barcode of type EAN13
-BarcodeDescUPC=Barcode of type UPC
-BarcodeDescISBN=Barcode of type ISBN
-BarcodeDescC39=Barcode of type C39
-BarcodeDescC128=Barcode of type C128
-BarcodeDescDATAMATRIX=Barcode of type Datamatrix
-BarcodeDescQRCODE=Barcode of type QR code
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
-BarcodeInternalEngine=Internal engine
-BarCodeNumberManager=Manager to auto define barcode numbers
-##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct debit payment orders
-##### ExternalRSS #####
-ExternalRSSSetup=External RSS imports setup
-NewRSS=New RSS Feed
-RSSUrl=RSS URL
-RSSUrlExample=An interesting RSS feed
-##### Mailing #####
-MailingSetup=EMailing module setup
-MailingEMailFrom=Sender EMail (From) for emails sent by emailing module
-MailingEMailError=Return EMail (Errors-to) for emails with errors
-MailingDelay=Seconds to wait after sending next message
-##### Notification #####
-NotificationSetup=EMail notification module setup
-NotificationEMailFrom=Sender EMail (From) for emails sent for notifications
-FixedEmailTarget=Fixed email target
-##### Sendings #####
-SendingsSetup=Sending module setup
-SendingsReceiptModel=Sending receipt model
-SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
-FreeLegalTextOnShippings=Free text on shipments
-##### Deliveries #####
-DeliveryOrderNumberingModules=Products deliveries receipt numbering module
-DeliveryOrderModel=Products deliveries receipt model
-DeliveriesOrderAbility=Support products deliveries receipts
-FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
-##### FCKeditor #####
-AdvancedEditor=Advanced editor
-ActivateFCKeditor=Activate advanced editor for:
-FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
-FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files.</font>
-FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
-FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
-##### OSCommerce 1 #####
-OSCommerceErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be an OSCommerce database (Key %s not found in table %s).
-OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' successfull.
-OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
-OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
-##### Stock #####
-StockSetup=Warehouse module setup
-IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
-##### Menu #####
-MenuDeleted=Menu deleted
-Menus=Menus
-TreeMenuPersonalized=Personalized menus
-NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
-NewMenu=New menu
-Menu=Selection of menu
-MenuHandler=Menu handler
-MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
-DetailId=Id menu
-DetailMenuHandler=Menu handler where to show new menu
-DetailMenuModule=Module name if menu entry come from a module
-DetailType=Type of menu (top or left)
-DetailTitre=Menu label or label code for translation
-DetailUrl=URL where menu send you (Absolute URL link or external link with http://)
-DetailEnabled=Condition to show or not entry
-DetailRight=Condition to display unauthorized grey menus
-DetailLangs=Lang file name for label code translation
-DetailUser=Intern / Extern / All
 Target=Objectif
-DetailTarget=Target for links (_blank top open a new window)
-DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu)
-ModifMenu=Menu change
-DeleteMenu=Delete menu entry
-ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
-FailedToInitializeMenu=Failed to initialize menu
-##### Tax #####
-TaxSetup=Taxes, social or fiscal taxes and dividends module setup
-OptionVatMode=VAT due
-OptionVATDefault=Cash basis
-OptionVATDebitOption=Accrual basis
-OptionVatDefaultDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on payments for services
-OptionVatDebitOptionDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on invoice (debit) for services
-SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
-OnDelivery=On delivery
-OnPayment=On payment
-OnInvoice=On invoice
-SupposedToBePaymentDate=Payment date used
-SupposedToBeInvoiceDate=Invoice date used
-Buy=Buy
-Sell=Sell
-InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
-AccountancyCode=Accountancy Code
-AccountancyCodeSell=Sale 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 -> Dictionary -> 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_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
-AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### 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 your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your 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.
-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 same computer than 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.
-##### Point Of Sales (CashDesk) #####
-CashDesk=Point of sales
-CashDeskSetup=Point of sales module setup
-CashDeskThirdPartyForSell=Default generic third party to use for sells
-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).
-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
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
-##### Bookmark #####
-BookmarkSetup=Bookmark module setup
-BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu.
-NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu
-##### WebServices #####
-WebServicesSetup=Webservices module setup
-WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
-WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
-EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
-##### API ####
-ApiSetup=API module setup
-ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
-OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
-ApiKey=Key for API
-WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
-##### Bank #####
-BankSetupModule=Bank module setup
-FreeLegalTextOnChequeReceipts=Free text on cheque receipts
-BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
-BankOrderGlobal=General
-BankOrderGlobalDesc=General display order
-BankOrderES=Spanish
-BankOrderESDesc=Spanish display order
-ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
-##### Multicompany #####
-MultiCompanySetup=Multi-company module setup
-##### Suppliers #####
-SuppliersSetup=Supplier module setup
-SuppliersCommandModel=Complete template of supplier order (logo...)
-SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
-SuppliersInvoiceNumberingModel=Supplier invoices numbering models
-IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
-##### GeoIPMaxmind #####
-GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
-NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
-YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
-YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
-TestGeoIPResult=Test of a conversion IP -> country
-##### Projects #####
-ProjectsNumberingModules=Projects numbering module
-ProjectsSetup=Project module setup
-ProjectsModelModule=Project reports document model
-TasksNumberingModules=Tasks numbering module
-TaskModelModule=Tasks reports document model
-UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
-##### ECM (GED) #####
-##### Fiscal Year #####
-AccountingPeriods=Accounting periods
-AccountingPeriodCard=Accounting period
-NewFiscalYear=New accounting period
-OpenFiscalYear=Open accounting period
-CloseFiscalYear=Close accounting period
-DeleteFiscalYear=Delete accounting period
-ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
-ShowFiscalYear=Show accounting period
-AlwaysEditable=Can always be edited
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
-Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
-IncludePath=Include path (defined into variable %s)
-ExpenseReportsSetup=Setup of module Expense Reports
-TemplatePDFExpenseReports=Document templates to generate expense report document
-NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
-YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of 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
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/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.
-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.
-ConfFileMuseContainCustom=Installing 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)
-TextTitleColor=Color of page title
-LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
-NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
-BackgroundColor=Background color
-TopMenuBackgroundColor=Background color for Top menu
-TopMenuDisableImages=Hide images in Top menu
-LeftMenuBackgroundColor=Background color for Left menu
-BackgroundTableTitleColor=Background color for Table title line
-BackgroundTableLineOddColor=Background color for odd table lines
-BackgroundTableLineEvenColor=Background color for even table lines
-MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
-NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
-UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
-PositionIntoComboList=Position of line into combo lists
-SellTaxRate=Sale tax rate
-RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
-UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipping, you can enter it here. You can use the key {TRACKID} into URL parameters so the system will replace it with value of tracking number user entered into shipment card.
-OpportunityPercent=When you create an opportunity, you will defined an estimated amount of project/lead. According to status of opportunity, this amount may be multiplicated 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
-FixTZ=TimeZone fix
-FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
-ExpectedChecksum=Expected Checksum
-CurrentChecksum=Current Checksum
-ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the latest stable version
-TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
-TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so 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 usefull only if your prices for each leve 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.
-SeeSubstitutionVars=See * note for list of possible substitution variables
-AllPublishers=All publishers
-UnknownPublishers=Unknown publishers
-AddRemoveTabs=Add or remove tabs
-AddDictionaries=Add dictionaries
-AddBoxes=Add widgets
-AddSheduledJobs=Add scheduled jobs
-AddHooks=Add hooks
-AddTriggers=Add triggers
-AddMenus=Add menus
-AddPermissions=Add permissions
-AddExportProfiles=Add export profiles
-AddImportProfiles=Add import profiles
-AddOtherPagesOrServices=Add other pages or services
-AddModels=Add document or numbering templates
-AddSubstitutions=Add keys substitutions
-DetectionNotPossible=Detection not possible
-UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved on 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 correclty. 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 inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <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
-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
-TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
-##### Resource ####
-ResourceSetup=Configuration du module Resource
-UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
diff --git a/htdocs/langs/fr_BE/cashdesk.lang b/htdocs/langs/fr_BE/cashdesk.lang
deleted file mode 100644
index c3ca13bf385..00000000000
--- a/htdocs/langs/fr_BE/cashdesk.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cashdesk
-BankToPay=Account for payment
diff --git a/htdocs/langs/fr_BE/main.lang b/htdocs/langs/fr_BE/main.lang
index 65941809b4b..b23a0e13878 100644
--- a/htdocs/langs/fr_BE/main.lang
+++ b/htdocs/langs/fr_BE/main.lang
@@ -1,9 +1,5 @@
 # Dolibarr language file - Source file is en_US - main
 DIRECTION=ltr
-# Note for Chinese:
-# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
-# stsongstdlight or cid0cs are for simplified Chinese
-# To read Chinese pdf with Linux: sudo apt-get install poppler-data
 FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=,
@@ -23,799 +19,10 @@ FormatDateHourShort=%d/%m/%Y %H:%M
 FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
-DatabaseConnection=Database connection
-NoTemplateDefined=No template defined for this email type
-AvailableVariables=Available substitution variables
-NoTranslation=No translation
-NoRecordFound=No record found
-NoRecordDeleted=No record deleted
-NotEnoughDataYet=Not enough data
-NoError=No error
-Error=Erreur
-Errors=Errors
-ErrorFieldRequired=Field '%s' is required
-ErrorFieldFormat=Field '%s' has a bad value
-ErrorFileDoesNotExists=File %s does not exist
-ErrorFailedToOpenFile=Failed to open file %s
-ErrorCanNotCreateDir=Cannot create dir %s
-ErrorCanNotReadDir=Cannot read dir %s
-ErrorConstantNotDefined=Parameter %s not defined
-ErrorUnknown=Unknown error
-ErrorSQL=SQL Error
-ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this
-ErrorGoToModuleSetup=Go to Module setup to fix this
-ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
-ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
-ErrorInternalErrorDetected=Error detected
-ErrorWrongHostParameter=Wrong host parameter
-ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post again the form.
-ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child records.
-ErrorWrongValue=Wrong value
-ErrorWrongValueForParameterX=Wrong value for parameter %s
-ErrorNoRequestInError=No request in error
-ErrorServiceUnavailableTryLater=Service not available for 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>.
-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 nb of record per page
-NotAuthorized=You are not authorized to do that.
-SetDate=Set date
-SelectDate=Select a date
-SeeAlso=See also %s
-SeeHere=See here
-Apply=Apply
-BackgroundColorByDefault=Default background color
-FileRenamed=The file was successfully renamed
-FileUploaded=The file was successfully uploaded
-FileGenerated=The file was successfully generated
-FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
-NbOfEntries=Nb of entries
-GoToWikiHelpPage=Read online help (Internet access needed)
-GoToHelpPage=Read help
-RecordSaved=Record saved
-RecordDeleted=Record deleted
-LevelOfFeature=Level of features
-NotDefined=Not defined
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
-Administrator=Administrator
-Undefined=Undefined
-PasswordForgotten=Password forgotten?
-SeeAbove=See above
-HomeArea=Home area
-LastConnexion=Latest connection
-PreviousConnexion=Previous connection
-PreviousValue=Previous value
-ConnectedOnMultiCompany=Connected on environment
-ConnectedSince=Connected since
-AuthenticationMode=Authentication mode
-RequestedUrl=Requested URL
-DatabaseTypeManager=Database type manager
-RequestLastAccessInError=Latest database access request error
-ReturnCodeLastAccessInError=Return code for latest database access request error
-InformationLastAccessInError=Information for latest database access request error
-DolibarrHasDetectedError=Dolibarr has detected a technical error
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes
-MoreInformation=More information
-TechnicalInformation=Technical information
-TechnicalID=Technical ID
-NotePublic=Note (public)
-NotePrivate=Note (private)
-PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
-DoTest=Test
-ToFilter=Filter
-NoFilter=No filter
-WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance delay.
-yes=yes
-Yes=Yes
-no=no
-No=No
-All=All
-Home=Home
-Help=Help
-OnlineHelp=Online help
-PageWiki=Wiki page
-MediaBrowser=Media browser
-Always=Always
-Never=Never
-Under=under
-Period=Period
-PeriodEndDate=End date for period
-Activate=Activate
-Activated=Activated
-Closed=Closed
-Closed2=Closed
-NotClosed=Not closed
-Enabled=Enabled
-Deprecated=Deprecated
-Disable=Disable
-Disabled=Disabled
-Add=Add
-AddLink=Add link
-RemoveLink=Remove link
-AddToDraft=Add to draft
 Update=Mise à jour
-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>?
-Delete=Delete
-Remove=Remove
-Resiliate=Terminate
-Cancel=Cancel
-Modify=Modify
-Edit=Edit
-Validate=Valider
-ValidateAndApprove=Validate and Approve
-ToValidate=To validate
-Save=Save
-SaveAs=Save As
-TestConnection=Test connection
-ToClone=Clone
-ConfirmClone=Choose data you want to clone :
-NoCloneOptionsSpecified=No data to clone defined.
-Of=of
-Go=Go
-Run=Run
-CopyOf=Copy of
-Show=Show
-Hide=Hide
-ShowCardHere=Show card
-Search=Search
-SearchOf=Search
-Valid=Valid
-Approve=Approve
-Disapprove=Disapprove
-ReOpen=Re-Open
-Upload=Send file
-ToLink=Link
-Select=Select
-Choose=Choose
-Resize=Resize
-Recenter=Recenter
-Author=Author
-User=User
-Users=Users
-Group=Group
-Groups=Groups
-NoUserGroupDefined=No user group defined
-Password=Password
-PasswordRetype=Retype your password
-NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
-Name=Name
-Person=Person
-Parameter=Parameter
-Parameters=Parameters
-Value=Value
-PersonalValue=Personal value
-NewValue=New value
-CurrentValue=Current value
-Code=Code
-Type=Type
-Language=Language
-MultiLanguage=Multi-language
-Note=Note
-Title=Title
-Label=Label
-RefOrLabel=Ref. or label
-Info=Log
-Family=Family
-Description=Description
-Designation=Description
-Model=Doc template
-DefaultModel=Default doc template
-Action=Event
-About=About
-Number=Number
-NumberByMonth=Number by month
-AmountByMonth=Amount by month
-Numero=Number
-Limit=Limit
-Limits=Limits
-Logout=Logout
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Connection
-Setup=Setup
-Alert=Alert
-Previous=Previous
-Next=Next
-Cards=Cards
-Card=Card
-Now=Now
-HourStart=Start hour
-Date=Date
-DateAndHour=Date and hour
-DateToday=Today's date
-DateReference=Reference date
 DateStart=Date de début
 DateEnd=Date de fin
-DateCreation=Creation date
-DateCreationShort=Creat. date
-DateModification=Modification date
-DateModificationShort=Modif. date
-DateLastModification=Latest modification date
-DateValidation=Validation date
-DateClosing=Closing date
-DateDue=Due date
-DateValue=Value date
-DateValueShort=Value date
-DateOperation=Operation date
-DateOperationShort=Oper. Date
-DateLimit=Limit date
-DateRequest=Request date
-DateProcess=Process date
-DateBuild=Report build date
-DatePayment=Date of payment
-DateApprove=Approving date
-DateApprove2=Approving date (second approval)
-UserCreation=Creation user
-UserModification=Modification user
-UserCreationShort=Creat. user
-UserModificationShort=Modif. user
-DurationYear=year
-DurationMonth=month
-DurationWeek=week
-DurationDay=day
-DurationYears=years
-DurationMonths=months
-DurationWeeks=weeks
-DurationDays=days
-Year=Year
-Month=Month
-Week=Week
-WeekShort=Week
-Day=Day
-Hour=Hour
-Minute=Minute
-Second=Second
-Years=Years
-Months=Months
-Days=Days
-days=days
-Hours=Hours
-Minutes=Minutes
-Seconds=Seconds
-Weeks=Weeks
-Today=Today
-Yesterday=Yesterday
-Tomorrow=Tomorrow
-Morning=Morning
-Afternoon=Afternoon
-Quadri=Quadri
-MonthOfDay=Month of the day
-HourShort=H
-MinuteShort=mn
-Rate=Rate
-CurrencyRate=Currency conversion rate
-UseLocalTax=Include tax
-Bytes=Bytes
-KiloBytes=Kilobytes
-MegaBytes=Megabytes
-GigaBytes=Gigabytes
-TeraBytes=Terabytes
-b=b.
-Kb=Kb
-Mb=Mb
-Gb=Gb
-Tb=Tb
-Cut=Cut
-Copy=Copy
-Paste=Paste
-Default=Default
-DefaultValue=Default value
-Price=Price
-UnitPrice=Unit price
-UnitPriceHT=Unit price (net)
-UnitPriceTTC=Unit price
-PriceU=U.P.
-PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (currency)
-PriceUTTC=U.P. (inc. tax)
-Amount=Montant
-AmountInvoice=Invoice amount
 AmountPayment=Montant de paiement
-AmountHTShort=Amount (net)
-AmountTTCShort=Amount (inc. tax)
-AmountHT=Amount (net of tax)
-AmountTTC=Amount (inc. tax)
-AmountVAT=Amount tax
-MulticurrencyAlreadyPaid=Already payed, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
-MulticurrencyAmountHT=Amount (net of tax), original currency
-MulticurrencyAmountTTC=Amount (inc. of tax), original currency
-MulticurrencyAmountVAT=Amount tax, original currency
-AmountLT1=Amount tax 2
-AmountLT2=Amount tax 3
-AmountLT1ES=Amount RE
-AmountLT2ES=Amount IRPF
-AmountTotal=Total amount
-AmountAverage=Average amount
-PriceQtyMinHT=Price quantity min. (net of tax)
-Percentage=Percentage
-Total=Total
-SubTotal=Subtotal
-TotalHTShort=Total (net)
-TotalHTShortCurrency=Total (net in currency)
-TotalTTCShort=Total (inc. tax)
-TotalHT=Total (net of tax)
-TotalHTforthispage=Total (net of tax) for this page
-Totalforthispage=Total for this page
-TotalTTC=Total (inc. tax)
-TotalTTCToYourCredit=Total (inc. tax) to your credit
-TotalVAT=Total tax
-TotalLT1=Total tax 2
-TotalLT2=Total tax 3
-TotalLT1ES=Total RE
-TotalLT2ES=Total IRPF
-HT=Net of tax
-TTC=Inc. tax
-VAT=Sales tax
-VATs=Sales taxes
-LT1ES=RE
-LT2ES=IRPF
-VATRate=Tax Rate
-Average=Average
-Sum=Sum
-Delta=Delta
-Module=Module
-Option=Option
-List=Liste
-FullList=Full list
-Statistics=Statistics
-OtherStatistics=Other statistics
-Status=Status
-Favorite=Favorite
-ShortInfo=Info.
-Ref=Ref.
-ExternalRef=Ref. extern
-RefSupplier=Ref. supplier
-RefPayment=Ref. payment
-CommercialProposalsShort=Commercial proposals
-Comment=Comment
-Comments=Comments
-ActionsToDo=Events to do
-ActionsToDoShort=To do
-ActionsDoneShort=Done
-ActionNotApplicable=Not applicable
-ActionRunningNotStarted=To start
-ActionRunningShort=In progress
-ActionDoneShort=Finished
-ActionUncomplete=Uncomplete
-CompanyFoundation=Company/Foundation
-ContactsForCompany=Contacts 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
-NActionsLate=%s late
-RequestAlreadyDone=Request already recorded
-Filter=Filter
-FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
-RemoveFilter=Remove filter
-ChartGenerated=Chart generated
-ChartNotGenerated=Chart not generated
-GeneratedOn=Build on %s
-Generate=Generate
-Duration=Duration
-TotalDuration=Total duration
-Summary=Summary
-DolibarrStateBoard=Statistics
-DolibarrWorkBoard=Work tasks board
-Available=Available
-NotYetAvailable=Not yet available
-NotAvailable=Not available
-Categories=Tags/categories
-Category=Tag/category
-By=By
-From=From
-to=to
-and=and
-or=or
-Other=Other
-Others=Others
-OtherInformations=Other informations
-Quantity=Quantity
-Qty=Qty
-ChangedBy=Changed by
-ApprovedBy=Approved by
-ApprovedBy2=Approved by (second approval)
-Approved=Approuvé
-Refused=Refused
-ReCalculate=Recalculate
-ResultKo=Failure
-Reporting=Reporting
-Reportings=Reporting
-Draft=Draft
-Drafts=Drafts
-Validated=Validated
-Opened=Opened
-New=New
 Discount=Ristourne
 Unknown=Inconnue
-General=General
-Size=Size
-Received=Received
-Paid=Paid
-Topic=Subject
-ByCompanies=By third parties
-ByUsers=By users
-Links=Links
-Link=Link
-Rejects=Rejects
-Preview=Preview
-NextStep=Next step
-Datas=Data
-None=None
-NoneF=None
-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.
-Photo=Picture
-Photos=Pictures
-AddPhoto=Add picture
-DeletePicture=Picture delete
-ConfirmDeletePicture=Confirm picture deletion?
-Login=Login
-CurrentLogin=Current login
-EnterLoginDetail=Enter login details
-January=January
-February=February
-March=March
-April=April
-May=May
-June=June
-July=July
-August=August
-September=September
-October=October
-November=November
-December=December
-JanuaryMin=Jan
-FebruaryMin=Feb
-MarchMin=Mar
-AprilMin=Apr
-MayMin=May
-JuneMin=Jun
-JulyMin=Jul
-AugustMin=Aug
-SeptemberMin=Sep
-OctoberMin=Oct
-NovemberMin=Nov
-DecemberMin=Dec
-Month01=January
-Month02=February
-Month03=March
-Month04=April
-Month05=May
-Month06=June
-Month07=July
-Month08=August
-Month09=September
-Month10=October
-Month11=November
-Month12=December
-MonthShort01=Jan
-MonthShort02=Feb
-MonthShort03=Mar
-MonthShort04=Apr
-MonthShort05=May
-MonthShort06=Jun
-MonthShort07=Jul
-MonthShort08=Aug
-MonthShort09=Sep
-MonthShort10=Oct
-MonthShort11=Nov
-MonthShort12=Dec
-AttachedFiles=Attached files and documents
-FileTransferComplete=File was uploaded successfuly
-DateFormatYYYYMM=YYYY-MM
-DateFormatYYYYMMDD=YYYY-MM-DD
-DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
-ReportName=Report name
-ReportPeriod=Report period
-ReportDescription=Description
-Report=Report
-Keyword=Keyword
-Origin=Origin
-Legend=Legend
-Fill=Fill
-Reset=Reset
-File=File
-Files=Files
-NotAllowed=Not allowed
-ReadPermissionNotAllowed=Read permission not allowed
-AmountInCurrency=Amount in %s currency
-Example=Example
-Examples=Examples
-NoExample=No example
-FindBug=Report a bug
-NbOfThirdParties=Number of third parties
-NbOfLines=Number of lines
-NbOfObjects=Number of objects
-NbOfObjectReferers=Number of related items
-Referers=Related items
-TotalQuantity=Total quantity
-DateFromTo=From %s to %s
-DateFrom=From %s
-DateUntil=Until %s
 Check=Chèque
-Uncheck=Uncheck
-Internal=Internal
-External=External
-Internals=Internal
-Externals=External
-Warning=Warning
-Warnings=Warnings
-BuildDoc=Build Doc
-Entity=Environment
-Entities=Entities
-CustomerPreview=Customer preview
-SupplierPreview=Supplier preview
-ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show supplier preview
-RefCustomer=Ref. customer
-Currency=Currency
-InfoAdmin=Information for administrators
-Undo=Undo
-Redo=Redo
-ExpandAll=Expand all
-UndoExpandAll=Undo expand
-Reason=Reason
-FeatureNotYetSupported=Feature not yet supported
-CloseWindow=Close window
-Response=Response
-Priority=Priority
-SendByMail=Send by EMail
-MailSentBy=Email sent by
-TextUsedInTheMessageBody=Email body
-SendAcknowledgementByMail=Send confirmation email
-EMail=E-mail
-NoEMail=No email
-Email=Email
-NoMobilePhone=No mobile phone
-Owner=Owner
-FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
-Refresh=Refresh
-BackToList=Back to list
-GoBack=Go back
-CanBeModifiedIfOk=Can be modified if valid
-CanBeModifiedIfKo=Can be modified if not valid
-ValueIsValid=Value is valid
-ValueIsNotValid=Value is not valid
-RecordCreatedSuccessfully=Record created successfully
-RecordModifiedSuccessfully=Record modified successfully
-RecordsModified=%s record modified
-RecordsDeleted=%s record deleted
-AutomaticCode=Automatic code
-FeatureDisabled=Feature disabled
-MoveBox=Move widget
-Offered=Offered
-NotEnoughPermissions=You don't have permission for this action
-SessionName=Session name
-Method=Method
-Receive=Receive
-CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
-ExpectedValue=Expected Value
-CurrentValue=Current value
-PartialWoman=Partial
-TotalWoman=Total
-NeverReceived=Never received
-Canceled=Canceled
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
-Color=Color
-Documents=Linked files
-Documents2=Documents
-UploadDisabled=Upload disabled
-MenuECM=Documents
-MenuAWStats=AWStats
-MenuMembers=Members
-MenuAgendaGoogle=Google agenda
-ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=No documents saved in this directory
-CurrentUserLanguage=Current language
-CurrentTheme=Current theme
-CurrentMenuManager=Current menu manager
-Browser=Browser
-Layout=Layout
-Screen=Screen
-DisabledModules=Disabled modules
-For=For
-ForCustomer=For customer
-Signature=Signature
-DateOfSignature=Date of signature
-HidePassword=Show command with password hidden
-UnHidePassword=Show real command with clear password
-Root=Root
-Informations=Informations
-Page=Page
-Notes=Notes
-AddNewLine=Add new line
-AddFile=Add file
-FreeZone=Free entry
-FreeLineOfType=Free entry of type
-CloneMainAttributes=Clone object with its main attributes
-PDFMerge=PDF Merge
-Merge=Merge
-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 application at the moment.
-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=Carte de crédit
-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.
-AccordingToGeoIPDatabase=(according to GeoIP convertion)
-Line=Ligne
-NotSupported=Not supported
-RequiredField=Required field
-Result=Result
-ToTest=Test
-ValidateBefore=Card must be validated before using this feature
-Visibility=Visibility
-Private=Private
-Hidden=Hidden
-Resources=Resources
-Source=Source
-Prefix=Prefix
-Before=Before
-After=After
-IPAddress=IP address
-Frequency=Frequency
-IM=Instant messaging
-NewAttribute=New attribute
-AttributeCode=Attribute code
-URLPhoto=URL of photo/logo
-SetLinkToAnotherThirdParty=Link to another third party
-LinkTo=Link to
-LinkToProposal=Link to proposal
-LinkToOrder=Link to order
-LinkToInvoice=Link to invoice
-LinkToSupplierOrder=Link to supplier order
-LinkToSupplierProposal=Link to supplier proposal
-LinkToSupplierInvoice=Link to supplier invoice
-LinkToContract=Link to contract
-LinkToIntervention=Link to intervention
-CreateDraft=Create draft
-SetToDraft=Back to draft
-ClickToEdit=Click to edit
-ObjectDeleted=Object %s deleted
-ByCountry=By country
-ByTown=By town
-ByDate=By date
-ByMonthYear=By month/year
-ByYear=By year
-ByMonth=By month
-ByDay=By day
-BySalesRepresentative=By sales representative
-LinkedToSpecificUsers=Linked to a particular user contact
-NoResults=No results
-AdminTools=Admin tools
-SystemTools=System tools
-ModulesSystemTools=Modules tools
-Test=Test
-Element=Element
-NoPhotoYet=No pictures available yet
-Dashboard=Dashboard
-MyDashboard=My dashboard
-Deductible=Deductible
-from=from
-toward=toward
-Access=Access
-SelectAction=Select action
-HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
-SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
-OriginFileName=Original filename
-SetDemandReason=Set source
-SetBankAccount=Define Bank Account
-AccountCurrency=Account Currency
-ViewPrivateNote=View notes
-XMoreLines=%s line(s) hidden
-PublicUrl=Public URL
-AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
-PrintFile=Print File %s
-ShowTransaction=Show entry on bank account
-GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
-Deny=Deny
-Denied=Denied
-ListOfTemplates=List of templates
-Gender=Gender
-Genderman=Man
-Genderwoman=Woman
-ViewList=Vue liste
-Mandatory=Mandatory
-Hello=Hello
-Sincerely=Sincerely
-DeleteLine=Delete line
-ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
-NoRecordSelected=No record selected
-MassFilesArea=Area for files built by mass actions
-ShowTempMassFilesArea=Show area of files built by mass actions
-RelatedObjects=Related Objects
-ClassifyBilled=Classify billed
-Progress=Progress
-ClickHere=Click here
-FrontOffice=Front office
-BackOffice=Back office
-View=View
-Export=Export
-Exports=Exports
-ExportFilteredList=Export filtered list
-ExportList=Export list
-Miscellaneous=Miscellaneous
-Calendar=Calendrier
-GroupBy=Group by...
-ViewFlatList=View flat list
-RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Direct download link
-Download=Download
-ActualizeCurrency=Update currency rate
-Fiscalyear=Fiscal year
-# Week day
-Monday=Monday
-Tuesday=Tuesday
-Wednesday=Wednesday
-Thursday=Thursday
-Friday=Friday
-Saturday=Saturday
-Sunday=Sunday
-MondayMin=Mo
-TuesdayMin=Tu
-WednesdayMin=We
-ThursdayMin=Th
-FridayMin=Fr
-SaturdayMin=Sa
-SundayMin=Su
-Day1=Monday
-Day2=Tuesday
-Day3=Wednesday
-Day4=Thursday
-Day5=Friday
-Day6=Saturday
-Day0=Sunday
-ShortMonday=M
-ShortTuesday=T
-ShortWednesday=W
-ShortThursday=T
-ShortFriday=F
-ShortSaturday=S
-ShortSunday=S
-SelectMailModel=Select email template
-SetRef=Set ref
-Select2ResultFoundUseArrows=Some results found. Use arrows to select.
-Select2NotFound=No result found
-Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
-Select2LoadingMoreResults=Loading more results...
-Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
-SearchIntoContacts=Contacts
-SearchIntoMembers=Members
-SearchIntoUsers=Users
-SearchIntoProductsOrServices=Products or services
-SearchIntoProjects=Projects
-SearchIntoTasks=Tasks
-SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
-SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
-SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
-SearchIntoInterventions=Interventions
-SearchIntoContracts=Contracts
-SearchIntoCustomerShipments=Customer shipments
-SearchIntoExpenseReports=Expense reports
-SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/fr_CA/accountancy.lang b/htdocs/langs/fr_CA/accountancy.lang
index 50f9b46c36b..54ac9970ec1 100644
--- a/htdocs/langs/fr_CA/accountancy.lang
+++ b/htdocs/langs/fr_CA/accountancy.lang
@@ -3,20 +3,156 @@ ACCOUNTING_EXPORT_SEPARATORCSV=Séparateur de colonne pour le fichier export
 ACCOUNTING_EXPORT_DATE=Format de date pour le fichier export
 ACCOUNTING_EXPORT_PIECE=Exporter le nombre de pièces
 ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Exporter avec compte global
+ACCOUNTING_EXPORT_LABEL=Exporter l'étiquette
+ACCOUNTING_EXPORT_AMOUNT=Montant de l'exportation
+ACCOUNTING_EXPORT_DEVISE=Exporter la monnaie
 Selectformat=Sélectionner le format de date pour le fichier
 ACCOUNTING_EXPORT_PREFIX_SPEC=Spécifiez le préfixe du nom de fichier
+DefaultForService=Par défaut pour le service
+DefaultForProduct=Défaut pour le produit
+CantSuggest=Ne peut pas suggérer
+AccountancySetupDoneFromAccountancyMenu=La plupart de la configuration de la comptabilité se fait à partir du menu %s
+CurrentDedicatedAccountingAccount=Compte dédié actuel
+AssignDedicatedAccountingAccount=Nouveau compte à attribuer
+InvoiceLabel=Etiquette de facture
+OverviewOfAmountOfLinesNotBound=Aperçu du montant des lignes non liées au compte comptable
+OverviewOfAmountOfLinesBound=Vue d'ensemble du montant des lignes déjà liées au compte comptable
+DeleteCptCategory=Supprimer le compte comptable du groupe
+ConfirmDeleteCptCategory=Êtes-vous sûr de vouloir supprimer ce compte comptable du groupe de compte comptable?
+AccountancyArea=Zone de comptabilité
+AccountancyAreaDescActionOnce=Les actions suivantes sont généralement exécutées une seule fois, ou une fois par an ...
+AccountancyAreaDescActionOnceBis=Les étapes suivantes devraient être faites pour vous faire gagner du temps en vous suggérant le bon compte comptable par défaut lors de la journalisation (écriture dans Journals et le grand livre)
+AccountancyAreaDescActionFreq=Les actions suivantes sont généralement exécutées chaque mois, semaine ou jour pour de très grandes entreprises ...
+AccountancyAreaDescJournalSetup=STEP %s: Créez ou vérifiez le contenu de votre liste de journal à partir du menu %s
+AccountancyAreaDescChartModel=Étape %s: Créez un modèle de tableau de compte à partir du menu %s
+AccountancyAreaDescChart=STEP %s: créez ou vérifiez le contenu de votre tableau de compte à partir du menu %s
+AccountancyAreaDescVat=STEP %s: définissez les comptes comptables pour chaque taux de TVA. Pour cela, utilisez l'entrée de menu %s.
+AccountancyAreaDescExpenseReport=STEP %s: définissez les comptes comptables par défaut pour chaque type de rapport de dépenses. Pour cela, utilisez l'entrée de menu %s.
+AccountancyAreaDescSal=Étape %s: définissez les comptes comptables par défaut pour le paiement des salaires. Pour cela, utilisez l'entrée de menu %s.
+AccountancyAreaDescContrib=Étape %s: définissez les comptes comptables par défaut pour les dépenses spéciales (taxes diverses). Pour cela, utilisez l'entrée de menu %s.
+AccountancyAreaDescDonation=Étape %s: définissez les comptes comptables par défaut pour le don. Pour cela, utilisez l'entrée de menu %s.
+AccountancyAreaDescMisc=STEP %s: définissez les comptes comptables par défaut pour les transactions diverses. Pour cela, utilisez l'entrée de menu %s.
+AccountancyAreaDescLoan=Étape %s: définissez les comptes comptables par défaut pour les prêts. Pour cela, utilisez l'entrée de menu %s.
+AccountancyAreaDescBank=ÉTAPE %s: définissez les comptes comptables de chaque banque et compte financier. Pour cela, passez la carte de chaque compte financier. Vous pouvez commencer à partir de la page %s.
+AccountancyAreaDescProd=STEP %s: définissez les comptes comptables sur vos produits / services. Pour cela, utilisez l'entrée de menu %s.
+AccountancyAreaDescBind=STEP %s: vérifiez la liaison entre les lignes %s existantes et le compte comptable est effectué, de sorte que l'application pourra publier des transactions dans Ledger en un seul clic. Compléter les liaisons manquantes. Pour cela, utilisez l'entrée de menu %s.
+AccountancyAreaDescWriteRecords=Étape %s: Écrivez des transactions dans le Ledger. Pour cela, accédez au menu <strong>%s</strong>, et cliquez sur le bouton <strong>%s</strong>.
+AccountancyAreaDescAnalyze=STEP %s: Ajoutez ou modifiez des transactions existantes et générez des rapports et des exportations.
+AccountancyAreaDescClosePeriod=STEP %s: période de fermeture afin que nous ne puissions faire aucune modification dans un futur.
+Selectchartofaccounts=Sélectionnez le plan des comptes actif
+SubledgerAccount=Compte Subledger
+subledger_account=Compte Subledger
+ShowAccountingJournal=Afficher le journal comptable
+AccountAccountingSuggest=Compte comptable suggéré
+MenuVatAccounts=Comptes Vat
+MenuTaxAccounts=Comptes d'impôts
+MenuExpenseReportAccounts=Comptes de comptes de dépenses
+MenuLoanAccounts=Comptes de prêts
+MenuProductsAccounts=Comptes de produits
+Ventilation=Reliure aux comptes
+CustomersVentilation=Contrat de facture client
+SuppliersVentilation=Reliure de la facture du fournisseur
+ExpenseReportsVentilation=Rapport de dépenses liant
+CreateMvts=Créer une nouvelle transaction
+WriteBookKeeping=Journalize les transactions dans Ledger
+Bookkeeping=Grand livre
 AccountBalance=Solde du compte
 CAHTF=Total achats fournisseur avant taxes
+TotalExpenseReport=Rapport de dépenses totales
+InvoiceLines=Lignes des factures pour lier
+InvoiceLinesDone=Lignes liées aux factures
+ExpenseReportLines=Lignes des rapports de dépenses pour lier
+ExpenseReportLinesDone=Lignes liées aux rapports de dépenses
+IntoAccount=Lier avec le compte comptable
+EndProcessing=Processus terminé.
+LineOfExpenseReport=Ligne de rapport de dépenses
+NoAccountSelected=Aucun compte comptable sélectionné
+VentilatedinAccount=Lié avec succès au compte comptable
+XLineSuccessfullyBinded=%s produits / services liés avec succès à un compte comptable
+XLineFailedToBeBinded=%s produits / services n'étaient liés à aucun compte comptable
+ACCOUNTING_LIMIT_LIST_VENTILATION=Nombre d'éléments à lier affichés par page (maximum recommandé: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Commencez le tri de la page "Reliure à faire" par les éléments les plus récents
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Commencez le tri de la page "Reliure faite" par les éléments les plus récents
+ACCOUNTING_LENGTH_DESCRIPTION=Tronquer la description des produits et services dans les listes après les caractères X (Best = 50)
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Tronquer le formulaire de description de compte de produits et services dans les listes après x chars (Best = 50)
+ACCOUNTING_LENGTH_GACCOUNT=Longueur des comptes comptables généraux (Si vous définissez la valeur à 6 ici, le compte '706' apparaîtra comme '706000' à l'écran)
+ACCOUNTING_LENGTH_AACCOUNT=Longueur des comptes comptables tiers (Si vous définissez la valeur à 6 ici, le compte '401' apparaîtra comme '401000' à l'écran)
+ACCOUNTING_MANAGE_ZERO=Autoriser à gérer un nombre différent de zéro à la fin d'un compte comptable. Nécessaire par certains pays (comme la suisse). Si vous êtes désactivé (par défaut), vous pouvez définir les 2 paramètres suivants pour demander à l'application d'ajouter zéro virtuel.
+BANK_DISABLE_DIRECT_INPUT=Désactiver l'enregistrement direct de la transaction dans le compte bancaire
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Note de frais
-AccountingCategory=Accounting category
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Compte comptable du transfert
+DONATION_ACCOUNTINGACCOUNT=Compte comptable pour enregistrer des dons
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Compte comptable par défaut pour les services achetés (utilisé si non défini dans la fiche de service)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Compte comptable par défaut pour les services vendus (utilisé si non défini dans la fiche de service)
+GroupByAccountAccounting=Groupe par compte comptable
+NotMatch=Pas encore défini
+DeleteMvt=Effacer les lignes du grand livre
+ConfirmDeleteMvt=Cela supprimera toutes les lignes du Ledger pour l'année et / ou d'un journal spécifique. Au moins un critère est requis.
+ConfirmDeleteMvtPartial=Cela supprimera les lignes sélectionnées du Ledger
+DelBookKeeping=Supprimer l'enregistrement du Ledger
 FinanceJournal=Journal des finances
+ExpenseReportsJournal=Journal des rapports de dépenses
 DescFinanceJournal=Journal de banque comprenant tous les types de règlements autres que espèce\t
+DescJournalOnlyBindedVisible=Il s'agit d'une vue d'ensemble qui est liée au compte de comptabilité des produits / services et peut être enregistrée dans le Ledger.
+VATAccountNotDefined=Compte pour la TVA non définie
+ThirdpartyAccountNotDefined=Compte pour un tiers non défini
+ProductAccountNotDefined=Compte pour produit non défini
+FeeAccountNotDefined=Compte pour frais non définis
+BankAccountNotDefined=Compte pour banque non défini
+NumMvts=Nombre de transactions
+AddCompteFromBK=Ajouter des comptes comptables au groupe
+ReportThirdParty=Liste du compte tiers
+DescThirdPartyReport=Consultez ici la liste des clients et fournisseurs tiers et leurs comptes comptables
 TotalVente=Chiffre d'affaires total avant taxes
+DescVentilCustomer=Consultez ici la liste des lignes de facture client liées (ou non) à un compte comptable produit
+DescVentilMore=Dans la plupart des cas, si vous utilisez des produits ou des services prédéfinis et que vous définissez le numéro de compte sur la carte produit / service, l'application pourra établir toute la liaison entre vos lignes de facturation et le compte comptable de votre plan comptable, juste en Un clic avec le bouton <strong>"%s"</strong>. Si le compte n'a pas été défini sur les cartes produit / service ou si vous avez encore certaines lignes qui ne sont liées à aucun compte, vous devrez effectuer une liaison manuelle à partir du menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consultez ici la liste des lignes clients des factures et leur compte comptable produit
+DescVentilTodoCustomer=Lier les lignes de facture qui ne sont pas déjà liées avec un compte de comptabilité de produit
+ChangeAccount=Modifiez le compte comptable produit / service pour les lignes sélectionnées avec le compte comptable suivant:
+DescVentilSupplier=Consultez la liste des lignes de facturation fournisseur liées ou non liées à un compte comptable produit
 DescVentilDoneSupplier=Consultez ici la liste des lignes de factures fournisseur et leur compte comptable
+DescVentilTodoExpenseReport=Les lignes de rapport de frais de liaison ne sont pas déjà liées à un compte comptable
+DescVentilExpenseReport=Consultez ici la liste des lignes de rapport de dépenses liées (ou non) à un compte comptable de frais
+DescVentilExpenseReportMore=Si vous configurez un compte comptable sur le type de lignes de rapport de dépenses, l'application sera en mesure d'établir toute la liaison entre vos lignes de rapport de dépenses et le compte comptable de votre plan comptable, en un clic avec le bouton <strong>"%s"</strong>. Si le compte n'a pas été défini sur le dictionnaire des tarifs ou si vous avez encore certaines lignes qui ne sont liées à aucun compte, vous devrez effectuer une liaison manuelle à partir du menu "<strong>%s</strong>".
+DescVentilDoneExpenseReport=Consultez ici la liste des rapports des lignes de dépenses et de leurs comptes comptables
+AutomaticBindingDone=Liaison automatique effectuée
 MvtNotCorrectlyBalanced=Le mouvement n'est pas correctement équilibré. Crédit = %s. Débit = %s
+FicheVentilation=Carte de reliure
+GeneralLedgerIsWritten=Les transactions sont écrites dans le Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Certaines transactions n'ont pas pu être envoyées. S'il n'y a pas d'autre message d'erreur, c'est probablement parce qu'ils ont déjà été envoyés.
+NoNewRecordSaved=Aucun nouveau disque expédié
+ChangeBinding=Changer la liaison
+ApplyMassCategories=Appliquer des catégories de masse
+AddAccountFromBookKeepingWithNoCategories=Ajouter un compte déjà utilisé sans catégories
+CategoryDeleted=La catégorie pour le compte comptable a été supprimée
+AccountingJournals=Revues comptables
+ShowAccoutingJournal=Afficher le journal comptable
+AccountingJournalType1=Diverses opérations
+AccountingJournalType9=A-nouveau
+ErrorAccountingJournalIsAlreadyUse=Ce journal est déjà utilisé
+Modelcsv_CEGID=Export vers CEGID Expert Comptabilité
+Modelcsv_COALA=Exporter vers Sage Coala
+Modelcsv_bob50=Exporter vers Sage BOB 50
+Modelcsv_ciel=Exporter vers Sage Ciel Compta ou Compta Evolution
+Modelcsv_quadratus=Exporter vers Quadratus QuadraCompta
+Modelcsv_ebp=Exporter vers EBP
+Modelcsv_cogilog=Exporter vers Cogilog
+Modelcsv_agiris=Export vers Agiris (test)
+ChartofaccountsId=Carte comptable Id
 InitAccountancy=Compabilité initiale
+InitAccountancyDesc=Cette page peut être utilisée pour initialiser un compte comptable sur les produits et services qui n'a pas de compte comptable défini pour les ventes et les achats.
+DefaultBindingDesc=Cette page peut être utilisée pour définir un compte par défaut à utiliser pour lier l'historique des transactions sur les salaires de paiement, le don, les taxes et la TVA lorsque aucun compte comptable spécifique n'a été défini.
 OptionModeProductSell=Mode de ventes
 OptionModeProductBuy=Mode d'achats
+OptionModeProductSellDesc=Afficher tous les produits avec compte comptable pour les ventes.
+OptionModeProductBuyDesc=Afficher tous les produits avec compte comptable pour les achats.
+CleanFixHistory=Supprimer le code de comptabilité des lignes qui n'existent pas dans les tableaux de compte
+CleanHistory=Réinitialiser toutes les liaisons pour l'année sélectionnée
+ValueNotIntoChartOfAccount=Cette valeur du compte comptable n'existe pas dans le tableau de compte
 Range=Gamme de compte comptable
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+SomeMandatoryStepsOfSetupWereNotDone=Certaines étapes obligatoires de configuration n'ont pas été effectuées, veuillez les compléter
+ErrorNoAccountingCategoryForThisCountry=Aucun groupe de compte disponible pour le pays %s (Voir Home - Setup - Dictionaries)
+ExportNotSupported=Le format d'exportation configuré n'est pas pris en charge dans cette page
+BookeppingLineAlreayExists=Des lignes existant déjà dans la bibliothèque
+NoJournalDefined=Aucun journal n'a défini
+WarningReportNotReliable=Avertissement, ce rapport n'est pas basé sur le Ledger, donc ne contient pas de transaction modifiée manuellement dans le Ledger. Il sera remplacé par un rapport plus complet dans une prochaine version.
diff --git a/htdocs/langs/fr_CA/admin.lang b/htdocs/langs/fr_CA/admin.lang
index d1e0a9f5bc6..29fd8a5e339 100644
--- a/htdocs/langs/fr_CA/admin.lang
+++ b/htdocs/langs/fr_CA/admin.lang
@@ -1,1597 +1,347 @@
 # Dolibarr language file - Source file is en_US - admin
-Foundation=Association
-Version=Version
-VersionProgram=Version programmes
-VersionLastInstall=Initial install version
-VersionLastUpgrade=Latest version upgrade
-VersionExperimental=Expérimental
-VersionDevelopment=Développement
-VersionUnknown=Inconnue
-VersionRecommanded=Recommandé
-FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. Value of some setup constants may also be checked. You can use this tool to detect if some files were modified by a hacker for example.
-FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
-GlobalChecksum=Global checksum
-MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
-LocalSignature=Embedded local signature (less reliable)
-RemoteSignature=Remote distant signature (more reliable)
-FilesMissing=Fichiers manquants
+VersionLastInstall=Version d'installation initiale
+VersionLastUpgrade=Dernière mise à jour de la version
+FileCheck=Vérificateur d'intégrité des fichiers
+FileCheckDesc=Cet outil vous permet de vérifier l'intégrité des fichiers et la configuration de votre application, en comparant chaque fichier avec les officiels. La valeur de certaines constantes d'installation peut également être vérifiée. Vous pouvez utiliser cet outil pour détecter si certains fichiers ont été modifiés par un pirate informatique par exemple.
+FileIntegrityIsStrictlyConformedWithReference=L'intégrité des fichiers est strictement conforme à la référence.
+FileIntegrityIsOkButFilesWereAdded=La vérification de l'intégrité des fichiers s'est écoulée, mais certains nouveaux fichiers ont été ajoutés.
+FileIntegritySomeFilesWereRemovedOrModified=La vérification de l'intégrité des fichiers a échoué. Certains fichiers ont été modifiés, supprimés ou ajoutés.
+GlobalChecksum=Somme de contrôle globale
+MakeIntegrityAnalysisFrom=Effectuer une analyse d'intégrité des fichiers d'application de
+LocalSignature=Signature locale intégrée (moins fiable)
+RemoteSignature=Signature distante distante (plus fiable)
 FilesUpdated=Mettre à jour les fichiers
-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
-XmlNotFound=Xml Integrity File of application not found
-SessionId=ID Session
-SessionSaveHandler=Modalité de sauvegarde des sessions
-SessionSavePath=Emplacement de sauvegarde sessions
-PurgeSessions=Purge des sessions
-ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
-NoSessionListWithThisHandler=Le gestionnaire de session configuré pour votre PHP ne permet pas de lister les sessions en cours
-LockNewSessions=Bloquer nouvelles connexions
-ConfirmLockNewSessions=Êtes-vous sûr de vouloir restreindre l'accès Dolibarr à votre utilisateur. Seul l'utilisateur <b>%s</b> pourra se connecter après cela.
-UnlockNewSessions=Lever blocage des connexions
-YourSession=Votre session
-Sessions=Sessions utilisateurs
-WebUserGroup=Serveur web utilisateur/groupe
-NoSessionFound=Votre PHP ne semble pas pouvoir lister les sessions actives. Le répertoire de sauvegarde des sessions (<b>%s</b>) est peut être protégé (Par exemple, par les permissions de l'OS ou par la directive open_basedir de votre PHP, ce qui d'un point de vue sécurité est une bonne chose).
-DBStoringCharset=Encodage base pour stockage données
-DBSortingCharset=Encodage base pour tri données
-WarningModuleNotActive=Le module <b>%s</b> doit être activé pour utiliser cette fonction.
-WarningOnlyPermissionOfActivatedModules=Attention, seules les permissions en rapport avec les modules activés sont affichées ici. Vous pouvez activer d'autres modules sur la page Accueil->Configuration->Modules.
-DolibarrSetup=Installation ou mise à jour de Dolibarr
-InternalUser=Utilisateur interne
-ExternalUser=Utilisateur externe
-InternalUsers=Utilisateurs internes
-ExternalUsers=Utilisateurs externes
-GUISetup=Affichage
-SetupArea=Espace de configuration
-FormToTestFileUploadForm=Formulaire de test d'envoi de fichier (selon options choisies)
-IfModuleEnabled=Rem: oui est effectif uniquement si le module <b>%s</b> est activé
-RemoveLock=Effacer le fichier <b>%s</b> s'il existe afin d'autoriser l'outil de mise à jour.
-RestoreLock=Replacer un fichier <b>%s</b> en ne donnant que les droits de lecture sur ce fichier afin d'interdire à nouveau les mises à jour.
-SecuritySetup=Configuration de la sécurité
-SecurityFilesDesc=Define here options related to security about uploading files.
-ErrorModuleRequirePHPVersion=Erreur, ce module requiert une version %s ou supérieure de PHP
-ErrorModuleRequireDolibarrVersion=Erreur, ce module requiert une version %s ou supérieure de Dolibarr
-ErrorDecimalLargerThanAreForbidden=Erreur, les précisions supérieures à <b>%s</b> ne sont pas prises en charge.
-DictionarySetup=Dictionnaires
-Dictionary=Dictionnaires
-ErrorReservedTypeSystemSystemAuto=Erreur, les valeurs 'system' et 'systemauto' sont réservées. Vous pouvez utiliser la valeur 'user' pour ajouter vos propres enregistrements
-ErrorCodeCantContainZero=Erreur, le code ne peut contenir la valeur 0
-DisableJavascript=Désactive les fonctions Javascript et Ajax (Recommandé pour les personnes aveugles ou navigateurs text).
-UseSearchToSelectCompanyTooltip=Si vous avez un nombre important de tiers (>100 000), vous pourrez améliorer les performances en positionnant la constante COMPANY_DONOTSEARCH_ANYWHERE à 1 dans Configuration->Divers. La recherche sera alors limité au début des chaines.
-UseSearchToSelectContactTooltip=Si vous avez un nombre important de contacts (>100 000), vous pourrez améliorer les performances en positionnant la constante CONTACT_DONOTSEARCH_ANYWHERE à 1 dans Configuration->Divers. La recherche sera alors limité au début des chaines.
-DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties, but it is less convenient)
-DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact, but it is less convenient)
-NumberOfKeyToSearch=Nb carac. déclenchant recherche : %s
-NotAvailableWhenAjaxDisabled=Non disponible quand Ajax est désactivé
-AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
-JavascriptDisabled=Javascript désactivé
-UsePreviewTabs=Afficher les onglets "Aperçu"
-ShowPreview=Afficher aperçu
-PreviewNotAvailable=Aperçu non disponible
-ThemeCurrentlyActive=Thème actif actuellement
-CurrentTimeZone=Fuseau horaire PHP (serveur)
-MySQLTimeZone=Fuseau horaire MySQL (serveur)
-TZHasNoEffect=Les dates sont stockées et retournées par le serveur de base de données comme si elles étaient conservées sous forme de chaîne. Le fuseau horaire n'a d'effet que lorsque vous utilisez la fonction UNIX_TIMESTAMP (qui ne devrait pas être utilisé par Dolibarr, aussi le TZ de la base de données ne devrait avoir aucun effet, même si changé après que les données aient été saisies).
-Space=Espace
-Table=Table
-Fields=Champs
-Index=Index
-Mask=Masque
-NextValue=Prochaine valeur
-NextValueForInvoices=Prochaine valeur (factures)
-NextValueForCreditNotes=Prochaine valeur (avoirs)
-NextValueForDeposit=Prochaine valeur (acomptes)
-NextValueForReplacements=Prochaine valeur  (factures de remplacement)
-MustBeLowerThanPHPLimit=Remarque : Votre PHP limite la taille des envois à <b>%s</b> %s, quelle que soit la valeur de ce paramètre
-NoMaxSizeByPHPLimit=Aucune limite configurée dans votre serveur PHP
-MaxSizeForUploadedFiles=Taille maximum des fichiers envoyés (0 pour interdire l'envoi)
-UseCaptchaCode=Utilisation du code graphique (CAPTCHA) sur la page de connexion
-AntiVirusCommand= Chemin complet vers la commande antivirus
-AntiVirusCommandExample= Exemple pour ClamWin : c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Exemple pour ClamAv : /usr/bin/clamscan
-AntiVirusParam= Paramètres supplémentaires sur la ligne de commande
-AntiVirusParamExample= Exemple pour ClamWin : --database="C:\\Program Files (x86)\\ClamWin\\lib"
-ComptaSetup=Configuration du module Comptabilité
-UserSetup=Configuration de la gestion des utilisateurs
-MultiCurrencySetup=Multi-currency setup
-MenuLimits=Limites et précision
-MenuIdParent=Identifiant du menu parent
-DetailMenuIdParent=Identifiant du menu parent (vide pour un menu du haut)
-DetailPosition=Numéro d'ordre déterminant la position du menu
-AllMenus=Tous
-NotConfigured=Module non configuré
-Active=Actif
-SetupShort=Configuration
-OtherOptions=Autres options
-OtherSetup=Divers
-CurrentValueSeparatorDecimal=Séparateur décimal
-CurrentValueSeparatorThousand=Séparateur de milliers
-Destination=Destination
-IdModule=ID Module
-IdPermissions=ID Permissions
-Modules=Modules
-LanguageBrowserParameter=Variable %s
-LocalisationDolibarrParameters=Paramètres de localisation
-ClientTZ=Fuseau horaire client (utilisateur)
-ClientHour=Heure client (utilisateur)
-OSTZ=Fuseau horaire OS
-PHPTZ=Fuseau horaire serveur PHP
-DaylingSavingTime=Heure d'été
-CurrentHour=Heure PHP (serveur)
-CurrentSessionTimeOut=Délai expiration session actuelle
-YouCanEditPHPTZ=Pour définir un autre fuseau horaire PHP (non obligatoire), vous pouvez essayer d'ajouter un fichier .htaccess avec une ligne du type "SetEnv TZ Europe/Paris"
-Box=Widget
-Boxes=Widgets
-MaxNbOfLinesForBoxes=Max number of lines for widgets
-PositionByDefault=Position par défaut
-Position=Position
-MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
-MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br />Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
-MenuForUsers=Menu pour les utilisateurs
-LangFile=Fichier .lang
-System=Système
-SystemInfo=Infos Système
-SystemToolsArea=Espace outils systèmes
-SystemToolsAreaDesc=Cet espace offre des fonctions d'administration diverses. Utilisez le menu pour choisir la fonctionnalité recherchée.
-Purge=Purger
-PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
-PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
+FileCheckDolibarr=Vérifier l'intégrité des fichiers d'application
+AvailableOnlyOnPackagedVersions=Le fichier local pour la vérification de l'intégrité n'est disponible que lorsque l'application est installée à partir d'un paquet officiel
+XmlNotFound=Xml Integrity Fichier de l'application introuvable
+ConfirmPurgeSessions=Voulez-vous vraiment purger toutes les sessions? Cela déconnectera tous les utilisateurs (sauf vous).
+UploadNewTemplate=Télécharger un nouveau modèle (s)
+SecurityFilesDesc=Définissez ici les options liées à la sécurité concernant le téléchargement de fichiers.
+DelaiedFullListToSelectCompany=Attendez que vous appuyez sur une touche avant de charger le contenu de la liste des combinaisons de tiers (cela peut augmenter les performances si vous avez un grand nombre de tiers, mais cela est moins pratique)
+DelaiedFullListToSelectContact=Attendez que vous appuyez sur une touche avant de charger le contenu de la liste des contacts combinés (Cela peut augmenter les performances si vous avez un grand nombre de contacts, mais cela est moins pratique)
+AllowToSelectProjectFromOtherCompany=Sur le document d'un tiers, peut choisir un projet lié à un autre tiers
+NextValueForDeposit=Valeur suivante (acompte)
+MultiCurrencySetup=Configuration multi-devises
+NotConfigured=Module / Application non configuré
+HoursOnThisPageAreOnServerTZ=Avertissement, contrairement à d'autres écrans, les heures sur cette page ne sont pas dans votre fuseau horaire local, mais pour le fuseau horaire du serveur.
+MaxNbOfLinesForBoxes=Nombre maximum de lignes pour les widgets
+MenusDesc=Les gestionnaires de menu définissent le contenu des deux barres de menus (horizontales et verticales).
+MenusEditorDesc=L'éditeur de menu vous permet de définir des entrées de menu personnalisées. Utilisez-le soigneusement pour éviter l'instabilité et les entrées de menu inaccessibles en permanence. <br /> Certains modules ajoutent des entrées de menu (dans le menu <b> Tous </ b> principalement). Si vous supprimez certaines de ces entrées par erreur, vous pouvez les restaurer en désactivant et en redéfinissant le module.
+PurgeAreaDesc=Cette page vous permet de supprimer tous les fichiers générés ou stockés par Dolibarr (fichiers temporaires ou tous les fichiers dans le répertoire <b>%s</b>). L'utilisation de cette fonctionnalité n'est pas nécessaire. Il est fourni en tant que solution de contournement pour les utilisateurs dont Dolibarr est hébergé par un fournisseur qui n'offre pas d'autorisations pour supprimer les fichiers générés par le serveur Web.
+PurgeDeleteLogFile=Supprimer le fichier journal <b>%s</b> défini pour le module Syslog (sans risque de perte de données)
+PurgeDeleteTemporaryFiles=Supprimez tous les fichiers temporaires (pas de risque de perte de données)
 PurgeDeleteTemporaryFilesShort=Supprimer les fichiers temporaires
-PurgeDeleteAllFilesInDocumentsDir=Effacer tous les fichiers du répertoire <b>%s</b>. Les fichiers temporaires mais aussi les fichiers « dumps » de sauvegarde de base de données, les fichiers joints aux éléments (tiers, factures, ...) ou fichiers stockés dans le module GED seront irrémédiablement effacés.
-PurgeRunNow=Lancer la purge maintenant
-PurgeNothingToDelete=No directory or files to delete.
-PurgeNDirectoriesDeleted=<b>%s</b> fichiers ou répertoires supprimés.
-PurgeAuditEvents=Purger les événements d'audit de sécurité
-ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
-GenerateBackup=Générer sauvegarde
-Backup=Sauvegarde
-Restore=Restauration
-RunCommandSummary=La sauvegarde sera exécutée par la commande suivante
-BackupResult=Résultat sauvegarde
-BackupFileSuccessfullyCreated=Fichier de sauvegarde généré avec succès
-YouCanDownloadBackupFile=Les fichiers générés peuvent maintenant être téléchargés
-NoBackupFileAvailable=Aucun fichier de sauvegarde disponible.
-ExportMethod=Méthode d'exportation
-ImportMethod=Méthode d'importation
-ToBuildBackupFileClickHere=Pour générer un fichier de sauvegarde, cliquez <a href="%s">ici</a>.
-ImportMySqlDesc=Pour importer une sauvegarde, il faut utiliser la commande mysql suivante en ligne de commande:
-ImportPostgreSqlDesc=Pour importer une sauvegarde, il faut utiliser la commande pg_restore en ligne suivante:
-ImportMySqlCommand=%s %s < monfichiersauvegarde.sql
-ImportPostgreSqlCommand=%s %s monfichiersauvegarde.sql
-FileNameToGenerate=Nom du fichier à générer
-Compression=Compression
-CommandsToDisableForeignKeysForImport=Commande pour désactiver les clés étrangères à l'importation
-CommandsToDisableForeignKeysForImportWarning=Requis si vous voulez être en mesure de restaurer votre « dump » SQL plus tard
-ExportCompatibility=Compatibilité du fichier d'exportation généré
-MySqlExportParameters=Paramètres de l'exportation MySQL
-PostgreSqlExportParameters= Paramètres de l'exportation PostgreSQL
-UseTransactionnalMode=Utiliser le mode transactionnel
-FullPathToMysqldumpCommand=Chemin complet vers la commande mysqldump
-FullPathToPostgreSQLdumpCommand=Chemin complet vers la commande pg_dump
-ExportOptions=Options d'exportation
-AddDropDatabase=Ajouter ordres DROP DATABASE
-AddDropTable=Ajouter ordres DROP TABLE
-ExportStructure=Structure
-NameColumn=Nomme les colonnes
-ExtendedInsert=Instructions INSERT étendues
-NoLockBeforeInsert=Pas d'instruction LOCK autour des INSERT
-DelayedInsert=Insertion avec délai
-EncodeBinariesInHexa=Encoder les champs binaires en hexadécimal
-IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
-AutoDetectLang=Détection automatique (navigateur)
-FeatureDisabledInDemo=Fonction désactivée dans la démo
-FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Permissions
-BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
-OnlyActiveElementsAreShown=Seuls les éléments en rapport avec un <a href="%s">module actif</a> sont présentés.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
-ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external modules...
-GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
-DoliStoreDesc=DoliStore, la place de marché officielle des modules et extensions complémentaires pour Dolibarr ERP/CRM
-DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
-WebSiteDesc=Reference websites to find more modules...
-URL=Lien
-BoxesAvailable=Widgets available
-BoxesActivated=Widgets activated
-ActivateOn=Activer sur
-ActiveOn=Active sur
-SourceFile=Fichier source
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponible uniquement si Javascript activé
-Required=Requis
-UsedOnlyWithTypeOption=Utilisé par certaines options de l'agenda uniquement
-Security=Sécurité
-Passwords=Mots de passe
-DoNotStoreClearPassword=Ne pas stocker de mots de passe en clair dans la base (Activation recommandée)
-MainDbPasswordFileConfEncrypted=Chiffrer le mot de passe de la base dans le fichier conf.php (Activation recommandée)
+PurgeNothingToDelete=Pas de répertoire ou de fichiers à supprimer.
+ConfirmPurgeAuditEvents=Êtes-vous sûr de vouloir purger tous les événements de sécurité? Tous les journaux de sécurité seront supprimés, aucune autre donnée ne sera supprimée.
+IgnoreDuplicateRecords=Ignorer les erreurs d'enregistrement en double (INSERT IGNORE)
+FeatureAvailableOnlyOnStable=La fonctionnalité est uniquement disponible sur les versions officielles stables
+BoxesDesc=Les widgets sont des composants montrant des informations que vous pouvez ajouter pour personnaliser certaines pages. Vous pouvez choisir entre afficher le widget ou non en sélectionnant la page cible et en cliquant sur 'Activer', ou en cliquant sur la poubelle pour la désactiver.
+ModulesDesc=Les modules Dolibarr définissent quelle application / fonctionnalité est activée dans le logiciel. Certaines applications / modules nécessitent des autorisations que vous devez accorder aux utilisateurs, après l'avoir activé. Cliquez sur le bouton activé / désactivé pour activer un module / application.
+ModulesMarketPlaceDesc=Vous pouvez trouver plus de modules à télécharger sur des sites Web externes sur Internet ...
+ModulesDeployDesc=Si les autorisations sur votre système de fichiers le permettent, vous pouvez utiliser cet outil pour déployer un module externe. Le module sera alors visible sur l'onglet <strong>%s</strong>.
+ModulesMarketPlaces=Trouver des modules externes ...
+GoModuleSetupArea=Pour déployer / installer un nouveau module, accédez à la zone de configuration du module à <a href="%s"> %s </a>.
+DoliPartnersDesc=Liste des entreprises proposant des modules ou des fonctionnalités développés personnalisés (Remarque: toute personne expérimentée dans la programmation PHP peut fournir un développement personnalisé pour un projet open source)
+WebSiteDesc=Les sites Web de référence pour trouver plus de modules ...
 InstrucToEncodePass=Pour chiffrer le mot de passe de la base dans le fichier de configuration <b>conf.php</b>, remplacer la ligne<br><b>$dolibarr_main_db_pass="...";</b><br>par<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=Pour avoir le mot de passe de la base décodé (en clair) dans le fichier de configuration <b>conf.php</b>, remplacer dans ce fichier la ligne<br><b>$dolibarr_main_db_pass="crypted:..."</b><br>par<br><b>$dolibarr_main_db_pass="%s"</b>
-ProtectAndEncryptPdfFiles=Protection des PDF générés (Activation NON recommandée, rend inopérante la génération de PDF de masse)
-ProtectAndEncryptPdfFilesDesc=La protection d'un document PDF laisse le document libre à la lecture et à l'impression avec tout logiciel de lecture PDF. Par contre, la modification et la copie deviennent impossible. Notez que, de plus, l'utilisation de cette option empêche la génération de PDF cumulés (comme pour le PDF global des impayés).
-Feature=Fonction
-DolibarrLicense=Licence
-Developpers=Développeurs/contributeurs
-OfficialWebSite=Site web officiel international
-OfficialWebSiteLocal=Site web local (%s)
-OfficialWiki=Wiki de documentation Dolibarr
-OfficialDemo=Démo en ligne Dolibarr
-OfficialMarketPlace=Place de marché officielle des modules et extensions complémentaires
-OfficialWebHostingService=Services d'hébergements référencés (Cloud)
-ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
-ForDocumentationSeeWiki=Pour la documentation utilisateur, développeur ou les FAQs,<br>consultez le wiki Dolibarr:<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=Pour tout autre question/aide, vous pouvez utiliser le forum Dolibarr:<br><b><a href="%s" target="_blank">%s</a></b>
-HelpCenterDesc1=Cette application, indépendante de Dolibarr,  permet de vous aider à obtenir un service d'assistance sur Dolibarr.
-HelpCenterDesc2=Choisissez le service qui correspond à votre besoin en cliquant sur le lien adéquat (Certains de ces services ne sont disponibles qu'en <b>anglais</b>).
-CurrentMenuHandler=Gestionnaire menu courant
-MeasuringUnit=Unité de mesure
-LeftMargin=Left margin
-TopMargin=Top margin
-PaperSize=Paper type
-Orientation=Orientation
-SpaceX=Space X
-SpaceY=Space Y
-FontSize=Font size
-Content=Content
-NoticePeriod=Notice period
-NewByMonth=New by month
-Emails=Emails
-EMailsSetup=Configuration Emails
-EMailsDesc=Cette page permet de remplacer les paramètres PHP en rapport avec l'envoi d'emails. Dans la plupart des cas, sur des OS comme Unix/Linux, les paramètres PHP sont déjà corrects et cette page est inutile.
-MAIN_MAIL_SMTP_PORT=Port du serveur SMTP/SMTPS (Par défaut dans php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_SERVER=Nom d'hôte ou adresse IP du serveur SMTP/SMTPS (Par défaut dans php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Port du serveur SMTP/SMTPS (Non défini dans le PHP sur les systèmes de type Unix)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Nom d'hôte ou adresse IP du serveur SMTP/SMTPS (Non défini dans le PHP sur les systèmes de type Unix)
-MAIN_MAIL_EMAIL_FROM=Adresse email de l'émetteur pour l'envoi d'emails automatiques (Par défaut dans php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Adresse email utilisée pour les retours d'erreurs des emails envoyés
-MAIN_MAIL_AUTOCOPY_TO= Envoyer systématiquement une copie cachée des emails envoyés à
-MAIN_DISABLE_ALL_MAILS=Désactiver globalement tout envoi d'emails (pour mode test ou démos)
-MAIN_MAIL_SENDMODE=Méthode d'envoi des emails
-MAIN_MAIL_SMTPS_ID=Identifiant d'authentification SMTP si authentification SMTP requise
-MAIN_MAIL_SMTPS_PW=Mot de passe d'authentification SMTP si authentification SMTP requise
-MAIN_MAIL_EMAIL_TLS= Utilisation du chiffrement TLS (SSL)
-MAIN_MAIL_EMAIL_STARTTLS= Utilisation du chiffrement TLS (SSL)
-MAIN_DISABLE_ALL_SMS=Désactiver globalement tout envoi de SMS (pour mode test ou démos)
-MAIN_SMS_SENDMODE=Méthode d'envoi des SMS
-MAIN_MAIL_SMS_FROM=Numéro de téléphone par défaut pour l'envoi des SMS
-MAIN_MAIL_DEFAULT_FROMTYPE=Sender e-mail by default for manual sendings (User email or Company email)
-UserEmail=User email
-CompanyEmail=Company email
-FeatureNotAvailableOnLinux=Fonctionnalité non disponible sous systèmes Unix. Tester votre sendmail localement.
+ProtectAndEncryptPdfFilesDesc=La protection d'un document PDF le permet de lire et d'imprimer avec n'importe quel navigateur PDF. Cependant, l'édition et la copie ne sont plus possibles. Notez que l'utilisation de cette fonctionnalité rend le développement d'un PDF fusionné global ne fonctionnant pas.
+NoticePeriod=Période de préavis
+NewByMonth=Nouveau par mois
+MAIN_MAIL_EMAIL_STARTTLS=Utilisation du chiffrement TLS (SSL)
+MAIN_MAIL_DEFAULT_FROMTYPE=E-mail de l'expéditeur par défaut pour les envois manuels (courrier électronique de l'utilisateur ou courrier électronique de la société)
+UserEmail=Courrier électronique de l'utilisateur
+CompanyEmail=Courrier électronique de la société
 SubmitTranslation=Si la traduction de cette langue est incomplète ou vous trouvez des erreur , vous pouvez corriger cela en modifiant les fichiers dans le répertoire <b>langs/%s</b> et soumettre votre changement à www.transifex.com/dolibarr-association/dolibarr/
 SubmitTranslationENUS=Si la traduction de cette langue est incomplète ou vous trouvez des erreurs , vous pouvez corriger cela en modifiant les fichiers dans le répertoire <b> langs/%s </b> et soumettre les fichiers modifiés sur dolibarr.org/forum ou pour les développeurs sur github.com/Dolibarr/dolibarr.
-ModuleSetup=Configuration du module
-ModulesSetup=Configuration des modules
-ModuleFamilyBase=Système
-ModuleFamilyCrm=Gestion de la relation client (GRC)
+ModulesSetup=Modules / Configuration de l'application
 ModuleFamilySrm=Gestion des relations fournisseurs (GRF)
 ModuleFamilyProducts=Gestion des produits
 ModuleFamilyHr=Gestion des ressources humaines (GRH)
-ModuleFamilyProjects=Projets/Travail collaboratif
-ModuleFamilyOther=Autre
-ModuleFamilyTechnic=Outils multi-modules
-ModuleFamilyExperimental=Modules expérimentaux
-ModuleFamilyFinancial=Modules financiers (Compta/trésorerie)
-ModuleFamilyECM=Gestion électronique de documents (GED)
 ModuleFamilyPortal=Site internet et autres applications frontales
 ModuleFamilyInterface=Interfaces avec les systèmes externes
-MenuHandlers=Gestionnaires de menu
-MenuAdmin=Édition menu
-DoNotUseInProduction=Ne pas utiliser en production
-ThisIsProcessToFollow=This is steps to process:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
-StepNb=Étape %s
-FindPackageFromWebSite=Recherche le paquet qui répond à votre besoin (par exemple sur le site web %s).
+ThisIsProcessToFollow=Voici des étapes à suivre pour traiter:
+ThisIsAlternativeProcessToFollow=Il s'agit d'une configuration alternative à traiter manuellement:
 DownloadPackageFromWebSite=Télécharger le package %s.
-UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <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>.
-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='http://myserver/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.
+UnpackPackageInDolibarrRoot=Décompressez les fichiers emballés dans le répertoire du serveur dédié à Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=Pour déployer / installer un module externe, décompressez les fichiers emballés dans le répertoire du serveur dédié aux modules: <b>%s</b>
+SetupIsReadyForUse=Le déploiement du module est terminé. Vous devez toutefois activer et configurer le module dans votre application en allant sur la page pour configurer les modules: <a href="%s"> %s </a>.
+NotExistsDirect=Le répertoire racine alternatif n'est pas défini dans un répertoire existant.
+InfDirAlt=Depuis la version 3, il est possible de définir un autre répertoire racine. Cela vous permet de stocker, dans un répertoire dédié, des plug-ins et des modèles personnalisés. <br> Créez simplement un répertoire à la racine de Dolibarr (par exemple: personnalisé).
+InfDirExample=<br> Puis déclarer dans le fichier <strong> conf.php </ strong> <br> $ dolibarr_main_url_root_alt = 'http: // myserver / custom' <br> $ dolibarr_main_document_root_alt = '/ path / of / dolibarr / htdocs / Custom '<br> Si ces lignes sont commentées avec "#", pour les activer, il suffit de faire un commentaire en supprimant le caractère "#".
 YouCanSubmitFile=Sélectionner le module :
-CurrentVersion=Version actuelle de Dolibarr
-CallUpdatePage=Go to the page that updates the database structure and data: %s.
-LastStableVersion=Latest stable version
-LastActivationDate=Latest activation date
-UpdateServerOffline=Serveur de mise à jour hors ligne
-GenericMaskCodes=Vous pouvez saisir tout masque de numérotation. Dans ce masque, les balises suivantes peuvent être utilisées:<br><b>{000000}</b> correspond à un numéro qui sera incrémenté à chaque %s. Mettre autant de zéro que la longueur désirée du compteur. Le compteur sera complété par des 0 à gauche afin d'avoir autant de zéro que dans le masque.<br><b>{000000+000}</b> idem que précédemment mais un décalage correspondant au nombre à droite du + est appliqué dès la première %s.<br><b>{000000@x}</b> idem que précédemment mais le compteur est remis à zéro le xème mois de l'année (x entre 1 et 12, ou 0 pour utiliser le mois de début d'exercice fiscal défini dans votre configuration, ou 99 pour remise à zéro chaque mois). Si cette option est utilisée et x vaut 2 ou plus, alors la séquence {yy}{mm} ou {yyyy}{mm} est obligatoire. <br><b>{dd}</b> jour (01 à 31).<br><b>{mm}</b> mois (01 à 12).<br><b>{yy}</b>, <b>{yyyy}</b> ou <b>{y}</b> année sur 2, 4 ou 1 chiffres.<br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
-GenericMaskCodes3=Tout autre caractère dans le masque sera laissé inchangé.<br>Les espaces ne sont pas permis.<br>
-GenericMaskCodes4a=<u>Exemple sur la 99eme %s du tiers LaCompanie faite le 31/03/2007 :</u><br>
-GenericMaskCodes4b=<u>Exemple sur un tiers créé le 31/03/2007 :</u><br>
-GenericMaskCodes4c=<u>Exemple sur un produit/service créé le 31/03/2007 :</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> donnera <b>ABC0703-000099</b><br><b>{0000+100@1}-XXX-{dd}-YYY</b> donnera <b>0199-XXX-31-YYY</b>
-GenericNumRefModelDesc=Renvoie un numéro personnalisable selon un masque à définir.
-ServerAvailableOnIPOrPort=Serveur disponible à l'adresse <b>%s</b> sur le port <b>%s</b>
-ServerNotAvailableOnIPOrPort=Serveur non disponible à l'adresse <b>%s</b> sur le port <b>%s</b>
-DoTestServerAvailability=Tester disponibilité serveur
-DoTestSend=Tester envoi
-DoTestSendHTML=Tester envoi HTML
-ErrorCantUseRazIfNoYearInMask=Erreur, ne peut utiliser l'option @ pour remettre à zéro en début d'année si la séquence {yy} ou {yyyy} n'est pas dans le masque.
-ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Erreur, ne peut utiliser l'option @ si la séquence {yy}{mm} ou {yyyy}{mm} n'est pas dans le masque.
-UMask=Masque des nouveaux fichiers sous Unix/Linux/BSD/Mac.
-UMaskExplanation=Ce paramètre permet de définir les droits des fichiers créés sur le serveur par Dolibarr (lors d'envois par exemple).<br>Ce doit être la valeur octale (par exemple 0666 signifie lecture/écriture pour tous).<br>Ce paramètre n'a aucun effet sur un serveur Windows.
-SeeWikiForAllTeam=Voir le wiki pour le détail de tous les acteurs et leur organisation
-UseACacheDelay= Délai de mise en cache de l'export en secondes (0 ou vide pour aucun cache)
-DisableLinkToHelpCenter=Cacher le lien «<b>Besoin d'aide ou d'assistance</b>» sur la page de connexion
+CallUpdatePage=Accédez à la page qui met à jour la structure et les données de la base de données: %s.
+LastStableVersion=Dernière version stable
+LastActivationDate=Dernière date d'activation
+LastActivationAuthor=Dernier auteur d'activation
+LastActivationIP=Dernière activation IP
+GenericMaskCodes2=<B> {cccc} </ b> le code client sur n caractères <br> <b> {cccc000} </ b> le code client sur n caractères est suivi d'un compteur dédié au client. Ce compteur dédié au client est réinitialisé au même moment que le compteur global. <B> {tttt} </ b> Le code de type tiers sur n caractères (voir menu Accueil - Configuration - Dictionnaire - Types de tiers) . Si vous ajoutez cette étiquette, le compteur sera différent pour chaque type de tiers.
+GenericMaskCodes4a=<br><u> Exemple au 99th %s du tiers TheCompany, avec la date 2007-01-31: </u>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> donnera <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> donnera <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> donnera <b>IN0701-0099-A</b> si le type d'entreprise est 'Responsable Inscripto' avec un code pour le type 'A_RI'
 DisableLinkToHelp=Masquer lien vers l'aide en ligne "<b>%s</b>"
-AddCRIfTooLong=Il n'y a pas de coupure de ligne automatique, aussi si votre texte est trop long sur les documents, il faudra ajouter vous même des retours chariot dans la zone de saisie du texte
-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...).
-MinLength=Longueur minimale
-LanguageFilesCachedIntoShmopSharedMemory=Fichiers .lang en mémoire partagée
-ExamplesWithCurrentSetup=Exemples avec le paramétrage actif courant
-ListOfDirectories=Liste des répertoires des modèles OpenDocument
+ConfirmPurge=Êtes-vous sûr de vouloir exécuter cette purge? <br> Cela supprimera définitivement tous vos fichiers de données sans pouvoir les restaurer (fichiers ECM, fichiers joints ...).
 ListOfDirectoriesForModelGenODT=Liste des répertoires contenant des fichiers de modèles avec le format OpenDocument . <br><br> Mettez ici le chemin complet des répertoires .<br>Ajouter un retour chariot entre répertoire eah.<br> Pour ajouter un répertoire du module de GED , ajouter ici<b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br> Fichiers dans ces répertoires doit se terminer par <b>.odt</b> or <b>.ods</b>.
-NumberOfModelFilesFound=Nombre de fichiers modèles ODT/ODS trouvés dans ce(s) répertoire(s)
-ExampleOfDirectoriesForModelGen=Exemple de syntaxe :<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
-FollowingSubstitutionKeysCanBeUsed=<br>Pour savoir comment rédiger des modèles de document odt avant de les placer dans un de ces répertoires, consulter la documentation du wiki :
-FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Créer_un_modèle_de_document_ODT
-FirstnameNamePosition=Ordre d'affichage prénom/nom
-DescWeather=Les graphiques suivant seront affichés sur le tableau de bord si le nombre d'éléments en retard atteint ces valeurs :
-KeyForWebServicesAccess=Clé pour utiliser les Web Services (paramètre "dolibarrkey" dans les webservices)
-TestSubmitForm=Formulaire de test de saisie
-ThisForceAlsoTheme=Utiliser ce gestionnaire de menu force aussi le thème quel que soit le choix de thème de l'utilisateur. De plus, ce gestionnaire de menu, spécialisé pour smartphone, ne fonctionne que sur certains téléphones. Utilisez un autre gestionnaire si vous constatez des problèmes.
-ThemeDir=Répertoire des thèmes
-ConnectionTimeout=Délai expiration de connexion
-ResponseTimeout=Délai expiration de réponse
-SmsTestMessage=Message de test de __PHONEFROM__ vers __PHONETO__
-ModuleMustBeEnabledFirst=Le module <b>%s</b> doit être activé pour utiliser cette fonction.
-SecurityToken=Clé de sécurisation des URLs
-NoSmsEngine=Aucun gestionnaire d'envoi de SMS n'est disponible. Les gestionnaires d'envois SMS ne sont pas installés en standard (car dépendent d'un fournisseur) mais vous pourrez en trouver depuis la plateforme %s
-PDF=PDF
-PDFDesc=Vous pouvez définir ici des options globales sur la génération des PDF
-PDFAddressForging=Règles de fabrication des zones adresses
 HideAnyVATInformationOnPDF=Cacher toutes les informations en rapport avec la TPS/TVH sur les PDF générés
-HideDescOnPDF=Cacher la description des produits sur les PDF générés
-HideRefOnPDF=Cacher la référence des produits sur les PDF générés
-HideDetailsOnPDF=Hide product lines details on generated PDF
+HideDetailsOnPDF=Masquer les détails des lignes de produits sur le PDF généré
 PlaceCustomerAddressToIsoLocation=Utilisez french standard position (La Poste) pour le client position d'adresse
-Library=Bibliothèque
-UrlGenerationParameters=Sécurisation des URLs
-SecurityTokenIsUnique=Utiliser un paramètre securekey unique pour chaque URL ?
-EnterRefToBuildUrl=Entrer la référence pour l'objet %s
-GetSecuredUrl=Obtenir l'URL calculée
-ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Masquer les boutons pour les utilisateurs non administrateurs pour les actions non autorisées au lieu de afficher les boutons désactivés grisés
 OldVATRates=Ancien taux de TPS/TVH
 NewVATRates=Nouveau taux de TPS/TVH
-PriceBaseTypeToChange=Modifier sur les prix dont la référence de base est le
-MassConvert=Convertir en masse
-String=Chaîne
-TextLong=Texte long
-Int=Numérique entier
-Float=Décimal
-DateAndTime=Date et heure
-Unique=Unique
-Boolean=Booléen (Case à cocher)
-ExtrafieldPhone = Téléphone
-ExtrafieldPrice = Prix
-ExtrafieldMail = Email
-ExtrafieldUrl = Url
-ExtrafieldSelect = Liste de sélection
-ExtrafieldSelectList = Liste issue d'une table
-ExtrafieldSeparator=Séparateur de champ
-ExtrafieldPassword=Mot de passe
-ExtrafieldCheckBox=Case à cocher
-ExtrafieldRadio=Bouton radio
-ExtrafieldCheckBoxFromList= Liste à cocher issue d'une table
-ExtrafieldLink=Lier à un objet
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=La liste doit être de la forme clef,valeur<br><br> par exemple : <br>1,valeur1<br>2,valeur2<br>3,valeur3<br>...
-ExtrafieldParamHelpradio=La liste doit être de la forme clef,valeur<br><br> par exemple : <br>1,valeur1<br>2,valeur2<br>3,valeur3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+Boolean=Boolean (une case à cocher)
+ExtrafieldSeparator=Séparateur (pas un champ)
+ExtrafieldRadio=Boutons radio (uniquement sur le choix)
+ExtrafieldCheckBoxFromList=Les cases à cocher du tableau
+ComputedFormulaDesc=Vous pouvez entrer ici une formule utilisant d'autres propriétés de l'objet ou tout codage PHP pour obtenir une valeur calculée dynamique. Vous pouvez utiliser toutes les formules compatibles PHP, y compris le "?" L'opérateur de condition et l'objet global suivant: <strong> $ db, $ conf, $ langs, $ mysoc, $ user, $ object </ strong>. <br> <strong> AVERTISSEMENT </ strong>: Seules certaines propriétés de $ L'objet peut être disponible. Si vous avez besoin de propriétés non chargées, récupérez-vous l'objet dans votre formule comme dans le deuxième exemple. L'utilisation d'un champ calculé signifie que vous ne pouvez pas entrer de valeur d'interface. De plus, s'il existe une erreur de syntaxe, la formule ne peut renvoyer rien. <br> <br> Exemple de formule: $ $ object-> id <10? Round ($ object-> id / 2, 2): ($ object-> id + 2 * $ user-> id) * (int) substr ($ mysoc-> zip, 1, 2) <br> <br> Exemple de recharger l'objet <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> Autre exemple de formule pour forcer la charge de l'objet et son objet parent: <br> (($ reloadedobj = New Task ($ db)) && ($ reloadedobj-> fetch ($ object-> id)> 0) && ($ secondloadedobj = new Project ($ db)) && ($ secondloadedobj-> fetch ($ reloadedobj-> fk_project )> 0))? $ Secondloadedobj-> ref: 'Projet parent introuvable'
+ExtrafieldParamHelpselect=La liste des paramètres doit être comme une clé, une valeur <br> <br> par exemple: <br> 1, value1 <br> 2, value2 <br> 3, value3 <br> ... <br> <br> Pour Pour avoir la liste en fonction d'une autre liste d'attributs complémentaires: <br> 1, value1 | options_ <i> parent_list_code </ i>: parent_key <br> 2, value2 | options_ <i> parent_list_code </ i>: parent_key <br> <br> Pour avoir la liste en fonction d'une autre liste: <br> 1, value1 | <i> parent_list_code </ i>: parent_key <br> 2, value2 | <i> parent_list_code </ i>: parent_key
+ExtrafieldParamHelpsellist=La liste des paramètres provient d'une table Syntaxe: table_name: label_field: id_field :: filter <br> Exemple: c_typent: libelle: id :: filter <br> <br> filter peut être un test simple (par exemple active = 1) Pour afficher uniquement la valeur active <br> Vous pouvez également utiliser $ ID $ en filtre witch est l'identifiant actuel de l'objet actuel <br> Pour faire un SELECT en filtre, utilisez $ SEL $ <br> si vous souhaitez filtrer sur la syntaxe d'utilisation extrafields Extra.fieldcode = ... (où le code de champ est le code de extrafield) <br> <br> Pour avoir la liste en fonction d'une autre liste d'attributs complémentaires: <br> c_typent: libelle: id: options_ <i> parent_list_code </ I> | parent_column: filter <br> <br> Pour avoir la liste en fonction d'une autre liste: <br> c_typent: libelle: id: <i> parent_list_code </ i> | parent_column: filter
+ExtrafieldParamHelpchkbxlst=La liste des paramètres provient d'une table Syntaxe: table_name: label_field: id_field :: filter <br> Exemple: c_typent: libelle: id :: filter <br> <br> filter peut être un test simple (par exemple active = 1) Pour afficher uniquement la valeur active <br> Vous pouvez également utiliser $ ID $ en filtre witch est l'identifiant actuel de l'objet actuel <br> Pour faire un SELECT en filtre, utilisez $ SEL $ <br> si vous souhaitez filtrer sur la syntaxe d'utilisation extrafields Extra.fieldcode = ... (où le code de champ est le code de extrafield) <br> <br> Pour avoir la liste en fonction d'une autre liste d'attributs complémentaires: <br> c_typent: libelle: id: options_ <i> parent_list_code </ I> | parent_column: filter <br> <br> Pour avoir la liste en fonction d'une autre liste: <br> c_typent: libelle: id: <i> parent_list_code </ i> | parent_column: filter
 ExtrafieldParamHelplink=Les paramètres doivent être ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Exemple : Societe:societe/class/societe.class.php
-LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Attention : votre fichier <b>conf.php</b> contient la directive <b>dolibarr_pdf_force_fpdf=1</b>. Cela signifie que vous utilisez la librairie FPDF pour générer vos fichiers PDF. Cette librairie est ancienne et ne couvre pas de nombreuses fonctionnalités (Unicode, transparence des images, langues cyrilliques, arabes ou asiatiques...), aussi vous pouvez rencontrer des problèmes durant la génération des PDF.<br>Pour résoudre cela et avoir une prise en charge complète de PDF, vous pouvez télécharger la <a href="http://www.tcpdf.org/" target="_blank">bibliothèque TCPDF</a> puis commenter ou supprimer la ligne <b>$dolibarr_pdf_force_fpdf=1</b>, et ajouter à la place <b>$dolibarr_lib_TCPDF_PATH='chemin_vers_TCPDF'</b>
+LibraryToBuildPDF=Bibliothèque utilisée pour la génération de PDF
 LocalTaxDesc=Certains pays appliquent 2 voire 3 taux sur chaque ligne de facture. Si c'est le cas, choisissez le type du deuxième et troisième taux et sa valeur. Les types possibles sont:<br>1 : taxe locale sur les produits et services hors TPS/TVH (la taxe locale est calculée sur le montant hors taxe)<br>2 : taxe locale sur les produits et services avant TPS/TVH (la taxe locale est appliquée sur le montant + TPS/TVH)<br>3 : taxe locale uniquement sur les produits hors TPS/TVH (la taxe locale est calculée sur le montant hors taxe)<br>4 : taxe locale uniquement sur les produits avant TPS/TVH (la taxe locale est calculée sur le montant + TPS/TVH)<br>5 : taxe locale uniquement sur les services hors TPS/TVH (la taxe locale est calculée sur le montant hors taxe)<br>6 : taxe locale uniquement sur les service avant TPS/TVH (la taxe locale est calculée sur le montant + TPS/TVH)
-SMS=SMS
-LinkToTestClickToDial=Entrez un numéro de téléphone à appeler pour tester le lien d'appel « ClickToDial » pour l'utilisateur <strong>%s</strong>
-RefreshPhoneLink=Rafraichir lien
-LinkToTest=Lien cliquable généré pour l'utilisateur <strong>%s</strong> (cliquer sur le numéro pour tester)
-KeepEmptyToUseDefault=Laisser ce champ vide pour utiliser la valeur par défaut
-DefaultLink=Lien par défaut
-SetAsDefault=Set as default
-ValueOverwrittenByUserSetup=Attention, cette valeur peut être écrasée par une valeur spécifique à la configuration de l'utilisateur (chaque utilisateur pouvant avoir sa propre URL « clicktodial »)
-ExternalModule=Module externe - Installé dans le répertoire %s
-BarcodeInitForThirdparties=Initialisation du code-barre en masse pour les tiers
-BarcodeInitForProductsOrServices=Initialisation ou purge en masse des codes-barre des produits ou services
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Initialisez les valeurs pour les %s enregistrements vides suivant
-EraseAllCurrentBarCode=Efface toutes les valeurs de code-barre
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
-AllBarcodeReset=Tous les codes-barre ont été supprimés
-NoBarcodeNumberingTemplateDefined=Aucun modèle de numérotation de code-barre n'a été activé dans la configuration du module code-barre.
+CurrentlyNWithoutBarCode=Actuellement, vous avez <strong>%s</strong> enregistrements sur <strong>%s</strong> %s sans code à barres défini.
+ConfirmEraseAllCurrentBarCode=Êtes-vous sûr de vouloir effacer toutes les valeurs actuelles du code-barres?
 EnableFileCache=Activer le cache de fichiers
-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
-DisplayCompanyInfo=Display company address
-DisplayCompanyManagers=Display manager names
-DisplayCompanyInfoAndManagers=Display company address and manager names
-EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Renvoie un code comptable composé de :<br>%s suivi du code tiers fournisseur pour le code compta fournisseur,<br>%s suivi du code tiers client pour le code compta client.
-ModuleCompanyCodePanicum=Renvoie un code comptable vide.
-ModuleCompanyCodeDigitaria=Renvoie un code comptable composé suivant le code tiers. Le code est composé du caractère 'C' en première position suivi des 5 premiers caractères du code tiers.
-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: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-ClickToShowDescription=Click to show description
-# Modules
-Module0Name=Utilisateurs & groupes
-Module0Desc=Users / Employees and Groups management
-Module1Name=Tiers
-Module1Desc=Gestion des tiers (sociétés, particuliers) et contacts
-Module2Name=Commercial
-Module2Desc=Gestion commerciale
-Module10Name=Comptabilité
-Module10Desc=Activation de rapports simplistes de comptabilité (chiffre d'affaires, journaux) basé sur les données en base. Pas de ventilation.
-Module20Name=Propositions commerciales
-Module20Desc=Gestion des devis/propositions commerciales
-Module22Name=Emailing
-Module22Desc=Administration et envoi d'emails en masse
-Module23Name=Énergie
-Module23Desc=Suivi de la consommation des énergies
-Module25Name=Commandes clients
-Module25Desc=Gestion des commandes clients
-Module30Name=Factures et avoirs
-Module30Desc=Gestion des factures et avoirs clients. Gestion des factures fournisseurs
-Module40Name=Fournisseurs
-Module40Desc=Gestion des fournisseurs et des achats (commandes et factures)
-Module42Name=Journaux et traces
-Module42Desc=Génération de journaux (fichiers, syslog, …)
-Module49Name=Éditeurs
-Module49Desc=Gestion des éditeurs
-Module50Name=Produits
-Module50Desc=Gestion des produits
-Module51Name=Publipostage
-Module51Desc=Administration et envoi de courriers papiers en masse
-Module52Name=Stocks
-Module52Desc=Gestion des stocks de produits
-Module53Name=Services
-Module53Desc=Gestion des services
-Module54Name=Contrats/Abonnements
-Module54Desc=Gestion des contrats (services ou abonnements récurrents)
-Module55Name=Codes-barres
-Module55Desc=Gestion des codes-barres
-Module56Name=Téléphonie
-Module56Desc=Gestion de la téléphonie
-Module57Name=Direct bank payment orders
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
-Module58Name=ClickToDial
-Module58Desc=Intégration d'un système de « ClickToDial » (Asterisk, …)
-Module59Name=Bookmark4u
-Module59Desc=Ajoute une fonction pour générer un compte Bookmark4u depuis un compte Dolibarr
-Module70Name=Interventions
-Module70Desc=Gestion des interventions chez les tiers
+ShowDetailsInPDFPageFoot=Ajoutez plus de détails au pied de page de fichiers PDF, comme l'adresse de votre entreprise, ou les noms de gestionnaire (pour compléter les identifiants professionnels, le capital de la société et le numéro de TVA).
+NoDetails=Plus de détails dans le pied de page
+DisplayCompanyManagers=Afficher les noms des gestionnaires
+DisplayCompanyInfoAndManagers=Afficher l'adresse de la société et les noms des gestionnaires
+EnableAndSetupModuleCron=Si vous souhaitez que cette facture récurrente soit générée automatiquement, le module * %s * doit être activé et correctement configuré. Sinon, la génération des factures doit être effectuée manuellement à partir de ce modèle avec le bouton * Créer *. Notez que même si vous avez activé la génération automatique, vous pouvez toujours lancer une génération manuelle sans risque. La génération de doublons pour la même période n'est pas possible.
+Use3StepsApproval=Par défaut, les bons de commande doivent être créés et approuvés par 2 utilisateurs différents (une étape / utilisateur à créer et une étape / utilisateur à approuver. Notez que si l'utilisateur a la permission de créer et d'approuver, un pas / utilisateur suffira) . Vous pouvez demander cette option pour introduire une troisième étape / approbation de l'utilisateur, si le montant est supérieur à une valeur dédiée (donc 3 étapes seront nécessaires: 1 = validation, 2 = première approbation et 3 = deuxième approbation si le montant est suffisant). <br> Configurez ceci pour vider si une approbation (2 étapes) est suffisante, définissez-la à une valeur très faible (0.1) si une deuxième approbation (3 étapes) est toujours requise.
+UseDoubleApproval=Utilisez une approbation de 3 étapes lorsque le montant (sans taxes) est supérieur à ...
+WarningPHPMail=AVERTISSEMENT: Certains fournisseurs de courrier électronique (comme Yahoo) ne vous permettent pas d'envoyer un courrier électronique d'un autre serveur que le serveur Yahoo si l'adresse de courrier électronique utilisée comme expéditeur est votre courrier électronique Yahoo (comme myemail@yahoo.com, myemail@yahoo.fr, ...). Votre configuration actuelle utilise le serveur de l'application pour envoyer un courrier électronique, de sorte que certains destinataires (l'un compatible avec le protocole DMARC restrictif) demanderont à Yahoo s'ils peuvent accepter votre courrier électronique et Yahoo répondra «non» car le serveur n'est pas un serveur Appartenant à Yahoo, peu de vos e-mails envoyés peuvent ne pas être acceptés. Si votre fournisseur de messagerie (comme Yahoo) a cette restriction, vous devez modifier la configuration de messagerie pour choisir l'autre méthode "Serveur SMTP" et entrer le serveur SMTP et Les informations d'identification fournies par votre fournisseur de messagerie (demandez à votre fournisseur d'EMail d'obtenir des informations d'identification SMTP pour votre compte).
+ClickToShowDescription=Cliquez pour afficher la description
+DependsOn=Ce module nécessite le (s) module (s)
+RequiredBy=Ce module est requis par module (s)
+TheKeyIsTheNameOfHtmlField=C'est le nom du champ HTML. Ce besoin d'avoir des connaissances techniques pour lire le contenu de la page HTML pour obtenir le nom clé d'un champ.
+PageUrlForDefaultValues=Vous devez entrer ici l'URL relative de la page. Si vous incluez des paramètres dans l'URL, les valeurs par défaut seront effectives si tous les paramètres sont définis sur la même valeur. Exemples:
+PageUrlForDefaultValuesCreate=<br> Pour que le formulaire crée une nouvelle tierce partie, c'est <strong>%s</strong>
+PageUrlForDefaultValuesList=<br> Pour la page qui liste les tierces parties, c'est <strong>%s</strong>
+EnableDefaultValues=Activer l'utilisation de valeurs par défaut personnalisées
+EnableOverwriteTranslation=Activer l'utilisation de la traduction écrasée
+GoIntoTranslationMenuToChangeThis=Une traduction a été trouvée pour la clé avec ce code, afin de modifier cette valeur, vous devez l'éditer pour la traduction à domicile.
+WarningSettingSortOrder=Avertissement, le réglage d'un ordre de tri par défaut peut entraîner une erreur technique lors de la page de la liste si un champ est un champ inconnu. Si vous rencontrez une telle erreur, revenez à cette page pour supprimer l'ordre de tri par défaut et restaurer le comportement par défaut.
+ProductDocumentTemplates=Modèles de documents pour générer un document produit
+FreeLegalTextOnExpenseReports=Texte juridique gratuit sur les rapports de dépenses
+WatermarkOnDraftExpenseReports=Filigrane sur les projets de rapports de dépenses
+Module0Desc=Gestion des utilisateurs / employés et des groupes
+Module42Desc=Installations de journalisation (fichier, syslog, ...). Ces journaux sont à des fins techniques / de débogage.
+Module57Name=Ordres de paiement bancaire direct
+Module57Desc=Gestion des ordres de paiement de débit direct. Il comprend la génération du fichier SEPA pour les pays européens.
 Module75Name=Notes de frais et déplacements
-Module75Desc=Gestion des notes de frais et déplacements
-Module80Name=Expéditions
-Module80Desc=Gestion des expéditions et réceptions clients
-Module85Name=Banques et caisses
-Module85Desc=Gestion des comptes financiers de type comptes bancaires, postaux ou caisses liquide
-Module100Name=Site externe
-Module100Desc=Ajoute un site web externe dans les menus Dolibarr et l'affiche dans un cadre Dolibarr
-Module105Name=Mailman and SPIP
-Module105Desc=Interface vers Mailman ou SPIP pour le module Adhérent
-Module200Name=LDAP
-Module200Desc=Synchronisation avec un annuaire LDAP
-Module210Name=PostNuke
-Module210Desc=Intégration avec PostNuke
-Module240Name=Exports de données
-Module240Desc=Tool to export Dolibarr data (with assistants)
-Module250Name=Imports de données
-Module250Desc=Tool to import data in Dolibarr  (with assistants)
-Module310Name=Adhérents
-Module310Desc=Gestion des adhérents d'une association
-Module320Name=Flux RSS
-Module320Desc=Ajout de flux d'informations RSS dans les écrans Dolibarr
-Module330Name=Marque-pages
-Module330Desc=Gestion des marque-pages
-Module400Name=Projets/Opportunités/Affaires
-Module400Desc=Gestion des projets, opportunités ou affaires. Vous pouvez ensuite assigner tous les autres éléments (facture, commande, proposition, intervention, ...) à ces projets et avoir une vue transverse depuis cette vue projet.
-Module410Name=Webcalendar
-Module410Desc=Interface avec le calendrier Webcalendar
+Module240Desc=Outil d'exportation de données Dolibarr (avec des assistants)
+Module250Desc=Outil d'importation de données à Dolibarr (avec des assistants)
 Module500Name=Dépenses spéciales (taxes, charges, dividendes)
 Module500Desc=Gestion des dépenses spéciales comme les taxes, charges sociales et dividendes
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
-Module520Name=Emprunt
-Module520Desc=Gestion des emprunts
-Module600Name=Notifications
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
-Module700Name=Dons
-Module700Desc=Gestion des dons
+Module510Name=Paiement des salaires des employés
+Module510Desc=Enregistrer et suivre le paiement de vos salaires salariés
+Module600Desc=Envoyer des notifications EMail (déclenchées par certains événements métier) aux utilisateurs (configuration définie sur chaque utilisateur), contacts tiers (configuration définie sur chaque tiers) ou courriels fixes
 Module770Name=Note de frais
-Module770Desc=Gestion et déclaration des notes de frais (transports, repas, ...)
 Module1120Name=Propositions commerciales founisseurs
-Module1120Desc=Demander des devis et tarifs aux fournisseurs
-Module1200Name=Mantis
-Module1200Desc=Interface avec le bug tracker Mantis
-Module1400Name=Comptabilité
-Module1400Desc=Gestion de la comptabilité (partie double)
-Module1520Name=Génération de document
-Module1520Desc=Génération de documents de publipostages
-Module1780Name=Libellés/Catégories
-Module1780Desc=Créer tags/catégories (pour les produits, clients, fournisseurs, contacts ou adhérents)
-Module2000Name=Éditeur WYSIWYG
-Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
-Module2200Name=Prix calculés dynamiquement
-Module2200Desc=Active l'usage d'expressions mathématiques
-Module2300Name=Travaux programmés
-Module2300Desc=Travaux planifiées
-Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
-Module2500Name=Gestion électronique de documents
-Module2500Desc=Permet de stocker et administrer une base de documents
+Module2000Desc=Permet d'éditer une zone de texte à l'aide d'un éditeur avancé (basé sur CKEditor)
+Module2400Name=Evénements / Agenda
+Module2400Desc=Suivez les événements réalisés et à venir. Laissez l'application enregistrer les événements automatiques à des fins de suivi ou enregistrer des événements manuels ou rendez-vous.
 Module2600Name=services API / Web ( serveur SOAP )
 Module2600Desc=Active le serveur de Web Services de Dolibarr
 Module2610Name=services API / Web ( serveur REST )
 Module2610Desc=Activer le serveur REST de services API de les services
 Module2660Name=WebServices appel ( client SOAP )
 Module2660Desc=Activer le client Dolibarr de services Web (peut être utilisé pour pousser les données / demandes de serveurs externes . Fournisseur commandes prises en charge seulement pour le moment )
-Module2700Name=Gravatar
-Module2700Desc=Utilise le service en ligne Gravatar (www.gravatar.com) pour afficher les photos d'utilisateurs/membres (en fonction leur email). Besoin d'un accès Internet
-Module2800Desc=Client FTP
-Module2900Name=GeoIPMaxmind
-Module2900Desc=Capacités de conversion GeoIP Maxmind
-Module3100Name=Skype
-Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3100Desc=Ajouter un bouton Skype aux utilisateurs / tiers / contacts / cartes membres
+Module3200Name=Grumes non réversibles
+Module3200Desc=Activez le journal de certains événements commerciaux dans un journal non réversible. Les événements sont archivés en temps réel. Le journal est un tableau de l'événement enchaîné qui peut ensuite être lu et exporté. Ce module peut être obligatoire pour certains pays.
 Module4000Name=Gestion des ressources humaines
-Module4000Desc=Ressources humaines
-Module5000Name=Multi-société
-Module5000Desc=Permet de gérer plusieurs sociétés
-Module6000Name=Workflow
-Module6000Desc=Gérer le Workflow
-Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module4000Desc=Gestion des ressources humaines (gestion du département, contrats des employés et sentiments)
+Module10000Name=Sites Internet
+Module10000Desc=Créez des sites Web publics avec un éditeur WYSIWG. Installez simplement votre serveur Web pour pointer vers le répertoire dédié pour l'avoir en ligne sur Internet.
 Module20000Name=Gestion des demandes de congès
 Module20000Desc=Déclaration et suivi des congès des employés
 Module39000Name=Lot/Série du produit
-Module39000Desc=Gestion des lots et numéro de série, et date de péremption ou consommation sur les produits
-Module50000Name=PayBox
-Module50000Desc=Module permettant d'offrir en ligne une page de paiement par carte de crédit avec PayBox
-Module50100Name=Point de vente
-Module50100Desc=Point of sales module (POS).
-Module50200Name=Paypal
-Module50200Desc=Module permettant d'offrir en ligne une page de paiement par carte de crédit avec Paypal
-Module50400Name=Comptabilité (avancée)
-Module50400Desc=Gestion de la comptabilité (doubles parties)
-Module54000Name=PrintIPP
-Module54000Desc=Impression directe (sans ouvrir les documents) en utilisant l'interface Cups IPP (l'imprimante doit être visible depuis le serveur, et CUPS doit être installé sur le serveur).
+Module50100Desc=Module de point de vente (POS).
 Module55000Name=Sondage, enquête ou vote
 Module55000Desc=Module pour faire des sondages en ligne, des enquêtes ou des votes (comme Doodle , Studs , Rdvz , ... )
-Module59000Name=Marges
-Module59000Desc=Module pour gérer les marges
-Module60000Name=Commissions
-Module60000Desc=Module pour gérer les commissions
-Module63000Name=Ressources
-Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
-Permission11=Consulter les factures clients
-Permission12=Créer/modifier les factures clients
-Permission13=Dé-valider les factures clients
-Permission14=Valider les factures clients
-Permission15=Envoyer les factures clients par email
-Permission16=Émettre des paiements sur les factures clients
-Permission19=Supprimer les factures clients
-Permission21=Consulter les propositions commerciales
-Permission22=Créer/modifier les propositions commerciales
-Permission24=Valider les propositions commerciales
-Permission25=Envoyer les propositions commerciales
-Permission26=Clôturer les propositions commerciales
-Permission27=Supprimer les propositions commerciales
-Permission28=Exporter les propositions commerciales
-Permission31=Consulter les produits
-Permission32=Créer/modifier les produits
-Permission34=Supprimer les produits
-Permission36=Voir/gérer les produits cachés
-Permission38=Exporter les produits
-Permission41=Consulter les projets et tâches (partagés ou dont je suis contact)
-Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
-Permission44=Supprimer les projets et tâches (partagés ou dont je suis contact)
+Module63000Desc=Gérer les ressources (imprimantes, voitures, salles, ...) vous pouvez ensuite partager vos événements
+Permission41=Lisez les projets et les tâches (projet partagé et projets auxquels je suis contacté). Peut aussi entrer dans le temps, pour moi ou pour ma hiérarchie, sur les tâches assignées (feuille de temps)
+Permission42=Créer / modifier des projets (projet partagé et projets pour lesquels je suis contact). Peut également créer des tâches et affecter des utilisateurs à des projets et à des tâches
 Permission45=Exportation de projets
-Permission61=Consulter les interventions
-Permission62=Créer/modifier les interventions
-Permission64=Supprimer les interventions
-Permission67=Exporter les interventions
-Permission71=Consulter les fiches adhérents
-Permission72=Créer/modifier les adhérents
-Permission74=Supprimer les adhérents
-Permission75=Configurer les types d'adhérents
-Permission76=Export data
-Permission78=Consulter les cotisations
-Permission79=Créer/modifier les cotisations
-Permission81=Consulter les commandes clients
-Permission82=Créer/modifier les commandes clients
-Permission84=Valider les commandes clients
-Permission86=Envoyer les commandes clients
-Permission87=Clôturer les commandes clients
-Permission88=Annuler les commandes clients
-Permission89=Supprimer les commandes clients
+Permission76=Exporter des données
 Permission91=Consulter les charges et la TPS/TVH
 Permission92=Créer/modifier les charges et la TPS/TVH
 Permission93=Supprimer les charges et la TPS/TVH
 Permission94=Exporter les charges
-Permission95=Consulter CA, bilans et résultats
-Permission101=Consulter les expéditions
-Permission102=Créer/modifier les expéditions
-Permission104=Valider les expéditions
-Permission106=Exporter les expéditions
-Permission109=Supprimer les expéditions
-Permission111=Consulter les comptes financiers (comptes bancaires, caisses)
-Permission112=Créer/modifier montant/supprimer écritures bancaires
-Permission113=Configurer les comptes financiers (créer, gérer les catégories)
-Permission114=Rapprocher les transactions
-Permission115=Exporter transactions et relevés
-Permission116=Saisir virements entre comptes
-Permission117=Gérer les dépots en banque de chèques reçus
-Permission121=Consulter les tiers (sociétés) liés à l'utilisateur
-Permission122=Créer/modifier les tiers (sociétés) liés à l'utilisateur
-Permission125=Supprimer les tiers (sociétés) liés à l'utilisateur
-Permission126=Exporter les tiers (sociétés)
-Permission141=Consulter tous les projets et tâches (y compris privés dont je ne suis pas contact)
-Permission142=Créer/modifier tous les projets et tâches (y compris privés dont je ne suis pas contact)
 Permission144=Supprimer tous les projets et tâches (y compris privés dont je ne suis pas contact)
-Permission146=Consulter les fournisseurs
-Permission147=Consulter les 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
-Permission161=Lire les contrats/abonnements
-Permission162=Créer/modifier les contrats/abonnements
-Permission163=Activer un service/abonnement
-Permission164=Désactiver un service/abonnements
-Permission165=Supprimer les contrats/abonnements
+Permission151=Lire les ordres de paiement de débit direct
+Permission152=Créer / modifier des ordres de paiement de débit direct
+Permission153=Envoyer / Transmettre les ordres de paiement de débit direct
+Permission154=Enregistrer les crédits / Rejet des ordres de paiement par prélèvement automatique
 Permission167=Exportation de contacts
 Permission171=Lire les déplacements et les dépenses (le vôtre et vos subordonnés )
-Permission172=Créer/modifier les notes de frais / déplacements
-Permission173=Supprimer les notes de frais / déplacements
-Permission174=Lire toutes les notes de frais
-Permission178=Exporter les notes de frais / déplacements
-Permission180=Consulter les fournisseurs
-Permission181=Consulter les commandes fournisseurs
-Permission182=Créer/modifier les commandes fournisseurs
-Permission183=Valider les commandes fournisseurs
-Permission184=Approuver les commandes fournisseurs
-Permission185=Commander ou annuler les commandes fournisseurs
-Permission186=Accuser réception des commandes fournisseurs
-Permission187=Clôturer les commandes fournisseurs
-Permission188=Annuler les commandes fournisseurs
-Permission192=Créer des lignes
-Permission193=Résilier des lignes
-Permission194=Consulter la marge des lignes
-Permission202=Créer des liaisons ADSL
-Permission203=Demander la commande des liaisons
-Permission204=Commander les liaisons
-Permission205=Gérer les liaisons
-Permission206=Consulter les liaisons
-Permission211=Consulter la téléphonie
-Permission212=Commander les lignes
-Permission213=Activer une ligne
-Permission214=Configurer la téléphonie
-Permission215=Configurer les fournisseurs
-Permission221=Consulter les emailings
-Permission222=Créer/modifier les emailings (sujet, destinataires, etc.)
-Permission223=Valider les emailings (permet leur envoi)
-Permission229=Supprimer les emailings
-Permission237=Visualiser les destinataires et les infos
-Permission238=Envoyer les emailings manuellement
-Permission239=Supprimer les emailings après leur validation ou leur envoi
-Permission241=Consulter les catégories
-Permission242=Créer/modifier les catégories
-Permission243=Supprimer les catégories
-Permission244=Voir le contenu des catégories cachées
-Permission251=Consulter les autres utilisateurs, les groupes et leurs permissions
-PermissionAdvanced251=Consulter les autres utilisateurs
-Permission252=Consulter les permissions des autres utilisateurs
-Permission253=Créer/modifier les autres utilisateurs, les groupes et leurs permissions
-PermissionAdvanced253=Créer/modifier les utilisateurs internes/externes et leurs permissions
-Permission254=Créer/modifier les utilisateurs externes seulement
-Permission255=Modifier le mot de passe des autres utilisateurs
-Permission256=Supprimer ou désactiver les autres utilisateurs
-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 assignement matters).
-Permission271=Consulter le chiffre d'affaires
-Permission272=Consulter les factures
-Permission273=Émettre les factures
-Permission281=Consulter les contacts
-Permission282=Créer/modifier les contacts
-Permission283=Supprimer les contacts
-Permission286=Exporter les contacts
-Permission291=Consulter les tarifs
-Permission292=Définir les permissions sur les tarifs
-Permission293=Modifier les tarifs clients
-Permission300=Consulter les codes-barres
-Permission301=Créer/modifier les codes-barres
-Permission302=Supprimer les codes-barres
-Permission311=Consulter les services
-Permission312=Affecter le service/abonnement au contrat
-Permission331=Lire les marque-pages
-Permission332=Créer/modifier les marque-pages
-Permission333=Supprimer les marque-pages
-Permission341=Consulter ses propres permissions
-Permission342=Créer/modifier ses propres informations utilisateur
-Permission343=Modifier son propre mot de passe
-Permission344=Modifier ses propres permissions
-Permission351=Consulter les groupes
-Permission352=Consulter les permissions des groupes
-Permission353=Créer/modifier les groupes et leurs permissions
-Permission354=Supprimer ou désactiver les groupes
-Permission358=Exporter les utilisateurs
-Permission401=Consulter les avoirs
-Permission402=Créer/modifier les avoirs
-Permission403=Valider les avoirs
-Permission404=Supprimer les avoirs
-Permission510=Consulter les salaires
-Permission512=Créer/modifier les salaires
-Permission514=Supprimer les salaires
-Permission517=Exporter les salaires
-Permission520=Consulter les emprunts
-Permission522=Créer/Modifier les emprunts
-Permission524=Supprimer les emprunts
-Permission525=Utiliser le calculateur d'emprunts
-Permission527=Exporter les emprunts
-Permission531=Consulter les services
-Permission532=Créer/modifier les services
-Permission534=Supprimer les services
-Permission536=Voir/gérer les services cachés
-Permission538=Exporter les services
-Permission701=Consulter les dons
-Permission702=Créer/modifier les dons
-Permission703=Supprimer les dons
+Permission262=Prolonger l'accès à tous les tiers (non seulement les tiers que l'utilisateur est un représentant de la vente). <br> Pas efficace pour les utilisateurs externes (toujours limités à eux-mêmes pour des propositions, des commandes, des factures, des contrats, etc.). Projets (règles uniquement sur les autorisations de projet, visibilité et affectation).
 Permission771=Lire les rapports de dépenses (le vôtre et vos subordonnés )
-Permission772=Créer/modifier les notes de frais
-Permission773=Supprimer les notes de frais
-Permission774=Lire toutes les notes de frais (même pour les utilisateurs en dehors de ma hierarchie)
-Permission775=Approuver les notes de frais
-Permission776=Payer les notes de frais
-Permission779=Exporter les notes de frais
-Permission1001=Consulter les stocks
-Permission1002=Créer/modifier entrepôts
-Permission1003=Supprimer entrepôts
-Permission1004=Consulter les mouvements de stocks
-Permission1005=Créer/modifier les mouvements de stocks
-Permission1101=Consulter les bons de livraison
-Permission1102=Créer/modifier les bons de livraison
-Permission1104=Valider les bons de livraison
-Permission1109=Supprimer les bons de livraison
-Permission1181=Consulter les fournisseurs
-Permission1182=Consulter les commandes fournisseur
-Permission1183=Créer les commandes fournisseur
-Permission1184=Valider les commandes fournisseur
-Permission1185=Approuver les commandes fournisseur
-Permission1186=Commander les commandes fournisseur
-Permission1187=Accuser réception des commandes fournisseur
-Permission1188=Supprimer les commandes fournisseur
-Permission1190=Approuver les commandes fournisseur (second niveau)
-Permission1201=Récupérer le résultat d'un export
-Permission1202=Créer/modifier un export
-Permission1231=Consulter les factures fournisseur
-Permission1232=Créer des factures fournisseur
-Permission1233=Valider les factures fournisseur
-Permission1234=Supprimer les factures fournisseur
-Permission1235=Envoyer les factures fournisseur par email
-Permission1236=Exporter les factures fournisseurs, attributs et règlements
-Permission1237=Exporter les commande fournisseurs, attributs
-Permission1251=Lancer des importations en masse dans la base (chargement de données)
-Permission1321=Exporter les factures clients, attributs et règlements
-Permission1322=Reopen a paid bill
-Permission1421=Exporter les commandes clients et attributs
+Permission1322=Réouvrir une facture payée
 Permission20001=Lire les demandes de congé  (le vôtre et vos subordonnés)
 Permission20002=Créer / modifier les demandes de congé
-Permission20003=Supprimer les demandes de congé
 Permission20004=Lire toutes les demandes de congé (même utilisateur non subordonnés)
 Permission20005=Créer / modifier les demandes de congé pour tout le monde
 Permission20006=Administration des demandes de congé (balance de configuration et de mise à jour )
-Permission23001=Voir les travaux planifiés
-Permission23002=Créer/Modifier des travaux planifiées
-Permission23003=Effacer travail planifié
 Permission23004=Exécuté Travail planifié
-Permission2401=Lire les actions (événements ou tâches) liées à son compte
-Permission2402=Créer/modifier les actions (événements ou tâches) liées à son compte
-Permission2403=Supprimer les actions (événements ou tâches) liées à son compte
-Permission2411=Lire les actions (événements ou tâches) des autres
-Permission2412=Créer/modifier les actions (événements ou tâches) pour les autres
-Permission2413=Supprimer les actions (événements ou tâches) pour les autres
 Permission2414=Exportation d'actions/tâches des autres
-Permission2501=Lire/récupérer les documents
-Permission2502=Récupérer les documents
-Permission2503=Soumettre ou supprimer des documents
-Permission2515=Administrer les rubriques de documents
-Permission2801=Utiliser un client FTP en mode lecture (parcours et téléchargement de fichiers)
-Permission2802=Utiliser un client FTP en mode écriture (suppression et envoi de fichiers)
-Permission50101=Utiliser le point de vente
-Permission50201=Consulter les transactions
-Permission50202=Importer les transactions
-Permission54001=Imprimer
-Permission55001=Lire sondages
-Permission55002=Créer/modifier les sondages
 Permission59001=Consulter les propositions commerciales
-Permission59002=Saisir les marges commerciales
-Permission59003=Peut lire les marges de tout le monde
-Permission63001=Read resources
-Permission63002=Create/modify resources
-Permission63003=Delete resources
-Permission63004=Link resources to agenda events
-DictionaryCompanyType=Types of thirdparties
-DictionaryCompanyJuridicalType=Legal forms of thirdparties
-DictionaryProspectLevel=Niveau de potentiel des prospects
+Permission63002=Créer / modifier des ressources
+Permission63004=Relier les ressources aux événements de l'agenda
+DictionaryCompanyType=Types de tiers
+DictionaryCompanyJuridicalType=Formes juridiques des tierces parties
 DictionaryCanton=État / Province
-DictionaryRegion=Régions
-DictionaryCountry=Pays
-DictionaryCurrency=Monnaies
-DictionaryCivility=Personal and professional titles
-DictionaryActions=Types of agenda events
+DictionaryCivility=Titres personnels et professionnels
+DictionaryActions=Types d'événements de l'agenda
 DictionarySocialContributions=Types de charges sociales
 DictionaryVAT=Taux de TPS/TVH ou de Taxes de Ventes
-DictionaryRevenueStamp=Montants des timbres fiscaux
-DictionaryPaymentConditions=Conditions de règlement
-DictionaryPaymentModes=Modes de paiements
-DictionaryTypeContact=Types de contacts/adresses
-DictionaryEcotaxe=Barèmes Eco-participation (DEEE)
-DictionaryPaperFormat=Format papiers
-DictionaryFormatCards=Cards formats
-DictionaryFees=Types of fees
-DictionarySendingMethods=Méthodes d'expédition
-DictionaryStaff=Effectifs
-DictionaryAvailability=Délai de livraison
-DictionaryOrderMethods=Méthodes de commandes
-DictionarySource=Origines des propales/commandes
-DictionaryAccountancyCategory=Accounting account groups
-DictionaryAccountancysystem=Modèles de plan comptable
-DictionaryEMailTemplates=Modèles des courriels
-DictionaryUnits=Unités
-DictionaryProspectStatus=Statuts de prospection
-DictionaryHolidayTypes=Types of leaves
+DictionaryFormatCards=Formats de cartes
+DictionaryFees=Types de frais
+DictionaryAccountancyJournal=Revues comptables
+DictionaryHolidayTypes=Types de feuilles
 DictionaryOpportunityStatus=État d'opportunité pour le projet/chef de file
-SetupSaved=Configuration sauvegardée
-BackToModuleList=Retour liste des modules
-BackToDictionaryList=Retour liste des dictionnaires
+SetupNotSaved=Le programme d'installation n'a pas été enregistré
 VATManagement=Gestion TPS/TVH
-VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
+VATIsUsedDesc=Par défaut, lors de la création de prospects, factures, commandes, etc., le taux de TVA suit la règle standard active: <br> Si le vendeur n'est pas assujetti à la TVA, la TVA prend par défaut 0. Fin de la règle. Si le (pays vendeur = Pays d'achat), la TVA par défaut est égale à la TVA du produit dans le pays de vente. Fin de la règle. <br> Si le vendeur et l'acheteur sont tous deux dans la Communauté européenne et les marchandises sont des produits de transport (voiture, bateau, avion), la TVA par défaut est 0 (la TVA devrait être payée par l'acheteur au bureau de son pays et non à la vendeur). Fin de la règle. Si le vendeur et l'acheteur sont tous deux dans la Communauté européenne et que l'acheteur n'est pas une société, la TVA par défaut est la TVA du produit vendu. Fin de la règle. Si le vendeur et l'acheteur sont tous deux dans la Communauté européenne et l'acheteur est une société, la TVA est 0 par défaut. Fin de la règle. En tout autre cas, le défaut proposé est la TVA = 0. Fin de la règle.
 VATIsNotUsedDesc=Le taux de TPS/TVH proposé par défaut est 0. C'est le cas d'associations, particuliers ou certaines petites sociétés.
-VATIsUsedExampleFR=En France, il s'agit des sociétés ou organismes ayant choisi un régime fiscale réel (Réel simplifié ou Réel normal), régime dans lequel la TVA est déclarée.
-VATIsNotUsedExampleFR=En France, il s'agit des associations ne déclarant pas de TVA ou sociétés, organismes ou professions libérales ayant choisi le régime fiscal micro entreprise (TVA en franchise) et payant une TVA en franchise sans faire de déclaration de TVA. Ce choix fait de plus apparaître la mention "TVA non applicable - art-293B du CGI" sur les factures.
-##### Local Taxes #####
-LTRate=Taux
-LocalTax1IsNotUsed=Non assujeti
 LocalTax1IsUsedDesc=Utilisation d'un 2ème type taxe (autre que TPS/TVH)
 LocalTax1IsNotUsedDesc=Pas d'utilisation de 2ème type taxe (autre que TPS/TVH)
-LocalTax1Management=Gestion 2ème type de taxe
-LocalTax1IsUsedExample=
-LocalTax1IsNotUsedExample=
-LocalTax2IsNotUsed=Non assujeti
 LocalTax2IsUsedDesc=Utilisation d'un 3ème type taxe  (autre que TPS/TVH)
 LocalTax2IsNotUsedDesc=Pas d'utilisation de 3ème type taxe  (autre que TPS/TVH)
-LocalTax2Management=Gestion 3ème type de tax
-LocalTax2IsUsedExample=
-LocalTax2IsNotUsedExample=
-LocalTax1ManagementES= Gestion RE
-LocalTax1IsUsedDescES= Le taux de RE proposé par défaut lors de la création de proposition commercial, facture, commande, etc… répond à la règle standard suivante:<br>Si acheteur non assujetti à RE, RE par défaut=0. Fin de règle.<br>Si acheteur assujetti à RE alors RE par défaut. Fin de règle.<br>
-LocalTax1IsNotUsedDescES= Le taux de RE proposé par défaut est 0. Fin de règle.
-LocalTax1IsUsedExampleES= En Espagne, ce sont des professionnels sous réserve de certaines sections spécifiques de l'IAE Espagnol.
-LocalTax1IsNotUsedExampleES= En Espagne, ce sont des sociétés en commandite, les sociétés anonymes, etc... et les individus (autonomes) sous réserve de certaines sections de l'IAE Espagnol.
-LocalTax2ManagementES= Gestion IRPF
-LocalTax2IsUsedDescES= L'IRPF proposé par défaut lors de la création de proposition commerciale, facture, commande, etc… répond à la règle standard suivante:<br>Si vendeur non assujetti à IRPF, IRPF par défaut=0. Fin de règle.<br>Si vendeur assujetti à IRPF alors IRPF par défaut. Fin de règle.<br>
-LocalTax2IsNotUsedDescES= L'IRPF proposé par défaut est 0. Fin de règle.
-LocalTax2IsUsedExampleES= En Espagne, ce sont des professionnels autonomes et indépendants qui offrent des services, et des sociétés qui ont choisi le système fiscal du module.
-LocalTax2IsNotUsedExampleES= En Espagne, ce sont des sociétés qui ne sont pas soumises au système fiscal du module.
-CalcLocaltax=Rapports sur les taxes locales
-CalcLocaltax1=Ventes - Achats
-CalcLocaltax1Desc=Les rapports des Taxes locales sont calculées avec la différence entre les taxes locales de ventes et les taxes locales d'achats
-CalcLocaltax2=Achats
-CalcLocaltax2Desc=Le Rapport des Taxes locales sont le total des taxes locales d'achats
-CalcLocaltax3=Ventes
-CalcLocaltax3Desc=Le Rapports des Taxes locales sont le total des taxes locales de ventes
-LabelUsedByDefault=Libellé qui sera utilisé si aucune traduction n'est trouvée pour ce code
-LabelOnDocuments=Libellé sur les documents
-NbOfDays=Nbre de jours
-AtEndOfMonth=En fin de mois
-CurrentNext=Current/Next
-Offset=Décalage
-AlwaysActive=Toujours actif
-Upgrade=Mise à jour
-MenuUpgrade=Mise à jour / extension
-AddExtensionThemeModuleOrOther=Deploy/install external module
-WebServer=Serveur Web
-DocumentRootServer=Répertoire racine des pages web
-DataRootServer=Répertoire racine des fichiers de données
-IP=IP
-Port=Port
-VirtualServerName=Nom du serveur virtuel
-OS=OS
-PhpWebLink=Lien Web-Php
-Browser=Navigateur
-Server=Serveur
-Database=Base de données
-DatabaseServer=Hôte de la base de données
-DatabaseName=Nom de la base de données
-DatabasePort=Port de la base de données
-DatabaseUser=Utilisateur de la base de données
-DatabasePassword=Mot de passe de la base de données
-Tables=Tables
-TableName=Nom de la table
-NbOfRecord=Nb d'enr.
-Host=Serveur
-DriverType=Type du pilote
-SummarySystem=Résumé des informations systèmes
-SummaryConst=Liste de tous les paramètres de configuration Dolibarr
-MenuCompanySetup=Société/Institution
-DefaultMenuManager= Gestionnaire du menu standard
-DefaultMenuSmartphoneManager=Gestionnaire du menu smartphone
-Skin=Thème visuel
-DefaultSkin=Thème visuel par défaut
-MaxSizeList=Longueur maximale des listes
+CurrentNext=Actuel / Suivant
+AddExtensionThemeModuleOrOther=Déploiement / installation du module externe
+MenuCompanySetup=Société / Organisation
 DefaultMaxSizeList=Longueur maximale des listes
 DefaultMaxSizeShortList=Longueur maximale par défaut des listes
-MessageOfDay=Message du jour
-MessageLogin=Message page de connexion
-PermanentLeftSearchForm=Zone de recherche permanente du menu de gauche
-DefaultLanguage=Langue à utiliser par défaut (code langue)
-EnableMultilangInterface=Activer l'interface multi-langue
-EnableShowLogo=Afficher le logo dans le menu gauche
-CompanyInfo=Informations sur la société/institution
-CompanyIds=Identifiants règlementaires
-CompanyName=Nom/Enseigne/Raison sociale
-CompanyAddress=Adresse
-CompanyZip=Code postal
-CompanyTown=Ville
-CompanyCountry=Pays
-CompanyCurrency=Devise principale
+CompanyInfo=Informations sur la société / l'organisation
+CompanyIds=Identités de la société / organisation
 CompanyObject=Objet de la compagnie
-Logo=Logo
-DoNotSuggestPaymentMode=Ne pas suggérer
-NoActiveBankAccountDefined=Aucun compte bancaire actif défini
-OwnerOfBankAccount=Propriétaire du compte %s
-BankModuleNotActive=Module comptes bancaires non activé
 ShowBugTrackLink=Afficher le lien "Signaler un défaut"
-Alerts=Alertes
-DelaysOfToleranceBeforeWarning=Délais de tolérance avant alerte
-DelaysOfToleranceDesc=Cet écran permet de définir les délais de tolérance après lesquels une alerte sera signalée à l'écran par le pictogramme %s sur chaque élément en retard.
-Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned events (agenda events) not completed yet
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Delay tolerance (in days) before alert on project not closed in time
-Delays_MAIN_DELAY_TASKS_TODO=Delay tolerance (in days) before alert on planned tasks (project tasks) not completed yet
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on orders not processed yet
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on suppliers orders not processed yet
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Tolérance de retard avant alerte (en jours) sur propales à cloturer
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Tolérance de retard avant alerte (en jours) sur propales non facturées
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolérance de retard avant alerte (en jours) sur services à activer
-Delays_MAIN_DELAY_RUNNING_SERVICES=Tolérance de retard avant alerte (en jours) sur services expirés
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolérance de retard avant alerte (en jours) sur factures fournisseur impayées
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolérance de retard avant alerte (en jours) sur factures client impayées
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolérance de retard avant alerte (en jours) sur rapprochements bancaires à faire
-Delays_MAIN_DELAY_MEMBERS=Tolérance de retard avant alerte (en jours) sur cotisations adhérents en retard
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolérance de retard avant alerte (en jours) sur chèques à déposer
+Delays_MAIN_DELAY_ACTIONS_TODO=Tolérance retardée (en jours) avant l'alerte sur les événements planifiés (événements agenda) non encore terminés
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Tolérance retardée (en jours) avant l'alerte sur le projet non fermé dans le temps
+Delays_MAIN_DELAY_TASKS_TODO=Tolérance retardée (en jours) avant l'alerte sur les tâches planifiées (tâches du projet) non complétées encore
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Tolérance de retard (en jours) avant l'alerte sur les commandes non traitées encore
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Tolérance de retard (en jours) avant l'alerte sur les commandes des fournisseurs non encore traitées
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolérance de retard (en jours) avant alerte pour les rapports de dépenses à approuver
-SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
-SetupDescription5=Les autres entrées de configuration gèrent des paramètres facultatifs.
-LogEvents=Événements d'audit de sécurité
-Audit=Audit
-InfoDolibarr=About Dolibarr
-InfoBrowser=About Browser
-InfoOS=About OS
-InfoWebServer=About Web Server
-InfoDatabase=About Database
-InfoPHP=About PHP
-InfoPerf=About Performances
-BrowserName=Nom du navigateur
-BrowserOS=OS du navigateur
-ListOfSecurityEvents=Liste des événements de sécurité Dolibarr
-SecurityEventsPurged=Evenement de sécurité purgés
-LogEventDesc=Vous pouvez activer ici, la journalisation des événements d'audit de sécurité. Cet historique est consultable par les administrateurs dans le menu <b>Outils systèmes - Audit</b>. Attention, cette fonctionnalité peut générer un gros volume de données.
-AreaForAdminOnly=Ces fonctions ne sont accessibles qu'aux administrateurs.
-SystemInfoDesc=Les informations systèmes sont des informations techniques diverses accessibles en lecture seule aux administrateurs uniquement.
-SystemAreaForAdminOnly=Cet espace n'est accessible qu'aux utilisateurs de type administrateur. Aucune permission Dolibarr ne permet d'étendre le cercle des utilisateurs autorisés à cet espace.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
-DisplayDesc=Vous pouvez choisir ici tous les paramètres liés à l'apparence de Dolibarr
-AvailableModules=Modules disponibles
-ToActivateModule=Pour activer des modules, aller dans l'espace Configuration (Accueil->Configuration->Modules).
-SessionTimeOut=Délai expiration des sessions
-SessionExplanation=Ce nombre garanti que la session n'expire pas avant ce délai, lorsque le nettoyage des sessions est assurés par le mécanisme de nettoyage interne à PHP (et aucun autre). Le nettoyage interne de sessions PHP ne garantie pas que la session expire juste au moment de ce délai. Elle expirera après ce délai, mais au moment du nettoyage des sessions, qui a lieu toutes les <b>%s/%s</b> accès environ, mais uniquement lors d'accès fait par d'autres sessions.<br>Note : sur certains serveurs munis d'un mécanisme de nettoyage de session externe (cron sous Debian, Ubuntu…), le sessions peuvent être détruites après un délai, défini par la valeur par défaut de <strong>session.gc_maxlifetime</strong>, quelle que soit la valeur saisie ici.
-TriggersAvailable=Déclencheurs disponibles
-TriggersDesc=Les déclencheurs sont des fichiers qui, une fois déposés dans le répertoire <b>htdocs/core/triggers</b>, modifient le comportement du workflow de Dolibarr. Ils réalisent des actions supplémentaires, déclenchées par les événements Dolibarr (création société, validation facture, clôture contrat…).
-TriggerDisabledByName=Déclencheurs de ce fichier désactivés par le suffix <b>-NORUN</b> dans le nom du fichier.
-TriggerDisabledAsModuleDisabled=Déclencheurs de ce fichier désactivés car le module <b>%s</b> n'est pas actif.
-TriggerAlwaysActive=Déclencheurs de ce fichier toujours actifs, quels que soient les modules Dolibarr activés.
-TriggerActiveAsModuleActive=Déclencheurs de ce fichier actifs car le module <b>%s</b> est actif.
-GeneratedPasswordDesc=Definissez ici quelle règle vous voulez utiliser pour générer les mots de passe quand vous demandez à fabriquer un nouveau mot de passe
-DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">check here</a>.
-MiscellaneousDesc=All other security related parameters are defined here.
-LimitsSetup=Configuration des limites et précisions
-LimitsDesc=Vous pouvez définir ici les limites, précisions et optimisations utilisées par Dolibarr
-MAIN_MAX_DECIMALS_UNIT=Nombre de décimales maximum pour les prix unitaires
-MAIN_MAX_DECIMALS_TOT=Nombre de décimales maximum pour les prix totaux
-MAIN_MAX_DECIMALS_SHOWN=Nombre de décimales maximum pour les montant affichés à l'écran (Mettre <b>...</b> après ce nombre max si vous voulez voir <b>...</b> quand le nombre est tronqué à l'affichage écran)
+SetupDescription1=La zone de configuration est pour les paramètres de configuration initiale avant de commencer à utiliser Dolibarr.
+SetupDescription2=Les deux étapes d'installation obligatoires sont les deux premières dans le menu de configuration à gauche: %s page de configuration et %s page de configuration:
+SetupDescription3=Les paramètres du menu <a href="%s"> %s -> %s </a> sont nécessaires car les données définies sont utilisées sur les écrans Dolibarr et pour personnaliser le comportement par défaut du logiciel (par exemple pour les fonctions liées au pays).
+SetupDescription4=Les paramètres du menu <a href="%s"> %s -> %s </a> sont requis car Dolibarr ERP / CRM est une collection de plusieurs modules / applications, tous plus ou moins indépendants. De nouvelles fonctionnalités seront ajoutées aux menus pour chaque module que vous allez activer.
+InfoDolibarr=À propos de Dolibarr
+InfoBrowser=À propos du navigateur
+InfoWebServer=À propos du serveur Web
+InfoPHP=À propos de PHP
+InfoPerf=À propos des performances
+AreaForAdminOnly=Les paramètres d'installation peuvent être définis par <b> utilisateurs d'administrateur </ b> uniquement.
+CompanyFundationDesc=Modifier sur cette page toutes les informations connues de l'entreprise ou de la fondation que vous devez gérer (Pour cela, cliquez sur le bouton "Modifier" ou "Enregistrer" au bas de la page)
+DictionaryDesc=Insérez toutes les données de référence. Vous pouvez ajouter vos valeurs par défaut.
+ConstDesc=Cette page vous permet de modifier tous les autres paramètres non disponibles dans les pages précédentes. Ce sont principalement des paramètres réservés pour les développeurs ou le dépannage avancé. Pour une liste d'options <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site-opens in new window" target="_blank"> check here </ A>.
+MiscellaneousDesc=Tous les autres paramètres liés à la sécurité sont définis ici.
 MAIN_ROUNDING_RULE_TOT=Taille du pas des arrondis (pour les très rares pays qui arrondissent sur une autre base que la base 10)
 UnitPriceOfProduct=Prix unitaire (no tax) d'un produit
 TotalPriceAfterRounding=Prix total (no tax/TPS/TVH/tx incl.) après arrondis
-ParameterActiveForNextInputOnly=Paramètre effectif pour les prochaines saisies uniquement
-NoEventOrNoAuditSetup=Aucun événement d'audit de sécurité n'a été enregistré. Ceci peut être normal si l'audit n'a pas été activé dans la configuration - sécurité - audit.
-NoEventFoundWithCriteria=Aucun événement d'audit de sécurité trouvé avec ces critères.
-SeeLocalSendMailSetup=Voir la configuration locale de sendmail
-BackupDesc=Pour réaliser une sauvegarde complète de Dolibarr, vous devez :
 BackupDesc2=Enregistrer le contenu du répertoire de documents (<b>%s</b>) qui contient tous les fichiers téléchargés et générés ( Donc, il inclut tous les fichiers de sauvegarde générés à l'étape 1).
-BackupDesc3=Sauvez le contenu de votre base de données (<b>%s</b>) dans un fichier « dump ». Pour cela vous pouvez utiliser l'assistant ci-dessous.
-BackupDescX=Le répertoire archivé devra être placé en lieu sûr.
-BackupDescY=Le fichier « dump » généré devra être placé en lieu sûr.
-BackupPHPWarning=La sauvegarde n'est pas garantie avec cette méthode. Préférez la méthode précédente.
-RestoreDesc=Pour restaurer une sauvegarde de Dolibarr, vous devez :
-RestoreDesc2=Restaurez le fichier archive (fichier zip par exemple) du répertoire documents en extrayant l'arborescence dans le répertoire documents d'une nouvelle installation de Dolibarr ou dans le répertoire documents de cette installation (<b>%s</b>).
-RestoreDesc3=Restaurez les données, depuis le fichier « dump » de sauvegarde, dans  la base de données d'une nouvelle installation de Dolibarr ou de cette instance en cours (<b>%s</b>). Attention, une fois la restauration faite, il faudra utiliser un identifiant/mot de passe administrateur existant à l'époque de la sauvegarde pour se connecter. Pour restaurer la base dans l'installation actuelle, vous pouvez utiliser l'assistant suivant.
-RestoreMySQL=Importation MySQL
-ForcedToByAModule= Cette règle est forcée à <b>%s</b> par un des modules activés
-PreviousDumpFiles=Fichiers de sauvegarde de la base de données disponibles
-WeekStartOnDay=Premier jour de la semaine
-RunningUpdateProcessMayBeRequired=Le lancement du processus de mise à jour semble requis (La version des programmes %s diffère de la version de la base %s)
-YouMustRunCommandFromCommandLineAfterLoginToUser=Vous devez exécuter la commande sous un terminal après vous être identifié avec le compte <b>%s</b> ou ajouter -W à la fin de la commande pour fournir le mot de passe de <b>%s</b>.
-YourPHPDoesNotHaveSSLSupport=Fonctions SSL non présentes dans votre PHP
-DownloadMoreSkins=Plus de thèmes à télécharger
-SimpleNumRefModelDesc=Renvoie le numéro sous la forme %syymm-nnnn où yy est l'année, mm le mois et nnnn un compteur séquentiel sans rupture et sans remise à 0.
-ShowProfIdInAddress=Afficher l'identifiant professionnel dans les adresses sur les documents
-ShowVATIntaInAddress=Cacher l'identifiant de TVA Intracommunautaire dans les adresses sur les documents
-TranslationUncomplete=Traduction partielle
-MAIN_DISABLE_METEO=Désactiver la vue météo
-TestLoginToAPI=Tester connexion à l'API
-ProxyDesc=Certaines fonctions de Dolibarr nécessitent que le serveur ait accès à internet. Définissez ici les paramètres de ces accès. Si le serveur Dolibarr est derrière un proxy, ces paramètres indiquent à Dolibarr comment le traverser.
-ExternalAccess=Accès externes
-MAIN_PROXY_USE=Utiliser un serveur proxy mandataire (sinon accès direct à internet)
-MAIN_PROXY_HOST=Nom/Adresse du serveur proxy mandataire
-MAIN_PROXY_PORT=Port du serveur proxy mandataire
-MAIN_PROXY_USER=Identifiant pour passer le serveur proxy mandataire
-MAIN_PROXY_PASS=Mot de passe pour passer le serveur proxy mandataire
-DefineHereComplementaryAttributes=Définissez ici la liste des attributs supplémentaires, non disponibles en standard, et que vous voulez voir gérer sur les %s.
-ExtraFields=Attributs supplémentaires
-ExtraFieldsLines=Attributs supplémentaires (lignes)
-ExtraFieldsSupplierOrdersLines=Attributs supplémentaires (lignes de commandes)
-ExtraFieldsSupplierInvoicesLines=Attributs supplémentaires (lignes de factures)
-ExtraFieldsThirdParties=Attributs supplémentaires (tiers)
-ExtraFieldsContacts=Attributs supplémentaires (contacts/adresses)
-ExtraFieldsMember=Attributs supplémentaires (adhérents)
-ExtraFieldsMemberType=Attributs supplémentaires (type d'adhérents)
-ExtraFieldsCustomerInvoices=Attributs supplémentaires (factures)
-ExtraFieldsSupplierOrders=Attributs supplémentaires (commandes)
-ExtraFieldsSupplierInvoices=Attributs supplémentaires (factures)
-ExtraFieldsProject=Attributs supplémentaires (projets)
-ExtraFieldsProjectTask=Attributs supplémentaires (tâches)
-ExtraFieldHasWrongValue=L'attribut %s a une valeur incorrecte.
-AlphaNumOnlyLowerCharsAndNoSpace=uniquement des caractères alphanumériques et en minuscule sans espace
-SendmailOptionNotComplete=Attention, sur certains systèmes Linux, avec cette méthode d'envoi, pour pouvoir envoyer des emails en votre nom, la configuration d'exécution de sendmail doit contenir l'option <b>-ba</b> (paramètre <b>mail.force_extra_parameters</b> dans le fichier <b>php.ini</b>). Si certains de vos destinataires ne reçoivent pas de message, essayer de modifier ce paramètre PHP avec <b>mail.force_extra_parameters = -ba</b>.
-PathToDocuments=Chemin d'accès aux documents
-PathDirectory=Répertoire
-SendmailOptionMayHurtBuggedMTA=La fonction d'envoi de mails par la méthode "PHP mail directe" génère un message mail qui peut être mal interprété par certains serveurs mal configurés de réception de mail. Cela se traduit par des mails non lisibles chez les personnes hébergés par ces plateformes boguées. C'est le cas des clients de certains fournisseurs d'accès internet (Ex: Orange). Ce n'est pas un problème, ni dans Dolibarr ni dans PHP mais sur le serveur de réception. Vous pouvez toutefois ajouter l'option MAIN_FIX_FOR_BUGGED_MTA à 1 dans configuration - divers pour modifier Dolibarr afin de compenser le bug. Toutefois ce sont les serveurs respectueux du standard d'envoi de mail qui pourront avoir des problèmes. L'autre solution (recommandée) est d'utiliser la méthode d'envoi SMTP socket library qui n'a aucun de ces inconvénients.
-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: <strong>User display setup</strong> tab of 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
-TranslationString=Translation string
-CurrentTranslationString=Current translation string
-WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
-NewTranslationStringToShow=New translation string to show
-OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Nombre total de modules de fonction activés : <b>%s</b> / <b>%s</b>
-YouMustEnableOneModule=Vous devez activer au moins une fonctionnalité
-ClassNotFoundIntoPathWarning=La classe %s n'a pas été trouvée dans le chemin PHP
-YesInSummer=Oui en été
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
-SuhosinSessionEncrypt=Stockage des sessions chiffrées par Suhosin
-ConditionIsCurrently=La condition est actuellement %s
-YouUseBestDriver=Vous utilisez le driver %s qui est le driver recommandé actuellement.
-YouDoNotUseBestDriver=Vous utilisez le driver %s mais le driver %s est recommandé.
-NbOfProductIsLowerThanNoPb=Vous n'avez que %s produits/services en base. Ceci ne requiert pas d'optimisation particulière.
-SearchOptim=Optimization des recherches
-YouHaveXProductUseSearchOptim=Vous avez %s produits/services en base. Il est recommandé d'ajouter la constante PRODUCT_DONOTSEARCH_ANYWHERE à 1 dans Accueil-Configuration-Divers, vous limiterez ainsi la recherche au début de la chaine rendant possible l'utilisation de l'index et obtiendrez une réponse immédiate.
-BrowserIsOK=Vous utilisez le navigateur %s. Ce navigateur est réputé optimisé pour la sécurité et performance.
-BrowserIsKO=Vous utilisez le navigateur %s. Ce navigateur est déconseillé pour des raisons de sécurité, performance et qualité des pages restituées. Nous vous recommandons d'utiliser Firefox, Chrome, Opera ou Safari.
-XDebugInstalled=XDebug est chargé.
-XCacheInstalled=XCache est chargé.
-AddRefInList=Afficher les références client/fournisseur dans les listes (listes déroulantes ou à autocomplétion) et les libellés des liens clicables. Les tiers apparaîtront alors sous la forme "CC12345 - SC45678 - La big company coorp", au lieu de "La big company coorp".
-AskForPreferredShippingMethod=Ask for preferred Sending Method for Third Parties.
-FieldEdition=Édition du champ %s
-FillThisOnlyIfRequired=Exemple: +2 (ne remplir que si un décalage d'heure est constaté dans l'export)
-GetBarCode=Récupérer code barre
-##### Module password generation
-PasswordGenerationStandard=Renvoie un mot de passe généré selon l'algorithme interne de Dolibarr : 8 caractères, chiffres et caractères en minuscules mélangés.
+TranslationKeySearch=Rechercher une clé ou une chaîne de traduction
+TranslationOverwriteKey=Ecraser une chaîne de traduction
+TranslationDesc=Comment définir la langue de l'application affichée: <br> * Systemwide: menu <strong> Accueil - Configuration - Affichage </ strong> <br> * Par utilisateur: <strong> Affichage de l'utilisateur </ strong> onglet de la carte utilisateur (cliquez sur Nom d'utilisateur en haut de l'écran).
+TranslationOverwriteDesc=Vous pouvez également remplacer les chaînes en remplissant le tableau suivant. Choisissez votre langue dans le menu déroulant "%s", insérez la chaîne de traduction dans "%s" et votre nouvelle traduction dans "%s"
+TranslationString=Chaîne de traduction
+WarningAtLeastKeyOrTranslationRequired=Un critère de recherche est requis au moins pour une clé ou une chaîne de traduction
+NewTranslationStringToShow=Nouvelle chaîne de traduction à afficher
+OriginalValueWas=La traduction originale est écrasée. La valeur d'origine était: <br> <br> %s
+TransKeyWithoutOriginalValue=Vous avez forcé une nouvelle traduction pour la clé de traduction '<strong>%s</strong>' qui n'existe pas dans aucun fichier de langue
+TotalNumberOfActivatedModules=Application / modules activés: <b>%s</b> / <b>%s</b>
+OnlyFollowingModulesAreOpenedToExternalUsers=Remarque, seuls les modules suivants sont ouverts aux utilisateurs externes (quelle que soit l'autorisation de ces utilisateurs) et uniquement si les autorisations ont été accordées:
+AskForPreferredShippingMethod=Demandez la méthode d'envoi préférée pour les tiers.
 PasswordGenerationNone=Aucune suggestion de mot de passe généré . Le mot de passe doit être saisi manuellement.
 PasswordGenerationPerso=Retour un mot de passe en fonction de votre configuration personnellement défini.
-SetupPerso=Selon votre configuration
 PasswordPatternDesc=Description du modèle de mot de passe
-##### Users setup #####
-RuleForGeneratedPasswords=Règle pour la génération des mots de passe proposés et leur validation
-DisableForgetPasswordLinkOnLogonPage=Ne pas afficher le lien "Mot de passe oublié" sur la page de connexion
-UsersSetup=Configuration du module utilisateurs
-UserMailRequired=Email requis pour créer un nouvel utilisateur
-##### HRM setup #####
 HRMSetup=Configuration du module de GRH
-##### Company setup #####
-CompanySetup=Configuration du module Tiers
-CompanyCodeChecker=Modèle de génération et contrôle des codes tiers (clients/fournisseurs)
-AccountCodeManager=Modèle de génération des codes comptable (clients/fournisseurs)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
-NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
-NotificationsDescGlobal=* or by setting global target emails in module setup page.
-ModelModules=Modèle de documents
-DocumentModelOdt=Génération depuis des modèles OpenDocument (Fichier .ODT ou .ODS OpenOffice, KOffice, TextEdit…)
-WatermarkOnDraft=Filigrane sur les documents brouillons
-JSOnPaimentBill=Activer la fonctionnalité de remplissage automatique des lignes de paiement sur le formulaire de paiement
-CompanyIdProfChecker=Règles sur les Identifiants professionnels
-MustBeUnique=Must be unique?
-MustBeMandatory=Mandatory to create third parties?
-MustBeInvoiceMandatory=Mandatory to validate invoices?
-##### Webcal setup #####
-WebCalUrlForVCalExport=Un lien d'exportation du calendrier au format <b>%s</b> sera disponible à l'url :<br>%s
-##### Invoices #####
-BillsSetup=Configuration du module Factures
-BillsNumberingModule=Modèle de numérotation des factures et avoirs
-BillsPDFModules=Modèle de document de factures
-CreditNote=Avoir
-CreditNotes=Avoirs
-ForceInvoiceDate=Forcer la date de facturation à la date de validation
-SuggestedPaymentModesIfNotDefinedInInvoice=Mode de paiement suggéré par défaut si non défini au niveau de la facture
-SuggestPaymentByRIBOnAccount=Proposer paiement par virement sur le compte
-SuggestPaymentByChequeToAddress=Proposer paiement par chèque à l'ordre et adresse de
-FreeLegalTextOnInvoices=Mention complémentaire sur les factures
-WatermarkOnDraftInvoices=Filigrane sur les brouillons de factures (aucun si vide)
+NotificationsDesc=La fonction de notification des messages électroniques vous permet d'envoyer automatiquement un courrier automatique pour certains événements Dolibarr. Les cibles des notifications peuvent être définies:
+NotificationsDescUser=* Par utilisateur, un utilisateur à l'heure.
+NotificationsDescContact=* Par les contacts de tiers (clients ou fournisseurs), un contact à l'heure.
+NotificationsDescGlobal=* Ou en définissant des emails de cible globaux dans la page de configuration du module.
+MustBeUnique=Doit être unique?
+MustBeMandatory=Obligatoire de créer des tiers?
+MustBeInvoiceMandatory=Obligatoire de valider les factures?
+PaymentsPDFModules=Modèles de documents de paiement
 PaymentsNumberingModule=Modèles de numérotation des paiements
-SuppliersPayment=Règlements fournisseurs
-SupplierPaymentSetup=Suppliers payments setup
-##### Proposals #####
-PropalSetup=Configuration du module Propositions Commerciales
-ProposalsNumberingModules=Modèles de numérotation des propositions commerciales
-ProposalsPDFModules=Modèles de documents de propositions commerciales
-FreeLegalTextOnProposal=Mention complémentaire sur les propositions commerciales
-WatermarkOnDraftProposal=Filigrane sur les brouillons de propositions commerciales (aucun si vide)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Saisir le compte bancaire cible lors de la proposition commerciale
-##### SupplierProposal #####
+SupplierPaymentSetup=Configuration des paiements des fournisseurs
 SupplierProposalSetup=Configuration du module de ​​demande de prix des fournisseurs
-SupplierProposalNumberingModules=Modèles de numérotation des demandes de prix des fournisseurs 
-SupplierProposalPDFModules=Modèles des documents des demandes de prix des fournisseurs 
+SupplierProposalNumberingModules=Modèles de numérotation des demandes de prix des fournisseurs
+SupplierProposalPDFModules=Modèles des documents des demandes de prix des fournisseurs
 FreeLegalTextOnSupplierProposal=Texte libre sur les demandes de prix fournisseurs
 WatermarkOnDraftSupplierProposal=Filigrane sur le projet de prix demande des fournisseurs (si aucun laisser vide)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Demandez compte bancaire de destination pour les demandes de prix
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Demandez une source d'entrepôt pour l'ordre
-##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
-##### Orders #####
-OrdersSetup=Configuration du module Commandes
-OrdersNumberingModules=Modèles de numérotation des commandes
-OrdersModelModule=Modèles de document des commandes
-FreeLegalTextOnOrders=Mention complémentaire sur les commandes
-WatermarkOnDraftOrders=Filigrane sur les brouillons de commandes (aucun si vide)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Demandez la destination du compte bancaire de l'ordre fournisseur
 ShippableOrderIconInList=Ajouter un icône dans la liste des commandes qui indique si la commande est expédiable.
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Demander le compte bancaire cible durant la commande
-##### Interventions #####
-InterventionsSetup=Configuration du module Interventions
-FreeLegalTextOnInterventions=Mention complémentaire sur les fiches d'intervention
-FicheinterNumberingModules=Modèles de numérotation des fiches d'intervention
-TemplatePDFInterventions=Modèles de document des fiches d'intervention
-WatermarkOnDraftInterventionCards=Filigrane sur les brouillons des fiches d'intervention (aucun si vide)
-##### Contracts #####
-ContractsSetup=Configuration du module Contrats/Abonnements
-ContractsNumberingModules=Modèles de numérotation des contrats
-TemplatePDFContracts=Modèles de document de contrats
-FreeLegalTextOnContracts=Mention complémentaire sur les contrats
-WatermarkOnDraftContractCards=Filigrane sur les brouillons de contrats (aucun si vide)
-##### Members #####
-MembersSetup=Configuration du module Adhérents
-MemberMainOptions=Options principales
-AdherentLoginRequired= Gérer un identifiant pour chaque adhérent
-AdherentMailRequired=Email obligatoire pour créer un nouvel adhérent
-MemberSendInformationByMailByDefault=Case à cocher pour envoyer un email de confirmation (validation ou nouvelle cotisation) aux adhérents est à oui par défaut.
-##### LDAP setup #####
-LDAPSetup=Configuration du module LDAP
-LDAPGlobalParameters=Paramètres globaux
-LDAPUsersSynchro=Utilisateurs
-LDAPGroupsSynchro=Groupes
-LDAPContactsSynchro=Contacts
-LDAPMembersSynchro=Adhérents
-LDAPSynchronization=Synchronisation LDAP
-LDAPFunctionsNotAvailableOnPHP=Les fonctions LDAP ne sont pas disponibles sur votre PHP
-LDAPToDolibarr=LDAP -> Dolibarr
-DolibarrToLDAP=Dolibarr -> LDAP
-LDAPNamingAttribute=Clé dans LDAP
-LDAPSynchronizeUsers=Organisation des objets utilisateurs dans le LDAP
-LDAPSynchronizeGroups=Organisation des objets groupes dans le LDAP
-LDAPSynchronizeContacts=Organisation des objets contacts dans le LDAP
-LDAPSynchronizeMembers=Organisation des objets adhérents dans le LDAP
-LDAPPrimaryServer=Serveur primaire
-LDAPSecondaryServer=Serveur secondaire
-LDAPServerPort=Port du serveur
-LDAPServerPortExample=Port par défaut : 389
-LDAPServerProtocolVersion=Version du protocole
-LDAPServerUseTLS=Utiliser TLS
-LDAPServerUseTLSExample=Votre serveur utilise le TLS
-LDAPServerDn=DN du serveur
-LDAPAdminDn=DN de l'administrateur
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
-LDAPPassword=Mot de passe de l'administrateur
-LDAPUserDn=DN des utilisateurs
-LDAPUserDnExample=DN complet (ex : ou=users,dc=my-domain,dc=com)
-LDAPGroupDn=DN des groupes
-LDAPGroupDnExample=DN complet (ex : ou=groups,dc=my-domain,dc=com)
-LDAPServerExample=Adresse du serveur (ex : localhost, 192.168.0.2, ldaps://ldap.example.com/)
-LDAPServerDnExample=DN complet (ex : dc=my-domain,dc=com)
-LDAPDnSynchroActive=Synchronisation des utilisateurs et groupes
-LDAPDnSynchroActiveExample=Synchronisation de LDAP vers Dolibarr ou Dolibarr vers LDAP
-LDAPDnContactActive=Synchronisation des contacts
-LDAPDnContactActiveExample=Synchronisation activée/désactivée
-LDAPDnMemberActive=Synchronisation des adhérents
-LDAPDnMemberActiveExample=Synchronisation activée/désactivée
-LDAPContactDn=DN des contacts Dolibarr
-LDAPContactDnExample=DN complet (ex : ou=contacts,dc=my-domain,dc=com)
-LDAPMemberDn=DN des adhérents
-LDAPMemberDnExample=DN complet (ex : ou=members,dc=society,dc=com)
-LDAPMemberObjectClassList=Liste des objectClass
-LDAPMemberObjectClassListExample=Liste des objectClass définissant les attributs d'un enregistrement (ex : top,inetOrgPerson ou top,user for active directory)
-LDAPUserObjectClassList=Liste des objectClass
-LDAPUserObjectClassListExample=Liste des objectClass définissant les attributs d'un enregistrement (ex : top,inetOrgPerson ou top,user for active directory)
-LDAPGroupObjectClassList=Liste des objectClass
-LDAPGroupObjectClassListExample=Liste des objectClass définissant les attributs d'un enregistrement (ex : top,groupOfUniqueNames)
-LDAPContactObjectClassList=Liste des objectClass
-LDAPContactObjectClassListExample=Liste des objectClass définissant les attributs d'un enregistrement (ex : top,inetOrgPerson ou top,user for active directory)
-LDAPTestConnect=Tester la connexion LDAP
-LDAPTestSynchroContact=Tester synchronisation contacts
-LDAPTestSynchroUser=Tester synchronisation utilisateur
-LDAPTestSynchroGroup=Tester synchronisation groupe
-LDAPTestSynchroMember=Tester synchronisation adhérent
-LDAPTestSearch= Tester une recherche LDAP
-LDAPSynchroOK=Test de synchronisation réalisé avec succès
-LDAPSynchroKO=Échec du test de synchronisation
-LDAPSynchroKOMayBePermissions=Échec du test de synchronisation. Vérifier que la connexion au serveur est correctement configurée et permet les mises à jour LDAP
-LDAPTCPConnectOK=Connexion TCP au serveur LDAP réussie (Serveur=%s, Port=%s)
-LDAPTCPConnectKO=Connexion TCP au serveur LDAP échouée (Serveur=%s, Port=%s)
-LDAPBindOK=Connection/Authentification au serveur LDAP réussie (Serveur=%s, Port=%s, Admin=%s, Password=%s)
-LDAPBindKO=Connexion/Authentification au serveur LDAP échouée (Serveur=%s, Port=%s, Admin=%s, Password=%s)
-LDAPSetupForVersion3=Serveur LDAP configuré en version 3
-LDAPSetupForVersion2=Serveur LDAP configuré en version 2
-LDAPDolibarrMapping=Mapping Dolibarr
-LDAPLdapMapping=Mapping LDAP
-LDAPFieldLoginUnix=Identifiant (unix)
-LDAPFieldLoginExample=Exemple : uid
-LDAPFilterConnection=Filtre de recherche
-LDAPFilterConnectionExample=Exemple : &(objectClass=inetOrgPerson)
-LDAPFieldLoginSamba=Identifiant (samba, activedirectory)
-LDAPFieldLoginSambaExample=Exemple : samaccountname
-LDAPFieldFullname=Prénom Nom
-LDAPFieldFullnameExample=Exemple : cn
-LDAPFieldPasswordNotCrypted=Mot de passe non chiffré
-LDAPFieldPasswordCrypted=Mot de passe chiffré
-LDAPFieldPasswordExample=Exemple : userPassword
-LDAPFieldCommonNameExample=Exemple : cn
-LDAPFieldName=Nom
-LDAPFieldNameExample=Exemple : sn
-LDAPFieldFirstName=Prénom
-LDAPFieldFirstNameExample=Exemple : givenName
-LDAPFieldMail=Email
-LDAPFieldMailExample=Exemple : email
-LDAPFieldPhone=Téléphone professionnel
-LDAPFieldPhoneExample=Exemple : telephonenumber
-LDAPFieldHomePhone=Téléphone perso
-LDAPFieldHomePhoneExample=Exemple : homephone
-LDAPFieldMobile=Téléphone portable
-LDAPFieldMobileExample=Exemple : mobile
-LDAPFieldFax=Fax
-LDAPFieldFaxExample=Exemple : facsimiletelephonenumber
-LDAPFieldAddress=Adresse
-LDAPFieldAddressExample=Exemple : street
-LDAPFieldZip=Code postal
-LDAPFieldZipExample=Exemple : postalcode
-LDAPFieldTown=Ville
-LDAPFieldTownExample=Exemple : l
-LDAPFieldCountry=Pays
-LDAPFieldDescription=Description
-LDAPFieldDescriptionExample=Exemple : description
-LDAPFieldNotePublic=Note publique
-LDAPFieldNotePublicExample=Exemple : publicnote
-LDAPFieldGroupMembers= Membres du groupe
-LDAPFieldGroupMembersExample= Exemple : uniqueMember
-LDAPFieldBirthdate=Date de naissance
-LDAPFieldCompany=Société
-LDAPFieldCompanyExample=Exemple : o
-LDAPFieldSid=SID
-LDAPFieldSidExample=Exemple : objectsid
-LDAPFieldEndLastSubscription=Date de fin de validité adhésion
-LDAPFieldTitle=Job position
-LDAPFieldTitleExample=Exemple: title
-LDAPSetupNotComplete=Configuration LDAP incomplète (à compléter sur les autres onglets)
-LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Administrateur ou mot de passe non renseigné. Les accès LDAP seront donc anonymes et en lecture seule.
-LDAPDescContact=Cette page permet de définir le nom des attributs de l'arbre LDAP pour chaque information des contacts Dolibarr.
-LDAPDescUsers=Cette page permet de définir le nom des attributs de l'arbre LDAP pour chaque information des utilisateurs Dolibarr.
-LDAPDescGroups=Cette page permet de définir le nom des attributs de l'arbre LDAP pour chaque information des groupes utilisateurs Dolibarr.
-LDAPDescMembers=Cette page permet de définir le nom des attributs de l'arbre LDAP pour chaque information des membres du module adhérents Dolibarr.
-LDAPDescValues=Les valeurs exemples sont adaptées à <b>OpenLDAP</b> avec les schémas suivant chargés: <b>core.schema, cosine.schema, inetorgperson.schema</b>). Si vous utilisez les valeurs suggérées et OpenLDAP, modifiez votre fichier de configuration LDAP <b>slapd.conf</b> pour avoir tous ces schémas actifs.
-ForANonAnonymousAccess=Pour un accès authentifié (pour accès en écriture par exemple)
-PerfDolibarr=Rapport de configuration/optimisation sur la performance
-YouMayFindPerfAdviceHere=Sur cette page vous trouverez quelques indicateurs ou conseils pour optimiser la performance.
-NotInstalled=Non installé, aussi votre serveur n'est pas ralentit par cela.
-ApplicativeCache=Cache applicatif
-MemcachedNotAvailable=Aucun cache applicatif trouvé. Vous pouvez accélérer les performances de Dolibarr en installant un serveur de cache Memcached et un module de cache applicatif exploitant ce serveur.<br>Plus d'info sur la page <a href="http://wiki.dolibarr.org/index.php/Module_MemCached">http://wiki.dolibarr.org/index.php/Module_MemCached</a>. Notez que de nombreux hébergeurs low-cost ne fournissent pas de tels serveurs de cache dans leur infrastructure.
-MemcachedModuleAvailableButNotSetup=Le module memcached pour le cache applicatif a été trouvé mais la configuration de ce module n'est pas complète.
-MemcachedAvailableAndSetup=Le module memcached dédié à l'utilisation du serveur de cache memcached est activé.
-OPCodeCache=Cache OPCode
-NoOPCodeCacheFound=Pas de cache OPCode trouvé. Peut-être utilisez-vous un cache OPCode différent de XCache ou eAccelerator (bien), peut-être n'avez vous pas du tout de cache OPCode (très mauvais).
-HTTPCacheStaticResources=Cache HTTP des ressources statiques (css, img, javascript)
-FilesOfTypeCached=Fichiers de type %s mis en cache par le serveur HTTP
-FilesOfTypeNotCached=Fichiers de type %s non mis en cache par le serveur HTTP
-FilesOfTypeCompressed=Fichiers de type %s compressé par le serveur HTTP
-FilesOfTypeNotCompressed=Fichiers de type %s non compressé par le serveur HTTP
-CacheByServer=Cache par le serveur
-CacheByClient=Cache par le navigateur
-CompressionOfResources=Compression des réponses HTTP
-TestNotPossibleWithCurrentBrowsers=Une détection automatique n'est pas possible avec le navigateur courant
-##### Products #####
-ProductSetup=Configuration du module Produits
-ServiceSetup=Configuration du module Services
-ProductServiceSetup=Configuration des modules Produits et Services
-NumberOfProductShowInSelect=Nombre maximum de produits dans les listes déroulantes (0=aucune limite)
-ViewProductDescInFormAbility=Visualisation des descriptions produits dans les formulaires (sinon en tant que bulle d'aide)
+LDAPAdminDnExample=DN complet (ex: cn = admin, dc = exemple, dc = com ou cn = Administrateur, cn = Utilisateurs, dc = exemple, dc = com pour le répertoire actif)
+LDAPFieldTitle=Poste
+CacheByServerDesc=Par exemple, en utilisant la directive Apache "ExpiresByType image / gif A2592000"
+DefaultValuesDesc=Vous pouvez définir / forcer ici la valeur par défaut que vous voulez obtenir lorsque vous créez un nouvel enregistrement, et / ou défairez les filtres ou le tri lors de votre liste.
+DefaultSearchFilters=Filtres de recherche par défaut
+DefaultSortOrder=Ordres de tri par défaut
+DefaultFocus=Champs de mise au point par défaut
 MergePropalProductCard=Activez dans le produit/service, l'option onglet de fichiers attachés pour fusionner le produit PDF le document à la proposition PDF azur si le produit/service est dans la proposition
-ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
-UseSearchToSelectProductTooltip=Si vous avez un nombre important de produits (>100 000), vous pourrez améliorer les performances en positionnant la constante PRODUCT_DONOTSEARCH_ANYWHERE à 1 dans Configuration->Divers. La recherche sera alors limité au début des chaines.
-UseSearchToSelectProduct=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)
-SetDefaultBarcodeTypeProducts=Type de code-barre utilisé par défaut pour les produits
-SetDefaultBarcodeTypeThirdParties=Type de code-barre utilisé par défaut pour les tiers
+ViewProductDescInThirdpartyLanguageAbility=Visualisation des descriptions de produits dans la langue de tiers
+UseSearchToSelectProduct=Attendez que vous appuyez sur une touche avant de charger le contenu de la liste des combo du produit (cela peut augmenter les performances si vous avez un grand nombre de produits, mais cela est moins pratique)
 UseUnits=Définir une unité de mesure pour la quantité lors de la commande, l'édition de la proposition ou les lignes de facture
-ProductCodeChecker= Modèles de numérotation des produits / services
-ProductOtherConf= Paramètres des produits / services
 IsNotADir=n'est pas un répertoire
-##### Syslog #####
-SyslogSetup=Configuration du module Journaux et traces
-SyslogOutput=Sortie des journaux
-SyslogFacility=Facility
-SyslogLevel=Niveau
-SyslogFilename=Nom et chemin du fichier
-YouCanUseDOL_DATA_ROOT=Vous pouvez utiliser DOL_DATA_ROOT/dolibarr.log pour un journal dans le répertoire "documents" de Dolibarr. Vous pouvez néanmoins définir un chemin différent pour stocker ce fichier.
-ErrorUnknownSyslogConstant=La constante %s n'est pas une constante syslog connue
-OnlyWindowsLOG_USER=Windows ne prend en charge que LOG_USER
-##### Donations #####
-DonationsSetup=Configuration du module Dons
-DonationsReceiptModel=Modèles de reçu de dons
-##### Barcode #####
-BarcodeSetup=Configuration des codes-barres
-PaperFormatModule=Modules format d'impression
-BarcodeEncodeModule=Modules d'encodage des codes-barres
-CodeBarGenerator=Générateur graphique
-ChooseABarCode=Aucun générateur sélectionné
-FormatNotSupportedByGenerator=Format non géré par ce générateur
-BarcodeDescEAN8=code-barres de type EAN8
-BarcodeDescEAN13=code-barres de type EAN13
-BarcodeDescUPC=code-barres de type UPC
-BarcodeDescISBN=code-barres de type ISBN
-BarcodeDescC39=code-barres de type C39
-BarcodeDescC128=code-barres de type C128
 BarcodeDescDATAMATRIX=Codebarre de type Datamatrix
 BarcodeDescQRCODE=Codebarre de type QRcode
-GenbarcodeLocation=Outil de génération de code-barres en ligne de commande (utilisé par le moteur interne pour certains types de codes-barres). Doit être compatible avec "genbarcode".<br>Par exemple: /usr/local/bin/genbarcode
-BarcodeInternalEngine=Moteur interne
-BarCodeNumberManager=Gestionnaire pour la génération automatique de numéro de code-barre
-##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct debit payment orders
-##### ExternalRSS #####
-ExternalRSSSetup=Configuration des imports de flux RSS
-NewRSS=Syndication d'un nouveau flux RSS
-RSSUrl=URL RSS
-RSSUrlExample=Mon flux RSS
-##### Mailing #####
-MailingSetup=Configuration du module Emailing
-MailingEMailFrom=Email émetteur (From) des emails envoyés par Emailing
-MailingEMailError=Email retour (Errors-to) pour les réponses lors des envois par Emailing en erreur
-MailingDelay=Temps d'attente, en seconde, avant d'envoyer le prochain message
-##### Notification #####
-NotificationSetup=Configuration du module notification par email
-NotificationEMailFrom=Adresse émettrice (From) des emails envoyés lors des notifications
-FixedEmailTarget=Email fixe cible destinataires
-##### Sendings #####
-SendingsSetup=Configuration du module Expédition/Livraison
-SendingsReceiptModel=Modèles de bordereau d'expédition
-SendingsNumberingModules=Modèles de numérotation des expéditions
+WithdrawalsSetup=Configuration du module Ordres de paiement de débit direct
 SendingsAbility=Fiches d'expédition de soutien pour les livraisons aux clients
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
-FreeLegalTextOnShippings=Mention complémentaire sur les expéditions
-##### Deliveries #####
-DeliveryOrderNumberingModules=Modèle de numérotation des bons de réception client
-DeliveryOrderModel=Modèle de bon de réception client
-DeliveriesOrderAbility=Prise en charge des bons de réception client
-FreeLegalTextOnDeliveryReceipts=Mention complémentaire sur les bons de réception
-##### FCKeditor #####
-AdvancedEditor=Editeur avancé
-ActivateFCKeditor=Activer l'éditeur avancé pour :
-FCKeditorForCompany=Création/édition WYSIWIG de la description et note des éléments (autre que produits/services)
-FCKeditorForProduct=Création/édition WYSIWIG de la description et note des produits/services
-FCKeditorForProductDetails=Création/édition WYSIWIG des lignes détails produits sur tous les éléments (commandes, propales, factures, etc...). <font class="warning">Attention: L'utilisation pour ce cas est fortement déconseillée car peut poser des problèmes dans la gestion de caractères et mise en page des fichiers PDF générés.</font>
-FCKeditorForMailing= Création/édition WYSIWIG des emailings (Outils->Emailings)
-FCKeditorForUserSignature=Création/édition WYSIWIG de la signature des utilisateurs
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
-##### OSCommerce 1 #####
-OSCommerceErrorConnectOkButWrongDatabase=La connexion a réussi mais la base ne semble pas être une base OSCommerce (clé %s  non trouvée dans la table %s).
-OSCommerceTestOk=La connexion au serveur '%s' sur la base '%s' par l'utilisateur '%s' a réussi.
-OSCommerceTestKo1=La connexion au serveur '%s' a réussi mais la base '%s' n'a pu être atteinte.
-OSCommerceTestKo2=La connexion au serveur '%s' par l'utilisateur '%s' à échoué.
-##### Stock #####
-StockSetup=Configuration du module Entrepôt
-IfYouUsePointOfSaleCheckModule=Si vous utilisez un module Point de Vente (module POS fourni par défaut ou un autre module externe), cette configuration peut être ignoré par votre module point de vente. La plupart de modules Point de Vente sont conçus pour créer immédiatement une facture et de réduire les stocks par défaut quelles que soient les options ici. Donc, si vous avez besoin ou non d'avoir une diminution du stock lors de l'enregistrement d'une vente dans votre Point de Vente, vérifiez également la configuration de votre module POS.
-##### Menu #####
-MenuDeleted=Menu supprimé
-Menus=Menus
-TreeMenuPersonalized=Menus personnalisés
-NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
-NewMenu=Nouveau menu
-Menu=Sélection des menus
-MenuHandler=Gestionnaire de menu
-MenuModule=Module source
-HideUnauthorizedMenu= Masquer les menus non autorisés aussi pour les utilisateurs internes (sinon juste grisés)
-DetailId=Identifiant du menu
-DetailMenuHandler=Nom du gestionnaire menu dans lequel faire apparaitre le nouveau menu
-DetailMenuModule=Nom du module si l'entrée menu est issue d'un module
-DetailType=Type de menu (top ou left)
-DetailTitre=Libellé du menu ou code libellé à traduire
-DetailUrl=URL vers laquelle le menu pointe (Lien URL absolu ou lien externe avec http://)
-DetailEnabled=Condition d'affichage ou non
-DetailRight=Condition d'affichage plein ou grisé
-DetailLangs=Fichier .lang pour la traduction du code libellé
-DetailUser=Interne / Externe / Tous
-Target=Cible
-DetailTarget=Cible liens menu (_blank pour ouvrir une nouvelle fenêtre)
-DetailLevel=Niveau (-1:menu haut, 0:entête menu, >0 menu et sous menu)
-ModifMenu=Modification du menu
-DeleteMenu=Effacer entrée de menu
-ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
+NoNeedForDeliveryReceipts=Dans la plupart des cas, les feuilles d'expédition sont utilisées à la fois comme feuilles pour les livraisons clients (liste des produits à envoyer) et les feuilles reçues et signées par le client. Donc, les reçus des livraisons de produits sont une fonctionnalité en double et sont rarement activés.
+FCKeditorForMail=Création / édition WYSIWIG pour tous les courriers (sauf Outils-> eMailing)
+NotTopTreeMenuPersonalized=Menus personnalisés non liés à une entrée de menu supérieure
+ConfirmDeleteMenu=Êtes-vous sûr de vouloir supprimer l'entrée du menu <b>%s</b>?
 FailedToInitializeMenu=Impossible d'initialiser le menu
-##### Tax #####
 TaxSetup=Configuration du module Taxes, charges sociales et dividendes
 OptionVatMode=TPS/TVH due
-OptionVATDefault=Standard
-OptionVATDebitOption=Option services sur Débit
 OptionVatDefaultDesc=TPS/TVH sur encaissement, l'exigibilité de la TPS/TVH est:<br>- sur livraison pour les biens (en pratique on utilise la date de facturation)<br>- sur paiement pour les services
 OptionVatDebitOptionDesc=TPS/TVH sur débit, l'exigibilité de la TPS/TVH est:<br>- sur livraison pour les biens (en pratique on utilise la date de facturation)<br>- sur facturation (débit) pour les services
 SummaryOfVatExigibilityUsedByDefault=Moment d'exigibilité par défaut de la TPS/TVH pour l'option choisie:
-OnDelivery=Sur livraison
-OnPayment=Sur paiement
-OnInvoice=Sur facture
-SupposedToBePaymentDate=Date de paiement utilisée
-SupposedToBeInvoiceDate=Date de facture utilisée
-Buy=Achat
-Sell=Vente
-InvoiceDateUsed=Date de facture utilisée
-YourCompanyDoesNotUseVAT=Votre institution est configurée comme non assujettie à la TPS/TVH (Accueil - Configuration - Société/Institution), aussi il n'y a aucune option sur la gestion TPS/TVH à paramétrer.
-AccountancyCode=Code comptable
-AccountancyCodeSell=Code comptable vente
-AccountancyCodeBuy=Code comptable achat
-##### Agenda #####
-AgendaSetup=Configuration du module actions et agenda
-PasswordTogetVCalExport=Clé pour autoriser le lien d'exportation
-PastDelayVCalExport=Ne pas exporter les événements de plus de
+YourCompanyDoesNotUseVAT=Votre entreprise a été définie pour ne pas utiliser la TVA (Home - Setup - Company / Organization), donc il n'y a pas de TVA pour configurer.
 AGENDA_USE_EVENT_TYPE=Utilisez les types des évenements (administrable dans Configuration -> Dictionnaires -> Liste des types d'évenements de l'agenda)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Réglez automatiquement cette valeur par défaut pour le type d'événement dans en événement de lors de la création »
-AGENDA_DEFAULT_FILTER_TYPE=Régler automatiquement ce type d'événement dans le filtre de recherche de la vue agenda
-AGENDA_DEFAULT_FILTER_STATUS=Régler automatiquement le statut d'événement dans le filtre de recherche de la vue agenda
-AGENDA_DEFAULT_VIEW=Quel onglet voulez-vous voir ouvrir par défaut quand on choisit le menu Agenda
-AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
-AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### Clicktodial #####
-ClickToDialSetup=Configuration du module Click To Dial
-ClickToDialUrlDesc=URL appelée lors d'un clic sur le pictogramme téléphone. Dans l'URL, vous pouvez utiliser les balises<br><b>__PHONETO__</b> qui sera remplacée par le téléphone de l'appelé<br><b>__PHONEFROM__</b> qui sera remplacée par le téléphone de l'appelant (le votre, défini sur votre fiche utilisateur)<br><b>__LOGIN__</b> qui sera remplacée par votre identifiant clicktodial (défini sur votre fiche utilisateur)<br><b>__PASS__</b> qui sera remplacée par votre mot de passe clicktodial (défini sur votre fiche utilisateur).
+AGENDA_NOTIFICATION=Activer la notification d'événement sur les navigateurs utilisateur lorsque la date d'événement est atteinte (chaque utilisateur peut refuser cela à partir de la question de confirmation du navigateur)
+AGENDA_NOTIFICATION_SOUND=Activer la notification sonore
+AGENDA_SHOW_LINKED_OBJECT=Afficher l'objet lié dans la vue d'agenda
+ClickToDialUrlDesc=Url appelle quand un clic sur le picto du téléphone est terminé. Dans l'URL, vous pouvez utiliser des tags sur <b> __ PHONETO __ </ b> qui sera remplacé par le numéro de téléphone de la personne à appeler <b> __ PHONEFROM __ </ b> qui sera remplacé par le numéro de téléphone de l'appel Personne (votre) <br> <b> __ LOGIN __ </ b> qui sera remplacé par login clicktodial (défini sur la carte utilisateur) <br> <b> __ PASS __ </ b> qui sera remplacé par le mot de passe clicktodial (défini sur l'utilisateur carte).
 ClickToDialDesc=Ce module permet de faire des numéros de téléphone cliquable . Un clic sur cette icône fera appel à rendre votre téléphone pour appeler le numéro de téléphone . Cela peut être utilisé pour appeler un système de Dolibarr du centre d'appels qui peut appeler le numéro de téléphone sur un système SIP par exemple.
 ClickToDialUseTelLink=Utilisez juste un lien "tel: " sur les numéros de téléphone
 ClickToDialUseTelLinkDesc=Utilisez cette méthode si vos utilisateurs ont un softphone ou une interface de logiciel installé sur un même ordinateur que le navigateur , et a appelé lorsque vous cliquez sur un lien dans votre navigateur qui commencent par "tel: " . Si vous avez besoin d'une solution de serveur complet (pas besoin d'installation locale du logiciel ) , vous devez définir ce "Non" et remplir champ suivant.
-##### Point Of Sales (CashDesk) #####
-CashDesk=Caisse enregistreuse
-CashDeskSetup=Configuration du module Point de vente/caisse enregistreuse
-CashDeskThirdPartyForSell=Tiers générique à utiliser par défaut pour les ventes
-CashDeskBankAccountForSell=Compte par défaut à utiliser pour l'encaissement en liquide
-CashDeskBankAccountForCheque= Compte par défaut à utiliser pour l'encaissement en chèque
-CashDeskBankAccountForCB= Compte par défaut à utiliser pour l'encaissement en carte de crédit
-CashDeskDoNotDecreaseStock=Désactiver la réduction de stocks systématique lorsque une vente se fait à partir du Point de Vente (si «non», la réduction du stock est faite pour chaque vente faite depuis le POS, quelquesoit l'option de changement de stock définit dans le module Stock).
-CashDeskIdWareHouse=Forcer et restreindre l'emplacement/entrepôt à utiliser pour la réduction de stock
-StockDecreaseForPointOfSaleDisabled=Réduction de stock lors de l'utilisation du Point de Vente désactivée
-StockDecreaseForPointOfSaleDisabledbyBatch=La décrémentation de stock depuis ce module Point de Vente n'est pas encore compatible avec la gestion des numéros de lots/série.
-CashDeskYouDidNotDisableStockDecease=Vous n'avez pas désactivé la réduction de stocks lors de la réalisation d'une vente depuis le Point de Vente. Aussi, un entrepôt/emplacement est nécessaire.
-##### Bookmark #####
-BookmarkSetup=Configuration du module Marque-pages
-BookmarkDesc=Ce module vous permet de gérer des liens et raccourcis. Il permet aussi d'ajouter n'importe quelle page de Dolibarr ou lien web dans le menu d'accès rapide sur la gauche.
-NbOfBoomarkToShow=Nombre maximum de marques-pages à afficher dans le menu
-##### WebServices #####
-WebServicesSetup=Configuration du module Webservices
-WebServicesDesc=En activant ce module, Dolibarr devient aussi serveur de web services offrant des web services divers.
-WSDLCanBeDownloadedHere=Les descripteurs WSDL des services fournis peuvent être récupéré ici
-EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
-##### API ####
+EndPointIs=Les clients SOAP doivent envoyer leurs demandes au point d'extrémité Dolibarr disponible à l'URL
 ApiSetup=Configuration du module API
 ApiDesc=En activant ce module , Dolibarr devenir un serveur REST pour fournir des services Web divers .
-ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+ApiProductionMode=Activer le mode de production (cela active l'utilisation d'un cache pour la gestion des services)
+ApiExporerIs=Vous pouvez explorer et tester les API à l'URL
 OnlyActiveElementsAreExposed=Seuls les éléments de modules activés sont exposés
 ApiKey=Clé API
-WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
-##### Bank #####
-BankSetupModule=Configuration du module Banque
-FreeLegalTextOnChequeReceipts=Mention complémentaire sur les bordereaux de remises de chèques
-BankOrderShow=Ordre d'affichage des informations bancaires (pour les pays les détaillant)
-BankOrderGlobal=Général
-BankOrderGlobalDesc=Ordre d'affichage général
-BankOrderES=Espagnol
-BankOrderESDesc=Ordre d'affichage Espagnol
-ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
-##### Multicompany #####
-MultiCompanySetup=Configuration du module Multi-société
-##### Suppliers #####
-SuppliersSetup=Configuration du module Fournisseurs
-SuppliersCommandModel=Modèle de commandes fournisseur complet (logo…)
-SuppliersInvoiceModel=Modèle de factures fournisseur complet (logo…)
-SuppliersInvoiceNumberingModel=Modèles de numérotation des factures fournisseur
-IfSetToYesDontForgetPermission=Si positionné sur Oui, n'oubliez pas de donner les permissions aux groupes ou utilisateurs qui auront le droit de cette action.
-##### GeoIPMaxmind #####
-GeoIPMaxmindSetup=Configuration du module GeoIP Maxmind
-PathToGeoIPMaxmindCountryDataFile=Chemin du fichier Maxmind contenant les conversions IP->Pays.<br>Exemples<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
-NoteOnPathLocation=Notez que ce fichier doit être dans un répertoire accessible à votre PHP (Vérifiez le paramètre open_basedir de votre PHP et les permissions du fichier/répertoires).
-YouCanDownloadFreeDatFileTo=Vous pouvez télécharger une <b>version démo gratuite</b> de la base Maxmind à l'adresse %s.
-YouCanDownloadAdvancedDatFileTo=Vous pouvez aussi télécharger une <b>version plus complète avec mise à jours</b> de la base Maxmind à l'adresse %s.
-TestGeoIPResult=Test de conversion IP -> Pays
-##### Projects #####
-ProjectsNumberingModules=Modèles de numérotation des références projets
-ProjectsSetup=Configuration du module Projets
-ProjectsModelModule=Modèles de document de rapport projets
-TasksNumberingModules=Modèles de numérotation des références tâches
-TaskModelModule=Modèles de document de rapport tâches
-UseSearchToSelectProject=Utilisez un champ avec auto-complétion pour choisir les projets (plutôt qu'une liste déroulante).
-##### ECM (GED) #####
-##### Fiscal Year #####
-AccountingPeriods=Accounting periods
-AccountingPeriodCard=Accounting period
-NewFiscalYear=New accounting period
-OpenFiscalYear=Open accounting period
-CloseFiscalYear=Close accounting period
-DeleteFiscalYear=Delete accounting period
-ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
-ShowFiscalYear=Show accounting period
-AlwaysEditable=Peut toujours être édité
-MAIN_APPLICATION_TITLE=Forcer la valeur visible du nom de l'application (attention : positionner ici son propre nom rendra inopérante la fonction de remplissage automatique de l'identifiant lorsque vous utilisez l'application mobile DoliDroid)
-NbMajMin=Nombre minimal de caractères majuscules
-NbNumMin=Nombre minimal de caractères numériques
-NbSpeMin=Nombre minimal de caractères spéciaux
-NbIteConsecutive=Nombre maximal de répétition des mêmes caractères
-NoAmbiCaracAutoGeneration=Ne pas utiliser des caractères ambigus ("1","l","i","|","0","O") pour la génération automatique
+WarningAPIExplorerDisabled=L'explorateur API a été désactivé. L'API Explorer n'est pas nécessaire pour fournir des services API. C'est un outil permettant aux développeurs de trouver / tester des API REST. Si vous avez besoin de cet outil, installez le module API REST pour l'activer.
+ChequeReceiptsNumberingModule=Vérifier le module de numérotation des reçus
+AccountingPeriods=Périodes de comptabilité
+AccountingPeriodCard=Période de comptabilité
+NewFiscalYear=Nouvelle période comptable
+OpenFiscalYear=Période comptable ouverte
+CloseFiscalYear=Période comptable rapprochée
+DeleteFiscalYear=Supprimer la période comptable
+ConfirmDeleteFiscalYear=Êtes-vous sûr de supprimer cette période comptable?
+ShowFiscalYear=Afficher la période comptable
 SalariesSetup=Configuration du module salariés
-SortOrder=Ordre de tri
-Format=Format
-TypePaymentDesc=0:Type de paiement client, 1:Type de paiement fournisseur, 2:Paiement de type client et fournisseur
-IncludePath=Chemin Include (défini dans la variable %s)
-ExpenseReportsSetup=Configuration du module Notes de frais
-TemplatePDFExpenseReports=Modèles de documents pour générer les document de Notes de frais
-NoModueToManageStockIncrease=Aucun module capable d'assurer l'augmentation de stock en automatique a été activé. La réduction de stock se fera donc uniquement sur mise à jour manuelle.
-YouMayFindNotificationsFeaturesIntoModuleNotification=Vous pouvez trouver d'autres options pour la notification par Email en activant et configurant le module "Notification".
-ListOfNotificationsPerUser=List of notifications per user*
-ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
-ListOfFixedNotifications=Liste des notifications emails fixes
-GoOntoUserCardToAddMore=Go on 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 contacts/addresses
-Threshold=Seuil
-BackupDumpWizard=Assistant de génération d'un fichier de sauvegarde de la base de données
-SomethingMakeInstallFromWebNotPossible=L'installation de module externe est impossible depuis l'interface web pour la raison suivante :
-SomethingMakeInstallFromWebNotPossible2=Pour cette raison, le processus de mise à jour décrit ici est uniquement une série de manipulations que seul un utilisateur ayant des droits privilégiés peut faire
-InstallModuleFromWebHasBeenDisabledByFile=L'installation de module externe depuis l'application a été désactivé par l'administrator. Vous devez lui demander de supprimer le fichier <strong>%s</strong> pour permettre cette fonctionnalité.
-ConfFileMuseContainCustom=Installing 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>
+ListOfNotificationsPerUser=Liste des notifications par utilisateur *
+ListOfNotificationsPerUserOrContact=Liste des notifications par utilisateur * ou par contact **
+GoOntoUserCardToAddMore=Allez sur l'onglet "Notifications" d'un utilisateur pour ajouter ou supprimer des notifications pour les utilisateurs
+GoOntoContactCardToAddMore=Accédez à l'onglet "Notifications" d'un tiers pour ajouter ou supprimer des notifications de contacts / adresses
+ConfFileMustContainCustom=L'installation ou la construction d'un module externe à partir de l'application doit sauvegarder les fichiers du module dans le répertoire <strong>%s</strong>. Pour que ce répertoire soit traité par Dolibarr, vous devez configurer votre <strong> conf / conf.php </strong> pour ajouter les 2 lignes de directive: <br><strong> $ dolibarr_main_url_root_alt = '/ custom'; </strong><br><strong> $ dolibarr_main_document_root_alt = '%s / custom'; </strong>
 HighlightLinesOnMouseHover=Mettez en surbrillance les lignes de table lorsque déplacement de la souris passe au-dessus
 HighlightLinesColor=Mettez en surbrillance la couleur de la ligne lorsque la souris passe au-dessus (gardez vide pour ne pas mettre en évidence)
 TextTitleColor=Couleur de la page titre
-LinkColor=Couleur des liens
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
-NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
-BackgroundColor=Couleur de fond
+PressF5AfterChangingThis=Appuyez sur CTRL + F5 sur le clavier ou effacez votre cache de navigateur après avoir changé cette valeur pour l'avoir efficace
+NotSupportedByAllThemes=Will fonctionne avec des thèmes de base, peut ne pas être pris en charge par des thèmes externes
 TopMenuBackgroundColor=Couleur de fond du menu haut
-TopMenuDisableImages=Hide images in Top menu
+TopMenuDisableImages=Masquer les images dans le menu principal
 LeftMenuBackgroundColor=Couleur de fond gauche
 BackgroundTableTitleColor=Couleur de fond pour le tableau ligne de titre
 BackgroundTableLineOddColor=Couleur de fond pour les lignes impaires
@@ -1600,6 +350,7 @@ MinimumNoticePeriod=Période minimale de préavis  (Votre demande de congé doit
 NbAddedAutomatically=Nombre de jours ajoutés aux compteurs d'utilisateurs (automatiquement) chaque mois
 EnterAnyCode=Ce champ contient une référence pour identifier la ligne. Entrez une valeur de votre choix, mais sans caractères spéciaux.
 UnicodeCurrency=Saisissez ici entre accolades , liste de nombre d'octets qui représentent le symbole monétaire . Pour exemple : pour $ , entrez [ 36 ] - pour le Brésil réel R $ [ 82,36 ] - pour € , entrez [ 8364 ]
+ColorFormat=La couleur RVB est en format HEX, par exemple: FF0000
 PositionIntoComboList=Position de la ligne dans les listes déroulantes
 SellTaxRate=Taxes de vente
 RecuperableOnly=Oui à la TPS/TVH " Non Perçue Récupérable " dédié pour quelques état en France. Gardez la valeur à «Non» dans tous les autres cas.
@@ -1608,11 +359,10 @@ OpportunityPercent=Lorsque vous créez une opportunité , vous défini un montan
 TemplateForElement=Ce gabarit est dédié à cet élément
 TypeOfTemplate=Type de thèmes
 TemplateIsVisibleByOwnerOnly=Thème visible par propriétaire seulement
-FixTZ=Correction du fuseau horaire
 FillFixTZOnlyIfRequired=Exemple: +2 (remplir seulement si le problème est connu)
 ExpectedChecksum=Somme attendue
 CurrentChecksum=Somme actuel
-ForcedConstants=Required constant values
+ForcedConstants=Valeurs constantes requises
 MailToSendProposal=Envoyer la proposition au client
 MailToSendOrder=Envoyer la commande au client
 MailToSendInvoice=Envoyer la facture au client
@@ -1621,45 +371,43 @@ MailToSendIntervention=Envoyer l'intervention
 MailToSendSupplierRequestForQuotation=Pour envoyer demande de devis au fournisseur
 MailToSendSupplierOrder=Envoyer la commande fournisseur
 MailToSendSupplierInvoice=Envoyer la facture fournisseur
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
+MailToThirdparty=Pour envoyer un courriel à partir d'une page tiers
 ByDefaultInList=Afficher par défaut sur la liste vue
-YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Exemple de message que vous pouvez utiliser pour annoncer cette version majeure ( se sentir libre de l'utiliser sur vos sites web )
 TitleExampleForMaintenanceRelease=Exemple de message que vous pouvez utiliser pour annoncer cette version de maintenance ( se sentir libre de l'utiliser sur vos sites web )
-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.
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s est disponible. La version %s est une version majeure avec beaucoup de nouvelles fonctionnalités pour les utilisateurs et les développeurs. Vous pouvez le télécharger à partir de la zone de téléchargement du https://www.dolibarr.org portal (sous-répertoire Stable versions). Vous pouvez lire <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> pour obtenir la liste complète des modifications.
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s est disponible. La version %s est une version de maintenance, donc elle contient uniquement des corrections de bogues. Nous vous recommandons tout le monde en utilisant une ancienne version pour passer à celle-ci. Comme toute version de maintenance, aucune nouvelle fonctionnalité, ni changement de structure de données n'est présent dans cette version. Vous pouvez le télécharger à partir de la zone de téléchargement du https://www.dolibarr.org portal (sous-répertoire Stable versions). Vous pouvez lire <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> pour obtenir la liste complète des modifications.
 MultiPriceRuleDesc=Lorsque l'option " Plusieurs niveaux de prix par produit / service " est activée, vous pouvez définir des prix différents (un par niveau de prix ) pour chaque produit . Pour gagner du temps , vous pouvez entrer ici la règle pour avoir le prix pour chaque niveau autocalculated en fonction du prix du premier niveau , de sorte que vous devrez entrer seulement le prix pour le premier niveau sur chaque produit . Cette page est ici pour gagner du temps et peut être utile que si vos prix pour chaque leve sont liés à premier niveau . Vous pouvez ignorer cette page dans la plupart des cas .
 ModelModulesProduct=Modèles de documents produits
 ToGenerateCodeDefineAutomaticRuleFirst=Pour être en mesure de générer automatiquement des codes , vous devez d'abord définir un gestionnaire à l'auto de définir le numéro de code à barres .
 SeeSubstitutionVars=Voir la note * pour la liste des variables de substitution possibles
-AllPublishers=All publishers
-UnknownPublishers=Unknown publishers
-AddRemoveTabs=Add or remove tabs
-AddDictionaries=Add dictionaries
-AddBoxes=Add widgets
-AddSheduledJobs=Add scheduled jobs
-AddHooks=Add hooks
-AddTriggers=Add triggers
-AddMenus=Add menus
-AddPermissions=Add permissions
-AddExportProfiles=Add export profiles
-AddImportProfiles=Add import profiles
-AddOtherPagesOrServices=Add other pages or services
-AddModels=Add document or numbering templates
-AddSubstitutions=Add keys substitutions
-DetectionNotPossible=Detection not possible
-UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved on 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 correclty. 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 inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <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
-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
-TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
-##### Resource ####
-ResourceSetup=Configuration du module Resource
-UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+AddRemoveTabs=Ajouter ou supprimer des onglets
+AddDictionaries=Ajouter des dictionnaires
+AddBoxes=Ajouter des widgets
+AddSheduledJobs=Ajouter des tâches planifiées
+AddHooks=Ajouter des crochets
+AddTriggers=Ajouter des déclencheurs
+AddMenus=Ajouter des menus
+AddPermissions=Ajouter des autorisations
+AddExportProfiles=Ajouter des profils d'exportation
+AddImportProfiles=Ajouter des profils d'importation
+AddOtherPagesOrServices=Ajouter d'autres pages ou services
+AddModels=Ajouter un document ou des modèles de numérotation
+AddSubstitutions=Ajouter des substitutions de clés
+DetectionNotPossible=La détection n'est pas possible
+UrlToGetKeyToUseAPIs=Url pour obtenir un jeton pour utiliser l'API (une fois que le jeton a été reçu, il est enregistré sur la table des utilisateurs de la base de données et doit être fourni sur chaque appel d'API)
+ListOfAvailableAPIs=Liste des API disponibles
+activateModuleDependNotSatisfied=Le module "%s" dépend du module "%s" qui manque, donc le module "%1$s" peut ne pas fonctionner correctement. Veuillez installer le module "%2$s" ou désactiver le module "%1$s" si vous souhaitez être à l'abri de toute surprise
+CommandIsNotInsideAllowedCommands=La commande que vous essayez d'exécuter n'est pas dans la liste des commandes autorisées définies dans le paramètre <strong> $ dolibarr_main_restrict_os_commands </ strong> dans le fichier <strong> conf.php </ strong>.
+LandingPage=Page d'atterrissage
+SamePriceAlsoForSharedCompanies=Si vous utilisez un module multicompanique, avec le choix "Prix unique", le prix sera également le même pour toutes les entreprises si les produits sont partagés entre les environnements
+ModuleEnabledAdminMustCheckRights=Le module a été activé. Les autorisations pour les modules activés ont été données uniquement aux utilisateurs administratifs. Vous devrez peut-être accorder des autorisations aux autres utilisateurs ou groupes manuellement si nécessaire.
+UserHasNoPermissions=Cet utilisateur n'a pas d'autorisation définie
+TypeCdr=Utilisez "Aucun" si la date du terme de paiement est la date de facture plus un delta en jours (delta est le champ "Nb de jours") <br> Utilisez "Fin de mois", si, après le delta, la date doit être augmentée Pour atteindre la fin du mois (+ un «décalage» optionnel en jours) <br> Utilisez "Current / Next" pour que la date de terme de paiement soit le premier Nième du mois (N est stocké dans le champ "Nb de jours")
+BaseCurrency=Monnaie de référence de la société (entrer dans la configuration de l'entreprise pour modifier cela)
+WarningNoteModuleInvoiceForFrenchLaw=Ce module %s est conforme aux lois françaises (Loi Finance 2016).
+WarningNoteModulePOSForFrenchLaw=Ce module %s est conforme aux lois françaises (Loi Finance 2016) car le module Les journaux non réversibles est automatiquement activé.
+WarningInstallationMayBecomeNotCompliantWithLaw=Vous essayez d'installer le module %s qui est un module externe. L'activation d'un module externe signifie que vous faites confiance à l'éditeur du module et que vous êtes sûr que ce module ne modifie pas négativement le comportement de votre application et est conforme aux lois de votre pays (%s). Si le module comporte une fonctionnalité non juridique, vous devenez responsable de l'utilisation d'un logiciel non juridique.
+UseSearchToSelectResource=Utilisez un formulaire de recherche pour choisir une ressource (plutôt qu'une liste déroulante).
+DisabledResourceLinkUser=Lien de ressource désactivé à l'utilisateur
+DisabledResourceLinkContact=Lien de ressource handicapée au contact
diff --git a/htdocs/langs/fr_CA/agenda.lang b/htdocs/langs/fr_CA/agenda.lang
index 0c22869d7ca..ee94b6f276a 100644
--- a/htdocs/langs/fr_CA/agenda.lang
+++ b/htdocs/langs/fr_CA/agenda.lang
@@ -1,5 +1,17 @@
 # Dolibarr language file - Source file is en_US - agenda
 ToUserOfGroup=À n'importe quel utilisateur du groupe
+AgendaAutoActionDesc=Définissez ici les événements pour lesquels vous souhaitez que Dolibarr crée automatiquement un événement dans l'agenda. Si rien n'est vérifié, seules les actions manuelles seront incluses dans l'agenda et visibles dans l'agenda. Le suivi automatique des actions commerciales réalisées sur les objets (validation, changement d'état) ne sera pas sauvegardé.
+NewCompanyToDolibarr=Le tiers %s a été créé
+PropalClassifiedBilledInDolibarr=Proposition %s classée facturée
+InvoicePaidInDolibarr=La facture %s a changé en payé
+MemberValidatedInDolibarr=Membre %s validé
+MemberResiliatedInDolibarr=Membre %s terminé
+MemberDeletedInDolibarr=Membre %s supprimé
+MemberSubscriptionAddedInDolibarr=L'abonnement au membre %s a ajouté
+ShipmentClassifyClosedInDolibarr=Expédition %s classé facturé
+ShipmentUnClassifyCloseddInDolibarr=Expédition %s classée rouverte
+ShipmentDeletedInDolibarr=Envoi %s supprimé
+OrderCreatedInDolibarr=L'ordre %s a été créé
 OrderDeliveredInDolibarr=Commande %s classée Délivrée
 ShippingSentByEMail=Bon expédition %s envoyé par EMail
 InterventionSentByEMail=Intervention %s envoyée par EMail
@@ -12,5 +24,6 @@ AgendaExtNb=Calendrier no %s
 VisibleTimeRange=Plage d'heures visibles
 VisibleDaysRange=Plage de jours visibles
 CloneAction=Dupliquer événement
+ConfirmCloneEvent=Êtes-vous sûr de vouloir cloner l'événement <b>%s</b>?
 RepeatEvent=Répéter événement
 DateStartPlusOne=Date de début +1 heure
diff --git a/htdocs/langs/fr_CA/banks.lang b/htdocs/langs/fr_CA/banks.lang
index 2ff7e2dd8c5..09812367f1f 100644
--- a/htdocs/langs/fr_CA/banks.lang
+++ b/htdocs/langs/fr_CA/banks.lang
@@ -1,11 +1,52 @@
 # Dolibarr language file - Source file is en_US - banks
+SwiftValid=BIC / SWIFT valide
+SwiftVNotalid=BIC / SWIFT non valide
+IbanValid=BAN valide
+IbanNotValid=BAN non valide
+ConfirmDeleteAccount=Êtes-vous sûr de vouloir supprimer ce compte?
+BankTransactionByCategories=Entrées bancaires par catégories
+BankTransactionForCategory=Entrées bancaires pour la catégorie <b>%s</b>
+RemoveFromRubriqueConfirm=Êtes-vous sûr de vouloir supprimer le lien entre l'entrée et la catégorie?
+ListBankTransactions=Liste des entrées bancaires
+BankTransactions=Entrées bancaires
+ListTransactions=Entrées de la liste
+ListTransactionsByCategory=Liste des entrées / catégorie
+TransactionsToConciliate=Entrées à réconcilier
+ReconciliationLate=Réconciliation tardive
+OnlyOpenedAccount=Uniquement comptes ouverts
+LinkedToAConciliatedTransaction=Lié à une entrée conciliée
+StatusAccountOpened=Ouverte
+AddBankRecord=Ajouter une entrée
+AddBankRecordLong=Ajouter une entrée manuellement
+BankLineConciliated=Entrée rapprochée
+Reconciled=Réconcilié
+NotReconciled=Non réconcilié
 SocialContributionPayment=Règlement charge sociale
+MenuBankInternalTransfer=Transfert interne
+TransferDesc=Transfert d'un compte à un autre, Dolibarr écrira deux enregistrements (un compte débiteur dans un compte source et un crédit dans un compte cible. Le même montant (sauf le signe), l'étiquette et la date seront utilisés pour cette transaction)
+ValidateCheckReceipt=Validez cette facture?
+ConfirmValidateCheckReceipt=Êtes-vous sûr de vouloir valider cette facture, aucun changement ne sera possible une fois que cela sera fait?
+DeleteCheckReceipt=Supprimer ce reçu de facturation?
+ConfirmDeleteCheckReceipt=Êtes-vous sûr de vouloir supprimer ce justificatif?
+BankChecksToReceipt=Chèques en attente de dépôt
+DeleteTransaction=Supprimer l'entrée
+ConfirmDeleteTransaction=Êtes-vous sûr de vouloir supprimer cette entrée?
+ThisWillAlsoDeleteBankRecord=Cela supprimera également l'entrée bancaire générée
+PlannedTransactions=Entrées prévues
+ExportDataset_banque_1=Entrées bancaires et relevé de compte
+PaymentNumberUpdateSucceeded=Numéro de paiement mis à jour avec succès
+BankTransactionLine=Entrée de la banque
+ToConciliate=Réconcilier?
 DefaultRIB=RIB par défaut
 AllRIB=Tous les RIB
 LabelRIB=Nom du RIB
 NoBANRecord=Aucun RIB enregistré
 DeleteARib=Supprimé RIB enregistré
+ConfirmDeleteRib=Êtes-vous sûr de vouloir supprimer cet enregistrement BAN?
 RejectCheck=Chèque renvoyé
+ConfirmRejectCheck=Êtes-vous sûr de vouloir marquer ce contrôle comme rejeté?
 RejectCheckDate=Date à laquelle le chèque a été retourné
 CheckRejected=Chèque renvoyé
 CheckRejectedAndInvoicesReopened=Chèques retournés et factures rouvertes
+DocumentModelSepaMandate=Modèle de mandat SEPA. Utile pour les pays européens en CEE seulement.
+DocumentModelBan=Modèle pour imprimer une page avec des informations BAN.
diff --git a/htdocs/langs/fr_CA/bills.lang b/htdocs/langs/fr_CA/bills.lang
index b3a0f4950dd..a26912adf0d 100644
--- a/htdocs/langs/fr_CA/bills.lang
+++ b/htdocs/langs/fr_CA/bills.lang
@@ -1,49 +1,127 @@
 # Dolibarr language file - Source file is en_US - bills
+BillsCustomersUnpaidForCompany=Les factures des clients non payées pour %s
+BillsSuppliersUnpaidForCompany=Factures fournisseurs non payées pour %s
+DisabledBecauseNotErasable=Désactivé car il ne peut pas être effacé
+InvoiceDepositDesc=Ce type de facture se fait lorsque l'acompte a été reçu.
+InvoiceHasAvoir=Était une source d'une ou de plusieurs notes de crédit
 PredefinedInvoices=Facture prédéfinie
 paymentInInvoiceCurrency=en factures de devises
+ConfirmDeletePayment=Êtes-vous sûr de vouloir supprimer ce paiement?
+ConfirmConvertToReduc=Voulez-vous convertir ce %s en une réduction absolue? <br> Le montant sera ainsi enregistré parmi toutes les réductions et pourrait être utilisé comme réduction pour une facture actuelle ou future pour ce client.
+PaymentTypeDC=Carte de débit / crédit
+PaymentTypePP=Pay Pal
 LabelPaymentMode=Mode de règlement (étiquette)
 CreateCreditNote=Créer avoir
+DoPayment=Entrez le paiement
+DoPaymentBack=Saisissez le remboursement
+ConvertExcessReceivedToReduc=Convertir l'excédent reçu en réduction future
 StatusOfGeneratedInvoices=État des factures générées
+BillStatusPaidBackOrConverted=Remboursement de la note de crédit ou converti en réduction
+BillShortStatusPaidBackOrConverted=Remboursement ou conversion
+RecurringInvoiceTemplate=Modèle / facture récurrente
 NoQualifiedRecurringInvoiceTemplateFound=Aucune facture de modèle récurrent qualifié pour la génération.
 FoundXQualifiedRecurringInvoiceTemplate=Modèles de factures récurrentes qualifiées trouvées %s pour la génération
 NotARecurringInvoiceTemplate=Pas un modèle de facture récurrente
+LastBills=%s dernières factures
+LastCustomersBills=%s dernières factures client
+LastSuppliersBills=%s dernières factures fournisseurs
+CustomersDraftInvoices=Factures de tirage des clients
+SuppliersDraftInvoices=Les factures du fournisseur
+ConfirmDeleteBill=Êtes-vous sûr de vouloir supprimer cette facture?
+ConfirmValidateBill=Êtes-vous sûr de vouloir valider cette facture avec référence <b>%s</b>?
+ConfirmUnvalidateBill=Êtes-vous sûr de vouloir modifier la facture <b>%s</b> pour rédiger un état?
+ConfirmClassifyPaidBill=Êtes-vous sûr de vouloir modifier la facture <b>%s</b>au statut payé?
+ConfirmCancelBill=Êtes-vous sûr de vouloir annuler la facture <b>%s</b>?
+ConfirmCancelBillQuestion=Pourquoi souhaitez-vous classer cette facture «abandonnée»?
+ConfirmClassifyPaidPartially=Êtes-vous sûr de vouloir modifier la facture <b>%s</b> au statut payé?
+ConfirmClassifyPaidPartiallyQuestion=Cette facture n'a pas été entièrement payée. Quelles sont les raisons pour lesquelles vous fermez cette facture?
+ConfirmCustomerPayment=Confirmez-vous cette entrée de paiement pour <b>%s</b> %s?
+ConfirmSupplierPayment=Confirmez-vous cette entrée de paiement pour <b>%s</b> %s?
+ConfirmValidatePayment=Êtes-vous sûr de vouloir valider ce paiement? Aucun changement ne peut être effectué une fois le paiement validé.
 AmountOfBillsByMonthHT=Montant de factures par mois (no tax.)
 ShowSocialContribution=Afficher charge sociale
+ShowInvoiceDeposit=Afficher la facture de paiement
 ShowInvoiceSituation=Montrer facture de situation
+AlreadyPaidNoCreditNotesNoDeposits=Déjà payé (sans notes de crédit ni acomptes)
 EscompteOffered=Escompte (règlement avant échéance)
 EscompteOfferedShort=Remise
+StandingOrders=Ordres de débit direct
+StandingOrder=Ordre de débit direct
 RelatedRecurringCustomerInvoices=Connexes factures clients récurrents
+DatePointOfTax=Point d'imposition
 SetRevenuStamp=Configurer timbre fiscal
 AddGlobalDiscount=Créer ligne de déduction
+DiscountFromDeposit=Acompte versé par la facture %s
+DiscountFromExcessReceived=Paiements provenant de l'excédent reçu de la facture %s
+CreditNoteDepositUse=La facture doit être validée pour utiliser ce type de crédits
 IdSocialContribution=Id charge sociale
 PaymentRef=Règlement référence
+ConfirmCloneInvoice=Êtes-vous sûr de vouloir cloner cette facture <b>%s</b>?
+DescTaxAndDividendsArea=Cette zone présente un résumé de tous les paiements effectués pour les dépenses spéciales. Le seul enregistrement avec paiement pendant l'année fixe est inclus ici.
+ConfirmSplitDiscount=Êtes-vous sûr de vouloir diviser cette réduction de <b>%s</b> %s en 2 rabais inférieurs?
+ConfirmRemoveDiscount=Êtes-vous sûr de vouloir supprimer cette réduction?
 AmountPaymentDistributedOnInvoice=Montant du paiement distribué sur la facture
+PaymentOnDifferentThirdBills=Autoriser les paiements sur différentes factures de tiers, mais la même société mère
 PaymentNote=Note de règlement
 ListOfPreviousSituationInvoices=Liste des factures de situation antérieure
 ListOfNextSituationInvoices=Liste des prochaines factures de situation
 FrequencyPer_d=Chaque %s jours
 FrequencyPer_m=Chaque %s mois
 FrequencyPer_y=Chaque %s années
+toolTipFrequency=Exemples: <br /> <b> Set 7, Day </ b>: donnez une nouvelle facture tous les 7 jours <br /> <b> Set 3, Month </ b>: donnez une nouvelle facture tous les 3 mois
 NextDateToExecution=Date de la prochaine génération de facture
+DateLastGeneration=Date de dernière génération
 MaxPeriodNumber=Nombre maximal de génération de facture
 NbOfGenerationDone=Nombre de génération de facture déjà faite
+MaxGenerationReached=Nombre maximum de générations atteintes
 GeneratedFromRecurringInvoice=Généré à partir du modèle facture récurrente %s
+DateIsNotEnough=Date non encore atteinte
 InvoiceGeneratedFromTemplate=Facture %s générée depuis le modèle de facture %s récurrentes
+WarningInvoiceDateInFuture=Attention, la date de facturation est supérieure à la date actuelle
+PaymentConditionShortRECEP=Dû à la réception
+PaymentConditionRECEP=Dû à la réception
+PaymentConditionShort30DENDMONTH=30 jours de fin de mois
+PaymentCondition30DENDMONTH=Dans les 30 jours suivant la fin du mois
+PaymentConditionShort60DENDMONTH=60 jours de fin de mois
+PaymentCondition60DENDMONTH=Dans les 60 jours suivant la fin du mois
+PaymentConditionShortPT_ORDER=Commande
+PaymentConditionShort10DENDMONTH=10 jours de fin de mois
+PaymentCondition10DENDMONTH=Dans les 10 jours suivant la fin du mois
+PaymentConditionShort14DENDMONTH=14 jours de fin de mois
+PaymentCondition14DENDMONTH=Dans les 14 jours suivant la fin du mois
+PaymentTypePRE=Ordre de paiement de débit direct
+PaymentTypeShortPRE=Ordre de paiement de débit
+PaymentTypeTIP=CONSEIL (Documents contre paiement)
+PaymentTypeShortTIP=PAIEMENT Paiement
+PaymentTypeTRA=Procédure bancaire
 PaymentTypeShortTRA=Brouillon
 BankAccountNumberKey=Clé RIB
+Residence=Prélèvement automatique
 ChequeMaker=Émetteur du chèque/transfert
 PaymentByChequeOrderedTo=Règlement (tx incl.) par chèque à l'ordre de %s envoyé à
 PaymentByChequeOrderedToShort=Règlement (tx incl.) par chèque à l'ordre de
 DepositId=Identifiant de dépot
+ValidateInvoices=Valider les factures
 CantRemoveConciliatedPayment=Impossible de supprimer le paiement par voie de conciliation
-ClosePaidInvoicesAutomatically=Classer "Payées" touts les factures standards ou de remplacements ayant un reste à payer nul
-MarsNumRefModelDesc1=Numéro de retour avec le format %syymm-nnnn pour les factures standards %syymm-nnnn pour les factures de remplacement , %syymm-nnnn pour les factures de dépôt et %syymm-nnnn pour les notes de crédit où yy année, mm le mois et nnnn est une séquence sans casse et pas de retour à 0
+ClosePaidInvoicesAutomatically=Classifiez «Payé» toutes les factures standard, d'acompte ou de remplacement entièrement payées.
+ClosePaidContributionsAutomatically=Classer "Payé" toutes les contributions sociales ou fiscales entièrement payées.
+YouMustCreateInvoiceFromThird=Cette option n'est disponible que lors de la création de la facture à partir de l'onglet «client» de tiers
+YouMustCreateInvoiceFromSupplierThird=Cette option n'est disponible que lors de la création de la facture à partir de l'onglet «fournisseur» de tiers
+YouMustCreateStandardInvoiceFirstDesc=Vous devez d'abord créer une facture standard et la convertir en «modèle» pour créer une nouvelle facture modèle
+PDFCrevetteDescription=Facture modèle PDF Crevette. Un modèle de facture complet pour les factures de situation
+MarsNumRefModelDesc1=Numéro de retour avec le format %syymm-nnnn pour les factures standard, %syymm-nnnn pour les factures de remplacement, %syymm-nnnn pour les factures de versement et %syymm-nnnn pour les notes de crédit où il est année, mm est le mois et nnnn est une séquence sans interruption et non Retourner à 0
+CactusNumRefModelDesc1=Numéro de retour avec le format %syymm-nnnn pour les factures standard, %syymm-nnnn pour les notes de crédit et %syymm-nnnn pour les factures de versement de paiement où yy est l'année, mm est le mois et nnnn est une séquence sans interruption et aucun retour à 0
 SituationAmount=Montant de facture de situation (no tax.)
+NotLastInCycle=Cette facture n'est pas la dernière en cycle et ne doit pas être modifiée.
 NoSituations=Pas de point de situation ouvert
 PDFCrevetteSituationInvoiceLineDecompte=Facture de situation - compter
 PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s sur %s
 TotalSituationInvoice=Situation total
+invoiceLineProgressError=La progression de la ligne de facture ne peut pas être supérieure ou égale à la ligne de facture suivante
 updatePriceNextInvoiceErrorUpdateline=Erreur: le prix de mise à jour sur la ligne facture : %s
 ToCreateARecurringInvoice=Pour créer une facture récurrente pour ce contrat , d'abord créer ce projet de facture, puis le convertir en un modèle de facture et de définir la fréquence pour la génération des factures futures .
 ToCreateARecurringInvoiceGene=Pour générer des factures à venir régulièrement et manuellement , allez dans le menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=Si vous avez besoin d'avoir des factures générées automatiquement , vous demander administrateur d'activer et le module de configuration <strong>%s</strong>. Notez que les deux méthodes ( manuelle et automatique ) peut être utilisé en même temps sans risque de duplication .
+DeleteRepeatableInvoice=Supprimer la facture du modèle
+ConfirmDeleteRepeatableInvoice=Êtes-vous sûr de vouloir supprimer la facture du modèle?
+BillCreated=%s facture (s) créée (s)
diff --git a/htdocs/langs/fr_CA/boxes.lang b/htdocs/langs/fr_CA/boxes.lang
index 5fc77750eb4..85820c35db0 100644
--- a/htdocs/langs/fr_CA/boxes.lang
+++ b/htdocs/langs/fr_CA/boxes.lang
@@ -1,4 +1,48 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxLastProducts=%s derniers produits / services
+BoxProductsAlertStock=Alertes stockées pour les produits
+BoxLastProductsInContract=%s derniers produits / services sous contrat
+BoxLastSupplierBills=Dernières factures des fournisseurs
+BoxLastCustomerBills=Dernières factures client
+BoxOldestUnpaidCustomerBills=Les factures des clients non payées les plus anciennes
+BoxOldestUnpaidSupplierBills=Les plus anciennes factures fournisseurs non payées
+BoxLastProspects=Dernières perspectives modifiées
+BoxLastCustomerOrders=Derniers commandes client
+BoxLastActions=Dernières actions
+BoxLastContacts=Derniers contacts / adresses
+BoxLastMembers=Derniers membres
 BoxCurrentAccounts=Soldes Comptes ouverts
+BoxTitleLastRssInfos=%s dernières nouvelles de %s
+BoxTitleLastProducts=%s derniers produits / services modifiés
+BoxTitleLastSuppliers=%s derniers fournisseurs enregistrés
+BoxTitleLastModifiedSuppliers=%s derniers fournisseurs modifiés
+BoxTitleLastModifiedCustomers=%s derniers clients modifiés
+BoxTitleLastCustomersOrProspects=%s derniers  clients ou prospects
+BoxTitleLastCustomerBills=Dernières %s factures client
+BoxTitleLastSupplierBills=Dernières %s factures fournisseurs
+BoxTitleLastModifiedProspects=%s dernières prospects modifiées
+BoxTitleLastModifiedMembers=%s derniers membres
+BoxTitleLastFicheInter=%s dernières interventions modifiées
 BoxTitleCurrentAccounts=Soldes des comptes ouverts
+BoxTitleLastModifiedContacts=%s derniers contacts / adresses modifiés
+BoxMyLastBookmarks=Mes derniers %s signets
+BoxLastExpiredServices=Les %s derniers contacts les plus anciens avec les services expirés actifs
+BoxTitleLastActionsToDo=%s dernières actions à faire
+BoxTitleLastContracts=%s dernier contrats modifiés
+BoxTitleLastModifiedDonations=%s derniers dons modifiés
+BoxTitleLastModifiedExpenses=%s derniers rapports de dépenses modifiés
 BoxTitleGoodCustomers=%s Bons clients
+FailedToRefreshDataInfoNotUpToDate=Impossible de rafraîchir le flux RSS. Dernière date de rafraîchissement réussie: %s
+LastRefreshDate=Dernière date de rafraîchissement
+NoRecordedOrders=Aucune commande client enregistrée
+NoRecordedInvoices=Aucune facture de client enregistrée
+NoUnpaidCustomerBills=Pas de factures de clients non payées
+NoUnpaidSupplierBills=Pas de factures fournisseurs non payées
+NoModifiedSupplierBills=Aucune facture de fournisseur enregistrée
+BoxTitleLastModifiedSupplierBills=%s dernières factures de fournisseur modifiées
+BoxTitleLatestModifiedSupplierOrders=%s dernières commandes modifiées
+BoxTitleLastModifiedCustomerBills=%s derniers modifications des factures des clients
+BoxTitleLastModifiedCustomerOrders=%s dernières commandes client modifiées
+BoxTitleLastModifiedPropals=%s dernières modifications proposées
+LastXMonthRolling=Le dernier roulement du mois de %s
+ChooseBoxToAdd=Ajouter un widget sur votre tableau de bord
diff --git a/htdocs/langs/fr_CA/cashdesk.lang b/htdocs/langs/fr_CA/cashdesk.lang
index ed55b9044b2..2f3da52b1f5 100644
--- a/htdocs/langs/fr_CA/cashdesk.lang
+++ b/htdocs/langs/fr_CA/cashdesk.lang
@@ -1,4 +1,4 @@
 # Dolibarr language file - Source file is en_US - cashdesk
 NoVAT=Pas de TVA (TAXE) pour cette vente
-BankToPay=Account for payment
+BankToPay=Compte pour le paiement
 DolibarrReceiptPrinter=Imprimante de reçu Dolibarr
diff --git a/htdocs/langs/fr_CA/categories.lang b/htdocs/langs/fr_CA/categories.lang
index 0737a652735..97519cbf02f 100644
--- a/htdocs/langs/fr_CA/categories.lang
+++ b/htdocs/langs/fr_CA/categories.lang
@@ -1,10 +1,21 @@
 # Dolibarr language file - Source file is en_US - categories
 MembersCategoriesArea=Espace tags/catégories de membres
+AccountsCategoriesArea=Étiquettes / catégories de comptes
+ProjectsCategoriesArea=Zone de tags / catégories de projets
+ImpossibleAddCat=Impossible d'ajouter le tag / catégorie %s
 ProductIsInCategories=Produit/service appartient aux tags/catégories suivant(e)s
 CompanyIsInCustomersCategories=Ce tiers appartient aux tags/catégories de clients/prospects suivant(e)s
 CompanyIsInSuppliersCategories=Ce tiers appartient aux tags/catégories de fournisseurs suivant(e)s
 MemberIsInCategories=Ce membre appartient aux tags/catégories suivant(e)s
 ContactIsInCategories=Ce contact appartient aux tags/catégories suivant(e)s
+CompanyHasNoCategory=Ce tiers n'est pas dans les tags / catégories
+ProjectHasNoCategory=Ce projet n'est pas dans les tags / catégories
 ClassifyInCategory=Classer dans le(a) tag/catégorie
+ConfirmDeleteCategory=Êtes-vous sûr de vouloir supprimer cette étiquette / catégorie?
 MembersCategoryShort=Tags/catégories de membres
 ProspectsCategoriesShort=Prospects tags/catégories
+AccountsCategoriesShort=Étiquettes / catégories de comptes
+ProjectsCategoriesShort=Projets Tags / catégories
+ThisCategoryHasNoAccount=Cette catégorie ne contient aucun compte.
+ThisCategoryHasNoProject=Cette catégorie ne contient aucun projet.
+CatProJectLinks=Liens entre projets et tags / catégories
diff --git a/htdocs/langs/fr_CA/commercial.lang b/htdocs/langs/fr_CA/commercial.lang
index b2f630b9bf6..c48270c9d6c 100644
--- a/htdocs/langs/fr_CA/commercial.lang
+++ b/htdocs/langs/fr_CA/commercial.lang
@@ -1,4 +1,10 @@
 # Dolibarr language file - Source file is en_US - commercial
 DeleteAction=Supprimer l'événement
 NewAction=Nouvel événement
-ActionAC_OTH_AUTO=Autre (evênements insérés automatiquement)
+ConfirmDeleteAction=Êtes-vous sûr de vouloir supprimer cet événement?
+ActionOnCompany=Société associée
+ActionOnContact=Contact connexe
+ThirdPartiesOfSaleRepresentative=Personnes tierces ayant un représentant commercial
+LastDoneTasks=Dernières %s actions complétées
+LastActionsToDo=Le plus ancien %s actions non complétées
+ActionAC_OTH_AUTO=Événements insérés automatiquement
diff --git a/htdocs/langs/fr_CA/companies.lang b/htdocs/langs/fr_CA/companies.lang
index 1489d72d6b7..7ab8756646e 100644
--- a/htdocs/langs/fr_CA/companies.lang
+++ b/htdocs/langs/fr_CA/companies.lang
@@ -1,22 +1,54 @@
 # Dolibarr language file - Source file is en_US - companies
+ConfirmDeleteCompany=Êtes-vous sûr de vouloir supprimer cette entreprise et toutes les informations héritées?
+ConfirmDeleteContact=Êtes-vous sûr de vouloir supprimer ce contact et toutes les informations héritées?
+CreateThirdPartyAndContact=Créer un tiers + un contact enfant
 AliasNames=Nom de l'alias (commercial, marque, ... )
 AliasNameShort=Nom de l'alias
+ToCreateContactWithSameName=Créeront automatiquement un contact / adresse avec les mêmes informations que le tiers sous le tiers. Dans la plupart des cas, même si votre tiers est une personne physique, créer un tiers seul suffit.
+PostOrFunction=Poste
 State=États/Provinces
 StateShort=États
 PhoneShort=Téléphone
+No_Email=Refuser les envois de masse
 VATIsUsed=Assujetti à la TPS/TVH
 VATIsNotUsed=Non assujetti à la TPS/TVH
+CopyAddressFromSoc=Adresse de remplissage avec adresse de tiers
+ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty ni client ni fournisseur, aucun objet de référence disponible
+PaymentBankAccount=Compte bancaire de paiement
+OverAllOrders=Ordres
+OverAllSupplierProposals=Demande de prix
 LocalTax1IsUsed=Assujeti à la TVQ
 LocalTax2IsUsed=Assujeti à une troisième taxe
 ProfId6Short=TVQ
 ProfId6=TVQ
+ProfId1US=Id du professeur
 VATIntra=Numéro de TPS/TVH
 VATIntraShort=TPS/TVH
+CompanyHasAbsoluteDiscount=Ce client dispose d'un rabais disponible (notes de crédits ou acomptes) pour <b> %s</b>%s
+ContactId=ID de contact
+FromContactName=Prénom:
 ContactForOrdersOrShipments=Contact de commandes ou de livraison
 NoContactForAnyOrderOrShipments=Ce contact n'est contact d'aucune commande ou livraison
+StatusProspect1=Pour être contacté
+ChangeToContact=Changer l'état sur 'À contacter'
+ExportDataset_company_1=Les tiers (Entreprises / fondations / personnes physiques) et les propriétés
+ImportDataset_company_1=Les tiers (Entreprises / fondations / personnes physiques) et les propriétés
 ImportDataset_company_4=Tiers/ventes représentatives (ventes représentatives affectées aux utilisateurs aux entreprises )
+AddAddress=Ajoutez l'adresse
+AllocateCommercial=Attribué au représentant des ventes
+YouMustAssignUserMailFirst=Vous devez d'abord créer un email pour cet utilisateur afin d'y ajouter des notifications par courrier électronique.
+YouMustCreateContactFirst=Pour pouvoir ajouter des notifications par courrier électronique, vous devez d'abord définir des contacts avec des courriels valides pour le tiers
+LastModifiedThirdParties=Dernier %s tiers modifiés
+InActivity=Ouverte
+ThirdPartyIsClosed=Le tiers est fermé
 ProductsIntoElements=Liste des produits/services en %s
+OutstandingBillReached=Max. Pour la facture exceptionnelle atteinte
 MergeOriginThirdparty=Dupliquer tiers (tiers que vous souhaitez supprimer)
 MergeThirdparties=Fusionner des tiers
+ConfirmMergeThirdparties=Êtes-vous sûr de vouloir fusionner ce tiers avec le présent? Tous les objets liés (factures, commandes, ...) seront transférés vers un tiers actuel, puis la tierce partie sera supprimée.
 ThirdpartiesMergeSuccess=Les tiers ont été fusionnées
+SaleRepresentativeLogin=Connexion du représentant des ventes
+SaleRepresentativeFirstname=Prénom du représentant des ventes
+SaleRepresentativeLastname=Nom de représentant commercial
 ErrorThirdpartiesMerge=Il y avait une erreur lors de la suppression des les tiers. S'il vous plaît vérifier le journal. Des modifications ont été annulées.
+NewCustomerSupplierCodeProposed=Nouveau code client ou fournisseur suggéré sur le code en double
diff --git a/htdocs/langs/fr_CA/compta.lang b/htdocs/langs/fr_CA/compta.lang
index dd117ca45c7..825749e8b52 100644
--- a/htdocs/langs/fr_CA/compta.lang
+++ b/htdocs/langs/fr_CA/compta.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - compta
+Accountparent=Compte Parent
+Accountsparent=Comptes parents
 AmountHTVATRealReceived=no tax. collectée
 AmountHTVATRealPaid=no tax. payé
 VATToPay=TPS/TVH ventes
@@ -10,19 +12,38 @@ VATPaid=TPS/TVH payée
 LT1PaidES=RE (TVQ) Payé
 LT1CustomerES=RE (TVQ) ventes
 VATCollected=TPS/TVH récupérée
+ToPay=Saisir règlement
 SocialContribution=Charge sociale
 SocialContributions=Charges sociales
+SocialContributionsDeductibles=Taxes sociales ou fiscales déductibles
+SocialContributionsNondeductibles=Impôts sociaux ou fiscaux non déductibles
+LabelContrib=Contribution d'étiquette
+TypeContrib=Type de contribution
 MenuSocialContributions=Charges sociales
 MenuNewSocialContribution=Nouvelle charge sociale
 NewSocialContribution=Nouvelle charge sociale
+AddSocialContribution=Ajouter la taxe sociale / fiscale
 ContributionsToPay=Charges à payer
 PaymentSocialContribution=Règlement charge sociale
 PaymentVat=Règlement TPS/TVH
+newLT2Payment=Nouveau paiement d'impôt 3
+LT1Payment=Paiement de l'impôt 2
+LT2Payment=Paiement d'impôt 3
+LT2Payments=Taxe 3 paiements
 newLT1PaymentES=Nouveau règlement de RE (TVQ)
 LT1PaymentES=Règlement RE (TVQ)
 LT1PaymentsES=Règlements RE (TVQ)
+VATPayment=Paiement d'impôt sur les ventes
+VATPayments=Paiements d'impôt sur les ventes
+VATRefund=Remboursement de la taxe de vente
 SocialContributionsPayments=Règlements charges sociales
 ShowVatPayment=Affiche paiement TPS/TVH
+BalanceVisibilityDependsOnSortAndFilters=La balance est visible dans cette liste uniquement si la table est triée en ascendant sur %s et filtrée pour 1 compte bancaire
+CustomerAccountancyCodeShort=Cust. Compte. code
+SupplierAccountancyCodeShort=Souper. Compte. code
+ByExpenseIncome=Par dépenses et revenus
+LastCheckReceiptShort=Dernier %s vérifier les reçus
+NoWaitingChecks=Aucun chèque en attente de dépôt.
 PaySocialContribution=Payer une charge sociale
 ConfirmPaySocialContribution=Êtes-vous sûr de vouloir classer cette charge sociale à payée ?
 DeleteSocialContribution=Effacer charge sociale
@@ -30,6 +51,11 @@ ConfirmDeleteSocialContribution=Êtes-vous sûr de vouloir supprimer cette charg
 ExportDataset_tax_1=Charges sociales et paiements
 CalcModeVATDebt=Mode <b>%sTPS/TVH sur débit%s</b>.
 CalcModeVATEngagement=Mode <b>%s TPS/TVH sur encaissement%s</b>.
+RulesResultDue=- Il comprend les factures, les dépenses, la TVA, les dons, qu'ils soient payés ou non. Comprend également les salaires payés. <br> - Il est basé sur la date de validation des factures et la TVA et à la date d'échéance des dépenses. Pour les salaires définis avec le module Salaire, la date de valeur du paiement est utilisée.
+RulesResultInOut=- Il comprend les paiements réels effectués sur les factures, les dépenses, la TVA et les salaires. <br> - Il est basé sur les dates de paiement des factures, des dépenses, de la TVA et des salaires. La date de donation pour le don.
+RulesCADue=- Il comprend les factures exigibles du client, qu'elles soient payées ou non. <br> - Il est basé sur la date de validation de ces factures.<br>
+DepositsAreNotIncluded=- Les factures d'acompte ne sont ni incluses
+DepositsAreIncluded=- Les factures de versement sont incluses
 LT1ReportByCustomersInInputOutputModeES=Rapport par tiers des RE (TVA)
 VATReportByCustomersInDueDebtMode=Rapport par client des TPS/TVH collectées et payées
 VATReportByQuartersInInputOutputMode=Rapport par taux des TPS/TVH collectées et payées
@@ -40,7 +66,28 @@ RulesVATInServices=- Pour les services, le rapport inclut les TVA TAXES) des rè
 RulesVATInProducts=- Pour les biens matériels, il inclut les TVA(TAXES) des factures en se basant sur la date de facture.
 RulesVATDueServices=- Pour les services, le rapport inclut les TVA TAXES) des factures dues, payées ou non en se basant sur la date de facture.
 RulesVATDueProducts=- Pour les biens matériels, il inclut les TVA TAXES) des factures en se basant sur la date de facture.
+WarningDepositsNotIncluded=Les factures de acompte ne sont pas incluses dans cette version avec ce module de comptabilité.
+Pcg_version=Modèles de plan comptable
+ToCreateAPredefinedInvoice=Pour créer une facture de modèle, créez une facture standard, puis, sans la valider, cliquez sur le bouton "%s".
 CalculationRuleDesc=Pour calculer le total de TPS/TVH, il existe 2 modes:<br>Le mode 1 consiste à arrondir la TPS/TVH de chaque ligne et à sommer cet arrondi.<br>Le mode 2 consiste à sommer la TPS/TVH de chaque ligne puis à l'arrondir.<br>Les résultats peuvent différer de quelques centimes. Le mode par défaut est le mode <b>%s</b>.
+CalculationRuleDescSupplier=Selon le fournisseur, choisissez la méthode appropriée pour appliquer la même règle de calcul et obtenez le même résultat attendu par votre fournisseur.
+ACCOUNTING_VAT_SOLD_ACCOUNT=Compte comptable par défaut pour la perception de la TVA - TVA sur les ventes (utilisé si non défini sur la configuration du dictionnaire TVA)
+ACCOUNTING_VAT_BUY_ACCOUNT=Compte comptable par défaut pour la TVA récupérée - TVA sur les achats (utilisé si non défini sur la configuration du dictionnaire TVA)
+ACCOUNTING_VAT_PAY_ACCOUNT=Compte comptable par défaut pour payer la TVA
+ACCOUNTING_ACCOUNT_CUSTOMER=Compte comptable utilisé pour les tiers clients
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Le compte comptable dédié défini sur une carte tierce sera utilisé pour la comptabilisation de Subledger, celui-ci pour le grand livre général ou la valeur par défaut de la comptabilité de Sous-compte si le compte dédié d'accoutant au client sur un tiers n'est pas défini
+ACCOUNTING_ACCOUNT_SUPPLIER=Compte comptable utilisé pour les tiers fournisseurs
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Le compte comptable dédié défini sur une carte tierce sera utilisé pour l'affectation de logiciels afférent, celui-ci pour le grand livre général ou la valeur par défaut de la comptabilité de sous-compte si le compte dédié d'accoutant du fournisseur sur un tiers n'est pas défini
 CloneTax=Cloner une charge sociale
 ConfirmCloneTax=Confirmer le clonage de la charge sociale
+AddExtraReport=Rapports supplémentaires (ajouter un rapport client étranger et national)
+OtherCountriesCustomersReport=Rapport des clients étrangers
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Sur la base des deux premières lettres du numéro de TVA différentes du code de pays de votre entreprise
+SameCountryCustomersWithVAT=Rapport des clients nationaux
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Sur la base des deux premières lettres du numéro de TVA étant les mêmes que le code de votre propre entreprise
+LinkedFichinter=Lien vers une intervention
 ImportDataset_tax_contrib=Charges sociales
+ImportDataset_tax_vat=Paiements de vat
+ErrorBankAccountNotFound=Erreur: compte bancaire introuvable
+FiscalPeriod=Période de comptabilité
+ListSocialContributionAssociatedProject=Liste des contributions sociales associées au projet
diff --git a/htdocs/langs/fr_CA/contracts.lang b/htdocs/langs/fr_CA/contracts.lang
index 1c4de4ea90a..7cf3e22ff17 100644
--- a/htdocs/langs/fr_CA/contracts.lang
+++ b/htdocs/langs/fr_CA/contracts.lang
@@ -1,4 +1,67 @@
 # Dolibarr language file - Source file is en_US - contracts
+ContractsArea=Zone de contrats
 ContractCard=Carte du contrat
+ContractStatusNotRunning=Ne pas courrir
 ContractStatusValidated=Validée
+ServiceStatusInitial=Ne pas courrir
+ServiceStatusRunning=Fonctionnement
+ServiceStatusNotLate=En cours d'exécution, pas expiré
+ServiceStatusLate=En cours d'exécution, a expiré
 ServiceStatusClosed=Fermées
+ShowContractOfService=Afficher le contrat de service
+Closing=Fermeture
+NoContracts=Aucun contrat
+MenuInactiveServices=Services non actifs
+MenuRunningServices=Les services en cours d'exécution
+NewContractSubscription=Nouveau contrat / abonnement
+AddContract=Créer un contrat
+CloseAContract=Fermer un contrat
+ConfirmDeleteAContract=Êtes-vous sûr de vouloir supprimer ce contrat et tous ses services?
+ConfirmValidateContract=Êtes-vous sûr de vouloir valider ce contrat sous le nom <b>%s</b>?
+ConfirmCloseContract=Cela fermera tous les services (actifs ou non). Êtes-vous sûr de vouloir fermer ce contrat?
+ConfirmCloseService=Êtes-vous sûr de vouloir fermer ce service avec la date <b>%s</b>?
+ConfirmActivateService=Êtes-vous sûr de vouloir activer ce service avec la date <b>%s</b>?
+DateContract=Date de contrat
+DateServiceActivate=Date d'activation du service
+ShowContract=Afficher le contrat
+ListOfInactiveServices=Liste des services non actifs
+ListOfExpiredServices=Liste des services actifs périmés
+ListOfRunningServices=Liste des services en cours d'exécution
+NotActivatedServices=Services inactifs (contrats validés)
+BoardNotActivatedServices=Services à activer entre contrats validés
+LastContracts=Derniers contrats %s
+LastModifiedServices=Derniers %s services modifiés
+ContractStartDate=Date de début
+ContractEndDate=Date de fin
+DateStartPlanned=Date de début de réalisation prévue
+DateStartPlannedShort=Date de début de réalisation prévue
+DateEndPlanned=Date de fin de réalisation prévue
+DateEndPlannedShort=Date de fin de réalisation prévue
+DateStartReal=Date de début de réalisation réelle
+DateStartRealShort=Date de début de réalisation réelle
+DateEndReal=Date de fin de réalisation réelle
+DateEndRealShort=Date de fin de réalisation réelle
+CloseService=Fermer le service
+BoardRunningServices=Services d'exploitation périmés
+DraftContracts=Contrats réduits
+CloseRefusedBecauseOneServiceActive=Le contrat ne peut pas être fermé car il y a au moins un service ouvert
+CloseAllContracts=Fermer toutes les lignes de contrat
+DeleteContractLine=Supprimer une ligne de contrat
+ConfirmDeleteContractLine=Êtes-vous sûr de vouloir supprimer cette ligne de contrat?
+MoveToAnotherContract=Déplacer le service dans un autre contrat.
+ConfirmMoveToAnotherContract=J'ai choisi un nouveau contrat cible et je confirme que je souhaite transférer ce service dans ce contrat.
+ConfirmMoveToAnotherContractQuestion=Choisissez dans quel contrat existant (d'un même tiers), vous souhaitez transférer ce service?
+PaymentRenewContractId=Renouveler la ligne du contrat (numéro %s)
+ExpiredSince=Date d'expiration
+NoExpiredServices=Aucun service actif expiré
+ListOfServicesToExpireWithDuration=Liste des services à expirer en %s jours
+ListOfServicesToExpireWithDurationNeg=Liste des services expirés de plus de %s jours
+ListOfServicesToExpire=Liste des services à expirer
+NoteListOfYourExpiredServices=Cette liste contient uniquement des services de contrats pour des tiers auxquels vous êtes lié en tant que représentant de vente.
+StandardContractsTemplate=Modèle de contrat standard
+OnlyLinesWithTypeServiceAreUsed=Seules les lignes avec le type "Service" seront clonées.
+TypeContact_contrat_internal_SALESREPSIGN=Contrat de signature du représentant des ventes
+TypeContact_contrat_internal_SALESREPFOLL=Contrat de suivi du représentant des ventes
+TypeContact_contrat_external_BILLING=Contact client de facturation
+TypeContact_contrat_external_CUSTOMER=Suivi du contact client
+TypeContact_contrat_external_SALESREPSIGN=Contrat de signature contact client
diff --git a/htdocs/langs/fr_CA/cron.lang b/htdocs/langs/fr_CA/cron.lang
index d49f6e04bf6..ca52eea8053 100644
--- a/htdocs/langs/fr_CA/cron.lang
+++ b/htdocs/langs/fr_CA/cron.lang
@@ -3,5 +3,51 @@ Permission23101 =Voir les travaux planifiés
 Permission23102 =Créer/Modifier des travaux planifiées
 Permission23103 =Effacer travail planifié
 Permission23104 =Exécuté Travail planifié
+CronSetup=Configuration programmée de la gestion des tâches
+URLToLaunchCronJobs=URL pour vérifier et lancer des emplois qualifiés cron
+OrToLaunchASpecificJob=Ou pour vérifier et lancer un travail spécifique
+KeyForCronAccess=Clé de sécurité pour URL pour lancer des travaux de cron
+FileToLaunchCronJobs=Ligne de commande pour lancer des travaux de cron
+CronExplainHowToRunUnix=Sur l'environnement Unix, vous devez utiliser l'entrée crontab suivante pour exécuter la ligne de commande toutes les 5 minutes
+CronExplainHowToRunWin=Sur Microsoft (tm) environnement Windows, vous pouvez utiliser les outils de tâches planifiés pour exécuter la ligne de commande toutes les 5 minutes
+EnabledAndDisabled=Activé et désactivé
+CronLastOutput=Dernier résultat d'exécution
+CronLastResult=Le dernier code de résultat
+CronCommand=Commander
+CronList=Emplois programmés
+CronDelete=Supprimer les tâches planifiées
+CronConfirmDelete=Êtes-vous sûr de vouloir supprimer ces emplois planifiés?
+CronExecute=Lancer un travail planifié
+CronConfirmExecute=Êtes-vous sûr de vouloir exécuter ces tâches planifiées maintenant?
+CronInfo=Le module de travail planifié permet de programmer des tâches pour les exécuter automatiquement. Les travaux peuvent également être démarrés manuellement.
+CronTask=Emploi
 CronNone=Aucune
+CronDtLastLaunch=Date de début de la dernière exécution
+CronDtLastResult=Date de fin de la dernière exécution
+CronNoJobs=Aucun emploi enregistré
+CronNbRun=Nb. lancement
+CronMaxRun=Max nb. lancement
+CronEach=Chaque
+CronAdd=Ajouter des emplois
+CronEvery=Exécuter le travail chaque
+CronObject=Instance / objet à créer
+CronSaveSucess=Sauvegarde réussie
+CronFieldMandatory=Les champs %s sont obligatoires
+CronErrEndDateStartDt=La date de fin ne peut pas être avant la date de début
+CronTaskInactive=Ce travail est désactivé
+CronClassFile=Nom de fichier avec classe
+CronModuleHelp=Nom du répertoire du module Dolibarr (fonctionne également avec le module Dolibarr externe). <BR> Par exemple, appeler la méthode de récupération de l'objet de produit Dolibarr /htdocs/<u>product</u>/class/product.class.php, la valeur du module est <i> produit </i>
+CronClassFileHelp=Le chemin relatif et le nom du fichier à charger (le chemin d'accès est relatif au répertoire racine du serveur Web). <BR> Par exemple, appeler la méthode de récupération de Dolibarr Product object htdocs / product / class / <u> product.class.php</u>, la valeur du nom de fichier de classe est <i> product / class / product.class .php </i>
+CronObjectHelp=Le nom de l'objet à charger. <BR> Pour appeler par exemple la méthode de récupération de l'objet de produit Dolibarr /htdocs/product/class/product.class.php, la valeur du nom de fichier de classe est <i> Produit</i>
+CronMethodHelp=La méthode objet à lancer. <BR> Par exemple, appeler la méthode de récupération de l'objet produit Dolibarr /htdocs/product/class/product.class.php, la valeur pour la méthode est <i> fecth</i>
+CronArgsHelp=Les arguments de la méthode. <BR> Par exemple, appeler la méthode de récupération de l'objet de produit Dolibarr /htdocs/product/class/product.class.php, la valeur pour les paramètres peut être <i> 0, ProductRef</i>
+CronCommandHelp=La ligne de commande du système à exécuter.
+CronCreateJob=Créer un nouvel emploi planifié
 CronFrom=De
+CronType=Type d'emploi
+CronType_method=Méthode d'appel d'une classe Dolibarr
+CronType_command=Commande Shell
+UseMenuModuleToolsToAddCronJobs=Accédez au menu «Accueil - Outils d'administration - Emplois programmés» pour voir et modifier les tâches planifiées.
+MakeLocalDatabaseDumpShort=Sauvegarde de la base de données locale
+MakeLocalDatabaseDump=Créer une décharge de base de données locale
+WarningCronDelayed=Attention, à des fins de performance, quelle que soit la prochaine date d'exécution des travaux activés, vos travaux peuvent être retardés jusqu'à un maximum de %s heures avant d'être exécutés.
diff --git a/htdocs/langs/fr_CA/deliveries.lang b/htdocs/langs/fr_CA/deliveries.lang
index c7fc4272841..10619dd2aca 100644
--- a/htdocs/langs/fr_CA/deliveries.lang
+++ b/htdocs/langs/fr_CA/deliveries.lang
@@ -1,2 +1,22 @@
 # Dolibarr language file - Source file is en_US - deliveries
 Delivery=A livraison
+DeliveryRef=Livraison de remise
+DeliveryCard=Carte de réception
+DeliveryOrder=Bon de livraison
+CreateDeliveryOrder=Gérer le reçu de livraison
+DeliveryStateSaved=Etat de livraison enregistré
+SetDeliveryDate=Date d'expédition prévue
+ValidateDeliveryReceipt=Valider le reçu de livraison
+ValidateDeliveryReceiptConfirm=Êtes-vous sûr de vouloir valider ce reçu de livraison?
+DeleteDeliveryReceipt=Supprimer le reçu de livraison
+DeleteDeliveryReceiptConfirm=Êtes-vous sûr de vouloir supprimer le reçu de livraison <b>%s</b>?
+DeliveryNotValidated=Livraison non validée
+NameAndSignature=Nom et signature:
+ToAndDate=À ___________________________________ à ____ / _____ / __________
+GoodStatusDeclaration=Avoir reçu les marchandises ci-dessus en bon état,
+Deliverer=Libérateur:
+Recipient=Bénéficiaire
+ErrorStockIsNotEnough=Il n'y a pas assez de stock
+Shippable=Envoi possible
+NonShippable=Non expédié
+ShowReceiving=Afficher le reçu de livraison
diff --git a/htdocs/langs/fr_CA/donations.lang b/htdocs/langs/fr_CA/donations.lang
index 5519da52f06..9102ba55b8a 100644
--- a/htdocs/langs/fr_CA/donations.lang
+++ b/htdocs/langs/fr_CA/donations.lang
@@ -1,2 +1,25 @@
 # Dolibarr language file - Source file is en_US - donations
+Donor=Donneur
+DeleteADonation=Supprimer un don
+ConfirmDeleteADonation=Êtes-vous sûr de vouloir supprimer ce don?
+ShowDonation=Montrer le don
+DonationsArea=Domaine de donations
+DonationStatusPromiseNotValidated=Projet de promesse
+DonationStatusPaid=Dons reçus
 DonationStatusPromiseNotValidatedShort=Brouillon
+DonationStatusPaidShort=Reçu
+DonationTitle=Reçu de don
+DonationDatePayment=Date de règlement
+ValidPromess=Valider la promesse
+DonationReceipt=Reçu de don
+DonationsModels=Modèles de documents pour les reçus de dons
+LastModifiedDonations=Derniers %s dons modifiés
+DonationRecipient=Destinataire du don
+IConfirmDonationReception=Le destinataire déclare réception, en tant que don, du montant suivant
+MinimumAmount=Le montant minimum est %s
+FreeTextOnDonations=Texte gratuit à afficher en bas de page
+FrenchOptions=Options pour la France
+DONATION_ART200=Afficher l'article 200 de CGI si vous êtes concerné
+DONATION_ART238=Afficher l'article 238 de CGI si vous êtes concerné
+DONATION_ART885=Afficher l'article 885 de CGI si vous êtes concerné
+DonationPayment=Paiement de donation
diff --git a/htdocs/langs/fr_CA/ecm.lang b/htdocs/langs/fr_CA/ecm.lang
index 17963c36751..37142ed3387 100644
--- a/htdocs/langs/fr_CA/ecm.lang
+++ b/htdocs/langs/fr_CA/ecm.lang
@@ -1,2 +1,32 @@
 # Dolibarr language file - Source file is en_US - ecm
+ECMNbOfDocs=Nb de documents dans l'annuaire
+ECMSectionManual=Annuaire manuel
+ECMSectionAuto=Annuaire automatique
+ECMSectionsManual=Arbre manuel
+ECMSectionsAuto=Arbre automatique
+ECMAddSection=Ajouter un répertoire
 ECMCreationDate=Date création
+ECMArea=Zone EDM
+ECMAreaDesc=La zone EDM (Electronic Document Management) vous permet d'enregistrer, de partager et de rechercher rapidement toutes sortes de documents dans Dolibarr.
+ECMAreaDesc2=* Les répertoires automatiques sont remplis automatiquement lors de l'ajout de documents à partir d'une carte d'un élément. <br> * Les répertoires manuels peuvent être utilisés pour enregistrer des documents non liés à un élément particulier.
+ECMSectionWasRemoved=Le répertoire <b>%s</b> a été supprimé.
+ECMSectionOfDocuments=Répertoires de documents
+ECMDocsBySocialContributions=Documents liés aux impôts sociaux ou fiscaux
+ECMDocsByThirdParties=Documents liés à des tiers
+ECMDocsByProposals=Documents liés aux propositions
+ECMDocsByOrders=Documents liés aux commandes clients
+ECMDocsByContracts=Documents liés aux contrats
+ECMDocsByInvoices=Documents liés aux factures des clients
+ECMDocsByProducts=Documents liés aux produits
+ECMDocsByProjects=Documents liés à des projets
+ECMDocsByUsers=Documents liés aux utilisateurs
+ECMDocsByInterventions=Documents liés aux interventions
+ECMDocsByExpenseReports=Documents liés aux rapports de dépenses
+ShowECMSection=Afficher le répertoire
+DeleteSection=Supprimer le répertoire
+ConfirmDeleteSection=Pouvez-vous confirmer que vous souhaitez supprimer le répertoire <b>%s</b>?
+ECMDirectoryForFiles=Répertoire relatif des fichiers
+CannotRemoveDirectoryContainsFiles=Supprimé n'est pas possible car il contient certains fichiers
+ECMFileManager=Gestionnaire de fichiers
+ECMSelectASection=Sélectionnez un répertoire sur l'arbre de gauche ...
+DirNotSynchronizedSyncFirst=Ce répertoire semble être créé ou modifié en dehors du module ECM. Vous devez d'abord cliquer sur le bouton "Actualiser" pour synchroniser le disque et la base de données pour obtenir le contenu de ce répertoire.
diff --git a/htdocs/langs/fr_CA/errors.lang b/htdocs/langs/fr_CA/errors.lang
index a8c4f59801a..53013ba9bf6 100644
--- a/htdocs/langs/fr_CA/errors.lang
+++ b/htdocs/langs/fr_CA/errors.lang
@@ -1,19 +1,188 @@
 # Dolibarr language file - Source file is en_US - errors
+NoErrorCommitIsDone=Aucune erreur, nous nous engageons
+ErrorButCommitIsDone=Les erreurs trouvées, mais nous validons malgré cela
 ErrorBadEMail=Le courriel %s n'est pas bon
 ErrorBadUrl=L'adresse Url %s n'est pas bonne
+ErrorBadValueForParamNotAString=Valeur incorrecte pour votre paramètre. Il ajoute généralement lorsque la traduction est manquante.
 ErrorRecordNotFound=L'enregistrement n'a pas été trouvé.
 ErrorFailToCopyFile=Impossible de copier le fichier '<b>%s</b>' en '<b>%s</b>'.
+ErrorFailToCopyDir=Impossible de copier le répertoire '<b>%s</b>' dans '<b>%s</b>'.
 ErrorFailToRenameFile=Impossible de renommer le fichier '<b>%s</b>' en '<b>%s</b>'.
 ErrorFailToDeleteFile=Impossible de supprimer le fichier '<b>%s</b>'.
 ErrorFailToCreateFile=Impossible de créer le fichier '<b>%s</b>'.
+ErrorFailToRenameDir=Impossible de renommer l'annuaire '<b>%s</b>' dans '<b>%s</b>'.
+ErrorFailToCreateDir=Impossible de créer le répertoire '<b>%s</b>'.
+ErrorFailToDeleteDir=Échec de la suppression du répertoire '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Impossible de remplacer le fichier '<b>%s</b>'.
+ErrorFailToGenerateFile=Impossible de générer le fichier '<b>%s</b>'.
+ErrorThisContactIsAlreadyDefinedAsThisType=Ce contact est déjà défini comme un contact pour ce type.
 ErrorCashAccountAcceptsOnlyCashMoney=Ce compte bancaire est de type comptant, alors, il n'accepte que les paiements de type comptant.
 ErrorFromToAccountsMustDiffers=Le compte bancaire d'origine et celui de la cible doivent être différents.
+ErrorBadThirdPartyName=Valeur incorrecte pour le nom de tiers
 ErrorBadCustomerCodeSyntax=Mauvaise syntaxe du code client
+ErrorBadBarCodeSyntax=Mauvaise syntaxe pour le code à barres. Peut-être que vous définissez un mauvais type de code à barres ou que vous avez défini un masque de code à barres pour la numérotation qui ne correspond pas à la valeur analysée.
 ErrorCustomerCodeRequired=Code client requis
+ErrorBarCodeRequired=Code de barre requis
+ErrorBarCodeAlreadyUsed=Code à barres déjà utilisé
 ErrorPrefixRequired=Préfixe requis
+ErrorBadSupplierCodeSyntax=Mauvaise syntaxe pour le code fournisseur
+ErrorSupplierCodeRequired=Code du fournisseur requis
 ErrorBadParameters=Mauvais paramètres
+ErrorBadValueForParameter=Valeur incorrecte '%s' pour le paramètre '%s'
 ErrorBadImageFormat=Le format de votre fichier image n'est pas supporté (Votre logiciel PHP ne supporte pas les fonctions de conversion d'images de ce format)
 ErrorBadDateFormat=La valeur '%s' a un mauvais format de date
+ErrorWrongDate=La date n'est pas correcte!
 ErrorFailedToWriteInDir=Erreur d'écriture dans le répertoire %s
+ErrorFoundBadEmailInFile=Trouver une syntaxe de courrier électronique incorrecte pour les lignes %s dans le fichier (ligne d'exemple %s avec email = %s)
+ErrorUserCannotBeDelete=L'utilisateur ne peut pas être supprimé. Peut-être qu'il soit associé à des entités Dolibarr.
+ErrorFieldsRequired=Certains champs obligatoires n'ont pas été remplis.
+ErrorSubjectIsRequired=Le sujet du courrier électronique est requis
+ErrorFailedToCreateDir=Impossible de créer un répertoire. Vérifiez que l'utilisateur du serveur Web a la permission d'écrire dans le répertoire de documents Dolibarr. Si le paramètre <b> safe_mode </ b> est activé sur ce PHP, vérifiez que les fichiers Dolibarr php appartiennent à l'utilisateur du serveur Web (ou au groupe).
+ErrorNoMailDefinedForThisUser=Aucun courrier défini pour cet utilisateur
+ErrorFeatureNeedJavascript=Cette fonctionnalité nécessite l'activation de JavaScript pour fonctionner. Modifiez ceci dans la configuration - l'affichage.
+ErrorTopMenuMustHaveAParentWithId0=Un menu de type 'Top' ne peut pas contenir un menu parent. Mettez 0 dans le menu parent ou choisissez un menu de type 'Gauche'.
+ErrorLeftMenuMustHaveAParentId=Un menu de type 'Gauche' doit avoir un identifiant parent.
+ErrorFileNotFound=Le fichier <b>%s</b> n'a pas été trouvé (mauvais chemin, mauvaises autorisations ou accès refusé par PHP openbasedir ou paramètre safe_mode)
+ErrorDirNotFound=Répertoire <b>%s</b>non trouvé (mauvais chemin, mauvaises autorisations ou accès refusé par PHP openbasedir ou paramètre safe_mode)
+ErrorFunctionNotAvailableInPHP=La fonction <b>%s</b> est requise pour cette fonctionnalité mais n'est pas disponible dans cette version / configuration de PHP.
+ErrorDirAlreadyExists=Un répertoire avec ce nom existe déjà.
+ErrorFileAlreadyExists=Un fichier avec ce nom existe déjà.
+ErrorPartialFile=Fichier non reçu complètement par le serveur.
+ErrorNoTmpDir=Le code temporaire %s n'existe pas.
+ErrorUploadBlockedByAddon=Téléchargement bloqué par un plugin PHP / Apache.
+ErrorSizeTooLongForIntType=Taille trop longue pour le type int (%s maximum)
+ErrorSizeTooLongForVarcharType=Taille trop longue pour le type de chaîne (%s chars maximum)
+ErrorNoValueForSelectType=Remplissez la valeur pour sélectionner la liste
+ErrorNoValueForCheckBoxType=Veuillez remplir la valeur pour la liste des cases à cocher
+ErrorNoValueForRadioType=Remplissez la valeur pour la liste radio
+ErrorBadFormatValueList=La valeur de la liste ne peut pas contenir plus d'une virgule: <u>%s</u>, mais nécessite au moins une: clé, valeur
+ErrorFieldCanNotContainSpecialCharacters=Le champ <b>%s</b> ne doit pas contenir de caractères spéciaux.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Le champ <b>%s</b> ne doit pas contenir de caractères spéciaux, ni les caractères majuscules et ne peut contenir que des nombres.
+ErrorExportDuplicateProfil=Ce nom de profil existe déjà pour ce jeu d'exportation.
+ErrorLDAPSetupNotComplete=La correspondance Dolibarr-LDAP n'est pas complète.
+ErrorLDAPMakeManualTest=Un fichier .ldif a été généré dans le répertoire %s. Essayez de le charger manuellement à partir de la ligne de commande pour avoir plus d'informations sur les erreurs.
+ErrorCantSaveADoneUserWithZeroPercentage=Impossible d'enregistrer une action avec "statut non démarré" si le champ "fait par" est également rempli.
+ErrorRefAlreadyExists=La référence utilisée pour la création existe déjà.
+ErrorPleaseTypeBankTransactionReportName=Tapez le nom du relevé bancaire où l'entrée est signalée (Format AAAAMM ou AAAAMMDD)
+ErrorRecordHasChildren=Impossible de supprimer l'enregistrement puisqu'il a des enfants.
+ErrorRecordIsUsedCantDelete=Impossible de supprimer l'enregistrement. Il est déjà utilisé ou inclus dans un autre objet.
+ErrorModuleRequireJavascript=Javascript ne doit pas être désactivé pour que cette fonction fonctionne. Pour activer / désactiver Javascript, accédez au menu Accueil-> Configuration-> Affichage.
+ErrorPasswordsMustMatch=Les deux mots de passe dactylographiés doivent correspondre les uns aux autres
+ErrorContactEMail=Une erreur technique s'est produite. Veuillez contacter l'administrateur pour suivre le courrier électronique <b>%s</b> en fournir le code d'erreur <b>%s</b>dans votre message, ou encore mieux en ajoutant une copie d'écran de cette page.
+ErrorWrongValueForField=Valeur incorrecte pour le numéro de champ <b>%s</b> (valeur '<b>%s</b>' ne correspond pas à la règle regex <b>%s</b>)
+ErrorFieldValueNotIn=Valeur incorrecte pour le numéro de champ <b>%s</b> (valeur '<b>%s</b>' n'est pas une valeur disponible dans le champ <b>%s</b> de la table <b> %s</b> )
+ErrorFieldRefNotIn=Valeur incorrecte pour le numéro de champ <b>%s</b> (valeur '<b> %s</b>' n'est pas un <b>%s</b> référence existante)
+ErrorFileIsInfectedWithAVirus=Le programme antivirus n'a pas pu valider le fichier (le fichier peut être infecté par un virus)
+ErrorSpecialCharNotAllowedForField=Les caractères spéciaux ne sont pas autorisés pour le champ "%s"
+ErrorNumRefModel=Une référence existe dans la base de données (%s) et n'est pas compatible avec cette règle de numérotation. Supprimez l'enregistrement ou la renommée référence pour activer ce module.
 ErrorQtyTooLowForThisSupplier=Quantité trop faible pour ce fournisseur ou pas de prix défini sur ce produit pour ce fournisseur
+ErrorModuleSetupNotComplete=La configuration du module semble être inachevée. Allez sur Accueil - Configuration - Modules à compléter.
+ErrorBadMaskBadRazMonth=Erreur, mauvaise valeur de réinitialisation
+ErrorMaxNumberReachForThisMask=Nombre maxi pour ce masque
+ErrorCounterMustHaveMoreThan3Digits=Le compteur doit avoir plus de 3 chiffres
+ErrorDeleteNotPossibleLineIsConsolidated=L'effacement n'est pas possible car l'enregistrement est lié à une transition bancaire conciliée
+ErrorProdIdAlreadyExist=%s est affecté à un autre tiers
+ErrorFailedToLoadRSSFile=Impossible d'obtenir un flux RSS. Essayez d'ajouter constante MAIN_SIMPLEXMLLOAD_DEBUG si les messages d'erreur ne fournissent pas suffisamment d'informations.
+ErrorForbidden=Accès refusé. <br> Vous essayez d'accéder à une page, zone ou fonctionnalité d'un module désactivé ou sans être dans une session authentifiée ou non autorisée pour votre utilisateur.
+ErrorForbidden2=La permission de cette connexion peut être définie par votre administrateur Dolibarr à partir du menu %s-> %s.
+ErrorForbidden3=Il semble que Dolibarr ne soit pas utilisé par une session authentifiée. Consultez la documentation d'installation de Dolibarr pour savoir comment gérer les authentifications (htaccess, mod_auth ou autre ...).
+ErrorNoImagickReadimage=Class Imagick n'est pas trouvé dans cette PHP. Aucun aperçu ne peut être disponible. Les administrateurs peuvent désactiver cet onglet dans le menu Configuration - Affichage.
+ErrorRecordAlreadyExists=L'enregistrement existe déjà
+ErrorCantReadFile=Impossible de lire le fichier '%s'
+ErrorCantReadDir=Impossible de lire le répertoire '%s'
+ErrorBadLoginPassword=Mauvaise valeur pour la connexion ou le mot de passe
+ErrorLoginDisabled=Votre compte a été désactivé
+ErrorFailedToRunExternalCommand=Impossible d'exécuter une commande externe. Vérifiez qu'il est disponible et exécutable par votre serveur PHP. Si PHP <b> Mode sans échec </ b> est activé, vérifiez que cette commande se trouve dans un répertoire défini par le paramètre <b> safe_mode_exec_dir </ b>.
+ErrorFailedToChangePassword=Échec de la modification du mot de passe
+ErrorLoginDoesNotExists=L'utilisateur avec la connexion <b>%s</b> n'a pas été trouvé.
+ErrorLoginHasNoEmail=Cet utilisateur n'a pas d'adresse e-mail. Processus interrompu.
+ErrorBadValueForCode=Valeur incorrecte pour le code de sécurité. Réessayez avec une nouvelle valeur ...
+ErrorBothFieldCantBeNegative=Les champs %s et %s ne peuvent pas être à la fois négatifs
+ErrorQtyForCustomerInvoiceCantBeNegative=La quantité de ligne dans les factures des clients ne peut pas être négative
+ErrorWebServerUserHasNotPermission=Le compte d'utilisateur <b>%s</b> utilisé pour exécuter le serveur Web n'a aucune permission pour cela
+ErrorNoActivatedBarcode=Aucun type de code à barres activé
+ErrUnzipFails=Impossible de décompresser %s avec ZipArchive
+ErrNoZipEngine=Pas de fichier moteur pour zip / unzip %s dans ce PHP
+ErrorFileMustBeADolibarrPackage=Le fichier %s doit être un zip zip Dolibarr
+ErrorModuleFileRequired=Vous devez sélectionner un module de module Dolibarr
+ErrorPhpCurlNotInstalled=Le PHP CURL n'est pas installé, c'est essentiel pour parler avec Paypal
+ErrorFailedToAddToMailmanList=Impossible d'ajouter l'enregistrement %s à la liste Mailman %s ou à la base SPIP
+ErrorFailedToRemoveToMailmanList=Impossible de supprimer l'enregistrement %s à la liste Mailman %s ou à la base SPIP
+ErrorNewValueCantMatchOldValue=Une nouvelle valeur ne peut pas être égale à l'ancienne
+ErrorFailedToValidatePasswordReset=Impossible de réinitialiser le mot de passe. Peut-être que le reinit était déjà fait (ce lien ne peut être utilisé qu'une seule fois). Sinon, essayez de redémarrer le processus de réinitialisation.
+ErrorToConnectToMysqlCheckInstance=La connexion à la base de données échoue. Vérifiez que le serveur Mysql est en cours d'exécution (dans la plupart des cas, vous pouvez le lancer à partir de la ligne de commande avec 'sudo /etc/init.d/mysql start').
+ErrorFailedToAddContact=Impossible d'ajouter un contact
+ErrorPaymentModeDefinedToWithoutSetup=Un mode de paiement a été configuré pour taper %s mais la configuration du module La facture n'a pas été complétée pour définir les informations à afficher pour ce mode de paiement.
+ErrorOpenIDSetupNotComplete=Vous configurez le fichier de configuration Dolibarr pour autoriser l'authentification OpenID, mais l'URL du service OpenID n'est pas définie en constante %s
+ErrorWarehouseMustDiffers=Les entrepôts source et cible doivent être différents
+ErrorBadFormat=Mauvais format!
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Erreur, ce membre n'est pas encore lié à un tiers. Associez le membre à un tiers existant ou créez un nouveau tiers avant de créer une souscription avec facture.
+ErrorThereIsSomeDeliveries=Une erreur, des livraisons sont liées à cette expédition. La suppression a été refusée.
+ErrorCantDeletePaymentReconciliated=Impossible de supprimer un paiement qui a généré une entrée bancaire qui a été réconciliée
+ErrorCantDeletePaymentSharedWithPayedInvoice=Impossible de supprimer un paiement partagé par au moins une facture avec le statut Payé
+ErrorPriceExpression1=Impossible d'assigner à la constante '%s'
+ErrorPriceExpression2=Impossible de redéfinir la fonction intégrée '%s'
+ErrorPriceExpression3=Variable non définie '%s' en définition de fonction
+ErrorPriceExpression5=Inattendue '%s'
+ErrorPriceExpression6=Mauvais nombre d'arguments (%s donné, %s prévu)
+ErrorPriceExpression8=Opérateur inattendu '%s'
+ErrorPriceExpression10=Iperator '%s' manque d'opérande
+ErrorPriceExpression11=En attendant '%s'
+ErrorPriceExpression17=Variable non définie '%s'
+ErrorPriceExpression19=Expression non trouvée
+ErrorPriceExpression21=Résultat vide '%s'
+ErrorSrcAndTargetWarehouseMustDiffers=Les entrepôts source et cible doivent être différents
+ErrorTryToMakeMoveOnProductRequiringBatchData=Erreur, essayer de faire un mouvement de stock sans lot / informations en série, sur un produit nécessitant des informations de lot / série
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=Toutes les réceptions enregistrées doivent d'abord être vérifiées (approuvées ou refusées) avant d'être autorisées à effectuer cette action
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=Toutes les réceptions enregistrées doivent d'abord être vérifiées (approuvées) avant d'être autorisées à effectuer cette action
+ErrorGlobalVariableUpdater0=La demande HTTP a échoué avec l'erreur '%s'
+ErrorGlobalVariableUpdater3=Les données demandées n'ont pas été trouvées en résultat
+ErrorGlobalVariableUpdater5=Aucune variable globale sélectionnée
+ErrorFieldMustBeANumeric=Le champ <b>%s</b> doit être une valeur numérique
+ErrorMandatoryParametersNotProvided=Paramètre (s) obligatoire (s) non fourni
+ErrorOppStatusRequiredIfAmount=Vous avez fixé un montant estimé pour cette opportunité / chef de file. Vous devez donc entrer son statut
+ErrorFailedToLoadModuleDescriptorForXXX=Impossible de charger la classe descripteur du module pour %s
+ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Définition incorrecte de la matrice de menus dans le descripteur de module (mauvaise valeur pour la clé fk_menu)
+ErrorSavingChanges=Une erreur s'est produite lors de l'enregistrement des modifications
+ErrorWarehouseRequiredIntoShipmentLine=Un entrepôt est requis sur la ligne à expédier
+ErrorFileMustHaveFormat=Le fichier doit avoir un format %s
 ErrorSupplierCountryIsNotDefined=Le pays pour ce fournisseur n'est pas défini. Veuillez premièrement corriger cet élément.
+ErrorsThirdpartyMerge=Impossible de fusionner les deux enregistrements. Demande annulée.
+ErrorStockIsNotEnoughToAddProductOnOrder=Le stock n'est pas suffisant pour le produit %s pour l'ajouter à une nouvelle commande.
+ErrorStockIsNotEnoughToAddProductOnInvoice=Le stock n'est pas suffisant pour le produit %s pour l'ajouter à une nouvelle facture.
+ErrorStockIsNotEnoughToAddProductOnShipment=Le stock n'est pas suffisant pour le produit %s pour l'ajouter à un nouvel envoi.
+ErrorStockIsNotEnoughToAddProductOnProposal=Le stock n'est pas suffisant pour le produit %s pour l'ajouter à une nouvelle proposition.
+ErrorFailedToLoadLoginFileForMode=Impossible d'obtenir la touche de connexion pour le mode '%s'.
+ErrorModuleNotFound=Le fichier du module n'a pas été trouvé.
+ErrorFieldAccountNotDefinedForBankLine=Le compte Value for Accounting n'est pas défini pour l'identifiant de ligne source %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Le compte Value for Accounting n'est pas défini pour l'identifiant de la facture %s (%s)
+ErrorFieldAccountNotDefinedForLine=Le compte Value for Accounting n'est pas défini pour la ligne (%s)
+ErrorBankStatementNameMustFollowRegex=Erreur, le nom de la déclaration bancaire doit suivre la règle de syntaxe suivante %s
+ErrorPhpMailDelivery=Vérifiez que vous n'utilisez pas un nombre trop élevé de destinataires et que votre contenu de courrier électronique n'est pas similaire à un Spam. Demandez également à votre administrateur de vérifier les fichiers de pare-feu et de journaux du serveur pour obtenir des informations plus complètes.
+ErrorUserNotAssignedToTask=L'utilisateur doit être affecté à la tâche pour pouvoir saisir le temps consommé.
+ErrorTaskAlreadyAssigned=Tâche déjà attribuée à l'utilisateur
+ErrorModuleFileSeemsToHaveAWrongFormat=Le module module semble avoir un mauvais format.
+ErrorFilenameDosNotMatchDolibarrPackageRules=Le nom du module package (<strong>%s</strong>) ne correspond pas à la syntaxe du nom attendu: <strong>%s</strong>
+ErrorDuplicateTrigger=Erreur, nom du trigger en double %s. Déjà chargé à partir de %s.
+ErrorNoWarehouseDefined=Erreur, aucun entrepôt n'a été défini.
+ErrorBadLinkSourceSetButBadValueForRef=Le lien que vous utilisez n'est pas valide. Une «source» de paiement est définie, mais la valeur pour «ref» n'est pas valide.
+ErrorTooManyErrorsProcessStopped=Trop d'erreurs. Le processus a été arrêté.
+WarningPasswordSetWithNoAccount=Un mot de passe a été défini pour ce membre. Cependant, aucun compte utilisateur n'a été créé. Donc, ce mot de passe est stocké mais ne peut pas être utilisé pour vous connecter à Dolibarr. Il peut être utilisé par un module / interface externe, mais si vous n'avez pas besoin de définir un login ou un mot de passe pour un membre, vous pouvez désactiver l'option "Gérer une connexion pour chaque membre" de la configuration du module Membre. Si vous devez gérer une connexion mais n'avez pas besoin de mot de passe, vous pouvez garder ce champ vide pour éviter cet avertissement. Remarque: Le courrier électronique peut également être utilisé en tant que connexion si le membre est lié à un utilisateur.
+WarningMandatorySetupNotComplete=Les paramètres de configuration obligatoires ne sont pas encore définis
+WarningSafeModeOnCheckExecDir=Avertissement, l'option PHP <b> safe_mode </ b> est activée, la commande doit être stockée dans un répertoire déclaré par le paramètre php <b> safe_mode_exec_dir </ b>.
+WarningBookmarkAlreadyExists=Un marque-page avec ce titre ou cette cible (URL) existe déjà.
+WarningPassIsEmpty=Attention, le mot de passe de la base de données est vide. C'est un trou de sécurité. Vous devez ajouter un mot de passe à votre base de données et modifier votre fichier conf.php pour refléter cela.
+WarningConfFileMustBeReadOnly=Avertissement, votre fichier de configuration (<b> htdocs / conf / conf.php </ b>) peut être écrasé par le serveur Web. C'est un trou de sécurité sérieux. Modifiez les autorisations sur le fichier pour être en mode lecture seule pour l'utilisateur du système d'exploitation utilisé par le serveur Web. Si vous utilisez le format Windows et FAT pour votre disque, vous devez savoir que ce système de fichiers ne permet pas d'ajouter des autorisations au fichier, donc ne peut pas être complètement sécurisé.
+WarningsOnXLines=Avertissements sur <b>%s</b> enregistrement source (s)
+WarningNoDocumentModelActivated=Aucun modèle, pour la génération de document, n'a été activé. Un modèle sera choisi par défaut jusqu'à ce que vous vérifiez la configuration de votre module.
+WarningLockFileDoesNotExists=Attention, une fois la configuration terminée, vous devez désactiver l'installation / la migration des outils en ajoutant un fichier <b> install.lock</b> dans le répertoire <b> %s</b>. Le fait de manquer ce fichier est un trou de sécurité.
+WarningUntilDirRemoved=Tous les avertissements de sécurité (visibles uniquement par les utilisateurs d'administration) resteront actifs tant que la vulnérabilité est présente (ou que constante MAIN_REMOVE_INSTALL_WARNING est ajoutée dans Configuration-> Autre configuration).
+WarningCloseAlways=Avertissement, la fermeture se fait même si le montant diffère entre les éléments source et cible. Activez cette fonctionnalité avec prudence.
+WarningUsingThisBoxSlowDown=Avertissement, l'utilisation de cette boîte ralentit sérieusement toutes les pages montrant la boîte.
+WarningClickToDialUserSetupNotComplete=L'installation des informations ClickToDial pour votre utilisateur n'est pas complète (voir l'onglet ClickToDial sur votre carte utilisateur).
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Fonction désactivée lorsque la configuration de l'affichage est optimisée pour les navigateurs de personnes aveugles ou de texte.
+WarningPaymentDateLowerThanInvoiceDate=La date de paiement (%s) est antérieure à la date de facture (%s) pour la facture %s.
+WarningTooManyDataPleaseUseMoreFilters=Trop de données (plus de %s lignes). Utilisez plus de filtres ou réglez la constante %s à une limite supérieure.
+WarningSomeLinesWithNullHourlyRate=Quelques fois ont été enregistrés par certains utilisateurs alors que leur taux horaire n'était pas défini. Une valeur de 0 %s par heure a été utilisée, mais cela peut entraîner une mauvaise évaluation du temps passé.
+WarningYourLoginWasModifiedPleaseLogin=Votre connexion a été modifiée. Pour des raisons de sécurité, vous devrez vous connecter avec votre nouvelle connexion avant l'action suivante.
+WarningAnEntryAlreadyExistForTransKey=Une entrée existe déjà pour la clé de traduction pour cette langue
diff --git a/htdocs/langs/fr_CA/exports.lang b/htdocs/langs/fr_CA/exports.lang
index 04f510da475..d1b114f8f3d 100644
--- a/htdocs/langs/fr_CA/exports.lang
+++ b/htdocs/langs/fr_CA/exports.lang
@@ -1,2 +1,112 @@
 # Dolibarr language file - Source file is en_US - exports
+ExportsArea=Zone d'exportation
+ImportArea=Zone d'importation
+NewExport=Nouvelle exportation
+NewImport=Nouvelle importation
+ExportableDatas=Ensemble de données exportables
+ImportableDatas=Ensemble de données Importable
+SelectExportDataSet=Choisissez l'ensemble de données que vous souhaitez exporter ...
+SelectImportDataSet=Choisissez l'ensemble de données que vous souhaitez importer ...
+SelectExportFields=Choisissez les champs que vous souhaitez exporter ou sélectionnez un profil d'exportation prédéfini
+SelectImportFields=Choisissez les champs de fichier source que vous souhaitez importer et leur champ cible dans la base de données en les déplaçant vers le haut et vers le bas avec l'ancre %s ou sélectionnez un profil d'importation prédéfini:
+NotImportedFields=Les champs du fichier source ne sont pas importés
+SaveExportModel=Enregistrez ce profil d'exportation si vous prévoyez de le réutiliser plus tard ...
+SaveImportModel=Enregistrez ce profil d'importation si vous prévoyez de le réutiliser plus tard ...
+ExportModelName=Exporter le nom du profil
+ExportModelSaved=Exporter le profil enregistré sous le nom <b>%s</b>.
+ExportableFields=Champs d'exportation
+ExportedFields=Champs exportés
+ImportModelName=Nom du profil d'importation
+ImportModelSaved=Importer le profil enregistré sous le nom <b>%s</b>.
+DatasetToExport=Ensemble de données à exporter
+DatasetToImport=Importer un fichier dans l'ensemble de données
+ChooseFieldsOrdersAndTitle=Choisissez les champs d'ordre ...
+FieldsTitle=Titre des champs
+FieldTitle=Titre du champ
+NowClickToGenerateToBuildExportFile=Maintenant, sélectionnez le format de fichier dans la zone de liste déroulante et cliquez sur "Générer" pour créer un fichier d'exportation ...
+FormatedImport=Assistant d'importation
+FormatedImportDesc1=Cette zone permet d'importer des données personnalisées, en utilisant un assistant pour vous aider en cours sans connaissance technique.
+FormatedImportDesc2=La première étape consiste à choisir un roi de données que vous souhaitez charger, puis à charger, puis à choisir les champs que vous souhaitez charger.
+FormatedExport=Assistant d'exportation
+FormatedExportDesc1=Cette zone permet d'exporter des données personnalisées, en utilisant un assistant pour vous aider en cours sans connaissance technique.
+FormatedExportDesc2=La première étape consiste à choisir un ensemble de données prédéfini, puis à choisir les champs que vous voulez dans vos fichiers de résultat et à quel ordre.
+FormatedExportDesc3=Lorsque les données à exporter sont sélectionnées, vous pouvez définir le format de fichier de sortie auquel vous souhaitez exporter vos données.
+Sheet=Drap
+NoImportableData=Aucune donnée importable (aucun module avec des définitions permettant d'importer des données)
+SQLUsedForExport=Requête SQL utilisée pour créer un fichier d'exportation
+LineId=Id de ligne
+LineLabel=Étiquette de ligne
+LineDescription=Description de la ligne
+LineUnitPrice=Prix ​​unitaire de la ligne
+LineQty=Quantité pour ligne
+LineTotalHT=Montant net d'impôt pour ligne
+LineTotalTTC=Montant avec taxe pour ligne
+LineTotalVAT=Montant de la TVA pour ligne
+TypeOfLineServiceOrProduct=Type de ligne (0 = produit, 1 = service)
+FileWithDataToImport=Fichier avec données à importer
+FileMustHaveOneOfFollowingFormat=Le fichier à importer doit avoir un format suivant
+DownloadEmptyExample=Télécharger l'exemple du fichier source vide
+ChooseFormatOfFileToImport=Choisissez le format de fichier à utiliser comme format de fichier d'importation en cliquant sur picto %s pour le sélectionner ...
+ChooseFileToImport=Téléchargez le fichier puis cliquez sur picto %s pour sélectionner le fichier comme fichier d'importation source ...
+SourceFileFormat=Format de fichier source
+FieldsInTargetDatabase=Champs cibles dans la base de données Dolibarr (gras = obligatoire)
+NoFields=Pas de champs
+MoveField=Déplacer le numéro de colonne du champ %s
+SaveImportProfile=Enregistrer ce profil d'importation
+ErrorImportDuplicateProfil=Impossible d'enregistrer ce profil d'importation avec ce nom. Un profil existant existe déjà avec ce nom.
+TablesTarget=Tableaux ciblés
+FieldsTarget=Champs ciblés
+FieldTarget=Champ ciblé
+NbOfSourceLines=Nombre de lignes dans le fichier source
+NowClickToTestTheImport=Vérifiez les paramètres d'importation que vous avez définis. Si elles sont correctes, cliquez sur le bouton "<b>%s</b>" pour lancer une simulation du processus d'importation (aucune donnée ne sera modifiée dans votre base de données, c'est seulement une simulation pour le moment) ...
+RunSimulateImportFile=Lancer la simulation d'importation
+FieldNeedSource=Ce champ nécessite des données du fichier source
+SomeMandatoryFieldHaveNoSource=Certains champs obligatoires n'ont aucune source à partir du fichier de données
+SelectAtLeastOneField=Changer au moins un champ source dans la colonne de champs à exporter
+SelectFormat=Choisissez ce format de fichier d'importation
+RunImportFile=Lancer le fichier d'importation
+NowClickToRunTheImport=Vérifier les résultats de la simulation d'importation. Si tout va bien, lancez l'importation définitive.
+DataLoadedWithId=Toutes les données seront chargées avec l'identifiant d'importation suivant: <b>%s</b>
+ErrorMissingMandatoryValue=Les données obligatoires sont vides dans le fichier source pour le champ <b>%s</b>.
+TooMuchErrors=Il existe encore <b>%s</b> autres lignes source avec des erreurs, mais la sortie a été limitée.
+TooMuchWarnings=Il existe encore <b>%s</b> autres lignes sources avec des avertissements mais la sortie a été limitée.
+EmptyLine=Ligne vide (sera rejetée)
+CorrectErrorBeforeRunningImport=Vous devez d'abord corriger toutes les erreurs avant d'exécuter l'importation définitive.
+FileWasImported=Le fichier a été importé avec le numéro <b>%s</b>.
+YouCanUseImportIdToFindRecord=Vous pouvez trouver tous les enregistrements importés dans votre base de données en filtrant sur le champ <b> import_key = '%s'</b>.
+NbOfLinesOK=Nombre de lignes sans erreur et sans avertissement: <b>%s</b>.
+NbOfLinesImported=Nombre de lignes importées avec succès: <b>%s</b>.
+DataComeFromNoWhere=La valeur à insérer vient de nulle part dans le fichier source.
+DataComeFromFileFieldNb=La valeur à insérer provient du numéro de champ <b>%s</b> dans le fichier source.
+DataComeFromIdFoundFromRef=La valeur provenant du numéro de champ <b>%s</b> du fichier source sera utilisée pour trouver l'identifiant de l'objet parent à utiliser (Donc, l'objet <b>%s</b> qui a le ref. À partir du fichier source doit exister Dans Dolibarr).
+DataComeFromIdFoundFromCodeId=Le code provenant du numéro de champ <b>%s</b>du fichier source sera utilisé pour trouver l'identifiant de l'objet parent à utiliser (Donc, le code du fichier source doit exister dans le dictionnaire <b>%s</b>). Notez que si vous connaissez l'identification, vous pouvez également l'utiliser dans un fichier source au lieu du code. L'importation devrait fonctionner dans les deux cas.
+DataIsInsertedInto=Les données provenant du fichier source seront insérées dans le champ suivant:
+DataIDSourceIsInsertedInto=L'identifiant de l'objet parent trouvé à l'aide des données dans le fichier source sera inséré dans le champ suivant:
+DataCodeIDSourceIsInsertedInto=L'identifiant de la ligne parent trouvée à partir du code, sera inséré dans le champ suivant:
+SourceRequired=La valeur des données est obligatoire
+SourceExample=Exemple de valeur de données possible
+ExampleAnyRefFoundIntoElement=Toute référence pour l'élément <b>%s</b>
+ExampleAnyCodeOrIdFoundIntoDictionary=Tout code (ou id) trouvé dans le dictionnaire <b>%s</b>
+CSVFormatDesc=<B> Comma Separated Value </ b> format de fichier (.csv). <br> C'est un format de fichier texte où les champs sont séparés par separator [%s]. Si le séparateur se trouve dans un contenu de champ, le champ est arrondis par un caractère rond [%s]. Le personnage d'évasion pour échapper au caractère rond est [%s].
+Excel95FormatDesc=<B> Excel </ b> format de fichier (.xls) <br> C'est le format native Excel 95 (BIFF5).
+Excel2007FormatDesc=<B> Excel </ b> format de fichier (.xlsx) <br> C'est le format natif de Excel 2007 (SpreadsheetML).
+TsvFormatDesc=<B> Onglet Valeur séparée </ b> format de fichier (.tsv) <br> Il s'agit d'un format de fichier texte où les champs sont séparés par un tabulateur [onglet].
+ExportFieldAutomaticallyAdded=Le champ <b>%s</b>a été ajouté automatiquement. Cela vous évitera d'avoir des lignes similaires à traiter comme enregistrement en double (avec ce champ ajouté, toutes les lignes seront propriétaires de leur propre identifiant et seront différentes).
+CsvOptions=Options Csv
 Separator=Séparateur de champ
+Enclosure=Enceinte
+ExportStringFilter=%% permet de remplacer un ou plusieurs caractères dans le texte
+ExportDateFilter=AAAA, AAAAA, YYYMMDD: filtre d'ici un an / mois / jour <br> AAAA + YYYY, YYYYMM + YYYYMM, AAAAAAAA + AAAAMMDD: filtre sur une plage d'années / mois / jours <br>> AAAA, AAAAA, : Filtre sur toutes les années / mois / jours suivants <AAAA, <YYYYMM, <YYYMMDD: filtres sur toutes les années précédentes / mois / jours
+ExportNumericFilter=Filtres NNNN par une valeur <br> NNNNN + NNNNN filtre sur une gamme de valeurs <br> <Filtres NNNNN par valeurs inférieures <br >> Filtres NNNNN par des valeurs plus élevées
+ImportFromLine=Importation à partir du numéro de ligne
+EndAtLineNb=Fin au numéro de ligne
+ImportFromToLine=Importer les numéros de ligne (de - à)
+SetThisValueTo2ToExcludeFirstLine=Par exemple, définissez cette valeur sur 3 pour exclure les 2 premières lignes
+KeepEmptyToGoToEndOfFile=Gardez ce champ vide pour passer à la fin du fichier
+SelectPrimaryColumnsForUpdateAttempt=Sélectionnez la (les) colonne (s) à utiliser comme clé primaire pour la tentative de mise à jour
+UpdateNotYetSupportedForThisImport=La mise à jour n'est pas prise en charge pour ce type d'importation (uniquement insertion)
+NoUpdateAttempt=Aucune tentative de mise à jour n'a été effectuée, insérer seulement
+ImportDataset_user_1=Utilisateurs (employés ou non) et propriétés
+SelectFilterFields=Si vous souhaitez filtrer certaines valeurs, il suffit d'entrer les valeurs ici.
+FilteredFieldsValues=Valeur pour le filtre
+KeysToUseForUpdates=Clé à utiliser pour la mise à jour des données
diff --git a/htdocs/langs/fr_CA/holiday.lang b/htdocs/langs/fr_CA/holiday.lang
index c0339838872..8b2bb1c91ec 100644
--- a/htdocs/langs/fr_CA/holiday.lang
+++ b/htdocs/langs/fr_CA/holiday.lang
@@ -1,11 +1,85 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=Gestion des ressources humaines
+Holidays=Feuilles
+CPTitreMenu=Feuilles
+MenuReportMonth=Relevé mensuel
+MenuAddCP=Nouvelle demande de congé
+NotActiveModCP=Vous devez activer le module Déplacer pour afficher cette page.
+AddCP=Demander un congé
 DateDebCP=Date de début
 DateFinCP=Date de fin
 DateCreateCP=Date création
 ApprovedCP=Approuver
 CancelCP=Annulé
 RefuseCP=Refusé
+ListeCP=Liste des feuilles
+SendRequestCP=Créer un congé
+DelayToRequestCP=Les requêtes doivent être effectuées au moins <b> %s jour (s) </ b> devant elles.
+MenuConfCP=Balance des feuilles
+SoldeCPUser=Le solde des feuilles est <b>%s</b> jours.
+ErrorEndDateCP=Vous devez sélectionner une date de fin supérieure à la date de début.
+ErrorSQLCreateCP=Une erreur SQL s'est produite lors de la création:
+ErrorIDFicheCP=Une erreur s'est produite, la demande de congé n'existe pas.
+ReturnCP=Retourner à la page précédente
+ErrorUserViewCP=Vous n'êtes pas autorisé à lire cette demande de congé.
+InfosWorkflowCP=Flux de travail d'information
+RequestByCP=Demandé par
+TitreRequestCP=Demande de congé
+NbUseDaysCP=Nombre de jours de vacances consommés
 EditCP=Éditer
 StatutCP=État
+TitleDeleteCP=Supprimer la demande de congé
+ConfirmDeleteCP=Confirmer la suppression de cette demande de congé?
+ErrorCantDeleteCP=Erreur, vous n'avez pas le droit de supprimer cette demande de congé.
+CantCreateCP=Vous n'avez pas le droit de faire des demandes de congé.
+InvalidValidatorCP=Vous devez choisir un approbateur à votre demande de congé.
+NoDateDebut=Vous devez sélectionner une date de début.
+NoDateFin=Vous devez sélectionner une date de fin.
+ErrorDureeCP=Votre demande de congé ne contient pas de jour ouvrable.
+TitleValidCP=Approuver la demande de congé
+ConfirmValidCP=Êtes-vous sûr de vouloir approuver la demande de congé?
+TitleToValidCP=Envoyer demande de congé
+ConfirmToValidCP=Êtes-vous sûr de vouloir envoyer la demande de congé?
+TitleRefuseCP=Refuser la demande de congé
+ConfirmRefuseCP=Êtes-vous sûr de vouloir refuser la demande de congé?
+NoMotifRefuseCP=Vous devez choisir une raison pour refuser la demande.
+TitleCancelCP=Annuler la demande de congé
+ConfirmCancelCP=Êtes-vous sûr de vouloir annuler la demande de congé?
+DateRefusCP=Date de refus
+DateCancelCP=Date d'annulation
+addEventToUserCP=Assigner un congé
 MotifCP=Raison
+ErrorAddEventToUserCP=Une erreur s'est produite lors de l'ajout du congé exceptionnel.
+AddEventToUserOkCP=L'ajout du congé exceptionnel a été complété.
+MenuLogCP=Afficher les journaux de modification
+LogCP=Enregistrement des mises à jour des jours de vacances disponibles
+ActionByCP=Interprété par
+PrevSoldeCP=Solde précédent
+NewSoldeCP=Nouvel équilibre
+alreadyCPexist=Une demande de congé a déjà été faite sur cette période.
+FirstDayOfHoliday=Premier jour de vacances
+LastDayOfHoliday=Dernier jour de vacances
+BoxTitleLastLeaveRequests=Dernier %s demandes de congé modifié
+HolidaysCancelation=Laisser l'annulation de demande
+EmployeeLastname=Nom de famille de l'employé
+EmployeeFirstname=Prénom de l'employé
+TypeWasDisabledOrRemoved=Laisser le type (id %s) a été désactivé ou supprimé
+LastUpdateCP=Dernière mise à jour automatique de l'allocation des feuilles
+MonthOfLastMonthlyUpdate=Mois de la dernière mise à jour automatique de l'allocation des feuilles
+UpdateConfCPOK=Mis à jour avec succés.
+Module27130Name=Gestion des demandes de congé
+Module27130Desc=Gestion des demandes de congé
+ErrorMailNotSend=Une erreur s'est produite lors de l'envoi du courrier électronique:
+HolidaysToValidate=Valider les demandes de congé
+HolidaysToValidateBody=Voici une demande de congé pour valider
+HolidaysToValidateDelay=Cette demande de congé aura lieu dans un délai inférieur à %s jours.
+HolidaysToValidateAlertSolde=L'utilisateur qui a fait cette demande de demande n'a pas assez de jours disponibles.
+HolidaysValidated=Demandes de congés validés
+HolidaysValidatedBody=Votre demande de congé pour %s à %s a été validée.
+HolidaysRefused=Demande refusée
+HolidaysRefusedBody=Votre demande de congé pour %s à %s a été refusée pour la raison suivante:
+HolidaysCanceled=Demande d'annulation
+HolidaysCanceledBody=Votre demande de congé pour %s à %s a été annulée.
+FollowedByACounter=1: Ce type de congé doit être suivi d'un compteur. Le compteur est incrémenté manuellement ou automatiquement et lorsqu'une demande de congé est validée, le compteur est décrémenté. <br> 0: Non suivi d'un compteur.
+NoLeaveWithCounterDefined=Il n'existe aucun type de congé défini qui doit être suivi d'un compteur
+GoIntoDictionaryHolidayTypes=Entrez dans <strong> Accueil - Configuration - Dictionnaires - Type de feuilles </ strong> pour configurer les différents types de feuilles.
diff --git a/htdocs/langs/fr_CA/install.lang b/htdocs/langs/fr_CA/install.lang
index 6cfce2c80c3..cde4cbb1e6e 100644
--- a/htdocs/langs/fr_CA/install.lang
+++ b/htdocs/langs/fr_CA/install.lang
@@ -1,3 +1,18 @@
 # Dolibarr language file - Source file is en_US - install
-WarningUpgrade=Attention:\nEst-ce que votre exécuter une sauvegarde de base de données en premier?\nIl est fortement conseillé: par exemple, en raison de quelques bugs dans les systèmes de bases de données ( pour la version exemple mysql 5.5.40 / 41 /42/ 43) , certaines données ou tables peuvent être perdues au cours de ce processus , il est donc fortement conseillé d'avoir un vidage complet de votre base de données avant de commencer migration.\n\n\nCliquez sur OK pour lancer le processus de migration ...
+PHPSupportCurl=Ce PHP supporte Curl.
+ErrorPHPDoesNotSupportCurl=Votre installation PHP ne prend pas en charge Curl.
+AdminLoginCreatedSuccessfuly=Connexion administrateur Dolibarr '<b>%s</b>' créé avec succès.
+FailedToCreateAdminLogin=Impossible de créer un compte administrateur Dolibarr.
+WarningUpgrade=Attention:\nEst-ce que vous avez effectué une sauvegarde de la base de données d'abord?\nCeci est très recommandé: par exemple, en raison de certains bogues dans les systèmes de bases de données (par exemple mysql version 5.5.40 / 41/42/43), certaines données ou tables peuvent être perdues au cours de ce processus, il est donc fortement recommandé de disposer d'un Déversement complet de votre base de données avant de commencer la migration.\n\nCliquez sur OK pour commencer le processus de migration ...
+KeepDefaultValuesWamp=Comme vous utilisez l'assistant d'installation Dolibarr depuis DoliWamp, les valeurs proposées aux paramètres sont déjà optimisées. Ne les modifier qu'en connaissance de cause.
+KeepDefaultValuesDeb=Comme vous utilisez l'assistant d'installation Dolibarr depuis un paquet Linux ou BSD (Ubuntu, Debian, Fedora, …), les valeurs proposées aux paramètres sont déjà optimisées. Seul le mot de passe du propriétaire de la base de données à créer est à renseigner. Ne modifiez les autres informations qu'en connaissance de cause.
+KeepDefaultValuesMamp=Comme vous utilisez l'assistant d'installation Dolibarr depuis DoliMamp, les valeurs proposées aux paramètres sont déjà optimisées. Ne les modifiez qu'en connaissance de cause.
+KeepDefaultValuesProxmox=Comme vous utilisez l'assistant d'installation Dolibarr depuis une machine virtuelle Proxmox, les valeurs proposées aux paramètres sont déjà optimisées. Ne les modifiez qu'en connaissance de cause.
+MigrationSuccessfullUpdate=Mise à niveau réussie
+MigrationContractsEmptyDatesUpdateSuccess=Contrat de correction de date d'emtpy effectué avec succès
+MigrationContractsIncoherentCreationDateUpdateSuccess=Correction mauvaise valeur de la date de création du contrat effectuée avec succès
+MigrationBankTransfertsUpdate=Mettre à jour les liens entre la saisie bancaire et un virement bancaire
+MigrationRemiseEntity=Mise à jour de la valeur du champ de l'entité de llx_societe_remise
+MigrationRemiseExceptEntity=Valeur du champ d'entité de mise à jour de llx_societe_remise_except
 MigrationReloadModule=Recharger module %s
+ErrorFoundDuringMigration=Des erreurs ont été signalées lors du processus de migration, alors la prochaine étape n'est pas disponible. Pour ignorer les erreurs, vous pouvez <a href="%s"> cliquer ici </a>, mais l'application ou certaines fonctionnalités peuvent ne pas fonctionner correctement jusqu'à ce qu'elles soient corrigées.
diff --git a/htdocs/langs/fr_CA/interventions.lang b/htdocs/langs/fr_CA/interventions.lang
index 46f819f49f0..5b92c324b23 100644
--- a/htdocs/langs/fr_CA/interventions.lang
+++ b/htdocs/langs/fr_CA/interventions.lang
@@ -1,2 +1,49 @@
 # Dolibarr language file - Source file is en_US - interventions
+InterventionCard=Carte d'intervention
+AddIntervention=Créer une intervention
+ActionsOnFicheInter=Actions sur l'intervention
+LastInterventions=Dernières %s interventions
+InterventionContact=Contact d'intervention
+DeleteIntervention=Supprimer l'intervention
+ValidateIntervention=Valider l'intervention
+ModifyIntervention=Modifier l'intervention
+DeleteInterventionLine=Supprimer la ligne d'intervention
+CloneIntervention=Intervention de clone
+ConfirmDeleteIntervention=Êtes-vous sûr de vouloir supprimer cette intervention?
+ConfirmValidateIntervention=Êtes-vous sûr de vouloir valider cette intervention sous le nom <b>%s</b>?
+ConfirmModifyIntervention=Êtes-vous sûr de vouloir modifier cette intervention?
+ConfirmDeleteInterventionLine=Êtes-vous sûr de vouloir supprimer cette ligne d'intervention?
+ConfirmCloneIntervention=Êtes-vous sûr de vouloir cloner cette intervention?
+NameAndSignatureOfInternalContact=Nom et signature de l'intervention:
+NameAndSignatureOfExternalContact=Nom et signature du client:
+DocumentModelStandard=Modèle de document standard pour les interventions
+InterventionCardsAndInterventionLines=Interventions et lignes d'intervention
+InterventionClassifyBilled=Classer "facturé"
+InterventionClassifyUnBilled=Classer "Non facturé"
+InterventionClassifyDone=Classer "Terminé"
 StatusInterInvoiced=Facturées
+ShowIntervention=Montrer l'intervention
+SendInterventionRef=Soumission de l'intervention %s
+SendInterventionByMail=Envoyer l'intervention par courrier électronique
+InterventionClassifiedBilledInDolibarr=Intervention %s définie comme facturée
+InterventionClassifiedUnbilledInDolibarr=Intervention %s définie comme non facturée
+InterventionDeletedInDolibarr=Intervention %s supprimé
+InterventionsArea=Zone d'intervention
+DraftFichinter=Projet d'interventions
+LastModifiedInterventions=Dernières %s interventions modifiées
+TypeContact_fichinter_external_CUSTOMER=Suivi du contact client
+PrintProductsOnFichinter=Imprimez également les lignes de type "produit" (non seulement les services) sur la carte d'intervention
+PrintProductsOnFichinterDetails=Interventions générées à partir des commandes
+UseServicesDurationOnFichinter=Utiliser la durée des services pour les interventions générées à partir des commandes
+NbOfinterventions=Nb de cartes d'intervention
+NumberOfInterventionsByMonth=Nb de cartes d'intervention par mois (date de validation)
+InterId=ID d'intervention
+InterRef=Intervention réf.
+InterDateCreation=Intervention de création de date
+InterDuration=Intervention de durée
+InterStatus=Intervention d'état
+InterNote=Note d'intervention
+InterLineId=Intervention d'identification de ligne
+InterLineDate=Intervention de la date limite
+InterLineDuration=Intervention de durée de ligne
+InterLineDesc=Intervention de description de ligne
diff --git a/htdocs/langs/fr_CA/ldap.lang b/htdocs/langs/fr_CA/ldap.lang
index bb9f35af0f5..19fb06a3b0c 100644
--- a/htdocs/langs/fr_CA/ldap.lang
+++ b/htdocs/langs/fr_CA/ldap.lang
@@ -1,2 +1,21 @@
 # Dolibarr language file - Source file is en_US - ldap
+DomainPassword=Mot de passe pour le domaine
+YouMustChangePassNextLogon=Le mot de passe pour l'utilisateur <b>%s</b> sur le domaine <b>%s</b> doit être modifié.
+UserMustChangePassNextLogon=L'utilisateur doit modifier le mot de passe sur le domaine %s
+LDAPInformationsForThisContact=Information dans la base de données LDAP pour ce contact
+LDAPInformationsForThisUser=Information dans la base de données LDAP pour cet utilisateur
+LDAPInformationsForThisGroup=Information dans la base de données LDAP pour ce groupe
+LDAPInformationsForThisMember=Information dans la base de données LDAP pour ce membre
+LDAPCard=Carte LDAP
+LDAPRecordNotFound=Enregistrement non trouvé dans la base de données LDAP
+LDAPUsers=Utilisateurs dans la base de données LDAP
 LDAPFieldStatus=État
+LDAPFieldFirstSubscriptionDate=Première date d'abonnement
+LDAPFieldFirstSubscriptionAmount=Premier montant de souscription
+LDAPFieldLastSubscriptionDate=La dernière date d'abonnement
+LDAPFieldLastSubscriptionAmount=Dernier montant de souscription
+LDAPFieldSkypeExample=Exemple: skypeName
+UserSynchronized=Synchronisé par l'utilisateur
+MemberSynchronized=Membre synchronisé
+ForceSynchronize=Force la synchronisation Dolibarr -> LDAP
+ErrorFailedToReadLDAP=Impossible de lire la base de données LDAP. Vérifiez l'installation du module LDAP et l'accessibilité de la base de données.
diff --git a/htdocs/langs/fr_CA/mails.lang b/htdocs/langs/fr_CA/mails.lang
index 71ecef377dd..b17db32f75b 100644
--- a/htdocs/langs/fr_CA/mails.lang
+++ b/htdocs/langs/fr_CA/mails.lang
@@ -1,2 +1,127 @@
 # Dolibarr language file - Source file is en_US - mails
+Mailing=Emission
+EMailing=Emission
+AllEMailings=Tous les eMailings
+MailCard=Carte de préhension
+MailRecipients=Récipiendaires
+MailRecipient=Bénéficiaire
+MailFrom=Expéditeur
+MailReply=Répondre à
+MailTo=Récepteur (s)
+MailCC=Copier
+MailCCC=Copie en cache vers
+MailTopic=Sujet EMail
+MailMessage=Courrier électronique
+ShowEMailing=Afficher le courrier électronique
+ListOfEMailings=Liste des courriers électroniques
+NewMailing=Nouveau courrier électronique
+EditMailing=Modifier le courrier électronique
+ResetMailing=Renvoyer l'envoi par courrier électronique
+DeleteMailing=Supprimer l'envoi par courrier électronique
+DeleteAMailing=Supprimer un courrier électronique
+PreviewMailing=Aperçu de l'envoi par courrier électronique
+CreateMailing=Créer un email
+TestMailing=E-mail de test
+ValidMailing=Courrier électronique valide
 MailingStatusValidated=Validée
+MailSuccessfulySent=Courrier électronique (de %s à %s) accepté avec succès pour la livraison
+MailingSuccessfullyValidated=Emission validée avec succès
+MailUnsubcribe=Se désabonner
+MailingStatusReadAndUnsubscribe=Lire et se désabonner
+ErrorMailRecipientIsEmpty=Le destinataire du courrier électronique est vide
+WarningNoEMailsAdded=Pas de nouveau courrier électronique pour ajouter à la liste des destinataires.
+ConfirmValidMailing=Êtes-vous sûr de vouloir valider ce courrier électronique?
+ConfirmResetMailing=Avertissement, en réinitialisant le courrier électronique <b>%s</b>, vous permettez de faire un envoi en masse de cet email à un autre moment. Êtes-vous sûr que c'est ce que vous voulez faire?
+ConfirmDeleteMailing=Êtes-vous sûr de vouloir supprimer cette mise en cache?
+NbOfUniqueEMails=Nb d'emails uniques
+TotalNbOfDistinctRecipients=Nombre de destinataires distincts
+NoTargetYet=Pas encore de destinataires définis (Passez sur l'onglet 'Récipients')
+RemoveRecipient=Supprimer le destinataire
+YouCanAddYourOwnPredefindedListHere=Pour créer votre module sélecteur de messagerie, voir htdocs / core / modules / mailings / README.
+EMailTestSubstitutionReplacedByGenericValues=Lors de l'utilisation du mode de test, les variables de substitution sont remplacées par des valeurs génériques
+MailingAddFile=Joignez ce fichier
+NoAttachedFiles=Pas de fichiers joints
+BadEMail=Mauvaise valeur pour EMail
+ConfirmCloneEMailing=Êtes-vous sûr de vouloir cloner ce courrier électronique?
+CloneReceivers=Récipiendaires Cloner
+DateLastSend=Date de l'envoi le plus récent
+DateSending=Envoi de la date
+SentTo=Envoyé à <b>%s</b>
+MailingStatusRead=Lis
+YourMailUnsubcribeOK=Le courrier électronique <b>%s</b> est correctement désactivé à partir de la liste de diffusion
+ActivateCheckReadKey=Clé utilisée pour chiffrer l'URL utilisée pour la fonctionnalité "Réception de lecture" et "Désinscription"
+EMailSentToNRecipients=EMail envoyé aux destinataires %s.
+EMailSentForNElements=EMail envoyé pour les éléments %s.
+XTargetsAdded=<b>%s</b> les destinataires ajoutés dans la liste cible
+OnlyPDFattachmentSupported=Si le document PDF a déjà été généré pour l'objet à envoyer, il sera joint au courrier électronique. Sinon, aucun courrier électronique ne sera envoyé (notez également que seuls les documents pdf sont pris en charge comme pièce jointe dans l'envoi de masse dans cette version).
+AllRecipientSelected=Toutes les tierces parties sélectionnées et si un courrier électronique est défini.
+ResultOfMailSending=Résultat de la messe EMail envoi
+NbIgnored=Nb a ignoré
+ConfirmUnvalidateEmailing=Êtes-vous sûr de vouloir modifier le courrier électronique <b>%s</b> pour rédiger un état?
+MailingModuleDescContactsWithThirdpartyFilter=Contact avec les filtres clients
+MailingModuleDescContactsByCompanyCategory=Contacts par catégorie de tiers
+MailingModuleDescContactsByCategory=Contacts par catégories
+MailingModuleDescContactsByFunction=Contacts par poste
+LineInFile=Ligne %s dans le fichier
+RecipientSelectionModules=Demandes définies pour la sélection du destinataire
+MailSelectedRecipients=Récipiendaires sélectionnés
+MailingArea=Zone d'édition
+LastMailings=Derniers %s messages électroniques
+TargetsStatistics=Statistiques des cibles
+NbOfCompaniesContacts=Contacts / adresses uniques
+MailNoChangePossible=Les destinataires pour les courriers électroniques validés ne peuvent pas être modifiés
+SearchAMailing=Chercher l'envoi postal
+SendMailing=Envoyer un courrier électronique
+SendMail=Envoyer un courrier électronique
+SentBy=Envoyée par
+MailingNeedCommand=L'envoi d'un courrier électronique peut être effectué à partir de la ligne de commande. Demandez à votre administrateur du serveur de lancer la commande suivante pour envoyer le courrier électronique à tous les destinataires:
+MailingNeedCommand2=Vous pouvez cependant les envoyer en ligne en ajoutant le paramètre MAILING_LIMIT_SENDBYWEB avec la valeur du nombre maximum d'emails que vous souhaitez envoyer par session. Pour cela, passez à la page d'accueil - Configuration - Autre.
+ConfirmSendingEmailing=Si vous souhaitez envoyer des courriels directement à partir de cet écran, veuillez confirmer que vous souhaitez envoyer des courriels maintenant depuis votre navigateur?
+LimitSendingEmailing=Remarque: l'envoi de courriels à partir de l'interface Web se fait plusieurs fois pour des raisons de sécurité et de délai, <b>%s</b> destinataires à la fois pour chaque session d'envoi.
+TargetsReset=Effacer la liste
+ToClearAllRecipientsClickHere=Cliquez ici pour effacer la liste des destinataires pour ce courrier électronique
+ToAddRecipientsChooseHere=Ajouter les destinataires en choisissant parmi les listes
+NbOfEMailingsReceived=Courrier électronique de masse reçu
+NbOfEMailingsSend=Envoi massif envoyé
+IdRecord=Enregistrement d'identité
+YouCanUseCommaSeparatorForSeveralRecipients=Vous pouvez utiliser le séparateur <b> virgule </b> pour spécifier plusieurs destinataires.
+TagCheckMail=Suivre l'ouverture du courrier
+TagUnsubscribe=Désinscription lien
+TagSignature=Signature envoyant l'utilisateur
+EMailRecipient=Destinataire E-mail
+TagMailtoEmail=Lien de courrier électronique du destinataire (y compris html "mailto:")
+NoEmailSentBadSenderOrRecipientEmail=Aucun courriel envoyé. Mauvais expéditeur ou courrier électronique du destinataire. Vérifiez le profil de l'utilisateur.
+NoNotificationsWillBeSent=Aucune notification par courrier électronique n'est prévue pour cet événement et cette entreprise
+ANotificationsWillBeSent=1 notification sera envoyée par courrier électronique
+SomeNotificationsWillBeSent=%s les notifications seront envoyées par courrier électronique
+AddNewNotification=Activer un nouvel objectif / événement de notification par courrier électronique
+ListOfActiveNotifications=Liste tous les cibles / événements actifs pour la notification par courrier électronique
+ListOfNotificationsDone=Liste toutes les notifications par courrier électronique envoyées
+MailSendSetupIs=La configuration de l'envoi de courrier électronique a été configurée sur '%s'. Ce mode ne peut pas être utilisé pour envoyer des messages électroniques de masse.
+MailSendSetupIs2=Vous devez d'abord aller, avec un compte admin, dans le menu %sHome - Configuration - EMails%s pour modifier le paramètre <strong> '%s' </strong>pour utiliser le mode '%s'. Avec ce mode, vous pouvez entrer dans la configuration du serveur SMTP fourni par votre fournisseur de services Internet et utiliser la fonctionnalité de messagerie en masse.
+MailSendSetupIs3=Si vous avez des questions sur la configuration de votre serveur SMTP, vous pouvez demander à %s.
+YouCanAlsoUseSupervisorKeyword=Vous pouvez également ajouter le mot-clé <strong> __ SUPERVISOREMAIL __ </ strong> pour que le courrier électronique soit envoyé au superviseur de l'utilisateur (fonctionne uniquement si un email est défini pour ce superviseur)
+NbOfTargetedContacts=Nombre actuel d'emails de contact ciblés
+UseFormatFileEmailToTarget=Le fichier importé doit avoir un format <strong> email; nom; prénom; autre </ strong>
+UseFormatInputEmailToTarget=Entrez une chaîne avec le format <strong> email; nom; prénom; autre </ strong>
+MailAdvTargetRecipients=Récipiendaires (sélection avancée)
+AdvTgtTitle=Remplissez les champs de saisie pour présélectionner les tierces parties ou les contacts / adresses à cibler
+AdvTgtSearchTextHelp=Utilisez %% comme caractères magiques. Par exemple, pour trouver tous les éléments comme <b> jean, joe, jim</b>, vous pouvez entrer <b> j%%</b>, vous pouvez également utiliser; Comme séparateur pour la valeur et l'utilisation! Sauf pour cette valeur. Par exemple <b> jean; joe; jim%%;! jimo;! Jima% </b> ciblera tous jean, joe, commence par jim mais pas jimo et pas tout le monde commence par jima
+AdvTgtSearchIntHelp=Intervalle d'utilisation pour sélectionner la valeur int ou flottante
+AdvTgtMinVal=Valeur minimale
+AdvTgtSearchDtHelp=Intervalle d'utilisation pour sélectionner la valeur de la date
+AdvTgtStartDt=Démarrez dt.
+AdvTgtEndDt=Fin dt.
+AdvTgtTypeOfIncudeHelp=Email cible de tiers et courrier électronique de contact du tiers, ou simplement un courrier électronique de tiers ou simplement un courrier électronique de contact
+AdvTgtTypeOfIncude=Type d'email ciblé
+AdvTgtContactHelp=Utilisez uniquement si vous ciblez le contact dans "Type d'email ciblé"
+RemoveAll=Enlever tout
+ItemsCount=Articles)
+AdvTgtAddContact=Ajouter les emails selon les critères
+AdvTgtLoadFilter=Filtre de charge
+AdvTgtDeleteFilter=Supprimer le filtre
+AdvTgtCreateFilter=Créer un filtre
+NoContactWithCategoryFound=Aucun contact / adresse avec une catégorie trouvée
+NoContactLinkedToThirdpartieWithCategoryFound=Aucun contact / adresse avec une catégorie trouvée
+OutGoingEmailSetup=Configuration de messagerie sortante
+InGoingEmailSetup=Configuration de messagerie entrante
diff --git a/htdocs/langs/fr_CA/main.lang b/htdocs/langs/fr_CA/main.lang
index e0e41b700d6..15a815ae518 100644
--- a/htdocs/langs/fr_CA/main.lang
+++ b/htdocs/langs/fr_CA/main.lang
@@ -1,9 +1,5 @@
 # Dolibarr language file - Source file is en_US - main
 DIRECTION=ltr
-# Note for Chinese:
-# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
-# stsongstdlight or cid0cs are for simplified Chinese
-# To read Chinese pdf with Linux: sudo apt-get install poppler-data
 FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=,
@@ -24,798 +20,159 @@ FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Connexion à la base de donnée
-NoTemplateDefined=No template defined for this email type
-AvailableVariables=Available substitution variables
-NoTranslation=Pas de traduction
-NoRecordFound=Aucun enregistrement trouvé
-NoRecordDeleted=No record deleted
-NotEnoughDataYet=Not enough data
-NoError=Aucune erreur
-Error=Erreur
-Errors=Erreurs
-ErrorFieldRequired=Le champ '%s' est obligatoire
-ErrorFieldFormat=Le champ '%s' a une valeur incorrecte
-ErrorFileDoesNotExists=Le fichier %s n'existe pas
-ErrorFailedToOpenFile=Impossible d'ouvrir le fichier %s
-ErrorCanNotCreateDir=Cannot create dir %s
-ErrorCanNotReadDir=Cannot read dir %s
-ErrorConstantNotDefined=Paramètre %s non défini
-ErrorUnknown=Erreur inconnue
-ErrorSQL=Erreur SQL
-ErrorLogoFileNotFound=Le fichier logo '%s' n'a pas été trouvé
-ErrorGoToGlobalSetup=Allez dans la Configuration 'Société/Institution' pour corriger
-ErrorGoToModuleSetup=Allez dans la Configuration du module pour corriger
-ErrorFailedToSendMail=Échec de l'envoi de l'email (émetteur=%s, destinataire=%s)
-ErrorFileNotUploaded=Le fichier n'a pas été transféré. Vérifiez que sa taille ne dépasse pas le maxium autorisé, que l'espace disque est disponible et qu'un fichier du même nom n'existe pas déjà.
-ErrorInternalErrorDetected=Erreur détectée
-ErrorWrongHostParameter=Mauvais paramètre Serveur
-ErrorYourCountryIsNotDefined=Votre pays n'est pas défini. Corriger en allant dans Accueil-Configuration-Société/Institution-Editer.
-ErrorRecordIsUsedByChild=Impossible de supprimer cet enregistrement. Ce dernier est utilisé en tant que père par au moins un enregistrement fils.
-ErrorWrongValue=Valeur incorrecte
-ErrorWrongValueForParameterX=Valeur incorrecte pour le paramètre %s
-ErrorNoRequestInError=Aucune requête en erreur
-ErrorServiceUnavailableTryLater=Service non disponible actuellement. Réessayer plus tard.
-ErrorDuplicateField=Doublon dans un champ unique
-ErrorSomeErrorWereFoundRollbackIsDone=Des erreurs ont été trouvées. On rollback les modifications.
-ErrorConfigParameterNotDefined=Le paramètre <b>%s</b> n'est pas défini dans le fichier de configuration Dolibarr <b>conf.php</b>.
-ErrorCantLoadUserFromDolibarrDatabase=Impossible de trouver l'utilisateur <b>%s</b> dans la base Dolibarr.
-ErrorNoVATRateDefinedForSellerCountry=Erreur, aucun taux tva défini pour le pays '%s'.
+NoTemplateDefined=Aucun modèle défini pour ce type de courrier électronique
+ErrorCanNotCreateDir=Impossible de créer le dir %s
+ErrorCanNotReadDir=Impossible de lire le dir %s
+ErrorGoToGlobalSetup=Accédez à la configuration 'Société / Organisation' pour corriger cela
 ErrorNoSocialContributionForSellerCountry=Erreur, aucun type de charges défini pour le pays '%s'.
-ErrorFailedToSaveFile=Erreur, l'enregistrement du fichier a échoué.
-ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
-NotAuthorized=You are not authorized to do that.
-SetDate=Définir date
-SelectDate=Sélectionnez une date
-SeeAlso=Voir aussi %s
-SeeHere=Regardez ici
-Apply=Appliquer
-BackgroundColorByDefault=Couleur de fond
-FileRenamed=The file was successfully renamed
-FileUploaded=Le fichier a été transféré avec succès
-FileGenerated=The file was successfully generated
-FileWasNotUploaded=Un fichier a été sélectionné pour attachement mais n'a pas encore été uploadé. Cliquez sur "Joindre ce fichier" pour cela.
-NbOfEntries=Nb d'entrées
-GoToWikiHelpPage=Read online help (Internet access needed)
-GoToHelpPage=Consulter l'aide
-RecordSaved=Enregistrement sauvegardé
-RecordDeleted=Enregistrement supprimé
-LevelOfFeature=Niveau de fonctionnalités
-NotDefined=Non défini
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
-Administrator=Administrateur
-Undefined=Non défini
-PasswordForgotten=Password forgotten?
-SeeAbove=Voir ci-dessus
-HomeArea=Espace accueil
-LastConnexion=Latest connection
-PreviousConnexion=Connexion précédente
-PreviousValue=Previous value
-ConnectedOnMultiCompany=Connexion sur l'entité
-ConnectedSince=Connecté depuis
-AuthenticationMode=Authentication mode
-RequestedUrl=Requested URL
-DatabaseTypeManager=Type gestionnaire de base de données
-RequestLastAccessInError=Latest database access request error
-ReturnCodeLastAccessInError=Return code for latest database access request error
-InformationLastAccessInError=Information for latest database access request error
-DolibarrHasDetectedError=Dolibarr a détecté une erreur technique
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes
-MoreInformation=Plus d'information
-TechnicalInformation=Informations techniques
-TechnicalID=Technical ID
-NotePublic=Note (publique)
-NotePrivate=Note (privée)
-PrecisionUnitIsLimitedToXDecimals=Dolibarr a été configuré pour limiter la précision des prix unitaires à <b>%s</b> décimales.
-DoTest=Tester
-ToFilter=Filtrer
-NoFilter=Pas de filtre
-WarningYouHaveAtLeastOneTaskLate=Attention, vous avez au moins un élément qui a dépassé le délai de tolérance de retard.
-yes=oui
-Yes=Oui
-no=non
-No=Non
-All=Tout
-Home=Accueil
-Help=Aide
-OnlineHelp=Aide en ligne
-PageWiki=Page Wiki
-MediaBrowser=Media browser
-Always=Toujours
-Never=Jamais
-Under=sous
-Period=Période
-PeriodEndDate=Date fin période
-Activate=Activer
-Activated=Activé
-Closed=Clôturé
-Closed2=Fermé
-NotClosed=Not closed
-Enabled=Actif
-Deprecated=Obsolète
-Disable=Désactiver
-Disabled=Désactivé
-Add=Ajouter
-AddLink=Lier
+ErrorCannotAddThisParentWarehouse=Vous essayez d'ajouter un entrepôt parent qui est déjà un enfant de l'actuel
+MaxNbOfRecordPerPage=Nombre maximum d'enregistrements par page
+NotAuthorized=Vous n'êtes pas autorisé à le faire.
+GoToWikiHelpPage=Lire l'aide en ligne (accès Internet nécessaire)
+DolibarrInHttpAuthenticationSoPasswordUseless=Le mode d'authentification Dolibarr est défini sur <b>%s</b> dans le fichier de configuration <b>conf.php</b>.<br> Cela signifie que la base de données de mots de passe est externe à Dolibarr, donc changer ce champ peut ne pas avoir d'effet .
+PasswordForgotten=Mot de passe oublié?
+AuthenticationMode=Mode d'authentification
+RequestedUrl=URL requise
+RequestLastAccessInError=Erreur de demande d'accès à la base de données la plus récente
+ReturnCodeLastAccessInError=Code de retour pour la dernière erreur de demande d'accès à la base de données
+InformationLastAccessInError=Informations pour la dernière erreur de demande d'accès à la base de données
+InformationToHelpDiagnose=Cette information peut être utile à des fins de diagnostic
+TechnicalID=ID technique
+MediaBrowser=Navigateur multimédia
+NotClosed=Pas fermé
 RemoveLink=Supprimer lien
-AddToDraft=Add to draft
-Update=Modifier
-Close=Clôturer
-CloseBox=Remove widget from your dashboard
-Confirm=Confirmer
-ConfirmSendCardByMail=Do you really want to send content of this card by mail to <b>%s</b>?
-Delete=Supprimer
-Remove=Enlever
-Resiliate=Terminate
-Cancel=Annuler
-Modify=Modifier
-Edit=Éditer
-Validate=Valider
-ValidateAndApprove=Valider et Approuver
-ToValidate=À valider
-Save=Enregistrer
-SaveAs=Enregistrer sous
-TestConnection=Tester la connexion
-ToClone=Cloner
-ConfirmClone=Veuillez choisir votre option de clonage :
-NoCloneOptionsSpecified=Aucun option de clonage n'a été spécifiée.
-Of=du
-Go=Aller
-Run=Lancer
-CopyOf=Copie de
-Show=Voir
-Hide=Hide
-ShowCardHere=Voir la fiche ici
-Search=Rechercher
-SearchOf=Recherche de
-Valid=Valider
-Approve=Approuver
-Disapprove=Désapprouver
-ReOpen=Réouvrir
-Upload=Envoyer fichier
-ToLink=Lier
-Select=Sélectionner
-Choose=Choisir
-Resize=Redimensionner
-Recenter=Recadrer
-Author=Auteur
-User=Utilisateur
-Users=Utilisateurs
-Group=Groupe
-Groups=Groupes
-NoUserGroupDefined=Pas de groupe utilisateur défini
-Password=Mot de passe
-PasswordRetype=Retaper le mot de passe
+AddToDraft=Ajouter au projet
+CloseBox=Supprimer le widget de votre tableau de bord
+ConfirmSendCardByMail=Voulez-vous vraiment envoyer le contenu de cette carte par mail à <b>%s</b>?
+Resiliate=Mettre fin
+NotValidated=Pas validé
 NoteSomeFeaturesAreDisabled=Attention, seules quelques modules/fonctionnalités ont été activés dans cette démo.
-Name=Nom
-Person=Personne
-Parameter=Paramètre
-Parameters=Paramètres
-Value=Valeur
-PersonalValue=Valeur personnelle
-NewValue=Nouvelle valeur
-CurrentValue=Valeur courante
-Code=Code
-Type=Type
-Language=Langue
-MultiLanguage=Multi-langage
-Note=Note
-Title=Titre
-Label=Libellé
-RefOrLabel=Réf. ou libellé
-Info=Suivi
-Family=Famille
-Description=Description
-Designation=Description
-Model=Doc template
-DefaultModel=Default doc template
-Action=Action
-About=À propos
-Number=Nombre
-NumberByMonth=Nombre par mois
-AmountByMonth=Montant par mois
-Numero=Numéro
-Limit=Limite
-Limits=Limites
-Logout=Déconnexion
-NoLogoutProcessWithAuthMode=Pas de fonctionnalité de déconnexion applicative avec le mode d'authentification <b>%s</b>
-Connection=Connexion
-Setup=Configuration
-Alert=Alerte
-Previous=Précédent
-Next=Suivant
-Cards=Fiches
-Card=Fiche
-Now=Maintenant
-HourStart=Heure de début
-Date=Date
-DateAndHour=Date et heure
-DateToday=Today's date
-DateReference=Reference date
+DefaultModel=Modèle de docteur par défaut
+DateToday=La date d'aujourd'hui
 DateStart=Date de début
 DateEnd=Date de fin
-DateCreation=Date création
-DateCreationShort=Creat. date
-DateModification=Date modification
-DateModificationShort=Date modif.
-DateLastModification=Latest modification date
-DateValidation=Date validation
-DateClosing=Date clôture
-DateDue=Date échéance
-DateValue=Date valeur
-DateValueShort=Date valeur
-DateOperation=Date opération
-DateOperationShort=Date opé.
-DateLimit=Date limite
-DateRequest=Date demande
-DateProcess=Date traitement
-DateBuild=Date génération du rapport
-DatePayment=Date paiement
-DateApprove=Date approbation
-DateApprove2=Date approbation (deuxième approbation)
-UserCreation=Creation user
-UserModification=Modification user
-UserCreationShort=Creat. user
-UserModificationShort=Modif. user
-DurationYear=an
-DurationMonth=mois
-DurationWeek=semaine
-DurationDay=jour
-DurationYears=ans
-DurationMonths=mois
-DurationWeeks=semaines
-DurationDays=jours
-Year=Année
-Month=Mois
-Week=Semaine
-WeekShort=Semaine
-Day=Jour
-Hour=Heure
-Minute=Minute
-Second=Seconde
-Years=Années
-Months=Mois
-Days=Jours
-days=jours
-Hours=Heures
-Minutes=Minutes
-Seconds=Secondes
-Weeks=Semaines
-Today=Aujourd'hui
-Yesterday=Hier
-Tomorrow=Demain
-Morning=Matin
-Afternoon=Après-midi
-Quadri=Trimestre
-MonthOfDay=Mois du jour
-HourShort=H
-MinuteShort=mn
-Rate=Taux
-CurrencyRate=Currency conversion rate
+DateCreationShort=Création. rendez-vous amoureux
+DateLastModification=Dernière date de modification
+UserCreation=Utilisateur de la création
+UserModification=Modification utilisateur
+UserCreationShort=Création. utilisateur
+UserModificationShort=Modif. utilisateur
+CurrencyRate=Taux de conversion monétaire
 UseLocalTax=Inclure taxe
-Bytes=Octets
-KiloBytes=Kilooctets
-MegaBytes=Mégaoctets
-GigaBytes=Gigaoctets
-TeraBytes=Teraoctets
-b=o.
-Kb=Ko
-Mb=Mo
-Gb=Go
-Tb=To
-Cut=Couper
-Copy=Copier
-Paste=Coller
-Default=Défaut
-DefaultValue=Valeur par défaut
-Price=Prix
-UnitPrice=Prix unitaire
+DefaultValues=Les valeurs par défaut
 UnitPriceHT=Prix unitaire (no tax.)
 UnitPriceTTC=Prix unitaire tx incl.
-PriceU=P.U.
 PriceUHT=Prix
-PriceUHTCurrency=U.P (currency)
+PriceUHTCurrency=U.P (devise)
 PriceUTTC=P.U. (tx incl.)
-Amount=Montant
-AmountInvoice=Montant facture
-AmountPayment=Montant paiement
 AmountHTShort=Montant (no tax.)
 AmountTTCShort=Montant (tx incl.)
 AmountHT=Montant (no tax.)
 AmountTTC=Montant (tx incl.)
 AmountVAT=Montant TPS/TVH
-MulticurrencyAlreadyPaid=Already payed, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
-MulticurrencyAmountHT=Amount (net of tax), original currency
-MulticurrencyAmountTTC=Amount (inc. of tax), original currency
-MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencyAlreadyPaid=Déjà payé, monnaie d'origine
+MulticurrencyRemainderToPay=Reste à payer, monnaie d'origine
+MulticurrencyPaymentAmount=Montant du paiement, monnaie d'origine
+MulticurrencyAmountHT=Montant (net d'impôt), monnaie d'origine
+MulticurrencyAmountTTC=Montant (hors taxe), monnaie d'origine
+MulticurrencyAmountVAT=Montant de l'impôt, monnaie d'origine
 AmountLT1=Montant TVQ
-AmountLT2=Montant Tax 3
-AmountLT1ES=Montant RE
-AmountLT2ES=Montant IRPF
-AmountTotal=Montant total
-AmountAverage=Montant moyen
 PriceQtyMinHT=Prix quantité min. (no tax.)
-Percentage=Pourcentage
-Total=Total
-SubTotal=Sous-total
 TotalHTShort=Total (no tax.)
-TotalHTShortCurrency=Total (net in currency)
+TotalHTShortCurrency=Total (en devise nette)
 TotalTTCShort=Total (tx incl.)
 TotalHT=Sous-total
 TotalHTforthispage=Montant (no tax.) pour la page
-Totalforthispage=Total for this page
 TotalTTC=Total
 TotalTTCToYourCredit=Total (tx incl.) à votre crédit
 TotalVAT=Total TPS/TVH
 TotalLT1=Total TVQ
-TotalLT2=Total Taxe 3
-TotalLT1ES=Total RE
-TotalLT2ES=Total IRPF
 HT=no tax.
 TTC=tx incl.
 VAT=TPS/TVH
 VATs=Taxes de vente
-LT1ES=RE
-LT2ES=IRPF
 VATRate=Taux TPS/TVH
-Average=Moyenne
-Sum=Somme
-Delta=Écart
-Module=Module
-Option=Option
-List=Liste
-FullList=Liste complète
-Statistics=Statistiques
-OtherStatistics=Autres statistiques
-Status=État
-Favorite=Favori
-ShortInfo=Infos
-Ref=Réf.
-ExternalRef=Réf. externe
-RefSupplier=Réf. fournisseur
-RefPayment=Réf. paiement
-CommercialProposalsShort=Propositions/devis
-Comment=Commentaire
-Comments=Commentaires
-ActionsToDo=Événements à faire
-ActionsToDoShort=À faire
-ActionsDoneShort=Effectuées
-ActionNotApplicable=Non applicable
-ActionRunningNotStarted=A réaliser
-ActionRunningShort=In progress
-ActionDoneShort=Terminé
-ActionUncomplete=Incomplets
-CompanyFoundation=Société ou institution
-ContactsForCompany=Contacts de ce tiers
-ContactsAddressesForCompany=Contacts/adresses de ce tiers
-AddressesForCompany=Adresses de ce tiers
-ActionsOnCompany=Événements vis à vis de ce tiers
-ActionsOnMember=Événements vis à vis de cet adhérent
-NActionsLate=%s en retard
-RequestAlreadyDone=Requête déjà enregistrée
-Filter=Filtre
-FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
-RemoveFilter=Supprimer filtre
-ChartGenerated=Graphiques générés
-ChartNotGenerated=Graphique non généré
-GeneratedOn=Généré le %s
-Generate=Générer
-Duration=Durée
-TotalDuration=Durée totale
-Summary=Résumé
-DolibarrStateBoard=Statistiques
-DolibarrWorkBoard=Tableau de bord de travail
-Available=Disponible
-NotYetAvailable=Pas encore disponible
-NotAvailable=Non disponible
-Categories=Tags/catégories
-Category=Tag/catégorie
-By=Par
-From=Du
-to=au
-and=et
-or=ou
-Other=Autre
-Others=Autres
-OtherInformations=Autres informations
-Quantity=Quantité
-Qty=Qté
-ChangedBy=Modifié par
-ApprovedBy=Approuvé par
-ApprovedBy2=Approuvé par (deuxième approbation)
+Module=Module / Application
+Modules=Modules / Applications
+CompanyFoundation=Société / Organisation
+FilterOnInto=Critères de recherche '<strong>%s</strong>' dans les champs %s
+DolibarrStateBoard=Statistiques de base de données
+DolibarrWorkBoard=Ouvrir le tableau de bord des éléments
 Approved=Approuver
-Refused=Refusé
-ReCalculate=Recalculer
-ResultKo=Échec
-Reporting=Rapport
-Reportings=Rapports
-Draft=Brouillon
-Drafts=Brouillons
-Validated=Validé
-Opened=Opened
-New=Nouveau
-Discount=Remise
-Unknown=Inconnu
-General=Général
-Size=Taille
-Received=Reçu
-Paid=Payé
-Topic=Sujet
-ByCompanies=Par tiers
-ByUsers=Par utilisateur
-Links=Liens
-Link=Lien
-Rejects=Rejets
-Preview=Aperçu
-NextStep=Étape suivante
-Datas=Données
-None=Aucun
-NoneF=Aucune
-Late=Retard
-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.
-Photo=Photo
-Photos=Photos
-AddPhoto=Ajouter photo
+Opened=Ouverte
+LateDesc=Retard pour définir si un enregistrement est en retard ou non dépend de votre configuration. Demandez à votre administrateur de modifier le délai du menu Accueil - Configuration - Alertes.
 DeletePicture=Supprimer image
 ConfirmDeletePicture=Etes-vous sur de vouloir supprimer cette image ?
-Login=Identifiant
-CurrentLogin=Identifiant courant
-EnterLoginDetail=Enter login details
-January=janvier
-February=février
-March=mars
-April=avril
-May=mai
-June=juin
-July=juillet
-August=août
-September=septembre
-October=octobre
-November=novembre
-December=décembre
-JanuaryMin=Jan
-FebruaryMin=Fév
-MarchMin=Mars
-AprilMin=Avr
-MayMin=Mai
-JuneMin=Juin
-JulyMin=Juil
-AugustMin=Août
-SeptemberMin=Sep
-OctoberMin=Oct
-NovemberMin=Nov
-DecemberMin=Déc
-Month01=Janvier
-Month02=Février
-Month03=Mars
-Month04=Avril
-Month05=Mai
-Month06=Juin
-Month07=Juillet
-Month08=Août
-Month09=Septembre
-Month10=Octobre
-Month11=Novembre
-Month12=Décembre
-MonthShort01=Jan.
-MonthShort02=Fév.
-MonthShort03=Mars
-MonthShort04=Avr.
-MonthShort05=Mai
-MonthShort06=Juin
-MonthShort07=Juil.
-MonthShort08=Août
-MonthShort09=Sep.
-MonthShort10=Oct.
-MonthShort11=Nov.
-MonthShort12=Déc.
-AttachedFiles=Fichiers et documents joints
-FileTransferComplete=Le fichier a été correctement transféré
-DateFormatYYYYMM=YYYY-MM
-DateFormatYYYYMMDD=YYYY-MM-DD
-DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
-ReportName=Nom du rapport
-ReportPeriod=Période d'analyse
-ReportDescription=Description
-Report=Rapport
-Keyword=Keyword
-Origin=Origin
-Legend=Légende
-Fill=Remplir
-Reset=Vider
-File=Fichier
-Files=Fichiers
-NotAllowed=Non autorisé
-ReadPermissionNotAllowed=Lecture non autorisée
-AmountInCurrency=Montants exprimés en %s
-Example=Exemple
-Examples=Exemples
-NoExample=Pas d'exemple
-FindBug=Signaler un bug
-NbOfThirdParties=Nombre de tiers
-NbOfLines=Nombre de lignes
-NbOfObjects=Nombre d'objets
-NbOfObjectReferers=Number of related items
-Referers=Related items
-TotalQuantity=Quantité totale
-DateFromTo=Du %s au %s
-DateFrom=A partir du %s
-DateUntil=Jusqu'au %s
-Check=Vérifier
-Uncheck=Décocher
-Internal=Interne
-External=Externe
-Internals=Internes
-Externals=Externes
-Warning=Alerte
-Warnings=Alertes
-BuildDoc=Générer le doc
-Entity=Environnement
-Entities=Environnements
-CustomerPreview=Aperçu client
-SupplierPreview=Aperçu fournisseur
-ShowCustomerPreview=Afficher aperçu client
-ShowSupplierPreview=Afficher aperçu fournisseur
-RefCustomer=Réf. client
-Currency=Devise
-InfoAdmin=Information pour les administrateurs
-Undo=Annuler
-Redo=Refaire
-ExpandAll=Tout dérouler
-UndoExpandAll=Annuler déroulement
-Reason=Raison
-FeatureNotYetSupported=Fonctionnalité pas encore prise en charge
-CloseWindow=Fermer fenêtre
-Response=Réponse
-Priority=Priorité
-SendByMail=Envoyer par email
-MailSentBy=Mail envoyé par
-TextUsedInTheMessageBody=Corps du message
-SendAcknowledgementByMail=Send confirmation email
+EnterLoginDetail=Entrez les détails de connexion
+NbOfObjectReferers=Nombre d'articles connexes
+Referers=Articles connexes
+SendAcknowledgementByMail=Envoyer un email de confirmation
 EMail=Courriel
-NoEMail=Pas d'email
-Email=Email
-NoMobilePhone=Pas de téléphone portable
-Owner=Propriétaire
-FollowingConstantsWillBeSubstituted=Les constantes suivantes seront substituées par leur valeur correspondante.
-Refresh=Rafraichir
-BackToList=Retour liste
-GoBack=Retour arrière
-CanBeModifiedIfOk=Peut être modifié si valide
-CanBeModifiedIfKo=Peut être modifié si invalide
-ValueIsValid=Valeur valide
-ValueIsNotValid=Value is not valid
-RecordCreatedSuccessfully=Record created successfully
-RecordModifiedSuccessfully=Enregistrement modifié avec succès
-RecordsModified=%s record modified
-RecordsDeleted=%s record deleted
-AutomaticCode=Création automatique du code
-FeatureDisabled=Fonction désactivée
-MoveBox=Move widget
-Offered=Offert
-NotEnoughPermissions=Vous n'avez pas les permissions pour cette action
-SessionName=Nom session
-Method=Méthode
-Receive=Réceptionner
-CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
-ExpectedValue=Expected Value
-CurrentValue=Valeur courante
-PartialWoman=Partielle
-TotalWoman=Totale
-NeverReceived=Jamais reçu
-Canceled=Annulé
-YouCanChangeValuesForThisListFromDictionarySetup=Vous pouvez changer ces valeurs depuis le menu accueil - configuration - dictionnaires
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
-Color=Couleur
-Documents=Fichiers joints
-Documents2=Documents
-UploadDisabled=Transfert désactivé
-MenuECM=Documents
-MenuAWStats=AWStats
-MenuMembers=Adhérents
-MenuAgendaGoogle=Agenda Google
-ThisLimitIsDefinedInSetup=Limite Dolibarr (Menu accueil-configuration-sécurité): %s Ko, Limite PHP: %s Ko
-NoFileFound=Pas de documents stockés dans cette rubrique
-CurrentUserLanguage=Langue utilisateur actuelle
-CurrentTheme=Thème courant
-CurrentMenuManager=Gestionnaire de menu courant
-Browser=Navigateur
-Layout=Layout
-Screen=Screen
-DisabledModules=Modules désactivés
-For=Pour
-ForCustomer=Pour le client
-Signature=Signature
-DateOfSignature=Date of signature
-HidePassword=Afficher commande avec mot de passe masqué
-UnHidePassword=Afficher commande réelle avec mot de passe en clair
-Root=Racine
-Informations=Informations
-Page=Page
-Notes=Notes
-AddNewLine=Ajout nouvelle ligne
-AddFile=Ajouter fichier
-FreeZone=Ligne en saisie libre
-FreeLineOfType=Ligne libre de type
-CloneMainAttributes=Cloner l'objet avec ces attributs principaux
-PDFMerge=Fusion PDF
-Merge=Fusion
-PrintContentArea=Afficher page d'impression de la zone centrale
-MenuManager=Gestionnaire de menu
-WarningYouAreInMaintenanceMode=Attention, vous êtes en mode maintenance, aussi seul l'utilisateur identifié par <b>%s</b> est autorisé à utiliser l'application en ce moment.
-CoreErrorTitle=Erreur système
-CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
-CreditCard=Carte de crédit
-FieldsWithAreMandatory=Les champs marqués par un <b>%s</b> sont obligatoires
-FieldsWithIsForPublic=Les champs marqués par <b>%s</b> seront affichés sur la liste publique des membres. Si vous ne le souhaitez pas, décochez la case "public".
-AccordingToGeoIPDatabase=(obtenu par conversion GeoIP)
-Line=Ligne
-NotSupported=Non pris en charge
-RequiredField=Champ obligatoire
-Result=Résultat
-ToTest=Tester
-ValidateBefore=La fiche doit être validée pour pouvoir utiliser cette fonction
-Visibility=Visibilité
-Private=Privé
-Hidden=Caché
-Resources=Ressources
-Source=Origine
-Prefix=Préfixe
-Before=Avant
-After=Après
-IPAddress=Adresse IP
-Frequency=Fréquence
-IM=Messagerie instantanée
-NewAttribute=Nouvel attribut
-AttributeCode=Code de l'attribut
-URLPhoto=URL de la photo/logo
-SetLinkToAnotherThirdParty=Lier vers un autre tiers
-LinkTo=Link to
-LinkToProposal=Link to proposal
-LinkToOrder=Lier à une commande
-LinkToInvoice=Link to invoice
-LinkToSupplierOrder=Link to supplier order
-LinkToSupplierProposal=Link to supplier proposal
-LinkToSupplierInvoice=Link to supplier invoice
-LinkToContract=Link to contract
-LinkToIntervention=Link to intervention
-CreateDraft=Créer brouillon
-SetToDraft=Retour en brouillon
-ClickToEdit=Cliquer ici pour éditer
-ObjectDeleted=Objet %s supprimé
-ByCountry=Par pays
-ByTown=Par ville
-ByDate=Par date
-ByMonthYear=Par mois/année
-ByYear=Par année
-ByMonth=Par mois
-ByDay=Par jour
-BySalesRepresentative=Par commerciaux
-LinkedToSpecificUsers=Liés à un contact utilisateur particulier
-NoResults=Aucun résultat
-AdminTools=Admin tools
-SystemTools=Outils système
-ModulesSystemTools=Outils Modules
-Test=Test
-Element=Élément
-NoPhotoYet=Pas de photo disponible pour l'instant
-Dashboard=Dashboard
-MyDashboard=My dashboard
-Deductible=Déductible
-from=de
-toward=vers
-Access=Accès
-SelectAction=Select action
-HelpCopyToClipboard=Utilisez Ctrl+C pour copier dans le presse-papier
-SaveUploadedFileWithMask=Sauver le fichier sur le serveur sous le nom "<strong>%s</strong>" (sinon "%s")
-OriginFileName=nom du fichier source
-SetDemandReason=Définir la source
-SetBankAccount=Définir compte bancaire
-AccountCurrency=Devise du compte
-ViewPrivateNote=Voir les notes
-XMoreLines=%s ligne(s) cachées
-PublicUrl=URL publique
-AddBox=Ajouter boite
-SelectElementAndClickRefresh=Sélectionnez un élément et cliquez sur Rafraichir
-PrintFile=Imprimer fichier %s
-ShowTransaction=Show entry on bank account
-GoIntoSetupToChangeLogo=Allez dans Accueil - Configuration - Société/institution pour changer le  logo ou aller dans Accueil - Configuration - Affichage pour le cacher.
-Deny=Refuser
-Denied=Refusé
-ListOfTemplates=Liste des modèles
-Gender=Genre
-Genderman=Homme
-Genderwoman=Femme
-ViewList=Vue liste
-Mandatory=Mandatory
-Hello=Bonjour
-Sincerely=Sincèrement
+ValueIsNotValid=La valeur n'est pas valide
+RecordsModified=%s enregistrement modifié
+RecordsDeleted=%s enregistrement supprimé
+CompleteOrNoMoreReceptionExpected=Complète ou rien de plus attendu
+YouCanChangeValuesForThisListFromDictionarySetup=Vous pouvez modifier les valeurs de cette liste dans le menu Configuration - Dictionnaires
+YouCanChangeValuesForThisListFrom=Vous pouvez modifier les valeurs de cette liste dans le menu %s
+YouCanSetDefaultValueInModuleSetup=Vous pouvez configurer la valeur par défaut utilisée lors de la création d'un nouvel enregistrement dans la configuration du module
+Layout=Disposition
+Screen=Écran
+DocumentModelStandardPDF=Modèle PDF standard
+CoreErrorMessage=Désolé, une erreur s'est produite. Contactez votre administrateur système pour vérifier les journaux ou désactiver $ dolibarr_main_prod = 1 pour obtenir plus d'informations.
+LinkTo=Lié à
+LinkToProposal=Lien vers la proposition
+LinkToInvoice=Lien vers la facture
+LinkToSupplierOrder=Lien vers l'ordre du fournisseur
+LinkToSupplierProposal=Lien vers la proposition du fournisseur
+LinkToSupplierInvoice=Lien vers la facture du fournisseur
+LinkToContract=Lien vers le contrat
+LinkToIntervention=Lien vers l'intervention
+SelectAction=Sélectionnez l'action
+SelectTargetUser=Sélectionnez l'utilisateur / employé cible
+SelectElementAndClick=Sélectionnez un élément et cliquez sur %s
+ShowTransaction=Afficher l'entrée sur le compte bancaire
 DeleteLine=Suppression de ligne
-ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
-NoRecordSelected=No record selected
-MassFilesArea=Area for files built by mass actions
-ShowTempMassFilesArea=Show area of files built by mass actions
-RelatedObjects=Related Objects
-ClassifyBilled=Classify billed
-Progress=Progression
-ClickHere=Click here
-FrontOffice=Front office
-BackOffice=Back office
-View=View
-Export=Export
-Exports=Exports
-ExportFilteredList=Export filtered list
-ExportList=Export list
-Miscellaneous=Divers
-Calendar=Calendrier
-GroupBy=Group by...
-ViewFlatList=View flat list
-RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Direct download link
-Download=Download
-ActualizeCurrency=Update currency rate
+ConfirmDeleteLine=Êtes-vous sûr de vouloir supprimer cette ligne?
+NoPDFAvailableForDocGenAmongChecked=Aucun document PDF n'était disponible pour la génération du document parmi les enregistrements vérifiés
+TooManyRecordForMassAction=Trop d'enregistrement sélectionné pour une action de masse. L'action est limitée à une liste de %s enregistrement.
+NoRecordSelected=Aucun enregistrement sélectionné
+MassFilesArea=Domaine pour les fichiers construits par des actions de masse
+ShowTempMassFilesArea=Afficher la zone des fichiers construits par des actions de masse
+RelatedObjects=Objets associés
+ClickHere=Cliquez ici
+FrontOffice=Front Office
+ExportFilteredList=Export liste filtrée
+ExportList=Liste des exportations
+GroupBy=Par groupe...
+ViewFlatList=Afficher la liste forfaitaire
+RemoveString=Supprimer la chaîne '%s'
+SomeTranslationAreUncomplete=Certaines langues peuvent être partiellement traduites ou peuvent contenir des erreurs. Si vous détectez certains, vous pouvez réparer les fichiers de langue se connectant à <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/ Dolibarr / </a>.
+Download=Télécharger
+ActualizeCurrency=Mettre à jour le taux de change
 Fiscalyear=Année fiscale
-# Week day
-Monday=Lundi
-Tuesday=Mardi
-Wednesday=Mercredi
-Thursday=Jeudi
-Friday=Vendredi
-Saturday=Samedi
-Sunday=Dimanche
-MondayMin=Lu
-TuesdayMin=Ma
-WednesdayMin=Me
-ThursdayMin=Je
-FridayMin=Ve
-SaturdayMin=Sa
-SundayMin=Di
-Day1=Lundi
-Day2=Mardi
-Day3=Mercredi
-Day4=Jeudi
-Day5=Vendredi
-Day6=Samedi
-Day0=Dimanche
-ShortMonday=L
-ShortTuesday=M
-ShortWednesday=M
-ShortThursday=J
-ShortFriday=V
-ShortSaturday=S
-ShortSunday=D
+SetMultiCurrencyCode=Définir la devise
+BulkActions=Actions en vrac
+ClickToShowHelp=Cliquez pour afficher l'aide sur les outils
+HR=HEURE
+HRAndBank=RH et Banque
+AutomaticallyCalculated=Calculé automatiquement
+TitleSetToDraft=Retourner au brouillon
+ConfirmSetToDraft=Êtes-vous sûr de vouloir revenir à l'état du projet?
 SelectMailModel=Choisir modèle de courriel
-SetRef=Set ref
-Select2ResultFoundUseArrows=Some results found. Use arrows to select.
-Select2NotFound=No result found
-Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
-Select2LoadingMoreResults=Loading more results...
-Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
-SearchIntoContacts=Contacts
+SetRef=Ref.
+Select2ResultFoundUseArrows=Certains résultats ont été trouvés. Utilisez les flèches pour sélectionner.
+Select2NotFound=Aucun résultat trouvé
+Select2Enter=Entrer
+Select2MoreCharacter=Ou plus de caractère
+Select2MoreCharacters=Ou plus de personnages
+Select2MoreCharactersMore=<Strong> Syntaxe de recherche: </ strong> <br /> <kbd> <strong> | </ strong> </ kbd> <kbd> OU </ kbd> (a | b) <br /> <kbd> < Strong> * </ strong> </ kbd> <kbd> Tout caractère </ kbd> (a * b) <br /> <kbd> <strong> ^ </ strong> </ kbd> <kbd> Commencez avec < / Kbd> (^ ab) <br /> <kbd> <strong> $ </ strong> </ kbd> <kbd> Fin avec </ kbd> (ab $) <br />
+Select2LoadingMoreResults=Chargement de plus de résultats ...
+Select2SearchInProgress=Recherche en cours ...
 SearchIntoMembers=Membres
-SearchIntoUsers=Utilisateurs
-SearchIntoProductsOrServices=Produits ou services
-SearchIntoProjects=Projets
-SearchIntoTasks=Tasks
-SearchIntoCustomerInvoices=Factures clients
-SearchIntoSupplierInvoices=Factures fournisseurs
-SearchIntoCustomerOrders=Commandes clients
-SearchIntoSupplierOrders=Supplier orders
-SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
-SearchIntoInterventions=Interventions
-SearchIntoContracts=Contracts
-SearchIntoCustomerShipments=Customer shipments
+SearchIntoTasks=les tâches
+SearchIntoSupplierOrders=Commandes de fournisseur
+SearchIntoCustomerProposals=Propositions de clients
+SearchIntoSupplierProposals=Propositions de fournisseurs
+SearchIntoCustomerShipments=Envois clients
 SearchIntoExpenseReports=Note de frais
-SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
+SearchIntoLeaves=Feuilles
diff --git a/htdocs/langs/fr_CA/margins.lang b/htdocs/langs/fr_CA/margins.lang
index 285abe5dd0d..c06f8189cb6 100644
--- a/htdocs/langs/fr_CA/margins.lang
+++ b/htdocs/langs/fr_CA/margins.lang
@@ -1,2 +1,34 @@
 # Dolibarr language file - Source file is en_US - margins
+MarkRate=Marquer le taux
+DisplayMarkRates=Taux d'affichage
+InputPrice=Prix ​​d'entrée
+margin=Gestion des marges bénéficiaires
+margesSetup=Configuration de la gestion des marges bénéficiaires
+MarginDetails=Détails de la marge
+ProductMargins=Marges du produit
+CustomerMargins=Les marges clients
+SalesRepresentativeMargins=Marges représentatives des ventes
+UserMargins=Marges de l'utilisateur
 ProductService=Produit et service
+ChooseProduct/Service=Choisissez un produit ou un service
+ForceBuyingPriceIfNull=Force achat / prix de revient au prix de vente si non défini
+ForceBuyingPriceIfNullDetails=Si le prix d'achat / coût non défini, et cette option "ON", la marge sera nulle en ligne (prix d'achat / coût = prix de vente), sinon ("OFF"), marge sera égal au défaut suggéré.
+MARGIN_METHODE_FOR_DISCOUNT=Méthode de marge pour les réductions globales
+UseDiscountAsProduct=En tant que produit
+UseDiscountAsService=En tant que service
+UseDiscountOnTotal=Sur le sous-total
+MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Définit si une remise globale est traitée comme un produit, un service, ou seulement sur le sous-total pour le calcul de la marge.
+MARGIN_TYPE=Prix ​​d'achat / coût suggéré par défaut pour le calcul de la marge
+MargeType2=Marge sur le prix moyen pondéré (WAP)
+MargeType3=Marge sur prix coûté
+MarginTypeDesc=* Marge sur le meilleur prix d'achat = Prix de vente - Meilleur prix fournisseur défini sur la carte du produit <br> * Marge sur le prix moyen pondéré (WAP) = Prix de vente - Prix moyen pondéré du produit (WAP) ou meilleur prix fournisseur si WAP n'est pas encore défini < Br> * Marge sur prix de coût = Prix de vente - Prix de coût défini sur la carte de produit ou WAP si le prix de revient n'est pas défini ou le meilleur prix de fournisseur si WAP n'est pas encore défini
+CostPrice=Prix ​​de revient
+UnitCharges=Frais unitaires
+Charges=Des charges
+AgentContactType=Type de contact d'agent commercial
+AgentContactTypeDetails=Définir le type de contact (lié sur les factures) sera utilisé pour le rapport de marge par représentant de vente
+rateMustBeNumeric=Le taux doit être une valeur numérique
+markRateShouldBeLesserThan100=Le taux de marquage devrait être inférieur à 100
+ShowMarginInfos=Afficher les infos de marge
+CheckMargins=Détail des marges
+MarginPerSaleRepresentativeWarning=Le rapport de la marge par utilisateur utilise le lien entre les tierces parties et les représentants de vente pour calculer la marge de chaque salerepresentaive. Étant donné que certaines tierces parties peuvent ne pas avoir de représentant de vente dédié et que certaines tierces parties peuvent être liées à plusieurs, certains montants peuvent ne pas être inclus dans ce rapport (s'il n'y a pas de représentant de vente) et certains peuvent apparaître sur des lignes différentes (pour chaque représentant de vente).
diff --git a/htdocs/langs/fr_CA/members.lang b/htdocs/langs/fr_CA/members.lang
index a7293341530..c6578f71b34 100644
--- a/htdocs/langs/fr_CA/members.lang
+++ b/htdocs/langs/fr_CA/members.lang
@@ -1,5 +1,153 @@
 # Dolibarr language file - Source file is en_US - members
+MembersArea=Zone des membres
+MemberCard=Carte de membre
+SubscriptionCard=Carte de souscription
+Member=Membre
 Members=Membres
+ShowMember=Afficher la carte membre
+UserNotLinkedToMember=L'utilisateur n'est pas lié à un membre
+ThirdpartyNotLinkedToMember=Un tiers non lié à un membre
+MembersTickets=Billets des membres
+FundationMembers=Membres de la Fondation
+ListOfValidatedPublicMembers=Liste des membres publics validés
+ErrorThisMemberIsNotPublic=Ce membre n'est pas public
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Un autre membre (nom: <b> %s</b>, connexion: <b>%s</b>) est déjà lié à un tiers <b>%s</b>. Supprimez ce lien en premier parce qu'un tiers ne peut être lié qu'à un membre (et vice versa).
+ErrorUserPermissionAllowsToLinksToItselfOnly=Pour des raisons de sécurité, vous devez disposer d'autorisations pour éditer tous les utilisateurs afin de pouvoir lier un membre à un utilisateur qui n'est pas le vôtre.
+ThisIsContentOfYourCard=Bonjour. <br> <br> Ceci rappelle l'information que nous avons sur vous. N'hésitez pas à nous contacter si quelque chose a l'air mal. <br> <br>
+CardContent=Contenu de votre carte membre
+SetLinkToUser=Lien vers un utilisateur Dolibarr
+SetLinkToThirdParty=Lien vers un tiers Dolibarr
+MembersCards=Cartes de visite Membres
+MembersList=Liste des membres
+MembersListToValid=Liste des membres préliminaires (à valider)
+MembersListValid=Liste des membres valides
+MembersListUpToDate=Liste des membres valides avec abonnement à jour
+MembersListNotUpToDate=Liste des membres valides avec une souscription périmée
+MembersListResiliated=Liste des membres licenciés
+MembersListQualified=Liste des membres qualifiés
+MenuMembersToValidate=Ébauche de membres
+MenuMembersValidated=Membres validés
+MenuMembersUpToDate=Membres à jour
+MenuMembersNotUpToDate=Membres périmés
+MenuMembersResiliated=Membres résiliés
+MembersWithSubscriptionToReceive=Membres avec abonnement à recevoir
+DateSubscription=Date de souscription
+DateEndSubscription=Date de fin de l'abonnement
+EndSubscription=Fin de l'abonnement
+SubscriptionId=Identifiant de souscription
+MemberId=ID membres
+NewMember=Nouveau membre
+MemberType=Type de membre
+MemberTypeId=Id. De type membre
+MemberTypeLabel=Étiquette de type membre
+MembersTypes=Types de membres
+MemberStatusActive=Validé (en attente d'abonnement)
 MemberStatusActiveShort=Validée
+MemberStatusActiveLate=L'abonnement est expiré
+MemberStatusActiveLateShort=Expiré
+MemberStatusPaid=Abonnement à jour
+MemberStatusPaidShort=À jour
+MemberStatusResiliated=Membre résilié
+MemberStatusResiliatedShort=Terminé
+MembersStatusToValid=Ébauche de membres
+MembersStatusResiliated=Membres résiliés
+NewCotisation=Nouvelle contribution
+PaymentSubscription=Nouveau paiement de contribution
+SubscriptionEndDate=Date de fin de l'abonnement
+MembersTypeSetup=Configuration des types de membres
+NewSubscription=Nouvelle inscription
+NewSubscriptionDesc=Ce formulaire vous permet d'enregistrer votre abonnement en tant que nouveau membre de la fondation. Si vous souhaitez renouveler votre abonnement (si déjà un membre), veuillez contacter le conseil de fondation par email %s.
+Subscription=Abonnement
+Subscriptions=Abonnements
 SubscriptionLate=Retard
+SubscriptionNotReceived=L'abonnement n'a jamais été reçu
+ListOfSubscriptions=Liste des abonnements
+SendCardByMail=Envoyer une carte par courrier électronique
+AddMember=Créer un membre
+NoTypeDefinedGoToSetup=Aucun type de membre n'est défini. Aller au menu "Types de membres"
+WelcomeEMail=E-mail de bienvenue
+SubscriptionRequired=Abonnement requis
+MorPhy=Moral / Physique
+Reenable=Reignable
+ResiliateMember=Terminer un membre
+ConfirmResiliateMember=Êtes-vous sûr de vouloir mettre fin à ce membre?
+DeleteMember=Supprimer un membre
+ConfirmDeleteMember=Êtes-vous sûr de vouloir supprimer ce membre (Supprimer un membre supprime tous ses abonnements)?
+DeleteSubscription=Supprimer un abonnement
+ConfirmDeleteSubscription=Êtes-vous sûr de vouloir supprimer cette souscription?
+ValidateMember=Valider un membre
+ConfirmValidateMember=Êtes-vous sûr de vouloir valider ce membre?
+FollowingLinksArePublic=Les liens suivants sont des pages ouvertes non protégées par une autorisation de Dolibarr. Ce ne sont pas des pages formées, fournies à titre d'exemple pour montrer comment lister la base de données des membres.
+BlankSubscriptionForm=Formulaire d'auto-abonnement public
+BlankSubscriptionFormDesc=Dolibarr peut vous fournir une URL publique permettant aux visiteurs externes de demander de s'abonner à la fondation. Si un module de paiement en ligne est activé, un formulaire de paiement sera automatiquement fourni.
+EnablePublicSubscriptionForm=Activer le formulaire d'auto-abonnement public
+ExportDataset_member_1=Membres et abonnements
 ImportDataset_member_1=Membres
+LastMembersModified=Derniers membres modifiés %s
+LastSubscriptionsModified=Derniers %s modifications des abonnements
+Text=Texte
+PublicMemberCard=Carte publique membre
+SubscriptionNotRecorded=L'abonnement n'est pas enregistré
+AddSubscription=Créer un abonnement
+ShowSubscription=Afficher l'abonnement
+SendAnEMailToMember=Envoyer un email d'information au membre
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Objet de l'e-mail reçu en cas d'auto-inscription d'un invité
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail reçu en cas d'auto-inscription d'un invité
+DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Émetteur pour les abonnements aux membres
+DescADHERENT_AUTOREGISTER_MAIL=EMail pour les abonnements aux membres
+DescADHERENT_MAIL_VALID_SUBJECT=Sujet d'envoi pour la validation des membres
+DescADHERENT_MAIL_VALID=EMail pour la validation des membres
+DescADHERENT_MAIL_COTIS_SUBJECT=Sujet d'envoi pour souscription
+DescADHERENT_MAIL_COTIS=EMail pour souscription
+DescADHERENT_MAIL_RESIL_SUBJECT=Sujet d'envoi pour la résiliation des membres
+DescADHERENT_MAIL_RESIL=EMail pour la résiliation des membres
+DescADHERENT_MAIL_FROM=Expéditeur EMail pour les courriels automatiques
+DescADHERENT_ETIQUETTE_TYPE=Format de la page des étiquettes
+DescADHERENT_ETIQUETTE_TEXT=Texte imprimé sur les feuilles d'adresses des membres
+DescADHERENT_CARD_TYPE=Format de la page des cartes
+DescADHERENT_CARD_HEADER_TEXT=Texte imprimé au dessus des cartes membres
+DescADHERENT_CARD_TEXT=Texte imprimé sur les cartes membres (aligner sur la gauche)
+DescADHERENT_CARD_TEXT_RIGHT=Texte imprimé sur les cartes membres (aligner à droite)
+DescADHERENT_CARD_FOOTER_TEXT=Texte imprimé au bas des cartes membres
+ShowTypeCard=Afficher le type '%s'
+HTPasswordExport=Génération de fichier htpassword
+NoThirdPartyAssociatedToMember=Aucun tiers associé à ce membre
+MembersAndSubscriptions=Membres et abonnements
+MoreActions=Action complémentaire sur l'enregistrement
+MoreActionsOnSubscription=Action complémentaire, suggérée par défaut lors de l'enregistrement d'une souscription
+MoreActionBankDirect=Créer une entrée directe sur un compte bancaire
+MoreActionBankViaInvoice=Créer une facture et un paiement sur un compte bancaire
+MoreActionInvoiceOnly=Créer une facture sans paiement
+LinkToGeneratedPages=Générer des cartes de visite
+LinkToGeneratedPagesDesc=Cet écran vous permet de générer des fichiers PDF avec des cartes de visite pour tous vos membres ou un membre particulier.
+DocForAllMembersCards=Générer des cartes de visite pour tous les membres
+DocForOneMemberCards=Générer des cartes de visite pour un membre particulier
+DocForLabels=Générer des feuilles d'adresses
+SubscriptionPayment=Paiement de souscription
+LastSubscriptionDate=La dernière date d'abonnement
+LastSubscriptionAmount=Dernier montant de souscription
+MembersStatisticsByState=Statistiques des membres par état / province
+NoValidatedMemberYet=Aucun membre validé n'a été trouvé
+MembersByCountryDesc=Cet écran vous montre des statistiques sur les membres par pays. Le graphique dépend toutefois du service graphique Google en ligne et n'est disponible que si une connexion Internet fonctionne.
+MembersByStateDesc=Cet écran vous montre des statistiques sur les membres par état / provinces / canton.
+MembersByTownDesc=Cet écran vous montre des statistiques sur les membres par ville.
+MembersStatisticsDesc=Choisissez les statistiques que vous souhaitez lire ...
+LastMemberDate=Dernière date de membre
+Nature=La nature
+Public=L'information est publique
+NewMemberbyWeb=Nouveau membre ajouté. En attente d'approbation
+NewMemberForm=Nouveau formulaire de membre
+SubscriptionsStatistics=Statistiques sur les abonnements
+NbOfSubscriptions=Nombre d'abonnements
+AmountOfSubscriptions=Montant des abonnements
+TurnoverOrBudget=Chiffre d'affaires (pour une entreprise) ou Budget (pour une fondation)
+DefaultAmount=Montant d'abonnement par défaut
+CanEditAmount=Le visiteur peut choisir / modifier le montant de son abonnement
+MEMBER_NEWFORM_PAYONLINE=Aller sur la page de paiement en ligne intégrée
+MembersStatisticsByProperties=Statistiques des membres par caractéristiques
+MembersByNature=Cet écran vous montre des statistiques sur les membres par nature.
+MembersByRegion=Cet écran vous montre des statistiques sur les membres par région.
+VATToUseForSubscriptions=Taux de TVA à utiliser pour les abonnements
+NoVatOnSubscription=Pas de TVA pour les abonnements
+MEMBER_PAYONLINE_SENDEMAIL=Courrier électronique à utiliser pour l'alerte par courrier électronique lorsque Dolibarr reçoit une confirmation d'un paiement validé pour un abonnement (Exemple: paymentdone@example.com)
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produit utilisé pour la ligne d'abonnement en facture: %s
diff --git a/htdocs/langs/fr_CA/oauth.lang b/htdocs/langs/fr_CA/oauth.lang
index 6bc640c655b..b55f8db25ec 100644
--- a/htdocs/langs/fr_CA/oauth.lang
+++ b/htdocs/langs/fr_CA/oauth.lang
@@ -1,3 +1,21 @@
 # Dolibarr language file - Source file is en_US - oauth
-NewTokenStored=Token received ans saved
-ToCheckDeleteTokenOnProvider=To check/delete authorization saved by %s OAuth provider
+ConfigOAuth=Configuration d'Oauth
+ManualTokenGeneration=Génération de jetons manuels
+IsTokenGenerated=Le jeton est-il généré?
+NoAccessToken=Pas de jeton d'accès enregistré dans la base de données locale
+HasAccessToken=Un jeton a été généré et enregistré dans la base de données locale
+NewTokenStored=Jeton reçu et enregistré
+ToCheckDeleteTokenOnProvider=Cliquez ici pour vérifier / supprimer l'autorisation enregistrée par %s OAuth provider
+TokenDeleted=Jeton supprimé
+RequestAccess=Cliquez ici pour demander / renouveler l'accès et recevoir un nouveau jeton à sauvegarder
+DeleteAccess=Cliquez ici pour supprimer le jeton
+UseTheFollowingUrlAsRedirectURI=Utiliser l'URL suivante comme URI de redirection lorsque vous créez vos informations d'identification sur votre fournisseur OAuth:
+ListOfSupportedOauthProviders=Entrez ici les informations d'identification fournies par votre fournisseur OAuth2. Seuls les fournisseurs OAuth2 supportés sont visibles ici. Cette configuration peut être utilisée par d'autres modules nécessitant une authentification OAuth2.
+OAuthSetupForLogin=Page pour générer un jeton OAuth
+SeePreviousTab=Voir l'onglet précédent
+TOKEN_EXPIRED=Jeton expiré
+TOKEN_EXPIRE_AT=Token expire à
+TOKEN_DELETE=Supprimer le jeton enregistré
+OAUTH_GOOGLE_ID=Id de Google Oauth
+OAUTH_GOOGLE_DESC=Allez sur <a class="notasortlink" href="https://console.developers.google.com/" target="_blank"> cette page </a> puis "Credentials" pour créer des informations d'identification Oauth
+OAUTH_GITHUB_DESC=Allez sur <a class="notasortlink" href="https://github.com/settings/developers" target="_blank"> cette page </a> puis "Enregistrez une nouvelle application" pour créer des informations d'identification Oauth
diff --git a/htdocs/langs/fr_CA/opensurvey.lang b/htdocs/langs/fr_CA/opensurvey.lang
index 140add7ceaa..edb093acd77 100644
--- a/htdocs/langs/fr_CA/opensurvey.lang
+++ b/htdocs/langs/fr_CA/opensurvey.lang
@@ -1,2 +1,46 @@
 # Dolibarr language file - Source file is en_US - opensurvey
+Surveys=Les sondages
+OrganizeYourMeetingEasily=Organisez facilement vos réunions et vos sondages. Premier choix de type de sondage ...
+OpenSurveyArea=Zone des sondages
+AddACommentForPoll=Vous pouvez ajouter un commentaire dans le sondage ...
+AddComment=Ajouter un commentaire
+CreatePoll=Créer un sondage
+PollTitle=Titre du sondage
+ToReceiveEMailForEachVote=Recevoir un email pour chaque vote
+OpenSurveyStep2=Sélectionnez vos dates entre les jours libres (gris). Les jours sélectionnés sont verts. Vous pouvez désélectionner un jour précédemment sélectionné en cliquant à nouveau sur celui-ci
+RemoveAllDays=Supprimer tous les jours
+CopyHoursOfFirstDay=Heures de copie du premier jour
+RemoveAllHours=Supprimer toutes les heures
+TheBestChoices=Les meilleurs choix sont actuellement
+OpenSurveyHowTo=Si vous acceptez de voter dans ce sondage, vous devez donner votre nom, choisir les valeurs qui vous conviennent le mieux et valider avec le bouton de plus à la fin de la ligne.
+CommentsOfVoters=Commentaires des électeurs
+ConfirmRemovalOfPoll=Êtes-vous sûr de vouloir supprimer ce sondage (et tous les votes)
+RemovePoll=Supprimer le sondage
+UrlForSurvey=URL pour communiquer pour obtenir un accès direct au sondage
+PollOnChoice=Vous créez un sondage pour faire un choix multiple pour un sondage. Entrez tout les choix possibles pour votre sondage:
+CreateSurveyDate=Créer un sondage de date
+CheckBox=Case à cocher simple
+YesNoList=Liste (vide / oui / non)
+PourContreList=Liste (vide / pour / contre)
+AddNewColumn=Ajouter une nouvelle colonne
+TitleChoice=Étiquette de choix
+ExportSpreadsheet=Feuille de calcul des résultats d'exportation
 ExpireDate=Date limite
+NbOfVoters=Nb des électeurs
+PollAdminDesc=Vous pouvez modifier toutes les lignes de vote de ce sondage avec le bouton "Modifier". Vous pouvez également supprimer une colonne ou une ligne avec %s. Vous pouvez également ajouter une nouvelle colonne avec %s.
+5MoreChoices=5 choix supplémentaires
+YouAreInivitedToVote=Vous êtes invité à voter pour ce sondage
+VoteNameAlreadyExists=Ce nom a déjà été utilisé pour ce sondage
+AddStartHour=Ajouter l'heure de début
+AddEndHour=Ajouter l'heure de fin
+votes=Vote (s)
+NoCommentYet=Aucun commentaire n'a encore été publié pour ce sondage
+CanComment=Les électeurs peuvent commenter dans le sondage
+CanSeeOthersVote=Les électeurs peuvent voir le vote d'autres personnes
+SelectDayDesc=Pour chaque jour sélectionné, vous pouvez choisir, ou non, les heures de rendez-vous dans le format suivant: <br> - vide, <br> - "8h", "8H" ou "8:00" pour donner l'heure de début d'une réunion, < Br> - "8-11", "8h-11h", "8H-11H" ou "8: 00-11: 00" pour donner l'heure de début et de fin d'une réunion, - "8h15-11h15", " 8H15-11H15 "ou" 8: 15-11: 15 "pour la même chose mais avec des minutes.
+ErrorOpenSurveyFillFirstSection=Vous n'avez pas rempli la première section de la création du sondage
+ErrorOpenSurveyOneChoice=Entrez au moins un choix
+ErrorInsertingComment=Une erreur s'est produite lors de l'insertion de votre commentaire
+MoreChoices=Entrez plus de choix pour les électeurs
+SurveyExpiredInfo=Le sondage a été clôturé ou le délai de vote a expiré.
+EmailSomeoneVoted=%s a rempli une ligne.\nVous pouvez trouver votre sondage au lien:\n%s
diff --git a/htdocs/langs/fr_CA/orders.lang b/htdocs/langs/fr_CA/orders.lang
index 497d078c595..b888e06a930 100644
--- a/htdocs/langs/fr_CA/orders.lang
+++ b/htdocs/langs/fr_CA/orders.lang
@@ -1,16 +1,118 @@
 # Dolibarr language file - Source file is en_US - orders
+OrdersArea=Zone de commandes clients
+SuppliersOrdersArea=Zone de commandes des fournisseurs
+OrderCard=Carte de commande
+OrderId=Numéro de commande
+Orders=Ordres
+OrderToProcess=Commander pour traiter
+NewOrder=nouvel ordre
+ToOrder=Faire une commande
+MakeOrder=Faire une commande
+SupplierOrder=Commande du fournisseur
+SuppliersOrders=Commandes des fournisseurs
+SuppliersOrdersRunning=Commandes actuelles des fournisseurs
+CustomerOrder=Commande du client
+CustomersOrdersRunning=Commandes clients actuelles
+CustomersOrdersAndOrdersLines=Commandes client et lignes de commande
+OrdersDeliveredToBill=Ordres des clients livrés à la facture
+OrdersToBill=Commandes du client livrées
+OrdersInProcess=Commandes clients en cours
+OrdersToProcess=Ordres clients à traiter
+SuppliersOrdersToProcess=Ordres fournisseurs à traiter
 StatusOrderCanceledShort=Annulé
 StatusOrderProcessedShort=Traité
+StatusOrderDelivered=Livré
+StatusOrderDeliveredShort=Livré
 StatusOrderApprovedShort=Approuver
 StatusOrderRefusedShort=Refusé
 StatusOrderBilledShort=Facturées
+StatusOrderToProcessShort=Procéder
+StatusOrderReceivedPartiallyShort=Partiellement reçu
 StatusOrderCanceled=Annulé
+StatusOrderOnProcess=Commandé - Réception en veille
+StatusOrderOnProcessWithValidation=Commandé - Réception ou validation en veille
 StatusOrderProcessed=Traité
+StatusOrderToBill=Livré
 StatusOrderApproved=Approuver
 StatusOrderRefused=Refusé
 StatusOrderBilled=Facturées
+StatusOrderReceivedPartially=Partiellement reçu
+QtyOrdered=Qté commandé
+ProductQtyInDraft=Quantité de produit dans les projets de commande
+ProductQtyInDraftOrWaitingApproved=Quantité de produit dans les projets ou les commandes approuvées, pas encore commandé
+ShipProduct=Produit de navire
+CreateOrder=Créer un ordre
+RefuseOrder=Refus d'ordre
+ApproveOrder=Approuver l'ordre
+Approve2Order=Approuver l'ordre (deuxième niveau)
+ValidateOrder=Valider l'ordre
+UnvalidateOrder=Ordre non valide
+DeleteOrder=Supprimer l'ordre
+OrderReopened=Commande %s Réouverture
+AddOrder=Créer un ordre
+AddToDraftOrders=Ajouter au projet d'ordre
+ShowOrder=Afficher l'ordre
+NoDraftOrders=Aucun projet de commande
+NoSupplierOrder=Pas de fournisseur
+LastOrders=Derniers %s commandes client
+LastCustomerOrders=Derniers %s commandes client
+LastSupplierOrders=Dernières commandes du fournisseur %s
+LastModifiedOrders=Derniers %s commandes modifiées
+AllOrders=Tous les ordres
+OrdersStatistics=Statistiques de la commande
+OrdersStatisticsSuppliers=Statistiques de la commande du fournisseur
+AmountOfOrdersByMonthHT=Montant des commandes par mois (net d'impôt)
+CloseOrder=Fermer l'ordre
+ConfirmCloseOrder=Êtes-vous sûr de vouloir régler cette commande? Une fois la commande livrée, elle peut être configurée comme facturée.
+ConfirmDeleteOrder=Êtes-vous sûr de vouloir supprimer cette commande?
+ConfirmValidateOrder=Êtes-vous sûr de vouloir valider cette commande sous le nom <b>%s</b>?
+ConfirmUnvalidateOrder=Êtes-vous sûr de vouloir rétablir l'ordre <b>%s</b> pour ébauche d'état?
+ConfirmCancelOrder=Êtes-vous sûr de vouloir annuler cette commande?
+ConfirmMakeOrder=Êtes-vous sûr de vouloir confirmer que vous avez effectué cette commande sur <b>%s</b>?
+GenerateBill=Générer une facture
+ClassifyShipped=Classifier livré
+DraftOrders=Projet de commandes
+DraftSuppliersOrders=Ordres des fournisseurs de projets
+OnProcessOrders=Commandes en cours
+RefCustomerOrder=Réf. Commande pour client
+RefOrderSupplier=Réf. Commande pour fournisseur
+RefOrderSupplierShort=Réf. Fournisseur de commande
+SendOrderByMail=Envoyer la commande par mail
+ActionsOnOrder=Événements sur commande
+NoArticleOfTypeProduct=Aucun article de type 'produit' donc aucun article expédié pour cet ordre
+AuthorRequest=Demandeur
+UserWithApproveOrderGrant=Les utilisateurs bénéficient d'une autorisation «d'approbation des commandes».
+PaymentOrderRef=Paiement de la commande %s
+CloneOrder=Ordre de clone
+ConfirmCloneOrder=Êtes-vous sûr de vouloir cloner cette commande <b>%s</b>?
+DispatchSupplierOrder=Commande de fournisseur de réception %s
+FirstApprovalAlreadyDone=Première approbation déjà terminée
+SecondApprovalAlreadyDone=Deuxième approbation déjà terminée
+SupplierOrderReceivedInDolibarr=Commande fournisseur %s reçu %s
+SupplierOrderSubmitedInDolibarr=Commande du fournisseur %s soumise
+SupplierOrderClassifiedBilled=Commande du fournisseur %s set facturé
+TypeContact_commande_internal_SALESREPFOLL=Ordre de suivi du client représentatif
+TypeContact_commande_internal_SHIPPING=Expédition complémentaire représentative
 TypeContact_commande_external_BILLING=Contact client facturation
 TypeContact_commande_external_SHIPPING=Contact client livraison
+TypeContact_commande_external_CUSTOMER=Ordre de suivi du contact client
+TypeContact_order_supplier_internal_SALESREPFOLL=Ordonnance de fournisseur adjointe représentative
+TypeContact_order_supplier_internal_SHIPPING=Expédition complémentaire représentative
 TypeContact_order_supplier_external_BILLING=Contact fournisseur facturation
 TypeContact_order_supplier_external_SHIPPING=Contact fournisseur livraison
+TypeContact_order_supplier_external_CUSTOMER=Ordre de suivi du contact fournisseur
+Error_OrderNotChecked=Aucun ordre de facturation sélectionné
 OrderByFax=Télécopie
+PDFEinsteinDescription=Un modèle de commande complet (logo ...)
+PDFEdisonDescription=Un modèle d'ordre simple
+PDFProformaDescription=Une facture proforma complète (logo ...)
+CreateInvoiceForThisCustomer=Commandes de factures
+NoOrdersToInvoice=Aucun ordre pouvant être facturé
+CloseProcessedOrdersAutomatically=Classifiez "Traiter" toutes les commandes sélectionnées.
+OrderCreation=Création d'ordre
+OrderCreated=Vos commandes ont été créées
+OrderFail=Une erreur est survenue lors de la création de votre commande
+CreateOrders=Créer des commandes
+ToBillSeveralOrderSelectCustomer=Pour créer une facture pour plusieurs commandes, cliquez d'abord sur le client, puis choisissez "%s".
+CloseReceivedSupplierOrdersAutomatically=Fermez l'ordre à "%s" automatiquement si tous les produits sont reçus.
+SetShippingMode=Définir le mode d'expédition
diff --git a/htdocs/langs/fr_CA/other.lang b/htdocs/langs/fr_CA/other.lang
index 67e3098eb10..48069cec6b2 100644
--- a/htdocs/langs/fr_CA/other.lang
+++ b/htdocs/langs/fr_CA/other.lang
@@ -1,2 +1,164 @@
 # Dolibarr language file - Source file is en_US - other
+NumberingShort=N °
+ToolsDesc=Tous les outils divers non inclus dans les autres entrées de menu sont collectés ici. <br /> <br /> Tous les outils sont accessibles dans le menu de gauche.
+BirthdayDate=Date d'anniversaire
+BirthdayAlertOn=Alerte d'anniversaire active
+BirthdayAlertOff=Alerte d'anniversaire inactive
+TransKey=Traduction de la clé TransKey
+MonthOfInvoice=Mois (numéro 1-12) de la date de facturation
+TextMonthOfInvoice=Mois (tex) de la date de facturation
+PreviousMonthOfInvoice=Mois précédent (numéro 1-12) de la date de facturation
+TextPreviousMonthOfInvoice=Mois précédent (texte) de la date de facturation
+NextMonthOfInvoice=Le mois suivant (numéro 1-12) de la date de facturation
+TextNextMonthOfInvoice=Le mois suivant (texte) de la date de facturation
+ZipFileGeneratedInto=Fichier Zip généré dans <b>%s</b>.
+YearOfInvoice=Année de la date de facturation
+PreviousYearOfInvoice=Année de facture précédente
+NextYearOfInvoice=Année suivante de la date de facturation
+Notify_FICHINTER_ADD_CONTACT=Ajout de contact à Intervention
+Notify_FICHINTER_VALIDATE=Intervention validée
+Notify_FICHINTER_SENTBYMAIL=Intervention envoyée par courrier
+Notify_ORDER_VALIDATE=Ordre client validé
+Notify_ORDER_SENTBYMAIL=Commande client envoyée par courrier électronique
+Notify_ORDER_SUPPLIER_SENTBYMAIL=Commande du fournisseur envoyée par courrier
+Notify_ORDER_SUPPLIER_VALIDATE=Ordre du fournisseur enregistré
+Notify_ORDER_SUPPLIER_APPROVE=Ordre du fournisseur approuvé
+Notify_ORDER_SUPPLIER_REFUSE=Ordre du fournisseur refusé
+Notify_PROPAL_VALIDATE=Proposition client validée
+Notify_PROPAL_CLOSE_SIGNED=Client propal fermé signé
+Notify_PROPAL_CLOSE_REFUSED=Client propal fermé refusé
+Notify_PROPAL_SENTBYMAIL=Proposition commerciale envoyée par courrier
+Notify_WITHDRAW_TRANSMIT=Retrait de la transmission
+Notify_WITHDRAW_CREDIT=Retrait de crédit
+Notify_WITHDRAW_EMIT=Effectuer le retrait
+Notify_COMPANY_SENTBYMAIL=Les envois envoyés par une carte tierce
+Notify_BILL_VALIDATE=Facture client validée
+Notify_BILL_UNVALIDATE=Facture du client non valide
+Notify_BILL_PAYED=Facture du client payée
+Notify_BILL_CANCEL=Facture du client annulée
+Notify_BILL_SENTBYMAIL=Facture du client envoyée par courrier
+Notify_BILL_SUPPLIER_VALIDATE=Facture du fournisseur validée
+Notify_BILL_SUPPLIER_PAYED=Facture du fournisseur payée
+Notify_BILL_SUPPLIER_SENTBYMAIL=Facture du fournisseur envoyée par courrier
+Notify_BILL_SUPPLIER_CANCELED=Facture du fournisseur annulée
+Notify_CONTRACT_VALIDATE=Contrat validé
+Notify_FICHEINTER_VALIDATE=Intervention validée
+Notify_SHIPPING_VALIDATE=Expédition validée
+Notify_SHIPPING_SENTBYMAIL=Expédition envoyée par mail
+Notify_MEMBER_VALIDATE=Membre validé
+Notify_MEMBER_MODIFY=Membre modifié
+Notify_MEMBER_SUBSCRIPTION=Membre abonné
+Notify_MEMBER_RESILIATE=Membre résilié
+Notify_MEMBER_DELETE=Membre supprimé
+NbOfAttachedFiles=Nombre de fichiers / documents attachés
+TotalSizeOfAttachedFiles=Taille totale des fichiers / documents attachés
+AttachANewFile=Joindre un nouveau fichier / document
+NbOfActiveNotifications=Nombre de notifications (nb des emails du destinataire)
+PredefinedMailTest=C'est un courrier de test.\nLes deux lignes sont séparées par un retour de chariot.\n\n__SIGNATURE__
+PredefinedMailTestHtml=Il s'agit d'un <b> test</b> mail (le mot test doit être en gras). <br>Les deux lignes sont séparées par un retour de chariot.<br><br> __SIGNATURE__
+PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nVous trouverez ici la facture __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nNous aimerions vous avertir que la facture __REF__ semble ne pas être payée. C'est donc la facture en pièce jointe à nouveau, comme un rappel.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nVous trouverez ici la proposition commerciale __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nVous trouverez ici la demande de prix __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nVous trouverez ici la commande __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nVous trouverez ici notre commande __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nVous trouverez ici la facture __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nVous trouverez ici la livraison __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nVous trouverez ici l'intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentUser=Aa__PERSONALIZED__\n\n__SIGNATURE__
+DemoDesc=Dolibarr est un ERP / CRM compact prenant en charge plusieurs modules métier. Une démonstration montrant tous les modules n'a aucun sens car ce scénario ne se produit jamais (plusieurs centaines disponibles). Ainsi, plusieurs profils de démonstration sont disponibles.
+ChooseYourDemoProfil=Choisissez le profil de démonstration qui correspond le mieux à vos besoins ...
+ChooseYourDemoProfilMore=... ou créez votre propre profil <br> (sélection du module manuel)
+DemoFundation=Gérer les membres d'une fondation
+DemoFundation2=Gérer les membres et le compte bancaire d'une fondation
+DemoCompanyServiceOnly=Société ou service de vente indépendant uniquement
+DemoCompanyShopWithCashDesk=Gérer un magasin avec une caisse
+DemoCompanyProductAndStocks=Société vendant des produits avec un magasin
+DemoCompanyAll=Entreprise avec plusieurs activités (tous les modules principaux)
+ValidatedBy=Valider par %s
+ClosedBy=Fermé par %s
+CreatedById=Identifiant utilisateur créé
+ModifiedById=Identifiant utilisateur qui a effectué le dernier changement
+ValidatedById=Identification de l'utilisateur qui a validé
+CanceledById=Identification de l'utilisateur qui a annulé
+ClosedById=Identification de l'utilisateur qui a fermé
+CreatedByLogin=Connexion utilisateur créée
+ModifiedByLogin=Connexion utilisateur qui a effectué les derniers changements
+ValidatedByLogin=Connexion utilisateur validée
+CanceledByLogin=Connexion utilisateur annulée
+ClosedByLogin=Connexion utilisateur fermée
+DirWasRemoved=L'annuaire %s a été supprimé
+FeatureNotYetAvailable=La fonctionnalité n'est pas encore disponible dans la version actuelle
+Height=la taille
+Left=La gauche
+WeightUnitmg=Mg
+LengthUnitm=M
+LengthUnitdm=Dm
+LengthUnitmm=Mm
+Surface=Région
+SurfaceUnitm2=M²
+SurfaceUnitdm2=Dm²
+SurfaceUnitcm2=Cm²
+SurfaceUnitmm2=Mm²
+SurfaceUnitfoot2=Pi²
+SurfaceUnitinch2=En²
+Volume=Le volume
+VolumeUnitm3=M³
+VolumeUnitdm3=Dm³ (L)
+VolumeUnitcm3=Cm³ (ml)
+VolumeUnitmm3=Mm³ (μ l)
+VolumeUnitfoot3=Ft³
+VolumeUnitinch3=In³
+SizeUnitm=M
+SizeUnitdm=Dm
+SizeUnitmm=Mm
+SendNewPasswordDesc=Ce formulaire vous permet de demander un nouveau mot de passe. Il sera envoyé à votre adresse électronique. <br /> Le changement entrera en vigueur une fois que vous aurez cliqué sur le lien de confirmation dans l'email. <br /> Vérifiez votre boîte de réception.
+BackToLoginPage=Retour à la page de connexion
+AuthenticationDoesNotAllowSendNewPassword=Le mode d'authentification est <b>%s</b>. <br /> Dans ce mode, Dolibarr ne peut pas savoir ni modifier votre mot de passe. <br /> Contactez votre administrateur système si vous souhaitez modifier votre mot de passe.
+EnableGDLibraryDesc=Installez ou activez la bibliothèque GD sur votre installation PHP pour utiliser cette option.
+ProfIdShortDesc=<b>Prof ID%s</b> est une information en fonction d'un pays tiers. <br> Par exemple, pour le pays <b>%s</b>, c'est le code<b>%s</b>.
+DolibarrDemo=Démo Dolibarr ERP / CRM
+StatsByNumberOfUnits=Statistiques pour la somme des produits / services
+StatsByNumberOfEntities=Statistiques en nombre d'entités référantes (nb de facture, ou commande ...)
+NumberOfProposals=Nombre de propositions
+NumberOfCustomerInvoices=Nombre de factures des clients
+NumberOfSupplierProposals=Nombre de propositions de fournisseurs
+NumberOfSupplierOrders=Nombre d'ordres fournisseurs
+NumberOfUnitsProposals=Nombre d'unités sur proposition
+NumberOfUnitsCustomerOrders=Nombre d'unités sur commandes client
+NumberOfUnitsCustomerInvoices=Nombre d'unités sur les factures des clients
+NumberOfUnitsSupplierProposals=Nombre d'unités sur les propositions des fournisseurs
+NumberOfUnitsSupplierOrders=Nombre d'unités sur commandes fournisseurs
+NumberOfUnitsSupplierInvoices=Nombre d'unités sur les factures des fournisseurs
+EMailTextInterventionAddedContact=Une nouvelle intervention %s vous a été assignée.
+EMailTextInterventionValidated=L'intervention %s a été validée.
+EMailTextInvoiceValidated=La facture %s a été validée.
+EMailTextProposalValidated=Le projet %s a été validé.
+EMailTextOrderValidated=La commande %s a été validée.
+EMailTextOrderValidatedBy=La commande %s a été enregistrée par %s.
+EMailTextOrderRefusedBy=L'ordre %s a été refusé par %s.
+EMailTextExpeditionValidated=La livraison %s a été validée.
+ImportedWithSet=Ensemble de données sur l'importation
+ResizeDesc=Entrez une nouvelle largeur <b> OU </ b> nouvelle hauteur. Le ratio sera maintenu pendant le redimensionnement ...
+NewSizeAfterCropping=Nouvelle taille après la culture
+DefineNewAreaToPick=Définir une nouvelle zone sur l'image à choisir (clic gauche sur l'image, puis faites glisser jusqu'à ce que vous atteigniez le coin opposé)
+CurrentInformationOnImage=Cet outil a été conçu pour vous aider à redimensionner ou à recadrer une image. Il s'agit d'informations sur l'image éditée en cours
+YouReceiveMailBecauseOfNotification=Vous recevez ce message car votre courriel a été ajouté à la liste des cibles pour être informé des événements particuliers dans le logiciel %s de %s.
+YouReceiveMailBecauseOfNotification2=Cet événement est le suivant:
+ThisIsListOfModules=Il s'agit d'une liste de modules présélectionnés par ce profil de démonstration (seuls les modules les plus courants sont visibles dans cette démo). Modifiez ceci pour avoir une démo plus personnalisée et cliquez sur "Démarrer".
+UseAdvancedPerms=Utilisez les autorisations avancées de certains modules
+StartUpload=Commence le téléchargement
+CancelUpload=Annuler le chargement
+FileIsTooBig=Les fichiers sont trop gros
 PleaseBePatient=Merci de patienter…
+RequestToResetPasswordReceived=Une requête pour changer votre mot de passe Dolibarr a été reçue
+NewKeyIs=Voici vos nouvelles clés pour vous connecter
+NewKeyWillBe=Votre nouvelle clé de connexion au logiciel sera
+ClickHereToGoTo=Cliquez ici pour aller à %s
+YouMustClickToChange=Vous devez tout d'abord cliquer sur le lien suivant pour valider ce changement de mot de passe
+ForgetIfNothing=Si vous n'avez pas demandé ce changement, n'oubliez pas cet email. Vos informations d'identification sont sécurisées.
+IfAmountHigherThan=Si un montant supérieur à <strong>%s</strong>
+SourcesRepository=Dépôt de sources
+LibraryVersion=Version de la bibliothèque
+NoExportableData=Aucune donnée exportable (aucun module avec des données exportables chargées ou des autorisations manquantes)
+WebsiteSetup=Site de configuration du module
diff --git a/htdocs/langs/fr_CA/paybox.lang b/htdocs/langs/fr_CA/paybox.lang
index c10ae6c580b..14b5e199543 100644
--- a/htdocs/langs/fr_CA/paybox.lang
+++ b/htdocs/langs/fr_CA/paybox.lang
@@ -1,2 +1,32 @@
 # Dolibarr language file - Source file is en_US - paybox
+PayBoxSetup=Configuration du module PayBox
+PayBoxDesc=Ce module offre des pages pour permettre le paiement sur <a href="http://www.paybox.com" target="_blank"> Paybox </a> par les clients. Cela peut être utilisé pour un paiement gratuit ou pour un paiement sur un objet Dolibarr particulier (facture, commande, ...)
+FollowingUrlAreAvailableToMakePayments=Les URL suivantes sont disponibles pour offrir une page à un client pour effectuer un paiement sur les objets Dolibarr
+ThisScreenAllowsYouToPay=Cet écran vous permet de faire un paiement en ligne à %s.
+ThisIsInformationOnPayment=Il s'agit d'informations sur le paiement à effectuer
+ToComplete=Compléter
+YourEMail=Email pour recevoir la confirmation de paiement
+Creditor=Créancier
+PayBoxDoPayment=Aller au paiement
+YouWillBeRedirectedOnPayBox=Vous serez redirigé sur la page Paybox sécurisée pour vous inscrire les informations de votre carte de crédit
 Continue=Suivant
+ToOfferALinkForOnlinePayment=URL pour le paiement %s
+ToOfferALinkForOnlinePaymentOnOrder=URL pour proposer une interface utilisateur de paiement en ligne %s pour une commande client
+ToOfferALinkForOnlinePaymentOnInvoice=URL pour proposer une interface utilisateur de paiement en ligne %s pour une facture client
+ToOfferALinkForOnlinePaymentOnContractLine=URL pour proposer une interface utilisateur de paiement en ligne %s pour une ligne de contrat
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL pour offrir une interface utilisateur de paiement en ligne %s pour un montant gratuit
+ToOfferALinkForOnlinePaymentOnMemberSubscription=URL pour offrir une interface utilisateur de paiement en ligne %s pour un abonnement de membre
+YouCanAddTagOnUrl=Vous pouvez également ajouter le paramètre url <b> & tag = <i> valeur </ i> </ b> à l'un de ces URL (requis uniquement pour un paiement gratuit) pour ajouter votre propre étiquette de commentaire de paiement.
+SetupPayBoxToHavePaymentCreatedAutomatically=Configurez votre PayBox avec url <b>%s</b> pour que le paiement soit créé automatiquement lorsqu'il est validé par Paybox.
+YourPaymentHasBeenRecorded=Cette page confirme que votre paiement a été enregistré. Je vous remercie.
+YourPaymentHasNotBeenRecorded=Votre paiement n'a pas été enregistré et la transaction a été annulée. Je vous remercie.
+InformationToFindParameters=Aidez-nous à trouver vos informations sur le compte %s
+PAYBOX_CGI_URL_V2=Url de Paybox CGI module de paiement
+CSSUrlForPaymentForm=URL de la feuille de style CSS pour le formulaire de paiement
+MessageOK=Message sur la page de retour de paiement validée
+MessageKO=Message sur la page de retour de paiement annulée
+NewPayboxPaymentFailed=Le nouveau paiement Paybox a échoué
+PAYBOX_PAYONLINE_SENDEMAIL=EMail pour avertir après un paiement (succès ou échec)
+PAYBOX_PBX_SITE=Valeur pour PBX SITE
+PAYBOX_PBX_RANG=Valeur pour PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Valeur pour ID de PBX
diff --git a/htdocs/langs/fr_CA/printing.lang b/htdocs/langs/fr_CA/printing.lang
index 0ed07f1f5d0..8696206a6a4 100644
--- a/htdocs/langs/fr_CA/printing.lang
+++ b/htdocs/langs/fr_CA/printing.lang
@@ -1,2 +1,36 @@
 # Dolibarr language file - Source file is en_US - printing
-GoogleAuthConfigured=Google OAuth credentials found into setup of module OAuth.
+Module64000Name=Impression directe
+Module64000Desc=Activer le système d'impression directe
+PrintingSetup=Configuration du système d'impression directe
+PrintingDesc=Ce module ajoute un bouton Imprimer pour envoyer des documents directement à une imprimante (sans ouvrir le document dans une application) avec différents modules.
+MenuDirectPrinting=Emploi d'impression directe
+DirectPrint=Impression directe
+PrintingDriverDesc=Variables de configuration pour l'impression du pilote.
+ListDrivers=Liste des conducteurs
+PrintTestDesc=Liste des imprimantes.
+NoActivePrintingModuleFound=Aucun module actif pour imprimer un document
+PleaseSelectaDriverfromList=Sélectionnez un pilote de la liste.
+PleaseConfigureDriverfromList=Configurez le pilote sélectionné dans la liste.
+SetupDriver=Configuration du pilote
+TargetedPrinter=Imprimante ciblée
+PRINTGCP_INFO=Configuration de Google OAuth API
+PrintGCPDesc=Ce pilote permet d'envoyer des documents directement à une imprimante avec Google Cloud Print.
+GCP_displayName=Afficher un nom
+GCP_Id=ID de l'imprimante
+GCP_OwnerName=Le nom du propriétaire
+GCP_State=État de l'imprimante
+GCP_connectionStatus=État en ligne
+PrintIPPDesc=Ce pilote permet d'envoyer des documents directement à une imprimante. Il nécessite un système Linux avec CUPS installé.
+PRINTIPP_HOST=Serveur d'imprimante
+NoDefaultPrinterDefined=Aucune imprimante par défaut n'est définie
+IPP_Uri=Imprimante Uri
+IPP_Name=Nom de l'imprimante
+IPP_State=État de l'imprimante
+IPP_State_reason=Raison de l'état
+IPP_State_reason1=Motif de l'État1
+IPP_Media=Imprimante média
+DirectPrintingJobsDesc=Cette page répertorie les travaux d'impression trouvés pour les imprimantes disponibles.
+GoogleAuthNotConfigured=L'installation de Google OAuth n'est pas terminée. Activez le module OAuth et définissez Google ID / Secret.
+GoogleAuthConfigured=Les informations d'identification de Google OAuth ont été trouvées dans la configuration du module OAuth.
+PrintingDriverDescprintgcp=Variables de configuration pour l'impression du pilote Google Cloud Print.
+PrintTestDescprintgcp=Liste des imprimantes pour Google Cloud Print.
diff --git a/htdocs/langs/fr_CA/products.lang b/htdocs/langs/fr_CA/products.lang
index ba0002c657a..ca4acd5f682 100644
--- a/htdocs/langs/fr_CA/products.lang
+++ b/htdocs/langs/fr_CA/products.lang
@@ -1,15 +1,27 @@
 # Dolibarr language file - Source file is en_US - products
 ProductRef=Référence produit
 ProductLabel=Désignation du produit
+ProductLabelTranslated=Etiquette du produit traduit
+ProductDescriptionTranslated=Description du produit traduit
+ProductNoteTranslated=Note du produit traduit
 ProductServiceCard=Carte du produits/services
 ProductId=Identification du produit/service
+ProductVatMassChange=Changement massif de la TVA
+ProductVatMassChangeDesc=Cette page peut être utilisée pour modifier un taux de TVA défini sur des produits ou services d'une valeur à l'autre. Avertissement, cette modification est effectuée sur toutes les bases de données.
+MassBarcodeInit=Invalidité du code barre
+MassBarcodeInitDesc=Cette page peut être utilisée pour initialiser un code à barres sur des objets qui n'ont pas le code à barres défini. Vérifiez avant que la configuration du code-barres du module soit terminée.
+ProductAccountancyBuyCode=Code de comptabilité (achat)
+ProductAccountancySellCode=Code de comptabilité (vente)
 ProductOrService=Produit et service
 ProductsAndServices=Produits et services
 ProductsOrServices=Produits ou services
-ProductsOnSell=Produit à la vente ou à l'achat
 ProductsNotOnSell=Produit non destiné à la vente et non à l'achat
-ServicesOnSell=Produit à la vente ou à l'achat
-ServicesNotOnSell=Les services non destinés à la vente
+ProductsOnSellAndOnBuy=Produits à vendre et à acheter
+ServicesNotOnSell=Services à vendre et non à l'achat
+ServicesOnSellAndOnBuy=Services à vendre et à vendre
+LastModifiedProductsAndServices=Derniers %s produits / services modifiés
+LastRecordedProducts=Derniers produits enregistrés %s
+LastRecordedServices=Derniers %s services enregistrés
 CardProduct0=Carte du produit
 CardProduct1=Carte du service
 OnSell=À vendre
@@ -23,5 +35,186 @@ ProductStatusOnBuy=À acheter
 ProductStatusNotOnBuy=Pas à acheter
 ProductStatusOnBuyShort=À acheter
 ProductStatusNotOnBuyShort=Pas à acheter
+UpdateVAT=Mise à jour de la batterie
+UpdateDefaultPrice=Mettre à jour le prix par défaut
+UpdateLevelPrices=Mettre à jour les prix pour chaque niveau
+AppliedPricesFrom=Prix ​​appliqués à partir de
+SellingPrice=Prix ​​de vente
+SellingPriceHT=Prix ​​de vente (hors taxes)
+SellingPriceTTC=Prix ​​de vente (taxes)
+CostPriceDescription=Ce prix (net d'impôt) peut être utilisé pour stocker le montant moyen de ce produit pour votre entreprise. Il peut s'agir de tout prix que vous calculez, par exemple du prix d'achat moyen plus le coût moyen de production et de distribution.
+CostPriceUsage=Cette valeur pourrait être utilisée pour le calcul de la marge.
+SoldAmount=Montant vendu
+PurchasedAmount=Montant acheté
+MinPrice=Min. prix de vente
+CantBeLessThanMinPrice=Le prix de vente ne peut être inférieur au minimum autorisé pour ce produit (%s sans taxes). Ce message peut également apparaître si vous tapez une remise trop importante.
 ContractStatusClosed=Fermées
+ErrorProductBadRefOrLabel=Valeur incorrecte pour référence ou étiquette.
+ErrorProductClone=Il y a eu un problème en essayant de cloner le produit ou le service.
+SupplierRef=Produit ref.
+ShowProduct=Afficher le produit
+ShowService=Afficher le service
+ProductsAndServicesArea=Domaine de produits et services
+ProductsArea=Zone de produits
+ServicesArea=Zone de services
+SupplierCard=Carte du fournisseur
+PriceRemoved=Prix ​​retiré
+BarCode=code à barre
+BarcodeType=Type de code à barres
+SetDefaultBarcodeType=Définir le type de code à barres
+BarcodeValue=Valeur du code à barres
+NoteNotVisibleOnBill=Note (non visible sur les factures, propositions ...)
+ServiceLimitedDuration=Si le produit est un service à durée limitée:
+MultiPricesAbility=Plusieurs segments de prix par produit / service (chaque client est en un seul segment)
+AssociatedProductsAbility=Activez la fonctionnalité pour gérer les produits virtuels
+AssociatedProductsNumber=Nombre de produits composant ce produit virtuel
+ParentProductsNumber=Nombre de produits d'emballage pour les parents
+ParentProducts=Produits parentaux
+IfZeroItIsNotUsedByVirtualProduct=Si 0, ce produit n'est utilisé par aucun produit virtuel
+KeywordFilter=Filtre à mots clés
+CategoryFilter=Filtre de catégorie
+ProductToAddSearch=Rechercher un produit à ajouter
+NoMatchFound=Pas de résultat trouvé
+ListOfProductsServices=Liste des produits / services
+ProductAssociationList=Liste des produits / services composant ce produit / package virtuel
+ProductParentList=Liste des produits / services virtuels avec ce produit en tant que composant
+ErrorAssociationIsFatherOfThis=L'un des produits sélectionnés est le parent avec le produit actuel
+DeleteProduct=Supprimer un produit / service
+ConfirmDeleteProduct=Êtes-vous sûr de vouloir supprimer ce produit / service?
+ProductDeleted=Produit / Service "%s" supprimé de la base de données.
+DeleteProductLine=Supprimer la ligne de produits
+ConfirmDeleteProductLine=Êtes-vous sûr de vouloir supprimer cette ligne de produits?
+ProductSpecial=Spécial
+QtyMin=Quantité minimale
+PriceQtyMin=Prix ​​pour cette min. Qté (sans rabais)
+VATRateForSupplierProduct=Taux de TVA (pour ce fournisseur / produit)
+DiscountQtyMin=Réduction par défaut pour la quantité
+NoPriceDefinedForThisSupplier=Pas de prix / quantité défini pour ce fournisseur / produit
+NoSupplierPriceDefinedForThisProduct=Aucun fournisseur prix / quantité défini pour ce produit
+PredefinedProductsToSell=Produits prédéfinis à vendre
+PredefinedServicesToSell=Services prédéfinis à vendre
+PredefinedProductsAndServicesToSell=Produits / services prédéfinis à vendre
+PredefinedProductsToPurchase=Produit prédéfini à acheter
+PredefinedProductsAndServicesToPurchase=Produits / services prédéfinis à puchase
+NotPredefinedProducts=Produits / services non prédéfinis
+GenerateThumb=Générer le pouce
+ServiceNb=Service # %s
+ListProductServiceByPopularity=Liste des produits / services par popularité
+Finished=Produit fabriqué
+CloneProduct=Clone produit ou service
+ConfirmCloneProduct=Êtes-vous sûr de vouloir cloner un produit ou un service <b>%s</b>?
+CloneContentProduct=Cloner toutes les informations principales du produit / service
+ClonePricesProduct=Informations principales et prix Clone
+CloneCompositionProduct=Produit / service emballé par clone
+CloneCombinationsProduct=Variantes de produit de clonage
+NewRefForClone=Réf. De nouveau produit / service
+SellingPrices=Prix ​​de vente
+BuyingPrices=Prix ​​d'achat
+CustomerPrices=Prix ​​client
+SuppliersPrices=Prix ​​des fournisseurs
+SuppliersPricesOfProductsOrServices=Prix ​​des fournisseurs (des produits ou des services)
+CustomCode=Code douanier
+ShortLabel=Étiquette courte
+p=U.
+s=S
+h=H
+d=ré
+m=M
+lm=Lm
+m2=M²
+m3=M³
+ProductCodeModel=Modèle de ref. Produit
+ServiceCodeModel=Modèle de réparation de service
+CurrentProductPrice=Prix ​​actuel
+AlwaysUseNewPrice=Toujours utiliser le prix actuel du produit / service
+AlwaysUseFixedPrice=Utilisez le prix fixe
+PriceByQuantity=Différents prix par quantité
+PriceByQuantityRange=Gamme de quantité
+MultipriceRules=Règles du segment des prix
+UseMultipriceRules=Utiliser les règles de segment de prix (définies dans la configuration du module de produit) pour calculer automatiquement les prix de tous les autres segments selon le premier segment
+PercentVariationOver=%% variation par rapport à %s
+PercentDiscountOver=%% discount sur %s
+Build=Produire
+ProductsMultiPrice=Produits et prix pour chaque segment de prix
+ProductsOrServiceMultiPrice=Prix ​​clients (de produits ou de services, multi-prix)
+ProductSellByQuarterHT=Le chiffre d'affaires des produits trimestriels avant impôt
+ServiceSellByQuarterHT=Chiffre d'affaires trimestriel avant impôts
+Quarter1=1er. Trimestre
+Quarter2=2ème. Trimestre
+Quarter3=3ème. Trimestre
+Quarter4=4ème. Trimestre
+BarCodePrintsheet=Imprimer le code à barres
+PageToGenerateBarCodeSheets=Avec cet outil, vous pouvez imprimer des feuilles d'autocollants de codes à barres. Choisissez le format de votre page d'autocollant, le type de code à barres et la valeur du code à barres, puis cliquez sur le bouton <b>%s</b>.
+NumberOfStickers=Nombre d'autocollants à imprimer sur la page
+PrintsheetForOneBarCode=Imprimez plusieurs autocollants pour un code à barres
+BuildPageToPrint=Générer une page pour imprimer
+FillBarCodeTypeAndValueManually=Remplissez le type de code à barres et la valeur manuellement.
+FillBarCodeTypeAndValueFromProduct=Remplissez le type de code à barres et la valeur du code à barres d'un produit.
+FillBarCodeTypeAndValueFromThirdParty=Remplissez le type de code à barres et la valeur du code à barres d'un tiers.
+DefinitionOfBarCodeForProductNotComplete=La définition du type ou de la valeur du code à barres n'est pas complète pour le produit %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Définition du type ou de la valeur du code à barres non complet pour le tiers %s.
+BarCodeDataForProduct=Informations sur le code à barres du produit %s:
+BarCodeDataForThirdparty=Informations sur le code à barres de tiers %s:
+ResetBarcodeForAllRecords=Définissez la valeur du code-barres pour tous les enregistrements (cela rétablira également la valeur du code-barres déjà définie avec de nouvelles valeurs)
+PriceByCustomer=Différents prix pour chaque client
+PriceCatalogue=Un prix de vente unique par produit / service
+PricingRule=Règles pour les prix de vente
+AddCustomerPrice=Ajouter un prix par client
+ForceUpdateChildPriceSoc=Définir le même prix sur les filiales clientes
+PriceByCustomerLog=Enregistrement des prix clients précédents
+MinimumPriceLimit=Le prix minimum ne peut pas être inférieur à %s
+MinimumRecommendedPrice=Le prix minimum recommandé est: %s
+PriceExpressionSelected=Expression de prix choisie
+PriceExpressionEditorHelp1="Prix = 2 + 2" ou "2 + 2" pour régler le prix. Utilisation ; Séparer les expressions
+PriceExpressionEditorHelp2=Vous pouvez accéder à ExtraFields avec des variables comme <b> #extrafield_myextrafieldkey # </ b> et les variables globales avec <b> #global_mycode # </ b>
+PriceExpressionEditorHelp3=Dans les prix des produits / services et des fournisseurs, ces variables sont disponibles: <b> # tva_tx # # localtax1_tx # # localtax2_tx # # poids # # longueur # # surface # #price_min # </ b>
+PriceExpressionEditorHelp4=En prix produit / service seulement: <b> #supplier_min_price # </ b> <br> Sur les prix des fournisseurs uniquement: <b> # supplier_quantity # et #supplier_tva_tx # </ b>
+PriceMode=Mode prix
 PriceNumeric=Numéro
+DefaultPrice=Prix ​​par défaut
+ComposedProductIncDecStock=Augmenter / diminuer le stock sur le changement de parent
+ComposedProduct=Sous-produit
+MinSupplierPrice=Prix ​​minimum fournisseur
+MinCustomerPrice=Prix ​​minimum du client
+DynamicPriceConfiguration=Configuration de prix dynamique
+DynamicPriceDesc=Sur la carte produit, avec ce module activé, vous pouvez définir des fonctions mathématiques pour calculer les prix Client ou Fournisseur. Une telle fonction peut utiliser tous les opérateurs mathématiques, certaines constantes et variables. Vous pouvez définir ici les variables que vous voulez et si la variable nécessite une mise à jour automatique, l'URL externe à utiliser pour demander à Dolibarr de mettre à jour automatiquement la valeur.
+AddVariable=Ajouter une variable
+AddUpdater=Ajouter une mise à jour
+GlobalVariableUpdaters=Mises à jour variables globales
+UpdateInterval=Intervalle de mise à jour (minutes)
+CorrectlyUpdated=Correctement mis à jour
+PropalMergePdfProductActualFile=Les fichiers utilisés pour ajouter au PDF Azur sont / sont
+IncludingProductWithTag=Y compris produit / service avec étiquette
+NbOfQtyInProposals=Qté dans les propositions
+ClinkOnALinkOfColumn=Cliquez sur un lien de la colonne %s pour obtenir une vue détaillée ...
+TranslatedLabel=Etiquette traduite
+ProductWeight=Poids pour 1 produit
+ProductVolume=Volume pour 1 produit
+DeleteProductBuyPrice=Supprimer le prix d'achat
+ConfirmDeleteProductBuyPrice=Êtes-vous sûr de vouloir supprimer ce prix d'achat?
+ProductAttributeName=Attribut Variant %s
+ProductAttributeDeleteDialog=Êtes-vous sûr de vouloir supprimer cet attribut? Toutes les valeurs seront supprimées
+ProductAttributeValueDeleteDialog=Êtes-vous sûr de vouloir supprimer la valeur "%s" avec la référence "%s" de cet attribut?
+ProductCombinationDeleteDialog=Êtes-vous sûr de vouloir supprimer la variante du produit "<strong>%s</strong>"?
+ProductCombinationAlreadyUsed=Une erreur s'est produite lors de la suppression de la variante. Vérifiez qu'il ne soit utilisé dans aucun objet
+HideProductCombinations=Masquer la variante des produits dans le sélecteur de produits
+ProductCombination=Une variante
+EditProductCombination=Modification de la variante
+Features=Caractéristiques
+PriceImpact=Impact des prix
+NewProductAttributeValue=Nouvelle valeur d'attribut
+ErrorCreatingProductAttributeValue=Une erreur s'est produite lors de la création de la valeur de l'attribut. Ce pourrait être parce qu'il existe déjà une valeur existante avec cette référence
+ProductCombinationGeneratorWarning=Si vous continuez, avant de générer de nouvelles variantes, toutes les précédentes seront supprimées. Les éléments déjà existants seront mis à jour avec les nouvelles valeurs
+TooMuchCombinationsWarning=La génération de nombreuses variantes peut entraîner une CPU élevée, une utilisation de la mémoire et Dolibarr pas capable de les créer. L'activation de l'option "%s" peut aider à réduire l'utilisation de la mémoire.
+DoNotRemovePreviousCombinations=Ne supprimez pas les variantes précédentes
+UsePercentageVariations=Variations en pourcentage d'utilisation
+PercentageVariation=Variation en pourcentage
+ErrorDeletingGeneratedProducts=Une erreur s'est produite en essayant de supprimer les variantes de produits existantes
+NbProducts=Nb. De produits
+ParentProduct=Produit principal
+HideChildProducts=Masquer les variantes
+ConfirmCloneProductCombinations=Voulez-vous copier toutes les variantes du produit vers l'autre produit parent avec la référence donnée?
+CloneDestinationReference=Référence du produit de destination
+ErrorCopyProductCombinations=Une erreur s'est produite lors de la copie des variantes du produit
+ErrorDestinationProductNotFound=Produit de destination introuvable
+ErrorProductCombinationNotFound=Variante du produit non trouvée
diff --git a/htdocs/langs/fr_CA/projects.lang b/htdocs/langs/fr_CA/projects.lang
index 1e30aa508b0..ed0a18cc2c6 100644
--- a/htdocs/langs/fr_CA/projects.lang
+++ b/htdocs/langs/fr_CA/projects.lang
@@ -1,2 +1,145 @@
 # Dolibarr language file - Source file is en_US - projects
+ProjectRef=Projet ref.
+ProjectId=Id de projet
+ProjectLabel=Étiquette du projet
+ProjectsArea=Zone de projets
+ProjectStatus=L'état du projet
+PrivateProject=Contacts de projet
+ProjectsImContactFor=Projets, je suis explicitement un contact de
+AllAllowedProjects=Tout le projet que je peux lire (mine + public)
+MyProjectsDesc=Cette vue est limitée aux projets pour lesquels vous êtes un contact (quel que soit le type).
+ProjectsPublicDesc=Cette vue présente tous les projets que vous êtes autorisé à lire.
+TasksOnProjectsPublicDesc=Cette vue présente toutes les tâches sur les projets que vous êtes autorisé à lire.
+ProjectsPublicTaskDesc=Cette vue présente tous les projets et tâches que vous pouvez lire.
+ProjectsDesc=Cette vue présente tous les projets (vos autorisations d'utilisateur vous permettent d'afficher tout).
+TasksOnProjectsDesc=Cette vue présente toutes les tâches sur tous les projets (vos autorisations d'utilisateur vous permettent d'afficher tout).
+MyTasksDesc=Cette vue est limitée aux projets ou tâches auxquels vous êtes un contact (quel que soit le type).
+OnlyOpenedProject=Seuls les projets ouverts sont visibles (les projets en ébauche ou l'état fermé ne sont pas visibles).
+ClosedProjectsAreHidden=Les projets fermés ne sont pas visibles.
+TasksPublicDesc=Cette vue présente tous les projets et tâches que vous pouvez lire.
+TasksDesc=Cette vue présente tous les projets et les tâches (vos autorisations d'utilisateur vous accordent l'autorisation de voir tout).
+AllTaskVisibleButEditIfYouAreAssigned=Toutes les tâches pour un tel projet sont visibles, mais vous ne pouvez entrer l'heure que pour la tâche qui vous est assignée. Assignez-vous la tâche si vous devez entrer l'heure.
+OnlyYourTaskAreVisible=Seules les tâches qui vous sont assignées sont visibles. Assignez-vous la tâche si elle n'est pas visible et vous devez entrer l'heure.
+ProjectCategories=Étiquettes / catégories de projet
+AddProject=Créer un projet
+ConfirmDeleteAProject=Êtes-vous sûr de vouloir supprimer ce projet?
+ConfirmDeleteATask=Êtes-vous sûr de vouloir supprimer cette tâche?
+OpenedTasks=Ouvrir des tâches
+OpportunitiesStatusForOpenedProjects=Opportunités nombre de projets ouverts par statut
+OpportunitiesStatusForProjects=Opportunités montant des projets par statut
+ShowProject=Afficher le projet
+SetProject=Définir le projet
+NoProject=Aucun projet défini ou détenu
+NbOfProjects=Nb de projets
+TimeSpent=Temps passé
+TimeSpentByYou=Temps passé par vous
+TimeSpentByUser=Temps passé par l'utilisateur
+TimesSpent=Temps passé
+RefTask=Réf. tâche
+LabelTask=Tâche d'étiquette
+TaskTimeSpent=Temps consacré aux tâches
+NewTimeSpent=Temps passé
+MyTimeSpent=Mon temps passé
+Tasks=les tâches
+TaskDateStart=Date de début de la tâche
+AddTask=Créer une tâche
+AddTimeSpent=Créer le temps passé
+AddHereTimeSpentForDay=Ajouter ici le temps passé pour cette journée / tâche
+Activities=Tâches / activités
+MyActivities=Mes tâches / activités
+MyProjectsArea=Zone de mes projets
+ProgressDeclared=Progrès déclaré
+ListOfTasks=Liste des tâches
+ListInvoicesAssociatedProject=Liste des factures de clients associées au projet
+ListPredefinedInvoicesAssociatedProject=Liste des factures de modèles de clients associées au projet
+ListShippingAssociatedProject=Liste des envois associés au projet
+ListExpenseReportsAssociatedProject=Liste des rapports de dépenses associés au projet
+ListTaskTimeUserProject=Liste des temps consacrés aux tâches du projet
+ActivityOnProjectToday=Activité sur le projet aujourd'hui
+ActivityOnProjectYesterday=Activité sur projet hier
+ActivityOnProjectThisWeek=Activité de projet cette semaine
+ActivityOnProjectThisMonth=Activité de projet ce mois-ci
+ActivityOnProjectThisYear=Activité de projet cette année
+ChildOfTask=Enfant du projet / tâche
+NotOwnerOfProject=Pas le propriétaire de ce projet privé
+AffectedTo=Alloué à
+CantRemoveProject=Ce projet ne peut pas être supprimé car il est référencé par d'autres objets (facture, commandes ou autres). Voir l'onglet des références.
+ValidateProject=Valider le projet
+ConfirmValidateProject=Êtes-vous sûr de vouloir valider ce projet?
+CloseAProject=Prochain projet
+ConfirmCloseAProject=Êtes-vous sûr de vouloir fermer ce projet?
+AlsoCloseAProject=Fermez également le projet (maintenez-le ouvert si vous devez toujours suivre les tâches de production)
+ReOpenAProject=Projet ouvert
+ConfirmReOpenAProject=Êtes-vous sûr de vouloir rouvrir ce projet?
+ProjectContact=Contacts de projet
+ActionsOnProject=Événements sur projet
+YouAreNotContactOfProject=Vous n'êtes pas un contact de ce projet privé
+UserIsNotContactOfProject=L'utilisateur n'est pas un contact de ce projet privé
+DeleteATimeSpent=Supprimer le temps passé
+ConfirmDeleteATimeSpent=Êtes-vous sûr de vouloir supprimer ce temps passé?
+DoNotShowMyTasksOnly=Voir aussi les tâches qui ne m'ont pas été affectées
+ShowMyTasksOnly=Voir seulement les tâches qui m'ont été assignées
+LinkedToAnotherCompany=Lié à d'autres tiers
+TaskIsNotAssignedToUser=Tâche non assignée à l'utilisateur. Utilisez le bouton '<strong>%s</strong>' pour attribuer la tâche maintenant.
+ErrorTimeSpentIsEmpty=Le temps passé est vide
+ThisWillAlsoRemoveTasks=Cette action supprimera également toutes les tâches du projet (<b>%s</b> tâches en ce moment) et toutes les entrées du temps passé.
+IfNeedToUseOhterObjectKeepEmpty=Si certains objets (facture, commande, ...), appartenant à un autre tiers, doivent être liés au projet à créer, conservez ce vide pour que le projet soit multi tiers.
+CloneProject=Projet Clone
+CloneTasks=Tâches de clonage
+CloneProjectFiles=Le projet Clone a joint les fichiers
+CloneTaskFiles=Tâches (s) clonées (s) jointes (si une ou plusieurs tâches est clonée)
+CloneMoveDate=Mettre à jour les dates de projets / tâches à partir de maintenant?
+ConfirmCloneProject=Êtes-vous sûr de cloner ce projet?
+ProjectReportDate=Modifier les dates des tâches en fonction de la nouvelle date de début du projet
+ErrorShiftTaskDate=Impossible de modifier la date de la tâche selon la nouvelle date de début du projet
+TaskDeletedInDolibarr=Tâche %s supprimé
+OpportunityStatus=Statut d'opportunité
+OpportunityStatusShort=Opp. statut
+OpportunityProbabilityShort=Opp. Probab.
+OpportunityAmount=Montant de l'opportunité
+OpportunityAmountShort=Opp. montant
+OpportunityAmountAverageShort=Moyenne Opp. montant
+OpportunityAmountWeigthedShort=Opp pondéré. montant
+WonLostExcluded=Won / Lost excluded
+TypeContact_project_internal_PROJECTCONTRIBUTOR=Donateur
+TypeContact_project_external_PROJECTCONTRIBUTOR=Donateur
+TypeContact_project_task_internal_TASKEXECUTIVE=Responsable de la tâche
+TypeContact_project_task_external_TASKEXECUTIVE=Responsable de la tâche
+TypeContact_project_task_internal_TASKCONTRIBUTOR=Donateur
+TypeContact_project_task_external_TASKCONTRIBUTOR=Donateur
+SelectElement=Sélectionnez l'élément
+AddElement=Lien vers l'élément
+DocumentModelBeluga=Modèle de projet pour l'aperçu des objets liés
+DocumentModelBaleine=Modèle de rapport de projet pour les tâches
+PlannedWorkload=Charge de travail planifiée
+ProjectReferers=Articles connexes
+ProjectMustBeValidatedFirst=Le projet doit d'abord être validé
+FirstAddRessourceToAllocateTime=Affectez une ressource utilisateur à la tâche pour allouer du temps
+InputPerDay=Entrée par jour
+InputPerWeek=Entrée par semaine
+InputPerAction=Entrée par action
+TimeAlreadyRecorded=Il s'agit du temps passé déjà enregistré pour cette tâche / jour et utilisateur %s
+ProjectsWithThisUserAsContact=Projets avec cet utilisateur en contact
+ResourceNotAssignedToProject=Pas affecté au projet
+ResourceNotAssignedToTheTask=Non assigné à la tâche
+AssignTaskToMe=Attribuez une tâche à moi
+AssignTaskToUser=Affectez une tâche à %s
+SelectTaskToAssign=Sélectionnez la tâche à affecter ...
+AssignTask=Attribuer
+ProjectOverview=Aperçu
+ManageTasks=Utiliser des projets pour suivre les tâches et le temps
+ManageOpportunitiesStatus=Utiliser des projets pour suivre les pistes / opportunités
+ProjectOppAmountOfProjectsByMonth=Nombre de possibilités par mois
+ProjectOpenedProjectByOppStatus=Projet ouvert / chef d'entreprise selon le statut d'opportunité
+ProjectsStatistics=Statistiques sur les projets / prospects
+TasksStatistics=Statistiques sur les tâches de projet / chef de file
+TaskAssignedToEnterTime=Tâche attribuée. La saisie de cette tâche devrait être possible.
+IdTaskTime=Id temps de tâche
+YouCanCompleteRef=Si vous souhaitez compléter la référence avec certaines informations (pour l'utiliser comme filtres de recherche), il est recommandé d'ajouter un caractère pour le séparer, de sorte que la numérotation automatique fonctionnera toujours correctement pour les prochains projets. Par exemple %s-ABC. Vous pouvez également ajouter des clés de recherche dans l'étiquette. Mais la meilleure pratique peut être d'ajouter un champ dédié, également appelé attributs complémentaires.
+OpenedProjectsByThirdparties=Projets ouverts par des tiers
+OnlyOpportunitiesShort=Seules les opportunités
+NotAnOpportunityShort=Pas une opportunité
+OpportunityTotalAmount=Possibilité montant total
+OpportunityPonderatedAmountDesc=Montant des opportunités pondéré avec probabilité
 OppStatusPENDING=Créance
+OppStatusWON=A gagné
diff --git a/htdocs/langs/fr_CA/propal.lang b/htdocs/langs/fr_CA/propal.lang
index c883ba1ad88..fc289fe178d 100644
--- a/htdocs/langs/fr_CA/propal.lang
+++ b/htdocs/langs/fr_CA/propal.lang
@@ -1,26 +1,46 @@
 # Dolibarr language file - Source file is en_US - propal
 ProposalsDraft=Propositions brouillons
+ProposalCard=Carte de proposition
 DeleteProp=Supprimer la proposition commerciale
 ValidateProp=Valider la proposition commerciale
+ConfirmDeleteProp=Êtes-vous sûr de vouloir supprimer cette proposition commerciale?
+ConfirmValidateProp=Êtes-vous sûr de vouloir valider cette proposition commerciale sous le nom <b> %s</b>?
+LastPropals=Dernières %s propositions
+LastModifiedProposals=Dernières %s propositions modifiées
 AllPropals=Toutes les propositions
 SearchAProposal=Rechercher une proposition
 NoProposal=Pas de propositions
+ProposalsStatistics=Statistiques de la proposition commerciale
+AmountOfProposalsByMonthHT=Montant par mois (net d'impôt)
+PropalStatusValidated=Validé (la proposition est ouverte)
 PropalStatusNotSigned=Non signée (close)
+PropalsToClose=Propositions commerciales à clôturer
+ListOfProposals=Liste des propositions commerciales
+ActionsOnPropal=Événements sur proposition
 RefProposal=Référence de la proposition commerciale
 SendPropalByMail=Envoyer proposition commerciale par courriel
 DateEndPropal=Date de validité se terminant
+CloseAs=Définir l'état sur
 SetAcceptedRefused=Accepté/refusé
 ErrorPropalNotFound=Pas de proposition %s trouvées
 AddToDraftProposals=Ajouter un brouillon de proposition
 NoDraftProposals=Pas de brouillons de propositions
 CopyPropalFrom=Créer proposition commerciale en copiant proposition existante
+CreateEmptyPropal=Créer des propositions commerciales vides vierge ou à partir d'une liste de produits / services
 DefaultProposalDurationValidity=Durée de validité par défaut de la proposition commerciale (en jours)
 UseCustomerContactAsPropalRecipientIfExist=\n
 ClonePropal=Dupliquer proposition commerciale
+ConfirmClonePropal=Êtes-vous sûr de vouloir cloner la proposition commerciale <b> %s</b>?
+ConfirmReOpenProp=Êtes-vous sûr de vouloir ouvrir la proposition commerciale <b>%s</b>?
 ProposalsAndProposalsLines=Proposition commerciale et des lignes
 ProposalLine=ligne de proposition
 AvailabilityPeriod=Délai de disponibilité
 SetAvailability=Indiquer le délai de disponibilité
 AvailabilityTypeAV_NOW=Immédiatement
+TypeContact_propal_internal_SALESREPFOLL=Proposition de suivi représentative
 TypeContact_propal_external_BILLING=Contact client facturation
+TypeContact_propal_external_CUSTOMER=Proposition de suivi du contact client
+DocModelAzurDescription=Un modèle complet de proposition (logo ...)
+DefaultModelPropalCreate=Création de modèle par défaut
+DefaultModelPropalClosed=Modèle par défaut lors de la clôture d'une proposition commerciale (non facturé)
 ProposalsStatisticsSuppliers=Statistiques des propositions par fournisseurs
diff --git a/htdocs/langs/fr_CA/salaries.lang b/htdocs/langs/fr_CA/salaries.lang
index a1f85800ea0..effce5cd68f 100644
--- a/htdocs/langs/fr_CA/salaries.lang
+++ b/htdocs/langs/fr_CA/salaries.lang
@@ -1,10 +1,13 @@
 # Dolibarr language file - Source file is en_US - salaries
-SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Code comptable pour les charges financières
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Compte comptable par défaut pour les paiements de salaire
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Compte comptable par défaut pour les dépenses de personnel
 Salary=Salaires
 NewSalaryPayment=Nouveau paiement de salaire
 SalaryPayment=Paiement Salaire
 SalariesPayments=Paiements salaires
 ShowSalaryPayment=Afficher paiement de salaires
+THM=Taux horaire moyen
+TJM=Taux journalier moyen
 CurrentSalary=Salaire actuel
 THMDescription=Cette valeur peut être utilisée pour calculer le coût du temps consommé sur un projet entré par les utilisateurs si le projet de module est utilisé
 TJMDescription=Cette valeur est actuellement à titre d'information seulement et ne sert pas à tout calcul
diff --git a/htdocs/langs/fr_CA/sendings.lang b/htdocs/langs/fr_CA/sendings.lang
index a36c88189e1..7b30519b12e 100644
--- a/htdocs/langs/fr_CA/sendings.lang
+++ b/htdocs/langs/fr_CA/sendings.lang
@@ -1,2 +1,51 @@
 # Dolibarr language file - Source file is en_US - sendings
+AllSendings=Tous les envois
+ShowSending=Afficher les envois
+Receivings=Reçus de livraison
+SendingsArea=Zone d'expédition
+ListOfSendings=Liste des envois
+SendingMethod=Méthode d'envoi
+LastSendings=Dernières expéditions %s
+StatisticsOfSendings=Statistiques pour les envois
+NumberOfShipmentsByMonth=Nombre d'envois par mois
+SendingCard=Carte d'expédition
+CreateShipment=Créer un envoi
+QtyShipped=Quantité expédiée
+QtyPreparedOrShipped=Qté préparé ou expédié
+QtyToShip=Qté pour expédier
+QtyReceived=Qté reçue
+QtyInOtherShipments=Quantité dans les autres envois
+OtherSendingsForSameOrder=Autres envois pour cette commande
+SendingsAndReceivingForSameOrder=Livraisons et recettes pour cet ordre
+SendingsToValidate=Livraisons à valider
+StatusSendingCanceled=Annulé
+StatusSendingValidated=Validé (produits à expédier ou déjà expédiés)
+StatusSendingProcessed=Traité
+StatusSendingProcessedShort=Traité
+SendingSheet=Fiche d'expédition
+ConfirmDeleteSending=Êtes-vous sûr de vouloir supprimer cette expédition?
+ConfirmValidateSending=Êtes-vous sûr de vouloir valider cette expédition avec la référence <b>%s</b>?
+ConfirmCancelSending=Êtes-vous sûr de vouloir annuler cette expédition?
+WarningNoQtyLeftToSend=Attention, aucun produit n'est en attente d'expédition.
+StatsOnShipmentsOnlyValidated=Statistiques réalisées sur les envois validés uniquement. La date utilisée est la date de validation de l'expédition (la date de livraison prévue n'est pas toujours connue).
 DateDeliveryPlanned=Date de livraison prévue
+RefDeliveryReceipt=Bon de livraison de remise
+StatusReceipt=Date réception de livraison
+DateReceived=Date de livraison reçue
+SendShippingByEMail=Envoyer un envoi par EMail
+SendShippingRef=Soumission d'envoi %s
+ActionsOnShipping=Évènements à l'expédition
+LinkToTrackYourPackage=Lien pour suivre votre colis
+ShipmentCreationIsDoneFromOrder=Pour l'instant, la création d'un nouvel envoi se fait à partir de la carte de commande.
+ShipmentLine=Ligne de livraison
+ProductQtyInCustomersOrdersRunning=Quantité de produit dans les commandes de clients ouverts
+ProductQtyInSuppliersOrdersRunning=Quantité de produit en commandes de fournisseurs ouverts
+ProductQtyInShipmentAlreadySent=La quantité de produit provenant de l'ordre client ouvert déjà envoyé
+ProductQtyInSuppliersShipmentAlreadyRecevied=La quantité de produit provenant de l'ordre fournisseur ouvert déjà reçu
+NoProductToShipFoundIntoStock=Aucun produit à expédier dans l'entrepôt <b>%s</b>. Corrigez le stock ou reviens pour choisir un autre entrepôt.
+WeightVolShort=Poids / Vol.
+ValidateOrderFirstBeforeShipment=Vous devez d'abord valider l'ordre avant de pouvoir effectuer des expéditions.
+DocumentModelTyphon=Modèle de document plus complet pour les reçus de livraison (logo ...)
+SumOfProductVolumes=Somme des volumes de produits
+DetailWarehouseNumber=Détails de l'entrepôt
+DetailWarehouseFormat=W: %s (Qté: %d)
diff --git a/htdocs/langs/fr_CA/sms.lang b/htdocs/langs/fr_CA/sms.lang
index 82c8a7fb0dd..6a79dcba648 100644
--- a/htdocs/langs/fr_CA/sms.lang
+++ b/htdocs/langs/fr_CA/sms.lang
@@ -1,2 +1,35 @@
 # Dolibarr language file - Source file is en_US - sms
+SmsSetup=Configuration Sms
+SmsDesc=Cette page vous permet de définir des options globales sur les fonctionnalités SMS
+SmsCard=Carte SMS
+AllSms=Tous les campagnes SMS
+SmsTargets=Objectifs
+SmsRecipients=Objectifs
+SmsRecipient=Cible
+SmsFrom=Expéditeur
+SmsTo=Cible
+SmsMessage=Message SMS
+EditSms=Modifier Sms
+DeleteSms=Supprimer Sms campain
+DeleteASms=Supprimer une campagne Sms
+PreviewSms=Aperçu Sms
+PrepareSms=Préparer Sms
+CreateSms=Créer Sms
+SmsResult=Résultat de l'envoi de Sms
+ValidSms=Valider Sms
+ApproveSms=Approuve Sms
 SmsStatusValidated=Validée
+SmsStatusApproved=Approuver
+SmsStatusSentPartialy=Envoyé en partie
+SmsSuccessfulySent=Sms envoyé correctement (%s de %s)
+ErrorSmsRecipientIsEmpty=Le nombre de cibles est vide
+WarningNoSmsAdded=Aucun nouveau numéro de téléphone à ajouter à la liste cible
+ConfirmValidSms=Confirmez-vous la validation de ce campain?
+NbOfUniqueSms=Nb dof numéros de téléphone uniques
+NbOfSms=Nbre de numéros phon
+SendSms=Envoyer un SMS
+SmsInfoCharRemain=Nb de personnages restants
+SmsInfoNumero=(Format international, c'est-à-dire: +33899701761)
+DelayBeforeSending=Délai avant l'envoi (minutes)
+SmsNoPossibleSenderFound=Aucun expéditeur n'est disponible. Vérifiez la configuration de votre fournisseur de SMS.
+SmsNoPossibleRecipientFound=Aucune cible disponible. Vérifiez la configuration de votre fournisseur de SMS.
diff --git a/htdocs/langs/fr_CA/stocks.lang b/htdocs/langs/fr_CA/stocks.lang
index 96b8786b0d8..9fe13bc4cb2 100644
--- a/htdocs/langs/fr_CA/stocks.lang
+++ b/htdocs/langs/fr_CA/stocks.lang
@@ -1,3 +1,109 @@
 # Dolibarr language file - Source file is en_US - stocks
+WarehouseCard=Carte d'entrepôt
+NewWarehouse=Nouvelle entrepôt / zone de stock
+WarehouseEdit=Modifier l'entrepôt
+AddOne=Ajoute un
+WarehouseTarget=Entrepôt cible
+ValidateSending=Supprimer l'envoi
+CancelSending=Annuler l'envoi
+DeleteSending=Supprimer l'envoi
+StocksByLotSerial=Stock par lot / série
+LotSerial=Lots / Serials
+LotSerialList=Liste des lots / séries
+ErrorWarehouseRefRequired=Le nom de référence de l'entrepôt est requis
+StockMovementForId=ID de mouvement %d
+ListMouvementStockProject=Liste des mouvements de stock associés au projet
+StocksArea=Zone d'entrepôts
+LocationSummary=Nom abrégé
+StockCorrection=Stock correct
+StockTransfer=Stock de transfert
+MassStockTransferShort=Transfert de stock de masse
+LabelMovement=Étiquette de mouvement
+NumberOfUnit=Nombre d'unités
+UnitPurchaseValue=Prix ​​unitaire d'achat
+StockTooLow=Stock trop bas
+StockLowerThanLimit=Stock inférieure à la limite d'alerte (%s)
 EnhancedValue=Valeur
+PMPValue=Prix ​​moyen pondéré
+EnhancedValueOfWarehouses=Valeur des entrepôts
+UserWarehouseAutoCreate=Créer un entrepôt automatiquement lors de la création d'un utilisateur
+AllowAddLimitStockByWarehouse=Permet d'ajouter la limite et le stock désiré par couple (produit, entrepôt) au lieu de par produit
+IndependantSubProductStock=Le stock de produits et le sous-produit sont indépendants
+QtyDispatched=Quantité expédiée
+QtyDispatchedShort=Qté expédiée
+QtyToDispatchShort=Qté à expédier
+RuleForStockManagementDecrease=Règle pour la réduction automatique de la gestion des stocks (la diminution manuelle est toujours possible, même si une règle de diminution automatique est activée)
+RuleForStockManagementIncrease=Règle pour l'augmentation automatique de la gestion des stocks (l'augmentation manuelle est toujours possible, même si une règle d'augmentation automatique est activée)
+DeStockOnBill=Diminuer les stocks réels sur les factures des clients / validation des notes de crédit
+DeStockOnValidateOrder=Diminuer les stocks réels sur la validation des commandes des clients
+DeStockOnShipment=Diminuer les stocks réels lors de la validation de l'expédition
+DeStockOnShipmentOnClosing=Diminuer les stocks réels sur la classification de l'expédition fermée
+ReStockOnBill=Augmenter les stocks réels sur les factures des fournisseurs / validation des notes de crédit
+ReStockOnValidateOrder=Augmenter les stocks réels sur l'approbation des commandes des fournisseurs
+ReStockOnDispatchOrder=Augmenter les stocks réels lors de l'expédition manuelle dans les entrepôts, après réception de la facture fournisseur des marchandises
+OrderStatusNotReadyToDispatch=L'ordre n'a pas encore ou pas plus un statut qui permet l'envoi de produits dans des entrepôts de stock.
+StockDiffPhysicTeoric=Explication de la différence entre le stock physique et le stock virtuel
+NoPredefinedProductToDispatch=Aucun produit prédéfini pour cet objet. Donc, aucune expédition en stock n'est requise.
+DispatchVerb=Envoi
+StockLimitShort=Limite d'alerte
+StockLimit=Limite de stock pour l'alerte
+VirtualStock=Stock virtuel
+IdWarehouse=Id entrepôt
+LieuWareHouse=Entrepôt de localisation
+WarehousesAndProductsBatchDetail=Entrepôts et produits (avec détail par lot / série)
+AverageUnitPricePMPShort=Prix ​​moyen pondéré des intrants
+AverageUnitPricePMP=Prix ​​moyen pondéré des intrants
+SellPriceMin=Prix ​​unitaire de vente
+EstimatedStockValueSellShort=Valeur à vendre
+EstimatedStockValueSell=Valeur à vendre
+EstimatedStockValueShort=Valeur de stock d'entrée
+EstimatedStockValue=Valeur de stock d'entrée
+ConfirmDeleteWarehouse=Êtes-vous sûr de vouloir supprimer l'entrepôt <b>%s</b>?
+ThisWarehouseIsPersonalStock=Cet entrepôt représente un stock personnel de %s %s
+SelectWarehouseForStockDecrease=Choisissez un entrepôt à utiliser pour réduire les stocks
+SelectWarehouseForStockIncrease=Choisir un entrepôt à utiliser pour augmenter les stocks
+NoStockAction=Pas de stock action
+DesiredStock=Offre optimale souhaitée
+DesiredStockDesc=Ce montant de stock sera la valeur utilisée pour remplir le stock par fonctionnalité de réapprovisionnement.
+StockToBuy=Commander
+ReplenishmentOrders=Ordres de réapprovisionnement
+VirtualDiffersFromPhysical=Selon l'augmentation / diminution des options d'achat d'actions, les stocks physiques et les stocks virtuels (commandes physiques et actuelles) peuvent différer
+UseVirtualStockByDefault=Utilisez le stock virtuel par défaut, au lieu du stock physique, pour la fonctionnalité de réapprovisionnement
+UseVirtualStock=Utiliser un stock virtuel
+UsePhysicalStock=Utiliser un stock physique
+CurentSelectionMode=Mode de sélection actuel
+CurentlyUsingVirtualStock=Stock virtuel
+CurentlyUsingPhysicalStock=Stock physique
+RuleForStockReplenishment=Règle pour la reconstitution des stocks
+AlertOnly=Alertes uniquement
+WarehouseForStockDecrease=L'entrepôt <b>%s</b> sera utilisé pour diminuer les stocks
+WarehouseForStockIncrease=L'entrepôt <b>%s</b> sera utilisé pour augmenter les stocks
+ReplenishmentStatusDesc=Il s'agit d'une liste de tous les produits avec un stock inférieur au stock souhaité (ou inférieur à la valeur d'alerte si la case "Alerte uniquement" est cochée). À l'aide de la case à cocher, vous pouvez créer des commandes fournisseurs pour combler la différence.
+ReplenishmentOrdersDesc=Il s'agit d'une liste de toutes les commandes fournisseurs ouvertes, y compris des produits prédéfinis. Seuls les commandes ouvertes avec des produits prédéfinis, de sorte que les commandes susceptibles d'affecter les stocks, sont visibles ici.
+NbOfProductBeforePeriod=Quantité de produit %s en stock avant la période sélectionnée (<%s)
+NbOfProductAfterPeriod=Quantité de produit %s en stock après la période sélectionnée (> %s)
+MassMovement=Mouvement de masse
+SelectProductInAndOutWareHouse=Sélectionnez un produit, une quantité, un entrepôt source et un entrepôt cible, puis cliquez sur "%s". Une fois que cela est fait pour tous les mouvements requis, cliquez sur "%s".
+RecordMovement=Transfert d'enregistrement
+ReceivingForSameOrder=Reçus pour cette commande
+StockMovementRecorded=Mouvements de stock enregistrés
+RuleForStockAvailability=Règles sur les stocks requis
+StockMustBeEnoughForInvoice=Le niveau de stock doit être suffisant pour ajouter un produit / service à la facture (la vérification est effectuée sur le stock réel actuel lors de l'ajout d'une ligne dans la facture, quelle que soit la règle pour la modification automatique des stocks)
+StockMustBeEnoughForOrder=Le niveau de stock doit être suffisant pour ajouter un produit / service à la commande (la vérification est effectuée sur le stock réel actuel lors de l'ajout d'une ligne dans l'ordre quelle que soit la règle pour le changement de stock automatique)
+StockMustBeEnoughForShipment=Le niveau de stock doit être suffisant pour ajouter du produit / service à l'expédition (la vérification est effectuée sur le stock réel actuel lors de l'ajout d'une ligne dans l'expédition, quelle que soit la règle pour la modification automatique des stocks)
+MovementLabel=Étiquette de mouvement
+InventoryCode=Mouvement ou code d'inventaire
+IsInPackage=Contenu dans le paquet
 ShowWarehouse=Voir entrepôt
+MovementCorrectStock=Correction de stock pour le produit %s
+NoPendingReceptionOnSupplierOrder=Pas de réception en attente en raison d'une commande ouverte du fournisseur
+ThisSerialAlreadyExistWithDifferentDate=Ce lot / numéro de série (<strong>%s</strong>) existe déjà, mais avec différentes dates eatby ou sellby (trouvé <strong>%s</strong> mais vous entrez <strong>%s</strong>).
+OpenAll=Ouvert pour toutes les actions
+OpenInternal=Ouvrir uniquement pour les actions internes
+UseDispatchStatus=Utilisez un état d'envoi (approbation / refus) pour les lignes de produits lors de la réception de commande fournisseur
+OptionMULTIPRICESIsOn=L'option "plusieurs prix par segment" est activée. Cela signifie qu'un produit a plusieurs prix de vente, donc la valeur à vendre ne peut être calculée
+ProductStockWarehouseCreated=Limite de stock pour l'alerte et le stock optimal souhaité correctement créé
+ProductStockWarehouseUpdated=La limite de stock pour l'alerte et le stock optimal souhaité est correctement mis à jour
+ProductStockWarehouseDeleted=La limite de stock pour l'alerte et le stock optimal souhaité sont correctement supprimés
+AddNewProductStockWarehouse=Définir une nouvelle limite pour l'alerte et le stock optimal souhaité
+AddStockLocationLine=Diminuez la quantité, puis cliquez pour ajouter un autre entrepôt pour ce produit
diff --git a/htdocs/langs/fr_CA/supplier_proposal.lang b/htdocs/langs/fr_CA/supplier_proposal.lang
index 1ba2ff4572d..f9a6b3caf48 100644
--- a/htdocs/langs/fr_CA/supplier_proposal.lang
+++ b/htdocs/langs/fr_CA/supplier_proposal.lang
@@ -1,4 +1,42 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposal=Propositions commerciales fournisseurs
+supplier_proposalDESC=Gérer les demandes de prix aux fournisseurs
+SupplierProposalNew=Nouvelle requête
+CommRequests=Demande de prix
+SearchRequest=Trouver une demande
+DraftRequests=Requêtes préliminaires
+SupplierProposalsDraft=Projet de propositions de fournisseurs
+LastModifiedRequests=Dernières %s demandes de prix modifiées
+RequestsOpened=Demandes de prix ouverts
+SupplierProposalArea=Zone de propositions de fournisseurs
+SupplierProposalShort=Proposition de fournisseur
+SupplierProposals=Propositions de fournisseurs
+SupplierProposalsShort=Propositions de fournisseurs
+ShowSupplierProposal=Afficher la demande de prix
+SupplierProposalRefFourn=Réf fournisseur
+SupplierProposalRefFournNotice=Avant de passer à "Accepté", pensez à saisir les références des fournisseurs.
+ConfirmValidateAsk=Êtes-vous sûr de vouloir valider cette demande de prix sous le nom <b> %s</b>?
+DeleteAsk=Supprimer la demande
+ValidateAsk=Valider la demande
+SupplierProposalStatusValidated=Validé (la demande est ouverte)
 SupplierProposalStatusClosed=Fermées
 SupplierProposalStatusValidatedShort=Validée
 SupplierProposalStatusClosedShort=Fermées
+CopyAskFrom=Créer une demande de prix en copiant une demande existante
+CreateEmptyAsk=Créer une requête vierge
+CloneAsk=Demande de prix de clone
+ConfirmCloneAsk=Êtes-vous sûr de vouloir cloner la demande de prix <b> %s</b>?
+ConfirmReOpenAsk=Êtes-vous sûr de vouloir ouvrir la demande de prix <b> %s</b>?
+SendAskByMail=Envoyer la demande de prix par mail
+SupplierProposalCard=Demande de carte
+ConfirmDeleteAsk=Êtes-vous sûr de vouloir supprimer cette demande de prix <b>%s</b>?
+ActionsOnSupplierProposal=Événements sur demande de prix
+DocModelAuroreDescription=Un modèle de demande complet (logo ...)
+DefaultModelSupplierProposalCreate=Création de modèle par défaut
+DefaultModelSupplierProposalToBill=Modèle par défaut lors de la clôture d'une demande de prix (acceptée)
+DefaultModelSupplierProposalClosed=Modèle par défaut lors de la clôture d'une demande de prix (refusée)
+ListSupplierProposalsAssociatedProject=Liste des propositions de fournisseurs associées au projet
+SupplierProposalsToClose=Propositions de fournisseurs à clôturer
+SupplierProposalsToProcess=Propositions de fournisseurs à traiter
+LastSupplierProposals=Dernières demandes de prix %s
+AllPriceRequests=Toutes les demandes
diff --git a/htdocs/langs/fr_CA/suppliers.lang b/htdocs/langs/fr_CA/suppliers.lang
index ee2194a28ed..9ae6d3eb064 100644
--- a/htdocs/langs/fr_CA/suppliers.lang
+++ b/htdocs/langs/fr_CA/suppliers.lang
@@ -4,6 +4,7 @@ ShowSupplierInvoice=Afficher une facture fournisseur
 ListOfSuppliers=Liste fournisseurs
 TotalBuyingPriceMinShort=Total de sous-produits par prix d'achat
 SomeSubProductHaveNoPrices=Certains sous-produits n'ont pas de prix défini
+ChangeSupplierPrice=Changer le prix d'achat
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Ce fournisseur de référence est déjà associé à une référence : %s
 NoRecordedSuppliers=Aucun fournisseurs enregistrés
 SupplierPayment=Règlement fournisseur
@@ -12,7 +13,13 @@ ExportDataset_fournisseur_1=Liste des factures des fournisseurs et des lignes de
 ExportDataset_fournisseur_2=Factures des fournisseurs et paiements
 ExportDataset_fournisseur_3=Commandes fournisseurs et les lignes de commande
 ApproveThisOrder=Approuver cette commande
+ConfirmApproveThisOrder=Êtes-vous sûr de vouloir approuver la commande <b> %s</b>?
+ConfirmDenyingThisOrder=Êtes-vous sûr de vouloir refuser cette commande <b> %s</b>?
+ConfirmCancelThisOrder=Êtes-vous sûr de vouloir annuler cette commande <b> %s</b>?
 ListOfSupplierProductForSupplier=Liste des produits et des prix pour le fournisseur <b>%s</b>
 SentToSuppliers=Envoyer aux fournisseurs
 MenuOrdersSupplierToBill=Commandes de fournisseur à facturer
 DescNbDaysToDelivery=Délai de livraison maximum pour les produits de cette commande
+DoNotOrderThisProductToThisSupplier=Ne commandez pas
+NotTheGoodQualitySupplier=Qualité incorrecte
+AllProductServicePrices=Tous les prix des produits / services
diff --git a/htdocs/langs/fr_CA/trips.lang b/htdocs/langs/fr_CA/trips.lang
index 70793109004..3e2773793f2 100644
--- a/htdocs/langs/fr_CA/trips.lang
+++ b/htdocs/langs/fr_CA/trips.lang
@@ -1,5 +1,68 @@
 # Dolibarr language file - Source file is en_US - trips
+ExpenseReport=Rapport de dépenses
 ExpenseReports=Note de frais
+ShowExpenseReport=Afficher le rapport de dépenses
+TripsAndExpenses=Rapports sur les dépenses
+TripsAndExpensesStatistics=Statistiques des rapports de dépenses
+TripCard=Rapport de dépenses
+AddTrip=Créer un rapport de dépenses
+ListOfTrips=Liste des rapports de dépenses
+ListOfFees=Liste des frais
+TypeFees=Types de frais
+ShowTrip=Afficher le rapport de dépenses
+NewTrip=Nouveau rapport de dépenses
+CompanyVisited=Entreprise / organisation visité
+DeleteTrip=Supprimer le rapport de dépenses
+ConfirmDeleteTrip=Êtes-vous sûr de vouloir supprimer ce rapport de dépenses?
+ListTripsAndExpenses=Liste des rapports de dépenses
+ListToApprove=en attente d'approbation
+ExpensesArea=Zone de rapports sur les dépenses
+ClassifyRefunded=Classer «Remboursé»
+ExpenseReportWaitingForApproval=Un nouveau rapport de dépenses a été soumis pour approbation
+ExpenseReportWaitingForApprovalMessage=Un nouveau rapport de dépenses a été soumis et attend l'approbation.\n - Utilisateur: %s\n - Période: %s\nCliquez ici pour valider: %s
+ExpenseReportWaitingForReApproval=Un rapport sur les dépenses a été soumis pour approbation
+ExpenseReportWaitingForReApprovalMessage=Un rapport sur les dépenses a été soumis et attend une ré-approbation.\nLe %s, vous avez refusé d'approuver le rapport de dépenses pour cette raison: %s.\nUne nouvelle version a été proposée et en attente de votre approbation.\n - Utilisateur: %s\n - Période: %s\nCliquez ici pour valider: %s
+ExpenseReportApproved=Un rapport sur les dépenses a été approuvé
+ExpenseReportApprovedMessage=Le rapport de dépenses %s a été approuvé.\n - Utilisateur: %s\n - Approuvé par: %s\nCliquez ici pour afficher le rapport de dépenses: %s
+ExpenseReportRefused=Un rapport de dépenses a été refusé
+ExpenseReportRefusedMessage=Le rapport de dépenses %s a été refusé.\n - Utilisateur: %s\n - Refusé par: %s\n - Motif de refus: %s\nCliquez ici pour afficher le rapport de dépenses: %s
+ExpenseReportCanceled=Un rapport de dépenses a été annulé
+ExpenseReportCanceledMessage=Le rapport de dépenses %s a été annulé.\n - Utilisateur: %s\n - Annulé par: %s\n - Motif d'annulation: %s\nCliquez ici pour afficher le rapport de dépenses: %s
+ExpenseReportPaid=Un rapport de dépenses a été payé
+ExpenseReportPaidMessage=Le rapport de dépenses %s a été payé.\n - Utilisateur: %s\n - Payé par: %s\nCliquez ici pour afficher le rapport de dépenses: %s
+TripId=Rapport de dépenses
+AnyOtherInThisListCanValidate=Personne à informer pour validation.
+TripSociete=Société d'information
+TripNDF=Informations rapport de dépenses
+PDFStandardExpenseReports=Modèle standard pour générer un document PDF pour le rapport de dépenses
+ExpenseReportLine=Ligne de rapport de dépenses
+TF_LUNCH=Le déjeuner
+TF_BUS=Autobus
+TF_HOTEL=Un hôtel
+ErrorDoubleDeclaration=Vous avez déclaré un autre rapport de dépenses dans une fourchette de dates similaire.
+AucuneLigne=Il n'y a pas encore de rapport de dépenses déclaré
+VALIDATOR=Responsable de l'approbation
 MOTIF_REFUS=Raison
 MOTIF_CANCEL=Raison
+DATE_REFUS=Déni de date
+DATE_CANCEL=Date d'annulation
 DATE_PAIEMENT=Date de règlement
+BROUILLONNER=Rouvrir
+ValidateAndSubmit=Validez et soumettez pour approbation
+NOT_AUTHOR=Vous n'êtes pas l'auteur de ce rapport de dépenses. Fonctionnement annulé.
+ConfirmRefuseTrip=Êtes-vous sûr de vouloir refuser ce rapport de dépenses?
+ValideTrip=Approuver le rapport de dépenses
+ConfirmValideTrip=Êtes-vous sûr de vouloir approuver ce rapport de dépenses?
+PaidTrip=Payer un rapport de dépenses
+ConfirmPaidTrip=Êtes-vous sûr de vouloir modifier l'état de ce rapport de dépenses sur "Payé"?
+ConfirmCancelTrip=Êtes-vous sûr de vouloir annuler ce rapport de dépenses?
+BrouillonnerTrip=Déplacer le rapport de dépenses vers le statut "Ébauche"
+ConfirmBrouillonnerTrip=Êtes-vous sûr de vouloir déplacer ce rapport de dépenses au statut "Ébauche"?
+SaveTrip=Valider le rapport de dépenses
+ConfirmSaveTrip=Êtes-vous sûr de vouloir valider ce rapport de dépenses?
+NoTripsToExportCSV=Aucun rapport de dépenses à exporter pour cette période.
+ExpenseReportPayment=Paiement du rapport de dépenses
+ExpenseReportsToApprove=Rapports de dépenses à approuver
+ExpenseReportsToPay=Rapports de dépenses à payer
+CloneExpenseReport=Rapport de dépenses de clones
+ConfirmCloneExpenseReport=Êtes-vous sûr de vouloir cloner ce rapport de dépenses?
diff --git a/htdocs/langs/fr_CA/users.lang b/htdocs/langs/fr_CA/users.lang
index dc4b895ede4..7f80f64cd1b 100644
--- a/htdocs/langs/fr_CA/users.lang
+++ b/htdocs/langs/fr_CA/users.lang
@@ -1,2 +1,16 @@
 # Dolibarr language file - Source file is en_US - users
+SubjectNewPassword=Votre nouveau mot de passe pour %s
+ConfirmDisableUser=Êtes-vous sûr de vouloir désactiver l'utilisateur <b>%s</b>?
+ConfirmDeleteUser=Êtes-vous sûr de vouloir supprimer l'utilisateur <b>%s</b>?
+ConfirmDeleteGroup=Êtes-vous sûr de vouloir supprimer le groupe <b>%s</b>?
+ConfirmEnableUser=Êtes-vous sûr de vouloir activer l'utilisateur <b>%s</b>?
+ConfirmReinitPassword=Êtes-vous sûr de vouloir générer un nouveau mot de passe pour l'utilisateur <b>%s</b>?
+ConfirmSendNewPassword=Êtes-vous sûr de vouloir générer et envoyer un nouveau mot de passe pour l'utilisateur <b> %s</b>?
+LastGroupsCreated=Derniers groupes %s créés
+LastUsersCreated=Derniers %s utilisateurs créés
+CreateInternalUserDesc=Ce formulaire vous permet de créer un utilisateur interne à votre entreprise / organisation. Pour créer un utilisateur externe (client, fournisseur, ...), utilisez le bouton 'Créer un utilisateur Dolibarr' à partir de la carte de contact de tiers.
+InternalExternalDesc=Un utilisateur <b> interne </b> est un utilisateur qui fait partie de votre entreprise/organisation. <br>Un utilisateur<b> externe</b>est un client, un fournisseur ou un autre. <br><br>Les deux cas, les autorisations définissent les droits sur Dolibarr, mais l'utilisateur externe peut avoir un gestionnaire de menu différent de l'utilisateur interne (voir Home - Setup - Display)
+ConfirmCreateContact=Êtes-vous sûr de vouloir créer un compte Dolibarr pour ce contact?
+ConfirmCreateLogin=Êtes-vous sûr de vouloir créer un compte Dolibarr pour ce membre?
+ConfirmCreateThirdParty=Êtes-vous sûr de vouloir créer un tiers pour ce membre?
 UserAccountancyCode=code comptabie de l'utilisateur
diff --git a/htdocs/langs/fr_CA/website.lang b/htdocs/langs/fr_CA/website.lang
index 7656edf7aa4..ca6168a235e 100644
--- a/htdocs/langs/fr_CA/website.lang
+++ b/htdocs/langs/fr_CA/website.lang
@@ -2,3 +2,23 @@
 WebsiteSetupDesc=Créer ici autant d'entrée que le nombre de différents sites Web dont vous avez besoin. Ensuite, allez dans le menu Sites Web pour les éditer.
 DeleteWebsite=Supprimer site internet
 ConfirmDeleteWebsite=Etes-vous sûr de vouloir supprimer ce site Web. Toutes ses pages et le contenu seront également supprimés.
+WEBSITE_PAGENAME=Nom / alias de la page
+WEBSITE_CSS_URL=URL du fichier CSS externe
+WEBSITE_CSS_INLINE=Contenu CSS
+MediaFiles=Médiathèque
+EditCss=Modifier style / CSS
+EditMenu=Menu Edition
+EditPageMeta=Modifier Meta
+EditPageContent=Modifier le contenu
+Website=Site Internet
+Webpage=page web
+PreviewOfSiteNotYetAvailable=Aperçu de votre site web <strong>%s</strong> n'est pas encore disponible. Vous devez d'abord ajouter une page.
+RequestedPageHasNoContentYet=La page demandée avec l'identifiant %s n'a pas encore de contenu ou le fichier cache .tpl.php a été supprimé. Modifier le contenu de la page pour résoudre ce problème.
+PageDeleted=Page '%s' du site %s supprimé
+PageAdded=La page '%s' a ajouté
+ViewSiteInNewTab=Afficher le site dans un nouvel onglet
+ViewPageInNewTab=Afficher la page dans un nouvel onglet
+ViewWebsiteInProduction=Afficher le site Web à l'aide d'URL d'accueil
+SetHereVirtualHost=Si vous pouvez définir, sur votre serveur Web, un hôte virtuel dédié avec un répertoire racine sur <strong>%s</strong>, définissez ici le nom d'hôte virtuel afin que l'aperçu puisse être effectué également en utilisant cet accès direct au serveur Web et non seulement en utilisant Serveur Dolibarr.
+PreviewSiteServedByWebServer=Aperçu %s dans un nouvel onglet. <br> <br> Le %s sera desservi par un serveur web externe (comme Apache, Nginx, IIS). Vous devez installer et configurer ce serveur avant de pointer vers le répertoire: <br> <strong>%s</strong> <br> URL desservie par un serveur externe: <br> <strong> %s</strong>
+PreviewSiteServedByDolibarr=Aperçu %s dans un nouvel onglet. <br> <br> %s sera desservi par le serveur Dolibarr afin qu'il ne soit pas nécessaire d'installer un serveur Web supplémentaire (comme Apache, Nginx, IIS).<br> L'inconvénient est cet URL Des pages ne sont pas conviviaux et commencent par le chemin de votre Dolibarr. <br> URL desservie par Dolibarr: <br><strong>%s</strong><br><br>Pour utiliser votre propre serveur Web externe pour desservir ce site Web Site, créez un hôte virtuel sur votre serveur Web qui pointe sur le répertoire <br><strong>%s</strong><br> puis entrez le nom de ce serveur virtuel et cliquez sur l'autre bouton de prévisualisation.
diff --git a/htdocs/langs/fr_CA/withdrawals.lang b/htdocs/langs/fr_CA/withdrawals.lang
index 9efc4180748..923d547db91 100644
--- a/htdocs/langs/fr_CA/withdrawals.lang
+++ b/htdocs/langs/fr_CA/withdrawals.lang
@@ -1,2 +1,87 @@
 # Dolibarr language file - Source file is en_US - withdrawals
+CustomersStandingOrdersArea=Zone de commandes de paiement par débit direct
+SuppliersStandingOrdersArea=Zone de commandes de paiement direct
+NewStandingOrder=Nouveau décret direct
+StandingOrderToProcess=Procéder
+WithdrawalsReceipts=Ordres de débit direct
+WithdrawalReceipt=Ordre de débit direct
+LastWithdrawalReceipts=Derniers fichiers de débit direct %s
+WithdrawalsLines=Lignes de commande de débit direct
+RequestStandingOrderToTreat=Demande d'ordonnance de paiement de débit direct à traiter
+RequestStandingOrderTreated=Demande d'ordonnance de paiement par prélèvement automatique traitée
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Pas encore possible. L'état de retrait doit être défini sur 'crédité' avant de déclarer le rejet sur des lignes spécifiques.
+NbOfInvoiceToWithdraw=Nb. De la facture avec l'ordre de débit direct
+NbOfInvoiceToWithdrawWithInfo=Nb. De la facture du client avec des ordres de paiement de débit direct ayant des informations définies sur le compte bancaire
+InvoiceWaitingWithdraw=Facture en attente de débit direct
+AmountToWithdraw=Montant à retirer
+WithdrawsRefused=Débit direct refusé
+NoInvoiceToWithdraw=Aucune facture de client avec Open 'Demandes de débit direct' est en attente. Allez sur l'onglet '%s' sur la carte de facture pour faire une demande.
+ResponsibleUser=Utilisateur responsable
+WithdrawStatistics=Statistiques de paiement par débit direct
+WithdrawRejectStatistics=Statistiques de rejet de paiement par débit direct
+LastWithdrawalReceipt=Derniers %s reçus de débit direct
+MakeWithdrawRequest=Faire une demande de paiement par prélèvement automatique
+WithdrawRequestsDone=%s demandes de paiement par prélèvement automatique enregistrées
+ThirdPartyBankCode=Code bancaire tiers
+NoInvoiceCouldBeWithdrawed=Aucune facture retirée avec succès. Vérifiez que la facture se trouve sur des sociétés avec un BAN valide.
+ClassCreditedConfirm=Êtes-vous sûr de vouloir classer ce reçu de retrait comme crédité sur votre compte bancaire?
+WithdrawalRefused=Retrait refusée
+WithdrawalRefusedConfirm=Êtes-vous sûr de vouloir introduire un rejet de retrait pour la société?
+RefusedData=Date de rejet
+RefusedReason=Raison du rejet
+NoInvoiceRefused=Ne chargez pas le rejet
+InvoiceRefused=Facture refusée (Charge le rejet au client)
+StatusWaiting=Attendre
+StatusTrans=Envoyé
+StatusCredited=Crédit
 StatusRefused=Refusé
+StatusMotif0=Non spécifié
+StatusMotif1=Fonds insuffisants
+StatusMotif2=Demande contestée
+StatusMotif3=Aucune ordonnance de paiement par prélèvement automatique
+StatusMotif4=Commande du client
+StatusMotif5=RIB inutilisable
+StatusMotif6=Compte sans solde
+StatusMotif8=Autre raison
+CreateAll=Retirer tout
+CreateGuichet=Seul bureau
+CreateBanque=Seulement la banque
+NotifyTransmision=Transmission de retrait
+NotifyCredit=Crédit de retrait
+NumeroNationalEmetter=Numéro national de l'émetteur
+WithBankUsingRIB=Pour les comptes bancaires utilisant RIB
+WithBankUsingBANBIC=Pour les comptes bancaires utilisant IBAN / BIC / SWIFT
+BankToReceiveWithdraw=Compte bancaire pour recevoir des débits directs
+CreditDate=Crédit sur
+WithdrawalFileNotCapable=Impossible de générer un fichier de retrait de retrait pour votre pays %s (Votre pays n'est pas pris en charge)
+ShowWithdraw=Afficher le retrait
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Toutefois, si la facture a au moins un paiement de retrait non encore traité, elle ne sera pas définie comme payée pour permettre la gestion préalable du retrait.
+DoStandingOrdersBeforePayments=Cet onglet vous permet de demander une commande de paiement par prélèvement automatique. Une fois terminé, accédez au menu Banque-> Ordres de débit direct pour gérer l'ordre de paiement de débit direct. Lorsque la commande de paiement est fermée, le paiement sur facture sera automatiquement enregistré et la facture sera fermée si le solde à payer est nul.
+WithdrawalFile=Fichier de retrait
+SetToStatusSent=Définir le statut "Fichier envoyé"
+ThisWillAlsoAddPaymentOnInvoice=Cela s'appliquera également aux paiements aux factures et les classera comme "Payé"
+StatisticsByLineStatus=Statistiques par état des lignes
+RUMLong=Référence de mandat unique
+RUMWillBeGenerated=Le numéro UMR sera généré une fois les informations du compte bancaire enregistrées
+WithdrawMode=Mode de débit direct (FRST ou RECUR)
+WithdrawRequestAmount=Montant de la demande de débit direct:
+WithdrawRequestErrorNilAmount=Impossible de créer une demande de débit direct pour un montant vide.
+SepaMandate=Mandat de débit direct SEPA
+PleaseReturnMandate=Veuillez renvoyer ce formulaire de mandat par courrier électronique à %s ou par courrier à
+SEPALegalText=En signant ce formulaire de mandat, vous autorisez (A) %s à envoyer des instructions à votre banque pour débiter votre compte et (B) votre banque pour débiter votre compte conformément aux instructions de %s. Dans le cadre de vos droits, vous avez droit à un remboursement de votre banque selon les termes et conditions de votre contrat avec votre banque. Un remboursement doit être demandé dans les 8 semaines à partir de la date à laquelle votre compte a été débité. Vos droits concernant le mandat ci-dessus sont expliqués dans un état que vous pouvez obtenir auprès de votre banque.
+CreditorIdentifier=Identificateur du créancier
+CreditorName=Nom du créancier
+SEPAFillForm=(B) Veuillez compléter tous les champs marqués *
+SEPAFormYourBAN=Votre nom de compte bancaire (IBAN)
+SEPAFormYourBIC=Votre code d'identification de banque (BIC)
+ModeRECUR=Paiement récurrent
+ModeFRST=Paiement unique
+PleaseCheckOne=Veuillez cocher un seul
+InfoCreditSubject=Paiement de l'ordre de paiement de débit direct %s par la banque
+InfoCreditMessage=La ligne de paiement de débit direct %s a été payée par la banque <br> Données de paiement: %s
+InfoTransSubject=Transmission de l'ordre de paiement de débit direct %s à la banque
+InfoTransMessage=L'ordre de paiement de débit direct %s a été envoyé à la banque par %s %s. <br> <br>
+InfoTransData=Montant: %s <br> Méthode: %s <br> Date: %s
+InfoRejectSubject=Ordonnance de paiement par prélèvement automatique refusée
+InfoRejectMessage=Bonjour, <br> <br> l'ordre de paiement de débit direct de la facture %s relatif à la société %s, avec un montant de %s a été refusé par la banque. <br> <br> - <br> %s
+ModeWarning=L'option pour le mode réel n'a pas été définie, nous nous arrêtons après cette simulation
diff --git a/htdocs/langs/fr_CA/workflow.lang b/htdocs/langs/fr_CA/workflow.lang
index 785a361bd24..e0f853db9e4 100644
--- a/htdocs/langs/fr_CA/workflow.lang
+++ b/htdocs/langs/fr_CA/workflow.lang
@@ -5,6 +5,9 @@ ThereIsNoWorkflowToModify=Il n'y a pas de modification de flux de travail dispon
 descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Créer automatiquement une commande client après une proposition commerciale est signée
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Créer automatiquement une facture client après une proposition commerciale est signée
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Créer automatiquement une facture client après un contrat est validé
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Crée automatiquement une facture client après la fermeture d'une commande client
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classez proposition source liée à bec lors de la commande du client est réglé sur payé
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classez commande client source liée(s) à bec lorsque la facture client est réglé sur payé
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classez ordre lié source de client(s) à bec lorsque la facture client est validée
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classer la proposition de source liée à facturer lorsque la facture du client est validée
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classer l'ordre source lié à l'expédition lorsqu'un envoi est validé et la quantité expédiée est identique à celle de l'ordre
diff --git a/htdocs/langs/fr_CH/accountancy.lang b/htdocs/langs/fr_CH/accountancy.lang
deleted file mode 100644
index 527f1fd139d..00000000000
--- a/htdocs/langs/fr_CH/accountancy.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-AccountingCategory=Accounting category
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
diff --git a/htdocs/langs/fr_CH/admin.lang b/htdocs/langs/fr_CH/admin.lang
index 9602601e241..1c53b65c99c 100644
--- a/htdocs/langs/fr_CH/admin.lang
+++ b/htdocs/langs/fr_CH/admin.lang
@@ -1,1665 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
-Foundation=Foundation
-Version=Version
-VersionProgram=Version program
-VersionLastInstall=Initial install version
-VersionLastUpgrade=Latest version upgrade
-VersionExperimental=Experimental
-VersionDevelopment=Development
-VersionUnknown=Unknown
-VersionRecommanded=Recommended
-FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. Value of some setup constants may also be checked. You can use this tool to detect if some files were modified by a hacker for example.
-FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
-GlobalChecksum=Global checksum
-MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
-LocalSignature=Embedded local signature (less reliable)
-RemoteSignature=Remote distant signature (more reliable)
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FilesModified=Modified Files
-FilesAdded=Added Files
-FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
-XmlNotFound=Xml Integrity File of application not found
-SessionId=Session ID
-SessionSaveHandler=Handler to save sessions
-SessionSavePath=Storage session localization
-PurgeSessions=Purge of sessions
-ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
-NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow to list all running sessions.
-LockNewSessions=Lock new connections
-ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself. Only user <b>%s</b> will be able to connect after that.
-UnlockNewSessions=Remove connection lock
-YourSession=Your session
-Sessions=Users session
-WebUserGroup=Web server user/group
-NoSessionFound=Your PHP seems to not allow to list active sessions. Directory used to save sessions (<b>%s</b>) might be protected (For example, by OS permissions or by PHP directive open_basedir).
-DBStoringCharset=Database charset to store data
-DBSortingCharset=Database charset to sort data
-WarningModuleNotActive=Module <b>%s</b> must be enabled
-WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page.
-DolibarrSetup=Dolibarr install or upgrade
-InternalUser=Internal user
-ExternalUser=External user
-InternalUsers=Internal users
-ExternalUsers=External users
-GUISetup=Display
-SetupArea=Setup area
-FormToTestFileUploadForm=Form to test file upload (according to setup)
-IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
-RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
-RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any usage of update tool.
-SecuritySetup=Security setup
-SecurityFilesDesc=Define here options related to security about uploading files.
-ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
-ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
-ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is not supported.
-DictionarySetup=Dictionary setup
-Dictionary=Dictionaries
-ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
-ErrorCodeCantContainZero=Code can't contain value 0
-DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
-UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties, but it is less convenient)
-DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact, but it is less convenient)
-NumberOfKeyToSearch=Nbr of characters to trigger search: %s
-NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
-AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
-JavascriptDisabled=JavaScript disabled
-UsePreviewTabs=Use preview tabs
-ShowPreview=Show preview
-PreviewNotAvailable=Preview not available
-ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
-MySQLTimeZone=TimeZone MySql (database)
-TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
-Space=Space
-Table=Table
-Fields=Fields
-Index=Index
-Mask=Mask
-NextValue=Next value
-NextValueForInvoices=Next value (invoices)
-NextValueForCreditNotes=Next value (credit notes)
-NextValueForDeposit=Next value (deposit)
-NextValueForReplacements=Next value (replacements)
-MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to <b>%s</b> %s, whatever this parameter's value is
-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
-AntiVirusParam= More parameters on command line
-AntiVirusParamExample= Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
-ComptaSetup=Accounting module setup
-UserSetup=User management setup
-MultiCurrencySetup=Multi-currency setup
-MenuLimits=Limits and accuracy
-MenuIdParent=Parent menu ID
-DetailMenuIdParent=ID of parent menu (empty for a top menu)
-DetailPosition=Sort number to define menu position
-AllMenus=All
-NotConfigured=Module not configured
-Active=Active
-SetupShort=Setup
-OtherOptions=Other options
-OtherSetup=Other setup
-CurrentValueSeparatorDecimal=Decimal separator
-CurrentValueSeparatorThousand=Thousand separator
-Destination=Destination
-IdModule=Module ID
-IdPermissions=Permissions ID
-Modules=Modules
-LanguageBrowserParameter=Parameter %s
-LocalisationDolibarrParameters=Localisation parameters
-ClientTZ=Client Time Zone (user)
-ClientHour=Client time (user)
-OSTZ=Server OS Time Zone
-PHPTZ=PHP server Time Zone
-DaylingSavingTime=Daylight saving time
-CurrentHour=PHP Time (server)
-CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
-Box=Widget
-Boxes=Widgets
-MaxNbOfLinesForBoxes=Max number of lines for widgets
-PositionByDefault=Default order
-Position=Position
-MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
-MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br />Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
-MenuForUsers=Menu for users
-LangFile=.lang file
-System=System
-SystemInfo=System information
-SystemToolsArea=System tools area
-SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for.
-Purge=Purge
-PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
-PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
-PurgeDeleteTemporaryFilesShort=Delete temporary files
-PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory <b>%s</b>. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted.
-PurgeRunNow=Purge now
-PurgeNothingToDelete=No directory or files to delete.
-PurgeNDirectoriesDeleted=<b>%s</b> files or directories deleted.
-PurgeAuditEvents=Purge all security events
-ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
-GenerateBackup=Generate backup
-Backup=Backup
-Restore=Restore
-RunCommandSummary=Backup has been launched with the following command
-BackupResult=Backup result
-BackupFileSuccessfullyCreated=Backup file successfully generated
-YouCanDownloadBackupFile=Generated files can now be downloaded
-NoBackupFileAvailable=No backup files available.
-ExportMethod=Export method
-ImportMethod=Import method
-ToBuildBackupFileClickHere=To build a backup file, click <a href="%s">here</a>.
-ImportMySqlDesc=To import a backup file, you must use mysql command from command line:
-ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line:
-ImportMySqlCommand=%s %s < mybackupfile.sql
-ImportPostgreSqlCommand=%s %s mybackupfile.sql
-FileNameToGenerate=File name to generate
-Compression=Compression
-CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
-CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
-ExportCompatibility=Compatibility of generated export file
-MySqlExportParameters=MySQL export parameters
-PostgreSqlExportParameters= PostgreSQL export parameters
-UseTransactionnalMode=Use transactional mode
-FullPathToMysqldumpCommand=Full path to mysqldump command
-FullPathToPostgreSQLdumpCommand=Full path to pg_dump command
-ExportOptions=Export Options
-AddDropDatabase=Add DROP DATABASE command
-AddDropTable=Add DROP TABLE command
-ExportStructure=Structure
-NameColumn=Name columns
-ExtendedInsert=Extended INSERT
-NoLockBeforeInsert=No lock commands around INSERT
-DelayedInsert=Delayed insert
-EncodeBinariesInHexa=Encode binary data in hexadecimal
-IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
-AutoDetectLang=Autodetect (browser language)
-FeatureDisabledInDemo=Feature disabled in demo
-FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Permissions
-BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
-OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
-ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external modules...
-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 (Note: anyone experienced in PHP programming can provide custom development for an open source project)
-WebSiteDesc=Reference websites to find more modules...
-URL=Link
-BoxesAvailable=Widgets available
-BoxesActivated=Widgets activated
-ActivateOn=Activate on
-ActiveOn=Activated on
-SourceFile=Source file
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
-Required=Required
-UsedOnlyWithTypeOption=Used by some agenda option only
-Security=Security
-Passwords=Passwords
-DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
-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 (Activated 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 make building of a global cumulated pdf not working (like unpaid invoices).
-Feature=Feature
-DolibarrLicense=License
-Developpers=Developers/contributors
-OfficialWebSite=Dolibarr international official web site
-OfficialWebSiteLocal=Local web site (%s)
-OfficialWiki=Dolibarr documentation on Wiki
-OfficialDemo=Dolibarr online demo
-OfficialMarketPlace=Official market place for external modules/addons
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
-ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
-HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
-HelpCenterDesc2=Some part of this service are available in <b>english only</b>.
-CurrentMenuHandler=Current menu handler
-MeasuringUnit=Measuring unit
-LeftMargin=Left margin
-TopMargin=Top margin
-PaperSize=Paper type
-Orientation=Orientation
-SpaceX=Space X
-SpaceY=Space Y
-FontSize=Font size
-Content=Content
-NoticePeriod=Notice period
-NewByMonth=New by month
-Emails=E-mails
-EMailsSetup=E-mails setup
-EMailsDesc=This page allows you to overwrite your PHP parameters for e-mails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless.
-MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
-MAIN_MAIL_EMAIL_FROM=Sender e-mail for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Sender e-mail used for error returns emails sent
-MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
-MAIN_DISABLE_ALL_MAILS=Disable all e-mails sendings (for test purposes or demos)
-MAIN_MAIL_SENDMODE=Method to use to send EMails
-MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
-MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
-MAIN_MAIL_EMAIL_TLS= Use TLS (SSL) encrypt
-MAIN_MAIL_EMAIL_STARTTLS= Use TLS (STARTTLS) encrypt
-MAIN_DISABLE_ALL_SMS=Disable all SMS sendings (for test purposes or demos)
-MAIN_SMS_SENDMODE=Method to use to send SMS
-MAIN_MAIL_SMS_FROM=Default sender phone number for Sms sending
-MAIN_MAIL_DEFAULT_FROMTYPE=Sender e-mail by default for manual sendings (User email or Company email)
-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/
-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 setup
-ModuleFamilyBase=System
-ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
-ModuleFamilyProducts=Products Management (PM)
-ModuleFamilyHr=Human Resource Management (HR)
-ModuleFamilyProjects=Projects/Collaborative work
-ModuleFamilyOther=Other
-ModuleFamilyTechnic=Multi-modules tools
-ModuleFamilyExperimental=Experimental modules
-ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
-ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
-ModuleFamilyInterface=Interfaces with external systems
-MenuHandlers=Menu handlers
-MenuAdmin=Menu editor
-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).
-DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <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>.
-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='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
-YouCanSubmitFile=For this step, you can send package using this tool: Select module file
-CurrentVersion=Dolibarr current version
-CallUpdatePage=Go to the page that updates the database structure and data: %s.
-LastStableVersion=Latest stable version
-LastActivationDate=Latest activation date
-UpdateServerOffline=Update server offline
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
-GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
-GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
-ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
-ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
-DoTestServerAvailability=Test server connectivity
-DoTestSend=Test sending
-DoTestSendHTML=Test sending HTML
-ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
-ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
-UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
-UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
-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...).
-MinLength=Minimum length
-LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
-ExamplesWithCurrentSetup=Examples with current running setup
-ListOfDirectories=List of OpenDocument templates directories
-ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
-NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories
+AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
+AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 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.
-ThemeDir=Skins directory
-ConnectionTimeout=Connexion timeout
-ResponseTimeout=Response timeout
-SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__
-ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
-SecurityToken=Key to secure URLs
-NoSmsEngine=No SMS sender manager available. SMS sender manager are not installed with default distribution (because they depends on an external supplier) but you can find some on %s
-PDF=PDF
-PDFDesc=You can set each global options related to the PDF generation
-PDFAddressForging=Rules to forge address boxes
-HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF
-HideDescOnPDF=Hide products description on generated PDF
-HideRefOnPDF=Hide products ref. on generated PDF
-HideDetailsOnPDF=Hide product lines details on generated PDF
-PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
-Library=Library
-UrlGenerationParameters=Parameters to secure URLs
-SecurityTokenIsUnique=Use a unique securekey parameter for each URL
-EnterRefToBuildUrl=Enter reference for object %s
-GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons to 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
-MassConvert=Launch mass convert
-String=String
-TextLong=Long text
-Int=Integer
-Float=Float
-DateAndTime=Date and hour
-Unique=Unique
-Boolean=Boolean (Checkbox)
-ExtrafieldPhone = Phone
-ExtrafieldPrice = Price
-ExtrafieldMail = Email
-ExtrafieldUrl = Url
-ExtrafieldSelect = Select list
-ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
-ExtrafieldPassword=Password
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
-ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
-LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
-SMS=SMS
-LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
-RefreshPhoneLink=Refresh link
-LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
-KeepEmptyToUseDefault=Keep empty to use default value
-DefaultLink=Default link
-SetAsDefault=Set as default
-ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
-BarcodeInitForThirdparties=Mass barcode init for thirdparties
-BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Init value for next %s empty records
-EraseAllCurrentBarCode=Erase all current barcode values
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
-AllBarcodeReset=All barcode values have been removed
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into 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
-DisplayCompanyInfo=Display company address
-DisplayCompanyManagers=Display manager names
-DisplayCompanyInfoAndManagers=Display company address and manager names
-EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
-ModuleCompanyCodePanicum=Return an empty accountancy code.
-ModuleCompanyCodeDigitaria=Accountancy 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: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-ClickToShowDescription=Click to show description
-# Modules
-Module0Name=Users & groups
-Module0Desc=Users / Employees and Groups management
-Module1Name=Third parties
-Module1Desc=Companies and contact management (customers, prospects...)
-Module2Name=Commercial
-Module2Desc=Commercial management
-Module10Name=Accounting
-Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
-Module20Name=Proposals
-Module20Desc=Commercial proposal management
-Module22Name=Mass E-mailings
-Module22Desc=Mass E-mailing management
-Module23Name=Energy
-Module23Desc=Monitoring the consumption of energies
-Module25Name=Customer Orders
-Module25Desc=Customer order management
-Module30Name=Invoices
-Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
-Module40Name=Suppliers
-Module40Desc=Supplier management and buying (orders and invoices)
-Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
-Module49Name=Editors
-Module49Desc=Editor management
-Module50Name=Products
-Module50Desc=Product management
-Module51Name=Mass mailings
-Module51Desc=Mass paper mailing management
-Module52Name=Stocks
-Module52Desc=Stock management (products)
-Module53Name=Services
-Module53Desc=Service management
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
-Module55Name=Barcodes
-Module55Desc=Barcode management
-Module56Name=Telephony
-Module56Desc=Telephony integration
-Module57Name=Direct bank payment orders
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
-Module58Name=ClickToDial
-Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
-Module70Name=Interventions
-Module70Desc=Intervention management
-Module75Name=Expense and trip notes
-Module75Desc=Expense and trip notes management
-Module80Name=Shipments
-Module80Desc=Shipments and delivery order management
-Module85Name=Banks and cash
-Module85Desc=Management of bank or cash accounts
-Module100Name=External site
-Module100Desc=This module include an external web site or page into Dolibarr menus and view it into a Dolibarr frame
-Module105Name=Mailman and SPIP
-Module105Desc=Mailman or SPIP interface for member module
-Module200Name=LDAP
-Module200Desc=LDAP directory synchronisation
-Module210Name=PostNuke
-Module210Desc=PostNuke integration
-Module240Name=Data exports
-Module240Desc=Tool to export Dolibarr data (with assistants)
-Module250Name=Data imports
-Module250Desc=Tool to import data in Dolibarr  (with assistants)
-Module310Name=Members
-Module310Desc=Foundation members management
-Module320Name=RSS Feed
-Module320Desc=Add RSS feed inside Dolibarr screen pages
-Module330Name=Bookmarks
-Module330Desc=Bookmarks management
-Module400Name=Projects/Opportunities/Leads
-Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
-Module410Name=Webcalendar
-Module410Desc=Webcalendar integration
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
-Module520Name=Loan
-Module520Desc=Management of loans
-Module600Name=Notifications
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
-Module700Name=Donations
-Module700Desc=Donation management
-Module770Name=Expense reports
-Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
-Module1200Name=Mantis
-Module1200Desc=Mantis integration
-Module1400Name=Accounting
-Module1400Desc=Accounting management (double parties)
-Module1520Name=Document Generation
-Module1520Desc=Mass mail document generation
-Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
-Module2000Name=WYSIWYG editor
-Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
-Module2200Name=Dynamic Prices
-Module2200Desc=Enable the usage of math expressions for prices
-Module2300Name=Cron
-Module2300Desc=Scheduled job management
-Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
-Module2500Name=Electronic Content Management
-Module2500Desc=Save and share documents
-Module2600Name=API/Web services (SOAP server)
-Module2600Desc=Enable the Dolibarr SOAP server providing API services
-Module2610Name=API/Web services (REST server)
-Module2610Desc=Enable the Dolibarr REST server providing API services
-Module2660Name=Call WebServices (SOAP client)
-Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
-Module2700Name=Gravatar
-Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
-Module2800Desc=FTP Client
-Module2900Name=GeoIPMaxmind
-Module2900Desc=GeoIP Maxmind conversions capabilities
-Module3100Name=Skype
-Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
-Module4000Name=HRM
-Module4000Desc=Human resources management
-Module5000Name=Multi-company
-Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management
-Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
-Module20000Name=Leave Requests management
-Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Product lot
-Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
-Module50000Name=PayBox
-Module50000Desc=Module to offer an online payment page by credit card with PayBox
-Module50100Name=Point of sales
-Module50100Desc=Point of sales module (POS).
-Module50200Name=Paypal
-Module50200Desc=Module to offer an online payment page by credit card with Paypal
-Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double parties)
-Module54000Name=PrintIPP
-Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
-Module55000Name=Poll, Survey or Vote
-Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
-Module59000Name=Margins
-Module59000Desc=Module to manage margins
-Module60000Name=Commissions
-Module60000Desc=Module to manage commissions
-Module63000Name=Resources
-Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
-Permission11=Read customer invoices
-Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
-Permission14=Validate customer invoices
-Permission15=Send customer invoices by email
-Permission16=Create payments for customer invoices
-Permission19=Delete customer invoices
-Permission21=Read commercial proposals
-Permission22=Create/modify commercial proposals
-Permission24=Validate commercial proposals
-Permission25=Send commercial proposals
-Permission26=Close commercial proposals
-Permission27=Delete commercial proposals
-Permission28=Export commercial proposals
-Permission31=Read products
-Permission32=Create/modify products
-Permission34=Delete products
-Permission36=See/manage hidden products
-Permission38=Export products
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
-Permission44=Delete projects (shared project and projects i'm contact for)
-Permission45=Export projects
-Permission61=Read interventions
-Permission62=Create/modify interventions
-Permission64=Delete interventions
-Permission67=Export interventions
-Permission71=Read members
-Permission72=Create/modify members
-Permission74=Delete members
-Permission75=Setup types of membership
-Permission76=Export data
-Permission78=Read subscriptions
-Permission79=Create/modify subscriptions
-Permission81=Read customers orders
-Permission82=Create/modify customers orders
-Permission84=Validate customers orders
-Permission86=Send customers orders
-Permission87=Close customers orders
-Permission88=Cancel customers orders
-Permission89=Delete customers orders
-Permission91=Read social or fiscal taxes and vat
-Permission92=Create/modify social or fiscal taxes and vat
-Permission93=Delete social or fiscal taxes and vat
-Permission94=Export social or fiscal taxes
-Permission95=Read reports
-Permission101=Read sendings
-Permission102=Create/modify sendings
-Permission104=Validate sendings
-Permission106=Export sendings
-Permission109=Delete sendings
-Permission111=Read financial accounts
-Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
-Permission114=Reconciliate transactions
-Permission115=Export transactions and account statements
-Permission116=Transfers between accounts
-Permission117=Manage cheques dispatching
-Permission121=Read third parties linked to user
-Permission122=Create/modify third parties linked to user
-Permission125=Delete third parties linked to user
-Permission126=Export third parties
-Permission141=Read all projects and tasks (also private projects i am not contact for)
-Permission142=Create/modify all projects and tasks (also private projects i am not 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
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
-Permission167=Export contracts
-Permission171=Read trips and expenses (yours and your subordinates)
-Permission172=Create/modify trips and expenses
-Permission173=Delete trips and expenses
-Permission174=Read all trips and expenses
-Permission178=Export trips and expenses
-Permission180=Read suppliers
-Permission181=Read supplier orders
-Permission182=Create/modify supplier orders
-Permission183=Validate supplier orders
-Permission184=Approve supplier orders
-Permission185=Order or cancel supplier orders
-Permission186=Receive supplier orders
-Permission187=Close supplier orders
-Permission188=Cancel supplier orders
-Permission192=Create lines
-Permission193=Cancel lines
-Permission194=Read the bandwith lines
-Permission202=Create ADSL connections
-Permission203=Order connections orders
-Permission204=Order connections
-Permission205=Manage connections
-Permission206=Read connections
-Permission211=Read Telephony
-Permission212=Order lines
-Permission213=Activate line
-Permission214=Setup Telephony
-Permission215=Setup providers
-Permission221=Read emailings
-Permission222=Create/modify emailings (topic, recipients...)
-Permission223=Validate emailings (allows sending)
-Permission229=Delete emailings
-Permission237=View recipients and info
-Permission238=Manually send mailings
-Permission239=Delete mailings after validation or sent
-Permission241=Read categories
-Permission242=Create/modify categories
-Permission243=Delete categories
-Permission244=See the contents of the hidden categories
-Permission251=Read other users and groups
-PermissionAdvanced251=Read other users
-Permission252=Read permissions of other users
-Permission253=Create/modify other users, groups and permisssions
-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 assignement matters).
-Permission271=Read CA
-Permission272=Read invoices
-Permission273=Issue invoices
-Permission281=Read contacts
-Permission282=Create/modify contacts
-Permission283=Delete contacts
-Permission286=Export contacts
-Permission291=Read tariffs
-Permission292=Set permissions on the tariffs
-Permission293=Modify costumers tariffs
-Permission300=Read bar codes
-Permission301=Create/modify bar codes
-Permission302=Delete bar codes
-Permission311=Read services
-Permission312=Assign service/subscription to contract
-Permission331=Read bookmarks
-Permission332=Create/modify bookmarks
-Permission333=Delete bookmarks
-Permission341=Read its own permissions
-Permission342=Create/modify his own user information
-Permission343=Modify his own password
-Permission344=Modify its own permissions
-Permission351=Read groups
-Permission352=Read groups permissions
-Permission353=Create/modify groups
-Permission354=Delete or disable groups
-Permission358=Export users
-Permission401=Read discounts
-Permission402=Create/modify discounts
-Permission403=Validate discounts
-Permission404=Delete discounts
-Permission510=Read Salaries
-Permission512=Create/modify salaries
-Permission514=Delete salaries
-Permission517=Export salaries
-Permission520=Read Loans
-Permission522=Create/modify loans
-Permission524=Delete loans
-Permission525=Access loan calculator
-Permission527=Export loans
-Permission531=Read services
-Permission532=Create/modify services
-Permission534=Delete services
-Permission536=See/manage hidden services
-Permission538=Export services
-Permission701=Read donations
-Permission702=Create/modify donations
-Permission703=Delete donations
-Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
-Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
-Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission779=Export expense reports
-Permission1001=Read stocks
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
-Permission1004=Read stock movements
-Permission1005=Create/modify stock movements
-Permission1101=Read delivery orders
-Permission1102=Create/modify delivery orders
-Permission1104=Validate delivery orders
-Permission1109=Delete delivery orders
-Permission1181=Read suppliers
-Permission1182=Read supplier orders
-Permission1183=Create/modify supplier orders
-Permission1184=Validate supplier orders
-Permission1185=Approve supplier orders
-Permission1186=Order supplier orders
-Permission1187=Acknowledge receipt of supplier orders
-Permission1188=Delete supplier orders
-Permission1190=Approve (second approval) supplier orders
-Permission1201=Get result of an export
-Permission1202=Create/Modify an export
-Permission1231=Read supplier invoices
-Permission1232=Create/modify supplier invoices
-Permission1233=Validate supplier invoices
-Permission1234=Delete supplier invoices
-Permission1235=Send supplier invoices by email
-Permission1236=Export supplier invoices, attributes and payments
-Permission1237=Export supplier orders and their details
-Permission1251=Run mass imports of external data into database (data load)
-Permission1321=Export customer invoices, attributes and payments
-Permission1322=Reopen a paid bill
-Permission1421=Export customer orders and attributes
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
-Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
-Permission20006=Admin leave requests (setup and update balance)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
-Permission2401=Read actions (events or tasks) linked to his account
-Permission2402=Create/modify actions (events or tasks) linked to his account
-Permission2403=Delete actions (events or tasks) linked to his account
-Permission2411=Read actions (events or tasks) of others
-Permission2412=Create/modify actions (events or tasks) of others
-Permission2413=Delete actions (events or tasks) of others
-Permission2414=Export actions/tasks of others
-Permission2501=Read/Download documents
-Permission2502=Download documents
-Permission2503=Submit or delete documents
-Permission2515=Setup documents directories
-Permission2801=Use FTP client in read mode (browse and download only)
-Permission2802=Use FTP client in write mode (delete or upload files)
-Permission50101=Use Point of sales
-Permission50201=Read transactions
-Permission50202=Import transactions
-Permission54001=Print
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
-Permission59003=Read every user margin
-Permission63001=Read resources
-Permission63002=Create/modify resources
-Permission63003=Delete resources
-Permission63004=Link resources to agenda events
-DictionaryCompanyType=Types of thirdparties
-DictionaryCompanyJuridicalType=Legal forms of thirdparties
-DictionaryProspectLevel=Prospect potential level
-DictionaryCanton=State/Province
-DictionaryRegion=Regions
-DictionaryCountry=Countries
-DictionaryCurrency=Currencies
-DictionaryCivility=Personal and professional titles
-DictionaryActions=Types of agenda events
-DictionarySocialContributions=Social or fiscal taxes types
-DictionaryVAT=VAT Rates or Sales Tax Rates
-DictionaryRevenueStamp=Amount of revenue stamps
-DictionaryPaymentConditions=Payment terms
-DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact/Address types
-DictionaryEcotaxe=Ecotax (WEEE)
-DictionaryPaperFormat=Paper formats
-DictionaryFormatCards=Cards formats
-DictionaryFees=Types of fees
-DictionarySendingMethods=Shipping methods
-DictionaryStaff=Staff
-DictionaryAvailability=Delivery delay
-DictionaryOrderMethods=Ordering methods
-DictionarySource=Origin of proposals/orders
-DictionaryAccountancyCategory=Accounting account groups
-DictionaryAccountancysystem=Models for chart of accounts
-DictionaryEMailTemplates=Emails templates
-DictionaryUnits=Units
-DictionaryProspectStatus=Prospection status
-DictionaryHolidayTypes=Types of leaves
-DictionaryOpportunityStatus=Opportunity status for project/lead
-SetupSaved=Setup saved
-BackToModuleList=Back to modules list
-BackToDictionaryList=Back to dictionaries list
-VATManagement=VAT Management
-VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
-VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies.
-VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
-##### Local Taxes #####
-LTRate=Rate
-LocalTax1IsNotUsed=Do not use second tax
-LocalTax1IsUsedDesc=Use a second type of tax (other than VAT)
-LocalTax1IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax1Management=Second type of tax
-LocalTax1IsUsedExample=
-LocalTax1IsNotUsedExample=
-LocalTax2IsNotUsed=Do not use third tax
-LocalTax2IsUsedDesc=Use a third type of tax (other than VAT)
-LocalTax2IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax2Management=Third type of tax
-LocalTax2IsUsedExample=
-LocalTax2IsNotUsedExample=
-LocalTax1ManagementES= RE Management
-LocalTax1IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If te buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
-LocalTax1IsNotUsedDescES= By default the proposed RE is 0. End of rule.
-LocalTax1IsUsedExampleES= In Spain they are professionals subject to some specific sections of the Spanish IAE.
-LocalTax1IsNotUsedExampleES= In Spain they are professional and societies and subject to certain sections of the Spanish IAE.
-LocalTax2ManagementES= IRPF Management
-LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
-LocalTax2IsNotUsedDescES= By default the proposed IRPF is 0. End of rule.
-LocalTax2IsUsedExampleES= In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
-LocalTax2IsNotUsedExampleES= In Spain they are bussines not subject to tax system of modules.
-CalcLocaltax=Reports on local taxes
-CalcLocaltax1=Sales - Purchases
-CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2=Purchases
-CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3=Sales
-CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
-LabelUsedByDefault=Label used by default if no translation can be found for code
-LabelOnDocuments=Label on documents
-NbOfDays=Nb of days
-AtEndOfMonth=At end of month
-CurrentNext=Current/Next
-Offset=Offset
-AlwaysActive=Always active
-Upgrade=Upgrade
-MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Deploy/install external module
-WebServer=Web server
-DocumentRootServer=Web server's root directory
-DataRootServer=Data files directory
-IP=IP
-Port=Port
-VirtualServerName=Virtual server name
-OS=OS
-PhpWebLink=Web-Php link
-Browser=Browser
-Server=Server
-Database=Database
-DatabaseServer=Database host
-DatabaseName=Database name
-DatabasePort=Database port
-DatabaseUser=Database user
-DatabasePassword=Database password
-Tables=Tables
-TableName=Table name
-NbOfRecord=Nb of records
-Host=Server
-DriverType=Driver type
-SummarySystem=System information summary
-SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Foundation
-DefaultMenuManager= Standard menu manager
-DefaultMenuSmartphoneManager=Smartphone menu manager
-Skin=Skin theme
-DefaultSkin=Default skin theme
-MaxSizeList=Max length for list
-DefaultMaxSizeList=Default max length for lists
-DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
-MessageOfDay=Message of the day
-MessageLogin=Login page message
-PermanentLeftSearchForm=Permanent search form on left menu
-DefaultLanguage=Default language to use (language code)
-EnableMultilangInterface=Enable multilingual interface
-EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/foundation information
-CompanyIds=Company/foundation identities
-CompanyName=Name
-CompanyAddress=Address
-CompanyZip=Zip
-CompanyTown=Town
-CompanyCountry=Country
-CompanyCurrency=Main currency
-CompanyObject=Object of the company
-Logo=Logo
-DoNotSuggestPaymentMode=Do not suggest
-NoActiveBankAccountDefined=No active bank account defined
-OwnerOfBankAccount=Owner of bank account %s
-BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show link "<strong>%s</strong>"
-Alerts=Alerts
-DelaysOfToleranceBeforeWarning=Tolerance delays before warning
-DelaysOfToleranceDesc=This screen allows you to define the tolerated delays before an alert is reported on screen with picto %s for each late element.
-Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned events (agenda events) not completed yet
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Delay tolerance (in days) before alert on project not closed in time
-Delays_MAIN_DELAY_TASKS_TODO=Delay tolerance (in days) before alert on planned tasks (project tasks) not completed yet
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on orders not processed yet
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on suppliers orders not processed yet
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Delay tolerance (in days) before alert on proposals to close
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Delay tolerance (in days) before alert on proposals not billed
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerance delay (in days) before alert on services to activate
-Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerance delay (in days) before alert on expired services
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerance delay (in days) before alert on unpaid supplier invoices
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerence delay (in days) before alert on unpaid client invoices
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerance delay (in days) before alert on pending bank reconciliation
-Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed membership fee
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
-Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
-SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
-SetupDescription5=Other menu entries manage optional parameters.
-LogEvents=Security audit events
-Audit=Audit
-InfoDolibarr=About Dolibarr
-InfoBrowser=About Browser
-InfoOS=About OS
-InfoWebServer=About Web Server
-InfoDatabase=About Database
-InfoPHP=About PHP
-InfoPerf=About Performances
-BrowserName=Browser name
-BrowserOS=Browser OS
-ListOfSecurityEvents=List of Dolibarr security events
-SecurityEventsPurged=Security events purged
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
-SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
-SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
-DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
-AvailableModules=Available 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.
-TriggersAvailable=Available triggers
-TriggersDesc=Triggers are files that will modify the behaviour of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realised new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
-TriggerDisabledByName=Triggers in this file are disabled by the <b>-NORUN</b> suffix in their name.
-TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module <b>%s</b> is disabled.
-TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules.
-TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
-GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password
-DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">check here</a>.
-MiscellaneousDesc=All other security related parameters are defined here.
-LimitsSetup=Limits/Precision setup
-LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here
-MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices
-MAIN_MAX_DECIMALS_TOT=Max decimals for total prices
-MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add <b>...</b> after this number if you want to see <b>...</b> when number is truncated when shown on screen)
-MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
-UnitPriceOfProduct=Net unit price of a product
-TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
-ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
-NoEventFoundWithCriteria=No security event has been found for such search criterias.
-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.
-BackupDescX=Archived directory should be stored in a secure place.
-BackupDescY=The generated dump file should be stored in a secure place.
-BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one
-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 directoy (<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=Available database backup dump files
-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
-DownloadMoreSkins=More skins to download
-SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence without hole and with no reset
-ShowProfIdInAddress=Show professionnal id with addresses on documents
-ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents
-TranslationUncomplete=Partial translation
-MAIN_DISABLE_METEO=Disable meteo view
-TestLoginToAPI=Test login to API
-ProxyDesc=Some features of Dolibarr need to have an Internet access to work. Define here parameters for this. If the Dolibarr server is behind a Proxy server, those parameters tells Dolibarr how to access Internet through it.
-ExternalAccess=External access
-MAIN_PROXY_USE=Use a proxy server (otherwise direct access to internet)
-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 all attributes, not already available by default, and that you want to be supported for %s.
-ExtraFields=Complementary attributes
-ExtraFieldsLines=Complementary attributes (lines)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
-ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact/address)
-ExtraFieldsMember=Complementary attributes (member)
-ExtraFieldsMemberType=Complementary attributes (member type)
-ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
-ExtraFieldsSupplierOrders=Complementary attributes (orders)
-ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
-ExtraFieldsProject=Complementary attributes (projects)
-ExtraFieldsProjectTask=Complementary attributes (tasks)
-ExtraFieldHasWrongValue=Attribute %s has a wrong value.
-AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
-SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
-PathToDocuments=Path to documents
-PathDirectory=Directory
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might 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.
-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: <strong>User display setup</strong> tab of 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
-TranslationString=Translation string
-CurrentTranslationString=Current translation string
-WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
-NewTranslationStringToShow=New translation string to show
-OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
-YouMustEnableOneModule=You must at least enable 1 module
-ClassNotFoundIntoPathWarning=Class %s not found into PHP path
-YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
-SuhosinSessionEncrypt=Session storage encrypted by Suhosin
-ConditionIsCurrently=Condition is currently %s
-YouUseBestDriver=You use driver %s that is best driver available currently.
-YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required 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.
-BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance.
-BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
-AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp".
-AskForPreferredShippingMethod=Ask for preferred Sending Method for Third Parties.
-FieldEdition=Edition of field %s
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
-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.
-PasswordGenerationPerso=Return a password according to your personally defined configuration.
-SetupPerso=According to your configuration
-PasswordPatternDesc=Password pattern description
-##### Users setup #####
-RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passwords
-DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page
-UsersSetup=Users module setup
-UserMailRequired=EMail required to create a new user
-##### HRM setup #####
-HRMSetup=HRM module setup
-##### Company setup #####
-CompanySetup=Companies module setup
-CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier)
-AccountCodeManager=Module for accountancy code generation (customer or supplier)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
-NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
-NotificationsDescGlobal=* or by setting global target emails in module setup page.
-ModelModules=Documents templates
-DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
-WatermarkOnDraft=Watermark on draft document
-JSOnPaimentBill=Activate feature to autofill payment lines on payment form
-CompanyIdProfChecker=Rules on Professional Ids
-MustBeUnique=Must be unique?
-MustBeMandatory=Mandatory to create third parties?
-MustBeInvoiceMandatory=Mandatory to validate invoices?
-##### Webcal setup #####
-WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
-##### Invoices #####
-BillsSetup=Invoices module setup
-BillsNumberingModule=Invoices and credit notes numbering model
-BillsPDFModules=Invoice documents models
-CreditNote=Credit note
-CreditNotes=Credit notes
-ForceInvoiceDate=Force invoice date to validation date
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
-SuggestPaymentByRIBOnAccount=Suggest payment by withdraw on account
-SuggestPaymentByChequeToAddress=Suggest payment by cheque to
-FreeLegalTextOnInvoices=Free text on invoices
-WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
-PaymentsNumberingModule=Payments numbering model
-SuppliersPayment=Suppliers payments
-SupplierPaymentSetup=Suppliers payments setup
-##### Proposals #####
-PropalSetup=Commercial proposals module setup
-ProposalsNumberingModules=Commercial proposal numbering models
-ProposalsPDFModules=Commercial proposal documents models
-FreeLegalTextOnProposal=Free text on commercial proposals
-WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
-WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
-##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
-##### Orders #####
-OrdersSetup=Order management setup
-OrdersNumberingModules=Orders numbering models
-OrdersModelModule=Order documents models
-FreeLegalTextOnOrders=Free text on orders
-WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
-ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Interventions #####
-InterventionsSetup=Interventions module setup
-FreeLegalTextOnInterventions=Free text on intervention documents
-FicheinterNumberingModules=Intervention numbering models
-TemplatePDFInterventions=Intervention card documents models
-WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
-##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
-ContractsNumberingModules=Contracts numbering modules
-TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
-##### Members #####
-MembersSetup=Members module setup
-MemberMainOptions=Main options
-AdherentLoginRequired= Manage a Login for each member
-AdherentMailRequired=EMail required to create a new member
-MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
-##### LDAP setup #####
-LDAPSetup=LDAP Setup
-LDAPGlobalParameters=Global parameters
-LDAPUsersSynchro=Users
-LDAPGroupsSynchro=Groups
-LDAPContactsSynchro=Contacts
-LDAPMembersSynchro=Members
-LDAPSynchronization=LDAP synchronisation
-LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP
-LDAPToDolibarr=LDAP -> Dolibarr
-DolibarrToLDAP=Dolibarr -> LDAP
-LDAPNamingAttribute=Key in LDAP
-LDAPSynchronizeUsers=Organization of users in LDAP
-LDAPSynchronizeGroups=Organization of groups in LDAP
-LDAPSynchronizeContacts=Organization of contacts in LDAP
-LDAPSynchronizeMembers=Organization of foundation's members in LDAP
-LDAPPrimaryServer=Primary server
-LDAPSecondaryServer=Secondary server
-LDAPServerPort=Server port
-LDAPServerPortExample=Default port : 389
-LDAPServerProtocolVersion=Protocol version
-LDAPServerUseTLS=Use TLS
-LDAPServerUseTLSExample=Your LDAP server use TLS
-LDAPServerDn=Server DN
-LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
-LDAPPassword=Administrator password
-LDAPUserDn=Users' DN
-LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
-LDAPGroupDn=Groups' DN
-LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com)
-LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
-LDAPServerDnExample=Complete DN (ex: dc=example,dc=com)
-LDAPDnSynchroActive=Users and groups synchronization
-LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization
-LDAPDnContactActive=Contacts' synchronization
-LDAPDnContactActiveExample=Activated/Unactivated synchronization
-LDAPDnMemberActive=Members' synchronization
-LDAPDnMemberActiveExample=Activated/Unactivated synchronization
-LDAPContactDn=Dolibarr contacts' DN
-LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com)
-LDAPMemberDn=Dolibarr members DN
-LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com)
-LDAPMemberObjectClassList=List of objectClass
-LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPUserObjectClassList=List of objectClass
-LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPGroupObjectClassList=List of objectClass
-LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
-LDAPContactObjectClassList=List of objectClass
-LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPTestConnect=Test LDAP connection
-LDAPTestSynchroContact=Test contacts synchronization
-LDAPTestSynchroUser=Test user synchronization
-LDAPTestSynchroGroup=Test group synchronization
-LDAPTestSynchroMember=Test member synchronization
-LDAPTestSearch= Test a LDAP search
-LDAPSynchroOK=Synchronization test successful
-LDAPSynchroKO=Failed synchronization test
-LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that connexion to server is correctly configured and allows LDAP udpates
-LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s)
-LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s)
-LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPBindKO=Connect/Authentificate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPSetupForVersion3=LDAP server configured for version 3
-LDAPSetupForVersion2=LDAP server configured for version 2
-LDAPDolibarrMapping=Dolibarr Mapping
-LDAPLdapMapping=LDAP Mapping
-LDAPFieldLoginUnix=Login (unix)
-LDAPFieldLoginExample=Example : uid
-LDAPFilterConnection=Search filter
-LDAPFilterConnectionExample=Example : &(objectClass=inetOrgPerson)
-LDAPFieldLoginSamba=Login (samba, activedirectory)
-LDAPFieldLoginSambaExample=Example : samaccountname
-LDAPFieldFullname=Full name
-LDAPFieldFullnameExample=Example : cn
-LDAPFieldPasswordNotCrypted=Password not crypted
-LDAPFieldPasswordCrypted=Password crypted
-LDAPFieldPasswordExample=Example : userPassword
-LDAPFieldCommonNameExample=Example : cn
-LDAPFieldName=Name
-LDAPFieldNameExample=Example : sn
-LDAPFieldFirstName=First name
-LDAPFieldFirstNameExample=Example : givenName
-LDAPFieldMail=Email address
-LDAPFieldMailExample=Example : mail
-LDAPFieldPhone=Professional phone number
-LDAPFieldPhoneExample=Example : telephonenumber
-LDAPFieldHomePhone=Personal phone number
-LDAPFieldHomePhoneExample=Example : homephone
-LDAPFieldMobile=Cellular phone
-LDAPFieldMobileExample=Example : mobile
-LDAPFieldFax=Fax number
-LDAPFieldFaxExample=Example : facsimiletelephonenumber
-LDAPFieldAddress=Street
-LDAPFieldAddressExample=Example : street
-LDAPFieldZip=Zip
-LDAPFieldZipExample=Example : postalcode
-LDAPFieldTown=Town
-LDAPFieldTownExample=Example : l
-LDAPFieldCountry=Country
-LDAPFieldDescription=Description
-LDAPFieldDescriptionExample=Example : description
-LDAPFieldNotePublic=Public Note
-LDAPFieldNotePublicExample=Example : publicnote
-LDAPFieldGroupMembers= Group members
-LDAPFieldGroupMembersExample= Example : uniqueMember
-LDAPFieldBirthdate=Birthdate
-LDAPFieldCompany=Company
-LDAPFieldCompanyExample=Example : o
-LDAPFieldSid=SID
-LDAPFieldSidExample=Example : objectsid
-LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Job position
-LDAPFieldTitleExample=Example: title
-LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
-LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
-LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts.
-LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users.
-LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups.
-LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module.
-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 advices related to performance.
-NotInstalled=Not installed, so your server is not slow 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.
-MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
-MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
-OPCodeCache=OPCode cache
-NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad).
-HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
-FilesOfTypeCached=Files of type %s are cached by HTTP server
-FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
-FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
-FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
-CacheByServer=Cache by server
-CacheByClient=Cache by browser
-CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
-##### Products #####
-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)
-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 third party language
-UseSearchToSelectProductTooltip=Also if you have a large number of product (> 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)
-SetDefaultBarcodeTypeProducts=Default barcode type to use for products
-SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
-ProductCodeChecker= Module for product code generation and checking (product or service)
-ProductOtherConf= Product / Service configuration
-IsNotADir=is not a directory!
-##### Syslog #####
-SyslogSetup=Logs module setup
-SyslogOutput=Logs outputs
-SyslogFacility=Facility
-SyslogLevel=Level
-SyslogFilename=File name and path
-YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
-ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
-##### Donations #####
-DonationsSetup=Donation module setup
-DonationsReceiptModel=Template of donation receipt
-##### Barcode #####
-BarcodeSetup=Barcode setup
-PaperFormatModule=Print format module
-BarcodeEncodeModule=Barcode encoding type
-CodeBarGenerator=Barcode generator
-ChooseABarCode=No generator defined
-FormatNotSupportedByGenerator=Format not supported by this generator
-BarcodeDescEAN8=Barcode of type EAN8
-BarcodeDescEAN13=Barcode of type EAN13
-BarcodeDescUPC=Barcode of type UPC
-BarcodeDescISBN=Barcode of type ISBN
-BarcodeDescC39=Barcode of type C39
-BarcodeDescC128=Barcode of type C128
-BarcodeDescDATAMATRIX=Barcode of type Datamatrix
-BarcodeDescQRCODE=Barcode of type QR code
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
-BarcodeInternalEngine=Internal engine
-BarCodeNumberManager=Manager to auto define barcode numbers
-##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct debit payment orders
-##### ExternalRSS #####
-ExternalRSSSetup=External RSS imports setup
-NewRSS=New RSS Feed
-RSSUrl=RSS URL
-RSSUrlExample=An interesting RSS feed
-##### Mailing #####
-MailingSetup=EMailing module setup
-MailingEMailFrom=Sender EMail (From) for emails sent by emailing module
-MailingEMailError=Return EMail (Errors-to) for emails with errors
-MailingDelay=Seconds to wait after sending next message
-##### Notification #####
-NotificationSetup=EMail notification module setup
-NotificationEMailFrom=Sender EMail (From) for emails sent for notifications
-FixedEmailTarget=Fixed email target
-##### Sendings #####
-SendingsSetup=Sending module setup
-SendingsReceiptModel=Sending receipt model
-SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
-FreeLegalTextOnShippings=Free text on shipments
-##### Deliveries #####
-DeliveryOrderNumberingModules=Products deliveries receipt numbering module
-DeliveryOrderModel=Products deliveries receipt model
-DeliveriesOrderAbility=Support products deliveries receipts
-FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
-##### FCKeditor #####
-AdvancedEditor=Advanced editor
-ActivateFCKeditor=Activate advanced editor for:
-FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
-FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files.</font>
-FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
-FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
-##### OSCommerce 1 #####
-OSCommerceErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be an OSCommerce database (Key %s not found in table %s).
-OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' successfull.
-OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
-OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
-##### Stock #####
-StockSetup=Warehouse module setup
-IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
-##### Menu #####
-MenuDeleted=Menu deleted
-Menus=Menus
-TreeMenuPersonalized=Personalized menus
-NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
-NewMenu=New menu
-Menu=Selection of menu
-MenuHandler=Menu handler
-MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
-DetailId=Id menu
-DetailMenuHandler=Menu handler where to show new menu
-DetailMenuModule=Module name if menu entry come from a module
-DetailType=Type of menu (top or left)
-DetailTitre=Menu label or label code for translation
-DetailUrl=URL where menu send you (Absolute URL link or external link with http://)
-DetailEnabled=Condition to show or not entry
-DetailRight=Condition to display unauthorized grey menus
-DetailLangs=Lang file name for label code translation
-DetailUser=Intern / Extern / All
-Target=Target
-DetailTarget=Target for links (_blank top open a new window)
-DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu)
-ModifMenu=Menu change
-DeleteMenu=Delete menu entry
-ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
-FailedToInitializeMenu=Failed to initialize menu
-##### Tax #####
-TaxSetup=Taxes, social or fiscal taxes and dividends module setup
-OptionVatMode=VAT due
-OptionVATDefault=Cash basis
-OptionVATDebitOption=Accrual basis
-OptionVatDefaultDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on payments for services
-OptionVatDebitOptionDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on invoice (debit) for services
-SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
-OnDelivery=On delivery
-OnPayment=On payment
-OnInvoice=On invoice
-SupposedToBePaymentDate=Payment date used
-SupposedToBeInvoiceDate=Invoice date used
-Buy=Buy
-Sell=Sell
-InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
-AccountancyCode=Accountancy Code
-AccountancyCodeSell=Sale 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 -> Dictionary -> 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_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
-AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### 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 your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your 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.
-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 same computer than 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.
-##### Point Of Sales (CashDesk) #####
-CashDesk=Point of sales
-CashDeskSetup=Point of sales module setup
-CashDeskThirdPartyForSell=Default generic third party to use for sells
-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).
-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
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
-##### Bookmark #####
-BookmarkSetup=Bookmark module setup
-BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu.
-NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu
-##### WebServices #####
-WebServicesSetup=Webservices module setup
-WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
-WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
-EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
-##### API ####
-ApiSetup=API module setup
-ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
-OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
-ApiKey=Key for API
-WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
-##### Bank #####
-BankSetupModule=Bank module setup
-FreeLegalTextOnChequeReceipts=Free text on cheque receipts
-BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
-BankOrderGlobal=General
-BankOrderGlobalDesc=General display order
-BankOrderES=Spanish
-BankOrderESDesc=Spanish display order
-ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
-##### Multicompany #####
-MultiCompanySetup=Multi-company module setup
-##### Suppliers #####
-SuppliersSetup=Supplier module setup
-SuppliersCommandModel=Complete template of supplier order (logo...)
-SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
-SuppliersInvoiceNumberingModel=Supplier invoices numbering models
-IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
-##### GeoIPMaxmind #####
-GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
-NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
-YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
-YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
-TestGeoIPResult=Test of a conversion IP -> country
-##### Projects #####
-ProjectsNumberingModules=Projects numbering module
-ProjectsSetup=Project module setup
-ProjectsModelModule=Project reports document model
-TasksNumberingModules=Tasks numbering module
-TaskModelModule=Tasks reports document model
-UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
-##### ECM (GED) #####
-##### Fiscal Year #####
-AccountingPeriods=Accounting periods
-AccountingPeriodCard=Accounting period
-NewFiscalYear=New accounting period
-OpenFiscalYear=Open accounting period
-CloseFiscalYear=Close accounting period
-DeleteFiscalYear=Delete accounting period
-ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
-ShowFiscalYear=Show accounting period
-AlwaysEditable=Can always be edited
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
-Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
-IncludePath=Include path (defined into variable %s)
-ExpenseReportsSetup=Setup of module Expense Reports
-TemplatePDFExpenseReports=Document templates to generate expense report document
-NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
-YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of 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
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/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.
-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.
-ConfFileMuseContainCustom=Installing 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)
-TextTitleColor=Color of page title
-LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
-NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
-BackgroundColor=Background color
-TopMenuBackgroundColor=Background color for Top menu
-TopMenuDisableImages=Hide images in Top menu
-LeftMenuBackgroundColor=Background color for Left menu
-BackgroundTableTitleColor=Background color for Table title line
-BackgroundTableLineOddColor=Background color for odd table lines
-BackgroundTableLineEvenColor=Background color for even table lines
-MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
-NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
-UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
-PositionIntoComboList=Position of line into combo lists
-SellTaxRate=Sale tax rate
-RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
-UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipping, you can enter it here. You can use the key {TRACKID} into URL parameters so the system will replace it with value of tracking number user entered into shipment card.
-OpportunityPercent=When you create an opportunity, you will defined an estimated amount of project/lead. According to status of opportunity, this amount may be multiplicated 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
-FixTZ=TimeZone fix
-FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
-ExpectedChecksum=Expected Checksum
-CurrentChecksum=Current Checksum
-ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the latest stable version
-TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
-TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so 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 usefull only if your prices for each leve 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.
-SeeSubstitutionVars=See * note for list of possible substitution variables
-AllPublishers=All publishers
-UnknownPublishers=Unknown publishers
-AddRemoveTabs=Add or remove tabs
-AddDictionaries=Add dictionaries
-AddBoxes=Add widgets
-AddSheduledJobs=Add scheduled jobs
-AddHooks=Add hooks
-AddTriggers=Add triggers
-AddMenus=Add menus
-AddPermissions=Add permissions
-AddExportProfiles=Add export profiles
-AddImportProfiles=Add import profiles
-AddOtherPagesOrServices=Add other pages or services
-AddModels=Add document or numbering templates
-AddSubstitutions=Add keys substitutions
-DetectionNotPossible=Detection not possible
-UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved on 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 correclty. 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 inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <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
-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
-TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
-##### Resource ####
-ResourceSetup=Configuration du module Resource
-UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
diff --git a/htdocs/langs/fr_CH/cashdesk.lang b/htdocs/langs/fr_CH/cashdesk.lang
deleted file mode 100644
index c3ca13bf385..00000000000
--- a/htdocs/langs/fr_CH/cashdesk.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cashdesk
-BankToPay=Account for payment
diff --git a/htdocs/langs/fr_CH/main.lang b/htdocs/langs/fr_CH/main.lang
index 9ffa398137f..2e691473326 100644
--- a/htdocs/langs/fr_CH/main.lang
+++ b/htdocs/langs/fr_CH/main.lang
@@ -1,9 +1,5 @@
 # Dolibarr language file - Source file is en_US - main
 DIRECTION=ltr
-# Note for Chinese:
-# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
-# stsongstdlight or cid0cs are for simplified Chinese
-# To read Chinese pdf with Linux: sudo apt-get install poppler-data
 FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=.
@@ -23,799 +19,3 @@ FormatDateHourShort=%m/%d/%Y %I:%M %p
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
-DatabaseConnection=Database connection
-NoTemplateDefined=No template defined for this email type
-AvailableVariables=Available substitution variables
-NoTranslation=No translation
-NoRecordFound=No record found
-NoRecordDeleted=No record deleted
-NotEnoughDataYet=Not enough data
-NoError=No error
-Error=Error
-Errors=Errors
-ErrorFieldRequired=Field '%s' is required
-ErrorFieldFormat=Field '%s' has a bad value
-ErrorFileDoesNotExists=File %s does not exist
-ErrorFailedToOpenFile=Failed to open file %s
-ErrorCanNotCreateDir=Cannot create dir %s
-ErrorCanNotReadDir=Cannot read dir %s
-ErrorConstantNotDefined=Parameter %s not defined
-ErrorUnknown=Unknown error
-ErrorSQL=SQL Error
-ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this
-ErrorGoToModuleSetup=Go to Module setup to fix this
-ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
-ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
-ErrorInternalErrorDetected=Error detected
-ErrorWrongHostParameter=Wrong host parameter
-ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post again the form.
-ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child records.
-ErrorWrongValue=Wrong value
-ErrorWrongValueForParameterX=Wrong value for parameter %s
-ErrorNoRequestInError=No request in error
-ErrorServiceUnavailableTryLater=Service not available for 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>.
-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 nb of record per page
-NotAuthorized=You are not authorized to do that.
-SetDate=Set date
-SelectDate=Select a date
-SeeAlso=See also %s
-SeeHere=See here
-Apply=Apply
-BackgroundColorByDefault=Default background color
-FileRenamed=The file was successfully renamed
-FileUploaded=The file was successfully uploaded
-FileGenerated=The file was successfully generated
-FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
-NbOfEntries=Nb of entries
-GoToWikiHelpPage=Read online help (Internet access needed)
-GoToHelpPage=Read help
-RecordSaved=Record saved
-RecordDeleted=Record deleted
-LevelOfFeature=Level of features
-NotDefined=Not defined
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
-Administrator=Administrator
-Undefined=Undefined
-PasswordForgotten=Password forgotten?
-SeeAbove=See above
-HomeArea=Home area
-LastConnexion=Latest connection
-PreviousConnexion=Previous connection
-PreviousValue=Previous value
-ConnectedOnMultiCompany=Connected on environment
-ConnectedSince=Connected since
-AuthenticationMode=Authentication mode
-RequestedUrl=Requested URL
-DatabaseTypeManager=Database type manager
-RequestLastAccessInError=Latest database access request error
-ReturnCodeLastAccessInError=Return code for latest database access request error
-InformationLastAccessInError=Information for latest database access request error
-DolibarrHasDetectedError=Dolibarr has detected a technical error
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes
-MoreInformation=More information
-TechnicalInformation=Technical information
-TechnicalID=Technical ID
-NotePublic=Note (public)
-NotePrivate=Note (private)
-PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
-DoTest=Test
-ToFilter=Filter
-NoFilter=No filter
-WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance delay.
-yes=yes
-Yes=Yes
-no=no
-No=No
-All=All
-Home=Home
-Help=Help
-OnlineHelp=Online help
-PageWiki=Wiki page
-MediaBrowser=Media browser
-Always=Always
-Never=Never
-Under=under
-Period=Period
-PeriodEndDate=End date for period
-Activate=Activate
-Activated=Activated
-Closed=Closed
-Closed2=Closed
-NotClosed=Not closed
-Enabled=Enabled
-Deprecated=Deprecated
-Disable=Disable
-Disabled=Disabled
-Add=Add
-AddLink=Add link
-RemoveLink=Remove link
-AddToDraft=Add to draft
-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>?
-Delete=Delete
-Remove=Remove
-Resiliate=Terminate
-Cancel=Cancel
-Modify=Modify
-Edit=Edit
-Validate=Validate
-ValidateAndApprove=Validate and Approve
-ToValidate=To validate
-Save=Save
-SaveAs=Save As
-TestConnection=Test connection
-ToClone=Clone
-ConfirmClone=Choose data you want to clone :
-NoCloneOptionsSpecified=No data to clone defined.
-Of=of
-Go=Go
-Run=Run
-CopyOf=Copy of
-Show=Show
-Hide=Hide
-ShowCardHere=Show card
-Search=Search
-SearchOf=Search
-Valid=Valid
-Approve=Approve
-Disapprove=Disapprove
-ReOpen=Re-Open
-Upload=Send file
-ToLink=Link
-Select=Select
-Choose=Choose
-Resize=Resize
-Recenter=Recenter
-Author=Author
-User=User
-Users=Users
-Group=Group
-Groups=Groups
-NoUserGroupDefined=No user group defined
-Password=Password
-PasswordRetype=Retype your password
-NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
-Name=Name
-Person=Person
-Parameter=Parameter
-Parameters=Parameters
-Value=Value
-PersonalValue=Personal value
-NewValue=New value
-CurrentValue=Current value
-Code=Code
-Type=Type
-Language=Language
-MultiLanguage=Multi-language
-Note=Note
-Title=Title
-Label=Label
-RefOrLabel=Ref. or label
-Info=Log
-Family=Family
-Description=Description
-Designation=Description
-Model=Doc template
-DefaultModel=Default doc template
-Action=Event
-About=About
-Number=Number
-NumberByMonth=Number by month
-AmountByMonth=Amount by month
-Numero=Number
-Limit=Limit
-Limits=Limits
-Logout=Logout
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Connection
-Setup=Setup
-Alert=Alert
-Previous=Previous
-Next=Next
-Cards=Cards
-Card=Card
-Now=Now
-HourStart=Start hour
-Date=Date
-DateAndHour=Date and hour
-DateToday=Today's date
-DateReference=Reference date
-DateStart=Start date
-DateEnd=End date
-DateCreation=Creation date
-DateCreationShort=Creat. date
-DateModification=Modification date
-DateModificationShort=Modif. date
-DateLastModification=Latest modification date
-DateValidation=Validation date
-DateClosing=Closing date
-DateDue=Due date
-DateValue=Value date
-DateValueShort=Value date
-DateOperation=Operation date
-DateOperationShort=Oper. Date
-DateLimit=Limit date
-DateRequest=Request date
-DateProcess=Process date
-DateBuild=Report build date
-DatePayment=Date of payment
-DateApprove=Approving date
-DateApprove2=Approving date (second approval)
-UserCreation=Creation user
-UserModification=Modification user
-UserCreationShort=Creat. user
-UserModificationShort=Modif. user
-DurationYear=year
-DurationMonth=month
-DurationWeek=week
-DurationDay=day
-DurationYears=years
-DurationMonths=months
-DurationWeeks=weeks
-DurationDays=days
-Year=Year
-Month=Month
-Week=Week
-WeekShort=Week
-Day=Day
-Hour=Hour
-Minute=Minute
-Second=Second
-Years=Years
-Months=Months
-Days=Days
-days=days
-Hours=Hours
-Minutes=Minutes
-Seconds=Seconds
-Weeks=Weeks
-Today=Today
-Yesterday=Yesterday
-Tomorrow=Tomorrow
-Morning=Morning
-Afternoon=Afternoon
-Quadri=Quadri
-MonthOfDay=Month of the day
-HourShort=H
-MinuteShort=mn
-Rate=Rate
-CurrencyRate=Currency conversion rate
-UseLocalTax=Include tax
-Bytes=Bytes
-KiloBytes=Kilobytes
-MegaBytes=Megabytes
-GigaBytes=Gigabytes
-TeraBytes=Terabytes
-b=b.
-Kb=Kb
-Mb=Mb
-Gb=Gb
-Tb=Tb
-Cut=Cut
-Copy=Copy
-Paste=Paste
-Default=Default
-DefaultValue=Default value
-Price=Price
-UnitPrice=Unit price
-UnitPriceHT=Unit price (net)
-UnitPriceTTC=Unit price
-PriceU=U.P.
-PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (currency)
-PriceUTTC=U.P. (inc. tax)
-Amount=Amount
-AmountInvoice=Invoice amount
-AmountPayment=Payment amount
-AmountHTShort=Amount (net)
-AmountTTCShort=Amount (inc. tax)
-AmountHT=Amount (net of tax)
-AmountTTC=Amount (inc. tax)
-AmountVAT=Amount tax
-MulticurrencyAlreadyPaid=Already payed, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
-MulticurrencyAmountHT=Amount (net of tax), original currency
-MulticurrencyAmountTTC=Amount (inc. of tax), original currency
-MulticurrencyAmountVAT=Amount tax, original currency
-AmountLT1=Amount tax 2
-AmountLT2=Amount tax 3
-AmountLT1ES=Amount RE
-AmountLT2ES=Amount IRPF
-AmountTotal=Total amount
-AmountAverage=Average amount
-PriceQtyMinHT=Price quantity min. (net of tax)
-Percentage=Percentage
-Total=Total
-SubTotal=Subtotal
-TotalHTShort=Total (net)
-TotalHTShortCurrency=Total (net in currency)
-TotalTTCShort=Total (inc. tax)
-TotalHT=Total (net of tax)
-TotalHTforthispage=Total (net of tax) for this page
-Totalforthispage=Total for this page
-TotalTTC=Total (inc. tax)
-TotalTTCToYourCredit=Total (inc. tax) to your credit
-TotalVAT=Total tax
-TotalLT1=Total tax 2
-TotalLT2=Total tax 3
-TotalLT1ES=Total RE
-TotalLT2ES=Total IRPF
-HT=Net of tax
-TTC=Inc. tax
-VAT=Sales tax
-VATs=Sales taxes
-LT1ES=RE
-LT2ES=IRPF
-VATRate=Tax Rate
-Average=Average
-Sum=Sum
-Delta=Delta
-Module=Module
-Option=Option
-List=List
-FullList=Full list
-Statistics=Statistics
-OtherStatistics=Other statistics
-Status=Status
-Favorite=Favorite
-ShortInfo=Info.
-Ref=Ref.
-ExternalRef=Ref. extern
-RefSupplier=Ref. supplier
-RefPayment=Ref. payment
-CommercialProposalsShort=Commercial proposals
-Comment=Comment
-Comments=Comments
-ActionsToDo=Events to do
-ActionsToDoShort=To do
-ActionsDoneShort=Done
-ActionNotApplicable=Not applicable
-ActionRunningNotStarted=To start
-ActionRunningShort=In progress
-ActionDoneShort=Finished
-ActionUncomplete=Uncomplete
-CompanyFoundation=Company/Foundation
-ContactsForCompany=Contacts 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
-NActionsLate=%s late
-RequestAlreadyDone=Request already recorded
-Filter=Filter
-FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
-RemoveFilter=Remove filter
-ChartGenerated=Chart generated
-ChartNotGenerated=Chart not generated
-GeneratedOn=Build on %s
-Generate=Generate
-Duration=Duration
-TotalDuration=Total duration
-Summary=Summary
-DolibarrStateBoard=Statistics
-DolibarrWorkBoard=Work tasks board
-Available=Available
-NotYetAvailable=Not yet available
-NotAvailable=Not available
-Categories=Tags/categories
-Category=Tag/category
-By=By
-From=From
-to=to
-and=and
-or=or
-Other=Other
-Others=Others
-OtherInformations=Other informations
-Quantity=Quantity
-Qty=Qty
-ChangedBy=Changed by
-ApprovedBy=Approved by
-ApprovedBy2=Approved by (second approval)
-Approved=Approved
-Refused=Refused
-ReCalculate=Recalculate
-ResultKo=Failure
-Reporting=Reporting
-Reportings=Reporting
-Draft=Draft
-Drafts=Drafts
-Validated=Validated
-Opened=Opened
-New=New
-Discount=Discount
-Unknown=Unknown
-General=General
-Size=Size
-Received=Received
-Paid=Paid
-Topic=Subject
-ByCompanies=By third parties
-ByUsers=By users
-Links=Links
-Link=Link
-Rejects=Rejects
-Preview=Preview
-NextStep=Next step
-Datas=Data
-None=None
-NoneF=None
-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.
-Photo=Picture
-Photos=Pictures
-AddPhoto=Add picture
-DeletePicture=Picture delete
-ConfirmDeletePicture=Confirm picture deletion?
-Login=Login
-CurrentLogin=Current login
-EnterLoginDetail=Enter login details
-January=January
-February=February
-March=March
-April=April
-May=May
-June=June
-July=July
-August=August
-September=September
-October=October
-November=November
-December=December
-JanuaryMin=Jan
-FebruaryMin=Feb
-MarchMin=Mar
-AprilMin=Apr
-MayMin=May
-JuneMin=Jun
-JulyMin=Jul
-AugustMin=Aug
-SeptemberMin=Sep
-OctoberMin=Oct
-NovemberMin=Nov
-DecemberMin=Dec
-Month01=January
-Month02=February
-Month03=March
-Month04=April
-Month05=May
-Month06=June
-Month07=July
-Month08=August
-Month09=September
-Month10=October
-Month11=November
-Month12=December
-MonthShort01=Jan
-MonthShort02=Feb
-MonthShort03=Mar
-MonthShort04=Apr
-MonthShort05=May
-MonthShort06=Jun
-MonthShort07=Jul
-MonthShort08=Aug
-MonthShort09=Sep
-MonthShort10=Oct
-MonthShort11=Nov
-MonthShort12=Dec
-AttachedFiles=Attached files and documents
-FileTransferComplete=File was uploaded successfuly
-DateFormatYYYYMM=YYYY-MM
-DateFormatYYYYMMDD=YYYY-MM-DD
-DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
-ReportName=Report name
-ReportPeriod=Report period
-ReportDescription=Description
-Report=Report
-Keyword=Keyword
-Origin=Origin
-Legend=Legend
-Fill=Fill
-Reset=Reset
-File=File
-Files=Files
-NotAllowed=Not allowed
-ReadPermissionNotAllowed=Read permission not allowed
-AmountInCurrency=Amount in %s currency
-Example=Example
-Examples=Examples
-NoExample=No example
-FindBug=Report a bug
-NbOfThirdParties=Number of third parties
-NbOfLines=Number of lines
-NbOfObjects=Number of objects
-NbOfObjectReferers=Number of related items
-Referers=Related items
-TotalQuantity=Total quantity
-DateFromTo=From %s to %s
-DateFrom=From %s
-DateUntil=Until %s
-Check=Check
-Uncheck=Uncheck
-Internal=Internal
-External=External
-Internals=Internal
-Externals=External
-Warning=Warning
-Warnings=Warnings
-BuildDoc=Build Doc
-Entity=Environment
-Entities=Entities
-CustomerPreview=Customer preview
-SupplierPreview=Supplier preview
-ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show supplier preview
-RefCustomer=Ref. customer
-Currency=Currency
-InfoAdmin=Information for administrators
-Undo=Undo
-Redo=Redo
-ExpandAll=Expand all
-UndoExpandAll=Undo expand
-Reason=Reason
-FeatureNotYetSupported=Feature not yet supported
-CloseWindow=Close window
-Response=Response
-Priority=Priority
-SendByMail=Send by EMail
-MailSentBy=Email sent by
-TextUsedInTheMessageBody=Email body
-SendAcknowledgementByMail=Send confirmation email
-EMail=E-mail
-NoEMail=No email
-Email=Email
-NoMobilePhone=No mobile phone
-Owner=Owner
-FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
-Refresh=Refresh
-BackToList=Back to list
-GoBack=Go back
-CanBeModifiedIfOk=Can be modified if valid
-CanBeModifiedIfKo=Can be modified if not valid
-ValueIsValid=Value is valid
-ValueIsNotValid=Value is not valid
-RecordCreatedSuccessfully=Record created successfully
-RecordModifiedSuccessfully=Record modified successfully
-RecordsModified=%s record modified
-RecordsDeleted=%s record deleted
-AutomaticCode=Automatic code
-FeatureDisabled=Feature disabled
-MoveBox=Move widget
-Offered=Offered
-NotEnoughPermissions=You don't have permission for this action
-SessionName=Session name
-Method=Method
-Receive=Receive
-CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
-ExpectedValue=Expected Value
-CurrentValue=Current value
-PartialWoman=Partial
-TotalWoman=Total
-NeverReceived=Never received
-Canceled=Canceled
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
-Color=Color
-Documents=Linked files
-Documents2=Documents
-UploadDisabled=Upload disabled
-MenuECM=Documents
-MenuAWStats=AWStats
-MenuMembers=Members
-MenuAgendaGoogle=Google agenda
-ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=No documents saved in this directory
-CurrentUserLanguage=Current language
-CurrentTheme=Current theme
-CurrentMenuManager=Current menu manager
-Browser=Browser
-Layout=Layout
-Screen=Screen
-DisabledModules=Disabled modules
-For=For
-ForCustomer=For customer
-Signature=Signature
-DateOfSignature=Date of signature
-HidePassword=Show command with password hidden
-UnHidePassword=Show real command with clear password
-Root=Root
-Informations=Informations
-Page=Page
-Notes=Notes
-AddNewLine=Add new line
-AddFile=Add file
-FreeZone=Free entry
-FreeLineOfType=Free entry of type
-CloneMainAttributes=Clone object with its main attributes
-PDFMerge=PDF Merge
-Merge=Merge
-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 application at the moment.
-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
-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.
-AccordingToGeoIPDatabase=(according to GeoIP convertion)
-Line=Line
-NotSupported=Not supported
-RequiredField=Required field
-Result=Result
-ToTest=Test
-ValidateBefore=Card must be validated before using this feature
-Visibility=Visibility
-Private=Private
-Hidden=Hidden
-Resources=Resources
-Source=Source
-Prefix=Prefix
-Before=Before
-After=After
-IPAddress=IP address
-Frequency=Frequency
-IM=Instant messaging
-NewAttribute=New attribute
-AttributeCode=Attribute code
-URLPhoto=URL of photo/logo
-SetLinkToAnotherThirdParty=Link to another third party
-LinkTo=Link to
-LinkToProposal=Link to proposal
-LinkToOrder=Link to order
-LinkToInvoice=Link to invoice
-LinkToSupplierOrder=Link to supplier order
-LinkToSupplierProposal=Link to supplier proposal
-LinkToSupplierInvoice=Link to supplier invoice
-LinkToContract=Link to contract
-LinkToIntervention=Link to intervention
-CreateDraft=Create draft
-SetToDraft=Back to draft
-ClickToEdit=Click to edit
-ObjectDeleted=Object %s deleted
-ByCountry=By country
-ByTown=By town
-ByDate=By date
-ByMonthYear=By month/year
-ByYear=By year
-ByMonth=By month
-ByDay=By day
-BySalesRepresentative=By sales representative
-LinkedToSpecificUsers=Linked to a particular user contact
-NoResults=No results
-AdminTools=Admin tools
-SystemTools=System tools
-ModulesSystemTools=Modules tools
-Test=Test
-Element=Element
-NoPhotoYet=No pictures available yet
-Dashboard=Dashboard
-MyDashboard=My dashboard
-Deductible=Deductible
-from=from
-toward=toward
-Access=Access
-SelectAction=Select action
-HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
-SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
-OriginFileName=Original filename
-SetDemandReason=Set source
-SetBankAccount=Define Bank Account
-AccountCurrency=Account Currency
-ViewPrivateNote=View notes
-XMoreLines=%s line(s) hidden
-PublicUrl=Public URL
-AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
-PrintFile=Print File %s
-ShowTransaction=Show entry on bank account
-GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
-Deny=Deny
-Denied=Denied
-ListOfTemplates=List of templates
-Gender=Gender
-Genderman=Man
-Genderwoman=Woman
-ViewList=List view
-Mandatory=Mandatory
-Hello=Hello
-Sincerely=Sincerely
-DeleteLine=Delete line
-ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
-NoRecordSelected=No record selected
-MassFilesArea=Area for files built by mass actions
-ShowTempMassFilesArea=Show area of files built by mass actions
-RelatedObjects=Related Objects
-ClassifyBilled=Classify billed
-Progress=Progress
-ClickHere=Click here
-FrontOffice=Front office
-BackOffice=Back office
-View=View
-Export=Export
-Exports=Exports
-ExportFilteredList=Export filtered list
-ExportList=Export list
-Miscellaneous=Miscellaneous
-Calendar=Calendar
-GroupBy=Group by...
-ViewFlatList=View flat list
-RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Direct download link
-Download=Download
-ActualizeCurrency=Update currency rate
-Fiscalyear=Fiscal year
-# Week day
-Monday=Monday
-Tuesday=Tuesday
-Wednesday=Wednesday
-Thursday=Thursday
-Friday=Friday
-Saturday=Saturday
-Sunday=Sunday
-MondayMin=Mo
-TuesdayMin=Tu
-WednesdayMin=We
-ThursdayMin=Th
-FridayMin=Fr
-SaturdayMin=Sa
-SundayMin=Su
-Day1=Monday
-Day2=Tuesday
-Day3=Wednesday
-Day4=Thursday
-Day5=Friday
-Day6=Saturday
-Day0=Sunday
-ShortMonday=M
-ShortTuesday=T
-ShortWednesday=W
-ShortThursday=T
-ShortFriday=F
-ShortSaturday=S
-ShortSunday=S
-SelectMailModel=Select email template
-SetRef=Set ref
-Select2ResultFoundUseArrows=Some results found. Use arrows to select.
-Select2NotFound=No result found
-Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
-Select2LoadingMoreResults=Loading more results...
-Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
-SearchIntoContacts=Contacts
-SearchIntoMembers=Members
-SearchIntoUsers=Users
-SearchIntoProductsOrServices=Products or services
-SearchIntoProjects=Projects
-SearchIntoTasks=Tasks
-SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
-SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
-SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
-SearchIntoInterventions=Interventions
-SearchIntoContracts=Contracts
-SearchIntoCustomerShipments=Customer shipments
-SearchIntoExpenseReports=Expense reports
-SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index 949f602b617..42dba8d01f3 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -26,27 +26,31 @@ InvoiceLabel=Description de la facture
 OverviewOfAmountOfLinesNotBound=Vue d'ensemble du nombre de lignes non reliées à un compte comptable
 OverviewOfAmountOfLinesBound=Vue d'ensemble du nombre de lignes liées à un compte comptable
 OtherInfo=Autre information
+DeleteCptCategory=Supprimer le code comptable du groupe
+ConfirmDeleteCptCategory=Êtes-vous sur de vouloir supprimer ce compte comptable du groupe comptable ?
 
 AccountancyArea=Espace comptabilité
 AccountancyAreaDescIntro=L'utilisation du module de comptabilité se fait en plusieurs étapes:
 AccountancyAreaDescActionOnce=Les actions suivantes sont habituellement exécutées une seule fois, ou une fois par an ...
-AccountancyAreaDescActionOnceBis=Les prochaines étapes doivent être faites pour vous faire gagner du temps à l'avenir en vous proposant le bon compte comptable par défaut lors de la journalisation (écrire des enregistrements dans les journaux et Grand Livre)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=Les actions suivantes sont habituellement exécutées chaque mois, semaine, ou jour pour les très grandes entreprises ...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=Etape %s: Créer un modèle de plan de compte depuis le menu %s
 AccountancyAreaDescChart=Etape %s: Créer ou vérifier le contenu de votre plan de compte depuis le menu %s
-AccountancyAreaDescBank=Etape %s: Vérifier que la liaison entre les comptes bancaires et le compte comptable est faite. Compléter les liaisons manquantes. Pour cela, rendez-vous sur la fiche de chaque compte financier. Vous pouvez commencer à partir de la page %s.
-AccountancyAreaDescVat=Etape %s: Vérifiez que la liaison entre le paiement de la TVA et le compte comptable est faite. Compléter les liaisons manquantes. Vous pouvez définir les comptes comptables à utiliser pour chaque taux de TVA sur la page %s.
-AccountancyAreaDescExpenseReport=Etape %s: Vérifiez que la liaison entre le type de notes de frais et le compte comptable est faite. Compléter les liaisons manquantes. Vous pouvez définir les comptes comptables à utiliser pour chaque type de ligne de note de frais sur la page %s.
-AccountancyAreaDescSal=Etape %s: Vérifier que la liaison entre les paiements de salaires et le compte comptable est faite. Compléter les liaisons manquantes. Pour cela, vous pouvez utiliser l'entrée de menu %s.
-AccountancyAreaDescContrib=Etape %s: Vérifier que la liaison entre les dépenses spéciales (cotisations sociales ou fiscales) et le compte comptable est faite. Compléter les liaisons manquantes. Pour cela, vous pouvez utiliser l'entrée de menu %s.
-AccountancyAreaDescDonation=Etape %s: Vérifier que la liaison entre les paiements de dons et le compte comptable est faite. Compléter les liaisons manquantes. Vous pouvez définir le compte dédié pour cela à partir de l'entrée de menu %s.
-AccountancyAreaDescMisc=Etape %s: Vérifier que la liaison par défaut entre les lignes de transactions diverses et le compte comptable est faite. Compléter les liaisons manquantes. Pour cela, vous pouvez utiliser l'entrée de menu %s.
-AccountancyAreaDescProd=Etape %s: Vérifier que la liaison entre les produits/services et le compte comptable est faite. Compléter les liaisons manquantes. Pour cela, vous pouvez utiliser l'entrée de menu %s.
-AccountancyAreaDescLoan=Etape %s: Vérifier que la liaison entre les paiements de prêts et les comptes comptables est faite. Compléter les liaisons manquantes. Pour cela, vous pouvez utiliser l'entrée de menu %s.
 
-AccountancyAreaDescCustomer=Etape %s: Vérifier que la liaison entre les lignes de factures client existantes et le compte comptable est faite. Compléter les liaisons manquantes. Pour cela, vous pouvez utiliser l'entrée de menu %s.
-AccountancyAreaDescSupplier=Etape %s: Vérifier que la liaison entre les lignes de factures fournisseurs existantes et le compte comptable est faite. Compléter les liaisons manquantes. Pour cela, vous pouvez utiliser l'entrée de menu %s.
-AccountancyAreaDescWriteRecords=Etape %s: Ecrire les transactions dans le Grand Livre. Pour cela, aller sur chaque Journal, et cliquer sur le bouton "Enregistrer les opérations dans le Grand Livre".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=Etape %s: Définissez les comptes comptables de chaque compte bancaire ou financier. Vous pouvez commencer à partir de la page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=Etape %s: Ajouter ou modifier les opérations existantes et générer des rapports et des exportations.
 
 AccountancyAreaDescClosePeriod=Etape %s: Fermer la période pour ne plus pouvoir faire de modification à l'avenir.
@@ -57,6 +61,10 @@ ChangeAndLoad=Changer et charger
 Addanaccount=Ajouter un compte comptable
 AccountAccounting=Compte comptable
 AccountAccountingShort=Compte
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Afficher le compte comptable
+ShowAccountingJournal=Afficher le journal
 AccountAccountingSuggest=Code comptable suggéré
 MenuDefaultAccounts=Comptes par défaut
 MenuVatAccounts=Compte TVA
@@ -71,8 +79,8 @@ SuppliersVentilation=Liaison factures fournisseur
 ExpenseReportsVentilation=Liaison notes de frais
 CreateMvts=Créer nouvelle transaction
 UpdateMvts=Modification d'une transaction
-WriteBookKeeping=Ventiler les opérations dans le Grand Livre
-Bookkeeping=Grand livre
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Balance des comptes
 
 CAHTF=Total achat fournisseur HT
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Commencez le tri de la page "Liens réalis
 
 ACCOUNTING_LENGTH_DESCRIPTION=Tronquer la description des produits & services dans les listes à n caractères (Idéalement = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Tronquer la description du compte des produits & services dans les listes à n caractères (Idéalement = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Longueur des comptes généraux
-ACCOUNTING_LENGTH_AACCOUNT=Longueur des comptes tiers
-ACCOUNTING_MANAGE_ZERO=Ajouter des 0  à la fin des codes comptables. Fonctionnalité nécessaire pour certains pays. Désactivée par défaut. Si vous positionnez cette option à Oui, il vous faut aussi définir les 2 paramètres suivants (sinon celui-ci sera ignoré)
+ACCOUNTING_LENGTH_GACCOUNT=Longueur des comptes de la comptabilité générale (Si vous définissez la valeur à 6 ici, le compte « 706 » apparaîtra comme « 706000 » à l'écran)
+ACCOUNTING_LENGTH_AACCOUNT=Longueur des comptes comptables de Tiers (Si vous définissez la valeur à 6 ici, le compte « 401 » apparaîtra comme « 401000 » à l'écran)
+ACCOUNTING_MANAGE_ZERO=Permettre de gérer un nombre différent de zéro à la fin d'un compte comptable. Nécessaire par certains pays (comme la Suisse). Si conservé à Non (par défaut), vous pouvez définir les 2 paramètres suivants pour demander à l'application d'ajouter des zéros virtuels.
 BANK_DISABLE_DIRECT_INPUT=Désactiver la saisie directe de transactions en banque
 
 ACCOUNTING_SELL_JOURNAL=Journal des ventes
@@ -132,19 +140,19 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Numéro de pièce
 TransactionNumShort=Num. transaction
-AccountingCategory=Catégorie comptable
+AccountingCategory=Groupes de comptes comptables
 GroupByAccountAccounting=Grouper par compte comptable
 NotMatch=Non défini
-DeleteMvt=Supprimer les lignes du grand livre
+DeleteMvt=Delete Ledger lines
 DelYear=Année à supprimer
 DelJournal=Journal à supprimer
-ConfirmDeleteMvt=Cela supprimera toutes les lignes du Grand Livre pour l'année et/ou un journal spécifique. Au moins un critère est requis.
-ConfirmDeleteMvtPartial=Ceci va supprimer la(les) ligne(s) sélectionnée(s) du Grand Livre
-DelBookKeeping=Supprimer l'enregistrement du grand livre
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Journal de trésorerie
 ExpenseReportsJournal=Journal des notes de frais
 DescFinanceJournal=Journal de trésorerie comprenant tous les types de paiements par compte bancaire / caisse
-DescJournalOnlyBindedVisible=Ceci est une vue des enregistrements qui sont liés à un compte comptable produits et qui peuvent être enregistrés dans le Grand Livre.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Compte de la TVA non défini
 ThirdpartyAccountNotDefined=Compte pour le tiers non défini
 ProductAccountNotDefined=Compte pour le produit non défini
@@ -156,13 +164,13 @@ NewAccountingMvt=Nouvelle transaction
 NumMvts=Numéro de transaction
 ListeMvts=Liste des mouvements
 ErrorDebitCredit=Débit et crédit ne peuvent pas avoir la même valeur en même temps.
-
+AddCompteFromBK=Ajouter un code comptable au groupe
 ReportThirdParty=Liste des comptes tiers
 DescThirdPartyReport=Consultez ici la liste des tiers clients et fournisseurs et leurs codes comptables
 ListAccounts=Liste des comptes comptables
 
 Pcgtype=Classe de compte
-Pcgsubtype=Sous classe de compte
+Pcgsubtype=Sous-classe de compte
 
 TotalVente=Total chiffre affaires hors taxe
 TotalMarge=Total marge
@@ -186,9 +194,9 @@ AutomaticBindingDone=Liaison automatique faite
 ErrorAccountancyCodeIsAlreadyUse=Erreur, vous ne pouvez pas détruire de compte comptable car il est utilisé
 MvtNotCorrectlyBalanced=Le mouvement n'est pas équilibré. Crédit = %s. Débit = %s
 FicheVentilation=Fiche lien
-GeneralLedgerIsWritten=Les opérations ont été inscrites dans le grand livre
-GeneralLedgerSomeRecordWasNotRecorded=Certaines des opérations n'ont pu être enregistrées.
-NoNewRecordSaved=Aucun nouvel enregistrement sauvegardé
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=Pas de nouvelle ligne liée
 ListOfProductsWithoutAccountingAccount=Liste des produits non liés à un compte comptable
 ChangeBinding=Changer les liens
 
@@ -196,6 +204,18 @@ ChangeBinding=Changer les liens
 ApplyMassCategories=Application en masse des catégories
 AddAccountFromBookKeepingWithNoCategories=Ajouter les comptes sans groupes
 CategoryDeleted=Le groupe de comptes comptables a été supprimé
+AccountingJournals=Journaux comptables
+AccountingJournal=Journal comptable
+NewAccountingJournal=Nouveau journal comptable
+ShowAccoutingJournal=Afficher le journal
+Code=Code
+Nature=Nature
+AccountingJournalType1=Opérations Diverses
+AccountingJournalType2=Ventes
+AccountingJournalType3=Achats
+AccountingJournalType4=Banque
+AccountingJournalType9=A-nouveaux
+ErrorAccountingJournalIsAlreadyUse=Le journal est déjà utilisé
 
 ## Export
 Exports=Exports
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export vers Sage Ciel Compta ou Compta Evolution
 Modelcsv_quadratus=Export vers Quadratus QuadraCompta
 Modelcsv_ebp=Export vers EBP
 Modelcsv_cogilog=Export vers Cogilog
+Modelcsv_agiris=Export vers Agiris (Test)
 ChartofaccountsId=Id plan comptable
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculé
 Formula=Formule
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=Pas de catégories comptable disponibles pour le pays %s (Voir Accueil - Configuration - Dictionnaires)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=Pas de catégories de regroupement comptable disponibles pour le pays %s (Voir Accueil - Configuration - Dictionnaires)
 ExportNotSupported=Le format de l'export n'est pas supporté par cette page
 BookeppingLineAlreayExists=Lignes dejà existantes dans le grand livre
-
+NoJournalDefined=Pas de journal défini
 Binded=Lignes liées
 ToBind=Lignes à lier
 
-WarningReportNotReliable=Attention, ce rapport ne se fonde pas sur le Grand Livre, donc n'est pas précis pour l'instant. Il sera remplacé par un rapport plus fiable dans une prochaine version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 5fc1993c898..f639964e86c 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=Utilisateurs internes
 ExternalUsers=Utilisateurs externes
 GUISetup=Affichage
 SetupArea=Espace de configuration
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Formulaire de test d'envoi de fichier (selon options choisies)
 IfModuleEnabled=Rem: oui est effectif uniquement si le module <b>%s</b> est activé
 RemoveLock=Effacer le fichier <b>%s</b> s'il existe afin d'autoriser l'outil de mise à jour.
@@ -103,7 +104,7 @@ MenuIdParent=Identifiant du menu parent
 DetailMenuIdParent=Identifiant du menu parent (vide pour un menu du haut)
 DetailPosition=Numéro d'ordre déterminant la position du menu
 AllMenus=Tous
-NotConfigured=Module non configuré
+NotConfigured=Module/Application non configuré
 Active=Actif
 SetupShort=Configuration
 OtherOptions=Autres options
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Séparateur de milliers
 Destination=Destination
 IdModule=ID Module
 IdPermissions=ID Permissions
-Modules=Modules
 LanguageBrowserParameter=Variable %s
 LocalisationDolibarrParameters=Paramètres de localisation
 ClientTZ=Fuseau horaire client (utilisateur)
@@ -123,7 +123,8 @@ PHPTZ=Fuseau horaire serveur PHP
 DaylingSavingTime=Heure d'été
 CurrentHour=Heure PHP (serveur)
 CurrentSessionTimeOut=Délai expiration session actuelle
-YouCanEditPHPTZ=Pour définir un autre fuseau horaire PHP (non obligatoire), vous pouvez essayer d'ajouter un fichier .htaccess avec une ligne du type "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=Pour définir un fuseau horaire PHP différent (non requis), vous pouvez essayer d'ajouter un fichier .htaccess avec une ligne comme celle-ci "SetEnv TZ Europe / Paris"
+HoursOnThisPageAreOnServerTZ=Attention, contrairement à d'autres écrans, les heures sur cette page ne sont pas dans votre fuseau horaire local, mais dépendent du le fuseau horaire du serveur.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Nombre maximum de lignes dans les widgets
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Fonction disponible uniquement sur les versions off
 Rights=Permissions
 BoxesDesc=Les widgets sont des composants montrant des informations que vous pouvez ajouter à vos pages pour les personnaliser. Vous pouvez choisir de les afficher ou non en sélectionnant la page cible et en cliquant sur "Activer" ou "Désactiver".
 OnlyActiveElementsAreShown=Seuls les éléments en rapport avec un <a href="%s">module actif</a> sont présentés.
-ModulesDesc=Les modules déterminent les fonctionnalités qui seront actives sur l'environnement. Certains modules nécessitent le paramétrage de permissions utilisateurs à définir suite à l'installation du module. Cliquez sur les boutons on/off pour activer/désactiver les modules.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=D'autres modules/extensions sont disponibles en téléchargement sur des sites externes sur Internet...
 ModulesDeployDesc=Si les permissions de votre système de fichier le permettent , vous pouvez utiliser cet outil pour déployer un module externe. Le module sera alors visible dans l'onglet <strong>%s</strong>.
 ModulesMarketPlaces=Recherche de modules externes...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Chiffrer le mot de passe de la base dans le fich
 InstrucToEncodePass=Pour avoir le mot de passe de la base encodé dans le fichier de configuration <b>conf.php</b>, remplacer dans ce fichier la ligne<br><b>$dolibarr_main_db_pass="...";</b><br>par<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=Pour avoir le mot de passe de la base décodé (en clair) dans le fichier de configuration <b>conf.php</b>, remplacer dans ce fichier la ligne<br><b>$dolibarr_main_db_pass="crypted:...";</b><br>par<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Protection des PDF générés (Activation NON recommandée, rend inopérante la génération de PDF de masse)
-ProtectAndEncryptPdfFilesDesc=La protection d'un document PDF laisse le document libre à la lecture et à l'impression avec tout logiciel de lecture PDF. Par contre, la modification et la copie deviennent impossible. Notez que, de plus, l'utilisation de cette option empêche la génération de PDF cumulés (comme pour le PDF global des impayés).
+ProtectAndEncryptPdfFilesDesc=La protection d'un document PDF laisse le document libre à la lecture et à l'impression avec tout logiciel de lecture PDF. Par contre, la modification et la copie deviennent impossible. Notez que, de plus, l'utilisation de cette option empêche la génération de PDFs cumulés.
 Feature=Fonction
 DolibarrLicense=Licence
 Developpers=Développeurs/contributeurs
@@ -225,6 +226,8 @@ OfficialMarketPlace=Place de marché officielle des modules et extensions compl
 OfficialWebHostingService=Services d'hébergements référencés (Cloud)
 ReferencedPreferredPartners=Preferred Partners
 OtherResources=Autres ressources
+ExternalResources=Ressources externes
+SocialNetworks=Réseaux sociaux
 ForDocumentationSeeWiki=Pour la documentation utilisateur, développeur ou les FAQs,<br>consultez le wiki Dolibarr:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=Pour tout autre question/aide, vous pouvez utiliser le forum Dolibarr:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Cette application, indépendante de Dolibarr,  permet de vous aider à obtenir un service d'assistance sur Dolibarr.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=Fonctionnalité non disponible sous systèmes Unix. T
 SubmitTranslation=Si la traduction de cette langue est incomplète ou si vous trouvez des erreurs, vous pouvez corriger cela en éditant les fichiers dans le répertoire <b>langs/%s</b> et soumettre votre changement sur www.transifex.com/dolibarr-association/dolibarr/
 SubmitTranslationENUS=Si la traduction pour cette langue est incomplète ou si vous trouvez des erreurs, vous pouvez les corriger en éditant les fichiers dans le répertoire <b>langs/%s</b> et soumettre les modifications sur le forum dolibarr.org/forum ou pour les développeurs sur github.com/Dolibarr/dolibarr.
 ModuleSetup=Configuration du module
-ModulesSetup=Configuration des modules
+ModulesSetup=Configuration Modules/Application
 ModuleFamilyBase=Système
 ModuleFamilyCrm=Gestion de la relation client (GRC)
 ModuleFamilySrm=Gestion de la relation fournisseur (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=Version actuelle de Dolibarr
 CallUpdatePage=Aller à la page de mise à jour de la structure et des données de la base : %s.
 LastStableVersion=Dernière version stable disponible
 LastActivationDate=Date de dernière activation
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Serveur de mise à jour hors ligne
+WithCounter=Gérer un compteur
 GenericMaskCodes=Vous pouvez saisir tout masque de numérotation. Dans ce masque, les balises suivantes peuvent être utilisées:<br><b>{000000}</b> correspond à un numéro qui sera incrémenté à chaque %s. Mettre autant de zéro que la longueur désirée du compteur. Le compteur sera complété par des 0 à gauche afin d'avoir autant de zéro que dans le masque.<br><b>{000000+000}</b> idem que précédemment mais un décalage correspondant au nombre à droite du + est appliqué dès la première %s.<br><b>{000000@x}</b> idem que précédemment mais le compteur est remis à zéro le xème mois de l'année (x entre 1 et 12, ou 0 pour utiliser le mois de début d'exercice fiscal défini dans votre configuration, ou 99 pour remise à zéro chaque mois). Si cette option est utilisée et x vaut 2 ou plus, alors la séquence {yy}{mm} ou {yyyy}{mm} est obligatoire. <br><b>{dd}</b> jour (01 à 31).<br><b>{mm}</b> mois (01 à 12).<br><b>{yy}</b>, <b>{yyyy}</b> ou <b>{y}</b> année sur 2, 4 ou 1 chiffres.<br>
-GenericMaskCodes2=<b>{cccc}</b> le code client sur n lettres<br><b>{cccc000}</b> le code client sur n lettres est suivi d'un compteur propre au client. Ce compteur propre au client est aussi remis à zéro en même temps que le compteur global.<br><b>{tttt}</b> Le code du type de tiers sur n caractères (voir dictionnaires-types de tiers).<br>
+GenericMaskCodes2=<b>{cccc}</b> : code client sur n caractères</br><b>{cccc000}</b> : code client sur n caractères suivi d'un compteur propre au client. Ce compteur propre au client est remis à zéro en même temps que le compteur général.</br><b>{tttt}</b> code du type de tiers sur n caractères (Voir menu Accueil > Configuration > Dictionnaires > Types de tiers). Si vous ajoutez cet élément au masque de numérotation, le compteur sera différent pour chaque type de tiers.<br>
 GenericMaskCodes3=Tout autre caractère dans le masque sera laissé inchangé.<br>Les espaces ne sont pas permis.<br>
 GenericMaskCodes4a=<u>Exemple sur la 99eme %s du tiers LaCompanie faite le 31/03/2007 :</u><br>
 GenericMaskCodes4b=<u>Exemple sur un tiers créé le 31/03/2007 :</u><br>
 GenericMaskCodes4c=<u>Exemple sur un produit/service créé le 31/03/2007 :</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> donnera <b>ABC0703-000099</b><br><b>{0000+100@1}-XXX-{dd}-YYY</b> donnera <b>0199-XXX-31-YYY</b>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> donnera <b>ABC0703-000099</b><br><b>{0000+100@1}-XXX-{dd}-YYY</b> donnera <b>0199-XXX-31-YYY</b><br><b>IN{yy}{mm}-{0000}-{t}</b> donnera <b>IN0701-0099-A</b> si la société a le type 'Responsable Inscripto' avec le code type qui est 'A_RI'
 GenericNumRefModelDesc=Renvoie un numéro personnalisable selon un masque à définir.
 ServerAvailableOnIPOrPort=Serveur disponible à l'adresse <b>%s</b> sur le port <b>%s</b>
 ServerNotAvailableOnIPOrPort=Serveur non disponible à l'adresse <b>%s</b> sur le port <b>%s</b>
@@ -369,19 +375,21 @@ Int=Numérique entier
 Float=Décimal
 DateAndTime=Date et heure
 Unique=Unique
-Boolean=Booléen (Case à cocher)
+Boolean=Boolean (case à cocher unique)
 ExtrafieldPhone = Téléphone
 ExtrafieldPrice = Prix
 ExtrafieldMail = Email
 ExtrafieldUrl = Url
 ExtrafieldSelect = Liste de sélection
 ExtrafieldSelectList = Liste issue d'une table
-ExtrafieldSeparator=Séparateur de champ
+ExtrafieldSeparator=Séparateur (il ne s'agit pas d'un champ de saisie)
 ExtrafieldPassword=Mot de passe
-ExtrafieldCheckBox=Case à cocher
-ExtrafieldRadio=Bouton radio
-ExtrafieldCheckBoxFromList= Liste à cocher issue d'une table
+ExtrafieldRadio=Radio bouton (choix unique)
+ExtrafieldCheckBox=Cases à cocher
+ExtrafieldCheckBoxFromList=Cases à cocher issues d'une table
 ExtrafieldLink=Lier à un objet
+ComputedFormula=Champ calculé
+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'
 ExtrafieldParamHelpselect=La liste doit être de la forme clef,valeur<br><br> par exemple : <br>1,valeur1<br>2,valeur2<br>3,valeur3<br>...<br><br>\nPour afficher une liste dépendant d'une autre liste attribut complémentaire: <br>1, valeur1|options_<i>code_liste_parente</i>:clé_parente<br> 2,valeur2|option_<i>Code_liste_parente</i>:clé_parente<br><br>\nPour que la liste soit dépendante d'une autre liste:<br>1,valeur1|<i>code_liste_parent</i>:clef_parent<br>2,valeur2|<i>code_liste_parent</i>:clef_parent
 ExtrafieldParamHelpcheckbox=La liste doit être de la forme clef,valeur<br><br> par exemple : <br>1,valeur1<br>2,valeur2<br>3,valeur3<br>...
 ExtrafieldParamHelpradio=La liste doit être de la forme clef,valeur<br><br> par exemple : <br>1,valeur1<br>2,valeur2<br>3,valeur3<br>...
@@ -422,6 +430,20 @@ Use3StepsApproval=Par défaut, les commandes fournisseurs nécessitent d'être c
 UseDoubleApproval=Activer l'approbation en trois étapes si le montant HT est supérieur à...
 WarningPHPMail=Attention : Certains serveurs de messagerie (Yahoo) ne permettent pas l'envoi d'e-mails depuis un autre serveur que le leur si l'adresse d'envoi utilisée est une adresse Yahoo (myemail@yahoo.fr, myemail@yahoo.com...) Votre configuration actuelle utilise le serveur de l'application pour l'envoi d'e-mails. Le serveur de certains destinataires (compatibles avec le protocole restrictif DMARC) demanderont aux serveurs Yahoo l'autorisation de recevoir les e-mails et Yahoo la refusera car le serveur n'est pas un serveur appartenant à Yahoo, aussi une partie de vos e-mails envoyés risquent de ne pas être reçus.\n<br>Si votre fournisseur d'e-mail (comme Yahoo) impose cette restriction, vous devrez modifier votre configuration et opter pour l'autre méthode d'envoi "SMTP server" en saisissant les identifiants SMTP fournis par votre FAI (à demander à votre fourniseur de messagerie)
 ClickToShowDescription=Cliquer pour afficher la description
+DependsOn=Ce module a besoin du(des) module(s)
+RequiredBy=Ce module est requis par le ou les module(s)
+TheKeyIsTheNameOfHtmlField=C'est le nom du champ HTML. Cela nécessite d'avoir des connaissances techniques pour lire le contenu de la page HTML et récupérer le nom d'un champ.
+PageUrlForDefaultValues=Vous devez entrer ici l'URL relative de la page. Si vous indiquez des paramètres dans l'URL, les valeurs par défaut seront effectives si tous les paramètres sont définis sur la même valeur. Exemples:
+PageUrlForDefaultValuesCreate=<br>Pour créer un nouveau tiers, c'est <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Pour la liste des tiers, c'est <strong>%s</strong>
+EnableDefaultValues=Autoriser l'enregistrement par défaut de valeurs personnalisées
+EnableOverwriteTranslation=Activer la réécriture de traduction
+GoIntoTranslationMenuToChangeThis=Une traduction a été trouvée pour le code de cette valeur. Pour changer cette valeur, vous devez modifier le fichier depuis Accueil > Configuration > Traduction.
+WarningSettingSortOrder=Attention, le réglage d'un tri par défaut peut entraîner une erreur technique lorsque le champ est inconnu dans le listing. Si vous rencontrez une telle erreur, revenez à cette page pour supprimer l'ordre de tri par défaut et restaurer le comportement par défaut.
+Field=Champ
+ProductDocumentTemplates=Modèle de document pour la fiche produit
+FreeLegalTextOnExpenseReports=Mention complémentaire sur les notes de frais
+WatermarkOnDraftExpenseReports=Filigrane sur les notes de frais
 # Modules
 Module0Name=Utilisateurs & groupes
 Module0Desc=Gestion des utilisateurs / employés et groupes
@@ -444,7 +466,7 @@ Module30Desc=Gestion des factures et avoirs clients. Gestion des factures fourni
 Module40Name=Fournisseurs
 Module40Desc=Gestion des fournisseurs et des achats (commandes et factures)
 Module42Name=Journaux et traces
-Module42Desc=Génération de journaux (fichiers, syslog, …)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Éditeurs
 Module49Desc=Gestion des éditeurs
 Module50Name=Produits
@@ -499,8 +521,8 @@ Module410Name=Webcalendar
 Module410Desc=Interface avec le calendrier Webcalendar
 Module500Name=Dépenses spéciales
 Module500Desc=Dépenses spéciales (taxes, charges fiscales ou sociales, dividendes)
-Module510Name=Contrats et salaires des salariés
-Module510Desc=Gestion des paiements des salaires des employés
+Module510Name=Règlement des salaires
+Module510Desc=Enregistrer et suivre le paiement des salaires des employés
 Module520Name=Emprunt
 Module520Desc=Gestion des emprunts
 Module600Name=Notifications
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=Capacités de conversion GeoIP Maxmind
 Module3100Name=Skype
 Module3100Desc=Ajouter un bouton Skype dans les fiches utilisateurs / tiers / contacts / adhérents
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=GRH
-Module4000Desc=Gestion des ressources humaines
+Module4000Desc=Gestion des ressources humaines (gestion du département, contrats des employés et appréciations)
 Module5000Name=Multi-société
 Module5000Desc=Permet de gérer plusieurs sociétés
 Module6000Name=Workflow
@@ -591,7 +615,7 @@ Permission32=Créer/modifier les produits
 Permission34=Supprimer les produits
 Permission36=Voir/gérer les produits cachés
 Permission38=Exporter les produits
-Permission41=Consulter les projets et les tâches (projets publiques et projets dont je suis contact). Peut également entrer le temps consommé sur les tâches assignées (feuille de temps)
+Permission41=Lire les projets et tâches (partagés ou dont vous êtes un contact). Permet la saisie de temps passé par vous et votre supérieur hiérarchique sur les tâches auxquelles vous êtes assigné.
 Permission42=Créer/modifier les projets (projets partagés et projets pour lesquels je suis contact). Permet aussi de créer des tâches et d'assigner des utilisateurs aux projets et tâches.
 Permission44=Supprimer les projets et tâches (partagés ou dont je suis contact)
 Permission45=Exporter les projets
@@ -695,7 +719,7 @@ PermissionAdvanced253=Créer/modifier les utilisateurs internes/externes et leur
 Permission254=Créer/modifier les utilisateurs externes seulement
 Permission255=Modifier le mot de passe des autres utilisateurs
 Permission256=Supprimer ou désactiver les autres utilisateurs
-Permission262=Etendre l'accès à tous les utilisateurs (pas seulement ceux dont l'utilisateur est enregistré en tant que commercial). <br>Non effectif pour les utilisateurs externes (toujours limités à eux-mêmes sur les propositions commerciales, commandes, factures, contrats, etc).<br>Non effectif sur les projets (seules s'appliquent les permissions propres au module projets, et les règles de visibilité et d'assignation des tâches)
+Permission262=Etendre l'accès à tous les tiers (pas seulement ceux dont l'utilisateur est enregistré en tant que commercial). <br>Non effectif pour les utilisateurs externes (toujours limités à eux-mêmes sur les propositions commerciales, commandes, factures, contrats, etc).<br>Non effectif sur les projets (seules s'appliquent les permissions propres au module projets, et les règles de visibilité et d'assignation des tâches)
 Permission271=Consulter le chiffre d'affaires
 Permission272=Consulter les factures
 Permission273=Émettre les factures
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Méthodes de commandes
 DictionarySource=Origines des propales/commandes
 DictionaryAccountancyCategory=Groupes de comptes comptables
 DictionaryAccountancysystem=Modèles de plan comptable
+DictionaryAccountancyJournal=Journaux comptables
 DictionaryEMailTemplates=Modèles des courriels
 DictionaryUnits=Unités
 DictionaryProspectStatus=Statuts de prospection
 DictionaryHolidayTypes=Type de congés
 DictionaryOpportunityStatus=Statut d'opportunités pour les affaires/projets
 SetupSaved=Configuration sauvegardée
+SetupNotSaved=Configuration non enregistrée
 BackToModuleList=Retour liste des modules
 BackToDictionaryList=Retour liste des dictionnaires
 VATManagement=Gestion TVA
@@ -897,7 +923,7 @@ Offset=Décalage
 AlwaysActive=Toujours actif
 Upgrade=Mise à jour
 MenuUpgrade=Mise à jour / extension
-AddExtensionThemeModuleOrOther=Déployer/Installer le module externe
+AddExtensionThemeModuleOrOther=Déployer/Installer un module externe
 WebServer=Serveur Web
 DocumentRootServer=Répertoire racine des pages web
 DataRootServer=Répertoire racine des fichiers de données
@@ -921,7 +947,7 @@ Host=Serveur
 DriverType=Type du pilote
 SummarySystem=Résumé des informations systèmes
 SummaryConst=Liste de tous les paramètres de configuration Dolibarr
-MenuCompanySetup=Société/Institution
+MenuCompanySetup=Société/Organisation
 DefaultMenuManager= Gestionnaire du menu standard
 DefaultMenuSmartphoneManager=Gestionnaire du menu smartphone
 Skin=Thème visuel
@@ -931,11 +957,13 @@ DefaultMaxSizeList=Longueur maximale par défaut des listes
 DefaultMaxSizeShortList=Longueur maximale par défaut des listes courtes (e.g. dans la carte du client)
 MessageOfDay=Message du jour
 MessageLogin=Message page de connexion
+LoginPage=Page de connexion
+BackgroundImageLogin=Image de fond
 PermanentLeftSearchForm=Zone de recherche permanente du menu de gauche
 DefaultLanguage=Langue à utiliser par défaut (code langue)
 EnableMultilangInterface=Activer l'interface multi-langue
 EnableShowLogo=Afficher le logo dans le menu gauche
-CompanyInfo=Informations sur la société/institution
+CompanyInfo=Informations sur la société/organisation
 CompanyIds=Identifiants règlementaires
 CompanyName=Nom/Enseigne/Raison sociale
 CompanyAddress=Adresse
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolérance de retard avant alerte (en jours) sur cotis
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolérance de retard avant alerte (en jours) sur chèques à déposer
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolérance de retard avant alerte (en jours) sur les notes de frais à approuver
 SetupDescription1=L'espace configuration permet de réaliser le paramétrage afin de pouvoir commencer à utiliser l'application
-SetupDescription2=Les deux étapes les plus importantes de la configuration sont les deux entrées du menu gauche : Configuration de la Société/institution et Configuration des Modules
-SetupDescription3=Les données du menu <a href="%s">Configuration -> Société/institution</a> sont requises car les informations saisies sont utilisées dans la plupart des écrans, en affichage, ou pour modifier le comportement de Dolibarr (comme par exemple des fonctions qui dépendent de votre pays).
-SetupDescription4=Les données du menu <a href="%s">Configuration -> Modules</a> sont indispensables car Dolibarr ERP/CRM est constitué d'un ensemble de modules tous plus ou moins indépendants. C'est après avoir activé les modules qui vous intéressent que vous verrez apparaître les fonctionnalités dans les menus.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Les autres entrées de configuration gèrent des paramètres facultatifs.
 LogEvents=Événements d'audit de sécurité
 Audit=Audit
@@ -987,7 +1015,7 @@ BrowserOS=OS du navigateur
 ListOfSecurityEvents=Liste des événements de sécurité Dolibarr
 SecurityEventsPurged=Evenement de sécurité purgés
 LogEventDesc=Vous pouvez activer ici, la journalisation des événements d'audit de sécurité. Cet historique est consultable par les administrateurs dans le menu <b>Outils systèmes - Audit</b>. Attention, cette fonctionnalité peut générer un gros volume de données.
-AreaForAdminOnly=Ces fonctions ne sont accessibles qu'aux administrateurs.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Les informations systèmes sont des informations techniques diverses accessibles en lecture seule aux administrateurs uniquement.
 SystemAreaForAdminOnly=Cet espace n'est accessible qu'aux utilisateurs de type administrateur. Aucune permission Dolibarr ne permet d'étendre le cercle des utilisateurs autorisés à cet espace.
 CompanyFundationDesc=Éditez sur cette page toutes les informations connues de la société ou de l'association que vous souhaitez gérer (Pour cela, cliquez sur les boutons "Modifier" ou "Sauvegarder" en bas de page)
@@ -1079,7 +1107,8 @@ CurrentTranslationString=Chaîne de traduction actuelle
 WarningAtLeastKeyOrTranslationRequired=Un critère de recherche est nécessaire au moins pour la clé ou la valeur de traduction
 NewTranslationStringToShow=Nouvelle traduction à afficher
 OriginalValueWas=La traduction d'origine est écrasée. La valeur initiale était: <br><br> %s
-TotalNumberOfActivatedModules=Nombre total de modules/fonctionnalités activés: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=Vous avez forcé une nouvelle traduction pour la clé de traduction '<strong>%s</strong>' qui n'existe dans aucun fichier de langue
+TotalNumberOfActivatedModules=Modules activés : <b>%s</b>/<b>%s</b>
 YouMustEnableOneModule=Vous devez activer au moins une fonctionnalité
 ClassNotFoundIntoPathWarning=La classe %s n'a pas été trouvée dans le chemin PHP
 YesInSummer=Oui en été
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Règles sur les Identifiants professionnels
 MustBeUnique=Doit être unique ?
 MustBeMandatory=Obligatoire pour créer des tiers ?
 MustBeInvoiceMandatory=Obligatoire pour valider des factures ?
+TechnicalServicesProvided=Services techniques fournis
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Un lien d'exportation du calendrier au format <b>%s</b> sera disponible à l'url :<br>%s
 ##### Invoices #####
 BillsSetup=Configuration du module Factures
 BillsNumberingModule=Modèle de numérotation des factures et avoirs
 BillsPDFModules=Modèle de document de factures
+PaymentsPDFModules=Modèle de document pour les règlements
 CreditNote=Avoir
 CreditNotes=Avoirs
 ForceInvoiceDate=Forcer la date de facturation à la date de validation
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Fichiers de type %s non mis en cache par le serveur HTTP
 FilesOfTypeCompressed=Fichiers de type %s compressé par le serveur HTTP
 FilesOfTypeNotCompressed=Fichiers de type %s non compressé par le serveur HTTP
 CacheByServer=Cache par le serveur
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache par le navigateur
 CompressionOfResources=Compression des réponses HTTP
+CompressionOfResourcesDesc=Par exemple, en utilisant la directive Apache "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Une détection automatique n'est pas possible avec le navigateur courant
+DefaultValuesDesc=Vous pouvez définir/forcer ici la valeur par défaut que vous voulez obtenir lorsque vous créez un nouvel enregistrement, et/ou les filtres par défaut ou ordre de tri des listes.
+DefaultCreateForm=Valeurs par défaut pour les nouveaux objets
+DefaultSearchFilters=Filtres par défaut
+DefaultSortOrder=Tri des commandes par défaut 
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Configuration du module Produits
 ServiceSetup=Configuration du module Services
@@ -1339,7 +1377,7 @@ ViewProductDescInFormAbility=Visualisation des descriptions produits dans les fo
 MergePropalProductCard=Ajoute dans l'onglet Fichiers joints des produits/services, une option pour fusionner le document PDF du produit au PDF des propositions Azur si le produit/services est inclut dans la proposition.
 ViewProductDescInThirdpartyLanguageAbility=Visualisation des descriptions de produits dans la langue du tiers
 UseSearchToSelectProductTooltip=Si vous avez un nombre important de produits (>100 000), vous pourrez améliorer les performances en positionnant la constante PRODUCT_DONOTSEARCH_ANYWHERE à 1 dans Configuration->Divers. La recherche sera alors limité au début des chaines.
-UseSearchToSelectProduct=Attendre que vous ayez appuyez sur une touche avant de charger le contenu de la liste déroulante des produits (Cela peut augmenter les performances si vous avez un grand nombre de contacts)
+UseSearchToSelectProduct=Attendre que vous ayez appuyé sur une touche avant de charger le contenu de la liste déroulante des produits (Cela peut augmenter les performances si vous avez un grand nombre de contacts)
 SetDefaultBarcodeTypeProducts=Type de code-barre utilisé par défaut pour les produits
 SetDefaultBarcodeTypeThirdParties=Type de code-barre utilisé par défaut pour les tiers
 UseUnits=Définir une unité de mesure pour la quantité lors de l'édition de lignes de commande, proposition ou facture
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Date de facture utilisée
 Buy=Achat
 Sell=Vente
 InvoiceDateUsed=Date de facture utilisée
-YourCompanyDoesNotUseVAT=Votre institution est configurée comme non assujettie à la TVA (Accueil - Configuration - Société/Institution), aussi il n'y a aucune option sur la gestion TVA à paramétrer.
+YourCompanyDoesNotUseVAT=Votre société/institution est définie comme non assujettie à la TVA (voir Accueil > Configuration > Société/Institution), aussi il n'y a pas d'option paramétrage de la TVA.
 AccountancyCode=Code comptable
 AccountancyCodeSell=Code comptable vente
 AccountancyCodeBuy=Code comptable achat
@@ -1482,7 +1520,7 @@ AGENDA_NOTIFICATION_SOUND=Activer les notifications sonores.
 AGENDA_SHOW_LINKED_OBJECT=Afficher l'objet lié dans la vue agenda
 ##### Clicktodial #####
 ClickToDialSetup=Configuration du module Click To Dial
-ClickToDialUrlDesc=URL appelée lors d'un clic sur le pictogramme téléphone. Dans l'URL, vous pouvez utiliser les balises<br><b>__PHONETO__</b> qui sera remplacée par le téléphone de l'appelé<br><b>__PHONEFROM__</b> qui sera remplacée par le téléphone de l'appelant (le votre, défini sur votre fiche utilisateur)<br><b>__LOGIN__</b> qui sera remplacée par votre identifiant clicktodial (défini sur votre fiche utilisateur)<br><b>__PASS__</b> qui sera remplacée par votre mot de passe clicktodial (défini sur votre fiche utilisateur).
+ClickToDialUrlDesc=URL appelée au clic sur l'icône téléphone. Dans l'URL, vous pouvez utiliser les tags <br><b>__PHONETO__</b> qui sera remplacée par le numéro de téléphone de la personne à appeler, <br><b>__PHONEFROM__</b> qui sera remplacée par le numéro de l'appelant (vous), <br>__LOGIN__<b> qui sera remplacée par l'identifiant d'accès de l'utilisateur à l'application d'appel (à définir sur la fiche utilisateur) et <br><b>__PASS__</b> qui sera remplacée par le mot de passe d'accès de l'utilisateur à l'application d'appel (également à définir sur la fiche utilisateur)
 ClickToDialDesc=Ce module permet de rendre un numéro de téléphone cliquable. Un clique sur cet icone fera votre téléphone appeler le numéro cliqué. Ce module peut être utilisé pour appeler un système de centre d'appel à partir de Dolibarr. 
 ClickToDialUseTelLink=Utiliser un lien «Tel.» sur les numéros de téléphone
 ClickToDialUseTelLinkDesc=Utilisez cette méthode si vos utilisateurs ont un softphone ou une interface de logiciel installé sur un même ordinateur que le navigateur, et a appelé lorsque vous cliquez sur un lien dans votre navigateur qui commencent par "tel:". Si vous avez besoin d'une solution de serveur complet (pas besoin d'installation locale du logiciel), vous devez définir ce "Non" et remplissez champ suivant.
@@ -1511,7 +1549,7 @@ EndPointIs=Les clients SOAP doivent envoyer leur requêtes vers le point de sort
 ApiSetup=Configuration du module API REST
 ApiDesc=En activant ce module, Dolibarr devient aussi serveur de services API de type REST
 ApiProductionMode=Activer le mode « production » (ceci activera l'utilisation du cache pour la gestion des services)
-ApiExporerIs=Vous pouvez accéder aux API par l'URL
+ApiExporerIs=Vous pouvez explorer et tester les API par l'URL
 OnlyActiveElementsAreExposed=Seuls les éléments en rapport avec un module actif sont présentés.
 ApiKey=Clé pour l'API
 WarningAPIExplorerDisabled=L'explorateur d'API est désactivé. L'explorateur d'API n'est pas nécessaire pour le fonctionnement des API. il s'agit d'un outil pour les développeurs pour en tester les services. Si cet outil vous est nécessaire, activez le module API REST dans la liste des modules.
@@ -1524,7 +1562,6 @@ BankOrderGlobalDesc=Ordre d'affichage général
 BankOrderES=Espagnol
 BankOrderESDesc=Ordre d'affichage Espagnol
 ChequeReceiptsNumberingModule=Module de numérotation des bordereaux de remises de chèques
-
 ##### Multicompany #####
 MultiCompanySetup=Configuration du module Multi-société
 ##### Suppliers #####
@@ -1583,12 +1620,12 @@ BackupDumpWizard=Assistant de génération d'un fichier de sauvegarde de la base
 SomethingMakeInstallFromWebNotPossible=L'installation de module externe est impossible depuis l'interface web pour la raison suivante : 
 SomethingMakeInstallFromWebNotPossible2=Pour cette raison, le processus de mise à jour décrit ici est uniquement une série de manipulations que seul un utilisateur ayant des droits privilégiés peut faire
 InstallModuleFromWebHasBeenDisabledByFile=L'installation de module externe depuis l'application a été désactivé par l'administrator. Vous devez lui demander de supprimer le fichier <strong>%s</strong> pour permettre cette fonctionnalité.
-ConfFileMuseContainCustom=L'installation d'un module externe depuis l'application nécessite de sauver les fichiers du module dans le répertoire <strong>%s</strong>. Pour que ce répertoire soit reconnu par Dolibarr, il est nécessaire de paramétrer le fichier de configuration <strong>conf/conf.php</strong> pour lui ajouter les 2 lignes suivantes :<br>\n<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=Mettez en surbrillance les lignes de la table lorsque la souris passe au-dessus
 HighlightLinesColor=Mettez en surbrillance les lignes de la table lorsque la souris passe au-dessus (garder vide pour ne pas avoir de surbrillance)
 TextTitleColor=Couleur du titre des pages
 LinkColor=Couleur des liens
-PressF5AfterChangingThis=Appuyez sur la touche F5 ou videz le cache de votre navigateur après avoir modifié cette valeur pour que le changement soit effectif
+PressF5AfterChangingThis=Appuyez sur la touche CTRL+F5 ou videz le cache de votre navigateur après avoir modifié cette valeur pour que le changement soit effectif
 NotSupportedByAllThemes=Fonctionne avec les thèmes natifs. Non garanti avec d'autres
 BackgroundColor=Couleur de fond
 TopMenuBackgroundColor=Couleur de fond pour le menu horizontal
@@ -1601,7 +1638,7 @@ MinimumNoticePeriod=Période de préavis minimum (Votre demande de congé doit 
 NbAddedAutomatically=Nombre de jours ajoutés aux compteurs des utilisateurs (automatiquement) chaque mois
 EnterAnyCode=Ce champ contient une référence pour identifier le champ. Entrez une valeur de votre choix, mais sans caractères spéciaux.
 UnicodeCurrency=Saisissez ici entre accolades, la liste du numéro des octets qui représentent le symbole de la monnaie. Pour exemple: pour $, entrez [36] - pour le Real Brésilien R$ [82,36] - pour l'euro €, entrez [8364]
-ColorFormat=La couleur RVB est au format HEX, ex: FF0000
+ColorFormat=La couleur RVB au format HEX est, par exemple: FF0000
 PositionIntoComboList=Position de la ligne dans des listes déroulantes
 SellTaxRate=Taux de TVA
 RecuperableOnly=Oui pour une TVA "Perçue Non Récupérable" dédiée à certains pays comme la France. Gardez la valeur à "Non" dans tous les autres cas.
@@ -1660,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=Si vous utilisez un module multi-société, avec
 ModuleEnabledAdminMustCheckRights=Le module a été activé. Les permissions pour le(s) module(s) activé(s) ont été donnés aux utilisateurs admin uniquement. Vous devrez peut-être accorder des autorisations aux autres utilisateurs ou groupes manuellement si nécessaire.
 UserHasNoPermissions=Cet utilisateur n'a pas de permission définie
 TypeCdr=Utilisez "Aucune" si la date du terme de paiement est la date de la facture plus un delta en jours (delta est le champ "Nb de jours") <br> Utilisez "À la fin du mois", si, après le delta, la date doit être augmentée pour atteindre la fin du mois (+ un «Offset» optionnel en jours) <br> Utilisez "Coutant/Suivant" pour que la date du terme de paiement soit la premier Nième jour du mois qui suit (N est stocké dans le champ "Nb de jours")
+BaseCurrency=Devise par défaut de votre société/institution (Voir Accueil > configuration > Société/Institution)
+WarningNoteModuleInvoiceForFrenchLaw=Ce module %s permet d'être conforme aux lois françaises (Loi Finance 2016 par exemple).
+WarningNoteModulePOSForFrenchLaw=This module %s is compliant with french laws (Loi Finance 2016) because module Non Reversible Logs is automatically activated.
+WarningInstallationMayBecomeNotCompliantWithLaw=You try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Ressource
 UseSearchToSelectResource=Utilisez un champ avec auto-complétion pour choisir les ressources (plutôt qu'une liste déroulante).
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 10a2f2075ec..fa0159c2aa0 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -17,7 +17,7 @@ InvoiceStandardAsk=Facture standard
 InvoiceStandardDesc=Ce type de facture est la facture traditionnelle. On l'appelle aussi <b>facture de doit</b> (du verbe devoir).
 InvoiceDeposit=Facture d'acompte
 InvoiceDepositAsk=Facture d'acompte
-InvoiceDepositDesc=La <b>facture d'acompte</b> est le type de facture qui fait suite à réception d'un acompte, s'il n'est pas encore possible de saisir le paiement sur une facture définitive.
+InvoiceDepositDesc=Ce type de facture fait suite à réception d'un acompte, s'il n'est pas encore possible de saisir le paiement sur une facture définitive.
 InvoiceProForma=Facture proforma
 InvoiceProFormaAsk=Facture proforma
 InvoiceProFormaDesc=La <b>facture proforma</b> est une image de facture définitive mais qui n'a aucune valeur comptable.
@@ -115,7 +115,7 @@ BillStatus=État de la facture
 StatusOfGeneratedInvoices=Statut des factures générées
 BillStatusDraft=Brouillon (à valider)
 BillStatusPaid=Payée
-BillStatusPaidBackOrConverted=Remboursé ou converti en réduction
+BillStatusPaidBackOrConverted=Facture d'avoir remboursée ou convertie en réduction
 BillStatusConverted=Payée
 BillStatusCanceled=Abandonnée
 BillStatusValidated=Validée (à payer)
@@ -127,7 +127,7 @@ BillStatusClosedPaidPartially=Payée (partiellement)
 BillShortStatusDraft=Brouillon
 BillShortStatusPaid=Payée
 BillShortStatusPaidBackOrConverted=Remboursé ou converti
-BillShortStatusConverted=Traité
+BillShortStatusConverted=Payé
 BillShortStatusCanceled=Abandonnée
 BillShortStatusValidated=Validée
 BillShortStatusStarted=Commencée
@@ -273,7 +273,7 @@ CreditNotes=Avoirs
 Deposit=Acompte
 Deposits=Acomptes
 DiscountFromCreditNote=Remise issue de l'avoir %s
-DiscountFromDeposit=Paiements issus de l'acompte %s
+DiscountFromDeposit=Acomptes issus de la facture %s
 DiscountFromExcessReceived=Trop-perçu sur la facture %s
 AbsoluteDiscountUse=Ce type de crédit ne peut s'utiliser que sur une facture non validée
 CreditNoteDepositUse=La facture doit être validée pour pouvoir utiliser ce type de crédit
@@ -357,13 +357,13 @@ PaymentConditionPT_ORDER=À réception de commande
 PaymentConditionShortPT_5050=50/50
 PaymentConditionPT_5050=Règlement 50%% d'avance, 50%% à la livraison
 PaymentConditionShort10D=10 jours
-PaymentCondition10D=Règlement à 10 jours
+PaymentCondition10D=10 jours
 PaymentConditionShort10DENDMONTH=10 jours fin de mois
-PaymentCondition10DENDMONTH=Règlement à 10 jours fin de mois
+PaymentCondition10DENDMONTH=Sous 10 jours suivant la fin du mois
 PaymentConditionShort14D=14 jours
-PaymentCondition14D=Règlement à 14 jours
+PaymentCondition14D=14 jours
 PaymentConditionShort14DENDMONTH=14 jours fin de mois
-PaymentCondition14DENDMONTH=Règlement à 14 jours fin de mois
+PaymentCondition14DENDMONTH=Sous 14 jours suivant la fin du mois
 FixAmount=Montant Fixe
 VarAmount=Montant variable (%% tot.)
 # PaymentType
@@ -447,7 +447,7 @@ CantRemovePaymentWithOneInvoicePaid=Suppression impossible quand il existe au mo
 ExpectedToPay=Paiement attendu
 CantRemoveConciliatedPayment=Suppression d'un paiement rapproché impossible
 PayedByThisPayment=Règlé par ce paiement
-ClosePaidInvoicesAutomatically=Classer "Payées" les factures standards ou de remplacements ayant un reste à payer nul 
+ClosePaidInvoicesAutomatically=Classifiez "Payée" toutes les factures standard, d'acompte ou de remplacement entièrement payées.
 ClosePaidCreditNotesAutomatically=Classer automatiquement à "Payé" les factures avoirs entièrement remboursées.
 ClosePaidContributionsAutomatically=Classer "payée" toutes les dépenses spéciales réglées en totalité.
 AllCompletelyPayedInvoiceWillBeClosed=Toutes les factures avec un reste à payer nul seront automatiquement fermées au statut "Payé".
@@ -462,9 +462,9 @@ YouMustCreateStandardInvoiceFirstDesc=Pour créer une facture modèle, vous deve
 PDFCrabeDescription=Modèle de facture PDF complet (modèle recommandé par défaut)
 PDFCrevetteDescription=Modèle de facture PDF Crevette (modèle complet pour les factures de situation)
 TerreNumRefModelDesc1=Renvoie le numéro sous la forme %syymm-nnnn pour les factures et factures de remplacement, %syymm-nnnn pour les avoirs et %syymm-nnnn pour les acomptes où yy est l'année, mm le mois et nnnn un compteur séquentiel sans rupture et sans remise à 0
-MarsNumRefModelDesc1=Renvoie le numéro sous la forme %syymm-nnnn pour les factures, %syymm-nnnn pour les factures de remplacement, %syymm-nnnn pour les acomptes et %syymm-nnnn pour les avoirs où yy est l'année, mm le mois et nnnn un compteur séquentiel sans rupture et sans remise à 0
+MarsNumRefModelDesc1=Renvoie une numérotation au format %syymm-nnnn pour les factures standards, %syymm-nnnn pour les factures de remplacement, %syymm-nnnn pour les factures d'acompte et %syymm-nnnn pour les factures d'avoir où yy est l'année, mm, le mois et nnnn un compteur sans rupture ni remise à zéro.
 TerreNumRefModelError=Une facture commençant par $syymm existe déjà et est incompatible avec cet modèle de numérotation. Supprimez-la ou renommez-la pour activer ce module.
-CactusNumRefModelDesc1=Renvoie une référence avec le format %syymm-nnnn pour les factures standards, %symm-nnnn pour les avoirs et %syymm-nnnn pour les factures d'accomptes où yy est l'année, mm est le mois et nnnn est une séquence sans rupture et sans retour à 0
+CactusNumRefModelDesc1=Renvoie un numéro au format %syymm-nnnn pour les factures standards, %syymm-nnnn pour les factures d'avoir et %syymm-nnnn pour les factures d'acompte où yy est l'année, mm le mois et nnnn un compteur sans rupture ni remise à 0.
 ##### Types de contacts #####
 TypeContact_facture_internal_SALESREPFOLL=Responsable suivi facture client
 TypeContact_facture_external_BILLING=Contact client facturation
@@ -504,5 +504,3 @@ DeleteRepeatableInvoice=Supprimer facture modèle
 ConfirmDeleteRepeatableInvoice=Est-ce votre sûr de vouloir supprimer la facture modèle ?
 CreateOneBillByThird=Créer une facture par tiers (sinon, une facture par commande)
 BillCreated=%s facture(s) créée(s)
-WithdrawRequest=Demande de prélèvement
-BadPaymentMethod=Mauvais mode de paiement
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index 14f2e9ffd76..4fc3580fa26 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -13,7 +13,7 @@ MenuNewPrivateIndividual=Nouveau particulier
 NewCompany=Nouvelle société (prospect, client, fournisseur)
 NewThirdParty=Nouveau tiers (prospect, client, fournisseur)
 CreateDolibarrThirdPartySupplier=Créer un Tiers (fournisseur)
-CreateThirdPartyOnly=Créer le tiers
+CreateThirdPartyOnly=Créer tiers
 CreateThirdPartyAndContact=Créer un tiers + un contact/adresse fils
 ProspectionArea=Espace prospection
 IdThirdParty=Identifiant tiers
@@ -38,7 +38,6 @@ ThirdPartyCustomersStats=Clients
 ThirdPartyCustomersWithIdProf12=Clients avec %s ou %s
 ThirdPartySuppliers=Fournisseurs
 ThirdPartyType=Type du tiers
-Company/Fundation=Société/Association
 Individual=Individu privé
 ToCreateContactWithSameName=Crée automatiquement un contact/adresse, sous le tiers, avec la même information que le tiers. Dans la plupart des cas, même si votre tiers est une personne physique, la création d'un tiers seul suffit.
 ParentCompany=Maison mère
@@ -78,10 +77,10 @@ VATIsNotUsed=Non assujetti à la TVA
 CopyAddressFromSoc=Remplir avec l'adresse du tiers
 ThirdpartyNotCustomerNotSupplierSoNoRef=Ce tiers n'est ni client ni fournisseur. il n'y a pas d'objet référent.
 PaymentBankAccount=Compte bancaire paiements
-OverAllProposals=Total des propositions commerciales
-OverAllOrders=Total des commandes
-OverAllInvoices=Total des factures
-OverAllSupplierProposals=Total des propositions fournisseurs
+OverAllProposals=Propositions commerciales
+OverAllOrders=Commandes
+OverAllInvoices=Factures
+OverAllSupplierProposals=Demandes de prix
 ##### Local Taxes #####
 LocalTax1IsUsed=Assujetti à la deuxième taxe
 LocalTax1IsUsedES= Assujetti à RE
@@ -237,6 +236,12 @@ ProfId3TN=Id. prof. 3 (Code en douane)
 ProfId4TN=Id. prof. 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
+ProfId1US=Id prof
+ProfId2US=-
+ProfId3US=-
+ProfId4US=-
+ProfId5US=-
+ProfId6US=-
 ProfId1RU=Id. prof.1 (OGRN)
 ProfId2RU=Id. prof.2 (INN)
 ProfId3RU=Id. prof.3 (KPP)
@@ -259,7 +264,7 @@ CustomerRelativeDiscountShort=Remise relative
 CustomerAbsoluteDiscountShort=Remise fixe
 CompanyHasRelativeDiscount=Ce client a une remise par défaut de <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Ce client n'a pas de remise relative par défaut
-CompanyHasAbsoluteDiscount=Ce client a <b>%s</b> %s de lignes de déduction disponibles (remises, acomptes…)
+CompanyHasAbsoluteDiscount=Ce client dispose de remises disponibles (avoirs ou acomptes) pour un montant de <b>%s</b> %s
 CompanyHasCreditNote=Ce client a <b>%s</b> %s d'avoirs disponibles
 CompanyHasNoAbsoluteDiscount=Ce client n'a pas ou plus de remise fixe disponible
 CustomerAbsoluteDiscountAllUsers=Remises fixes en cours (accordées par tout utilisateur)
@@ -390,7 +395,7 @@ ListCustomersShort=Liste clients
 ThirdPartiesArea=Espace tiers et contacts
 LastModifiedThirdParties=Les %s derniers tiers modifiés
 UniqueThirdParties=Total de tiers uniques
-InActivity=En activité
+InActivity=Ouvert
 ActivityCeased=Clos
 ThirdPartyIsClosed=Le tiers est clôturé
 ProductsIntoElements=Liste des produits/services dans %s
@@ -402,7 +407,7 @@ LeopardNumRefModelDesc=Code libre sans vérification. Peut être modifié à tou
 ManagingDirectors=Nom du(des) gestionnaire(s) (PDG, directeur, président...)
 MergeOriginThirdparty=Tiers en doublon (le tiers que vous voulez supprimer)
 MergeThirdparties=Fursion de tiers
-ConfirmMergeThirdparties=Etes-vous sûr que vous voulez fusionner ce tiers dans l'actuel ? Tous les objets liés (factures, commandes, ...) seront déplacés sur le tiers en cours de sorte que vous serez en mesure de supprimer le doublon.
+ConfirmMergeThirdparties=Êtes-vous sur de vouloir fusionner ce tiers avec le tiers courant ? Tous ses objets liés (factures, commandes, ...) seront déplacés vers le tiers courant avant sa suppression.
 ThirdpartiesMergeSuccess=Les tiers ont été fusionnés
 SaleRepresentativeLogin=Login du commercial
 SaleRepresentativeFirstname=Prénom du commercial
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index b72af130b92..590b468465f 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Les montants obtenus sont ceux calculés
 Param=Paramétrage
 RemainingAmountPayment=Montant restant du paiement :
 Account=Compte
-Accountparent=Racine du compte
-Accountsparent=Racine des comptes
+Accountparent=Compte père
+Accountsparent=Comptes père
 Income=Recettes
 Outcome=Dépenses
 ReportInOut=Résultat / Exercice
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Taxes et charges
 MenuSocialContributions=Charges fiscales/sociales
 MenuNewSocialContribution=Nouvelle taxe sociale
 NewSocialContribution=Nouvelle charge fiscale/sociale
+AddSocialContribution=Ajouter taxe sociale/fiscale
 ContributionsToPay=Charges fiscales/sociales à payer
 AccountancyTreasuryArea=Espace comptabilité/trésorerie
 NewPayment=Nouveau règlement
@@ -189,8 +190,10 @@ AccountancyJournal=Code journal comptabilité
 ACCOUNTING_VAT_SOLD_ACCOUNT=Compte comptable par défaut pour l'encaissement de TVA - TVA sur les ventes (utilisé si non défini au niveau de la configuration du dictionnaire de TVA)
 ACCOUNTING_VAT_BUY_ACCOUNT=Compte comptable par défaut pour le paiement de la TVA - TVA sur les achats (utilisé si non défini au niveau de la configuration du dictionnaire de TVA)
 ACCOUNTING_VAT_PAY_ACCOUNT=Compte comptable par défaut pour le paiement de la TVA
-ACCOUNTING_ACCOUNT_CUSTOMER=Compte comptable par défaut des tiers clients (utilisé si non défini au niveau de la fiche Tiers)
-ACCOUNTING_ACCOUNT_SUPPLIER=Compte comptable par défaut des tiers fournisseurs (utilisé si non défini au niveau de la fiche Tiers)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Cloner une charge sociale/fiscale
 ConfirmCloneTax=Confirmez le clone du paiement de charge sociale/fiscale
 CloneTaxForNextMonth=Cloner pour le mois suivant
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Charges fiscales/sociales
 ImportDataset_tax_vat=Paiements de TVA
 ErrorBankAccountNotFound=Erreur: compte banque non trouvé
 FiscalPeriod=Période fiscale
+ListSocialContributionAssociatedProject=Liste des charges sociales liées au projet
diff --git a/htdocs/langs/fr_FR/cron.lang b/htdocs/langs/fr_FR/cron.lang
index caeab63a7cb..355f1c2556f 100644
--- a/htdocs/langs/fr_FR/cron.lang
+++ b/htdocs/langs/fr_FR/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Effacer les travaux planifiés
 CronConfirmDelete=Êtes-vous sûr de vouloir supprimer ces travaux planifiées?
 CronExecute=Lancer la tache planifiée
 CronConfirmExecute=Etes-vous sûr que vous voulez exécuter ces travaux planifiées maintenant?
-CronInfo=Le module des travaux planifiés permet d'exécuter des opérations qui ont été programmées
+CronInfo=Les travaux planifiés permettent de planifier des tâches à exécuter automatiquement. Les travaux planifiés peuvent aussi être lancés manuellement.
 CronTask=Travail planifié
 CronNone=Aucun(e)
 CronDtStart=Pas avant
@@ -57,23 +57,23 @@ CronStatusActiveBtn=Activer
 CronStatusInactiveBtn=Désactiver
 CronTaskInactive=Cette tâche est désactivée
 CronId=Id
-CronClassFile=Classes (nom de fichier)
-CronModuleHelp=Nom du répertoire du module Dolibarr (fonctionne aussi avec les modules externes de Dolibarr). <BR> Par exemple pour appeler la méthode fetch de l'objet Product de Dolibarr /htdocs/<u>product</u>/class/product.class.php, la valeur de module est <i>product</i>
-CronClassFileHelp=Le nom du fichier à charger. <BR> Par exemple pour appeler la méthode fetch de l'objet Product de Dolibarr /htdocs/product/class/<u>product.class.php</u>, la valeur de du nom de fichier de classe est <i>product.class.php</i>
-CronObjectHelp=Le nom de l'objet à charger. <BR> Par exemple pour appeler la méthode fetch de l'objet Product de Dolibarr /htdocs/product/class/product.class.php, la valeur du nom de l'objet est <i>Product</i>
-CronMethodHelp=La méthode à lancer. <BR> Par exemple pour appeler la méthode fetch de l'objet Product de Dolibarr /htdocs/product/class/product.class.php, la valeur de la méthode est <i>fetch</i>
-CronArgsHelp=Les arguments de la méthode. <BR> Par exemple pour appeler la méthode fetch de l'objet Product de Dolibarr /htdocs/product/class/product.class.php, la valeur des arguments pourrait être <i>0, RefProduit</i>
+CronClassFile=Filename with class
+CronModuleHelp=Nom du dossier du module dans Dolibarr (fonctionne aussi avec les modules externes). <BR>Par exemple, pour appeler la méthode d'appel des produits Dolibarr /htdocs/<u>product</u>/class/product.class.php, la valeur du module est <i>product</i>.
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=La commande système a exécuter.
 CronCreateJob=Créer un nouveau travail planifié
 CronFrom=A partir du
 # Info
 # Common
 CronType=Type de travail planifié
-CronType_method=Méthode d'appel d'une classe Dolibarr
+CronType_method=Appelle d'une méthode d'une classe Dolibarr
 CronType_command=Commande terminal
 CronCannotLoadClass=Impossible de charger la classe %s ou l'objet %s
 UseMenuModuleToolsToAddCronJobs=Aller à la page "Accueil - Outils administration - Travaux planifiées" pour voir la listes des travaux programmées et les modifier.
 JobDisabled=Travail désactivé
 MakeLocalDatabaseDumpShort=Sauvegarde locale de base
 MakeLocalDatabaseDump=Créer une sauvegarde locale de la base
-WarningCronDelayed=Attention, à des fins de performance, quelle que soit la prochaine date d'exécution des travaux actifs, vos travaux peuvent être retardée jusqu'à un maximum de %s heures avant d'être exécuter.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index 09b2f9a16c1..13c813f963a 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Echec de la création du fichier '<b>%s</b>'.
 ErrorFailToRenameDir=Echec du renommage du répertoire '<b>%s</b>' en '<b>%s</b>'.
 ErrorFailToCreateDir=Echec de création du répertoire '<b>%s</b>'.
 ErrorFailToDeleteDir=Echec de la suppression du répertoire '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=Ce contact est déjà défini comme contact pour ce type.
 ErrorCashAccountAcceptsOnlyCashMoney=Ce compte bancaire est de type caisse et n'accepte que le mode de règlement de type <b>espèce</b>.
 ErrorFromToAccountsMustDiffers=Les comptes source et destination doivent être différents.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Impossible d'écrire dans le répertoire %s
 ErrorFoundBadEmailInFile=Syntaxe d'email incorrecte trouvée pour %s lignes dans le fichier (exemple ligne %s avec email=%s)
 ErrorUserCannotBeDelete=L'utilisateur ne peut pas être supprimé. Peut-être est-il associé à des éléments de Dolibarr.
 ErrorFieldsRequired=Des champs obligatoires n'ont pas été renseignés
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Echec à la création d'un répertoire. Vérifiez que le user du serveur Web ait bien les droits d'écriture dans les répertoires documents de Dolibarr. Si le paramètre <b>safe_mode</b> a été activé sur ce PHP, vérifiez que les fichiers php dolibarr appartiennent à l'utilisateur du serveur Web.
 ErrorNoMailDefinedForThisUser=Email non défini pour cet utilisateur
 ErrorFeatureNeedJavascript=Cette fonctionnalité a besoin de javascript activé pour fonctionner. Modifiez dans configuration - affichage.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=La quantité d'une ligne ne peut pas ê
 ErrorWebServerUserHasNotPermission=Le compte d'exécution du serveur web <b>%s</b> n'a pas les permissions pour cela
 ErrorNoActivatedBarcode=Aucun type de code-barres activé
 ErrUnzipFails=Impossible de décompresser le fichier %s avec ZipArchive
-ErrNoZipEngine=Pas de moteur pour décompresser le fichier %s dans ce PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=Le fichier doit être un package Dolibarr
 ErrorModuleFileRequired=Vous devez sélectionner un fichier package de module Dolibarr
 ErrorPhpCurlNotInstalled=L'extension PHP CURL n'est pas installée, ceci est indispensable pour dialoguer avec Paypal.
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=Pas de variable globale
 ErrorFieldMustBeANumeric=Le champ <b>%s</b> doit être un numérique
 ErrorMandatoryParametersNotProvided=Paramètre(s) obligatoire(s) non fournis
 ErrorOppStatusRequiredIfAmount=Vous avez fixé un montant estimé pour cette opportunité/affaire. Aussi, vous devez également entrer son statut
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Mauvaise définition du tableau Menu dans le descripteur de module (mauvaise valeur pour la clé fk_menu)
 ErrorSavingChanges=Une erreur est survenue lors de la sauvegarde des modifications
 ErrorWarehouseRequiredIntoShipmentLine=L'entrepôt est requis sur la ligne de l'expédition
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Le stock du produit %s est insuffisa
 ErrorStockIsNotEnoughToAddProductOnProposal=Le stock du produit %s est insuffisant pour permettre un ajout dans une nouvelle proposition commerciale.
 ErrorFailedToLoadLoginFileForMode=Impossible d'obtenir la clé de connexion pour le mode « %s ».
 ErrorModuleNotFound=Fichier du module non trouvé.
-ErrorFieldAccountNotDefinedForBankLine=Valeur du compte comptable non défini pour la ligne de bank source %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Erreur, le nom de relevé bancaire doit suivre la règle de syntaxe suivante %s
 ErrorPhpMailDelivery=Assurez-vous que vous n'utilisez pas un nombre de destinataires trop élevé et que le contenu de votre message n'est pas similaire à du Spam. Demandez aussi à votre administrateur de vérifier le pare-feu et les journaux serveur pour une information plus complète.
 ErrorUserNotAssignedToTask=L'utilisateur doit être assigné à une tâche pour qu'il puisse entrer le temps consommé.
 ErrorTaskAlreadyAssigned=Tâche déjà assignée à l'utilisateur
 ErrorModuleFileSeemsToHaveAWrongFormat=Le package du module semble avoir un mauvais format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=Le nom du package du module (<strong>%s</strong>)  ne correspond pas à la syntaxe attendue: <strong>%s</strong>
+ErrorDuplicateTrigger=Erreur, doublon du trigger nommé %s. Déjà chargé à partir de %s.
+ErrorNoWarehouseDefined=Erreur, aucun entrepôts défini.
+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.
 
 # Warnings
 WarningPasswordSetWithNoAccount=Un mot de passe a été fixé pour cet adhérent. Cependant, aucun compte d'utilisateur n'a été créé. Donc, ce mot de passe est stocké, mais ne peut être utilisé pour accéder à Dolibarr. Il peut être utilisé par un module/interface externe, mais si vous n'avez pas besoin de définir ni login ni mot de passe pour un adhérent, vous pouvez désactiver l'option «Gérer un login pour chaque adhérent" depuis la configuration du module Adhérents. Si vous avez besoin de gérer un login, mais pas de mot de passe, vous pouvez laisser ce champ vide pour éviter cet avertissement. Remarque: L'email peut également être utilisé comme login si l'adhérent est lié à un utilisateur.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=La date de paiement (%s) est inférieure
 WarningTooManyDataPleaseUseMoreFilters=Trop de données (plus de %s lignes). Utilisez davantage de filtres ou régler la constante %s pour augmenter la limite à une valeur plus élevée.
 WarningSomeLinesWithNullHourlyRate=Des temps ont été enregistrés par des utilisateurs lorsque leur taux horaire n'était défini. Une valeur de 0 %s a été utilisée, mais cela peut entraîner une mauvaise évaluation du temps passé.
 WarningYourLoginWasModifiedPleaseLogin=Votre identifiant a été modifié. Par sécurité, vous devrez vous identifiez avec votre nouvel identifiant avant l'action suivante.
+WarningAnEntryAlreadyExistForTransKey=Une donnée identique existe déjà pour la traduction du code dans cette langue
diff --git a/htdocs/langs/fr_FR/exports.lang b/htdocs/langs/fr_FR/exports.lang
index da785522df5..660ae8276e1 100644
--- a/htdocs/langs/fr_FR/exports.lang
+++ b/htdocs/langs/fr_FR/exports.lang
@@ -113,8 +113,14 @@ ExportDateFilter=AAAA, AAAAMM, AAAAMMJJ: filtre pour une année/mois/jour<br>AAA
 ExportNumericFilter=NNNNN filtre une seule valeur<br>NNNNN+NNNNN filtre une plage de valeurs<br>< NNNNN filtre les valeurs inférieures<br>> NNNNN filtre les valeurs supérieures
 ImportFromLine=Début d'import à la ligne numéro
 EndAtLineNb=Fin à la ligne numéro
+ImportFromToLine=Importer les lignes à la position (de - à)
 SetThisValueTo2ToExcludeFirstLine=Par exemple, positionnez cette valeur à 3 pour exclure les 2 premières lignes
 KeepEmptyToGoToEndOfFile=Laissez ce champ vide pour aller jusqu'à la fin du fichier
+SelectPrimaryColumnsForUpdateAttempt=Sélectionnez la ou les colonne(s) à utiliser comme clé primaire pour la tentative de mise à jour
+UpdateNotYetSupportedForThisImport=La mise à jour n'est pas pris en charge pour ce type d'importation (seulement les ajouts)
+NoUpdateAttempt=Aucune tentative de mise à jour n'a été effectuée, seulement un insertion.
+ImportDataset_user_1=Utilisateurs (employés ou non) et attributs
+ComputedField=Champ calculé
 ## filters
 SelectFilterFields=Si vous voulez filtrer sur certaines valeurs, saisissez ces valeurs.
 FilteredFields=Champs filtrés
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 1f0b2340feb..e37d708fbbe 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=Paramètre %s non défini
 ErrorUnknown=Erreur inconnue
 ErrorSQL=Erreur SQL
 ErrorLogoFileNotFound=Le fichier logo '%s' n'a pas été trouvé
-ErrorGoToGlobalSetup=Allez dans la Configuration 'Société/Institution' pour corriger
+ErrorGoToGlobalSetup=Allez dans la Configuration 'Société/Organisation' pour corriger
 ErrorGoToModuleSetup=Allez dans la Configuration du module pour corriger
 ErrorFailedToSendMail=Échec de l'envoi de l'email (émetteur=%s, destinataire=%s)
 ErrorFileNotUploaded=Le fichier n'a pas été transféré. Vérifiez que sa taille ne dépasse pas le maxium autorisé, que l'espace disque est disponible et qu'un fichier du même nom n'existe pas déjà.
@@ -153,6 +153,7 @@ Edit=Éditer
 Validate=Valider
 ValidateAndApprove=Valider et Approuver
 ToValidate=À valider
+NotValidated=Non validé
 Save=Enregistrer
 SaveAs=Enregistrer sous
 TestConnection=Tester la connexion
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=Pas de fonctionnalité de déconnexion applicative a
 Connection=Connexion
 Setup=Configuration
 Alert=Alerte
+MenuWarnings=Alertes
 Previous=Précédent
 Next=Suivant
 Cards=Fiches
@@ -292,7 +294,7 @@ HourShort=H
 MinuteShort=mn
 Rate=Taux
 CurrencyRate=Taux de change de la devise
-UseLocalTax=Inclure taxe
+UseLocalTax=Utiliser taxe
 Bytes=Octets
 KiloBytes=Kilooctets
 MegaBytes=Mégaoctets
@@ -308,6 +310,7 @@ Copy=Copier
 Paste=Coller
 Default=Défaut
 DefaultValue=Valeur par défaut
+DefaultValues=Valeurs par défaut
 Price=Prix
 UnitPrice=Prix unitaire
 UnitPriceHT=Prix unitaire HT
@@ -363,7 +366,8 @@ VATRate=Taux TVA
 Average=Moyenne
 Sum=Somme
 Delta=Écart
-Module=Module
+Module=Module/Application
+Modules=Modules/Applications
 Option=Option
 List=Liste
 FullList=Liste complète
@@ -387,7 +391,7 @@ ActionRunningNotStarted=A réaliser
 ActionRunningShort=En cours
 ActionDoneShort=Terminé
 ActionUncomplete=Incomplets
-CompanyFoundation=Société ou institution
+CompanyFoundation=Société/Organisation
 ContactsForCompany=Contacts de ce tiers
 ContactsAddressesForCompany=Contacts/adresses de ce tiers
 AddressesForCompany=Adresses de ce tiers
@@ -405,8 +409,9 @@ Generate=Générer
 Duration=Durée
 TotalDuration=Durée totale
 Summary=Résumé
-DolibarrStateBoard=Statistiques
-DolibarrWorkBoard=Tableau de bord de travail
+DolibarrStateBoard=Statistiques de la base
+DolibarrWorkBoard=Tableau de bord des éléments ouverts
+NoOpenedElementToProcess=Aucun élément ouvert à traiter
 Available=Disponible
 NotYetAvailable=Pas encore disponible
 NotAvailable=Non disponible
@@ -453,6 +458,7 @@ NextStep=Étape suivante
 Datas=Données
 None=Aucun
 NoneF=Aucune
+NoneOrSeveral=Aucun ou plusieurs
 Late=Retard
 LateDesc=Le délai qui définit si un enregistrement est en retard ou non dépend de votre configuration. Demandez à votre administrateur pour changer ce délai depuis Accueil - Configuration - Alertes 
 Photo=Photo
@@ -606,7 +612,8 @@ PartialWoman=Partielle
 TotalWoman=Totale
 NeverReceived=Jamais reçu
 Canceled=Annulé
-YouCanChangeValuesForThisListFromDictionarySetup=Vous pouvez changer ces valeurs depuis le menu accueil - configuration - dictionnaires
+YouCanChangeValuesForThisListFromDictionarySetup=Les valeurs de cette liste sont modifiables  depuis le menu Accueil > Configuration > Dictionnaires
+YouCanChangeValuesForThisListFrom=You can change values for this list from menu %s
 YouCanSetDefaultValueInModuleSetup=Vous pouvez définir la valeur par défaut utilisée lors de la création d'un nouvel enregistrement dans la configuration du module
 Color=Couleur
 Documents=Fichiers joints
@@ -642,6 +649,7 @@ FreeLineOfType=Ligne libre de type
 CloneMainAttributes=Cloner l'objet avec ces attributs principaux
 PDFMerge=Fusion PDF
 Merge=Fusion
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Afficher page d'impression de la zone centrale
 MenuManager=Gestionnaire de menu
 WarningYouAreInMaintenanceMode=Attention, vous êtes en mode maintenance, aussi seul l'utilisateur identifié par <b>%s</b> est autorisé à utiliser l'application en ce moment.
@@ -708,6 +716,7 @@ from=de
 toward=vers
 Access=Accès
 SelectAction=Sélectionner l'action
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Utilisez Ctrl+C pour copier dans le presse-papier
 SaveUploadedFileWithMask=Sauver le fichier sur le serveur sous le nom "<strong>%s</strong>" (sinon "%s")
 OriginFileName=nom du fichier source
@@ -718,7 +727,7 @@ ViewPrivateNote=Voir les notes
 XMoreLines=%s ligne(s) cachées
 PublicUrl=URL publique
 AddBox=Ajouter boite
-SelectElementAndClickRefresh=Sélectionnez un élément et cliquez sur Rafraichir
+SelectElementAndClick=Select an element and click %s
 PrintFile=Imprimer fichier %s
 ShowTransaction=Afficher l'écriture sur le compte bancaire
 GoIntoSetupToChangeLogo=Allez dans Accueil - Configuration - Société/institution pour changer le  logo ou aller dans Accueil - Configuration - Affichage pour le cacher.
@@ -734,8 +743,8 @@ Hello=Bonjour
 Sincerely=Sincèrement
 DeleteLine=Effacer ligne
 ConfirmDeleteLine=Êtes-vous sûr de vouloir supprimer cette ligne ?
-NoPDFAvailableForDocGenAmongChecked=Aucun PDF n'est disponible pour la génération du document parmi les enregistrements cochés
-TooManyRecordForMassAction=Trop d'enregistrements sélectionnés pour l'action de masse. De telles actions sont restreintes à une liste de %s enregistrements maximum.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=Aucu enregistrement sélectionné
 MassFilesArea=Zone des fichiers générés en masse
 ShowTempMassFilesArea=Afficher la zone des fichiers générés en masse
@@ -755,11 +764,20 @@ Calendar=Calendrier
 GroupBy=Grouper par...
 ViewFlatList=Voir vue liste
 RemoveString=Supprimer la chaine '%s'
-SomeTranslationAreUncomplete=Certaines langues sont traduites partiellement ou peuvent contenir des erreurs. Si vous en détectez, vous pouvez corriger les fichiers langues depuis  <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Lien de téléchargement direct
 Download=Téléchargement
 ActualizeCurrency=Mettre à jour le taux de devise
 Fiscalyear=Exercice fiscal
+ModuleBuilder=Générateur de Module
+SetMultiCurrencyCode=Set currency
+BulkActions=Actions de masse
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Lundi
 Tuesday=Mardi
@@ -817,40 +835,3 @@ SearchIntoContracts=Contrats
 SearchIntoCustomerShipments=Expéditions clients
 SearchIntoExpenseReports=Notes de frais
 SearchIntoLeaves=Congés
-BulkActions=Actions de masse
-#Numbers translate
-centimes=centimes
-one=un
-two=deux
-three=trois
-four=quatre
-five=cinq
-six=six
-seven=sept
-eight=huit
-nine=neuf
-ten=dix
-eleven=onze
-twelve=douze
-thirteen=treize
-fourteen=quatorze
-fifteen=quinze
-sixteen=seize
-seventeen=dix-sept
-eighteen=dix-huit
-nineteen=dix-neuf
-twenty=vingt
-thirty=trente
-forty=quarante
-fifty=cinquante
-sixty=soixante
-seventy=soixante-dix
-eighty=quatre-vingt
-ninety=quatre-vingt-dix
-hundred=cent
-hundreds=cents
-thousand=mille
-million=million
-billion=milliard
-trillion=billion
-quadrillion=quadrillion
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index 6c279402dc2..5ee7db08209 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Date anniversaire
 DateToBirth=Date de naissance
 BirthdayAlertOn=alerte anniversaire active
 BirthdayAlertOff=alerte anniversaire inactive
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Contact ajouté à l'intervention
 Notify_FICHINTER_VALIDATE=Validation fiche intervention
 Notify_FICHINTER_SENTBYMAIL=Envoi fiche d'intervention par email
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=Ceci est un message de <b>test</b> (le mot test doit êtr
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nVous trouverez ci-joint la facture __REF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nNous voudrions vous avertir que le facture __REF__ ne semble pas avoir été payée. Nous vous avons joins la dite facture comme rappel.\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint la proposition commerciale __PROPREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nVous trouverez ci-joint la demande de prix __ASKREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nVous trouverez ci-joint la demande de prix __REF__\n\n__PERSONALIZED__Cordialement,\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint la commande __ORDERREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint notre commande __ORDERREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nVous trouverez ci-joint la facture __REF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint le bon d'expédition __SHIPPINGREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint la fiche d'intervention __FICHINTERREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr est un logiciel de gestion proposant plusieurs modules métiers. Une démonstration qui inclut tous ces modules n'a pas de sens car ce cas n'existe jamais (plusieurs centaines de modules disponibles). Aussi, quelques profils type de démo sont disponibles.
 ChooseYourDemoProfil=Veuillez choisir le profil de démonstration qui correspond le mieux à votre activité…
 ChooseYourDemoProfilMore=...ou construisez votre propre profil<br>(sélection manuelle des modules)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Le mode d'authentification de Dolibarr
 EnableGDLibraryDesc=Vous devez activer ou installer la librairie GD avec votre PHP pour pouvoir activer cette option.
 ProfIdShortDesc=<b>Id prof. %s</b> est une information qui dépend du pays du tiers.<br>Par exemple, pour le pays <b>%s</b>, il s'agit du code <b>%s</b>.
 DolibarrDemo=Démonstration de Dolibarr ERP/CRM
-StatsByNumberOfUnits=Statistiques en nombre d'unités du produit/service
-StatsByNumberOfEntities=Statistiques en nombre d'entités référentes
-NumberOfProposals=Nombre de propositions commerciales sur les 12 derniers mois
-NumberOfCustomerOrders=Nombre de commandes clients sur les 12 derniers mois
-NumberOfCustomerInvoices=Nombre de factures clients sur les 12 derniers mois
-NumberOfSupplierProposals=Nombre de propositions commerciales fournisseurs des 12 derniers mois
-NumberOfSupplierOrders=Nombre de factures fournisseurs sur les 12 derniers mois
-NumberOfSupplierInvoices=Nombre de factures fournisseurs sur les 12 derniers mois
-NumberOfUnitsProposals=Nombre d'unités sur les propositions commerciales des 12 derniers mois
-NumberOfUnitsCustomerOrders=Nombre d'unités sur les commandes clients des 12 derniers mois
-NumberOfUnitsCustomerInvoices=Nombre d'unités sur les factures clients des 12 derniers mois
-NumberOfUnitsSupplierProposals=Nombre d'unités sur les propositions commerciales fournisseurs des 12 derniers mois
-NumberOfUnitsSupplierOrders=Nombre d'unités sur les factures fournisseurs des 12 derniers mois
-NumberOfUnitsSupplierInvoices=Nombre d'unités sur les factures fournisseurs des 12 derniers mois
+StatsByNumberOfUnits=Statistiques de quantités de produits/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Nombre de propositions commerciales
+NumberOfCustomerOrders=Nombre de commandes clients
+NumberOfCustomerInvoices=Nombre de factures clients
+NumberOfSupplierProposals=Nombre de demandes de prix
+NumberOfSupplierOrders=Nombre de commandes fournisseurs
+NumberOfSupplierInvoices=Nombre de factures fournisseurs
+NumberOfUnitsProposals=Quantités présentes sur les propositions commerciales
+NumberOfUnitsCustomerOrders=Quantités présentes sur les commandes clients
+NumberOfUnitsCustomerInvoices=Quantités présentes sur les factures fournisseurs
+NumberOfUnitsSupplierProposals=Quantités présentes en demande de prix
+NumberOfUnitsSupplierOrders=Quantités  présentes dans les commandes fournisseurs
+NumberOfUnitsSupplierInvoices=Quantités présentes sur les factures fournisseurs
 EMailTextInterventionAddedContact=Une nouvelle intervention %s vous a été assignée
 EMailTextInterventionValidated=La fiche intervention %s vous concernant a été validée.
 EMailTextInvoiceValidated=La facture %s vous concernant a été validée.
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index 34553656359..51f26eb28d8 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Espace projets
 ProjectStatus=Statut projet
 SharedProject=Tout le monde
 PrivateProject=Contacts projet
+ProjectsImContactFor=Projets dont je suis un contact explicite
+AllAllowedProjects=Tout projet que je peux lire (les miens + public)
+AllProjects=Tous les projets
 MyProjectsDesc=Cette vue projet est restreinte aux projets pour lesquels vous êtes un contact affecté (quel qu'en soit le type).
 ProjectsPublicDesc=Cette vue présente tous les projets pour lesquels vous êtes habilité à avoir une visibilité.
 TasksOnProjectsPublicDesc=Cette vue affiche toutes les tâches de projets selon vos permissions utilisateur
@@ -23,6 +26,7 @@ TasksDesc=Cette vue présente tous les projets et tâches (vos habilitations vou
 AllTaskVisibleButEditIfYouAreAssigned=Toutes les tâches d'un tel projet sont visibles mais il n'est possible de saisir du temps passé que sur celles qui vous sont assignées.\nAssignez vous la tache pour pouvoir saisir un temps passé.
 OnlyYourTaskAreVisible=Seules les tâches qui vous sont assignées sont visibles. Assignez vous une tâche pour la voir et saisir du temps passé
 ImportDatasetTasks=Tâches des projets
+ProjectCategories=Catégories/tags de projet
 NewProject=Nouveau projet
 AddProject=Créer projet
 DeleteAProject=Supprimer un projet
@@ -37,6 +41,7 @@ ShowProject=Afficher projet
 SetProject=Définir projet
 NoProject=Aucun projet défini ou responsable
 NbOfProjects=Nombre de projets
+NbOfTasks=Nb de tâches
 TimeSpent=Temps consommé
 TimeSpentByYou=Temps consommé par vous
 TimeSpentByUser=Temps consommé par utilisateur
@@ -47,9 +52,9 @@ TaskTimeSpent=Temps consommé sur les tâches
 TaskTimeUser=Utilisateur
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tâches sur projets ouverts
+TasksOnOpenedProject=Tâches sur les projets ouverts
 WorkloadNotDefined=Charge de travail non définie
-NewTimeSpent=Nouveau consommé
+NewTimeSpent=Temps consommés
 MyTimeSpent=Mon consommé
 Tasks=Tâches
 Task=Tâche
@@ -59,6 +64,7 @@ TaskDescription=Description de la tâche
 NewTask=Nouvelle tâche
 AddTask=Créer tâche
 AddTimeSpent=Saisir temps consommé
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Activité
 Activities=Tâches/activités
 MyActivities=Mes tâches/activités
@@ -78,8 +84,8 @@ ListPredefinedInvoicesAssociatedProject=Liste des modèles de facture client ass
 ListSupplierOrdersAssociatedProject=Liste des commandes fournisseurs associées au projet
 ListSupplierInvoicesAssociatedProject=Liste des factures fournisseurs associées au projet
 ListContractAssociatedProject=Liste des contrats associés au projet
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=Liste des interventions associées au projet
-ListShippingAssociatedProject=Liste des expéditions associées au projet
 ListExpenseReportsAssociatedProject=Liste des notes de frais associées avec ce projet
 ListDonationsAssociatedProject=Liste des dons associés au projet
 ListActionsAssociatedProject=Liste des événements associés au projet
@@ -103,6 +109,7 @@ ConfirmReOpenAProject=Êtes-vous sûr de vouloir rouvrir ce projet ?
 ProjectContact=Contacts projet
 ActionsOnProject=Événements sur le projet
 YouAreNotContactOfProject=Vous n'êtes pas contact de ce projet privé
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Suppression du temps consommé
 ConfirmDeleteATimeSpent=Êtes-vous sûr de vouloir supprimer ce temps consommé ?
 DoNotShowMyTasksOnly=Voir aussi les tâches qui ne me sont pas affectées
@@ -111,7 +118,7 @@ TaskRessourceLinks=Ressources
 ProjectsDedicatedToThisThirdParty=Projets dédiés à ce tiers
 NoTasks=Aucune tâche pour ce projet
 LinkedToAnotherCompany=Liés à autre société
-TaskIsNotAffectedToYou=Tâche qui ne vous sont pas affectées
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=Le temps consommé n'est pas renseigné
 ThisWillAlsoRemoveTasks=Cette opération détruira également les tâches du projet (<b>%s</b> tâches actuellement) et le suivi des consommés.
 IfNeedToUseOhterObjectKeepEmpty=Si des objets (facture, commande, ...), appartenant à un autre tiers que celui choisi, doivent être liés au projet à créer, laisser vide afin de laisser le projet multi-tiers.
@@ -162,21 +169,26 @@ FirstAddRessourceToAllocateTime=Affecter un utilisateur pour saisir des temps
 InputPerDay=Saisie par jour
 InputPerWeek=Saisie par semaine
 InputPerAction=Saisie par action
-TimeAlreadyRecorded=Temps consommé déjà enregistré pour cette tâche/jour et utilisateur %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projets avec cet utilisateur comme contact
 TasksWithThisUserAsContact=Tâches assignées à cet utilisateur
 ResourceNotAssignedToProject=Non assigné à un projet
 ResourceNotAssignedToTheTask=Non assigné à la tache
+TasksAssignedTo=Tâches assignées à
 AssignTaskToMe=M'assigner la tâche
+AssignTaskToUser=Tâche assignée à %s
+SelectTaskToAssign=Sélectionnez la tâche à assigner
 AssignTask=Assigner
 ProjectOverview=Vue d'ensemble
 ManageTasks=Utiliser les projets pour suivre les tâches
 ManageOpportunitiesStatus=Utiliser les projets pour suivre les affaires / opportunités
 ProjectNbProjectByMonth=Nb de projets créés par mois
+ProjectNbTaskByMonth=Nb de tâches créées par mois
 ProjectOppAmountOfProjectsByMonth=Montant des opportunités par mois
 ProjectWeightedOppAmountOfProjectsByMonth=Montant pondéré des opportunités par mois
 ProjectOpenedProjectByOppStatus=Opportunités/affaires ouvertes par statut
 ProjectsStatistics=Statistics sur les projets
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Tâche assignée. La saisie de temps sur cette tâche devrait être possible.
 IdTaskTime=Id ligne de temps
 YouCanCompleteRef=SI vous souhaitez compléter la référence avec d'autres informations filtrables, il est recommandé d'ajouter le caractère - entre les données. La numérotation automatique sera alors fonctionnelle pour le prochain compteur. Par exemple %s-ABC. Il est également possible d'ajouter des mots-clés dans le libellé. Il est cependant recommandé d'utiliser un attribut supplémentaire ou extrafield.
diff --git a/htdocs/langs/fr_NC/projects.lang b/htdocs/langs/fr_NC/projects.lang
index 34553656359..d36e44c7248 100644
--- a/htdocs/langs/fr_NC/projects.lang
+++ b/htdocs/langs/fr_NC/projects.lang
@@ -1,197 +1,5 @@
 # Dolibarr language file - Source file is en_US - projects
-RefProject=Réf. projet
-ProjectRef=Ref projet
-ProjectId=Id projet
-ProjectLabel=Libellé projet
-Project=Projet
-Projects=Projets
-ProjectsArea=Espace projets
-ProjectStatus=Statut projet
-SharedProject=Tout le monde
-PrivateProject=Contacts projet
-MyProjectsDesc=Cette vue projet est restreinte aux projets pour lesquels vous êtes un contact affecté (quel qu'en soit le type).
-ProjectsPublicDesc=Cette vue présente tous les projets pour lesquels vous êtes habilité à avoir une visibilité.
-TasksOnProjectsPublicDesc=Cette vue affiche toutes les tâches de projets selon vos permissions utilisateur
-ProjectsPublicTaskDesc=Cette vue présente tous les projets et tâches pour lesquels vous êtes habilité à avoir une visibilité.
-ProjectsDesc=Cette vue présente tous les projets (vos habilitations vous offrant une vue exhaustive).
-TasksOnProjectsDesc=Cette vue présente toutes les tâches sur tous les projets (vos permissions d'utilisateur vous accordent la permission de voir tout).
-MyTasksDesc=Cette vue est restreinte aux projets et tâches pour lesquels vous êtes un contact affecté à au moins une tâche (quel qu'en soit le type).
-OnlyOpenedProject=Seuls les projets ouverts sont visibles (les projets à l'état brouillon ou fermé ne sont pas visibles).
-ClosedProjectsAreHidden=Les projets fermés ne sont pas visible.
-TasksPublicDesc=Cette vue présente tous les projets et tâches pour lesquels vous êtes habilité à avoir une visibilité.
-TasksDesc=Cette vue présente tous les projets et tâches (vos habilitations vous offrant une vue exhaustive).
-AllTaskVisibleButEditIfYouAreAssigned=Toutes les tâches d'un tel projet sont visibles mais il n'est possible de saisir du temps passé que sur celles qui vous sont assignées.\nAssignez vous la tache pour pouvoir saisir un temps passé.
-OnlyYourTaskAreVisible=Seules les tâches qui vous sont assignées sont visibles. Assignez vous une tâche pour la voir et saisir du temps passé
-ImportDatasetTasks=Tâches des projets
-NewProject=Nouveau projet
-AddProject=Créer projet
-DeleteAProject=Supprimer un projet
-DeleteATask=Supprimer une tâche
-ConfirmDeleteAProject=Êtes-vous sûr de vouloir supprimer ce projet ?
-ConfirmDeleteATask=Êtes-vous sûr de vouloir supprimer cette tâche ?
-OpenedProjects=Projets ouverts
-OpenedTasks=Tâches ouvertes
-OpportunitiesStatusForOpenedProjects=Montant des opportunités des projets ouverts par statut
-OpportunitiesStatusForProjects=Montant des opportunités des projets par statut
-ShowProject=Afficher projet
-SetProject=Définir projet
-NoProject=Aucun projet défini ou responsable
-NbOfProjects=Nombre de projets
-TimeSpent=Temps consommé
-TimeSpentByYou=Temps consommé par vous
-TimeSpentByUser=Temps consommé par utilisateur
-TimesSpent=Temps consommés
-RefTask=Ref. tâche
-LabelTask=Libellé tâche
-TaskTimeSpent=Temps consommé sur les tâches
-TaskTimeUser=Utilisateur
-TaskTimeNote=Note
-TaskTimeDate=Date
 TasksOnOpenedProject=Tâches sur projets ouverts
-WorkloadNotDefined=Charge de travail non définie
 NewTimeSpent=Nouveau consommé
-MyTimeSpent=Mon consommé
-Tasks=Tâches
-Task=Tâche
-TaskDateStart=Date de début de tâche
-TaskDateEnd=Date de fin de tâche
-TaskDescription=Description de la tâche
-NewTask=Nouvelle tâche
-AddTask=Créer tâche
-AddTimeSpent=Saisir temps consommé
-Activity=Activité
-Activities=Tâches/activités
-MyActivities=Mes tâches/activités
-MyProjects=Mes projets
-MyProjectsArea=Espace Mes projets
-DurationEffective=Durée effective
-ProgressDeclared=Progression déclarée
-ProgressCalculated=Progression calculée
-Time=Temps
-ListOfTasks=Liste de tâches
-GoToListOfTimeConsumed=Aller à la liste des temps consommés
-GoToListOfTasks=Aller à la liste des tâches
-ListProposalsAssociatedProject=Liste des propositions commerciales associées au projet
-ListOrdersAssociatedProject=Liste des commandes clients associées au projet
-ListInvoicesAssociatedProject=Liste des factures clients associées au projet
-ListPredefinedInvoicesAssociatedProject=Liste des modèles de facture client associées au projet
-ListSupplierOrdersAssociatedProject=Liste des commandes fournisseurs associées au projet
-ListSupplierInvoicesAssociatedProject=Liste des factures fournisseurs associées au projet
-ListContractAssociatedProject=Liste des contrats associés au projet
-ListFichinterAssociatedProject=Liste des interventions associées au projet
 ListShippingAssociatedProject=Liste des expéditions associées au projet
-ListExpenseReportsAssociatedProject=Liste des notes de frais associées avec ce projet
-ListDonationsAssociatedProject=Liste des dons associés au projet
-ListActionsAssociatedProject=Liste des événements associés au projet
-ListTaskTimeUserProject=Liste du temps consommé sur les tâches d'un projet
-ActivityOnProjectToday=Activité projet aujourd'hui
-ActivityOnProjectYesterday=Activité projet hier
-ActivityOnProjectThisWeek=Activité sur les projets cette semaine
-ActivityOnProjectThisMonth=Activité sur les projets ce mois
-ActivityOnProjectThisYear=Activité sur les projets cette année
-ChildOfTask=Fille du projet/tâche
-NotOwnerOfProject=Non responsable de ce projet privé
-AffectedTo=Affecté à
-CantRemoveProject=Ce projet ne peut être supprimé car il est référencé par de nombreux objets (factures, commandes ou autre). voir la liste sur l'onglet Reférents.
-ValidateProject=Valider projet
-ConfirmValidateProject=Êtes-vous sûr de vouloir valider ce projet ?
-CloseAProject=Clore projet
-ConfirmCloseAProject=Êtes-vous sûr de vouloir clore ce projet ?
-AlsoCloseAProject=Fermer également le projet (laissez-le ouvert si vous devez suivre la production de tâches dessus)
-ReOpenAProject=Réouvrir projet
-ConfirmReOpenAProject=Êtes-vous sûr de vouloir rouvrir ce projet ?
-ProjectContact=Contacts projet
-ActionsOnProject=Événements sur le projet
-YouAreNotContactOfProject=Vous n'êtes pas contact de ce projet privé
-DeleteATimeSpent=Suppression du temps consommé
-ConfirmDeleteATimeSpent=Êtes-vous sûr de vouloir supprimer ce temps consommé ?
-DoNotShowMyTasksOnly=Voir aussi les tâches qui ne me sont pas affectées
-ShowMyTasksOnly=Ne voir que les tâches qui me sont affectées
-TaskRessourceLinks=Ressources
-ProjectsDedicatedToThisThirdParty=Projets dédiés à ce tiers
-NoTasks=Aucune tâche pour ce projet
-LinkedToAnotherCompany=Liés à autre société
-TaskIsNotAffectedToYou=Tâche qui ne vous sont pas affectées
-ErrorTimeSpentIsEmpty=Le temps consommé n'est pas renseigné
-ThisWillAlsoRemoveTasks=Cette opération détruira également les tâches du projet (<b>%s</b> tâches actuellement) et le suivi des consommés.
-IfNeedToUseOhterObjectKeepEmpty=Si des objets (facture, commande, ...), appartenant à un autre tiers que celui choisi, doivent être liés au projet à créer, laisser vide afin de laisser le projet multi-tiers.
-CloneProject=Cloner le projet
-CloneTasks=Cloner les tâches
-CloneContacts=Cloner les contacts
-CloneNotes=Cloner les notes
-CloneProjectFiles=Cloner les pièces jointes du projet
-CloneTaskFiles=Cloner les pièces jointes des tâche(s) (si tâche(s) cloner)
-CloneMoveDate=Mettre à jour les dates projet/tâches à partir de maintenant
-ConfirmCloneProject=Êtes-vous sûr de vouloir cloner ce projet ?
-ProjectReportDate=Reporter les dates des tâches en fonction de la date de départ.
-ErrorShiftTaskDate=Une erreur s'est produite dans le report des dates des tâches.
-ProjectsAndTasksLines=Projets et tâches
-ProjectCreatedInDolibarr=Projet %s créé
-ProjectModifiedInDolibarr=Projet %s modifié
-TaskCreatedInDolibarr=Tâche %s créée
-TaskModifiedInDolibarr=Tâche %s modifiée
-TaskDeletedInDolibarr=Tâche %s supprimée
-OpportunityStatus=Statut opportunité
-OpportunityStatusShort=Status opp.
-OpportunityProbability=Probabilité d'opportunité
-OpportunityProbabilityShort=Prob. opp.
-OpportunityAmount=Montant opportunité
-OpportunityAmountShort=Montant Opp.
-OpportunityAmountAverageShort=montant moyen des opportunités
-OpportunityAmountWeigthedShort=Montant pondéré des opportunités
-WonLostExcluded=hors opportunités remportées/perdues
-##### Types de contacts #####
-TypeContact_project_internal_PROJECTLEADER=Chef de projet
-TypeContact_project_external_PROJECTLEADER=Chef de projet
-TypeContact_project_internal_PROJECTCONTRIBUTOR=Contributeur
-TypeContact_project_external_PROJECTCONTRIBUTOR=Contributeur
-TypeContact_project_task_internal_TASKEXECUTIVE=Responsable
-TypeContact_project_task_external_TASKEXECUTIVE=Responsable
-TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributeur
-TypeContact_project_task_external_TASKCONTRIBUTOR=Contributeur
-SelectElement=Séléctionnez l'élément
-AddElement=Associer l'élément
-# Documents models
-DocumentModelBeluga=Modèle de document de rapport pour l'aperçu projet
-DocumentModelBaleine=Modèles de document de rapport de tâches de projets
-PlannedWorkload=Charge de travail prévue
-PlannedWorkloadShort=Charge de travail
-ProjectReferers=Objets associés
-ProjectMustBeValidatedFirst=Le projet doit être validé d'abord
-FirstAddRessourceToAllocateTime=Affecter un utilisateur pour saisir des temps
-InputPerDay=Saisie par jour
-InputPerWeek=Saisie par semaine
-InputPerAction=Saisie par action
 TimeAlreadyRecorded=Temps consommé déjà enregistré pour cette tâche/jour et utilisateur %s
-ProjectsWithThisUserAsContact=Projets avec cet utilisateur comme contact
-TasksWithThisUserAsContact=Tâches assignées à cet utilisateur
-ResourceNotAssignedToProject=Non assigné à un projet
-ResourceNotAssignedToTheTask=Non assigné à la tache
-AssignTaskToMe=M'assigner la tâche
-AssignTask=Assigner
-ProjectOverview=Vue d'ensemble
-ManageTasks=Utiliser les projets pour suivre les tâches
-ManageOpportunitiesStatus=Utiliser les projets pour suivre les affaires / opportunités
-ProjectNbProjectByMonth=Nb de projets créés par mois
-ProjectOppAmountOfProjectsByMonth=Montant des opportunités par mois
-ProjectWeightedOppAmountOfProjectsByMonth=Montant pondéré des opportunités par mois
-ProjectOpenedProjectByOppStatus=Opportunités/affaires ouvertes par statut
-ProjectsStatistics=Statistics sur les projets
-TaskAssignedToEnterTime=Tâche assignée. La saisie de temps sur cette tâche devrait être possible.
-IdTaskTime=Id ligne de temps
-YouCanCompleteRef=SI vous souhaitez compléter la référence avec d'autres informations filtrables, il est recommandé d'ajouter le caractère - entre les données. La numérotation automatique sera alors fonctionnelle pour le prochain compteur. Par exemple %s-ABC. Il est également possible d'ajouter des mots-clés dans le libellé. Il est cependant recommandé d'utiliser un attribut supplémentaire ou extrafield.
-OpenedProjectsByThirdparties=Projets ouverts par tiers
-OnlyOpportunitiesShort=Opportunités uniquement
-OpenedOpportunitiesShort=Opportunités ouvertes
-NotAnOpportunityShort=Non une opportunité
-OpportunityTotalAmount=Montant total des opportunités
-OpportunityPonderatedAmount=Montant pondéré des opportunités
-OpportunityPonderatedAmountDesc=Montant des opportunités pondéré par la probabilité
-OppStatusPROSP=Prospection
-OppStatusQUAL=Qualification
-OppStatusPROPO=Proposition
-OppStatusNEGO=Négociation
-OppStatusPENDING=En attente
-OppStatusWON=Gagné
-OppStatusLOST=Perdu
-Budget=Budget
diff --git a/htdocs/langs/fr_NC/sendings.lang b/htdocs/langs/fr_NC/sendings.lang
deleted file mode 100644
index 5c3974dc11c..00000000000
--- a/htdocs/langs/fr_NC/sendings.lang
+++ /dev/null
@@ -1,71 +0,0 @@
-# Dolibarr language file - Source file is en_US - sendings
-RefSending=Réf. expédition
-Sending=Expédition
-Sendings=Expéditions
-AllSendings=Toutes les expéditions
-Shipment=Expédition
-Shipments=Expéditions
-ShowSending=Afficher Expéditions
-Receivings=Bons de réceptions
-SendingsArea=Espace expéditions
-ListOfSendings=Liste des expéditions
-SendingMethod=Méthode d'expédition
-LastSendings=Les %s dernières expéditions
-StatisticsOfSendings=Statistiques des expéditions
-NbOfSendings=Nombre d'expéditions
-NumberOfShipmentsByMonth=Nombre d'expéditions par mois
-SendingCard=Fiche expédition
-NewSending=Nouvelle expédition
-CreateShipment=Créer expédition
-QtyShipped=Qté. expédiée
-QtyPreparedOrShipped=Quantité préparée ou envoyée
-QtyToShip=Qté. à expédier
-QtyReceived=Qté. reçue
-QtyInOtherShipments=Qté dans les autres expéditions
-KeepToShip=Reste à expédier
-OtherSendingsForSameOrder=Autres expéditions pour cette commande
-SendingsAndReceivingForSameOrder=Expéditions et réceptions pour cette commande
-SendingsToValidate=Expéditions à valider
-StatusSendingCanceled=Annulée
-StatusSendingDraft=Brouillon
-StatusSendingValidated=Validée (produits à envoyer ou envoyés)
-StatusSendingProcessed=Traitée
-StatusSendingDraftShort=Brouillon
-StatusSendingValidatedShort=Validée
-StatusSendingProcessedShort=Traitée
-SendingSheet=Fiche expédition
-ConfirmDeleteSending=Êtes-vous sûr de vouloir supprimer cette expédition ?
-ConfirmValidateSending=Êtes-vous sûr de vouloir valider cette expédition sous la référence <b>%s</b>?
-ConfirmCancelSending=Êtes-vous sûr de vouloir annuler cette expédition ?
-DocumentModelSimple=Modèle simple
-DocumentModelMerou=Modèle Merou A5
-WarningNoQtyLeftToSend=Alerte, aucun produit en attente d'expédition.
-StatsOnShipmentsOnlyValidated=Statistiques effectuées sur les expéditions validées uniquement. La date prise en compte est la date de validation (la date de prévision de livraison n'étant pas toujours renseignée).
-DateDeliveryPlanned=Date prévue de livraison
-RefDeliveryReceipt=Ref bon de réception
-StatusReceipt=Status du bon de réception
-DateReceived=Date de réception réelle
-SendShippingByEMail=Envoyer bon d'expédition par email
-SendShippingRef=Envoi du bordereau d'expédition %s
-ActionsOnShipping=Événements sur l'expédition
-LinkToTrackYourPackage=Lien pour le suivi de votre colis
-ShipmentCreationIsDoneFromOrder=Pour le moment, la création d'une nouvelle expédition se fait depuis la fiche commande.
-ShipmentLine=Ligne d'expédition
-ProductQtyInCustomersOrdersRunning=Quantité de produit en commandes client ouvertes
-ProductQtyInSuppliersOrdersRunning=Quantité de produit en commandes fournisseur ouvertes
-ProductQtyInShipmentAlreadySent=Quantité du produit parmi les commandes clients déjà envoyées
-ProductQtyInSuppliersShipmentAlreadyRecevied=Quantité de produit déjà reçu en commandes fournisseur ouvertes
-NoProductToShipFoundIntoStock=Aucun produit à expédier n'a été trouver dans l'entrepôt <b>%s</b>. Corrigez l'inventaire ou retourner choisir un autre entrepôt.
-WeightVolShort=Poids/vol.
-ValidateOrderFirstBeforeShipment=Vous devez d'abord valider la commande pour pouvoir créer une expédition.
-
-# Sending methods
-# ModelDocument
-DocumentModelTyphon=Modèle de bon de réception/livraison complet (logo…)
-Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constante EXPEDITION_ADDON_NUMBER non définie
-SumOfProductVolumes=Somme des volumes des produits
-SumOfProductWeights=Somme des poids des produits
-
-# warehouse details
-DetailWarehouseNumber= Détail de l'entrepôt
-DetailWarehouseFormat= W:%s (Qté : %d)
diff --git a/htdocs/langs/he_IL/accountancy.lang b/htdocs/langs/he_IL/accountancy.lang
index 4c2336b97b0..31b54e83c5b 100644
--- a/htdocs/langs/he_IL/accountancy.lang
+++ b/htdocs/langs/he_IL/accountancy.lang
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=General ledger
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
@@ -132,19 +140,19 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=List of the accounting accounts
 
 Pcgtype=Class of account
-Pcgsubtype=Under class of account
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Code
+Nature=Nature
+AccountingJournalType1=Various operation
+AccountingJournalType2=Sales
+AccountingJournalType3=Purchases
+AccountingJournalType4=Bank
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Exports
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index db1cace6b2c..de6406b1bf7 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=משתמשים פנימיים
 ExternalUsers=משתמשים חיצוניים
 GUISetup=להציג
 SetupArea=הגדרת האזור
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=טופס לבדוק העלאת קובץ (על פי ההגדרה)
 IfModuleEnabled=הערה: כן, הוא יעיל רק אם <b>%s</b> מודול מופעלת
 RemoveLock=הסר קבצים <b>%s</b> אם היא קיימת כדי לאפשר שימוש בכלי העדכון.
@@ -85,7 +86,7 @@ Mask=מסכה
 NextValue=לאחר מכן ערך
 NextValueForInvoices=הערך הבא (חשבוניות)
 NextValueForCreditNotes=הערך הבא (הערות אשראי)
-NextValueForDeposit=Next value (deposit)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Next value (replacements)
 MustBeLowerThanPHPLimit=הערה: PHP שלך מגביל גודל כל קובץ של ההעלאה כדי %s <b>%s,</b> מה הערך של פרמטר זה הוא
 NoMaxSizeByPHPLimit=הערה: אין גבול מוגדר בתצורת שלך PHP
@@ -103,7 +104,7 @@ MenuIdParent=התפריט ההורה מזהה
 DetailMenuIdParent=תעודת הזהות של ההורה התפריט (0 עבור התפריט העליון)
 DetailPosition=מיין במספר להגדיר מיקום תפריט
 AllMenus=כל
-NotConfigured=מודול לא מוגדר
+NotConfigured=Module/Application not configured
 Active=פעיל
 SetupShort=הגדרת
 OtherOptions=אפשרויות אחרות
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=אלף מפריד
 Destination=Destination
 IdModule=Module ID
 IdPermissions=Permissions ID
-Modules=מודולים
 LanguageBrowserParameter=פרמטר %s
 LocalisationDolibarrParameters=Localisation פרמטרים
 ClientTZ=Client Time Zone (user)
@@ -123,7 +123,8 @@ PHPTZ=אזור זמן PHP שרת
 DaylingSavingTime=שעון קיץ (משתמש)
 CurrentHour=שעה PHP (שרת)
 CurrentSessionTimeOut=ההפעלה הנוכחית פסק זמן
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max number of lines for widgets
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=הרשאות
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=האלמנטים היחידים של <a href="%s">מודולים המאפשרים</a> מוצגים.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=מאגר המידע הסיסמה מוצפן ב c
 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=הגנה על קבצי PDF שנוצרו הופעל (לא מומלץ, שובר את הדור המונית pdf)
-ProtectAndEncryptPdfFilesDesc=הגנה על מסמך PDF שומר אותו לזמין לקרוא ולהדפיס עם כל דפדפן PDF. עם זאת, עריכת והעתקה אינו אפשרי עוד. שים לב כי השימוש בתכונה זו את בניית PDF המצטבר העולמי לא עובד (כמו חשבוניות שלא שולמו).
+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=תכונה
 DolibarrLicense=רשיון
 Developpers=מפתחים / תורמים
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr הדגמה מקוון
 OfficialMarketPlace=שוק המקום הרשמי של מודולים / addons חיצוניים
 OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
 ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=עבור המשתמש או תיעוד של מפתח (דוק, שאלות ...) <br> תסתכל על ויקי Dolibarr: <br> <a href="%s" target="_blank"><b>%s</b></a>
 ForAnswersSeeForum=אם יש לך שאלות נוספות / עזרה, אתה יכול להשתמש בפורום Dolibarr: <br> <a href="%s" target="_blank"><b>%s</b></a>
 HelpCenterDesc1=שטח זה יכול לעזור לך לקבל תמיכה ועזרה שירות Dolibarr.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=תכונה לא זמינה כמו מערכות יונ
 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/
 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=מודול ההתקנה
-ModulesSetup=מודולים ההתקנה
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=מערכת
 ModuleFamilyCrm=קשרי לקוחות (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=Dolibarr הגרסה הנוכחית
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Update server offline
+WithCounter=Manage a counter
 GenericMaskCodes=אתה רשאי להיכנס לכל מסכת מספור. במסכת זו, התגים הבאים יכול לשמש: <br> <b>{000000}</b> המתאים למספר אשר יהיה מוגדל על %s כל אחד. הזן כמו אפסים רבים ככל האורך הרצוי של הדלפק. נגד יושלם עד אפסים משמאל כדי שיהיה כמו אפסים רבים ככל המסכה. <br> <b>{000} 000000</b> זהה לקודם, אך קוזז המתאים למספר בצד ימין של סימן + מיושם החל מיום %s הראשונים. <br> <b>{000000 @ x}</b> זהה לקודם אבל הדלפק מתאפס לאפס כאשר x חודש הוא הגיע (x בין 1 ל 12 או 0 כדי להשתמש בחודשים הראשונים של שנת הכספים מוגדרת בהגדרות שלך). אם אפשרות זו בשימוש, x הוא 2 או יותר, אז רצף {yy} {מ&quot;מ} או {yyyy} {מ&quot;מ} נדרש גם. <br> <b>Dd {}</b> היום (01 עד 31). <br> <b>{מ&quot;מ}</b> החודש (01 עד 12). <br> <b>{Yy}, {yyyy}</b> או <b>{y}</b> השנה על 2, 4 או 1 מספרים. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=כל הדמויות האחרות מסכת יישאר ללא שינוי. <br> מקומות אסורים. <br>
-GenericMaskCodes4a=<u>למשל על %s 99 של צד שלישי TheCompany לעשות 2007/01/31:</u> <br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>למשל על צד שלישי נוצר 2007/03/01:</u> <br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC {yy} {מ&quot;מ} - {000000}</b> ייתן <b>ABC0701-000099</b> <br> <b>{0000} 100-zzz / dd {} / XXX</b> ייתן <b>0199-ZZZ/31/XXX</b>
+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=להחזיר מספר להתאמה אישית על פי מסכת מוגדר.
 ServerAvailableOnIPOrPort=שרת זמין בכתובת <b>%s</b> כתובת ביציאה <b>%s</b>
 ServerNotAvailableOnIPOrPort=השרת אינו זמין <b>%s</b> כתובת ביציאה <b>%s</b>
@@ -369,19 +375,21 @@ Int=Integer
 Float=Float
 DateAndTime=Date and hour
 Unique=Unique
-Boolean=Boolean (Checkbox)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Phone
 ExtrafieldPrice = Price
 ExtrafieldMail = Email
 ExtrafieldUrl = Url
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=סיסמה
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldRadio=Radio buttons (on 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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Field
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=משתמשים להקות
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=חשבוניות וניהול הערת אשראי ללקוחות. 
 Module40Name=ספקים
 Module40Desc=הספק של ניהול הקנייה (הזמנות וחשבוניות)
 Module42Name=יומנים
-Module42Desc=מתקני רישום (קובץ, syslog, ...)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=העורכים
 Module49Desc=עורך ההנהלה
 Module50Name=מוצרים
@@ -499,8 +521,8 @@ Module410Name=לוח השנה
 Module410Desc=שילוב לוח השנה
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=הודעות
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind המרות יכולות
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
-Module4000Desc=Human resources management
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=רב החברה
 Module5000Desc=מאפשר לך לנהל מספר רב של חברות
 Module6000Name=Workflow
@@ -591,7 +615,7 @@ Permission32=צור / לשנות מוצרים
 Permission34=מחק מוצרים
 Permission36=ראה / ניהול מוצרים מוסתרים
 Permission38=ייצוא מוצרים
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=מחק פרויקטים (פרויקט משותף פרויקטים אני לפנות לקבלת)
 Permission45=Export projects
@@ -844,12 +868,14 @@ DictionaryOrderMethods=הזמנת שיטות
 DictionarySource=מקור הצעות / הזמנות
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Emails templates
 DictionaryUnits=Units
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=הגדרת הציל
+SetupNotSaved=Setup not saved
 BackToModuleList=חזרה לרשימת מודולים
 BackToDictionaryList=חזרה לרשימת המילונים
 VATManagement=מע&quot;מ ניהול
@@ -921,7 +947,7 @@ Host=שרת
 DriverType=הנהג סוג
 SummarySystem=מערכת מידע סיכום
 SummaryConst=רשימה של כל הפרמטרים ההתקנה Dolibarr
-MenuCompanySetup=החברה / קרן
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= התפריט הסטנדרטי מנהל
 DefaultMenuSmartphoneManager=התפריט החכם המנהל
 Skin=העור נושא
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Default max length for lists
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=המסר של היום
 MessageLogin=התחברות הודעה בדף
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=חפש בצורה קבועה בתפריט השמאלי
 DefaultLanguage=ברירת המחדל של השפה להשתמש (קוד שפה)
 EnableMultilangInterface=אפשר ממשק רב לשוני
 EnableShowLogo=הצג את הלוגו בתפריט השמאלי
-CompanyInfo=החברה / בסיס מידע
-CompanyIds=החברה / קרן זהויות
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=שם
 CompanyAddress=כתובת
 CompanyZip=רוכסן
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=עיכוב סובלנות (בימים) לפני התר
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=עיכוב סובלנות (בימים) לפני התראה על הפקדת המחאות לעשות
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=ערכים אחרים לנהל את התפריט פרמטרים אופציונליים.
 LogEvents=ביקורת אבטחה אירועים
 Audit=ביקורת
@@ -987,7 +1015,7 @@ BrowserOS=Browser OS
 ListOfSecurityEvents=רשימת אירועים Dolibarr הביטחון
 SecurityEventsPurged=אירועים ביטחוניים מטוהר
 LogEventDesc=ניתן להפעיל כאן בכניסה לאירועים Dolibarr הביטחון. מנהלים יכולים לראות את התוכן שלה באמצעות <b>כלי מערכת</b> התפריטים <b>- הביקורת.</b> אזהרה, תכונה זו יכולה לצרוך כמות גדולה של נתונים במסד נתונים.
-AreaForAdminOnly=תכונות אלה יכולים לשמש את <b>המשתמשים מנהל</b> בלבד.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=מערכת מידע הוא מידע טכני שונות נכנסת למצב קריאה בלבד ונראה לעין עבור מנהלי בלבד.
 SystemAreaForAdminOnly=אזור זה זמין עבור המשתמשים מנהל בלבד. אף אחד הרשאות Dolibarr יכול להפחית את המגבלה.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists 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
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Professional מזהה ייחודי
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=הקישור ייצוא לפורמט <b>%s</b> זמין בקישור הבא: %s
 ##### Invoices #####
 BillsSetup=חשבוניות ההתקנה מודול
 BillsNumberingModule=חשבוניות ושטרי אשראי המונים מודול
 BillsPDFModules=חשבוניות ומסמכים מודלים
+PaymentsPDFModules=Payment documents models
 CreditNote=כתב זכויות
 CreditNotes=אשראי הערות
 ForceInvoiceDate=להכריח את תאריך החשבונית עד כה אימות
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
 FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
 FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
 CacheByServer=Cache by server
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
+CompressionOfResourcesDesc=For exemple 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 your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=מוצרים מודול ההתקנה
 ServiceSetup=מודול שירותי התקנה
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=תאריך חשבונית שימוש
 Buy=לקנות
 Sell=למכור
 InvoiceDateUsed=תאריך חשבונית שימוש
-YourCompanyDoesNotUseVAT=החברה שלך הוגדר לא להשתמש מע&quot;מ (דף הבית - התקנה - החברה / קרן), כך שאין אפשרויות מע&quot;מ ההתקנה.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=חשבונאות קוד
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=לחץ כדי לחייג ההתקנה מודול
-ClickToDialUrlDesc=כתובת האתר נקרא כאשר לחיצה על הטלפון picto נעשה. ב-URL, ניתן להשתמש בתגיות <br> <b>__PHONETO__</b> כי יוחלף מספר הטלפון של אדם לקרוא <br> <b>__PHONEFROM__</b> כי יוחלף מספר הטלפון של אדם קורא (שלך) <br> <b>__LOGIN__</b> כי יוחלפו התחברות clicktodial שלך (המוגדר בכרטיס המשתמש שלך) <br> <b>__PASS__</b> כי יוחלף עם הסיסמה clicktodial שלך (המוגדר בכרטיס המשתמש שלך).
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 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.
 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 same computer than 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.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+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.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=התצוגה כללי סדר
 BankOrderES=ספרדית
 BankOrderESDesc=התצוגה ספרדית כדי
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=רב החברה מודול ההתקנה
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ 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.
 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.
-ConfFileMuseContainCustom=Installing 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)
 TextTitleColor=Color of page title
 LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/he_IL/compta.lang b/htdocs/langs/he_IL/compta.lang
index ae9d9019fb1..a009e65313f 100644
--- a/htdocs/langs/he_IL/compta.lang
+++ b/htdocs/langs/he_IL/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using r
 Param=הגדרת
 RemainingAmountPayment=Amount payment remaining :
 Account=Account
-Accountparent=Account parent
-Accountsparent=Accounts parent
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=Income
 Outcome=Expense
 ReportInOut=Income / Expense
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Taxes and dividends
 MenuSocialContributions=Social/fiscal taxes
 MenuNewSocialContribution=New social/fiscal tax
 NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Accountancy/Treasury area
 NewPayment=New payment
@@ -134,8 +135,8 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from clients.<br>- It is based on the payment date of these invoices<br>
-DepositsAreNotIncluded=- Deposit invoices are nor included
-DepositsAreIncluded=- Deposit invoices are included
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
 VATReport=VAT report
@@ -169,7 +170,7 @@ DescSellsJournal=Sales Journal
 DescPurchasesJournal=Purchases Journal
 InvoiceRef=Invoice ref.
 CodeNotDef=Not defined
-WarningDepositsNotIncluded=Deposits invoices are not included in this version with this accountancy module.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
 Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
@@ -189,8 +190,10 @@ AccountancyJournal=Accountancy code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/he_IL/cron.lang b/htdocs/langs/he_IL/cron.lang
index b1e8bcb36d2..245fefe7af1 100644
--- a/htdocs/langs/he_IL/cron.lang
+++ b/htdocs/langs/he_IL/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allow to execute job that have been planned
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Job
 CronNone=None
 CronDtStart=Not before
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
-CronClassFile=Classes (filename.class.php)
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=From
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/he_IL/errors.lang b/htdocs/langs/he_IL/errors.lang
index 9e2eb6817ef..feada2d1b5a 100644
--- a/htdocs/langs/he_IL/errors.lang
+++ b/htdocs/langs/he_IL/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
 ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
 ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
 ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
 ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Some required fields were not filled.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoice
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # 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.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice
 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/he_IL/main.lang b/htdocs/langs/he_IL/main.lang
index 794af723739..3d2bca74f3b 100644
--- a/htdocs/langs/he_IL/main.lang
+++ b/htdocs/langs/he_IL/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=Parameter %s not defined
 ErrorUnknown=Unknown error
 ErrorSQL=SQL Error
 ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=Go to Module setup to fix this
 ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
 ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
@@ -153,6 +153,7 @@ Edit=Edit
 Validate=Validate
 ValidateAndApprove=Validate and Approve
 ToValidate=To validate
+NotValidated=Not validated
 Save=Save
 SaveAs=Save As
 TestConnection=Test connection
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=No applicative disconnect feature with authenticatio
 Connection=Connection
 Setup=הגדרת
 Alert=Alert
+MenuWarnings=התראות
 Previous=Previous
 Next=Next
 Cards=Cards
@@ -308,6 +310,7 @@ Copy=Copy
 Paste=Paste
 Default=Default
 DefaultValue=Default value
+DefaultValues=Default values
 Price=Price
 UnitPrice=Unit price
 UnitPriceHT=Unit price (net)
@@ -363,7 +366,8 @@ VATRate=Tax Rate
 Average=Average
 Sum=Sum
 Delta=Delta
-Module=Module
+Module=Module/Application
+Modules=Modules/Applications
 Option=Option
 List=List
 FullList=Full list
@@ -387,7 +391,7 @@ ActionRunningNotStarted=To start
 ActionRunningShort=In progress
 ActionDoneShort=Finished
 ActionUncomplete=Uncomplete
-CompanyFoundation=החברה / קרן
+CompanyFoundation=Company/Organisation
 ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
@@ -405,8 +409,9 @@ Generate=Generate
 Duration=Duration
 TotalDuration=Total duration
 Summary=Summary
-DolibarrStateBoard=Statistics
-DolibarrWorkBoard=Work tasks board
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=Available
 NotYetAvailable=Not yet available
 NotAvailable=Not available
@@ -434,7 +439,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Opened
+Opened=Open
 New=New
 Discount=Discount
 Unknown=לא ידוע
@@ -453,6 +458,7 @@ NextStep=Next step
 Datas=נתונים
 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.
 Photo=Picture
@@ -606,7 +612,8 @@ PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
 Canceled=Canceled
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
+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
 Color=Color
 Documents=Linked files
@@ -642,6 +649,7 @@ FreeLineOfType=Free entry of type
 CloneMainAttributes=Clone object with its main attributes
 PDFMerge=PDF Merge
 Merge=Merge
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Show page to print main content area
 MenuManager=Menu manager
 WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only login <b>%s</b> is allowed to use application at the moment.
@@ -708,6 +716,7 @@ from=from
 toward=toward
 Access=Access
 SelectAction=Select action
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
 SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
 OriginFileName=Original filename
@@ -718,7 +727,7 @@ ViewPrivateNote=View notes
 XMoreLines=%s line(s) hidden
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
+SelectElementAndClick=Select an element and click %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
@@ -734,8 +743,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=מחק את השורה
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
@@ -755,11 +764,20 @@ Calendar=Calendar
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -817,5 +835,3 @@ SearchIntoContracts=חוזים
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/he_IL/other.lang b/htdocs/langs/he_IL/other.lang
index ba4a8398a3b..892ea707a92 100644
--- a/htdocs/langs/he_IL/other.lang
+++ b/htdocs/langs/he_IL/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=Date of birth
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Statistics in number of products/services units
-StatsByNumberOfEntities=Statistics in number of referring entities
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=The intervention %s has been validated.
 EMailTextInvoiceValidated=The invoice %s has been validated.
diff --git a/htdocs/langs/he_IL/projects.lang b/htdocs/langs/he_IL/projects.lang
index 3f2e1c48449..a2635adb0e9 100644
--- a/htdocs/langs/he_IL/projects.lang
+++ b/htdocs/langs/he_IL/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
 PrivateProject=Project contacts
+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 (whatever is the type).
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=New project
 AddProject=Create project
 DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Opened projects
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
 SetProject=Set project
 NoProject=No project defined or owned
 NbOfProjects=Nb of projects
+NbOfTasks=Nb of tasks
 TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
@@ -47,9 +52,9 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
-NewTimeSpent=New time spent
+NewTimeSpent=Time spent
 MyTimeSpent=My time spent
 Tasks=Tasks
 Task=Task
@@ -59,6 +64,7 @@ TaskDescription=Task description
 NewTask=New task
 AddTask=Create task
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Activity
 Activities=Tasks/activities
 MyActivities=My tasks/activities
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=List of contracts associated with the project
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
 ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
@@ -110,7 +118,7 @@ TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
-TaskIsNotAffectedToYou=Task not assigned to you
+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.
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
 ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/hr_HR/accountancy.lang b/htdocs/langs/hr_HR/accountancy.lang
index 896f98e2c24..a51023fdbec 100644
--- a/htdocs/langs/hr_HR/accountancy.lang
+++ b/htdocs/langs/hr_HR/accountancy.lang
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=Dodaj obračunski račun
 AccountAccounting=Obračunski račun
 AccountAccountingShort=Račun
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=General ledger
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Stanje računa
 
 CAHTF=Ukupna nabava dobavljača prije poreza
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
@@ -132,19 +140,19 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Broj komada
 TransactionNumShort=Num. transaction
-AccountingCategory=Obračunska kategorija
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Nije postavljeno
-DeleteMvt=Brisanje stavaka glavne knjige
+DeleteMvt=Delete Ledger lines
 DelYear=Godina za obrisati
 DelJournal=Dnevnik za obrisati
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Financijski izvještaj uključujući sve tipove plačanja po bankovnom računom
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=Popis obračunskih računa
 
 Pcgtype=Klasa računa
-Pcgsubtype=Podklasa računa
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Greška, ne možete obrisati obračunski račun jer je u upotrebi
 MvtNotCorrectlyBalanced=Kretanje nije točno balansirano. Potražno = %s. Dugovno = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Primjeni masovne kategorije
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Kod
+Nature=Vrsta
+AccountingJournalType1=Various operation
+AccountingJournalType2=Prodaja
+AccountingJournalType3=Nabava
+AccountingJournalType4=Banka
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Exports
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Izračunato
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=Podešeni format izvoza nije podržan
 BookeppingLineAlreayExists=Stavke već postoje u knjigovodstvu
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index 21ec7d6d56f..ac249be826f 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=Interni korisnici
 ExternalUsers=Vanjski korisnici
 GUISetup=Prikaz
 SetupArea=Sučelje postavki
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Obrazac za testiranje uploada datoteka (sukladno postavkama)
 IfModuleEnabled=Napomena: DA je efektivno samo ako je modul <b>%s</b> omogućen
 RemoveLock=makni datoteku <b>%s</b> ako postoji da biste omogučili korištenje alata za nadogradnju.
@@ -85,7 +86,7 @@ Mask=Maska
 NextValue=Sljedeća vrijednost
 NextValueForInvoices=Sljedeća vrijednost (računi)
 NextValueForCreditNotes=Sljedeća vrijednost (kreditne bilješke)
-NextValueForDeposit=Sljedeća vrijednost (polog)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Sljedeća vrijednost (zamjene)
 MustBeLowerThanPHPLimit=Napomena: vaš PHP limitira svaki upload datoteka većih od <b>%s</b> %s, bez obzira koja je vrijednost parametra
 NoMaxSizeByPHPLimit=Napomena: Limit nije podešen u vašoj PHP konfiguraciji
@@ -103,7 +104,7 @@ MenuIdParent=Matični izbornik ID
 DetailMenuIdParent=ID matičnog izbornika (prazno za top izbornik)
 DetailPosition=Redni broj za definiranje pozicije izbornika
 AllMenus=Svi
-NotConfigured=Modul nije konfiguriran
+NotConfigured=Module/Application not configured
 Active=Aktivan
 SetupShort=Postavke
 OtherOptions=Ostale opcije
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Separator tisučica
 Destination=Odredište
 IdModule=ID Modula
 IdPermissions=ID Dozvole
-Modules=Moduli
 LanguageBrowserParameter=Parametar %s
 LocalisationDolibarrParameters=Parametri prijevoda
 ClientTZ=Vremenska zona klijenta (korisnik)
@@ -123,7 +123,8 @@ PHPTZ=PHP server vremenska zona
 DaylingSavingTime=Ljetno računanje vremena
 CurrentHour=PHP Vrijem (server)
 CurrentSessionTimeOut=Trenutni istek sesije
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Dodatak
 Boxes=Dodaci
 MaxNbOfLinesForBoxes=Maksimalni broj linija u dodatku
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Prava pristupa
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Prikazani su samo elementi sa  <a href="%s">omogučenih modula</a>
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=Možete pronaći više modula za download na vanjskim internet web lokacijama 
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Lozinka baze enkriptirana u conf.php (Preporuče
 InstrucToEncodePass=Da biste imali kodiranu lozinku u <b>conf.php</b> datoteci, zamjenite red <br><b>$dolibarr_main_db_pass="...";</b><br>sa<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=Da biste imali čitljivu lozinku u <b>conf.php</b> datoteci, zamjenite red <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>sa<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Zaštita generiranih PDF datoteka (NIJE preporučeno aktiviranje, kvari masovno generiranje PDF-ova)
-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 make building of a global cumulated pdf not working (like unpaid invoices).
+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=Mogučnost
 DolibarrLicense=Licenca
 Developpers=Kreatori/suradnici
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr Online demo
 OfficialMarketPlace=Ovlaštena trgovina za vanjske module/dodatke
 OfficialWebHostingService=Preporučeni web hosting servisi (Cloud hosting)
 ReferencedPreferredPartners=Preferirani partneri
-OtherResources=Drugi resursi
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=Za korisničku ili razvojnu dokumentciju ( DOC, FAQ...)<br> pogledajte na Dolibarr Wiki-u:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=Za sva ostala pitanja/pomoć, obratite se na Dolibarr forumu:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Ovo sučelje vam može pomoći da dobijete pomoć Dolibarr servisa podrške
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=Mogučnost nije dostupna na UNIX-u. Testirajte sendma
 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/
 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=Podešavanje modula
-ModulesSetup=Podešavanje modula
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Sistem
 ModuleFamilyCrm=Upravljanje odnosima sa kupcima (CRM)
 ModuleFamilySrm=Upravljanje odnosima dobavljača (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=Trenutna verzija Dolibarr-a
 CallUpdatePage=Idite na stranicu koja nadograđuje strukturu baze i podatke: %s
 LastStableVersion=Zadnja stabilna verzija
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Nadogradi server offline
+WithCounter=Manage a counter
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Svi preostali znakovi u predlošku će ostati nepromjenjeni.<br>Razmak nije dozvoljen.<br>
-GenericMaskCodes4a=<u>Primjer na 99th %s Tvrtka komitenta je uradila 2007-01-31:</u><br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Primjer na komitentu kreiranog 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Primjer na proizvodu kreiranog 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> dati će <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> dati će <b>0199-ZZZ/31/XXX</b>
+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=Vraća prilagodljiv broj sukladno s definiranim predloškom.
 ServerAvailableOnIPOrPort=Server je dostupan na adresi <b>%s</b> na portu <b>%s</b>
 ServerNotAvailableOnIPOrPort=Server nije dostupan na adresi <b>%s</b> s portom <b>%s</b>
@@ -369,19 +375,21 @@ Int=Integer
 Float=Float
 DateAndTime=Date and hour
 Unique=Unique
-Boolean=Boolean (Checkbox)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Telefon
 ExtrafieldPrice = Cijena
 ExtrafieldMail = E-pošta
 ExtrafieldUrl = Url
 ExtrafieldSelect = Odaberi popis
 ExtrafieldSelectList = Odaberi iz tabele
-ExtrafieldSeparator=Separator
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Lozinka
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldRadio=Radio buttons (on choice only)
+ExtrafieldCheckBox=Checkboxes
+ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Poveži s objektom
+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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Koristi 3 koraka odobravanja kada je iznos (bez poreza) veći od...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Field
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Korisnici i grupe
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=Invoice and credit note management for customers. Invoice managemen
 Module40Name=Dobavljači
 Module40Desc=Upravljanje dobavljačima i nabava (narudžbe i računi)
 Module42Name=Dnevnici
-Module42Desc=Sadržaji dnevnika (datoteke, syslog, ...)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Urednici
 Module49Desc=Upravljanje urednicima
 Module50Name=Proizvodi
@@ -499,8 +521,8 @@ Module410Name=Web kalendar
 Module410Desc=Integracija web kalendara
 Module500Name=Specijalni troškovi
 Module500Desc=Upravljanje specijalnim troškovima (porezi, društveni ili fiskalni porezi, dividende)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Kredit
 Module520Desc=Upravljanje kreditima
 Module600Name=Obavijesti
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind mogućnosti konverzije
 Module3100Name=Skype
 Module3100Desc=Dodaj Skype gumb na kartice korisnika / komitenta / kontakata / članova
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
-Module4000Desc=Upravljanje ljudskim resursima
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi tvrtka
 Module5000Desc=Dozvoljava upravljanje multi tvrtkama
 Module6000Name=Tijek rada
@@ -591,7 +615,7 @@ Permission32=Kreiraj/izmjeni proizvod
 Permission34=Obriši proizvod
 Permission36=Pregled/upravljanje skrivenim proizvodima
 Permission38=izvoz proizvoda
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Obriši projekte (zajednički projekti i moji projekti)
 Permission45=Izvezi projekte
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Metode naručivanja
 DictionarySource=Porjeklo ponuda/narudžbi
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Modeli za grafikone računa
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Predlošci e-pošte
 DictionaryUnits=Jedinice
 DictionaryProspectStatus=Status prospekcije
 DictionaryHolidayTypes=Tipovi odsustva
 DictionaryOpportunityStatus=Status šanse za projekt/prednost
 SetupSaved=Postavi spremljeno
+SetupNotSaved=Setup not saved
 BackToModuleList=Povratak na popis modula
 BackToDictionaryList=Povratak na popis definicija
 VATManagement=Upravljanje PDV
@@ -921,7 +947,7 @@ Host=Server
 DriverType=Tip upr. programa
 SummarySystem=Sažetak informacija o sistemu
 SummaryConst=Popis svih Dolibarr parametara podešavanja
-MenuCompanySetup=Tvrtka/Zaklada
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= Upravitelj standardnog izbornika
 DefaultMenuSmartphoneManager=Upravitelj mobilnog izbornika
 Skin=Skin teme
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Zadana maks. dužina popisa
 DefaultMaxSizeShortList=Zadana maks. dužina za kratke popise ( npr. na kartici kupca)
 MessageOfDay=Poruka dana
 MessageLogin=Poruka na stranici za prijavu
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Stalni obrazac za pretraživanje na ljevom izborniku
 DefaultLanguage=Zadani jezik za korištenje (kod jezika)
 EnableMultilangInterface=Omogući višejezično sučelje
 EnableShowLogo=Prikaži logo na ljevom izborniku
-CompanyInfo=Informacije o tvrtci/zakladi
-CompanyIds=Identitet tvrtke/zaklade
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=Naziv
 CompanyAddress=Adresa
 CompanyZip=PBR
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerancija kašnjenja (u danima) prije obavijesti o z
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerancija kašnjenja (u danima) prije obavijesti za napraviti čekovne pologe
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerancija kašnjenja (u danima) prije obavijesti za odobravanje izvještaja troška
 SetupDescription1=Sučelje postavki je za inicijalnu podešavanje parametara prije korištenja Dolibarr-a.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Ostale stavke izbornika upravljaju dodatnim parametrima.
 LogEvents=Pregled sigurnosnih događaja
 Audit=Revizija
@@ -987,7 +1015,7 @@ BrowserOS=OS preglednika
 ListOfSecurityEvents=Popis Dolibarr sigurnosnih događaja
 SecurityEventsPurged=Sigurnosni događaji trajno obrisani
 LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Ove mogućnosti mogu se koristit samo od strane <b>administratora</b>.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=Novi prevedeni tekst za prikaz
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Ukupan broj aktiviranih modula : <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists in any language files
+TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Morate omogućiti barem 1 modul
 ClassNotFoundIntoPathWarning=Klasa %s nije pronađena u PHP putanji
 YesInSummer=Da u ljeto
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Stanje je trenutno %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Pravila za profesionalne ID
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Izvoz poveznice u <b>%s</b> formatu je dostupno na sljedećoj poveznici: %s
 ##### Invoices #####
 BillsSetup=Podešavanje modula računa
 BillsNumberingModule=Način označavanja računa i odobrenja
 BillsPDFModules=Model dokumenata računa
+PaymentsPDFModules=Payment documents models
 CreditNote=Odobrenje
 CreditNotes=Odobrenja
 ForceInvoiceDate=Forsiraj datum računa kao datum ovjere
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
 FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
 FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
 CacheByServer=Cache by server
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
+CompressionOfResourcesDesc=For exemple 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 your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Podešavanje modula proizvoda
 ServiceSetup=Podešavanje modula usluga
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Korišten datum računa
 Buy=Kupi
 Sell=Prodaj
 InvoiceDateUsed=Korišten datum računa
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=Konto
 AccountancyCodeSell=Konto prodaje
 AccountancyCodeBuy=Konto nabave
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Postavi automatski ovaj status u filter pretraživa
 AGENDA_DEFAULT_VIEW=Koji tab želite da se otvori kod odabira izbornika Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Podešavanje modula ClickToDial
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
+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.
 ClickToDialUseTelLink=Koristi samo "tel:" kod telefona
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than 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.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=Podešavanje API modula
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=Možete istražiti API na URL
+ApiExporerIs=You can explore and test the APIs at URL
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=API Key
 WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=Glavni red prikaza
 BankOrderES=Španjolski
 BankOrderESDesc=Španjolski red prikaza
 ChequeReceiptsNumberingModule=Način označavanja čekovnih primki
-
 ##### Multicompany #####
 MultiCompanySetup=Više poduzeća module podešavanje
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ BackupDumpWizard=Čarobnjak za izradu backup-a baze podataka
 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.
 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.
-ConfFileMuseContainCustom=Installing 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)
 TextTitleColor=Boja naslova stranice
 LinkColor=Boja poveznica
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Boja pozadine
 TopMenuBackgroundColor=Boja pozadine za gornji izbornik
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Stopa prodajnog poreza
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/hr_HR/compta.lang b/htdocs/langs/hr_HR/compta.lang
index 8db21d04355..cf920e14dcd 100644
--- a/htdocs/langs/hr_HR/compta.lang
+++ b/htdocs/langs/hr_HR/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Prikazani iznosi su izračunati korišten
 Param=Podešavanje
 RemainingAmountPayment=Preostali iznos za naplatu:
 Account=Račun
-Accountparent=Matični račun
-Accountsparent=Matični računi
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=Prihod
 Outcome=Trošak
 ReportInOut=Prihod / Trošak
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Porezi i dividende
 MenuSocialContributions=Društveni/fiskalni porezi
 MenuNewSocialContribution=Novi druš/fis porez
 NewSocialContribution=Novi društveni/fiskalni porez
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Društvni/fiskalni porez za platiti
 AccountancyTreasuryArea=Sučelje Računovodstva/Financija
 NewPayment=Novo plaćanje
@@ -134,8 +135,8 @@ RulesResultDue=- Uključuje neplačene račune, troškove, PDV, donacije bez obz
 RulesResultInOut=- Uključuje stvarne uplate po računima, troškove, PDV i plaće. <br>- Baziran je po datumu plaćanja računa, troškova, PDV-a i plaćama. Datum donacje za donacije.
 RulesCADue=- Uključuje dospjeće računa kupca bez obzira da li je plaćena ili ne.<br>- Baziran je po datumu ovjere tih računa.<br> 
 RulesCAIn=- Uključuje sva efektivna plaćanja računa zaprimljena od klijenata.<br>- Baziran je po datumu plaćanja tih računa<br>
-DepositsAreNotIncluded=- Računi pologa nisu uključeni
-DepositsAreIncluded=- Računi pologa su uključeni
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Izvještaj po IRPF komitenta
 LT1ReportByCustomersInInputOutputModeES=Izvještaj po RE komitenta
 VATReport=PDV izvještaj 
@@ -169,7 +170,7 @@ DescSellsJournal=Izvještaj prodaje
 DescPurchasesJournal=Izvještaj kupovine
 InvoiceRef=Ref. računa
 CodeNotDef=Nije definirano
-WarningDepositsNotIncluded=Računi depozita nisu uključeni u ovoj verziji s ovim računovodstvenim modulom
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Datum valute plaćanja ne može biti manji od datuma objekta.
 Pcg_version=Chart of accounts models
 Pcg_type=Pcg tip
@@ -189,8 +190,10 @@ AccountancyJournal=Kontni plan
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Kloniraj društveni/fiskalni porez
 ConfirmCloneTax=Potvrdi kloniranje plaćanja društvenog/fiskalnog poreza
 CloneTaxForNextMonth=Kloniraj za sljedeći mjesec
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Društveni/fiskalni porezi
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Greška: Nije pronađen bankovni račun
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/hr_HR/cron.lang b/htdocs/langs/hr_HR/cron.lang
index a6bfed3c88b..1beb4167616 100644
--- a/htdocs/langs/hr_HR/cron.lang
+++ b/htdocs/langs/hr_HR/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Obriši planirane zadatke
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Pokreni planirani posao
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Modul planiranih poslova omogućuje izvrsavanje poslova koji su planirani
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Posao
 CronNone=Nijedan
 CronDtStart=Ne prije
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Omogući
 CronStatusInactiveBtn=Onemogući
 CronTaskInactive=Ovaj posao je onemogućen
 CronId=ID
-CronClassFile=Klase (filename.class.php)
-CronModuleHelp=Naziv mape Dolibarr modula ( radi isto i s vanjskim Dolibarr modulom ). <BR> Na primjer za dohvat metodu od Dolibarr Product objekta /htdocs/<u>product</u>/class/product.class.php, vrijednost modula je <i>product</i>
-CronClassFileHelp=Naziv datoteke za učitavanje.<BR> Na primjer za dohvat metodu od Dolibarr Product objekta /htdocs/product/class/<u>product.class.php</u>, vrijednost naziva datoteke klase je <i>product.class.php</i>
-CronObjectHelp=Naziv objekta za učitavanje.<BR> Na primjer za dohvat metodu od Dolibarr Product objekta /htdocs/product/class/product.class.php, vrijednost naziva datoteke klase je <i>Product</i>
-CronMethodHelp=Metoda objekta za pokretanje.<BR> Na primjer za dohvat metode od Dolibarr Product objekta /htdocs/product/class/product.class.php, vrijednost metode je <i>fetch</i>
-CronArgsHelp=Argumenti metode.<BR> Na primjer za dohvat metodu od Dolibarr Product objekta /htdocs/product/class/product.class.php, vrijednost parametara može biti <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=Sistemska komanda za pokretanje
 CronCreateJob=Kreiraj novi planirani posao
 CronFrom=Od
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Idite na izbornik "Home - Admin tools - Schedule
 JobDisabled=Posao onemogućen
 MakeLocalDatabaseDumpShort=Lakalni backup baze
 MakeLocalDatabaseDump=Kreiraj lokalni backup baze
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/hr_HR/errors.lang b/htdocs/langs/hr_HR/errors.lang
index a7722d97d3c..14629ea74fa 100644
--- a/htdocs/langs/hr_HR/errors.lang
+++ b/htdocs/langs/hr_HR/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
 ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
 ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
 ErrorCashAccountAcceptsOnlyCashMoney=Ovaj bankovni račun je gotovinski račun, te kao takav prihvača samo gotovinske uplate.
 ErrorFromToAccountsMustDiffers=Izvorni i odredišni bankovni računi moraju biti različiti.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Some required fields were not filled.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoice
 ErrorWebServerUserHasNotPermission=Korisnički račun <b>%s</b> koji pokreće web server nema dozvolu za pokretanje
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # 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.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice
 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/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang
index 35bc4e304d4..02cac8e8b43 100644
--- a/htdocs/langs/hr_HR/main.lang
+++ b/htdocs/langs/hr_HR/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=Značajka %s nije određena
 ErrorUnknown=Nepoznata greška
 ErrorSQL=Greška na SQL-u
 ErrorLogoFileNotFound=Datoteka s logom '%s' nije pronađena
-ErrorGoToGlobalSetup=Idite na postavke 'Tvrtka/Zaklada' kako bi ste ovo popravili
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=Idite na postavke modula kako bi ste ovo popravili
 ErrorFailedToSendMail=Elektronska pošta nije poslana (pošiljatelj=%s, primatelj=%s)
 ErrorFileNotUploaded=Datoteka nije učitana. Proverite da veličina ne prelazi dozvoljenu, da imate slobodnog mjesta na disku i da u ovoj mapi nema datoteke sa istim imenom.
@@ -153,6 +153,7 @@ Edit=Uredi
 Validate=Ovjeri
 ValidateAndApprove=Ovjeri i odobri
 ToValidate=Za ovjeru
+NotValidated=Not validated
 Save=Spremi
 SaveAs=Spremi kao
 TestConnection=Provjera veze
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=Nema mogučnosti aplikativnog odspajanja s <b>%s</b>
 Connection=Veza
 Setup=Podešavanje
 Alert=Obavijest
+MenuWarnings=Obavijesti
 Previous=Prijašnji
 Next=Sljedeći
 Cards=Kartice
@@ -308,6 +310,7 @@ Copy=Kopiraj
 Paste=Zalijepi
 Default=Zadano
 DefaultValue=Zadana vrijednost
+DefaultValues=Default values
 Price=Cijena
 UnitPrice=Jedinična cijena
 UnitPriceHT=Jedinična cijena (neto)
@@ -363,7 +366,8 @@ VATRate=Stopa poreza
 Average=Prosjek
 Sum=Zbroj
 Delta=Delta
-Module=Modul
+Module=Module/Application
+Modules=Modules/Applications
 Option=Opcija
 List=Popis
 FullList=Kompletan popis
@@ -387,7 +391,7 @@ ActionRunningNotStarted=Za početi
 ActionRunningShort=In progress
 ActionDoneShort=Završeno
 ActionUncomplete=Nekompletno
-CompanyFoundation=Tvrtka/Zaklada
+CompanyFoundation=Company/Organisation
 ContactsForCompany=Kontakti komitenta
 ContactsAddressesForCompany=Kontakti/adrese komitenta
 AddressesForCompany=Adrese komitenta
@@ -405,8 +409,9 @@ Generate=Generiraj
 Duration=Trajanje
 TotalDuration=Ukupno trajanje
 Summary=Sažetak
-DolibarrStateBoard=Statistika
-DolibarrWorkBoard=Ploča radnih zadataka
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=Dostupno
 NotYetAvailable=Nije još dostupno
 NotAvailable=Nije dostupno
@@ -434,7 +439,7 @@ Reportings=Izvještavanje
 Draft=Skica
 Drafts=Skice
 Validated=Ovjereno
-Opened=Otvorena
+Opened=Otvori
 New=Novo
 Discount=Rabat
 Unknown=Nepoznat
@@ -453,6 +458,7 @@ NextStep=Sljedeći korak
 Datas=Podatak
 None=Niti jedan
 NoneF=Niti jedan
+NoneOrSeveral=None or several
 Late=Kasni
 LateDesc=Kašnjenje za definiranje ako podatak kasni ili ne ovisno o vašim postavkama. Tražite administratora da promjeni kašnjenje iz izbornika Naslovna - Podešavanje - Obavijesti.
 Photo=Slika
@@ -606,7 +612,8 @@ PartialWoman=Parcijalno
 TotalWoman=Ukupno
 NeverReceived=Nikad primljeno
 Canceled=Otkazano
-YouCanChangeValuesForThisListFromDictionarySetup=Možete promijeniti vrijednosti za ovaj popis kroz izbornik Podešavanje - definicije
+YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu Setup - Dictionaries
+YouCanChangeValuesForThisListFrom=You can change values for this list from menu %s
 YouCanSetDefaultValueInModuleSetup=Možete podesiti zadanu vrijednost koju koristite kada kreirate novi podatak u postavkama modula.
 Color=Boja
 Documents=Povezane datoteke
@@ -642,6 +649,7 @@ FreeLineOfType=Slobodan unos tipa
 CloneMainAttributes=Kloniraj objekt s svim glavnim atributima
 PDFMerge=Spoji PDF
 Merge=Spoji
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Prikaži stranicu za ispis
 MenuManager=Upravitelj izbornikom
 WarningYouAreInMaintenanceMode=Upozorenje, nalazite se u načinu održavanja, tako da samo prijava <b>%s</b> je dozvoljeno za korištenje aplikacije.
@@ -708,6 +716,7 @@ from=od
 toward=ispred
 Access=Pristup
 SelectAction=Odaberi akciju
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Koristi Ctrl+C za kopiranje u međuspremnik
 SaveUploadedFileWithMask=Spremite datoteku na server pod imenom  "<strong>%s</strong>" (u protivnom "%s")
 OriginFileName=Orginalna datoteka
@@ -718,7 +727,7 @@ ViewPrivateNote=Vidi napomene
 XMoreLines=%s stavaka(e) skriveno
 PublicUrl=Javni URL
 AddBox=Dodaj blok
-SelectElementAndClickRefresh=Odaberi element i klikni Osvježi
+SelectElementAndClick=Select an element and click %s
 PrintFile=Ispis datoteke %s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Idite na Home - Podešavanje - Tvrtka za promjenu logotipa ili idite na Home - Podešavanje - Prikaz za skrivanje.
@@ -734,8 +743,8 @@ Hello=Pozdrav
 Sincerely=Srdačno
 DeleteLine=Obriši stavku
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=PDF nije dostupan za generiranje dokumenta unutar označenih podataka
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Sučelje za datoteke stvorene masovnom akcijom
 ShowTempMassFilesArea=Prikaži sučelje datoteka stvorenih masovnom akcijom
@@ -755,11 +764,20 @@ Calendar=Kalendar
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Ponedjeljak
 Tuesday=Utorak
@@ -817,5 +835,3 @@ SearchIntoContracts=Ugovori
 SearchIntoCustomerShipments=Pošiljke kupcu
 SearchIntoExpenseReports=Izvještaji troška
 SearchIntoLeaves=Odsustva
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/hr_HR/other.lang b/htdocs/langs/hr_HR/other.lang
index db195747ddf..18169a54a4b 100644
--- a/htdocs/langs/hr_HR/other.lang
+++ b/htdocs/langs/hr_HR/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=Date of birth
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nPonudu __PROPREF__ ćete pronaći ovdje\n\n__PERSONALIZED__Srdačno\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Prof Id %s</b> je podatak ovisan o državi komitenta. <br> Na primjer, za zemlju <b>%s</b>, kod je <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Statistics in number of products/services units
-StatsByNumberOfEntities=Statistics in number of referring entities
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=The intervention %s has been validated.
 EMailTextInvoiceValidated=The invoice %s has been validated.
diff --git a/htdocs/langs/hr_HR/projects.lang b/htdocs/langs/hr_HR/projects.lang
index e5a8ce39356..84f15e8b191 100644
--- a/htdocs/langs/hr_HR/projects.lang
+++ b/htdocs/langs/hr_HR/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Sučelje projekata
 ProjectStatus=Status projekta
 SharedProject=Svi
 PrivateProject=Kontakti projekta
+ProjectsImContactFor=Projects I'm explicitely a contact of
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=Svi projekti
 MyProjectsDesc=Ovaj popis je ograničen samo na projekte gdje ste navedeni za kontakt ( bez obzira na tip)
 ProjectsPublicDesc=Ovaj popis predstavlja sve projekte za koje imate dozvolu.
 TasksOnProjectsPublicDesc=Ovaj popis predstavlja sve zadatke na projektima za koje imate dozvolu.
@@ -23,20 +26,22 @@ TasksDesc=Ovaj popis predstavlja sve projekte i zadatke (vaše korisničke dozvo
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=Novi projekt
 AddProject=Kreiraj projekt
 DeleteAProject=Izbriši projekt
 DeleteATask=Izbriši zadatak
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Opened projects
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpenedProjects=Otvoreni projekti
+OpenedTasks=Otvoreni zadaci
+OpportunitiesStatusForOpenedProjects=Mogući iznos otvorenih projekata po statusu
 OpportunitiesStatusForProjects=Iznos šanse za projekte po statusu
 ShowProject=Prikaži projekt
 SetProject=Postavi projekt
 NoProject=Nema definiranih ili vlastih projekata
 NbOfProjects=Br. projekata
+NbOfTasks=Nb of tasks
 TimeSpent=Vrijeme utrošeno
 TimeSpentByYou=Vaše utrošeno vrijeme
 TimeSpentByUser=Utrošeno vrijeme korisnika
@@ -47,9 +52,9 @@ TaskTimeSpent=Utrošeno vrijeme zadataka
 TaskTimeUser=Korisnik
 TaskTimeNote=Bilješka
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Zadaci u otvorenim projektima
 WorkloadNotDefined=Opterećenje nije definirano
-NewTimeSpent=Novo utrošeno vrijeme
+NewTimeSpent=Vrijeme utrošeno
 MyTimeSpent=Moje utrošeno vrijeme
 Tasks=Zadaci
 Task=Zadatak
@@ -59,6 +64,7 @@ TaskDescription=Opis zadatka
 NewTask=Novi zadatak
 AddTask=Kreiraj zadatak
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Aktivnost
 Activities=Zadaci/aktovnosti
 MyActivities=Moji zadaci/aktivnosti
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Popis ugovora povezanih sa projektom
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=Popis intervencija povezanih sa projektom
 ListExpenseReportsAssociatedProject=Popis izvještaja troškova povezanih sa projektom
 ListDonationsAssociatedProject=Popis donacija povezanih sa projektom
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Kontakti projekta
 ActionsOnProject=Događaji projekta
 YouAreNotContactOfProject=Niste kontakt za ovaj privatni projekti
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Obriši utrošeno vrijeme
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=Vidi također zadatke koji nisu dodjeljeni meni
@@ -110,7 +118,7 @@ TaskRessourceLinks=Resursi
 ProjectsDedicatedToThisThirdParty=Projekti posvećeni komitentu
 NoTasks=Nema zadataka u ovom projektu
 LinkedToAnotherCompany=Povezano s drugim komitentom
-TaskIsNotAffectedToYou=Zadatak nije dodjeljen vama
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=Utrošeno vrijeme je prazno
 ThisWillAlsoRemoveTasks=Ova akcija će također obrisati sve zadatke projekta (<b>%s</b> zadataka u ovom trenutku) i sve unose utrošenog vremena.
 IfNeedToUseOhterObjectKeepEmpty=Ako neki objekti (računi, narudžbe,...), pripadaju drugom komitentu, moraju biti povezani s projektom koji se kreira, ostavite prazno da bi projekt bio za više komitenata.
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Dodjeli korisnka u zadatak za alokaciju vremena
 InputPerDay=Unos po danu
 InputPerWeek=Unos po tjednu
 InputPerAction=Unos po akciji
-TimeAlreadyRecorded=Utrošeno vrijeme je već zabilježeno za ovaj zadatak/dan i za korisnika %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projekti s ovim korisnikom kao kontakt osoba
 TasksWithThisUserAsContact=Zadaci dodjeljeni korisniku
 ResourceNotAssignedToProject=Nije dodjeljen projektu
 ResourceNotAssignedToTheTask=Nije dodjeljen zadatku
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Dodjeli zadatak meni
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Dodjeli
 ProjectOverview=Pregled
 ManageTasks=Koristi projekte za pračenje zadataka i vremena 
 ManageOpportunitiesStatus=Koristi projekte za praćenje prednosti/šansi
 ProjectNbProjectByMonth=Br. kreiranih projektata po mjesecu 
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Iznos šansi po mjesecu
 ProjectWeightedOppAmountOfProjectsByMonth=Važniji iznosi šansi po mjesecu
 ProjectOpenedProjectByOppStatus=Otvoreni projekti/prednosti po statusu šanse
 ProjectsStatistics=Statistika po projektima/prednostima
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Zadatak dodjeljen. Unos vremena za zadatak je moguće.
 IdTaskTime=ID vre. zad.
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Samo šanse
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Otvorene šanse
 NotAnOpportunityShort=Nije šansa
 OpportunityTotalAmount=Ukupan iznos šansi
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/hu_HU/accountancy.lang b/htdocs/langs/hu_HU/accountancy.lang
index b602f003d38..497b3bcce71 100644
--- a/htdocs/langs/hu_HU/accountancy.lang
+++ b/htdocs/langs/hu_HU/accountancy.lang
@@ -3,8 +3,8 @@ ACCOUNTING_EXPORT_SEPARATORCSV=Oszlop határoló az export fájlhoz
 ACCOUNTING_EXPORT_DATE=Dátum formátuma az export fájlhoz
 ACCOUNTING_EXPORT_PIECE=Darabszám exportálása
 ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export globális számlákkal
-ACCOUNTING_EXPORT_LABEL=Export label
-ACCOUNTING_EXPORT_AMOUNT=Export amount
+ACCOUNTING_EXPORT_LABEL=Felíratok Exportálása
+ACCOUNTING_EXPORT_AMOUNT=Számlák Exportálása
 ACCOUNTING_EXPORT_DEVISE=Export currency
 Selectformat=Fájl formátumának kiválasztása
 ACCOUNTING_EXPORT_PREFIX_SPEC=Fájlnév előtagjának kiválasztása
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Számla
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=General ledger
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
@@ -132,19 +140,19 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=List of the accounting accounts
 
 Pcgtype=Számlaosztály
-Pcgsubtype=Under class of account
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Teljes eladási marzs
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Kód
+Nature=Természet
+AccountingJournalType1=Various operation
+AccountingJournalType2=Eladások
+AccountingJournalType3=Beszerzések
+AccountingJournalType4=Bank
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Export
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Számított
 Formula=Képlet
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index fa2ddb07122..2f228660c45 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=Belső felhasználók
 ExternalUsers=Külső felhasználók
 GUISetup=Kijelző
 SetupArea=Beállítási terület
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=A fájlfeltöltés tesztelésének űrlapja (beállítás szerint)
 IfModuleEnabled=Megjegyzés: az 'igen' csak akkor eredményes, ha a <b>%s</b> modul engedélyezve van 
 RemoveLock=A frissítőeszköz használatához törölje a következő fájlt, ha létezik: <b>%s</b>
@@ -85,7 +86,7 @@ Mask=Maszk
 NextValue=Következő érték
 NextValueForInvoices=Következő érték (számlák)
 NextValueForCreditNotes=Következő érték (jóváírás)
-NextValueForDeposit=Next value (deposit)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Next value (replacements)
 MustBeLowerThanPHPLimit=Megjegyzés: A PHP minden fájlfeltöltést <b>%s</b> %s méretre korlátoz, függetlenül ennek a paraméternek az értékétől
 NoMaxSizeByPHPLimit=Megjegyzés: A PHP konfigurációban nincs beállítva korlátozás
@@ -103,7 +104,7 @@ MenuIdParent=Szülő menü ID
 DetailMenuIdParent=Szülő menü azonosítója (a főmenü esetében üres)
 DetailPosition=A menü sorrendjét meghatározó szám
 AllMenus=Minden
-NotConfigured=A modul nincs konfigurálva
+NotConfigured=Module/Application not configured
 Active=Aktív
 SetupShort=Beállítás
 OtherOptions=Egyéb lehetőségek
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Ezer elválasztó
 Destination=Úticél
 IdModule=Module ID
 IdPermissions=Permissions ID
-Modules=Modulok
 LanguageBrowserParameter=Paraméter %s
 LocalisationDolibarrParameters=Lokalizációs paraméterek
 ClientTZ=Kliens időzónája (felhasználó)
@@ -123,7 +123,8 @@ PHPTZ=A PHP szerver időzónája
 DaylingSavingTime=Nyári időszámítás
 CurrentHour=PHP óra (szerver)
 CurrentSessionTimeOut=Jelenlegi munkamenet elévülési ideje
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgetek
 MaxNbOfLinesForBoxes=A widgetek által elfoglalt sorok száma max.
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Engedélyek
 BoxesDesc=A widgetek olyan elemek melyek segítségével egyes oldalak testreszabhatók. A widget ki/bekapcsolását a cél-oldal kiválasztásával az 'Aktiválás'-ra kattintva érheti el illetve a kukára kattintva kikapcsolhatja.
 OnlyActiveElementsAreShown=Csak a <a href="%s"> bekapcsolt modulok</a> elemei jelennek meg.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=Az interneten további modulokat találhat...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Titkosítsa az adatbázis jelszót a conf.php-ba
 InstrucToEncodePass=A jelszavak titkosításához a <b>conf.php</b>-ben cserélje ki a <br><b>$dolibarr_main_db_pass="...";</b><br>sort erre:<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=A generált pdf fájlok védelme (nem ajánlott aktiválni, mivel a tömeges pdf generálást ellehetetleníti)
-ProtectAndEncryptPdfFilesDesc=A PDF dokumentum védelme lehetővé teszi az olvasást és nyomtatást bármilyen PDF böngészőben. Azonban a dokumentum szerkesztése és másolása többé nem lesz lehetséges. Megjegyzendő, amennyiben ezt a szolgáltatást használja, a globális sorozatos pdf generálás nem fog működni (például kifizetetlen számlák).
+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=Funkció
 DolibarrLicense=Engedély
 Developpers=Fejlesztők / közreműködők
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr online demo
 OfficialMarketPlace=Hivatalos piactér külső modulok / kiegészítők számára
 OfficialWebHostingService=Referencia tárhely szolgáltatások (Cloud hosting)
 ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=A felhasználó vagy fejlesztői dokumentáció (doc, GYIK ...), <br> vessünk egy pillantást a Dolibarr Wiki: <br> <a href="%s" target="_blank"><b>%s</b></a>
 ForAnswersSeeForum=Ha bármilyen további kérdése / help, akkor használja a fórumot Dolibarr: <br> <a href="%s" target="_blank"><b>%s</b></a>
 HelpCenterDesc1=Ebben a részben a Dolibarral kapcsolatos segítségnyújtási szolgáltatást veheti igénybe.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=A szolgáltatás nem elérhető Unix szerű rendszere
 SubmitTranslation=Ha a fordítás nem teljes vagy hibákat talál, kijavíthatja a <b>langs/%s</b> könyvtárban található fájlokban és elküldheti a javítást a www.transifex.com/dolibarr-association/dolibarr/ címre
 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=Modul beállítása
-ModulesSetup=Modulok beállítása
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Rendszer
 ModuleFamilyCrm=Ügyfélkapcsolat kezelés (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=Dolibarr jelenlegi verziója
 CallUpdatePage=Lépjen az oldalra amiben az adatbázis struktúrát és adatokat frissíti: %s
 LastStableVersion=Utolsó stabil verzió
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=A szerver offline frissítése
+WithCounter=Manage a counter
 GenericMaskCodes=Megadhat bármilyen számozás maszk. Ebben a maszk, az alábbi címkék is használhatók: <br> <b>{000000}</b> felel meg egy számot, amelyet fogja megnövelni minden %s. Adja meg a nullákat, mint annyi a kívánt méretre a számláló. A számláló tölti nullákkal balról annak érdekében, hogy minél több nullák, mint a maszk. <br> <b>{000000} 000</b> ugyanaz, mint korábban, hanem ellensúlyozza számának megfelelő jobbra a + jel alkalmazzák kezdve az első %s. <br> <b>{000000} @ x</b> ugyanaz, mint korábban, de a számláló lenullázódik, ha havi x-ért (x 1 és 12 között, vagy 0 használni a korai hónapokban a pénzügyi év van megadva a konfiguráció). Ha ezt az opciót használjuk, és az x 2 vagy magasabb, akkor a sorozat nn {} {} vagy {mm yyyy}} {mm is szükség van. <br> <b>{} Dd</b> nap (01 31). <br> <b>{} Mm</b> hónap (01-12). <br> <b>Yy {}, {ÉÉÉÉ}</b> vagy <b>{} y</b> évben több mint 2, 4 vagy 1 számokat. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Az összes többi karakter a maszkban marad érintetlen. <br> A szóközök nem megengedettek. <br>
-GenericMaskCodes4a=<u>Példa a 99. %s a harmadik fél kész TheCompany 2007/01/31:</u> <br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Példa: a harmadik fél létre 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>
+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=Vissza szabható számot a meghatározott maszkot.
 ServerAvailableOnIPOrPort=Kiszolgálóhoz elérhető a címen <b>%s %s</b> porton
 ServerNotAvailableOnIPOrPort=A kiszolgáló nem elérhető címen <b>%s %s</b> porton
@@ -369,19 +375,21 @@ Int=Egész
 Float=Lebegőpontos
 DateAndTime=Dátum és idő
 Unique=Egyedi
-Boolean=Logikai (jelölőnégyzet)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Telefon
 ExtrafieldPrice = Ár
 ExtrafieldMail = E-mail
 ExtrafieldUrl = Cím
 ExtrafieldSelect = Kiválasztó lista
 ExtrafieldSelectList = Válassz a táblából
-ExtrafieldSeparator=Elválasztó
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Jelszó
-ExtrafieldCheckBox=Jelölőnégyzet
-ExtrafieldRadio=Választógomb
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldRadio=Radio buttons (on 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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Mező
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Felhasználók és csoportok
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=Ügyfél számlák és jóváírás, beszállítói számlák kezel
 Module40Name=Beszállítók
 Module40Desc=Szállító menedzsment és vásárlás (megrendelések és számlák)
 Module42Name=Naplók
-Module42Desc=Bejelentkezés létesítmények (fájl, syslog, ...)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Szerkesztők
 Module49Desc=Szerkesztő vezetése
 Module50Name=Termékek
@@ -499,8 +521,8 @@ Module410Name=WebCalendar
 Module410Desc=WebCalendar integráció
 Module500Name=Különleges költségek
 Module500Desc=Különleges kiadások (adók, szociális vagy pénzügyi adók, osztalék) kezelése
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Értesítések
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP MaxMind konverziók képességek
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
-Module4000Desc=Human resources management
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Több-cég
 Module5000Desc=Több vállalat kezelését teszi lehetővé
 Module6000Name=Workflow
@@ -591,7 +615,7 @@ Permission32=Létrehozza / módosítja termékek
 Permission34=Törlés termékek
 Permission36=Lásd / kezelhetik rejtett termékek
 Permission38=Export termékek
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Törlés projektek (közös projekt és a projektek vagyok contact)
 Permission45=Export projects
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Rendelés módjai
 DictionarySource=Származási javaslatok / megrendelések
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=E-mail sablonok
 DictionaryUnits=Egységek
 DictionaryProspectStatus=Ajánlat állapota
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Beállítás mentett
+SetupNotSaved=Setup not saved
 BackToModuleList=Visszalép a modulok listáját
 BackToDictionaryList=Visszalép a szótárak listája
 VATManagement=ÁFA kezelés
@@ -921,7 +947,7 @@ Host=Szerver
 DriverType=Vezető típus
 SummarySystem=Rendszer információk összefoglaló
 SummaryConst=List of all Dolibarr beállítási paraméterek
-MenuCompanySetup=Company / Alapítvány
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= Normál menü menedzser
 DefaultMenuSmartphoneManager=Smartphone Menükezelőben
 Skin=Bőr téma
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Default max length for lists
 DefaultMaxSizeShortList=Alapértelmezett maximális karakter-hossz egy rövid listában (pl. vevő adatlapon)
 MessageOfDay=A nap üzenete
 MessageLogin=Belépés oldalra üzenet
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Állandó keresési űrlapot baloldali menüben
 DefaultLanguage=Alapértelmezett nyelv használatát (nyelv kód)
 EnableMultilangInterface=Engedélyezze a többnyelvű interfész
 EnableShowLogo=Mutasd logo a bal menüben
-CompanyInfo=Cég / alapítvány adatai
-CompanyIds=Cég / alapítvány identitások
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=Név
 CompanyAddress=Cím
 CompanyZip=Zip
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerancia késleltetést (nap) előtt figyelmeztető
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerancia késedelem (nap) előtt figyelmeztetést ellenőrzések betét csinálni
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tűréshatár értéke (napokban) mielőtt figyelmeztetést küld a kiadási összesítések elfogadtatására
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=További bejegyzések kezelése menüben választható paramétereket.
 LogEvents=Biztonsági audit események
 Audit=Könyvvizsgálat
@@ -987,7 +1015,7 @@ BrowserOS=Browser OS
 ListOfSecurityEvents=Listája Dolibarr biztonsági események
 SecurityEventsPurged=Biztonsági események kitisztítják
 LogEventDesc=Itt tud belépni a Dolibarr eseményeire biztonságosa. A rendszergazdák láthatják annak tartalmát menün keresztül <b>Rendszereszközök - Audit.</b> Figyelem, ez a funkció nagy mennyiségű adatot dolgozhat fel az adatbázisban!
-AreaForAdminOnly=Ezeket a funkciókat lehet használni a <b>felhasználók</b> csak a <b>rendszergazda.</b>
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Rendszer információk különféle műszaki információkat kapunk a csak olvasható módban, és csak rendszergazdák számára látható.
 SystemAreaForAdminOnly=Ez a terület áll rendelkezésre a felhasználók csak rendszergazda. Egyik Dolibarr engedélyek csökkentheti ezt a határt.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists in any language files
+TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Legalább egy modult engedélyezni kell
 ClassNotFoundIntoPathWarning=A(z) %s osztály nem található a PHP útvonalon
 YesInSummer=Nyáron
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=A %s meghajtóprogram van használatban, ez a jelenleg elérhető legjobb.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Professzionális egyedi azonosító
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Az export linket <b>%s</b> formátumban elérhető a következő linkre: %s
 ##### Invoices #####
 BillsSetup=Számlák modul beállítása
 BillsNumberingModule=Számlák és jóváírási számozási modul
 BillsPDFModules=Számla dokumentumok modellek
+PaymentsPDFModules=Payment documents models
 CreditNote=Jóváírást
 CreditNotes=Jóváírási
 ForceInvoiceDate=Kényszer számla keltétől annak érvényességét
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=A HTTP szerver a %s típusú fájlok esetében nem használ
 FilesOfTypeCompressed=A HTTP szerver a %s típusú fájlokat tömöríti.
 FilesOfTypeNotCompressed=A HTTP szerver a %s típusú fájlokat nem tömöríti.
 CacheByServer=Cache by server
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache by browser
 CompressionOfResources=HTTP válaszok tömörítése
+CompressionOfResourcesDesc=For exemple 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 your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Termékek modul beállítása
 ServiceSetup=Szolgáltatások modul beállítása
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Számla dátuma használt
 Buy=Megvesz
 Sell=Eladás
 InvoiceDateUsed=Számla dátuma használt
-YourCompanyDoesNotUseVAT=A cég már meg, hogy nem használja ÁFA-t (Home - Beállítás - Company / Alapítvány), így nincs lehetőség ÁFA telepíteni.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=Számviteli kód
 AccountancyCodeSell=Eladás számviteli kódja
 AccountancyCodeBuy=Vétel számviteli kódja
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Kattintson a Tárcsázás modul beállítása
-ClickToDialUrlDesc=Url meghívásra, ha egy kattintás a telefonon Picto történik. Az URL, akkor a tag <br> <b>__PHONETO__</b> Hogy fogja helyettesíteni a telefonszámot hívott személynek <br> <b>__PHONEFROM__</b> Hogy váltják fel a hívó telefonszámát személy (a tiéd) <br> <b>__LOGIN__</b> Hogy váltják fel clicktodial login (azaz a felhasználói kártya) <br> <b>__PASS__</b> Hogy váltják a clicktodial jelszót (amelyeket a felhasználói kártya).
+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.
 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 same computer than 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.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+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.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=Általános megjelenítési sorrend
 BankOrderES=Spanyol
 BankOrderESDesc=Spanyol megjelenítési sorrend
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=Több cég setup modul
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ 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.
 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.
-ConfFileMuseContainCustom=Installing 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)
 TextTitleColor=Color of page title
 LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/hu_HU/compta.lang b/htdocs/langs/hu_HU/compta.lang
index 4225e7501cc..8bff007aad1 100644
--- a/htdocs/langs/hu_HU/compta.lang
+++ b/htdocs/langs/hu_HU/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using r
 Param=Beállítás
 RemainingAmountPayment=Összeg kifizetése még:
 Account=Fiók
-Accountparent=Account parent
-Accountsparent=Accounts parent
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=Jövedelem
 Outcome=Költség
 ReportInOut=Bevétel / Kiadás
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Adók és osztalék
 MenuSocialContributions=Social/fiscal taxes
 MenuNewSocialContribution=New social/fiscal tax
 NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Számviteli / Treasury területén
 NewPayment=Új fizetési
@@ -134,8 +135,8 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- Magában foglalja mindazokat a tényleges kifizetések kézhez kapott számlák az ügyfelektől. <br> - Ennek alapja a fizetési határidőn ilyen számlák <br>
-DepositsAreNotIncluded=- Befizetési számla nem tartalmazza
-DepositsAreIncluded=- Fizess számlák kerülnek
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Jelentés a harmadik fél IRPF
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
 VATReport=VAT report
@@ -169,7 +170,7 @@ DescSellsJournal=Értékesítési Journal
 DescPurchasesJournal=Vásárlások Journal
 InvoiceRef=Számla ref.
 CodeNotDef=Nem meghatározott
-WarningDepositsNotIncluded=Betétek számlák nem szerepelnek ebben a változatban a számviteli modul.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=A fizetés határideje nem lehet korábbi a tárgy dátumánál
 Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
@@ -189,8 +190,10 @@ AccountancyJournal=Accountancy code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Könyvelési periódus
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/hu_HU/cron.lang b/htdocs/langs/hu_HU/cron.lang
index 4ceeeda9fda..f942363f3c3 100644
--- a/htdocs/langs/hu_HU/cron.lang
+++ b/htdocs/langs/hu_HU/cron.lang
@@ -20,24 +20,24 @@ EnabledAndDisabled=Enabled and disabled
 CronLastOutput=Latest run output
 CronLastResult=Latest result code
 CronCommand=Command
-CronList=Scheduled jobs
+CronList=Időzített feladatok
 CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allow to execute job that have been planned
-CronTask=Job
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
+CronTask=Feladat
 CronNone=Nincs
-CronDtStart=Not before
-CronDtEnd=Not after
-CronDtNextLaunch=Next execution
-CronDtLastLaunch=Start date of latest execution
+CronDtStart=Nem hamarabb mint
+CronDtEnd=Nem később mint
+CronDtNextLaunch=Következő végrehajtás
+CronDtLastLaunch=Legutóbbi végrehajtás időpontja
 CronDtLastResult=End date of latest execution
 CronFrequency=Gyakoriság
-CronClass=Class
+CronClass=Osztály
 CronMethod=Módszer
 CronModule=Modul
-CronNoJobs=No jobs registered
+CronNoJobs=Nincsenek feladatok
 CronPriority=Prioritás
 CronLabel=Felirat
 CronNbRun=Nb. launch
@@ -49,20 +49,20 @@ CronAdd= Add jobs
 CronEvery=Execute job each
 CronObject=Instance/Object to create
 CronArgs=Paraméterek
-CronSaveSucess=Save successfully
+CronSaveSucess=Sikeres mentés
 CronNote=Megjegyzés
-CronFieldMandatory=Fields %s is mandatory
-CronErrEndDateStartDt=End date cannot be before start date
-CronStatusActiveBtn=Enable
+CronFieldMandatory=A %s mezőket kötelező kitölteni
+CronErrEndDateStartDt=A befejezés időpontja nem lehet hamarabb mint a kezdet
+CronStatusActiveBtn=Engedélyez
 CronStatusInactiveBtn=Letiltás
 CronTaskInactive=This job is disabled
 CronId=Id
-CronClassFile=Classes (filename.class.php)
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=Küldő
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/hu_HU/errors.lang b/htdocs/langs/hu_HU/errors.lang
index 2635aacb539..b35d06274d5 100644
--- a/htdocs/langs/hu_HU/errors.lang
+++ b/htdocs/langs/hu_HU/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Nem sikerült létrehozni a '<b>%s</b>' fájlt.
 ErrorFailToRenameDir=Nem sikerült átnevezni a '<b>%s</b>' könyvtárat '<b>%s</b>' -ra.
 ErrorFailToCreateDir=Nem sikerült létrehozni a '<b>%s</b>' könyvtárat.
 ErrorFailToDeleteDir=Nem sikerült törölni a '<b>%s</b>' könyvtárat.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=Ez a kapcsolat már definiálva van, mint az ilyen típusú kapcsolatot.
 ErrorCashAccountAcceptsOnlyCashMoney=Ez egy folyószámla, ezért csak készpénzes fizetési módot fogad el.
 ErrorFromToAccountsMustDiffers=A forrás és cél bankszámláknak különbözőeknek kell lenniük.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Nem sikerült írni a %s könyvtárba
 ErrorFoundBadEmailInFile=Talált rossz e-mail szintaxisa %s sorok fájlt (például az e-mail vonal %s %s =)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Néhány kötelezően kitöltendő mező még üres.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Nem sikerült létrehozni egy könyvtárat. Ellenőrizze, hogy a Web szerver felhasználó engedélyekkel rendelkezik, hogy ültesse át Dolibarr dokumentumok könyvtárba. Ha a paraméter <b>safe_mode</b> engedélyezve van ez a PHP-t, ellenőrizze, hogy Dolibarr PHP fájlok tulajdonosa a webszerver felhasználó (vagy csoport).
 ErrorNoMailDefinedForThisUser=Nincs megadva a felhasználó email címe
 ErrorFeatureNeedJavascript=A funkcó működéséhez Javascript aktiválására van szükség. A beállítások - képernyő részben beállíthatja.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoice
 ErrorWebServerUserHasNotPermission=Felhasználói fiók <b>%s</b> végrehajtására használnak web szerver nincs engedélye az adott
 ErrorNoActivatedBarcode=Nem vonalkód típus aktivált
 ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # 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.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice
 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/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang
index 74817be31c4..e72c33485a3 100644
--- a/htdocs/langs/hu_HU/main.lang
+++ b/htdocs/langs/hu_HU/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=%s paraméter nincs definiálva
 ErrorUnknown=Ismeretlen hiba
 ErrorSQL=SQL Hiba
 ErrorLogoFileNotFound='%s' logo fájl nincs meg
-ErrorGoToGlobalSetup=Menj a 'Cég/Alapítván' beállításokhoz a javítás érdekében
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=Menj a Modul beállításokhoz a javítás érdekében
 ErrorFailedToSendMail=Nemsikerült elküldeni a levelet (feladó=%s, címzett=%s)
 ErrorFileNotUploaded=A Fájl nem lett feltöltve. Ellenőrizd, hogy a méret nem haladja -e meg a maximum méretet, van -e elég szabad hely és hogy a célkönyvtárban nincs -e még egy ugyan ilyen nevü fájl.
@@ -153,6 +153,7 @@ Edit=Szerkesztés
 Validate=Hitelesítés
 ValidateAndApprove=Validate and Approve
 ToValidate=Hitelesyteni
+NotValidated=Not validated
 Save=Mentés
 SaveAs=Mentés másként
 TestConnection=Kapcsolat tesztelése
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=No applicative disconnect feature with authenticatio
 Connection=Kapcsolat
 Setup=Beállítás
 Alert=Figyelmeztetés
+MenuWarnings=Figyelmeztetések
 Previous=Előző
 Next=Következő
 Cards=Kártyák
@@ -308,6 +310,7 @@ Copy=Másolás
 Paste=Beillesztés
 Default=Alaptértelmezett
 DefaultValue=Alaptértelmezett érték
+DefaultValues=Default values
 Price=Ár
 UnitPrice=Egység ár
 UnitPriceHT=Egység ár (nettó)
@@ -363,7 +366,8 @@ VATRate=ÁFA érték
 Average=Átlag
 Sum=Szumma
 Delta=Delta
-Module=Modul
+Module=Module/Application
+Modules=Modules/Applications
 Option=Opció
 List=Lista
 FullList=Teljes lista
@@ -387,7 +391,7 @@ ActionRunningNotStarted=Nincs elkezdve
 ActionRunningShort=Folyamatban
 ActionDoneShort=Befejezett
 ActionUncomplete=Befejezetlen
-CompanyFoundation=Cég/Alapítvány
+CompanyFoundation=Company/Organisation
 ContactsForCompany=Kapcsolat/cím ehhez a harmadik félhez
 ContactsAddressesForCompany=Kapcsolat/cím ehhez a harmadik félhez
 AddressesForCompany=Cím ehhez a harmadik félhez
@@ -405,8 +409,9 @@ Generate=Generálás
 Duration=Időtartam
 TotalDuration=Teljes időtartam
 Summary=Összefoglalás
-DolibarrStateBoard=Statisztikák
-DolibarrWorkBoard=Munkafeladatok felület
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=Elérhető
 NotYetAvailable=Még nem elérhető
 NotAvailable=Nem elérhető
@@ -434,7 +439,7 @@ Reportings=Jelentés
 Draft=Piszkozat
 Drafts=Piszkozatok
 Validated=Hitelesítve
-Opened=Megnyitva
+Opened=Nyitott
 New=Új
 Discount=Kedvezmény
 Unknown=Ismeretlen
@@ -453,6 +458,7 @@ NextStep=Következő lépés
 Datas=Adat
 None=Nincs
 NoneF=Nincs
+NoneOrSeveral=None or several
 Late=Késő
 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.
 Photo=Kép
@@ -606,7 +612,8 @@ PartialWoman=Részleges
 TotalWoman=Összes
 NeverReceived=Soha nem került átvételre
 Canceled=Megszakítva
-YouCanChangeValuesForThisListFromDictionarySetup=A lista elemeit megváltoztathatja a menüben: Beállítások->Szótár
+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
 Color=Szín
 Documents=Kapcsolt fájlok
@@ -642,6 +649,7 @@ FreeLineOfType=Free entry of type
 CloneMainAttributes=Objektum klónozása a főbb jellemzőivel
 PDFMerge=PDF összeolvasztás
 Merge=Összeolvasztás
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Show page to print main content area
 MenuManager=Menü-menedzser
 WarningYouAreInMaintenanceMode=Figyelem, karbantartási mód, csak <b>%s</b> jelentkezhet be.
@@ -708,6 +716,7 @@ from=tól
 toward=felé
 Access=Hozzáférés
 SelectAction=Válasszon tevékenységet
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Használja a Ctrl+C kombinációt a vágólapra másoláshoz
 SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
 OriginFileName=Eredeti fájlnév
@@ -718,7 +727,7 @@ ViewPrivateNote=Megjegyzések
 XMoreLines=%s sor rejtve maradt
 PublicUrl=Nyílvános URL
 AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
+SelectElementAndClick=Select an element and click %s
 PrintFile=%s fájl nyomtatása
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
@@ -734,8 +743,8 @@ Hello=Hello
 Sincerely=Tisztelettel
 DeleteLine=Sor törlése
 ConfirmDeleteLine=Biztos, hogy törölni akarja ezt a sort ?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
@@ -755,11 +764,20 @@ Calendar=Naptár
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Közvetlen letöltés címe
 Download=Letöltés
 ActualizeCurrency=Árfolyam frissítése
 Fiscalyear=Fiscal year
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Hétfő
 Tuesday=Kedd
@@ -817,5 +835,3 @@ SearchIntoContracts=Szerződések
 SearchIntoCustomerShipments=Vásárlói kiszállítások
 SearchIntoExpenseReports=Költség kimutatások
 SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/hu_HU/other.lang b/htdocs/langs/hu_HU/other.lang
index 681fd608a8e..612007188e9 100644
--- a/htdocs/langs/hu_HU/other.lang
+++ b/htdocs/langs/hu_HU/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=Dátum a születési
 BirthdayAlertOn=Születésnaposok aktív
 BirthdayAlertOff=Születésnaposok inaktív
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=Beavatkozás validált
 Notify_FICHINTER_SENTBYMAIL=Beavatkozás küldése e-mailben
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=Ez egy <b>teszt</b> mail (a szó vizsgálatot kell vastag
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Prof Id %s</b> egy információs függően harmadik fél ország. <br> Például, az ország <b>%s,</b> ez <b>%s</b> kódot.
 DolibarrDemo=Dolibarr ERP / CRM demo
-StatsByNumberOfUnits=Statisztikák száma termékek / szolgáltatások egységek
-StatsByNumberOfEntities=Statisztikák száma utaló szervezetek
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=A beavatkozás %s nem érvényesítette.
 EMailTextInvoiceValidated=A számla %s nem érvényesítette.
diff --git a/htdocs/langs/hu_HU/projects.lang b/htdocs/langs/hu_HU/projects.lang
index 200f09562ea..b7066f448ed 100644
--- a/htdocs/langs/hu_HU/projects.lang
+++ b/htdocs/langs/hu_HU/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Mindenki
 PrivateProject=Projekt kapcsolatok
+ProjectsImContactFor=Projects I'm explicitely a contact of
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=Minden projekt
 MyProjectsDesc=Ez a nézet azokra a projektekre van korlátozva amivel valamilyen összefüggésben áll.
 ProjectsPublicDesc=Ez a nézet minden az ön által megtekinthető projektre van korlátozva.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=Ez a nézet minden projektet tartalmaz.
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=Új projekt
 AddProject=Create project
 DeleteAProject=Projekt törlése
 DeleteATask=Feladat törlése
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Opened projects
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Projektek mutatása
 SetProject=Projekt beállítása
 NoProject=Nincs létrehozott vagy tulajdonolt projekt
 NbOfProjects=Projektek száma
+NbOfTasks=Nb of tasks
 TimeSpent=Eltöltött idő
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
@@ -47,9 +52,9 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=Felhasználó
 TaskTimeNote=Megjegyzés
 TaskTimeDate=Dátum
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
-NewTimeSpent=Új eltöltött idő
+NewTimeSpent=Töltött idő
 MyTimeSpent=Az én eltöltött időm
 Tasks=Feladatok
 Task=Feladat
@@ -59,6 +64,7 @@ TaskDescription=Task description
 NewTask=Új feladat
 AddTask=Create task
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Aktivitás
 Activities=Feladatok/aktivitások
 MyActivities=Feladataim/Aktivitásaim
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=A projekthez tartozó szerződések listája
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=A projekthez tartozó intervenciók listája
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Projekt kapcsolatok
 ActionsOnProject=Projekteh tartozó cselekvések
 YouAreNotContactOfProject=Nem kapcsolata ennek a privát projektnek
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Eltöltött idő törlése
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
@@ -110,7 +118,7 @@ TaskRessourceLinks=Erőforrások
 ProjectsDedicatedToThisThirdParty=Harmadik félhnek dedikált projektek
 NoTasks=Nincs a projekthez tartozó feladat
 LinkedToAnotherCompany=Harmadik félhez kapcsolva
-TaskIsNotAffectedToYou=Task not assigned to you
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=Töltött idő üres
 ThisWillAlsoRemoveTasks=Ez a művelet is törli az összes feladatot a projekt <b>(%s</b> feladatokat a pillanatban), és az összes bemenet eltöltött idő.
 IfNeedToUseOhterObjectKeepEmpty=Ha egyes tárgyakat (számla, megrendelés, ...), amelyek egy másik harmadik félnek kell kapcsolódniuk a projekt létrehozásához, tartsa ezt az üres, hogy a projekt, hogy több harmadik fél.
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
 ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/id_ID/accountancy.lang b/htdocs/langs/id_ID/accountancy.lang
index 9d4337e6803..f2b698ffa73 100644
--- a/htdocs/langs/id_ID/accountancy.lang
+++ b/htdocs/langs/id_ID/accountancy.lang
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=Tambahkan sebuah akun akuntansi
 AccountAccounting=Akun akuntansi
 AccountAccountingShort=Akun
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=Buku besar
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Saldo akun
 
 CAHTF=Total pembelian pemasok sebelum pajak
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Jurnal Penjualan
@@ -132,19 +140,19 @@ Sens=Sen
 Codejournal=Jurnal
 NumPiece=Jumlah potongan
 TransactionNumShort=Num. transaction
-AccountingCategory=Kategori akuntansi
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Debet dan Kredit tidak boleh ada nilai di saat yg sama
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=Daftar akun-akun akunting
 
 Pcgtype=Class of account
-Pcgsubtype=Under class of account
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Total margin penjualan
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Kesalahan, Anda tidak dapat menghapus akun akuntansi ini karena digunakan
 MvtNotCorrectlyBalanced=Perpindahan tidak benar seimbang . Kredit = %s . Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Terapkan kategori secara massal
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Code
+Nature=Nature
+AccountingJournalType1=Various operation
+AccountingJournalType2=Sales
+AccountingJournalType3=Purchases
+AccountingJournalType4=Bank
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Ekspor
@@ -211,6 +231,7 @@ Modelcsv_ciel=Ekspor terhadap Sage Ceil Compta atau Compta Evolution
 Modelcsv_quadratus=Ekspor terhadap Quadratus QuadraCompta
 Modelcsv_ebp=Ekspor terhadap EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Terhitung
 Formula=Rumus
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=Format ekspor yang diseting tidak sesuai untuk halaman ini
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
index b089fc36ed8..d1a0ecc9941 100644
--- a/htdocs/langs/id_ID/admin.lang
+++ b/htdocs/langs/id_ID/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=Beberapa pengguna internal
 ExternalUsers=Beberapa pengguna eksternal
 GUISetup=Penampakan display
 SetupArea=Area setup
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Halaman percobaan untuk menunggah / upload file ( berdasarkan konfigurasi setup )
 IfModuleEnabled=Catatan: Ya ini efektif jika hanya module <b>%s</b> di hidupkan
 RemoveLock=Hapus file <b>%s</b> kalau sudah tersedia untuk diperbolehkan penggunaannya oleh update tool.
@@ -85,7 +86,7 @@ Mask=Topeng
 NextValue=Nilai berikutnya
 NextValueForInvoices=Nilai berikutnya (faktur)
 NextValueForCreditNotes=Nilai berikutnya (nota kredit)
-NextValueForDeposit=Next value (deposit)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Next value (replacements)
 MustBeLowerThanPHPLimit=Catatan: PHP Anda membatasi ukuran setiap file upload <b>untuk% s%</b> s, apa pun nilai parameter ini adalah
 NoMaxSizeByPHPLimit=Catatan: Tidak ada batas diatur dalam konfigurasi PHP Anda
@@ -103,7 +104,7 @@ MenuIdParent=Menu Induk ID
 DetailMenuIdParent=ID dari menu induk (kosong untuk menu atas)
 DetailPosition=Urutkan nomor untuk menentukan posisi menu
 AllMenus=Semua
-NotConfigured=Modul tidak dikonfigurasi
+NotConfigured=Module/Application not configured
 Active=Aktif
 SetupShort=Pengaturan
 OtherOptions=Pilihan lain
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Ribuan pemisah
 Destination=Destination
 IdModule=Module ID
 IdPermissions=Permissions ID
-Modules=Modul
 LanguageBrowserParameter=Parameter% s
 LocalisationDolibarrParameters=Parameter Lokalisasi
 ClientTZ=Zona Waktu Klien (Pengguna)
@@ -123,7 +123,8 @@ PHPTZ=Zona Waktu Server PHP
 DaylingSavingTime=Menghemat waktu siang hari
 CurrentHour=Jam PHP (Server)
 CurrentSessionTimeOut=Sesi sekarang habis waktu
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max number of lines for widgets
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Izin
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activat
 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 (Activated 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 make building of a global cumulated pdf not working (like unpaid invoices).
+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=Keistimewaan
 DolibarrLicense=Lisensi
 Developpers=Pembangun/Penyumbang
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr online demo
 OfficialMarketPlace=Official market place for external modules/addons
 OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
 ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your
 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/
 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=Setup Modul
-ModulesSetup=Setup Modul-Modul
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Sistem
 ModuleFamilyCrm=Customer Relation Management (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=Versi Dolibarr saat ini
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Update server offline
+WithCounter=Manage a counter
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
 ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
 ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
@@ -369,19 +375,21 @@ Int=Integer
 Float=Float
 DateAndTime=Date and hour
 Unique=Unik
-Boolean=Boolean (Checkbox)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Telepon
 ExtrafieldPrice = Harga
 ExtrafieldMail = Email
 ExtrafieldUrl = Url
 ExtrafieldSelect = Daftar Pilihan
 ExtrafieldSelectList = Pilih dari tabel
-ExtrafieldSeparator=Pembatas
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Kata kunci
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldRadio=Radio buttons (on 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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Field
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Pengguna & Grup
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=Invoice and credit note management for customers. Invoice managemen
 Module40Name=Pemasok
 Module40Desc=Supplier management and buying (orders and invoices)
 Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Produk
@@ -499,8 +521,8 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Notifikasi
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
-Module4000Desc=Human resources management
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow
@@ -591,7 +615,7 @@ Permission32=Membuat/Merubah produk
 Permission34=Menghapus Produk
 Permission36=See/manage hidden products
 Permission38=Export products
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects i'm contact for)
 Permission45=Export projects
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Emails templates
 DictionaryUnits=Units
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Setup saved
+SetupNotSaved=Setup not saved
 BackToModuleList=Kembali Ke Daftar Modul
 BackToDictionaryList=Back to dictionaries list
 VATManagement=VAT Management
@@ -921,7 +947,7 @@ Host=Server
 DriverType=Driver type
 SummarySystem=Ringkasan Sistem Informasi
 SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Foundation
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= Standard menu manager
 DefaultMenuSmartphoneManager=Smartphone menu manager
 Skin=Skin theme
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Default max length for lists
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=Berita Hari Ini
 MessageLogin=Login page message
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Tampilkan Logo dimenu kiri
-CompanyInfo=Company/foundation information
-CompanyIds=Company/foundation identities
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=Nama
 CompanyAddress=Alamat
 CompanyZip=Kode Pos
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Other menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Audit
@@ -987,7 +1015,7 @@ BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
 LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists 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
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Rules on Professional Ids
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####
 BillsSetup=Invoices module setup
 BillsNumberingModule=Invoices and credit notes numbering model
 BillsPDFModules=Invoice documents models
+PaymentsPDFModules=Payment documents models
 CreditNote=Catatan kredit
 CreditNotes=Credit notes
 ForceInvoiceDate=Force invoice date to validation date
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
 FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
 FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
 CacheByServer=Cache by server
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
+CompressionOfResourcesDesc=For exemple 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 your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Products module setup
 ServiceSetup=Services module setup
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Invoice date used
 Buy=Buy
 Sell=Sell
 InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=Accountancy Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+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 your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
+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.
 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 same computer than 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.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+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.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=General display order
 BankOrderES=Spanyol
 BankOrderESDesc=Spanish display order
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ 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.
 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.
-ConfFileMuseContainCustom=Installing 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)
 TextTitleColor=Color of page title
 LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/id_ID/compta.lang b/htdocs/langs/id_ID/compta.lang
index 6dfee813bf9..65bbb736dc8 100644
--- a/htdocs/langs/id_ID/compta.lang
+++ b/htdocs/langs/id_ID/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using r
 Param=Pengaturan
 RemainingAmountPayment=Amount payment remaining :
 Account=Akun
-Accountparent=Account parent
-Accountsparent=Accounts parent
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=Income
 Outcome=Expense
 ReportInOut=Income / Expense
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Taxes and dividends
 MenuSocialContributions=Social/fiscal taxes
 MenuNewSocialContribution=New social/fiscal tax
 NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Accountancy/Treasury area
 NewPayment=New payment
@@ -134,8 +135,8 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from clients.<br>- It is based on the payment date of these invoices<br>
-DepositsAreNotIncluded=- Deposit invoices are nor included
-DepositsAreIncluded=- Deposit invoices are included
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
 VATReport=VAT report
@@ -169,7 +170,7 @@ DescSellsJournal=Sales Journal
 DescPurchasesJournal=Purchases Journal
 InvoiceRef=Invoice ref.
 CodeNotDef=Not defined
-WarningDepositsNotIncluded=Deposits invoices are not included in this version with this accountancy module.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
 Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
@@ -189,8 +190,10 @@ AccountancyJournal=Accountancy code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/id_ID/cron.lang b/htdocs/langs/id_ID/cron.lang
index 40543fd4f96..03cb471fe75 100644
--- a/htdocs/langs/id_ID/cron.lang
+++ b/htdocs/langs/id_ID/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allow to execute job that have been planned
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Job
 CronNone=None
 CronDtStart=Not before
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
-CronClassFile=Classes (filename.class.php)
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=Dari
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/id_ID/errors.lang b/htdocs/langs/id_ID/errors.lang
index 9e2eb6817ef..feada2d1b5a 100644
--- a/htdocs/langs/id_ID/errors.lang
+++ b/htdocs/langs/id_ID/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
 ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
 ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
 ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
 ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Some required fields were not filled.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoice
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # 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.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice
 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/id_ID/main.lang b/htdocs/langs/id_ID/main.lang
index cfecf76ef70..74921a43c4b 100644
--- a/htdocs/langs/id_ID/main.lang
+++ b/htdocs/langs/id_ID/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=Parameter %s not defined
 ErrorUnknown=Unknown error
 ErrorSQL=SQL Error
 ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=Go to Module setup to fix this
 ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
 ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
@@ -153,6 +153,7 @@ Edit=Edit
 Validate=Validasi
 ValidateAndApprove=Validate and Approve
 ToValidate=Untuk divalidasi
+NotValidated=Not validated
 Save=Save
 SaveAs=Save As
 TestConnection=Test connection
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=No applicative disconnect feature with authenticatio
 Connection=Connection
 Setup=Pengaturan
 Alert=Alert
+MenuWarnings=Alerts
 Previous=Previous
 Next=Next
 Cards=Cards
@@ -308,6 +310,7 @@ Copy=Copy
 Paste=Paste
 Default=Default
 DefaultValue=Default value
+DefaultValues=Default values
 Price=Harga
 UnitPrice=Unit price
 UnitPriceHT=Unit price (net)
@@ -363,7 +366,8 @@ VATRate=Tax Rate
 Average=Average
 Sum=Sum
 Delta=Delta
-Module=Module
+Module=Module/Application
+Modules=Modules/Applications
 Option=Option
 List=Daftar
 FullList=Full list
@@ -387,7 +391,7 @@ ActionRunningNotStarted=To start
 ActionRunningShort=In progress
 ActionDoneShort=Finished
 ActionUncomplete=Uncomplete
-CompanyFoundation=Company/Foundation
+CompanyFoundation=Company/Organisation
 ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
@@ -405,8 +409,9 @@ Generate=Generate
 Duration=Duration
 TotalDuration=Total duration
 Summary=Summary
-DolibarrStateBoard=Statistics
-DolibarrWorkBoard=Work tasks board
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=Available
 NotYetAvailable=Not yet available
 NotAvailable=Tidak tersedia
@@ -434,7 +439,7 @@ Reportings=Reporting
 Draft=Konsep
 Drafts=Drafts
 Validated=Divalidasi
-Opened=Opened
+Opened=Open
 New=New
 Discount=Discount
 Unknown=Tidak diketahui
@@ -453,6 +458,7 @@ NextStep=Next step
 Datas=Data
 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.
 Photo=Picture
@@ -606,7 +612,8 @@ PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
 Canceled=Dibatalkan
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
+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
 Color=Color
 Documents=Linked files
@@ -642,6 +649,7 @@ FreeLineOfType=Free entry of type
 CloneMainAttributes=Clone object with its main attributes
 PDFMerge=PDF Merge
 Merge=Merge
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Show page to print main content area
 MenuManager=Menu manager
 WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only login <b>%s</b> is allowed to use application at the moment.
@@ -708,6 +716,7 @@ from=from
 toward=toward
 Access=Access
 SelectAction=Select action
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
 SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
 OriginFileName=Original filename
@@ -718,7 +727,7 @@ ViewPrivateNote=View notes
 XMoreLines=%s line(s) hidden
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
+SelectElementAndClick=Select an element and click %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
@@ -734,8 +743,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
@@ -755,11 +764,20 @@ Calendar=Kalender
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -817,5 +835,3 @@ SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Cuti
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/id_ID/other.lang b/htdocs/langs/id_ID/other.lang
index bed72a95198..fab58d6ceba 100644
--- a/htdocs/langs/id_ID/other.lang
+++ b/htdocs/langs/id_ID/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=Date of birth
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Statistics in number of products/services units
-StatsByNumberOfEntities=Statistics in number of referring entities
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=The intervention %s has been validated.
 EMailTextInvoiceValidated=The invoice %s has been validated.
diff --git a/htdocs/langs/id_ID/projects.lang b/htdocs/langs/id_ID/projects.lang
index 72821fbdf8a..efbeec7d156 100644
--- a/htdocs/langs/id_ID/projects.lang
+++ b/htdocs/langs/id_ID/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
 PrivateProject=Project contacts
+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 (whatever is the type).
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=New project
 AddProject=Create project
 DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Opened projects
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
 SetProject=Set project
 NoProject=No project defined or owned
 NbOfProjects=Nb of projects
+NbOfTasks=Nb of tasks
 TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
@@ -47,9 +52,9 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Tanggal
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
-NewTimeSpent=New time spent
+NewTimeSpent=Time spent
 MyTimeSpent=My time spent
 Tasks=Tasks
 Task=Task
@@ -59,6 +64,7 @@ TaskDescription=Task description
 NewTask=New task
 AddTask=Create task
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Activity
 Activities=Tasks/activities
 MyActivities=My tasks/activities
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=List of contracts associated with the project
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
 ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
@@ -110,7 +118,7 @@ TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
-TaskIsNotAffectedToYou=Task not assigned to you
+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.
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
 ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/is_IS/accountancy.lang b/htdocs/langs/is_IS/accountancy.lang
index f1254652032..5249dd2e7d0 100644
--- a/htdocs/langs/is_IS/accountancy.lang
+++ b/htdocs/langs/is_IS/accountancy.lang
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=General ledger
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
@@ -132,19 +140,19 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=List of the accounting accounts
 
 Pcgtype=Class of account
-Pcgsubtype=Under class of account
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Code
+Nature=Náttúra
+AccountingJournalType1=Various operation
+AccountingJournalType2=Velta
+AccountingJournalType3=Innkaup
+AccountingJournalType4=Bank
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Exports
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
index c63f2421390..b6ec2e652a5 100644
--- a/htdocs/langs/is_IS/admin.lang
+++ b/htdocs/langs/is_IS/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=Innri notendur
 ExternalUsers=Ytri notendur
 GUISetup=Skoða
 SetupArea=Skipulag svæðis
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form til að prófa skrá hlaða (samkvæmt skipulag)
 IfModuleEnabled=Ath: er já aðeins gild ef <b>einingin %s </b> er virkt
 RemoveLock=Fjarlægja <b>skrána %s </b> ef það er til staðar til að leyfa endurnýja tól.
@@ -85,7 +86,7 @@ Mask=Gríma
 NextValue=Næsta gildi
 NextValueForInvoices=Næsta gildi (reikningum)
 NextValueForCreditNotes=Næsta gildi (kredit athugasemdum)
-NextValueForDeposit=Next value (deposit)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Next value (replacements)
 MustBeLowerThanPHPLimit=Ath: PHP þínum takmörk Nýjustu's stærð hvor <b>til %s %</b> s, hvað sem viðfang 'gildi þetta er
 NoMaxSizeByPHPLimit=Ath: Ekki eru sett lágmörk á PHP uppsetningu þína
@@ -103,7 +104,7 @@ MenuIdParent=Parent Valmynd ID
 DetailMenuIdParent=Auðkenni Valmynd foreldri (0 til aðalvalmynd)
 DetailPosition=Raða númer til að tilgreina Valmynd stöðu
 AllMenus=All
-NotConfigured=Ekki stillt
+NotConfigured=Module/Application not configured
 Active=Virk
 SetupShort=Skipulag
 OtherOptions=Aðrir valkostir
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Thousand skiltákn
 Destination=Destination
 IdModule=Module ID
 IdPermissions=Permissions ID
-Modules=Modules
 LanguageBrowserParameter=Viðfang %s
 LocalisationDolibarrParameters=Staðsetning stika
 ClientTZ=Client Time Zone (user)
@@ -123,7 +123,8 @@ PHPTZ=Time Zone PHP miðlara
 DaylingSavingTime=Sumartíma (notandi)
 CurrentHour=PHP-miðlara klukkustund
 CurrentSessionTimeOut=Núverandi fundur tími
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max number of lines for widgets
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Heimildir
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Aðeins atriði frá <a href="%s">virkt einingar</a> eru birtar.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Gagnasafn lykilorð dulkóðuð í conf.php (Vir
 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=Verndun mynda pdf skrá (Virkja EKKI mælt, brýtur massi pdf-kynslóð)
-ProtectAndEncryptPdfFilesDesc=Verndun á PDF skjal heldur laus við að lesa og prenta með einhverju PDF vafra. Hins vegar útgáfa og afritun er ekki hægt lengur. Athugaðu að nota þennan eiginleika að byggja upp alþjóðlegt cumulated Pdf ekki að vinna (eins og ógreiddra reikninga).
+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=Lögun
 DolibarrLicense=License
 Developpers=Developers / Höfundar
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr netinu kynningu
 OfficialMarketPlace=Opinber markaði fyrir ytri modules / addons
 OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
 ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=Notandanafn eða skjölum verktaki '(Doc, FAQs ...), <br> kíkið á Dolibarr Wiki: <br> <a href="%s" target="_blank"><b> %s </b></a>
 ForAnswersSeeForum=Fyrir einhverjar aðrar spurningar / hjálp, getur þú notað Dolibarr spjall: <br> <a href="%s" target="_blank"><b> %s </b></a>
 HelpCenterDesc1=Þetta svæði getur hjálpað þér að fá stuðning Hjálp þjónusta á Dolibarr.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=Lögun er ekki í boði á Unix eins og kerfum. Próf
 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/
 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 skipulag
-ModulesSetup=Modules skipulag
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Kerfi
 ModuleFamilyCrm=Viðskiptavinur Tengsl Stjórnun (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=Dolibarr núverandi útgáfa
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Update server offline
+WithCounter=Manage a counter
 GenericMaskCodes=Þú getur fært inn hvaða tala lagsins. Í þessu maska gæti eftirfarandi tög að nota: <br> <b>(000000)</b> samsvarar fjölda sem verður incremented á hverjum %s . Sláðu inn eins mörg núll og löngun lengd borðið. Teljarinn verður lokið við núllum frá vinstri til að fá eins mörg núll og lagsins. <br> <b>(000000 000)</b> sami eins og fyrri en að vega upp á móti sem svarar til fjölda til hægri á + merki er notað sem hófst á fyrsta %s . <br> <b>(000000 @ x)</b> sami eins og fyrri en borðið er endurstilla á núll þegar mánaðar x er náð (x á milli 1 og 12). Ef þessi möguleiki er notaður og x er 2 eða hærra, þá röð (YY) (mm) eða (áááá) (mm) er einnig nauðsynleg. <br> <b>(Dd)</b> dag (01-31). <br> <b>(Mm)</b> mánuði (01-12). <br> <b>(YY), (áááá)</b> eða <b>(y)</b> ár yfir 2, 4 eða 1 númer. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Allir aðrir stafir í möskva haldast óbreytt. <br> Bil eru ekki leyfð. <br>
-GenericMaskCodes4a=<u>Dæmi um 99 %s  af þriðja aðila TheCompany gert 2007/01/31:</u> <br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Dæmi um þriðja aðila skapa á 2007/3/1:</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>
+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=Fara aftur á sérhannaðar númer samkvæmt skilgreiningu lagsins.
 ServerAvailableOnIPOrPort=Þjónninn er í boði <b>á%</b> heimilisfang <b>er</b> á <b>gátt %s </b>
 ServerNotAvailableOnIPOrPort=Þjónninn er ekki í boði <b>á%</b> heimilisfang <b>er</b> á <b>gátt %s </b>
@@ -369,19 +375,21 @@ Int=Integer
 Float=Float
 DateAndTime=Date and hour
 Unique=Unique
-Boolean=Boolean (Checkbox)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Sími
 ExtrafieldPrice = Verð
 ExtrafieldMail = Email
 ExtrafieldUrl = Url
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Lykilorð
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldRadio=Radio buttons (on 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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Field
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Notendur & hópar
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=Reikninga og stjórnun kredit athugið fyrir viðskiptavini. Invoic
 Module40Name=Birgjar
 Module40Desc=Birgis stjórnun og kaupa (pöntunum og reikningum)
 Module42Name=Syslog
-Module42Desc=Annálar aðstöðu (skrifað)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Ritstjórar
 Module49Desc=Ritstjórainnskráning stjórnun
 Module50Name=Vörur
@@ -499,8 +521,8 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar sameining
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Tilkynningar
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind viðskipti viðbúnað
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
-Module4000Desc=Human resources management
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi-fyrirtæki
 Module5000Desc=Leyfir þér að stjórna mörgum fyrirtækjum
 Module6000Name=Workflow
@@ -591,7 +615,7 @@ Permission32=Búa til / breyta vörur
 Permission34=Eyða vöru
 Permission36=Sjá / stjórna falinn vörur
 Permission38=Útflutningur vöru
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Eyða verkefni (sameiginleg verkefni og verkefnum sem ég hef samband vegna)
 Permission45=Export projects
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Röðun aðferðir
 DictionarySource=Uppruni tillögur / pantanir
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Emails templates
 DictionaryUnits=Einingar
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Skipulag vistuð
+SetupNotSaved=Setup not saved
 BackToModuleList=Til baka í mát lista
 BackToDictionaryList=Til baka orðabækur lista
 VATManagement=VSK Stjórn
@@ -921,7 +947,7 @@ Host=Server
 DriverType=Bílstjóri tegund
 SummarySystem=System Information yfirlit
 SummaryConst=Listi yfir allar Dolibarr skipulag breytur
-MenuCompanySetup=Fyrirtæki / Stofnun
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= Standard matseðill framkvæmdastjóri
 DefaultMenuSmartphoneManager=Smartphone matseðill framkvæmdastjóri
 Skin=Skin þema
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Default max length for lists
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=Skilaboð dagsins
 MessageLogin=Innskráning síðu skilaboð
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Varanleg leita mynd til vinstri valmynd
 DefaultLanguage=Sjálfgefið tungumál til að nota (tungumálið code)
 EnableMultilangInterface=Virkja Fjöltyng tengi
 EnableShowLogo=Sýna merki á vinstri valmynd
-CompanyInfo=Fyrirtæki / stofnun upplýsingar
-CompanyIds=Fyrirtæki / stofnun auðkenni
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=Nafn
 CompanyAddress=Heimilisfang
 CompanyZip=Zip
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Umburðarlyndi töf (í dögum) áður en viðvörun u
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Umburðarlyndi töf (í dögum) áður en vakandi fyrir eftirlit leggja inn til að gera
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Aðrar færslur matseðill stjórna valfrjálst stika.
 LogEvents=Öryggi endurskoðun viðburðir
 Audit=Úttekt
@@ -987,7 +1015,7 @@ BrowserOS=Browser OS
 ListOfSecurityEvents=Listi yfir Dolibarr öryggi viðburðir
 SecurityEventsPurged=Öryggi viðburðir hreinsa
 LogEventDesc=Þú getur gert hér skráir þig inn Dolibarr öryggi viðburðir. Stjórnandi getur þá sjá efni þess í gegnum valmynd <b>System verkfæri - endurskoðun.</b> Aðvörun, getur þessi eiginleiki neyta mikið af gögnum í gagnagrunninum.
-AreaForAdminOnly=Þessir eiginleikar geta vera notaður af <b>notendum og stjórnandi</b> aðeins.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Kerfi upplýsingar er ýmis tæknilegar upplýsingar sem þú færð í lesa aðeins háttur og sýnileg Aðeins kerfisstjórar.
 SystemAreaForAdminOnly=Þetta svæði er í boði fyrir notendur stjórnandi aðeins. Ekkert af Dolibarr leyfi getur dregið þessi mörk.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists 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
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Professional Id einstakt
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Óákveðinn greinir í ensku útflutningur hlekkur <b>til %s </b> snið er að finna á eftirfarandi tengil: %s
 ##### Invoices #####
 BillsSetup=Kvittanir í mát skipulag
 BillsNumberingModule=Reikninga og lána athugasemdir tala mát
 BillsPDFModules=Invoice skjöl módel
+PaymentsPDFModules=Payment documents models
 CreditNote=Credit athugið
 CreditNotes=Credit athugasemdir
 ForceInvoiceDate=Force dagsetningu reiknings staðfestingu dagsetningu
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
 FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
 FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
 CacheByServer=Cache by server
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
+CompressionOfResourcesDesc=For exemple 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 your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Vörur mát skipulag
 ServiceSetup=Þjónusta mát skipulag
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Dagsetning reiknings notað
 Buy=Kaupa
 Sell=Selja
 InvoiceDateUsed=Dagsetning reiknings notað
-YourCompanyDoesNotUseVAT=Félagið hefur verið skilgreint til að nota VSK (Heim - Skipulag - Fyrirtæki / Stofnun), svo það er ekkert VSK valmöguleika til skipulag.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=Bankar Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Smelltu til að hringja mát skipulag
-ClickToDialUrlDesc=Url kallað þegar smellur á picto síminn er lokið. Dans l'url, énumérés pouvez utiliser les balises <br> <b>%% 1 $ s</b> Qui Sera remplacé jöfnuður æ Sími de l'appelé <br> <b>%% 2 $ s</b> Qui Sera remplacé jöfnuður æ Sími de l'appelant (æ votre) <br> <b>%% 3 $ s</b> Qui Sera remplacé jöfnuður votre innskráningu clicktodial (skilgreining sur votre fiche utilisateur) <br> <b>%% 4 $ s</b> Qui Sera remplacé jöfnuður votre mot de passe clicktodial (skilgreining sur votre fiche utilisateur).
+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.
 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 same computer than 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.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+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.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=Almennt sýna til
 BankOrderES=Spænska
 BankOrderESDesc=Spænska sýna til
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=Multi-fyrirtæki mát skipulag
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ 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.
 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.
-ConfFileMuseContainCustom=Installing 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)
 TextTitleColor=Color of page title
 LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/is_IS/compta.lang b/htdocs/langs/is_IS/compta.lang
index 240fba50459..1882883d39c 100644
--- a/htdocs/langs/is_IS/compta.lang
+++ b/htdocs/langs/is_IS/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using r
 Param=Skipulag
 RemainingAmountPayment=Upphæð greiðslu eftir:
 Account=Reikningur
-Accountparent=Account parent
-Accountsparent=Accounts parent
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=Tekjur
 Outcome=Kostnað
 ReportInOut=Tekjur / gjöld
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Skattar og arður
 MenuSocialContributions=Social/fiscal taxes
 MenuNewSocialContribution=New social/fiscal tax
 NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Bókhalds / ríkissjóðs area
 NewPayment=Ný greiðsla
@@ -134,8 +135,8 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- Það innheldur alla virka greiðslur reikninga sem berast frá viðskiptavini. <br> - Þetta er byggt á gjalddagi þessara reikninga <br>
-DepositsAreNotIncluded=- Innlánsstofnanir reikningar eru né með
-DepositsAreIncluded=- Innlánsstofnanir reikningar eru
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Skýrsla um þriðja aðila IRPF
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
 VATReport=VAT report
@@ -169,7 +170,7 @@ DescSellsJournal=Sala Journal
 DescPurchasesJournal=Kaup Journal
 InvoiceRef=Invoice tilv.
 CodeNotDef=Ekki skilgreint
-WarningDepositsNotIncluded=Innlán reikningar eru ekki með í þessari útgáfu með þessari endurskoðun áfanga.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
 Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
@@ -189,8 +190,10 @@ AccountancyJournal=Accountancy code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/is_IS/cron.lang b/htdocs/langs/is_IS/cron.lang
index 28d4e811598..1cf87277e89 100644
--- a/htdocs/langs/is_IS/cron.lang
+++ b/htdocs/langs/is_IS/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allow to execute job that have been planned
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Job
 CronNone=None
 CronDtStart=Not before
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Slökkva
 CronTaskInactive=This job is disabled
 CronId=Id
-CronClassFile=Classes (filename.class.php)
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=Frá
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/is_IS/errors.lang b/htdocs/langs/is_IS/errors.lang
index e15208488af..67c301be52a 100644
--- a/htdocs/langs/is_IS/errors.lang
+++ b/htdocs/langs/is_IS/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Ekki tókst að búa til skrána <b>' %s '.</b>
 ErrorFailToRenameDir=Ekki tókst að endurnefna <b>'Mappan %s '</b> í <b>' %s '.</b>
 ErrorFailToCreateDir=Ekki tókst að búa til möppu <b>' %s '.</b>
 ErrorFailToDeleteDir=Tókst ekki að eyða <b>'%</b> möppu <b>s'.</b>
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=Þessi tengiliður er nú þegar skilgreint og tengiliður fyrir þessa tegund.
 ErrorCashAccountAcceptsOnlyCashMoney=Þessi bankareikningur er reiðufé reikning, svo tekur það greiðslur af gerðinni reiðufé eingöngu.
 ErrorFromToAccountsMustDiffers=Heimild og markmið bankareikninga verður að vera annað.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Tókst ekki að skrifa í möppunni %s
 ErrorFoundBadEmailInFile=Stofna rangt netfang setningafræði fyrir %s  línur í skrá (td línu %s  með email = %s )
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Sumir Nauðsynlegir reitir voru ekki fylltir.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Ekki tókst að búa til möppu. Athugaðu að vefþjóninn notandi hefur réttindi til að skrifa inn Dolibarr skjöl skrá. Ef viðfang <b>safe_mode</b> er virkt á þessu PHP, athuga hvort Dolibarr PHP skrár á nú á netþjóninn notandi (eða hóp).
 ErrorNoMailDefinedForThisUser=Nei póstur er skilgreind fyrir þennan notanda
 ErrorFeatureNeedJavascript=Þessi aðgerð þarfnast javascript til að virkja til vinnu. Breyting þessi hefur skipulag - sýna.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoice
 ErrorWebServerUserHasNotPermission=Notandi Reikningur <b>%s</b> notað til að framkvæma vefur framreiðslumaður hefur ekki leyfi til að
 ErrorNoActivatedBarcode=Nei barcode gerð virk
 ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # 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.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice
 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/is_IS/main.lang b/htdocs/langs/is_IS/main.lang
index cc86e39b822..e1e180da766 100644
--- a/htdocs/langs/is_IS/main.lang
+++ b/htdocs/langs/is_IS/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=Viðfang %s  ekki skilgreint
 ErrorUnknown=Unknown error
 ErrorSQL=SQL Villa
 ErrorLogoFileNotFound=%s  Logo skrá 'fannst ekki
-ErrorGoToGlobalSetup=Fara á "Fyrirtæki / skipulag Foundation" til að laga þetta
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=Fara til Module skipulag til festa this
 ErrorFailedToSendMail=Ekki tókst að senda póst (sendandi = %s , símtól = %s )
 ErrorFileNotUploaded=Skrá var ekki send inn. Athugaðu að stærð hjartarskinn ekki fara yfir leyfileg mörk, sem laust pláss er í boði á diski og að það er ekki nú þegar skrá með sama nafni í þessari möppu.
@@ -153,6 +153,7 @@ Edit=Breyta
 Validate=Staðfesta
 ValidateAndApprove=Validate and Approve
 ToValidate=Til að sannprófa
+NotValidated=Not validated
 Save=Vista
 SaveAs=Save As
 TestConnection=Próf tengingu
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=No applicative disconnect feature with authenticatio
 Connection=Tengsl
 Setup=Skipulag
 Alert=Viðvörun
+MenuWarnings=Alerts
 Previous=Fyrri
 Next=Næsti
 Cards=Spil
@@ -308,6 +310,7 @@ Copy=Afrita
 Paste=Líma
 Default=Default
 DefaultValue=Sjálfgefið gildi
+DefaultValues=Default values
 Price=Verð
 UnitPrice=Eining verðs
 UnitPriceHT=Unit verð (nettó)
@@ -363,7 +366,8 @@ VATRate=VSK-hlutfall
 Average=Meðaltal
 Sum=Summa
 Delta=Delta
-Module=Module
+Module=Module/Application
+Modules=Modules/Applications
 Option=Valkostur
 List=Listi
 FullList=Sjá lista
@@ -387,7 +391,7 @@ ActionRunningNotStarted=Ekki byrjað
 ActionRunningShort=In progress
 ActionDoneShort=Lokið
 ActionUncomplete=Uncomplete
-CompanyFoundation=Fyrirtæki / Stofnun
+CompanyFoundation=Company/Organisation
 ContactsForCompany=Tengiliðir / adresses fyrir þessa þriðja aðila
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
@@ -405,8 +409,9 @@ Generate=Mynda
 Duration=Lengd
 TotalDuration=Samtals tímalengd
 Summary=Yfirlit
-DolibarrStateBoard=Tölfræði
-DolibarrWorkBoard=Vinna verkefni borð
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=Laus
 NotYetAvailable=Ekki enn í boði
 NotAvailable=Ekki í boði
@@ -434,7 +439,7 @@ Reportings=Skýrslur
 Draft=Víxill
 Drafts=Drög
 Validated=Staðfestar
-Opened=Opnaður
+Opened=Opnaðu
 New=New
 Discount=Afsláttur
 Unknown=Óþekkt
@@ -453,6 +458,7 @@ NextStep=Næsta skref
 Datas=Gögn
 None=None
 NoneF=None
+NoneOrSeveral=None or several
 Late=Seint
 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.
 Photo=Mynd augnabliksins
@@ -606,7 +612,8 @@ PartialWoman=Partial
 TotalWoman=Samtals
 NeverReceived=Aldrei fengið
 Canceled=Hætt við
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
+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
 Color=Litur
 Documents=Hlekkur skrá
@@ -642,6 +649,7 @@ FreeLineOfType=Free entry of type
 CloneMainAttributes=Klóna mótmæla við helstu eiginleika hennar
 PDFMerge=PDF Sameina
 Merge=Sameina
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Sýna síðu til að prenta aðalefni area
 MenuManager=Menu manager
 WarningYouAreInMaintenanceMode=Aðvörun, ert þú í viðhald háttur, svo að aðeins <b>tenging %s </b> er leyft að nota forritið í augnablikinu.
@@ -708,6 +716,7 @@ from=from
 toward=toward
 Access=Access
 SelectAction=Select action
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
 SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
 OriginFileName=Original filename
@@ -718,7 +727,7 @@ ViewPrivateNote=View notes
 XMoreLines=%s line(s) hidden
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
+SelectElementAndClick=Select an element and click %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
@@ -734,8 +743,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Eyða línu
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
@@ -755,11 +764,20 @@ Calendar=Calendar
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Mánudagur
 Tuesday=Þriðjudagur
@@ -817,5 +835,3 @@ SearchIntoContracts=Samningar
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/is_IS/other.lang b/htdocs/langs/is_IS/other.lang
index e0affdb2cc9..76ee678b253 100644
--- a/htdocs/langs/is_IS/other.lang
+++ b/htdocs/langs/is_IS/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=Dags til fæðingu
 BirthdayAlertOn=afmæli viðvörun virk
 BirthdayAlertOff=afmæli viðvörun óvirk
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=Intervention staðfestar
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=Þetta er <b>prófun</b> póstur (orðið próf verður f
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Prof Id %s </b> er upplýsingamiðstöð ráðast á þriðja aðila land. <br> Til dæmis, þegar <b>landið %s , kóði%</b> það <b>er.</b>
 DolibarrDemo=Dolibarr ERP / CRM kynningu
-StatsByNumberOfUnits=Tölfræði í fjölda af vörum / þjónustu eininga
-StatsByNumberOfEntities=Tölfræði í fjölda vísa aðila
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=Á% afskipti s hefur verið staðfest.
 EMailTextInvoiceValidated=Í% reikningi s hefur verið staðfest.
diff --git a/htdocs/langs/is_IS/projects.lang b/htdocs/langs/is_IS/projects.lang
index 40b006ff906..8851e24cfe2 100644
--- a/htdocs/langs/is_IS/projects.lang
+++ b/htdocs/langs/is_IS/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Allir
 PrivateProject=Project tengiliðir
+ProjectsImContactFor=Projects I'm explicitely a contact of
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=Öll verkefni
 MyProjectsDesc=Þessi skoðun er takmörkuð við verkefni sem þú ert að hafa samband við (hvað sem er gerð).
 ProjectsPublicDesc=Þetta sýnir öll verkefni sem þú ert að fá að lesa.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=Þetta sýnir öll verkefni og verkefni (notandi heimildir veita þér
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=Ný verkefni
 AddProject=Create project
 DeleteAProject=Eyða verkefni
 DeleteATask=Eyða verkefni
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Opened projects
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Sýna verkefni
 SetProject=Setja verkefni
 NoProject=Engin verkefni skilgreind eða í eigu
 NbOfProjects=ATH verkefna
+NbOfTasks=Nb of tasks
 TimeSpent=Tíma sem fer
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
@@ -47,9 +52,9 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=Notandi
 TaskTimeNote=Ath
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
-NewTimeSpent=Nýr tími
+NewTimeSpent=Tími
 MyTimeSpent=Minn tími var
 Tasks=Verkefni
 Task=Verkefni
@@ -59,6 +64,7 @@ TaskDescription=Task description
 NewTask=Ný verkefni
 AddTask=Create task
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Afþreying
 Activities=Verkefni / starfsemi
 MyActivities=verkefni mín / starfsemi
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Listi yfir samninga í tengslum við verkefnið
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=Listi yfir inngrip í tengslum við verkefnið
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project tengiliðir
 ActionsOnProject=Aðgerðir á verkefninu
 YouAreNotContactOfProject=Þú ert ekki samband við þessa einka verkefni
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Eyða tíma
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
@@ -110,7 +118,7 @@ TaskRessourceLinks=Gagnagrunnur
 ProjectsDedicatedToThisThirdParty=Verkefni hollur til þessa þriðja aðila
 NoTasks=Engin verkefni fyrir þetta verkefni
 LinkedToAnotherCompany=Tengjast öðrum þriðja aðila
-TaskIsNotAffectedToYou=Task not assigned to you
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=Tími er tómur
 ThisWillAlsoRemoveTasks=Þessi aðgerð mun einnig eyða öllum verkefnum verkefnisins <b>(%s</b> verkefni í augnablikinu) og allt inntak tíma varið.
 IfNeedToUseOhterObjectKeepEmpty=Ef sumir hlutir (nótum röð ...), sem tilheyra öðrum þriðja aðila, verður að vera í tengslum við verkefnið til að búa til, halda þessu tóm til að hafa verkefni verði fjölnota þriðja aðila.
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
 ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/it_IT/accountancy.lang b/htdocs/langs/it_IT/accountancy.lang
index e144c03ffff..489b64b2282 100644
--- a/htdocs/langs/it_IT/accountancy.lang
+++ b/htdocs/langs/it_IT/accountancy.lang
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=Aggiungi un account di contabilità
 AccountAccounting=Account di contabilità
 AccountAccountingShort=Conto
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Account per contabilità suggerito
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Inserisci movimento
 UpdateMvts=Modifica di un movimento
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=Contabilità generale
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Saldo
 
 CAHTF=Total purchase supplier before tax
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
@@ -118,10 +126,10 @@ ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
 DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account di contabilità predefinito per i prodotti acquistati (se non definito nella scheda prodotto)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Account di contabilità predefinito per i prodotti venduti (se non definito nella scheda prodotto)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Account di contabilità predefinito per i servizi acquistati (se non definito nella scheda servizio)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Account di contabilità predefinito per i servizi venduti (se non definito nella scheda servizio)
 
 Doctype=Tipo documento
 Docdate=Data
@@ -132,19 +140,19 @@ Sens=Verso
 Codejournal=Giornale
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Categoria contabile
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Non impostato
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Debito e Credito non possono avere un valore contemporaneamente
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=List of the accounting accounts
 
 Pcgtype=Class of account
-Pcgsubtype=Under class of account
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Margine totale sulle vendite
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Movimento non bilanciato correttamente. Credito =%s. Debito =%s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Codice
+Nature=Natura
+AccountingJournalType1=Various operation
+AccountingJournalType2=Vendite
+AccountingJournalType3=Acquisti
+AccountingJournalType4=Banca
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Esportazioni
@@ -211,6 +231,7 @@ Modelcsv_ciel=Esportazione per Sage Ciel Compta o Compta Evolution
 Modelcsv_quadratus=Esportazione per Quadratus QuadraCompta
 Modelcsv_ebp=Esportazione per EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calcolato
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index ee6bf0e89c9..7a658ee1743 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -19,8 +19,8 @@ LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=File mancanti
 FilesUpdated=File aggiornati
-FilesModified=Modified Files
-FilesAdded=Added Files
+FilesModified=Files modificati
+FilesAdded=Files aggiunti
 FileCheckDolibarr=Check integrity of application files
 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
@@ -48,12 +48,13 @@ InternalUsers=Utenti interni
 ExternalUsers=Utenti esterni
 GUISetup=Layout di visualizzazione
 SetupArea=Sezione impostazioni
+UploadNewTemplate=Carica nuovi modelli
 FormToTestFileUploadForm=Modulo per provare il caricamento file (secondo la configurazione)
 IfModuleEnabled=Nota: funziona solo se il <b>modulo %s</b> è attivo
 RemoveLock=Per consentire l'aggiornamento del modulo, il file <b>%s</b> deve essere eliminato, se esiste.
 RestoreLock=Impostare il file <b>%s</b> in sola lettura per disabilitare l'uso di qualsiasi strumento di aggiornamento.
 SecuritySetup=Impostazioni per la sicurezza
-SecurityFilesDesc=Define here options related to security about uploading files.
+SecurityFilesDesc=Definire qui le impostazioni relative alla sicurezza per l'upload dei files.
 ErrorModuleRequirePHPVersion=Errore: questo modulo richiede almeno la versione %s di PHP.
 ErrorModuleRequireDolibarrVersion=Errore: questo modulo richiede almeno la versione %s di Dolibarr
 ErrorDecimalLargerThanAreForbidden=Errore: Non è supportata una precisione superiore a <b> %s </b>.
@@ -85,7 +86,7 @@ Mask=Maschera
 NextValue=Prossimo valore
 NextValueForInvoices=Prossimo valore (fatture)
 NextValueForCreditNotes=Prossimo valore (note di credito)
-NextValueForDeposit=Valore successivo (deposito)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Valore successivo (sostituzioni)
 MustBeLowerThanPHPLimit=Nota: il tuo PHP limita la dimensione di ogni file upload a <b> %s </b> %s, sebbene il valore del parametro sia
 NoMaxSizeByPHPLimit=Nota: Non è stato fissato nessun limite massimo nella configurazione del PHP
@@ -103,7 +104,7 @@ MenuIdParent=Capogruppo dal menu ID
 DetailMenuIdParent=ID del menu principale (0 per un menu in alto)
 DetailPosition=Ordina per definire il numero di posizione del menu
 AllMenus=Tutti
-NotConfigured=Non configurato
+NotConfigured= Modulo/Applicazione non configurato
 Active=Attivo
 SetupShort=Impostazioni
 OtherOptions=Altre opzioni
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Separatore per le migliaia
 Destination=Destinazione
 IdModule=Modulo ID
 IdPermissions=Permessi ID
-Modules=Moduli
 LanguageBrowserParameter=Parametro %s
 LocalisationDolibarrParameters=Parametri di localizzazione
 ClientTZ=Fuso orario client (utente)
@@ -123,7 +123,8 @@ PHPTZ=Fuso orario server PHP
 DaylingSavingTime=Ora legale (utente)
 CurrentHour=Orario PHP (server)
 CurrentSessionTimeOut=Timeout sessione corrente
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Massimo numero di righe per componente
@@ -189,13 +190,13 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Autorizzazioni
 BoxesDesc=I Widgets sono componenti che personalizzano le pagine aggiungendo delle informazioni.\nPuoi scegliere se mostrare il widget o meno cliccando 'Attiva' sulla la pagina di destinazione, o cliccando sul cestino per disattivarlo.
 OnlyActiveElementsAreShown=Vengono mostrati solo gli elementi relativi ai <a href="%s">moduli attivi</a> .
-ModulesDesc=I moduli di Dolibarr definiscono quale funzionalità è abilitata. Alcuni moduli richiedono permessi da abilitare agli utenti, dopo la loro abilitazione. Clicca su on/off per l'abilitazione del modulo.
+ModulesDesc=I moduli di Dolibarr definiscono quali funzionalità sono abilitate. Alcuni moduli, dopo la loro attivazione, richiedono dei permessi da abilitare agli utenti. Clicca su on/off per l'abilitazione del modulo.
 ModulesMarketPlaceDesc=Potete trovare altri moduli da scaricare su siti web esterni...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Trova altri moduli esterni...
 GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, il mercato ufficiale dei moduli esterni per Dolibarr ERP/CRM
-DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
+DoliPartnersDesc=Elenco di aziende che forniscono moduli e funzionalità sviluppate su misura (Nota: chiunque sia esperto in programmazione PHP è in grado di fornire un contributo allo sviluppo per un progetto open source)
 WebSiteDesc=Siti Web in cui è possibile cercare altri moduli ...
 URL=Collegamento
 BoxesAvailable=Widget disponibili
@@ -213,31 +214,33 @@ MainDbPasswordFileConfEncrypted=Password del database crittata in conf.php (racc
 InstrucToEncodePass=Per avere la password codificata sostituisci nel file <b>conf.php</b> , la linea <br><b>$dolibarr_main_db_pass="...";</b><br>con<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=Per avere la password decodificata (in chiaro) sostituisci nel file<b>conf.php</b> la linea <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>con<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Protezione e crittografia dei PDF generati
-ProtectAndEncryptPdfFilesDesc=La protezione di un documento PDF rende possibile solo la lettura e la stampa con qualsiasi browser. La modifica e la copia non sono più possibili.
+ProtectAndEncryptPdfFilesDesc=La protezione di un documento PDF rende possibile la lettura e la stampa con qualsiasi browser; tuttavia modifica e copia non sono più possibili. Si noti che l'utilizzo di questa funzionalità non renderà possibile la stampa unione dei file PDF
 Feature=Caratteristica
 DolibarrLicense=Licenza
 Developpers=Sviluppatori e contributori
 OfficialWebSite=Sito ufficiale internazionale
-OfficialWebSiteLocal=Local web site (%s)
+OfficialWebSiteLocal=Sito ufficiale locale (%s)
 OfficialWiki=Dolibarr Wiki
 OfficialDemo=Dolibarr demo online
 OfficialMarketPlace=Market ufficiale per moduli esterni e addon
 OfficialWebHostingService=Servizi di hosting web referenziati (Hosting Cloud)
 ReferencedPreferredPartners=Preferred Partners
-OtherResources=Altre risorse
+OtherResources=Other resources
+ExternalResources=Risorse esterne
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=La documentazione per utenti e sviluppatori e le FAQ sono disponibili sul wiki di Dolibarr: <br/>Dai un'occhiata a <a href="%s" target="_blank"><b> %s</b></a>
 ForAnswersSeeForum=Per qualsiasi altro problema/domanda, si può utilizzare il forum di Dolibarr: <br> <a href="%s" target="_blank"><b>%s</b></a>
 HelpCenterDesc1=In quest'area puoi cercare un servizio di supporto su Dolibarr.
 HelpCenterDesc2=Alcuni di questi servizi sono disponibili <b>solo in inglese</b>.
 CurrentMenuHandler=Attuale gestore menu
 MeasuringUnit=Unità di misura
-LeftMargin=Left margin
-TopMargin=Top margin
-PaperSize=Paper type
-Orientation=Orientation
+LeftMargin=Margine sinistro
+TopMargin=Margine superiore
+PaperSize=Tipo di carta
+Orientation=Orientamento
 SpaceX=Space X
 SpaceY=Space Y
-FontSize=Font size
+FontSize=Dimensione del testo
 Content=Content
 NoticePeriod=Periodo di avviso
 NewByMonth=New by month
@@ -265,12 +268,12 @@ UserEmail=Email utente
 CompanyEmail=Email società
 FeatureNotAvailableOnLinux=Funzione non disponibile sui sistemi Linux. Viene usato il server di posta installato sul server (es. sendmail).
 SubmitTranslation=Se la traduzione per questa lingua non è completa o trovi degli errori, puoi correggere i file presenti nella directory <b>langs/%s</b> e pubblicare i file modificati su 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.
+SubmitTranslationENUS=Se la traduzione per questa lingua non è completa o trovi degli errori, puoi correggere i file presenti nella directory <b>langs/%s</b> e pubblicare i file modificati su dolibarr.org/forum oppure, se sei uno sviluppatore, su github.com/Dolibarr/dolibarr
 ModuleSetup=Impostazioni modulo
-ModulesSetup=Impostazioni moduli
+ModulesSetup=Impostazione Modulo/Applicazione
 ModuleFamilyBase=Sistema
 ModuleFamilyCrm=Client Resource Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Gestione delle relazioni con i fornitori (SRM)
 ModuleFamilyProducts=Gestione dei prodotti (PM)
 ModuleFamilyHr=Gestione delle risorse umane (HR)
 ModuleFamilyProjects=Progetti/collaborazioni
@@ -284,7 +287,7 @@ ModuleFamilyInterface=Interfacce con sistemi esterni
 MenuHandlers=Gestori menu
 MenuAdmin=Editor menu
 DoNotUseInProduction=Da non usare in produzione
-ThisIsProcessToFollow=This is steps to process:
+ThisIsProcessToFollow=Il procedimento da seguire è:
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Passo %s
 FindPackageFromWebSite=Trova un pacchetto che fornisca la funzionalità desiderata (per esempio su %s).
@@ -300,14 +303,17 @@ CurrentVersion=Versione attuale di Dolibarr
 CallUpdatePage=Vai alla pagina che aggiorna la struttura del database e dati su %s.
 LastStableVersion=Ultima versione stabile
 LastActivationDate=Latest activation date
+LastActivationAuthor=Ultimo
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Update server offline
+WithCounter=Manage a counter
 GenericMaskCodes=Puoi inserire uno schema di numerazione. In questo schema, possono essere utilizzati i seguenti tag : <br><b> {000000} </b> Corrisponde a un numero che sarà incrementato ad ogni aggiunta di %s. Inserisci il numero di zeri equivalente alla lunghezza desiderata per il contatore. Verranno aggiunti zeri a sinistra fino alla lunghezza impostata per il contatore. <br><b> {000000+000} </b> Come il precedente, ma con un offset corrispondente al numero a destra del segno + che viene applicato al primo inserimento %s. <br> <b> {000000@x} </b> Come sopra, ma il contatore viene reimpostato a zero quando si raggiunge il mese x (x compreso tra 1 e 12). Se viene utilizzata questa opzione e x è maggiore o uguale a 2, diventa obbligatorio inserire anche la sequenza {yy}{mm} o {yyyy}{mm}. <br> <b> {dd} </b> giorno (da 01 a 31). <br> <b> {mm} </b> mese (da 01 a 12). <br> <b> {yy} </b>, <b> {yyyy} </b> o <b> {y}  </b> anno con 2, 4 o 1 cifra.<br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Tutti gli altri caratteri nello schema rimarranno inalterati. <br> Gli spazi non sono ammessi. <br>
-GenericMaskCodes4a=<u>Esempio sulla novantanovesima %s del terzo TheCompany fatta il 31/01/2007:</u> <br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Esempio : il 99esimo cliente/fornitore viene creato 31/01/2007:</u> <br>
 GenericMaskCodes4c=<u>Esempio su prodotto creato il 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> darà <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> darà <b>0199-ZZZ/31/XXX</b>
+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=Restituisce un numero personalizzabile in base allo schema definito dalla maschera.
 ServerAvailableOnIPOrPort=Il server è disponibile all'indirizzo <b> %s </b> sulla porta <b> %s </b>
 ServerNotAvailableOnIPOrPort=Il server non è disponibile all'indirizzo <b> %s </b> sulla porta <b> %s </b>
@@ -358,7 +364,7 @@ UrlGenerationParameters=Parametri di generazione degli indirizzi
 SecurityTokenIsUnique=Utilizzare un unico parametro securekey per ogni URL
 EnterRefToBuildUrl=Inserisci la reference per l'oggetto %s
 GetSecuredUrl=Prendi URL calcolato
-ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Nascondi pulsanti per azioni non autorizzate anziché mostrare pulsantii disabilitati
 OldVATRates=Vecchia aliquota IVA
 NewVATRates=Nuova aliquota IVA
 PriceBaseTypeToChange=Modifica i prezzi con la valuta di base definita.
@@ -369,24 +375,26 @@ Int=Intero
 Float=Decimale
 DateAndTime=Data e ora
 Unique=Unico
-Boolean=Booleano (Checkbox)
+Boolean=booleano (una checkbox)
 ExtrafieldPhone = Tel.
 ExtrafieldPrice = Prezzo
 ExtrafieldMail = Email
 ExtrafieldUrl = Url
 ExtrafieldSelect = Lista di selezione
 ExtrafieldSelectList = Seleziona dalla tabella
-ExtrafieldSeparator=Separatore
+ExtrafieldSeparator=Separatore (non è un campo)
 ExtrafieldPassword=Password
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Bottone Radio
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldRadio=Radio button (una sola scelta)
+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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=La lista dei parametri deve contenere chiave univoca e valore.<br><br>Per esempio:<br>1, valore1<br>2, valore2<br>3, valore3<br>...
 ExtrafieldParamHelpradio=La lista dei parametri deve rispettare il formato chiave,valore<br /><br /> per esempio: <br />1,valore1<br />2,valore2<br />3,valore3<br />...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=La lista dei parametri viene da una tabella<br />Sintassi: table_name:label_field:id_field::filter<br>Per esempio: c_typent:libelle:id::filter<br /><br />filter può essere un semplice test (tipo active=1 per mostrare solo valori attivi) <br /> se vuoi filtrare per extrafield usa la sintassi extra.fieldcode=... (dove fieldcode è il codice del extrafield)<br /><br />Per far dipendere la lista da un'altra usa:<br />c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpchkbxlst=La lista dei parametri viene da una tabella<br>Sintassi: table_name:label_field:id_field::filter<br>Per esempio: c_typent:libelle:id::filter<br><br>filter può essere un semplice test (tipo active=1 per mostrare solo valori attivi) <br> se vuoi filtrare per extrafield usa la sintassi extra.fieldcode=... (dove fieldcode è il codice del extrafield)<br><br>Per far dipendere la lista da un'altra usa:<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Libreria utilizzata per generare PDF
 WarningUsingFPDF=Avviso: Il tuo <b>conf.php</b> contiene la direttiva <b>dolibarr_pdf_force_fpdf = 1.</b> Questo significa che si utilizza la libreria FPDF per generare file PDF. Questa libreria è obsoleta e non supporta un molte funzioni (Unicode, trasparenza dell'immagine, lingue cirillico, arabo e asiatico, ...), quindi potrebbero verificarsi errori durante la generazione di file PDF. <br> Per risolvere questo problema ed avere un supporto completo di generazione di file PDF, scarica <a href="http://www.tcpdf.org/" target="_blank">biblioteca TCPDF</a> , quindi commentare o rimuovere la riga <b>$ dolibarr_pdf_force_fpdf = 1,</b> e aggiungere invece <b>$ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir'</b>
@@ -409,19 +417,33 @@ ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode
 AllBarcodeReset=All barcode values have been removed
 NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into barcode module setup.
 EnableFileCache=Abilita file di 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).
+ShowDetailsInPDFPageFoot=Aggiungi ulteriori dettagli a piè di pagina nei files PDF, come l'indirizzo della tua società o i nomi dei managers (per completare id professionali, capitale sociale e numeri di partita IVA).
 NoDetails=Nessun dettaglio nel piè di pagina
 DisplayCompanyInfo=Mostra indirizzo dell'azienda
 DisplayCompanyManagers=Visualizza nomi responsabili
-DisplayCompanyInfoAndManagers=Display company address and manager names
+DisplayCompanyInfoAndManagers=Mostra l'indirizzo dell'azienda ed il nome del manager
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Restituisce una stringa composta da %s seguito dal codice del fornitore per il codice contabile fornitori, e %s seguito dal codice del cliente per il codice contabile cliente.
 ModuleCompanyCodePanicum=Restituisce un codice contabile vuoto.
 ModuleCompanyCodeDigitaria=Codice contabile dipendente dal codice di terze parti. Il codice è composto dal carattere "C" nella prima posizione seguito da i primi 5 caratteri del codice cliente/fornitore.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-ClickToShowDescription=Click to show description
+WarningPHPMail=Attenzione: Alcuni providers(com Yahoo)  non ti consentono di inviare un'email da un altro server rispetto al server Yahoo se l'indirizzo email utilizzato come mittente è la tua email di Yahoo (come myemail@yahoo.com, myemail@yahoo.fr, ...). La tua configurazione corrente utilizza il server dell'applicazione per inviare e-mail, quindi alcuni destinatari (quello compatibile con il protocollo restrittivo DMARC) chiederanno a Yahoo se accettano la tua e-mail e Yahoo risponderà "no" perché il server non è un server Yahoo, quindi alcune delle tue email inviate potrebbero non essere accettate.<br> Se il tuo provider di posta elettronica (come Yahoo) ha questa restrizione, devi modificare l'impostazione di posta elettronica per scegliere l'altro metodo "server SMTP" e inserire il server SMTP e le credenziali fornite da Il tuo provider di posta elettronica (chiedere al tuo fornitore di Email di ottenere credenziali SMTP per il tuo account).
+ClickToShowDescription=Clicca per mostrare la descrizione
+DependsOn=A questo modulo serve il modulo
+RequiredBy=Questo modulo è richiesto dal modulo
+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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Abilita l'utilizzo di valori predefiniti personalizzati
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Campo
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Testo libero sul report di spesa
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Utenti e gruppi
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=Gestione Fatture e note di credito per i clienti. Gestione Fatture
 Module40Name=Fornitori
 Module40Desc=Gestione fornitori e acquisti (ordini e fatture)
 Module42Name=Log
-Module42Desc=Sistemi di log (file, syslog, ecc...)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Redazione
 Module49Desc=Gestione redattori
 Module50Name=Prodotti
@@ -461,7 +483,7 @@ Module55Name=Codici a barre
 Module55Desc=Gestione codici a barre
 Module56Name=Telefonia
 Module56Desc=Integrazione telefonia
-Module57Name=Direct bank payment orders
+Module57Name=Ordini permanenti e domiciliazioni
 Module57Desc=Gestione degli ordini di pagamento SEPA Direct Debit. Comprende anche la generazione di file SEPA per i paesi europei.
 Module58Name=ClickToDial
 Module58Desc=Integrazione di un sistema ClickToDial (per esempio Asterisk)
@@ -499,8 +521,8 @@ Module410Name=Calendario web
 Module410Desc=Integrazione calendario web
 Module500Name=Spese speciali
 Module500Desc=Gestione delle sepse speciali (tasse, contributi, dividendi)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Prestito
 Module520Desc=Gestione dei prestiti
 Module600Name=Notifiche
@@ -525,8 +547,8 @@ Module2200Name=Prezzi dinamici
 Module2200Desc=Abilita l'utilizzo di espressioni matematiche per i prezzi
 Module2300Name=Cron
 Module2300Desc=Gestione delle operazioni pianificate
-Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Name=Eventi/Agenda
+Module2400Desc=Gestione eventi/compiti e ordine del giorno. Registra manualmente eventi nell'agenda o consenti all'applicazione di registrare eventi automaticamente a scopo di monitoraggio
 Module2500Name=Gestione dei contenuti digitali
 Module2500Desc=Salvare e condividere documenti
 Module2600Name=API/Web services (SOAP server)
@@ -541,9 +563,11 @@ Module2800Desc=Client FTP
 Module2900Name=GeoIPMaxmind
 Module2900Desc=Localizzazione degli accessi tramite GeoIP Maxmind
 Module3100Name=Skype
-Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3100Desc=Aggiunge un collegamento a Skype nelle schede di terze parti e contatti
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=Risorse umane
-Module4000Desc=Gestione delle risorse umane
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multiazienda
 Module5000Desc=Permette la gestione di diverse aziende
 Module6000Name=Flusso di lavoro
@@ -557,7 +581,7 @@ Module39000Desc=Lot or serial number, eat-by and sell-by date management on prod
 Module50000Name=PayBox
 Module50000Desc=Modulo per offrire il pagamento online con PayBox
 Module50100Name=Punti vendita
-Module50100Desc=Point of sales module (POS).
+Module50100Desc=Modulo per la creazione di un punto vendita (POS)
 Module50200Name=Paypal
 Module50200Desc=Modulo per offrire il pagamento online con Paypal
 Module50400Name=Accounting (advanced)
@@ -565,13 +589,13 @@ Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
 Module54000Desc=Stampa diretta (senza aprire i documenti) tramite l'interfaccia CUPS IPP (la stampante deve essere visibile dal server, e il server deve avere CUPS installato).
 Module55000Name=Sondaggio, Indagine o Votazione
-Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
+Module55000Desc=Modulo per creare sondaggi, indagini o feedback online (Doodle, Studs, Rdvz o simili)
 Module59000Name=Margini
 Module59000Desc=Modulo per gestire margini
 Module60000Name=Commissioni
 Module60000Desc=Modulo per gestire commissioni
 Module63000Name=Risorse
-Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
+Module63000Desc=Gestione risorse (stampanti, automobili, locali, ...) e loro utilizzo all'interno degli eventi
 Permission11=Vedere le fatture attive
 Permission12=Creare fatture attive
 Permission13=Annullare le fatture attive
@@ -591,8 +615,8 @@ Permission32=Creare/modificare  prodotti
 Permission34=Eliminare prodotti
 Permission36=Vedere/gestire prodotti nascosti
 Permission38=Esportare prodotti
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
+Permission42=Creare/modificare i progetti (condivisi e di cui si è contatto). Può anche creare compiti/attività e assegnare risorse a progetti e compiti/attività
 Permission44=Eliminare progetti
 Permission45=Esporta progetti
 Permission61=Vedere gli interventi
@@ -639,10 +663,10 @@ Permission142=Crea e mofica tutti i progetti e tutti i compiti (anche progetti p
 Permission144=Cancella tutti i progetti e tutti i compiti (anche progetti privati in cui non sono stato insertio come contatto)
 Permission146=Vedere provider
 Permission147=Vedere statistiche
-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
+Permission151=Vedere ordini permanenti
+Permission152=Creare/modificare richieste di ordini permanenti
+Permission153=Trasmettere fatture ordini permanenti
+Permission154=Pagare/rifiutare fatture ordini permanenti
 Permission161=Leggi contratti / abbonamenti
 Permission162=Crea/modifica contratti/abbonamenti
 Permission163=Attiva un servizio/sottoscrizione di un contratto
@@ -695,7 +719,7 @@ PermissionAdvanced253=Creare/modificare utenti interni/esterni e permessi
 Permission254=Eliminare o disattivare altri utenti
 Permission255=Cambiare le password di altri utenti
 Permission256=Eliminare o disabilitare altri utenti
-Permission262=Extend access to all third parties (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 assignement matters).
+Permission262=Estendere accesso a tutte le terze parti (non solo quelle legate all'utente). Non ha effetto sugli utenti esterni e sui progetti.
 Permission271=Vedere CA
 Permission272=Vedere fatture
 Permission273=Emettere fatture
@@ -744,7 +768,7 @@ Permission538=Esportare servizi
 Permission701=Vedere donazioni
 Permission702=Creare/modificare donazioni
 Permission703=Eliminare donazioni
-Permission771=Read expense reports (yours and your subordinates)
+Permission771=Visualizzare le note spese (tue e dei tuoi subordinati)
 Permission772=Create/modify expense reports
 Permission773=Delete expense reports
 Permission774=Read all expense reports (even for user not subordinates)
@@ -780,13 +804,13 @@ Permission1236=Esportare fatture fornitore, attributi e pagamenti
 Permission1237=Esportazione ordini fornitori e loro dettagli
 Permission1251=Eseguire importazioni di massa di dati esterni nel database (data load)
 Permission1321=Esportare fatture cliente, attributi e pagamenti
-Permission1322=Reopen a paid bill
+Permission1322=Riaprire le fatture pagate
 Permission1421=Esportare ordini cliente e attributi
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
-Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
+Permission20001=Vedere le richieste di ferie (tue e dei tuoi subordinati)
+Permission20002=Creare/modicare le richieste di ferie
+Permission20003=Eliminare le richieste di ferie
+Permission20004=Vedere tutte le richieste di ferie (anche di utenti non subordinati)
+Permission20005=Creaee/modificare le richieste di ferie per tutti
 Permission20006=Admin leave requests (setup and update balance)
 Permission23001=Leggi lavoro pianificato
 Permission23002=Crea / Aggiorna lavoro pianificato
@@ -814,9 +838,9 @@ Permission55002=Crea/modifica sondaggi
 Permission59001=Leggi margini commerciali
 Permission59002=Definisci margini commerciali
 Permission59003=Read every user margin
-Permission63001=Read resources
-Permission63002=Create/modify resources
-Permission63003=Delete resources
+Permission63001=Leggi risorse
+Permission63002=Crea/modifica risorse
+Permission63003=Elimina risorsa
 Permission63004=Link resources to agenda events
 DictionaryCompanyType=Tipi dei soggetti terzi
 DictionaryCompanyJuridicalType=forma legale dei soggetti terzi
@@ -825,8 +849,8 @@ DictionaryCanton=Stato/Provincia
 DictionaryRegion=Regioni
 DictionaryCountry=Paesi
 DictionaryCurrency=Valute
-DictionaryCivility=Personal and professional titles
-DictionaryActions=Types of agenda events
+DictionaryCivility=Titoli personali e professionali
+DictionaryActions=Tipi di azioni/eventi
 DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=Aliquote IVA o Tasse di vendita
 DictionaryRevenueStamp=Ammontare dei valori bollati
@@ -836,7 +860,7 @@ DictionaryTypeContact=Tipi di contatti/indirizzi
 DictionaryEcotaxe=Ecotassa (WEEE)
 DictionaryPaperFormat=Formati di carta
 DictionaryFormatCards=Cards formats
-DictionaryFees=Types of fees
+DictionaryFees=Tipi di imposte
 DictionarySendingMethods=Metodi di spedizione
 DictionaryStaff=Personale
 DictionaryAvailability=Tempi di consegna
@@ -844,16 +868,18 @@ DictionaryOrderMethods=Metodi di ordinazione
 DictionarySource=Origine delle proposte/ordini
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Modelli per piano dei conti
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Modelli email
 DictionaryUnits=Unità
 DictionaryProspectStatus=Prospection status
-DictionaryHolidayTypes=Types of leaves
+DictionaryHolidayTypes=Tipi di ferie
 DictionaryOpportunityStatus=Stato opportunità per progetto/clienti interessati
 SetupSaved=Impostazioni salvate
+SetupNotSaved=Impostazioni non salvate
 BackToModuleList=Torna alla lista moduli
 BackToDictionaryList=Torna alla lista dei dizionari
 VATManagement=Gestione IVA
-VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
+VATIsUsedDesc=Per impostazione predefinita l'aliquota IVA usata per la creazione di prospetti, fatture, ordini, ecc. segue la regola attiva:<br> - Se il venditore non è un soggetto IVA, l'aliquota IVA è pari a 0.<br> - Se i paesi di vendita e di acquisto coincidono, il valore predefinito dell'aliquota IVA è quello del prodotto nel paese di vendita. <br> - Se il venditore e l'acquirente si trovano entrambi all'interno della Comunità Europea ed i beni consistono in servizi di trasporto (auto, nave, aereo), il valore predefinito dell'aliquota IVA è 0 (L'IVA dovrebbe essere pagata dall'acquirente all'ufficio doganale del suo paese e non al venditore). <br> - Se il venditore e l'acquirente si trovano entrambi all'interno della Comunità Europea e l'acquirente non è una società, l'aliquota IVA predefinita è quella del prodotto venduto. <br> - Se il venditore e l'acquirente si trovano entrambi all'interno della Comunità Europea e l'acquirente è una società, l'aliquota IVA predefinita è 0.<br>In tutti gli altri casi l'aliquota IVA predefinita è 0.
 VATIsNotUsedDesc=Impostazione predefinita in cui l'aliquota IVA è pari a 0. Adatto a soggetti come associazioni, persone fisiche o piccole imprese con regime semplificato o a forfait.
 VATIsUsedExampleFR=In Francia si intendono le imprese o organizzazioni che hanno un vero e proprio sistema fiscale (Semplificato, nominale o normale). Un sistema in cui l'IVA à dichiarata.
 VATIsNotUsedExampleFR=In Francia le associazioni non sono tenute alla dichiarazione IVA, così come le società, le organizzazioni o i liberi professionisti che hanno scelto la microimpresa come sistema fiscale (IVA a forfait) e il versamento di una franchigia IVA senza alcuna dichiarazione IVA. In questo caso viene visualizzata la dicitura "non applicabile IVA - Art-293B del CGI" sulle fatture.
@@ -892,12 +918,12 @@ LabelUsedByDefault=Descrizione (utilizzata in tutti i documenti per cui non esis
 LabelOnDocuments=Descrizione sul documento
 NbOfDays=Numero di giorni
 AtEndOfMonth=Alla fine del mese
-CurrentNext=Current/Next
+CurrentNext=Corrente/Successivo
 Offset=Scostamento
 AlwaysActive=Sempre attivo
 Upgrade=Aggiornamento
 MenuUpgrade=Migliora/Estendi
-AddExtensionThemeModuleOrOther=Deploy/install external module
+AddExtensionThemeModuleOrOther=Aggiungi estensione (tema, modulo, ...)
 WebServer=Server Web
 DocumentRootServer=Cartella principale del Server Web
 DataRootServer=Cartella dei file di dati
@@ -928,9 +954,11 @@ Skin=Tema
 DefaultSkin=Skin di default
 MaxSizeList=Lunghezza massima elenchi
 DefaultMaxSizeList=Lunghezza massima predefinita elenchi
-DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
+DefaultMaxSizeShortList=Massima lunghezza di default per le liste brevi (es in scheda cliente)
 MessageOfDay=Messaggio del giorno
 MessageLogin=Messaggio per la pagina di login
+LoginPage=Login page
+BackgroundImageLogin=Immagine di sfondo
 PermanentLeftSearchForm=Modulo di ricerca permanente nel menu di sinistra
 DefaultLanguage=La lingua da impostare come predefinita (codice lingua)
 EnableMultilangInterface=Attiva l'interfaccia multilingua
@@ -953,11 +981,11 @@ ShowBugTrackLink=Mostra link "<strong>%s</strong>"
 Alerts=Avvisi e segnalazioni
 DelaysOfToleranceBeforeWarning=Tolleranza sui ritardi prima di un avvertimento
 DelaysOfToleranceDesc=Questa schermata consente di definire per ciascun elemento la tolleranza sul ritardo prima che appaia una segnalazione nella casella con l'immagine %s.
-Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned events (agenda events) not completed yet
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Delay tolerance (in days) before alert on project not closed in time
-Delays_MAIN_DELAY_TASKS_TODO=Delay tolerance (in days) before alert on planned tasks (project tasks) not completed yet
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on orders not processed yet
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on suppliers orders not processed yet
+Delays_MAIN_DELAY_ACTIONS_TODO=Tolleranza sul ritardo (in giorni) prima di un avvertimento per azioni pianificate non ancora realizzate
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Tolleranza sul ritardo (in giorni) prima di un avvertimento per progetti non terminati nei tempi previsti
+Delays_MAIN_DELAY_TASKS_TODO=Tolleranza sul ritardo (in giorni) prima di un avvertimento per attività di progetto pianificate e non ancora completate
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Tolleranza sul ritardo (in giorni) prima di un avvertimento per ordini non ancora lavorati
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Tolleranza sul ritardo (in giorni) prima di un avvertimento per ordini fornitore non ancora elaborati
 Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Tolleranza sul ritardo (in giorni) prima di un avvertimento per  proposte da chiudere
 Delays_MAIN_DELAY_PROPALS_TO_BILL=Tolleranza sul ritardo (in giorni) prima di un avvertimento per proposte non fatturate
 Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolleranza sul ritardo (in giorni) prima di un avvertimento per servizi da attivare
@@ -968,26 +996,26 @@ Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolleranza sul ritardo (in giorni)
 Delays_MAIN_DELAY_MEMBERS=Tolleranza sul ritardo (in giorni) prima di un avvertimento per quota di adesione ritardata
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolleranza sul ritardo (in giorni) prima un avvertimento per deposito di assegni da fare
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolleranza (in giorni) prima di avvisare per l'approvazione delle note spese
-SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription1=La sezione impostazioni consente il setup iniziale di Dolibarr prima del suo utilizzo.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Altre voci di menu consentono la gestione di parametri opzionali.
 LogEvents=Eventi di audit di sicurezza
 Audit=Audit
 InfoDolibarr=Informazioni su Dolibarr
-InfoBrowser=About Browser
+InfoBrowser=Informazioni browser
 InfoOS=Informazioni OS
 InfoWebServer=Informazioni web server
 InfoDatabase=Informazioni database
 InfoPHP=Informazioni PHP
-InfoPerf=About Performances
+InfoPerf=Informazioni prestazioni
 BrowserName=Browser
 BrowserOS=Sistema operativo
 ListOfSecurityEvents=Elenco degli eventi di sicurezza Dolibarr
 SecurityEventsPurged=Eventi di sicurezza eliminati
 LogEventDesc=Qui è possibile attivare il registro eventi di sicurezza di Dolibarr. Gli amministratori possono quindi vederne il contenuto attraverso <b>Strumenti di sistema - Audit</b>. Attenzione, attivando questa funzione è possibile che venga scritta una grande quantità di dati nel database.
-AreaForAdminOnly=Tali funzioni possono essere utilizzate solo da utenti di tipo <b>amministratore</b>.<br/>
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Le informazioni di sistema sono dati tecnici visibili in sola lettura e solo dagli amministratori.
 SystemAreaForAdminOnly=Questa sezione è disponibile solo agli utenti di tipo <b>amministratore</b>. Nessuna delle autorizzazioni disponibili può alterare questo limite.
 CompanyFundationDesc=In questa pagina puoi modificare tutte le informazioni della società o fondazione che intendi gestire (Per farlo clicca sui pulsanti "Modifica" o "Salva" in fondo alla pagina)
@@ -1003,8 +1031,8 @@ TriggerDisabledAsModuleDisabled=I trigger in questo file sono disabilitati perch
 TriggerAlwaysActive=I trigger in questo file sono sempre attivi, indipendentemente da quali moduli siano attivi in Dolibarr.
 TriggerActiveAsModuleActive=I trigger in questo file sono attivi se il modulo <b>%s</b> è attivo.
 GeneratedPasswordDesc=Regola per la generazione di nuove password generate automaticamente
-DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">check here</a>.
+DictionaryDesc=Inserire tutti i dati di riferimento. È possibile aggiungere i propri valori a quelli di default.
+ConstDesc=Questa pagina ti permette di modificare tutti i parametri non disponibili nelle pagine precedenti. Si tratta di parametri riservati per lo sviluppo o la risoluzione dei problemi.
 MiscellaneousDesc=Definire qui tutti gli altri parametri relativi alla sicurezza.
 LimitsSetup=Limiti/impostazioni di precisione
 LimitsDesc=Da qui è possibile definire i limiti e la precisione utilizzati da Dolibarr.
@@ -1019,7 +1047,7 @@ NoEventOrNoAuditSetup=Nessun evento di sicurezza registrato. Questo può essere
 NoEventFoundWithCriteria=Nessun evento di sicurezza trovato con i criteri di ricerca impostati.
 SeeLocalSendMailSetup=Controllare le impostazioni locali del server di posta (sendmail)
 BackupDesc=Per effettuare un backup completo di Dolibarr è necessario:
-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).
+BackupDesc2=Salvare il contenuto della directory dei documenti (<b>%s</b>) che contiene tutti i file generati e caricati (e che quindi contiene tutti i files dump generati al passo precedente).
 BackupDesc3=Salva il contenuto del tuo database <b>(%s)</b> in un file dump. È possibile utilizzare il seguente assistente.
 BackupDescX=L'archivio delle directory va conservato in un luogo sicuro.
 BackupDescY=Il file generato va conservato in un luogo sicuro.
@@ -1068,22 +1096,23 @@ SendmailOptionNotComplete=Attenzione: su alcuni sistemi Linux, per poter inviare
 PathToDocuments=Percorso documenti
 PathDirectory=Percorso 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.
-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: <strong>User display setup</strong> tab of 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
-TranslationString=Translation string
-CurrentTranslationString=Current translation string
+TranslationSetup=Configurazione della traduzione
+TranslationKeySearch=Cerca una chiave o una stringa di testo
+TranslationOverwriteKey=Sovrascrivi una stringa di testo
+TranslationDesc=La scelta della lingua visualizzata su schermo può essere modidificata:<br><br> - Globalmente dal menu <strong>Home > Impostazioni > Layout di visualizzazione</strong><br> - Per utente dalla linguetta <strong>Impostazioni interfaccia grafica</strong> della Scheda utente (cliccare l'icona di login in alto sullo schermo).
+TranslationOverwriteDesc=Puoi anche effettuare l'override delle stringhe di testo utilizzando la tabella seguente. Seleziona la tua lingua nel box "%s", inserisci la chiave della stringa da tradurre nel campo "%s" e la tua traduzione nel campo "%s".
+TranslationOverwriteDesc2=Puoi utilizzare il tab di ricerca per individuare la chiave della stringa di tuo interesse
+TranslationString=Stringa di testo
+CurrentTranslationString=Stringa di testo corrente
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
-NewTranslationStringToShow=New translation string to show
-OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+NewTranslationStringToShow=Nuova stringa di testo da utilizzare
+OriginalValueWas=La traduzione originale è stata sovrascritta. Il testo originale era:<br><br>%s
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists in any language files
+TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Devi abilitare almeno un modulo
 ClassNotFoundIntoPathWarning=La classe %s non è stata trovata al percorso PHP indicato
 YesInSummer=Si in estate
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Sessioni salvate con criptazione tramite Suhosin
 ConditionIsCurrently=La condizione corrente è %s
 YouUseBestDriver=Usi già il miglior driver attualmente disponibile: %s
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Unicità dell'identità
 MustBeUnique=Deve essere unico?
 MustBeMandatory=Obbligatorio per creare il soggetto terzo?
 MustBeInvoiceMandatory=Obbligatorio per convalidare le fatture?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Un link per esportare <b>%s</b> è disponibile al seguente link: %s
 ##### Invoices #####
 BillsSetup=Impostazioni modulo fatture
 BillsNumberingModule=Numerazione modulo fatture e note di credito
 BillsPDFModules=Modelli fattura in pdf
+PaymentsPDFModules=Payment documents models
 CreditNote=Nota di credito
 CreditNotes=Note di credito
 ForceInvoiceDate=Forza la data della fattura alla data di convalida
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=I file di tipo %s non vengono serviti dalla cache del serve
 FilesOfTypeCompressed=I file di tipo %s vengono compressi dal server HTTP
 FilesOfTypeNotCompressed=I file di tipo %s non vengono compressi dal server HTTP
 CacheByServer=Cache per server
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache per browser
 CompressionOfResources=Compressione delle risposte HTTP
+CompressionOfResourcesDesc=For exemple using the Apache directive "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Con i browser attuali l'individuazione automatica non è possibile
+DefaultValuesDesc=You can define/force here the default value you want to get when your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Impostazioni modulo prodotti
 ServiceSetup=Impostazioni modulo servizi
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Alla data della fattura
 Buy=Acquista
 Sell=Vendi
 InvoiceDateUsed=Data utilizzata per la fatturazione
-YourCompanyDoesNotUseVAT=Società non soggetta all'IVA. Non ci sono parametri da impostare.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=Codice contabile
 AccountancyCodeSell=Codice contabilità vendite
 AccountancyCodeBuy=Codice contabilità acquisti
@@ -1478,11 +1516,12 @@ AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filt
 AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
-AGENDA_NOTIFICATION_SOUND=Enable sound notification
+AGENDA_NOTIFICATION_SOUND=Attiva i suoni per le notifiche
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Impostazioni modulo ClickToDial (telefonate con un clic)
-ClickToDialUrlDesc=Indirizzo da raggiungere quando si clicca sull'icona del telefono. L'indirizzo può contenere i codici <br/><b>__PHONETO__</b> che verrà sostituito con il numero telefonico a cui collegarsi, <br/><b>__PHONEFROM__</b> che verrà sostituito con il numero chiamante (il vostro), <br/><b>__LOGIN__</b> che verrà sostituito con il nome utente usato per il servizio e <br/><b>__PASS__</b> che verrà sostituito con la password del servizio ClickToDial.
-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.
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
+ClickToDialDesc=Questo modulo aggiunge un'icona accanto ai numeri telefonici dei contatti.<br/> Cliccando sull'icona si attiva il collegamento al server che effettuerà le chiamate telefoniche.
 ClickToDialUseTelLink=Peri numeri di telefono basta usare un link di tipo "tel:"
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than 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.
 ##### Point Of Sales (CashDesk) #####
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+ApiExporerIs=You can explore and test the APIs at URL
 OnlyActiveElementsAreExposed=Vengono esposti solo elementi correlati ai moduli abilitati
 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.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=Ordine di visualizzazione generale
 BankOrderES=Spagnolo
 BankOrderESDesc=Ordine di visualizzazione spagnolo
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=Impostazioni modulo multiazienda
 ##### Suppliers #####
@@ -1548,14 +1586,14 @@ TaskModelModule=Tasks reports document model
 UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ##### Fiscal Year #####
-AccountingPeriods=Accounting periods
-AccountingPeriodCard=Accounting period
-NewFiscalYear=New accounting period
-OpenFiscalYear=Open accounting period
-CloseFiscalYear=Close accounting period
-DeleteFiscalYear=Delete accounting period
-ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
-ShowFiscalYear=Show accounting period
+AccountingPeriods=Periodi di esercizio fiscale
+AccountingPeriodCard=Scheda periodo di esercizio
+NewFiscalYear=Nuovo periodo di esercizio
+OpenFiscalYear=Apri periodo di esercizio
+CloseFiscalYear=Chiudi periodo di esercizio
+DeleteFiscalYear=Elimina periodo di esercizio
+ConfirmDeleteFiscalYear=Vuoi davvero cancellare questo periodo di esercizio?
+ShowFiscalYear=Mostra periodo di esercizio
 AlwaysEditable=Può essere modificato in qualsiasi momento
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
 NbMajMin=Numero minimo di caratteri maiuscoli
@@ -1582,24 +1620,25 @@ BackupDumpWizard=Procedura guidata per creare file di backup del database (dump)
 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.
 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.
-ConfFileMuseContainCustom=Installing 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)
+HighlightLinesColor=Evidenzia le righe delle tabelle passandoci sopra con il mouse
 TextTitleColor=Colore del titolo di pagina
 LinkColor=Colore dei link
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
-NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
+NotSupportedByAllThemes=Funziona con il tema Eldy ma non è supportato da tutti gli altri temi
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
-TopMenuDisableImages=Hide images in Top menu
+TopMenuDisableImages=Nascondi le icone nel menu superiore
 LeftMenuBackgroundColor=Background color for Left menu
-BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleColor=Colore di sfondo della riga di intestazione
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Periodo minimo di avviso (le richieste di ferie/permesso dovranno essere effettuate prima di questo periodo)
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=Il colore RGB è nel formato HEX, es:FF0000
 PositionIntoComboList=Posizione di questo modello nella menu a tendina
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1621,10 +1660,10 @@ MailToSendIntervention=Inviare intervento
 MailToSendSupplierRequestForQuotation=Inviare richiesta di preventivo a fornitore
 MailToSendSupplierOrder=Inviare ordine fornitore
 MailToSendSupplierInvoice=Inviare fattura fornitore
-MailToSendContract=To send a contract
+MailToSendContract=Per spedire un contratto
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the latest stable version
+YouUseLastStableVersion=Stai usando l'ultima versione stabile
 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.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configurazione del modulo Risorse
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/it_IT/banks.lang b/htdocs/langs/it_IT/banks.lang
index 50c2f57cfb3..eac03717371 100644
--- a/htdocs/langs/it_IT/banks.lang
+++ b/htdocs/langs/it_IT/banks.lang
@@ -28,12 +28,12 @@ Reconciliation=Riconciliazione
 RIB=Coordinate bancarie
 IBAN=Codice IBAN
 BIC=Codice BIC (Swift)
-SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
-IbanValid=BAN valid
-IbanNotValid=BAN not valid
+SwiftValid=Il codice BIC/SWIFT è valido
+SwiftVNotalid=BIC/SWIFT non valido
+IbanValid=Il codice IBAN è valido
+IbanNotValid=Il codice IBAN non è valido
 StandingOrders=Ordini di addebito diretto
-StandingOrder=Direct debit order
+StandingOrder=Ordine di addebito diretto
 AccountStatement=Estratto conto
 AccountStatementShort=Est. conto
 AccountStatements=Estratti conto
@@ -59,20 +59,21 @@ AccountCard=Scheda conto
 DeleteAccount=Elimina conto
 ConfirmDeleteAccount=Vuoi davvero eliminare questo conto?
 Account=Conto
-BankTransactionByCategories=Bank entries by categories
-BankTransactionForCategory=Bank entries for category <b>%s</b>
+BankTransactionByCategories=Transazioni bancarie per categoria
+BankTransactionForCategory=Transazioni bancarie per la <b>categoria %s</b>
 RemoveFromRubrique=Rimuovi collegamento con la categoria
-RemoveFromRubriqueConfirm=Are you sure you want to remove link between the entry and the category?
-ListBankTransactions=List of bank entries
+RemoveFromRubriqueConfirm=Sei sicuro di voler rimuovere il legame tra l'operazione e la categoria?
+ListBankTransactions=Elenco delle transazioni bancarie
 IdTransaction=ID transazione
-BankTransactions=Bank entries
-ListTransactions=List entries
-ListTransactionsByCategory=List entries/category
-TransactionsToConciliate=Entries to reconcile
+BankTransactions=Transazioni bancarie
+BankTransaction=Transazione bancaria
+ListTransactions=Elenco transazioni
+ListTransactionsByCategory=Elenco transazioni per categoria
+TransactionsToConciliate=Transazioni da conciliare
 Conciliable=Conciliabile
 Conciliate=Concilia transazione
 Conciliation=Conciliazione
-ReconciliationLate=Reconciliation late
+ReconciliationLate=Riconciliazione in ritardo
 IncludeClosedAccount=Includi i conti chiusi
 OnlyOpenedAccount=Solo conti aperti
 AccountToCredit=Conto di accredito
@@ -84,11 +85,11 @@ StatusAccountOpened=Aperto
 StatusAccountClosed=Chiuso
 AccountIdShort=Numero di conto
 LineRecord=Transazione
-AddBankRecord=Add entry
-AddBankRecordLong=Add entry manually
+AddBankRecord=Aggiungi operazione
+AddBankRecordLong=Aggiungi operazione manualmente
 ConciliatedBy=Transazione conciliata da
 DateConciliating=Data di conciliazione
-BankLineConciliated=Entry reconciled
+BankLineConciliated=Transazione conciliata
 Reconciled=Conciliata
 NotReconciled=Non conciliata
 CustomerInvoicePayment=Pagamento fattura attiva
@@ -98,7 +99,7 @@ WithdrawalPayment=Ritiro pagamento
 SocialContributionPayment=Pagamento delle imposte sociali/fiscali
 BankTransfer=Bonifico bancario
 BankTransfers=Bonifici e giroconti
-MenuBankInternalTransfer=Internal transfer
+MenuBankInternalTransfer=Trasferimento interno
 TransferDesc=Trasferimento da un conto ad un altro, Dolibarr scriverà due record (uno di addebito nel conto di origine e uno di credito nel conto di destinazione), dello stesso importo. Per questa operazione verranno usate la stessa data e la stessa etichetta.
 TransferFrom=Da
 TransferTo=A
@@ -112,13 +113,13 @@ BankChecks=Assegni bancari
 BankChecksToReceipt=Assegni in attesa di deposito
 ShowCheckReceipt=Mostra ricevuta di versamento assegni
 NumberOfCheques=Numero di assegni
-DeleteTransaction=Delete entry
-ConfirmDeleteTransaction=Are you sure you want to delete this entry?
-ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
+DeleteTransaction=Elimina transazione
+ConfirmDeleteTransaction=Vuoi davvero eliminare questa transazione?
+ThisWillAlsoDeleteBankRecord=Questa operazione elimina anche le transazioni bancarie generate
 BankMovements=Movimenti
-PlannedTransactions=Planned entries
+PlannedTransactions=Transazioni pianificate
 Graph=Grafico
-ExportDataset_banque_1=Bank entries and account statement
+ExportDataset_banque_1=Movimenti bancari e di cassa e loro rilevazioni
 ExportDataset_banque_2=Modulo di versamento
 TransactionOnTheOtherAccount=Transazione sull'altro conto
 PaymentNumberUpdateSucceeded=Numero del pagamento aggiornato correttamente
@@ -126,7 +127,7 @@ PaymentNumberUpdateFailed=Il numero di pagamento potrebbe non essere stato aggio
 PaymentDateUpdateSucceeded=Data del pagamento aggiornata correttamente
 PaymentDateUpdateFailed=La data di pagamento potrebbe non essere stata aggiornata
 Transactions=Transazioni
-BankTransactionLine=Bank entry
+BankTransactionLine=Transazione bancaria
 AllAccounts=Tutte le banche/casse
 BackToAccount=Torna al conto
 ShowAllAccounts=Mostra per tutti gli account
@@ -141,12 +142,16 @@ AllRIB=Tutti i BAN
 LabelRIB=Etichetta BAN
 NoBANRecord=Nessun BAN
 DeleteARib=Cancella il BAN
-ConfirmDeleteRib=Are you sure you want to delete this BAN record?
+ConfirmDeleteRib=Vuoi davvero cancellare questo BAN?
 RejectCheck=Assegno restituito
 ConfirmRejectCheck=Sei sicuro di voler segnare questo assegno come rifiutato?
 RejectCheckDate=Data di restituzione dell'assegno
 CheckRejected=Assegno restituito
 CheckRejectedAndInvoicesReopened=Assegno restituito e fatture riaperte
-BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
-DocumentModelBan=Template to print a page with BAN information.
+BankAccountModelModule=Modelli di documento per i conti bancari e le casse
+DocumentModelSepaMandate=Modello di documento per i mandati SEPA. Da utilizzare solamente per i paese appartenenti alla CEE
+DocumentModelBan=Template per la stampa delle informazioni relative al BAN
+NewVariousPayment=New various payment
+VariousPayment=Various payment
+VariousPayments=Various payments
+ShowVariousPayment=Show various payment
diff --git a/htdocs/langs/it_IT/compta.lang b/htdocs/langs/it_IT/compta.lang
index abb92ffa2b0..7c7e389799e 100644
--- a/htdocs/langs/it_IT/compta.lang
+++ b/htdocs/langs/it_IT/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=I totali qui mostrati sono calcolati usan
 Param=Configurazione
 RemainingAmountPayment=Pagamento a saldo:
 Account=Conto
-Accountparent=Conto di origine
-Accountsparent=Conti di origine
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=Entrate
 Outcome=Uscite
 ReportInOut=Entrate/Uscite
@@ -22,7 +22,7 @@ ReportTurnover=Fatturato
 PaymentsNotLinkedToInvoice=I pagamenti non legati ad una fattura, quindi non legati ad alcun soggetto terzo
 PaymentsNotLinkedToUser=Pagamenti non legati ad alcun utente
 Profit=Utile
-AccountingResult=Accounting result
+AccountingResult=Risultato contabile
 Balance=Saldo
 Debit=Debito
 Credit=Credito
@@ -45,18 +45,19 @@ LT1SupplierES=RE purchases
 VATCollected=IVA incassata
 ToPay=Da pagare
 SpecialExpensesArea=Area per pagamenti straordinari
-SocialContribution=Social or fiscal tax
-SocialContributions=Social or fiscal taxes
-SocialContributionsDeductibles=Deductible social or fiscal taxes
-SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+SocialContribution=Tassa o contributo
+SocialContributions=Tasse o contributi
+SocialContributionsDeductibles=Tasse o contributi deducibili
+SocialContributionsNondeductibles=Tasse o contributi non deducibili
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=Spese straordinarie
 MenuTaxAndDividends=Imposte e dividendi
-MenuSocialContributions=Social/fiscal taxes
-MenuNewSocialContribution=New social/fiscal tax
-NewSocialContribution=New social/fiscal tax
-ContributionsToPay=Social/fiscal taxes to pay
+MenuSocialContributions=Tasse/contributi
+MenuNewSocialContribution=Nuova tassa/contributo
+NewSocialContribution=Nuova tassa/contributo
+AddSocialContribution=Add social/fiscal tax
+ContributionsToPay=Tasse/contributi da pagare
 AccountancyTreasuryArea=Area contabilità/tesoreria
 NewPayment=Nuovo pagamento
 Payments=Pagamenti
@@ -74,24 +75,24 @@ LT1Payment=Tax 2 payment
 LT1Payments=Tax 2 payments
 LT2Payment=Tax 3 payment
 LT2Payments=Tax 3 payments
-newLT1PaymentES=New RE payment
+newLT1PaymentES=Nuovo pagamento RE
 newLT2PaymentES=Nuovo pagamento IRPF (Spagna)
-LT1PaymentES=RE Payment
-LT1PaymentsES=RE Payments
+LT1PaymentES=Pagamento RE
+LT1PaymentsES=Pagamenti RE
 LT2PaymentES=Pagamento IRPF (Spagna)
 LT2PaymentsES=Pagamenti IRPF (Spagna)
-VATPayment=Sales tax payment
-VATPayments=Sales tax payments
-VATRefund=Sales tax refund
+VATPayment=Pagamento IVA
+VATPayments=Pagamenti IVA
+VATRefund=Rimborso IVA
 Refund=Rimborso
-SocialContributionsPayments=Social/fiscal taxes payments
+SocialContributionsPayments=Pagamenti tasse/contributi
 ShowVatPayment=Visualizza pagamento IVA
 TotalToPay=Totale da pagare
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Il bilancio è visibile in questo elenco solo se la tabella è ordinata in verso ascendente per %s e filtrata per un conto bancario
 CustomerAccountancyCode=Codice contabile cliente
 SupplierAccountancyCode=Codice contabile fornitore
-CustomerAccountancyCodeShort=Cust. account. code
-SupplierAccountancyCodeShort=Sup. account. code
+CustomerAccountancyCodeShort=Cod. cont. cliente
+SupplierAccountancyCodeShort=Cod. cont. fornitore
 AccountNumber=Numero di conto
 NewAccountingAccount=Nuovo conto
 SalesTurnover=Fatturato
@@ -101,28 +102,28 @@ ByThirdParties=Per soggetti terzi
 ByUserAuthorOfInvoice=Per autore fattura
 CheckReceipt=Ricevuta di versamento assegno
 CheckReceiptShort=Ricevuta assegno
-LastCheckReceiptShort=Latest %s check receipts
+LastCheckReceiptShort=Ultime %s ricevute assegni
 NewCheckReceipt=Nuovo sconto
 NewCheckDeposit=Nuovo deposito
 NewCheckDepositOn=Nuovo deposito sul conto: %s
 NoWaitingChecks=Nessun assegno in attesa di deposito.
 DateChequeReceived=Data di ricezione assegno
 NbOfCheques=Numero di assegni
-PaySocialContribution=Pay a social/fiscal tax
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
-DeleteSocialContribution=Delete a social or fiscal tax payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
-ExportDataset_tax_1=Social and fiscal taxes and payments
-CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
+PaySocialContribution=Paga tassa/contributo
+ConfirmPaySocialContribution=Sei sicuro di voler classificare questa tassa/contributo come pagato?
+DeleteSocialContribution=Cancella il pagamento della tassa/contributo
+ConfirmDeleteSocialContribution=Sei sicuro di voler cancellare il pagamento di questa tassa/contributo?
+ExportDataset_tax_1=Tasse/contributi e pagamenti
+CalcModeVATDebt=Modalità <b>%sIVA su contabilità d'impegno%s</b>.
 CalcModeVATEngagement=Calcola <b>%sIVA su entrate-uscite%s</b>
-CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
-CalcModeEngagement=Mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>
-CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
-CalcModeLT1Debt=Mode <b>%sRE on customer invoices%s</b>
-CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b>
-CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
-CalcModeLT2Debt=Mode <b>%sIRPF on customer invoices%s</b>
-CalcModeLT2Rec= Mode <b>%sIRPF on suppliers invoices%s</b>
+CalcModeDebt=Modalità <b>%sCrediti-Debiti%s</b> detta <b>Contabilità d'impegno</b>.
+CalcModeEngagement=Modalità <b>%sEntrate-Uscite%s</b> detta <b>contabilità di cassa</b>
+CalcModeLT1= Modalità <b>%sRE su fatture clienti - fatture fornitori%s</b>
+CalcModeLT1Debt=Modalità <b>%sRE su fatture clienti%s</b>
+CalcModeLT1Rec= Modalità <b>%sRE su fatture fornitori%s</b>
+CalcModeLT2= Modalità <b>%sIRPF su fatture clienti - fatture fornitori%s</b>
+CalcModeLT2Debt=Modalità <b>%sIRPF su fatture clienti%s</b>
+CalcModeLT2Rec= Modalità <b>%sIRPF su fatture fornitori%s</b>
 AnnualSummaryDueDebtMode=Bilancio di entrate e uscite, sintesi annuale
 AnnualSummaryInputOutputMode=Bilancio di entrate e uscite, sintesi annuale
 AnnualByCompaniesDueDebtMode=Bilancio delle entrate e delle spese, dettaglio per soggetti terzi, in modalità <b>%sCrediti-Debiti%s</b> detta <b>contabilità d'impegno </b>.
@@ -130,12 +131,12 @@ AnnualByCompaniesInputOutputMode=Bilancio delle entrate e delle spese, dettaglio
 SeeReportInInputOutputMode=Vedi il report <b>%sEntrate-Uscite%s</b> detto <b>contabilità di cassa</b> per un calcolo sui pagamenti effettuati
 SeeReportInDueDebtMode=Vedi il report <b>%sCrediti-Debiti%s</b> detto <b>contabilità d'impegno</b> per un calcolo sulle fatture emesse
 RulesAmountWithTaxIncluded=- Gli importi indicati sono tasse incluse
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the validation date of invoices and VAT and on the due date for expenses. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
-RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
+RulesResultDue=- Gli importi indicati sono tutti tasse incluse<br/>- Comprendono le fatture in sospeso, l'IVA e le spese, che siano state pagate o meno.<br/>- Si basa sulla data di convalida delle fatture e dell'IVA e sulla data di scadenza per le spese.
+RulesResultInOut=- Include i pagamenti reali di fatture, spese e IVA. <br>- Si basa sulle date di pagamento di fatture, spese e IVA.
+RulesCADue=- Comprende le fatture del cliente, che siano state pagate o meno.<br/>- Si basa sulla data di tali fatture.<br/>
 RulesCAIn=- Comprende le fatture effettivamente pagate dai clienti.<br/>- Si basa sulla data dei pagamenti.<br/>
-DepositsAreNotIncluded=- Le fatture d'acconto non sono incluse
-DepositsAreIncluded=- Le fatture d'acconto sono incluse
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=IRPF soggetti terzi(Spagna)
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
 VATReport=Dichiarazione IVA
@@ -169,7 +170,7 @@ DescSellsJournal=Storico vendite
 DescPurchasesJournal=Storico acquisti
 InvoiceRef=Rif. fattura
 CodeNotDef=Non definito
-WarningDepositsNotIncluded=Le fatture d'acconto non sono incluse in questa versione del modulo contabilità.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=La data termine di pagamento non può essere anteriore alla data dell'oggetto
 Pcg_version=Chart of accounts models
 Pcg_type=Tipo pcg
@@ -186,22 +187,25 @@ CalculationRuleDescSupplier=According to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Metodo di calcolo
 AccountancyJournal=Codice del giornale di contabilità
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
-CloneTax=Clone a social/fiscal tax
-ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
+ACCOUNTING_VAT_SOLD_ACCOUNT=Codice contabile predefinito per la riscossione dell'IVA sulle vendite (usato se l'IVA non è definita nel dizionario)
+ACCOUNTING_VAT_BUY_ACCOUNT=Codice contabile predefinito per il recupero dell'IVA sugli acquisti (usato se l'IVA non è definita nel dizionario)
+ACCOUNTING_VAT_PAY_ACCOUNT=Codice contabile predefinito per il pagamento dell'IVA
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
+CloneTax=Clonare tassa/contributo
+ConfirmCloneTax=Conferma la clonazione del pagamento tassa/contributo
 CloneTaxForNextMonth=Clona nel mese successivo
-SimpleReport=Simple report
+SimpleReport=Report semplice
 AddExtraReport=Extra reports (add foreign and national customer report)
 OtherCountriesCustomersReport=Foreign customers report
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Based on the two first letters of the VAT number being different from your own company's country code
 SameCountryCustomersWithVAT=National customers report
 BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Based on the two first letters of the VAT number being the same as your own company's country code
 LinkedFichinter=Collegamento ad un intervento
-ImportDataset_tax_contrib=Social/fiscal taxes
+ImportDataset_tax_contrib=Tasse/contributi
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
-FiscalPeriod=Accounting period
+FiscalPeriod=Scheda periodo di esercizio
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/it_IT/cron.lang b/htdocs/langs/it_IT/cron.lang
index 2ade1b8efb9..fdc66a42016 100644
--- a/htdocs/langs/it_IT/cron.lang
+++ b/htdocs/langs/it_IT/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Cancella i job programmati
 CronConfirmDelete=Vuoi davvero eliminare questi job schedulati?
 CronExecute=Esegui i job schedulati
 CronConfirmExecute=Vuoi davvero eseguire i job schedulati ora?
-CronInfo=Il modulo per i job programmati permette di eseguire operazioni definite in anticipoi 
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Azione
 CronNone=Nessuno
 CronDtStart=Non prima
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Abilita
 CronStatusInactiveBtn=Disattiva
 CronTaskInactive=Questa azione è disabilitata
 CronId=Id
-CronClassFile=Classi (filename.class.php)
-CronModuleHelp=Nome della directory del modulo di Dolibarr (funziona anche con moduli di Dolibarr esterni). <BR> Per esempio per ottenere il metodo corretto dell'oggetto /htdocs/<u>product</u>/class/product.class.php, il valore da inserire è <i>product</i>
-CronClassFileHelp=Nome del file da caricare.<BR> Per esempio per ottenere il metodo corretto dell'oggetto /htdocs/product/class/<u>product.class.php</u>, il valore del class file name è <i>product.class.php</i>
-CronObjectHelp=Nome dell'oggetto da caricare. <BR>Per esempio per ottenere il metodo corretto dell'oggetto /htdocs/product/class/product.class.php, il valore da inserire è <i>Product</i>
-CronMethodHelp=Nome del metodo dell'oggetto da eseguire. <BR>Per esempio per ottenere il metodo dell'oggetto /htdocs/product/class/product.class.php, il valore da inserire è <i>fetch</i>
-CronArgsHelp=Argomenti del metodo.<br/> Per esempio per ottenere il metodo corretto dell'oggetto /htdocs/product/class/<u>product.class.php</u>, il valore dei parametri può essere <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=Il comando da eseguire sul sistema
 CronCreateJob=Crea nuovo job programmato
 CronFrom=Da
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Vai nel menu "Home - Strumenti di amministrazion
 JobDisabled=Lavoro disabilitato
 MakeLocalDatabaseDumpShort=Backup del database locale
 MakeLocalDatabaseDump=Crea un backup del database locale
-WarningCronDelayed=Attenzione, per motivi di performance, qualunque sia la data della prossima esecuzione dei job attivi, i job possono essere ritardati di un massimo di %s ore prima di essere eseguiti
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/it_IT/errors.lang b/htdocs/langs/it_IT/errors.lang
index a38dd576f4b..2c1abe058d3 100644
--- a/htdocs/langs/it_IT/errors.lang
+++ b/htdocs/langs/it_IT/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Impossibile creare il file '<b>%s</b>'.
 ErrorFailToRenameDir=Impossibile rinominare la directory '<b>%s</b>' in '<b>%s</b>'.
 ErrorFailToCreateDir=Impossibile creare la directory '<b>%s</b>'.
 ErrorFailToDeleteDir=Impossibile eliminare la directory '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=Questo contatto è già tra i contatti di questo tipo
 ErrorCashAccountAcceptsOnlyCashMoney=Questo conto corrente è un conto di cassa e accetta solo pagamenti in contanti.
 ErrorFromToAccountsMustDiffers=I conti bancari di origine e destinazione devono essere diversi.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Impossibile scrivere nella directory %s
 ErrorFoundBadEmailInFile=Sintassi email errata nelle righe %s del file (ad esempio alla riga %s con email = %s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Mancano alcuni campi obbligatori.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Impossibile creare la directory. Verifica che l'utente del server Web abbia i permessi per scrivere nella directory Dolibarr. Se il parametro <b>safe_mode</b> è abilitato in PHP, verifica che i file php di Dolibarr appartengano all'utente o al gruppo del server web (per esempio www-data).
 ErrorNoMailDefinedForThisUser=Nessun indirizzo memorizzato per questo utente
 ErrorFeatureNeedJavascript=Questa funzione necessita di javascript per essere attivata. Modificare questa impostazione nel menu Impostazioni - layout di visualizzazione.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=La quantità di ciascuna riga della fat
 ErrorWebServerUserHasNotPermission=L'account utente <b>%s</b> utilizzato per eseguire il server web non ha i permessi necessari
 ErrorNoActivatedBarcode=Nessun tipo di codice a barre attivato
 ErrUnzipFails=Estrazione dell'archivio %s con ZipArchive fallita
-ErrNoZipEngine=Non c'è modo di spacchettare i file %s in questo PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=Il file %s deve essere un archivio zip Dolibarr
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=PHP CURL non risulta installato, ma è necessario per comunicare con Paypal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Il campo <b>%s</b> deve essere un valore numerico
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # 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.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=La scadenza del pagamento (%s) risulta an
 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/it_IT/main.lang b/htdocs/langs/it_IT/main.lang
index cf101b66421..901e485d434 100644
--- a/htdocs/langs/it_IT/main.lang
+++ b/htdocs/langs/it_IT/main.lang
@@ -28,7 +28,7 @@ NoTemplateDefined=Nessun template definito per questo tipo di email
 AvailableVariables=Available substitution variables
 NoTranslation=Nessuna traduzione
 NoRecordFound=Nessun risultato trovato
-NoRecordDeleted=No record deleted
+NoRecordDeleted=Nessun record eliminato
 NotEnoughDataYet=Dati insufficienti
 NoError=Nessun errore
 Error=Errore
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=Parametro %s non definito
 ErrorUnknown=Errore sconosciuto
 ErrorSQL=Errore di SQL
 ErrorLogoFileNotFound=Impossibile trovare il file <b>%s</b> per il logo
-ErrorGoToGlobalSetup=Vai alle impostazioni Società/Fondazione per risolvere il problema
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=Vai alle impostazioni del modulo per risolvere il problema
 ErrorFailedToSendMail=Impossibile inviare l'email (mittente=%s, destinatario=%s)
 ErrorFileNotUploaded=Upload fallito. Controllare che la dimensione del file non superi il numero massimo consentito, che lo spazio libero su disco sia sufficiente e che non esista già un file con lo stesso nome nella directory.
@@ -63,7 +63,7 @@ ErrorNoVATRateDefinedForSellerCountry=Errore, non sono state definite le aliquot
 ErrorNoSocialContributionForSellerCountry=Errore, non sono stati definiti i tipi di contributi per: '%s'.
 ErrorFailedToSaveFile=Errore, file non salvato.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Massimo numero di record per pagina
 NotAuthorized=Non sei autorizzato.
 SetDate=Imposta data
 SelectDate=Seleziona una data
@@ -71,9 +71,9 @@ SeeAlso=Vedi anche %s
 SeeHere=Vedi qui
 Apply=Applica
 BackgroundColorByDefault=Colore di sfondo predefinito
-FileRenamed=The file was successfully renamed
+FileRenamed=Il file è stato rinominato con successo
 FileUploaded=Il file è stato caricato con successo
-FileGenerated=The file was successfully generated
+FileGenerated=Il file è stato generato con successo
 FileWasNotUploaded=Il file selezionato per l'upload non è stato ancora caricato. Clicca su <b>Allega file</b> per farlo
 NbOfEntries=Numero di voci
 GoToWikiHelpPage=Leggi l'aiuto online (è richiesto un collegamento internet)
@@ -82,25 +82,25 @@ RecordSaved=Record salvato
 RecordDeleted=Record cancellato
 LevelOfFeature=Livello di funzionalità
 NotDefined=Non definito
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
+DolibarrInHttpAuthenticationSoPasswordUseless=Modalità di autenticazione <b>%s</b> configurata nel file <b>conf.php</b>.<br/>Ciò significa che la password del database è indipendente dall'applicazione, eventuali cambiamenti non avranno alcun effetto.
 Administrator=Amministratore
 Undefined=Indefinito
-PasswordForgotten=Password forgotten?
+PasswordForgotten=Password dimenticata?
 SeeAbove=Vedi sopra
 HomeArea=Area home
-LastConnexion=Latest connection
+LastConnexion=Ultima connessione
 PreviousConnexion=Connessione precedente
-PreviousValue=Previous value
+PreviousValue=Valore precedente
 ConnectedOnMultiCompany=Collegato all'ambiente
 ConnectedSince=Collegato da
-AuthenticationMode=Authentication mode
-RequestedUrl=Requested URL
+AuthenticationMode=Modalità di autenticazione
+RequestedUrl=URL richiesto
 DatabaseTypeManager=Gestore del tipo di database
 RequestLastAccessInError=Ultimo errore di accesso al database
-ReturnCodeLastAccessInError=Return code for latest database access request error
-InformationLastAccessInError=Information for latest database access request error
+ReturnCodeLastAccessInError=Codice di ritorno per l'ultimo accesso errato al database
+InformationLastAccessInError=Informazioni sull'ultimo accesso errato al database
 DolibarrHasDetectedError=Dolibarr ha rilevato un errore tecnico
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes
+InformationToHelpDiagnose=Questa informazione può essere utile alla diagnostica
 MoreInformation=Maggiori informazioni
 TechnicalInformation=Informazioni tecniche
 TechnicalID=Technical ID
@@ -130,7 +130,7 @@ Activate=Attiva
 Activated=Attivato
 Closed=Chiuso
 Closed2=Chiuso
-NotClosed=Not closed
+NotClosed=Non chiuso
 Enabled=Attivo
 Deprecated=Deprecato
 Disable=Disattivare
@@ -141,18 +141,19 @@ RemoveLink=Rimuovere collegamento
 AddToDraft=Aggiungi alla bozza
 Update=Aggiornamento
 Close=Chiudi
-CloseBox=Remove widget from your dashboard
+CloseBox=Rimuovi il widget dal pannello principale
 Confirm=Conferma
-ConfirmSendCardByMail=Do you really want to send content of this card by mail to <b>%s</b>?
+ConfirmSendCardByMail=Vuoi davvero inviare il contenuto di questa scheda per posta a <b>%s</b>?
 Delete=Elimina
 Remove=Rimuovi
-Resiliate=Terminate
+Resiliate=Termina
 Cancel=Annulla
 Modify=Modifica
 Edit=Modifica
 Validate=Convalida
 ValidateAndApprove=Convalida e approva
 ToValidate=Convalidare
+NotValidated=Not validated
 Save=Salva
 SaveAs=Salva con nome
 TestConnection=Test connessione
@@ -207,8 +208,8 @@ Info=Info
 Family=Famiglia
 Description=Descrizione
 Designation=Descrizione
-Model=Doc template
-DefaultModel=Default doc template
+Model=Modello
+DefaultModel=Modello predefinito
 Action=Azione
 About=About
 Number=Numero
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=Nessuna funzione di disconnessione al programma con
 Connection=Connessione
 Setup=Impostazioni
 Alert=Avvertimento
+MenuWarnings=Avvisi e segnalazioni
 Previous=Precedente
 Next=Successivo
 Cards=Schede
@@ -238,7 +240,7 @@ DateCreation=Data di creazione
 DateCreationShort=Data di creazione
 DateModification=Data di modifica
 DateModificationShort=Data modif.
-DateLastModification=Latest modification date
+DateLastModification=Data ultima modifica
 DateValidation=Data di convalida
 DateClosing=Data di chiusura
 DateDue=Data di scadenza
@@ -253,10 +255,10 @@ DateBuild=Data di creazione del report
 DatePayment=Data pagamento
 DateApprove=Approvato in data
 DateApprove2=Data di approvazione (seconda approvazione)
-UserCreation=Creation user
-UserModification=Modification user
-UserCreationShort=Creat. user
-UserModificationShort=Modif. user
+UserCreation=Creazione utente
+UserModification=Modifica utente
+UserCreationShort=Creaz. utente
+UserModificationShort=Modif. utente
 DurationYear=anno
 DurationMonth=mese
 DurationWeek=settimana
@@ -291,7 +293,7 @@ MonthOfDay=Mese del giorno
 HourShort=Ora
 MinuteShort=min
 Rate=Tariffa
-CurrencyRate=Currency conversion rate
+CurrencyRate=Tasso di conversione di valuta
 UseLocalTax=Tasse incluse
 Bytes=Byte
 KiloBytes=Kilobyte
@@ -308,14 +310,15 @@ Copy=Copia
 Paste=Incolla
 Default=Predefinito
 DefaultValue=Valore predefinito
+DefaultValues=Default values
 Price=Prezzo
 UnitPrice=Prezzo unitario
 UnitPriceHT=Prezzo unitario (netto)
 UnitPriceTTC=Prezzo unitario (lordo)
 PriceU=P.U.
 PriceUHT=P.U.(netto)
-PriceUHTCurrency=U.P (currency)
-PriceUTTC=U.P. (inc. tax)
+PriceUHTCurrency=P.U. (valuta)
+PriceUTTC=P.U.(lordo)
 Amount=Importo
 AmountInvoice=Importo della fattura
 AmountPayment=Importo del pagamento
@@ -363,7 +366,8 @@ VATRate=Aliquota IVA
 Average=Media
 Sum=Somma
 Delta=Delta
-Module=Modulo
+Module=Module/Application
+Modules=Modules/Applications
 Option=Opzione
 List=Elenco
 FullList=Elenco completo
@@ -384,7 +388,7 @@ ActionsToDoShort=Da fare
 ActionsDoneShort=Fatte
 ActionNotApplicable=Non applicabile
 ActionRunningNotStarted=Non avviato
-ActionRunningShort=In progress
+ActionRunningShort=Avviato
 ActionDoneShort=Fatto
 ActionUncomplete=Incompleto
 CompanyFoundation=Società/Fondazione
@@ -405,8 +409,9 @@ Generate=Genera
 Duration=Durata
 TotalDuration=Durata totale
 Summary=Riepilogo
-DolibarrStateBoard=Statistiche
-DolibarrWorkBoard=Pannello dei lavori/compiti
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=Disponibile
 NotYetAvailable=Non ancora disponibile
 NotAvailable=Non disponibile
@@ -453,6 +458,7 @@ NextStep=Passo successivo
 Datas=Dati
 None=Nessuno
 NoneF=Nessuno
+NoneOrSeveral=None or several
 Late=Tardi
 LateDesc=Il ritardo di un'azione viene definito nel setup. Chiedi al tuo amministratore di modificarlo dal menu Home - Setup - Alerts.
 Photo=Immagine
@@ -462,7 +468,7 @@ DeletePicture=Foto cancellata
 ConfirmDeletePicture=Confermi l'eliminazione della foto?
 Login=Login
 CurrentLogin=Accesso attuale
-EnterLoginDetail=Enter login details
+EnterLoginDetail=Inserisci le credenziali di accesso
 January=Gennaio
 February=Febbraio
 March=Marzo
@@ -520,8 +526,8 @@ ReportName=Nome report
 ReportPeriod=Periodo report
 ReportDescription=Descrizione
 Report=Report
-Keyword=Keyword
-Origin=Origin
+Keyword=Chiave
+Origin=Origine
 Legend=Legenda
 Fill=Completa
 Reset=Reset
@@ -586,14 +592,14 @@ GoBack=Torna indietro
 CanBeModifiedIfOk=Può essere modificato se valido
 CanBeModifiedIfKo=Può essere modificato se non valido
 ValueIsValid=Il valore è valido
-ValueIsNotValid=Value is not valid
-RecordCreatedSuccessfully=Record created successfully
+ValueIsNotValid=Il valore non è valido
+RecordCreatedSuccessfully=Record creato con success0
 RecordModifiedSuccessfully=Record modificati con successo
-RecordsModified=%s record modified
+RecordsModified=%s record modificati
 RecordsDeleted=%s record deleted
 AutomaticCode=Codice automatico
 FeatureDisabled=Funzionalità disabilitata
-MoveBox=Move widget
+MoveBox=Sposta widget
 Offered=Offerto
 NotEnoughPermissions=Non hai l'autorizzazione per svolgere questa azione
 SessionName=Nome sessione
@@ -606,7 +612,8 @@ PartialWoman=Parziale
 TotalWoman=Totale
 NeverReceived=Mai ricevuto
 Canceled=Annullato
-YouCanChangeValuesForThisListFromDictionarySetup=Puoi modificare i valori per questa lista dal menu setup - dizionario
+YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu Setup - Dictionaries
+YouCanChangeValuesForThisListFrom=You can change values for this list from menu %s
 YouCanSetDefaultValueInModuleSetup=Puoi definire il valore predefinito durante la creazione di un nuovo record nella configurazione del modulo
 Color=Colore
 Documents=Documenti
@@ -628,7 +635,7 @@ DisabledModules=Moduli disabilitati
 For=Per
 ForCustomer=Per i clienti
 Signature=Firma
-DateOfSignature=Date of signature
+DateOfSignature=Data della firma
 HidePassword=Mostra il comando con password offuscata
 UnHidePassword=Visualizza comando con password in chiaro
 Root=Root
@@ -642,11 +649,12 @@ FreeLineOfType=Libero inserimento del tipo
 CloneMainAttributes=Clona oggetto con i suoi principali attributi
 PDFMerge=Unisci PDF
 Merge=Unisci
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Mostra una pagina per stampare l'area principale
 MenuManager=Gestore dei menu
 WarningYouAreInMaintenanceMode=Attenzione, si è in modalità manutenzione. Solo <b>%s</b> ha il permesso di usare l'applicazione.
 CoreErrorTitle=Errore di sistema
-CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
+CoreErrorMessage=Si è verificato un errore. Controllare i log o contattare l'amministratore di sistema.
 CreditCard=Carta di credito
 FieldsWithAreMandatory=I campi con <b>%s</b> sono obbligatori
 FieldsWithIsForPublic=I campi con <b>%s</b> vengono mostrati nell'elenco pubblico dei membri. Per evitarlo, deseleziona la casella <b>pubblica.</b>
@@ -702,12 +710,13 @@ Test=Test
 Element=Elemento
 NoPhotoYet=Nessuna immagine disponibile
 Dashboard=Dashboard
-MyDashboard=My dashboard
+MyDashboard=Pannello principale
 Deductible=Deducibile
 from=da
 toward=verso
 Access=Accesso
 SelectAction=Seleziona azione
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Usa Ctrl+C per copiare negli appunti
 SaveUploadedFileWithMask=Salva il file sul server con il nome "<strong>%s</strong>" (oppure "%s")
 OriginFileName=Nome originale del file
@@ -718,7 +727,7 @@ ViewPrivateNote=Vedi note
 XMoreLines=%s linea(e) nascoste
 PublicUrl=URL pubblico
 AddBox=Aggiungi box
-SelectElementAndClickRefresh=Seleziona un elemento e clicca Aggiorna
+SelectElementAndClick=Select an element and click %s
 PrintFile=Stampa il file %s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Vai in Home -> Impostazioni -> Società per cambiare il logo o  in Home - Setup -> display per nasconderlo.
@@ -733,9 +742,9 @@ Mandatory=Obbligatorio
 Hello=Ciao
 Sincerely=Cordialmente
 DeleteLine=Elimina riga
-ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=Non è possibile generare PDF dai record selezionati
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+ConfirmDeleteLine=Vuoi davvero eliminare questa riga?
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=File creati da azioni di massa
 ShowTempMassFilesArea=Mostra i file creati da azioni di massa
@@ -745,21 +754,30 @@ Progress=Avanzamento
 ClickHere=Clicca qui
 FrontOffice=Front office
 BackOffice=Backoffice
-View=View
+View=Vista
 Export=Esportazione
 Exports=Esportazioni
-ExportFilteredList=Export filtered list
-ExportList=Export list
+ExportFilteredList=Esporta lista filtrata
+ExportList=Esporta lista
 Miscellaneous=Varie
 Calendar=Calendario
-GroupBy=Group by...
+GroupBy=Raggruppa per...
 ViewFlatList=View flat list
-RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Direct download link
+RemoveString=Rimuovi la stringa '%s'
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
+DirectDownloadLink=Collegamento diretto al download
 Download=Download
-ActualizeCurrency=Update currency rate
+ActualizeCurrency=Aggiorna tasso di cambio
 Fiscalyear=Anno fiscale
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Lunedì
 Tuesday=Martedì
@@ -817,5 +835,3 @@ SearchIntoContracts=Contratti
 SearchIntoCustomerShipments=Spedizioni cliente
 SearchIntoExpenseReports=Nota spese
 SearchIntoLeaves=Assenze
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/it_IT/other.lang b/htdocs/langs/it_IT/other.lang
index 30e09599bb2..11f987cbd8e 100644
--- a/htdocs/langs/it_IT/other.lang
+++ b/htdocs/langs/it_IT/other.lang
@@ -3,13 +3,26 @@ SecurityCode=Codice di sicurezza
 NumberingShort=N°
 Tools=Strumenti
 TMenuTools=Strumenti
-ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.<br /><br />All the tools can be reached in the left menu.
+ToolsDesc=<br/>Quest'area è dedicata agli strumenti di utilità generale.<br/>Questi strumenti permettono di gestire i dati, le risorse, le periferiche e le comunicazioni di massa.
 Birthday=Compleanno
 BirthdayDate=Data di nascita
 DateToBirth=Data di nascita
 BirthdayAlertOn=Attiva avviso compleanni
 BirthdayAlertOff=Avviso compleanni inattivo
-Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
+Notify_FICHINTER_ADD_CONTACT=Contatto aggiunto all'intervento
 Notify_FICHINTER_VALIDATE=Intervento convalidato
 Notify_FICHINTER_SENTBYMAIL=Intervento inviato per posta
 Notify_ORDER_VALIDATE=Ordine cliente convalidato
@@ -61,22 +74,23 @@ PredefinedMailTestHtml=Questa è una mail <b>di test</b> (la parola test deve ri
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ Qui troverete la fattura __REF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ Vorremmo avvertirvi che il __REF__ fattura sembra di non essere pagato. Quindi questa è la fattura in allegato di nuovo, come un promemoria. __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nAlleghiamo la proposta commerciale __PROPREF__ \n\n__PERSONALIZED__ Cordiali Saluti\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__ Troverete qui la richiesta di prezzo __ASKREF__ __PERSONALIZED__Cordialmente __SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nAlleghiamo l'ordine __ORDERREF__\n\n__PERSONALIZED__ Cordiali Saluti\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nAlleghiamo il nostro ordine __ORDERREF__\n\n__PERSONALIZED__Cordiali Saluti\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ Qui troverete la fattura __REF__ __PERSONALIZED__Cordialmente,  __SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nAlleghiamo il documento di trasporto __SHIPPINGREF__\n\n__PERSONALIZED__Cordiali Saluti\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nAlleghiamo l'intervento __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
-ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
+DemoDesc=Dolibarr è un ERP/CRM compatto composto di diversi moduli funzionali. Un demo comprendente tutti i moduli non ha alcun senso, perché un caso simile non esiste nella realtà. Sono dunque disponibili diversi profili demo.
+ChooseYourDemoProfil=Scegli il profilo demo che corrisponde alla tua attività ...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Gestisci i membri di una Fondazione
 DemoFundation2=Gestisci i membri e un conto bancario di una Fondazione
-DemoCompanyServiceOnly=Company or freelance selling service only
+DemoCompanyServiceOnly=Gestire un'attività freelance di vendita di soli servizi
 DemoCompanyShopWithCashDesk=Gestire un negozio con una cassa
-DemoCompanyProductAndStocks=Company selling products with a shop
-DemoCompanyAll=Company with multiple activities (all main modules)
+DemoCompanyProductAndStocks=Gestire una piccola o media azienda che vende prodotti
+DemoCompanyAll=Gestire una piccola o media azienda con più attività (tutti i moduli principali)
 CreatedBy=Creato da %s
 ModifiedBy=Modificato da %s
 ValidatedBy=Convalidato da %s
@@ -105,7 +119,7 @@ Right=Destra
 CalculatedWeight=Peso calcolato
 CalculatedVolume=volume calcolato
 Weight=Peso
-WeightUnitton=tonne
+WeightUnitton=t
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -140,27 +154,27 @@ SizeUnitinch=pollice
 SizeUnitfoot=piede
 SizeUnitpoint=punto
 BugTracker=Bug tracker
-SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address.<br />Change will become effective once you click on the confirmation link in the email.<br />Check your inbox.
+SendNewPasswordDesc=Questo modulo consente di richiedere una nuova password che verrà inviata al tuo indirizzo email.<br/> Il cambiamento sarà effettivo solo dopo aver cliccato sul link di conferma contenuto nell'email.<br/> Controlla la tua casella email.
 BackToLoginPage=Torna alla pagina di login
-AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br />In this mode, Dolibarr can't know nor change your password.<br />Contact your system administrator if you want to change your password.
-EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
+AuthenticationDoesNotAllowSendNewPassword=La modalità di autenticazione è <b>%s</b>.<br/>In questa modalità Dolibarr non può sapere né cambiare la tua password.<br/>Contatta l'amministratore di sistema se desideri cambiare password.
+EnableGDLibraryDesc=Per usare questa opzione bisogna installare o abilitare la libreria GD in PHP.
 ProfIdShortDesc=<b>Prof ID %s</b> è un dato dipendente dal paese terzo.<br/> Ad esempio, per il <b>paese %s,</b> è il <b>codice %s.</b>
 DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Statistiche per numero di unità
-StatsByNumberOfEntities=Statistiche per numero di entità
-NumberOfProposals=Numero di proposte degli ultimi 12 mesi
-NumberOfCustomerOrders=Numero di ordini clienti degli ultimi 12 mesi
-NumberOfCustomerInvoices=Numero di fatture clienti degli ultimi 12 mesi
-NumberOfSupplierProposals=Numero di proposte fornitori degli ultimi 12 mesi
-NumberOfSupplierOrders=Numero di ordini fornitori degli ultimi 12 mesi
-NumberOfSupplierInvoices=Numero di fatture fornitori degli ultimi 12 mesi
-NumberOfUnitsProposals=Numero di unità sulle proposte degli ultimi 12 mesi
-NumberOfUnitsCustomerOrders=Numero di unità sugli ordini clienti degli ultimi 12 mesi
-NumberOfUnitsCustomerInvoices=Numero di unità sulle fatture clienti degli ultimi 12 mesi
-NumberOfUnitsSupplierProposals=Numero di unità sulle proposte fornitori degli ultimi 12 mesi
-NumberOfUnitsSupplierOrders=Numero di unità sugli ordini fornitori degli ultimi 12 mesi
-NumberOfUnitsSupplierInvoices=Numero di unità sulle fatture fornitori degli ultimi 12 mesi
-EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
+EMailTextInterventionAddedContact=Ti è stato assegnato un nuovo intervento %s.
 EMailTextInterventionValidated=Intervento %s convalidato
 EMailTextInvoiceValidated=Fattura %s convalidata
 EMailTextProposalValidated=Proposta %s convalidata.
diff --git a/htdocs/langs/it_IT/projects.lang b/htdocs/langs/it_IT/projects.lang
index c94a449c4c4..69f321ed703 100644
--- a/htdocs/langs/it_IT/projects.lang
+++ b/htdocs/langs/it_IT/projects.lang
@@ -9,34 +9,39 @@ ProjectsArea=Sezione progetti
 ProjectStatus=Stato del progetto
 SharedProject=Progetto condiviso
 PrivateProject=Contatti del progetto
+ProjectsImContactFor=Projects I'm explicitely a contact of
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=Tutti i progetti
 MyProjectsDesc=Questa visualizzazione mostra solo i progetti in cui sei indicato come contatto (di qualsiasi tipo).
 ProjectsPublicDesc=Questa visualizzazione mostra tutti i progetti che sei autorizzato a vedere.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=Questa prospettiva presenta tutti i progetti e le attività a cui è permesso accedere.
 ProjectsDesc=Questa visualizzazione mostra tutti i progetti (hai i privilegi per vedere tutto).
-TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
+TasksOnProjectsDesc=Questa visualizzazione mostra tutti i compiti di ogni progetto (hai i privilegi per vedere tutto).
 MyTasksDesc=Questa visualizzazione mostra solo i progetti o i compiti in cui sei indicati come contatto (di qualsiasi tipo).
 OnlyOpenedProject=Sono visibili solamente i progetti aperti (i progetti con stato di bozza o chiusi non sono visibili).
-ClosedProjectsAreHidden=Closed projects are not visible.
+ClosedProjectsAreHidden=I progetti chiusi non sono visibili.
 TasksPublicDesc=Questa visualizzazione mostra tutti i progetti e i compiti che hai il permesso di vedere.
 TasksDesc=Questa visualizzazione mostra tutti i progetti e i compiti (hai i privilegi per vedere tutto).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
-ImportDatasetTasks=Tasks of projects
+AllTaskVisibleButEditIfYouAreAssigned=Tutti i compiti per questo progetto sono visibili, ma puoi allocare tempo lavorato solo ai compiti assegnati a te. Assegna a te stesso il compito se vuoi allocarvi tempo lavorato.
+OnlyYourTaskAreVisible=Solo i compiti assegnati a te sono visibili. Assegna a te stesso il compito se vuoi allocarvi tempo lavorato.
+ImportDatasetTasks=Compiti dei progetti
+ProjectCategories=Project tags/categories
 NewProject=Nuovo progetto
 AddProject=Crea progetto
 DeleteAProject=Elimina un progetto
 DeleteATask=Cancella un compito
-ConfirmDeleteAProject=Are you sure you want to delete this project?
-ConfirmDeleteATask=Are you sure you want to delete this task?
+ConfirmDeleteAProject=Vuoi davvero eliminare il progetto?
+ConfirmDeleteATask=Vuoi davvero eliminare questo compito?
 OpenedProjects=Progetti aperti
-OpenedTasks=Compiti aperti
-OpportunitiesStatusForOpenedProjects=Opportunità numero di progetti aperti per stato
-OpportunitiesStatusForProjects=Opportunities amount of projects by status
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpportunitiesStatusForProjects=Importo delle vendite potenziali per stato nei progetti
 ShowProject=Visualizza progetto
 SetProject=Imposta progetto
 NoProject=Nessun progetto definito o assegnato
 NbOfProjects=Num. di progetti
+NbOfTasks=Nb of tasks
 TimeSpent=Tempo lavorato
 TimeSpentByYou=Tempo impiegato da te
 TimeSpentByUser=Tempo impiegato dall'utente
@@ -49,7 +54,7 @@ TaskTimeNote=Nota
 TaskTimeDate=Data
 TasksOnOpenedProject=Compiti relativi a progetti aperti
 WorkloadNotDefined=Carico di lavoro non definito
-NewTimeSpent=Aggiungi tempo lavorato
+NewTimeSpent=Tempo lavorato
 MyTimeSpent=Il mio tempo lavorato
 Tasks=Compiti
 Task=Compito
@@ -58,26 +63,28 @@ TaskDateEnd=Data fine attività
 TaskDescription=Descrizione attività
 NewTask=Nuovo compito
 AddTask=Crea attività
-AddTimeSpent=Create time spent
+AddTimeSpent=Aggiungi tempo lavorato
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Operatività
 Activities=Compiti/operatività
 MyActivities=I miei compiti / operatività
 MyProjects=I miei progetti
-MyProjectsArea=My projects Area
+MyProjectsArea=Area progetti
 DurationEffective=Durata effettiva
 ProgressDeclared=Avanzamento dichiarato
 ProgressCalculated=Avanzamento calcolato
 Time=Tempo
-ListOfTasks=List of tasks
-GoToListOfTimeConsumed=Go to list of time consumed
-GoToListOfTasks=Go to list of tasks
+ListOfTasks=Lista dei compiti
+GoToListOfTimeConsumed=Vai all'elenco del tempo impiegato
+GoToListOfTasks=Vai all'elenco dei compiti
 ListProposalsAssociatedProject=Elenco delle proposte commerciali associate al progetto
-ListOrdersAssociatedProject=List of customer orders associated with the project
-ListInvoicesAssociatedProject=List of customer invoices associated with the project
-ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
-ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
-ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
+ListOrdersAssociatedProject=Elenco degli ordini associati al progetto
+ListInvoicesAssociatedProject=Elenco delle fatture attive associate al progetto
+ListPredefinedInvoicesAssociatedProject=Elenco dei modelli di fattura associati al progetto
+ListSupplierOrdersAssociatedProject=Elenco degli ordini fornitori associati al progetto
+ListSupplierInvoicesAssociatedProject=Elenco delle fatture passive associate al progetto
 ListContractAssociatedProject=Elenco dei contratti associati al progetto
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=Elenco degli interventi associati al progetto
 ListExpenseReportsAssociatedProject=Lista delle note spese associate con il progetto
 ListDonationsAssociatedProject=Lista delle donazioni associate al progetto
@@ -93,24 +100,25 @@ NotOwnerOfProject=Non sei proprietario di questo progetto privato
 AffectedTo=Assegnato a
 CantRemoveProject=Questo progetto non può essere rimosso: altri oggetti (fatture, ordini, ecc...) vi fanno riferimento. Guarda la scheda riferimenti.
 ValidateProject=Convalida progetto
-ConfirmValidateProject=Are you sure you want to validate this project?
+ConfirmValidateProject=Vuoi davvero convalidare il progetto?
 CloseAProject=Chiudi il progetto
-ConfirmCloseAProject=Are you sure you want to close this project?
-AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
+ConfirmCloseAProject=Vuoi davvero chiudere il progetto?
+AlsoCloseAProject=Chiudu anche il progetto (mantienilo aperto se hai ancora bisogno di seguire le attività in esso contenute)
 ReOpenAProject=Apri progetto
-ConfirmReOpenAProject=Are you sure you want to re-open this project?
+ConfirmReOpenAProject=Vuoi davvero riaprire il progetto?
 ProjectContact=Contatti del progetto
 ActionsOnProject=Azioni sul progetto
 YouAreNotContactOfProject=Non sei tra i contatti di questo progetto privato
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Cancella il tempo lavorato
-ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
+ConfirmDeleteATimeSpent=Vuoi davvero cancellare il tempo lavorato?
 DoNotShowMyTasksOnly=Mostra anche le attività non assegnate a me
 ShowMyTasksOnly=Mostra soltanto le attività assegnate a me
 TaskRessourceLinks=Risorse
 ProjectsDedicatedToThisThirdParty=Progetti dedicati a questo soggetto terzo
 NoTasks=Nessun compito per questo progetto
 LinkedToAnotherCompany=Collegato ad un altro soggetto terzo
-TaskIsNotAffectedToYou=Attività non assegnate a te
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=Il campo tempo lavorato è vuoto
 ThisWillAlsoRemoveTasks=Questa azione eliminerà anche tutti i compiti del progetto (al momento ci sono <b>%s</b> compiti) e tutto il tempo lavorato già inserito.
 IfNeedToUseOhterObjectKeepEmpty=Se qualche elemento (fattura, ordine, ...), appartenente ad un altro soggetto terzo deve essere collegato al progetto da creare, non compilare il campo per assegnare il progetto a più di un soggetto terzo.
@@ -120,25 +128,25 @@ CloneContacts=Clona contatti
 CloneNotes=Clona note
 CloneProjectFiles=Clona progetto con file collegati
 CloneTaskFiles=Clona i file collegati alle(a) attività (se le(a) attività sono clonate)
-CloneMoveDate=Update project/tasks dates from now?
-ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Change task dates according to new project start date
+CloneMoveDate=Vuoi davvero aggiornare le date di progetti e compiti a partire da oggi?
+ConfirmCloneProject=Vuoi davvero clonare il progetto?
+ProjectReportDate=Cambia la data del compito a seconda della data di inizio progetto
 ErrorShiftTaskDate=Impossibile cambiare la data del compito a seconda della data di inizio del progetto
 ProjectsAndTasksLines=Progetti e compiti
 ProjectCreatedInDolibarr=Progetto %s creato
-ProjectModifiedInDolibarr=Project %s modified
+ProjectModifiedInDolibarr=Progetto %s modificato
 TaskCreatedInDolibarr=Attività %s creata
 TaskModifiedInDolibarr=Attività %s modificata
 TaskDeletedInDolibarr=Attività %s cancellata
 OpportunityStatus=Stato Opportunità
 OpportunityStatusShort=Opp. stato
 OpportunityProbability=Probabilità oppotunità
-OpportunityProbabilityShort=Opp. probab.
+OpportunityProbabilityShort=Probabilità vendita
 OpportunityAmount=Ammontare opportunità
 OpportunityAmountShort=Opp. quantità
-OpportunityAmountAverageShort=Average Opp. amount
-OpportunityAmountWeigthedShort=Weighted Opp. amount
-WonLostExcluded=Won/Lost excluded
+OpportunityAmountAverageShort=Importo medio vendita
+OpportunityAmountWeigthedShort=Importo pesato vendita
+WonLostExcluded=Escluse acquisite/perse
 ##### Types de contacts #####
 TypeContact_project_internal_PROJECTLEADER=Capo progetto
 TypeContact_project_external_PROJECTLEADER=Capo progetto
@@ -151,41 +159,46 @@ TypeContact_project_task_external_TASKCONTRIBUTOR=Contributore
 SelectElement=Seleziona elemento
 AddElement=Link all'elemento
 # Documents models
-DocumentModelBeluga=Project template for linked objects overview
+DocumentModelBeluga=Modello di progetto per la panoramica sugli oggetti collegati
 DocumentModelBaleine=Modello per il report di un progetto completo
 PlannedWorkload=Carico di lavoro previsto
 PlannedWorkloadShort=Carico di lavoro
 ProjectReferers=Elementi correlati
 ProjectMustBeValidatedFirst=I progetti devono prima essere validati
-FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
+FirstAddRessourceToAllocateTime=Assegna una risorsa per allocare tempo
 InputPerDay=Input per giorno
 InputPerWeek=Input per settimana
 InputPerAction=Input per azione
-TimeAlreadyRecorded=Tempo impiegato e già registrato per questo compito/giorno e questo utente %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Progetti con questo utente come contatto
 TasksWithThisUserAsContact=Compiti assegnati a questo utente
 ResourceNotAssignedToProject=Non assegnato al progetto
-ResourceNotAssignedToTheTask=Not assigned to the task
+ResourceNotAssignedToTheTask=Risorsa non assegnata all'attività
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Assegnare un compito a me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Assegnare
 ProjectOverview=Panoramica
 ManageTasks=Utilizzare i progetti per seguire compiti e tempo
 ManageOpportunitiesStatus=Utilizzare i progetti per seguire clienti interessati/opportunità
 ProjectNbProjectByMonth=Num. di progetti creati per mese
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Quantità di opportunità per mese
 ProjectWeightedOppAmountOfProjectsByMonth=Quantità ponderata di opportunità per mese
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Le statistiche relative a progetti/clienti interessati
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Compito assegnato. Inserire i tempi per questo compito dovrebbe esserre possibile.
 IdTaskTime=Tempo compito id
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Progetti aperti da terze parti
-OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
-NotAnOpportunityShort=Not an opportunity
+YouCanCompleteRef=Se vuoi aggiungere informazioni al riferimento (per agevolare la ricerca tramite filtri), è opportuno separarle con un carattere "-" in modo che la numerazione automatica continui a funzionare correttamente per i progetti successivi (es: %s-ABC). Puoi aggiungere all'etichetta anche altre chiavi di ricerca.
+OpenedProjectsByThirdparties=Open projects by third parties
+OnlyOpportunitiesShort=Solo vendite potenziali
+OpenedOpportunitiesShort=Open opportunities
+NotAnOpportunityShort=Nessuna vendita potenziale
 OpportunityTotalAmount=Opportunità importo totale
 OpportunityPonderatedAmount=Opportunità importo ponderato
-OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
+OpportunityPonderatedAmountDesc=Importo vendite potenziali pesato con la probabilità
 OppStatusPROSP=Potenziale
 OppStatusQUAL=Qualificazione
 OppStatusPROPO=Proposta
diff --git a/htdocs/langs/ja_JP/accountancy.lang b/htdocs/langs/ja_JP/accountancy.lang
index 2db54463087..7d0d21f1255 100644
--- a/htdocs/langs/ja_JP/accountancy.lang
+++ b/htdocs/langs/ja_JP/accountancy.lang
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=General ledger
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
@@ -132,19 +140,19 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=List of the accounting accounts
 
 Pcgtype=Class of account
-Pcgsubtype=Under class of account
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=コー​​ド
+Nature=自然
+AccountingJournalType1=Various operation
+AccountingJournalType2=販売
+AccountingJournalType3=購入
+AccountingJournalType4=バンク
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Exports
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index d31d4d0bed2..ad4015ee27e 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=内部ユーザー
 ExternalUsers=外部ユーザー
 GUISetup=表示
 SetupArea=セットアップのエリア
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=ファイルのアップロードをテストするために形成します（設定に応じて）
 IfModuleEnabled=注：[はい]は、モジュールの<b>%sが</b>有効<b>になっ</b>ている場合にのみ有効です
 RemoveLock=それはアップデートツールの使用を可能にするために存在する場合は、ファイル<b>%sを</b>削除<b>します</b> 。
@@ -85,7 +86,7 @@ Mask=マスク
 NextValue=次の値
 NextValueForInvoices=次の値（請求書）
 NextValueForCreditNotes=次の値（クレジットメモ）
-NextValueForDeposit=Next value (deposit)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Next value (replacements)
 MustBeLowerThanPHPLimit=注意：PHPは、このパラメータの値が何であれ<b>、%s</b> %s <b>の</b>各ファイルのアップロードのサイズを制限する
 NoMaxSizeByPHPLimit=注：制限なしお使いのPHPの設定で設定されていません
@@ -103,7 +104,7 @@ MenuIdParent=親メニューのID
 DetailMenuIdParent=親メニューのID（上のメニューの場合は0）
 DetailPosition=メニューの位置を定義するには、ソート番号
 AllMenus=すべて
-NotConfigured=モジュール構成されていません
+NotConfigured=Module/Application not configured
 Active=アクティブ
 SetupShort=セットアップ
 OtherOptions=その他のオプション
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=桁区切り記号
 Destination=Destination
 IdModule=Module ID
 IdPermissions=Permissions ID
-Modules=モジュール
 LanguageBrowserParameter=パラメータ%s
 LocalisationDolibarrParameters=ローカリゼーションのパラメータ
 ClientTZ=Client Time Zone (user)
@@ -123,7 +123,8 @@ PHPTZ=タイムゾーンは、PHPサーバー
 DaylingSavingTime=夏時間（ユーザー）
 CurrentHour=時間PHP（サーバー）
 CurrentSessionTimeOut=現在のセッションのタイムアウト
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max number of lines for widgets
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=パーミッション
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=から要素のみ<a href="%s">対応のモジュールが</a>表示されます。
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=conf.phpで暗号化されたデータベース
 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=生成されたPDFファイル（推奨しない活性化、大量のPDF生成を壊す）の保護
-ProtectAndEncryptPdfFilesDesc=PDF文書の保護は、任意のPDFブラウザで読んで、印刷することが可能な保持されます。しかし、編集、およびコピーすることはもはや可能ではありません。この機能を使用すると、（未払いの請求書のように）動作していないグローバル累積PDFの建物を作ることに注意してください。
+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=機能
 DolibarrLicense=ライセンス
 Developpers=開発者/貢献者
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarrオンラインデモ
 OfficialMarketPlace=外部モジュール/アドオンの公式市場の場所
 OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
 ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=ユーザーまたは開発者のドキュメント（DOC、よくある質問（FAQ）...）のために、 <br> Dolibarr Wikiで見てみましょう。 <br> <a href="%s" target="_blank"><b>%s</b></a>
 ForAnswersSeeForum=他の質問/ヘルプについては、Dolibarrフォーラムを使用することができます。 <br> <a href="%s" target="_blank"><b>%s</b></a>
 HelpCenterDesc1=この領域には、Dolibarrのヘルプサポートサービスを取得することができます。
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=システムと同様にUnix上では使用できま
 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/
 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=モジュールのセットアップ
-ModulesSetup=モジュールのセットアップ
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=システム
 ModuleFamilyCrm=顧客関係管理（CRM）
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=Dolibarr現在のバージョン
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Update server offline
+WithCounter=Manage a counter
 GenericMaskCodes=任意の番号マスクを入力することができます。このマスクには、以下のタグを使用することができます。 <br> <b>{00万}</b>各%sにインクリメントされる番号に対応しています。カウンタの希望の長さなどの多くのゼロとして入力します。カウンタは、マスクとして多くのゼロとして持たせるために、左からゼロで完了する予定です。 <br> <b>{00万000}</b>以前のが、最初の%sから始まる適用されている+記号の右にある数字に対応するオフセットと同じです。 <br> <b>{00万@ x}の</b>前のと同じですが、カウンタが月、xは（1〜12、または0の間でXコンフィギュレーションで定義された会計年度の初めに数ヶ月を使用する）に達したときにゼロにリセットされます。このオプションを使用すると、xが2以上ある場合、その列{YY} {ミリメートル}または{yyyyは} {}ミリメートルも要求されます。 <br> <b>{DD}</b>日（01〜31）。 <br> <b>{}ミリメートル</b>月（01〜12）。 <br> 2、4、または1の数値以上<b>{YY}、{探す}</b>または<b>{Y}</b>年。 <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=マスク内の他のすべての文字はそのまま残ります。 <br>スペースは許可されていません。 <br>
-GenericMaskCodes4a=<u>サードパーティTheCompany第99 %s上の例では、2007年1月31日に行わ：</u> <br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>2007年3月1日で作成されたサードパーティの例：</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>
+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=定義されたマスクに応じてカスタマイズ可能な数を返します。
 ServerAvailableOnIPOrPort=サーバーはポート<b>%s</b>上のアドレス<b>%s</b>で入手できます。
 ServerNotAvailableOnIPOrPort=サーバーはポート<b>%s</b>上のアドレス<b>%s</b>では使用できません
@@ -369,19 +375,21 @@ Int=Integer
 Float=Float
 DateAndTime=Date and hour
 Unique=Unique
-Boolean=Boolean (Checkbox)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = 電話
 ExtrafieldPrice = 価格
 ExtrafieldMail = Email
 ExtrafieldUrl = Url
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=パスワード
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldRadio=Radio buttons (on 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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=フィールド
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=ユーザーとグループ
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=請求書、顧客のクレジットメモの管理。仕入先の
 Module40Name=サプライヤー
 Module40Desc=サプライヤーの管理と購買（注文書や請求書）
 Module42Name=ログ
-Module42Desc=ロギング機能（ファイル、syslog、...）
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=エディタ
 Module49Desc=エディタの管理
 Module50Name=製品
@@ -499,8 +521,8 @@ Module410Name=のwebcalendar
 Module410Desc=のwebcalendar統合
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=通知
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=のGeoIP Maxmindの変換機能
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
-Module4000Desc=Human resources management
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=マルチ会社
 Module5000Desc=あなたが複数の企業を管理することができます
 Module6000Name=Workflow
@@ -591,7 +615,7 @@ Permission32=製品を作成/変更
 Permission34=製品を削除します。
 Permission36=隠された製品を参照してください/管理
 Permission38=輸出製品
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=（私が連絡している共有プロジェクトとプロジェクト）のプロジェクトを削除します。
 Permission45=Export projects
@@ -844,12 +868,14 @@ DictionaryOrderMethods=注文方法
 DictionarySource=提案/受注の起源
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Emails templates
 DictionaryUnits=ユニット
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=セットアップは、保存された
+SetupNotSaved=Setup not saved
 BackToModuleList=モジュールリストに戻る
 BackToDictionaryList=辞書リストに戻る
 VATManagement=付加価値税管理
@@ -921,7 +947,7 @@ Host=サーバ
 DriverType=ドライバの種類
 SummarySystem=システム情報の概要
 SummaryConst=すべてのDolibarrセットアップパラメータのリスト
-MenuCompanySetup=会社/財団
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= 標準メニューマネージャ
 DefaultMenuSmartphoneManager=スマートフォンメニューマネージャ
 Skin=皮膚のテーマ
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Default max length for lists
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=その日のメッセージ
 MessageLogin=ログインページのメッセージ
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=左側のメニューの恒久的な検索フォーム
 DefaultLanguage=使用する既定の言語（言語コード）
 EnableMultilangInterface=多言語のインターフェイスをイネーブルにします。
 EnableShowLogo=左メニューのロゴを表示する
-CompanyInfo=会社/財団情報
-CompanyIds=会社/財団ID
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=名
 CompanyAddress=アドレス
 CompanyZip=ZIP
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=遅延会費のアラートの前に許容遅延時間
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=行うためのチェック預金のアラートの前に許容遅延時間（日数）
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=他のメニューエントリは、オプションのパラメータを管理することができます。
 LogEvents=セキュリティ監査イベント
 Audit=監査
@@ -987,7 +1015,7 @@ BrowserOS=Browser OS
 ListOfSecurityEvents=Dolibarrセキュリティイベントのリスト
 SecurityEventsPurged=セキュリティイベントのパージ
 LogEventDesc=ここDolibarrセキュリティイベントのロギングを有効にすることができます。 <b>監査-</b>管理者は、メニューの<b>システムツール</b>を介してそのコンテンツを見ることができます。警告は、この機能は、データベース内のデータを大量に消費することができます。
-AreaForAdminOnly=これらの機能は、 <b>管理者ユーザー</b>のみ ​​使用することができます。
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=システム情報では、読み取り専用モードでのみ管理者の目に見える得るその他の技術情報です。
 SystemAreaForAdminOnly=この領域は、管理者ユーザーのために利用可能です。 Dolibarr権限のいずれも、この制限を減らすことはできません。
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists 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
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=ユニークなイドプロ
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=<b>%s</b>形式にエクスポートするリンクは以下のリンクで入手可能です：%s
 ##### Invoices #####
 BillsSetup=請求書モジュールのセットアップ
 BillsNumberingModule=モジュールの番号請求書とクレジットメモ
 BillsPDFModules=請求書ドキュメントモデル
+PaymentsPDFModules=Payment documents models
 CreditNote=クレジットメモ
 CreditNotes=クレジットメモ
 ForceInvoiceDate=検証日に請求書の日付を強制的に
@@ -1302,7 +1333,7 @@ LDAPFieldCompanyExample=例：o
 LDAPFieldSid=SID
 LDAPFieldSidExample=例：objectSidが
 LDAPFieldEndLastSubscription=サブスクリプション終了の日付
-LDAPFieldTitle=Job position
+LDAPFieldTitle=職位
 LDAPFieldTitleExample=Example: title
 LDAPSetupNotComplete=（他のタブに行く）LDAPセットアップ完了していません
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=いいえ、管理者またはパスワードが提供されません。 LDAPのアクセスは匿名で、読み取り専用モードになります。
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
 FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
 FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
 CacheByServer=Cache by server
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
+CompressionOfResourcesDesc=For exemple 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 your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=製品モジュールのセットアップ
 ServiceSetup=サービスモジュールのセットアップ
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=使用される請求書の日付
 Buy=購入する
 Sell=販売
 InvoiceDateUsed=使用される請求書の日付
-YourCompanyDoesNotUseVAT=あなたの会社は付加価値税を（ - セットアップ - ホーム会社/財団）を使用しないように定義されているので、セットアップへのVATオプションはありません。
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=会計コード
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=モジュールのセットアップをダイヤルする]をクリックします
-ClickToDialUrlDesc=電話ピクトをクリックしが行われるときに、URLと呼ばれる。 URLでは、タグを使用することができます<br>呼び出すために人の電話番号に置き換えられます<b>__PHONETO__</b> <br>呼び出し人の電話番号（あなた）に置き換えられます<b>__PHONEFROM__</b> <br>あなたのclicktodialログイン（ユーザーカードに定義されています）に置き換えられます<b>__LOGIN__</b> <br>あなたのclicktodialパスワード（ユーザーカードに定義されています）に置き換えられます<b>__PASS__。</b>
+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.
 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 same computer than 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.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+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.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=一般的な表示順
 BankOrderES=スペイン語
 BankOrderESDesc=スペイン語の表示順​​序
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=マルチ会社のモジュールのセットアップ
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ 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.
 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.
-ConfFileMuseContainCustom=Installing 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)
 TextTitleColor=Color of page title
 LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/ja_JP/compta.lang b/htdocs/langs/ja_JP/compta.lang
index 5aa7c6c110f..4d1d4ae77ac 100644
--- a/htdocs/langs/ja_JP/compta.lang
+++ b/htdocs/langs/ja_JP/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using r
 Param=セットアップ
 RemainingAmountPayment=残りの金額の支払い：
 Account=アカウント
-Accountparent=Account parent
-Accountsparent=Accounts parent
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=収入
 Outcome=費用
 ReportInOut=収益/費用
@@ -56,6 +56,7 @@ MenuTaxAndDividends=税金と配当金
 MenuSocialContributions=Social/fiscal taxes
 MenuNewSocialContribution=New social/fiscal tax
 NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=会計/財務エリア
 NewPayment=新しいお支払い
@@ -134,8 +135,8 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- それは、クライアントから受け取った請求書のすべての効果的な支払いが含まれています。 <br> - これは、これらの請求書の支払日に基づいている<br>
-DepositsAreNotIncluded=- 入金請求書も含まれています
-DepositsAreIncluded=- デポジットの請求書が含まれています
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=第三者IRPFによる報告
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
 VATReport=VAT report
@@ -169,7 +170,7 @@ DescSellsJournal=セールスジャーナル
 DescPurchasesJournal=購入ジャーナル
 InvoiceRef=請求書参照。
 CodeNotDef=定義されていない
-WarningDepositsNotIncluded=預金請求書は、この会計モジュールでもこの​​バージョンに含まれていません。
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
 Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
@@ -189,8 +190,10 @@ AccountancyJournal=Accountancy code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/ja_JP/cron.lang b/htdocs/langs/ja_JP/cron.lang
index 3647d5769de..ed34f8a1655 100644
--- a/htdocs/langs/ja_JP/cron.lang
+++ b/htdocs/langs/ja_JP/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allow to execute job that have been planned
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Job
 CronNone=なし
 CronDtStart=Not before
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=無効にする
 CronTaskInactive=This job is disabled
 CronId=Id
-CronClassFile=Classes (filename.class.php)
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=から
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/ja_JP/errors.lang b/htdocs/langs/ja_JP/errors.lang
index 28da4e16c77..9f88ac112e1 100644
--- a/htdocs/langs/ja_JP/errors.lang
+++ b/htdocs/langs/ja_JP/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=ファイル<b>'%s'を</b>作成できませんでした
 ErrorFailToRenameDir=<b>&quot;%s&quot;</b>にディレクトリ<b>&quot;%s&quot;を</b>リネームに失敗しました。
 ErrorFailToCreateDir=ディレクトリ<b>'%s'を</b>作成できませんでした。
 ErrorFailToDeleteDir=ディレクトリ<b>'%s'を</b>削除できませんでした。
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=この連絡先は既にこのタイプの連絡先として定義されています。
 ErrorCashAccountAcceptsOnlyCashMoney=この銀行口座は現金勘定であるため、それが唯一のタイプの現金の支払を受け入れます。
 ErrorFromToAccountsMustDiffers=ソースとターゲットの銀行口座は異なっている必要があります。
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=ディレクトリ%sの書き込みに失敗しました
 ErrorFoundBadEmailInFile=ファイル内の%s線の発見誤った電子メールのシンタックス（電子メール= %sを使用したサンプルライン%s）
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=いくつかの必須フィールドが満たされていませんでした。
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=ディレクトリの作成に失敗しました。そのWebサーバのユーザがDolibarrのドキュメントディレクトリに書き込む権限を持って確認してください。パラメータの<b>safe_modeが</b>このPHPが有効になっている場合、Dolibarr PHPファイルは、Webサーバーのユーザー（またはグループ）に所有していることを確認してください。
 ErrorNoMailDefinedForThisUser=このユーザーに定義されたメールはありません
 ErrorFeatureNeedJavascript=この機能が動作するようにアクティブにするjavascriptをする必要があります。セットアップでこれを変更 - 表示されます。
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoice
 ErrorWebServerUserHasNotPermission=Webサーバを実行するユーザーアカウントを使用<b>%s</b>そのための権限を持っていない
 ErrorNoActivatedBarcode=活性化バーコード·タイプません
 ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # 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.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice
 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/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang
index e34383faf2a..2bfabf12f5c 100644
--- a/htdocs/langs/ja_JP/main.lang
+++ b/htdocs/langs/ja_JP/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=パラメータが定義されていない%s
 ErrorUnknown=Unknown error
 ErrorSQL=SQLエラー
 ErrorLogoFileNotFound=ロゴファイル '%s'が見つかりませんでした
-ErrorGoToGlobalSetup=&quot;会社/財団この問題を解決するためのセットアップに行く
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=これを修正するモジュールのセットアップに行く
 ErrorFailedToSendMail=（送信者= %s、受信機= %s）メールの送信に失敗しました
 ErrorFileNotUploaded=ファイルがアップロードされていませんでした。最大許容超えないようにサイズを確認し、その空き領域がディスク上で使用可能であり、すでにこのディレクトリ内の同じ名前のファイルが存在しないことに注意してください。
@@ -153,6 +153,7 @@ Edit=編集
 Validate=検証
 ValidateAndApprove=Validate and Approve
 ToValidate=検証するには
+NotValidated=Not validated
 Save=保存
 SaveAs=名前を付けて保存
 TestConnection=試験用接続
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=No applicative disconnect feature with authenticatio
 Connection=接続
 Setup=セットアップ
 Alert=警告
+MenuWarnings=アラート
 Previous=前
 Next=次の
 Cards=カード
@@ -308,6 +310,7 @@ Copy=コピー
 Paste=貼り付ける
 Default=デフォルト
 DefaultValue=デフォルト値
+DefaultValues=Default values
 Price=価格
 UnitPrice=単価
 UnitPriceHT=単価（純額）
@@ -363,7 +366,8 @@ VATRate=税率
 Average=平均
 Sum=合計
 Delta=デルタ
-Module=モジュール
+Module=Module/Application
+Modules=Modules/Applications
 Option=オプション
 List=リスト
 FullList=全リスト
@@ -387,7 +391,7 @@ ActionRunningNotStarted=開始するには
 ActionRunningShort=In progress
 ActionDoneShort=完成した
 ActionUncomplete=Uncomplete
-CompanyFoundation=会社/財団
+CompanyFoundation=Company/Organisation
 ContactsForCompany=このサードパーティの連絡先/ adresses
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
@@ -405,8 +409,9 @@ Generate=生成する
 Duration=持続
 TotalDuration=全持続時間
 Summary=要約
-DolibarrStateBoard=統計
-DolibarrWorkBoard=作業タスクボード
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=利用できる
 NotYetAvailable=まだ利用できません
 NotAvailable=利用できない
@@ -434,7 +439,7 @@ Reportings=報告
 Draft=ドラフト
 Drafts=ドラフト
 Validated=検証
-Opened=開かれた
+Opened=開く
 New=新しい
 Discount=割引
 Unknown=未知の
@@ -453,6 +458,7 @@ NextStep=次のステップ
 Datas=データ
 None=なし
 NoneF=なし
+NoneOrSeveral=None or several
 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.
 Photo=画像
@@ -606,7 +612,8 @@ PartialWoman=部分的な
 TotalWoman=合計
 NeverReceived=受信しませんでした
 Canceled=キャンセル
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
+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
 Color=カラー
 Documents=リンクされたファイル
@@ -642,6 +649,7 @@ FreeLineOfType=Free entry of type
 CloneMainAttributes=その主な属性を持つオブジェクトのクローンを作成する
 PDFMerge=PDFのマージ
 Merge=マージ
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=メインのコンテンツ領域を印刷するページを表示
 MenuManager=Menu manager
 WarningYouAreInMaintenanceMode=警告は、あなたがメンテナンスモードになっているので、唯一のログイン<b>%sは、</b>現時点ではアプリケーションの使用を許可されている。
@@ -708,6 +716,7 @@ from=from
 toward=toward
 Access=Access
 SelectAction=Select action
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
 SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
 OriginFileName=Original filename
@@ -718,7 +727,7 @@ ViewPrivateNote=View notes
 XMoreLines=%s line(s) hidden
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
+SelectElementAndClick=Select an element and click %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
@@ -734,8 +743,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=行を削除します
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
@@ -755,11 +764,20 @@ Calendar=カレンダー
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=月曜日
 Tuesday=火曜日
@@ -817,5 +835,3 @@ SearchIntoContracts=契約
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/ja_JP/other.lang b/htdocs/langs/ja_JP/other.lang
index 5f5b3009f47..ef87e73d04a 100644
--- a/htdocs/langs/ja_JP/other.lang
+++ b/htdocs/langs/ja_JP/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=誕生日
 BirthdayAlertOn=誕生日アラートアクティブ
 BirthdayAlertOff=非アクティブな誕生日アラート
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=介入は、検証
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=これは<b>テスト</b>メール（ワードテスト
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>教授イド%sは、</b>サードパーティの国に応じて情報です。 <br>たとえば、国<b>%s</b>のために、それはコード<b>%s</b>です。
 DolibarrDemo=Dolibarr ERP / CRMデモ
-StatsByNumberOfUnits=製品/サービス単位数の統計
-StatsByNumberOfEntities=参照エンティティの数の統計
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=介入%sが検証されています。
 EMailTextInvoiceValidated=請求書%sが検証されています。
diff --git a/htdocs/langs/ja_JP/projects.lang b/htdocs/langs/ja_JP/projects.lang
index 47da6022410..7bf41df7b9e 100644
--- a/htdocs/langs/ja_JP/projects.lang
+++ b/htdocs/langs/ja_JP/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=皆
 PrivateProject=プロジェクトの連絡先
+ProjectsImContactFor=Projects I'm explicitely a contact of
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=すべてのプロジェクト
 MyProjectsDesc=このビューは、（型が何であれ）の連絡先であるプロジェクトに限定されています。
 ProjectsPublicDesc=このビューには、読み取りを許可されているすべてのプロジェクトを紹介します。
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=このビューは、すべてのプロジェクトとタスク（あ
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=新しいプロジェクト
 AddProject=Create project
 DeleteAProject=プロジェクトを削除します。
 DeleteATask=タスクを削除する
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Opened projects
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=プロジェクトを表示する
 SetProject=プロジェクトを設定します。
 NoProject=はプロジェクトが定義されていませんまたは所有している
 NbOfProjects=プロジェクトのNb
+NbOfTasks=Nb of tasks
 TimeSpent=に費や​​された時間は
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
@@ -47,9 +52,9 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=ユーザー
 TaskTimeNote=注意
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
-NewTimeSpent=新たに費やされた時間は
+NewTimeSpent=に費や​​された時間は
 MyTimeSpent=私の時間を費やし
 Tasks=タスク
 Task=タスク
@@ -59,6 +64,7 @@ TaskDescription=Task description
 NewTask=新しいタスク
 AddTask=Create task
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=アクティビティ
 Activities=タスク/活動
 MyActivities=私の仕事/活動
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=プロジェクトに関連付けられている契約のリスト
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=プロジェクトに関連付けられている介入のリスト
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=プロジェクトの連絡先
 ActionsOnProject=プロジェクトのイベント
 YouAreNotContactOfProject=この民間プロジェクトの接触ではありません
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=費やした時間を削除します。
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
@@ -110,7 +118,7 @@ TaskRessourceLinks=資源
 ProjectsDedicatedToThisThirdParty=この第三者に専用のプロジェクト
 NoTasks=このプロジェクトのための作業をしない
 LinkedToAnotherCompany=他の第三者へのリンク
-TaskIsNotAffectedToYou=Task not assigned to you
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=費やした時間は空です
 ThisWillAlsoRemoveTasks=このアクションは、プロジェクトのすべてのタスク（現時点では<b>%s</b>タスク）と過ごした時間のすべての入力を削除します。
 IfNeedToUseOhterObjectKeepEmpty=いくつかのオブジェクト（請求書、注文、...）、別の第三者に属するが、作成するプロジェクトにリンクする必要がある場合は、複数のサードパーティ中のプロジェクトを持っているこの空を保持します。
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
 ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/ka_GE/accountancy.lang b/htdocs/langs/ka_GE/accountancy.lang
index 4c2336b97b0..31b54e83c5b 100644
--- a/htdocs/langs/ka_GE/accountancy.lang
+++ b/htdocs/langs/ka_GE/accountancy.lang
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=General ledger
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
@@ -132,19 +140,19 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=List of the accounting accounts
 
 Pcgtype=Class of account
-Pcgsubtype=Under class of account
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Code
+Nature=Nature
+AccountingJournalType1=Various operation
+AccountingJournalType2=Sales
+AccountingJournalType3=Purchases
+AccountingJournalType4=Bank
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Exports
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/ka_GE/admin.lang b/htdocs/langs/ka_GE/admin.lang
index 9602601e241..6851d698625 100644
--- a/htdocs/langs/ka_GE/admin.lang
+++ b/htdocs/langs/ka_GE/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=Internal users
 ExternalUsers=External users
 GUISetup=Display
 SetupArea=Setup area
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form to test file upload (according to setup)
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
@@ -85,7 +86,7 @@ Mask=Mask
 NextValue=Next value
 NextValueForInvoices=Next value (invoices)
 NextValueForCreditNotes=Next value (credit notes)
-NextValueForDeposit=Next value (deposit)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Next value (replacements)
 MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to <b>%s</b> %s, whatever this parameter's value is
 NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
@@ -103,7 +104,7 @@ MenuIdParent=Parent menu ID
 DetailMenuIdParent=ID of parent menu (empty for a top menu)
 DetailPosition=Sort number to define menu position
 AllMenus=All
-NotConfigured=Module not configured
+NotConfigured=Module/Application not configured
 Active=Active
 SetupShort=Setup
 OtherOptions=Other options
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Thousand separator
 Destination=Destination
 IdModule=Module ID
 IdPermissions=Permissions ID
-Modules=Modules
 LanguageBrowserParameter=Parameter %s
 LocalisationDolibarrParameters=Localisation parameters
 ClientTZ=Client Time Zone (user)
@@ -123,7 +123,8 @@ PHPTZ=PHP server Time Zone
 DaylingSavingTime=Daylight saving time
 CurrentHour=PHP Time (server)
 CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max number of lines for widgets
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activat
 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 (Activated 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 make building of a global cumulated pdf not working (like unpaid invoices).
+ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature makes building of a global merged PDFs not working.
 Feature=Feature
 DolibarrLicense=License
 Developpers=Developers/contributors
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr online demo
 OfficialMarketPlace=Official market place for external modules/addons
 OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
 ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your
 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/
 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 setup
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Update server offline
+WithCounter=Manage a counter
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
 ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
 ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
@@ -369,19 +375,21 @@ Int=Integer
 Float=Float
 DateAndTime=Date and hour
 Unique=Unique
-Boolean=Boolean (Checkbox)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Phone
 ExtrafieldPrice = Price
 ExtrafieldMail = Email
 ExtrafieldUrl = Url
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Password
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldRadio=Radio buttons (on 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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Field
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=Invoice and credit note management for customers. Invoice managemen
 Module40Name=Suppliers
 Module40Desc=Supplier management and buying (orders and invoices)
 Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Products
@@ -499,8 +521,8 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Notifications
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
-Module4000Desc=Human resources management
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow
@@ -591,7 +615,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects i'm contact for)
 Permission45=Export projects
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Emails templates
 DictionaryUnits=Units
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Setup saved
+SetupNotSaved=Setup not saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
 VATManagement=VAT Management
@@ -921,7 +947,7 @@ Host=Server
 DriverType=Driver type
 SummarySystem=System information summary
 SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Foundation
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= Standard menu manager
 DefaultMenuSmartphoneManager=Smartphone menu manager
 Skin=Skin theme
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Default max length for lists
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=Message of the day
 MessageLogin=Login page message
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/foundation information
-CompanyIds=Company/foundation identities
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=Name
 CompanyAddress=Address
 CompanyZip=Zip
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Other menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Audit
@@ -987,7 +1015,7 @@ BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
 LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists 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
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Rules on Professional Ids
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####
 BillsSetup=Invoices module setup
 BillsNumberingModule=Invoices and credit notes numbering model
 BillsPDFModules=Invoice documents models
+PaymentsPDFModules=Payment documents models
 CreditNote=Credit note
 CreditNotes=Credit notes
 ForceInvoiceDate=Force invoice date to validation date
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
 FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
 FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
 CacheByServer=Cache by server
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
+CompressionOfResourcesDesc=For exemple 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 your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Products module setup
 ServiceSetup=Services module setup
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Invoice date used
 Buy=Buy
 Sell=Sell
 InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=Accountancy Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+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 your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
+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.
 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 same computer than 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.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+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.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=General display order
 BankOrderES=Spanish
 BankOrderESDesc=Spanish display order
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ 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.
 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.
-ConfFileMuseContainCustom=Installing 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)
 TextTitleColor=Color of page title
 LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/ka_GE/compta.lang b/htdocs/langs/ka_GE/compta.lang
index 5e9814369ec..94a3bd671ef 100644
--- a/htdocs/langs/ka_GE/compta.lang
+++ b/htdocs/langs/ka_GE/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using r
 Param=Setup
 RemainingAmountPayment=Amount payment remaining :
 Account=Account
-Accountparent=Account parent
-Accountsparent=Accounts parent
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=Income
 Outcome=Expense
 ReportInOut=Income / Expense
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Taxes and dividends
 MenuSocialContributions=Social/fiscal taxes
 MenuNewSocialContribution=New social/fiscal tax
 NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Accountancy/Treasury area
 NewPayment=New payment
@@ -134,8 +135,8 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from clients.<br>- It is based on the payment date of these invoices<br>
-DepositsAreNotIncluded=- Deposit invoices are nor included
-DepositsAreIncluded=- Deposit invoices are included
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
 VATReport=VAT report
@@ -169,7 +170,7 @@ DescSellsJournal=Sales Journal
 DescPurchasesJournal=Purchases Journal
 InvoiceRef=Invoice ref.
 CodeNotDef=Not defined
-WarningDepositsNotIncluded=Deposits invoices are not included in this version with this accountancy module.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
 Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
@@ -189,8 +190,10 @@ AccountancyJournal=Accountancy code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/ka_GE/cron.lang b/htdocs/langs/ka_GE/cron.lang
index b1e8bcb36d2..245fefe7af1 100644
--- a/htdocs/langs/ka_GE/cron.lang
+++ b/htdocs/langs/ka_GE/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allow to execute job that have been planned
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Job
 CronNone=None
 CronDtStart=Not before
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
-CronClassFile=Classes (filename.class.php)
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=From
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/ka_GE/errors.lang b/htdocs/langs/ka_GE/errors.lang
index 9e2eb6817ef..feada2d1b5a 100644
--- a/htdocs/langs/ka_GE/errors.lang
+++ b/htdocs/langs/ka_GE/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
 ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
 ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
 ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
 ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Some required fields were not filled.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoice
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # 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.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice
 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/ka_GE/main.lang b/htdocs/langs/ka_GE/main.lang
index 9ffa398137f..d7dde34acbb 100644
--- a/htdocs/langs/ka_GE/main.lang
+++ b/htdocs/langs/ka_GE/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=Parameter %s not defined
 ErrorUnknown=Unknown error
 ErrorSQL=SQL Error
 ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=Go to Module setup to fix this
 ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
 ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
@@ -153,6 +153,7 @@ Edit=Edit
 Validate=Validate
 ValidateAndApprove=Validate and Approve
 ToValidate=To validate
+NotValidated=Not validated
 Save=Save
 SaveAs=Save As
 TestConnection=Test connection
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=No applicative disconnect feature with authenticatio
 Connection=Connection
 Setup=Setup
 Alert=Alert
+MenuWarnings=Alerts
 Previous=Previous
 Next=Next
 Cards=Cards
@@ -308,6 +310,7 @@ Copy=Copy
 Paste=Paste
 Default=Default
 DefaultValue=Default value
+DefaultValues=Default values
 Price=Price
 UnitPrice=Unit price
 UnitPriceHT=Unit price (net)
@@ -363,7 +366,8 @@ VATRate=Tax Rate
 Average=Average
 Sum=Sum
 Delta=Delta
-Module=Module
+Module=Module/Application
+Modules=Modules/Applications
 Option=Option
 List=List
 FullList=Full list
@@ -387,7 +391,7 @@ ActionRunningNotStarted=To start
 ActionRunningShort=In progress
 ActionDoneShort=Finished
 ActionUncomplete=Uncomplete
-CompanyFoundation=Company/Foundation
+CompanyFoundation=Company/Organisation
 ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
@@ -405,8 +409,9 @@ Generate=Generate
 Duration=Duration
 TotalDuration=Total duration
 Summary=Summary
-DolibarrStateBoard=Statistics
-DolibarrWorkBoard=Work tasks board
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=Available
 NotYetAvailable=Not yet available
 NotAvailable=Not available
@@ -434,7 +439,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Opened
+Opened=Open
 New=New
 Discount=Discount
 Unknown=Unknown
@@ -453,6 +458,7 @@ NextStep=Next step
 Datas=Data
 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.
 Photo=Picture
@@ -606,7 +612,8 @@ PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
 Canceled=Canceled
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
+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
 Color=Color
 Documents=Linked files
@@ -642,6 +649,7 @@ FreeLineOfType=Free entry of type
 CloneMainAttributes=Clone object with its main attributes
 PDFMerge=PDF Merge
 Merge=Merge
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Show page to print main content area
 MenuManager=Menu manager
 WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only login <b>%s</b> is allowed to use application at the moment.
@@ -708,6 +716,7 @@ from=from
 toward=toward
 Access=Access
 SelectAction=Select action
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
 SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
 OriginFileName=Original filename
@@ -718,7 +727,7 @@ ViewPrivateNote=View notes
 XMoreLines=%s line(s) hidden
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
+SelectElementAndClick=Select an element and click %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
@@ -734,8 +743,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
@@ -755,11 +764,20 @@ Calendar=Calendar
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -817,5 +835,3 @@ SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/ka_GE/other.lang b/htdocs/langs/ka_GE/other.lang
index ab937ff3bab..b151614ce3c 100644
--- a/htdocs/langs/ka_GE/other.lang
+++ b/htdocs/langs/ka_GE/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=Date of birth
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Statistics in number of products/services units
-StatsByNumberOfEntities=Statistics in number of referring entities
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=The intervention %s has been validated.
 EMailTextInvoiceValidated=The invoice %s has been validated.
diff --git a/htdocs/langs/ka_GE/projects.lang b/htdocs/langs/ka_GE/projects.lang
index f9c603ce113..f40af2b963b 100644
--- a/htdocs/langs/ka_GE/projects.lang
+++ b/htdocs/langs/ka_GE/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
 PrivateProject=Project contacts
+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 (whatever is the type).
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=New project
 AddProject=Create project
 DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Opened projects
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
 SetProject=Set project
 NoProject=No project defined or owned
 NbOfProjects=Nb of projects
+NbOfTasks=Nb of tasks
 TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
@@ -47,9 +52,9 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
-NewTimeSpent=New time spent
+NewTimeSpent=Time spent
 MyTimeSpent=My time spent
 Tasks=Tasks
 Task=Task
@@ -59,6 +64,7 @@ TaskDescription=Task description
 NewTask=New task
 AddTask=Create task
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Activity
 Activities=Tasks/activities
 MyActivities=My tasks/activities
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=List of contracts associated with the project
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
 ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
@@ -110,7 +118,7 @@ TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
-TaskIsNotAffectedToYou=Task not assigned to you
+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.
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
 ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/km_KH/accountancy.lang b/htdocs/langs/km_KH/accountancy.lang
index 4c2336b97b0..31b54e83c5b 100644
--- a/htdocs/langs/km_KH/accountancy.lang
+++ b/htdocs/langs/km_KH/accountancy.lang
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=General ledger
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
@@ -132,19 +140,19 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=List of the accounting accounts
 
 Pcgtype=Class of account
-Pcgsubtype=Under class of account
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Code
+Nature=Nature
+AccountingJournalType1=Various operation
+AccountingJournalType2=Sales
+AccountingJournalType3=Purchases
+AccountingJournalType4=Bank
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Exports
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/km_KH/admin.lang b/htdocs/langs/km_KH/admin.lang
index 9602601e241..6851d698625 100644
--- a/htdocs/langs/km_KH/admin.lang
+++ b/htdocs/langs/km_KH/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=Internal users
 ExternalUsers=External users
 GUISetup=Display
 SetupArea=Setup area
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form to test file upload (according to setup)
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
@@ -85,7 +86,7 @@ Mask=Mask
 NextValue=Next value
 NextValueForInvoices=Next value (invoices)
 NextValueForCreditNotes=Next value (credit notes)
-NextValueForDeposit=Next value (deposit)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Next value (replacements)
 MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to <b>%s</b> %s, whatever this parameter's value is
 NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
@@ -103,7 +104,7 @@ MenuIdParent=Parent menu ID
 DetailMenuIdParent=ID of parent menu (empty for a top menu)
 DetailPosition=Sort number to define menu position
 AllMenus=All
-NotConfigured=Module not configured
+NotConfigured=Module/Application not configured
 Active=Active
 SetupShort=Setup
 OtherOptions=Other options
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Thousand separator
 Destination=Destination
 IdModule=Module ID
 IdPermissions=Permissions ID
-Modules=Modules
 LanguageBrowserParameter=Parameter %s
 LocalisationDolibarrParameters=Localisation parameters
 ClientTZ=Client Time Zone (user)
@@ -123,7 +123,8 @@ PHPTZ=PHP server Time Zone
 DaylingSavingTime=Daylight saving time
 CurrentHour=PHP Time (server)
 CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max number of lines for widgets
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activat
 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 (Activated 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 make building of a global cumulated pdf not working (like unpaid invoices).
+ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature makes building of a global merged PDFs not working.
 Feature=Feature
 DolibarrLicense=License
 Developpers=Developers/contributors
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr online demo
 OfficialMarketPlace=Official market place for external modules/addons
 OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
 ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your
 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/
 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 setup
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Update server offline
+WithCounter=Manage a counter
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
 ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
 ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
@@ -369,19 +375,21 @@ Int=Integer
 Float=Float
 DateAndTime=Date and hour
 Unique=Unique
-Boolean=Boolean (Checkbox)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Phone
 ExtrafieldPrice = Price
 ExtrafieldMail = Email
 ExtrafieldUrl = Url
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Password
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldRadio=Radio buttons (on 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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Field
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=Invoice and credit note management for customers. Invoice managemen
 Module40Name=Suppliers
 Module40Desc=Supplier management and buying (orders and invoices)
 Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Products
@@ -499,8 +521,8 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Notifications
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
-Module4000Desc=Human resources management
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow
@@ -591,7 +615,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects i'm contact for)
 Permission45=Export projects
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Emails templates
 DictionaryUnits=Units
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Setup saved
+SetupNotSaved=Setup not saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
 VATManagement=VAT Management
@@ -921,7 +947,7 @@ Host=Server
 DriverType=Driver type
 SummarySystem=System information summary
 SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Foundation
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= Standard menu manager
 DefaultMenuSmartphoneManager=Smartphone menu manager
 Skin=Skin theme
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Default max length for lists
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=Message of the day
 MessageLogin=Login page message
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/foundation information
-CompanyIds=Company/foundation identities
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=Name
 CompanyAddress=Address
 CompanyZip=Zip
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Other menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Audit
@@ -987,7 +1015,7 @@ BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
 LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists 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
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Rules on Professional Ids
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####
 BillsSetup=Invoices module setup
 BillsNumberingModule=Invoices and credit notes numbering model
 BillsPDFModules=Invoice documents models
+PaymentsPDFModules=Payment documents models
 CreditNote=Credit note
 CreditNotes=Credit notes
 ForceInvoiceDate=Force invoice date to validation date
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
 FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
 FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
 CacheByServer=Cache by server
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
+CompressionOfResourcesDesc=For exemple 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 your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Products module setup
 ServiceSetup=Services module setup
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Invoice date used
 Buy=Buy
 Sell=Sell
 InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=Accountancy Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+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 your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
+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.
 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 same computer than 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.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+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.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=General display order
 BankOrderES=Spanish
 BankOrderESDesc=Spanish display order
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ 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.
 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.
-ConfFileMuseContainCustom=Installing 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)
 TextTitleColor=Color of page title
 LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/km_KH/compta.lang b/htdocs/langs/km_KH/compta.lang
index 5e9814369ec..94a3bd671ef 100644
--- a/htdocs/langs/km_KH/compta.lang
+++ b/htdocs/langs/km_KH/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using r
 Param=Setup
 RemainingAmountPayment=Amount payment remaining :
 Account=Account
-Accountparent=Account parent
-Accountsparent=Accounts parent
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=Income
 Outcome=Expense
 ReportInOut=Income / Expense
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Taxes and dividends
 MenuSocialContributions=Social/fiscal taxes
 MenuNewSocialContribution=New social/fiscal tax
 NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Accountancy/Treasury area
 NewPayment=New payment
@@ -134,8 +135,8 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from clients.<br>- It is based on the payment date of these invoices<br>
-DepositsAreNotIncluded=- Deposit invoices are nor included
-DepositsAreIncluded=- Deposit invoices are included
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
 VATReport=VAT report
@@ -169,7 +170,7 @@ DescSellsJournal=Sales Journal
 DescPurchasesJournal=Purchases Journal
 InvoiceRef=Invoice ref.
 CodeNotDef=Not defined
-WarningDepositsNotIncluded=Deposits invoices are not included in this version with this accountancy module.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
 Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
@@ -189,8 +190,10 @@ AccountancyJournal=Accountancy code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/km_KH/cron.lang b/htdocs/langs/km_KH/cron.lang
index b1e8bcb36d2..245fefe7af1 100644
--- a/htdocs/langs/km_KH/cron.lang
+++ b/htdocs/langs/km_KH/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allow to execute job that have been planned
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Job
 CronNone=None
 CronDtStart=Not before
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
-CronClassFile=Classes (filename.class.php)
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=From
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/km_KH/errors.lang b/htdocs/langs/km_KH/errors.lang
index 9e2eb6817ef..feada2d1b5a 100644
--- a/htdocs/langs/km_KH/errors.lang
+++ b/htdocs/langs/km_KH/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
 ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
 ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
 ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
 ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Some required fields were not filled.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoice
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # 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.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice
 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/km_KH/main.lang b/htdocs/langs/km_KH/main.lang
index c4b9c8e9f5b..9bcf62f836a 100644
--- a/htdocs/langs/km_KH/main.lang
+++ b/htdocs/langs/km_KH/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=Parameter %s not defined
 ErrorUnknown=Unknown error
 ErrorSQL=SQL Error
 ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=Go to Module setup to fix this
 ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
 ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
@@ -153,6 +153,7 @@ Edit=Edit
 Validate=Validate
 ValidateAndApprove=Validate and Approve
 ToValidate=To validate
+NotValidated=Not validated
 Save=Save
 SaveAs=Save As
 TestConnection=Test connection
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=No applicative disconnect feature with authenticatio
 Connection=Connection
 Setup=Setup
 Alert=Alert
+MenuWarnings=Alerts
 Previous=Previous
 Next=Next
 Cards=Cards
@@ -308,6 +310,7 @@ Copy=Copy
 Paste=Paste
 Default=Default
 DefaultValue=Default value
+DefaultValues=Default values
 Price=Price
 UnitPrice=Unit price
 UnitPriceHT=Unit price (net)
@@ -363,7 +366,8 @@ VATRate=Tax Rate
 Average=Average
 Sum=Sum
 Delta=Delta
-Module=Module
+Module=Module/Application
+Modules=Modules/Applications
 Option=Option
 List=List
 FullList=Full list
@@ -387,7 +391,7 @@ ActionRunningNotStarted=To start
 ActionRunningShort=In progress
 ActionDoneShort=Finished
 ActionUncomplete=Uncomplete
-CompanyFoundation=Company/Foundation
+CompanyFoundation=Company/Organisation
 ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
@@ -405,8 +409,9 @@ Generate=Generate
 Duration=Duration
 TotalDuration=Total duration
 Summary=Summary
-DolibarrStateBoard=Statistics
-DolibarrWorkBoard=Work tasks board
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=Available
 NotYetAvailable=Not yet available
 NotAvailable=Not available
@@ -434,7 +439,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Opened
+Opened=Open
 New=New
 Discount=Discount
 Unknown=Unknown
@@ -453,6 +458,7 @@ NextStep=Next step
 Datas=Data
 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.
 Photo=Picture
@@ -606,7 +612,8 @@ PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
 Canceled=Canceled
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
+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
 Color=Color
 Documents=Linked files
@@ -642,6 +649,7 @@ FreeLineOfType=Free entry of type
 CloneMainAttributes=Clone object with its main attributes
 PDFMerge=PDF Merge
 Merge=Merge
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Show page to print main content area
 MenuManager=Menu manager
 WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only login <b>%s</b> is allowed to use application at the moment.
@@ -708,6 +716,7 @@ from=from
 toward=toward
 Access=Access
 SelectAction=Select action
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
 SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
 OriginFileName=Original filename
@@ -718,7 +727,7 @@ ViewPrivateNote=View notes
 XMoreLines=%s line(s) hidden
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
+SelectElementAndClick=Select an element and click %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
@@ -734,8 +743,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
@@ -755,11 +764,20 @@ Calendar=Calendar
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -817,5 +835,3 @@ SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/km_KH/other.lang b/htdocs/langs/km_KH/other.lang
index ab937ff3bab..b151614ce3c 100644
--- a/htdocs/langs/km_KH/other.lang
+++ b/htdocs/langs/km_KH/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=Date of birth
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Statistics in number of products/services units
-StatsByNumberOfEntities=Statistics in number of referring entities
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=The intervention %s has been validated.
 EMailTextInvoiceValidated=The invoice %s has been validated.
diff --git a/htdocs/langs/km_KH/projects.lang b/htdocs/langs/km_KH/projects.lang
index f9c603ce113..f40af2b963b 100644
--- a/htdocs/langs/km_KH/projects.lang
+++ b/htdocs/langs/km_KH/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
 PrivateProject=Project contacts
+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 (whatever is the type).
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=New project
 AddProject=Create project
 DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Opened projects
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
 SetProject=Set project
 NoProject=No project defined or owned
 NbOfProjects=Nb of projects
+NbOfTasks=Nb of tasks
 TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
@@ -47,9 +52,9 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
-NewTimeSpent=New time spent
+NewTimeSpent=Time spent
 MyTimeSpent=My time spent
 Tasks=Tasks
 Task=Task
@@ -59,6 +64,7 @@ TaskDescription=Task description
 NewTask=New task
 AddTask=Create task
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Activity
 Activities=Tasks/activities
 MyActivities=My tasks/activities
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=List of contracts associated with the project
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
 ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
@@ -110,7 +118,7 @@ TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
-TaskIsNotAffectedToYou=Task not assigned to you
+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.
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
 ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/kn_IN/accountancy.lang b/htdocs/langs/kn_IN/accountancy.lang
index 4c2336b97b0..31b54e83c5b 100644
--- a/htdocs/langs/kn_IN/accountancy.lang
+++ b/htdocs/langs/kn_IN/accountancy.lang
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=General ledger
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
@@ -132,19 +140,19 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=List of the accounting accounts
 
 Pcgtype=Class of account
-Pcgsubtype=Under class of account
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Code
+Nature=Nature
+AccountingJournalType1=Various operation
+AccountingJournalType2=Sales
+AccountingJournalType3=Purchases
+AccountingJournalType4=Bank
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Exports
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/kn_IN/admin.lang b/htdocs/langs/kn_IN/admin.lang
index 6fc574c14e1..25e356fda32 100644
--- a/htdocs/langs/kn_IN/admin.lang
+++ b/htdocs/langs/kn_IN/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=Internal users
 ExternalUsers=External users
 GUISetup=Display
 SetupArea=Setup area
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form to test file upload (according to setup)
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
@@ -85,7 +86,7 @@ Mask=Mask
 NextValue=Next value
 NextValueForInvoices=Next value (invoices)
 NextValueForCreditNotes=Next value (credit notes)
-NextValueForDeposit=Next value (deposit)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Next value (replacements)
 MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to <b>%s</b> %s, whatever this parameter's value is
 NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
@@ -103,7 +104,7 @@ MenuIdParent=Parent menu ID
 DetailMenuIdParent=ID of parent menu (empty for a top menu)
 DetailPosition=Sort number to define menu position
 AllMenus=All
-NotConfigured=Module not configured
+NotConfigured=Module/Application not configured
 Active=Active
 SetupShort=Setup
 OtherOptions=Other options
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Thousand separator
 Destination=Destination
 IdModule=Module ID
 IdPermissions=Permissions ID
-Modules=Modules
 LanguageBrowserParameter=Parameter %s
 LocalisationDolibarrParameters=Localisation parameters
 ClientTZ=Client Time Zone (user)
@@ -123,7 +123,8 @@ PHPTZ=PHP server Time Zone
 DaylingSavingTime=Daylight saving time
 CurrentHour=PHP Time (server)
 CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max number of lines for widgets
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activat
 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 (Activated 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 make building of a global cumulated pdf not working (like unpaid invoices).
+ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature makes building of a global merged PDFs not working.
 Feature=Feature
 DolibarrLicense=License
 Developpers=Developers/contributors
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr online demo
 OfficialMarketPlace=Official market place for external modules/addons
 OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
 ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your
 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/
 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 setup
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Update server offline
+WithCounter=Manage a counter
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
 ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
 ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
@@ -369,19 +375,21 @@ Int=Integer
 Float=Float
 DateAndTime=Date and hour
 Unique=Unique
-Boolean=Boolean (Checkbox)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = ದೂರವಾಣಿ
 ExtrafieldPrice = Price
 ExtrafieldMail = Email
 ExtrafieldUrl = Url
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Password
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldRadio=Radio buttons (on 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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Field
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=Invoice and credit note management for customers. Invoice managemen
 Module40Name=ಪೂರೈಕೆದಾರರು
 Module40Desc=Supplier management and buying (orders and invoices)
 Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Products
@@ -499,8 +521,8 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Notifications
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3100Name=ಸ್ಕೈಪ್
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
-Module4000Desc=Human resources management
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow
@@ -591,7 +615,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects i'm contact for)
 Permission45=Export projects
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Emails templates
 DictionaryUnits=Units
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Setup saved
+SetupNotSaved=Setup not saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
 VATManagement=VAT Management
@@ -921,7 +947,7 @@ Host=Server
 DriverType=Driver type
 SummarySystem=System information summary
 SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=ಕಂಪನಿ / ಫೌಂಡೇಶನ್
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= Standard menu manager
 DefaultMenuSmartphoneManager=Smartphone menu manager
 Skin=Skin theme
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Default max length for lists
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=Message of the day
 MessageLogin=Login page message
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/foundation information
-CompanyIds=Company/foundation identities
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=ಹೆಸರು
 CompanyAddress=ವಿಳಾಸ
 CompanyZip=Zip
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Other menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Audit
@@ -987,7 +1015,7 @@ BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
 LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists 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
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Rules on Professional Ids
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####
 BillsSetup=Invoices module setup
 BillsNumberingModule=Invoices and credit notes numbering model
 BillsPDFModules=Invoice documents models
+PaymentsPDFModules=Payment documents models
 CreditNote=Credit note
 CreditNotes=Credit notes
 ForceInvoiceDate=Force invoice date to validation date
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
 FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
 FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
 CacheByServer=Cache by server
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
+CompressionOfResourcesDesc=For exemple 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 your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Products module setup
 ServiceSetup=Services module setup
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Invoice date used
 Buy=Buy
 Sell=Sell
 InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=Accountancy Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+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 your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
+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.
 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 same computer than 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.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+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.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=General display order
 BankOrderES=Spanish
 BankOrderESDesc=Spanish display order
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ 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.
 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.
-ConfFileMuseContainCustom=Installing 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)
 TextTitleColor=Color of page title
 LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/kn_IN/compta.lang b/htdocs/langs/kn_IN/compta.lang
index 5e9814369ec..94a3bd671ef 100644
--- a/htdocs/langs/kn_IN/compta.lang
+++ b/htdocs/langs/kn_IN/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using r
 Param=Setup
 RemainingAmountPayment=Amount payment remaining :
 Account=Account
-Accountparent=Account parent
-Accountsparent=Accounts parent
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=Income
 Outcome=Expense
 ReportInOut=Income / Expense
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Taxes and dividends
 MenuSocialContributions=Social/fiscal taxes
 MenuNewSocialContribution=New social/fiscal tax
 NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Accountancy/Treasury area
 NewPayment=New payment
@@ -134,8 +135,8 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from clients.<br>- It is based on the payment date of these invoices<br>
-DepositsAreNotIncluded=- Deposit invoices are nor included
-DepositsAreIncluded=- Deposit invoices are included
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
 VATReport=VAT report
@@ -169,7 +170,7 @@ DescSellsJournal=Sales Journal
 DescPurchasesJournal=Purchases Journal
 InvoiceRef=Invoice ref.
 CodeNotDef=Not defined
-WarningDepositsNotIncluded=Deposits invoices are not included in this version with this accountancy module.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
 Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
@@ -189,8 +190,10 @@ AccountancyJournal=Accountancy code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/kn_IN/cron.lang b/htdocs/langs/kn_IN/cron.lang
index 0535c4b32d4..e7433e137ac 100644
--- a/htdocs/langs/kn_IN/cron.lang
+++ b/htdocs/langs/kn_IN/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allow to execute job that have been planned
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Job
 CronNone=ಯಾವುದೂ ಇಲ್ಲ
 CronDtStart=Not before
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
-CronClassFile=Classes (filename.class.php)
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=From
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/kn_IN/errors.lang b/htdocs/langs/kn_IN/errors.lang
index 9e2eb6817ef..feada2d1b5a 100644
--- a/htdocs/langs/kn_IN/errors.lang
+++ b/htdocs/langs/kn_IN/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
 ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
 ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
 ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
 ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Some required fields were not filled.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoice
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # 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.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice
 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/kn_IN/main.lang b/htdocs/langs/kn_IN/main.lang
index fe4ad62f967..6c858333c20 100644
--- a/htdocs/langs/kn_IN/main.lang
+++ b/htdocs/langs/kn_IN/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=Parameter %s not defined
 ErrorUnknown=Unknown error
 ErrorSQL=SQL Error
 ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=Go to Module setup to fix this
 ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
 ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
@@ -153,6 +153,7 @@ Edit=Edit
 Validate=Validate
 ValidateAndApprove=Validate and Approve
 ToValidate=To validate
+NotValidated=Not validated
 Save=Save
 SaveAs=Save As
 TestConnection=Test connection
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=No applicative disconnect feature with authenticatio
 Connection=Connection
 Setup=Setup
 Alert=Alert
+MenuWarnings=Alerts
 Previous=Previous
 Next=Next
 Cards=Cards
@@ -308,6 +310,7 @@ Copy=Copy
 Paste=Paste
 Default=Default
 DefaultValue=Default value
+DefaultValues=Default values
 Price=Price
 UnitPrice=Unit price
 UnitPriceHT=Unit price (net)
@@ -363,7 +366,8 @@ VATRate=Tax Rate
 Average=Average
 Sum=Sum
 Delta=Delta
-Module=Module
+Module=Module/Application
+Modules=Modules/Applications
 Option=Option
 List=List
 FullList=Full list
@@ -387,7 +391,7 @@ ActionRunningNotStarted=To start
 ActionRunningShort=In progress
 ActionDoneShort=Finished
 ActionUncomplete=Uncomplete
-CompanyFoundation=ಕಂಪನಿ / ಫೌಂಡೇಶನ್
+CompanyFoundation=Company/Organisation
 ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
@@ -405,8 +409,9 @@ Generate=Generate
 Duration=Duration
 TotalDuration=Total duration
 Summary=Summary
-DolibarrStateBoard=Statistics
-DolibarrWorkBoard=Work tasks board
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=Available
 NotYetAvailable=Not yet available
 NotAvailable=Not available
@@ -434,7 +439,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Opened
+Opened=ತೆರೆಯಲಾಗಿದೆ
 New=New
 Discount=Discount
 Unknown=ತಿಳಿದಿಲ್ಲ
@@ -453,6 +458,7 @@ NextStep=Next step
 Datas=Data
 None=ಯಾವುದೂ ಇಲ್ಲ
 NoneF=ಯಾವುದೂ ಇಲ್ಲ
+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.
 Photo=Picture
@@ -606,7 +612,8 @@ PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
 Canceled=Canceled
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
+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
 Color=Color
 Documents=Linked files
@@ -642,6 +649,7 @@ FreeLineOfType=Free entry of type
 CloneMainAttributes=Clone object with its main attributes
 PDFMerge=PDF Merge
 Merge=Merge
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Show page to print main content area
 MenuManager=Menu manager
 WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only login <b>%s</b> is allowed to use application at the moment.
@@ -708,6 +716,7 @@ from=from
 toward=toward
 Access=Access
 SelectAction=Select action
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
 SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
 OriginFileName=Original filename
@@ -718,7 +727,7 @@ ViewPrivateNote=View notes
 XMoreLines=%s line(s) hidden
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
+SelectElementAndClick=Select an element and click %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
@@ -734,8 +743,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
@@ -755,11 +764,20 @@ Calendar=Calendar
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -817,5 +835,3 @@ SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/kn_IN/other.lang b/htdocs/langs/kn_IN/other.lang
index 0c86b423cb0..8c8701310e6 100644
--- a/htdocs/langs/kn_IN/other.lang
+++ b/htdocs/langs/kn_IN/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=Date of birth
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Statistics in number of products/services units
-StatsByNumberOfEntities=Statistics in number of referring entities
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=The intervention %s has been validated.
 EMailTextInvoiceValidated=The invoice %s has been validated.
diff --git a/htdocs/langs/kn_IN/projects.lang b/htdocs/langs/kn_IN/projects.lang
index f9c603ce113..f40af2b963b 100644
--- a/htdocs/langs/kn_IN/projects.lang
+++ b/htdocs/langs/kn_IN/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
 PrivateProject=Project contacts
+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 (whatever is the type).
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=New project
 AddProject=Create project
 DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Opened projects
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
 SetProject=Set project
 NoProject=No project defined or owned
 NbOfProjects=Nb of projects
+NbOfTasks=Nb of tasks
 TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
@@ -47,9 +52,9 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
-NewTimeSpent=New time spent
+NewTimeSpent=Time spent
 MyTimeSpent=My time spent
 Tasks=Tasks
 Task=Task
@@ -59,6 +64,7 @@ TaskDescription=Task description
 NewTask=New task
 AddTask=Create task
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Activity
 Activities=Tasks/activities
 MyActivities=My tasks/activities
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=List of contracts associated with the project
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
 ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
@@ -110,7 +118,7 @@ TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
-TaskIsNotAffectedToYou=Task not assigned to you
+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.
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
 ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/ko_KR/accountancy.lang b/htdocs/langs/ko_KR/accountancy.lang
index 4c2336b97b0..31b54e83c5b 100644
--- a/htdocs/langs/ko_KR/accountancy.lang
+++ b/htdocs/langs/ko_KR/accountancy.lang
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=General ledger
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
@@ -132,19 +140,19 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=List of the accounting accounts
 
 Pcgtype=Class of account
-Pcgsubtype=Under class of account
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Code
+Nature=Nature
+AccountingJournalType1=Various operation
+AccountingJournalType2=Sales
+AccountingJournalType3=Purchases
+AccountingJournalType4=Bank
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Exports
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang
index c92c890a496..9c6d314a6d2 100644
--- a/htdocs/langs/ko_KR/admin.lang
+++ b/htdocs/langs/ko_KR/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=Internal users
 ExternalUsers=External users
 GUISetup=Display
 SetupArea=Setup area
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form to test file upload (according to setup)
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
@@ -85,7 +86,7 @@ Mask=Mask
 NextValue=Next value
 NextValueForInvoices=Next value (invoices)
 NextValueForCreditNotes=Next value (credit notes)
-NextValueForDeposit=Next value (deposit)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Next value (replacements)
 MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to <b>%s</b> %s, whatever this parameter's value is
 NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
@@ -103,7 +104,7 @@ MenuIdParent=Parent menu ID
 DetailMenuIdParent=ID of parent menu (empty for a top menu)
 DetailPosition=Sort number to define menu position
 AllMenus=All
-NotConfigured=Module not configured
+NotConfigured=Module/Application not configured
 Active=Active
 SetupShort=Setup
 OtherOptions=Other options
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Thousand separator
 Destination=Destination
 IdModule=Module ID
 IdPermissions=Permissions ID
-Modules=Modules
 LanguageBrowserParameter=Parameter %s
 LocalisationDolibarrParameters=Localisation parameters
 ClientTZ=Client Time Zone (user)
@@ -123,7 +123,8 @@ PHPTZ=PHP server Time Zone
 DaylingSavingTime=Daylight saving time
 CurrentHour=PHP Time (server)
 CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max number of lines for widgets
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activat
 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 (Activated 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 make building of a global cumulated pdf not working (like unpaid invoices).
+ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature makes building of a global merged PDFs not working.
 Feature=Feature
 DolibarrLicense=License
 Developpers=Developers/contributors
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr online demo
 OfficialMarketPlace=Official market place for external modules/addons
 OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
 ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your
 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/
 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 setup
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Update server offline
+WithCounter=Manage a counter
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
 ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
 ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
@@ -369,19 +375,21 @@ Int=Integer
 Float=Float
 DateAndTime=Date and hour
 Unique=Unique
-Boolean=Boolean (Checkbox)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Phone
 ExtrafieldPrice = Price
 ExtrafieldMail = Email
 ExtrafieldUrl = Url
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Password
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldRadio=Radio buttons (on 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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Field
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=Invoice and credit note management for customers. Invoice managemen
 Module40Name=Suppliers
 Module40Desc=Supplier management and buying (orders and invoices)
 Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Products
@@ -499,8 +521,8 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Notifications
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
-Module4000Desc=Human resources management
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow
@@ -591,7 +615,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects i'm contact for)
 Permission45=Export projects
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Emails templates
 DictionaryUnits=Units
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Setup saved
+SetupNotSaved=Setup not saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
 VATManagement=VAT Management
@@ -921,7 +947,7 @@ Host=Server
 DriverType=Driver type
 SummarySystem=System information summary
 SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Foundation
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= Standard menu manager
 DefaultMenuSmartphoneManager=Smartphone menu manager
 Skin=Skin theme
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Default max length for lists
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=Message of the day
 MessageLogin=Login page message
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/foundation information
-CompanyIds=Company/foundation identities
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=Name
 CompanyAddress=Address
 CompanyZip=Zip
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Other menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Audit
@@ -987,7 +1015,7 @@ BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
 LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists 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
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Rules on Professional Ids
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####
 BillsSetup=Invoices module setup
 BillsNumberingModule=Invoices and credit notes numbering model
 BillsPDFModules=Invoice documents models
+PaymentsPDFModules=Payment documents models
 CreditNote=Credit note
 CreditNotes=Credit notes
 ForceInvoiceDate=Force invoice date to validation date
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
 FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
 FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
 CacheByServer=Cache by server
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
+CompressionOfResourcesDesc=For exemple 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 your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Products module setup
 ServiceSetup=Services module setup
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Invoice date used
 Buy=Buy
 Sell=Sell
 InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=Accountancy Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+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 your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
+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.
 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 same computer than 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.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+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.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=General display order
 BankOrderES=스페인어
 BankOrderESDesc=Spanish display order
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ 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.
 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.
-ConfFileMuseContainCustom=Installing 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)
 TextTitleColor=Color of page title
 LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/ko_KR/compta.lang b/htdocs/langs/ko_KR/compta.lang
index dd86d8177cc..1fe127bd3a6 100644
--- a/htdocs/langs/ko_KR/compta.lang
+++ b/htdocs/langs/ko_KR/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using r
 Param=Setup
 RemainingAmountPayment=Amount payment remaining :
 Account=Account
-Accountparent=Account parent
-Accountsparent=Accounts parent
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=Income
 Outcome=Expense
 ReportInOut=Income / Expense
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Taxes and dividends
 MenuSocialContributions=Social/fiscal taxes
 MenuNewSocialContribution=New social/fiscal tax
 NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Accountancy/Treasury area
 NewPayment=New payment
@@ -134,8 +135,8 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from clients.<br>- It is based on the payment date of these invoices<br>
-DepositsAreNotIncluded=- Deposit invoices are nor included
-DepositsAreIncluded=- Deposit invoices are included
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
 VATReport=VAT report
@@ -169,7 +170,7 @@ DescSellsJournal=Sales Journal
 DescPurchasesJournal=Purchases Journal
 InvoiceRef=Invoice ref.
 CodeNotDef=지정하지 않음
-WarningDepositsNotIncluded=Deposits invoices are not included in this version with this accountancy module.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
 Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
@@ -189,8 +190,10 @@ AccountancyJournal=Accountancy code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/ko_KR/cron.lang b/htdocs/langs/ko_KR/cron.lang
index b1e8bcb36d2..245fefe7af1 100644
--- a/htdocs/langs/ko_KR/cron.lang
+++ b/htdocs/langs/ko_KR/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allow to execute job that have been planned
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Job
 CronNone=None
 CronDtStart=Not before
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
-CronClassFile=Classes (filename.class.php)
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=From
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/ko_KR/errors.lang b/htdocs/langs/ko_KR/errors.lang
index 9e2eb6817ef..feada2d1b5a 100644
--- a/htdocs/langs/ko_KR/errors.lang
+++ b/htdocs/langs/ko_KR/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
 ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
 ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
 ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
 ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Some required fields were not filled.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoice
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # 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.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice
 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/ko_KR/main.lang b/htdocs/langs/ko_KR/main.lang
index f0c2e5199e3..2e8a395da7a 100644
--- a/htdocs/langs/ko_KR/main.lang
+++ b/htdocs/langs/ko_KR/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=%s 매개변수를 지정할 수 없습니다
 ErrorUnknown=Unknown error
 ErrorSQL=SQL 오류
 ErrorLogoFileNotFound='%s' 로고 파일이 없습니다
-ErrorGoToGlobalSetup='회사/재단' 설정에서 수정하세요
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=모듈 설정에서 수정하세요
 ErrorFailedToSendMail=메일을 보내는 데 실패했습니다 (전송인=%s, 수취인=%s)
 ErrorFileNotUploaded=파일을 업로드할 수 없습니다. 파일 크기가 최대 허가 용량을 초과하지 않고, 디스크 내 충분한 저장 공간이 남아 있으며 또한 디렉토리에 같은 이름의 파일이 없는지를 확인하세요.
@@ -153,6 +153,7 @@ Edit=Edit
 Validate=Validate
 ValidateAndApprove=Validate and Approve
 ToValidate=To validate
+NotValidated=Not validated
 Save=Save
 SaveAs=Save As
 TestConnection=Test connection
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=No applicative disconnect feature with authenticatio
 Connection=Connection
 Setup=Setup
 Alert=Alert
+MenuWarnings=Alerts
 Previous=Previous
 Next=Next
 Cards=Cards
@@ -308,6 +310,7 @@ Copy=Copy
 Paste=Paste
 Default=Default
 DefaultValue=Default value
+DefaultValues=Default values
 Price=Price
 UnitPrice=Unit price
 UnitPriceHT=Unit price (net)
@@ -363,7 +366,8 @@ VATRate=Tax Rate
 Average=Average
 Sum=Sum
 Delta=Delta
-Module=Module
+Module=Module/Application
+Modules=Modules/Applications
 Option=Option
 List=List
 FullList=Full list
@@ -387,7 +391,7 @@ ActionRunningNotStarted=To start
 ActionRunningShort=In progress
 ActionDoneShort=Finished
 ActionUncomplete=Uncomplete
-CompanyFoundation=Company/Foundation
+CompanyFoundation=Company/Organisation
 ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
@@ -405,8 +409,9 @@ Generate=Generate
 Duration=Duration
 TotalDuration=Total duration
 Summary=Summary
-DolibarrStateBoard=Statistics
-DolibarrWorkBoard=Work tasks board
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=Available
 NotYetAvailable=Not yet available
 NotAvailable=Not available
@@ -434,7 +439,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Opened
+Opened=Open
 New=New
 Discount=할인
 Unknown=알 수 없음
@@ -453,6 +458,7 @@ NextStep=Next step
 Datas=Data
 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.
 Photo=Picture
@@ -606,7 +612,8 @@ PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
 Canceled=Canceled
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
+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
 Color=Color
 Documents=Linked files
@@ -642,6 +649,7 @@ FreeLineOfType=Free entry of type
 CloneMainAttributes=Clone object with its main attributes
 PDFMerge=PDF Merge
 Merge=Merge
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Show page to print main content area
 MenuManager=Menu manager
 WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only login <b>%s</b> is allowed to use application at the moment.
@@ -708,6 +716,7 @@ from=from
 toward=toward
 Access=Access
 SelectAction=Select action
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
 SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
 OriginFileName=Original filename
@@ -718,7 +727,7 @@ ViewPrivateNote=View notes
 XMoreLines=%s line(s) hidden
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
+SelectElementAndClick=Select an element and click %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
@@ -734,8 +743,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
@@ -755,11 +764,20 @@ Calendar=Calendar
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=월요일
 Tuesday=화요일
@@ -817,5 +835,3 @@ SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/ko_KR/other.lang b/htdocs/langs/ko_KR/other.lang
index ab937ff3bab..b151614ce3c 100644
--- a/htdocs/langs/ko_KR/other.lang
+++ b/htdocs/langs/ko_KR/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=Date of birth
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Statistics in number of products/services units
-StatsByNumberOfEntities=Statistics in number of referring entities
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=The intervention %s has been validated.
 EMailTextInvoiceValidated=The invoice %s has been validated.
diff --git a/htdocs/langs/ko_KR/projects.lang b/htdocs/langs/ko_KR/projects.lang
index f9c603ce113..f40af2b963b 100644
--- a/htdocs/langs/ko_KR/projects.lang
+++ b/htdocs/langs/ko_KR/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
 PrivateProject=Project contacts
+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 (whatever is the type).
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=New project
 AddProject=Create project
 DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Opened projects
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
 SetProject=Set project
 NoProject=No project defined or owned
 NbOfProjects=Nb of projects
+NbOfTasks=Nb of tasks
 TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
@@ -47,9 +52,9 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
-NewTimeSpent=New time spent
+NewTimeSpent=Time spent
 MyTimeSpent=My time spent
 Tasks=Tasks
 Task=Task
@@ -59,6 +64,7 @@ TaskDescription=Task description
 NewTask=New task
 AddTask=Create task
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Activity
 Activities=Tasks/activities
 MyActivities=My tasks/activities
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=List of contracts associated with the project
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
 ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
@@ -110,7 +118,7 @@ TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
-TaskIsNotAffectedToYou=Task not assigned to you
+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.
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
 ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/lo_LA/accountancy.lang b/htdocs/langs/lo_LA/accountancy.lang
index 68f9d424d02..9ba6ee06140 100644
--- a/htdocs/langs/lo_LA/accountancy.lang
+++ b/htdocs/langs/lo_LA/accountancy.lang
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=ບັນຊີ
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=General ledger
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
@@ -132,19 +140,19 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=List of the accounting accounts
 
 Pcgtype=Class of account
-Pcgsubtype=Under class of account
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Code
+Nature=Nature
+AccountingJournalType1=Various operation
+AccountingJournalType2=Sales
+AccountingJournalType3=Purchases
+AccountingJournalType4=ທະນາຄານ
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Exports
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang
index 061ca7cb059..1252bc1dcc2 100644
--- a/htdocs/langs/lo_LA/admin.lang
+++ b/htdocs/langs/lo_LA/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=Internal users
 ExternalUsers=External users
 GUISetup=Display
 SetupArea=Setup area
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form to test file upload (according to setup)
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
@@ -85,7 +86,7 @@ Mask=Mask
 NextValue=Next value
 NextValueForInvoices=Next value (invoices)
 NextValueForCreditNotes=Next value (credit notes)
-NextValueForDeposit=Next value (deposit)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Next value (replacements)
 MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to <b>%s</b> %s, whatever this parameter's value is
 NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
@@ -103,7 +104,7 @@ MenuIdParent=Parent menu ID
 DetailMenuIdParent=ID of parent menu (empty for a top menu)
 DetailPosition=Sort number to define menu position
 AllMenus=All
-NotConfigured=Module not configured
+NotConfigured=Module/Application not configured
 Active=Active
 SetupShort=Setup
 OtherOptions=Other options
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Thousand separator
 Destination=Destination
 IdModule=Module ID
 IdPermissions=Permissions ID
-Modules=Modules
 LanguageBrowserParameter=Parameter %s
 LocalisationDolibarrParameters=Localisation parameters
 ClientTZ=Client Time Zone (user)
@@ -123,7 +123,8 @@ PHPTZ=PHP server Time Zone
 DaylingSavingTime=Daylight saving time
 CurrentHour=PHP Time (server)
 CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max number of lines for widgets
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=ການອະນຸຍາດ
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activat
 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 (Activated 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 make building of a global cumulated pdf not working (like unpaid invoices).
+ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature makes building of a global merged PDFs not working.
 Feature=Feature
 DolibarrLicense=License
 Developpers=Developers/contributors
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr online demo
 OfficialMarketPlace=Official market place for external modules/addons
 OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
 ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your
 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/
 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 setup
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Update server offline
+WithCounter=Manage a counter
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
 ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
 ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
@@ -369,19 +375,21 @@ Int=Integer
 Float=Float
 DateAndTime=Date and hour
 Unique=Unique
-Boolean=Boolean (Checkbox)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Phone
 ExtrafieldPrice = Price
 ExtrafieldMail = Email
 ExtrafieldUrl = Url
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Password
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldRadio=Radio buttons (on 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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Field
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=Invoice and credit note management for customers. Invoice managemen
 Module40Name=Suppliers
 Module40Desc=Supplier management and buying (orders and invoices)
 Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Products
@@ -499,8 +521,8 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Notifications
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
-Module4000Desc=Human resources management
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow
@@ -591,7 +615,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects i'm contact for)
 Permission45=Export projects
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Emails templates
 DictionaryUnits=Units
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Setup saved
+SetupNotSaved=Setup not saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
 VATManagement=VAT Management
@@ -921,7 +947,7 @@ Host=Server
 DriverType=Driver type
 SummarySystem=System information summary
 SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Foundation
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= Standard menu manager
 DefaultMenuSmartphoneManager=Smartphone menu manager
 Skin=Skin theme
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Default max length for lists
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=Message of the day
 MessageLogin=Login page message
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/foundation information
-CompanyIds=Company/foundation identities
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=ຊື່
 CompanyAddress=Address
 CompanyZip=Zip
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Other menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Audit
@@ -987,7 +1015,7 @@ BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
 LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists 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
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Rules on Professional Ids
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####
 BillsSetup=Invoices module setup
 BillsNumberingModule=Invoices and credit notes numbering model
 BillsPDFModules=Invoice documents models
+PaymentsPDFModules=Payment documents models
 CreditNote=Credit note
 CreditNotes=Credit notes
 ForceInvoiceDate=Force invoice date to validation date
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
 FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
 FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
 CacheByServer=Cache by server
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
+CompressionOfResourcesDesc=For exemple 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 your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Products module setup
 ServiceSetup=Services module setup
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Invoice date used
 Buy=Buy
 Sell=Sell
 InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=Accountancy Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+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 your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
+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.
 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 same computer than 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.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+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.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=General display order
 BankOrderES=Spanish
 BankOrderESDesc=Spanish display order
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ 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.
 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.
-ConfFileMuseContainCustom=Installing 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)
 TextTitleColor=Color of page title
 LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/lo_LA/compta.lang b/htdocs/langs/lo_LA/compta.lang
index a156c99f6d9..b16ca4f1053 100644
--- a/htdocs/langs/lo_LA/compta.lang
+++ b/htdocs/langs/lo_LA/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using r
 Param=Setup
 RemainingAmountPayment=Amount payment remaining :
 Account=ບັນຊີ
-Accountparent=Account parent
-Accountsparent=Accounts parent
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=Income
 Outcome=Expense
 ReportInOut=Income / Expense
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Taxes and dividends
 MenuSocialContributions=Social/fiscal taxes
 MenuNewSocialContribution=New social/fiscal tax
 NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Accountancy/Treasury area
 NewPayment=New payment
@@ -134,8 +135,8 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from clients.<br>- It is based on the payment date of these invoices<br>
-DepositsAreNotIncluded=- Deposit invoices are nor included
-DepositsAreIncluded=- Deposit invoices are included
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
 VATReport=VAT report
@@ -169,7 +170,7 @@ DescSellsJournal=Sales Journal
 DescPurchasesJournal=Purchases Journal
 InvoiceRef=Invoice ref.
 CodeNotDef=Not defined
-WarningDepositsNotIncluded=Deposits invoices are not included in this version with this accountancy module.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
 Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
@@ -189,8 +190,10 @@ AccountancyJournal=Accountancy code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/lo_LA/cron.lang b/htdocs/langs/lo_LA/cron.lang
index 8b4f1c713c3..c8dd26f18ed 100644
--- a/htdocs/langs/lo_LA/cron.lang
+++ b/htdocs/langs/lo_LA/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allow to execute job that have been planned
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Job
 CronNone=None
 CronDtStart=Not before
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=ປິດການນຳໃຊ້
 CronTaskInactive=This job is disabled
 CronId=Id
-CronClassFile=Classes (filename.class.php)
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=From
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/lo_LA/errors.lang b/htdocs/langs/lo_LA/errors.lang
index 9e2eb6817ef..feada2d1b5a 100644
--- a/htdocs/langs/lo_LA/errors.lang
+++ b/htdocs/langs/lo_LA/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
 ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
 ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
 ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
 ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Some required fields were not filled.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoice
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # 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.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice
 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/lo_LA/main.lang b/htdocs/langs/lo_LA/main.lang
index 4471f368a65..2f42675b2e4 100644
--- a/htdocs/langs/lo_LA/main.lang
+++ b/htdocs/langs/lo_LA/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=Parameter %s not defined
 ErrorUnknown=Unknown error
 ErrorSQL=SQL Error
 ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=Go to Module setup to fix this
 ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
 ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
@@ -153,6 +153,7 @@ Edit=Edit
 Validate=Validate
 ValidateAndApprove=Validate and Approve
 ToValidate=To validate
+NotValidated=Not validated
 Save=Save
 SaveAs=Save As
 TestConnection=Test connection
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=No applicative disconnect feature with authenticatio
 Connection=Connection
 Setup=Setup
 Alert=Alert
+MenuWarnings=Alerts
 Previous=Previous
 Next=Next
 Cards=Cards
@@ -308,6 +310,7 @@ Copy=Copy
 Paste=Paste
 Default=Default
 DefaultValue=Default value
+DefaultValues=Default values
 Price=Price
 UnitPrice=Unit price
 UnitPriceHT=Unit price (net)
@@ -363,7 +366,8 @@ VATRate=Tax Rate
 Average=Average
 Sum=Sum
 Delta=Delta
-Module=Module
+Module=Module/Application
+Modules=Modules/Applications
 Option=Option
 List=ລາຍການ
 FullList=Full list
@@ -387,7 +391,7 @@ ActionRunningNotStarted=To start
 ActionRunningShort=In progress
 ActionDoneShort=Finished
 ActionUncomplete=Uncomplete
-CompanyFoundation=Company/Foundation
+CompanyFoundation=Company/Organisation
 ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
@@ -405,8 +409,9 @@ Generate=Generate
 Duration=Duration
 TotalDuration=Total duration
 Summary=Summary
-DolibarrStateBoard=Statistics
-DolibarrWorkBoard=Work tasks board
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=Available
 NotYetAvailable=Not yet available
 NotAvailable=Not available
@@ -434,7 +439,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Opened
+Opened=Open
 New=New
 Discount=Discount
 Unknown=Unknown
@@ -453,6 +458,7 @@ NextStep=Next step
 Datas=Data
 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.
 Photo=Picture
@@ -606,7 +612,8 @@ PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
 Canceled=Canceled
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
+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
 Color=Color
 Documents=Linked files
@@ -642,6 +649,7 @@ FreeLineOfType=Free entry of type
 CloneMainAttributes=Clone object with its main attributes
 PDFMerge=PDF Merge
 Merge=Merge
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Show page to print main content area
 MenuManager=Menu manager
 WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only login <b>%s</b> is allowed to use application at the moment.
@@ -708,6 +716,7 @@ from=from
 toward=toward
 Access=Access
 SelectAction=Select action
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
 SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
 OriginFileName=Original filename
@@ -718,7 +727,7 @@ ViewPrivateNote=View notes
 XMoreLines=%s line(s) hidden
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
+SelectElementAndClick=Select an element and click %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
@@ -734,8 +743,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
@@ -755,11 +764,20 @@ Calendar=Calendar
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -817,5 +835,3 @@ SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/lo_LA/other.lang b/htdocs/langs/lo_LA/other.lang
index e57d267ae08..84b1fa38edc 100644
--- a/htdocs/langs/lo_LA/other.lang
+++ b/htdocs/langs/lo_LA/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=Date of birth
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Statistics in number of products/services units
-StatsByNumberOfEntities=Statistics in number of referring entities
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=The intervention %s has been validated.
 EMailTextInvoiceValidated=The invoice %s has been validated.
diff --git a/htdocs/langs/lo_LA/projects.lang b/htdocs/langs/lo_LA/projects.lang
index d29957e1825..82afb02ec1b 100644
--- a/htdocs/langs/lo_LA/projects.lang
+++ b/htdocs/langs/lo_LA/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
 PrivateProject=Project contacts
+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 (whatever is the type).
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=New project
 AddProject=Create project
 DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Opened projects
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
 SetProject=Set project
 NoProject=No project defined or owned
 NbOfProjects=Nb of projects
+NbOfTasks=Nb of tasks
 TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
@@ -47,9 +52,9 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=ວັນທີ
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
-NewTimeSpent=New time spent
+NewTimeSpent=Time spent
 MyTimeSpent=My time spent
 Tasks=Tasks
 Task=Task
@@ -59,6 +64,7 @@ TaskDescription=Task description
 NewTask=New task
 AddTask=Create task
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Activity
 Activities=Tasks/activities
 MyActivities=My tasks/activities
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=List of contracts associated with the project
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
 ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
@@ -110,7 +118,7 @@ TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
-TaskIsNotAffectedToYou=Task not assigned to you
+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.
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
 ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/lt_LT/accountancy.lang b/htdocs/langs/lt_LT/accountancy.lang
index e07ab55aa6f..468919c7b6d 100644
--- a/htdocs/langs/lt_LT/accountancy.lang
+++ b/htdocs/langs/lt_LT/accountancy.lang
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=Pridėti apskaitos sąskaitą
 AccountAccounting=Apskaitos sąskaita
 AccountAccountingShort=Sąskaita
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=Didžioji knyga
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Pardavimų žurnalas
@@ -132,19 +140,19 @@ Sens=Sens
 Codejournal=Žurnalas
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Debetas ir Kreditas negali turėti reikšmę tuo pačiu metu,
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=Apskaitos sąskaitų sąrašas
 
 Pcgtype=Sąskaitų klasė
-Pcgsubtype=Sąskaitų poklasis
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Iš viso pardavimų marža
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Kodas
+Nature=Prigimtis
+AccountingJournalType1=Various operation
+AccountingJournalType2=Pardavimai
+AccountingJournalType3=Pirkimai
+AccountingJournalType4=Bankas
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Eksportas
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index e60da717f22..694a3c5edec 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=Vidiniai naudotojai
 ExternalUsers=Išoriniai naudotojai
 GUISetup=Atvaizdavimas
 SetupArea=Paruošimo sritis
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Failo-testo įkėlimo forma (pagal nustatymus)
 IfModuleEnabled=Pastaba: Patvirtinimas yra efektyvus tik, kai modulis <b>%s</b> yra aktyvus
 RemoveLock=Norint naudotis įkėlimo įrankiu, pašalinkite <b>%s</b> failą, jei toks egzistuoja
@@ -85,7 +86,7 @@ Mask=Kaukė
 NextValue=Sekanti vertė
 NextValueForInvoices=Sekanti vertė (sąskaitos)
 NextValueForCreditNotes=Sekanti verte (kredito žymės)
-NextValueForDeposit=Kita vertė (depozitas)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Kita vertė (papildymas)
 MustBeLowerThanPHPLimit=Pastaba: jūsų PHP riboja kiekvienos įkeliamo failo dydį iki <b>%s</b> %s, nesvarbu kokia būtų šio parametro vertė
 NoMaxSizeByPHPLimit=PHP konfiguracijoje ribos nepritaikytos
@@ -103,7 +104,7 @@ MenuIdParent=Pagrindinio meniu ID
 DetailMenuIdParent=Pagrindinio meniu ID (tuščias aukščiausiam meniu lygiui)
 DetailPosition=Meniu pozicijos eilės numeris
 AllMenus=Visi
-NotConfigured=Modulis nesukonfigūruotas
+NotConfigured=Module/Application not configured
 Active=Aktyvus
 SetupShort=Nustatymai
 OtherOptions=Kitos parinktys
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Tūkstančių skyriklis
 Destination=Paskirties vieta
 IdModule=Modulio ID
 IdPermissions=Leidimų ID
-Modules=Moduliai
 LanguageBrowserParameter=Parametro %-as
 LocalisationDolibarrParameters=Vietos parametrai
 ClientTZ=Kliento Laiko Juosta (vartotojas)
@@ -123,7 +123,8 @@ PHPTZ=PHP serverio Laiko Juosta
 DaylingSavingTime=Vasaros laikas
 CurrentHour=PHP serverio laikas 
 CurrentSessionTimeOut=Einamosios sesijos pertrauka
-YouCanEditPHPTZ=Norėdami nustatyti kitą PHP laiko juostą (neprivaloma), galite pabandyti pridėti failą .htacces su tokia linija "SetEnv TZ Europe/Paris".
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max number of lines for widgets
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Leidimai
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Rodomi tik elementai iš <a href="%s">leidžiami moduliai</a>.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Duomenų bazės slaptažodis užšifruotas conf.
 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=Generuojamų PDF failų apsauga (Activated NOT recomended, breaks mass pdf generation)
-ProtectAndEncryptPdfFilesDesc=PDF dokumento apsauga sudaro galimybę jį skaityti ir spausdinti bet kurioje PDF skaityklėje. Tačiau redagavimas ir kopijavimas yra nebegalimas. Dėmesio, naudojant šią funkciją, masinis sukauptų pdf failų apjungimas neveikia (kaip neapmokėtų sąskaitų).
+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=Savybė
 DolibarrLicense=Licencija
 Developpers=Kūrėjai/autoriai
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr tiesioginis demo
 OfficialMarketPlace=Oficiali išorinių Modulių/papildinių parduotuvė
 OfficialWebHostingService=Nurodomos Web prieglobos (hosting) paslaugos (Debesų priegloba (Cloud hosting))
 ReferencedPreferredPartners=Privilegijuoti partneriai
-OtherResources=Kiti resursai
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=Vartotojo arba kūrėjo dokumentacijos (doc, DUK ...) <br> ieškoti Dolibarr Wiki: <br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=Dėl kitų klausimų/pagalbos galite kreiptis į Dolibarr forumą: <br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Ši sritis gali padėti jums gauti Dolibarr Help žinyno palaikymo paslaugą
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=Funkcija negalima Unix tipo sistemose. Patikrinti el.
 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/
 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=Modulio nuostatos
-ModulesSetup=Moduliai nuostatos
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Sistema
 ModuleFamilyCrm=Ryšių su klientais valdymas (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=Dolibarr dabartinė versija
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Atnaujinti serverį offline
+WithCounter=Manage a counter
 GenericMaskCodes=Galite įvesti bet kokį užmaskuotą numeravimą. Šiame maskavime naudojamos sekančios žymės:<br><b>{000000}</b> atitinka skaičių, kuris bus padidinamas vienetu kiekvienam%s. Įveskite nulių iki pageidaujamo skaitiklio ilgio. Skaitiklis bus užpildomas nuliais iš kairės iki pilno skaitiklio ilgio. <br><b>{000000+000}</b> toks kaip paskutinis, bet nuokrypis atitinkantis numerį dešinėje už + ženklo taikomas pradedant pirmu %s. <br><b>{000000@x}</b> toks pat kaip ankstesnis, bet skaitiklis apnulinamas, kai pasiekiamas mėnuo x (x tarp 1 ir 12, arba naudojamas 0 pirmaisiais fiskalinių metų mėnesiais kaip aprašyta konfigūracijoje, arba 99 apnulinimui kiekvieną mėnesį). Jei ši opcija yra naudojama ir x yra 2 ar didesnis, tada seka {yy}{mm} arba {yyyy}{mm} taip pat reikalinga. <br><b>{dd}</b> diena (nuo 01 iki 31). <br><b>{mm}</b> mėnuo (nuo 01 iki 12). <br><b>{yy}<b/>, <b>{yyyy}</b> arba <b>{y}</b> metai, 2, 4 arba 1 skaitmenys. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Visi kiti simboliai maskuotėje išliks nepakitę.<br>Tarpai neleidžiami.<br>
-GenericMaskCodes4a=<u>Trečios šalies pavyzdys apie 99-us %s. Įmonė įkurta 2007-01-31:</u><br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Trečios šalies pavyzdys sukurtas 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Produkto pavyzdys sukurtas 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> duos <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> duos <b>0199-ZZZ/31/XXX</b>
+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=Grąžina taikomą numerį pagal nustatytą numeravimo maskuotę.
 ServerAvailableOnIPOrPort=Serveris yra pasiekiamas adresu <b>%s, prievadas (port) %s</b>
 ServerNotAvailableOnIPOrPort=Serveris nėra pasiekiamas adresu <b>%s, prievadas (port) %s</b>
@@ -369,19 +375,21 @@ Int=Sveikasis skaičius
 Float=Slankus
 DateAndTime=Data ir valanda
 Unique=Unikalus
-Boolean=Būlio ("paukščiukas")
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Telefonas
 ExtrafieldPrice = Kaina
 ExtrafieldMail = El. paštas
 ExtrafieldUrl = Url
 ExtrafieldSelect = Pasirinkti sąrašą
 ExtrafieldSelectList = Pasirinkite iš lentelės
-ExtrafieldSeparator=Separatorius
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Slaptažodis
-ExtrafieldCheckBox=Žymimasis langelis ("paukščiukas")
-ExtrafieldRadio=Opcijų mygtukai
-ExtrafieldCheckBoxFromList= Žymės langelis iš lentelės
+ExtrafieldRadio=Radio buttons (on choice only)
+ExtrafieldCheckBox=Checkboxes
+ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Nuoroda į objektą,
+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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Laukas
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Vartotojai ir grupės
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=Sąskaitų ir kreditinių sąskaitų valdymas klientams. Sąskaitų
 Module40Name=Tiekėjai
 Module40Desc=Tiekėjų valdymas ir pirkimai (užsakymai ir sąskaitos)
 Module42Name=Įrašai
-Module42Desc=Įregistravimo sąlygos (failas, syslog, ...)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Redaktoriai
 Module49Desc=Redaktoriaus valdymas
 Module50Name=Produktai
@@ -499,8 +521,8 @@ Module410Name=Web kalendorius
 Module410Desc=Web kalendoriaus integracija
 Module500Name=Specialios išlaidos
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Paskola
 Module520Desc=Paskolų valdymas
 Module600Name=Pranešimai
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP MaxMind konvertavimo galimybes
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=Žmogiškųjų išteklių valdymas (HRM)
-Module4000Desc=Human resources management
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi įmonė
 Module5000Desc=Jums leidžiama valdyti kelias įmones
 Module6000Name=Darbo eiga
@@ -591,7 +615,7 @@ Permission32=Sukurti/pakeisti produktus
 Permission34=Ištrinti produktus
 Permission36=Žiūrėti/tvarkyti paslėptus produktus
 Permission38=Eksportuoti produktus
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Ištrinti projektus (bendrus projektus ir projektus, apie kuriuos kalbama)
 Permission45=Export projects
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Užsakymų metodai
 DictionarySource=Pasiūlymų/užsakymų kilmė
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Sąskaitų plano modeliai
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=El.pašto pranešimų šablonai
 DictionaryUnits=Vienetai
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Nustatymai išsaugoti
+SetupNotSaved=Setup not saved
 BackToModuleList=Atgal į modulių sąrašą
 BackToDictionaryList=Atgal į žodynų sąrašą
 VATManagement=PVM valdymas
@@ -921,7 +947,7 @@ Host=Serveris
 DriverType=Tvarkyklės (driver) tipas
 SummarySystem=Sistemos informacijos santrauka
 SummaryConst=Visų Dolibarr nuostatų parametrų sąrašas
-MenuCompanySetup=Įmonė/Organizacija
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= Standartinio meniu valdytojas
 DefaultMenuSmartphoneManager=Smartphone meniu valdytojas
 Skin=Grafinio vaizdo (skin) tema
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Default max length for lists
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=Dienos pranešimas
 MessageLogin=Prisijungimo prie sistemos ekrano pranešimas
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Nuolatinė paieškos forma kairiajame meniu
 DefaultLanguage=Naudojama kalba pagal nutylėjimą (kalbos kodas)
 EnableMultilangInterface=Įjungti daugiakalbę sąsają
 EnableShowLogo=Rodyti logotipą kairiajame meniu
-CompanyInfo=Įmonės/Organizacijos informacija
-CompanyIds=Įmonės/Organizacijos tapatybės
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=Pavadinimas/Vardas
 CompanyAddress=Adresas
 CompanyZip=Pašto kodas
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Vėlavimo tolerancija (dienų) prieš perspėjimą dė
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Vėlavimo tolerancija (dienų) prieš perspėjimą dėl čekių depozito įvykdymo
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Kiti meniu įrašai valdo laisvai pasirenkamus (optional) parametrus.
 LogEvents=Saugumo audito įvykiai
 Audit=Auditas
@@ -987,7 +1015,7 @@ BrowserOS=Naršyklės OS
 ListOfSecurityEvents=Dolibarr saugumo įvykių sąrašas
 SecurityEventsPurged=Saugumo įvykiai išvalyti
 LogEventDesc=Čia galite leisti prisijungimą prie Dolibarr saugumo įvykių. Administratoriai gali matyti turinį per meniu <b>System Tools - Audit</b>. Įspėjimas, ši funkcija gali užimti didelį kiekį duomenų bazės atminties ir sulėtinti darbą.
-AreaForAdminOnly=Šios funkcijos gali būti naudojamos tik <b>administrator users</b>.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Sistemos informacija yra įvairi techninė informacija, kurią gausite tik skaitymo režimu, ir bus matoma tik sistemos administratoriams.
 SystemAreaForAdminOnly=Ši sritis yra skirta tik administratoriams. Nė vienas iš Dolibarr leidimų negali sumažinti šio apribojimo.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists in any language files
+TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Jūs turite įjungti bent 1 modulį
 ClassNotFoundIntoPathWarning=Klasė %s nerasta į PHP kelią
 YesInSummer=Taip vasarą
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Sesijų saugykla užšifruota Suhosin
 ConditionIsCurrently=Dabartinė būklė yra %s
 YouUseBestDriver=Jūs naudojate tvarkyklę %s, kuri yra geriausia tvarkyklė prieinama šiuo metu.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Profesionalių IDS taisyklės
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Eksporto nuorodą į <b>%s</b> formatą galima rasti šiuo adresu: %s
 ##### Invoices #####
 BillsSetup=Sąskaitos-faktūros modulio nuostatos
 BillsNumberingModule=Sąskaitų-faktūrų ir kredito avizų numeravimo modulis
 BillsPDFModules=Sąskaitų-faktūrų dokumentų moduliai
+PaymentsPDFModules=Payment documents models
 CreditNote=Kreditinė sąskaita-faktūra
 CreditNotes=Kreditinės sąskaitos-faktūros
 ForceInvoiceDate=Sąskaitos-faktūros data įsigalioja patvirtinimo datą
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=%s tipo failais nėra laikomi HTTP serverio tarpinėje spar
 FilesOfTypeCompressed=%s tipo failai yra suspausti HTTP serveryje
 FilesOfTypeNotCompressed=%s tipo failai nėra suspausti HTTP serveryje
 CacheByServer=Laikoma serverio atmintyje
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Laikoma naršyklės atmintyje
 CompressionOfResources=HTTP atsakymų suspaudimas
+CompressionOfResourcesDesc=For exemple using the Apache directive "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Toks automatinis aptikimas negalimas su naudojama naršykle
+DefaultValuesDesc=You can define/force here the default value you want to get when your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Produktų modulio nuostatos
 ServiceSetup=Paslaugų modulio nuostatos
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Naudojama sąskaitos-faktūros data
 Buy=Pirkti
 Sell=Parduoti
 InvoiceDateUsed=Naudojama sąskaitos-faktūros data
-YourCompanyDoesNotUseVAT=Jūsų įmonei yra nustatymas netaikyti PVM (Pagrindinis - Nustatymai - Įmonė/Organizacija), todėl čia nėra PVM variantų pasirinkimo.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=Apskaitos kodeksas
 AccountancyCodeSell=Pardavimo sąskaita. Kodas
 AccountancyCodeBuy=Pirkimo sąskaita. Kodas
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Nustatyti automatiškai šio įvykio būklę paieš
 AGENDA_DEFAULT_VIEW=Kurią kortelę norite atidaryti pagal nutylėjimą renkantis meniu Darbotvarkė
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial modulio nuostatos
-ClickToDialUrlDesc=Paspaudus telefono piktogramą kviečiamas URL. Galima naudoti žymes<br><b>__PHONETO__</b>, tam, kad pakeisti asmens, kuriam skambinama, telefono numeriu<br><b>__PHONEFROM__</b>, tam, kad pakeisti asmens, kuris skambina, telefono numeriu (Jūsų)<br><b>__LOGIN__</b>, tam, kad  pakeisti Jūsų ClickToDial prisijungimo vardu (nustatytu vartotojo kortelėje)<br><b>__PASS__</b>, tam, kad pakeisti Jūsų ClickToDial slaptažodį (nustatytą vartotojo kortelėje).
+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.
 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 same computer than 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.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+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.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=Bendra rodymo tvarka
 BankOrderES=Ispanų
 BankOrderESDesc=Ispanijos rodymo tvarka
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=Multi-įmonės modulio nustatymas
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ BackupDumpWizard=Duomenų bazės atsarginės kopijos failo kūrimo vedlys
 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.
 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.
-ConfFileMuseContainCustom=Installing 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)
 TextTitleColor=Color of page title
 LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/lt_LT/compta.lang b/htdocs/langs/lt_LT/compta.lang
index 178a643e61b..4467e9e42af 100644
--- a/htdocs/langs/lt_LT/compta.lang
+++ b/htdocs/langs/lt_LT/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using r
 Param=Nustatymai
 RemainingAmountPayment=Likusi mokėjimo suma:
 Account=Sąskaita
-Accountparent=Pagrindinė sąskaita (motina)
-Accountsparent=Pagrindinės sąskaitos (motinos)
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=Pajamos
 Outcome=Išlaidos
 ReportInOut=Pajamų/išlaidų
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Mokesčiai ir dividendai
 MenuSocialContributions=Social/fiscal taxes
 MenuNewSocialContribution=New social/fiscal tax
 NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Apskaitos/Iždo sritis
 NewPayment=Naujas mokėjimas
@@ -134,8 +135,8 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- Tai apima visus faktinius sąskaitų-faktūrų apmokėjimus, gautus iš klientų. <br>- Tai grindžiama šių sąskaitų-faktūrų apmokėjimo datomis.<br>
-DepositsAreNotIncluded=- Depozitų sąskaitos-faktūros neįtrauktos
-DepositsAreIncluded=- Depozitų sąskaitos-faktūros yra įtrauktos
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Ataskaita pagal trečiosios šalies IRPF
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
 VATReport=VAT report
@@ -169,7 +170,7 @@ DescSellsJournal=Pardavimų žurnalas
 DescPurchasesJournal=Pirkimų žurnalas
 InvoiceRef=Sąskaitos-faktūros nuoroda
 CodeNotDef=Neapibūdinta
-WarningDepositsNotIncluded=Depozitų sąskaitos-faktūros nėra įtrauktos į apskaitos modulį šioje versijoje.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Mokėjimo termino data negali būti mažesnė nei objekto data.
 Pcg_version=Chart of accounts models
 Pcg_type=Pcg tipas
@@ -189,8 +190,10 @@ AccountancyJournal=Accountancy code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/lt_LT/cron.lang b/htdocs/langs/lt_LT/cron.lang
index 49700c9d714..2e9fd168ccd 100644
--- a/htdocs/langs/lt_LT/cron.lang
+++ b/htdocs/langs/lt_LT/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allow to execute job that have been planned
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Darbas
 CronNone=Nė vienas
 CronDtStart=Not before
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Įjungti
 CronStatusInactiveBtn=Išjungti
 CronTaskInactive=Šis darbas yra išjungtas
 CronId=ID
-CronClassFile=Klasės (filename.class.php)
-CronModuleHelp=Dolibarr modulio aplanko vardas (taip pat dirba su išorės Dolibarr moduliu). <BR> Pvz.: Dolibarr Produkto objekto patraukimo metodas /htdocs/<u>product</u>/class/product.class.php, modulio reikšmė yra <i>product</i>
-CronClassFileHelp=Failo pavadinimas įkėlimui. <BR> Pvz.: Dolibarr Produkto objekto patraukimo metodas /htdocs/product/class/<u>product.class.php</u>, klasės failo vardo reikšmė yra <i>product.class.php</i>
-CronObjectHelp=Objekto pavadinimas įkėlimui. <BR> Pvz.:Dolibarr Produkto objekto patraukimo metodas /htdocs/product/clas/product.class.php, klasės failo vardo reikšmė yra <i>Product</i>
-CronMethodHelp=Objekto metodas įkėlimui. <BR> Pvz.: Dolibarr Produkto objekto patraukimo metodas /htdocs/product/class/product.class.php, metodo reikšmė yra <i>fecth</i>
-CronArgsHelp=Metodo argumentai. <BR> Pvz.: Dolibarr Produkto objekto patraukimo metodas /htdocs/product/class/product.class.php, parametrų reikšmė gali būti <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=Sistemos komandinė eilutė vykdymui
 CronCreateJob=Create new Scheduled Job
 CronFrom=Nuo
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/lt_LT/errors.lang b/htdocs/langs/lt_LT/errors.lang
index c00f0160604..d2297ca32e5 100644
--- a/htdocs/langs/lt_LT/errors.lang
+++ b/htdocs/langs/lt_LT/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Nepavyko sukurti failo '<b>%s</b>'.
 ErrorFailToRenameDir=Nepavyko pervadinti katalogo '<b>%s</b>' į '<b>%s</b>'
 ErrorFailToCreateDir=Nepavyko sukurti katalogo '<b>%s</b>'
 ErrorFailToDeleteDir=Nepavyko ištrinti katalogo '<b>%s</b>'
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=Šis kontaktas jau yra apibrėžtas kaip šio tipo kontaktas.
 ErrorCashAccountAcceptsOnlyCashMoney=Tai banko sąskaita yra pinigų sąskaita, todėl ji priima mokėjimus tik grynaisiais pinigais.
 ErrorFromToAccountsMustDiffers=Šaltinis ir tikslinės banko sąskaitos turi būti skirtingi.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Nepavyko įrašyti į katalogą %s
 ErrorFoundBadEmailInFile=Rasta neteisinga elektroninio pašto sintaksė failo eilutėje %s (eilutės pavyzdys %s su e-paštas=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Kai kurie privalomi laukai nėra užpildyti.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Nepavyko sukurti aplanko. Įsitikinkite, kad web serverio vartotojas turi teisę rašyti į Dolibarr dokumentų aplanką. Jei parametras <b>safe_mode</b> yra įjungtas šio PHP, patikrinkite, ar Dolibarr PHP failai priklauso web serverio vartotojui (ar jų grupei).
 ErrorNoMailDefinedForThisUser=Šiam klientui neapibrėžtas paštas
 ErrorFeatureNeedJavascript=Šiai funkcijai turi būti aktyvuotas Javascript, kad galėtumėte dirbti. Pakeiskite tai meniu Nustatymai-Ekranas.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoice
 ErrorWebServerUserHasNotPermission=Vartotojo sąskaita <b>%s</b> naudojama web serverio vykdymui neturi leidimo tam.
 ErrorNoActivatedBarcode=Nėra įjungta brūkšninio kodo tipo
 ErrUnzipFails=Nepavyko išpakuoti %s su ZipArchive
-ErrNoZipEngine=Nėra programos išpakuoti failui %s šiame PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=Failas %s turi būti Dolibarr zip paketas
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=PHP CURL nėra įdiegta, tai yra būtina kalbantis su PayPal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # 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.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice
 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/lt_LT/main.lang b/htdocs/langs/lt_LT/main.lang
index 68379d6399d..ca2af29824f 100644
--- a/htdocs/langs/lt_LT/main.lang
+++ b/htdocs/langs/lt_LT/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=Parametras %s neapibrėžtas
 ErrorUnknown=Nežinoma klaida
 ErrorSQL=SQL klaida
 ErrorLogoFileNotFound=Logotipo failas '%s' nerastas
-ErrorGoToGlobalSetup=Eiti į 'Įmonė/Organizacija' nustatymus išspręsti šią problemą
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=Eiti į Modulio nustatymus ir išspręsti šią problemą
 ErrorFailedToSendMail=Nepavyko išsiųsti laiško (siuntėjas=%s, gavėjas=%s)
 ErrorFileNotUploaded=Failas nebuvo įkeltas. Patikrinkite, ar jo dydis neviršija leistino, ar yra laisvos vietos diske ir ar jau nėra failo su tokiu pačiu pavadinimu šiame kataloge.
@@ -153,6 +153,7 @@ Edit=Redaguoti
 Validate=Patvirtinti
 ValidateAndApprove=Patvirtinti ir leisti
 ToValidate=Patvirtinti
+NotValidated=Not validated
 Save=Išsaugoti
 SaveAs=Įšsaugoti kaip
 TestConnection=Bandyti sujungimą
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=Nėra tinkamos atjungimo funkcijos su autentifikavim
 Connection=Sujungimas
 Setup=Nustatymai
 Alert=Įspėjimas
+MenuWarnings=Įspėjimai
 Previous=Ankstesnis
 Next=Sekantis
 Cards=Kortelės
@@ -308,6 +310,7 @@ Copy=Kopijuoti
 Paste=Įklijuoti
 Default=Pagal nutylėjimą
 DefaultValue=Reikšmė pagal nutylėjimą
+DefaultValues=Default values
 Price=Kaina
 UnitPrice=Vieneto kaina
 UnitPriceHT=Vieneto kaina (grynoji)
@@ -363,7 +366,8 @@ VATRate=Mokesčio tarifas
 Average=Vidutinis
 Sum=Suma
 Delta=Delta
-Module=Modulis
+Module=Module/Application
+Modules=Modules/Applications
 Option=Opcija
 List=Sąrašas
 FullList=Pilnas sąrašas
@@ -387,7 +391,7 @@ ActionRunningNotStarted=Pradėti
 ActionRunningShort=In progress
 ActionDoneShort=Baigtas
 ActionUncomplete=Nepilnas
-CompanyFoundation=Įmonė/Organizacija
+CompanyFoundation=Company/Organisation
 ContactsForCompany=Šios trečiosios šalies adresatas
 ContactsAddressesForCompany=Adresatai/adresai šiai trečiajai šaliai
 AddressesForCompany=Adresai šiai trečiajai šaliai
@@ -405,8 +409,9 @@ Generate=Generuoti
 Duration=Trukmė
 TotalDuration=Bendra trukmė
 Summary=Suvestinė
-DolibarrStateBoard=Statistika
-DolibarrWorkBoard=Darbo uždavinių lenta
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=Prieinamas
 NotYetAvailable=Dar nėra prieinamas
 NotAvailable=Nėra prieinamas
@@ -453,6 +458,7 @@ NextStep=Kitas žingsnis
 Datas=Duomenys
 None=Nė vienas
 NoneF=Nė vienas
+NoneOrSeveral=None or several
 Late=Vėlai
 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.
 Photo=Nuotrauka
@@ -606,7 +612,8 @@ PartialWoman=Dalinis
 TotalWoman=Visas
 NeverReceived=Niekada negautas
 Canceled=Atšauktas
-YouCanChangeValuesForThisListFromDictionarySetup=Jūs galite pakeisti reikšmes šiame sąraše iš meniu Nustatymai-Žodynas
+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
 Color=Spalva
 Documents=Susieti failai
@@ -642,6 +649,7 @@ FreeLineOfType=Nemokamas tipo įėjimas
 CloneMainAttributes=Klonuoti objektą su savo pagrindiniais atributais
 PDFMerge=PDF sujungimas
 Merge=Sujungti
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Rodyti puslapio pagrindinio turinio sritį spausdinimui
 MenuManager=Meniu vadovas
 WarningYouAreInMaintenanceMode=Perspėjimas. Jūs esate serviso režime, todėl tik prisijungimas <b>%s</b> leidžiamas naudotis programa einamu momentu.
@@ -708,6 +716,7 @@ from=nuo
 toward=būsimas
 Access=Priėjimas
 SelectAction=Select action
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Naudokite Ctrl+C kopijuoti į iškarpinę (clipboard)
 SaveUploadedFileWithMask=Išsaugokite failą serveryje su pavadinimu "<strong>%s</strong>" (kitaip "%s")
 OriginFileName=Originalus failo pavadinimas
@@ -718,7 +727,7 @@ ViewPrivateNote=Peržiūrėti pastabas
 XMoreLines=%s paslėptos eilutės
 PublicUrl=Viešas URL
 AddBox=Pridėti langelį
-SelectElementAndClickRefresh=Pasirinkite elementą ir spustelėkite Atnaujinti
+SelectElementAndClick=Select an element and click %s
 PrintFile=Spausdinti failą %s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Eiti į Pradžia - Nustatymai - Bendrovė, kad pakeisti logotipą arba eikite į Pradžia - Nustatymai - Ekranas, kad paslėpti.
@@ -734,8 +743,8 @@ Hello=Sveiki !
 Sincerely=Sincerely
 DeleteLine=Ištrinti eilutę
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
@@ -755,11 +764,20 @@ Calendar=Kalendorius
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiskaliniai metai
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Pirmadienis
 Tuesday=Antradienis
@@ -817,5 +835,3 @@ SearchIntoContracts=Sutartys
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Išlaidų ataskaitos
 SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/lt_LT/other.lang b/htdocs/langs/lt_LT/other.lang
index 1a7647cf207..eff7ebeab4d 100644
--- a/htdocs/langs/lt_LT/other.lang
+++ b/htdocs/langs/lt_LT/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=Gimimo data
 BirthdayAlertOn=Gimtadienio perspėjimas aktyvus
 BirthdayAlertOff=Gimtadienio perspėjimas neaktyvus
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=Intervencija patvirtinta
 Notify_FICHINTER_SENTBYMAIL=Intervencija nusiųsta paštu
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=Tai yra pašto <b>bandymas</b> (žodis bandymas turi būt
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nČia rasite komercinį pasiūlymą __ PROPREF__\n\n__ PERSONALIZED__Sincerely\n\n__ SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nČia rasite užsakymą __ ORDERREF__\n\n__ PERSONALIZED__Sincerely\n\n__ SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nČia rasite mūsų užsakymą __ ORDERREF__\n\n__ PERSONALIZED__Sincerely\n\n__ SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nČia rasite pakrovimo gabenimui dokumentą __ SHIPPINGREF__\n\n__ PERSONALIZED__Sincerely\n\n__ SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nČia rasite intervencijos dokumentą __ FICHINTERREF__\n\n__ PERSONALIZED__Sincerely\n\n__ SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n __ PERSONALIZED__ \n\n__ SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Prof ID%s</b> yra informacija, priklausoma nuo trečiosios šalies dalyvio šalies.<br>Pavyzdžiui, šaliai <b>%s</b>, jo kodas <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Produktų/paslaugų vienetų skaičių statistika
-StatsByNumberOfEntities=Susijusių subjektų skaičių statistika
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=Intervencija %s buvo patvirtinta
 EMailTextInvoiceValidated=Sąskaita-faktūra %s buvo patvirtinta
diff --git a/htdocs/langs/lt_LT/projects.lang b/htdocs/langs/lt_LT/projects.lang
index fe5adf133d1..ec5ef378aff 100644
--- a/htdocs/langs/lt_LT/projects.lang
+++ b/htdocs/langs/lt_LT/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=Projekto statusas
 SharedProject=Visi
 PrivateProject=Projekto kontaktai
+ProjectsImContactFor=Projects I'm explicitely a contact of
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=Visi projektai
 MyProjectsDesc=Šis vaizdas yra ribotas projektams, kuriems esate kontaktinis asmuo (koks bebūtų tipas).
 ProjectsPublicDesc=Šis vaizdas rodo visus projektus, kuriuos yra Jums leidžiama skaityti.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=Šis vaizdas rodo visus projektus ir užduotis (Jūsų vartotojo teis
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=Naujas projektas
 AddProject=Sukurti projektą
 DeleteAProject=Ištrinti projektą
 DeleteATask=Ištrinti užduotį
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Opened projects
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Rodyti projektą
 SetProject=Nustatykite projektą
 NoProject=Nėra apibrėžto ar turimo projekto
 NbOfProjects=Projektų skaičius
+NbOfTasks=Nb of tasks
 TimeSpent=Praleistas laikas
 TimeSpentByYou=Jūsų sugaištas laikas
 TimeSpentByUser=Vartotojo sugaištas laikas
@@ -47,9 +52,9 @@ TaskTimeSpent=Laikas, praleistas vykdant užduotis
 TaskTimeUser=Vartotojas
 TaskTimeNote=Pastaba
 TaskTimeDate=Data
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Užduotys atidarytuose projektuose
 WorkloadNotDefined=Darbo krūvis nėra apibrėžtas
-NewTimeSpent=Naujas praleistas laikas
+NewTimeSpent=Praleistas laikas
 MyTimeSpent=Mano praleistas laikas
 Tasks=Uždaviniai
 Task=Užduotis
@@ -59,6 +64,7 @@ TaskDescription=Užduoties aprašymas
 NewTask=Nauja užduotis
 AddTask=Sukurti užduotį
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Veikla
 Activities=Užduotys/veikla
 MyActivities=Mano užduotys/veikla
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Sudarytų sutarčių, susijusių su projektu, sąrašas
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=Intervencijų, susijusių su projektu, sąrašas
 ListExpenseReportsAssociatedProject=Išlaidų, susijusių su projektu, ataskaitų sąrašas.
 ListDonationsAssociatedProject=Paaukotų lėšų, susijusių su projektu, sąrašas.
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Projekto kontaktai
 ActionsOnProject=Projekto įvykiai
 YouAreNotContactOfProject=Jūs nesate šios privataus projekto kontaktinis adresatas
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Ištrinti praleistą laiką
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=Taip pat žiūrėti užduotis pavestas ne man
@@ -110,7 +118,7 @@ TaskRessourceLinks=Ištekliai
 ProjectsDedicatedToThisThirdParty=Projektai, skirti šiai trečiąjai šaliai
 NoTasks=Nėra uždavinių šiam projektui
 LinkedToAnotherCompany=Susijęs su kita trečiąja šalimi
-TaskIsNotAffectedToYou=Užduotis nėra priskirta jums
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=Praleistas laikas yra tuščias
 ThisWillAlsoRemoveTasks=Šis veiksmas taip pat ištrins visas projekto užduotis (<b>%s</b> užduotis šiuo metu) ir visus praleisto laiko įvestus duomenis.
 IfNeedToUseOhterObjectKeepEmpty=Jei kai kurie objektai (sąskaitos-faktūros, užsakymai, ...), priklausantys kitai trečiąjai šaliai, turi būti susiję su kuriamu projektu, laikykite šitą tuščią, kad projektas būtų kelių trečiųjų šalių (multi).
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Įvesčių per dieną
 InputPerWeek=Įvesčių per savaitę
 InputPerAction=Įvesčių vienam veiksmui
-TimeAlreadyRecorded=sugaištas laikas, jau įrašytas šiai užduočiai / dienai ir vartotojas %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projektai su šiuo vartotoju kaip kontaktu.
 TasksWithThisUserAsContact=Užduotys, priskirtos šiam vartotojui
 ResourceNotAssignedToProject=Nepriskirtas projektui
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
 ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/lv_LV/accountancy.lang b/htdocs/langs/lv_LV/accountancy.lang
index f4c34b6b7f4..115020e1028 100644
--- a/htdocs/langs/lv_LV/accountancy.lang
+++ b/htdocs/langs/lv_LV/accountancy.lang
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Konts
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=Virsgrāmata
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Konta bilance
 
 CAHTF=Total purchase supplier before tax
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
@@ -132,19 +140,19 @@ Sens=Sens
 Codejournal=Žurnāls
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Nav iestatīts
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Gads kurš jādzēš
 DelJournal=Žurnāls kurš jādzēš
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=Jauna transakcija
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=Trešo personu kontu saraksts
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=List of the accounting accounts
 
 Pcgtype=Class of account
-Pcgsubtype=Under class of account
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Kods
+Nature=Daba
+AccountingJournalType1=Various operation
+AccountingJournalType2=Pārdošanas
+AccountingJournalType3=Purchases
+AccountingJournalType4=Banka
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Eksports
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index f7e06ddafbd..e10b81e721c 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=Iekšējie lietotāji
 ExternalUsers=Ārējie lietotāji
 GUISetup=Attēlojums
 SetupArea=Iestatījumi
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Forma, lai pārbaudītu failu augšupielādi (pēc uiestatītajiem parametriem)
 IfModuleEnabled=Piezīme: jā, ir efektīva tikai tad, ja modulis <b>%s</b> ir iespējots
 RemoveLock=Dzēst failu <b>%s</b>, ja tāds ir, lai varētu izmantošanu atjaunināšanas rīku.
@@ -85,7 +86,7 @@ Mask=Maska
 NextValue=Nākošā vērtība
 NextValueForInvoices=Nākošā vērtība (rēķini)
 NextValueForCreditNotes=Nākošā vērtība (kredīta piezīmes)
-NextValueForDeposit=Tālāk vērtība (depozīts)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Tālāk vērtība (nomaiņa)
 MustBeLowerThanPHPLimit=Piezīme: jūsu PHP ierobežo katra failu augšupielādes lielumu, lai <b>%s</b> %s, neatkarīgi no šī parametra vērtība ir
 NoMaxSizeByPHPLimit=Piezīme: Nav limits tiek noteikts jūsu PHP konfigurācijā
@@ -103,7 +104,7 @@ MenuIdParent=Mātes izvēlne ID
 DetailMenuIdParent=ID vecāku izvēlnē (tukšs top izvēlnē)
 DetailPosition=Šķirot skaits definēt izvēlnes novietojumu
 AllMenus=Viss
-NotConfigured=Modulis nav konfigurēts
+NotConfigured=Module/Application not configured
 Active=Aktīvs
 SetupShort=Iestatījumi
 OtherOptions=Citas iespējas
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Tūkstošu atdalītājs
 Destination=Galamērķis
 IdModule=Module ID
 IdPermissions=Permissions ID
-Modules=Moduļi
 LanguageBrowserParameter=Parametrs %s
 LocalisationDolibarrParameters=Lokalizācijas parametri
 ClientTZ=Klienta laika zona (lietotāja)
@@ -123,7 +123,8 @@ PHPTZ=PHP servera Laika zona
 DaylingSavingTime=Vasaras laiks
 CurrentHour=PHP laiks (servera)
 CurrentSessionTimeOut=Pašreizējais sesijas taimauts
-YouCanEditPHPTZ=Noteikt atšķirīgu PHP laika joslu (nav obligāti), jūs varat mēģināt, lai pievienotu failu htacces ar līniju, piemēram, šīs "setenv TZ Eiropa / Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max number of lines for widgets
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Atļaujas
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Tikai elementus no <a href="%s">iespējotu moduļi</a> tiek parādīts.
-ModulesDesc=Dolibarr moduļi noteikt, kura funkcionalitāte ir iespējots programmatūru. Daži moduļi pieprasa atļaujas, jums ir piešķirt lietotājiem, pēc tam ļaujot moduli. Noklikšķiniet uz pogas on / off ailē "Statuss", lai nodrošinātu moduli / funkciju.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Datubāzes paroli šifrēti conf.php (aktivēt i
 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=Ģenerēto PDF failu aizsardzība (aktivizēta NAV ieteicama, masveida pdf veidošanai)
-ProtectAndEncryptPdfFilesDesc=Aizsardzība PDF dokumentu saglabā to pieejamu lasīt un izdrukāt ar jebkuru PDF pārlūkprogrammu. Tomēr, rediģēšanu un kopēšanu nav iespējams vairs. Ņemiet vērā, ka, izmantojot šo funkciju veikt ēku no pasaules uzkrātā pdf nedarbojas (piemēram, neapmaksātiem rēķiniem).
+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=Iespēja
 DolibarrLicense=Licence
 Developpers=Izstrādātāji/ziedotāji
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr tiešsaistes demo
 OfficialMarketPlace=Oficiālais tirgus vieta ārējiem moduļiem/papildinājumiem
 OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
 ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=Par lietotāju vai attīstītājs dokumentācijas (Doc, FAQ ...), <br> ieskatieties uz Dolibarr Wiki: <br> <a href="%s" target="_blank"><b>%s</b></a>
 ForAnswersSeeForum=Attiecībā uz jebkuru citu jautājumu / palīdzēt, jūs varat izmantot Dolibarr forumu: <br> <a href="%s" target="_blank"><b>%s</b></a>
 HelpCenterDesc1=Šī sadaļa var palīdzēt jums, lai saņemtu palīdzības dienesta atbalstu Dolibarr programmai.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=Iezīme nav pieejams Unix, piemēram, sistēmas. Pār
 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/
 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=Moduļa iestatīšana
-ModulesSetup=Moduļu iestatīšana
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Sistēma
 ModuleFamilyCrm=Klientu pārvaldība (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=Dolibarr pašreizējā versija
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Jaunākā stabilā versija
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Update server offline
+WithCounter=Manage a counter
 GenericMaskCodes=Jūs varat ievadīt jebkuru numerācijas masku. Šajā maska, šādus tagus var izmantot: <br> <b>{000000}</b> atbilst skaitam, kas tiks palielināts par katru %s. Ievadīt tik daudz nullēm, kā vajadzīgajā garumā letes. Skaitītājs tiks pabeigts ar nullēm no kreisās puses, lai būtu tik daudz nullēm kā masku. <br> <b>{000000 000}</b> tāds pats kā iepriekšējais, bet kompensēt atbilst noteiktam skaitam pa labi uz + zīmi tiek piemērots, sākot ar pirmo %s. <br> <b>{000000 @ x}</b> tāds pats kā iepriekšējais, bet skaitītājs tiek atiestatīts uz nulli, kad mēnesī x ir sasniegts (x no 1 līdz 12, 0 vai izmantot agri no finanšu gada mēnešiem, kas noteiktas konfigurācijas, 99 vai atiestatīt uz nulli katru mēnesi ). Ja šis variants tiek izmantots, un x ir 2 vai vairāk, tad secība {gggg} {mm} vai {GGGG} {mm} ir arī nepieciešama. <br> <b>{Dd}</b> diena (no 01 līdz 31). <br> <b>{Mm}</b> mēnesi (no 01 līdz 12). <br> <b>{Yy}, {GGGG}</b> vai <b>{y}</b> gadu vairāk nekā 2, 4 vai 1 numuri. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Visas citas rakstzīmes masku paliks neskartas.<br>Atstarpes nav atļautas.<br>
-GenericMaskCodes4a=<u>Piemērs par 99. %s trešās puses Thecompany darīts 2007-01-31:</u> <br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Piemērs trešā persona veidota 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Piemērs produkts veidots 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC {gggg} {mm} - {000000}</b> dos <b>ABC0701-000099</b> <br> <b>{0000 +100 @ 1}-ZZZ / {dd} / XXX</b> dos <b>0199-ZZZ/31/XXX</b>
+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=Atgriež pielāgojamu numuru atbilstoši noteiktajai maskai.
 ServerAvailableOnIPOrPort=Serveris ir pieejams adresē <b>%s</b> ports <b>%s</b>
 ServerNotAvailableOnIPOrPort=Serveris nav pieejams adresē <b>%s</b> ports <b>%s</b>
@@ -369,19 +375,21 @@ Int=Vesels skaitlis
 Float=Peldēt
 DateAndTime=Datums un laiks
 Unique=Unikāls
-Boolean=Būla (izvēles rūtiņa)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Telefons
 ExtrafieldPrice = Cena
 ExtrafieldMail = E-pasts
 ExtrafieldUrl = Url
 ExtrafieldSelect = Izvēlēties sarakstu
 ExtrafieldSelectList = Izvēlieties kādu no tabulas
-ExtrafieldSeparator=Atdalītājs
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Parole
-ExtrafieldCheckBox=Rūtiņa
-ExtrafieldRadio=Radio poga
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldRadio=Radio buttons (on 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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Lauks
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Lietotāji un grupas
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=Rēķinu un kredītu piezīmi vadību klientiem. Rēķinu pārvald
 Module40Name=Piegādātāji
 Module40Desc=Piegādātājs vadības un iepirkuma (rīkojumi un rēķini)
 Module42Name=Logfaili
-Module42Desc=Mežizstrāde iekārtas (fails, syslog, ...)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Redaktors
 Module49Desc=Redaktora vadība
 Module50Name=Produkti
@@ -499,8 +521,8 @@ Module410Name=Vebkalendārs
 Module410Desc=Web kalendāra integrācija
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Darbinieku līgumi un atalgojums
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Paziņojumi
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP MaxMind pārveidošanu iespējas
 Module3100Name=Skaips
 Module3100Desc=Add a Skype button into card of users / third parties / contacts / members
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
-Module4000Desc=Human resources management
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi-kompānija
 Module5000Desc=Ļauj jums pārvaldīt vairākus uzņēmumus
 Module6000Name=Darba plūsma
@@ -591,7 +615,7 @@ Permission32=Izveidot / mainīt produktus
 Permission34=Dzēst produktus
 Permission36=Skatīt/vadīt slēptos produktus
 Permission38=Eksportēt produktus
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Dzēst projektus (dalīta projekts un projektu es esmu kontaktpersonai)
 Permission45=Eksportēt projektus
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Pasūtījumu veidi
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=E-pastu paraugi
 DictionaryUnits=Vienības
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Iestatījumi saglabāti
+SetupNotSaved=Setup not saved
 BackToModuleList=Atpakaļ uz moduļu sarakstu
 BackToDictionaryList=Atpakaļ uz vārdnīcu sarakstu
 VATManagement=PVN Vadība
@@ -921,7 +947,7 @@ Host=Serveris
 DriverType=Draivera veids
 SummarySystem=Sistēmas informācijas kopsavilkums
 SummaryConst=Sarakstu ar visiem Dolibarr uzstādīšanas parametriem
-MenuCompanySetup=Kompānija/Organizācija
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= Standarta izvēlnes menedžeris
 DefaultMenuSmartphoneManager=Viedtālruņa izvēlnes vadība
 Skin=Izskats
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Noklusētais maksimālais sarakstu garums
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=Dienas ziņa
 MessageLogin=Iežurnalēšanās lapas paziņojums
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Pastāvīgā meklēšanas forma kreisajā izvēlnē
 DefaultLanguage=Noklusējuma izmantošanas valoda (valodas kods)
 EnableMultilangInterface=Iespējot daudzvalodu interfeisu
 EnableShowLogo=Rādīt logotipu kreisajā izvēlnē
-CompanyInfo=Uzņēmuma / nodibinājuma informācija
-CompanyIds=Uzņēmuma / nodibinājuma identitātes
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=Nosaukums
 CompanyAddress=Adrese
 CompanyZip=Pasta indekss
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance kavēšanās (dienās) pirms brīdinājumu p
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance kavēšanās (dienās) pirms brīdinājumu par pārbaudēm, depozītu darīt
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Citas izvēlnes ieraksti pārvaldīt izvēles parametrus.
 LogEvents=Drošības audita notikumi
 Audit=Audits
@@ -987,7 +1015,7 @@ BrowserOS=Pārlūkprogrammas OS
 ListOfSecurityEvents=Saraksts ar Dolibarr drošības pasākumiem
 SecurityEventsPurged=Drošības pasākumi dzēsti
 LogEventDesc=Jūs varat ļaut šeit reģistrēšanu Dolibarr drošības notikumiem. Administratori tad var redzēt tās saturu, izmantojot izvēlnes <b>Sistēmas rīki - revīzijas.</b> Uzmanību, šī funkcija var patērēt lielu daudzumu datu bāzē.
-AreaForAdminOnly=Minētās funkcijas var izmantot <b>administratora lietotājiem.</b>
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Sistēmas informācija ir dažādi tehniskā informācija jums tikai lasīšanas režīmā un redzama tikai administratoriem.
 SystemAreaForAdminOnly=Šī joma ir pieejama administratora lietotājiem. Neviens no Dolibarr atļauju var samazināt šo robežu.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists in any language files
+TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Jums ir jābūt ieslēgtam vismaz 1 modulim
 ClassNotFoundIntoPathWarning=Klase %s nav atrasta PHP norādītajā ceļā
 YesInSummer=Jā vasarā
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Sesija uzglabāšana šifrēta ar Suhosin
 ConditionIsCurrently=Stāvoklis šobrīd ir %s
 YouUseBestDriver=Jūs varat izmantot vadītāja %s, kas ir labākais draiveris, kas pieejams šobrīd.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Noteikumi par profesionālo IDS
 MustBeUnique=Jābūt unikālam?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Eksporta saite uz <b>%s</b> formātā ir pieejams šādā tīmekļa vietnē: %s
 ##### Invoices #####
 BillsSetup=Rēķinu moduļa uzstādīšana
 BillsNumberingModule=Rēķinu un kredītu piezīmes numerācijas modelis
 BillsPDFModules=Rēķina dokumentu modeļi
+PaymentsPDFModules=Payment documents models
 CreditNote=Kredīta piezīme
 CreditNotes=Kredīta piezīmes
 ForceInvoiceDate=Force rēķina datumu apstiprināšanas datuma
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Faili tipa %s nav kešatmiņā ar HTTP serveri
 FilesOfTypeCompressed=Faili Tipa %s tiek saspiesti ar HTTP serveri
 FilesOfTypeNotCompressed=Faili Tipa %s nav saspiesti ar HTTP serveri
 CacheByServer=Cache serverim
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache pārlūks
 CompressionOfResources=Kompresijas HTTP atbildes
+CompressionOfResourcesDesc=For exemple 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 your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Produktu moduļa uzstādīšana
 ServiceSetup=Pakalpojumu moduļa uzstādīšana
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Rēķina izmantotais datums
 Buy=Pirkt
 Sell=Pārdot
 InvoiceDateUsed=Rēķina izmantotais datums
-YourCompanyDoesNotUseVAT=Jūsu uzņēmums ir definēts neizmantot PVN (Home - Setup - Uzņēmuma / Foundation), tāpēc nav PVN iespējas, lai setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=Grāmatvedība kods
 AccountancyCodeSell=Tirdzniecība kontu. kods
 AccountancyCodeBuy=Iegādes konta. kods
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Klikšķiniet lai  Dial moduļa uzstādīšanas
-ClickToDialUrlDesc=Url sauc, kad uz tālruņa Piktogramma klikšķis tiek darīts. In URL, jūs varat izmantot tagus <br> <b>__PHONETO__</b> Kas tiks aizstāts ar tālruņa numuru personai, lai izsauktu <br> <b>__PHONEFROM__</b> Kas tiks aizstāts ar tālruņa numuru, aicinot personas (jūsu) <br> <b>__LOGIN__</b> Kas tiks aizstāts ar jūsu clicktodial pieteikšanās (definēts jūsu lietotāja kartes) <br> <b>__PASS__</b> Kas tiks aizstāts ar jūsu clicktodial paroli (definēts jūsu lietotāja kartes).
+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.
 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 same computer than 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.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+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.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=Vispārējā displejs rīkojums
 BankOrderES=Spāņu
 BankOrderESDesc=Spāņu displejs, lai
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=Multi-kompānija modulis iestatīšana
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ 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.
 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.
-ConfFileMuseContainCustom=Installing 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)
 TextTitleColor=Lapas virsraksta krāsa
 LinkColor=Linku krāsa
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Fona krāsa
 TopMenuBackgroundColor=Fona krāsa augšējai izvēlnei
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/lv_LV/compta.lang b/htdocs/langs/lv_LV/compta.lang
index cb3fb940f6c..41682eb4b3f 100644
--- a/htdocs/langs/lv_LV/compta.lang
+++ b/htdocs/langs/lv_LV/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using r
 Param=Iestatījumi
 RemainingAmountPayment=Summa maksājums Atlikušo:
 Account=Konts
-Accountparent=Konta vecākiem
-Accountsparent=Konti vecākiem
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=Ienākumi
 Outcome=Izdevumi
 ReportInOut=Ienākumi / izdevumi
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Nodokļi un dividendes
 MenuSocialContributions=Social/fiscal taxes
 MenuNewSocialContribution=New social/fiscal tax
 NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Grāmatvedība / kase laukums
 NewPayment=Jauns maksājums
@@ -134,8 +135,8 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- Tas ietver visas efektīvus maksājumus rēķiniem, kas saņemti no klientiem. <br> - Tā ir balstīta uz maksājuma datumu šiem rēķiniem <br>
-DepositsAreNotIncluded=- Noguldījumu rēķinus, nedz iekļauti
-DepositsAreIncluded=- Noguldījumu rēķini ir iekļauti
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Ziņojumā, ko trešās puses IRPF
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
 VATReport=PVN atskaite
@@ -169,7 +170,7 @@ DescSellsJournal=Pārdošanas žurnāls
 DescPurchasesJournal=Pirkšanas žurnāls
 InvoiceRef=Rēķina ref.
 CodeNotDef=Nav definēts
-WarningDepositsNotIncluded=Noguldījumi rēķini nav iekļauti šajā versijā ar šo grāmatvedības moduli.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Maksājuma termiņš datums nevar būt zemāka par objekta datumu.
 Pcg_version=Chart of accounts models
 Pcg_type=PCG veids
@@ -189,8 +190,10 @@ AccountancyJournal=Kontu žurnāls
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Klonēt nākošam mēnesim
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/lv_LV/cron.lang b/htdocs/langs/lv_LV/cron.lang
index dbde31ee42d..fedc26e7d45 100644
--- a/htdocs/langs/lv_LV/cron.lang
+++ b/htdocs/langs/lv_LV/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allow to execute job that have been planned
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Darbs
 CronNone=Nav
 CronDtStart=Not before
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Ieslēgt
 CronStatusInactiveBtn=Izslēgt
 CronTaskInactive=Šis darbs ir izslēgts
 CronId=Id
-CronClassFile=Klases (filename.class.php)
-CronModuleHelp=Nosaukums Dolibarr moduļa direktoriju (arī strādāt ar ārējo Dolibarr moduli). <BR> Par exemple atnest metodi Dolibarr Produkta objekts / htdocs / <u>produktu</u> / klase / product.class.php, moduļa vērtība ir <i>produkts</i>
-CronClassFileHelp=Faila nosaukumu, lai slodze. <BR> Par exemple atnest metodi Dolibarr Produkta objekts / htdocs / produktu / klase / <u>product.class.php,</u> klases faila nosaukuma vērtība ir <i>product.class.php</i>
-CronObjectHelp=Objekta nosaukums, lai slodze. <BR> Par exemple atnest metodi Dolibarr Produkta objekts / htdocs / produktu / klase / product.class.php, klases faila nosaukuma vērtība ir <i>produktu</i>
-CronMethodHelp=Objekts metode, lai palaistu. <BR> Par exemple atnest metodi Dolibarr Produkta objekts / htdocs / produktu / klase / product.class.php, metodes vērtība ir ir <i>fecth</i>
-CronArgsHelp=Šī metode argumentus. <BR> Par exemple atnest metodi Dolibarr Produkta objekts / htdocs / produktu / klase / product.class.php, no paramters vērtība var būt <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=Sistēma komandrindas izpildīt.
 CronCreateJob=Create new Scheduled Job
 CronFrom=No
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang
index 0962082bf40..8e3808f142e 100644
--- a/htdocs/langs/lv_LV/errors.lang
+++ b/htdocs/langs/lv_LV/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Neizdevās izveidot failu '<b>%s</b>'.
 ErrorFailToRenameDir=Neizdevās pārdēvēt mapi '<b>%s</b>' uz '<b>%s</b>'.
 ErrorFailToCreateDir=Neizdevās izveidot mapi '<b>%s</b>'.
 ErrorFailToDeleteDir=Neizdevās dzēst direktoriju '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=Šī kontaktpersona jau ir definēts kā kontaktpersona šāda veida.
 ErrorCashAccountAcceptsOnlyCashMoney=Šis bankas konts ir naudas konts, lai tā pieņem maksājumus no veida tikai skaidrā naudā.
 ErrorFromToAccountsMustDiffers=Avots un mērķiem banku kontiem jābūt atšķirīgai.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Neizdevās ierakstīt direktorijā %s
 ErrorFoundBadEmailInFile=Atrasts nepareiza e-pasta sintakse %s līnijām failā (piemērs line %s ar e-pasta = %s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Daži nepieciešamie lauki netika aizpildīti.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Neizdevās izveidot direktoriju. Pārbaudiet, vai Web servera lietotājam ir tiesības rakstīt uz Dolibarr dokumentus direktorijā. Ja parametrs <b>safe_mode</b> ir iespējots uz šo PHP, pārbaudiet, Dolibarr php faili pieder web servera lietotājam (vai grupa).
 ErrorNoMailDefinedForThisUser=Nav definēts e-pasts šim lietotājam
 ErrorFeatureNeedJavascript=Šai funkcijai ir nepieciešams aktivizēt javascript. Mainīt to var iestatījumi - attēlojums.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoice
 ErrorWebServerUserHasNotPermission=Lietotāja konts <b>%s</b> izmantot, lai veiktu web serveri nav atļauja, kas
 ErrorNoActivatedBarcode=Nav svītrkodu veids aktivizēts
 ErrUnzipFails=Neizdevās atarhivēt %s izmantojot ZipArchive
-ErrNoZipEngine=Nav dzinēja unzip %s failu šajā PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=Failam %s jābūt Dolibarr zip
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=PHP CURL nav uzstādīts, tas ir svarīgi runāt ar Paypal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=Kļūda saglabājot izmaiņas
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # 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.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice
 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/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang
index 1de889172ed..fa2167ea8bf 100644
--- a/htdocs/langs/lv_LV/main.lang
+++ b/htdocs/langs/lv_LV/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=Parametrs %s nav definēts
 ErrorUnknown=Nezināma kļūda
 ErrorSQL=SQL kļūda
 ErrorLogoFileNotFound=Logotipa fails '%s' nav atrasts
-ErrorGoToGlobalSetup=Iet uz 'Sabiedrība / nodibinājums' uzstādījumiem, lai novērstu šo
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=Iet uz moduļa uzstādīšanu, lai atrisinātu šo
 ErrorFailedToSendMail=Neizdevās nosūtīt pastu (sūtītājs = %s, saņēmējs = %s)
 ErrorFileNotUploaded=Fails netika augšupielādēts. Pārbaudiet vai izmērs nepārsniedz maksimāli pieļaujamo un, ka brīvas vietas ir pieejama uz diska, un nav jau failu ar tādu pašu nosaukumu šajā direktorijā.
@@ -153,6 +153,7 @@ Edit=Rediģēt
 Validate=Pārbaudīt
 ValidateAndApprove=Validate and Approve
 ToValidate=Jāpārbauda
+NotValidated=Not validated
 Save=Saglabāt
 SaveAs=Saglabāt kā
 TestConnection=Savienojuma pārbaude
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=No applicative disconnect feature with authenticatio
 Connection=Pieslēgties
 Setup=Iestatījumi
 Alert=Brīdināt
+MenuWarnings=Brīdinājumi
 Previous=Iepriekšējais
 Next=Nākamais
 Cards=Kartes
@@ -308,6 +310,7 @@ Copy=Kopēt
 Paste=Ielīmēt
 Default=Noklusējums
 DefaultValue=Noklusējuma vērtība
+DefaultValues=Default values
 Price=Cena
 UnitPrice=Vienības cena
 UnitPriceHT=Vienības cena (neto)
@@ -363,7 +366,8 @@ VATRate=Nodokļa likme
 Average=Vidējais
 Sum=Summa
 Delta=Delta
-Module=Modulis
+Module=Module/Application
+Modules=Modules/Applications
 Option=Iespējas
 List=Saraksts
 FullList=Pilns saraksts
@@ -387,7 +391,7 @@ ActionRunningNotStarted=Jāsāk
 ActionRunningShort=Procesā
 ActionDoneShort=Pabeigts
 ActionUncomplete=Nepabeigts
-CompanyFoundation=Kompānija/Organizācija
+CompanyFoundation=Company/Organisation
 ContactsForCompany=Šīs trešās personas kontakti
 ContactsAddressesForCompany=Kontakti / adreses par šīs trešās personas
 AddressesForCompany=Šīs trešās puses adreses
@@ -405,8 +409,9 @@ Generate=Izveidot
 Duration=Ilgums
 TotalDuration=Kopējais pasākuma ilgums
 Summary=Kopsavilkums
-DolibarrStateBoard=Statistika
-DolibarrWorkBoard=Darba uzdevumi
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=Pieejams
 NotYetAvailable=Nav vēl pieejams
 NotAvailable=Nav pieejams
@@ -453,6 +458,7 @@ NextStep=Nākamais solis
 Datas=Dati
 None=Nav
 NoneF=Nav
+NoneOrSeveral=None or several
 Late=Vēlu
 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.
 Photo=Attēls
@@ -606,7 +612,8 @@ PartialWoman=Daļējs
 TotalWoman=Kopsumma
 NeverReceived=Nekad nav saņemts
 Canceled=Atcelts
-YouCanChangeValuesForThisListFromDictionarySetup=Jūs varat mainīt vērtības šim sarakstam no iestatījumiem - vārdnīcas
+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
 Color=Krāsa
 Documents=Piesaistītie faili
@@ -642,6 +649,7 @@ FreeLineOfType=Free entry of type
 CloneMainAttributes=Klonēt objektu ar tā galvenajiem atribūtiem
 PDFMerge=Apvienot PDF
 Merge=Apvienot
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Rādīt lapu drukāt galveno satura jomā
 MenuManager=Izvēlnes iestatīšana
 WarningYouAreInMaintenanceMode=Uzmanību, jūs esat uzturēšanas režīmā, t.i. tikai pieteikšanās <b>%s</b> ir atļauts lietot programmu.
@@ -708,6 +716,7 @@ from=no
 toward=uz
 Access=Pieeja
 SelectAction=Izvēlēties darbību
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Izmantot taustiņu kombināciju Ctrl + C, lai kopētu
 SaveUploadedFileWithMask=Saglabāt failu uz servera ar nosaukumu "<strong>%s</strong>" (citādi "%s")
 OriginFileName=Oriģinālais faila nosaukums
@@ -718,7 +727,7 @@ ViewPrivateNote=Apskatīt piezīmes
 XMoreLines=%s līnija(as) slēptas
 PublicUrl=Publiskā saite
 AddBox=Pievienot info logu
-SelectElementAndClickRefresh=Izvēlieties elementu un nospiediet atjaunot
+SelectElementAndClick=Select an element and click %s
 PrintFile=Drukāt failu %s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
@@ -734,8 +743,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
@@ -755,11 +764,20 @@ Calendar=Kalendārs
 GroupBy=Kārtot pēc...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiskālais gads
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Pirmdiena
 Tuesday=Otrdiena
@@ -817,5 +835,3 @@ SearchIntoContracts=Līgumi
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Izdevumu atskaites
 SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/lv_LV/other.lang b/htdocs/langs/lv_LV/other.lang
index 3b169d369c3..8c7f7ce2be7 100644
--- a/htdocs/langs/lv_LV/other.lang
+++ b/htdocs/langs/lv_LV/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Dzimšanas diena
 DateToBirth=Dzimšanas datums
 BirthdayAlertOn=dzimšanas dienas brīdinājums aktīvs
 BirthdayAlertOff=dzimšanas dienas brīdinājums neaktīvs
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=Intervences apstiprināts
 Notify_FICHINTER_SENTBYMAIL=Intervences nosūtīt pa pastu
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=Tas ir <b>tests</b> pasts (vārds testam jābūt treknrak
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nJums tiek nosūtīts komerciālais piedāvājums __PROPREF__\n\n__PERSONALIZED__Ar cieņu\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\n\nYou will find here the price request __ASKREF__\n\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Prof ID %s</b> ir informācija, atkarībā no trešās puses valstīm. <br> Piemēram, attiecībā uz valstu <b>%s,</b> tas ir kods <b>%s.</b>
 DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Statistiku skaita produktu / pakalpojumu vienības
-StatsByNumberOfEntities=Statistiku skaita atsaucoties vienību
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=Iejaukšanās %s ir apstiprināta.
 EMailTextInvoiceValidated=Rēķins %s ir apstiprināts.
diff --git a/htdocs/langs/lv_LV/projects.lang b/htdocs/langs/lv_LV/projects.lang
index c5d2461511c..7218c550c1c 100644
--- a/htdocs/langs/lv_LV/projects.lang
+++ b/htdocs/langs/lv_LV/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Projektu sadaļa
 ProjectStatus=Project status
 SharedProject=Visi
 PrivateProject=Projekta kontakti
+ProjectsImContactFor=Projects I'm explicitely a contact of
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=Visi projekti
 MyProjectsDesc=Šis skats ir tikai uz projektiem, jums ir kontakts (kāds ir tipa).
 ProjectsPublicDesc=Šo viedokli iepazīstina visus projektus jums ir atļauts lasīt.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,6 +26,7 @@ TasksDesc=Šo viedokli iepazīstina visus projektus un uzdevumus (jūsu lietotā
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=Jauns projekts
 AddProject=Izveidot projektu
 DeleteAProject=Dzēst projektu
@@ -30,13 +34,14 @@ DeleteATask=Izdzēst uzdevumu
 ConfirmDeleteAProject=Vai tiešām vēlaties dzēst šo projektu?
 ConfirmDeleteATask=Vai tiešām vēlaties dzēst šo uzdevumu?
 OpenedProjects=Atvērtie projekti
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpenedTasks=Atvērtie uzdevumi
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Rādīt projektu
 SetProject=Izvēlēties projektu
 NoProject=Neviens projekts nosaka, vai īpašumā
 NbOfProjects=Nb projektu
+NbOfTasks=Nb of tasks
 TimeSpent=Laiks, kas pavadīts
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
@@ -47,9 +52,9 @@ TaskTimeSpent=Pavadītais laiks veicot uzdevumus
 TaskTimeUser=Lietotājs
 TaskTimeNote=Piezīme
 TaskTimeDate=Datums
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
-NewTimeSpent=Jauns pavadītais laiks
+NewTimeSpent=Laiks, kas patērēts
 MyTimeSpent=Mans pavadīts laiks
 Tasks=Uzdevumi
 Task=Uzdevums
@@ -59,6 +64,7 @@ TaskDescription=Uzdevuma apraksts
 NewTask=Jauns uzdevums
 AddTask=Izveidot uzdevumu
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Aktivitāte
 Activities=Uzdevumi/aktivitātes
 MyActivities=Mani uzdevumi / aktivitātes
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Līgumu sarakstu kas saistīti ar projektu
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=Saraksts iejaukšanās saistīts ar projektu
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Projekta kontakti
 ActionsOnProject=Pasākumi par projektu
 YouAreNotContactOfProject=Jūs neesat kontakts šīs privātam projektam
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Dzēst pavadīts laiks
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
@@ -110,7 +118,7 @@ TaskRessourceLinks=Resursi
 ProjectsDedicatedToThisThirdParty=Projekti, kas veltīta šai trešajai personai
 NoTasks=Neviens uzdevumi šajā projektā
 LinkedToAnotherCompany=Saistīts ar citām trešajām personām
-TaskIsNotAffectedToYou=Task not assigned to you
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=Pavadīts laiks ir tukšs
 ThisWillAlsoRemoveTasks=Šī darbība arī izdzēst visus uzdevumus projekta <b>(%s</b> uzdevumi brīdī) un visu laiku ieguldījumiem pavadīts.
 IfNeedToUseOhterObjectKeepEmpty=Ja daži objekti (rēķinu, pasūtījumu, ...), kas pieder citai trešai personai, ir saistītas ar projektu, lai izveidotu, saglabāt šo tukšo, lai būtu projektam, multi trešajām personām.
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
 ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/mk_MK/accountancy.lang b/htdocs/langs/mk_MK/accountancy.lang
index 4c2336b97b0..31b54e83c5b 100644
--- a/htdocs/langs/mk_MK/accountancy.lang
+++ b/htdocs/langs/mk_MK/accountancy.lang
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=General ledger
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
@@ -132,19 +140,19 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=List of the accounting accounts
 
 Pcgtype=Class of account
-Pcgsubtype=Under class of account
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Code
+Nature=Nature
+AccountingJournalType1=Various operation
+AccountingJournalType2=Sales
+AccountingJournalType3=Purchases
+AccountingJournalType4=Bank
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Exports
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang
index 95d5fd9f7de..ffc92b65536 100644
--- a/htdocs/langs/mk_MK/admin.lang
+++ b/htdocs/langs/mk_MK/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=Internal users
 ExternalUsers=External users
 GUISetup=Display
 SetupArea=Setup area
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form to test file upload (according to setup)
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
@@ -85,7 +86,7 @@ Mask=Mask
 NextValue=Next value
 NextValueForInvoices=Next value (invoices)
 NextValueForCreditNotes=Next value (credit notes)
-NextValueForDeposit=Next value (deposit)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Next value (replacements)
 MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to <b>%s</b> %s, whatever this parameter's value is
 NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
@@ -103,7 +104,7 @@ MenuIdParent=Parent menu ID
 DetailMenuIdParent=ID of parent menu (empty for a top menu)
 DetailPosition=Sort number to define menu position
 AllMenus=All
-NotConfigured=Module not configured
+NotConfigured=Module/Application not configured
 Active=Active
 SetupShort=Setup
 OtherOptions=Other options
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Thousand separator
 Destination=Destination
 IdModule=Module ID
 IdPermissions=Permissions ID
-Modules=Modules
 LanguageBrowserParameter=Parameter %s
 LocalisationDolibarrParameters=Localisation parameters
 ClientTZ=Client Time Zone (user)
@@ -123,7 +123,8 @@ PHPTZ=PHP server Time Zone
 DaylingSavingTime=Daylight saving time
 CurrentHour=PHP Time (server)
 CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max number of lines for widgets
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activat
 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 (Activated 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 make building of a global cumulated pdf not working (like unpaid invoices).
+ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature makes building of a global merged PDFs not working.
 Feature=Feature
 DolibarrLicense=License
 Developpers=Developers/contributors
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr online demo
 OfficialMarketPlace=Official market place for external modules/addons
 OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
 ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your
 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/
 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 setup
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Update server offline
+WithCounter=Manage a counter
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
 ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
 ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
@@ -369,19 +375,21 @@ Int=Integer
 Float=Float
 DateAndTime=Date and hour
 Unique=Unique
-Boolean=Boolean (Checkbox)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Phone
 ExtrafieldPrice = Price
 ExtrafieldMail = Email
 ExtrafieldUrl = Url
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Password
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldRadio=Radio buttons (on 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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Field
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=Invoice and credit note management for customers. Invoice managemen
 Module40Name=Suppliers
 Module40Desc=Supplier management and buying (orders and invoices)
 Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Products
@@ -499,8 +521,8 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Notifications
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
-Module4000Desc=Human resources management
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow
@@ -591,7 +615,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects i'm contact for)
 Permission45=Export projects
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Emails templates
 DictionaryUnits=Units
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Setup saved
+SetupNotSaved=Setup not saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
 VATManagement=VAT Management
@@ -921,7 +947,7 @@ Host=Server
 DriverType=Driver type
 SummarySystem=System information summary
 SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Foundation
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= Standard menu manager
 DefaultMenuSmartphoneManager=Smartphone menu manager
 Skin=Skin theme
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Default max length for lists
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=Message of the day
 MessageLogin=Login page message
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/foundation information
-CompanyIds=Company/foundation identities
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=Name
 CompanyAddress=Address
 CompanyZip=Zip
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Other menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Audit
@@ -987,7 +1015,7 @@ BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
 LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists 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
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Rules on Professional Ids
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####
 BillsSetup=Invoices module setup
 BillsNumberingModule=Invoices and credit notes numbering model
 BillsPDFModules=Invoice documents models
+PaymentsPDFModules=Payment documents models
 CreditNote=Credit note
 CreditNotes=Credit notes
 ForceInvoiceDate=Force invoice date to validation date
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
 FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
 FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
 CacheByServer=Cache by server
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
+CompressionOfResourcesDesc=For exemple 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 your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Products module setup
 ServiceSetup=Services module setup
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Invoice date used
 Buy=Buy
 Sell=Sell
 InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=Accountancy Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+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 your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
+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.
 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 same computer than 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.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+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.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=General display order
 BankOrderES=Шпански
 BankOrderESDesc=Spanish display order
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ 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.
 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.
-ConfFileMuseContainCustom=Installing 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)
 TextTitleColor=Color of page title
 LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/mk_MK/compta.lang b/htdocs/langs/mk_MK/compta.lang
index 5e9814369ec..94a3bd671ef 100644
--- a/htdocs/langs/mk_MK/compta.lang
+++ b/htdocs/langs/mk_MK/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using r
 Param=Setup
 RemainingAmountPayment=Amount payment remaining :
 Account=Account
-Accountparent=Account parent
-Accountsparent=Accounts parent
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=Income
 Outcome=Expense
 ReportInOut=Income / Expense
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Taxes and dividends
 MenuSocialContributions=Social/fiscal taxes
 MenuNewSocialContribution=New social/fiscal tax
 NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Accountancy/Treasury area
 NewPayment=New payment
@@ -134,8 +135,8 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from clients.<br>- It is based on the payment date of these invoices<br>
-DepositsAreNotIncluded=- Deposit invoices are nor included
-DepositsAreIncluded=- Deposit invoices are included
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
 VATReport=VAT report
@@ -169,7 +170,7 @@ DescSellsJournal=Sales Journal
 DescPurchasesJournal=Purchases Journal
 InvoiceRef=Invoice ref.
 CodeNotDef=Not defined
-WarningDepositsNotIncluded=Deposits invoices are not included in this version with this accountancy module.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
 Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
@@ -189,8 +190,10 @@ AccountancyJournal=Accountancy code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/mk_MK/cron.lang b/htdocs/langs/mk_MK/cron.lang
index ae15e3b505f..6cce323868e 100644
--- a/htdocs/langs/mk_MK/cron.lang
+++ b/htdocs/langs/mk_MK/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
-CronInfo=Scheduled job module allow to execute job that have been planned
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Job
 CronNone=None
 CronDtStart=Not before
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
-CronClassFile=Classes (filename.class.php)
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=From
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/mk_MK/errors.lang b/htdocs/langs/mk_MK/errors.lang
index 9e2eb6817ef..feada2d1b5a 100644
--- a/htdocs/langs/mk_MK/errors.lang
+++ b/htdocs/langs/mk_MK/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
 ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
 ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
 ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
 ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Some required fields were not filled.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoice
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # 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.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice
 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/mk_MK/main.lang b/htdocs/langs/mk_MK/main.lang
index f2d5f7bdd22..49a6e4064e1 100644
--- a/htdocs/langs/mk_MK/main.lang
+++ b/htdocs/langs/mk_MK/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=Parameter %s not defined
 ErrorUnknown=Unknown error
 ErrorSQL=SQL Error
 ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=Go to Module setup to fix this
 ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
 ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
@@ -153,6 +153,7 @@ Edit=Edit
 Validate=Validate
 ValidateAndApprove=Validate and Approve
 ToValidate=To validate
+NotValidated=Not validated
 Save=Save
 SaveAs=Save As
 TestConnection=Test connection
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=No applicative disconnect feature with authenticatio
 Connection=Connection
 Setup=Setup
 Alert=Alert
+MenuWarnings=Alerts
 Previous=Previous
 Next=Next
 Cards=Cards
@@ -308,6 +310,7 @@ Copy=Copy
 Paste=Paste
 Default=Default
 DefaultValue=Default value
+DefaultValues=Default values
 Price=Price
 UnitPrice=Unit price
 UnitPriceHT=Unit price (net)
@@ -363,7 +366,8 @@ VATRate=Tax Rate
 Average=Average
 Sum=Sum
 Delta=Delta
-Module=Module
+Module=Module/Application
+Modules=Modules/Applications
 Option=Option
 List=List
 FullList=Full list
@@ -387,7 +391,7 @@ ActionRunningNotStarted=To start
 ActionRunningShort=In progress
 ActionDoneShort=Finished
 ActionUncomplete=Uncomplete
-CompanyFoundation=Company/Foundation
+CompanyFoundation=Company/Organisation
 ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
@@ -405,8 +409,9 @@ Generate=Generate
 Duration=Duration
 TotalDuration=Total duration
 Summary=Summary
-DolibarrStateBoard=Statistics
-DolibarrWorkBoard=Work tasks board
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=Available
 NotYetAvailable=Not yet available
 NotAvailable=Not available
@@ -434,7 +439,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Opened
+Opened=Open
 New=New
 Discount=Discount
 Unknown=Unknown
@@ -453,6 +458,7 @@ NextStep=Next step
 Datas=Data
 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.
 Photo=Picture
@@ -606,7 +612,8 @@ PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
 Canceled=Canceled
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
+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
 Color=Color
 Documents=Linked files
@@ -642,6 +649,7 @@ FreeLineOfType=Free entry of type
 CloneMainAttributes=Clone object with its main attributes
 PDFMerge=PDF Merge
 Merge=Merge
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Show page to print main content area
 MenuManager=Menu manager
 WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only login <b>%s</b> is allowed to use application at the moment.
@@ -708,6 +716,7 @@ from=from
 toward=toward
 Access=Access
 SelectAction=Select action
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
 SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
 OriginFileName=Original filename
@@ -718,7 +727,7 @@ ViewPrivateNote=View notes
 XMoreLines=%s line(s) hidden
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
+SelectElementAndClick=Select an element and click %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
@@ -734,8 +743,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
@@ -755,11 +764,20 @@ Calendar=Calendar
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -817,5 +835,3 @@ SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/mk_MK/other.lang b/htdocs/langs/mk_MK/other.lang
index ab937ff3bab..b151614ce3c 100644
--- a/htdocs/langs/mk_MK/other.lang
+++ b/htdocs/langs/mk_MK/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=Date of birth
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Statistics in number of products/services units
-StatsByNumberOfEntities=Statistics in number of referring entities
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=The intervention %s has been validated.
 EMailTextInvoiceValidated=The invoice %s has been validated.
diff --git a/htdocs/langs/mk_MK/projects.lang b/htdocs/langs/mk_MK/projects.lang
index f9c603ce113..f40af2b963b 100644
--- a/htdocs/langs/mk_MK/projects.lang
+++ b/htdocs/langs/mk_MK/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
 PrivateProject=Project contacts
+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 (whatever is the type).
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=New project
 AddProject=Create project
 DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Opened projects
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
 SetProject=Set project
 NoProject=No project defined or owned
 NbOfProjects=Nb of projects
+NbOfTasks=Nb of tasks
 TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
@@ -47,9 +52,9 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
-NewTimeSpent=New time spent
+NewTimeSpent=Time spent
 MyTimeSpent=My time spent
 Tasks=Tasks
 Task=Task
@@ -59,6 +64,7 @@ TaskDescription=Task description
 NewTask=New task
 AddTask=Create task
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Activity
 Activities=Tasks/activities
 MyActivities=My tasks/activities
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=List of contracts associated with the project
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
 ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
@@ -110,7 +118,7 @@ TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
-TaskIsNotAffectedToYou=Task not assigned to you
+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.
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
 ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/mn_MN/accountancy.lang b/htdocs/langs/mn_MN/accountancy.lang
index 4c2336b97b0..31b54e83c5b 100644
--- a/htdocs/langs/mn_MN/accountancy.lang
+++ b/htdocs/langs/mn_MN/accountancy.lang
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=General ledger
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
@@ -132,19 +140,19 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=List of the accounting accounts
 
 Pcgtype=Class of account
-Pcgsubtype=Under class of account
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Code
+Nature=Nature
+AccountingJournalType1=Various operation
+AccountingJournalType2=Sales
+AccountingJournalType3=Purchases
+AccountingJournalType4=Bank
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Exports
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/mn_MN/admin.lang b/htdocs/langs/mn_MN/admin.lang
index 9602601e241..6851d698625 100644
--- a/htdocs/langs/mn_MN/admin.lang
+++ b/htdocs/langs/mn_MN/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=Internal users
 ExternalUsers=External users
 GUISetup=Display
 SetupArea=Setup area
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form to test file upload (according to setup)
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
@@ -85,7 +86,7 @@ Mask=Mask
 NextValue=Next value
 NextValueForInvoices=Next value (invoices)
 NextValueForCreditNotes=Next value (credit notes)
-NextValueForDeposit=Next value (deposit)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Next value (replacements)
 MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to <b>%s</b> %s, whatever this parameter's value is
 NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
@@ -103,7 +104,7 @@ MenuIdParent=Parent menu ID
 DetailMenuIdParent=ID of parent menu (empty for a top menu)
 DetailPosition=Sort number to define menu position
 AllMenus=All
-NotConfigured=Module not configured
+NotConfigured=Module/Application not configured
 Active=Active
 SetupShort=Setup
 OtherOptions=Other options
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Thousand separator
 Destination=Destination
 IdModule=Module ID
 IdPermissions=Permissions ID
-Modules=Modules
 LanguageBrowserParameter=Parameter %s
 LocalisationDolibarrParameters=Localisation parameters
 ClientTZ=Client Time Zone (user)
@@ -123,7 +123,8 @@ PHPTZ=PHP server Time Zone
 DaylingSavingTime=Daylight saving time
 CurrentHour=PHP Time (server)
 CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max number of lines for widgets
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activat
 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 (Activated 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 make building of a global cumulated pdf not working (like unpaid invoices).
+ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature makes building of a global merged PDFs not working.
 Feature=Feature
 DolibarrLicense=License
 Developpers=Developers/contributors
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr online demo
 OfficialMarketPlace=Official market place for external modules/addons
 OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
 ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your
 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/
 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 setup
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Update server offline
+WithCounter=Manage a counter
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
 ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
 ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
@@ -369,19 +375,21 @@ Int=Integer
 Float=Float
 DateAndTime=Date and hour
 Unique=Unique
-Boolean=Boolean (Checkbox)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Phone
 ExtrafieldPrice = Price
 ExtrafieldMail = Email
 ExtrafieldUrl = Url
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Password
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldRadio=Radio buttons (on 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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Field
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=Invoice and credit note management for customers. Invoice managemen
 Module40Name=Suppliers
 Module40Desc=Supplier management and buying (orders and invoices)
 Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Products
@@ -499,8 +521,8 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Notifications
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
-Module4000Desc=Human resources management
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow
@@ -591,7 +615,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects i'm contact for)
 Permission45=Export projects
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Emails templates
 DictionaryUnits=Units
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Setup saved
+SetupNotSaved=Setup not saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
 VATManagement=VAT Management
@@ -921,7 +947,7 @@ Host=Server
 DriverType=Driver type
 SummarySystem=System information summary
 SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Foundation
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= Standard menu manager
 DefaultMenuSmartphoneManager=Smartphone menu manager
 Skin=Skin theme
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Default max length for lists
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=Message of the day
 MessageLogin=Login page message
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/foundation information
-CompanyIds=Company/foundation identities
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=Name
 CompanyAddress=Address
 CompanyZip=Zip
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Other menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Audit
@@ -987,7 +1015,7 @@ BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
 LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists 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
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Rules on Professional Ids
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####
 BillsSetup=Invoices module setup
 BillsNumberingModule=Invoices and credit notes numbering model
 BillsPDFModules=Invoice documents models
+PaymentsPDFModules=Payment documents models
 CreditNote=Credit note
 CreditNotes=Credit notes
 ForceInvoiceDate=Force invoice date to validation date
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
 FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
 FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
 CacheByServer=Cache by server
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
+CompressionOfResourcesDesc=For exemple 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 your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Products module setup
 ServiceSetup=Services module setup
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Invoice date used
 Buy=Buy
 Sell=Sell
 InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=Accountancy Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+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 your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
+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.
 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 same computer than 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.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+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.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=General display order
 BankOrderES=Spanish
 BankOrderESDesc=Spanish display order
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ 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.
 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.
-ConfFileMuseContainCustom=Installing 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)
 TextTitleColor=Color of page title
 LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/mn_MN/compta.lang b/htdocs/langs/mn_MN/compta.lang
index 5e9814369ec..94a3bd671ef 100644
--- a/htdocs/langs/mn_MN/compta.lang
+++ b/htdocs/langs/mn_MN/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using r
 Param=Setup
 RemainingAmountPayment=Amount payment remaining :
 Account=Account
-Accountparent=Account parent
-Accountsparent=Accounts parent
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=Income
 Outcome=Expense
 ReportInOut=Income / Expense
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Taxes and dividends
 MenuSocialContributions=Social/fiscal taxes
 MenuNewSocialContribution=New social/fiscal tax
 NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Accountancy/Treasury area
 NewPayment=New payment
@@ -134,8 +135,8 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from clients.<br>- It is based on the payment date of these invoices<br>
-DepositsAreNotIncluded=- Deposit invoices are nor included
-DepositsAreIncluded=- Deposit invoices are included
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
 VATReport=VAT report
@@ -169,7 +170,7 @@ DescSellsJournal=Sales Journal
 DescPurchasesJournal=Purchases Journal
 InvoiceRef=Invoice ref.
 CodeNotDef=Not defined
-WarningDepositsNotIncluded=Deposits invoices are not included in this version with this accountancy module.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
 Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
@@ -189,8 +190,10 @@ AccountancyJournal=Accountancy code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/mn_MN/cron.lang b/htdocs/langs/mn_MN/cron.lang
index b1e8bcb36d2..245fefe7af1 100644
--- a/htdocs/langs/mn_MN/cron.lang
+++ b/htdocs/langs/mn_MN/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allow to execute job that have been planned
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Job
 CronNone=None
 CronDtStart=Not before
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
-CronClassFile=Classes (filename.class.php)
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=From
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/mn_MN/errors.lang b/htdocs/langs/mn_MN/errors.lang
index 9e2eb6817ef..feada2d1b5a 100644
--- a/htdocs/langs/mn_MN/errors.lang
+++ b/htdocs/langs/mn_MN/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
 ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
 ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
 ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
 ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Some required fields were not filled.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoice
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # 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.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice
 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/mn_MN/main.lang b/htdocs/langs/mn_MN/main.lang
index 8e74def35e0..b1718bc40eb 100644
--- a/htdocs/langs/mn_MN/main.lang
+++ b/htdocs/langs/mn_MN/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=Parameter %s not defined
 ErrorUnknown=Unknown error
 ErrorSQL=SQL Error
 ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=Go to Module setup to fix this
 ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
 ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
@@ -153,6 +153,7 @@ Edit=Edit
 Validate=Validate
 ValidateAndApprove=Validate and Approve
 ToValidate=To validate
+NotValidated=Not validated
 Save=Save
 SaveAs=Save As
 TestConnection=Test connection
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=No applicative disconnect feature with authenticatio
 Connection=Connection
 Setup=Setup
 Alert=Alert
+MenuWarnings=Alerts
 Previous=Previous
 Next=Next
 Cards=Cards
@@ -308,6 +310,7 @@ Copy=Copy
 Paste=Paste
 Default=Default
 DefaultValue=Default value
+DefaultValues=Default values
 Price=Price
 UnitPrice=Unit price
 UnitPriceHT=Unit price (net)
@@ -363,7 +366,8 @@ VATRate=Tax Rate
 Average=Average
 Sum=Sum
 Delta=Delta
-Module=Module
+Module=Module/Application
+Modules=Modules/Applications
 Option=Option
 List=List
 FullList=Full list
@@ -387,7 +391,7 @@ ActionRunningNotStarted=To start
 ActionRunningShort=In progress
 ActionDoneShort=Finished
 ActionUncomplete=Uncomplete
-CompanyFoundation=Company/Foundation
+CompanyFoundation=Company/Organisation
 ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
@@ -405,8 +409,9 @@ Generate=Generate
 Duration=Duration
 TotalDuration=Total duration
 Summary=Summary
-DolibarrStateBoard=Statistics
-DolibarrWorkBoard=Work tasks board
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=Available
 NotYetAvailable=Not yet available
 NotAvailable=Not available
@@ -434,7 +439,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Opened
+Opened=Open
 New=New
 Discount=Discount
 Unknown=Unknown
@@ -453,6 +458,7 @@ NextStep=Next step
 Datas=Data
 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.
 Photo=Picture
@@ -606,7 +612,8 @@ PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
 Canceled=Canceled
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
+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
 Color=Color
 Documents=Linked files
@@ -642,6 +649,7 @@ FreeLineOfType=Free entry of type
 CloneMainAttributes=Clone object with its main attributes
 PDFMerge=PDF Merge
 Merge=Merge
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Show page to print main content area
 MenuManager=Menu manager
 WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only login <b>%s</b> is allowed to use application at the moment.
@@ -708,6 +716,7 @@ from=from
 toward=toward
 Access=Access
 SelectAction=Select action
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
 SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
 OriginFileName=Original filename
@@ -718,7 +727,7 @@ ViewPrivateNote=View notes
 XMoreLines=%s line(s) hidden
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
+SelectElementAndClick=Select an element and click %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
@@ -734,8 +743,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
@@ -755,11 +764,20 @@ Calendar=Calendar
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -817,5 +835,3 @@ SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/mn_MN/other.lang b/htdocs/langs/mn_MN/other.lang
index ab937ff3bab..b151614ce3c 100644
--- a/htdocs/langs/mn_MN/other.lang
+++ b/htdocs/langs/mn_MN/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=Date of birth
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Statistics in number of products/services units
-StatsByNumberOfEntities=Statistics in number of referring entities
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=The intervention %s has been validated.
 EMailTextInvoiceValidated=The invoice %s has been validated.
diff --git a/htdocs/langs/mn_MN/projects.lang b/htdocs/langs/mn_MN/projects.lang
index f9c603ce113..f40af2b963b 100644
--- a/htdocs/langs/mn_MN/projects.lang
+++ b/htdocs/langs/mn_MN/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
 PrivateProject=Project contacts
+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 (whatever is the type).
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=New project
 AddProject=Create project
 DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Opened projects
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
 SetProject=Set project
 NoProject=No project defined or owned
 NbOfProjects=Nb of projects
+NbOfTasks=Nb of tasks
 TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
@@ -47,9 +52,9 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
-NewTimeSpent=New time spent
+NewTimeSpent=Time spent
 MyTimeSpent=My time spent
 Tasks=Tasks
 Task=Task
@@ -59,6 +64,7 @@ TaskDescription=Task description
 NewTask=New task
 AddTask=Create task
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Activity
 Activities=Tasks/activities
 MyActivities=My tasks/activities
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=List of contracts associated with the project
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
 ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
@@ -110,7 +118,7 @@ TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
-TaskIsNotAffectedToYou=Task not assigned to you
+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.
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
 ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/nl_BE/accountancy.lang b/htdocs/langs/nl_BE/accountancy.lang
index 2c832e27ab6..778ac68b554 100644
--- a/htdocs/langs/nl_BE/accountancy.lang
+++ b/htdocs/langs/nl_BE/accountancy.lang
@@ -13,14 +13,14 @@ MenuAccountancy=Boekhouding
 Addanaccount=Voeg een boekhouder account toe
 AccountAccounting=Boekhouder account
 AccountAccountingShort=Rekening
-Bookkeeping=Grootboek
 CAHTF=Totaal leveranciersaankoop voor BTW
 Processing=Verwerken
-SelectedLines=Geselecteerde lijnen
 Lineofinvoice=Factuur lijn
 Docdate=Datum
 Docref=Artikelcode
 TotalVente=Totaal omzet voor belastingen
+AccountingJournalType2=Verkoop
+AccountingJournalType3=Inkoop
 Modelcsv=Model van een export
 OptionsDeactivatedForThisExportModel=Voor dit export model zijn de opties gedeactiveerd.
 Selectmodelcsv=Selecteer een model van export
diff --git a/htdocs/langs/nl_BE/admin.lang b/htdocs/langs/nl_BE/admin.lang
index d18bc42a159..1c513e99f4a 100644
--- a/htdocs/langs/nl_BE/admin.lang
+++ b/htdocs/langs/nl_BE/admin.lang
@@ -1,1665 +1,16 @@
 # Dolibarr language file - Source file is en_US - admin
-Foundation=Stichting
-Version=Versie
-VersionProgram=Programmaversie
-VersionLastInstall=Initial install version
-VersionLastUpgrade=Latest version upgrade
-VersionExperimental=Experimenteel
-VersionDevelopment=Ontwikkeling
-VersionUnknown=Onbekend
-VersionRecommanded=Aanbevolen
-FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. Value of some setup constants may also be checked. You can use this tool to detect if some files were modified by a hacker for example.
-FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
-GlobalChecksum=Global checksum
-MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
-LocalSignature=Embedded local signature (less reliable)
-RemoteSignature=Remote distant signature (more reliable)
-FilesMissing=Ontbrekende bestanden
-FilesUpdated=Bijgewerkte bestanden
-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
-XmlNotFound=Xml Integrity File of application not found
-SessionId=Sessie-ID
-SessionSaveHandler=Wijze van sessieopslag
-SessionSavePath=Sessie opslaglocatie
-PurgeSessions=Verwijderen van sessies
-ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
-NoSessionListWithThisHandler=De waarde van 'save session handler' ingesteld in uw PHP instellingen staat het niet toe een lijst van alle lopende sessies weer te geven.
-LockNewSessions=Blokkeer nieuwe sessies
-ConfirmLockNewSessions=Weet u zeker dat u alle sessies wilt beperken tot uzelf? Alleen de gebruiker <b>%s</b> kan dan nog met Dolibarr verbinden.
-UnlockNewSessions=Verwijder sessieblokkering
-YourSession=Uw sessie
-Sessions=Gebruikers-sessies
-WebUserGroup=Webserver gebruiker / groep
-NoSessionFound=Uw PHP installatie lijkt het niet toe te staan een lijst van actieve sessies weer te geven. De map waarin sessies worden opgeslagen (<b>%s</b>) zou afgeschermd kunnen zijn (bijvoorbeeld, door OS rechten of via de PHP instelling open_basedir).
-DBStoringCharset=Databasekarakterset voor het opslaan van gegevens
-DBSortingCharset=Databasekarakterset voor het sorteren van gegevens
-WarningModuleNotActive=<b>Module %s</b> dient te worden ingeschakeld
-WarningOnlyPermissionOfActivatedModules=Hier worden alleen de rechten van geactiveerde modules weergegeven. U kunt andere modules in het menu Home->Instellingen->Modules activeren.
-DolibarrSetup=Installatie of upgrade van Dolibarr
-InternalUser=Interne gebruiker
-ExternalUser=Externe gebruiker
-InternalUsers=Interne gebruikers
-ExternalUsers=Externe gebruikers
-GUISetup=Scherm
-SetupArea=Instellingenoverzicht
-FormToTestFileUploadForm=Formulier waarmee bestandsupload kan worden getest (afhankelijk van de gekozen opties)
-IfModuleEnabled=Opmerking: Ja, is alleen effectief als module <b>%s</b> is geactiveerd
-RemoveLock=Verwijder, als het bestaat, het bestand <b>%s</b> om gebruik te kunnen maken van de updatetool.
-RestoreLock=Voorzie het bestand <b>%s</b> van 'alleen-bekijken' rechten om updaten te voorkomen.
-SecuritySetup=Beveiligingsinstellingen
-SecurityFilesDesc=Define here options related to security about uploading files.
-ErrorModuleRequirePHPVersion=Fout, deze module vereist PHP versie %s of hoger.
-ErrorModuleRequireDolibarrVersion=Fout, deze module vereist Dolibarr versie %s of hoger.
-ErrorDecimalLargerThanAreForbidden=Fout, een nauwkeurigheid van meer dan <b>%s</b> wordt niet ondersteund.
-DictionarySetup=Woordenboek setup
-Dictionary=Woordenboeken
-ErrorReservedTypeSystemSystemAuto=De waarde 'system' en 'systemauto' als type zijn voorbehouden voor het systeem.  Je kan 'user' als waarde gebruiken om je eigen gegevens-record toe te voegen.
-ErrorCodeCantContainZero=Code mag geen 0 bevatten
-DisableJavascript=JavaScript en Ajax functies uitzetten (Aanbevolen voor blinden of tekst browsers)
-UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties, but it is less convenient)
-DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact, but it is less convenient)
-NumberOfKeyToSearch=Aantal karakters om een zoekopdracht te initiëren: %s
-NotAvailableWhenAjaxDisabled=Niet beschikbaar wanneer AJAX functionaliteit uitgeschakeld is
-AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
-JavascriptDisabled=JavaScript uitgeschakeld
-UsePreviewTabs=Gebruik voorbeelweergavetabbladen
-ShowPreview=Toon voorbeelweergave
-PreviewNotAvailable=Voorbeeldweergave niet beschikbaar
-ThemeCurrentlyActive=Huidige thema
-CurrentTimeZone=Huidige Tijdszone
-MySQLTimeZone=TimeZone MySql (database)
-TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
-Space=Ruimte
-Table=Tabel
-Fields=Velden
-Index=Index
-Mask=Masker
-NextValue=Volgende waarde
-NextValueForInvoices=Volgende waarde (facturen)
-NextValueForCreditNotes=Volgende waarde (creditnota's)
-NextValueForDeposit=Volgende waarde (storting)
-NextValueForReplacements=Volgende waarde (vervangingen)
-MustBeLowerThanPHPLimit=Opmerking: uw PHP instellingen beperken de groote van bestanduploads naar <b>%s %s,</b> ongeacht wat de waarde van de instelling binnen Dolibarr is
-NoMaxSizeByPHPLimit=Opmerking: Geen limiet ingesteld in uw PHP instellingen
-MaxSizeForUploadedFiles=Maximale grootte voor geüploade bestanden (0 om uploaden niet toe te staan)
-UseCaptchaCode=Gebruik een grafische code (CAPTCHA) op de aanmeldingspagina (SPAM preventie)
-AntiVirusCommand= Het volledige pad naar het antiviruscommando
-AntiVirusCommandExample= Voorbeeld voor ClamWin: c:\\Program Files (x86)\\ClamWin\\bin\\clamscan.exe<br>Voorbeeld voor ClamAv: /usr/bin/clamscan
-AntiVirusParam= Aanvullende parameters op de opdrachtregel
-AntiVirusParamExample= Voorbeeld voor ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
-ComptaSetup=Instellingen van de boekhoudkundige module
-UserSetup=Gebruikersbeheerinstellingen
-MultiCurrencySetup=Multi-currency setup
-MenuLimits=Limieten en nauwkeurigheid
-MenuIdParent=ID van het bovenliggende menu
-DetailMenuIdParent=ID van het bovenliggend menu (0 voor een hoogste menu)
-DetailPosition=Sorteren aantal te definiëren menupositie
-AllMenus=Alle
-NotConfigured=Niet geconfigureerd
-Active=Actief
-SetupShort=Instellingen
-OtherOptions=Overige opties
-OtherSetup=Overige instellingen
-CurrentValueSeparatorDecimal=Decimaal scheidingsteken
-CurrentValueSeparatorThousand=Duizend scheidingsteken
-Destination=Bestemming
-IdModule=Module ID
-IdPermissions=Permissions ID
-Modules=Modules
-LanguageBrowserParameter=Instelling %s
-LocalisationDolibarrParameters=Localisatie-instellingen
-ClientTZ=Tijdzone van de klant (gebruiker)
-ClientHour=Tijd bij de klant (gebruiker)
-OSTZ=Server OS Time Zone
-PHPTZ=Tijdzone binnen de PHP server
-DaylingSavingTime=Zomertijd (gebruiker)
-CurrentHour=Huidige tijd op server
-CurrentSessionTimeOut=Huidige sessietimeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
-Box=Widget
-Boxes=Widgets
-MaxNbOfLinesForBoxes=Max number of lines for widgets
-PositionByDefault=Standaardvolgorde
-Position=Positie
-MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
-MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br />Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
-MenuForUsers=Gebruikersmenu
-LangFile=.lang bestand
-System=Systeem
-SystemInfo=Systeeminformatie
-SystemToolsArea=Systeemwerksetoverzicht
-SystemToolsAreaDesc=Dit gedeelte biedt administratieve functionaliteit. Gebruik het menu om de functionaliteit in te stellen die u nodig heeft.
-Purge=Leegmaken
-PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
-PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
-PurgeDeleteTemporaryFilesShort=Delete temporary files
-PurgeDeleteAllFilesInDocumentsDir=Verwijder alle bestanden in de map <b>%s.</b>. Tijdelijke bestanden, maar ook databasebackupbestanden, bijlagen van elementen (derde partijen, facturen, etc) en bestanden geüpload naar de ECM-module zullen verwijderd worden.
-PurgeRunNow=Nu opschonen
-PurgeNothingToDelete=No directory or files to delete.
-PurgeNDirectoriesDeleted=<b>%s</b> bestanden of mappen verwijderd.
-PurgeAuditEvents=Verwijder alle gebeurtenisen
-ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
-GenerateBackup=Genereer backup
-Backup=Backup
-Restore=Herstellen
-RunCommandSummary=Backup geïnitieerd met het volgende commando
-BackupResult=Resultaat backup
-BackupFileSuccessfullyCreated=Backupbestand succesvol gegenereerd
-YouCanDownloadBackupFile=De gegenereerde bestanden kunnen nu gedownload worden
-NoBackupFileAvailable=Geen backupbestanden beschikbaar.
-ExportMethod=Exporteer methode
-ImportMethod=Importeer methode
-ToBuildBackupFileClickHere=Om een backupbestand te maken, klik <a href="%s">hier</a>.
-ImportMySqlDesc=Voor de invoer van een backupbestand, voert u het mysql-commando vanaf de opdrachtregel uit:
-ImportPostgreSqlDesc=Om een backupbestand te importeren, dient u het 'pg_restore' commando vanaf de opdrachtregel uit te voeren:
-ImportMySqlCommand=%s %s < mijnbackupbestand.sql
-ImportPostgreSqlCommand=%s %s mijnbackupbestand.sql
-FileNameToGenerate=Te creëren bestandsnaam
-Compression=Compressie
-CommandsToDisableForeignKeysForImport=Commando om 'foreign keys' bij importeren uit te schakelen
-CommandsToDisableForeignKeysForImportWarning=Verplicht als je je sql neerslag later wil gebruiken
-ExportCompatibility=Uitwisselbaarheid (compatibiliteit) van het gegenereerde exportbestand
-MySqlExportParameters=MySQL exporteer instellingen
-PostgreSqlExportParameters= PostgreSQL uitvoer parameters
-UseTransactionnalMode=Gebruik transactionele modus
-FullPathToMysqldumpCommand=Het volledige pad naar het 'MySQL dump' commando
-FullPathToPostgreSQLdumpCommand=Volledige pad naar het 'pg_dump' commando
-ExportOptions=Exporteeropties
-AddDropDatabase=Voeg 'DROP DATABASE' commando toe
-AddDropTable=Voeg 'DROP TABLE' commando toe
-ExportStructure=Struktuur
-NameColumn=Kollomennaam
-ExtendedInsert=Uitgebreide (extended) INSERT
-NoLockBeforeInsert=Geen lock-opdrachten rond INSERT
-DelayedInsert=Vertraagde (delayed) INSERT
-EncodeBinariesInHexa=Codeer binaire data in hexadecimalen
-IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
-AutoDetectLang=Automatisch detecteren (taal van de browser)
-FeatureDisabledInDemo=Functionaliteit uitgeschakeld in de demonstratie
-FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Rechten
-BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
-OnlyActiveElementsAreShown=Alleen elementen van ingeschakelde <a href="%s">modules</a> worden getoond.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
-ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external modules...
-GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
-DoliStoreDesc=DoliStore, de officiële markt voor externe Dolibarr ERP / CRM modules
-DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
-WebSiteDesc=Reference websites to find more modules...
-URL=Link
-BoxesAvailable=Widgets available
-BoxesActivated=Widgets activated
-ActivateOn=Activeren op
-ActiveOn=Geactiveerd op
-SourceFile=Bronbestand
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=Alleen beschikbaar als JavaScript en AJAX niet zijn uitgeschakeld
-Required=Verplicht
-UsedOnlyWithTypeOption=Alleen gebruikt door sommige agenda opties
-Security=Beveiliging
-Passwords=Wachtwoorden
-DoNotStoreClearPassword=Geen onversleutelde wachtwoorden opslaan in de database, maar alleen versleutelde (Activering aanbevolen)
-MainDbPasswordFileConfEncrypted=Databasewachtwoord versleuteld opslaan in conf.php (Activering aanbevolen)
-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=Bescherming van gecreëerde PDF files. (Activering NIET aanbevolen, omdat dit de aanmaak van meerdere bestanden onmogelijk maakt)
-ProtectAndEncryptPdfFilesDesc=Bescherming van PDF files, deze kunnen gelezen en afgedrukt worden met behulp van een PDF-lezer. Echter, het bewerken en kopiëren is niet meer mogelijk. Let op dat door het gebruik van deze functionaliteit, de bouw van een globale gecumuleerde pdf niet werkt (zoals bij onbetaalde facturen).
-Feature=Functionaliteit
-DolibarrLicense=Licentie
-Developpers=Ontwikkelaars / mensen die bijgedragen hebben
-OfficialWebSite=Officiële internationale Dolibarr website
-OfficialWebSiteLocal=Local web site (%s)
-OfficialWiki=Documentatie op de Wiki pagina's van Dolibarr
-OfficialDemo=Online demonstratie van Dolibarr
-OfficialMarketPlace=Officiële markt voor externe modules / addons
-OfficialWebHostingService=Verwezen web hosting diensten (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
-OtherResources=Andere bronnen
-ForDocumentationSeeWiki=Documentatie voor gebruikers of ontwikkelaars kunt u inzien door <br>te kijken op de Dolibarr Wiki-pagina's:<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=Voor alle andere vragen / hulp, kunt u gebruik maken van het Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
-HelpCenterDesc1=Dit scherm kan u helpen om ondersteuning voor Dolibarr te krijgen.
-HelpCenterDesc2=Kies de ondersteuning die overeenkomt met uw behoeften door te klikken op de betreffende link (Sommige van deze diensten zijn alleen beschikbaar in het <b>Engels</b>).
-CurrentMenuHandler=Huidige menuverwerker
-MeasuringUnit=Maateenheid
-LeftMargin=Left margin
-TopMargin=Top margin
-PaperSize=Paper type
-Orientation=Orientation
-SpaceX=Space X
-SpaceY=Space Y
-FontSize=Font size
-Content=Content
-NoticePeriod=Notice period
-NewByMonth=New by month
-Emails=E-mails
-EMailsSetup=E-mailinstellingen
-EMailsDesc=Met behulp van deze pagina kunt u PHP instellingen om e-mails te verzenden overschrijven. Op Unix / Linux besturingssystemen zijn deze In de meeste gevallen goed ingesteld en zijn deze instellingen nutteloos.
-MAIN_MAIL_SMTP_PORT=SMTP / SMTPS-poort (standaard in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS Host (standaard in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP / SMTPS-poort (niet gedefinieerd in PHP op Unix-achtige systemen)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS-host (Niet gedefinieerd in PHP op Unix-achtige systemen)
-MAIN_MAIL_EMAIL_FROM=E-mailafzender voor automatische e-mails (Standaard in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Afzender e-mail gebruikt voor error rendementen e-mails verzonden
-MAIN_MAIL_AUTOCOPY_TO= Stuur systematisch een verborgen zogenoemde 'Carbon-Copy' van alle verzonden e-mails naar
-MAIN_DISABLE_ALL_MAILS=Schakel alle e-mailverzendingen uit (voor testdoeleinden of demonstraties)
-MAIN_MAIL_SENDMODE=Te gebruiken methode om e-mails te verzenden
-MAIN_MAIL_SMTPS_ID=SMTP-gebruikersnaam indien verificatie vereist
-MAIN_MAIL_SMTPS_PW=SMTP-wachtwoord indien verificatie vereist
-MAIN_MAIL_EMAIL_TLS= Gebruik TLS (SSL) encryptie
-MAIN_MAIL_EMAIL_STARTTLS= Use TLS (STARTTLS) encrypt
-MAIN_DISABLE_ALL_SMS=Schakel alle SMS verzendingen (voor test doeleinden of demo)
-MAIN_SMS_SENDMODE=Methode te gebruiken om SMS te verzenden
-MAIN_MAIL_SMS_FROM=Standaard afzender telefoonnummer voor Sms versturen
-MAIN_MAIL_DEFAULT_FROMTYPE=Sender e-mail by default for manual sendings (User email or Company email)
-UserEmail=User email
-CompanyEmail=Company email
-FeatureNotAvailableOnLinux=Functionaliteit niet beschikbaar op Unix-achtige systemen. Test uw lokale 'sendmail' programma.
-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/
+VersionLastInstall=Versie van eerste installatie
+VersionLastUpgrade=Laatste versie upgrade
+MaxNbOfLinesForBoxes=Max aantal lijnen voor widgets
+PurgeDeleteTemporaryFiles=Verwijder alle tijdelijke bestanden (geen risico op verlies van gegevens)
+PurgeNothingToDelete=Geen map of bestanden om te verwijderen.
+IgnoreDuplicateRecords=Negeer fouten van dubbele tabelregels (INSERT negeren)
+ModulesMarketPlaces=Meer modules...
+BoxesAvailable=Beschikbare widgets
+BoxesActivated=Geactiveerde widgets
 SubmitTranslationENUS=Als de vertaling voor deze taal niet volledig is of een fout bevat, dan kunt u dit corrigeren door het bewuste taalbestand in de map <b>Langs/%s</b> te wijzigen en de wijzigingen op het Dolibarr forum te delen met anderen: www.dolibarr.org.
-ModuleSetup=Module-instellingen
-ModulesSetup=Instellingen van modules
-ModuleFamilyBase=Systeem
-ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
-ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Personeelszaken (HR)
-ModuleFamilyProjects=Projecten / Samenwerkingen
-ModuleFamilyOther=Ander
-ModuleFamilyTechnic=Hulpmiddelen voor multi-modules
-ModuleFamilyExperimental=Experimentele modules
-ModuleFamilyFinancial=Financiële Modules (Boekhouding / Bedrijfsfinanciën)
-ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
-ModuleFamilyInterface=Interfaces with external systems
-MenuHandlers=Menuverwerkers
-MenuAdmin=Menu wijzigen
-DoNotUseInProduction=Niet in productie gebruiken
-ThisIsProcessToFollow=This is steps to process:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
-StepNb=Stap %s
-FindPackageFromWebSite=Vind een pakket die u de functionaliteit geeft die u wilt (bijvoorbeeld op de officiële website van %s).
-DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <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>.
-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='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
-YouCanSubmitFile=For this step, you can send package using this tool: Select module file
-CurrentVersion=Huidige versie van Dolibarr
-CallUpdatePage=Go to the page that updates the database structure and data: %s.
-LastStableVersion=Latest stable version
-LastActivationDate=Latest activation date
-UpdateServerOffline=Updateserver offline
-GenericMaskCodes=U kunt elk gewenst maskernummer invoeren. In dit masker, kunnen de volgende tags worden gebruikt:<br><b>{000000}</b> correspondeert met een nummer welke vermeerderd zal worden op elke %s. Voer zoveel nullen in als de gewenste lengte van de teller. De teller wordt aangevuld met nullen vanaf links zodat er zoveel nullen zijn als in het masker.<br><b>{000000+000}</b> hetzelfde als voorgaand maar een offset corresponderend met het nummer aan de rechterkant van het + teken is toegevoegd startend op de eerste %s. <br><b>{000000@x}</b> hetzelfde als voorgaande maar de teller wordt gereset naar nul, wanneer maand x is bereikt (x tussen 1 en 12). Als deze optie is gebruikt en x is 2 of hoger, dan is de volgorde {yy}{mm} of {yyyy}{mm} ook vereist. <br><b>{dd}</b> dag (01 t/m 31).<br><b>{mm}</b> maand (01 t/m 12).<br><b>{yy}</b>, <b>{yyyy}</b> of <b>{y}</b> jaat over 2, 4 of 1 nummer(s). <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
-GenericMaskCodes3=Alle andere karakters in het masker zullen intact blijven.<br>Spaties zijn niet toegestaan.<br>
-GenericMaskCodes4a=<u>Voorbeeld van de 99e %s van de Klant 'HetBedrijf' gedaan op 2007-01-31:</u><br>
-GenericMaskCodes4b=<u>Voorbeeld van een Klant gecreëerd op 2007-03-01:</u><br>
-GenericMaskCodes4c=<u>Voorbeeld op product gemaakt op 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> geeft <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> geeft <b>0199-ZZZ/31/XXX</b>
-GenericNumRefModelDesc=Geeft een aanpasbaar nummer volgens een gedefinieerd masker.
-ServerAvailableOnIPOrPort=Server is beschikbaar op het IP-adres <b>%s</b> met poort <b>%s</b>
-ServerNotAvailableOnIPOrPort=Server is niet beschikbaar op het IP-adres <b>%s</b> met poort <b>%s</b>
-DoTestServerAvailability=Test server verbinding
-DoTestSend=Test verzenden
-DoTestSendHTML=Test het verzenden van HTML
-ErrorCantUseRazIfNoYearInMask=Fout, kan optie @ niet gebruiken om teller te resetten als sequence {yy} or {yyyy}  niet in het masker.
-ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Fout, kan optie @ niet gebruiken wanneer de volgorde {jj}{mm} of {jjjj}{mm} niet is opgenomen in het masker.
-UMask=Umask parameter voor nieuwe bestanden op een Unix- / Linux- / BSD-bestandssysteem.
-UMaskExplanation=Deze parameter laat u de rechten bepalen welke standaard zijn ingesteld voor de bestanden aangemaakt door Dolibarr op de server (tijdens het uploaden, bijvoorbeeld).<br>Het moet de octale waarde zijn (bijvoorbeeld, 0666 betekent lezen en schrijven voor iedereen).<br>Deze parameter wordt NIET op een windows-server gebruikt
-SeeWikiForAllTeam=Zie de Wiki-pagina voor details van alle personen die bijgedragen hebben en hun organisaties
-UseACacheDelay= Ingestelde vertraging voor de cacheexport in secondes (0 of leeg voor geen cache)
-DisableLinkToHelpCenter=Verberg de link "<b>ondersteuning of hulp nodig</b>" op de inlogpagina
-DisableLinkToHelp=Hide link to online help "<b>%s</b>"
-AddCRIfTooLong=Er zijn geen automatische regeleinden, dus als uw tekst in de documenten te lang is, moet u zelf regeleinden in de teksteditor invoeren.
-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...).
-MinLength=Minimale lengte
-LanguageFilesCachedIntoShmopSharedMemory=Bestanden .lang in het gedeelde geheugen
-ExamplesWithCurrentSetup=Voorbeelden met de huidige actieve configuratie
-ListOfDirectories=Lijst van OpenDocument sjablonenmappen
-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=Aantal ODT/ODS templates gevonden in deze mappen
-ExampleOfDirectoriesForModelGen=Voorbeelden van de syntaxis: <br>c:\\mijndir<br>/home/mijndir<br>DOL_DATA_ROOT/ECM/ecmdir
-FollowingSubstitutionKeysCanBeUsed=Door het plaatsen van de volgende velden in het sjabloon krijgt u een vervanging met de aangepaste waarde bij het genereren van het document:
-FullListOnOnlineDocumentation=De complete lijst met beschikbare velden is te vinden in de gebruikersdocumentatie op de Wiki van Dolibar: http://wiki.dolibarr.org.
-FirstnameNamePosition=Positie van voornaam / achternaam
-DescWeather=De volgende afbeeldingen zullen getoond worden op het dashboard wanneer het aantal late acties de volgende waarden heeft bereikt:
-KeyForWebServicesAccess=Sleutel om webdiensten te gebruiken (waarde "dolibarrkey" in webdiensten)
-TestSubmitForm=Invoer testformulier
-ThisForceAlsoTheme=Met behulp van dit menu manager zal ook gebruik maken van een eigen thema wat er keuze van de gebruiker. Ook dit menu manager gespecialiseerd smartphones niet werkt op alle smartphone. Gebruik een ander menu manager als u problemen ondervindt op het jouwe.
-ThemeDir=Skins directory
-ConnectionTimeout=Connexion time-out
-ResponseTimeout=Time-out antwoord
-SmsTestMessage=Testbericht van __PHONEFROM__ naar __PHONETO__
-ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
-SecurityToken=Sleutel tot URL beveiligen
-NoSmsEngine=Geen SMS afzender manager beschikbaar. SMS afzender manager zijn niet geïnstalleerd met de standaard distributie (omdat ze afhankelijk is van een externe leverancier), maar u kunt vinden op een aantal http://www.dolistore.com
-PDF=PDF
-PDFDesc=U kunt elke globale opties met betrekking tot de PDF-generatie
-PDFAddressForging=Regels aan te pakken dozen te smeden
-HideAnyVATInformationOnPDF=Verberg alle informatie met betrekking tot de BTW op gegenereerde PDF
-HideDescOnPDF=Verberg productbeschrijving op gemaakte PDF
-HideRefOnPDF=Verberg productreferentie op gemaakte PDF
-HideDetailsOnPDF=Hide product lines details on generated PDF
-PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
-Library=Bibliotheek
-UrlGenerationParameters=Parameters om URL beveiligen
-SecurityTokenIsUnique=Gebruik een unieke securekey parameter voor elke URL
-EnterRefToBuildUrl=Geef referentie voor object %s
-GetSecuredUrl=Get berekend URL
-ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
-OldVATRates=Oud BTW tarief
-NewVATRates=Nieuw BTW tarief
-PriceBaseTypeToChange=Wijzig op prijzen waarop een base reference waarde gedefiniëerd is
-MassConvert=Start algemene omzetting
-String=String
-TextLong=Lange tekst
-Int=Integer
-Float=Float
-DateAndTime=Datum en uur
-Unique=Unique
-Boolean=Boolean (Checkbox)
-ExtrafieldPhone = Telefoon
-ExtrafieldPrice = Prijs
-ExtrafieldMail = Email
-ExtrafieldUrl = Url
-ExtrafieldSelect = Keuze lijst
-ExtrafieldSelectList = Kies uit tabel
-ExtrafieldSeparator=Scheidingsteken
+HideDetailsOnPDF=Verberg product-detaillijnen op gemaakte PDF
 ExtrafieldPassword=Paswoord
-ExtrafieldCheckBox=Aanvink-vak
-ExtrafieldRadio=Radioknop
-ExtrafieldCheckBoxFromList= Checkbox from table
-ExtrafieldLink=Link naar een object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Een parameterlijst heeft de waarden sleutel,waarde<br><br> bijvoorbeeld: <br>1,waarde1<br>2,waarde2<br>3,waarde3<br>...<br><br>
-ExtrafieldParamHelpradio=Lijst van parameters moet bestaan uit sleutel,waarde<br><br>bv:<br>1,waarde<br>2,waarde2<br>3,waarde3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
-LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Opgelet: je <br>conf.php</b> bevat de instelling <b>dolibarr_pdf_force_fpdf=1</b>.  Dat betekent dat je de FPDF bibliotheek gebruikt om PDF bestanden te maken.  Deze bibliotheek is oud, en ondersteunt een aantal mogelijkheden niet (Unicode, transparantie in beelden, cyrillische, arabische en aziatische talen, ...), dus er kunnen fouten optreden bij het maken van PDF's.  <br>Om dat op te lossen, en om volledige ondersteuning van PDF-maken te hebben, download aub <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, en dan verwijder of maak commentaar van de lijn <b>$dolibarr_pdf_force_fpdf=1</b>, en voeg in plaats daarvan <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b> toe.
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
-SMS=SMS
-LinkToTestClickToDial=Geef een telefoonnummer om de ClickToDial link te testen voor gebruiker <strong>%s</strong>
-RefreshPhoneLink=Herladen link
-LinkToTest=Klikbare link gegenereerd voor <strong>gebruiker% s</strong> (klik telefoonnummer om te testen)
-KeepEmptyToUseDefault=Laat leeg om standaardwaarde te gebruiken
-DefaultLink=Standaard link
-SetAsDefault=Set as default
-ValueOverwrittenByUserSetup=Waarschuwing, deze waarde kan worden overschreven door de gebruiker specifieke setup (elke gebruiker kan zijn eigen ClickToDial url ingestellen)
-ExternalModule=Externe module - geïnstalleerd in map %s
-BarcodeInitForThirdparties=Mass barcode initialisatie voor relaties
-BarcodeInitForProductsOrServices=Mass barcode init of reset voor producten of diensten
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Init waarde voor de volgende %s lege records
-EraseAllCurrentBarCode=Wis alle huidige barcode waarden
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
-AllBarcodeReset=Alle barcode waarden zijn verwijderd
-NoBarcodeNumberingTemplateDefined=Geen barcode nummering sjabloon ingeschakeld in 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
-DisplayCompanyInfo=Display company address
-DisplayCompanyManagers=Display manager names
-DisplayCompanyInfoAndManagers=Display company address and manager names
-EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Geef een boekhoudkundige code terug opgebouwd uit "401", gevolgd door de de leverancierscode(Wanneer het een leverancier betreft) of een afnemerscode van de Klant (Wanneer het een afnemer betreft).
-ModuleCompanyCodePanicum=Geef een lege boekhoudkundige code terug.
-ModuleCompanyCodeDigitaria=Boekhoudkundige-code is afhankelijk van derden code. De code bestaat uit het teken "C" in de eerste positie, gevolgd door de eerste 5 tekens van de derden 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: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-ClickToShowDescription=Click to show description
-# Modules
-Module0Name=Gebruikers & groepen
-Module0Desc=Users / Employees and Groups management
-Module1Name=Beheer derde partijen
-Module1Desc=Beheer van derde partijen (klanten, leveranciers en contactpersonen). Ook kunt u hier sjabloondocumenten uploaden.
-Module2Name=Commercieel
-Module2Desc=Commercieel beheer
-Module10Name=Boekhouding
-Module10Desc=Eenvoudig boekhoudkundig beheer (Verzending van facturen en betalingen)
-Module20Name=Zakelijke voorstellen / Offertes
-Module20Desc=Beheer van offertes
-Module22Name=EMailings
-Module22Desc=Administratie en verzending van bulk-e-mails
-Module23Name=Energie
-Module23Desc=Monitoring van het verbruik van energie
-Module25Name=Bestellingen klanten
-Module25Desc=Beheer van de bestellingen door klanten
-Module30Name=Facturen
-Module30Desc=Factuur- en creditnotabeheer voor klanten. Factuurbeheer voor leveranciers
-Module40Name=Leveranciers
-Module40Desc=Leveranciersbeheer (inkoopopdrachten en -facturen)
-Module42Name=Syslog
-Module42Desc=logfaciliteiten met behulp van het 'syslog'-systeem
-Module49Name=Editors
-Module49Desc=Editorbeheer
-Module50Name=Producten
-Module50Desc=Productenbeheer
-Module51Name=Bulkmailings
-Module51Desc=Bulkmailingbeheer
-Module52Name=Productenvoorraad
-Module52Desc=Productenvoorraadbeheer
-Module53Name=Diensten
-Module53Desc=Dienstenbeheer
-Module54Name=Contracten/Abonnementen
-Module54Desc=Contractmanagement (diensten of herhalende abonnementen)
-Module55Name=Streepjescodes
-Module55Desc=Streepjescodesbeheer
-Module56Name=Telefonie
-Module56Desc=Telefoniebeheer
-Module57Name=Direct bank payment orders
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
-Module58Name=ClickToDial
-Module58Desc=Integratie van een 'ClickToDial' systeem (Asterisk, etc)
-Module59Name=Bookmark4u
-Module59Desc=Voeg functionaliteit toe om een 'Bookmark4u'-account te maken vanuit een Dolibarr-account
-Module70Name=Interventies
-Module70Desc=Interventiesbeheer
-Module75Name=Reisnotities en -kosten
-Module75Desc=Beheer van reisnotities en -kosten
-Module80Name=Verzendingen
-Module80Desc=Beheer afnemersverzending en -ontvangst
-Module85Name=Bank en Contant
-Module85Desc=Beheer van bank- en / of kasrekeningen
-Module100Name=Externe site
-Module100Desc=Voeg een externe website in het Dolibarr menu toe en bekijk deze in een frame
-Module105Name=Mailman en SPIP
-Module105Desc=Mailman of SPIP-interface voor leden-module
-Module200Name=LDAP
-Module200Desc=LDAP mappen synchronisatie
-Module210Name=PostNuke
-Module210Desc='PostNuke'-integratie
-Module240Name=Uitvoer gegevens (exporteren)
-Module240Desc=Tool to export Dolibarr data (with assistants)
-Module250Name=Invoer gegevens (importeren)
-Module250Desc=Tool to import data in Dolibarr  (with assistants)
-Module310Name=Leden
-Module310Desc=Ledenbeheer (van een vereniging)
-Module320Name=RSS-feeds
-Module320Desc=Voeg een RSS feed toe in de informatieschermen van Dolibarr
-Module330Name=Weblinks (Favouriete internetpagina's in het menu weergeven)
-Module330Desc=Internetfavorietenbeheer
-Module400Name=Projecten/Kansen/Leads
-Module400Desc=Beheer van projecten, kansen of leads. U kunt elk willekeurig element (factuur, order, offerte, interventie, ...) toewijzen aan een project en een transversale weergave krijgen van de projectweergave.
-Module410Name=Webkalender
-Module410Desc=Integratie van een webkalender
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
-Module520Name=Lening
-Module520Desc=Het beheer van de leningen
-Module600Name=Kennisgevingen
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
-Module700Name=Giften
-Module700Desc=Donatiebeheer
-Module770Name=Expense reports
-Module770Desc=Management en vordering onkostennota's (vervoer, maaltijden, ...)
-Module1120Name=Leverancier commerciële voorstel
-Module1120Desc=Leverancier verzoek commerciële voorstel en prijzen
-Module1200Name=Mantis
-Module1200Desc=Mantis integratie
-Module1400Name=Boekhouden
-Module1400Desc=Boekhoudkundig beheer van deskundigen (dubbel partijen)
-Module1520Name=Documenten genereren
-Module1520Desc=Massa mail document generen
-Module1780Name=Labels/Categorien
-Module1780Desc=Label/categorie maken (producten, klanten, leveranciers, contacten of leden)
-Module2000Name=Fckeditor
-Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
-Module2200Name=Dynamische prijzen
-Module2200Desc=Het gebruik van wiskundige uitdrukkingen voor prijzen mogelijk te maken
-Module2300Name=Cron
-Module2300Desc=Beheer taakplanning
-Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
-Module2500Name=Electronic Content Management
-Module2500Desc=Opslaan en delen van documenten
-Module2600Name=API/Web services (SOAP server)
-Module2600Desc=Enable the Dolibarr SOAP server providing API services
-Module2610Name=API/Web services (REST server)
-Module2610Desc=Enable the Dolibarr REST server providing API services
-Module2660Name=Call WebServices (SOAP client)
-Module2660Desc=Schakel de Dolibarr webservices client aan (Kan worden gebruikt om gegevens en / of aanvragen duwen naar externe servers. Leverancier bestellingen alleen ondersteund voor het moment)
-Module2700Name=Gravatar
-Module2700Desc=Gebruik de online dienst 'Gravatar' (www.gravatar.com) voor het posten van afbeeldingen van gebruikers / leden (gevonden door hun e-mails). Internet toegang vereist.
-Module2800Desc=FTP Client
-Module2900Name=GeoIPMaxmind
-Module2900Desc=Capaciteitconversie GeoIP Maxmind
-Module3100Name=Skype
-Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
-Module4000Name=HRM
-Module4000Desc=Human resources management
-Module5000Name=Multi-bedrijf
-Module5000Desc=Hiermee kunt meerdere bedrijven beheren in Dolibarr
-Module6000Name=Workflow
-Module6000Desc=Workflow beheer
-Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
-Module20000Name=Beheer van verlofverzoeken
-Module20000Desc=Bevestig en volg verlofverzoeken van medewerkers
-Module39000Name=Product lot
-Module39000Desc=Lot of serienummer, vervaldatum en de uiterste verkoopdatum beheer van producten
-Module50000Name=Paybox
-Module50000Desc=Module om een ​​online betaling pagina te bieden door creditcard met Paybox
-Module50100Name=Verkooppunt
-Module50100Desc=Point of sales module (POS).
-Module50200Name=Paypal
-Module50200Desc=Module om een ​​online betaling pagina te bieden per credit card met Paypal
-Module50400Name=Boekhouding
-Module50400Desc=Boekhoudkundig beheer
-Module54000Name=PrintIPP
-Module54000Desc=Direct print (zonder het openen van de documenten) met behulp van Cups IPP-interface (Printer moet zichtbaar zijn vanaf de server zijn, en CUPS moet geinstalleerd zijn op de server).
-Module55000Name=Poll, Survey or Vote
-Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
-Module59000Name=Marges
-Module59000Desc=Module om de marges te beheren
-Module60000Name=Commissies
-Module60000Desc=Module om commissies te beheren
-Module63000Name=Resources
-Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
-Permission11=Bekijk afnemersfacturen
-Permission12=Creëer / wijzigen afnemersfacturen
-Permission13=Invalideer afnemersfacturen
-Permission14=Valideer afnemersfacturen
-Permission15=Afnemersfacturen verzenden via e-mail
-Permission16=Creëer betalingen voor afnemersfacturen
-Permission19=Verwijder afnemersfacturen
-Permission21=Bekijk offertes
-Permission22=Creëer / wijzig offertes
-Permission24=Valideer offertes
-Permission25=Stuur offertes
-Permission26=Sluit offertes
-Permission27=Verwijder offertes
-Permission28=Exporteer offertes
-Permission31=Bekijk producten / diensten
-Permission32=Creëer / wijzig producten / diensten
-Permission34=Verwijderen producten / diensten
-Permission36=Exporteer producten / diensten
-Permission38=Export producten
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
-Permission44=Verwijder projecten (Gedeelde projecten en projecten waarvoor ik de contactpersoon ben)
-Permission45=Export projects
-Permission61=Bekijk interventies
-Permission62=Creëer / wijzig interventies
-Permission64=Verwijder interventies
-Permission67=Exporteer interventies
-Permission71=Bekijk leden
-Permission72=Creëer / wijzigen leden
-Permission74=Verwijder leden
-Permission75=Instelling lidsoorten en -attributen
-Permission76=Export data
-Permission78=Bekijk abonnementen
-Permission79=Creëer / wijzigen abonnementen
-Permission81=Bekijk afnemersopdrachten
-Permission82=Creëer / wijzig afnemersopdrachten
-Permission84=Valideer afnemersopdrachten
-Permission86=Verzend afnemersopdrachten
-Permission87=Sluit afnemersopdrachten
-Permission88=Annuleer afnemersopdrachten
-Permission89=Verwijder afnemersopdrachten
-Permission91=Read social or fiscal taxes and vat
-Permission92=Create/modify social or fiscal taxes and vat
-Permission93=Delete social or fiscal taxes and vat
-Permission94=Export social or fiscal taxes
-Permission95=Bekijk de verslagen
-Permission101=Bekijk verzendingen
-Permission102=Creëer / wijzig verzendingen
-Permission104=Valideer verzendingen
-Permission106=Export zendingen
-Permission109=Verwijder verzendingen
-Permission111=Bekijk de financiële rekeningen
-Permission112=Creëer / wijzig / verwijder en vergelijk transacties
-Permission113=Stel financiële rekeningen in (creëer, beheer, categoriseer)
-Permission114=Afstemming overboekingen
-Permission115=Exporteer transacties en rekeningafschriften
-Permission116=Overschrijvingen tussen rekeningen
-Permission117=Beheer cheques verzending
-Permission121=Bekijk derde partijen gelinkt aan de gebruiker
-Permission122=Creëer / wijzig derden gelinkt aan gebruiker
-Permission125=Verwijderen van derden gelinkt aan gebruiker
-Permission126=Exporteer derden
-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)
-Permission144=Delete all projects and tasks (also private projects i am not contact for)
-Permission146=Bekijk leveranciers
-Permission147=Bekijk statistieken
-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
-Permission161=Lees contracten/abonnementen
-Permission162=Creëren/aanpassen contracten/abonnementen
-Permission163=Een dienst/abonnement van een contract activeren
-Permission164=Een dienst/abonnement van een contract uitschakelen
-Permission165=Verwijderen contracten/abonnementen
-Permission167=Export contracts
-Permission171=Read trips and expenses (yours and your subordinates)
-Permission172=Creëren / bewerken reis- en onkosten
-Permission173=Verwijder reis- en onkosten
-Permission174=Lees alle reis en onkosten
-Permission178=Exporteer reis- en onkosten
-Permission180=Bekijk leveranciers
-Permission181=Bekijk leverancier opdrachten
-Permission182=Creëren / wijzigen leverancier opdrachten
-Permission183=Valideer leveranciersopdrachten
-Permission184=Goedkeuren leveranciersopdrachten
-Permission185=Bestel of annuleer leverancieropdrachten
-Permission186=Ontvang leveranciersopdrachten
-Permission187=Sluiten leverancieropdrachten
-Permission188=Annuleren leverancieropdrachten
-Permission192=Regels aanmaken
-Permission193=Regels beëindigen
-Permission194=Consult marge regels
-Permission202=Creëer DSL-aansluitingen
-Permission203=links inzien
-Permission204=Creëer links
-Permission205=Beheer links
-Permission206=Bladeren links
-Permission211=Consult telefonie
-Permission212=Orderregels
-Permission213=Schakel lijn
-Permission214=Configureer telefonie
-Permission215=Configureer leveranciers
-Permission221=Bekijk EMailings
-Permission222=Creëren / wijzigen e-mailings (onderwerp, ontvangers etc)
-Permission223=Valideer EMailings (laat sturen)
-Permission229=Verwijderen EMailings
-Permission237=Bekijk ontvangers en info
-Permission238=Handmatig verzenden van mailings
-Permission239=Verwijder mailings na validatie of verzonden
-Permission241=Bekijk categorieën
-Permission242=Creëren / wijzigen categorieën
-Permission243=Verwijderen categorieën
-Permission244=Zie de inhoud van de verborgen categorieën
-Permission251=Bekijk de andere gebruikers en groepen
-PermissionAdvanced251=Lees andere gebruikers
-Permission252=Creëren / wijzigen van andere gebruikers, groepen en rechten
-Permission253=Wijzigen van andere gebruikers wachtwoord
-PermissionAdvanced253=Creëer / wijzig de rechten van internet / externe gebruikers
-Permission254=Verwijderen of uitschakelen van andere gebruikers
-Permission255=Creëren / wijzigen eigen gebruikersgegevens
-Permission256=Wijzigen eigen wachtwoord
-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 assignement matters).
-Permission271=Lees CA
-Permission272=Facturen inzien
-Permission273=Facturen uitgeven
-Permission281=Bekijk contactpersonen
-Permission282=Creëren / wijzigen contactpersonen
-Permission283=Contactpersonen verwijderen
-Permission286=Contactpersonen Exporteren
-Permission291=Tarieven inzien
-Permission292=Stel rechten voor tarieven in
-Permission293=Wijzig afnemerstarieven
-Permission300=Bekijk streepjescodes
-Permission301=Creëren / wijzigen streepjescodes
-Permission302=Verwijderen streepjescodes
-Permission311=Diensten inzien
-Permission312=Dienst/abonnement aan het contract toevoegen
-Permission331=Bekijk weblinks
-Permission332=Creëren / wijzigen weblinks
-Permission333=Verwijderen weblinks
-Permission341=zijn eigen rechten lezen
-Permission342=zijn eigen gebruikersinformatie creëren / wijzigen
-Permission343=Eigen wachtwoord wijzigen
-Permission344=De eigen rechten aanpassen
-Permission351=Groepen inzien
-Permission352=Groepsrechten inzien
-Permission353=Creëren / bewerken van groepen
-Permission354=Verwijderen of uitschakelen van groepen
-Permission358=Gebruikers exporteren
-Permission401=Bekijk kortingen
-Permission402=Creëren / wijzigen kortingen
-Permission403=Kortingen valideren
-Permission404=Kortingen verwijderen
-Permission510=Lees Salarissen
-Permission512=Maak / wijzig salarissen
-Permission514=Verwijder salarissen
-Permission517=Export salarissen
-Permission520=Lees Leningen
-Permission522=Creëer/wijzigen leningen
-Permission524=Verwijderen leningen
-Permission525=Toegang lening calculator
-Permission527=Export leningen
-Permission531=Diensten inzien
-Permission532=Creëren / wijzigen van diensten
-Permission534=Diensten verwijderen
-Permission536=Inzien / beheren van verborgen diensten
-Permission538=Diensten exporteren
-Permission701=Bekijk donaties
-Permission702=Creëren / wijzigen donaties
-Permission703=Verwijderen donaties
-Permission771=Read expense reports (yours and your subordinates)
-Permission772=Creëer / wijzigen onkostennota's
-Permission773=Verwijderen onkostennota's
-Permission774=Lees alle onkostennota's (ook voor de gebruiker niet ondergeschikten)
-Permission775=Goedkeuren onkostennota's
-Permission776=Betalen onkostennota's
-Permission779=Export onkostennota's
-Permission1001=Bekijk voorraden
-Permission1002=Toevoegen/wijzigen van een magazijn
-Permission1003=Verwijder magazijnen
-Permission1004=Bekijk voorraadmutaties
-Permission1005=Creëren / wijzigen voorraadmutaties
-Permission1101=Bekijk levering opdrachten
-Permission1102=Creëren / wijzigen opdrachtenlevering
-Permission1104=Valideer opdrachtenlevering
-Permission1109=Verwijderen opdrachtenlevering
-Permission1181=Bekijk leveranciers
-Permission1182=Bekijk leveranciersopdrachten
-Permission1183=Creëer leveranciersopdrachten
-Permission1184=Valideer leveranciersopdrachten
-Permission1185=Goedkeuren leveranciersopdrachten
-Permission1186=Bestel leveranciersopdrachten
-Permission1187=Bevestigt de ontvangst van de leveranciersopdrachten
-Permission1188=Sluiten leverancier opdrachten
-Permission1190=Goedkeuren (tweede goedkeuring) leverancier bestellingen
-Permission1201=Geef het resultaat van een uitvoervergunning
-Permission1202=Creëren/wijzigen een uitvoervergunning
-Permission1231=Bekijk leveranciersfacturen
-Permission1232=Creëer leveranciersfacturen
-Permission1233=Valideer leveranciersfacturen
-Permission1234=Verwijderen leveranciersfacturen
-Permission1235=Leveranciersfacturen per e-mail verzenden
-Permission1236=Exporteer leveranciersfacturen, attributen en betalingen
-Permission1237=Exporteer Leverancier opdrachten en hun details
-Permission1251=Voer massale invoer van externe gegevens in de database uit (data load)
-Permission1321=Exporteer afnemersfacturen, attributen en betalingen
-Permission1322=Reopen a paid bill
-Permission1421=Exporteer afnemersfacturen en attributen
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
-Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
-Permission20006=Admin leave requests (setup and update balance)
-Permission23001=Lees geplande taak
-Permission23002=Maak/wijzig geplande taak
-Permission23003=Verwijder geplande taak
-Permission23004=Voer geplande taak uit
-Permission2401=Bekijk acties (gebeurtenissen of taken) in gerelateerd aan eigen account
-Permission2402=Creëren / wijzigen / verwijderen acties (gebeurtenissen of taken) gerelateerd aan eigen account
-Permission2403=Bekijk acties (gebeurtenissen of taken) van anderen
-Permission2411=Inzien van acties (gebeurtenissen of taken) van anderen
-Permission2412=Creëer/delete acties (gebeurtenissen of taken) van anderen
-Permission2413=Wijzig acties (gebeurtenissen of taken) van anderen
-Permission2414=Export actions/tasks of others
-Permission2501=Inzien van documenten
-Permission2502=Uploaden of verwijderen van documenten
-Permission2503=In te dienen of te verwijderen documenten
-Permission2515=Instellen documentabonneelijsten
-Permission2801=Gebruik FTP-client in lees modus (enkel verkennen en downloaden)
-Permission2802=Gebruik FTP-client in schrijf modus (verwijderen of bestanden uploaden)
-Permission50101=Gebruik Verkooppunten
-Permission50201=Lees transacties
-Permission50202=Import transacties
-Permission54001=Afdrukken
-Permission55001=Lees polls
-Permission55002=Maak / wijzig polls
-Permission59001=Lees commerciële marges
-Permission59002=Definieer commerciële marges
-Permission59003=Read every user margin
-Permission63001=Read resources
-Permission63002=Create/modify resources
-Permission63003=Delete resources
-Permission63004=Link resources to agenda events
-DictionaryCompanyType=Types of thirdparties
-DictionaryCompanyJuridicalType=Legal forms of thirdparties
-DictionaryProspectLevel=Prospect potentiële niveau
-DictionaryCanton=Provincie
-DictionaryRegion=Regio
-DictionaryCountry=Landen
-DictionaryCurrency=Valuta
-DictionaryCivility=Personal and professional titles
-DictionaryActions=Types of agenda events
-DictionarySocialContributions=Social or fiscal taxes types
-DictionaryVAT=BTW-tarieven of Verkoop Tax tarieven
-DictionaryRevenueStamp=Bedrag van de fiscale zegels
-DictionaryPaymentConditions=Betalingsvoorwaarden
-DictionaryPaymentModes=Betaalwijzen
-DictionaryTypeContact=Contact / Adres soorten
-DictionaryEcotaxe=Ecotax (WEEE)
-DictionaryPaperFormat=Papierformaten
-DictionaryFormatCards=Cards formats
-DictionaryFees=Types of fees
-DictionarySendingMethods=Verzendmethoden
-DictionaryStaff=Personeel
-DictionaryAvailability=Leverings vertraging
-DictionaryOrderMethods=Bestel methodes
-DictionarySource=Oorsprong van offertes / bestellingen
-DictionaryAccountancyCategory=Accounting account groups
-DictionaryAccountancysystem=Modellen voor rekeningschema
-DictionaryEMailTemplates=Email documentensjablonen
-DictionaryUnits=Units
-DictionaryProspectStatus=Prospection status
-DictionaryHolidayTypes=Types of leaves
-DictionaryOpportunityStatus=Opportunity status for project/lead
-SetupSaved=Instellingen opgeslagen
-BackToModuleList=Terug naar moduleoverzicht
-BackToDictionaryList=Terug naar de woordenboeken lijst
-VATManagement=BTW-beheer
-VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
-VATIsNotUsedDesc=Standaard is de voorgestelde BTW 0. Dit kan gebruikt worden in situaties zoals verenigingen, particulieren of kleine bedrijven.
-VATIsUsedExampleFR=In Frankrijk, betekent dit dat bedrijven of organisaties met een echt fiscaalsysteem (Vereenvoudigd reëel of normaal reëel). Een systeem waarbij de BTW wordt aangegeven.
-VATIsNotUsedExampleFR=In Frankrijk, betekent dit verenigingen die geen BTW aangegeven of bedrijven, organisaties of vrije beroepen die hebben gekozen voor het micro-onderneming fiscale stelsel (BTW in franchise) en een franchise BTW betaalden zonder BTW aangifte. Bij het maken van deze keuze verschijnt de vermelding "Niet van toepassing BTW - art-293B van CGI" op de facturen.
-##### Local Taxes #####
-LTRate=Tarief
-LocalTax1IsNotUsed=Gebruik geen tweede belasting
-LocalTax1IsUsedDesc=Gebruik een tweede type van belasting (met uitzondering van de BTW)
-LocalTax1IsNotUsedDesc=Gebruik geen ander type van belasting (andere dan BTW)
-LocalTax1Management=Tweede soort belasting
-LocalTax1IsUsedExample=
-LocalTax1IsNotUsedExample=
-LocalTax2IsNotUsed=Derde belasting niet gebruiken
-LocalTax2IsUsedDesc=Gebruik een derde type van belasting (met uitzondering van de BTW)
-LocalTax2IsNotUsedDesc=Gebruik geen ander type van belasting (andere dan BTW)
-LocalTax2Management=Derde type belasting
-LocalTax2IsUsedExample=
-LocalTax2IsNotUsedExample=
-LocalTax1ManagementES= Gestion RE
-LocalTax1IsUsedDescES= Het RE tarief volgt standaard de actieve standaardregel (bij het maken van prospecten, facturen, opdrachten etc)<br> Als de koper niet is onderworpen aan RE, wordt de RE standaard standaard ingesteld op 0. Einde van de regel.<br>Indien de koper wordt onderworpen aan dan de RE dan standaard RE. Einde van de regel.<br>
-LocalTax1IsNotUsedDescES= Standaard is de voorgestelde RE 0. Einde van de regel.
-LocalTax1IsUsedExampleES= In Spanje zijn zij professionals die onderworpen zijn aan enkele specifieke secties van het Spaanse IAE.
-LocalTax1IsNotUsedExampleES= In Spanje zijn zij professionals en verenigingen die onderworpen zijn aan bepaalde secties van het Spaanse IAE.
-LocalTax2ManagementES= IRPF beheer
-LocalTax2IsUsedDescES= Het standaard RE tarief bij het aanmaken van prospecten, facturen, opdrachten, etc volgt de actieve standaardregel:<br>Wanneer de verkoper niet onderworpen is aan de IRPF, dan wordt IRPF ingesteld op o. Einde van de regel.<br>Wanneer de verkoper onderworpen is aan de IRPF, dan wordt standaard de IRPF insgesteld. Einde van regel.<br>
-LocalTax2IsNotUsedDescES= Standaard is de voorgestelde IRPF 0. Einde van de regel.
-LocalTax2IsUsedExampleES= In Spanje, freelancers en onafhankelijke professionals die diensten aanbieden alsmede bedrijven die voor het belastingsysteem van modules hebben gekozen.
-LocalTax2IsNotUsedExampleES= In Spanje zijn zij bedrijven die niet onderworpen zijn aan het belastingsysteem van modules.
-CalcLocaltax=Rapporten over lokale belastingen
-CalcLocaltax1=Verkopen - Aankopen
-CalcLocaltax1Desc=Lokale belastings rapporten worden berekend met het verschil tussen verkopen en aankopen
-CalcLocaltax2=Aankopen
-CalcLocaltax2Desc=Lokale Belastingen rapporten zijn het totaal van balastingen aankopen
-CalcLocaltax3=Verkopen
-CalcLocaltax3Desc=Lokale Belastingen rapporten zijn het totaal van belastingen verkoop
-LabelUsedByDefault=Standaard te gebruiken label indien er geen vertaling kan worden gevonden voor de code
-LabelOnDocuments=Etiket op documenten
-NbOfDays=Aantal dagen
-AtEndOfMonth=Aan het einde van de maand
-CurrentNext=Current/Next
-Offset=Offset (afstand)
-AlwaysActive=Altijd actief
-Upgrade=Bijwerken
-MenuUpgrade=Bijwerken / Uitbreiden
-AddExtensionThemeModuleOrOther=Deploy/install external module
-WebServer=Webserver
-DocumentRootServer='Root' map van de webserver
-DataRootServer=Gegevensbestandenmap
-IP=IP
-Port=Poort
-VirtualServerName=Virtuele servernaam
-OS=OS
-PhpWebLink=PHP Weblink
-Browser=Browser
-Server=Server
-Database=Database
-DatabaseServer=Databasehost
-DatabaseName=Databasenaam
-DatabasePort=Databasepoort
-DatabaseUser=Databasegebruikersnaam
-DatabasePassword=Databasewachwoord
-Tables=Tabellen
-TableName=Tabelnaam
-NbOfRecord=Aantal tabelregels
-Host=Server
-DriverType=Drivertype
-SummarySystem=Samenvatting van systeeminformatie
-SummaryConst=Lijst van alle Dolibarr-instellingen
-MenuCompanySetup=Bedrijf / Stichting
-DefaultMenuManager= standaard menuverwerker
-DefaultMenuSmartphoneManager=standaard smartphonemenuverwerker
-Skin=Uiterlijksthema
-DefaultSkin=Standaard uiterlijksthema
-MaxSizeList=Maximale lijstlengte
-DefaultMaxSizeList=Default max length for lists
-DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
-MessageOfDay=Bericht van de dag
-MessageLogin=Bericht op inlogpagina
-PermanentLeftSearchForm=Permanent zoekformulier in linker menu
-DefaultLanguage=Standaard te gebruiken taal (taal-code)
-EnableMultilangInterface=Inschakelen meertalige interface
-EnableShowLogo=Toon logo in het linker menu
-CompanyInfo=Bedrijf / stichting informatie
-CompanyIds=Bedrijf / stichting identiteiten
-CompanyName=Naam
-CompanyAddress=Adres
-CompanyZip=Postcode
-CompanyTown=Plaats
-CompanyCountry=Land
-CompanyCurrency=Belangrijkste valuta
-CompanyObject=Object of the company
-Logo=Logo
-DoNotSuggestPaymentMode=Geen betalingswijze voorstellen
-NoActiveBankAccountDefined=Geen actieve bankrekening ingesteld
-OwnerOfBankAccount=Eigenaar van bankrekening %s
-BankModuleNotActive=Bankrekeningen module niet ingeschakeld
-ShowBugTrackLink=Show link "<strong>%s</strong>"
-Alerts=Kennisgevingen
-DelaysOfToleranceBeforeWarning=Getolereerde vertraging voor kennisgeving
-DelaysOfToleranceDesc=In dit scherm kunt u de getolereerde vertraging voordat een kennisgeving wordt gemeld op het scherm met een icoontje %s voor elk te laat element.
-Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned events (agenda events) not completed yet
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Delay tolerance (in days) before alert on project not closed in time
-Delays_MAIN_DELAY_TASKS_TODO=Delay tolerance (in days) before alert on planned tasks (project tasks) not completed yet
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on orders not processed yet
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on suppliers orders not processed yet
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Getolereerde vertraging (in dagen) voor een kennisgeving, op af te sluiten offertes word getoond
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Getolereerde vertraging (in dagen) voor een kennisgeving, op niet-gefactureerde offertes word getoond
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Getolereerde vertraging (in dagen) voor een kennisgeving, op te activeren diensten word getoond
-Delays_MAIN_DELAY_RUNNING_SERVICES=Getolereerde vertraging (in dagen) voor een kennisgeving, op afgelopen diensten word getoond
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Getolereerde vertraging (in dagen) voor een kennisgeving, op een onbetaalde leveranciersfactuur word getoond
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Getolereerde vertraging (in dagen) voor een kennisgeving, op een onbetaalde afnemersfactuur word getoond
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Getolereerde vertraging (in dagen) voor een kennisgeving, op bank conciliatie word getoond
-Delays_MAIN_DELAY_MEMBERS=Getolereerde vertraging (in dagen) voor een kennisgeving, op niet betaalde contributie word getoond
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Getolereerde vertraging (in dagen) voor de kennisgeving voor nog te doen cheques aanbetaling
-Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
-SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
-SetupDescription5=Andere menu-items beheren / optionele instellingen.
-LogEvents=Veiligheidsauditgebeurtenissen
-Audit=Audit
-InfoDolibarr=About Dolibarr
-InfoBrowser=About Browser
-InfoOS=About OS
-InfoWebServer=About Web Server
-InfoDatabase=About Database
-InfoPHP=About PHP
-InfoPerf=About Performances
-BrowserName=Browser naam
-BrowserOS=Browser OS
-ListOfSecurityEvents=Lijst van Dolibarr veiligheidgebeurtenisen
-SecurityEventsPurged=Beveiliging gebeurtenissen verwijderd
-LogEventDesc=Hier kunt u de de gewenste veiligheidslogs in- of uitschakelen. Beheerders kunnen de inhoud ervan dan zien via het menu <b>Home->Systeemwerkset->Audit.</b> Waarschuwing, deze functionaliteit kan een grote hoeveelheid gegevens in de database wegschrijven.
-AreaForAdminOnly=Deze functies kunnen alleen worden gebruikt door <b>beheerders</b>
-SystemInfoDesc=Systeeminformatie is technische informatie welke u in alleen-lezen modus krijgt en alleen door beheerders is in te zien.
-SystemAreaForAdminOnly=Dit scherm is alleen beschikbaar voor de beheerders. Andere Dolibarr gebruikers kunnen hier niets wijzigen.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
-DisplayDesc=U kunt hier instellingen doen die het uiterlijk van Dolibarr instellen
-AvailableModules=Beschikbare modules
-ToActivateModule=Om modules te activeren, ga naar Home->Instellingen->Modules.
-SessionTimeOut=Time-out van de sessie
-SessionExplanation=De hier ingestelde waarde garandeert dat de sessie nooit zal verlopen voordat deze periode is verlopen, maar niet dat de sessie wel verloopt na deze vertraging, omdat sessies worden worden verwijderd wanneer het systeem zelf een opschoning begint.<br>Opmerking: bij geen specifiek systeem, zal PHP elke sessie wissen rond <b>%s/%s</b> toegang, maar alleen tijdens de toegang van andere sessies.
-TriggersAvailable=Beschikbare initiatoren (triggers)
-TriggersDesc=Initiatoren zijn bestanden die het gedrag van de 'workflow' van Dolibarr zullen beïnvloeden vanaf het moment dat zij zijn gekopieerd naar de map <b>htdocs/core/triggers.</b>Zij initiëren nieuwe acties, geactiveerd door Dolibarr gebeurtenissen (de creatie van nieuwe bedrijven, factuur validatie, etc).
-TriggerDisabledByName=Initiatoren in dit bestand zijn uitgeschakeld door het <b>NoRun</b> achtervoegsel in hun naam.
-TriggerDisabledAsModuleDisabled=Initiatoren in dit bestand zijn uitgeschakeld als module <b>%s</b> is uitgeschakeld.
-TriggerAlwaysActive=Initiatoren in dit bestand zijn altijd actief, ongeacht de geactiveerde modules in Dolibarr.
-TriggerActiveAsModuleActive=Initiatoren in dit bestand zijn actief als module <b>%s</b> is ingeschakeld.
-GeneratedPasswordDesc=Stel hier de regel in die u wilt gebruiken voor het genereren van een nieuwe wachtwoord als u vraagt om een automatisch gegenereerd wachtwoord
-DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">check here</a>.
-MiscellaneousDesc=All other security related parameters are defined here.
-LimitsSetup=Limieten- en precisieinstellingen
-LimitsDesc=U kunt hier limieten en preciseringen die Dolibarr gebruikt instellen
-MAIN_MAX_DECIMALS_UNIT=Maximaal aantal decimalen voor eenheidsprijzen
-MAIN_MAX_DECIMALS_TOT=Maximaal aantal decimalen voor de totale prijs
-MAIN_MAX_DECIMALS_SHOWN=Maximaal aantal decimalen voor de prijzen weergegeven op het scherm (Voeg <b>...</b> toe na dit nummer als u <b>...</b> wilt zien als het nummer wordt afgekapt op het scherm)
-MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
-UnitPriceOfProduct=Prijs per eenheid van een product
-TotalPriceAfterRounding=Totale prijs inclusief na afronding
-ParameterActiveForNextInputOnly=De instelling word pas actief voor de volgende invoer
-NoEventOrNoAuditSetup=Geen geregistreerde auditgebeurtenis. Dit is normaal als de audit nog niet is ingeschakeld in "Home->Instellingen->Beveiliging->Audit".
-NoEventFoundWithCriteria=Geen beveiligingsgebeurtenis gevonden met deze zoek criteria.
-SeeLocalSendMailSetup=Controleer de instellingen van uw lokale "sendmail"-programma
-BackupDesc=Om een complete backup van Dolibarr te maken, dient u:
-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=- Bewaar de inhoud van uw database in een dump bestand. Om dit te doen, kunt u gebruik maken van de volgende assistent.
-BackupDescX=Gearchiveerde map-bestand moet op een veilige plaats worden opgeslagen.
-BackupDescY=De gemaakte dump bestand moet op een veilige plaats worden opgeslagen.
-BackupPHPWarning=Backup niet gegarandeerd met deze methode. Gebruik beter de vorige
-RestoreDesc=Om een Dolibarr backup terug te zetten, dient u:
-RestoreDesc2=- Herstel archiefbestand (zip bestand bijvoorbeeld) van de oude documentenmap in de documentenmap van de nieuwe Dolibarr installatie of in huidige documentenmap (<b>%s</b>).
-RestoreDesc3=- Herstel de gegevens van een backup dumpbestand, in de database van de nieuwe Dolibarr installatie of in de database van de huidige installatie. Waarschuwing, zodra een herstel is gedaan, zult u de gebruikersnaam en wachtwoord die bestonden toen de backup werd gemaakt, moeten gebruiken. Om een backupdatabase in de huidige installatie te herstellen, kunt u de assistent (wizard) volgen.
-RestoreMySQL=MySQL import
-ForcedToByAModule= Geforceerd tot <b>%s</b> door een geactiveerde module
-PreviousDumpFiles=Beschikbare databasebackupdumpbestanden
-WeekStartOnDay=Eerste dag van de week
-RunningUpdateProcessMayBeRequired=Update lijkt vereist (Programma versie %s verschilt met de database versie %s)
-YouMustRunCommandFromCommandLineAfterLoginToUser=U dient dit commando vanaf de opdrachtregel uit te voeren, na ingelogd te zijn als gebruiker <b>%s</b>. Of u dient het commando uit te breiden door de -W optie mee te geven zodat u het wachtwoord kunt opgeven.
-YourPHPDoesNotHaveSSLSupport=SSL functies niet beschikbaar in uw PHP installatie
-DownloadMoreSkins=Meer uiterlijkthema's om te downloaden
-SimpleNumRefModelDesc=Geeft het referentienummer terug in het formaat %sjjmm-nnnn waar jj jaar is, mm de maand en nnnn een opeenvolgende aaneengesloten reeks en zonder vervangende 0
-ShowProfIdInAddress=Toon in het adresgedeelte van documenten het 'professioneel ID'
-ShowVATIntaInAddress=Verberg BTW Intra num met adressen op documenten
-TranslationUncomplete=Onvolledige vertaling
-MAIN_DISABLE_METEO=Schakel "Meteo"-weergave uit
-TestLoginToAPI=Test inloggen op API
-ProxyDesc=Sommige functies van Dolibarr moet een toegang tot internet aan het werk te hebben. Definieer hier parameters voor deze. Als de Dolibarr server zich achter een Proxy server, deze parameters vertelt Dolibarr hoe toegang tot internet via het.
-ExternalAccess=Externe toegang
-MAIN_PROXY_USE=Gebruik een proxy server (anders directe toegang tot internet)
-MAIN_PROXY_HOST=Naam / adres van de proxy server
-MAIN_PROXY_PORT=Poort van de proxy server
-MAIN_PROXY_USER=Inloggen op de proxyserver te gebruiken
-MAIN_PROXY_PASS=Wachtwoord voor de proxy-server te gebruiken
-DefineHereComplementaryAttributes=Definieer hier alle attributen, niet reeds standaard beschikbaar, en dat je wilt worden ondersteund voor %s.
-ExtraFields=Aanvullende attributen
-ExtraFieldsLines=Aanvullende kenmerken (lijnen)
-ExtraFieldsSupplierOrdersLines=Complementaire attributen (orderregels)
-ExtraFieldsSupplierInvoicesLines=Complementaire attributen (factuurregels)
-ExtraFieldsThirdParties=Aanvullende kenmerken (relaties)
-ExtraFieldsContacts=Aanvullende kenmerken (contact / adres)
-ExtraFieldsMember=Aanvullende kenmerken (lid)
-ExtraFieldsMemberType=Aanvullende kenmerken (soort lid)
-ExtraFieldsCustomerInvoices=Aanvullende kenmerken (facturen)
-ExtraFieldsSupplierOrders=Aanvullende kenmerken (orders)
-ExtraFieldsSupplierInvoices=Aanvullende kenmerken (facturen)
-ExtraFieldsProject=Aanvullende kenmerken (projecten)
-ExtraFieldsProjectTask=Aanvullende kenmerken (taken)
-ExtraFieldHasWrongValue=Attribuut %s heeft een verkeerde waarde.
-AlphaNumOnlyLowerCharsAndNoSpace=alleen alfanumerieke tekens en kleine letters zonder spatie
-SendmailOptionNotComplete=Waarschuwing, op sommige Linux-systemen, e-mail verzenden vanaf uw e-mail, sendmail uitvoering setup moet conatins optie-ba (parameter mail.force_extra_parameters in uw php.ini-bestand). Als sommige ontvangers nooit e-mails ontvangen, probeer dit PHP parameter bewerken met mail.force_extra_parameters =-ba).
-PathToDocuments=Pad naar documenten
-PathDirectory=Map
-SendmailOptionMayHurtBuggedMTA=Feature om e-mails met behulp van methode "PHP mail direct" te sturen zal een e-mailbericht dat niet goed zou kunnen worden ontleed door sommige het ontvangen van e-mailservers. Resultaat is dat sommige mails niet kunnen worden gelezen door mensen gehost door thoose afgeluisterd platforms. Het is het geval voor sommige Internet providers (Ex: Orange in Frankrijk). Dit is geen probleem in Dolibarr noch in PHP, maar op het ontvangen van e-mailserver. U kunt de optie MAIN_FIX_FOR_BUGGED_MTA echter toe te voegen aan 1 in setup - andere om Dolibarr wijzigen om dit te voorkomen. Echter, kunnen er problemen met andere servers dat opzicht strikt de SMTP-standaard. De andere oplossing (aanbevolen) is het gebruik van de methode "SMTP-socket bibliotheek" dat er geen nadelen heeft.
-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: <strong>User display setup</strong> tab of 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
-TranslationString=Translation string
-CurrentTranslationString=Current translation string
-WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
-NewTranslationStringToShow=New translation string to show
-OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
-YouMustEnableOneModule=Je moet minstens 1 module aktiveren
-ClassNotFoundIntoPathWarning=Classe %s niet gevonden in PHP pad
-YesInSummer=Ja in de zomer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
-SuhosinSessionEncrypt=Sessie opslag geencrypteerd door Suhosin
-ConditionIsCurrently=Voorwaarde is momenteel %s
-YouUseBestDriver=U gebruikt driver %s die momenteel meest geschikt is.
-YouDoNotUseBestDriver=U gebruikt driver %s, maar driver %s is aangeraden
-NbOfProductIsLowerThanNoPb=U hebt enkel %s producten/diensten in de database. Er is geen optimalisatie nodig.
-SearchOptim=Zoekmachine optimalisatie
-YouHaveXProductUseSearchOptim=U hebt %s producten in de database. U kan best de constante PRODUCT_DONOTSEARCH_ANYWHERE op 1 zetten in Home-instellingen-andere, u beperkt het zoeken tot begin van strings, waardoor de database een index kan gebruiken en een onmiddelijk resultaat geeft.
-BrowserIsOK=U gebruikt de webbrowser %s. Deze browser is in orde voor beveiliging en prestaties.
-BrowserIsKO=U gebruikt de webbrowser %s. Deze browser is een slechte keuze voor veiligheid, prestaties en betrouwbaarheid. Wij raden u aan Firefox, Chrome, Opera of Safari gebruiken.
-XDebugInstalled=Xdebug is geladen.
-XCacheInstalled=Xcache is geladen.
-AddRefInList=Weergave klant / leverancier ref in lijst (lijst of combobox) en de meeste van hyperlink. Relaties verschijnen met de naam "CC12345 - SC45678 - Het groot bedrijf coorp", in plaats van "Het groot bedrijf coorp".
-AskForPreferredShippingMethod=Ask for preferred Sending Method for Third Parties.
-FieldEdition=Wijziging van het veld %s
-FillThisOnlyIfRequired=Voorbeeld: +2 (alleen invullen als tijdzone offset problemen worden ervaren)
-GetBarCode=Haal barcode
-##### Module password generation
-PasswordGenerationStandard=Geeft een wachtwoord terug dat gegenereerd is volgens het interne Dolibarr algoritme: 8 karakters met gedeelde nummers en tekens in kleine letters.
-PasswordGenerationNone=Do not suggest any generated password. Password must be typed in manually.
-PasswordGenerationPerso=Return a password according to your personally defined configuration.
-SetupPerso=According to your configuration
-PasswordPatternDesc=Password pattern description
-##### Users setup #####
-RuleForGeneratedPasswords=Regel voor te genereren suggestie- en validatiewachtwoorden
-DisableForgetPasswordLinkOnLogonPage=Verberg de link "Wachtwoord vergeten?" op de inlogpagina
-UsersSetup=Gebruikersmoduleinstellingen
-UserMailRequired=E-mail verplicht om een nieuwe gebruiker creëren
-##### HRM setup #####
-HRMSetup=HRM module setup
-##### Company setup #####
-CompanySetup=Derde partijenmoduleinstellingen
-CompanyCodeChecker=Module voor de generatie en toetsing van codes voor derde partijen (afnemer of leverancier)
-AccountCodeManager=Module voor de generatie van boekhoudkundige codes (afnemer of leverancier)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
-NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
-NotificationsDescGlobal=* or by setting global target emails in module setup page.
-ModelModules=Documentensjablonen
-DocumentModelOdt=Genereer documenten uit OpenDocuments sjablonen (. ODT of. ODS-bestanden voor OpenOffice, KOffice, TextEdit, ...)
-WatermarkOnDraft=Watermerk op conceptdocumenten
-JSOnPaimentBill=Activeert functie om de betalingslijnen op betalingsformulieren automatisch aan te vullen
-CompanyIdProfChecker=Professionele Id unieke
-MustBeUnique=Must be unique?
-MustBeMandatory=Mandatory to create third parties?
-MustBeInvoiceMandatory=Mandatory to validate invoices?
-##### Webcal setup #####
-WebCalUrlForVCalExport=Een exportlink naar het <b>%s</b> formaat is beschikbaar onder de volgende link: %s
-##### Invoices #####
-BillsSetup=Facturenmodule instellen
-BillsNumberingModule=Nummeringsmodule voor facturen en creditnota's
-BillsPDFModules=Factuur documentsjablonen
-CreditNote=Creditnota
-CreditNotes=Creditnota's
-ForceInvoiceDate=Forceer factuurdatum naar validatiedatum
-SuggestedPaymentModesIfNotDefinedInInvoice=Voorgestelde betaalwijze standaard op de factuur, indien niet ingesteld voor de betreffende factuur
-SuggestPaymentByRIBOnAccount=Voorstellen de betaling via automatische incasso te laten plaatsvinden
-SuggestPaymentByChequeToAddress=Voorstellen de betaling per cheque te doen
-FreeLegalTextOnInvoices=Vrije tekst op facturen
-WatermarkOnDraftInvoices=Watermerk op ontwerp-facturen (geen indien leeg)
-PaymentsNumberingModule=Payments numbering model
-SuppliersPayment=Leveranciersbetalingen
-SupplierPaymentSetup=Suppliers payments setup
-##### Proposals #####
-PropalSetup=Offertemoduleinstellingen
-ProposalsNumberingModules=Offertenummeringmodules
-ProposalsPDFModules=Offertedocumentsjablonen
-FreeLegalTextOnProposal=Vrije tekst op Offertes
-WatermarkOnDraftProposal=Watermerk op ontwerp offertes (geen indien leeg)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Vraag naar bankrekening bestemming van het voorstel
-##### SupplierProposal #####
-SupplierProposalSetup=Prijsaanvragen leveranciers module instelling
-SupplierProposalNumberingModules=Prijsaanvragen leveranciers nummering modellen
-SupplierProposalPDFModules=Prijsaanvragen leveranciers documenten modellen
-FreeLegalTextOnSupplierProposal=Vrije tekst op leveranciers prijsaanvragen
-WatermarkOnDraftSupplierProposal=Watermerk op ontwerp leveranciers prijsaanvraag ​​(geen als leeg)
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Vraag naar bankrekening bestemming van prijsaanvraag
-WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
-##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
-##### Orders #####
-OrdersSetup=Opdrachtenbeheerinstellingen
-OrdersNumberingModules=Opdrachtennummeringmodules
-OrdersModelModule=Oprachtendocumentsjablonen
-FreeLegalTextOnOrders=Vrije tekst op opdrachten
-WatermarkOnDraftOrders=Watermerk op ontwerp-orders (geen indien leeg)
-ShippableOrderIconInList=Voeg een icoon toe aan de lijst Bestellingen die aangeeft wanneer leverbaar
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Interventions #####
-InterventionsSetup=Interventiemodule-instellingen
-FreeLegalTextOnInterventions=Vrije tekst op interventiedocumenten
-FicheinterNumberingModules=Interventienummeringsmodules
-TemplatePDFInterventions=Interventiekaartdocumentensjablonen
-WatermarkOnDraftInterventionCards=Watermerk op interventiekaart documenten (geen indien leeg)
-##### Contracts #####
-ContractsSetup=Contracten/Abonnementen instellingen
-ContractsNumberingModules=Contracten nummering modules
-TemplatePDFContracts=Modeldocumenten contracten
-FreeLegalTextOnContracts=Vrije tekst op contracten
-WatermarkOnDraftContractCards=Watermerk op voorlopige contracten (leeg=geen)
-##### Members #####
-MembersSetup=Ledenmoduleinstellingen
-MemberMainOptions=Hoofdopties
-AdherentLoginRequired= Beheren van een login voor elk lid
-AdherentMailRequired=E-mail is vereist om een nieuw lid te creeren
-MemberSendInformationByMailByDefault=Vinkvakje om een bevestigingse-mail te sturen naar leden (validatie van nieuwe abonnementen). Staat standaard aan.
-##### LDAP setup #####
-LDAPSetup=LDAP-instellingen
-LDAPGlobalParameters=Globale instellingen
-LDAPUsersSynchro=Gebruikers
-LDAPGroupsSynchro=Groepen
-LDAPContactsSynchro=Contacten
-LDAPMembersSynchro=Leden
-LDAPSynchronization=LDAP-synchronisatie
-LDAPFunctionsNotAvailableOnPHP=LDAP-functies zijn niet beschikbaar in uw PHP-installatie
-LDAPToDolibarr=LDAP -> Dolibarr
-DolibarrToLDAP=Dolibarr -> LDAP
-LDAPNamingAttribute=Waarde in LDAP
-LDAPSynchronizeUsers=Organisatie van gebruikers in LDAP
-LDAPSynchronizeGroups=Organisatie van groepen in LDAP
-LDAPSynchronizeContacts=Organisatie van contactpersonen in LDAP
-LDAPSynchronizeMembers=Organisatie van verenigingsleden in LDAP
-LDAPPrimaryServer=Primaire server
-LDAPSecondaryServer=Secundaire server
-LDAPServerPort=Serverpoort
-LDAPServerPortExample=Standaardpoort: 389
-LDAPServerProtocolVersion=Protocolversie
-LDAPServerUseTLS=Gebruik TLS
-LDAPServerUseTLSExample=Uw LDAP-server gebruik TLS
-LDAPServerDn=Server DN
-LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
-LDAPPassword=Beheerderswachtwoord
-LDAPUserDn=Gebruikers DN
-LDAPUserDnExample=Complete DN (voorbeeld: ou=users,dc=society,dc=com)
-LDAPGroupDn=Groepen DN
-LDAPGroupDnExample=Complete DN (voorbeeld: ou=groups,dc=society,dc=com)
-LDAPServerExample=Serveradres (voorbeeld: localhost, 192.168.0.2, LDAPS://ldap.example.com/)
-LDAPServerDnExample=Complete DN (voorbeeld: dc=company,dc=com)
-LDAPDnSynchroActive=Gebruikers- en groepensynchronisatie
-LDAPDnSynchroActiveExample=LDAP naar Dolibarr of Dolibarr naar LDAP synchronisatie
-LDAPDnContactActive=Contactpersonensynchronisatie
-LDAPDnContactActiveExample=Geactiveerde / gedeactiveerde synchronisatie
-LDAPDnMemberActive=Ledensynchronisatie
-LDAPDnMemberActiveExample=Geactiveerde / gedeactiveerde synchronisatie
-LDAPContactDn=Dolibarr contactpersonen DN
-LDAPContactDnExample=Complete DN (voorbeeld: ou=contacts,dc=society,dc=com)
-LDAPMemberDn=Dolibarr leden DN
-LDAPMemberDnExample=Complete DN (voorbeeld: ou=members,dc=society,dc=com)
-LDAPMemberObjectClassList=Lijst van objectClass
-LDAPMemberObjectClassListExample=Lijst van objectClass tabelregelattributen instellen (voorbeeld: top,inetOrgPerson of top,user voor de actieve map)
-LDAPUserObjectClassList=Lijst van objectClass
-LDAPUserObjectClassListExample=Lijst van objectClass tabelregelattributen instellen (voorbeeld: top,inetOrgPerson of top,user voor de actieve map)
-LDAPGroupObjectClassList=Lijst van objectClass
-LDAPGroupObjectClassListExample=Lijst van objectClass tabelregelattributen instellen (voorbeeld: top,groupOfUniqueNames)
-LDAPContactObjectClassList=Lijst van objectClass
-LDAPContactObjectClassListExample=Lijst van objectClass tabelregelattributen instellen (voorbeeld: top,inetOrgPerson of top,user voor actieve map)
-LDAPTestConnect=Test LDAP-verbinding
-LDAPTestSynchroContact=Test contactpersonensynchronisatie
-LDAPTestSynchroUser=Test gebruikersynchronisatie
-LDAPTestSynchroGroup=Test groepsynchronisatie
-LDAPTestSynchroMember=Test ledensynchronisatie
-LDAPTestSearch= Test een LDAP-zoekopdracht
-LDAPSynchroOK=Synchronisatietest succesvol
-LDAPSynchroKO=Synchronisatietest mislukt
-LDAPSynchroKOMayBePermissions=Synchronisatie test mislukt. Controleer of de verbinding met de server correct is ingesteld en LDAP udpates toestaat.
-LDAPTCPConnectOK=TCP verbinding met de LDAP-server succesvol (Server=%s, Port=%s)
-LDAPTCPConnectKO=TCP verbinding met de LDAP-server mislukt (Server=%s, Port=%s)
-LDAPBindOK=Verbinden en autorisatie met LDAP server geslaagd (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPBindKO=Verbinden en autoriseren met LDAP server mislukt (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPSetupForVersion3=LDAP-server ingesteld voor versie 3
-LDAPSetupForVersion2=LDAP-server ingesteld voor versie 2
-LDAPDolibarrMapping=Dolibarr-mapping (in kaart brengen)
-LDAPLdapMapping=LDAP-mapping (in kaart brengen)
-LDAPFieldLoginUnix=Gebruikersnaam (Unix)
-LDAPFieldLoginExample=Voorbeeld: uid
-LDAPFilterConnection=Zoekfilter
-LDAPFilterConnectionExample=Voorbeeld: &(objectClass=inetOrgPerson)
-LDAPFieldLoginSamba=Gebruikersnaam (samba, activedirectory)
-LDAPFieldLoginSambaExample=Voorbeeld: sAMAccountName
-LDAPFieldFullname=Voornaam Achternaam
-LDAPFieldFullnameExample=Voorbeeld: cn
-LDAPFieldPasswordNotCrypted=Wachtwoord niet versleuteld
-LDAPFieldPasswordCrypted=Wachtwoord versleuteld
-LDAPFieldPasswordExample=Voorbeeld: userPassword
-LDAPFieldCommonNameExample=Voorbeeld: cn
-LDAPFieldName=Naam
-LDAPFieldNameExample=Voorbeeld: sn
-LDAPFieldFirstName=Voornaam
-LDAPFieldFirstNameExample=Voorbeeld: givenname
-LDAPFieldMail=E-mailadres
-LDAPFieldMailExample=Voorbeeld: mail
-LDAPFieldPhone=Zakelijk telefoonnummer
-LDAPFieldPhoneExample=Voorbeeld: telefoonnummer
-LDAPFieldHomePhone=Privételefoonnummer
-LDAPFieldHomePhoneExample=Voorbeeld: Privénummer
-LDAPFieldMobile=Mobieltelefoonnummer
-LDAPFieldMobileExample=Voorbeeld: mobiele
-LDAPFieldFax=Faxnummer
-LDAPFieldFaxExample=Voorbeeld: facsimiletelephonenumber
-LDAPFieldAddress=Straat
-LDAPFieldAddressExample=Voorbeeld: straat
-LDAPFieldZip=Zip
-LDAPFieldZipExample=Voorbeeld: postalcode
-LDAPFieldTown=Plaats
-LDAPFieldTownExample=Voorbeeld: l
-LDAPFieldCountry=Land
-LDAPFieldDescription=Omschrijving
-LDAPFieldDescriptionExample=Voorbeeld: omschrijving
-LDAPFieldNotePublic=Openbare Nota
-LDAPFieldNotePublicExample=Voorbeeld: publicnote
-LDAPFieldGroupMembers= Groepsleden
-LDAPFieldGroupMembersExample= Voorbeeld : uniqueMember
-LDAPFieldBirthdate=Geboortedatum
-LDAPFieldCompany=Bedrijf
-LDAPFieldCompanyExample=Voorbeeld: o
-LDAPFieldSid=SID
-LDAPFieldSidExample=Voorbeeld: objectsid
-LDAPFieldEndLastSubscription=Datum van abonnementseinde
-LDAPFieldTitle=Job position
-LDAPFieldTitleExample=Voorbeeld: title
-LDAPSetupNotComplete=LDAP instellingen niet compleet (ga naar de andere tabbladen)
-LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Geen beheerder of wachtwoord opgegeven. LDAP toegang zal anoniem zijn en in alleen-lezen modus.
-LDAPDescContact=Deze pagina maakt het u mogelijk LDAP-waarden in de LDAP structuur te koppelen aan elk gegeven in de Dolibarr contactpersonen
-LDAPDescUsers=Deze pagina maakt het u mogelijk LDAP-waarden in de LDAP structuur te koppelen aan elk gegeven in de Dolibarr gebruikers
-LDAPDescGroups=Deze pagina maakt het u mogelijk LDAP-waarden in de LDAP structuur te koppelen aan elk gegeven in de Dolibarr groepen
-LDAPDescMembers=Deze pagina maakt het u mogelijk LDAP-waarden in de LDAP structuur te koppelen aan elk gegeven in de Dolibarr ledenmodule
-LDAPDescValues=Voorbeeldwaarden zijn ingesteld voor <b>OpenLDAP</b> geladen met de volgende schema's: TODO {VAR INSTELLEN?)<b>core.schema, cosine.schema, inetorgperson.schema</b>). Als udie waarden gebruikt en OpenLDAP, wijzigen dan uw LDAP 'config'-bestand <b>slapd.conf</b> om alle die schema's te laden.
-ForANonAnonymousAccess=Voor een geautoriseerde verbinding (bijvoorbeeld om over schrijfrechten te beschikken)
-PerfDolibarr=Prestaties setup / optimaliseren rapport
-YouMayFindPerfAdviceHere=U vindt op deze pagina een aantal controles of adviezen met betrekking tot de prestaties.
-NotInstalled=Niet geïnstalleerd, zodat uw server niet vertraagt
-ApplicativeCache=Applicatieve cache
-MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
-MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
-MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
-OPCodeCache=OPCode cache
-NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad).
-HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
-FilesOfTypeCached=Files of type %s are cached by HTTP server
-FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
-FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
-FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
-CacheByServer=Cache by server
-CacheByClient=Cache by browser
-CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Automatische detectie niet mogelijk
-##### Products #####
-ProductSetup=Productenmoduleinstellingen
-ServiceSetup=Services module setup
-ProductServiceSetup=Producten en Diensten modules setup
-NumberOfProductShowInSelect=Maximaal aantal producten in 'combo-lijsten' (0 = onbeperkt)
-ViewProductDescInFormAbility=Visualisatie van de productomschrijvingen in de formulieren (anders getoond als 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 third party language
-UseSearchToSelectProductTooltip=Also if you have a large number of product (> 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)
-SetDefaultBarcodeTypeProducts=Standaard streepjescodetype voor produkten
-SetDefaultBarcodeTypeThirdParties=Standaard streepjescodetype voor derde partijen
-UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
-ProductCodeChecker= Module om product codes te genereren en te controleren (product of dienst)
-ProductOtherConf= Product / dienst configuratie
-IsNotADir=is not a directory!
-##### Syslog #####
-SyslogSetup=Syslog-moduleinstellingen
-SyslogOutput=Log uitvoer
-SyslogFacility=Faciliteit
-SyslogLevel=Level
-SyslogFilename=Bestandsnaam en -pad
-YouCanUseDOL_DATA_ROOT=U kunt DOL_DATA_ROOT/dolibarr.log gebruiken voor een logbestand in de Dolibarr "documenten"-map. U kunt ook een ander pad gebruiken om dit bestand op te slaan.
-ErrorUnknownSyslogConstant=Constante %s is geen bekende 'syslog' constante
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
-##### Donations #####
-DonationsSetup=Donatiemoduleinstellingen
-DonationsReceiptModel=Sjabloon van donatie-ontvangst
-##### Barcode #####
-BarcodeSetup=Streepjescodeinstellingen
-PaperFormatModule=Afdrukformaatmodule
-BarcodeEncodeModule=Streepjescodesencoderingstype
-CodeBarGenerator=Streepjescodegenerator
-ChooseABarCode=Geen generator ingesteld
-FormatNotSupportedByGenerator=Formaat niet ondersteund door deze generator
-BarcodeDescEAN8=Streepjescodetype EAN8
-BarcodeDescEAN13=Streepjescodetype EAN13
-BarcodeDescUPC=Streepjescodetype UPC
-BarcodeDescISBN=Streepjescodetype ISBN
-BarcodeDescC39=Streepjescodetype C39
-BarcodeDescC128=Streepjescodetype C128
-BarcodeDescDATAMATRIX=Barcode of type Datamatrix
-BarcodeDescQRCODE=Barcode of type QR code
-GenbarcodeLocation=Opdrachtregelprogramma voor streepjescodegeneratie (gebruikt door interne generator voor sommige barcode types). Moet compatible zijn met "genbarcode". <br>vb: /usr/local/bin/genbarcode
-BarcodeInternalEngine=Internal engine
-BarCodeNumberManager=Beheerder om automatisch barcode nummers te bepalen.
-##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct debit payment orders
-##### ExternalRSS #####
-ExternalRSSSetup=Externe RSS importeerinstellingen
-NewRSS=Nieuwe RSS Feed
-RSSUrl=RSS URL
-RSSUrlExample=Een interessante RSS-feed
-##### Mailing #####
-MailingSetup=EMailingmoduleinstellingen
-MailingEMailFrom=E-mailafzender (Van) voor e-mails die verstuurd worden door de EMailingmodule
-MailingEMailError=Retoure-mailadres (Errors-to) voor e-mails met fouten
-MailingDelay=Seconds to wait after sending next message
-##### Notification #####
-NotificationSetup=Moduleinstellingen voor kennisgeving door e-mail
-NotificationEMailFrom=E-mailafzender (van) voor e-mails die verstuurd worden voor kennisgevingen
-FixedEmailTarget=Vaste email bestemmeling
-##### Sendings #####
-SendingsSetup=Verzendingsmoduleinstellingen
-SendingsReceiptModel=Verzendontvangstsjabloon
-SendingsNumberingModules=Verzendingen nummering modules
-SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
-FreeLegalTextOnShippings=Vrije tekst op verzendingen
-##### Deliveries #####
-DeliveryOrderNumberingModules=ontvangstbevestigingennummeringsmodule
-DeliveryOrderModel=ontvangstbevestigingensjablonen
-DeliveriesOrderAbility=Ondersteun productontvangstbevestigingen
-FreeLegalTextOnDeliveryReceipts=Vrije tekst op ontvangstbevestigingen
-##### FCKeditor #####
-AdvancedEditor=Geavanceerde editor
-ActivateFCKeditor=Activeer FCKeditor voor:
-FCKeditorForCompany=WYSIWIG creatie / bewerking van bedrijfsomschrijving en notities
-FCKeditorForProduct=WYSIWIG creatie / bewerking van product- / dienstomschrijving en notities
-FCKeditorForProductDetails=WYSIWIG creatie / bewerking van produktdetailregels voor alle entiteiten (Offertes, opdrachten, facturen, etc)<br><font class="warning">Waarschuwing: Gebruik van deze optie, voor dit doeleinde, wordt sterk afgeraden, omdat het problemen kan geven met speciale karakters en de paginaopmaak wanneer er PDF bestanden worden gegenereerd van deze gegevens.</font>
-FCKeditorForMailing= WYSIWIG creatie / bewerking van mailings
-FCKeditorForUserSignature=WYSIWIG creatie /aanpassing van ondertekening
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
-##### OSCommerce 1 #####
-OSCommerceErrorConnectOkButWrongDatabase=Verbinding geslaagd, maar de database lijkt geen OSCommerce database te zijn (Sleutel %s niet gevonden in tabel %s).
-OSCommerceTestOk=Verbinding met de server '%s' en database '%s' met gebruiker '%s' succesvol.
-OSCommerceTestKo1=Verbinding met de server '%s' gelukt maar de database '%s' kon niet worden bereikt.
-OSCommerceTestKo2=Verbinding met server '%s' met gebruiker '%s' mislukt.
-##### Stock #####
-StockSetup=Magazijnen instellingen
-IfYouUsePointOfSaleCheckModule=Als u de verkooppunt module (de standaard POS module of een andere externe module) gebruikt, kan deze setup worden genegeerd door uw verkooppunt  module. De meeste verkooppunt modules zijn ontworpen om onmiddellijk een factuur te creëren en het standaard verlagen van voorraad. Dus, als je ja of nee een voorraad daling nodig hebt om bij het registreren van een verkoop op uw verkooppunt, controleer ook uw POS-module instellingen.
-##### Menu #####
-MenuDeleted=Menu verwijderd
-Menus=Menu's
-TreeMenuPersonalized=Persoonlijke menu's
-NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
-NewMenu=Nieuw menu
-Menu=Selectie van menu
-MenuHandler=Menuverwerker
-MenuModule=Bronmodule
-HideUnauthorizedMenu= Verberg ongeautoriseerde menu's (grijs)
-DetailId=Menu ID
-DetailMenuHandler=Menuverwerker waar het nieuwe menu getoond moet worden
-DetailMenuModule=Modulenaam als menu-item van een module afkomstig is
-DetailType=Menutype (boven of links (Top of Left)TODO)
-DetailTitre=Menulabel of labelcode voor de vertaling
-DetailUrl=URL waar het menu naar linkt (Absolute URL-link of externe link met http://)
-DetailEnabled=Voorwaarde voor het wel of niet tonen van het menu-item
-DetailRight=Voorwaarde om onbevoegde grijze menu's weer te geven
-DetailLangs=.lang bestandsnaam voor labelcodevertaling
-DetailUser=Intern / Extern / Alle
-Target=Doel
-DetailTarget=Doel van links (_blank opent een nieuw venster)
-DetailLevel=Niveau (-1: menu bovenaan, 0: header menu, >0 menu en submenu)
-ModifMenu=Menu-item wijzigen
-DeleteMenu=Menu-item verwijderen
-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=BTW verplicht
-OptionVATDefault=Kasbasis
-OptionVATDebitOption=Transactiebasis
-OptionVatDefaultDesc=BTW is verplicht:<br>- op levering / betalingen van goederen (wij gebruiken de factuurdatum)<br>- op betalingen van diensten
-OptionVatDebitOptionDesc=BTW is verplicht:<br>- op levering / betalingen van goederen<br>- op factuur (debet) voor diensten
-SummaryOfVatExigibilityUsedByDefault=Tijd van BTW opeisbaarheid standaard volgens gekozen optie:
-OnDelivery=Bij levering
-OnPayment=Bij betaling
-OnInvoice=Op factuur
-SupposedToBePaymentDate=Betalingsdatum gebruiken
-SupposedToBeInvoiceDate=Factuurdatum gebruiken
-Buy=Kopen
-Sell=Verkopen
-InvoiceDateUsed=Factuurdatum gebruiken
-YourCompanyDoesNotUseVAT=Uw bedrijf is ingesteld als zijnde vrijgesteld van BTW (Home->Instellingen->Bedrijf / stichting), er zijn dus geen BTW opties in te stellen.
-AccountancyCode=Accountancy Code
-AccountancyCodeSell=Boekhoudkundige afnemerscode
-AccountancyCodeBuy=Boekhoudkundige leverancierscode
-##### Agenda #####
-AgendaSetup=Acties- en agendamoduleinstellingen
-PasswordTogetVCalExport=autorisatiecode van de exportlink
-PastDelayVCalExport=Exporteer geen gebeurtenissen ouder dan
-AGENDA_USE_EVENT_TYPE=Gebruik event types (beheerd in menu Instellingen -> Woordenboek -> Type agenda event)
-AGENDA_USE_EVENT_TYPE_DEFAULT=Set automatically this default value for type of event into event create form
-AGENDA_DEFAULT_FILTER_TYPE=Stel automatisch dit soort evenementen in zoekfilter van agendaweergave
-AGENDA_DEFAULT_FILTER_STATUS=Stel automatisch deze status voor evenementen in zoekfilter van agendaweergave
-AGENDA_DEFAULT_VIEW=Welk tabblad wilt u standaard openen bij het selecteren van menu Agenda
-AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
-AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### Clicktodial #####
-ClickToDialSetup='Click-To-Dial' moduleinstellingen
-ClickToDialUrlDesc=Aangeroepen URL wanneer er geklikt wordt op een telefoonicoontje. In de URL kunt u 'tags' gebruiken<br><b>__PHONETO__</b> zal vervangen worden met het telefoonnummer dat gebeld moet worden<br><b>__PHONEFROM__</b> zal worden vervangen met het telefoonnummer van de bellende persoon (uw telefoonnummer)<br><b>__LOGIN__</b> zal vervangen worden door uw 'Click-To-Dial'-accountgebruikersnaam (Zoals ingesteld op uw gebruikerskaartdetails<br><b>__PASS__</b> zal vervangen worden door uw "Click-To-Dial"-accountwachtwoord (Zoals ingesteld op uw gebruikerskaartdetails).
-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.
-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 same computer than 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.
-##### Point Of Sales (CashDesk) #####
-CashDesk=Verkooppunten
-CashDeskSetup=Verkooppuntenmoduleinstellingen
-CashDeskThirdPartyForSell=Algemene Klant te gebruiken bij verkopen
-CashDeskBankAccountForSell=Te gebruiken rekening voor ontvangst van contacte betalingen
-CashDeskBankAccountForCheque= Te gebruiken rekening voor ontvangst van betalingen per cheque
-CashDeskBankAccountForCB= Te gebruiken rekening voor ontvangst van betalingen per CreditCard
-CashDeskDoNotDecreaseStock=Uitschakelen voorraad daling bij een verkoop via verkooppunt (indien "Nee", stock daling wordt gedaan voor elke verkoope gedaan via POS, wat er ook in de opties ingesteld staat in de module Stock).
-CashDeskIdWareHouse=Kies magazijn te gebruiken voor voorraad daling
-StockDecreaseForPointOfSaleDisabled=Stock daling van verkooppunt uitgeschakeld
-StockDecreaseForPointOfSaleDisabledbyBatch=De stock afname van POS is niet compatibel met lot/serienummer beheer
-CashDeskYouDidNotDisableStockDecease=Je hebt  voorraad daling bij het maken van een verkoop via verkooppunt niet uitgeschakeld. Dus een magazijn is vereist.
-##### Bookmark #####
-BookmarkSetup=Weblinkmoduleinstellingen
-BookmarkDesc=Deze module maakt het u mogelijk 'weblinks' te beheren. U kunt ook verwijzingen naar elke Dolibarr pagina of externe website in uw linker menu zetten.
-NbOfBoomarkToShow=Maximaal aantal 'weblinks' die in het linker menu getoond worden
-##### WebServices #####
-WebServicesSetup=Webdienstenmoduleinstellingen
-WebServicesDesc=Door het inschakelen van deze module, word Dolibarr een webdienstenserver voor het verrichten van diverse webdiensten.
-WSDLCanBeDownloadedHere='WSDL descriptor'-bestanden van de aangeboden diensten kunnen hier gedownload worden
-EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
-##### API ####
-ApiSetup=API module setup
-ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
-OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
-ApiKey=Key for API
-WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
-##### Bank #####
-BankSetupModule=Bankmoduleinstellingen
-FreeLegalTextOnChequeReceipts=Eigen tekst op cheque-ontvangsten
-BankOrderShow=Laat de volgorde van bankrekeningen zien voor landen die gebruik maken van "detailed bank number"
-BankOrderGlobal=Algemeen
-BankOrderGlobalDesc=Algemene vertoonvolgorde
-BankOrderES=Spaans
-BankOrderESDesc=Spaanse vertoonvolgorde
-ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
-##### Multicompany #####
-MultiCompanySetup=Multi-Bedrijfmoduleinstellingen
-##### Suppliers #####
-SuppliersSetup=Leveranciersmoduleinstellingen
-SuppliersCommandModel=Compleet levaranciersopdrachtsjabloon (logo)
-SuppliersInvoiceModel=Compleet leveranciersfacturensjabloon (logo)
-SuppliersInvoiceNumberingModel=Leveranciersfacturen nummering modellen
-IfSetToYesDontForgetPermission=Indien ingesteld op ja, vergeet dan niet om machtigingen te verlenen aan groepen of gebruikers ​​voor het toestaan van de tweede goedkeuring
-##### GeoIPMaxmind #####
-GeoIPMaxmindSetup="GeoIP Maxmind"-moduleinstellingen
-PathToGeoIPMaxmindCountryDataFile=Pad naar bestand met Maxmind ip tot land vertaling. <br>Voorbeelden: <br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
-NoteOnPathLocation=Let op dat uw "GeoIP Maxmind"-landbestand zich bevind in een map die door uw PHP-installatie kan worden gelezen (Controleer uwPHP open_basedir instelling en de bestandsrechten).
-YouCanDownloadFreeDatFileTo=U kunt een <b>gratis demo versie</b> downloaden van een "Maxmind GeoIP"-landbestand op het adres %s.
-YouCanDownloadAdvancedDatFileTo=U kunt ook een <b>completere versie, met updates</b> downloaden van het "Maxmind GeoIP"-landbestand op het adres %s.
-TestGeoIPResult=Test van een conversie IP -> land
-##### Projects #####
-ProjectsNumberingModules=Projectennummeringsmodule
-ProjectsSetup=Projectenmoduleinstellingen
-ProjectsModelModule=Projectenrapportagedocumentsjabloon
-TasksNumberingModules=Taken nummering module
-TaskModelModule=Taken rapporten documentmodel
-UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
-##### ECM (GED) #####
-##### Fiscal Year #####
-AccountingPeriods=Accounting periods
-AccountingPeriodCard=Accounting period
-NewFiscalYear=New accounting period
-OpenFiscalYear=Open accounting period
-CloseFiscalYear=Close accounting period
-DeleteFiscalYear=Delete accounting period
-ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
-ShowFiscalYear=Show accounting period
-AlwaysEditable=Kan altijd worden bewerkt
-MAIN_APPLICATION_TITLE=Forceer zichtbare naam van de toepassing (waarschuwing: het instellen van uw eigen naam hier kan het automatisch aanvullen van de inlog functie breken wanneer gebruik wordt van de mobiele applicatie DoliDroid)
-NbMajMin=Minimum aantal hoofdletters
-NbNumMin=Minimum aantal numerieke tekens
-NbSpeMin=Minimum aantal speciale tekens
-NbIteConsecutive=Maximum aantal repeterende dezelfde karakters
-NoAmbiCaracAutoGeneration=Voor het automatisch genereren, gebruik geen dubbelzinnige tekens ("1","l","i","|","0","O")
-SalariesSetup=Setup van module salarissen
-SortOrder=Sorteervolgorde
-Format=Formaat
-TypePaymentDesc=0: Klant betalingswijze, 1: Leverancier betalingswijze 2: Zowel klanten en leveranciers betaalwijze
-IncludePath=Include path (gedefinieerd in de variabele %s)
-ExpenseReportsSetup=Setup van module onkostennota's
-TemplatePDFExpenseReports=Document sjablonen om onkostennota's document te genereren
-NoModueToManageStockIncrease=Geen module in staat om automatische voorraad toename beheren is geactiveerd. Stock verhoging zal worden gedaan via handmatige invoer.
-YouMayFindNotificationsFeaturesIntoModuleNotification=U kunt opties voor e-mailberichten door het inschakelen en configureren van de module "Meldingen " te vinden.
-ListOfNotificationsPerUser=List of notifications per user*
-ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
-ListOfFixedNotifications=Lijst met vaste meldingen
-GoOntoUserCardToAddMore=Go on 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 contacts/addresses
-Threshold=Drempel
-BackupDumpWizard=Wizard om database backup dump bestand op te bouwen
-SomethingMakeInstallFromWebNotPossible=Installatie van externe module is niet mogelijk via de webinterface om de volgende reden:
-SomethingMakeInstallFromWebNotPossible2=Om deze reden, is het upgrade process hier beschreven alleen in handmatige stappen door een bevoorrechte gebruiker te doen.
-InstallModuleFromWebHasBeenDisabledByFile=Installeren van externe module van toepassing is uitgeschakeld door uw beheerder. Je moet hem vragen om het bestand <strong>%s</strong>  te verwijderen om deze functie mogelijk te maken.
-ConfFileMuseContainCustom=Installing 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)
-TextTitleColor=Color of page title
-LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
-NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
-BackgroundColor=Background color
-TopMenuBackgroundColor=Background color for Top menu
-TopMenuDisableImages=Hide images in Top menu
-LeftMenuBackgroundColor=Background color for Left menu
-BackgroundTableTitleColor=Background color for Table title line
-BackgroundTableLineOddColor=Background color for odd table lines
-BackgroundTableLineEvenColor=Background color for even table lines
-MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
-NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
-UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
-PositionIntoComboList=Position of line into combo lists
-SellTaxRate=Sale tax rate
-RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
-UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipping, you can enter it here. You can use the key {TRACKID} into URL parameters so the system will replace it with value of tracking number user entered into shipment card.
-OpportunityPercent=When you create an opportunity, you will defined an estimated amount of project/lead. According to status of opportunity, this amount may be multiplicated 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
-FixTZ=TimeZone fix
-FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
-ExpectedChecksum=Expected Checksum
-CurrentChecksum=Current Checksum
-ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the latest stable version
-TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
-TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so 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 usefull only if your prices for each leve 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.
-SeeSubstitutionVars=See * note for list of possible substitution variables
-AllPublishers=All publishers
-UnknownPublishers=Unknown publishers
-AddRemoveTabs=Add or remove tabs
-AddDictionaries=Add dictionaries
-AddBoxes=Add widgets
-AddSheduledJobs=Add scheduled jobs
-AddHooks=Add hooks
-AddTriggers=Add triggers
-AddMenus=Add menus
-AddPermissions=Add permissions
-AddExportProfiles=Add export profiles
-AddImportProfiles=Add import profiles
-AddOtherPagesOrServices=Add other pages or services
-AddModels=Add document or numbering templates
-AddSubstitutions=Add keys substitutions
-DetectionNotPossible=Detection not possible
-UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved on 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 correclty. 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 inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <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
-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
-TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
-##### Resource ####
-ResourceSetup=Configuration du module Resource
-UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+LDAPFieldTitle=Functie
+AddBoxes=Widgets toevoegen
diff --git a/htdocs/langs/nl_BE/compta.lang b/htdocs/langs/nl_BE/compta.lang
index 85b92a9942f..f1e6f65a49a 100644
--- a/htdocs/langs/nl_BE/compta.lang
+++ b/htdocs/langs/nl_BE/compta.lang
@@ -1,7 +1,5 @@
 # Dolibarr language file - Source file is en_US - compta
 RemainingAmountPayment=Resterend bedrag betaling:
-Accountparent=Hoofdrekening
-Accountsparent=Hoofdrekeningen
 LT1SummaryES=RE Balans
 SocialContribution=Sociale bijdrage/belasting
 SocialContributions=Sociale bijdragen/belastingen
@@ -33,7 +31,6 @@ RulesResultInOut=- Dit omvat alle betalingen van facturen, uitgaven, BTW en lone
 RulesCADue=- Dit omvat de verschuldigde afnemersfacturen, betaald of niet. <br>- Dit is gebaseerd op de validatiedata van deze facturen.<br>
 RulesCAIn=- Dit omvat alle effectieve betalingen van afnemersfacturen.<br>- Het is gebaseerd op de betaaldatum van deze facturen<br>
 VATReport=BTW rapport
-WarningDepositsNotIncluded=Deposito facturen worden niet opgenomen in deze versie met deze boekhoudmodule.
 CloneTax=Kopieer een sociale bijdrage/belasting
 ConfirmCloneTax=Bevestig kopie van betaling sociale bijdrage/belasting
 SimpleReport=Eenvoudig rapport
diff --git a/htdocs/langs/nl_BE/main.lang b/htdocs/langs/nl_BE/main.lang
index 83ab59c7974..ae55704fe49 100644
--- a/htdocs/langs/nl_BE/main.lang
+++ b/htdocs/langs/nl_BE/main.lang
@@ -1,9 +1,5 @@
 # Dolibarr language file - Source file is en_US - main
 DIRECTION=ltr
-# Note for Chinese:
-# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
-# stsongstdlight or cid0cs are for simplified Chinese
-# To read Chinese pdf with Linux: sudo apt-get install poppler-data
 FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=,
@@ -23,799 +19,39 @@ FormatDateHourShort=%d-%m-%Y %H:%M
 FormatDateHourSecShort=%d/%m/%Y %I:%M:%S %p
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
-DatabaseConnection=Databaseverbinding
 NoTemplateDefined=Geen model gedefinieerd voor dit email type
-AvailableVariables=Available substitution variables
-NoTranslation=Geen vertaling
 NoRecordFound=Geen record gevonden
-NoRecordDeleted=No record deleted
-NotEnoughDataYet=Not enough data
-NoError=Geen fout
-Error=Fout
-Errors=Fouten
-ErrorFieldRequired=Veld '%s' is vereist
-ErrorFieldFormat=Veld '%s' heeft een incorrecte waarde
-ErrorFileDoesNotExists=Bestand %s bestaat niet
-ErrorFailedToOpenFile=Kan bestand %s niet openen
-ErrorCanNotCreateDir=Cannot create dir %s
-ErrorCanNotReadDir=Cannot read dir %s
-ErrorConstantNotDefined=Parameter %s is niet gedefinieerd
-ErrorUnknown=Onbekende fout
-ErrorSQL=SQL fout
-ErrorLogoFileNotFound=Logobestand '%s' is niet gevonden
-ErrorGoToGlobalSetup=Ga naar het instellingscherm 'Bedrijf / Stichting' om dit te corrigeren
-ErrorGoToModuleSetup=Ga naar Moduleinstellingen om dit te corrigeren
-ErrorFailedToSendMail=Mail versturen mislukt (afzender=%s, ontvanger=%s)
 ErrorFileNotUploaded=Bestand is niet geüpload. Controleer of de grootte niet meer is dan maximaal toegestaan, of er vrije ruimte beschikbaar is op de schijf en of er niet al een bestand met dezelfde naam in deze map bestaat.
-ErrorInternalErrorDetected=Fout ontdekt
 ErrorWrongHostParameter=Verkeerde host instelling
-ErrorYourCountryIsNotDefined=Uw land is niet gedefinieerd. Corrigeer in Home->Instellingen-Bewerk en verstuur het formulier opnieuw.
 ErrorRecordIsUsedByChild=Tabelregel verwijderen mislukt. Deze tabelregel wordt gebruikt door ten minste een onderliggend tabelregel.
-ErrorWrongValue=Verkeerde waarde
-ErrorWrongValueForParameterX=Verkeerde waarde voor de parameter %s
-ErrorNoRequestInError=Geen verzoek mislukt
-ErrorServiceUnavailableTryLater=Service op dit moment niet beschikbaar. Probeer het later opnieuw.
-ErrorDuplicateField=Dubbele waarde in een uniek veld
-ErrorSomeErrorWereFoundRollbackIsDone=Fouten gevonden. Wij draaien de veranderingen terug.
-ErrorConfigParameterNotDefined=<b>Parameter %s</b> is niet gedefinieerd binnen Dolibarr configuratiebestand <b>conf.php</b>.
-ErrorCantLoadUserFromDolibarrDatabase=Kan <b>gebruiker %s</b> niet in de Dolibarr database vinden.
-ErrorNoVATRateDefinedForSellerCountry=Fout, geen BTW-tarieven voor land '%s'.
-ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
-ErrorFailedToSaveFile=Fout, bestand opslaan mislukt.
-ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
 NotAuthorized=U bent niet toegelaten om dat te doen.
-SetDate=Stel datum in
-SelectDate=Selecteer een datum
-SeeAlso=Zie ook %s
-SeeHere=Zie hier
-Apply=Toepassen
-BackgroundColorByDefault=Standaard achtergrondkleur
-FileRenamed=The file was successfully renamed
-FileUploaded=Het bestand is geüpload
-FileGenerated=The file was successfully generated
 FileWasNotUploaded=Een bestand is geselecteerd als bijlage, maar is nog niet geupload. Klik hiervoor op "Bevestig dit bestand".
-NbOfEntries=Aantal invoeringen
-GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Contacteer helpdesk
 RecordSaved=Tabelregel opgeslagen
 RecordDeleted=Record verwijderd
-LevelOfFeature=Niveau van de functionaliteiten
-NotDefined=Niet gedefinieerd
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
-Administrator=Beheerder
-Undefined=Ongedefineerd
-PasswordForgotten=Password forgotten?
-SeeAbove=Zie hierboven
-HomeArea=Home
-LastConnexion=Latest connection
-PreviousConnexion=Laatste keer ingelogd
-PreviousValue=Previous value
-ConnectedOnMultiCompany=Aangesloten bij Meervoudig bedrijf
-ConnectedSince=Aangesloten sinds
-AuthenticationMode=Authentication mode
-RequestedUrl=Requested URL
-DatabaseTypeManager=Database Type Manager
-RequestLastAccessInError=Latest database access request error
-ReturnCodeLastAccessInError=Return code for latest database access request error
-InformationLastAccessInError=Information for latest database access request error
-DolibarrHasDetectedError=Dolibarr heeft een technische fout gedetecteerd
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes
-MoreInformation=Meer informatie
-TechnicalInformation=Technische gegevens
-TechnicalID=Technische ID
-NotePublic=Notitie (publiek)
-NotePrivate=Notitie (privé)
-PrecisionUnitIsLimitedToXDecimals=Dolibarr is geconfigureerd om de precisie van de stuksprijzen op <b>%s</b> decimalen te beperken.
-DoTest=Test
-ToFilter=Filter
 NoFilter=Geen filter
-WarningYouHaveAtLeastOneTaskLate=Let op, u heeft minstens een vertraagd element dat de getolereerde vertraging heeft overschreden.
-yes=ja
-Yes=Ja
-no=nee
-No=Nee
-All=Alle
-Home=Home
-Help=Help
-OnlineHelp=Online hulp
-PageWiki=Wiki Pagina
-MediaBrowser=Media browser
-Always=Altijd
-Never=Nooit
-Under=onder
-Period=Looptijd
-PeriodEndDate=Einddatum looptijd
-Activate=Activeren
-Activated=Geactiveerd
-Closed=Gesloten
-Closed2=Gesloten
-NotClosed=Not closed
-Enabled=Ingeschakeld
-Deprecated=Deprecated
-Disable=Uitschakelen
-Disabled=Uitgeschakeld
-Add=Toevoegen
-AddLink=Link toevoegen
-RemoveLink=Remove link
-AddToDraft=Add to draft
-Update=Update
-Close=Sluiten
-CloseBox=Remove widget from your dashboard
-Confirm=Bevestig
-ConfirmSendCardByMail=Do you really want to send content of this card by mail to <b>%s</b>?
-Delete=Wissen
-Remove=Verwijderen
-Resiliate=Terminate
-Cancel=Annuleren
-Modify=Wijzigen
-Edit=Bewerken
-Validate=Valideer
-ValidateAndApprove=Valideren en goedkeuren
-ToValidate=Te valideren
-Save=Opslaan
-SaveAs=Opslaan als
-TestConnection=Test verbinding
-ToClone=Klonen
-ConfirmClone=Kies de gegevens die u wilt klonen:
-NoCloneOptionsSpecified=Geen gegevens om te klonen gedefinieerd.
-Of=van
-Go=Ga
-Run=Run
-CopyOf=Kopie van
-Show=Tonen
-Hide=Hide
-ShowCardHere=Kaart tonen
-Search=Zoeken
-SearchOf=Zoeken
-Valid=Geldig
-Approve=Goedkeuren
-Disapprove=Afkeuren
-ReOpen=Heropenen
-Upload=Upload
-ToLink=Link
-Select=Selecteer
-Choose=Kies
-Resize=Schalen
-Recenter=Hercentreer
-Author=Auteur
-User=Gebruiker
-Users=Gebruikers
-Group=Groep
-Groups=Groepen
-NoUserGroupDefined=Geen gebruikersgroep gedefinieerd
-Password=Wachtwoord
-PasswordRetype=Herhaal uw wachtwoord
-NoteSomeFeaturesAreDisabled=Let op, veel functionaliteiten / modules zijn uitgeschakeld in deze demonstratie.
-Name=Naam
-Person=Persoon
-Parameter=Instelling
-Parameters=Instellingen
-Value=Waarde
-PersonalValue=Persoonlijke waarde
-NewValue=Nieuwe waarde
-CurrentValue=Huidige waarde
-Code=Code
-Type=Type
-Language=Taal
-MultiLanguage=Meertalig
-Note=Notitie
-Title=Titel
-Label=Naam
-RefOrLabel=Nr. of naam
-Info=Info
-Family=Familie
-Description=Omschrijving
-Designation=Omschrijving
-Model=Doc template
-DefaultModel=Default doc template
-Action=Actie
-About=Over
-Number=Aantal
-NumberByMonth=Aantal per maand
-AmountByMonth=Bedrag per maand
-Numero=Nummer
-Limit=Limiet
-Limits=Grenzen
-Logout=Uitloggen
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Inloggen
-Setup=Instellingen
-Alert=Kennisgevingen
-Previous=Vorige
-Next=Volgende
-Cards=Kaarten
-Card=Kaart
-Now=Nu
-HourStart=Start uur
-Date=Datum
-DateAndHour=Datum en uur
 DateToday=Datum van vandaag
 DateReference=Referentie datum
 DateStart=Start datum
 DateEnd=Eind datum
-DateCreation=Aanmaakdatum
 DateCreationShort=Aanmaak datum
-DateModification=Wijzigingsdatum
-DateModificationShort=Wijzigingsdatum
-DateLastModification=Latest modification date
-DateValidation=Validatiedatum
-DateClosing=Sluitingsdatum
-DateDue=Vervaldatum
-DateValue=Valutadatum
-DateValueShort=Valutadatum
-DateOperation=Exploitatiedatum
-DateOperationShort=Exploitatiedatum
-DateLimit=Termijn
-DateRequest=Verzoekdatum
-DateProcess=Procesdatum
-DateBuild=Datum van rapportgeneratie
-DatePayment=Datum van betaling
-DateApprove=Goedkeurings datum
-DateApprove2=Goedkeurings datum (tweede goedkeuring)
-UserCreation=Creation user
-UserModification=Modification user
-UserCreationShort=Creat. user
-UserModificationShort=Modif. user
-DurationYear=jaar
-DurationMonth=maand
-DurationWeek=week
-DurationDay=dag
-DurationYears=jaren
-DurationMonths=maanden
-DurationWeeks=weken
-DurationDays=dagen
-Year=Jaar
-Month=Maand
-Week=Week
-WeekShort=Week
-Day=Dag
-Hour=Uur
-Minute=Minuut
-Second=Seconde
-Years=Jaren
-Months=Maanden
-Days=Dagen
-days=dagen
-Hours=Uur
-Minutes=Minuten
-Seconds=Seconden
-Weeks=Weken
-Today=Vandaag
-Yesterday=Gisteren
-Tomorrow=Morgen
-Morning=Ochtend
-Afternoon=Namiddag
-Quadri=Trimester
-MonthOfDay=Maand van de dag
-HourShort=U
-MinuteShort=mn
-Rate=Tarief
-CurrencyRate=Currency conversion rate
-UseLocalTax=Inclusief btw
-Bytes=Bytes
-KiloBytes=KiloBytes
-MegaBytes=MegaBytes
-GigaBytes=GigaBytes
-TeraBytes=Terabytes
-b=b
-Kb=Kb
-Mb=Mb
-Gb=Gb
-Tb=Tb
-Cut=Knippen
-Copy=Kopiëren
-Paste=Plakken
-Default=Standaard
-DefaultValue=Standaardwaarde
-Price=Prijs
-UnitPrice=Eenheidsprijs
-UnitPriceHT=Eenheidsprijs (netto)
-UnitPriceTTC=Eenheidsprijs (bruto)
-PriceU=E.P.
-PriceUHT=EP (netto)
-PriceUHTCurrency=U.P (currency)
-PriceUTTC=U.P. (inc. tax)
-Amount=Hoeveelheid
-AmountInvoice=Factuurbedrag
-AmountPayment=Betalingsbedrag
-AmountHTShort=Bedrag ex. BTW
-AmountTTCShort=Bedrag met BTW
-AmountHT=Bedrag (exclusief BTW)
-AmountTTC=Bedrag (incl. BTW)
-AmountVAT=Bedrag BTW
-MulticurrencyAlreadyPaid=Already payed, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
-MulticurrencyAmountHT=Amount (net of tax), original currency
-MulticurrencyAmountTTC=Amount (inc. of tax), original currency
-MulticurrencyAmountVAT=Amount tax, original currency
-AmountLT1=Bedrag tax 2
-AmountLT2=Bedrag tax 3
-AmountLT1ES=Bedrag RE
-AmountLT2ES=Bedrag IRPF
-AmountTotal=Totaal bedrag
-AmountAverage=Gemiddeld bedrag
-PriceQtyMinHT=Prijs hoeveelheid min. (exclusief BTW)
-Percentage=Percentage
-Total=Totaal
-SubTotal=Subtotaal
-TotalHTShort=Totaal excl. BTW
-TotalHTShortCurrency=Total (net in currency)
-TotalTTCShort=Totaal incl. BTW
-TotalHT=Totaal excl. BTW
-TotalHTforthispage=Totaal (na belastingen) voor deze pagina
-Totalforthispage=Total for this page
-TotalTTC=Totaal (incl. BTW)
-TotalTTCToYourCredit=Totaal (incl. BTW) op uw krediet
-TotalVAT=Totaal BTW
-TotalLT1=Totaal tax 2
-TotalLT2=Totaal tax 3
-TotalLT1ES=Totaal RE
-TotalLT2ES=Totaal IRPF
-HT=Exclusief BTW
-TTC=Inclusief BTW
-VAT=BTW
-VATs=Sales taxes
-LT1ES=RE
-LT2ES=IRPF
-VATRate=BTW-tarief
-Average=Gemiddeld
-Sum=Som
-Delta=Variantie
-Module=Module
-Option=Optie
-List=Lijstoverzicht
-FullList=Volledig overzicht
-Statistics=Statistieken
-OtherStatistics=Andere statistieken
-Status=Status
-Favorite=Favoriet
-ShortInfo=Info.
-Ref=Referentie
-ExternalRef=Ref. extern
-RefSupplier=Leverancierreferentie
-RefPayment=Betalingskenmerk
-CommercialProposalsShort=Offertes
-Comment=Opmerking
-Comments=Opmerkingen
-ActionsToDo=Acties te doen
-ActionsToDoShort=Te doen
-ActionsDoneShort=Uitgevoerd
-ActionNotApplicable=Niet van toepassing
-ActionRunningNotStarted=Niet gestart
-ActionRunningShort=In progress
-ActionDoneShort=Uitgevoerd
-ActionUncomplete=Onvolledig
-CompanyFoundation=Bedrijf of instelling
-ContactsForCompany=Bedrijfscontacten
-ContactsAddressesForCompany=Contacten / adressen voor deze relatie
-AddressesForCompany=Adressen voor deze relatie
-ActionsOnCompany=Acties voor bedrijf
-ActionsOnMember=Events over dit lid
-NActionsLate=%s is laat
-RequestAlreadyDone=Aanvraag reeds opgenomen
-Filter=Filter
-FilterOnInto=Zoekcriteria '<strong>%s</strong>' in velden %s
-RemoveFilter=Verwijder filter
-ChartGenerated=Grafiek gegenereerd
-ChartNotGenerated=Grafiek niet gegenereerd
-GeneratedOn=Voortbouwen op %s
-Generate=Genereer
-Duration=Duur
-TotalDuration=Totale duur
-Summary=Samenvatting
-DolibarrStateBoard=Statistieken
-DolibarrWorkBoard=Actieoverzicht
-Available=Beschikbaar
-NotYetAvailable=Nog niet beschikbaar
-NotAvailable=Niet beschikbaar
-Categories=Tags / categorieën
-Category=Tag / categorie
-By=Door
-From=Van
-to=aan
-and=en
-or=of
-Other=Overig
-Others=Overigen
-OtherInformations=Overige informatie
-Quantity=Hoeveelheid
-Qty=Aantal
-ChangedBy=Veranderd door
-ApprovedBy=Goedgekeurd door
-ApprovedBy2=Goedgekeurd door (tweede goedkeuring)
-Approved=Approved
-Refused=Refused
-ReCalculate=Herberekenen
-ResultKo=Mislukking
-Reporting=Rapportage
-Reportings=Rapportage
-Draft=Concept
-Drafts=Concepten
-Validated=Gevalideerd
-Opened=Opened
-New=Nieuw
-Discount=Korting
-Unknown=Onbekend
-General=Algemeen
-Size=Grootte
-Received=Ontvangen
-Paid=Betaald
-Topic=Onderwerp
-ByCompanies=Door bedrijven
-ByUsers=Door gebruikers
-Links=Links
-Link=Link
-Rejects=Verworpen
-Preview=Voorbeeldweergave
-NextStep=Volgende stap
-Datas=Gegevens
-None=Geen
-NoneF=Geen
-Late=Vertraagd
-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.
-Photo=Afbeelding
-Photos=Afbeeldingen
-AddPhoto=Afbeelding toevoegen
-DeletePicture=Afbeelding verwijderen
-ConfirmDeletePicture=Bevestig verwijderen afbeelding
-Login=Login
-CurrentLogin=Huidige login
-EnterLoginDetail=Enter login details
-January=Januari
-February=Februari
-March=Maart
-April=April
-May=Mei
-June=Juni
-July=Juli
-August=Augustus
-September=September
-October=Oktober
-November=November
-December=December
-JanuaryMin=Jan
-FebruaryMin=Februari
-MarchMin=Mar
-AprilMin=April
-MayMin=Kunnen
-JuneMin=Juni
-JulyMin=Juli
-AugustMin=Augustus
-SeptemberMin=September
-OctoberMin=Oktober
-NovemberMin=November
-DecemberMin=December
-Month01=januari
-Month02=februari
-Month03=maart
-Month04=april
-Month05=mei
-Month06=juni
-Month07=juli
-Month08=augustus
-Month09=september
-Month10=oktober
-Month11=november
-Month12=december
-MonthShort01=jan
-MonthShort02=feb
-MonthShort03=mar
-MonthShort04=apr
-MonthShort05=mei
-MonthShort06=jun
-MonthShort07=jul
-MonthShort08=aug
-MonthShort09=sep
-MonthShort10=okt
-MonthShort11=nov
-MonthShort12=dec
-AttachedFiles=Bijgevoegde bestanden en documenten
-FileTransferComplete=Het bestand is succesvol geupload
-DateFormatYYYYMM=JJJJ-MM
-DateFormatYYYYMMDD=JJJJ-MM-DD
-DateFormatYYYYMMDDHHMM=JJJJ-MM-DD HH: SS
-ReportName=Rapportnaam
-ReportPeriod=Periode-analyse
-ReportDescription=Omschrijving
-Report=Verslag
-Keyword=Keyword
-Origin=Origin
-Legend=Legende
-Fill=Invullen
-Reset=Reset
-File=Bestand
-Files=Bestanden
-NotAllowed=Niet toegestaan
-ReadPermissionNotAllowed=Leesrechten niet toegestaan
-AmountInCurrency=Bedrag in %s valuta
-Example=Voorbeeld
-Examples=Voorbeelden
-NoExample=Geen voorbeeld
-FindBug=Rapporteer een bug
-NbOfThirdParties=Aantal derden
-NbOfLines=Aantal regels
-NbOfObjects=Aantal objecten
-NbOfObjectReferers=Number of related items
-Referers=Related items
-TotalQuantity=Totale hoeveelheid
-DateFromTo=Van %s naar %s
-DateFrom=Vanaf %s
-DateUntil=Tot %s
-Check=Controleren
-Uncheck=Haal het vinkje weg
-Internal=Interne
-External=Extern
-Internals=Internen
-Externals=Externen
-Warning=Waarschuwing
-Warnings=Waarschuwingen
-BuildDoc=Genereer Document
-Entity=Entiteit
-Entities=Entiteiten
-CustomerPreview=Afnemersvoorbeeldweergave
-SupplierPreview=Leverancier voorbeeldweergave
-ShowCustomerPreview=Toon afnemersvoorbeeldweergave
-ShowSupplierPreview=Toon leverancier voorbeeldweergave
-RefCustomer=Referentie afnemer
-Currency=Valuta
-InfoAdmin=Informatie voor beheerders
-Undo=Ongedaan maken
-Redo=Opnieuw
-ExpandAll=Alles uitklappen
-UndoExpandAll=Ongedaan maken alles uitklappen
-Reason=Reden
-FeatureNotYetSupported=Functie nog niet ondersteund
-CloseWindow=Sluit venster
-Response=Antwoord
-Priority=Prioriteit
-SendByMail=Verzend per mail
-MailSentBy=E-mail verzonden door
-TextUsedInTheMessageBody=E-mailinhoud
-SendAcknowledgementByMail=Send confirmation email
-EMail=E-mail
-NoEMail=Geen e-mail
-Email=Email
-NoMobilePhone=Geen mobiele telefoon
-Owner=Eigenaar
-FollowingConstantsWillBeSubstituted=De volgende constanten worden vervangen met de overeenkomstige waarde.
-Refresh=Vernieuwen
-BackToList=Terug naar het overzicht
-GoBack=Ga terug
-CanBeModifiedIfOk=Kan worden gewijzigd indien geldig
-CanBeModifiedIfKo=Kan worden gewijzigd indien ongeldig
-ValueIsValid=Prijs is geldig
-ValueIsNotValid=Value is not valid
-RecordCreatedSuccessfully=Record created successfully
-RecordModifiedSuccessfully=Tabelregel succesvol gewijzigd
-RecordsModified=%s record modified
-RecordsDeleted=%s record deleted
-AutomaticCode=Automatische code
-FeatureDisabled=Functie uitgeschakeld
-MoveBox=Move widget
-Offered=Beschikbaar
-NotEnoughPermissions=U heeft geen toestemming voor deze actie
-SessionName=Sessienaam
-Method=Methode
-Receive=Ontvangen
-CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
-ExpectedValue=Expected Value
-CurrentValue=Huidige waarde
-PartialWoman=Gedeeltelijke
-TotalWoman=Totaal
-NeverReceived=Nooit ontvangen
-Canceled=Geannuleerd
-YouCanChangeValuesForThisListFromDictionarySetup=U kunt waarden voor deze lijst wijzigen via menu-instellingen - woordenboek
 YouCanSetDefaultValueInModuleSetup=Je kan de standaard waarde gebruiken wanneer je een nieuw record plaatst in de module setup
-Color=Kleur
-Documents=Gekoppelde bestanden
-Documents2=Documenten
-UploadDisabled=Uploaden uitgeschakeld
-MenuECM=Documenten
-MenuAWStats=AWStats
-MenuMembers=Leden
-MenuAgendaGoogle=Google-agenda
-ThisLimitIsDefinedInSetup=Dolibarr limiet (Menu Home-Instellingen-Beveiliging): %s Kb, PHP grens: %s Kb
-NoFileFound=Geen documenten die zijn opgeslagen in deze map
-CurrentUserLanguage=Huidige taal
-CurrentTheme=Actuele thema
-CurrentMenuManager=Huidige menu manager
-Browser=Browser
-Layout=Layout
-Screen=Screen
-DisabledModules=Uitgeschakelde modules
-For=Voor
-ForCustomer=Voor de afnemer
-Signature=Handtekening
-DateOfSignature=Date of signature
-HidePassword=Toon opdracht met verborgen wachtwoord
-UnHidePassword=Toon opdracht met zichtbaar wachtwoord
-Root=Root
-Informations=Informatie
-Page=Pagina
-Notes=Notitie
-AddNewLine=Voeg nieuwe regel toe
-AddFile=Voeg bestand toe
-FreeZone=Vrije ingave
-FreeLineOfType=Vrije ingave van type
-CloneMainAttributes=Kloon het object met de belangrijkste kenmerken
-PDFMerge=Voeg PDF samen
-Merge=Samenvoegen
-PrintContentArea=Toon printervriendelijke pagina
-MenuManager=Standaard menuverwerker
-WarningYouAreInMaintenanceMode=Let op, u bevind zich in de onderhoudmodus, dus alleen de login <b>%s</b> is gemachtigd om de applicatie op dit moment te gebruiken.
-CoreErrorTitle=Systeemfout
-CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
-CreditCard=CreditCard
-FieldsWithAreMandatory=Velden met een <b>%s</b> zijn verplicht
-FieldsWithIsForPublic=Velden gemarkeerd door <b>%s</b> zullen worden geplaatst op de openbare lijst van de leden. Indien u dat niet wenst, schakelt u de toegang "publiek" uit.
-AccordingToGeoIPDatabase=(verkregen door conversie GeoIP)
-Line=Regel
-NotSupported=Niet ondersteund
-RequiredField=Verplicht veld
-Result=Resultaat
-ToTest=Testen
-ValidateBefore=Het geheel moet worden gevalideerd om deze functie te kunnen gebruiken
-Visibility=Zichtbaarheid
-Private=Privé
-Hidden=Verborgen
-Resources=Middelen
-Source=Bron
-Prefix=Voorvoegsel
-Before=Voor
-After=Na
-IPAddress=IP-adres
-Frequency=Frequentie
-IM=Instant messaging
-NewAttribute=Nieuwe attribuut
-AttributeCode=Attribuut code
-URLPhoto=Url van foto / logo
 SetLinkToAnotherThirdParty=Link naar een derde partij
-LinkTo=Link to
-LinkToProposal=Link to proposal
-LinkToOrder=gekoppeld aan bestelling
-LinkToInvoice=Link to invoice
-LinkToSupplierOrder=Link to supplier order
-LinkToSupplierProposal=Link to supplier proposal
-LinkToSupplierInvoice=Link to supplier invoice
-LinkToContract=Link to contract
-LinkToIntervention=Link to intervention
-CreateDraft=Maak een ontwerp
-SetToDraft=Terug naar ontwerp
-ClickToEdit=Klik om te bewerken
-ObjectDeleted=Object %s verwijderd
-ByCountry=Per land
-ByTown=Door de stad
-ByDate=Op datum
-ByMonthYear=Per maand / jaar
-ByYear=Per jaar
-ByMonth=per maand
-ByDay=Per dag
-BySalesRepresentative=Door vertegenwoordiger
-LinkedToSpecificUsers=Gekoppeld aan een bepaalde gebruiker contact
-NoResults=Geen resultaten
-AdminTools=Admin tools
-SystemTools=System tools
-ModulesSystemTools=Modules gereedschappen
-Test=Test
-Element=Element
-NoPhotoYet=Nog geen fotos beschikbaar
-Dashboard=Dashboard
-MyDashboard=My dashboard
-Deductible=Aftrekbaar
-from=van
-toward=richting
-Access=Toegang
 SelectAction=Selecteer actie
-HelpCopyToClipboard=Gebruik Ctrl + C om te kopiëren naar het klembord
-SaveUploadedFileWithMask=Sla het bestand op de server met de naam "<strong>%s</strong>" (anders "%s")
-OriginFileName=Oorspronkelijke bestandsnaam
-SetDemandReason=Stel bron in
-SetBankAccount=Definieer Bank Rekening
-AccountCurrency=Rekening Valuta
-ViewPrivateNote=Notities bekijken
-XMoreLines=%s regel(s) verborgen
-PublicUrl=Openbare URL
-AddBox=Box toevoegen
-SelectElementAndClickRefresh=Selecteer een element en klik op nernieuwen
-PrintFile=Bestand afdrukken %s
-ShowTransaction=Show entry on bank account
-GoIntoSetupToChangeLogo=Ga naar Home - Setup - Bedrijf om logo te wijzigen of ga naar Home - Instellingen - Scherm om te verbergen.
 Deny=Weigeren
 Denied=Geweigerd
-ListOfTemplates=List of templates
-Gender=Geslacht
-Genderman=Man
-Genderwoman=Vrouw
-ViewList=List view
-Mandatory=Mandatory
-Hello=Hallo
 Sincerely=Met vriendelijke groeten
 DeleteLine=Verwijder lijn
-ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
-NoRecordSelected=No record selected
-MassFilesArea=Area for files built by mass actions
-ShowTempMassFilesArea=Show area of files built by mass actions
-RelatedObjects=Related Objects
 ClassifyBilled=Wijzig Status naar "gefactureerd"
-Progress=Voortgang
-ClickHere=Klik hier
-FrontOffice=Front office
-BackOffice=Back office
-View=View
-Export=Export
 Exports=Exporten
-ExportFilteredList=Export filtered list
-ExportList=Export list
-Miscellaneous=Diversen
-Calendar=Kalender
-GroupBy=Group by...
-ViewFlatList=View flat list
-RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Direct download link
-Download=Download
-ActualizeCurrency=Update currency rate
-Fiscalyear=Boekjaar
-# Week day
-Monday=Maandag
-Tuesday=Dinsdag
-Wednesday=Woensdag
-Thursday=Donderdag
-Friday=Vrijdag
-Saturday=Zaterdag
-Sunday=Zondag
-MondayMin=Mo
-TuesdayMin=Tu
-WednesdayMin=Wij
-ThursdayMin=Th
-FridayMin=Fr
-SaturdayMin=Sa
-SundayMin=Su
-Day1=Maandag
-Day2=Dinsdag
-Day3=Woensdag
-Day4=Donderdag
-Day5=Vrijdag
-Day6=Zaterdag
-Day0=Zondag
-ShortMonday=Ma
-ShortTuesday=Di
-ShortWednesday=Wo
-ShortThursday=Do
-ShortFriday=Vr
-ShortSaturday=Za
-ShortSunday=Zo
-SelectMailModel=Selecteer e-mail template
-SetRef=Set ref
-Select2ResultFoundUseArrows=Some results found. Use arrows to select.
 Select2NotFound=Geen resultaten gevonden
-Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=of meer karakters
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
 Select2LoadingMoreResults=Laden van meer resultaten...
 Select2SearchInProgress=Zoeken is aan de gang...
 SearchIntoThirdparties=Derde partijen
-SearchIntoContacts=Contacten
-SearchIntoMembers=Leden
-SearchIntoUsers=Gebruikers
 SearchIntoProductsOrServices=Producten of diensten
-SearchIntoProjects=Projecten
-SearchIntoTasks=Taken
 SearchIntoCustomerInvoices=Klant facturen
 SearchIntoSupplierInvoices=Leverancier facturen
 SearchIntoCustomerOrders=Klant bestellingen
-SearchIntoSupplierOrders=Leveranciersopdrachten
 SearchIntoCustomerProposals=Klant voorstellen
 SearchIntoSupplierProposals=Leverancier voorstellen
-SearchIntoInterventions=Interventies
-SearchIntoContracts=Contracten
-SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Uitgaven rapporten
-SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/nl_BE/other.lang b/htdocs/langs/nl_BE/other.lang
index b1d06de55b8..ddba9731290 100644
--- a/htdocs/langs/nl_BE/other.lang
+++ b/htdocs/langs/nl_BE/other.lang
@@ -2,7 +2,6 @@
 Notify_COMPANY_CREATE=Third party aangemaakt
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nHierbij vindt U de factuur __REF__\n\n__PERSONALIZED__Met oprechte groeten\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe willen U waarschuwen dat deze factuur  __REF__ nog nog niet werd betaald. Hierbij kunt U, als herinnering, de factuur opnieuw terug vinden in bijlage .\n\n__PERSONALIZED__ met oprechte groeten\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nHierbij vindt U de prijs offerte  __ASKREF__\n\n__PERSONALIZED__Met oprechte groeten\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nHierbij vindt U de factuur __REF__\n\n__PERSONALIZED__Met oprechte groeten\n\n__SIGNATURE__
 FileIsTooBig=Bestanden zijn te groot
 WebsiteSetup=Setup van de module website
diff --git a/htdocs/langs/nl_BE/products.lang b/htdocs/langs/nl_BE/products.lang
index 70da9583209..4701b644959 100644
--- a/htdocs/langs/nl_BE/products.lang
+++ b/htdocs/langs/nl_BE/products.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - products
 Reference=Artikelcode
-ProductsOnSell=Beschikbaar voor verkoop
 ProductsNotOnSell=Niet beschikbaar voor verkoop
 ServicesNotOnSell=Geen diensten vatbaar voor verkoop
 OnSell=Te koop
diff --git a/htdocs/langs/nl_NL/accountancy.lang b/htdocs/langs/nl_NL/accountancy.lang
index ebcac1f50a5..e9b1ede8897 100644
--- a/htdocs/langs/nl_NL/accountancy.lang
+++ b/htdocs/langs/nl_NL/accountancy.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - en_US - Accounting Expert
-ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
-ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_SEPARATORCSV=Kolom separator voor export bestand
+ACCOUNTING_EXPORT_DATE=Datumnotatie voor exportbestand
 ACCOUNTING_EXPORT_PIECE=Export the number of piece
 ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account
 ACCOUNTING_EXPORT_LABEL=Export label
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=General ledger
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
@@ -86,10 +94,10 @@ IntoAccount=Bind line with the accounting account
 
 Ventilate=Bind
 LineId=Id line
-Processing=Processing
+Processing=verwerken
 EndProcessing=Process terminated.
-SelectedLines=Selected lines
-Lineofinvoice=Line of invoice
+SelectedLines=Geselecteerde lijnen
+Lineofinvoice=factuur lijn
 LineOfExpenseReport=Line of expense report
 NoAccountSelected=No accounting account selected
 VentilatedinAccount=Binded successfully to the accounting account
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
@@ -126,43 +134,43 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold servi
 Doctype=Type of document
 Docdate=Date
 Docref=Reference
-Code_tiers=Thirdparty
+Code_tiers=Klant
 Labelcompte=Label account
 Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-ThirdPartyAccount=Thirdparty account
+ThirdPartyAccount=Klant account
 NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=List of the accounting accounts
 
 Pcgtype=Class of account
-Pcgsubtype=Under class of account
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Code
+Nature=Natuur
+AccountingJournalType1=Various operation
+AccountingJournalType2=Verkopen
+AccountingJournalType3=Aankopen
+AccountingJournalType4=Bank
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Export
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index 3466e729f44..4e03bc776b3 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=Interne gebruikers
 ExternalUsers=Externe gebruikers
 GUISetup=Scherm
 SetupArea=Instellingenoverzicht
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Formulier waarmee bestandsupload kan worden getest (afhankelijk van de gekozen opties)
 IfModuleEnabled=Opmerking: Ja, is alleen effectief als module <b>%s</b> is geactiveerd
 RemoveLock=Verwijder, als het bestaat, het bestand <b>%s</b> om gebruik te kunnen maken van de updatetool.
@@ -85,7 +86,7 @@ Mask=Masker
 NextValue=Volgende waarde
 NextValueForInvoices=Volgende waarde (facturen)
 NextValueForCreditNotes=Volgende waarde (creditnota's)
-NextValueForDeposit=Volgende waarde (storting)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Volgende waarde (vervangingen)
 MustBeLowerThanPHPLimit=Opmerking: uw PHP instellingen beperken de groote van bestanduploads naar <b>%s %s,</b> ongeacht wat de waarde van de instelling binnen Dolibarr is
 NoMaxSizeByPHPLimit=Opmerking: Geen limiet ingesteld in uw PHP instellingen
@@ -103,7 +104,7 @@ MenuIdParent=ID van het bovenliggende menu
 DetailMenuIdParent=ID van het bovenliggend menu (0 voor een hoogste menu)
 DetailPosition=Sorteren aantal te definiëren menupositie
 AllMenus=Alle
-NotConfigured=Niet geconfigureerd
+NotConfigured=Module/Application not configured
 Active=Actief
 SetupShort=Instellingen
 OtherOptions=Overige opties
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Duizend scheidingsteken
 Destination=Bestemming
 IdModule=Module ID
 IdPermissions=Permissions ID
-Modules=Modules
 LanguageBrowserParameter=Instelling %s
 LocalisationDolibarrParameters=Localisatie-instellingen
 ClientTZ=Tijdzone van de klant (gebruiker)
@@ -123,7 +123,8 @@ PHPTZ=Tijdzone binnen de PHP server
 DaylingSavingTime=Zomertijd (gebruiker)
 CurrentHour=Huidige tijd op server
 CurrentSessionTimeOut=Huidige sessietimeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max number of lines for widgets
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Rechten
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Alleen elementen van ingeschakelde <a href="%s">modules</a> worden getoond.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Databasewachtwoord versleuteld opslaan in conf.p
 InstrucToEncodePass=Om je paswoord versleuteld (gecodeerd) te krijgen in dit bestand <b>conf.php</b> , vervang de regel <br><b>$dolibarr_main_db_pass="...";</b><br>door<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=Om je paswoord gedecodeerd te verkrijgen in dit bestand <b>conf.php</b>,  vervang de regel <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>door<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Bescherming van gecreëerde PDF files. (Activering NIET aanbevolen, omdat dit de aanmaak van meerdere bestanden onmogelijk maakt)
-ProtectAndEncryptPdfFilesDesc=Bescherming van PDF files, deze kunnen gelezen en afgedrukt worden met behulp van een PDF-lezer. Echter, het bewerken en kopiëren is niet meer mogelijk. Let op dat door het gebruik van deze functionaliteit, de bouw van een globale gecumuleerde pdf niet werkt (zoals bij onbetaalde facturen).
+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=Functionaliteit
 DolibarrLicense=Licentie
 Developpers=Ontwikkelaars / mensen die bijgedragen hebben
@@ -224,7 +225,9 @@ OfficialDemo=Online demonstratie van Dolibarr
 OfficialMarketPlace=Officiële markt voor externe modules / addons
 OfficialWebHostingService=Verwezen web hosting diensten (Cloud hosting)
 ReferencedPreferredPartners=Preferred Partners
-OtherResources=Andere bronnen
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=Documentatie voor gebruikers of ontwikkelaars kunt u inzien door <br>te kijken op de Dolibarr Wiki-pagina's:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=Voor alle andere vragen / hulp, kunt u gebruik maken van het Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Dit scherm kan u helpen om ondersteuning voor Dolibarr te krijgen.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=Functionaliteit niet beschikbaar op Unix-achtige syst
 SubmitTranslation=Indien de vertaling voor deze taal nog niet volledig is of je vindt fouten, dan kan je dit verbeteren door de bestanden te editeren in de volgende directory <b>langs/%s</b> en stuur uw wijzigingen door naar 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-instellingen
-ModulesSetup=Instellingen van modules
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Systeem
 ModuleFamilyCrm=Customer Relation Management (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=Huidige versie van Dolibarr
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Updateserver offline
+WithCounter=Manage a counter
 GenericMaskCodes=U kunt elk gewenst maskernummer invoeren. In dit masker, kunnen de volgende tags worden gebruikt:<br><b>{000000}</b> correspondeert met een nummer welke vermeerderd zal worden op elke %s. Voer zoveel nullen in als de gewenste lengte van de teller. De teller wordt aangevuld met nullen vanaf links zodat er zoveel nullen zijn als in het masker.<br><b>{000000+000}</b> hetzelfde als voorgaand maar een offset corresponderend met het nummer aan de rechterkant van het + teken is toegevoegd startend op de eerste %s. <br><b>{000000@x}</b> hetzelfde als voorgaande maar de teller wordt gereset naar nul, wanneer maand x is bereikt (x tussen 1 en 12). Als deze optie is gebruikt en x is 2 of hoger, dan is de volgorde {yy}{mm} of {yyyy}{mm} ook vereist. <br><b>{dd}</b> dag (01 t/m 31).<br><b>{mm}</b> maand (01 t/m 12).<br><b>{yy}</b>, <b>{yyyy}</b> of <b>{y}</b> jaat over 2, 4 of 1 nummer(s). <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Alle andere karakters in het masker zullen intact blijven.<br>Spaties zijn niet toegestaan.<br>
-GenericMaskCodes4a=<u>Voorbeeld van de 99e %s van de Klant 'HetBedrijf' gedaan op 2007-01-31:</u><br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Voorbeeld van een Klant gecreëerd op 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Voorbeeld op product gemaakt op 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> geeft <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> geeft <b>0199-ZZZ/31/XXX</b>
+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=Geeft een aanpasbaar nummer volgens een gedefinieerd masker.
 ServerAvailableOnIPOrPort=Server is beschikbaar op het IP-adres <b>%s</b> met poort <b>%s</b>
 ServerNotAvailableOnIPOrPort=Server is niet beschikbaar op het IP-adres <b>%s</b> met poort <b>%s</b>
@@ -369,19 +375,21 @@ Int=Integer
 Float=Float
 DateAndTime=Datum en uur
 Unique=Unique
-Boolean=Boolean (Checkbox)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Telefoon
 ExtrafieldPrice = Prijs
 ExtrafieldMail = Email
 ExtrafieldUrl = Url
 ExtrafieldSelect = Keuze lijst
 ExtrafieldSelectList = Kies uit tabel
-ExtrafieldSeparator=Scheidingsteken
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Wachtwoord
-ExtrafieldCheckBox=Aanvink-vak
-ExtrafieldRadio=Radioknop
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldRadio=Radio buttons (on choice only)
+ExtrafieldCheckBox=Checkboxes
+ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link naar een 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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Een parameterlijst heeft de waarden sleutel,waarde<br><br> bijvoorbeeld: <br>1,waarde1<br>2,waarde2<br>3,waarde3<br>...<br><br>
 ExtrafieldParamHelpradio=Lijst van parameters moet bestaan uit sleutel,waarde<br><br>bv:<br>1,waarde<br>2,waarde2<br>3,waarde3<br>...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=veld
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Gebruikers & groepen
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=Factuur- en creditnotabeheer voor klanten. Factuurbeheer voor lever
 Module40Name=Leveranciers
 Module40Desc=Leveranciersbeheer (inkoopopdrachten en -facturen)
 Module42Name=Syslog
-Module42Desc=logfaciliteiten met behulp van het 'syslog'-systeem
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Editors
 Module49Desc=Editorbeheer
 Module50Name=Producten
@@ -499,8 +521,8 @@ Module410Name=Webkalender
 Module410Desc=Integratie van een webkalender
 Module500Name=Speciale uitgaven
 Module500Desc=Beheer van bijzondere uitgaven (BTW, sociale of fiscale lasten, dividenden)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Lening
 Module520Desc=Het beheer van de leningen
 Module600Name=Kennisgevingen
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=Capaciteitconversie GeoIP Maxmind
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
-Module4000Desc=Human resources management
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi-bedrijf
 Module5000Desc=Hiermee kunt meerdere bedrijven beheren in Dolibarr
 Module6000Name=Workflow
@@ -591,7 +615,7 @@ Permission32=Creëer / wijzig producten / diensten
 Permission34=Verwijderen producten / diensten
 Permission36=Exporteer producten / diensten
 Permission38=Export producten
-Permission41=Lees projecten en taken (gedeeld project en project waarvan ik contactpersoon ben). Kan ook de gebruikte tijd invoeren op toegewezen taken (rooster).
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Verwijder projecten (Gedeelde projecten en projecten waarvoor ik de contactpersoon ben)
 Permission45=Export projects
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Bestel methodes
 DictionarySource=Oorsprong van offertes / bestellingen
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Modellen voor rekeningschema
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Email documentensjablonen
 DictionaryUnits=Eenheden
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Instellingen opgeslagen
+SetupNotSaved=Setup not saved
 BackToModuleList=Terug naar moduleoverzicht
 BackToDictionaryList=Terug naar de woordenboeken lijst
 VATManagement=BTW-beheer
@@ -921,7 +947,7 @@ Host=Server
 DriverType=Drivertype
 SummarySystem=Samenvatting van systeeminformatie
 SummaryConst=Lijst van alle Dolibarr-instellingen
-MenuCompanySetup=Bedrijf / Stichting
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= standaard menuverwerker
 DefaultMenuSmartphoneManager=standaard smartphonemenuverwerker
 Skin=Uiterlijksthema
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Standaard maximum lengte voor lijsten
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=Bericht van de dag
 MessageLogin=Bericht op inlogpagina
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent zoekformulier in linker menu
 DefaultLanguage=Standaard te gebruiken taal (taal-code)
 EnableMultilangInterface=Inschakelen meertalige interface
 EnableShowLogo=Toon logo in het linker menu
-CompanyInfo=Bedrijf / stichting informatie
-CompanyIds=Bedrijf / stichting identiteiten
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=Naam
 CompanyAddress=Adres
 CompanyZip=Postcode
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Getolereerde vertraging (in dagen) voor een kennisgevi
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Getolereerde vertraging (in dagen) voor de kennisgeving voor nog te doen cheques aanbetaling
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Andere menu-items beheren / optionele instellingen.
 LogEvents=Veiligheidsauditgebeurtenissen
 Audit=Audit
@@ -987,7 +1015,7 @@ BrowserOS=Browser OS
 ListOfSecurityEvents=Lijst van Dolibarr veiligheidgebeurtenisen
 SecurityEventsPurged=Beveiliging gebeurtenissen verwijderd
 LogEventDesc=Hier kunt u de de gewenste veiligheidslogs in- of uitschakelen. Beheerders kunnen de inhoud ervan dan zien via het menu <b>Home->Systeemwerkset->Audit.</b> Waarschuwing, deze functionaliteit kan een grote hoeveelheid gegevens in de database wegschrijven.
-AreaForAdminOnly=Deze functies kunnen alleen worden gebruikt door <b>beheerders</b>
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Systeeminformatie is technische informatie welke u in alleen-lezen modus krijgt en alleen door beheerders is in te zien.
 SystemAreaForAdminOnly=Dit scherm is alleen beschikbaar voor de beheerders. Andere Dolibarr gebruikers kunnen hier niets wijzigen.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists in any language files
+TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Je moet minstens 1 module aktiveren
 ClassNotFoundIntoPathWarning=Classe %s niet gevonden in PHP pad
 YesInSummer=Ja in de zomer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Sessie opslag geencrypteerd door Suhosin
 ConditionIsCurrently=Voorwaarde is momenteel %s
 YouUseBestDriver=U gebruikt driver %s die momenteel meest geschikt is.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Professionele Id unieke
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Een exportlink naar het <b>%s</b> formaat is beschikbaar onder de volgende link: %s
 ##### Invoices #####
 BillsSetup=Facturenmodule instellen
 BillsNumberingModule=Nummeringsmodule voor facturen en creditnota's
 BillsPDFModules=Factuur documentsjablonen
+PaymentsPDFModules=Payment documents models
 CreditNote=Creditnota
 CreditNotes=Creditnota's
 ForceInvoiceDate=Forceer factuurdatum naar validatiedatum
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
 FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
 FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
 CacheByServer=Cache via server
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache via browser
 CompressionOfResources=Compression of HTTP responses
+CompressionOfResourcesDesc=For exemple using the Apache directive "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Automatische detectie niet mogelijk
+DefaultValuesDesc=You can define/force here the default value you want to get when your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Productenmoduleinstellingen
 ServiceSetup=Services module setup
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Factuurdatum gebruiken
 Buy=Kopen
 Sell=Verkopen
 InvoiceDateUsed=Factuurdatum gebruiken
-YourCompanyDoesNotUseVAT=Uw bedrijf is ingesteld als zijnde vrijgesteld van BTW (Home->Instellingen->Bedrijf / stichting), er zijn dus geen BTW opties in te stellen.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=Accountancy Code
 AccountancyCodeSell=Boekhoudkundige afnemerscode
 AccountancyCodeBuy=Boekhoudkundige leverancierscode
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Stel automatisch deze status voor evenementen in zo
 AGENDA_DEFAULT_VIEW=Welk tabblad wilt u standaard openen bij het selecteren van menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup='Click-To-Dial' moduleinstellingen
-ClickToDialUrlDesc=Aangeroepen URL wanneer er geklikt wordt op een telefoonicoontje. In de URL kunt u 'tags' gebruiken<br><b>__PHONETO__</b> zal vervangen worden met het telefoonnummer dat gebeld moet worden<br><b>__PHONEFROM__</b> zal worden vervangen met het telefoonnummer van de bellende persoon (uw telefoonnummer)<br><b>__LOGIN__</b> zal vervangen worden door uw 'Click-To-Dial'-accountgebruikersnaam (Zoals ingesteld op uw gebruikerskaartdetails<br><b>__PASS__</b> zal vervangen worden door uw "Click-To-Dial"-accountwachtwoord (Zoals ingesteld op uw gebruikerskaartdetails).
+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.
 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 same computer than 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.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+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.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=Algemene vertoonvolgorde
 BankOrderES=Spaans
 BankOrderESDesc=Spaanse vertoonvolgorde
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=Multi-Bedrijfmoduleinstellingen
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ BackupDumpWizard=Wizard om database backup dump bestand op te bouwen
 SomethingMakeInstallFromWebNotPossible=Installatie van externe module is niet mogelijk via de webinterface om de volgende reden:
 SomethingMakeInstallFromWebNotPossible2=Om deze reden, is het upgrade process hier beschreven alleen in handmatige stappen door een bevoorrechte gebruiker te doen.
 InstallModuleFromWebHasBeenDisabledByFile=Installeren van externe module van toepassing is uitgeschakeld door uw beheerder. Je moet hem vragen om het bestand <strong>%s</strong>  te verwijderen om deze functie mogelijk te maken.
-ConfFileMuseContainCustom=Installing 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)
 TextTitleColor=Color of page title
 LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/nl_NL/agenda.lang b/htdocs/langs/nl_NL/agenda.lang
index 8b093601644..8c67e47823a 100644
--- a/htdocs/langs/nl_NL/agenda.lang
+++ b/htdocs/langs/nl_NL/agenda.lang
@@ -2,6 +2,7 @@
 IdAgenda=ID gebeurtenis
 Actions=Acties
 Agenda=Agenda
+TMenuAgenda=Agenda
 Agendas=Agenda's
 LocalAgenda=Interne kalender
 ActionsOwnedBy=Actie gevraagd door
@@ -47,6 +48,7 @@ InvoiceDeleteDolibarr=Factuur %s verwijderd
 InvoicePaidInDolibarr=Factuur %s gewijzigd naar betaald
 InvoiceCanceledInDolibarr=Factuur %s geannuleerd
 MemberValidatedInDolibarr=Lid %s gevalideerd
+MemberModifiedInDolibarr=Lid %s gewijzigd
 MemberResiliatedInDolibarr=Lidmaatschap %s beëindigd
 MemberDeletedInDolibarr=Lid %s verwijderd
 MemberSubscriptionAddedInDolibarr=Abonnement voor lid %s toegevoegd
@@ -74,6 +76,7 @@ ProposalDeleted=Voorstel verwijderd
 OrderDeleted=Bestelling verwijderd
 InvoiceDeleted=Factuur verwijderd
 ##### End agenda events #####
+AgendaModelModule=Document sjablonen voor evenement
 DateActionStart=Startdatum
 DateActionEnd=Einddatum
 AgendaUrlOptions1=U kunt ook de volgende parameters gebruiken om te filteren:
diff --git a/htdocs/langs/nl_NL/compta.lang b/htdocs/langs/nl_NL/compta.lang
index 4dc07f35e50..e0ac09c805b 100644
--- a/htdocs/langs/nl_NL/compta.lang
+++ b/htdocs/langs/nl_NL/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Bedragen hier getoond worden berekend vol
 Param=Instellen
 RemainingAmountPayment=Bedrag betaling resteert:
 Account=Rekening
-Accountparent=Hoofd rekening
-Accountsparent=Hoofd rekeningen
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=Inkomsten
 Outcome=Kosten
 ReportInOut=Opbrengsten / kosten
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Belastingen en dividenden
 MenuSocialContributions=Social/fiscal taxes
 MenuNewSocialContribution=New social/fiscal tax
 NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Treasury- (schatkist) / boekhoudingsoverzicht
 NewPayment=Nieuwe betaling
@@ -134,8 +135,8 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- Het bevat alle effectieve betalingen van afnemersfacturen.<br>- Het is gebaseerd op de betaaldatum van deze facturen<br>
-DepositsAreNotIncluded=- Storting facturen worden ook niet opgenomen
-DepositsAreIncluded=- Storting facturen zijn opgenomen
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Verslag van derden IRPF
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
 VATReport=VAT report
@@ -169,7 +170,7 @@ DescSellsJournal=Verkoopdagboek
 DescPurchasesJournal=Inkoopdagboek
 InvoiceRef=Factuur ref.
 CodeNotDef=Niet gedefinieerd
-WarningDepositsNotIncluded=Deposito facturen worden niet opgenomen in deze versie met deze accountancy module.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Betalingstermijn mag niet lager zijn dan de datum object.
 Pcg_version=Chart of accounts models
 Pcg_type=Boekhouding soort
@@ -189,8 +190,10 @@ AccountancyJournal=Dagboek van financiële rekening
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Kloon het voor volgende maand
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/nl_NL/cron.lang b/htdocs/langs/nl_NL/cron.lang
index a33f2824410..0e1bea43164 100644
--- a/htdocs/langs/nl_NL/cron.lang
+++ b/htdocs/langs/nl_NL/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allow to execute job that have been planned
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Taak
 CronNone=Geen
 CronDtStart=Not before
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Deactiveren
 CronTaskInactive=This job is disabled
 CronId=Id
-CronClassFile=Classes (filename.class.php)
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=Van
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang
index b43b1ba0a06..eef726cce6f 100644
--- a/htdocs/langs/nl_NL/errors.lang
+++ b/htdocs/langs/nl_NL/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Creëren van het bestand '<b>%s</b>' mislukt.
 ErrorFailToRenameDir=De map '<b>%s</b>' kon niet hernoemd worden naar '<b>%s</b>'.
 ErrorFailToCreateDir=Creëren van de map '<b>%s</b>' mislukt.
 ErrorFailToDeleteDir=Verwijderen van de map '<b>%s</b>' mislukt.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=Deze contactpersoon is al ingesteld als een contactpersoon voor dit type.
 ErrorCashAccountAcceptsOnlyCashMoney=Dit is een kasrekening, dus deze accepteert alleen betalingen van het type kas.
 ErrorFromToAccountsMustDiffers=De bron- en doelrekening mogen niet dezelfde zijn.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Schrijven in de map %s mislukt
 ErrorFoundBadEmailInFile=Onjuist e-mail syntax gevonden voor %s regels in het bestand (bijvoorbeeld regel %s met email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Enkele verplichte velden zijn niet ingevuld.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Creëren van een map mislukt. Controleer of de Webservergebruiker toestemming heeft om te schrijven in Dolibarr documentenmap. Wanneer de parameter <b>safe_mode</b> is ingeschakeld in PHP, controleer dan dat de Dolibarr php bestanden eigendom zijn van de de webserve gebruiker (of groep).
 ErrorNoMailDefinedForThisUser=Geen e-mailadres ingesteld voor deze gebruiker
 ErrorFeatureNeedJavascript=Voor deze functie moet Javascript geactiveerd zijn. Verander dit in het Instellingen - scherm.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoice
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> gebruikt om web-server uit te voeren heeft geen toestemming voor die
 ErrorNoActivatedBarcode=Geen geactiveerde barcode soort
 ErrUnzipFails=uitpakken %s mislukt met ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=Het bestand %s moet een Dolibarr zip-pakket zijn
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=De PHP CURL is niet geïnstalleerd, dit is van essentieel belang met Paypal te communiceren
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # 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.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice
 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/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
index 3937bd6d813..f8ecd5293a9 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=Parameter %s is niet gedefinieerd
 ErrorUnknown=Onbekende fout
 ErrorSQL=SQL fout
 ErrorLogoFileNotFound=Logobestand '%s' is niet gevonden
-ErrorGoToGlobalSetup=Ga naar het instellingscherm 'Bedrijf / Stichting' om dit te corrigeren
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=Ga naar Moduleinstellingen om dit te corrigeren
 ErrorFailedToSendMail=Mail versturen mislukt (afzender=%s, ontvanger=%s)
 ErrorFileNotUploaded=Bestand is niet geüploadet. Controleer of de grootte niet meer is dan maximaal toegestaan, of er vrije ruimte beschikbaar is op de schijf en of er niet al een bestand met dezelfde naam in deze map bestaat.
@@ -153,6 +153,7 @@ Edit=Bewerken
 Validate=Valideer
 ValidateAndApprove=Valideren en goedkeuren
 ToValidate=Te valideren
+NotValidated=Not validated
 Save=Opslaan
 SaveAs=Opslaan als
 TestConnection=Test verbinding
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=No applicative disconnect feature with authenticatio
 Connection=Inloggen
 Setup=Instellingen
 Alert=Kennisgevingen
+MenuWarnings=Kennisgevingen
 Previous=Vorige
 Next=Volgende
 Cards=Kaarten
@@ -308,6 +310,7 @@ Copy=Kopiëren
 Paste=Plakken
 Default=Standaard
 DefaultValue=Standaardwaarde
+DefaultValues=Default values
 Price=Prijs
 UnitPrice=Eenheidsprijs
 UnitPriceHT=Eenheidsprijs (netto)
@@ -363,7 +366,8 @@ VATRate=BTW-tarief
 Average=Gemiddeld
 Sum=Som
 Delta=Variantie
-Module=Module
+Module=Module/Application
+Modules=Modules/Applications
 Option=Optie
 List=Lijstoverzicht
 FullList=Volledig overzicht
@@ -387,7 +391,7 @@ ActionRunningNotStarted=Niet gestart
 ActionRunningShort=In progress
 ActionDoneShort=Uitgevoerd
 ActionUncomplete=Onvolledig
-CompanyFoundation=Bedrijf of instelling
+CompanyFoundation=Company/Organisation
 ContactsForCompany=Bedrijfscontacten
 ContactsAddressesForCompany=Contacten / adressen voor deze relatie
 AddressesForCompany=Adressen voor deze relatie
@@ -405,8 +409,9 @@ Generate=Genereer
 Duration=Duur
 TotalDuration=Totale duur
 Summary=Samenvatting
-DolibarrStateBoard=Statistieken
-DolibarrWorkBoard=Actieoverzicht
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=Beschikbaar
 NotYetAvailable=Nog niet beschikbaar
 NotAvailable=Niet beschikbaar
@@ -434,7 +439,7 @@ Reportings=Rapportage
 Draft=Concept
 Drafts=Concepten
 Validated=Gevalideerd
-Opened=Geopend
+Opened=Open
 New=Nieuw
 Discount=Korting
 Unknown=Onbekend
@@ -453,6 +458,7 @@ NextStep=Volgende stap
 Datas=Gegevens
 None=Geen
 NoneF=Geen
+NoneOrSeveral=None or several
 Late=Vertraagd
 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.
 Photo=Afbeelding
@@ -606,7 +612,8 @@ PartialWoman=Gedeeltelijke
 TotalWoman=Totaal
 NeverReceived=Nooit ontvangen
 Canceled=Geannuleerd
-YouCanChangeValuesForThisListFromDictionarySetup=U kunt waarden voor deze lijst wijzigen via menu-instellingen - woordenboek
+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
 Color=Kleur
 Documents=Gekoppelde bestanden
@@ -642,6 +649,7 @@ FreeLineOfType=Vrije ingave van type
 CloneMainAttributes=Kloon het object met de belangrijkste kenmerken
 PDFMerge=Voeg PDF samen
 Merge=Samenvoegen
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Toon printervriendelijke pagina
 MenuManager=Standaard menuverwerker
 WarningYouAreInMaintenanceMode=Let op, u bevind zich in de onderhoudmodus, dus alleen de login <b>%s</b> is gemachtigd om de applicatie op dit moment te gebruiken.
@@ -708,6 +716,7 @@ from=van
 toward=richting
 Access=Toegang
 SelectAction=Select action
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Gebruik Ctrl + C om te kopiëren naar het klembord
 SaveUploadedFileWithMask=Sla het bestand op de server met de naam "<strong>%s</strong>" (anders "%s")
 OriginFileName=Oorspronkelijke bestandsnaam
@@ -718,7 +727,7 @@ ViewPrivateNote=Notities bekijken
 XMoreLines=%s regel(s) verborgen
 PublicUrl=Openbare URL
 AddBox=Box toevoegen
-SelectElementAndClickRefresh=Selecteer een element en klik op nernieuwen
+SelectElementAndClick=Select an element and click %s
 PrintFile=Bestand afdrukken %s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Ga naar Home - Setup - Bedrijf om logo te wijzigen of ga naar Home - Instellingen - Scherm om te verbergen.
@@ -734,8 +743,8 @@ Hello=Hallo
 Sincerely=Oprecht
 DeleteLine=Verwijderen regel
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
@@ -755,11 +764,20 @@ Calendar=Kalender
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Boekjaar
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Maandag
 Tuesday=Dinsdag
@@ -817,5 +835,3 @@ SearchIntoContracts=Contracten
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Onkostennota's 
 SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/nl_NL/other.lang b/htdocs/langs/nl_NL/other.lang
index 4b4627f0eac..399d30b445d 100644
--- a/htdocs/langs/nl_NL/other.lang
+++ b/htdocs/langs/nl_NL/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=Geboortedatum
 BirthdayAlertOn=Verjaardagskennisgeving actief
 BirthdayAlertOff=Verjaardagskennisgeving inactief
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=Interventie gevalideerd
 Notify_FICHINTER_SENTBYMAIL=Interventie via mail verzonden
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=Dit is een <b>test</b> e-mail (het woord test moet vetged
 PredefinedMailContentSendInvoice=Geachte __CONTACTCIVNAME__,\n\nGraag verwijzen wij u naar de bijlage van dit e-mail bericht, hierin treft u onze factuur met nummer __REF__ aan. Het PDF-bestand in de bijlage kunt u openen met Adobe Reader.\nMet vriendelijke groeten,
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__Hierbij sturen wij u de offerte __PROPREF__\n\n__PERSONALIZED__Met vriendelijke groeten,\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__ Hierbij sturen wij u de opdracht __ORDERREF__ __PERSONALIZED__Met vriendelijke groeten, __SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ Hierbij sturen wij u de opdracht __ORDERREF__ __PERSONALIZED__Met vriendelijke groeten, __SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ Hierbij sturen wij u de factuur __FACREF__ __PERSONALIZED__Met vriendelijke groeten, __SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__ Hier vindt u de verzendkosten __SHIPPINGREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__ Hier vindt u de tussenkomst __FICHINTERREF__ __PERSONALIZED__Sincerely __SIGNATURE_
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=Prof. id <b>%s</b> is een gegeven afhankelijk van het land.<br>Voor land <b>%s</b>, is de code bijvoorbeeld <b>%s</b>.
 DolibarrDemo=Dolibarr ERP / CRM demonstratie
-StatsByNumberOfUnits=Statistieken van het aantal producten / diensten
-StatsByNumberOfEntities=Statistieken van het aantal verwijzende eenheden
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=De interventie %s is gevalideerd
 EMailTextInvoiceValidated=De factuur %s is gevalideerd
diff --git a/htdocs/langs/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang
index 1279279b1d3..6f999eac8eb 100644
--- a/htdocs/langs/nl_NL/projects.lang
+++ b/htdocs/langs/nl_NL/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Iedereen
 PrivateProject=Projectcontacten
+ProjectsImContactFor=Projects I'm explicitely a contact of
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=Alle projecten
 MyProjectsDesc=Deze weergave is beperkt tot projecten waarvoor u een contactpersoon bent (ongeacht het type).
 ProjectsPublicDesc=Deze weergave toont alle projecten waarvoor u gerechtigd bent deze in te zien.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=Deze weergave toont alle projecten en taken (Uw gebruikersrechten staa
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=Nieuw project
 AddProject=Nieuw project
 DeleteAProject=Project verwijderen
 DeleteATask=Taak verwijderen
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Opened projects
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Toon project
 SetProject=Stel project in
 NoProject=Geen enkel project gedefinieerd of in eigendom
 NbOfProjects=Aantal projecten
+NbOfTasks=Nb of tasks
 TimeSpent=Bestede tijd
 TimeSpentByYou=Uw tijdsbesteding
 TimeSpentByUser=Gebruikers tijdsbesteding
@@ -47,9 +52,9 @@ TaskTimeSpent=Tijd besteed aan taken
 TaskTimeUser=Gebruiker
 TaskTimeNote=Notitie
 TaskTimeDate=Datum
-TasksOnOpenedProject=Taken op geopende projecten
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload niet gedefinieerd
-NewTimeSpent=Nieuwe bestede tijd
+NewTimeSpent=Bestede tijd
 MyTimeSpent=Mijn bestede tijd
 Tasks=Taken
 Task=Taak
@@ -59,6 +64,7 @@ TaskDescription=Taakomschrijving
 NewTask=Nieuwe taak
 AddTask=Nieuwe taak
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Activiteit
 Activities=Taken / activiteiten
 MyActivities=Mijn taken / activiteiten
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Lijst van aan het project verbonden contracten
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=Lijst van aan het project verbonden interventies
 ListExpenseReportsAssociatedProject=Lijst van onkostennota's in verband met het project
 ListDonationsAssociatedProject=Lijst van donaties in verband met het project
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Projectcontacten
 ActionsOnProject=Acties in het project
 YouAreNotContactOfProject=U bent geen contactpersoon van dit privé project
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Verwijder gespendeerde tijd
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=Bekijk ook taken niet aan mij toegewezen
@@ -110,7 +118,7 @@ TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projecten gewijd aan deze derde partij
 NoTasks=Geen taken voor dit project
 LinkedToAnotherCompany=Gekoppeld aan een andere derde partij
-TaskIsNotAffectedToYou=Taak niet aan u toegewezen
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=Gespendeerde tijd is leeg
 ThisWillAlsoRemoveTasks=Deze actie zal ook alle taken van het project <b>(%s</b> taken op het moment) en alle ingangen van de tijd doorgebracht.
 IfNeedToUseOhterObjectKeepEmpty=Als sommige objecten (factuur, order, ...), die behoren tot een andere derde, moet worden gekoppeld aan het project te maken, houden deze leeg naar het project dat met meerdere derden.
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per dag
 InputPerWeek=Input per week
 InputPerAction=Input per actie
-TimeAlreadyRecorded=Tijd besteed reeds opgenomen voor deze taak / dag en gebruiker %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
 ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/pl_PL/accountancy.lang b/htdocs/langs/pl_PL/accountancy.lang
index 21ed2c370e3..52677424e4e 100644
--- a/htdocs/langs/pl_PL/accountancy.lang
+++ b/htdocs/langs/pl_PL/accountancy.lang
@@ -21,32 +21,36 @@ JournalFinancial=Dzienniki finansowe
 BackToChartofaccounts=Powrót planu kont
 Chartofaccounts=Plan kont
 CurrentDedicatedAccountingAccount=Current dedicated account
-AssignDedicatedAccountingAccount=New account to assign
+AssignDedicatedAccountingAccount=Nowe konto do przypisania
 InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
-AccountancyArea=Accountancy area
+AccountancyArea=Obszar księgowości
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=Następujące akcje są wykonywane zwykle tylko raz lub raz w roku...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=Następujące akcje są wykonywane zwykle każdego miesiąca, tygodnia lub dnia dla naprawdę wielkich firm...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=Dodaj konto księgowe
 AccountAccounting=Konto księgowe
 AccountAccountingShort=Konto
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -64,16 +72,16 @@ MenuTaxAccounts=Tax accounts
 MenuExpenseReportAccounts=Expense report accounts
 MenuLoanAccounts=Loan accounts
 MenuProductsAccounts=Product accounts
-ProductsBinding=Products accounts
+ProductsBinding=Konta produktów
 Ventilation=Binding to accounts
 CustomersVentilation=Powiązania do faktury klienta
 SuppliersVentilation=Powiązania do faktury dostawcy
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Utwórz nową transakcję
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=Księga główna
-AccountBalance=Account balance
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
+AccountBalance=Bilans konta
 
 CAHTF=Total sprzedaży dostawcy przed opodatkowaniem
 TotalExpenseReport=Total expense report
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Długość kont księgowych kontrahenta
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Dziennik sprzedaży
@@ -114,9 +122,9 @@ ACCOUNTING_MISCELLANEOUS_JOURNAL=Dziennik różnic
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Dziennik raportów kosztowych
 ACCOUNTING_SOCIAL_JOURNAL=Czasopismo Społecznego
 
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
-ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
-DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Konto księgowe dla przelewów
+ACCOUNTING_ACCOUNT_SUSPENSE=Konto księgowe dla oczekujących
+DONATION_ACCOUNTINGACCOUNT=Konto księgowe dla zarejestrowanych dotatcji
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
@@ -132,21 +140,21 @@ Sens=Sens
 Codejournal=Dziennik
 NumPiece=ilość sztuk
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Dziennik finansów
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Dziennik finansów zawiera wszystkie typy płatności wykonane przez konto bankowe
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
-VATAccountNotDefined=Account for VAT not defined
-ThirdpartyAccountNotDefined=Account for third party not defined
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
+VATAccountNotDefined=Konto dla niezdefiniowanego VATu
+ThirdpartyAccountNotDefined=Konto dla niezdefiniowanego kontrahenta
 ProductAccountNotDefined=Account for product not defined
 FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Account for bank not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=Nowa transakcja
 NumMvts=Numero of transaction
 ListeMvts=Lista ruchów
 ErrorDebitCredit=Debetowych i kredytowych nie może mieć wartość w tym samym czasie
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=Lista kont kontrahentów
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=Lista kont księgowych
 
 Pcgtype=Klasa konta
-Pcgsubtype=W ramach klasy uwagę
+Pcgsubtype=Subclass of account
 
 TotalVente=Łączny obrót przed opodatkowaniem
 TotalMarge=Całkowita marża sprzedaży
@@ -171,7 +179,7 @@ DescVentilCustomer=Consult here the list of customer invoice lines bound (or not
 DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
 DescVentilTodoCustomer=Powiąż pozycje faktury aktualnie nie związane  z kontem księgowym produktu
-ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
+ChangeAccount=Zmień konto księgowe dla zaznaczonych produktów/usług na następujące konto księgowe:
 Vide=-
 DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
 DescVentilDoneSupplier=Skonsultuj się tutaj listę linii dostawcy faktur i ich koncie księgowym
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Błąd, nie można usunąc tego konta księgowego, ponieważ jest w użyciu
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=Brak zapisanych nowych rekordów
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Kod
+Nature=Natura
+AccountingJournalType1=Various operation
+AccountingJournalType2=Sprzedaż
+AccountingJournalType3=Zakupy
+AccountingJournalType4=Bank
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Eksporty
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index ee430d88d8d..e3cd4ac1dea 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -28,7 +28,7 @@ SessionId=ID sesji
 SessionSaveHandler=Asystent zapisu sesji
 SessionSavePath=Lokalizacja sesji danych
 PurgeSessions=Czyszczenie sesji
-ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
+ConfirmPurgeSessions=Czy na pewno chcesz usunąć wszystkie sesje? Spowoduje to odłączenie każdego użytkownika (oprócz ciebie).
 NoSessionListWithThisHandler=Asystent zapisu sesji skonfigurowany w PHP nie zezwala na wyświetlenie wszystkich aktywnych sesji.
 LockNewSessions=Zablokuj nowe połączenia
 ConfirmLockNewSessions=Czy na pewno chcesz ograniczyć wszelkie nowe połączenie Dolibarr do siebie. Tylko <b>%s</b> użytkownik będzie mógł się połączyć po tym.
@@ -48,6 +48,7 @@ InternalUsers=Wewnętrzni użytkownicy
 ExternalUsers=Zewnetrzni użytkownicy
 GUISetup=Wyświetlanie
 SetupArea=Dział konfiguracji
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Formularz do wysyłania pliku testowego (według konfiguracji)
 IfModuleEnabled=Uwaga: tak jest skuteczne tylko wtedy, gdy <b>moduł %s</b> jest aktywny
 RemoveLock=Usuń <b>plik %s,</b> jeśli istnieje, aby umożliwić aktualizację narzędzia.
@@ -64,8 +65,8 @@ ErrorCodeCantContainZero=Kod nie może zawierać wartości "0"
 DisableJavascript=Wyłącz funkcje JavaScript i Ajax (rekomendowane dla osób niewidomych oraz przeglądarek tekstowych)
 UseSearchToSelectCompanyTooltip=Także jeśli masz dużą liczbę osób trzecich (> 100 000), można zwiększyć prędkość przez ustawienie stałej COMPANY_DONOTSEARCH_ANYWHERE do 1 w Setup-> Inne. Szukaj zostaną ograniczone do początku łańcucha.
 UseSearchToSelectContactTooltip=Także jeśli masz dużą liczbę osób trzecich (> 100 000), można zwiększyć prędkość przez ustawienie stałej CONTACT_DONOTSEARCH_ANYWHERE do 1 w Setup-> Inne. Szukaj zostaną ograniczone do początku łańcucha.
-DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties, but it is less convenient)
-DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact, but it is less convenient)
+DelaiedFullListToSelectCompany=Poczekaj  na kliknięcia na przycisk przed załadowaniem zawartości do listy kontrahentów (opcja może zwiększyć wydajność jeżeli masz dużą ilość kontrahentów, ale zmniejszy wygodę użytkowania)
+DelaiedFullListToSelectContact=Poczekaj  na kliknięcia na przycisk przed załadowaniem zawartości do listy kontaktów (opcja może zwiększyć wydajność jeżeli masz dużą ilość kontrahentów, ale zmniejszy wygodę użytkowania)
 NumberOfKeyToSearch=Liczba znaków do wyszukiwania: %s
 NotAvailableWhenAjaxDisabled=Niedostępne kiedy Ajax nie działa
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
@@ -85,7 +86,7 @@ Mask=Maska
 NextValue=Następna wartość
 NextValueForInvoices=Następna wartość (faktury)
 NextValueForCreditNotes=Następna wartość (not kredytowych)
-NextValueForDeposit=Następny wartości (depozyt)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Następna wartość (zamienniki)
 MustBeLowerThanPHPLimit=Uwaga: twoj PHP ogranicza rozmiar każdego uploadowanego pliku do <b>%s</b> %s, niezależnie od wartości tego parametru
 NoMaxSizeByPHPLimit=Uwaga: Brak ustawionego limitu w twojej konfiguracji PHP
@@ -97,13 +98,13 @@ AntiVirusParam= Więcej parametrów w linii poleceń
 AntiVirusParamExample= Przykład dla ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Konfiguracja modułu rachunkowości
 UserSetup=Zarządzanie konfiguracją użytkowników
-MultiCurrencySetup=Multi-currency setup
+MultiCurrencySetup=Konfiguracja multi-walut
 MenuLimits=Granice i dokładność
 MenuIdParent=ID Rodzica menu
 DetailMenuIdParent=ID menu rodzica (pusty dla górnego menu)
 DetailPosition=Sortuj numer do zdefiniowania pozycji menu
 AllMenus=Wszyscy
-NotConfigured=Moduł nie skonfigurowano
+NotConfigured=Module/Application not configured
 Active=Aktywne
 SetupShort=Konfiguracja
 OtherOptions=Inne opcje
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Separator tysięczny
 Destination=Miejsce przeznaczenia
 IdModule=Identyfikator modułu
 IdPermissions=Uprawnienia ID
-Modules=Moduły
 LanguageBrowserParameter=Parametr %s
 LocalisationDolibarrParameters=Parametry lokalizacji
 ClientTZ=Strefa Czasowa Klienta (użytkownik)
@@ -123,14 +123,15 @@ PHPTZ=Strefa czasowa serwera PHP
 DaylingSavingTime=Czas letni (użytkownik)
 CurrentHour=Aktualna godzina
 CurrentSessionTimeOut=Obecna sesja wygasła
-YouCanEditPHPTZ=Aby ustawić inną strefę czasową PHP (nie jest wymagany), można spróbować dodać .htacces plików z linii jak ten "Setenv TZ Europe / Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widżet
 Boxes=Widżety
 MaxNbOfLinesForBoxes=Maks. ilość linii dla widgetów
 PositionByDefault=Domyślny porządek
 Position=Pozycja
 MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
-MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br />Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
+MenusEditorDesc=Edytor menu pozwala CI na ustawienie własnych pozycji w menu. Używaj go ostrożnie, aby zapobiec destabilizacji i całkowitej niedostępności pozycji menu.<br />Niektóre moduły i pozycje menu (w menu <b>Wszystkie</b> w większości). jeżeli usuniesz niektóe z tych pozycji przez pomyłkę, możesz je przywrócić wyłączając i ponownie włączając moduł.
 MenuForUsers=Menu dla użytkowników
 LangFile=Plik. Lang
 System=System
@@ -141,13 +142,13 @@ Purge=Czyszczenie
 PurgeAreaDesc=Ta strona pozwala Ci na usunięcie wszystkich plików wygenerowanych lub zapisanych przesz Dolibarr (tymczasowe pliki lub wszystkie pliki w folderze <b>%s</b>). Używanie tej opcji nie jest konieczne. Opcja ta jest dostarczana jako obejście dla użytkowników, których Dolibarr jest obsługiwany przez operatora, który nie oferuje możliwości usuwania plików generowanych przez serwer WWW.
 PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk of losing data)
 PurgeDeleteTemporaryFiles=Usuń wszystkie pliki tymczasowe (nie utracisz danych)
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFilesShort=Usuń pliki tymczasowe
 PurgeDeleteAllFilesInDocumentsDir=Usuń wszystkie pliki w <b>katalogu %s.</b> Pliki tymczasowe, jak również kopie zapasowe baz danych oraz pliki dołączone do elementów (kontrahencji, faktury ...) i przesłane do modułu ECM zostaną usunięte.
 PurgeRunNow=Czyść teraz
 PurgeNothingToDelete=Brak katalogu lub plików do usunięcia.
 PurgeNDirectoriesDeleted=<b> %s</b> pliki lub katalogi usunięte.
 PurgeAuditEvents=Czyść wszystkie wydarzenia
-ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
+ConfirmPurgeAuditEvents=Czy jesteś pewien, że chcesz usunąć wszystkie zdarzenia związane z bezpieczeństwem? Wszystkie logo związane z bezpieczeństwem zostaną usunięte. Inne dane nie zostaną usunięte. 
 GenerateBackup=Generowanie kopii zapasowej
 Backup=Kopia zapasowa
 Restore=Przywróć
@@ -189,14 +190,14 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Uprawnienia
 BoxesDesc=Widgety są komponentami pokazującymi pewne informacje, które możesz dodać w celu spersonalizowania niektórych stron. Możesz wybrać pomiędzy pokazaniem wigetu lub nie poprzez wybranie docelowej strony i kliknięcie "Aktywacja", lub poprzez kliknięcie na kosz w celu wyłączenia go.
 OnlyActiveElementsAreShown=Tylko elementy z <a href="%s">aktywnych modułów</a> są widoczne.
-ModulesDesc=Moduły Dolibarr określają funkcjonalności które są włączone w oprogramowaniu. Niektóre moduły wymagają pozwoleń, które musisz przyznać użytkownikom po włączeniu modułu. Kliknij na przycisk on/off w celu włączenia modułu.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=Możesz znaleźć więcej modułów do pobrania na zewnętrznych stronach internetowych...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external modules...
+ModulesMarketPlaces=Znajdź dodatkowe moduły...
 GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, oficjalny kanał dystrybucji zewnętrznych modułów Dolibarr ERP / CRM
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
-WebSiteDesc=Reference websites to find more modules...
+WebSiteDesc=Powiązane strony z modułami...
 URL=Łącze
 BoxesAvailable=Dostępne widgety
 BoxesActivated=Widgets activated
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Hasło bazy danych zakodowane w conf.php
 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=Ochrona generowanych plików PDF (Aktywowany nie jest zalecany, przerwa masowe generowanie plików pdf)
-ProtectAndEncryptPdfFilesDesc=Ochrona dokument PDF udostępnia go do odczytu i druku z wykorzystaniem dowolnej przeglądarki plików PDF. Jednakże, edycja i kopiowanie nie jest już możliwe. Należy pamiętać, że korzystając z tej funkcji, budowa globalnego,  skumulowanego pliku PDF nie jest możliwa (np. zestawienie niezapłaconych faktur).
+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=Funkcja
 DolibarrLicense=Licencja
 Developpers=Programiści / Współpracownicy
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr online demo
 OfficialMarketPlace=Oficjalne miejsce dystrybucji zewnętrznych modułów / dodatków
 OfficialWebHostingService=Opisywane usługi hostingowe (Cloud hosting)
 ReferencedPreferredPartners=Preferowani Partnerzy
-OtherResources=Zasoby autres
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=Aby zapoznać się z dokumentacją użytkownika lub dewelopera (Doc, FAQ ...), <br> zajrzyj do Dolibarr Wiki: <br> <a href="%s" target="_blank"><b> %s</b></a>
 ForAnswersSeeForum=Aby znaleźć odpowiedzi na pytania / uzyskać dodatkową pomoc, możesz skorzystać z  forum Dolibarr : <br> <a href="%s" target="_blank"><b> %s</b></a>
 HelpCenterDesc1=Obszar ten może pomóc w uzyskaniu wsparcia dla usługi Dolibarr.
@@ -256,7 +259,7 @@ MAIN_MAIL_SENDMODE=Metoda używana do wysłania E-maili
 MAIN_MAIL_SMTPS_ID=Identyfikator SMTP, jeżeli wymaga uwierzytelniania
 MAIN_MAIL_SMTPS_PW=Hasło SMTP , jeżeli wymagane uwierzytelniania
 MAIN_MAIL_EMAIL_TLS= Użyj szyfrowania TLS (SSL)
-MAIN_MAIL_EMAIL_STARTTLS= Use TLS (STARTTLS) encrypt
+MAIN_MAIL_EMAIL_STARTTLS= Użyj szyfrowania TLS (STARTTLS)
 MAIN_DISABLE_ALL_SMS=Wyłącz wysyłanie wszystkich SMS (do celów badawczych lub testowych)
 MAIN_SMS_SENDMODE=Metoda służy do wysyłania wiadomości SMS
 MAIN_MAIL_SMS_FROM=Nadawca domyślny numer telefonu wysyłaniu SMS-ów
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=Cechy te nie są dostępne w systemach Unix, takich j
 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/
 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=Moduł konfiguracji
-ModulesSetup=Moduły konfiguracji
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Zarządzanie relacjami z klientem (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=Aktualna wersja Dolibarr
 CallUpdatePage=Przejdź na stronę, która pomoże w zaktualizować strukturę bazy danych i dane: %s.
 LastStableVersion=Ostatnia stabilna wersja
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Aktualizacja serwera nieaktywny
+WithCounter=Manage a counter
 GenericMaskCodes=Można wpisać dowolną maskę numeracji. W tej masce, może stosować następujące tagi: <br> <b>{000000}</b> odpowiada liczbie, która jest zwiększona w każdym% s. Wprowadzić dowolną liczbę zer jako żądaną długość licznika. Licznik zostaną zakończone zerami z lewej, aby mieć jak najwięcej zer jak maski. <br> <b>{000000 + 000}</b> sama jak poprzednia, ale przesunięciem odpowiadającym numerem, na prawo od znaku + odnosi się począwszy od pierwszego% s. <br> <b>{000000} @ x,</b> ale sama jak poprzednia licznik jest wyzerowany, gdy miesiąc osiągnięciu x (x od 1 do 12 lub ​​0 do korzystania pierwszych miesiącach roku podatkowego określone w konfiguracji, lub 99 do wyzerowany co miesiąc ). Jeśli opcja ta jest używana, a x jest 2 lub więcej, wymagana jest również to ciąg {rr} {mm} lub {rrrr} {mm}. <br> <b>{Dd}</b> dni (01 do 31). <br> <b>{Mm}</b> miesięcy (01 do 12). <br> <b>{Rr}, {rrrr}</b> lub <b>{r}</b> roku ponad 2, 4 lub 1 liczb. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Wszystkie inne znaki w masce pozostaną nienaruszone. <br> Spacje są niedozwolone. <br>
-GenericMaskCodes4a=<u>Przykład na 99-cie %s strony trzeciej TheCompany utworzony 2007-01-31:</u> <br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Przykład kontrahenta utworzonego w dniu 2007-03-01:</u> <br>
 GenericMaskCodes4c=<u>Przykład produktu utworzony 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> wygeneruje <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> wygeneruje <b>0199-ZZZ/31/XXX</b>
+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=Zwraca numer wysyłki zgodnie z zdefiniowaną maską
 ServerAvailableOnIPOrPort=Serwer dostępny jest pod <b>adresem %s</b> na <b>porcie %s</b>
 ServerNotAvailableOnIPOrPort=Serwer nie jest dostępna pod <b>adresem %s</b> na <b>porcie %s</b>
@@ -351,14 +357,14 @@ PDFAddressForging=Zasady złączania pól adresowych
 HideAnyVATInformationOnPDF=Ukryj wszystkie informacje dotyczące podatku VAT w wygenerowanym pliku PDF
 HideDescOnPDF=Ukryj opis produktów w wygenerowanych plikach PDF
 HideRefOnPDF=Ukryj numer referencyjny produktów w generowanych plikach PDF
-HideDetailsOnPDF=Hide product lines details on generated PDF
+HideDetailsOnPDF=Ukryj linię z szczegółami produktu w generowanym pliku PDF
 PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
 Library=Biblioteka
 UrlGenerationParameters=Parametry do zabezpiecznie adresu URL
 SecurityTokenIsUnique=Użyj unikalnego klucza zabezpieczeń dla każdego adresu
 EnterRefToBuildUrl=Wprowadź odwołanie do obiektu %s
 GetSecuredUrl=Pobierz obliczony adres URL
-ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Ukryj przyciski dla użytkowników nie będących administratorami zamiast pokazywać szare wyłączone przyciski
 OldVATRates=Poprzednia stawka VAT
 NewVATRates=Nowa stawka VAT
 PriceBaseTypeToChange=Zmiana dla cen opartych na wartości referencyjnej ustalonej na
@@ -369,19 +375,21 @@ Int=Liczba całkowita
 Float=Liczba zmiennoprzecinkowa
 DateAndTime=Data i godzina
 Unique=Unikalny
-Boolean=Typ logiczny (pole wyboru)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Telefon
 ExtrafieldPrice = Cena
 ExtrafieldMail = Adres e-mail
 ExtrafieldUrl = Url
 ExtrafieldSelect = Wybierz listę
 ExtrafieldSelectList = Wybierz z tabeli
-ExtrafieldSeparator=Separator
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Hasło
-ExtrafieldCheckBox=Pole wyboru
-ExtrafieldRadio=Przełącznik
-ExtrafieldCheckBoxFromList= Pole z tabeli
+ExtrafieldRadio=Radio buttons (on choice only)
+ExtrafieldCheckBox=Checkboxes
+ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link do obiektu
+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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parametry lista musi tak być, wartość klucza <br><br> Na przykład: <br> 1, wartosc1 <br> 2, wartość2 <br> 3, wartość3 <br> ...
 ExtrafieldParamHelpradio=Parametry lista musi tak być, wartość klucza <br><br> Na przykład: <br> 1, wartosc1 <br> 2, wartość2 <br> 3, wartość3 <br> ...
@@ -397,7 +405,7 @@ RefreshPhoneLink=Odśwież link
 LinkToTest=Klikalny link wygenerowany dla <strong>użytkownika% s</strong> (kliknij numer telefonu, aby sprawdzić)
 KeepEmptyToUseDefault=Zostaw puste by używać domyślnych wartości
 DefaultLink=Domyślny link
-SetAsDefault=Set as default
+SetAsDefault=Ustaw jako domyślny
 ValueOverwrittenByUserSetup=Uwaga, ta wartość może być zastąpiona przez specyficzną konfiguracją użytkownika (każdy użytkownik może ustawić własny clicktodial url)
 ExternalModule=Moduł zewnętrzny - Zainstalowane w katalogu% s
 BarcodeInitForThirdparties=Masowa inicjalizacja kodów kreskowych dla kontrahentów
@@ -405,15 +413,15 @@ BarcodeInitForProductsOrServices=Masowe generowanie kodów lub reset kodów kres
 CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
 InitEmptyBarCode=Generuj wartość dla kolejnych %s pustych wpisów
 EraseAllCurrentBarCode=Usuń wszystkie aktualne kody kreskowe
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
-AllBarcodeReset=Wszystkie wartości zostały usunięte z kodem kreskowym
+ConfirmEraseAllCurrentBarCode=Jesteś pewien, że chcesz usunąć wszystkie aktualne wartości kodów kreskowych?
+AllBarcodeReset=Wszystkie wartości kodów kreskowych zostały usunięte
 NoBarcodeNumberingTemplateDefined=Nie szablonu numeracji kodów kreskowych włączona w konfiguracji modułu kodów kreskowych.
 EnableFileCache=Włącz cache plików
-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).
+ShowDetailsInPDFPageFoot=Dodaj więcej szczegółów w stopce dokumentów PDF takich jak adres twojej firmy lub dane menadżerów (w celu dodatnia numeru REGON, kapitału zakładowego i numeru NIP)
 NoDetails=No more details in footer
-DisplayCompanyInfo=Display company address
+DisplayCompanyInfo=Wyświetl adres firmy
 DisplayCompanyManagers=Display manager names
-DisplayCompanyInfoAndManagers=Display company address and manager names
+DisplayCompanyInfoAndManagers=Wyświetl adres firmy i dane menadżerów
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Zwrócić rachunkowych kod zbudowany przez %s, a następnie trzeciej dostawcy kod dostawcy rachunkowych kod i %s, a następnie trzeciej klienta kodu dla klienta rachunkowych kodu.
 ModuleCompanyCodePanicum=Wróć pusty rachunkowych kodu.
@@ -422,9 +430,23 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Pole
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Użytkownicy i grupy
-Module0Desc=Users / Employees and Groups management
+Module0Desc=Zarządzanie Użytkownikami/Pracownikami i Grupami
 Module1Name=Kontrahenci
 Module1Desc=Zarządzanie firmami oraz kontaktami (klienci, prospekty...)
 Module2Name=Reklama
@@ -444,7 +466,7 @@ Module30Desc=Zarządzanie fakturami oraz notami kredytowymi klientów. Zarządza
 Module40Name=Dostawcy
 Module40Desc=Zarządzanie dostawcami oraz zakupami (zamówienia i faktury)
 Module42Name=Syslog
-Module42Desc=Rejestrowanie urządzenia (syslog)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Edytory
 Module49Desc=Zarządzanie edytorem
 Module50Name=Produkty
@@ -499,8 +521,8 @@ Module410Name=Webcalendar
 Module410Desc=Integracja Webcalendar
 Module500Name=Special expenses
 Module500Desc=Zarządzanie kosztami specjalnymi (podatki, opłaty ZUS, dywidendy)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Pożyczka
 Module520Desc=Zarządzanie kredytów
 Module600Name=Powiadomienia
@@ -520,12 +542,12 @@ Module1520Desc=Dokument poczty masowej generacji
 Module1780Name=Tagi / Kategorie
 Module1780Desc=Tworzenie tagów / kategorii (produktów, klientów, dostawców, kontaktów lub członków)
 Module2000Name=Edytor WYSIWYG
-Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
+Module2000Desc=Pozwól na edycję niektórych pól tekstowych z użyciem zaawansowanego edytora (bazującego na CKEditor)
 Module2200Name=Dynamiczne Ceny
 Module2200Desc=Włącz użycie wyrażeń matematycznych dla cen
 Module2300Name=Cron
 Module2300Desc=Zaplanowane zarządzanie zadaniami
-Module2400Name=Events/Agenda
+Module2400Name=Wydarzenia/Agenda
 Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
 Module2500Name=Zarządzanie zawartością elektroniczną (ECM)
 Module2500Desc=Zapisz i udostępnij dokumenty
@@ -542,13 +564,15 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=Możliwości konwersji GeoIP Maxmind
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=HR
-Module4000Desc=Zarządzanie zasobami ludzkimi
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Pozwala na zarządzanie wieloma firmami
 Module6000Name=Workflow
 Module6000Desc=Zarządzania przepływem pracy
-Module10000Name=Websites
+Module10000Name=Strony internetowe
 Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
 Module20000Name=Zarządzanie "Pozostaw Żądanie"
 Module20000Desc=Zadeklaruj oraz nadzoruj wnioski pracowników dotyczące wyjść z pracy
@@ -557,7 +581,7 @@ Module39000Desc=Partia lub numer seryjny, zarządzanie według daty ważności l
 Module50000Name=Paybox
 Module50000Desc=Moduł oferujący płatność online za pomocą karty kredytowej z Paybox
 Module50100Name=Punkt sprzedaży
-Module50100Desc=Point of sales module (POS).
+Module50100Desc=Punkty sprzedaży (POS)
 Module50200Name=Paypal
 Module50200Desc=Moduł oferujący płatność online za pomocą karty kredytowej z Paypal
 Module50400Name=Rachunkowość (zaawansowane)
@@ -591,10 +615,10 @@ Permission32=Tworzenie / modyfikacja produktów
 Permission34=Usuwanie produktów
 Permission36=Podejrzyj / zarządzaj ukrytymi produktami
 Permission38=Eksport produktów
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
+Permission42=Twórz/modyfikuj projekty (projekty udostępnione i projekty dla których jestem kontaktem). Można tworzyć zadania i przypisywać  użytkowników to projektów i zadań
 Permission44=Usuwanie projektów (projekty współdzielone oraz projekty, w których biorę udział)
-Permission45=Export projects
+Permission45=Eksportuj projekty
 Permission61=Czytaj interwencje
 Permission62=Tworzenie / modyfikacja interwencji
 Permission64=Usuwanie interwencji
@@ -648,7 +672,7 @@ Permission162=Tworzenie / modyfikacja umowy / subskrypcji
 Permission163=Aktywacja usługi / subskrypcji umowy
 Permission164=Wyłączanie usługi / subskrypcji umowy
 Permission165=Usuń umowy / subskrypcje
-Permission167=Export contracts
+Permission167=Eksportuj kontrakty
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Tworzenie / modyfikacja wyjazdów i kosztów
 Permission173=Usuń wyjazdy i wydatki
@@ -745,7 +769,7 @@ Permission701=Zobacz darowizny
 Permission702=Tworzenie / modyfikacja darowizn
 Permission703=Usuń darowizny
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Tworzenie / modyfikacja raportów wydatków
+Permission772=Tworzenie/modyfikacja raportów kosztów
 Permission773=Usuń raporty wydatków
 Permission774=Przeczytaj wszystkie raporty wydatków (nawet dla użytkowników nie podwładni)
 Permission775=Zatwierdzanie raportów wydatków
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Sposoby zamawiania
 DictionarySource=Pochodzenie wniosków / zleceń
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Modele dla planu kont
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Szablony wiadomości e-mail
 DictionaryUnits=Units
 DictionaryProspectStatus=Status możliwości
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Konfiguracja zapisana
+SetupNotSaved=Setup not saved
 BackToModuleList=Powrót do listy modułów
 BackToDictionaryList=Powrót do listy słowników
 VATManagement=Zarządzanie VAT
@@ -897,7 +923,7 @@ Offset=Offset
 AlwaysActive=Zawsze aktywne
 Upgrade=Uaktualnij
 MenuUpgrade=Uaktualnij / Rozszerz
-AddExtensionThemeModuleOrOther=Deploy/install external module
+AddExtensionThemeModuleOrOther=Wdrażaj/Instaluj dodatkowe moduły
 WebServer=Serwer sieciowy
 DocumentRootServer=Katalog główny serwera sieciowego
 DataRootServer=Katalogi plików danych
@@ -921,7 +947,7 @@ Host=Serwer
 DriverType=Typ sterownika
 SummarySystem=Podsumowanie informacji systemowych
 SummaryConst=Lista wszystkich parametrów konfiguracji Dolibarr
-MenuCompanySetup=Firma / Fundacja
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= Menedżer standardowego menu
 DefaultMenuSmartphoneManager=Menedżer menu Smartphona
 Skin=Skórka
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Domyślna maksymalna długość listy
 DefaultMaxSizeShortList=Domyślna maksymalna długość dla krótkiej listy (przykłado na karcie klienta)
 MessageOfDay=Wiadomość dnia
 MessageLogin=Wiadomość strona logowania
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Stały formularz wyszukiwania w lewym menu
 DefaultLanguage=Domyślny język do użytku (kod języka)
 EnableMultilangInterface=Włącz wielojęzyczny interfejs
 EnableShowLogo=Pokaż logo w menu po lewej stronie
-CompanyInfo=Informacja o firmie / fundacji
-CompanyIds=Tożsamości firmy / fundacji
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=Nazwa firmy
 CompanyAddress=Adres
 CompanyZip=Kod pocztowy
@@ -953,11 +981,11 @@ ShowBugTrackLink=Show link "<strong>%s</strong>"
 Alerts=Alarmy
 DelaysOfToleranceBeforeWarning=Tolerancja opóźnień przed ostrzeżeniem
 DelaysOfToleranceDesc=Ten ekran pozwala na określenie dopuszczalnego opóźnienia przed uruchomieniem alarmu na ekranie z pictogramami %s dla każdego opóźnionego elementu.
-Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned events (agenda events) not completed yet
+Delays_MAIN_DELAY_ACTIONS_TODO=Dopuszczalne opóźnienie (w dniach) przed alarmem o niezakończonych zaplanowanych wydarzeniach (wydarzeniach a agendzie)
 Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Delay tolerance (in days) before alert on project not closed in time
 Delays_MAIN_DELAY_TASKS_TODO=Delay tolerance (in days) before alert on planned tasks (project tasks) not completed yet
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on orders not processed yet
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on suppliers orders not processed yet
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Dopuszczalne opóźnienie (w dniach) przed alarmem o nieprzetworzonych zamówieniach
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Dopuszczalne opóźnienie (w dniach) przed alarmem o nieprzetworzonych zamówieniach dostawców
 Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Opóźnienie tolerancji (w dniach) przed wpisu w sprawie propozycji, aby zamknąć
 Delays_MAIN_DELAY_PROPALS_TO_BILL=Opóźnienie tolerancji (w dniach) przed wpisu na temat propozycji nie rozliczone
 Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerancja opóźnienia (liczba dni) przed wpisu na usługi, aby uaktywnić
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerancja opóźnienie (w dniach) przed wpisu na opó
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerancja opóźnienia (liczba dni) przed wpisu do deponowania czeków do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Opóźnienie tolerancji (w dniach) przed wpisu do zestawienia wydatków do zatwierdzenia
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Inne pozycje menu zarządzają opcjonalnymi parametrami.
 LogEvents=Zdarzenia audytu bezpieczeństwa
 Audit=Audyt
@@ -987,10 +1015,10 @@ BrowserOS=Przeglądarka OS
 ListOfSecurityEvents=Lista zdarzeń bezpieczeństwa Dolibarr
 SecurityEventsPurged=Zdarzenia dotyczące bezpieczeństwa oczyszczone
 LogEventDesc=Można włączyć dziennik Dolibarr bezpieczeństwa imprez tutaj. Administratorzy mogą wtedy zobaczyć jego zawartość za pomocą menu <b>Narzędzia systemowe - Audyt.</b> Ostrzeżenie: Funkcja ta może zużywają duże ilości danych w bazie danych.
-AreaForAdminOnly=Cechy te mogą być używane tylko przez <b>użytkowników na prawach administratora</b>.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System informacji jest różne informacje techniczne można uzyskać w trybie tylko do odczytu i widoczne tylko dla administratorów.
 SystemAreaForAdminOnly=Obszar ten jest dostępny tylko dla użytkowników na prawach administratora. Żadne z uprawnień Dolibarr nie zniesie tego ograniczenia.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+CompanyFundationDesc=Edytuj na tej stronie wszystkie znane Ci informacje na temat firmy lub fundacji (Aby to zrobić, kliknij na przycisk "Modyfikuj" lub "Zapisz" na dole strony)
 DisplayDesc=Możesz wybrać każdego z parametrów związanych z wyglądem i Dolibarr tutaj
 AvailableModules=Dostępne moduły
 ToActivateModule=Aby uaktywnić modules, przejdź na konfigurację Powierzchnia.
@@ -1005,7 +1033,7 @@ TriggerActiveAsModuleActive=Wyzwalacze w tym pliku są aktywne jako <b>modułu %
 GeneratedPasswordDesc=Określ tutaj reguły, które chcesz użyć do wygenerowania nowego hasła, jeśli zapyta się automatycznie wygenerowane hasło
 DictionaryDesc=Insert all reference data. You can add your values to the default.
 ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">check here</a>.
-MiscellaneousDesc=All other security related parameters are defined here.
+MiscellaneousDesc=Inne powiązane parametry bezpieczeństwa są zdefiniowane tutaj
 LimitsSetup=Ograniczenia / Precision konfiguracji
 LimitsDesc=Można określić limity, doprecyzowanie i optymalizacje stosowane przez Dolibarr tutaj
 MAIN_MAX_DECIMALS_UNIT=Max dziesiętnych na ceny jednostkowe
@@ -1048,7 +1076,7 @@ MAIN_PROXY_HOST=Imię i nazwisko / adres serwera proxy
 MAIN_PROXY_PORT=Port serwera proxy
 MAIN_PROXY_USER=Zaloguj się, aby korzystać z serwera proxy
 MAIN_PROXY_PASS=Hasło do korzystania z serwera proxy
-DefineHereComplementaryAttributes=Określ tutaj wszystkie ATUTY, nie są już dostępne domyślnie i że chcesz być obsługiwane przez %s.
+DefineHereComplementaryAttributes=Określ tutaj wszystkie atrybuty, nie są już dostępne domyślnie i że chcesz być obsługiwane przez %s.
 ExtraFields=Uzupełniające atrybuty
 ExtraFieldsLines=Atrybuty uzupełniające (linie)
 ExtraFieldsSupplierOrdersLines=(Linie uzupełniające atrybuty order)
@@ -1068,7 +1096,7 @@ SendmailOptionNotComplete=Uwaga, w niektórych systemach Linux, aby wysłać e-m
 PathToDocuments=Ścieżka do dokumentów
 PathDirectory=Katalog
 SendmailOptionMayHurtBuggedMTA=Funkcja wysłać maile za pomocą metody "PHP poczty bezpośredniej" wygeneruje wiadomości, że może nie być prawidłowo przeanalizowany przez niektórych otrzymujących serwerów pocztowych. Powoduje to, że niektóre maile nie mogą być odczytywane przez ludzi obsługiwanych przez te platformy podsłuchu. To przypadku niektórych dostawców internetowych (Ex: Pomarańczowy we Francji). To nie jest problem w Dolibarr, ani w PHP, ale na otrzymywanie serwera poczty. Możesz jednak dodać opcję MAIN_FIX_FOR_BUGGED_MTA do 1 w konfiguracji - inne zmodyfikować Dolibarr, aby tego uniknąć. Jednakże, mogą wystąpić problemy z innymi serwerami, które przestrzegają ściśle standardu SMTP. Inne rozwiązanie (zalecane) jest użycie metody "gniazdo SMTP biblioteki", który nie ma wad.
-TranslationSetup=Setup of translation
+TranslationSetup=Ustawienia tłumaczenia
 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: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists in any language files
+TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Musisz przynajmniej umożliwić 1 moduł
 ClassNotFoundIntoPathWarning=Klasa% s nie znaleziono na drodze PHP
 YesInSummer=Tak w lecie
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Przechowywania sesji szyfrowane Suhosin
 ConditionIsCurrently=Stan jest obecnie% s
 YouUseBestDriver=Za pomocą sterownika% s, który jest najlepszym kierowcą dostępne obecnie.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Profesjonalny Identyfikator unikalny
 MustBeUnique=Musi być unikatowy?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Wywóz <b>link %s</b> format jest dostępny na poniższy link: %s
 ##### Invoices #####
 BillsSetup=Konfiguracja modułu faktur
 BillsNumberingModule=Faktur i not kredytowych numeracji modułu
 BillsPDFModules=Faktura dokumentów modele
+PaymentsPDFModules=Payment documents models
 CreditNote=Nota kredytowa
 CreditNotes=Not kredytowych
 ForceInvoiceDate=Siły daty wystawienia faktury do walidacji daty
@@ -1181,8 +1212,8 @@ WatermarkOnDraftInterventionCards=Znak wodny na dokumentach kart interwencji (br
 ContractsSetup=Kontrakty / konfiguracji modułu Subskrybcje
 ContractsNumberingModules=Kontrakty numerowania modułów
 TemplatePDFContracts=Kontrakty modele dokumenty
-FreeLegalTextOnContracts=Wolny tekst na kontraktach
-WatermarkOnDraftContractCards=Znak wodny w sprawie projektów umów (brak jeśli pusty)
+FreeLegalTextOnContracts=Dowolny tekst na kontraktach
+WatermarkOnDraftContractCards=Znak wodny w szkicach projektów (brak jeśli pusty)
 ##### Members #####
 MembersSetup=Członkowie konfiguracji modułu
 MemberMainOptions=Główne opcje
@@ -1200,7 +1231,7 @@ LDAPSynchronization=LDAP synchronizacji
 LDAPFunctionsNotAvailableOnPHP=LDAP funkcje nie są availbale w PHP
 LDAPToDolibarr=LDAP -> Dolibarr
 DolibarrToLDAP=Dolibarr -> LDAP
-LDAPNamingAttribute=Wpisz LDAP
+LDAPNamingAttribute=Klucz LDAP
 LDAPSynchronizeUsers=Synchronizacja Dolibarr użytkowników LDAP
 LDAPSynchronizeGroups=Synchronizacja Dolibarr grup LDAP
 LDAPSynchronizeContacts=Synchronizacja kontaktów z Dolibarr LDAP
@@ -1225,9 +1256,9 @@ LDAPServerDnExample=Complete DN (ex: dc=company,dc=Kompletny DN (dawniej: dc= fi
 LDAPDnSynchroActive=Użytkownicy i grupy synchronizacji
 LDAPDnSynchroActiveExample=LDAP do Dolibarr lub Dolibarr do synchronizacji LDAP
 LDAPDnContactActive=Kontakty 'synchronizacji
-LDAPDnContactActiveExample=Aktywowany / Unactivated synchronizacji
+LDAPDnContactActiveExample=Aktywuj/Dezaktywuj synchronizację
 LDAPDnMemberActive=Posłów synchronizacji
-LDAPDnMemberActiveExample=Aktywowany / Unactivated synchronizacji
+LDAPDnMemberActiveExample=Aktywuj/Dezaktywuj synchronizację
 LDAPContactDn=Dolibarr kontaktów "DN
 LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=society,dc=Kompletny DN (dawniej: ou= Kontakty, DC= społeczeństwa, dc= com)
 LDAPMemberDn=Dolibarr członków DN
@@ -1305,7 +1336,7 @@ LDAPFieldEndLastSubscription=Data zakończenia subskrypcji
 LDAPFieldTitle=Job position
 LDAPFieldTitleExample=Przykład: tytuł
 LDAPSetupNotComplete=LDAP konfiguracji nie są kompletne (przejdź na innych kartach)
-LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Nr hasło administratora lub przewidziane. LDAP dostęp będą anonimowe i w trybie tylko do odczytu.
+LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Brak administratora lub hasła. Dostęp do LDAP będzie jedynie anonimowy i tylko w trybie do odczytu.
 LDAPDescContact=Ta strona pozwala na zdefiniowanie atrybutów LDAP nazwę LDAP drzewa dla każdego danych na Dolibarr kontakty.
 LDAPDescUsers=Ta strona pozwala na zdefiniowanie atrybutów LDAP nazwę LDAP drzewa dla każdego danych na Dolibarr użytkowników.
 LDAPDescGroups=Ta strona pozwala na zdefiniowanie atrybutów LDAP nazwę LDAP drzewa dla każdego danych na Dolibarr grupy.
@@ -1322,14 +1353,21 @@ MemcachedAvailableAndSetup=Moduł memcached dedykowane obsłudze serwer memcache
 OPCodeCache=OPCODE cache
 NoOPCodeCacheFound=Nie znaleziono OpCode cache. Może użyć innego cache OPCODE niż XCache lub eAccelerator (dobry), może nie masz OPCODE cache (bardzo źle).
 HTTPCacheStaticResources=Cache HTTP do zasobów statycznych (css, img, JavaScript)
-FilesOfTypeCached=Pliki typu% s są buforowane przez serwer HTTP
-FilesOfTypeNotCached=Pliki typu% s nie są buforowane przez serwer HTTP
-FilesOfTypeCompressed=Pliki typu% s są skompresowane przez serwer HTTP
-FilesOfTypeNotCompressed=Pliki typu% s nie są kompresowane przez serwer HTTP
+FilesOfTypeCached=Pliki typu %s są buforowane przez serwer HTTP
+FilesOfTypeNotCached=Pliki typu %s nie są buforowane przez serwer HTTP
+FilesOfTypeCompressed=Pliki typu %s są kompresowane przez serwer HTTP
+FilesOfTypeNotCompressed=Pliki typu %s nie są kompresowane przez serwer HTTP
 CacheByServer=Cache przez serwer
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache przez przeglądarkę
 CompressionOfResources=Kompresja odpowiedzi HTTP
+CompressionOfResourcesDesc=For exemple using the Apache directive "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Taka automatyczna detekcja nie jest możliwe przy obecnych przeglądarek
+DefaultValuesDesc=You can define/force here the default value you want to get when your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Produkty konfiguracji modułu
 ServiceSetup=Konfiguracja modułu Usługi
@@ -1341,7 +1379,7 @@ ViewProductDescInThirdpartyLanguageAbility=Visualization of products description
 UseSearchToSelectProductTooltip=Także jeśli masz dużą ilość produktu (> 100 000), można zwiększyć prędkość przez ustawienie stałej PRODUCT_DONOTSEARCH_ANYWHERE do 1 w Setup-> Inne. Szukaj zostaną ograniczone do początku łańcucha.
 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)
 SetDefaultBarcodeTypeProducts=Domyślny kod kreskowy typu użyć do produktów
-SetDefaultBarcodeTypeThirdParties=Domyślny kod kreskowy typu do użytku dla osób trzecich
+SetDefaultBarcodeTypeThirdParties=Domyślny typ kodu kreskowego używanego dla kontahentów
 UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
 ProductCodeChecker= Moduł do generowania kodu produktu i sprawdzeniu (produkt lub usługa)
 ProductOtherConf= Konfiguracja produktu / usługi
@@ -1385,12 +1423,12 @@ RSSUrl=RSS URL
 RSSUrlExample=Ciekawe RSS
 ##### Mailing #####
 MailingSetup=Moduł konfiguracji e-maila
-MailingEMailFrom=Nadawca wiadomości e-mail (Z) na e-maile wysyłane przez e-maila modułu
-MailingEMailError=Powrót e-mail (Errors-do) na e-maile z błędami
+MailingEMailFrom=Nadawca wiadomości e-mail (Od) dla wiadomości wysyłanych przez moduł mailingowy
+MailingEMailError=Email zwrotny (Error-To) dla wiadomości z błędami wysyłania
 MailingDelay=Sekund po wysłaniu czekać następnej wiadomości
 ##### Notification #####
 NotificationSetup=Napisz e-mail konfiguracji modułu powiadomienia
-NotificationEMailFrom=Nadawca wiadomości e-mail (Z) na e-maile wysyłane do powiadomień
+NotificationEMailFrom=Nadawca wiadomości e-mail (Od) dla wiadomości wysyłanych w formie powiadomień
 FixedEmailTarget=Naprawiono docelowy adres e-mail
 ##### Sendings #####
 SendingsSetup=Konfiguracja modułu wysyłek
@@ -1403,7 +1441,7 @@ FreeLegalTextOnShippings=Dowolny tekst sprawie przemieszczania
 DeliveryOrderNumberingModules=Produkty dostaw otrzymania numeracji modułu
 DeliveryOrderModel=Produkty dostaw otrzymania modelu
 DeliveriesOrderAbility=Obsługuj wysyłki przychodzące z dostawami produktów
-FreeLegalTextOnDeliveryReceipts=Wolny tekst na dostawy wpływy
+FreeLegalTextOnDeliveryReceipts=Dowolny tekst na dokumentach dostawy
 ##### FCKeditor #####
 AdvancedEditor=Zaawansowany edytor
 ActivateFCKeditor=Uaktywnij FCKeditor za:
@@ -1415,9 +1453,9 @@ FCKeditorForUserSignature=WYSIWIG tworzenie / edycja podpisu użytkownika
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
 ##### OSCommerce 1 #####
 OSCommerceErrorConnectOkButWrongDatabase=Połączenie udało, ale baza danych nie patrzy się osCommerce danych (klucz %s nie został znaleziony w tabeli %s).
-OSCommerceTestOk=Połączenie do serwera ' %s' w bazie danych " %s" z użytkownika' %s' powiodło się.
-OSCommerceTestKo1=Połączenie do serwera ' %s' sukces, ale baza danych' %s' nie mógł zostać osiągnięty.
-OSCommerceTestKo2=Połączenie do serwera ' %s' z użytkownika' %s' nie powiodło się.
+OSCommerceTestOk=Połączenie do serwera ' %s' z bazą danych " %s" z użytkownikiem '%s' powiodło się.
+OSCommerceTestKo1=Pomyślnie połączono się z serwerem '%s', ale baza danych '%s' jest niedostępna.
+OSCommerceTestKo2=Połączenie do serwera '%s' z użytkownikiem '%s' nie powiodło się.
 ##### Stock #####
 StockSetup=Magazyn konfiguracji modułu
 IfYouUsePointOfSaleCheckModule=W przypadku korzystania z modułu Point of Sale (moduł POS dostarczony domyślnie lub inny moduł zewnętrzny), ta konfiguracja może być ignorowana przez twój moduł POS. Większość modułów POS jest zaprojektowana, aby wystawiać natychmiast fakturę i obniżać zapas domyślnie, czyli podobnie jak poniższe opcje. Tak więc, jeśli chcesz lub nie, aby twój moduł POS obsłużył zmniejszanie zapasu na magazynie podczas rejestrowania sprzedaży, sprawdź konfigurację twojego modułu POS.
@@ -1445,11 +1483,11 @@ Target=Cel
 DetailTarget=Target dla linków (_blank górę otworzyć nowe okno)
 DetailLevel=Poziom (-1: top menu 0: nagłówek menu&gt; 0 menu i podmenu)
 ModifMenu=Menu zmiany
-DeleteMenu=Usuń w menu
+DeleteMenu=Usuń element menu
 ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
 FailedToInitializeMenu=Nie można zainicjowac menu
 ##### Tax #####
-TaxSetup=Taxes, social or fiscal taxes and dividends module setup
+TaxSetup=Podatki, podatki socjalne lub podatkowe i dywidendy konfiguracji moduł
 OptionVatMode=Opcja d'exigibilit de TVA
 OptionVATDefault=Kasowej
 OptionVATDebitOption=Memoriału
@@ -1460,11 +1498,11 @@ OnDelivery=Na dostawy
 OnPayment=W sprawie wypłaty
 OnInvoice=Na fakturze
 SupposedToBePaymentDate=Płatność daty dostawy, jeśli wykorzystane data nie jest znana
-SupposedToBeInvoiceDate=Faktura używany termin
+SupposedToBeInvoiceDate=Data użyta na fakturze
 Buy=Kupić
 Sell=Sprzedać
-InvoiceDateUsed=Faktura używany termin
-YourCompanyDoesNotUseVAT=Twoja firma została określona, aby nie używać VAT (Start - Ustawienia - Firma / fundacji), więc nie ma VAT opcje konfiguracji.
+InvoiceDateUsed=Data użyta na fakturze
+YourCompanyDoesNotUseVAT=Twoja firma została zdefiniowana jako nie rozliczająca się z podatku VAT (Strona główna - Konfiguracja - Firma / Fundacja), więc nie ma opcji ustawienia podatku VAT do ustawienia.
 AccountancyCode=Kod Księgowość
 AccountancyCodeSell=Rachunek sprzedaży. kod
 AccountancyCodeBuy=Kup konto. kod
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Ustaw automatycznie tego stanu dla wydarzeń w filt
 AGENDA_DEFAULT_VIEW=Która karta chcesz otworzyć domyślnie po wybraniu menu Agendę
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Kliknij, aby Dial konfiguracji modułu
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  Dans l'url, vous pouvez utiliser les balises<br><b>__PHONETO__</b> qui sera remplacé par le téléphone de l'appelé<br><b>__PHONEFROM__</b> qui sera remplacé par le téléphone de l'appelant (le votre)<br><b>__LOGIN__</b> qui sera remplacé par votre login clicktodial (défini sur votre fiche utilisateur)<br><b>__PASS__</b> qui sera remplacé par votre mot de passe clicktodial (défini sur votre fiche utilisateur).
+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=Moduł ten pozwala dodać ikonę po numer telefonu Dolibarr kontakty. Kliknięcie na tę ikonę, będzie połączenie z serveur z danego adresu URL można zdefiniować poniżej. Może to być wykorzystane, aby połączyć się z Call Center z systemu Dolibarr, że mogą dzwonić na numer telefonu SIP system przykład.
 ClickToDialUseTelLink=Używaj tylko łącza "tel:" na numery telefonów
 ClickToDialUseTelLinkDesc=Użyj tej metody, jeśli użytkownicy mają softphone lub interfejs oprogramowania zainstalowanego na tym samym komputerze, niż przeglądarce i nazywa się po kliknięciu na link w przeglądarce, które zaczynają się od "tel:". Jeśli potrzebujesz pełne rozwiązanie serwera (bez potrzeby instalacji oprogramowania lokalnego), należy ustawić na "Nie" i wypełnić następne pole.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+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.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=Ogólna kolejność wyświetlania
 BankOrderES=Hiszpański
 BankOrderESDesc=Hiszpański kolejność wyświetlania
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=Firma Multi-Moduł konfiguracji
 ##### Suppliers #####
@@ -1550,11 +1588,11 @@ UseSearchToSelectProject=Use autocompletion fields to choose project (instead of
 ##### Fiscal Year #####
 AccountingPeriods=Accounting periods
 AccountingPeriodCard=Accounting period
-NewFiscalYear=New accounting period
-OpenFiscalYear=Open accounting period
-CloseFiscalYear=Close accounting period
-DeleteFiscalYear=Delete accounting period
-ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
+NewFiscalYear=Nowy okres rozliczeniowy
+OpenFiscalYear=Otwórz okres rozliczeniowy
+CloseFiscalYear=Zamknij okres rozliczeniowy
+DeleteFiscalYear=Usuń okres rozliczeniowy
+ConfirmDeleteFiscalYear=Jesteś pewien, że chcesz usunąć ten okres rozliczeniowy?
 ShowFiscalYear=Show accounting period
 AlwaysEditable=Zawsze może być edytowany
 MAIN_APPLICATION_TITLE=Wymusza widoczną nazwę aplikacji (ostrzeżenie: ustawienie własnej nazwy tutaj może złamać Autouzupełnianie funkcji logowania przy użyciu DoliDroid aplikację mobilną)
@@ -1582,12 +1620,12 @@ BackupDumpWizard=Konfigurator wykonywania kopii zapasowej bazy danych
 SomethingMakeInstallFromWebNotPossible=Instalacja zewnętrznych modułów za pomocą interfejsu sieciowego nie jest możliwa z powodu następujących przyczyn:
 SomethingMakeInstallFromWebNotPossible2=Z tego powodu, proces uaktualnienia tutaj opisany jest jednie krokiem manualnym, który wykonać może uprawniony użytkownik.
 InstallModuleFromWebHasBeenDisabledByFile=Instalacja zewnętrznych modułów z poziomu aplikacji została wyłączona przez administratora. Musisz poprosić go o usunięcie pliku <strong>%s</strong> aby włączyć odpowiednią funkcję.
-ConfFileMuseContainCustom=Installing 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=Kolor podświetlenia linii przy najechaniu na nią myszą (pozostaw puste jeżeli ma nie być podświetlona)
 TextTitleColor=Kolor tytułu strony
 LinkColor=Kolor odnośników
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Naciśnij CTRL+F5 na klawiaturze aby wyczyścić cache w przeglądarce po zmianie tej wartości, aby zobaczyć efekt tej zmiany
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Kolor tła
 TopMenuBackgroundColor=Kolor tła górnego menu
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1624,7 +1663,7 @@ MailToSendSupplierInvoice=To send supplier invoice
 MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Pokaż domyślnie w widoku listy
-YouUseLastStableVersion=You use the latest stable version
+YouUseLastStableVersion=Używasz ostatniej stabilnej wersji
 TitleExampleForMajorRelease=Przykład wiadomości można użyć, aby ogłosić to główne wydanie (prosimy używać go na swoich stronach internetowych)
 TitleExampleForMaintenanceRelease=Przykład wiadomości można użyć, aby ogłosić wydanie konserwacji (prosimy używać go na swoich stronach internetowych)
 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.
@@ -1633,24 +1672,24 @@ MultiPriceRuleDesc=Gdy opcja "Kilka poziom cen na produkt / usługę" jest włą
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
-AllPublishers=All publishers
-UnknownPublishers=Unknown publishers
-AddRemoveTabs=Add or remove tabs
-AddDictionaries=Add dictionaries
+AllPublishers=Wszyscy wydawcy
+UnknownPublishers=Nieznani wydawcy
+AddRemoveTabs=Dodaj lub usuń zakładki
+AddDictionaries=Dodaj słowniki
 AddBoxes=Dodaj widgety
-AddSheduledJobs=Add scheduled jobs
+AddSheduledJobs=Dodaj zaplanowane zadania
 AddHooks=Add hooks
 AddTriggers=Add triggers
 AddMenus=Add menus
-AddPermissions=Add permissions
+AddPermissions=Dodaj uprawnienia
 AddExportProfiles=Add export profiles
 AddImportProfiles=Add import profiles
 AddOtherPagesOrServices=Add other pages or services
 AddModels=Add document or numbering templates
 AddSubstitutions=Add keys substitutions
-DetectionNotPossible=Detection not possible
+DetectionNotPossible=Wykrycie niemożliwe
 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)
-ListOfAvailableAPIs=List of available APIs
+ListOfAvailableAPIs=Lista dostępnych API
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. 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 inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
 LandingPage=Landing page
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/pl_PL/compta.lang b/htdocs/langs/pl_PL/compta.lang
index 4fe290d65ce..3b84c67a289 100644
--- a/htdocs/langs/pl_PL/compta.lang
+++ b/htdocs/langs/pl_PL/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Kwoty podane tutaj są obliczane na podst
 Param=Konfiguracja
 RemainingAmountPayment=Płatność pozostałej kwoty:
 Account=Konto
-Accountparent=Konto rodzic
-Accountsparent=Konta rodzica
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=Przychody
 Outcome=Rozchody
 ReportInOut=Przychody/Koszty
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Podatki i dywidendy
 MenuSocialContributions=ZUS/podatek
 MenuNewSocialContribution=Nowa opłata ZUS/podatek
 NewSocialContribution=Nowa opłata ZUS/podatek
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Opłata ZUS/podatek do zapłacenia
 AccountancyTreasuryArea=Obszar księgowości
 NewPayment=Nowa płatność
@@ -134,8 +135,8 @@ RulesResultDue=- Obejmuje zaległe faktury, koszty, podatek VAT, darowizny nieza
 RulesResultInOut=- Obejmuje rzeczywiste płatności dokonywane za faktury, koszty, podatek VAT oraz wynagrodzenia. <br> Opiera się na  datach płatności faktur, wygenerowania kosztów, podatku VAT oraz wynagrodzeń. Dla darowizn brana jest pod uwagę data przekazania darowizny.
 RulesCADue=- Zawiera numery faktur klienta, niezależnie czy są płacone, czy też nie. <br> - Jest oparte na podstawie daty zatwierdzenia tych faktur. <br>
 RulesCAIn=- Obejmuje wszystkie skuteczne płatności faktur otrzymanych od klientów. <br> - Jest on oparty na dacie płatności tych faktur <br>
-DepositsAreNotIncluded=- Faktury depozytów są ani też
-DepositsAreIncluded=- Faktury depozytowe są zawarte
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Raport osób trzecich IRPF
 LT1ReportByCustomersInInputOutputModeES=Sprawozdanie trzecim RE partii
 VATReport=VAT report
@@ -169,7 +170,7 @@ DescSellsJournal=Dziennik sprzedaży
 DescPurchasesJournal=Dziennik zakupów
 InvoiceRef=Numer referencyjny faktury
 CodeNotDef=Nie zdefiniowany
-WarningDepositsNotIncluded=Depozyty faktury nie są zawarte w tej wersji z tego modułu księgowego.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Termin płatności określony nie może być niższa niż data obiektu.
 Pcg_version=Chart of accounts models
 Pcg_type=Typ PCG
@@ -189,8 +190,10 @@ AccountancyJournal=Dziennik kodów księgowości
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Powiel opłatę za ZUS/podatek
 ConfirmCloneTax=Potwierdź powielenie płatności za ZUS/podatek
 CloneTaxForNextMonth=Powiel to na następny miesiąc
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=ZUS/podatek
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/pl_PL/cron.lang b/htdocs/langs/pl_PL/cron.lang
index 9e2b50a7987..57f515d93ad 100644
--- a/htdocs/langs/pl_PL/cron.lang
+++ b/htdocs/langs/pl_PL/cron.lang
@@ -13,26 +13,26 @@ KeyForCronAccess=Klucz zabezpieczeń dla URL, aby uruchomić cron
 FileToLaunchCronJobs=Linia poleceń do uruchamiania zadań crona
 CronExplainHowToRunUnix=W środowisku Unix należy użyć następującego wpisu crontab, aby uruchomić wiersz poleceń co 5 minut
 CronExplainHowToRunWin=W środowisku Microsoft Windows(tm) można użyć narzędzia  Zaplanowane zadania, aby uruchomić linię poleceń co 5 minut
-CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodDoesNotExists=Klasa %s nie zawiera żadnej metody %s
 # Menu
-EnabledAndDisabled=Enabled and disabled
+EnabledAndDisabled=Włączone i wyłączone
 # Page list
 CronLastOutput=Latest run output
 CronLastResult=Latest result code
 CronCommand=Komenda
 CronList=Zaplanowane zadania
 CronDelete=Usuwanie zaplanowanych zadań
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
-CronExecute=Launch scheduled job
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Moduł zaplanowanych zadań pozwala na uruchamianie zadań, ktore były zaplanowane
+CronConfirmDelete=Czy jesteś pewien, że chcesz usunąć te zaplanowane zadania?
+CronExecute=Uruchom zaplanowane zadania
+CronConfirmExecute=Jesteś pewien, że chcesz wykonać te zaplanowane zadania teraz?
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Zadanie
 CronNone=Żaden
-CronDtStart=Not before
-CronDtEnd=Not after
+CronDtStart=Nie przed
+CronDtEnd=Nie po
 CronDtNextLaunch=Kolejne wykonanie
-CronDtLastLaunch=Start date of latest execution
-CronDtLastResult=End date of latest execution
+CronDtLastLaunch=Data rozpoczęcia ostatniego wykonania
+CronDtLastResult=Data zakończenia ostatniego wykonania
 CronFrequency=Częstotliwość
 CronClass=Klasa
 CronMethod=Metoda
@@ -57,23 +57,23 @@ CronStatusActiveBtn=Włączone
 CronStatusInactiveBtn=Wyłączone
 CronTaskInactive=To zadanie jest wyłączone
 CronId=ID
-CronClassFile=Klasy (filename.class.php)
-CronModuleHelp=Nazwa Dolibarr katalogu modułu (także współpracować z zewnętrznym modułem Dolibarr). <BR> Dla exemple sprowadzić metodę Dolibarr obiektu wyrobów / htdocs / /class/product.class.php <u>produktu,</u> wartość modułu jest <i>produktem</i>
-CronClassFileHelp=Nazwa pliku do załadowania. <BR> Dla exemple sprowadzić metodę Dolibarr obiektu wyrobów / htdocs / produktu / klasy / <u>product.class.php</u> wartość nazwy pliku klasa <i>product.class.php</i>
-CronObjectHelp=Nazwa obiektu, aby załadować. <BR> Dla exemple sprowadzić metodę Dolibarr obiektu wyrobów /htdocs/product/class/product.class.php wartość nazwy pliku klasa <i>produktów</i>
-CronMethodHelp=Metoda obiektu, aby uruchomić. <BR> Dla exemple sprowadzić metodę Dolibarr obiektu wyrobów /htdocs/product/class/product.class.php, wartość metody jest to <i>fecth</i>
-CronArgsHelp=Argumenty metody. <BR> Reprezentują np sprowadzić sposób Dolibarr obiektu Product /htdocs/product/class/product.class.php, wartość paramters może wynosić <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=System linii poleceń do wykonania.
 CronCreateJob=Utwórz nowe zaplanowane zadanie
 CronFrom=Z
 # Info
 # Common
 CronType=Typ zadania
-CronType_method=Wywołanie metody z klasy Dolibarr
+CronType_method=Metoda wywołania klasy Dolibarr
 CronType_command=Polecenie powłoki
 CronCannotLoadClass=Nie można załadować klasy s% lub obiektu %s
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+UseMenuModuleToolsToAddCronJobs=Idź do "Strona główna - Narzędzia administracyjne - Zaplanowane zadania" aby zobaczyć i zmieniać zaplanowane zadania
 JobDisabled=Zadanie wyłączone
-MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+MakeLocalDatabaseDumpShort=Backup lokalnej bazy danych
+MakeLocalDatabaseDump=Twórz zrzut lokalnej bazy danych
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang
index 320e6d4abd0..e116dcdc611 100644
--- a/htdocs/langs/pl_PL/errors.lang
+++ b/htdocs/langs/pl_PL/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Nie można utworzyć pliku '<b>%s</b>'.
 ErrorFailToRenameDir=Nie można zmienić nazwy katalogu <b>%s</b> na <b>%s</b>.
 ErrorFailToCreateDir=Nie można utworzyć katalogu '<b>%s</b>'.
 ErrorFailToDeleteDir=Nie można usunąć katalogu '<b %s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=Ten kontakt jest już zdefiniowana jako kontaktowy dla tego typu.
 ErrorCashAccountAcceptsOnlyCashMoney=To konto bankowe jest kontem gotówkowym, więc akceptuje jedynie płatności gotówkowe
 ErrorFromToAccountsMustDiffers=Konta źródłowe i docelowe muszą być inne
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Nie można zapisać w katalogu %s
 ErrorFoundBadEmailInFile=Znaleziono nieprawidłową składnię adresu email dla %s linii w pliku (przykładowo linia %s z adresem email %s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Niektóre pola wymagane nie były uzupełnione.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Nie można utworzyć katalogu. Sprawdź, czy serwer WWW użytkownik ma uprawnienia do zapisu do katalogu dokumentów Dolibarr. Jeśli parametr <b>safe_mode</b> jest włączona w tym PHP, czy posiada Dolibarr php pliki do serwera internetowego użytkownika (lub grupy).
 ErrorNoMailDefinedForThisUser=Nie określono adresu email dla tego użytkownika
 ErrorFeatureNeedJavascript=Ta funkcja wymaga do pracy aktywowanego JavaScript. Zmień to w konfiguracji - wyświetlanie.
@@ -57,9 +60,9 @@ ErrorNoTmpDir=Tymczasowy directy %s nie istnieje.
 ErrorUploadBlockedByAddon=Prześlij zablokowane / PHP wtyczki Apache.
 ErrorFileSizeTooLarge=Rozmiar pliku jest zbyt duży.
 ErrorSizeTooLongForIntType=Rozmiar zbyt długi dal typu int (max %s cyfr)
-ErrorSizeTooLongForVarcharType=Rozmiar zbyt długo typu string (%s znaków maksymalnie)
-ErrorNoValueForSelectType=Proszę wypełnić wartości listy wyboru
-ErrorNoValueForCheckBoxType=Proszę wypełnić pole wyboru wartości dla listy
+ErrorSizeTooLongForVarcharType=Za dużo znaków dla tego typu (maksymalnie %s znaków)
+ErrorNoValueForSelectType=Proszę wypełnić wartości dla listy wyboru
+ErrorNoValueForCheckBoxType=Proszę wypełnić wartości dla listy checkbox
 ErrorNoValueForRadioType=Proszę wypełnić wartość liście radiowej
 ErrorBadFormatValueList=Wartość na tej liście nie może mieć więcej niż jeden <u>przecinek: %s,</u> ale wymagany jest przynajmniej jeden: klucz, wartość
 ErrorFieldCanNotContainSpecialCharacters=<b>Pole %s</b> nie zawiera znaki specjalne.
@@ -102,19 +105,19 @@ ErrorNoImagickReadimage=Funkcja imagick_readimage nie jest w tej PHP. Podgląd m
 ErrorRecordAlreadyExists=Wpis już istnieje
 ErrorCantReadFile=Nie można odczytać pliku '%s'
 ErrorCantReadDir=Nie można odczytać katalogu '%s'
-ErrorBadLoginPassword=Zła wartość dla loginu lub hasła
+ErrorBadLoginPassword=Błędne hasło lub login
 ErrorLoginDisabled=Twoje konto zostało wyłączone
 ErrorFailedToRunExternalCommand=Nie można uruchomić polecenia zewnętrznych. Zameldowanie jest ona dostępna i runnable przez serwer PHP. Jeśli PHP <b>safe mode</b> jest włączony, czy polecenie wewnątrz katalogu określonym przez parametr <b>safe_mode_exec_dir.</b>
 ErrorFailedToChangePassword=Nie można zmienić hasła
 ErrorLoginDoesNotExists=Użytkownik <b>%s</b> nie został znaleziony.
 ErrorLoginHasNoEmail=Ten użytkownik nie ma adresu e-mail. Proces przerwany.
-ErrorBadValueForCode=Zła wartość typy kodu. Spróbuj ponownie z nową wartość ...
+ErrorBadValueForCode=Zła wartość kody zabezpieczeń. Wprowadź nową wartość...
 ErrorBothFieldCantBeNegative=Pola %s i %s nie może być zarówno negatywny
 ErrorQtyForCustomerInvoiceCantBeNegative=Ilość linii do faktur dla klientów nie może być ujemna
 ErrorWebServerUserHasNotPermission=Konto użytkownika <b>%s</b> wykorzystywane do wykonywania serwer WWW nie ma zgody na który
 ErrorNoActivatedBarcode=Nie Typ aktywny kodów kreskowych
 ErrUnzipFails=Nie udało się rozpakować% s ZipArchive
-ErrNoZipEngine=Brak silnika do rozpakowania pliku %s w PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=Plik% s musi być pakiet zip Dolibarr
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=PHP CURL nie jest zainstalowany, to jest niezbędne, aby porozmawiać z Paypal
@@ -146,8 +149,8 @@ ErrorPriceExpression10=Iperator '% s' nie ma argumentu
 ErrorPriceExpression11=Spodziewając '% s'
 ErrorPriceExpression14=Dzielenie przez zero
 ErrorPriceExpression17=Niezdefiniowana zmienna '%s'
-ErrorPriceExpression19=Ekspresja Nie znaleziono
-ErrorPriceExpression20=Pusty wyraz
+ErrorPriceExpression19=Nie znaleziono wyrażenia
+ErrorPriceExpression20=Puste wyrażenie
 ErrorPriceExpression21=Pusty wynik '%s'
 ErrorPriceExpression22=Wynik negatywny '%s'
 ErrorPriceExpressionInternal=Wewnętrzny błąd '%s'
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=Nie wybrano zmiennej globalnej
 ErrorFieldMustBeANumeric=Pole <b>%s</b> musi mieć wartość numeryczną
 ErrorMandatoryParametersNotProvided=Obowiązkowe parametr (y) nie przewidziane
 ErrorOppStatusRequiredIfAmount=Możesz ustawić szacunkową kwotę za możliwość / ołowiu. Więc należy także wprowadzić swój status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad definicja tablicy w menu modułu deskryptora (zły stosunek jakości do kluczowego fk_menu)
 ErrorSavingChanges=Wystąpił błąd podczas zapisywania zmian
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # Warnings
 WarningPasswordSetWithNoAccount=Hasło zostało ustawione dla tego użytkownika. Jednakże nie Konto użytkownika zostało utworzone. Więc to hasło jest przechowywane, ale nie mogą być używane do logowania do Dolibarr. Może być stosowany przez zewnętrzny moduł / interfejsu, ale jeśli nie trzeba definiować dowolną logowania ani hasła do członka, można wyłączyć opcję "Zarządzaj login dla każdego członka" od konfiguracji modułu użytkownika. Jeśli potrzebujesz zarządzać logowanie, ale nie wymagają hasła, możesz zachować to pole puste, aby uniknąć tego ostrzeżenia. Uwaga: E może być również stosowany jako login, jeśli element jest połączony do użytkownika.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Termin płatności (%s) jest wcześniejsz
 WarningTooManyDataPleaseUseMoreFilters=Zbyt wiele danych (więcej niż% s linii). Proszę używać więcej filtrów lub ustawić stałą% s na wyższy 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/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
index 08676b5ad05..249acebddcf 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -24,12 +24,12 @@ FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=Połączenia z bazą danych
-NoTemplateDefined=No template defined for this email type
+NoTemplateDefined=Nie zdefiniowano szablonu do wiadomości email tego typu
 AvailableVariables=Available substitution variables
 NoTranslation=Brak tłumaczenia
 NoRecordFound=Rekord nie został znaleziony.
 NoRecordDeleted=No record deleted
-NotEnoughDataYet=Not enough data
+NotEnoughDataYet=Za mało danych
 NoError=Brak błędów
 Error=Błąd
 Errors=Błędy
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=Parametr %s nie został zdefiniowany
 ErrorUnknown=Nieznany błąd
 ErrorSQL=Błąd SQL
 ErrorLogoFileNotFound=Logo pliku ' %s' nie zostało odnalezione
-ErrorGoToGlobalSetup=Idź do "Firma / Fundacja" Aby rozwiązać problem
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=Przejdź do modułu konfiguracji aby naprawić
 ErrorFailedToSendMail=Próba wysłania maila nie udana (nadawca=%s, odbiorca=%s)
 ErrorFileNotUploaded=Plik nie został załadowany. Sprawdź, czy rozmiar nie przekracza maksymalnej dopuszczalnej wagi, lub czy wolne miejsce jest dostępne na dysku. Sprawdz czy nie ma już pliku o takiej samej nazwie w tym katalogu.
@@ -69,11 +69,11 @@ SetDate=Ustaw datę
 SelectDate=Wybierz datę
 SeeAlso=Zobacz także %s
 SeeHere=Zobacz tutaj
-Apply=Zastosować
+Apply=Zastosuj
 BackgroundColorByDefault=domyślny kolor tła
 FileRenamed=The file was successfully renamed
 FileUploaded=Plik został pomyślnie przesłany
-FileGenerated=The file was successfully generated
+FileGenerated=Plik został wygenerowany pomyślnie
 FileWasNotUploaded=Wybrano pliku do zamontowaia, ale jeszcze nie wysłano. W tym celu wybierz opcję "dołącz plik".
 NbOfEntries=Liczba wejść
 GoToWikiHelpPage=Read online help (Internet access needed)
@@ -85,7 +85,7 @@ NotDefined=Nie zdefiniowany
 DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
 Administrator=Administrator
 Undefined=Niezdefiniowano
-PasswordForgotten=Password forgotten?
+PasswordForgotten=Zapomniałeś hasła?
 SeeAbove=Patrz wyżej
 HomeArea=Strona Startowa
 LastConnexion=Latest connection
@@ -153,6 +153,7 @@ Edit=Edytuj
 Validate=Potwierdź
 ValidateAndApprove=Weryfikacja i zatwierdzanie
 ToValidate=Aby potwierdzić
+NotValidated=Not validated
 Save=Zapisać
 SaveAs=Zapisz jako
 TestConnection=Test połączenia
@@ -186,7 +187,7 @@ Groups=Grupy
 NoUserGroupDefined=Niezdefiniowano grup użytkowników
 Password=Hasło
 PasswordRetype=Powtórz hasło
-NoteSomeFeaturesAreDisabled=Należy pamiętać, że wiele funkcji / modułów są wyłączone w tej demonstracji.
+NoteSomeFeaturesAreDisabled=Należy pamiętać, że wiele funkcji/modułów jest wyłączonych w tej demonstracji.
 Name=Nazwa
 Person=Osoba
 Parameter=Parametr
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=żadna aplikacja nierozłączona w skutek uwierzytel
 Connection=Połączenie
 Setup=Konfiguracja
 Alert=Sygnał
+MenuWarnings=Alarmy
 Previous=Poprzednia
 Next=Następny
 Cards=Kartki
@@ -230,15 +232,15 @@ Now=Teraz
 HourStart=Godzina startu
 Date=Data
 DateAndHour=Data i godzina
-DateToday=Today's date
+DateToday=Dzisiejsza data
 DateReference=Reference date
 DateStart=Data rozpoczęcia
-DateEnd=Koniec
+DateEnd=Data zakończenia
 DateCreation=Data utworzenia
 DateCreationShort=Data utworzenia
 DateModification=Zmiana daty
 DateModificationShort=Data modyfikacji
-DateLastModification=Latest modification date
+DateLastModification=Data ostatniej zmiany
 DateValidation=Zatwierdzenie daty
 DateClosing=Ostateczny termin
 DateDue=W trakcie terminu
@@ -308,6 +310,7 @@ Copy=Kopiowanie
 Paste=Wklej
 Default=Domyślny
 DefaultValue=Wartość domyślna
+DefaultValues=Default values
 Price=Cena
 UnitPrice=Cena jednostkowa
 UnitPriceHT=Cena jednostkowa (netto)
@@ -324,12 +327,12 @@ AmountTTCShort=Kwota (zawierająca VAT)
 AmountHT=Kwota (netto bez podatku)
 AmountTTC=Kwota (zawierająca VAT)
 AmountVAT=Kwota podatku VAT
-MulticurrencyAlreadyPaid=Already payed, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
-MulticurrencyAmountHT=Amount (net of tax), original currency
-MulticurrencyAmountTTC=Amount (inc. of tax), original currency
-MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencyAlreadyPaid=Zapłacono, oryginalna waluta
+MulticurrencyRemainderToPay=Pozostało do zapłaty, oryginalna waluta
+MulticurrencyPaymentAmount=Kwota płatności, oryginalna waluta
+MulticurrencyAmountHT=Kwota (bez VAT), oryginalna waluta
+MulticurrencyAmountTTC=Kwota (zVAT), oryginalna waluta
+MulticurrencyAmountVAT=Kwota VAT, oryginalna waluta
 AmountLT1=Wartość podatku 2
 AmountLT2=Wartość podatku 3
 AmountLT1ES=Kwota RE
@@ -363,7 +366,8 @@ VATRate=Stawka VAT
 Average=Średni
 Sum=Suma
 Delta=Delta
-Module=Moduł
+Module=Module/Application
+Modules=Modules/Applications
 Option=Opcja
 List=Lista
 FullList=Pełna lista
@@ -387,7 +391,7 @@ ActionRunningNotStarted=By rozpocząć
 ActionRunningShort=In progress
 ActionDoneShort=Zakończone
 ActionUncomplete=Niekompletne
-CompanyFoundation=Firma / Fundacja
+CompanyFoundation=Company/Organisation
 ContactsForCompany=Kontakty dla tego zamówienia
 ContactsAddressesForCompany=Kontakt/adres dla tej części/zamówienia/
 AddressesForCompany=Adressy dla części trzeciej
@@ -405,8 +409,9 @@ Generate=Wygeneruj
 Duration=Czas trwania
 TotalDuration=Łączny czas trwania
 Summary=Podsumowanie
-DolibarrStateBoard=Statystyki
-DolibarrWorkBoard=Do zrobienia
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=Dostępny
 NotYetAvailable=Nie są jeszcze dostępne
 NotAvailable=Niedostępne
@@ -434,7 +439,7 @@ Reportings=Raportowanie
 Draft=Szkic
 Drafts=Robocze
 Validated=Zatwierdzona
-Opened=Otwierany
+Opened=Otwarte
 New=Nowy
 Discount=Rabat
 Unknown=Nieznany
@@ -453,12 +458,13 @@ NextStep=Następny krok
 Datas=Dane
 None=Żaden
 NoneF=Żaden
+NoneOrSeveral=None or several
 Late=Późno
 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.
 Photo=Obraz
 Photos=Obrazy
 AddPhoto=Dodaj obraz
-DeletePicture=Usuń obraz
+DeletePicture=Obraz usunięty
 ConfirmDeletePicture=Potwierdzić usunięcie obrazka?
 Login=Login
 CurrentLogin=Aktualny login
@@ -537,8 +543,8 @@ FindBug=Zgłoś błąd
 NbOfThirdParties=Liczba zamówień
 NbOfLines=Liczba linii
 NbOfObjects=Liczba obiektów
-NbOfObjectReferers=Number of related items
-Referers=Related items
+NbOfObjectReferers=Liczba powiązanych elementów
+Referers=Powiązane elementy
 TotalQuantity=Całkowita ilość
 DateFromTo=Z %s do %s
 DateFrom=Z %s
@@ -573,7 +579,7 @@ Priority=Priorytet
 SendByMail=Wyślij przez email
 MailSentBy=E-mail został wysłany przez
 TextUsedInTheMessageBody=Zawartość emaila 
-SendAcknowledgementByMail=Send confirmation email
+SendAcknowledgementByMail=Wyślij email potwierdzający
 EMail=E-mail
 NoEMail=Brak e-mail
 Email=Adres e-mail
@@ -586,7 +592,7 @@ GoBack=Wróć
 CanBeModifiedIfOk=Mogą być zmienione  jeśli ważne
 CanBeModifiedIfKo=Mogą być zmienione, jeśli nie ważne
 ValueIsValid=Wartość jest poprawna
-ValueIsNotValid=Value is not valid
+ValueIsNotValid=Wartość jest niepoprawna
 RecordCreatedSuccessfully=Record created successfully
 RecordModifiedSuccessfully=Zapis zmodyfikowany pomyślnie
 RecordsModified=%s record modified
@@ -606,7 +612,8 @@ PartialWoman=Część
 TotalWoman=Razem
 NeverReceived=Nigdy nie otrzymała
 Canceled=Anulowany
-YouCanChangeValuesForThisListFromDictionarySetup=Możesz zmieniać wartości dla tej listy z menu Konfiguracja - Słownik
+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
 Color=Kolor
 Documents=Związanych plików
@@ -642,11 +649,12 @@ FreeLineOfType=Wolność wyboru typu
 CloneMainAttributes=Skopiuj obiekt z jego głównymi atrybutami
 PDFMerge=Scalanie/ dzielenie PDF 
 Merge=Scalanie/ dzielenie
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Pokaż stronę do wydruku głównej treści
 MenuManager=Menu menager
 WarningYouAreInMaintenanceMode=Uwaga, jesteś w trybie konserwacji, więc tylko zalogowani <b>%s</b> mogą używać aplikacji w danym momencie.
 CoreErrorTitle=Błąd systemu
-CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
+CoreErrorMessage=Przepraszamy, napotkano błąd. Skontaktuj się z administratorem w celu sprawdzenia logów lub wyłącz $dolibarr_main_prod=1 aby uzyskać więcej informacji.
 CreditCard=Karta kredytowa
 FieldsWithAreMandatory=Pola <b>%s</b>  są obowiązkowe
 FieldsWithIsForPublic=Pola <b>%s</b> są wyświetlane na publiczną listę członków. Jeśli nie chcesz, odznacz opcję "publiczny".
@@ -675,10 +683,10 @@ SetLinkToAnotherThirdParty=Link do innego kontrahenta
 LinkTo=Link to
 LinkToProposal=Link to proposal
 LinkToOrder=Link do zamówienia
-LinkToInvoice=Link to invoice
-LinkToSupplierOrder=Link to supplier order
+LinkToInvoice=Link do faktury
+LinkToSupplierOrder=Link do zamówienia dostawcy
 LinkToSupplierProposal=Link to supplier proposal
-LinkToSupplierInvoice=Link to supplier invoice
+LinkToSupplierInvoice=Link do faktury dostawcy
 LinkToContract=Link to contract
 LinkToIntervention=Link to intervention
 CreateDraft=Utwórz Szic
@@ -708,6 +716,7 @@ from=od
 toward=kierunek
 Access=Dostęp
 SelectAction=Wybierz działanie
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Użyj Ctrl+C by skopiować
 SaveUploadedFileWithMask=Zapisz plik na serwerze z nazwą "<strong>%s</strong>" (w innym wypadku "%s")
 OriginFileName=Oryginalna nazwa pliku
@@ -718,9 +727,9 @@ ViewPrivateNote=Wyświetl notatki
 XMoreLines=%s lini(e) ukryte
 PublicUrl=Publiczny URL
 AddBox=Dodaj skrzynke
-SelectElementAndClickRefresh=Zaznacz element i kliknij Odśwież
+SelectElementAndClick=Select an element and click %s
 PrintFile=Wydrukuj plik %s
-ShowTransaction=Show entry on bank account
+ShowTransaction=Pokaż wpisy na koncie bankowym
 GoIntoSetupToChangeLogo=Wejdź w Strona główna - Ustawienia- Firma by zmienić logo lub przejdź do Strona główna- Ustawienia - Wyświetl do ukrycia.
 Deny=Zabraniać
 Denied=Zabroniony
@@ -733,13 +742,13 @@ Mandatory=Zleceniobiorca
 Hello=Witam
 Sincerely=Z poważaniem
 DeleteLine=Usuń linię
-ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+ConfirmDeleteLine=Czy jesteś pewien, że chcesz usunąć tą linię?
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
-RelatedObjects=Related Objects
+RelatedObjects=Powiązane obiekty
 ClassifyBilled=Klasyfikacja billed
 Progress=Postęp
 ClickHere=Kliknij tutaj
@@ -755,11 +764,20 @@ Calendar=Kalendarz
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
-ActualizeCurrency=Update currency rate
+ActualizeCurrency=Aktualizuj kurs walut
 Fiscalyear=Rok podatkowy
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Poniedziałek
 Tuesday=Wtorek
@@ -817,5 +835,3 @@ SearchIntoContracts=Kontrakty
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Zestawienia wydatków
 SearchIntoLeaves=Urlopy
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/pl_PL/other.lang b/htdocs/langs/pl_PL/other.lang
index 6869882df75..c7fdc7eecfe 100644
--- a/htdocs/langs/pl_PL/other.lang
+++ b/htdocs/langs/pl_PL/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=Data urodzenia
 BirthdayAlertOn=urodziny wpisu aktywnych
 BirthdayAlertOff=urodziny wpisu nieaktywne
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=Validate interwencji
 Notify_FICHINTER_SENTBYMAIL=Interwencja wysyłane pocztą
@@ -46,8 +59,8 @@ Notify_MEMBER_SUBSCRIPTION=Członek subskrybowanych
 Notify_MEMBER_RESILIATE=Member terminated
 Notify_MEMBER_DELETE=Członek usunięte
 Notify_PROJECT_CREATE=Stworzenie projektu
-Notify_TASK_CREATE=Utworzone zadanie
-Notify_TASK_MODIFY=Zmodyfikowane zadanie
+Notify_TASK_CREATE=Zadanie utworzone
+Notify_TASK_MODIFY=Zadanie zmodyfikowane
 Notify_TASK_DELETE=Zadanie usunięte
 SeeModuleSetup=Zobacz konfigurację modułu% s
 NbOfAttachedFiles=Liczba załączonych plików / dokumentów
@@ -61,49 +74,50 @@ PredefinedMailTestHtml=Dette er en <b>test</b> mail (ordet testen må være i fe
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nZnajdziesz tu fakturę __REF__\n\n__PERSONALIZED__Z poważaniem\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nChcielibyśmy przypomnieć, że faktura __REF__ jest wciąż nie zapłacona. Więc w załączniku przesyłamy ponownie fakturę  jako przypomnienie.\n\n__PERSONALIZED__Z poważaniem\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__ Znajdziesz tu propozycję handlową __PROPREF__ __PERSONALIZED__Sincerely __SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nZnajdziesz tutaj zapytanie o cenę __ASKREF__\n\n __PERSONALIZED__Z poważaniem\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__ Znajdziesz tu porządek __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ Znajdziesz tu nasze zamówienie __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nZnajdziesz tu fakturę __REF__\n\n__PERSONALIZED__Z poważaniem\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__ Znajdziesz tu wysyłkę __SHIPPINGREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__ Znajdziesz tu interwencji __FICHINTERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__ __PERSONALIZED__ __SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
-DemoFundation=Zarządzanie użytkowników o fundacji
+DemoFundation=Zarządzanie członkami fundacji
 DemoFundation2=Zarządzanie członkami i kontami bankowymi fundacji
 DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Zarządzanie sklepem z kasy
 DemoCompanyProductAndStocks=Company selling products with a shop
 DemoCompanyAll=Company with multiple activities (all main modules)
-CreatedBy=Utworzono %s
+CreatedBy=Utworzone przez %s
 ModifiedBy=Zmodyfikowane przez %s
-ValidatedBy=Zatwierdzona przez %s
+ValidatedBy=Zatwierdzone przez %s
 ClosedBy=Zamknięte przez %s
-CreatedById=ID użytkownika, który stworzył
+CreatedById=ID użytkownika który stworzył
 ModifiedById=User id who made latest change
-ValidatedById=ID użytkownika, który zatwierdzony
-CanceledById=ID użytkownika, który anulowane
-ClosedById=ID użytkownika, który zamknięty
-CreatedByLogin=Nazwa użytkownika, który stworzył
+ValidatedById=ID użytkownika który zatwierdzał
+CanceledById=ID użytkownika który anulował
+ClosedById=ID użytkownika który zamknął
+CreatedByLogin=Nazwa użytkownika który stworzył
 ModifiedByLogin=User login who made latest change
-ValidatedByLogin=Nazwa użytkownika, który zatwierdzony
-CanceledByLogin=Nazwa użytkownika, który anulowane
-ClosedByLogin=Nazwa użytkownika, który zamknięty
-FileWasRemoved=Plik został usunięty
-DirWasRemoved=Katalog został usunięty
+ValidatedByLogin=Nazwa użytkownika który zatwierdził
+CanceledByLogin=Nazwa użytkownika który anulował
+ClosedByLogin=Nazwa użytkownika który zamknął
+FileWasRemoved=Plik %s został usunięty
+DirWasRemoved=Katalog %s został usunięty
 FeatureNotYetAvailable=Feature not yet available in the current version
 FeaturesSupported=Supported features
 Width=Szerokość
 Height=Wysokość
 Depth=Głębokość
-Top=Top
-Bottom=Dno
-Left=W lewo
+Top=Góra
+Bottom=Dół
+Left=Lewo
 Right=Prawo
-CalculatedWeight=Beregnet vekt
-CalculatedVolume=Beregnet volum
+CalculatedWeight=Obliczona waga
+CalculatedVolume=Obliczona wartość
 Weight=Waga
 WeightUnitton=tonne
 WeightUnitkg=kg
@@ -145,56 +159,56 @@ BackToLoginPage=Powrót do strony logowania
 AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br />In this mode, Dolibarr can't know nor change your password.<br />Contact your system administrator if you want to change your password.
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Prof ID %s</b> jest informacji w zależności od trzeciej kraju. <br> Na przykład, dla <b>kraju, %s,</b> jest to <b>kod %s.</b>
-DolibarrDemo=Dolibarr ERP / CRM demo
-StatsByNumberOfUnits=Statystyki liczby jednostek
-StatsByNumberOfEntities=Statystyki liczby podmiotów
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Ilość zamówień klientów przez ostatnie 12 miesięcy
-NumberOfCustomerInvoices=Ilość faktur klientów przez ostatnie 12 miesięcy
-NumberOfSupplierProposals=Ilość propozycji dostawców przez ostatnie 12 miesięcy
-NumberOfSupplierOrders=Ilość zamówień dostawców przez ostatnie 12 miesięcy
-NumberOfSupplierInvoices=Ilość faktur dostawców przez ostatnie 12 miesięcy
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Ilość sztuk artykułu w zamówieniach klienta przez ostatnie 12 miesięcy
-NumberOfUnitsCustomerInvoices=Ilość sztuk artykułu na fakturach klientów przez ostatnie 12 miesięcy
-NumberOfUnitsSupplierProposals=Ilość sztuk na propozycjach dostawców przez ostatnie 12 miesięcy
-NumberOfUnitsSupplierOrders=Ilość sztuk artykułu w zamówieniach dostawców przez ostatnie 12 miesięcy
-NumberOfUnitsSupplierInvoices=Ilość sztuk artykułu na fakturach dostawców przez ostatnie 12 miesięcy
+DolibarrDemo=Demo Dolibarr ERP/CRM
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=Interwencja %s zatwierdzone
-EMailTextInvoiceValidated=Faktura %s zatwierdzone
+EMailTextInvoiceValidated=Faktura %s została zatwierdzona
 EMailTextProposalValidated=Forslaget %s har blitt validert.
-EMailTextOrderValidated=Ordren %s har blitt validert.
-EMailTextOrderApproved=Postanowienie %s zatwierdzone
+EMailTextOrderValidated=Zamówienie %s zostało zatwierdzone
+EMailTextOrderApproved=Zamówienie %s zostało zaakceptowane.
 EMailTextOrderValidatedBy=Kolejność% s został nagrany przez% s.
-EMailTextOrderApprovedBy=Zamówienie zatwierdzone przez %s %s
-EMailTextOrderRefused=Postanowienie %s odmówił
-EMailTextOrderRefusedBy=Postanowienie %s %s odmawia
-EMailTextExpeditionValidated=Wysyłka% s został zatwierdzony.
+EMailTextOrderApprovedBy=Zamówienie %s zostało zaakceptowane przez %s.
+EMailTextOrderRefused=Zamówienie %s zostało odrzucone.
+EMailTextOrderRefusedBy=Zamówienie %s zostało odrzucone przez %s.
+EMailTextExpeditionValidated=Wysyłka %s została zatwierdzone.
 ImportedWithSet=Przywóz zestaw danych
-DolibarrNotification=Automatyczne powiadomienia
+DolibarrNotification=Automatyczne powiadomienie
 ResizeDesc=Skriv inn ny <b>bredde</b> eller ny høyde. Forhold vil bli holdt under resizing ...
-NewLength=Ny bredde
-NewHeight=Ny høyde
-NewSizeAfterCropping=Ny størrelse etter beskjæring
+NewLength=Nowa szerokość
+NewHeight=Nowa waga
+NewSizeAfterCropping=Nowy rozmiar po przycięciu
 DefineNewAreaToPick=Definer nytt område på bildet for å plukke (venstre klikk på bildet og dra til du kommer til motsatt hjørne)
-CurrentInformationOnImage=Informasjon om gjeldende bilde
+CurrentInformationOnImage=To narzędzie zostało zaprojektowane aby pomóc ci w zmianie wielkości lub przycięciu obrazu.
 ImageEditor=Edytor obrazów
 YouReceiveMailBecauseOfNotification=Du mottar denne meldingen fordi din e-post har blitt lagt til listen over mål for å bli informert om spesielle hendelser i %s programvare av %s.
 YouReceiveMailBecauseOfNotification2=Denne hendelsen er følgende:
 ThisIsListOfModules=To jest lista modułów selekcjonowane przez tego profilu demo (tylko najczęściej moduły są widoczne w tym demo). Zmodyfikować, aby mieć bardziej spersonalizowany demo i kliknij &quot;Start&quot;.
-UseAdvancedPerms=Korzystać z zaawansowanych uprawnień niektórych modułów
+UseAdvancedPerms=Użyj zaawansowanych uprawnień niektórych modułów
 FileFormat=Format pliku
 SelectAColor=Wybierz kolor
 AddFiles=Dodaj pliki
 StartUpload=Rozpocznij przesyłanie
 CancelUpload=Anuluj przesyłanie
-FileIsTooBig=Plików jest zbyt duży
+FileIsTooBig=Plik jest za duży
 PleaseBePatient=Proszę o cierpliwość...
 RequestToResetPasswordReceived=Wniosek o zmianę hasła Dolibarr został odebrany
-NewKeyIs=To jest twoje nowe klucze, aby zalogować się
+NewKeyIs=To są twoje nowe klucze do logowania
 NewKeyWillBe=Twój nowy klucz, aby zalogować się do programu będzie
-ClickHereToGoTo=Kliknij tutaj, aby przejść do% s
+ClickHereToGoTo=Kliknij tutaj, aby przejść do %s
 YouMustClickToChange=Trzeba jednak najpierw kliknąć na poniższy link, aby potwierdzić tę zmianę hasła
 ForgetIfNothing=Jeśli nie zwrócić tę zmianę, po prostu zapomnieć ten e-mail. Twoje dane są przechowywane w sposób bezpieczny.
 IfAmountHigherThan=Jeśli kwota wyższa niż <strong>%s</strong>
@@ -204,7 +218,7 @@ Chart=Chart
 ##### Export #####
 ExportsArea=Wywóz obszarze
 AvailableFormats=Dostępne formaty
-LibraryUsed=Librairie
+LibraryUsed=Użyte biblioteki
 LibraryVersion=Library version
 ExportableDatas=Eksport danych
 NoExportableData=Nr eksport danych (bez modułów z eksportowane dane załadowane lub brakujące uprawnienia)
diff --git a/htdocs/langs/pl_PL/projects.lang b/htdocs/langs/pl_PL/projects.lang
index 6afa35d22e2..3c493284115 100644
--- a/htdocs/langs/pl_PL/projects.lang
+++ b/htdocs/langs/pl_PL/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Obszar projektów
 ProjectStatus=Status projektu
 SharedProject=Wszyscy
 PrivateProject=Kontakty projektu
+ProjectsImContactFor=Projects I'm explicitely a contact of
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=Wszystkie projekty
 MyProjectsDesc=Ten widok jest ograniczony do projektów dla których jesteś kontaktem (cokolwiek jest w typie).
 ProjectsPublicDesc=Ten widok przedstawia wszystkie projekty, które możesz przeczytać.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,6 +26,7 @@ TasksDesc=Ten widok przedstawia wszystkie projekty i zadania (twoje uprawnienia
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=Nowy projekt
 AddProject=Tworzenie projektu
 DeleteAProject=Usuń projekt
@@ -30,13 +34,14 @@ DeleteATask=Usuń zadanie
 ConfirmDeleteAProject=Czy usunąć ten projekt?
 ConfirmDeleteATask=Czy usunąć to zadanie?
 OpenedProjects=Otwarte projekty
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Szanse ilość otwartych projektów przez statusu
+OpenedTasks=Otwarte zadania
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Pokaż projekt
 SetProject=Ustaw projekt
 NoProject=Żadny projekt niezdefiniowany lub nie jest twoją własnością
 NbOfProjects=Liczba projektów
+NbOfTasks=Nb of tasks
 TimeSpent=Czas spędzony
 TimeSpentByYou=Czas spędzony przez Ciebie
 TimeSpentByUser=Czas spędzony przez użytkownika
@@ -47,9 +52,9 @@ TaskTimeSpent=Czas spędzony na zadaniach
 TaskTimeUser=Użytkownik
 TaskTimeNote=Uwaga
 TaskTimeDate=Data
-TasksOnOpenedProject=Zadania na otwartych projektach
+TasksOnOpenedProject=Zadania w otwartych projektach
 WorkloadNotDefined=Czas pracy nie zdefiniowany
-NewTimeSpent=Nowy czas spędzony
+NewTimeSpent=Czas spędzony
 MyTimeSpent=Mój czas spędzony
 Tasks=Zadania
 Task=Zadanie
@@ -59,6 +64,7 @@ TaskDescription=Opis zadania
 NewTask=Nowe zadania
 AddTask=Tworzenie zadania
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Aktywność
 Activities=Zadania / aktywności
 MyActivities=Moje zadania / aktywności
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=Lista szablonów faktur klientów powią
 ListSupplierOrdersAssociatedProject=Lista zamówień dostawców powiązanych z projektem
 ListSupplierInvoicesAssociatedProject=Lista faktur dostawców powiązanych z projektem
 ListContractAssociatedProject=Wykaz umów związanych z projektem
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=Wykaz interwencji związanych z projektem
 ListExpenseReportsAssociatedProject=Lista raportów o wydatkach związanych z projektem
 ListDonationsAssociatedProject=Lista dotacji związanych z projektem
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Czy otworzyć na nowo ten projekt?
 ProjectContact=Kontakty projektu
 ActionsOnProject=Działania w ramach projektu
 YouAreNotContactOfProject=Nie jestes kontaktem tego prywatnego projektu
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Usuń czas spędzony
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=Zobacz również zadania nie przypisane do mnie
@@ -110,7 +118,7 @@ TaskRessourceLinks=Zasoby
 ProjectsDedicatedToThisThirdParty=Projekty poświęcone tej stronie trzeciej
 NoTasks=Brak zadań dla tego projektu
 LinkedToAnotherCompany=Powiązane z innymą częścią trzecią
-TaskIsNotAffectedToYou=Zadanie nie jest przypisany do Ciebie
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=Czas spędzony jest pusty
 ThisWillAlsoRemoveTasks=To działanie także usunie wszystkie zadania projektu (<b>%s</b> zadania w tej chwili) i wszystkie dane wejścia czasu spędzonego.
 IfNeedToUseOhterObjectKeepEmpty=Jeżeli pewne obiekty (faktura, zamówienie, ...), należące do innej części trzeciej, muszą być związane z projektem tworzenia, zachowaj to puste by projekt był wielowątkowy -(wiele części trzecich).
@@ -155,33 +163,38 @@ DocumentModelBeluga=Szablon projektu na przegląd połączonych obiektów
 DocumentModelBaleine=Szablon projektu raportu dla zadań
 PlannedWorkload=Planowany nakład pracy
 PlannedWorkloadShort=Nakład pracy
-ProjectReferers=Related items
+ProjectReferers=Powiązane elementy
 ProjectMustBeValidatedFirst=Projekt musi być najpierw zatwierdzony
 FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Wejścia na dzień
 InputPerWeek=Wejścia w tygodniu
 InputPerAction=Wejścia na działanie
-TimeAlreadyRecorded=Czas spędzony (zarejestrowany do tej pory) dla tego zadanie / dzień i użytkownik %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projekty z tym użytkownika jako kontakt
 TasksWithThisUserAsContact=Zadania dopisane do tego użytkownika
 ResourceNotAssignedToProject=Nie przypisane do projektu
 ResourceNotAssignedToTheTask=Nie dopisane do zadania
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Przypisz zadanie do mnie
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Przydzielać
 ProjectOverview=Przegląd
 ManageTasks=Użyj projektów do śledzenia zadań i czasu
 ManageOpportunitiesStatus=Użyj projekty śledzić pozostawienie danych kontaktowych / opportinuties
 ProjectNbProjectByMonth=Liczba stworzynych projektów w miesiącu
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Ilość możliwości w danym miesiącu
 ProjectWeightedOppAmountOfProjectsByMonth=Ważona ilość szans na miesiąc
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statystyki dotyczące projektów / przewodów
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Zadanie przypisanie. Wprowadzenie czasu na zadanie powinno być możliwe.
 IdTaskTime=Id razem zadaniem
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Projekty otwarte przez kontahentów
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Szanse Całkowita ilość
 OpportunityPonderatedAmount=Ilość możliwości ważone
diff --git a/htdocs/langs/pt_BR/accountancy.lang b/htdocs/langs/pt_BR/accountancy.lang
index 25e6fd6c775..a4765b0f22d 100644
--- a/htdocs/langs/pt_BR/accountancy.lang
+++ b/htdocs/langs/pt_BR/accountancy.lang
@@ -11,8 +11,6 @@ ACCOUNTING_EXPORT_PREFIX_SPEC=Especifique o prefixo do nome do arquivo
 AccountancySetupDoneFromAccountancyMenu=A maioria das configurações da Contabilidade é feita a partir do menu %s
 ConfigAccountingExpert=Configuração do módulo específico de contabilidade
 Journalization=Lançamento no Livro
-Journaux=Diários
-JournalFinancial=Diários financeiros
 Chartofaccounts=Plano de contas
 AccountancyArea=Área da Contabilidade
 AccountancyAreaDescIntro=O uso do módulo Contabilidade é feito em diversas etapas:
@@ -20,7 +18,6 @@ AccountancyAreaDescActionOnce=As ações a seguir são normalmente realizadas ap
 AccountancyAreaDescActionFreq=As ações a seguir são normalmente executadas a cada mês, semana ou dia para grandes empresas...
 AccountancyAreaDescChartModel=ETAPA %s: Criar um modelo de gráfico de conta a partir do menu %s
 AccountancyAreaDescChart=ETAPA %s: Criar ou verificar o conteúdo do seu gráfico de conta a partir do menu %s
-AccountancyAreaDescWriteRecords=ETAPA %s: Grave as transações na Contabilidade Geral. Para isto, vá para cada Registro, e clique no botão "Registrar as transações na Contabilidade Geral".
 AccountancyAreaDescAnalyze=ETAPA %s: Adicionar ou editar as transações existentes, gerar os relatórios e exportar.
 AccountancyAreaDescClosePeriod=ETAPA %s: Fechar o período de forma que não possamos fazer modificações no futuro.
 Selectchartofaccounts=Selecione gráfico ativo de contas
@@ -28,25 +25,17 @@ ChangeAndLoad=Alterar e carregar
 Addanaccount=Adicionar uma conta contábil
 AccountAccounting=Conta contábil
 AccountAccountingSuggest=Sugerir Conta de Contabilidade
-MenuDefaultAccounts=Contas padrão
 MenuProductsAccounts=Contas de produto
 ProductsBinding=Contas dos produtos
 Ventilation=Vinculando para as contas
 CustomersVentilation=Vinculando as faturas do cliente
 SuppliersVentilation=Vinculando as faturas do fornecedor
-CreateMvts=Criar nova transação
-UpdateMvts=Modificação de uma transação
-WriteBookKeeping=Diário de transações em Contabilidade Geral
-Bookkeeping=Livro razão
-AccountBalance=Saldo da conta
 CAHTF=Total de Compras em fornecedores sem Impostos
 InvoiceLines=Linhas da fatura a vincular
 InvoiceLinesDone=Linhas das faturas vinculadas
 IntoAccount=Vincular linha com conta contábil
-Ventilate=Vincular
+Processing=Processando
 EndProcessing=Processo foi finalizado.
-SelectedLines=Linhas selecionadas
-Lineofinvoice=Linha da fatura
 NoAccountSelected=Nenhuma conta da Contabilidade selecionada
 VentilatedinAccount=Vinculado a conta contábil com sucesso
 NotVentilatedinAccount=Não vinculado a conta contábil
@@ -57,45 +46,30 @@ ACCOUNTING_LIST_SORT_VENTILATION_TODO=Iniciar a página "Vinculações a fazer"
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Iniciar a página "Vinculações feitas" ordenando pelos elementos mais recentes
 ACCOUNTING_LENGTH_DESCRIPTION=Truncar a descrição de Produtos & Serviços nas listagens, após x caracteres (Melhor = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncar a descrição da conta de Produtos & Serviços nas listagens, após X caracteres (Melhor = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Tamanho das contas contábeis geral
-ACCOUNTING_LENGTH_AACCOUNT=Tamanho das contas contábeis de terceiros
-ACCOUNTING_MANAGE_ZERO=Gerenciar o zero no fim de uma conta da Contabilidade. Necessário em alguns países. Desabilitado como padrão. Se habilitado, você deve também definir os 2 parâmetros seguintes (ou isto é ignorado).
+ACCOUNTING_LENGTH_GACCOUNT=Comprimento das contas de contabilidade geral (se o valor configurado for 6, a conta '706' aparecerá como '706000' na tela)
 BANK_DISABLE_DIRECT_INPUT=Desabilitar o registro direto da transação na conta bancária
 ACCOUNTING_SELL_JOURNAL=Resumo diário das Vendas
 ACCOUNTING_PURCHASE_JOURNAL=Resumo diário das Compras
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Diário diversos
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Diário de relatórios de despesas
-Docref=Referência
 Code_tiers=Terceiro
 Labelcompte=Conta rótulo
 Sens=Significado
-NumPiece=Número da peça
 TransactionNumShort=Nº da transação
-AccountingCategory=Categoria contábil
 GroupByAccountAccounting=Agrupar pela conta da Contabilidade
 NotMatch=Não Definido
-DeleteMvt=Excluir as linhas da Contabilidade geral
 DelYear=Ano a ser deletado
 DelJournal=Resumo a ser deletado
-ConfirmDeleteMvt=Isto excluirá todas as linhas da Contabilidade geral para o ano e/ou de um registro específico. É exigido pelo menos um critério.
-ConfirmDeleteMvtPartial=Isto excluirá a(s) linha(s) selecionada(s) da Contabilidade geral
-FinanceJournal=Diário financeiro
-DescFinanceJournal=Diário financeiro incluindo todos os tipos de pagamentos por conta bancária
-DescJournalOnlyBindedVisible=Esta é uma visualização do registro que está vinculado à conta da Contabilidade dos produtos/serviços e que pode ser também registrado na Contabilidade Geral.
 VATAccountNotDefined=Conta para ICMS não definida
 ThirdpartyAccountNotDefined=Conta para terceiro não definida
 ProductAccountNotDefined=Conta para produto não definida
 BankAccountNotDefined=Conta para o banco não definida
 ThirdPartyAccount=Conta de terceiro
-NewAccountingMvt=Nova transação
-NumMvts=Número da transação
 ListeMvts=Lista de movimentações
 ErrorDebitCredit=Débito e Crédito não pode ter valor preenchido ao mesmo tempo
-ReportThirdParty=Lista de contas de terceiros
 DescThirdPartyReport=Consulte aqui a lista dos terceiros, clientes e fornecedores, e as suas contas contábeis
 ListAccounts=Lista das contas contábeis
 Pcgtype=Classes de conta
-Pcgsubtype=Sob classe de conta
 TotalVente=Volume total negociado sem Impostos
 TotalMarge=Margem de vendas totais
 DescVentilCustomer=Consulte aqui a lista linhas de pedidos de clientes vinculadas (ou não) a uma conta contábil de produto
@@ -109,16 +83,11 @@ ValidateHistory=Vincular Automaticamente
 AutomaticBindingDone=Vinculação automática realizada
 ErrorAccountancyCodeIsAlreadyUse=Erro, você não pode excluir esta conta contábil, pois ela esta em uso
 MvtNotCorrectlyBalanced=Movimento sem o equilíbrio correto. Crédito = %s. Débito = %s
-FicheVentilation=Cartão de vinculação
-GeneralLedgerIsWritten=As transações são gravadas na Contabilidade geral
-GeneralLedgerSomeRecordWasNotRecorded=Algumas das transações poderão não ser registradas.
-NoNewRecordSaved=Nenhum novo registro salvo
 ListOfProductsWithoutAccountingAccount=Lista de produtos não vinculados a qualquer conta da Contabilidade
 ChangeBinding=Alterar a vinculação
-ApplyMassCategories=Aplicar categorias em massa
+AccountingJournalType2=De vendas
 OptionsDeactivatedForThisExportModel=Para este modelo de exportação, as opções são desativadas
 Selectmodelcsv=Escolha um modelo de exportação
-Modelcsv_normal=Exportação clássica
 Modelcsv_CEGID=Exportação em direção CEGID Especialista em Contabilidade
 Modelcsv_COALA=Exportar para Sage Coala
 Modelcsv_bob50=Exportar para Sage BOB 50
@@ -129,17 +98,10 @@ Modelcsv_cogilog=Exportar para Cogilog
 InitAccountancy=Contabilidade Inicial
 InitAccountancyDesc=Esta página pode ser usada para inicializar uma conta da Contabilidade dos produtos e serviços que não possuem uma conta da Contabilidade definida para vendas e compras.
 DefaultBindingDesc=Esta página pode ser usada para definir a conta padrão a ser usada para conectar o registro das transações sobre o pagamento de salários, doações, taxas e o ICMS quando nenhuma conta da Contabilidade específica tiver sido definida.
-Options=Opções
 OptionModeProductSell=Modo vendas
 OptionModeProductBuy=Modo compras
 CleanFixHistory=Remover o código da Contabilidade das linhas que não existem nos gráficos da conta
 CleanHistory=Redefinir todas as vinculações para o ano selecionado
 Range=Faixa da conta da Contabilidade
-Calculated=Calculado
-Formula=Fórmula
-ErrorNoAccountingCategoryForThisCountry=Nenhuma categoria da Contabilidade disponível para o país %s (Veja Início - Configuração - Dicionários)
 ExportNotSupported=O formato de exportação definido não é suportado nesta página
 BookeppingLineAlreayExists=Linhas já existentes na Contabilidade
-Binded=Linhas vinculadas
-ToBind=Linhas a vincular
-WarningReportNotReliable=Alerta, este relatório não está baseado na Contabilidade Geral, portanto não é ainda confiável. Ele será substituído por um relatório correto na próxima versão.
diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang
index a7fdad6e2ef..c5e2eefe797 100644
--- a/htdocs/langs/pt_BR/admin.lang
+++ b/htdocs/langs/pt_BR/admin.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
-Foundation=Fundação
-Version=Versão
 VersionProgram=Versão Programa
 VersionLastInstall=Versão de instalação inicial
 VersionLastUpgrade=Atualização versão mais recente
@@ -9,20 +7,12 @@ VersionDevelopment=Versão de Desenvolvimento
 VersionUnknown=Versão Desconhecida
 VersionRecommanded=Versão Recomendada
 FileCheck=Verificador da integridade dos arquivos
-FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. Value of some setup constants may also be checked. You can use this tool to detect if some files were modified by a hacker for example.
-FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
-GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Realizar a análise da integridade dos arquivos do aplicativo em
 LocalSignature=Assinatura local integrada (menos confiável)
 RemoteSignature=Assinatura remota distante (mais confiável)
 FilesMissing=Arquivos ausentes
 FilesUpdated=Arquivos atualizados
-FilesModified=Modified Files
-FilesAdded=Added Files
 FileCheckDolibarr=Verificar a integridade dos arquivos do aplicativo
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Não encontrado o Arquivo Xml da integridade
 SessionId=ID da sessão
 SessionSaveHandler=Manipulador para salvar sessão
@@ -58,18 +48,14 @@ ErrorModuleRequirePHPVersion=Erro, este módulo requer uma versão %s ou superio
 ErrorModuleRequireDolibarrVersion=Erro, este módulo requer uma versão %s ou superior do Dolibarr
 ErrorDecimalLargerThanAreForbidden=Erro, número maior que <b>%s</b> e não é suportada pelo dolibarr.
 DictionarySetup=Configuração Dicionário
-Dictionary=Dicionários
 ErrorReservedTypeSystemSystemAuto=A Variável 'system' e 'systemauto' é reservada. Você pode usar 'user' como variável para adicionar sua própria gravação
 ErrorCodeCantContainZero=A variável não pode conter valor "0" (zero)
 DisableJavascript=Desativar as funções Javascript e Ajax
 UseSearchToSelectCompanyTooltip=Além disso, se você tem um grande número de terceiros (> 100 000), você pode aumentar a velocidade, definindo COMPANY_DONOTSEARCH_ANYWHERE constante a 1 em Setup-> Outro. Busca, então, ser limitada até o início da string.
 UseSearchToSelectContactTooltip=Além disso, se você tem um grande número de terceiros (> 100 000), você pode aumentar a velocidade, definindo CONTACT_DONOTSEARCH_ANYWHERE constante a 1 em Setup-> Outro. Busca, então, ser limitada até o início da string.
-DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties, but it is less convenient)
-DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact, but it is less convenient)
 NumberOfKeyToSearch='Nbr' dos caracteres para 'trigger search': %s
 NotAvailableWhenAjaxDisabled=Indisponível quando o Ajax esta desativado
 AllowToSelectProjectFromOtherCompany=No documento de um terceiro, pode-se escolher um projeto conectado a outro terceiro
-JavascriptDisabled=JavaScript desativado
 UsePreviewTabs=Usar previsão de digitação na tecla 'tab'
 ShowPreview=Mostrar Previsão
 PreviewNotAvailable=Previsão Indisponível
@@ -77,24 +63,18 @@ ThemeCurrentlyActive=Tema Ativo
 CurrentTimeZone=Timezone PHP (do servidor apache)
 MySQLTimeZone=Timezone Mysql (do servidor sql)
 TZHasNoEffect=A data é armazenada e retornada pelo servidor sql se eles manterem a string apresentada. A timezone é resultado somente se for usado a função UNIX_TIMESTAMP (Não deve ser usada pelo Dolibarr, se não a database TZ não terá efeito, mesmo se tivesse trocada depois da data ter entrado).
-Space=Área
-Table=Tabela
-Fields=Campos
-Index=Index
-Mask=Mask
 NextValue=Próximo Valor
 NextValueForInvoices=Próximo Valor (Faturas)
 NextValueForCreditNotes=Próximo Valor (Notas de Crédito)
-NextValueForDeposit=Próximo Valor (Depósito)
 NextValueForReplacements=Próximo Valor (Substituição)
 MustBeLowerThanPHPLimit=OBS: Tamanho máximo de upload é <b>%s</b> %s de máximo, qualquer que seja o valor do parâmetro é
 NoMaxSizeByPHPLimit=Nenhum limite foi configurado no seu PHP
 MaxSizeForUploadedFiles=Tamanho Máximo para uploads de arquivos ('0' para proibir o carregamento)
 UseCaptchaCode=Usar captcha para login (recomendado se os usuários tiverem acesso ao Dolibarr pela internet)
-AntiVirusCommand= Caminho completo para antivirus
-AntiVirusCommandExample= Exemplo com o ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Exemplo com o ClamAv: /usr/bin/clamscan (UNIX)
-AntiVirusParam= Mais parâmetros em linha de comando (CLI)
-AntiVirusParamExample= Exemplo com o ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusCommand=Caminho completo para antivirus
+AntiVirusCommandExample=Exemplo com o ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Exemplo com o ClamAv: /usr/bin/clamscan (UNIX)
+AntiVirusParam=Mais parâmetros em linha de comando (CLI)
+AntiVirusParamExample=Exemplo com o ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Conf. do Módulo Contabilidade
 UserSetup=Conf. do Gestor de usuários
 MultiCurrencySetup=Configuração de múltiplas moedas
@@ -102,38 +82,26 @@ MenuLimits=Limites e Precisão
 MenuIdParent=ID do menu pai
 DetailMenuIdParent=ID do menu pai (vazio (NULL) para menu no topo)
 DetailPosition=Define as posições do menu em ordem numérica
-AllMenus=Todos
-NotConfigured=Módulo não está configurado
-Active=Ativo
 SetupShort=Conf.
 OtherOptions=Outras Opções
 OtherSetup=Outras Configurações
-CurrentValueSeparatorDecimal=Separador decimal
 CurrentValueSeparatorThousand=Separador de milhar
-Destination=Destino
 IdModule=Módulo ID
 IdPermissions=Permissão ID
-Modules=Módulos
 LanguageBrowserParameter=Parâmetro de Linguagem %s
 LocalisationDolibarrParameters=Parâmetros de Localização
 ClientTZ=Fuso Horário do cliente (usuário)
 ClientHour=Horário do Cliente (usuário)
 OSTZ=Fuso Horário do OS do Servidor
 PHPTZ=Fuso Horário do servidor PHP
-DaylingSavingTime=Horário de verão
 CurrentHour=Horário PHP (servidor)
 CurrentSessionTimeOut=A sessão expirou
-YouCanEditPHPTZ=Para trocar diferente PHP 'timezone' (não requerido), você pode tentar adicionando um arquivo .htacces com uma linha tipo essa "SetEnv TZ Europe/Paris"
-Box=Widget
-Boxes=Widgets
 MaxNbOfLinesForBoxes=Número máximo de linahs para os widgets
 PositionByDefault=Posição Padrão(default)
-Position=Posição
 MenusDesc=O Gerenciador de Menu, define o conteúdo das barras de menu (Horizontal e Vertical).
 MenusEditorDesc=O Editor de menu permite definir entradas personalizadas ao menu.<br />Use-o com cuidado para evitar instabilidades e que os menus fiquem totalmente inacessiveis.<br />Alguns módulos adicionam entradas do menu ( no menu <b>Geral</b> principalmente). Se você remover algumas destas entradas por engano, você poderá restaurá-las desabilitando e habilitando o módulo novamente.
 MenuForUsers=Menu para os Usuários
 LangFile=Arquivo .lang
-System=Sistema
 SystemInfo=Informações de Sistema
 SystemToolsArea=Área de Ferramentas do sistema
 SystemToolsAreaDesc=Essa área dispõe de funções administrativas. Use esse menu para escolher as funções que você está procurando.
@@ -149,8 +117,6 @@ PurgeNDirectoriesDeleted=<b>%s</b> Arquivos o diretórios eliminados
 PurgeAuditEvents=Eliminar os eventos de segurança
 ConfirmPurgeAuditEvents=Você tem certeza que deseja limpar todos os eventos de segurança? Todos os registros de segurança serão excluídos, nenhum outro dado será removido.
 GenerateBackup=Gerar Backup
-Backup=Backup
-Restore=Restaurar
 RunCommandSummary=Backup foi iniciado com o seguinte comando
 BackupResult=Resultado de backup
 BackupFileSuccessfullyCreated=Sucesso em gerar o arquivo de backup! =D
@@ -169,15 +135,10 @@ CommandsToDisableForeignKeysForImport=Comando para desativar as chaves estrangei
 CommandsToDisableForeignKeysForImportWarning=Mandatório se você quiser ser capaz de restaurar seu 'sql dump' depois
 ExportCompatibility=Compatibilidade de gerar arquivos de exportação
 MySqlExportParameters=Parâmetros de exportação do MySql
-PostgreSqlExportParameters= Parâmetros de exportação do PostgreSQL
+PostgreSqlExportParameters=Parâmetros de exportação do PostgreSQL
 UseTransactionnalMode=Utilizar o modo transicional(transactional mode)
-FullPathToMysqldumpCommand=Caminho completo para o comando mysqldump
-FullPathToPostgreSQLdumpCommand=Caminho completo para o comando pg_dump
-ExportOptions=Opções de exportação
 AddDropDatabase=Adicionar  o comando 'DROP DATABASE'
 AddDropTable=Adicionar o comando 'DROP TABLE'
-ExportStructure=Estrutura
-NameColumn=Nome das colunas
 ExtendedInsert=Extender o INSERT
 NoLockBeforeInsert=Não travar comando antes do INSERT
 DelayedInsert=Inserir Atraso
@@ -186,14 +147,10 @@ IgnoreDuplicateRecords=Ignorar erros de registro duplicado (INSERT IGNORE)
 AutoDetectLang=Autodetecção de idioma pelo navegador
 FeatureDisabledInDemo=Algumas funções desabilitada no Demo
 FeatureAvailableOnlyOnStable=Funcionalidade somente disponível em versões estáveis oficiais
-Rights=Permissões
 BoxesDesc=Os widgets são componentes que exibem alguma informação que você pode adicionar para personalizar algumas páginas. Você pode escolher entre a exibição ou não do widget pela seleção da página de destino e clicando em "Ativar", ou clicando na lixeira para desabilitá-lo.
 OnlyActiveElementsAreShown=Somente elementos de <a href="%s">módulos ativos</a> são mostrado.
-ModulesDesc=Os módulos do Dolibarr definem qual funcionalidade está habilitada no aplicativo. Alguns módulos exigem permissões que você deve garantir aos usuários, após a habilitação do código. Clique no botão on/off para habilitar um módulo/funcionalidade.
 ModulesMarketPlaceDesc=Você pode encontrar mais módulos para download em sites externos na Internet ...
-ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external modules...
-GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
+ModulesMarketPlaces=Localizar módulos externos
 DoliStoreDesc=DoliStore, o site oficial para baixar módulos externos.
 DoliPartnersDesc=Lista das empresas que realizam o serviço de desenvolvimento de módulos ou funcionalidades personalizadas (Nota: qualquer pessoa com experiência na programação em PHP pode realizar o desenvolvimento personalizado para um projeto com código fonte aberto)
 WebSiteDesc=Sites de referência para encontrar mais módulos ...
@@ -204,18 +161,15 @@ ActivateOn=Ativar
 ActiveOn=Ativa
 SourceFile=Arquivo Fonte
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponível somente se Javascript não estiver desativado
-Required=Requerido
 UsedOnlyWithTypeOption=Usado por alguns opção agenda única
-Security=Segurança
 Passwords=Senhas
 DoNotStoreClearPassword=Não armazenar senhas em branco no banco de dados, somente armazenar senhas criptografadas (Ativação é Recomendada)
 MainDbPasswordFileConfEncrypted=Criptografar senha do banco de dados no arquivo conf.php
 InstrucToEncodePass=Para ter a senha codificada no arquivo <b>conf.php</b>, substitua a linha <br><b>$dolibarr_main_db_pass="..."</b><br>por<br><b>$dolibarr_main_db_pass="crypted:%s"</b>
 InstrucToClearPass=Para ter a senha não codificada(limpa) no arquivo <b>conf.php</b>, substitua a linha <br><b>$dolibarr_main_db_pass="crypted:..."</b><br>por<br><b>$dolibarr_main_db_pass="%s"</b>
 ProtectAndEncryptPdfFiles=Criptografar a geração de arquivos em PDF (NÃO RECOMENDADO, póis pode deixar instável a geração de PDFs massivos)
-ProtectAndEncryptPdfFilesDesc=A proteção de um documento PDF o mantém disponível para leitura e impressão em qualquer leitor PDF. Contudo, a edição e a cópia não serão mais possíveis. Favor notar que o uso desta função não permite a criação de um PDF global acumulado (tal como as faturas não pagas).
+ProtectAndEncryptPdfFilesDesc=Proteção de um documento PDF mantém ele disponível para ler e imprimir com qualquer navegador PDF. No entanto, edição e cópia não é possível. Observe que a utilização deste recurso faz com que a construção de um PDF global mesclado não funcione.
 Feature=Destaque
-DolibarrLicense=Licença
 Developpers=Desenvolvedores/Contribuidores
 OfficialWebSite=Site internacional do Dolibarr
 OfficialWebSiteLocal=Web site local (%s)
@@ -224,23 +178,12 @@ OfficialDemo=Demo online do Dolibarr
 OfficialMarketPlace=Loja oficial para módulos externos/addons
 OfficialWebHostingService=Serviços de hospedagem web referenciados (hospedagem na Nuvem)
 ReferencedPreferredPartners=Parceiro preferido
-OtherResources=Outros recursos
 ForDocumentationSeeWiki=Documentos para usuários e desenvolvedores (Doc, FAQs...), <br>de uma olhada no Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=Para outras questões/ajudas, você pode usar o forum do Dolibar:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Essa área pode ajudar você a conseguir serviço de suporte no Dolibarr.
 HelpCenterDesc2=Uma parte desse serviço está disponivel em <b>inglês</b>.
 CurrentMenuHandler=Gestor atual de menu
 MeasuringUnit=Unidade de medida
-LeftMargin=Left margin
-TopMargin=Top margin
-PaperSize=Paper type
-Orientation=Orientation
-SpaceX=Space X
-SpaceY=Space Y
-FontSize=Font size
-Content=Content
-NoticePeriod=Período de aviso
-NewByMonth=New by month
 Emails=E-Mails
 EMailsSetup=Conf. de E-Mails
 EMailsDesc=Essa página permite você a sobrescrever os seus parâmetros PHP para enviar e-mails. Na maioria dos casos dos sistemas Unix/Linux OS, a configuração já está correta, tornando desnecessário esses parâmetros.
@@ -250,64 +193,50 @@ MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Porta SMTP/SMTPS (Não definido no P
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Servidor SMTP/SMTPS (Não definido no PHP nos sistemas tipo Unix)
 MAIN_MAIL_EMAIL_FROM=E-Mail de envio para envios automáticos (Como padrão no php.ini: <b>%s</b>)
 MAIN_MAIL_ERRORS_TO=Remetente do e-mail usado para o erro retorna e-mails enviados
-MAIN_MAIL_AUTOCOPY_TO= Enviar sistematicamente uma cópia carbono oculta de todos os e-mails enviados para
+MAIN_MAIL_AUTOCOPY_TO=Enviar sistematicamente uma cópia carbono oculta de todos os e-mails enviados para
 MAIN_DISABLE_ALL_MAILS=Desabilita o envido de todos os E-Mails (Para testes ou demo)
 MAIN_MAIL_SENDMODE=Método usado para o envio de E-Mails
 MAIN_MAIL_SMTPS_ID=ID SMTP se a autentificação é exigida
 MAIN_MAIL_SMTPS_PW=Senha SMTP se a autenticação é exigida
-MAIN_MAIL_EMAIL_TLS= Usar criptografia TLS (SSL)
-MAIN_MAIL_EMAIL_STARTTLS= Use criptografia TLS (STARTTLS)
+MAIN_MAIL_EMAIL_TLS=Usar criptografia TLS (SSL)
+MAIN_MAIL_EMAIL_STARTTLS=Use criptografia TLS (STARTTLS)
 MAIN_DISABLE_ALL_SMS=Desabilitar todos envios de SMS (Para testes ou demo)
 MAIN_SMS_SENDMODE=Método usado para enviar SMS
 MAIN_MAIL_SMS_FROM=Número de telefone padrão para o envio de SMS
 MAIN_MAIL_DEFAULT_FROMTYPE=Remetente do e-mail como padrão para envios manuais (e-mail do usuário ou e-mail da empresa)
 UserEmail=E-mail do usuário
-CompanyEmail=E-mail da empresa
 FeatureNotAvailableOnLinux=Função não disponível para sistemas tipo Unix. Teste de envio local.
 SubmitTranslation=Se a tradução deste idioma não estiver completa ou se encontrar erros, você poderá corrigir editando os arquivos no diretório <b>langs/%s</b> e submeter sua alteração em www.transifex.com/dolibarr-association/dolibarr/
 SubmitTranslationENUS=Se a tradução para este idioma não está completa ou você encontrar erros, você pode corrigir pela edição dos arquivos no diretório <b>langs/%s</b> e enviar os arquivos modificados para dolibarr.org/forum ou para os desenvolvedores em github.com/Dolibarr/dolibarr.
 ModuleSetup=Conf. do módulo
-ModulesSetup=Conf. dos módulos
-ModuleFamilyBase=Sistema
 ModuleFamilyCrm=Gestão de Relacionamento com o Cliente (CRM)
 ModuleFamilySrm=Gestor da Relação com o Fornecedor (SRM)
 ModuleFamilyProducts=Gestão de Produtos (GP)
 ModuleFamilyHr=Gestão de Recursos Humanos (RH)
 ModuleFamilyProjects=Projetos
-ModuleFamilyOther=Outro
 ModuleFamilyTechnic=Ferramentas para Módulos Múltiplos
 ModuleFamilyExperimental=Módulos Experimentais
 ModuleFamilyFinancial=Módulos Financeiros
 ModuleFamilyECM=Gestão de Conteúdos Eletrônicos (ECM)
 ModuleFamilyPortal=Websites e outras aplicações frontend
-ModuleFamilyInterface=Interfaces com sistemas externos
 MenuHandlers=Gestor de Menus
 MenuAdmin=Editor menus
 DoNotUseInProduction=Não utilizar em produção
-ThisIsProcessToFollow=This is steps to process:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
-StepNb=Passo %s
+ThisIsProcessToFollow=Estas são as etapas para o processo:
 FindPackageFromWebSite=Achar um pacote que possue as funções desejadas (por exemplo no site oficial %s).
 DownloadPackageFromWebSite=Baixar pacote.
-UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <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>.
-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='http://myserver/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.
+UnpackPackageInDolibarrRoot=Descompacte os arquivos no diretório do servidor dedicado ao Dolibarr:<b>%s</b>
+SetupIsReadyForUse=A implantação do módulo está concluída. No entanto, você deve habilitar e configurar o módulo em sua aplicatição, indo na página para configurar os módulos: <a href="%s">%s</a>.
+NotExistsDirect=O diretório root alternativo não está definido para um diretório existente.<br>
+InfDirAlt=Desde a versão 3, é possível definir um diretório-root alternativo. Isso permite que você armazene, em um diretório dedicado, plug-ins e modelos personalizados. <br> Basta criar um diretório na raiz de Dolibarr (por exemplo:custom).<br>
+InfDirExample=<br> Em seguida, declará-lo no arquivo <strong> conf.php </ strong> <br>$dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom' <br> Se essas linhas forem comentadas com "#", para habilitá-las, basta descomentar  removendo o caractere "#".
 YouCanSubmitFile=Selecione o módulo:
-CurrentVersion=Versão atual do Dolibarr
 CallUpdatePage=Vá para a página que atualiza a estrutura de banco de dados e os dados:% s.
-LastStableVersion=Última versão estável
-LastActivationDate=Latest activation date
 UpdateServerOffline=Atualização de servidor off-line
 GenericMaskCodes=Você pode criar suas próprias mascaras para gerar as referências automáticas.<br> Como exemplo inicial a mascara <b>'CLI{000}'</b> vai gerar a ref. <b>CLI001</b>,<b>CLI002</b>,<b>...</b> as mascaras são:<br>Mascara de contagem <b>{0000}</b>, essa mascara vai contar para cada nova ref. ex:<b>0001</b>,<b>0002</b>,<b>0003</b>,<b>...</b><br>Mascara de número inicial ex:<b>{000+100}</b> -> <b>101</b>,<b>102</b>,<b>103</b>,<b>...</b> ex2:<b>{0000+123}</b> -> <b>0124</b>,<b>0125</b>,<b>...</b><br>Mascara da data <b>{dd}</b> dias (01 a 31), <b>{mm}</b> mês (01 a 12), <b>{yy} {yyyy}</b> para anos ex:<b>{dd}/{mm}/{yy}</b> -> <b>28/07/15</b><br>
-GenericMaskCodes2=<b>{cccc}</b> o código do cliente nos caracteres<br><b>{cccc000}</b> o código do cliente nos caracteres é seguido por um contador dedicado ao cliente. Este contador dedicado ao cliente é redefinido ao mesmo tempo que o contador global.<br><b>{tttt}</b> O código do tipo de terceiros em n caracteres (veja o dicionário-tipos de terceiros).<br>
 GenericMaskCodes3=Não é permitido espaços. <br>Mascara fixa, basta colocar uma letra ou número sem <b>{}</b> ex:<b>CLI</b>,<b>FOR</b></b><br>
-GenericMaskCodes4a=Ex: <b>TESTE{000+100}.{mm}.{yy}</b> -> <b>TESTE101.07.15</b>,<b>TESTE102.07.15</b><br>
 GenericMaskCodes4b=Ex: CLI{dd}{mm}{yy}.{000} -> <b>CLI280715.001</b><br>
 GenericMaskCodes4c=Ex: PRODUTO{000+100} -> <b>PRODUTO101</b><br>
-GenericMaskCodes5=Ex:<b>ABC{yy}{mm}-{000000}</b> -> <b>ABC1507-000099</b><br>
 GenericNumRefModelDesc=Retorna um número costomizado de acordo com a mascara definida.
 ServerAvailableOnIPOrPort=Servidor disponível no endeço <b>%s</b> e porta <b>%s</b>
 ServerNotAvailableOnIPOrPort=Servidor não disponível no endereço <b>%s</b> e porta <b>%s</b>
@@ -319,12 +248,11 @@ ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Erro, não pode utilizar a opç
 UMask=Parâmetros da UMask para novos arquivos nos sistemas de arquivos Unix/Linux/BSD/Mac.
 UMaskExplanation=Esses parâmetros permitem você definir permissões por default nos arquivos criado pelo Dolibarr no servidor (Ex: durante upload).<br>Deve ser em formato octal (Ex: 06666 significa que tem permissão de leitura e escrita para todo mundo).<br> Esse parâmetro é inutil para servidores windows.
 SeeWikiForAllTeam=Veja a página da wiki para ver a lista de todos os autores e essa organização
-UseACacheDelay= Atraso para exportação de cache em segundos (0 ou vazio para sem cache)
+UseACacheDelay=Atraso para exportação de cache em segundos (0 ou vazio para sem cache)
 DisableLinkToHelpCenter=Esconder link "<b>Precisa de ajuda ou suporte</b>" na página de login
 DisableLinkToHelp=Ocultar link para ajuda online "<b>%s</b>"
 AddCRIfTooLong=Não possui nenhum empacotamento automático, então se a linha sair da página do documento é porque é muito comprida, você precisa adicionar você mesmo um retorno de transporte(carriage) na área de texto.
 ConfirmPurge=Você tem certeza que deseja executar esta limpeza?<br>Isto excluirá definitivamente todos os arquivos de dados sem qualquer chance de restaurá-los (arquivos ECM, arquivos anexos...).
-MinLength=Comprimento mínimo
 LanguageFilesCachedIntoShmopSharedMemory=Os arquivos .lang foram carregados na memória compartilhada
 ExamplesWithCurrentSetup=Exemplos com atuais configurações que estão rodando
 ListOfDirectories=Lista de diretórios com templates de documentos abertos(.odt)
@@ -332,7 +260,6 @@ ListOfDirectoriesForModelGenODT=A lista de diretórios contém modelos de arquiv
 NumberOfModelFilesFound=Número de arquivos de temas ODT/ODS encontrados nestes diretórios
 ExampleOfDirectoriesForModelGen=Exemplo de sintaxe:<br>c:\\meudir<br>/home/meudir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>Para saber como criar seus temas de documento em ODT, antes de armazená-los nesses diretórios, leia a documentação wiki:
-FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Posição do Nome/Sobrenome
 DescWeather=As seguintes imagens serão mostradas no painel quando o número de ações tardias alcançar os seguintes valores:
 KeyForWebServicesAccess=Chave para usar o Serviços Web (parâmetro "dolibarrkey" no serviço web)
@@ -345,7 +272,6 @@ SmsTestMessage=Mensagem Teste de __PHONEFROM__ para __PHONETO__
 ModuleMustBeEnabledFirst=O módulo <b>%s</b> deve estar primeiramente habilitado se você precisa desta funcionalidade.
 SecurityToken=Chave para proteção das URLs
 NoSmsEngine=Sem gestor de envido de SMS disponível. Por default o gestor de envio de SMS não vêm instalado (porque depende de um fornecedor externo) mas você pode achar um em %s
-PDF=PDF
 PDFDesc=Você pode configurar cada opção global relacionada com geração de PDF
 PDFAddressForging=Regras para forjar caixas de endereços
 HideAnyVATInformationOnPDF=Esconder todas as informações relacionadas com ICMS na geração de PDF
@@ -353,7 +279,6 @@ HideDescOnPDF=Esconder todas as descrições de produto na geração de PDF
 HideRefOnPDF=Esconder ref. dos produtos na geração de PDF
 HideDetailsOnPDF=Esconder a linha de detalhes dos produtos na geração de PDF
 PlaceCustomerAddressToIsoLocation=Use a posição padrão francesa (La Poste) para a posição do endereço do cliente
-Library=Biblioteca
 UrlGenerationParameters=Parâmetros para URLs de segurança
 SecurityTokenIsUnique=Usar um único parâmetro na chave de segurança para cada URL
 EnterRefToBuildUrl=Entre com a referência do objeto %s
@@ -364,34 +289,22 @@ NewVATRates=Taxa de ICMS nova
 PriceBaseTypeToChange=Modificar os preços com base no valor de referência defino em
 MassConvert=Lançar converções massivas
 String=Variável
-TextLong=Texto longo
 Int=Inteiro
 Float=Flutuante
 DateAndTime=Data e Hora
-Unique=Único
-Boolean=Boolean
-ExtrafieldPhone = Telefone
-ExtrafieldPrice = Preço
-ExtrafieldMail = E-mail
-ExtrafieldUrl = Url
-ExtrafieldSelect = Selecionar lista
-ExtrafieldSelectList = Selecionar da tabela
-ExtrafieldSeparator=Separador
+Boolean=Booleano (uma caixa de seleção)
+ExtrafieldMail =E-mail
+ExtrafieldSelect =Selecionar lista
 ExtrafieldPassword=Senha
-ExtrafieldCheckBox=Caixa de seleção
-ExtrafieldRadio=Botão de Rádio
-ExtrafieldCheckBoxFromList= Caixa de seleção da tabela
+ExtrafieldRadio=Botões de seleção única (apenas na escolha)
+ExtrafieldCheckBox=Caixas de seleção
 ExtrafieldLink=Link para um objeto
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Lista de parâmetros tem que ser tipo chave,valor<br><br> por exemplo: <br>1,valor1<br>2,valor2<br>3,valor3<br>...
 ExtrafieldParamHelpradio=Lista de parâmetros tem que ser do tipo chave,valor<br><br> por exemplo: <br>1,valor1<br>2,valor2<br>3,valor3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Os parâmetros devem ser ObjectName:Classpath<br>Sintaxe : ObjectName:Classpath<br>Exemplo : Sociedade:sociedade/class/sociedade.class.php
 LibraryToBuildPDF=Biblioteca usada para a geração de PDF
 WarningUsingFPDF=Aviso: Sua <b>conf.php</b> Contém diretrize <b>dolibarr_pdf_force_fpdf=1</b>. Isso significa que você usa a biblioteca FPDF para gerar arquivos em PDF. Essa biblioteca é velha e não suporta muitas novas funções (Unicode, imagem transparente, cyrillic, línguas arábicas e asiáticas,...), portanto pode ocorrer alguns erros durante a geração de PDF.<br>Para corrigir esse problema e ter todo o suporte na geração de PDF, baixe <a href="http://www.tcpdf.org/" target="_blank">Biblioteca TCPDF</a>, então comente ou remova essa linha <b>$dolibarr_pdf_force_fpdf=1</b>, e adicione essa <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=Alguns paises aplicam de 2 a 3 taxas em cada linha de fatura. Se for esse caso, escolha o tipo de segunda e terceira taxa. Os possíveis tipos são:<br>1 : Taxa local aplicam em produtos e serviços sem ICMS (ICMS não é aplicada em taxa local)<br>2 : Taxa local aplicam em produtos e serviços antes do ICMS (ICMS é calculado no montante + taxa local)<br>3 : Taxa local aplicam em produtos sem o ICMS (ICMS não é aplicada na taxa local)<br>4 : Taxa local aplicam nos produtos antes do ICMS (ICMS é calculado no montante + taxa local)<br>5 : Taxa local aplicam no serviço sem o ICMS (ICMS não é aplicado em taxa local)<br>6 : Taxa local aplicam em serviços antes do ICMS (ICMS é calculado no montante + taxa local)
-SMS=SMS
 LinkToTestClickToDial=Entre com um número telefônico para chamar e mostrar um link que testar a URL CliqueParaDiscar para usuário <strong>%s</strong>
 RefreshPhoneLink=Atualizar link
 LinkToTest=Clique no link gerado pelo usuário <strong>%s</strong> (clique no número telefônico para testar)
@@ -410,7 +323,6 @@ AllBarcodeReset=Todos os valores de código de barras foram removidas
 NoBarcodeNumberingTemplateDefined=Nenhum modelo de numeração de código de barras habilitado para configuração do módulo de código de barras.
 EnableFileCache=Ativar cache de arquivos
 ShowDetailsInPDFPageFoot=Adicionar mais detalhes no rodapé dos arquivos PDF, tais como o endereço da empresa, ou os nomes dos gerentes (para completar as IDs profissionais, capital da empresa e o número VAT).
-NoDetails=Sem mais detalhes no rodapé
 DisplayCompanyInfo=Exibir endereço da empresa
 DisplayCompanyManagers=Exibir nomes dos gerentes
 DisplayCompanyInfoAndManagers=Exibir o endereço da empresa e os nomes dos gerentes
@@ -418,42 +330,27 @@ EnableAndSetupModuleCron=Se você deseja ter esta fatura recorrente sendo gerada
 ModuleCompanyCodeAquarium=Retorna código de contabilidade construido por:<br>%s seguido pelo código do fornecedor terceiro pelo código de contabilidade do fornecedor, <br>%s seguido pelo código do cliente terceiro pelo código de contabilidade do cliente.
 ModuleCompanyCodePanicum=Retorna um código de contabilidade vazio.
 ModuleCompanyCodeDigitaria=Código de contabilidade depende do código do terceiro. O Código é composto pelo caractere "C" na primeira posição seguido pelos 5 primeiros caracteres do código do terceiro.
-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=Usar uma aprovação de 3 etapas quando o valor (sem taxa) é maior do que ...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-ClickToShowDescription=Click to show description
-# Modules
 Module0Name=Usuários e grupos
-Module0Desc=Users / Employees and Groups management
-Module1Name=Terceiros
+Module0Desc=Gerenciamento de Usuários / Funcionários e Grupos
 Module1Desc=Gerenciamento de empresas e contatos (clientes, prospecção, etc.)
-Module2Name=Comercial
 Module2Desc=Gestor Comercial
-Module10Name=Contabilidade
 Module10Desc=Relatório de Contabilidade Simples (jornais, rotação de estoque) baseado no conteúdo do banco de dados.
-Module20Name=Orçamentos
 Module20Desc=Gestor de Orçamentos
 Module22Name=E-Mails Massivos
 Module22Desc=Envio de E-Mails Massivos (spam)
-Module23Name=Energia
 Module23Desc=Monitoramento de Consumo de Energia
 Module25Name=Pedidos de Clientes
 Module25Desc=Gestor de Pedidos de Clientes
-Module30Name=Faturas
 Module30Desc=Gestor de Faturas e Notas de Créditos para Clientes. Gestor de faturas para Fornecedores
-Module40Name=Fornecedores
 Module40Desc=Gestor de Fornecedores e Compra (Pedidos e Faturas)
 Module42Name=Registros
-Module42Desc=Recursos para registro (arquivo, syslog, etc.)
-Module49Name=Editores
 Module49Desc=Gestor de Editores
-Module50Name=Produtos
 Module50Desc=Gestor de Produtos
 Module51Name=Cartas Massivos
 Module51Desc=Gestão de correspondência do massa
 Module52Name=Estoques
 Module52Desc=Gestor de Estoques (produtos)
-Module53Name=Serviços
 Module53Desc=Gestor de Serviços
 Module54Name=Contratos/Assinaturas
 Module54Desc=Gestor de Contratos (serviços e assinaturas recorrentes)
@@ -465,9 +362,7 @@ Module57Name=Ordens de pagamento bancárias diretas
 Module57Desc=Gerenciamento dos pedidos de pagamento com Débito Direto. Isto inclui a geração do arquivo SEPA para os países europeus.
 Module58Name=CliqueParaDiscarl
 Module58Desc=Integração do Sistema CliqueParaDiscar (Asterisk, etc.)
-Module59Name=Bookmark4u
 Module59Desc=Adicione uma função para gerar uma conta Bookmark4u de uma conta Dolibarr
-Module70Name=Intervenções
 Module70Desc=Gestor de Intervenções
 Module75Name=Despesas e Notas de Viagem
 Module75Desc=Gestor de Despesas e Notas de Viagem. Administração das notas de despesas e deslocamentos
@@ -479,98 +374,68 @@ Module100Name=Site Externo
 Module100Desc=Incluir seu site no menu superior do Dolibarr
 Module105Name=Carteiro e SPIP
 Module105Desc=Carteiro ou Interface SPIP para Módulo MembroMailman or SPIP interface for member module
-Module200Name=LDAP
 Module200Desc=Diretório de sincronização do LDAP
-Module210Name=PostNuke
-Module210Desc=Integração com PostNuke
 Module240Name=Exportações de Dados
 Module240Desc=Ferramenta para exportar dados do Dolibarr (com assistentes)
 Module250Name=Importação de Dados
 Module250Desc=Ferramenta para importar dados para o Dolibarr (com assistentes)
-Module310Name=Membros
 Module310Desc=Gestor de Associação de Membros
-Module320Name=RSS Feed
 Module320Desc=Adiciona um RSS feed dentro das páginas de tela do Dolibarr
 Module330Name=Marcadores de Página
 Module330Desc=Gerenciamento de agendamentos
 Module400Name=Projetos
 Module400Desc=Gestor de Projetos dentro de outros módulos
-Module410Name=Webcalendar
 Module410Desc=Integração do Webcalendar
 Module500Name=Taxas, Contribuições Sociais e Dividendos
 Module500Desc=Gestor Taxas, Contribuições Sociais e Dividentos
-Module510Name=Contratos e salários do empregado
-Module510Desc=Gerenciamento dos contratos, salários e pagamentos dos empregados
-Module520Name=Empréstimo
 Module520Desc=Gestão dos empréstimos
-Module600Name=Notificações
 Module600Desc=Enviar notificações por e-mail (disparadas por alguns eventos comerciais) para os usuários (configuração definida para cada usuário), contatos de terceiros (configuração definida para cada terceiro) ou para e-mails fixos
 Module700Name=Doações
 Module700Desc=Gestor de Doações
-Module770Name=Relatórios de despesas
 Module770Desc=Gestão e reivindicação de relatórios de despesas (transporte, refeição, ...)
 Module1120Name=Fornecedor - proposta comercial
 Module1120Desc=Pedido fornecedor - proposta comercial e preços
-Module1200Name=Mantis
 Module1200Desc=Integração Mantis
-Module1400Name=Contabilidade
 Module1400Desc=Gestor de Contabilidade (duas partes)
 Module1520Name=Geração de Documentos
 Module1520Desc=Geração de documentos via e-mail em massa
 Module1780Name=Categorias
 Module1780Desc=Gestor de Categorias (produtos, fornecedores e clientes)
-Module2000Name=Editor WYSIWYG
 Module2000Desc=Permitir editar alguma área do texto usando um editor avançado (Baseado no CKEditor)
 Module2200Name=Preços dinâmicos
 Module2200Desc=Habilitar o uso de expressões matemáticas para os preços
-Module2300Name=Cron
 Module2300Desc=Gestor de Tarefas Agendadas
-Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Name=Eventos / Agenda
+Module2400Desc=Acompanhe os eventos realizados e futuros. Deixe o aplicativo registrar eventos automáticos para fins de rastreamento ou gravar eventos manuais ou reuniões.
 Module2500Name=Gerenciamento de Conteúdo Eletrônico
 Module2500Desc=Salve e compartilhe documentos
 Module2600Name=Serviços API/Web (Servidor SOAP)
 Module2600Desc=Ativa o servidor de serviços web do Dolibarr
-Module2610Name=Serviços API/Web (servidor REST)
 Module2610Desc=Permitir que o servidor prestação de serviços de API REST do Dolibarr
 Module2660Name=Chamar ServiçosWeb (cliente SOAP)
 Module2660Desc=Habilitar o webservices do Dolibarr (pode ser usado para empurrar de dados / pedidos de servidores externos. Ordens Fornecedor suporte apenas para o momento)
-Module2700Name=Gravatar
 Module2700Desc=Usar serviço online do Gravatar (www.gravatar.com) para mostrar foto de usuários/membros (achado pelos emails deles). Precisa de acesso a internet
-Module2800Desc=Cliente FTP
-Module2900Name=GeoIPMaxmind
 Module2900Desc=Capacidade de conversão com o GeoIP Maxmind
-Module3100Name=Skype
 Module3100Desc=Adicionar um botão Skype nos cartões dos usuários / terceiros / contatos membros
-Module4000Name=RH
-Module4000Desc=Gestão de recursos humanos
 Module5000Name=Multi-Empresas
 Module5000Desc=Permite gerenciar várias empresas
 Module6000Name=Fluxo de Trabalho
 Module6000Desc=Gestor de Fluxo de Trabalho
-Module10000Name=Websites
 Module10000Desc=Criar websites públicos com um editor WYSIWYG. Configure apenas o seu servidor web para direcionar para um diretório dedicado para tê-lo online na Internet.
 Module20000Name=Gerenciamento de folgas e férias
 Module20000Desc=Autorizar e acompanhar solicitações de licença de funcionários
-Module39000Name=Lote do produto
 Module39000Desc=Lote ou número de serie, para compra e venda administrado produtos
-Module50000Name=PayBox
 Module50000Desc=Módulo para oferecer pagamento online via cartão de crédito com PayBox
 Module50100Name=Ponto de Vendas
 Module50100Desc=Módulo ponto de vendas (PDV)
-Module50200Name=Paypal
 Module50200Desc=Módulo que oferece pagamento online via cartão de crédito com Paypal
-Module50400Name=Contabilidade (avançada)
 Module50400Desc=Gestão de Contabilidade (partes duplas)
 Module54000Name=ImprimirIPP
 Module54000Desc=Imprima via Cups IPP
 Module55000Name=Pesquisa Aberta
 Module55000Desc=Módulo que integra pesquisa (tipo: Doodle, Studs, Rdvz, ...)
-Module59000Name=Margens
 Module59000Desc=Módulo para gerenciar margens
-Module60000Name=Comissões
 Module60000Desc=Módulo para gerenciar comissão
-Module63000Name=Recursos
 Module63000Desc=Gerenciar recursos (impressoras, carros, salas, etc.) que você pode compartilhar em eventos.
 Permission11=Ler Faturas de Clientes
 Permission12=Criar/Modificar Faturas de Clientes
@@ -591,10 +456,9 @@ Permission32=Criar/Modificar Produtos
 Permission34=Deletar Produtos
 Permission36=Ver/Gerenciar Produtos Ocultos
 Permission38=Exportar Produtos
-Permission41=Ler Projetos (Projetos Compartilhados e Projetos que eu contratei para)
-Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
+Permission41=Leia projetos e tarefas (projeto compartilhado e projetos para os quais eu sou um contato). Também pode inserir o tempo consumido, para mim ou minha hierarquia, nas tarefas atribuídas (Folha de horários)
+Permission42=Criar / modificar projetos (projeto compartilhado e projetos para os quais eu sou um contato). Também pode criar tarefas e atribuir usuários a projetos e tarefas
 Permission44=Deletar Projetos (Projetos Compartilhados e Projetos que eu contratei para)
-Permission45=Exportar projetos
 Permission61=Ler Intervenções
 Permission62=Criar/Modificar Intervenções
 Permission64=Deletar Intervenções
@@ -603,7 +467,6 @@ Permission71=Ler Membros
 Permission72=Criar/Modificar Membros
 Permission74=Deletar Membros
 Permission75=Configurar tipos e atributos dos Membros
-Permission76=Exportar dados
 Permission78=Ler Assinaturas
 Permission79=Criar/Modificar Assinaturas
 Permission81=Ler Pedidos de Clientes
@@ -648,7 +511,6 @@ Permission162=Criar/Modificar Contratos
 Permission163=Ativar Serviço de um Contrato
 Permission164=Desabilitar Serviço de um Contrato
 Permission165=Excluir Contratos/assinaturas
-Permission167=Exportar contratos
 Permission171=Ler viagens e despesas (suas e de seus subordinados)
 Permission172=Criar/Modificar Viagens
 Permission173=Deletar Viagens
@@ -695,7 +557,7 @@ PermissionAdvanced253=Criar/Modificar Usuários internos/externos e suas Permiss
 Permission254=Criar/Modificar Usuários Externos
 Permission255=Modificar Senha de Outros Usuários
 Permission256=Deletar ou Desativar Outros Usuários
-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 assignement matters).
+Permission262=Estender o acesso a todos os terceiros (não apenas os terceiros para os quais o usuário é um representante de venda).<br> Não é efetivo para usuários externos (sempre limitados a si próprios para propostas, pedidos, faturas, contratos, etc.).<br> Não é efetivo para Projetos (apenas regras sobre permissões do projeto, visibilidade e questões de atribuição).
 Permission271=Ler CA
 Permission272=Ler Faturas
 Permission273=Emitir Fatura
@@ -750,7 +612,7 @@ Permission773=Excluir relatórios de despesas
 Permission774=Leia todos os relatórios de despesas (mesmo para o utilizadores Não subordinados)
 Permission775=Aprovar os relatórios de despesas
 Permission776=Relatórios de despesas pagas
-Permission779=Exportar - Relatórios de despesas 
+Permission779=Exportar - Relatórios de despesas
 Permission1001=Ler Estoques
 Permission1002=Criar/Modificar Estoques
 Permission1003=Excluir Estoques
@@ -808,121 +670,89 @@ Permission2802=Usar cliente FTP no modo escrita (deletar ou upload de arquivos)
 Permission50101=Usar Ponto de Vendas
 Permission50201=Ler Transações
 Permission50202=Importar Transações
-Permission54001=Imprimir
 Permission55001=Ler Pesquisa
 Permission55002=Criar/Modificar Pesquisa
 Permission59001=Leia margens comerciais
-Permission59002=Definir margens comerciais
 Permission59003=Leia cada margem do usuário
 Permission63001=Ler recursos
 Permission63002=Criar/Modificar recursos
 Permission63003=Excluir recursos
 Permission63004=Conectar os recursos aos eventos da agenda
-DictionaryCompanyType=Tipos de terceiros
 DictionaryCompanyJuridicalType=Formas legais dos terceiros
 DictionaryProspectLevel=Nível potencial Prospect
 DictionaryCanton=Estado/Província
 DictionaryRegion=Regiões
-DictionaryCountry=Países
-DictionaryCurrency=Moedas
-DictionaryCivility=Títulos pessoais e profissionais
 DictionaryActions=Tipos de eventos na agenda
 DictionarySocialContributions=Tipos de encargos sociais e fiscais
 DictionaryVAT=Taxas de VAT ou imposto sobre vendas de moeda
 DictionaryRevenueStamp=Quantidade de selos fiscais
-DictionaryPaymentConditions=Condições de pagamento
 DictionaryPaymentModes=Modos de pagamento
 DictionaryTypeContact=Tipos Contato / Endereço
 DictionaryEcotaxe=Ecotaxa (REEE)
 DictionaryPaperFormat=Formatos de papel
-DictionaryFormatCards=Cards formats
 DictionaryFees=Tipos de benefício
 DictionarySendingMethods=Métodos do transporte
 DictionaryStaff=Pessoal
-DictionaryAvailability=Atraso na entrega
 DictionaryOrderMethods=Métodos de compra
 DictionarySource=Origem das propostas / ordens
-DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Modelos para o plano de contas
 DictionaryEMailTemplates=Modelos de E-mails
-DictionaryUnits=Unidades
 DictionaryProspectStatus=Status de Prospecção
 DictionaryHolidayTypes=Tipos de licenças
 DictionaryOpportunityStatus=Status oportunidade para projeto / lead
 SetupSaved=Configurações Salvas
-BackToModuleList=Voltar à lista de módulos
 BackToDictionaryList=Voltar para a lista de dicionários
 VATManagement=Gestor de ICMS
 VATIsUsedDesc=Como padrão, quando da criação de orçamentos, faturas, pedidos, etc. a taxa do ICMS acompanha a regra padrão ativa:<br>se o vendedor não estiver sujeito ao ICMS, então o padrão do ICMS é 0. Fim da regra.<br>Se o (país da venda= país da compra), então o ICMS por padrão é igual ao ICMS do produto no país da venda. Fim da regra. <br>Se o vendedor e o comprador estão na Comunidade Europeia e os produtos são meios de transporte (carro, navio, avião), o VAT padrão é 0 (O VAT deverá ser pago pelo comprador à receita federal do seu país e não ao vendedor). Fim da regra.<br>Se o vendedor e o comprador estão na Comunidade Europeia e o comprador não é uma pessoa jurídica, então o VAT por padrão é o VAT do produto vendido. Fim da regra.<br>Se o vendedor e o comprador estão na Comunidade Europeia e o comprador é uma pessoa jurídica, então o VAT é 0 por padrão . Fim da regra.<br>Em qualquer outro caso o padrão proposto é ICMS=0. Fim da regra.
 VATIsNotUsedDesc=Por padrão o ICMS sugerido é 0, o que pode ser usado em casos tipo associações, pessoas ou pequenas empresas.
 VATIsUsedExampleFR=Na França, as empresas ou organizações tem um sistema fiscal real (simplificado real ou normal real). Um sistema no qual o ICMS(vat) é declarado.
 VATIsNotUsedExampleFR=Na França, as associações que não declaram ICMS(vat) ou empresas, organizações ou profissionais liberais que tem escolhidos o sistema fiscal de micro empresas (VAT em franquia) e pago uma franquia VAT sem qualquer declaração de ICMS(vat). Está escolha será mostrado com uma refêrencia "Não Aplicado ICMS(vat) - art-293B de CGI" nas faturas.
-##### Local Taxes #####
 LTRate=Rata
 LocalTax1IsNotUsed=Não utilizar segundo imposto
 LocalTax1IsUsedDesc=Utilizar um segundo tipo de imposto (outro que não seja ICMS)
 LocalTax1IsNotUsedDesc=Não utilizar outro tipo de imposto (outro que não seja ICMS)
-LocalTax1Management=Segundo tipo de imposto
-LocalTax1IsUsedExample=
-LocalTax1IsNotUsedExample=
 LocalTax2IsNotUsed=Não utilizar terceiro imposto
 LocalTax2IsUsedDesc=Utilizar um terceiro tipo de imposto (outro que não seja ICMS)
 LocalTax2IsNotUsedDesc=Não utilizar outro tipo de imposto (outro que não seja ICMS)
-LocalTax2Management=Terceiro tipo de imposto
-LocalTax2IsUsedExample=
-LocalTax2IsNotUsedExample=
-LocalTax1ManagementES= Gestor RE
-LocalTax1IsUsedDescES= A taxa RE padrão, quando criando orçamentos, faturas, pedidos, etc., segue a regra padrão ativa:<br>Se o comprador não estiver sujeito à RE, a RE por padrão=0. Fim da regra.<br>Se o comprador for sujeito à RE, então será aplicada a RE padrão. Fim da regra.<br>
-LocalTax1IsNotUsedDescES= A RE padrão proposta é 0. Fim da regra.
-LocalTax1IsUsedExampleES= Na Espanha eles são profissionais sujeito a alguma seção especifica da IAE espanhola.
-LocalTax1IsNotUsedExampleES= Na Espanha eles são proficionais e sócios e sujeito a uma certa seção da IAE espanhola.
-LocalTax2ManagementES= Gestor IRPF
-LocalTax2IsUsedDescES= A taxa RE padrão, quando criando orçamentos, faturas, pedidos, etc., acompanha a regra padrão ativa:<br>Se o vendedor não estiver sujeito ao IRPF, então o IRPF por padrão=0. Fim da regra.<br>Se o vendedor estiver sujeito ao IRPF, então aplica-se o IRPF padrão. Fim da regra.<br>
-LocalTax2IsNotUsedDescES= Por padrão, o iRPF sugerido é 0. Fim da regra.
-LocalTax2IsUsedExampleES= Na Espanha, freelancers e profissionais independentes que oferecem serviços e empresas que tenham escolhidos o módulo de sistema de imposto.
-LocalTax2IsNotUsedExampleES= Na Espanha eles são negócios não sujeito ao módulo de sistema de imposto.
+LocalTax1ManagementES=Gestor RE
+LocalTax1IsUsedDescES=A taxa RE padrão, quando criando orçamentos, faturas, pedidos, etc., segue a regra padrão ativa:<br>Se o comprador não estiver sujeito à RE, a RE por padrão=0. Fim da regra.<br>Se o comprador for sujeito à RE, então será aplicada a RE padrão. Fim da regra.<br>
+LocalTax1IsNotUsedDescES=A RE padrão proposta é 0. Fim da regra.
+LocalTax1IsUsedExampleES=Na Espanha eles são profissionais sujeito a alguma seção especifica da IAE espanhola.
+LocalTax1IsNotUsedExampleES=Na Espanha eles são proficionais e sócios e sujeito a uma certa seção da IAE espanhola.
+LocalTax2ManagementES=Gestor IRPF
+LocalTax2IsUsedDescES=A taxa RE padrão, quando criando orçamentos, faturas, pedidos, etc., acompanha a regra padrão ativa:<br>Se o vendedor não estiver sujeito ao IRPF, então o IRPF por padrão=0. Fim da regra.<br>Se o vendedor estiver sujeito ao IRPF, então aplica-se o IRPF padrão. Fim da regra.<br>
+LocalTax2IsNotUsedDescES=Por padrão, o iRPF sugerido é 0. Fim da regra.
+LocalTax2IsUsedExampleES=Na Espanha, freelancers e profissionais independentes que oferecem serviços e empresas que tenham escolhidos o módulo de sistema de imposto.
+LocalTax2IsNotUsedExampleES=Na Espanha eles são negócios não sujeito ao módulo de sistema de imposto.
 CalcLocaltax=Relatórios sobre os impostos locais
-CalcLocaltax1=Vendas - Compras
 CalcLocaltax1Desc=Relatorios de taxas locais são calculados pela differença entre taxas locais de venda e taxas locais de compra
-CalcLocaltax2=Compras
 CalcLocaltax2Desc=Relatorio de taxas locais e o total de taxas locais nas compras
 CalcLocaltax3=De vendas
 CalcLocaltax3Desc=Relatorio de taxas locais e o total de taxas locais de vendas
 LabelUsedByDefault=Etiqueta usado por default se nenhuma tradução não for encontrado para o código =/
 LabelOnDocuments=Etiqueta nos documentos
 NbOfDays=Nº de dias
-AtEndOfMonth=No fim de mês
 CurrentNext=Atual/Próxima
 Offset=Compensar
-AlwaysActive=Sempre ativo
 Upgrade=Atualizar
 MenuUpgrade=Atualizar / Ampliar
-AddExtensionThemeModuleOrOther=Deploy/install external module
-WebServer=Servidor web
+AddExtensionThemeModuleOrOther=Implantar / instalar o módulo externo
 DocumentRootServer=Diretório raiz do servidor web
 DataRootServer=Diretório raiz dos dados
-IP=IP
-Port=Porta
 VirtualServerName=Nome virtual do servidor
-OS=SO
 PhpWebLink=link Web-PHP
-Browser=Navegador
-Server=Servidor
 Database=Banco de Dados
 DatabaseServer=Servidor do Banco de Dados
 DatabaseName=Nome do Banco de Dados
 DatabasePort=Porta do Banco de Dados
 DatabaseUser=Usuário do Banco de Dados
 DatabasePassword=Senha do Banco de Dados
-Tables=Tabelas
 TableName=Nome da Tabela
 NbOfRecord=Núm de gravações
-Host=Servidor
 DriverType=Tipo de Driver
 SummarySystem=Resumo de informações do sistema
 SummaryConst=Lista de todos os parâmetros de configurações do Dolibarr
-MenuCompanySetup=Empresa
-DefaultMenuManager= Gestor padrão de menu
+DefaultMenuManager=Gestor padrão de menu
 DefaultMenuSmartphoneManager=Gestor do menu de smartphone
 Skin=Tema Visual
 DefaultSkin=Tema visual default
@@ -935,22 +765,15 @@ PermanentLeftSearchForm=Formulário permanente de pesquisa no menu esquerdo
 DefaultLanguage=Idioma padrão a ser usado (código do idioma)
 EnableMultilangInterface=Habilitar interface multi-idioma
 EnableShowLogo=Exibir logo no menu esquerdo
-CompanyInfo=Informação da empresa/fundação
-CompanyIds=Identificações da empresa/fundação
+CompanyInfo=Informações da Empresa/Organização
+CompanyIds=Identificações da Empresa/Organização
 CompanyName=Nome
 CompanyAddress=Endereço
 CompanyZip=CEP
 CompanyTown=Município
-CompanyCountry=País
-CompanyCurrency=Moeda principal
-CompanyObject=Objeto da empresa
-Logo=Logo
-DoNotSuggestPaymentMode=Não sugerir
 NoActiveBankAccountDefined=Nenhuma conta bancária ativa está definida
-OwnerOfBankAccount=Titular da conta bancária %s
 BankModuleNotActive=O módulo de contas bancárias não está habilitado
 ShowBugTrackLink=Mostrar link "<strong>%s</strong>"
-Alerts=Alertas
 DelaysOfToleranceBeforeWarning=Prazos de tolerância antes do aviso
 DelaysOfToleranceDesc=Esta janela permite definir os prazos de tolerância antes que o aviso é reportado na tela com o símbolo %s, sobre cada elemento em atraso.
 Delays_MAIN_DELAY_ACTIONS_TODO=Prazo de tolerância (em dias) antes do alerta sobre eventos planejados (eventos da agenda) ainda não concluídos
@@ -969,30 +792,20 @@ Delays_MAIN_DELAY_MEMBERS=Prazo de tolerância (em dias) antes do aviso do atras
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Prazo de tolerância (em dias) antes do aviso de fazer depósitos de cheques
 Delays_MAIN_DELAY_EXPENSEREPORTS=Prazo de tolerância (em dias) antes do alerta para aprovação do relatório de despesas
 SetupDescription1=A área de configuração é para a definição dos parâmetros iniciais antes de se usar o Dolibarr.
-SetupDescription2=As duas etapas mais importantes da configuração são as duas primeiras no menu de configuração à esquerda: Página de configuração da companhia/fundação e a Página de configuração dos módulos.
-SetupDescription3=Os parâmetros no menu <a href="%s">Configuração -> Companhia/Fundação</a> são exigidos, pois os dados enviados são usados nas telas do Dolibarr e para personalizar o comportamento padrão do aplicativo (para funções que dependem do país, por exemplo).
-SetupDescription4=Os parâmetros no menu <a href="%s">Configuração -> Módulos</a> são exigidos, pois o Dolibarr não é um ERP/CRM monolítico, mas uma coleção de diversos módulos, todos mais ou menos independentes. Novas funções serão adicionadas aos menus para cada módulo que você habilitar.
 SetupDescription5=Outros menu precisa entrar com parâmetros opcionais do gestor.
 LogEvents=Auditoría de segurança dos eventos
 Audit=Auditoría
-InfoDolibarr=Sobre o Dolibarr
-InfoBrowser=Sobre o navegador
 InfoOS=Sobre o SO
-InfoWebServer=Sobre o servidor web
 InfoDatabase=Sobre o banco de dados
-InfoPHP=Sobre o PHP
 InfoPerf=Sobre Desempenhos
-BrowserName=Nome do navegador
 BrowserOS=Navegador OS
 ListOfSecurityEvents=Lista de eventos de segurança do Dolibarr
 SecurityEventsPurged=Eventos de segurança foram purgados(apagados)
 LogEventDesc=Você pode habilitar aqui os logging para os eventos de segurança do Dolibarr. Administradores podem ver o conteúdo via menu <b>Ferramentas do Sistema - Auditar</b>. Aviso, essa função pode consumir uma grande quantidade de dados no banco de dados.
-AreaForAdminOnly=Essas funções podem ser usadas somente por <b>Usuários Administrativos</b>.
 SystemInfoDesc=Informações do sistema está faltando informações, técnicas você consegue em modo de leitura e é visivel somente para administradores.
 SystemAreaForAdminOnly=Essa área é dísponivel apenas para administradores. Ninguém do Dolibarr pode diminuir essas permissões.
 CompanyFundationDesc=Editar nesta página toda a informação conhecida da companhia ou fundação que você precisa gerenciar (Para isto, clique no botão "Modificar" ou "Salvar" no rodapé da página).
 DisplayDesc=Você pode escolher cada parâmetro relacionado com a aparência do Dolibarr e testar aqui
-AvailableModules=Módulos disponíveis
 ToActivateModule=Para ativar os módulos, vá à área de configuração (Home->Configuração->Módulo).
 SessionTimeOut=Expiro tempo de sessão
 SessionExplanation=Esse número garante que a sessão nunca irá expirar antes desse tempo de atraso, se o <b>session cleaner</b> for feito pelo <b>Internal PHP session cleaner</b> (e nada mais). O <b>Internal PHP session cleaner</b> não garante que irá expirar nesse tempo de atraso. Ele vai expirar, depois desse tempo de atraso, e quando o <b>session cleaner</b> está na RAM, então cada <b>%s/%s</b> acesso, mas somente durante o acesso feito pelos outros usuários.<br> Nota: em alguns servidores com mecanismo de "external session cleaning" (cron no Debian, Ubuntu ...), a sessão pode ser perdida depois desse periodo definido por default <strong>session.gc_maxlifetime</strong>, não importando importando o valor entrado aqui.
@@ -1004,7 +817,7 @@ TriggerAlwaysActive=Triggers neste arquivo está sempre ativo, não importando o
 TriggerActiveAsModuleActive=Triggers neste arquivo são ativos quando módulo <b>%s</b> está ativado.
 GeneratedPasswordDesc=Defina aqui qual regra você deseja para gerar uma nova senha se você perguntar para ter uma geração automática de senhas
 DictionaryDesc=Inserir todos os dados de referência. Você pode adicionar seus valores ao padrão.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">check here</a>.
+ConstDesc=Esta página permite editar todos os outros parâmetros não disponíveis nas páginas anteriores. Estes são principalmente parâmetros reservados para desenvolvedores ou solução de problemas avançada. Para uma lista de opções <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">verifique aqui</a>.
 MiscellaneousDesc=Todos os outros parâmetros relacionados com a segurança são definidos aqui.
 LimitsSetup=Configurações de Limites/Precisões
 LimitsDesc=Você pode definir limites, precisões e otimizações utilizadas pelo Dolibarr aqui
@@ -1028,9 +841,8 @@ RestoreDesc=Para restaurar o backup Dolibarr, você deve:
 RestoreDesc2=* Restaurar o arquivo de backup (zipado) no diretório dos documentos, para extrair a arvore de arquivos no diretório do documento da nova instalação do Dolibarr ou dentro do atual diretório dos documentos (<b>%s</b>).
 RestoreDesc3=* Restaurar os dados de backup do arquivo de despejo, para dentro do banco de dados da nova instalação do Dolibarr ou para dentro da atual instalação. Aviso, uma vez a restauração completa, você deve usar o login/senha, que existia quando o backup foi feito, para conectar denovo. Para restaurar o backup do banco de dados para dentro da atual instalação, você pode seguir esse assistente.
 RestoreMySQL=Importar MySQL
-ForcedToByAModule= Essa Regra é forçada para <b>%s</b> by um módulo ativado
+ForcedToByAModule=Essa Regra é forçada para <b>%s</b> by um módulo ativado
 PreviousDumpFiles=Disponível banco de dados de backup dos arquivos de despejo
-WeekStartOnDay=Primeiro dia da semana
 RunningUpdateProcessMayBeRequired=Rodando o processo de upgrade parece ser requerido (Versão dos programas %s é diferente da versão do banco de dados %s)
 YouMustRunCommandFromCommandLineAfterLoginToUser=Você deve rodar esse comando na linha de comando (CLI) depois de logar no shell com o usuário <b>%s</b> ou você deve adicionar a opção -W no final da linha de comando para fornecer a senha <b>%s</b>.
 YourPHPDoesNotHaveSSLSupport=Função SSL functions não está disponível no seu PHP
@@ -1038,37 +850,25 @@ DownloadMoreSkins=Mais skins para baixar
 SimpleNumRefModelDesc=Retorna o número de referênciaReturns com o formato %syymm-nnnn onde yy é o ano, mm é o mês é nnnn é a sequencia sem buraco e sem reset
 ShowProfIdInAddress=Mostrar id proficional com endereço no documento
 ShowVATIntaInAddress=Esconder ICMS dentro num com endereços no documento
-TranslationUncomplete=Tradução parcial
 MAIN_DISABLE_METEO=Desativar visualização meteo
 TestLoginToAPI=Teste de login para API
 ProxyDesc=Algumas funções do Dolibarr precisam ter acesso a internet para funcionar. Defina esses parâmetros aqui. se o servidor Dolibarr esta atrás de um servidor de proxy, esses parâmetros falam pro Dolibarr como acessar a internet através disso.
-ExternalAccess=Acesso externo
 MAIN_PROXY_USE=Use um servidor de proxy (caso contrário acesso direto a internet)
 MAIN_PROXY_HOST=Nome/Endereço do servidor de proxy
 MAIN_PROXY_PORT=Porta do servidor de proxy
 MAIN_PROXY_USER=Login para usar no servidor de proxy
 MAIN_PROXY_PASS=Senha para usar no servidor de proxy
 DefineHereComplementaryAttributes=Defina aqui todos os atributos, não disponível por default, e que você quer que seja suportado por %s.
-ExtraFields=Atributos complementares
-ExtraFieldsLines=Atributos complementares (linhas)
 ExtraFieldsSupplierOrdersLines=Atributos complementares (linhas de encomenda)
-ExtraFieldsSupplierInvoicesLines=Atributos complementares (linhas da fatura)
 ExtraFieldsThirdParties=Atributos complementares (terceiros)
 ExtraFieldsContacts=Atributos complementares (contato/endereço)
 ExtraFieldsMember=Atributos complementares (membros)
-ExtraFieldsMemberType=Atributos complementares (tipo de membro)
-ExtraFieldsCustomerInvoices=Atributos complementares (faturas)
 ExtraFieldsSupplierOrders=Atributos complementares (pedidos)
-ExtraFieldsSupplierInvoices=Atributos complementares (faturas)
-ExtraFieldsProject=Atributos complementares (projetos)
-ExtraFieldsProjectTask=Atributos complementares (tarefas)
 ExtraFieldHasWrongValue=Atributo %s tem um valor errado.
 AlphaNumOnlyLowerCharsAndNoSpace=apenas alfanumérico e minúsculas, sem espaço
 SendmailOptionNotComplete=Aviso, em alguns sistemas Linux, para enviar email para seu email, sendmail executa a configuração que deve conter opção -ba (parâmetro mail.force_extra_parameters dentro do seu arquivo php.ini). Se algum destinatário não receber emails, tente editar esse parâmetro PHP com mail.force_extra_parameters = -ba).
 PathToDocuments=Caminho para documentos
-PathDirectory=Diretório
 SendmailOptionMayHurtBuggedMTA=Função para envios de correspondência usando o método "PHP mail direct" irá gerar uma mensagem na correspondência que pode não estar corretamente analisada por algum servidor de recepção de correspondência. Resultando que essa correspondência não pode ser lida pela pessoa hostiada por essa plataforma bugada. É caso de alguns provedores de internet (Ex: Orange na França). Isso não é um problema para o Dolibarr nem dentro PHP mas para servidor receptor de correspondência. Você pode contudo adicionar a opção MAIN_FIX_FOR_BUGGED_MTA para 1 dentro da configuração, outra modificação do Dolibarr para evitar isso. Contudo você pode sofrer problemas com outros servidores que respeitão estritamente os padrões SMTP. A outra solução (RECOMENDADA) é usar o método "SMTP socket library" que não tem desvantagens.
-TranslationSetup=Configuração da tradução
 TranslationKeySearch=Buscar uma chave ou variável de tradução
 TranslationOverwriteKey=Sobrescrever uma variável de tradução
 TranslationDesc=Como definir o idioma exibido no aplicativo :<br>* Systemwide: menu <strong>Início - Configuração - Exibição</strong><br>* Por usuário : <strong>Configuração da exibição por usuário</strong> aba do cartão do usuário (clique no nome do usuário na parte superior da tela).
@@ -1079,11 +879,11 @@ CurrentTranslationString=Variável de tradução atual
 WarningAtLeastKeyOrTranslationRequired=Pelo menos um critério de busca é exigido para a chave ou variável de tradução.
 NewTranslationStringToShow=Nova variável de tradução a ser exibida
 OriginalValueWas=A tradução original foi sobrescrita. O valor original era:<br><br>%s
-TotalNumberOfActivatedModules=Número total de módulos ativados em destaque: <b>%s</b> / <b>%s</b>
+TotalNumberOfActivatedModules=Aplicação / módulos ativados: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Você pelo menos deve ativar 1 módulo
 ClassNotFoundIntoPathWarning=Classe %s não achado dentro o caminho PHP
 YesInSummer=Sim em verão
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, apenas os seguintes módulos são abertos para usuários externos (seja qual for a permissão de tais usuários) e somente se as permissões fossem concedidas:
 SuhosinSessionEncrypt=Sessão armazenada criptografada pelo Suhosin
 ConditionIsCurrently=Condição é atualmente %s
 YouUseBestDriver=Você usa o driver %s que é o melhor driver disponível atualmente.
@@ -1096,24 +896,16 @@ BrowserIsKO=Você está usando o navegador %s. Esse navegador é uma péssima es
 XDebugInstalled=XDebug é carregado.
 XCacheInstalled=XCache é carregado.
 AddRefInList=Aparência cliente/fornecedor ref dentro da lista (escolha a lista ou combobox) e mais o hyperlink. Terceiros serão exibidos co o nome "CC12345 - SC45678 - A grande corporação", ao invés de "A grande corporação".
-AskForPreferredShippingMethod=Perguntar pelo Método de Envio preferido para Terceiros
-FieldEdition=Edição do campo %s
 FillThisOnlyIfRequired=Exemplo: +2 (Preencha somente se compensar o problema do timezone é experiente)
-GetBarCode=Obter código de barras
-##### Module password generation
 PasswordGenerationStandard=Retorna uma senha gerara de acordo com o algorítimo interno do Dolibarr: 8 caracteres contendo números e letras em letras minusculas.
 PasswordGenerationNone=Não sugerimos qualquer senha gerada. A senha deve ser inserida manualmente.
 PasswordGenerationPerso=Retornar uma senha de acordo com a configuração definida para a sua personalidade.
-SetupPerso=De acordo com a sua configuração
 PasswordPatternDesc=Descrição do padrão de senha
-##### Users setup #####
 RuleForGeneratedPasswords=Regra para sugerir uma senha gerada ou validação de senha
 DisableForgetPasswordLinkOnLogonPage=Não mostrar o link "Esqueceu a senha" na página de login
 UsersSetup=Configurações de módulo de usuários
 UserMailRequired=EMail é necessário para criação de um novo usuário
-##### HRM setup #####
 HRMSetup=Configuração do módulo RH
-##### Company setup #####
 CompanySetup=Configurações de módulo das empresas
 CompanyCodeChecker=Módulo de geração e verificação de códigos de terceiros (cliente ou fornecedor)
 AccountCodeManager=Módulo de geração de códigos de contabilidade (clientes ou fornecedores)
@@ -1126,17 +918,12 @@ DocumentModelOdt=Gerar documentos dos templates livres (Arquivos .ODT ou .ODS do
 WatermarkOnDraft=Marca d'água no documento de rascuno
 JSOnPaimentBill=Ative a função de preenchimento automático de linhas no formulário de pagamento
 CompanyIdProfChecker=Regras no Ids profissional
-MustBeUnique=Deve ser único?
 MustBeMandatory=Obrigatória a criação de terceiros?
 MustBeInvoiceMandatory=Obrigatória a validação de faturas?
-##### Webcal setup #####
 WebCalUrlForVCalExport=Uma exportação de link para o formato <b>%s</b> está disponível no seguinte link: %s
-##### Invoices #####
 BillsSetup=Configurações do módulo de faturas
 BillsNumberingModule=Faturas e notas de crédito no modelo de numeração
 BillsPDFModules=Modelos de documentos da fatura
-CreditNote=Nota de crédito
-CreditNotes=Notas de crédito
 ForceInvoiceDate=Forçar data de fatura para data de validação
 SuggestedPaymentModesIfNotDefinedInInvoice=Sugerir formas de pagamentos na fatura por default se não estiver definida na fatura
 SuggestPaymentByRIBOnAccount=Sugerir pagamento por transferência bancária
@@ -1144,16 +931,13 @@ SuggestPaymentByChequeToAddress=Sugerir pagamento por cheque para
 FreeLegalTextOnInvoices=Texto livre nas fatura
 WatermarkOnDraftInvoices=Marca d'água sobre o projeto de faturas (nenhum se estiver vazio)
 PaymentsNumberingModule=Modelo de enumeração para pagamentos
-SuppliersPayment=Pagamentos a fornecedores
 SupplierPaymentSetup=Configuração dos pagamentos aos fornecedores
-##### Proposals #####
 PropalSetup=Configurações do módulo de orçamentos
 ProposalsNumberingModules=Modelos de numeração de orçamentos
 ProposalsPDFModules=Modelos de documentos para Orçamentos
 FreeLegalTextOnProposal=Texto livre em orçamentos
 WatermarkOnDraftProposal=Marca d'água no rascunho de orçamentos (nenhum se vazio)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Informar conta bancária de destino da proposta
-##### SupplierProposal #####
 SupplierProposalSetup=Preço solicitado via fornecedor instalação de módulo
 SupplierProposalNumberingModules=Modelos de numeração das solicitações de preço aos fornecedores
 SupplierProposalPDFModules=Modelos de documentos de solicitação de preço aos fornecedores
@@ -1161,9 +945,6 @@ FreeLegalTextOnSupplierProposal=Texto livre sobre os pedidos de preços de forne
 WatermarkOnDraftSupplierProposal=Marca d'água em projetos de ordem dos fornecedores (nenhum se estiver vazio)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Informar conta bancária de destino da proposta
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Solicitar Fonte de Armazenagem para o pedido
-##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
-##### Orders #####
 OrdersSetup=Configurações do gestor de pedidos
 OrdersNumberingModules=modelos de numeração de pedidos
 OrdersModelModule=Modelos de documentos de pedidos
@@ -1171,59 +952,42 @@ FreeLegalTextOnOrders=Texto livre em pedidos
 WatermarkOnDraftOrders=Marca d'água no rascunho de pedidos (nenhum para vazio)
 ShippableOrderIconInList=Adicionar um ícone na lista de pedidos que indicam se a ordem é shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Informar conta bancária de destino da ordem
-##### Interventions #####
 InterventionsSetup=Configurações do módulo intervenções
 FreeLegalTextOnInterventions=Texto livre nos documentos de intervenção
 FicheinterNumberingModules=Modelos de numeração de intervenção
 TemplatePDFInterventions=Modelos de documentos de cartão de intervenção
 WatermarkOnDraftInterventionCards=Marca d'água nos documentos de cartão de intervenção (nenhum para vazio)
-##### Contracts #####
 ContractsSetup=Configurações de módulo de contratos
 ContractsNumberingModules=módulos de numeração de contratos
 TemplatePDFContracts=Modelos de documentos Contratos
-FreeLegalTextOnContracts=Texto livre em contratos
 WatermarkOnDraftContractCards=Marca d'água em projetos de contratos (nenhum se estiver vazio)
-##### Members #####
 MembersSetup=Configurações de módulo de membros
-MemberMainOptions=Opções principais
-AdherentLoginRequired= Gestor de login para cada membro
+AdherentLoginRequired=Gestor de login para cada membro
 AdherentMailRequired=E-Mail é obrigatório para criar um novo membro
 MemberSendInformationByMailByDefault=Marque o checkbox para enviar confirmação de correspondência para membros (validação ou nova contribuição) é ativo por default
-##### LDAP setup #####
 LDAPSetup=Configurações do LDAP
-LDAPGlobalParameters=Parâmetros globais
 LDAPUsersSynchro=Usuários
-LDAPGroupsSynchro=Grupos
 LDAPContactsSynchro=Contatos
-LDAPMembersSynchro=Membros
 LDAPSynchronization=sincronização LDAP
 LDAPFunctionsNotAvailableOnPHP=Funções LDAP não estão disponíveis no seu PHP
-LDAPToDolibarr=LDAP -> Dolibarr
-DolibarrToLDAP=Dolibarr -> LDAP
-LDAPNamingAttribute=Chave em LDAP
 LDAPSynchronizeUsers=Organização dos usuários em LDAP
 LDAPSynchronizeGroups=Organização dos grupos em LDAP
 LDAPSynchronizeContacts=Organização dos contatos em LDAP
 LDAPSynchronizeMembers=Organização dos membros da fundação em LDAP
 LDAPPrimaryServer=Servidor primário
 LDAPSecondaryServer=Servidor secundário
-LDAPServerPort=Porta do servidor
 LDAPServerPortExample=Porta default : 389
-LDAPServerProtocolVersion=Versão de protocolo
 LDAPServerUseTLS=Usuário TLS
 LDAPServerUseTLSExample=Seu servidor LDAP usa TLS
-LDAPServerDn=Servidor DN
 LDAPAdminDn=Administrador DN
 LDAPAdminDnExample=Preencher DN (ex: cn=admin,dc=exemplo,dc=com ou cn=Administrador,cn=Usuários,dc=exemplo,dc=com para diretório ativo)
 LDAPPassword=Senha do administrador
 LDAPUserDn=DN dos Usuário
 LDAPUserDnExample=DN completo (ex: ou=usuários,dc=exemplo,dc=com)
-LDAPGroupDn=DN dos grupos
 LDAPGroupDnExample=DN completo (ex: ou=grupos,dc=exemplo,dc=com)
 LDAPServerExample=Endereço do servidor (ex: localhost, 192.168.0.2, ldaps://ldap.exemplo.com/)
 LDAPServerDnExample=DN completo (Ex: dc=exemplo,dc=com)
 LDAPDnSynchroActive=Sincronização de Usuários e Grupos
-LDAPDnSynchroActiveExample=Sincronização LDAP para Dolibarr ou Dolibarr para LDAP
 LDAPDnContactActive=Sincronização dos contatos
 LDAPDnContactActiveExample=Sincronização Ativada/Desativada
 LDAPDnMemberActive=Sincronização dos Membros
@@ -1232,20 +996,16 @@ LDAPContactDn=Contatos DN do Dolibarr
 LDAPContactDnExample=DN completo (ex: ou=contatos,dc=exemplo,dc=com)
 LDAPMemberDn=Membros DN do Dolibarr
 LDAPMemberDnExample=DN completo (ex: ou=membros,dc=exemplo,dc=com)
-LDAPMemberObjectClassList=Lista de objectClass
 LDAPMemberObjectClassListExample=Lista de ObjectClass que definem os atributos gravados (ex: top,inetOrgPerson ou top,usuário por active diretory)
-LDAPUserObjectClassList=Lista de objectClass
 LDAPUserObjectClassListExample=Lista de ObjectClass que definem os atributos gravados (ex: top,inetOrgPerson ou top,usuário por active diretory)
-LDAPGroupObjectClassList=Lista de objectClass
 LDAPGroupObjectClassListExample=Lista de ObjectClass que definem os atributos gravados (ex top,grupoDeNomeUnico)
-LDAPContactObjectClassList=Lista de objectClass
 LDAPContactObjectClassListExample=Lista de objectClass que definem os atributos gravados (ex: top,inetOrgPerson o top,usuários por active diretory)
 LDAPTestConnect=Teste de conexão LDAP
 LDAPTestSynchroContact=Teste de sincronização dos contatos
 LDAPTestSynchroUser=Teste de sincronização dos Usuário
 LDAPTestSynchroGroup=Teste de sincronização dos grupos
 LDAPTestSynchroMember=Teste de sincronização dos Membros
-LDAPTestSearch= Teste de pesquisa LDAP
+LDAPTestSearch=Teste de pesquisa LDAP
 LDAPSynchroOK=Teste de sincronização foi um sucesso
 LDAPSynchroKO=Teste de sincronização falhou
 LDAPSynchroKOMayBePermissions=Teste de sincronização falhou. Verifique se a conexão do servidor está corretamente configurada e que permita atualizações LDAP
@@ -1255,23 +1015,15 @@ LDAPBindOK=Conexão/Autenticação do servidor LDAP foi um sucesso (Servidor=%s,
 LDAPBindKO=Conexão/Autenticação do servidor LDAP falhou (Servidor=%s, Porta=%s, Admin=%s, Senha=%s)
 LDAPSetupForVersion3=Servidor LDAP configurado para versão 3
 LDAPSetupForVersion2=Servidor LDAP configurado para versão 2
-LDAPDolibarrMapping=Mapeamento Dolibarr
-LDAPLdapMapping=Mapeamento LDAP
-LDAPFieldLoginUnix=Login (unix)
 LDAPFieldLoginExample=Exemplo : uid
-LDAPFilterConnection=Filtro de pesquisa
 LDAPFilterConnectionExample=Exemplo : &(objectClass=inetOrgPerson)
-LDAPFieldLoginSamba=Login (samba, activedirectory)
 LDAPFieldLoginSambaExample=Exemplo : ananomedaconta
-LDAPFieldFullname=Nome completo
 LDAPFieldFullnameExample=Exemplo : cn
 LDAPFieldPasswordNotCrypted=Senha não criptografada
 LDAPFieldPasswordCrypted=Senha criptografada
 LDAPFieldPasswordExample=Exemplo : SenhaUsuário
 LDAPFieldCommonNameExample=Exemplo : cn
-LDAPFieldName=Nome
 LDAPFieldNameExample=Exemplo : sn
-LDAPFieldFirstName=Primeiro nome
 LDAPFieldFirstNameExample=Exemplo : deumnome
 LDAPFieldMail=E-Mail
 LDAPFieldMailExample=Exemplo : mail
@@ -1289,20 +1041,12 @@ LDAPFieldZip=CEP
 LDAPFieldZipExample=Exemplo : 00000-000
 LDAPFieldTown=Município
 LDAPFieldTownExample=Exemplo : l
-LDAPFieldCountry=País
-LDAPFieldDescription=Descrição
 LDAPFieldDescriptionExample=Exemplo : Descrição
-LDAPFieldNotePublic=Nota Pública
 LDAPFieldNotePublicExample=Exemplo: publicnote
-LDAPFieldGroupMembers= Membros de grupo
-LDAPFieldGroupMembersExample= Exemplo : membroÚnico
-LDAPFieldBirthdate=Data de nascimento
-LDAPFieldCompany=Empresa
-LDAPFieldCompanyExample=Exemplo : o
-LDAPFieldSid=SID
+LDAPFieldGroupMembers=Membros de grupo
+LDAPFieldGroupMembersExample=Exemplo : membroÚnico
 LDAPFieldSidExample=Exemplo : objetosid
 LDAPFieldEndLastSubscription=Data do término de inscrição
-LDAPFieldTitle=Cargo
 LDAPFieldTitleExample=Exemplo: Título
 LDAPSetupNotComplete=Configurações LDAP não está completa (vá nas outras abas)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Nenhum administrador ou senha fornecido. O acesso LDAP será anônimo no modo sómente leitura.
@@ -1321,16 +1065,12 @@ MemcachedModuleAvailableButNotSetup=Módulo de aceleração da memória cache es
 MemcachedAvailableAndSetup=Módulo de aceleração da memória cache está ativado e a configuração está completa
 OPCodeCache=cache OPCode
 NoOPCodeCacheFound=Nenhum cache OPCode foi achado. Pode ser que você use outro cache OPCode do que XCache ou eAccelerator (bom), pode ser que você não tenha cache OPCode (muito mau).
-HTTPCacheStaticResources=Cache HTTP para recursos estáticos (css, img, javascript)
 FilesOfTypeCached=Arquivos do tipo %s estão no cache pelo servidor HTTP
 FilesOfTypeNotCached=Arquivos do tipo %s não estão no cache pelo servidor HTTP
 FilesOfTypeCompressed=Arquivos do tipo %s estão comprimidos pelo servidor HTTP
 FilesOfTypeNotCompressed=Arquivos do tipo %s não estão comprimidos pelo servidor HTTP
-CacheByServer=Cache pelo servidor
-CacheByClient=Cache pelo navegador
 CompressionOfResources=Comprimir as respostas HTTP
 TestNotPossibleWithCurrentBrowsers=Não é possível detecção automática
-##### Products #####
 ProductSetup=Configurações do módulo dos produtos
 ServiceSetup=Configurações do módulo de serviços
 ProductServiceSetup=Configurações dos módulos de produtos e serviços
@@ -1339,26 +1079,19 @@ ViewProductDescInFormAbility=Visualização das descrições do produto nos form
 MergePropalProductCard=Ativar na aba Arquivos Anexos ao produto/serviço uma opção para mesclar o documento PDF do produto à proposta PDF se o produto/serviço estiver na proposta
 ViewProductDescInThirdpartyLanguageAbility=Visualização das descrições dos produtos no idioma do terceiro
 UseSearchToSelectProductTooltip=Além disso, se você tem um grande número de produtos (> 100 000), você pode aumentar a velocidade, definindo PRODUCT_DONOTSEARCH_ANYWHERE constante a 1 em Setup Outro. Busca, então, ser limitada até o início da 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)
 SetDefaultBarcodeTypeProducts=Tipo de código de barras default para usar nós produtos
 SetDefaultBarcodeTypeThirdParties=Tipo de código de barras default para usar nós terceiros
 UseUnits=Definir uma unidade de medida para a Quantidade durante a edição das linhas do pedido, proposta ou fatura
-ProductCodeChecker= Módulo para geração de código do produto e verificação (produto ou serviço)
-ProductOtherConf= Configurações de Produto / Serviço
-IsNotADir=não é um diretório!
-##### Syslog #####
+ProductCodeChecker=Módulo para geração de código do produto e verificação (produto ou serviço)
+ProductOtherConf=Configurações de Produto / Serviço
 SyslogSetup=Configurações do módulo de logs
 SyslogOutput=Saídas de logs
-SyslogFacility=Facilidade
-SyslogLevel=Nível
 SyslogFilename=Nome do arquivo e caminho
 YouCanUseDOL_DATA_ROOT=Você pode usar DOL_DATA_ROOT/dolibarr.log para um arquivo de log no diretório dos "documentos" do Dolibarr.
 ErrorUnknownSyslogConstant=A Constante %s não é conhecida pelas constantes do Syslog
 OnlyWindowsLOG_USER=Somente Windows suporta LOG_USER
-##### Donations #####
 DonationsSetup=Configurações do módulo de doações
 DonationsReceiptModel=Templates de recibos de doação
-##### Barcode #####
 BarcodeSetup=Configurações de código de barras
 PaperFormatModule=Módulo de formato de impressão
 BarcodeEncodeModule=Tipo de codificação do código de barras
@@ -1371,84 +1104,64 @@ BarcodeDescUPC=Código de barras tipo UPC
 BarcodeDescISBN=Código de barras tipo ISBN
 BarcodeDescC39=Código de barras tipo C39
 BarcodeDescC128=Código de barras tipo C128
-BarcodeDescDATAMATRIX=Código de barras do tipo Datamatrix
 BarcodeDescQRCODE=Código de barras do tipo QR code
 GenbarcodeLocation=Ferramenta em linha de comando para geração de código de barras (usado pelo mecanismo interno para alguns tipos de código de barras)
 BarcodeInternalEngine=Mecanismo interno
 BarCodeNumberManager=Gerente de auto definir números de código de barras
-##### Prelevements #####
 WithdrawalsSetup=Configuração do módulo de pedidos com pagamento por Débito direto
-##### ExternalRSS #####
 ExternalRSSSetup=Configurações importantes de RSS externo
 NewRSS=Novo RSS Feed
 RSSUrl=URL de RSS
 RSSUrlExample=Um interessante RSS feed
-##### Mailing #####
 MailingSetup=Configurações do módulo de e-mails
 MailingEMailFrom=Emissor de e-mails (de) por envio de e-mail pelo módulo de e-mails
 MailingEMailError=Retornar e-mails (erros-para) por e-mails que contêm erros
 MailingDelay=Segundos de espera antes do envio da mensagem seguinte
-##### Notification #####
 NotificationSetup=Configurações do módulo de notificações por e-mail
 NotificationEMailFrom=Emissor de e-mails (de) por envio de notificação por e-mails
 FixedEmailTarget=Alvo fixo e-mail
-##### Sendings #####
 SendingsSetup=Configurações do módulo de envios
 SendingsReceiptModel=Modelo de recibo do envio
 SendingsNumberingModules=Módulos de númeração de envios
 SendingsAbility=Suporte para folhas de envios, para entregas de cliente
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Texto livre para envios
-##### Deliveries #####
 DeliveryOrderNumberingModules=Módulo de numeração de recibos de produtos entregues
 DeliveryOrderModel=Modelo de recibo de produtos entregues
 DeliveriesOrderAbility=Suporta recibos de entrega de produtos
 FreeLegalTextOnDeliveryReceipts=Texto livre em recibos de entregas
-##### FCKeditor #####
-AdvancedEditor=Editor avançado
 ActivateFCKeditor=Editor avançado ativo por:
 FCKeditorForCompany=Criação/edição do WYSIWIG nas descrições de elementos e nota (exceto produtos/serviços)
 FCKeditorForProduct=Criação/edição do WYSIWIG nas descrições de  produtos/serviços e nota
 FCKeditorForProductDetails=Criação/edição do WYSIWIG nas linhas dos detalhes de produtos de todas entidades (orçamentos, pedidos, faturas, etc...). <font class="warning">Aviso: Usando essa opção nesse caso é extremamente NÃO recomendado, podendo causar problemas com caracteres especiais e no formato da página na construção do arquivo PDF.</font>
-FCKeditorForMailing= Criação/edição do WYSIWIG nos E-Mails massivos (ferramentas->emailing)
+FCKeditorForMailing=Criação/edição do WYSIWIG nos E-Mails massivos (ferramentas->emailing)
 FCKeditorForUserSignature=criação/edição do WYSIWIG nas assinaturas de usuários
 FCKeditorForMail=Criação/Edição WYSIWIG para todos os e-mails (exceto Ferramentas->eMailing)
-##### OSCommerce 1 #####
 OSCommerceErrorConnectOkButWrongDatabase=Conexão foi um sucesso mas o banco de dados não enxerga o banco de dados do OSCommerce (chave %s não achada na tabela %s).
 OSCommerceTestOk=Conexão ao servidor '%s' no banco de dados '%s' com o usuário '%s' foi um sucesso.
 OSCommerceTestKo1=Conexão ao servidor '%s' foi um sucesso mas o banco de dados '%s' não foi alcançado.
 OSCommerceTestKo2=Conexão ao servidor '%s' com o usuário '%s' falhou.
-##### Stock #####
 StockSetup=Configurações do módulo de estoque
 IfYouUsePointOfSaleCheckModule=Se você usar um módulo Ponto de Venda (POS módulo fornecido por padrão ou outro módulo externo), esta configuração pode ser ignorado pelo seu modulo ponto de Venda. A maioria modulo ponto de Vendas são projetados para criar imediatamente uma fatura e diminuir estoque por padrão tudo o que são opções aqui. Então, se você precisa ou não ter uma diminuição de ações quando registrar uma venda a partir do seu ponto de venda, verifique também a configuração do seu módulo POS.
-##### Menu #####
 MenuDeleted=Menu Deletado
-Menus=Menus
-TreeMenuPersonalized=Menus personalizados
 NotTopTreeMenuPersonalized=Menus personalizados não conectados à uma entrada do menu superior
 NewMenu=Novo Menu
 Menu=Seleção de menus
-MenuHandler=Gestor de menus
 MenuModule=Fonte do módulo
-HideUnauthorizedMenu= Esconder menus não autorizados (cinza)
+HideUnauthorizedMenu=Esconder menus não autorizados (cinza)
 DetailId=Menu ID
 DetailMenuHandler=Gestor de menu onde mostra novo menu
 DetailMenuModule=Nome do módulo se a entrada do menu vier de um módulo
 DetailType=Tipo do menu (superior o esquerdo)
-DetailTitre=Etiqueta do menu ou código da etiqueta para tradução
 DetailUrl=URL onde o menu envia para você (URL absoluta ou link externo com http://)
 DetailEnabled=Condição para mostra ou não entrar
 DetailRight=Condição para mostrar menus não autorizados em cinza
 DetailLangs=Nomes de arquivos lang para código de etiqueta da tradução
-DetailUser=Interno / Externo / Todos
-Target=Alvo
 DetailTarget=Alvos por links (_blank topo abre uma nova janela)
 DetailLevel=Nível (-1:menu superior, 0:menu do cabeçario, >0 menu e sub-menu)
 ModifMenu=Modificar menu
 DeleteMenu=Deletar entrada do menu
 ConfirmDeleteMenu=Você tem certeza que deseja excluir a entrada no menu <b>%s</b>?
 FailedToInitializeMenu=Falha na inicialização do menu
-##### Tax #####
 TaxSetup=Configurações do módulo taxas, contribuição social e dividendos
 OptionVatMode=Imposto ICMS
 OptionVATDefault=Base em Dinheiro
@@ -1456,19 +1169,14 @@ OptionVATDebitOption=Base em Acréscimo
 OptionVatDefaultDesc=ICMS é um imposto:<br>- Nas entregas dos bens (Nós usamos a data da fatura)<br>- Nos pagamentos dos serviços
 OptionVatDebitOptionDesc=ICMS é um imposto:<br>- Nas entregas dos bens (Nós usamos a data da fatura)<br>- Na emissão da fatura do serviço
 SummaryOfVatExigibilityUsedByDefault=O tempo do ICMS exige por default as seguintes opções a serem escolhidas:
-OnDelivery=Na entrega
-OnPayment=No pagamento
-OnInvoice=Na fatura
 SupposedToBePaymentDate=Data usada no pagamento
 SupposedToBeInvoiceDate=Data usada na fatura
 Buy=Compra
 Sell=Venda
 InvoiceDateUsed=Data usada na fatura
-YourCompanyDoesNotUseVAT=Sua empresa está definido para não usar ICMS (Home->Configuração->Empresa), então não há nenhuma opção de configuração do ICMS.
 AccountancyCode=Código de contabilidade
 AccountancyCodeSell=Código de contas de vendas
 AccountancyCodeBuy=Código de contas de compras
-##### Agenda #####
 AgendaSetup=Configurações do módulo de eventos e agenda
 PasswordTogetVCalExport=Chave para autorizar exportação do link
 PastDelayVCalExport=Não exportar eventos antigos de
@@ -1477,77 +1185,56 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Definido automaticamente esse valor padrão para o
 AGENDA_DEFAULT_FILTER_TYPE=Use automaticamente este tipo de evento no filtro de busca da agenda
 AGENDA_DEFAULT_FILTER_STATUS=Use automaticamente este estado no filtro das buscas da agenda
 AGENDA_DEFAULT_VIEW=Qual aba voçê quer abrir por padrão quando o menu Agenda e selecionado
-AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
-AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### Clicktodial #####
 ClickToDialSetup=Configurações do módulo clique para discar
-ClickToDialUrlDesc=Chamada URL quando se dá um clique na imagem do telefone. Na URL, você pode usar as tags<br><b>__TELEFONEPARA__</b> que será substituido com o número telefônico da pessoa a telefonar<br><b>__TELEFONEDE__ que será substituido com o número da pessoa que se telefona (seus)<br><b>__LOGIN__</b> que será substituido com o seu usuário do seu clique para discar (definido com o seu cartão de usuário)<br><b>__SENHA__</b> que será substituido pela sua senha do clique para discar (definida pelo seu cartão de usuário)
 ClickToDialDesc=Esto modo permite tornar os números telefônicos em link. Um clique neste ícone fará com que o seu telefone ligue para o número exibido. Isto pode ser usado para ligar para um sistema de Call Center do Dolibarr, o qual poderá ligar para um número em um sistema SIP, por exemplo.
 ClickToDialUseTelLink=Use apenas o link "tel." para os números de telefone
 ClickToDialUseTelLinkDesc=Use este método se os seus usuários possuírem um softphone ou uma interface de programa instalada no mesmo computador do navegador, e usado para ligar quando você clica em um link no seu navegador que inicia com "tel.". Se você precisar de uma solução de um servidor completo (sem a necessidade de instalação de um programa local), você deve definir isto para "Não" e preencher o próximo campo.
-##### Point Of Sales (CashDesk) #####
-CashDesk=Ponto de Vendas
 CashDeskSetup=Configurações do módulo do ponto de vendas
 CashDeskThirdPartyForSell=Terceiro genérico para usar nas vendas
 CashDeskBankAccountForSell=Conta default para usar nos pagamentos em dinheiro
-CashDeskBankAccountForCheque= Conta default para usar nos pagamentos em cheque
-CashDeskBankAccountForCB= Conta default para usar nos pagamentos em cartão de crédito
+CashDeskBankAccountForCheque=Conta default para usar nos pagamentos em cheque
+CashDeskBankAccountForCB=Conta default para usar nos pagamentos em cartão de crédito
 CashDeskDoNotDecreaseStock=Desativar diminuição de ações quando uma venda é feita a partir de ponto de venda (se "não", diminuição de ações é feito para cada vendem feito a partir de POS, o que for opção definida no módulo de estoque).
 CashDeskIdWareHouse=Depósito para usar nas vendas
 StockDecreaseForPointOfSaleDisabled=Diminuição do estoque pelo PDV desativado
 StockDecreaseForPointOfSaleDisabledbyBatch=Diminuir estoque no Ponto De Vendas não é compativel com o gerenciamento do lote
 CashDeskYouDidNotDisableStockDecease=Você não desabilitou a redução do estoque quando realizando uma venda a partir do Ponto de Venda. Por isso um armazém é exigido.
-##### Bookmark #####
 BookmarkSetup=Configurações do módulo de marcadores
 BookmarkDesc=Esse módulo permite você gerenciar marcadores. Você pode também adicionar atalhos para qualquer página do Dolibarr ou sites externos no seu menu esquerdo.
 NbOfBoomarkToShow=Número máximo de marcadores para mostrar no menu esquerdo
-##### WebServices #####
 WebServicesSetup=Configurações do módulo de serviço de web
 WebServicesDesc=Ativando esse módulo, Dolibarr se torna um servidor de serviços web e fornece vários serviços web.
 WSDLCanBeDownloadedHere=Arquivos descritor WSDL que fornece serviços que podem ser baixados aqui
 EndPointIs=Os clientes SOAP devem enviar suas solicitações para o destinatário Dolibarr disponível na URL
-##### API ####
 ApiSetup=Instalação de módulo de API
 ApiDesc=Ao ativar este módulo, Dolibarr se tornar um servidor REST para fornecer serviços de web diversos.
-ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=Você pode explorar as APIs no URL
 OnlyActiveElementsAreExposed=Somente elementos de módulos habilitados são expostos
 ApiKey=Chave para API
-WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
-##### Bank #####
 BankSetupModule=Configurações do módulo bancário
 FreeLegalTextOnChequeReceipts=Texto livre para recibos de cheque
 BankOrderShow=Mostrar ordem das contas bancárias para países usando "Número do banco detalhado"
-BankOrderGlobal=Geral
 BankOrderGlobalDesc=Ordem geral exibida
 BankOrderES=Espanhol
 BankOrderESDesc=Ordem espanhola exibida
 ChequeReceiptsNumberingModule=Módulo de Numeração dos Comprovantes de Cheque
-
-##### Multicompany #####
 MultiCompanySetup=Configurações do módulo multi-empresas
-##### Suppliers #####
 SuppliersSetup=Configurações do módulo de fornecedores
 SuppliersCommandModel=Template completo de pedidos de fornecedores (logo...)
 SuppliersInvoiceModel=Template completo de faturas de fornecedores (logo...)
 SuppliersInvoiceNumberingModel=Modelo de numeração de faturas de fornecedores
 IfSetToYesDontForgetPermission=Se definido como sim, não se esqueça de fornecer permissões a grupos ou usuários autorizados para a segunda aprovação
-##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Configurações do módulo GeoIP Maxmind
 PathToGeoIPMaxmindCountryDataFile=Caminho do arquivo que contêm Maxmind ip para tradução do país.<br>Exemplos:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
 NoteOnPathLocation=Nota que seu ip para o arquivo de dados do país deve estar dentro do diretório do seu PHP que possa ser lido (Verifique a configuração do seu PHP open_basedir e o sistema de permissões).
 YouCanDownloadFreeDatFileTo=Você pode baixar uma <b>Versão demo</b> do arquivo Maxmind GeoIP do seu país no %s.
 YouCanDownloadAdvancedDatFileTo=Você também pode baixar uma versão mais completa, com updates do arquivo Maxmind GeoIP do seu país no %s.
 TestGeoIPResult=Teste a conversão IP -> país
-##### Projects #####
 ProjectsNumberingModules=Modelo de numeração de projetos
 ProjectsSetup=Configurações do módulo de projetos
 ProjectsModelModule=Modelo de documento de relatório de projeto
 TasksNumberingModules=Modelo de numeração de tarefas
 TaskModelModule=Modelo de numeração de relatório de tarefas
 UseSearchToSelectProject=Use campos de completação automática para escolher projeto (em vez de usar uma caixa de lista)
-##### ECM (GED) #####
-##### Fiscal Year #####
 AccountingPeriods=Períodos de contabilidade
 AccountingPeriodCard=Período de contabilidade
 NewFiscalYear=Novo período de contabilidade
@@ -1559,13 +1246,10 @@ ShowFiscalYear=Exibir período da contabilidade
 AlwaysEditable=Sempre pode ser editado
 MAIN_APPLICATION_TITLE=Forçar nome visível da aplicação (aviso: definir o seu próprio nome aqui pode quebrar recurso de login preenchimento automático ao usar aplicativos móveis DoliDroid)
 NbMajMin=Número mínimo de caracteres maiúsculos
-NbNumMin=Número mínimo de caracteres numéricos
-NbSpeMin=Número mínimo de caracteres especiais
 NbIteConsecutive=Numero maximo dos mesmos caracteres repetidos
 NoAmbiCaracAutoGeneration=Não use caracteres ambíguos ("1","l","i","|","0","O") para a geração automática
 SalariesSetup=Configuração do módulo de salários
 SortOrder=Ordem de classificação
-Format=Formato
 TypePaymentDesc=0: Pagamento para Cliente, 1: Pagamento para Fornecedor, 2: Pagamentos para Clientes e Fornecedores
 IncludePath=Incluir caminho (definido na variável %s)
 ExpenseReportsSetup=Configuração do módulo de Relatórios de Despesas
@@ -1574,22 +1258,16 @@ NoModueToManageStockIncrease=Nenhum módulo disponível foi ativado para gerenci
 YouMayFindNotificationsFeaturesIntoModuleNotification=Você pode encontrar opções para notificações por email por habilitar e configurar o módulo "Notificação".
 ListOfNotificationsPerUser=Lista de notificações por usuário*
 ListOfNotificationsPerUserOrContact=Lista de notificações por usuário* ou por contato**
-ListOfFixedNotifications=Lista de notificações fixas
 GoOntoUserCardToAddMore=Ir para a aba "Notificações" de um usuário para adicionar ou remover as notificações para os usuários
 GoOntoContactCardToAddMore=Ir para a aba "Notificações" de um terceiro para adicionar ou remover as notificações para contatos/endereços
-Threshold=Limite
 BackupDumpWizard=Assistente para construir arquivo de despejo de backup do banco de dados
 SomethingMakeInstallFromWebNotPossible=A instalação do módulo externo não é possível a partir da interface web pelo seguinte motivo:
 SomethingMakeInstallFromWebNotPossible2=Por esta razão, o processo de atualização descrito aqui é apenas manual de passos que um usuário privilegiado pode fazer.
 InstallModuleFromWebHasBeenDisabledByFile=A instalação do módulo externo do aplicativo foi desabilitada pelo seu Administrador. Você deve pedir que ele remova o arquivo <strong>%s</strong> para permitir esta funcionalidade.
-ConfFileMuseContainCustom=Installing 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=Destacar linhas de tabela quando o mouse passar sobre elas
 HighlightLinesColor=Cor de realce da linha quando o mouse passa sobre ela (manter vazio para nenhum realce)
-TextTitleColor=Cor do título da página
 LinkColor=Cor dos linques
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Trabalhará com os temas principais, pode não ser suportado por temas externos
-BackgroundColor=Cor de fundo
 TopMenuBackgroundColor=Cor de fundo para o menu de topo
 TopMenuDisableImages=Ocultar imagens no menu Superior
 LeftMenuBackgroundColor=Cor do fundo para o menu esquerdo
@@ -1606,13 +1284,10 @@ RecuperableOnly=Sim para VAT "Non Perçue Récupérable" dedicado a alguns estad
 UrlTrackingDesc=Se o prestador do serviço de transporte oferece uma página ou um site na web para verificação da situação do seu envio, você pode inserir seu endereço aqui. Você pode usar a chave {TRACKID} nos parâmetros da URL de forma que o sistema a substitua com o valor do número de rastreamento que o usuário inseriu no cartão de envio.
 OpportunityPercent=Quando você cria uma oportunidade, você definiu um valor estimado para o projeto. De acordo com a situação da oportunidade, este valor pode ser multiplicado por esta taxa para avaliação do valor global que todas as suas oportunidades podem gerar. O valor é uma porcentagem (entre 0 e 100).
 TemplateForElement=O registro deste tema é dedicado a qual elemento
-TypeOfTemplate=Tipo de modelo
 TemplateIsVisibleByOwnerOnly=Template é visível somente pelo proprietário
 FixTZ=Consertar TimeZone
 FillFixTZOnlyIfRequired=Exemplo: +2 (preencher apenas se experimentou um problema)
-ExpectedChecksum=Checksum esperado
 CurrentChecksum=Checksum corrente
-ForcedConstants=Required constant values
 MailToSendProposal=Para enviar a proposta ao cliente
 MailToSendOrder=Para enviar pedido do cliente
 MailToSendInvoice=Para enviar fatura do cliente
@@ -1621,14 +1296,10 @@ MailToSendIntervention=Para enviar intervenção
 MailToSendSupplierRequestForQuotation=Para enviar a solicitação de cotação para fornecedor
 MailToSendSupplierOrder=Para enviar ordem fornecedor
 MailToSendSupplierInvoice=Para enviar fatura do fornecedor
-MailToSendContract=To send a contract
 MailToThirdparty=Para enviar e-mail de uma página de terceiro
 ByDefaultInList=Exibir como padrão na visualização em lista
-YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Exemplo de mensagem que você pode usar para anunciar esta importante versão (sinta-se à vontade para usar isso nos seus websites)
 TitleExampleForMaintenanceRelease=Exemplo de mensagem que você pode usar para anunciar esta versão de manutenção (sinta-se à vontade para usar isso nos seus websites)
-ExampleOfNewsMessageForMajorRelease=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=Quando a opção "Diversos níveis de preço por produto/serviço" estiver habilitada, você pode definir diferentes preços (um por nível de preço) para cada produto. Para ganhar tempo, você pode inserir aqui a regra para ter um preço para cada nível sendo calculada automaticamente de acordo com o preço do primeiro nível, desta forma você precisará apenas inserir o preço do primeiro nível para cada produto. Está página existe apenas para lhe ajudar a ganhar tempo e pode ser útil somente se os seus preços para cada nível estão relacionados ao primeiro nível. Você pode ignorar esta página na maioria das vezes.
 ModelModulesProduct=Temas para os documentos do produto
 ToGenerateCodeDefineAutomaticRuleFirst=Para estar apto a gerar códigos automaticamente, você deve definir primeiro um gerente para definir automaticamente o número do código de barras.
@@ -1636,30 +1307,15 @@ SeeSubstitutionVars=Veja * nota para a lista das possíveis variáveis de substi
 AllPublishers=Todos os que publicam
 UnknownPublishers=Anônimos que publicam
 AddRemoveTabs=Adicionar ou remover abas
-AddDictionaries=Adicionar dicionários
-AddBoxes=Adicionar widgets
-AddSheduledJobs=Adicionar trabalhos agendados
 AddHooks=Adicionar ganchos
 AddTriggers=Adicionar disparadores
-AddMenus=Adicionar menus
-AddPermissions=Adicionar permissões
-AddExportProfiles=Adicionar perfis de exportação
-AddImportProfiles=Adicionar perfis de importação
-AddOtherPagesOrServices=Adicionar outras páginas ou serviços
 AddModels=Adicionar temas de documentos ou de numeração
 AddSubstitutions=Adicionar substituições de chaves
 DetectionNotPossible=Não foi possível a detecção
-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)
 ListOfAvailableAPIs=Lista de API's disponíveis
 activateModuleDependNotSatisfied=O módulo "%s" depende do módulo "%s" que está faltando, assim o módulo "%1$s" pode não funcionar corretamente. Favor instalar o módulo "%2$s" ou desabilitar o módulo "%1$s" se você deseja estar livre de qualquer surpresa.
 CommandIsNotInsideAllowedCommands=O comando que você tenta executar não está na lista de comandos permitidos definidos no parâmetro <strong>$dolibarr_main_restrict_os_commands</strong> no arquivo <strong>conf.php</strong>.
 LandingPage=Página de destino
 SamePriceAlsoForSharedCompanies=Se você usa um módulo de múltiplas empresas, com a escolha de "Preço único", o preço será também o mesmo para todas as empresas se os produtos são compartilhados entre os ambientes.
-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=Este usuário não possui permissões definidas
 TypeCdr=Use "Nenhum" se a data do prazo de pagamento da fatura mais um delta em dias (delta é o campo "Nº de dias")<br>Use "No fim do mês", se, após o delta, a data deve ser aumentada para alcançar o fim do mês (+ um "Prazo" opcional em dias)<br>Use "Atual/Próximo" para ter a data do prazo de pagamento sendo o primeiro Nº do mês (N é armazenado no campo "Nº de dias")
-##### Resource ####
-ResourceSetup=Configuration du module Resource
-UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
diff --git a/htdocs/langs/pt_BR/banks.lang b/htdocs/langs/pt_BR/banks.lang
index a06dc7619cd..d7f6b5fef65 100644
--- a/htdocs/langs/pt_BR/banks.lang
+++ b/htdocs/langs/pt_BR/banks.lang
@@ -56,12 +56,14 @@ TransactionsToConciliate=Transações a reconciliar
 Conciliable=Pode ser reconciliado
 Conciliate=Reconciliar
 Conciliation=Reconciliação
+ReconciliationLate=Reconciliação tardia
 IncludeClosedAccount=Incluir contas inativas
-OnlyOpenedAccount=Somente Contas Abertas
+OnlyOpenedAccount=Apenas contas ativas
 AccountToCredit=Conta para crédito
 AccountToDebit=Conta para débito
 DisableConciliation=Desativar função de reconciliação dessa conta
 ConciliationDisabled=Função de reconciliação desativada
+LinkedToAConciliatedTransaction=Ligado a uma entrada conciliada
 StatusAccountClosed=Inativa
 LineRecord=Transação
 AddBankRecord=Adicionar transação
@@ -88,6 +90,7 @@ DeleteTransaction=Excluir transação
 ConfirmDeleteTransaction=Você tem certeza que deseja excluir esta transação?
 ThisWillAlsoDeleteBankRecord=Isto também excluirá as transações geradas
 PlannedTransactions=Transações planejadas
+ExportDataset_banque_1=Entradas bancárias e demonstrações contábeis
 ExportDataset_banque_2=Comprovante de depósito
 TransactionOnTheOtherAccount=Transação de outra conta
 PaymentNumberUpdateSucceeded=Número de pagamentos atualizado com sucesso
@@ -95,6 +98,7 @@ PaymentNumberUpdateFailed=Número de pagamento não foi possível ser atualizada
 PaymentDateUpdateSucceeded=Data de pagamento atualizada com sucesso
 PaymentDateUpdateFailed=Data de pagamento não foi possível ser atualizada
 Transactions=Transações
+BankTransactionLine=Entrada no bancária
 AllAccounts=Todas contas bancária/caixa
 BackToAccount=Voltar para conta
 ShowAllAccounts=Mostrar todas as contas
diff --git a/htdocs/langs/pt_BR/bookmarks.lang b/htdocs/langs/pt_BR/bookmarks.lang
index 1ad92390b9c..3e6878d9de8 100644
--- a/htdocs/langs/pt_BR/bookmarks.lang
+++ b/htdocs/langs/pt_BR/bookmarks.lang
@@ -1,15 +1,9 @@
 # Dolibarr language file - Source file is en_US - bookmarks
 AddThisPageToBookmarks=Adicionar essa página aos marcadores
-Bookmark=Marcador
-Bookmarks=Marcadores
-NewBookmark=Novo marcador
-ShowBookmark=Mostrar marcador
 OpenANewWindow=Abrir uma nova janela
 ReplaceWindow=Substituir atual janela
 BookmarkTargetReplaceWindowShort=Atual janela
-BookmarkTitle=Título do marcador
 BehaviourOnClick=Comportamento quando a URL é clicada
-CreateBookmark=Criar marcador
 SetHereATitleForLink=Colocar título para o marcador
 UseAnExternalHttpLinkOrRelativeDolibarrLink=Usar uma URL externa ou uma URL do Dolibarr
 ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Escolha se página vinculada deve abrir em uma nova janela ou não
diff --git a/htdocs/langs/pt_BR/boxes.lang b/htdocs/langs/pt_BR/boxes.lang
index 49419f61306..a1d3b2b88cf 100644
--- a/htdocs/langs/pt_BR/boxes.lang
+++ b/htdocs/langs/pt_BR/boxes.lang
@@ -53,7 +53,6 @@ BoxCustomersInvoicesPerMonth=Faturas de cliente por mês
 BoxSuppliersInvoicesPerMonth=Faturas de fornecedor por mês
 BoxCustomersOrdersPerMonth=Pedidos de clientes por mês
 BoxSuppliersOrdersPerMonth=Pedidos de fornecedor por mês
-BoxProposalsPerMonth=Orçamentos por mês
 NoTooLowStockProducts=Nenhum produto abaixo do estoque mínimo
 BoxTitleLastModifiedSupplierBills=Ultimos %s notas fornecedores modificadas
 BoxTitleLatestModifiedSupplierOrders=Ultimas %s ordems de fornecedores modificadas
diff --git a/htdocs/langs/pt_BR/companies.lang b/htdocs/langs/pt_BR/companies.lang
index b88d0b8859d..6073684e4c9 100644
--- a/htdocs/langs/pt_BR/companies.lang
+++ b/htdocs/langs/pt_BR/companies.lang
@@ -12,7 +12,6 @@ MenuNewPrivateIndividual=Novo particular
 NewCompany=Nova empresa (prospecto de cliente, cliente, fornecedor)
 NewThirdParty=Novo terceiro (prospecto de cliente, cliente, fornecedor)
 CreateDolibarrThirdPartySupplier=Criar um terceiro (fornecedor)
-CreateThirdPartyOnly=Criar terceiro
 CreateThirdPartyAndContact=Criar um terceiro + um contato interno
 ProspectionArea=Área de prospecção
 IdThirdParty=ID do terceiro
@@ -29,7 +28,6 @@ ThirdPartyProspects=Prospectos de cliente
 ThirdPartyProspectsStats=Prospectos de cliente
 ThirdPartyCustomersWithIdProf12=Clientes com %s ou %s
 ThirdPartyType=Tipo de terceiro
-Company/Fundation=Pessoa jurídica
 Individual=Pessoa física
 ToCreateContactWithSameName=Um contato/endereço será criado automaticamente com a mesma informação do terceiro. Na maioria dos casos, mesmo que o terceiro seja uma pessoa física, a criação de um único terceiro é suficiente.
 ParentCompany=Matriz
@@ -209,7 +207,6 @@ PriceLevel=Faixa de preço
 DeliveryAddress=Endereço de entrega
 AddAddress=Adicionar endereço
 SupplierCategory=Categoria de fornecedor
-JuridicalStatus200=Independente
 DeleteFile=Excluir arquivo
 ConfirmDeleteFile=Você tem certeza que deseja deletar esse arquivo?
 AllocateCommercial=Designado para representante comercial
diff --git a/htdocs/langs/pt_BR/compta.lang b/htdocs/langs/pt_BR/compta.lang
index 1b5ee09e148..392d95470e4 100644
--- a/htdocs/langs/pt_BR/compta.lang
+++ b/htdocs/langs/pt_BR/compta.lang
@@ -11,8 +11,6 @@ VATReportBuildWithOptionDefinedInModule=Os valores aqui apresentados são calcul
 LTReportBuildWithOptionDefinedInModule=Valores mostrados aqui são calculados usando as regras definidas nas configurações da empresa.
 Param=Configuração
 RemainingAmountPayment=Pagamento montante remanescente:
-Accountparent=Conta pai
-Accountsparent=Contas pai
 Income=Rendimentos
 ReportInOut=Rendimentos/Despesas
 ReportTurnover=Faturamento
@@ -114,8 +112,6 @@ RulesResultDue=- Isto inclui as faturas vencidas, despesas, ICMS (VAT), doaçõe
 RulesResultInOut=- Isto inclui os pagamentos reais feitos nas faturas, despesas, ICMS (VAT) e salários. <br>- Isto é baseado nas datas de pagamento das faturas, despesas, ICMS (VAT) e salários. A data de doação para a doação.
 RulesCADue=- Isto inclui as faturas vencidas do cliente, pagas ou não. <br>- Isto é baseado na data de validação destas faturas. <br>
 RulesCAIn=- Inclui os pagamentos efetuados das faturas a clientes.<br>- Baseia-se na data de pagamento das mesmas<br>
-DepositsAreNotIncluded=- Faturas e depósito não estão incluído
-DepositsAreIncluded=- Faturas de Depósito estão incluídos
 LT2ReportByCustomersInInputOutputModeES=Relatório de fornecedores do  IRPF
 LT1ReportByCustomersInInputOutputModeES=Relatorio por terceiro RE
 VATReport=Relatório de ICMS
@@ -143,7 +139,6 @@ PurchasesJournal=Diário de  Compras
 DescSellsJournal=Diário de Vendas
 DescPurchasesJournal=Diário de  Compras
 CodeNotDef=Não Definida
-WarningDepositsNotIncluded=Depósitos faturas não estão incluídos nesta versão com este módulo de contabilidade.
 DatePaymentTermCantBeLowerThanObjectDate=Data Prazo de pagamento não pode ser inferior a data da compra ou aquisição
 Pcg_version=Modelos de carta de contas
 Pcg_type=Tipo Pcg
diff --git a/htdocs/langs/pt_BR/cron.lang b/htdocs/langs/pt_BR/cron.lang
index 9c4de0bc30d..203adb63829 100644
--- a/htdocs/langs/pt_BR/cron.lang
+++ b/htdocs/langs/pt_BR/cron.lang
@@ -17,14 +17,12 @@ CronDelete=Excluir tarefas agendadas
 CronConfirmDelete=Você tem certeza que deseja excluir esses cron jobs agendados?
 CronExecute=Lançar Tarefas agendadas
 CronConfirmExecute=Você tem certeza que deseja executar agora estas tarefas agendadas?
-CronInfo=Módulo de tarefas agendadas permitem executar trabalho que foram planejadas
 CronNone=Nenhum
 CronDtStart=Não antes
 CronDtEnd=Não depois
 CronDtNextLaunch=Próxima execução
 CronDtLastLaunch=Data de início da última execução
 CronDtLastResult=Data final da última execução
-CronClass=Classe
 CronNoJobs=Nenhuma tarefa registrada
 CronNbRun=Nr. execuçao
 CronMaxRun=Max nr. execução
@@ -39,12 +37,6 @@ CronErrEndDateStartDt=A data final não pode ser anterior a data de início
 CronStatusActiveBtn=Ativar
 CronStatusInactiveBtn=Desativar
 CronTaskInactive=Está tarefa está desativada
-CronClassFile=Classes (nomedoarquivo.class.php)
-CronModuleHelp=Nome do diretório do módulo Dolibarr (também trabalha com módulo Dolibarr externo). Por exemplo para buscar método do objeto Dolibarr Product /htdocs/<u>produto</u>/class/product.class.php, o valor do módulo é o <i>produto</i>
-CronClassFileHelp=O nome do arquivo a ser carregado.<BR>Por exemplo para buscar método do objeto Dolibarr Product /htdocs/produtos/classe/<u>product.class.php</u>, o valor do nome do arquivo de classe é <i>product.class.php</i>
-CronObjectHelp=O nome do objeto a ser carregado. Por exemplo para buscar método do objeto Dolibarr Product /htdocs/produtos/class/product.class.php, o valor do nome do arquivo da classe é <i>Produtos</i>
-CronMethodHelp=O método de objeto para o lançamento. Por exemplo para buscar método do objeto Dolibarr Product /htdocs/produtos/class/product.class.php, o valor do método é <i>fecth</i>
-CronArgsHelp=Os argumentos do método. Por exemplo para buscar método do objeto Product do Dolibarr /htdocs/produto/class/product.class.php, o valor de paramtetros pode ser <i>0, ProductRef</i>
 CronCommandHelp=A linha de comando de sistema que deve ser executada.
 CronCreateJob=Criar uma nova Tarefa agendada
 CronType=Tipo de tarefa
@@ -55,4 +47,3 @@ UseMenuModuleToolsToAddCronJobs=Vá até o menu "Home >> Ferramentas administrat
 JobDisabled=Tarefa desativada
 MakeLocalDatabaseDumpShort=Backup do banco de dados local
 MakeLocalDatabaseDump=Criar um dump do banco de dados local
-WarningCronDelayed=Atenção, para fins de desempenho, qualquer que seja a próxima data de execução das tarefas ativas, as suas tarefas podem ser atrasadas no máximo %s horas antes de serem executadas;
diff --git a/htdocs/langs/pt_BR/errors.lang b/htdocs/langs/pt_BR/errors.lang
index 6ad94dddc47..273cc59b14b 100644
--- a/htdocs/langs/pt_BR/errors.lang
+++ b/htdocs/langs/pt_BR/errors.lang
@@ -4,6 +4,7 @@ ErrorButCommitIsDone=Erros foram encontrados mas, apesar disso, validamos
 ErrorBadEMail=O e-mail %s está errado
 ErrorBadUrl=O URL %s está errado
 ErrorBadValueForParamNotAString=Valor ruim para o seu parâmetro por falta, possivelmente, de tradução.
+ErrorLoginAlreadyExists=O login %s já existe.
 ErrorRecordNotFound=Registro não encontrado.
 ErrorFailToCopyFile=Houve uma falha ao copiar o arquivo '<b>%s</b>' para '<b>%s</b>'.
 ErrorFailToRenameFile=Houve uma falha ao renomear o arquivo '<b>%s</b>' para '<b>%s</b>'.
@@ -101,7 +102,6 @@ ErrorQtyForCustomerInvoiceCantBeNegative=A quantidade nas linhas das notas de cl
 ErrorWebServerUserHasNotPermission=A conta de usuário <b>%s</b> usada para executar o servidor web não possui permissão para isto
 ErrorNoActivatedBarcode=Nenhum tipo de código de barras foi ativado
 ErrUnzipFails=Houve uma falha ao descompactar %s com ZipArchive
-ErrNoZipEngine=Não esta instaladoo programa para descompactar o arquivo% s neste PHP
 ErrorFileMustBeADolibarrPackage=O arquivo %s deve ser um pacote zipado do Dolibarr
 ErrorPhpCurlNotInstalled=O PHP CURL não está instalado, isto é essencial para conversar com Paypal
 ErrorFailedToAddToMailmanList=Falha ao adicionar registro% s para% s Mailman lista ou base SPIP
@@ -157,7 +157,6 @@ ErrorFileMustHaveFormat=O arquivo deve ter o formato %s
 ErrorSupplierCountryIsNotDefined=Este fornecedor não possui o país definido. Corrija isto primeiro.
 ErrorsThirdpartyMerge=Falha em mesclar os dois registros. Solicitação cancelada.
 ErrorModuleNotFound=O arquivo do módulo não foi encontrado.
-ErrorFieldAccountNotDefinedForBankLine=O valor para a conta da Contabilidade não foi definido para a linha do banco de origem %s
 WarningPasswordSetWithNoAccount=A senha foi definida para esse membro. No entanto, nenhuma conta de usuário foi criada. Portanto, esta senha é armazenada, mas não pode ser usado para acessar Dolibarr. Ele pode ser usado por um módulo / interface externa, mas se você não precisa definir qualquer login nem palavra-passe para um membro, você pode desabilitar a opção "Gerenciar um login para cada membro" da configuração do módulo-Membro. Se você precisa para gerenciar um login, mas não precisa de qualquer senha, você pode manter este campo em branco para evitar este aviso. Nota: E-mail pode também ser utilizado como uma entre o membro se está ligado a um utilizador.
 WarningMandatorySetupNotComplete=Há parâmetros de configuração obrigatórios ainda não definidos
 WarningSafeModeOnCheckExecDir=Atenção, a opção PHP <b>safe_mode</b> está em modo de comando devem ser armazenados dentro de um diretório declarado pelo php parâmetro <b>safe_mode_exec_dir.</b>
diff --git a/htdocs/langs/pt_BR/main.lang b/htdocs/langs/pt_BR/main.lang
index 3f9aa2dcf51..a95c5c4eac5 100644
--- a/htdocs/langs/pt_BR/main.lang
+++ b/htdocs/langs/pt_BR/main.lang
@@ -1,9 +1,5 @@
 # Dolibarr language file - Source file is en_US - main
 DIRECTION=ltr
-# Note for Chinese:
-# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
-# stsongstdlight or cid0cs are for simplified Chinese
-# To read Chinese pdf with Linux: sudo apt-get install poppler-data
 FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=,
@@ -26,50 +22,33 @@ FormatDateHourText=%d %B, %Y, %I:%M %p
 DatabaseConnection=Login à Base de Dados
 NoTemplateDefined=Nenhum tema definido para este tipo de e-mail
 AvailableVariables=Variáveis de substituição disponíveis
-NoTranslation=Sem tradução
 NoRecordFound=Nenhum registro encontrado
 NoRecordDeleted=Nenhum registro foi deletado
 NotEnoughDataYet=Sem dados suficientes
 NoError=Sem erro
-Error=Erro
-Errors=Erros
-ErrorFieldRequired=O campo '%s' é obrigatório
 ErrorFieldFormat=O campo '%s' tem um valor incorreto
 ErrorFileDoesNotExists=O arquivo %s não existe
 ErrorFailedToOpenFile=Houve uma falha ao abrir o arquivo %s
 ErrorCanNotCreateDir=Não é possível criar  a pasta %s
 ErrorCanNotReadDir=Não é possível ler a pasta %s
-ErrorConstantNotDefined=Parâmetro %s não definido
-ErrorUnknown=Erro desconhecido
-ErrorSQL=Erro de SQL
 ErrorLogoFileNotFound=O arquivo logo '%s' não se encontra
-ErrorGoToGlobalSetup=Ir á configuração ' Empresa/Instituição ' para corrigir
-ErrorGoToModuleSetup=Ir á configuração do módulo para corrigir
 ErrorFailedToSendMail=Erro ao envio do e-mail (emissor
 ErrorFileNotUploaded=O arquivo não foi possível transferir
-ErrorInternalErrorDetected=Erro detectado
-ErrorWrongHostParameter=Parâmetro Servidor inválido
 ErrorYourCountryIsNotDefined=O seu país não está definido. corrija indo a Configuração-Geral-Editar
 ErrorRecordIsUsedByChild=Impossível de suprimir este registo. Esta sendo utilizado como pai pelo menos em um registo filho.
 ErrorWrongValue=Valor incorreto
 ErrorWrongValueForParameterX=Valor incorreto para o parâmetro %s
-ErrorNoRequestInError=Nenhuma petição em erro
 ErrorServiceUnavailableTryLater=Serviço não disponível no momento. Tente novamente mais tarde.
-ErrorDuplicateField=Duplicado num campo único
 ErrorSomeErrorWereFoundRollbackIsDone=Foram encontrados alguns erros. Alterações revertidas.
 ErrorConfigParameterNotDefined=O parâmetro <b>%s</b> não está definido ao arquivo de configuração Dolibarr <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Impossível encontrar o usuário <b>%s</b> na base de dados do Dolibarr.
 ErrorNoVATRateDefinedForSellerCountry=Erro, nenhum tipo de ICMS definido para o país '%s'.
 ErrorNoSocialContributionForSellerCountry=Erro, nenhum tipo de imposto social / fiscal definidos para o país '%s'.
 ErrorFailedToSaveFile=Erro, o registo do arquivo falhou.
-ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
 NotAuthorized=Você não está autorizado a fazer isso.
-SetDate=Definir data
 SelectDate=Selecionar uma data
 SeeAlso=Ver tambem %s
 SeeHere=veja aqui
-Apply=Aplicar
 BackgroundColorByDefault=Cor do fundo padrão
 FileRenamed=O arquivo foi renomeado com sucesso
 FileUploaded=O arquivo foi carregado com sucesso
@@ -78,169 +57,87 @@ FileWasNotUploaded=O arquivo foi selecionado, mas nao foi ainda enviado. Clique
 NbOfEntries=Nr. de entradas
 GoToWikiHelpPage=Ler a ajuda online (necessário acesso a Internet)
 GoToHelpPage=Consulte a ajuda (pode necessitar de acesso à internet)
-RecordSaved=Registo Guardado
 RecordDeleted=Registro apagado
 LevelOfFeature=Nível de funções
-NotDefined=Não Definida
 DolibarrInHttpAuthenticationSoPasswordUseless=Modo de autenticação do Dolibarr está definido como <b>%s</b> no arquivo de configuração<b>conf.php</b>.<br>Isso significa que o banco de dados das senhas é externo ao Dolibarr, assim mudar este campo, pode não ter efeito.
-Administrator=Administrador
-Undefined=Não Definido
 PasswordForgotten=Esqueceu a senha?
 SeeAbove=Mencionar anteriormente
-HomeArea=Área Principal
-LastConnexion=Latest connection
 PreviousConnexion=último login
 PreviousValue=Valor anterior
 ConnectedOnMultiCompany=Conectado no ambiente
-ConnectedSince=Conectado desde
 AuthenticationMode=Modo de Autenticação
 RequestedUrl=URL solicitada
 DatabaseTypeManager=Tipo de gerente de base de dados
 RequestLastAccessInError=Últimos erros de acesso ao banco de dados
 ReturnCodeLastAccessInError=Código de retorno do último erro de acesso ao banco de dados
 InformationLastAccessInError=Informação do último erro de acesso ao banco de dados
-DolibarrHasDetectedError=O Dolibarr detectou um erro técnico
-InformationToHelpDiagnose=Esta informação pode ser útil para fins de diagnóstico 
-MoreInformation=Mais Informação
-TechnicalInformation=Informação técnica 
+InformationToHelpDiagnose=Esta informação pode ser útil para fins de diagnóstico
 TechnicalID=ID Técnico
-NotePublic=Nota (pública)
-NotePrivate=Nota (privada)
 PrecisionUnitIsLimitedToXDecimals=Dolibarr está configurado para limitar a precisão dos preços unitários a <b>%s</b> Decimais.
-DoTest=Teste
-ToFilter=Filtrar
 NoFilter=Nenhum filtro
 WarningYouHaveAtLeastOneTaskLate=Atenção, tem um elemento a menos que passou a data de tolerância.
 yes=sim
-Yes=Sim
 no=não
-No=Não
-All=Tudo
-Home=Inicio
-Help=Ajuda
 OnlineHelp=Ajuda online
 PageWiki=Pagina wiki
 MediaBrowser=Navegador de mídia
-Always=Sempre
-Never=Nunca
-Under=Baixo
-Period=Periodo
 PeriodEndDate=Data final periodo
 Activate=Ativar
 Activated=Ativado
 Closed=Encerrado
 Closed2=Encerrado
-NotClosed=Not closed
 Enabled=Ativado
-Deprecated=Obsoleto
 Disable=Desativar
 Disabled=Desativado
-Add=Adicionar
 AddLink=Adicionar link
 RemoveLink=Remover o link
 AddToDraft=Adicionar ao rascunho
 Update=Modificar
-Close=Fechar
 CloseBox=Remover o widget do seu painel de controle
-Confirm=Confirmar
 ConfirmSendCardByMail=Você realmente quer enviar o conteúdo deste cartão por e-mail para  <b>%s</b>?
 Delete=Eliminar
 Remove=Retirar
 Resiliate=Concluir
-Cancel=Cancelar
-Modify=Modificar
-Edit=Editar
 Validate=Confirmar
-ValidateAndApprove=Validar e Aprovar
 ToValidate=A Confirmar
-Save=Guardar
 SaveAs=Guardar como
 TestConnection=Teste a login
 ToClone=Cópiar
 ConfirmClone=Selecciones dados que deseja Cópiar.
 NoCloneOptionsSpecified=Não existem dados definidos para copiar
-Of=de
 Go=Ir
 Run=Attivo
-CopyOf=Cópia de
 Show=Ver
-Hide=Hide
 ShowCardHere=Mostrar cartão
-Search=Procurar
-SearchOf=Procurar
-Valid=Confirmar
-Approve=Aprovar
-Disapprove=Desaprovar
-ReOpen=Reabrir
 Upload=Enviar Arquivo
-ToLink=Link
-Select=Selecionar
-Choose=Escolher
 Resize=Modificar tamanho
 Recenter=Recolocar no centro
-Author=Autor
 User=Usuário
 Users=Usuário
-Group=Grupo
-Groups=Grupos
 NoUserGroupDefined=Nenhum grupo definido pelo usuário
-Password=Senha
 PasswordRetype=Repetir Senha
 NoteSomeFeaturesAreDisabled=Antenção, só poucos módulos/funcionalidade foram ativados nesta demo
-Name=Nome
-Person=Pessoa
-Parameter=Parâmetro
-Parameters=Parâmetros
-Value=Valor
 PersonalValue=Valor Personalizado
-NewValue=Novo valor
 CurrentValue=Valor atual
-Code=Código
-Type=Tipo
-Language=Idioma
 MultiLanguage=Multi Idioma
-Note=Nota
-Title=Título
-Label=Etiqueta
 RefOrLabel=Ref. da etiqueta
-Info=Log
-Family=Familia
-Description=Descrição
-Designation=Designação
-Model=Doc template
-DefaultModel=Default doc template
 Action=Ação
 About=Acerca de
-Number=Número
 NumberByMonth=Numero por mes
-AmountByMonth=Valor por mês
-Numero=Número
 Limit=Límite
-Limits=Limites
 Logout=Sair
 NoLogoutProcessWithAuthMode=No recurso de desconexão aplicativo com modo de autenticação
 Connection=Login
-Setup=Configuração
-Alert=Alerta
-Previous=Anterior
-Next=Seguinte
-Cards=Fichas
-Card=Ficha
 Now=Agora
 HourStart=Comece hora
-Date=Data
 DateAndHour=Data e hora
 DateToday=Data de hoje
 DateReference=Data de referência
-DateStart=Data de início
 DateEnd=Data de término
-DateCreation=Data de Criação
 DateCreationShort=Data Criação
 DateModification=Data Modificação
 DateModificationShort=Data Modif.
-DateLastModification=Latest modification date
 DateValidation=Data Validação
-DateClosing=Data de Encerramento
 DateDue=Data Vencimento
 DateValue=Data Valor
 DateValueShort=Data Valor
@@ -249,66 +146,20 @@ DateOperationShort=Data Op.
 DateLimit=Data Límite
 DateRequest=Data Consulta
 DateProcess=Data Processo
-DateBuild=Data da geração do Relatório
-DatePayment=Data de pagamento
-DateApprove=Data de aprovação
-DateApprove2=Data de aprovação (segunda aprovação)
 UserCreation=Criado por
 UserModification=Alterado por
 UserCreationShort=Criado por
 UserModificationShort=Modif. por
-DurationYear=Ano
-DurationMonth=Mês
-DurationWeek=Semana
 DurationDay=Día
-DurationYears=Anos
-DurationMonths=Meses
-DurationWeeks=Semanas
-DurationDays=Dias
-Year=Ano
-Month=Mês
-Week=Semana
-WeekShort=Semana
 Day=Día
-Hour=Hora
-Minute=Minuto
-Second=Segundo
-Years=Anos
-Months=Meses
-Days=Dias
 days=Dias
-Hours=Horas
-Minutes=Minutos
-Seconds=Segundos
 Weeks=Semandas
-Today=Hoje
-Yesterday=Ontem
-Tomorrow=Amanhã
 Morning=Manha
-Afternoon=Tarde
 Quadri=Trimistre
-MonthOfDay=Dia do mês
-HourShort=H
-MinuteShort=mn
-Rate=Tipo
 CurrencyRate=Taxa de conversão moeda
 UseLocalTax=Incluindo taxa
-Bytes=Bytes
-KiloBytes=Kilobytes
-MegaBytes=Megabytes
-GigaBytes=Gigabytes
-TeraBytes=Terabytes
-b=b.
-Kb=Kb
-Mb=Mb
-Gb=Gb
-Tb=Tb
-Cut=Cortar
-Copy=Copiar
-Paste=Colar
 Default=Padrao
 DefaultValue=Valor por default
-Price=Preço
 UnitPrice=Preço Unit.
 UnitPriceHT=Preço Base
 UnitPriceTTC=Preço Unit. Total
@@ -324,9 +175,6 @@ AmountTTCShort=Valor (incl. taxas)
 AmountHT=Valor Base
 AmountTTC=Valor
 AmountVAT=Valor ICMS
-MulticurrencyAlreadyPaid=Already payed, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
 MulticurrencyAmountHT=Quantia (sem as taxas), na moeda original
 MulticurrencyAmountTTC=Quantia (com as taxas), na moeda original
 MulticurrencyAmountVAT=Valor das taxas, na moeda original
@@ -336,10 +184,6 @@ AmountLT1ES=Valor RE
 AmountLT2ES=Valor IRPF
 AmountTotal=Valor Total
 AmountAverage=Valor médio
-PriceQtyMinHT=Preço quantidade min total
-Percentage=Percentagem
-Total=Total
-SubTotal=Subtotal
 TotalHTShort=Total (neto)
 TotalHTShortCurrency=Total (líquido na moeda)
 TotalTTCShort=Total (incl. taxas)
@@ -347,297 +191,106 @@ TotalHT=Valor
 TotalHTforthispage=Total (sem impostos) desta pagina
 Totalforthispage=Total para esta página
 TotalTTC=Total
-TotalTTCToYourCredit=Total a crédito
 TotalVAT=Total do ICMS
 TotalLT1=Total taxa 2
 TotalLT2=Total taxa 3
-TotalLT1ES=Total RE
-TotalLT2ES=Total IRPF
 HT=Sem ICMS
 TTC=ICMS Incluido
 VAT=ICMS
 VATs=Impostos sobre vendas
-LT1ES=RE
-LT2ES=IRPF
 VATRate=Taxa ICMS
-Average=Média
-Sum=Soma
-Delta=Divergencia
-Module=Módulo
-Option=Opção
-List=Lista
-FullList=Lista Completa
-Statistics=Estatísticas
 OtherStatistics=Outras estatisticas
-Status=Estado
 Favorite=Favorito
-ShortInfo=Info.
-Ref=Ref.
-ExternalRef=Ref. extern
 RefSupplier=Ref. Fornecedor
 RefPayment=Ref. Pagamento
-CommercialProposalsShort=Orçamentos
 Comment=Comentario
 Comments=Comentarios
 ActionsToDo=Ações a realizar
-ActionsToDoShort=A realizar
-ActionsDoneShort=Realizadas
 ActionNotApplicable=Não aplicavel
 ActionRunningNotStarted=A Iniciar
-ActionRunningShort=In progress
-ActionDoneShort=Terminado
 ActionUncomplete=Imcompleto
-CompanyFoundation=Companhia/Fundação
 ContactsForCompany=Contatos desta empresa
 ContactsAddressesForCompany=Contatos/Endereços do Cliente ou Fornecedor
 AddressesForCompany=Endereços para este terceiro
 ActionsOnCompany=Ações nesta sociedade
 ActionsOnMember=Eventos deste membro
-NActionsLate=%s em atraso
 RequestAlreadyDone=Pedido ja registrado
-Filter=Filtro
 FilterOnInto=Critério da pesquisa  '<strong>%s</strong>' nos campos %s
 RemoveFilter=Eliminar filtro
-ChartGenerated=Gráficos gerados
-ChartNotGenerated=Gráfico não gerado
 GeneratedOn=Gerado a %s
-Generate=Gerar
-Duration=Duração
-TotalDuration=Duração total
-Summary=Resumo
-DolibarrStateBoard=Estatísticas
-DolibarrWorkBoard=Indicadores de Trabalho
 Available=Disponivel
 NotYetAvailable=Ainda não disponível
 NotAvailable=Não disponível
 Categories=Tags / categorias
 Category=Tag / categoria
-By=Por
-From=De
 to=para
-and=e
-or=ou
-Other=Outro
-Others=Outros
-OtherInformations=Outras Informações
-Quantity=quantidade
-Qty=Quant.
-ChangedBy=Modificado por
-ApprovedBy=Aprovado por
 ApprovedBy2=Aprovado pelo (segunda aprovação)
-Approved=Aprovado
-Refused=Recusado
-ReCalculate=Recalcular
-ResultKo=Erro
-Reporting=Relatório
-Reportings=Relatórios
-Draft=Rascunho
-Drafts=Drafts
-Validated=Validado
 Opened=Aberto
-New=Novo
-Discount=Desconto
-Unknown=Desconhecido
-General=General
-Size=Tamanho
-Received=Recebido
-Paid=Pago
 Topic=Assunto
-ByCompanies=Por empresa
 ByUsers=Por usuário
-Links=Links
-Link=Link
-Rejects=Reprovado
-Preview=Preview
-NextStep=Passo Seguinte
-Datas=Dados
-None=Nenhum
-NoneF=Nenhuma
-Late=Atraso
 LateDesc=O atraso na definição se o registro é tardio ou não, depende da sua configuração. Peça ao seu Administrador para alterar o atraso no menu Início - Configuração - Alertas.
-Photo=Foto
-Photos=Fotos
-AddPhoto=Adicionar foto
 DeletePicture=Apagar foto
 ConfirmDeletePicture=Confirmar eliminação de fotografias
-Login=Login
 CurrentLogin=Login atual
-EnterLoginDetail=Enter login details
-January=Janeiro
-February=Fevereiro
-March=Março
-April=Abril
-May=Maio
-June=Junho
-July=Julho
-August=Agosto
-September=Setembro
-October=Outubro
-November=Novembro
-December=Dezembro
-JanuaryMin=Jan
 FebruaryMin=Fev
-MarchMin=Mar
 AprilMin=Abr
 MayMin=Mai
-JuneMin=Jun
-JulyMin=Jul
 AugustMin=Ago
 SeptemberMin=Set
 OctoberMin=Out
-NovemberMin=Nov
 DecemberMin=Dez
-Month01=Janeiro
-Month02=Fevereiro
-Month03=Março
-Month04=Abril
-Month05=Maio
-Month06=Junho
-Month07=Julho
-Month08=Agosto
-Month09=Setembro
-Month10=Outubro
-Month11=Novembro
-Month12=Dezembro
-MonthShort01=Jan
 MonthShort02=Fev
-MonthShort03=Mar
 MonthShort04=Abr
 MonthShort05=Mai
-MonthShort06=Jun
-MonthShort07=Jul
 MonthShort08=Ago
 MonthShort09=Set
 MonthShort10=Out
-MonthShort11=Nov
 MonthShort12=Dez
 AttachedFiles=Arquivos e Documentos Anexos
 FileTransferComplete=Foi transferido corretamente o Arquivo
-DateFormatYYYYMM=YYYY-MM
-DateFormatYYYYMMDD=YYYY-MM-DD
-DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
-ReportName=Nome do Relatório
 ReportPeriod=Periodo de Análise
-ReportDescription=Descrição
-Report=Relatório
 Keyword=Palavra-chave
-Origin=Origin
-Legend=Legenda
 Fill=Preencher
 Reset=Resetar
 File=Arquivo
 Files=Arquivos
-NotAllowed=Não Autorizado
-ReadPermissionNotAllowed=Leitura não Autorizada
 AmountInCurrency=Valores Apresentados em %s
-Example=Exemplo
-Examples=Exemplos
-NoExample=Sem Exemplo
-FindBug=Sinalizar um bug
 NbOfThirdParties=Numero de Fornecedores
-NbOfLines=Numeros de Linhas
 NbOfObjects=Numero de Objetos
 NbOfObjectReferers=Número de itens relacionados
 Referers=Itens correlatos
-TotalQuantity=Quantidade Total
-DateFromTo=De %s a %s
-DateFrom=A partir de %s
-DateUntil=Até %s
-Check=Verificar
 Uncheck=Desmarque
-Internal=Interno
-External=Externo
-Internals=Internos
-Externals=Externos
-Warning=Alerta
-Warnings=Alertas
-BuildDoc=Gerar o doc
-Entity=Entidade
 Entities=Entidadees
 CustomerPreview=Historico Cliente
 SupplierPreview=Historico Fornecedor
 ShowCustomerPreview=Ver Historico Cliente
 ShowSupplierPreview=Ver Historico Fornecedor
-RefCustomer=Ref. Cliente
-Currency=Moeda
-InfoAdmin=Informação para os administradores
-Undo=Desfazer
-Redo=Refazer
-ExpandAll=Expandir tudo
-UndoExpandAll=Anular Expansão
-Reason=Razão
-FeatureNotYetSupported=Funcionalidade ainda não suportada
-CloseWindow=Fechar Janela
-Response=Resposta
-Priority=Prioridade
 SendByMail=Enviado por e-mail
-MailSentBy=Mail enviado por
-TextUsedInTheMessageBody=Texto utilizado no corpo da mensagem
-SendAcknowledgementByMail=Enviar email de confirmação
-EMail=E-mail
-NoEMail=Sem e-mail
 Email=E-mail
 NoMobilePhone=Sem celular
 Owner=Proprietário
-FollowingConstantsWillBeSubstituted=As seguintes constantes serão substituidas pelo seu valor correspondente.
 Refresh=Atualizar
-BackToList=Mostar Lista
-GoBack=Voltar
 CanBeModifiedIfOk=Pode modificarse se é valido
 CanBeModifiedIfKo=Pode modificarse senão é valido
 ValueIsValid=Valor é válido
 ValueIsNotValid=Valor inválido
 RecordCreatedSuccessfully=Registro criado com sucesso
-RecordModifiedSuccessfully=Registo modificado com êxito
 RecordsModified=%s registros modificados
 RecordsDeleted=%s registro excluido
-AutomaticCode=Criação automática de código
 FeatureDisabled=Função Desativada
 MoveBox=Widget de movimento
-Offered=Oferta
 NotEnoughPermissions=Não tem permissões para esta ação
-SessionName=Nome Sessão
-Method=Método
-Receive=Recepção
 CompleteOrNoMoreReceptionExpected=Completo nada mais a fazer
-ExpectedValue=Expected Value
-CurrentValue=Valor atual
-PartialWoman=Parcial
-TotalWoman=Total
-NeverReceived=Nunca Recebido
-Canceled=Cancelado
-YouCanChangeValuesForThisListFromDictionarySetup=Voce pode modificar os valores para esta lista no menu Configuração - dicionario
 YouCanSetDefaultValueInModuleSetup=Você pode definir o valor padrão usado quando da criação de um novo registro na configuração do módulo
-Color=Cor
-Documents=Documentos
-Documents2=Documentos
 UploadDisabled=Carregamento Desativada
-MenuECM=Documentos
-MenuAWStats=Estatisticas
-MenuMembers=Membros
-MenuAgendaGoogle=Agenda Google
-ThisLimitIsDefinedInSetup=Límite Dolibarr (menu inicio-configuração-segurança): %s Kb, PHP limit: %s Kb
-NoFileFound=Não existem documentos guardados nesta pasta
 CurrentUserLanguage=Idioma atual
 CurrentTheme=Tema atual
 CurrentMenuManager=Administração do menu atual
-Browser=Navegador
-Layout=Layout
-Screen=Screen
 DisabledModules=Módulos desativados
-For=Para
-ForCustomer=Para cliente
-Signature=Assinatura
 DateOfSignature=Data da assinatura
 HidePassword=Mostrar comando com senha oculta
 UnHidePassword=Mostrar comando real com a senha visivel
-Root=Raíz
-Informations=Informação
-Page=Página
-Notes=Notas
-AddNewLine=Adicionar nova linha
 AddFile=Adicionar arquivo
-FreeZone=Entrada livre
 FreeLineOfType=Entrada livre de tipo
 CloneMainAttributes=Clonar o objeto com estes atributos
 PDFMerge=Fusão de PDF
@@ -645,30 +298,18 @@ Merge=Fusão
 PrintContentArea=Mostrar pagina a se imprimir na area principal
 MenuManager=Administração do menu
 WarningYouAreInMaintenanceMode=Atenção, voce esta no modo de manutenção, somente o login <b>%s</b> tem permissões para uso da aplicação no momento.
-CoreErrorTitle=Erro de sistema
-CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=Cartão de credito
 FieldsWithAreMandatory=Campos com <b>%s</b> são obrigatorios
 FieldsWithIsForPublic=Campos com <b>%s</b> são mostrados na lista publica de membros. Se não deseja isto, deselecione a caixa "publico".
 AccordingToGeoIPDatabase=(conforme a convenção GeoIP)
-Line=Linha
 NotSupported=Não suportado
 RequiredField=Campo obrigatorio
-Result=Resultado
-ToTest=Teste
 ValidateBefore=Precisa de um cartão valido antes de usar esta função
-Visibility=Visibilidade
-Private=Privado
 Hidden=Escondido
 Resources=Resorsas
-Source=Fonte
-Prefix=Prefixo
-Before=Antes
-After=Depois
 IPAddress=endereco IP
 Frequency=Frequencia
 IM=Mensagems instantaneas
-NewAttribute=Novo atributo
 AttributeCode=Codigo do atributo
 URLPhoto=URL da photo/logo
 SetLinkToAnotherThirdParty=Atalho para outro terceiro
@@ -681,32 +322,21 @@ LinkToSupplierProposal=Link para a proposta de Compra
 LinkToSupplierInvoice=Link para a Fatura de Compra
 LinkToContract=Link para o Contrato
 LinkToIntervention=Link para a Intervensão
-CreateDraft=Criar Rascunho
 SetToDraft=Voltar para modo rascunho
-ClickToEdit=Clique para editar
 ObjectDeleted=Objeto %s apagado
-ByCountry=Por país
-ByTown=Por cidade
-ByDate=Por data
 ByMonthYear=Por mes/ano
 ByYear=Por ano
 ByMonth=Por mes
 ByDay=Por día
 BySalesRepresentative=Por vendedor representante
-LinkedToSpecificUsers=Conectado com um contato particular do usuario 
-NoResults=Sem resultados
+LinkedToSpecificUsers=Conectado com um contato particular do usuario
 AdminTools=Ferram. admin.
-SystemTools=Ferramentas do sistema
 ModulesSystemTools=Ferramentas de modulos
-Test=Teste
-Element=Elemento
 NoPhotoYet=Sem fotos disponiveis no momento
 Dashboard=Painel de Controle
-MyDashboard=My dashboard
 Deductible=Deduzivel
 from=de
 toward=para
-Access=Acesso
 SelectAction=Selecionar ação
 HelpCopyToClipboard=Use Ctrl+C para copiar para o clipboard
 SaveUploadedFileWithMask=Salvar arquivo no servidor com nome "<strong>%s</strong>" (alternativamente "%s")
@@ -718,35 +348,23 @@ ViewPrivateNote=Ver anotaçoes
 XMoreLines=%s linha(s) escondidas
 PublicUrl=URL pública
 AddBox=Adicionar caixa
-SelectElementAndClickRefresh=Selecionar um elemento e clickar atualizar
 PrintFile=Imprimir arquivo %s
-ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Vá para casa - Configuração - Empresa de mudar logotipo ou ir para casa - Setup - Display para esconder.
-Deny=Negar
 Denied=Negado
-ListOfTemplates=Lista de modelos
 Gender=Gênero
-Genderman=Homem
-Genderwoman=Mulher
 ViewList=Exibição de lista
 Mandatory=Obrigatório
-Hello=Olá
 Sincerely=Sinceramente
 DeleteLine=Apagar linha
 ConfirmDeleteLine=Você tem certeza que deseja excluir esta linha?
-NoPDFAvailableForDocGenAmongChecked=Nenhum PDF estava disponível para a geração do documento entre os registros verificados
-TooManyRecordForMassAction=Muitos registros selecionados para a ação em massa. A ação é restrita a uma lista de %s registros.
-NoRecordSelected=No record selected
 MassFilesArea=Área para os arquivos gerados pelas ações em massa
 ShowTempMassFilesArea=Exibir área dos arquivos gerados pelas ações em massa
 RelatedObjects=Objetos Relacionados
 ClassifyBilled=Classificar Faturado
-Progress=Progresso
 ClickHere=Clickque aqui
 FrontOffice=Frente do escritório
 BackOffice=Fundo do escritório
 View=Visão
-Export=Exportar
 Exports=Exportações
 ExportFilteredList=Exportar lista filtrada
 ExportList=Exportar lista
@@ -754,41 +372,9 @@ Miscellaneous=Variados
 Calendar=Calendário
 GroupBy=Agrupar por
 ViewFlatList=Visão da lista resumida
-RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Direct download link
-Download=Download
-ActualizeCurrency=Update currency rate
 Fiscalyear=Ano fiscal
-# Week day
-Monday=Segunda-feira
-Tuesday=Terça-feira
-Wednesday=Quarta-feira
-Thursday=Quinta-feira
-Friday=Sexta-feira
 Saturday=Sabado
-Sunday=Domingo
-MondayMin=Seg
-TuesdayMin=Ter
-WednesdayMin=Qua
-ThursdayMin=Qui
-FridayMin=Sex
 SaturdayMin=Sab
-SundayMin=Dom
-Day1=Segunda-Feira
-Day2=Terça-Feira
-Day3=Quarta-Feira
-Day4=Quinta-Feira
-Day5=Sexta-Feria
-Day6=Sábado
-Day0=Domingo
-ShortMonday=Seg
-ShortTuesday=Ter
-ShortWednesday=Qua
-ShortThursday=Qui
-ShortFriday=Sex
-ShortSaturday=Sab
-ShortSunday=Dom
 SelectMailModel=Escolha um modelo de e-mail
 SetRef=Escolher referência
 Select2ResultFoundUseArrows=Alguns resultados encontrados. Use as setas para selecionar.
@@ -796,26 +382,17 @@ Select2NotFound=Nenhum resultado encontrado
 Select2Enter=Forneça
 Select2MoreCharacter=ou mais caracteres
 Select2MoreCharacters=ou mais caracteres
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
 Select2LoadingMoreResults=Carregando mais resultados...
 Select2SearchInProgress=Busca em andamento...
 SearchIntoThirdparties=Terceiros
 SearchIntoContacts=Contatos
-SearchIntoMembers=Membros
 SearchIntoUsers=Usuários
 SearchIntoProductsOrServices=Produtos ou serviços
-SearchIntoProjects=Projetos
-SearchIntoTasks=Tarefas
 SearchIntoCustomerInvoices=Faturas a clientes
 SearchIntoSupplierInvoices=Faturas de fornecedores
 SearchIntoCustomerOrders=Pedidos de clientes
 SearchIntoSupplierOrders=Pedidos a fornecedores
 SearchIntoCustomerProposals=Propostas de cliente
 SearchIntoSupplierProposals=Propostas a fornecedor
-SearchIntoInterventions=Intervenções
 SearchIntoContracts=Contratos
 SearchIntoCustomerShipments=Remessas do cliente
-SearchIntoExpenseReports=Relatórios de despesas
-SearchIntoLeaves=Licenças
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/pt_BR/other.lang b/htdocs/langs/pt_BR/other.lang
index 9e8e942fd7e..82594ede742 100644
--- a/htdocs/langs/pt_BR/other.lang
+++ b/htdocs/langs/pt_BR/other.lang
@@ -54,7 +54,6 @@ PredefinedMailTestHtml=Esse é um email de <b>teste</b> (a palavra teste deve es
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nVocê encontrará a fatura aqui __REF__\n\n__PERSONALIZED__Atenciosamente\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nGostaríamos de lhe alertar que a fatura  __REF__ parece não ter sido paga. Por isso ela está novamente anexa, apenas como um lembrete.\n\n__PERSONALIZED__Atenciosamente\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__ CONTACTCIV NAME__ Você vai encontrar aqui a proposta comercial __ PROPREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nVocê vai encontrar aqui o preço pedido __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIV NAME__ Você vai encontrar aqui a ordem __ ORDERREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ Você vai encontrar aqui o nosso pedido __ ORDERREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nVocê encontrará sua fatura aqui __REF__\n\n__PERSONALIZED__Atenciosamente\n\n__SIGNATURE__
@@ -91,18 +90,6 @@ BackToLoginPage=Voltar e a página de login
 AuthenticationDoesNotAllowSendNewPassword=O modo de autenticação é <b>%s</b>.<br />Neste modo, o Dolibarr não pode saber e nem alterar a sua senha.<br />Entre em contato com o seu Administrador se você deseja alterar a sua senha.
 EnableGDLibraryDesc=Instale ou ative a biblioteca GD da sua instalação PHP para usar esta opção.
 ProfIdShortDesc=<b>Prof Id %s</b> é uma informação dePendente do país do Fornecedor.<br>Por Exemplo, para o país  <b>%s</b>, é o código <b>%s</b>.
-NumberOfProposals=Número de propostas nos últimos 12 meses
-NumberOfCustomerOrders=Número de pedidos de cliente nos últimos 12 meses
-NumberOfCustomerInvoices=Número de faturas de cliente nos últimos 12 meses
-NumberOfSupplierProposals=Número de propostas do fornecedor nos últimos 12 meses
-NumberOfSupplierOrders=Número de pedidos a fornecedor nos últimos 12 meses
-NumberOfSupplierInvoices=Número de faturas de fornecedor nos últimos 12 meses
-NumberOfUnitsProposals=Número de unidades nas propostas nos últimos 12 meses
-NumberOfUnitsCustomerOrders=Número de unidades nos pedidos de cliente nos últimos 12 meses
-NumberOfUnitsCustomerInvoices=Número de unidades nas faturas de cliente nos últimos 12 meses
-NumberOfUnitsSupplierProposals=Número de unidades nas propostas do fornecedor nos últimos 12 meses
-NumberOfUnitsSupplierOrders=Número de unidades nos pedidos a fornecedor nos últimos 12 meses
-NumberOfUnitsSupplierInvoices=Número de unidades nas faturas de fornecedor nos últimos 12 meses
 EMailTextInterventionAddedContact=Uma nova intervenção %s foi atribuída a você.
 EMailTextInterventionValidated=A intervenção %s foi validada
 EMailTextInvoiceValidated=A fatura %s foi validada.
diff --git a/htdocs/langs/pt_BR/paypal.lang b/htdocs/langs/pt_BR/paypal.lang
index 3a24701e5fb..40c5d92f42f 100644
--- a/htdocs/langs/pt_BR/paypal.lang
+++ b/htdocs/langs/pt_BR/paypal.lang
@@ -16,11 +16,8 @@ ThisIsTransactionId=Eis o id da transação: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Adicionar URL do pagamento Paypal quando se envia o documento por e-mail
 PredefinedMailContentLink=Clique no link seguro abaixo para fazer o pagamento (PayPal) se nao esta ainda effetuado.⏎\n⏎\n%s⏎\n⏎\n
 YouAreCurrentlyInSandboxMode=No momento esta no modo "caixa de areia"
-NewPaypalPaymentFailed=Tentado novo pagamento Paypal mas sem hesito.
 PAYPAL_PAYONLINE_SENDEMAIL=Endereço e-mail para aviso apos o pagamento (positivo ou nao)
 ReturnURLAfterPayment=Retornar ao URL após o pagamento
-ValidationOfPaypalPaymentFailed=Validação do pagamento do Paypal falhou
-PaypalConfirmPaymentPageWasCalledButFailed=Pagamento completo mas nenhum pagamento foi recebido no PayPal
 SetExpressCheckoutAPICallFailed=Falha ao chamar a API: SetExpressCheckout.
 DoExpressCheckoutPaymentAPICallFailed=Falha ao chamar a API: DoExpressCheckoutPayment.
 DetailedErrorMessage=Mensagem de erro detalhada
diff --git a/htdocs/langs/pt_BR/products.lang b/htdocs/langs/pt_BR/products.lang
index 4243b299105..0fdd0ce8344 100644
--- a/htdocs/langs/pt_BR/products.lang
+++ b/htdocs/langs/pt_BR/products.lang
@@ -15,10 +15,8 @@ MassBarcodeInit=Inicialização de código de barras.
 MassBarcodeInitDesc=Esta página pode ser usado para inicializar um código de barras em objetos que não têm código de barras definidas. Verifique antes que a instalação do módulo de código de barras é completa.
 ProductAccountancyBuyCode=Código contábil (para compras)
 ProductAccountancySellCode=Código contábil (venda)
-ProductsOnSell=Produto para venda ou para compra
 ProductsNotOnSell=Produto que não se vende nem se compra
 ProductsOnSellAndOnBuy=Produtos para venda e para compra
-ServicesOnSell=Serviços para venda ou para compra
 ServicesNotOnSell=Serviços não vendidos
 ServicesOnSellAndOnBuy=Serviços para venda e compra
 LastModifiedProductsAndServices=Últimos %s produtos/serviços modificados
diff --git a/htdocs/langs/pt_BR/projects.lang b/htdocs/langs/pt_BR/projects.lang
index 7a16aa7591c..fbe1965a978 100644
--- a/htdocs/langs/pt_BR/projects.lang
+++ b/htdocs/langs/pt_BR/projects.lang
@@ -22,6 +22,9 @@ DeleteAProject=Excluir um projeto
 DeleteATask=Excluir uma tarefa
 ConfirmDeleteAProject=Você tem certeza que deseja excluir este projeto?
 ConfirmDeleteATask=Você tem certeza que deseja excluir esta tarefa?
+OpenedProjects=Projetos em andamento
+OpenedTasks=Tarefas em andamento
+OpportunitiesStatusForOpenedProjects=Montante de oportunidades de projetos abertos de acordo com a situação
 OpportunitiesStatusForProjects=Montante de oportunidades dos projetos pela situação
 ShowProject=Mostrar projeto
 NoProject=Nenhum Projeto Definido
@@ -33,7 +36,8 @@ TimesSpent=Dispêndio de tempo
 RefTask=Ref. da tarefa
 TaskTimeSpent=Dispêndio de tempo com tarefas
 TaskTimeUser=Usuário
-NewTimeSpent=Novo dispêndio de tempo
+TasksOnOpenedProject=Tarefas em projetos abertos
+NewTimeSpent=Dispêndio de tempo
 MyTimeSpent=Meu dispêndio de tempo
 TaskDateEnd=Data final da tarefa
 NewTask=Nova tarefa
@@ -75,7 +79,6 @@ DoNotShowMyTasksOnly=Ver tambem tarefas não associadas comigo
 ShowMyTasksOnly=Visualizar apenas tarefas incumbidas a mim
 NoTasks=Não há tarefas para este projeto
 LinkedToAnotherCompany=Ligado a outros terceiros
-TaskIsNotAffectedToYou=Tarefas não incumbidas a você
 ErrorTimeSpentIsEmpty=O dispêndio de tempo está em branco
 ThisWillAlsoRemoveTasks=Esta ação também vai apagar todas as tarefas do projeto <b>(tarefas% s</b> no momento) e todas as entradas de tempo gasto.
 IfNeedToUseOhterObjectKeepEmpty=Se alguns objetos (nota fiscal, ordem, ...), pertencentes a um terceiro, deve estar vinculado ao projeto de criar, manter este vazio para que o projeto de vários fornecedores.
@@ -115,7 +118,6 @@ FirstAddRessourceToAllocateTime=Atribuir o recurso de um usuário à tarefa para
 InputPerDay=Entrada por dia
 InputPerWeek=Entrada por semana
 InputPerAction=Entrada por ação
-TimeAlreadyRecorded=Tempo já passado gravado para esta tarefa / dia e usuário %s
 ProjectsWithThisUserAsContact=Projetos com este usuário como contato
 TasksWithThisUserAsContact=As tarefas atribuídas a esse usuário
 ResourceNotAssignedToProject=Não atribuído ao projeto
@@ -132,8 +134,8 @@ ProjectsStatistics=As estatísticas sobre projetos / leads
 TaskAssignedToEnterTime=Tarefa atribuída. Entrando tempo nesta tarefa deve ser possível.
 IdTaskTime=Horário do ID da tarefa
 YouCanCompleteRef=Se você deseja completar a referência com alguma informação (para usar como filtro de busca), recomenda-se a adição do carácter "-" para separação, desta forma a numeração automática ainda funcionará corretamente para os próximos projetos. Por exemplo: %s-ABC. Você também pode preferir adicionar chaves de busca no rótulo. Mas a melhor prática pode ser adicionar um campo dedicado, também chamado de atributos complementares.
-OpenedProjectsByThirdparties=Projetos abertos pelo thirdparties
 OnlyOpportunitiesShort=Somente oportunidades
+OpenedOpportunitiesShort=Oportunidades em andamento
 NotAnOpportunityShort=Não é uma oportunidade
 OpportunityTotalAmount=Montante total de oportunidades
 OpportunityPonderatedAmount=Montante de oportunidades ponderadas
diff --git a/htdocs/langs/pt_BR/supplier_proposal.lang b/htdocs/langs/pt_BR/supplier_proposal.lang
index 5feee372351..82e3b298c05 100644
--- a/htdocs/langs/pt_BR/supplier_proposal.lang
+++ b/htdocs/langs/pt_BR/supplier_proposal.lang
@@ -44,7 +44,6 @@ CommercialAsk=Solicitação de preço
 DefaultModelSupplierProposalCreate=Criação de modelo padrão
 DefaultModelSupplierProposalToBill=Tema padrão quando fechando uma solicitação de preço (aceita)
 DefaultModelSupplierProposalClosed=Tema padrão quando fechando uma solicitação de preço (recusada)
-ListOfSupplierProposal=Lista de solicitações de proposta a fornecedor
 ListSupplierProposalsAssociatedProject=Lista de propostas de fornecedores associadas ao projeto
 SupplierProposalsToClose=Propostas a fornecedor a encerrar
 SupplierProposalsToProcess=Propostas a fornecedor a tratar
diff --git a/htdocs/langs/pt_PT/accountancy.lang b/htdocs/langs/pt_PT/accountancy.lang
index 9fe84202b60..b10124ac9a9 100644
--- a/htdocs/langs/pt_PT/accountancy.lang
+++ b/htdocs/langs/pt_PT/accountancy.lang
@@ -1,245 +1,267 @@
 # Dolibarr language file - en_US - Accounting Expert
-ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
-ACCOUNTING_EXPORT_DATE=Date format for export file
-ACCOUNTING_EXPORT_PIECE=Export the number of piece
-ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account
-ACCOUNTING_EXPORT_LABEL=Export label
-ACCOUNTING_EXPORT_AMOUNT=Export amount
-ACCOUNTING_EXPORT_DEVISE=Export currency
-Selectformat=Select the format for the file
-ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
-ThisService=This service
-ThisProduct=This product
-DefaultForService=Default for service
-DefaultForProduct=Default for product
-CantSuggest=Can't suggest
-AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=A configuração do módulo especialista em contabilidade
-Journalization=Journalization
-Journaux=Diarios
-JournalFinancial=Diarios financeiros
+ACCOUNTING_EXPORT_SEPARATORCSV=Separador de coluna para o ficheiro exportado
+ACCOUNTING_EXPORT_DATE=Formato da data para o ficheiro exportado
+ACCOUNTING_EXPORT_PIECE=Exportar a referência da peça
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Exportar com a conta global
+ACCOUNTING_EXPORT_LABEL=Exportar a etiqueta
+ACCOUNTING_EXPORT_AMOUNT=Exportar quantia
+ACCOUNTING_EXPORT_DEVISE=Exportar moeda
+Selectformat=Selecione o formato para o ficheiro
+ACCOUNTING_EXPORT_PREFIX_SPEC=Especifique o prefixo para o nome de ficheiro
+ThisService=Este serviço
+ThisProduct=Este produto
+DefaultForService=Padrão para o serviço
+DefaultForProduct=Padrão para o produto
+CantSuggest=Não pode sugerir
+AccountancySetupDoneFromAccountancyMenu=A maioria da configuração da contabilidade é efetuada a partir do menu %s
+ConfigAccountingExpert=Configuração do módulo "Contabilidade (avançada)"
+Journalization=Registo em diário contabilístico
+Journaux=Diários
+JournalFinancial=Diários financeiros
 BackToChartofaccounts=Voltar ao plano de contas
 Chartofaccounts=Gráfico de contas
-CurrentDedicatedAccountingAccount=Current dedicated account
-AssignDedicatedAccountingAccount=New account to assign
-InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
-OtherInfo=Other information
+CurrentDedicatedAccountingAccount=Conta dedicada atual
+AssignDedicatedAccountingAccount=Nova conta para atribuir
+InvoiceLabel=Etiqueta da factura
+OverviewOfAmountOfLinesNotBound=Visão geral da quantidade de linhas não vinculadas à conta contabilística
+OverviewOfAmountOfLinesBound=Visão geral da quantidade de linhas já vinculadas à conta contabilística
+OtherInfo=Outra informação
+DeleteCptCategory=Remover conta contabilistica do grupo
+ConfirmDeleteCptCategory=Tem a certeza que deseja remover esta conta contabilística deste grupo?
 
-AccountancyArea=Accountancy area
-AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
-AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
-AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
-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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
+AccountancyArea=Área de contabilidade
+AccountancyAreaDescIntro=O uso do módulo de contabilidade é feito em várias etapas:
+AccountancyAreaDescActionOnce=As seguintes ações são geralmente executadas apenas uma vez, ou uma vez por ano ...
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionFreq=As seguintes ações são normalmente executadas a cada mês, semana ou dia para grandes empresas...
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
-AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
+AccountancyAreaDescChartModel=PASSO %s: Crie um modelo de gráfico de conta no menu %s
+AccountancyAreaDescChart=PASSO %s: Criar or verificar conteúdo do seu gráfico de conta no menu %s
 
-AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=PASSO %s: Defina a conta contabilística para cada conta bancária e financeira. Para tal vá à ficha de cada conta bancária ou financeira. Comece na página %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
+AccountancyAreaDescAnalyze=PASSO %s: Adicionar ou editar transações e gerar relatórios e ficheiros a exportar.
+
+AccountancyAreaDescClosePeriod=PASSO %s: Fechar período para que não seja possível modificar no futuro.
 
 MenuAccountancy=Contabilidade
-Selectchartofaccounts=Select active chart of accounts
-ChangeAndLoad=Change and load
-Addanaccount=Adicione uma conta contabilistica
-AccountAccounting=Conta contabilistica
+Selectchartofaccounts=Selecione gráfico de contas ativo 
+ChangeAndLoad=Mudar e carregar
+Addanaccount=Adicione uma conta contabilística
+AccountAccounting=Conta contabilística
 AccountAccountingShort=Conta
-AccountAccountingSuggest=Accounting account suggested
-MenuDefaultAccounts=Default accounts
-MenuVatAccounts=Vat accounts
-MenuTaxAccounts=Tax accounts
-MenuExpenseReportAccounts=Expense report accounts
-MenuLoanAccounts=Loan accounts
-MenuProductsAccounts=Product accounts
-ProductsBinding=Products accounts
-Ventilation=Binding to accounts
-CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Supplier invoice binding
-ExpenseReportsVentilation=Expense report binding
-CreateMvts=Create new transaction
-UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=Contabilidade geral
-AccountBalance=Account balance
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Mostrar diário contabilistico
+AccountAccountingSuggest=Conta contabilística sugerida
+MenuDefaultAccounts=Contas padrão
+MenuVatAccounts=Contas de IVA
+MenuTaxAccounts=Contas fiscais
+MenuExpenseReportAccounts=Contas de relatório de despesas
+MenuLoanAccounts=Contas de empréstimo
+MenuProductsAccounts=Contas de produtos
+ProductsBinding=Contas de produtos
+Ventilation=Vinculação a contas
+CustomersVentilation=Cliente de ligação factura
+SuppliersVentilation=Fornecedor de ligação factura
+ExpenseReportsVentilation=Vinculação do relatório de despesas
+CreateMvts=Criar nova transação
+UpdateMvts=Modificação de uma transação
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
+AccountBalance=Saldo da conta
 
-CAHTF=Total purchase supplier before tax
-TotalExpenseReport=Total expense report
-InvoiceLines=Lines of invoices to bind
-InvoiceLinesDone=Bound lines of invoices
-ExpenseReportLines=Lines of expense reports to bind
-ExpenseReportLinesDone=Bound lines of expense reports
-IntoAccount=Bind line with the accounting account
+CAHTF=Total de compras em fornecedores sem impostos
+TotalExpenseReport=Relatório da despesa total
+InvoiceLines=Linhas de facturas a vincular
+InvoiceLinesDone=Linhas vinculadas de facturas
+ExpenseReportLines=Linhas de relatórios de despesas para vincular
+ExpenseReportLinesDone=Linhas vinculadas de relatórios de despesas
+IntoAccount=Vincular linha com a conta contabilística
 
 
-Ventilate=Bind
-LineId=Id line
-Processing=Processando
-EndProcessing=Process terminated.
-SelectedLines=Selecione a linha
-Lineofinvoice=Linha de fatura
-LineOfExpenseReport=Line of expense report
-NoAccountSelected=No accounting account selected
-VentilatedinAccount=Binded successfully to the accounting account
-NotVentilatedinAccount=Not bound to the accounting account
-XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
-XLineFailedToBeBinded=%s products/services were not bound to any accounting account
+Ventilate=Vincular
+LineId=Linha de Id
+Processing=A processar
+EndProcessing=Processo terminado.
+SelectedLines=Linhas selecionadas
+Lineofinvoice=Linha da fatura
+LineOfExpenseReport=Linha de relatório de despesas
+NoAccountSelected=Nenhuma conta contabilística selecionada
+VentilatedinAccount=Vinculado com sucesso a conta de contabilística
+NotVentilatedinAccount=Não vinculado à conta contabilística
+XLineSuccessfullyBinded=%s produtos/serviços vinculados com sucesso a uma conta contabilística
+XLineFailedToBeBinded=%s produtos/serviços não foram vinculados a uma conta contabilística
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Número de elementos para vincular, mostrado por página (máximo recomendado: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Comece a ordenação da página "Vinculação a efetuar" pelos elementos mais recentes
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Comece a ordenação da página "Vinculação efetuada" pelos elementos mais recentes
 
-ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
-BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
+ACCOUNTING_LENGTH_DESCRIPTION=Truncar a descrição de produtos e serviços em listas após x caracteres (Ideal = 50)
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncar descrição produtos e serviços em formulário da conta em listas após x caracteres (Ideal = 50)
+ACCOUNTING_LENGTH_GACCOUNT=Tamanho das contas contabilísticas gerais (se definir o valor deste campo a 6, então a conta '706' irá ser mostrada como '706000')
+ACCOUNTING_LENGTH_AACCOUNT=Tamanho das contas contabilísticas de terceiros (se definir o valor deste campo a 6, então a conta '401' irá ser mostrada como '401000')
+ACCOUNTING_MANAGE_ZERO=Permitir a gestão do número de zeros no fim da designação da conta contabilística. Isto é necessário em alguns países (como a Suíça). Se desativada (por defeito), você poderá definir os 2 seguintes parâmetros de forma a que a aplicação adicione zeros virtualmente.
+BANK_DISABLE_DIRECT_INPUT=Desactivar a gravação direta de transação na conta bancária
 
 ACCOUNTING_SELL_JOURNAL=Diário de vendas
 ACCOUNTING_PURCHASE_JOURNAL=Diário de compras
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Diário de diversos
-ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Diário de relatório de despesas
 ACCOUNTING_SOCIAL_JOURNAL=Diário social
 
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
-ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
-DONATION_ACCOUNTINGACCOUNT=Conta de contabilidade para registar donativos
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Conta contabilística de transferência
+ACCOUNTING_ACCOUNT_SUSPENSE=Conta contabilística de espera
+DONATION_ACCOUNTINGACCOUNT=Conta contabilística para registar donativos
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Conta contabilística padrão para produtos comprados (usado se não for definida na folha de produto)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Conta contabilística padrão para produtos vendidos (utilizada se não for definida na folha de produto)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Conta contabilística padrão para compra de serviços (usada se não for definida na folha de serviço)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Conta contabilística padrão para serviços vendidos (usada se não for definida na folha de serviço)
 
 Doctype=Tipo de documento
 Docdate=Data
-Docref=Referencia
+Docref=Referência
 Code_tiers=Terceiros
 Labelcompte=Etiqueta de conta
 Sens=Sentido
 Codejournal=Diário
-NumPiece=Piece number
-TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
-GroupByAccountAccounting=Group by accounting account
-NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
-DelYear=Year to delete
-DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
-FinanceJournal=Finance journal
-ExpenseReportsJournal=Expense reports journal
-DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
-VATAccountNotDefined=Account for VAT not defined
-ThirdpartyAccountNotDefined=Account for third party not defined
-ProductAccountNotDefined=Account for product not defined
-FeeAccountNotDefined=Account for fee not defined
-BankAccountNotDefined=Account for bank not defined
+NumPiece=Número da peça
+TransactionNumShort=Núm. de transação
+AccountingCategory=Grupos de contas contabilísticas
+GroupByAccountAccounting=Agrupar por conta contabilística
+NotMatch=Não configurado
+DeleteMvt=Delete Ledger lines
+DelYear=Ano a apagar
+DelJournal=Diário a apagar
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
+FinanceJournal=Diário financeiro
+ExpenseReportsJournal=Diário de relatórios de despesas
+DescFinanceJournal=Diário financeiro incluindo todos os tipos de pagamentos por conta bancária
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
+VATAccountNotDefined=Conta para efeitos de IVA não definido
+ThirdpartyAccountNotDefined=Conta para terceiros não definido
+ProductAccountNotDefined=Conta para o produto não definido
+FeeAccountNotDefined=Conta para o honorário não definida
+BankAccountNotDefined=Conta de banco não definida
 CustomerInvoicePayment=Pagamento de fatura de cliente
 ThirdPartyAccount=Conta de terceiros
-NewAccountingMvt=New transaction
-NumMvts=Numero of transaction
-ListeMvts=List of movements
+NewAccountingMvt=Nova transação
+NumMvts=Número da transação
+ListeMvts=Lista de movimentos
 ErrorDebitCredit=Débito e crédito não pode ter um valor, ao mesmo tempo
-
-ReportThirdParty=List third party account
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
-ListAccounts=Lista de contas contabeis
+AddCompteFromBK=Adicionar contas contabilisticas ao grupo
+ReportThirdParty=Lista de contas de terceiros
+DescThirdPartyReport=Consulte aqui a lista de clientes e fornecedores e as suas contas contabilísticas
+ListAccounts=Lista de contas contabilísticas
 
 Pcgtype=Classe de conta
-Pcgsubtype=sub-classe de conta
+Pcgsubtype=Subclass of account
 
-TotalVente=Total turnover before tax
+TotalVente=Total de volume de negócios sem impostos
 TotalMarge=Margem total de vendas
 
-DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
-DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
-DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
-ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
+DescVentilCustomer=Consulte aqui a lista de linhas de faturas de clientes associados (ou não) a uma conta contabilística de produto
+DescVentilMore=Na maioria dos casos, se você usar produtos ou serviços predefinidos e configurar o número de conta no cartão do produto/serviço, a aplicação será capaz de efetuar toda a vinculação entre a linhas das faturas e a conta contabilística do seu gráfico de contas através de um clique no botão <strong>"%s"</strong>. Se a conta não for configurada no cartão do produto/serviço or se você tiver algumas linhas não vinculadas a uma conta, então terá de efetuar a vinculação manual a partir do menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consulte aqui a lista das linhas de facturas de clientes e as suas contas de contabilísticas de produto
+DescVentilTodoCustomer=Vincular linhas da fatura que não estejam vinculadas a uma conta contabilística de produto
+ChangeAccount=Alterar a conta contabilística de produto/serviço para as linhas selecionadas com a seguinte conta contabilística:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Consulte  as suas linhas da fatura de fornecedor com a conta de contabilidade
-DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
-DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
-DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
-DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
+DescVentilSupplier=Consulte aqui a lista de linhas fornecedor factura associado ou não, a uma conta contabilística de produto
+DescVentilDoneSupplier=Consulte aqui a lista das linhas das faturas e a conta contabilística do fornecedor
+DescVentilTodoExpenseReport=Vincule as linhas do relatórios de despesas de não vinculados a um honorário de uma conta de contabilística
+DescVentilExpenseReport=Consulte aqui a lista de linhas do relatório de despesas vinculadas (ou não) a um honorário da conta contabilística
+DescVentilExpenseReportMore=Se configurar a conta contabilística de acordo com o tipo de linha de relatório de despesa, a aplicação será capaz de efetuar toda a vinculação entre as linhas do seu relatório de despesas e a conta contabilística do seu gráfico de contas através de um único clique no botão <strong>"%s"</strong>. Se a conta não foi configurada no dicionário de honorários ou se você tem algumas linhas não vinculadas, então terá de efetuar a vinculação manuel no menu "<strong>%s</strong>".
+DescVentilDoneExpenseReport=Consulte aqui a lista das linhas de relatórios de despesas e os seus honorários da conta contabilística
 
-ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+ValidateHistory=Vincular automaticamente
+AutomaticBindingDone=Vinculação automática efetuada
 
-ErrorAccountancyCodeIsAlreadyUse=Erro, Não pode apagar uma conta em uso
-MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
-ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
-ChangeBinding=Change the binding
+ErrorAccountancyCodeIsAlreadyUse=Erro, não pode apagar esta conta contabilística porque está a ser utilizada
+MvtNotCorrectlyBalanced=O movimento não foi balanceado corretamente. Crédito = %s. Débito = %s
+FicheVentilation=Cartão de vinculação
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
+ListOfProductsWithoutAccountingAccount=Lista de produtos não vinculados a qualquer conta contabilística
+ChangeBinding=Alterar vinculação
 
 ## Admin
-ApplyMassCategories=Apply mass categories
-AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
-CategoryDeleted=Category for the accounting account has been removed
+ApplyMassCategories=Aplicar categorias em massa
+AddAccountFromBookKeepingWithNoCategories=Adicionar conta já foi utilizado com nenhuma categoria
+CategoryDeleted=Categoria para a conta contabilística foi removida
+AccountingJournals=Diários contabilisticos
+AccountingJournal=Diário contabilistico
+NewAccountingJournal=Novo diário contabilistico
+ShowAccoutingJournal=Mostrar diário contabilistico
+Code=Código
+Nature=Natureza
+AccountingJournalType1=Várias operações
+AccountingJournalType2=Vendas
+AccountingJournalType3=Compras
+AccountingJournalType4=Banco
+AccountingJournalType9=Contém novo
+ErrorAccountingJournalIsAlreadyUse=Este diário já está a ser utilizado
 
 ## Export
 Exports=Exportados
 Export=Exportar
 Modelcsv=Modelo de exportação
-OptionsDeactivatedForThisExportModel=Para este modelo de esportação, as opções estão desativadas
+OptionsDeactivatedForThisExportModel=Para este modelo de exportação, as opções estão desativadas
 Selectmodelcsv=Selecione um modelo de exportação
-Modelcsv_normal=Exportação classica
-Modelcsv_CEGID=Export towards CEGID Expert Comptabilité
-Modelcsv_COALA=Export towards Sage Coala
-Modelcsv_bob50=Export towards Sage BOB 50
-Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
-Modelcsv_quadratus=Export towards Quadratus QuadraCompta
-Modelcsv_ebp=Export towards EBP
-Modelcsv_cogilog=Export towards Cogilog
-ChartofaccountsId=Chart of accounts Id
+Modelcsv_normal=Exportação clássica
+Modelcsv_CEGID=Exportar relativamente a CEGID Expert Comptabilité
+Modelcsv_COALA=Exportar relativamente a Sage Coala
+Modelcsv_bob50=Exportação relativamente a Sage BOB 50
+Modelcsv_ciel=Exportar relativamente a Sage Ciel Compta ou Compta Evolution
+Modelcsv_quadratus=Exportar relativamente a Quadratus QuadraCompta
+Modelcsv_ebp=Exportar relativamente a EBP
+Modelcsv_cogilog=Exportar relativamente a Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
+ChartofaccountsId=ID de plano de contas
 
 ## Tools - Init accounting account on product / service
-InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases.
-DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-Options=Options
-OptionModeProductSell=Mode sales
-OptionModeProductBuy=Mode purchases
-OptionModeProductSellDesc=Show all products with accounting account for sales.
-OptionModeProductBuyDesc=Show all products with accounting account for purchases.
-CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
-CleanHistory=Reset all bindings for selected year
+InitAccountancy=Iniciar contabilidade
+InitAccountancyDesc=Esta página pode ser usado para inicializar uma conta contabilística sobre os produtos e serviços que não têm conta de contabilidade definida para vendas e compras.
+DefaultBindingDesc=Esta página pode ser usada para definir uma conta padrão a ser usada para vincular registo de transações sobre salários, doações, impostos e IVA quando nenhuma conta contabilística específica estiver definida.
+Options=Opções
+OptionModeProductSell=Modo de vendas
+OptionModeProductBuy=Modo de compras
+OptionModeProductSellDesc=Mostrar todos os produtos com conta contabilística para as vendas.
+OptionModeProductBuyDesc=Mostrar todos os produtos com conta contabilística para as compras.
+CleanFixHistory=Remover o código de contabilidade de linhas que não existe em gráficos de conta
+CleanHistory=Repor todas as vinculações para o ano selecionado
 
-WithoutValidAccount=Without valid dedicated account
-WithValidAccount=With valid dedicated account
-ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
+WithoutValidAccount=Sem conta dedicada válido
+WithValidAccount=Com conta dedicada válida
+ValueNotIntoChartOfAccount=Este valor de conta de contabilística não existe no plano de contas
 
 ## Dictionary
-Range=Range of accounting account
-Calculated=Calculated
-Formula=Formula
+Range=Gama da conta contabilística
+Calculated=Calculado
+Formula=Fórmula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
-ExportNotSupported=The export format setuped is not supported into this page
-BookeppingLineAlreayExists=Lines already existing into bookeeping
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=Não existe grupo de conta contabilística disponível para o país %s (Consulte Inicio -> Configuração -> Dicionários)
+ExportNotSupported=O formato de exportação configurado não é suportado nesta página
+BookeppingLineAlreayExists=Linhas já existente em contabilidade
+NoJournalDefined=No journal defined
+Binded=Linhas vinculadas
+ToBind=Linhas a vincular
 
-Binded=Lines bound
-ToBind=Lines to bind
-
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index e135a2a8169..3b44d6044de 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - admin
 Foundation=Fundação
 Version=Versão
-VersionProgram=Versão do Programa
-VersionLastInstall=Versão Inicial instalada
-VersionLastUpgrade=Versão da Última Atualização
+VersionProgram=Versão do programa
+VersionLastInstall=Versão inicial instalada
+VersionLastUpgrade=Última atualização da versão
 VersionExperimental=Experimental
 VersionDevelopment=Desenvolvimento
-VersionUnknown=Desconhecido
+VersionUnknown=Desconhecida
 VersionRecommanded=Recomendada
-FileCheck=Files integrity checker
+FileCheck=Verificador da integridade dos ficheiros
 FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. Value of some setup constants may also be checked. You can use this tool to detect if some files were modified by a hacker for example.
 FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
 FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
@@ -17,220 +17,223 @@ GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
-FilesMissing=Ficheiros em Falta
-FilesUpdated=Ficheiros Atualizados
+FilesMissing=Ficheiros em falta
+FilesUpdated=Ficheiros atualizados
 FilesModified=Modified Files
 FilesAdded=Added Files
-FileCheckDolibarr=Check integrity of application files
+FileCheckDolibarr=Verficar a integridade dos ficheiros de aplicação
 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
+XmlNotFound=Ficheiro XML de integridade da aplicação não encontrado
 SessionId=Id. da Sessão
-SessionSaveHandler=Gestor para guardar as sessões
-SessionSavePath=Localização para guardar a sessão
-PurgeSessions=Limpeza de sessões
-ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
-NoSessionListWithThisHandler=O gestor de guardar a sessão configurado no seu PHP não permite listar todas as sessões em execução.
+SessionSaveHandler=Utilizador para guardar as sessões
+SessionSavePath=Localização de armazenamento da sessão
+PurgeSessions=Limpeza das sessões
+ConfirmPurgeSessions=Deseja mesmo limpar todas as sessões? Isto irá desassociar todos os utilizadores (exceto você).
+NoSessionListWithThisHandler=O utilizador para guardar a sessão configurado no seu PHP não permite listar todas as sessões em execução.
 LockNewSessions=Bloquear novas ligações
-ConfirmLockNewSessions=Tem certeza que quer restringir qualquer ligação nova EPR para si mesmo? Depois disso, só o utilizador <b>%s</b> poderá conetar.
+ConfirmLockNewSessions=Tem a certeza que pretende restringir qualquer nova ligação Dolibarr para si? Depois disso, só o utilizador <b>%s</b> poderá ligar.
 UnlockNewSessions=Remover bloqueio de ligação
 YourSession=A sua sessão
-Sessions=Sessão do utilizador
-WebUserGroup=Utilizador / grupo do servidor da Web
+Sessions=Sessão de utilizadores
+WebUserGroup=Utilizador/grupo do servidor da Web
 NoSessionFound=O seu PHP parece não permitir a listagem das sessões ativas. A diretoria utilizada para guardar as sessões <b>(%s)</b> poderá estar protegida (por exemplo, pelas permissões do SO ou pela diretiva open_basedir PHP ).
 DBStoringCharset=Conjunto de carateres  da base de dados para guardar os dados
 DBSortingCharset=Conjunto de carateres da base de dados para ordenar os dados
 WarningModuleNotActive=O módulo <b>%s</b> deve estar ativado
-WarningOnlyPermissionOfActivatedModules=Só são mostradas aqui as permissões relacionadas com os módulos ativados. Pode ativar os outros módulos em Início -> Configuração -> Módulos.
-DolibarrSetup=Instalar ou atualizar o ERP
-InternalUser=Utilizador Interno
-ExternalUser=Utilizador Externo
-InternalUsers=Utilizadores Internos
-ExternalUsers=Utilizadores Externos
-GUISetup=Layout
-SetupArea=Área de Configuração
-FormToTestFileUploadForm=Formulário para testar o upload de arquivos (de acordo com instalação)
-IfModuleEnabled=Nota: Só é eficaz se <b>módulo %s</b> é ativado
-RemoveLock=Remova o <b>arquivo %s</b> se existir para permitir a atualização da ferramenta.
-RestoreLock=Substituir um <b>arquivo %s</b> com permissão somente leitura no arquivo para desativar o uso de qualquer atualização da ferramenta.
-SecuritySetup=Configuração de Segurança
-SecurityFilesDesc=Define here options related to security about uploading files.
-ErrorModuleRequirePHPVersion=Erro, este módulo requer uma versão %s ou superior de PHP
+WarningOnlyPermissionOfActivatedModules=Só são mostradas aqui as permissões relacionadas com os módulos ativados. Pode ativar outros módulos em Início->Configuração->Módulos.
+DolibarrSetup=Instalar ou atualizar o Dolibarr
+InternalUser=Utilizador interno
+ExternalUser=Utilizador externo
+InternalUsers=Utilizadores internos
+ExternalUsers=Utilizadores externos
+GUISetup=Exibir
+SetupArea=Área de configuração
+UploadNewTemplate=Upload new template(s)
+FormToTestFileUploadForm=Formulário para testar o envio de ficheiro (de acordo com a configuração)
+IfModuleEnabled=Nota: sim, só é eficaz se <b>módulo %s</b> estiver ativado
+RemoveLock=Se este existir, remova o ficheiro <b>%s</b> para permitir a utilização da ferramenta de atualização.
+RestoreLock=Restaure o ficheiro <b>%s</b>, apenas com permissão de só de leitura, para desativar qualquer utilização da ferramenta de atualização.
+SecuritySetup=Configuração de segurança
+SecurityFilesDesc=Defina aqui opções relacionadas com a segurança de ficheiros carregados.
+ErrorModuleRequirePHPVersion=Erro, este módulo requer a versão %s ou superior do PHP
 ErrorModuleRequireDolibarrVersion=Erro, este módulo requer a versão %s ou superior do Dolibarr
-ErrorDecimalLargerThanAreForbidden=Erro, as casas decimais superiores a <b>%s</b> não são suportadas.
-DictionarySetup=Configurar Dicionário
+ErrorDecimalLargerThanAreForbidden=Erro, não é suportada uma casa decimal superior a <b>%s</b>.
+DictionarySetup=Configurar dicionário
 Dictionary=Dicionários
-ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
+ErrorReservedTypeSystemSystemAuto=O valor 'system' e 'systemauto', para o tipo está reservado. Pode utilizar 'user' como valor para adicionar o seu próprio registo
 ErrorCodeCantContainZero=O código não pode conter o valor 0
-DisableJavascript=Desactivar as funções Javascript e Ajax ( Recomendado para pessoas cegas )
-UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties, but it is less convenient)
-DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact, but it is less convenient)
-NumberOfKeyToSearch=Nr palavras chave para adicionar á pesquisa: %s
-NotAvailableWhenAjaxDisabled=Não está disponível quando o Ajax esta desativado
+DisableJavascript=Desativar as funções de Javascript e Ajax (Recomendado para pessoas invisuais ou navegadores de texto)
+UseSearchToSelectCompanyTooltip=Se tiver um grande número de terceiros (> 100 000), pode aumentar a velocidade, configurando a constante COMPANY_DONOTSEARCH_ANYWHERE para 1 em Configuração->Outros. A procura depois será limitada para o início da sequência de carateres.
+UseSearchToSelectContactTooltip=Se você tiver grande número de contactos (> 100 000), você pode aumentar a velocidade, definindo a constante CONTACT_DONOTSEARCH_ANYWHERE para 1 em Configuração -> Outros. A pesquisa será então limitada ao início da sequência de caracteres.
+DelaiedFullListToSelectCompany=Esperar até que introduza valores no campo antes de carregar a lista de terceiros (isto pode aumentar a performance se você tiver um elevado número de terceiros, mas é menos conveniente)
+DelaiedFullListToSelectContact=Esperar até que introduza valores no campo antes de carregar a lista de contactos (isto pode aumentar a performance se você tiver um elevado número de contactos, mas é menos conveniente)
+NumberOfKeyToSearch=Número de carateres para acionar a procura: %s
+NotAvailableWhenAjaxDisabled=Não está disponível quando o Ajax está desativado
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
-JavascriptDisabled=Javascript Desativado
-UsePreviewTabs=Ver Fichas "Vista Prévia"
-ShowPreview=Ver Vista Prévia
-PreviewNotAvailable=Visualização não disponível
-ThemeCurrentlyActive=Tema Actualmente Activo
-CurrentTimeZone=Zona Horaria Actual
-MySQLTimeZone=Zona Horária MySql (database)
-TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
+JavascriptDisabled=JavaScript desativado
+UsePreviewTabs=Utilizar separadores de pré-visualização
+ShowPreview=Mostrar pré-visualização
+PreviewNotAvailable=Pré-visualização não disponível
+ThemeCurrentlyActive=Tema atualmente ativo
+CurrentTimeZone=Zona Horária PHP (servidor)
+MySQLTimeZone=Fuso Horário MySQL (base de dados)
+TZHasNoEffect=As datas são armazenadas e retornadas pela base de dados como se elas fossem submetidas como sequência de caracteres. O fuso horário tem efeito somente ao usar a função UNIX_TIMESTAMP (que não deve ser usada pelo Dolibarr, portanto a base de dados TZ não deve ter nenhum efeito, mesmo se alterado depois da submissão de dados).
 Space=Área
 Table=Tabela
 Fields=Campos
 Index=Índice
 Mask=Máscara
-NextValue=Próximo Valor
-NextValueForInvoices=Próximo Valor (Facturas)
-NextValueForCreditNotes=Próximo Valor (Notas de Entregas)
-NextValueForDeposit=Valor seguinte (depósito)
+NextValue=Valor seguinte
+NextValueForInvoices=Valor seguinte (faturas)
+NextValueForCreditNotes=Valor seguinte (notas de crédito)
+NextValueForDeposit=Valor seguinte (entrada inicial)
 NextValueForReplacements=Valor seguinte (restituições)
-MustBeLowerThanPHPLimit=Observação: Parametros PHP limita o tamanho a <b>%s</b> %s de máximo, qualquer que seja o valor deste parametro
-NoMaxSizeByPHPLimit=Nenhuma limitação interna no servidor PHP
-MaxSizeForUploadedFiles=Tamanho máximo dos documentos a carregar (0 para proibir o carregamento)
-UseCaptchaCode=Utilização do código gráfico no login
+MustBeLowerThanPHPLimit=Nota: os seus limites do PHP de cada tamanho de envio de ficheiro para <b>%s</b> %s , qualquer que seja o valor deste parâmetro
+NoMaxSizeByPHPLimit=Nota: não está definido nenhum limite na sua configuração do PHP
+MaxSizeForUploadedFiles=Tamanho máximo para os ficheiros enviados (0 para rejeitar qualquer envio)
+UseCaptchaCode=Utilizar código gráfico (CAPTCHA) na página de iniciar a sessão
 AntiVirusCommand= Caminho completo para o comando de antivírus
-AntiVirusCommandExample= Exemplo de AntiVirus: c: \\ Program Files (x86) \\ ClamWin \\ bin \\ clamscan.exe <br> Exemplo de AntiVirus: / usr / bin / clamscan
-AntiVirusParam= Mais informações sobre parâmetros da linha de comando
-AntiVirusParamExample= Exemplo de Antivirus: - database
-ComptaSetup=Configuração do Módulo Contabilidade
-UserSetup=Configuração e Gestão dos Utilizadores
-MultiCurrencySetup=Multi-currency setup
-MenuLimits=Límites e Precisão
-MenuIdParent=Id do menu pai
-DetailMenuIdParent=ID do menu pai (0 para um menu superior)
-DetailPosition=Número de ordem para a posição no menu
+AntiVirusCommandExample= Exemplo para ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Exemplo para ClamAV: /usr/bin/clamscan
+AntiVirusParam= Mais parâmetros na linha de comando
+AntiVirusParamExample= Exemplo para ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+ComptaSetup=Configuração do módulo de "Contabilidade"
+UserSetup=Configuração e gestão dos utilizadores
+MultiCurrencySetup=Configuração da utilização de várias moedas
+MenuLimits=Limites e precisão
+MenuIdParent=Id. do menu origem
+DetailMenuIdParent=Id. do menu origem (vazio para um menu superior)
+DetailPosition=Número de ordenação para definir a posição no menu
 AllMenus=Todos
-NotConfigured=Não Configurado
-Active=Activo
+NotConfigured=Módulo/Aplicação não configurados
+Active=Ativo
 SetupShort=Config.
-OtherOptions=Outras Opções
-OtherSetup=Várias Configurações
+OtherOptions=Outras opções
+OtherSetup=Outras configurações
 CurrentValueSeparatorDecimal=Separador decimal
 CurrentValueSeparatorThousand=Separador dos milhares
 Destination=Destino
-IdModule=Id. do Módulo
-IdPermissions=Id. das Autorizações
-Modules=Módulos
-LanguageBrowserParameter=Variável %s
+IdModule=Id do módulo
+IdPermissions=Id das autorizações
+LanguageBrowserParameter=Parâmetro %s
 LocalisationDolibarrParameters=Parâmetros de localização
 ClientTZ=Fuso Horário do Cliente (utilizador)
-ClientHour=Hora do Cliente (utilizador)
-OSTZ=Fuso Horário do Servidor do SO
-PHPTZ=Zona horaria PHP
-DaylingSavingTime=Horário de verão (do usuário)
-CurrentHour=Hora actual
-CurrentSessionTimeOut=Time out Sessão actual
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
-Box=Aplicativo
-Boxes=Aplicativo
-MaxNbOfLinesForBoxes=Número máximo de linhas para os aplicativos
-PositionByDefault=Posição por defeito
+ClientHour=Hora do cliente (utilizador)
+OSTZ=Fuso Horário do Servidor do Sistema Operativo
+PHPTZ=Fuso Horário do servidor do PHP
+DaylingSavingTime=Horário de verão
+CurrentHour=Hora do PHP (servidor)
+CurrentSessionTimeOut=Sessão atual expirou
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
+Box=Widget
+Boxes=Widgets
+MaxNbOfLinesForBoxes=Número máximo de linhas para os widgets
+PositionByDefault=Ordem predefinida
 Position=Posição
-MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
-MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br />Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
-MenuForUsers=Menu para os Utilizadores
+MenusDesc=Os gestores de menu definem o conteúdo das duas barras de menu (horizontal e vertical)
+MenusEditorDesc=O editor de menu permite-lhe definir as entradas de menu personalizadas. Utilize com cuidado para evitar instabilidade e entradas de menu inválidas.<br />Alguns módulos adicionam entradas de menu (principalmente no menu <b>Todos</b>). Se remover algumas destas entradas por engano, poderá restaurá-las, desativando e reativando o módulo.
+MenuForUsers=Menu para os utilizadores
 LangFile=Ficheiro .lang
 System=Sistema
-SystemInfo=Info Sistema
-SystemToolsArea=Área de utilidades do sistema
-SystemToolsAreaDesc=Esta área oferece diferentes funções de administração. Use o menu para escolher a Funcionalidade e pesquisa.
-Purge=Limpar
-PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
-PurgeDeleteLogFile=Eliminar ficheiro de Log <b>%s</b> definido para o módulo Syslog (sem risco de perda de dados)
-PurgeDeleteTemporaryFiles=Apagar todos os ficheiros tempórarios (sem risco de perderem os dados)
-PurgeDeleteTemporaryFilesShort=Delete temporary files
-PurgeDeleteAllFilesInDocumentsDir=Eliminar todos os ficheiros da pasta <b>%s</b>. Ficheiros temporários e Ficheiros anexados a elementos (Terceiros, facturas, etc.) serão eliminados.
-PurgeRunNow=Purgar Agora
-PurgeNothingToDelete=Nenhuma(s) pasta(s) ou ficheiro(s) para apagar.
-PurgeNDirectoriesDeleted=<b>%s</b> Ficheiros ou pastas eliminados
-PurgeAuditEvents=Purgar os eventos de segurança
-ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
-GenerateBackup=Gerar Cópia
-Backup=Cópia
+SystemInfo=Informação do Sistema
+SystemToolsArea=Área de ferramentas do sistema
+SystemToolsAreaDesc=Esta área oferece funcionalidades de administração. Utilize o menu para escolher a funcionalidade que está à procura.
+Purge=Limpar\n
+PurgeAreaDesc=Esta página permite-lhe eliminar todos os ficheiros gerados ou armazenados pelo Dolibarr (ficheiros temporários ou todos os ficheiros na diretoria <b>%s</b>). Não é necessário utilizar esta funcionalidade. Esta é fornecida como uma alternativa para os utilizadores que têm o Dolibarr alojado num provedor que não oferece permissões para eliminar os ficheiros gerados pelo servidor da Web.
+PurgeDeleteLogFile=Eliminar o ficheiro de registo <b>%s</b> definido para o módulo Syslog (sem risco de perda de dados)
+PurgeDeleteTemporaryFiles=Eliminar todos os ficheiros temporários (sem risco de perder os dados)
+PurgeDeleteTemporaryFilesShort=Eliminar ficheiros temporários
+PurgeDeleteAllFilesInDocumentsDir=Eliminar todos os ficheiros na diretoria <b>%s</b>. Não só os ficheiros temporários mas também as cópias de segurança da base de dados, ficheiros anexados aos elementos (como faturas, terceiros, ...) e enviados para o módulo GED serão eliminados.
+PurgeRunNow=Limpar agora
+PurgeNothingToDelete=Nenhuma diretoria ou ficheiros para eliminar.
+PurgeNDirectoriesDeleted=<b>%s</b> ficheiros ou diretorias eliminadas.
+PurgeAuditEvents=Limpar todos os eventos de segurança
+ConfirmPurgeAuditEvents=tem a certeza que deseja limpar todos os eventos de segurança? Serão eliminados todos os registos de segurança, e não serão serão removidos outros dados.
+GenerateBackup=Gerar cópia de segurança
+Backup=Cópia de segurança
 Restore=Restaurar
-RunCommandSummary=A cópia será feita pelo seguinte comando
-BackupResult=Resultado da Cópia
-BackupFileSuccessfullyCreated=Ficheiro de cópia gerado correctamente
-YouCanDownloadBackupFile=Os arquivos gerados podem agora ser baixados
-NoBackupFileAvailable=Nenhuma cópia disponivel
+RunCommandSummary=A cópia de segurança foi iniciada com o seguinte comando
+BackupResult=Resultado da cópia de segurança
+BackupFileSuccessfullyCreated=Ficheiro de cópia de segurança gerado correctamente
+YouCanDownloadBackupFile=Os ficheiros gerados podem agora ser descarregados
+NoBackupFileAvailable=Sem ficheiros de cópias de segurança disponíveis
 ExportMethod=Método de exportação
 ImportMethod=Método de importação
-ToBuildBackupFileClickHere=Para criar uma cópia, click <a href
-ImportMySqlDesc=Para importar uma cópia, deve usar o mysql com a seguinte linha de comando:
-ImportPostgreSqlDesc=Para importar um arquivo de backup, você deve usar o comando pg_restore de linha de comando:
-ImportMySqlCommand=%s %s < miFicheirobackup.sql
-ImportPostgreSqlCommand=%s %s mybackupfile.sql
+ToBuildBackupFileClickHere=Para criar um ficheiro de cópia de segurança, clique <a href="%s">aqui</a>.
+ImportMySqlDesc=Para importar um ficheiro de cópia de segurança, deve utilizar o comando mysql a partir da linha de comandos:
+ImportPostgreSqlDesc=Para importar um ficheiro de cópia de segurança, deve utilizar o comando pg_restore a partir da linha de comandos:
+ImportMySqlCommand=%s %s < ficheiro_copia_seguranca.sql
+ImportPostgreSqlCommand=%s %s ficheiro_copia_seguranca.sql
 FileNameToGenerate=Nome do ficheiro a gerar
 Compression=Compressão
 CommandsToDisableForeignKeysForImport=Comando para desactivar a chave exclusiva para a importação
-CommandsToDisableForeignKeysForImportWarning=Obrigatório, se pretender restaurar mais tarde o lixo 'sql'
+CommandsToDisableForeignKeysForImportWarning=Obrigatório, se pretender restaurar mais tarde o ficheiro dump de SQL
 ExportCompatibility=Compatibilidade do ficheiro de exportação gerado
-MySqlExportParameters=Parâmetros da exportação MySql
+MySqlExportParameters=Parâmetros da exportação MySQL
 PostgreSqlExportParameters= Parâmetros de exportação PostgreSQL
 UseTransactionnalMode=Utilizar o modo transaccional
-FullPathToMysqldumpCommand=Rota completa do comando mysqldump
-FullPathToPostgreSQLdumpCommand=Caminho completo para o pg_dump comando
+FullPathToMysqldumpCommand=Caminho completo para o comando mysqldump
+FullPathToPostgreSQLdumpCommand=Caminho completo para o comando pg_dump
 ExportOptions=Opções de exportação
-AddDropDatabase=Adicionar  DROP DATABASE
-AddDropTable=Adicionar ordens DROP TABLE
+AddDropDatabase=Adicionar comando DROP DATABASE
+AddDropTable=Adicionar comando DROP TABLE
 ExportStructure=Estrutura
 NameColumn=Nome das colunas
 ExtendedInsert=Instruções INSERT extendidas
 NoLockBeforeInsert=Nenhum comando de bloqueio em torno de Inserção
 DelayedInsert=Adições com atraso
-EncodeBinariesInHexa=Codificar os campos binarios em hexadecimal
-IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
-AutoDetectLang=Autodetecção (navegador)
-FeatureDisabledInDemo=Opção desabilitada em demo
+EncodeBinariesInHexa=Codificar os campos binários em hexadecimal
+IgnoreDuplicateRecords=Ignorar erros de registos duplicados (INSERT IGNORE)
+AutoDetectLang=Autodeteção (navegador)
+FeatureDisabledInDemo=Opção desativada em demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Permissões
-BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
-OnlyActiveElementsAreShown=Só os elementos de <a href
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
-ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
+BoxesDesc=Widgets são componentes que mostram alguma informação, os quais pode adicionar a algumas páginas. Pode escolher entre mostrar a widget ou não selecionando a página alvo e clicar em 'Ativar', ou clicando no caixote do lixo para a desativar.
+OnlyActiveElementsAreShown=Só são mostrados os elementos de <a href="%s">módulos ativos</a>.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
+ModulesMarketPlaceDesc=Pode encontrar mais módulos para descarregar noutros sites da internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external modules...
+ModulesMarketPlaces=Procurar módulos externos...
 GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
-DoliStoreDesc=DoliStore, o mercado oficial para Dolibarr ERP / CRM módulos externos
-DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
+DoliStoreDesc=DoliStore, o mercado oficial para módulos externos Dolibarr ERP/CRM
+DoliPartnersDesc=Lista de empresas que desenvolvem módulos ou funcionalidades personalizadas (Nota: qualquer pessoa com experiência em programação PHP pode proporcionar o desenvolvimento personalizado para um projeto open source)
 WebSiteDesc=Indique sites de referência para encontrar mais módulos...
-URL=Link
-BoxesAvailable=Aplicativos disponiveis
-BoxesActivated=Aplicativos activados
-ActivateOn=Activar sobre
-ActiveOn=Activa sobre
+URL=Hiperligação
+BoxesAvailable=Aplicativos disponíveis
+BoxesActivated=Aplicativos ativados
+ActivateOn=Ativar sobre
+ActiveOn=Ativado sobre
 SourceFile=Ficheiro origem
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponivel somente se o Javascript e Ajax estiverem activos
+AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponível somente se o JavaScript e Ajax estiverem ativos
 Required=Requerido
-UsedOnlyWithTypeOption=Used by some agenda option only
+UsedOnlyWithTypeOption=Utilizado apenas por algumas opções da agenda
 Security=Segurança
 Passwords=Palavras-passe
-DoNotStoreClearPassword=Não guardar as palavras-passe na base de dados, mas guardar apenas os valores encriptados (recomendado Ativada)
-MainDbPasswordFileConfEncrypted=Palavra-passe da base de dados encriptada no ficheiro conf.php (recomendado Ativada)
-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=Protecção e encriptação dos pdf gerados
-ProtectAndEncryptPdfFilesDesc=A protecção de um documento pdf deixa o documento livre para leitura e impressão a qualquer leitor de PDF. Ao contrário, a modificação e a cópia são impossíveis.
-Feature=Característica
+DoNotStoreClearPassword=Não guardar as palavras-passe na base de dados, mas guardar apenas os valores encriptados (recomendado: Ativada)
+MainDbPasswordFileConfEncrypted=Palavra-passe da base de dados encriptada no ficheiro conf.php (recomendado: Ativada)
+InstrucToEncodePass=Para que a palavra passe seja codificada no ficheiro <b>conf.php</b>, substitua a linha <br><b>$dolibarr_main_db_pass="...";</b><br>por<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=Para que a palavra passe seja descodificada no ficheiro <b>conf.php</b>, substitua a linha <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>por<br><b>$dolibarr_main_db_pass="%s";</b>
+ProtectAndEncryptPdfFiles=Protecção e encriptação dos ficheiros PDF criados (recomendado: Desativado, pode provocar problemas na produção de PDFs)
+ProtectAndEncryptPdfFilesDesc=A proteção de um documento PDF faz com que este esteja disponível para ler e imprimir a partir de qualquer navegador. No entanto, a edição e cópia do documento deixam de ser possíveis. Nota: ao usar esta funcionalidade deixa de ser possível juntar documentos PDFs singulares num único documento PDF global.
+Feature=Funcionalidade
 DolibarrLicense=Licença
-Developpers=Programadores/contribuintes
-OfficialWebSite=Sitio web oficial internacional
-OfficialWebSiteLocal=Local web site (%s)
-OfficialWiki=Wiki ERP
-OfficialDemo=Demo em linha ERP/CRM
-OfficialMarketPlace=Mercado Oficial externo para os módulos / addons
-OfficialWebHostingService=web hosting de serviços referenciados (hospedagem na nuvem)
-ReferencedPreferredPartners=Parceiros Preferidos
+Developpers=Programadores/colaboradores
+OfficialWebSite=Página Dolibarr internacional oficial
+OfficialWebSiteLocal=Website local (%s)
+OfficialWiki=Documentação Dolibarr na Wiki
+OfficialDemo=Demo online Dolibarr
+OfficialMarketPlace=Mercado externo oficial para os módulos/addons
+OfficialWebHostingService=Serviços web hosting referenciados (hospedagem na nuvem)
+ReferencedPreferredPartners=Parceiros preferidos
 OtherResources=Outros recursos
-ForDocumentationSeeWiki=Para a documentação de utilizador, programador ou Perguntas Frequentes (FAQ), consulte o wiki do ERP: <br><b><a href
-ForAnswersSeeForum=Para outras questões, como efectuar as consultas, pode utilizar o forum do ERP: <br><b><a href
-HelpCenterDesc1=Esta área permite ajuda-lo a obter um serviço de suporte do ERP/CRM.
+ExternalResources=External resources
+SocialNetworks=Social Networks
+ForDocumentationSeeWiki=Para a documentação de utilizador, programador ou Perguntas Frequentes (FAQ), consulte o wiki do Dolibarr<br><b><a href="%s" target="_blank">%s</a></b>
+ForAnswersSeeForum=Para outras questões, como efectuar as consultas, pode utilizar o forum do Dolibarr:<br><b><a href="%s" target="_blank">%s</a></b>
+HelpCenterDesc1=Esta área permite ajudá-lo a obter um serviço de suporte para o Dolibarr.
 HelpCenterDesc2=Alguns destes serviços só estão disponíveis em <b>inglês</b>.
-CurrentMenuHandler=Manipulador de menu atual
-MeasuringUnit=Unidade de medida
+CurrentMenuHandler=Gestor de menu atual
+MeasuringUnit=Unidade de medição
 LeftMargin=Left margin
 TopMargin=Top margin
 PaperSize=Paper type
@@ -241,633 +244,656 @@ FontSize=Font size
 Content=Content
 NoticePeriod=Período de aviso
 NewByMonth=New by month
-Emails=E-Mails
-EMailsSetup=Configuração E-Mails
-EMailsDesc=Esta página permite substituir os parâmetros PHP relacionados con o envío de correios electrónicos. Na maioria dos casos não com SO como UNIX/Linux, os parâmetros PHP estão correctos e esta página é inútil.
-MAIN_MAIL_SMTP_PORT=Porta do servidor SMTP (Por defeito não php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_SERVER=Nome host ou ip do servidor SMTP (Por defeito em php.ini: <b>%s</b>)
+Emails=Emails
+EMailsSetup=Configuração de emails
+EMailsDesc=Esta página permite substituir os parâmetros PHP relacionados com o envio de emails. Na maioria dos casos em sistemas operativos Unix/Linux, os parâmetros PHP estão correctos e esta página é inútil.
+MAIN_MAIL_SMTP_PORT=Porta de SMTP/SMTPS (Por predefinição no php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_SERVER=Servidor SMTP/SMTPS (Por predefinição no php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Porta do servidor SMTP (Não definido em PHP em sistemas de tipo Unix)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Nome servidor ou ip do servidor SMTP (Não definido em PHP em sistemas de tipo Unix)
-MAIN_MAIL_EMAIL_FROM=E-Mail do emissor para envios E-Mail automáticos (Por defeito em php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Remetente de e-mail usado para e-mails enviados retorna erro
-MAIN_MAIL_AUTOCOPY_TO= Enviar sistematicamente uma cópia carbono de todos os e-mails enviados para
-MAIN_DISABLE_ALL_MAILS=Desativar globalmente todo o envio de correios eletrónicos (para fins de teste ou demonstrações)
-MAIN_MAIL_SENDMODE=Método de envío de e-mails
-MAIN_MAIL_SMTPS_ID=ID SMTP para autenticação SMTP
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Servidor SMTP/SMTPS (Não definido em PHP em sistemas de tipo Unix)
+MAIN_MAIL_EMAIL_FROM=Email do emissor para envios email automáticos (Por defeito em php.ini: <b>%s</b>)
+MAIN_MAIL_ERRORS_TO=Remetente de email usado para emails enviados que retornaram erro
+MAIN_MAIL_AUTOCOPY_TO= Enviar sistematicamente uma cópia carbono de todos os emails enviados para
+MAIN_DISABLE_ALL_MAILS=Desativar globalmente todo o envio de emails (para fins de teste ou demonstrações)
+MAIN_MAIL_SENDMODE=Método de envio de emails
+MAIN_MAIL_SMTPS_ID=ID SMTP, se necessário a autenticação
 MAIN_MAIL_SMTPS_PW=Palavra-passe de SMTP, se necessário a autenticação
-MAIN_MAIL_EMAIL_TLS= Utilizar TLS (SSL) criptografia
-MAIN_MAIL_EMAIL_STARTTLS= Use TLS (STARTTLS) encrypt
+MAIN_MAIL_EMAIL_TLS= Utilizar criptografia TLS (SSL)
+MAIN_MAIL_EMAIL_STARTTLS= Utilizar encriptação TLS (STARTTLS)
 MAIN_DISABLE_ALL_SMS=Desative todos os envios de SMS (para fins de teste ou demonstrações)
-MAIN_SMS_SENDMODE=Método a ser usado para enviar SMS
-MAIN_MAIL_SMS_FROM=Número de telefone padrão do remetente para envio de SMS
-MAIN_MAIL_DEFAULT_FROMTYPE=Sender e-mail by default for manual sendings (User email or Company email)
+MAIN_SMS_SENDMODE=Método a usar para enviar SMS
+MAIN_MAIL_SMS_FROM=Número de telefone predefinido do remetente para envio de SMS
+MAIN_MAIL_DEFAULT_FROMTYPE=E-mail do remetente por predefinição para os envios manuais (E-mail do Utilizador ou da Empresa)
 UserEmail=User email
-CompanyEmail=Company email
+CompanyEmail=E-mail da empresa
 FeatureNotAvailableOnLinux=Funcionalidade não disponivel em sistemas  Unix. Teste parâmetros sendmail localmente.
-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=Se a tradução para esta lingua não estiver completa ou se encontrar erros, pode corrigi-los editando os ficheiros no diretório <b>langs/%s</b> e submetendo-os em 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=Configuração do módulo
-ModulesSetup=Configuração dos módulos
+ModulesSetup=Módulos/Aplicação - Configuração
 ModuleFamilyBase=Sistema
-ModuleFamilyCrm=Gestão cliente (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilyCrm=Gestão do Relacionamento com o Cliente (CRM)
+ModuleFamilySrm=Gestão de Relacionamento com o Fornecedor (SRM)
 ModuleFamilyProducts=Gestão de Productos (PM)
 ModuleFamilyHr=Gestão de Recursos Humanos (HR)
-ModuleFamilyProjects=Projectos/Trabalho cooperativo
+ModuleFamilyProjects=Projetos/Trabalho cooperativo
 ModuleFamilyOther=Outro
-ModuleFamilyTechnic=Módulos ferramentas do sistema
+ModuleFamilyTechnic=Ferramentas multi-módulos
 ModuleFamilyExperimental=Módulos testes
 ModuleFamilyFinancial=Módulos financeiros (Contabilidade/Tesouraria)
-ModuleFamilyECM=ECM
-ModuleFamilyPortal=Web sites and other frontal application
-ModuleFamilyInterface=Interfaces with external systems
+ModuleFamilyECM=Gestão de conteúdo electrónico (ECM)
+ModuleFamilyPortal=Websites e outras aplicações de interface de utilizador
+ModuleFamilyInterface=Interfaces com sistemas externos
 MenuHandlers=Gestores de menu
 MenuAdmin=Editor de menu
 DoNotUseInProduction=Não utilizar em ambiente de produção
-ThisIsProcessToFollow=This is steps to process:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
+ThisIsProcessToFollow=Estes são os passos a processar:
+ThisIsAlternativeProcessToFollow=Esta é uma configuração alternativa para processar manualmente:
 StepNb=Passo %s
-FindPackageFromWebSite=Encontre um pacote que fornece a funcionalidade desejada (por exemplo, %s site oficial).
-DownloadPackageFromWebSite=Transfira o pacote (por exemplo, do site da Web oficial %s).
-UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+FindPackageFromWebSite=Encontre um pacote que fornece a funcionalidade desejada (por exemplo, na página oficial %s).
+DownloadPackageFromWebSite=Descarregue o pacote (por exemplo, da página oficial %s).
+UnpackPackageInDolibarrRoot=Descompactar os ficheiros para a raiz da instalação Dolibarr: <b>%s</b>
 UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <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>.
-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='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
-YouCanSubmitFile=For this step, you can send package using this tool: Select module file
-CurrentVersion=Versão actual do ERP/CRM
-CallUpdatePage=Go to the page that updates the database structure and data: %s.
+SetupIsReadyForUse=A instalação do módulo terminou. No entanto você deve ativar e configurar o módulo na sua aplicação, indo à página de configuração de módulos: <a href="%s">%s</a>.
+NotExistsDirect=O diretório raiz alternativo não está definido para um diretório existente.<br>
+InfDirAlt=Desde a versão 3 do Dolibarr que é possível definir um diretório raiz alternativo. Isto permite que você consiga armazenar plug-ins e templates, num diretório dedicado.<br>Para tal basta criar um dirétorio na raiz do Dolibarr (ex: dedicado). <br>
+InfDirExample=<br>Depois declare-o no ficheiro <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>Se estas linhas estiverem comentadas com um "#", descomente-as removendo o "#".
+YouCanSubmitFile=Para este passo, pode enviar o pacote utilizando esta ferramenta: Selecione o ficheiro do módulo
+CurrentVersion=Versão atual do Dolibarr
+CallUpdatePage=Vá à página que atualiza a estrutura e dados da base de dados: %s.
 LastStableVersion=Última versão estável
 LastActivationDate=Latest activation date
-UpdateServerOffline=Update server offline
-GenericMaskCodes=Pode introduzir qualquer máscara numérica. Nesta máscara, pode utilizar as seguintes etiquetas:<br><b>{000000} </b> corresponde a um número que se incrementa em cada um de %s. Introduza tantos zeros como longitude que deseja mostrar. O contador completar-se-á a partir de zeros pela esquerda com o fim de ter tantos zeros como a máscara. <br> <b> {000000+000}</ b> Igual que o anterior, com uma compensação correspondente ao número da direita do sinal + aplica-se a partir do primeiro %s. <br> <b> {000000@x}</b> igual que o anterior, mas o contador restablece-se a zero quando se chega a x meses (x entre 1 e 12). Se esta opção se utiliza e x é de 2 ou superior, então a sequência {yy}{mm} ou {yyyy}{mm} também é necessário. <br> <b> {dd} </b> días (01 a 31). <br><b> {mm}</b> mês (01 a 12). <br><b>{yy}</b>, <b>{yyyy}</b> ou <b>{e}</b> ano em 2, 4 ou 1 figura.<br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
-GenericMaskCodes3=Qualquer outro caractere na máscara  fica sem alterações. <br>Não são permitidos espaços <br>
-GenericMaskCodes4a=<u>Exemplo em 99 ª %s o Terceiro a Empresa realizada em 31/03/2007: </u><br>
-GenericMaskCodes4b=<u>Exemplo sobre um Terceiro criado em 31/03/2007:</u><br>
-GenericMaskCodes4c=<u>Exemplo no produto criado em 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> dará <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> dará <b>0199-ZZZ/31/XXX</b>
-GenericNumRefModelDesc=Devolve um número criado na linha numa máscara definida.
-ServerAvailableOnIPOrPort=Servidor disponivel no endereço <b>%s</b> na porta <b>%s</b>
-ServerNotAvailableOnIPOrPort=Servidor não disponivel no endereço <b>%s</b> na Porta <b>%s</b>
-DoTestServerAvailability=Teste de conectividade com o servidor
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
+UpdateServerOffline=Atualizar servidor offline
+WithCounter=Manage a counter
+GenericMaskCodes=Pode introduzir qualquer máscara numérica. Nesta máscara, pode utilizar as seguintes etiquetas: <br><b>{000000}</b> corresponde a um número que se incrementa em cada um de %s. Introduza um número de zeros idêntico ao comprimento do número que deseja mostrar. O contador completar-se-á a partir de zeros pela esquerda de forma a ter tantos zeros como a máscara. <br><b>{000000+000}</b> igual ao anterior, com uma compensação em algarismos correspondente ao número à direita do sinal + que é aplicada a partir do primeiro %s. <br><b>{000000@x}</b> igual ao anterior, mas o contador volta a zero quando se chega ao mês x (x entre 1 e 12, 0 para usar o primeiros meses do mês fiscal definido na sua configuração, 99 para voltar a zero todos os meses). Se esta opção se utiliza e x é igual ou superior a 2, então a sequência {yy}{mm} ou {yyyy}{mm} também é necessária. <br><b>{dd}</b> días (01 a 31). <br><b>{mm}</b> mês (01 a 12). <br><b>{yy}</b>, <b>{yyyy}</b> ou <b>{y}</b> ano formatado em 2, 4 ou 1 algarismos.<br>
+GenericMaskCodes2=<b>{cccc}</b> o código do cliente em N caracteres<br><b>{cccc000}</b> o código de cliente em N caracteres, seguido de um contador dedicado ao cliente. Este contador é reiniciado ao mesmo tempo que o contador global.<br><b>{tttt}</b> O código do tipo de terceiro em N caracteres (ver dicionário->Tipos de terceiros).<br>
+GenericMaskCodes3=Quaisquer outros caracteres na máscara não sofrerão alterações.<br>Não são permitidos espaços.<br>
+GenericMaskCodes4a=<u>Exemplo no 99º %s de terceiro 'A Empresa', com a data 31-01-2007:</u><br>
+GenericMaskCodes4b=<u>Exemplo sobre um terceiro criado a 31-03-2007:</u><br>
+GenericMaskCodes4c=<u>Exemplo no produto criado a 01-03-2007:</u><br>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> dará <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> dará <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> dará <b>IN0701-0099-A</b>
+GenericNumRefModelDesc=Devolve um número personalizado, de acordo com a máscara definida.
+ServerAvailableOnIPOrPort=O servidor está disponível no endereço <b>%s</b> na porta <b>%s</b>
+ServerNotAvailableOnIPOrPort=O servidor não está disponível no endereço <b>%s</b> na porta <b>%s</b>
+DoTestServerAvailability=Teste de conetividade com o servidor
 DoTestSend=Teste de envío
-DoTestSendHTML=Testede  envio HTML
-ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
-ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Erro, não se pode usar a opção @ se a sequência {yy}{mm} ou {yyyy}{mm} não se encontra a máscara.
-UMask=Parâmetro UMask de novos ficheiros em Unix/Linux/BSD.
-UMaskExplanation=Este parâmetro determina os direitos dos ficheiros criados no servidor do ERP/CRM (durante o carregamento, por Exemplo).<br>Este deve ter o valor octal (por Exemplo, 0666 significa leitura / escrita para todos).<br>Este parâmetro não tem nenhum efeito sobre um servidor Windows.
-SeeWikiForAllTeam=Veja o wiki para mais detalhes de todos os actores e da sua organização
-UseACacheDelay= Tempo para o caching exportação em segundos (0 ou em branco para não cache)
-DisableLinkToHelpCenter=Ocultar link <b>"Precisa de ajuda ou apoio"</b> na página de login
+DoTestSendHTML=Teste de envio HTML
+ErrorCantUseRazIfNoYearInMask=Erro, não pode usar a opção @ para repor o contador a cada ano, se sequência {yy} ou {aaaa} não está na máscara.
+ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Erro, não pode usar a opção @ se a sequência {yy}{mm} ou {yyyy}{mm} não se encontra na máscara definida.
+UMask=Parâmetro UMask de novos ficheiros em sistemas Unix/Linux/BSD/macOS.
+UMaskExplanation=Este parâmetro permite definir permissões usadas por omissão em ficheiros criados pelo Dolibarr no servidor (durante o carregamento, por exemplo).<br>Este deve ter o valor octal (por exemplo, 0666 significa permissão de leitura/escrita para todos).<br>Este parâmetro não tem nenhum efeito sobre um servidor Windows.
+SeeWikiForAllTeam=Veja o wiki para mais detalhes de todos os atores e da sua organização
+UseACacheDelay= Atraso, em segundos, para o caching de exportação (0 ou em branco para não criar cache)
+DisableLinkToHelpCenter=Ocultar hiperligação <b>"Precisa de ajuda ou apoio"</b> na página de inicio de sessão
 DisableLinkToHelp=Ocultar a hiperligação para a ajuda on-line "<b>%s</b>"
-AddCRIfTooLong=Não há envolvimento automático, por isso, se estiver fora de linha da página de documentos, por ser demasiado longo,  deve adicionar um "enter" na area de texto
-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...).
-MinLength=Prazo mínimo
-LanguageFilesCachedIntoShmopSharedMemory=Arquivos. Lang carregado na memória compartilhada
-ExamplesWithCurrentSetup=Exemplos com o funcionamento da actual configuração
-ListOfDirectories=Lista dos modelos OpenDocument directórios
-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=Número de ficheiros de modelos ODT/ODS encontrados nessas diretorias
-ExampleOfDirectoriesForModelGen=Exemplos de sintaxe: <br> c: \\ mydir <br> / Home mydir / <br> DOL_DATA_ROOT ecm / ecmdir /
-FollowingSubstitutionKeysCanBeUsed=<br> Para saber como criar os seus modelos de documentos odt, antes de armazená-los nestas listas, ler a documentação wiki:
+AddCRIfTooLong=Não há envolvimento automático, por isso, se estiver fora de linha da página de documentos, por ser demasiado longo, deve adicionar um parágrafo, "Enter", na área de texto.
+ConfirmPurge=De certeza que quer executar esta limpeza?<br>Isto eliminará definitivamente todos os seus ficheiros de dados sem forma de os recuperar (ficheiros GED, ficheiros anexados)
+MinLength=Comprimento mínimo
+LanguageFilesCachedIntoShmopSharedMemory=Ficheiros .lang carregados na memória partilhada
+ExamplesWithCurrentSetup=Exemplos com a configuração atual
+ListOfDirectories=Lista de diretórios com modelos OpenDocument
+ListOfDirectoriesForModelGenODT=Lista de diretórios que contêm ficheiros template com formato OpenDocument.<br><br>Digite aqui o caminho completo dos diretórios.<br>Adicione um "Enter" entre cada diratório.<br>Para adicionar um diretório do módulo GED, adicione aqui <b>DOL_DATA_ROOT/ecm/seudiretorio</b>.<br><br>Ficheiros nesses diretórios têm de acabar com <b>.odt</b> ou <b>.ods</b>.
+NumberOfModelFilesFound=Número de ficheiros de modelos ODT/ODS encontrados nesses diretórios
+ExampleOfDirectoriesForModelGen=Exemplos de sintaxe: <br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+FollowingSubstitutionKeysCanBeUsed=<br>Para saber como criar os seus modelos de documentos ODT, antes de armazená-los nestes diretórios, leia a documentação no wiki:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
-FirstnameNamePosition=Posição do primeiro  nome /
+FirstnameNamePosition=Posição do primeiro nome/último nome
 DescWeather=As imagens seguintes serão mostradas no painel quando o número de ações tardias alcançar os seguintes valores:
-KeyForWebServicesAccess=A chave para usar Web Services (parâmetro &quot
-TestSubmitForm=Forma de teste de Entrada
-ThisForceAlsoTheme=Usando este gestor de menu também vai usar o seu próprio tema qualquer que seja a escolha do usuário. Além disso, este gestor de menu especializado em smartphones não funciona em todos os smartphones. Use um outro gestor de menu se você tiver problemas na seu.
-ThemeDir=Diretório Skins
+KeyForWebServicesAccess=Chave para usar Web Services (parâmetro "dolibarrkey" nos webservices)
+TestSubmitForm=Formulário de teste de introdução
+ThisForceAlsoTheme=Ao utilizar este gestor de menu também vai utilizar o seu tema, independentemente da escolha do utilizador. Para além disso, este gestor de menu especializado em smartphones não funciona em todos os smartphones. Utilize outro gestor de menu se você tiver problemas.
+ThemeDir=Diretório de temas
 ConnectionTimeout=Tempo limite de conexão
 ResponseTimeout=Tempo limite de resposta
-SmsTestMessage=Mensagem de teste de PHONEFROM__ __ para __ PHONETO__
-ModuleMustBeEnabledFirst=Primeiro, o módulo <b>%s</b> deve estar ativado se precisar desta função.
+SmsTestMessage=Mensagem teste de __PHONEFROM__ para __PHONETO__
+ModuleMustBeEnabledFirst=Se precisa desta função, o módulo <b>%s</b> deve ser ativado antes.
 SecurityToken=A chave para URLs seguras
-NoSmsEngine=Nenhum mecanismo de envio de SMS disponível. Mecanismos de sms, não são instalados com a distribuição padrão (porque depende de um fornecedor externo), mas você pode encontrar alguns em http://www.dolistore.com
+NoSmsEngine=Nenhum mecanismo de envio de SMS disponível. Mecanismos de SMS, não são instalados juntamente com a distribuição (porque depende de um fornecedor externo), mas você pode encontrar alguns em %s
 PDF=PDF
-PDFDesc=Você pode definir cada uma das opções globais relacionadas com a geração do PDF
-PDFAddressForging=Regras para forjar caixas de endereço
+PDFDesc=Você pode definir cada uma das opções globais relacionadas com a criação de PDF
+PDFAddressForging=Regras para criar caixas de endereço
 HideAnyVATInformationOnPDF=Ocultar todas as informações relativas ao IVA em PDF gerado
 HideDescOnPDF=Ocultar a descrição dos produtos no PDF gerado
 HideRefOnPDF=Ocultar a referência dos produtos no PDF gerado
 HideDetailsOnPDF=Esconder linhas de detalhes do produto no PDF gerado
-PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
+PlaceCustomerAddressToIsoLocation=Usar a posição padrão francesa (La Poste) para a posição de endereço do cliente
 Library=Biblioteca
-UrlGenerationParameters=Parâmetros para garantir URLs
-SecurityTokenIsUnique=Use um parâmetro securekey exclusivo para cada URL
-EnterRefToBuildUrl=Digite referência para %s objeto
+UrlGenerationParameters=Parâmetros para tornar URLs seguros
+SecurityTokenIsUnique=Use um parâmetro securekey único para cada URL
+EnterRefToBuildUrl=Digite a referência para o objeto %s
 GetSecuredUrl=Obter URL seguro
-ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Esconder botões de ações não autorizados a utilizadores não administradores, em vez de mostrá-los com cor cinza e desativados.
 OldVATRates=Taxa de IVA antiga
-NewVATRates=Nova Taxa de IVA
-PriceBaseTypeToChange=Modificar nos preços com base no valor de referência definido em
-MassConvert=Launch mass convert
-String=Cadeia
+NewVATRates=Nova taxa de IVA
+PriceBaseTypeToChange=Modificar nos preços com valor de referência base definido em
+MassConvert=Executar a conversão em massa
+String=Sequencia de caracteres
 TextLong=Texto longo
-Int=Número inteiro
-Float=Número vírgula flutuante
+Int=Integer
+Float=Float
 DateAndTime=Data e hora
 Unique=Único
-Boolean=Booleano (Caixa de verificação)
+Boolean=Booliano (uma caixa de marcação)
 ExtrafieldPhone = Telefone
 ExtrafieldPrice = Preço
 ExtrafieldMail = Email
 ExtrafieldUrl = Url
 ExtrafieldSelect = Lista de selecção
 ExtrafieldSelectList = Selecionar da tabela
-ExtrafieldSeparator=Separador
+ExtrafieldSeparator=Separador (não um campo)
 ExtrafieldPassword=Palavra Passe
-ExtrafieldCheckBox=Caixa de verificação
-ExtrafieldRadio=Botão
-ExtrafieldCheckBoxFromList= Checkbox from table
-ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldRadio=Radio buttons (on choice only)
+ExtrafieldCheckBox=Caixas de marcação
+ExtrafieldCheckBoxFromList=Caixas de marcação da tabela
+ExtrafieldLink=Vincular a um objeto
+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'
+ExtrafieldParamHelpselect=A lista de parâmetros tem seguir o seguinte esquema chave,valor<br><br> por exemplo: <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>Para que a lista dependa noutra lista de atributos complementares:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>Para que a lista dependa doutra lista:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
+ExtrafieldParamHelpcheckbox=A lista de parâmetros tem de seguir o seguinte esquema chave,valor<br><br> por exemplo:<br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpradio=A lista de parâmetros tem de seguir o seguinte esquema chave,valor<br><br> por exemplo:<br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpsellist=A lista de parâmetros vem de uma tabela<br>Syntaxe: table_name:label_field:id_field::filter<br>Examplo: c_typent:libelle:id::filter<br><br>o filtro pode ser um simples teste (ex: active=1) para exibir só o valor ativo<br>Também pode utilizar $ID$ no filtro, o qual se refere ao ID do objeto atual<br>Para fazer um SELECT no filtro utilize $SEL$<br>Se quer filtrar campos complementares use a sintaxe extra.fieldcode=... (onde fieldcode representa o código do campo complementar)<br><br>Para fazer com que a lista dependa doutra lista:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
+ExtrafieldParamHelplink=Os parâmetros devem ser ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br> Exemplo: Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Biblioteca utilizada para gerar PDF
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+WarningUsingFPDF=Aviso: O seu ficheiro <b>conf.php</b> contém a diretiva <b>dolibarr_pdf_force_fpdf=1</b>. Isto significa que utiliza a biblioteca FPDF para gerar ficheiros PDF. Esta biblioteca está desatualizada e não suporta muitas funcionalidades (Unicode, transparência de imagens, línguas asiáticas, árabes ou cirílicas, ...), por isso você pode experienciar alguns erros durante a produção de PDFs.<br>Para resolver isto e para ter suporte completo para produção de PDF, por favor descarregue a biblioteca <a href="http://www.tcpdf.org/" target="_blank">TCPDF</a>, comente ou remova a linha <b>$dolibarr_pdf_force_fpdf=1</b>, e adicione <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
+LocalTaxDesc=Alguns países aplicam 2 ou 3 impostos para cada linha da fatura. Se é este o caso, escolha o tipo para o segundo e terceiro imposto e a sua taxa. Os tipos possíveis são:<br>1 : imposto local aplicado em produtos e serviços sem IVA (imposto local é calculado sobre o total sem IVA)<br>2 : imposto local aplicado em produtos e serviços incluindo IVA (imposto local é calculado sobre o total + IVA)<br>3 : imposto local aplicado em produtos sem IVA (imposto local é calculado sobre o total sem IVA)<br>4 : imposto local aplicado em produtos incluindo IVA (imposto local é calculado sobre o total + IVA)<br>5 : imposto local aplicado em serviços sem IVA (imposto local é calculado sobre o total sem IVA)<br>6 : imposto local aplicado em serviços incluindo IVA (imposto local é calculado sobre o total + IVA)
 SMS=SMS
-LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
-RefreshPhoneLink=Atualizar link
-LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
+LinkToTestClickToDial=Introduzida o número de telefone a ligar, de forma mostra um link para testar o ClickToDial para o utilizador <strong>%s</strong>
+RefreshPhoneLink=Atualizar hiperligação
+LinkToTest=Link gerado para o utilizador <strong>%s</strong> (clique no número de telefone para ligar)
 KeepEmptyToUseDefault=Deixar em branco para usar o valor por omissão
 DefaultLink=Hiperligação predefinida
-SetAsDefault=Set as default
-ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=Módulo externo - Instalado na diretoria %s
-BarcodeInitForThirdparties=Mass barcode init for thirdparties
-BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Init value for next %s empty records
-EraseAllCurrentBarCode=Erase all current barcode values
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
-AllBarcodeReset=All barcode values have been removed
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into barcode module setup.
-EnableFileCache=Enable file cache
+SetAsDefault=Definir como predefinição
+ValueOverwrittenByUserSetup=Aviso: Este valor pode ter sido modificado pela configuração específica de um utilizador (cada utilizador pode definir o seu próprio link ClickToDial)
+ExternalModule=Módulo externo - Instalado no diretório %s
+BarcodeInitForThirdparties=Inicialização em massa de códigos de barras para terceiros
+BarcodeInitForProductsOrServices=Inicialização ou reposição de códigos de barras em massa para produtos ou serviços
+CurrentlyNWithoutBarCode=Atualmente, você tem o registo <strong>%s</strong> em <strong>%s</strong> %s sem o código de barras definido.
+InitEmptyBarCode=Inicializar o valor para os próximos %s registos vazios
+EraseAllCurrentBarCode=Apagar todos os códigos de barras atuais
+ConfirmEraseAllCurrentBarCode=Tem certeza de que deseja apagar todos os códigos de barras atuais?
+AllBarcodeReset=Todos os códigos de barras foram removidos
+NoBarcodeNumberingTemplateDefined=Nenhum modelo de numeração de códigos de barras ativo na configuração do módulo "Código de barras".
+EnableFileCache=Ativar cache de ficheiros
 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
-DisplayCompanyInfo=Display company address
+NoDetails=Sem mais detalhes no rodapé
+DisplayCompanyInfo=Exibir morada da empresa
 DisplayCompanyManagers=Display manager names
-DisplayCompanyInfoAndManagers=Display company address and manager names
+DisplayCompanyInfoAndManagers=Exibir a morada da empresa e menus de gestor
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Devolve um código contabilistico composto de 401 seguido do código do Terceiro do fornecedor para o código contabilistico de fornecedor, e 411 seguido do código Terceiro de cliente para o código contabilistico do cliente.
+ModuleCompanyCodeAquarium=Devolve um código contabilístico composto de:<br>%s seguido do código do terceiro (fornecedor) para o código contabilístico de fornecedor,,<br>%s seguido do código do terceiro (cliente) para o código contabilístico do cliente.
 ModuleCompanyCodePanicum=Devolve um código contabilistico vazio.
-ModuleCompanyCodeDigitaria=Devolve um código contabilistico composto por o código do Terceiro. O código está formado por caracter ' C ' na primeira posição seguido dos 5 primeiros caracteres do código do Terceiro.
+ModuleCompanyCodeDigitaria=O código contabilístico depende do código do terceiro. O código é composto pelo caractere "C" na primeira posição seguido dos 5 primeiros caracteres do código do terceiro.
 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: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Campo
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
-Module0Name=Utilizadores e Grupos
-Module0Desc=Users / Employees and Groups management
+Module0Name=Utilizadores e grupos
+Module0Desc=Gestão de Utilizadores / Funcionários e Grupos
 Module1Name=Terceiros
-Module1Desc=Gestão de Terceiros (Empresas, Particulares) e Contactos
+Module1Desc=Gestão de terceiros (empresas, particulares) e contactos
 Module2Name=Comercial
 Module2Desc=Gestão comercial
 Module10Name=Contabilidade
-Module10Desc=Gestão simples da Contabilidade (repartição das receitas e pagamentos)
+Module10Desc=Relatórios simples de contabilidade (repartição das receitas e pagamentos) baseados no conteúdo da base de dados. Sem expedição.
 Module20Name=Orçamentos
-Module20Desc=Gestão de Orçamentos/Propostas comerciais
-Module22Name=E-Mailings
-Module22Desc=Administração e envío de E-Mails massivos
+Module20Desc=Gestão de orçamentos para clientes
+Module22Name=Emails em massa
+Module22Desc=Gestão de emails em massa
 Module23Name=Energia
-Module23Desc=Acompanhamento do consumo de energia
-Module25Name=Pedidos de clientes
-Module25Desc=Gestão de pedidos de clientes
-Module30Name=Facturas e Recibos
-Module30Desc=Gestão de facturas e recibos de clientes. Gestão de facturas de Fornecedores
+Module23Desc=Monitorização do consumo de energia
+Module25Name=Encomendas de clientes
+Module25Desc=Gestão de encomendas de clientes
+Module30Name=Faturas
+Module30Desc=Gestão de faturas e notas de crédito de clientes. Gestão de faturas de fornecedores
 Module40Name=Fornecedores
-Module40Desc=Gestão de Fornecedores
+Module40Desc=Gestão de fornecedores (encomendas e faturas)
 Module42Name=Syslog
-Module42Desc=Utilização de logs (syslog)
+Module42Desc=Funções de registo de eventos (ficheiro, registo do sistema, ...). Tais registos, são para fins técnicos/depuração.
 Module49Name=Editores
-Module49Desc=Gestão de Editores
+Module49Desc=Gestão de editores
 Module50Name=Produtos
 Module50Desc=Gestão de produtos
-Module51Name=Massa envios
-Module51Desc=Massa papel expedições "gestão"
-Module52Name=Stocks de produtos
-Module52Desc=Gestão de stocks de produtos
+Module51Name=Envio de emails em massa
+Module51Desc=Gestão de envio de correio em massa
+Module52Name=Stocks
+Module52Desc=Gestão de stocks (produtos)
 Module53Name=Serviços
 Module53Desc=Gestão de serviços
 Module54Name=Contractos/Subscrições
 Module54Desc=Gestão de contractos (serviços ou subscrições periódicas)
 Module55Name=Códigos de barras
 Module55Desc=Gestão dos códigos de barras
-Module56Name=Central Telefónica
-Module56Desc=Gestão da Central Telefónica
-Module57Name=Direct bank payment orders
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
+Module56Name=Central telefónica
+Module56Desc=Gestão de central telefónica
+Module57Name=Ordens de pagamento por transferência bancária
+Module57Desc=Gestão de order de pagamento por débito direto. Inclui a produção de ficheiros SEPA para países europeus.
 Module58Name=ClickToDial
-Module58Desc=Integração com ClickToDial
+Module58Desc=Integração com um sistema ClickToDial (Asterisk, ...)
 Module59Name=Bookmark4u
-Module59Desc=Adicione função para gerar uma conta Bookmark4u a partir de uma conta do ERP
+Module59Desc=Adicione uma função para gerar uma conta Bookmark4u a partir de uma conta do Dolibarr
 Module70Name=Intervenções
-Module70Desc=Gestão de Intervenções
+Module70Desc=Gestão de intervenções
 Module75Name=Notas de despesas e deslocações
 Module75Desc=Gestão das notas de despesas e deslocações
 Module80Name=Expedições
-Module80Desc="Gestão de Expedições e Recepções\t "
-Module85Name=Bancos e Caixas
-Module85Desc=Gestão das contas financeiras de tipo contas bancarias, prazo ou efectivo
-Module100Name=Site Externo
-Module100Desc=Incluir qualquer site externo em menus ERP/CRM e visualizá-lo em um quadro ERP/CRM
-Module105Name=Mailman e Sip
-Module105Desc=Mailman ou Spip interface para o módulo membro
+Module80Desc=Gestão de expedições e notas de encomenda
+Module85Name=Bancos e caixas
+Module85Desc=Gestão das contas financeiras ou contas bancárias (prazo ou efetivo)
+Module100Name=Página externa
+Module100Desc=Incluir página externa no menu e visualizá-la a partir do Dolibarr
+Module105Name=Mailman e SPIP
+Module105Desc=Interface Mailman ou SPIP para módulo membro
 Module200Name=LDAP
-Module200Desc=Sincronização com LDAP
+Module200Desc=Sincronização de diretórios com LDAP
 Module210Name=PostNuke
 Module210Desc=Integração com PostNuke
 Module240Name=Exportações de dados
-Module240Desc=Tool to export Dolibarr data (with assistants)
+Module240Desc=Ferramenta para exportação dos dados do Dolibarr
 Module250Name=Importação de dados
-Module250Desc=Tool to import data in Dolibarr  (with assistants)
+Module250Desc=Ferramenta para importação dos dados do Dolibarr
 Module310Name=Membros
-Module310Desc=Gestão de Membros de uma associação
-Module320Name=Ligações RSS
-Module320Desc=Criação de ligações de informação RSS nas janelas do ERP
-Module330Name=Favoritos
-Module330Desc=Gestão de Favoritos
-Module400Name=Projetos/Oportunidades/Chefias
-Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
+Module310Desc=Gestão de membros de uma fundação
+Module320Name=Feed RSS
+Module320Desc=Adicionar feed RSS às páginas Dolibarr
+Module330Name=Marcadores
+Module330Desc=Gestão de marcadores
+Module400Name=Projetos/Oportunidades/Leads
+Module400Desc=Gestão de projetos, oportunidades ou leads. Depois você pode atribuir qualquer elemento (fatura, encomenda, proposta, intervenção, ...) a um projeto e obter uma vista transversal do mesmo.
 Module410Name=Webcalendar
-Module410Desc=Interface com calendario Webcalendar
+Module410Desc=Integração com Webcalendar
 Module500Name=Despesas especiais
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module500Desc=Gestão de despesas especiais (impostos, impostos sociais ou ficais, dividendos)
+Module510Name=Pagamento dos ordenados do funcionário
+Module510Desc=Registe o seguinte pagamento dos ordenados do seu funcionário
 Module520Name=Empréstimo
 Module520Desc=Gestão de empréstimos
 Module600Name=Notificações
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
-Module700Name=Bolsas
-Module700Desc=Gestão de Bolsas
+Module600Desc=Enviar notificações por email (acionado por alguns eventos) aos utilizadores (configurável para cada utilizador), contactos de terceiros (configurável para cada terceiro) ou emails fixos
+Module700Name=Donativos
+Module700Desc=Gestão de donativos
 Module770Name=Relatórios de despesas
-Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module770Desc=Gestão e reivindicação de relatórios de despesas (deslocação, refeição, ...)
+Module1120Name=Orçamentos de fornecedores
+Module1120Desc=Pedir orçamentos e preços de fornecedores
 Module1200Name=Mantis
-Module1200Desc=Interface com o sistema de seguimento de incidencias Mantis
-Module1400Name=Perito de Contabilidade
-Module1400Desc=Perido de gestão da Contabilidade (dupla posição)
-Module1520Name=Criação de Documentio
-Module1520Desc=Mass mail document generation
+Module1200Desc=Integração com Mantis
+Module1400Name=Contabilidade
+Module1400Desc=Gestão de contabilidade (dupla posição)
+Module1520Name=Criação de documentos
+Module1520Desc=Produção do documento da emails em massa
 Module1780Name=Etiquetas/Categorias
 Module1780Desc=Criar etiquetas/categoria (produtos, clientes, fornecedores, contactos ou membros)
-Module2000Name=FCKeditor
-Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
-Module2200Name=Preços Dinamicos
-Module2200Desc=Enable the usage of math expressions for prices
+Module2000Name=Editor WYSIWYG
+Module2000Desc=Permitir a edição de texto utilizando um editor avançado (baseado no CKEditor)
+Module2200Name=Preços dinamicos
+Module2200Desc=Permitir a utilização de expressões matemáticas para os preços
 Module2300Name=Cron
 Module2300Desc=Gestão de trabalho agendado
-Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
-Module2500Name=Gestão Electrónica de Documentos
-Module2500Desc=Permite administrar uma base de documentos
+Module2400Name=Eventos/Agenda
+Module2400Desc=Seguir eventos terminados e que estão para ocorrer. Permitir que a aplicação registe eventos automáticos ou eventos manuais ou encontros.
+Module2500Name=Gestão electrónica de conteúdo
+Module2500Desc=Guardar e partilhar documentos
 Module2600Name=Serviços API/Web (servidor SOAP)
-Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2600Desc=Ativar o servidor SOAP do Dolibarr, fornecendo serviços API
 Module2610Name=Serviços API/Web (servidor REST)
-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)
+Module2610Desc=Ativar os serviços API do servidor REST do Dolibarr
+Module2660Name=Serviços Web de chamada (cliente SOAP)
+Module2660Desc=Ativar o cliente de serviços web Dolibarr (pode ser usado para enviar dados/pedidos a servidores externos. Suporta apenas encomendas a fornecedores de momento)
 Module2700Name=Gravatar
-Module2700Desc=Usar o serviço online Gravatar (www.gravatar.com) para mostrar as fotos dos utilizadores / membros (que encontrar nos seus e-mails). Necessita de um acesso à Internet
+Module2700Desc=Usar o serviço online Gravatar (www.gravatar.com) para mostrar as fotos dos utilizadores/membros (que encontrar nos seus e-mails). Necessita de um acesso à Internet
 Module2800Desc=Cliente FTP
 Module2900Name=GeoIPMaxmind
-Module2900Desc=Capacidades GeoIP conversões MaxMind
+Module2900Desc=Capacidades de conversões GeoIP Maxmind
 Module3100Name=Skype
-Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3100Desc=Adicionar um botão Skype nas fichas dos usuários/terceiros/contactos/membros
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=RH
-Module4000Desc=Human resources management
-Module5000Name=Multi-empresa
+Module4000Desc=Gestão de recursos humanos (gestão do departamento, contactos do funcionário e  sentimentos)
+Module5000Name=Multiempresa
 Module5000Desc=Permite-lhe gerir várias empresas
-Module6000Name=Fluxo de Trabalho
+Module6000Name=Fluxo de trabalho
 Module6000Desc=Gestão do fluxo de trabalho
-Module10000Name=Websites
+Module10000Name=Sites da Web
 Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
-Module20000Name=Deixar gestão de Pedidos
-Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Product lot
-Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
-Module50000Name=Paybox
-Module50000Desc=Módulo para oferecer uma página de pagamento online por cartão de crédito com paybox
-Module50100Name=Caixa
-Module50100Desc=Modúlo de Ponto de Venda (POS).
+Module20000Name=Gestão de pedidos de licença
+Module20000Desc=Declarar e seguir os pedidos de licença dos funcionários
+Module39000Name=Lote do produto
+Module39000Desc=Gestão de produtos por lotes ou números de série
+Module50000Name=PayBox
+Module50000Desc=Módulo que disponibiliza uma página de pagamento online por cartão de crédito com PayBox
+Module50100Name=Ponto de vendas
+Module50100Desc=Modúlo de ponto de vendas (POS).
 Module50200Name=Paypal
-Module50200Desc=Módulo para oferecer uma página de pagamento online por cartão de crédito com Paypal
-Module50400Name=Accounting (advanced)
-Module50400Desc=Perido de gestão da Contabilidade (dupla posição)
+Module50200Desc=Módulo que disponibiliza uma página de pagamento online por cartão de crédito com Paypal
+Module50400Name=Contabilidade (avançada)
+Module50400Desc=Gestão de contabilidade (dupla posição)
 Module54000Name=PrintIPP
-Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
-Module55000Name=Poll, Survey or Vote
-Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
+Module54000Desc=impressão direta (sem abrir os documentos) usando a interface Cups IPP (A impressora deve ser visível a partir do servidor, e o CUPS deve estar instalado no servidor).
+Module55000Name=Votação ou Questionário
+Module55000Desc=Módulo para fazer votações ou questionários online (como Doodle, Studs, Rdvz, ...)
 Module59000Name=Margens
-Module59000Desc=Módulo para gerir as margens
+Module59000Desc=Módulo para gerir margens
 Module60000Name=Comissões
 Module60000Desc=Módulo para gerir comissões
 Module63000Name=Recursos
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
-Permission11=Consultar facturas
-Permission12=Criar/Modificar facturas
-Permission13=Facturas não validadas
-Permission14=Confirmar facturas
-Permission15=Enviar facturas por correio
-Permission16=Emitir pagamentos de facturas
-Permission19=Eliminar facturas
-Permission21=Consultar Orçamentos
-Permission22=Criar/Modificar Orçamentos
-Permission24=Confirmar Orçamentos
-Permission25=Enviar os Orçamentos
-Permission26=Fechar Orçamentos
-Permission27=Eliminar Orçamentos
-Permission28=Exportação propostas comerciais
-Permission31=Consultar produtos/serviços
-Permission32=Criar/Modificar produtos/serviços
-Permission34=Eliminar produtos/serviços
-Permission36=Exportar produtos/serviços
-Permission38=Exportar Produtos
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
-Permission44=Eliminar projectos
-Permission45=Export projects
-Permission61=Consultar Intervenções
-Permission62=Criar/Modificar Intervenções
-Permission64=Eliminar Intervenções
-Permission67=Exportar Intervenções
-Permission71=Consultar Membros
-Permission72=Criar/Modificar Membros
-Permission74=Eliminar Membros
+Permission11=Consultar facturas de clientes
+Permission12=Criar/Modificar faturas de clientes
+Permission13=Invalidar faturas de clientes
+Permission14=Validar faturas de clientes
+Permission15=Enviar faturas de clientes por email
+Permission16=Emitir pagamentos para facturas de clientes
+Permission19=Eliminar faturas de clientes
+Permission21=Consultar orçamentos a clientes
+Permission22=Criar/Modificar orçamentos a clientes
+Permission24=Confirmar orçamentos a clientes
+Permission25=Enviar orçamentos a clientes
+Permission26=Fechar orçamentos para clientes
+Permission27=Eliminar orçamentos a clientes
+Permission28=Exportar orçamentos a clientes
+Permission31=Consultar produtos
+Permission32=Criar/Modificar produtos
+Permission34=Eliminar produtos
+Permission36=Ver/Gerir produtos ocultos
+Permission38=Exportar produtos
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
+Permission42=Criar/modificar projetos (projetos partilhados e projetos nos quais sou contacto). Permite também criar tarefas e atribuir utilizadores a projetos e tarefas
+Permission44=Eliminar projectos (projetos partilhados e projetos dos quais sou contacto)
+Permission45=Exportar projetos
+Permission61=Consultar intervenções
+Permission62=Criar/Modificar intervenções
+Permission64=Eliminar intervenções
+Permission67=Exportar intervenções
+Permission71=Consultar membros
+Permission72=Criar/Modificar membros
+Permission74=Eliminar membros
 Permission75=Configure os tipos de membros
 Permission76=Exportar dados
-Permission78=Consultar honorários
-Permission79=Criar/Modificar honorários
-Permission81=Consultar pedidos de clientes
-Permission82=Criar/Modificar pedidos de clientes
-Permission84=Confirmar pedidos de clientes
-Permission86=Enviar pedidos de clientes
-Permission87=Fechar pedidos de clientes
-Permission88=Anular pedidos de clientes
-Permission89=Eliminar pedidos de clientes
-Permission91=Read social or fiscal taxes and vat
-Permission92=Create/modify social or fiscal taxes and vat
-Permission93=Delete social or fiscal taxes and vat
-Permission94=Export social or fiscal taxes
-Permission95=Consultar balanços e resultados
+Permission78=Consultar subscrições
+Permission79=Criar/Modificar subscrições
+Permission81=Consultar encomendas de clientes
+Permission82=Criar/Modificar encomendas de clientes
+Permission84=Confirmar encomendas de clientes
+Permission86=Enviar encomendas de clientes
+Permission87=Fechar encomendas de clientes
+Permission88=Cancelar encomendas de clientes
+Permission89=Eliminar encomendas de clientes
+Permission91=Consultar impostos sociais e fiscais e IVA
+Permission92=Criar/modificar impostos sociais e fiscais e IVA
+Permission93=Eliminar impostos sociais e fiscais e IVA
+Permission94=Exportar impostos sociais ou fiscais
+Permission95=Consultar relatórios
 Permission101=Consultar envios
 Permission102=Criar/modificar envios
 Permission104=Confirmar envios
 Permission106=Exportar envios
 Permission109=Eliminar envios
-Permission111=Consultar contas financeiras (contas bancarias, caixas)
-Permission112=Criar/Modificar quantidade/eliminar registos bancarios
+Permission111=Consultar contas financeiras (contas bancárias, caixas)
+Permission112=Criar/modificar/eliminar e comparar trasações
 Permission113=Configurar as contas ficnanceiras (criar, gerir categorias)
 Permission114=Reconciliar transações
 Permission115=Exportar transacções e extractos
-Permission116=Captar transferencias entre contas
-Permission117=Gerir envío de cheques
-Permission121=Consultar empresas
-Permission122=Criar/Modificar empresas
-Permission125=Eliminar empresas
-Permission126=Exportar as empresas
-Permission141=Ler todos os projetos e tarefas (também os projetos privados em que eu não sou contactado)
-Permission142=Criar/modificar todos os projetos e tarefas (também os projetos privados em que eu não sou contactado)
-Permission144=Eliminar todos os projetos e tarefas (também os projetos privados em que eu não sou contactado)
-Permission146=Consultar Fornecedores
-Permission147=Consultar Estados
-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
-Permission161=Ler contractos/subscrições
-Permission162=Criar/modificar contractos/subscrições
-Permission163=Ativar um serviço/subscrição de um contracto
-Permission164=Desativar um serviço/subscrição de um contracto
-Permission165=Apagar contractos/subscrições
-Permission167=Export contracts
-Permission171=Read trips and expenses (yours and your subordinates)
+Permission116=Transferências entre contas
+Permission117=Gerir envio de cheques
+Permission121=Consultar terceiros associados ao utilizador
+Permission122=Criar/modificar terceiros associados ao utilizador
+Permission125=Eliminar terceiros associados ao utilizador
+Permission126=Exportar terceiros
+Permission141=Ler todos os projetos e tarefas (também os projetos privados para os quais não sou contatado)
+Permission142=Criar/modificar todos os projetos e tarefas (também os projetos privados para os quais não sou contactado)
+Permission144=Eliminar todos os projetos e tarefas (também os projetos privados para os quais não sou contactado)
+Permission146=Consultar fornecedores de rede
+Permission147=Consultar estados
+Permission151=Consultar ordens de pagamento por débito direto
+Permission152=Criar/modificar ordens de pagamento por débito direto
+Permission153=Enviar/transimitir ordens de pagamento por débito direto
+Permission154=Registar Créditos/Rejeições de ordens de pagamento por débito direto
+Permission161=Consultar contratos/subscrições
+Permission162=Criar/modificar contratos/subscrições
+Permission163=Ativar um serviço/subscrição de um contrato
+Permission164=Desativar um serviço/subscrição de um contrato
+Permission165=Apagar contratos/subscrições
+Permission167=Exportar contratos
+Permission171=Consultar viagens e despesas (suas e dos seus subordinados)
 Permission172=Criar/modificar viagens e despesas
 Permission173=Apagar viagens e despesas
-Permission174=Ler todas as viagens e despesas
+Permission174=Consultar todas as viagens e despesas
 Permission178=Exportar viagens e despesas
-Permission180=Consultar Fornecedores
-Permission181=Consultar pedidos a Fornecedores
-Permission182=Criar/Modificar pedidos a Fornecedores
-Permission183=Confirmar pedidos a Fornecedores
-Permission184=Aprovar pedidos a Fornecedores
-Permission185=Encomendar ou cancelar ordens do fornecedor
-Permission186=Receber pedidos de Fornecedores
-Permission187=Fechar pedidos a Fornecedores
-Permission188=Anular pedidos a Fornecedores
-Permission192=Criar Linhas
-Permission193=Cancelar Linhas
-Permission194=Consultar Linhas, Largura de Banda
-Permission202=Criar Ligações ADSL
-Permission203=Ordem das ligações encomendadas
-Permission204=Comprar Ligações
-Permission205=Gerir Ligações
-Permission206=Consultar Ligações
-Permission211=Ler Telefone
-Permission212=Comprar Linhas
-Permission213=Activar Linha
-Permission214=Configurar Telefone
-Permission215=Configurar Fornecedores
-Permission221=Consultar E-Mails
-Permission222=Criar/Modificar E-Mails (assunto, destinatarios, etc.)
-Permission223=Confirmar E-Mails (permite o envío)
-Permission229=Eliminar E-Mails
+Permission180=Consultar fornecedores
+Permission181=Consultar encomendas a fornecedores
+Permission182=Criar/modificar encomendas a fornecedores
+Permission183=Confirmar encomendas a fornecedores
+Permission184=Aprovar encomendas a fornecedores
+Permission185=Encomendar ou cancelar encomendas a fornecedores
+Permission186=Receber encomendas a fornecedores
+Permission187=Fechar encomendas a fornecedores
+Permission188=Cancelar encomendas a fornecedores
+Permission192=Criar linhas de rede
+Permission193=Cancelar linhas de rede
+Permission194=Consultar linhas de largura de banda
+Permission202=Criar ligações ADSL
+Permission203=Encomendar encomendas de ligações
+Permission204=Encomendar ligações
+Permission205=Gerir ligações
+Permission206=Consultar ligações
+Permission211=Consultar telefonia
+Permission212=Encomendar linhas de rede
+Permission213=Ativar linha de rede
+Permission214=Configurar telefonia
+Permission215=Configurar fornecedores de rede
+Permission221=Consultar emails
+Permission222=Criar/modificar emails (assunto, destinatários, etc.)
+Permission223=Validar emails (permite o envío)
+Permission229=Eliminar emails
 Permission237=Ver destinatários e informação
 Permission238=Envie correio manualmente
 Permission239=Apagar o correio depois da validação ou envio
 Permission241=Consultar categorías
-Permission242=Criar/Modificar categorías
+Permission242=Criar/modificar categorías
 Permission243=Eliminar categorías
 Permission244=Ver conteudo de categorías ocultas
-Permission251=Consultar Outros Utilizadores, grupos e permissões
-PermissionAdvanced251=Leia outros usuários
-Permission252=Criar/Modificar outros utilizadores, grupos e permissões
-Permission253=Modificar a palavra-passe de outros utilizadores
-PermissionAdvanced253=Criar / modificar usuários internos / externos e permissões
-Permission254=Eliminar ou desactivar outros utilizadores
+Permission251=Consultar outros utilizadores e grupos
+PermissionAdvanced251=Consultar outros utilizadores
+Permission252=Consultar permissões de outros utilizadores
+Permission253=Criar/modificar outros utilizadores, grupos e permissões
+PermissionAdvanced253=Criar/modificar utilizadores internos/externos e permissões
+Permission254=Criar/modificar apenas utilizadores externos
 Permission255=Modificar a palavra-passe de outros utilizadores
-Permission256=Modificar a sua propia palavra-passe
-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 assignement matters).
-Permission271=Ler CA
-Permission272=Ler Facturas
-Permission273=Emitir Factura
+Permission256=Eliminar ou desativar outros utilizadores
+Permission262=Extender o acesso do utilizador a todos os terceiros (e não apenas aos clientes dos quais o utilizador é representante de vendas).<br>Não é eficaz para utilizadores externos (sempre limitados aos orçamentos, encomendas, faturas, etc. que são deles)<br>Não é eficaz para projetos (apenas regras em termos de permissões, visibilidade e atribuição de projeto é que importam).
+Permission271=Consultar CA
+Permission272=Consultar faturas
+Permission273=Emitir fatura
 Permission281=Consultar contactos
-Permission282=Criar/Modificar contactos
+Permission282=Criar/modificar contactos
 Permission283=Eliminar contactos
-Permission286=Exportar os contactos
-Permission291=Consultar Tarifas
-Permission292=Permissões das Tarifas
-Permission293=Modificar Fornecedor de Tarifas
+Permission286=Exportar contactos
+Permission291=Consultar tarifas
+Permission292=Definir permissões das tarifas
+Permission293=Modificar tarifas de clientes
 Permission300=Consultar códigos de barra
-Permission301=Criar/Modificar códigos de barra
+Permission301=Criar/modificar códigos de barra
 Permission302=Eliminar código de barras
-Permission311=Consultar Serviços
-Permission312=Assign service/subscription to contract
-Permission331=Consultar Favoritos
-Permission332=Criar/Modificar Favoritos
-Permission333=Eliminar Favoritos
-Permission341=Leia suas próprias permissões
-Permission342=Criar / modificar suas informações de utilizador
+Permission311=Consultar serviços
+Permission312=Atribuir serviço/subscrição ao contrato
+Permission331=Consultar marcadores
+Permission332=Criar/modificar marcadores
+Permission333=Eliminar marcadores
+Permission341=Consultar as suas próprias permissões
+Permission342=Criar/modificar a sua informação de utilizador
 Permission343=Modificar a sua própria palavra-passe
-Permission344=Modificar suas próprias permissões
-Permission351=Leia grupos
-Permission352=Permissões de leitura grupos
-Permission353=Criar / modificar grupos
-Permission354=Excluir ou desativar grupos
-Permission358=Usuários de Exportação
-Permission401=Consultar activos
-Permission402=Criar/Modificar activos
-Permission403=Confirmar activos
-Permission404=Eliminar activos
-Permission510=Ler Salários
+Permission344=Modificar as suas próprias permissões
+Permission351=Consultar grupos
+Permission352=Consultar permissões dos grupos
+Permission353=Criar/modificar grupos
+Permission354=Eliminar ou desativar grupos
+Permission358=Exportar utilizadores
+Permission401=Consultar descontos
+Permission402=Criar/modificar descontos
+Permission403=Validar descontos
+Permission404=Eliminar descontos
+Permission510=Consultar salários
 Permission512=Criar/modificar salários
 Permission514=Apagar salários
 Permission517=Exportar salários
-Permission520=Ler Empréstimos
+Permission520=Consultar empréstimos
 Permission522=Criar/modificar empréstimos
 Permission524=Eliminar empréstimos
 Permission525=Aceder á calculadora de empréstimos
 Permission527=Exportar empréstimos
-Permission531=Ler serviços
-Permission532=Criar / modificar serviços
-Permission534=Apagar serviços
-Permission536=Ver / gerenciar os serviços escondidos
-Permission538=Exportação de serviços
-Permission701=Consultar Bolsas
-Permission702=Criar/Modificar Bolsas
-Permission703=Eliminar Bolsas
-Permission771=Read expense reports (yours and your subordinates)
+Permission531=Consultar serviços
+Permission532=Criar/modificar serviços
+Permission534=Eliminar serviços
+Permission536=Ver/gerir serviços ocultos
+Permission538=Exportar serviços
+Permission701=Consultar donativos
+Permission702=Criar/modificar donativos
+Permission703=Eliminar donativos
+Permission771=Consultar relatórios de despesas (seus e dos seus subordinados)
 Permission772=Criar/modificar relatórios de despesas
 Permission773=Eliminar relatórios de despesas
-Permission774=Read all expense reports (even for user not subordinates)
+Permission774=Consultar todos os relatórios de despesa (mesmo para utilizadores que não são subordinados)
 Permission775=Aprovar relatórios de despesas
 Permission776=Pagar relatórios de despesas
 Permission779=Exportar relatórios de despesas
 Permission1001=Consultar stocks
 Permission1002=Criar/modificar armazéns
-Permission1003=Apagar armazéns
-Permission1004=Consultar movimientos de stock
-Permission1005=Criar/Modificar movimentos de stock
+Permission1003=Eliminar armazéns
+Permission1004=Consultar movimentos de stock
+Permission1005=Criar/modificar movimentos de stock
 Permission1101=Consultar ordens de envío
 Permission1102=Criar/modificar ordens de envío
 Permission1104=Confirmar ordem de envío
 Permission1109=Eliminar ordem de envío
-Permission1181=Consultar Fornecedores
-Permission1182=Consultar pedidos a Fornecedores
-Permission1183=Criar pedidos a Fornecedores
-Permission1184=Confirmar pedidos a Fornecedores
-Permission1185=Aprovar pedidos a Fornecedores
-Permission1186=Enviar pedidos a Fornecedores
-Permission1187=Receber pedidos de Fornecedores
-Permission1188=Fechar pedidos a Fornecedores
-Permission1190=Approve (second approval) supplier orders
+Permission1181=Consultar fornecedores
+Permission1182=Consultar encomendas a fornecedores
+Permission1183=Criar/modificar encomendas a fornecedores
+Permission1184=Validar encomendas a fornecedores
+Permission1185=Aprovar encomendas a fornecedores
+Permission1186=Encomendar encomendas a fornecedores
+Permission1187=Confirmar a receção de encomendas a fornecedores
+Permission1188=Eliminar encomendas a fornecedores
+Permission1190=Aprovar (segunda aprovação) encomendas a fornecedores
 Permission1201=Obter resultado de uma exportação
-Permission1202=Criar/Modificar Exportações
-Permission1231=Consultar facturas de Fornecedores
-Permission1232=Criar facturas de Fornecedores
-Permission1233=Confirmar facturas de Fornecedores
-Permission1234=Eliminar facturas de Fornecedores
-Permission1235=Enviar facturas de fornecedores por e-mail
-Permission1236=Exportar facturas de Fornecedores, atributos e pagamentos
-Permission1237=Exportar as encomendas do fornecedor e os seus ddetalhes
-Permission1251=Executar importações em massa de dados externos em bases de dados (dados de carga)
-Permission1321=Exportar facturas a clientes, atributos e cobranças
+Permission1202=Criar/Modificar uma exportação
+Permission1231=Consultar facturas de fornecedores
+Permission1232=Criar/modificar facturas de fornecedores
+Permission1233=Validar faturas de fornecedores
+Permission1234=Eliminar faturas de fornecedores
+Permission1235=Enviar faturas de fornecedores por email
+Permission1236=Exportar faturas, atributos e pagamentos de fornecedores
+Permission1237=Exportar encomendas a fornecedores e os seus detalhes
+Permission1251=Executar importações em massa de dados externos para a bases de dados (data load)
+Permission1321=Exportar faturas, atributos e cobranças de clientes
 Permission1322=Reopen a paid bill
-Permission1421=Exportar facturas de clientes e atributos
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
-Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
-Permission20006=Admin leave requests (setup and update balance)
-Permission23001=Ler trabalho agendado
+Permission1421=Exportar faturas e atributos de clientes
+Permission20001=Consultar pedidos de licença (seu e dos seus subordinados)
+Permission20002=Criar/Modificar os seus pedidos de licença
+Permission20003=Eliminar pedidos de licença
+Permission20004=Consultar todos os pedidos de licença (seus e dos seus subordinados)
+Permission20005=Criar/Modificar todos os pedidos de licenças
+Permission20006=Pedidos de licenças do administrador (configuração e atualização do balanço)
+Permission23001=Consultar trabalho agendado
 Permission23002=Criar/atualizar trabalho agendado
-Permission23003=Apagar Trabalho Agendado
-Permission23004=Executar Trabalho Agendado
-Permission2401=Ler acções (eventos ou tarefas) vinculadas na sua conta
-Permission2402=Criar/Modificar/Eliminar acções (eventos ou tarefas) vinculadas na sua conta
-Permission2403=Consultar acções (acontecimientos ou tarefas) de outros
-Permission2411=Ler acções (eventos ou tarefas) de outros
-Permission2412=Criar / modificar acções (eventos ou tarefas) de outros
-Permission2413=Excluir acções (eventos ou tarefas) de outros
-Permission2414=Export actions/tasks of others
-Permission2501=Consultar documentos
-Permission2502=Enviar ou eliminar documentos
-Permission2503=Enviar ou excluir documentos
-Permission2515=Configuração de directorios de documentos
-Permission2801=Usar cliente FTP em modo de leitura (listar e transferir apenas)
-Permission2802=Usar o cliente FTP em modo de escrita (apagar ou fazer upload de ficheiros)
-Permission50101=Usar Pontos de Venda
-Permission50201=Leia transações
-Permission50202=Operações de importação
+Permission23003=Eliminar trabalho agendado
+Permission23004=Executar trabalho agendado
+Permission2401=Consultar ações (eventos ou tarefas) vinculadas à conta dele
+Permission2402=Criar/modificar ações (eventos ou tarefas) vinculadas à conta dele
+Permission2403=Consultar ações (eventos ou tarefas) vinculadas à conta dele
+Permission2411=Consultar ações (eventos ou tarefas) de outros
+Permission2412=Criar/modificar ações (eventos ou tarefas) de outros
+Permission2413=Eliminar ações (eventos ou tarefas) de outros
+Permission2414=Exportar ações/taregas de outros
+Permission2501=Consultar/descarregar documentos
+Permission2502=Descarregar documentos
+Permission2503=Submeter ou eliminar documentos
+Permission2515=Configuração de diretórios de documentos
+Permission2801=Usar cliente FTP em modo de leitura (listar e descarregar apenas)
+Permission2802=Usar o cliente FTP em modo de escrita (eliminar ou carregar ficheiros)
+Permission50101=Utilizar Pontos de venda
+Permission50201=Consultar transações
+Permission50202=Importar transações
 Permission54001=Imprimir
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
-Permission59003=Read every user margin
+Permission55001=Consultar votações
+Permission55002=Criar/Modificar votações
+Permission59001=Consultar margens comerciais
+Permission59002=Definir margens comerciais
+Permission59003=Consultar as margens de todos os utilizadores
 Permission63001=Read resources
 Permission63002=Create/modify resources
 Permission63003=Delete resources
 Permission63004=Link resources to agenda events
-DictionaryCompanyType=Types of thirdparties
-DictionaryCompanyJuridicalType=Legal forms of thirdparties
-DictionaryProspectLevel=Perspectiva ao nivel do cliente potencial
-DictionaryCanton=Cidade/Distrito
-DictionaryRegion=Regiões
+DictionaryCompanyType=Tipos de terceiros
+DictionaryCompanyJuridicalType=Formulários legais de terceiros
+DictionaryProspectLevel=Nível de potencial da prospeção
+DictionaryCanton=Concelho
+DictionaryRegion=Distritos
 DictionaryCountry=Países
 DictionaryCurrency=Moedas
-DictionaryCivility=Personal and professional titles
-DictionaryActions=Types of agenda events
-DictionarySocialContributions=Social or fiscal taxes types
+DictionaryCivility=Títulos pessoais e profissionais
+DictionaryActions=Tipos de eventos da agenda
+DictionarySocialContributions=Tipos de impostos sociais ou fiscais
 DictionaryVAT=Taxa de IVA
-DictionaryRevenueStamp=Amount of revenue stamps
-DictionaryPaymentConditions=Condições de Pagamento
-DictionaryPaymentModes=Modos de Pagamento
-DictionaryTypeContact=Tipos de Contacto/Endereço
-DictionaryEcotaxe=ECO Taxa (DEEE)
+DictionaryRevenueStamp=Quantidade de sêlos fiscais
+DictionaryPaymentConditions=Condições de pagamento
+DictionaryPaymentModes=Métodos de pagamento
+DictionaryTypeContact=Tipos de contacto/endereço
+DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Formatos de Papel
 DictionaryFormatCards=Cards formats
-DictionaryFees=Types of fees
-DictionarySendingMethods=Métodos de Expedição
+DictionaryFees=Tipos de taxas
+DictionarySendingMethods=Métodos de expedição
 DictionaryStaff=Empregados
 DictionaryAvailability=Atraso na entrega
 DictionaryOrderMethods=Métodos de encomenda
-DictionarySource=Origem das propostas/ordens
-DictionaryAccountancyCategory=Accounting account groups
+DictionarySource=Origem de orçamentos/encomendas
+DictionaryAccountancyCategory=Grupos de contas contabilísticas
 DictionaryAccountancysystem=Modelos para o gráfíco de contas
-DictionaryEMailTemplates=Modelos de Mensagens
+DictionaryAccountancyJournal=Diários contabilisticos
+DictionaryEMailTemplates=Modelos de emails
 DictionaryUnits=Unidades
 DictionaryProspectStatus=Estado da prospeção
-DictionaryHolidayTypes=Types of leaves
-DictionaryOpportunityStatus=Opportunity status for project/lead
+DictionaryHolidayTypes=Tipos de licença
+DictionaryOpportunityStatus=Estado da oportunidade para o projeto/lead
 SetupSaved=Configuração guardada
+SetupNotSaved=Setup not saved
 BackToModuleList=Voltar à lista de módulos
 BackToDictionaryList=Voltar à lista de dicionários
 VATManagement=Gestão de IVA
-VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
-VATIsNotUsedDesc=O tipo de IVA proposto por defeito é 0. Este é o caso de associações, particulares o algunas pequenas sociedades.
+VATIsUsedDesc=Por defeito, quando prospeções; faturas; encomendas; etc. são criadas, a taxa de IVA segue a seguinte regra:<br>Se o vendedor não estiver sujeito a IVA, então este é igual a 0. Fim da regra.<br>Se o país de venda for igual ao país de compra, então o valor do IVA passa a ser o aplicado no país de venda. Fim da regra.<br>Se o vendedor e o comprador fizerem parte da União Europeia e os bens forem produtos de transporte (carro, navio, avião), o IVA é 0 (o IVA deverá ser pago pelo comprador à alfândega do seu país, e não ao vendedor). Fim da regra.<br>Se o vendedor e o comprador fizerem parte da União Europeia e o comprador não for uma empresa, então o IVA é igual ao IVA aplicado no produto vendido. Fim da regra.<br>Se o vendedor e o comprador fizerem parte da União Europeia e o comprador for uma empresa, então o IVA é igual a 0. Fim da regra.<br>Noutros casos o IVA por defeito é igual a 0. Fim da regra.
+VATIsNotUsedDesc=O tipo de IVA proposto por defeito é 0, este pode ser usado em casos como associações, indivíduos ou pequenas empresas.
 VATIsUsedExampleFR=Em França, trata-se de sociedades ou organismos que elegem um regime fiscal general (Geral simplificado ou Geral normal), regime ao qual se declara o IVA.
-VATIsNotUsedExampleFR=Em França, trata-se de associações ou sociedades isentas de IVA, organismos o profissionais liberais que escolheram o régime fiscal de módulos (IVA em franquia), pagando um IVA em franquia sem fazer declarações de IVA. Esta eleição faz aparecer a anotação  "IVA não aplicavel" nas facturas.
+VATIsNotUsedExampleFR=Em França, trata-se de associações ou sociedades isentas de IVA, organismos ou profissionais liberais que escolheram o regime fiscal de módulos (IVA em franquia) e pagaram um IVA em franquia sem fazer declarações de IVA. Esta escolha faz com apareça a anotação "IVA não aplicável" nas facturas.
 ##### Local Taxes #####
 LTRate=Taxa
 LocalTax1IsNotUsed=Não utilizar um segundo imposto
-LocalTax1IsUsedDesc=Utilizar um segundo tipo de imposto (não IVA)
-LocalTax1IsNotUsedDesc=Não utilizar outro tipo de imposto (não IVA)
+LocalTax1IsUsedDesc=Utilizar um segundo tipo de imposto (para além do IVA)
+LocalTax1IsNotUsedDesc=Não utilizar outro tipo de imposto (para além do IVA)
 LocalTax1Management=Segundo tipo de imposto
 LocalTax1IsUsedExample=
 LocalTax1IsNotUsedExample=
 LocalTax2IsNotUsed=Não utilizar um terceiro imposto
-LocalTax2IsUsedDesc=Use a third type of tax (other than VAT)
-LocalTax2IsNotUsedDesc=Não utilizar outro tipo de imposto (não IVA)
+LocalTax2IsUsedDesc=Utilizar um terceiro tipo de imposto (a parte do IVA)
+LocalTax2IsNotUsedDesc=Não utilizar outro tipo de imposto (para além do IVA)
 LocalTax2Management=Terceiro tipo de imposto
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
@@ -876,185 +902,187 @@ LocalTax1IsUsedDescES= A taxa de RE por padrão, quando as perspectivas de cria
 LocalTax1IsNotUsedDescES= Por padrão, o RE proposto é 0. Fim da regra.
 LocalTax1IsUsedExampleES= Em Espanha, eles são profissionais sujeitos a algumas secções específicas do IAE Espanhol.
 LocalTax1IsNotUsedExampleES= Em Espanha por exemplo, eles são profissionais e sociedades, sujeitos a certas secções do IAE Espanhol.
-LocalTax2ManagementES= IRPF Gestão
+LocalTax2ManagementES= Gestão de Imposto sobre o Rendimento das Pessoas Singulares (IRS)
 LocalTax2IsUsedDescES= A taxa de RE por padrão, quando as perspectivas de criação, faturas, pedidos, etc seguir a regra activa padrão: <br> Se o vendedor não está sujeito ao IRPF, IRPF, seguida, por defeito
-LocalTax2IsNotUsedDescES= Por padrão, o IRPF proposto é 0. Fim da regra.
+LocalTax2IsNotUsedDescES= Por defeito, o IRS proposto é 0. Fim da regra.
 LocalTax2IsUsedExampleES= Em Espanha, os freelancers e profissionais liberais que prestam serviços e empresas que escolheram o regime fiscal dos módulos.
-LocalTax2IsNotUsedExampleES= Em Espanha, eles não são negócios sujeitas ao regime fiscal dos módulos.
-CalcLocaltax=Reports on local taxes
+LocalTax2IsNotUsedExampleES= Em Espanha, eles são negócios que não estão sujeitos ao regime fiscal de módulos.
+CalcLocaltax=Relatórios sobre impostos locais
 CalcLocaltax1=Vendas - Compras
-CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
+CalcLocaltax1Desc=Os relatórios de impostos locais são calculados através da diferença entre as vendas de impostos locais e as compras de impostos locais
 CalcLocaltax2=Compras
-CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
+CalcLocaltax2Desc=Os relatórios de impostos locais são o total de compras de impostos locais
 CalcLocaltax3=Vendas
-CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
-LabelUsedByDefault=Etiqueta que se utilizará se não se encontra tradução para este código
+CalcLocaltax3Desc=Os relatórios de impostos locais são o total de vendas de impostos locais
+LabelUsedByDefault=Etiqueta que será utilizada por defeito se não for encontrada tradução para este código
 LabelOnDocuments=Etiqueta sobre documentos
 NbOfDays=Nº de Dias
-AtEndOfMonth=No Fim de Mês
+AtEndOfMonth=No fim de mês
 CurrentNext=Current/Next
-Offset=Deslocado
-AlwaysActive=Sempre Activo
-Upgrade=Actualização
-MenuUpgrade=Upgrade / Ampliar
-AddExtensionThemeModuleOrOther=Deploy/install external module
+Offset=Desvio
+AlwaysActive=Sempre ativo
+Upgrade=Atualização
+MenuUpgrade=Atualizar/Estender
+AddExtensionThemeModuleOrOther=Instalar módulo externo
 WebServer=Servidor web
-DocumentRootServer=Pasta raiz das páginas web
-DataRootServer=Pasta raiz dos ficheiros de dados
+DocumentRootServer=Directório raiz do servidor
+DataRootServer=Diretório raiz dos ficheiros de dados
 IP=IP
 Port=Porta
 VirtualServerName=Nome do servidor virtual
 OS=SO
-PhpWebLink=link Web-PHP
-Browser=Browser
-Server=Server
+PhpWebLink=Ligação Web-PHP
+Browser=Navegador
+Server=Servidor
 Database=Base de dados
-DatabaseServer=Host da base de dados
+DatabaseServer=Servidor da base de dados
 DatabaseName=Nome da base de dados
 DatabasePort=Porta da base de dados
 DatabaseUser=Utilizador da base de dados
 DatabasePassword=Palavra-passe da base de dados
 Tables=Tabelas
 TableName=Nome da tabela
-NbOfRecord=Nº Reg.
+NbOfRecord=Nº de registos
 Host=Servidor
 DriverType=Tipo de driver
-SummarySystem=Resumo da informação de sistemas ERP/CRM
-SummaryConst=Lista de todos os parâmetros de configuração ERP/CRM
-MenuCompanySetup=Empresa/Instituição
-DefaultMenuManager= Gestor de menu padrão
-DefaultMenuSmartphoneManager=Gestor de menu Smartphone
-Skin=Tema visual
-DefaultSkin=Tema visual por defeito
-MaxSizeList=Longuitude máxima de listagem
-DefaultMaxSizeList=Default max length for lists
-DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
+SummarySystem=Resumo da informação do sistema
+SummaryConst=Lista de todos os parâmetros de configuração do Dolibarr
+MenuCompanySetup=Empresa/Organização
+DefaultMenuManager= Gestor de menu predefinido
+DefaultMenuSmartphoneManager=Gestor de menu smartphone
+Skin=Tema
+DefaultSkin=Tema predefinido
+MaxSizeList=Tamanho máximo da lista
+DefaultMaxSizeList=Tamanho máximo predefinido para listas
+DefaultMaxSizeShortList=Tamanho máximo predefinido para listas curtas (por exemplo, listas na ficha de cliente)
 MessageOfDay=Mensagem do día
-MessageLogin=Mensagem do login
-PermanentLeftSearchForm=Zona de pesquisa permanente do menu esquerdo
+MessageLogin=Mensagem da página de inicio de sessão
+LoginPage=Login page
+BackgroundImageLogin=Background image
+PermanentLeftSearchForm=Zona de pesquisa permanente no menu esquerdo
 DefaultLanguage=Idioma por defeito a utilizar (código idioma)
-EnableMultilangInterface=Activar interface Multi Idioma
-EnableShowLogo=Mostrar o logotipo no menu da esquerda
-CompanyInfo=Informação da Empresa/Instituição
-CompanyIds=Identificação regulamentação
+EnableMultilangInterface=Ativar interface multi-idioma
+EnableShowLogo=Mostrar o logótipo no menu esquerdo
+CompanyInfo=Informação da empresa/organização
+CompanyIds=Identidades da empresa/organização
 CompanyName=Nome/Razão social
 CompanyAddress=Morada
 CompanyZip=Código Postal
-CompanyTown=Concelho
+CompanyTown=Cidade
 CompanyCountry=País
 CompanyCurrency=Moeda principal
 CompanyObject=Objeto da empresa
 Logo=Logótipo
 DoNotSuggestPaymentMode=Não sugerir
-NoActiveBankAccountDefined=Nenhuma conta bancaria activa definida
-OwnerOfBankAccount=Titular da conta %s
-BankModuleNotActive=O módulo de contas bancarias não se encontra activado
+NoActiveBankAccountDefined=Nenhuma conta bancária ativa definida
+OwnerOfBankAccount=Titular da conta bancária %s
+BankModuleNotActive=O módulo de contas bancarias não se encontra ativado
 ShowBugTrackLink=Mostrar hiperligação "<strong>%s</strong>"
 Alerts=Alertas
-DelaysOfToleranceBeforeWarning=Prazos de tolerancia antes de notificação
-DelaysOfToleranceDesc=Esta janela permite configurar os prazos de tolerancia antes de que se notifique com o símbolo %s, sobre cada elemento em atraso.
-Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned events (agenda events) not completed yet
+DelaysOfToleranceBeforeWarning=Prazos de tolerância antes de notificação
+DelaysOfToleranceDesc=Esta janela permite configurar os prazos de tolerância antes da emissão de um alerta no ecrã, com o símbolo %s, sobre cada elemento em atraso.
+Delays_MAIN_DELAY_ACTIONS_TODO=Tolerância de atraso (em dias) antes da emissão de um alerta para eventos planeados (eventos da agenda) que não estejam terminados
 Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Delay tolerance (in days) before alert on project not closed in time
-Delays_MAIN_DELAY_TASKS_TODO=Delay tolerance (in days) before alert on planned tasks (project tasks) not completed yet
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on orders not processed yet
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on suppliers orders not processed yet
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Delay tolerance (in days) before alert on proposals to close
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Delay tolerance (in days) before alert on proposals not billed
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerance delay (in days) before alert on services to activate
-Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerance delay (in days) before alert on expired services
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerance delay (in days) before alert on unpaid supplier invoices
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerence delay (in days) before alert on unpaid client invoices
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerance delay (in days) before alert on pending bank reconciliation
-Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed membership fee
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
-Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
-SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+Delays_MAIN_DELAY_TASKS_TODO=Tolerância de atraso (em dias) antes da emissão de alertas para tarefas planeadas (tarefas de projeto) ainda não concluídas
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Tolerância de atraso (em dias) antes da emissão de um alerta para encomendas de cleintes não processadas
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Tolerância de atraso (em dias) antes da emissão de um alerta para encomendas a fornecedor não processadas
+Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Tolerância (em dias) antes da emissão do alerta para orçamentos a fechar
+Delays_MAIN_DELAY_PROPALS_TO_BILL=Tolerância (em dias) antes da emissão do alerta para orçamentos não faturados
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerância de atraso (em dias) antes da emissão de um alerta para serviços por ativar
+Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerância de atraso (em dias) antes da emissão de um alerta para serviços expirados
+Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerância de atraso (em dias) antes da emissão de um alerta para faturas de fornecedores por pagar
+Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerância de atraso (em dias) antes da emissão de um alerta para faturas de clientes por pagar
+Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerância de atraso (em dias) antes da emissão de um alerta para reconcilizações bancárias pendentes
+Delays_MAIN_DELAY_MEMBERS=Tolerância de atraso (em dias) antes da emissão de um alerta para atrasos de pagamentos para taxas de associação
+Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerância de atraso (em dias) antes da emissão de um alerta para depósitos em cheques, por efetuar
+Delays_MAIN_DELAY_EXPENSEREPORTS=Atraso de tolerância (em dias) antes da emissão de um alerta para relatórios de despesas por aprovar
+SetupDescription1=A área de configuração é para parâmetros de configuração iniciais, antes do primeiro uso do Dolibarr
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Outros itens do menu, gerir parâmetros opcionais.
-LogEvents=Auditoría da segurança de eventos
-Audit=Auditoría
-InfoDolibarr=Sobre Dolibarr
-InfoBrowser=About Browser
-InfoOS=Sobre OS
-InfoWebServer=Sobre Web Server
-InfoDatabase=Sobre Database
-InfoPHP=Sobre PHP
-InfoPerf=About Performances
-BrowserName=Nome do Navegador
-BrowserOS=Browser OS
-ListOfSecurityEvents=Listagem de eventos de segurança ERP/CRM
+LogEvents=Eventos de auditoria da segurança
+Audit=Auditoria
+InfoDolibarr=Sobre o Dolibarr
+InfoBrowser=Sobre o navegador
+InfoOS=Sobre o sistema operativo
+InfoWebServer=Sobre o servidor web
+InfoDatabase=Sobre a base de dados
+InfoPHP=Sobre o PHP
+InfoPerf=Sobre o desempenho
+BrowserName=Nome do navegador
+BrowserOS=Sistema operativo do navegador
+ListOfSecurityEvents=Listagem de eventos de segurança do Dolibarr
 SecurityEventsPurged=Os eventos de segurança purgados
-LogEventDesc=Pode activar o registo de eventos de segurança ERP/CRM aquí. os administradores podem ver o seu conteúdo a través d0 menu <b>ferramentas do sistema - Auditoria</b>.Atenção, esta característica pode consumir uma grande quantidade de espaço na base de dados.
-AreaForAdminOnly=Estas funções só são acessiveis ao Utilizador Administrador.
+LogEventDesc=Pode ativar o registo de eventos de segurança Dolibarr aqui. Os administradores podem ver o seu conteúdo a través do menu <b>Ferramentas do sistema - Auditoria</b>. Atenção, esta funcionalidade pode consumir uma grande quantidade de espaço na base de dados.
+AreaForAdminOnly=Os parâmetros de configuração só podem ser definidos pelos <b>utilizadores administradores</b>.
 SystemInfoDesc=Esta informação do sistema é uma informação técnica acessível só para leitura dos administradores.
-SystemAreaForAdminOnly=Esta área só é acessível aos Utilizadores do tipo administradores. Nenhuma permissão ERP/CRM permite extender o círculo de Utilizadores autorizados.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
-DisplayDesc=Pode encontrar aqui todos os parâmetros relacionados com a apariencia do ERP
-AvailableModules=Módulos disponiveis
-ToActivateModule=Para activar os módulos, aceder á área de configuração.
-SessionTimeOut=Time out de sessões
-SessionExplanation=Assegura que o período de sessões não expirará antes deste momento. sem perda, a Gestão do período de sessões de PHP não garante que o período de sessões expire depois deste período: Este será o caso sem o sistema de limpieza da cache de sessões activo. <br> Nota: sem mecanismo especial, o mecanismo interno para limpiar o período de sessões de PHP e todos os acessos <b>%s/%s</b>, só em acesso de Outros períodos de sessões.
-TriggersAvailable=Triggers disponiveis
-TriggersDesc=Os triggers são Ficheiros que, une vez depositados na pasta <b>htdocs/includes/triggers</b>, modifican o comportamento do workflow de Dolibarr. Realizan acções suplementares, desencadenadas por os eventos Dolibarr (criação de empresa, validação factura, fechar contrato, etc).
-TriggerDisabledByName=Triggers deste Ficheiro desactivador por o sufijo <b>-NORUN</b> ao Nome do Ficheiro.
-TriggerDisabledAsModuleDisabled=Triggers deste Ficheiro desactivados já que o módulo <b>%s</b> não está activado.
-TriggerAlwaysActive=Triggers deste Ficheiro sempre activos, já que os módulos Dolibarr relacionados estão activados
-TriggerActiveAsModuleActive=Triggers deste Ficheiro activos já que o módulo <b>%s</b> está activado
-GeneratedPasswordDesc=Indique aqui que norma quer utilizar para gerar as palavras-passe.
-DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">check here</a>.
-MiscellaneousDesc=All other security related parameters are defined here.
-LimitsSetup=Configuração de límites e precisões
-LimitsDesc=Pode definir aqui os límites e precisões utilizados pelo ERP/CRM
-MAIN_MAX_DECIMALS_UNIT=Decimais máximos para os preços unitários
-MAIN_MAX_DECIMALS_TOT=Decimais máximos para os preços totais
-MAIN_MAX_DECIMALS_SHOWN=Decimais máximos para os valores mostrados na janela (Por <b>...</b> depois do valor máximo em <b>...</b> quando o número seja truncado, mostrar na janela)
-MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
+SystemAreaForAdminOnly=Esta área só é acessível aos utilizadores administradores. Nenhuma permissão do Dolibarr permite reduzir esta limitação.
+CompanyFundationDesc=Nesta página modifique toda a informação relacionada com a empresa ou fundação que você gere (para isso, clique em no botão "Modificar" ou "Guardar" no fim da página)
+DisplayDesc=Pode encontrar aqui todos os parâmetros relacionados com a aparência do Dolibarr
+AvailableModules=Módulos disponíveis
+ToActivateModule=Para ativar módulos, aceder à área de configuração (Configuração->Módulos).
+SessionTimeOut=Tempo limite para a sessão
+SessionExplanation=Este valor assegura que o período de sessões não expirará antes deste momento, se a limpeza de sessão for efetuada internamente pelo PHP (e nada mais). A limpeza de sessões interna do PHP não garante que a sessão expire logo a seguir ao atraso definido. A sessão irá expirar, após o atraso aqui definido, e quando a limpeza de sessão ocorrer, normalmente após cada <b>%s/%s</b> acessos feitos para além deste.<br>Nota: em alguns servidores que possuem mecanismos de limpeza de sessão (cron), as sessões expirarão após o perído predefinido <strong>session.gc_maxlifetime</strong>, independentemente do valor aqui introduzido.
+TriggersAvailable=Acionadores disponíveis
+TriggersDesc=Os acionadores são ficheiros que irão modificar o comportamento do fluxo de trabalho do Dolibarr, assim que estes forem copiados para i diretório <b>htdocs/core/triggers</b>. Estes realizam novas ações, ativadas sobre eventos do Dolibarr (criação de novos terceiros, validação de faturas, etc.).
+TriggerDisabledByName=Os acionadores neste ficheiro estão desativados pelo sufixo <b>-NORUN</b> presente no nome.
+TriggerDisabledAsModuleDisabled=Os acionadores neste ficheiro estão desativados porque o módulo <b>%s</b> está desativado.
+TriggerAlwaysActive=Os acionadores neste ficheiro estão sempre ativos, independentemente de quais são os módulos ativados.
+TriggerActiveAsModuleActive=Os acionadores deste ficheiro estão ativos, isto porque o módulo <b>%s</b> está ativado.
+GeneratedPasswordDesc=Indique aqui a norma quer definir para gerar palavras-passe automáticas.
+DictionaryDesc=Insira todos os dados de referência. Você pode adicionar os seus valores aos valores predefinidos.
+ConstDesc=Esta página permite que modifique todos os outros parâmetros não disponíveis nas páginas anteriores. Estes são na sua maioria parâmetros reservados para programadores ou solução avançada de problemas. Para uma lista de opções <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">consulte aqui</a>.
+MiscellaneousDesc=Aqui são definidos todos os outros parâmetros relacionados com segurança.
+LimitsSetup=Configuração de limites/precisão
+LimitsDesc=Pode definir aqui os limites, precisão e otimizações utilizados pelo Dolibarr
+MAIN_MAX_DECIMALS_UNIT=Número de casa decimais máximo para os preços unitários
+MAIN_MAX_DECIMALS_TOT=Número de casa decimais máximo para os preços totais
+MAIN_MAX_DECIMALS_SHOWN=Número de casa decimais máximo para os valores mostrados na janela (Colocar <b>...</b> depois do número de casas decimais máximo quando o número for truncado)
+MAIN_ROUNDING_RULE_TOT=Passo do intervalo de arredondamento (para os países onde o arredondamento é feito em algo mais do que a base 10. Por exemplo, colocar 0,05 se o arredondamento é feito por incrementos de 0,05)
 UnitPriceOfProduct=Preço unitário líquido de um produto
-TotalPriceAfterRounding=Preço total (líquido / / IVA incl fiscal) após arredondamento
-ParameterActiveForNextInputOnly=Parâmetro efectivo somente a partir das próximas sessões
-NoEventOrNoAuditSetup=Não registraram eventos de segurança. Pode ser normal se a auditoría não foi habilitada na página "configuração->segurança->auditoría".
-NoEventFoundWithCriteria=Não se encontraram eventos de segurança para os criterios de pesquisa.
-SeeLocalSendMailSetup=Ver a configuração local de sendmail
-BackupDesc=Para realizar uma Cópia de segurança completa do ERP, deve:
-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.
-BackupDescX=O ficheiro gerado deverá ser guardado num lugar seguro.
-BackupDescY=O arquivo gerado deve ser armazenado em local seguro.
-BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one
-RestoreDesc=Para restaurar uma Cópia de segurança do ERP/CRM, você deve:
-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 directoy (<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.
+TotalPriceAfterRounding=Preço total (líquido/IVA/inclui impostos) após arredondamento
+ParameterActiveForNextInputOnly=Parâmetro efetivo somente para as próximas sessões
+NoEventOrNoAuditSetup=Ainda não foram registados eventos de segurança. Isto é comum no caso de "Auditoria" não estar ativa na página "Configuração->Segurança->Auditoria".
+NoEventFoundWithCriteria=Não foram encontrados eventos de segurança para os critérios de pesquisa introduzidos.
+SeeLocalSendMailSetup=Verifique a configuração local de sendmail
+BackupDesc=Para realizar uma cópia de segurança completa do Dolibarr, deve:
+BackupDesc2=Guarde o conteúdo do diretório de documentos (<b>%s</b>) que contém todos ficheiros carregados e gerados (de forma a que inclua todos os ficheiros dump gerados no passo 1).
+BackupDesc3=Guarde o conteúdo da sua base de dados (<b>%s</b>) num ficheiro dump. Para isso, pode usar o assistente seguinte.
+BackupDescX=O diretório arquivado deverá ser guardado num local seguro.
+BackupDescY=A cópia de segurança gerada deve ser armazenada num local seguro.
+BackupPHPWarning=O backup não pode ser garantido com este método. Utilize o anterior
+RestoreDesc=Para restaurar uma cópia de segurança do Dolibarr, você deve:
+RestoreDesc2=Restaurar o ficheiro de arquivo (ficheiro .zip por exemplo) do diretório de documentos para extrair árvore de ficheiros no diretório de documentos de uma nova instalação Dolibarr ou no atual diretório de documentos (<b>%s</b>).
+RestoreDesc3=Restaurar os dados, a partir de um ficheiro dump backup, na base de dados da nova instalação Dolibarr ou na base de dados da instalação atual (<b>%s</b>). Aviso: uma vez que a restauração esteja concluída, você deve usar um login/palavra passe, que existia quando o backup foi feito, para iniciar a sessão novamente. Para restaurar um backup da base de dados para a instalação atual, pode seguir este assistente.
 RestoreMySQL=Importação MySQL
-ForcedToByAModule= Esta regra é forçada <b>a %s</b> activada por um módulo
-PreviousDumpFiles=Cópia de segurança disponível, base de dados de arquivos
+ForcedToByAModule= Esta regra é forçada a <b>a %s</b>, por um módulo ativo
+PreviousDumpFiles=Ficheiros de cópias de segurança de base de dados disponíveis
 WeekStartOnDay=Primeiro dia da semana
-RunningUpdateProcessMayBeRequired=Para Executar o processo de atualização é necessário (versão Programas %s %s diferente da versão da base de dados)
-YouMustRunCommandFromCommandLineAfterLoginToUser=Você deve executar este comando de linha de comando após o login de um escudo com <b>%s</b> usuário.
-YourPHPDoesNotHaveSSLSupport=Funções SSL não está disponível no seu PHP
-DownloadMoreSkins=Mais skins para download
-SimpleNumRefModelDesc=Retorna o número de referência, com o formato nnnn %syymm, onde aa é o ano, mm é o mês e nnnn é uma sequência.
+RunningUpdateProcessMayBeRequired=Parece ser necessário executar o processo de atualização (a versão do programa %s difere da versão da base de dados %s)
+YouMustRunCommandFromCommandLineAfterLoginToUser=Deve executar este comando a partir de uma linha de comandos depois de iniciar a sessão, na linha de comandos, com o utilizador <b>%s</b> ou deve adicionar a opção -W no fim da linha de comando para indicar a palavra-passe <b>%s</b>.
+YourPHPDoesNotHaveSSLSupport=Funções SSL não estão disponíveis no seu PHP
+DownloadMoreSkins=Mais temas para descarregar
+SimpleNumRefModelDesc=Retorna o número de referência, com o formato %syymm-nnnn, onde "yy" é o ano, "mm" é o mês e "nnnn" é uma sequência.
 ShowProfIdInAddress=Mostrar ID professionnal com endereços em documentos
-ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents
-TranslationUncomplete=Tradução incompleta
+ShowVATIntaInAddress=Ocultar o número IVA Intra-Comunitário com endereços em documentos
+TranslationUncomplete=Tradução parcial
 MAIN_DISABLE_METEO=Desativar vista de meteorologia
-TestLoginToAPI=Teste o login para API
-ProxyDesc=Algumas características do Dolibarr precisa ter um acesso à Internet para funcionar. Definir aqui parâmetros para isso. Se o servidor Dolibarr está atrás de um servidor Proxy, esses parâmetros diz Dolibarr como acessar a Internet através dele.
+TestLoginToAPI=Teste o login à API
+ProxyDesc=Algumas características do Dolibarr precisam de acesso à Internet para funcionar. Defina aqui os parâmetros necessários para tal. Se o servidor Dolibarr estiver atrás de um servidor Proxy, esses parâmetros informam o Dolibarr como aceder à internet através dele.
 ExternalAccess=Acesso externo
-MAIN_PROXY_USE=Usar um servidor proxy (acesso direto à internet de outra forma)
-MAIN_PROXY_HOST=Nome / Endereço de servidor proxy
+MAIN_PROXY_USE=Utilizar um servidor proxy (se não, o acesso à internet é direto)
+MAIN_PROXY_HOST=Nome/Endereço de servidor proxy
 MAIN_PROXY_PORT=Porta do servidor proxy
-MAIN_PROXY_USER=Entrar para usar o servidor proxy
+MAIN_PROXY_USER=Inicie a sessão para usar o servidor proxy
 MAIN_PROXY_PASS=Palavra-passe para utilizar o servidor proxy
-DefineHereComplementaryAttributes=Defina aqui todos os atributos complementares, que não estejam disponiveis por padrão, e que deseja ser suporte para %s.
+DefineHereComplementaryAttributes=Defina aqui todos os atributos complementares, que não estejam disponíveis por defeito, e que deseja que seja suportado por %s.
 ExtraFields=Atributos complementares
 ExtraFieldsLines=Atributos complementares (linhas)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
+ExtraFieldsSupplierOrdersLines=Atributos complementares (linhas da encomenda)
+ExtraFieldsSupplierInvoicesLines=Atributos complementares (linhas da fatura)
 ExtraFieldsThirdParties=Atributos complementares (terceiro)
-ExtraFieldsContacts=Atributos complementares (contato/morada)
+ExtraFieldsContacts=Atributos complementares (contacto/morada)
 ExtraFieldsMember=Atributos complementares (membro)
 ExtraFieldsMemberType=Atributos complementares (tipo de membro)
 ExtraFieldsCustomerInvoices=Atributos complementares (faturas)
@@ -1063,308 +1091,318 @@ ExtraFieldsSupplierInvoices=Atributos complementares (faturas)
 ExtraFieldsProject=Atributos complementares (projetos)
 ExtraFieldsProjectTask=Atributos complementares (tarefas)
 ExtraFieldHasWrongValue=O atributo %s tem um valor errado.
-AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
-SendmailOptionNotComplete=Aviso, em alguns sistemas Linux, para enviar e-mails, a configuração sendmail  deve conter a opção ba-(mail.force_extra_parameters parâmetro em seu arquivo php.ini). Se alguns destinatários não receberem e-mails, tente editar este parâmetro PHP com mail.force_extra_parameters
+AlphaNumOnlyLowerCharsAndNoSpace=somente caracteres alfanuméricos e minúsculas, sem espaço
+SendmailOptionNotComplete=Aviso, em alguns sistemas Linux, para enviar emails, a configuração sendmail deve conter a opção -ba (o parâmetro mail.force_extra_parameters no seu ficheiro php.ini). Se alguns destinatários não receberem e-mails, tente editar este parâmetro PHP com mail.force_extra_parameters = -ba
 PathToDocuments=Caminhos de acesso a documentos
-PathDirectory=Catálogo
-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.
+PathDirectory=Diretório
+SendmailOptionMayHurtBuggedMTA=Funcionalidade para enviar e-mails usando o método "PHP mail direct" irá gerar uma mensagem de correio que poderá não ser lida corretamente por alguns servidores de e-mail. O resultado será que alguns e-mails não poderão ser lidos por utilizadores que usem essas plataformas com problemas. Isto é o caso de alguns fornecedores de Internet (Ex: MEO em Portugal). Este problema não está relacionado com o Dolibarr nem o PHP, mas sim com o servidor de correio que recebe os e-mails. No entanto, você pode adicionar a opção MAIN_FIX_FOR_BUGGED_MTA a 1 na configuração de forma contornar esta questão. No entanto, você pode ter problemas com outros servidores que respeitam estritamente o padrão SMTP. A outra solução (recomendada) é usar o método "SMTP socket library" que não traz desvantagens.
 TranslationSetup=Configuração da tradução
 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: <strong>User display setup</strong> tab of 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"
+TranslationDesc=Como definir o idioma exibido: <br>* Systemwide: menu <strong>Início -> Configuração -> Aspeto</strong><br>* Por utilizador: <strong>Configuração do aspeto por utilizador</strong> aba do cartão do utilizador (clique no nome de utlizador, localizado no topo do ecrã).
+TranslationOverwriteDesc=Você pode substituir as traduções na seguinte tabela. Escolha o seu idioma na caixa de seleção "%s", insira a chave tradução rm "%s" e sua nova tradução em "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
 CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists in any language files
+TotalNumberOfActivatedModules=Aplicação/módulos ativados: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Deve ativar, pelo menos, 1 módulo
-ClassNotFoundIntoPathWarning=Classe %s não encontrada no caminho PHP
+ClassNotFoundIntoPathWarning=A classe %s não foi encontrada no caminho PHP
 YesInSummer=Sim no verão
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Nota: apenas os seguintes módulos é que estão disponíveis a utilizadores externos (independentemente das permissões definidas para tais utilizadores) e somente se as permissões foram concedidas:
 SuhosinSessionEncrypt=Sessão de armazenamento encriptada por Suhosin
 ConditionIsCurrently=A condição está atualmente %s
-YouUseBestDriver=You use driver %s that is best driver available currently.
-YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization.
+YouUseBestDriver=Você está a utilizar a driver %s, sendo esta a melhor driver disponível atualmente.
+YouDoNotUseBestDriver=Você está a utilizar a driver %s, mas a driver %s é recomendada.
+NbOfProductIsLowerThanNoPb=Você apenas possui %s  produtos/serviços na base de dados. Assim sendo não é necessário qualquer tipo de otimização.
 SearchOptim=Optimização da pesquisa
-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.
-BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance.
-BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari.
+YouHaveXProductUseSearchOptim=Você possui %s produtos na base de dados. Deve adicionar a constante PRODUCT_DONOTSEARCH_ANYWHERE a 1 em Início->Configuração->Outros, assim limita a pesquisa ao início de sequências de caracteres tornando possível para a base de dados usar índices e você deve obter uma resposta imediata.
+BrowserIsOK=Você está utilizar o navegador %s. Este navegador não tem quaisquer problemas relacionados com segurança e desempenho.
+BrowserIsKO=Você está utilizar o navegador %s. Este navegador é conhecido por ter problemas a nível de segurança e desempenho. Recomendamos que utilize o Firefox, Chrome, Opera ou o Safari.
 XDebugInstalled=XDebug está carregado.
 XCacheInstalled=XCache está carregada.
-AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp".
-AskForPreferredShippingMethod=Ask for preferred Sending Method for Third Parties.
+AddRefInList=Exibir a referência do cliente/fornecedor na lista (lista de seleção) e na maioria das hiperligações. Os terceiros aparecerão com o nome "CC12345 - SC45678 - A grande empresa", em vez de apenas "A grande empresa".
+AskForPreferredShippingMethod=Perguntar pelo Método de Envio preferido para Terceiros
 FieldEdition=Edição do campo %s
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
+FillThisOnlyIfRequired=Exemplo: +2 (para preencher apenas se existir problemas de desvios de fuso horário)
 GetBarCode=Obter código de barras
 ##### Module password generation
-PasswordGenerationStandard=Devolve uma palavra-passe generada por o algoritmo interno ERP/CRM: 8 caracteres, números e caracteres em minúsculas misturados.
-PasswordGenerationNone=Não sugerir qualquer palavra-passe gerada. A palavra-passe deve ser digitada manualmente.
-PasswordGenerationPerso=Return a password according to your personally defined configuration.
-SetupPerso=According to your configuration
-PasswordPatternDesc=Password pattern description
+PasswordGenerationStandard=Devolve uma palavra-passe gerada pelo algoritmo interno Dolibarr: 8 caracteres no mínimo, contendo números e letras minúsculas.
+PasswordGenerationNone=Não sugerir qualquer palavra-passe gerada. A palavra-passe deve ser introduzida manualmente.
+PasswordGenerationPerso=Retornar uma palavra-passe que esteja de acordo com sua configuração definida.
+SetupPerso=De acordo com a sua configuração
+PasswordPatternDesc=Descrição do padrão da palavra-passe
 ##### Users setup #####
 RuleForGeneratedPasswords=Regra para gerar as palavras-passe sugeridas ou validar as palavras-passe
-DisableForgetPasswordLinkOnLogonPage=Não mostrar a hiperligação "Esquecer palavra-passe" na página de iniciar a sessão
-UsersSetup=Utilizadores de configuração do módulo
-UserMailRequired=Email exigidos para criar um novo utilizador
+DisableForgetPasswordLinkOnLogonPage=Não mostrar a hiperligação "Esqueceu-se da palavra-passe?" na página de inicio de sessão
+UsersSetup=Configuração do módulo "Utilizadores"
+UserMailRequired=O email é obrigatório para poder criar um novo utilizador
 ##### HRM setup #####
-HRMSetup=HRM module setup
+HRMSetup=Configuração do módulo "Gestão de Recursos Humanos"
 ##### Company setup #####
-CompanySetup=Configuração do módulo empresas
-CompanyCodeChecker=Módulo de geração e control dos códigos de Terceiros (Clientes/Fornecedores)
-AccountCodeManager=Módulo de geração dos códigos contabilisticos (Clientes/Fornecedores)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
+CompanySetup=Configuração do módulo "Empresas"
+CompanyCodeChecker=Módulo para criação e verificação dos códigos de terceiros (clientes ou fornecedores)
+AccountCodeManager=Módulo para criação dos códigos contabilísticos (clientes ou fornecedores)
+NotificationsDesc=O funcionalidade "Notificações por email" permite que você envie mensagens automáticas para alguns eventos Dolibarr. Os destinatários das notificações podem ser definidos:
 NotificationsDescUser=* per users, one user at time.
 NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=Documentos modelos
 DocumentModelOdt=Crie documentos a partir dos modelos OpenDocuments (ficheiros .ODT ou .ODS para o KOffice, OpenOffice, TextEdit,...)
-WatermarkOnDraft=Marca d&#39
-JSOnPaimentBill=Activate feature to autofill payment lines on payment form
-CompanyIdProfChecker=Identidade profissional única
+WatermarkOnDraft=Marca d'água no documento rascunho
+JSOnPaimentBill=Ative a funcionalidade para preencher automaticamente as linhas de pagamento no formulário de pagamento
+CompanyIdProfChecker=Regras sobre IDs profissionais
 MustBeUnique=Deve ser único?
 MustBeMandatory=Obrigatório para criar terceiros?
 MustBeInvoiceMandatory=Obrigatório para validar faturas?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
-WebCalUrlForVCalExport=Um link de exportação do calendario em formato <b>%s</b> estará disponivel na url: %s
+WebCalUrlForVCalExport=Uma hiperligação de exportação para o formato <b>%s</b> está disponivel na seguinte hiperligação: %s
 ##### Invoices #####
-BillsSetup=Configuração do módulo Facturas
-BillsNumberingModule=Módulo de numeração de facturas e entregas
-BillsPDFModules=Modelo de documentos de facturas
-CreditNote=Entrega
-CreditNotes=Entregas
-ForceInvoiceDate=Forçar a data de factura e a data de validação
-SuggestedPaymentModesIfNotDefinedInInvoice=Formas de pagamento sugeridas para facturas, estão definidas explicitamente
-SuggestPaymentByRIBOnAccount=Sugerir o pagamento por transfência para a conta
+BillsSetup=Configuração do módulo "Faturas"
+BillsNumberingModule=Módulo de numeração de faturas e entregas
+BillsPDFModules=Modelo de documentos de faturas
+PaymentsPDFModules=Payment documents models
+CreditNote=Nota de crédito
+CreditNotes=Notas de crédito
+ForceInvoiceDate=Forçar a data de factura para a data de validação
+SuggestedPaymentModesIfNotDefinedInInvoice=Formas de pagamento sugeridas para faturas por defeito, se não estiverem definidas explicitamente
+SuggestPaymentByRIBOnAccount=Sugerir o pagamento por levantamento na conta
 SuggestPaymentByChequeToAddress=Sugerir o pagamento por cheque a
-FreeLegalTextOnInvoices=Texto livre em facturas
-WatermarkOnDraftInvoices=Marca d'água nas faturas provisórias (nenhuma se em branco)
-PaymentsNumberingModule=Payments numbering model
-SuppliersPayment=Pagamentos a Fornecedores
+FreeLegalTextOnInvoices=Texto livre em faturas
+WatermarkOnDraftInvoices=Marca d'água nas faturas rascunho (nenhuma se em branco)
+PaymentsNumberingModule=Modelo de numeração de pagamentos
+SuppliersPayment=Pagamentos a fornecedores
 SupplierPaymentSetup=Suppliers payments setup
 ##### Proposals #####
-PropalSetup=Configuração do módulo Orçamentos
-ProposalsNumberingModules=Módulos de numeração de Orçamentos
-ProposalsPDFModules=Modelos de documentos de Orçamentos
-FreeLegalTextOnProposal=Texto livre em Orçamentos
-WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+PropalSetup=Configuração do módulo "Orçamentos para clientes"
+ProposalsNumberingModules=Modelos de numeração de orçamentos para clientes
+ProposalsPDFModules=Modelos de documentos de orçamentos para clientes
+FreeLegalTextOnProposal=Texto livre em orçamentos para clientes
+WatermarkOnDraftProposal=Marca d'água em rascunhos de orçamentos para clientes (nenhuma não preenchido)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Pedir conta bancária destinatária do orçamento
 ##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
-WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
+SupplierProposalSetup=Configuração do módulo "Solicitações de preço a fornecedores"
+SupplierProposalNumberingModules=Modelos de numeração para solicitações de preços a fornecedores
+SupplierProposalPDFModules=Modelos de documentos para solicitações de preços a fornecedores
+FreeLegalTextOnSupplierProposal=Texto livre em solicitações de preços a fornecedores
+WatermarkOnDraftSupplierProposal=Marca d'água nos documentos rascunho de solicitações de preços a fornecedores (nenhuma se vazio)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Pedir conta bancária destinatária da solicitação de preço
+WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Pedir qual o armazém origem para a encomenda
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
 ##### Orders #####
-OrdersSetup=Configuração do módulo pedidos
-OrdersNumberingModules=Módulos de numeração dos pedidos
-OrdersModelModule=Modelos de documentos dos pedidos
-FreeLegalTextOnOrders=Texto livre em pedidos
-WatermarkOnDraftOrders=Marca d'água nas encomendas provisórias (nenhuma se em branco)
-ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
+OrdersSetup=Configuração do módulo "Encomendas"
+OrdersNumberingModules=Modelos de numeração de encomendas
+OrdersModelModule=Modelos de documentos de encomendas
+FreeLegalTextOnOrders=Texto livre em encomendas
+WatermarkOnDraftOrders=Marca d'água nas encomendas rascunho (nenhuma se em branco)
+ShippableOrderIconInList=Adicionar um ícone na lista de Encomendas que indicam se o pedido pode ser expedido
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=Pedir conta bancária destinatária da encomenda
 ##### Interventions #####
-InterventionsSetup=Configuração do módulo Intervenções
-FreeLegalTextOnInterventions=Texto livre em  documentos de intervenção
-FicheinterNumberingModules=Módulos de numeração das fichas de intervenção
-TemplatePDFInterventions=Modelo de documentos das fichas de intervenção
-WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
+InterventionsSetup=Configuração do módulo "Intervenções"
+FreeLegalTextOnInterventions=Texto livre em documentos de intervenção
+FicheinterNumberingModules=Modelos de numeração de intervenções
+TemplatePDFInterventions=Modelo de documentos de intervenções
+WatermarkOnDraftInterventionCards=Marca d'água em documentos de intervenções (nenhum se vazio)
 ##### Contracts #####
-ContractsSetup=Configurar módulo de Contractos/Subscricões
-ContractsNumberingModules=Contratos de numeração módulos
-TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
+ContractsSetup=Configuração do módulo "Contratos/Subscrições"
+ContractsNumberingModules=Módulos de númeração de contratos
+TemplatePDFContracts=Modelos de documentos de contratos
+FreeLegalTextOnContracts=Texto livre em contratos
+WatermarkOnDraftContractCards=Marca d'água nos contratos rascunho (nenhuma se estiver vazio)
 ##### Members #####
-MembersSetup=Configuração do módulo de associações
+MembersSetup=Configuração do módulo "Membros"
 MemberMainOptions=Opções principais
-AdherentLoginRequired= Gerenciar um login para cada membro
-AdherentMailRequired=E-Mail obrigatório para criar um novo membro
-MemberSendInformationByMailByDefault=Caixa de verificação para enviar o correio de confirmação aos Membros é por defeito "sim"
+AdherentLoginRequired= Gerir um login para cada membro
+AdherentMailRequired=O email é obrigatório para criar um novo membro
+MemberSendInformationByMailByDefault=Selecione para enviar email de confirmação aos membros (validação ou nova subscrição), está ativada por defeito
 ##### LDAP setup #####
-LDAPSetup=Configuração do módulo LDAP
-LDAPGlobalParameters=parâmetros globais
+LDAPSetup=Configuração do módulo "LDAP"
+LDAPGlobalParameters=Parâmetros globais
 LDAPUsersSynchro=Utilizadores
 LDAPGroupsSynchro=Grupos
 LDAPContactsSynchro=Contactos
 LDAPMembersSynchro=Membros
 LDAPSynchronization=Sincronização LDAP
-LDAPFunctionsNotAvailableOnPHP=as funções LDAP não estão disponiveis no seu PHP
-LDAPToDolibarr=LDAP -> ERP/CRM
-DolibarrToLDAP=ERP/CRM -> LDAP
+LDAPFunctionsNotAvailableOnPHP=As funções LDAP não estão disponiveis no seu PHP
+LDAPToDolibarr=LDAP -> Dolibarr
+DolibarrToLDAP=Dolibarr -> LDAP
 LDAPNamingAttribute=Chave em LDAP
-LDAPSynchronizeUsers=Sincronização dos Utilizadores ERP/CRM com LDAP
-LDAPSynchronizeGroups=Sincronização dos grupos de Utilizadores  com LDAP
-LDAPSynchronizeContacts=Sincronização dos contactos ERP/CRM com LDAP
-LDAPSynchronizeMembers=Sincronização dos Membros do módulo associações de ERP/CRM com LDAP
+LDAPSynchronizeUsers=Sincronização dos utilizadores com LDAP
+LDAPSynchronizeGroups=Sincronização dos grupos de utilizadores com LDAP
+LDAPSynchronizeContacts=Sincronização dos contactos com LDAP
+LDAPSynchronizeMembers=Sincronização dos membros da fundação com LDAP
 LDAPPrimaryServer=Servidor primario
 LDAPSecondaryServer=Servidor secundario
 LDAPServerPort=Porta do servidor
-LDAPServerPortExample=Porta por defeito : 389
+LDAPServerPortExample=Porta predefinida : 389
 LDAPServerProtocolVersion=Versão de protocolo
-LDAPServerUseTLS=Utilizador TLS
-LDAPServerUseTLSExample=O seu servidor utiliza TLS
-LDAPServerDn=DN do servidor
+LDAPServerUseTLS=Utilizar TLS
+LDAPServerUseTLSExample=O seu servidor LDAP utiliza TLS
+LDAPServerDn=Servidor DN
 LDAPAdminDn=DN do administrador
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
+LDAPAdminDnExample=DN completo (ex: cn=admin,dc=example,dc=com ou cn=Administrator,cn=Users,dc=example,dc=com para o diretório ativo)
 LDAPPassword=Palavra-passe do Administrador
-LDAPUserDn=DN dos Utilizadores
-LDAPUserDnExample=DN completo (ej: ou
+LDAPUserDn=DN dos utilizadores
+LDAPUserDnExample=DN completo (ex: ou=users,dc=example,dc=com)
 LDAPGroupDn=DN dos grupos
-LDAPGroupDnExample=DN completo (ej: ou
-LDAPServerExample=Direcção do servidor (ej: localhost, 192.168.0.2, ldaps://ldap.example.com/)
-LDAPServerDnExample=DN completo (ej: dc
-LDAPDnSynchroActive=Sincronização de Utilizadores e Grupos
-LDAPDnSynchroActiveExample=Sincronização LDAP vs ERP/CRM ou ERP/CRM vs LDAP
+LDAPGroupDnExample=DN completo (ex: ou=groups,dc=example,dc=com)
+LDAPServerExample=Endereço do servidor (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
+LDAPServerDnExample=DN completo (ex: dc=example,dc=com)
+LDAPDnSynchroActive=Sincronização de utilizadores e grupos
+LDAPDnSynchroActiveExample=Sincronização LDAP para Dolibarr ou Dolibarr para LDAP
 LDAPDnContactActive=Sincronização de contactos
-LDAPDnContactActiveExample=Sincronização activada/desactivada
-LDAPDnMemberActive=Sincronização dos Membros
-LDAPDnMemberActiveExample=Sincronização activada/desactivada
-LDAPContactDn=DN dos contactos ERP/CRM
-LDAPContactDnExample=DN completo (ej: ou
-LDAPMemberDn=DN dos Membros
-LDAPMemberDnExample=DN completo (ex: ou
+LDAPDnContactActiveExample=Sincronização ativada/desativada
+LDAPDnMemberActive=Sincronização de membros
+LDAPDnMemberActiveExample=Sincronização ativada/desativada
+LDAPContactDn=DN dos contactos Dolibarr
+LDAPContactDnExample=DN completo (ex: ou=contacts,dc=example,dc=com)
+LDAPMemberDn=DN dos membros Dolibarr
+LDAPMemberDnExample=DN completo (ex: ou=members,dc=example,dc=com)
 LDAPMemberObjectClassList=Lista de objectClass
-LDAPMemberObjectClassListExample=Lista de ObjectClass que definem os atributos de um registo (ej: top,inetOrgPerson o top,user for active directory)
+LDAPMemberObjectClassListExample=Lista de objectClass que definem os atributos de registo (ex: top,inetOrgPerson or top,user for active directory)
 LDAPUserObjectClassList=Lista de objectClass
-LDAPUserObjectClassListExample=Lista de ObjectClass que definem os atributos de um registo (ej: top,inetOrgPerson o top,user for active directory)
+LDAPUserObjectClassListExample=Lista de objectClass que definem os atributos de registo (ex: top,inetOrgPerson or top,user for active directory)
 LDAPGroupObjectClassList=Lista de objectClass
-LDAPGroupObjectClassListExample=Lista de ObjectClass que definem os atributos de um registo (ej: top,groupOfUniqueNames)
+LDAPGroupObjectClassListExample=Lista de objectClass que definem os atributos de registo (ex: top,groupOfUniqueNames)
 LDAPContactObjectClassList=Lista de objectClass
-LDAPContactObjectClassListExample=Lista de objectClass que definem os atributos de um registo (ej: top,inetOrgPerson o top,user for active directory)
-LDAPTestConnect=Teste a ligação LDAP
+LDAPContactObjectClassListExample=Lista de objectClass que definem os atributos de registo (ex: top,inetOrgPerson or top,user for active directory)
+LDAPTestConnect=Testar a ligação LDAP
 LDAPTestSynchroContact=Teste a sincronização de contactos
-LDAPTestSynchroUser=Teste a sincronização de Utilizadores
-LDAPTestSynchroGroup=Teste a sincronização de grupos
-LDAPTestSynchroMember=Teste a sincronização de Membros
+LDAPTestSynchroUser=Testar a sincronização de utilizadores
+LDAPTestSynchroGroup=Testar a sincronização de grupos
+LDAPTestSynchroMember=Testar a sincronização de membros
 LDAPTestSearch= Testar pesquisa LDAP
-LDAPSynchroOK=Teste de sincronização realizado correctamente
-LDAPSynchroKO=Teste de sincronização errado
-LDAPSynchroKOMayBePermissions=Erro do teste de sincronização. verifique que a ligação ao servidor está correcta e que permite as actualizações LDAP
-LDAPTCPConnectOK=Ligação TCP ao servidor LDAP efectuada (Servidor
-LDAPTCPConnectKO=Falha de ligação TCP ao servidor LDAP (Servidor
-LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPBindKO=Fallo de ligação/autenticação ao servidor LDAP (Servidor
-LDAPSetupForVersion3=Servidor LDAP configurado em Versão 3
-LDAPSetupForVersion2=Servidor LDAP configurado em Versão 2
-LDAPDolibarrMapping=Mapping ERP/CRM
-LDAPLdapMapping=Mapping LDAP
-LDAPFieldLoginUnix=Login (unix)
-LDAPFieldLoginExample=Exemplo : uid
+LDAPSynchroOK=Teste de sincronização realizado com sucesso
+LDAPSynchroKO=O teste de sincronização falhou
+LDAPSynchroKOMayBePermissions=O teste de sincronização falhou. Verifique se ligação ao servidor está correctamente configurada e que permite atualizações LDAP
+LDAPTCPConnectOK=Ligação TCP ao servidor LDAP efectuada com sucesso (Servidor=%s, Porta=%s)
+LDAPTCPConnectKO=Falha de ligação TCP ao servidor LDAP (Servidor=%s, Porta=%s)
+LDAPBindOK=Conexão/Autenticação ao servidor LDAP efetuada com êxito (Servidor=%s, Porta=%s, Admin=%s, Palavra passe=%s)
+LDAPBindKO=A ligação/autenticação ao servidor LDAP falhou (Servidor=%s, Porta=%s, Administrador=%s, Palavra-passe=%s)
+LDAPSetupForVersion3=Servidor LDAP configurado para a versão 3
+LDAPSetupForVersion2=Servidor LDAP configurado para a versão 2
+LDAPDolibarrMapping=Mapeamento Dolibarr
+LDAPLdapMapping=Mapeamento LDAP
+LDAPFieldLoginUnix=Nome de utilizador (Unix)
+LDAPFieldLoginExample=Exemplo: uid
 LDAPFilterConnection=Filtro de pesquisa
-LDAPFilterConnectionExample=Exemplo : &(objectClass
-LDAPFieldLoginSamba=Login (samba, activedirectory)
-LDAPFieldLoginSambaExample=Exemplo : Nome da conta samba
+LDAPFilterConnectionExample=Exemplo: &(objectClass=inetOrgPerson)
+LDAPFieldLoginSamba=Nome de utilizador (samba, activedirectory)
+LDAPFieldLoginSambaExample=Exemplo: sambaccountname
 LDAPFieldFullname=Nome completo
-LDAPFieldFullnameExample=Exemplo : cn
+LDAPFieldFullnameExample=Exemplo: cn
 LDAPFieldPasswordNotCrypted=Palavra-passe não encriptada
 LDAPFieldPasswordCrypted=Palavra-passe encriptada
-LDAPFieldPasswordExample=Exemplo : userPassword
-LDAPFieldCommonNameExample=Exemplo : cn
+LDAPFieldPasswordExample=Exemplo: userPassword
+LDAPFieldCommonNameExample=Exemplo: cn
 LDAPFieldName=Nome
-LDAPFieldNameExample=Exemplo : sn
-LDAPFieldFirstName=Nome
-LDAPFieldFirstNameExample=Exemplo : dar nome
-LDAPFieldMail=E-Mail
-LDAPFieldMailExample=Exemplo : mail
-LDAPFieldPhone=Telefone trabalho
-LDAPFieldPhoneExample=Exemplo : Número do telefone
-LDAPFieldHomePhone=Telefone pessoal
-LDAPFieldHomePhoneExample=Exemplo : Telefone casa
-LDAPFieldMobile=Telefone móvel
-LDAPFieldMobileExample=Exemplo : Telemóvel
-LDAPFieldFax=Fax
-LDAPFieldFaxExample=Exemplo :numero de telefone de fax
-LDAPFieldAddress=Direcção
-LDAPFieldAddressExample=Exemplo : rua
+LDAPFieldNameExample=Exemplo: sn
+LDAPFieldFirstName=Primeiro nome
+LDAPFieldFirstNameExample=Exemplo: givenName
+LDAPFieldMail=Endereço de email
+LDAPFieldMailExample=Exemplo: mail
+LDAPFieldPhone=Número de telefone profissional
+LDAPFieldPhoneExample=Exemplo: telephonenumber
+LDAPFieldHomePhone=Número de telefone pessoal
+LDAPFieldHomePhoneExample=Exemplo: homephone
+LDAPFieldMobile=Número de telemóvel
+LDAPFieldMobileExample=Exemplo: mobile
+LDAPFieldFax=Número de fax
+LDAPFieldFaxExample=Exemplo: facsimiletelephonenumber
+LDAPFieldAddress=Rua
+LDAPFieldAddressExample=Exemplo: street
 LDAPFieldZip=Código postal
-LDAPFieldZipExample=Exemplo : Código postal
-LDAPFieldTown=Concelho
-LDAPFieldTownExample=Exemplo : l
+LDAPFieldZipExample=Exemplo: postalcode
+LDAPFieldTown=Cidade
+LDAPFieldTownExample=Exemplo: l
 LDAPFieldCountry=País
 LDAPFieldDescription=Descrição
-LDAPFieldDescriptionExample=Exemplo : descrição
+LDAPFieldDescriptionExample=Exemplo: description
 LDAPFieldNotePublic=Nota Pública
-LDAPFieldNotePublicExample=Example : publicnote
-LDAPFieldGroupMembers= Os membros do grupo
-LDAPFieldGroupMembersExample= Exemplo: Membro único
+LDAPFieldNotePublicExample=Exemplo : publicnote
+LDAPFieldGroupMembers= Membros do grupo
+LDAPFieldGroupMembersExample= Exemplo: uniqueMember
 LDAPFieldBirthdate=Data de nascimento
 LDAPFieldCompany=Empresa
 LDAPFieldCompanyExample=Exemplo : o
 LDAPFieldSid=SID
-LDAPFieldSidExample=Exemplo : objecto sid
-LDAPFieldEndLastSubscription=Data finalização como membro
-LDAPFieldTitle=Posição de trabalho
-LDAPFieldTitleExample=Exemplo: título
-LDAPSetupNotComplete=Configuração LDAP incompleta (a completar em Outras pestañas)
+LDAPFieldSidExample=Exemplo : objectsid
+LDAPFieldEndLastSubscription=Data de fim da subscrição
+LDAPFieldTitle=Cargo
+LDAPFieldTitleExample=Exemplo: title
+LDAPSetupNotComplete=Configuração LDAP incompleta
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Não foi indicado o administrador ou palavra-passe. Os acessos LDAP serão anónimos e no modo só de leitura.
-LDAPDescContact=Esta página permite definir o Nome dos atributos da árvore LDAP para cada informação dos contactos ERP/CRM.
-LDAPDescUsers=Esta página permite definir o Nome dos atributos da árvore LDAP para cada informação dos Utilizadores ERP/CRM.
-LDAPDescGroups=Esta página permite definir o Nome dos atributos da árvore LDAP para cada informação dos grupos Utilizadores ERP/CRM.
-LDAPDescMembers=Esta página permite definir o Nome dos atributos da árvore LDAP para cada informação dos Membros do módulo associações ERP/CRM.
-LDAPDescValues=Os valores de Exemplo adaptam-se a <b>OpenLDAP</b> com os esquemas cargados: <b>core.schema, cosine.schema, inetorgperson.schema</b>). Utilize os valores sugeridos de OpenLDAP, modifique o seu ficheiro de configuração LDAP <b>slapd.conf</b> para ter estes esquemas activos.
+LDAPDescContact=Esta página permite definir o nome dos atributos da árvore LDAP para cada contacto registado no Dolibarr.
+LDAPDescUsers=Esta página permite definir o nome dos atributos da árvore LDAP para cada utilizador registado no Dolibarr.
+LDAPDescGroups=Esta página permite definir o nome dos atributos da árvore LDAP para cada grupo registado no Dolibarr.
+LDAPDescMembers=Esta página permite definir o Nome dos atributos da árvore LDAP para cada membro registado no Dolibarr.
+LDAPDescValues=Os valores de exemplo foram construídos para o <b>OpenLDAP</b> com os seguintes esquemas carregados: <b>core.schema, cosine.schema, inetorgperson.schema</b>. Se você utiliza esses valores e o OpenLDAP, então modifique o seu ficheiro de configuração LDAP, <b>slapd.conf</b>, para carregar todos esses esquemas.
 ForANonAnonymousAccess=Para um acesso autentificado
-PerfDolibarr=Performance setup/optimizing report
-YouMayFindPerfAdviceHere=You will find on this page some checks or advices related to performance.
+PerfDolibarr=Relatório de configuração/otimização de desempenho
+YouMayFindPerfAdviceHere=Nesta página encontrará algumas dicas relacionadas com desempenho.
 NotInstalled=Não instalado, o servidor não está mais lento por isso.
-ApplicativeCache=Cache aplicativa
-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=Cache de OPCode
-NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad).
+ApplicativeCache=Cache de aplicativo
+MemcachedNotAvailable=Não foi encontrada cache de aplicativo. Você pode melhorar o desempenho através da instalação de um servidor de cache Memcached e um módulo capaz de utilizar este servidor de cache.<br>Mais informações em  <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note que muitos fornecedores de hospedagem web não fornece tais servidores de cache.
+MemcachedModuleAvailableButNotSetup=Encontrado módulo memcached para cache de aplicativo, mas a configuração deste não está completa.
+MemcachedAvailableAndSetup=O módulo memcached dedicado está ativo.
+OPCodeCache=Cache OPCode
+NoOPCodeCacheFound=Nenhuma cache OPCode encontrada. Pode ser que você utilize outro tipo de cache OPCode sem ser XCache ou eAccelerator, pode ser que você não tenha cache OPCode.
 HTTPCacheStaticResources=Cache HTTP para recursos estáticos (css, img, javascript)
 FilesOfTypeCached=Ficheiros do tipo %s são guardados na cache do servidor HTTP
 FilesOfTypeNotCached=Ficheiros do tipo %s não são guardados na cache do servidor HTTP
 FilesOfTypeCompressed=Ficheiros do tipo %s são comprimidos pelo servidor HTTP
 FilesOfTypeNotCompressed=Ficheiros do tipo %s não são comprimidos pelo servidor HTTP
 CacheByServer=Cache pelo servidor
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache pelo navegador
 CompressionOfResources=Compressão das respostas HTTP
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
+CompressionOfResourcesDesc=For exemple using the Apache directive "AddOutputFilterByType DEFLATE"
+TestNotPossibleWithCurrentBrowsers=A detecção automática não é possível com os navegadores atuais
+DefaultValuesDesc=You can define/force here the default value you want to get when your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
-ProductSetup=Configuração do módulo produtos
-ServiceSetup=Serviços de instalação do módulo
-ProductServiceSetup=Produtos e Serviços de instalação de módulos
-NumberOfProductShowInSelect=Nº de produtos max em listas (0
-ViewProductDescInFormAbility=Visualização das descrições dos produtos nos formularios
-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 third party language
-UseSearchToSelectProductTooltip=Also if you have a large number of product (> 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)
-SetDefaultBarcodeTypeProducts=Tipo de código de barras utilizado por defeito para os produtos
-SetDefaultBarcodeTypeThirdParties=Tipo de código de barras utilizado por defeito para os Terceiros
-UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
-ProductCodeChecker= Module for product code generation and checking (product or service)
-ProductOtherConf= Configuração de Produtos/Serviços
-IsNotADir=is not a directory!
+ProductSetup=Configuração do módulo "Produtos"
+ServiceSetup=Configuração do módulo "Serviços"
+ProductServiceSetup=Configuração do módulo "Produtos e Serviços"
+NumberOfProductShowInSelect=Nº máximo de produtos apresentados em listas (0=sem limite)
+ViewProductDescInFormAbility=Visualização das descrições dos produtos nos formulários (de outra forma serão apresentados em popups)
+MergePropalProductCard=Ative na aba "Ficheiros anexados" do cartão de produto/serviço a opção para unir o documento PDF do produto/serviço ao documento PDF do orçamento, isto se o produto/serviço se encontrar no orçamento
+ViewProductDescInThirdpartyLanguageAbility=Visualização das descrições de produtos na língua do terceiro
+UseSearchToSelectProductTooltip=Se você tiver grande número de produtos (> 100 000), você pode aumentar a velocidade, definindo a constante PRODUCT_DONOTSEARCH_ANYWHERE para 1 em Configuração -> Outros. A pesquisa será então limitada ao início da sequência de caracteres.
+UseSearchToSelectProduct=Aguardar até que seja preenchido parte do campo antes de carregar o conteúdo da lista de produtos (isto pode aumentar o desempenho se você tiver um grande número de produtos, mas é menos conveniente)
+SetDefaultBarcodeTypeProducts=Tipo de código de barras predefinido para produtos
+SetDefaultBarcodeTypeThirdParties=Tipo de código de barras predefinido para terceiros
+UseUnits=Defina uma unidade de medida para o campo "Quantidade" durante a edição de uma encomenda, orçamento ou fatura
+ProductCodeChecker= Modelo para a produção e verificação de códigos de produto (produto ou serviço)
+ProductOtherConf= Configuração de produto/serviço
+IsNotADir=não é um diretório!
 ##### Syslog #####
-SyslogSetup=configuração do módulo Syslog
-SyslogOutput=Sair do log
+SyslogSetup=Configuração do módulo "Syslog"
+SyslogOutput=Regista saídas
 SyslogFacility=Facilidade
-SyslogLevel=Nivel
-SyslogFilename=Nome e caminho do Ficheiro
-YouCanUseDOL_DATA_ROOT=Pode utilizar DOL_DATA_ROOT/dolibarr.log para um log na pasta 'documentos' de Dolibarr.
-ErrorUnknownSyslogConstant=A constante %s não é uma constante syslog conhecida
-OnlyWindowsLOG_USER=O Windows suporta apenas LOG_USER
+SyslogLevel=Nível
+SyslogFilename=Nome e caminho do ficheiro
+YouCanUseDOL_DATA_ROOT=Pode utilizar DOL_DATA_ROOT/dolibarr.log para um ficheiro log no diretório de "documentos" do Dolibarr.
+ErrorUnknownSyslogConstant=A constante %s não é uma constante Syslog conhecida
+OnlyWindowsLOG_USER=O Windows apenas suporta LOG_USER
 ##### Donations #####
-DonationsSetup=Configuração do módulo Bolsas
-DonationsReceiptModel=Modelo de recibo de doação
+DonationsSetup=Configuração do módulo "Donativos"
+DonationsReceiptModel=Modelo de recibo de donativo
 ##### Barcode #####
-BarcodeSetup=Configuração dos códigos de barras
-PaperFormatModule=Módulos de formatos de impressão
-BarcodeEncodeModule=Módulos de codificação dos códigos de barras
-CodeBarGenerator=Gerador do código
-ChooseABarCode=Nenhum gerador seleccionado
-FormatNotSupportedByGenerator=Formato não gerado por este gerador
+BarcodeSetup=Configuração de códigos de barras
+PaperFormatModule=Módulo de formatos de impressão
+BarcodeEncodeModule=Tipo de codificação de códigos de barras
+CodeBarGenerator=Gerador do códigos de barras
+ChooseABarCode=Nenhum gerador definido
+FormatNotSupportedByGenerator=Formato não suportado por este gerador
 BarcodeDescEAN8=Códigos de barras tipo EAN8
 BarcodeDescEAN13=Códigos de barras tipo EAN13
 BarcodeDescUPC=Códigos de barras tipo UPC
@@ -1373,284 +1411,285 @@ BarcodeDescC39=Códigos de barras tipo C39
 BarcodeDescC128=Códigos de barras tipo C128
 BarcodeDescDATAMATRIX=Código de barras do tipo Datamatrix
 BarcodeDescQRCODE=Código de barras do tipo QR
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
+GenbarcodeLocation=Ferramenta da linha de comandos para a produção de códigos de barras (usado pelo motor interno para alguns tipos de códigos de barras). Deve ser compatível com "genbarcode".<br>Por exemplo: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Motor interno
-BarCodeNumberManager=Manager to auto define barcode numbers
+BarCodeNumberManager=Gestor para definir automaticamente números de código de barras
 ##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct debit payment orders
+WithdrawalsSetup=Configuração do módulo de "Ordens de pagamento por débito directo"
 ##### ExternalRSS #####
-ExternalRSSSetup=Configuração das importacções do fluxo RSS
-NewRSS=Gravação de um Novo fluxo RSS
-RSSUrl=Endereço RSS
+ExternalRSSSetup=Configuração das importações de feeds RSS externos
+NewRSS=Novo feed RSS
+RSSUrl=Endereço do feed RSS
 RSSUrlExample=Um feed RSS interessante
 ##### Mailing #####
-MailingSetup=configuração do módulo E-Mailing
-MailingEMailFrom=E-Mail emissor (From) dos correios enviados por E-Mailing
-MailingEMailError=Retorno EMail (Erros a) para e-mails com erros
-MailingDelay=Seconds to wait after sending next message
+MailingSetup=Configuração do módulo "Emailing"
+MailingEMailFrom=Email do emissor (From) para emails enviados através do módulo emailing
+MailingEMailError=Email de retorno (Erros a) para emails com erros
+MailingDelay=Segundos a esperar antes de enviar a próxima mensagem
 ##### Notification #####
-NotificationSetup=Configurar módulo da notificação de mensagem
-NotificationEMailFrom=E-Mail emissor (From) dos correios enviados a traves de Notificações
-FixedEmailTarget=Fixed email target
+NotificationSetup=Configuração do módulo "Notificação por email"
+NotificationEMailFrom=Email emissor (From) para emails enviados de notificações
+FixedEmailTarget=Destinatário fixo de emails
 ##### Sendings #####
-SendingsSetup=Configuração do módulos envíos
-SendingsReceiptModel=Modelo da ficha de expedição
+SendingsSetup=Configuração do módulo "Envios"
+SendingsReceiptModel=Modelo do recibo de expedição
 SendingsNumberingModules=Envios módulos numerados
-SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
+SendingsAbility=Suporte para guias de transporte para entregas a clientes
+NoNeedForDeliveryReceipts=Na maioria dos casos, as guias de transporte são usadas tanto como folhas para entregas do cliente (lista de produtos para enviar), como folhas que são recebidas e assinadas pelo cliente. Deste modo, os recibos de entregas de produtos são uma funcionalidade duplicada e raramente é ativada.
 FreeLegalTextOnShippings=Texto livre nas expedições
 ##### Deliveries #####
-DeliveryOrderNumberingModules=Módulo de numeração dos envios a clientes
-DeliveryOrderModel=Modelo de ordem de envío
-DeliveriesOrderAbility=Portes pagos pelo cliente
-FreeLegalTextOnDeliveryReceipts=Texto livre em notas de entregas.
+DeliveryOrderNumberingModules=Módulo de numeração de notas de entrega de produtos
+DeliveryOrderModel=Modelo de nota de entrega de produtos
+DeliveriesOrderAbility=Notas de entrega para produtos de suporte
+FreeLegalTextOnDeliveryReceipts=Texto livre em notas de entregas
 ##### FCKeditor #####
-AdvancedEditor=Edição avançada
-ActivateFCKeditor=Activar FCKeditor para :
-FCKeditorForCompany=Criação/Edição WYSIWIG da descrição e notas dos Terceiros
+AdvancedEditor=Editor avançado
+ActivateFCKeditor=Ativar editor avançado para:
+FCKeditorForCompany=Criação/Edição WYSIWIG da descrição e notas de elementos (exceto produtos/services)
 FCKeditorForProduct=Criação/Edição WYSIWIG da descrição e notas dos produtos/serviços
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files.</font>
-FCKeditorForMailing= Criação/Edição WYSIWIG dos E-Mails
-FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
+FCKeditorForProductDetails=Edição/criação WYSIWIG dos detalhes produtos para todas as entidades (orçamentos, encomendas, faturas, etc.). <font class="warning">Aviso: Usar esta opção para este caso é muito pouco recomendado, isto porque pode criar problemas relacionados com caracteres especiais e formatação durante a criação de ficheiros PDF.</font>
+FCKeditorForMailing= Criação/Edição WYSIWIG para emails em massa (Ferramentas->eMailing)
+FCKeditorForUserSignature=Criação/Edição WYSIWIG da assinatura do utilizador
+FCKeditorForMail=Criação/Edição WYSIWIG para todo o correio (exceto Ferramentas->eMailling)
 ##### OSCommerce 1 #####
-OSCommerceErrorConnectOkButWrongDatabase=A ligação foi establecida, mas a base de dados não parece de OSCommerce.
-OSCommerceTestOk=A ligação ao servidor '%s' sobre a base '%s' pelo Utilizador '%s' está correcta.
-OSCommerceTestKo1=A ligação ao servidor '%s' sobre a base '%s' por o Utilizador '%s' não se pode efectuar.
-OSCommerceTestKo2=A ligação ao servidor '%s' pelo Utilizador '%s'  falhou.
+OSCommerceErrorConnectOkButWrongDatabase=A ligação foi establecida, mas a base de dados não parece ser de OSCommerce (A chave %s não foi encontrada na tabela %s).
+OSCommerceTestOk=A ligação ao servidor '%s' à base de dados '%s' através do utilizador '%s' foi efetuada com sucesso.
+OSCommerceTestKo1=A ligação ao servidor '%s' foi efetuada com sucesso, no entanto não foi possível comunicar com a base de dados '%s'.
+OSCommerceTestKo2=A ligação ao servidor '%s' através do utilizador '%s'  não foi possível.
 ##### Stock #####
-StockSetup=Warehouse module setup
+StockSetup=Configuração do módulo "Armazém"
 IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
 ##### Menu #####
-MenuDeleted=Menu Eliminado
+MenuDeleted=Menu eliminado
 Menus=Menus
 TreeMenuPersonalized=Menus personalizados
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
-NewMenu=Novo Menu
-Menu=Selecção dos menus
+NewMenu=Novo menu
+Menu=Seleção do menu
 MenuHandler=Gestor de menus
 MenuModule=Módulo origem
 HideUnauthorizedMenu= Ocultar menus não autorizados (cinza)
-DetailId=Identificador do menu
-DetailMenuHandler=Nome do gestor de menus
-DetailMenuModule=Nome do módulo,  a entrada do menu é resultante de um módulo
+DetailId=Id do menu
+DetailMenuHandler=Gestor de menus onde será exibido o novo menu
+DetailMenuModule=Nome do módulo, no caso da entrada do menu ser resultante de um módulo
 DetailType=Tipo de menu (superior ou esquerdo)
-DetailTitre=Etiqueta do menu
-DetailUrl=URL da página para a qual o menu aponta
-DetailEnabled=Condição para mostrar ou não a entrada
-DetailRight=Condição de visualização completa ou cristálida
-DetailLangs=Ficheiro langs para a tradução do título
+DetailTitre=Etiqueta do menu ou código da etiqueta para tradução
+DetailUrl=URL da página para a qual o menu aponta (URL absoluto or hiperligação externa com http://)
+DetailEnabled=Condição para mostrar, ou não, a entrada
+DetailRight=Condição para mostrar menus cinza não autorizados
+DetailLangs=Nome do ficheiro. lang para a tradução de códigos de etiquetas
 DetailUser=Interno / Externo / Todos
 Target=Alvo
-DetailTarget=Objectivo
+DetailTarget=Alvo para hiperligações (_blank para abrir numa nova janela)
 DetailLevel=Nivel (-1:menu superior, 0:principal, >0 menu e submenu)
 ModifMenu=Modificação do menu
 DeleteMenu=Eliminar entrada de menu
-ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
-FailedToInitializeMenu=Failed to initialize menu
+ConfirmDeleteMenu=Tem a certeza que deseja eliminar a entrada de menu <b>%s</b> ?
+FailedToInitializeMenu=Falha ao inicializar o menu
 ##### Tax #####
-TaxSetup=Taxes, social or fiscal taxes and dividends module setup
-OptionVatMode=Opção de carga de IVA
-OptionVATDefault=Cash basis
-OptionVATDebitOption=Accrual basis
-OptionVatDefaultDesc=A carga do IVA é: <br>-ao envio dos bens <br>-sobre o pagamento dos serviços
-OptionVatDebitOptionDesc=A carga do IVA é: <br>-ao envío dos bens <br>-sobre a facturação dos serviços
-SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
+TaxSetup=Configuração do módulo "Impostos, impostos sociais ou fiscais e dividendos"
+OptionVatMode=Aplicação do IVA
+OptionVATDefault=Regime de caixa
+OptionVATDebitOption=Regime de competência
+OptionVatDefaultDesc=O IVA é aplicado:<br>- ao envio dos bens (é utilizada a data da fatura)<br>- sobre o pagamento dos serviços
+OptionVatDebitOptionDesc=O IVA é aplicado:<br>- ao envio dos bens (é utilizada a data da fatura)<br>- sobre a faturação (débito) dos serviços
+SummaryOfVatExigibilityUsedByDefault=Tempo de exigibilidade do IVA prédefinido, de acordo com a opção escolhida:
 OnDelivery=Na entrega
-OnPayment=Pagamento
-OnInvoice=Em factura
-SupposedToBePaymentDate=Data de pagamento utilizada, se não souber a data de entrega
-SupposedToBeInvoiceDate=Data da factura usada
+OnPayment=No pagamento
+OnInvoice=Na fatura
+SupposedToBePaymentDate=Data de pagamento utilizada
+SupposedToBeInvoiceDate=Data da fatura usada
 Buy=Comprar
 Sell=Vender
-InvoiceDateUsed=Data da factura usada
-YourCompanyDoesNotUseVAT=Sua empresa não tem configuração definida para usar o IVA (Home - Setup - Empresa / Fundação), pelo que não há opções de configuração do IVA.
+InvoiceDateUsed=Data da fatura usada
+YourCompanyDoesNotUseVAT=Sua empresa não tem configuração definida para usar o IVA (Home - Configuração - Empresa/Organização), pelo que não há opções de configuração do IVA.
 AccountancyCode=Código de Contabilidade
-AccountancyCodeSell=Código da conta de Vendas
-AccountancyCodeBuy=Código da conta de Compras
+AccountancyCodeSell=Código de contabilidade de vendas
+AccountancyCodeBuy=Código de contabilidade de compras
 ##### Agenda #####
-AgendaSetup=Módulo configuração de acções e agenda
+AgendaSetup=Configuração do módulo "Eventos e agenda"
 PasswordTogetVCalExport=Chave de autorização para exportação do link vcal.
 PastDelayVCalExport=Não exportar evento com mais de
-AGENDA_USE_EVENT_TYPE=Use events types (managed into menu Setup -> Dictionary -> 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_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_USE_EVENT_TYPE=Usar tipos de eventos (gerido através do menu Configuração -> Dicionário -> Tipo de eventos da agenda)
+AGENDA_USE_EVENT_TYPE_DEFAULT=Definir este valor automaticamente como o valor predefinido para o campo tipo de evento, no formulário de criação de evento
+AGENDA_DEFAULT_FILTER_TYPE=Definir automaticamente este tipo de evento no filtro de pesquisa da vista agenda
+AGENDA_DEFAULT_FILTER_STATUS=Definido automaticamente este estado para eventos no filtro de pesquisa da vista agenda
+AGENDA_DEFAULT_VIEW=Qual é a aba que você deseja abrir por defeito quando seleciona o menu "Agenda"
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
-ClickToDialSetup=Configuração do módulo Click To Dial
-ClickToDialUrlDesc=Efectue uma chamada, fazendo click no icon (URL) do telefone . <br>a 'url completa da chamada será: URL?login
-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.
-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 same computer than 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.
+ClickToDialSetup=Configuração do módulo "Click To Dial"
+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=Este módulo torna os números de telefone clicáveis. Um clique neste ícone fará com que o seu telefone ligue para o número de telefone. Isto pode ser usado para chamar um sistema de call-center a partir do Dolibarr que por sua vez pode ligar ao número de telefone num sistema SIP, por exemplo.
+ClickToDialUseTelLink=Usar apenas um link "tel:" em números de telefone
+ClickToDialUseTelLinkDesc=Utilize este método se os utilizadores têm um softphone ou uma interface de software instalado no mesmo computador que o navegador e efetua uma chamada quando você clica em links que começam com "tel:". Se você precisa de uma solução de servidor (sem necessidade de instalação de software local), você deve definir este como "Não" e preencher o próximo campo.
 ##### Point Of Sales (CashDesk) #####
 CashDesk=Pontos de vendas
-CashDeskSetup=Configuração do módulo de Caixa Registadora
-CashDeskThirdPartyForSell=Default generic third party to use for sells
-CashDeskBankAccountForSell=Conta de efectivo que se utilizará para as vendas
+CashDeskSetup=Configuração do módulo "Ponto de vendas"
+CashDeskThirdPartyForSell=Terceiro genérico a usar para as vendas
+CashDeskBankAccountForSell=Conta a ser usada para receber pagamentos em dinheiro
 CashDeskBankAccountForCheque= Conta a ser usada para receber pagamentos através de cheques
-CashDeskBankAccountForCB= Conta a ser usada para receber pagamentos em dinheiro ou por cartões de crédito
-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).
-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
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
+CashDeskBankAccountForCB= Conta a ser usada para receber pagamentos por cartões de crédito
+CashDeskDoNotDecreaseStock=Decréscimo de stock quando é efetuada uma venda a partir do Ponto de Venda desativado  (se "não", o decréscimo do stock e feito após cada venda, para qualquer opção definida no módulo "Stock")
+CashDeskIdWareHouse=Forçar e restringir o armazém a usar para o decréscimo de stock
+StockDecreaseForPointOfSaleDisabled=Decréscimo de stock a partir do Ponto de Venda desativado
+StockDecreaseForPointOfSaleDisabledbyBatch=Decréscimo de stock a partir do Ponto de Venda não é compatível com a gestão de lotes
+CashDeskYouDidNotDisableStockDecease=Não desativou o decréscimo de stock para quando é efetuada uma venda a partir do Ponto de Venda, como tal é necessário ter um armazém definido.
 ##### Bookmark #####
-BookmarkSetup=Configuração do Modulo de Favoritos
-BookmarkDesc=Este módulo  permite gerir as ligações e acessos directos. Também permite adicionar qualquer página do ERP/CRM ou o link web ao menu de acesso rápido na esquerda.
-NbOfBoomarkToShow=Número máximo de marcadores que se mostra no menu
+BookmarkSetup=Configuração do módulo "Marcadores"
+BookmarkDesc=Este módulo permite gerir os marcadores. Também permite adicionar qualquer página do Dolibarr ou links externos ao menu de acesso rápido na esquerda.
+NbOfBoomarkToShow=Número máximo de marcadores a mostrar no menu esquerdo
 ##### WebServices #####
-WebServicesSetup=Webservices módulo configuração
-WebServicesDesc=Ao permitir a este módulo, ERP/CRM tornar-se um serviço de servidor web para fornecer diversos serviços da web.
-WSDLCanBeDownloadedHere=WSDL descritor de arquivo desde serviços pode ser fazer o download aqui
-EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
+WebServicesSetup=Configuração do módulo "Webservices"
+WebServicesDesc=Ao ativar a este módulo, o Dolibarr torna-se num servidor de web services para fornecer diversos serviços da web.
+WSDLCanBeDownloadedHere=Os ficheiros descritores WSDL de serviços fornecidos pode ser descarregado aqui
+EndPointIs=Clientes SOAP devem enviar os seus pedidos à Dolibarr disponível no URL
 ##### API ####
-ApiSetup=Configurar módulo API
-ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=Pode explorar as APIs na url
-OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiSetup=Configuração do módulo "API"
+ApiDesc=Ao ativar este módulo, o Dolibarr torna-se num servidor REST para prestar diversoes serviços web.
+ApiProductionMode=Ativar o modo de produção (isto irá ativar uso de uma cache para a gestão de serviços)
+ApiExporerIs=Você pode explorar e testar as APIs no URL
+OnlyActiveElementsAreExposed=Somente os elementos de módulos ativados é que estão expostos
 ApiKey=Chave para a API
 WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
-BankSetupModule=Banco módulo de configuração
-FreeLegalTextOnChequeReceipts=Texto livre em recibos dos cheques
-BankOrderShow=Mostrar fim de contas bancárias para países que utilizam &quot
+BankSetupModule=Configuração do módulo "Bancário"
+FreeLegalTextOnChequeReceipts=Texto livre em recibos de pagamento em cheque
+BankOrderShow=Ordem de exibiçãode contas bancárias para países que utilizam "IBAN"
 BankOrderGlobal=Geral
-BankOrderGlobalDesc=Ordem de exibição Geral
-BankOrderES=Ordem bancária Espanhola
-BankOrderESDesc=Ordem de apresentação espanhol
-ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
+BankOrderGlobalDesc=Ordem de exibição geral
+BankOrderES=Espanhola
+BankOrderESDesc=Ordem de exibição espanhola
+ChequeReceiptsNumberingModule=Módulo de numeração para recibos de pagamento em cheque
 ##### Multicompany #####
-MultiCompanySetup=Multi-empresa módulo configuração
+MultiCompanySetup=Configuração do módulo "Multi-empresa"
 ##### Suppliers #####
-SuppliersSetup=Fornecedor de configuração do módulo
-SuppliersCommandModel=Complete modelo de ordem do fornecedor (logo. ..)
-SuppliersInvoiceModel=Modelo completo da factura do fornecedor (logo. ..)
-SuppliersInvoiceNumberingModel=Supplier invoices numbering models
-IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
+SuppliersSetup=Configuração do módulo "Fornecedor"
+SuppliersCommandModel=Modelo completo de encomenda a fornecedor (logo...)
+SuppliersInvoiceModel=Modelo completo de fatura do fornecedor (logo. ..)
+SuppliersInvoiceNumberingModel=Modelos de numeração de faturas de fornecedores
+IfSetToYesDontForgetPermission=Se definido a "sim", não se esqueça de atribuir permissões a utilizadores ou grupos de utilizadores que possam efetuar a segunda aprovação
 ##### GeoIPMaxmind #####
-GeoIPMaxmindSetup=MaxMind GeoIP instalação do módulo
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
-NoteOnPathLocation=Note que o ip de dados do país/arquivo deve estar dentro de um diretório do seu PHP (Verifique a configuração do PHP open_basedir e permissões de arquivos).
-YouCanDownloadFreeDatFileTo=Você pode baixar uma <b>versão demo gratuita</b> do país arquivo GeoIP MaxMind em %s.
+GeoIPMaxmindSetup=Configuração do módulo "GeoIP Maxmind"
+PathToGeoIPMaxmindCountryDataFile=Caminho para o ficheiro que contém o IP do Maxmind para tradução do país.<br>Exemplos:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+NoteOnPathLocation=Note que o endereço IP de dados do país/arquivo deve estar dentro de um diretório do seu PHP (Verifique a configuração do PHP open_basedir e permissões de ficheiros de sistema).
+YouCanDownloadFreeDatFileTo=Você pode descarregar uma <b>versão demo gratuita</b> do ficheiro país Maxmind GeoIP em %s.
 YouCanDownloadAdvancedDatFileTo=Você também pode baixar uma <b>versão</b> mais <b>completa, com atualizações</b> do país arquivo GeoIP MaxMind em %s.
-TestGeoIPResult=Teste de uma conversão de IP -&gt
+TestGeoIPResult=Teste de uma conversão IP -> País
 ##### Projects #####
-ProjectsNumberingModules=Projetos módulo de numeração
-ProjectsSetup=Projeto de instalação do módulo
-ProjectsModelModule=Modelo de projeto de documento de relatório
-TasksNumberingModules=Módulo de numeração das tarefas
+ProjectsNumberingModules=Módulo de numeração de projetos
+ProjectsSetup=Configuração do módulo "Projetos"
+ProjectsModelModule=Modelo de documento para relatórios de projeto
+TasksNumberingModules=Módulo de numeração de tarefas
 TaskModelModule=Modelo de documento dos relatórios de tarefasl
-UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
+UseSearchToSelectProject=Usar campos de preenchimento automático para escolher o projeto (em vez de usar uma lista de seleção)
 ##### ECM (GED) #####
 ##### Fiscal Year #####
 AccountingPeriods=Accounting periods
 AccountingPeriodCard=Accounting period
-NewFiscalYear=New accounting period
-OpenFiscalYear=Open accounting period
-CloseFiscalYear=Close accounting period
-DeleteFiscalYear=Delete accounting period
-ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
+NewFiscalYear=Novo período contabilístico
+OpenFiscalYear=Abrir período contabilístico
+CloseFiscalYear=Fechar período contabilístico
+DeleteFiscalYear=Eliminar período contabilístico
+ConfirmDeleteFiscalYear=Tem certeza que deseja eliminar este período contábilistico?
 ShowFiscalYear=Show accounting period
 AlwaysEditable=Pode ser sempre editado
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Número máximo de carateres maiúsculos
-NbNumMin=Número mínimod de carateres numéricos
-NbSpeMin=Número mínimo de carateres especiais
-NbIteConsecutive=Número máximo para repetir os mesmos carateres
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Configuração do módulo de salários
+MAIN_APPLICATION_TITLE=Forçar o nome visível da aplicação (aviso: definir o seu próprio nome aqui pode quebrar a funcionalidade de preenchimento automático de credenciais de inicio de sessão ao usar a aplicação DoliDroid para telemovel)
+NbMajMin=Número máximo de caracteres maiúsculos
+NbNumMin=Número mínimo de caracteres numéricos
+NbSpeMin=Número mínimo de caracteres especiais
+NbIteConsecutive=Número máximo de caracteres repetidos
+NoAmbiCaracAutoGeneration=Em criação automática de referências não utilize caracteres ambíguos ("1","l","i","|","0","O")
+SalariesSetup=Configuração do módulo "Salários"
 SortOrder=Ordenação
 Format=Formato
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
-IncludePath=Include path (defined into variable %s)
-ExpenseReportsSetup=Configuração do módulo de Relatórios de Despesas
-TemplatePDFExpenseReports=Document templates to generate expense report document
-NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
-YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+TypePaymentDesc=0:Tipo de pagamento de cliente, 1:Tipo de pagamento de fornecedor, 2:Tipo de pagamento de clientes e fornecedores
+IncludePath=Caminho para o dirétorio "include" (definido na variável %s)
+ExpenseReportsSetup=Configuração do módulo "Relatórios de Despesas"
+TemplatePDFExpenseReports=Modelos de documentos para a produção de relatórios de despesa 
+NoModueToManageStockIncrease=Não foi ativado nenhum módulo capaz de efetuar a gestão automática do acréscimo de stock. O acrescimo de stock será efetuado manualmente.
+YouMayFindNotificationsFeaturesIntoModuleNotification=Poderá encontrar as opções das notificações por email ao ativar e configurar o módulo "Notificação".
 ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
-ListOfFixedNotifications=List of fixed notifications
+ListOfFixedNotifications=Lista de notificações fixas
 GoOntoUserCardToAddMore=Go on 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 contacts/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.
-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.
-ConfFileMuseContainCustom=Installing 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)
-TextTitleColor=Color of page title
-LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
-NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
+GoOntoContactCardToAddMore=Vá à aba "Notificações" de um terceiro para adicionar ou remover as notificações de contactos/endereços
+Threshold=Limite
+BackupDumpWizard=Assistente para construir o ficheiro dump de backup da base de dados
+SomethingMakeInstallFromWebNotPossible=Instalação do módulo externo não é possível a partir da interface web pelo seguinte motivo:
+SomethingMakeInstallFromWebNotPossible2=Por este motivo, o processo de atualização descrito aqui é apenas manual que um utilizador privilegiado pode efetuar.
+InstallModuleFromWebHasBeenDisabledByFile=Instalação de um módulo externo da aplicação foi desativada pelo seu administrador. Você deve pedir-lhe para remover o ficheiro <strong>%s</strong> para permitir esta funcionalidade.
+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=Realçar as linhas da tabela quando o rato passar sobre elas
+HighlightLinesColor=Realçar a cor da linha quando o rato passa por cima (manter vazio para não realçar)
+TextTitleColor=Cor do título da página
+LinkColor=Cor dos links
+PressF5AfterChangingThis=Pressione CTRL+F5 no teclado ou limpe a cache do navegador depois de mudar este valor de forma a gravar as alterações
+NotSupportedByAllThemes=Funciona com os temas predefinidos, pode não ser suportado por temas externos
 BackgroundColor=Cor de fundo
-TopMenuBackgroundColor=Background color for Top menu
+TopMenuBackgroundColor=Cor de fundo para o menu no topo
 TopMenuDisableImages=Hide images in Top menu
-LeftMenuBackgroundColor=Background color for Left menu
-BackgroundTableTitleColor=Background color for Table title line
-BackgroundTableLineOddColor=Background color for odd table lines
-BackgroundTableLineEvenColor=Background color for even table lines
-MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
-NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
-UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
-PositionIntoComboList=Position of line into combo lists
-SellTaxRate=Sale tax rate
-RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
-UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipping, you can enter it here. You can use the key {TRACKID} into URL parameters so the system will replace it with value of tracking number user entered into shipment card.
-OpportunityPercent=When you create an opportunity, you will defined an estimated amount of project/lead. According to status of opportunity, this amount may be multiplicated 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
+LeftMenuBackgroundColor=Cor de fundo para o menu à esquerda
+BackgroundTableTitleColor=A cor do fundo para a linha de título das tabelas
+BackgroundTableLineOddColor=A cor do fundo para as linhas ímpares da tabela
+BackgroundTableLineEvenColor=Cor de fundo para linhas pares da tabela
+MinimumNoticePeriod=Período mínimo de notificação (o seu pedido de licença deve ser feito antes deste período)
+NbAddedAutomatically=Número de dias adicionados ao contadores dos utilizadores (automaticamente) cada mês
+EnterAnyCode=Este campo contém uma referência para identificar a linha. Digite qualquer valor sem caracteres especiais.
+UnicodeCurrency=Digite aqui entre parêntesis retos, a lista  de bytes que representam o símbolo da moeda. Por exemplo: para o dólar americano $, digite [36] - para o real braisleiro, R$ [82,36] - para o euro €, digite [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
+PositionIntoComboList=Posição da linha nas listas de seleção
+SellTaxRate=Taxa de imposto de venda
+RecuperableOnly=Sim para IVA "Non Perçue Récupérable" dedicado para alguns estados na França. Mantenha o valor como "Não" em todos os outros casos.
+UrlTrackingDesc=Se a transportadora oferecer uma página da Internet para verificar o estado da sua encomenda, pode introduzi-lo aqui. Você pode usar a chave {TRACKID} nos  parâmetros do URL para que o sistema possa substituí-lo na ficha de expedição.
+OpportunityPercent=Quando você cria uma oportunidade, você vai definir um valor estimado de projeto/lead. De acordo com o estado da oportunidade, este montante poderá ser multiplicado por esta taxa para avaliar o montante global que todas as suas oportunidades pode gerar. O valor é percentual (entre 0 e 100).
+TemplateForElement=Este registo modelo é dedicado a qual elemento
 TypeOfTemplate=Tipo de modelo
 TemplateIsVisibleByOwnerOnly=Modelo é visível apenas pelo dono
 FixTZ=Corrigir Fuso Horário
-FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
-ExpectedChecksum=Expected Checksum
-CurrentChecksum=Current Checksum
+FillFixTZOnlyIfRequired=Exemplo: +2 (preencha somente se experienciar problemas)
+ExpectedChecksum=Checksum esperado
+CurrentChecksum=Checksum atual
 ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
+MailToSendProposal=Orçamento para cliente a enviar
+MailToSendOrder=Para enviar a encomenda do cliente por e-mail
+MailToSendInvoice=Para enviar a fatura do cliente por e-mail
+MailToSendShipment=Para enviar a expedição por e-mail
+MailToSendIntervention=Para enviar a intervenção por e-mail
+MailToSendSupplierRequestForQuotation=Para enviar a solicitação de cotação ao fornecedor por e-mail
+MailToSendSupplierOrder=Para enviar a encomenda ao fornecedor por e-mail
+MailToSendSupplierInvoice=Para enviar a fatura emitida pelo fornecedor por e-mail
 MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the latest stable version
-TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
-TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so 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.
+MailToThirdparty=Para enviar e-mail a partir da página dos terceiros
+ByDefaultInList=Mostrar por padrão na vista de lista
+YouUseLastStableVersion=Você possui a última versão estável
+TitleExampleForMajorRelease=Exemplo de mensagem que você pode usar para anunciar esta versão principal (sinta-se livre para usá-la nas suas páginas da Internet)
+TitleExampleForMaintenanceRelease=Exemplo de mensagem que você pode usar para anunciar esta versão de manutenção (sinta-se livre para usá-la nas suas páginas da Internet)
+ExampleOfNewsMessageForMajorRelease=O Dolibarr ERP e CRM %s está disponível. A versão %s é um grande lançamento com várias funcionalidades novas. Você pode transferi-lo a partir da área de downloads do portal https://www.dolibarr.org (subdiretório: versões estáveis). Você pode ler o <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> para consultar a lista completa de alterações.
+ExampleOfNewsMessageForMaintenanceRelease=O Dolibarr ERP e CRM %s está disponível. A versão %s é uma versão de manutenção, por isso contém apenas correções de bugs. Recomendamos que atualize para este. Como com qualquer versão de manutenção, não há novas funcionalidades, nem foi mudada a estrutura de dados presente nesta versão. Você pode transferi-lo a partir da área de downloads da página https://www.dolibarr.org (subdiretório: versões estáveis). Você pode consultar <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> para a lista completa de alterações.
 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 usefull only if your prices for each leve 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.
-SeeSubstitutionVars=See * note for list of possible substitution variables
-AllPublishers=All publishers
-UnknownPublishers=Unknown publishers
-AddRemoveTabs=Add or remove tabs
-AddDictionaries=Add dictionaries
-AddBoxes=Add widgets
-AddSheduledJobs=Add scheduled jobs
+ModelModulesProduct=Modelos para documentos de produto
+ToGenerateCodeDefineAutomaticRuleFirst=Para ser possível criar códigos automaticamente, você deve primeiro definir um gestor para auto definir o número de código de barras.
+SeeSubstitutionVars=Veja a nota * para uma lista de possíveis variáveis ​​de substituição
+AllPublishers=Todos os editores
+UnknownPublishers=Editores desconhecidos
+AddRemoveTabs=Adicionar ou remover separadores
+AddDictionaries=Adicionar dicionários
+AddBoxes=Adicionar widgets
+AddSheduledJobs=Adicionar trabalhos agendados
 AddHooks=Add hooks
 AddTriggers=Add triggers
-AddMenus=Add menus
-AddPermissions=Add permissions
-AddExportProfiles=Add export profiles
-AddImportProfiles=Add import profiles
-AddOtherPagesOrServices=Add other pages or services
-AddModels=Add document or numbering templates
+AddMenus=Adicionar menus
+AddPermissions=Adicionar permissões
+AddExportProfiles=Adicionar perfis de exportação
+AddImportProfiles=Adicionar perfis de importação
+AddOtherPagesOrServices=Adicionar outras páginas ou serviços
+AddModels=Adicionar modelos de documento ou numeração
 AddSubstitutions=Add keys substitutions
-DetectionNotPossible=Detection not possible
+DetectionNotPossible=Deteção não é possível
 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)
-ListOfAvailableAPIs=List of available APIs
+ListOfAvailableAPIs=Lista de APIs disponíveis
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. 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 inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
 LandingPage=Página Inicial
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/pt_PT/bills.lang b/htdocs/langs/pt_PT/bills.lang
index 397079541da..853457b9f74 100644
--- a/htdocs/langs/pt_PT/bills.lang
+++ b/htdocs/langs/pt_PT/bills.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Fatura
 Bills=Facturas
-BillsCustomers=Customer invoices
+BillsCustomers=Faturas de Clientes
 BillsCustomer=Fatura de Cliente
-BillsSuppliers=Supplier invoices
+BillsSuppliers=Faturas de Fornecedores
 BillsCustomersUnpaid=Faturas a receber de clientes
 BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
 BillsSuppliersUnpaid=Faturas a pagar de fornecedores
@@ -15,9 +15,9 @@ DisabledBecauseNotErasable=Desativar porque não pode ser eliminado
 InvoiceStandard=Fatura Normal
 InvoiceStandardAsk=Fatura Normal
 InvoiceStandardDesc=Este tipo de fatura é uma fatura comum.
-InvoiceDeposit=Depositar Factura
-InvoiceDepositAsk=Depositar Factura
-InvoiceDepositDesc=Este tipo de fatura é efetuada quando for recebido um depósito.
+InvoiceDeposit=Down payment invoice
+InvoiceDepositAsk=Down payment invoice
+InvoiceDepositDesc=This kind of invoice is done when a down payment has been received.
 InvoiceProForma=Fatura Pró-Forma
 InvoiceProFormaAsk=Fatura Pró-Forma
 InvoiceProFormaDesc=A <b>Fatura Pró-Forma</b> é uma imagem de uma fatura, mas não tem valor contabilístico.
@@ -103,8 +103,8 @@ SearchACustomerInvoice=Procurar por uma fatura de cliente
 SearchASupplierInvoice=Procurar por uma factura de fornecedor
 CancelBill=Anular uma Factura
 SendRemindByMail=Enviar lembrete por E-mail
-DoPayment=Enter payment
-DoPaymentBack=Enter refund
+DoPayment=Inserir pagamento
+DoPaymentBack=Inserir reembolso
 ConvertToReduc=Converter em desconto futuro
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Adicionar pagamento recebido de cliente
@@ -115,7 +115,7 @@ BillStatus=Estado da factura
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=rascunho (a Confirmar)
 BillStatusPaid=paga
-BillStatusPaidBackOrConverted=Refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or converted into discount
 BillStatusConverted=Converter em Desconto
 BillStatusCanceled=Abandonada
 BillStatusValidated=Validada (a pagar)
@@ -127,7 +127,7 @@ BillStatusClosedPaidPartially=Paga (parcialmente)
 BillShortStatusDraft=Rascunho
 BillShortStatusPaid=Paga
 BillShortStatusPaidBackOrConverted=Refund or converted
-BillShortStatusConverted=Transformados
+BillShortStatusConverted=Pago
 BillShortStatusCanceled=Abandonada
 BillShortStatusValidated=Validada
 BillShortStatusStarted=Iniciada
@@ -153,22 +153,22 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=Nova factura
-LastBills=Latest %s invoices
-LastCustomersBills=Latest %s customer invoices
-LastSuppliersBills=Latest %s supplier invoices
+LastBills=Últimas %s faturas
+LastCustomersBills=Últimas %s faturas de cliente
+LastSuppliersBills=Últimas %s faturas de fornecedor
 AllBills=Todas as facturas
 OtherBills=Outras facturas
 DraftBills=Facturas rascunho
-CustomersDraftInvoices=Customer draft invoices
-SuppliersDraftInvoices=Supplier draft invoices
+CustomersDraftInvoices=Faturas provisórias de cliente
+SuppliersDraftInvoices=Faturas provisórias de fornecedor
 Unpaid=Pendentes
-ConfirmDeleteBill=Are you sure you want to delete this invoice?
-ConfirmValidateBill=Are you sure you want to validate this invoice with reference <b>%s</b>?
-ConfirmUnvalidateBill=Are you sure you want to change invoice <b>%s</b> to draft status?
-ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
-ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
-ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
+ConfirmDeleteBill=Tem a certeza que deseja eliminar esta fatura?
+ConfirmValidateBill=Tem a certeza que deseja validar esta fatura com a referência <b>%s</b>?
+ConfirmUnvalidateBill=Tem a certeza que pretende alterar a fatura <b>%s</b> para o estado de provisória?
+ConfirmClassifyPaidBill=Tem a certeza que pretende alterar a fatura <b>%s</b> para o estado de paga?
+ConfirmCancelBill=Tem a certeza que pretende cancelar a fatura <b>%s</b>?
+ConfirmCancelBillQuestion=Porque é que pretende classificar esta fatura como 'abandonada'?
+ConfirmClassifyPaidPartially=Tem a certeza que pretende alterar a fatura <b>%s</b> para o estado de paga?
 ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
 ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
 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.
@@ -198,12 +198,12 @@ ShowBill=Ver factura
 ShowInvoice=Ver factura
 ShowInvoiceReplace=Ver factura rectificativa
 ShowInvoiceAvoir=Ver deposito
-ShowInvoiceDeposit=Ver Factura Depositada
+ShowInvoiceDeposit=Show down payment invoice
 ShowInvoiceSituation=Show situation invoice
 ShowPayment=Ver pagamento
 AlreadyPaid=Já e
 AlreadyPaidBack=Já reembolsado
-AlreadyPaidNoCreditNotesNoDeposits=Já pagas (sem notas de crédito e depósitos)
+AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
 Abandoned=Abandonada
 RemainderToPay=Restante a receber
 RemainderToTake=Remaining amount to take
@@ -225,7 +225,7 @@ ToBill=A facturar
 RemainderToBill=Falta Facturar
 SendBillByMail=Enviar a factura por E-Mail
 SendReminderBillByMail=Enviar um lembrete por E-Mail
-RelatedCommercialProposals=Orçamentos associados
+RelatedCommercialProposals=Orçamentos para clientes associados
 RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=A Confirmar
 DateMaxPayment=Data limite de pagamento
@@ -238,7 +238,7 @@ CustomerBillsUnpaid=Faturas a receber de clientes
 NonPercuRecuperable=Não recuperável
 SetConditions=Definir Condições de pagamento
 SetMode=Definir modo de pagamento
-SetRevenuStamp=Set revenue stamp
+SetRevenuStamp=Definir selo fiscal
 Billed=Facturado
 RecurringInvoices=Recurring invoices
 RepeatableInvoice=Fatura Modelo
@@ -270,10 +270,10 @@ RelativeDiscount=Desconto relativo
 GlobalDiscount=Desconto fixo
 CreditNote=Deposito
 CreditNotes=Recibos
-Deposit=Depósito
-Deposits=Depósitos
+Deposit=Down payment
+Deposits=Down payments
 DiscountFromCreditNote=Desconto resultante do deposito %s
-DiscountFromDeposit=Pagamentos a partir de depósito na factura %s
+DiscountFromDeposit=Down payments from invoice %s
 DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=Este tipo de crédito pode ser usado na factura antes da sua validação
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
@@ -282,8 +282,8 @@ NewRelativeDiscount=Nova parente desconto
 NoteReason=Nota/Motivo
 ReasonDiscount=Motivo
 DiscountOfferedBy=Acordado por
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Descontos disponíveis
+DiscountAlreadyCounted=Descontos já utilizados
 BillAddress=Morada de facturação
 HelpEscompte=Um <b>Desconto</b> é um desconto acordado sobre uma factura dada, a um cliente que realizou o seu pagamento muito antes do vencimento.
 HelpAbandonBadCustomer=Este Montante é deixado (cliente julgado como devedor) e se considera como uma perda excepcional.
@@ -302,12 +302,12 @@ RemoveDiscount=Eliminar Desconto
 WatermarkOnDraftBill=Marca de agua em facturas rascunho (nada sem está vazia)
 InvoiceNotChecked=Factura não seleccionada
 CloneInvoice=Clonar factura
-ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
+ConfirmCloneInvoice=Tem a certeza que pretende clonar esta fatura <b>%s</b>?
 DisabledBecauseReplacedInvoice=Acção desactivada porque é uma factura substituída
 DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
 NbOfPayments=Nb de pagamentos
 SplitDiscount=Dividido em duas desconto
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
+ConfirmSplitDiscount=Tem a certeza que pretende dividir este desconto de <b>%s</b> %s em 2 descontos menores?
 TypeAmountOfEachNewDiscount=Entrada montante para cada uma das duas partes:
 TotalOfTwoDiscountMustEqualsOriginal=Total de dois novos desconto deve ser igual ao montante original de desconto.
 ConfirmRemoveDiscount=Tem certeza que deseja remover este desconto?
@@ -353,7 +353,7 @@ PaymentCondition60DENDMONTH=Within 60 days following the end of the month
 PaymentConditionShortPT_DELIVERY=Envio
 PaymentConditionPT_DELIVERY=Na entrega
 PaymentConditionShortPT_ORDER=Pedido
-PaymentConditionPT_ORDER=On order
+PaymentConditionPT_ORDER=Ao encomendar
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% adiantado, 50%% na entrega
 PaymentConditionShort10D=10 days
@@ -381,7 +381,7 @@ PaymentTypeTIP=TIP (Documents against Payment)
 PaymentTypeShortTIP=TIP Payment
 PaymentTypeVAD=Pagamento On Line
 PaymentTypeShortVAD=Pagamento On Line
-PaymentTypeTRA=Bank draft
+PaymentTypeTRA=Letra bancária
 PaymentTypeShortTRA=Rascunho
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
@@ -447,24 +447,24 @@ CantRemovePaymentWithOneInvoicePaid=Não é possível remover o pagamento desde
 ExpectedToPay=Pagamento esperado
 CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Pago por esse pagamento
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
 ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=Tudo sem nota fiscal continuam a pagar será automaticamente fechada ao status de &quot;payed&quot;.
 ToMakePayment=Pagar
 ToMakePaymentBack=Reembolsar
 ListOfYourUnpaidInvoices=Lista de faturas não pagas
-NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
-RevenueStamp=Revenue stamp
+NoteListOfYourUnpaidInvoices=Nota: Esta lista apenas contém fatura de terceiros dos quais você está definido como representante de vendas.
+RevenueStamp=Selo fiscal
 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
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Modelo de factura completo (IVA,  método de pago a mostrar, logotipo...)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for deposit invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
 TerreNumRefModelError=Uma conta a começar com $syymm já existe e não é compatível com este modelo de sequencia. Remove-o ou renomeia para activar este modulo
-CactusNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for deposit invoices where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+CactusNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
 ##### Types de contacts #####
 TypeContact_facture_internal_SALESREPFOLL=Representante factura do cliente seguimento
 TypeContact_facture_external_BILLING=Contacto na factura do Cliente
diff --git a/htdocs/langs/pt_PT/bookmarks.lang b/htdocs/langs/pt_PT/bookmarks.lang
index e201e4f4166..b82edfa034b 100644
--- a/htdocs/langs/pt_PT/bookmarks.lang
+++ b/htdocs/langs/pt_PT/bookmarks.lang
@@ -1,18 +1,20 @@
 # Dolibarr language file - Source file is en_US - marque pages
-AddThisPageToBookmarks=Adicionar esta página aos Favoritos
-Bookmark=Favorito
-Bookmarks=Favoritos
-NewBookmark=Novo Favorito
-ShowBookmark=Mostrar Favoritos
-OpenANewWindow=Abrir uma Nova Janela
+AddThisPageToBookmarks=Adicionar a página atual aos marcadores
+Bookmark=Marcador
+Bookmarks=Marcadores
+ListOfBookmarks=Lista de Marcadores
+EditBookmarks=Listar/editar marcadores
+NewBookmark=Novo marcador
+ShowBookmark=Mostrar marcador
+OpenANewWindow=Abrir numa nova janela
 ReplaceWindow=Substituir a janela atual
 BookmarkTargetNewWindowShort=Nova janela
 BookmarkTargetReplaceWindowShort=Janela atual
-BookmarkTitle=Título do Favorito
+BookmarkTitle=Título do marcador
 UrlOrLink=URL
-BehaviourOnClick=Comportamento quando clica num URL
-CreateBookmark=Criar Favorito
-SetHereATitleForLink=Defina um título para o Favorito
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Indicar um URL externo para o URL relativo do Dolibarr
-ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if linked page must open in new window or not
-BookmarksManagement=Gestão de Favoritos
+BehaviourOnClick=Comportamento quando um URL de marcador é selecionado
+CreateBookmark=Criar marcador
+SetHereATitleForLink=Defina um título para o marcador
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Utilizar um URL http externo para o URL Dolibarr relativo
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Escolher se a página associada deve abrir ou não numa nova janela
+BookmarksManagement=Gestão de Marcadores
diff --git a/htdocs/langs/pt_PT/boxes.lang b/htdocs/langs/pt_PT/boxes.lang
index 060f311dd64..116f9f8d304 100644
--- a/htdocs/langs/pt_PT/boxes.lang
+++ b/htdocs/langs/pt_PT/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxLoginInformation=Login information
 BoxLastRssInfos=Informação RSS
 BoxLastProducts=Os %s últimos produtos/serviços
 BoxProductsAlertStock=Alertas de stock para produtos
@@ -7,7 +8,7 @@ BoxLastSupplierBills=Últimas faturas do fornecedor
 BoxLastCustomerBills=Últimas faturas do cliente
 BoxOldestUnpaidCustomerBills=Oldest unpaid customer invoices
 BoxOldestUnpaidSupplierBills=Oldest unpaid supplier invoices
-BoxLastProposals=Latest commercial proposals
+BoxLastProposals=Últimos orçamentos para clientes
 BoxLastProspects=Latest modified prospects
 BoxLastCustomers=Latest modified customers
 BoxLastSuppliers=Latest modified suppliers
@@ -17,7 +18,7 @@ BoxLastContracts=Últimos contratos
 BoxLastContacts=Latest contacts/addresses
 BoxLastMembers=Últimos membros
 BoxFicheInter=Últimas intervenções
-BoxCurrentAccounts=Open accounts balance
+BoxCurrentAccounts=Saldo de abertura das contas
 BoxTitleLastRssInfos=Latest %s news from %s
 BoxTitleLastProducts=Latest %s modified products/services
 BoxTitleProductsAlertStock=Produtos no alerta de stock
@@ -25,8 +26,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Latest %s modified customers
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer invoices
-BoxTitleLastSupplierBills=Latest %s supplier invoices
+BoxTitleLastCustomerBills=Últimas %s faturas de clientes
+BoxTitleLastSupplierBills=Últimas %s faturas de fornecedores
 BoxTitleLastModifiedProspects=Latest %s modified prospects
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -39,26 +40,26 @@ BoxOldestExpiredServices=Mais antigos ativos de serviços vencidos
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
 BoxTitleLastContracts=Latest %s modified contracts
-BoxTitleLastModifiedDonations=%s Últimas doações modificadas
+BoxTitleLastModifiedDonations=As %s últimos donativos modificados
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
-BoxGlobalActivity=Atividade Global (faturas, propostas, encomendas)
+BoxGlobalActivity=Atividade global (faturas, orçamentos, encomendas)
 BoxGoodCustomers=Good customers
 BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successfull refresh date: %s
 LastRefreshDate=Latest refresh date
-NoRecordedBookmarks=Não existem favoritos pessoais. Click aqui para adicionar.
+NoRecordedBookmarks=Não existem marcadores definidos.
 ClickToAdd=Clique aqui para adicionar.
 NoRecordedCustomers=Nenhum cliente registado
-NoRecordedContacts=Não há contatos gravados
-NoActionsToDo=Sem acções a realizar
+NoRecordedContacts=Nenhum contacto registado
+NoActionsToDo=Sem ações a realizar
 NoRecordedOrders=No recorded customer orders
-NoRecordedProposals=Sem Orçamentos registados
+NoRecordedProposals=Sem orçamentos registados
 NoRecordedInvoices=No recorded customer invoices
 NoUnpaidCustomerBills=No unpaid customer invoices
 NoUnpaidSupplierBills=No unpaid supplier invoices
 NoModifiedSupplierBills=No recorded supplier invoices
-NoRecordedProducts=Não gravados produtos / serviços
-NoRecordedProspects=Não gravadas perspectivas
+NoRecordedProducts=Nenhum produto/serviço registado
+NoRecordedProspects=Nenhuma prospecção registada
 NoContractedProducts=Não contractados produtos / serviços
 NoRecordedContracts=Sem contratos registrados
 NoRecordedInterventions=No recorded interventions
@@ -67,8 +68,8 @@ NoSupplierOrder=No recorded supplier order
 BoxCustomersInvoicesPerMonth=Faturas de clientes por mês
 BoxSuppliersInvoicesPerMonth=Facturas de fornecedores por mês
 BoxCustomersOrdersPerMonth=Encomendas de clientes por mês
-BoxSuppliersOrdersPerMonth=Encomendas de Fornecedores por mês
-BoxProposalsPerMonth=Propostas por mês
+BoxSuppliersOrdersPerMonth=Encomendas a fornecedores por mês
+BoxProposalsPerMonth=Orçamentos por mês
 NoTooLowStockProducts=Nenhum produto abaixo do limite mínimo de stock
 BoxProductDistribution=Distribuição de Produtos/Serviços
 BoxProductDistributionFor=Distribuição de %s para %s
@@ -82,3 +83,4 @@ ForCustomersOrders=Encomendas de clientes
 ForProposals=Orçamentos
 LastXMonthRolling=The latest %s month rolling
 ChooseBoxToAdd=Add widget to your dashboard
+BoxAdded=Widget was added in your dashboard
diff --git a/htdocs/langs/pt_PT/companies.lang b/htdocs/langs/pt_PT/companies.lang
index 6dcae58c45f..bdb37320deb 100644
--- a/htdocs/langs/pt_PT/companies.lang
+++ b/htdocs/langs/pt_PT/companies.lang
@@ -13,7 +13,7 @@ MenuNewPrivateIndividual=Novo Particular
 NewCompany=Nova Empresa (Cliente Potencial, Cliente, Fornecedor)
 NewThirdParty=Novo Terceiro (Cliente Potencial, Cliente, Fornecedor)
 CreateDolibarrThirdPartySupplier=Criar entidade (fornecedor)
-CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyOnly=Criar terceiro
 CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Área de prospeção
 IdThirdParty=ID Terceiro
@@ -38,7 +38,6 @@ ThirdPartyCustomersStats=Clientes
 ThirdPartyCustomersWithIdProf12=Clientes com %s ó %s
 ThirdPartySuppliers=Fornecedores
 ThirdPartyType=Tipo de Terceiro
-Company/Fundation=Empresa/Associação
 Individual=Particular
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Casa mãe
@@ -78,10 +77,10 @@ VATIsNotUsed=Não Sujeito a IVA
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 PaymentBankAccount=Payment bank account
-OverAllProposals=Total proposals
-OverAllOrders=Total orders
-OverAllInvoices=Total invoices
-OverAllSupplierProposals=Total price requests
+OverAllProposals=Orçamentos
+OverAllOrders=Encomendas
+OverAllInvoices=Faturas
+OverAllSupplierProposals=Preços solicitados
 ##### Local Taxes #####
 LocalTax1IsUsed=Utilizar um segundo imposto
 LocalTax1IsUsedES= RE é usado
@@ -237,6 +236,12 @@ ProfId3TN=Código na Alfandega
 ProfId4TN=CCC
 ProfId5TN=-
 ProfId6TN=-
+ProfId1US=Prof Id
+ProfId2US=-
+ProfId3US=-
+ProfId4US=-
+ProfId5US=-
+ProfId6US=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
 ProfId3RU=Prof Id 3 (KPP)
@@ -259,8 +264,8 @@ CustomerRelativeDiscountShort=Desconto Relativo
 CustomerAbsoluteDiscountShort=Desconto Fixo
 CompanyHasRelativeDiscount=Este cliente tem um desconto por defeito de <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Este cliente não tem descontos relativos por defeito
-CompanyHasAbsoluteDiscount=Este cliente tem <b>%s %s</b> Descontos fixos disponiveis
-CompanyHasCreditNote=Este cliente tem <b>%s %s</b> recibos disponiveis
+CompanyHasAbsoluteDiscount=This customer has discount available (credits notes or down payments) for <b>%s</b> %s
+CompanyHasCreditNote=Este cliente ainda tem notas de crédito para <b>%s</b> %s
 CompanyHasNoAbsoluteDiscount=Este cliente não tem mas descontos fixos disponiveis
 CustomerAbsoluteDiscountAllUsers=Descontos fixos em curso (acordado por todos os Utilizadores)
 CustomerAbsoluteDiscountMy=Descontos fixos em curso (acordados Pessoalmente)
@@ -296,7 +301,7 @@ CompanyDeleted=A Empresa "%s" foi Eliminada
 ListOfContacts=Lista de Contactos
 ListOfContactsAddresses=Lista de contactos/endereços
 ListOfThirdParties=Lista de Terceiros
-ShowCompany=Show third party
+ShowCompany=Mostrar terceiros
 ShowContact=Mostrar Contacto
 ContactsAllShort=Todos (sem filtro)
 ContactType=Tipo de Contacto
@@ -351,34 +356,34 @@ TE_PRIVATE=Micro
 TE_OTHER=Outro
 StatusProspect-1=Não Contactar
 StatusProspect0=Nunca Contactado
-StatusProspect1=To be contacted
+StatusProspect1=Para ser contactado
 StatusProspect2=Contacto em Curso
 StatusProspect3=Contacto Realizado
 ChangeDoNotContact=Alterar o Estado para ' Não Contactar '
 ChangeNeverContacted=Alterar o Estado para 'Nunca Nontactado'
-ChangeToContact=Change status to 'To be contacted'
+ChangeToContact=Alterar estado para 'Para ser contactado'
 ChangeContactInProcess=Alterar o Estado para 'Contacto em Curso'
 ChangeContactDone=Alterar o Estado para 'Contacto Realizado'
 ProspectsByStatus=Clientes Potenciais por Estado
 NoParentCompany=Nenhuma
 ExportCardToFormat=Exportar ficha para o formato
 ContactNotLinkedToCompany=Contacto não vinculado a um Terceiro
-DolibarrLogin=Login
+DolibarrLogin=Dolibarr - Iniciar Sessão
 NoDolibarrAccess=Sem Acesso
 ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Contactos de Terceiro e Atributos
 ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Contatos/Moradas (de terceiros ou não) e atributos
 ImportDataset_company_3=Dados bancários
-ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
+ImportDataset_company_4=Terceiros/Representantes de vendas (afetar utilizadores representantes de vendas a terceiros)
 PriceLevel=Nível de preços
 DeliveryAddress=Direcção de Envío
 AddAddress=Adicionar Direcção
 SupplierCategory=categoria Fornecedor
-JuridicalStatus200=Independent
+JuridicalStatus200=Independente
 DeleteFile=Apagar um Ficheiro
 ConfirmDeleteFile=Está seguro de querer eliminar este ficheiro?
-AllocateCommercial=Assigned to sales representative
+AllocateCommercial=Atribuído a representante de vendas
 Organization=Organismo
 FiscalYearInformation=Informação do Ano Fiscal
 FiscalMonthStart=Mês de Inicio do Exercício
@@ -390,7 +395,7 @@ ListCustomersShort=Lista de clientes
 ThirdPartiesArea=Terceiros e árrea de contacto
 LastModifiedThirdParties=Latest %s modified third parties
 UniqueThirdParties=Total de originais terceiros
-InActivity=Aberto
+InActivity=Abrir
 ActivityCeased=Fechado
 ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=List of products/services into %s
@@ -402,10 +407,10 @@ LeopardNumRefModelDesc=Código de cliente/fornecedor livre sem verificação. po
 ManagingDirectors=Nome Diretor(es) (DE, diretor, presidente ...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
-ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the thirdparty will be deleted.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
-SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=First name of sales representative
-SaleRepresentativeLastname=Last name of sales representative
+SaleRepresentativeLogin=Nome de utilizador do representante de vendas
+SaleRepresentativeFirstname=Primeiro nome do representante de vendas
+SaleRepresentativeLastname=Último nome do representante de vendas
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/pt_PT/compta.lang b/htdocs/langs/pt_PT/compta.lang
index 88326c6bcd0..4fa138590c4 100644
--- a/htdocs/langs/pt_PT/compta.lang
+++ b/htdocs/langs/pt_PT/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using r
 Param=Parametrização
 RemainingAmountPayment=Saldo pagamento:
 Account=Conta
-Accountparent=Conta original
-Accountsparent=Contas originais
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=Depósitos
 Outcome=Despesas
 ReportInOut=Resultado / Exercício
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Impostos e Dividas
 MenuSocialContributions=Social/fiscal taxes
 MenuNewSocialContribution=New social/fiscal tax
 NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Área Contabilidade/Tesouraria
 NewPayment=Novo Pagamento
@@ -134,8 +135,8 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- Inclui os pagamentos efectuados das facturas a clientes.<br>- Se baseia na data de pagamento das mesmas<br>
-DepositsAreNotIncluded=- Facturas de depósito não são incluídas
-DepositsAreIncluded=- Facturas de Depósito estão incluídas
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Relatório de terceiros IRPF
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
 VATReport=VAT report
@@ -169,9 +170,9 @@ DescSellsJournal=Relatório vendas
 DescPurchasesJournal=Relatório compras
 InvoiceRef=Ref fatura.
 CodeNotDef=Não definido
-WarningDepositsNotIncluded=Facturas depósitos não estão incluídos nesta versão com este módulo de contabilidade.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
-Pcg_version=Chart of accounts models
+Pcg_version=Modelos de planos de contas
 Pcg_type=Pcg type
 Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
@@ -189,8 +190,10 @@ AccountancyJournal=Accountancy code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Cloná-la para o mês seguinte
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/pt_PT/cron.lang b/htdocs/langs/pt_PT/cron.lang
index 1869af8b0b5..7338c883140 100644
--- a/htdocs/langs/pt_PT/cron.lang
+++ b/htdocs/langs/pt_PT/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allow to execute job that have been planned
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Tarefa
 CronNone=Nenhuma
 CronDtStart=Not before
@@ -34,7 +34,7 @@ CronDtNextLaunch=Próximo execução
 CronDtLastLaunch=Start date of latest execution
 CronDtLastResult=End date of latest execution
 CronFrequency=Frequência
-CronClass=Class
+CronClass=Classe
 CronMethod=Método
 CronModule=Módulo
 CronNoJobs=Nenhumas tarefas registadas
@@ -46,10 +46,10 @@ CronEach=Every
 JobFinished=Terafa lançada e concluída
 #Page card
 CronAdd= Adicionar tarefas
-CronEvery=Execute job each
+CronEvery=Executar cada trabalho
 CronObject=Instância/Objeto para criar
 CronArgs=Parâmetros
-CronSaveSucess=Save successfully
+CronSaveSucess=Guardado com sucesso
 CronNote=Comentário
 CronFieldMandatory=Os campos %s são obrigatórios
 CronErrEndDateStartDt=A data de fim não pode ser anterior à data de início
@@ -57,18 +57,18 @@ CronStatusActiveBtn=Activar
 CronStatusInactiveBtn=Desactivar
 CronTaskInactive=Esta tarefa está desactivada
 CronId=Id
-CronClassFile=Classes (filename.class.php)
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=De
 # Info
 # Common
-CronType=Job type
+CronType=Tipo de trabalho
 CronType_method=Call method of a Dolibarr Class
 CronType_command=Shell command
 CronCannotLoadClass=Cannot load class %s or object %s
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang
index 6a885acb6fa..055b4c07850 100644
--- a/htdocs/langs/pt_PT/errors.lang
+++ b/htdocs/langs/pt_PT/errors.lang
@@ -7,17 +7,19 @@ ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=EMail %s é errado
 ErrorBadUrl=Url %s é errado
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
-ErrorLoginAlreadyExists=O login %s já existe.
+ErrorLoginAlreadyExists=A sessão %s já existe.
 ErrorGroupAlreadyExists=O grupo %s já existe.
 ErrorRecordNotFound=Registro não foi encontrado.
 ErrorFailToCopyFile=Falha ao copiar <b>&quot;%s&quot;</b> arquivo para <b>&quot;%s&quot;.</b>
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Falha ao renomear <b>&quot;%s&quot;</b> arquivo para <b>&quot;%s&quot;.</b>
-ErrorFailToDeleteFile=Erro à eliminar o Ficheiro '<b>%s</b>'.
-ErrorFailToCreateFile=Erro ao criar o ficheiro '<b<%s</b>'
+ErrorFailToDeleteFile=A remoção do ficheiro '<b>%s</b>' falhou.
+ErrorFailToCreateFile=A criação do ficheiro '<b<%s</b> falhou'.
 ErrorFailToRenameDir=Erro à renomear a pasta '<b>%s</b>' a '<b>%s</b>'.
 ErrorFailToCreateDir=Erro ao criar a pasta '<b>%s</b>'
 ErrorFailToDeleteDir=Erro à eliminar a pasta '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=Este contacto já está definido como contacto para este tipo.
 ErrorCashAccountAcceptsOnlyCashMoney=Esta conta bancaria é de tipo Caixa e só aceita o método de pagamento de tipo <b>especie</b>.
 ErrorFromToAccountsMustDiffers=A conta origem e destino devem ser diferentes.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Impossivel escrever na pasta %s
 ErrorFoundBadEmailInFile=Encontrada sintaxis incorrecta em email em %s linhas em Ficheiro (Exemplo linha %s com email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Não se indicaram alguns campos obrigatórios
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Erro na criação de uma pasta. Verifique se o usuário do servidor Web tem acesso de escrita aos documentos Dolibarr. Se o parâmetro <b> safe_mode </ b> está ativo no PHP, Verifique se os arquivos php do Dolibarr são da propriedade do usuário do servidor web.
 ErrorNoMailDefinedForThisUser=E-Mail não definido para este utilizador
 ErrorFeatureNeedJavascript=Esta Funcionalidade precisa de javascript activo para funcionar. Modifique em configuração->ambiente.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoice
 ErrorWebServerUserHasNotPermission=Conta de usuário utilizada para executar <b>%s</b> servidor web não tem permissão para que
 ErrorNoActivatedBarcode=Nenhum tipo de código de barras ativado
 ErrUnzipFails=Falha ao extrair %s com o ZipArchive
-ErrNoZipEngine=Não existe nenhum mecanismo para extrair o ficheiro %s neste PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=O ficheiro %s deve ser um pacote Dolibarr no formato zip
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=O PHP CURL não está instalado, isto é essencial para comunicar com o Paypal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # 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.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice
 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/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index 455ab4e39a8..a3f3d656336 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=Parâmetro %s não definido
 ErrorUnknown=Erro desconhecido
 ErrorSQL=Erro de SQL
 ErrorLogoFileNotFound=O ficheiro logo '%s' não se encontra
-ErrorGoToGlobalSetup=Ir á configuração ' Empresa/Instituição ' para corrigir
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=Ir á configuração do módulo para corrigir
 ErrorFailedToSendMail=Erro ao envio do e-mail (emissor=%s, destinatário=%s)
 ErrorFileNotUploaded=Não foi possivel transferir o ficheiro
@@ -153,6 +153,7 @@ Edit=Editar
 Validate=Validar
 ValidateAndApprove=Validar e Aprovar
 ToValidate=Para validar
+NotValidated=Not validated
 Save=Guardar
 SaveAs=Guardar Como
 TestConnection=Teste a ligação
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=Função aplicativo não desconetado com modo de aut
 Connection=Ligação
 Setup=Configuração
 Alert=Alerta
+MenuWarnings=Alertas
 Previous=Anterior
 Next=Seguinte
 Cards=Fichas
@@ -308,6 +310,7 @@ Copy=Copiar
 Paste=Colar
 Default=Predefinição
 DefaultValue=Valor Predefinido
+DefaultValues=Default values
 Price=Preço
 UnitPrice=Preço Unitário
 UnitPriceHT=Preço Base (base)
@@ -363,7 +366,8 @@ VATRate=Taxa IVA
 Average=Média
 Sum=Soma
 Delta=Divergencia
-Module=Módulo
+Module=Module/Application
+Modules=Modules/Applications
 Option=Opção
 List=Lista
 FullList=Lista Completa
@@ -387,7 +391,7 @@ ActionRunningNotStarted=Não Iniciado
 ActionRunningShort=In progress
 ActionDoneShort=Terminado
 ActionUncomplete=Incompleta
-CompanyFoundation=Empresa/Fundação
+CompanyFoundation=Empresa/Organização
 ContactsForCompany=Contactos para este terceiro
 ContactsAddressesForCompany=Contactos/moradas para este terceiro
 AddressesForCompany=Moradas para este terceiro
@@ -405,8 +409,9 @@ Generate=Gerar
 Duration=Duração
 TotalDuration=Duração total
 Summary=Resumo
-DolibarrStateBoard=Estatísticas
-DolibarrWorkBoard=Indicadores de Trabalho
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=Disponível
 NotYetAvailable=Ainda não disponivel
 NotAvailable=Não disponivel
@@ -434,7 +439,7 @@ Reportings=Relatórios
 Draft=Rascunho
 Drafts=Rascunhos
 Validated=Validado
-Opened=Aberto
+Opened=Abrir
 New=Novo
 Discount=Desconto
 Unknown=Desconhecido
@@ -453,6 +458,7 @@ NextStep=Passo Seguinte
 Datas=Dados
 None=Nenhum
 NoneF=Nenhuma
+NoneOrSeveral=None or several
 Late=Atraso
 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.
 Photo=Foto
@@ -461,7 +467,7 @@ AddPhoto=Adicionar foto
 DeletePicture=Apagar Imagem
 ConfirmDeletePicture=Confirmar eliminação da imagem?
 Login=Iniciar Sessão
-CurrentLogin=Login actual
+CurrentLogin=Sessão atual
 EnterLoginDetail=Enter login details
 January=Janeiro
 February=Fevereiro
@@ -606,7 +612,8 @@ PartialWoman=Parcial
 TotalWoman=Total
 NeverReceived=Nunca Recebido
 Canceled=Cancelado
-YouCanChangeValuesForThisListFromDictionarySetup=Pode alterar estes valores no menu configuração->dicionários
+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
 Color=Cor
 Documents=Documentos
@@ -642,6 +649,7 @@ FreeLineOfType=Entrada livre do tipo
 CloneMainAttributes=Copiar objeto com os seus atributos principais
 PDFMerge=PDF Merge
 Merge=Junção
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Visualizar página para impressão área de conteúdo principal
 MenuManager=Gestão do menu
 WarningYouAreInMaintenanceMode=Atenção, você está em um modo de manutenção, tão somente <b>%s</b> login é permitido o uso de aplicativos no momento.
@@ -692,7 +700,7 @@ ByMonthYear=Por mês / ano
 ByYear=por ano
 ByMonth=por mês
 ByDay=Por dia
-BySalesRepresentative=Ao representante de vendas
+BySalesRepresentative=Por representante de vendas
 LinkedToSpecificUsers=Associado ao contacto de um utilizador
 NoResults=Sem resultados
 AdminTools=Admin tools
@@ -708,6 +716,7 @@ from=Emissor
 toward=relativamente a
 Access=Acesso
 SelectAction=Select action
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Use Ctrl+C para copiar
 SaveUploadedFileWithMask=Guardar o ficheiro no servidor com o nome  "<strong>%s</strong>" (caso contrário "%s")
 OriginFileName=Nome do ficheiro original
@@ -718,7 +727,7 @@ ViewPrivateNote=Ver notas
 XMoreLines=%s linhas(s) ocultas
 PublicUrl=URL público
 AddBox=Adicionar Caixa
-SelectElementAndClickRefresh=Selecione um elemento e actualize a pagina
+SelectElementAndClick=Select an element and click %s
 PrintFile=Imprimir Ficheiro %s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Vá Início - Configurar - Empresa para alterar o logótipo ou vá a Início - Configurar - Exibir para ocultar.
@@ -734,8 +743,8 @@ Hello=Olá
 Sincerely=Sincerely
 DeleteLine=Apagar a linha
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
@@ -755,11 +764,20 @@ Calendar=Calendario
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Ano Fiscal
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Segunda-feira
 Tuesday=Terça-feira
@@ -806,9 +824,9 @@ SearchIntoUsers=Utilizadores
 SearchIntoProductsOrServices=Products or services
 SearchIntoProjects=Projetos
 SearchIntoTasks=Tarefas
-SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
-SearchIntoCustomerOrders=Customer orders
+SearchIntoCustomerInvoices=Faturas de Clientes
+SearchIntoSupplierInvoices=Faturas de Fornecedores
+SearchIntoCustomerOrders=Encomendas de clientes
 SearchIntoSupplierOrders=Supplier orders
 SearchIntoCustomerProposals=Customer proposals
 SearchIntoSupplierProposals=Supplier proposals
@@ -817,5 +835,3 @@ SearchIntoContracts=contractos
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Relatórios de despesas
 SearchIntoLeaves=Licenças
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/pt_PT/other.lang b/htdocs/langs/pt_PT/other.lang
index dd9a9eee46e..75f0feb81e6 100644
--- a/htdocs/langs/pt_PT/other.lang
+++ b/htdocs/langs/pt_PT/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=Data de Nascimento
 BirthdayAlertOn=Alerta de aniversário activo
 BirthdayAlertOff=Alerta aniversário inativo
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=Validação Ficha Intervenção
 Notify_FICHINTER_SENTBYMAIL=Intervenções enviadas por correio
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=Este é um email de <b>teste</b> (o teste de palavra deve
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -141,25 +155,25 @@ SizeUnitfoot=pé
 SizeUnitpoint=ponto
 BugTracker=Incidencias
 SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address.<br />Change will become effective once you click on the confirmation link in the email.<br />Check your inbox.
-BackToLoginPage=Voltar e a página de ligação
+BackToLoginPage=Voltar à página de iniciar a sessão
 AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br />In this mode, Dolibarr can't know nor change your password.<br />Contact your system administrator if you want to change your password.
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Prof Id %s</b> é uma informação dePendente do país do Terceiro.<br>Por Exemplo, para o país  <b>%s</b>, é o código <b>%s</b>.
 DolibarrDemo=Demo de Dolibarr ERP/CRM
-StatsByNumberOfUnits=Estatísticas em número de unidades de produto/serviço
-StatsByNumberOfEntities=Estatísticas em número de identidadees referentes
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=Intervenção %s validados
 EMailTextInvoiceValidated=Factura %s validados
diff --git a/htdocs/langs/pt_PT/projects.lang b/htdocs/langs/pt_PT/projects.lang
index 0e79a52bfed..d1b6fb71060 100644
--- a/htdocs/langs/pt_PT/projects.lang
+++ b/htdocs/langs/pt_PT/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Área de Projetos
 ProjectStatus=Estado do projeto
 SharedProject=Toda a Gente
 PrivateProject=contatos do Projeto
+ProjectsImContactFor=Projects I'm explicitely a contact of
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=Todos os Projetos
 MyProjectsDesc=Esta visualização está limitada a projetos onde é um contacto para (seja qual for o tipo).
 ProjectsPublicDesc=Esta visualização apresenta todos os projetos que está autorizado a ler.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=Esta visualização apresenta todos os projetos e tarefas (as suas per
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=Novo Projeto
 AddProject=Criar Projeto
 DeleteAProject=Apagar um Projeto
 DeleteATask=Apagar uma Tarefa
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Projetos abertos
-OpenedTasks=Tarefas abertas
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Mostrar Projeto
 SetProject=Definir Projeto
 NoProject=Nenhum projeto definido ou possuído
 NbOfProjects=Nr. de Projetos
+NbOfTasks=Nb of tasks
 TimeSpent=Tempo Dispendido
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
@@ -47,9 +52,9 @@ TaskTimeSpent=Tempo despendido nas tarefas
 TaskTimeUser=Utilizador
 TaskTimeNote=Nota
 TaskTimeDate=Data
-TasksOnOpenedProject=Tarefas nos projetos abertos
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Carga de trabalho não definida
-NewTimeSpent=Novo Tempo Dispendido
+NewTimeSpent=Tempos Dispendidos
 MyTimeSpent=Meu Tempo Dispendido
 Tasks=Tarefas
 Task=Tarefa
@@ -59,6 +64,7 @@ TaskDescription=Descrição da tarefa
 NewTask=Nova Tarefa
 AddTask=Criar Tarefa
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Atividade
 Activities=Tarefas/Atividades
 MyActivities=As Minhas Tarefas/Atividades
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Lista de Contratos Associados ao Projeto
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=Lista de intervenções associadas ao projeto
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=contatos do Projeto
 ActionsOnProject=Ações sobre o projeto
 YouAreNotContactOfProject=Não é um contato deste projeto privado
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Excluir o tempo gasto
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=Ver também as tarefas não me atribuidas
@@ -110,7 +118,7 @@ TaskRessourceLinks=Recursos
 ProjectsDedicatedToThisThirdParty=Projetos dedicados a este terceiro
 NoTasks=Não existem tarefas para este projeto
 LinkedToAnotherCompany=Vinculado a Terceiros
-TaskIsNotAffectedToYou=Tarefas que não lhe foram atribuidas
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=Tempo dispensado está vazio
 ThisWillAlsoRemoveTasks=Esta ação também vai excluir todas as tarefas do projeto (<b>%s</b> tarefas no momento) e todas as entradas de tempo dispensadas.
 IfNeedToUseOhterObjectKeepEmpty=Caso alguns objetos (fatura, encomenda, ...), pertencentes a um terceiro, deve estar vinculado ao projeto para criar, manter este vazio para ter o projeto sendo multi-terceiros.
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projetos com este utilizador como contacto
 TasksWithThisUserAsContact=Tarefas atribuídas a este utilizador
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Atribuir 
 ProjectOverview=Resumo
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Apenas oportunidades
-OpenedOpportunitiesShort=Oportunidades abertas
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/ro_RO/accountancy.lang b/htdocs/langs/ro_RO/accountancy.lang
index 1e898fa8f06..4c6f707faec 100644
--- a/htdocs/langs/ro_RO/accountancy.lang
+++ b/htdocs/langs/ro_RO/accountancy.lang
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Contabilitate
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=Add un cont contabil
 AccountAccounting=Cont contabil
 AccountAccountingShort=Cont
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=Cartea Mare
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Sold cont
 
 CAHTF=Total purchase supplier before tax
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Jurnal vânzări
@@ -132,19 +140,19 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Număr nota contabila
 TransactionNumShort=Num. transaction
-AccountingCategory=Categorie Contabilitate
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Jurnal Bancă
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Debitul și creditul nu pot avea o valoare, în același timp,
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=Lista conturilor contabile
 
 Pcgtype=Clasa contului
-Pcgsubtype=Sub Clasa contului
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Total Marje vânzări
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Eroare, nu puteți șterge acest cont contabil, deoarece este folosit
 MvtNotCorrectlyBalanced=Miscare incorect efectuata   . Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Aplica categorii bulk
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Cod
+Nature=Personalitate juridică
+AccountingJournalType1=Various operation
+AccountingJournalType2=Vânzări
+AccountingJournalType3=Achiziţii
+AccountingJournalType4=Banca
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Exporturi
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export către  Sage Ciel Compta sau Compta Evolution
 Modelcsv_quadratus=Export către Quadratus QuadraCompta
 Modelcsv_ebp=Export către EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculat
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=Formatul exportat nu este suportat in aceasta pagina
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index 21d4ad84942..66416440fd3 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=Utilizatori interni
 ExternalUsers=Utilizatori externi
 GUISetup=Afişare
 SetupArea=CONFIGURARE
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Formular pentru testarear încărcării de  fişiere (în funcţie de configurare)
 IfModuleEnabled=Notă: Da este folositor numai dacă modul  <b>%s</b> este activat
 RemoveLock=Eliminaţi  fişierul <b>%s</b> dacă acesta există, pentru a permite utilizarea instrumentelor de actualizare.
@@ -85,7 +86,7 @@ Mask=Masca
 NextValue=Următoarea valoare
 NextValueForInvoices=Urmatoarea valoare (facturi)
 NextValueForCreditNotes=Urmatoarea valoare (credit note)
-NextValueForDeposit=Urmatoarea Valoare()
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Urmatoarea valoare(înlocuiri)
 MustBeLowerThanPHPLimit=Notă:  PHP limitează fiecare upload ladimensiunea de <b> %s</b>  %s chiar dacă valoarea acestui parametru este
 NoMaxSizeByPHPLimit=Notă: Nicio limită setată în configuraţia dvs. PHP
@@ -103,7 +104,7 @@ MenuIdParent=ID Meniu părinte
 DetailMenuIdParent=ID-ul  meniului părinte (0 pentru top meniu )
 DetailPosition=Sortează numărul meniu pentru a defini poziţia
 AllMenus=Toate
-NotConfigured=Modul neconfigurat
+NotConfigured=Module/Application not configured
 Active=Activ
 SetupShort=Setări
 OtherOptions=Alte opţiuni
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Separator mii
 Destination=Destinaţii
 IdModule=ID Modul
 IdPermissions=ID Permisiuni
-Modules=Module
 LanguageBrowserParameter=Parametru %s
 LocalisationDolibarrParameters=Parametrii Localizare
 ClientTZ=Time Zone client (utilizator)
@@ -123,7 +123,8 @@ PHPTZ=Time Zone Server PHP
 DaylingSavingTime=Ora de vară (utilizator)
 CurrentHour=Timp  PHP (server)
 CurrentSessionTimeOut=Sesiunea curentă timeout
-YouCanEditPHPTZ=Pentru a seta un alt fus orar PHP (nu este obligatoriu), aveți posibilitatea să încercați să adăugați la fișierul .htacces cu o linie de genul acesta"SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgeturi
 MaxNbOfLinesForBoxes=Număr maxim de linii pentru widgeturi
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Permisiuni
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Numai elementele din <a href="%s"> module activate </a> sunt afişate.
-ModulesDesc=Modulele Dolibarr definesc care funcționalitatea este activată în software. Unele module necesită permisiuni pe care trebuie să le acordați utilizatorilor, după activarea modulului. Faceți clic pe butonul de pornire/oprire pentru a activa un modul/caracteristică.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=Puteți descărca mai multe module de pe site-uri externe de pe Internet ...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Baza de date parola criptat în conf.php
 InstrucToEncodePass=Pentru a fi parola codificată în dosarul <b>conf.php</b>, înlocuiţi linia  <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=Protecţie a generat pdf (nu recommandd, pauzele de masă PDF Generation)
-ProtectAndEncryptPdfFilesDesc=De protecţie a unui document PDF păstrează disponibil pentru a citi şi de a imprima cu orice browser PDF. Cu toate acestea, editarea şi copierea nu este posibil acum. Reţineţi că utilizarea acestei funcţii face construirea unui globale cumulate pdf nu de lucru (cum ar fi facturile unpaid).
+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=Funcţionalitate
 DolibarrLicense=Licenţa
 Developpers=Dezvoltatori / colaboratori
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr demo online
 OfficialMarketPlace=Oficial loc pe piaţă pentru modulelor externe / addons
 OfficialWebHostingService=Referinţă Servicii de web hosting (Cloud hosting)
 ReferencedPreferredPartners=Parteneri preferati
-OtherResources=Alte Resurse
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=Pentru utilizator sau developer documentaţia (doc, FAQs ...), <br> aruncăm o privire la Dolibarr Wiki: <br> <a href="%s" target="_blank"><b> %s</b></a>
 ForAnswersSeeForum=Pentru orice alte întrebări / ajutor, se poate utiliza Dolibarr forum: <br> <a href="%s" target="_blank"><b> %s</b></a>
 HelpCenterDesc1=Această zonă vă poate ajuta să obţineţi un suport de Ajutor de servicii pe Dolibarr.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=Caracteristicã nu sunt disponibile pe Unix, cum ar f
 SubmitTranslation=Dacă traducerea este incompletă sau găsiți erori, puteți corecta prin editarea fișierului în directorul <b>langs/%s</b> și trimite schimbările la 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=Configurare Modul
-ModulesSetup=Configurare Module
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Sistem
 ModuleFamilyCrm=Clientul Ressource Management (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=Dolibarr versiunea curentă
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Ultima versiune stabilă
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Update server offline
+WithCounter=Manage a counter
 GenericMaskCodes=Puteți introduce orice mască de numerotare. În această mască, ar putea fi folosit următoarele etichete: <br> <b>{000000}</b> corespunde unui număr care va fi incrementat pe fiecare% s. Introduceți cât mai multe zerouri ca lungimea dorită a contra. Contorul va fi completat cu zerouri la stânga, în scopul de a avea cât mai multe zerouri ca masca. <br> <b>{000000} +000</b> fel ca și anterior, dar o compensare corespunzător cu numărul din dreapta semnului + se aplică începând cu prima% s. <br> <b>{000000 @ x}</b> fel ca și anterior, dar contorul este resetat la zero atunci când se ajunge la o lună x (x între 1 și 12, sau 0 pentru a folosi primele luni ale anului fiscal definite în configurația dvs., sau 99 pentru a reseta la zero în fiecare lună ). Dacă această opțiune este folosită și x este 2 sau mai mare, atunci secvența {aa} {mm} sau {AAAA} {mm} este de asemenea necesară. <br> <b>{Dd}</b> zi (01 la 31). <br> <b>{Mm}</b> luni (01 la 12). <br> <b>{AA}, {AAAA}</b> sau <b>{y}</b> an peste 2, 4 sau 1 numere. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Toate celelalte caractere în masca va rămâne intactă. <br> Spaţiile nu sunt permise. <br>
-GenericMaskCodes4a=<u>Exemplu pe 99th %s de-a treia parte TheCompany făcut 2007-01-31:</u> <br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Exemplu de la o terţă parte a creat pe 2007-03-01:</u> <br>
 GenericMaskCodes4c=<u>Examplu pe produs creat pe  2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> va da<b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> va da <b>0199-ZZZ/31/XXX</b>
+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=Întoarceţi-vă un număr de personalizabil definite în conformitate cu o masca.
 ServerAvailableOnIPOrPort=Server este disponibil la <b>adresa %s</b> pe <b>portul %s</b>
 ServerNotAvailableOnIPOrPort=Serverul nu este disponibil la <b>adresa %s</b> pe <b>portul %s</b>
@@ -369,19 +375,21 @@ Int=Întreg
 Float=Float
 DateAndTime=Data şi ora
 Unique=Unic
-Boolean=Boolean (Checkbox)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Telefon
 ExtrafieldPrice = Preţ
 ExtrafieldMail = Email
 ExtrafieldUrl = Url
 ExtrafieldSelect = Select Listă 
 ExtrafieldSelectList = Select din tabel
-ExtrafieldSeparator=Separator
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Parolă
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio buton
-ExtrafieldCheckBoxFromList= Checkbox din tabel
+ExtrafieldRadio=Radio buttons (on choice only)
+ExtrafieldCheckBox=Checkboxes
+ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link către un obiect
+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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Lista de parametri trebuie să fie de tip cheie, valoare <br><br> pentru exemplul: <br> 1, valoare1 <br> 2, valoare2 <br> 3, value3 <br> ...
 ExtrafieldParamHelpradio=Lista de parametri trebuie să fie de tip  cheie, valoare <br><br> pentru exemplul: <br> 1, valoare1 <br> 2, valoare2 <br> 3, value3 <br> ...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Câmp
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Utilizatori & grupuri
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=Facturi şi note de credit "de management pentru clienţi. Facturi
 Module40Name=Furnizori
 Module40Desc=Managementul Furnizorilor şi aprovizionării  (comenzi si facturi)
 Module42Name=Loguri
-Module42Desc=Jurnalizarea facilităţi (syslog)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Editori
 Module49Desc=Managementul Editorilor
 Module50Name=Produse
@@ -499,8 +521,8 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar integrare
 Module500Name=Cheltuieli speciale
 Module500Desc=Managementul cheltuielilor speciale (impozite, taxe sociale sau fiscale, dividende)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Credit
 Module520Desc=Gestionarea creditelor
 Module600Name=Notificări
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP conversii Maxmind capacităţile
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
-Module4000Desc=Managementul resurselor umane
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi-societate
 Module5000Desc=Vă permite să administraţi mai multe companii
 Module6000Name=Flux de lucru
@@ -591,7 +615,7 @@ Permission32=Creare / Modificare produse / servicii
 Permission34=Ştergere produse / servicii
 Permission36=Exportul de produse / servicii
 Permission38=Exportul de produse
-Permission41=Citește proiecte și sarcini (proiecte comune și proiecte la care sunt persoana de contact). Se poate introduce, de asemenea, timpul consumat cu privire la sarcinile atribuite (pontajul)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Ştergere proiecte
 Permission45=Export proiecte
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Metode de comandă
 DictionarySource=Originea ofertei  / comenzi
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Model pentru plan de conturi
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Șabloane e-mailuri 
 DictionaryUnits=Unităţi
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Tipuri concedii
 DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Setup salvate
+SetupNotSaved=Setup not saved
 BackToModuleList=Inapoi la lista de module
 BackToDictionaryList=Inapoi la lista de dicţionare
 VATManagement=TVA-ul de management
@@ -921,7 +947,7 @@ Host=Server
 DriverType=Driver de tip
 SummarySystem=Sistemul de informaţii rezumat
 SummaryConst=Lista tuturor Dolibarr setarea parametrilor
-MenuCompanySetup=Societatea/ Fundaţia
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= Manager meniul Standard
 DefaultMenuSmartphoneManager=Manager meniul  Smartphone
 Skin=Tema vizuală
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Lungime max implicită pentru lista
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=Mesajul zilei
 MessageLogin=Mesaj pagina login
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Formular de căutare permanent in meniu din  stânga
 DefaultLanguage=Limba folosita  implicit (cod limba)
 EnableMultilangInterface=Activaţi multilingv interfaţă
 EnableShowLogo=Afişare logo în meniul stânga
-CompanyInfo=Companie / fundaţie informaţii
-CompanyIds=Companie / fundaţie identităţi
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=Nume
 CompanyAddress=Adresă
 CompanyZip=Zip
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Toleranta întârziere (în zile) înainte de alertă
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Toleranta întârziere (în zile) înainte de alertă pentru cecuri de depozit pentru a face
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=\nZona de configurare este pentru parametrii de configurare inițiali înainte de a începe să se utilizeze Dolibarr.
-SetupDescription2=Cele mai importante două etape  de configurare sunt primele două din meniul de setare din partea stângă: pagina de configurare pentru Companie/fundație și pagina de configurare a Modulelor:
-SetupDescription3=Parametrii din meniul <a href="%s"> Setup -> Companie / fundație </a> sunt necesari  deoarece datele transmise sunt utilizate pe ecranele Dolibarr și pentru a personaliza comportamentul implicit al software-ului (pentru caracteristicile legate de țară, de exemplu) .
-SetupDescription4=Parametrii din meniul <a href="%s"> Configurare -> Module </a> sunt necesari, deoarece Dolibarr nu este un ERP/CRM monolitic, ci o colecție de mai multe module, toate mai mult sau mai puțin independente. Noile caracteristici vor fi adăugate meniurilor pentru fiecare modul pe care îl veți activa.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Alte meniul intrări gestiona parametri opţionali.
 LogEvents=Audit de securitate evenimente
 Audit=Audit
@@ -987,7 +1015,7 @@ BrowserOS=Browser OS
 ListOfSecurityEvents=Lista de evenimente Dolibarr de securitate
 SecurityEventsPurged=Evenimentelor de securitate epurate
 LogEventDesc=Puteţi activa jurnalul de evenimente de securitate Dolibarr aici. Administratorii pot vedea apoi conţinutul său prin meniul <b>System Tools - Audit.</b> Atenţie, această caracteristică poate consuma o cantitate mare de date în baza de date.
-AreaForAdminOnly=Aceste caracteristici pot fi utilizate numai de către <b>administratorul de utilizatori.</b> Administrator caracteristici şi pentru a ajuta sunt identificate în Dolibarr de următoarele picto:
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Sistemul de informare este diverse informaţii tehnice ai citit doar în modul şi vizibil doar pentru administratori.
 SystemAreaForAdminOnly=Această zonă este disponibil numai pentru utilizatorii de administrator. Nici una din Dolibarr permisiunile pot reduce această limită.
 CompanyFundationDesc=Editați pe această pagină toate informațiile cunoscute ale companiei sau fundației pe care trebuie să o gestionați (Pentru aceasta, faceți clic pe "Modificare" sau "Salvare", butonul din partea de jos a paginii)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Numărul total al modulelor funcţionale activate: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists in any language files
+TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Trebuie activat cel puţin 1 modul
 ClassNotFoundIntoPathWarning=Clasa %s negăsită în calea PHP
 YesInSummer=Da în vară
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Stocarea sesiune criptată prin Suhosin
 ConditionIsCurrently=Condiția este momentan %s
 YouUseBestDriver=Utilizaţi driverul %s care este cel mai bun driver disponibil acum.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Professional ID unic
 MustBeUnique=Trebuie sa fie unic?
 MustBeMandatory=Este obligatorie crearea unor terțe părți?
 MustBeInvoiceMandatory=Este obligatorie validarea facturilor?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=O export se leagă de <b>format %s</b> este disponibil la următoarea adresă: %s
 ##### Invoices #####
 BillsSetup=Facturi modul de configurare
 BillsNumberingModule=Facturi şi note de credit, modul de numerotare
 BillsPDFModules=Factura modele de documente
+PaymentsPDFModules=Payment documents models
 CreditNote=Nota de credit
 CreditNotes=Credit note
 ForceInvoiceDate=Vigoare la data facturii de validare data
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Fișierele de tip %s nu sunt puse în cache de serverul HTT
 FilesOfTypeCompressed=Fișierele de tip %s sunt comprimate de serverul HTTP
 FilesOfTypeNotCompressed=Fișierele de tip %s nu sunt comprimate de serverul HTTP
 CacheByServer=Cache pe server
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache pe browser
 CompressionOfResources=Compresie a răspunsului HTTP
+CompressionOfResourcesDesc=For exemple using the Apache directive "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=O astfel de detectare automată nu este posibilă cu browserele curente
+DefaultValuesDesc=You can define/force here the default value you want to get when your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Produse modul de configurare
 ServiceSetup=Servicii de modul de configurare
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Data facturii utilizat
 Buy=Cumpăra
 Sell=Vinde
 InvoiceDateUsed=Data facturii utilizat
-YourCompanyDoesNotUseVAT=Compania dvs. a fost definit de a nu folosi TVA (Home - Setup - Companie / fundaţiei), deci nu există opţiuni pentru a TVA-ului de instalare.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=Codul de Contabilitate
 AccountancyCodeSell=Cont vânzare. cod
 AccountancyCodeBuy=Cont cumpărare. cod
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Setați automat acest statut în filtrul de căutar
 AGENDA_DEFAULT_VIEW=Care tab doriţi să deschideţi când selectaţi meniul Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click pentru a Dial modul setup
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  Dans l'url, vous pouvez utiliser les balises<br><b>__PHONETO__</b> qui sera remplac� par le t�l�phone de l'appel�<br><b>__PHONEFROM__</b> qui sera remplac� par le t�l�phone de l'appelant (le votre)<br><b>__LOGIN__</b> qui sera remplac� par votre login clicktodial (d�fini sur votre fiche utilisateur)<br><b>__PASS__</b> qui sera remplac� par votre mot de passe clicktodial (d�fini sur votre fiche utilisateur).
+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.
 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 same computer than 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.
@@ -1510,7 +1549,7 @@ EndPointIs=Clienții SOAP trebuie să își trimită cererile la punctul final D
 ApiSetup=Configurare Modul API
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+ApiExporerIs=You can explore and test the APIs at URL
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Cheie pentru 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.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=General, pentru afişaj
 BankOrderES=Spaniol
 BankOrderESDesc=Spaniolă de afişare pentru
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=Multi-societate modul setup
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ 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.
 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.
-ConfFileMuseContainCustom=Installing 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)
 TextTitleColor=Culoare titlu pagina
 LinkColor=Culoare link-uri
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Culoare Background 
 TopMenuBackgroundColor=Culoare Background pentru Top menu
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/ro_RO/compta.lang b/htdocs/langs/ro_RO/compta.lang
index dda1589b5c3..607c95b12da 100644
--- a/htdocs/langs/ro_RO/compta.lang
+++ b/htdocs/langs/ro_RO/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Sumele prezentate aici sunt calculate fol
 Param=Setări
 RemainingAmountPayment=Suma rămasă de plată:
 Account=Cont
-Accountparent=Rădăcina contului
-Accountsparent=Rădăcina conturilor
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=Venituri
 Outcome=Cheltuieli
 ReportInOut=Venituri / Rezultate
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Impozite şi dividende
 MenuSocialContributions=Taxe sociale / fiscale
 MenuNewSocialContribution=Tax social/fiscal nou
 NewSocialContribution=Taxa sociala/fiscala noua
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Taxe sociale / fiscale de plata
 AccountancyTreasuryArea=Contabilitate / Trezorerie
 NewPayment=Plată nouă
@@ -134,8 +135,8 @@ RulesResultDue=- Include facturi deschise, cheltuieli, TVA, donații, indiferent
 RulesResultInOut=- Include plățile efective pe facturi, cheltuieli,TVA și salarii. <br> - Se ia  în calcul data plăţii facturilor, cheltuielilor, TVA-ului  și salariilor .
 RulesCADue=-Include facturile scadente de la clienți indiferent dacă sunt încasate sau nu. <br>-Se ia în calcul data de validare a acestor facturi <br> 
 RulesCAIn=- Ea include toate plăţile efective a facturilor primite de la clienti. <br> - Se bazează pe data de plată a acestor facturi <br>
-DepositsAreNotIncluded=- Facturile de depozit nu sunt incluse
-DepositsAreIncluded=- Facturile de depozit sunt incluse
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Raport de terţă parte IRPF
 LT1ReportByCustomersInInputOutputModeES=Raport pe terţ RE
 VATReport=Raport TVA
@@ -169,7 +170,7 @@ DescSellsJournal=Jurnalul de vânzări
 DescPurchasesJournal=Jurnalul de cumpărări
 InvoiceRef=Factură ref.
 CodeNotDef=Nedefinit
-WarningDepositsNotIncluded=Facturile  în avans nu sunt incluse in aceasta versiune cu acest modul de contabilitate.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Termenul de plată nu poate fi mai mic decât data obiectului.
 Pcg_version=Chart of accounts models
 Pcg_type=Pcg tip
@@ -189,8 +190,10 @@ AccountancyJournal=Jurnal cod contabilitate
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Cloneaza o taxa sociala / fiscala
 ConfirmCloneTax= Confirmare duplicare plată taxă. 
 CloneTaxForNextMonth=Clonaţi-o pentru luna următoare
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Taxe sociale / fiscale
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound= Eroare: cont bancar nu a fost găsit
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/ro_RO/cron.lang b/htdocs/langs/ro_RO/cron.lang
index 5c69dd88a17..58b98ed116a 100644
--- a/htdocs/langs/ro_RO/cron.lang
+++ b/htdocs/langs/ro_RO/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Şterge Joburi programate
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Modul de joburi programate permite să  se execute  job-uri  care au fost planificate
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Job
 CronNone=Niciunul
 CronDtStart=Dată începere
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Activare
 CronStatusInactiveBtn=Dezactivare
 CronTaskInactive=Acest post este dezactivat
 CronId=Id
-CronClassFile=Clase (filename.class.php)
-CronModuleHelp=Numele directorului modulului Dolibarr( de asemenea lucrează cu module externe Dolibarr).<BR>De exemplu să aducă metoda de obiect Produs Dolibarr  /htdocs/<u>product</u>/class/product.class.php,valoarea modulului este <i>product</i>
-CronClassFileHelp=Numele fişierului de încărcat. <BR> De exemplu să aducă metoda de obiect Produs Dolibarr  htdocs/product/class/<u>product.class.php</u>,  valoarea numelui fișierului de clasă este <i>product.class.php</i>
-CronObjectHelp=Numele obiectului de încărcat. <BR> De exemplu să aducă metoda de obiect Produs Dolibarr  / htdocs / produse / clasă / product.class.php, valoarea numelui fișierului de clasă este <i> Produs </ i>
-CronMethodHelp=Metoda obiectului de încărcat. <BR> De exemplu să aducă metoda de obiect Produs Dolibarr  /htdocs/product/class/product.class.php, valoarea metodei  este  <i>fecth</i>
-CronArgsHelp=Argumentele metodei . <BR> De exemplu să aducă metoda  obiect ului Produs Dolibarr  /htdocs/product/class/product.class.php, valoarea parametrilor pot fi este  <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=Linia de comandă de sistem pentru a executa.
 CronCreateJob=Creare job programat
 CronFrom=De la
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Intrați în meniul ''Acasă - Module Instrument
 JobDisabled=Job dezactivat
 MakeLocalDatabaseDumpShort=Backup local baza de date
 MakeLocalDatabaseDump=Creare dump local baza de date
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang
index 8b6acb43154..14acf4124b3 100644
--- a/htdocs/langs/ro_RO/errors.lang
+++ b/htdocs/langs/ro_RO/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Nu a reuşit să creeze fişierul <b>" %s".</b>
 ErrorFailToRenameDir=Nu a reuşit să redenumiţi directorul <b>" %s"</b> în <b>" %s".</b>
 ErrorFailToCreateDir=Nu a reuşit să crea directorul <b>" %s".</b>
 ErrorFailToDeleteDir=Esec pentru a şterge directorul <b>" %s".</b>
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=Acest contact este deja definit ca persoană de contact pentru acest tip.
 ErrorCashAccountAcceptsOnlyCashMoney=Acest cont bancar este un cont de bani, aşa că acceptă plăţi de tip cash numai.
 ErrorFromToAccountsMustDiffers=Sursa obiective şi conturi bancare trebuie să fie diferite.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Nu a reuşit să scrie în directorul %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=Found incorecte de email sintaxă pentru %s linii în fişier (de exemplu linia de e-mail cu %s= %s)
 ErrorUserCannotBeDelete=Utilizatorul nu poate fi şters. Poate fi asociat la o entitate Dolibarr.
 ErrorFieldsRequired=Unele campuri obligatorii nu au fost ocupate.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Nu a reuşit să creeze un director. Verificaţi ca server Web utilizator are permisiuni pentru a scrie în directorul de Dolibarr documente. Dacă <b>safe_mode</b> parametru este activat pe această PHP, Dolibarr verifica faptul că fişierele PHP detine la server web utilizator (sau grup).
 ErrorNoMailDefinedForThisUser=Nu mail definite pentru acest utilizator
 ErrorFeatureNeedJavascript=Această caracteristică JavaScript trebuie activat pentru a fi la locul de muncă. Schimbare în acest setup - display.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Cantitatea pentru linia unei facturi cl
 ErrorWebServerUserHasNotPermission=Contul de utilizator <b>%s</b> folosite pentru a executa serverul de web nu are permisiunea, pentru că
 ErrorNoActivatedBarcode=Niciun tip de coduri de bare activat
 ErrUnzipFails=Eşec la dezarhivarea fişierului %s cu ZipArchive
-ErrNoZipEngine=Niciun motor pentru dezarhivarea fișierului %s în acest PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=Fșierul %s  trebuie să fie un pachet zip Dolibarr
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=PHP CURLnu este instalat, acest lucru este esențial pentru comunicarea cu Paypal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=Nicio varialbila globala selectata
 ErrorFieldMustBeANumeric=Campul <b>%s</b> trebuie sa fie  o valoare numerica
 ErrorMandatoryParametersNotProvided= Parametrii obligatorii nu au fost furnizați 
 ErrorOppStatusRequiredIfAmount=Stabiliți o sumă estimată pentru această oportunitate / lead. Astfel, trebuie să introduceți, de asemenea, stadiul său.
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Definire greșită pentru Menu Array in descriptorul modulului (valoare greșită pentru cheia fk_menu)
 ErrorSavingChanges=A apărut o eroare la salvarea modificărilor
 ErrorWarehouseRequiredIntoShipmentLine=Depozitul este obligatoriu pe linie pentru livrare
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # Warnings
 WarningPasswordSetWithNoAccount= O parolă a fost trimisă către acest membru. Cu toate acestea, nu a fost creat nici un cont de utilizator. Astfel, această parolă este stocată, dar nu poate fi utilizată pentru autentificare. Poate fi utilizată de către un modul / interfată externă, dar dacă nu aveți nevoie să definiți un utilizator sau o parolă pentru un membru, puteți dezactiva opțiunea "Gestionați o conectare pentru fiecare membru" din modul de configurare membri. În cazul în care aveți nevoie să gestionați un utilizator, dar nu este nevoie de parolă, aveți posibilitatea să păstrați acest câmp gol pentru a evita acest avertisment. Notă: Adresa de e-mail poate fi utilizată ca utilizator la autentificare, în cazul în care membrul este legat de un utilizator. 
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Data plăţii(%s) este mai veche decât d
 WarningTooManyDataPleaseUseMoreFilters= Prea multe date (mai mult de %s linii). Folosiți mai multe filtre sau setați constanta %s la o limită superioară. 
 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=Utilizatorul-ul a fost modificat. Din motive de securitate, va trebui să vă conectați cu noul dvs. utilizator înainte de următoarea acțiune.
+WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang
index d26d4baa38c..7d2a3ac264d 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=Parametrul %s nedefinit
 ErrorUnknown=Eroare Necunoscută
 ErrorSQL=Eroare SQL
 ErrorLogoFileNotFound=Fișierul logo '% s' nu a fost găsit
-ErrorGoToGlobalSetup=Mergeţi la Configurare "Societate / Fundație" pentru rezolvare
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=Mergeţi la configurarea modulului pentru rezolvare
 ErrorFailedToSendMail=Nu se poate  trimite e-mail (expeditor=% s,  destinatar =%s)
 ErrorFileNotUploaded=Fișierul nu a fost încărcat. Verificați ca dimensiunea să nu depășească maximul permis, că spațiu pe disc este disponibil  și că nu există deja un fișier cu același nume, în acest director.
@@ -153,6 +153,7 @@ Edit=Editează
 Validate=Validează
 ValidateAndApprove=Validareaza si aproba
 ToValidate=De validat
+NotValidated=Not validated
 Save=Salvează
 SaveAs=Salvează ca
 TestConnection=Test conexiune
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=Nu există funcție de deconectare ce poate fi aplic
 Connection=Conexiune
 Setup=Setări
 Alert=Alerta
+MenuWarnings=Alerte
 Previous=Precedent
 Next=Următor
 Cards=Fişe
@@ -308,6 +310,7 @@ Copy=Copiază
 Paste=Lipeşte
 Default=Implicit
 DefaultValue=Valoare implicită
+DefaultValues=Default values
 Price=Preţ
 UnitPrice=Preţ unitar
 UnitPriceHT=Preț unitar (net)
@@ -363,7 +366,8 @@ VATRate=Taxa TVA
 Average=Medie
 Sum=Suma
 Delta=Delta
-Module=Modul
+Module=Module/Application
+Modules=Modules/Applications
 Option=Opţiunea
 List=Lista
 FullList=Lista completă
@@ -387,7 +391,7 @@ ActionRunningNotStarted=De realizat
 ActionRunningShort=In progress
 ActionDoneShort=Terminat
 ActionUncomplete=Incomplet
-CompanyFoundation=Societate sau Instituţie
+CompanyFoundation=Company/Organisation
 ContactsForCompany=Contacte pentru aceast terţ
 ContactsAddressesForCompany=Contacte pentru aceast terţ
 AddressesForCompany=Adrese pentru acest terţ
@@ -405,8 +409,9 @@ Generate=Generează
 Duration=Durata
 TotalDuration=Durată totală
 Summary=Sumar
-DolibarrStateBoard=Statistici
-DolibarrWorkBoard=Sarcini Tablou de bord
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=Disponibil
 NotYetAvailable=Nedisponibil încă
 NotAvailable=Nedisponibil
@@ -453,6 +458,7 @@ NextStep=Etapa următoare
 Datas=Date
 None=Niciunul
 NoneF=Niciunul
+NoneOrSeveral=None or several
 Late=Întârziat
 LateDesc=Durata care defineşte dacă o înregistrare este întârziată depinde de configurare. Contactaţi administratorul pentru a schimbă durata din Acasă - Setări - Alerte.
 Photo=Foto
@@ -606,7 +612,8 @@ PartialWoman=Parţial
 TotalWoman=Total
 NeverReceived=Niciodată primit
 Canceled=Anulată
-YouCanChangeValuesForThisListFromDictionarySetup=Se pot schimba valorile pentru această listă din meniul setări - dicționar
+YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu Setup - Dictionaries
+YouCanChangeValuesForThisListFrom=You can change values for this list from menu %s
 YouCanSetDefaultValueInModuleSetup=Valoarea implicită pentru o nouă înregistrare se poate defini în configirarea modulului
 Color=Culoare
 Documents=Fişiere ataşate
@@ -642,6 +649,7 @@ FreeLineOfType=Câmp liber de introdus
 CloneMainAttributes=Clonează obiect cu atributele sale principale
 PDFMerge=Îmbină PDF
 Merge=Îmbină
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Afişaţi pagina pentru imprimat în zona conţinutului principal
 MenuManager=Manager Meniu
 WarningYouAreInMaintenanceMode=Atenție, vă aflați în modul de întreținere, astfel încât numai <b>%s</b> este permis să utilizeze aplicația în acest moment.
@@ -708,6 +716,7 @@ from=de la
 toward=spre
 Access=Acces
 SelectAction=Selectați acțiune
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Utilizați Ctrl + C pentru a copia în clipboard
 SaveUploadedFileWithMask=Salvați fișierul pe server cu numele "<strong>%s</strong>" (altfel"%s")
 OriginFileName=Nume fişier original
@@ -718,7 +727,7 @@ ViewPrivateNote=Vezi notițe
 XMoreLines=%s linii(e) ascunse
 PublicUrl=URL Public
 AddBox=Adauga box
-SelectElementAndClickRefresh=Selectează un element şi click Refresh
+SelectElementAndClick=Select an element and click %s
 PrintFile=Printeaza Fisierul %s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Mergi la  Home - Setup - Company pentru a schimba logo - ul sau mergi la  Home - Setup - Display pentru a ascunde.
@@ -734,8 +743,8 @@ Hello=Salut
 Sincerely=Cu sinceritate
 DeleteLine=Şterge linie
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=Nici un PDF nu este disponibil pentru generarea documentului
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Zona pentru fişiere generate prin acţiuni în masă
 ShowTempMassFilesArea=Afişează zona pentru fişiere generate prin acţiuni în masă
@@ -755,11 +764,20 @@ Calendar=Calendar
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=An fiscal
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Luni
 Tuesday=Marţi
@@ -817,5 +835,3 @@ SearchIntoContracts=Contracte
 SearchIntoCustomerShipments=Livrări Client
 SearchIntoExpenseReports=Rapoarte Cheltuieli
 SearchIntoLeaves=Concedii
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/ro_RO/other.lang b/htdocs/langs/ro_RO/other.lang
index be0572ae809..bcb29ececd8 100644
--- a/htdocs/langs/ro_RO/other.lang
+++ b/htdocs/langs/ro_RO/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Data naştere
 DateToBirth=Data naşterii
 BirthdayAlertOn=ziua de nastere de alertă activă
 BirthdayAlertOff=ziua de nastere de alertă inactiv
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Adaugat contact la Interventie
 Notify_FICHINTER_VALIDATE=Validate intervenţie
 Notify_FICHINTER_SENTBYMAIL=Intervenţie trimisă prin mail
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=Acesta este un e-mail <b>de testare</b> (test de cuvânt
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nVeţi găsi aici oferta comercială__PROPREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nVeţi găsi aici comanda __ORDERREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYVeţi găsi aici comanda noastră__ORDERREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nVeţi găsi aici livrarea __SHIPPINGREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nVeţi găsi aici intervenţia__FICHINTERREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Prof Id-ul %s</b> este una de informaţii în funcţie de ţară terţă parte. <br> De exemplu, pentru <b>ţara %s,</b> este <b>codul %s.</b>
 DolibarrDemo=Demo Dolibarr ERP / CRM
-StatsByNumberOfUnits=Statistica în numărul de unităţi
-StatsByNumberOfEntities=Statistica în număr de entităţi
-NumberOfProposals=Numărul ofertelor pe ultimele 12 luni
-NumberOfCustomerOrders=Număr comenzi clienţi pe ultimele 12 luni
-NumberOfCustomerInvoices=Numărul facturilor clienţi pe ultimele 12 luni
-NumberOfSupplierProposals=Număr oferte  furnizor  pe ultimele 12 luni
-NumberOfSupplierOrders=Număr comenzi furnizor  pe ultimele 12 luni
-NumberOfSupplierInvoices=Număr facturi furnizor pe ultimele 12 luni
-NumberOfUnitsProposals=Numărul de unităţi pe oferte în ultimele 12 luni
-NumberOfUnitsCustomerOrders=Numărul de unităţi de pe facturile clienti pe ultimele 12 luni
-NumberOfUnitsCustomerInvoices=Numărul de unităţi de pe facturile clienti pe ultimele 12 luni
-NumberOfUnitsSupplierProposals=Numărul de unităţi pe oferte furnizori în ultimele 12 luni
-NumberOfUnitsSupplierOrders=Numărul de unităţi de pe facturile furnizori pe ultimele 12 luni
-NumberOfUnitsSupplierInvoices=Număr facturi furnizor pe ultimele 12 luni
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=O noua interventie %s ti- a fost atribuita 
 EMailTextInterventionValidated=Intervenţia %s validată
 EMailTextInvoiceValidated=Factura %s validată
diff --git a/htdocs/langs/ro_RO/paybox.lang b/htdocs/langs/ro_RO/paybox.lang
index d8bef6b0be5..a003453de43 100644
--- a/htdocs/langs/ro_RO/paybox.lang
+++ b/htdocs/langs/ro_RO/paybox.lang
@@ -11,6 +11,7 @@ YourEMail=E-mail de confirmare de plată
 Creditor=Creditor
 PaymentCode=Cod Plata
 PayBoxDoPayment=Du-te la plată
+ToPay=Emite plata
 YouWillBeRedirectedOnPayBox=Veţi fi redirecţionat pe pagina Paybox securizat la intrare ai card de credit Informatii
 Continue=Următorul
 ToOfferALinkForOnlinePayment=URL-ul pentru plata %s
diff --git a/htdocs/langs/ro_RO/projects.lang b/htdocs/langs/ro_RO/projects.lang
index b6f2f5e1326..8a515eb93f1 100644
--- a/htdocs/langs/ro_RO/projects.lang
+++ b/htdocs/langs/ro_RO/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=Statut Proiect
 SharedProject=Toată lumea
 PrivateProject=Contacte Proiect
+ProjectsImContactFor=Projects I'm explicitely a contact of
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=Toate proiectele
 MyProjectsDesc=Această vedere  este limitată la proiecte sau sarcini  pentru care sunteţi contact(indiferent de tip).
 ProjectsPublicDesc=Această vedere prezintă toate proiectele la care aveţi permisiunea să le  citiţi.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=Această vedere prezintă toate proiectele şi sarcinile (permisiuni d
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=Proiect nou
 AddProject=Creare proiect
 DeleteAProject=Şterge  proiect
 DeleteATask=Şterge task
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Opened projects
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Afişează proiect
 SetProject=Setare proiect
 NoProject=Niciun proiect definit sau responsabil
 NbOfProjects=Nr proiecte
+NbOfTasks=Nb of tasks
 TimeSpent=Timp comsumat
 TimeSpentByYou=Timpul consumat  da tine
 TimeSpentByUser=Timp consumat pe utilizator
@@ -47,9 +52,9 @@ TaskTimeSpent=Timp consumat pe task
 TaskTimeUser=Utilizator
 TaskTimeNote=Nota
 TaskTimeDate=Data
-TasksOnOpenedProject=Sarcini la proiectele deschise
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Volumul de muncă nu este definit
-NewTimeSpent=Timp nou consumat
+NewTimeSpent=Timpi consumaţi
 MyTimeSpent=Timpul meu consumat
 Tasks=Taskuri
 Task=Task
@@ -59,6 +64,7 @@ TaskDescription=Descriere task
 NewTask=Task nou
 AddTask=Creare sarcină 
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Activitate
 Activities=Activităţi / Taskuri
 MyActivities=Activităţile / Taskurile mele
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Lista contracte  asociate  la  proiect
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=Lista intervenţii  asociate  la  proiectului
 ListExpenseReportsAssociatedProject=Lista rapoartelor cheltuieli  asociate proiectului
 ListDonationsAssociatedProject=List of donations associated with the project
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Contacte Proiect
 ActionsOnProject=Evenimente pe proiect
 YouAreNotContactOfProject=Nu sunteţi un contact al acestui proiect privat
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Ştergeţi timpul  consumat
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=Afişează, de asemenea, şi taskurile ce nu sunt atribuite mie
@@ -110,7 +118,7 @@ TaskRessourceLinks=Resurse
 ProjectsDedicatedToThisThirdParty=Proiecte dedicate acestui terţ
 NoTasks=Nr sarcini pentru acest proiect
 LinkedToAnotherCompany=Legat de terţe părţi, alta
-TaskIsNotAffectedToYou=Sarcină neatribuită ţie
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=Timpul consumat nu este completat
 ThisWillAlsoRemoveTasks=Această acţiune va şterge, de asemenea, toate taskurile proiectului (<b>%s</b> ) la acest moment şitoţi timpii petrecuţi.
 IfNeedToUseOhterObjectKeepEmpty=Dacă unele obiecte (facturi, comenzi, ...), care aparţin altui terţ, trebuie să fie legate de proiect, pentru creare, menţine acest gol pentru a avea proiectul fiind multiterţi.
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Intrare pe zi
 InputPerWeek=Intrare pe saptamana
 InputPerAction=Intrare pe actiune
-TimeAlreadyRecorded=Timpul consumat deja înregistrat pentru această sarcină / zi și utilizator %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
 ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/ru_RU/accountancy.lang b/htdocs/langs/ru_RU/accountancy.lang
index 174d88cdfd1..47149e160ea 100644
--- a/htdocs/langs/ru_RU/accountancy.lang
+++ b/htdocs/langs/ru_RU/accountancy.lang
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=Добавить бухгалтерский счёт
 AccountAccounting=Бухгалтерский счёт
 AccountAccountingShort=Бухгалтерский счёт
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=Главная книга
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Журнал продаж
@@ -132,19 +140,19 @@ Sens=Sens
 Codejournal=Журнал
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Дебит и кредит не могут иметь значения одновременно
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=Список бухгалтерских счетов
 
 Pcgtype=Класс бухгалтерского счёта
-Pcgsubtype=Подкласс бухгалтерского счёта
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Итоговая наценка на продажи
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Код
+Nature=Природа
+AccountingJournalType1=Various operation
+AccountingJournalType2=Продажи
+AccountingJournalType3=Покупки
+AccountingJournalType4=Банк
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Экспорт
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index f0f43c7ccd5..343d31eef0b 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=Внутренние пользователи
 ExternalUsers=Внешние пользователи
 GUISetup=Внешний вид
 SetupArea=Раздел настроек
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Форма для проверки загрузки файлов (в зависимости от настройки)
 IfModuleEnabled=Примечание: "Да" влияет только тогда, когда модуль <b>%s</b> включен
 RemoveLock=Удалить файл <b>%s,</b> (если он существует), чтобы позволить использование инструментов обновления.
@@ -85,7 +86,7 @@ Mask=Маска
 NextValue=Следующее значение
 NextValueForInvoices=Следующее значение (счета-фактуры)
 NextValueForCreditNotes=Следующее значение (credit notes)
-NextValueForDeposit=Следующее значение (депозиты)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Следующее значение (замены)
 MustBeLowerThanPHPLimit=Примечание: ваш PHP ограничивает размер загружаемого файла до <b>%s</b> %s независимо от значения этого параметра
 NoMaxSizeByPHPLimit=Примечание: в вашей конфигурации PHP установлено <b>no limit</b>
@@ -103,7 +104,7 @@ MenuIdParent=ID родительского меню
 DetailMenuIdParent=ID родительского меню (EMPTY для верхнего меню)
 DetailPosition=Порядковый номер меню для определения позиции меню
 AllMenus=Все
-NotConfigured=Модуль не настроен
+NotConfigured=Module/Application not configured
 Active=Активная
 SetupShort=Настройка
 OtherOptions=Другие опции
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Разделитель разрядов
 Destination=Назначение
 IdModule=ID модуля
 IdPermissions=ID прав доступа
-Modules=Модули
 LanguageBrowserParameter=Параметр %s
 LocalisationDolibarrParameters=Параметры локализации
 ClientTZ=Часовой пояс пользователя
@@ -123,7 +123,8 @@ PHPTZ=Часовой пояс PHP сервера
 DaylingSavingTime=Летнее время (пользователь)
 CurrentHour=Время PHP (на PHP-сервере)
 CurrentSessionTimeOut=Тайм-аут текущей сессии
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Виджет
 Boxes=Виджеты
 MaxNbOfLinesForBoxes=Максимальное количество строк для виджетов
@@ -142,7 +143,7 @@ PurgeAreaDesc=Эта страница позволяет вам удалить 
 PurgeDeleteLogFile=Удалить файл с логами <b>%s</b> являющегося системным журналом Dolibarr (без риска потери данных)
 PurgeDeleteTemporaryFiles=Удалить все временные файлы (без риска потери данных)
 PurgeDeleteTemporaryFilesShort=Delete temporary files
-PurgeDeleteAllFilesInDocumentsDir=Удалить все файлы в каталоге <b>%s</b>. Временные файлы, резервные копии базы данных, а также файлы, прикрепленные к элементам (контрагенты, счета-фактуры, ...) и загруженные в модуль ECM (модуль электронного документооборота) будут удалены.
+PurgeDeleteAllFilesInDocumentsDir=Удалить все файлы в директории <b>%s</b>. Временные файлы, резервные копии базы данных, а также файлы, прикрепленные к элементам (контрагенты, счета-фактуры, ...) и загруженные в модуль электронного документооборота ECM будут удалены.
 PurgeRunNow=Очистить сейчас
 PurgeNothingToDelete=Нет директории или файла для удаления.
 PurgeNDirectoriesDeleted=Удалено <b>%s</b> файлов или каталогов.
@@ -189,10 +190,10 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Права
 BoxesDesc=Виджеты компонентов отображают такую же информацию которую вы можете добавить к персонализированным страницам. Вы можете выбрать между показом виджета или не выбирая целевую страницу нажать "Активировать", или выбрать корзину для отключения.
 OnlyActiveElementsAreShown=Показаны только элементы из <a href="%s">включенных модулей</a>
-ModulesDesc=Модули Dolibarr определяют какая функциональность будет доступна в программе. Так же модулям необходимы разрешения которые необходимо предоставить пользователям после включения модуля. Нажмите на on/off для включения или отключения модуля.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=В интернете вы можете найти больше модулей для загрузки...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external modules...
+ModulesMarketPlaces=Поиск внешних модулей...
 GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, официальный магазин внешних модулей Dolibarr ERP / CRM
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Зашифровать пароль к базе
 InstrucToEncodePass=Чтобы поместить зашифрованный пароль в <b>conf.php</b> файл, замените строку <br><b>$dolibarr_main_db_pass ="..."</b><br>на<br><b>$dolibarr_main_db_pass"=crypted:%s"</b>
 InstrucToClearPass=Чтобы поместить не зашифрованный пароль в <b>conf.php</b> файл, замените строку <br><b>$dolibarr_main_db_pass="crypted:..."</b><br>на<br><b>$dolibarr_main_db_pass="%s"</b>
 ProtectAndEncryptPdfFiles=Защита создаваемых PDF файлов (НЕ РЕКОМЕНДУЕТСЯ при массовом создании PDF)
-ProtectAndEncryptPdfFilesDesc=Защита PDF документа оставляет его доступным для чтения и печати PDF любым браузером. Вместе с тем, редактирование и копирование запрещается. Заметим, что из-за использования этой опции создание глобального аккумулированного PDF перестает работать (например неоплаченные счета-фактуры).
+ProtectAndEncryptPdfFilesDesc=Защита документов PDF допускает чтение и распечатку любым приложением просмотра файлов PDF. Однако редактирование и копирование не возможно. Использование этой возможности не позволит глобальное объединение файлов PDF.
 Feature=Возможность
 DolibarrLicense=Лицензия
 Developpers=Разработчики / авторы
@@ -224,7 +225,9 @@ OfficialDemo=Демонстрация возможностей Dolibarr в ин
 OfficialMarketPlace=Официальный магазин внешних модулей / дополнений
 OfficialWebHostingService=Рекомендуемые сервисы веб-хостинга (облачный хостинг)
 ReferencedPreferredPartners=Предпочитаемые партнёры
-OtherResources=Другие ресурсы
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=Для получения документации пользователя или разработчика (документация, часто задаваемые вопросы...),<br> посетите Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=Для любых других вопросов / помощи, вы можете использовать форум Dolibarr:<br><b><a href="%s" target="_blank">%s</b></a>
 HelpCenterDesc1=Этот раздел может помочь вам получить помощь службы поддержки по Dolibarr.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=Функция недоступна на Unix под
 SubmitTranslation=Если перевод на этот язык не завершен или вы нашли ошибки, вы можете исправить их отредактировав файлы в папке <b>langs/%s</b> и отправив внесенные изменения на www.transifex.com/dolibarr-association/dolibarr/
 SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
 ModuleSetup=Настройка модуля
-ModulesSetup=Настройка модулей
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Система
 ModuleFamilyCrm=Управление взаимоотношениями с клиентами (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -275,7 +278,7 @@ ModuleFamilyProducts=Управление продукцией (PM)
 ModuleFamilyHr=Управление персоналом (HR)
 ModuleFamilyProjects=Проекты / Совместная работа
 ModuleFamilyOther=Другое
-ModuleFamilyTechnic=Инструменты для массовых модулей
+ModuleFamilyTechnic=Много-модульные инструменты
 ModuleFamilyExperimental=Экспериментальные модули
 ModuleFamilyFinancial=Финансовые модули (Бухгалтерия / Казначейство)
 ModuleFamilyECM=Управление электронным содержимым (ECM)
@@ -287,36 +290,39 @@ DoNotUseInProduction=Не используйте в производстве
 ThisIsProcessToFollow=Это шаги для процесса:
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Шаг %s
-FindPackageFromWebSite=Найдите пакет, который обеспечивает функции которые вы хотите (например, на официальном веб-сайте %s).
-DownloadPackageFromWebSite=Скачайте пакет (например, на официальном веб-сайте %s).
-UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+FindPackageFromWebSite=Поиск пакета, который обеспечивает функции которые вы хотите (например, на официальном веб-сайте %s).
+DownloadPackageFromWebSite=Загрузка пакета (например, на официальном веб-сайте %s).
+UnpackPackageInDolibarrRoot=Распаковка файлов пакета на сервере Dolibarr: <b>%s</b>
 UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <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>.
-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='http://myserver/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.
+SetupIsReadyForUse=Развертывание модуля завершено. Теперь необходимо включить и настроить модуль в вашей программе на странице настройки модуля: <a href="%s">%s</a>.
+NotExistsDirect=Альтернативная корневая директория не задана.<br>
+InfDirAlt=Начиная с 3-ей версии, можно определить альтернативный корневой каталог. Это позволяет вам хранить в специальном каталоге, плагины и настраиваемые шаблоны. <br> Просто создайте каталог в корне Dolibarr (например: custom). <br>
+InfDirExample=<br> Затем укажите его в файле <strong> conf.php </strong> <br> \n$ dolibarr_main_url_root_alt = 'http://myserver/custom' <br> $ dolibarr_main_document_root_alt = '/путь/к/dolibarr/htdocs/Custom'<br> Если эти строки закомментированы с помощью «#», раскомментируйте их, удалив символ «#» чтобы включить их.
 YouCanSubmitFile=На этом шаге вы можете отправить пакет используя этот инструмент: Выберите файл модуля
 CurrentVersion=Текущая версия Dolibarr
 CallUpdatePage=Перейдите на страницу, где вы сможете обновить структуру базы данных и данные: %s.
 LastStableVersion=Последняя стабильная версия
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Сервер обновления недоступен
+WithCounter=Manage a counter
 GenericMaskCodes=Вы можете ввести любую цифровую маску. В этой маске можно использовать следующие тэги:<br><b>{000000}</b> соответствующий номер будет увеличиваться для каждого %s. Введите столько нулей сколько соответствует длине счетчика. Счетчик будет заполнен слева нулями в таком количестве как указано в маске. <br><b>{000000+000}</b> как предыдущая, но со смещением на количество справа + знаки начиная с первого %s. <br><b>{000000@x}</b> то же что и предыдущее, но счетчик будет обнулен когда наступит месяц Х (x может быть от 1 до 12, or 0 для использования заранее или налоговый год определен в вашей конфигурации, или 99 для обнуления каждый месяц). Если эта опция используется и х равен 2 или более чем последовательность {yy}{mm} или {yyyy}{mm} это тоже необходимо. <br><b>{dd}</b> день (от 01 до 31).<br><b>{mm}</b> месяц (от 01 до 12).<br><b>{yy}</b>, <b>{yyyy}</b> или <b>{y}</b> год указывается 2, 4 или 1 цифрами. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
-GenericMaskCodes3=Все другие символы в маске останутся нетронутыми. <br>Пробелы не допускается. <br>
-GenericMaskCodes4a=<u>Пример 99-й %s компании контрагента созданной 2007-01-31:</u> <br>
+GenericMaskCodes2=<b>{cccc}</b> код клиента на n символов <br> <b> {cccc000} </b> код клиента на n символов с счетчиком, предназначенным для клиента. Этот счетчик, предназначенный для клиента, сбрасывается в то же время, что и глобальный счетчик. <br> <b> {tttt} </b> Код контрагента для n символов (см. Меню «Главная страница - Настройка - Словарь - Типы контрагентов») , Если вы добавите этот тег, счетчик будет отличаться для каждого типа контрагента. <br>
+GenericMaskCodes3=Все остальные символы в маске останутся нетронутыми. <br>Пробелы не допускается. <br>
+GenericMaskCodes4a=<U> Пример для 99-го %s контрагента Компании с датой 2007-01-31: </u> <br>
 GenericMaskCodes4b=<u>Пример контрагента созданного 2007-03-01:</u> <br>
 GenericMaskCodes4c=<u>Пример товара созданного 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> получится <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> получится <b>0199-ZZZ/31/XXX</b>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000} </b> даст <b> ABC0701-000099 </b> <br> <b> {0000+100@1}-ZZZ/{dd}/XXX</b> даст <b> 0199-ZZZ/31/XXX</b> <br> <b>IN{yy}{mm}-{0000}-{t} </b> даст <b > IN0701-0099-A </b>, если тип компании является «Responsable Inscripto» с кодом типа «A_RI»,
 GenericNumRefModelDesc=Возвращает настраиваемое число в соответствии с заданной маской.
 ServerAvailableOnIPOrPort=Сервер доступен по адресу <b>%s</b> порт <b>%s</b>
 ServerNotAvailableOnIPOrPort=Сервер не доступен по адресу <b>%s</b> порт <b>%s</b>
-DoTestServerAvailability=Тест соединения с сервером
-DoTestSend=Тест отправки
-DoTestSendHTML=Тест отправки HTML
+DoTestServerAvailability=Проверка соединения с сервером
+DoTestSend=Проверка отправки
+DoTestSendHTML=Проверка отправки HTML
 ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Ошибка, не возможно использовать опцию @ если последовательность {yy}{mm} или {yyyy}{mm} не в маске.
-UMask=UMask параметр для новых файлов в файловых системах Unix / Linux / BSD.
+UMask=UMask параметр для новых файлов в файловых системах Unix / Linux / BSD / Mac.
 UMaskExplanation=Этот параметр позволяет определить набор прав по умолчанию для файлов, созданных Dolibarr на сервере (при загрузке, например).<br> Это должно быть восьмеричное значение (например, 0666 означает, читать и записывать сможет каждый). <br> Этот параметр бесполезен на Windows-сервере.
 SeeWikiForAllTeam=Посмотрите на вики-странице на полный список всех участников и их организации
 UseACacheDelay= Задержка для кэширования при экспорте в секундах (0 или пусто для отключения кэширования)
@@ -369,23 +375,25 @@ Int=Целое
 Float=С плавающей запятой
 DateAndTime=Дата и время
 Unique=Уникальный
-Boolean=Двоичный (флажок)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Телефон
 ExtrafieldPrice = Цена
 ExtrafieldMail = Адрес электронной почты
 ExtrafieldUrl = Url
 ExtrafieldSelect = Выбрать из списка
 ExtrafieldSelectList = Выбрать из таблицы
-ExtrafieldSeparator=Разделитель
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Пароль
-ExtrafieldCheckBox=Флажок
-ExtrafieldRadio=Переключатель
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldRadio=Radio buttons (on choice only)
+ExtrafieldCheckBox=Checkboxes
+ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Ссылка на объект
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Параметры списка имеют ключи, значение<br><br> например : <br>1,значение1<br>2,значение2<br>3,значение3<br>...
-ExtrafieldParamHelpradio=Параметры списка имеют ключи, значение<br><br> например : <br>1,значение1<br>2,значение2<br>3,значение3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+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'
+ExtrafieldParamHelpselect=Список параметров должен быть в формате ключ, значение <br> <br> например: <br> 1,значение1 <br> 2,значение2 <br> 3,значение3 <br>... <br> <br>Иметь список зависимый от другого дополнительного списка атрибутов: <br> 1,value1|options_<i> parent_list_code </i>: parent_key <br> 2,value2|options_<i> parent_list_code </i>: parent_key <br> <br> Список в зависящий от другого списка: <br> 1,value1|<i>parent_list_code</i>:parent_key<br> 2,значение2|<i>parent_list_code</i>:parent_key
+ExtrafieldParamHelpcheckbox=Список параметров имеет ключ,значение<br><br> например : <br>1,значение1<br>2,значение2<br>3,значение3<br>...
+ExtrafieldParamHelpradio=Список параметров имеет ключ,значение<br><br> например : <br>1,значение1<br>2,значение2<br>3,значение3<br>...
+ExtrafieldParamHelpsellist=Список параметров берется из таблицы<br>Syntax : table_name:label_field:id_field::filter<br>Пример : c_typent:libelle:id::filter<br><br>фильтр может быть простым текстом (напр. active=1) отображающим только активное значение<br>Так же можно использовать $ID$ в фильтрах текущего id текущего объекта<br>Для ВЫДЕЛЕНИЯ в фильтре используйте $SEL$<br>если вы хотите фильтровать дополнительные поля используйте extra.fieldcode=... (где код поля это код дополнительного поля)<br><br>В результате вы получите список зависимый от дополнительного списка атрибутов:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>В результате вы получите список зависимый от другого списка:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Библиотека используемая для создания PDF-файлов
@@ -422,9 +430,23 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Поле
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Пользователи и группы
-Module0Desc=Users / Employees and Groups management
+Module0Desc=Управление Пользователями / Сотрудниками и Группами
 Module1Name=Контрагенты
 Module1Desc=Компании и управление контактами (клиенты, перспективы...)
 Module2Name=Коммерческие
@@ -444,7 +466,7 @@ Module30Desc=Управелние счет-фактурами и кредитн
 Module40Name=Поставщики
 Module40Desc=Управление поставщиками и закупками (заказы и счета-фактуры)
 Module42Name=Журналы
-Module42Desc=Средства журналирования (файлы, системный журнал, ...)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Редакторы
 Module49Desc=Управления редактором
 Module50Name=Продукция
@@ -464,7 +486,7 @@ Module56Desc=Интеграция телефонии
 Module57Name=Прямые банковские поручения
 Module57Desc=Управление прямыми дебиторскими платежными поручениями. Включая создание SEPA-файлов для европейских стран.
 Module58Name=ClickToDial
-Module58Desc=Интерация ClickToDial
+Module58Desc=Интеграция с системами НажатьДляЗвонка (Asterisk, ...)
 Module59Name=Bookmark4u
 Module59Desc=Добавить функцию для создания учетных записей Bookmark4u из учетной записи Dolibarr
 Module70Name=Мероприятия
@@ -499,8 +521,8 @@ Module410Name=Веб-календарь
 Module410Desc=Интеграция веб-календаря
 Module500Name=Специальные расходы
 Module500Desc=Управление специальными расходами (налоги, социальные или налоговые отчисления, дивиденды)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Ссуда
 Module520Desc=Управление ссудами
 Module600Name=Уведомления
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=Подключение к службе GeoIP MaxMind для преобразования IP-адреса в название страны
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=Отдел кадров
-Module4000Desc=Human resources management
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Группы компаний
 Module5000Desc=Управление группами компаний
 Module6000Name=Бизнес-Процесс
@@ -591,7 +615,7 @@ Permission32=Создание / изменение продукции / услу
 Permission34=Удаленные продукция / услуги
 Permission36=Просмотр / управление скрытой продукцией / услугами
 Permission38=Экспорт продукции
-Permission41=Просмотр проектов и задач (общие и мои проекты). Можно так же указать расход времени на поставленные задачи (расписание)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Создание / изменение проектов и задач (общие и мои проекты). Можно так же создать задачи и назначить пользователей для выполнения проекта и задач
 Permission44=Удаление проектов (общих и моих проектов)
 Permission45=Export projects
@@ -695,7 +719,7 @@ PermissionAdvanced253=Создать / изменить внутренних / 
 Permission254=Создать / изменить только внешних пользователей
 Permission255=Изменить пароли других пользователей
 Permission256=Удалить или отключить других пользователей
-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 assignement matters).
+Permission262=Расширенный доступ ко всем контрагентам (не только контрагентов пользователей являющихся торговыми представителями).<br> Не эффективно для внешних пользователей (всегда ограниченные только предложениями, заказами, счетами-фактурами, контрактами и т.д.).<br>Не эффективно для проектов (только правила разрешений проекта, видимости и распределение вопросов).
 Permission271=Читать CA
 Permission272=Читать счета
 Permission273=Выпуск счетов
@@ -739,11 +763,11 @@ Permission527=Экспорт ссуд
 Permission531=Читать услуги
 Permission532=Создать / изменить услуги
 Permission534=Удаление услуг
-Permission536=See / Управлять скрытыми услугами
+Permission536=Смотреть / Управлять скрытыми услугами
 Permission538=Экспорт услуг
-Permission701=Читать пожертвования
-Permission702=Создать / изменить пожертвований
-Permission703=Удалить пожертвований
+Permission701=Просмотр пожертвований
+Permission702=Создание / изменение пожертвований
+Permission703=Удаление пожертвований
 Permission771=Read expense reports (yours and your subordinates)
 Permission772=Создание/изменение отчётов о затратах
 Permission773=Удаление отчётов о затратах
@@ -751,32 +775,32 @@ Permission774=Просмотр всех отчётов о затратах (да
 Permission775=Утвердить отчёты о расходах
 Permission776=Оплата отчётов о затратах
 Permission779=Экспорт отчётов о затратах
-Permission1001=Читать запасов
+Permission1001=Просмотр запасов
 Permission1002=Создать/изменить склады
 Permission1003=Удалить склады
-Permission1004=Читать фондового движения
-Permission1005=Создать / изменить фондового движения
-Permission1101=Читать доставка заказов
-Permission1102=Создать / изменить доставки заказов
+Permission1004=Просмотр перемещений по складу
+Permission1005=Создание / изменение перемещений на складе
+Permission1101=Просмотр доставки заказов
+Permission1102=Создание / изменение доставки заказов
 Permission1104=Подтверждение доставки заказов
-Permission1109=Удалить доставка заказов
-Permission1181=Читать поставщиков
-Permission1182=Читать поставщик заказов
+Permission1109=Удаление доставки заказов
+Permission1181=Просмотр поставщиков
+Permission1182=Просмотр заказов поставщикам
 Permission1183=Создание заказов поставщикам
-Permission1184=Проверка поставщиком заказов
-Permission1185=Одобрить поставщик заказов
-Permission1186=Заказ поставщику заказов
-Permission1187=Подтвердить получение поставщиками заказов
-Permission1188=Закрыть поставщик заказов
+Permission1184=Проверка заказов поставщикам
+Permission1185=Одобрение заказов поставщикам
+Permission1186=Заказ заказов поставщикам
+Permission1187=Подтверждение получения заказов поставщикам
+Permission1188=Удаление заказов поставщикам
 Permission1190=Утвердить (второй уровень) заказы поставщика
 Permission1201=Получите результат экспорта
-Permission1202=Создать / Изменить экспорт
-Permission1231=Читать поставщиком счета-фактуры
+Permission1202=Создание / Изменение экспорта
+Permission1231=Просмотр счета-фактуры поставщиков
 Permission1232=Создание счета-фактуры поставщика
 Permission1233=Проверка счета-фактуры поставщика
-Permission1234=Удалить поставщиком счета-фактуры
-Permission1235=Отправить поставщиком счетов по электронной почте
-Permission1236=Экспорт поставщиком счета-фактуры, качества и платежей
+Permission1234=Удаление счета-фактуры поставщика
+Permission1235=Отправка счетов поставщику по электронной почте
+Permission1236=Экспорт счета-фактуры поставщика, аттрибутов и платежей
 Permission1237=Детализированный экспорт заказов поставщика
 Permission1251=Запуск массового импорта внешних данных в базу данных (загрузка данных)
 Permission1321=Экспорт клиентом счета-фактуры, качества и платежей
@@ -792,22 +816,22 @@ Permission23001=Просмотр Запланированных задач
 Permission23002=Создать/обновить Запланированную задачу
 Permission23003=Удалить Запланированную задачу
 Permission23004=Выполнить запланированную задачу
-Permission2401=Читать действия (события или задачи), связанные с его счета
-Permission2402=Создать / изменить / удалить действия (события или задачи), связанные с его счета
-Permission2403=Читать мероприятия (задачи, события или) других
-Permission2411=Читайте действия (события или задачи), других
+Permission2401=Посмотреть действия (события или задачи), связанные с его учетной записью
+Permission2402=Создание / изменение / удаление действий (события или задачи), связанные с его учетной записью
+Permission2403=Удаление действий (задачи, события или) связанных с его учетной записью
+Permission2411=Просмотреть действия (события или задачи), других
 Permission2412=Создать / изменить действия (события или задачи), других
 Permission2413=Удалить действия (события или задачи), других
 Permission2414=Export actions/tasks of others
-Permission2501=Читайте документы
-Permission2502=Добавить или удалить документы
-Permission2503=Отправить или удалять документы
-Permission2515=Настройка документов, справочников
-Permission2801=Использовать FTP  клиент в режиме только для чтения (просмотр и загрузка файлов)
-Permission2802=Использовать FTP клиент в режиме для записи (удаление или загрузка файлов)
+Permission2501=Чтение/Загрузка документов
+Permission2502=Загрузка документов
+Permission2503=Отправить или удалить документы
+Permission2515=Настройка директорий документов
+Permission2801=Использовать FTP  клиент в режиме только чтения (только просмотр и загрузка файлов)
+Permission2802=Использовать FTP клиент в режиме записи (удаление или выгрузка файлов)
 Permission50101=Использовать Торговую точку
-Permission50201=Прочитано сделок
-Permission50202=Импортных операций
+Permission50201=Просмотр транзакций
+Permission50202=Импорт транзакций
 Permission54001=Печать
 Permission55001=Открыть опросы
 Permission55002=Создать/изменить опросы
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Методы заказов
 DictionarySource=Происхождение Коммерческих предложений / Заказов
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Модели для диаграммы счетов
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Шаблоны электронных писем
 DictionaryUnits=Единицы
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Настройки сохранены
+SetupNotSaved=Setup not saved
 BackToModuleList=Вернуться к списку модулей
 BackToDictionaryList=Назад к списку словарей
 VATManagement=НДС менеджмент
@@ -921,7 +947,7 @@ Host=Сервер
 DriverType=Тип драйвера
 SummarySystem=Обзор системной информации
 SummaryConst=Список всех параметров настройки Dolibarr
-MenuCompanySetup=Компания / Фонд
+MenuCompanySetup=\t\nКомпания/Организация
 DefaultMenuManager= Менеджер стандартного меню
 DefaultMenuSmartphoneManager=Менеджер Меню Смартфона
 Skin=Тема оформления
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Default max length for lists
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=Сообщение дня
 MessageLogin=Сообщение на странице входа
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Постоянный поиск формы на левом меню
 DefaultLanguage=Язык по умолчанию (код языка)
 EnableMultilangInterface=Включить многоязычный интерфейс
 EnableShowLogo=Показать логотип на левом меню
-CompanyInfo=Информация о Компании / фонде
-CompanyIds=Компания / фундамент тождествам
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=Имя
 CompanyAddress=Адрес
 CompanyZip=Индекс
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Толерантность задержки (в дня
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Терпимость задержки (в днях) до полной готовности к чеки сделать депозит
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Другие пункты меню управления необязательных параметров.
 LogEvents=Безопасность ревизии события
 Audit=Аудит
@@ -987,7 +1015,7 @@ BrowserOS=Операционная система браузера
 ListOfSecurityEvents=Список Dolibarr безопасность события
 SecurityEventsPurged=Безопасность событий очищены
 LogEventDesc=Вы можете включить в журнале событий безопасности Dolibarr здесь. Администраторы могут увидеть его содержимое с помощью меню <b>System Tools - Аудит.</b> Внимание, эта функция может занимать большой объем данных в базе данных.
-AreaForAdminOnly=Эти функции могут быть использованы только <b>администратору пользователей.</b> Администратор черт и помочь определены в Dolibarr по следующим picto:
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Система информации разного техническую информацию Вы получите в режиме только для чтения и видимые только для администраторов.
 SystemAreaForAdminOnly=Эта область доступна для пользователей только администратором. Ни одно из разрешений Dolibarr может снизить этот предел.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists in any language files
+TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Вы должны включить минимум 1 модуль
 ClassNotFoundIntoPathWarning=Класс %s не найден по PHP пути
 YesInSummer=Да летом
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Хранилище сессий шифровано системой SUHOSIN
 ConditionIsCurrently=Текущее состояние %s
 YouUseBestDriver=Вы используете драйвер %s, который на текущий момент является самым подходящим
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Профессиональные Id уникальным
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Экспорт ссылка <b>на %s</b> формате доступна на следующую ссылку: %s
 ##### Invoices #####
 BillsSetup=Счета модуль настройки
 BillsNumberingModule=Счета и кредитных нот нумерации модуль
 BillsPDFModules=Счет документы моделей
+PaymentsPDFModules=Payment documents models
 CreditNote=Кредит сведению
 CreditNotes=Кредитных нот
 ForceInvoiceDate=Силы дата счета-фактуры для подтверждения даты
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Файлы типа  %s не кешируются HTTP  с
 FilesOfTypeCompressed=Файлы типа  %s  сжимаются HTTP  сервером
 FilesOfTypeNotCompressed=Файлы типа  %s  сжимаются не HTTP  сервером
 CacheByServer=Кэшируется сервером
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Кэшируется броузером
 CompressionOfResources=Сжатие HTTP заголовков
+CompressionOfResourcesDesc=For exemple 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 your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Продукты модуль настройки
 ServiceSetup=Услуги установки модуля
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Счет дата, используемая
 Buy=Покупать
 Sell=Продавать
 InvoiceDateUsed=Счет дата, используемая
-YourCompanyDoesNotUseVAT=Ваша компания была определена не использовать НДС (Главная - Настройка - компания / фонд), так что нет НДС на эту настройку.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=Бухгалтерия код
 AccountancyCodeSell=Бух. код продаж
 AccountancyCodeBuy=Бух. код покупок
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Устанавливать автоматическ
 AGENDA_DEFAULT_VIEW=Какую вкладку вы хотите открывать по умолчанию, когда выбираете из меню Повестку дня
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Нажмите для набора модуля настройки
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  Dans l'url, vous pouvez utiliser les balises<br><b>__PHONETO__</b> qui sera remplacé par le téléphone de l'appelé<br><b>__PHONEFROM__</b> qui sera remplacé par le téléphone de l'appelant (le votre)<br><b>__LOGIN__</b> qui sera remplacé par votre login clicktodial (défini sur votre fiche utilisateur)<br><b>__PASS__</b> qui sera remplacé par votre mot de passe clicktodial (défini sur votre fiche utilisateur).
+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.
 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 same computer than 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.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+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.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=Генеральный порядок отображения
 BankOrderES=Испанский
 BankOrderESDesc=Испанская порядок отображения
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=Компания Multi-модуль настройки
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ BackupDumpWizard=Мастер создания резервной копии б
 SomethingMakeInstallFromWebNotPossible=Установка внешних модулей через веб-интерфейс не возможна по следующей причине:
 SomethingMakeInstallFromWebNotPossible2=По этой причине, описанный здесь процесс апрейгда  - это только шаги, которые может выполнить пользователь с соответствующими правами доступа.
 InstallModuleFromWebHasBeenDisabledByFile=Установка внешних модулей из приложения отключена вашим администратором. Вы должны попросить его удалить файл <strong>%s</strong>, чтобы использовать эту функцию.
-ConfFileMuseContainCustom=Installing 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)
 TextTitleColor=Color of page title
 LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/ru_RU/compta.lang b/htdocs/langs/ru_RU/compta.lang
index cc0699b8b10..f0d4cb004ea 100644
--- a/htdocs/langs/ru_RU/compta.lang
+++ b/htdocs/langs/ru_RU/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using r
 Param=Настройка
 RemainingAmountPayment=Сумма оплаты Осталось:
 Account=Учетная запись
-Accountparent=Исходный счёт
-Accountsparent=Исходные счета
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=Поступления
 Outcome=Итог
 ReportInOut=Поступления / Результат
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Налоги и дивиденды
 MenuSocialContributions=Social/fiscal taxes
 MenuNewSocialContribution=New social/fiscal tax
 NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Бухгалтерия / Казначейство области
 NewPayment=Новые оплаты
@@ -134,8 +135,8 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- Она включает в себя все эффективные платежи в счетах-фактурах, полученных от клиентов. <br> - Он основан на день оплаты этих счетов-фактур <br>
-DepositsAreNotIncluded=- Депозитные счета-фактуры и не включен
-DepositsAreIncluded=- Депозитные счета включены
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Доклад третьей стороной IRPF
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
 VATReport=VAT report
@@ -169,7 +170,7 @@ DescSellsJournal=Продажи журнала
 DescPurchasesJournal=Покупки Журнал
 InvoiceRef=Счет реф.
 CodeNotDef=Не определено
-WarningDepositsNotIncluded=Депозиты счетов не включены в эту версию с этим бухгалтерский учет модуля.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
 Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
@@ -189,8 +190,10 @@ AccountancyJournal=Журнал бухгалтерских кодов
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Клонировать для следующего месяца
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/ru_RU/cron.lang b/htdocs/langs/ru_RU/cron.lang
index 5ebd75c5fdf..2e583fdd108 100644
--- a/htdocs/langs/ru_RU/cron.lang
+++ b/htdocs/langs/ru_RU/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Удалить запланированные задания
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Модуль запланированных задач позволяет выполнять запланированные задачи
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Задание
 CronNone=Никакой
 CronDtStart=Not before
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Включено
 CronStatusInactiveBtn=Выключать
 CronTaskInactive=Задание отключено
 CronId=ID
-CronClassFile=Классы (filename.class.php)
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=Команда для выполнения
 CronCreateJob=Создать новое запланированное задание
 CronFrom=От
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/ru_RU/errors.lang b/htdocs/langs/ru_RU/errors.lang
index 7f03c4c6803..2e549a57b68 100644
--- a/htdocs/langs/ru_RU/errors.lang
+++ b/htdocs/langs/ru_RU/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Не удалось создать файл '<b>%s</b>'
 ErrorFailToRenameDir=Не удалось переименовать директорию '<b>%s</b>' в '<b>%s</b>'
 ErrorFailToCreateDir=Не удалось создать директорию '<b>%s</b>'
 ErrorFailToDeleteDir=Не удалось удалить директорию '<b>%s</b>'
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=Этот контакт уже определено в качестве контакта данного типа.
 ErrorCashAccountAcceptsOnlyCashMoney=Этот банковский счет определен как счет для наличных, так что он принимает только наличные платежи.
 ErrorFromToAccountsMustDiffers=Источник и цели банковского счета должны быть разными.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Не удалось записать в директор
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=Найдено неверный электронный синтаксис% с линии в файл (например, строка %s с электронной почтой= %s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Некоторые обязательные поля не были заполнены.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Не удалось создать каталог. Убедитесь, что веб-сервер пользователь имеет разрешения на запись в каталог Dolibarr документы. Если параметр <b>safe_mode</b> включен по этому PHP, проверьте, что Dolibarr PHP файлы принадлежат к веб-серверу пользователей (или группы).
 ErrorNoMailDefinedForThisUser=Нет определена почта для этого пользователя
 ErrorFeatureNeedJavascript=Эта функция JavaScript должны быть активированы на работу. Изменить это в настройки - дисплей.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Количество строк в сч
 ErrorWebServerUserHasNotPermission=Учетная запись пользователя <b>%s</b> используется для выполнения веб-сервер не имеет разрешения для этого
 ErrorNoActivatedBarcode=Нет штрих-кодов типа активированного
 ErrUnzipFails=Невозможно распаковать %s с помощью  ZipArchive
-ErrNoZipEngine=Нет доступного модуля в PHP для распаковки файла %s
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=Файл %s  должен быть архивом zip системы Dolibarr 
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=Модуль CURL для PHP  не установлен, он необходим для работы с PayPal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=Не выбрана глобальная перем
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # 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.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Дата платежа (%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/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index c37813cd169..911eb16f641 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -7,13 +7,13 @@ DIRECTION=ltr
 FONTFORPDF=freemono
 FONTSIZEFORPDF=8
 SeparatorDecimal=,
-SeparatorThousand=None
+SeparatorThousand=,
 FormatDateShort=%d.%m.%Y
 FormatDateShortInput=%d.%m.%Y
-FormatDateShortJava=dd.MM.yyyy
-FormatDateShortJavaInput=dd.MM.yyyy
-FormatDateShortJQuery=dd.mm.yy
-FormatDateShortJQueryInput=dd.mm.yy
+FormatDateShortJava=ММ/дд/гггг
+FormatDateShortJavaInput=ММ/дд/гггг
+FormatDateShortJQuery=мм/дд/гг
+FormatDateShortJQueryInput=мм/дд/гг
 FormatHourShortJQuery=ЧЧ:ММ
 FormatHourShort=%H:%M
 FormatHourShortDuration=%H:%M
@@ -43,9 +43,9 @@ ErrorConstantNotDefined=Параметр s% не определен
 ErrorUnknown=Неизвестная ошибка
 ErrorSQL=Ошибка SQL
 ErrorLogoFileNotFound=Файл логотипа '%s' не найден
-ErrorGoToGlobalSetup=Перейти к настройкам 'Компания/Организация', чтобы исправить
-ErrorGoToModuleSetup=Перейти к настройкам модулей, чтобы исправить
-ErrorFailedToSendMail=Не удалось отправить почту(отправитель=%s, получатель=%s)
+ErrorGoToGlobalSetup=Для исправления перейдите в настройки "Компании/Организации"
+ErrorGoToModuleSetup=Для исправления перейдите в настройки модуля
+ErrorFailedToSendMail=Не удалось отправить почту (отправитель=%s, получатель=%s)
 ErrorFileNotUploaded=Файл не был загружен. Убедитесь, что его размер не превышает максимально допустимое значение, свободное место имеется на диске, и файл с таким же именем не существует в этом каталоге.
 ErrorInternalErrorDetected=Обнаружена ошибка
 ErrorWrongHostParameter=Неверный параметр хоста
@@ -88,7 +88,7 @@ Undefined=Неопределено
 PasswordForgotten=Забыли пароль?
 SeeAbove=См. выше
 HomeArea=Начальная область
-LastConnexion=Latest connection
+LastConnexion=Последнее подключение
 PreviousConnexion=Предыдущий вход
 PreviousValue=Предыдущее значение
 ConnectedOnMultiCompany=Подключено к объекту
@@ -105,7 +105,7 @@ MoreInformation=Подробнее
 TechnicalInformation=Техническая информация
 TechnicalID=Технический идентификатор
 NotePublic=Примечание (публичное)
-NotePrivate=Примечание (частное)
+NotePrivate=Примечание (личное)
 PrecisionUnitIsLimitedToXDecimals=Dolibarr был настроен на ограничение точности цены единицы до <b>%s</b> десятых.
 DoTest=Проверка
 ToFilter=Фильтр
@@ -117,8 +117,8 @@ no=нет
 No=Нет
 All=Все
 Home=Главная
-Help=Помощь
-OnlineHelp=Он-лайн помощь
+Help=Справка
+OnlineHelp=Интернет-справка
 PageWiki=Страница Wiki
 MediaBrowser=Обозреватель медиа
 Always=Всегда
@@ -153,6 +153,7 @@ Edit=Редактировать
 Validate=Проверить
 ValidateAndApprove=Проверить и Утвердить
 ToValidate=На проверке
+NotValidated=Не подтвержден
 Save=Сохранить
 SaveAs=Сохранить как
 TestConnection=Проверка подключения
@@ -202,7 +203,7 @@ MultiLanguage=Многоязычный
 Note=Примечание
 Title=Название
 Label=Наименование
-RefOrLabel=Ref. или наименование
+RefOrLabel=Ссылка или ярлык
 Info=Журнал
 Family=Семья
 Description=Описание
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=Нет возможности разрыва сое
 Connection=Войти
 Setup=Настройка
 Alert=Оповещение
+MenuWarnings=Предупреждения
 Previous=Назад
 Next=Дальше
 Cards=Карточки
@@ -238,7 +240,7 @@ DateCreation=Дата создания
 DateCreationShort=Дата создания
 DateModification=Дата изменения
 DateModificationShort=Дата изм.
-DateLastModification=Latest modification date
+DateLastModification=Дата последнего изменения
 DateValidation=Дата проверки
 DateClosing=Дата закрытия
 DateDue=Срок выполнения
@@ -308,6 +310,7 @@ Copy=Копировать
 Paste=Вставить
 Default=По умолчанию
 DefaultValue=Значение по умолчанию
+DefaultValues=Стандартное значение
 Price=Цена
 UnitPrice=Цена за единицу
 UnitPriceHT=Цена за единицу (нетто)
@@ -339,7 +342,7 @@ AmountAverage=Средняя сумма
 PriceQtyMinHT=Цена за мин. количество (без налога)
 Percentage=Процент
 Total=Всего
-SubTotal=Итого
+SubTotal=Подитог
 TotalHTShort=Всего (без налога)
 TotalHTShortCurrency=Итого (нетто в текущей валюте)
 TotalTTCShort=Всего (вкл-я налог)
@@ -357,25 +360,26 @@ HT=Без налога
 TTC=Вкл-я налог
 VAT=НДС
 VATs=Торговые сборы
-LT1ES=Повторно
+LT1ES=RE
 LT2ES=IRPF
 VATRate=Ставка НДС
 Average=Среднее
 Sum=Сумма
 Delta=Разница
-Module=Модуль
+Module=Module/Application
+Modules=Modules/Applications
 Option=Опция
 List=Список
 FullList=Полный список
 Statistics=Статистика
 OtherStatistics=Другие статистические данные
 Status=Статус
-Favorite=Любимые
+Favorite=Избранное
 ShortInfo=Инфо
-Ref=Ref.
+Ref=Ссылка
 ExternalRef=Внешний источник
-RefSupplier=Ref. поставщика
-RefPayment=Ref. оплаты
+RefSupplier=Ссылка на поставщика
+RefPayment=Ссылка на оплату
 CommercialProposalsShort=Коммерческие предложения
 Comment=Комментарий
 Comments=Комментарии
@@ -387,26 +391,27 @@ ActionRunningNotStarted=Не начато
 ActionRunningShort=Выполняется
 ActionDoneShort=Завершено
 ActionUncomplete=Не завершено
-CompanyFoundation=Компания/Организация
-ContactsForCompany=Контакты/адреса контрагента
-ContactsAddressesForCompany=Контак/Адреса для этого стороннего лица
-AddressesForCompany=Адреса для этого стороннего лица
+CompanyFoundation=\t\nКомпания/Организация
+ContactsForCompany=Контакты для этого контрагента контрагента
+ContactsAddressesForCompany=Контакты/Адреса для этого контрагента
+AddressesForCompany=Адреса для этого контарагента
 ActionsOnCompany=Действия для этого контрагента
-ActionsOnMember=События об этом члене
+ActionsOnMember=События этого участника
 NActionsLate=% с опозданием
 RequestAlreadyDone=Запрос уже зарегистрован
 Filter=Фильтр
 FilterOnInto=Найти критерий '<strong>%s</strong>' в полях %s
 RemoveFilter=Удалить фильтр
-ChartGenerated=Диаграмма сгенерирована
-ChartNotGenerated=Диаграмма не сгенерирована
+ChartGenerated=Диаграмма создана
+ChartNotGenerated=Диаграмма не создана
 GeneratedOn=Создан %s
 Generate=Создать
 Duration=Продолжительность
 TotalDuration=Общая продолжительность
 Summary=Общее
-DolibarrStateBoard=Статистика
-DolibarrWorkBoard=Панель текущих задач
+DolibarrStateBoard=Статистика базы данных
+DolibarrWorkBoard=Открытые элементы основной страницы
+NoOpenedElementToProcess=Нет открытого элемента для обработки
 Available=Доступно
 NotYetAvailable=Пока не доступно
 NotAvailable=Не доступно
@@ -434,7 +439,7 @@ Reportings=Отчеты
 Draft=Черновик
 Drafts=Черновики
 Validated=Подтверждено
-Opened=Открыты
+Opened=Открытые
 New=Новый
 Discount=Скидка
 Unknown=Неизвестно
@@ -453,6 +458,7 @@ NextStep=Следующий шаг
 Datas=Данные
 None=Никакой
 NoneF=Никакой
+NoneOrSeveral=Нет или несколько
 Late=Поздно
 LateDesc=Появится ваша запись с задержкой или без задержки определяется в настройках. Попросите вашего администратора изменить задержку из меню Главная - Настройка - Предупреждения
 Photo=Изображение
@@ -600,13 +606,14 @@ SessionName=Имя Сессии
 Method=Метод
 Receive=Получить
 CompleteOrNoMoreReceptionExpected=Завершено или ничего больше не ожидается
-ExpectedValue=Expected Value
+ExpectedValue=Ожидаемое значение
 CurrentValue=Текущее значение
 PartialWoman=Частичное
 TotalWoman=Всего
 NeverReceived=Никогда не получено
 Canceled=Отменено
-YouCanChangeValuesForThisListFromDictionarySetup=Вы можете изменить значения для этого списка из меню Настройки->Словарь
+YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu Setup - Dictionaries
+YouCanChangeValuesForThisListFrom=You can change values for this list from menu %s
 YouCanSetDefaultValueInModuleSetup=Вы можете настроить значение по-умолчанию используемое при создании новой записи в модуле Настройка
 Color=Цвет
 Documents=Связанные файлы
@@ -642,6 +649,7 @@ FreeLineOfType=Свободная запись типа
 CloneMainAttributes=Клонирование объекта с его основными атрибутами
 PDFMerge=Слияние PDF
 Merge=Слияние
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Показать страницу для печати области основного содержимого
 MenuManager=Менеджер меню
 WarningYouAreInMaintenanceMode=Внимание, вы находитесь в режиме обслуживания, так что только пользователю <b>%s</b> разрешено использовать приложение в данный момент.
@@ -708,6 +716,7 @@ from=от
 toward=к
 Access=Доступ
 SelectAction=Выбор действия
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Для копировани в буфер обмена используйте Ctrl+C
 SaveUploadedFileWithMask=Сохранить файл на сервер под именем "<strong>%s</strong>" (иначе "%s")
 OriginFileName=Изначальное имя файла
@@ -718,7 +727,7 @@ ViewPrivateNote=Посмотреть заметки
 XMoreLines=%s строк(и) скрыто
 PublicUrl=Публичная ссылка
 AddBox=Добавить бокс
-SelectElementAndClickRefresh=Выберите элемент и нажмите обновить
+SelectElementAndClick=Select an element and click %s
 PrintFile=Печать файл %s
 ShowTransaction=Показать транзакцию на банковском счете
 GoIntoSetupToChangeLogo=Используйте Главная-Настройки-Компании для изменения логотипа или  Главная-Настройки-Отображение для того, чтобы его скрыть.
@@ -734,8 +743,8 @@ Hello=Здравствуйте
 Sincerely=С уважением,
 DeleteLine=Удалить строки
 ConfirmDeleteLine=Вы точно хотите удалить эту строку?
-NoPDFAvailableForDocGenAmongChecked=Нет доступных PDF среди проверяемых записей для создания документов
-TooManyRecordForMassAction=Выделено слишком много записей для массового действия. Массовое действие запрещено для списка из более %s записей.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=Нет выделенных записей
 MassFilesArea=Пространство для массовых действий с файлами
 ShowTempMassFilesArea=Показать область для массовых действий с файлами
@@ -755,11 +764,20 @@ Calendar=Календарь
 GroupBy=Группировка по...
 ViewFlatList=Вид плоским списком
 RemoveString=Удалить строку '%s'
-SomeTranslationAreUncomplete=Некоторые языки могут быть переведены частично или могут содержать ошибки. Если вы обнаружите их, вы можете исправить языковые файлы зарегистрировавшись на <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Прямая ссылка для загрузки
 Download=Загрузка
 ActualizeCurrency=Обновить текущий курс
 Fiscalyear=Финансовый год
+ModuleBuilder=Создатель Модуля
+SetMultiCurrencyCode=Set currency
+BulkActions=Массовые действия
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Понедельник
 Tuesday=Вторник
@@ -794,9 +812,9 @@ SetRef=Настроить источник
 Select2ResultFoundUseArrows=Найдено несколько результатов. Используйте стрелки для выбора.
 Select2NotFound=Ничего не найдено
 Select2Enter=Ввод/вход
-Select2MoreCharacter=or more character
+Select2MoreCharacter=или больше символов
 Select2MoreCharacters=или больше символов
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharactersMore=<strong>Синтаксис поиска:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> любые символы</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Начинается с</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> Заканчивается символами</kbd> (ab$)<br />
 Select2LoadingMoreResults=Загрузка результатов...
 Select2SearchInProgress=Поиск в процессе...
 SearchIntoThirdparties=Контрагенты
@@ -817,5 +835,3 @@ SearchIntoContracts=Договоры
 SearchIntoCustomerShipments=Отгрузки клиентам
 SearchIntoExpenseReports=Отчёты о затратах
 SearchIntoLeaves=Отпуска
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/ru_RU/other.lang b/htdocs/langs/ru_RU/other.lang
index 28a79aa2881..9e04daa2f8f 100644
--- a/htdocs/langs/ru_RU/other.lang
+++ b/htdocs/langs/ru_RU/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=Дата рождения
 BirthdayAlertOn=рождения активного оповещения
 BirthdayAlertOff=рождения оповещения неактивные
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=Посредничество подтверждено
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=Dette er en <b>test</b> mail (ordet testen må være i fe
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nВы можете увидеть здесь запрос цены __ASKREF__\n\n\n__PERSONALIZED__С уважением\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Проф Id %s</b> является информация в зависимости от сторонних страны. <br> Например, для страны <b>с%,</b> то <b>с кодом%.</b>
 DolibarrDemo=Dolibarr ERP / CRM демо
-StatsByNumberOfUnits=Статистика количества единиц
-StatsByNumberOfEntities=Статистика в ряде организаций
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=Посредничество %s проверено.
 EMailTextInvoiceValidated=Счет %s проверены
diff --git a/htdocs/langs/ru_RU/projects.lang b/htdocs/langs/ru_RU/projects.lang
index 52985ce2487..b6ecd847c1b 100644
--- a/htdocs/langs/ru_RU/projects.lang
+++ b/htdocs/langs/ru_RU/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=Статус проекта
 SharedProject=Общий проект
 PrivateProject=Проект контакты
+ProjectsImContactFor=Projects I'm explicitely a contact of
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=Все проекты
 MyProjectsDesc=Эта точка зрения ограничена проекты, которые Вы контакте (что бы это тип).
 ProjectsPublicDesc=Эта точка зрения представлены все проекты, которые Вы позволили читать.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=Эта точка зрения представляет всех пр
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=Новый проект
 AddProject=Создать проект
 DeleteAProject=Удаление проекта
 DeleteATask=Удалить задание
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Opened projects
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Показать проекта
 SetProject=Комплекс проектов
 NoProject=Нет проекта определена
 NbOfProjects=Nb проектов
+NbOfTasks=Nb of tasks
 TimeSpent=Время, затраченное
 TimeSpentByYou=Затраченное мной время
 TimeSpentByUser=Затраченное пользователем время
@@ -47,9 +52,9 @@ TaskTimeSpent=Время, потраченное на задачи
 TaskTimeUser=Пользователь
 TaskTimeNote=Заметка
 TaskTimeDate=Дата
-TasksOnOpenedProject=Задачи на открытых проектах
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Рабочая нагрузка не задана
-NewTimeSpent=Новое время
+NewTimeSpent=Время, проведенное
 MyTimeSpent=Мое время
 Tasks=Задание
 Task=Задача
@@ -59,6 +64,7 @@ TaskDescription=Описание задачи
 NewTask=Новые задачи
 AddTask=Создать задачу
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Мероприятие
 Activities=Задачи / мероприятия
 MyActivities=Мои задачи / мероприятия
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Перечень договоров, связанных с проектом
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=Список мероприятий, связанных с проектом
 ListExpenseReportsAssociatedProject=Список отчётов о затратах, связанных с проектом
 ListDonationsAssociatedProject=Список пожертвований, связанных с проектом
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Проект контакты
 ActionsOnProject=Действия по проекту
 YouAreNotContactOfProject=Вы не контакт этого частного проекта
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Удалить времени
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=Также видеть  задачи, не назначенные мне
@@ -110,7 +118,7 @@ TaskRessourceLinks=Ресурсы
 ProjectsDedicatedToThisThirdParty=Проектов, посвященных этой третьей стороне
 NoTasks=Нет задач, для этого проекта
 LinkedToAnotherCompany=Связь с другими третий участник
-TaskIsNotAffectedToYou=Задачи, не назначенные вам
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=Время, проведенное пуста
 ThisWillAlsoRemoveTasks=Это действие приведет к удалению всех задач проекта <b>(%s</b> задач на данный момент), и все входы затраченного времени.
 IfNeedToUseOhterObjectKeepEmpty=Если некоторые объекты (счет-фактура, заказ, ...), принадлежащей другому третьему лицу, должна быть увязана с проектом по созданию, держать этот пустой иметь проект, несколько третьих лиц.
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Ввод по дням
 InputPerWeek=Ввод по неделе
 InputPerAction=Ввод по действиям
-TimeAlreadyRecorded=Время, потраченное на уже зафиксировано для этой задачи / дня и пользователя %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
 ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/sk_SK/accountancy.lang b/htdocs/langs/sk_SK/accountancy.lang
index 5f31b6e2b2d..0bbbf93b74d 100644
--- a/htdocs/langs/sk_SK/accountancy.lang
+++ b/htdocs/langs/sk_SK/accountancy.lang
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Účet
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=Priradenie dodávateľskej faktúry
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Vytvoriť novú tranzakciu
 UpdateMvts=Upraviť tranzakciu
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=General ledger
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Stav účtu
 
 CAHTF=Total purchase supplier before tax
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Trvanie prístupových údajov pre všeobecné účtovníctvo
-ACCOUNTING_LENGTH_AACCOUNT=Trvanie prístupových údajov pre účtovníctvo tretej strany
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
@@ -132,19 +140,19 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Číslo kusu
 TransactionNumShort=Num. transaction
-AccountingCategory=Účtovná kategória
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Nenastavené
-DeleteMvt=Zmazať riadky hlavnej účtovnej knihy
+DeleteMvt=Delete Ledger lines
 DelYear=Rok na zmazanie
 DelJournal=Žurnále na zmazanie
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=Táto akcia zmaže vybrané riadky z hlavnej účtovnej knihy
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=Nová tranzakcia
 NumMvts=Numero of transaction
 ListeMvts=Zoznam pohybov
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=List of the accounting accounts
 
 Pcgtype=Class of account
-Pcgsubtype=Under class of account
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatické priradenie dokončené
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Pohyby nie sú vyvážené. Kredit = %S Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Použiť hromadne kategóriu
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Kód
+Nature=Príroda
+AccountingJournalType1=Various operation
+AccountingJournalType2=Predaje
+AccountingJournalType3=Platby
+AccountingJournalType4=Banka
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Exports
@@ -211,6 +231,7 @@ Modelcsv_ciel=Exportovať pre Sage Ciel Compta alebo Compta Evolution
 Modelcsv_quadratus=Exportovať pre Quadratus QuadraCompta
 Modelcsv_ebp=Exportovať pre EBP
 Modelcsv_cogilog=Exportovať pre Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Vypočítané
 Formula=Vzorec
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=Exportovaný formát nie je podporovaný pre túto stránku
 BookeppingLineAlreayExists=Riadky už existujú v archíve
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index b8f240e6747..56a8bdeb85b 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=Interní používatelia
 ExternalUsers=Externí používatelia
 GUISetup=Zobraziť
 SetupArea=Nastavenie plochy
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Formulár pre testovanie nahrávania súborov (podľa nastavenia)
 IfModuleEnabled=Poznámka: áno je účinné len vtedy, ak je modul <b>%s</b> zapnutý
 RemoveLock=Odstráňte súbor <b>%s</b> ak existuje povoliť použitie aktualizačného nástroja.
@@ -85,7 +86,7 @@ Mask=Maska
 NextValue=Ďalšia hodnota
 NextValueForInvoices=Ďalšie hodnota (faktúry)
 NextValueForCreditNotes=Ďalšie hodnota (dobropisov)
-NextValueForDeposit=Ďalšie hodnota (záloha)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Ďalšie hodnota (náhrady)
 MustBeLowerThanPHPLimit=Poznámka: Váš PHP obmedzuje každého upload súboru je veľkosť <b>%s</b> %s, čo hodnota tohto parametra je
 NoMaxSizeByPHPLimit=Poznámka: No limit je nastavený v konfigurácii PHP
@@ -103,7 +104,7 @@ MenuIdParent=Materská Ponuka ID
 DetailMenuIdParent=ID nadradenej ponuky (prázdny na horné menu)
 DetailPosition=Zoradiť číslo definovať pozíciu v menu
 AllMenus=Všetko
-NotConfigured=Modul nie je nakonfigurovaný
+NotConfigured=Module/Application not configured
 Active=Aktívne
 SetupShort=Setup
 OtherOptions=Ďalšie možnosti
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Oddeľovač tisícov
 Destination=Destinácia
 IdModule=ID Modulu
 IdPermissions=ID Povolení
-Modules=Moduly
 LanguageBrowserParameter=Parameter %s
 LocalisationDolibarrParameters=Parametre lokalizácie
 ClientTZ=Časová zóna klienta (používateľ)
@@ -123,7 +123,8 @@ PHPTZ=PHP servera Časová zóna
 DaylingSavingTime=Letný čas
 CurrentHour=PHP Čas (server)
 CurrentSessionTimeOut=Časový limit súčasnej relácie
-YouCanEditPHPTZ=Ak chcete nastaviť iné časové pásmo PHP (nie je podmienkou), môžete skúsiť pridať súbor. Htacces s linkou, ako je tento &quot;TZ setenv Europe / Paris&quot;
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Panel
 Boxes=Panely
 MaxNbOfLinesForBoxes=Maximálny počet panelov
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Táto možnosť je dostupná iba v oficiálnej stab
 Rights=Oprávnenie
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Iba prvky z <a href="%s">povolených modulov</a> sú uvedené.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=Viac modulov na stiahnutie môžete nájst na internete
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Databáza heslo zašifrované v conf.php (Activa
 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=Ochrana generovaných súborov PDF (aktivuje sa neodporúča, rozbije hromadné generovanie PDF)
-ProtectAndEncryptPdfFilesDesc=Ochrana dokumentu vo formáte PDF udržuje ju k dispozícii pre čítanie a tlač PDF s akýmkoľvek prehliadači. Avšak, editáciu a kopírovanie nie je už možné. Všimnite si, že používate túto funkciu, aby budovu globálne kumulovanú pdf nefunguje (ako nezaplatených faktúr).
+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=Rys
 DolibarrLicense=Licencia
 Developpers=Vývojári / prispievatelia
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr on-line demo
 OfficialMarketPlace=Oficiálny trh pre externé moduly / addons
 OfficialWebHostingService=Odkazované služby web hostingu ( Cloud hosting )
 ReferencedPreferredPartners=Preferovaní partneri
-OtherResources=Autres ressources
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=Pre používateľov alebo vývojárov dokumentácie (doc, FAQs ...) <br> pozrite sa na Dolibarr Wiki: <br> <a href="%s" target="_blank"><b>%s</b></a>
 ForAnswersSeeForum=V prípade akýchkoľvek ďalších otázok / help, môžete použiť fórum Dolibarr: <br> <a href="%s" target="_blank"><b>%s</b></a>
 HelpCenterDesc1=Táto oblasť vám môže pomôcť získať pomocníka služby podpory na Dolibarr.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=Funkcia nie je k dispozícii pre Unix, ako napr syst
 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/
 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=Nastavenie modulu
-ModulesSetup=Moduly nastavenie
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Systém
 ModuleFamilyCrm=Riadenie vzťahov so zákazníkmi (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=Dolibarr aktuálna verzia
 CallUpdatePage=Choďte na stránku úpravý databázobej štruktúry a dát. %s
 LastStableVersion= Najnovšia stabilná verzia
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Aktualizovať server offline
+WithCounter=Manage a counter
 GenericMaskCodes=Môžete zadať akékoľvek masku číslovanie. V tejto maske, by mohli byť použité nasledovné značky: <br> <b>{000000}</b> zodpovedá množstvu, ktoré sa zvýšia na každej %s. Vložiť počet núl na požadovanú dĺžku pultu. Počítadlo sa vyplní nulami zľava, aby sa čo najviac nuly ako maska. <br> <b>{000000} 000</b> rovnako ako predchádzajúce, ale posun zodpovedá číslu na pravej strane znamienko + je aplikovaný začína na prvej %s. <br> <b>{000000 @ x}</b> rovnaká ako predchádzajúca, ale počítadlo sa resetuje na nulu, keď je mesiac x hodnoty (x medzi 1 a 12 alebo 0, používať prvých mesiacoch fiškálneho roka definované v konfigurácii, alebo 99 pre resetovanie na nulu každý mesiac ). Ak je táto voľba sa používa, a x je 2 alebo vyššia, potom postupnosť {yy} {mm} alebo {yyyy} {} mm je tiež potrebné. <br> <b>{Dd}</b> deň (01 až 31). <br> <b>{Mm}</b> mesiac (01 až 12). <br> <b>{Yy}, {RRRR}</b> alebo <b>{y}</b> ročne po dobu 2, 4 alebo 1 číslice. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Všetky ostatné znaky v maske zostanú nedotknuté. <br> Medzery nie sú povolené. <br>
-GenericMaskCodes4a=<u>Príklad na 99. %s tretej strany Thecompany vykonáva 2007-01-31:</u> <br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Príklad na tretie osoby vytvorené na 03.1.2007:</u> <br>
 GenericMaskCodes4c=<u>Príklad produktu vytvorili na 03.1.2007:</u> <br>
-GenericMaskCodes5=<b>ABC {yy} {mm} - {000000}</b> dám <b>ABC0701-000099</b> <br> <b>{0000} 100 @ 1-ZZZ / {dd} / XXX</b> dá <b>0199-ZZZ/31/XXX</b>
+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=Vracia číslo prispôsobiteľný podľa tvarovanou maskou.
 ServerAvailableOnIPOrPort=Server je k dispozícii na adrese <b>%s</b> na porte <b>%s</b>
 ServerNotAvailableOnIPOrPort=Server nie je k dispozícii na adrese <b>%s</b> na porte <b>%s</b>
@@ -369,19 +375,21 @@ Int=Celé číslo
 Float=Vznášať sa
 DateAndTime=Dátum a hodina
 Unique=Unikátna
-Boolean=Boolean (checkbox)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Telefón
 ExtrafieldPrice = Cena
 ExtrafieldMail = E-mail
 ExtrafieldUrl = Url
 ExtrafieldSelect = Vyberte zoznam
 ExtrafieldSelectList = Vyberte z tabuľky
-ExtrafieldSeparator=Oddeľovač
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Heslo
-ExtrafieldCheckBox=Zaškrtávacie políčko
-ExtrafieldRadio=Prepínač
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldRadio=Radio buttons (on choice only)
+ExtrafieldCheckBox=Checkboxes
+ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Odkaz na objekt
+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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Zoznam kľúčových hodnôt <br><br> napríklad : <br>1,hodnota1<br>2,hodnota2<br>3,hodnota3<br>...
 ExtrafieldParamHelpradio=Zoznam kľúčových hodnôt <br><br> napríklad : <br>1,hodnota1<br>2,hodnota2<br>3,hodnota3<br>...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Použiť 3 krokové povolenie ked cena ( bez DPH ) je väčšia ako...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Pole
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Používatelia a skupiny
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=Faktúra a dobropis riadenie pre zákazníkov. Faktúra konania pre
 Module40Name=Dodávatelia
 Module40Desc=Dodávateľ riadenia a nákupu (objednávky a faktúry)
 Module42Name=Záznamy
-Module42Desc=Ťažobné zariadenie (súbor, syslog, ...)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Redakcia
 Module49Desc=Editor pre správu
 Module50Name=Produkty
@@ -499,8 +521,8 @@ Module410Name=WebCalendar
 Module410Desc=WebCalendar integrácia
 Module500Name=špeciálne rozšírenia
 Module500Desc=Správca špeciálnych rozšírení ( dane, sociálne a fiškálne dane, dividendy )
-Module510Name=Zamestnanecké zmluvy a platy
-Module510Desc=Spravovanie zamestnaneckých zmlúv, platov a platieb
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Pôžička
 Module520Desc=Správca pôžičiek
 Module600Name=Upozornenie
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP MaxMind konverzie možnosti
 Module3100Name=Skype
 Module3100Desc=Pridať Skype tlačidlo na úžívateľskú kartu používateľa / tretej osoby / kontaktu
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
-Module4000Desc=Human resources management
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi-spoločnosť
 Module5000Desc=Umožňuje spravovať viac spoločností
 Module6000Name=Workflow
@@ -591,7 +615,7 @@ Permission32=Vytvoriť / upraviť produktov
 Permission34=Odstrániť produkty
 Permission36=Pozri / správa skryté produkty
 Permission38=Export produktov
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Odstrániť projektov (spoločné projekty, projekt a ja som kontakt pre)
 Permission45=Export projects
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Možnosti objednávky
 DictionarySource=Pôvod ponuky / objednávky
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Modely účtovných osnov
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Šablóny emailov
 DictionaryUnits=Jednotky
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Status príležitosti pre projekt/vedenie
 SetupSaved=Nastavenie uložené
+SetupNotSaved=Setup not saved
 BackToModuleList=Späť na zoznam modulov
 BackToDictionaryList=Napäť do zoznamu slovníkov
 VATManagement=DPH riadenia
@@ -921,7 +947,7 @@ Host=Server
 DriverType=Typ ovládača
 SummarySystem=Systém súhrn informácií
 SummaryConst=Zoznam všetkých nastavených parametrov Dolibarr
-MenuCompanySetup=Spoločnosti / Nadácia
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= Štandardná ponuka manažér
 DefaultMenuSmartphoneManager=Smartphone Ponuka manažér
 Skin=Skin téma
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Základná max. dĺžka zoznamu
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=Správa dňa
 MessageLogin=Prihlasovacia stránka správu
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanentný vyhľadávací formulár na ľavom menu
 DefaultLanguage=Predvolený jazyk používať (kód jazyka)
 EnableMultilangInterface=Povoliť viacjazyčné rozhranie
 EnableShowLogo=Zobraziť logo na ľavom menu
-CompanyInfo=Spoločnosti / Nadácia informácie
-CompanyIds=Spoločnosť / nadácie identity
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=Názov
 CompanyAddress=Adresa
 CompanyZip=Zips
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerancia oneskorenie (v dňoch) pred záznam o mešk
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerancia oneskorenie (v dňoch) pred pohotovosti pre kontrolu vklad robiť
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=Oblasť nastavení je pre základné nastavenia pre začatím používania Dolubarru
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Ostatné položky menu spravovať voliteľné parametre.
 LogEvents=Udalosti bezpečnostný audit
 Audit=Audit
@@ -987,7 +1015,7 @@ BrowserOS=OS prehliadača
 ListOfSecurityEvents=Zoznam Dolibarr udalostí zabezpečenia
 SecurityEventsPurged=Bezpečnostnej akcie očistil
 LogEventDesc=Môžete povoliť tu zapisovanie udalostí Dolibarr zabezpečenia. Správcovia môžu potom vidieť jeho obsah pomocou <b>nástrojov systému</b> menu <b>- audit.</b> Pozor, táto funkcia môže spotrebovať veľké množstvo dát v databáze.
-AreaForAdminOnly=Tieto vlastnosti môžu byť použité <b>správcom užívateľa.</b>
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Systémové informácie je rôzne technické informácie získate v režime iba pre čítanie a viditeľné len pre správcov.
 SystemAreaForAdminOnly=Táto oblasť je k dispozícii pre správcu užívateľa. Žiadny z Dolibarr oprávnenia môže znížiť tento limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Aktuálny prekladovy reťazec
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=Novy prekladový reťazec na zobrzenie
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Počet aktivovaných modulov :  <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists in any language files
+TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Musíte povoliť aspoň jeden modul
 ClassNotFoundIntoPathWarning=Trieda %s nenašli cestu do PHP
 YesInSummer=Áno v lete
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Úložisko relácie šifrovaná Suhosin
 ConditionIsCurrently=Podmienkou je v súčasnej dobe %s
 YouUseBestDriver=Pomocou ovládača %s, že je najlepší vodič súčasnej dobe k dispozícii.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Pravidlá pre profesionálne IDs
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Export odkaz na <b>%s</b> formáte je k dispozícii na nasledujúcom odkaze: %s
 ##### Invoices #####
 BillsSetup=Faktúry modul nastavenia
 BillsNumberingModule=Faktúry a dobropisy číslovanie modelu
 BillsPDFModules=Fakturačné doklady modely
+PaymentsPDFModules=Payment documents models
 CreditNote=Dobropis
 CreditNotes=Dobropisy
 ForceInvoiceDate=Force faktúry dátum Dátum overenia
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Súbory typu %s nie sú ukladané do medzipamäte servera H
 FilesOfTypeCompressed=Súbory typu %s sú skomprimované servera HTTP
 FilesOfTypeNotCompressed=Súbory typu %s nekomprimuje servera HTTP
 CacheByServer=Cache serverom
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache v prehliadači
 CompressionOfResources=Kompresia odpovedí HTTP
+CompressionOfResourcesDesc=For exemple using the Apache directive "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=So súčasnými prehliadačmi taká automatická detekcia nie je možná 
+DefaultValuesDesc=You can define/force here the default value you want to get when your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Produkty modul nastavenia
 ServiceSetup=Služby modul nastavenia
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Faktúra použitá dáta
 Buy=Kúpiť
 Sell=Predávať
 InvoiceDateUsed=Faktúra použitá dáta
-YourCompanyDoesNotUseVAT=Vaša spoločnosť bola definovaná nepoužívať DPH (Home - Nastavenie - Firma / Foundation), takže nie je DPH na možnosti nastavenia.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=Účtovníctvo kód
 AccountancyCodeSell=Predaj účtu. kód
 AccountancyCodeBuy=Nákup účet. kód
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Kliknite pre Dial Nastavenie modulu
-ClickToDialUrlDesc=Url volaná, keď sa vykonáva kliknutím na tel Piktogram. Do poľa URL môžete použiť značky <br> <b>__PHONETO__</b> Ktorý bude nahradený s telefónnym číslom osoby volať <br> <b>__PHONEFROM__</b> Ktorý bude nahradený telefónne číslo volajúceho (vaše) <br> <b>__LOGIN__</b> Ktorý bude nahradený s clicktodial prihlásenie (definované na karte užívateľa) <br> <b>__PASS__</b> Ktorý bude nahradený s clicktodial heslo (definované na karte užívateľa).
+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.
 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 same computer than 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.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=Nastavenie API modulu
 ApiDesc=Zapnutím tohto modulu získate rôzne služby REST servra
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=API možete preskúmať na adrese
+ApiExporerIs=You can explore and test the APIs at URL
 OnlyActiveElementsAreExposed=Iba prvky zapnutého modulu sú odhalené
 ApiKey=Kľúč pre 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.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=Všeobecné poradí zobrazenie
 BankOrderES=Španielčina
 BankOrderESDesc=Španielska poradí zobrazenie
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=Spoločnosť Multi-modul nastavenia
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ BackupDumpWizard=Pomocník pre databázovú zálohu
 SomethingMakeInstallFromWebNotPossible=Inštalácia externého modulu z webu nie je možná kôli : 
 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.
-ConfFileMuseContainCustom=Installing 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=Zvýrazniť riadok pre prechode kurzora
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
 LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Spolupracuje so základnou témou, nemusí byť podporované externou témou
 BackgroundColor=Farba pozadia
 TopMenuBackgroundColor=Farba pozadia pre vrchné menu
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimálny oznamovací čas ( Vaša požiadávka musi byť z
 NbAddedAutomatically=Počet dní pridaných do počítadla užívateľov ( automaticky ) každý mesiac
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Hodnota dane z predaja
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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=Užívateľ nemá definované povolenia
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/sk_SK/compta.lang b/htdocs/langs/sk_SK/compta.lang
index 2d35bf37a41..91c96839bd6 100644
--- a/htdocs/langs/sk_SK/compta.lang
+++ b/htdocs/langs/sk_SK/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using r
 Param=Setup
 RemainingAmountPayment=Suma platby sviatku:
 Account=Účet
-Accountparent=Účet rodič
-Accountsparent=Účty rodič
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=Príjem
 Outcome=Výdavok
 ReportInOut=Výnosy / náklady
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Dane a dividendy
 MenuSocialContributions=Social/fiscal taxes
 MenuNewSocialContribution=New social/fiscal tax
 NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Účtovníctvo / Treasury oblasť
 NewPayment=Nový platobný
@@ -134,8 +135,8 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- Obsahuje všetky účinné platby faktúry prijaté od klientov. <br> - Je založený na dátume úhrady týchto faktúr <br>
-DepositsAreNotIncluded=- Kaucia faktúry, ani zahrnuté
-DepositsAreIncluded=- Kaucia faktúry sú zahrnuté
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Správa o treťou stranou IRPF
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
 VATReport=VAT report
@@ -169,7 +170,7 @@ DescSellsJournal=Predaj Journal
 DescPurchasesJournal=Nákupy Journal
 InvoiceRef=Faktúra čj.
 CodeNotDef=Nie je definované
-WarningDepositsNotIncluded=Vklady faktúry nie sú zahrnuté v tejto verzii tohto modulu účtovníctva.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Termín vyplatenia dátum nemôže byť nižšia ako objektu dáta.
 Pcg_version=Chart of accounts models
 Pcg_type=PCG typ
@@ -189,8 +190,10 @@ AccountancyJournal=Accountancy code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/sk_SK/cron.lang b/htdocs/langs/sk_SK/cron.lang
index 343b69e2325..18ca43ec3e7 100644
--- a/htdocs/langs/sk_SK/cron.lang
+++ b/htdocs/langs/sk_SK/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allow to execute job that have been planned
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Práca
 CronNone=Nikto
 CronDtStart=Not before
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Umožniť
 CronStatusInactiveBtn=Zakázať
 CronTaskInactive=Táto úloha je zakázaný
 CronId=Id
-CronClassFile=Triedy (filename.class.php)
-CronModuleHelp=Názov adresára modulu Dolibarr (tiež pracovať s externým modulom Dolibarr). <BR> Napr načítať metódy objektu výrobku Dolibarr / htdocs / <u>produktu</u> / trieda / product.class.php, hodnota modulu je <i>produkt</i>
-CronClassFileHelp=Názov súboru načítať. <BR> Napr načítať metódy objektu výrobku Dolibarr / htdocs / produktu / trieda / <u>product.class.php,</u> hodnota názov triedy súboru je <i>product.class.php</i>
-CronObjectHelp=Názov objektu načítať. <BR> Napr načítať metódy objektu výrobku Dolibarr / htdocs / produktu / trieda / product.class.php, hodnota názov triedy súboru je <i>výrobok</i>
-CronMethodHelp=Objekt spôsob štartu. <BR> Napr načítať metódy objektu výrobku Dolibarr / htdocs / produktu / trieda / product.class.php, hodnota metódy je <i>fecth</i>
-CronArgsHelp=Metóda argumenty. <BR> Napr načítať metódy objektu výrobku Dolibarr / htdocs / produktu / trieda / product.class.php, môže byť hodnota paramters byť <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=Systém príkazového riadka spustiť.
 CronCreateJob=Create new Scheduled Job
 CronFrom=Z
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/sk_SK/errors.lang b/htdocs/langs/sk_SK/errors.lang
index 1370f0edf3a..ff9dadd7021 100644
--- a/htdocs/langs/sk_SK/errors.lang
+++ b/htdocs/langs/sk_SK/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Nepodarilo sa vytvoriť súbor <b>&quot;%s&quot;.</b>
 ErrorFailToRenameDir=Nepodarilo sa premenovať adresár <b>&quot;%s&quot;</b> na <b>&quot;%s&quot;.</b>
 ErrorFailToCreateDir=Nepodarilo sa vytvoriť adresár <b>&quot;%s&quot;.</b>
 ErrorFailToDeleteDir=Nepodarilo sa zmazať adresár <b>&quot;%s&quot;.</b>
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=Tento kontakt je už definovaný ako kontakt pre tento typ.
 ErrorCashAccountAcceptsOnlyCashMoney=Tento bankový účet peňažný účet, takže prijíma platby typu iba v hotovosti.
 ErrorFromToAccountsMustDiffers=Zdrojovej a cieľovej bankové účty musí byť iný.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Nepodarilo sa zapísať do adresára %s
 ErrorFoundBadEmailInFile=Našiel nesprávne email syntaxe %s riadkov v súbore (%s príklad súlade s emailom = %s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Niektoré požadované pole sa nevypĺňa.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Nepodarilo sa vytvoriť adresár. Uistite sa, že webový server má užívateľ oprávnenie na zápis do adresára dokumentov Dolibarr. Ak je parameter <b>safe_mode</b> je povolené na tomto PHP, skontrolujte, či Dolibarr php súbory, vlastné pre užívateľa webového servera (alebo skupina).
 ErrorNoMailDefinedForThisUser=Žiadna pošta definované pre tohto používateľa
 ErrorFeatureNeedJavascript=Táto funkcia potrebujete mať Java scripty byť aktivovaný do práce. Zmeniť v nastavení - displej.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoice
 ErrorWebServerUserHasNotPermission=Užívateľský účet <b>%s</b> použiť na spustenie webový server nemá oprávnenie pre ktoré
 ErrorNoActivatedBarcode=Žiaden čiarový kód aktivovaný typ
 ErrUnzipFails=Nepodarilo sa rozbaliť %s s ZipArchive
-ErrNoZipEngine=No motor rozbaliť %s súbor v tomto PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=Súborov %s musí byť zips Dolibarr balíček
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=PHP CURL nie je nainštalovaný, je to nevyhnutné hovoriť s Paypal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # 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.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice
 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/sk_SK/main.lang b/htdocs/langs/sk_SK/main.lang
index 37ac2025e6c..e16ed9ff52d 100644
--- a/htdocs/langs/sk_SK/main.lang
+++ b/htdocs/langs/sk_SK/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=Parameter %s nie je definovaný
 ErrorUnknown=Neznáma chyba
 ErrorSQL=Chyba SQL
 ErrorLogoFileNotFound=Súbor loga '%s' nebol nájdený
-ErrorGoToGlobalSetup=Prejsť do spoločnosti / Nadácia nastavenia Ak chcete tento
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=Choď na Nastavenie modulu to opraviť
 ErrorFailedToSendMail=Nepodarilo sa odoslať poštu (vysielač, prijímač = %s = %s)
 ErrorFileNotUploaded=Súbor nebol nahraný. Skontrolujte, či veľkosť nepresahuje maximálnu povolenú, že voľné miesto na disku a že už nie je súbor s rovnakým názvom v tomto adresári.
@@ -153,6 +153,7 @@ Edit=Upraviť
 Validate=Potvrdiť
 ValidateAndApprove=Overiť a schváliť
 ToValidate=Ak chcete overiť
+NotValidated=Not validated
 Save=Uložiť
 SaveAs=Uložiť ako
 TestConnection=Skúšobné pripojenie
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=No applicative disconnect feature with authenticatio
 Connection=Spojenie
 Setup=Setup
 Alert=Upozornenie
+MenuWarnings=Upozornenie
 Previous=Predchádzajúci
 Next=Ďalšie
 Cards=Karty
@@ -308,6 +310,7 @@ Copy=Kopírovať
 Paste=Pasta
 Default=Štandardné
 DefaultValue=Východisková hodnota
+DefaultValues=Default values
 Price=Cena
 UnitPrice=Jednotková cena
 UnitPriceHT=Jednotková cena (bez DPH)
@@ -363,7 +366,8 @@ VATRate=Daňová sadzba
 Average=Priemer
 Sum=Súčet
 Delta=Delta
-Module=Modul
+Module=Module/Application
+Modules=Modules/Applications
 Option=Voľba
 List=Zoznam
 FullList=Plný zoznam
@@ -387,7 +391,7 @@ ActionRunningNotStarted=Ak chcete začať
 ActionRunningShort=In progress
 ActionDoneShort=Hotový
 ActionUncomplete=Neúplné
-CompanyFoundation=Spoločnosti / Nadácia
+CompanyFoundation=Company/Organisation
 ContactsForCompany=Kontakty pre túto tretiu stranu
 ContactsAddressesForCompany=Kontakty / adries tretím stranám tejto
 AddressesForCompany=Adresy pre túto tretiu stranu
@@ -405,8 +409,9 @@ Generate=Generovať
 Duration=Trvanie
 TotalDuration=Celkové trvanie
 Summary=Zhrnutie
-DolibarrStateBoard=Štatistika
-DolibarrWorkBoard=Pracovné úlohy doska
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=Dostupný
 NotYetAvailable=Zatiaľ nie je k dispozícii
 NotAvailable=Nie je k dispozícii
@@ -434,7 +439,7 @@ Reportings=Hlásenie
 Draft=Návrh
 Drafts=Dáma
 Validated=Overené
-Opened=Otvorené
+Opened=Otvorení
 New=Nový
 Discount=Zľava
 Unknown=Neznámy
@@ -453,6 +458,7 @@ NextStep=Ďalší krok
 Datas=Údaje
 None=Nikto
 NoneF=Nikto
+NoneOrSeveral=None or several
 Late=Neskoro
 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.
 Photo=Obrázok
@@ -606,7 +612,8 @@ PartialWoman=Čiastočný
 TotalWoman=Celkový
 NeverReceived=Nikdy nedostal
 Canceled=Zrušený
-YouCanChangeValuesForThisListFromDictionarySetup=Hodnoty tohto zoznamu môžete zmenit z menu Nastavenie - Slovník
+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
 Color=Farba
 Documents=Pripojené súbory
@@ -642,6 +649,7 @@ FreeLineOfType=Voľný vstup typu
 CloneMainAttributes=Clone objekt s jeho hlavnými atribútmi
 PDFMerge=PDF Merge
 Merge=Spojiť
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Zobraziť stránku pre tlač hlavnú obsahovú časť
 MenuManager=Menu manažér
 WarningYouAreInMaintenanceMode=Pozor, ste v režime údržby, tak len prihlásení <b>%s</b> je dovolené používať aplikácie v túto chvíľu.
@@ -708,6 +716,7 @@ from=z
 toward=k
 Access=Prístup
 SelectAction=Select action
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Použite Ctrl + C skopírujte do schránky
 SaveUploadedFileWithMask=Uloženie súboru na serveri s názvom <strong>&quot;%s&quot;</strong> (inak &quot;%s&quot;)
 OriginFileName=Pôvodný názov súboru
@@ -718,7 +727,7 @@ ViewPrivateNote=Zobraziť poznámky
 XMoreLines=%s riadk(y/ov) skrytých
 PublicUrl=Verejné URL
 AddBox=Pridať box
-SelectElementAndClickRefresh=Vyberte prvok a stlačte Obnoviť
+SelectElementAndClick=Select an element and click %s
 PrintFile=Vytlačiť súbor %s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Choďte na Domov - Nastavenie - Spoločnosť pre zmenu loga, alebo na Domov - Nastavenie - Zobrazenie pre skrytie loga.
@@ -734,8 +743,8 @@ Hello=Ahoj
 Sincerely=Sincerely
 DeleteLine=Odstránenie riadka
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
@@ -755,11 +764,20 @@ Calendar=Kalendár
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiškálny rok
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Pondelok
 Tuesday=Utorok
@@ -817,5 +835,3 @@ SearchIntoContracts=Zmluvy
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/sk_SK/other.lang b/htdocs/langs/sk_SK/other.lang
index d246e62180c..89dd366e930 100644
--- a/htdocs/langs/sk_SK/other.lang
+++ b/htdocs/langs/sk_SK/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=Dátum narodenia
 BirthdayAlertOn=narodeniny výstraha aktívna
 BirthdayAlertOff=narodeniny upozornenia neaktívne
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=Intervencie overená
 Notify_FICHINTER_SENTBYMAIL=Intervencie poštou
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=Toto je <b>test-mail</b> (slovo test musí byť tučne).
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Prof Id %s</b> je informácia v závislosti na tretích strán krajiny. <br> Napríklad pre krajiny <b>%s,</b> je to kód <b>%s.</b>
 DolibarrDemo=Dolibarr ERP / CRM demo
-StatsByNumberOfUnits=Štatistika v rade produktov / služieb jednotiek
-StatsByNumberOfEntities=Štatistika v počte odkazujúcich subjektov
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=Zásah %s bol overený.
 EMailTextInvoiceValidated=Faktúra %s bol overený.
diff --git a/htdocs/langs/sk_SK/projects.lang b/htdocs/langs/sk_SK/projects.lang
index 128849d06e3..9ef949c8c39 100644
--- a/htdocs/langs/sk_SK/projects.lang
+++ b/htdocs/langs/sk_SK/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Všetci
 PrivateProject=Projekt kontakty
+ProjectsImContactFor=Projects I'm explicitely a contact of
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=Všetky projekty
 MyProjectsDesc=Tento pohľad je obmedzená na projekty, ste kontakt (nech je to typ).
 ProjectsPublicDesc=Tento názor predstavuje všetky projekty, ktoré sú prístupné pre čítanie.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=Tento názor predstavuje všetky projekty a úlohy (vaše užívateľs
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=Nový projekt
 AddProject=Create project
 DeleteAProject=Odstránenie projektu
 DeleteATask=Ak chcete úlohu
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Opened projects
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Zobraziť projektu
 SetProject=Nastavenie projektu
 NoProject=Žiadny projekt definovaný alebo vlastné
 NbOfProjects=Nb projektov
+NbOfTasks=Nb of tasks
 TimeSpent=Čas strávený
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
@@ -47,9 +52,9 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=Užívateľ
 TaskTimeNote=Poznámka
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
-NewTimeSpent=Nový čas strávený
+NewTimeSpent=Čas strávený
 MyTimeSpent=Môj čas strávený
 Tasks=Úlohy
 Task=Úloha
@@ -59,6 +64,7 @@ TaskDescription=Task description
 NewTask=Nová úloha
 AddTask=Create task
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Činnosť
 Activities=Úlohy / aktivity
 MyActivities=Moje úlohy / činnosti
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Zoznam zákaziek súvisiacich s projektom
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=Zoznam výkonov spojených s projektom
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Projekt kontakty
 ActionsOnProject=Udalosti na projekte
 YouAreNotContactOfProject=Nie ste kontakt tomto súkromnom projekte
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Odstrániť čas strávený
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
@@ -110,7 +118,7 @@ TaskRessourceLinks=Zdroje
 ProjectsDedicatedToThisThirdParty=Projekty venovaný tejto tretej osobe
 NoTasks=Žiadne úlohy tohto projektu
 LinkedToAnotherCompany=Súvisí s tretej strane
-TaskIsNotAffectedToYou=Task not assigned to you
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=Čas strávený je prázdny
 ThisWillAlsoRemoveTasks=Táto akcia bude tiež odstrániť všetky úlohy projektu <b>(%s</b> úlohy v túto chvíľu) a všetky vstupy času stráveného.
 IfNeedToUseOhterObjectKeepEmpty=Ak sú niektoré predmety (faktúra, objednávka, ...), ktoré patria do inej tretej osobe, musí byť spojené s projektom, vytvoriť, aby bol tento prázdny mať projekt bytia multi tretej strany.
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
 ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/sl_SI/accountancy.lang b/htdocs/langs/sl_SI/accountancy.lang
index 606f39ed6af..df8fa63f7f3 100644
--- a/htdocs/langs/sl_SI/accountancy.lang
+++ b/htdocs/langs/sl_SI/accountancy.lang
@@ -3,9 +3,9 @@ ACCOUNTING_EXPORT_SEPARATORCSV=Ločilo za stolpce za izvozno datoteko
 ACCOUNTING_EXPORT_DATE=Format datuma za izvozno datoteko
 ACCOUNTING_EXPORT_PIECE=Export the number of piece
 ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account
-ACCOUNTING_EXPORT_LABEL=Export label
-ACCOUNTING_EXPORT_AMOUNT=Export amount
-ACCOUNTING_EXPORT_DEVISE=Export currency
+ACCOUNTING_EXPORT_LABEL=Izvozi naziv
+ACCOUNTING_EXPORT_AMOUNT=Izvozi znesek
+ACCOUNTING_EXPORT_DEVISE=Izvozi valuto
 Selectformat=Select the format for the file
 ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
 ThisService=This service
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=Dodaj računovodskega račun
 AccountAccounting=Računovodstvo račun
 AccountAccountingShort=Račun
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=Glavna knjiga
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Prodam revija
@@ -132,19 +140,19 @@ Sens=Sens
 Codejournal=Revija
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Debetne in Credit ne more imeti vrednosti hkrati
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=Seznam računovodskih računov
 
 Pcgtype=Razred račun
-Pcgsubtype=Pod razred račun
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Skupaj prodajna marža
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Napaka, ne morete izbrisati to računovodsko račun, ker se uporablja
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Koda
+Nature=Narava
+AccountingJournalType1=Various operation
+AccountingJournalType2=Prodaja
+AccountingJournalType3=Nabava
+AccountingJournalType4=Banka
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Izvoz
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index 6d5ebdb4082..9d90b068978 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=Interni uporabniki
 ExternalUsers=Zunanji uporabniki
 GUISetup=Prikaz
 SetupArea=Področje nastavitev
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Testiranje »upload-a« (v skladu z nastavitvami)
 IfModuleEnabled=Opomba: 'Da' velja samo, če je omogočen modul <b>%s</b>
 RemoveLock=Odstrani datoteko <b>%s</b>, če obstaja,  da omogočite orodje za posodobitev.
@@ -85,7 +86,7 @@ Mask=Maska
 NextValue=Naslednja vrednost
 NextValueForInvoices=Naslednja vrednost (fakture)
 NextValueForCreditNotes=Naslednja vrednost (dobropisi)
-NextValueForDeposit=Naslednja vrednost (depozit)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Naslednja vrednost (zamenjave)
 MustBeLowerThanPHPLimit=Opomba: vaš PHP omejuje velikost datoteke za prenos na <b>%s</b> %s, kot je vrednost tega parametra
 NoMaxSizeByPHPLimit=Opomba: V vaši PHP konfiguraciji ni nastavljenih omejitev
@@ -103,7 +104,7 @@ MenuIdParent=ID nadrejenega menija
 DetailMenuIdParent=ID nadrejenega menija (0 za najvišji meni)
 DetailPosition=Številka za razvrstitev za določanje položaja menija
 AllMenus=Vsi
-NotConfigured=Ni konfiguriran
+NotConfigured=Module/Application not configured
 Active=Aktiven
 SetupShort=Nastavitve
 OtherOptions=Ostale opcije
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Ločilo tisočic
 Destination=Destinacija
 IdModule=ID modula
 IdPermissions=ID dovoljenj
-Modules=Moduli
 LanguageBrowserParameter=Parameter %s
 LocalisationDolibarrParameters=Lokalizacijski parameteri
 ClientTZ=Časovni pas klienta (uporabnika)
@@ -123,7 +123,8 @@ PHPTZ=Časovni pas PHP strežnika
 DaylingSavingTime=Poletni/zimski čas (uporabnik)
 CurrentHour=Ura PHP strežnika
 CurrentSessionTimeOut=Časovna omejitev trenutne seje
-YouCanEditPHPTZ=Za nastavitev drugačne PHP časovne cone (ni obvezno), lahko poskusite dodati datoteko .htacces z vrstico, kot je ta "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max number of lines for widgets
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Dovoljenja
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Prikazani so samo elementi <a href="%s">omogočenih modulov </a>.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Šifrirana baza podatkov v conf.php (priporočen
 InstrucToEncodePass=Za kodiranje gesla v datoteki <b>conf.php</b>, zamenjajte vrstico <br><b>$dolibarr_main_db_pass="...";</b><br>z<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=Za dekodiranje gesla (izbris) v datoteki <b>conf.php</b>, zamenjajte vrstico <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>z<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Zaščita generiranih pdf datotek (aktivacija ni priporočena, prekinjeno masovno generiranje pdf)
-ProtectAndEncryptPdfFilesDesc=Zaščiteni PDF se lahko berejo in tiskajo preko kateregakoli PDF bralnika. Vendar pa ni več možno popravljanje in kopiranje. Upoštevajte, da uporaba te funkcije onemogoči izdelavo globalnih zbirnih pdf datotek (kot so neplačani računi).
+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=Funkcija
 DolibarrLicense=Licenca
 Developpers=Razvojniki/sodelavci
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr online demo
 OfficialMarketPlace=Uradna tržnica za zunanje module/dodatke
 OfficialWebHostingService=Referenčne storitve spletnega gostovanja (gostovanje v oblaku)
 ReferencedPreferredPartners=Preferirani partnerji
-OtherResources=Drugi izvori
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=Glede dokumentacije za uporabnike in razvojnike (Doc, FAQ...),<br>poglejte na Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=Za vsa ostala vprašanja/pomoč lahko uporabite Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=To področje vam omogoča dostop do storitve »Dolibarr Help Support«.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=Funkcija ni na voljo pri Unix sistemih. Preverite pro
 SubmitTranslation=Če prevod v ta jezik ni narejen v celoti ali če ste v prevodu našli napake, lahko popravite datoteke v mapi <b>langs/%s</b> in pošljete vaše spremembe na www.transifex.com/dolibarr-association/dolibarr/
 SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
 ModuleSetup=Nastavitve modula
-ModulesSetup=Nastavitve modulov
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Sistem
 ModuleFamilyCrm=Upravljanje odnosov s strankami (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=Trenutna različica Dolibarr
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Posodobitev strežnika brez povezave
+WithCounter=Manage a counter
 GenericMaskCodes=Vnesete lahko kakršnokoli številčno masko. V tej maski lahko uporabite naslednje oznake:<br><b>{000000}</b> ustreza številki, ki se poveča pri vsakem %s. Vnesite toliko ničel, kot je želena dolžina števca. Števec se bo zapolnil z ničlami na levi strani, da bi velikost ustrezala maski. <br><b>{000000+000}</b> enako kot prej, vendar je desno od znaka + odmik, ki je uporabljen na prvi %s. <br><b>{000000@x}</b> enako kot prej, vendar se števec resetira na 0, ko se doseže mesec x (x je med 1 in 12). Če je uporabljena ta opcija, ,in je x enak ali večji od 2, je zahtevana tudi sekvenca {yy}{mm} ali {yyyy}{mm}. <br><b>{dd}</b> dan (01 do 31).<br><b>{mm}</b> mesec (01 do 12).<br><b>{yy}</b>, <b>{yyyy}</b> ali <b>{y}</b> leto, izraženo z 2, 4 ali 1 številko. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Vsi ostali znaki v maski bodo ostali nedotaknjeni.<br>Presledki niso dovoljeni.<br>
-GenericMaskCodes4a=<u>Primer 99-ega %s partnerja podjetja narejen 2007-01-31:</u><br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Primer partnerja 99, kreiranega 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Primer proizvoda, kreiranega 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> bo dal rezultat <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> bo dal rezultat <b>0199-ZZZ/31/XXX</b>
+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=Predlaga prilagodljivo številko glede na definirano masko.
 ServerAvailableOnIPOrPort=Strežnik je na voljo na naslovu <b>%s</b> na vratih <b>%s</b>
 ServerNotAvailableOnIPOrPort=Strežnik ni na voljo na naslovu <b>%s</b> na vratih <b>%s</b>
@@ -369,19 +375,21 @@ Int=Celo število
 Float=Plavajoče
 DateAndTime=Datum in ura
 Unique=Enoličen
-Boolean=Boolov izraz (potrditveno polje)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Telefon
 ExtrafieldPrice = Cena
 ExtrafieldMail = E-pošta
 ExtrafieldUrl = Url
 ExtrafieldSelect = Izberi seznam
 ExtrafieldSelectList = Izberi iz tabele
-ExtrafieldSeparator=Ločilo
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Geslo
-ExtrafieldCheckBox=Potrditveno polje
-ExtrafieldRadio=Radijski gumb
-ExtrafieldCheckBoxFromList= Potrditveno polje iz tabele
+ExtrafieldRadio=Radio buttons (on choice only)
+ExtrafieldCheckBox=Checkboxes
+ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Poveži z objektom
+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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Seznam parametrov mora biti kot ključ,vrednost<br><br> na primer : <br>1,vrednost1<br>2,vrednost2<br>3,vrednost3<br>...
 ExtrafieldParamHelpradio=Seznam parametrov mora biti kot ključ,vrednost<br><br> na primer : <br>1,vrednost1<br>2,vrednost2<br>3,vrednost3<br>...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Polje
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Uporabniki & skupine
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=Upravljanje računov in dobropisov za kupce. Upravljanje računov d
 Module40Name=Dobavitelji
 Module40Desc=Upravljanje dobaviteljev in nabava (naročila in računi)
 Module42Name=Sistemski dnevniki (syslog)
-Module42Desc=Možnosti za prijavljanje (syslog)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Urejevalniki
 Module49Desc=Upravljanje urejevalnikov
 Module50Name=Proizvodi
@@ -499,8 +521,8 @@ Module410Name=Internetni koledar
 Module410Desc=Integracija internetnega koledarja
 Module500Name=Posebni stroški
 Module500Desc=Upravljanje posebnih stroškov (davki, socialni ali fiskalni prispevki, dividende)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Posojilo
 Module520Desc=Upravljanje posojil
 Module600Name=Obvestila
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=Možnost konverzije GeoIP Maxmind
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
-Module4000Desc=Human resources management
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Skupine podjetij
 Module5000Desc=Omogoča upravljaje skupine podjetij
 Module6000Name=Potek dela
@@ -591,7 +615,7 @@ Permission32=Kreiranje/spreminjanje proizvodov
 Permission34=Brisanje proizvodov
 Permission36=Pregled/upravljanje skritih proizvodov
 Permission38=Izvoz proizvodov
-Permission41=Beri projekte in naloge (za katere sem jaz kontaktna oseba). Lahko se vnese porabljen čas za dodeljeno nalogo (časovnica)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Brisanje projektov
 Permission45=Export projects
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Metode naročanja
 DictionarySource=Izvor ponudb/naročil
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Modeli kontnih planov
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Predloge za elektronsko pošto
 DictionaryUnits=Enote
 DictionaryProspectStatus=Status možnih strank
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Status priložnosti za projekt/možnost
 SetupSaved=Nastavitve shranjene
+SetupNotSaved=Setup not saved
 BackToModuleList=Nazaj na seznam modulov
 BackToDictionaryList=Nazaj na seznam slovarjev
 VATManagement=Upravljanje DDV
@@ -921,7 +947,7 @@ Host=Server
 DriverType=Tip gonilnika
 SummarySystem=Povzetek sistemskih informacij
 SummaryConst=Seznam vseh Dolibarr nastavitvenih parametrov
-MenuCompanySetup=Podjetje/ustanova
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= Vmesnik za standardni meni
 DefaultMenuSmartphoneManager=Vmesnik za Smartphone meni
 Skin=Tema preobleke
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Default max length for lists
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=Sporočilo dneva
 MessageLogin=Sporočilo na prijavni strani
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Stalno polje za iskanje na levem meniju
 DefaultLanguage=Privzet jezik uporabe (koda jezika)
 EnableMultilangInterface=Omogočen večjezični vmesnik
 EnableShowLogo=Prikaži logo na levem meniju
-CompanyInfo=Informacije o podjetju/ustanovi
-CompanyIds=Registracijski podatki o podjetju/ustanovi
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=Ime podjetja
 CompanyAddress=Naslov
 CompanyZip=Poštna številka
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Toleranca zakasnitve (v dnevih) pred opozorilom na zak
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Toleranca zakasnitve (v dnevih) pred opozorilom na potrebo po deponiranju čeka
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Ostale postavke na meniju so namenjene upravljanju opcijskih parametrov.
 LogEvents=Dogodki v zvezi z nadzorovanjem varnosti
 Audit=Nadzor
@@ -987,7 +1015,7 @@ BrowserOS=OS brskalnika
 ListOfSecurityEvents=Seznam varnostnih dogodkov Dolibarr
 SecurityEventsPurged=Varnostni dogodki očistimo
 LogEventDesc=Tukaj lahko omogočite beleženje dnevnika Dolibarr varnostnih dogodkov. Administratorji lahko vidijo njegovo vsebino preko menija <b>Sistemska orodja - Nadzor</b>. Pozor, ta funkcija lahko uporabi veliko količino podatkov iz baze.
-AreaForAdminOnly=Te funkcije lahko uporablja samo <b>administrator</b>.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Sistemske informacije so raznovrstne tehnične informacije, ki so na voljo samo v bralnem načinu in jih vidi samo administrator.
 SystemAreaForAdminOnly=To področje je na voljo samo administratorju. Nobeno od Dolibarr dovoljenj ne more spremeniti teh omejitev.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists in any language files
+TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Omogočiti morate vsaj 1 modul
 ClassNotFoundIntoPathWarning=Ratzred %s ni najedn na poti PHP
 YesInSummer=Da poleti
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Shranjevanje seje kriptirano s Suhosin
 ConditionIsCurrently=Trenutni pogoj je %s
 YouUseBestDriver=Uporabljate gonilnik %s , ki je najboljši trenutno na voljo
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Strokovno Id edinstven
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Izvozna povezava na <b>%s</b> format je na voljo na naslednji povezavi: %s
 ##### Invoices #####
 BillsSetup=Nastavitve modula za račune
 BillsNumberingModule=Modul za številčenje računov in dobropisov
 BillsPDFModules=Modeli obrazcev računov
+PaymentsPDFModules=Payment documents models
 CreditNote=Dobropis
 CreditNotes=Dobropisi
 ForceInvoiceDate=Vsili datum računa kot datum potrditve
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Datoteke tipa %s niso shranjene v predpomnilniku HTTP stre
 FilesOfTypeCompressed=Datoteke tipa %s so komprimirane v HTTP strežniku
 FilesOfTypeNotCompressed=Datoteke tipa %s niso komprimirane v HTTP strežniku
 CacheByServer=Predpomnilnik v strežniku
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Predpomnilnik v brskalniku
 CompressionOfResources=Kompresija HTTP odgovorov
+CompressionOfResourcesDesc=For exemple using the Apache directive "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Taka avtomatska zaznava ni možna v trenutnem brskalniku
+DefaultValuesDesc=You can define/force here the default value you want to get when your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Nastavitve modula za proizvode
 ServiceSetup=Storitve modul nastavitev
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Predvideva se datum računa
 Buy=Nakup
 Sell=Prodaja
 InvoiceDateUsed=Uporabljen datum računa
-YourCompanyDoesNotUseVAT=Vaše podjetje ni davčni zavezanec (Domov - Nastavitve - Podjetje/ustanova), zato ni možno nastaviti opcij za DDV.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=Računovodstvo zakonik
 AccountancyCodeSell=Računovodska koda prodaje
 AccountancyCodeBuy=Računovodska koda nabave
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Avtomatsko nastavi ta status aktivnosti v iskalni f
 AGENDA_DEFAULT_VIEW=Kateri zavihek naj se privzeto odpre ko izberete meni Dnevni red
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Nastavitve modula za klicanje s klikom
-ClickToDialUrlDesc=Po kliku na piktogram se izvede klic na Url.  Na url lahko uporabite ikono<br><b>__PHONETO__</b> ki predstavlja telefon klicanega<br><b>__PHONEFROM__</b> ki predstavlja telefon klicatelja (vaša številka)<br><b>__LOGIN__</b> ki predstavlja vašo prijavo na klicanje s klikom (določena z vašo uporabniško kodo)<br><b>__PASS__</b> ki predstavlja vaše geslo za klicanje s klikom (določena z vašo uporabniško kodo).
+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.
 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 same computer than 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.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=Nastavitev modula API
 ApiDesc=Z omogočenjem tega modula postane Dolibarr REST strežnik za zagotavljanje različnih spletnih storitev.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+ApiExporerIs=You can explore and test the APIs at URL
 OnlyActiveElementsAreExposed=Izpostavljeni so samo elementi omogočenih modulov
 ApiKey=Ključ za 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.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=Splošno zaporedje prikaza
 BankOrderES=Španski
 BankOrderESDesc=Spanish display order
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=Nastavitev modula za več podjetij
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ BackupDumpWizard=Čarovnik za ustvarjanje datoteke z varnostnimi kopijami podatk
 SomethingMakeInstallFromWebNotPossible=Instalacija eksternega modula s spletnega vmesnika ni možna zaradi naslednjega razloga:
 SomethingMakeInstallFromWebNotPossible2=Zaradi tega razloga je tukaj opisan postopek samo ročnih korakov, ki jih lahko naredi le uporabnik z dovoljenjem.
 InstallModuleFromWebHasBeenDisabledByFile=Instalacijo zunanjega modula iz aplikacije je onemogočil vaš administrator. Prositi ga morate, naj odstrani datoteko <strong>%s</strong>, da bi omogočil to funkcijo.
-ConfFileMuseContainCustom=Installing 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=Osvetli vrstice tabele, preko katerih je šla miška
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
 LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Barva ozadja
 TopMenuBackgroundColor=Barva ozadja za zgornji meni
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimalni rok za obvestilo (Vaš zahtevek za odsotnost mora
 NbAddedAutomatically=Število dodanih dni pri števcu uporabnikov (avtomatsko) vsak mesec
 EnterAnyCode=To polje vsebuje referenco identifikacijske vrstice. Vnesite poljubno vrednost, vendar brez posebnih znakov.
 UnicodeCurrency=Med oklepaja vnesite seznam bitnih števil, ki določajo valutni simbol. Na primer: za $, vnesite [36] - za brazilski real R$ [82,36] - za €, vnesite [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Položaj vrstice v kombiniranih seznamih
 SellTaxRate=Stopnja prodajnega davka
 RecuperableOnly=Yes z DDV "Non Perçue Récupérable" določen za nekatera področja v Franciji. Obdržite vrednost "No" v vseh drugih primerih.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/sl_SI/compta.lang b/htdocs/langs/sl_SI/compta.lang
index 3f37d21ffd9..58cc2377639 100644
--- a/htdocs/langs/sl_SI/compta.lang
+++ b/htdocs/langs/sl_SI/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using r
 Param=Nastavitve
 RemainingAmountPayment=Znesek preostalih plačil :
 Account=Konto
-Accountparent=Nadrejen račun
-Accountsparent=Ndrejeni računi
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=Prejemek
 Outcome=Izdatek
 ReportInOut=Prejemek / Izdatek
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Davki in dividende
 MenuSocialContributions=Social/fiscal taxes
 MenuNewSocialContribution=New social/fiscal tax
 NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Področje računovodstva/blagajne
 NewPayment=Novo plačilo
@@ -134,8 +135,8 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- Vključuje vsa dejanska plačila kupcev.<br>- Temelji na datumu plačila teh računov<br>
-DepositsAreNotIncluded=- Vlog računi so prav tako vključeni
-DepositsAreIncluded=- Vključena so vlog računi
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Poročilo tretjih oseb IRPF
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
 VATReport=VAT report
@@ -169,7 +170,7 @@ DescSellsJournal=Poročilo o prodaji
 DescPurchasesJournal=Poročilo o nabavi
 InvoiceRef=Referenca računa
 CodeNotDef=Ni definirano
-WarningDepositsNotIncluded=Avansni računi niso vključeni v tej verziji računovodskega modula.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Datum plačila ne more biti nižji od datuma storitve.
 Pcg_version=Chart of accounts models
 Pcg_type=Pcg način
@@ -189,8 +190,10 @@ AccountancyJournal=Accountancy code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/sl_SI/cron.lang b/htdocs/langs/sl_SI/cron.lang
index ff381bf9d15..8195afc58df 100644
--- a/htdocs/langs/sl_SI/cron.lang
+++ b/htdocs/langs/sl_SI/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allow to execute job that have been planned
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Naloga
 CronNone=Nič
 CronDtStart=Not before
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Omogočeno
 CronStatusInactiveBtn=Onemogoči
 CronTaskInactive=This job is disabled
 CronId=Id
-CronClassFile=Classes (filename.class.php)
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=Od
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/sl_SI/dict.lang b/htdocs/langs/sl_SI/dict.lang
index a302c28e995..3a15500a30a 100644
--- a/htdocs/langs/sl_SI/dict.lang
+++ b/htdocs/langs/sl_SI/dict.lang
@@ -138,7 +138,7 @@ CountryLS=Lesoto
 CountryLR=Liberija
 CountryLY=Libija
 CountryLI=Lihtenštajn
-CountryLT=Lithuania
+CountryLT=Litva
 CountryLU=Luksemburg
 CountryMO=Makao
 CountryMK=Makedonija
diff --git a/htdocs/langs/sl_SI/errors.lang b/htdocs/langs/sl_SI/errors.lang
index 21953a5bcfe..af30bdb6101 100644
--- a/htdocs/langs/sl_SI/errors.lang
+++ b/htdocs/langs/sl_SI/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Napaka pri kreiranju datoteke '<b>%s</b>'.
 ErrorFailToRenameDir=Napaka pri preimenovanju mape '<b>%s</b>' v '<b>%s</b>'.
 ErrorFailToCreateDir=Napaka pri kreiranju mape '<b>%s</b>'.
 ErrorFailToDeleteDir=Napaka pri brisanju mape '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=Ta kontakt je že definiran kot kontakt istega tipa.
 ErrorCashAccountAcceptsOnlyCashMoney=Ta bančni račun je gotovinski, zato so možna samo gotovinska plačila.
 ErrorFromToAccountsMustDiffers=Plačilni in ciljni bančni račun morata biti različna.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Napaka pri pisanju v mapo %s
 ErrorFoundBadEmailInFile=Napačna email sintaksa v vrstici %s v datoteki (naprimer vrstica %s z emailom=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Nekatera zahtevana polja niso izpolnjena.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Kreiranje mape ni uspelo. Preverite, če ima uporabnik internetne strani dovoljenje za pisanje v mapo z Dolibarr dokumenti. Če je parameter <b>safe_mode</b> v tem PHP omogočen, preverite če je lastnik Dolibarr php datotek uporabnik web strežnika (ali skupina).
 ErrorNoMailDefinedForThisUser=Ta uporabnik nima določenega Email naslova
 ErrorFeatureNeedJavascript=Za aktiviranje ali delovanje te funkcije je potreben javascript. Spremenite »Nastavitve – Prikaz«.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoice
 ErrorWebServerUserHasNotPermission=Uporabniški račun <b>%s</b> uporablja za izvedbo spletni strežnik nima dovoljenja za to
 ErrorNoActivatedBarcode=Noben tip črtne kode ni aktiviran
 ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # 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.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice
 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/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang
index ba7ff980af3..e7bc7f7da7f 100644
--- a/htdocs/langs/sl_SI/main.lang
+++ b/htdocs/langs/sl_SI/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=Parameter %s ni definiran
 ErrorUnknown=Neznana napaka
 ErrorSQL=SQL napaka
 ErrorLogoFileNotFound=Datoteka z logotipom '%s' ni bila najdena
-ErrorGoToGlobalSetup=Popravite v meniju 'Nastavitve', 'Podjetje/Ustanova'
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=Popravite v meniju 'Nastavitve', 'Moduli'
 ErrorFailedToSendMail=Napaka pri pošiljanju E-maila (pošiljatelj=%s, prejemnik=%s)
 ErrorFileNotUploaded=Datoteka ni bila naložena. Preverite, če velikost ne presega omejitve, če je na disku dovolj prostora ali če datoteka z istim imenom že obstaja v tej mapi.
@@ -153,6 +153,7 @@ Edit=Uredi
 Validate=Potrdi
 ValidateAndApprove=Potrdi in odobri
 ToValidate=Za potrditev
+NotValidated=Not validated
 Save=Shrani
 SaveAs=Shrani kot
 TestConnection=Test povezave
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=Ni zahtevana funkcija odklopa pri avtentifikacijskem
 Connection=Prijava
 Setup=Nastavitve
 Alert=Opozorilo
+MenuWarnings=Opozorila
 Previous=Prejšnji
 Next=Naslednji
 Cards=Kartice
@@ -308,6 +310,7 @@ Copy=Kopiraj
 Paste=Prilepi
 Default=Privzeto
 DefaultValue=Privzeta vrednost
+DefaultValues=Default values
 Price=Cena
 UnitPrice=Cena enote
 UnitPriceHT=Cena enote (neto)
@@ -363,7 +366,8 @@ VATRate=Stopnja DDV
 Average=Povprečje
 Sum=Vsota
 Delta=Razlika
-Module=Modul
+Module=Module/Application
+Modules=Modules/Applications
 Option=Opcija
 List=Seznam
 FullList=Celoten seznam
@@ -387,7 +391,7 @@ ActionRunningNotStarted=Nezačete
 ActionRunningShort=In progress
 ActionDoneShort=Končane
 ActionUncomplete=Nepopolno
-CompanyFoundation=Podjetje/Ustanova
+CompanyFoundation=Company/Organisation
 ContactsForCompany=Kontakti tega partnerja
 ContactsAddressesForCompany=Kontakti/naslovi za tega partnerja
 AddressesForCompany=Naslovi za tega partnerja
@@ -405,8 +409,9 @@ Generate=Ustvari
 Duration=Trajanje
 TotalDuration=Skupno trajanje
 Summary=Povzetek
-DolibarrStateBoard=Statistika
-DolibarrWorkBoard=Tabla z delovnimi nalogami
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=Na voljo
 NotYetAvailable=Še ni na voljo
 NotAvailable=Ni na voljo
@@ -453,6 +458,7 @@ NextStep=Naslednji korak
 Datas=Podatki
 None=Nič
 NoneF=Nič
+NoneOrSeveral=None or several
 Late=Prekoračeno
 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.
 Photo=Slika
@@ -606,7 +612,8 @@ PartialWoman=Delni
 TotalWoman=Skupna
 NeverReceived=Nikoli prejeto
 Canceled=Preklicano
-YouCanChangeValuesForThisListFromDictionarySetup=Vrednosti za ta seznam lahko spremenite na meniju 'Nastavitve – Slovarji'
+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
 Color=Barva
 Documents=Povezane datoteke
@@ -642,6 +649,7 @@ FreeLineOfType=Prost vnos tipa
 CloneMainAttributes=Kloniraj objekt z osnovnimi atributi
 PDFMerge=Spoji PDF
 Merge=Spoji
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Prikaži stran za izpis področja z osnovno vsebino
 MenuManager=Upravljalnik menija
 WarningYouAreInMaintenanceMode=Pozor, ste v vzdrževalnem načinu, zato je trenutno samo prijavljenemu <b>%s</b> dovoljena uporaba aplikacije.
@@ -708,6 +716,7 @@ from=od
 toward=proti
 Access=Dostop
 SelectAction=Izberi akcijo
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Uporabi Ctrl+C za kopiranje na odložišče
 SaveUploadedFileWithMask=Shrani datoteko na strežnik z imenom "<strong>%s</strong>" (otherwise "%s")
 OriginFileName=Originalno ime datoteke
@@ -718,7 +727,7 @@ ViewPrivateNote=Glej opombe
 XMoreLines=%s zasenčena(ih) vrstic
 PublicUrl=Javni URL
 AddBox=Dodaj okvir
-SelectElementAndClickRefresh=Izberi element in klikni osveži
+SelectElementAndClick=Select an element and click %s
 PrintFile=Natisni datoteko %s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Pojdite na Domov - Nastavitve - Podjetje za spremembo logotipa oz. na Domov - Nastavitve - Prikaz za njegovo skritje.
@@ -734,8 +743,8 @@ Hello=Pozdravljeni
 Sincerely=S spoštovanjem
 DeleteLine=Izbriši vrstico
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
@@ -755,11 +764,20 @@ Calendar=Koledar
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiskalno leto
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Ponedeljek
 Tuesday=Torek
@@ -817,5 +835,3 @@ SearchIntoContracts=Pogodbe
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Stroškovna poročila
 SearchIntoLeaves=Dopusti
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/sl_SI/other.lang b/htdocs/langs/sl_SI/other.lang
index 91ef2e2eebd..bc2d5c993cc 100644
--- a/htdocs/langs/sl_SI/other.lang
+++ b/htdocs/langs/sl_SI/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=Datum rojstva
 BirthdayAlertOn=Vklopljeno opozorilo na rojstni dan
 BirthdayAlertOff=Izklopljeno opozorilo na rojstni dan
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=Potrjena intervencija
 Notify_FICHINTER_SENTBYMAIL=Intervencija poslana po EMailu
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=To je <b>test</b> mail (beseda test mora biti v krepkem t
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nV prilogi je ponudba __PROPREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nV prilogi je zahtevek za ceno __ASKREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nV prilogi je potrditev naročila __ORDERREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nV prilogi je naše naročilo __ORDERREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nV prilogi je pošiljka __SHIPPINGREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nV prilogi je intervencija __FICHINTERREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Prof Id %s</b> je informacija, odvisna od države partnerja.<br>Na primer za državo <b>%s</b>, je koda <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Statistika o številu enot proizvodov/storitev
-StatsByNumberOfEntities=Statistika o številu povezanih entitet
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=Potrjena intervencija %s
 EMailTextInvoiceValidated=Potrjen račun %s
diff --git a/htdocs/langs/sl_SI/projects.lang b/htdocs/langs/sl_SI/projects.lang
index b4cdec94699..bfb535d36ba 100644
--- a/htdocs/langs/sl_SI/projects.lang
+++ b/htdocs/langs/sl_SI/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Projekti v skupni rabi
 PrivateProject=Kontakti za projekt
+ProjectsImContactFor=Projects I'm explicitely a contact of
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=Vsi projekti
 MyProjectsDesc=Ta pogled je omejen na projekte za katere ste vi kontaktna oseba (ne glede na vrsto).
 ProjectsPublicDesc=To pogled predstavlja vse projekte, za katere imate dovoljenje za branje.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=Ta pogled predstavlja vse projekte in naloge (vaše uporabniško dovol
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=Nov projekt
 AddProject=Ustvari projekt
 DeleteAProject=Izbriši projekt
 DeleteATask=Izbriši nalogo
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Opened projects
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Prikaži projekt
 SetProject=Nastavi projekt
 NoProject=Nimate definiranega ali lastnega projekta
 NbOfProjects=Število projektov
+NbOfTasks=Nb of tasks
 TimeSpent=Porabljen čas
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
@@ -47,9 +52,9 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=Uporabnik
 TaskTimeNote=Beležka
 TaskTimeDate=Datum
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
-NewTimeSpent=Nov porabljen čas
+NewTimeSpent=Porabljen čas
 MyTimeSpent=Moj porabljen čas
 Tasks=Naloge
 Task=Naloga
@@ -59,6 +64,7 @@ TaskDescription=Opis naloge
 NewTask=Nova naloga
 AddTask=Ustvari nalogo
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Aktivnost
 Activities=Naloge/aktivnosti
 MyActivities=Moje naloge/aktivnosti
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Seznam pogodb, povezanih s projektom
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=Seznam intervencij, povezanih s projektom
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Kontakti za projekt
 ActionsOnProject=Aktivnosti o projektu
 YouAreNotContactOfProject=Niste kontakt tega privatnega projekta
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Izbrišite porabljen čas
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
@@ -110,7 +118,7 @@ TaskRessourceLinks=Viri
 ProjectsDedicatedToThisThirdParty=Projekti, ki so povezani s tem partnerjem
 NoTasks=Ni nalog za ta projekt
 LinkedToAnotherCompany=Povezane z drugimi partnerji
-TaskIsNotAffectedToYou=Task not assigned to you
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=Ni porabljenega časa
 ThisWillAlsoRemoveTasks=Ta aktivnost bo tudi izbrisala vse naloge projekta (<b>%s</b> trenutne naloge) in vse vnose porabljenega časa.
 IfNeedToUseOhterObjectKeepEmpty=Če nekateri objekti (računi, naročila, ...), ki pripadajo drugemu partnerju, morajo biti vezani na projekt, ki se kreira, pustite polje prazno, da je projekt lahko vezan na več partnerjev.
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
 ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/sq_AL/accountancy.lang b/htdocs/langs/sq_AL/accountancy.lang
index b087433178a..a63c99dacf1 100644
--- a/htdocs/langs/sq_AL/accountancy.lang
+++ b/htdocs/langs/sq_AL/accountancy.lang
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=General ledger
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
@@ -132,19 +140,19 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=List of the accounting accounts
 
 Pcgtype=Class of account
-Pcgsubtype=Under class of account
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Code
+Nature=Nature
+AccountingJournalType1=Various operation
+AccountingJournalType2=Sales
+AccountingJournalType3=Purchases
+AccountingJournalType4=Bank
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Exports
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index 34430e3ced7..15406423955 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=Përdorues të brendshëm
 ExternalUsers=Përdorues të jashtëm
 GUISetup=Display
 SetupArea=Setup area
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form to test file upload (according to setup)
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
@@ -85,7 +86,7 @@ Mask=Mask
 NextValue=Next value
 NextValueForInvoices=Next value (invoices)
 NextValueForCreditNotes=Next value (credit notes)
-NextValueForDeposit=Next value (deposit)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Next value (replacements)
 MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to <b>%s</b> %s, whatever this parameter's value is
 NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
@@ -103,7 +104,7 @@ MenuIdParent=Parent menu ID
 DetailMenuIdParent=ID of parent menu (empty for a top menu)
 DetailPosition=Sort number to define menu position
 AllMenus=Të gjitha
-NotConfigured=Modul i pakonfiguruar
+NotConfigured=Module/Application not configured
 Active=Aktiv
 SetupShort=Setup
 OtherOptions=Other options
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Thousand separator
 Destination=Destination
 IdModule=Module ID
 IdPermissions=Permissions ID
-Modules=Modulet
 LanguageBrowserParameter=Parametër %s
 LocalisationDolibarrParameters=Localisation parameters
 ClientTZ=Client Time Zone (user)
@@ -123,7 +123,8 @@ PHPTZ=PHP server Time Zone
 DaylingSavingTime=Daylight saving time
 CurrentHour=PHP Time (server)
 CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max number of lines for widgets
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activat
 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 (Activated 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 make building of a global cumulated pdf not working (like unpaid invoices).
+ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature makes building of a global merged PDFs not working.
 Feature=Feature
 DolibarrLicense=License
 Developpers=Developers/contributors
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr online demo
 OfficialMarketPlace=Official market place for external modules/addons
 OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
 ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your
 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/
 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 setup
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Update server offline
+WithCounter=Manage a counter
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
 ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
 ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
@@ -369,19 +375,21 @@ Int=Integer
 Float=Float
 DateAndTime=Date and hour
 Unique=Unique
-Boolean=Boolean (Checkbox)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Telefon
 ExtrafieldPrice = Price
 ExtrafieldMail = Email
 ExtrafieldUrl = Url
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Fjalëkalimi
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldRadio=Radio buttons (on 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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Field
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=Invoice and credit note management for customers. Invoice managemen
 Module40Name=Furnitorët
 Module40Desc=Supplier management and buying (orders and invoices)
 Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Products
@@ -499,8 +521,8 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Notifications
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
-Module4000Desc=Human resources management
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow
@@ -591,7 +615,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects i'm contact for)
 Permission45=Export projects
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Emails templates
 DictionaryUnits=Units
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Setup saved
+SetupNotSaved=Setup not saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
 VATManagement=VAT Management
@@ -921,7 +947,7 @@ Host=Server
 DriverType=Driver type
 SummarySystem=System information summary
 SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Foundation
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= Standard menu manager
 DefaultMenuSmartphoneManager=Smartphone menu manager
 Skin=Skin theme
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Default max length for lists
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=Message of the day
 MessageLogin=Login page message
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/foundation information
-CompanyIds=Company/foundation identities
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=Name
 CompanyAddress=Adresa
 CompanyZip=Zip
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Other menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Audit
@@ -987,7 +1015,7 @@ BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
 LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists 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
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Rules on Professional Ids
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####
 BillsSetup=Invoices module setup
 BillsNumberingModule=Invoices and credit notes numbering model
 BillsPDFModules=Invoice documents models
+PaymentsPDFModules=Payment documents models
 CreditNote=Credit note
 CreditNotes=Credit notes
 ForceInvoiceDate=Force invoice date to validation date
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
 FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
 FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
 CacheByServer=Cache by server
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
+CompressionOfResourcesDesc=For exemple 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 your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Products module setup
 ServiceSetup=Services module setup
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Invoice date used
 Buy=Bli
 Sell=Shit
 InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=Accountancy Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+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 your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
+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.
 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 same computer than 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.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+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.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=General display order
 BankOrderES=Spanjisht
 BankOrderESDesc=Spanish display order
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ 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.
 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.
-ConfFileMuseContainCustom=Installing 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)
 TextTitleColor=Color of page title
 LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/sq_AL/compta.lang b/htdocs/langs/sq_AL/compta.lang
index 5e9814369ec..94a3bd671ef 100644
--- a/htdocs/langs/sq_AL/compta.lang
+++ b/htdocs/langs/sq_AL/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using r
 Param=Setup
 RemainingAmountPayment=Amount payment remaining :
 Account=Account
-Accountparent=Account parent
-Accountsparent=Accounts parent
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=Income
 Outcome=Expense
 ReportInOut=Income / Expense
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Taxes and dividends
 MenuSocialContributions=Social/fiscal taxes
 MenuNewSocialContribution=New social/fiscal tax
 NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Accountancy/Treasury area
 NewPayment=New payment
@@ -134,8 +135,8 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from clients.<br>- It is based on the payment date of these invoices<br>
-DepositsAreNotIncluded=- Deposit invoices are nor included
-DepositsAreIncluded=- Deposit invoices are included
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
 VATReport=VAT report
@@ -169,7 +170,7 @@ DescSellsJournal=Sales Journal
 DescPurchasesJournal=Purchases Journal
 InvoiceRef=Invoice ref.
 CodeNotDef=Not defined
-WarningDepositsNotIncluded=Deposits invoices are not included in this version with this accountancy module.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
 Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
@@ -189,8 +190,10 @@ AccountancyJournal=Accountancy code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/sq_AL/cron.lang b/htdocs/langs/sq_AL/cron.lang
index 2101c395149..8d6477e206f 100644
--- a/htdocs/langs/sq_AL/cron.lang
+++ b/htdocs/langs/sq_AL/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allow to execute job that have been planned
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Job
 CronNone=None
 CronDtStart=Not before
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Aktivizo
 CronStatusInactiveBtn=Çaktivizo
 CronTaskInactive=This job is disabled
 CronId=Id
-CronClassFile=Classes (filename.class.php)
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=From
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/sq_AL/errors.lang b/htdocs/langs/sq_AL/errors.lang
index 9e2eb6817ef..feada2d1b5a 100644
--- a/htdocs/langs/sq_AL/errors.lang
+++ b/htdocs/langs/sq_AL/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
 ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
 ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
 ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
 ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Some required fields were not filled.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoice
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # 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.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice
 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/sq_AL/main.lang b/htdocs/langs/sq_AL/main.lang
index b2a7b7a14c0..d486ef50274 100644
--- a/htdocs/langs/sq_AL/main.lang
+++ b/htdocs/langs/sq_AL/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=Parameter %s not defined
 ErrorUnknown=Unknown error
 ErrorSQL=SQL Error
 ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=Go to Module setup to fix this
 ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
 ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
@@ -153,6 +153,7 @@ Edit=Edit
 Validate=Validate
 ValidateAndApprove=Validate and Approve
 ToValidate=To validate
+NotValidated=Not validated
 Save=Save
 SaveAs=Save As
 TestConnection=Test connection
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=No applicative disconnect feature with authenticatio
 Connection=Connection
 Setup=Setup
 Alert=Alert
+MenuWarnings=Alerts
 Previous=Previous
 Next=Next
 Cards=Cards
@@ -308,6 +310,7 @@ Copy=Copy
 Paste=Paste
 Default=Default
 DefaultValue=Default value
+DefaultValues=Default values
 Price=Price
 UnitPrice=Unit price
 UnitPriceHT=Unit price (net)
@@ -363,7 +366,8 @@ VATRate=Tax Rate
 Average=Average
 Sum=Sum
 Delta=Delta
-Module=Module
+Module=Module/Application
+Modules=Modules/Applications
 Option=Option
 List=List
 FullList=Full list
@@ -387,7 +391,7 @@ ActionRunningNotStarted=To start
 ActionRunningShort=In progress
 ActionDoneShort=Finished
 ActionUncomplete=Uncomplete
-CompanyFoundation=Company/Foundation
+CompanyFoundation=Company/Organisation
 ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
@@ -405,8 +409,9 @@ Generate=Generate
 Duration=Duration
 TotalDuration=Total duration
 Summary=Summary
-DolibarrStateBoard=Statistics
-DolibarrWorkBoard=Work tasks board
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=Available
 NotYetAvailable=Not yet available
 NotAvailable=Not available
@@ -434,7 +439,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Opened
+Opened=Hapur
 New=New
 Discount=Ulje
 Unknown=Unknown
@@ -453,6 +458,7 @@ NextStep=Next step
 Datas=Data
 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.
 Photo=Picture
@@ -606,7 +612,8 @@ PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
 Canceled=Anulluar
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
+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
 Color=Color
 Documents=Linked files
@@ -642,6 +649,7 @@ FreeLineOfType=Free entry of type
 CloneMainAttributes=Clone object with its main attributes
 PDFMerge=PDF Merge
 Merge=Merge
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Show page to print main content area
 MenuManager=Menu manager
 WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only login <b>%s</b> is allowed to use application at the moment.
@@ -708,6 +716,7 @@ from=from
 toward=toward
 Access=Access
 SelectAction=Select action
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
 SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
 OriginFileName=Original filename
@@ -718,7 +727,7 @@ ViewPrivateNote=View notes
 XMoreLines=%s line(s) hidden
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
+SelectElementAndClick=Select an element and click %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
@@ -734,8 +743,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
@@ -755,11 +764,20 @@ Calendar=Calendar
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -817,5 +835,3 @@ SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Lejet
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/sq_AL/other.lang b/htdocs/langs/sq_AL/other.lang
index 49ed25e0ec8..22b216a0816 100644
--- a/htdocs/langs/sq_AL/other.lang
+++ b/htdocs/langs/sq_AL/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=Date of birth
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Statistics in number of products/services units
-StatsByNumberOfEntities=Statistics in number of referring entities
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=The intervention %s has been validated.
 EMailTextInvoiceValidated=The invoice %s has been validated.
diff --git a/htdocs/langs/sq_AL/projects.lang b/htdocs/langs/sq_AL/projects.lang
index 95618bc5db6..325c567b86c 100644
--- a/htdocs/langs/sq_AL/projects.lang
+++ b/htdocs/langs/sq_AL/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
 PrivateProject=Project contacts
+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 (whatever is the type).
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=New project
 AddProject=Create project
 DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Opened projects
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
 SetProject=Set project
 NoProject=No project defined or owned
 NbOfProjects=Nb of projects
+NbOfTasks=Nb of tasks
 TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
@@ -47,9 +52,9 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
-NewTimeSpent=New time spent
+NewTimeSpent=Time spent
 MyTimeSpent=My time spent
 Tasks=Tasks
 Task=Task
@@ -59,6 +64,7 @@ TaskDescription=Task description
 NewTask=New task
 AddTask=Create task
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Activity
 Activities=Tasks/activities
 MyActivities=My tasks/activities
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=List of contracts associated with the project
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
 ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
@@ -110,7 +118,7 @@ TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
-TaskIsNotAffectedToYou=Task not assigned to you
+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.
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
 ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/sr_RS/accountancy.lang b/htdocs/langs/sr_RS/accountancy.lang
index 4e1a88f6681..37c63ff56f5 100644
--- a/htdocs/langs/sr_RS/accountancy.lang
+++ b/htdocs/langs/sr_RS/accountancy.lang
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=Dodaj računovodstveni nalog
 AccountAccounting=Računovodstveni nalog
 AccountAccountingShort=Račun
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=Glavna knjiga
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Stanje računa
 
 CAHTF=Ukupna nabavka bez PDV-a
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Izveštaj prodaje
@@ -132,19 +140,19 @@ Sens=Sens
 Codejournal=Izveštaj
 NumPiece=Deo broj
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finansijski izveštaji
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finansijski izveštaji uključujući sve vrste uplata preko bankovnog računa
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Debit i Kredit ne smeju imati vrednost u isto vreme
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=Lista računovodstvenih naloga
 
 Pcgtype=Klasa računa
-Pcgsubtype=Pod klasom računa
+Pcgsubtype=Subclass of account
 
 TotalVente=Ukupni obrt pre poreza
 TotalMarge=Ukupna prodajna marža
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Greška, ne možete opbrisati ovaj računovodstveni nalog, jer  je u upotrebi
 MvtNotCorrectlyBalanced=Transakcija nema dobar balans. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Kod
+Nature=Priroda
+AccountingJournalType1=Various operation
+AccountingJournalType2=Prodaje
+AccountingJournalType3=Nabavke
+AccountingJournalType4=Banka
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Izvozi
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/sr_RS/admin.lang b/htdocs/langs/sr_RS/admin.lang
index 0b463079387..a36197cc8d3 100644
--- a/htdocs/langs/sr_RS/admin.lang
+++ b/htdocs/langs/sr_RS/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=Internal users
 ExternalUsers=External users
 GUISetup=Display
 SetupArea=Setup area
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form to test file upload (according to setup)
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
@@ -85,7 +86,7 @@ Mask=Mask
 NextValue=Next value
 NextValueForInvoices=Next value (invoices)
 NextValueForCreditNotes=Next value (credit notes)
-NextValueForDeposit=Next value (deposit)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Next value (replacements)
 MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to <b>%s</b> %s, whatever this parameter's value is
 NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
@@ -103,7 +104,7 @@ MenuIdParent=Parent menu ID
 DetailMenuIdParent=ID of parent menu (empty for a top menu)
 DetailPosition=Sort number to define menu position
 AllMenus=All
-NotConfigured=Module not configured
+NotConfigured=Module/Application not configured
 Active=Active
 SetupShort=Setup
 OtherOptions=Other options
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Thousand separator
 Destination=Destination
 IdModule=Module ID
 IdPermissions=Permissions ID
-Modules=Modules
 LanguageBrowserParameter=Parameter %s
 LocalisationDolibarrParameters=Localisation parameters
 ClientTZ=Client Time Zone (user)
@@ -123,7 +123,8 @@ PHPTZ=PHP server Time Zone
 DaylingSavingTime=Daylight saving time
 CurrentHour=PHP Time (server)
 CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max number of lines for widgets
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activat
 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 (Activated 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 make building of a global cumulated pdf not working (like unpaid invoices).
+ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature makes building of a global merged PDFs not working.
 Feature=Feature
 DolibarrLicense=License
 Developpers=Developers/contributors
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr online demo
 OfficialMarketPlace=Official market place for external modules/addons
 OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
 ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your
 SubmitTranslation=Ukoliko prevod za ovaj jezik nije kompletan ili ukoliko pronađete greške, možete ga ispraviti izmenom fajlova u folderu <b>langs/%s</b> i da prosledite promene na www.transifex.com/dolibarr-association/dolibarr/
 SubmitTranslationENUS=Ukoliko prevod ovog jezika nije kompletan ili ukoliko pronađete greške, možete ih ispraviti editom fajlova u folderu <b>langs/%s</b> i proslediti izmene na dolibarr.org/forum ili na github.com/Dolibarr/dolibarr.
 ModuleSetup=Module setup
-ModulesSetup=Modules setup
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Update server offline
+WithCounter=Manage a counter
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
 ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
 ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
@@ -369,19 +375,21 @@ Int=Integer
 Float=Float
 DateAndTime=Date and hour
 Unique=Unique
-Boolean=Boolean (Checkbox)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Phone
 ExtrafieldPrice = Price
 ExtrafieldMail = Email
 ExtrafieldUrl = Url
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Password
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldRadio=Radio buttons (on 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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Polje
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=Invoice and credit note management for customers. Invoice managemen
 Module40Name=Suppliers
 Module40Desc=Supplier management and buying (orders and invoices)
 Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Products
@@ -499,8 +521,8 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Notifications
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
-Module4000Desc=Human resources management
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow
@@ -591,7 +615,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects i'm contact for)
 Permission45=Export projects
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Emails templates
 DictionaryUnits=Units
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Setup saved
+SetupNotSaved=Setup not saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
 VATManagement=VAT Management
@@ -921,7 +947,7 @@ Host=Server
 DriverType=Driver type
 SummarySystem=System information summary
 SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Foundation
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= Standard menu manager
 DefaultMenuSmartphoneManager=Smartphone menu manager
 Skin=Skin theme
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Default max dužina za liste
 DefaultMaxSizeShortList=Default max dužina kratkih lista (npr u kartici klijenta)
 MessageOfDay=Message of the day
 MessageLogin=Login page message
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/foundation information
-CompanyIds=Company/foundation identities
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=Name
 CompanyAddress=Address
 CompanyZip=Zip
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Prag tolerancije (u danima) pre pojavljivanja upozorenja za odobrenje troškova
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Other menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Audit
@@ -987,7 +1015,7 @@ BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
 LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists 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
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Rules on Professional Ids
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####
 BillsSetup=Invoices module setup
 BillsNumberingModule=Invoices and credit notes numbering model
 BillsPDFModules=Invoice documents models
+PaymentsPDFModules=Payment documents models
 CreditNote=Credit note
 CreditNotes=Credit notes
 ForceInvoiceDate=Force invoice date to validation date
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
 FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
 FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
 CacheByServer=Cache by server
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
+CompressionOfResourcesDesc=For exemple 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 your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Products module setup
 ServiceSetup=Services module setup
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Invoice date used
 Buy=Buy
 Sell=Sell
 InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=Accountancy Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+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 your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
+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=Ovaj modul omogućava klik na brojeve telefona. Klik na ovu ikonu će izvršiti poziv sa Vašeg telefona na odgovarajući broj. Ova funkcionalnost se može koristiti ukoliko se Dolibarr poveže sa call center sistemom koji može pozvati telefonski broj sa SIP sistema.
 ClickToDialUseTelLink=Samo koristi link "tel:" na telefonskim brojevima
 ClickToDialUseTelLinkDesc=Koristi ovu metodu ako korisnici imaju softphone ili softverski interfejs instaliran na istom računaru gde je i browser - biće pozvana kada kliknete na link u browseru koji počinje sa "tel:". Ukoliko Vam je potrebno celokupno server rešenje (bez instalacije softvera), ovde ostavie "Ne" i popunite sledeće polje.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+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.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=General display order
 BankOrderES=Spanish
 BankOrderESDesc=Spanish display order
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ 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.
 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.
-ConfFileMuseContainCustom=Installing 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=Boja kojom će linija biti označena kada se mišem pređe preko nje (ostavite prazno kako linija ne bi bila označena)
 TextTitleColor=Color of page title
 LinkColor=Boja linkova
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/sr_RS/compta.lang b/htdocs/langs/sr_RS/compta.lang
index 80d0a312e94..26887818c87 100644
--- a/htdocs/langs/sr_RS/compta.lang
+++ b/htdocs/langs/sr_RS/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Prikazani iznosi su sračunati po pravili
 Param=Podešavanja
 RemainingAmountPayment=Preostali iznos za plaćanje :
 Account=Nalog
-Accountparent=Matični nalog
-Accountsparent=Matični nalog
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=Prihod
 Outcome=Rashod
 ReportInOut=Prihod / Rashod
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Takse i dividende
 MenuSocialContributions=Socijalni/poreski troškovi
 MenuNewSocialContribution=Novi porez/doprinos
 NewSocialContribution=Novi porez/doprinos
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Porezi/doprinosi za uplatu
 AccountancyTreasuryArea=Oblast računovodstva/trezora
 NewPayment=Nova uplata
@@ -134,8 +135,8 @@ RulesResultDue=- Sadrži sve račune, troškove, PDV, donacije, bez obzira da li
 RulesResultInOut=- Sadrži realne uplate računa, troškova, PDV-a i zarada.<br>- Zasniva se na datumima isplate računa, troškova, PDV-a i zarada. Za donacije se zasniva na datumu donacije.
 RulesCADue=- Sadrži račune izdate klijentu, bez obzira da li su plaćeni ili ne. <br>- Zasniva se na datumu potvrde računa.<br>
 RulesCAIn=- Sadrži sve realne isplate računa primljene od klijenata.<br>- Zasniva se na datumu isplate računa<br>
-DepositsAreNotIncluded=- Računi depozita nisu uključeni
-DepositsAreIncluded=- Računi depozita su uključeni
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Izveštaj po subjektu IRPF
 LT1ReportByCustomersInInputOutputModeES=Izveštaj po RE subjektima
 VATReport=PDV izveštaj
@@ -169,7 +170,7 @@ DescSellsJournal=Dnevnik prodaje
 DescPurchasesJournal=Dnevnik nabavke
 InvoiceRef=Ref. Računa
 CodeNotDef=Nije definisano
-WarningDepositsNotIncluded=Računi depozita nisu uračunati u ovoj verziji sa ovim modulom računvodstva.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Rok isplate ne može biti pre datuma objekta.
 Pcg_version=Chart of accounts models
 Pcg_type=Pcg tip
@@ -189,8 +190,10 @@ AccountancyJournal=Računovodstveni kodovi
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Dupliraj porez/doprinos
 ConfirmCloneTax=Potvrdi dupliranje uplate poreza/doprinosa
 CloneTaxForNextMonth=Dupliraj za sledeći mesec
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Socijalni/poreski troškovi
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/sr_RS/cron.lang b/htdocs/langs/sr_RS/cron.lang
index 1bb3caad9fd..7dad7beadc8 100644
--- a/htdocs/langs/sr_RS/cron.lang
+++ b/htdocs/langs/sr_RS/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Obriši planirane operacije
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Modul planiranih aktivnosti omogućava izvršenje planirane aktivnosti
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Operacija
 CronNone=Nema
 CronDtStart=Ne pre
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Aktiviraj
 CronStatusInactiveBtn=Deaktiviraj
 CronTaskInactive=Operacije je deaktivirana
 CronId=Id
-CronClassFile=Klase (filename.class.php)
-CronModuleHelp=Naziv Dolibarr modul foldera (radi i sa eksternim Dolibarr modulima). <BR> Na primer za fetch metodu Dolibarr Product objekta /htdocs/<u>product</u>/class/product.class.php, vrednost modula je <i>product</i>
-CronClassFileHelp=Naziv fajla za učitavanje. <BR> Na primer za fetch metodu Dolibarr Product objekta /htdocs/product/class/<u>product.class.php</u>, naziv fajla za učitavanje je <i>product.class.php</i>
-CronObjectHelp=Naziv objekta za učitavanje. <BR> Na primer za fetch metodu Dolibarr Product objekta /htdocs/product/class/<u>product.class.php</u>, naziv objekta za učitavanje je <i>Product</i>
-CronMethodHelp=Naziv metode za učitavanje. <BR> Na primer za fetch metodu Dolibarr Product objekta /htdocs/product/class/<u>product.class.php</u>, naziv metode je <i>fetch</i>
-CronArgsHelp=Argumenti metode. <BR> Na primer za fetch metodu Dolibarr Product objekta /htdocs/product/class/<u>product.class.php</u>, parametri mogu biti <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=Komandna linija za izvršenje
 CronCreateJob=Kreiraj novu planiranu operaciju
 CronFrom=Od
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Operacija deaktivirana
 MakeLocalDatabaseDumpShort=Bekap lokalne baze
 MakeLocalDatabaseDump=Kreirajte odbacivanje lokalne baze
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/sr_RS/errors.lang b/htdocs/langs/sr_RS/errors.lang
index 72137d34f13..bb1752b10b1 100644
--- a/htdocs/langs/sr_RS/errors.lang
+++ b/htdocs/langs/sr_RS/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Greška prilikom kreacije fajla '<b>%s</b>'.
 ErrorFailToRenameDir=Greška prilikom preimenovanja foldera '<b>%s</b>' u '<b>%s</b>'.
 ErrorFailToCreateDir=Greška prilikom kreacije foldera '<b>%s</b>'.
 ErrorFailToDeleteDir=Greška prilikom brisanja foldera '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=Kontakt je već definisan kao kontakt za ovaj tip.
 ErrorCashAccountAcceptsOnlyCashMoney=Ovaj bankovni raču je keš račun i prihvata samo keš uplate.
 ErrorFromToAccountsMustDiffers=Izvorni i ciljani bankovni račun moraju biti različiti.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Greška prilikom pisanja u folder %s
 ErrorFoundBadEmailInFile=Pronađeni su mailovi sa pogrešnom sintaksom za %s linija u fajlu (primer linija %s sa mailom %s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Neka obavezna polja nisu popunjena
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Greška prilikom kreacije foldera. Proverite da li Web server nalog ima prava da piše u Dolibarr documents folderu. Ako je parametar <b>safe_mode</b> aktivan u PHP-u, proverite da li Dolibarr php fajlovi pripadaju korisniku (ili grupi) Web server naloga.
 ErrorNoMailDefinedForThisUser=Mail nije definisan za ovog korisnika
 ErrorFeatureNeedJavascript=Za ovu funkcionalnost morate aktivirati javascript.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Količina za liniju na fakturi klijenta
 ErrorWebServerUserHasNotPermission=Korisnik <b>%s</b> nema prava za izvršavanje na web serveru
 ErrorNoActivatedBarcode=Barcode tip nije aktiviran
 ErrUnzipFails=Greška prilikom dekompresije %s
-ErrNoZipEngine=PHP ne podržava dekompresiju za fajl %s
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=Fajl %s mora biti Dolibarr zip paket
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=PHP CURL nije instaliran, ovo je neophodno za Paypal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=Nema selektovane globalne promenljive
 ErrorFieldMustBeANumeric=Polje <b>%s</b> mora biti numeričko
 ErrorMandatoryParametersNotProvided=Obavezni parametar(i) nije dat
 ErrorOppStatusRequiredIfAmount=Podesili ste procenjeni iznos za ovu priliku, tako da morate uneti i status.
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Pogrešna definicija Menu Array u Module Descriptoru (pogrešna vrednost za fk_menu)
 ErrorSavingChanges=Došlo je do greške prilikom čuvanja promena.
 ErrorWarehouseRequiredIntoShipmentLine=Magacin je neophodan na liniji do isporuke
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # Warnings
 WarningPasswordSetWithNoAccount=Lozinka je podešena za ovog člana, ali korisnik nije kreiran. To znači da je lozinka sačuvana, ali se član ne može ulogovati na Dolibarr. Informaciju može koristiti neka eksterna komponenta, ali ako nemate potrebe da definišete korisnika/lozinku za članove, možete deaktivirati opciju "Upravljanje lozinkama za svakog člana" u podešavanjima modula Članovi. Ukoliko morate da kreirate login, ali Vam nije potrebna lozinka, ostavite ovo polje prazno da se ovo upozorenje ne bi prikazivalo. Napomena: email može biti korišćen kao login ako je član povezan sa korisnikom.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Datum uplate (%s) je pre datuma fakture (
 WarningTooManyDataPleaseUseMoreFilters=Previše podataka (preko %s linija). Molimo koristite filtere ili podesite konstantu %s na veći 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=Vaša prijava je promenjena. Iz sigurnosnih razloga se morate ponovo ulogovati.
+WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
diff --git a/htdocs/langs/sr_RS/main.lang b/htdocs/langs/sr_RS/main.lang
index 5341d8b02d9..9344892419a 100644
--- a/htdocs/langs/sr_RS/main.lang
+++ b/htdocs/langs/sr_RS/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=Parametar %s nije definisan
 ErrorUnknown=Nepoznata greška
 ErrorSQL=Greška u SQL-u
 ErrorLogoFileNotFound=Logo fajl '%s' nije pronađen
-ErrorGoToGlobalSetup=Idite u 'Company/Foundation' podešavanja da ovo ispravite
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=Idite u podešavanja Modula da ovo ispravite
 ErrorFailedToSendMail=Greška u slanju mail-a (pošiljalac=%s, primalac=%s)
 ErrorFileNotUploaded=Fajl nije uploadovan. Proverite da li je fajl preveliki, da li ima dovoljno prostora na disku i da li postoji fajl sa istim imenom u ovom folderu.
@@ -153,6 +153,7 @@ Edit=Izmeni
 Validate=Potvrdi
 ValidateAndApprove=Validiraj i Odobri
 ToValidate=Potvrditi
+NotValidated=Not validated
 Save=Sačuvaj
 SaveAs=Sačuvaj kao
 TestConnection=Testiraj konekciju
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=Nema funkcionalnosti za diskonekciju sa <b>%s</b> mo
 Connection=Konekcija
 Setup=Podešavanja
 Alert=Alert
+MenuWarnings=Alerts
 Previous=Prethodno
 Next=Sledeće
 Cards=Kartice
@@ -308,6 +310,7 @@ Copy=Kopiraj
 Paste=Zalepi
 Default=Default
 DefaultValue=Default vrednost
+DefaultValues=Default values
 Price=Cena
 UnitPrice=Jedinična cena
 UnitPriceHT=Jedinična cena (neto)
@@ -363,7 +366,8 @@ VATRate=Stopa poreza
 Average=Prosek
 Sum=Suma
 Delta=Razlika
-Module=Modul
+Module=Module/Application
+Modules=Modules/Applications
 Option=Opcija
 List=Lista
 FullList=Cela lista
@@ -387,7 +391,7 @@ ActionRunningNotStarted=Započeti
 ActionRunningShort=In progress
 ActionDoneShort=Završeno
 ActionUncomplete=nepotpuno
-CompanyFoundation=Kompanija/Fondacija
+CompanyFoundation=Company/Organisation
 ContactsForCompany=Kontakti za ovaj subjekat
 ContactsAddressesForCompany=Kontakti/adrese za ovaj subjekat
 AddressesForCompany=Adrese za ovaj subjekat
@@ -405,8 +409,9 @@ Generate=Gereriši
 Duration=Trajanje
 TotalDuration=Ukupno trajanje
 Summary=Rezime
-DolibarrStateBoard=Statistike
-DolibarrWorkBoard=Pregled radnih zadataka
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=Dostupno
 NotYetAvailable=Još uvek nedostupno
 NotAvailable=Nedostupno
@@ -434,7 +439,7 @@ Reportings=Izveštavanje
 Draft=Draft
 Drafts=Draft
 Validated=Validirano
-Opened=Opened
+Opened=Otvoreno
 New=Novo
 Discount=Popust
 Unknown=Nepoznato
@@ -453,6 +458,7 @@ NextStep=Sledeće
 Datas=Podaci
 None=Ništa
 NoneF=Ništa
+NoneOrSeveral=None or several
 Late=Kasni
 LateDesc=Odloži definisanje da li je zapis zakasneo ili ne zavisi od vašeg podešenja. Zamolite Vašeg administratora da promeni odlaganje u Naslovna-Podešenja-Upozorenja
 Photo=Slika
@@ -606,7 +612,8 @@ PartialWoman=Delimično
 TotalWoman=Celo
 NeverReceived=Nije primljena
 Canceled=Otkazano
-YouCanChangeValuesForThisListFromDictionarySetup=Možete izmeniti vrednosti ove liste iz menija podešavanja - rečnik
+YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu Setup - Dictionaries
+YouCanChangeValuesForThisListFrom=You can change values for this list from menu %s
 YouCanSetDefaultValueInModuleSetup=Možete postaviti podrazumevane vrednosti pri kreiranju novog zapisa u modul podešavanja
 Color=Boja
 Documents=Povezani fajlovi
@@ -642,6 +649,7 @@ FreeLineOfType=Slobodan unos tipa
 CloneMainAttributes=Dupliraj objekat sa glavnim atributima
 PDFMerge=PDF Merge
 Merge=Merge
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Prikaži stranu za štampanje glavnog sadržaja
 MenuManager=Menu manager
 WarningYouAreInMaintenanceMode=Upozorenje, trenutno ste u modu održavanja, samo korisnik <b>%s</b> može trenutno koristiti aplikaciju.
@@ -708,6 +716,7 @@ from=od
 toward=ka
 Access=Pristup
 SelectAction=Selektiraj akciju
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Ctrl+C za kopiranje
 SaveUploadedFileWithMask=Sačuvaj fajl na serveru sa nazivom "<strong>%s</strong>" (ili "%s")
 OriginFileName=Originalno ime fajla
@@ -718,7 +727,7 @@ ViewPrivateNote=Pogledaj beleške
 XMoreLines=%s linija skrivena(o)
 PublicUrl=Javni UR
 AddBox=Dodaj box
-SelectElementAndClickRefresh=Izaberite element i kliknite na Refresh
+SelectElementAndClick=Select an element and click %s
 PrintFile=Štampaj fajl %s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Otvori Home - Podešavanja - Kompanija da biste izmenili logo ili Home - Setup - Prikaz da biste ga sakrili.
@@ -734,8 +743,8 @@ Hello=Zdravo
 Sincerely=Srdačan pozdrav
 DeleteLine=Obriši red
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=Nema PDF-a za generaciju dokumenata među proverenim zapisima
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Zona za dokumenta kreirana masovnim akcijama
 ShowTempMassFilesArea=Prikaži zonu za dokumenta kreirana masovnim akcijama
@@ -755,11 +764,20 @@ Calendar=Kalendar
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Ponedeljak
 Tuesday=Utorak
@@ -817,5 +835,3 @@ SearchIntoContracts=Ugovori
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Troškovi
 SearchIntoLeaves=Odsustva
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/sr_RS/other.lang b/htdocs/langs/sr_RS/other.lang
index 2ffac3ed71e..e81a263aef4 100644
--- a/htdocs/langs/sr_RS/other.lang
+++ b/htdocs/langs/sr_RS/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=Datum rođenja
 BirthdayAlertOn=Obaveštenje o rođendanu je aktivno
 BirthdayAlertOff=Obaveštenje o rođendanu je neaktivno
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Dodat kontakt Intervenciji
 Notify_FICHINTER_VALIDATE=Intervencija je potvrđena
 Notify_FICHINTER_SENTBYMAIL=Intervencija je poslata mail-om
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=Ovo je <b>test</b> mail (reč test mora biti pojačana).<
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nU prilogu možete pronaći fakturu __REF__\n\n__PERSONALIZED__Srdačan pozdrav\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nOvom prilikom želimo da Vas upozorimo da nismo evidentirali uplatu za fakturu  __REF__ koju možete pronaći u prilogu, kao podsetnik.\n\n__PERSONALIZED__Srdačan pozdrav,\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nU prilogu možete pronaći komercijalnu ponudu __PROPREF__\n\n__PERSONALIZED__Srdačan pozdrav,\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nU prilogu možete pronaći zahtev za cenu __ASKREF__\n\n__PERSONALIZED__Srdačan pozdrav,\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nU prilogu možete naći narudžbinu __ORDERREF__\n\n__PERSONALIZED__Srdačan pozdrav,\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nU prilogu možete naći narudžbinu __ORDERREF__\n\n__PERSONALIZED__Srdačan pozdrav,\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nU prilogu možete pronaći fakturu __REF__\n\n__PERSONALIZED__Srdačan pozdrav\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nU prilogu možete naći isporuku __SHIPPINGREF__\n\n__PERSONALIZED__Srdačan pozdrav,\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nU prilogu možete naći intervenciju __FICHINTERREF__\n\n__PERSONALIZED__Srdačan pozdrav,\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Prof Id %s</b> je infomacija koja zavisi od zemlje subjekta.<br>Na primer, za zemlju <b>%s</b>, to je kod <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Statistike u brojkama jedinica proizvoda/usluga
-StatsByNumberOfEntities=Statistike u brojkama referentnih entiteta
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=Nova intervencija %s je dodeljena Vama.
 EMailTextInterventionValidated=Intervencija %s je potvrđena.
 EMailTextInvoiceValidated=Račun %s je potvrđen.
diff --git a/htdocs/langs/sr_RS/projects.lang b/htdocs/langs/sr_RS/projects.lang
index 1bc63c8365b..be2de884f26 100644
--- a/htdocs/langs/sr_RS/projects.lang
+++ b/htdocs/langs/sr_RS/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Zona projekata
 ProjectStatus=Status projekta
 SharedProject=Svi
 PrivateProject=Kontakti projekta
+ProjectsImContactFor=Projects I'm explicitely a contact of
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=Svi projekti
 MyProjectsDesc=Ovaj ekran prikazuje samo projekte u kojima ste definisani kao kontakt (bilo kog tipa).
 ProjectsPublicDesc=Ovaj ekran prikazuje sve projekte za koje imate pravo pregleda.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=Ovaj ekran prikazuje sve projekte i zadatke (Vaš korisnik ima pravo p
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=Novi projekat
 AddProject=Kreiraj projekat
 DeleteAProject=Obriši projekat
 DeleteATask=Obriši zadatak
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Otvoreni projekti
-OpenedTasks=Otvoreni zadaci
-OpportunitiesStatusForOpenedProjects=Iznos prilika u otvorenim projektima po statusu
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Količina prilika projekata na osnovu statusa
 ShowProject=Prikaži projekat
 SetProject=Postavi projekat
 NoProject=Nema definisanih ni pripadajućih projekata
 NbOfProjects=Br projekata
+NbOfTasks=Nb of tasks
 TimeSpent=Provedeno vreme
 TimeSpentByYou=Vreme koje ste Vi proveli
 TimeSpentByUser=Vreme koje je korisnik proveo
@@ -47,9 +52,9 @@ TaskTimeSpent=Vreme provedeno na zadacima
 TaskTimeUser=Korisnik
 TaskTimeNote=Beleška
 TaskTimeDate=Datum
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Zadaci na otvorenim projektima
 WorkloadNotDefined=Količina vremena nije definisana
-NewTimeSpent=Novo provedeno vreme
+NewTimeSpent=Provedeno vreme
 MyTimeSpent=Moje vreme
 Tasks=Zadaci
 Task=Zadatak
@@ -59,6 +64,7 @@ TaskDescription=Opis zadatka
 NewTask=Novi zadatak
 AddTask=Kreiraj zadatak
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Aktivnost
 Activities=Zadaci/aktivnosti
 MyActivities=Moji zadaci/aktivnosti
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Lista ugovora vezanih za projekat
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=Lista intervencija vezanih za projekat
 ListExpenseReportsAssociatedProject=Lista troškova povezanih sa ovim projektom
 ListDonationsAssociatedProject=Lista donacija vezanih za ovaj projekat
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Kontakti projekta
 ActionsOnProject=Događaji projekta
 YouAreNotContactOfProject=Vi niste kontakt u ovom privatnom projektu
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Obriši provedeno vreme
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=Prikaži zadatke koji mi nisu dodeljeni
@@ -110,7 +118,7 @@ TaskRessourceLinks=Resursi
 ProjectsDedicatedToThisThirdParty=Projekti posvećeni ovom subjektu
 NoTasks=Nema zadataka za ovaj projekat
 LinkedToAnotherCompany=Subjekti vezani za ovaj projekat
-TaskIsNotAffectedToYou=Zadaci koji Vam nisu dodeljeni
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=Provedeno vreme nije uneto
 ThisWillAlsoRemoveTasks=Ova akcija će obrisati sve zadatke ovog projekta (<b>%s</b> zadataka u ovom trenutku) i sve unose utrošenog vremena.
 IfNeedToUseOhterObjectKeepEmpty=Ukoliko neki objekti (fakture, narudžbine, ...) pripadaju drugom subjektu, oni moraju biti povezani projektu koji se kreira. Ostavite ovu opciju praznu da bi projekat mogao da bude povezan sa više subjekata.
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Ulaz po danu
 InputPerWeek=Ulaz po nedelji
 InputPerAction=Ulaz po akciji
-TimeAlreadyRecorded=Utrošeno vreme je već sačuvano za ovaj zadatak/dan za korisnika %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projekti sa ovim korisnikom u kontaktima
 TasksWithThisUserAsContact=Zadaci ovog korisnika
 ResourceNotAssignedToProject=Nije dodeljen projektu
 ResourceNotAssignedToTheTask=Nije dodeljen zadatku
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Dodeli zadatak meni
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Dodeli
 ProjectOverview=Pregled
 ManageTasks=Koristi projekte za praćenje zadataka i vremena
 ManageOpportunitiesStatus=Koristi projekte za praćenje prilika
 ProjectNbProjectByMonth=Br kreiranih projekata po mesecu
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Iznos prilika po mesecu
 ProjectWeightedOppAmountOfProjectsByMonth=Prosečni iznos prilika po mesecu
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistike na projektima/lead-ovima
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Zadatak je dodeljen. Unos vremena za ovaj zadatak je omogućen.
 IdTaskTime=Id vremena zadatka
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Otvoreni projekti po subjektima
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Samo šanse
-OpenedOpportunitiesShort=Otvorene šanse
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Nije šansa
 OpportunityTotalAmount=Ukupan iznos prilika
 OpportunityPonderatedAmount=Prosečni iznos prilika
diff --git a/htdocs/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang
index e4e68206bb2..8b3bd4d73be 100644
--- a/htdocs/langs/sv_SE/accountancy.lang
+++ b/htdocs/langs/sv_SE/accountancy.lang
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=Lägg till ett redovisningskonto
 AccountAccounting=Redovisningskonto
 AccountAccountingShort=Konto
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=Huvudbok
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Sell ​​tidskrift
@@ -132,19 +140,19 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Debit och kredit kan inte ha ett värde på samma gång
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=Förteckning över redovisningskonton
 
 Pcgtype=Klass konto
-Pcgsubtype=Under klass konto
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Total försäljning marginal
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Fel, du kan inte ta bort denna redovisningskonto eftersom den används
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Kod
+Nature=Naturen
+AccountingJournalType1=Various operation
+AccountingJournalType2=Försäljning
+AccountingJournalType3=Inköp
+AccountingJournalType4=Bank
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Export
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index 10e6a0646e1..6b0aeb6aeda 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=Interna användare
 ExternalUsers=Externa användare
 GUISetup=Visa
 SetupArea=Setup område
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Formulär för att testa filuppladdning (enligt inställningar)
 IfModuleEnabled=Anm: ja effektivt endast om modul <b>%s</b> är aktiverat
 RemoveLock=Ta bort filen <b>%s</b> om den finns godkänns uppdatering verktyget.
@@ -85,7 +86,7 @@ Mask=Mask
 NextValue=Nästa värde
 NextValueForInvoices=Nästa värde (fakturor)
 NextValueForCreditNotes=Nästa värde (kreditnotor)
-NextValueForDeposit=Nästa värde (deposition)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Nästa värde (ersättare)
 MustBeLowerThanPHPLimit=Obs: Din PHP gränser varje filuppladdning storlek till <b>%s</b> %s, oavsett denna parameter värde är
 NoMaxSizeByPHPLimit=Obs: Ingen gräns som anges i din PHP konfiguration
@@ -103,7 +104,7 @@ MenuIdParent=Överordnade menyn ID
 DetailMenuIdParent=ID överordnade menyn (0 för en toppmenyn)
 DetailPosition=Sortera nummer att definiera menyposition
 AllMenus=Alla
-NotConfigured=Inte konfigurerad
+NotConfigured=Module/Application not configured
 Active=Aktiv
 SetupShort=Inställning
 OtherOptions=Andra alternativ
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Tusentalsavgränsare
 Destination=Destination
 IdModule=Modul ID
 IdPermissions=Behörighet ID
-Modules=Moduler
 LanguageBrowserParameter=Parameter %s
 LocalisationDolibarrParameters=Lokalisering parametrar
 ClientTZ=Kund tidzon (användare)
@@ -123,7 +123,8 @@ PHPTZ=Tidszon PHP server
 DaylingSavingTime=Sommartid (användare)
 CurrentHour=PHP Tid (server)
 CurrentSessionTimeOut=Aktuell session timeout
-YouCanEditPHPTZ=För att ställa in en annan PHP tidszon (inget krav), kan du försöka lägga till en fil .htacces med en rad som denna "setenv TZ Europe / Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max number of lines for widgets
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Behörigheter
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Endast delar av <a href="%s">aktiverade moduler</a> visas.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Databas lösenord krypterat i conf.php (Aktivera
 InstrucToEncodePass=Att ha lösenord kodad i <b>conf.php</b> filen, ersätt raden <br> <b>$ Dolibarr_main_db_pass = "...";</b> <br> av <br> <b>$ Dolibarr_main_db_pass = "krypterad:%s";</b>
 InstrucToClearPass=Att ha lösenord avkodas (klar) i <b>conf.php</b> filen, ersätt raden <br> <b>$ Dolibarr_main_db_pass = "krypterat: ...";</b> <br> av <br> <b>$ Dolibarr_main_db_pass = "%s";</b>
 ProtectAndEncryptPdfFiles=Skydd av genererade pdf-filer (Aktiverad rekommenderas inte, raster massa pdf generationen)
-ProtectAndEncryptPdfFilesDesc=Skydd av ett PDF-dokument håller den tillgänglig att läsa och skriva ut alla PDF webbläsare. Det är dock redigering och kopiering inte möjligt längre. Observera att använda den här funktionen gör byggandet av en samlad global pdf inte fungerar (t.ex. obetalda fakturor).
+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=Huvudnummer
 DolibarrLicense=Licens
 Developpers=Utvecklare / bidragsgivare
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr online demo
 OfficialMarketPlace=Officiella marknadsplats för externa moduler / addons
 OfficialWebHostingService=Refererade webbhotell (Cloud hosting)
 ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=För användarens eller utvecklarens dokumentation (Doc, FAQs ...), <br> ta en titt på Dolibarr Wiki: <br> <a href="%s" target="_blank"><b>%s</b></a>
 ForAnswersSeeForum=För alla andra frågor / hjälp, kan du använda Dolibarr forumet: <br> <a href="%s" target="_blank"><b>%s</b></a>
 HelpCenterDesc1=Detta område kan hjälpa dig att få en tjänst Hjälp stöd på Dolibarr.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=Funktionen inte finns på Unix-liknande system. Testa
 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/
 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=Modul setup
-ModulesSetup=Moduler setup
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=Dolibarr nuvarande version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Uppdatera server offline
+WithCounter=Manage a counter
 GenericMaskCodes=Du kan ange någon numrering mask. I denna mask skulle följande taggar användas: <br> <b>(000000)</b> motsvarar ett antal som kommer att ökas på varje %s. Ange så många nollor som den önskade längden på disken. Räknaren kommer att fyllas ut med nollor från vänster för att få så många nollor som masken. <br> <b>(000000 000)</b> samma som tidigare men en kompensation som motsvarar det antal till höger om tecknet + tillämpas med början den första %s. <br> <b>(000000 @ x)</b> samma som tidigare, men räknaren återställs till noll när månaden x uppnås (x mellan 1 och 12). Om detta alternativ används och x är 2 eller högre, då sekvensen (yy) (mm) eller (ÅÅÅÅ) (mm) krävs också. <br> <b>(Dd)</b> dag (01 till 31). <br> <b>(Mm)</b> månad (01 till 12). <br> <b>(Yy), (ÅÅÅÅ) eller (y)</b> år under 2, 4 eller ett nummer. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Alla andra tecken i masken förblir intakt. <br> Blanksteg är inte tillåtna. <br>
-GenericMaskCodes4a=<u>Exempel på 99. %s den tredje part TheCompany gjort 2007/01/31:</u> <br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Exempel på tredje part som har skapats på 2007/03/01:</u> <br>
 GenericMaskCodes4c=<u>Exempel på artikel skapad 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> blir <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> blir <b>0199-ZZZ/31/XXX</b>
+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=Avkastningen en anpassningsbar nummer enligt en fastställd mask.
 ServerAvailableOnIPOrPort=Server finns på adressen <b>%s</b> på port <b>%s</b>
 ServerNotAvailableOnIPOrPort=Servern är inte tillgänglig på adress <b>%s</b> på port <b>%s</b>
@@ -369,19 +375,21 @@ Int=Heltal
 Float=Flyttal
 DateAndTime=Datum och timme
 Unique=Unik
-Boolean=Boolsk (Kryssruta)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Telefonen
 ExtrafieldPrice = Pris
 ExtrafieldMail = epost
 ExtrafieldUrl = Url
 ExtrafieldSelect = Välj lista
 ExtrafieldSelectList = Välj från tabell
-ExtrafieldSeparator=Avskiljare
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Lösenord
-ExtrafieldCheckBox=Kryssruta
-ExtrafieldRadio=Radioknapp
-ExtrafieldCheckBoxFromList= Kryssruta från tabell
+ExtrafieldRadio=Radio buttons (on choice only)
+ExtrafieldCheckBox=Checkboxes
+ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Länk till ett objekt
+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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parametrar listan måste vara som nyckel, värde <br><br> till exempel: <br> 1, value1 <br> 2, värde2 <br> 3, value3 <br> ...
 ExtrafieldParamHelpradio=Parametrar listan måste vara som nyckel, värde <br><br> till exempel: <br> 1, value1 <br> 2, värde2 <br> 3, value3 <br> ...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Fält
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Användare & grupper
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=Fakturor och kreditnota: s förvaltning för kunder. Faktura lednin
 Module40Name=Leverantörer
 Module40Desc=Leverantörens ledning och inköp (order och fakturor)
 Module42Name=Syslog
-Module42Desc=Loggning faciliteter (syslog)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Redaktion
 Module49Desc=Redaktör ledning
 Module50Name=Produkter
@@ -499,8 +521,8 @@ Module410Name=WebCalendar
 Module410Desc=WebCalendar integration
 Module500Name=Särskilda kostnader
 Module500Desc=Förvaltning av särskilda kostnader (skatter, sociala eller skattemässiga skatter, utdelningar)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Lån
 Module520Desc=Förvaltning av lån
 Module600Name=Anmälningar
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind omvandlingar kapacitet
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
-Module4000Desc=Human resources management
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi-bolag
 Module5000Desc=Gör att du kan hantera flera företag
 Module6000Name=Workflow
@@ -591,7 +615,7 @@ Permission32=Skapa / modifiera produkter
 Permission34=Ta bort produkter
 Permission36=Se / hantera dold produkter
 Permission38=EXPORTVARA
-Permission41=Läs projekt och uppgifter (gemensamma projekt och projekt jag är kontaktperson för). Kan också ange tid konsumeras på tilldelade uppgifter (tidrapport)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Ta bort projekt (gemensamma projekt och projekt som jag är kontaktperson för)
 Permission45=Export projects
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Beställningsmetoder
 DictionarySource=Ursprung av affärsförslag / beställning
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Modeller för kontoplan
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=E-postmeddelanden mallar
 DictionaryUnits=Enheter
 DictionaryProspectStatus=Prospektering Status
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Möjlighet status för projektet / bly
 SetupSaved=Setup sparas
+SetupNotSaved=Setup not saved
 BackToModuleList=Tillbaka till moduler lista
 BackToDictionaryList=Tillbaka till ordlistan
 VATManagement=Moms Management
@@ -921,7 +947,7 @@ Host=Server
 DriverType=Driver typ
 SummarySystem=Systeminformation sammandrag
 SummaryConst=Lista över alla Dolibarr setup parametrar
-MenuCompanySetup=Företag / stiftelsen
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= Standard Menu Manager
 DefaultMenuSmartphoneManager=Smartphone menyhanteraren
 Skin=Hud tema
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Default max length for lists
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=Dagens meddelande
 MessageLogin=Inloggningssidan meddelande
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent sökformuläret på menyn till vänster
 DefaultLanguage=Default språk att använda (språkkod)
 EnableMultilangInterface=Aktivera flerspråkigt gränssnitt
 EnableShowLogo=Visa logotypen på vänstra menyn
-CompanyInfo=Företag / stiftelse information
-CompanyIds=Företag / stiftelse identiteter
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=Namn
 CompanyAddress=Adress
 CompanyZip=Zip
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerans fördröjning (i dagar) före registrering om
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerans fördröjning (i dagar) före registrering om kontroller insättning för att göra
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Andra menyalternativ hantera valfria parametrar.
 LogEvents=Säkerhetsgranskning evenemang
 Audit=Revision
@@ -987,7 +1015,7 @@ BrowserOS=Browser OS
 ListOfSecurityEvents=Förteckning över Dolibarr säkerhetshändelser
 SecurityEventsPurged=Säkerhetshändelser renas
 LogEventDesc=Du kan aktivera här loggning för Dolibarr säkerhet händelser. Administratörer kan sedan se dess innehåll via menyn <b>Systemverktyg - Revision.</b> Varning, kan denna funktion konsumerar en stor mängd data i databasen.
-AreaForAdminOnly=Dessa funktioner kan användas av <b>administratören användare.</b>
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information diverse teknisk information får du i skrivskyddad läge och synlig för administratörer bara.
 SystemAreaForAdminOnly=Detta område är tillgänglig för administratören användare. Ingen av de Dolibarr behörigheter kan minska denna gräns.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists in any language files
+TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Minst 1 modul måste aktiveras
 ClassNotFoundIntoPathWarning=Klass %s inte funnen i PHP-sökvägen
 YesInSummer=Ja, under sommaren
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Session lagring krypteras av Suhosin
 ConditionIsCurrently=Condition är för närvarande% s
 YouUseBestDriver=Du använder drivrutinen %s som är bäst drivrutin tillgänglig för tillfället.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Professionell Id unik
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=En export länk till <b>%s</b> format finns på följande länk: %s
 ##### Invoices #####
 BillsSetup=Fakturor modul setup
 BillsNumberingModule=Fakturor och kreditnotor numrering modul
 BillsPDFModules=Faktura dokument modeller
+PaymentsPDFModules=Payment documents models
 CreditNote=Kreditnota
 CreditNotes=Kreditnotor
 ForceInvoiceDate=Force fakturadatum till giltighetsdatum
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Filer av typen %s är inte cachas av HTTP-server
 FilesOfTypeCompressed=Filer av typen %s komprimeras med HTTP-server
 FilesOfTypeNotCompressed=Filer av typen %s är inte komprimerade av HTTP-server
 CacheByServer=Cache med server
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache med browser
 CompressionOfResources=Komprimering av HTTP-svar
+CompressionOfResourcesDesc=For exemple using the Apache directive "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=En sådan automatisk detektering är inte möjligt med nuvarande webbläsare
+DefaultValuesDesc=You can define/force here the default value you want to get when your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Produkter modul setup
 ServiceSetup=Tjänster modul konfiguration
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Fakturadatum används
 Buy=Köp
 Sell=Sälj
 InvoiceDateUsed=Fakturadatum används
-YourCompanyDoesNotUseVAT=Ditt företag har definierats att inte använda moms (Hem - Setup - Företaget / Foundation), så det finns ingen mervärdesskatt alternativ för installationen.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=Bokföring kod
 AccountancyCodeSell=Försäljning konto. kod
 AccountancyCodeBuy=Köpa konto. kod
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Ställs in automatiskt denna status för evenemang
 AGENDA_DEFAULT_VIEW=Vilken flik vill du öppna som standard vid val av meny Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Klicka för att Dial modul setup
-ClickToDialUrlDesc=Url anropas när ett klick på telefon picto görs. I URL kan du använda taggar <br> <b>__PHONETO__</b> Som kommer att ersättas med telefonnumret för personen att ringa <br> <b>__PHONEFROM__</b> Som ska ersättas med telefonnummer att ringa person (er) <br> <b>__LOGIN__</b> Som ska ersättas med clicktodial inloggning (definierad på ditt användarnamn kort) <br> <b>__PASS__</b> Som ska ersättas med ditt clicktodial lösenord (definierad på ditt användarnamn kort).
+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.
 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 same computer than 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.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API-modul konfiguration
 ApiDesc=Genom att aktivera denna modul Dolibarr bli en REST-server för att tillhandahålla diverse webbtjänster.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+ApiExporerIs=You can explore and test the APIs at URL
 OnlyActiveElementsAreExposed=Endast element från aktiverade moduler utsätts
 ApiKey=Key för 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.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=Allmänt visningsordning
 BankOrderES=Spanska
 BankOrderESDesc=Spanska visningsordning
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=Multi-bolag modul setup
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ BackupDumpWizard=Guiden för att bygga databas backup dumpfilen
 SomethingMakeInstallFromWebNotPossible=Installation av extern modul är inte möjligt från webbgränssnittet av följande skäl:
 SomethingMakeInstallFromWebNotPossible2=Av denna anledning, för att processen uppgradering, som beskrivs här är endast manuell steg en privilegierad användare kan göra.
 InstallModuleFromWebHasBeenDisabledByFile=Installation av extern modul från ansökan har inaktiverats av administratören. Du måste be honom att ta bort <strong>filen% s</strong> för att tillåta denna funktion.
-ConfFileMuseContainCustom=Installing 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=Markera tabelllinjer när musen flytta passerar över
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
 LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Bakgrundsfärg
 TopMenuBackgroundColor=Bakgrundsfärg för Huvudmeny
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minsta varseltid (Din ledighet begäran måste göras innan
 NbAddedAutomatically=Antal dagar som läggs till räknare av användare (automatiskt) varje månad
 EnterAnyCode=Detta fält innehåller en hänvisning till identifiera linje. Ange något värde i ditt val, men utan specialtecken.
 UnicodeCurrency=Ange här mellan hängslen, lista över bytenummer som representerar valutasymbolen. För exemple: för $ anger [36] - för brazil real R $ [82,36] - för €, ange [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line i kombinationslistor
 SellTaxRate=Försäljning skattesats
 RecuperableOnly=Ja moms "Non Perçue återvinningsbart" avsedd för någon stat i Frankrike. Håll värde till "Nej" i alla andra fall.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/sv_SE/compta.lang b/htdocs/langs/sv_SE/compta.lang
index 4f41edbbc17..d06bba823ce 100644
--- a/htdocs/langs/sv_SE/compta.lang
+++ b/htdocs/langs/sv_SE/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Belopp som visas här är beräknade med
 Param=Setup
 RemainingAmountPayment=Belopp som skall erläggas resterande:
 Account=Konto
-Accountparent=Konto förälder
-Accountsparent=Konto förälder
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=Inkomst
 Outcome=Expense
 ReportInOut=Intäkter / kostnader
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Skatter och utdelning
 MenuSocialContributions=Social/fiscal taxes
 MenuNewSocialContribution=New social/fiscal tax
 NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Bokföring / Treasury område
 NewPayment=Ny betalning
@@ -134,8 +135,8 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- Den innehåller alla faktiska utbetalningar av fakturor från kunder. <br> - Den bygger på betalningsdagen för dessa fakturor <br>
-DepositsAreNotIncluded=- Deposit fakturor eller ingår
-DepositsAreIncluded=- Deposit fakturor ingår
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Rapport från tredje part IRPF
 LT1ReportByCustomersInInputOutputModeES=Rapport från tredje part RE
 VATReport=VAT report
@@ -169,7 +170,7 @@ DescSellsJournal=Försäljning Journal
 DescPurchasesJournal=Inköp Journal
 InvoiceRef=Faktura ref.
 CodeNotDef=Inte definierad
-WarningDepositsNotIncluded=Insättningar fakturor ingår inte i denna version med denna redovisning modul.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Betalning sikt datum kan inte vara lägre än objektdatum.
 Pcg_version=Chart of accounts models
 Pcg_type=Pcg typ
@@ -189,8 +190,10 @@ AccountancyJournal=Bokförings kod tidskrift
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Klona det för nästa månad
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/sv_SE/cron.lang b/htdocs/langs/sv_SE/cron.lang
index afa1fee7995..c23917c395c 100644
--- a/htdocs/langs/sv_SE/cron.lang
+++ b/htdocs/langs/sv_SE/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allow to execute job that have been planned
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Jobb
 CronNone=Ingen
 CronDtStart=Not before
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Aktivera
 CronStatusInactiveBtn=Inaktivera
 CronTaskInactive=Det här jobbet är avaktiverat
 CronId=Id
-CronClassFile=Klasser (filename.class.php)
-CronModuleHelp=Namn på Dolibarr modul katalog (även arbeta med extern Dolibarr modul). <BR> För exemple att hämta metod för Dolibarr Produkt objektet / htdocs / <u>produkt</u> /class/product.class.php, värdet av modulen är <i>produkten</i>
-CronClassFileHelp=Filnamnet för att ladda. <BR> För exemple att hämta metod för Dolibarr Produkt objektet / htdocs / produkt / klass / <u>product.class.php,</u> är värdet av klass filnamn <i>product.class.php</i>
-CronObjectHelp=Det objektnamn som ska läsas in. <BR> För exemple att hämta metod för Dolibarr Produktobjekt /htdocs/product/class/product.class.php, är värdet av klass filnamn <i>Produkt</i>
-CronMethodHelp=Objektet metod för att starta. <BR> För exemple att hämta metod för Dolibarr Produktobjekt /htdocs/product/class/product.class.php, värdet av metoden är är <i>fecth</i>
-CronArgsHelp=Metoden argument. <BR> Till exemple att hämta förfarande för Dolibarr Produkt objekt /htdocs/product/class/product.class.php kan värdet av paramters vara <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=Systemet kommandoraden som ska köras.
 CronCreateJob=Create new Scheduled Job
 CronFrom=Från
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang
index f47da3aa0ac..530c61834a4 100644
--- a/htdocs/langs/sv_SE/errors.lang
+++ b/htdocs/langs/sv_SE/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Misslyckades med att skapa filen <b>&quot;%s&quot;.</b>
 ErrorFailToRenameDir=Misslyckades med att byta namn på katalogen <b>&quot;%s&quot;</b> till <b>&quot;%s&quot;.</b>
 ErrorFailToCreateDir=Det gick inte att skapa katalogen <b>&quot;%s&quot;.</b>
 ErrorFailToDeleteDir=Det gick inte att ta bort katalogen <b>&quot;%s&quot;.</b>
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=Denna kontakt redan har definierats som kontaktperson för denna typ.
 ErrorCashAccountAcceptsOnlyCashMoney=Detta bankkonto är en kontant-konto, så det tar emot betalningar av typ kontanter endast.
 ErrorFromToAccountsMustDiffers=Källa och mål bankkonton måste vara olika.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Misslyckades med att skriva i katalogen %s
 ErrorFoundBadEmailInFile=Hittade felaktig e-syntax för %s rader i filen (t.ex. linje %s med email = %s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Vissa obligatoriska fält inte fylls.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Misslyckades med att skapa en katalog. Kontrollera att webbservern användaren har rättigheter att skriva till Dolibarr dokument katalogen. Om parametern <b>safe_mode</b> är aktiv på PHP, kontrollera att Dolibarr php-filer äger till webbserver användare (eller grupp).
 ErrorNoMailDefinedForThisUser=Ingen post definierats för denna användare
 ErrorFeatureNeedJavascript=Denna funktion måste ha Javascript vara aktiverat för att arbeta. Ändra detta i setup - displayen.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Kvantitet för linje i kundfakturor kan
 ErrorWebServerUserHasNotPermission=Användarkonto <b>%s</b> användas för att exekvera webbserver har ingen behörighet för den
 ErrorNoActivatedBarcode=Ingen streckkod typ aktiveras
 ErrUnzipFails=Det gick inte att packa upp %s med ZipArchive
-ErrNoZipEngine=Ingen motor att packa upp %s fil i denna PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=Filen %s måste vara ett Dolibarr zip-paket
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=PHP CURL är inte installerat, detta är viktigt för att prata med Paypal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # 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.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Betalningsdag (%s) är tidigare än faktu
 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/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
index 87d0480f94a..4f243484bdc 100644
--- a/htdocs/langs/sv_SE/main.lang
+++ b/htdocs/langs/sv_SE/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=Parameter %s inte definierad
 ErrorUnknown=Okänt fel
 ErrorSQL=SQL-fel
 ErrorLogoFileNotFound=Logo fil '%s' hittades inte
-ErrorGoToGlobalSetup=Gå till 'bolaget / stiftelsen' setup för att åtgärda detta
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=Gå till modul inställningarna för att åtgärda detta
 ErrorFailedToSendMail=Det gick inte att skicka e-post (avsändare = %s, mottagare = %s)
 ErrorFileNotUploaded=Filen har inte laddats upp. Kontrollera att storleken inte överskrider högsta tillåtna, att det finns plats på disken och att det inte redan finns en fil med samma namn i den här katalogen.
@@ -153,6 +153,7 @@ Edit=Redigera
 Validate=Validera
 ValidateAndApprove=Validate and Approve
 ToValidate=Att validera
+NotValidated=Not validated
 Save=Spara
 SaveAs=Spara som
 TestConnection=Testa anslutning
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=Ingen applikativ koppling funktionen med autentiseri
 Connection=Anslutning
 Setup=Setup
 Alert=Alert
+MenuWarnings=Varningar
 Previous=Föregående
 Next=Nästa
 Cards=Kort
@@ -308,6 +310,7 @@ Copy=Kopiera
 Paste=Klistra in
 Default=Standard
 DefaultValue=Standardvärde
+DefaultValues=Default values
 Price=Pris
 UnitPrice=Pris per enhet
 UnitPriceHT=Pris per enhet (netto)
@@ -363,7 +366,8 @@ VATRate=Mervärdesskattesats
 Average=Genomsnittlig
 Sum=Summa
 Delta=Delta
-Module=Modul
+Module=Module/Application
+Modules=Modules/Applications
 Option=Alternativ
 List=Lista
 FullList=Fullständig lista
@@ -387,7 +391,7 @@ ActionRunningNotStarted=Inte påbörjats
 ActionRunningShort=In progress
 ActionDoneShort=Färdiga
 ActionUncomplete=Icke klar
-CompanyFoundation=Företag / stiftelse
+CompanyFoundation=Company/Organisation
 ContactsForCompany=Kontakter till denna tredje part
 ContactsAddressesForCompany=Kontakter / adresser för denna tredje part
 AddressesForCompany=Adresser för denna tredje part
@@ -405,8 +409,9 @@ Generate=Generera
 Duration=Längd
 TotalDuration=Total längd
 Summary=Sammanfattning
-DolibarrStateBoard=Statistik
-DolibarrWorkBoard=Arbetsuppgifter ombord
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=Tillgängliga
 NotYetAvailable=Ännu inte tillgängligt
 NotAvailable=Inte tillgänglig
@@ -434,7 +439,7 @@ Reportings=Rapportering
 Draft=Utkast
 Drafts=Utkast
 Validated=Validerad
-Opened=Öppnad
+Opened=Öppen
 New=Ny
 Discount=Rabatt
 Unknown=Okänd
@@ -453,6 +458,7 @@ NextStep=Nästa steg
 Datas=Data
 None=Ingen
 NoneF=Ingen
+NoneOrSeveral=None or several
 Late=Sent
 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.
 Photo=Bild
@@ -606,7 +612,8 @@ PartialWoman=Partiell
 TotalWoman=Totalt
 NeverReceived=Aldrig fick
 Canceled=Annullerad
-YouCanChangeValuesForThisListFromDictionarySetup=Du kan ändra värden för denna lista från menyinställning - ordbok
+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
 Color=Färg
 Documents=Länkade filer
@@ -642,6 +649,7 @@ FreeLineOfType=Fritt inlägg typ
 CloneMainAttributes=Klona objekt med dess viktigaste attribut
 PDFMerge=PDF-dokument
 Merge=Sammanfoga
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Visa sidan för att skriva ut huvudinnehållet
 MenuManager=Menyhanteraren
 WarningYouAreInMaintenanceMode=Varning, du är i en underhållsmode, så bara login <b>%s</b> får använda tillämpningen för tillfället.
@@ -708,6 +716,7 @@ from=från
 toward=mot
 Access=Åtkomst
 SelectAction=Select action
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Använd Ctrl+C för att kopiera till klippbordet
 SaveUploadedFileWithMask=Spara filen på servern med namnet "<strong>%s</strong>" (annars "%s")
 OriginFileName=Ursprungligt filnamn
@@ -718,7 +727,7 @@ ViewPrivateNote=Se noter
 XMoreLines=%s rader osynliga
 PublicUrl=Offentlig webbadress
 AddBox=Lägg till låda
-SelectElementAndClickRefresh=Välj ett element och klicka på uppdatera
+SelectElementAndClick=Select an element and click %s
 PrintFile=Skriv ut fil %s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
@@ -734,8 +743,8 @@ Hello=Hallå
 Sincerely=Sincerely
 DeleteLine=Radera rad
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
@@ -755,11 +764,20 @@ Calendar=Kalender
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Räkenskapsåret
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Måndag
 Tuesday=Tisdag
@@ -817,5 +835,3 @@ SearchIntoContracts=Kontrakt
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Räkningar
 SearchIntoLeaves=Löv
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/sv_SE/other.lang b/htdocs/langs/sv_SE/other.lang
index 04369a11ffd..896818bf966 100644
--- a/htdocs/langs/sv_SE/other.lang
+++ b/htdocs/langs/sv_SE/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=Födelsedatum
 BirthdayAlertOn=födelsedag alert aktiva
 BirthdayAlertOff=födelsedag alert inaktiv
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=Intervention validerade
 Notify_FICHINTER_SENTBYMAIL=Ingripande skickas per post
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=Detta är en <b>test</b> post (ordet Provningen skall i f
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__ \nHär hittar du det kommersiella förslaget __PROPREF__\n__PERSONALIZED__mvh\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__ Här hittar ordern __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ Här hittar du vår ordning __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__ Här hittar sjöfarten __SHIPPINGREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__ Här hittar interventionen __FICHINTERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__ __PERSONALIZED__ __SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Prof Id %s</b> är en information är beroende av tredje part land. <br> Till exempel för landets <b>%s,</b> det är kod <b>%s.</b>
 DolibarrDemo=Dolibarr ERP / CRM-demo
-StatsByNumberOfUnits=Statistik i antal produkter / tjänster enheter
-StatsByNumberOfEntities=Statistik på antalet nationella enheter
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=Interventionen %s har validerats.
 EMailTextInvoiceValidated=Fakturan %s har validerats.
diff --git a/htdocs/langs/sv_SE/projects.lang b/htdocs/langs/sv_SE/projects.lang
index 19bfbc40c24..121db6b87d4 100644
--- a/htdocs/langs/sv_SE/projects.lang
+++ b/htdocs/langs/sv_SE/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=Projektstatus
 SharedProject=Alla
 PrivateProject=Projekt kontakter
+ProjectsImContactFor=Projects I'm explicitely a contact of
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=Alla projekt
 MyProjectsDesc=Denna syn är begränsad till projekt du en kontakt för (allt som är &quot;typ&quot;).
 ProjectsPublicDesc=Denna uppfattning presenterar alla projekt du har rätt att läsa.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=Denna uppfattning presenterar alla projekt och uppgifter (din använda
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=Nytt projekt
 AddProject=Skapa projekt
 DeleteAProject=Ta bort ett projekt
 DeleteATask=Ta bort en uppgift
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Opened projects
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Visa projekt
 SetProject=Ställ projekt
 NoProject=Inget projekt definieras eller ägs
 NbOfProjects=Nb av projekt
+NbOfTasks=Nb of tasks
 TimeSpent=Tid som tillbringas
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
@@ -47,9 +52,9 @@ TaskTimeSpent=Tid som ägnas åt uppgifter
 TaskTimeUser=Användare
 TaskTimeNote=Anmärkning
 TaskTimeDate=Datum
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Arbetsbelastning inte definierad
-NewTimeSpent=Ny tid
+NewTimeSpent=Tid
 MyTimeSpent=Min tid
 Tasks=Uppgifter
 Task=Uppgift
@@ -59,6 +64,7 @@ TaskDescription=Uppgiftsbeskrivning
 NewTask=Ny uppgift
 AddTask=Skapa uppgift
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Aktivitet
 Activities=Uppgifter / aktiviteter
 MyActivities=Mina uppgifter / aktiviteter
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Förteckning över avtal i samband med projektet
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=Lista över åtgärder i samband med projektet
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Projekt kontakter
 ActionsOnProject=Åtgärder för projektet
 YouAreNotContactOfProject=Du är inte en kontakt på denna privata projekt
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Ta bort tid
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=Se även uppgifter som inte tilldelats mig
@@ -110,7 +118,7 @@ TaskRessourceLinks=Resurser
 ProjectsDedicatedToThisThirdParty=Projekt som arbetat med denna tredje part
 NoTasks=Inga uppgifter för detta projekt
 LinkedToAnotherCompany=Kopplat till annan tredje part
-TaskIsNotAffectedToYou=Uppgift inte tilldelats dig
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=Tid är tom
 ThisWillAlsoRemoveTasks=Denna åtgärd kommer också att ta bort alla aktiviteter av projekt <b>(%s</b> uppgifter på för tillfället) och alla ingångar för nedlagd tid.
 IfNeedToUseOhterObjectKeepEmpty=Om vissa objekt (faktura, order, ...), som tillhör en annan tredje part, måste kopplas till projektet för att skapa, hålla denna tomt för att få projektet att flera tredje part.
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
 ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/sw_SW/accountancy.lang b/htdocs/langs/sw_SW/accountancy.lang
index 4c2336b97b0..31b54e83c5b 100644
--- a/htdocs/langs/sw_SW/accountancy.lang
+++ b/htdocs/langs/sw_SW/accountancy.lang
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=General ledger
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
@@ -132,19 +140,19 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=List of the accounting accounts
 
 Pcgtype=Class of account
-Pcgsubtype=Under class of account
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Code
+Nature=Nature
+AccountingJournalType1=Various operation
+AccountingJournalType2=Sales
+AccountingJournalType3=Purchases
+AccountingJournalType4=Bank
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Exports
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang
index 9602601e241..6851d698625 100644
--- a/htdocs/langs/sw_SW/admin.lang
+++ b/htdocs/langs/sw_SW/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=Internal users
 ExternalUsers=External users
 GUISetup=Display
 SetupArea=Setup area
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form to test file upload (according to setup)
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
@@ -85,7 +86,7 @@ Mask=Mask
 NextValue=Next value
 NextValueForInvoices=Next value (invoices)
 NextValueForCreditNotes=Next value (credit notes)
-NextValueForDeposit=Next value (deposit)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Next value (replacements)
 MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to <b>%s</b> %s, whatever this parameter's value is
 NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
@@ -103,7 +104,7 @@ MenuIdParent=Parent menu ID
 DetailMenuIdParent=ID of parent menu (empty for a top menu)
 DetailPosition=Sort number to define menu position
 AllMenus=All
-NotConfigured=Module not configured
+NotConfigured=Module/Application not configured
 Active=Active
 SetupShort=Setup
 OtherOptions=Other options
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Thousand separator
 Destination=Destination
 IdModule=Module ID
 IdPermissions=Permissions ID
-Modules=Modules
 LanguageBrowserParameter=Parameter %s
 LocalisationDolibarrParameters=Localisation parameters
 ClientTZ=Client Time Zone (user)
@@ -123,7 +123,8 @@ PHPTZ=PHP server Time Zone
 DaylingSavingTime=Daylight saving time
 CurrentHour=PHP Time (server)
 CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max number of lines for widgets
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activat
 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 (Activated 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 make building of a global cumulated pdf not working (like unpaid invoices).
+ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature makes building of a global merged PDFs not working.
 Feature=Feature
 DolibarrLicense=License
 Developpers=Developers/contributors
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr online demo
 OfficialMarketPlace=Official market place for external modules/addons
 OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
 ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your
 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/
 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 setup
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Update server offline
+WithCounter=Manage a counter
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
 ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
 ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
@@ -369,19 +375,21 @@ Int=Integer
 Float=Float
 DateAndTime=Date and hour
 Unique=Unique
-Boolean=Boolean (Checkbox)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Phone
 ExtrafieldPrice = Price
 ExtrafieldMail = Email
 ExtrafieldUrl = Url
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Password
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldRadio=Radio buttons (on 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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Field
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=Invoice and credit note management for customers. Invoice managemen
 Module40Name=Suppliers
 Module40Desc=Supplier management and buying (orders and invoices)
 Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Products
@@ -499,8 +521,8 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Notifications
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
-Module4000Desc=Human resources management
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow
@@ -591,7 +615,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects i'm contact for)
 Permission45=Export projects
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Emails templates
 DictionaryUnits=Units
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Setup saved
+SetupNotSaved=Setup not saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
 VATManagement=VAT Management
@@ -921,7 +947,7 @@ Host=Server
 DriverType=Driver type
 SummarySystem=System information summary
 SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Foundation
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= Standard menu manager
 DefaultMenuSmartphoneManager=Smartphone menu manager
 Skin=Skin theme
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Default max length for lists
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=Message of the day
 MessageLogin=Login page message
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/foundation information
-CompanyIds=Company/foundation identities
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=Name
 CompanyAddress=Address
 CompanyZip=Zip
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Other menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Audit
@@ -987,7 +1015,7 @@ BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
 LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists 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
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Rules on Professional Ids
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####
 BillsSetup=Invoices module setup
 BillsNumberingModule=Invoices and credit notes numbering model
 BillsPDFModules=Invoice documents models
+PaymentsPDFModules=Payment documents models
 CreditNote=Credit note
 CreditNotes=Credit notes
 ForceInvoiceDate=Force invoice date to validation date
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
 FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
 FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
 CacheByServer=Cache by server
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
+CompressionOfResourcesDesc=For exemple 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 your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Products module setup
 ServiceSetup=Services module setup
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Invoice date used
 Buy=Buy
 Sell=Sell
 InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=Accountancy Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+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 your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
+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.
 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 same computer than 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.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+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.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=General display order
 BankOrderES=Spanish
 BankOrderESDesc=Spanish display order
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ 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.
 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.
-ConfFileMuseContainCustom=Installing 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)
 TextTitleColor=Color of page title
 LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/sw_SW/compta.lang b/htdocs/langs/sw_SW/compta.lang
index 5e9814369ec..94a3bd671ef 100644
--- a/htdocs/langs/sw_SW/compta.lang
+++ b/htdocs/langs/sw_SW/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using r
 Param=Setup
 RemainingAmountPayment=Amount payment remaining :
 Account=Account
-Accountparent=Account parent
-Accountsparent=Accounts parent
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=Income
 Outcome=Expense
 ReportInOut=Income / Expense
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Taxes and dividends
 MenuSocialContributions=Social/fiscal taxes
 MenuNewSocialContribution=New social/fiscal tax
 NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Accountancy/Treasury area
 NewPayment=New payment
@@ -134,8 +135,8 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from clients.<br>- It is based on the payment date of these invoices<br>
-DepositsAreNotIncluded=- Deposit invoices are nor included
-DepositsAreIncluded=- Deposit invoices are included
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
 VATReport=VAT report
@@ -169,7 +170,7 @@ DescSellsJournal=Sales Journal
 DescPurchasesJournal=Purchases Journal
 InvoiceRef=Invoice ref.
 CodeNotDef=Not defined
-WarningDepositsNotIncluded=Deposits invoices are not included in this version with this accountancy module.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
 Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
@@ -189,8 +190,10 @@ AccountancyJournal=Accountancy code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/sw_SW/cron.lang b/htdocs/langs/sw_SW/cron.lang
index b1e8bcb36d2..245fefe7af1 100644
--- a/htdocs/langs/sw_SW/cron.lang
+++ b/htdocs/langs/sw_SW/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allow to execute job that have been planned
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Job
 CronNone=None
 CronDtStart=Not before
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
-CronClassFile=Classes (filename.class.php)
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=From
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/sw_SW/errors.lang b/htdocs/langs/sw_SW/errors.lang
index 9e2eb6817ef..feada2d1b5a 100644
--- a/htdocs/langs/sw_SW/errors.lang
+++ b/htdocs/langs/sw_SW/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
 ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
 ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
 ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
 ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Some required fields were not filled.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoice
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # 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.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice
 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/sw_SW/main.lang b/htdocs/langs/sw_SW/main.lang
index 9ffa398137f..d7dde34acbb 100644
--- a/htdocs/langs/sw_SW/main.lang
+++ b/htdocs/langs/sw_SW/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=Parameter %s not defined
 ErrorUnknown=Unknown error
 ErrorSQL=SQL Error
 ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=Go to Module setup to fix this
 ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
 ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
@@ -153,6 +153,7 @@ Edit=Edit
 Validate=Validate
 ValidateAndApprove=Validate and Approve
 ToValidate=To validate
+NotValidated=Not validated
 Save=Save
 SaveAs=Save As
 TestConnection=Test connection
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=No applicative disconnect feature with authenticatio
 Connection=Connection
 Setup=Setup
 Alert=Alert
+MenuWarnings=Alerts
 Previous=Previous
 Next=Next
 Cards=Cards
@@ -308,6 +310,7 @@ Copy=Copy
 Paste=Paste
 Default=Default
 DefaultValue=Default value
+DefaultValues=Default values
 Price=Price
 UnitPrice=Unit price
 UnitPriceHT=Unit price (net)
@@ -363,7 +366,8 @@ VATRate=Tax Rate
 Average=Average
 Sum=Sum
 Delta=Delta
-Module=Module
+Module=Module/Application
+Modules=Modules/Applications
 Option=Option
 List=List
 FullList=Full list
@@ -387,7 +391,7 @@ ActionRunningNotStarted=To start
 ActionRunningShort=In progress
 ActionDoneShort=Finished
 ActionUncomplete=Uncomplete
-CompanyFoundation=Company/Foundation
+CompanyFoundation=Company/Organisation
 ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
@@ -405,8 +409,9 @@ Generate=Generate
 Duration=Duration
 TotalDuration=Total duration
 Summary=Summary
-DolibarrStateBoard=Statistics
-DolibarrWorkBoard=Work tasks board
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=Available
 NotYetAvailable=Not yet available
 NotAvailable=Not available
@@ -434,7 +439,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Opened
+Opened=Open
 New=New
 Discount=Discount
 Unknown=Unknown
@@ -453,6 +458,7 @@ NextStep=Next step
 Datas=Data
 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.
 Photo=Picture
@@ -606,7 +612,8 @@ PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
 Canceled=Canceled
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
+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
 Color=Color
 Documents=Linked files
@@ -642,6 +649,7 @@ FreeLineOfType=Free entry of type
 CloneMainAttributes=Clone object with its main attributes
 PDFMerge=PDF Merge
 Merge=Merge
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Show page to print main content area
 MenuManager=Menu manager
 WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only login <b>%s</b> is allowed to use application at the moment.
@@ -708,6 +716,7 @@ from=from
 toward=toward
 Access=Access
 SelectAction=Select action
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
 SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
 OriginFileName=Original filename
@@ -718,7 +727,7 @@ ViewPrivateNote=View notes
 XMoreLines=%s line(s) hidden
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
+SelectElementAndClick=Select an element and click %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
@@ -734,8 +743,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
@@ -755,11 +764,20 @@ Calendar=Calendar
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -817,5 +835,3 @@ SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/sw_SW/other.lang b/htdocs/langs/sw_SW/other.lang
index ab937ff3bab..b151614ce3c 100644
--- a/htdocs/langs/sw_SW/other.lang
+++ b/htdocs/langs/sw_SW/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=Date of birth
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Statistics in number of products/services units
-StatsByNumberOfEntities=Statistics in number of referring entities
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=The intervention %s has been validated.
 EMailTextInvoiceValidated=The invoice %s has been validated.
diff --git a/htdocs/langs/sw_SW/projects.lang b/htdocs/langs/sw_SW/projects.lang
index f9c603ce113..f40af2b963b 100644
--- a/htdocs/langs/sw_SW/projects.lang
+++ b/htdocs/langs/sw_SW/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
 PrivateProject=Project contacts
+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 (whatever is the type).
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=New project
 AddProject=Create project
 DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Opened projects
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
 SetProject=Set project
 NoProject=No project defined or owned
 NbOfProjects=Nb of projects
+NbOfTasks=Nb of tasks
 TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
@@ -47,9 +52,9 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
-NewTimeSpent=New time spent
+NewTimeSpent=Time spent
 MyTimeSpent=My time spent
 Tasks=Tasks
 Task=Task
@@ -59,6 +64,7 @@ TaskDescription=Task description
 NewTask=New task
 AddTask=Create task
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Activity
 Activities=Tasks/activities
 MyActivities=My tasks/activities
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=List of contracts associated with the project
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
 ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
@@ -110,7 +118,7 @@ TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
-TaskIsNotAffectedToYou=Task not assigned to you
+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.
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
 ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/th_TH/accountancy.lang b/htdocs/langs/th_TH/accountancy.lang
index 2c7a10cea3e..8b2bbbbe6f0 100644
--- a/htdocs/langs/th_TH/accountancy.lang
+++ b/htdocs/langs/th_TH/accountancy.lang
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=เพิ่มบัญชีบัญชี
 AccountAccounting=บัญชีการบัญชี
 AccountAccountingShort=บัญชี
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=บัญชีแยกประเภททั่วไป
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=ขายวารสาร
@@ -132,19 +140,19 @@ Sens=ซองส์
 Codejournal=วารสาร
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=เดบิตและเครดิตไม่สามารถมีค่าในเวลาเดียวกัน
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=รายการบัญชีที่บัญชี
 
 Pcgtype=ชั้นบัญชี
-Pcgsubtype=ภายใต้ระดับบัญชี
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=อัตรากำไรขั้นต้นรวมยอดขาย
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=ข้อผิดพลาดที่คุณไม่สามารถลบบัญชีบัญชีนี้เพราะมันถูกนำมาใช้
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=รหัส
+Nature=ธรรมชาติ
+AccountingJournalType1=Various operation
+AccountingJournalType2=ขาย
+AccountingJournalType3=การสั่งซื้อสินค้า
+AccountingJournalType4=ธนาคาร
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=การส่งออก
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index d49d6a99a20..476a622c632 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=ผู้ใช้ภายใน
 ExternalUsers=ผู้ใช้ภายนอก
 GUISetup=แสดง
 SetupArea=พื้นที่ติดตั้ง
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=แบบทดสอบการอัปโหลดไฟล์ (ตามการตั้งค่า)
 IfModuleEnabled=หมายเหตุ: <b>ใช่จะมีผลเฉพาะถ้าโมดูล% s</b> ถูกเปิดใช้งาน
 RemoveLock=<b>ลบไฟล์% s</b> ถ้ามันมีอยู่เพื่อช่วยให้การใช้งานของเครื่องมือการปรับปรุง
@@ -85,7 +86,7 @@ Mask=หน้ากาก
 NextValue=ค่าถัดไป
 NextValueForInvoices=ค่าถัดไป (ใบแจ้งหนี้)
 NextValueForCreditNotes=ค่าถัดไป (บันทึกเครดิต)
-NextValueForDeposit=ค่าถัดไป (เงินฝาก)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=ค่าถัดไป (เปลี่ยน)
 MustBeLowerThanPHPLimit=หมายเหตุ: PHP ของคุณ จำกัด <b>ขนาดอัปโหลดไฟล์แต่ละ% s%</b> s สิ่งที่ค่าพารามิเตอร์นี้คือ
 NoMaxSizeByPHPLimit=หมายเหตุ: ไม่ จำกัด มีการตั้งค่าในการกำหนดค่าของ PHP
@@ -103,7 +104,7 @@ MenuIdParent=ID เมนูผู้ปกครอง
 DetailMenuIdParent=ID ของเมนูปกครอง (ที่ว่างเปล่าสำหรับเมนูด้านบน)
 DetailPosition=เรียงลำดับหมายเลขในการกำหนดตำแหน่งที่เมนู
 AllMenus=ทั้งหมด
-NotConfigured=โมดูลไม่ได้กำหนดค่า
+NotConfigured=Module/Application not configured
 Active=กระตือรือร้น
 SetupShort=การติดตั้ง
 OtherOptions=ตัวเลือกอื่น ๆ
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=พันคั่น
 Destination=ปลายทาง
 IdModule=โมดูล ID
 IdPermissions=ID สิทธิ์
-Modules=โมดูล
 LanguageBrowserParameter=s พารามิเตอร์%
 LocalisationDolibarrParameters=พารามิเตอร์ภาษาท้องถิ่น
 ClientTZ=โซนเวลาไคลเอ็นต์ (ผู้ใช้)
@@ -123,7 +123,8 @@ PHPTZ=PHP เซิร์ฟเวอร์โซนเวลา
 DaylingSavingTime=ปรับเวลาตามฤดูกาล
 CurrentHour=PHP เวลา (เซิร์ฟเวอร์)
 CurrentSessionTimeOut=หมดเวลาการใช้งานปัจจุบัน
-YouCanEditPHPTZ=การตั้งค่าเขตเวลาที่แตกต่างกัน PHP (ไม่จำเป็น) คุณสามารถพยายามที่จะเพิ่ม .htacces ไฟล์ที่มีสายเช่นนี้ "SetEnv TZ ยุโรป / ปารีส"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max number of lines for widgets
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=สิทธิ์
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=องค์ประกอบเฉพาะจาก <a href="%s">โมดูลที่เปิดใช้งาน</a> จะแสดง
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=รหัสผ่านฐานข้อมู
 InstrucToEncodePass=จะมีรหัสผ่านที่เข้ารหัสเป็นไฟล์ <b>conf.php</b> เปลี่ยนสาย <br> <b>$ dolibarr_main_db_pass = "... ";</b> <br> โดย <br> <b>$ dolibarr_main_db_pass = "crypted:% s";</b>
 InstrucToClearPass=จะมีรหัสผ่านถอดรหัส (ชัดเจน) เป็นไฟล์ <b>conf.php</b> เปลี่ยนสาย <br> <b>$ dolibarr_main_db_pass = "crypted ... ";</b> <br> โดย <br> <b>$ dolibarr_main_db_pass = "% s";</b>
 ProtectAndEncryptPdfFiles=การคุ้มครองของไฟล์ PDF ที่สร้าง (เปิดใช้งานไม่แนะนำแบ่งไฟล์ PDF รุ่นมวล)
-ProtectAndEncryptPdfFilesDesc=คุ้มครองเอกสาร PDF ช่วยให้มันสามารถอ่านและพิมพ์ไฟล์ PDF กับเบราว์เซอร์ใด ๆ อย่างไรก็ตามการแก้ไขและการคัดลอกเป็นไปไม่ได้อีกต่อไป โปรดทราบว่าการใช้คุณลักษณะนี้ทำให้การสร้างไฟล์ PDF สะสมทั่วโลกไม่ทำงาน (เช่นใบแจ้งหนี้ที่ค้างชำระ)
+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=ลักษณะ
 DolibarrLicense=อนุญาต
 Developpers=นักพัฒนา / ผู้ร่วมสมทบ
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr สาธิตออนไลน์
 OfficialMarketPlace=ตลาดอย่างเป็นทางการสำหรับโมดูลภายนอก / addons
 OfficialWebHostingService=อ้างอิงเว็บโฮสติ้ง (Cloud โฮสติ้ง)
 ReferencedPreferredPartners=พาร์ทเนอร์ที่ต้องการ
-OtherResources=สารสนเทศ autres
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=สำหรับผู้ใช้หรือเอกสารพัฒนา (หมอคำถามที่พบบ่อย ... ), <br> ดูที่วิกิพีเดีย Dolibarr: <br> <a href="%s" target="_blank"><b>% s</b></a>
 ForAnswersSeeForum=สำหรับคำถามใด ๆ / ความช่วยเหลือคุณสามารถใช้ฟอรั่ม Dolibarr: <br> <a href="%s" target="_blank"><b>% s</b></a>
 HelpCenterDesc1=พื้นที่บริเวณนี้จะสามารถช่วยให้คุณได้รับบริการสนับสนุนช่วยเหลือใน Dolibarr
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=คุณลักษณะที่ไม่สา
 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/
 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=การติดตั้งโมดูล
-ModulesSetup=การติดตั้งโมดูล
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=ระบบ
 ModuleFamilyCrm=การบริหารลูกค้าสัมพันธ์ (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=รุ่นปัจจุบัน Dolibarr
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=เซิร์ฟเวอร์การอัพเดทออฟไลน์
+WithCounter=Manage a counter
 GenericMaskCodes=คุณอาจป้อนหน้ากากเลขใด ๆ ในหน้ากากนี้แท็กต่อไปนี้สามารถนำมาใช้: <br> <b>{000000}</b> สอดคล้องกับจำนวนที่จะเพิ่มขึ้นในแต่ละ% s ใส่เลขศูนย์เป็นจำนวนมากตามความยาวที่ต้องการของเคาน์เตอร์ เคาน์เตอร์จะแล้วเสร็จภายในศูนย์จากซ้ายเพื่อให้มีศูนย์มากที่สุดเท่าที่เป็นหน้ากาก <br> <b>{000000} + 000</b> เช่นเดียวกับก่อนหน้านี้ แต่ชดเชยที่สอดคล้องกับจำนวนที่อยู่ทางขวาของเครื่องหมาย + ถูกนำไปใช้ในการเริ่มต้นครั้งแรก% <br> <b>{000000 @ x}</b> เดียวกับก่อนหน้านี้ แต่นับตั้งค่าใหม่เป็นศูนย์เมื่อเดือน x ถึง (x ระหว่างวันที่ 1 และ 12 หรือ 0 จะใช้เดือนแรกของปีงบประมาณที่กำหนดไว้ในการกำหนดค่าของคุณหรือ 99 เพื่อตั้งค่าให้เป็นศูนย์ทุกเดือน ) ถ้าตัวเลือกนี้ถูกนำมาใช้และ x 2 หรือสูงกว่านั้นลำดับ {yy} {} มิลลิเมตรหรือปปปป {} {} มิลลิเมตรจะต้องมี <br> <b>{} วววัน</b> (01-31) <br> <b>{} มิลลิเมตรเดือน</b> (01-12) <br> <b>yy {}, {} หรือปปปป {y}</b> มากกว่าปีที่ 2, 4 หรือ 1 หมายเลข <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=ทุกตัวละครอื่น ๆ ในหน้ากากจะยังคงเหมือนเดิม <br> ช่องว่างที่ไม่ได้รับอนุญาต <br>
-GenericMaskCodes4a=<u>ตัวอย่างใน% s 99 ของ thecompany บุคคลที่สามทำ 2007/01/31:</u> <br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>ตัวอย่างของบุคคลที่สามที่สร้างขึ้นบน 2007/03/01:</u> <br>
 GenericMaskCodes4c=<u>ตัวอย่างสินค้าที่สร้างขึ้นบน 2007/03/01:</u> <br>
-GenericMaskCodes5=<b>เอบีซี yy {} {} มิลลิเมตร - {000000}</b> จะให้ <b>ABC0701-000099</b> <br> <b>{0000 + 100 @ 1} -ZZZ / {} วว / XXX</b> จะให้ <b>ZZZ-0199/31 / XXX</b>
+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=ส่งกลับจำนวนที่ปรับแต่งได้ตามที่กำหนดไว้หน้ากาก
 ServerAvailableOnIPOrPort=<b>เซิร์ฟเวอร์ที่มีอยู่ในที่อยู่% s พอร์ต% s</b>
 ServerNotAvailableOnIPOrPort=<b>เซิร์ฟเวอร์ที่ไม่สามารถใช้ได้ตามที่อยู่% s พอร์ต% s</b>
@@ -369,19 +375,21 @@ Int=จำนวนเต็ม
 Float=ลอย
 DateAndTime=วันที่และชั่วโมง
 Unique=เป็นเอกลักษณ์
-Boolean=บูลีน (Checkbox)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = โทรศัพท์
 ExtrafieldPrice = ราคา
 ExtrafieldMail = อีเมล์
 ExtrafieldUrl = Url
 ExtrafieldSelect = เลือกรายการ
 ExtrafieldSelectList = เลือกจากตาราง
-ExtrafieldSeparator=เครื่องสกัด
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=รหัสผ่าน
-ExtrafieldCheckBox=ช่องทำเครื่องหมาย
-ExtrafieldRadio=ปุ่ม
-ExtrafieldCheckBoxFromList= Checkbox จากตาราง
+ExtrafieldRadio=Radio buttons (on choice only)
+ExtrafieldCheckBox=Checkboxes
+ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=เชื่อมโยงไปยังวัตถุ
+ComputedFormula=Computed field
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=รายการพารามิเตอร์จะต้องเป็นเหมือนกุญแจสำคัญค่า <br><br> ตัวอย่างเช่น: <br> 1 ค่า 1 <br> 2 value2 <br> 3 value3 <br> ...
 ExtrafieldParamHelpradio=รายการพารามิเตอร์จะต้องเป็นเหมือนกุญแจสำคัญค่า <br><br> ตัวอย่างเช่น: <br> 1 ค่า 1 <br> 2 value2 <br> 3 value3 <br> ...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=สนาม
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=และกลุ่มผู้ใช้
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=ใบแจ้งหนี้และการจัดการ
 Module40Name=ซัพพลายเออร์
 Module40Desc=จัดการซัพพลายเออร์และการซื้อ (คำสั่งซื้อและใบแจ้งหนี้)
 Module42Name=บันทึก
-Module42Desc=สิ่งอำนวยความสะดวกการบันทึกข้อมูล (ไฟล์ syslog, ... )
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=บรรณาธิการ
 Module49Desc=การจัดการแก้ไข
 Module50Name=ผลิตภัณฑ์
@@ -499,8 +521,8 @@ Module410Name=Webcalendar
 Module410Desc=บูรณาการ Webcalendar
 Module500Name=ค่าใช้จ่ายพิเศษ
 Module500Desc=การบริหารจัดการค่าใช้จ่ายพิเศษ (ภาษีภาษีสังคมหรือการเงินการจ่ายเงินปันผล)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=เงินกู้
 Module520Desc=การบริหารจัดการของเงินให้สินเชื่อ
 Module600Name=การแจ้งเตือน
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind ความสามารถในการแปลง
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=ระบบบริหารจัดการทรัพยากรบุคคล
-Module4000Desc=Human resources management
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=หลาย บริษัท
 Module5000Desc=ช่วยให้คุณสามารถจัดการกับหลาย บริษัท
 Module6000Name=ขั้นตอนการทำงาน
@@ -591,7 +615,7 @@ Permission32=สร้าง / แก้ไขผลิตภัณฑ์
 Permission34=ลบผลิตภัณฑ์
 Permission36=ดู / จัดการผลิตภัณฑ์ที่ซ่อน
 Permission38=สินค้าส่งออก
-Permission41=อ่านโครงการและงาน (โครงการและโครงการที่ใช้ร่วมกันฉันติดต่อ) นอกจากนี้ยังสามารถใส่เวลาที่ใช้ในงานที่ได้รับมอบหมาย (timesheet)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=ลบโครงการ (โครงการและโครงการที่ใช้ร่วมกันฉันติดต่อ)
 Permission45=Export projects
@@ -844,12 +868,14 @@ DictionaryOrderMethods=วิธีการสั่งซื้อ
 DictionarySource=แหล่งที่มาของข้อเสนอ / การสั่งซื้อ
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=รุ่นสำหรับผังบัญชี
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=แม่แบบอีเมล
 DictionaryUnits=หน่วย
 DictionaryProspectStatus=สถานะ prospection
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=สถานะการเปิดโอกาสให้โครงการ / นำ
 SetupSaved=การตั้งค่าที่บันทึกไว้
+SetupNotSaved=Setup not saved
 BackToModuleList=กลับไปยังรายการโมดูล
 BackToDictionaryList=กลับไปยังรายการพจนานุกรม
 VATManagement=การบริหารจัดการภาษีมูลค่าเพิ่ม
@@ -921,7 +947,7 @@ Host=เซิร์ฟเวอร์
 DriverType=ชนิดตัวขับ
 SummarySystem=สรุปข้อมูลระบบ
 SummaryConst=รายชื่อของพารามิเตอร์การตั้งค่า Dolibarr
-MenuCompanySetup=บริษัท / มูลนิธิ
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= ผู้จัดการเมนูมาตรฐาน
 DefaultMenuSmartphoneManager=ผู้จัดการเมนูมาร์ทโฟน
 Skin=ธีมผิว
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Default max length for lists
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=ข้อความของวัน
 MessageLogin=ข้อความหน้าเข้าสู่ระบบ
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=แบบฟอร์มการค้นหาถาวรบนเมนูด้านซ้าย
 DefaultLanguage=ภาษาเริ่มต้นที่จะใช้ (รหัสภาษา)
 EnableMultilangInterface=เปิดใช้งานอินเตอร์เฟซที่พูดได้หลายภาษา
 EnableShowLogo=โลโก้แสดงบนเมนูด้านซ้าย
-CompanyInfo=บริษัท / ข้อมูลมูลนิธิ
-CompanyIds=บริษัท / อัตลักษณ์ของมูลนิธิ
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=ชื่อ
 CompanyAddress=ที่อยู่
 CompanyZip=ไปรษณีย์
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=ความล่าช้าความอดทน
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=ความล่าช้าความอดทน (ในวัน) ก่อนที่จะแจ้งเตือนสำหรับการฝากเงินการตรวจสอบที่จะทำ
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=รายการเมนูอื่น ๆ จัดการพารามิเตอร์ที่ไม่จำเป็น
 LogEvents=ตรวจสอบเหตุการณ์การรักษาความปลอดภัย
 Audit=การตรวจสอบบัญชี
@@ -987,7 +1015,7 @@ BrowserOS=ระบบปฏิบัติการเบราว์เซอ
 ListOfSecurityEvents=รายการ Dolibarr เหตุการณ์การรักษาความปลอดภัย
 SecurityEventsPurged=เหตุการณ์การรักษาความปลอดภัยกำจัด
 LogEventDesc=คุณสามารถเปิดใช้การเข้าสู่ระบบที่นี่สำหรับ Dolibarr เหตุการณ์การรักษาความปลอดภัย <b>ผู้ดูแลระบบแล้วสามารถมองเห็นเนื้อหาผ่านทางเครื่องมือของระบบเมนู - ตรวจสอบ</b> คำเตือนคุณลักษณะนี้สามารถใช้ข้อมูลจำนวนมากในฐานข้อมูล
-AreaForAdminOnly=<b>คุณสมบัติเหล่านั้นสามารถนำมาใช้โดยผู้ใช้ผู้ดูแลระบบเท่านั้น</b>
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=ข้อมูลระบบข้อมูลทางด้านเทคนิคอื่น ๆ ที่คุณได้รับในโหมดอ่านอย่างเดียวและมองเห็นสำหรับผู้ดูแลระบบเท่านั้น
 SystemAreaForAdminOnly=บริเวณนี้เป็นที่ใช้ได้สำหรับผู้ใช้ผู้ดูแลระบบเท่านั้น ไม่มีสิทธิ์ Dolibarr สามารถลดขีด จำกัด นี้
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists in any language files
+TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=คุณต้องเปิดการใช้งานอย่างน้อย 1 โมดูล
 ClassNotFoundIntoPathWarning=คลาส% s ไม่พบเ​​ข้ามาในเส้นทาง PHP
 YesInSummer=ใช่ในช่วงฤดู​​ร้อน
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=เซสชั่นการจัดเก็บข้อมูลที่มีการเข้ารหัสโดย Suhosin
 ConditionIsCurrently=สภาพปัจจุบันคือ% s
 YouUseBestDriver=คุณสามารถใช้โปรแกรมควบคุม% s ที่เป็นคนขับรถที่ดีที่สุดที่มีอยู่ในปัจจุบัน
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=หลักเกณฑ์ในการมืออา
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=<b>การเชื่อมโยงการส่งออกไปยังรูปแบบ% s</b> สามารถดูได้ที่ลิงค์ต่อไปนี้:% s
 ##### Invoices #####
 BillsSetup=ใบแจ้งหนี้การติดตั้งโมดูล
 BillsNumberingModule=ใบแจ้งหนี้และบันทึกหมายเลขบัตรเครดิตรูปแบบ
 BillsPDFModules=รูปแบบเอกสารใบแจ้งหนี้
+PaymentsPDFModules=Payment documents models
 CreditNote=ใบลดหนี้
 CreditNotes=บันทึกเครดิต
 ForceInvoiceDate=วันที่ใบแจ้งหนี้กองทัพวันที่ตรวจสอบ
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=แฟ้ม s พิมพ์% ไม่ได้เก็
 FilesOfTypeCompressed=ไฟล์ประเภท% s จะถูกบีบอัดโดยเซิร์ฟเวอร์ HTTP
 FilesOfTypeNotCompressed=แฟ้ม s พิมพ์% ไม่ได้บีบอัดโดยเซิร์ฟเวอร์ HTTP
 CacheByServer=แคชโดยเซิร์ฟเวอร์
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=แคชเบราว์เซอร์
 CompressionOfResources=การบีบอัดของการตอบสนอง HTTP
+CompressionOfResourcesDesc=For exemple using the Apache directive "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=ดังกล่าวตรวจสอบโดยอัตโนมัติเป็นไปไม่ได้กับเบราว์เซอร์ในปัจจุบัน
+DefaultValuesDesc=You can define/force here the default value you want to get when your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=ผลิตภัณฑ์การติดตั้งโมดูล
 ServiceSetup=บริการติดตั้งโมดูล
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=วันที่ใบแจ้งหนี้ที
 Buy=ซื้อ
 Sell=ขาย
 InvoiceDateUsed=วันที่ใบแจ้งหนี้ที่ใช้
-YourCompanyDoesNotUseVAT=บริษัท ของคุณได้รับการกำหนดที่จะไม่ใช้ภาษีมูลค่าเพิ่ม (หน้าหลัก - การติดตั้ง - บริษัท / มูลนิธิ) ดังนั้นจึงไม่มีตัวเลือกในการติดตั้งภาษีมูลค่าเพิ่ม
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=รหัสบัญชี
 AccountancyCodeSell=บัญชีการขาย รหัส
 AccountancyCodeBuy=บัญชีซื้อ รหัส
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=ตั้งค่าโดยอัตโนมั
 AGENDA_DEFAULT_VIEW=ซึ่งแท็บที่คุณต้องการที่จะเปิดตามค่าเริ่มต้นเมื่อมีการเลือกวาระที่เมนู
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=คลิกเพื่อกดติดตั้งโมดูล
-ClickToDialUrlDesc=url ที่เรียกว่าเมื่อการคลิกที่ picto โทรศัพท์จะทำ ใน URL คุณสามารถใช้แท็ก <br> <b>__PHONETO__</b> ที่จะถูกแทนที่ด้วยหมายเลขโทรศัพท์ของบุคคลที่จะเรียก <br> <b>__PHONEFROM__</b> ที่จะถูกแทนที่ด้วยหมายเลขโทรศัพท์ของบุคคลที่โทร (คุณ) <br> <b>__LOGIN__</b> ที่จะถูกแทนที่ด้วยการเข้าสู่ระบบของคุณ clicktodial (ตามที่กำหนดในบัตรผู้ใช้ของคุณ) <br> <b>__PASS__</b> ที่จะถูกแทนที่ด้วยรหัสผ่าน clicktodial คุณ (ที่กำหนดไว้ในบัตรผู้ใช้ของคุณ)
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 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.
 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 same computer than 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.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API การติดตั้งโมดูล
 ApiDesc=โดยการเปิดใช้โมดูลนี้ Dolibarr กลายเป็นเซิร์ฟเวอร์ REST เพื่อให้บริการเว็บอื่น ๆ
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+ApiExporerIs=You can explore and test the APIs at URL
 OnlyActiveElementsAreExposed=องค์ประกอบเฉพาะจากโมดูลมีการเปิดใช้งาน
 ApiKey=ที่สำคัญสำหรับ API
 WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=ลำดับการแสดงทั่วไป
 BankOrderES=สเปน
 BankOrderESDesc=เพื่อการแสดงผลภาษาสเปน
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=หลาย บริษัท ติดตั้งโมดูล
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ BackupDumpWizard=ตัวช่วยสร้างการสร้างแ
 SomethingMakeInstallFromWebNotPossible=การติดตั้งโมดูลภายนอกเป็นไปไม่ได้จากอินเตอร์เฟซเว็บด้วยเหตุผลต่อไปนี้:
 SomethingMakeInstallFromWebNotPossible2=ด้วยเหตุนี้กระบวนการอัพเกรดอธิบายไว้ที่นี่เป็นเพียงไม่กี่ก้าวคู่มือผู้ใช้สิทธิพิเศษที่สามารถทำ
 InstallModuleFromWebHasBeenDisabledByFile=ติดตั้งโมดูลภายนอกจากโปรแกรมที่ได้รับการปิดใช้งานโดยผู้ดูแลระบบ <strong>คุณต้องขอให้เขาลบไฟล์% s</strong> เพื่อให้คุณลักษณะนี้
-ConfFileMuseContainCustom=Installing 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=เน้นเส้นตารางเมื่อเลื่อนเมาส์ผ่านไป
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
 LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=สีพื้นหลัง
 TopMenuBackgroundColor=สีพื้นหลังสำหรับเมนูยอดนิยม
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=ระยะเวลาการแจ้งให้ทร
 NbAddedAutomatically=จำนวนวันที่เพิ่มเข้าไปในเคาน์เตอร์ของผู้ใช้ (โดยอัตโนมัติ) ในแต่ละเดือน
 EnterAnyCode=ฟิลด์นี้มีการอ้างอิงในการระบุสาย ป้อนค่าที่คุณเลือกได้ แต่ไม่มีตัวอักษรพิเศษ
 UnicodeCurrency=ป้อนที่นี่ระหว่างวงเล็บรายการจำนวนไบต์ที่เป็นตัวแทนของสัญลักษณ์สกุลเงิน สำหรับ exemple: ราคา $ ป้อน [36] - ราคา $ บราซิลจริง R [82,36] - สำหรับ€ป้อน [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=ตำแหน่งของเส้นเป็นรายการคำสั่งผสม
 SellTaxRate=อัตราภาษีการขาย
 RecuperableOnly=ใช่ภาษีมูลค่าเพิ่ม "ไม่PerçueRécupérable" ทุ่มเทของรัฐในฝรั่งเศสบาง เก็บค่าที่จะ "ไม่" ในกรณีอื่น ๆ
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/th_TH/compta.lang b/htdocs/langs/th_TH/compta.lang
index cf965e0f49c..d25fbd36226 100644
--- a/htdocs/langs/th_TH/compta.lang
+++ b/htdocs/langs/th_TH/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=จํานวนเงินที่
 Param=การติดตั้ง
 RemainingAmountPayment=การชำระเงินจำนวนเงินที่เหลือ:
 Account=บัญชี
-Accountparent=บัญชีผู้ปกครอง
-Accountsparent=บัญชีผู้ปกครอง
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=เงินได้
 Outcome=ค่าใช้จ่าย
 ReportInOut=รายได้ / ค่าใช้จ่าย
@@ -56,6 +56,7 @@ MenuTaxAndDividends=ภาษีและเงินปันผล
 MenuSocialContributions=สังคม / ภาษีการคลัง
 MenuNewSocialContribution=ใหม่สังคม / ภาษีการคลัง
 NewSocialContribution=ใหม่สังคม / ภาษีการคลัง
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=สังคม / ภาษีการคลังที่จะต้องจ่าย
 AccountancyTreasuryArea=การบัญชี / ธนารักษ์พื้นที่
 NewPayment=การชำระเงินใหม่
@@ -134,8 +135,8 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- ซึ่งจะรวมถึงทุกการชำระเงินที่มีประสิทธิภาพของใบแจ้งหนี้ที่ได้รับจากลูกค้า <br> - มันขึ้นอยู่กับวันที่ชำระเงินของใบแจ้งหนี้เหล่านี้ <br>
-DepositsAreNotIncluded=- ใบแจ้งหนี้หรือเงินฝากจะรวม
-DepositsAreIncluded=- ใบแจ้งหนี้เงินฝากที่จะถูกรวม
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=รายงานโดยบุคคลที่สาม IRPF
 LT1ReportByCustomersInInputOutputModeES=รายงานโดยเรื่องของบุคคลที่สาม
 VATReport=VAT report
@@ -169,7 +170,7 @@ DescSellsJournal=วารสารการขาย
 DescPurchasesJournal=วารสารการสั่งซื้อสินค้า
 InvoiceRef=อ้างอิงใบแจ้งหนี้
 CodeNotDef=ไม่กำหนด
-WarningDepositsNotIncluded=ใบแจ้งหนี้เงินฝากไม่รวมอยู่ในรุ่นที่มีโมดูลบัญชีนี้
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=ในระยะวันที่ชำระเงินไม่สามารถจะต่ำกว่าวันที่วัตถุ
 Pcg_version=Chart of accounts models
 Pcg_type=ประเภท PCG
@@ -189,8 +190,10 @@ AccountancyJournal=วารสารการบัญชีรหัส
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=โคลนสังคม / ภาษีการคลัง
 ConfirmCloneTax=ยืนยันโคลนของสังคม / ชำระภาษีการคลัง
 CloneTaxForNextMonth=โคลนมันสำหรับเดือนถัดไป
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=สังคม / ภาษีการคลัง
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/th_TH/cron.lang b/htdocs/langs/th_TH/cron.lang
index 5172a26816f..d7a604c6b46 100644
--- a/htdocs/langs/th_TH/cron.lang
+++ b/htdocs/langs/th_TH/cron.lang
@@ -25,7 +25,7 @@ CronDelete=ลบงานที่กำหนดไว้
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=โมดูลงานตามกำหนดการอนุญาตให้มีการดำเนินงานที่ได้รับการวางแผน
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=งาน
 CronNone=ไม่
 CronDtStart=Not before
@@ -57,12 +57,12 @@ CronStatusActiveBtn=เปิดใช้งาน
 CronStatusInactiveBtn=ปิดการใช้งาน
 CronTaskInactive=งานนี้ถูกปิดใช้งาน
 CronId=Id
-CronClassFile=การเรียนการสอน (filename.class.php)
-CronModuleHelp=ชื่อของไดเรกทอรีโมดูล Dolibarr (ยังทำงานร่วมกับโมดูล Dolibarr ภายนอก) <BR> สำหรับ exemple สามารถดึงข้อมูลวิธีการ Dolibarr วัตถุสินค้า / htdocs / <u>ผลิตภัณฑ์</u> /class/product.class.php <i>ค่าของโมดูลเป็นผลิตภัณฑ์</i>
-CronClassFileHelp=ชื่อไฟล์ที่จะโหลด <BR> สำหรับ exemple สามารถดึงข้อมูลวิธีการ Dolibarr วัตถุสินค้า / htdocs / สินค้า / ระดับ / <u>product.class.php</u> ค่าของชื่อไฟล์ระดับคือ <i>product.class.php</i>
-CronObjectHelp=ชื่อวัตถุที่จะโหลด <BR> สำหรับ exemple สามารถดึงข้อมูลวิธีการ Dolibarr วัตถุสินค้า /htdocs/product/class/product.class.php <i>ค่าของชื่อไฟล์ระดับเป็นสินค้า</i>
-CronMethodHelp=วิธีวัตถุที่จะเปิดตัว <BR> สำหรับ exemple สามารถดึงข้อมูลวิธีการ Dolibarr วัตถุสินค้า /htdocs/product/class/product.class.php ค่าของวิธีการที่เป็น <i>fecth</i>
-CronArgsHelp=วิธีการขัดแย้ง <BR> สำหรับ exemple สามารถดึงข้อมูลวิธีการ Dolibarr วัตถุสินค้า /htdocs/product/class/product.class.php ค่าของพารามิเตอร์สามารถ <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=บรรทัดคำสั่งระบบที่จะดำเนินการ
 CronCreateJob=สร้างงานใหม่กำหนด
 CronFrom=จาก
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=ปิดการใช้งาน
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/th_TH/errors.lang b/htdocs/langs/th_TH/errors.lang
index 6092dfbe7a8..c7b6db36de1 100644
--- a/htdocs/langs/th_TH/errors.lang
+++ b/htdocs/langs/th_TH/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=ล้มเหลวในการสร้างแฟ
 ErrorFailToRenameDir=ไม่สามารถเปลี่ยนชื่อไดเรกทอรี <b>'% s'</b> เป็น <b>'% s'</b>
 ErrorFailToCreateDir=ล้มเหลวในการสร้างไดเรกทอรี <b>'% s'</b>
 ErrorFailToDeleteDir=ไม่สามารถลบไดเรกทอรี <b>'% s'</b>
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=ติดต่อนี้ถูกกำหนดไว้แล้วเป็นผู้ติดต่อสำหรับประเภทนี้
 ErrorCashAccountAcceptsOnlyCashMoney=บัญชีธนาคารนี้เป็นบัญ​​ชีเงินสดดังนั้นจึงยอมรับการชำระเงินของเงินสดชนิดเดียว
 ErrorFromToAccountsMustDiffers=แหล่งที่มาและเป้าหมายบัญชีธนาคารจะต้องแตกต่าง
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=ไม่สามารถเขียนในได
 ErrorFoundBadEmailInFile=พบไวยากรณ์อีเมลไม่ถูกต้องสำหรับ% s บรรทัดในไฟล์ (เช่นสาย% s ด้วยอีเมล =% s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=ฟิลด์ที่จำเป็นบางคนไม่เต็ม
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=ล้มเหลวในการสร้างไดเรกทอรี ตรวจสอบการใช้เว็บเซิร์ฟเวอร์ที่มีสิทธิ์ในการเขียนลงในไดเรกทอรีเอกสาร Dolibarr หาก <b>safe_mode</b> พารามิเตอร์เปิดใช้งานบน PHP นี้ตรวจสอบว่า php ไฟล์ Dolibarr เป็นเจ้าของให้กับผู้ใช้เว็บเซิร์ฟเวอร์ (หรือกลุ่ม)
 ErrorNoMailDefinedForThisUser=จดหมายไม่มีกำหนดไว้สำหรับผู้ใช้นี้
 ErrorFeatureNeedJavascript=คุณลักษณะนี้จะต้องเปิดการใช้งานได้ในการทำงาน เปลี่ยนนี้ในการตั้งค่า - การแสดงผล
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=จำนวนบรรทัดลง
 ErrorWebServerUserHasNotPermission=<b>บัญชีผู้ใช้% s</b> ใช้ในการดำเนินการเว็บเซิร์ฟเวอร์มีสิทธิ์ในการที่ไม่มี
 ErrorNoActivatedBarcode=ประเภทไม่มีการเปิดใช้งานบาร์โค้ด
 ErrUnzipFails=ไม่สามารถเปิดเครื่องรูด% s กับ ZipArchive
-ErrNoZipEngine=เครื่องยนต์ยังไม่ได้เปิดเครื่องรูดแฟ้ม% ใน PHP นี้
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=ไฟล์% s จะต้องเป็นแพคเกจซิป Dolibarr
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=PHP CURL ไม่ได้ติดตั้งนี้เป็นสิ่งสำคัญที่จะพูดคุยกับ Paypal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=ไม่มีตัวแปรทั่วโล
 ErrorFieldMustBeANumeric=<b>s สนาม%</b> จะต้องเป็นค่าตัวเลข
 ErrorMandatoryParametersNotProvided=พารามิเตอร์บังคับ (s) ไม่ได้ให้
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # 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.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=วันที่ชำระเงิ
 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/th_TH/main.lang b/htdocs/langs/th_TH/main.lang
index 2db97ac35dd..eaa24193396 100644
--- a/htdocs/langs/th_TH/main.lang
+++ b/htdocs/langs/th_TH/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=พารามิเตอร์% s ไม่ได้
 ErrorUnknown=ข้อผิดพลาดที่ไม่รู้จัก
 ErrorSQL=ข้อผิดพลาด SQL
 ErrorLogoFileNotFound=ไฟล์โลโก้ '% s' ไม่พบ
-ErrorGoToGlobalSetup=ไปที่ 'บริษัท / มูลนิธิการติดตั้งการแก้ไขปัญหานี้
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=ไปยังโมดูลการติดตั้งการแก้ไขปัญหานี้
 ErrorFailedToSendMail=ล้มเหลวในการส่งอีเมล (ส่ง =% s รับ =% s)
 ErrorFileNotUploaded=ไฟล์ที่อัปโหลดไม่ได้ ตรวจสอบขนาดที่ไม่เกินสูงสุดที่อนุญาตที่พื้นที่ว่างที่มีอยู่บนดิสก์และนั่นก็คือไม่ได้อยู่แล้วไฟล์ที่มีชื่อเดียวกันในไดเรกทอรีนี้
@@ -153,6 +153,7 @@ Edit=แก้ไข
 Validate=ตรวจสอบ
 ValidateAndApprove=ตรวจสอบและอนุมัติ
 ToValidate=ในการตรวจสอบ
+NotValidated=Not validated
 Save=บันทึก
 SaveAs=บันทึกเป็น
 TestConnection=ทดสอบการเชื่อมต่อ
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=ไม่มีคุณลักษณะปลด
 Connection=สัมพันธ์
 Setup=การติดตั้ง
 Alert=เตือนภัย
+MenuWarnings=การแจ้งเตือน
 Previous=ก่อน
 Next=ถัดไป
 Cards=การ์ด
@@ -308,6 +310,7 @@ Copy=สำเนา
 Paste=แปะ
 Default=ผิดนัด
 DefaultValue=ค่ามาตรฐาน
+DefaultValues=Default values
 Price=ราคา
 UnitPrice=ราคาต่อหน่วย
 UnitPriceHT=ราคาต่อหน่วย (สุทธิ)
@@ -363,7 +366,8 @@ VATRate=อัตราภาษี
 Average=เฉลี่ย
 Sum=รวม
 Delta=รูปสามเหลี่ยม
-Module=โมดูล
+Module=Module/Application
+Modules=Modules/Applications
 Option=ตัวเลือก
 List=รายการ
 FullList=รายการเต็มรูปแบบ
@@ -387,7 +391,7 @@ ActionRunningNotStarted=ในการเริ่มต้น
 ActionRunningShort=In progress
 ActionDoneShort=เสร็จสิ้น
 ActionUncomplete=Uncomplete
-CompanyFoundation=บริษัท / มูลนิธิ
+CompanyFoundation=Company/Organisation
 ContactsForCompany=สำหรับรายชื่อของบุคคลที่สามนี้
 ContactsAddressesForCompany=รายชื่อ / ที่อยู่สำหรับบุคคลที่สามนี้
 AddressesForCompany=สำหรับที่อยู่ของบุคคลที่สามนี้
@@ -405,8 +409,9 @@ Generate=ผลิต
 Duration=ระยะเวลา
 TotalDuration=ระยะเวลารวม
 Summary=ย่อ
-DolibarrStateBoard=สถิติ
-DolibarrWorkBoard=คณะกรรมการงานการทำงาน
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=มีจำหน่าย
 NotYetAvailable=ยังไม่สามารถใช้ได้
 NotAvailable=ไม่พร้อม
@@ -434,7 +439,7 @@ Reportings=การรายงาน
 Draft=ร่าง
 Drafts=ร่าง
 Validated=ผ่านการตรวจสอบ
-Opened=Opened
+Opened=เปิด
 New=ใหม่
 Discount=ส่วนลด
 Unknown=ไม่ทราบ
@@ -453,6 +458,7 @@ NextStep=ขั้นตอนต่อไป
 Datas=ข้อมูล
 None=ไม่
 NoneF=ไม่
+NoneOrSeveral=None or several
 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.
 Photo=ภาพ
@@ -606,7 +612,8 @@ PartialWoman=เป็นบางส่วน
 TotalWoman=ทั้งหมด
 NeverReceived=ไม่เคยได้รับ
 Canceled=ยกเลิก
-YouCanChangeValuesForThisListFromDictionarySetup=คุณสามารถเปลี่ยนค่าสำหรับรายชื่อจากการตั้งค่าเมนูนี้ - พจนานุกรม
+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
 Color=สี
 Documents=แฟ้มที่เชื่อมโยง
@@ -642,6 +649,7 @@ FreeLineOfType=รายการฟรีประเภท
 CloneMainAttributes=วัตถุโคลนที่มีคุณลักษณะหลัก
 PDFMerge=ผสานรูปแบบไฟล์ PDF
 Merge=ผสาน
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=หน้าแสดงพื้นที่ในการพิมพ์เนื้อหาหลัก
 MenuManager=ผู้จัดการเมนู
 WarningYouAreInMaintenanceMode=<b>คำเตือนคุณอยู่ในโหมดการบำรุงรักษาดังนั้นเพียง% s</b> เข้าสู่ระบบได้รับอนุญาตให้ใช้โปรแกรมในขณะนี้
@@ -708,6 +716,7 @@ from=จาก
 toward=ไปทาง
 Access=การเข้าถึง
 SelectAction=Select action
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=ใช้ Ctrl + C เพื่อคัดลอกไปที่คลิปบอร์ด
 SaveUploadedFileWithMask=บันทึกไฟล์บนเซิร์ฟเวอร์ที่มีชื่อ "<strong>%s</strong>" (มิฉะนั้น "%s")
 OriginFileName=ชื่อไฟล์ต้นฉบับ
@@ -718,7 +727,7 @@ ViewPrivateNote=ดูบันทึก
 XMoreLines=% s สาย (s) ซ่อน
 PublicUrl=URL ที่สาธารณะ
 AddBox=เพิ่มกล่อง
-SelectElementAndClickRefresh=เลือกองค์ประกอบและคลิกฟื้นฟู
+SelectElementAndClick=Select an element and click %s
 PrintFile=พิมพ์ไฟล์% s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=ไปลงในหน้าหลัก - การติดตั้ง - บริษัท ที่จะเปลี่ยนโลโก้หรือไปลงในหน้าแรก - การติดตั้ง - จอแสดงผลที่จะซ่อน
@@ -734,8 +743,8 @@ Hello=สวัสดี
 Sincerely=Sincerely
 DeleteLine=ลบบรรทัด
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
@@ -755,11 +764,20 @@ Calendar=ปฏิทิน
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=ปีงบประมาณ
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=วันจันทร์
 Tuesday=วันอังคาร
@@ -817,5 +835,3 @@ SearchIntoContracts=สัญญา
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=รายงานค่าใช้จ่าย
 SearchIntoLeaves=ใบลา
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/th_TH/other.lang b/htdocs/langs/th_TH/other.lang
index 4f436420b43..7d99ded2d77 100644
--- a/htdocs/langs/th_TH/other.lang
+++ b/htdocs/langs/th_TH/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=วันเกิด
 BirthdayAlertOn=การแจ้งเตือนการใช้งานวันเกิด
 BirthdayAlertOff=การแจ้งเตือนวันเกิดไม่ได้ใช้งาน
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=การแทรกแซงการตรวจสอบ
 Notify_FICHINTER_SENTBYMAIL=การแทรกแซงส่งทางไปรษณีย์
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=<b>นี่คือจดหมายทดสอบ</b
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__ คุณจะพบว่าที่นี่ข้อเสนอในเชิงพาณิชย์ __PROPREF__ __PERSONALIZED__Sincerely __SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__ คุณจะพบว่าที่นี่คำขอราคา __ASKREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__ คุณจะพบว่าที่นี่เพื่อ __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ คุณจะพบว่าที่นี่เพื่อเรา __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__ คุณจะพบว่าที่นี่จัดส่ง __SHIPPINGREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__ คุณจะพบว่าที่นี่แทรกแซง __FICHINTERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__ __PERSONALIZED__ __SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>ศ Id% s</b> ข้อมูลขึ้นอยู่กับประเทศของบุคคลที่สาม <br> <b>ตัวอย่างเช่นสำหรับประเทศ% s ก็รหัส%</b> s
 DolibarrDemo=Dolibarr ERP / CRM สาธิต
-StatsByNumberOfUnits=สถิติในจำนวนของผลิตภัณฑ์ / หน่วยบริการ
-StatsByNumberOfEntities=สถิติในจำนวนของหน่วยงานหมาย
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=การแทรกแซง% s ได้รับการตรวจสอบ
 EMailTextInvoiceValidated=ใบแจ้งหนี้% s ได้รับการตรวจสอบ
diff --git a/htdocs/langs/th_TH/projects.lang b/htdocs/langs/th_TH/projects.lang
index 43ea4da302a..d8950ef4322 100644
--- a/htdocs/langs/th_TH/projects.lang
+++ b/htdocs/langs/th_TH/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=สถานะของโครงการ
 SharedProject=ทุกคน
 PrivateProject=รายชื่อโครงการ
+ProjectsImContactFor=Projects I'm explicitely a contact of
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=ทุกโครงการ
 MyProjectsDesc=มุมมองนี้จะ จำกัด ให้กับโครงการที่คุณกำลังติดต่อ (สิ่งที่เป็นประเภท)
 ProjectsPublicDesc=มุมมองนี้จะนำเสนอโครงการทั้งหมดที่คุณได้รับอนุญาตให้อ่าน
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=มุมมองนี้นำเสนอทุกโครงก
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=โครงการใหม่
 AddProject=สร้างโครงการ
 DeleteAProject=ลบโครงการ
 DeleteATask=ลบงาน
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=เปิดโครงการ
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=แสดงโครงการ
 SetProject=โครงการตั้ง
 NoProject=ไม่มีโครงการที่กำหนดไว้หรือเป็นเจ้าของ
 NbOfProjects=nb ของโครงการ
+NbOfTasks=Nb of tasks
 TimeSpent=เวลาที่ใช้
 TimeSpentByYou=เวลาที่ใช้โดยคุณ
 TimeSpentByUser=เวลาที่ใช้โดยผู้ใช้
@@ -47,9 +52,9 @@ TaskTimeSpent=เวลาที่ใช้ในงาน
 TaskTimeUser=ผู้ใช้งาน
 TaskTimeNote=บันทึก
 TaskTimeDate=วันที่
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=งานเกี่ยวกับโครงการที่เปิด
 WorkloadNotDefined=ภาระงานที่ไม่ได้กำหนดไว้
-NewTimeSpent=เวลาใหม่ใช้เวลา
+NewTimeSpent=เวลาที่ใช้
 MyTimeSpent=เวลาของการใช้จ่าย
 Tasks=งาน
 Task=งาน
@@ -59,6 +64,7 @@ TaskDescription=รายละเอียดงาน
 NewTask=งานใหม่
 AddTask=สร้างงาน
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=กิจกรรม
 Activities=งาน / กิจกรรม
 MyActivities=งานของฉัน / กิจกรรม
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=รายการของสัญญาที่เกี่ยวข้องกับโครงการ
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=รายชื่อของการแทรกแซงที่เกี่ยวข้องกับโครงการ
 ListExpenseReportsAssociatedProject=รายชื่อของรายงานค่าใช้จ่ายที่เกี่ยวข้องกับการโครงการ
 ListDonationsAssociatedProject=รายชื่อของการบริจาคที่เกี่ยวข้องกับการโครงการ
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=รายชื่อโครงการ
 ActionsOnProject=เหตุการณ์ที่เกิดขึ้นในโครงการ
 YouAreNotContactOfProject=คุณยังไม่ได้ติดต่อส่วนตัวของโครงการนี​​้
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=ลบเวลาที่ใช้
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=ดูยังไม่ได้รับมอบหมายงานมาให้ฉัน
@@ -110,7 +118,7 @@ TaskRessourceLinks=ทรัพยากร
 ProjectsDedicatedToThisThirdParty=โครงการที่ทุ่มเทให้กับบุคคลที่สามนี้
 NoTasks=ไม่มีงานสำหรับโครงการนี​​้
 LinkedToAnotherCompany=เชื่อมโยงไปยังบุคคลที่สาม
-TaskIsNotAffectedToYou=งานไม่ได้มอบหมายให้คุณ
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=เวลาที่ใช้เป็นที่ว่างเปล่า
 ThisWillAlsoRemoveTasks=การดำเนินการนี้จะลบงานทั้งหมดของโครงการ <b>(% s</b> งานในขณะนี้) และปัจจัยการผลิตทั้งหมดของเวลาที่ใช้
 IfNeedToUseOhterObjectKeepEmpty=หากวัตถ​​ุบางอย่าง (ใบแจ้งหนี้การสั่งซื้อ ... ) เป็นของอีกบุคคลที่สามจะต้องเชื่อมโยงกับโครงการที่จะสร้างให้ที่ว่างเปล่านี้จะมีโครงการที่เป็นบุคคลที่สามหลาย
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=การป้อนข้อมูลต่อวัน
 InputPerWeek=การป้อนข้อมูลต่อสัปดาห์
 InputPerAction=การป้อนข้อมูลต่อการกระทำ
-TimeAlreadyRecorded=เวลาที่อยู่ในใช้เวลาบันทึกไว้แล้วสำหรับงานนี้วัน / และใช้งาน% s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=โครงการที่มีผู้ใช้เป็นการติดต่อนี้
 TasksWithThisUserAsContact=Tasks ได้รับมอบหมายให้ผู้ใช้รายนี้
 ResourceNotAssignedToProject=ไม่ได้กำหนดโครงการ
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=มอบหมายงานให้ฉัน
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=กำหนด
 ProjectOverview=ภาพรวม
 ManageTasks=ใช้โครงการที่จะปฏิบัติตามงานและเวลา
 ManageOpportunitiesStatus=ใช้โครงการที่จะนำไปสู่​​การปฏิบัติตาม / opportinuties
 ProjectNbProjectByMonth=nb ของโครงการที่สร้างขึ้นโดย
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=สถิติในโครงการ / โอกาสในการขาย
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=งานที่ได้รับมอบหมาย เข้าครั้งในงานนี้จะเป็นไปได้
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=โครงการเปิดโดย thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/tr_TR/accountancy.lang b/htdocs/langs/tr_TR/accountancy.lang
index 4c62a66caa3..2a204c8e8d4 100644
--- a/htdocs/langs/tr_TR/accountancy.lang
+++ b/htdocs/langs/tr_TR/accountancy.lang
@@ -3,16 +3,16 @@ ACCOUNTING_EXPORT_SEPARATORCSV=Dışaaktarma dosyası için sütun ayırıcısı
 ACCOUNTING_EXPORT_DATE=Dışaaktarma dosyası için tarih biçimi
 ACCOUNTING_EXPORT_PIECE=Parça sayısını dışaaktar
 ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Genel hesapla birlikte dışaaktar
-ACCOUNTING_EXPORT_LABEL=Etiket dışaaktar
-ACCOUNTING_EXPORT_AMOUNT=Tutarı dışaaktar
-ACCOUNTING_EXPORT_DEVISE=Para birimi dışaaktar
+ACCOUNTING_EXPORT_LABEL=Etiket dışa aktar
+ACCOUNTING_EXPORT_AMOUNT=Tutarı dışa aktar
+ACCOUNTING_EXPORT_DEVISE=Para birimi dışa aktar
 Selectformat=Dosya için biçimi seçin
 ACCOUNTING_EXPORT_PREFIX_SPEC=Dosya adı için öneki belirtin
-ThisService=This service
-ThisProduct=This product
-DefaultForService=Default for service
-DefaultForProduct=Default for product
-CantSuggest=Can't suggest
+ThisService=Bu hizmet
+ThisProduct=Bu ürün
+DefaultForService=Hizmet için varsayılan
+DefaultForProduct=Ürün için varsayılan
+CantSuggest=Öneri yok
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
 ConfigAccountingExpert=Hesap uzmanı modülü yapılandırması
 Journalization=Journalization
@@ -22,31 +22,35 @@ BackToChartofaccounts=Hesap planı cirosu
 Chartofaccounts=Hesap planı
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
-InvoiceLabel=Invoice label
+InvoiceLabel=Fatura etiketi
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
-OtherInfo=Other information
+OtherInfo=Diğer Bilgiler
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,12 +61,16 @@ ChangeAndLoad=Change and load
 Addanaccount=Muhasebe hesabı ekle
 AccountAccounting=Muhasebe hesabı
 AccountAccountingShort=Hesap
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Önerilen muhasebe hesabı
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
-MenuTaxAccounts=Tax accounts
-MenuExpenseReportAccounts=Expense report accounts
-MenuLoanAccounts=Loan accounts
+MenuTaxAccounts=Vergi hesabı
+MenuExpenseReportAccounts=Gider raporu hesapları
+MenuLoanAccounts=Kredi hesapları
 MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=Hesaba bağlama
@@ -71,8 +79,8 @@ SuppliersVentilation=Tedarikçi faturası bağlama
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Yeni işlem oluştur
 UpdateMvts=İşlemi değiştir
-WriteBookKeeping=İşlemleri Büyük Deftere kaydet
-Bookkeeping=Büyük Defter
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Hesap bakiyesi
 
 CAHTF=Total purchase supplier before tax
@@ -93,19 +101,19 @@ Lineofinvoice=Fatura satırı
 LineOfExpenseReport=Line of expense report
 NoAccountSelected=No accounting account selected
 VentilatedinAccount=Muhasebe hesabına başarıyla bağlandı
-NotVentilatedinAccount=Not bound to the accounting account
+NotVentilatedinAccount=Muhasebe hesabına bağlı değil
 XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Her sayfada gösterilen bağlanacak öğe sayısı (ençok önerilen: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO="Bağlama yapılacaklar" sayfasının sıralama işlemini en son öğelerden başlatın
+ACCOUNTING_LIST_SORT_VENTILATION_DONE="Bağlama yapılanlar" sayfasının sıralama işlemini en son öğelerden başlatın
 
-ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_DESCRIPTION=Listedeki ürün ve hizmet açıklamalarını x karakterden sonra kesin (En iyi = 50)
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Listedeki ürün ve hizmet hesabı açıklamalarını x karakterden sonra kesin (En iyi = 50)
+ACCOUNTING_LENGTH_GACCOUNT=Genel muhasebe hesaplarının uzunluğu (eğer burada değeri 6 olarak ayarlarsanız '706' nolu hesap ekranda '706000' gibi görüntülenecektir)
+ACCOUNTING_LENGTH_AACCOUNT=Üçüncü taraf muhasebe hesaplarının uzunluğu (eğer burada değeri 6 olarak ayarlarsanız '401' nolu hesap ekranda '401000' gibi görüntülenecektir)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Satış günlüğü
@@ -114,14 +122,14 @@ ACCOUNTING_MISCELLANEOUS_JOURNAL=Çeşitli günlük
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Rapor günlüğü dışaaktarılsın mı?
 ACCOUNTING_SOCIAL_JOURNAL=Sosyal günlük
 
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
-ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Muhasebe hesabının transferi
+ACCOUNTING_ACCOUNT_SUSPENSE=Muhasebe hesabının bekletilmesi
 DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Satınalınan ürünler için varsayılan muhasebe hesabı (ürün kartlarında tanımlanmışsa)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Satılan ürünler için varsayılan muhasebe hesabı (ürün kartlarında tanımlanmışsa)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Satınalınan hizmetler için varsayılan muhasebe hesabı (ürün kartlarında tanımlanmışsa)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Satılan hizmetler için varsayılan muhasebe kodu (hizmet sayfasında tanımlanmamışsa)
 
 Doctype=Belge türü
 Docdate=Tarih
@@ -132,19 +140,19 @@ Sens=Sens (borsa haberleri yayınlama günlüğü)
 Codejournal=Günlük
 NumPiece=Parça sayısı
 TransactionNumShort=Num. transaction
-AccountingCategory=Muhasebe kategorisi
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Ayarlanmamış
-DeleteMvt=Büyük defter satırı sil
+DeleteMvt=Delete Ledger lines
 DelYear=Silinecek yıl
 DelJournal=Silinecek günlük
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
-ExpenseReportsJournal=Expense reports journal
+ExpenseReportsJournal=Gider raporları günlüğü
 DescFinanceJournal=Banka hesabından yapılan tüm ödeme türlerini içeren finans günlüğü
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -152,22 +160,22 @@ FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Müşteri faturası ödemesi
 ThirdPartyAccount=Üçüncü taraf hesabı
-NewAccountingMvt=New transaction
-NumMvts=Numero of transaction
-ListeMvts=List of movements
+NewAccountingMvt=Yeni İşlem
+NumMvts=İşlem hareket sayısı
+ListeMvts=Hareketler Listesi
 ErrorDebitCredit=Borç ve Alacak aynı anda bir değere sahip olamaz
-
-ReportThirdParty=List third party account
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+AddCompteFromBK=Add accounting accounts to the group
+ReportThirdParty=Üçüncü taraf hesabını listele
+DescThirdPartyReport=Burada üçüncü taraf müşterileri ve tedarikçileri ile onların muhasebe hesaplarının listesine bakın
 ListAccounts=Muhasebe hesapları listesi
 
 Pcgtype=Hesap sınıfı
-Pcgsubtype=Hesap sınıfı altında
+Pcgsubtype=Subclass of account
 
 TotalVente=Vergi öncesi toplam gelir
 TotalMarge=Toplam satışlar kar oranı
 
-DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilCustomer=Burada bir ürün hesabına bağlı (ya da bağlı olmayan) müşteri faturaları satırları listesine bakın.
 DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
@@ -186,16 +194,28 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Hata, kullanıldığı için bu muhasebe hesabını silemezsiniz
 MvtNotCorrectlyBalanced=Hareket doğru denkleştirilmemiş. Alacak = %s. Borç = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Toplu kategori uygula
-AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+AddAccountFromBookKeepingWithNoCategories=Önceden kategori kullanılmayan bir hesap ekle
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Kod
+Nature=Niteliği
+AccountingJournalType1=Various operation
+AccountingJournalType2=Satışlar
+AccountingJournalType3=Alışlar
+AccountingJournalType4=Banka
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Dışaaktarımlar
@@ -211,7 +231,8 @@ Modelcsv_ciel=Sage Ciel Compta ya da Compta Evolution'a doğru dışaaktar
 Modelcsv_quadratus=Quadratus QuadraCompta'ya doğru dışaaktar
 Modelcsv_ebp=EBP'ye yönelik dışaaktarım
 Modelcsv_cogilog=Cogilog'a dışaaktar
-ChartofaccountsId=Chart of accounts Id
+Modelcsv_agiris=Export towards Agiris (Test)
+ChartofaccountsId=Hesap planı Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Muhasebe başlangıcı
@@ -235,11 +256,12 @@ Calculated=Hesaplanmış
 Formula=Formül
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=Ayarlanan dışaaktarım biçimi bu sayfada desteklenmiyor
 BookeppingLineAlreayExists=Satırlar zaten muhasebede bulunmaktadır
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index 0eb1491952f..19ba7f0497b 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=İç kullanıcılar
 ExternalUsers=Dış kullanıcılar
 GUISetup=Ekran
 SetupArea=Ayarlar alanı
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Dosya yükleme deneme formu (ayarlara göre)
 IfModuleEnabled=Not: yalnızca <b>%s</b> modülü etkinleştirildiğinde evet etkilidir.
 RemoveLock=<b>%s</b> dosyasını, eğer güncelleme aracının kullanımına izin vermek için belirmişse kaldırın.
@@ -85,7 +86,7 @@ Mask=Maske
 NextValue=Sonraki değer
 NextValueForInvoices=Sonraki değer (faturalar)
 NextValueForCreditNotes=Sonraki değer (iade faturaları)
-NextValueForDeposit=Sonraki değer (yatırılan)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Sonraki değer (yenileme)
 MustBeLowerThanPHPLimit=Not: PHP niz yüklenen her dosyanın boyutunu, parametrelerin değeri ne olursa olsun <b>%s</b> %s ile sınırlandırır
 NoMaxSizeByPHPLimit=Not: PHP yapılandırmanızda hiç sınır ayarlanmamış
@@ -103,7 +104,7 @@ MenuIdParent=Ana menü Kimliği
 DetailMenuIdParent=Ana menü Kimliği (bir üst menü için boş)
 DetailPosition=Menü konumunu tanımlamak için sıra numarası
 AllMenus=Tümü
-NotConfigured=Modül yapılandırılmamış
+NotConfigured=Module/Application not configured
 Active=Etkin
 SetupShort=Ayarlar
 OtherOptions=Diğer seçenekler
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Binlik ayırıcı
 Destination=Hedef
 IdModule=Modül Kimliği
 IdPermissions=İzin Kimliği
-Modules=Modüller
 LanguageBrowserParameter=Parametre %s
 LocalisationDolibarrParameters=Yerelleştirme parametreleri
 ClientTZ=İstemci Zaman Dilimi (kullanıcı)
@@ -123,7 +123,8 @@ PHPTZ=PHP Saat Dilimi (sunucu)
 DaylingSavingTime=Yaz saati uygulaması
 CurrentHour=PHP saati (sunucu)
 CurrentSessionTimeOut=Geçerli oturumun zaman aşımı
-YouCanEditPHPTZ=Farklı bir PHP saat dilimi (gerekli değildir) ayarlamak için "SetEnv TZ Europe/Paris" gibi bir satır içeren .htacces dosyası eklemeyi deneyin
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Ekran etiketi
 Boxes=Ekran Etiketleri
 MaxNbOfLinesForBoxes=Ekran etiketleri için ençok satır sayısı
@@ -189,10 +190,10 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=İzinler
 BoxesDesc=Ekran etiketleri, sayfaları kişiselleştirmek için ekleyeceğiniz bazı bilgiler gösteren ekran araçlarıdır. Bu ekran etiketlerini gösterip göstermemeyi seçebilirsiniz ya da hedef sayfayı seçip 'Etkinleştir'e tıklayabilir ya da engellemek için çöp kutusuna tıklayabilirsiniz.
 OnlyActiveElementsAreShown=Yalnızca <ahref="modules.php">etkinleştirilmiş modüllerin</a> öğeleri gösterilmiştir.
-ModulesDesc=Dolibarr modülleri, yazılımda hangi özelliğin devreye alınacağını tanımlar. Modül devreye alındıktan sonra kullanıcıya bazı izinler vermeniz gerekir. Bir modülü/özelliği etkinleştirmek için aç/kapa düğmesini tıklayın.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=Internette dış web sitelerinde indirmek için daha çok modül bulabilirsiniz...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external modules...
+ModulesMarketPlaces=Dış modül bul...
 GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, Dolibarr ERP/CRM dış modülleri için resmi pazar yeri
 DoliPartnersDesc=İstek üzerine modül ve özellik geliştiren firmaların listesi. (Not: Açık kaynak kullanan PHP bilen herhangi bir firma size özel geliştirme hizmetleri sağlayabilir)
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Veritabanı parolaları conf.php de şifrelendir
 InstrucToEncodePass=Parolayı <b>conf.php</b> dosyasına kodlamak için <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b> satırını değiştirin
 InstrucToClearPass=Parolayı <b>conf.php</b> dosyasına kodlamak (temiz) için <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b> satırını değiştirin
 ProtectAndEncryptPdfFiles=Oluşturulan pdf dosyalarının korunması (Etkinleştirme önerilmez) toplu pdf oluşumunu bozar
-ProtectAndEncryptPdfFilesDesc=Bir PDF belgesinin korunması dosyanın herhangi bir PDF tarayıcısında okunmasını ve yazdırılmasını sağlar. Bundan düzenleme ve kopyalama olanaksızdır. Bu özelliği kulanmanın çalışmayan genel kümülatif pdf oluşturduğuna dikkat edin (ödenmemiş faturalar gibi).
+ProtectAndEncryptPdfFilesDesc=Bir PDF belgesinin korunması dosyanın herhangi bir PDF tarayıcısında okunmasını ve yazdırılmasını sağlar. Bundan düzenleme ve kopyalama yapmak olanaksızdır. Bu özelliği kulanmanın çalışmayan genel kümülatif pdf oluşturduğuna dikkat edin.
 Feature=Özellik
 DolibarrLicense=Lisans
 Developpers=Geliştiriciler/katılımcılar
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr çevrimiçi demo
 OfficialMarketPlace=Dış modüller/eklentiler için resmi Pazar yeri
 OfficialWebHostingService=Önerilen web barındırma servisleri (bulut barındırma)
 ReferencedPreferredPartners=Tercihli Ortaklar
-OtherResources=Diğer kaynaklar
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=Kullanıcıların ve geliştiricilerin belgeleri (Doc, FAQs…), <br>Dolibarr Wiki ye bir göz atın:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=Herhangi bir başka soru/yardım için Dolibarr forumunu kullanabilirsiniz:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Bu alan Dolibarr’dan Yardım destek hizmeti almanıza olanak sağlar.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=Unix gibi sistemlerde bu özellik yoktur.
 SubmitTranslation=Bu dil için çeviri tamamlanmamışsa ya da hatalar buluyorsanız, bunları <b>langs/%s</b> dizininde düzeltebilir ve değişikliklerinizi www.transifex.com/dolibarr-association/dolibarr/ a gönderebilirsiniz.
 SubmitTranslationENUS=Bu dil için çeviri tamamlanmamışsa ya da hatalar buluyorsanız, bunları <b>langs/%s</b> dizininde düzeltebilir ve değişikliklerinizi dolibarr.org/forum adresine veya geliştiriciler için github.com/Dolibarr/dolibarr adresine gönderebilirsiniz.
 ModuleSetup=Modül kurulumu
-ModulesSetup=Modüllerin kurulumu
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Sistem
 ModuleFamilyCrm=Müşteri İlişkileri Yönetimi (CRM)
 ModuleFamilySrm=Tefadrikçi İlişkileri Yönetimi (SRM)
@@ -284,30 +287,33 @@ ModuleFamilyInterface=Dış sistemli arayüzler
 MenuHandlers=Menü işlemcileri
 MenuAdmin=Menü düzenleyici
 DoNotUseInProduction=Üretimde kullanmayın
-ThisIsProcessToFollow=This is steps to process:
+ThisIsProcessToFollow=İşlem adımlarıdır:
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Adım %s
 FindPackageFromWebSite=İstediğiniz özelliği sağlayan bir paket bulun (örneğin; resmi web sitesinden %s).
 DownloadPackageFromWebSite=Paketi indir (örneğin resmi web sitesinden %s).
-UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInDolibarrRoot=Paket dosyalarını Dolibarr'da dış modüllere ayrılmış sunucu dizini içine ayıkla: <b>%s</b>
 UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <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>.
-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='http://myserver/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.
+SetupIsReadyForUse=Modül yerleşimi tamamlandı. Bununla birlikte, modül ayarları sayfasına giderek modülleri uygulamanızda etkinleştirmeli ve kurmalısınız: <a href="%s">%s</a>.
+NotExistsDirect=Alternatif kök dizin varolan bir dizine tanımlanmamış.<br>
+InfDirAlt=Sürüm 3 ten beri bir alternatif kök dizin tanımlanabiliyor. Bu sizin ayrılmış bir dizine, eklentiler ve özel şablonlar depolamanızı sağlar.<br>Yalnızca Dolibarr kökünde bir dizin oluşturun (örn. özel).<br>
+InfDirExample=<br>Sonra bunu <strong>conf.php</strong> dosyasında belirtin<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*Bu satırlar "#" karakteri ile yorumlanır, yorumu kaldırmak için sadece bu karakteri kaldırın.
 YouCanSubmitFile=Bu adımda paketi göndermek için kullanacağınız araç: Modül dosyasını seç
 CurrentVersion=Dolibarr geçerli sürümü
 CallUpdatePage=Veritabanı yapısını ve verileri güncelleyen sayfaya git: %s.
 LastStableVersion=Son kararlı sürüm
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Güncelleme sunucusu çevrimdışı
+WithCounter=Manage a counter
 GenericMaskCodes=Herhangi bir numaralandırma maskesi girebilirsiniz. Bu maskede alttaki etiketler kullanılabilir: <br><b>{000000}</ b> her %s te artırılacak bir numaraya karşılık gelir. Sayacın istenilen uzunluğu kadar çok sıfır girin. Sayaç, maskedeki kadar çok sayıda sıfır olacak şekilde soldan sıfırlarla tamamlanacaktır.<br><b>{000000+000}</b> önceki ile aynıdır fakat + işaretinin sağındaki sayıya denk gelen bir sapma ilk %s ten itibaren uygulanır.<br><b>{000000@x}</b> önceki ile aynıdır fakat sayaç x aya ulaşıldığında sıfırlanır (x= 1 ve 12 arasındadır veya yapılandırmada tanımlanan mali yılın ilk aylarını kullanmak için 0 dır). Bu seçenek kullanılırsa ve x= 2 veya daha yüksekse, {yyyy}{mm} veya {yyyy}{mm} dizisi de gereklidir.<br><b>{dd}</b> gün (01 ila 31).<br><b> {mm}</b> ay (01 ila 12).<br><b>{yy}</b>, <b>{yyyy}</b> veya <b>{y}</b> yıl 2, 4 veya 1 sayıları üzerindedir.<br>
-GenericMaskCodes2=<b>{cccc}</b> n Karakterdeki istemci kodu <br><b>{cccc000}</b> n Karakterdeki istemci kodu müşteri için özel bir sayaç tarafından takip edilmektedir. Müşteriye ayrılan bu sayaç, genel sayaçla aynı anda sıfırlanır.<br><b>{tttt}</b> n Karakterdeki üçüncü taraf türü kodu (bakınız sözlük-şirket türleri).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Maskede diğer tüm karakterler olduğu gibi kalır.<br>Boşluklara izin verilmez.<br>
-GenericMaskCodes4a=<u>Üçüncü partinin 99 uncu %s örneği Firma 2007/01/31 de yapıldı:</u><br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>2007/03/01 tarihinde oluşturulan üçüncü parti örneği:</u><br>
 GenericMaskCodes4c=<u>2007-03-01 de oluşturulan ürün için örnek:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b>, <b>ABC0701-000099</b> verecektir <br><b>{0000+100@1}-ZZZ/{dd}/XXX</b>, <b>0199-ZZZ/31/XXX</b> verecektir
+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=Tanımlı bir maskeye göre özelleştirilebilir bir sayı verir.
 ServerAvailableOnIPOrPort=Sunucu <b>%s</b> portundaki <b>%s</b> adresinde bulunur.
 ServerNotAvailableOnIPOrPort=Sunucu <b>%s</b> portundaki <b>%s</b> adresinde yoktur.
@@ -369,20 +375,22 @@ Int=Tam sayı
 Float=Kayan
 DateAndTime=Tarih ve saat
 Unique=Benzersiz
-Boolean=Matıksal (Onay kutusu)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Telefon
 ExtrafieldPrice = Fiyat
 ExtrafieldMail = Eposta
 ExtrafieldUrl = Url
 ExtrafieldSelect = Liste seç
 ExtrafieldSelectList = Tablodan seç
-ExtrafieldSeparator=Ayırıcı
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Parola
-ExtrafieldCheckBox=Onay kutusu
-ExtrafieldRadio=Onay düğmesi
-ExtrafieldCheckBoxFromList= Tablodan açılır kutu
+ExtrafieldRadio=Radio buttons (on choice only)
+ExtrafieldCheckBox=Checkboxes
+ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Bir nesneye bağlantı
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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
+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'
+ExtrafieldParamHelpselect=Parametre listesi anahtar,değer gibi olmalı, örneğin <br><br> : <br>1,değer1<br>2,değer2<br>3,değer3<br>...<br><br>Listenin başka bir tamamlayıcı nitelik listesine bağlı olmasını sağlamak için :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>Başka bir listeye bağlı bir liste elde etmek için\n:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parametre listesi anahtar.değer gibi olmalı, örneğin <br><br> : <br>1,değer1<br>2,değer2<br>3,değer3<br>...
 ExtrafieldParamHelpradio=Parametre listesi anahtar.değer gibi olmalı, örneğin <br><br> : <br>1,değer1<br>2,değer2<br>3,değer3<br>...
 ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
@@ -422,9 +430,23 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Tutar (vergi öncesi) bu tutardan yüksekse 3 aşamalı bir onaylama kullanın...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Alan
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Kullanıcılar & gruplar
-Module0Desc=Users / Employees and Groups management
+Module0Desc=Kullanıcı / Çalışan ve Grup Yönetimi
 Module1Name=Üçüncü partiler
 Module1Desc=Firma ve kişi yönetimi (müşteriler, adaylar…)
 Module2Name=Ticaret
@@ -444,7 +466,7 @@ Module30Desc=Müşteri faturaları ve iade faturaları yönetimi. Tedarikçi fat
 Module40Name=Tedarikçiler
 Module40Desc=Tedarikçi yönetimi ve satın alma (siparişler ve faturalar)
 Module42Name=Kütükler
-Module42Desc=Kütük özellikleri (dosya, syslog, ...)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Düzenleyiciler
 Module49Desc=Düzenleyici yönetimi
 Module50Name=Ürünler
@@ -499,8 +521,8 @@ Module410Name=Web Takvimi
 Module410Desc=WebT akvimi entegrasyonu
 Module500Name=Özel giderler
 Module500Desc=Özel giderlerin yönetimi (vergiler, sosyal ya da mali vergiler, kar payları)
-Module510Name=Çalışan sözleşmeleri ve ücretleri
-Module510Desc=Çalışanların sözleşme, ücret ve ödeme yönetimi
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Borç
 Module520Desc=Borçların yönetimi
 Module600Name=Duyurlar
@@ -525,8 +547,8 @@ Module2200Name=Dinamik Fiyatlar
 Module2200Desc=Fiyatlar için matematik ifadelerin kullanımını etkinleştir
 Module2300Name=Kron
 Module2300Desc=Planlı iş yönetimi
-Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Name=Etkinlik / Ajanda
+Module2400Desc=Geçmiş ve Gelecek Etkinlikleri izle. Uygulama kayıtlarının otomatik etkinlik takibi ya da el ile etkinlikleri takip et
 Module2500Name=Elektronik İçerik Yönetimi
 Module2500Desc=Belgeleri saklayın ve yönetin
 Module2600Name=API/Web hizmetleri (SOAP sunucusu)
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind dönüştürme becerileri
 Module3100Name=Skype
 Module3100Desc=Kullanıcı / üçüncü parti / kişi / üye kartlarına bir Skype düğmesi ekle
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=IK
-Module4000Desc=İnsan Kaynakları Yönetimi
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Çoklu-firma
 Module5000Desc=Birden çok firmayı yönetmenizi sağlar
 Module6000Name=İş akışı
@@ -591,7 +615,7 @@ Permission32=Ürün oluştur/düzenle
 Permission34=Ürün sil
 Permission36=Gizli ürünleri gör/yönet
 Permission38=Ürün dışaaktar
-Permission41=Proje ve görevleri oku (paylaşılan projeleri ve benim ilgilisi olduğum projeleri). Aynı zamanda verilen görevlerde harcanan süreleri de ekleyebilir (zaman çizelgeleri).
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Proje sil (paylaşılan projeler ve ilgilisi olduğum projeler)
 Permission45=Projeleri dışaaktar
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Sipariş yöntemleri
 DictionarySource=Teklifin/siparişin kökeni
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Hesap planı modelleri
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Eposta şablonları
 DictionaryUnits=Birimler
 DictionaryProspectStatus=Aday durumu
 DictionaryHolidayTypes=izin türleri
 DictionaryOpportunityStatus=Proje/aday için fırsat durumu
 SetupSaved=Kurulum kaydedildi
+SetupNotSaved=Setup not saved
 BackToModuleList=Modül listesine geri git
 BackToDictionaryList=Sözlük listesine dön
 VATManagement=KDV Yönetimi
@@ -921,7 +947,7 @@ Host=Sunucu
 DriverType=Sürücü türü
 SummarySystem=Sistem bilgileri özeti
 SummaryConst=Tüm Dolibarr kurulum parametreleri listesi
-MenuCompanySetup=Firma/Dernek
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= Standart menü yöneticisi
 DefaultMenuSmartphoneManager=Akıllı telefon (Smartphone) menü yöneticisi
 Skin=Dış görünüm teması
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Liste için varsayılan ençok uzunluk
 DefaultMaxSizeShortList=Kısa liste için ençok uzunluk (örn müşteri kartında)
 MessageOfDay=Günün mesajı
 MessageLogin=Oturum açma sayfası mesajı
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Sol menüdeki sabit arama formu
 DefaultLanguage=Kullanılan varsayılan dil (dil kodu)
 EnableMultilangInterface=Çoklu dil arayüzünü etkinleştir
 EnableShowLogo=Logoyu sol menüde göster
-CompanyInfo=Firma/dernek bilgileri
-CompanyIds=Firma/dernek kimlikleri
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=Adı
 CompanyAddress=Adresi
 CompanyZip=Posta Kodu
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Gecikmiş üyelik ücreti uyarısı öncesi süre tole
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Çek ödemesi uyarısı öncesi süre tolerans (gün olarak)
 Delays_MAIN_DELAY_EXPENSEREPORTS=Gider raporlarının onaylanmasından önceki uyarı için bekleme süresi (gün)
 SetupDescription1=Ayarlar alanı, Dolibarr'ı kullanmaya başlamadan önceki ilk parametre ayarları içindir.
-SetupDescription2=En önemli 2 ayarlama adımı sol ayarlar menüsündeki ilk 2 adımdır: Firma/dernek ayarları sayfası ve Modül kurulumu sayfası:
-SetupDescription3=<a href="%s">Ayarlar->Firma/dernek</a> menüsündeki parametreler gereklidir, çünkü giriş bilgileri Dolibarr ekranlarında ve Dolibarr’ın davranışlarını özelleştirmek üzere kullanılır (örneğin ülkenizle ilgili özellikler).
-SetupDescription4=<a href="%s">Ayarlar->Modüller</a> menüsündeki parametreler gereklidir, çünkü Dolibarr sabit bir ERP/CRM olmayıp bir çok modülden oluşur, daha çoğuna ya da daha azına bağımlıdır. Ancak istediğiniz modülleri etkinleştirdikten sonra özellikleri menülerde görebilirsiniz.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Diğer menü girişleri ile isteğe bağlı parametreleri yönetebilirsiniz.
 LogEvents=Güvenlik denetimi etkinlikleri
 Audit=Denetim
@@ -987,7 +1015,7 @@ BrowserOS=Tarayıcı OS
 ListOfSecurityEvents=Dolibarr güvenlik etkinlikleri listesi
 SecurityEventsPurged=Güvenlik etkinlikleri temizlendi
 LogEventDesc=Burada Dolibarr güvenlik etkinlikleri için günlük etkinleştirebilirsiniz. Yöneticiler sonra <b>Sistem araçları->Denetim</b> menüsünden içeriği görebilir. Uyarı, bu özellik veritabanında büyük miktarda veri tüketebilir.
-AreaForAdminOnly=Bu özellikler yalnız <b>yönetici kullanıcılar</b> tarafından kullanılabilir.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Sistem bilgileri sadece okuma modunda ve yöneticiler için görüntülenen çeşitli teknik bilgilerdir.
 SystemAreaForAdminOnly=Bu alan yalnız yönetici kullanıcılar için kullanılabilir. Hiçbir Dolibarr izini bu sınırı azaltamaz.
 CompanyFundationDesc=Bu sayfada yönetmek istediğiniz şirket veya dernekle ilgili bilinen bütün bilgileri düzenleyebilirsiniz. (Bunun için sayfanın en altındaki “Değiştir” ya da "Kaydet" düğmesine basın).
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Geçerli çeviri dizesi
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=Gösterilecek yeni çeviri dizesi
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Etkinleştirilmiş özel modül toplam sayısı: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists in any language files
+TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Enaz 1 modül etkinleştirmelisiniz
 ClassNotFoundIntoPathWarning=Sınıf %s PHP youlnda bulunamadı
 YesInSummer=Yazın evet
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Oturum depolaması Suhosin tarafından şifrelendi
 ConditionIsCurrently=Koşul şu anda %s durumunda
 YouUseBestDriver=Kullandığınız sürücü %s şu anda en iyi sürücüdür.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Uzman Kimliği kuralları
 MustBeUnique=Eşsiz olmalıdır?
 MustBeMandatory=Üçüncü tarafları oluşturmak zorunludur?
 MustBeInvoiceMandatory=Faturaları doğrulamak zorunludur ?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=<b>%s</b> biçimine göndermek için gerekli bağlantıyı aşağıdaki bağlantıdan bulabilirsiniz:%s
 ##### Invoices #####
 BillsSetup=Faturalar modülünün kurulumu
 BillsNumberingModule=Fatura ve iade faturaları numaralandırma modülü
 BillsPDFModules=Fatura belgesi modelleri
+PaymentsPDFModules=Payment documents models
 CreditNote=İade faturası
 CreditNotes=İade faturaları
 ForceInvoiceDate=Fatura tarihini fatura doğrulama tarihine zorla
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=%s türündeki dosyalar HTTP sunucusu tarafından önbelle
 FilesOfTypeCompressed=%s türündeki dosyalar HTTP sunucusu tarafından sıkıştırılır
 FilesOfTypeNotCompressed=%s türündeki dosyalar HTTP sunucusu tarafından sıkıştırılmaz
 CacheByServer=Sunucu önbelleği
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Tarayıcı önbelleği
 CompressionOfResources=HTTP yanıtlarının sıkıştırılması
+CompressionOfResourcesDesc=For exemple using the Apache directive "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Böyle bir otomatik algılama mevcut tarayıcılar için olası değildir
+DefaultValuesDesc=You can define/force here the default value you want to get when your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Ürünler modülü kurulumu
 ServiceSetup=Hizmetler modülü kurulumu
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Kullanılan fatura tarihi
 Buy=Satınal
 Sell=Sat
 InvoiceDateUsed=Kullanılan fatura tarihi
-YourCompanyDoesNotUseVAT=Firmanız (Giriş - Ayarlar - Firma/Dernek) KDV kullanmıyor olarak yapılandırılmış, bu nedenle ayarlama için herhangi bir KDV seçeneği belirlenmemiştir.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=Muhasebe Kodu
 AccountancyCodeSell=Satış hesap. kodu
 AccountancyCodeBuy=Alış hesap. kodu
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Gündem görünümü arama süzgeçinde, etkinlikle
 AGENDA_DEFAULT_VIEW=Gündem menüsünü seçtiğinizde varsayılan olarak hangi sekmenin açılmasını istiyorsunuz
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=TıklaAra modülü kurulumu
-ClickToDialUrlDesc=Telefon resmi üzerine tıklandığında Url aranır. URL’de aranan kişinin telefon numarası ile değişecek <br><b>__PHONETO__</b> etiketini kullanabilirsiniz
+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=Bu modül telefon numaralarının tıklanabilmesini sağlar. Bu simgeye tıklanma telefonunuz ile bu telefonun aranmasını sağlar. Bu işlem Dolibarr'dan bir çağrı merkezini aramak için kullanılır, örneğin SIP sisteminde bir telefon numarasının aranması.
 ClickToDialUseTelLink=Telefon numaraları üzerinde yalnızca bir "tel:" linki kullan
 ClickToDialUseTelLinkDesc=Eğer kullanıcılarınız bir softphone ya da web tarayıcıdan farklı olarak aynı bilgisayarda kurulu bir arayüz kullanıyorsa ve web tarayıcınızda "tel:" ile başlayan bir köprü tıklandığında aranıyorsa bu yöntemi kullanın. Tam bir sunucu çözümüne gereksiniminiz varsa (yerel yazılım kurulumu gereksinimi olmadan) bunu "HAYIR" olarak ayarlayın ve sonraki alanı doldurun.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP istemcileri isteklerini URL de varolan Dolibarr uç noktasına g
 ApiSetup=API modül ayarları
 ApiDesc=Bu modül etkinleştirilerek Dolibarr çeşitli web hizmetlerini sağlayan bir REST sunucusu haline getirilir.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=API leri url de keşfedebilirsiniz
+ApiExporerIs=You can explore and test the APIs at URL
 OnlyActiveElementsAreExposed=Yalnızca etkin modüllerdeki öğeler gösterilir
 ApiKey=API için anahtar
 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.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=Genel görüntüleme sırası
 BankOrderES=İspanyolca
 BankOrderESDesc=İspanyolca görüntüleme sırası
 ChequeReceiptsNumberingModule=Çek Makbuzu Numaralandırma modülü
-
 ##### Multicompany #####
 MultiCompanySetup=Çoklu şirket modülü kurulumu
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ BackupDumpWizard=Veritabanı yedekleme döküm dosyası oluşturma sihirbazı
 SomethingMakeInstallFromWebNotPossible=Web arayüzünden dış modül kurulumu aşağıdaki nedenden ötürü olanaksızdır:
 SomethingMakeInstallFromWebNotPossible2=Bu nedenle, burada anlatılan yükseltme işlemi yalnızca ayrıcalıklı bir kullanıcın elle atacağı adımlardır.
 InstallModuleFromWebHasBeenDisabledByFile=Dış modülün uygulama içerisinden kurulumu yöneticiniz tarafından engellenmiştir. Bu özelliğe izin verilmesi için ondan <strong>%s</strong> dosyasını kaldırmasını istemelisiniz.
-ConfFileMuseContainCustom=Installing 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=Tablo satırlarını fare üzerine geldiğinde vurgula
 HighlightLinesColor=Fare üzerinden geçerken satır rengini vurgula (vurgulanmaması için boş bırakın)
 TextTitleColor=Sayfa başlık rengi
 LinkColor=Bağlantıların rengi
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Yalnızca çekirdek temaları ile çalışır ancak dış temalar tarafından desteklenmez
 BackgroundColor=Arka plan rengi
 TopMenuBackgroundColor=Üst menü için arka plan rengi
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Enaz bildirim süresi (İzin isteğiniz bu süreden önce ya
 NbAddedAutomatically=Her ay (otomatik olarak) bu kullanıcının sayacına eklenen gün sayısı 
 EnterAnyCode=Bu alan satırın tanınması için bir referans içerir. Özel karakterler hariç seçeceğiniz herhangi bir değeri girebilirsiniz.
 UnicodeCurrency=Burada ayraçlar arasına para birimi simgesini belirten bayt sayısını girin. Örneğin: $ için [36] - Brezilya Real'i için [82,36] - € için [8364] girin
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Satırın kombo listesindeki konumu
 SellTaxRate=Satış vergisi oranı
 RecuperableOnly=Bazı Fransa eyaletlerinde geçerli olan "Non Perçue Récupérable" KDV için Evet, bütün diğer durumlar için "Hayır" girin.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=Çok firmalı modülü kullanıyorsanız, eğer
 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=Kullanıcının tanımlanmış izni yok
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/tr_TR/compta.lang b/htdocs/langs/tr_TR/compta.lang
index 38639e13bcc..1b11fd564c0 100644
--- a/htdocs/langs/tr_TR/compta.lang
+++ b/htdocs/langs/tr_TR/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Burada gösterilen tutarlar Firma ayarlar
 Param=Ayarlar
 RemainingAmountPayment=Kalan ödeme tutarı:
 Account=Hesap
-Accountparent=Ana hesap
-Accountsparent=Ana hesaplar
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=Gelir
 Outcome=Gider
 ReportInOut=Gelir/Gider
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Vergiler ve kar payları
 MenuSocialContributions=Sosyal/mali vergiler
 MenuNewSocialContribution=Yeni sosyal/mali
 NewSocialContribution=Yeni sosyal/mali vergi
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Ödenecek sosyal/mali vergiler
 AccountancyTreasuryArea=Muhasebe/Maliye alanı
 NewPayment=Yeni ödeme
@@ -134,8 +135,8 @@ RulesResultDue=- Ödenmemiş faturaları, giderleri ve KDV ni, ödenmiş ya da 
 RulesResultInOut=- Faturalarda, giderlerde, KDV inde ve maaşlarda yapılan gerçek ödemeleri içerir. <br>- Faturaların, giderleri, KDV nin ve maaşların ödeme tarihleri baz alınır. Bağışlar için bağış tarihi.
 RulesCADue=- ödenmiş ya da ödenmemiş olsun müşterilere ait faturaları içerir. <br>- Bu faturaların doğrulama tarihi baz alınır.<br>
 RulesCAIn=- Müşterilerden alınan tüm geçerli fatura ödemelerini içerir.<br>- Bu faturaların ödenme tarihleri baz alınır<br>
-DepositsAreNotIncluded=- Teminat faturalarını içermez
-DepositsAreIncluded=- Teminat faturalarını içerir
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Üçüncü parti IRPF Raporu
 LT1ReportByCustomersInInputOutputModeES=RE Üçüncü partiye göre rapor
 VATReport=KDV raporu
@@ -169,7 +170,7 @@ DescSellsJournal=Satış Günlüğü
 DescPurchasesJournal=Alış Günlüğü
 InvoiceRef=Fatura ref.
 CodeNotDef=Tanımlanmamış
-WarningDepositsNotIncluded=Teminat faturaları bu muhasebe modülü ile bu sürümde içerilmez.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Ödeme koşulu tarihi nesnenin tarihinden düşük olamaz.
 Pcg_version=Chart of accounts models
 Pcg_type=Pcg türü
@@ -189,8 +190,10 @@ AccountancyJournal=Muhasebe kodu günlüğü
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Sosyal/mali vergi kopyala
 ConfirmCloneTax=Sosyal/mali vergi ödemesi kopyalamasını onayla
 CloneTaxForNextMonth=Sonraki aya kopyala
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Sosyal/mali vergiler
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Hata: Banka hesabı bulunamadı
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/tr_TR/cron.lang b/htdocs/langs/tr_TR/cron.lang
index 43d9ce91177..ca6d8f33249 100644
--- a/htdocs/langs/tr_TR/cron.lang
+++ b/htdocs/langs/tr_TR/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Planlı işleri sil
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Planlı işleri yükle
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Planlı iş modülü planlanmış işlerin yürütülmesini sağlar
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=İş
 CronNone=Hiçbiri
 CronDtStart=Bundan önce değil
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Etkin
 CronStatusInactiveBtn=Engelle
 CronTaskInactive=Bu iş devre dışı
 CronId=Kimlik
-CronClassFile=Sınıflar (dosyaadı.sınıf.php)
-CronModuleHelp=Dolibarr modül dizini adı (aynı zamanda dış Dolibarr modülü ile de çalışır). <BR> Örneğin; Dolibarr Ürün nesnesi alım yöntemi /htdocs/<u>product</u>/class/product.class.php, modül değeri <i>product</i>
-CronClassFileHelp=Yüklenecek dosya adı. <BR> Örneğin; Dolibarr Ürün nesnesi alım yöntemi /htdocs/product/class/<u>product.class.php</u>, sınıf dosya adı değeri <i>product.class.php</i>
-CronObjectHelp=Yüklenecek nesne adı. <BR> Örneğin; Dolibarr Ürün nesnesi alım yöntemi /htdocs/product/class/product.class.php, sınıf dosya adı değeri <i>Product</i>
-CronMethodHelp=Çalıştırılacak nesne yöntemi. <BR> Örneğin; Dolibarr Ürün nesnesi alım yöntemi /htdocs/product/class/product.class.php, yöntem değeri <i>fecth</i>
-CronArgsHelp=Yöntem parametreleri. <BR> Örneğin; Dolibarr Ürün nesnesi alım yöntemi /htdocs/product/class/product.class.php, parametre değerleri <i>0, ProductRef</i> olabilir
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=Yürütülecek sistem komut satırı.
 CronCreateJob=Yeni Planlı İş oluştur
 CronFrom=Gönderen
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Planlı işleri görmek ve düzenlemek için "Gi
 JobDisabled=İş engellendi
 MakeLocalDatabaseDumpShort=Yerel veritabanı yedeklemesi
 MakeLocalDatabaseDump=Yerel bir veritabanı dökümü oluştur
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang
index 287807daf9b..ba98a1ea218 100644
--- a/htdocs/langs/tr_TR/errors.lang
+++ b/htdocs/langs/tr_TR/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile='<b>%s</b>' dosyası oluşturulamadı
 ErrorFailToRenameDir='<b>%s</b>' dizinin adı '<b>%s</b>' olarak değiştirilemedi.
 ErrorFailToCreateDir='<b>%s</b>' dizini oluşturulamadı
 ErrorFailToDeleteDir='<b>%s</b>' dizini silinemedi
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=Bu kişi zaten bu tür için kişi olarak tanımlıdır.
 ErrorCashAccountAcceptsOnlyCashMoney=Bu banka hesabı kasa hesabı lduğundan yalnızca nakit ödemeleri kabul eder.
 ErrorFromToAccountsMustDiffers=Kaynak ve hedef banka hesapları farklı olmalıdır.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=%s dizinine yazılamadı
 ErrorFoundBadEmailInFile=Dosyada %s satır hatalı e-posta sözdizimi bulundu (örneğin eposta=%s teki satır %s)
 ErrorUserCannotBeDelete=Kullanıcı silinemez. Belki Dolibarr öğeleri ile ilişkili olabilir.
 ErrorFieldsRequired=Bazı gerekli alanlar doldurulmamış.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Dizin oluşturulamadı. Web sunucusu kullanıcısının Dolibarr belgeleri dizinine yazma izinlerini denetleyin. Eğer bu parametre <b>guvenli_mod</b> bu PHP üzerinde etkinleştirilmişse, Dolibarr php dosyalarının web sunucusu kullanıcısına (ya da grubuna) sahip olduğunu denetleyin.
 ErrorNoMailDefinedForThisUser=Bu kullanıcı için tanımlı posta yok
 ErrorFeatureNeedJavascript=Bu özelliğin çalışması için JavaScriptin etkinleştirilmesi gerekir. Bunu Kurulum - Ekran menüsünden değiştirebilirsiniz.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Müşteri faturasındaki kalem miktarı
 ErrorWebServerUserHasNotPermission=Web sunucusunu çalıştırmak için kullanılan <b>%s</b> kullanıcı hesabnın bunun için izni yok
 ErrorNoActivatedBarcode=Etkinleştirilmiş barkod türü yok
 ErrUnzipFails=% ZipArchive ile sıkıştırılamıyor
-ErrNoZipEngine=Bu PHP deki %s dosyası ayıklamak için motor yok
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=Bu %s dosyası bir Dolibarr zip paketi olmalıdır
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=PHP CURL kurulu değil, Bu PayPal ile iletişim kurmak için gereklidir
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=Seçilmiş genel değişken yok
 ErrorFieldMustBeANumeric=<b>%s</b> alanı sayısal bir değer olmalıdır
 ErrorMandatoryParametersNotProvided=Zorunlu parametre(ler) girilmemiş
 ErrorOppStatusRequiredIfAmount=Bu fırsat/aday için tahmini bir tutar ayarladınız. Durumunu da girmelisiniz
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Modül Tanımlayıcıda hatalı Menu Dizisi tanımı (fk_menu anahtarı için hatalı değer)
 ErrorSavingChanges=Değişiklikler kaydedilirken bir hata oluştu
 ErrorWarehouseRequiredIntoShipmentLine=Depo gemi hattı üzerinde gerekli
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=Modül dosyası bulunamadı.
-ErrorFieldAccountNotDefinedForBankLine=Kaynak bankanın %s satırı için Muhasebe hesabı değeri tanımlanmamış
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # Warnings
 WarningPasswordSetWithNoAccount=Bu üye için bir parola ayarlıdır. Ancak, hiçbir kullanıcı hesabı oluşturulmamıştır. Yani bu şifre saklanır ama Dolibarr'a giriş için kullanılamaz. Dış bir modül/arayüz tarafından kullanılıyor olabilir, ama bir üye için ne bir kullanıcı adı ne de parola tanımlamanız gerekmiyorsa "Her üye için bir kullanıcı adı yönet" seçeneğini devre dışı bırakabilirsiniz. Bir kullanıcı adı yönetmeniz gerekiyorsa ama herhangi bir parolaya gereksinim duymuyorsanız bu uyarıyı engellemek için bu alanı boş bırakabilirsiniz. Not: Eğer bir üye bir kullanıcıya bağlıysa kullanıcı adı olarak eposta adresi de kullanılabilir.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Ödeme tarihi (%s) fatura tarihinden (%s)
 WarningTooManyDataPleaseUseMoreFilters=Çok fazla veri (%s değerinden fazla satır). Daha çok süzgeç kullanın ya da %s değişmezini daha yüksek bir sınıra getirin.
 WarningSomeLinesWithNullHourlyRate=Saatlik ücretleri tanımlanmadığında bazen bazı kullanıcılar tarafından kayıt edilir. Saat başına 0 %s değeri kullanılmıştır ancak harcanan sürenin yanlış değerlendirilmesine neden olabilir.
 WarningYourLoginWasModifiedPleaseLogin=Kullanıcı adınız değiştirilmiştir. Güvenlik nedeniyle sonraki eyleminiz için yeni kullanıcı adınızla giriş yapmalısınız.
+WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang
index 7c8aaeea585..5648b017065 100644
--- a/htdocs/langs/tr_TR/main.lang
+++ b/htdocs/langs/tr_TR/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=%s Parametresi tanımlı değil
 ErrorUnknown=Bilinmeyen hata
 ErrorSQL=SQL Hatası
 ErrorLogoFileNotFound='%s' Logo dosyası bulunamadı
-ErrorGoToGlobalSetup='Firma/Dernek' ayarlarına giderek düzeltiniz.
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=Bunu düzeltmek için Modül Kurulumuna git
 ErrorFailedToSendMail=Posta gönderilemedi (gönderen)
 ErrorFileNotUploaded=Dosya gönderilemedi. Boyutun izin verilen ençok dosya boyutunu aşmadığını denetleyin, bu dizinde yeterli boş alan olmalı ve aynı isimde başka bir dosya olmamalı.
@@ -153,6 +153,7 @@ Edit=Düzenle
 Validate=Doğrula
 ValidateAndApprove=Doğrula ve onayla
 ToValidate=Doğrulanacak
+NotValidated=Not validated
 Save=Kaydet
 SaveAs=Farklı kaydet
 TestConnection=Deneme bağlantısı
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=Kimlik denetimi modu <b>%s</b> için uygulanabilir b
 Connection=Bağlan
 Setup=Ayarlar
 Alert=Uyarı
+MenuWarnings=Uyarılar
 Previous=Önceki
 Next=Sonraki
 Cards=Kartlar
@@ -308,6 +310,7 @@ Copy=Kopyala
 Paste=Yapıştır
 Default=Varsayılan
 DefaultValue=Varsayılan değer
+DefaultValues=Default values
 Price=Fiyat
 UnitPrice=Birim fiyat
 UnitPriceHT=Birim fiyat (net)
@@ -363,7 +366,8 @@ VATRate=KDV Oranı
 Average=Ortalama
 Sum=Toplam
 Delta=Değişim oranı
-Module=Modül
+Module=Module/Application
+Modules=Modules/Applications
 Option=Seçenek
 List=Liste
 FullList=Tüm liste
@@ -387,7 +391,7 @@ ActionRunningNotStarted=Başlayacak
 ActionRunningShort=In progress
 ActionDoneShort=Bitti
 ActionUncomplete=Tamamlanmamış
-CompanyFoundation=Firma/Dernek
+CompanyFoundation=Company/Organisation
 ContactsForCompany=Bu üçüncü partinin kişileri
 ContactsAddressesForCompany=Bu üçüncü partinin kişleri/adresleri
 AddressesForCompany=Bu üçüncü partinin adresleri
@@ -405,8 +409,9 @@ Generate=Oluştur
 Duration=Süre
 TotalDuration=Toplam süre
 Summary=Özet
-DolibarrStateBoard=İstatistikler
-DolibarrWorkBoard=İş görevleri panosu
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=Mevcut
 NotYetAvailable=Henüz mevcut değil
 NotAvailable=Uygun değil
@@ -453,6 +458,7 @@ NextStep=Sonraki adım
 Datas=Veriler
 None=Hiçbiri
 NoneF=Hiçbiri
+NoneOrSeveral=None or several
 Late=Son
 LateDesc=Bir kayıdın sizin ayarlarınıza dayanarak gecikmiş olduğu ya da olmadığını tanımlayabilmek için gerekli süre. Yöneticinizden Giriş - Ayarlar - Uyarılar menüsünden süreyi değiştirmesini isteyin.
 Photo=Resim
@@ -606,7 +612,8 @@ PartialWoman=Kısmi
 TotalWoman=Toplam
 NeverReceived=Hiç alınmadı
 Canceled=Vazgeçildi
-YouCanChangeValuesForThisListFromDictionarySetup=Bu listedeki değerleri ayarlar - sözlük menüsünden değiştirebilirsiniz
+YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu Setup - Dictionaries
+YouCanChangeValuesForThisListFrom=You can change values for this list from menu %s
 YouCanSetDefaultValueInModuleSetup=Modül ayarlarında yeni bir kayıt oluştururken kullanılacak varsayılan değeri belirleybilirsiniz
 Color=Renk
 Documents=Bağlı dosyalar
@@ -642,6 +649,7 @@ FreeLineOfType=Türe göre serbest giriş
 CloneMainAttributes=Nesneyi ana öznitelikleri ile klonla
 PDFMerge=PDF Birleştir
 Merge=Birleştir
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Yazdırılıcak Sayfanın ana içerik alanını göster
 MenuManager=Menu yöneticisi
 WarningYouAreInMaintenanceMode=Uyarı, bakım modundasınız, şu anda uygulamayı kullanmak için yalnızca <b>%s</b> girişine izin veriliyor.
@@ -708,6 +716,7 @@ from=itibaren
 toward=yönünde
 Access=Erişim
 SelectAction=Eylem seç
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Panoya kopyalamak için Crtl+C
 SaveUploadedFileWithMask=Dosyayı "<strong>%s</strong>" adlı sunucuya kaydedin (aksi durumda "%s")
 OriginFileName=Özgün dosya adı
@@ -718,7 +727,7 @@ ViewPrivateNote=Notları izle
 XMoreLines=%s gizli satır
 PublicUrl=Genel URL
 AddBox=Kutu ekle
-SelectElementAndClickRefresh=Bir öğe seçin ve Yenile'ye tıkla
+SelectElementAndClick=Select an element and click %s
 PrintFile=%s Dosyasını Yazdır
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Logoyu değiştirmek için Giriş - Ayarlar - Firma menüsüne ya da gizlemek için Giriş - Ayarlar - Ekran menüsüne git.
@@ -734,8 +743,8 @@ Hello=Merhaba
 Sincerely=Saygılar
 DeleteLine=Satır sil
 ConfirmDeleteLine=Bu satırı silmek istediğinizden emin misiniz?
-NoPDFAvailableForDocGenAmongChecked=Kontrol edilen kayıtlar arasında belge oluşturmak için hiç PDF yok
-TooManyRecordForMassAction=Toplu işlem için çok sayıda kayıt seçilmiş. Bu işlem %s kayıtlık bir liste ile sınırlıdır.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Toplu işlemler tarafından yapılan dosyalar için alan
 ShowTempMassFilesArea=Toplu işlemler tarafından yapılan dosyalar alanını göster
@@ -755,11 +764,20 @@ Calendar=Takvim
 GroupBy=Gruplandır...
 ViewFlatList=Düz listeyi incele
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Mali yıl
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Pazartesi
 Tuesday=Salı
@@ -817,5 +835,3 @@ SearchIntoContracts=Sözleşmeler
 SearchIntoCustomerShipments=Müşteri sevkiyatları
 SearchIntoExpenseReports=Gider raporları
 SearchIntoLeaves=İzinler
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/tr_TR/other.lang b/htdocs/langs/tr_TR/other.lang
index 05f824dab00..87915753874 100644
--- a/htdocs/langs/tr_TR/other.lang
+++ b/htdocs/langs/tr_TR/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Doğumgünü tarihi
 DateToBirth=Doğum Tarihi
 BirthdayAlertOn=doğum günü uyarısı etkin
 BirthdayAlertOff=doğumgünü uyarısı etkin değil
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Müdahaleye kişi eklendi
 Notify_FICHINTER_VALIDATE=Müdahale doğrulandı
 Notify_FICHINTER_SENTBYMAIL=Müdahale posta ile gönderildi
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=Bu bir <b>deneme</b> postası (deneme sözcüğü koyu ol
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nFaturanız ektedir  __REF__\n\n__PERSONALIZED__Saygılarımızla\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nFaturanızın __REF__ ödenmemiş olarak göründüğünü size anımsatmak isteriz. Bu yüzden bu faturanız anımsatmak amacıyla yeniden eklenmiştir.\n\n__PERSONALIZED__Saygılarımızla\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nTeklifiniz bilgilerinize sunulmuştur __PROPREF__\n\n__PERSONALIZED__Saygılarımızla\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nFiyat isteğini burada görebilirsiniz __ASKREF__\n\n__PERSONALIZED__Saygılarımızla\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nSiparişiniz buradadır __ORDERREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nSiparişimiz buradadır __ORDERREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nFaturanız ektedir  __REF__\n\n__PERSONALIZED__Saygılarımızla\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nSevkiyatınız bilgilerinize sunulmuştur __SHIPPINGREF__\n\n__PERSONALIZED__Saygılarımızla\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nMüdahale bilgilerinize sunulmuştur __FICHINTERREF__\n\n__PERSONALIZED__Saygılarımızla\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n__PERSONALIZED__\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=İşlemlerinize uyan demo profilini seçin...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Kimlik doğrulama modu <b>%s</b>.<br /
 EnableGDLibraryDesc=Bu seçeneği kullanmak için PHP nizdeki GD kütüphanesini kurun ya da etkinleştirin.
 ProfIdShortDesc=<b>Uzman no %s</b> üçüncü parti ülkesine bağlı bir bilgidir.<br>Örneğin, <b>%s</b> ülkesi için kodu<b>%s</b>dir.
 DolibarrDemo=Dolibarr ERP/CRM demosu
-StatsByNumberOfUnits=Sayı olarak ürün/hizmet birimleri istatistikleri
-StatsByNumberOfEntities=Sayı olarak ilgili varlıkların istatistikleri
-NumberOfProposals=Son 12 aydaki teklif sayısı
-NumberOfCustomerOrders=Son 12 aydaki müşteri siparişlerinin sayısı
-NumberOfCustomerInvoices=Son 12 aydaki müşteri faturalarının sayısı
-NumberOfSupplierProposals=Son 12 aydaki tedarikçi tekliflerinin sayısı
-NumberOfSupplierOrders=Son 12 aydaki tedarikçi siparişlerinin sayısı
-NumberOfSupplierInvoices=Son 12 aydaki tedarikçi faturalarının sayısı
-NumberOfUnitsProposals=Son 12 aydaki birimlerin sayısı
-NumberOfUnitsCustomerOrders=Son 12 aydaki müşteri siparişlerindeki birimlerin sayısı
-NumberOfUnitsCustomerInvoices=Son 12 aydaki müşteri faturalarındaki birimlerin sayısı
-NumberOfUnitsSupplierProposals=Son 12 aydaki tedarikçi tekliflerindeki birimlerin sayısı
-NumberOfUnitsSupplierOrders=Son 12 aydaki tedarikçi siparişlerindeki birimlerin sayısı
-NumberOfUnitsSupplierInvoices=Son 12 aydaki tedarikçi faturalarındaki birimlerin sayısı
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=Bir yeni müdahale olan %s size atandı
 EMailTextInterventionValidated=Müdahele %s doğrulanmıştır.
 EMailTextInvoiceValidated=Fatura %s doğrulanmıştır.
diff --git a/htdocs/langs/tr_TR/projects.lang b/htdocs/langs/tr_TR/projects.lang
index 3e029dde645..59f9e0a087a 100644
--- a/htdocs/langs/tr_TR/projects.lang
+++ b/htdocs/langs/tr_TR/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Projeler Alanı
 ProjectStatus=Proje durumu
 SharedProject=Herkes
 PrivateProject=Proje ilgilileri
+ProjectsImContactFor=Projects I'm explicitely a contact of
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=Tüm projeler
 MyProjectsDesc=Bu görünüm ilgilisi olduğunuz projelerle sınırlıdır (türü ne olursa olsun).
 ProjectsPublicDesc=Bu görünüm okuma izininiz olan tüm projeleri içerir.
 TasksOnProjectsPublicDesc=Bu görünüm okuma izininiz olan tüm projeleri içerir.
@@ -23,6 +26,7 @@ TasksDesc=Bu görünüm tüm projeleri ve görevleri içerir (size verilen kulla
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=Yeni proje
 AddProject=Proje oluştur
 DeleteAProject=Bir proje sil
@@ -31,12 +35,13 @@ ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
 OpenedProjects=Açık projeler
 OpenedTasks=Açık görevler
-OpportunitiesStatusForOpenedProjects=Durumuna göre açık projelerin fırsat tutarı
+OpportunitiesStatusForOpenedProjects=Projelerin durumuna göre fırsat tutarı
 OpportunitiesStatusForProjects=Projelerin durumuna göre fırsat tutarı
 ShowProject=Proje göster
 SetProject=Proje ayarla
 NoProject=Tanımlı ya da sahip olunan hiçbir proje yok
 NbOfProjects=Proje sayısı
+NbOfTasks=Nb of tasks
 TimeSpent=Harcanan süre
 TimeSpentByYou=Tarafınızdan harcanan süre
 TimeSpentByUser=Kullanıcı tarafından harcanan süre
@@ -49,7 +54,7 @@ TaskTimeNote=Not
 TaskTimeDate=Tarih
 TasksOnOpenedProject=Açık projelerdeki görevler
 WorkloadNotDefined=İşyükü tanımlanmamış
-NewTimeSpent=Yeni harcanan süre
+NewTimeSpent=Harcanan süre
 MyTimeSpent=Harcadığım sürelerim
 Tasks=Görevler
 Task=Görev
@@ -59,6 +64,7 @@ TaskDescription=Görev açıklaması
 NewTask=Yeni görev
 AddTask=Görev oluştur
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Etkinlik
 Activities=Görevler/etkinlikler
 MyActivities=Görevlerim/etkinliklerim
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Proje ile ilgili sözleşmelerin listesi
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=Proje ile ilgili müdahalelerin listesi
 ListExpenseReportsAssociatedProject=Bu proje ile ilişkili gider raporları listesi
 ListDonationsAssociatedProject=Bu proje ile ilişkilendirilmiş bağış listesi
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Proje ilgilileri
 ActionsOnProject=Proje etkinlikleri
 YouAreNotContactOfProject=Bu özel projenin bir ilgilisi değilsiniz
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Harcana süre sil
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=Bana atanmamış görevleri de göster
@@ -110,7 +118,7 @@ TaskRessourceLinks=Kaynaklar
 ProjectsDedicatedToThisThirdParty=Bu üçüncü parti atanmış projeler
 NoTasks=Bu proje için hiçbir görev yok
 LinkedToAnotherCompany=Diğer üçüncü partiye bağlantılı
-TaskIsNotAffectedToYou=Sana atanmamış görevler
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=Harcanan süre boş
 ThisWillAlsoRemoveTasks=Bu eylem aynı zamanda projenin tüm görevlerini (şu andaki <b>%s</b> görevleri) ve tüm harcanan süre girişlernii siler .
 IfNeedToUseOhterObjectKeepEmpty=Eğer bazı nesneler başka bir üçüncü partiye aitse  (fatura, sipariş, ...), oluşturulması  için bu projeye bağlanmalıdır, projenin birden çok üçüncü partiye bağlı olması için bunu boş bırakın.
@@ -161,25 +169,30 @@ FirstAddRessourceToAllocateTime=Zaman tahsisi için göreve bir kullanıcı kayn
 InputPerDay=Günlük giriş
 InputPerWeek=Haftalık giriş
 InputPerAction=Eylem başına giriş
-TimeAlreadyRecorded=Bu görev ve kullanıcı %s için harcanan süre zaten kayıtlı
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=İlgili olarak bu kullanıcı olan projeler
 TasksWithThisUserAsContact=Bu kullanıcıya atanmış görevler
 ResourceNotAssignedToProject=Projeye atanmamış
 ResourceNotAssignedToTheTask=Bu göreve atanmamış
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Görevi bana ata
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Ata
 ProjectOverview=Genel bakış
 ManageTasks=Görev ve süre izlemek için projeleri kullan
 ManageOpportunitiesStatus=Adayları/fırsatları izlemek için projeleri kullan
 ProjectNbProjectByMonth=Aylık oluşturulan proje sayısı
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Aylık fırsat tutarı
 ProjectWeightedOppAmountOfProjectsByMonth=Aylık fırsat ağırlıklı tutarı
 ProjectOpenedProjectByOppStatus=Fırsat durumuna göre açık proje/aday
 ProjectsStatistics=Projeler/adaylar için istatistikler
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Atanan görevler. Bu göreve süre girmek mümkün olmalı.
 IdTaskTime=Görev zamanı kimliği
 YouCanCompleteRef=Eğer referansı bazı bilgilerle tamamlamak isterseniz (arama süzgeçleri olarak kullanmak üzere), ayırmak için bir - karakteri eklemeniz önerilir, böylece otomatik numaralandırma sonraki projeler için de çalışacaktır. Örneğin; %s-ABC. Etikete arama anahtarları da eklemeyi yeğleyebilirsiniz. Ama en iyisi özel bir alan olarak da adlandırılan tamamlayıcı özellikler eklemek olabilir.
-OpenedProjectsByThirdparties=Üçüncü partiye göre açık projeler
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Yalnızca fırsatlar
 OpenedOpportunitiesShort=Açık fırsatlar
 NotAnOpportunityShort=Bir fırsat değil
diff --git a/htdocs/langs/uk_UA/accountancy.lang b/htdocs/langs/uk_UA/accountancy.lang
index 4c2336b97b0..31b54e83c5b 100644
--- a/htdocs/langs/uk_UA/accountancy.lang
+++ b/htdocs/langs/uk_UA/accountancy.lang
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=General ledger
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
@@ -132,19 +140,19 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=List of the accounting accounts
 
 Pcgtype=Class of account
-Pcgsubtype=Under class of account
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Code
+Nature=Nature
+AccountingJournalType1=Various operation
+AccountingJournalType2=Sales
+AccountingJournalType3=Purchases
+AccountingJournalType4=Bank
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Exports
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index b3725c985c4..0e12f44d409 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=Internal users
 ExternalUsers=External users
 GUISetup=Display
 SetupArea=Setup area
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form to test file upload (according to setup)
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
@@ -85,7 +86,7 @@ Mask=Mask
 NextValue=Next value
 NextValueForInvoices=Next value (invoices)
 NextValueForCreditNotes=Next value (credit notes)
-NextValueForDeposit=Next value (deposit)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Next value (replacements)
 MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to <b>%s</b> %s, whatever this parameter's value is
 NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
@@ -103,7 +104,7 @@ MenuIdParent=Parent menu ID
 DetailMenuIdParent=ID of parent menu (empty for a top menu)
 DetailPosition=Sort number to define menu position
 AllMenus=Всі
-NotConfigured=Module not configured
+NotConfigured=Module/Application not configured
 Active=Active
 SetupShort=Setup
 OtherOptions=Other options
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Thousand separator
 Destination=Destination
 IdModule=Module ID
 IdPermissions=Permissions ID
-Modules=Modules
 LanguageBrowserParameter=Parameter %s
 LocalisationDolibarrParameters=Localisation parameters
 ClientTZ=Client Time Zone (user)
@@ -123,7 +123,8 @@ PHPTZ=PHP server Time Zone
 DaylingSavingTime=Daylight saving time
 CurrentHour=PHP Time (server)
 CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max number of lines for widgets
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activat
 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 (Activated 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 make building of a global cumulated pdf not working (like unpaid invoices).
+ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature makes building of a global merged PDFs not working.
 Feature=Feature
 DolibarrLicense=License
 Developpers=Developers/contributors
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr online demo
 OfficialMarketPlace=Official market place for external modules/addons
 OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
 ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your
 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/
 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 setup
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Update server offline
+WithCounter=Manage a counter
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
 ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
 ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
@@ -369,19 +375,21 @@ Int=Integer
 Float=Float
 DateAndTime=Date and hour
 Unique=Unique
-Boolean=Boolean (Checkbox)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Phone
 ExtrafieldPrice = Price
 ExtrafieldMail = Email
 ExtrafieldUrl = Url
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Password
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldRadio=Radio buttons (on 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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Field
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=Invoice and credit note management for customers. Invoice managemen
 Module40Name=Suppliers
 Module40Desc=Supplier management and buying (orders and invoices)
 Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Products
@@ -499,8 +521,8 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Оповіщення
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
-Module4000Desc=Human resources management
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow
@@ -591,7 +615,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects i'm contact for)
 Permission45=Export projects
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Emails templates
 DictionaryUnits=Units
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Setup saved
+SetupNotSaved=Setup not saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
 VATManagement=VAT Management
@@ -921,7 +947,7 @@ Host=Server
 DriverType=Driver type
 SummarySystem=System information summary
 SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Foundation
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= Standard menu manager
 DefaultMenuSmartphoneManager=Smartphone menu manager
 Skin=Skin theme
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Default max length for lists
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=Message of the day
 MessageLogin=Login page message
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/foundation information
-CompanyIds=Company/foundation identities
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=Name
 CompanyAddress=Address
 CompanyZip=Zip
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Other menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Audit
@@ -987,7 +1015,7 @@ BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
 LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists 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
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Rules on Professional Ids
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####
 BillsSetup=Invoices module setup
 BillsNumberingModule=Invoices and credit notes numbering model
 BillsPDFModules=Invoice documents models
+PaymentsPDFModules=Payment documents models
 CreditNote=Кредитове авізо
 CreditNotes=Кредитове авізо
 ForceInvoiceDate=Force invoice date to validation date
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
 FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
 FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
 CacheByServer=Cache by server
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
+CompressionOfResourcesDesc=For exemple 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 your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Products module setup
 ServiceSetup=Services module setup
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Invoice date used
 Buy=Buy
 Sell=Sell
 InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=Accountancy Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+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 your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
+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.
 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 same computer than 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.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+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.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=General display order
 BankOrderES=Іспанська
 BankOrderESDesc=Spanish display order
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ 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.
 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.
-ConfFileMuseContainCustom=Installing 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)
 TextTitleColor=Color of page title
 LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/uk_UA/compta.lang b/htdocs/langs/uk_UA/compta.lang
index 9ce9af8bff6..71427bfd4e7 100644
--- a/htdocs/langs/uk_UA/compta.lang
+++ b/htdocs/langs/uk_UA/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using r
 Param=Setup
 RemainingAmountPayment=Amount payment remaining :
 Account=Account
-Accountparent=Account parent
-Accountsparent=Accounts parent
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=Income
 Outcome=Expense
 ReportInOut=Income / Expense
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Taxes and dividends
 MenuSocialContributions=Social/fiscal taxes
 MenuNewSocialContribution=New social/fiscal tax
 NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Accountancy/Treasury area
 NewPayment=New payment
@@ -134,8 +135,8 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from clients.<br>- It is based on the payment date of these invoices<br>
-DepositsAreNotIncluded=- Deposit invoices are nor included
-DepositsAreIncluded=- Deposit invoices are included
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
 VATReport=VAT report
@@ -169,7 +170,7 @@ DescSellsJournal=Sales Journal
 DescPurchasesJournal=Purchases Journal
 InvoiceRef=Invoice ref.
 CodeNotDef=Not defined
-WarningDepositsNotIncluded=Deposits invoices are not included in this version with this accountancy module.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
 Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
@@ -189,8 +190,10 @@ AccountancyJournal=Accountancy code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/uk_UA/cron.lang b/htdocs/langs/uk_UA/cron.lang
index 5c3ecd0a53f..d59dd3c965c 100644
--- a/htdocs/langs/uk_UA/cron.lang
+++ b/htdocs/langs/uk_UA/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allow to execute job that have been planned
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Job
 CronNone=None
 CronDtStart=Not before
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
-CronClassFile=Classes (filename.class.php)
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=Продавець
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/uk_UA/errors.lang b/htdocs/langs/uk_UA/errors.lang
index 9e2eb6817ef..feada2d1b5a 100644
--- a/htdocs/langs/uk_UA/errors.lang
+++ b/htdocs/langs/uk_UA/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
 ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
 ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
 ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
 ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Some required fields were not filled.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoice
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # 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.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice
 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/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang
index 6f0fce5cf10..daf29f55264 100644
--- a/htdocs/langs/uk_UA/main.lang
+++ b/htdocs/langs/uk_UA/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=Параметр %s не було визначено
 ErrorUnknown=Невідома помилка
 ErrorSQL=Помилка SQL
 ErrorLogoFileNotFound=Файл логотипу '%s' не знайдено
-ErrorGoToGlobalSetup=Перейти до налаштувань 'Компанія/Організація', щоб це виправити
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=Перейти до Модулю налаштувань, щоб це виправити
 ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
 ErrorFileNotUploaded=Файл не завантажений. Переконайтеся, що розмір не перевищує максимально допустимий, що достатньо вільного місця на диску і що не існує вже файл з таким же ім'ям в цій директорії.
@@ -153,6 +153,7 @@ Edit=Edit
 Validate=Validate
 ValidateAndApprove=Validate and Approve
 ToValidate=На підтвердженні
+NotValidated=Not validated
 Save=Save
 SaveAs=Save As
 TestConnection=Test connection
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=No applicative disconnect feature with authenticatio
 Connection=Connection
 Setup=Setup
 Alert=Alert
+MenuWarnings=Alerts
 Previous=Previous
 Next=Next
 Cards=Cards
@@ -308,6 +310,7 @@ Copy=Copy
 Paste=Paste
 Default=Default
 DefaultValue=Default value
+DefaultValues=Default values
 Price=Price
 UnitPrice=Unit price
 UnitPriceHT=Unit price (net)
@@ -363,7 +366,8 @@ VATRate=Tax Rate
 Average=Average
 Sum=Sum
 Delta=Delta
-Module=Module
+Module=Module/Application
+Modules=Modules/Applications
 Option=Option
 List=List
 FullList=Full list
@@ -387,7 +391,7 @@ ActionRunningNotStarted=To start
 ActionRunningShort=In progress
 ActionDoneShort=Finished
 ActionUncomplete=Uncomplete
-CompanyFoundation=Company/Foundation
+CompanyFoundation=Company/Organisation
 ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
@@ -405,8 +409,9 @@ Generate=Generate
 Duration=Duration
 TotalDuration=Total duration
 Summary=Summary
-DolibarrStateBoard=Statistics
-DolibarrWorkBoard=Work tasks board
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=Available
 NotYetAvailable=Not yet available
 NotAvailable=Not available
@@ -434,7 +439,7 @@ Reportings=Reporting
 Draft=Проект
 Drafts=Drafts
 Validated=Підтверджений
-Opened=Opened
+Opened=Open
 New=New
 Discount=Знижка
 Unknown=Невизначена
@@ -453,6 +458,7 @@ NextStep=Next step
 Datas=Data
 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.
 Photo=Picture
@@ -606,7 +612,8 @@ PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
 Canceled=Canceled
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
+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
 Color=Color
 Documents=Linked files
@@ -642,6 +649,7 @@ FreeLineOfType=Free entry of type
 CloneMainAttributes=Clone object with its main attributes
 PDFMerge=PDF Merge
 Merge=Merge
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Show page to print main content area
 MenuManager=Menu manager
 WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only login <b>%s</b> is allowed to use application at the moment.
@@ -708,6 +716,7 @@ from=from
 toward=toward
 Access=Access
 SelectAction=Select action
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
 SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
 OriginFileName=Original filename
@@ -718,7 +727,7 @@ ViewPrivateNote=View notes
 XMoreLines=%s line(s) hidden
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
+SelectElementAndClick=Select an element and click %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
@@ -734,8 +743,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
@@ -755,11 +764,20 @@ Calendar=Календар
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -817,5 +835,3 @@ SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/uk_UA/other.lang b/htdocs/langs/uk_UA/other.lang
index ab937ff3bab..b151614ce3c 100644
--- a/htdocs/langs/uk_UA/other.lang
+++ b/htdocs/langs/uk_UA/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=Date of birth
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Statistics in number of products/services units
-StatsByNumberOfEntities=Statistics in number of referring entities
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=The intervention %s has been validated.
 EMailTextInvoiceValidated=The invoice %s has been validated.
diff --git a/htdocs/langs/uk_UA/projects.lang b/htdocs/langs/uk_UA/projects.lang
index 8227ed550d9..86c9a21346f 100644
--- a/htdocs/langs/uk_UA/projects.lang
+++ b/htdocs/langs/uk_UA/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
 PrivateProject=Project contacts
+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 (whatever is the type).
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=New project
 AddProject=Create project
 DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Opened projects
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
 SetProject=Set project
 NoProject=No project defined or owned
 NbOfProjects=Nb of projects
+NbOfTasks=Nb of tasks
 TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
@@ -47,9 +52,9 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
-NewTimeSpent=New time spent
+NewTimeSpent=Time spent
 MyTimeSpent=My time spent
 Tasks=Tasks
 Task=Task
@@ -59,6 +64,7 @@ TaskDescription=Task description
 NewTask=New task
 AddTask=Create task
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Activity
 Activities=Tasks/activities
 MyActivities=My tasks/activities
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=List of contracts associated with the project
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
 ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
@@ -110,7 +118,7 @@ TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
-TaskIsNotAffectedToYou=Task not assigned to you
+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.
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
 ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/uz_UZ/accountancy.lang b/htdocs/langs/uz_UZ/accountancy.lang
index 4c2336b97b0..31b54e83c5b 100644
--- a/htdocs/langs/uz_UZ/accountancy.lang
+++ b/htdocs/langs/uz_UZ/accountancy.lang
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=General ledger
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
@@ -132,19 +140,19 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=List of the accounting accounts
 
 Pcgtype=Class of account
-Pcgsubtype=Under class of account
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Code
+Nature=Nature
+AccountingJournalType1=Various operation
+AccountingJournalType2=Sales
+AccountingJournalType3=Purchases
+AccountingJournalType4=Bank
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Exports
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index 9602601e241..6851d698625 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=Internal users
 ExternalUsers=External users
 GUISetup=Display
 SetupArea=Setup area
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form to test file upload (according to setup)
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
@@ -85,7 +86,7 @@ Mask=Mask
 NextValue=Next value
 NextValueForInvoices=Next value (invoices)
 NextValueForCreditNotes=Next value (credit notes)
-NextValueForDeposit=Next value (deposit)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Next value (replacements)
 MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to <b>%s</b> %s, whatever this parameter's value is
 NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
@@ -103,7 +104,7 @@ MenuIdParent=Parent menu ID
 DetailMenuIdParent=ID of parent menu (empty for a top menu)
 DetailPosition=Sort number to define menu position
 AllMenus=All
-NotConfigured=Module not configured
+NotConfigured=Module/Application not configured
 Active=Active
 SetupShort=Setup
 OtherOptions=Other options
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Thousand separator
 Destination=Destination
 IdModule=Module ID
 IdPermissions=Permissions ID
-Modules=Modules
 LanguageBrowserParameter=Parameter %s
 LocalisationDolibarrParameters=Localisation parameters
 ClientTZ=Client Time Zone (user)
@@ -123,7 +123,8 @@ PHPTZ=PHP server Time Zone
 DaylingSavingTime=Daylight saving time
 CurrentHour=PHP Time (server)
 CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max number of lines for widgets
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activat
 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 (Activated 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 make building of a global cumulated pdf not working (like unpaid invoices).
+ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature makes building of a global merged PDFs not working.
 Feature=Feature
 DolibarrLicense=License
 Developpers=Developers/contributors
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr online demo
 OfficialMarketPlace=Official market place for external modules/addons
 OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
 ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your
 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/
 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 setup
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Update server offline
+WithCounter=Manage a counter
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
 ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
 ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
@@ -369,19 +375,21 @@ Int=Integer
 Float=Float
 DateAndTime=Date and hour
 Unique=Unique
-Boolean=Boolean (Checkbox)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Phone
 ExtrafieldPrice = Price
 ExtrafieldMail = Email
 ExtrafieldUrl = Url
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Password
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldRadio=Radio buttons (on 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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Field
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=Invoice and credit note management for customers. Invoice managemen
 Module40Name=Suppliers
 Module40Desc=Supplier management and buying (orders and invoices)
 Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Products
@@ -499,8 +521,8 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Notifications
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
-Module4000Desc=Human resources management
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow
@@ -591,7 +615,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects i'm contact for)
 Permission45=Export projects
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Emails templates
 DictionaryUnits=Units
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Setup saved
+SetupNotSaved=Setup not saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
 VATManagement=VAT Management
@@ -921,7 +947,7 @@ Host=Server
 DriverType=Driver type
 SummarySystem=System information summary
 SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Foundation
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= Standard menu manager
 DefaultMenuSmartphoneManager=Smartphone menu manager
 Skin=Skin theme
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Default max length for lists
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=Message of the day
 MessageLogin=Login page message
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/foundation information
-CompanyIds=Company/foundation identities
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=Name
 CompanyAddress=Address
 CompanyZip=Zip
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Other menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Audit
@@ -987,7 +1015,7 @@ BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
 LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists 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
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Rules on Professional Ids
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####
 BillsSetup=Invoices module setup
 BillsNumberingModule=Invoices and credit notes numbering model
 BillsPDFModules=Invoice documents models
+PaymentsPDFModules=Payment documents models
 CreditNote=Credit note
 CreditNotes=Credit notes
 ForceInvoiceDate=Force invoice date to validation date
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
 FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
 FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
 CacheByServer=Cache by server
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
+CompressionOfResourcesDesc=For exemple 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 your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Products module setup
 ServiceSetup=Services module setup
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Invoice date used
 Buy=Buy
 Sell=Sell
 InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=Accountancy Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+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 your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
+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.
 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 same computer than 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.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+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.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=General display order
 BankOrderES=Spanish
 BankOrderESDesc=Spanish display order
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ 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.
 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.
-ConfFileMuseContainCustom=Installing 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)
 TextTitleColor=Color of page title
 LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/uz_UZ/compta.lang b/htdocs/langs/uz_UZ/compta.lang
index 5e9814369ec..94a3bd671ef 100644
--- a/htdocs/langs/uz_UZ/compta.lang
+++ b/htdocs/langs/uz_UZ/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using r
 Param=Setup
 RemainingAmountPayment=Amount payment remaining :
 Account=Account
-Accountparent=Account parent
-Accountsparent=Accounts parent
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=Income
 Outcome=Expense
 ReportInOut=Income / Expense
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Taxes and dividends
 MenuSocialContributions=Social/fiscal taxes
 MenuNewSocialContribution=New social/fiscal tax
 NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Accountancy/Treasury area
 NewPayment=New payment
@@ -134,8 +135,8 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from clients.<br>- It is based on the payment date of these invoices<br>
-DepositsAreNotIncluded=- Deposit invoices are nor included
-DepositsAreIncluded=- Deposit invoices are included
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
 VATReport=VAT report
@@ -169,7 +170,7 @@ DescSellsJournal=Sales Journal
 DescPurchasesJournal=Purchases Journal
 InvoiceRef=Invoice ref.
 CodeNotDef=Not defined
-WarningDepositsNotIncluded=Deposits invoices are not included in this version with this accountancy module.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
 Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
@@ -189,8 +190,10 @@ AccountancyJournal=Accountancy code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/uz_UZ/cron.lang b/htdocs/langs/uz_UZ/cron.lang
index b1e8bcb36d2..245fefe7af1 100644
--- a/htdocs/langs/uz_UZ/cron.lang
+++ b/htdocs/langs/uz_UZ/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allow to execute job that have been planned
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Job
 CronNone=None
 CronDtStart=Not before
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
-CronClassFile=Classes (filename.class.php)
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=From
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/uz_UZ/errors.lang b/htdocs/langs/uz_UZ/errors.lang
index 9e2eb6817ef..feada2d1b5a 100644
--- a/htdocs/langs/uz_UZ/errors.lang
+++ b/htdocs/langs/uz_UZ/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
 ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
 ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
 ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
 ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Some required fields were not filled.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoice
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # 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.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice
 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/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang
index b93c4e1e8dc..788a10d92f0 100644
--- a/htdocs/langs/uz_UZ/main.lang
+++ b/htdocs/langs/uz_UZ/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=Parameter %s not defined
 ErrorUnknown=Unknown error
 ErrorSQL=SQL Error
 ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=Go to Module setup to fix this
 ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
 ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
@@ -153,6 +153,7 @@ Edit=Edit
 Validate=Validate
 ValidateAndApprove=Validate and Approve
 ToValidate=To validate
+NotValidated=Not validated
 Save=Save
 SaveAs=Save As
 TestConnection=Test connection
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=No applicative disconnect feature with authenticatio
 Connection=Connection
 Setup=Setup
 Alert=Alert
+MenuWarnings=Alerts
 Previous=Previous
 Next=Next
 Cards=Cards
@@ -308,6 +310,7 @@ Copy=Copy
 Paste=Paste
 Default=Default
 DefaultValue=Default value
+DefaultValues=Default values
 Price=Price
 UnitPrice=Unit price
 UnitPriceHT=Unit price (net)
@@ -363,7 +366,8 @@ VATRate=Tax Rate
 Average=Average
 Sum=Sum
 Delta=Delta
-Module=Module
+Module=Module/Application
+Modules=Modules/Applications
 Option=Option
 List=List
 FullList=Full list
@@ -387,7 +391,7 @@ ActionRunningNotStarted=To start
 ActionRunningShort=In progress
 ActionDoneShort=Finished
 ActionUncomplete=Uncomplete
-CompanyFoundation=Company/Foundation
+CompanyFoundation=Company/Organisation
 ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
@@ -405,8 +409,9 @@ Generate=Generate
 Duration=Duration
 TotalDuration=Total duration
 Summary=Summary
-DolibarrStateBoard=Statistics
-DolibarrWorkBoard=Work tasks board
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=Available
 NotYetAvailable=Not yet available
 NotAvailable=Not available
@@ -434,7 +439,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Opened
+Opened=Open
 New=New
 Discount=Discount
 Unknown=Unknown
@@ -453,6 +458,7 @@ NextStep=Next step
 Datas=Data
 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.
 Photo=Picture
@@ -606,7 +612,8 @@ PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
 Canceled=Canceled
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
+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
 Color=Color
 Documents=Linked files
@@ -642,6 +649,7 @@ FreeLineOfType=Free entry of type
 CloneMainAttributes=Clone object with its main attributes
 PDFMerge=PDF Merge
 Merge=Merge
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Show page to print main content area
 MenuManager=Menu manager
 WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only login <b>%s</b> is allowed to use application at the moment.
@@ -708,6 +716,7 @@ from=from
 toward=toward
 Access=Access
 SelectAction=Select action
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
 SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
 OriginFileName=Original filename
@@ -718,7 +727,7 @@ ViewPrivateNote=View notes
 XMoreLines=%s line(s) hidden
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
+SelectElementAndClick=Select an element and click %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
@@ -734,8 +743,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
@@ -755,11 +764,20 @@ Calendar=Calendar
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -817,5 +835,3 @@ SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/uz_UZ/other.lang b/htdocs/langs/uz_UZ/other.lang
index ab937ff3bab..b151614ce3c 100644
--- a/htdocs/langs/uz_UZ/other.lang
+++ b/htdocs/langs/uz_UZ/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=Date of birth
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Statistics in number of products/services units
-StatsByNumberOfEntities=Statistics in number of referring entities
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=The intervention %s has been validated.
 EMailTextInvoiceValidated=The invoice %s has been validated.
diff --git a/htdocs/langs/uz_UZ/projects.lang b/htdocs/langs/uz_UZ/projects.lang
index f9c603ce113..f40af2b963b 100644
--- a/htdocs/langs/uz_UZ/projects.lang
+++ b/htdocs/langs/uz_UZ/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
 PrivateProject=Project contacts
+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 (whatever is the type).
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=New project
 AddProject=Create project
 DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Opened projects
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
 SetProject=Set project
 NoProject=No project defined or owned
 NbOfProjects=Nb of projects
+NbOfTasks=Nb of tasks
 TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
@@ -47,9 +52,9 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
-NewTimeSpent=New time spent
+NewTimeSpent=Time spent
 MyTimeSpent=My time spent
 Tasks=Tasks
 Task=Task
@@ -59,6 +64,7 @@ TaskDescription=Task description
 NewTask=New task
 AddTask=Create task
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Activity
 Activities=Tasks/activities
 MyActivities=My tasks/activities
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=List of contracts associated with the project
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
 ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
@@ -110,7 +118,7 @@ TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
-TaskIsNotAffectedToYou=Task not assigned to you
+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.
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
 ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/vi_VN/accountancy.lang b/htdocs/langs/vi_VN/accountancy.lang
index 998a2808d5f..d0a0c29f2ed 100644
--- a/htdocs/langs/vi_VN/accountancy.lang
+++ b/htdocs/langs/vi_VN/accountancy.lang
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=Thêm một tài khoản kế toán
 AccountAccounting=Tài khoản kế toán
 AccountAccountingShort=Tài khoản
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=Sổ cái tổng hợp
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Bán tạp chí
@@ -132,19 +140,19 @@ Sens=Sens
 Codejournal=Tạp chí
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Thẻ ghi nợ và tín dụng không thể có một giá trị cùng một lúc
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=Danh sách các tài khoản kế toán
 
 Pcgtype=Lớp tài khoản
-Pcgsubtype=Trong lớp học của các tài khoản
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Lợi nhuận tổng doanh thu
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Lỗi, bạn không thể xóa tài khoản kế toán này bởi vì nó được sử dụng
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Mã
+Nature=Tự nhiên
+AccountingJournalType1=Various operation
+AccountingJournalType2=Bán
+AccountingJournalType3=Mua
+AccountingJournalType4=Ngân hàng
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Xuất khẩu
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index a9b49d488ba..b07d3372ad3 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=Người dùng bên trong
 ExternalUsers=Người dùng bên ngoài
 GUISetup=Hiển thị
 SetupArea=Khu vực thiết lập
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Mẫu để thử nghiệm việc tải lên tập tin (dựa theo thiết lập)
 IfModuleEnabled=Ghi chú: Yes chỉ có tác dụng nếu module <b>%s</b> được mở
 RemoveLock=Loại bỏ tập tin <b>%s</b> nếu tập tin này cho phép sử dụng công cụ cập nhật.
@@ -85,7 +86,7 @@ Mask=Mặt nạ
 NextValue=Giá trị tiếp theo
 NextValueForInvoices=Giá trị tiếp theo (hóa đơn)
 NextValueForCreditNotes=Giá trị tiếp theo (giấy báo có)
-NextValueForDeposit=Giá trị tiếp theo (tiền ứng trước)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Giá trị tiếp theo (thay thế)
 MustBeLowerThanPHPLimit=Ghi chú: PHP của bạn giới hạn kích thước của tập tin tải lên là <b>%s</b>%s, cho dù giá trị thông số phần này là
 NoMaxSizeByPHPLimit=Ghi chú: Không có giới hạn được chỉnh sửa trong phần chỉnh sửa PHP
@@ -103,7 +104,7 @@ MenuIdParent=ID menu chính
 DetailMenuIdParent=ID menu chính (rỗng nếu là menu gốc)
 DetailPosition=Sắp xếp chữ số để xác định vị trí menu
 AllMenus=Tất cả
-NotConfigured=Module chưa được cấu hình
+NotConfigured=Module/Application not configured
 Active=Kích hoạt
 SetupShort=Cài đặt
 OtherOptions=Tùy chọn khác
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Phân cách phần ngàn
 Destination=Đích đến
 IdModule=ID module
 IdPermissions=ID phân quyền
-Modules=Module
 LanguageBrowserParameter=Thông số %s
 LocalisationDolibarrParameters=Thông số địa phương hóa
 ClientTZ=Time Zone khách hàng (người sử dụng)
@@ -123,7 +123,8 @@ PHPTZ=PHP server Time Zone
 DaylingSavingTime=Daylight saving time
 CurrentHour=PHP Time (server)
 CurrentSessionTimeOut=Thời hạn phiên làm việc hiện tại
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max number of lines for widgets
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Phân quyền
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Chỉ có các yếu tố từ <a href="%s">module kích hoạt</a> được hiển thị.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Cơ sở dữ liệu mật khẩu được mã h
 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 (Activated 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 make building of a global cumulated pdf not working (like unpaid invoices).
+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=Đặc tính
 DolibarrLicense=Giấy phép
 Developpers=Người phát triển/cộng tác viên
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr demo trực tuyến
 OfficialMarketPlace=Thị trường chính thức cho các module/addon bên ngoài
 OfficialWebHostingService=Dịch vụ lưu trữ web được tham chiếu (Cloud hosting)
 ReferencedPreferredPartners=Đối tác ưu tiên
-OtherResources=Autres ressources
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=Tính năng không có sẵn trên Unix như hệ th
 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/
 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=Cài đặt module
-ModulesSetup=Cài đặt module
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Hệ thống
 ModuleFamilyCrm=Quản lý quan hệ khách hàng (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=Phiên bản hiện tại Dolibarr
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Cập nhật server offline
+WithCounter=Manage a counter
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
 ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
 ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
@@ -369,19 +375,21 @@ Int=Integer
 Float=Float
 DateAndTime=Date and hour
 Unique=Unique
-Boolean=Boolean (Checkbox)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Phone
 ExtrafieldPrice = Giá
 ExtrafieldMail = Email
 ExtrafieldUrl = Url
 ExtrafieldSelect = Lựa chọn danh sách
 ExtrafieldSelectList = Chọn từ bảng
-ExtrafieldSeparator=Separator
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Mật khẩu
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox từ bảng
+ExtrafieldRadio=Radio buttons (on choice only)
+ExtrafieldCheckBox=Checkboxes
+ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Liên kết với một đối tượng
+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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Dòng
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Người dùng & nhóm
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=Quản lý hóa đơn và giấy báo có cho khách hàng. Quản
 Module40Name=Nhà cung cấp
 Module40Desc=Quản lý nhà cung cấp và mua hàng (đơn hàng và hoá đơn)
 Module42Name=Nhật trình
-Module42Desc=Nhật trình thiết bị (file, nhật trình hệ thống, ...)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Biên tập
 Module49Desc=Quản lý biên tập
 Module50Name=Sản phẩm
@@ -499,8 +521,8 @@ Module410Name=Lịch trên web
 Module410Desc=Tích hợp lịch trên web
 Module500Name=Chi phí đặc biệt
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Cho vay
 Module520Desc=Quản lý cho vay
 Module600Name=Thông báo
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
-Module4000Desc=Human resources management
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Đa công ty
 Module5000Desc=Cho phép bạn quản lý đa công ty
 Module6000Name=Quy trình làm việc
@@ -591,7 +615,7 @@ Permission32=Tạo/chỉnh sửa sản phẩm
 Permission34=Xóa sản phẩm
 Permission36=Xem/quản lý sản phẩm ẩn
 Permission38=Xuất dữ liệu sản phẩm
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Xóa dự án (dự án chia sẻ và các dự án tôi liên lạc)
 Permission45=Export projects
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Phương thức đặt hàng
 DictionarySource=Chứng từ gốc của đơn hàng đề xuất/đơn hàng
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Kiểu biểu đồ tài khoản
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Mẫu email
 DictionaryUnits=Đơn vị
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Cài đặt đã lưu
+SetupNotSaved=Setup not saved
 BackToModuleList=Trở lại danh sách module
 BackToDictionaryList=Trở lại danh sách từ điển
 VATManagement=Quản lý thuế VAT
@@ -921,7 +947,7 @@ Host=Máy chủ
 DriverType=Driver type
 SummarySystem=Tóm tắt thông tin hệ thống
 SummaryConst=Danh sách của tất cả các thông số cài đặt Dolibarr
-MenuCompanySetup=Công ty/Tổ chức
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= Quản lý menu chuẩn
 DefaultMenuSmartphoneManager=Quản lý menu smartphone
 Skin=Chủ đề giao diện
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Default max length for lists
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=Tin trong ngày
 MessageLogin=Tin trang đăng nhập
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Forrm tìm kiếm cố định trên menu bên trái
 DefaultLanguage=Ngôn ngữ mặc định để sử dụng (mã ngôn ngữ)
 EnableMultilangInterface=Kích hoạt giao diện đa ngôn ngữ
 EnableShowLogo=Hiển thị logo trên menu bên trái
-CompanyInfo=Thông tin Công ty/Tổ chức
-CompanyIds=Xác định Công ty/Tổ chức
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=Tên
 CompanyAddress=Địa chỉ
 CompanyZip=Zip
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Khoảng trì hoãn (theo ngày) trước khi cảnh b
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Khoảng trì hoãn (theo ngày) trước khi cảnh báo đối với séc ứng trước để làm
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Thông số tùy chọn quản lý thông tin menu đầu vào khác
 LogEvents=Sự kiện kiểm toán bảo mật
 Audit=Kiểm toán
@@ -987,7 +1015,7 @@ BrowserOS=Trình duyệt hệ điều hành
 ListOfSecurityEvents=Danh sách các sự kiện bảo mật Dolibarr
 SecurityEventsPurged=Sự kiện bảo mật được thanh lọc
 LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Những tính năng này có thể được sử dụng bởi những <b>người dùng quản trị.</b>
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Hệ thống thông tin là thông tin kỹ thuật linh tinh bạn nhận được trong chế độ chỉ đọc và có thể nhìn thấy chỉ cho quản trị viên.
 SystemAreaForAdminOnly=Khu vực này hiện có sẵn cho những người dùng quản trị. Không ai trong số phân quyền Dolibarr có thể làm giảm giới hạn này.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists in any language files
+TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Bạn phải có ít nhất 1 mô-đun cho phép
 ClassNotFoundIntoPathWarning=Lớp %s không tìm thấy con đường vào PHP
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Điều kiện là hiện tại %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Rules on Professional Ids
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Một liên kết xuất dữ liệu sang định dạng <b>%s</b> có sẵn tại liên kết sau đây: %s
 ##### Invoices #####
 BillsSetup=Cài đặt module hóa đơn
 BillsNumberingModule=Mô hình đánh số Hoá đơn và giấy báo có
 BillsPDFModules=Mô hình chứng từ hóa đơn
+PaymentsPDFModules=Payment documents models
 CreditNote=Lưu ý tín dụng
 CreditNotes=Giấy báo có
 ForceInvoiceDate=Buộc ngày hóa đơn là ngày xác nhận
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
 FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
 FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
 CacheByServer=Cache by server
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
+CompressionOfResourcesDesc=For exemple 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 your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Cài đặt module sản phẩm
 ServiceSetup=Cài đặt module dịch vụ
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Ngày hóa đơn được dùng
 Buy=Mua
 Sell=Bán
 InvoiceDateUsed=Ngày hóa đơn được dùng
-YourCompanyDoesNotUseVAT=Công ty của bạn đã được xác định không sử dụng thuế VAT (Trang chủ - Cài đặt - Công ty / Tổ chức), vì vậy không có tùy chọn để cài đặt thuế VAT.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=Mã kế toán
 AccountancyCodeSell=Mã kế toán bán hàng
 AccountancyCodeBuy=Mã kế toán mua hàng
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Thiết lập tự động trạng thái này cho c
 AGENDA_DEFAULT_VIEW=Tab mà bạn muốn mở mặc định khi lựa chọn menu chương trình nghị sự
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+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 your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
+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.
 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 same computer than 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.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+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.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=Thứ tự hiển thị chung
 BankOrderES=Tây Ban Nha
 BankOrderESDesc=Thứ tự hiển thị tiếng Tây Ban Nha
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=Thiết lập mô-đun đa công ty
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ BackupDumpWizard=Thủ thuật tạo file dump sao lưu dự phòng cơ sở d
 SomethingMakeInstallFromWebNotPossible=Cài đặt module bên ngoài là không thể từ giao diện web với các lý do sau:
 SomethingMakeInstallFromWebNotPossible2=Vì lý do này, quá trình nâng cấp để mô tả ở đây là chỉ là bước thủ công một người dùng có đặc quyền có thể làm.
 InstallModuleFromWebHasBeenDisabledByFile=Cài đặt các module bên ngoài từ các ứng dụng đã bị vô hiệu bởi quản trị viên của bạn. Bạn phải yêu cầu ông phải loại bỏ các tập tin <strong>%s</strong> để cho phép tính năng này.
-ConfFileMuseContainCustom=Installing 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)
 TextTitleColor=Color of page title
 LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/vi_VN/compta.lang b/htdocs/langs/vi_VN/compta.lang
index 2ce9d4799df..41d427301b1 100644
--- a/htdocs/langs/vi_VN/compta.lang
+++ b/htdocs/langs/vi_VN/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Lượng hiển thị ở đây được
 Param=Thiết lập
 RemainingAmountPayment=Thanh toán số tiền còn lại:
 Account=Tài khoản
-Accountparent=Mẹ tài khoản
-Accountsparent=Tài khoản mẹ
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=Thu nhập
 Outcome=Chi phí
 ReportInOut=Thu nhập / chi phí
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Thuế và cổ tức
 MenuSocialContributions=Social/fiscal taxes
 MenuNewSocialContribution=New social/fiscal tax
 NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Kế toán / Tài chính khu vực
 NewPayment=Thanh toán mới
@@ -134,8 +135,8 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- Nó bao gồm tất cả các khoản thanh toán có hiệu quả các hóa đơn nhận được từ khách hàng. <br> - Nó được dựa trên ngày thanh toán các hoá đơn <br>
-DepositsAreNotIncluded=- Hóa đơn tiền gửi cũng không được bao gồm
-DepositsAreIncluded=- Hóa đơn tiền gửi mới có
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Báo cáo của bên thứ ba IRPF
 LT1ReportByCustomersInInputOutputModeES=Báo cáo của bên thứ ba RE
 VATReport=VAT report
@@ -169,7 +170,7 @@ DescSellsJournal=Tạp chí Kinh doanh
 DescPurchasesJournal=Mua Tạp chí
 InvoiceRef=Ref hóa đơn.
 CodeNotDef=Không xác định
-WarningDepositsNotIncluded=Tiền gửi hoá đơn không được bao gồm trong phiên bản này với các phân hệ kế toán này.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Ngày thanh toán hạn không thể thấp hơn so với ngày đối tượng.
 Pcg_version=Chart of accounts models
 Pcg_type=PCG loại
@@ -189,8 +190,10 @@ AccountancyJournal=Đang kế toán tạp chí
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Sao chép nó vào tháng tới
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/vi_VN/cron.lang b/htdocs/langs/vi_VN/cron.lang
index c3c615b9722..497f2b24b2c 100644
--- a/htdocs/langs/vi_VN/cron.lang
+++ b/htdocs/langs/vi_VN/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allow to execute job that have been planned
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Công việc
 CronNone=Không
 CronDtStart=Not before
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Kích hoạt
 CronStatusInactiveBtn=Vô hiệu hoá
 CronTaskInactive=Công việc này bị vô hiệu hóa
 CronId=Id
-CronClassFile=Lớp học (filename.class.php)
-CronModuleHelp=Tên của thư mục module Dolibarr (cũng làm việc với mô-đun Dolibarr bên ngoài). <BR> Đối với exemple phương pháp của Dolibarr đối tượng sản phẩm / htdocs / <u>sản phẩm</u> /class/product.class.php lấy, giá trị của mô-đun là <i>sản phẩm</i>
-CronClassFileHelp=Tên tập tin để tải. <BR> Đối với exemple phương pháp của Dolibarr đối tượng sản phẩm / htdocs / sản phẩm / lớp / <u>product.class.php</u> lấy, giá trị của tên tập tin lớp học là <i>product.class.php</i>
-CronObjectHelp=Tên đối tượng để tải. <BR> Đối với exemple phương pháp của Dolibarr đối tượng sản phẩm /htdocs/product/class/product.class.php lấy, giá trị của tên tập tin lớp học là <i>sản phẩm</i>
-CronMethodHelp=Phương pháp đối tượng để khởi động. <BR> Đối với exemple phương pháp của Dolibarr đối tượng sản phẩm /htdocs/product/class/product.class.php lấy, giá trị của phương pháp là <i>fecth</i>
-CronArgsHelp=Các đối số phương pháp. <BR> Đối với exemple phương pháp của Dolibarr đối tượng sản phẩm /htdocs/product/class/product.class.php lấy, giá trị của paramters có thể là <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=Các dòng lệnh hệ thống để thực thi.
 CronCreateJob=Create new Scheduled Job
 CronFrom=Từ
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/vi_VN/errors.lang b/htdocs/langs/vi_VN/errors.lang
index 8d2ddf5ad2c..5cb5d29384c 100644
--- a/htdocs/langs/vi_VN/errors.lang
+++ b/htdocs/langs/vi_VN/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Không thể tạo tập tin <b>'% s'.</b>
 ErrorFailToRenameDir=Không thể đổi tên thư mục <b>'% s'</b> vào <b>'% s'.</b>
 ErrorFailToCreateDir=Không thể tạo thư mục <b>'% s'.</b>
 ErrorFailToDeleteDir=Không thể xóa thư mục <b>'% s'.</b>
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=Liên hệ này đã được xác định là liên lạc cho loại hình này.
 ErrorCashAccountAcceptsOnlyCashMoney=Tài khoản ngân hàng Đây là một tài khoản tiền mặt, vì vậy nó chấp nhận thanh toán các loại chỉ tiền mặt.
 ErrorFromToAccountsMustDiffers=Nguồn tài khoản ngân hàng và các mục tiêu phải khác.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Không thể viết trong thư mục% s
 ErrorFoundBadEmailInFile=Tìm thấy cú pháp email không chính xác cho% s dòng trong tập tin (ví dụ dòng% s với email =% s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Một số trường yêu cầu không được lấp đầy.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Không thể tạo một thư mục. Kiểm tra xem người sử dụng máy chủ web có quyền ghi vào thư mục tài liệu Dolibarr. Nếu tham số <b>safe_mode</b> được kích hoạt trên PHP này, hãy kiểm tra các tập tin php Dolibarr sở hữu cho người sử dụng máy chủ web (hoặc một nhóm).
 ErrorNoMailDefinedForThisUser=Không có thư xác định cho người dùng này
 ErrorFeatureNeedJavascript=Tính năng này cần javascript để được kích hoạt để làm việc. Thay đổi điều này trong thiết lập - hiển thị.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoice
 ErrorWebServerUserHasNotPermission=Tài khoản người <b>dùng% s</b> được sử dụng để thực hiện các máy chủ web không có sự cho phép cho điều đó
 ErrorNoActivatedBarcode=Không có loại mã vạch kích hoạt
 ErrUnzipFails=Không thể giải nén% s với ZipArchive
-ErrNoZipEngine=Không có công cụ để giải nén tập tin% s trong PHP này
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=Các tập tin% s phải là một gói zip Dolibarr
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=PHP CURL không được cài đặt, điều này là cần thiết để nói chuyện với Paypal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # 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.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice
 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/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang
index 23df966ce86..6258f3369a1 100644
--- a/htdocs/langs/vi_VN/main.lang
+++ b/htdocs/langs/vi_VN/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=Thông số %s chưa được khai báo
 ErrorUnknown=Lỗi không xác định
 ErrorSQL=Lỗi SQL
 ErrorLogoFileNotFound=Không tìm thấy tệp logo '%s'
-ErrorGoToGlobalSetup=Đi đến phần thiết lập 'Công ty/Tổ chức" để sửa lỗi này
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=Đến phần thiết lập Module để sửa lỗi này
 ErrorFailedToSendMail=Lỗi gửi mail (người gửi=%s, người nhận=%s)
 ErrorFileNotUploaded=Tập tin không được tải lên. Kiểm tra kích thước không vượt quá tối đa cho phép, không gian miễn phí có sẵn trên đĩa và không có một tập tin đã có cùng tên trong thư mục này.
@@ -153,6 +153,7 @@ Edit=Sửa
 Validate=Xác nhận
 ValidateAndApprove=Xác nhận và Duyệt
 ToValidate=Để xác nhận
+NotValidated=Not validated
 Save=Lưu
 SaveAs=Lưu thành
 TestConnection=Kiểm tra kết nối
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=Không áp dụng tính năng ngắt kết nối v
 Connection=Kết nối
 Setup=Thiết lập
 Alert=Cảnh báo
+MenuWarnings=Cảnh báo
 Previous=Trước
 Next=Tiếp theo
 Cards=Thẻ
@@ -308,6 +310,7 @@ Copy=Copy
 Paste=Dán
 Default=Mặc định
 DefaultValue=Giá trị mặc định
+DefaultValues=Default values
 Price=Giá
 UnitPrice=Đơn giá
 UnitPriceHT=Đơn giá (chưa thuế)
@@ -363,7 +366,8 @@ VATRate=Thuế suất
 Average=Trung bình
 Sum=Tính tổng
 Delta=Delta
-Module=Module
+Module=Module/Application
+Modules=Modules/Applications
 Option=Tùy chọn
 List=Danh sách
 FullList=Danh mục đầy đủ
@@ -387,7 +391,7 @@ ActionRunningNotStarted=Để bắt đầu
 ActionRunningShort=In progress
 ActionDoneShort=Đã hoàn tất
 ActionUncomplete=Không hoàn tất
-CompanyFoundation=Công ty/Tổ chức
+CompanyFoundation=Company/Organisation
 ContactsForCompany=Liên lạc cho bên thứ ba này
 ContactsAddressesForCompany=Liên lạc/địa chỉ cho bên thứ ba này
 AddressesForCompany=Địa chỉ cho bên thứ ba này
@@ -405,8 +409,9 @@ Generate=Xuất ra
 Duration=Thời hạn
 TotalDuration=Tổng thời hạn
 Summary=Tóm tắt
-DolibarrStateBoard=Thống kê
-DolibarrWorkBoard=Ban tác vụ công việc
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=Sẵn có
 NotYetAvailable=Chưa có
 NotAvailable=Chưa có
@@ -434,7 +439,7 @@ Reportings=Việc báo cáo
 Draft=Dự thảo
 Drafts=Dự thảo
 Validated=Đã xác nhận
-Opened=Đã mở
+Opened=Mở
 New=Mới
 Discount=Giảm giá
 Unknown=Không biết
@@ -453,6 +458,7 @@ NextStep=Bước tiếp theo
 Datas=Dữ liệu
 None=Không
 NoneF=Không
+NoneOrSeveral=None or several
 Late=Trễ
 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.
 Photo=Hình ảnh
@@ -606,7 +612,8 @@ PartialWoman=Một phần
 TotalWoman=Tổng
 NeverReceived=Chưa từng nhận
 Canceled=Đã hủy
-YouCanChangeValuesForThisListFromDictionarySetup=Bạn có thể thay đổi giá trị cho danh sách này từ menu thiết lập-từ điển
+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
 Color=Màu
 Documents=Tập tin liên kết
@@ -642,6 +649,7 @@ FreeLineOfType=Loại tự do gõ
 CloneMainAttributes=Nhân bản đối tượng và các thuộc tính chính của nó
 PDFMerge=PDF Merge
 Merge=Merge
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Hiển thị trang in khu vực nội dung chính
 MenuManager=Menu quản lý
 WarningYouAreInMaintenanceMode=Cảnh báo, bạn đang trong chế độ bảo trì, vì vậy chỉ có đăng nhập <b>%s</b> là được phép sử dụng ứng dụng tại thời điểm này.
@@ -708,6 +716,7 @@ from=từ
 toward=hướng
 Access=Truy cập
 SelectAction=Select action
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Sử dụng tổ hợp phím Ctrl + C để copy vào clipboard
 SaveUploadedFileWithMask=Lưu tập tin trên máy chủ với tên <strong>"%s"</strong> (nếu không "%s")
 OriginFileName=Tên tập tin gốc
@@ -718,7 +727,7 @@ ViewPrivateNote=Xem ghi chú
 XMoreLines=%s dòng ẩn
 PublicUrl=URL công khai
 AddBox=Thêm hộp
-SelectElementAndClickRefresh=Chọn một phần tử và nhấn Làm mới
+SelectElementAndClick=Select an element and click %s
 PrintFile=In tập tin %s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Vào Nhà-Thiết lập-Công ty để đổi logo hoặc vào Nhà-Thiết lập-Hiển thị để ẩn.
@@ -734,8 +743,8 @@ Hello=Xin chào
 Sincerely=Sincerely
 DeleteLine=Xóa dòng
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
@@ -755,11 +764,20 @@ Calendar=Lịch
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Năm tài chính
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Thứ Hai
 Tuesday=Thứ Ba
@@ -817,5 +835,3 @@ SearchIntoContracts=Hợp đồng
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Nghỉ phép
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/vi_VN/other.lang b/htdocs/langs/vi_VN/other.lang
index 4fd0bc0f659..dced48e8ed9 100644
--- a/htdocs/langs/vi_VN/other.lang
+++ b/htdocs/langs/vi_VN/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=Ngày tháng năm sinh
 BirthdayAlertOn=sinh nhật cảnh báo hoạt động
 BirthdayAlertOff=sinh nhật không hoạt động cảnh báo
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=Can thiệp xác nhận
 Notify_FICHINTER_SENTBYMAIL=Can thiệp gửi qua đường bưu điện
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=Đây là một thư <b>kiểm tra</b> (kiểm tra từ p
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây đề nghị thương mại __PROPREF__ __PERSONALIZED__Sincerely __SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây thứ tự __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây để chúng tôi __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây vận chuyển __SHIPPINGREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây sự can thiệp __FICHINTERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__ __PERSONALIZED__ __SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Id Giáo sư% s</b> là một thông tin phụ thuộc vào quốc gia của bên thứ ba. <br> Ví dụ, đối với đất <b>nước% s,</b> đó là <b>mã% s.</b>
 DolibarrDemo=Giới thiệu Dolibarr ERP / CRM
-StatsByNumberOfUnits=Thống kê về số lượng các sản phẩm / dịch vụ đơn vị
-StatsByNumberOfEntities=Thống kê về số lượng của các đơn vị giới thiệu
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=Sự can thiệp% s đã được xác nhận.
 EMailTextInvoiceValidated=Hóa đơn% s đã được xác nhận.
diff --git a/htdocs/langs/vi_VN/projects.lang b/htdocs/langs/vi_VN/projects.lang
index ef47a652093..90150e9b76f 100644
--- a/htdocs/langs/vi_VN/projects.lang
+++ b/htdocs/langs/vi_VN/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=Trạng thái dự án
 SharedProject=Mọi người
 PrivateProject=Liên lạc dự án
+ProjectsImContactFor=Projects I'm explicitely a contact of
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=Tất cả dự án
 MyProjectsDesc=Phần xem này được giới hạn cho dự án mà bạn có liên quan (đối với bất kỳ loại dự án nào).
 ProjectsPublicDesc=Phần xem này hiển thị tất cả các dự án mà bạn được phép đọc.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=Phần xem này hiển thị tất cả các dự án và tác vụ (q
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=Dự án mới
 AddProject=Tạo dự án
 DeleteAProject=Xóa một dự án
 DeleteATask=Xóa một tác vụ
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Opened projects
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Hiển thị dự án
 SetProject=Lập dự án
 NoProject=Không có dự án được xác định hoặc tự tạo
 NbOfProjects=Nb của dự án
+NbOfTasks=Nb of tasks
 TimeSpent=Thời gian đã qua
 TimeSpentByYou=Thời gian đã qua bởi bạn
 TimeSpentByUser=Thời gian đã qua bởi người dùng
@@ -47,9 +52,9 @@ TaskTimeSpent=Thời gian đã qua trên tác vụ
 TaskTimeUser=Người dùng
 TaskTimeNote=Ghi chú
 TaskTimeDate=Ngày
-TasksOnOpenedProject=Tác vụ đã mở trong dự án
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Khối lượng công việc chưa xác định
-NewTimeSpent=Thời gian đã qua mới
+NewTimeSpent=Thời gian đã qua
 MyTimeSpent=Thời gian đã qua của tôi
 Tasks=Tác vụ
 Task=Tác vụ
@@ -59,6 +64,7 @@ TaskDescription=Mô tả tác vụ
 NewTask=Tác vụ mới
 AddTask=Tạo tác vụ
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Hoạt động
 Activities=Tác vụ/hoạt động
 MyActivities=Tác vụ/hoạt động của tôi
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Danh sách các hợp đồng được gắn với dự án
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=Danh sách các sự can thiệp được gắn với dự án
 ListExpenseReportsAssociatedProject=Danh sách các báo cáo chi phí liên quan đến dự án
 ListDonationsAssociatedProject=Danh sách hiến tặng liên quan đến dự án
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Liên lạc dự án
 ActionsOnProject=Các sự kiện trên dự án
 YouAreNotContactOfProject=Bạn không là một liên hệ của dự án riêng tư này
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Xóa thời gian đã qua
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=Xem thêm tác vụ không được gán cho tôi
@@ -110,7 +118,7 @@ TaskRessourceLinks=Tài nguyên
 ProjectsDedicatedToThisThirdParty=Các dự án được dành riêng cho bên thứ ba này
 NoTasks=Không có tác vụ nào cho dự án này
 LinkedToAnotherCompany=Được liên kết đến các bên thứ ba
-TaskIsNotAffectedToYou=Tác vụ không được gán cho bạn
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=Thời gian đã qua đang trống
 ThisWillAlsoRemoveTasks=Thao tác này sẽ xóa toàn bộ các tác vụ của dự án (<b>%s</b> các tác vụ ở thời điểm hiện tại) và toàn bộ dữ liệu đã nhập vào trong suốt thời gian vừa qua.
 IfNeedToUseOhterObjectKeepEmpty=Nếu một số đối tượng (hóa đơn, đơn hàng, ...), thuộc về một bên thứ ba khác, phải có liên kết đến dự án để tạo, giữ phần này trống để dự án có sự tham gia của nhiều bên thứ ba khác
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Đầu vào mỗi ngày
 InputPerWeek=Đầu vào mỗi tuần
 InputPerAction=Đầu vào mỗi hành động
-TimeAlreadyRecorded=Thời gian đã qua được ghi nhận cho tác vụ/ngày này và người dùng %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Giao việc cho tôi
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Phân công
 ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/zh_CN/accountancy.lang b/htdocs/langs/zh_CN/accountancy.lang
index eed32904230..85ae089bfb5 100644
--- a/htdocs/langs/zh_CN/accountancy.lang
+++ b/htdocs/langs/zh_CN/accountancy.lang
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=添加一个会计帐户
 AccountAccounting=会计账户
 AccountAccountingShort=账户
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=总帐
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=账目平衡
 
 CAHTF=税前供应商采购总计
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=卖杂志
@@ -132,19 +140,19 @@ Sens=SENS
 Codejournal=日记帐
 NumPiece=件数
 TransactionNumShort=Num. transaction
-AccountingCategory=会计分类
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=未设定
-DeleteMvt=删除常规分类账清单
+DeleteMvt=Delete Ledger lines
 DelYear=删除整年
 DelJournal=删除整月
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=财务账
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=财务账包括全部银行账户付款类型
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=借记卡和信用卡在同一时间不能有一个值
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=会计账目清单
 
 Pcgtype=账户类
-Pcgsubtype=在类账户
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=总销售利润率
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=错误，你不能删除这个会计帐户，因为它是用来
 MvtNotCorrectlyBalanced=不正确的移转调拨。 Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=应用批量类别
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=编码
+Nature=属性
+AccountingJournalType1=Various operation
+AccountingJournalType2=销售
+AccountingJournalType3=采购
+AccountingJournalType4=银行
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=导出
@@ -211,6 +231,7 @@ Modelcsv_ciel=向 Sage Ciel Compta 或 Compta Evolution导出
 Modelcsv_quadratus=向 Quadratus QuadraCompta导出
 Modelcsv_ebp=向 EBP导出
 Modelcsv_cogilog=导出到 Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=计算
 Formula=公式
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=本页不支持设置导出格式
 BookeppingLineAlreayExists=已存在的账簿明细行
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index 511474769d4..9a78588e2ff 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=内部员工用户
 ExternalUsers=外部用户
 GUISetup=主题
 SetupArea=设置区
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=文件上传功能测试
 IfModuleEnabled=注：“是”仅在模块 <b>%s</b> 启用时有效
 RemoveLock=如果存在文件 <b>%s</b> 则删除，以便可以使用升级工具。
@@ -85,7 +86,7 @@ Mask=格式掩码
 NextValue=下一个编码
 NextValueForInvoices=下一个发票编码
 NextValueForCreditNotes=下一个票据编码
-NextValueForDeposit=下一值(存款)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=下一值(替换)
 MustBeLowerThanPHPLimit=注意：无论这个参数值是多少，您的 PHP 参数已经限制每个上传文件大小为<b>%s</b> %s,
 NoMaxSizeByPHPLimit=注：您的 PHP 配置参数中没有设置限制
@@ -103,7 +104,7 @@ MenuIdParent=父菜单ID
 DetailMenuIdParent=父菜单ID (空表示顶级菜单)
 DetailPosition=排序编号，以确定菜单位置
 AllMenus=全部
-NotConfigured=模块未配置
+NotConfigured=Module/Application not configured
 Active=启用
 SetupShort=设置
 OtherOptions=其他选项
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=千位分隔符
 Destination=目的地
 IdModule=模块ID
 IdPermissions=权限ID
-Modules=模块
 LanguageBrowserParameter=参数 %s
 LocalisationDolibarrParameters=本地化参数
 ClientTZ=(用户)客户端时区
@@ -123,7 +123,8 @@ PHPTZ=PHP服务器时区
 DaylingSavingTime=夏令时间
 CurrentHour=PHP 服务器时间
 CurrentSessionTimeOut=当前会话超时
-YouCanEditPHPTZ=要设置不同的PHP时区(不要求)，你可以尝试在 .htacces文件添加像这样 "SetEnv TZ 欧洲/巴黎" 一行。
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=插件
 Boxes=插件
 MaxNbOfLinesForBoxes=插件清单最大数值
@@ -189,10 +190,10 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=权限
 BoxesDesc=小组件展示一些可以添加到您个人页面的信息。您可以通过选择目标页面点击“激活”或关闭按钮来选择显示或关闭这些小组件。
 OnlyActiveElementsAreShown=仅显示 <a href="%s">已启用模块</a> 的元素。
-ModulesDesc=激活并启用Dolibarr定义的功能模块。部分模块启用后，需要您给予相应用户权限他才能使用到该模块。点击 on/off 来启用/禁用功能/模块。
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=你能在外部互联网查找到并下载更多的功能模块...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external modules...
+ModulesMarketPlaces=查找更多模块
 GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore，为 Dolibarr 的 ERP/CRM 的外部模块官方市场
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=加密 conf.php 中的数据库密码(推荐启
 InstrucToEncodePass=如果要在<b>conf.php</b>中使用明文密码，请将<br><b>$dolibarr_main_db_pass="...";</b><br>替换为br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=如果要在<b>conf.php</b>中使用明文密码，请将<br><b>$dolibarr_main_db_pass="crypted:...";</b><br>替换为<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=保护生成的PDF文件(不推荐，影响PDF的批量生成)
-ProtectAndEncryptPdfFilesDesc=PDF保护允许在PDF浏览器中阅读和打印PDF，但无法编辑和复制内容。请注意，此功能让追加生成多页PDF的功能无法使用(例如未支付账单)。
+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=功能特色
 DolibarrLicense=授权
 Developpers=开发商/贡献者
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr在线演示
 OfficialMarketPlace=官方市场提供外部扩展模型/模块
 OfficialWebHostingService=引用网络托管服务（云主机）
 ReferencedPreferredPartners=首选合作伙伴
-OtherResources=其他资源
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=用户或开发人员用文档(文档，常见问题…)，<br>参见 Dolibarr 百科：<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=您有任何其他问题/帮助，可以到 Dolibarr 论坛： <br> <b><a href="%s" target="_blank">%s</a></b>简体中文翻译可到Dolibarr爱好者交流Q群技术交流：206239089
 HelpCenterDesc1=此处可以帮助你获得 Dolibarr 帮助支持服务。
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=功能在 Unix 类系统下不可用。请在本地
 SubmitTranslation=如果您发现当前语言的翻译不完整或有误，您可以通过编辑 <b>langs/%s</b> 文件更正它，并将修改后的文件提交至  www.transifex.com/dolibarr-association/dolibarr/
 SubmitTranslationENUS=如果您发现当前语言的翻译不完整或有误，您可以通过编辑 <b>langs/%s</b> 文件更正它，并将修改后的文件提交至 dolibarr.org/forum 或github开发者 github.com/Dolibarr/dolibarr.
 ModuleSetup=模块设置
-ModulesSetup=模块设置
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=系统
 ModuleFamilyCrm=客户关系管理(CRM)
 ModuleFamilySrm=供应商关系管理 (SRM)
@@ -284,7 +287,7 @@ ModuleFamilyInterface=系统外部扩展接口
 MenuHandlers=菜单处理程序
 MenuAdmin=菜单编辑器
 DoNotUseInProduction=请勿用于生产环境
-ThisIsProcessToFollow=This is steps to process:
+ThisIsProcessToFollow=步骤如下：
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=第 %s 步
 FindPackageFromWebSite=搜索你需要的功能(例如在官方 %s )。
@@ -300,14 +303,17 @@ CurrentVersion=Dolibarr 当前版本
 CallUpdatePage=升级更新数据库和数据请到: %s.
 LastStableVersion=最新稳定版
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=离线升级服务器
+WithCounter=Manage a counter
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=其它非标记字符将维持不变。<br>不允许使用空格<br>
-GenericMaskCodes4a=<u>例如第99位 %s 合伙人 TheCompany 已搞定于 2007-01-31:</u><br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>例如合伙人创建于 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>例如: 于 2007-03-1 建立的产品资料:</u><br>
-GenericMaskCodes5=号码格式: <b>ABC{yy}{mm}-{000000}</b> 将生成 <b>ABC0701-000099</b>格式编号<br> 号码格式:<b>{0000+100}-ZZZ/{dd}/XXX</b> 将生成 <b>0199-ZZZ/31/XXX</b>格式编号
+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=根据事先定义的格式掩码，返回一个可定制编号，详见说明。
 ServerAvailableOnIPOrPort=可用服务器地址: <b>%s:</b><b>%s</b>
 ServerNotAvailableOnIPOrPort=服务器地址: <b>%s:</b><b>%s</b> 不可用
@@ -369,19 +375,21 @@ Int=整型
 Float=浮点型
 DateAndTime=日期与小时
 Unique=唯一
-Boolean=布尔值 (复选框)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = 电话
 ExtrafieldPrice = 价格
 ExtrafieldMail = 电子邮件
 ExtrafieldUrl = Url
 ExtrafieldSelect = 选择列表
 ExtrafieldSelectList = 从表格中选取
-ExtrafieldSeparator=分隔符
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=密码
-ExtrafieldCheckBox=复选框
-ExtrafieldRadio=单选框
-ExtrafieldCheckBoxFromList= 表格的勾选框
+ExtrafieldRadio=Radio buttons (on choice only)
+ExtrafieldCheckBox=Checkboxes
+ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=连接到项目
+ComputedFormula=Computed field
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=字符列表类似于 key,value<br><br> 举例说明 :: <br>1,value1<br>2,value2<br>3,value3<br>等等等...
 ExtrafieldParamHelpradio=字符列表类似于 key,value<br><br> 举例说明 :: <br>1,value1<br>2,value2<br>3,value3<br>等等等...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=栏位
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=用户和组
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=客户发票和信用记录管理。供应商发票管理。
 Module40Name=供应商
 Module40Desc=供应商和其采购管理(订单和发票)
 Module42Name=日志
-Module42Desc=日志系统(文件、系统日志...)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=编辑器
 Module49Desc=编辑器管理
 Module50Name=产品
@@ -499,8 +521,8 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar 整合
 Module500Name=特殊开支
 Module500Desc=特殊开支管理(税、财政税等)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=贷款
 Module520Desc=贷款管理模块
 Module600Name=通知
@@ -542,8 +564,10 @@ Module2900Name=Maxmind网站的GeoIP全球IP地址数据库
 Module2900Desc=Maxmind的geoip数据库的转换能力
 Module3100Name=Skype
 Module3100Desc=添加 Skype 聊天按钮到用户 / 合伙人 / 联系人 / 会员信息资料卡
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=人事管理
-Module4000Desc=人力资源管理
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=多公司
 Module5000Desc=允许你管理多个公司
 Module6000Name=工作流程
@@ -591,7 +615,7 @@ Permission32=创建/变更产品信息
 Permission34=删除产品信息
 Permission36=查看/管理隐藏产品
 Permission38=导出产品信息
-Permission41=读取项目和任务(共享的工程和我参与的项目)。还可输入项目所消耗的时间(时间表)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=删除项目(共享的项目和我参与的项目)
 Permission45=导出项目
@@ -844,12 +868,14 @@ DictionaryOrderMethods=订单类型
 DictionarySource=报价/订单来源方式
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=账户图标模块
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=电子邮件模板
 DictionaryUnits=单位
 DictionaryProspectStatus=准客户状态
 DictionaryHolidayTypes=请假类型
 DictionaryOpportunityStatus=项目/线索的机会状态
 SetupSaved=设置已经成功保存
+SetupNotSaved=Setup not saved
 BackToModuleList=返回模块列表
 BackToDictionaryList=回到字典库
 VATManagement=增值税管理
@@ -921,7 +947,7 @@ Host=服务器
 DriverType=驱动类型
 SummarySystem=系统信息摘要
 SummaryConst=Dolibarr所有设置参数清单
-MenuCompanySetup=公司/机构
+MenuCompanySetup=公司/组织
 DefaultMenuManager= 标准菜单管理
 DefaultMenuSmartphoneManager=智能手机菜单管理
 Skin=外观主题
@@ -931,12 +957,14 @@ DefaultMaxSizeList=列表默认最大值
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=每日消息
 MessageLogin=登陆页面显示消息
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=常驻左侧菜单搜寻框
 DefaultLanguage=默认语言(语言代码)
 EnableMultilangInterface=启用多语言界面
 EnableShowLogo=左侧菜单中显示LOGO公司标志
-CompanyInfo=公司/机构资料信息
-CompanyIds=公司/机构的编号
+CompanyInfo=公司/组织信息
+CompanyIds=Company/organisation identities
 CompanyName=名称
 CompanyAddress=地址
 CompanyZip=邮编
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=会员费用最大逾期时间 (天)
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=支票兑现最大逾期时间 (天) 
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=在开始使用Dolibarr之前请先进行初始化设置相关参数。
-SetupDescription2=两个最重要的设置步骤是在左边的设置菜单中的前两个：公司/机构和模块：
-SetupDescription3=该参数的设置菜单是 <a href="%s">设置 -> 公司/机构</a> 需要您首先设定好的原因是因为显示特定信息必须事先设定好此参数 (例如国家税费相关的信息).
-SetupDescription4=该参数的设置菜单是 <a href="%s">设置 -> 模块</a> 需要您首先设定好的原因是Dolibarr采用的是目前最先进优化的模块化设计 ERP/CRM 系统.这种设计非常棒，未来我们开发新功能将以模块的形式启用到系统菜单中.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=其他管理菜单可选参数。
 LogEvents=安全稽核事件
 Audit=安全稽核
@@ -987,7 +1015,7 @@ BrowserOS=浏览器操作系统
 ListOfSecurityEvents=安全事件清单
 SecurityEventsPurged=安全事件清除
 LogEventDesc=这里您可以启用 Dolibarr 的安全事件日志记录。管理员可以通过<b>系统工具-稽核</b>查看其内容。警告，此功能会消耗大量的数据库空间。
-AreaForAdminOnly=此功能仅供<b>管理员用户</b> 使用。
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=系统信息指以只读方式显示的其它技术信息，只对系统管理员可见。
 SystemAreaForAdminOnly=此区仅供管理员用户使用。Dolibarr 中没有权限可越过此限制。
 CompanyFundationDesc=在本页面输入详细的公司或机构的初始资料 (然后点击页面底部的 "变更" 或 "保存" 按钮)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=显示新翻译字符串
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=启用的功能模块总共: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists in any language files
+TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=您必须至少启用 1 个模块
 ClassNotFoundIntoPathWarning=PHP 路径中未发现 类 %s
 YesInSummer=是(在夏天)
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=会话存储空间已用 Suhosin 加密
 ConditionIsCurrently=当前条件为 %s
 YouUseBestDriver=你使用的驱动程序 %s 就是目前最佳驱动程式。
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=专业ID号码规则
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=<b>%s</b>格式的导出文件可以通过链接 %s 下载
 ##### Invoices #####
 BillsSetup=发票模块设置
 BillsNumberingModule=发票与信用记录编号模块
 BillsPDFModules=发票文档模板
+PaymentsPDFModules=Payment documents models
 CreditNote=信用记录
 CreditNotes=信用记录
 ForceInvoiceDate=强制发票中的日期为确认日期
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=HTTP服务器不缓存的文件类型%s
 FilesOfTypeCompressed=HTTP服务器 %s 类型的文件被压缩
 FilesOfTypeNotCompressed=HTTP服务器 %s 类型的文件不会被压缩
 CacheByServer=缓存服务器
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=通过浏览器缓存
 CompressionOfResources=压缩的HTTP响应
+CompressionOfResourcesDesc=For exemple using the Apache directive "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=这种自动检测在该浏览器中不适用
+DefaultValuesDesc=You can define/force here the default value you want to get when your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=产品模块设置
 ServiceSetup=服务模块设置
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=所用账单日期
 Buy=采购
 Sell=销售
 InvoiceDateUsed=所用账单日期
-YourCompanyDoesNotUseVAT=贵公司已被定义为不含增值税 (首页->设定->公司/机构)，所以没有设置增值税的选项。
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=科目代码
 AccountancyCodeSell=销售账户代码
 AccountancyCodeBuy=采购账户代码
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=点击拨号模块设置
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
+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.
 ClickToDialUseTelLink=在电话号码上链接 "tel:" 
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than 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.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API模块设置
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=你可浏览 APIs 地址
+ApiExporerIs=You can explore and test the APIs at URL
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=API的Key
 WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=一般的显示顺序
 BankOrderES=西班牙语
 BankOrderESDesc=西班牙语显示顺序
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=多公司模块设置
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ BackupDumpWizard=数据库转储备份向导
 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.
 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.
-ConfFileMuseContainCustom=Installing 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=当鼠标经过表格明细时高亮显示
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=页面标题颜色
 LinkColor=颜色链接
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=背景颜色
 TopMenuBackgroundColor=顶部菜单背景颜色
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=最小通知间隔
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=消费税率
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/zh_CN/compta.lang b/htdocs/langs/zh_CN/compta.lang
index 158bee98f0b..944091f39c2 100644
--- a/htdocs/langs/zh_CN/compta.lang
+++ b/htdocs/langs/zh_CN/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=这里显示的金额是根据公司定
 Param=设置
 RemainingAmountPayment=剩余的付款金额：
 Account=帐户
-Accountparent=母公司帐户
-Accountsparent=母公司帐户
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=收入
 Outcome=支出
 ReportInOut=收入/支出
@@ -56,6 +56,7 @@ MenuTaxAndDividends=税和股息
 MenuSocialContributions=社会/财政税
 MenuNewSocialContribution=新建社会/财政税
 NewSocialContribution=新建社会/财政税
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=支付社会/财政税
 AccountancyTreasuryArea=会计/库务区
 NewPayment=新建支付
@@ -134,8 +135,8 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- 它包括所有从客户收到发票有效付款。 <br> - 这是对这些发票的付款日期为基础<br>
-DepositsAreNotIncluded=- 不包括存款发票
-DepositsAreIncluded=- 包括存款发票
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=按合伙人IRPF的报表
 LT1ReportByCustomersInInputOutputModeES=按合伙人 RE 报表
 VATReport=VAT报告
@@ -169,7 +170,7 @@ DescSellsJournal=销售日志
 DescPurchasesJournal=采购日志
 InvoiceRef=发票编号。
 CodeNotDef=没有定义
-WarningDepositsNotIncluded=存款发票不包括在此版本与本会计模块。
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=付款期限日期不能小于对象日期。
 Pcg_version=Chart of accounts models
 Pcg_type=PCG类型
@@ -189,8 +190,10 @@ AccountancyJournal=科目代码日记账
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=复制 social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=复制下一个月
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=社会/财政税
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=错误：银行账号未发现
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/zh_CN/cron.lang b/htdocs/langs/zh_CN/cron.lang
index 720a516ec5a..f4dbef38a61 100644
--- a/htdocs/langs/zh_CN/cron.lang
+++ b/htdocs/langs/zh_CN/cron.lang
@@ -25,7 +25,7 @@ CronDelete=删除计划任务
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=安排计划工作
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=计划工作模式允许执行计划好了的工作
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=工作
 CronNone=无
 CronDtStart=之前
@@ -57,12 +57,12 @@ CronStatusActiveBtn=生效
 CronStatusInactiveBtn=禁用
 CronTaskInactive=这个工作已失效
 CronId=Id
-CronClassFile=Classes (filename.class.php)
-CronModuleHelp=Dolibarr模块目录名称 (同时也是 Dolibarr 外部模块的工作目录). <BR> 例如 Dolibarr 产品对象 /htdocs/<u>product</u>/class/product.class.php的获取方法, 模块的参数值是 <i>product</i>
-CronClassFileHelp=加载文件名称。 <BR> 例如 Dolibarr 产品对象 /htdocs/product/class/<u>product.class.php</u>的获取方法, 它的参数值 class 文件名称是 <i>product.class.php</i>
-CronObjectHelp=加载对象名称. <BR> 例如 Dolibarr 产品对象 /htdocs/product/class/product.class.php的获取方法, 它的参数值 class 文件名称是 <i>Product</i>
-CronMethodHelp=对象启动方法. <BR> 例如 Dolibarr 产品对象 /htdocs/product/class/product.class.php的启动方法, 它的参数方法是 <i>fecth</i>
-CronArgsHelp=该方法的参数. <BR>例如 Dolibarr 产品对象 /htdocs/product/class/product.class.php的获取方法, 参数值 <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=系统命令行执行。
 CronCreateJob=创建新的计划任务
 CronFrom=From
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=请到菜单 "主页 - 管理员工具 - 计划
 JobDisabled=岗位无效
 MakeLocalDatabaseDumpShort=本地数据库备份
 MakeLocalDatabaseDump=生成一份本地数据库 dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/zh_CN/errors.lang b/htdocs/langs/zh_CN/errors.lang
index 5cfebca3dcb..0abbed95bfb 100644
--- a/htdocs/langs/zh_CN/errors.lang
+++ b/htdocs/langs/zh_CN/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=无法创建文件<b>'%s'</b>的。
 ErrorFailToRenameDir=无法重命名目录<b>'%s'</b>到<b>%s'</b>的。
 ErrorFailToCreateDir=无法创建目录<b>'%s'</b>的。
 ErrorFailToDeleteDir=无法删除目录<b>'%s'</b>的。
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=这个联络已定义为这种类型的接触。
 ErrorCashAccountAcceptsOnlyCashMoney=这是一个银行帐户的现金帐户，所以只接受现金支付的类型。
 ErrorFromToAccountsMustDiffers=源和目标的银行帐户必须是不同的。
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=无法写在目录%s
 ErrorFoundBadEmailInFile=找到%S的语法不正确的电子邮件文件中的行（例如行%的电子邮件s =%s）的
 ErrorUserCannotBeDelete=用户不能删除。也许它已经关联到Dolibarr实体对象了。
 ErrorFieldsRequired=一些必要的栏位都没有填补。
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=无法创建一个目录。检查Web服务器的用户有权限写入Dolibarr文件目录。如果参数<b>safe_mode设置</b>为启用这个PHP，检查Dolibarr php文件到Web服务器的用户拥有（或组）。
 ErrorNoMailDefinedForThisUser=没有邮件定义该用户
 ErrorFeatureNeedJavascript=此功能需要Javascript被激活才能工作。更改此设置 - 显示。
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoice
 ErrorWebServerUserHasNotPermission=<b>%s</b>用来执行Web服务器用户帐户没有该权限
 ErrorNoActivatedBarcode=没有激活的条码类型
 ErrUnzipFails=%s 无法解压缩与解压缩
-ErrNoZipEngine=PHP没有引擎来解压缩文件%s
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=%s 文件必须是Dolibarr zip格式包
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=PHP Curl没有安装，这需要与支付宝协调
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=没有全局变量选择
 ErrorFieldMustBeANumeric=填写 <b>%s</b> 必须为数字值
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # 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.
@@ -191,7 +201,7 @@ WarningMandatorySetupNotComplete=初始参数尚未设置
 WarningSafeModeOnCheckExecDir=警告，PHP的选项<b>safe_mode设置</b>为在此情况下命令必须在<b>safe_mode_exec_dir之</b>存储参数的PHP目录内宣布。
 WarningBookmarkAlreadyExists=本标题或此目标（网址）书签已存在。
 WarningPassIsEmpty=警告，数据库密码是空的。这是一个安全漏洞。您应该添加一个密码到您的数据库，并改变你的conf.php文件，以反映这一点。
-WarningConfFileMustBeReadOnly=警告：您的服务器配置文件 (<b>htdocs/conf/conf.php</b>LiAnGjiA注：初始安装时需要允许Dolibarr读写权限安装完成后为了安全着想则需要取消写入权限害怕被公鸡啦) 有写入权限。这是个非常严重的漏洞。其允许服务器权限级别的文件读取与写入，有被恶意利用的风险。假如你是Windows的磁盘格式是FAT格式，你必须将该配置文件的权限修改为只读权限，并请继续加强其他服务器安全防护工作。
+WarningConfFileMustBeReadOnly=警告：您的服务器配置文件 (<b>htdocs/conf/conf.php</b>——LiAnGjiA注：初始安装时需要允许Dolibarr读写权限安装完成后为了安全着想则需要取消写入权限害怕被公鸡啦) 有写入权限。这是个非常严重的漏洞。其允许服务器权限级别的文件读取与写入，有被恶意利用的风险。假如你是Windows的磁盘格式是FAT格式，你必须将该配置文件的权限修改为只读权限，并请继续加强其他服务器安全防护工作。
 WarningsOnXLines=<b>%S上</b>的源代码行警告
 WarningNoDocumentModelActivated=没有模板，对文档生成，已被激活。一个模板是选用默认，直到您检查您的模块设置。
 WarningLockFileDoesNotExists=警告：一旦您安装完成Dolibarr则必须将install整个目录移走并在目录 <b>%s</b>下添加一个 <b>install.lock</b> 文件来防止他人的恶意重装。如若缺少此文件则将是个安全漏洞哦。
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice
 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/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index 309c8ce3cc4..76de77ade11 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=不是定义的参数%
 ErrorUnknown=未知错误
 ErrorSQL=SQL错误
 ErrorLogoFileNotFound=徽标LOGO文件'%s'没有找到
-ErrorGoToGlobalSetup=到'公司/机构的设置来解决此
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=前往模块设置来解决此
 ErrorFailedToSendMail=无法发送邮件（发件人=%s后，接收器=%s）的
 ErrorFileNotUploaded=文件没有上传。检查大小不超过允许的最大值，即在磁盘上的可用空间是可用和有没有这已经与in这个目录同名文件。
@@ -85,15 +85,15 @@ NotDefined=未定义
 DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
 Administrator=管理员
 Undefined=未定义
-PasswordForgotten=Password forgotten?
+PasswordForgotten=忘记密码？
 SeeAbove=见上文
 HomeArea=首页信息状态区
-LastConnexion=Latest connection
-PreviousConnexion=上次登陆
+LastConnexion=最后上线时间
+PreviousConnexion=上次上线时间
 PreviousValue=上一个值
 ConnectedOnMultiCompany=对实体连接
 ConnectedSince=当前连接状态
-AuthenticationMode=Authentication mode
+AuthenticationMode=认证模式
 RequestedUrl=Requested URL
 DatabaseTypeManager=数据库类型管理员
 RequestLastAccessInError=最后数据库访问请求错误
@@ -153,6 +153,7 @@ Edit=编辑
 Validate=验证
 ValidateAndApprove=验证和同意
 ToValidate=为了验证
+NotValidated=Not validated
 Save=保存
 SaveAs=另存为
 TestConnection=测试连接
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=No applicative disconnect feature with authenticatio
 Connection=登陆
 Setup=设置
 Alert=生日提醒
+MenuWarnings=警告
 Previous=以前
 Next=未来
 Cards=牌
@@ -238,7 +240,7 @@ DateCreation=创建日期
 DateCreationShort=创建日期
 DateModification=变更日期
 DateModificationShort=变更日期
-DateLastModification=Latest modification date
+DateLastModification=最后修改日期
 DateValidation=验证日期
 DateClosing=截止日期
 DateDue=截止日期
@@ -308,6 +310,7 @@ Copy=复制
 Paste=糊
 Default=默认
 DefaultValue=默认值
+DefaultValues=默认值
 Price=价格
 UnitPrice=单价
 UnitPriceHT=单位价格（净值）
@@ -363,7 +366,8 @@ VATRate=增值税率
 Average=平均
 Sum=总和
 Delta=增量
-Module=模块
+Module=Module/Application
+Modules=Modules/Applications
 Option=选项
 List=列表
 FullList=全部列表
@@ -387,7 +391,7 @@ ActionRunningNotStarted=等待
 ActionRunningShort=In progress
 ActionDoneShort=已完成
 ActionUncomplete=未完成
-CompanyFoundation=公司/机构
+CompanyFoundation=公司/组织信息
 ContactsForCompany=合伙人联系方式
 ContactsAddressesForCompany=这个合伙人联系人/地址
 AddressesForCompany=这个合伙人的地址
@@ -405,8 +409,9 @@ Generate=生成
 Duration=为期
 TotalDuration=总时间
 Summary=摘要
-DolibarrStateBoard=统计
-DolibarrWorkBoard=工作任务看板
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=可用的
 NotYetAvailable=尚未提供
 NotAvailable=不可用
@@ -434,7 +439,7 @@ Reportings=报告
 Draft=草稿
 Drafts=草稿
 Validated=验证
-Opened=启动
+Opened=打开
 New=新建
 Discount=折扣
 Unknown=未知
@@ -453,6 +458,7 @@ NextStep=下一步
 Datas=数据
 None=无
 NoneF=无
+NoneOrSeveral=None or several
 Late=逾期
 LateDesc=延迟的定义假如一条记录逾期或者取决于你的配置设定。请向管理员询问并从首页菜单->设置->警告菜单下修改相应设置。
 Photo=图片
@@ -543,7 +549,7 @@ TotalQuantity=总数量
 DateFromTo=从%s到%s
 DateFrom=第05期从%
 DateUntil=直到%s的
-Check=支票
+Check=检查
 Uncheck=不检查
 Internal=内部
 External=外部
@@ -606,7 +612,8 @@ PartialWoman=局部的
 TotalWoman=总计
 NeverReceived=从未收到
 Canceled=取消
-YouCanChangeValuesForThisListFromDictionarySetup=你可在设置->字典中更改此下拉列表值
+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
 Color=颜色
 Documents=链接的文件
@@ -623,7 +630,7 @@ CurrentTheme=当前主题样式
 CurrentMenuManager=当前后台管理菜单主题样式
 Browser=浏览器
 Layout=Layout
-Screen=Screen
+Screen=屏幕分辨率
 DisabledModules=禁用模块
 For=为
 ForCustomer=对于客户
@@ -642,6 +649,7 @@ FreeLineOfType=自由选项类型
 CloneMainAttributes=复制项目含主属性
 PDFMerge=PDF合并
 Merge=合并
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=打印中间大区域中显示的文字内容
 MenuManager=菜单管理器
 WarningYouAreInMaintenanceMode=警告，你是在维护模式，因此，目前只有登陆<b>%s</b>才被允许使用应用。
@@ -702,12 +710,13 @@ Test=测试
 Element=元素
 NoPhotoYet=还没有图片
 Dashboard=看板
-MyDashboard=My dashboard
+MyDashboard=个人看板
 Deductible=可抵扣
 from=从
 toward=往
 Access=访问
 SelectAction=Select action
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=按快捷键 Ctrl+C 复制
 SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
 OriginFileName=原始文件名
@@ -718,7 +727,7 @@ ViewPrivateNote=查看备注
 XMoreLines=%s 明细(s) 隐藏
 PublicUrl=公网URL
 AddBox=添加选项框
-SelectElementAndClickRefresh=选择元素然后点击刷新
+SelectElementAndClick=Select an element and click %s
 PrintFile=打印文件 %s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=点击菜单 主页 -> 设置 -> 公司 来修改LOGO或 主页 -> 设置 -> 显示菜单隐藏它。
@@ -734,8 +743,8 @@ Hello=你好
 Sincerely=诚恳地
 DeleteLine=删除行
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=批量动作生成文件区
 ShowTempMassFilesArea=显示批量动作生成文件区
@@ -755,11 +764,20 @@ Calendar=日历
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=财务年度
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=星期一
 Tuesday=星期二
@@ -817,5 +835,3 @@ SearchIntoContracts=合同
 SearchIntoCustomerShipments=客户运输
 SearchIntoExpenseReports=费用报表
 SearchIntoLeaves=请假
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/zh_CN/other.lang b/htdocs/langs/zh_CN/other.lang
index 3f8ee552a68..9820e25f517 100644
--- a/htdocs/langs/zh_CN/other.lang
+++ b/htdocs/langs/zh_CN/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=生日
 DateToBirth=生日
 BirthdayAlertOn=生日提醒活跃
 BirthdayAlertOff=生日提醒无效
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=添加联络人到干预
 Notify_FICHINTER_VALIDATE=干预验证
 Notify_FICHINTER_SENTBYMAIL=通过邮件发送的干预
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\n你将在这里找到询价申请 __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=选择最适合您所需的演示配置文件…
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=认证模式是 <b>%s</b>。<br />在
 EnableGDLibraryDesc=这个选项安装或启用PHP的GD支持库。
 ProfIdShortDesc=<b>Prof Id %s</b> 取决于合伙人的国别。 <br>例如，对于<b>%s</b>, 它的代码是<b>%s</b>.。
 DolibarrDemo=Dolibarr的ERP / CRM的演示
-StatsByNumberOfUnits=统计的产品/服务单位数目
-StatsByNumberOfEntities=统计中所指的实体数量
-NumberOfProposals=过去12个月的报价数量
-NumberOfCustomerOrders=过去12个月客户订单数
-NumberOfCustomerInvoices=过去12个月客户发票数量
-NumberOfSupplierProposals=过去12个月供应商报价数
-NumberOfSupplierOrders=过去12个月的供应商订单数
-NumberOfSupplierInvoices=去年供应商发票数
-NumberOfUnitsProposals=过去12个月的报价单位数量
-NumberOfUnitsCustomerOrders=过去12个月客户订单单位数量
-NumberOfUnitsCustomerInvoices=过去12个月客户发票单位数量
-NumberOfUnitsSupplierProposals=过去12个月供应商报价单位数量
-NumberOfUnitsSupplierOrders=过去12个月供应商订单单位数量
-NumberOfUnitsSupplierInvoices=去年供应商发票单位数量
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=你有一个新干预%s任务。
 EMailTextInterventionValidated=干预%s已被验证。
 EMailTextInvoiceValidated=发票%s已被确认。
diff --git a/htdocs/langs/zh_CN/projects.lang b/htdocs/langs/zh_CN/projects.lang
index af1709bdaf9..a0e636e1e8a 100644
--- a/htdocs/langs/zh_CN/projects.lang
+++ b/htdocs/langs/zh_CN/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=项目区
 ProjectStatus=项目状态
 SharedProject=全体同仁
 PrivateProject=项目联系人
+ProjectsImContactFor=Projects I'm explicitely a contact of
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=所有项目
 MyProjectsDesc=这种观点是有限的项目你是一个接触（不管是类型）。
 ProjectsPublicDesc=这种观点提出了所有你被允许阅读的项目。
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=这种观点提出的所有项目和任务（您的用户权限批准
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=新建项目
 AddProject=创建项目
 DeleteAProject=删除一个项目
 DeleteATask=删除任务
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Opened projects
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpenedProjects=打开项目
+OpenedTasks=打开任务
+OpportunitiesStatusForOpenedProjects=按有效项目状态机会值
 OpportunitiesStatusForProjects=按项目状态机会值
 ShowProject=显示项目
 SetProject=设置项目
 NoProject=没有项目或拥有的定义
 NbOfProjects=项目数量
+NbOfTasks=Nb of tasks
 TimeSpent=花费的时间
 TimeSpentByYou=你花费的时间
 TimeSpentByUser=用户花费时间
@@ -47,9 +52,9 @@ TaskTimeSpent=任务花费时间
 TaskTimeUser=用户
 TaskTimeNote=备注
 TaskTimeDate=日期
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=打开项目任务
 WorkloadNotDefined=工作量没有定义
-NewTimeSpent=新的时间
+NewTimeSpent=所花费的时间
 MyTimeSpent=我的时间花
 Tasks=任务
 Task=任务
@@ -59,6 +64,7 @@ TaskDescription=任务描述
 NewTask=新建任务
 AddTask=创建任务
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=活动
 Activities=任务/活动
 MyActivities=我的任务/活动
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=项目有关的合同列表
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=项目相关的干预措施列表
 ListExpenseReportsAssociatedProject=项目相关费用报销列表
 ListDonationsAssociatedProject=项目相关捐款列表
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=项目联系人
 ActionsOnProject=项目活动
 YouAreNotContactOfProject=你是不是这个私人项目联系
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=删除的时间
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=查看未分配给我的任务
@@ -110,7 +118,7 @@ TaskRessourceLinks=资源
 ProjectsDedicatedToThisThirdParty=这个项目致力于合伙人
 NoTasks=该项目没有任务
 LinkedToAnotherCompany=链接到其他合伙人
-TaskIsNotAffectedToYou=未分配给你的任务
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=所花费的时间是空的
 ThisWillAlsoRemoveTasks=这一行动也将删除所有项目任务 (<b>%s</b> 任务的时刻) ，花全部的时间都投入。
 IfNeedToUseOhterObjectKeepEmpty=如果某些对象(发票，订单，...)，属于其他合伙人，必须与该项目以创建，保持这个空项目多的合伙人。
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=输入天数
 InputPerWeek=输入周数
 InputPerAction=输入动作
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=项目的用户作为联系人
 TasksWithThisUserAsContact=任务分配给这个用户
 ResourceNotAssignedToProject=未分配到项目
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=分配任务给自己
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=分配
 ProjectOverview=概览
 ManageTasks=用项目跟进任务和工时
 ManageOpportunitiesStatus=用项目跟进机会/线索
 ProjectNbProjectByMonth=按月份筛选创建项目数
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=按月的机会加权数值
 ProjectOpenedProjectByOppStatus=按机会状态打开项目/线索
 ProjectsStatistics=统计项目/线索
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=机会数值总计
 OpportunityPonderatedAmount=机会加权数值
diff --git a/htdocs/langs/zh_TW/accountancy.lang b/htdocs/langs/zh_TW/accountancy.lang
index 1a2bcb9820c..115e212c047 100644
--- a/htdocs/langs/zh_TW/accountancy.lang
+++ b/htdocs/langs/zh_TW/accountancy.lang
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: 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
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (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 default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=General ledger
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
@@ -132,19 +140,19 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=List of the accounting accounts
 
 Pcgtype=Class of account
-Pcgsubtype=Under class of account
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=碼
+Nature=類型
+AccountingJournalType1=Various operation
+AccountingJournalType2=可否銷售
+AccountingJournalType3=可否採購
+AccountingJournalType4=银行
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Exports
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index e7c2a08d03f..e289bce6a50 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=公司員工用戶
 ExternalUsers=非公司員工用戶
 GUISetup=人機介面
 SetupArea=安裝面積
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=測試文件的形式上傳（根據設置）
 IfModuleEnabled=註：是的，是有效的，只有模組<b>%s</b>是啟用
 RemoveLock=刪除檔案 <b>%s</b> ，如果此檔案是因為升級工具產生的。
@@ -85,7 +86,7 @@ Mask=遮罩
 NextValue=下一個產生的值
 NextValueForInvoices=下一個發票(invoice)編碼值
 NextValueForCreditNotes=下一個信用債券編碼值
-NextValueForDeposit=Next value (deposit)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Next value (replacements)
 MustBeLowerThanPHPLimit=注意：你的PHP限制每個文件上傳的大小為<b>%s%s</b>的，不管這個參數的值
 NoMaxSizeByPHPLimit=註：不限制設置在你的PHP配置
@@ -103,7 +104,7 @@ MenuIdParent=父菜單編號
 DetailMenuIdParent=家長菜單（0編號為頂級菜單）
 DetailPosition=分類編號，以確定菜單位置
 AllMenus=所有
-NotConfigured=未配置
+NotConfigured=Module/Application not configured
 Active=活躍
 SetupShort=設定
 OtherOptions=其他選項
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=千位分隔符
 Destination=Destination
 IdModule=Module ID
 IdPermissions=Permissions ID
-Modules=模組
 LanguageBrowserParameter=%s的參數
 LocalisationDolibarrParameters=本地化參數
 ClientTZ=使用者時區
@@ -123,7 +123,8 @@ PHPTZ=PHP伺服器時區
 DaylingSavingTime=夏令時間（用戶）
 CurrentHour=當前 PHP伺服器時間
 CurrentSessionTimeOut=當前會話超時
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=小工具
 Boxes=小工具
 MaxNbOfLinesForBoxes=Max number of lines for widgets
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=權限
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=只有被<a href="modules.php"> modules.php </a>所啟用的模組才會顯示。
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=數據庫密碼conf.php加密（活性炭推薦
 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=保護生成的PDF文件（活性不推薦，休息質量PDF生成）
-ProtectAndEncryptPdfFilesDesc=一個PDF文檔保護不斷提供給閲讀和打印任何的PDF瀏覽器。然而，編輯和複製是不可能的了。請注意，使用此功能使全球累計PDF格式的建設工作不喜歡未付發票（）。
+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=功能特色
 DolibarrLicense=授權
 Developpers=開發商/貢獻者
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr在線演示
 OfficialMarketPlace=官方/插件外部模組市場
 OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
 ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=對於用戶或開發人員的文件（文檔，常見問題...), <br>看一看在Dolibarr維基看看： <br> <a href="%s" target="_blank"><b>%s的</b></a>
 ForAnswersSeeForum=對於任何其他問題/幫助，您可以使用Dolibarr論壇： <br> <a href="%s" target="_blank"><b>%s的</b></a>
 HelpCenterDesc1=這方面可以幫助你獲得一個Dolibarr幫助支持服務。
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=功能不可用在Unix類系統。在本地測試您
 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/
 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=模組設置
-ModulesSetup=模組設置
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=系統
 ModuleFamilyCrm=客戶關係管理（CRM）
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=此系統軟體(Dolibarr)目前版本
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Update server offline
+WithCounter=Manage a counter
 GenericMaskCodes=這個編碼模組使用方式如下:<br>1. <b>{000000}</b>表示每個 %s 編碼會依據此參數產生序號字串，且會自動遞增。有多少個0就表示序號字串有多長，滿最大值會自動歸0。<br>2. <b>{000000+000}</b> 同上面第一條，但是多了 offset 功能，也就第一筆 %s 編碼的起始序號會根據 + 號後面的參數而定。<br>3. <b>{000000@x}</b> 同上面第一條，但是每當為新的月份時，會將序號歸0。如果使用兩個x 則必需要有 {yy}{mm} 或 {yyyy}{mm} 參數。<br><b>{dd}</b> 表示天 (01 to 31).<br><b>{mm}</b> 表示月 (01 to 12)<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b>  表示用多少位數顯示年<br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=非遮罩字元的則該字元維持不變，也就是 A 就是 A，Z 就是 Z<br>注意:不允許空白字元<br>
-GenericMaskCodes4a=<u>例如: 第99筆 %s 資訊於 2007-01-31 建立完成：</u> <br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>例如: 於 2007-01-31 建立的客戶/供應商資訊:</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>
+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=根據事先定義的遮罩值，回傳一個客制化的編號，詳細可參照說明。
 ServerAvailableOnIPOrPort=服務器可在地址<b>%s%s的</b>連接埠上
 ServerNotAvailableOnIPOrPort=服務器而不是<b>%</b>可在地址<b>的</b>港口<b>%s</b>對
@@ -369,19 +375,21 @@ Int=Integer
 Float=Float
 DateAndTime=日期時間
 Unique=Unique
-Boolean=Boolean (Checkbox)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = 電話
 ExtrafieldPrice = 價格
 ExtrafieldMail = Email
 ExtrafieldUrl = Url
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=密碼
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldRadio=Radio buttons (on 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'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,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=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
 ClickToShowDescription=Click to show description
+DependsOn=This module need 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:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=欄位
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=用戶和組
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=客戶發票(invoice)和票據(credit note)的管理。供應商發
 Module40Name=供應商
 Module40Desc=供應商的管理和採購管理（訂單和發票）
 Module42Name=系統日誌
-Module42Desc=測井設備（系統日誌）
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=編輯
 Module49Desc=編輯器的管理
 Module50Name=產品
@@ -499,8 +521,8 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar一體化
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=通知
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=geoip的Maxmind轉換能力
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
-Module4000Desc=Human resources management
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=多公司
 Module5000Desc=允許你管理多個公司
 Module6000Name=Workflow
@@ -591,7 +615,7 @@ Permission32=建立/修改產品資訊
 Permission34=刪除產品資訊
 Permission36=查看/隱藏產品管理
 Permission38=匯出產品資訊
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=刪除項目（共享的項目和項目我聯繫）
 Permission45=Export projects
@@ -844,12 +868,14 @@ DictionaryOrderMethods=排列方法
 DictionarySource=訂單來源方式
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Emails templates
 DictionaryUnits=單位
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=設定值已儲存
+SetupNotSaved=Setup not saved
 BackToModuleList=返回模組列表
 BackToDictionaryList=回到設定選項列表
 VATManagement=營業稅管理
@@ -921,7 +947,7 @@ Host=服務器
 DriverType=驅動類型
 SummarySystem=系統資訊摘要
 SummaryConst=列出所有Dolibarr設置參數
-MenuCompanySetup=公司資訊
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= 標準菜單管理
 DefaultMenuSmartphoneManager=智能手機菜單管理
 Skin=佈景主題
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Default max length for lists
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=消息的一天
 MessageLogin=登錄頁的信息
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=常駐左搜尋列表菜單
 DefaultLanguage=預設語言使用（語言代碼）
 EnableMultilangInterface=啟用多語言界面
 EnableShowLogo=在菜單上顯示的標誌
-CompanyInfo=公司/基本資訊
-CompanyIds=公司/基本ID
+CompanyInfo=Company/organisation information
+CompanyIds=Company/organisation identities
 CompanyName=名稱
 CompanyAddress=地址
 CompanyZip=郵遞區號
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=其他菜單項管理可選參數。
 LogEvents=安全稽核事件
 Audit=安全稽核
@@ -987,7 +1015,7 @@ BrowserOS=Browser OS
 ListOfSecurityEvents=安全事件清單
 SecurityEventsPurged=安全事件清除
 LogEventDesc=在這裡您可以啟用的Dolibarr安全事件日誌記錄。管理員就可以看到它的菜單內容，通過<b>系統工具-稽核</b> 。警告，此功能可以在數據庫中消耗了大量數據。
-AreaForAdminOnly=這些功能都可以使用<b>管理員用戶</b> 。
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=只有系統管理員可以取得系統資訊。
 SystemAreaForAdminOnly=此區是只給具有管理員權限的使用者。在此系統軟體中，這是必要的限制。
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists 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
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=專業術語欄位ID是否獨一無二
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=出口連接到<b>%s</b>格式可在以下連結：%s的
 ##### Invoices #####
 BillsSetup=發票模組設置
 BillsNumberingModule=發票編號和信用票據模組
 BillsPDFModules=發票文件範本
+PaymentsPDFModules=Payment documents models
 CreditNote=信用注意
 CreditNotes=信用票據
 ForceInvoiceDate=強制使用驗證日期為發票(invoice)日期
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
 FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
 FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
 CacheByServer=Cache by server
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
+CompressionOfResourcesDesc=For exemple 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 your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=產品模組設置
 ServiceSetup=服務模組的設置
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=使用的發票日期
 Buy=購買
 Sell=出售
 InvoiceDateUsed=使用的發票日期
-YourCompanyDoesNotUseVAT=貴公司已被定義為不使用增值稅（首頁 - 安裝 - 公司/基金會），所以沒有設置增值稅的選擇。
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=會計準則
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=點擊撥號模組設置
-ClickToDialUrlDesc=連結時調用一個電話象形點擊完成。丹斯l'網址，vous pouvez utiliser萊balises <br> <b>%%1 $ s的</b>誇血清remplacé電話桿樂德l' appelé <br> <b>%%2 $ s的</b>誇血清remplacé電話桿樂德l' appelant（樂votre） <br> <b>%%3 $ s的</b>誇血清remplacé桿votre登錄clicktodial（定義所涵蓋河畔votre膠片utilisateur） <br> <b>%%4 $ s的</b>誇血清remplacé桿votre摩托羅拉德過時clicktodial（定義所涵蓋河畔votre膠片utilisateur）。
+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.
 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 same computer than 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.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+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.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=一般的顯示順序
 BankOrderES=西班牙人
 BankOrderESDesc=西班牙的顯示順序
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=多模組安裝公司
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ 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.
 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.
-ConfFileMuseContainCustom=Installing 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)
 TextTitleColor=Color of page title
 LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 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
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+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 try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/zh_TW/compta.lang b/htdocs/langs/zh_TW/compta.lang
index e47375ad955..8505bf63968 100644
--- a/htdocs/langs/zh_TW/compta.lang
+++ b/htdocs/langs/zh_TW/compta.lang
@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using r
 Param=格局
 RemainingAmountPayment=付款金額其余：
 Account=帳戶
-Accountparent=Account parent
-Accountsparent=Accounts parent
+Accountparent=Parent account
+Accountsparent=Parent accounts
 Income=收入
 Outcome=費用
 ReportInOut=收入/支出
@@ -56,6 +56,7 @@ MenuTaxAndDividends=稅和股息
 MenuSocialContributions=Social/fiscal taxes
 MenuNewSocialContribution=New social/fiscal tax
 NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=財務/會計區
 NewPayment=新的支付
@@ -134,8 +135,8 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- 它包括所有從客戶收到發票有效付款。 <br> - 這是對這些發票的付款日期為基礎<br>
-DepositsAreNotIncluded=- 存款發票，也不包括
-DepositsAreIncluded=- 存款發票
+DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=報告由第三方IRPF
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
 VATReport=VAT report
@@ -169,7 +170,7 @@ DescSellsJournal=銷售雜誌
 DescPurchasesJournal=購買雜誌
 InvoiceRef=發票編號。
 CodeNotDef=沒有定義
-WarningDepositsNotIncluded=存款發票不包括在此版本與本會計模塊。
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
 Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
@@ -189,8 +190,10 @@ AccountancyJournal=Accountancy code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/zh_TW/cron.lang b/htdocs/langs/zh_TW/cron.lang
index d220e226056..15f6c089257 100644
--- a/htdocs/langs/zh_TW/cron.lang
+++ b/htdocs/langs/zh_TW/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allow to execute job that have been planned
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Job
 CronNone=無
 CronDtStart=Not before
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=禁用
 CronTaskInactive=This job is disabled
 CronId=Id
-CronClassFile=Classes (filename.class.php)
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=From
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/htdocs/langs/zh_TW/errors.lang b/htdocs/langs/zh_TW/errors.lang
index 26f9692cb4b..4fe69b16b2f 100644
--- a/htdocs/langs/zh_TW/errors.lang
+++ b/htdocs/langs/zh_TW/errors.lang
@@ -18,6 +18,8 @@ ErrorFailToCreateFile=無法創建文件<b>'%s'</b>的。
 ErrorFailToRenameDir=無法重命名目錄<b>'%s'</b>到<b>%s'</b>的。
 ErrorFailToCreateDir=無法創建目錄<b>'%s'</b>的。
 ErrorFailToDeleteDir=無法刪除目錄<b>'%s'</b>的。
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=這個聯絡已定義為這種類型的接觸。
 ErrorCashAccountAcceptsOnlyCashMoney=這是一個銀行帳戶的現金帳戶，所以只接受現金支付的類型。
 ErrorFromToAccountsMustDiffers=源和目標的銀行帳戶必須是不同的。
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=無法寫在目錄%s
 ErrorFoundBadEmailInFile=找到%S的語法不正確的電子郵件文件中的行（例如行%的電子郵件s =%s）的
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=一些必要的欄位都沒有填補。
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=無法創建一個目錄。檢查Web服務器的用戶有權限寫入Dolibarr文件目錄。如果參數<b>safe_mode設置</b>為啟用這個PHP，檢查Dolibarr php文件到Web服務器的用戶擁有（或組）。
 ErrorNoMailDefinedForThisUser=沒有郵件定義該用戶
 ErrorFeatureNeedJavascript=此功能需要Javascript被激活的工作。更改此設置 - 顯示。
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoice
 ErrorWebServerUserHasNotPermission=<b>%s</b>用來執行Web服務器用戶帳戶沒有該權限
 ErrorNoActivatedBarcode=沒有激活的條碼類型
 ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # 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.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice
 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/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang
index 7a67ec9df40..0c02e3e3c79 100644
--- a/htdocs/langs/zh_TW/main.lang
+++ b/htdocs/langs/zh_TW/main.lang
@@ -43,7 +43,7 @@ ErrorConstantNotDefined=不是定義的參數%
 ErrorUnknown=未知錯誤
 ErrorSQL=SQL錯誤
 ErrorLogoFileNotFound=徽標文件'%s'沒有找到
-ErrorGoToGlobalSetup=到'公司/基金會的設置來解決此
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=前往模塊設置來解決此
 ErrorFailedToSendMail=錯誤!無法傳送郵件（寄件人=%s、收件人=%s）。
 ErrorFileNotUploaded=文件沒有上傳。檢查大小不超過允許的最大值，即在磁盤上的可用空間是可用和有沒有這已經與in這個目錄同名文件。
@@ -153,6 +153,7 @@ Edit=編輯
 Validate=確認
 ValidateAndApprove=確認核准
 ToValidate=為了驗證
+NotValidated=Not validated
 Save=儲存
 SaveAs=另存為
 TestConnection=測試連接
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=No applicative disconnect feature with authenticatio
 Connection=連接
 Setup=設定
 Alert=提示
+MenuWarnings=其他快訊資訊
 Previous=前一筆
 Next=下一筆
 Cards=資訊卡
@@ -308,6 +310,7 @@ Copy=複製
 Paste=貼上
 Default=預設
 DefaultValue=預設值
+DefaultValues=Default values
 Price=價格
 UnitPrice=單價
 UnitPriceHT=單位價格（凈值）
@@ -363,7 +366,8 @@ VATRate=營業稅率
 Average=平均
 Sum=總和
 Delta=三角洲
-Module=模組
+Module=Module/Application
+Modules=Modules/Applications
 Option=選項
 List=清單列表
 FullList=全部列表
@@ -387,7 +391,7 @@ ActionRunningNotStarted=未開始
 ActionRunningShort=In progress
 ActionDoneShort=成品
 ActionUncomplete=Uncomplete
-CompanyFoundation=公司資訊設定
+CompanyFoundation=Company/Organisation
 ContactsForCompany=聯系方式/不會忽略這個第三者
 ContactsAddressesForCompany=此客戶(供應商)的聯絡人及地址清單
 AddressesForCompany=Addresses for this third party
@@ -405,8 +409,9 @@ Generate=產生
 Duration=為期
 TotalDuration=總時間
 Summary=摘要
-DolibarrStateBoard=統計
-DolibarrWorkBoard=任務工作板
+DolibarrStateBoard=Database statistics
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=可用的
 NotYetAvailable=尚未提供
 NotAvailable=不適用
@@ -434,7 +439,7 @@ Reportings=報表
 Draft=草案
 Drafts=草稿
 Validated=驗證
-Opened=開業
+Opened=開放
 New=新
 Discount=折扣
 Unknown=未知
@@ -453,6 +458,7 @@ NextStep=下一步
 Datas=數據
 None=無
 NoneF=無
+NoneOrSeveral=None or several
 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.
 Photo=圖片
@@ -606,7 +612,8 @@ PartialWoman=部分
 TotalWoman=全部
 NeverReceived=從未收到
 Canceled=取消
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
+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
 Color=彩色
 Documents=附加檔案
@@ -642,6 +649,7 @@ FreeLineOfType=Free entry of type
 CloneMainAttributes=複製的對象，其主要屬性
 PDFMerge=合併PDF
 Merge=合併
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=全螢幕顯示資訊區
 MenuManager=Menu manager
 WarningYouAreInMaintenanceMode=警告，你是在維護模式，因此，只有登錄<b>%s</b>是允許使用在目前的應用。
@@ -708,6 +716,7 @@ from=從
 toward=toward
 Access=Access
 SelectAction=Select action
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=按 Ctrl+C 複製
 SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
 OriginFileName=原始檔名
@@ -718,7 +727,7 @@ ViewPrivateNote=View notes
 XMoreLines=%s line(s) hidden
 PublicUrl=公開網址
 AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
+SelectElementAndClick=Select an element and click %s
 PrintFile=列印檔案 %s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
@@ -734,8 +743,8 @@ Hello=Hello
 Sincerely=敬祝商祺
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
@@ -755,11 +764,20 @@ Calendar=日歷
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=星期一
 Tuesday=星期二
@@ -817,5 +835,3 @@ SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=休假
-
-BulkActions=Bulk actions
diff --git a/htdocs/langs/zh_TW/other.lang b/htdocs/langs/zh_TW/other.lang
index 412a760ea54..7a10c5cad7a 100644
--- a/htdocs/langs/zh_TW/other.lang
+++ b/htdocs/langs/zh_TW/other.lang
@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=出生日期
 BirthdayAlertOn=生日提醒活躍
 BirthdayAlertOff=生日提醒無效
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=幹預驗證
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=這是一個<b>測試</b>郵件（單詞測試必須大
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>教授ID為%s</b>是一個國家的信息取決於第三方。 <br>例如，對於國家的<b>%s，</b>它的代碼<b>的%s。</b>
 DolibarrDemo=Dolibarr的ERP / CRM的演示
-StatsByNumberOfUnits=根據單位數統計的產品/服務
-StatsByNumberOfEntities=根據實體數統計的產品/服務
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=幹預%s已被驗證。
 EMailTextInvoiceValidated=發票%s已被確認。
diff --git a/htdocs/langs/zh_TW/projects.lang b/htdocs/langs/zh_TW/projects.lang
index a00589c9c8d..1e9e446321d 100644
--- a/htdocs/langs/zh_TW/projects.lang
+++ b/htdocs/langs/zh_TW/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=每個人
 PrivateProject=項目聯系人
+ProjectsImContactFor=Projects I'm explicitely a contact of
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=所有項目
 MyProjectsDesc=這種觀點是有限的項目你是一個接觸（不管是類型）。
 ProjectsPublicDesc=這種觀點提出了所有你被允許閱讀的項目。
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=這種觀點提出的所有項目和任務（您的用戶權限批準
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=新項目
 AddProject=Create project
 DeleteAProject=刪除一個項目
 DeleteATask=刪除任務
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Opened projects
-OpenedTasks=Opened tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpenedProjects=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=顯示項目
 SetProject=設置項目
 NoProject=沒有項目或擁有的定義
 NbOfProjects=鈮項目
+NbOfTasks=Nb of tasks
 TimeSpent=花費的時間
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
@@ -47,9 +52,9 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=用戶
 TaskTimeNote=註解
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
-NewTimeSpent=新的時間
+NewTimeSpent=所花費的時間
 MyTimeSpent=我的時間花
 Tasks=任務
 Task=任務
@@ -59,6 +64,7 @@ TaskDescription=Task description
 NewTask=新任務
 AddTask=Create task
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=活動
 Activities=任務/活動
 MyActivities=我的任務/活動
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=名單與項目有關的合同
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=名單與項目相關的幹預措施
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=項目聯系人
 ActionsOnProject=行動項目
 YouAreNotContactOfProject=你是不是這個私人項目聯系
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=刪除的時間
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
@@ -110,7 +118,7 @@ TaskRessourceLinks=資源
 ProjectsDedicatedToThisThirdParty=這個項目致力於第三方
 NoTasks=該項目沒有任務
 LinkedToAnotherCompany=鏈接到其他第三方
-TaskIsNotAffectedToYou=Task not assigned to you
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=所花費的時間是空的
 ThisWillAlsoRemoveTasks=這一行動也將刪除所有項目任務<b>（%s</b>任務的時刻），花全部的時間都投入。
 IfNeedToUseOhterObjectKeepEmpty=如果某些對象（發票，訂單，...），屬於其他第三方，必須與該項目以創建，保持這個空項目多的第三方。
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
 ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount

From 068460540c1b9af6c5491cfa1d0c76514da5d41c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Jun 2017 21:38:33 +0200
Subject: [PATCH 308/438] Full enable of pgsql in CI

---
 .travis.yml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fc892b7178b..473a1ac8fba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,7 +58,7 @@ matrix:
   allow_failures:
   - php: 7.1
   - php: nightly
-  - env: DB=postgresql
+  #- env: DB=postgresql
   # TODO
   #- env: DB=sqlite
 
@@ -261,18 +261,16 @@ script:
   echo "Checking PHP syntax errors"
   # Ensure we catch errors
   set -e
-  #parallel-lint --exclude htdocs/includes --blame .
+  parallel-lint --exclude htdocs/includes --blame .
   set +e
   echo
 
-# TODO: dev/* checks
-
 - |
   echo "Checking coding style"
   # Ensure we catch errors
   set -e
   # Exclusions are defined in the ruleset.xml file
-  #phpcs -s -n -p -d memory_limit=-1 --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 .
+  phpcs -s -n -p -d memory_limit=-1 --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 .
   set +e
   echo
 
@@ -280,8 +278,6 @@ script:
 
 # TODO: Check CSS (csslint?)
 
-# TODO: check SQL syntax (pgsanity?)
-
 - |
   echo "Upgrading Dolibarr"
   # Ensure we catch errors

From 95573e86080ed9de82fa491324263631738f03f2 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Mon, 19 Jun 2017 21:39:43 +0200
Subject: [PATCH 309/438] Fix : Accountancy - Debug

---
 htdocs/accountancy/admin/index.php            |   1 +
 htdocs/accountancy/bookkeeping/card.php       | 191 ++++++++++++------
 .../accountancy/class/bookkeeping.class.php   |   6 +-
 .../journal/expensereportsjournal.php         |   2 +-
 htdocs/accountancy/journal/sellsjournal.php   |   7 +-
 5 files changed, 136 insertions(+), 71 deletions(-)

diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index 0e1f67a0e61..2d6ee046bbc 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -31,6 +31,7 @@ require '../../main.inc.php';
 
 // Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 
 $langs->load("compta");
 $langs->load("bills");
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 680a2d25470..3c6d2faec94 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -1,7 +1,7 @@
 <?php
-/* Copyright (C) 2013-2017 Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013-2017 Florian Henry        <florian.henry@open-concept.pro>
- * Copyright (C) 2013-2017 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+/* Copyright (C) 2013-2017 Olivier Geffroy		<jeff@jeffinfo.com>
+ * Copyright (C) 2013-2017 Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2017 Alexandre Spangaro	<aspangaro@zendsi.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,16 +40,19 @@ if ($user->societe_id > 0) {
 $action = GETPOST('action');
 $mode = GETPOST('mode');
 $piece_num = GETPOST("piece_num");
+
 $mesg = '';
+
 $account_number = GETPOST('account_number');
-$code_tiers = GETPOST('code_tiers');
-if ($code_tiers == - 1) {
-	$code_tiers = null;
+$subledger_account = GETPOST('subledger_account');
+if ($subledger_account == - 1) {
+	$subledger_account = null;
 }
 $label_compte = GETPOST('label_compte');
 $label_operation= GETPOST('label_operation');
 $debit = price2num(GETPOST('debit'));
 $credit = price2num(GETPOST('credit'));
+
 $save = GETPOST('save');
 if (! empty($save)) {
 	$action = 'add';
@@ -60,23 +63,28 @@ if (! empty($update)) {
 }
 $object = new BookKeeping($db);
 if ($action == "confirm_update") {
+
 	$error = 0;
+
 	if ((floatval($debit) != 0.0) && (floatval($credit) != 0.0)) {
 		setEventMessages($langs->trans('ErrorDebitCredit'), null, 'errors');
 		$error ++;
 	}
+
 	if (empty($error)) {
 		$book = new BookKeeping($db);
+
 		$result = $book->fetch($id, null, $mode);
 		if ($result < 0) {
 			setEventMessages($book->error, $book->errors, 'errors');
 		} else {
 			$book->numero_compte = $account_number;
-			$book->code_tiers = $code_tiers;
+			$book->subledger_account = $subledger_account;
 			$book->label_compte = $label_compte;
 			$book->label_operation= $label_operation;
 			$book->debit = $debit;
 			$book->credit = $credit;
+
 			if (floatval($debit) != 0.0) {
 				$book->montant = $debit;
 				$book->sens = 'D';
@@ -85,6 +93,7 @@ if ($action == "confirm_update") {
 				$book->montant = $credit;
 				$book->sens = 'C';
 			}
+
 			$result = $book->update($user, false, $mode);
 			if ($result < 0) {
 				setEventMessages($book->error, $book->errors, 'errors');
@@ -95,16 +104,20 @@ if ($action == "confirm_update") {
 		}
 	}
 }
+
 else if ($action == "add") {
 	$error = 0;
+
 	if ((floatval($debit) != 0.0) && (floatval($credit) != 0.0)) {
 		setEventMessages($langs->trans('ErrorDebitCredit'), null, 'errors');
 		$error ++;
 	}
+
 	if (empty($error)) {
 		$book = new BookKeeping($db);
+
 		$book->numero_compte = $account_number;
-		$book->code_tiers = $code_tiers;
+		$book->subledger_account = $subledger_account;
 		$book->label_compte = $label_compte;
 		$book->label_operation= $label_operation;
 		$book->debit = $debit;
@@ -116,14 +129,17 @@ else if ($action == "add") {
 		$book->code_journal = GETPOST('code_journal');
 		$book->fk_doc = GETPOST('fk_doc');
 		$book->fk_docdet = GETPOST('fk_docdet');
+
 		if (floatval($debit) != 0.0) {
 			$book->montant = $debit;
 			$book->sens = 'D';
 		}
+
 		if (floatval($credit) != 0.0) {
 			$book->montant = $credit;
 			$book->sens = 'C';
 		}
+
 		$result = $book->createStd($user, false, $mode);
 		if ($result < 0) {
 			setEventMessages($book->error, $book->errors, 'errors');
@@ -133,10 +149,13 @@ else if ($action == "add") {
 		}
 	}
 }
+
 else if ($action == "confirm_delete") {
 	$book = new BookKeeping($db);
+
 	$result = $book->fetch($id, null, $mode);
 	$piece_num = $book->piece_num;
+
 	if ($result < 0) {
 		setEventMessages($book->error, $book->errors, 'errors');
 	} else {
@@ -147,41 +166,47 @@ else if ($action == "confirm_delete") {
 	}
 	$action = '';
 }
+
 else if ($action == "confirm_create") {
-    $error = 0;
-    $book = new BookKeeping($db);
+	$error = 0;
+
+	$book = new BookKeeping($db);
+
 	if (! GETPOST('next_num_mvt'))
 	{
-	    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NumPiece")), null, 'errors');
-	    $error++;
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NumPiece")), null, 'errors');
+		$error++;
 	}
+
 	if (! $error)
 	{
-    	$book->label_compte = '';
-    	$book->debit = 0;
-    	$book->credit = 0;
-    	$book->doc_date = $date_start = dol_mktime(0, 0, 0, GETPOST('doc_datemonth'), GETPOST('doc_dateday'), GETPOST('doc_dateyear'));
-    	$book->doc_type = GETPOST('doc_type');
-    	$book->piece_num = GETPOST('next_num_mvt');
-    	$book->doc_ref = GETPOST('doc_ref');
-    	$book->code_journal = GETPOST('code_journal');
-    	$book->fk_doc = 0;
-    	$book->fk_docdet = 0;
-    	$book->montant = 0;
-    	$result = $book->createStd($user,0, $mode);
-    	if ($result < 0) {
-    		setEventMessages($book->error, $book->errors, 'errors');
-    	} else {
-    		setEventMessages($langs->trans('Saved'), null, 'mesgs');
-    		$action = 'update';
-    		$id=$book->id;
-    		$piece_num = $book->piece_num;
-    	}
+		$book->label_compte = '';
+		$book->debit = 0;
+		$book->credit = 0;
+		$book->doc_date = $date_start = dol_mktime(0, 0, 0, GETPOST('doc_datemonth'), GETPOST('doc_dateday'), GETPOST('doc_dateyear'));
+		$book->doc_type = GETPOST('doc_type');
+		$book->piece_num = GETPOST('next_num_mvt');
+		$book->doc_ref = GETPOST('doc_ref');
+		$book->code_journal = GETPOST('code_journal');
+		$book->fk_doc = 0;
+		$book->fk_docdet = 0;
+		$book->montant = 0;
+
+		$result = $book->createStd($user,0, $mode);
+		if ($result < 0) {
+			setEventMessages($book->error, $book->errors, 'errors');
+		} else {
+			setEventMessages($langs->trans('Saved'), null, 'mesgs');
+			$action = 'update';
+			$id=$book->id;
+			$piece_num = $book->piece_num;
+		}
 	}
 }
+
 if ($action == 'setdate') {
 	$datedoc = dol_mktime(0, 0, 0, GETPOST('doc_datemonth'), GETPOST('doc_dateday'), GETPOST('doc_dateyear'));
-	$result = $object->upddateByMvt($piece_num,'doc_date',$db->idate($datedoc),$mode);
+	$result = $object->updateByMvt($piece_num,'doc_date',$db->idate($datedoc),$mode);
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 	} else {
@@ -189,12 +214,13 @@ if ($action == 'setdate') {
 		$action = '';
 	}
 }
+
 if ($action == 'setjournal') {
 	$journaldoc = trim(GETPOST('code_journal'));
 	if (!empty($journaldoc)) {
 		$journaldoc='\''.$journaldoc.'\'';
 	}
-	$result = $object->upddateByMvt($piece_num,'code_journal',$journaldoc,$mode);
+	$result = $object->updateByMvt($piece_num,'code_journal',$journaldoc,$mode);
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 	} else {
@@ -202,12 +228,13 @@ if ($action == 'setjournal') {
 		$action = '';
 	}
 }
+
 if ($action == 'setdocref') {
 	$refdoc = trim(GETPOST('doc_ref'));
 	if (!empty($refdoc)) {
 		$refdoc='\''.$refdoc.'\'';
 	}
-	$result = $object->upddateByMvt(doc_ref,'code_journal',$refdoc,$mode);
+	$result = $object->updateByMvt(doc_ref,'code_journal',$refdoc,$mode);
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 	} else {
@@ -215,6 +242,7 @@ if ($action == 'setdocref') {
 		$action = '';
 	}
 }
+
 if ($action == 'valid') {
 	$result = $object->transformTransaction(0,$piece_num);
 	if ($result < 0) {
@@ -224,6 +252,7 @@ if ($action == 'valid') {
 		exit;
 	}
 }
+
 /*
  * View
  */
@@ -237,47 +266,61 @@ if ($action == 'delete') {
 	$formconfirm = $html->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $id.'&mode='. $mode, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt'), 'confirm_delete', '', 0, 1);
 	print $formconfirm;
 }
+
 if ($action == 'create') {
 	print load_fiche_titre($langs->trans("CreateMvts"));
+
 	$book = new BookKeeping($db);
 	$next_num_mvt = $book->getNextNumMvt('_tmp');
-    if (empty($next_num_mvt))
-    {
-        dol_print_error('', 'Failed to get next piece number');
-    }
+
+	if (empty($next_num_mvt))
+	{
+		dol_print_error('', 'Failed to get next piece number');
+	}
+
 	print '<form action="' . $_SERVER["PHP_SELF"] . '" name="create_mvt" method="POST">';
 	print '<input type="hidden" name="action" value="confirm_create">' . "\n";
 	print '<input type="hidden" name="next_num_mvt" value="' . $next_num_mvt . '">' . "\n";
 	print '<input type="hidden" name="mode" value="_tmp">' . "\n";
+
 	dol_fiche_head();
+
 	print '<table class="border" width="100%">';
 	print '<tr>';
 	print '<td class="titlefieldcreate fieldrequired">' . $langs->trans("NumPiece") . '</td>';
 	print '<td>' . $next_num_mvt . '</td>';
 	print '</tr>';
+
 	print '<tr>';
 	print '<td class="fieldrequired">' . $langs->trans("Docdate") . '</td>';
 	print '<td>';
 	print $html->select_date('', 'doc_date', '', '', '', "create_mvt", 1, 1);
 	print '</td>';
 	print '</tr>';
+
 	print '<tr>';
 	print '<td class="fieldrequired">' . $langs->trans("Codejournal") . '</td>';
 	print '<td>' . $formaccounting->select_journal(GETPOST('code_journal'),'code_journal',0,0,array(),1,1) . '</td>';
 	print '</tr>';
+
 	print '<tr>';
 	print '<td>' . $langs->trans("Docref") . '</td>';
-	print '<td><input type="text" size="20" name="doc_ref" value=""/></td>';
+	print '<td><input type="text" class="minwidth200" name="doc_ref" value=""/></td>';
 	print '</tr>';
+
 	print '<tr>';
 	print '<td>' . $langs->trans("Doctype") . '</td>';
-	print '<td><input type="text" size="20" name="doc_type" value=""/></td>';
+	print '<td><input type="text" class="minwidth200 name="doc_type" value=""/></td>';
 	print '</tr>';
+
 	print '</table>';
+
 	dol_fiche_end();
+
 	print '<div align="center"><input type="submit" class="button" value="' . $langs->trans("Create") . '">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="button" value="' . $langs->trans("Cancel") . '" class="button" onclick="history.go(-1)" />';
 	print '</div>';
+
 	print '</form>';
 } else {
 	$book = new BookKeeping($db);
@@ -286,16 +329,21 @@ if ($action == 'create') {
 		setEventMessages($book->error, $book->errors, 'errors');
 	}
 	if (! empty($book->piece_num)) {
+
 		print load_fiche_titre($langs->trans("UpdateMvts"), '<a href="list.php">' . $langs->trans('BackToList') . '</a>');
+
 		dol_fiche_head();
+
 		print '<div class="fichehalfleft">';
 		print '<div class="underbanner clearboth"></div>';
 		print '<table class="border" width="100%">';
-		// account mouvment
+
+		// account movement
 		print '<tr class="pair">';
 		print '<td class="titlefield">' . $langs->trans("NumMvts") . '</td>';
 		print '<td>' . $book->piece_num . '</td>';
 		print '</tr>';
+
 		// date
 		print '<tr class="impair"><td>';
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
@@ -368,11 +416,14 @@ if ($action == 'create') {
 		print '<td>' . $book->doc_type . '</td>';
 		print '</tr>';
 		print '</table>';
+
 		print '</div>';
+
 		print '<div class="fichehalfright"><div class="ficheaddleft">';
 		print '<div class="underbanner clearboth"></div>';
 		print '<table class="border tableforfield" width="100%">';
-		//Validate
+
+		// Validate
 		print '<tr class="pair">';
 		print '<td class="titlefield">' . $langs->trans("Status") . '</td>';
 		print '<td>';
@@ -394,17 +445,17 @@ if ($action == 'create') {
 		if ($book->doc_type == 'customer_invoice')
 		{
 		 $sqlmid = 'SELECT rowid as ref';
-		    $sqlmid .= " FROM ".MAIN_DB_PREFIX."facture as fac";
-		    $sqlmid .= " WHERE fac.rowid=" . $book->fk_doc;
-		    dol_syslog("accountancy/bookkeeping/card.php::sqlmid=" . $sqlmid, LOG_DEBUG);
-		    $resultmid = $db->query($sqlmid);
-		    if ($resultmid) {
-		        $objmid = $db->fetch_object($resultmid);
-		        $invoicestatic = new Facture($db);
-		        $invoicestatic->fetch($objmid->ref);
-		        $ref=$langs->trans("Invoice").' '.$invoicestatic->getNomUrl(1);
-		    }
-		    else dol_print_error($db);
+			$sqlmid .= " FROM ".MAIN_DB_PREFIX."facture as fac";
+			$sqlmid .= " WHERE fac.rowid=" . $book->fk_doc;
+			dol_syslog("accountancy/bookkeeping/card.php::sqlmid=" . $sqlmid, LOG_DEBUG);
+			$resultmid = $db->query($sqlmid);
+			if ($resultmid) {
+				$objmid = $db->fetch_object($resultmid);
+				$invoicestatic = new Facture($db);
+				$invoicestatic->fetch($objmid->ref);
+				$ref=$langs->trans("Invoice").' '.$invoicestatic->getNomUrl(1);
+			}
+			else dol_print_error($db);
 		}
 		*/
 		print '<td>' . $ref .'</td>';
@@ -413,11 +464,14 @@ if ($action == 'create') {
 		print '</div></div>';
 		print '<div style="clear:both"></div>';
 		print '<br>';
+
 		$result = $book->fetchAllPerMvt($piece_num, $mode);
 		if ($result < 0) {
 			setEventMessages($book->error, $book->errors, 'errors');
 		} else {
+
 			print load_fiche_titre($langs->trans("ListeMvts"), '', '');
+
 			print '<form action="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $book->piece_num . '" method="post">';
 			print '<input type="hidden" name="doc_date" value="' . $book->doc_date . '">' . "\n";
 			print '<input type="hidden" name="doc_type" value="' . $book->doc_type . '">' . "\n";
@@ -426,30 +480,37 @@ if ($action == 'create') {
 			print '<input type="hidden" name="fk_doc" value="' . $book->fk_doc . '">' . "\n";
 			print '<input type="hidden" name="fk_docdet" value="' . $book->fk_docdet . '">' . "\n";
 			print '<input type="hidden" name="mode" value="' . $mode . '">' . "\n";
+
 			print "<table class=\"noborder\" width=\"100%\">";
 			if (count($book->linesmvt) > 0) {
+
 				$total_debit = 0;
 				$total_credit = 0;
+
 				print '<tr class="liste_titre">';
+
 				print_liste_field_titre($langs->trans("AccountAccountingShort"));
-				print_liste_field_titre($langs->trans("Code_tiers"));
+				print_liste_field_titre($langs->trans("Subledger_account"));
 				print_liste_field_titre($langs->trans("Labelcompte"));
 				print_liste_field_titre($langs->trans("Labeloperation"));
 				print_liste_field_titre($langs->trans("Debit"), "", "", "", "", 'align="center"');
 				print_liste_field_titre($langs->trans("Credit"), "", "", "", "", 'align="center"');
 				print_liste_field_titre($langs->trans("Action"), "", "", "", "", 'width="60" align="center"');
+
 				print "</tr>\n";
+
 				foreach ( $book->linesmvt as $line ) {
 					$var = ! $var;
 					print '<tr' . $bc[$var] . '>';
 					$total_debit += $line->debit;
 					$total_credit += $line->credit;
+
 					if ($action == 'update' && $line->id == $id) {
 						print '<td>';
 						print $formaccounting->select_account($line->numero_compte, 'account_number', 0, array (), 1, 1, '');
 						print '</td>';
 						print '<td>';
-						print $formaccounting->select_auxaccount($line->code_tiers, 'code_tiers', 1);
+						print $formaccounting->select_auxaccount($line->subledger_account, 'subledger_account', 1);
 						print '</td>';
 						print '<td><input type="text" size="15" name="label_compte" value="' . $line->label_compte . '"/></td>';
 						print '<td><input type="text" size="15" name="label_operation" value="' . $line->label_operation. '"/></td>';
@@ -461,34 +522,37 @@ if ($action == 'create') {
 						print '</td>';
 					} else {
 						print '<td>' . length_accountg($line->numero_compte) . '</td>';
-						print '<td>' . length_accounta($line->code_tiers) . '</td>';
+						print '<td>' . length_accounta($line->subledger_account) . '</td>';
 						print '<td>' . $line->label_compte . '</td>';
 						print '<td>' . $line->label_operation. '</td>';
 						print '<td align="right">' . price($line->debit) . '</td>';
 						print '<td align="right">' . price($line->credit) . '</td>';
+
 						print '<td align="center">';
-						print '<a href="./card.php?action=update&amp;id=' . $line->id . '&amp;piece_num=' . $line->piece_num . '&amp;mode='.$mode.'">';
+						print '<a href="' . $_SERVER["PHP_SELF"] . '?action=update&amp;id=' . $line->id . '&amp;piece_num=' . $line->piece_num . '&amp;mode='.$mode.'">';
 						print img_edit();
 						print '</a>&nbsp;';
-						print '<a href="./card.php?action=delete&amp;id=' . $line->id . '&amp;piece_num=' . $line->piece_num . '&amp;mode='.$mode.'">';
+						print '<a href="' . $_SERVER["PHP_SELF"] . '?action=delete&amp;id=' . $line->id . '&amp;piece_num=' . $line->piece_num . '&amp;mode='.$mode.'">';
 						print img_delete();
+
 						print '</a>';
 						print '</td>';
 					}
 					print "</tr>\n";
 				}
+
 				if ($total_debit != $total_credit)
 				{
 					setEventMessages(null, array($langs->trans('MvtNotCorrectlyBalanced', $total_credit, $total_debit)), 'warnings');
 				}
+
 				if ($action == "" || $action == 'add') {
-					$var = ! $var;
-					print '<tr' . $bc[$var] . '>';
+					print '<tr class="oddeven">';
 					print '<td>';
 					print $formaccounting->select_account($account_number, 'account_number', 0, array (), 1, 1, '');
 					print '</td>';
 					print '<td>';
-					print $formaccounting->select_auxaccount($code_tiers, 'code_tiers', 1);
+					print $formaccounting->select_auxaccount($subledger_account, 'subledger_account', 1);
 					print '</td>';
 					print '<td><input type="text" size="15" name="label_compte" value="' . $line->label_compte . '"/></td>';
 					print '<td><input type="text" size="15" name="label_operation" value="' . $line->label_operation. '"/></td>';
@@ -510,6 +574,7 @@ if ($action == 'create') {
 		print load_fiche_titre($langs->trans("NoRecords"));
 	}
 }
+
 dol_fiche_end();
 llxFooter();
-$db->close();
\ No newline at end of file
+$db->close();
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index a441b79dbb2..843e15a5dd7 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -1060,10 +1060,10 @@ class BookKeeping extends CommonObject
 	 * @param  string  $mode           Mode
 	 * @return number                  <0 if KO, >0 if OK
 	 */
-	public function upddateByMvt($piece_num='', $field='', $value='', $mode='') {
+	public function updateByMvt($piece_num='', $field='', $value='', $mode='') {
 		$this->db->begin();
-		$sql = "UPDATE " . MAIN_DB_PREFIX .  $this->table_element.$mode." as ab";
-		$sql .= ' SET ab.'.$field.'=' . $value;
+		$sql = "UPDATE " . MAIN_DB_PREFIX .  $this->table_element . $mode . " as ab";
+		$sql .= ' SET ab.' . $field . '=' . $value;
 		$sql .= ' WHERE ab.piece_num=' . $piece_num ;
 		$resql = $this->db->query($sql);
 		if (! $resql) {
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index 6dba1443ae1..f751d78b1a6 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -91,7 +91,7 @@ $idpays = $mysoc->country_id;
 $sql = "SELECT er.rowid, er.ref, er.date_debut as de,";
 $sql .= " erd.rowid as erdid, erd.comments, erd.total_ttc, erd.tva_tx, erd.total_ht, erd.total_tva, erd.fk_code_ventilation, erd.vat_src_code, ";
 $sql .= " u.rowid as uid, u.firstname, u.lastname, u.accountancy_code as user_accountancy_account,";
-$sql .= " f.accountancy_code, aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte,";
+$sql .= " f.accountancy_code, aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte";
 //$sql .= " ct.accountancy_code_buy as account_tva";
 $sql .= " FROM " . MAIN_DB_PREFIX . "expensereport_det as erd";
 //$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_tva as ct ON erd.tva_tx = ct.taux AND ct.fk_pays = '" . $idpays . "'";
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index a50f8be7fb9..e374ab62c5c 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -152,7 +152,7 @@ if ($result) {
 		// Define array to display all VAT rates that use this accounting account $compta_tva
 		if ((! price2num($obj->tva_tx)) || ! empty($obj->vat_src_code))
 		{
-            $def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':'')]=(vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':''));
+			$def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':'')]=(vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':''));
 		}
 
 		// Situation invoices handling
@@ -591,7 +591,7 @@ if (empty($action) || $action == 'view') {
 	print "<td>" . $langs->trans("Date") . "</td>";
 	print "<td>" . $langs->trans("Piece") . ' (' . $langs->trans("InvoiceRef") . ")</td>";
 	print "<td>" . $langs->trans("AccountAccounting") . "</td>";
-	print "<td>" . $langs->trans("Type") . "</td>";
+	print "<td>" . $langs->trans("Label") . "</td>";
 	print "<td align='right'>" . $langs->trans("Debit") . "</td>";
 	print "<td align='right'>" . $langs->trans("Credit") . "</td>";
 	print "</tr>\n";
@@ -617,7 +617,6 @@ if (empty($action) || $action == 'view') {
 			$companystatic->id = $tabcompany[$key]['id'];
 			$companystatic->name = $tabcompany[$key]['name'];
 			$companystatic->client = $tabcompany[$key]['code_client'];
-			$companystatic->client = $tabcompany[$key]['code_client'];
 			print "<td>";
 			$accountoshow = length_accounta($k);
 			if (empty($accountoshow) || $accountoshow == 'NotDefined')
@@ -675,7 +674,7 @@ if (empty($action) || $action == 'view') {
 				}
 				else print $accountoshow;
 				print "</td>";
-				print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT") . ' '.join(', ',$def_tva[$key][$k]). "</td>";
+				print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT") . "</td>"; // ' '.join(', ',$def_tva[$key][$k]).
 				// print "<td>" . $langs->trans("VAT") . "</td>";
 				print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
 				print "<td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";

From 8dffc38cd5567fe8ebb22b9f43fb838b102d5962 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Jun 2017 21:46:38 +0200
Subject: [PATCH 310/438] Fix separator

---
 htdocs/langs/ru_RU/main.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index 911eb16f641..632522bc90f 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -7,7 +7,7 @@ DIRECTION=ltr
 FONTFORPDF=freemono
 FONTSIZEFORPDF=8
 SeparatorDecimal=,
-SeparatorThousand=,
+SeparatorThousand=None
 FormatDateShort=%d.%m.%Y
 FormatDateShortInput=%d.%m.%Y
 FormatDateShortJava=ММ/дд/гггг

From 3717a016413a55396f0da20cece4f263dab5fa26 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Jun 2017 23:15:47 +0200
Subject: [PATCH 311/438] Fix lang

---
 htdocs/langs/ru_RU/main.lang          |  8 ++---
 htdocs/langs/ru_RU/modulebuilder.lang | 24 +++++++++++++++
 htdocs/langs/ru_RU/multicurrency.lang | 18 ++++++++++++
 htdocs/langs/ru_RU/stripe.lang        | 42 +++++++++++++++++++++++++++
 4 files changed, 88 insertions(+), 4 deletions(-)
 create mode 100644 htdocs/langs/ru_RU/modulebuilder.lang
 create mode 100644 htdocs/langs/ru_RU/multicurrency.lang
 create mode 100644 htdocs/langs/ru_RU/stripe.lang

diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index 632522bc90f..19a24fa80f6 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -10,10 +10,10 @@ SeparatorDecimal=,
 SeparatorThousand=None
 FormatDateShort=%d.%m.%Y
 FormatDateShortInput=%d.%m.%Y
-FormatDateShortJava=ММ/дд/гггг
-FormatDateShortJavaInput=ММ/дд/гггг
-FormatDateShortJQuery=мм/дд/гг
-FormatDateShortJQueryInput=мм/дд/гг
+FormatDateShortJava=dd.MM.yyyy
+FormatDateShortJavaInput=dd.MM.yyyy
+FormatDateShortJQuery=dd.mm.yy
+FormatDateShortJQueryInput=dd.mm.yy
 FormatHourShortJQuery=ЧЧ:ММ
 FormatHourShort=%H:%M
 FormatHourShortDuration=%H:%M
diff --git a/htdocs/langs/ru_RU/modulebuilder.lang b/htdocs/langs/ru_RU/modulebuilder.lang
new file mode 100644
index 00000000000..a8fc8164ae8
--- /dev/null
+++ b/htdocs/langs/ru_RU/modulebuilder.lang
@@ -0,0 +1,24 @@
+# Dolibarr language file - Source file is en_US - loan
+ModuleBuilderDesc=This tools give you utilites to build or edit your own module.
+EnterNameOfModuleDesc=Enter name of the module to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
+ModuleBuilderDesc2=Path were modules are generated/edited (first alternative directory defined into %s): <strong>%s</strong>
+ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong> (they are detected as editable when the file <strong>%s</strong> exists in root of module directory).
+NewModule=New module
+ModuleKey=Key for new module
+ModuleInitialized=Module initialized
+ModuleBuilderDescdescription=Enter here all general information that describe your module
+ModuleBuilderDescobjects=Define here the new objects you want to manage with your module. A page to list them and a page to create/edit/view a card will be generated.
+ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
+ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with your module.
+ModuleBuilderDesctriggers=This is the view of triggers provided by your module. To include code executed when a triggered business event is launched, just edit this file with your IDE.
+ModuleBuilderDeschooks=This tab is dedicated to hooks.
+ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
+ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module. Just click on button to get your module package file.
+ModuleBuilderDescdangerzone=You can delete your module. WARNING: All files of module will be definetly lost !
+DangerZone=Danger zone
+BuildPackage=Build package
+ModuleIsNotActive=This module was not activated yet (go into Home-Setup-Module to make it live)
+ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
+DescriptionLong=Long description
+EditorName=Name of editor
+EditorUrl=URL of editor
diff --git a/htdocs/langs/ru_RU/multicurrency.lang b/htdocs/langs/ru_RU/multicurrency.lang
new file mode 100644
index 00000000000..925764f5e37
--- /dev/null
+++ b/htdocs/langs/ru_RU/multicurrency.lang
@@ -0,0 +1,18 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multi currency
+ErrorAddRateFail=Error in added rate
+ErrorAddCurrencyFail=Error in added currency
+ErrorDeleteCurrencyFail=Error delete fail
+multicurrency_syncronize_error=Synchronisation error: %s
+multicurrency_useOriginTx=When an object is created from another, keep the original rate of source object (otherwise use the new known rate)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=You sould create an account on their website to use this functionnality<br />Get your <b>API key</b><br />If you use a free account you can't change the <b>currency source</b> (USD by default)<br />But if your main currency isn't USD you can use the <b>alternate currency source</b> to force you main currency<br /><br />You are limited at 1000 synchronizations per month
+multicurrency_appId=API key
+multicurrency_appCurrencySource=Currency source
+multicurrency_alternateCurrencySource= Alternate currency souce
+CurrenciesUsed=Currencies used
+CurrenciesUsed_help_to_add=Add the differents currencies and rates you need to use on you <b>proposals</b>, <b>orders</b>, etc.
+rate=rate
+MulticurrencyReceived=Received, original currency
+MulticurrencyRemainderToTake=Remaining amout, original currency
+MulticurrencyPaymentAmount=Сумма платежа, в оригинальной валюте
diff --git a/htdocs/langs/ru_RU/stripe.lang b/htdocs/langs/ru_RU/stripe.lang
new file mode 100644
index 00000000000..ff607e59dc3
--- /dev/null
+++ b/htdocs/langs/ru_RU/stripe.lang
@@ -0,0 +1,42 @@
+# Dolibarr language file - Source file is en_US - stripe
+StripeSetup=Stripe module setup
+StripeDesc=This module offer pages to allow payment on <a href="http://www.stripe.com" target="_blank">Stripe</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
+StripeOrCBDoPayment=Pay with credit card or Stripe
+FollowingUrlAreAvailableToMakePayments=После URL, можно предложить страницу к клиенту сделать платеж по Dolibarr объектов
+PaymentForm=Форма оплаты
+WelcomeOnPaymentPage=Добро пожаловать на наш интернет-платежей службы
+ThisScreenAllowsYouToPay=На этом экране можно сделать онлайн-платежей для %s.
+ThisIsInformationOnPayment=Это данные по оплате делать
+ToComplete=Для завершения
+YourEMail=Электронная почта для подтверждения оплаты
+STRIPE_PAYONLINE_SENDEMAIL=Адрес электронной почты, куда будут высылаться уведомления о платежах (успешных или нет)
+Creditor=Кредитор
+PaymentCode=Код платежа
+StripeDoPayment=Перейти к оплате
+YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
+Continue=Дальше
+ToOfferALinkForOnlinePayment=URL-адрес для оплаты %s
+ToOfferALinkForOnlinePaymentOnOrder=URL предложить %s онлайн платежей пользовательский интерфейс для заказа
+ToOfferALinkForOnlinePaymentOnInvoice=URL предложить %s онлайн платежей пользовательский интерфейс для счета
+ToOfferALinkForOnlinePaymentOnContractLine=URL предложить% интернет-платежей с интерфейсом пользователя на контракт линия
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL предложить% интернет-платежей с пользовательским интерфейсом для свободного сумму
+ToOfferALinkForOnlinePaymentOnMemberSubscription=URL предложить оплаты %s онлайн пользовательский интерфейс для членов подписки
+YouCanAddTagOnUrl=Вы также можете добавить URL параметр И <b>тег= <i>значение</i></b> для любой из этих URL (требуется только для свободного платежа), чтобы добавить свой комментарий оплаты метки.
+SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
+YourPaymentHasBeenRecorded=Эта страница подтверждает, что ваш платеж был записан. Спасибо.
+YourPaymentHasNotBeenRecorded=Вы платеж не был записан и сделка была отменена. Спасибо.
+AccountParameter=Счет параметры
+UsageParameter=Использование параметров
+InformationToFindParameters=Помогите найти %s информацию об учетной записи
+STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
+VendorName=Имя поставщика
+CSSUrlForPaymentForm=CSS-стилей URL для оплаты форме
+MessageOK=Сообщение на странице проверки возвращение оплаты
+MessageKO=Сообщение на странице отменен возврат оплаты
+NewStripePaymentReceived=New Stripe payment received
+NewStripePaymentFailed=New Stripe payment tried but failed
+STRIPE_TEST_SECRET_KEY=Secret test key
+STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_LIVE_SECRET_KEY=Secret live key
+STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)

From eef5df583ef8ee35f1ba4ae619a2415050af713c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Jun 2017 00:50:30 +0200
Subject: [PATCH 312/438] Fix php 7.2

---
 htdocs/core/lib/json.lib.php | 7 +++++--
 test/phpunit/JsonLibTest.php | 8 +++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/lib/json.lib.php b/htdocs/core/lib/json.lib.php
index 6b868663aa7..7388ba47806 100644
--- a/htdocs/core/lib/json.lib.php
+++ b/htdocs/core/lib/json.lib.php
@@ -49,12 +49,15 @@ function dol_json_encode($elements)
 {
 	dol_syslog('dol_json_encode() is deprecated. Please update your code to use native json_encode().', LOG_WARNING);
 
-	$num=count($elements);
+	$num=0;
 	if (is_object($elements))	// Count number of properties for an object
 	{
-		$num=0;
 		foreach($elements as $key => $value) $num++;
 	}
+	else
+	{
+	    $num=count($elements);
+	}
 	//var_dump($num);
 
 	// determine type
diff --git a/test/phpunit/JsonLibTest.php b/test/phpunit/JsonLibTest.php
index 66999e31c65..a06db14565c 100644
--- a/test/phpunit/JsonLibTest.php
+++ b/test/phpunit/JsonLibTest.php
@@ -134,7 +134,7 @@ class JsonLibTest extends PHPUnit_Framework_TestCase
         // Do a test with an array starting with 0
         $arraytotest=array(0=>array('key'=>1,'value'=>'PRODREF','label'=>'Product ref with é and special chars \\ \' "'));
 		$arrayencodedexpected='[{"key":1,"value":"PRODREF","label":"Product ref with \u00e9 and special chars \\\\ \' \""}]';
-		
+
         $encoded=json_encode($arraytotest);
         $this->assertEquals($arrayencodedexpected,$encoded);
         $decoded=json_decode($encoded,true);
@@ -148,7 +148,7 @@ class JsonLibTest extends PHPUnit_Framework_TestCase
 		// Same test but array start with 2 instead of 0
         $arraytotest=array(2=>array('key'=>1,'value'=>'PRODREF','label'=>'Product ref with é and special chars \\ \' "'));
 		$arrayencodedexpected='{"2":{"key":1,"value":"PRODREF","label":"Product ref with \u00e9 and special chars \\\\ \' \""}}';
-		
+
         $encoded=json_encode($arraytotest);
         $this->assertEquals($arrayencodedexpected,$encoded);
         $decoded=json_decode($encoded,true);
@@ -158,7 +158,7 @@ class JsonLibTest extends PHPUnit_Framework_TestCase
         $this->assertEquals($arrayencodedexpected,$encoded);
         $decoded=dol_json_decode($encoded,true);
         $this->assertEquals($arraytotest,$decoded,'test for dol_json_xxx');
-        
+
         // Test with object
         $now=gmmktime(12,0,0,1,1,1970);
         $objecttotest=new stdClass();
@@ -167,7 +167,5 @@ class JsonLibTest extends PHPUnit_Framework_TestCase
         $objecttotest->property3=$now;
         $encoded=dol_json_encode($objecttotest);
         $this->assertEquals('{"property1":"abc","property2":1234,"property3":43200}',$encoded);
-
     }
-
 }

From d78d5d60c44f8ff371f61b0f854b3e33ec6968d9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Jun 2017 01:45:44 +0200
Subject: [PATCH 313/438] Fix pgsql Fix missing vat rate info.

---
 htdocs/accountancy/journal/sellsjournal.php  |  4 ++-
 htdocs/compta/resultat/index.php             | 26 ++++++++++----------
 htdocs/install/pgsql/functions/functions.sql |  3 +++
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index e374ab62c5c..425153198a0 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -674,7 +674,9 @@ if (empty($action) || $action == 'view') {
 				}
 				else print $accountoshow;
 				print "</td>";
-				print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT") . "</td>"; // ' '.join(', ',$def_tva[$key][$k]).
+				print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT");
+				print ' '.join(', ',$def_tva[$key][$k]);
+				print "</td>";
 				// print "<td>" . $langs->trans("VAT") . "</td>";
 				print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
 				print "<td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index 45cbbfe3a46..6043a7cbec5 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -492,14 +492,14 @@ if (! empty($conf->salaries->enabled))
     } else {
     	$column = 'p.datep';
     }
-    
+
     $subtotal_ht = 0;
     $subtotal_ttc = 0;
     $sql = "SELECT p.label as nom, date_format($column,'%Y-%m') as dm, sum(p.amount) as amount";
     $sql.= " FROM ".MAIN_DB_PREFIX."payment_salary as p";
     $sql.= " WHERE p.entity = ".$conf->entity;
     $sql.= " GROUP BY p.label, dm";
-    
+
     dol_syslog("get social salaries payments");
     $result=$db->query($sql);
     if ($result)
@@ -512,13 +512,13 @@ if (! empty($conf->salaries->enabled))
     		while ($i < $num)
     		{
     			$obj = $db->fetch_object($result);
-    
+
     			if (! isset($decaiss[$obj->dm])) $decaiss[$obj->dm]=0;
     			$decaiss[$obj->dm] += $obj->amount;
-    
+
     			if (! isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm]=0;
     			$decaiss_ttc[$obj->dm] += $obj->amount;
-    
+
     			$i++;
     		}
     	}
@@ -568,7 +568,7 @@ if (! empty($conf->expensereport->enabled))
 			{
 				if (! isset($decaiss[$obj->dm])) $decaiss[$obj->dm]=0;
 				$decaiss[$obj->dm] += $obj->amount_ht;
-				
+
 				if (! isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm]=0;
 				$decaiss_ttc[$obj->dm] += $obj->amount_ttc;
 
@@ -588,7 +588,7 @@ if (! empty($conf->don->enabled))
 {
     $subtotal_ht = 0;
     $subtotal_ttc = 0;
-    
+
     if ($modecompta == 'CREANCES-DETTES') {
         $sql = "SELECT p.societe as nom, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
         $sql.= " FROM ".MAIN_DB_PREFIX."don as p";
@@ -617,13 +617,13 @@ if (! empty($conf->don->enabled))
     		while ($i < $num)
     		{
     			$obj = $db->fetch_object($result);
-    
+
     			if (! isset($encaiss[$obj->dm])) $encaiss[$obj->dm]=0;
     			$encaiss[$obj->dm] += $obj->amount;
-    
+
     			if (! isset($encaiss_ttc[$obj->dm])) $encaiss_ttc[$obj->dm]=0;
     			$encaiss_ttc[$obj->dm] += $obj->amount;
-    
+
     			$i++;
     		}
     	}
@@ -671,7 +671,7 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++)
 {
 	$mois_modulo = $mois;
 	if($mois>12) {$mois_modulo = $mois-12;}
-	
+
 	print '<tr class="oddeven">';
 	print "<td>".dol_print_date(dol_mktime(12,0,0,$mois_modulo,1,$annee),"%B")."</td>";
 	for ($annee = $year_start ; $annee <= $year_end ; $annee++)
@@ -680,7 +680,7 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++)
 		if($mois>12) {$annee_decalage=$annee+1;}
 		$case = strftime("%Y-%m",dol_mktime(12,0,0,$mois_modulo,1,$annee_decalage));
 
-		print '<td class="liste_titre" align="right">&nbsp;';
+		print '<td align="right">&nbsp;';
 		if (isset($decaiss_ttc[$case]) && $decaiss_ttc[$case] != 0)
 		{
 			print '<a href="clientfourn.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta?'&modecompta='.$modecompta:'').'">'.price(price2num($decaiss_ttc[$case],'MT')).'</a>';
@@ -689,7 +689,7 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++)
 		}
 		print "</td>";
 
-		print '<td align="right" class="liste_titre borderrightlight">&nbsp;';
+		print '<td align="right" class="borderrightlight">&nbsp;';
 		//if (isset($encaiss_ttc[$case]) && $encaiss_ttc[$case] != 0)
 		if (isset($encaiss_ttc[$case]))
 		{
diff --git a/htdocs/install/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql
index 9d3b3c8dbe6..441b20c66ad 100644
--- a/htdocs/install/pgsql/functions/functions.sql
+++ b/htdocs/install/pgsql/functions/functions.sql
@@ -23,9 +23,12 @@ CREATE LANGUAGE plpgsql;
 CREATE OR REPLACE FUNCTION UNIX_TIMESTAMP(TIMESTAMP WITHOUT TIME ZONE) RETURNS BIGINT LANGUAGE SQL IMMUTABLE STRICT AS 'SELECT EXTRACT(EPOCH FROM $1)::bigint;';
 
 CREATE OR REPLACE FUNCTION UNIX_TIMESTAMP(TIMESTAMP WITH TIME ZONE) RETURNS BIGINT LANGUAGE SQL IMMUTABLE STRICT AS 'SELECT EXTRACT(EPOCH FROM $1)::bigint;';
+
  
 CREATE OR REPLACE FUNCTION date_format(timestamp without time zone, text) RETURNS text AS $$ DECLARE i int := 1; temp text := ''; c text; n text; res text; BEGIN WHILE i <= pg_catalog.length($2) LOOP c := SUBSTRING ($2 FROM i FOR 1); IF c = '%' AND i != pg_catalog.length($2) THEN n := SUBSTRING ($2 FROM (i + 1) FOR 1); SELECT INTO res CASE WHEN n = 'a' THEN pg_catalog.to_char($1, 'Dy') WHEN n = 'b' THEN pg_catalog.to_char($1, 'Mon') WHEN n = 'c' THEN pg_catalog.to_char($1, 'FMMM') WHEN n = 'D' THEN pg_catalog.to_char($1, 'FMDDth') WHEN n = 'd' THEN pg_catalog.to_char($1, 'DD') WHEN n = 'e' THEN pg_catalog.to_char($1, 'FMDD') WHEN n = 'f' THEN pg_catalog.to_char($1, 'US') WHEN n = 'H' THEN pg_catalog.to_char($1, 'HH24') WHEN n = 'h' THEN pg_catalog.to_char($1, 'HH12') WHEN n = 'I' THEN pg_catalog.to_char($1, 'HH12') WHEN n = 'i' THEN pg_catalog.to_char($1, 'MI') WHEN n = 'j' THEN pg_catalog.to_char($1, 'DDD') WHEN n = 'k' THEN pg_catalog.to_char($1, 'FMHH24') WHEN n = 'l' THEN pg_catalog.to_char($1, 'FMHH12') WHEN n = 'M' THEN pg_catalog.to_char($1, 'FMMonth') WHEN n = 'm' THEN pg_catalog.to_char($1, 'MM') WHEN n = 'p' THEN pg_catalog.to_char($1, 'AM') WHEN n = 'r' THEN pg_catalog.to_char($1, 'HH12:MI:SS AM') WHEN n = 'S' THEN pg_catalog.to_char($1, 'SS') WHEN n = 's' THEN pg_catalog.to_char($1, 'SS') WHEN n = 'T' THEN pg_catalog.to_char($1, 'HH24:MI:SS') WHEN n = 'U' THEN pg_catalog.to_char($1, '?') WHEN n = 'u' THEN pg_catalog.to_char($1, '?') WHEN n = 'V' THEN pg_catalog.to_char($1, '?') WHEN n = 'v' THEN pg_catalog.to_char($1, '?') WHEN n = 'W' THEN pg_catalog.to_char($1, 'FMDay') WHEN n = 'w' THEN EXTRACT(DOW FROM $1)::text WHEN n = 'X' THEN pg_catalog.to_char($1, '?') WHEN n = 'x' THEN pg_catalog.to_char($1, '?') WHEN n = 'Y' THEN pg_catalog.to_char($1, 'YYYY') WHEN n = 'y' THEN pg_catalog.to_char($1, 'YY') WHEN n = '%' THEN pg_catalog.to_char($1, '%') ELSE NULL END; temp := temp operator(pg_catalog.||) res; i := i + 2; ELSE temp = temp operator(pg_catalog.||) c; i := i + 1; END IF; END LOOP; RETURN temp; END $$ IMMUTABLE STRICT LANGUAGE plpgsql;
 
+CREATE OR REPLACE FUNCTION date_format(timestamp with time zone, text) RETURNS text AS $$ DECLARE i int := 1; temp text := ''; c text; n text; res text; BEGIN WHILE i <= pg_catalog.length($2) LOOP c := SUBSTRING ($2 FROM i FOR 1); IF c = '%' AND i != pg_catalog.length($2) THEN n := SUBSTRING ($2 FROM (i + 1) FOR 1); SELECT INTO res CASE WHEN n = 'a' THEN pg_catalog.to_char($1, 'Dy') WHEN n = 'b' THEN pg_catalog.to_char($1, 'Mon') WHEN n = 'c' THEN pg_catalog.to_char($1, 'FMMM') WHEN n = 'D' THEN pg_catalog.to_char($1, 'FMDDth') WHEN n = 'd' THEN pg_catalog.to_char($1, 'DD') WHEN n = 'e' THEN pg_catalog.to_char($1, 'FMDD') WHEN n = 'f' THEN pg_catalog.to_char($1, 'US') WHEN n = 'H' THEN pg_catalog.to_char($1, 'HH24') WHEN n = 'h' THEN pg_catalog.to_char($1, 'HH12') WHEN n = 'I' THEN pg_catalog.to_char($1, 'HH12') WHEN n = 'i' THEN pg_catalog.to_char($1, 'MI') WHEN n = 'j' THEN pg_catalog.to_char($1, 'DDD') WHEN n = 'k' THEN pg_catalog.to_char($1, 'FMHH24') WHEN n = 'l' THEN pg_catalog.to_char($1, 'FMHH12') WHEN n = 'M' THEN pg_catalog.to_char($1, 'FMMonth') WHEN n = 'm' THEN pg_catalog.to_char($1, 'MM') WHEN n = 'p' THEN pg_catalog.to_char($1, 'AM') WHEN n = 'r' THEN pg_catalog.to_char($1, 'HH12:MI:SS AM') WHEN n = 'S' THEN pg_catalog.to_char($1, 'SS') WHEN n = 's' THEN pg_catalog.to_char($1, 'SS') WHEN n = 'T' THEN pg_catalog.to_char($1, 'HH24:MI:SS') WHEN n = 'U' THEN pg_catalog.to_char($1, '?') WHEN n = 'u' THEN pg_catalog.to_char($1, '?') WHEN n = 'V' THEN pg_catalog.to_char($1, '?') WHEN n = 'v' THEN pg_catalog.to_char($1, '?') WHEN n = 'W' THEN pg_catalog.to_char($1, 'FMDay') WHEN n = 'w' THEN EXTRACT(DOW FROM $1)::text WHEN n = 'X' THEN pg_catalog.to_char($1, '?') WHEN n = 'x' THEN pg_catalog.to_char($1, '?') WHEN n = 'Y' THEN pg_catalog.to_char($1, 'YYYY') WHEN n = 'y' THEN pg_catalog.to_char($1, 'YY') WHEN n = '%' THEN pg_catalog.to_char($1, '%') ELSE NULL END; temp := temp operator(pg_catalog.||) res; i := i + 2; ELSE temp = temp operator(pg_catalog.||) c; i := i + 1; END IF; END LOOP; RETURN temp; END $$ IMMUTABLE STRICT LANGUAGE plpgsql;
+
 
 CREATE OR REPLACE FUNCTION YEAR(TIMESTAMP without TIME ZONE) RETURNS INTEGER AS $$ SELECT EXTRACT(YEAR FROM $1)::INTEGER; $$ LANGUAGE SQL IMMUTABLE;
 

From fcdc7b1a0d015b9977802211d47d81632773a48f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Jun 2017 01:52:47 +0200
Subject: [PATCH 314/438] Fix pgsql compatibility

---
 htdocs/accountancy/customer/index.php | 32 +++++++++++++--------------
 htdocs/accountancy/supplier/index.php | 28 +++++++++++------------
 htdocs/langs/en_US/admin.lang         |  4 ++--
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index 24e066917bc..817811cd0fc 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -73,7 +73,7 @@ if ($action == 'validatehistory') {
 
 	// First clean corrupted data
 	$sqlclean = "UPDATE " . MAIN_DB_PREFIX . "facturedet as fd";
-	$sqlclean .= " SET fd.fk_code_ventilation = 0";
+	$sqlclean .= " SET fk_code_ventilation = 0";
 	$sqlclean .= ' WHERE fd.fk_code_ventilation NOT IN ';
 	$sqlclean .= '	(SELECT accnt.rowid ';
 	$sqlclean .= '	FROM ' . MAIN_DB_PREFIX . 'accounting_account as accnt';
@@ -91,7 +91,7 @@ if ($action == 'validatehistory') {
 		$sql1 .= " AND " . MAIN_DB_PREFIX . "facturedet.fk_code_ventilation = 0";
 	} else {
 		$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facturedet as fd, " . MAIN_DB_PREFIX . "product as p, " . MAIN_DB_PREFIX . "accounting_account as accnt , " . MAIN_DB_PREFIX . "accounting_system as syst";
-		$sql1 .= " SET fd.fk_code_ventilation = accnt.rowid";
+		$sql1 .= " SET fk_code_ventilation = accnt.rowid";
 		$sql1 .= " WHERE fd.fk_product = p.rowid  AND accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=" . $conf->global->CHARTOFACCOUNTS;
 		$sql1 .= " AND accnt.active = 1 AND p.accountancy_code_sell=accnt.account_number";
 		$sql1 .= " AND fd.fk_code_ventilation = 0";
@@ -113,7 +113,7 @@ if ($action == 'validatehistory') {
 	$db->begin();
 
 	$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facturedet as fd";
-	$sql1 .= " SET fd.fk_code_ventilation = 0";
+	$sql1 .= " SET fk_code_ventilation = 0";
 	$sql1 .= ' WHERE fd.fk_code_ventilation NOT IN ';
 	$sql1 .= '	(SELECT accnt.rowid ';
 	$sql1 .= '	FROM ' . MAIN_DB_PREFIX . 'accounting_account as accnt';
@@ -134,16 +134,16 @@ if ($action == 'validatehistory') {
 } elseif ($action == 'cleanaccountancycode') {
 	$error = 0;
 	$db->begin();
-	
+
 	// Now clean
 	$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facturedet as fd";
-	$sql1.= " SET fd.fk_code_ventilation = 0";
+	$sql1.= " SET fk_code_ventilation = 0";
 	$sql1.= " WHERE fd.fk_facture IN ( SELECT f.rowid FROM " . MAIN_DB_PREFIX . "facture as f";
 	$sql1.= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($year_current, 1, false)) . "'";
 	$sql1.= " AND f.datef <= '" . $db->idate(dol_get_last_day($year_current, 12, false)) . "'";
 	$sql1.= " AND f.entity IN (" . getEntity('accountancy') . ")";
 	$sql1.=")";
-	
+
 	dol_syslog("htdocs/accountancy/customer/index.php fixaccountancycode", LOG_DEBUG);
 
 	$resql1 = $db->query($sql1);
@@ -321,9 +321,9 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
 {
     print '<br>';
     print '<br>';
-    
+
     print_fiche_titre($langs->trans("OtherInfo"), '', '');
-    
+
     print "<br>\n";
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre"><td width="400" align="left">' . $langs->trans("TotalVente") . '</td>';
@@ -331,7 +331,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
     	print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . '</td>';
     }
     print '<td width="60" align="right"><b>' . $langs->trans("Total") . '</b></td></tr>';
-    
+
     $sql = "SELECT '" . $langs->trans("TotalVente") . "' AS total,";
     for($i = 1; $i <= 12; $i ++) {
     	$sql .= "  SUM(" . $db->ifsql('MONTH(f.datef)=' . $i, 'fd.total_ht', '0') . ") AS month" . str_pad($i, 2, '0', STR_PAD_LEFT) . ",";
@@ -347,13 +347,13 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
     } else {
         $sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
     }
-    
+
     dol_syslog('htdocs/accountancy/customer/index.php');
     $resql = $db->query($sql);
     if ($resql) {
     	$i = 0;
     	$num = $db->num_rows($resql);
-    
+
     	while ($row = $db->fetch_row($resql)) {
     		print '<tr><td>' . $row[0] . '</td>';
     		for($i = 1; $i <= 12; $i ++) {
@@ -368,7 +368,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
     	print $db->lasterror(); // Show last sql error
     }
     print "</table>\n";
-    
+
     if (! empty($conf->margin->enabled)) {
     	print "<br>\n";
     	print '<table class="noborder" width="100%">';
@@ -377,7 +377,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
     		print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . '</td>';
     	}
     	print '<td width="60" align="right"><b>' . $langs->trans("Total") . '</b></td></tr>';
-    
+
     	$sql = "SELECT '" . $langs->trans("Vide") . "' AS marge,";
     	for($i = 1; $i <= 12; $i ++) {
     		$sql .= "  SUM(" . $db->ifsql('MONTH(f.datef)=' . $i, '(fd.total_ht-(fd.qty * fd.buy_price_ht))', '0') . ") AS month" . str_pad($i, 2, '0', STR_PAD_LEFT) . ",";
@@ -393,14 +393,14 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
     	} else {
     	    $sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
     	}
-    	 
+
     	dol_syslog('htdocs/accountancy/customer/index.php:: $sql=' . $sql);
     	$resql = $db->query($sql);
     	if ($resql) {
     		$num = $db->num_rows($resql);
-    
+
     		while ($row = $db->fetch_row($resql)) {
-    
+
     			print '<tr><td>' . $row[0] . '</td>';
     			for($i = 1; $i <= 12; $i ++) {
     				print '<td align="right">' . price(price2num($row[$i])) . '</td>';
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index 3aa8e501bb9..fb5f28fc27d 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -69,14 +69,14 @@ if ($action == 'validatehistory') {
 
 	// First clean corrupted data
 	$sqlclean = "UPDATE " . MAIN_DB_PREFIX . "facturedet as fd";
-	$sqlclean .= " SET fd.fk_code_ventilation = 0";
+	$sqlclean .= " SET fk_code_ventilation = 0";
 	$sqlclean .= ' WHERE fd.fk_code_ventilation NOT IN ';
 	$sqlclean .= '	(SELECT accnt.rowid ';
 	$sqlclean .= '	FROM ' . MAIN_DB_PREFIX . 'accounting_account as accnt';
 	$sqlclean .= '	INNER JOIN ' . MAIN_DB_PREFIX . 'accounting_system as syst';
 	$sqlclean .= '	ON accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=' . $conf->global->CHARTOFACCOUNTS . ')';
 	$resql = $db->query($sqlclean);
-	
+
 	// Now make the binding. Bind automatically only for product with a dedicated account that exists into chart of account, others need a manual bind
 	if ($db->type == 'pgsql') {
 		$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det";
@@ -87,7 +87,7 @@ if ($action == 'validatehistory') {
 		$sql1 .= " AND " . MAIN_DB_PREFIX . "facture_fourn_det.fk_code_ventilation = 0";
 	} else {
 		$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det as fd, " . MAIN_DB_PREFIX . "product as p, " . MAIN_DB_PREFIX . "accounting_account as accnt , " . MAIN_DB_PREFIX . "accounting_system as syst";
-		$sql1 .= " SET fd.fk_code_ventilation = accnt.rowid";
+		$sql1 .= " SET fk_code_ventilation = accnt.rowid";
 		$sql1 .= " WHERE fd.fk_product = p.rowid AND accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=" . $conf->global->CHARTOFACCOUNTS;
 		$sql1 .= " AND accnt.active = 1 AND p.accountancy_code_buy=accnt.account_number";
 		$sql1 .= " AND fd.fk_code_ventilation = 0";
@@ -107,7 +107,7 @@ if ($action == 'validatehistory') {
 	$db->begin();
 
 	$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det as fd";
-	$sql1 .= " SET fd.fk_code_ventilation = 0";
+	$sql1 .= " SET fk_code_ventilation = 0";
 	$sql1 .= ' WHERE fd.fk_code_ventilation NOT IN ';
 	$sql1 .= '	(SELECT accnt.rowid ';
 	$sql1 .= '	FROM ' . MAIN_DB_PREFIX . 'accounting_account as accnt';
@@ -130,13 +130,13 @@ if ($action == 'validatehistory') {
 	$db->begin();
 
 	$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det as fd";
-	$sql1.= " SET fd.fk_code_ventilation = 0";
+	$sql1.= " SET fk_code_ventilation = 0";
 	$sql1.= " WHERE fd.fk_facture_fourn IN ( SELECT f.rowid FROM " . MAIN_DB_PREFIX . "facture_fourn as f";
 	$sql1.= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($year_current, 1, false)) . "'";
 	$sql1.= " AND f.datef <= '" . $db->idate(dol_get_last_day($year_current, 12, false)) . "'";
 	$sql1.= " AND f.entity IN (" . getEntity('accountancy') . ")";
 	$sql1.= ")";
-	
+
 	dol_syslog("htdocs/accountancy/customer/index.php fixaccountancycode", LOG_DEBUG);
 
 	$resql1 = $db->query($sql1);
@@ -291,9 +291,9 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
 {
     print '<br>';
     print '<br>';
-    
+
     print_fiche_titre($langs->trans("OtherInfo"), '', '');
-    
+
     print "<br>\n";
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre"><td width="400" align="left">' . $langs->trans("Total") . '</td>';
@@ -301,7 +301,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
     	print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . '</td>';
     }
     print '<td width="60" align="right"><b>' . $langs->trans("Total") . '</b></td></tr>';
-    
+
     $sql = "SELECT '" . $langs->trans("CAHTF") . "' AS label,";
     for($i = 1; $i <= 12; $i ++) {
     	$sql .= "  SUM(" . $db->ifsql('MONTH(ff.datef)=' . $i, 'ffd.total_ht', '0') . ") AS month" . str_pad($i, 2, '0', STR_PAD_LEFT) . ",";
@@ -313,15 +313,15 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
     $sql .= "  AND ff.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
     $sql .= "  AND ff.fk_statut > 0 ";
     $sql .= " AND ff.entity IN (" . getEntity('facture_fourn', 0) . ")";     // We don't share object for accountancy
-    
+
     dol_syslog('/accountancy/supplier/index.php:: sql=' . $sql);
     $resql = $db->query($sql);
     if ($resql) {
     	$num = $db->num_rows($resql);
-    
+
     	while ( $row = $db->fetch_row($resql)) {
-    
-    
+
+
     		print '<tr><td>' . $row[0] . '</td>';
     			for($i = 1; $i <= 12; $i ++) {
     			print '<td align="right">' . price($row[$i]) . '</td>';
@@ -329,7 +329,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
     		print '<td align="right"><b>' . price($row[13]) . '</b></td>';
     		print '</tr>';
     	}
-    
+
     	$db->free($resql);
     } else {
     	print $db->lasterror(); // Show last sql error
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 23b207b4fea..e4fd5a7b253 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -536,7 +536,7 @@ Module1120Desc=Request supplier commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
 Module1400Name=Accounting
-Module1400Desc=Accounting management (double parties)
+Module1400Desc=Accounting management (double entries)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
 Module1780Name=Tags/Categories
@@ -585,7 +585,7 @@ Module50100Desc=Point of sales module (POS).
 Module50200Name=Paypal
 Module50200Desc=Module to offer an online payment page by credit card with Paypal
 Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double parties)
+Module50400Desc=Accounting management (double entries)
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Poll, Survey or Vote

From 8d23ffd6d234d57cfc2d59bf3b5fe9984f844662 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Jun 2017 02:05:42 +0200
Subject: [PATCH 315/438] Fix show vat rates

---
 htdocs/accountancy/journal/expensereportsjournal.php | 2 +-
 htdocs/accountancy/journal/purchasesjournal.php      | 2 +-
 htdocs/accountancy/journal/sellsjournal.php          | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index f751d78b1a6..1a18e89792a 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -134,7 +134,7 @@ if ($result) {
 		$compta_tva = (! empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $account_vat);
 
 		// Define array to display all VAT rates that use this accounting account $compta_tva
-		if ((! price2num($obj->tva_tx)) || ! empty($obj->vat_src_code))
+		if (price2num($obj->tva_tx) || ! empty($obj->vat_src_code))
 		{
 			$def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':'')]=(vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':''));
 		}
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index e80ae3ba059..cbe793deb63 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -145,7 +145,7 @@ if ($result) {
 		$compta_tva = (! empty($vatdata['accountancy_code_buy']) ? $vatdata['accountancy_code_buy'] : $cpttva);
 
 		// Define array to display all VAT rates that use this accounting account $compta_tva
-		if ((! price2num($obj->tva_tx)) || ! empty($obj->vat_src_code))
+		if (price2num($obj->tva_tx) || ! empty($obj->vat_src_code))
 		{
             $def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':'')]=(vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':''));
 		}
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 425153198a0..cf92905e041 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -150,7 +150,7 @@ if ($result) {
 		$compta_tva = (! empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $cpttva);
 
 		// Define array to display all VAT rates that use this accounting account $compta_tva
-		if ((! price2num($obj->tva_tx)) || ! empty($obj->vat_src_code))
+        if (price2num($obj->tva_tx) || ! empty($obj->vat_src_code))
 		{
 			$def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':'')]=(vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':''));
 		}
@@ -674,8 +674,7 @@ if (empty($action) || $action == 'view') {
 				}
 				else print $accountoshow;
 				print "</td>";
-				print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT");
-				print ' '.join(', ',$def_tva[$key][$k]);
+				print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT"). ' '.join(', ',$def_tva[$key][$k]);
 				print "</td>";
 				// print "<td>" . $langs->trans("VAT") . "</td>";
 				print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";

From 658ba50aa812da9e21ef7e4dbddb31fa1e74b6f1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Jun 2017 02:29:29 +0200
Subject: [PATCH 316/438] Standardize picto status

---
 htdocs/core/class/fiscalyear.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/fiscalyear.class.php b/htdocs/core/class/fiscalyear.class.php
index 22b26983bcc..a273443ef7c 100644
--- a/htdocs/core/class/fiscalyear.class.php
+++ b/htdocs/core/class/fiscalyear.class.php
@@ -275,7 +275,7 @@ class Fiscalyear extends CommonObject
 		if ($mode == 5)
 		{
 			if ($statut==0 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
-			if ($statut==1 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut8');
+			if ($statut==1 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut6');
 		}
 	}
 

From 74c509eac83498a6432626b2f5d230faf469f031 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Jun 2017 02:36:13 +0200
Subject: [PATCH 317/438] Fix bad var type (must be array)

---
 htdocs/install/upgrade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index 772d578a841..e7cb6f46d71 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -185,10 +185,10 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
         dolibarr_install_syslog("upgrade: " . $langs->transnoentities("ServerVersion") . ": " .$version);
 
         // Test database version requirement
-        $versionmindb=$db::VERSIONMIN;
+        $versionmindb=explode('.',$db::VERSIONMIN);
         //print join('.',$versionarray).' - '.join('.',$versionmindb);
         if (count($versionmindb) && count($versionarray)
-        	&& versioncompare($versionarray,$versionmindb) < 0)
+        	&& versioncompare($versionarray, $versionmindb) < 0)
         {
         	// Warning: database version too low.
         	print "<tr><td>".$langs->trans("ErrorDatabaseVersionTooLow",join('.',$versionarray),join('.',$versionmindb))."</td><td align=\"right\">".$langs->trans("Error")."</td></tr>\n";

From c381c213a50af78bcf7f6b877e81493bdee2adfd Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Tue, 20 Jun 2017 06:52:41 +0200
Subject: [PATCH 318/438] Fix : Accountancy

---
 htdocs/accountancy/admin/accountmodel.php    |   1 -
 htdocs/accountancy/admin/defaultaccounts.php |  16 +-
 htdocs/accountancy/bookkeeping/card.php      |   3 +-
 htdocs/accountancy/bookkeeping/list.php      |   1 -
 htdocs/accountancy/customer/index.php        | 232 +++++++++----------
 htdocs/accountancy/expensereport/index.php   |   3 -
 htdocs/langs/en_US/salaries.lang             |   3 +-
 7 files changed, 125 insertions(+), 134 deletions(-)

diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index ff908d6d066..e57354f8566 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -1148,7 +1148,6 @@ else
      * Show list of dictionary to show
      */
 
-    $var=true;
     $lastlineisempty=false;
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php
index 227949a3c1c..9cf4d2977fd 100644
--- a/htdocs/accountancy/admin/defaultaccounts.php
+++ b/htdocs/accountancy/admin/defaultaccounts.php
@@ -1,11 +1,11 @@
 <?php
-/* Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2013-2014 Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2013-2016 Alexandre Spangaro	<aspangaro@zendsi.com>
- * Copyright (C) 2014-2015 Ari Elbaz (elarifr)	<github@accedinfo.com>
+/* Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
+ * Copyright (C) 2013-2014 Florian Henry        <florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2017 Alexandre Spangaro   <aspangaro@zendsi.com>
+ * Copyright (C) 2014-2015 Ari Elbaz (elarifr)  <github@accedinfo.com>
  * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
+ * Copyright (C) 2014      Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2015      Jean-François Ferry  <jfefe@aternatik.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
  */
 
 /**
- * \file		htdocs/accountancy/admin/index.php
+ * \file		htdocs/accountancy/admin/defaultaccounts.php
  * \ingroup		Advanced accountancy
  * \brief		Setup page to configure accounting expert module
  */
@@ -53,10 +53,10 @@ $action = GETPOST('action', 'alpha');
 $list_account_main = array (
     'ACCOUNTING_ACCOUNT_CUSTOMER',
     'ACCOUNTING_ACCOUNT_SUPPLIER',
+    'SALARIES_ACCOUNTING_ACCOUNT_PAYMENT',
 );
 
 $list_account = array (
-    'SALARIES_ACCOUNTING_ACCOUNT_PAYMENT',
     'ACCOUNTING_PRODUCT_BUY_ACCOUNT',
     'ACCOUNTING_PRODUCT_SOLD_ACCOUNT',
     'ACCOUNTING_SERVICE_BUY_ACCOUNT',
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 3c6d2faec94..28b7b177860 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -500,8 +500,7 @@ if ($action == 'create') {
 				print "</tr>\n";
 
 				foreach ( $book->linesmvt as $line ) {
-					$var = ! $var;
-					print '<tr' . $bc[$var] . '>';
+					print '<tr class="oddeven">';
 					$total_debit += $line->debit;
 					$total_credit += $line->credit;
 
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 1062fd50d87..16d27df15fd 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -438,7 +438,6 @@ $total_debit = 0;
 $total_credit = 0;
 
 foreach ($object->lines as $line ) {
-	$var = ! $var;
 
 	$total_debit += $line->debit;
 	$total_credit += $line->credit;
diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index 24e066917bc..10322c68077 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -1,9 +1,9 @@
 <?php
-/* Copyright (C) 2013      Olivier Geffroy		<jeff@jeffinfo.com>
+/* Copyright (C) 2013	  Olivier Geffroy		<jeff@jeffinfo.com>
  * Copyright (C) 2013-2014 Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2013-2016 Alexandre Spangaro	<aspangaro@zendsi.com>
  * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2015      Jean-François Ferry  <jfefe@aternatik.fr>
+ * Copyright (C) 2015	  Jean-François Ferry  <jfefe@aternatik.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,7 +40,7 @@ $langs->load("accountancy");
 
 // Security check
 if (empty($conf->accounting->enabled)) {
-    accessforbidden();
+	accessforbidden();
 }
 if ($user->societe_id > 0)
 	accessforbidden();
@@ -187,7 +187,7 @@ if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 } else {
 	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
 }
-$sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")";    // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")";	// We don't share object for accountancy
 
 dol_syslog("htdocs/accountancy/customer/index.php sql=" . $sql, LOG_DEBUG);
 $result = $db->query($sql);
@@ -203,10 +203,6 @@ $buttonbind = '<a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?year=' .
 $buttonreset = '<a class="butActionDelete" href="' . $_SERVER['PHP_SELF'] . '?year=' . $year_current . '&action=cleanaccountancycode">' . $langs->trans("CleanHistory", $year_current) . '</a>';
 
 
-
-
-$var = true;
-
 print_fiche_titre($langs->trans("OverviewOfAmountOfLinesNotBound"), $buttonbind, '');
 
 print '<table class="noborder" width="100%">';
@@ -269,14 +265,14 @@ print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><td width="200">' . $langs->trans("Account") . '</td>';
 print '<td width="200" align="left">' . $langs->trans("Label") . '</td>';
 for($i = 1; $i <= 12; $i ++) {
-    print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . '</td>';
+	print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . '</td>';
 }
 print '<td width="60" align="right"><b>' . $langs->trans("Total") . '</b></td></tr>';
 
 $sql = "SELECT " . $db->ifsql('aa.account_number IS NULL', "'".$langs->trans('NotMatch')."'", 'aa.account_number') . " AS codecomptable,";
 $sql .= "  " . $db->ifsql('aa.label IS NULL', "'".$langs->trans('NotMatch')."'", 'aa.label') . " AS intitule,";
 for($i = 1; $i <= 12; $i ++) {
-    $sql .= "  SUM(" . $db->ifsql('MONTH(f.datef)=' . $i, 'fd.total_ht', '0') . ") AS month" . str_pad($i, 2, '0', STR_PAD_LEFT) . ",";
+	$sql .= "  SUM(" . $db->ifsql('MONTH(f.datef)=' . $i, 'fd.total_ht', '0') . ") AS month" . str_pad($i, 2, '0', STR_PAD_LEFT) . ",";
 }
 $sql .= "  SUM(fd.total_ht) as total";
 $sql .= " FROM " . MAIN_DB_PREFIX . "facturedet as fd";
@@ -296,22 +292,22 @@ $sql .= " GROUP BY fd.fk_code_ventilation,aa.account_number,aa.label";
 dol_syslog("htdocs/accountancy/customer/index.php sql=" . $sql, LOG_DEBUG);
 $resql = $db->query($sql);
 if ($resql) {
-    $num = $db->num_rows($resql);
+	$num = $db->num_rows($resql);
 
-    while ( $row = $db->fetch_row($resql)) {
+	while ( $row = $db->fetch_row($resql)) {
 
-        print '<tr class="oddeven"><td>' . length_accountg($row[0]) . '</td>';
-        print '<td align="left">' . $row[1] . '</td>';
-        for($i = 2; $i <= 12; $i ++) {
-            print '<td align="right">' . price($row[$i]) . '</td>';
-        }
-        print '<td align="right">' . price($row[13]) . '</td>';
-        print '<td align="right"><b>' . price($row[14]) . '</b></td>';
-        print '</tr>';
-    }
-    $db->free($resql);
+		print '<tr class="oddeven"><td>' . length_accountg($row[0]) . '</td>';
+		print '<td align="left">' . $row[1] . '</td>';
+		for($i = 2; $i <= 12; $i ++) {
+			print '<td align="right">' . price($row[$i]) . '</td>';
+		}
+		print '<td align="right">' . price($row[13]) . '</td>';
+		print '<td align="right"><b>' . price($row[14]) . '</b></td>';
+		print '</tr>';
+	}
+	$db->free($resql);
 } else {
-    print $db->lasterror(); // Show last sql error
+	print $db->lasterror(); // Show last sql error
 }
 print "</table>\n";
 
@@ -319,101 +315,101 @@ print "</table>\n";
 
 if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange. Why showing a report that should rely on result of this step ?
 {
-    print '<br>';
-    print '<br>';
-    
-    print_fiche_titre($langs->trans("OtherInfo"), '', '');
-    
-    print "<br>\n";
-    print '<table class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td width="400" align="left">' . $langs->trans("TotalVente") . '</td>';
-    for($i = 1; $i <= 12; $i ++) {
-    	print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . '</td>';
-    }
-    print '<td width="60" align="right"><b>' . $langs->trans("Total") . '</b></td></tr>';
-    
-    $sql = "SELECT '" . $langs->trans("TotalVente") . "' AS total,";
-    for($i = 1; $i <= 12; $i ++) {
-    	$sql .= "  SUM(" . $db->ifsql('MONTH(f.datef)=' . $i, 'fd.total_ht', '0') . ") AS month" . str_pad($i, 2, '0', STR_PAD_LEFT) . ",";
-    }
-    $sql .= "  SUM(fd.total_ht) as total";
-    $sql .= " FROM " . MAIN_DB_PREFIX . "facturedet as fd";
-    $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_facture";
-    $sql .= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
-    $sql .= "  AND f.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
-    $sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")"; // We don't share object for accountancy
-    if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-        $sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
-    } else {
-        $sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
-    }
-    
-    dol_syslog('htdocs/accountancy/customer/index.php');
-    $resql = $db->query($sql);
-    if ($resql) {
-    	$i = 0;
-    	$num = $db->num_rows($resql);
-    
-    	while ($row = $db->fetch_row($resql)) {
-    		print '<tr><td>' . $row[0] . '</td>';
-    		for($i = 1; $i <= 12; $i ++) {
-    			print '<td align="right">' . price($row[$i]) . '</td>';
-    		}
-    		print '<td align="right"><b>' . price($row[13]) . '</b></td>';
-    		print '</tr>';
-    		$i ++;
-    	}
-    	$db->free($resql);
-    } else {
-    	print $db->lasterror(); // Show last sql error
-    }
-    print "</table>\n";
-    
-    if (! empty($conf->margin->enabled)) {
-    	print "<br>\n";
-    	print '<table class="noborder" width="100%">';
-    	print '<tr class="liste_titre"><td width="400">' . $langs->trans("TotalMarge") . '</td>';
-    	for($i = 1; $i <= 12; $i ++) {
-    		print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . '</td>';
-    	}
-    	print '<td width="60" align="right"><b>' . $langs->trans("Total") . '</b></td></tr>';
-    
-    	$sql = "SELECT '" . $langs->trans("Vide") . "' AS marge,";
-    	for($i = 1; $i <= 12; $i ++) {
-    		$sql .= "  SUM(" . $db->ifsql('MONTH(f.datef)=' . $i, '(fd.total_ht-(fd.qty * fd.buy_price_ht))', '0') . ") AS month" . str_pad($i, 2, '0', STR_PAD_LEFT) . ",";
-    	}
-    	$sql .= "  SUM((fd.total_ht-(fd.qty * fd.buy_price_ht))) as total";
-    	$sql .= " FROM " . MAIN_DB_PREFIX . "facturedet as fd";
-    	$sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_facture";
-    	$sql .= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
-    	$sql .= "  AND f.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
-    	$sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")";   // We don't share object for accountancy
-    	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-    	    $sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
-    	} else {
-    	    $sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
-    	}
-    	 
-    	dol_syslog('htdocs/accountancy/customer/index.php:: $sql=' . $sql);
-    	$resql = $db->query($sql);
-    	if ($resql) {
-    		$num = $db->num_rows($resql);
-    
-    		while ($row = $db->fetch_row($resql)) {
-    
-    			print '<tr><td>' . $row[0] . '</td>';
-    			for($i = 1; $i <= 12; $i ++) {
-    				print '<td align="right">' . price(price2num($row[$i])) . '</td>';
-    			}
-    			print '<td align="right"><b>' . price(price2num($row[13])) . '</b></td>';
-    			print '</tr>';
-    		}
-    		$db->free($resql);
-    	} else {
-    		print $db->lasterror(); // Show last sql error
-    	}
-    	print "</table>\n";
-    }
+	print '<br>';
+	print '<br>';
+
+	print_fiche_titre($langs->trans("OtherInfo"), '', '');
+
+	print "<br>\n";
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre"><td width="400" align="left">' . $langs->trans("TotalVente") . '</td>';
+	for($i = 1; $i <= 12; $i ++) {
+		print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . '</td>';
+	}
+	print '<td width="60" align="right"><b>' . $langs->trans("Total") . '</b></td></tr>';
+	
+	$sql = "SELECT '" . $langs->trans("TotalVente") . "' AS total,";
+	for($i = 1; $i <= 12; $i ++) {
+		$sql .= "  SUM(" . $db->ifsql('MONTH(f.datef)=' . $i, 'fd.total_ht', '0') . ") AS month" . str_pad($i, 2, '0', STR_PAD_LEFT) . ",";
+	}
+	$sql .= "  SUM(fd.total_ht) as total";
+	$sql .= " FROM " . MAIN_DB_PREFIX . "facturedet as fd";
+	$sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_facture";
+	$sql .= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
+	$sql .= "  AND f.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
+	$sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")"; // We don't share object for accountancy
+	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+		$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
+	} else {
+		$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
+	}
+
+	dol_syslog('htdocs/accountancy/customer/index.php');
+	$resql = $db->query($sql);
+	if ($resql) {
+		$i = 0;
+		$num = $db->num_rows($resql);
+
+		while ($row = $db->fetch_row($resql)) {
+			print '<tr><td>' . $row[0] . '</td>';
+			for($i = 1; $i <= 12; $i ++) {
+				print '<td align="right">' . price($row[$i]) . '</td>';
+			}
+			print '<td align="right"><b>' . price($row[13]) . '</b></td>';
+			print '</tr>';
+			$i ++;
+		}
+		$db->free($resql);
+	} else {
+		print $db->lasterror(); // Show last sql error
+	}
+	print "</table>\n";
+
+	if (! empty($conf->margin->enabled)) {
+		print "<br>\n";
+		print '<table class="noborder" width="100%">';
+		print '<tr class="liste_titre"><td width="400">' . $langs->trans("TotalMarge") . '</td>';
+		for($i = 1; $i <= 12; $i ++) {
+			print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . '</td>';
+		}
+		print '<td width="60" align="right"><b>' . $langs->trans("Total") . '</b></td></tr>';
+
+		$sql = "SELECT '" . $langs->trans("Vide") . "' AS marge,";
+		for($i = 1; $i <= 12; $i ++) {
+			$sql .= "  SUM(" . $db->ifsql('MONTH(f.datef)=' . $i, '(fd.total_ht-(fd.qty * fd.buy_price_ht))', '0') . ") AS month" . str_pad($i, 2, '0', STR_PAD_LEFT) . ",";
+		}
+		$sql .= "  SUM((fd.total_ht-(fd.qty * fd.buy_price_ht))) as total";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "facturedet as fd";
+		$sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_facture";
+		$sql .= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
+		$sql .= "  AND f.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
+		$sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")";   // We don't share object for accountancy
+		if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
+		} else {
+			$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
+		}
+
+		dol_syslog('htdocs/accountancy/customer/index.php:: $sql=' . $sql);
+		$resql = $db->query($sql);
+		if ($resql) {
+			$num = $db->num_rows($resql);
+
+			while ($row = $db->fetch_row($resql)) {
+
+				print '<tr><td>' . $row[0] . '</td>';
+				for($i = 1; $i <= 12; $i ++) {
+					print '<td align="right">' . price(price2num($row[$i])) . '</td>';
+				}
+				print '<td align="right"><b>' . price(price2num($row[13])) . '</b></td>';
+				print '</tr>';
+			}
+			$db->free($resql);
+		} else {
+			print $db->lasterror(); // Show last sql error
+		}
+		print "</table>\n";
+	}
 }
 
 
diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
index e9ce1b2e729..fdbf4d1ce4b 100644
--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -178,9 +178,6 @@ $buttonreset = '<a class="butActionDelete" href="' . $_SERVER['PHP_SELF'] . '?ye
 
 $y = $year_current;
 
-$var = true;
-
-
 print '<br>';
 
 print_fiche_titre($langs->trans("OverviewOfAmountOfLinesNotBound"), $buttonbind, '');
diff --git a/htdocs/langs/en_US/salaries.lang b/htdocs/langs/en_US/salaries.lang
index 5fedb79823d..522bf0a65d7 100644
--- a/htdocs/langs/en_US/salaries.lang
+++ b/htdocs/langs/en_US/salaries.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - salaries
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account by default for salaries payments
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Dedicated accounting account defined on user card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated user accouting account on user is not defined
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for personnel expenses
 Salary=Salary
 Salaries=Salaries

From 3002c2855756445c3c2140abc672bfcdc3933313 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Tue, 20 Jun 2017 06:57:23 +0200
Subject: [PATCH 319/438] Fix: add dist name

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 473a1ac8fba..509578e57ef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,7 @@
 # from Dolibarr GitHub repository.
 # For syntax, see http://about.travis-ci.org/docs/user/languages/php/
 
+dist: precise
 sudo: required
 
 language: php

From 07a2938b832e4d38268dbba5e37ea60ff2255561 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Tue, 20 Jun 2017 07:07:12 +0200
Subject: [PATCH 320/438] Fix: try to force php version

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 509578e57ef..db0f3196cf8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ php:
 - '5.3'
 - '5.4'
 - '5.5'
-- '5.6'
+- '5.6.29'
 - '7.0'
 - '7.1'
 - nightly

From 095155a58b8e6e9a620955bcf57935304d0d89d3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Jun 2017 10:06:17 +0200
Subject: [PATCH 321/438] Enhance sql quality. Refused double quotes into sql
 content.

---
 htdocs/install/mysql/migration/3.2.0-3.3.0.sql         | 4 ++--
 htdocs/install/mysql/migration/3.5.0-3.6.0.sql         | 2 +-
 htdocs/install/mysql/migration/repair.sql              | 2 +-
 htdocs/install/mysql/tables/llx_accounting_account.sql | 2 +-
 htdocs/install/mysql/tables/llx_actioncomm.sql         | 2 +-
 htdocs/install/mysql/tables/llx_advtargetemailing.sql  | 2 +-
 htdocs/install/mysql/tables/llx_budget_lines.sql       | 2 +-
 htdocs/install/mysql/tables/llx_chargesociales.sql     | 2 +-
 test/phpunit/CodingSqlTest.php                         | 4 ++++
 9 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql
index bc065ee4c1a..2253eb68787 100644
--- a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql
+++ b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql
@@ -659,7 +659,7 @@ insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype,
 insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (305,'PCG99-BASE','FINAN', 'XXXXXX',  '511', '51', 'Valeurs à l''encaissement', '1');
 insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (306,'PCG99-BASE','FINAN', 'BANK',    '512', '51', 'Banques', '1');
 insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (307,'PCG99-BASE','FINAN', 'XXXXXX',  '514', '51', 'Chèques postaux', '1');
-insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (308,'PCG99-BASE','FINAN', 'XXXXXX',  '515', '51', '"Caisses" du Trésor et des établissements publics', '1');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (308,'PCG99-BASE','FINAN', 'XXXXXX',  '515', '51', 'Caisses du Trésor et des établissements publics', '1');
 insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (309,'PCG99-BASE','FINAN', 'XXXXXX',  '516', '51', 'Sociétés de bourse', '1');
 insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (310,'PCG99-BASE','FINAN', 'XXXXXX',  '517', '51', 'Autres organismes financiers', '1');
 insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (311,'PCG99-BASE','FINAN', 'XXXXXX',  '518', '51', 'Intérêts courus', '1');
@@ -803,7 +803,7 @@ ALTER TABLE llx_user ADD COLUMN job varchar(128) AFTER firstname;
 
 
 -- Use entity 0 for all entities
-INSERT INTO llx_const(name, value, visible, entity) SELECT __ENCRYPT('SYSLOG_HANDLERS')__, __ENCRYPT('["mod_syslog_file"]')__, 0, 0 FROM llx_const WHERE __DECRYPT('name')__ = 'SYSLOG_FILE_ON' AND __DECRYPT('value')__ = '1';
+INSERT INTO llx_const(name, value, visible, entity) SELECT __ENCRYPT('SYSLOG_HANDLERS')__, __ENCRYPT('[\'mod_syslog_file\']')__, 0, 0 FROM llx_const WHERE __DECRYPT('name')__ = 'SYSLOG_FILE_ON' AND __DECRYPT('value')__ = '1';
 
 
 -- New Imports
diff --git a/htdocs/install/mysql/migration/3.5.0-3.6.0.sql b/htdocs/install/mysql/migration/3.5.0-3.6.0.sql
index 1d7ad10d938..bfd9f1c3d53 100755
--- a/htdocs/install/mysql/migration/3.5.0-3.6.0.sql
+++ b/htdocs/install/mysql/migration/3.5.0-3.6.0.sql
@@ -635,7 +635,7 @@ INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype,
 INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (305,'PCG99-BASE','FINAN', 'XXXXXX',  '511', '304', 'Valeurs à l''encaissement', '1');
 INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (306,'PCG99-BASE','FINAN', 'BANK',    '512', '304', 'Banques', '1');
 INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (307,'PCG99-BASE','FINAN', 'XXXXXX',  '514', '304', 'Chèques postaux', '1');
-INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (308,'PCG99-BASE','FINAN', 'XXXXXX',  '515', '304', '"Caisses" du Trésor et des établissements publics', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (308,'PCG99-BASE','FINAN', 'XXXXXX',  '515', '304', 'Caisses du Trésor et des établissements publics', '1');
 INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (309,'PCG99-BASE','FINAN', 'XXXXXX',  '516', '304', 'Sociétés de bourse', '1');
 INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (310,'PCG99-BASE','FINAN', 'XXXXXX',  '517', '304', 'Autres organismes financiers', '1');
 INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (311,'PCG99-BASE','FINAN', 'XXXXXX',  '518', '304', 'Intérêts courus', '1');
diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index 567bd3aef85..3f1b93778d4 100755
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -18,7 +18,7 @@
 
 -- ALTER TABLE llx_accounting_account MODIFY account_number VARCHAR(20) CHARACTER SET utf8;
 -- ALTER TABLE llx_accounting_account MODIFY account_number VARCHAR(20) COLLATE utf8_unicode_ci;
--- You can check with "show full columns from llx_accounting_account";
+-- You can check with 'show full columns from llx_accounting_account';
 
 
 
diff --git a/htdocs/install/mysql/tables/llx_accounting_account.sql b/htdocs/install/mysql/tables/llx_accounting_account.sql
index 23e53f73740..8abd342cee5 100644
--- a/htdocs/install/mysql/tables/llx_accounting_account.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_account.sql
@@ -16,7 +16,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
--- Table of "accounts" for accountancy expert module
+-- Table of 'accounts' for accountancy expert module
 -- ============================================================================
 
 create table llx_accounting_account
diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql
index 48b73bcaa65..dc5c50c288f 100644
--- a/htdocs/install/mysql/tables/llx_actioncomm.sql
+++ b/htdocs/install/mysql/tables/llx_actioncomm.sql
@@ -65,7 +65,7 @@ create table llx_actioncomm
   errors_to			varchar(256),					-- when event was an email, we store here the erros_to
   
   recurid           varchar(128),                   -- used to store event id to link each other all the repeating event record
-  recurrule         varchar(128),					-- contains string with ical format recurring rule like "FREQ=MONTHLY;INTERVAL=2;BYMONTHDAY=19" or "FREQ=WEEKLY;BYDAY=MO"
+  recurrule         varchar(128),					-- contains string with ical format recurring rule like 'FREQ=MONTHLY;INTERVAL=2;BYMONTHDAY=19' or 'FREQ=WEEKLY;BYDAY=MO'
   recurdateend      datetime,						-- no more recurring event after this date
      
   fk_element		integer DEFAULT NULL,			-- For link to an element (proposal, invoice, order, ...)
diff --git a/htdocs/install/mysql/tables/llx_advtargetemailing.sql b/htdocs/install/mysql/tables/llx_advtargetemailing.sql
index 7e95f6b8097..d2114821f2e 100644
--- a/htdocs/install/mysql/tables/llx_advtargetemailing.sql
+++ b/htdocs/install/mysql/tables/llx_advtargetemailing.sql
@@ -14,7 +14,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
--- Table of "Plan de comptes" for accountancy expert module
+-- Table to setup advanced targeting for emailing
 -- ============================================================================
 
 CREATE TABLE llx_advtargetemailing
diff --git a/htdocs/install/mysql/tables/llx_budget_lines.sql b/htdocs/install/mysql/tables/llx_budget_lines.sql
index aba5c7f53ee..c93a6e736e7 100644
--- a/htdocs/install/mysql/tables/llx_budget_lines.sql
+++ b/htdocs/install/mysql/tables/llx_budget_lines.sql
@@ -20,7 +20,7 @@ create table llx_budget_lines
 (
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
   fk_budget     	integer NOT NULL,
-  fk_project_ids	varchar(255) NOT NULL,		-- 'IDS:x,y' = List of project ids related to this budget. If budget is dedicated to projects not yet started, we recommand to create a project "Projects to come". 'FILTER:ref=*ABC' = Can also be a dynamic rule to select projects.
+  fk_project_ids	varchar(255) NOT NULL,		-- 'IDS:x,y' = List of project ids related to this budget. If budget is dedicated to projects not yet started, we recommand to create a project 'Projects to come'. 'FILTER:ref=*ABC' = Can also be a dynamic rule to select projects.
   amount			double(24,8) NOT NULL,
   datec        		datetime,
   tms           	timestamp,
diff --git a/htdocs/install/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql
index 519ceacc9e5..f52d155ecaa 100644
--- a/htdocs/install/mysql/tables/llx_chargesociales.sql
+++ b/htdocs/install/mysql/tables/llx_chargesociales.sql
@@ -21,7 +21,7 @@
 create table llx_chargesociales
 (
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
-  ref               varchar(16),				   -- "TX...."
+  ref               varchar(16),				   -- 'TX....'
   date_ech			datetime NOT NULL,             -- date echeance
   libelle			varchar(80) NOT NULL,
   entity			integer DEFAULT 1 NOT NULL,	  -- multi company id
diff --git a/test/phpunit/CodingSqlTest.php b/test/phpunit/CodingSqlTest.php
index c56f76af246..348043d4a4e 100644
--- a/test/phpunit/CodingSqlTest.php
+++ b/test/phpunit/CodingSqlTest.php
@@ -160,6 +160,10 @@ class CodingSqlTest extends PHPUnit_Framework_TestCase
                 print __METHOD__." Result for checking we don't have back quote = ".$result."\n";
                 $this->assertTrue($result===false, 'Found back quote into '.$file.'. Bad.');
 
+                $result=strpos($filecontent,'"');
+                print __METHOD__." Result for checking we don't have double quote = ".$result."\n";
+                $this->assertTrue($result===false, 'Found double quote into '.$file.'. Bad.');
+
                 $result=strpos($filecontent,'int(');
                 print __METHOD__." Result for checking we don't have 'int(' instead of 'integer' = ".$result."\n";
                 $this->assertTrue($result===false, 'Found int(x) or tinyint(x) instead of integer or tinyint into '.$file.'. Bad.');

From d8b0199ba23724a9861a1f5bca42a056eb329c32 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Jun 2017 10:24:54 +0200
Subject: [PATCH 322/438] FIX #7040

---
 htdocs/core/class/commonobject.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index d98625db1cc..2d52a7ee2d1 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1469,7 +1469,7 @@ abstract class CommonObject
     		$fieldname = 'multicurrency_code';
 
     		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-    		$sql .= ' SET '.$fieldname.' = "'.$this->db->escape($code).'"';
+    		$sql .= ' SET '.$fieldname." = '".$this->db->escape($code)."'";
     		$sql .= ' WHERE rowid='.$this->id;
 
     		if ($this->db->query($sql))

From 6d42922839c41bf205f985b69b7cc83cab167be4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Jun 2017 10:37:42 +0200
Subject: [PATCH 323/438] FIX #7012

---
 htdocs/supplier_proposal/card.php | 68 +++++++++++++++----------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 55da718cebc..a336a96b5e0 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -510,7 +510,7 @@ if (empty($reshook))
 	}
 
 	// Add a product line
-	if ($action == 'addline' && $user->rights->supplier_proposal->creer) 
+	if ($action == 'addline' && $user->rights->supplier_proposal->creer)
 	{
 	    $langs->load('errors');
 	    $error = 0;
@@ -520,7 +520,7 @@ if (empty($reshook))
 		$product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):'');
 		$date_start=dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start' . $predef . 'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
 		$date_end=dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end' . $predef . 'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
-		
+
 		if (GETPOST('prod_entry_mode') == 'free')
 		{
 			$idprod=0;
@@ -577,7 +577,7 @@ if (empty($reshook))
 			if ((GETPOST('prod_entry_mode') != 'free') && empty($error))	// With combolist mode idprodfournprice is > 0 or -1. With autocomplete, idprodfournprice is > 0 or ''
 			{
 			    $productsupplier = new ProductFournisseur($db);
-			    
+
 			    if (empty($conf->global->SUPPLIER_PROPOSAL_WITH_NOPRICEDEFINED))
 			    {
 			        $idprod=0;
@@ -597,7 +597,7 @@ if (empty($reshook))
 			        $idprod=$productsupplier->get_buyprice(GETPOST('idprodfournprice'), -1);        // We force qty to -1 to be sure to find if a supplier price exist
                     $res=$productsupplier->fetch($idprod);
 			    }
-                
+
 			    if ($idprod > 0)
 			    {
 			        $pu_ht = $productsupplier->fourn_pu;
@@ -606,7 +606,7 @@ if (empty($reshook))
 			        $label = $productsupplier->label;
 			        $desc = $productsupplier->description;
 			        if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc);
-			
+
 			        $tva_tx	= get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice'));
 			        $tva_npr = get_default_npr($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice'));
 			        if (empty($tva_tx)) $tva_npr=0;
@@ -664,13 +664,13 @@ if (empty($reshook))
 			    $type = GETPOST('type');
 
 			    $fk_unit= GETPOST('units', 'alpha');
-			
+
 			    $tva_tx = price2num($tva_tx);	// When vat is text input field
-			
+
 			    // Local Taxes
 			    $localtax1_tx= get_localtax($tva_tx, 1, $mysoc, $object->thirdparty);
 			    $localtax2_tx= get_localtax($tva_tx, 2, $mysoc, $object->thirdparty);
-			
+
 			    if (GETPOST('price_ht')!=='')
 			    {
 			        $price_base_type = 'HT';
@@ -683,13 +683,13 @@ if (empty($reshook))
 			        $ht = $ttc / (1 + ($tva_tx / 100));
 			        $price_base_type = 'HT';
 			    }
-			
+
 				$result = $object->addline($desc, $ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $price_base_type, $ttc, $info_bits, $type, - 1, 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $array_options, $ref_fourn, $fk_unit);
 			    //$result = $object->addline($desc, $ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, 0, 0, '', $remise_percent, $price_base_type, $ttc, $type,'','', $date_start, $date_end, $array_options, $fk_unit);
 			}
 
 
-			if (! $error && $result > 0) 
+			if (! $error && $result > 0)
 			{
 					$db->commit();
 
@@ -706,7 +706,7 @@ if (empty($reshook))
 						}
 						$model=$object->modelpdf;
 						$ret = $object->fetch($id); // Reload to get new records
-						
+
 						$result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			    		if ($result < 0) dol_print_error($db,$result);
 					}
@@ -716,7 +716,7 @@ if (empty($reshook))
 					unset($_POST['qty']);
 					unset($_POST['type']);
 					unset($_POST['remise_percent']);
-					unset($_POST['pu']);					
+					unset($_POST['pu']);
 					unset($_POST['price_ht']);
 					unset($_POST['multicurrency_price_ht']);
 					unset($_POST['price_ttc']);
@@ -747,8 +747,8 @@ if (empty($reshook))
 					unset($_POST['date_endday']);
 					unset($_POST['date_endmonth']);
 					unset($_POST['date_endyear']);
-			} 
-			else 
+			}
+			else
 			{
 				$db->rollback();
 
@@ -1367,11 +1367,11 @@ if ($action == 'create')
 	// Print form confirm
 	print $formconfirm;
 
-	
+
 	// Supplier proposal card
 	$linkback = '<a href="' . DOL_URL_ROOT . '/supplier_proposal/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
-	
-	
+
+
 	$morehtmlref='<div class="refidno">';
 	// Ref supplier
 	//$morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->fournisseur->commande->creer, 'string', '', 0, 1);
@@ -1392,7 +1392,7 @@ if ($action == 'create')
 	                $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
 	                $morehtmlref.='<input type="hidden" name="action" value="classin">';
 	                $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	                $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+	                $morehtmlref.=$formproject->select_projects((empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS)?$object->socid:-1), $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
 	                $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 	                $morehtmlref.='</form>';
 	            } else {
@@ -1411,15 +1411,15 @@ if ($action == 'create')
 	    }
 	}
 	$morehtmlref.='</div>';
-	
-	
+
+
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-	
-	
+
+
 	print '<div class="fichecenter">';
 	print '<div class="fichehalfleft">';
 	print '<div class="underbanner clearboth"></div>';
-	
+
 	print '<table class="border" width="100%">';
 
 	// Payment term
@@ -1562,14 +1562,14 @@ if ($action == 'create')
 	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
 	print '</table>';
-	
+
 	print '</div>';
 	print '<div class="fichehalfright">';
 	print '<div class="ficheaddleft">';
 	print '<div class="underbanner clearboth"></div>';
-	
+
 	print '<table class="border centpercent">';
-	
+
 	if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency))
 	{
 		// Multicurrency Amount HT
@@ -1587,7 +1587,7 @@ if ($action == 'create')
 		print '<td>' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
 		print '</tr>';
 	}
-	
+
 	// Amount HT
 	print '<tr><td class="titlefieldmiddle">' . $langs->trans('AmountHT') . '</td>';
 	print '<td>' . price($object->total_ht, '', $langs, 0, - 1, - 1, $conf->currency) . '</td>';
@@ -1618,18 +1618,18 @@ if ($action == 'create')
 	print '</tr>';
 
 	print '</table>';
-	
+
 	// Margin Infos
 	/*if (! empty($conf->margin->enabled)) {
 	   $formmargin->displayMarginInfos($object);
-	}*/	
+	}*/
 
 	print '</div>';
 	print '</div>';
 	print '</div>';
-	
+
 	print '<div class="clearboth"></div><br>';
-	
+
 	if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
 		$blocname = 'contacts';
 		$title = $langs->trans('ContactsAddresses');
@@ -1666,7 +1666,7 @@ if ($action == 'create')
 	// Add free products/services form
 	global $forceall, $senderissupplier, $dateSelector;
 	$forceall=1; $senderissupplier=2; $dateSelector=0;     // $senderissupplier=2 is same than 1 but disable test on minimum qty.
-	
+
 	if (! empty($object->lines))
 		$ret = $object->printObjectLines($action, $soc, $mysoc, $lineid, 1);
 
@@ -1814,12 +1814,12 @@ if ($action == 'create')
 
 		print $formfile->showdocuments('supplier_proposal', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
 
-		
+
 		// Show links to link elements
 		$linktoelem = $form->showLinkToObjectBlock($object, null, array('supplier_proposal'));
 		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
-		
+
 		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
 		// List of actions on element

From d572bd4f34e6ab85718a035d0300ea48dfe53cef Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Jun 2017 10:45:20 +0200
Subject: [PATCH 324/438] FIX #7003

---
 htdocs/projet/ganttchart.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/projet/ganttchart.inc.php b/htdocs/projet/ganttchart.inc.php
index f60ada41bb1..8ac203500b3 100644
--- a/htdocs/projet/ganttchart.inc.php
+++ b/htdocs/projet/ganttchart.inc.php
@@ -141,7 +141,7 @@ else
 function constructGanttLine($tarr,$task,$project_dependencies,$level=0,$project_id=null)
 {
     global $dateformatinput2;
-    
+
     $start_date = $task["task_start_date"];
     $end_date = $task["task_end_date"];
     if (!$end_date) $end_date = $start_date;
@@ -206,7 +206,7 @@ function constructGanttLine($tarr,$task,$project_dependencies,$level=0,$project_
     $s = "\n// Add taks id=".$task["task_id"]." level = ".$level."\n";
    // $s.= "g.AddTaskItem(new JSGantt.TaskItem(".$task['task_id'].",'".dol_escape_js($name)."','".$start_date."', '".$end_date."', '".$task['task_color']."', '".$link."', ".$task['task_milestone'].", '".$resources."', ".($percent >= 0 ? $percent : 0).", ".($task["task_is_group"]>0?1:0).", '".$parent."', 1, '".($depend?$depend:"")."', '".$note."'));";
     // For JSGanttImproved
-    $s.= "g.AddTaskItem(new JSGantt.TaskItem(".$task['task_id'].",'".dol_escape_js(trim($name))."','".$start_date."', '".$end_date."', '".$task['task_css']."', '".$link."', ".$task['task_milestone'].", '".$resources."', ".($percent >= 0 ? $percent : 0).", ".($task["task_is_group"]).", '".$parent."', 1, '".($depend?$depend:$parent."SS")."', '".($percent >= 0 ? $percent.'%' : '0%')."','".$task['note']."'));";
+    $s.= "g.AddTaskItem(new JSGantt.TaskItem(".$task['task_id'].",'".dol_escape_js(trim($name))."','".$start_date."', '".$end_date."', '".$task['task_css']."', '".$link."', ".$task['task_milestone'].", '".$resources."', ".($percent >= 0 ? $percent : 0).", ".($task["task_is_group"]).", '".$parent."', 1, '".($depend?$depend:$parent."SS")."', '".($percent >= 0 ? $percent.'%' : '0%')."','".dol_escape_js($task['note'])."'));";
     echo $s;
 
 

From f2a2cfd8c85ea7241e4e830caa772921d7fef765 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Jun 2017 11:46:30 +0200
Subject: [PATCH 325/438] Look and feel v6

---
 htdocs/admin/multicurrency.php | 53 +++++++++++++++-------------------
 1 file changed, 23 insertions(+), 30 deletions(-)

diff --git a/htdocs/admin/multicurrency.php b/htdocs/admin/multicurrency.php
index 3aa6ad5dc26..ac5ab678109 100644
--- a/htdocs/admin/multicurrency.php
+++ b/htdocs/admin/multicurrency.php
@@ -61,7 +61,7 @@ if (preg_match('/set_(.*)/',$action,$reg))
 		dol_print_error($db);
 	}
 }
-	
+
 if (preg_match('/del_(.*)/',$action,$reg))
 {
 	$code=$reg[1];
@@ -79,7 +79,7 @@ if (preg_match('/del_(.*)/',$action,$reg))
 if ($action == 'add_currency')
 {
 	$langs->loadCacheCurrencies('');
-	
+
 	$code = GETPOST('code', 'alpha');
 	$rate = GETPOST('rate', 'alpha');
 	$currency = new MultiCurrency($db);
@@ -96,23 +96,23 @@ if ($action == 'add_currency')
 elseif ($action == 'update_currency')
 {
 	$submit = GETPOST('submit', 'alpha');
-	
+
 	if ($submit == $langs->trans('Modify'))
 	{
 		$fk_multicurrency = GETPOST('fk_multicurrency', 'int');
 		$rate = GETPOST('rate', 'float');
 		$currency = new MultiCurrency($db);
-		
+
 		if ($currency->fetch($fk_multicurrency) > 0)
 		{
 			$currency->updateRate($rate);
-		}	
+		}
 	}
 	elseif ($submit == $langs->trans('Delete'))
 	{
 		$fk_multicurrency = GETPOST('fk_multicurrency', 'int');
 		$currency = new MultiCurrency($db);
-		
+
 		if ($currency->fetch($fk_multicurrency) > 0)
 		{
 			if ($currency->delete() > 0) setEventMessages($langs->trans('RecordDeleted'), array());
@@ -120,14 +120,14 @@ elseif ($action == 'update_currency')
 		}
 	}
 }
-elseif ($action == 'synchronize') 
+elseif ($action == 'synchronize')
 {
 	$response = GETPOST('response');
 	$response = json_decode($response);
-	
+
 	if ($response->success)
 	{
-		MultiCurrency::syncRates($response);	
+		MultiCurrency::syncRates($response);
 	}
 	else
 	{
@@ -159,19 +159,12 @@ $page_name = "MultiCurrencySetup";
 llxHeader('', $langs->trans($page_name));
 
 // Subheader
-$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">'
-    . $langs->trans("BackToModuleList") . '</a>';
+$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">' . $langs->trans("BackToModuleList") . '</a>';
 print_fiche_titre($langs->trans($page_name), $linkback);
 
 // Configuration header
 $head = multicurrencyAdminPrepareHead();
-dol_fiche_head(
-    $head,
-    'settings',
-    $langs->trans("ModuleSetup"),
-    0,
-    "multicurrency"
-);
+dol_fiche_head($head, 'settings', $langs->trans("ModuleSetup"), -1, "multicurrency");
 
 // Setup page goes here
 $form=new Form($db);
@@ -225,7 +218,7 @@ print '</form>';
 print '</td></tr>';
 */
 
-/* TODO uncomment when the functionality will integrated 
+/* TODO uncomment when the functionality will integrated
 
 print '<tr class="oddeven">';
 print '<td>'.$langs->transnoentitiesnoconv("multicurrency_modifyRateApplication").'</td>';
@@ -258,9 +251,9 @@ if (!empty($conf->global->MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION))
 	print $langs->trans("Value").'&nbsp;<input type="button" id="bt_sync" class="button" onclick="javascript:getRates();" value="'.$langs->trans('Synchronize').'" />';
 	print '</form>';
 	print '</td></tr>';
-	
-	
-	
+
+
+
 	print '<tr class="oddeven">';
 	print '<td><a target="_blank" href="https://currencylayer.com">'.$langs->transnoentitiesnoconv("multicurrency_appId").'</a></td>';
 	print '<td align="center" width="20">&nbsp;</td>';
@@ -272,8 +265,8 @@ if (!empty($conf->global->MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION))
 	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 	print '</form>';
 	print '</td></tr>';
-	
-	
+
+
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->transnoentitiesnoconv("multicurrency_appCurrencySource").'</td>';
 	print '<td align="center" width="20">&nbsp;</td>';
@@ -285,8 +278,8 @@ if (!empty($conf->global->MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION))
 	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 	print '</form>';
 	print '</td></tr>';
-	
-	
+
+
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->transnoentitiesnoconv("multicurrency_alternateCurrencySource").'</td>';
 	print '<td align="center" width="20">&nbsp;</td>';
@@ -298,7 +291,7 @@ if (!empty($conf->global->MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION))
 	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 	print '</form>';
 	print '</td></tr>';
-	
+
 	print '</table>';
 	print '<br />';
 }
@@ -333,8 +326,8 @@ print '</td></form></tr>';
 foreach ($TCurrency as &$currency)
 {
 	if($currency->code == $conf->currency) continue;
-	
-	
+
+
 	print '<tr class="oddeven">';
 	print '<td>'.$currency->code.' - '.$currency->name.'</td>';
 	print '<td align="center" width="20">&nbsp;</td>';
@@ -362,7 +355,7 @@ print '
 		{
 			$("#bt_sync").attr("disabled", true);
 			var url_sync = "http://apilayer.net/api/live?access_key='.$conf->global->MULTICURRENCY_APP_ID.'&format=1'.(!empty($conf->global->MULTICURRENCY_APP_SOURCE) ? '&source='.$conf->global->MULTICURRENCY_APP_SOURCE : '').'";
-			
+
 			$.ajax({
 				url: url_sync,
 				dataType: "jsonp"

From 08a86fa03dcc5ee4c46f9b001de3cccafed17b2f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Jun 2017 12:17:13 +0200
Subject: [PATCH 326/438] Start #6981

---
 htdocs/commande/stats/index.php | 6 +++---
 htdocs/core/lib/files.lib.php   | 2 +-
 htdocs/fourn/commande/list.php  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index 8967e22a160..ed9f8906804 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -76,7 +76,7 @@ if ($mode == 'customer')
 if ($mode == 'supplier')
 {
     $title=$langs->trans("OrdersStatisticsSuppliers").' ('.$langs->trans("SentToSuppliers").")";
-    $dir=$conf->fournisseur->dir_output.'/commande/temp';
+    $dir=$conf->fournisseur->commande->dir_temp;
 }
 
 llxHeader('', $title);
@@ -322,7 +322,7 @@ foreach ($data as $val)
 	while (! empty($year) && $oldyear > $year+1)
 	{ // If we have empty year
 		$oldyear--;
-		
+
 		print '<tr class="oddeven" height="24">';
 		print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$oldyear.'</a></td>';
 		print '<td align="right">0</td>';
@@ -334,7 +334,7 @@ foreach ($data as $val)
 		print '</tr>';
 	}
 
-	
+
 	print '<tr class="oddeven" height="24">';
 	print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$year.'</a></td>';
 	print '<td align="right">'.$val['nb'].'</td>';
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 7f2be7f5a3d..6257bcb08db 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1912,7 +1912,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 	elseif ($modulepart == 'orderstatssupplier' && !empty($conf->fournisseur->dir_output))
 	{
 		if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed=1;
-		$original_file=$conf->fournisseur->dir_output.'/commande/temp/'.$original_file;
+		$original_file=$conf->fournisseur->commande->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats factures
 	elseif ($modulepart == 'billstats' && !empty($conf->facture->dir_temp))
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 0b988e4d96b..3e3fe658155 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -1111,7 +1111,7 @@ if ($resql)
     	    // Other picto tool
     	    print '<td width="16" align="right" class="nobordernopadding hideonsmartphone">';
 			$filename=dol_sanitizeFileName($obj->ref);
-			$filedir=$conf->fournisseur->dir_output.'/commande' . '/' . dol_sanitizeFileName($obj->ref);
+			$filedir=$conf->fournisseur->dir_output.'/commande/' . dol_sanitizeFileName($obj->ref);
 			print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
 			print '</td></tr></table>';
 

From 3ec0e6f7efc965da8991a17541e20e1c28cf6b0d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Jun 2017 12:31:08 +0200
Subject: [PATCH 327/438] FIX #6885

---
 htdocs/core/ajax/ajaxdirpreview.php       | 16 ++-----
 htdocs/core/class/html.formfile.class.php | 56 +++++++++++------------
 2 files changed, 33 insertions(+), 39 deletions(-)

diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index bbc7647c802..f6077bf6261 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -162,21 +162,13 @@ if ($type == 'directory')
     // Auto area for suppliers invoices
     else if ($module == 'invoice') $upload_dir = $conf->facture->dir_output;
     // Auto area for suppliers invoices
-    else if ($module == 'invoice_supplier')
-    {
-        $relativepath='facture';
-        $upload_dir = $conf->fournisseur->dir_output.'/'.$relativepath;
-    }
+    else if ($module == 'invoice_supplier') $upload_dir = $conf->fournisseur->facture->dir_output;
     // Auto area for customers orders
     else if ($module == 'propal') $upload_dir = $conf->propal->dir_output;
     // Auto area for customers orders
     else if ($module == 'order') $upload_dir = $conf->commande->dir_output;
     // Auto area for suppliers orders
-    else if ($module == 'order_supplier')
-    {
-        $relativepath='commande';
-        $upload_dir = $conf->fournisseur->dir_output.'/'.$relativepath;
-    }
+    else if ($module == 'order_supplier') $upload_dir = $conf->fournisseur->commande->dir_output;
     // Auto area for suppliers invoices
     else if ($module == 'contract') $upload_dir = $conf->contrat->dir_output;
     // Auto area for products
@@ -197,10 +189,12 @@ if ($type == 'directory')
         $param.='&module='.$module;
         $textifempty=($section?$langs->trans("NoFileFound"):($showonrightsize=='featurenotyetavailable'?$langs->trans("FeatureNotYetAvailable"):$langs->trans("NoFileFound")));
 
+        if ($module == 'company') $excludefiles[]='^contact$';   // The subdir 'contact' contains files of contacts with no id of thirdparty.
+
         $filearray=dol_dir_list($upload_dir,"files",1,'', $excludefiles, $sortfield, $sorting,1);
         $formfile->list_of_autoecmfiles($upload_dir,$filearray,$module,$param,1,'',$user->rights->ecm->upload,1,$textifempty,$maxlengthname,$url);
     }
-    //Manual area
+    // Manual area
     else
     {
         $relativepath=$ecmdir->getRelativePath();
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 6e46efe3fdf..05c5982dc00 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -331,11 +331,11 @@ class FormFile
 							jQuery(\'#togglemassfilesarea\').text("('.dol_escape_js($langs->trans("Hide")).')");
 						}
 						return false;
-					});		
+					});
 				});
 				</script>';
-        }        
-        
+        }
+
         $titletoshow=$langs->trans("Documents");
         if (! empty($title)) $titletoshow=$title;
 
@@ -556,7 +556,7 @@ class FormFile
             if (empty($noform)) $out.= '<form action="'.$urlsource.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc').'" name="'.$forname.'" id="'.$forname.'_form" method="post">';
             $out.= '<input type="hidden" name="action" value="builddoc">';
             $out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-            
+
             $out.= load_fiche_titre($titletoshow, '', '');
             $out.= '<table class="liste formdoc noborder" summary="listofdocumentstable" width="100%">';
 
@@ -644,9 +644,9 @@ class FormFile
                 $sortfield = $sortorder = null;
                 $res = $link->fetchAll($link_list, $object->element, $object->id, $sortfield, $sortorder);
             }
-            
+
             $out.= '<!-- html.formfile::showdocuments -->'."\n";
-            
+
             // Show title of array if not already shown
             if ((! empty($file_list) || ! empty($link_list) || preg_match('/^massfilesarea/', $modulepart)) && ! $headershown)
             {
@@ -671,7 +671,7 @@ class FormFile
 
 					$documenturl = DOL_URL_ROOT.'/document.php';
 					if (isset($conf->global->DOL_URL_ROOT_DOCUMENT_PHP)) $documenturl=$conf->global->DOL_URL_ROOT_DOCUMENT_PHP;
-					
+
 					// Show file name with link to download
 					$out.= '<td class="nowrap">';
 					$out.= '<a data-ajax="false" href="'.$documenturl.'?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).($param?'&'.$param:'').'"';
@@ -737,11 +737,11 @@ class FormFile
             if (is_array($link_list))
             {
                 $colspan=2;
-                    
+
                 foreach($link_list as $file)
                 {
                     $var=!$var;
-                    
+
                     $out.= "<tr ".$bc[$var].">";
                     $out.='<td colspan="'.$colspan.'" class="maxwidhtonsmartphone">';
                     $out.='<a data-ajax="false" href="' . $link->url . '" target="_blank">';
@@ -756,7 +756,7 @@ class FormFile
                 }
                 $this->numoffiles++;
             }
-            
+
 		 	if (count($file_list) == 0 && count($link_list) == 0 && $headershown)
             {
 	        	$out.='<tr '.$bc[0].'><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
@@ -799,7 +799,7 @@ class FormFile
     	$this->infofiles=array('nboffiles'=>0,'extensions'=>array(),'files'=>array());
 
     	if (! empty($conf->dol_use_jmobile)) return '';
-    	 
+
 		$file_list=dol_dir_list($filedir, 'files', 0, preg_quote(basename($modulesubdir),'/').'[^\-]+', '\.meta$|\.png$');	// Get list of files starting with name of ref (but not followed by "-" to discard uploaded files)
 
     	// For ajax treatment
@@ -919,7 +919,7 @@ class FormFile
 			        if ($user->rights->service->creer && $object->type == Product::TYPE_SERVICE) $permtoeditline=1;
 			    }
 			}
-			if (empty($conf->global->MAIN_UPLOAD_DOC)) 
+			if (empty($conf->global->MAIN_UPLOAD_DOC))
 			{
 			    $permtoeditline=0;
 			    $permonobject=0;
@@ -928,7 +928,7 @@ class FormFile
 			// Show list of existing files
 			if (empty($useinecm)) print load_fiche_titre($title?$title:$langs->trans("AttachedFiles"));
 			if (empty($url)) $url=$_SERVER["PHP_SELF"];
-			
+
 			print '<!-- html.formfile::list_of_documents -->'."\n";
 			if (GETPOST('action') == 'editfile' && $permtoeditline)
 			{
@@ -938,7 +938,7 @@ class FormFile
 			    print '<input type="hidden" name="modulepart" value="'.$modulepart.'">';
 			}
 			print '<table width="100%" class="'.($useinecm?'liste noborderbottom':'liste').'">'."\n";
-			
+
 			print '<tr class="liste_titre">';
 			print_liste_field_titre($langs->trans("Documents2"),$url,"name","",$param,'align="left"',$sortfield,$sortorder);
 			print_liste_field_titre($langs->trans("Size"),$url,"size","",$param,'align="right"',$sortfield,$sortorder);
@@ -971,13 +971,13 @@ class FormFile
 	                    $relativepath=preg_replace('/^.*\/produit\//','',$file['path']).'/';
 	                }
 					$var=!$var;
-					
+
 					$editline=0;
-					
+
 			        print '<!-- Line list_of_documents '.$key.' -->'."\n";
 					print '<tr '.$bc[$var].'>';
 					print '<td class="tdoverflow">';
-					
+
 					//print "XX".$file['name'];	//$file['name'] must be utf8
 					print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
 					if ($forcedownload) print '&attachment=1';
@@ -1007,7 +1007,7 @@ class FormFile
 					    print $file['name'];
 					    print '</a>';
 					}
-					
+
                     if (! $editline) print $this->showPreview($file,$modulepart,$filepath);
 
 					print "</td>\n";
@@ -1038,7 +1038,7 @@ class FormFile
     					// Delete or view link
     					// ($param must start with &)
     					print '<td class="valignmiddle right"><!-- action on files -->';
-    					if ($useinecm)     
+    					if ($useinecm)
     					{
     					    print '<a href="'.DOL_URL_ROOT.'/ecm/docfile.php?urlfile='.urlencode($file['name']).$param.'" class="editfilelink" rel="'.urlencode($file['name']).'">'.img_view('default', 0, 'class="paddingrightonly"').'</a>';
     					}
@@ -1046,10 +1046,10 @@ class FormFile
     					{
         					$newmodulepart=$modulepart;
         					if (in_array($modulepart, array('product','produit','service'))) $newmodulepart='produit|service';
-    						
-        					$disablecrop=1; 
+
+        					$disablecrop=1;
         					if (in_array($modulepart, array('product','produit','service','holiday','project'))) $disablecrop=0;
-        					
+
     					    if (! $disablecrop && image_format_supported($file['name']) > 0)
     						{
     							if ($permtoeditline)
@@ -1058,7 +1058,7 @@ class FormFile
        			               		print '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode($newmodulepart).'&id='.$object->id.'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension'])).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"),DOL_URL_ROOT.'/theme/common/transform-crop-and-resize','class="paddingrightonly"',1).'</a>';
     							}
     						}
-    						
+
     						if ($permtoeditline)
     						{
     						    print '<a href="'.(($useinecm && $useajax)?'#':$url.'?action=editfile&urlfile='.urlencode($filepath).$param).'" class="editfilelink" rel="'.$filepath.'">'.img_edit('default',0,'class="paddingrightonly"').'</a>';
@@ -1076,7 +1076,7 @@ class FormFile
     						if (! empty($conf->dol_use_jmobile)) $useajax=0;
     						if (empty($conf->use_javascript_ajax)) $useajax=0;
     						if (! empty($conf->global->MAIN_ECM_DISABLE_JS)) $useajax=0;
-    
+
     						print '<a href="'.(($useinecm && $useajax)?'#':$url.'?action=delete&urlfile='.urlencode($filepath).$param).'" class="deletefilelink" rel="'.$filepath.'">'.img_delete().'</a>';
     					}
 					    print "</td>";
@@ -1103,7 +1103,7 @@ class FormFile
 			{
 			    print '</form>';
 			}
-			    	
+
 			return $nboffiles;
 		}
 	}
@@ -1489,11 +1489,11 @@ class FormFile
 
         return $nboflinks;
     }
-    
-    
+
+
     /**
      * Show detail icon with link for preview
-     * 
+     *
      * @param   array     $file           File
      * @param   string    $modulepart     propal, facture, facture_fourn, ...
      * @param   string    $relativepath   Relative path of docs

From 4dda771079d04bb22eb5166ad2aff8042e237184 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Jun 2017 12:54:26 +0200
Subject: [PATCH 328/438] FIX #6973

---
 htdocs/admin/mails_templates.php | 404 +++++++++++++++++--------------
 1 file changed, 216 insertions(+), 188 deletions(-)

diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index cc35aed19be..123877f7f4e 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -50,6 +50,7 @@ $action=GETPOST('action','alpha')?GETPOST('action','alpha'):'view';
 $confirm=GETPOST('confirm','alpha');
 $id=GETPOST('id','int');
 $rowid=GETPOST('rowid','alpha');
+$search_label=GETPOST('search_label','alpha');
 
 $allowed=$user->admin;
 if (! $allowed) accessforbidden();
@@ -78,10 +79,6 @@ $hookmanager->initHooks(array('emailtemplates'));
 $tabname=array();
 $tabname[25]= MAIN_DB_PREFIX."c_email_templates";
 
-// Requests to extract data
-$tabsql=array();
-$tabsql[25]= "SELECT rowid   as rowid, label, type_template, private, position, topic, content_lines, content, active FROM ".MAIN_DB_PREFIX."c_email_templates WHERE entity IN (".getEntity('email_template').")";
-
 // Criteria to sort dictionaries
 $tabsqlsort=array();
 $tabsqlsort[25]="label ASC";
@@ -173,211 +170,223 @@ $id = 25;
  * Actions
  */
 
-if (GETPOST('button_removefilter') || GETPOST('button_removefilter.x') || GETPOST('button_removefilter_x'))
-{
-    //$search_country_id = '';
-}
+if (GETPOST('cancel')) { $action='list'; $massaction=''; }
+if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
 
-// Actions add or modify an entry into a dictionary
-if (GETPOST('actionadd') || GETPOST('actionmodify'))
-{
-    $listfield=explode(',', str_replace(' ', '',$tabfield[$id]));
-    $listfieldinsert=explode(',',$tabfieldinsert[$id]);
-    $listfieldmodify=explode(',',$tabfieldinsert[$id]);
-    $listfieldvalue=explode(',',$tabfieldvalue[$id]);
+$parameters=array();
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-    // Check that all fields are filled
-    $ok=1;
-    foreach ($listfield as $f => $value)
+if (empty($reshook))
+{
+    // Purge search criteria
+    if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") ||GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
     {
-        if ($value == 'content') continue;
-        if ($value == 'content_lines') continue;
-        if ($value == 'content') $value='content-'.$rowid;
-        if ($value == 'content_lines') $value='content_lines-'.$rowid;
-
-        if (! isset($_POST[$value]) || $_POST[$value]=='')
-        {
-            $ok=0;
-            $fieldnamekey=$listfield[$f];
-            // We take translate key of field
-            if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label'))  $fieldnamekey='Label';
-            if ($fieldnamekey == 'libelle_facture') $fieldnamekey = 'LabelOnDocuments';
-            if ($fieldnamekey == 'code') $fieldnamekey = 'Code';
-            if ($fieldnamekey == 'note') $fieldnamekey = 'Note';
-            if ($fieldnamekey == 'type') $fieldnamekey = 'Type';
-
-            setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
-        }
+        $search_label='';
+        $toselect='';
+        $search_array_options=array();
     }
 
-    // Si verif ok et action add, on ajoute la ligne
-    if ($ok && GETPOST('actionadd'))
+    // Actions add or modify an entry into a dictionary
+    if (GETPOST('actionadd') || GETPOST('actionmodify'))
     {
-        if ($tabrowid[$id])
+        $listfield=explode(',', str_replace(' ', '',$tabfield[$id]));
+        $listfieldinsert=explode(',',$tabfieldinsert[$id]);
+        $listfieldmodify=explode(',',$tabfieldinsert[$id]);
+        $listfieldvalue=explode(',',$tabfieldvalue[$id]);
+
+        // Check that all fields are filled
+        $ok=1;
+        foreach ($listfield as $f => $value)
         {
-            // Recupere id libre pour insertion
-            $newid=0;
-            $sql = "SELECT max(".$tabrowid[$id].") newid from ".$tabname[$id];
-            $result = $db->query($sql);
-            if ($result)
+            if ($value == 'content') continue;
+            if ($value == 'content_lines') continue;
+            if ($value == 'content') $value='content-'.$rowid;
+            if ($value == 'content_lines') $value='content_lines-'.$rowid;
+
+            if (! isset($_POST[$value]) || $_POST[$value]=='')
             {
-                $obj = $db->fetch_object($result);
-                $newid=($obj->newid + 1);
+                $ok=0;
+                $fieldnamekey=$listfield[$f];
+                // We take translate key of field
+                if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label'))  $fieldnamekey='Label';
+                if ($fieldnamekey == 'libelle_facture') $fieldnamekey = 'LabelOnDocuments';
+                if ($fieldnamekey == 'code') $fieldnamekey = 'Code';
+                if ($fieldnamekey == 'note') $fieldnamekey = 'Note';
+                if ($fieldnamekey == 'type') $fieldnamekey = 'Type';
 
-            } else {
-                dol_print_error($db);
+                setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
             }
         }
 
-        // Add new entry
-        $sql = "INSERT INTO ".$tabname[$id]." (";
-        // List of fields
-        if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldinsert))
-        	$sql.= $tabrowid[$id].",";
-        $sql.= $tabfieldinsert[$id];
-        $sql.=",active)";
-        $sql.= " VALUES(";
+        // Si verif ok et action add, on ajoute la ligne
+        if ($ok && GETPOST('actionadd'))
+        {
+            if ($tabrowid[$id])
+            {
+                // Recupere id libre pour insertion
+                $newid=0;
+                $sql = "SELECT max(".$tabrowid[$id].") newid from ".$tabname[$id];
+                $result = $db->query($sql);
+                if ($result)
+                {
+                    $obj = $db->fetch_object($result);
+                    $newid=($obj->newid + 1);
 
-        // List of values
-        if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldinsert))
-        	$sql.= $newid.",";
-        $i=0;
-        foreach ($listfieldinsert as $f => $value)
-        {
-            //var_dump($i.' - '.$listfieldvalue[$i].' - '.$_POST[$listfieldvalue[$i]].' - '.$value);
-            if ($value == 'entity') {
-            	$_POST[$listfieldvalue[$i]] = $conf->entity;
+                } else {
+                    dol_print_error($db);
+                }
             }
-            if ($i) $sql.=",";
-            if ($value == 'private' && ! is_numeric($_POST[$listfieldvalue[$i]])) $_POST[$listfieldvalue[$i]]='0';
-            if ($value == 'position' && ! is_numeric($_POST[$listfieldvalue[$i]])) $_POST[$listfieldvalue[$i]]='1';
-            if ($_POST[$listfieldvalue[$i]] == '') $sql.="null";  // For vat, we want/accept code = ''
-            else $sql.="'".$db->escape($_POST[$listfieldvalue[$i]])."'";
-            $i++;
-        }
-        $sql.=",1)";
 
-        dol_syslog("actionadd", LOG_DEBUG);
-        $result = $db->query($sql);
-        if ($result)	// Add is ok
-        {
-            setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
-        	$_POST=array('id'=>$id);	// Clean $_POST array, we keep only
-        }
-        else
-        {
-            if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-                setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
+            // Add new entry
+            $sql = "INSERT INTO ".$tabname[$id]." (";
+            // List of fields
+            if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldinsert))
+            	$sql.= $tabrowid[$id].",";
+            $sql.= $tabfieldinsert[$id];
+            $sql.=",active)";
+            $sql.= " VALUES(";
+
+            // List of values
+            if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldinsert))
+            	$sql.= $newid.",";
+            $i=0;
+            foreach ($listfieldinsert as $f => $value)
+            {
+                //var_dump($i.' - '.$listfieldvalue[$i].' - '.$_POST[$listfieldvalue[$i]].' - '.$value);
+                if ($value == 'entity') {
+                	$_POST[$listfieldvalue[$i]] = $conf->entity;
+                }
+                if ($i) $sql.=",";
+                if ($value == 'private' && ! is_numeric($_POST[$listfieldvalue[$i]])) $_POST[$listfieldvalue[$i]]='0';
+                if ($value == 'position' && ! is_numeric($_POST[$listfieldvalue[$i]])) $_POST[$listfieldvalue[$i]]='1';
+                if ($_POST[$listfieldvalue[$i]] == '') $sql.="null";  // For vat, we want/accept code = ''
+                else $sql.="'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+                $i++;
             }
-            else {
-                dol_print_error($db);
+            $sql.=",1)";
+
+            dol_syslog("actionadd", LOG_DEBUG);
+            $result = $db->query($sql);
+            if ($result)	// Add is ok
+            {
+                setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
+            	$_POST=array('id'=>$id);	// Clean $_POST array, we keep only
+            }
+            else
+            {
+                if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+                    setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
+                }
+                else {
+                    dol_print_error($db);
+                }
+            }
+        }
+
+        // Si verif ok et action modify, on modifie la ligne
+        if ($ok && GETPOST('actionmodify'))
+        {
+            if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
+            else { $rowidcol="rowid"; }
+
+            // Modify entry
+            $sql = "UPDATE ".$tabname[$id]." SET ";
+            // Modifie valeur des champs
+            if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldmodify))
+            {
+                $sql.= $tabrowid[$id]."=";
+                $sql.= "'".$db->escape($rowid)."', ";
+            }
+            $i = 0;
+            foreach ($listfieldmodify as $field)
+            {
+                if ($field == 'content') $_POST['content']=$_POST['content-'.$rowid];
+                if ($field == 'content_lines') $_POST['content_lines']=$_POST['content_lines-'.$rowid];
+                if ($field == 'entity') {
+                	$_POST[$listfieldvalue[$i]] = $conf->entity;
+                }
+                if ($i) $sql.=",";
+                $sql.= $field."=";
+                if ($_POST[$listfieldvalue[$i]] == '') $sql.="null";  // For vat, we want/accept code = ''
+                else $sql.="'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+                $i++;
+            }
+            $sql.= " WHERE ".$rowidcol." = '".$rowid."'";
+
+            dol_syslog("actionmodify", LOG_DEBUG);
+            //print $sql;
+            $resql = $db->query($sql);
+            if (! $resql)
+            {
+                setEventMessages($db->error(), null, 'errors');
             }
         }
     }
 
-    // Si verif ok et action modify, on modifie la ligne
-    if ($ok && GETPOST('actionmodify'))
+    if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
     {
         if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
         else { $rowidcol="rowid"; }
 
-        // Modify entry
-        $sql = "UPDATE ".$tabname[$id]." SET ";
-        // Modifie valeur des champs
-        if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldmodify))
-        {
-            $sql.= $tabrowid[$id]."=";
-            $sql.= "'".$db->escape($rowid)."', ";
-        }
-        $i = 0;
-        foreach ($listfieldmodify as $field)
-        {
-            if ($field == 'content') $_POST['content']=$_POST['content-'.$rowid];
-            if ($field == 'content_lines') $_POST['content_lines']=$_POST['content_lines-'.$rowid];
-            if ($field == 'entity') {
-            	$_POST[$listfieldvalue[$i]] = $conf->entity;
-            }
-            if ($i) $sql.=",";
-            $sql.= $field."=";
-            if ($_POST[$listfieldvalue[$i]] == '') $sql.="null";  // For vat, we want/accept code = ''
-            else $sql.="'".$db->escape($_POST[$listfieldvalue[$i]])."'";
-            $i++;
-        }
-        $sql.= " WHERE ".$rowidcol." = '".$rowid."'";
+        $sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol."='".$rowid."'";
 
-        dol_syslog("actionmodify", LOG_DEBUG);
-        //print $sql;
-        $resql = $db->query($sql);
-        if (! $resql)
+        dol_syslog("delete", LOG_DEBUG);
+        $result = $db->query($sql);
+        if (! $result)
         {
-            setEventMessages($db->error(), null, 'errors');
+            if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
+            {
+                setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
+            }
+            else
+            {
+                dol_print_error($db);
+            }
         }
     }
-}
 
-if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
-{
-    if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
-    else { $rowidcol="rowid"; }
-
-    $sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol."='".$rowid."'";
-
-    dol_syslog("delete", LOG_DEBUG);
-    $result = $db->query($sql);
-    if (! $result)
+    // activate
+    if ($action == $acts[0])
     {
-        if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
-        {
-            setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
+        if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
+        else { $rowidcol="rowid"; }
+
+        if ($rowid) {
+            $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol."='".$rowid."'";
         }
-        else
+        elseif ($code) {
+            $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code='".$code."'";
+        }
+
+        $result = $db->query($sql);
+        if (!$result)
+        {
+            dol_print_error($db);
+        }
+    }
+
+    // disable
+    if ($action == $acts[1])
+    {
+        if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
+        else { $rowidcol="rowid"; }
+
+        if ($rowid) {
+            $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol."='".$rowid."'";
+        }
+        elseif ($code) {
+            $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code='".$code."'";
+        }
+
+        $result = $db->query($sql);
+        if (!$result)
         {
             dol_print_error($db);
         }
     }
 }
 
-// activate
-if ($action == $acts[0])
-{
-    if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
-    else { $rowidcol="rowid"; }
-
-    if ($rowid) {
-        $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol."='".$rowid."'";
-    }
-    elseif ($code) {
-        $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code='".$code."'";
-    }
-
-    $result = $db->query($sql);
-    if (!$result)
-    {
-        dol_print_error($db);
-    }
-}
-
-// disable
-if ($action == $acts[1])
-{
-    if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
-    else { $rowidcol="rowid"; }
-
-    if ($rowid) {
-        $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol."='".$rowid."'";
-    }
-    elseif ($code) {
-        $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code='".$code."'";
-    }
-
-    $result = $db->query($sql);
-    if (!$result)
-    {
-        dol_print_error($db);
-    }
-}
-
-
 
 /*
  * View
@@ -416,8 +425,11 @@ if ($action == 'delete')
 }
 //var_dump($elementList);
 
-// Complete requete recherche valeurs avec critere de tri
-$sql=$tabsql[$id];
+
+$sql="SELECT rowid as rowid, label, type_template, private, position, topic, content_lines, content, active";
+$sql.=" FROM ".MAIN_DB_PREFIX."c_email_templates";
+$sql.=" WHERE entity IN (".getEntity('email_template').")";
+if ($search_label) $sql.=natural_search('label', $search_label);
 
 if ($search_country_id > 0)
 {
@@ -572,9 +584,19 @@ if ($action != 'edit')
 
 
     $colspan=count($fieldlist)+1;
-    print '<tr><td colspan="'.$colspan.'">&nbsp;</td></tr>';	// Keep &nbsp; to have a line with enough height
+    //print '<tr><td colspan="'.$colspan.'">&nbsp;</td></tr>';	// Keep &nbsp; to have a line with enough height
 }
 
+print '</table>';
+print '</form>';
+
+print '<br>';
+
+print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from','alpha')).'">';
+
+print '<table class="noborder" width="100%">';
 
 // List of available record in database
 dol_syslog("htdocs/admin/dict", LOG_DEBUG);
@@ -599,8 +621,26 @@ if ($resql)
         print '</td></tr>';
     }
 
+
+    // Title line with search boxes
+    print '<tr class="liste_titre">';
+    $filterfound=0;
+    foreach ($fieldlist as $field => $value)
+    {
+        if ($value == 'label') print '<td class="liste_titre"><input type="text" name="search_label" value="'.dol_escape_htmltag($search_label).'"></td>';
+        elseif (! in_array($value, array('content', 'content_lines'))) print '<td class="liste_titre"></td>';
+    }
+    if (empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) print '<td class="liste_titre"></td>';
+    print '<td class="liste_titre"></td>';
+    // Action column
+    print '<td class="liste_titre" align="right">';
+    $searchpicto=$form->showFilterButtons();
+    print $searchpicto;
+    print '</td>';
+    print '</tr>';
+
     // Title of lines
-    print '<tr class="liste_titre'.($action != 'edit' ? ' liste_titre_add' : '').'">';
+    print '<tr class="liste_titre">';
     foreach ($fieldlist as $field => $value)
     {
         // Determine le nom du champ par rapport aux noms possibles
@@ -642,18 +682,6 @@ if ($resql)
     print getTitleFieldOfList('');
     print '</tr>';
 
-    // Title line with search boxes
-    print '<tr class="liste_titre">';
-    $filterfound=0;
-    foreach ($fieldlist as $field => $value)
-    {
-        if (! in_array($field, array('content', 'content_lines'))) print '<td class="liste_titre"></td>';
-    }
-    if (empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) print '<td class="liste_titre"></td>';
-    print '<td class="liste_titre"></td>';
-    print '<td class="liste_titre"></td>';
-    print '</tr>';
-
     if ($num)
     {
         // Lines with values

From efe5d79a862f72b3da7aecbf07e508d7e6d23b65 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Jun 2017 12:58:43 +0200
Subject: [PATCH 329/438] Work on #6958. Only one type of invoice supported for
 supplier invoices

---
 .../mod_facture_fournisseur_tulip.php         | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
index b7a3801a9cd..2e155c04df8 100644
--- a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
+++ b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
@@ -72,27 +72,32 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
 		$tooltip.=$langs->trans("GenericMaskCodes5");
 
 		// Parametrage du prefix
-		$texte.= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceStandard").'):</td>';
+		$texte.= '<tr><td>'.$langs->trans("Mask");
+		//$texte.= ' ('.$langs->trans("InvoiceStandard").')';
+		$texte.= ':</td>';
 		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskinvoice" value="'.$conf->global->SUPPLIER_INVOICE_TULIP_MASK.'">',$tooltip,1,1).'</td>';
 
 		$texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
 		$texte.= '</tr>';
 
-		// Parametrage du prefix des replacement
-		$texte.= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceReplacement").'):</td>';
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskreplacement" value="'.$conf->global->SUPPLIER_REPLACEMENT_TULIP_MASK.'">',$tooltip,1,1).'</td>';
-		$texte.= '</tr>';
+		if ($conf->global->MAIN_FEATURE_LEVEL >= 2)
+		{
+    		// Parametrage du prefix des replacement
+    		$texte.= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceReplacement").'):</td>';
+    		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskreplacement" value="'.$conf->global->SUPPLIER_REPLACEMENT_TULIP_MASK.'">',$tooltip,1,1).'</td>';
+    		$texte.= '</tr>';
 
-		// Parametrage du prefix des avoirs
-		$texte.= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceAvoir").'):</td>';
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskcredit" value="'.$conf->global->SUPPLIER_CREDIT_TULIP_MASK.'">',$tooltip,1,1).'</td>';
-		$texte.= '</tr>';
+    		// Parametrage du prefix des avoirs
+    		$texte.= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceAvoir").'):</td>';
+    		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskcredit" value="'.$conf->global->SUPPLIER_CREDIT_TULIP_MASK.'">',$tooltip,1,1).'</td>';
+    		$texte.= '</tr>';
 
-		// Parametrage du prefix des acomptes
-		$texte.= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceDeposit").'):</td>';
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskdeposit" value="'.$conf->global->SUPPLIER_DEPOSIT_TULIP_MASK.'">',$tooltip,1,1).'</td>';
-		$texte.= '</tr>';
+    		// Parametrage du prefix des acomptes
+    		$texte.= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceDeposit").'):</td>';
+    		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskdeposit" value="'.$conf->global->SUPPLIER_DEPOSIT_TULIP_MASK.'">',$tooltip,1,1).'</td>';
+    		$texte.= '</tr>';
+		}
 
 		$texte.= '</table>';
 		$texte.= '</form>';
@@ -137,7 +142,7 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
 
 		// Get Mask value
 		$mask = '';
-		if (is_object($object) && $object->type == 1) 
+		if (is_object($object) && $object->type == 1)
 		{
 			$mask=$conf->global->SUPPLIER_REPLACEMENT_TULIP_MASK;
 			if (! $mask)

From f1701469e0a16d80951de4801a4637918ad7493d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Jun 2017 13:28:34 +0200
Subject: [PATCH 330/438] NEW data files are now also parsed by phpunit for sql
 syntax

---
 htdocs/core/db/pgsql.class.php                      |  3 ++-
 htdocs/install/mysql/data/llx_accounting.sql        |  2 +-
 htdocs/install/mysql/data/llx_const.sql             |  8 ++++----
 htdocs/install/mysql/migration/3.2.0-3.3.0.sql      |  2 +-
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql      |  2 +-
 .../mysql/tables/llx_blockedlog_authority.sql       |  2 +-
 htdocs/install/pgsql/functions/functions.sql        |  3 ++-
 test/phpunit/CodingSqlTest.php                      | 13 +++++++++++--
 8 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index 89f2a66bdea..2b8e90d0780 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -169,7 +169,7 @@ class DoliDBPgsql extends DoliDB
 			$line = preg_replace('/ SEPARATOR/i', ',', $line);
 			$line = preg_replace('/STRING_AGG\(([^,\)]+)\)/i', 'STRING_AGG(\\1, \',\')', $line);
 			//print $line."\n";
-					
+
 		    if ($type == 'auto')
 		    {
               if (preg_match('/ALTER TABLE/i',$line)) $type='dml';
@@ -210,6 +210,7 @@ class DoliDBPgsql extends DoliDB
     			// tinytext/mediumtext -> text
     			$line=preg_replace('/tinytext/i','text',$line);
     			$line=preg_replace('/mediumtext/i','text',$line);
+    			$line=preg_replace('/longtext/i','text',$line);
 
     			$line=preg_replace('/text\([0-9]+\)/i','text',$line);
 
diff --git a/htdocs/install/mysql/data/llx_accounting.sql b/htdocs/install/mysql/data/llx_accounting.sql
index ea1fe7a7dd7..6448646bda0 100644
--- a/htdocs/install/mysql/data/llx_accounting.sql
+++ b/htdocs/install/mysql/data/llx_accounting.sql
@@ -360,7 +360,7 @@ INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (305,'PCG99-BASE','FINAN', 'XXXXXX',  '511', '304', 'Valeurs à l''encaissement', 1);
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (306,'PCG99-BASE','FINAN', 'BANK',    '512', '304', 'Banques', 1);
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (307,'PCG99-BASE','FINAN', 'XXXXXX',  '514', '304', 'Chèques postaux', 1);
-INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (308,'PCG99-BASE','FINAN', 'XXXXXX',  '515', '304', '"Caisses" du Trésor et des établissements publics', 1);
+INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (308,'PCG99-BASE','FINAN', 'XXXXXX',  '515', '304', 'Caisses du Trésor et des établissements publics', 1);
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (309,'PCG99-BASE','FINAN', 'XXXXXX',  '516', '304', 'Sociétés de bourse', 1);
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (310,'PCG99-BASE','FINAN', 'XXXXXX',  '517', '304', 'Autres organismes financiers', 1);
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (311,'PCG99-BASE','FINAN', 'XXXXXX',  '518', '304', 'Intérêts courus', 1);
diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql
index bf76d378789..ee6f952e6ae 100644
--- a/htdocs/install/mysql/data/llx_const.sql
+++ b/htdocs/install/mysql/data/llx_const.sql
@@ -91,7 +91,7 @@ insert into llx_const (name, value, type, note, visible) values ('MAILING_EMAIL_
 --
 -- ODT Path
 ---
-insert into `llx_const` (`name`, `entity`, `value`, `type`, `visible`) VALUES ('PRODUCT_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/products', 'chaine', 0);
-insert into `llx_const` (`name`, `entity`, `value`, `type`, `visible`) VALUES ('CONTRACT_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/contracts', 'chaine', 0);
-insert into `llx_const` (`name`, `entity`, `value`, `type`, `visible`) VALUES ('USERGROUP_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/usergroups', 'chaine', 0);
-insert into `llx_const` (`name`, `entity`, `value`, `type`, `visible`) VALUES ('USER_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/users', 'chaine', 0);
+insert into llx_const (name, entity, value, type, visible) VALUES ('PRODUCT_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/products', 'chaine', 0);
+insert into llx_const (name, entity, value, type, visible) VALUES ('CONTRACT_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/contracts', 'chaine', 0);
+insert into llx_const (name, entity, value, type, visible) VALUES ('USERGROUP_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/usergroups', 'chaine', 0);
+insert into llx_const (name, entity, value, type, visible) VALUES ('USER_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/users', 'chaine', 0);
diff --git a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql
index 2253eb68787..91c155d3d84 100644
--- a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql
+++ b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql
@@ -803,7 +803,7 @@ ALTER TABLE llx_user ADD COLUMN job varchar(128) AFTER firstname;
 
 
 -- Use entity 0 for all entities
-INSERT INTO llx_const(name, value, visible, entity) SELECT __ENCRYPT('SYSLOG_HANDLERS')__, __ENCRYPT('[\'mod_syslog_file\']')__, 0, 0 FROM llx_const WHERE __DECRYPT('name')__ = 'SYSLOG_FILE_ON' AND __DECRYPT('value')__ = '1';
+INSERT INTO llx_const(name, value, visible, entity) SELECT __ENCRYPT('SYSLOG_HANDLERS')__, __ENCRYPT('["mod_syslog_file"]')__, 0, 0 FROM llx_const WHERE __DECRYPT('name')__ = 'SYSLOG_FILE_ON' AND __DECRYPT('value')__ = '1';
 
 
 -- New Imports
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 3acf312bae1..637648be3ba 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -493,7 +493,7 @@ CREATE TABLE llx_blockedlog_authority
 	rowid integer AUTO_INCREMENT PRIMARY KEY, 
 	blockchain longtext NOT NULL,
 	signature varchar(100) NOT NULL,
-	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+	tms timestamp
 ) ENGINE=innodb;
 
 ALTER TABLE llx_blockedlog_authority ADD INDEX signature (signature);
diff --git a/htdocs/install/mysql/tables/llx_blockedlog_authority.sql b/htdocs/install/mysql/tables/llx_blockedlog_authority.sql
index eb491f93af4..9e7dae8f23c 100644
--- a/htdocs/install/mysql/tables/llx_blockedlog_authority.sql
+++ b/htdocs/install/mysql/tables/llx_blockedlog_authority.sql
@@ -3,5 +3,5 @@ CREATE TABLE llx_blockedlog_authority
 	rowid integer AUTO_INCREMENT PRIMARY KEY, 
 	blockchain longtext NOT NULL,
 	signature varchar(100) NOT NULL,
-	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+	tms timestamp
 ) ENGINE=innodb;
diff --git a/htdocs/install/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql
index 441b20c66ad..1b2d184de0f 100644
--- a/htdocs/install/pgsql/functions/functions.sql
+++ b/htdocs/install/pgsql/functions/functions.sql
@@ -24,9 +24,10 @@ CREATE OR REPLACE FUNCTION UNIX_TIMESTAMP(TIMESTAMP WITHOUT TIME ZONE) RETURNS B
 
 CREATE OR REPLACE FUNCTION UNIX_TIMESTAMP(TIMESTAMP WITH TIME ZONE) RETURNS BIGINT LANGUAGE SQL IMMUTABLE STRICT AS 'SELECT EXTRACT(EPOCH FROM $1)::bigint;';
 
- 
+DROP FUNCTION date_format(timestamp without time zone,text);
 CREATE OR REPLACE FUNCTION date_format(timestamp without time zone, text) RETURNS text AS $$ DECLARE i int := 1; temp text := ''; c text; n text; res text; BEGIN WHILE i <= pg_catalog.length($2) LOOP c := SUBSTRING ($2 FROM i FOR 1); IF c = '%' AND i != pg_catalog.length($2) THEN n := SUBSTRING ($2 FROM (i + 1) FOR 1); SELECT INTO res CASE WHEN n = 'a' THEN pg_catalog.to_char($1, 'Dy') WHEN n = 'b' THEN pg_catalog.to_char($1, 'Mon') WHEN n = 'c' THEN pg_catalog.to_char($1, 'FMMM') WHEN n = 'D' THEN pg_catalog.to_char($1, 'FMDDth') WHEN n = 'd' THEN pg_catalog.to_char($1, 'DD') WHEN n = 'e' THEN pg_catalog.to_char($1, 'FMDD') WHEN n = 'f' THEN pg_catalog.to_char($1, 'US') WHEN n = 'H' THEN pg_catalog.to_char($1, 'HH24') WHEN n = 'h' THEN pg_catalog.to_char($1, 'HH12') WHEN n = 'I' THEN pg_catalog.to_char($1, 'HH12') WHEN n = 'i' THEN pg_catalog.to_char($1, 'MI') WHEN n = 'j' THEN pg_catalog.to_char($1, 'DDD') WHEN n = 'k' THEN pg_catalog.to_char($1, 'FMHH24') WHEN n = 'l' THEN pg_catalog.to_char($1, 'FMHH12') WHEN n = 'M' THEN pg_catalog.to_char($1, 'FMMonth') WHEN n = 'm' THEN pg_catalog.to_char($1, 'MM') WHEN n = 'p' THEN pg_catalog.to_char($1, 'AM') WHEN n = 'r' THEN pg_catalog.to_char($1, 'HH12:MI:SS AM') WHEN n = 'S' THEN pg_catalog.to_char($1, 'SS') WHEN n = 's' THEN pg_catalog.to_char($1, 'SS') WHEN n = 'T' THEN pg_catalog.to_char($1, 'HH24:MI:SS') WHEN n = 'U' THEN pg_catalog.to_char($1, '?') WHEN n = 'u' THEN pg_catalog.to_char($1, '?') WHEN n = 'V' THEN pg_catalog.to_char($1, '?') WHEN n = 'v' THEN pg_catalog.to_char($1, '?') WHEN n = 'W' THEN pg_catalog.to_char($1, 'FMDay') WHEN n = 'w' THEN EXTRACT(DOW FROM $1)::text WHEN n = 'X' THEN pg_catalog.to_char($1, '?') WHEN n = 'x' THEN pg_catalog.to_char($1, '?') WHEN n = 'Y' THEN pg_catalog.to_char($1, 'YYYY') WHEN n = 'y' THEN pg_catalog.to_char($1, 'YY') WHEN n = '%' THEN pg_catalog.to_char($1, '%') ELSE NULL END; temp := temp operator(pg_catalog.||) res; i := i + 2; ELSE temp = temp operator(pg_catalog.||) c; i := i + 1; END IF; END LOOP; RETURN temp; END $$ IMMUTABLE STRICT LANGUAGE plpgsql;
 
+DROP FUNCTION date_format(timestamp with time zone,text);
 CREATE OR REPLACE FUNCTION date_format(timestamp with time zone, text) RETURNS text AS $$ DECLARE i int := 1; temp text := ''; c text; n text; res text; BEGIN WHILE i <= pg_catalog.length($2) LOOP c := SUBSTRING ($2 FROM i FOR 1); IF c = '%' AND i != pg_catalog.length($2) THEN n := SUBSTRING ($2 FROM (i + 1) FOR 1); SELECT INTO res CASE WHEN n = 'a' THEN pg_catalog.to_char($1, 'Dy') WHEN n = 'b' THEN pg_catalog.to_char($1, 'Mon') WHEN n = 'c' THEN pg_catalog.to_char($1, 'FMMM') WHEN n = 'D' THEN pg_catalog.to_char($1, 'FMDDth') WHEN n = 'd' THEN pg_catalog.to_char($1, 'DD') WHEN n = 'e' THEN pg_catalog.to_char($1, 'FMDD') WHEN n = 'f' THEN pg_catalog.to_char($1, 'US') WHEN n = 'H' THEN pg_catalog.to_char($1, 'HH24') WHEN n = 'h' THEN pg_catalog.to_char($1, 'HH12') WHEN n = 'I' THEN pg_catalog.to_char($1, 'HH12') WHEN n = 'i' THEN pg_catalog.to_char($1, 'MI') WHEN n = 'j' THEN pg_catalog.to_char($1, 'DDD') WHEN n = 'k' THEN pg_catalog.to_char($1, 'FMHH24') WHEN n = 'l' THEN pg_catalog.to_char($1, 'FMHH12') WHEN n = 'M' THEN pg_catalog.to_char($1, 'FMMonth') WHEN n = 'm' THEN pg_catalog.to_char($1, 'MM') WHEN n = 'p' THEN pg_catalog.to_char($1, 'AM') WHEN n = 'r' THEN pg_catalog.to_char($1, 'HH12:MI:SS AM') WHEN n = 'S' THEN pg_catalog.to_char($1, 'SS') WHEN n = 's' THEN pg_catalog.to_char($1, 'SS') WHEN n = 'T' THEN pg_catalog.to_char($1, 'HH24:MI:SS') WHEN n = 'U' THEN pg_catalog.to_char($1, '?') WHEN n = 'u' THEN pg_catalog.to_char($1, '?') WHEN n = 'V' THEN pg_catalog.to_char($1, '?') WHEN n = 'v' THEN pg_catalog.to_char($1, '?') WHEN n = 'W' THEN pg_catalog.to_char($1, 'FMDay') WHEN n = 'w' THEN EXTRACT(DOW FROM $1)::text WHEN n = 'X' THEN pg_catalog.to_char($1, '?') WHEN n = 'x' THEN pg_catalog.to_char($1, '?') WHEN n = 'Y' THEN pg_catalog.to_char($1, 'YYYY') WHEN n = 'y' THEN pg_catalog.to_char($1, 'YY') WHEN n = '%' THEN pg_catalog.to_char($1, '%') ELSE NULL END; temp := temp operator(pg_catalog.||) res; i := i + 2; ELSE temp = temp operator(pg_catalog.||) c; i := i + 1; END IF; END LOOP; RETURN temp; END $$ IMMUTABLE STRICT LANGUAGE plpgsql;
 
 
diff --git a/test/phpunit/CodingSqlTest.php b/test/phpunit/CodingSqlTest.php
index 348043d4a4e..d158b71fc2e 100644
--- a/test/phpunit/CodingSqlTest.php
+++ b/test/phpunit/CodingSqlTest.php
@@ -141,7 +141,7 @@ class CodingSqlTest extends PHPUnit_Framework_TestCase
         $langs=$this->savlangs;
         $db=$this->savdb;
 
-        $listofsqldir = array(DOL_DOCUMENT_ROOT.'/install/mysql/tables', DOL_DOCUMENT_ROOT.'/install/mysql/migration');
+        $listofsqldir = array(DOL_DOCUMENT_ROOT.'/install/mysql/data', DOL_DOCUMENT_ROOT.'/install/mysql/tables', DOL_DOCUMENT_ROOT.'/install/mysql/migration');
 
         foreach ($listofsqldir as $dir)
         {
@@ -161,8 +161,12 @@ class CodingSqlTest extends PHPUnit_Framework_TestCase
                 $this->assertTrue($result===false, 'Found back quote into '.$file.'. Bad.');
 
                 $result=strpos($filecontent,'"');
+                if ($result)
+                {
+                    $result=! strpos($filecontent,'["');
+                }
                 print __METHOD__." Result for checking we don't have double quote = ".$result."\n";
-                $this->assertTrue($result===false, 'Found double quote into '.$file.'. Bad.');
+                $this->assertTrue($result===false, 'Found double quote that is not [" (used for json content) into '.$file.'. Bad.');
 
                 $result=strpos($filecontent,'int(');
                 print __METHOD__." Result for checking we don't have 'int(' instead of 'integer' = ".$result."\n";
@@ -176,6 +180,11 @@ class CodingSqlTest extends PHPUnit_Framework_TestCase
                 {
                     // Test for migration files only
 
+                }
+                elseif ($dir == DOL_DOCUMENT_ROOT.'/install/mysql/data')
+                {
+                    // Test for data files only
+
                 }
                 else
                 {

From 302e086f991c60dad5abd3a7b3ea214dbf3b5106 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Jun 2017 13:33:26 +0200
Subject: [PATCH 331/438] Fix pgsql compatibility

---
 .../class/supplier_proposal.class.php         | 86 +++++++++----------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index e3f873476ba..b14e4a40ff9 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -50,7 +50,7 @@ class SupplierProposal extends CommonObject
     public $fk_element='fk_supplier_proposal';
     protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
     public $picto='propal';
-    
+
     /**
      * {@inheritdoc}
      */
@@ -140,7 +140,7 @@ class SupplierProposal extends CommonObject
 	var $multicurrency_total_ht;
 	var $multicurrency_total_tva;
 	var $multicurrency_total_ttc;
-	
+
 	/**
 	 * Draft status
 	 */
@@ -160,10 +160,10 @@ class SupplierProposal extends CommonObject
 	/**
 	 * Billed or closed/processed quote
 	 */
-	const STATUS_CLOSE = 4;	
-	
-	
-	
+	const STATUS_CLOSE = 4;
+
+
+
     /**
      *	Constructor
      *
@@ -407,7 +407,7 @@ class SupplierProposal extends CommonObject
 
             $localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty,$mysoc);
             $txtva = preg_replace('/\s*\(.*\)/','',$txtva);  // Remove code into vatrate.
-            
+
             $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx);
             $total_ht  = $tabprice[0];
             $total_tva = $tabprice[1];
@@ -419,7 +419,7 @@ class SupplierProposal extends CommonObject
 			$multicurrency_total_ht  = $tabprice[16];
             $multicurrency_total_tva = $tabprice[17];
             $multicurrency_total_ttc = $tabprice[18];
-			
+
             // Rang to use
             $rangtouse = $rang;
             if ($rangtouse == -1)
@@ -487,7 +487,7 @@ class SupplierProposal extends CommonObject
 			$this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
             $this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
             $this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
-			
+
             // Mise en option de la ligne
             if (empty($qty) && empty($special_code)) $this->line->special_code=3;
 
@@ -583,7 +583,7 @@ class SupplierProposal extends CommonObject
 
             $localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty,$mysoc);
             $txtva = preg_replace('/\s*\(.*\)/','',$txtva);  // Remove code into vatrate.
-            
+
             $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx);
             $total_ht  = $tabprice[0];
             $total_tva = $tabprice[1];
@@ -595,7 +595,7 @@ class SupplierProposal extends CommonObject
 			$multicurrency_total_ht  = $tabprice[16];
             $multicurrency_total_tva = $tabprice[17];
             $multicurrency_total_ttc = $tabprice[18];
-			
+
             // Anciens indicateurs: $price, $remise (a ne plus utiliser)
             $price = $pu;
             if ($remise_percent > 0)
@@ -662,7 +662,7 @@ class SupplierProposal extends CommonObject
             if (is_array($array_option) && count($array_option)>0) {
             	$this->line->array_options=$array_option;
             }
-			
+
 			// Multicurrency
 			$this->line->multicurrency_subprice		= price2num($pu * $this->multicurrency_tx);
 			$this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
@@ -1180,7 +1180,7 @@ class SupplierProposal extends CommonObject
 				$this->multicurrency_total_ht 	= $obj->multicurrency_total_ht;
 				$this->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
 				$this->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
-				
+
                 if ($obj->fk_statut == 0)
                 {
                     $this->brouillon = 1;
@@ -1271,7 +1271,7 @@ class SupplierProposal extends CommonObject
 						$line->multicurrency_total_tva 	= $objp->multicurrency_total_tva;
 						$line->multicurrency_total_ttc 	= $objp->multicurrency_total_ttc;
 						$line->fk_unit					= $objp->fk_unit;
-						
+
                         $this->lines[$i]        = $line;
 
                         $i++;
@@ -1653,7 +1653,7 @@ class SupplierProposal extends CommonObject
             {
             	$trigger_name='SUPPLIER_PROPOSAL_CLASSIFY_BILLED';
             }
-            
+
             if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
             {
              	// Define output language
@@ -1704,7 +1704,7 @@ class SupplierProposal extends CommonObject
 		$productsupplier = new ProductFournisseur($this->db);
 
 		dol_syslog(get_class($this)."::updateOrCreatePriceFournisseur", LOG_DEBUG);
-		foreach ($this->lines as $product) 
+		foreach ($this->lines as $product)
 		{
 			if ($product->subprice <= 0) continue;
 
@@ -1721,7 +1721,7 @@ class SupplierProposal extends CommonObject
 				$this->createPriceFournisseur($product, $user);
 			}
 		}
-		
+
 		return 1;
 	}
 
@@ -2149,7 +2149,7 @@ class SupplierProposal extends CommonObject
 	        $response->label = $label;
 	        $response->url = DOL_URL_ROOT.'/supplier_proposal/list.php?viewstatut='.$statut;
 	        $response->img = img_object('',"propal");
-            
+
             // This assignment in condition is not a bug. It allows walking the results.
             while ($obj=$this->db->fetch_object($resql))
             {
@@ -2187,7 +2187,7 @@ class SupplierProposal extends CommonObject
         global $user,$langs,$conf;
 
         // Load array of products prodids
-        $num_prods = 0; 
+        $num_prods = 0;
         $prodids = array();
         $sql = "SELECT rowid";
         $sql.= " FROM ".MAIN_DB_PREFIX."product";
@@ -2250,7 +2250,7 @@ class SupplierProposal extends CommonObject
             	$prodid = mt_rand(1, $num_prods);
             	$line->fk_product=$prodids[$prodid];
             }
-            
+
             $this->lines[$xnbp]=$line;
 
             $this->total_ht       += $line->total_ht;
@@ -2375,10 +2375,10 @@ class SupplierProposal extends CommonObject
         global $langs, $conf, $user;
 
         if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
-        
+
         $url='';
         $result='';
-        
+
         $label='<u>'.$langs->trans("ShowSupplierProposal").'</u>';
         if (! empty($this->ref))
         $label.= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
@@ -2396,7 +2396,7 @@ class SupplierProposal extends CommonObject
         if ($option == 'document') {
             $url = DOL_URL_ROOT.'/supplier_proposal/document.php?id='.$this->id. $get_params;
         }
-        
+
         $linkclose='';
         if (empty($notooltip) && $user->rights->propal->lire)
         {
@@ -2408,7 +2408,7 @@ class SupplierProposal extends CommonObject
             $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
             $linkclose.=' class="classfortooltip"';
         }
-        
+
         $linkstart = '<a href="'.$url.'"';
         $linkstart.=$linkclose.'>';
         $linkend='</a>';
@@ -2432,14 +2432,14 @@ class SupplierProposal extends CommonObject
     function getLinesArray()
     {
         // For other object, here we call fetch_lines. But fetch_lines does not exists on supplier proposal
-        
+
         $sql = 'SELECT pt.rowid, pt.label as custom_label, pt.description, pt.fk_product, pt.fk_remise_except,';
         $sql.= ' pt.qty, pt.tva_tx, pt.remise_percent, pt.subprice, pt.info_bits,';
         $sql.= ' pt.total_ht, pt.total_tva, pt.total_ttc, pt.fk_product_fournisseur_price as fk_fournprice, pt.buy_price_ht as pa_ht, pt.special_code, pt.localtax1_tx, pt.localtax2_tx,';
         $sql.= ' pt.product_type, pt.rang, pt.fk_parent_line,';
         $sql.= ' p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid,';
-        $sql.= ' p.description as product_desc, pt.ref_fourn as ref_produit_fourn';
-		$sql.= ' ,pt.fk_multicurrency, pt.multicurrency_code, pt.multicurrency_subprice, pt.multicurrency_total_ht, pt.multicurrency_total_tva, pt.multicurrency_total_ttc, pt.fk_unit';
+        $sql.= ' p.description as product_desc, pt.ref_fourn as ref_produit_fourn,';
+		$sql.= ' pt.fk_multicurrency, pt.multicurrency_code, pt.multicurrency_subprice, pt.multicurrency_total_ht, pt.multicurrency_total_tva, pt.multicurrency_total_ttc, pt.fk_unit';
         $sql.= ' FROM '.MAIN_DB_PREFIX.'supplier_proposaldet as pt';
         $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pt.fk_product=p.rowid';
         $sql.= ' WHERE pt.fk_supplier_proposal = '.$this->id;
@@ -2486,7 +2486,7 @@ class SupplierProposal extends CommonObject
                 $this->lines[$i]->rang				= $obj->rang;
 
                 $this->lines[$i]->ref_fourn				= $obj->ref_produit_fourn;
-				
+
 				// Multicurrency
 				$this->lines[$i]->fk_multicurrency 			= $obj->fk_multicurrency;
 				$this->lines[$i]->multicurrency_code 		= $obj->multicurrency_code;
@@ -2541,7 +2541,7 @@ class SupplierProposal extends CommonObject
 		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	}
 
-	
+
 	/**
 	 * Function used to replace a thirdparty id with another one.
 	 *
@@ -2555,10 +2555,10 @@ class SupplierProposal extends CommonObject
 	    $tables = array(
 	        'supplier_proposal'
 	    );
-	
+
 	    return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
 	}
-	
+
 }
 
 
@@ -2669,7 +2669,7 @@ class SupplierProposalLine  extends CommonObjectLine
     var $skip_update_total; // Skip update price total for special lines
 
 	var $ref_fourn;
-	
+
 	// Multicurrency
 	var $fk_multicurrency;
 	var $multicurrency_code;
@@ -2750,7 +2750,7 @@ class SupplierProposalLine  extends CommonObjectLine
 			$this->product_desc		= $objp->product_desc;
 
 			$this->ref_fourn		= $objp->ref_produit_forun;
-			
+
 			// Multicurrency
 			$this->fk_multicurrency 		= $objp->fk_multicurrency;
 			$this->multicurrency_code 		= $objp->multicurrency_code;
@@ -2798,11 +2798,11 @@ class SupplierProposalLine  extends CommonObjectLine
         if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
         if (empty($this->fk_fournprice)) $this->fk_fournprice=0;
         if (empty($this->fk_unit)) $this->fk_unit=0;
-		
+
         if (empty($this->pa_ht)) $this->pa_ht=0;
 
 		// if buy price not defined, define buyprice as configured in margin admin
-		if ($this->pa_ht == 0) 
+		if ($this->pa_ht == 0)
 		{
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{
@@ -2826,8 +2826,8 @@ class SupplierProposalLine  extends CommonObjectLine
         $sql.= ' subprice, remise_percent, ';
         $sql.= ' info_bits, ';
         $sql.= ' total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, fk_product_fournisseur_price, buy_price_ht, special_code, rang,';
-        $sql.= ' ref_fourn';
-		$sql.= ', fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc, fk_unit)';
+        $sql.= ' ref_fourn,';
+		$sql.= ' fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc, fk_unit)';
         $sql.= " VALUES (".$this->fk_supplier_proposal.",";
         $sql.= " ".($this->fk_parent_line>0?"'".$this->fk_parent_line."'":"null").",";
         $sql.= " ".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
@@ -2860,7 +2860,7 @@ class SupplierProposalLine  extends CommonObjectLine
 		$sql.= ", ".$this->multicurrency_total_ht;
 		$sql.= ", ".$this->multicurrency_total_tva;
 		$sql.= ", ".$this->multicurrency_total_ttc;
-        $sql.= ", fk_unit=".($this->fk_unit?$this->fk_unit:'null');
+        $sql.= ", ".($this->fk_unit?$this->fk_unit:'null');
 		$sql.= ')';
 
         dol_syslog(get_class($this).'::insert', LOG_DEBUG);
@@ -2869,7 +2869,7 @@ class SupplierProposalLine  extends CommonObjectLine
         {
             $this->rowid=$this->db->last_insert_id(MAIN_DB_PREFIX.'supplier_proposaldet');
 			$this->id=$this->rowid;
-			
+
             if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
             {
             	$result=$this->insertExtraFields();
@@ -2982,11 +2982,11 @@ class SupplierProposalLine  extends CommonObjectLine
         if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
         if (empty($this->fk_fournprice)) $this->fk_fournprice=0;
         if (empty($this->fk_unit)) $this->fk_unit=0;
-		
+
 		if (empty($this->pa_ht)) $this->pa_ht=0;
 
 		// if buy price not defined, define buyprice as configured in margin admin
-		if ($this->pa_ht == 0) 
+		if ($this->pa_ht == 0)
 		{
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{
@@ -3031,13 +3031,13 @@ class SupplierProposalLine  extends CommonObjectLine
         if (! empty($this->rang)) $sql.= ", rang=".$this->rang;
         $sql.= " , ref_fourn=".(! empty($this->ref_fourn)?"'".$this->db->escape($this->ref_fourn)."'":"null");
         $sql.= " , fk_unit=".($this->fk_unit?$this->fk_unit:'null');
-        
+
 		// Multicurrency
 		$sql.= " , multicurrency_subprice=".price2num($this->multicurrency_subprice)."";
         $sql.= " , multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
         $sql.= " , multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
         $sql.= " , multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
-		
+
 		$sql.= " WHERE rowid = ".$this->rowid;
 
         dol_syslog(get_class($this)."::update", LOG_DEBUG);

From 3873bc74333657921b2c01cc67a3153284674146 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Jun 2017 15:06:24 +0200
Subject: [PATCH 332/438] Fix bette compatibility with pgsql

---
 htdocs/core/db/pgsql.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index 2b8e90d0780..4aa56b367f3 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -185,8 +185,8 @@ class DoliDBPgsql extends DoliDB
 
 		        // we are inside create table statement so lets process datatypes
     			if (preg_match('/(ISAM|innodb)/i',$line)) { // end of create table sequence
-    				$line=preg_replace('/\)[\s\t]*type[\s\t]*=[\s\t]*(MyISAM|innodb);/i',');',$line);
-    				$line=preg_replace('/\)[\s\t]*engine[\s\t]*=[\s\t]*(MyISAM|innodb);/i',');',$line);
+    				$line=preg_replace('/\)[\s\t]*type[\s\t]*=[\s\t]*(MyISAM|innodb).*;/i',');',$line);
+    				$line=preg_replace('/\)[\s\t]*engine[\s\t]*=[\s\t]*(MyISAM|innodb).*;/i',');',$line);
     				$line=preg_replace('/,$/','',$line);
     			}
 

From ec9bbe2b52214008f6d6c55bf3dafbb8b8080778 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Jun 2017 16:54:37 +0200
Subject: [PATCH 333/438] Help/Need debug of some online instances with the log
 view

---
 htdocs/admin/syslog.php       | 14 +++++++++++---
 htdocs/admin/tools/purge.php  | 10 +++++++++-
 htdocs/core/lib/files.lib.php | 21 +++++++++++++--------
 htdocs/document.php           |  5 +++--
 4 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index 65933c25639..75de985728c 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -88,7 +88,7 @@ if ($action == 'set')
 
 	$newActiveModules = array();
 	$selectedModules = (isset($_POST['SYSLOG_HANDLERS']) ? $_POST['SYSLOG_HANDLERS'] : array());
-	
+
 	// Save options of handler
 	foreach ($syslogModules as $syslogHandler)
 	{
@@ -111,7 +111,7 @@ if ($action == 'set')
 
 	$activeModules = $newActiveModules;
 
-    dolibarr_del_const($db, 'SYSLOG_HANDLERS', -1);  // To be sure ther is not a setup into another entity	
+    dolibarr_del_const($db, 'SYSLOG_HANDLERS', -1);  // To be sure ther is not a setup into another entity
     dolibarr_set_const($db, 'SYSLOG_HANDLERS', json_encode($activeModules), 'chaine',0,'',0);
 
 	// Check configuration
@@ -206,7 +206,7 @@ foreach ($syslogModules as $moduleName)
 	//print $moduleName." = ".$moduleactive." - ".$module->getName()." ".($moduleactive == -1)."<br>\n";
 	if (($moduleactive == -1) && empty($conf->global->MAIN_FEATURES_LEVEL)) continue;		// Some modules are hidden if not activable and not into debug mode (end user must not see them)
 
-	
+
 	print '<tr class="oddeven">';
 	print '<td width="140">';
 	print '<input class="oddeven" type="checkbox" name="SYSLOG_HANDLERS[]" value="'.$moduleName.'" '.(in_array($moduleName, $activeModules) ? 'checked' : '').($moduleactive <= 0 ? 'disabled' : '').'> ';
@@ -229,6 +229,14 @@ foreach ($syslogModules as $moduleName)
 
 			print $option['name'].': <input type="text" class="flat" name="'.$option['constant'].'" value="'.$value.'"'.(isset($option['attr']) ? ' '.$option['attr'] : '').'>';
 			if (! empty($option['example'])) print '<br>'.$langs->trans("Example").': '.$option['example'];
+
+			if ($option['constant'] == 'SYSLOG_FILE' && preg_match('/^DOL_DATA_ROOT\/[^\/]*$/',$value))
+			{
+    			$filelogparam =' (<a href="'.DOL_URL_ROOT.'/document.php?modulepart=logs&file='.basename($value).'">';
+    			$filelogparam.=$langs->trans('Download');
+    			$filelogparam.=$filelog.'</a>)';
+    			print $filelogparam;
+			}
 		}
 	}
 	print '</td>';
diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php
index e913d59a4a7..7a5cb30ae75 100644
--- a/htdocs/admin/tools/purge.php
+++ b/htdocs/admin/tools/purge.php
@@ -83,7 +83,15 @@ if (! empty($conf->syslog->enabled))
 {
 	print '<input type="radio" name="choice" value="logfile"';
 	print ($choice && $choice=='logfile') ? ' checked' : '';
-	print '> '.$langs->trans("PurgeDeleteLogFile",$filelog).'<br><br>';
+	$filelogparam=$filelog;
+	if ($user->admin && preg_match('/^dolibarr.*\.log$/', basename($filelog)))
+	{
+	   $filelogparam ='<a href="'.DOL_URL_ROOT.'/document.php?modulepart=logs&file=';
+	   $filelogparam.=basename($filelog);
+	   $filelogparam.='">'.$filelog.'</a>';
+	}
+	print '> '.$langs->trans("PurgeDeleteLogFile", $filelogparam);
+	print '<br><br>';
 }
 
 print '<input type="radio" name="choice" value="tempfiles"';
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 6257bcb08db..dd21a1345e7 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1825,8 +1825,20 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 	    $lire='creer'; $read='write'; $download='upload';
 	}
 
+	// Wrapping for miscellaneous medias files
+	if ($modulepart == 'medias' && !empty($dolibarr_main_data_root))
+	{
+	    $accessallowed=1;
+	    $original_file=$dolibarr_main_data_root.'/medias/'.$original_file;
+	}
+	// Wrapping for *.log files, like when used with url http://.../document.php?modulepart=logs&file=dolibarr.log
+	elseif ($modulepart == 'logs' && !empty($dolibarr_main_data_root))
+	{
+	    $accessallowed=($user->admin && basename($original_file) == $original_file && preg_match('/^dolibarr.*\.log$/', basename($original_file)));
+	    $original_file=$dolibarr_main_data_root.'/'.$original_file;
+	}
 	// Wrapping for some images
-	if (($modulepart == 'mycompany' || $modulepart == 'companylogo') && !empty($conf->mycompany->dir_output))
+	elseif (($modulepart == 'mycompany' || $modulepart == 'companylogo') && !empty($conf->mycompany->dir_output))
 	{
 		$accessallowed=1;
 		$original_file=$conf->mycompany->dir_output.'/logos/'.$original_file;
@@ -2369,13 +2381,6 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		$original_file=$conf->fckeditor->dir_output.'/'.$original_file;
 	}
 
-	// Wrapping for miscellaneous medias files
-	elseif ($modulepart == 'medias' && !empty($dolibarr_main_data_root))
-	{
-	    $accessallowed=1;
-	    $original_file=$dolibarr_main_data_root.'/medias/'.$original_file;
-	}
-
 	// Wrapping for backups
 	else if ($modulepart == 'systemtools' && !empty($conf->admin->dir_output))
 	{
diff --git a/htdocs/document.php b/htdocs/document.php
index 46e27d57a67..206ea69688a 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -26,6 +26,7 @@
  *  \brief      Wrapper to download data files
  *  \remarks    Call of this wrapper is made with URL:
  * 				document.php?modulepart=repfichierconcerne&file=pathrelatifdufichier
+ * 				document.php?modulepart=logs&file=dolibarr.log
  */
 
 define('NOTOKENRENEWAL',1); // Disables token renewal
@@ -106,7 +107,7 @@ $refname=basename(dirname($original_file)."/");
 
 // Security check
 if (empty($modulepart)) accessforbidden('Bad value for parameter modulepart');
-$check_access = dol_check_secure_access_document($modulepart,$original_file,$entity,$refname);
+$check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, $refname);
 $accessallowed              = $check_access['accessallowed'];
 $sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
 $original_file              = $check_access['original_file'];               // original_file is now a full path name
@@ -183,7 +184,7 @@ header('Pragma: public');
 
 //ob_clean();
 //flush();
-    
+
 readfile($original_file_osencoded);
 
 if (is_object($db)) $db->close();

From ce8a024d4484c5f42d141e5889f6d62b0eebf51e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 21 Jun 2017 00:34:56 +0200
Subject: [PATCH 334/438] Fix limit on margin pages

---
 htdocs/margin/agentMargins.php    | 22 ++++++++++++----------
 htdocs/margin/customerMargins.php | 18 ++++++++++++------
 htdocs/margin/productMargins.php  | 28 ++++++++++++++--------------
 3 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index f474b7af340..e00eb4ae18b 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -44,8 +44,15 @@ if ($user->rights->margins->read->all) {
 
 $mesg = '';
 
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
+// 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) { $page = 0; }     // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
 if (! $sortorder) $sortorder="ASC";
 if (! $sortfield)
 {
@@ -54,11 +61,6 @@ if (! $sortfield)
 	else
 	    $sortfield="u.lastname";
 }
-$page = GETPOST("page",'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
-$offset = $conf->liste_limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
 
 $startdate=$enddate='';
 
@@ -170,13 +172,13 @@ if ($result)
 	$num = $db->num_rows($result);
 
 	print '<br>';
-	print_barre_liste($langs->trans("MarginDetails"),$page,$_SERVER["PHP_SELF"],"",$sortfield,$sortorder,'',$num,$num,'');
+	print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num, $num, '', 0, '', '', 0, 1);
 
 	if ($conf->global->MARGIN_TYPE == "1")
 	    $labelcostprice=$langs->trans('BuyingPrice');
 	else   // value is 'costprice' or 'pmp'
 	    $labelcostprice=$langs->trans('CostPrice');
-	
+
 	$i = 0;
 	print "<table class=\"noborder\" width=\"100%\">";
 
@@ -220,7 +222,7 @@ if ($result)
 				$markRate = ($pv != 0)?(100 * $marge / $pv):'' ;
 			}
 
-			
+
 
 			print '<tr class="oddeven">';
 			if ($agentid > 0) {
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index 64b0dd82ff2..ed76cde223c 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -41,11 +41,17 @@ $result = restrictedArea($user, 'societe','','');
 
 $mesg = '';
 
-$page = GETPOST("page",'int');
+// 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) { $page = 0; }     // If $page is not defined, or '' or -1
-$offset = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
+if (! $sortfield) $sortfield="s.nom"; // Set here default search field
+if (! $sortorder) $sortorder="ASC";
 
 $startdate=$enddate='';
 
@@ -206,13 +212,13 @@ if ($result)
 	$num = $db->num_rows($result);
 
   	print '<br>';
-	print_barre_liste($langs->trans("MarginDetails"),$page,$_SERVER["PHP_SELF"],"",$sortfield,$sortorder,'',$num,$num,'');
+	print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num, $num, '', 0, '', '', 0, 1);
 
 	if ($conf->global->MARGIN_TYPE == "1")
 	    $labelcostprice=$langs->trans('BuyingPrice');
 	else   // value is 'costprice' or 'pmp'
 	    $labelcostprice=$langs->trans('CostPrice');
-	
+
 	$i = 0;
 	print "<table class=\"noborder\" width=\"100%\">";
 
@@ -260,7 +266,7 @@ if ($result)
 				$markRate = ($pv != 0)?(100 * $marge / $pv):'' ;
 			}
 
-			
+
 
 			print '<tr class="oddeven">';
 			if ($client) {
@@ -295,7 +301,7 @@ if ($result)
 	}
 
 	// affichage totaux marges
-	
+
 	$totalMargin = $cumul_vente - $cumul_achat;
 	/*if ($totalMargin < 0)
 	{
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index f1ed5afe573..43a9ef0f22e 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -46,9 +46,15 @@ $result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','',
 
 $mesg = '';
 
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-if (! $sortorder) $sortorder="ASC";
+// 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) { $page = 0; }     // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
 if (! $sortfield)
 {
 	if ($id > 0)
@@ -63,12 +69,6 @@ if (! $sortfield)
 	}
 }
 
-$page = GETPOST("page",'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
-$offset = $conf->liste_limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-
 $startdate=$enddate='';
 
 if (!empty($_POST['startdatemonth']))
@@ -202,16 +202,16 @@ if ($result)
 	$num = $db->num_rows($result);
 
 	print '<br>';
-	print_barre_liste($langs->trans("MarginDetails"),$page,$_SERVER["PHP_SELF"],"&amp;id=".$id,$sortfield,$sortorder,'',$num,$num,'');
+	print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], "&amp;id=".$id, $sortfield, $sortorder, '', $num, $num, '', 0, '', '', 0, 1);
 
 	//var_dump($conf->global->MARGIN_TYPE);
 	if ($conf->global->MARGIN_TYPE == "1")
 	    $labelcostprice=$langs->trans('BuyingPrice');
 	else   // value is 'costprice' or 'pmp'
 	    $labelcostprice=$langs->trans('CostPrice');
-	    
+
 	$moreforfilter='';
-	
+
 	$i = 0;
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
@@ -260,7 +260,7 @@ if ($result)
 				$markRate = ($pv != 0)?(100 * $marge / $pv):'' ;
 			}
 
-			
+
 
 			print '<tr class="oddeven">';
 			if ($id > 0) {
@@ -308,7 +308,7 @@ if ($result)
 	}
 
 	// affichage totaux marges
-	
+
 	$totalMargin = $cumul_vente - $cumul_achat;
 
 	$marginRate = ($cumul_achat != 0)?(100 * $totalMargin / $cumul_achat):'';

From 9ec792975396b708dd1e90fd535bcae94df26a9e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 21 Jun 2017 10:57:15 +0200
Subject: [PATCH 335/438] Look and feel v6

---
 htdocs/margin/agentMargins.php    |  25 +++-
 htdocs/margin/checkMargins.php    | 237 +++++++++++++++---------------
 htdocs/margin/customerMargins.php |   1 +
 htdocs/margin/productMargins.php  |   1 +
 htdocs/theme/eldy/style.css.php   |   5 +-
 htdocs/theme/md/style.css.php     |   5 +-
 6 files changed, 143 insertions(+), 131 deletions(-)

diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index e00eb4ae18b..6c3a246ad0d 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -34,14 +34,6 @@ $langs->load("bills");
 $langs->load("products");
 $langs->load("margins");
 
-// Security check
-
-if ($user->rights->margins->read->all) {
-	$agentid = GETPOST('agentid', 'int');
-} else {
-	$agentid = $user->id;
-}
-
 $mesg = '';
 
 // Load variable for pagination
@@ -69,6 +61,23 @@ if (!empty($_POST['startdatemonth']))
 if (!empty($_POST['enddatemonth']))
   $enddate  = dol_mktime(23, 59, 59, $_POST['enddatemonth'],  $_POST['enddateday'],  $_POST['enddateyear']);
 
+// Security check
+if ($user->rights->margins->read->all) {
+  $agentid = GETPOST('agentid', 'int');
+} else {
+  $agentid = $user->id;
+}
+$result=restrictedArea($user,'margins');
+
+
+/*
+ * Actions
+ */
+
+// None
+
+
+
 /*
  * View
  */
diff --git a/htdocs/margin/checkMargins.php b/htdocs/margin/checkMargins.php
index c576b3ce4a6..ab6394eb74c 100644
--- a/htdocs/margin/checkMargins.php
+++ b/htdocs/margin/checkMargins.php
@@ -34,72 +34,35 @@ $langs->load("bills");
 $langs->load("products");
 $langs->load("margins");
 
-// Security check
-
-if ($user->rights->margins->creer) {
-	$agentid = $user->id;
-} else {
-	accessforbidden();
-}
-
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
-if (! $sortorder)
-	$sortorder = "DESC";
-if (! $sortfield) {
-	$sortfield = 'f.facnumber';
-}
-$page = GETPOST("page", 'int');
-if ($page == - 1) {
-	$page = 0;
-}
-$offset = $conf->liste_limit * $page;
+// 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) { $page = 0; }     // If $page is not defined, or '' or -1
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-
-// Both test are required to be compatible with all browsers
-if (GETPOST("button_search_x") || GETPOST("button_search")) {
-	$action = 'search';
-} elseif (GETPOST("button_updatemagins_x") || GETPOST("button_updatemagins")) {
-	$action = 'update';
-}
-
-if ($action == 'update') {
-	$datapost = $_POST;
-	
-	foreach ( $datapost as $key => $value ) {
-		if (strpos($key, 'buyingprice_') !== false) {
-			$tmp_array = explode('_', $key);
-			if (count($tmp_array) > 0) {
-				$invoicedet_id = $tmp_array[1];
-				if (! empty($invoicedet_id)) {
-					$sql = 'UPDATE ' . MAIN_DB_PREFIX . 'facturedet';
-					$sql .= ' SET buy_price_ht=\'' . price2num($value) . '\'';
-					$sql .= ' WHERE rowid=' . $invoicedet_id;
-					$result = $db->query($sql);
-					if (!$result) {
-						setEventMessages($db->lasterror, null, 'errors');
-					}
-				}
-			}
-		}
-	}
-}
+if (! $sortorder) $sortorder = "DESC";
+if (! $sortfield) $sortfield = 'f.facnumber';
 
 $startdate = $enddate = '';
 
 $startdate = dol_mktime(0, 0, 0, GETPOST('startdatemonth', 'int'), GETPOST('startdateday', 'int'), GETPOST('startdateyear', 'int'));
 $enddate = dol_mktime(23, 59, 59, GETPOST('enddatemonth', 'int'), GETPOST('enddateday', 'int'), GETPOST('enddateyear', 'int'));
 
-if (! empty($startdate)) {
-	$options .= '&amp;startdatemonth=' . GETPOST('startdatemonth', 'int') . '&amp;startdateday=' . GETPOST('startdateday', 'int') . '&amp;startdateyear=' . GETPOST('startdateyear', 'int');
-}
-if (! empty($enddate)) {
-	$options .= '&amp;enddatemonth=' . GETPOST('enddatemonth', 'int') . '&amp;enddateday=' . GETPOST('enddateday', 'int') . '&amp;enddateyear=' . GETPOST('enddateyear', 'int');
-}
-
 $search_ref = GETPOST('search_ref','alpha');
 
+// Security check
+$result=restrictedArea($user,'margins');
+
+// Both test are required to be compatible with all browsers
+if (GETPOST("button_search_x") || GETPOST("button_search")) {
+    $action = 'search';
+} elseif (GETPOST("button_updatemagins_x") || GETPOST("button_updatemagins")) {
+    $action = 'update';
+}
+
 
 /*
  * Actions
@@ -117,6 +80,28 @@ if (empty($reshook))
     // Selection of new fields
     include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
+    if ($action == 'update') {
+        $datapost = $_POST;
+
+        foreach ( $datapost as $key => $value ) {
+            if (strpos($key, 'buyingprice_') !== false) {
+                $tmp_array = explode('_', $key);
+                if (count($tmp_array) > 0) {
+                    $invoicedet_id = $tmp_array[1];
+                    if (! empty($invoicedet_id)) {
+                        $sql = 'UPDATE ' . MAIN_DB_PREFIX . 'facturedet';
+                        $sql .= ' SET buy_price_ht=\'' . price2num($value) . '\'';
+                        $sql .= ' WHERE rowid=' . $invoicedet_id;
+                        $result = $db->query($sql);
+                        if (!$result) {
+                            setEventMessages($db->lasterror, null, 'errors');
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     // Purge search criteria
     if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
     {
@@ -155,6 +140,17 @@ llxHeader('', $title);
 
 // print_fiche_titre($text);
 
+$param='';
+if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
+if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+if (! empty($startdate)) {
+    $param .= '&startdatemonth=' . GETPOST('startdatemonth', 'int') . '&startdateday=' . GETPOST('startdateday', 'int') . '&startdateyear=' . GETPOST('startdateyear', 'int');
+}
+if (! empty($enddate)) {
+    $param .= '&enddatemonth=' . GETPOST('enddatemonth', 'int') . '&enddateday=' . GETPOST('enddateday', 'int') . '&enddateyear=' . GETPOST('enddateyear', 'int');
+}
+if ($optioncss != '') $param.='&optioncss='.$optioncss;
+
 // Show tabs
 $head = marges_prepare_head($user);
 $picto = 'margin';
@@ -202,7 +198,7 @@ $sql .= $db->order($sortfield, $sortorder);
 
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
-	
+
 	dol_syslog(__FILE__, LOG_DEBUG);
 	$result = $db->query($sql);
 	if ($result) {
@@ -212,31 +208,30 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	}
 }
 
-$sql .= $db->plimit($conf->liste_limit + 1, $offset);
+$sql .= $db->plimit($limit+1, $offset);
 
-dol_syslog(__FILE__, LOG_DEBUG);
 $result = $db->query($sql);
 if ($result) {
 	$num = $db->num_rows($result);
-	
+
 	print '<br>';
-	print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num, $nbtotalofrecords, '');
-	
+	print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, '', '', $limit);
+
 	if ($conf->global->MARGIN_TYPE == "1")
 	    $labelcostprice=$langs->trans('BuyingPrice');
 	else   // value is 'costprice' or 'pmp'
 	    $labelcostprice=$langs->trans('CostPrice');
-	
+
 	$moreforfilter='';
-	
+
 	$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
 	//$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
 	//if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
 	$selectedfields='';
-	
+
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-	
+
 	print '<tr class="liste_titre liste_titre_search">';
 	print '<td><input type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'"></td>';
 	print '<td></td>';
@@ -249,66 +244,66 @@ if ($result) {
     print $searchpitco;
     print '</td>';
 	print "</tr>\n";
-    
+
 	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "f.facnumber", "", $options, '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Description"), $_SERVER["PHP_SELF"], "", "", $options, 'width=20%', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("UnitPriceHT"), $_SERVER["PHP_SELF"], "d.subprice", "", $options, 'align="right"', $sortfield, $sortorder);
-	print_liste_field_titre($labelcostprice, $_SERVER["PHP_SELF"], "d.buy_price_ht", "", $options, 'align="right"', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Qty"), $_SERVER["PHP_SELF"], "d.qty", "", $options, 'align="right"', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("AmountTTC"), $_SERVER["PHP_SELF"], "d.total_ht", "", $options, 'align="right"', $sortfield, $sortorder);
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
+	print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "f.facnumber", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Description"), $_SERVER["PHP_SELF"], "", "", $param, 'width=20%', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("UnitPriceHT"), $_SERVER["PHP_SELF"], "d.subprice", "", $param, 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre($labelcostprice, $_SERVER["PHP_SELF"], "d.buy_price_ht", "", $param, 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Qty"), $_SERVER["PHP_SELF"], "d.qty", "", $param, 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("AmountTTC"), $_SERVER["PHP_SELF"], "d.total_ht", "", $param, 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'',$param,'align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";
-	
-	if ($num > 0) {
-		while ($objp = $db->fetch_object($result)) 
-		{
-			$var = ! $var;
-			
-			print '<tr class="oddeven">';
-			print '<td>';
-			$result_inner = $invoicestatic->fetch($objp->invoiceid);
-			if ($result_inner < 0) {
-				setEventMessages($invoicestatic->error, null, 'errors');
-			} else {
-				print $invoicestatic->getNomUrl(1);
-			}
-			print '</td>';
-			print '<td>';
-			if (! empty($objp->fk_product)) {
-				$result_inner = $productstatic->fetch($objp->fk_product);
-				if ($result_inner < 0) {
-					setEventMessages($productstatic->error, null, 'errors');
-				} else {
-					print $productstatic->getNomUrl(1);
-				}
-			} else {
-				print $objp->label;
-				print '&nbsp;';
-				print $objp->description;
-			}
-			print '</td>';
-			print '<td align="right">';
-			print price($objp->subprice);
-			print '</td>';
-			print '<td align="right">';
-			print '<input type="text" name="buyingprice_' . $objp->invoicedetid . '" id="buyingprice_' . $objp->invoicedetid . '" size="6" value="' . price($objp->buy_price_ht) . '" class="flat">';
-			print '</td>';
-			print '<td align="right">';
-			print $objp->qty;
-			print '</td>';
-			print '<td align="right">';
-			print price($objp->total_ht);
-			print '</td>';
-			print '<td></td>';
-				
-			print "</tr>\n";
-			
-			$i ++;
+
+    $i=0;
+	while ($i < min($num, $limit))
+	{
+	    $objp = $db->fetch_object($result);
+
+		print '<tr class="oddeven">';
+		print '<td>';
+		$result_inner = $invoicestatic->fetch($objp->invoiceid);
+		if ($result_inner < 0) {
+			setEventMessages($invoicestatic->error, null, 'errors');
+		} else {
+			print $invoicestatic->getNomUrl(1);
 		}
+		print '</td>';
+		print '<td>';
+		if (! empty($objp->fk_product)) {
+			$result_inner = $productstatic->fetch($objp->fk_product);
+			if ($result_inner < 0) {
+				setEventMessages($productstatic->error, null, 'errors');
+			} else {
+				print $productstatic->getNomUrl(1);
+			}
+		} else {
+			print $objp->label;
+			print '&nbsp;';
+			print $objp->description;
+		}
+		print '</td>';
+		print '<td align="right">';
+		print price($objp->subprice);
+		print '</td>';
+		print '<td align="right">';
+		print '<input type="text" name="buyingprice_' . $objp->invoicedetid . '" id="buyingprice_' . $objp->invoicedetid . '" size="6" value="' . price($objp->buy_price_ht) . '" class="right flat">';
+		print '</td>';
+		print '<td align="right">';
+		print $objp->qty;
+		print '</td>';
+		print '<td align="right">';
+		print price($objp->total_ht);
+		print '</td>';
+		print '<td></td>';
+
+		print "</tr>\n";
+
+		$i ++;
 	}
+
 	print "</table>";
-	
+
 	print "</div>";
 } else {
 	dol_print_error($db);
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index ed76cde223c..643fdcb4704 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -37,6 +37,7 @@ $langs->load("margins");
 $socid = GETPOST('socid','int');
 if (! empty($user->societe_id)) $socid=$user->societe_id;
 $result = restrictedArea($user, 'societe','','');
+$result = restrictedArea($user,'margins');
 
 
 $mesg = '';
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index 43a9ef0f22e..77f7e23c84f 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -43,6 +43,7 @@ $fieldvalue = (! empty($id) ? $id : (! empty($ref) ? $ref : ''));
 $fieldtype = (! empty($ref) ? 'ref' : 'rowid');
 if (! empty($user->societe_id)) $socid=$user->societe_id;
 $result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype);
+$result=restrictedArea($user,'margins');
 
 $mesg = '';
 
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index c3bfa8b05cb..3f05f66c82b 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -4043,12 +4043,15 @@ a span.select2-chosen
 .css-searchselectcombo ul.select2-results {
 	max-height:	none;
 }
-.select2-container-multi.select2-container-disabled .select2-choices {
+.select2-container.select2-container-disabled .select2-choice, .select2-container-multi.select2-container-disabled .select2-choices {
 	background-color: #FFFFFF;
 	background-image: none;
 	border: none;
 	cursor: default;
 }
+.select2-container-disabled .select2-choice .select2-arrow b {
+	opacity: 0.5;
+}
 .select2-container-multi .select2-choices .select2-search-choice {
   margin-bottom: 3px;
 }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index e96fa032538..802eb46f6af 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -4128,12 +4128,15 @@ a span.select2-chosen
 .css-searchselectcombo ul.select2-results {
 	max-height:	none;
 }
-.select2-container-multi.select2-container-disabled .select2-choices {
+.select2-container.select2-container-disabled .select2-choice, .select2-container-multi.select2-container-disabled .select2-choices {
 	background-color: #FFFFFF;
 	background-image: none;
 	border: none;
 	cursor: default;
 }
+.select2-container-disabled .select2-choice .select2-arrow b {
+	opacity: 0.5;
+}
 .select2-container-multi .select2-choices .select2-search-choice {
   margin-bottom: 3px;
 }

From 4102403482156add2e1342d7d8b02f8604678b6e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 21 Jun 2017 11:37:34 +0200
Subject: [PATCH 336/438] Look and feel v6

---
 htdocs/categories/card.php            | 11 +++++------
 htdocs/comm/propal/card.php           |  2 +-
 htdocs/commande/card.php              |  2 +-
 htdocs/core/class/html.form.class.php |  4 ++--
 htdocs/core/lib/ajax.lib.php          | 20 ++++++++++----------
 htdocs/core/lib/functions.lib.php     |  4 ++--
 htdocs/fichinter/card.php             |  2 +-
 htdocs/fourn/commande/card.php        |  2 +-
 htdocs/fourn/facture/card.php         |  2 +-
 htdocs/product/card.php               |  4 +++-
 htdocs/product/stock/card.php         |  4 +++-
 htdocs/societe/ajax/company.php       |  5 +++--
 htdocs/supplier_proposal/card.php     |  2 +-
 htdocs/theme/eldy/style.css.php       |  2 +-
 14 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/htdocs/categories/card.php b/htdocs/categories/card.php
index 55bf400ea3a..9f49e42f060 100644
--- a/htdocs/categories/card.php
+++ b/htdocs/categories/card.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2005		Matthieu Valleton	<mv@seeschloss.org>
- * Copyright (C) 2006-2015	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2006-2017	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2014	Regis Houssin		<regis.houssin@capnetworks.com>
  * Copyright (C) 2007		Patrick Raguin		<patrick.raguin@gmail.com>
  * Copyright (C) 2013		Florian Henry		<florian.henry@open-concept.pro>
@@ -221,9 +221,7 @@ llxHeader("",$langs->trans("Categories"),$helpurl);
 
 if ($user->rights->categorie->creer)
 {
-	/*
-	 * Fiche en mode creation
-	 */
+	// Create or add
 	if ($action == 'create' || $_POST["addcat"] == 'addcat')
 	{
 		dol_set_focus('#label');
@@ -246,7 +244,7 @@ if ($user->rights->categorie->creer)
 
 		// Ref
 		print '<tr>';
-		print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("Ref").'</td><td><input id="label" class="flat" name="label" size="25" value="'.$label.'">';
+		print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("Ref").'</td><td><input id="label" class="minwidth100" name="label" value="'.$label.'">';
 		print'</td></tr>';
 
 		// Description
@@ -263,7 +261,8 @@ if ($user->rights->categorie->creer)
 
 		// Parent category
 		print '<tr><td>'.$langs->trans("AddIn").'</td><td>';
-		print $form->select_all_categories($type, $catorigin);
+		print $form->select_all_categories($type, $catorigin, 'parent');
+		print ajax_combobox('parent');
 		print '</td></tr>';
 
 		$parameters=array();
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 67dbca101f8..0c9d97fc299 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1360,7 +1360,7 @@ if ($action == 'create')
         }
 	} else {
 		print '<td>';
-		print $form->select_company('', 'socid', '(s.client = 1 OR s.client = 2 OR s.client = 3) AND status=1', 'SelectThirdParty');
+		print $form->select_company('', 'socid', '(s.client = 1 OR s.client = 2 OR s.client = 3) AND status=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
 		// reload page to retrieve customer informations
 		if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE))
 		{
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index f837119730c..a10de641ea1 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1477,7 +1477,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 		print '</td>';
 	} else {
 		print '<td>';
-		print $form->select_company('', 'socid', 's.client = 1 OR s.client = 3', 'SelectThirdParty');
+		print $form->select_company('', 'socid', 's.client = 1 OR s.client = 3', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
 		// reload page to retrieve customer informations
 		if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE))
 		{
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 7c8efcc8328..1a19d0da776 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -995,7 +995,7 @@ class Form
     			unset($societetmp);
     		}
     		// mode 1
-    		$urloption='htmlname='.$htmlname.'&outjson=1&filter='.$filter;
+    		$urloption='htmlname='.$htmlname.'&outjson=1&filter='.$filter.($showtype?'&showtype='.$showtype:'');
     		$out.=  ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/societe/ajax/company.php', $urloption, $conf->global->COMPANY_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
 			$out.='<style type="text/css">
 					.ui-autocomplete {
@@ -3461,7 +3461,7 @@ class Form
             $cate_arbo = $cat->get_full_arbo($type,$excludeafterid);
 		}
 
-        $output = '<select class="flat" name="'.$htmlname.'">';
+        $output = '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
 		$outarray=array();
         if (is_array($cate_arbo))
         {
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index d278f29b897..705bcf6deab 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -37,9 +37,9 @@
  *  @param	int		$autoselect			Automatic selection if just one value
  *  @param	array	$ajaxoptions		Multiple options array
  *                                          Ex: array('update'=>array('field1','field2'...)) will reset field1 and field2 once select done
- *                                          Ex: array('disabled'=>
- *                                          Ex: array('show'=>
- *                                          Ex: array('update_textarea'=>
+ *                                          Ex: array('disabled'=> )
+ *                                          Ex: array('show'=> )
+ *                                          Ex: array('update_textarea'=> )
  *	@return string              		Script
  */
 function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLength=2, $autoselect=0, $ajaxoptions=array())
@@ -181,12 +181,12 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLengt
     							});
     						}
     						console.log("ajax_autocompleter new value selected, we trigger change on original component so field #search_'.$htmlname.'");
-							
+
     						$("#search_'.$htmlname.'").trigger("change");	// We have changed value of the combo select, we must be sure to trigger all js hook binded on this event. This is required to trigger other javascript change method binded on original field by other code.
     					}
     					,delay: 500
 					}).data("ui-autocomplete")._renderItem = function( ul, item ) {
-						  
+
 						return $("<li>")
 						.data( "ui-autocomplete-item", item ) // jQuery UI > 1.10.0
 						.append( \'<a><span class="tag">\' + item.label + "</span></a>" )
@@ -352,8 +352,8 @@ function ajax_dialog($title,$message,$w=350,$h=150)
 
 /**
  * Make content of an input box selected when we click into input field.
- * 
- * @param string	$htmlname	Id of html object 
+ *
+ * @param string	$htmlname	Id of html object
  * @param string	$addlink	Add a 'link to' after
  */
 function ajax_autoselect($htmlname, $addlink='')
@@ -383,7 +383,7 @@ function ajax_autoselect($htmlname, $addlink='')
 function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0, $forcefocus=0, $widthTypeOfAutocomplete='resolve')
 {
 	global $conf;
-	
+
 	if (! empty($conf->browser->phone)) return '';	// select2 disabled for smartphones with standard browser (does not works, popup appears outside screen)
 	if (! empty($conf->dol_use_jmobile)) return '';	// select2 works with jmobile but it breaks the autosize feature of jmobile.
 	if (! empty($conf->global->MAIN_DISABLE_AJAX_COMBOX)) return '';
@@ -392,13 +392,13 @@ function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0, $
 	if (empty($minLengthToAutocomplete)) $minLengthToAutocomplete=0;
 
     $tmpplugin='select2';
-    $msg='<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->
+    $msg='<!-- JS CODE TO ENABLE '.$tmpplugin.' for id = '.$htmlname.' -->
           <script type="text/javascript">
         	$(document).ready(function () {
         		$(\''.(preg_match('/^\./',$htmlname)?$htmlname:'#'.$htmlname).'\').'.$tmpplugin.'({
         		    dir: \'ltr\',
         			width: \''.$widthTypeOfAutocomplete.'\',		/* off or resolve */
-					minimumInputLength: '.$minLengthToAutocomplete.'				    
+					minimumInputLength: '.$minLengthToAutocomplete.'
 				})';
 	if ($forcefocus) $msg.= '.select2(\'focus\')';
 	$msg.= ';'."\n";
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 50e3ecfb33f..87fc05f7114 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6088,13 +6088,13 @@ function dolExplodeIntoArray($string, $delimiter = ';', $kv = '=')
 /**
  * Set focus onto field with selector
  *
- * @param 	string	$selector	Selector ('#id') to use to find the HTML input field that must get the autofocus. You must use a CSS selector, so unique id preceding with the '#' char.
+ * @param 	string	$selector	Selector ('#id' or 'input[name="ref"]') to use to find the HTML input field that must get the autofocus. You must use a CSS selector, so unique id preceding with the '#' char.
  * @return	string				HTML code to set focus
  */
 function dol_set_focus($selector)
 {
 	print "\n".'<!-- Set focus onto a specific field -->'."\n";
-	print '<script type="text/javascript" language="javascript">jQuery(document).ready(function() { jQuery("'.$selector.'").focus(); });</script>'."\n";
+	print '<script type="text/javascript" language="javascript">jQuery(document).ready(function() { jQuery("'.dol_escape_js($selector).'").focus(); });</script>'."\n";
 }
 
 
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 108aaf7a23a..272a15e6ab8 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -1045,7 +1045,7 @@ if ($action == 'create')
 		}
 		print '<table class="border" width="100%">';
 		print '<tr><td class="fieldrequired">'.$langs->trans("ThirdParty").'</td><td>';
-		print $form->select_company('','socid','','SelectThirdParty',1);
+		print $form->select_company('', 'socid', '', 'SelectThirdParty', 1, 0, null, 0, 'minwidth300');
 		print '</td></tr>';
 		print '</table>';
 
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 04cbe76ee66..c76a25caa70 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1436,7 +1436,7 @@ if ($action=='create')
 	}
 	else
 	{
-		print $form->select_company((empty($socid)?'':$socid), 'socid', 's.fournisseur = 1', 'SelectThirdParty');
+		print $form->select_company((empty($socid)?'':$socid), 'socid', 's.fournisseur = 1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
         // reload page to retrieve customer informations
         if (!empty($conf->global->RELOAD_PAGE_ON_SUPPLIER_CHANGE))
         {
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index db017cc004a..956808b1fab 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1445,7 +1445,7 @@ if ($action == 'create')
     }
     else
     {
-        print $form->select_company($societe->id, 'socid', 's.fournisseur = 1', 'SelectThirdParty');
+        print $form->select_company($societe->id, 'socid', 's.fournisseur = 1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
         // reload page to retrieve supplier informations
         if (!empty($conf->global->RELOAD_PAGE_ON_SUPPLIER_CHANGE))
         {
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index ed4439d7288..0f093ca60de 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -865,6 +865,8 @@ else
         	$modCodeProduct = new $module();
         }
 
+        dol_set_focus('input[name="ref"]');
+
         print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
         print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
         print '<input type="hidden" name="action" value="add">';
@@ -886,7 +888,7 @@ else
         print '<tr>';
         $tmpcode='';
 		if (! empty($modCodeProduct->code_auto)) $tmpcode=$modCodeProduct->getNextValue($object,$type);
-        print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("Ref").'</td><td colspan="3"><input name="ref" class="maxwidth200" maxlength="128" value="'.dol_escape_htmltag(GETPOST('ref')?GETPOST('ref'):$tmpcode).'">';
+        print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("Ref").'</td><td colspan="3"><input id="ref" name="ref" class="maxwidth200" maxlength="128" value="'.dol_escape_htmltag(GETPOST('ref')?GETPOST('ref'):$tmpcode).'">';
         if ($refalreadyexists)
         {
             print $langs->trans("RefAlreadyExists");
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 7d54642f1c6..db8a6736688 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -181,6 +181,8 @@ if ($action == 'create')
 {
 	print load_fiche_titre($langs->trans("NewWarehouse"));
 
+	dol_set_focus('input[name="libelle"]');
+
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">'."\n";
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="action" value="add">';
@@ -477,7 +479,7 @@ else
 						}
 					}
 
-					
+
 					//print '<td>'.dol_print_date($objp->datem).'</td>';
 					print '<tr class="oddeven">';
 					print "<td>";
diff --git a/htdocs/societe/ajax/company.php b/htdocs/societe/ajax/company.php
index 9c7915faa14..93af8509e32 100644
--- a/htdocs/societe/ajax/company.php
+++ b/htdocs/societe/ajax/company.php
@@ -37,6 +37,7 @@ $filter=GETPOST('filter','alpha');
 $outjson=(GETPOST('outjson','int') ? GETPOST('outjson','int') : 0);
 $action=GETPOST('action', 'alpha');
 $id=GETPOST('id', 'int');
+$showtype=GETPOST('showtype','int');
 
 
 /*
@@ -87,9 +88,9 @@ else
 	$searchkey=(($id && GETPOST($id, 'alpha'))?GETPOST($id, 'alpha'):(($htmlname && GETPOST($htmlname, 'alpha'))?GETPOST($htmlname, 'alpha'):''));
 
 	if (! $searchkey) return;
-	
+
 	$form = new Form($db);
-	$arrayresult=$form->select_thirdparty_list(0,$htmlname,$filter,1,0,0,null,$searchkey,$outjson);
+	$arrayresult=$form->select_thirdparty_list(0, $htmlname, $filter, 1, $showtype, 0, null, $searchkey, $outjson);
 
 	$db->close();
 
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 46d4acb286a..1352e8c154c 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1058,7 +1058,7 @@ if ($action == 'create')
 		print '</td>';
 	} else {
 		print '<td colspan="2">';
-		print $form->select_company('', 'socid', 's.fournisseur = 1', 'SelectThirdParty');
+		print $form->select_company('', 'socid', 's.fournisseur = 1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
 		print '</td>';
 	}
 	print '</tr>' . "\n";
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 3f05f66c82b..562d707c454 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -283,7 +283,7 @@ input, input.flat, textarea, textarea.flat, form.flat select, select, select.fla
     font-family: <?php print $fontlist ?>;
     outline: none;
     margin: 0px 0px 0px 0px;
-    border-bottom: solid 1px rgba(0,0,0,.4);
+    border-bottom: solid 1px rgba(0,0,0,.2);
 }
 
 input {

From 014cb4b004394793fbc8c653e379376b69755dd8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 21 Jun 2017 12:03:49 +0200
Subject: [PATCH 337/438] Fix navigation on security event list

---
 htdocs/admin/tools/listevents.php | 91 +++++++++++++++++--------------
 htdocs/core/lib/functions.lib.php |  2 +-
 2 files changed, 51 insertions(+), 42 deletions(-)

diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index 40ebcd69dc6..fc1d2b72fdf 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2004-2015  Laurent Destailleur	<eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2017  Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012  Regis Houssin		<regis.houssin@capnetworks.com>
  * Copyright (C) 2015       Bahfir Abbes		<bafbes@gmail.com>
  *
@@ -45,15 +45,17 @@ $langs->load("companies");
 $langs->load("users");
 $langs->load("other");
 
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
-if ($page == -1) { $page = 0 ; }
-$offset = $conf->liste_limit * $page ;
+// 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) { $page = 0; }     // If $page is not defined, or '' or -1
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) $sortorder="DESC";
 if (! $sortfield) $sortfield="dateevent";
+if (! $sortorder) $sortorder="DESC";
 
 $search_code = GETPOST("search_code");
 $search_ip   = GETPOST("search_ip");
@@ -61,9 +63,9 @@ $search_user = GETPOST("search_user");
 $search_desc = GETPOST("search_desc");
 $search_ua   = GETPOST("search_ua");
 
-if (!isset($_REQUEST["date_startmonth"]) || $_REQUEST["date_startmonth"] > 0) $date_start=dol_mktime(0,0,0,$_REQUEST["date_startmonth"],$_REQUEST["date_startday"],$_REQUEST["date_startyear"]);
+if (GETPOST("date_startmonth") == '' || GETPOST("date_startmonth") > 0) $date_start=dol_mktime(0,0,0,GETPOST("date_startmonth"),GETPOST("date_startday"),GETPOST("date_startyear"));
 else $date_start=-1;
-if (!isset($_REQUEST["date_endmonth"]) || $_REQUEST["date_endmonth"] > 0) $date_end=dol_mktime(23,59,59,$_REQUEST["date_endmonth"],$_REQUEST["date_endday"],$_REQUEST["date_endyear"]);
+if (GETPOST("date_endmonth") == '' || GETPOST("date_endmonth") > 0) $date_end=dol_mktime(23,59,59,GETPOST("date_endmonth"),GETPOST("date_endday"),GETPOST("date_endyear"));
 else $date_end=-1;
 
 // checks:if date_start>date_end  then date_end=date_start + 24 hours
@@ -72,14 +74,6 @@ if ($date_start > 0 && $date_end > 0 && $date_start > $date_end) $date_end=$date
 $now = dol_now();
 $nowarray = dol_getdate($now);
 
-$params = "&amp;search_code=$search_code&amp;search_ip=$search_ip&amp;search_user=$search_user&amp;search_desc=$search_desc&amp;search_ua=$search_ua";
-$params.= "&amp;date_startmonth=".$_REQUEST["date_startmonth"];
-$params.= "&amp;date_startday=".$_REQUEST["date_startday"];
-$params.= "&amp;date_startyear=".$_REQUEST["date_startyear"];
-$params.= "&amp;date_endmonth=".$_REQUEST["date_endmonth"];
-$params.= "&amp;date_endday=".$_REQUEST["date_endday"];
-$params.= "&amp;date_endyear=".$_REQUEST["date_endyear"];
-
 if (empty($date_start)) // We define date_start and date_end
 {
     $date_start=dol_get_first_day($nowarray['year'],$nowarray['mon'],false);
@@ -88,6 +82,15 @@ if (empty($date_end))
 {
     $date_end=dol_mktime(23,59,59,$nowarray['mon'],$nowarray['mday'],$nowarray['year']);
 }
+// Set $date_startmonth...
+$tmp = dol_getdate($date_start);
+$date_startday = $tmp['mday'];
+$date_startmonth = $tmp['mon'];
+$date_startyear = $tmp['year'];
+$tmp = dol_getdate($date_end);
+$date_endday = $tmp['mday'];
+$date_endmonth = $tmp['mon'];
+$date_endyear = $tmp['year'];
 
 
 /*
@@ -97,7 +100,7 @@ if (empty($date_end))
 $now=dol_now();
 
 // Purge search criteria
-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
 {
     $date_start=-1;
     $date_end=-1;
@@ -192,39 +195,39 @@ if ($result)
 	$i = 0;
 
 	$param='';
-	if ($search_code) $param.='&search_code='.$search_code;
-	if ($search_ip)   $param.='&search_ip='.$search_ip;
-	if ($search_user) $param.='&search_user='.$search_user;
-	if ($search_desc) $param.='&search_desc='.$search_desc;
-	if ($search_ua)   $param.='&search_ua='.$search_ua;
+	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
+	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+	if ($optioncss != '') $param.='&optioncss='.$optioncss;
+	if ($search_code) $param.='&search_code='.urlencode($search_code);
+	if ($search_ip)   $param.='&search_ip='.urlencode($search_ip);
+	if ($search_user) $param.='&search_user='.urlencode($search_user);
+	if ($search_desc) $param.='&search_desc='.urlencode($search_desc);
+	if ($search_ua)   $param.='&search_ua='.urlencode($search_ua);
+	if ($date_startmonth) $param.= "&date_startmonth=".urlencode($date_startmonth);
+	if ($date_startday)   $param.= "&date_startday=".urlencode($date_startday);
+	if ($date_startyear)  $param.= "&date_startyear=".urlencode($date_startyear);
+	if ($date_endmonth)   $param.= "&date_endmonth=".urlencode($date_endmonth);
+	if ($date_endday)     $param.= "&date_endday=".urlencode($date_endday);
+	if ($date_endyear)    $param.= "&date_endyear=".urlencode($date_endyear);
 
     $langs->load('withdrawals');
     if ($num)
     {
         $center='<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=purge">'.$langs->trans("Purge").'</a>';
     }
-    
-	print_barre_liste($langs->trans("ListOfSecurityEvents"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $nbtotalofrecords, 'setup');
+
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+
+    print_barre_liste($langs->trans("ListOfSecurityEvents"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $nbtotalofrecords, 'setup', 0, '', '', $limit);
 
 	if ($action == 'purge')
 	{
 		$formquestion=array();
 		print $form->formconfirm($_SERVER["PHP_SELF"].'?noparam=noparam', $langs->trans('PurgeAuditEvents'), $langs->trans('ConfirmPurgeAuditEvents'),'confirm_purge',$formquestion,'no',1);
 	}
-	
-	print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
 
 	print '<div class="div-table-responsive">';
 	print '<table class="liste" width="100%">';
-	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"e.dateevent","","",'align="left"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Code"),$_SERVER["PHP_SELF"],"e.type","","",'align="left"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("IP"),$_SERVER["PHP_SELF"],"e.ip","","",'align="left"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("User"),$_SERVER["PHP_SELF"],"u.login","","",'align="left"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Description"),$_SERVER["PHP_SELF"],"e.description","","",'align="left"',$sortfield,$sortorder);
-	print_liste_field_titre('');
-	print "</tr>\n";
-
 
 	// Lignes des champs de filtres
 	print '<tr class="liste_titre">';
@@ -255,14 +258,20 @@ if ($result)
 
 	print "</tr>\n";
 
-	$var=True;
 
-	while ($i < min($num, $conf->liste_limit))
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"e.dateevent","",$param,'align="left"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Code"),$_SERVER["PHP_SELF"],"e.type","",$param,'align="left"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("IP"),$_SERVER["PHP_SELF"],"e.ip","",$param,'align="left"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("User"),$_SERVER["PHP_SELF"],"u.login","",$param,'align="left"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Description"),$_SERVER["PHP_SELF"],"e.description","",$param,'align="left"',$sortfield,$sortorder);
+	print_liste_field_titre('');
+	print "</tr>\n";
+
+	while ($i < min($num, $limit))
 	{
 		$obj = $db->fetch_object($result);
 
-		
-
 		print '<tr class="oddeven">';
 
 		// Date
@@ -316,7 +325,7 @@ if ($result)
 	}
 	print "</table>";
 	print "</div>";
-	
+
 	print "</form>";
 	$db->free($result);
 }
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 87fc05f7114..4fea390607a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3455,7 +3455,7 @@ function load_fiche_titre($titre, $morehtmlright='', $picto='title_generic.png',
  *	@param	string	    $titre				Title to show (required)
  *	@param	int   	    $page				Numero of page to show in navigation links (required)
  *	@param	string	    $file				Url of page (required)
- *	@param	string	    $options         	More parameters for links ('' by default, does not include sortfield neither sortorder)
+ *	@param	string	    $options         	More parameters for links ('' by default, does not include sortfield neither sortorder). Value must be 'urlencoded' before calling function.
  *	@param	string    	$sortfield       	Field to sort on ('' by default)
  *	@param	string	    $sortorder       	Order to sort ('' by default)
  *	@param	string	    $center          	String in the middle ('' by default). We often find here string $massaction comming from $form->selectMassAction()

From a6f3eabf4d91b4bd0eac2c6710b7983ec260ae62 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 21 Jun 2017 19:26:36 +0200
Subject: [PATCH 338/438] example of FK definition

---
 htdocs/modulebuilder/template/sql/llx_myobject.key.sql | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/modulebuilder/template/sql/llx_myobject.key.sql b/htdocs/modulebuilder/template/sql/llx_myobject.key.sql
index 6fd4bb4cda6..9f1c8c20ea2 100644
--- a/htdocs/modulebuilder/template/sql/llx_myobject.key.sql
+++ b/htdocs/modulebuilder/template/sql/llx_myobject.key.sql
@@ -14,4 +14,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+
 ALTER TABLE llx_myobject ADD UNIQUE INDEX uk_fk_othertable (fk_othertable);
+--ALTER TABLE llx_myobject ADD CONSTRAINT llx_mytable_field_id FOREIGN KEY (fk_field) REFERENCES llx_myOthertable(rowid);
+

From 06c7cb5d8cc003fd36de4000cd3d50d2dfd89d0f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Jun 2017 09:21:32 +0200
Subject: [PATCH 339/438] Fix css

---
 htdocs/core/get_menudiv.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/htdocs/core/get_menudiv.php b/htdocs/core/get_menudiv.php
index 18835a6b4d5..d2712de201f 100644
--- a/htdocs/core/get_menudiv.php
+++ b/htdocs/core/get_menudiv.php
@@ -93,6 +93,16 @@ print '
         background-position-y: 16px;
         padding: 1em 15px 1em 40px;
     }
+    li.lilevel0 font.vsmenudisabled {
+        /* background-image: url(/dolibarr_dev/htdocs/theme/eldy/img/next.png) !important; */
+        background-repeat: no-repeat !important;
+        background-position-x: 10px;
+        background-position-y: 16px;
+        padding: 1em 15px 1em 40px;
+        background: #f8f8f8;
+        display: block;
+        font-size: 16px !important;
+    }
     li.lilevel1 {
         padding: 1em 15px 0.5em 40px;
         border-top: 1px solid #aaa;

From 64eef9f89cde26070a954c8f1526ebf57dd66e09 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Jun 2017 11:04:15 +0200
Subject: [PATCH 340/438] Fix compatibility with pgsql

---
 htdocs/install/mysql/migration/repair.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index 3f1b93778d4..75e2e27ac2e 100755
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -100,7 +100,7 @@ DELETE FROM llx_product_stock WHERE reel = 0 AND rowid NOT IN (SELECT fk_product
 DROP TABLE tmp_llx_product_batch;
 DROP TABLE tmp_llx_product_batch2;
 CREATE TABLE tmp_llx_product_batch AS select fk_product_stock, eatby, sellby, batch, SUM(qty) as qty, COUNT(rowid) as nb FROM llx_product_batch GROUP BY fk_product_stock, eatby, sellby, batch HAVING COUNT(rowid) > 1;
-CREATE TABLE tmp_llx_product_batch2 AS select pb.rowid, pb.fk_product_stock, pb.eatby, pb.sellby, pb.batch, pb.qty from llx_product_batch as pb, tmp_llx_product_batch as tpb where pb.fk_product_stock = tpb.fk_product_stock and COALESCE(pb.eatby, '') = COALESCE(tpb.eatby,'') and COALESCE(pb.sellby, '') = COALESCE(tpb.sellby, '') and pb.batch = tpb.batch;
+CREATE TABLE tmp_llx_product_batch2 AS select pb.rowid, pb.fk_product_stock, pb.eatby, pb.sellby, pb.batch, pb.qty from llx_product_batch as pb, tmp_llx_product_batch as tpb where pb.fk_product_stock = tpb.fk_product_stock and COALESCE(pb.eatby, '2000-01-01') = COALESCE(tpb.eatby,'2000-01-01') and COALESCE(pb.sellby, '2000-01-01') = COALESCE(tpb.sellby, '2000-01-01') and pb.batch = tpb.batch;
 --select * from tmp_llx_product_batch;
 --select * from tmp_llx_product_batch2;
 DELETE FROM llx_product_batch WHERE rowid IN (select rowid FROM tmp_llx_product_batch2);

From c7a6a67e20c461c037e721293e3ec1c206d349a4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Jun 2017 11:04:29 +0200
Subject: [PATCH 341/438] Fix remove warnings

---
 htdocs/categories/class/categorie.class.php  | 22 +++++++++---------
 htdocs/categories/index.php                  | 24 ++++++++++----------
 htdocs/core/actions_sendmails.inc.php        |  2 +-
 htdocs/core/boxes/box_services_contracts.php |  6 ++---
 htdocs/core/boxes/modules_boxes.php          | 10 ++++----
 5 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index cfe4f3ad169..60ef207bb48 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -53,7 +53,7 @@ class Categorie extends CommonObject
 	const TYPE_PROJECT = 6;
     const TYPE_BANK_LINE = 'bank_line';
 	public $picto = 'category';
-    
+
 
 	/**
 	 * @var array ID mapping from type string
@@ -557,7 +557,7 @@ class Categorie extends CommonObject
 		        $error++;
 		    }
 		}
-		
+
 		if (! $error)
 		{
 			$sql  = "DELETE FROM ".MAIN_DB_PREFIX."categorie_lang";
@@ -814,7 +814,7 @@ class Categorie extends CommonObject
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			while ($rec = $this->db->fetch_array($resql)) 
+			while ($rec = $this->db->fetch_array($resql))
 			{
 			    if ($onlyids)
 			    {
@@ -938,7 +938,7 @@ class Categorie extends CommonObject
 	 *
 	 * @return  array               Array of categories. this->cats and this->motherof are set.
 	 */
-	function get_full_arbo($type,$markafterid=0)
+	function get_full_arbo($type, $markafterid=0)
 	{
 	    global $conf, $langs;
 
@@ -1355,7 +1355,7 @@ class Categorie extends CommonObject
 		    $sql.= " FROM ".MAIN_DB_PREFIX."bank_class as a, ".MAIN_DB_PREFIX."bank_categ as c";
 		    $sql.= " WHERE a.lineid=".$id." AND a.fk_categ = c.rowid";
 		    $sql.= " ORDER BY c.label";
-		    
+
 		    $res = $this->db->query($sql);
 		    if ($res)
 		    {
@@ -1377,7 +1377,7 @@ class Categorie extends CommonObject
 		    {
 		        dol_print_error($this->db);
 		        return -1;
-		    }		    
+		    }
 		}
         else
         {
@@ -1385,7 +1385,7 @@ class Categorie extends CommonObject
     		$sql .= " FROM " . MAIN_DB_PREFIX . "categorie_" . $this->MAP_CAT_TABLE[$type] . " as ct, " . MAIN_DB_PREFIX . "categorie as c";
     		$sql .= " WHERE ct.fk_categorie = c.rowid AND ct.fk_" . $this->MAP_CAT_FK[$type] . " = " . (int) $id . " AND c.type = " . $this->MAP_ID[$type];
     		$sql .= " AND c.entity IN (" . getEntity( 'category', 1 ) . ")";
-    
+
     		$res = $this->db->query($sql);
     		if ($res)
     		{
@@ -1408,7 +1408,7 @@ class Categorie extends CommonObject
     			return -1;
     		}
         }
-    
+
         return $cats;
 	}
 
@@ -1434,7 +1434,7 @@ class Categorie extends CommonObject
 		$cats = array();
 
 		// For backward compatibility
-		if (is_numeric( $type )) {
+		if (is_numeric($type)) {
 			// We want to reverse lookup
 			$map_type = array_flip( $this->MAP_ID );
 			$type = $map_type[$type];
@@ -1782,8 +1782,8 @@ class Categorie extends CommonObject
 	{
 	    return '';
 	}
-	
-	
+
+
     /**
      *  Initialise an instance with random values.
      *  Used to build previews or test instances.
diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index b68da6fd597..ea4d60e9b5b 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -36,9 +36,8 @@ $langs->load("categories");
 if (! $user->rights->categorie->lire) accessforbidden();
 
 $id=GETPOST('id','int');
-$type=(GETPOST('type') ? GETPOST('type') : Categorie::TYPE_PRODUCT);
+$type=(GETPOST('type','aZ09') ? GETPOST('type','aZ09') : Categorie::TYPE_PRODUCT);
 $catname=GETPOST('catname','alpha');
-$section=(GETPOST('section')?GETPOST('section'):0);
 
 
 /*
@@ -48,14 +47,15 @@ $section=(GETPOST('section')?GETPOST('section'):0);
 $categstatic = new Categorie($db);
 $form = new Form($db);
 
-if ($type == Categorie::TYPE_PRODUCT)       $title=$langs->trans("ProductsCategoriesArea");
-elseif ($type == Categorie::TYPE_SUPPLIER)  $title=$langs->trans("SuppliersCategoriesArea");
-elseif ($type == Categorie::TYPE_CUSTOMER)  $title=$langs->trans("CustomersCategoriesArea");
-elseif ($type == Categorie::TYPE_MEMBER)    $title=$langs->trans("MembersCategoriesArea");
-elseif ($type == Categorie::TYPE_CONTACT)   $title=$langs->trans("ContactsCategoriesArea");
-elseif ($type == Categorie::TYPE_ACCOUNT)   $title=$langs->trans("AccountsCategoriesArea");
-elseif ($type == Categorie::TYPE_PROJECT)   $title=$langs->trans("ProjectsCategoriesArea");
-else                                        $title=$langs->trans("CategoriesArea");
+if ($type == Categorie::TYPE_PRODUCT)       { $title=$langs->trans("ProductsCategoriesArea");  $typetext='product'; }
+elseif ($type == Categorie::TYPE_SUPPLIER)  { $title=$langs->trans("SuppliersCategoriesArea"); $typetext='supplier'; }
+elseif ($type == Categorie::TYPE_CUSTOMER)  { $title=$langs->trans("CustomersCategoriesArea"); $typetext='customer'; }
+elseif ($type == Categorie::TYPE_MEMBER)    { $title=$langs->trans("MembersCategoriesArea");   $typetext='member'; }
+elseif ($type == Categorie::TYPE_CONTACT)   { $title=$langs->trans("ContactsCategoriesArea");  $typetext='contact'; }
+elseif ($type == Categorie::TYPE_ACCOUNT)   { $title=$langs->trans("AccountsCategoriesArea");  $typetext='account'; }
+elseif ($type == Categorie::TYPE_USER)      { $title=$langs->trans("UsersCategoriesArea");     $typetext='user'; }
+elseif ($type == Categorie::TYPE_PROJECT)   { $title=$langs->trans("ProjectsCategoriesArea");  $typetext='project'; }
+else                                        { $title=$langs->trans("CategoriesArea");          $typetext='unknown'; }
 
 $arrayofjs=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.js', '/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js');
 $arrayofcss=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css');
@@ -104,7 +104,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
  */
 if ($catname || $id > 0)
 {
-	$cats = $categstatic->rechercher($id,$catname,$type);
+	$cats = $categstatic->rechercher($id, $catname, $typetext);
 
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("FoundCats").'</td></tr>';
@@ -140,7 +140,7 @@ print '<div class="fichecenter"><br>';
 
 
 // Charge tableau des categories
-$cate_arbo = $categstatic->get_full_arbo($type);
+$cate_arbo = $categstatic->get_full_arbo($typetext);
 
 // Define fulltree array
 $fulltree=$cate_arbo;
diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index 7bb3e8aec49..786c1c0db9d 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -447,7 +447,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("MailTo")), null, 'warnings');
-			dol_syslog('Try to send email with no recipiend defined', LOG_WARNING);
+			dol_syslog('Try to send email with no recipient defined', LOG_WARNING);
 			$action = 'presend';
 		}
 	}
diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php
index 3082b787e15..ccdcfbdbe5a 100644
--- a/htdocs/core/boxes/box_services_contracts.php
+++ b/htdocs/core/boxes/box_services_contracts.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2011 Regis Houssin        <regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,7 +20,7 @@
 /**
  *      \file       htdocs/core/boxes/box_services_contracts.php
  *		\ingroup    produits,services
- *      \brief      Module de generation de l'affichage de la box services_vendus
+ *      \brief      Widget of sells products
  */
 
 include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
@@ -124,7 +124,7 @@ class box_services_contracts extends ModeleBoxes
 					$thirdpartytmp->id = $objp->socid;
 
 					// Multilangs
-					if (! empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
+					if (! empty($conf->global->MAIN_MULTILANGS) && $objp->product_id > 0) // if option multilang is on
 					{
 						$sqld = "SELECT label";
 						$sqld.= " FROM ".MAIN_DB_PREFIX."product_lang";
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index 662e0b262bc..d83f0e80cba 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -255,14 +255,14 @@ class ModeleBoxes    // Can't be abtract as it is instantiated to build "empty"
                     $out.= $s;
                 }
                 $out.= '</td>';
-                
+
                 if (! empty($conf->use_javascript_ajax))
                 {
                     $sublink='';
                     if (! empty($head['sublink']))  $sublink.= '<a href="'.$head['sublink'].'"'.(empty($head['target'])?' target="_blank"':'').'>';
                     if (! empty($head['subpicto'])) $sublink.= img_picto($head['subtext'], $head['subpicto'], 'class="'.(empty($head['subclass'])?'':$head['subclass']).'" id="idsubimg'.$this->boxcode.'"');
                     if (! empty($head['sublink']))  $sublink.= '</a>';
-                    
+
                     $out.= '<td class="nocellnopadd boxclose right nowraponall">';
                     $out.=$sublink;
                     // The image must have the class 'boxhandle' beause it's value used in DOM draggable objects to define the area used to catch the full object
@@ -273,7 +273,7 @@ class ModeleBoxes    // Can't be abtract as it is instantiated to build "empty"
                     $out.= '<input type="hidden" id="boxlabelentry'.$this->box_id.'" value="'.dol_escape_htmltag($label).'">';
                     $out.= '</td></tr></table>';
                 }
-                
+
                 $out.= "</tr>\n";
             }
 
@@ -285,10 +285,8 @@ class ModeleBoxes    // Can't be abtract as it is instantiated to build "empty"
                 {
                     if (isset($contents[$i]))
                     {
-                        
-
                         // TR
-                        if (isset($contents[$i][0]['tr'])) $out.= '<tr valign="top" '.$contents[$i][0]['tr'].'>';
+                        if (isset($contents[$i][0]['tr'])) $out.= '<tr class="tdtop" '.$contents[$i][0]['tr'].'>';
                         else $out.= '<tr class="oddeven">';
 
                         // Loop on each TD

From 474a2692fa6f4a4e6cfdfd3927766fa0f418ad19 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Jun 2017 13:54:03 +0200
Subject: [PATCH 342/438] Fix missing /div

---
 htdocs/core/class/html.formfile.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 44a90794790..6d4d5d38b55 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -690,6 +690,7 @@ class FormFile
             {
                 $headershown=1;
                 $out.= '<div class="titre">'.$titletoshow.'</div>'."\n";
+                $out.= '<div class="div-table-responsive-no-min">';
                 $out.= '<table class="noborder" summary="listofdocumentstable" id="'.$modulepart.'_table" width="100%">'."\n";
             }
 

From 0fd1308f93f56a0589e5db4b47154a4075a4a5d7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Jun 2017 14:06:48 +0200
Subject: [PATCH 343/438] Add force_disable_of_modules_not_found to clean
 database and removed false warning when modules files were removed with
 disabling it before

---
 htdocs/install/repair.php | 99 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 96 insertions(+), 3 deletions(-)

diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index bab7b5e5da4..895d36d72f1 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -62,12 +62,10 @@ if (! is_object($conf)) dolibarr_install_syslog("repair: conf file not initializ
 
 /*
  * View
-*/
+ */
 
 pHeader('',"upgrade2",GETPOST('action','aZ09'));
 
-$actiondone=0;
-
 // Action to launch the repair script
 $actiondone=1;
 
@@ -79,6 +77,7 @@ print 'Option clean_orphelin_dir (0 or \'test\' or \'confirmed\') is '.(GETPOST(
 print 'Option clean_product_stock_batch (0 or \'test\' or \'confirmed\') is '.(GETPOST('clean_product_stock_batch','alpha')?GETPOST('clean_product_stock_batch','alpha'):'0').'<br>'."\n";
 print 'Option set_empty_time_spent_amount (0 or \'test\' or \'confirmed\') is '.(GETPOST('set_empty_time_spent_amount','alpha')?GETPOST('set_empty_time_spent_amount','alpha'):'0').'<br>'."\n";
 print 'Option rebuild_product_thumbs (0 or \'test\' or \'confirmed\') is '.(GETPOST('rebuild_product_thumbs','alpha')?GETPOST('rebuild_product_thumbs','alpha'):'0').'<br>'."\n";
+print 'Option force_disable_of_modules_not_found (0 or \'test\' or \'confirmed\') is '.(GETPOST('force_disable_of_modules_not_found','alpha')?GETPOST('force_disable_of_modules_not_found','alpha'):'0').'<br>'."\n";
 print '<br>';
 
 print '<table cellspacing="0" cellpadding="1" border="0" width="100%">';
@@ -316,6 +315,7 @@ if ($ok)
 
 
 
+
 /* From here, actions need a parameter */
 
 
@@ -795,6 +795,99 @@ if ($ok && GETPOST('set_empty_time_spent_amount','alpha'))
 }
 
 
+// clean_old_module_entries: Clean data into const when files of module were removed without being
+// clean_linked_elements: Check and clean linked elements
+if ($ok && GETPOST('force_disable_of_modules_not_found','alpha'))
+{
+    print '<tr><td colspan="2"><br>*** Force modules not found to be disabled</td></tr>';
+
+    $sql ="SELECT DISTINCT name";
+    $sql.=" FROM ".MAIN_DB_PREFIX."const as c";
+    $sql.=" WHERE name LIKE 'MAIN_MODULE_%_HOOKS'";
+    $sql.=" ORDER BY name";
+
+    $resql = $db->query($sql);
+    if ($resql)
+    {
+        $num = $db->num_rows($resql);
+        if ($num)
+        {
+            $i = 0;
+            while ($i < $num)
+            {
+                $obj=$db->fetch_object($resql);
+                $majname = $obj->name;
+
+                print '<tr><td>';
+                print $majname;
+
+                $db->begin();
+
+                if (preg_match('/MAIN_MODULE_(.*)_HOOKS/i', $majname, $reg))
+                {
+                    $name=strtolower($reg[1]);
+
+                    if ($name)
+                    {
+                        $reloffile=$name.'/class/actions_'.$name.'.class.php';
+                        $result = dol_include_once($reloffile);
+                        if (! $result)
+                        {
+                            print ' - File of hooks ('.$reloffile.') NOT found, we disable the module.';
+                            if (GETPOST('force_disable_of_modules_not_found') == 'confirmed')
+                            {
+                                $sql2 ="DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'MAIN_MODULE_".strtoupper($name)."_HOOKS'";
+                                $resql2=$db->query($sql2);
+                                if (! $resql2)
+                                {
+                                    $error++;
+                                    dol_print_error($db);
+                                }
+                                $sql2 ="DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'MAIN_MODULE_".strtoupper($name)."'";
+                                $resql2=$db->query($sql2);
+                                if (! $resql2)
+                                {
+                                    $error++;
+                                    dol_print_error($db);
+                                }
+                                else
+                                    print " - Cleaned";
+                            }
+                            else
+                            {
+                                print ' - Canceled (test mode)';
+                            }
+                        }
+                        else
+                        {
+                            print ' - File of hooks ('.$reloffile.') found, we do nothing.';
+                        }
+                    }
+
+                    if (!$error) $db->commit();
+                    else $db->rollback();
+                }
+
+                print'</td></tr>';
+
+                if ($error) break;
+
+                $i++;
+            }
+        }
+        else
+        {
+            print '<tr><td>No active module with missing files found</td></tr>';
+        }
+    }
+    else
+    {
+        dol_print_error($db);
+    }
+
+}
+
+
 
 
 print '</table>';

From 1b96bb422128867644618cefcf0c30f55a0f5307 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Jun 2017 14:48:13 +0200
Subject: [PATCH 344/438] Fix usage of constant. No need to have a dedicated
 setup as it should be supported by the responsive design architecture.

---
 htdocs/accountancy/admin/index.php            |  24 ++---
 htdocs/accountancy/admin/productaccount.php   | 100 +++++++++---------
 htdocs/accountancy/customer/lines.php         |  12 +--
 htdocs/accountancy/customer/list.php          |  12 +--
 htdocs/accountancy/expensereport/lines.php    |  34 +++---
 htdocs/accountancy/expensereport/list.php     |  22 ++--
 htdocs/accountancy/supplier/lines.php         |  64 +++++------
 htdocs/accountancy/supplier/list.php          |  16 +--
 .../core/class/html.formaccounting.class.php  |   2 +-
 9 files changed, 143 insertions(+), 143 deletions(-)

diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index 2d6ee046bbc..ead997a5d8c 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -51,8 +51,8 @@ $action = GETPOST('action', 'alpha');
 $list = array (
     'ACCOUNTING_LENGTH_GACCOUNT',
     'ACCOUNTING_LENGTH_AACCOUNT' ,
-    'ACCOUNTING_LENGTH_DESCRIPTION', // adjust size displayed for lines description for dol_trunc
-    'ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT', // adjust size displayed for select account description for dol_trunc
+//    'ACCOUNTING_LENGTH_DESCRIPTION',         // adjust size displayed for lines description for dol_trunc
+//    'ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT', // adjust size displayed for select account description for dol_trunc
 );
 
 
@@ -65,28 +65,28 @@ $accounting_mode = defined('ACCOUNTING_MODE') ? ACCOUNTING_MODE : 'RECETTES-DEPE
 
 if ($action == 'update') {
 	$error = 0;
-	
+
 	$accounting_modes = array (
 			'RECETTES-DEPENSES',
-			'CREANCES-DETTES' 
+			'CREANCES-DETTES'
 	);
-	
+
 	$accounting_mode = GETPOST('accounting_mode', 'alpha');
-	
+
 	if (in_array($accounting_mode, $accounting_modes)) {
-		
+
 		if (! dolibarr_set_const($db, 'ACCOUNTING_MODE', $accounting_mode, 'chaine', 0, '', $conf->entity)) {
 			$error ++;
 		}
 	} else {
 		$error ++;
 	}
-	
+
 	if ($error) {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 
-    foreach ($list as $constname) 
+    foreach ($list as $constname)
     {
         $constvalue = GETPOST($constname, 'alpha');
 
@@ -267,10 +267,10 @@ if (! empty($user->admin))
 
 
 // Param a user $user->rights->accountancy->chartofaccount can access
-foreach ($list as $key) 
+foreach ($list as $key)
 {
     print '<tr class="oddeven value">';
-    
+
     if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO) && ($key == 'ACCOUNTING_LENGTH_GACCOUNT' || $key == 'ACCOUNTING_LENGTH_AACCOUNT')) continue;
 
     // Param
@@ -280,7 +280,7 @@ foreach ($list as $key)
     print '<td align="right">';
     print '<input type="text" class="maxwidth100" id="' . $key . '" name="' . $key . '" value="' . $conf->global->$key . '">';
     print '</td>';
-    
+
     print '</tr>';
 }
 
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index 5b614061dbc..311aab692ff 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -111,16 +111,16 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
 if ($action == 'update') {
 	if (! empty($btn_changetype)) {
 		$error = 0;
-		
+
 		$accounting_product_modes = array (
 				'ACCOUNTANCY_SELL',
-				'ACCOUNTANCY_BUY' 
+				'ACCOUNTANCY_BUY'
 		);
-		
+
 		$accounting_product_mode = GETPOST('accounting_product_mode', 'alpha');
-		
+
 		if (in_array($accounting_product_mode, $accounting_product_modes)) {
-			
+
 			if (! dolibarr_set_const($db, 'ACCOUNTING_PRODUCT_MODE', $accounting_product_mode, 'chaine', 0, '', $conf->entity)) {
 				$error ++;
 			}
@@ -128,26 +128,26 @@ if ($action == 'update') {
 			$error ++;
 		}
 	}
-	
+
 	if (! empty($btn_changeaccount)) {
 		//$msg = '<div><span class="accountingprocessing">' . $langs->trans("Processing") . '...</span></div>';
 		if (! empty($chk_prod)) {
-			
+
 			$accounting = new AccountingAccount($db);
-			
+
 			//$msg .= '<div><span  class="accountingprocessing">' . count($chk_prod) . ' ' . $langs->trans("SelectedLines") . '</span></div>';
-			
+
 			$cpt = 0; $ok = 0; $ko = 0;
 			foreach ( $chk_prod as $productid ) {
-				
+
 				$accounting_account_id = GETPOST('codeventil_' . $productid);
-				
+
 				$result = $accounting->fetch($accounting_account_id, null, 1);
 				if ($result < 0) {
 					// setEventMessages(null, $accounting->errors, 'errors');
 					$msg .= '<div><font color="red">' . $langs->trans("ErrorDB") . ' : ' . $langs->trans("Product") . ' ' . $productid . ' ' . $langs->trans("NotVentilatedinAccount") . ' : id=' . $accounting_account_id . '<br/> <pre>' . $sql . '</pre></font></div>';
 				} else {
-					
+
 					$sql = " UPDATE " . MAIN_DB_PREFIX . "product";
 					if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
 						$sql .= " SET accountancy_code_buy = " . $accounting->account_number;
@@ -156,7 +156,7 @@ if ($action == 'update') {
 						$sql .= " SET accountancy_code_sell = " . $accounting->account_number;
 					}
 					$sql .= " WHERE rowid = " . $productid;
-					
+
 					dol_syslog("/accountancy/admin/productaccount.php sql=" . $sql, LOG_DEBUG);
 					if ($db->query($sql)) {
 					    $ok++;
@@ -166,7 +166,7 @@ if ($action == 'update') {
 						//$msg .= '<div><font color="red">' . $langs->trans("ErrorDB") . ' : ' . $langs->trans("Product") . ' ' . $productid . ' ' . $langs->trans("NotVentilatedinAccount") . ' : ' . length_accountg($accounting->account_number) . '<br/> <pre>' . $sql . '</pre></font></div>';
 					}
 				}
-				
+
 				$cpt ++;
 			}
 		} else {
@@ -258,11 +258,11 @@ $sql .= $db->plimit($limit + 1, $offset);
 
 dol_syslog("/accountancy/admin/productaccount.php:: sql=" . $sql, LOG_DEBUG);
 $result = $db->query($sql);
-if ($result) 
+if ($result)
 {
 	$num = $db->num_rows($result);
 	$i = 0;
-	
+
     $param='';
     if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
     if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
@@ -271,7 +271,7 @@ if ($result)
     if ($search_desc > 0) $param.="&search_desc=".urlencode($search_desc);
     if ($search_current_account > 0) $param.="&search_current_account=".urlencode($search_current_account);
     if ($search_current_account_valid && $search_current_account_valid != '-1') $param.="&search_current_account_valid=".urlencode($search_current_account_valid);
-    
+
     print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">';
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -280,14 +280,14 @@ if ($result)
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
     print '<input type="hidden" name="page" value="'.$page.'">';
-    
+
     print load_fiche_titre($langs->trans("ProductsBinding"), '', 'title_accountancy');
 	print '<br>';
-	
+
 	print $langs->trans("InitAccountancyDesc") . '<br>';
 	print '<br>';
-	
-    // Select mode	
+
+    // Select mode
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
 	print '<td>' . $langs->trans('Options') . '</td><td>' . $langs->trans('Description') . '</td>';
@@ -298,20 +298,20 @@ if ($result)
 	print '<tr ' . $bc[true] . '><td class="titlefield"><input type="radio" name="accounting_product_mode" value="ACCOUNTANCY_BUY"' . ($accounting_product_mode == 'ACCOUNTANCY_BUY' ? ' checked' : '') . '> ' . $langs->trans('OptionModeProductBuy') . '</td>';
 	print '<td>'.$langs->trans('OptionModeProductBuyDesc')."</td></tr>\n";
 	print "</table>\n";
-	
+
 	print '<div align="center"><input type="submit" class="button" value="' . $langs->trans('Refresh') . '" name="changetype"></div>';
-	
+
 	print "<br>\n";
 
-	
+
 	// Filter on categories
 	$moreforfilter='';
 	$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
 	$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-	
+
 	$texte=$langs->trans("ListOfProductsServices");
 	print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, '', '', $limit);
-	
+
 	print '<table class="liste '.($moreforfilter?"listwithfilterbefore":"").'">';
 
 	print '<tr class="liste_titre_filter">';
@@ -334,7 +334,7 @@ if ($result)
 	print $searchpicto;
 	print '</td>';
 	print '</tr>';
-	
+
 	print '<tr class="liste_titre">';
 	print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Label"), $_SERVER["PHP_SELF"], "p.label", "", $param, '', $sortfield, $sortorder);
@@ -350,9 +350,9 @@ if ($result)
 	$clickpitco=$form->showCheckAddButtons('checkforselect', 1);
 	print_liste_field_titre($clickpitco, '', '', '', '', 'align="center"');
 	print '</tr>';
-	
+
 	$product_static = new Product($db);
-	
+
 	$var = true;
 	$i=0;
     while ($i < min($num,$limit))
@@ -367,7 +367,7 @@ if ($result)
 		$product_static->description = $obj->description;
 		$product_static->status = $obj->tosell;
 		$product_static->status_buy = $obj->tobuy;
-		
+
 		if ($obj->product_type == 0) {
 			$compta_prodsell = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
 			$compta_prodsell_id = $aarowid_prodsell;
@@ -375,7 +375,7 @@ if ($result)
 			$compta_prodsell = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
 			$compta_prodsell_id = $aarowid_servsell;
 		}
-		
+
 		if ($obj->product_type == 0) {
 			$compta_prodbuy = (! empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
 			$compta_prodbuy_id = $aarowid_prodbuy;
@@ -383,41 +383,41 @@ if ($result)
 			$compta_prodbuy = (! empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
 			$compta_prodbuy_id = $aarowid_servbuy;
 		}
-		
+
 		print '<tr class="oddeven">';
-		
+
 		print '<td>';
 		print $product_static->getNomUrl(1);
 		print '</td>';
-		
+
 		print '<td align="left">'.$obj->label.'</td>';
-		
-		if (! empty($conf->global->ACCOUNTANCY_SHOW_PROD_DESC)) 
+
+		if (! empty($conf->global->ACCOUNTANCY_SHOW_PROD_DESC))
 		{
 		    // TODO ADJUST DESCRIPTION SIZE
     		// print '<td align="left">' . $obj->description . '</td>';
     		// TODO: we shoul set a user defined value to adjust user square / wide screen size
-    		$trunclengh = defined('ACCOUNTING_LENGTH_DESCRIPTION') ? ACCOUNTING_LENGTH_DESCRIPTION : 64;
+    		$trunclengh = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION) ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
     		print '<td style="' . $code_sell_p_l_differ . '">' . nl2br(dol_trunc($obj->description, $trunclengh)) . '</td>';
 		}
-		
+
 		print '<td align="center">'.$product_static->getLibStatut(3, 0).'</td>';
-		
+
 		print '<td align="center">'.$product_static->getLibStatut(3, 1).'</td>';
-		
+
 		// Current accounting account
 		print '<td align="left">';
 		if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
 		    print length_accountg($obj->accountancy_code_buy);
-		    if ($obj->accountancy_code_buy && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount")); 
+		    if ($obj->accountancy_code_buy && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
 		}
 		else
 		{
 		    print length_accountg($obj->accountancy_code_sell);
-		    if ($obj->accountancy_code_sell && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount")); 
+		    if ($obj->accountancy_code_sell && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
 		}
 		print '</td>';
-		
+
 		// Dedicated account
 		$defaultvalue='';
 		if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
@@ -440,7 +440,7 @@ if ($result)
 			print $form->select_account($defaultvalue, 'codeventil_' . $product_static->id, 1, array(), 1);
 			print '</td>';
 		}
-		
+
 		// Checkbox select
 		print '<td align="center">';
 		print '<input type="checkbox" class="checkforselect" name="chk_prod[]" value="' . $obj->rowid . '"/></td>';
@@ -448,7 +448,7 @@ if ($result)
 		$i ++;
 	}
 	print '</table>';
-	
+
 	// Example : Adding jquery code
 	print '<script type="text/javascript" language="javascript">
         jQuery(document).ready(function() {
@@ -461,7 +461,7 @@ if ($result)
 	  				/* console.log( index + ": " + $( this ).text() ); */
 	  				if ($(this).is(\':checked\')) atleastoneselected++;
 	  			});
-	    
+
 	            if (atleastoneselected) jQuery("#changeaccount").removeAttr(\'disabled\');
 	            else jQuery("#changeaccount").attr(\'disabled\',\'disabled\');
 	            if (atleastoneselected) jQuery("#changeaccount").attr(\'class\',\'butAction\');
@@ -474,12 +474,12 @@ if ($result)
         	init_savebutton();
         });
         </script>';
-	
-	
+
+
 	print '<br><div align="center"><input type="submit" class="butAction" id="changeaccount" name="changeaccount" value="' . $langs->trans("Save") . '"></div>';
-	
+
 	print '</form>';
-	
+
 	$db->free($result);
 } else {
 	dol_print_error($db);
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index b5778ce86f2..d6d006c6556 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -121,7 +121,7 @@ if (is_array($changeaccount) && count($changeaccount) > 0) {
 		$db->rollback();
 		setEventMessages($db->lasterror(), null, 'errors');
 	}
-	
+
 	$account_parent = '';   // Protection to avoid to mass apply it a second time
 }
 
@@ -240,7 +240,7 @@ if ($result) {
 	if ($search_tvaintra)
 		$param .= "&search_tvaintra=" . $search_tvaintra;
 
-	
+
 	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">' . "\n";
 	print '<input type="hidden" name="action" value="ventil">';
 	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -249,7 +249,7 @@ if ($result) {
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
-	
+
 	print_barre_liste($langs->trans("InvoiceLinesDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 	print $langs->trans("DescVentilDoneCustomer") . '<br>';
 
@@ -317,7 +317,7 @@ if ($result) {
 		print '<td>' . $facture_static->getNomUrl(1) . '</td>';
 
 		print '<td align="center">' . dol_print_date($db->jdate($objp->datef), 'day') . '</td>';
-		
+
 		// Ref Product
 		print '<td>';
 		if ($product_static->id)
@@ -327,7 +327,7 @@ if ($result) {
 
 		print '<td>';
 		$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->description));
-		$trunclength = defined('ACCOUNTING_LENGTH_DESCRIPTION') ? ACCOUNTING_LENGTH_DESCRIPTION : 32;
+		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION) ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
 		print $form->textwithtooltip(dol_trunc($text,$trunclength), $objp->description);
 		print '</td>';
 
@@ -355,7 +355,7 @@ if ($result) {
     if ($nbtotalofrecords > $limit) {
         print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, '', 0, '', '', $limit, 1);
     }
-    
+
     print '</form>';
 } else {
 	print $db->lasterror();
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 85a97fb3a1e..75c1a59aa30 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -144,10 +144,10 @@ if ($massaction == 'ventil') {
                 $sql = " UPDATE " . MAIN_DB_PREFIX . "facturedet";
                 $sql .= " SET fk_code_ventilation = " . $monCompte;
                 $sql .= " WHERE rowid = " . $monId;
-    
+
                 $accountventilated = new AccountingAccount($db);
                 $accountventilated->fetch($monCompte, '');
-    
+
                 dol_syslog("/accountancy/customer/list.php sql=" . $sql, LOG_DEBUG);
                 if ($db->query($sql)) {
                     $msg.= '<div><font color="green">' . $langs->trans("Lineofinvoice") . ' ' . $monId . ' - ' . $langs->trans("VentilatedinAccount") . ' : ' . length_accountg($accountventilated->account_number) . '</font></div>';
@@ -157,7 +157,7 @@ if ($massaction == 'ventil') {
                     $ko++;
                 }
             }
-            
+
             $cpt++;
         }
         $msg.='</div>';
@@ -375,10 +375,10 @@ if ($result) {
 
 		print '<td class="tdoverflowonsmartphone">';
 		$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->description));
-		$trunclength = defined('ACCOUNTING_LENGTH_DESCRIPTION') ? ACCOUNTING_LENGTH_DESCRIPTION : 32;
+		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION) ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
 		print $form->textwithtooltip(dol_trunc($text,$trunclength), $objp->description);
 		print '</td>';
-		
+
 		print '<td align="right">';
 		print price($objp->total_ht);
 		print '</td>';
@@ -404,7 +404,7 @@ if ($result) {
 		print '<td align="center">';
 		print $formaccounting->select_account($objp->aarowid_suggest, 'codeventil'.$objp->rowid, 1, array(), 0, 0, 'maxwidth300 maxwidthonsmartphone', 'cachewithshowemptyone');
 		print '</td>';
-		
+
 		print '<td align="center">';
 		print '<input type="checkbox" class="flat checkforselect" name="toselect[]"  value="' . $objp->rowid . "_" . $i . '"' . ($objp->aarowid ? "checked" : "") . '/>';
 		print '</td>';
diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
index 5a386c82522..2237f578069 100644
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -1,10 +1,10 @@
 <?php
 /* Copyright (C) 2013-2016	Olivier Geffroy		<jeff@jeffinfo.com>
  * Copyright (C) 2013-2017	Alexandre Spangaro	<aspangaro@zendsi.com>
- * Copyright (C) 2014-2015	Ari Elbaz (elarifr)	<github@accedinfo.com>  
+ * Copyright (C) 2014-2015	Ari Elbaz (elarifr)	<github@accedinfo.com>
  * Copyright (C) 2013-2016	Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2014		Juanjo Menent		<jmenent@2byte.es>
- *   
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
@@ -94,13 +94,13 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
 
 if (is_array($changeaccount) && count($changeaccount) > 0) {
 	$error = 0;
-	
+
 	$db->begin();
-	
+
 	$sql1 = "UPDATE " . MAIN_DB_PREFIX . "expensereport_det as erd";
 	$sql1 .= " SET erd.fk_code_ventilation=" . GETPOST('account_parent');
 	$sql1 .= ' WHERE erd.rowid IN (' . implode(',', $changeaccount) . ')';
-	
+
 	dol_syslog('accountancy/expensereport/lines.php::changeaccount sql= ' . $sql1);
 	$resql1 = $db->query($sql1);
 	if (! $resql1) {
@@ -193,7 +193,7 @@ $result = $db->query($sql);
 if ($result) {
 	$num_lines = $db->num_rows($result);
 	$i = 0;
-	
+
 	$param='';
 	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
@@ -210,8 +210,8 @@ if ($result) {
 	if ($search_country)
 		$param .= "&search_country=" . $search_country;
 	if ($search_tvaintra)
-		$param .= "&search_tvaintra=" . $search_tvaintra;	
-	
+		$param .= "&search_tvaintra=" . $search_tvaintra;
+
 	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">' . "\n";
 	print '<input type="hidden" name="action" value="ventil">';
 	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -220,7 +220,7 @@ if ($result) {
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
-	
+
 	print_barre_liste($langs->trans("ExpenseReportLinesDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 
 	print $langs->trans("DescVentilDoneExpenseReport") . '<br>';
@@ -273,7 +273,7 @@ if ($result) {
 
 		$expensereport_static->ref = $objp->ref;
 		$expensereport_static->id = $objp->erid;
-		
+
 		print '<tr class="oddeven">';
 
 		print '<td>' . $objp->rowid . '</td>';
@@ -282,12 +282,12 @@ if ($result) {
 		print '<td>' . $expensereport_static->getNomUrl(1) . '</td>';
 
 		print '<td align="center">' . dol_print_date($db->jdate($objp->date), 'day') . '</td>';
-		
+
 		print '<td class="tdoverflow">' . ($langs->trans($objp->type_fees_code) == $objp->type_fees_code ? $objp->type_fees_label : $langs->trans(($objp->type_fees_code))) . '</td>';
 
 		print '<td>';
 		$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->comments));
-		$trunclength = defined('ACCOUNTING_LENGTH_DESCRIPTION') ? ACCOUNTING_LENGTH_DESCRIPTION : 32;
+		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION) ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
 		print $form->textwithtooltip(dol_trunc($text,$trunclength), $objp->comments);
 		print '</td>';
 
@@ -300,20 +300,20 @@ if ($result) {
 		print '<td align="left"><a href="./card.php?id=' . $objp->rowid . '">';
 		print img_edit();
 		print '</a></td>';
-		
+
 		print '<td class="center"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="' . $objp->rowid . '"/></td>';
-		
+
 		print "</tr>";
 		$i ++;
 	}
-	
+
 	print "</table>";
 	print "</div>";
-	
+
 	if ($nbtotalofrecords > $limit) {
 	    print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, '', 0, '', '', $limit, 1);
 	}
-	
+
 	print '</form>';
 } else {
 	print $db->error();
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index 7fb5f26b28b..8e7b9c60c92 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -139,10 +139,10 @@ if ($massaction == 'ventil') {
                 $sql = " UPDATE " . MAIN_DB_PREFIX . "expensereport_det";
                 $sql .= " SET fk_code_ventilation = " . $monCompte;
                 $sql .= " WHERE rowid = " . $monId;
-    
+
                 $accountventilated = new AccountingAccount($db);
                 $accountventilated->fetch($monCompte, '');
-    
+
                 dol_syslog('accountancy/expensereport/list.php:: sql=' . $sql, LOG_DEBUG);
                 if ($db->query($sql)) {
                     $msg.= '<div><font color="green">' . $langs->trans("LineOfExpenseReport") . ' ' . $monId . ' - ' . $langs->trans("VentilatedinAccount") . ' : ' . length_accountg($accountventilated->account_number) . '</font></div>';
@@ -152,7 +152,7 @@ if ($massaction == 'ventil') {
                     $ko++;
                 }
             }
-            
+
             $cpt++;
         }
         $msg.='</div>';
@@ -224,7 +224,7 @@ if ($result) {
 	$i = 0;
 
 	$arrayofselected=is_array($toselect)?$toselect:array();
-	
+
 	$param='';
 	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
@@ -237,8 +237,8 @@ if ($result) {
 	//if ($user->rights->mymodule->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
 	//if ($massaction == 'presend') $arrayofmassactions=array();
 	$massactionbutton=$form->selectMassAction('ventil', $arrayofmassactions, 1);
-	
-	
+
+
 	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">' . "\n";
 	print '<input type="hidden" name="action" value="ventil">';
 	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -247,7 +247,7 @@ if ($result) {
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
-	
+
 	print_barre_liste($langs->trans("ExpenseReportLines"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 
 	print $langs->trans("DescVentilTodoExpenseReport") . '</br><br>';
@@ -290,8 +290,8 @@ if ($result) {
 	if ($massactionbutton) $checkpicto=$form->showCheckAddButtons('checkforselect', 1);
 	print_liste_field_titre($checkpicto, '', '', '', '', 'align="center"');
 	print "</tr>\n";
-	
-	
+
+
 	$expensereport_static = new ExpenseReport($db);
 	$form = new Form($db);
 
@@ -323,7 +323,7 @@ if ($result) {
 		// Fees description -- Can be null
 		print '<td>';
 		$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->comments));
-		$trunclength = defined('ACCOUNTING_LENGTH_DESCRIPTION') ? ACCOUNTING_LENGTH_DESCRIPTION : 32;
+		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION) ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
 		print $form->textwithtooltip(dol_trunc($text,$trunclength), $objp->comments);
 		print '</td>';
 
@@ -356,7 +356,7 @@ if ($result) {
 
 	print '</table>';
 	print "</div>";
-	
+
 	print '</form>';
 } else {
 	print $db->error();
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index dc6b5e7ec20..9c7a72cb94c 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -1,10 +1,10 @@
 <?php
 /* Copyright (C) 2013-2016 Olivier Geffroy		<jeff@jeffinfo.com>
  * Copyright (C) 2013-2017 Alexandre Spangaro	<aspangaro@zendsi.com>
- * Copyright (C) 2014-2015 Ari Elbaz (elarifr)	<github@accedinfo.com>  
+ * Copyright (C) 2014-2015 Ari Elbaz (elarifr)	<github@accedinfo.com>
  * Copyright (C) 2013-2016 Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2014      Juanjo Menent		<jmenent@2byte.es>
- *   
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
@@ -98,13 +98,13 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
 
 if (is_array($changeaccount) && count($changeaccount) > 0) {
 	$error = 0;
-	
+
 	$db->begin();
-	
+
 	$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det as l";
 	$sql1 .= " SET l.fk_code_ventilation=" . GETPOST('account_parent');
 	$sql1 .= ' WHERE l.rowid IN (' . implode(',', $changeaccount) . ')';
-	
+
 	dol_syslog('accountancy/supplier/lines.php::changeaccount sql= ' . $sql1);
 	$resql1 = $db->query($sql1);
 	if (! $resql1) {
@@ -202,7 +202,7 @@ $result = $db->query($sql);
 if ($result) {
 	$num_lines = $db->num_rows($result);
 	$i = 0;
-	
+
 	$param='';
 	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
@@ -221,8 +221,8 @@ if ($result) {
 	if ($search_country)
 		$param .= "&search_country=" . $search_country;
 	if ($search_tvaintra)
-		$param .= "&search_tvaintra=" . $search_tvaintra;	
-	
+		$param .= "&search_tvaintra=" . $search_tvaintra;
+
 	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">' . "\n";
 	print '<input type="hidden" name="action" value="ventil">';
 	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -231,20 +231,20 @@ if ($result) {
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
-	
+
 	print_barre_liste($langs->trans("InvoiceLinesDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
-	
+
 	print $langs->trans("DescVentilDoneSupplier") . '<br>';
-	
+
 	print '<br><div class="inline-block divButAction">' . $langs->trans("ChangeAccount") . '<br>';
 	print $formaccounting->select_account(GETPOST('account_parent'), 'account_parent', 1);
 	print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("ChangeBinding") . '" /></div>';
-	
+
 	$moreforfilter = '';
-	
+
     print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-	
+
 	print '<tr class="liste_titre_filter">';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_lineid" value="' . dol_escape_htmltag($search_lineid) . '""></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="' . dol_escape_htmltag($search_invoice) . '"></td>';
@@ -261,7 +261,7 @@ if ($result) {
     print $searchpicto;
     print '</td>';
 	print "</tr>\n";
-	
+
 	print '<tr class="liste_titre">';
 	print_liste_field_titre($langs->trans("LineId"), $_SERVER["PHP_SELF"], "l.rowid", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Invoice"), $_SERVER["PHP_SELF"], "f.ref", "", $param, '', $sortfield, $sortorder);
@@ -276,68 +276,68 @@ if ($result) {
     $checkpicto=$form->showCheckAddButtons();
 	print_liste_field_titre($checkpicto, '', '', '', '', 'align="center"');
 	print "</tr>\n";
-	
+
 	$facturefournisseur_static = new FactureFournisseur($db);
 	$product_static = new Product($db);
-	
+
 	while ($i < min($num_lines, $limit)) {
 		$objp = $db->fetch_object($result);
 
 		$codecompta = length_accountg($objp->account_number) . ' - ' . $objp->label;
-		
+
 		$facturefournisseur_static->ref = $objp->facnumber;
 		$facturefournisseur_static->id = $objp->facid;
-		
+
 		$product_static->ref = $objp->product_ref;
 		$product_static->id = $objp->product_id;
 		$product_static->type = $objp->type;
 		$product_static->label = $objp->product_label;
-		
+
 		print '<tr class="oddeven">';
-		
+
 		print '<td>' . $objp->rowid . '</td>';
-		
+
 		// Ref Invoice
 		print '<td>' . $facturefournisseur_static->getNomUrl(1) . '</td>';
-		
+
 		print '<td>';
 		print $objp->invoice_label;
 		print '</td>';
-		
+
 		print '<td align="center">' . dol_print_date($db->jdate($objp->datef), 'day') . '</td>';
-		
+
 		// Ref Product
 		print '<td>';
 		if ($product_static->id)
 			print $product_static->getNomUrl(1);
 	    if ($objp->product_label) print '<br>'.$objp->product_label;
 		print '</td>';
-		
+
 		print '<td>';
 		$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->description));
-		$trunclength = defined('ACCOUNTING_LENGTH_DESCRIPTION') ? ACCOUNTING_LENGTH_DESCRIPTION : 32;
+		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION) ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
 		print $form->textwithtooltip(dol_trunc($text,$trunclength), $objp->description);
 		print '</td>';
-		
+
 		print '<td align="right">' . price($objp->total_ht) . '</td>';
 		print '<td align="center">' . price($objp->tva_tx) . '</td>';
 		print '<td align="left">';
 		print $codecompta . ' <a href="./card.php?id=' . $objp->rowid . '">';
 		print img_edit();
 		print '</a></td>';
-		
+
 		print '<td class="center"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="' . $objp->rowid . '"/></td>';
-		
+
 		print "</tr>";
 		$i ++;
 	}
     print "</table>";
     print "</div>";
-    
+
     if ($nbtotalofrecords > $limit) {
         print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, '', 0, '', '', $limit, 1);
     }
-    
+
     print '</form>';
 } else {
 	print $db->error();
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 93aeb1746f5..ff39aad67f4 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -104,7 +104,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
 {
     $search_lineid = '';
     $search_ref = '';
-    $search_invoice = '';    
+    $search_invoice = '';
     $search_label = '';
     $search_desc = '';
     $search_amount = '';
@@ -146,10 +146,10 @@ if ($massaction == 'ventil') {
                 $sql = " UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det";
                 $sql .= " SET fk_code_ventilation = " . $monCompte;
                 $sql .= " WHERE rowid = " . $monId;
-    
+
                 $accountventilated = new AccountingAccount($db);
                 $accountventilated->fetch($monCompte, '');
-    
+
                 dol_syslog('accountancy/supplier/list.php:: sql=' . $sql, LOG_DEBUG);
                 if ($db->query($sql)) {
                     $msg.= '<div><font color="green">' . $langs->trans("Lineofinvoice") . ' ' . $monId . ' - ' . $langs->trans("VentilatedinAccount") . ' : ' . length_accountg($accountventilated->account_number) . '</font></div>';
@@ -159,7 +159,7 @@ if ($massaction == 'ventil') {
                     $ko++;
                 }
             }
-            
+
             $cpt++;
         }
         $msg.='</div>';
@@ -332,7 +332,7 @@ if ($result) {
 		$facturefourn_static->ref = $objp->ref;
 		$facturefourn_static->id = $objp->facid;
 		$facturefourn_static->type = $objp->type;
-		
+
 		$code_buy_p_notset = '';
 		$objp->aarowid_suggest = $objp->aarowid;
 
@@ -356,7 +356,7 @@ if ($result) {
 
 		// $objp->code_buy_p is now code of product/service
 		// $objp->code_buy_l is now default code of product/service
-					
+
 		print '<tr class="oddeven">';
 
 		// Line id
@@ -381,7 +381,7 @@ if ($result) {
         // Description
 		print '<td>';
 		$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->description));
-		$trunclength = defined('ACCOUNTING_LENGTH_DESCRIPTION') ? ACCOUNTING_LENGTH_DESCRIPTION : 32;
+		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION) ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
 		print $form->textwithtooltip(dol_trunc($text,$trunclength), $objp->description);
 		print '</td>';
 
@@ -422,7 +422,7 @@ if ($result) {
 
 	print '</table>';
 	print "</div>";
-	
+
 	print '</form>';
 } else {
 	print $db->error();
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index 8a348dba57a..e3e6e9a4f20 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -266,7 +266,7 @@ class FormAccounting extends Form
 		}
 		else
 		{
-    		$trunclength = defined('ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT') ? $conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT : 50;
+    		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT) ? 50 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT;
 
     		$sql = "SELECT DISTINCT aa.account_number, aa.label, aa.rowid, aa.fk_pcg_version";
     		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";

From 5ed8340d0e5ebfc6655298daf13e73e5dd685cf1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Jun 2017 15:22:44 +0200
Subject: [PATCH 345/438] Fix no record found into lists

---
 htdocs/expensereport/list.php                   |  5 ++++-
 htdocs/holiday/list.php                         | 13 +++++++------
 htdocs/modulebuilder/template/myobject_list.php |  9 +++++++++
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index d2c5db3426d..34f1cfebf38 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -684,7 +684,10 @@ if ($resql)
 	}
 	else
 	{
-		print '<tr '.$bc[false].'>'.'<td colspan="9" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
+	    $colspan=1;
+        foreach($arrayfields as $key => $val) { if (! empty($val['checked'])) $colspan++; }
+
+        print '<tr>'.'<td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 	}
 
 	// Show total line
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 2b917927067..925a210cb00 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -194,7 +194,7 @@ if (!empty($sall))
 
 if (empty($user->rights->holiday->read_all)) $filter.=' AND cp.fk_user IN ('.join(',',$childids).')';
 
-if ($type) $filter.=' AND cp.fk_type IN ('.$type.')';
+if ($type > 0) $filter.=' AND cp.fk_type IN ('.$db->escape($type).')';
 
 // Récupération de l'ID de l'utilisateur
 $user_id = $user->id;
@@ -206,17 +206,18 @@ if ($id > 0)
 	$fuser->getrights();
 	$user_id = $fuser->id;
 }
+
 // Récupération des congés payés de l'utilisateur ou de tous les users
 if (empty($user->rights->holiday->read_all) || $id > 0)
 {
-	$holiday_payes = $holiday->fetchByUser($user_id,$order,$filter);	// Load array $holiday->holiday
+	$result = $holiday->fetchByUser($user_id,$order,$filter);	// Load array $holiday->holiday
 }
 else
 {
-    $holiday_payes = $holiday->fetchAll($order,$filter);	// Load array $holiday->holiday
+    $result = $holiday->fetchAll($order,$filter);	// Load array $holiday->holiday
 }
 // Si erreur SQL
-if ($holiday_payes == '-1')
+if ($result == '-1')
 {
     print load_fiche_titre($langs->trans('CPTitreMenu'), '', 'title_hrm.png');
 
@@ -446,9 +447,9 @@ if (! empty($holiday->holiday))
 }
 
 // Si il n'y a pas d'enregistrement suite à une recherche
-if($holiday_payes == '2')
+if ($result == '2')
 {
-    print '<tr '.$bc[false].'>';
+    print '<tr>';
     print '<td colspan="10" class="opacitymedium">'.$langs->trans('NoRecordFound').'</td>';
     print '</tr>';
 }
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index ef3cb110224..57958bb25b8 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -535,6 +535,15 @@ if (isset($totalarray['totalhtfield']))
     print '</tr>';
 }
 
+// If no record found
+if ($num == 0)
+{
+    $colspan=1;
+    foreach($arrayfields as $key => $val) { if (! empty($val['checked'])) $colspan++; }
+    print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
+}
+
+
 $db->free($resql);
 
 $parameters=array('arrayfields'=>$arrayfields, 'sql'=>$sql);

From c89e2eb7ea8a34b9fc9b4fcc12c6c62174c2ffaf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Jun 2017 15:31:07 +0200
Subject: [PATCH 346/438] Fix pagination

---
 htdocs/holiday/list.php | 49 ++++++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 925a210cb00..5706307a16c 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -233,6 +233,20 @@ $num = count($holiday->holiday);
 $form = new Form($db);
 $formother = new FormOther($db);
 
+$param='';
+if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
+if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+if ($optioncss != '') $param.='&optioncss='.$optioncss;
+
+print '<form method="get" action="'.$_SERVER["PHP_SELF"].'">'."\n";
+if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="list">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
+if ($id > 0) print '<input type="hidden" name="id" value="'.$id.'">';
+
 if ($id > 0)
 {
 	$title = $langs->trans("User");
@@ -243,11 +257,9 @@ if ($id > 0)
 
     dol_banner_tab($fuser,'id',$linkback,$user->rights->user->user->lire || $user->admin);
 
-
     print '<div class="underbanner clearboth"></div>';
 
     print '<br>';
-
 }
 else
 {
@@ -274,17 +286,7 @@ print $out;
 dol_fiche_end();
 
 
-if ($id > 0) print '</br>';
-
-
-print '<form method="get" action="'.$_SERVER["PHP_SELF"].'">'."\n";
-if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="list">';
-print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-print '<input type="hidden" name="page" value="'.$page.'">';
-if ($id > 0) print '<input type="hidden" name="id" value="'.$id.'">';
+if ($id > 0) print '<br>';
 
 if ($sall)
 {
@@ -382,16 +384,16 @@ print '</td>';
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
-print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"cp.rowid","",'','',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("DateCreateCP"),$_SERVER["PHP_SELF"],"cp.date_create","",'','align="center"',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("Employee"),$_SERVER["PHP_SELF"],"cp.fk_user","",'','',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("ValidatorCP"),$_SERVER["PHP_SELF"],"cp.fk_validator","",'','',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],'','','','',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("Duration"),$_SERVER["PHP_SELF"],'','','','align="right"',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("DateDebCP"),$_SERVER["PHP_SELF"],"cp.date_debut","",'','align="center"',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("DateFinCP"),$_SERVER["PHP_SELF"],"cp.date_fin","",'','align="center"',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"cp.statut","",'','align="right"',$sortfield,$sortorder);
-print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
+print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"cp.rowid","",$param,'',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("DateCreateCP"),$_SERVER["PHP_SELF"],"cp.date_create","",$param,'align="center"',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("Employee"),$_SERVER["PHP_SELF"],"cp.fk_user","",$param,'',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("ValidatorCP"),$_SERVER["PHP_SELF"],"cp.fk_validator","",$param,'',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],'','',$param,'',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("Duration"),$_SERVER["PHP_SELF"],'','',$pram,'align="right"',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("DateDebCP"),$_SERVER["PHP_SELF"],"cp.date_debut","",$param,'align="center"',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("DateFinCP"),$_SERVER["PHP_SELF"],"cp.date_fin","",$param,'align="center"',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"cp.statut","",$param,'align="right"',$sortfield,$sortorder);
+print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'',$param,'',$sortfield,$sortorder,'maxwidthsearch ');
 print "</tr>\n";
 
 // Lines
@@ -456,6 +458,7 @@ if ($result == '2')
 
 print '</table>';
 print '</div>';
+
 print '</form>';
 
 /*if ($user_id == $user->id)

From 3a400c46adeb32582c99c4b8b986bd90ade33d90 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 23 Jun 2017 10:15:32 +0200
Subject: [PATCH 347/438] Fix preselected email not done

---
 htdocs/core/class/html.formmail.class.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index d59ac6c25af..d6089ebdb54 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -528,7 +528,12 @@ class FormMail extends Form
         				{
         				    $tmparray[$key]=dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
         				}
-        				$out.= $form->multiselectarray("receiver", $tmparray, GETPOST("receiver"), null, null, 'inline-block minwidth500', null, "");
+        				$withtoselected=GETPOST("receiver");     // Array of selected value
+        				if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action') == 'presend')
+        				{
+        				    $withtoselected = array_keys($tmparray);
+        				}
+        				$out.= $form->multiselectarray("receiver", $tmparray, $withtoselected, null, null, 'inline-block minwidth500', null, "");
         			}
         		}
         		$out.= "</td></tr>\n";
@@ -556,7 +561,8 @@ class FormMail extends Form
         				{
         				    $tmparray[$key]=dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
         				}
-        				$out.= $form->multiselectarray("receivercc", $tmparray, GETPOST("receivercc"), null, null, 'inline-block minwidth500',null, "");
+        				$withtoccselected=GETPOST("receivercc");     // Array of selected value
+        				$out.= $form->multiselectarray("receivercc", $tmparray, $withtoccselected, null, null, 'inline-block minwidth500',null, "");
         			}
         		}
         		$out.= "</td></tr>\n";
@@ -584,8 +590,8 @@ class FormMail extends Form
         				{
         				    $tmparray[$key]=dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
         				}
-        				//$out.= $form->selectarray("receiverccc", $this->withtoccc, GETPOST("receiverccc"), 1);
-        				$out.= $form->multiselectarray("receiverccc", $tmparray, GETPOST("receiverccc"), null, null, null,null, "90%");
+        				$withtocccselected=GETPOST("receiverccc");     // Array of selected value
+        				$out.= $form->multiselectarray("receiverccc", $tmparray, $withtocccselected, null, null, null,null, "90%");
         			}
         		}
 

From ecae2fc6b681a67bc7c85373bf87a9b610d257da Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 23 Jun 2017 11:08:49 +0200
Subject: [PATCH 348/438] Fix translation

---
 htdocs/compta/facture.php | 126 +++++++++++++++++++-------------------
 1 file changed, 63 insertions(+), 63 deletions(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 2d0208d0c2b..bc51f0b226b 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1003,7 +1003,7 @@ if (empty($reshook))
 					}
 
 					$id = $object->create($user);      // This include class to add_object_linked() and add add_contact()
-					
+
 					if ($id > 0)
 					{
 						dol_include_once('/' . $element . '/class/' . $subelement . '.class.php');
@@ -1052,7 +1052,7 @@ if (empty($reshook))
 
 							$tva_tx = $lines[$i]->tva_tx;
 							if (! empty($lines[$i]->vat_src_code) && ! preg_match('/\(/', $tva_tx)) $tva_tx .= ' ('.$lines[$i]->vat_src_code.')';
-								
+
 							$result = $object->addline(
 									$langs->trans('Deposit'),
 									$amountdeposit,		 	// subprice
@@ -1155,7 +1155,7 @@ if (empty($reshook))
 
 										$tva_tx = $lines[$i]->tva_tx;
 										if (! empty($lines[$i]->vat_src_code) && ! preg_match('/\(/', $tva_tx)) $tva_tx .= ' ('.$lines[$i]->vat_src_code.')';
-										
+
 										// View third's localtaxes for NOW and do not use value from origin.
 										// TODO Is this really what we want ? Yes if source if template invoice but what if proposal or order ?
 										$localtax1_tx = get_localtax($tva_tx, 1, $object->thirdparty);
@@ -1456,7 +1456,7 @@ if (empty($reshook))
 
 				$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $tva_tx));
 				$tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx));
-			    
+
 				// if price ht was forced (ie: from gui when calculated by margin rate and cost price). TODO Why this ?
 				if (! empty($price_ht))
 				{
@@ -1718,7 +1718,7 @@ if (empty($reshook))
 					}
 				}
 			}
-			
+
 			$result = $object->updateline(GETPOST('lineid'), $description, $pu_ht, $qty, GETPOST('remise_percent'),
 				$date_start, $date_end, $vat_rate, $localtax1_rate, $localtax2_rate, 'HT', $info_bits, $type,
 				GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, $special_code, $array_options, GETPOST('progress'),
@@ -2024,11 +2024,11 @@ if ($action == 'create')
 
 		if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) $currency_code = $soc->multicurrency_code;
 	}
-    
+
 	if (!empty($soc->id)) $absolute_discount = $soc->getAvailableDiscounts();
 	$note_public = $object->getDefaultCreateValueFor('note_public', (is_object($objectsrc)?$objectsrc->note_public:null));
 	$note_private = $object->getDefaultCreateValueFor('note_private', ((! empty($origin) && ! empty($originid) && is_object($objectsrc))?$objectsrc->note_private:null));
-	
+
 	if (! empty($conf->use_javascript_ajax))
 	{
 		require_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
@@ -2110,7 +2110,7 @@ if ($action == 'create')
 	print '</tr>' . "\n";
 
 	$exampletemplateinvoice=new FactureRec($db);
-	
+
 	// Overwrite value if creation of invoice is from a predefined invoice
 	if (empty($origin) && empty($originid) && GETPOST('fac_rec','int') > 0)
 	{
@@ -2232,7 +2232,7 @@ if ($action == 'create')
 	if ((empty($origin)) || ((($origin == 'propal') || ($origin == 'commande')) && (! empty($originid))))
 	{
 		// Deposit
-		if (empty($conf->global->INVOICE_DISABLE_DEPOSIT)) 
+		if (empty($conf->global->INVOICE_DISABLE_DEPOSIT))
    		{
     	    print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
     		$tmp='<input type="radio" id="radio_deposit" name="type" value="3"' . (GETPOST('type') == 3 ? ' checked' : '') . '> ';
@@ -2243,7 +2243,7 @@ if ($action == 'create')
     			});
     		});
     		</script>';
-    
+
     		$desc = $form->textwithpicto($tmp.$langs->trans("InvoiceDeposit"), $langs->transnoentities("InvoiceDepositDesc"), 1, 'help', '', 0, 3);
     		print '<table class="nobordernopadding"><tr><td>';
     		print $desc;
@@ -2257,7 +2257,7 @@ if ($action == 'create')
     			print '<td class="nowrap" style="padding-left: 5px">' . $langs->trans('Value') . ':<input type="text" id="valuedeposit" name="valuedeposit" size="3" value="' . GETPOST('valuedeposit', 'int') . '"/>';
     		}
     		print '</td></tr></table>';
-    
+
     		print '</div></div>';
    		}
 	}
@@ -2289,7 +2289,7 @@ if ($action == 'create')
 		}
 
 		// Replacement
-		if (empty($conf->global->INVOICE_DISABLE_REPLACEMENT)) 
+		if (empty($conf->global->INVOICE_DISABLE_REPLACEMENT))
 		{
     		print '<!-- replacement line -->';
     		print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
@@ -2336,7 +2336,7 @@ if ($action == 'create')
 		if ($socid > 0)
 		{
     		// Credit note
-		    if (empty($conf->global->INVOICE_DISABLE_CREDIT_NOTE)) 
+		    if (empty($conf->global->INVOICE_DISABLE_CREDIT_NOTE))
     		{
     			print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
     			$tmp='<input type="radio" id="radio_creditnote" name="type" value="2"' . (GETPOST('type') == 2 ? ' checked' : '');
@@ -2372,12 +2372,12 @@ if ($action == 'create')
     			$text .= '</select>';
     			$desc = $form->textwithpicto($text, $langs->transnoentities("InvoiceAvoirDesc"), 1, 'help', '', 0, 3);
     			print $desc;
-    
+
     			print '<div id="credit_note_options" class="clearboth">';
     	        print '&nbsp;&nbsp;&nbsp; <input data-role="none" type="checkbox" name="invoiceAvoirWithLines" id="invoiceAvoirWithLines" value="1" onclick="if($(this).is(\':checked\') ) { $(\'#radio_creditnote\').prop(\'checked\', true); $(\'#invoiceAvoirWithPaymentRestAmount\').removeAttr(\'checked\');   }" '.(GETPOST('invoiceAvoirWithLines','int')>0 ? 'checked':'').' /> <label for="invoiceAvoirWithLines">'.$langs->trans('invoiceAvoirWithLines')."</label>";
     	        print '<br>&nbsp;&nbsp;&nbsp; <input data-role="none" type="checkbox" name="invoiceAvoirWithPaymentRestAmount" id="invoiceAvoirWithPaymentRestAmount" value="1" onclick="if($(this).is(\':checked\') ) { $(\'#radio_creditnote\').prop(\'checked\', true);  $(\'#invoiceAvoirWithLines\').removeAttr(\'checked\');   }" '.(GETPOST('invoiceAvoirWithPaymentRestAmount','int')>0 ? 'checked':'').' /> <label for="invoiceAvoirWithPaymentRestAmount">'.$langs->trans('invoiceAvoirWithPaymentRestAmount')."</label>";
     			print '</div>';
-    
+
     			print '</div></div>';
     		}
 		}
@@ -2393,7 +2393,7 @@ if ($action == 'create')
 			print '</div></div>' . "\n";
 		}
 	}
-	
+
 	// Template invoice
 	print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 	$tmp='<input type="radio" name="type" id="radio_template" value="0" disabled> ';
@@ -2428,7 +2428,7 @@ if ($action == 'create')
 	}
 
 	$datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
-	
+
 	// Date invoice
 	print '<tr><td class="fieldrequired">' . $langs->trans('DateInvoice') . '</td><td colspan="2">';
 	print $form->select_date($datefacture?$datefacture:$dateinvoice, '', '', '', '', "add", 1, 1, 1);
@@ -2534,15 +2534,15 @@ if ($action == 'create')
     	    '__INVOICE_YEAR__' =>  $langs->trans("PreviousYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($dateexample,'%Y').')',
     	    '__INVOICE_NEXT_YEAR__' => $langs->trans("NextYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, 1, 'y'),'%Y').')'
     	);
-    	
+
     	$htmltext = '<i>'.$langs->trans("FollowingConstantsWillBeSubstituted").':<br>';
     	foreach($substitutionarray as $key => $val)
     	{
     	    $htmltext.=$key.' = '.$langs->trans($val).'<br>';
     	}
-    	$htmltext.='</i>';	
+    	$htmltext.='</i>';
 	}
-	
+
 	// Public note
 	print '<tr>';
 	print '<td class="border tdtop">';
@@ -2630,9 +2630,9 @@ if ($action == 'create')
 
 		if (!empty($conf->multicurrency->enabled))
 		{
-			print '<tr><td>' . $langs->trans('MulticurrencyTotalHT') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_ht) . '</td></tr>';
-			print '<tr><td>' . $langs->trans('MulticurrencyTotalVAT') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_tva) . "</td></tr>";
-			print '<tr><td>' . $langs->trans('MulticurrencyTotalTTC') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_ttc) . "</td></tr>";	
+			print '<tr><td>' . $langs->trans('MulticurrencyAmountHT') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_ht) . '</td></tr>';
+			print '<tr><td>' . $langs->trans('MulticurrencyAmountVAT') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_tva) . "</td></tr>";
+			print '<tr><td>' . $langs->trans('MulticurrencyAmountTTC') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_ttc) . "</td></tr>";
 		}
 	}
 
@@ -3336,9 +3336,9 @@ else if ($id > 0 || ! empty($ref))
 			$prevsits_total_amount += $object->total_ht;
 
 			print price($prevsits_total_amount, 0, $langs, 1, -1, -1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency) );
-			
+
 			print '</td></tr>';
-			
+
 
 			// Previous situation(s) deduction(s)
 			for ($i = 0; $i < $cprevsits; $i++) {
@@ -3352,7 +3352,7 @@ else if ($id > 0 || ! empty($ref))
 				print '<td align="left" class="nowrap">';
 				print '- ' . price($prevsits[$i]->total_ht, 0, $langs, 1, -1, -1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency) );
 				print '</td></tr>';
-				
+
 			}
 		}
 	}
@@ -3390,21 +3390,21 @@ else if ($id > 0 || ! empty($ref))
 	print '<div class="fichehalfright">';
 	print '<div class="ficheaddleft">';
 	print '<div class="underbanner clearboth"></div>';
-	
+
 	print '<table class="border centpercent">';
-	
+
 	if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency))
 	{
 	    // Multicurrency Amount HT
 	    print '<tr><td class="titlefieldmiddle">' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . '</td>';
 	    print '<td class="nowrap">' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
 	    print '</tr>';
-	
+
 	    // Multicurrency Amount VAT
 	    print '<tr><td>' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . '</td>';
 	    print '<td class="nowrap">' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
 	    print '</tr>';
-	
+
 	    // Multicurrency Amount TTC
 	    print '<tr><td>' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . '</td>';
 	    print '<td class="nowrap">' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
@@ -3463,7 +3463,7 @@ else if ($id > 0 || ! empty($ref))
 
 	print '</table>';
 
-	
+
 	// List of previous situation invoices
 
 	$sign = 1;
@@ -3486,12 +3486,12 @@ else if ($id > 0 || ! empty($ref))
         $nbrows += 5;
     if (! empty($conf->incoterm->enabled))
         $nbrows += 1;
-    
-    if ($object->type == Facture::TYPE_SITUATION && ! empty($conf->global->INVOICE_USE_SITUATION)) 
+
+    if ($object->type == Facture::TYPE_SITUATION && ! empty($conf->global->INVOICE_USE_SITUATION))
     {
         if (count($object->tab_previous_situation_invoice) > 0 || count($object->tab_next_situation_invoice) > 0)
             print '<table class="noborder situationstable" width="100%">';
-        
+
         if (count($object->tab_previous_situation_invoice) > 0) {
             // List of previous invoices
             print '<tr class="liste_titre">';
@@ -3503,7 +3503,7 @@ else if ($id > 0 || ! empty($ref))
             print '<td align="right">' . $langs->trans('AmountTTC') . '</td>';
             print '<td width="18">&nbsp;</td>';
             print '</tr>';
-            
+
             $total_prev_ht = $total_prev_ttc = 0;
             $var = true;
             foreach ($object->tab_previous_situation_invoice as $prev_invoice) {
@@ -3519,10 +3519,10 @@ else if ($id > 0 || ! empty($ref))
                 print '<td align="right">' . price($prev_invoice->total_ttc) . '</td>';
                 print '<td align="right">' . $prev_invoice->getLibStatut(3, $totalpaye) . '</td>';
                 print '</tr>';
-                
+
                 $var = ! $var;
             }
-            
+
             print '<tr ' . $bc[$var] . '>';
             print '<td colspan="3" align="right"></td>';
             print '<td align="right"><b>' . price($total_prev_ht) . '</b></td>';
@@ -3530,7 +3530,7 @@ else if ($id > 0 || ! empty($ref))
             print '<td width="18">&nbsp;</td>';
             print '</tr>';
         }
-        
+
         if (count($object->tab_next_situation_invoice) > 0) {
             // List of next invoices
             print '<tr class="liste_titre">';
@@ -3542,9 +3542,9 @@ else if ($id > 0 || ! empty($ref))
             print '<td align="right">' . $langs->trans('AmountTTC') . '</td>';
             print '<td width="18">&nbsp;</td>';
             print '</tr>';
-            
+
             $total_next_ht = $total_next_ttc = 0;
-            
+
             $var = true;
             foreach ($object->tab_next_situation_invoice as $next_invoice) {
                 $totalpaye = $next_invoice->getSommePaiement();
@@ -3559,10 +3559,10 @@ else if ($id > 0 || ! empty($ref))
                 print '<td align="right">' . price($next_invoice->total_ttc) . '</td>';
                 print '<td align="right">' . $next_invoice->getLibStatut(3, $totalpaye) . '</td>';
                 print '</tr>';
-                
+
                 $var = ! $var;
             }
-            
+
             print '<tr ' . $bc[$var] . '>';
             print '<td colspan="3" align="right"></td>';
             print '<td align="right"><b>' . price($total_next_ht) . '</b></td>';
@@ -3570,14 +3570,14 @@ else if ($id > 0 || ! empty($ref))
             print '<td width="18">&nbsp;</td>';
             print '</tr>';
         }
-        
+
         if (count($object->tab_previous_situation_invoice) > 0 || count($object->tab_next_situation_invoice) > 0)
             print '</table>';
     }
 
-    
+
     // List of payments already done
-    
+
     print '<table class="noborder paymenttable" width="100%">';
 
     print '<tr class="liste_titre">';
@@ -3735,7 +3735,7 @@ else if ($id > 0 || ! empty($ref))
 
         // Billed
         print '<tr><td colspan="' . $nbcols . '" align="right">' . $langs->trans("Billed") . ' :</td><td align="right">' . price($object->total_ttc) . '</td><td>&nbsp;</td></tr>';
-        
+
         // Remainder to pay
         print '<tr><td colspan="' . $nbcols . '" align="right">';
         if ($resteapayeraffiche >= 0)
@@ -3745,11 +3745,11 @@ else if ($id > 0 || ! empty($ref))
         print ' :</td>';
         print '<td align="right"'.($resteapayeraffiche?' class="amountremaintopay"':(' class="'.$cssforamountpaymentcomplete.'"')).'>' . price($resteapayeraffiche) . '</td>';
         print '<td class="nowrap">&nbsp;</td></tr>';
-    } 
+    }
     else // Credit note
     {
         $cssforamountpaymentcomplete='';
-        
+
         // Total already paid back
         print '<tr><td colspan="' . $nbcols . '" align="right">';
         print $langs->trans('AlreadyPaidBack');
@@ -3807,15 +3807,15 @@ else if ($id > 0 || ! empty($ref))
 	{
 		if ($object->situation_cycle_ref && $object->statut == 0) {
 			print '<div class="div-table-responsive">';
-			
+
 			print '<form name="updatealllines" id="updatealllines" action="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '#updatealllines" method="POST">';
 			print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '" />';
 			print '<input type="hidden" name="action" value="updatealllines" />';
 			print '<input type="hidden" name="id" value="' . $object->id . '" />';
-			
+
 			print '<table id="tablelines_all_progress" class="noborder noshadow" width="100%">';
 			print '<tr class="liste_titre nodrag nodrop">';
-			
+
 			if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
 				print '<td align="center" width="5">&nbsp;</td>';
 			}
@@ -3838,7 +3838,7 @@ else if ($id > 0 || ! empty($ref))
 			print '<td width="10">&nbsp;</td>';
 			print '<td width="10">&nbsp;</td>';
 			print "</tr>\n";
-			
+
 			if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
 				print '<td align="center" width="5">&nbsp;</td>';
 			}
@@ -3851,19 +3851,19 @@ else if ($id > 0 || ! empty($ref))
 			print '<td align="right" class="nowrap"><input type="text" size="1" value="" name="all_progress">%</td>';
 			print '<td colspan="4" align="right"><input class="button" type="submit" name="all_percent" value="Modifier" /></td>';
 			print '</tr>';
-			
+
 			print '</table>';
-			
+
 			print '</form>';
-			
+
 			print '</div>';
-			
+
 		}
-		
+
 	}
-	
-	
-	
+
+
+
 	print '	<form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '#add' : '#line_' . GETPOST('lineid')) . '" method="POST">
 	<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">
 	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateligne') . '">
@@ -3899,7 +3899,7 @@ else if ($id > 0 || ! empty($ref))
 
 	print "</table>\n";
     print "</div>";
-    
+
 	print "</form>\n";
 
 	dol_fiche_end();
@@ -3998,7 +3998,7 @@ else if ($id > 0 || ! empty($ref))
 			        //print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("AmountMustBePositive")).'">'.$langs->trans("MakeWithdrawRequest").'</a>';
 			    }
 			}
-			
+
 			// Create payment
 			if ($object->type != Facture::TYPE_CREDIT_NOTE && $object->statut == 1 && $object->paye == 0 && $user->rights->facture->paiement) {
 				if ($objectidnext) {
@@ -4149,7 +4149,7 @@ else if ($id > 0 || ! empty($ref))
 		// Show links to link elements
 		$linktoelem = $form->showLinkToObjectBlock($object, null, array('invoice'));
 		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
-		
+
 		// Link for paypal payment
 		if (! empty($conf->paypal->enabled) && $object->statut != 0) {
 			include_once DOL_DOCUMENT_ROOT . '/paypal/lib/paypal.lib.php';

From a05bbd651cc208a8e75f923a7ed4c7d096f404af Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 23 Jun 2017 11:09:29 +0200
Subject: [PATCH 349/438] Fix translation

---
 htdocs/compta/facture/card.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 8ad11189313..6c2ab5786b7 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2729,9 +2729,9 @@ if ($action == 'create')
 
 		if (!empty($conf->multicurrency->enabled))
 		{
-			print '<tr><td>' . $langs->trans('MulticurrencyTotalHT') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_ht) . '</td></tr>';
-			print '<tr><td>' . $langs->trans('MulticurrencyTotalVAT') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_tva) . "</td></tr>";
-			print '<tr><td>' . $langs->trans('MulticurrencyTotalTTC') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_ttc) . "</td></tr>";
+			print '<tr><td>' . $langs->trans('MulticurrencyAmountHT') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_ht) . '</td></tr>';
+			print '<tr><td>' . $langs->trans('MulticurrencyAmountVAT') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_tva) . "</td></tr>";
+			print '<tr><td>' . $langs->trans('MulticurrencyAmountTTC') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_ttc) . "</td></tr>";
 		}
 	}
 

From 45004493e0cb17248fbd0fc5211d30526e407a46 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 23 Jun 2017 11:12:17 +0200
Subject: [PATCH 350/438] Fix multicurrency and vat_src_code not propaged on
 invoice from shipment.

---
 htdocs/core/lib/functions.lib.php            | 18 +++++++-------
 htdocs/expedition/class/expedition.class.php | 26 ++++++++++++++------
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index f9f9c8557ee..aa70c2680dd 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3891,7 +3891,7 @@ function getTaxesFromId($vatrowid)
  *  @param	Societe	$buyer         		Company object
  *  @param	Societe	$seller        		Company object
  *  @param  int     $firstparamisid     1 if first param is id into table (use this if you can)
- *  @return	array    	  				array(localtax_type1(1-6 / 0 if not found), rate of localtax1, ...)
+ *  @return	array    	  				array(localtax_type1(1-6/0 if not found), rate localtax1, localtax_type1, rate localtax2, accountancycodecust, accountancycodesupp)
  */
 function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisid=0)
 {
@@ -3927,22 +3927,22 @@ function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisi
 		{
 			if (! isOnlyOneLocalTax(1))
 			{
-				return array($obj->localtax1_type, get_localtax($vatrate, $local, $buyer, $seller), $obj->accountancy_code_sell,$obj->accountancy_code_buy);
+				return array($obj->localtax1_type, get_localtax($vatrate, $local, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);
 			}
 			else
 			{
-				return array($obj->localtax1_type, $obj->localtax1,$obj->accountancy_code_sell,$obj->accountancy_code_buy);
+				return array($obj->localtax1_type, $obj->localtax1,$obj->accountancy_code_sell, $obj->accountancy_code_buy);
 			}
 		}
 		elseif ($local == 2)
 		{
 			if (! isOnlyOneLocalTax(2))
 			{
-				return array($obj->localtax2_type, get_localtax($vatrate, $local, $buyer, $seller),$obj->accountancy_code_sell,$obj->accountancy_code_buy);
+				return array($obj->localtax2_type, get_localtax($vatrate, $local, $buyer, $seller),$obj->accountancy_code_sell, $obj->accountancy_code_buy);
 			}
 			else
 			{
-				return array($obj->localtax2_type, $obj->localtax2,$obj->accountancy_code_sell,$obj->accountancy_code_buy);
+				return array($obj->localtax2_type, $obj->localtax2,$obj->accountancy_code_sell, $obj->accountancy_code_buy);
 			}
 		}
 		else
@@ -3951,22 +3951,22 @@ function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisi
 			{
 				if(! isOnlyOneLocalTax(2))
 				{
-					return array($obj->localtax1_type, get_localtax($vatrate, 1, $buyer, $seller), $obj->localtax2_type, get_localtax($vatrate, 2, $buyer, $seller),$obj->accountancy_code_sell,$obj->accountancy_code_buy);
+					return array($obj->localtax1_type, get_localtax($vatrate, 1, $buyer, $seller), $obj->localtax2_type, get_localtax($vatrate, 2, $buyer, $seller), $obj->accountancy_code_sell,$obj->accountancy_code_buy);
 				}
 				else
 				{
-					return array($obj->localtax1_type, get_localtax($vatrate, 1, $buyer, $seller), $obj->localtax2_type, $obj->localtax2,$obj->accountancy_code_sell,$obj->accountancy_code_buy);
+					return array($obj->localtax1_type, get_localtax($vatrate, 1, $buyer, $seller), $obj->localtax2_type, $obj->localtax2, $obj->accountancy_code_sell, $obj->accountancy_code_buy);
 				}
 			}
 			else
 			{
 				if(! isOnlyOneLocalTax(2))
 				{
-					return array($obj->localtax1_type, $obj->localtax1, $obj->localtax2_type,get_localtax($vatrate, 2, $buyer, $seller) ,$obj->accountancy_code_sell,$obj->accountancy_code_buy);
+					return array($obj->localtax1_type, $obj->localtax1, $obj->localtax2_type, get_localtax($vatrate, 2, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);
 				}
 				else
 				{
-					return array($obj->localtax1_type, $obj->localtax1, $obj->localtax2_type, $obj->localtax2,$obj->accountancy_code_sell,$obj->accountancy_code_buy);
+					return array($obj->localtax1_type, $obj->localtax1, $obj->localtax2_type, $obj->localtax2, $obj->accountancy_code_sell, $obj->accountancy_code_buy);
 				}
 			}
 		}
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 971a2189854..28e47ad4c98 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -49,7 +49,7 @@ class Expedition extends CommonObject
 	public $table_element_line="expeditiondet";
 	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
     public $picto = 'sending';
-    
+
 	var $socid;
 	var $ref_customer;
 	var $ref_int;
@@ -396,7 +396,7 @@ class Expedition extends CommonObject
 		{
 			$error++;
 		}
-		
+
 		if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
 		{
 			$expeditionline = new ExpeditionLigne($this->db);
@@ -915,7 +915,7 @@ class Expedition extends CommonObject
 		    $this->error='ADDLINE_WAS_CALLED_INSTEAD_OF_ADDLINEBATCH';
 		    return -4;
 		}
-		
+
 		// extrafields
 		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
 			$line->array_options = $array_options;
@@ -1316,7 +1316,8 @@ class Expedition extends CommonObject
 
 		$sql = "SELECT cd.rowid, cd.fk_product, cd.label as custom_label, cd.description, cd.qty as qty_asked, cd.product_type";
 		$sql.= ", cd.total_ht, cd.total_localtax1, cd.total_localtax2, cd.total_ttc, cd.total_tva";
-		$sql.= ", cd.tva_tx, cd.localtax1_tx, cd.localtax2_tx, cd.price, cd.subprice, cd.remise_percent,cd.buy_price_ht as pa_ht";
+		$sql.= ", cd.vat_src_code, cd.tva_tx, cd.localtax1_tx, cd.localtax2_tx, cd.localtax1_type, cd.localtax2_type, cd.price, cd.subprice, cd.remise_percent,cd.buy_price_ht as pa_ht";
+		$sql.= ", cd.fk_multicurrency, cd.multicurrency_code, cd.multicurrency_subprice, cd.multicurrency_total_ht, cd.multicurrency_total_tva, cd.multicurrency_total_ttc";
 		$sql.= ", ed.rowid as line_id, ed.qty as qty_shipped, ed.fk_origin_line, ed.fk_entrepot";
 		$sql.= ", p.ref as product_ref, p.label as product_label, p.fk_product_type";
 		$sql.= ", p.weight, p.weight_units, p.length, p.length_units, p.surface, p.surface_units, p.volume, p.volume_units, p.tobatch as product_tobatch";
@@ -1389,8 +1390,10 @@ class Expedition extends CommonObject
 
 				$line->pa_ht 			= $obj->pa_ht;
 
+				$localtax_array=array(0=>$obj->localtax1_type, 1=>$obj->localtax1_tx, 2=>$obj->localtax2_type, 3=>$obj->localtax2_tx);
+
 				// For invoicing
-				$tabprice = calcul_price_total($obj->qty_shipped, $obj->subprice, $obj->remise_percent, $obj->tva_tx, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $obj->info_bits, $obj->fk_product_type, $mysoc);	// We force type to 0
+				$tabprice = calcul_price_total($obj->qty_shipped, $obj->subprice, $obj->remise_percent, $obj->tva_tx, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $obj->info_bits, $obj->fk_product_type, $mysoc, $localtax_array);	// We force type to 0
 				$line->desc	         	= $obj->description;		// We need ->desc because some code into CommonObject use desc (property defined for other elements)
 				$line->qty 				= $line->qty_shipped;
 				$line->total_ht			= $tabprice[0];
@@ -1398,6 +1401,7 @@ class Expedition extends CommonObject
 				$line->total_localtax2 	= $tabprice[10];
 				$line->total_ttc	 	= $tabprice[2];
 				$line->total_tva	 	= $tabprice[1];
+				$line->vat_src_code	 	= $obj->vat_src_code;
 				$line->tva_tx 		 	= $obj->tva_tx;
 				$line->localtax1_tx 	= $obj->localtax1_tx;
 				$line->localtax2_tx 	= $obj->localtax2_tx;
@@ -1411,6 +1415,14 @@ class Expedition extends CommonObject
 				$this->total_localtax1+= $tabprice[9];
 				$this->total_localtax2+= $tabprice[10];
 
+				// Multicurrency
+				$this->fk_multicurrency 		= $obj->fk_multicurrency;
+				$this->multicurrency_code 		= $obj->multicurrency_code;
+				$this->multicurrency_subprice 	= $obj->multicurrency_subprice;
+				$this->multicurrency_total_ht 	= $obj->multicurrency_total_ht;
+				$this->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
+				$this->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
+
 				if ($originline != $obj->fk_origin_line)
 				{
 					$line->detail_batch = array();
@@ -1479,7 +1491,7 @@ class Expedition extends CommonObject
         $label = '<u>' . $langs->trans("ShowSending") . '</u>';
         $label .= '<br><b>' . $langs->trans('Ref') . ':</b> '.$this->ref;
         $label .= '<br><b>'.$langs->trans('RefCustomer').':</b> '.($this->ref_customer ? $this->ref_customer : $this->ref_client);
-            
+
 		$url = DOL_URL_ROOT.'/expedition/card.php?id='.$this->id;
 
 		if ($short) return $url;
@@ -1495,7 +1507,7 @@ class Expedition extends CommonObject
 		    $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
 		    $linkclose.=' class="classfortooltip"';
 		}
-		
+
         $linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend='</a>';
 

From 1211e0d7abcc165cbd50992f8da9f7bc006adca5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 23 Jun 2017 12:09:21 +0200
Subject: [PATCH 351/438] FIX vat code not saved during product creation.

---
 htdocs/core/class/html.form.class.php  |  2 +-
 htdocs/product/card.php                | 44 ++++++++++++++++++++++----
 htdocs/product/class/product.class.php |  5 +--
 htdocs/product/price.php               |  7 ++--
 4 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index b440c012f04..321a4752006 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4332,7 +4332,7 @@ class Form
 	 *                                            Si vendeur et acheteur dans Communauté européenne et acheteur= entreprise alors TVA par défaut=0. Fin de règle.
      *                  					      Sinon la TVA proposee par defaut=0. Fin de regle.
      *  @param	bool	     $options_only		  Return HTML options lines only (for ajax treatment)
-     *  @param  int          $mode                1=Add code into key in select list
+     *  @param  int          $mode                0=Use vat rate as key in combo list, 1=Add VAT code after vat rate into key, -1=Use id of vat line as key
      *  @return	string
      */
     function load_tva($htmlname='tauxtva', $selectedrate='', $societe_vendeuse='', $societe_acheteuse='', $idprod=0, $info_bits=0, $type='', $options_only=false, $mode=0)
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 31a865132c8..833330126bb 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -239,12 +239,43 @@ if (empty($reshook))
             else
             	$object->price_min = GETPOST('price_min');
 
-            $object->tva_tx                = str_replace('*','',GETPOST('tva_tx'));
-            $object->tva_npr               = preg_match('/\*/',GETPOST('tva_tx'))?1:0;
+	        $tva_tx_txt = GETPOST('tva_tx', 'alpha');           // tva_tx can be '8.5'  or  '8.5*'  or  '8.5 (XXX)' or '8.5* (XXX)'
 
-            // local taxes.
-            $object->localtax1_tx 			   = get_localtax($object->tva_tx,1);
-            $object->localtax2_tx 			   = get_localtax($object->tva_tx,2);
+	        // We must define tva_tx, npr and local taxes
+	        $vatratecode = '';
+	        $tva_tx = preg_replace('/[^0-9\.].*$/', '', $tva_tx_txt);     // keep remove all after the numbers and dot
+	        $npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
+	        $localtax1 = 0; $localtax2 = 0; $localtax1_type = '0'; $localtax2_type = '0';
+	        // If value contains the unique code of vat line (new recommanded method), we use it to find npr and local taxes
+	        if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
+	        {
+	            // We look into database using code (we can't use get_localtax() because it depends on buyer that is not known). Same in update price.
+	            $vatratecode=$reg[1];
+	            // Get record from code
+	            $sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+	            $sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+	            $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$mysoc->country_code."'";
+	            $sql.= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
+	            $sql.= " AND t.code ='".$vatratecode."'";
+	            $resql=$db->query($sql);
+	            if ($resql)
+	            {
+	                $obj = $db->fetch_object($resql);
+	                $npr = $obj->recuperableonly;
+	                $localtax1 = $obj->localtax1;
+	                $localtax2 = $obj->localtax2;
+	                $localtax1_type = $obj->localtax1_type;
+	                $localtax2_type = $obj->localtax2_type;
+	            }
+	        }
+
+	        $object->default_vat_code = $vatratecode;
+	        $object->tva_tx = $tva_tx;
+	        $object->tva_npr = $npr;
+	        $object->localtax1_tx = $localtax1;
+	        $object->localtax2_tx = $localtax2;
+	        $object->localtax1_type = $localtax1_type;
+	        $object->localtax2_type = $localtax2_type;
 
             $object->type               	 = $type;
             $object->status             	 = GETPOST('statut');
@@ -1109,7 +1140,8 @@ else
 
             // VAT
             print '<tr><td>'.$langs->trans("VATRate").'</td><td>';
-            print $form->load_tva("tva_tx",-1,$mysoc,'');
+            $defaultva=get_default_tva($mysoc, $mysoc);
+            print $form->load_tva("tva_tx", $defaultva, $mysoc, $mysoc, 0, 0, '', false, 1);
             print '</td></tr>';
 
             print '</table>';
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 0f28ffdea30..2e2f3007540 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -396,7 +396,7 @@ class Product extends CommonObject
 			$sql = "SELECT count(*) as nb";
 			$sql.= " FROM ".MAIN_DB_PREFIX."product";
 			$sql.= " WHERE entity IN (".getEntity('product', 1).")";
-			$sql.= " AND ref = '" .$this->ref."'";
+			$sql.= " AND ref = '" .$this->db->escape($this->ref)."'";
 
 			$result = $this->db->query($sql);
 			if ($result)
@@ -1285,7 +1285,7 @@ class Product extends CommonObject
 		if (empty($this->price_by_qty)) $this->price_by_qty=0;
 
 		// Add new price
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_price(price_level,date_price,fk_product,fk_user_author,price,price_ttc,price_base_type,tosell, tva_tx, default_vat_code, recuperableonly,";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_price(price_level,date_price, fk_product, fk_user_author, price, price_ttc, price_base_type,tosell, tva_tx, default_vat_code, recuperableonly,";
 		$sql.= " localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, price_min,price_min_ttc,price_by_qty,entity,fk_price_expression) ";
 		$sql.= " VALUES(".($level?$level:1).", '".$this->db->idate($now)."',".$this->id.",".$user->id.",".$this->price.",".$this->price_ttc.",'".$this->price_base_type."',".$this->status.",".$this->tva_tx.", ".($this->default_vat_code?("'".$this->default_vat_code."'"):"null").",".$this->tva_npr.",";
 		$sql.= " ".$this->localtax1_tx.", ".$this->localtax2_tx.", '".$this->localtax1_type."', '".$this->localtax2_type."', ".$this->price_min.",".$this->price_min_ttc.",".$this->price_by_qty.",".$conf->entity.",".($this->fk_price_expression > 0?$this->fk_price_expression:'null');
@@ -1721,6 +1721,7 @@ class Product extends CommonObject
 				$this->tva_tx					= $obj->tva_tx;
 				//! French VAT NPR
 				$this->tva_npr					= $obj->tva_npr;
+				$this->recuperableonly			= $obj->tva_npr;       // For backward compatibility
 				//! Local taxes
 				$this->localtax1_tx				= $obj->localtax1_tx;
 				$this->localtax2_tx				= $obj->localtax2_tx;
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index cbfe90a5a52..2b5617c601d 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -113,7 +113,7 @@ if (empty($reshook))
 	    // If value contains the unique code of vat line (new recommanded method), we use it to find npr and local taxes
 	    if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
 	    {
-	        // We look into database using code
+	        // We look into database using code (we can't use get_localtax() because it depends on buyer that is not known). Same in create product.
 	        $vatratecode=$reg[1];
 	        // Get record from code
 	        $sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
@@ -1819,7 +1819,10 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		print "<td>" . "</td>";
 
 		print '<td align="center">' . $langs->trans($object->price_base_type) . "</td>";
-		print '<td align="right">' . vatrate($object->tva_tx, true, $object->recuperableonly) . "</td>";
+		print '<td align="right">';
+		print vatrate($object->tva_tx, true, $object->recuperableonly);
+		print $object->default_vat_code?' ('.$object->default_vat_code.')':'';
+		print "</td>";
 		print '<td align="right">' . price($object->price) . "</td>";
 		print '<td align="right">' . price($object->price_ttc) . "</td>";
 		print '<td align="right">' . price($object->price_min) . '</td>';

From 247803f894f4c2f4c174fbe45e5df1522873bc52 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 23 Jun 2017 20:03:15 +0200
Subject: [PATCH 352/438] Better templates

---
 htdocs/modulebuilder/template/admin/about.php | 15 ++++++++--
 htdocs/modulebuilder/template/admin/setup.php | 16 +++++++++--
 .../template/css/mymodule.css.php             | 15 ++++++++--
 .../modulebuilder/template/js/mymodule.js.php | 20 +++++++++++++
 .../modulebuilder/template/myobject_card.php  | 21 ++++++++------
 .../modulebuilder/template/myobject_list.php  | 28 +++++++++++--------
 6 files changed, 87 insertions(+), 28 deletions(-)

diff --git a/htdocs/modulebuilder/template/admin/about.php b/htdocs/modulebuilder/template/admin/about.php
index 1306b0aef6a..532c3f36454 100644
--- a/htdocs/modulebuilder/template/admin/about.php
+++ b/htdocs/modulebuilder/template/admin/about.php
@@ -23,9 +23,18 @@
  */
 
 // Load Dolibarr environment
-if (false === (@include '../../main.inc.php')) {  // From htdocs directory
-	require '../../../main.inc.php'; // From "custom" directory
-}
+$res=0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (! $res && ! empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res=@include($_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php");
+// Try main.inc.php into web root detected using web root caluclated from SCRIPT_FILENAME
+$tmp=empty($_SERVER['SCRIPT_FILENAME'])?'':$_SERVER['SCRIPT_FILENAME'];$tmp2=realpath(__FILE__); $i=strlen($tmp)-1; $j=strlen($tmp2)-1;
+while($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i]==$tmp2[$j]) { $i--; $j--; }
+if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/main.inc.php")) $res=@include(substr($tmp, 0, ($i+1))."/main.inc.php");
+if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/../main.inc.php")) $res=@include(substr($tmp, 0, ($i+1))."/../main.inc.php");
+// Try main.inc.php using relative path
+if (! $res && file_exists("../../main.inc.php")) $res=@include("../../main.inc.php");
+if (! $res && file_exists("../../../main.inc.php")) $res=@include("../../../main.inc.php");
+if (! $res) die("Include of main fails");
 
 // Libraries
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index 421452f06e8..be5797337dd 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -23,9 +23,19 @@
  */
 
 // Load Dolibarr environment
-if (false === (@include '../../main.inc.php')) {  // From htdocs directory
-	require '../../../main.inc.php'; // From "custom" directory
-}
+$res=0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (! $res && ! empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res=@include($_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php");
+// Try main.inc.php into web root detected using web root caluclated from SCRIPT_FILENAME
+$tmp=empty($_SERVER['SCRIPT_FILENAME'])?'':$_SERVER['SCRIPT_FILENAME'];$tmp2=realpath(__FILE__); $i=strlen($tmp)-1; $j=strlen($tmp2)-1;
+while($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i]==$tmp2[$j]) { $i--; $j--; }
+if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/main.inc.php")) $res=@include(substr($tmp, 0, ($i+1))."/main.inc.php");
+if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/../main.inc.php")) $res=@include(substr($tmp, 0, ($i+1))."/../main.inc.php");
+// Try main.inc.php using relative path
+if (! $res && file_exists("../../main.inc.php")) $res=@include("../../main.inc.php");
+if (! $res && file_exists("../../../main.inc.php")) $res=@include("../../../main.inc.php");
+if (! $res) die("Include of main fails");
+
 
 global $langs, $user;
 
diff --git a/htdocs/modulebuilder/template/css/mymodule.css.php b/htdocs/modulebuilder/template/css/mymodule.css.php
index 0dbfae5b9ef..3722fc1e06e 100644
--- a/htdocs/modulebuilder/template/css/mymodule.css.php
+++ b/htdocs/modulebuilder/template/css/mymodule.css.php
@@ -33,15 +33,24 @@ if (! defined('NOLOGIN'))         define('NOLOGIN',1);          // File must be
 if (! defined('NOREQUIREHTML'))   define('NOREQUIREHTML',1);
 if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX','1');
 
-
-session_cache_limiter(FALSE);
-
+// Load Dolibarr environment
 $res=0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
 if (! $res && ! empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res=@include($_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php");
+// Try main.inc.php into web root detected using web root caluclated from SCRIPT_FILENAME
+$tmp=empty($_SERVER['SCRIPT_FILENAME'])?'':$_SERVER['SCRIPT_FILENAME'];$tmp2=realpath(__FILE__); $i=strlen($tmp)-1; $j=strlen($tmp2)-1;
+while($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i]==$tmp2[$j]) { $i--; $j--; }
+if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/main.inc.php")) $res=@include(substr($tmp, 0, ($i+1))."/main.inc.php");
+if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/../main.inc.php")) $res=@include(substr($tmp, 0, ($i+1))."/../main.inc.php");
+// Try main.inc.php using relative path
 if (! $res && file_exists("../../main.inc.php")) $res=@include("../../main.inc.php");
 if (! $res && file_exists("../../../main.inc.php")) $res=@include("../../../main.inc.php");
+if (! $res) die("Include of main fails");
+
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
+session_cache_limiter(FALSE);
+
 // Load user to have $user->conf loaded (not done into main because of NOLOGIN constant defined) and load permission if we need to use them in CSS
 /*if (empty($user->id) && ! empty($_SESSION['dol_login']))
 {
diff --git a/htdocs/modulebuilder/template/js/mymodule.js.php b/htdocs/modulebuilder/template/js/mymodule.js.php
index 32915dbe34e..2d6a940c373 100644
--- a/htdocs/modulebuilder/template/js/mymodule.js.php
+++ b/htdocs/modulebuilder/template/js/mymodule.js.php
@@ -22,4 +22,24 @@
  * \brief   JavaScript file for module MyModule.
  */
 
+// Load Dolibarr environment
+$res=0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (! $res && ! empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res=@include($_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php");
+// Try main.inc.php into web root detected using web root caluclated from SCRIPT_FILENAME
+$tmp=empty($_SERVER['SCRIPT_FILENAME'])?'':$_SERVER['SCRIPT_FILENAME'];$tmp2=realpath(__FILE__); $i=strlen($tmp)-1; $j=strlen($tmp2)-1;
+while($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i]==$tmp2[$j]) { $i--; $j--; }
+if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/main.inc.php")) $res=@include(substr($tmp, 0, ($i+1))."/main.inc.php");
+if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/../main.inc.php")) $res=@include(substr($tmp, 0, ($i+1))."/../main.inc.php");
+// Try main.inc.php using relative path
+if (! $res && file_exists("../../main.inc.php")) $res=@include("../../main.inc.php");
+if (! $res && file_exists("../../../main.inc.php")) $res=@include("../../../main.inc.php");
+if (! $res) die("Include of main fails");
+
+// Define js type
 header('Content-Type: application/javascript');
+// Important: Following code is to cache this file to avoid page request by browser at each Dolibarr page access.
+// You can use CTRL+F5 to refresh your browser cache.
+if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
+else header('Cache-Control: no-cache');
+
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 03dfd62f5d3..5ef7be8afbe 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -35,20 +35,25 @@
 //if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
 //if (! defined("NOLOGIN"))        define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
 
-// Change this following line to use the correct relative path (../, ../../, etc)
+// Load Dolibarr environment
 $res=0;
-if (! $res && file_exists("../main.inc.php")) $res=@include '../main.inc.php';					// to work if your module directory is into dolibarr root htdocs directory
-if (! $res && file_exists("../../main.inc.php")) $res=@include '../../main.inc.php';			// to work if your module directory is into a subdir of root htdocs directory
-if (! $res && file_exists("../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../dolibarr/htdocs/main.inc.php';     // Used on dev env only
-if (! $res && file_exists("../../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../../dolibarr/htdocs/main.inc.php';   // Used on dev env only
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (! $res && ! empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res=@include($_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php");
+// Try main.inc.php into web root detected using web root caluclated from SCRIPT_FILENAME
+$tmp=empty($_SERVER['SCRIPT_FILENAME'])?'':$_SERVER['SCRIPT_FILENAME'];$tmp2=realpath(__FILE__); $i=strlen($tmp)-1; $j=strlen($tmp2)-1;
+while($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i]==$tmp2[$j]) { $i--; $j--; }
+if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/main.inc.php")) $res=@include(substr($tmp, 0, ($i+1))."/main.inc.php");
+if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/../main.inc.php")) $res=@include(substr($tmp, 0, ($i+1))."/../main.inc.php");
+// Try main.inc.php using relative path
+if (! $res && file_exists("../../main.inc.php")) $res=@include("../../main.inc.php");
+if (! $res && file_exists("../../../main.inc.php")) $res=@include("../../../main.inc.php");
 if (! $res) die("Include of main fails");
-// Change this following line to use the correct relative path from htdocs
+
 include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
 dol_include_once('/mymodule/class/myobject.class.php');
 
 // Load traductions files requiredby by page
-$langs->load("mymodule");
-$langs->load("other");
+$langs->loadLangs(array("mymodule","other"));
 
 // Get parameters
 $id			= GETPOST('id','int');
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 57958bb25b8..479b3a200fa 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -35,14 +35,20 @@
 //if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
 //if (! defined("NOLOGIN"))        define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
 
-// Change this following lines to use the correct relative path (../, ../../, etc)
+// Load Dolibarr environment
 $res=0;
-if (! $res && file_exists("../main.inc.php")) $res=@include '../main.inc.php';					// to work if your module directory is into dolibarr root htdocs directory
-if (! $res && file_exists("../../main.inc.php")) $res=@include '../../main.inc.php';			// to work if your module directory is into a subdir of root htdocs directory
-if (! $res && file_exists("../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../dolibarr/htdocs/main.inc.php';     // Used on dev env only
-if (! $res && file_exists("../../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../../dolibarr/htdocs/main.inc.php';   // Used on dev env only
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (! $res && ! empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res=@include($_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php");
+// Try main.inc.php into web root detected using web root caluclated from SCRIPT_FILENAME
+$tmp=empty($_SERVER['SCRIPT_FILENAME'])?'':$_SERVER['SCRIPT_FILENAME'];$tmp2=realpath(__FILE__); $i=strlen($tmp)-1; $j=strlen($tmp2)-1;
+while($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i]==$tmp2[$j]) { $i--; $j--; }
+if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/main.inc.php")) $res=@include(substr($tmp, 0, ($i+1))."/main.inc.php");
+if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/../main.inc.php")) $res=@include(substr($tmp, 0, ($i+1))."/../main.inc.php");
+// Try main.inc.php using relative path
+if (! $res && file_exists("../../main.inc.php")) $res=@include("../../main.inc.php");
+if (! $res && file_exists("../../../main.inc.php")) $res=@include("../../../main.inc.php");
 if (! $res) die("Include of main fails");
-// Change this following line to use the correct relative path from htdocs
+
 require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -51,11 +57,11 @@ dol_include_once('/mymodule/class/myobject.class.php');
 // Load traductions files requiredby by page
 $langs->loadLangs(array("mymodule","other"));
 
-$action=GETPOST('action','alpha');
-$massaction=GETPOST('massaction','alpha');
-$show_files=GETPOST('show_files','int');
-$confirm=GETPOST('confirm','alpha');
-$toselect = GETPOST('toselect', 'array');
+$action     = GETPOST('action','alpha');
+$massaction = GETPOST('massaction','alpha');
+$show_files = GETPOST('show_files','int');
+$confirm    = GETPOST('confirm','alpha');
+$toselect   = GETPOST('toselect', 'array');
 
 $id			= GETPOST('id','int');
 $backtopage = GETPOST('backtopage');

From d2fd4d6978dc7dd2d2f7e861cd466aa7007a1af5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 23 Jun 2017 23:36:25 +0200
Subject: [PATCH 353/438] Better path to laod main.inc.php

---
 htdocs/modulebuilder/template/admin/about.php   | 2 +-
 htdocs/modulebuilder/template/admin/setup.php   | 3 +--
 htdocs/modulebuilder/template/myobject_card.php | 2 +-
 htdocs/modulebuilder/template/myobject_list.php | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/htdocs/modulebuilder/template/admin/about.php b/htdocs/modulebuilder/template/admin/about.php
index 532c3f36454..d73fa237b88 100644
--- a/htdocs/modulebuilder/template/admin/about.php
+++ b/htdocs/modulebuilder/template/admin/about.php
@@ -30,7 +30,7 @@ if (! $res && ! empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res=@include($_SERVER
 $tmp=empty($_SERVER['SCRIPT_FILENAME'])?'':$_SERVER['SCRIPT_FILENAME'];$tmp2=realpath(__FILE__); $i=strlen($tmp)-1; $j=strlen($tmp2)-1;
 while($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i]==$tmp2[$j]) { $i--; $j--; }
 if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/main.inc.php")) $res=@include(substr($tmp, 0, ($i+1))."/main.inc.php");
-if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/../main.inc.php")) $res=@include(substr($tmp, 0, ($i+1))."/../main.inc.php");
+if (! $res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i+1)))."/main.inc.php")) $res=@include(dirname(substr($tmp, 0, ($i+1)))."/main.inc.php");
 // Try main.inc.php using relative path
 if (! $res && file_exists("../../main.inc.php")) $res=@include("../../main.inc.php");
 if (! $res && file_exists("../../../main.inc.php")) $res=@include("../../../main.inc.php");
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index be5797337dd..9e9dbdaf1ac 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -30,13 +30,12 @@ if (! $res && ! empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res=@include($_SERVER
 $tmp=empty($_SERVER['SCRIPT_FILENAME'])?'':$_SERVER['SCRIPT_FILENAME'];$tmp2=realpath(__FILE__); $i=strlen($tmp)-1; $j=strlen($tmp2)-1;
 while($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i]==$tmp2[$j]) { $i--; $j--; }
 if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/main.inc.php")) $res=@include(substr($tmp, 0, ($i+1))."/main.inc.php");
-if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/../main.inc.php")) $res=@include(substr($tmp, 0, ($i+1))."/../main.inc.php");
+if (! $res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i+1)))."/main.inc.php")) $res=@include(dirname(substr($tmp, 0, ($i+1)))."/main.inc.php");
 // Try main.inc.php using relative path
 if (! $res && file_exists("../../main.inc.php")) $res=@include("../../main.inc.php");
 if (! $res && file_exists("../../../main.inc.php")) $res=@include("../../../main.inc.php");
 if (! $res) die("Include of main fails");
 
-
 global $langs, $user;
 
 // Libraries
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 5ef7be8afbe..62739e2a0a1 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -43,7 +43,7 @@ if (! $res && ! empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res=@include($_SERVER
 $tmp=empty($_SERVER['SCRIPT_FILENAME'])?'':$_SERVER['SCRIPT_FILENAME'];$tmp2=realpath(__FILE__); $i=strlen($tmp)-1; $j=strlen($tmp2)-1;
 while($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i]==$tmp2[$j]) { $i--; $j--; }
 if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/main.inc.php")) $res=@include(substr($tmp, 0, ($i+1))."/main.inc.php");
-if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/../main.inc.php")) $res=@include(substr($tmp, 0, ($i+1))."/../main.inc.php");
+if (! $res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i+1)))."/main.inc.php")) $res=@include(dirname(substr($tmp, 0, ($i+1)))."/main.inc.php");
 // Try main.inc.php using relative path
 if (! $res && file_exists("../../main.inc.php")) $res=@include("../../main.inc.php");
 if (! $res && file_exists("../../../main.inc.php")) $res=@include("../../../main.inc.php");
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 479b3a200fa..2cfc4f293fe 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -43,7 +43,7 @@ if (! $res && ! empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res=@include($_SERVER
 $tmp=empty($_SERVER['SCRIPT_FILENAME'])?'':$_SERVER['SCRIPT_FILENAME'];$tmp2=realpath(__FILE__); $i=strlen($tmp)-1; $j=strlen($tmp2)-1;
 while($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i]==$tmp2[$j]) { $i--; $j--; }
 if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/main.inc.php")) $res=@include(substr($tmp, 0, ($i+1))."/main.inc.php");
-if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/../main.inc.php")) $res=@include(substr($tmp, 0, ($i+1))."/../main.inc.php");
+if (! $res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i+1)))."/main.inc.php")) $res=@include(dirname(substr($tmp, 0, ($i+1)))."/main.inc.php");
 // Try main.inc.php using relative path
 if (! $res && file_exists("../../main.inc.php")) $res=@include("../../main.inc.php");
 if (! $res && file_exists("../../../main.inc.php")) $res=@include("../../../main.inc.php");

From 81a473d547458ce523fe34c98d4dd526f9fff3bd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 23 Jun 2017 23:40:02 +0200
Subject: [PATCH 354/438] Warning not required for the moment

---
 htdocs/core/modules/modCashDesk.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/modCashDesk.class.php b/htdocs/core/modules/modCashDesk.class.php
index e5ba473c1c7..f153631dc20 100644
--- a/htdocs/core/modules/modCashDesk.class.php
+++ b/htdocs/core/modules/modCashDesk.class.php
@@ -70,8 +70,8 @@ class modCashDesk extends DolibarrModules
 		$this->phpmin = array(4,1);					// Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(2,4);	// Minimum version of Dolibarr required by module
 		$this->langfiles = array("cashdesk");
-		$this->warnings_activation = array('FR'=>'WarningNoteModulePOSForFrenchLaw');                     // Warning to show when we activate module. array('always'='text') or array('FR'='text')
-		$this->warnings_activation_ext = array('FR'=>'WarningInstallationMayBecomeNotCompliantWithLaw');  // Warning to show when we activate an external module. array('always'='text') or array('FR'='text')
+		//$this->warnings_activation = array('FR'=>'WarningNoteModulePOSForFrenchLaw');                     // Warning to show when we activate module. array('always'='text') or array('FR'='text')
+		//$this->warnings_activation_ext = array('FR'=>'WarningInstallationMayBecomeNotCompliantWithLaw');  // Warning to show when we activate an external module. array('always'='text') or array('FR'='text')
 
 		// Constants
 		$this->const = array();

From ba82bc39c87beaba640dc6fb584c6d396dc1b342 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Jun 2017 00:25:29 +0200
Subject: [PATCH 355/438] Fix missing alias

---
 htdocs/societe/list.php | 81 +++++++++++++++++++++++++----------------
 1 file changed, 50 insertions(+), 31 deletions(-)

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 3bde7f09967..252bfc9383c 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -50,6 +50,7 @@ $result = restrictedArea($user,'societe',$socid,'');
 
 $search_all=trim(GETPOST('sall', 'alphanohtml'));
 $search_nom=trim(GETPOST("search_nom"));
+$search_alias=trim(GETPOST("search_alias"));
 $search_nom_only=trim(GETPOST("search_nom_only"));
 $search_barcode=trim(GETPOST("sbarcode"));
 $search_customer_code=trim(GETPOST('search_customer_code'));
@@ -70,7 +71,7 @@ $search_idprof5=trim(GETPOST('search_idprof5'));
 $search_idprof6=trim(GETPOST('search_idprof6'));
 $search_sale=trim(GETPOST("search_sale",'int'));
 $search_categ=trim(GETPOST("search_categ",'int'));
-$search_country=GETPOST("search_country",'int');
+$search_country=GETPOST("search_country",'intcomma');
 $search_type_thirdparty=GETPOST("search_type_thirdparty",'int');
 $search_status=GETPOST("search_status",'int');
 $search_type=GETPOST('search_type','alpha');
@@ -151,7 +152,8 @@ $checkedprofid6=0;
 $checkprospectlevel=(in_array($contextpage, array('prospectlist')) ? 1 : 0);
 $checkstcomm=(in_array($contextpage, array('prospectlist')) ? 1 : 0);
 $arrayfields=array(
-    's.nom'=>array('label'=>"Company", 'checked'=>1),
+    's.nom'=>array('label'=>"ThirdPartyName", 'checked'=>1),
+    's.name_alias'=>array('label'=>"AliasNameShort", 'checked'=>1),
     's.barcode'=>array('label'=>"Gencod", 'checked'=>1, 'enabled'=>(! empty($conf->barcode->enabled))),
     's.code_client'=>array('label'=>"CustomerCodeShort", 'checked'=>$checkedcustomercode),
     's.code_fournisseur'=>array('label'=>"SupplierCodeShort", 'checked'=>$checkedsuppliercode, 'enabled'=>(! empty($conf->fournisseur->enabled))),
@@ -210,6 +212,7 @@ if (empty($reshook))
     if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
     {
         $search_nom='';
+        $search_alias='';
         $search_categ=0;
         $search_sale='';
     	$search_barcode="";
@@ -406,6 +409,7 @@ if ($search_categ > 0)    $sql.= " AND cs.fk_categorie = ".$db->escape($search_c
 if ($search_categ == -2)  $sql.= " AND cs.fk_categorie IS NULL";
 if ($search_all)      $sql.= natural_search(array_keys($fieldstosearchall), $search_all);
 if ($search_nom)      $sql.= natural_search("s.nom",$search_nom);
+if ($search_alias)    $sql.= natural_search("s.name_alias",$search_alias);
 if ($search_nom_only) $sql.= natural_search("s.nom",$search_nom_only);
 if ($search_customer_code) $sql.= natural_search("s.code_client",$search_customer_code);
 if ($search_supplier_code) $sql.= natural_search("s.code_fournisseur",$search_supplier_code);
@@ -488,37 +492,38 @@ llxHeader('',$langs->trans("ThirdParty"),$help_url);
 $param='';
 if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-if ($search_all != '') $param = "&amp;sall=".urlencode($search_all);
-if ($sall != '') $param .= "&amp;sall=".urlencode($sall);
-if ($search_categ > 0) $param.='&amp;search_categ='.urlencode($search_categ);
-if ($search_sale > 0)	$param.='&amp;search_sale='.urlencode($search_sale);
-if ($search_nom != '') $param.= "&amp;search_nom=".urlencode($search_nom);
-if ($search_town != '') $param.= "&amp;search_town=".urlencode($search_town);
-if ($search_zip != '') $param.= "&amp;search_zip=".urlencode($search_zip);
-if ($search_phone != '') $param.= "&amp;search_phone=".urlencode($search_phone);
-if ($search_email != '') $param.= "&amp;search_email=".urlencode($search_email);
-if ($search_url != '') $param.= "&amp;search_url=".urlencode($search_url);
-if ($search_state != '') $param.= "&amp;search_state=".urlencode($search_state);
-if ($search_country != '') $param.= "&amp;search_country=".urlencode($search_country);
-if ($search_customer_code != '') $param.= "&amp;search_customer_code=".urlencode($search_customer_code);
-if ($search_supplier_code != '') $param.= "&amp;search_supplier_code=".urlencode($search_supplier_code);
-if ($search_account_customer_code != '') $param.= "&amp;search_account_customer_code=".urlencode($search_account_customer_code);
-if ($search_account_supplier_code != '') $param.= "&amp;search_account_supplier_code=".urlencode($search_account_supplier_code);
-if ($search_barcode != '') $param.= "&amp;sbarcode=".urlencode($search_barcode);
-if ($search_idprof1 != '') $param.= '&amp;search_idprof1='.urlencode($search_idprof1);
-if ($search_idprof2 != '') $param.= '&amp;search_idprof2='.urlencode($search_idprof2);
-if ($search_idprof3 != '') $param.= '&amp;search_idprof3='.urlencode($search_idprof3);
-if ($search_idprof4 != '') $param.= '&amp;search_idprof4='.urlencode($search_idprof4);
-if ($search_idprof5 != '') $param.= '&amp;search_idprof5='.urlencode($search_idprof5);
-if ($search_idprof6 != '') $param.= '&amp;search_idprof6='.urlencode($search_idprof6);
-if ($search_country != '') $param.='&amp;search_country='.urlencode($search_country);
-if ($search_type_thirdparty != '') $param.='&amp;search_type_thirdparty='.urlencode($search_type_thirdparty);
-if ($optioncss != '') $param.='&amp;optioncss='.urlencode($optioncss);
-if ($search_status != '') $param.='&amp;search_status='.urlencode($search_status);
+if ($search_all != '') $param = "&sall=".urlencode($search_all);
+if ($sall != '') $param .= "&sall=".urlencode($sall);
+if ($search_categ > 0) $param.='&search_categ='.urlencode($search_categ);
+if ($search_sale > 0)	$param.='&search_sale='.urlencode($search_sale);
+if ($search_nom != '') $param.= "&search_nom=".urlencode($search_nom);
+if ($search_alias != '') $param.= "&search_alias=".urlencode($search_alias);
+if ($search_town != '') $param.= "&search_town=".urlencode($search_town);
+if ($search_zip != '') $param.= "&search_zip=".urlencode($search_zip);
+if ($search_phone != '') $param.= "&search_phone=".urlencode($search_phone);
+if ($search_email != '') $param.= "&search_email=".urlencode($search_email);
+if ($search_url != '') $param.= "&search_url=".urlencode($search_url);
+if ($search_state != '') $param.= "&search_state=".urlencode($search_state);
+if ($search_country != '') $param.= "&search_country=".urlencode($search_country);
+if ($search_customer_code != '') $param.= "&search_customer_code=".urlencode($search_customer_code);
+if ($search_supplier_code != '') $param.= "&search_supplier_code=".urlencode($search_supplier_code);
+if ($search_account_customer_code != '') $param.= "&search_account_customer_code=".urlencode($search_account_customer_code);
+if ($search_account_supplier_code != '') $param.= "&search_account_supplier_code=".urlencode($search_account_supplier_code);
+if ($search_barcode != '') $param.= "&sbarcode=".urlencode($search_barcode);
+if ($search_idprof1 != '') $param.= '&search_idprof1='.urlencode($search_idprof1);
+if ($search_idprof2 != '') $param.= '&search_idprof2='.urlencode($search_idprof2);
+if ($search_idprof3 != '') $param.= '&search_idprof3='.urlencode($search_idprof3);
+if ($search_idprof4 != '') $param.= '&search_idprof4='.urlencode($search_idprof4);
+if ($search_idprof5 != '') $param.= '&search_idprof5='.urlencode($search_idprof5);
+if ($search_idprof6 != '') $param.= '&search_idprof6='.urlencode($search_idprof6);
+if ($search_country != '') $param.='&search_country='.urlencode($search_country);
+if ($search_type_thirdparty != '') $param.='&search_type_thirdparty='.urlencode($search_type_thirdparty);
+if ($optioncss != '') $param.='&optioncss='.urlencode($optioncss);
+if ($search_status != '') $param.='&search_status='.urlencode($search_status);
 if ($search_stcomm != '') $param.='&search_stcomm='.$search_stcomm;
 if ($search_level_from != '') $param.='&search_level_from='.$search_level_from;
 if ($search_level_to != '') $param.='&search_level_to='.$search_level_to;
-if ($type != '') $param.='&amp;type='.urlencode($type);
+if ($type != '') $param.='&type='.urlencode($type);
 // Add $param from extra fields
 foreach ($search_array_options as $key => $val)
 {
@@ -633,6 +638,12 @@ if (! empty($arrayfields['s.nom']['checked']))
 	print '<input class="flat searchstring" type="text" name="search_nom" size="8" value="'.dol_escape_htmltag($search_nom).'">';
 	print '</td>';
 }
+if (! empty($arrayfields['s.name_alias']['checked']))
+{
+	print '<td class="liste_titre">';
+	print '<input class="flat searchstring" type="text" name="search_alias" size="8" value="'.dol_escape_htmltag($search_alias).'">';
+	print '</td>';
+}
 // Barcode
 if (! empty($arrayfields['s.barcode']['checked']))
 {
@@ -882,6 +893,7 @@ print "</tr>\n";
 
 print '<tr class="liste_titre">';
 if (! empty($arrayfields['s.nom']['checked']))                     print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"],"s.nom","",$param,"",$sortfield,$sortorder);
+if (! empty($arrayfields['s.name_alias']['checked']))              print_liste_field_titre($arrayfields['s.name_alias']['label'], $_SERVER["PHP_SELF"],"s.name_alias","",$param,"",$sortfield,$sortorder);
 if (! empty($arrayfields['s.barcode']['checked']))                 print_liste_field_titre($arrayfields['s.barcode']['label'], $_SERVER["PHP_SELF"], "s.barcode",$param,'','',$sortfield,$sortorder);
 if (! empty($arrayfields['s.code_client']['checked']))             print_liste_field_titre($arrayfields['s.code_client']['label'],$_SERVER["PHP_SELF"],"s.code_client","",$param,'',$sortfield,$sortorder);
 if (! empty($arrayfields['s.code_fournisseur']['checked']))        print_liste_field_titre($arrayfields['s.code_fournisseur']['label'],$_SERVER["PHP_SELF"],"s.code_fournisseur","",$param,'',$sortfield,$sortorder);
@@ -948,7 +960,6 @@ while ($i < min($num, $limit))
 	$companystatic->code_compta_fournisseur=$obj->code_compta_fournisseur;
 
    	$companystatic->fk_prospectlevel=$obj->fk_prospectlevel;
-   	$companystatic->name_alias=$obj->name_alias;
 
 	print '<tr class="oddeven">';
 	if (! empty($arrayfields['s.nom']['checked']))
@@ -958,6 +969,14 @@ while ($i < min($num, $limit))
 		print "</td>\n";
         if (! $i) $totalarray['nbfield']++;
 	}
+	if (! empty($arrayfields['s.name_alias']['checked']))
+	{
+	    $companystatic->name_alias=$obj->name_alias;   // Added after the getNomUrl
+	    print '<td class="tdoverflowmax200">';
+	    print $companystatic->name_alias;
+	    print "</td>\n";
+	    if (! $i) $totalarray['nbfield']++;
+	}
 	// Barcode
     if (! empty($arrayfields['s.barcode']['checked']))
 	{

From ee8924e1015fe3e5a14acdb3a99c219fe96b1e20 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Jun 2017 10:23:38 +0200
Subject: [PATCH 356/438] Fix position of accounting periods

---
 htdocs/core/menus/init_menu_auguria.sql |  4 ++--
 htdocs/core/menus/standard/eldy.lib.php | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 5aa272380cc..b40eb4bafa9 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -220,6 +220,8 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2460__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_tax',           2451__+MAX_llx_menu__, '/admin/dict.php?id=7&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuTaxAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 50, __ENTITY__);
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2461__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_expensereport', 2451__+MAX_llx_menu__, '/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuExpenseReportAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 60, __ENTITY__);
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2462__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_product',       2451__+MAX_llx_menu__, '/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuProductsAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 70, __ENTITY__);
+	-- Accounting period
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin" && $conf->global->MAIN_FEATURES_LEVEL > 0', __HANDLER__, 'left', 2450__+MAX_llx_menu__,  'accountancy', 'accountancy_admin_period', 2451__+MAX_llx_menu__, '/accountancy/admin/fiscalyear.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'FiscalPeriod', 1, 'admin', '', '', 2, 80, __ENTITY__);
 	-- Binding
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2401__+MAX_llx_menu__, 'accountancy', 'dispatch_customer', 2400__+MAX_llx_menu__, '/accountancy/customer/index.php?leftmenu=dispatch_customer', 'CustomersVentilation', 1, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 2, __ENTITY__);
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="dispatch_customer"', __HANDLER__, 'left', 2402__+MAX_llx_menu__, 'accountancy', '', 2401__+MAX_llx_menu__, '/accountancy/customer/list.php', 'ToDispatch', 2, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 3, __ENTITY__);
@@ -245,8 +247,6 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2445__+MAX_llx_menu__, 'accountancy', '', 2440__+MAX_llx_menu__, '/compta/stats/casoc.php?leftmenu=ca', 'ByCompanies', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 22, __ENTITY__);
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2446__+MAX_llx_menu__, 'accountancy', '', 2440__+MAX_llx_menu__, '/compta/stats/cabyuser.php?leftmenu=ca', 'ByUsers', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 23, __ENTITY__);
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2447__+MAX_llx_menu__, 'accountancy', '', 2440__+MAX_llx_menu__, '/compta/stats/cabyprodserv.php?leftmenu=ca', 'ByProductsAndServices', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 24, __ENTITY__);
-	-- Accounting period
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2450__+MAX_llx_menu__,  'accountancy', 'accountancy_admin_period', 2400__+MAX_llx_menu__, '/accountancy/admin/fiscalyear.php?mainmenu=setup', 'FiscalPeriod', 1, 'admin', '', '', 2, 4, __ENTITY__);
 -- Rapports compta simple
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled', __HANDLER__, 'left', 2700__+MAX_llx_menu__, 'accountancy', 'ca', 6__+MAX_llx_menu__, '/compta/resultat/index.php?leftmenu=ca&amp;mainmenu=accountancy', 'Reportings', 0, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 11, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2701__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/resultat/index.php?leftmenu=ca', 'ReportInOut', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 0, __ENTITY__);
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 66fe9f993a9..e96ac4a7193 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -966,7 +966,13 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				{
 				    if (preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/don/admin/donation.php?from=accountancy&mainmenu=accountancy&amp;leftmenu=accountancy_admin", $langs->trans("MenuDonationAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_donation', 47);
 				}*/
-				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/productaccount.php?mainmenu=accountancy&amp;leftmenu=accountancy_admin", $langs->trans("MenuProductsAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_product', 50);
+				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuProductsAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_product', 50);
+
+				// Fiscal year
+				if ($conf->global->MAIN_FEATURES_LEVEL > 0)     // Not yet used. In a future will lock some periods.
+				{
+				    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/admin/fiscalyear.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("FiscalPeriod"), 2, $user->rights->accounting->fiscalyear, '', $mainmenu, 'fiscalyear');
+				}
 
 				// Binding
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/customer/index.php?leftmenu=accountancy_dispatch_customer&amp;mainmenu=accountancy",$langs->trans("CustomersVentilation"),1,$user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_customer');
@@ -1039,12 +1045,6 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/',$leftmenu)) $newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report",$langs->trans("ByCompanies"),3,$user->rights->accounting->comptarapport->lire);
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/',$leftmenu)) $newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report",$langs->trans("ByUsers"),3,$user->rights->accounting->comptarapport->lire);
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/',$leftmenu)) $newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=accountancy_report", $langs->trans("ByProductsAndServices"),3,$user->rights->accounting->comptarapport->lire);
-
-				// Fiscal year
-				if ($conf->global->MAIN_FEATURES_LEVEL > 0)     // Not yet used. In a future will lock some periods.
-				{
-				    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/admin/fiscalyear.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("FiscalPeriod"),1,$user->rights->accounting->fiscalyear, '', $mainmenu, 'fiscalyear');
-				}
 			}
 
 			// Accountancy (simple)

From 3b2eb97d722a8d8f9cb081c12ba84faea4c54802 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Jun 2017 10:29:07 +0200
Subject: [PATCH 357/438] Fix menu position

---
 htdocs/core/menus/standard/eldy.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 65488a3181e..cd53f913780 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -983,7 +983,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				// Fiscal year
 				if ($conf->global->MAIN_FEATURES_LEVEL > 0)     // Not yet used. In a future will lock some periods.
 				{
-				    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/admin/fiscalyear.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("FiscalPeriod"), 2, $user->rights->accounting->fiscalyear, '', $mainmenu, 'fiscalyear');
+				    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/fiscalyear.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("FiscalPeriod"), 2, $user->rights->accounting->fiscalyear, '', $mainmenu, 'fiscalyear');
 				}
 
 				// Binding

From 509aad9bcea13498dc561b4f40ffe303eeb44824 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Jun 2017 11:35:53 +0200
Subject: [PATCH 358/438] Fix README

---
 htdocs/api/README.md                          |  47 ++--
 htdocs/modulebuilder/README.md                | 216 +-----------------
 htdocs/modulebuilder/template/README.md       |  94 ++++++++
 .../template/dev/git-hooks/README             |  15 ++
 htdocs/theme/eldy/style.css.php               |   7 +
 htdocs/theme/md/style.css.php                 |   7 +
 6 files changed, 163 insertions(+), 223 deletions(-)
 create mode 100644 htdocs/modulebuilder/template/dev/git-hooks/README

diff --git a/htdocs/api/README.md b/htdocs/api/README.md
index b4ff7a89f7b..d57c9e61ef1 100644
--- a/htdocs/api/README.md
+++ b/htdocs/api/README.md
@@ -1,41 +1,54 @@
-API REST howto
-==============
+API REST
+========
 
-This directory contains files to make Dolibarr a server of REST Web Services.
-It depends on external library Restler.
+## Integrate your ERP with any other applications using Dolibarr APIs, Triggers or Hooks
+ 
+This module provides the service to make Dolibarr a server of REST Web Services. It depends on external library Restler.
+
+Extract any data or push insert, update or delete record using our new REST APIs. Using standard HTTP and Json format, it is compatible with any language (PHP, Java, Ruby, Python, C#, C++, JavaScript, JQuery, Basic, ...). Use the embedded APIs explorer tool to test APIs or get generated URLs to use in your own code.
 
 
-Explore the api
----------------
+<div align="center">
+  <img class="imgdoc" src="https://www.dolibarr.org//images/doc_apirest.png" alt="Dolibarr API explorer"/>
+</div>
 
-You can explore API method by using web interface : https://**yourdolibarr.tld**/mydolibarr/api/admin/explorer.php (replace **yourdolibarr.tld** by real hostname of your Dolibarr installation)
 
-Access to the API
+
+Explore the APIs
+----------------
+
+You can explore all available APIs by using the API explorer : [**yourdolibarr.tld**/api/index.php/explorer](../api/index.php/explorer) (replace **yourdolibarr.tld** by real hostname of your Dolibarr installation)
+
+
+Access to an API
 -----------------
 
-> **Warning : access to the API should (or better : must!) be secured with SSL connection**
+> **Warning : access to any API should (or better : must!) be secured with SSL connection**
 
-To access to the API you need a token to identify. When you access the API for the first time, you need to log in with user name and password to get a token. **Only**  this token will allow to access API with.
+To access to the API you need a token to identify. **Only**  this token will allow to access API with.
+The token is dedicated to a user and it **must** be put into requests as **DOLAPIKEY** parameter in HTTP header (or among URL parameters, but this is less secured). 
 
-To log in with the API, use this uri : https://**yourdolibarr.tld**/mydolibarr/api/index.php/login?login=**username**&password=**password** (replace bold strings with real values)
+To get a token you can:
 
-The token will be saved by Dolibarr for next user accesses to the API and it **must** be put into request uri as **api_key** parameter. 
+* Edit the user card to set the value of token. Each user can have a different token.
+* or Call the *login* API with login and password. This will return the value of token for the user used to login.
 
 Then call other services with
 
-https://**yourdolibarr.tld**/mydolibarr/api/index.php/otherservice?api_key=**api_key**
+https://**yourdolibarr.tld**/mydolibarr/api/index.php/otherservice?DOLAPIKEY=**api_key**
 
 
-Develop the API
----------------
+Develop an API
+--------------
 
 The API uses Lucarast Restler framework. Please check documentation https://www.luracast.com/products/restler and examples http://help.luracast.com/restler/examples/ 
+
 Github contains also usefull informations : https://github.com/Luracast/Restler
 
-To implement it into Dolibarr, we need to create a specific class for object we want to use. A skeleton file is available into /dev directory : *skeleton_api_class.class.php* 
+To implement it into Dolibarr, you need to create a specific class for object we want to use. A skeleton file is available into /modulebuilder/class directory : *api_mymodule_class.class.php* 
 The API class file must be put into object class directory, with specific file name. By example, API class file for '*myobject*' must be put as : /htdocs/*myobject*/class/api_*myobject*.class.php. Class must be named  **MyobjectApi**.
 
-If a module provide several object, use a different name for '*myobject*' and put the file into the same directory. 
+If a module provide several object, use a different name for *'myobject'* and put the file into the same directory. 
 
 **Define url for methods**
 
diff --git a/htdocs/modulebuilder/README.md b/htdocs/modulebuilder/README.md
index 548e87b7912..e5d9e63d7a3 100644
--- a/htdocs/modulebuilder/README.md
+++ b/htdocs/modulebuilder/README.md
@@ -1,10 +1,15 @@
-Dolibarr Module Template (aka My Module)
-========================================
+Module Builder
+==============
 
-This is a full featured module template for Dolibarr.
-It's a tool for module developers to kickstart their project and give an hands-on sample of which features Dolibarr has to offer for module development.
+This is a module to provide embedded tools to develop your own application/features inside Dolibarr ERP CRM software.
+It provide tools for module developers to kickstart their project and give an hands-on sample of which features Dolibarr
+has to offer for module development.
+
+If you don't need to develop your own module/application, you just don't need this.
+
+
+After enabling this module, you should find features to generate or edit modules/application from menu *Home - Admin tools - Module builder* 
 
-If you're not a module developer you have no use for this.
 
 Documentation
 -------------
@@ -12,204 +17,3 @@ Documentation
 [Module tutorial](https://wiki.dolibarr.org/index.php/Module_development)
 
 [Dolibarr development](https://wiki.dolibarr.org/index.php/Developer_documentation)
-
-### Translations
-
-Dolibarr uses [Transifex](https://transifex.com) to manage it's translations.
-
-This template also contains a sample configuration for Transifex managed translations under the hidden [.tx](.tx) directory.
-
-For more informations, see the [translator's documentation](http://wiki.dolibarr.org/index.php/Translator_documentation).
-
-There is a [Transifex project](https://transifex.com/projects/p/dolibarr-module-template) for this module.
-
-Install
--------
-
-### Manually
-
-- Make sure Dolibarr is already installed and configured on your workstation or development server.
-
-- In your Dolibarr installation directory, edit the ```htdocs/conf/conf.php``` file
-
-- Find the following lines:
-    ```php
-    //$dolibarr_main_url_root_alt ...
-    //$dolibarr_main_document_root_alt ...
-    ```
-
-- Uncomment these lines (delete the leading ```//```) and assign a sensible value according to your Dolibarr installation
-
-    For example :
-
-    - UNIX:
-        ```php
-        $dolibarr_main_url_root = 'http://localhost/Dolibarr/htdocs';
-        $dolibarr_main_document_root = '/var/www/Dolibarr/htdocs';
-        $dolibarr_main_url_root_alt = '/custom';
-        $dolibarr_main_document_root_alt = '/var/www/Dolibarr/htdocs/custom';
-        ```
-
-    - Windows:
-        ```php
-        $dolibarr_main_url_root = 'http://localhost/Dolibarr/htdocs';
-        $dolibarr_main_document_root = 'C:/My Web Sites/Dolibarr/htdocs';
-        $dolibarr_main_url_root_alt = '/custom';
-        $dolibarr_main_document_root_alt = 'C:/My Web Sites/Dolibarr/htdocs/custom';
-        ```
-
-    For more information about the ```conf.php``` file take a look at the conf.php.example file.
-
-- Clone the repository in ```$dolibarr_main_document_root_alt/mymodule```
-
-*(You may have to create the ```htdocs/custom``` directory first if it doesn't exist yet.)*
-```sh
-git clone git@github.com:Dolibarr/dolibarr-module-template.git mymodule
-```
-
-- Install [Composer](https://getcomposer.org) dependencies:
-```sh
-composer install
-```
-
-Follow the [final steps](#final_steps).
-
-### Using [Composer](https://getcomposer.org)
-Require this repository from Dolibarr's composer:
-```json
-{
-  "repositories": [
-    {
-      "type": "vcs",
-      "url": "https://github.com/dolibarr/dolibarr-module-template"
-    }
-  ],
-  "require": {
-    "dolibarr/mymodule": "dev-master"
-  }
-}
-```
-
-Run
-```sh
-composer update
-```
-
-Follow the [final steps](#final_steps).
-
-### <a name="final_steps"></a>Final steps
-
-From your browser:
-
-  - Log into Dolibarr as a super-administrator
-  - Under "Setup" -> "Other setup", set ```MAIN_FEATURES_LEVEL``` to ```2```
-  - Go to "Setup" -> "Modules"
-  - The module is under one of the tabs
-  - You should now be able to enable the new module and start coding ;)
-
-Provided tools
---------------
-
-### Starting a new module
-
-A [script](dev/newmodule.sh) allows you to rename most of the code to your own module name.  
-It requires ```find```, ```sed``` and ```rename``` commands on your system.  
-Just make sure you provide a CamelCase name.
-```sh
-./dev/newmodule.sh [NewName]
-```
-
-Some work still has to be done manually:
-- Rename the directory holding the code
-- Maybe rename some other bits (Search for 'my' in filenames and code)
-- Update your module ID in the module descriptor
-- Update your language files
-    - Keywords based on the module ID
-    - String referencing the template
-- Remove the features you don't plan to use
-- Fill the copyright notices at the top of each file
-- Add your logo: see [images README](dev/img/README.md) for specifications
-- Start a new GIT history 
-```
-git checkout --orphan [new_branch_name]
-```
-- Build an awesome module ;)
-
-### Composer scripts
-
-Only the main commands are listed here.  
-See the [composer comments](composer-comments.md) or the [composer.json](composer.json) itself for more informations.
-
-#### Check
-
-Run a linter, a PHP compatibility version checker and checks coding style.
-```sh
-composer check
-```
-
-#### Test
-  
-Run unit and functional tests.
-```sh
-composer test
-```
-
-#### Doc
-Build code and user documentation.
-
-#### Release
-
-Run the checks and tests then build a distribution ZIP.
-```sh
-composer release
-```
-
-#### Git hooks
-
-Optional [GIT hooks](https://git-scm.com/book/it/v2/Customizing-Git-Git-Hooks) are provided.
-These are just wrappers calling composer scripts.  
-They ensure best practices are followed during module development.  
-
-Install:
-```sh
-composer git_hooks_install
-```
-
-Remove:
-```sh
-composer git_hooks_remove
-```
-
-## Publishing the module
-The de-facto standard for publishing and marketing modules for Dolibarr is the [Dolistore](https://www.dolistore.com).  
-Templates for required images and texts are [provided](dev/dolistore).  
-Check the dedicated [README](dev/dolistore/README.md) for more informations.
-
-
-Licenses
---------
-
-### Main code
-
-![GPLv3 logo](img/gplv3.png)
-
-GPLv3 or (at your option) any later version.
-
-See [COPYING](COPYING) for more information.
-
-### Other Licenses
-
-#### [Parsedown](http://parsedown.org/)
-
-Used to display this README in the module's about page.  
-Licensed under MIT.
-
-#### [GNU Licenses logos](https://www.gnu.org/graphics/license-logos.html)
-
-Public domain
-
-#### Documentation
-
-All texts and readmes.
-
-![GFDL logo](img/gfdl.png)
diff --git a/htdocs/modulebuilder/template/README.md b/htdocs/modulebuilder/template/README.md
index 3d2d8f6102b..3385110838d 100644
--- a/htdocs/modulebuilder/template/README.md
+++ b/htdocs/modulebuilder/template/README.md
@@ -4,3 +4,97 @@
 MyModuleDescription
 
 Other modules are available on <a href="https://www.dolistore.com" target="_new">Dolistore.com</a>.
+
+
+
+### Translations
+
+This module contains a sample configuration for Transifex, under the hidden directory [.tx](.tx), so it is possible to manage translation using this service. 
+Translations can be define manually by editing files into directories [langs](langs). 
+
+<!--
+For more informations, see the [translator's documentation](https://wiki.dolibarr.org/index.php/Translator_documentation).
+
+There is a [Transifex project](https://transifex.com/projects/p/dolibarr-module-template) for this module.
+-->
+
+
+<!--
+
+Install
+-------
+
+### Manually
+
+- Make sure Dolibarr is already installed and configured on your workstation or development server.
+
+- In your Dolibarr installation directory, edit the ```htdocs/conf/conf.php``` file
+
+- Find the following lines:
+    ```php
+    //$dolibarr_main_url_root_alt ...
+    //$dolibarr_main_document_root_alt ...
+    ```
+
+- And uncomment these lines (delete the leading ```//```) and assign a sensible value according to your Dolibarr installation
+
+    For example :
+
+    - UNIX:
+        ```php
+        $dolibarr_main_url_root = 'http://localhost/Dolibarr/htdocs';
+        $dolibarr_main_document_root = '/var/www/Dolibarr/htdocs';
+        $dolibarr_main_url_root_alt = '/custom';
+        $dolibarr_main_document_root_alt = '/var/www/Dolibarr/htdocs/custom';
+        ```
+
+    - Windows:
+        ```php
+        $dolibarr_main_url_root = 'http://localhost/Dolibarr/htdocs';
+        $dolibarr_main_document_root = 'C:/My Web Sites/Dolibarr/htdocs';
+        $dolibarr_main_url_root_alt = '/custom';
+        $dolibarr_main_document_root_alt = 'C:/My Web Sites/Dolibarr/htdocs/custom';
+        ```
+
+    For more information about the ```conf.php``` file take a look at the conf.php.example file.
+
+- Clone the repository in ```$dolibarr_main_document_root_alt/mymodule```
+
+```sh
+git clone git@github.com:Dolibarr/dolibarr-module-template.git mymodule
+```
+
+### <a name="final_steps"></a>Final steps
+
+From your browser:
+
+  - Log into Dolibarr as a super-administrator
+  - Go to "Setup" -> "Modules"
+  - You should now be able to find and enable the module
+
+
+
+## Publishing the module
+The de-facto standard for publishing and marketing modules for Dolibarr is the [Dolistore](https://www.dolistore.com).  
+Templates for required images and texts are [provided](dev/dolistore).  
+Check the dedicated [README](dev/dolistore/README.md) for more informations.
+
+-->
+
+
+Licenses
+--------
+
+### Main code
+
+![GPLv3 logo](img/gplv3.png)
+
+GPLv3 or (at your option) any later version.
+
+See [COPYING](COPYING) for more information.
+
+#### Documentation
+
+All texts and readmes.
+
+![GFDL logo](img/gfdl.png)
diff --git a/htdocs/modulebuilder/template/dev/git-hooks/README b/htdocs/modulebuilder/template/dev/git-hooks/README
new file mode 100644
index 00000000000..a5d024c1bf5
--- /dev/null
+++ b/htdocs/modulebuilder/template/dev/git-hooks/README
@@ -0,0 +1,15 @@
+# Git hooks
+
+Optional [GIT hooks](https://git-scm.com/book/it/v2/Customizing-Git-Git-Hooks) are provided.
+These are just wrappers calling composer scripts.  
+They ensure best practices are followed during module development.  
+
+Install:
+```sh
+composer git_hooks_install
+```
+
+Remove:
+```sh
+composer git_hooks_remove
+```
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 562d707c454..67359ea650f 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -666,11 +666,18 @@ div.myavailability {
 	margin-bottom: 12px;
 }
 
+
 /* For the long description of module */
 .moduledesclong p img, .moduledesclong p a img {
     max-width: 90% !important;
     height: auto !important;
 }
+.imgdoc {
+    margin: 18px;
+    border: 1px solid #ccc;
+    box-shadow: 1px 1px 25px #aaa;
+    max-width: calc(100% - 56px);
+}
 
 
 /* DOL_XXX for future usage (when left menu has been removed). If we do not use datatable */
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 802eb46f6af..8543b2ecc0f 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -667,11 +667,18 @@ div.myavailability {
 	margin-bottom: 12px;
 }
 
+
 /* For the long description of module */
 .moduledesclong p img,.moduledesclong p a img {
     max-width: 90% !important;
     height: auto !important;
 }
+.imgdoc {
+    margin: 18px;
+    border: 1px solid #ccc;
+    box-shadow: 1px 1px 25px #aaa;
+    max-width: calc(100% - 56px);
+}
 
 
 /* DOL_XXX for future usage (when left menu has been removed). If we do not use datatable */

From 1eee7297dce5fef69dcfc3a02288289a5948bfeb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Jun 2017 12:56:55 +0200
Subject: [PATCH 359/438] Fix typo

---
 htdocs/api/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/api/README.md b/htdocs/api/README.md
index d57c9e61ef1..0b773888882 100644
--- a/htdocs/api/README.md
+++ b/htdocs/api/README.md
@@ -1,7 +1,7 @@
 API REST
 ========
 
-## Integrate your ERP with any other applications using Dolibarr APIs, Triggers or Hooks
+## Integrate your ERP with any other applications using Dolibarr APIs
  
 This module provides the service to make Dolibarr a server of REST Web Services. It depends on external library Restler.
 

From b0c5616ff08c62d8c571abfd08b3ad705f1521eb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Jun 2017 16:01:18 +0200
Subject: [PATCH 360/438] Fix in the way markdown README and ChangeLog are
 output on module page.

---
 htdocs/admin/modulehelp.php                   | 43 +++++++++++-----
 htdocs/core/modules/DolibarrModules.class.php | 51 ++++++++++++++++++-
 2 files changed, 79 insertions(+), 15 deletions(-)

diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index 21e3afb3921..143ebc627f8 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -225,20 +225,6 @@ asort($orders);
 //var_dump($modules);
 
 
-
-$h = 0;
-
-$head[$h][0] = DOL_URL_ROOT."/admin/modulehelp.php?id=".$id.'&mode=desc';
-$head[$h][1] = $langs->trans("Description");
-$head[$h][2] = 'desc';
-$h++;
-
-$head[$h][0] = DOL_URL_ROOT."/admin/modulehelp.php?id=".$id.'&mode=feature';
-$head[$h][1] = $langs->trans("TechnicalServicesProvided");
-$head[$h][2] = 'feature';
-$h++;
-
-
 $i=0;
 foreach($orders as $tmpkey => $tmpvalue)
 {
@@ -257,6 +243,28 @@ $special = $objMod->special;
 $tab=explode('_',$value);
 $familyposition=$tab[0]; $familykey=$tab[1]; $module_position=$tab[2]; $numero=$tab[3];
 
+
+
+$h = 0;
+
+$head[$h][0] = DOL_URL_ROOT."/admin/modulehelp.php?id=".$id.'&mode=desc';
+$head[$h][1] = $langs->trans("Description");
+$head[$h][2] = 'desc';
+$h++;
+
+$head[$h][0] = DOL_URL_ROOT."/admin/modulehelp.php?id=".$id.'&mode=feature';
+$head[$h][1] = $langs->trans("TechnicalServicesProvided");
+$head[$h][2] = 'feature';
+$h++;
+
+if ($objMod->isCoreOrExternalModule() == 'external')
+{
+    $head[$h][0] = DOL_URL_ROOT."/admin/modulehelp.php?id=".$id.'&mode=changelog';
+    $head[$h][1] = $langs->trans("ChangeLog");
+    $head[$h][2] = 'changelog';
+    $h++;
+}
+
 // Check filters
 $modulename=$objMod->getName();
 $moduledesc=$objMod->getDesc();
@@ -536,6 +544,13 @@ if ($mode == 'feature')
 }
 
 
+if ($mode == 'changelog')
+{
+    $changelog=$objMod->getChangeLog();
+    if ($changelog) $text.='<div class="moduledesclong">'.$changelog.'<div>';
+    else $text.='<div class="moduledesclong">'.$langs->trans("NotAvailable").'</div>';
+}
+
 print $text;
 
 
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 37e72024e2a..f05b549fe18 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -652,7 +652,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
             if ((float) DOL_VERSION >= 6.0)
             {
                 @include_once DOL_DOCUMENT_ROOT.'/core/lib/parsemd.lib.php';
-                $content = dolMd2Html($content, 'parsedown', array('doc/'=>dol_buildpath('cabinetmed/doc/', 1)));
+                $content = dolMd2Html($content, 'parsedown', array('doc/'=>dol_buildpath(strtolower($this->name).'/doc/', 1)));
             }
             else
             {
@@ -678,6 +678,55 @@ class DolibarrModules           // Can not be abstract, because we need to insta
         return $content;
     }
 
+    /**
+     * Gives the changelog. First check ChangeLog-la_LA.md then ChangeLog.md
+     *
+     * @return  string  Content of ChangeLog
+     */
+    function getChangeLog()
+    {
+        global $langs;
+        $langs->load("admin");
+
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+
+        $filefound= false;
+
+        // Define path to file README.md.
+        // First check README-la_LA.md then README.md
+        $pathoffile = dol_buildpath(strtolower($this->name).'/ChangeLog-'.$langs->defaultlang.'.md', 0);
+        if (dol_is_file($pathoffile))
+        {
+            $filefound = true;
+        }
+        if (! $filefound)
+        {
+            $pathoffile = dol_buildpath(strtolower($this->name).'/ChangeLog.md', 0);
+            if (dol_is_file($pathoffile))
+            {
+                $filefound = true;
+            }
+        }
+
+        if ($filefound)     // Mostly for external modules
+        {
+            $content = file_get_contents($pathoffile);
+
+            if ((float) DOL_VERSION >= 6.0)
+            {
+                @include_once DOL_DOCUMENT_ROOT.'/core/lib/parsemd.lib.php';
+                $content = dolMd2Html($content, 'parsedown', array('doc/'=>dol_buildpath(strtolower($this->name).'/doc/', 1)));
+            }
+            else
+            {
+                $content = nl2br($content);
+            }
+        }
+
+        return $content;
+    }
+
     /**
      * Gives the publisher name
      *

From e79f3715b4cfb5c07071c4edbf773503089ac75b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Jun 2017 16:21:25 +0200
Subject: [PATCH 361/438] FIX #7048 #6075

---
 htdocs/compta/bank/bankentries.php | 161 +++++++++++++++--------------
 1 file changed, 81 insertions(+), 80 deletions(-)

diff --git a/htdocs/compta/bank/bankentries.php b/htdocs/compta/bank/bankentries.php
index 4845012a3e0..c3afc9634cf 100644
--- a/htdocs/compta/bank/bankentries.php
+++ b/htdocs/compta/bank/bankentries.php
@@ -107,7 +107,7 @@ $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (! $sortorder) $sortorder='ASC';
-if (! $sortfield) $sortfield='b.datev';
+if (! $sortfield) $sortfield='b.datev, b.dateo, b.rowid';
 
 $mode_balance_ok=false;
 //if (($sortfield == 'b.datev' || $sortfield == 'b.datev, b.dateo, b.rowid'))    // TODO Manage balance when account not selected
@@ -194,7 +194,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
 	$search_num_releve='';
 	$search_conciliated='';
 	$thirdparty='';
-	
+
 	$account="";
 	if ($id > 0 || ! empty($ref)) $account=$object->id;
 }
@@ -396,18 +396,18 @@ if ($id > 0 || ! empty($ref))
     foreach ($bankcateg->fetchAll() as $bankcategory) {
         $options[$bankcategory->id] = $bankcategory->label;
     }
-    
+
     // Bank card
-    
+
     $head=bank_prepare_head($object);
     dol_fiche_head($head,'journal',$langs->trans("FinancialAccount"),0,'account');
-    
+
     $linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/index.php">'.$langs->trans("BackToList").'</a>';
-    
+
     dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
-    
+
     dol_fiche_end();
- 
+
 
 
     /*
@@ -416,7 +416,7 @@ if ($id > 0 || ! empty($ref))
     if ($action != 'addline' && $action != 'reconcile')
     {
         print '<div class="tabsAction">';
-    
+
         if ($action != 'addline')
         {
             if (empty($conf->global->BANK_DISABLE_DIRECT_INPUT))
@@ -438,7 +438,7 @@ if ($id > 0 || ! empty($ref))
                 print '<a class="butActionRefused" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("Conciliate").'</a>';
             }
         }
-    
+
         print '</div>';
     }
 }
@@ -524,10 +524,10 @@ if (($id > 0 || ! empty($ref)) && ((string) $page == ''))
     $offset = $limit * $page;
     if ($page < 0) $page = 0;
 }
-if ($page >= $nbtotalofpages) 
+if ($page >= $nbtotalofpages)
 {
     // If we made a search and result has low page than the page number we were on
-    $page = ($nbtotalofpages -1); 
+    $page = ($nbtotalofpages -1);
     $offset = $limit * $page;
     if ($page < 0) $page = 0;
 }
@@ -550,9 +550,9 @@ if ($resql)
 {
 	$var=True;
 	$num = $db->num_rows($resql);
-	
+
 	$arrayofselected=is_array($toselect)?$toselect:array();
-	
+
     // List of mass actions available
     $arrayofmassactions =  array(
         //'presend'=>$langs->trans("SendByMail"),
@@ -561,16 +561,16 @@ if ($resql)
     //if ($user->rights->bank->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
     if ($massaction == 'presend') $arrayofmassactions=array();
     $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
-    
-    
+
+
     // Confirmation delete
     if ($action == 'delete')
     {
         $text=$langs->trans('ConfirmDeleteTransaction');
         print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id.'&rowid='.GETPOST("rowid"), $langs->trans('DeleteTransaction'), $text, 'confirm_delete', null, '', 1);
     }
-    
-    
+
+
     // Lines of title fields
 	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="search_form">'."\n";
 	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -583,7 +583,7 @@ if ($resql)
 	print '<input type="hidden" name="id" value="'.$id.'">';
 	print '<input type="hidden" name="ref" value="'.$ref.'">';
 	if (GETPOST('bid')) print '<input type="hidden" name="bid" value="'.GETPOST("bid").'">';
-	
+
 	// Form to reconcile
 	if ($user->rights->banque->consolidate && $action == 'reconcile')
 	{
@@ -602,7 +602,7 @@ if ($resql)
 	    print '<input class="button" name="confirm_reconcile" type="submit" value="'.$langs->trans("Conciliate").'">';
 	    print ' '.$langs->trans("or").' ';
 	    print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
-	    
+
 	    // Show last bank statements
 	    $nbmax=15;      // We accept to show last 15 receipts (so we can have more than one year)
 	    $liste="";
@@ -644,7 +644,7 @@ if ($resql)
 	if ($user->rights->banque->modifier && $action == 'addline')
 	{
 	    print load_fiche_titre($langs->trans("AddBankRecordLong"),'','');
-	
+
 	    print '<table class="noborder" width="100%">';
 	    print '<tr class="liste_titre">';
 	    print '<td>'.$langs->trans("Date").'</td>';
@@ -656,7 +656,7 @@ if ($resql)
 	    print '<td align=right>'.$langs->trans("Credit").'</td>';
 	    print '<td colspan="2" align="center">&nbsp;</td>';
 	    print '</tr>';
-	
+
 	    print '<tr '.$bcnd[false].'>';
 	    print '<td class="nowrap" colspan="2">';
 	    $form->select_date(empty($dateop)?-1:$dateop,'op',0,0,0,'transaction');
@@ -680,9 +680,9 @@ if ($resql)
 	    print '</td></tr>';
 	    print '</table>';
 	    print '<br>';
-	}	
-	
-	
+	}
+
+
 	/// ajax to adjust value date with plus and less picto
 	print '
     <script type="text/javascript">
@@ -701,11 +701,11 @@ if ($resql)
     	});
     });
     </script>
-    	
-    ';	
-	
+
+    ';
+
 	$i = 0;
-	
+
 	// Title
 	$bankcateg=new BankCateg($db);
 	$morehtml='<div data-role="fieldcontain">';
@@ -713,7 +713,7 @@ if ($resql)
 	$morehtml.='<input type="text" name="pageplusone" id="pageplusone" size="1" class="flat" value="'.($page+1).'">';
 	$morehtml.='/'.$nbtotalofpages.' ';
 	$morehtml.='</div>';
-	
+
 	$picto='title_bank';
 	if ($id > 0 || ! empty($ref)) $picto='';
 	if (GETPOST("bid"))
@@ -725,13 +725,13 @@ if ($resql)
 	{
 		print_barre_liste($langs->trans("BankTransactions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $picto, 0, $morehtml, '', $limit);
 	}
-	
+
 	// We can add page now to param
 	if ($page != '') $param.='&page='.urlencode($page);
-	
-	
+
+
 	$moreforfilter = '';
-	
+
 	$moreforfilter.='<div class="divsearchfield">';
 	$moreforfilter .= $langs->trans('DateOperationShort').' : ';
 	$moreforfilter .= '<div class="nowrap'.($conf->browser->layout=='phone'?' centpercent':'').' inline-block">'.$langs->trans('From') . ' ';
@@ -739,7 +739,7 @@ if ($resql)
 	//$moreforfilter .= ' - ';
 	$moreforfilter .= '<div class="nowrap'.($conf->browser->layout=='phone'?' centpercent':'').' inline-block">'.$langs->trans('to') . ' ' . $form->select_date($search_dt_end, 'search_end_dt', 0, 0, 1, "search_form", 1, 0, 1).'</div>';
 	$moreforfilter .= '</div>';
-	
+
 	$moreforfilter.='<div class="divsearchfield">';
 	$moreforfilter .= $langs->trans('DateValueShort').' : ';
 	$moreforfilter .= '<div class="nowrap'.($conf->browser->layout=='phone'?' centpercent':'').' inline-block">'.$langs->trans('From') . ' ';
@@ -747,25 +747,25 @@ if ($resql)
 	//$moreforfilter .= ' - ';
 	$moreforfilter .= '<div class="nowrap'.($conf->browser->layout=='phone'?' centpercent':'').' inline-block">'.$langs->trans('to') . ' ' . $form->select_date($search_dv_end, 'search_end_dv', 0, 0, 1, "search_form", 1, 0, 1).'</div>';
 	$moreforfilter .= '</div>';
-	
+
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
 	if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
 	else $moreforfilter = $hookmanager->resPrint;
-	
-	if ($moreforfilter) 
+
+	if ($moreforfilter)
 	{
 		print '<div class="liste_titre liste_titre_bydiv centpercent">';
 		print $moreforfilter;
 		print '</div>'."\n";
 	}
-	
+
     $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
     $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-	
+
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-	
+
 	// Fields title
 	print '<tr class="liste_titre">';
 	if (! empty($arrayfields['b.rowid']['checked']))            print_liste_field_titre($arrayfields['b.rowid']['label'],$_SERVER['PHP_SELF'],'b.rowid','',$param,'',$sortfield,$sortorder);
@@ -784,9 +784,9 @@ if ($resql)
 	// Extra fields
 	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 	{
-	   foreach($extrafields->attribute_label as $key => $val) 
+	   foreach($extrafields->attribute_label as $key => $val)
 	   {
-           if (! empty($arrayfields["ef.".$key]['checked'])) 
+           if (! empty($arrayfields["ef.".$key]['checked']))
            {
 				$align=$extrafields->getAlignFlag($key);
 				print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
@@ -802,7 +802,7 @@ if ($resql)
 	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
-	if (! empty($arrayfields['b.rowid']['checked']))            
+	if (! empty($arrayfields['b.rowid']['checked']))
 	{
 	    print '<td class="liste_titre">';
     	print '<input type="text" class="flat" name="search_ref" size="2" value="'.dol_escape_htmltag($search_ref).'">';
@@ -884,25 +884,25 @@ if ($resql)
 
     $balance = 0;    // For balance
 	$balancecalculated = false;
-	
+
 	// Loop on each record
 	$sign = 1;
-	
+
     $totalarray=array();
-    while ($i < min($num,$limit)) 
+    while ($i < min($num,$limit))
     {
         $objp = $db->fetch_object($resql);
 
         // If we are in a situation where we need/can show balance, we calculate the start of balance
         if (! $balancecalculated && ! empty($arrayfields['balance']['checked']) && $mode_balance_ok)
         {
-            if (! $account) 
+            if (! $account)
             {
                 dol_print_error('', 'account is not defined but $mode_balance_ok is true');
                 exit;
             }
-            
-            //Loop on each record
+
+            // Loop on each record before
             $sign = 1;
             $i = 0;
             $sqlforbalance='SELECT SUM(b.amount) as balance';
@@ -912,7 +912,8 @@ if ($resql)
             $sqlforbalance.= " WHERE b.fk_account = ba.rowid";
             $sqlforbalance.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
             $sqlforbalance.= " AND b.fk_account = ".$account;
-            $sqlforbalance.= " AND b.datev < '" . $db->idate($db->jdate($objp->dv)) . "'";
+            //$sqlforbalance.= " AND (b.datev < '" . $db->idate($db->jdate($objp->dv)) . "')";
+            $sqlforbalance.= " AND (b.datev < '" . $db->idate($db->jdate($objp->dv)) . "' OR (b.datev = '" . $db->idate($db->jdate($objp->dv)) . "' AND (b.dateo < '".$db->idate($db->jdate($objp->do))."' OR (b.dateo = '".$db->idate($db->jdate($objp->do))."' AND b.rowid < ".$objp->rowid."))))";
             $resqlforbalance = $db->query($sqlforbalance);
             //print $sqlforbalance;
             if ($resqlforbalance)
@@ -924,12 +925,12 @@ if ($resql)
                 }
             }
             else dol_print_error($db);
-            
+
             $balancecalculated=true;
         }
-        
+
         $balance = price2num($balance + ($sign * $objp->amount),'MT');
-        
+
         if (empty($cachebankaccount[$objp->bankid]))
         {
             $bankaccounttmp = new Account($db);
@@ -941,13 +942,13 @@ if ($resql)
         {
             $bankaccount = $cachebankaccount[$objp->bankid];
         }
-         
+
         $var=!$var;
 
         print "<tr ".$bc[$var].">";
 
         // Ref
-    	if (! empty($arrayfields['b.rowid']['checked']))            
+    	if (! empty($arrayfields['b.rowid']['checked']))
     	{
                 print '<td align="left" class="nowrap">';
                 print "<a href=\"ligne.php?rowid=".$objp->rowid.'">'.img_object($langs->trans("ShowPayment").': '.$objp->rowid, 'account', 'class="classfortooltip"').' '.$objp->rowid."</a> &nbsp; ";
@@ -959,14 +960,14 @@ if ($resql)
     	if (! empty($arrayfields['description']['checked']))
     	{
     	    print "<td>";
-    	
+
     	    //print "<a href=\"ligne.php?rowid=".$objp->rowid."&amp;account=".$objp->fk_account."\">";
     	    $reg=array();
     	    preg_match('/\((.+)\)/i',$objp->label,$reg);	// Si texte entoure de parenthee on tente recherche de traduction
     	    if ($reg[1] && $langs->trans($reg[1])!=$reg[1]) print $langs->trans($reg[1]);
     	    else print dol_trunc($objp->label,40);
     	    //print "</a>&nbsp;";
-    	
+
     	    // Add links after description
     	    $links = $bankaccountstatic->get_url($objp->rowid);
     	    $cachebankaccount=array();
@@ -1054,19 +1055,19 @@ if ($resql)
     	        }
     	        elseif ($links[$key]['type']=='company')
     	        {
-    	            	
+
     	        }
     	        elseif ($links[$key]['type']=='user')
     	        {
-    	            	
+
     	        }
     	        elseif ($links[$key]['type']=='member')
     	        {
-    	            	
+
     	        }
     	        elseif ($links[$key]['type']=='sc')
     	        {
-    	            	
+
     	        }
     	        else
     	        {
@@ -1086,20 +1087,20 @@ if ($resql)
     	            print '</a>';
     	        }
     	    }
-    	    	
+
     	    print '</td>';
     	    if (! $i) $totalarray['nbfield']++;
     	}
-    	
+
         // Date ope
-    	if (! empty($arrayfields['b.dateo']['checked']))            
+    	if (! empty($arrayfields['b.dateo']['checked']))
     	{
     	   print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($objp->do),"day")."</td>\n";
                 if (! $i) $totalarray['nbfield']++;
     	}
 
         // Date value
-    	if (! empty($arrayfields['b.datev']['checked']))            
+    	if (! empty($arrayfields['b.datev']['checked']))
     	{
     	   print '<td align="center" class="nowrap">';
     	   print '<span id="datevalue_'.$objp->rowid.'">'.dol_print_date($db->jdate($objp->dv),"day")."</span>";
@@ -1115,7 +1116,7 @@ if ($resql)
     	}
 
         // Payment type
-    	if (! empty($arrayfields['type']['checked']))            
+    	if (! empty($arrayfields['type']['checked']))
     	{
         	print '<td align="center" class="nowrap">';
 	        $labeltype=($langs->trans("PaymentTypeShort".$objp->fk_type)!="PaymentTypeShort".$objp->fk_type)?$langs->trans("PaymentTypeShort".$objp->fk_type):$langs->getLabelFromKey($db,$objp->fk_type,'c_paiement','code','libelle');
@@ -1131,9 +1132,9 @@ if ($resql)
     	    print '<td class="nowrap" align="center">'.($objp->num_chq?$objp->num_chq:"")."</td>\n";
     	    if (! $i) $totalarray['nbfield']++;
     	}
-    	 
+
 		// Third party
-    	if (! empty($arrayfields['bu.label']['checked']))            
+    	if (! empty($arrayfields['bu.label']['checked']))
     	{
         	print "<td>";
 			if ($objp->url_id)
@@ -1156,16 +1157,16 @@ if ($resql)
 			print '</td>';
             if (! $i) $totalarray['nbfield']++;
     	}
-    	
+
     	// Bank account
-    	if (! empty($arrayfields['ba.ref']['checked']))            
+    	if (! empty($arrayfields['ba.ref']['checked']))
     	{
         	print '<td align="right" class="nowrap">';
 			print $bankaccount->getNomUrl(1);
 			print "</td>\n";
             if (! $i) $totalarray['nbfield']++;
     	}
-    	
+
     	// Debit
     	if (! empty($arrayfields['b.debit']['checked']))
     	{
@@ -1192,7 +1193,7 @@ if ($resql)
     	    if (! $i) $totalarray['nbfield']++;
     	    if (! $i) $totalarray['totalcredfield']=$totalarray['nbfield'];
     	}
-    	 
+
     	// Balance
     	if (! empty($arrayfields['balance']['checked']))
     	{
@@ -1212,7 +1213,7 @@ if ($resql)
         	    print '<td align="right">-</td>';
         	}
     	}
-    	
+
     	if (! empty($arrayfields['b.num_releve']['checked']))
     	{
             print '<td class="nowrap" align="center">';
@@ -1224,7 +1225,7 @@ if ($resql)
             	    print '<a href="releve.php?num='.$objp->num_releve.'&amp;account='.$objp->bankid.'">'.$objp->num_releve.'</a>';
             	}
             	else if ($action == 'reconcile')
-            	{ 
+            	{
             	    print '<input class="flat" name="rowid['.$objp->rowid.']" type="checkbox" value="'.$objp->rowid.'" size="1"'.(! empty($_POST['rowid'][$objp->rowid])?' checked':'').'>';
             	}
         	}
@@ -1239,7 +1240,7 @@ if ($resql)
         	print '</td>';
             if (! $i) $totalarray['nbfield']++;
     	}
-    	
+
     	// Action edit/delete
     	print '<td class="nowrap" align="center">';
     	// Transaction reconciliated or edit link
@@ -1279,8 +1280,8 @@ if ($resql)
     	    }
     	}
     	print '</td>';
-    	if (! $i) $totalarray['nbfield']++;    	
-    	
+    	if (! $i) $totalarray['nbfield']++;
+
     	// Action column
     	print '<td class="nowrap" align="center">';
     	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
@@ -1296,7 +1297,7 @@ if ($resql)
 
 		$i++;
 	}
-	
+
 	// Show total line
 	if (isset($totalarray['totaldebfield']) || isset($totalarray['totalcredfield']))
 	{
@@ -1319,7 +1320,7 @@ if ($resql)
 
 	print "</table>";
 	print "</div>";
-	
+
     print '</form>';
 	$db->free($resql);
 }

From 0f5dc90bae34e6c6e3250254767fcc9b3bda9486 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Bautista=20Mesa=20Rold=C3=A1n?= <juan.mesa@hidup.io>
Date: Sat, 24 Jun 2017 16:45:45 +0200
Subject: [PATCH 362/438] Fixing pages warning when value is null

---
 htdocs/accountancy/admin/accountmodel.php    | 2 +-
 htdocs/accountancy/admin/categories_list.php | 2 +-
 htdocs/accountancy/admin/journals_list.php   | 2 +-
 htdocs/adherents/document.php                | 2 +-
 htdocs/adherents/subscription/list.php       | 2 +-
 htdocs/admin/dict.php                        | 2 +-
 htdocs/admin/mails_templates.php             | 2 +-
 htdocs/admin/tools/listsessions.php          | 2 +-
 htdocs/admin/websites.php                    | 2 +-
 htdocs/comm/action/listactions.php           | 2 +-
 htdocs/comm/action/rapport/index.php         | 2 +-
 htdocs/compta/prelevement/ligne.php          | 2 +-
 htdocs/fourn/facture/list.php                | 2 +-
 htdocs/fourn/facture/paiement.php            | 2 +-
 htdocs/societe/notify/index.php              | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index ff908d6d066..a29cce64749 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -68,7 +68,7 @@ $active = 1;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0 ; }
+if ($page == -1 || $page == null) { $page = 0 ; }
 $offset = $listlimit * $page ;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index e71482b0efa..cb852d82e0c 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -74,7 +74,7 @@ $active = 1;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0 ; }
+if ($page == -1 || $page == null) { $page = 0 ; }
 $offset = $listlimit * $page ;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index 3dc932dbab5..dca29fd28b8 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -58,7 +58,7 @@ $active = 1;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0 ; }
+if ($page == -1 || $page == null) { $page = 0 ; }
 $offset = $listlimit * $page ;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php
index dd22a74577d..65dbadb11a6 100644
--- a/htdocs/adherents/document.php
+++ b/htdocs/adherents/document.php
@@ -52,7 +52,7 @@ $result=restrictedArea($user,'adherent',$id);
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0 ; }
+if ($page == -1 || $page == null) { $page = 0 ; }
 $offset = $conf->liste_limit * $page ;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index 628ceb390e3..369c56b068c 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -46,7 +46,7 @@ $limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0 ; }
+if ($page == -1 || $page == null) { $page = 0 ; }
 $offset = $limit * $page ;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 6db098f0750..485c5713636 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -73,7 +73,7 @@ $active = 1;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0 ; }
+if ($page == -1 || $page == null) { $page = 0 ; }
 $offset = $listlimit * $page ;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 123877f7f4e..16277811b72 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -67,7 +67,7 @@ $active = 1;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0 ; }
+if ($page == -1 || $page == null) { $page = 0 ; }
 $offset = $listlimit * $page ;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php
index 56db6eb2ad7..c57a78974ed 100644
--- a/htdocs/admin/tools/listsessions.php
+++ b/htdocs/admin/tools/listsessions.php
@@ -47,7 +47,7 @@ $langs->load("other");
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0 ; }
+if ($page == -1 || $page == null) { $page = 0 ; }
 $offset = $conf->liste_limit * $page ;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/admin/websites.php b/htdocs/admin/websites.php
index 1dc91786ada..4dbd154096f 100644
--- a/htdocs/admin/websites.php
+++ b/htdocs/admin/websites.php
@@ -54,7 +54,7 @@ $status = 1;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0 ; }
+if ($page == -1 || $page == null) { $page = 0 ; }
 $offset = $listlimit * $page ;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index 01094a78164..35fccdef2c8 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -80,7 +80,7 @@ $limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0 ; }
+if ($page == -1 || $page == null) { $page = 0 ; }
 $offset = $limit * $page ;
 if (! $sortorder)
 {
diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index e83506d8206..dcda4e0cf04 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -42,7 +42,7 @@ $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0 ; }
+if ($page == -1 || $page == null) { $page = 0 ; }
 $offset = $limit * $page ;
 if (! $sortorder) $sortorder="DESC";
 if (! $sortfield) $sortfield="a.datep";
diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php
index 933c23b0e7e..20ac3d18082 100644
--- a/htdocs/compta/prelevement/ligne.php
+++ b/htdocs/compta/prelevement/ligne.php
@@ -251,7 +251,7 @@ if ($id)
 
 
 
-	if ($page == -1) { $page = 0 ; }
+	if ($page == -1 || $page == null) { $page = 0 ; }
 
 	$offset = $conf->liste_limit * $page ;
 	$pageprev = $page - 1;
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index a9e372a9709..056a1961b4c 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -109,7 +109,7 @@ $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page=GETPOST("page",'int');
-if ($page == -1) { $page = 0 ; }
+if ($page == -1 || $page == null) { $page = 0 ; }
 $offset = $limit * $page ;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 59b6e2a27e9..fcf7dc92ebf 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -601,7 +601,7 @@ if (empty($action))
     $sortfield = GETPOST("sortfield",'alpha');
     $sortorder = GETPOST("sortorder",'alpha');
     $page=GETPOST("page",'int');
-    if ($page == -1) { $page = 0 ; }
+    if ($page == -1 || $page == null) { $page = 0 ; }
     $offset = $limit * $page ;
     $pageprev = $page - 1;
     $pagenext = $page + 1;
diff --git a/htdocs/societe/notify/index.php b/htdocs/societe/notify/index.php
index ebebb23494c..4b7a5a3a111 100644
--- a/htdocs/societe/notify/index.php
+++ b/htdocs/societe/notify/index.php
@@ -42,7 +42,7 @@ if ($sortfield == "")
   $sortfield="s.nom";
 }
 
-if ($page == -1) { $page = 0 ; }
+if ($page == -1 || $page == null) { $page = 0 ; }
 
 $offset = $conf->liste_limit * $page ;
 $pageprev = $page - 1;

From fed5999a6c1edcbf8e86db0812fba2557b5d3cc1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Jun 2017 16:57:42 +0200
Subject: [PATCH 363/438] Update doc

---
 htdocs/install/mysql/tables/llx_default_values.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/tables/llx_default_values.sql b/htdocs/install/mysql/tables/llx_default_values.sql
index ca9849c681d..4212b602bf7 100644
--- a/htdocs/install/mysql/tables/llx_default_values.sql
+++ b/htdocs/install/mysql/tables/llx_default_values.sql
@@ -20,7 +20,7 @@ create table llx_default_values
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   entity          integer DEFAULT 1 NOT NULL,		-- multi company id
-  type			  varchar(10),                      -- 'createform', 'filters', 'sortorder'
+  type			  varchar(10),                      -- 'createform', 'filters', 'sortorder', 'focus', 'transform'
   user_id         integer DEFAULT 0 NOT NULL,       -- 0 or user id
   page            varchar(255),                     -- relative url of page
   param           varchar(255),                     -- parameter

From 03cb850442c27558a0ba2f737e877a5bbe3b113f Mon Sep 17 00:00:00 2001
From: BENKE Charlene <charles.fr@benke.fr>
Date: Sat, 24 Jun 2017 20:48:11 +0200
Subject: [PATCH 364/438] $forceimgscaleheight instead $forceimgscalewidth

---
 .../core/modules/printsheet/doc/pdf_standardlabel.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
index 5fce4c63a51..6411e97c423 100644
--- a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
+++ b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
@@ -61,11 +61,11 @@ class pdf_standardlabel extends CommonStickerGenerator
 	 */
 	function Add_PDF_label(&$pdf,$textleft,$header,$footer,$outputlangs,$textright='',$photo='')
 	{
-		global $mysoc,$conf,$langs;
-		global $forceimgscalewidth,$forceimgscaleheight;
+		global $mysoc, $conf, $langs;
+		global $forceimgscalewidth, $forceimgscaleheight;
 
 		$imgscalewidth=(empty($forceimgscalewidth)?0.3:$forceimgscalewidth);	// Scale of image for width (1=Full width of sticker)
-		$imgscaleheight=(empty($forceimgscalewidth)?0.5:$forceimgscalewidth);	// Scale of image for height (1=Full height of sticker)
+		$imgscaleheight=(empty($forceimgscaleheight)?0.5:$forceimgscaleheight);	// Scale of image for height (1=Full height of sticker)
 
 		// We are in a new page, then we must add a page
 		if (($this->_COUNTX ==0) && ($this->_COUNTY==0) and (!$this->_First==1)) {

From ab9be29356f548a4ef11745234c12f406171c84c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Jun 2017 21:36:51 +0200
Subject: [PATCH 365/438] Fix installers

---
 build/exe/doliwamp/install.forced.php.install |  2 +-
 build/rpm/install.forced.php.fedora           |  2 +-
 build/rpm/install.forced.php.generic          |  2 +-
 build/rpm/install.forced.php.mandriva         |  2 +-
 build/rpm/install.forced.php.opensuse         |  2 +-
 htdocs/install/fileconf.php                   | 26 ++++++++++++-------
 htdocs/install/step1.php                      |  5 ++--
 7 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/build/exe/doliwamp/install.forced.php.install b/build/exe/doliwamp/install.forced.php.install
index fd98dbf3984..5b186c17268 100644
--- a/build/exe/doliwamp/install.forced.php.install
+++ b/build/exe/doliwamp/install.forced.php.install
@@ -5,7 +5,7 @@
 // during install process to be used.
 //
 //
-$force_install_noedit=2;
+$force_install_noedit=2;		// 1=To block vars specific to distrib, 2 to block all technical parameters
 $force_install_message='KeepDefaultValuesWamp';
 $force_install_main_data_root='WAMPROOT/dolibarr_documents';
 $force_install_type='mysqli';
diff --git a/build/rpm/install.forced.php.fedora b/build/rpm/install.forced.php.fedora
index 108455a9403..a8db3e25c9e 100644
--- a/build/rpm/install.forced.php.fedora
+++ b/build/rpm/install.forced.php.fedora
@@ -1,7 +1,7 @@
 <?php
 
 $force_install_packager='rpmfedora';
-$force_install_noedit=1;	# 1 to block var specific to distrib, 2 to block every technical parameters
+$force_install_noedit=1;	// 1 to block var specific to distrib, 2 to block every technical parameters
 $force_install_message='KeepDefaultValuesDeb';
 $force_install_main_data_root='/var/lib/dolibarr/documents';
 $force_install_type='mysqli';
diff --git a/build/rpm/install.forced.php.generic b/build/rpm/install.forced.php.generic
index 161f69cdbb3..107ef533310 100644
--- a/build/rpm/install.forced.php.generic
+++ b/build/rpm/install.forced.php.generic
@@ -1,7 +1,7 @@
 <?php
 
 $force_install_packager='rpmgeneric';
-$force_install_noedit=1;	# 1 to block var specific to distrib, 2 to block every technical parameters
+$force_install_noedit=1;	// 1 to block var specific to distrib, 2 to block every technical parameters
 $force_install_message='KeepDefaultValuesDeb';
 $force_install_main_data_root='/var/lib/dolibarr/documents';
 $force_install_type='mysqli';
diff --git a/build/rpm/install.forced.php.mandriva b/build/rpm/install.forced.php.mandriva
index 266468c7f33..927877b59d0 100644
--- a/build/rpm/install.forced.php.mandriva
+++ b/build/rpm/install.forced.php.mandriva
@@ -1,7 +1,7 @@
 <?php
 
 $force_install_packager='rpmmandriva';
-$force_install_noedit=1;	# 1 to block var specific to distrib, 2 to block every technical parameters
+$force_install_noedit=1;	// 1 to block var specific to distrib, 2 to block every technical parameters
 $force_install_message='KeepDefaultValuesDeb';
 $force_install_main_data_root='/var/lib/dolibarr/documents';
 $force_install_type='mysqli';
diff --git a/build/rpm/install.forced.php.opensuse b/build/rpm/install.forced.php.opensuse
index b644cea6e24..c91836918f4 100644
--- a/build/rpm/install.forced.php.opensuse
+++ b/build/rpm/install.forced.php.opensuse
@@ -1,7 +1,7 @@
 <?php
 
 $force_install_packager='rpmopensuse';
-$force_install_noedit=1;	# 1 to block var specific to distrib, 2 to block every technical parameters
+$force_install_noedit=1;	// 1 to block var specific to distrib, 2 to block every technical parameters
 $force_install_message='KeepDefaultValuesDeb';
 $force_install_main_data_root='/var/lib/dolibarr/documents';
 $force_install_type='mysqli';
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index cdd639ad50b..c1083062a5f 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -66,6 +66,7 @@ if (@file_exists($forcedfile)) {
 }
 
 
+
 /*
  *	View
  */
@@ -426,8 +427,8 @@ if (! empty($force_install_message))
 			<input type="password" id="db_pass" autocomplete="off"
 			       name="db_pass"
 			       value="<?php
-			       // We don't want to set password. It will be extracted from the forced install file at step1.
-			       $autofill = ((!empty($_SESSION['dol_save_pass'])) ? $_SESSION['dol_save_pass'] : '');
+			       // If $force_install_databasepass is on, we don't want to set password, we just show '***'. Real value will be extracted from the forced install file at step1.
+			       $autofill = ((!empty($_SESSION['dol_save_pass'])) ? $_SESSION['dol_save_pass'] : str_pad('', strlen($force_install_databasepass), '*'));
 			       if (!empty($dolibarr_main_prod)) {
 				       $autofill = '';
 			       }
@@ -479,7 +480,7 @@ if (! empty($force_install_message))
 			       name="db_user_root"
 			       class="needroot"
 			       value="<?php print (!empty($force_install_databaserootlogin)) ? $force_install_databaserootlogin : @$db_user_root; ?>"
-				<?php if ($force_install_noedit == 2 && $force_install_databaserootlogin !== null) {
+				<?php if ($force_install_noedit > 0 && ! empty($force_install_databaserootlogin)) {
 					print ' disabled';
 				} ?>
 			>
@@ -499,26 +500,28 @@ if (! empty($force_install_message))
 		<td class="label" valign="top"><b><?php echo $langs->trans("Password"); ?></b>
 		</td>
 		<td class="label" valign="top">
+
 			<input type="password"
 			       autocomplete="off"
 			       id="db_pass_root"
 			       name="db_pass_root"
 			       class="needroot"
 			       value="<?php
-			       // We don't want to set password. It will be extracted from the forced install file at step1.
-			       $autofill = ((!empty($force_install_database_rootpass)) ? '' : @$db_pass_root);
+			       // If $force_install_databaserootpass is on, we don't want to set password here, we just show '***'. Real value will be extracted from the forced install file at step1.
+			       $autofill = ((!empty($force_install_databaserootpass)) ? str_pad('', strlen($force_install_databaserootpass), '*') : @$db_pass_root);
 			       if (!empty($dolibarr_main_prod)) {
 				       $autofill = '';
-			       }    // Do not autofill password if instance is a production instance
+			       }
+				   // Do not autofill password if instance is a production instance
 			       if (!empty($_SERVER["SERVER_NAME"]) && !in_array($_SERVER["SERVER_NAME"],
-					       array('127.0.0.1', 'localhost'))
+					       array('127.0.0.1', 'localhost', 'localhostgit'))
 			       ) {
 				       $autofill = '';
 			       }    // Do not autofill password for remote access
 			       print dol_escape_htmltag($autofill);
 			       ?>"
-				<?php if ($force_install_noedit == 2 && $force_install_databaserootpass !== null) {
-					print ' disabled';
+				<?php if ($force_install_noedit > 0 && ! empty($force_install_databaserootpass)) {
+					print ' disabled';     // May be removed by javascript
 				} ?>
 			>
 		</td>
@@ -561,7 +564,10 @@ jQuery(document).ready(function() {
 		if (jQuery("#db_create_database").is(":checked") || jQuery("#db_create_user").is(":checked"))
 		{
 			jQuery(".hideroot").show();
-			jQuery(".needroot").removeAttr('disabled');
+			<?php
+			if ($force_install_noedit == 0) { ?>
+                jQuery(".needroot").removeAttr('disabled');
+			<?php } ?>
 		}
 		else
 		{
diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php
index b323c970a9d..486b156fcaf 100644
--- a/htdocs/install/step1.php
+++ b/htdocs/install/step1.php
@@ -88,6 +88,7 @@ if (@file_exists($forcedfile)) {
 			$main_data_dir = detect_dolibarr_main_data_root($main_dir);
 		}
 		$main_url = detect_dolibarr_main_url_root();
+
 		if (!empty($force_install_databaserootlogin)) {
 			$userroot = parse_database_login($force_install_databaserootlogin);
 		}
@@ -542,7 +543,7 @@ if (! $error && $db->connected && $action == "set")
                 if ($db->connected)
                 {
                     $resultbis = 1;
-                    
+
                     // Create user
                     $result=$db->DDLCreateUser($dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name);
                     // Create user bis
@@ -553,7 +554,7 @@ if (! $error && $db->connected && $action == "set")
                             $resultbis=$db->DDLCreateUser('%', $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name);
                         }
                     }
-                    
+
                     if ($result > 0 && $resultbis > 0)
                     {
 

From e6e8a014a3c3e4aafbb3af737deb6c811dcb5111 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Jun 2017 21:39:01 +0200
Subject: [PATCH 366/438] Prepare 5.0.4

---
 ChangeLog | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c43fd92f676..228a2fd6291 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,10 +2,17 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------
 
+
 ***** ChangeLog for 5.0.4 compared to 5.0.3 *****
-FIX: #6880
-FIX: #6925
+FIX: #5640 Prices of a predefined product/service were incorrect under certain circumstances
+FIX: #6541 since 4.0.4 to 5.0.0 autofill zip/town not working
+FIX: #6880 #6925
+FIX: #6885
 FIX: #6926
+FIX: #7003
+FIX: #7012
+FIX: #7040
+FIX: #7048 #6075
 FIX: Can set supplier invoice to billed.
 FIX: Can't create invoice if PO disapproved
 FIX: contratligne update
@@ -17,6 +24,7 @@ FIX: Redirect to payment page from member subscription page failed if a unique s
 FIX: REST api to get project when user has permission to read all.
 FIX: situation_progress param default value must be 100 and not 0
 FIX: SQL injection on user/index.php parameter search_statut.
+FIX: vat code not saved during product creation.
 FIX: Warnings
 
 ***** ChangeLog for 5.0.3 compared to 5.0.2 *****

From 778e581aca95af64b5ccc017072fb708b3189253 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Jun 2017 22:13:00 +0200
Subject: [PATCH 367/438] Fix: avoid warning on permission if there is only
 admin users

---
 htdocs/admin/modules.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 23d87791103..a59d6fca3bb 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -207,8 +207,19 @@ if ($action == 'set' && $user->admin)
 	    //var_dump($resarray);exit;
 	    if ($resarray['nbperms'] > 0)
 	    {
-    		$msg = $langs->trans('ModuleEnabledAdminMustCheckRights');
-    		setEventMessages($msg, null, 'warnings');
+	        $tmpsql="SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."user WHERE admin <> 1";
+	        $resqltmp=$db->query($tmpsql);
+	        if ($resqltmp)
+	        {
+	            $obj=$db->fetch_object($resqltmp);
+	            //var_dump($obj->nb);exit;
+	            if ($obj && $obj->nb > 1)
+	            {
+	                $msg = $langs->trans('ModuleEnabledAdminMustCheckRights');
+	                setEventMessages($msg, null, 'warnings');
+	            }
+	        }
+	        else dol_print_error($db);
 	    }
 	}
     header("Location: ".$_SERVER["PHP_SELF"]."?mode=".$mode.$param.($page_y?'&page_y='.$page_y:''));

From 6298436a1bae5e96086e4fd8b3d327133d2081dd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Jun 2017 02:26:30 +0200
Subject: [PATCH 368/438] Clean old lot numbers

---
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql | 3 +++
 htdocs/install/mysql/migration/repair.sql      | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 637648be3ba..096b82a7768 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -497,3 +497,6 @@ CREATE TABLE llx_blockedlog_authority
 ) ENGINE=innodb;
 
 ALTER TABLE llx_blockedlog_authority ADD INDEX signature (signature);
+
+-- VMYSQL4.1 INSERT IGNORE INTO llx_product_lot (entity, fk_product, batch, eatby, sellby, datec, fk_user_creat, fk_user_modif) SELECT DISTINCT e.entity, ps.fk_product, pb.batch, pb.eatby, pb.sellby, pb.tms, e.fk_user_author, e.fk_user_author from llx_product_batch as pb, llx_product_stock as ps, llx_entrepot as e WHERE pb.fk_product_stock = ps.rowid AND ps.fk_entrepot = e.rowid
+
diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index 75e2e27ac2e..a5549d33b25 100755
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -92,6 +92,9 @@ delete from llx_product_extrafields where fk_object not in (select rowid from ll
 update llx_product_batch set batch = '' where batch = 'Non d&eacute;fini';
 update llx_product_batch set batch = '' where batch = 'Non défini';
 
+update llx_stock_mouvement set batch = null where batch = 'Non d&eacute;fini';
+update llx_stock_mouvement set batch = null where batch = 'Non défini';
+
 DELETE FROM llx_product_lot WHERE fk_product NOT IN (select rowid from llx_product); 
 DELETE FROM llx_product_stock WHERE fk_product NOT IN (select rowid from llx_product); 
 DELETE FROM llx_product_stock WHERE reel = 0 AND rowid NOT IN (SELECT fk_product_stock FROM llx_product_batch as pb);

From 480587c8263398aad02a1961892a2ce2ab122d45 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Jun 2017 02:28:07 +0200
Subject: [PATCH 369/438] Fix travis errors

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 8655b27d4ed..4c18c5caa3b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ php:
 - '5.3'
 - '5.4'
 - '5.5'
-- '5.6'
+- '5.6.29'
 - '7.0'
 - nightly
 

From 8bfda8d4eec675dc71ed34ca9d34aa02cfeefb57 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Jun 2017 12:26:16 +0200
Subject: [PATCH 370/438] Code comment

---
 htdocs/api/class/api_access.class.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/api/class/api_access.class.php b/htdocs/api/class/api_access.class.php
index 407f94ac915..b2dcfefa49f 100644
--- a/htdocs/api/class/api_access.class.php
+++ b/htdocs/api/class/api_access.class.php
@@ -80,25 +80,25 @@ class DolibarrApiAccess implements iAuthenticate
 		{
 		    dol_syslog($key.' - '.$val);
 		}*/
-		
+
 		// api key can be provided in url with parameter api_key=xxx or ni header with header DOLAPIKEY:xxx
 		$api_key = '';
-		if (isset($_GET['api_key'])) 
+		if (isset($_GET['api_key']))
 		{
 		    // TODO Add option to disable use of api key on url. Return errors if used.
 		    $api_key = $_GET['api_key'];                         // For backward compatibility
 		}
-		if (isset($_GET['DOLAPIKEY'])) 
+		if (isset($_GET['DOLAPIKEY']))
 		{
 		    // TODO Add option to disable use of api key on url. Return errors if used.
 		    $api_key = $_GET['DOLAPIKEY'];                     // With GET method
 		}
-		if (isset($_SERVER['HTTP_DOLAPIKEY'])) 
+		if (isset($_SERVER['HTTP_DOLAPIKEY']))         // Param DOLAPIKEY in header can be read with HTTP_DOLAPIKEY
 		{
 		    $api_key = $_SERVER['HTTP_DOLAPIKEY'];     // With header method (recommanded)
 		}
-		
-		if ($api_key) 
+
+		if ($api_key)
 		{
 			$sql = "SELECT u.login, u.datec, u.api_key, ";
 			$sql.= " u.tms as date_modification, u.entity";

From 63dcdc3a03f1a03915f39d06f21fbb0f27ee2f49 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Jun 2017 17:09:08 +0200
Subject: [PATCH 371/438] Fix API was loading definition of all APIs at each
 call.

---
 htdocs/api/class/api_login.class.php          |  31 +--
 htdocs/api/index.php                          | 223 ++++++++++--------
 htdocs/core/lib/functions2.lib.php            |  71 +++++-
 htdocs/societe/class/api_contacts.class.php   |   3 +
 .../class/api_deprecated_thirdparty.class.php | 110 ++++-----
 htdocs/user/class/user.class.php              |   7 +-
 6 files changed, 272 insertions(+), 173 deletions(-)

diff --git a/htdocs/api/class/api_login.class.php b/htdocs/api/class/api_login.class.php
index 9b965e24c33..c6b71e8b25c 100644
--- a/htdocs/api/class/api_login.class.php
+++ b/htdocs/api/class/api_login.class.php
@@ -34,25 +34,25 @@ class Login
 	/**
 	 * Login
 	 *
-	 * Request the API token for a couple username / password. 
+	 * Request the API token for a couple username / password.
 	 * Using method POST is recommanded for security reasons (method GET is often logged by default by web servers with parameters so with login and pass into server log file).
-	 * Both methods are provided for developer conveniance. Best is to not use at all the login API method and enter directly the "api_key" into field at the top right of page (Note: "api_key" can be found/set on the user page). 
-	 * 
+	 * Both methods are provided for developer conveniance. Best is to not use at all the login API method and enter directly the "api_key" into field at the top right of page (Note: "api_key" can be found/set on the user page).
+	 *
 	 * @param   string  $login			User login
 	 * @param   string  $password		User password
-	 * @param   int     $entity			Entity (when multicompany module is used). Empty means 1=first company.
+	 * @param   string  $entity			Entity (when multicompany module is used). '' means 1=first company.
 	 * @param   int     $reset          Reset token (0=get current token, 1=ask a new token and canceled old token. This means access using current existing API token of user will fails: new token will be required for new access)
      * @return  array                   Response status and user token
      *
 	 * @throws RestException
-	 * 
+	 *
 	 * @url GET /
 	 * @url POST /
 	 */
-	public function index($login, $password, $entity=0, $reset=0) {
+	public function index($login, $password, $entity='', $reset=0) {
 
 	    global $conf, $dolibarr_main_authentication, $dolibarr_auto_user;
-	    
+
 		// Authentication mode
 		if (empty($dolibarr_main_authentication))
 			$dolibarr_main_authentication = 'http,dolibarr';
@@ -62,6 +62,8 @@ class Login
 		// Set authmode
 		$authmode = explode(',', $dolibarr_main_authentication);
 
+		if ($entity == '') $entity=1;
+
 		include_once DOL_DOCUMENT_ROOT . '/core/lib/security2.lib.php';
 		$login = checkLoginPassEntity($login, $password, $entity, $authmode);
 		if (empty($login))
@@ -70,21 +72,21 @@ class Login
 		}
 
 		$token = 'failedtogenerateorgettoken';
-		
+
 		$tmpuser=new User($this->db);
-		$tmpuser->fetch(0, $login);
-		
+		$tmpuser->fetch(0, $login, 0, 0, $entity);
+
 		// Renew the hash
 		if (empty($tmpuser->api_key) || $reset)
 		{
     		// Generate token for user
     		$token = dol_hash($login.uniqid().$conf->global->MAIN_API_KEY,1);
-    
+
     		// We store API token into database
     		$sql = "UPDATE ".MAIN_DB_PREFIX."user";
     		$sql.= " SET api_key = '".$this->db->escape($token)."'";
     		$sql.= " WHERE login = '".$this->db->escape($login)."'";
-    
+
     		dol_syslog(get_class($this)."::login", LOG_DEBUG);	// No log
     		$result = $this->db->query($sql);
     		if (!$result)
@@ -96,13 +98,14 @@ class Login
 		{
             $token = $tmpuser->api_key;
 		}
-		
+
 		//return token
 		return array(
 			'success' => array(
 				'code' => 200,
 				'token' => $token,
-				'message' => 'Welcome ' . $login.($reset?' - Token is new':' - This is your token (generated by a previous call). You can use it to make any REST API call, or enter it into the DOLAPIKEY field to use the Dolibarr API explorer.')
+			    'entity' => $tmpuser->entity,
+			    'message' => 'Welcome ' . $login.($reset?' - Token is new':' - This is your token (generated by a previous call). You can use it to make any REST API call, or enter it into the DOLAPIKEY field to use the Dolibarr API explorer.')
 			)
 		);
 	}
diff --git a/htdocs/api/index.php b/htdocs/api/index.php
index 1e04590da14..7a99490a48f 100644
--- a/htdocs/api/index.php
+++ b/htdocs/api/index.php
@@ -21,9 +21,7 @@
  * 	\defgroup   api     Module DolibarrApi
  *  \brief      API loader
  *				Search files htdocs/<module>/class/api_<module>.class.php
- *  \file       htdocs/api/indexphp
- *
- *	@todo	User authentication with api_key
+ *  \file       htdocs/api/index.php
  */
 
 if (! defined("NOLOGIN"))        define("NOLOGIN",'1');
@@ -79,110 +77,94 @@ $api->r->addAuthenticationClass('DolibarrApiAccess','');
 // Define accepted mime types
 UploadFormat::$allowedMimeTypes = array('image/jpeg', 'image/png', 'text/plain', 'application/octet-stream');
 
-$listofapis = array();
 
-$modulesdir = dolGetModulesDirs();
-foreach ($modulesdir as $dir)
+// Analyze URLs
+// index.php/explorer                           do a redirect to index.php/explorer/
+// index.php/explorer/                          called by swagger to build explorer page
+// index.php/explorer/.../....png|.css|.js      called by swagger for resources to build explorer page
+// index.php/explorer/resources.json            called by swagger to get list of all services
+// index.php/explorer/resources.json/xxx        called by swagger to get detail of services xxx
+// index.php/xxx                                called by any REST client to run API
+
+
+preg_match('/index\.php\/([^\/]+)(.*)$/', $_SERVER["PHP_SELF"], $reg);
+// .../index.php/categories?sortfield=t.rowid&sortorder=ASC
+
+
+// Call Explorer file for all APIs definitions
+if (! empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/resources.json' || $reg[2] == '/resources.json/root'))
 {
-    /*
-     * Search available module
-     */
-    //dol_syslog("Scan directory ".$dir." for API modules");
+    // Scan all API files to load them
 
-    $handle=@opendir(dol_osencode($dir));
-    if (is_resource($handle))
+    $listofapis = array();
+
+    $modulesdir = dolGetModulesDirs();
+    foreach ($modulesdir as $dir)
     {
-        while (($file = readdir($handle))!==false)
+        // Search available module
+        dol_syslog("Scan directory ".$dir." for module descriptor to after search for API files");
+
+        $handle=@opendir(dol_osencode($dir));
+        if (is_resource($handle))
         {
-            if (is_readable($dir.$file) && preg_match("/^mod(.*)\.class\.php$/i",$file,$reg))
+            while (($file = readdir($handle))!==false)
             {
-                $module = strtolower($reg[1]);
-                $moduledirforclass = $module;
-                $moduleforperm = $module;
-
-                if ($module == 'propale') {
-                    $moduledirforclass = 'comm/propal';
-                    $moduleforperm='propal';
-                }
-                elseif ($module == 'agenda') {
-                    $moduledirforclass = 'comm/action';
-                }
-                elseif ($module == 'adherent') {
-                    $moduledirforclass = 'adherents';
-                }
-                elseif ($module == 'banque') {
-                    $moduledirforclass = 'compta/bank';
-                }
-                elseif ($module == 'categorie') {
-                    $moduledirforclass = 'categories';
-                }
-                elseif ($module == 'facture') {
-                    $moduledirforclass = 'compta/facture';
-                }
-                elseif ($module == 'project') {
-                    $moduledirforclass = 'projet';
-                }
-                elseif ($module == 'task') {
-                    $moduledirforclass = 'projet';
-                }
-                elseif ($module == 'stock') {
-                    $moduledirforclass = 'product/stock';
-                }
-                elseif ($module == 'fournisseur') {
-                    $moduledirforclass = 'fourn';
-                }
-                //dol_syslog("Found module file ".$file." - module=".$module." - moduledirforclass=".$moduledirforclass);
-
-                // Defined if module is enabled
-                $enabled=true;
-                if (empty($conf->$moduleforperm->enabled)) $enabled=false;
-
-                if ($enabled)
+                if (is_readable($dir.$file) && preg_match("/^mod(.*)\.class\.php$/i",$file,$reg))
                 {
-                    /*
-                     * If exists, load the API class for enable module
-                     *
-                     * Search files named api_<object>.class.php into /htdocs/<module>/class directory
-                     *
-                     * @todo : use getElementProperties() function ?
-                     */
-                    $dir_part = dol_buildpath('/'.$moduledirforclass.'/class/');
+                    $module = strtolower($reg[1]);
+                    $moduledirforclass = getModuleDirForApiClass($module);
+                    $moduleforperm = $module;
+                    if ($module == 'propale') { $moduleforperm='propal'; }
 
-                    $handle_part=@opendir(dol_osencode($dir_part));
-                    if (is_resource($handle_part))
+                    //dol_syslog("Found module file ".$file." - module=".$module." - moduledirforclass=".$moduledirforclass);
+
+                    // Defined if module is enabled
+                    $enabled=true;
+                    if (empty($conf->$moduleforperm->enabled)) $enabled=false;
+
+                    if ($enabled)
                     {
-                        while (($file_searched = readdir($handle_part))!==false)
-                        {
-                            if ($file_searched == 'api_access.class.php') continue;
+                        // If exists, load the API class for enable module
+                        // Search files named api_<object>.class.php into /htdocs/<module>/class directory
+                        // @todo : use getElementProperties() function ?
+                        $dir_part = dol_buildpath('/'.$moduledirforclass.'/class/');
 
-                            // Support of the deprecated API.
-                            if (is_readable($dir_part.$file_searched) && preg_match("/^api_deprecated_(.*)\.class\.php$/i",$file_searched,$reg))
+                        $handle_part=@opendir(dol_osencode($dir_part));
+                        if (is_resource($handle_part))
+                        {
+                            while (($file_searched = readdir($handle_part))!==false)
                             {
-                                $classname = ucwords($reg[1]).'Api';
-                                require_once $dir_part.$file_searched;
-                                if (class_exists($classname))
+                                if ($file_searched == 'api_access.class.php') continue;
+
+                                // Support of the deprecated API.
+                                if (is_readable($dir_part.$file_searched) && preg_match("/^api_deprecated_(.*)\.class\.php$/i",$file_searched,$reg))
                                 {
-                                    //dol_syslog("Found deprecated API by index.php: classname=".$classname." for module ".$dir." into ".$dir_part.$file_searched);
-                                    $api->r->addAPIClass($classname, '/');
+                                    $classname = ucwords($reg[1]).'Api';
+                                    require_once $dir_part.$file_searched;
+                                    if (class_exists($classname))
+                                    {
+                                        //dol_syslog("Found deprecated API by index.php: classname=".$classname." for module ".$dir." into ".$dir_part.$file_searched);
+                                        $api->r->addAPIClass($classname, '/');
+                                    }
+                                    else
+                                    {
+                                        dol_syslog("We found an api_xxx file (".$file_searched.") but class ".$classname." does not exists after loading file", LOG_WARNING);
+                                    }
                                 }
-                                else
+                                elseif (is_readable($dir_part.$file_searched) && preg_match("/^api_(.*)\.class\.php$/i",$file_searched,$reg))
                                 {
-                                    dol_syslog("We found an api_xxx file (".$file_searched.") but class ".$classname." does not exists after loading file", LOG_WARNING);
-                                }
-                            }
-                            elseif (is_readable($dir_part.$file_searched) && preg_match("/^api_(.*)\.class\.php$/i",$file_searched,$reg))
-                            {
-                                $classname = ucwords($reg[1]);
-                                $classname = str_replace('_', '', $classname);
-                                require_once $dir_part.$file_searched;
-                                if (class_exists($classname))
-                                {
-                                    //dol_syslog("Found API by index.php: classname=".$classname." for module ".$dir." into ".$dir_part.$file_searched);
-                                    $listofapis[] = $classname;
-                                }
-                                else
-                                {
-                                    dol_syslog("We found an api_xxx file (".$file_searched.") but class ".$classname." does not exists after loading file", LOG_WARNING);
+                                    $classname = ucwords($reg[1]);
+                                    $classname = str_replace('_', '', $classname);
+                                    require_once $dir_part.$file_searched;
+                                    if (class_exists($classname))
+                                    {
+                                        //dol_syslog("Found API by index.php: classname=".$classname." for module ".$dir." into ".$dir_part.$file_searched);
+                                        $listofapis[] = $classname;
+                                    }
+                                    else
+                                    {
+                                        dol_syslog("We found an api_xxx file (".$file_searched.") but class ".$classname." does not exists after loading file", LOG_WARNING);
+                                    }
                                 }
                             }
                         }
@@ -191,20 +173,61 @@ foreach ($modulesdir as $dir)
             }
         }
     }
+
+    // Sort the classes before adding them to Restler. The Restler API Explorer
+    // shows the classes in the order they are added and it's a mess if they are not sorted.
+    sort($listofapis);
+    //var_dump($listofapis);
+    foreach ($listofapis as $classname)
+    {
+        $api->r->addAPIClass($classname);
+    }
 }
 
-// Sort the classes before adding them to Restler. The Restler API Explorer
-// shows the classes in the order they are added and it's a mess if they are
-// not sorted.
-sort($listofapis);
-//var_dump($listofapis);
-foreach ($listofapis as $classname)
+// Call one APIs or one definition of an API
+if (! empty($reg[1]) && ($reg[1] != 'explorer' || ($reg[2] != '/resources.json' && preg_match('/^\/resources.json\/(.+)$/', $reg[2], $regbis))))
 {
-    $api->r->addAPIClass($classname);
+    $module = $reg[1];
+    if ($module == 'explorer')  // If we call page to explore details of a service
+    {
+        $module = $regbis[1];
+    }
+
+    // Load a dedicated API file
+    dol_syslog("Load a dedicated API file");
+
+    $module=strtolower($module);
+    $moduledirforclass = getModuleDirForApiClass($module);
+
+    if (in_array($module, array('category','contact','customer','invoice','order','product','thirdparty','user')))  // Old Apis
+    {
+        $classfile = $module;
+        if ($module == 'customer') { $classfile = 'thirdparty'; }
+        if ($module == 'order')    { $classfile = 'commande'; }
+        $dir_part_file = dol_buildpath('/'.$moduledirforclass.'/class/api_deprecated_'.$classfile.'.class.php');
+        $classname=ucwords($module);
+        if ($module == 'customer') { $classname='Thirdparty'; }
+        if ($module == 'order')    { $classname='Commande'; }
+        //var_dump($classfile);var_dump($classname);exit;
+
+        require_once $dir_part_file;
+        if (class_exists($classname.'Api')) $api->r->addAPIClass($classname.'Api', '/');
+    }
+    else
+    {
+        $classfile = str_replace('_', '', $module);
+        if ($module == 'supplierinvoices') $classfile = 'supplier_invoices';
+        $dir_part_file = dol_buildpath('/'.$moduledirforclass.'/class/api_'.$classfile.'.class.php');
+        $classname=ucwords($module);
+
+        require_once $dir_part_file;
+        if (class_exists($classname)) $api->r->addAPIClass($classname);
+    }
 }
 
 // TODO If not found, redirect to explorer
 //var_dump($api);
+//exit;
 
 // Call API (we suppose we found it)
 $api->r->handle();
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index b68d7706e43..72f27a16602 100755
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -2121,8 +2121,8 @@ function colorStringToArray($stringcolor,$colorifnotfound=array(88,88,88))
  * Applies the Cartesian product algorithm to an array
  * Source: http://stackoverflow.com/a/15973172
  *
- * @param array $input Array of products
- * @return array Array of combinations
+ * @param   array $input    Array of products
+ * @return  array           Array of combinations
  */
 function cartesianArray(array $input) {
     // filter out empty values
@@ -2145,3 +2145,70 @@ function cartesianArray(array $input) {
 
     return $result;
 }
+
+
+/**
+ * Get name of directory where the api_...class.php file is stored
+ *
+ * @param   string  $module     Module name
+ * @return  string              Directory name
+ */
+function getModuleDirForApiClass($module)
+{
+    $moduledirforclass=$module;
+
+    if (in_array($module, array('login', 'access', 'status', 'documents'))) {
+        $moduledirforclass = 'api';
+    }
+    if (preg_match('/^dictionary/', $module)) {
+        $moduledirforclass = 'api';
+    }
+
+    if ($module == 'contact' || $module == 'contacts' || $module == 'customer' || $module == 'thirdparty' || $module == 'thirdparties') {
+        $moduledirforclass = 'societe';
+    }
+    if ($module == 'propale' || $module == 'proposals') {
+        $moduledirforclass = 'comm/propal';
+    }
+    elseif ($module == 'agenda' || $module == 'agendaevents') {
+        $moduledirforclass = 'comm/action';
+    }
+    elseif ($module == 'adherent' || $module == 'members' || $module == 'memberstypes' || $module == 'subscriptions') {
+        $moduledirforclass = 'adherents';
+    }
+    elseif ($module == 'banque' || $module == 'bankaccounts') {
+        $moduledirforclass = 'compta/bank';
+    }
+    elseif ($module == 'category' || $module == 'categorie') {
+        $moduledirforclass = 'categories';
+    }
+    elseif ($module == 'order' || $module == 'orders') {
+        $moduledirforclass = 'commande';
+    }
+    elseif ($module == 'facture' || $module == 'invoice' || $module == 'invoices') {
+        $moduledirforclass = 'compta/facture';
+    }
+    elseif ($module == 'products') {
+        $moduledirforclass = 'product';
+    }
+    elseif ($module == 'project' || $module == 'projects' || $module == 'tasks') {
+        $moduledirforclass = 'projet';
+    }
+    elseif ($module == 'task') {
+        $moduledirforclass = 'projet';
+    }
+    elseif ($module == 'stock' || $module == 'stockmovements' || $module == 'warehouses') {
+        $moduledirforclass = 'product/stock';
+    }
+    elseif ($module == 'fournisseur' || $module == 'supplierinvoices') {
+        $moduledirforclass = 'fourn';
+    }
+    elseif ($module == 'expensereports') {
+        $moduledirforclass = 'expensereport';
+    }
+    elseif ($module == 'users') {
+        $moduledirforclass = 'user';
+    }
+
+    return $moduledirforclass;
+}
diff --git a/htdocs/societe/class/api_contacts.class.php b/htdocs/societe/class/api_contacts.class.php
index f136d6895b2..fcfdf4ad084 100644
--- a/htdocs/societe/class/api_contacts.class.php
+++ b/htdocs/societe/class/api_contacts.class.php
@@ -47,6 +47,9 @@ class Contacts extends DolibarrApi
 	{
 		global $db, $conf;
 		$this->db = $db;
+
+		include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+
 		$this->contact = new Contact($this->db);
 	}
 
diff --git a/htdocs/societe/class/api_deprecated_thirdparty.class.php b/htdocs/societe/class/api_deprecated_thirdparty.class.php
index bca74ba8ae2..b335fb35183 100644
--- a/htdocs/societe/class/api_deprecated_thirdparty.class.php
+++ b/htdocs/societe/class/api_deprecated_thirdparty.class.php
@@ -22,7 +22,7 @@
  * API class for thirdparty object
  *
  * @smart-auto-routing false
- * @access protected 
+ * @access protected
  * @class  DolibarrApiAccess {@requires user,external}
  * @deprecated Use Thirdparties instead (defined in api_thirdparties.class.php)
  */
@@ -30,7 +30,7 @@ class ThirdpartyApi extends DolibarrApi
 {
     /**
      *
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object 
+     * @var array   $FIELDS     Mandatory fields, checked when create and update object
      */
     static $FIELDS = array(
         'name'
@@ -49,15 +49,17 @@ class ThirdpartyApi extends DolibarrApi
      * Constructor <b>Warning: Deprecated</b>
      *
      * @url	thirdparty/
-     * 
+     *
      */
     function __construct()
     {
+        include_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
+
 		global $db, $conf;
 		$this->db = $db;
         $this->company = new Societe($this->db);
         $this->customer = new Client($this->db);
-        
+
         if (! empty($conf->global->SOCIETE_MAIL_REQUIRED)) {
             static::$FIELDS[] = 'email';
         }
@@ -70,21 +72,21 @@ class ThirdpartyApi extends DolibarrApi
    *
    * @param 	int 	$id ID of customer
    * @return 	array|mixed data without useless information
-	 * 
+	 *
    * @url	GET customer/{id}
    * @throws 	RestException
    */
     function getCustomer($id)
-    {		
+    {
       if(! DolibarrApiAccess::$user->rights->societe->lire) {
         throw new RestException(401);
       }
-			
+
       $result = $this->customer->fetch($id);
       if( ! $result ) {
           throw new RestException(404, 'Customer not found');
       }
-		
+
       if( ! DolibarrApi::_checkAccessToResource('societe',$this->customer->id)) {
         throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
       }
@@ -94,11 +96,11 @@ class ThirdpartyApi extends DolibarrApi
 
     /**
      * Search customer by email <b>Warning: Deprecated</b>
-     * 
+     *
      * @param   string  $email      email id
      *
      * @return object    client with given email
-     * 
+     *
      * @url GET customer/byemail/{email}
      */
     function getByEmail($email) {
@@ -117,21 +119,21 @@ class ThirdpartyApi extends DolibarrApi
    *
    * @param 	int 	$id ID of thirdparty
    * @return 	array|mixed data without useless information
-	 * 
+	 *
    * @url	GET thirdparty/{id}
    * @throws 	RestException
    */
     function get($id)
-    {		
+    {
       if(! DolibarrApiAccess::$user->rights->societe->lire) {
         throw new RestException(401);
       }
-			
+
       $result = $this->company->fetch($id);
       if( ! $result ) {
           throw new RestException(404, 'Thirdparty not found');
       }
-		
+
       if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
         throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
       }
@@ -141,10 +143,10 @@ class ThirdpartyApi extends DolibarrApi
 
     /**
      * List thirdparties <b>Warning: Deprecated</b>
-     * 
+     *
      * Get a list of thirdparties
-     * 
-     * @param   int     $mode       Set to 1 to show only customers 
+     *
+     * @param   int     $mode       Set to 1 to show only customers
      *                              Set to 2 to show only prospects
      *                              Set to 3 to show only those are not customer neither prospect
      * @param   Text  $email      Search by email filter
@@ -153,17 +155,17 @@ class ThirdpartyApi extends DolibarrApi
      * @param   int     $limit      Limit for list
      * @param   int     $page       Page number
      * @return array Array of thirdparty objects
-     * 
+     *
      * @url	GET /thirdparty/list
      *
      */
     function getList($mode=0, $email=NULL, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0) {
         global $db, $conf;
-        
+
         $obj_ret = array();
-        
+
         $socid = DolibarrApiAccess::$user->societe_id ? DolibarrApiAccess::$user->societe_id : '';
-            
+
         // If the internal user must only see his customers, force searching by him
         $search_sale = 0;
         if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
@@ -171,7 +173,7 @@ class ThirdpartyApi extends DolibarrApi
         $sql = "SELECT s.rowid";
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
         $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-        
+
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
         $sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
         $sql.= " WHERE s.fk_stcomm = st.id";
@@ -183,13 +185,13 @@ class ThirdpartyApi extends DolibarrApi
         if ($email != NULL) $sql.= " AND s.email = \"".$email."\"";
         if ($socid) $sql.= " AND s.rowid = ".$socid;
         if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
-        
+
         // Insert sale filter
         if ($search_sale > 0)
         {
             $sql .= " AND sc.fk_user = ".$search_sale;
         }
-        
+
         $nbtotalofrecords = '';
         if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
         {
@@ -233,47 +235,47 @@ class ThirdpartyApi extends DolibarrApi
         }
 		return $obj_ret;
     }
-    
+
     /**
      * Show customers <b>Warning: Deprecated</b>
-     * 
+     *
      * @return array    List of customers
-     * 
+     *
      * @url GET /thirdparty/list/customers
      * @url GET /customer/list
      */
     function getListCustomers() {
         return $this->getList(1);
     }
-    
+
     /**
      * Show prospects <b>Warning: Deprecated</b>
-     * 
+     *
      * @return array    List of prospects
-     * 
+     *
      * @url GET /thirdparty/list/prospects
      */
     function getListProspects() {
         return $this->getList(2);
     }
-    
+
      /**
      * Show other <b>Warning: Deprecated</b>
-     * 
+     *
      * @return array    List of thirpdparties who are not customer neither prospect
-     * 
+     *
      * @url GET /thirdparty/list/others
      */
     function getListOthers() {
         return $this->getList(3);
     }
-    
+
     /**
      * Create thirdparty object <b>Warning: Deprecated</b>
      *
      * @param array $request_data   Request datas
      * @return int  ID of thirdparty
-     * 
+     *
      * @url	POST thirdparty/
      */
     function post($request_data = NULL)
@@ -283,7 +285,7 @@ class ThirdpartyApi extends DolibarrApi
       }
       // Check mandatory fields
       $result = $this->_validate($request_data);
-      
+
       foreach($request_data as $field => $value) {
           $this->company->$field = $value;
       }
@@ -296,7 +298,7 @@ class ThirdpartyApi extends DolibarrApi
      *
      * @param array $request_data   Request datas
      * @return int  ID of thirdparty
-     * 
+     *
      * @url	POST customer/
      */
     function postCustomer($request_data) {
@@ -309,9 +311,9 @@ class ThirdpartyApi extends DolibarrApi
      * Update thirdparty <b>Warning: Deprecated</b>
      *
      * @param int   $id             Id of thirdparty to update
-     * @param array $request_data   Datas   
-     * @return int 
-     * 
+     * @param array $request_data   Datas
+     * @return int
+     *
      * @url	PUT thirdparty/{id}
      */
     function put($id, $request_data = NULL)
@@ -319,12 +321,12 @@ class ThirdpartyApi extends DolibarrApi
         if(! DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
-        
+
         $result = $this->company->fetch($id);
         if( ! $result ) {
             throw new RestException(404, 'Thirdparty not found');
         }
-		
+
 		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
@@ -333,19 +335,19 @@ class ThirdpartyApi extends DolibarrApi
             if ($field == 'id') continue;
             $this->company->$field = $value;
         }
-        
+
         if($this->company->update($id, DolibarrApiAccess::$user,1,'','','update'))
             return $this->get ($id);
-        
+
         return false;
     }
     /**
      * Update customer <b>Warning: Deprecated</b>
      *
      * @param int   $id             Id of thirdparty to update
-     * @param array $request_data   Datas   
-     * @return int 
-     * 
+     * @param array $request_data   Datas
+     * @return int
+     *
      * @url	PUT customer/{id}
      */
     function putClient($id, $request_data = NULL) {
@@ -363,19 +365,19 @@ class ThirdpartyApi extends DolibarrApi
       foreach($request_data as $field => $value) {
           $this->customer->$field = $value;
       }
-      
+
       if($this->customer->update($id, DolibarrApiAccess::$user,1,'','','update'))
           return $this->get ($id);
-      
+
       return false;
     }
-    
+
     /**
      * Delete thirdparty <b>Warning: Deprecated</b>
      *
      * @param int $id   Thirparty ID
      * @return integer
-     * 
+     *
      * @url	DELETE thirdparty/{id}
      * @url	DELETE customer/{id}
      */
@@ -393,13 +395,13 @@ class ThirdpartyApi extends DolibarrApi
       }
       return $this->company->delete($id);
     }
-    
+
     /**
      * Validate fields before create or update object
-     * 
+     *
      * @param array $data   Datas to validate
      * @return array
-     * 
+     *
      * @throws RestException
      */
     function _validate($data)
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 6b39158a87b..577a6389b6f 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -221,7 +221,7 @@ class User extends CommonObject
 			if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
 				$sql.= " WHERE u.entity IS NOT NULL";    // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database
 			else
-				$sql.= " WHERE u.entity IN (0, ".$conf->entity.")";
+				$sql.= " WHERE u.entity IN (0, ".($entity!=''?$entity:$conf->entity).")";   // search in entity provided in parameter
 		}
 
 		if ($sid)    // permet une recherche du user par son SID ActiveDirectory ou Samba
@@ -236,6 +236,7 @@ class User extends CommonObject
 		{
 			$sql.= " AND u.rowid = ".$id;
 		}
+        $sql.= " ORDER BY u.entity ASC";    // Avoid random result when there is 2 login in 2 different entities
 
 		$result = $this->db->query($sql);
 		if ($result)
@@ -310,8 +311,8 @@ class User extends CommonObject
 				$this->fk_member            = $obj->fk_member;
 				$this->fk_user        		= $obj->fk_user;
 
-				// Protection when module multicompany was set, admin was set to first entity and the module disabled,
-				// then this admin user must be admin for all entities.
+				// Protection when module multicompany was set, admin was set to first entity and then, the module was disabled,
+				// in such case, this admin user must be admin for ALL entities.
 				if (empty($conf->multicompany->enabled) && $this->admin && $this->entity == 1) $this->entity = 0;
 
 				// Retreive all extrafield for thirdparty

From 0b7c768f2997fb77047ddefb52af323820b2c690 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Jun 2017 18:18:17 +0200
Subject: [PATCH 372/438] FIX Usage of production mode with REST Api.

---
 htdocs/api/class/api.class.php                | 17 +++---
 htdocs/api/index.php                          | 55 +++++++++++++------
 .../modulebuilder/template/myobject_list.php  |  2 +-
 3 files changed, 48 insertions(+), 26 deletions(-)

diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index 190e24d326c..40e00d01ffd 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -42,10 +42,11 @@ class DolibarrApi
     /**
      * Constructor
      *
-     * @param	DoliDb	$db		      Database handler
-     * @param   string  $cachedir     Cache dir
+     * @param	DoliDb	$db		        Database handler
+     * @param   string  $cachedir       Cache dir
+     * @param   boolean $refreshCache   Update cache
      */
-    function __construct($db, $cachedir='')
+    function __construct($db, $cachedir='', $refreshCache=false)
     {
         global $conf;
 
@@ -54,7 +55,7 @@ class DolibarrApi
 
         $this->db = $db;
         $production_mode = ( empty($conf->global->API_PRODUCTION_MODE) ? false : true );
-        $this->r = new Restler($production_mode);
+        $this->r = new Restler($production_mode, $refreshCache);
 
         $this->r->setAPIVersion(1);
     }
@@ -66,7 +67,7 @@ class DolibarrApi
      *
      * @return array
      */
-    /* Disabled, most APIs does not share same signature for method index 
+    /* Disabled, most APIs does not share same signature for method index
     function index()
     {
         return array(
@@ -93,9 +94,9 @@ class DolibarrApi
         unset($object->linkedObjects);
 
         unset($object->lines); // should be ->lines
-        
+
         unset($object->fields);
-        
+
         unset($object->oldline);
 
         unset($object->error);
@@ -175,7 +176,7 @@ class DolibarrApi
 	 * @throws RestException
 	 */
 	static function _checkAccessToResource($resource, $resource_id=0, $dbtablename='', $feature2='', $dbt_keyfield='fk_soc', $dbt_select='rowid') {
-        
+
 		// Features/modules to check
 		$featuresarray = array($resource);
 		if (preg_match('/&/', $resource)) {
diff --git a/htdocs/api/index.php b/htdocs/api/index.php
index 7a99490a48f..0e54d0cb8af 100644
--- a/htdocs/api/index.php
+++ b/htdocs/api/index.php
@@ -24,8 +24,18 @@
  *  \file       htdocs/api/index.php
  */
 
-if (! defined("NOLOGIN"))        define("NOLOGIN",'1');
-if (! defined("NOCSRFCHECK"))    define("NOCSRFCHECK",'1');
+//if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
+//if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
+//if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
+if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');			// Do not check anti CSRF attack test
+//if (! defined('NOSTYLECHECK'))   define('NOSTYLECHECK','1');		// Do not check style html tag into posted data
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');		// Do not check anti POST attack test
+if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');		// If there is no need to load and show top and left menu
+if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');		// If we don't need to load the html.form.class.php
+if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');       // Do not load ajax.lib.php library
+if (! defined("NOLOGIN"))        define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
+
 
 $res=0;
 if (! $res && file_exists("../main.inc.php")) $res=include '../main.inc.php';
@@ -65,17 +75,6 @@ if (preg_match('/api\/index\.php\/explorer/', $_SERVER["PHP_SELF"]) && ! empty($
 }
 
 
-$api = new DolibarrApi($db);
-
-// Enable the Restler API Explorer.
-// See https://github.com/Luracast/Restler-API-Explorer for more info.
-$api->r->addAPIClass('Luracast\\Restler\\Explorer');
-
-$api->r->setSupportedFormats('JsonFormat', 'XmlFormat', 'UploadFormat');
-$api->r->addAuthenticationClass('DolibarrApiAccess','');
-
-// Define accepted mime types
-UploadFormat::$allowedMimeTypes = array('image/jpeg', 'image/png', 'text/plain', 'application/octet-stream');
 
 
 // Analyze URLs
@@ -91,6 +90,29 @@ preg_match('/index\.php\/([^\/]+)(.*)$/', $_SERVER["PHP_SELF"], $reg);
 // .../index.php/categories?sortfield=t.rowid&sortorder=ASC
 
 
+// Set the flag to say to refresh (when we reload the explorer, production must be for API call only)
+$refreshcache=false;
+if (! empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/resources.json' || $reg[2] == '/resources.json/root'))
+{
+    $refreshcache=true;
+}
+
+
+$api = new DolibarrApi($db, '', $refreshcache);
+//var_dump($api->r->apiVersionMap);
+
+// Enable the Restler API Explorer.
+// See https://github.com/Luracast/Restler-API-Explorer for more info.
+$api->r->addAPIClass('Luracast\\Restler\\Explorer');
+
+$api->r->setSupportedFormats('JsonFormat', 'XmlFormat', 'UploadFormat');
+$api->r->addAuthenticationClass('DolibarrApiAccess','');
+
+// Define accepted mime types
+UploadFormat::$allowedMimeTypes = array('image/jpeg', 'image/png', 'text/plain', 'application/octet-stream');
+
+
+
 // Call Explorer file for all APIs definitions
 if (! empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/resources.json' || $reg[2] == '/resources.json/root'))
 {
@@ -174,10 +196,9 @@ if (! empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/resources.json' |
         }
     }
 
-    // Sort the classes before adding them to Restler. The Restler API Explorer
-    // shows the classes in the order they are added and it's a mess if they are not sorted.
+    // Sort the classes before adding them to Restler.
+    // The Restler API Explorer shows the classes in the order they are added and it's a mess if they are not sorted.
     sort($listofapis);
-    //var_dump($listofapis);
     foreach ($listofapis as $classname)
     {
         $api->r->addAPIClass($classname);
@@ -226,7 +247,7 @@ if (! empty($reg[1]) && ($reg[1] != 'explorer' || ($reg[2] != '/resources.json'
 }
 
 // TODO If not found, redirect to explorer
-//var_dump($api);
+//var_dump($api->r->apiVersionMap);
 //exit;
 
 // Call API (we suppose we found it)
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 2cfc4f293fe..a578a683131 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -32,7 +32,7 @@
 //if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');		// Do not check anti POST attack test
 //if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');			// If there is no need to load and show top and left menu
 //if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');			// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
+//if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');         // Do not load ajax.lib.php library
 //if (! defined("NOLOGIN"))        define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
 
 // Load Dolibarr environment

From 85ce1f3332a77909584eee86ef5f9b0253b25eec Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Jun 2017 09:20:16 +0200
Subject: [PATCH 373/438] Fix missing var init

---
 htdocs/admin/tools/export.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index ebc4061fe6d..7e2fa8ee79d 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -88,6 +88,7 @@ if (!empty($ExecTimeLimit))
     @set_time_limit($ExecTimeLimit);   // Need more than 240 on Windows 7/64
     error_reporting($err);
 }
+$MemoryLimit=0;
 if (!empty($MemoryLimit))
 {
     @ini_set('memory_limit', $MemoryLimit);
@@ -120,10 +121,10 @@ $utils = new Utils($db);
 // MYSQL
 if ($what == 'mysql')
 {
-    
+
     $cmddump=GETPOST("mysqldump");	// Do not sanitize here with 'alpha', will be sanitize later by dol_sanitizePathName and escapeshellarg
     $cmddump=dol_sanitizePathName($cmddump);
-    
+
     if (! empty($dolibarr_main_restrict_os_commands))
     {
         $arrayofallowedcommand=explode(',', $dolibarr_main_restrict_os_commands);
@@ -142,13 +143,13 @@ if ($what == 'mysql')
             $errormsg=$langs->trans('CommandIsNotInsideAllowedCommands');
         }
     }
-    
+
     if (! $errormsg && $cmddump)
     {
         dolibarr_set_const($db, 'SYSTEMTOOLS_MYSQLDUMP', $cmddump,'chaine',0,'',$conf->entity);
     }
 
-    if (! $errormsg) 
+    if (! $errormsg)
     {
         $utils->dumpDatabase(GETPOST('compression','alpha'), $what, 0, $file);
         $errormsg=$utils->error;
@@ -172,13 +173,13 @@ if ($what == 'postgresql')
 {
     $cmddump=GETPOST("postgresqldump");	// Do not sanitize here with 'alpha', will be sanitize later by dol_sanitizePathName and escapeshellarg
     $cmddump=dol_sanitizePathName($cmddump);
-    
+
     if (! $errormsg && $cmddump)
     {
         dolibarr_set_const($db, 'SYSTEMTOOLS_POSTGRESQLDUMP', $cmddump,'chaine',0,'',$conf->entity);
     }
 
-    if (! $errormsg) 
+    if (! $errormsg)
     {
         $utils->dumpDatabase(GETPOST('compression','alpha'), $what, 0, $file);
         $errormsg=$utils->error;

From 4a21457b8a7b7980ef3f8ddc0683804312c3b542 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Jun 2017 09:28:02 +0200
Subject: [PATCH 374/438] Fix position of page nb

---
 htdocs/core/lib/pdf.lib.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index c4257c3c7f8..1b79cc9163d 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1039,10 +1039,10 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
 	// Show page nb only on iso languages (so default Helvetica font)
 	if (strtolower(pdf_getPDFFont($outputlangs)) == 'helvetica')
 	{
-		$pdf->SetXY(-20,-$posy);
+		$pdf->SetXY($dims['wk']-$dims['rm']-15, -$posy);
 		//print 'xxx'.$pdf->PageNo().'-'.$pdf->getAliasNbPages().'-'.$pdf->getAliasNumPage();exit;
-		if (empty($conf->global->MAIN_USE_FPDF)) $pdf->MultiCell(13, 2, $pdf->PageNo().'/'.$pdf->getAliasNbPages(), 0, 'R', 0);
-		else $pdf->MultiCell(13, 2, $pdf->PageNo().'/{nb}', 0, 'R', 0);
+		if (empty($conf->global->MAIN_USE_FPDF)) $pdf->MultiCell(15, 2, $pdf->PageNo().'/'.$pdf->getAliasNbPages(), 0, 'R', 0);
+		else $pdf->MultiCell(15, 2, $pdf->PageNo().'/{nb}', 0, 'R', 0);
 	}
 
 	return $marginwithfooter;
@@ -1246,7 +1246,7 @@ function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issuppl
 
 			if (empty($hideref))
 			{
-				if ($issupplierline) 
+				if ($issupplierline)
 				{
 				    //$ref_prodserv = $prodser->ref.($ref_supplier ? ' ('.$outputlangs->transnoentitiesnoconv("SupplierRef").' '.$ref_supplier.')' : '');   // Show local ref and supplier ref
 				    if (! empty($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES)) $ref_prodserv =$ref_supplier;

From 2be848025f231922a5ef5061fe91e190dde2061d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Jun 2017 10:09:22 +0200
Subject: [PATCH 375/438] Fix parameter withcode of currency_name function. Add
 PHPUnit tests

---
 htdocs/core/lib/company.lib.php | 105 ++++++++++++-----------
 test/phpunit/AdminLibTest.php   |   2 +-
 test/phpunit/AllTests.php       |  10 ++-
 test/phpunit/CompanyLibTest.php | 144 ++++++++++++++++++++++++++++++++
 4 files changed, 205 insertions(+), 56 deletions(-)
 create mode 100644 test/phpunit/CompanyLibTest.php

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 0a41969afd3..d1e0b9020b7 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -162,7 +162,7 @@ function societe_prepare_head(Societe $object)
         $head[$h][2] = 'rib';
         $h++;
     }
-        
+
 	// Show more tabs from modules
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
@@ -217,7 +217,7 @@ function societe_prepare_head(Societe $object)
         $upload_dir = $conf->societe->multidir_output[$object->entity] . "/" . $object->id ;
         $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
         $nbLinks=Link::count($db, $object->element, $object->id);
-        
+
         $head[$h][0] = DOL_URL_ROOT.'/societe/document.php?socid='.$object->id;
         $head[$h][1] = $langs->trans("Documents");
 		if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
@@ -234,7 +234,7 @@ function societe_prepare_head(Societe $object)
     }
     $head[$h][2] = 'agenda';
     $h++;
-    
+
     // Log
     /*$head[$h][0] = DOL_URL_ROOT.'/societe/info.php?socid='.$object->id;
     $head[$h][1] = $langs->trans("Info");
@@ -334,7 +334,7 @@ function getCountry($searchkey,$withcode='',$dbtouse=0,$outputlangs='',$entconv=
     global $db,$langs;
 
     $result='';
-    
+
     // Check parameters
     if (empty($searchkey) && empty($searchlabel))
     {
@@ -421,23 +421,26 @@ function getState($id,$withcode='',$dbtouse=0)
 }
 
 /**
- *    Retourne le nom traduit ou code+nom d'une devise
+ *    Return label of currency or code+label
  *
- *    @param      string	$code_iso       Code iso de la devise
- *    @param      int		$withcode       '1'=affiche code + nom
- *    @return     string     			    Nom traduit de la devise
+ *    @param      string	$code_iso       Code iso of currency
+ *    @param      int		$withcode       '1'=show code + label
+ *    @param      Translate $outputlangs    Output language
+ *    @return     string     			    Label translated of currency
  */
-function currency_name($code_iso,$withcode='')
+function currency_name($code_iso, $withcode='', $outputlangs=null)
 {
     global $langs,$db;
 
-    // Si il existe une traduction, on peut renvoyer de suite le libelle
-    if ($langs->trans("Currency".$code_iso)!="Currency".$code_iso)
+    if (empty($outputlangs)) $outputlangs=$langs;
+
+    // If there is a translation, we can send immediatly the label
+    if ($outputlangs->trans("Currency".$code_iso)!="Currency".$code_iso)
     {
-        return $langs->trans("Currency".$code_iso);
+        return ($withcode?$code_iso.' - ':'').$outputlangs->trans("Currency".$code_iso);
     }
 
-    // Si pas de traduction, on consulte le libelle par defaut en table
+    // If no translation, we read table to get label by default
     $sql = "SELECT label FROM ".MAIN_DB_PREFIX."c_currencies";
     $sql.= " WHERE code_iso='".$code_iso."'";
 
@@ -457,8 +460,8 @@ function currency_name($code_iso,$withcode='')
         {
             return $code_iso;
         }
-
     }
+    return 'ErrorWhenReadingCurrencyLabel';
 }
 
 /**
@@ -499,7 +502,7 @@ function getFormeJuridiqueLabel($code)
 /**
  *  Return if a country is inside the EEC (European Economic Community)
  *  TODO Add a field into country dictionary.
- *  
+ *
  *  @param      Object      $object    Object
  *  @return     boolean		           true = country inside EEC, false = country outside EEC
  */
@@ -649,7 +652,7 @@ function show_projects($conf, $langs, $db, $object, $backtopage='', $nocreatelin
 			            // Opp percent
             			print '<td align="right">';
             			if ($obj->opp_percent) print price($obj->opp_percent, 1, '', 1, 0).'%';
-            			print '</td>';			            
+            			print '</td>';
                         // Status
                         print '<td align="right">'.$projecttmp->getLibStatut(5).'</td>';
 
@@ -671,7 +674,7 @@ function show_projects($conf, $langs, $db, $object, $backtopage='', $nocreatelin
         }
         print "</table>";
         print '</div>';
-        
+
         print "<br>\n";
     }
 
@@ -735,7 +738,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="page" value="'.$page.'">';
-    
+
     print "\n".'<table class="noborder" width="100%">'."\n";
 
     $param="socid=".$object->id;
@@ -777,44 +780,44 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
 	if ($num || (GETPOST('button_search') || GETPOST('button_search.x') || GETPOST('button_search_x')))
     {
         print '<tr class="liste_titre">';
-        
+
         // Photo - Name
         print '<td class="liste_titre">';
         print '<input type="text" class="flat" name="search_name" size="20" value="'.$search_name.'">';
         print '</td>';
-    
+
         // Position
         print '<td class="liste_titre">';
         print '</td>';
-    
+
         // Address - Phone - Email
         print '<td class="liste_titre">&nbsp;</td>';
-    
+
         // Status
         print '<td class="liste_titre maxwidthonsmartphone">';
         print $form->selectarray('search_status', array('-1'=>'','0'=>$contactstatic->LibStatut(0,1),'1'=>$contactstatic->LibStatut(1,1)),$search_status);
         print '</td>';
-    
+
         // Add to agenda
         if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
         {
         	$colspan++;
             print '<td class="liste_titre">&nbsp;</td>';
         }
-    
+
     	// Edit
         print '<td class="liste_titre" align="right">';
         print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
         print '</td>';
-    
+
         print "</tr>";
-    
+
         $i=0;
 
         while ($i < $num)
         {
             $obj = $db->fetch_object($result);
-            
+
             $contactstatic->id = $obj->rowid;
             $contactstatic->ref = $obj->ref;
             $contactstatic->statut = $obj->statut;
@@ -838,7 +841,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
             $contactstatic->country_code = $country_code;
 
             $contactstatic->setGenderFromCivility();
-            
+
             print "<tr>";
 
 			// Photo - Name
@@ -846,7 +849,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
             print $form->showphoto('contact',$contactstatic,0,0,0,'photorefnoborder valignmiddle marginrightonly','small',1,0,1);
 			print $contactstatic->getNomUrl(0,'',0,'&backtopage='.urlencode($backtopage));
 			print '</td>';
-			
+
 			// Job position
 			print '<td>';
             if ($obj->poste) print $obj->poste;
@@ -1036,7 +1039,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
     global $form;
 
     global $param;
-    
+
     // Check parameters
     if (! is_object($filterobj)) dol_print_error('','BadParameter');
 
@@ -1068,7 +1071,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
         $sql.= " AND a.entity IN (".getEntity('agenda').")";
         if (get_class($filterobj) == 'Societe'  && $filterobj->id) $sql.= " AND a.fk_soc = ".$filterobj->id;
         if (get_class($filterobj) == 'Project' && $filterobj->id) $sql.= " AND a.fk_project = ".$filterobj->id;
-        if (get_class($filterobj) == 'Adherent') 
+        if (get_class($filterobj) == 'Adherent')
         {
             $sql.= " AND a.fk_element = m.rowid AND a.elementtype = 'member'";
             if ($filterobj->id) $sql.= " AND a.fk_element = ".$filterobj->id;
@@ -1086,7 +1089,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
             {
                 if ($actioncode == 'AC_NON_AUTO') $sql.= " AND c.type != 'systemauto'";
                 elseif ($actioncode == 'AC_ALL_AUTO') $sql.= " AND c.type = 'systemauto'";
-                else 
+                else
                 {
                     if ($actioncode == 'AC_OTH') $sql.= " AND c.type != 'systemauto'";
                     if ($actioncode == 'AC_OTH_AUTO') $sql.= " AND c.type = 'systemauto'";
@@ -1114,7 +1117,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
             while ($i < $num)
             {
                 $obj = $db->fetch_object($resql);
-                
+
                 //if ($donetodo == 'todo') $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))";
                 //if ($donetodo == 'done') $sql.= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))";
                 $tododone='';
@@ -1128,7 +1131,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
             		'dateend'=>$db->jdate($obj->dp2),
             		'note'=>$obj->label,
             		'percent'=>$obj->percent,
-                    
+
                     'userid'=>$obj->user_id,
                     'login'=>$obj->user_login,
                     'userfirstname'=>$obj->user_firstname,
@@ -1146,7 +1149,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
                     'libelle'=>$obj->alabel,    // deprecated
                     'apicto'=>$obj->apicto
                 );
-                
+
                 $numaction++;
                 $i++;
             }
@@ -1191,7 +1194,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
                 		'note'=>$obj->note,
                 		'percent'=>$obj->percentage,
                 		'acode'=>$obj->acode,
-                    
+
                         'userid'=>$obj->user_id,
                         'login'=>$obj->user_login,
                         'userfirstname'=>$obj->user_firstname,
@@ -1213,7 +1216,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
     if (! empty($conf->agenda->enabled) || (! empty($conf->mailing->enabled) && ! empty($objcon->email)))
     {
         $delay_warning=$conf->global->MAIN_DELAY_ACTIONS_TODO*24*60*60;
-        
+
         require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
         require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
         require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
@@ -1222,7 +1225,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
 	    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 
 	    $formactions=new FormActions($db);
-        
+
 	    $actionstatic=new ActionComm($db);
         $userstatic=new User($db);
         $contactstatic = new Contact($db);
@@ -1243,9 +1246,9 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
             $out.='<input type="hidden" name="id" value="'.$filterobj->id.'" />';
         }
         if (get_class($filterobj) == 'Societe') $out.='<input type="hidden" name="socid" value="'.$filterobj->id.'" />';
-        
+
         $out.="\n";
-        
+
         $out.='<div class="div-table-responsive-no-min">';
         $out.='<table class="noborder" width="100%">';
 
@@ -1270,7 +1273,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
         $out.=$searchpicto;
         $out.='</td>';
         $out.='</tr>';
-        
+
         $out.='<tr class="liste_titre">';
 		if ($donetodo)
 		{
@@ -1293,26 +1296,26 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
 		$out.=getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], 'a.percent', '', $param, 'align="center"', $sortfield, $sortorder);
 		$out.=getTitleFieldOfList('', 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'maxwidthsearch ');
 		$out.='</tr>';
-		
+
         foreach ($histo as $key=>$value)
         {
-            
+
 			$actionstatic->fetch($histo[$key]['id']);    // TODO Do we need this, we already have a lot of data of line into $histo
 
             $out.="<tr ".$bc[$var].">";
-			
+
             // Done or todo
             if ($donetodo)
             {
                 $out.='<td class="nowrap">';
                 $out.='</td>';
             }
-            
+
             // Ref
             $out.='<td class="nowrap">';
             $out.=$actionstatic->getNomUrl(1, -1);
             $out.='</td>';
-            
+
             // Author of event
             $out.='<td>';
             //$userstatic->id=$histo[$key]['userid'];
@@ -1321,7 +1324,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
             $userstatic->fetch($histo[$key]['userid']);
             $out.=$userstatic->getNomUrl(-1);
             $out.='</td>';
-            
+
             // Title
             $out.='<td>';
             if (isset($histo[$key]['type']) && $histo[$key]['type']=='action')
@@ -1360,7 +1363,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
             if ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100 && ! $histo[$key]['dateend'] && $histo[$key]['datestart'] && $db->jdate($histo[$key]['datestart']) < ($now - $delay_warning)) $late=1;
             if ($late) $out.=img_warning($langs->trans("Late")).' ';
             $out.="</td>\n";
-            
+
             // Type
 			$out.='<td>';
 			if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
@@ -1375,7 +1378,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
 			}
 			else {
 			    $typelabel = $actionstatic->type;
-			    if ($histo[$key]['acode'] != 'AC_OTH_AUTO') $typelabel = $langs->trans("ActionAC_MANUAL"); 
+			    if ($histo[$key]['acode'] != 'AC_OTH_AUTO') $typelabel = $langs->trans("ActionAC_MANUAL");
 			    $out.=$typelabel;
 			}
 			$out.='</td>';
@@ -1445,7 +1448,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
 
             // Actions
             $out.='<td></td>';
-            
+
             $out.="</tr>\n";
             $i++;
         }
@@ -1454,7 +1457,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
     }
 
     $out.='</form>';
-    
+
     if ($noprint) return $out;
     else print $out;
 }
diff --git a/test/phpunit/AdminLibTest.php b/test/phpunit/AdminLibTest.php
index 7c9033fe2a6..5cf34e969b1 100644
--- a/test/phpunit/AdminLibTest.php
+++ b/test/phpunit/AdminLibTest.php
@@ -115,7 +115,7 @@ class AdminLibTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * testConvertTime2Seconds
+     * testVersionCompare
      *
      * @return	void
      */
diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php
index a417824867b..56c5541d0bb 100644
--- a/test/phpunit/AllTests.php
+++ b/test/phpunit/AllTests.php
@@ -81,6 +81,8 @@ class AllTests
         //$suite->addTestSuite('CoreTest');
         require_once dirname(__FILE__).'/AdminLibTest.php';
         $suite->addTestSuite('AdminLibTest');
+        require_once dirname(__FILE__).'/CompanyLibTest.php';
+        $suite->addTestSuite('CompanyLibTest');
         require_once dirname(__FILE__).'/DateLibTest.php';
         $suite->addTestSuite('DateLibTest');
         //require_once dirname(__FILE__).'/DateLibTzFranceTest.php';
@@ -107,7 +109,7 @@ class AllTests
         $suite->addTestSuite('CodingSqlTest');
         require_once dirname(__FILE__).'/CodingPhpTest.php';
         $suite->addTestSuite('CodingPhpTest');
-        
+
         require_once dirname(__FILE__).'/SecurityTest.php';
         $suite->addTestSuite('SecurityTest');
 
@@ -121,7 +123,7 @@ class AllTests
         $suite->addTestSuite('BuildDocTest');
         require_once dirname(__FILE__).'/CMailFileTest.php';
         $suite->addTestSuite('CMailFileTest');
-        
+
         require_once dirname(__FILE__).'/CommonObjectTest.php';
         $suite->addTestSuite('CommonObjectTest');
 
@@ -181,7 +183,7 @@ class AllTests
         $suite->addTestSuite('HolidayTest');
         require_once dirname(__FILE__).'/ExpenseReportTest.php';
         $suite->addTestSuite('ExpenseReportTest');
-        
+
         require_once dirname(__FILE__).'/EntrepotTest.php';
         $suite->addTestSuite('EntrepotTest');
         require_once dirname(__FILE__).'/MouvementStockTest.php';
@@ -192,7 +194,7 @@ class AllTests
 
         require_once dirname(__FILE__).'/RestAPIUserTest.php';
         $suite->addTestSuite('RestAPIUserTest');
- 
+
         require_once dirname(__FILE__).'/WebservicesProductsTest.php';
         $suite->addTestSuite('WebservicesProductsTest');
         require_once dirname(__FILE__).'/WebservicesInvoicesTest.php';
diff --git a/test/phpunit/CompanyLibTest.php b/test/phpunit/CompanyLibTest.php
new file mode 100644
index 00000000000..1d61d5925e3
--- /dev/null
+++ b/test/phpunit/CompanyLibTest.php
@@ -0,0 +1,144 @@
+<?php
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ *      \file       test/phpunit/CompanyLibTest.php
+ *      \ingroup    test
+ *      \brief      PHPUnit test
+ *      \remarks    To run this script as CLI:  phpunit filename.php
+ */
+
+global $conf,$user,$langs,$db;
+//define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
+//require_once 'PHPUnit/Autoload.php';
+require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
+require_once dirname(__FILE__).'/../../htdocs/core/lib/company.lib.php';
+
+if (empty($user->id)) {
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
+}
+$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+
+
+/**
+ * Class for PHPUnit tests
+ *
+ * @backupGlobals disabled
+ * @backupStaticAttributes enabled
+ * @remarks backupGlobals must be disabled to have db,conf,user and lang not erased.
+ */
+class CompanyLibTest extends PHPUnit_Framework_TestCase
+{
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
+
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return AdminLibTest
+     */
+    function __construct()
+    {
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
+
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
+    }
+
+    // Static methods
+    public static function setUpBeforeClass()
+    {
+        global $conf,$user,$langs,$db;
+        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+
+        print __METHOD__."\n";
+    }
+
+    // tear down after class
+    public static function tearDownAfterClass()
+    {
+        global $conf,$user,$langs,$db;
+        $db->rollback();
+
+        print __METHOD__."\n";
+    }
+
+    /**
+     * Init phpunit tests
+     *
+     * @return  void
+     */
+    protected function setUp()
+    {
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        print __METHOD__."\n";
+    }
+    /**
+     * End phpunit tests
+     *
+     * @return	void
+     */
+    protected function tearDown()
+    {
+        print __METHOD__."\n";
+    }
+
+    /**
+     * testNameCurrency
+     *
+     * @return	void
+     */
+    public function testNameCurrency()
+    {
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $result=currency_name('USD');
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('United States Dollar',$result);
+
+        $outputlangs=new Translate('', $conf);
+        $outputlangs->setDefaultLang('fr_FR');
+        $outputlangs->load("dict");
+
+        $result=currency_name('USD', 1, $outputlangs);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('USD - Dollars US',$result);
+
+        return $result;
+    }
+}

From 3a6314b1a02b6634b948e5a2f8158731c125c2fe Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Jun 2017 13:29:18 +0200
Subject: [PATCH 376/438] Fix data

---
 htdocs/install/mysql/migration/4.0.0-5.0.0.sql | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
index b5978efac99..5f62c766a01 100644
--- a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
+++ b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
@@ -270,3 +270,8 @@ ALTER TABLE llx_product_fournisseur_price ADD COLUMN default_vat_code	varchar(10
 
 
 ALTER TABLE llx_events MODIFY COLUMN ip varchar(250);
+
+
+UPDATE llx_bank SET label= '(SupplierInvoicePayment)' WHERE label= 'Règlement fournisseur';
+UPDATE llx_bank SET label= '(CustomerInvoicePayment)' WHERE label= 'Règlement client';
+

From cb93770d6b6babace7c93fa8f3b6dc7be9a84155 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Jun 2017 13:29:43 +0200
Subject: [PATCH 377/438] Add php unit

---
 test/phpunit/CompanyLibTest.php | 144 --------------------------------
 1 file changed, 144 deletions(-)
 delete mode 100644 test/phpunit/CompanyLibTest.php

diff --git a/test/phpunit/CompanyLibTest.php b/test/phpunit/CompanyLibTest.php
deleted file mode 100644
index 1d61d5925e3..00000000000
--- a/test/phpunit/CompanyLibTest.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * or see http://www.gnu.org/
- */
-
-/**
- *      \file       test/phpunit/CompanyLibTest.php
- *      \ingroup    test
- *      \brief      PHPUnit test
- *      \remarks    To run this script as CLI:  phpunit filename.php
- */
-
-global $conf,$user,$langs,$db;
-//define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
-//require_once 'PHPUnit/Autoload.php';
-require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
-require_once dirname(__FILE__).'/../../htdocs/core/lib/company.lib.php';
-
-if (empty($user->id)) {
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
-}
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
-
-
-/**
- * Class for PHPUnit tests
- *
- * @backupGlobals disabled
- * @backupStaticAttributes enabled
- * @remarks backupGlobals must be disabled to have db,conf,user and lang not erased.
- */
-class CompanyLibTest extends PHPUnit_Framework_TestCase
-{
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
-
-    /**
-     * Constructor
-     * We save global variables into local variables
-     *
-     * @return AdminLibTest
-     */
-    function __construct()
-    {
-        //$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
-
-        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-        //print " - db ".$db->db;
-        print "\n";
-    }
-
-    // Static methods
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
-
-        print __METHOD__."\n";
-    }
-
-    // tear down after class
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->rollback();
-
-        print __METHOD__."\n";
-    }
-
-    /**
-     * Init phpunit tests
-     *
-     * @return  void
-     */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-
-        print __METHOD__."\n";
-    }
-    /**
-     * End phpunit tests
-     *
-     * @return	void
-     */
-    protected function tearDown()
-    {
-        print __METHOD__."\n";
-    }
-
-    /**
-     * testNameCurrency
-     *
-     * @return	void
-     */
-    public function testNameCurrency()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-
-        $result=currency_name('USD');
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals('United States Dollar',$result);
-
-        $outputlangs=new Translate('', $conf);
-        $outputlangs->setDefaultLang('fr_FR');
-        $outputlangs->load("dict");
-
-        $result=currency_name('USD', 1, $outputlangs);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals('USD - Dollars US',$result);
-
-        return $result;
-    }
-}

From 75006f9970a0f518103898f0257a8b6e504541ad Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Jun 2017 13:30:14 +0200
Subject: [PATCH 378/438] Fix data

---
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 096b82a7768..0867aba9c38 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -500,3 +500,5 @@ ALTER TABLE llx_blockedlog_authority ADD INDEX signature (signature);
 
 -- VMYSQL4.1 INSERT IGNORE INTO llx_product_lot (entity, fk_product, batch, eatby, sellby, datec, fk_user_creat, fk_user_modif) SELECT DISTINCT e.entity, ps.fk_product, pb.batch, pb.eatby, pb.sellby, pb.tms, e.fk_user_author, e.fk_user_author from llx_product_batch as pb, llx_product_stock as ps, llx_entrepot as e WHERE pb.fk_product_stock = ps.rowid AND ps.fk_entrepot = e.rowid
 
+UPDATE llx_bank SET label= '(SupplierInvoicePayment)' WHERE label= 'Règlement fournisseur';
+UPDATE llx_bank SET label= '(CustomerInvoicePayment)' WHERE label= 'Règlement client';

From 9b951c5d1bf954eda70da700cec175a8f2b5e615 Mon Sep 17 00:00:00 2001
From: jfefe <jfefe@users.noreply.github.com>
Date: Mon, 26 Jun 2017 21:37:36 +0200
Subject: [PATCH 379/438] Add missing end tag `form` into fichinter setup

The setup for option `FICHINTER_PRINT_PRODUCTS` was broken.
---
 htdocs/admin/fichinter.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 926a3651362..64257225719 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -559,6 +559,7 @@ print '/>';
 print '</td><td align="right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 print "</td></tr>\n";
+print '</form>';
 // Use services duration
 print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">';
 print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

From 3fdfebf7ef437ff7d050dede9d0c92740e51827a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Jun 2017 04:25:41 +0200
Subject: [PATCH 380/438] Fix position of top menu does not follow 'position'
 field.

---
 htdocs/comm/action/peruser.php             |   4 +-
 htdocs/core/class/menu.class.php           |  18 +-
 htdocs/core/class/menubase.class.php       |   2 +-
 htdocs/core/get_menudiv.php                |   2 +-
 htdocs/core/menus/standard/auguria.lib.php |  25 ++-
 htdocs/core/menus/standard/eldy.lib.php    |  76 +++----
 htdocs/core/menus/standard/empty.php       | 247 ++++++++++++++++++---
 htdocs/core/modules/modAgenda.class.php    |  10 +-
 htdocs/hrm/index.php                       |  19 +-
 htdocs/theme/eldy/style.css.php            |   1 +
 htdocs/theme/md/style.css.php              |   1 +
 11 files changed, 298 insertions(+), 107 deletions(-)

diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 42fb67c8bde..7453b84d477 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -729,8 +729,8 @@ foreach ($usernames as $username)
 {
 	$var = ! $var;
 	echo "<tr>";
-	echo '<td class="cal_current_month cal_peruserviewname'.($var?' cal_impair':'').'">';
-	print $username->getNomUrl(-1,'',0,0,24,1,'');
+	echo '<td class="tdoverflowmax100 cal_current_month cal_peruserviewname'.($var?' cal_impair':'').'">';
+	print $username->getNomUrl(-1,'',0,0,20,1,'');
 	print '</td>';
 	$tmpday = $sav;
 
diff --git a/htdocs/core/class/menu.class.php b/htdocs/core/class/menu.class.php
index 58e93ec5544..d4570218ff2 100644
--- a/htdocs/core/class/menu.class.php
+++ b/htdocs/core/class/menu.class.php
@@ -51,7 +51,7 @@ class Menu
     /**
      * Add a menu entry into this->liste (at end)
      *
-     * @param	string	$url        Url to follow on click
+     * @param	string	$url        Url to follow on click (does not include DOL_URL_ROOT)
      * @param   string	$titre      Label of menu to add
      * @param   integer	$level      Level of menu to add
      * @param   int		$enabled    Menu active or not (0=Not active, 1=Active, 2=Active but grey)
@@ -59,11 +59,14 @@ class Menu
      * @param	string	$mainmenu	Main menu ('home', 'companies', 'products', ...)
      * @param	string	$leftmenu	Left menu ('setup', 'system', 'admintools', ...)
      * @param	int		$position	Position (not used yet)
+     * @param	string	$id			Id
+     * @param	string	$idsel		Id sel
+     * @param	string	$classname	Class name
      * @return	void
      */
-    function add($url, $titre, $level=0, $enabled=1, $target='',$mainmenu='',$leftmenu='',$position=0)
+    function add($url, $titre, $level=0, $enabled=1, $target='',$mainmenu='',$leftmenu='',$position=0, $id='', $idsel='', $classname='')
     {
-        $this->liste[]=array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu, 'position'=>$position);
+        $this->liste[]=array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname);
     }
 
     /**
@@ -78,12 +81,15 @@ class Menu
      * @param	string	$mainmenu	Main menu ('home', 'companies', 'products', ...)
      * @param	string	$leftmenu	Left menu ('setup', 'system', 'admintools', ...)
      * @param	int		$position	Position (not used yet)
+     * @param	string	$id			Id
+     * @param	string	$idsel		Id sel
+     * @param	string	$classname	Class name
      * @return	void
      */
-    function insert($idafter, $url, $titre, $level=0, $enabled=1, $target='',$mainmenu='',$leftmenu='',$position=0)
+    function insert($idafter, $url, $titre, $level=0, $enabled=1, $target='',$mainmenu='',$leftmenu='',$position=0, $id='', $idsel='', $classname='')
     {
         $array_start = array_slice($this->liste,0,($idafter+1));
-        $array_new   = array(0=>array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu,'position'=>$position));
+        $array_new   = array(0=>array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu,'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname));
         $array_end   = array_slice($this->liste,($idafter+1));
         $this->liste=array_merge($array_start,$array_new,$array_end);
     }
@@ -100,7 +106,7 @@ class Menu
 
     /**
      * Return number of visible entries (gray or not)
-     * 
+     *
      *  @return int     Number of visible (gray or not) menu entries
      */
     function getNbOfVisibleMenuEntries()
diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index a6770b57c37..137a5517231 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -602,7 +602,7 @@ class Menubase
                     //$tabMenu[$b]['langs']       = $menu['langs'];
                     $tabMenu[$b]['fk_mainmenu'] = $menu['fk_mainmenu'];
                     $tabMenu[$b]['fk_leftmenu'] = $menu['fk_leftmenu'];
-                    $tabMenu[$b]['position']    = $menu['position'];
+                    $tabMenu[$b]['position']    = (int) $menu['position'];
 
                     $b++;
                 }
diff --git a/htdocs/core/get_menudiv.php b/htdocs/core/get_menudiv.php
index d2712de201f..4ffee2caad9 100644
--- a/htdocs/core/get_menudiv.php
+++ b/htdocs/core/get_menudiv.php
@@ -194,7 +194,7 @@ if (! class_exists('MenuManager'))
 }
 $menumanager = new MenuManager($db, empty($user->societe_id)?0:1);
 $menumanager->loadMenu('all','all');
-//var_dump($menumanager->tabMenu);exit;
+//var_dump($menumanager);exit;
 $menumanager->showmenu('jmobile');
 
 print '</body>';
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index b51d303765b..7b7adc76901 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -62,10 +62,7 @@ function print_auguria_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$m
 	    $classname = 'class="tmenu menuhider"';
 	    $idsel='menu';
 
-	    if (empty($noout)) print_start_menu_entry_auguria($idsel,$classname,$showmode);
-	    if (empty($noout)) print_text_menu_entry_auguria('', 1, '#', $id, $idsel, $classname, $atarget);
-	    if (empty($noout)) print_end_menu_entry_auguria($showmode);
-	    $menu->add('#', '', 0, $showmode, $atarget, "xxx", '');
+	    $menu->add('#', '', 0, $showmode, $atarget, "xxx", '', 0, $id, $idsel, $classname);
 	}
 
 	$num = count($newTabMenu);
@@ -95,7 +92,9 @@ function print_auguria_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$m
 			    }
 				//$url.="idmenu=".$newTabMenu[$i]['rowid'];    // Already done by menuLoad
 				$url = dol_buildpath($url,1).($param?'?'.$param:'');
-				$shorturl = $shorturl.($param?'?'.$param:'');
+				//$shorturl = $shorturl.($param?'?'.$param:'');
+				$shorturl = $url;
+				if (DOL_URL_ROOT) $shorturl = preg_replace('/^'.preg_quote(DOL_URL_ROOT,'/').'/','',$shorturl);
 			}
 
 			$url=preg_replace('/__LOGIN__/',$user->login,$url);
@@ -118,10 +117,18 @@ function print_auguria_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$m
 		}
 		else if ($showmode == 2) $classname='class="tmenu"';
 
-		if (empty($noout)) print_start_menu_entry_auguria($idsel,$classname,$showmode);
-		if (empty($noout)) print_text_menu_entry_auguria($newTabMenu[$i]['titre'], $showmode, $url, $id, $idsel, $classname, ($newTabMenu[$i]['target']?$newTabMenu[$i]['target']:$atarget));
-		if (empty($noout)) print_end_menu_entry_auguria($showmode);
-		$menu->add($shorturl, $newTabMenu[$i]['titre'], 0, $showmode, ($newTabMenu[$i]['target']?$newTabMenu[$i]['target']:$atarget), ($newTabMenu[$i]['mainmenu']?$newTabMenu[$i]['mainmenu']:$newTabMenu[$i]['rowid']), '');
+		$menu->add($shorturl, $newTabMenu[$i]['titre'], 0, $showmode, ($newTabMenu[$i]['target']?$newTabMenu[$i]['target']:$atarget), ($newTabMenu[$i]['mainmenu']?$newTabMenu[$i]['mainmenu']:$newTabMenu[$i]['rowid']), ($newTabMenu[$i]['leftmenu']?$newTabMenu[$i]['leftmenu']:''), $newTabMenu[$i]['position'], $id, $idsel, $classname);
+	}
+
+	// Sort on position
+	$menu->liste = dol_sort_array($menu->liste, 'position');
+
+	// Output menu entries
+	foreach($menu->liste as $menkey => $menuval)
+	{
+	    if (empty($noout)) print_start_menu_entry_auguria($menuval['idsel'],$menuval['classname'],$menuval['enabled']);
+	    if (empty($noout)) print_text_menu_entry_auguria($menuval['titre'], $menuval['enabled'], ($menuval['url']!='#'?DOL_URL_ROOT:'').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target']?$menuval['target']:$atarget));
+	    if (empty($noout)) print_end_menu_entry_auguria($menuval['enabled']);
 	}
 
 	$showmode=1;
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index cd53f913780..ad0bce68f86 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -60,10 +60,7 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$mode
     	$classname = 'class="tmenu menuhider"';
     	$idsel='menu';
 
-    	if (empty($noout)) print_start_menu_entry($idsel,$classname,$showmode);
-    	if (empty($noout)) print_text_menu_entry('', 1, '#', $id, $idsel, $classname, $atarget);
-    	if (empty($noout)) print_end_menu_entry($showmode);
-    	$menu->add('#', '', 0, $showmode, $atarget, "xxx", '');
+    	$menu->add('#', '', 0, $showmode, $atarget, "xxx", '', 0, $id, $idsel, $classname);
 	}
 
 	// Home
@@ -73,10 +70,7 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$mode
 	else $classname = 'class="tmenu"';
 	$idsel='home';
 
-	if (empty($noout)) print_start_menu_entry($idsel,$classname,$showmode);
-	if (empty($noout)) print_text_menu_entry($langs->trans("Home"), 1, DOL_URL_ROOT.'/index.php?mainmenu=home&amp;leftmenu=', $id, $idsel, $classname, $atarget);
-	if (empty($noout)) print_end_menu_entry($showmode);
-	$menu->add('/index.php?mainmenu=home&amp;leftmenu=home', $langs->trans("Home"), 0, $showmode, $atarget, "home", '');
+	$menu->add('/index.php?mainmenu=home&amp;leftmenu=home', $langs->trans("Home"), 0, $showmode, $atarget, "home", '', 10, $id, $idsel, $classname);
 
 	// Third parties
 	$tmpentry=array('enabled'=>(( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)), 'perms'=>(! empty($user->rights->societe->lire) || ! empty($user->rights->fournisseur->lire)), 'module'=>'societe|fournisseur');
@@ -91,10 +85,7 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$mode
 		else $classname = 'class="tmenu"';
 		$idsel='companies';
 
-		if (empty($noout)) print_start_menu_entry($idsel,$classname,$showmode);
-		if (empty($noout)) print_text_menu_entry($langs->trans("ThirdParties"), $showmode, DOL_URL_ROOT.'/societe/index.php?mainmenu=companies&amp;leftmenu=', $id, $idsel, $classname, $atarget);
-		if (empty($noout)) print_end_menu_entry($showmode);
-		$menu->add('/societe/index.php?mainmenu=companies&amp;leftmenu=', $langs->trans("ThirdParties"), 0, $showmode, $atarget, "companies", '');
+		$menu->add('/societe/index.php?mainmenu=companies&amp;leftmenu=', $langs->trans("ThirdParties"), 0, $showmode, $atarget, "companies", '', 20, $id, $idsel, $classname);
 	}
 
 	// Products-Services
@@ -120,10 +111,7 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$mode
 			$chaine.=$langs->trans("TMenuServices");
 		}
 
-		if (empty($noout)) print_start_menu_entry($idsel,$classname,$showmode);
-		if (empty($noout)) print_text_menu_entry($chaine, $showmode, DOL_URL_ROOT.'/product/index.php?mainmenu=products&amp;leftmenu=', $id, $idsel, $classname, $atarget);
-		if (empty($noout)) print_end_menu_entry($showmode);
-		$menu->add('/product/index.php?mainmenu=products&amp;leftmenu=', $chaine, 0, $showmode, $atarget, "products", '');
+		$menu->add('/product/index.php?mainmenu=products&amp;leftmenu=', $chaine, 0, $showmode, $atarget, "products", '', 30, $id, $idsel, $classname);
 	}
 
 	// Commercial
@@ -147,10 +135,7 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$mode
 		else $classname = 'class="tmenu"';
 		$idsel='commercial';
 
-		if (empty($noout)) print_start_menu_entry($idsel,$classname,$showmode);
-		if (empty($noout)) print_text_menu_entry($langs->trans("Commercial"), $showmode, DOL_URL_ROOT.'/comm/index.php?mainmenu=commercial&amp;leftmenu=', $id, $idsel, $classname, $atarget);
-		if (empty($noout)) print_end_menu_entry($showmode);
-		$menu->add('/comm/index.php?mainmenu=commercial&amp;leftmenu=', $langs->trans("Commercial"), 0, $showmode, $atarget, "commercial", "");
+		$menu->add('/comm/index.php?mainmenu=commercial&amp;leftmenu=', $langs->trans("Commercial"), 0, $showmode, $atarget, "commercial", "", 40, $id, $idsel, $classname);
 	}
 
 	// Financial
@@ -177,10 +162,7 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$mode
 		else $classname = 'class="tmenu"';
 		$idsel='accountancy';
 
-		if (empty($noout)) print_start_menu_entry($idsel,$classname,$showmode);
-		if (empty($noout)) print_text_menu_entry($langs->trans("MenuFinancial"), $showmode, DOL_URL_ROOT.'/compta/index.php?mainmenu=accountancy&amp;leftmenu=', $id, $idsel, $classname, $atarget);
-		if (empty($noout)) print_end_menu_entry($showmode);
-		$menu->add('/compta/index.php?mainmenu=accountancy&amp;leftmenu=', $langs->trans("MenuFinancial"), 0, $showmode, $atarget, "accountancy", '');
+		$menu->add('/compta/index.php?mainmenu=accountancy&amp;leftmenu=', $langs->trans("MenuFinancial"), 0, $showmode, $atarget, "accountancy", '', 50, $id, $idsel, $classname);
 	}
 
 	// Bank
@@ -198,10 +180,7 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$mode
 		else $classname = 'class="tmenu"';
 		$idsel='bank';
 
-		if (empty($noout)) print_start_menu_entry($idsel,$classname,$showmode);
-		if (empty($noout)) print_text_menu_entry($langs->trans("MenuBankCash"), $showmode, DOL_URL_ROOT.'/compta/bank/index.php?mainmenu=bank&amp;leftmenu=', $id, $idsel, $classname, $atarget);
-		if (empty($noout)) print_end_menu_entry($showmode);
-		$menu->add('/compta/bank/index.php?mainmenu=bank&amp;leftmenu=', $langs->trans("MenuBankCash"), 0, $showmode, $atarget, "bank", '');
+		$menu->add('/compta/bank/index.php?mainmenu=bank&amp;leftmenu=', $langs->trans("MenuBankCash"), 0, $showmode, $atarget, "bank", '', 60, $id, $idsel, $classname);
 	}
 
 	// Projects
@@ -218,10 +197,7 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$mode
 		else $classname = 'class="tmenu"';
 		$idsel='project';
 
-		if (empty($noout)) print_start_menu_entry($idsel,$classname,$showmode);
-		if (empty($noout)) print_text_menu_entry($langs->trans("Projects"), $showmode, DOL_URL_ROOT.'/projet/index.php?mainmenu=project&amp;leftmenu=', $id, $idsel, $classname, $atarget);
-		if (empty($noout)) print_end_menu_entry($showmode);
-		$menu->add('/projet/index.php?mainmenu=project&amp;leftmenu=', $langs->trans("Projects"), 0, $showmode, $atarget, "project", '');
+		$menu->add('/projet/index.php?mainmenu=project&amp;leftmenu=', $langs->trans("Projects"), 0, $showmode, $atarget, "project", '', 70, $id, $idsel, $classname);
 	}
 
 	// HRM
@@ -238,10 +214,7 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$mode
 		else $classname = 'class="tmenu"';
 		$idsel='hrm';
 
-		if (empty($noout)) print_start_menu_entry($idsel,$classname,$showmode);
-		if (empty($noout)) print_text_menu_entry($langs->trans("HRM"), $showmode, DOL_URL_ROOT.'/hrm/index.php?mainmenu=hrm&amp;leftmenu=', $id, $idsel, $classname, $atarget);
-		if (empty($noout)) print_end_menu_entry($showmode);
-		$menu->add('/hrm/index.php?mainmenu=hrm&amp;leftmenu=', $langs->trans("HRM"), 0, $showmode, $atarget, "hrm", '');
+		$menu->add('/hrm/index.php?mainmenu=hrm&amp;leftmenu=', $langs->trans("HRM"), 0, $showmode, $atarget, "hrm", '', 80, $id, $idsel, $classname);
 	}
 
 
@@ -260,10 +233,7 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$mode
 		else $classname = 'class="tmenu"';
 		$idsel='tools';
 
-		if (empty($noout)) print_start_menu_entry($idsel,$classname,$showmode);
-		if (empty($noout)) print_text_menu_entry($langs->trans("TMenuTools"), $showmode, DOL_URL_ROOT.'/core/tools.php?mainmenu=tools&amp;leftmenu=', $id, $idsel, $classname, $atarget);
-		if (empty($noout)) print_end_menu_entry($showmode);
-		$menu->add('/core/tools.php?mainmenu=tools&amp;leftmenu=', $langs->trans("Tools"), 0, $showmode, $atarget, "tools", '');
+		$menu->add('/core/tools.php?mainmenu=tools&amp;leftmenu=', $langs->trans("Tools"), 0, $showmode, $atarget, "tools", '', 90, $id, $idsel, $classname);
 	}
 
 	// Members
@@ -278,10 +248,7 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$mode
 		else $classname = 'class="tmenu"';
 		$idsel='members';
 
-		if (empty($noout)) print_start_menu_entry($idsel,$classname,$showmode);
-		if (empty($noout)) print_text_menu_entry($langs->trans("MenuMembers"), $showmode, DOL_URL_ROOT.'/adherents/index.php?mainmenu=members&amp;leftmenu=', $id, $idsel, $classname, $atarget);
-		if (empty($noout)) print_end_menu_entry($showmode);
-		$menu->add('/adherents/index.php?mainmenu=members&amp;leftmenu=', $langs->trans("MenuMembers"), 0, $showmode, $atarget, "members", '');
+		$menu->add('/adherents/index.php?mainmenu=members&amp;leftmenu=', $langs->trans("MenuMembers"), 0, $showmode, $atarget, "members", '', 100, $id, $idsel, $classname);
 	}
 
 
@@ -297,6 +264,7 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$mode
 		$showmode=dol_eldy_showmenu($type_user,$newTabMenu[$i],$listofmodulesforexternal);
 		if ($showmode == 1)
 		{
+		    // url = url from host, shorturl = relative path into dolibarr sources
 			$url = $shorturl = $newTabMenu[$i]['url'];
 			if (! preg_match("/^(http:\/\/|https:\/\/)/i",$newTabMenu[$i]['url']))
 			{
@@ -307,7 +275,9 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$mode
 				if (! preg_match('/mainmenu/i',$param) || ! preg_match('/leftmenu/i',$param)) $param.=($param?'&':'').'mainmenu='.$newTabMenu[$i]['mainmenu'].'&amp;leftmenu=';
 				//$url.="idmenu=".$newTabMenu[$i]['rowid'];    // Already done by menuLoad
 				$url = dol_buildpath($url,1).($param?'?'.$param:'');
-				$shorturl = $shorturl.($param?'?'.$param:'');
+				//$shorturl = $shorturl.($param?'?'.$param:'');
+                $shorturl = $url;
+				if (DOL_URL_ROOT) $shorturl = preg_replace('/^'.preg_quote(DOL_URL_ROOT,'/').'/','',$shorturl);
 			}
 			$url=preg_replace('/__LOGIN__/',$user->login,$url);
 			$shorturl=preg_replace('/__LOGIN__/',$user->login,$shorturl);
@@ -321,10 +291,18 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$mode
 		}
 		else if ($showmode == 2) $classname='class="tmenu"';
 
-		if (empty($noout)) print_start_menu_entry($idsel,$classname,$showmode);
-		if (empty($noout)) print_text_menu_entry($newTabMenu[$i]['titre'], $showmode, $url, $id, $idsel, $classname, ($newTabMenu[$i]['target']?$newTabMenu[$i]['target']:$atarget));
-		if (empty($noout)) print_end_menu_entry($showmode);
-		$menu->add($shorturl, $newTabMenu[$i]['titre'], 0, $showmode, ($newTabMenu[$i]['target']?$newTabMenu[$i]['target']:$atarget), ($newTabMenu[$i]['mainmenu']?$newTabMenu[$i]['mainmenu']:$newTabMenu[$i]['rowid']), '');
+		$menu->add($shorturl, $newTabMenu[$i]['titre'], 0, $showmode, ($newTabMenu[$i]['target']?$newTabMenu[$i]['target']:$atarget), ($newTabMenu[$i]['mainmenu']?$newTabMenu[$i]['mainmenu']:$newTabMenu[$i]['rowid']), ($newTabMenu[$i]['leftmenu']?$newTabMenu[$i]['leftmenu']:''), $newTabMenu[$i]['position'], $id, $idsel, $classname);
+	}
+
+	// Sort on position
+	$menu->liste = dol_sort_array($menu->liste, 'position');
+
+	// Output menu entries
+	foreach($menu->liste as $menkey => $menuval)
+	{
+	    if (empty($noout)) print_start_menu_entry($menuval['idsel'],$menuval['classname'],$menuval['enabled']);
+	    if (empty($noout)) print_text_menu_entry($menuval['titre'], $menuval['enabled'], ($menuval['url']!='#'?DOL_URL_ROOT:'').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target']?$menuval['target']:$atarget));
+	    if (empty($noout)) print_end_menu_entry($menuval['enabled']);
 	}
 
 	$showmode=1;
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index e4424712625..dafc0486145 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -76,39 +76,47 @@ class MenuManager
 		$res='ErrorBadParameterForMode';
 
 		$noout=0;
-		if ($mode == 'jmobile') $noout=1;
+		//if ($mode == 'jmobile') $noout=1;
 
 		if ($mode == 'topnb')
 		{
 		    return 1;
 		}
 
-		if ($mode == 'top' || $mode == 'jmobile')
+		if ($mode == 'top')
 		{
 			if (empty($noout)) print_start_menu_array_empty();
 
-			// Home
-			$showmode=1;
-			$idsel='home';
-			$classname='class="tmenusel"';
+			$usemenuhider = (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER));
 
 			// Show/Hide vertical menu
-			if ($mode != 'jmobile' && $mode != 'topnb' && (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider &&  empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 			{
 			    $showmode=1;
 			    $classname = 'class="tmenu menuhider"';
 			    $idsel='menu';
 
-			    if (empty($noout)) print_start_menu_entry($idsel,$classname,$showmode);
-			    if (empty($noout)) print_text_menu_entry('', 1, '#', $id, $idsel, $classname, $atarget);
-			    if (empty($noout)) print_end_menu_entry($showmode);
-			    $menu->add('#', '', 0, $showmode, $atarget, "xxx", '');
+			    $this->menu->add('#', '', 0, $showmode, $atarget, "xxx", '', 0, $id, $idsel, $classname);
 			}
 
-			if (empty($noout)) print_start_menu_entry_empty($idsel, $classname, $showmode);
-			if (empty($noout)) print_text_menu_entry_empty($langs->trans("Home"), 1, dol_buildpath('/index.php',1).'?mainmenu=home&amp;leftmenu=', $id, $idsel, $classname, $this->atarget);
-			if (empty($noout)) print_end_menu_entry_empty($showmode);
-			$this->menu->add(dol_buildpath('/index.php',1), $langs->trans("Home"), 0, $showmode, $this->atarget, 'home', '');
+			// Home
+			$showmode=1;
+			$classname='class="tmenusel"';
+			$idsel='home';
+
+			$this->menu->add('/index.php', $langs->trans("Home"), 0, $showmode, $this->atarget, 'home', '', 10, $id, $idsel, $classname);
+
+
+			// Sort on position
+			$this->menu->liste = dol_sort_array($this->menu->liste, 'position');
+
+			// Output menu entries
+			foreach($this->menu->liste as $menkey => $menuval)
+			{
+			    if (empty($noout)) print_start_menu_entry_empty($menuval['idsel'],$menuval['classname'],$menuval['enabled']);
+			    if (empty($noout)) print_text_menu_entry_empty($menuval['titre'], $menuval['enabled'], ($menuval['url']!='#'?DOL_URL_ROOT:'').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target']?$menuval['target']:$atarget));
+			    if (empty($noout)) print_end_menu_entry_empty($menuval['enabled']);
+			}
 
 			$showmode=1;
 			if (empty($noout)) print_start_menu_entry_empty('','class="tmenuend"',$showmode);
@@ -123,7 +131,195 @@ class MenuManager
 			}
 		}
 
-		if ($mode == 'left' || $mode == 'jmobile')
+		if ($mode == 'jmobile')     // Used to get menu in xml ul/li
+		{
+		    // Home
+		    $showmode=1;
+		    $classname='class="tmenusel"';
+		    $idsel='home';
+
+		    $this->menu->add('/index.php', $langs->trans("Home"), 0, $showmode, $this->atarget, 'home', '', 10, $id, $idsel, $classname);
+
+
+		    // $this->menu->liste is top menu
+		    //var_dump($this->menu->liste);exit;
+		    $lastlevel = array();
+		    print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
+		    foreach($this->menu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
+		    {
+		        print '<ul class="ulmenu" data-inset="true">';
+		        print '<li class="lilevel0">';
+
+		        if ($val['enabled'] == 1)
+		        {
+		            $relurl=dol_buildpath($val['url'],1);
+		            $relurl=preg_replace('/__LOGIN__/',$user->login,$relurl);
+		            $relurl=preg_replace('/__USERID__/',$user->id,$relurl);
+		            $canonurl=preg_replace('/\?.*$/','',$val['url']);
+
+		            print '<a class="alilevel0" href="#">';
+
+		            // Add font-awesome
+		            if ($val['level'] == 0 && $val['mainmenu'] == 'home') print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';
+
+		            print $val['titre'];
+		            print '</a>'."\n";
+
+		            // Search submenu fot this mainmenu entry
+		            $tmpmainmenu=$val['mainmenu'];
+		            $tmpleftmenu='all';
+		            $submenu=new Menu();
+
+		            $langs->load("admin");  // Load translation file admin.lang
+		            $submenu->add("/admin/index.php?leftmenu=setup", $langs->trans("Setup"),0);
+		            $submenu->add("/admin/company.php", $langs->trans("MenuCompanySetup"),1);
+		            $submenu->add("/admin/modules.php", $langs->trans("Modules"),1);
+		            $submenu->add("/admin/menus.php", $langs->trans("Menus"),1);
+		            $submenu->add("/admin/ihm.php", $langs->trans("GUISetup"),1);
+		            $submenu->add("/admin/translation.php?mainmenu=home", $langs->trans("Translation"),1);
+		            $submenu->add("/admin/defaultvalues.php?mainmenu=home", $langs->trans("DefaultValues"),1);
+
+		            $submenu->add("/admin/boxes.php", $langs->trans("Boxes"),1);
+		            $submenu->add("/admin/delais.php",$langs->trans("Alerts"),1);
+		            $submenu->add("/admin/proxy.php?mainmenu=home", $langs->trans("Security"),1);
+		            $submenu->add("/admin/limits.php?mainmenu=home", $langs->trans("MenuLimits"),1);
+		            $submenu->add("/admin/pdf.php?mainmenu=home", $langs->trans("PDF"),1);
+		            $submenu->add("/admin/mails.php?mainmenu=home", $langs->trans("Emails"),1);
+		            $submenu->add("/admin/sms.php?mainmenu=home", $langs->trans("SMS"),1);
+		            $submenu->add("/admin/dict.php?mainmenu=home", $langs->trans("DictionarySetup"),1);
+		            $submenu->add("/admin/const.php?mainmenu=home", $langs->trans("OtherSetup"),1);
+
+		            //if ($tmpmainmenu.'-'.$tmpleftmenu == 'home-all') { var_dump($submenu); exit; }
+		            //if ($tmpmainmenu=='accountancy') { var_dump($submenu->liste); exit; }
+		            $nexturl=dol_buildpath($submenu->liste[0]['url'],1);
+
+		            $canonrelurl=preg_replace('/\?.*$/','',$relurl);
+		            $canonnexturl=preg_replace('/\?.*$/','',$nexturl);
+		            //var_dump($canonrelurl);
+		            //var_dump($canonnexturl);
+		            print '<ul>'."\n";
+		            if (($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('tools')))
+		                || (strpos($canonrelurl,'/product/index.php') !== false || strpos($canonrelurl,'/compta/bank/index.php') !== false))
+		            {
+		                // We add sub entry
+		                print str_pad('',1).'<li class="lilevel1 ui-btn-icon-right ui-btn">';	 // ui-btn to highlight on clic
+		                print '<a href="'.$relurl.'">';
+		                if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard")  // No translation
+		                {
+		                    if (in_array($val['mainmenu'], array('cashdesk', 'websites'))) print $langs->trans("Access");
+		                    else print $langs->trans("Dashboard");
+		                }
+		                else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
+		                print '</a>';
+		                print '</li>'."\n";
+		            }
+
+		            if ($val['level']==0)
+		            {
+		                if ($val['enabled'])
+		                {
+		                    $lastlevel[0]='enabled';
+		                }
+		                else if ($showmenu)                 // Not enabled but visible (so greyed)
+		                {
+		                    $lastlevel[0]='greyed';
+		                }
+		                else
+		                {
+		                    $lastlevel[0]='hidden';
+		                }
+		            }
+
+		            $lastlevel2 = array();
+		            foreach($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
+		            {
+		                $showmenu=true;
+		                if (! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) $showmenu=false;
+
+		                // If at least one parent is not enabled, we do not show any menu of all children
+		                if ($val2['level'] > 0)
+		                {
+		                    $levelcursor = $val2['level']-1;
+		                    while ($levelcursor >= 0)
+		                    {
+		                        if ($lastlevel2[$levelcursor] != 'enabled') $showmenu=false;
+		                        $levelcursor--;
+		                    }
+		                }
+
+		                if ($showmenu)		// Visible (option to hide when not allowed is off or allowed)
+		                {
+		                    $relurl2=dol_buildpath($val2['url'],1);
+		                    $relurl2=preg_replace('/__LOGIN__/',$user->login,$relurl2);
+		                    $relurl2=preg_replace('/__USERID__/',$user->id,$relurl2);
+		                    $canonurl2=preg_replace('/\?.*$/','',$val2['url']);
+		                    //var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
+		                    if (in_array($canonurl2,array('/admin/index.php','/admin/tools/index.php','/core/tools.php'))) $relurl2='';
+
+		                    $disabled='';
+		                    if (! $val2['enabled'])
+		                    {
+		                        $disabled=" vsmenudisabled";
+		                    }
+
+		                    print str_pad('',$val2['level']+1);
+		                    print '<li class="lilevel'.($val2['level']+1);
+		                    if ($val2['level']==0) print ' ui-btn-icon-right ui-btn';  // ui-btn to highlight on clic
+		                    print $disabled.'">';	 // ui-btn to highlight on clic
+		                    if ($relurl2)
+		                    {
+		                        if ($val2['enabled'])	// Allowed
+		                        {
+		                            print '<a href="'.$relurl2.'"';
+		                            //print ' data-ajax="false"';
+		                            print '>';
+		                            $lastlevel2[$val2['level']]='enabled';
+		                        }
+		                        else					// Not allowed but visible (greyed)
+		                        {
+		                            print '<a href="#" class="vsmenudisabled">';
+		                            $lastlevel2[$val2['level']]='greyed';
+		                        }
+		                    }
+		                    else
+		                    {
+		                        if ($val2['enabled'])	// Allowed
+		                        {
+		                            $lastlevel2[$val2['level']]='enabled';
+		                        }
+		                        else
+		                        {
+		                            $lastlevel2[$val2['level']]='greyed';
+		                        }
+		                    }
+		                    //var_dump($val2['level']);
+		                    //var_dump($lastlevel2);
+		                    print $val2['titre'];
+		                    if ($relurl2)
+		                    {
+		                        if ($val2['enabled'])	// Allowed
+		                            print '</a>';
+		                            else
+		                                print '</a>';
+		                    }
+		                    print '</li>'."\n";
+		                }
+
+
+		            }
+		            //var_dump($submenu);
+		            print '</ul>';
+		        }
+		        if ($val['enabled'] == 2)
+		        {
+		            print '<font class="vsmenudisabled">'.$val['titre'].'</font>';
+		        }
+		        print '</li>';
+		        print '</ul>'."\n";
+		    }
+		}
+
+		if ($mode == 'left')
 		{
 			// Put here left menu entries
 			// ***** START *****
@@ -134,8 +330,10 @@ class MenuManager
 			$this->menu->add("/admin/modules.php", $langs->trans("Modules"),1);
 			$this->menu->add("/admin/menus.php", $langs->trans("Menus"),1);
 			$this->menu->add("/admin/ihm.php", $langs->trans("GUISetup"),1);
-			$this->menu->add("/admin/fiscalyear.php", $langs->trans("Fiscalyear"),1);
-			$this->menu->add("/admin/boxes.php", $langs->trans("Boxes"),1);
+			$this->menu->add("/admin/translation.php?mainmenu=home", $langs->trans("Translation"),1);
+			$this->menu->add("/admin/defaultvalues.php?mainmenu=home", $langs->trans("DefaultValues"),1);
+
+		    $this->menu->add("/admin/boxes.php", $langs->trans("Boxes"),1);
 			$this->menu->add("/admin/delais.php",$langs->trans("Alerts"),1);
 			$this->menu->add("/admin/proxy.php?mainmenu=home", $langs->trans("Security"),1);
 			$this->menu->add("/admin/limits.php?mainmenu=home", $langs->trans("MenuLimits"),1);
@@ -143,7 +341,6 @@ class MenuManager
 			$this->menu->add("/admin/mails.php?mainmenu=home", $langs->trans("Emails"),1);
 			$this->menu->add("/admin/sms.php?mainmenu=home", $langs->trans("SMS"),1);
 			$this->menu->add("/admin/dict.php?mainmenu=home", $langs->trans("DictionarySetup"),1);
-			if (! empty($conf->accounting->enabled)) $this->menu->add("/accountancy/admin/account.php", $langs->trans("Chartofaccounts"),1);
 			$this->menu->add("/admin/const.php?mainmenu=home", $langs->trans("OtherSetup"),1);
 
 			// ***** END *****
@@ -170,15 +367,15 @@ class MenuManager
         				$lastopened = 1; // For menu manager "empty", we force to not have blockvmenulast defined
 						if (($alt%2==0))
 						{
-							print '<div class="blockvmenuimpair blockvmenuunique'.($lastopened?' blockvmenulast':'').($alt == 1 ? ' blockvmenufirst':'').'">'."\n";
+							print '<div class="blockvmenub lockvmenuimpair blockvmenuunique'.($lastopened?' blockvmenulast':'').($alt == 1 ? ' blockvmenufirst':'').'">'."\n";
 						}
 						else
 						{
-							print '<div class="blockvmenupair blockvmenuunique'.($lastopened?' blockvmenulast':'').($alt == 1 ? ' blockvmenufirst':'').'">'."\n";
+							print '<div class="blockvmenu blockvmenupair blockvmenuunique'.($lastopened?' blockvmenulast':'').($alt == 1 ? ' blockvmenufirst':'').'">'."\n";
 						}
 					}
 
-					// Place tabulation
+					// Add tabulation
 					$tabstring='';
 					$tabul=($this->menu->liste[$i]['level'] - 1);
 					if ($tabul > 0)
@@ -243,10 +440,10 @@ class MenuManager
 				unset($this->menu->liste);
 			}
 		}
-
+/*
 		if ($mode == 'jmobile')
 		{
-			foreach($this->topmenu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
+			foreach($this->menu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
 			{
 				print '<ul class="ulmenu" data-inset="true">';
 				print '<li class="lilevel0">';
@@ -296,7 +493,7 @@ class MenuManager
 				break;	// Only first menu entry (so home)
 			}
 		}
-
+*/
 		unset($this->menu);
 
 		return $res;
diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index 7513b489195..de7b42ef1a6 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -86,17 +86,17 @@ class modAgenda extends DolibarrModules
 		{
 		    while ($obj = $this->db->fetch_object($sqlreadactions))
 		    {
-		        //if (preg_match('/_CREATE$/',$obj->code) && (! in_array($obj->code, array('COMPANY_CREATE','PRODUCT_CREATE','TASK_CREATE')))) continue;    // We don't track such events (*_CREATE) by default, we prefer validation (except thirdparty/product/task creation because there is no validation). 
+		        //if (preg_match('/_CREATE$/',$obj->code) && (! in_array($obj->code, array('COMPANY_CREATE','PRODUCT_CREATE','TASK_CREATE')))) continue;    // We don't track such events (*_CREATE) by default, we prefer validation (except thirdparty/product/task creation because there is no validation).
 		        if (preg_match('/^TASK_/',$obj->code)) continue;      // We don't track such events by default.
 		        //if (preg_match('/^_MODIFY/',$obj->code)) continue;    // We don't track such events by default.
 		        $this->const[] = array('MAIN_AGENDA_ACTIONAUTO_'.$obj->code, "chaine", "1");
 		    }
 		}
-		else 
+		else
 		{
 		    dol_print_error($this->db->lasterror());
 		}
-		
+
 		// New pages on tabs
 		// -----------------
 		$this->tabs = array();
@@ -197,7 +197,7 @@ class modAgenda extends DolibarrModules
 													'mainmenu'=>'agenda',
 													'url'=>'/comm/action/index.php',
 													'langs'=>'agenda',
-													'position'=>100,
+													'position'=>15,
 													'perms'=>'$user->rights->agenda->myactions->read',
 													'enabled'=>'$conf->agenda->enabled',
 													'target'=>'',
@@ -407,5 +407,5 @@ class modAgenda extends DolibarrModules
 		$this->export_sql_end[$r] .=' ORDER BY ac.datep';
 
 	}
-	
+
 }
diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index 24038fd3403..5b3548cc8fb 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -109,7 +109,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is usele
     		print '</tr>';
     		$i++;
     	}
-    	print '</table>';	
+    	print '</table>';
     	print '</form>';
     	print '<br>';
     }
@@ -171,12 +171,13 @@ if (! empty($conf->holiday->enabled) && $user->rights->holiday->read)
 
         $holidaystatic=new Holiday($db);
         $userstatic=new User($db);
-        
+
         $listhalfday=array('morning'=>$langs->trans("Morning"),"afternoon"=>$langs->trans("Afternoon"));
         $typeleaves=$holidaystatic->getTypes(1,-1);
-        
+
         $i = 0;
 
+        print '<div class="div-table-responsive">';
         print '<table class="noborder" width="100%">';
         print '<tr class="liste_titre">';
         print '<th colspan="3">'.$langs->trans("BoxTitleLastLeaveRequests",min($max,$num)).'</th>';
@@ -202,16 +203,16 @@ if (! empty($conf->holiday->enabled) && $user->rights->holiday->read)
                 print '<td>'.$holidaystatic->getNomUrl(1).'</td>';
                 print '<td>'.$userstatic->getNomUrl(-1, 'leave').'</td>';
                 print '<td>'.$typeleaves[$obj->fk_type]['label'].'</td>';
-                
+
                 $starthalfday=($obj->halfday == -1 || $obj->halfday == 2)?'afternoon':'morning';
                 $endhalfday=($obj->halfday == 1 || $obj->halfday == 2)?'morning':'afternoon';
-                
+
                 print '<td>'.dol_print_date($obj->date_start,'day').' '.$langs->trans($listhalfday[$starthalfday]);
                 print '<td>'.dol_print_date($obj->date_end,'day').' '.$langs->trans($listhalfday[$endhalfday]);
                 print '<td align="right">'.dol_print_date($db->jdate($obj->dm),'day').'</td>';
                 print '<td>'.$holidaystatic->LibStatut($obj->status,3).'</td>';
                 print '</tr>';
-                
+
                 $i++;
             }
 
@@ -220,7 +221,7 @@ if (! empty($conf->holiday->enabled) && $user->rights->holiday->read)
         {
             print '<tr class="oddeven"><td colspan="7" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
         }
-        print '</table><br>';
+        print '</table></div><br>';
     }
     else dol_print_error($db);
 }
@@ -279,7 +280,7 @@ if (! empty($conf->deplacement->enabled) && $user->rights->deplacement->lire)
 				print '<td align="right">'.dol_print_date($db->jdate($obj->dm),'day').'</td>';
 				print '<td>'.$deplacementstatic->LibStatut($obj->fk_statut,3).'</td>';
 				print '</tr>';
-				
+
 				$i++;
 			}
 
@@ -346,7 +347,7 @@ if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire
 				print '<td align="right">'.dol_print_date($db->jdate($obj->dm),'day').'</td>';
 				print '<td>'.$expensereportstatic->LibStatut($obj->status,3).'</td>';
 				print '</tr>';
-				
+
 				$i++;
 			}
 
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 67359ea650f..d7ba1f979b4 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1735,6 +1735,7 @@ img.userphotosmall {			/* size for user photo in lists */
     height: 12px;
     background-size: contain;
     vertical-align: middle;
+    background-color: #FFF;
 }
 .span-icon-user {
 	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/object_user.png',1); ?>);
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 8543b2ecc0f..a2c9b20c63b 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1747,6 +1747,7 @@ img.login, img.printer, img.entity {
 	height: 16px;
     background-size: contain;
 	vertical-align: text-bottom;
+	background-color: #FFF;
 }
 img.userphoto {			/* size for user photo in lists */
     border-radius: 9px;

From 34f3552dc779475ba2734103b9b9225337e710e7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Jun 2017 04:31:29 +0200
Subject: [PATCH 381/438] Fix missing image of user

---
 htdocs/comm/action/listactions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index 35fccdef2c8..c8df98e0267 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -497,12 +497,12 @@ if ($resql)
             print '</td>';
         }
 
-		// User to do
+		// User owner
 		print '<td align="left">';
 		if ($obj->fk_user_action > 0)
 		{
 			$userstatic->fetch($obj->fk_user_action);
-			print $userstatic->getNomUrl(1);
+			print $userstatic->getNomUrl(-1);
 		}
 		else print '&nbsp;';
 		print '</td>';

From 267170b8d2afaf09386ddeadbe303951ef2929bc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Jun 2017 10:34:41 +0200
Subject: [PATCH 382/438] Fix mainmenu was not correctly set with auguria menu

---
 htdocs/core/menus/standard/auguria.lib.php | 7 ++++---
 htdocs/core/menus/standard/eldy.lib.php    | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 7b7adc76901..6334696a99f 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -81,10 +81,10 @@ function print_auguria_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$m
 				$url = $shorturl = $tmp[0];
 				$param = (isset($tmp[1])?$tmp[1]:'');
 
-				// Complete param to force leftmenu to '' to closed opend menu when we click on a link with no leftmenu defined.
+				// Complete param to force leftmenu to '' to close open menu when we click on a link with no leftmenu defined.
 			    if ((! preg_match('/mainmenu/i',$param)) && (! preg_match('/leftmenu/i',$param)) && ! empty($newTabMenu[$i]['url']))
 			    {
-			        $param.=($param?'&':'').'mainmenu='.$newTabMenu[$i]['url'].'&leftmenu=';
+			        $param.=($param?'&':'').'mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=';
 			    }
 			    if ((! preg_match('/mainmenu/i',$param)) && (! preg_match('/leftmenu/i',$param)) && empty($newTabMenu[$i]['url']))
 			    {
@@ -94,6 +94,7 @@ function print_auguria_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$m
 				$url = dol_buildpath($url,1).($param?'?'.$param:'');
 				//$shorturl = $shorturl.($param?'?'.$param:'');
 				$shorturl = $url;
+
 				if (DOL_URL_ROOT) $shorturl = preg_replace('/^'.preg_quote(DOL_URL_ROOT,'/').'/','',$shorturl);
 			}
 
@@ -126,7 +127,7 @@ function print_auguria_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$m
 	// Output menu entries
 	foreach($menu->liste as $menkey => $menuval)
 	{
-	    if (empty($noout)) print_start_menu_entry_auguria($menuval['idsel'],$menuval['classname'],$menuval['enabled']);
+        if (empty($noout)) print_start_menu_entry_auguria($menuval['idsel'],$menuval['classname'],$menuval['enabled']);
 	    if (empty($noout)) print_text_menu_entry_auguria($menuval['titre'], $menuval['enabled'], ($menuval['url']!='#'?DOL_URL_ROOT:'').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target']?$menuval['target']:$atarget));
 	    if (empty($noout)) print_end_menu_entry_auguria($menuval['enabled']);
 	}
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index ad0bce68f86..b479f02619c 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1583,7 +1583,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			    $url = $shorturl = $tmp[0];
 			    $param = (isset($tmp[1])?$tmp[1]:'');    // params in url of the menu link
 
-			    // Complete param to force leftmenu to '' to closed opend menu when we click on a link with no leftmenu defined.
+			    // Complete param to force leftmenu to '' to close open menu when we click on a link with no leftmenu defined.
 			    if ((! preg_match('/mainmenu/i',$param)) && (! preg_match('/leftmenu/i',$param)) && ! empty($menu_array[$i]['mainmenu']))
 			    {
 			        $param.=($param?'&':'').'mainmenu='.$menu_array[$i]['mainmenu'].'&leftmenu=';

From 08af9bf3655883b8c462544798667265b36001e0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Jun 2017 10:37:00 +0200
Subject: [PATCH 383/438] List before

---
 htdocs/comm/action/listactions.php      | 11 +++++++++++
 htdocs/core/lib/agenda.lib.php          | 21 +++++++++++----------
 htdocs/core/modules/modAgenda.class.php | 22 +++++++++++-----------
 3 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index c8df98e0267..13a7015059b 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -338,6 +338,17 @@ if ($resql)
     if ($usergroup) $nav.='<input type="hidden" name="usergroup" value="'.$usergroup.'">';
     print $nav;
 
+    if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create)
+    {
+        $newparam.='&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$year;
+
+        //$param='month='.$monthshown.'&year='.$year;
+        $hourminsec='100000';
+        $link = '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.sprintf("%04d%02d%02d",$year,$month,$day).$hourminsec.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($newparam?'?'.$newparam:'')).'">';
+        $link.= $langs->trans("NewAction");
+        $link.= '</a>';
+    }
+
     print_barre_liste($s, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $link, $num, -1 * $nbtotalofrecords, '', 0, $nav, '', $limit);
 
     $moreforfilter='';
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 4e9b458c3d0..5ac0982a3a0 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -85,7 +85,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 		{
 		    include_once DOL_DOCUMENT_ROOT . '/resource/class/html.formresource.class.php';
 		    $formresource=new FormResource($db);
-		    
+
     		// Resource
     		print '<tr>';
     		print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
@@ -94,7 +94,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
             print $formresource->select_resource_list($resourceid, "resourceid", '', 1, 0, 0, null, '', 2);
     		print '</td></tr>';
 		}
-		
+
 		include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
 		$formactions=new FormActions($db);
 
@@ -251,7 +251,7 @@ function show_array_actions_to_do($max=5)
         while ($i < $num)
         {
             $obj = $db->fetch_object($resql);
-            
+
 
             print '<tr class="oddeven">';
 
@@ -347,7 +347,7 @@ function show_array_last_actions_done($max=5)
 		while ($i < $num)
 		{
 			$obj = $db->fetch_object($resql);
-			
+
 
 			print '<tr class="oddeven">';
 
@@ -458,7 +458,7 @@ function actions_prepare_head($object)
 	{
 	    include_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
 	    $resource=new DolResource($db);
-	    
+
 		$head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=action&element_id='.$object->id;
         $listofresourcelinked = $resource->getElementResources($object->element, $object->id);
         $nbResources=count($listofresourcelinked);
@@ -506,6 +506,11 @@ function calendars_prepare_head($param)
     $h = 0;
     $head = array();
 
+    $head[$h][0] = DOL_URL_ROOT.'/comm/action/listactions.php'.($param?'?'.$param:'');
+    $head[$h][1] = $langs->trans("ViewList");
+    $head[$h][2] = 'cardlist';
+    $h++;
+
     $head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?action=show_day'.($param?'&'.$param:'');
     $head[$h][1] = $langs->trans("ViewDay");
     $head[$h][2] = 'cardday';
@@ -529,16 +534,12 @@ function calendars_prepare_head($param)
         $head[$h][2] = 'cardpertype';
         $h++;
     }
-    
+
     $head[$h][0] = DOL_URL_ROOT.'/comm/action/peruser.php'.($param?'?'.$param:'');
     $head[$h][1] = $langs->trans("ViewPerUser");
     $head[$h][2] = 'cardperuser';
     $h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/comm/action/listactions.php'.($param?'?'.$param:'');
-    $head[$h][1] = $langs->trans("ViewList");
-    $head[$h][2] = 'cardlist';
-    $h++;
 
 	$object=new stdClass();
 
diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index de7b42ef1a6..dc8b16fecc8 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -235,7 +235,7 @@ class modAgenda extends DolibarrModules
 													'mainmenu'=>'agenda',
 													'url'=>'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda',
 													'langs'=>'agenda',
-													'position'=>102,
+													'position'=>140,
 													'perms'=>'$user->rights->agenda->myactions->read',
 													'enabled'=>'$conf->agenda->enabled',
 													'target'=>'',
@@ -247,7 +247,7 @@ class modAgenda extends DolibarrModules
 													'mainmenu'=>'agenda',
 													'url'=>'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine',
 													'langs'=>'agenda',
-													'position'=>103,
+													'position'=>141,
 													'perms'=>'$user->rights->agenda->myactions->read',
 													'enabled'=>'$conf->agenda->enabled',
 													'target'=>'',
@@ -259,7 +259,7 @@ class modAgenda extends DolibarrModules
 													'mainmenu'=>'agenda',
 													'url'=>'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine',
 													'langs'=>'agenda',
-													'position'=>104,
+													'position'=>142,
 													'perms'=>'$user->rights->agenda->myactions->read',
 													'enabled'=>'$conf->agenda->enabled',
 													'target'=>'',
@@ -271,7 +271,7 @@ class modAgenda extends DolibarrModules
 													'mainmenu'=>'agenda',
 													'url'=>'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filtert=-1',
 													'langs'=>'agenda',
-													'position'=>105,
+													'position'=>143,
 													'perms'=>'$user->rights->agenda->allactions->read',
 													'enabled'=>'$user->rights->agenda->allactions->read',
 													'target'=>'',
@@ -283,7 +283,7 @@ class modAgenda extends DolibarrModules
 													'mainmenu'=>'agenda',
 													'url'=>'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filtert=-1',
 													'langs'=>'agenda',
-													'position'=>106,
+													'position'=>144,
 													'perms'=>'$user->rights->agenda->allactions->read',
 													'enabled'=>'$user->rights->agenda->allactions->read',
 													'target'=>'',
@@ -296,7 +296,7 @@ class modAgenda extends DolibarrModules
 													'mainmenu'=>'agenda',
 													'url'=>'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda',
 													'langs'=>'agenda',
-													'position'=>112,
+													'position'=>110,
 													'perms'=>'$user->rights->agenda->myactions->read',
 													'enabled'=>'$conf->agenda->enabled',
 													'target'=>'',
@@ -308,7 +308,7 @@ class modAgenda extends DolibarrModules
 													'mainmenu'=>'agenda',
 													'url'=>'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine',
 													'langs'=>'agenda',
-													'position'=>113,
+													'position'=>111,
 													'perms'=>'$user->rights->agenda->myactions->read',
 													'enabled'=>'$conf->agenda->enabled',
 													'target'=>'',
@@ -320,7 +320,7 @@ class modAgenda extends DolibarrModules
 													'mainmenu'=>'agenda',
 													'url'=>'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine',
 													'langs'=>'agenda',
-													'position'=>114,
+													'position'=>112,
 													'perms'=>'$user->rights->agenda->myactions->read',
 													'enabled'=>'$conf->agenda->enabled',
 													'target'=>'',
@@ -332,7 +332,7 @@ class modAgenda extends DolibarrModules
 													'mainmenu'=>'agenda',
 													'url'=>'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filtert=-1',
 													'langs'=>'agenda',
-													'position'=>115,
+													'position'=>113,
 													'perms'=>'$user->rights->agenda->allactions->read',
 													'enabled'=>'$user->rights->agenda->allactions->read',
 													'target'=>'',
@@ -344,7 +344,7 @@ class modAgenda extends DolibarrModules
 													'mainmenu'=>'agenda',
 													'url'=>'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filtert=-1',
 													'langs'=>'agenda',
-													'position'=>116,
+													'position'=>114,
 													'perms'=>'$user->rights->agenda->allactions->read',
 													'enabled'=>'$user->rights->agenda->allactions->read',
 													'target'=>'',
@@ -357,7 +357,7 @@ class modAgenda extends DolibarrModules
 													'mainmenu'=>'agenda',
 													'url'=>'/comm/action/rapport/index.php?mainmenu=agenda&amp;leftmenu=agenda',
 													'langs'=>'agenda',
-													'position'=>120,
+													'position'=>160,
 													'perms'=>'$user->rights->agenda->allactions->read',
 													'enabled'=>'$conf->agenda->enabled',
 													'target'=>'',

From 92287ab18d0473e6315f7b4fcdd11623e2cfeda7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Jun 2017 11:12:03 +0200
Subject: [PATCH 384/438] Fix url suggested for bookmark did not always include
 params

---
 htdocs/bookmarks/bookmarks.lib.php         | 24 ++++++++++++++++++++--
 htdocs/bookmarks/card.php                  | 20 ++++++++++--------
 htdocs/core/menus/standard/auguria.lib.php | 20 +++++++++---------
 3 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index b6a022db898..8f8295f0e53 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -40,7 +40,26 @@ function printBookmarksList($aDb, $aLangs)
 
 	$langs->load("bookmarks");
 
-	$url= $_SERVER["PHP_SELF"].(dol_escape_htmltag($_SERVER["QUERY_STRING"])?'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]):'');
+	$url= $_SERVER["PHP_SELF"];
+
+	if (! empty($_SERVER["QUERY_STRING"]))
+	{
+	    $url.=(dol_escape_htmltag($_SERVER["QUERY_STRING"])?'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]):'');
+	}
+	else
+	{
+	    global $sortfield,$sortorder;
+	    $tmpurl='';
+	    // No urlencode, all param $url will be urlencoded later
+	    if ($sortfield) $tmpurl.=($tmpurl?'&':'').'sortfield='.$sortfield;
+	    if ($sortorder) $tmpurl.=($tmpurl?'&':'').'sortorder='.$sortorder;
+	    foreach($_POST as $key => $val)
+	    {
+            if (preg_match('/^search_/', $key) && $val != '') $tmpurl.=($tmpurl?'&':'').$key.'='.$val;
+	    }
+
+	    $url.=($tmpurl?'?'.$tmpurl:'');
+	}
 
 	$ret = '';
 
@@ -55,7 +74,8 @@ function printBookmarksList($aDb, $aLangs)
 	// Url to go on create new bookmark page
 	if ($user->rights->bookmark->creer)
 	{
-    	$urltoadd=DOL_URL_ROOT.'/bookmarks/card.php?action=create&amp;urlsource='.urlencode($url).'&amp;url='.urlencode($url);
+    	//$urltoadd=DOL_URL_ROOT.'/bookmarks/card.php?action=create&amp;urlsource='.urlencode($url).'&amp;url='.urlencode($url);
+	    $urltoadd=DOL_URL_ROOT.'/bookmarks/card.php?action=create&amp;url='.urlencode($url);
     	$ret.= '<option value="newbookmark" class="optionblue" rel="'.dol_escape_htmltag($urltoadd).'">'.dol_escape_htmltag($langs->trans('AddThisPageToBookmarks')).'...</option>';
 	}
 	// Menu with all bookmarks
diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php
index a9d4a39ef85..e9722669e7d 100644
--- a/htdocs/bookmarks/card.php
+++ b/htdocs/bookmarks/card.php
@@ -39,6 +39,7 @@ $id=GETPOST("id");
 $action=GETPOST("action","alpha");
 $title=GETPOST("title","alpha");
 $url=GETPOST("url","alpha");
+$urlsource=GETPOST("urlsource","alpha");
 $target=GETPOST("target","alpha");
 $userid=GETPOST("userid","int");
 $position=GETPOST("position","int");
@@ -64,7 +65,7 @@ if ($action == 'add' || $action == 'addproduct' || $action == 'update')
 
 	if (GETPOST("cancel"))
 	{
-		if (empty($backtopage)) $backtopage=(GETPOST("urlsource")?GETPOST("urlsource"):((! empty($url))?$url:DOL_URL_ROOT.'/bookmarks/list.php'));
+		if (empty($backtopage)) $backtopage=($urlsource?$urlsource:((! empty($url))?$url:DOL_URL_ROOT.'/bookmarks/list.php'));
 		header("Location: ".$backtopage);
 		exit;
 	}
@@ -97,7 +98,7 @@ if ($action == 'add' || $action == 'addproduct' || $action == 'update')
 
 		if ($res > 0)
 		{
-			if (empty($backtopage)) $backtopage=(GETPOST("urlsource")?GETPOST("urlsource"):DOL_URL_ROOT.'/bookmarks/list.php');
+			if (empty($backtopage)) $backtopage=($urlsource?$urlsource:((! empty($url))?$url:DOL_URL_ROOT.'/bookmarks/list.php'));
 			header("Location: ".$backtopage);
 			exit;
 		}
@@ -121,6 +122,7 @@ if ($action == 'add' || $action == 'addproduct' || $action == 'update')
 	}
 }
 
+
 /*
  * View
  */
@@ -153,15 +155,15 @@ if ($action == 'create')
 
 	print load_fiche_titre($langs->trans("NewBookmark"));
 
-	dol_fiche_head($head, $hselected, $langs->trans("Bookmark"),0,'bookmark');
+	dol_fiche_head($head, $hselected, $langs->trans("Bookmark"), 0, 'bookmark');
 
 	print '<table class="border" width="100%">';
 
 	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("BookmarkTitle").'</td><td><input id="titlebookmark" class="flat minwidth100" name="title" value="'.$title.'"></td><td class="hideonsmartphone">'.$langs->trans("SetHereATitleForLink").'</td></tr>';
 	dol_set_focus('#titlebookmark');
-	
+
 	// Url
-	print '<tr><td class="fieldrequired">'.$langs->trans("UrlOrLink").'</td><td><input class="flat quatrevingtpercent" name="url" value="'.$url.'"></td><td class="hideonsmartphone">'.$langs->trans("UseAnExternalHttpLinkOrRelativeDolibarrLink").'</td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans("UrlOrLink").'</td><td><input class="flat quatrevingtpercent" name="url" value="'.dol_escape_htmltag($url).'"></td><td class="hideonsmartphone">'.$langs->trans("UseAnExternalHttpLinkOrRelativeDolibarrLink").'</td></tr>';
 
 	// Target
 	print '<tr><td>'.$langs->trans("BehaviourOnClick").'</td><td>';
@@ -219,14 +221,14 @@ if ($id > 0 && ! preg_match('/^add/i',$action))
 	}
 
 
-	dol_fiche_head($head, $hselected, $langs->trans("Bookmark"),0,'bookmark');
+	dol_fiche_head($head, $hselected, $langs->trans("Bookmark"), -1, 'bookmark');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/bookmarks/list.php">'.$langs->trans("BackToList").'</a>';
-	
+
     dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', '', 0);
 
     print '<div class="fichecenter">';
-    
+
     print '<div class="underbanner clearboth"></div>';
 	print '<table class="border" width="100%">';
 
@@ -304,7 +306,7 @@ if ($id > 0 && ! preg_match('/^add/i',$action))
 	print '</table>';
 
 	print '</div>';
-	
+
 	dol_fiche_end();
 
 	if ($action == 'edit')
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 6334696a99f..6b42e7ad500 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -301,6 +301,16 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
         print "<!-- End SearchForm -->\n";
 	}
 
+	if (is_array($moredata) && ! empty($moredata['bookmarks']))
+	{
+	    print "\n";
+	    print "<!-- Begin Bookmarks -->\n";
+	    print '<div id="blockvmenubookmarks" class="blockvmenubookmarks">'."\n";
+	    print $moredata['bookmarks'];
+	    print '</div>'."\n";
+	    print "<!-- End Bookmarks -->\n";
+	}
+
 	// We update newmenu with entries found into database
 	$menuArbo = new Menubase($db,'auguria');
 	$newmenu = $menuArbo->menuLeftCharger($newmenu,$mainmenu,$leftmenu,($user->societe_id?1:0),'auguria',$tabMenu);
@@ -564,16 +574,6 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 		if ($altok) print '<div class="blockvmenuend"></div>';    // End menu block
 	}
 
-	if (is_array($moredata) && ! empty($moredata['bookmarks']))
-	{
-	        print "\n";
-	        print "<!-- Begin Bookmarks -->\n";
-	        print '<div id="blockvmenubookmarks" class="blockvmenubookmarks">'."\n";
-	        print $moredata['bookmarks'];
-	        print '</div>'."\n";
-	        print "<!-- End Bookmarks -->\n";
-	}
-
 	return count($menu_array);
 }
 

From 10eda66735bcbcc775da7108b981e009fa970b0e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Jun 2017 11:32:52 +0200
Subject: [PATCH 385/438] Fix alignement

---
 htdocs/admin/delais.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index 0280673906b..d3ef125f2a7 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -165,7 +165,7 @@ if ($action == 'edit')
     $var=true;
 
     print '<table class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("DelaysOfToleranceBeforeWarning").'</td><td width="120px">'.$langs->trans("Value").'</td></tr>';
+    print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("DelaysOfToleranceBeforeWarning").'</td><td class="center" width="120px">'.$langs->trans("Value").'</td></tr>';
 
     foreach($modules as $module => $delays)
     {
@@ -173,12 +173,12 @@ if ($action == 'edit')
     	{
     		foreach($delays as $delay)
     		{
-    			
+
 				$value=(! empty($conf->global->{$delay['code']})?$conf->global->{$delay['code']}:0);
     			print '<tr class="oddeven">';
     			print '<td width="20px">'.img_object('',$delay['img']).'</td>';
     			print '<td>'.$langs->trans('Delays_'.$delay['code']).'</td><td>';
-    			print '<input size="5" name="'.$delay['code'].'" value="'.$value.'"> '.$langs->trans("days").'</td></tr>';
+    			print '<input class="right maxwidth75" type="number" name="'.$delay['code'].'" value="'.$value.'"> '.$langs->trans("days").'</td></tr>';
     		}
     	}
     }
@@ -189,11 +189,11 @@ if ($action == 'edit')
 
 	// Show if meteo is enabled
 	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="120px">'.$langs->trans("Value").'</td></tr>';
+	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td class="center" width="120px">'.$langs->trans("Value").'</td></tr>';
 
 	$var=false;
 	print '<tr class="oddeven">';
-	print '<td>'.$langs->trans("MAIN_DISABLE_METEO").'</td><td>' .$form->selectyesno('MAIN_DISABLE_METEO',(empty($conf->global->MAIN_DISABLE_METEO)?0:1),1) . '</td></tr>';
+	print '<td>'.$langs->trans("MAIN_DISABLE_METEO").'</td><td class="center">' .$form->selectyesno('MAIN_DISABLE_METEO',(empty($conf->global->MAIN_DISABLE_METEO)?0:1),1) . '</td></tr>';
 
 	print '</table>';
 
@@ -211,7 +211,7 @@ else
      */
 
 	print '<table class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("DelaysOfToleranceBeforeWarning").'</td><td width="120px">'.$langs->trans("Value").'</td></tr>';
+    print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("DelaysOfToleranceBeforeWarning").'</td><td class="center" width="120px">'.$langs->trans("Value").'</td></tr>';
     $var=true;
 
     foreach($modules as $module => $delays)
@@ -220,12 +220,12 @@ else
     	{
     		foreach($delays as $delay)
     		{
-    			
+
 				$value=(! empty($conf->global->{$delay['code']})?$conf->global->{$delay['code']}:0);
     			print '<tr class="oddeven">';
     			print '<td width="20px">'.img_object('',$delay['img']).'</td>';
     			print '<td>'.$langs->trans('Delays_'.$delay['code']).'</td>';
-    			print '<td>'.$value.' '.$langs->trans("days").'</td></tr>';
+    			print '<td class="right">'.$value.' '.$langs->trans("days").'</td></tr>';
     		}
     	}
     }
@@ -236,11 +236,11 @@ else
 
 	// Show if meteo is enabled
 	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="120px">'.$langs->trans("Value").'</td></tr>';
+	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td class="center" width="120px">'.$langs->trans("Value").'</td></tr>';
 
 	$var=false;
 	print '<tr class="oddeven">';
-	print '<td>'.$langs->trans("MAIN_DISABLE_METEO").'</td><td>' . yn($conf->global->MAIN_DISABLE_METEO) . '</td></tr>';
+	print '<td>'.$langs->trans("MAIN_DISABLE_METEO").'</td><td class="center">' . yn($conf->global->MAIN_DISABLE_METEO) . '</td></tr>';
 
 	print '</table>';
 

From 2e64db2556bebba042967ac35511c3902ad29f1e Mon Sep 17 00:00:00 2001
From: Darkjeff <jeff@jeffinfo.com>
Date: Tue, 27 Jun 2017 11:44:18 +0200
Subject: [PATCH 386/438] update sells journal

add in bookkeeping
add export control
---
 htdocs/accountancy/journal/sellsjournal.php | 149 ++++++++------------
 1 file changed, 55 insertions(+), 94 deletions(-)

diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index cf92905e041..720e020f7c8 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -46,7 +46,7 @@ $langs->load("main");
 $langs->load("accountancy");
 
 $id_journal = GETPOST('id_journal', 'int');
-$action = GETPOST('action','aZ09');
+$action = GETPOST('action','alpha');
 
 $date_startmonth = GETPOST('date_startmonth');
 $date_startday = GETPOST('date_startday');
@@ -54,6 +54,7 @@ $date_startyear = GETPOST('date_startyear');
 $date_endmonth = GETPOST('date_endmonth');
 $date_endday = GETPOST('date_endday');
 $date_endyear = GETPOST('date_endyear');
+$in_bookkeeping = GETPOST('in_bookkeeping');
 
 $now = dol_now();
 
@@ -113,6 +114,8 @@ if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 $sql .= " AND fd.product_type IN (0,1)";
 if ($date_start && $date_end)
 	$sql .= " AND f.datef >= '" . $db->idate($date_start) . "' AND f.datef <= '" . $db->idate($date_end) . "'";
+if ($in_bookkeeping == 'yes')    
+	$sql .= " AND (f.rowid NOT IN (SELECT fk_doc FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab  WHERE ab.doc_type='customer_invoice') )";
 $sql .= " ORDER BY f.datef";
 
 dol_syslog('accountancy/journal/sellsjournal.php', LOG_DEBUG);
@@ -401,76 +404,18 @@ if ($action == 'writebookkeeping') {
 $form = new Form($db);
 
 // Export
-/*if ($action == 'export_csv') {
+if ($action == 'export_csv') {
 
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
 	$sell_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
+	
 
 	include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';
 
 	$companystatic = new Client($db);
+	$invoicestatic = new Facture($db);
 
-	// Model Cegid Expert Export
-	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 2) {
-		$sep = ";";
-
-		foreach ( $tabfac as $key => $val ) {
-			$companystatic->id = $tabcompany[$key]['id'];
-			$companystatic->name = $tabcompany[$key]['name'];
-			$companystatic->client = $tabcompany[$key]['code_client'];
-
-			$invoicestatic->id = $key;
-			$invoicestatic->ref = $val["ref"];
-
-			$date = dol_print_date($val["date"], '%d%m%Y');
-
-			foreach ( $tabttc[$key] as $k => $mt ) {
-				print $date . $sep;
-				print $sell_journal . $sep;
-				print length_accountg($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) . $sep;
-				print length_accounta(html_entity_decode($k)) . $sep;
-				print ($mt < 0 ? 'C' : 'D') . $sep;
-				print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
-				print dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("subledger_account") . $sep;
-				print $val["ref"];
-				print "\n";
-			}
-
-			// Product / Service
-			foreach ( $tabht[$key] as $k => $mt ) {
-				$accountingaccount_static = new AccountingAccount($db);
-				if ($accountingaccount_static->fetch(null, $k, true)) {
-					print $date . $sep;
-					print $sell_journal . $sep;
-					print length_accountg(html_entity_decode($k)) . $sep;
-					print $sep;
-					print ($mt < 0 ? 'D' : 'C') . $sep;
-					print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
-					print dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $accountingaccount_static->label . $sep;
-					print $val["ref"];
-					print "\n";
-				}
-			}
-
-			// TVA
-			foreach ( $tabtva[$key] as $k => $mt ) {
-				if ($mt) {
-					print $date . $sep;
-					print $sell_journal . $sep;
-					print length_accountg(html_entity_decode($k)) . $sep;
-					print $sep;
-					print ($mt < 0 ? 'D' : 'C') . $sep;
-					print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
-					print dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT") . $sep;
-					// print $langs->trans("VAT") . $sep;
-					print $val["ref"];
-					print "\n";
-				}
-			}
-		}
-	} elseif ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 1) {
-		// Model Classic Export
-		foreach ( $tabfac as $key => $val ) {
+			foreach ( $tabfac as $key => $val ) {
 			$companystatic->id = $tabcompany[$key]['id'];
 			$companystatic->name = $tabcompany[$key]['name'];
 			$companystatic->client = $tabcompany[$key]['code_client'];
@@ -479,49 +424,70 @@ $form = new Form($db);
 			$invoicestatic->ref = $val["ref"];
 
 			$date = dol_print_date($val["date"], 'day');
-
+		
 			foreach ( $tabttc[$key] as $k => $mt ) {
-				print '"' . $date . '"' . $sep;
-				print '"' . $val["ref"] . '"' . $sep;
-				print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
-				print '"' . dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("subledger_account") . '"' . $sep;
-				print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
-				print '"' . ($mt < 0 ? price(- $mt) : '') . '"';
-				print "\n";
+				print '"' . $key . '"' . $sep;
+                print '"' . $date . '"' . $sep;
+                print '"' . $val["ref"] . '"' . $sep;
+				print '"' . utf8_decode ( dol_trunc($companystatic->name, 32) ) . '"' . $sep;
+                print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
+                print '"' . $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER . '"' . $sep;
+                print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
+				print '"' . $langs->trans("Code_tiers") . '"' . $sep;
+                print '"' . utf8_decode ( dol_trunc($companystatic->name, 16) ) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers")  . '"' . $sep;
+                print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
+                print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
+				print '"' . $sell_journal . '"' ;
+                print "\n";
 			}
 
 			// Product / Service
 			foreach ( $tabht[$key] as $k => $mt ) {
 				$accountingaccount = new AccountingAccount($db);
 				$accountingaccount->fetch(null, $k, true);
+				
 
 				if ($mt) {
-					print '"' . $date . '"' . $sep;
-					print '"' . $val["ref"] . '"' . $sep;
-					print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
-					print '"' . dol_trunc($companystatic->name, 16) . ' - ' . dol_trunc($accountingaccount->label, 32) . '"' . $sep;
-					print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
-					print '"' . ($mt >= 0 ? price($mt) : '') . '"';
-					print "\n";
+					print '"' . $key . '"' . $sep;
+                    print '"' . $date . '"' . $sep;
+                    print '"' . $val["ref"] . '"' . $sep;
+					print '"' . utf8_decode ( dol_trunc($companystatic->name, 32) ) . '"' . $sep;
+                    print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
+                    print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
+                    print "  " . $sep;
+					print '"' . utf8_decode ( dol_trunc($accountingaccount->label, 32) ) . '"' . $sep;
+                    print '"' . utf8_decode (dol_trunc($companystatic->name, 16) ) . ' - ' . dol_trunc($accountingaccount->label, 32) . '"' . $sep;
+                    print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
+                    print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
+              		print '"' . $sell_journal . '"' ;
+                    print "\n";
 				}
 			}
 
 			// VAT
 			foreach ( $tabtva[$key] as $k => $mt ) {
+			
+			
+			
 				if ($mt) {
-					print '"' . $date . '"' . $sep;
-					print '"' . $val["ref"] . '"' . $sep;
-					print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
-					print '"' . dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT") . '"' . $sep;
-					print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
-					print '"' . ($mt >= 0 ? price($mt) : '') . '"';
-					print "\n";
+					print '"' . $key . '"' . $sep;
+                    print '"' . $date . '"' . $sep;
+                    print '"' . $val["ref"] . '"' . $sep;
+					print '"' . utf8_decode ( dol_trunc($companystatic->name, 32) ). '"' . $sep;
+                    print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
+                    print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
+                    print "  " . $sep;
+					print '"' . $langs->trans("VAT") . ' - ' . $def_tva[$key]. '"' . $sep;
+                    print '"' . utf8_decode ( dol_trunc($companystatic->name, 16) ). ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT") . '"' . $sep;
+                    print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
+                    print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
+                   	print '"' . $sell_journal . '"' ;
+                    print "\n";
 				}
 			}
-		}
 	}
-}
-*/
+	}
+
 
 
 if (empty($action) || $action == 'view') {
@@ -545,12 +511,6 @@ if (empty($action) || $action == 'view') {
 
 	journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''), '', $varlink);
 
-	/*if ($conf->global->ACCOUNTING_EXPORT_MODELCSV != 1 && $conf->global->ACCOUNTING_EXPORT_MODELCSV != 2) {
-		print '<input type="button" class="butActionRefused" style="float: right;" value="' . $langs->trans("Export") . '" disabled="disabled" title="' . $langs->trans('ExportNotSupported') . '"/>';
-	} else {
-		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
-	}*/
-
 	// Button to write into Ledger
 	if (empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1') {
 	    print img_warning().' '.$langs->trans("SomeMandatoryStepsOfSetupWereNotDone");
@@ -563,6 +523,7 @@ if (empty($action) || $action == 'view') {
 	else {
 	   print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
 	}
+	print '<input type="button" class="butAction" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
 	print '</div>';
 
 	print '

From 618334ac4231284c0c4933efabcda3b3d8821a4e Mon Sep 17 00:00:00 2001
From: Darkjeff <jeff@jeffinfo.com>
Date: Tue, 27 Jun 2017 11:58:26 +0200
Subject: [PATCH 387/438] update purchase journal

add in bookkeeping
add export control
---
 .../accountancy/journal/purchasesjournal.php  | 108 ++++++------------
 1 file changed, 37 insertions(+), 71 deletions(-)

diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index cbe793deb63..06e681285b2 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -43,7 +43,7 @@ $langs->load("main");
 $langs->load("accountancy");
 
 $id_journal = GETPOST('id_journal', 'int');
-$action = GETPOST('action','aZ09');
+$action = GETPOST('action','alpha');
 
 $date_startmonth = GETPOST('date_startmonth');
 $date_startday = GETPOST('date_startday');
@@ -51,6 +51,7 @@ $date_startyear = GETPOST('date_startyear');
 $date_endmonth = GETPOST('date_endmonth');
 $date_endday = GETPOST('date_endday');
 $date_endyear = GETPOST('date_endyear');
+$in_bookkeeping = GETPOST('in_bookkeeping');
 
 $now = dol_now();
 
@@ -108,6 +109,8 @@ if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 }
 if ($date_start && $date_end)
 	$sql .= " AND f.datef >= '" . $db->idate($date_start) . "' AND f.datef <= '" . $db->idate($date_end) . "'";
+if ($in_bookkeeping == 'yes')    
+	$sql .= " AND (f.rowid NOT IN (SELECT fk_doc FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab  WHERE ab.doc_type='supplier_invoice') )";
 $sql .= " ORDER BY f.datef";
 
 dol_syslog('accountancy/journal/purchasesjournal.php:: $sql=' . $sql);
@@ -385,69 +388,15 @@ if ($action == 'writebookkeeping') {
 $form = new Form($db);
 
 $companystatic = new Fournisseur($db);
+$invoicestatic = new FactureFournisseur($db);
 
 // Export
-/*if ($action == 'export_csv') {
+if ($action == 'export_csv') {
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
 	$journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
 
 	include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';
 
-	// Model Cegid Expert Export
-	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 2) {
-		$sep = ";";
-
-		foreach ( $tabfac as $key => $val ) {
-			$date = dol_print_date($val["date"], '%d%m%Y');
-
-			// Product / Service
-			foreach ( $tabht[$key] as $k => $mt ) {
-				$companystatic->id = $tabcompany[$key]['id'];
-				$companystatic->name = $tabcompany[$key]['name'];
-				$companystatic->client = $tabcompany[$key]['code_client'];
-
-				if ($mt) {
-					print $date . $sep;
-					print $purchase_journal . $sep;
-					print length_accountg(html_entity_decode($k)) . $sep;
-					print $sep;
-					print ($mt < 0 ? 'C' : 'D') . $sep;
-					print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
-					print dol_trunc($val["description"], 32) . $sep;
-					print $val["ref"];
-					print "\n";
-				}
-			}
-
-			// VAT
-			foreach ( $tabtva[$key] as $k => $mt ) {
-				if ($mt) {
-					print $date . $sep;
-					print $purchase_journal . $sep;
-					print length_accountg(html_entity_decode($k)) . $sep;
-					print $sep;
-					print ($mt < 0 ? 'C' : 'D') . $sep;
-					print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
-					print $langs->trans("VAT") . $sep;
-					print $val["ref"];
-					print "\n";
-				}
-			}
-
-			foreach ( $tabttc[$key] as $k => $mt ) {
-				print $date . $sep;
-				print $purchase_journal . $sep;
-				print length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) . $sep;
-				print length_accounta(html_entity_decode($k)) . $sep;
-				print ($mt < 0 ? 'D' : 'C') . $sep;
-				print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
-				print $companystatic->name . $sep;
-				print $val["ref"];
-				print "\n";
-			}
-		}
-	} elseif ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 1) {
-		// Model Classic Export
 		foreach ( $tabfac as $key => $val ) {
 
 			$invoicestatic->id = $key;
@@ -468,44 +417,60 @@ $companystatic = new Fournisseur($db);
 				$accountingaccount = new AccountingAccount($db);
 				$accountingaccount->fetch(null, $k, true);
 				if ($mt) {
+					print '"' . $key . '"' . $sep;
 					print '"' . $date . '"' . $sep;
-					print '"' . $val["ref"] . '"' . $sep;
+					print '"' . $val["refsuppliersologest"] . '"' . $sep;
+					print '"' . utf8_decode ( dol_trunc($companystatic->name, 32) ) . '"' . $sep;
 					print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
-					print '"' . dol_trunc($companystatic->name, 16) . ' - ' . $val["refsuppliersologest"] . ' - ' . dol_trunc($accountingaccount->label, 32) . '"' . $sep;
-					// print '"' . dol_trunc($accountingaccount->label, 32) . '"' . $sep;
+					print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
+					print "  " . $sep;
+					print '"' . utf8_decode ( dol_trunc($accountingaccount->label, 32) ) . '"' . $sep;
+					print '"' . utf8_decode ( dol_trunc($companystatic->name, 16) ) . ' - ' . $val["refsuppliersologest"] . ' - ' . dol_trunc($accountingaccount->label, 32) . '"' . $sep;
 					print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
-					print '"' . ($mt < 0 ? price(- $mt) : '') . '"';
+					print '"' . ($mt < 0 ? price(- $mt) : '') . '"'. $sep;
+					print '"' . $journal_label . '"' ;
 					print "\n";
 				}
 			}
 			// VAT
 			foreach ( $tabtva[$key] as $k => $mt ) {
 				if ($mt) {
+					print '"' . $key . '"' . $sep;
 					print '"' . $date . '"' . $sep;
-					print '"' . $val["ref"] . '"' . $sep;
+					print '"' . $val["refsuppliersologest"] . '"' . $sep;
+					print '"' . utf8_decode ( dol_trunc($companystatic->name, 32) ) . '"' . $sep;
 					print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
-					// print '"' . $langs->trans("VAT") . '"' . $sep;
-					print '"' . dol_trunc($companystatic->name, 16) . ' - ' . $val["refsuppliersologest"] . ' - ' . $langs->trans("VAT") . '"' . $sep;
+					print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
+					print "  " . $sep;
+					print '"' . $langs->trans("VAT") . '"' . $sep;
+					print '"' . utf8_decode ( dol_trunc($companystatic->name, 16) ) . ' - ' . $val["refsuppliersologest"] . ' - ' . $langs->trans("VAT") . '"' . $sep;
 					print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
-					print '"' . ($mt < 0 ? price(- $mt) : '') . '"';
+					print '"' . ($mt < 0 ? price(- $mt) : '') . '"'. $sep;
+					print '"' . $journal_label . '"' ;
 					print "\n";
 				}
 			}
 
 			// Third party
 			foreach ( $tabttc[$key] as $k => $mt ) {
+				print '"' . $key . '"' . $sep;
 				print '"' . $date . '"' . $sep;
-				print '"' . $val["ref"] . '"' . $sep;
+				print '"' . $val["refsuppliersologest"] . '"' . $sep;
+				print '"' . utf8_decode ( dol_trunc($companystatic->name, 32) ). '"' . $sep;
 				print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
-				print '"' . dol_trunc($companystatic->name, 16) . ' - ' . $val["refsuppliersologest"] . ' - ' . $langs->trans("subledger_account") . '"' . $sep;
+				print '"' . $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER . '"' . $sep;
+				print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
+				print '"' . $langs->trans("Code_tiers") . '"' . $sep;
+				print '"' . utf8_decode ( dol_trunc($companystatic->name, 16) ) . ' - ' . $val["refsuppliersologest"] . ' - ' . $langs->trans("Code_tiers") . '"' . $sep;
 				print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
-				print '"' . ($mt >= 0 ? price($mt) : '') . '"';
+				print '"' . ($mt >= 0 ? price($mt) : '') . '"'. $sep;
+				print '"' . $journal_label . '"' ;
+				print "\n";
 			}
-			print "\n";
+			
 		}
 	}
-}
-*/
+
 
 if (empty($action) || $action == 'view') {
 
@@ -548,6 +513,7 @@ if (empty($action) || $action == 'view') {
 	else {
 	    print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
 	}
+	print '<input type="button" class="butAction" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
 	print '</div>';
 
 	print '

From 2f4749a7a27728e093f1cb7de92751fb264884ab Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Jun 2017 12:02:22 +0200
Subject: [PATCH 388/438] Revert "Add php unit"

This reverts commit cb93770d6b6babace7c93fa8f3b6dc7be9a84155.
---
 test/phpunit/CompanyLibTest.php | 144 ++++++++++++++++++++++++++++++++
 1 file changed, 144 insertions(+)
 create mode 100644 test/phpunit/CompanyLibTest.php

diff --git a/test/phpunit/CompanyLibTest.php b/test/phpunit/CompanyLibTest.php
new file mode 100644
index 00000000000..1d61d5925e3
--- /dev/null
+++ b/test/phpunit/CompanyLibTest.php
@@ -0,0 +1,144 @@
+<?php
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ *      \file       test/phpunit/CompanyLibTest.php
+ *      \ingroup    test
+ *      \brief      PHPUnit test
+ *      \remarks    To run this script as CLI:  phpunit filename.php
+ */
+
+global $conf,$user,$langs,$db;
+//define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
+//require_once 'PHPUnit/Autoload.php';
+require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
+require_once dirname(__FILE__).'/../../htdocs/core/lib/company.lib.php';
+
+if (empty($user->id)) {
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
+}
+$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+
+
+/**
+ * Class for PHPUnit tests
+ *
+ * @backupGlobals disabled
+ * @backupStaticAttributes enabled
+ * @remarks backupGlobals must be disabled to have db,conf,user and lang not erased.
+ */
+class CompanyLibTest extends PHPUnit_Framework_TestCase
+{
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
+
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return AdminLibTest
+     */
+    function __construct()
+    {
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
+
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
+    }
+
+    // Static methods
+    public static function setUpBeforeClass()
+    {
+        global $conf,$user,$langs,$db;
+        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+
+        print __METHOD__."\n";
+    }
+
+    // tear down after class
+    public static function tearDownAfterClass()
+    {
+        global $conf,$user,$langs,$db;
+        $db->rollback();
+
+        print __METHOD__."\n";
+    }
+
+    /**
+     * Init phpunit tests
+     *
+     * @return  void
+     */
+    protected function setUp()
+    {
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        print __METHOD__."\n";
+    }
+    /**
+     * End phpunit tests
+     *
+     * @return	void
+     */
+    protected function tearDown()
+    {
+        print __METHOD__."\n";
+    }
+
+    /**
+     * testNameCurrency
+     *
+     * @return	void
+     */
+    public function testNameCurrency()
+    {
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $result=currency_name('USD');
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('United States Dollar',$result);
+
+        $outputlangs=new Translate('', $conf);
+        $outputlangs->setDefaultLang('fr_FR');
+        $outputlangs->load("dict");
+
+        $result=currency_name('USD', 1, $outputlangs);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('USD - Dollars US',$result);
+
+        return $result;
+    }
+}

From 8146049b4d847352e438ac8d4c10f0c4f649e0a4 Mon Sep 17 00:00:00 2001
From: Darkjeff <jeff@jeffinfo.com>
Date: Tue, 27 Jun 2017 12:12:25 +0200
Subject: [PATCH 389/438] update bank journal

add in bookkeeping
add export control
correct some bug with salary
---
 htdocs/accountancy/journal/bankjournal.php | 131 +++++++--------------
 1 file changed, 42 insertions(+), 89 deletions(-)

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index bc27ebfa24f..bf4c5a45f02 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -72,10 +72,10 @@ $date_startyear = GETPOST('date_startyear');
 $date_endmonth = GETPOST('date_endmonth');
 $date_endday = GETPOST('date_endday');
 $date_endyear = GETPOST('date_endyear');
-$action = GETPOST('action','aZ09');
+$in_bookkeeping = GETPOST('in_bookkeeping');
 
 $now = dol_now();
-$action = GETPOST('action','aZ09');
+$action = GETPOST('action','alpha');
 
 // Security check
 if ($user->societe_id > 0 && empty($id_journal))
@@ -121,6 +121,8 @@ $sql .= " WHERE ba.fk_accountancy_journal=" . $id_journal;
 $sql .= ' AND ba.entity IN ('.getEntity('bank_account', 0).')';		// We don't share object for accountancy
 if ($date_start && $date_end)
 	$sql .= " AND b.dateo >= '" . $db->idate($date_start) . "' AND b.dateo <= '" . $db->idate($date_end) . "'";
+if ($in_bookkeeping == 'yes')    
+	$sql .= " AND (b.rowid NOT IN (SELECT fk_doc FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab  WHERE ab.doc_type='bank') )";	
 $sql .= " ORDER BY b.datev";
 
 $object = new Account($db);
@@ -366,6 +368,7 @@ if (! $error && $action == 'writebookkeeping') {
 					$bookkeeping->fk_docdet = $val["fk_bank"];
 					$bookkeeping->numero_compte = $k;
 					$bookkeeping->label_operation = $val["label"];
+					$bookkeeping->label_compte = $langs->trans("Bank");
 					$bookkeeping->montant = ($mt < 0 ? - $mt : $mt);
 					$bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
 					$bookkeeping->debit = ($mt >= 0 ? $mt : 0);
@@ -473,6 +476,17 @@ if (! $error && $action == 'writebookkeeping') {
 					$bookkeeping->date_create = $now;
 
 					if (in_array($tabtype[$key], array('sc', 'payment_sc'))) {   // If payment is payment of social contribution
+						$sqlmid = 'SELECT ch.libelle, t.libelle as labelc';
+						$sqlmid .= " FROM " . MAIN_DB_PREFIX . "chargesociales ch ";
+						$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementcharge as paych ON  paych.fk_charge=ch.rowid";
+						$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "c_chargesociales as t ON  ch.fk_type=t.id";
+						$sqlmid .= " WHERE paych.fk_bank=" . $key;
+						dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+						$resultmid = $db->query($sqlmid);
+						if ($resultmid) {
+    					$objmid = $db->fetch_object($resultmid);
+    					$bookkeeping->label_compte = $objmid->labelc;
+    					$bookkeeping->doc_ref = $objmid->libelle ;
 						$bookkeeping->subledger_account = '';
 						$bookkeeping->numero_compte = $k;
 					} else if ($tabtype[$key] == 'payment') {	// If payment is payment of customer invoice, we get ref of invoice
@@ -597,7 +611,6 @@ if (! $error && $action == 'writebookkeeping') {
 }
 
 // Export
-/*
 if ($action == 'export_csv') {
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
 
@@ -606,14 +619,10 @@ if ($action == 'export_csv') {
 	$companystatic = new Client($db);
 	$userstatic = new User($db);
 
-	// Model Cegid Expert Export
-	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 2)
-	{
-		$sep = ";";
-
+// Bank
 		foreach ( $tabpay as $key => $val ) {
-			$date = dol_print_date($db->jdate($val["date"]), '%d%m%Y');
-
+			$date = dol_print_date($db->jdate($val["date"]), 'day');
+			
 			$reflabel = $val["ref"];
 			if ($reflabel == '(SupplierInvoicePayment)') {
 				$reflabel = $langs->trans('Supplier');
@@ -637,88 +646,16 @@ if ($action == 'export_csv') {
 			$companystatic->id = $tabcompany[$key]['id'];
 			$companystatic->name = $tabcompany[$key]['name'];
 
-			$userstatic->id = $tabuser[$key]['id'];
-			$userstatic->lastname = $tabuser[$key]['lastname'];
-			$userstatic->firstname = $tabuser[$key]['firstname'];
-
-			// Bank
-			foreach ( $tabbq[$key] as $k => $mt ) {
-				print $date . $sep;
-				print $journal . $sep;
-				print length_accountg(html_entity_decode($k)) . $sep;
-				print $sep;
-				print ($mt < 0 ? 'C' : 'D') . $sep;
-				print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
-				if ($companystatic->name == '') {
-					print $langs->trans('Bank')." - ". utf8_decode($val["ref"]) . $sep;
-				} else {
-					print $langs->trans("Bank") .' - '.utf8_decode($companystatic->name) . $sep;
-				}
-				print utf8_decode($reflabel) . $sep;
-				print "\n";
-			}
-
-			// Third party
-			if (is_array($tabtp[$key])) {
-				foreach ( $tabtp[$key] as $k => $mt ) {
-					if ($mt) {
-						print $date . $sep;
-						print $journal . $sep;
-						if ($tabtype[$key] == 'payment') {
-							print length_accountg($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) . $sep;
-							print length_accounta(html_entity_decode($k)) . $sep;
-						} else if ($tabtype[$key] == 'payment_supplier') {
-							print length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) . $sep;
-							print length_accounta(html_entity_decode($k)) . $sep;
-						} else {
-							print length_accountg(html_entity_decode($k)) . $sep;
-							print $sep;
-						}
-						print ($mt < 0 ? 'D' : 'C') . $sep;
-						print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
-						if ($companystatic->name == '') {
-							print $langs->trans('ThirdParty')." - ". utf8_decode($val["ref"]) . $sep;
-						} else {
-							print $langs->trans('ThirdParty')." - ". utf8_decode($companystatic->name) . $sep;
-						}
-						print utf8_decode($reflabel) . $sep;
-						print "\n";
-					}
-				}
-			} else {
-				foreach ( $tabbq[$key] as $k => $mt ) {
-					print $date . $sep;
-					print $journal . $sep;
-					print length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) . $sep;
-					print $sep;
-					print ($mt < 0 ? 'D' : 'C') . $sep;
-					print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
-					if ($companystatic->name == '') {
-						print $langs->trans('ThirdParty')." - ". utf8_decode($val["ref"]) . $sep;
-					} else {
-						print $langs->trans('ThirdParty')." - ". utf8_decode($companystatic->name) . $sep;
-					}
-					print utf8_decode($reflabel) . $sep;
-					print "\n";
-				}
-			}
-		}
-	} else {
-		// Model Classic Export
-		foreach ( $tabpay as $key => $val ) {
-			$date = dol_print_date($db->jdate($val["date"]), 'day');
-
-			$companystatic->id = $tabcompany[$key]['id'];
-			$companystatic->name = $tabcompany[$key]['name'];
-
 			// Bank
 			foreach ( $tabbq[$key] as $k => $mt ) {
 				print '"' . $journal . '"' . $sep;
 				print '"' . $date . '"' . $sep;
 				print '"' . $val["type_payment"] . '"' . $sep;
 				print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
+				print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
+				print "  " . $sep;
 				if ($companystatic->name == '') {
-					print '"' . $langs->trans('Bank') . " - " . utf8_decode($val["ref"]) . '"' . $sep;
+					print '"' . $langs->trans('Bank') . " - " . utf8_decode($reflabel) . '"' . $sep;
 				} else {
 					print '"' . $langs->trans("Bank") . ' - ' . utf8_decode($companystatic->name) . '"' . $sep;
 				}
@@ -734,9 +671,21 @@ if ($action == 'export_csv') {
 						print '"' . $journal . '"' . $sep;
 						print '"' . $date . '"' . $sep;
 						print '"' . $val["type_payment"] . '"' . $sep;
+						print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
+						
+						if ($tabtype[$key] == 'payment_supplier') {
+						print '"' . $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER . '"' . $sep;
+						} else if($tabtype[$key] == 'payment') {
+						print '"' . $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER . '"' . $sep;
+						} else {
+						print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
+						}
+						
+						
+						
 						print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
 						if ($companystatic->name == '') {
-							print '"' . $langs->trans('ThirdParty') . " - " . utf8_decode($val["ref"]) . '"' . $sep;
+							print '"' . $langs->trans('ThirdParty') . " - " . utf8_decode($reflabel) . '"' . $sep;
 						} else {
 							print '"' . $langs->trans('ThirdParty') . " - " . utf8_decode($companystatic->name) . '"' . $sep;
 						}
@@ -751,8 +700,10 @@ if ($action == 'export_csv') {
 					print '"' . $date . '"' . $sep;
 					print '"' . $val["ref"] . '"' . $sep;
 					print '"' . length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) . '"' . $sep;
+					print '"' . length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) . '"' . $sep;
+					print "  " . $sep;
 					if ($companystatic->name == '') {
-						print '"' . $langs->trans("Bank") . ' - ' . utf8_decode($val["ref"]) . '"' . $sep;
+						print '"' . $langs->trans("Bank") . ' - ' . utf8_decode($reflabel) . '"' . $sep;
 					} else {
 						print '"' . $langs->trans("Bank") . ' - ' . utf8_decode($companystatic->name) . '"' . $sep;
 					}
@@ -763,8 +714,6 @@ if ($action == 'export_csv') {
 			}
 		}
 	}
-}
-*/
 
 
 /*
@@ -802,6 +751,7 @@ if (empty($action) || $action == 'view') {
 
 	print '<div class="tabsAction tabsActionNoBottom">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
+	print '<input type="button" class="butAction" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
 	print '</div>';
 
 	// TODO Avoid using js. We can use a direct link with $param
@@ -863,6 +813,9 @@ if (empty($action) || $action == 'view') {
 		if ($reflabel == '(ExpenseReportPayment)') {
 			$reflabel = $langs->trans('Employee');
 		}
+		if ($reflabel == '(payment_salary)') {
+			$reflabel = $langs->trans('Employee');
+		}
 
 		$ref=$reflabel;
 		if ($tabtype[$key] == 'payment')

From 32ff09123db1559297aa804b8ca9fa08912cb855 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Jun 2017 12:19:48 +0200
Subject: [PATCH 390/438] Add more info on phpunit

---
 test/phpunit/CompanyLibTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/phpunit/CompanyLibTest.php b/test/phpunit/CompanyLibTest.php
index 1d61d5925e3..f4aebc11026 100644
--- a/test/phpunit/CompanyLibTest.php
+++ b/test/phpunit/CompanyLibTest.php
@@ -129,7 +129,7 @@ class CompanyLibTest extends PHPUnit_Framework_TestCase
 
         $result=currency_name('USD');
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals('United States Dollar',$result);
+        $this->assertEquals('United States Dollar',$result,'Test to get currency name USD in default language '.$langs->defaultlang);
 
         $outputlangs=new Translate('', $conf);
         $outputlangs->setDefaultLang('fr_FR');
@@ -137,7 +137,7 @@ class CompanyLibTest extends PHPUnit_Framework_TestCase
 
         $result=currency_name('USD', 1, $outputlangs);
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals('USD - Dollars US',$result);
+        $this->assertEquals('USD - Dollars US',$result,'Test to get currency name USD in default language '.$outputlangs->getDefaultLang());
 
         return $result;
     }

From 1fafa4017d38437178ac13f4a5c27c26a7f46dc5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Jun 2017 12:33:29 +0200
Subject: [PATCH 391/438] Fix test on currency name

---
 htdocs/core/lib/company.lib.php | 2 ++
 test/phpunit/CompanyLibTest.php | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index d1e0b9020b7..c0e5e896872 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -434,6 +434,8 @@ function currency_name($code_iso, $withcode='', $outputlangs=null)
 
     if (empty($outputlangs)) $outputlangs=$langs;
 
+    $outputlangs->load("dict");
+
     // If there is a translation, we can send immediatly the label
     if ($outputlangs->trans("Currency".$code_iso)!="Currency".$code_iso)
     {
diff --git a/test/phpunit/CompanyLibTest.php b/test/phpunit/CompanyLibTest.php
index f4aebc11026..330eb914308 100644
--- a/test/phpunit/CompanyLibTest.php
+++ b/test/phpunit/CompanyLibTest.php
@@ -129,11 +129,10 @@ class CompanyLibTest extends PHPUnit_Framework_TestCase
 
         $result=currency_name('USD');
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals('United States Dollar',$result,'Test to get currency name USD in default language '.$langs->defaultlang);
+        $this->assertEquals('US Dollars',$result,'Test to get currency name USD in default language '.$langs->defaultlang);
 
         $outputlangs=new Translate('', $conf);
         $outputlangs->setDefaultLang('fr_FR');
-        $outputlangs->load("dict");
 
         $result=currency_name('USD', 1, $outputlangs);
         print __METHOD__." result=".$result."\n";

From 77ba5a8c24b3f1ef54b16d497198a6df708165cb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Jun 2017 13:57:41 +0200
Subject: [PATCH 392/438] Fix reception of product interface

---
 htdocs/fourn/commande/dispatch.php            | 85 ++++++++++++-------
 htdocs/fourn/commande/document.php            | 16 ++--
 htdocs/fourn/commande/info.php                |  4 +-
 htdocs/fourn/commande/note.php                | 20 ++---
 htdocs/fourn/js/lib_dispatch.js               | 21 +++--
 .../product/admin/product_lot_extrafields.php |  2 +-
 6 files changed, 92 insertions(+), 56 deletions(-)

diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index e89555a5d50..c0465a61658 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -150,10 +150,10 @@ if ($action == 'dispatch' && $user->rights->fournisseur->commande->receptionner)
 	$db->begin();
 
 	$pos = 0;
-	foreach ($_POST as $key => $value) 
+	foreach ($_POST as $key => $value)
 	{
 		// without batch module enabled
-		if (preg_match('/^product_([0-9]+)_([0-9]+)$/i', $key, $reg)) 
+		if (preg_match('/^product_([0-9]+)_([0-9]+)$/i', $key, $reg))
 		{
 			$pos ++;
 
@@ -184,7 +184,7 @@ if ($action == 'dispatch' && $user->rights->fournisseur->commande->receptionner)
 			}
 		}
 		// with batch module enabled
-		if (preg_match('/^product_batch_([0-9]+)_([0-9]+)$/i', $key, $reg)) 
+		if (preg_match('/^product_batch_([0-9]+)_([0-9]+)$/i', $key, $reg))
 		{
 			$pos ++;
 
@@ -260,6 +260,7 @@ if ($action == 'dispatch' && $user->rights->fournisseur->commande->receptionner)
 	}
 }
 
+
 /*
  * View
  */
@@ -284,13 +285,13 @@ if ($id > 0 || ! empty($ref)) {
 	$head = ordersupplier_prepare_head($object);
 
 	$title = $langs->trans("SupplierOrder");
-	dol_fiche_head($head, 'dispatch', $title, 0, 'order');
+	dol_fiche_head($head, 'dispatch', $title, -1, 'order');
+
 
-	
 	// Supplier order card
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/fourn/commande/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
-	
+
 	$morehtmlref='<div class="refidno">';
 	// Ref supplier
 	$morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
@@ -331,14 +332,14 @@ if ($id > 0 || ! empty($ref)) {
 	    }
 	}
 	$morehtmlref.='</div>';
-	
-	
-	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);	
-	
+
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
 
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
-	
+
 	print '<table class="border" width="100%">';
 
 	// Date
@@ -362,7 +363,7 @@ if ($id > 0 || ! empty($ref)) {
 	print "</table>";
 
 	print '</div>';
-	
+
 	// if ($mesg) print $mesg;
 	print '<br>';
 
@@ -382,7 +383,7 @@ if ($id > 0 || ! empty($ref)) {
 		print '<form method="POST" action="dispatch.php?id=' . $object->id . '">';
 		print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 		print '<input type="hidden" name="action" value="dispatch">';
-		
+
 		print '<div class="div-table-responsive">';
 		print '<table class="noborder" width="100%">';
 
@@ -434,6 +435,7 @@ if ($id > 0 || ! empty($ref)) {
 				print '<td align="right">' . $langs->trans("QtyOrdered") . '</td>';
 				print '<td align="right">' . $langs->trans("QtyDispatchedShort") . '</td>';
 				print '<td align="right">' . $langs->trans("QtyToDispatchShort") . '</td>';
+				print '<td width="32"></td>';
 				print '<td align="right">' . $langs->trans("Warehouse") . '</td>';
 				print "</tr>\n";
 
@@ -443,7 +445,7 @@ if ($id > 0 || ! empty($ref)) {
 					print '<td>' . $langs->trans("batch_number") . '</td>';
 					print '<td>' . $langs->trans("EatByDate") . '</td>';
 					print '<td>' . $langs->trans("SellByDate") . '</td>';
-					print '<td colspan="4">&nbsp;</td>';
+					print '<td colspan="5">&nbsp;</td>';
 					print "</tr>\n";
 				}
 			}
@@ -456,7 +458,7 @@ if ($id > 0 || ! empty($ref)) {
 			while ( $i < $num ) {
 				$objp = $db->fetch_object($resql);
 
-				// On n'affiche pas les produits personnalises
+				// On n'affiche pas les produits libres
 				if (! $objp->fk_product > 0) {
 					$nbfreeproduct++;
 				} else {
@@ -511,7 +513,11 @@ if ($id > 0 || ! empty($ref)) {
 
 						if (! empty($conf->productbatch->enabled) && $objp->tobatch == 1) {
 							$type = 'batch';
-							print '<td align="right">' . img_picto($langs->trans('AddDispatchBatchLine'), 'split.png', 'onClick="addDispatchLine(' . $i . ',\'' . $type . '\')"') . '</td>'; // Dispatch column
+							print '<td align="right">';
+							print '</td>';     // Qty to dispatch
+							print '<td>';
+							//print img_picto($langs->trans('AddDispatchBatchLine'), 'split.png', 'onClick="addDispatchLine(' . $i . ',\'' . $type . '\')"');
+							print '</td>';     // Dispatch column
 							print '<td></td>'; // Warehouse column
 							print '</tr>';
 
@@ -519,7 +525,7 @@ if ($id > 0 || ! empty($ref)) {
 							print '<td>';
 							print '<input name="fk_commandefourndet' . $suffix . '" type="hidden" value="' . $objp->rowid . '">';
 							print '<input name="product_batch' . $suffix . '" type="hidden" value="' . $objp->fk_product . '">';
-							
+
 							print '<!-- This is a up (may include discount or not depending on STOCK_EXCLUDE_DISCOUNT_FOR_PMP. will be used for PMP calculation) -->';
 							if (! empty($conf->global->SUPPLIER_ORDER_EDIT_BUYINGPRICE_DURING_RECEIPT)) // Not tested !
 							{
@@ -536,7 +542,7 @@ if ($id > 0 || ! empty($ref)) {
 							print '</td>';
 
 							print '<td>';
-							print '<input type="text" id="lot_number' . $suffix . '" name="lot_number' . $suffix . '" size="40" value="' . GETPOST('lot_number' . $suffix) . '">';
+							print '<input type="text" class="inputlotnumber" id="lot_number' . $suffix . '" name="lot_number' . $suffix . '" size="40" value="' . GETPOST('lot_number' . $suffix) . '">';
 							print '</td>';
 							print '<td>';
 							$dlcdatesuffix = dol_mktime(0, 0, 0, GETPOST('dlc' . $suffix . 'month'), GETPOST('dlc' . $suffix . 'day'), GETPOST('dlc' . $suffix . 'year'));
@@ -549,15 +555,19 @@ if ($id > 0 || ! empty($ref)) {
 							print '<td colspan="2">&nbsp</td>'; // Qty ordered + qty already dispatached
 						} else {
 							$type = 'dispatch';
-							print '<td align="right">' . img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'onClick="addDispatchLine(' . $i . ',\'' . $type . '\')"') . '</td>'; // Dispatch column
-							print '<td></td>';
+							print '<td align="right">';
+							print '</td>';     // Qty to dispatch
+							print '<td>';
+							//print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'onClick="addDispatchLine(' . $i . ',\'' . $type . '\')"');
+							print '</td>';      // Dispatch column
+							print '<td></td>'; // Warehouse column
 							print '</tr>';
 
 							print '<tr class="oddeven" name="' . $type . $suffix . '">';
 							print '<td colspan="6">';
 							print '<input name="fk_commandefourndet' . $suffix . '" type="hidden" value="' . $objp->rowid . '">';
 							print '<input name="product' . $suffix . '" type="hidden" value="' . $objp->fk_product . '">';
-							
+
 							print '<!-- This is a up (may include discount or not depending on STOCK_EXCLUDE_DISCOUNT_FOR_PMP. will be used for PMP calculation) -->';
 							if (! empty($conf->global->SUPPLIER_ORDER_EDIT_BUYINGPRICE_DURING_RECEIPT)) // Not tested !
 							{
@@ -567,23 +577,38 @@ if ($id > 0 || ! empty($ref)) {
 							{
 							    print '<input class="maxwidth75" name="pu' . $suffix . '" type="hidden" value="' . price2num($up_ht_disc, 'MU') . '">';
 							}
-							
+
 							// hidden fields for js function
 							print '<input id="qty_ordered' . $suffix . '" type="hidden" value="' . $objp->qty . '">';
 							print '<input id="qty_dispatched' . $suffix . '" type="hidden" value="' . ( float ) $products_dispatched[$objp->rowid] . '">';
 							print '</td>';
 						}
-						// Dispatch
+
+						// Qty to dispatch
 						print '<td align="right">';
 						print '<input id="qty' . $suffix . '" name="qty' . $suffix . '" type="text" size="8" value="' . (GETPOST('qty' . $suffix) != '' ? GETPOST('qty' . $suffix) : $remaintodispatch) . '">';
+                        print '</td>';
+
+                        print '<td>';
+						if (! empty($conf->productbatch->enabled) && $objp->tobatch == 1) {
+						    $type = 'batch';
+						    //print img_picto($langs->trans('AddDispatchBatchLine'), 'split.png', 'class="splitbutton" onClick="addDispatchLine(' . $i . ',\'' . $type . '\')"');
+						    print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" onClick="addDispatchLine(' . $i . ',\'' . $type . '\')"');
+						}
+						else
+						{
+						    $type = 'dispatch';
+						    print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" onClick="addDispatchLine(' . $i . ',\'' . $type . '\')"');
+						}
+
 						print '</td>';
 
 						// Warehouse
 						print '<td align="right">';
 						if (count($listwarehouses) > 1) {
-							print $formproduct->selectWarehouses(GETPOST("entrepot" . $suffix), "entrepot" . $suffix, '', 1, 0, $objp->fk_product);
+							print $formproduct->selectWarehouses(GETPOST("entrepot" . $suffix), "entrepot" . $suffix, '', 1, 0, $objp->fk_product, '', 1);
 						} elseif (count($listwarehouses) == 1) {
-							print $formproduct->selectWarehouses(GETPOST("entrepot" . $suffix), "entrepot" . $suffix, '', 0, 0, $objp->fk_product);
+							print $formproduct->selectWarehouses(GETPOST("entrepot" . $suffix), "entrepot" . $suffix, '', 0, 0, $objp->fk_product, '', 1);
 						} else {
 							$langs->load("errors");
 							print $langs->trans("ErrorNoWarehouseDefined");
@@ -604,10 +629,10 @@ if ($id > 0 || ! empty($ref)) {
 		print '</div>';
 		print "<br>\n";
 
-		if ($nbproduct) 
+		if ($nbproduct)
 		{
             $checkboxlabel=$langs->trans("CloseReceivedSupplierOrdersAutomatically", $langs->transnoentitiesnoconv($object->statuts[5]));
-            
+
 			print '<br><div class="center">';
             print $langs->trans("Comment") . ' : ';
 			print '<input type="text" class="minwidth400" maxlength="128" name="comment" value="';
@@ -616,7 +641,7 @@ if ($id > 0 || ! empty($ref)) {
 			print '" class="flat"><br>';
 
 			print '<input type="checkbox" checked="checked" name="closeopenorder"> '.$checkboxlabel;
-			
+
 			print '<br><input type="submit" class="button" value="' . $langs->trans("DispatchVerb") . '"';
 			if (count($listwarehouses) <= 0)
 				print ' disabled';
@@ -628,7 +653,7 @@ if ($id > 0 || ! empty($ref)) {
 		if (! $nbproduct) {
 			if (empty($conf->global->SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED))
 				print '<div class="opacitymedium">'.$langs->trans("NoPredefinedProductToDispatch").'</div>';		// No predefined line at all
-			else 
+			else
 				print '<div class="opacitymedium">'.$langs->trans("NoMorePredefinedProductToDispatch").'</div>';	// No predefined line that remain to be dispatched.
 		}
 
@@ -637,7 +662,7 @@ if ($id > 0 || ! empty($ref)) {
 
 	dol_fiche_end();
 
-	
+
 	// List of lines already dispatched
 	$sql = "SELECT p.ref, p.label,";
 	$sql .= " e.rowid as warehouse_id, e.label as entrepot,";
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index 68976e9b7c7..700ce7a770a 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -100,7 +100,7 @@ if ($object->id > 0)
 
 	$head = ordersupplier_prepare_head($object);
 
-	dol_fiche_head($head, 'documents', $langs->trans('SupplierOrder'), 0, 'order');
+	dol_fiche_head($head, 'documents', $langs->trans('SupplierOrder'), -1, 'order');
 
 
 	// Construit liste des fichiers
@@ -114,7 +114,7 @@ if ($object->id > 0)
 	// Supplier order card
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/fourn/commande/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
-	
+
 	$morehtmlref='<div class="refidno">';
 	// Ref supplier
 	$morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
@@ -155,13 +155,13 @@ if ($object->id > 0)
 	    }
 	}
 	$morehtmlref.='</div>';
-			
-	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);	
 
-	
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
-	
+
 	print '<table class="border" width="100%">';
 	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
 	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
@@ -170,8 +170,8 @@ if ($object->id > 0)
 	print "</div>\n";
 
 	dol_fiche_end();
-	
-	
+
+
 	$modulepart = 'commande_fournisseur';
 	$permission = $user->rights->fournisseur->commande->creer;
 	$permtoedit = $user->rights->fournisseur->commande->creer;
diff --git a/htdocs/fourn/commande/info.php b/htdocs/fourn/commande/info.php
index 50b310a55e5..bbc688264b8 100644
--- a/htdocs/fourn/commande/info.php
+++ b/htdocs/fourn/commande/info.php
@@ -100,7 +100,7 @@ $now=dol_now();
 $head = ordersupplier_prepare_head($object);
 
 
-dol_fiche_head($head, 'info', $langs->trans("SupplierOrder"), 0, 'order');
+dol_fiche_head($head, 'info', $langs->trans("SupplierOrder"), -1, 'order');
 
 
 // Supplier order card
@@ -197,7 +197,7 @@ if (!empty($object->id))
     $param='&id='.$object->id;
     if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
     if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-    
+
     print load_fiche_titre($langs->trans("ActionsOnOrder"),'','');
 
     // List of actions on element
diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php
index a3334baa5d9..45e4bd80e3a 100644
--- a/htdocs/fourn/commande/note.php
+++ b/htdocs/fourn/commande/note.php
@@ -75,19 +75,19 @@ if ($id > 0 || ! empty($ref))
     if ($result >= 0)
     {
         $object->fetch_thirdparty();
-        
+
         $author = new User($db);
         $author->fetch($object->user_author_id);
 
         $head = ordersupplier_prepare_head($object);
 
         $title=$langs->trans("SupplierOrder");
-        dol_fiche_head($head, 'note', $title, 0, 'order');
+        dol_fiche_head($head, 'note', $title, -1, 'order');
 
 		// Supplier order card
-	
+
 		$linkback = '<a href="'.DOL_URL_ROOT.'/fourn/commande/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
-		
+
 		$morehtmlref='<div class="refidno">';
 		// Ref supplier
 		$morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
@@ -128,19 +128,19 @@ if ($id > 0 || ! empty($ref))
 		    }
 		}
 		$morehtmlref.='</div>';
-				
-		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);	
 
-		
+		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+
 		print '<div class="fichecenter">';
 		print '<div class="underbanner clearboth"></div>';
-		
-		
+
+
 		$cssclass="titlefield";
         include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
         print '</div>';
-        
+
         dol_fiche_end();
     }
     else
diff --git a/htdocs/fourn/js/lib_dispatch.js b/htdocs/fourn/js/lib_dispatch.js
index c58a4e1fe9d..84f74c30c54 100644
--- a/htdocs/fourn/js/lib_dispatch.js
+++ b/htdocs/fourn/js/lib_dispatch.js
@@ -26,16 +26,20 @@
  * 
  * @param	index	int		index of produt line. 0 = first product line
  * @param	type	string	type of dispatch (batch = batch dispatch, dispatch = non batch dispatch)
+ * @param	mode	string	'qtymissing' will create new line with qty missing, 'lessone' will keep 1 in old line and the rest in new one
  */
-function addDispatchLine(index,type) 
+function addDispatchLine(index, type, mode) 
 {
+	mode = mode || 'qtymissing'
+	
+	console.log("Split line type="+type+" index="+index+" mode="+mode);
 	var $row = $("tr[name='"+type+'_0_'+index+"']").clone(true), // clone first batch line to jQuery object
 		nbrTrs = $("tr[name^='"+type+"_'][name$='_"+index+"']").length, // position of line for batch
 		qtyOrdered = parseFloat($("#qty_ordered_"+(nbrTrs - 1)+"_"+index).val()),
 		qty = parseFloat($("#qty_"+(nbrTrs - 1)+"_"+index).val()),
 		qtyDispatched;
 			
-	if (type === 'batch') 
+	if (mode === 'lessone') 
 	{
 		qtyDispatched = parseFloat($("#qty_dispatched_"+(nbrTrs - 1)+"_"+index).val()) + 1;
 	}
@@ -63,15 +67,22 @@ function addDispatchLine(index,type)
 		/*  Suffix of lines are:  _ trs.length _ index  */
 		$("#qty_"+nbrTrs+"_"+index).focus();
 		$("#qty_dispatched_"+(nbrTrs)+"_"+index).val(qtyDispatched);
-		if (type === 'batch')
+		
+		//hide all buttons then show only the last one
+		$("tr[name^='"+type+"_'][name$='_"+index+"'] .splitbutton").hide();
+		$("tr[name^='"+type+"_'][name$='_"+index+"']:last .splitbutton").show();
+		
+		if (mode === 'lessone')
 		{
 			$("#qty_"+(nbrTrs)+"_"+index).val(qty-1);
 			$("#qty_"+(nbrTrs-1)+"_"+index).val(1);
 		}
 		else
 		{
-			
 			$("#qty_"+nbrTrs+"_"+index).val(qtyOrdered - qtyDispatched);	
-		}		
+		}
+		
+		//set focus on lot of new line (if it exists)
+		$("#lot_number_"+(nbrTrs)+"_"+index).focus();
 	}
 }
\ No newline at end of file
diff --git a/htdocs/product/admin/product_lot_extrafields.php b/htdocs/product/admin/product_lot_extrafields.php
index 28b4ee7db1d..fb1cdfcb704 100644
--- a/htdocs/product/admin/product_lot_extrafields.php
+++ b/htdocs/product/admin/product_lot_extrafields.php
@@ -75,7 +75,7 @@ print load_fiche_titre($title,$linkback,'title_setup');
 
 $head = product_lot_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $textobject, 0, 'stock');
+dol_fiche_head($head, 'attributes', $textobject, -1, 'stock');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 

From 50bf1bb21fd36d1e5f81118269896e93d94f573e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Jun 2017 16:41:57 +0200
Subject: [PATCH 393/438] Fix error in count of qty in other shipments

---
 htdocs/expedition/card.php                   | 32 ++++++++++++--------
 htdocs/expedition/class/expedition.class.php |  9 ++++--
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index ec2e6f782bf..b332667f681 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -109,7 +109,6 @@ $hookmanager->initHooks(array('expeditioncard','globalcard'));
 $permissiondellink=$user->rights->expedition->livraison->creer;	// Used by the include of actions_dellink.inc.php
 
 
-
 /*
  * Actions
  */
@@ -195,8 +194,8 @@ if (empty($reshook))
 
 	    $object->note				= GETPOST('note','alpha');
 	    $object->origin				= $origin;
-	    $object->origin_id			= $origin_id;
-            $object->fk_project         = GETPOST('projectid');
+        $object->origin_id			= $origin_id;
+        $object->fk_project         = GETPOST('projectid','int');
 	    $object->weight				= GETPOST('weight','int')==''?"NULL":GETPOST('weight','int');
 	    $object->sizeH				= GETPOST('sizeH','int')==''?"NULL":GETPOST('sizeH','int');
 	    $object->sizeW				= GETPOST('sizeW','int')==''?"NULL":GETPOST('sizeW','int');
@@ -214,7 +213,7 @@ if (empty($reshook))
 
 	    $object->socid					= $objectsrc->socid;
 	    $object->ref_customer			= '';                   // We don't use $objectsrc->ref_client, this is ref or order not shipment
-	    $object->model_pdf				= GETPOST('model');
+	    $object->model_pdf				= GETPOST('model','alpha');
 	    $object->date_delivery			= $date_delivery;	    // Date delivery planed
 	    $object->fk_delivery_address	= $objectsrc->fk_delivery_address;
 	    $object->shipping_method_id		= GETPOST('shipping_method_id','int');
@@ -704,7 +703,7 @@ if ($action == 'create')
             // Project
             if (! empty($conf->projet->enabled))
             {
-                $projectid = GETPOST('projectid')?GETPOST('projectid'):0;
+                $projectid = GETPOST('projectid','int')?GETPOST('projectid','int'):0;
                 if ($origin == 'project') $projectid = ($originid ? $originid : 0);
 
                 $langs->load("projects");
@@ -890,6 +889,7 @@ if ($action == 'create')
                 if (! empty($line->date_start)) $type=1;
                 if (! empty($line->date_end)) $type=1;
 
+                print '<!-- line '.$line->rowid.' for product -->'."\n";
                 print '<tr class="oddeven">'."\n";
 
                 // Product label
@@ -979,7 +979,7 @@ if ($action == 'create')
 						print '<td align="center">';
 						if ($line->product_type == 0 || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
 						{
-                            if (GETPOST('qtyl'.$indiceAsked)) $defaultqty=GETPOST('qtyl'.$indiceAsked);
+                            if (GETPOST('qtyl'.$indiceAsked, 'int')) $defaultqty=GETPOST('qtyl'.$indiceAsked, 'int');
                             print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
 							print '<input name="qtyl'.$indiceAsked.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$deliverableQty.'">';
 						}
@@ -1107,8 +1107,8 @@ if ($action == 'create')
 					// ship from multiple locations
 					if (empty($conf->productbatch->enabled) || ! $product->hasbatch())
 					{
-					    print '<td></td><td></td></tr>';	// end line and start a new one for each warehouse
 					    print '<!-- Case warehouse not already known and product does not need lot -->';
+					    print '<td></td><td></td></tr>'."\n";	// end line and start a new one for each warehouse
 
 						print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
 						$subj=0;
@@ -1195,7 +1195,8 @@ if ($action == 'create')
 					}
 					else
 					{
-						print '<td></td><td></td></tr>';	// end line and start a new one for lot/serial
+					    print '<!-- Case warehouse not already known and product need lot -->';
+					    print '<td></td><td></td></tr>';	// end line and start a new one for lot/serial
 
 						$subj=0;
 						print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
@@ -1222,6 +1223,7 @@ if ($action == 'create')
 									//var_dump($dbatch);
 									$batchStock = + $dbatch->qty;		// To get a numeric
 									$deliverableQty = min($quantityToBeDelivered,$batchStock);
+									if ($deliverableQty < 0) $deliverableQty = 0;
 									print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested)?$bc[$var]:'').'><td colspan="3"></td><td align="center">';
 									print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="'.$deliverableQty.'">';
 									print '</td>';
@@ -1233,8 +1235,11 @@ if ($action == 'create')
 									print '<!-- Show details of lot -->';
 									print '<input name="batchl'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$dbatch->id.'">';
 									//print $langs->trans("DetailBatchFormat", $dbatch->batch, dol_print_date($dbatch->eatby,"day"), dol_print_date($dbatch->sellby,"day"), $dbatch->qty);
-									$productlotObject->fetch(0, $line->fk_product, $dbatch->batch);
-									print $langs->trans("Batch").': '.$productlotObject->getNomUrl(1);
+									//print $line->fk_product.' - '.$dbatch->batch;
+									print $langs->trans("Batch").': ';
+									$result = $productlotObject->fetch(0, $line->fk_product, $dbatch->batch);
+									if ($result > 0) print $productlotObject->getNomUrl(1);
+									else print 'TableLotIncompleteRunRepair';
 									print ' ('.$dbatch->qty.')';
 									//print $langs->trans("DetailBatchFormat", 'ee'.$dbatch->batch, dol_print_date($dbatch->eatby,"day"), dol_print_date($dbatch->sellby,"day"), $dbatch->qty);
 									$quantityToBeDelivered -= $deliverableQty;
@@ -1350,7 +1355,7 @@ else if ($id || $ref)
 		$res = $object->fetch_optionals($object->id, $extralabels);
 
 		$head=shipping_prepare_head($object);
-		dol_fiche_head($head, 'shipping', $langs->trans("Shipment"), 0, 'sending');
+		dol_fiche_head($head, 'shipping', $langs->trans("Shipment"), -1, 'sending');
 
 		$formconfirm='';
 
@@ -1817,6 +1822,7 @@ else if ($id || $ref)
 		// Loop on each product to send/sent
 		for ($i = 0 ; $i < $num_prod ; $i++)
 		{
+		    print '<!-- origin line id = '.$lines[$i]->origin_line_id.' -->'; // id of order line
 			print '<tr class="oddeven">';
 
 			if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
@@ -1889,14 +1895,14 @@ else if ($id || $ref)
     			        $j = 0;
     			        foreach($val as $shipmentline_id=> $shipmentline_var)
     			        {
-    			            if ($shipmentline_id == $lines[$i]->rowid) continue; // We want to show only "other shipments"
+    			            if ($shipmentline_var['shipment_id'] == $lines[$i]->fk_expedition) continue; // We want to show only "other shipments"
 
     			            $j++;
     			            if ($j > 1) print '<br>';
     			            $shipment_static->fetch($shipmentline_var['shipment_id']);
     			            print $shipment_static->getNomUrl(1);
     			            print ' - '.$shipmentline_var['qty_shipped'];
-    			            $htmltext=$langs->trans("DateValidation").' : '.dol_print_date($shipmentline_var['date_valid'], 'dayhour');
+    			            $htmltext=$langs->trans("DateValidation").' : '.(empty($shipmentline_var['date_valid'])?$langs->trans("Draft"):dol_print_date($shipmentline_var['date_valid'], 'dayhour'));
     			            if (! empty($conf->stock->enabled) && $shipmentline_var['warehouse'] > 0)
     			            {
     			                $warehousestatic->fetch($shipmentline_var['warehouse']);
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 711bd5e767d..857ac1d5271 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -1369,8 +1369,13 @@ class Expedition extends CommonObject
                 $line->line_id          = $obj->line_id;
                 $line->rowid            = $obj->line_id;    // TODO deprecated
                 $line->id               = $obj->line_id;
-				$line->fk_origin_line 	= $obj->fk_origin_line;
-				$line->origin_line_id 	= $obj->fk_origin_line;	    // TODO deprecated
+
+                $line->fk_origin     	= 'orderline';
+                $line->fk_origin_line 	= $obj->fk_origin_line;
+                $line->origin_line_id 	= $obj->fk_origin_line;	    // TODO deprecated
+
+				$line->fk_expedition    = $this->id;                // id of parent
+
 				$line->product_type     = $obj->product_type;
 				$line->fk_product     	= $obj->fk_product;
 				$line->fk_product_type	= $obj->fk_product_type;

From 1a860c42eed3f8bb4fe7849ec3dd3cbbb79276e6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Jun 2017 16:42:11 +0200
Subject: [PATCH 394/438] Look and feel v6

---
 htdocs/core/actions_dellink.inc.php   | 6 +++---
 htdocs/core/actions_sendmails.inc.php | 4 ++--
 htdocs/core/lib/functions.lib.php     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/actions_dellink.inc.php b/htdocs/core/actions_dellink.inc.php
index 63218dde739..7d20f124277 100644
--- a/htdocs/core/actions_dellink.inc.php
+++ b/htdocs/core/actions_dellink.inc.php
@@ -30,15 +30,15 @@ $dellinkid = GETPOST('dellinkid','int');
 $addlinkid = GETPOST('idtolinkto','int');
 
 // Link invoice to order
-if ($action == 'addlink' && ! empty($permissiondellink) && ! GETPOST('cancel') && $id > 0 && $addlinkid > 0)
+if ($action == 'addlink' && ! empty($permissiondellink) && ! GETPOST('cancel','alpha') && $id > 0 && $addlinkid > 0)
 {
     $object->fetch($id);
     $object->fetch_thirdparty();
-    $result = $object->add_object_linked(GETPOST('addlink'), $addlinkid);
+    $result = $object->add_object_linked(GETPOST('addlink','alpha'), $addlinkid);
 }
 
 // Delete link
-if ($action == 'dellink' && ! empty($permissiondellink) && ! GETPOST('cancel') && $dellinkid > 0)
+if ($action == 'dellink' && ! empty($permissiondellink) && ! GETPOST('cancel','alpha') && $dellinkid > 0)
 {
 	$result=$object->deleteObjectLinked(0, '', 0, '', $dellinkid);
 	if ($result < 0) setEventMessages($object->error,$object->errors,'errors');
diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index 786c1c0db9d..a796a94c68c 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -32,7 +32,7 @@
 /*
  * Add file in email form
  */
-if (GETPOST('addfile'))
+if (GETPOST('addfile','alpha'))
 {
 	$trackid = GETPOST('trackid','aZ09');
 
@@ -68,7 +68,7 @@ if (! empty($_POST['removedfile']) && empty($_POST['removAll']))
 /*
  * Remove all files in email form
  */
-if (GETPOST('removAll'))
+if (GETPOST('removAll','alpha'))
 {
 	$trackid = GETPOST('trackid','aZ09');
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 4629324dc84..c598e6be4dd 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -245,7 +245,7 @@ function dol_shutdown()
  *  @param	string	$check	     Type of check
  *                                  ''=no check (deprecated)
  *                                  'none'=no check (only for param that should have very rich content)
- *                                  'int'=check it's numeric
+ *                                  'int'=check it's numeric (integer or float)
  *                                  'alpha'=check it's text and sign
  *                                  'aZ'=check it's a-z only
  *                                  'aZ09'=check it's simple alpha string (recommended for keys)

From c213624c14c97d4538dcc19d31c2227868644d6c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Jun 2017 16:42:37 +0200
Subject: [PATCH 395/438] Fix migration into product_lot

---
 htdocs/install/mysql/migration/repair.sql     | 12 ++++-
 .../product/stock/class/productlot.class.php  | 46 +++++++++----------
 2 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index a5549d33b25..f9ec23d4f69 100755
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -31,6 +31,15 @@
 
 -- Requests to clean corrupted data
 
+-- VMYSQL4.1 INSERT IGNORE INTO llx_product_lot (entity, fk_product, batch, eatby, sellby, datec, fk_user_creat, fk_user_modif) SELECT DISTINCT e.entity, ps.fk_product, pb.batch, pb.eatby, pb.sellby, pb.tms, e.fk_user_author, e.fk_user_author from llx_product_batch as pb, llx_product_stock as ps, llx_entrepot as e WHERE pb.fk_product_stock = ps.rowid AND ps.fk_entrepot = e.rowid;
+-- -- a tester VPGSQL9.5 INSERT IGNORE INTO llx_product_lot (entity, fk_product, batch, eatby, sellby, datec, fk_user_creat, fk_user_modif) SELECT DISTINCT e.entity, ps.fk_product, pb.batch, pb.eatby, pb.sellby, pb.tms, e.fk_user_author, e.fk_user_author from llx_product_batch as pb, llx_product_stock as ps, llx_entrepot as e WHERE pb.fk_product_stock = ps.rowid AND ps.fk_entrepot = e.rowid ON CONFLICT DO NOTHING;
+-- -- avant 9.5 faire en variant x pour qu'au 2eme passage, le premier doublon soit dans la tabel cible
+-- -- INSERT INTO llx_product_lot (entity, fk_product, batch, eatby, sellby, datec, fk_user_creat, fk_user_modif) 
+-- -- SELECT DISTINCT e.entity, ps.fk_product, pb.batch, pb.eatby, pb.sellby, pb.tms, e.fk_user_author, e.fk_user_author 
+-- -- from llx_product_batch as pb, llx_product_stock as ps, llx_entrepot as e
+-- -- WHERE pb.fk_product_stock = ps.rowid AND ps.fk_entrepot = e.rowid 
+-- -- AND NOT EXISTS (SELECT 1 FROM llx_product_lot as b WHERE b.fk_product=ps.fk_product and pb.batch=b.batch) LIMIT x
+
 
 UPDATE llx_user set api_key = null where api_key = '';
 
@@ -99,6 +108,8 @@ DELETE FROM llx_product_lot WHERE fk_product NOT IN (select rowid from llx_produ
 DELETE FROM llx_product_stock WHERE fk_product NOT IN (select rowid from llx_product); 
 DELETE FROM llx_product_stock WHERE reel = 0 AND rowid NOT IN (SELECT fk_product_stock FROM llx_product_batch as pb);
 
+
+
 -- Merge splitted lines into one in table llx_product_batch 
 DROP TABLE tmp_llx_product_batch;
 DROP TABLE tmp_llx_product_batch2;
@@ -356,4 +367,3 @@ drop table tmp_c_shipment_mode;
 -- Backport a change of value into the hourly rate. 
 -- update llx_projet_task_time as ptt set ptt.thm = (SELECT thm from llx_user as u where ptt.fk_user = u.rowid) where (ptt.thm is null)
 
-  
\ No newline at end of file
diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php
index f28f3fd00d3..78ea81bd41d 100644
--- a/htdocs/product/stock/class/productlot.class.php
+++ b/htdocs/product/stock/class/productlot.class.php
@@ -43,12 +43,12 @@ class Productlot extends CommonObject
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element = 'product_lot';
-	
+
 	public $picto='barcode';
-	
+
 	public $isnolinkedbythird = 1;
     public $ismultientitymanaged = 1;
-    
+
 	/**
 	 * @var ProductlotLine[] Lines
 	 */
@@ -56,7 +56,7 @@ class Productlot extends CommonObject
 
 	/**
 	 */
-	
+
 	public $entity;
 	public $fk_product;
 	public $batch;
@@ -70,7 +70,7 @@ class Productlot extends CommonObject
 
 	/**
 	 */
-	
+
 
 	/**
 	 * Constructor
@@ -97,7 +97,7 @@ class Productlot extends CommonObject
 		$error = 0;
 
 		// Clean parameters
-		
+
 		if (isset($this->entity)) {
 			 $this->entity = trim($this->entity);
 		}
@@ -117,7 +117,7 @@ class Productlot extends CommonObject
 			 $this->import_key = trim($this->import_key);
 		}
 
-		
+
 
 		// Check parameters
 		// Put here code to add control on parameters values
@@ -207,7 +207,7 @@ class Productlot extends CommonObject
 		$sql .= " t.import_key";
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
 		if ($product_id > 0 && $batch != '') {
-			$sql .= ' WHERE t.batch = ' . '\'' . $this->db->escape($batch) . '\' AND t.fk_product = ' . $product_id;
+			$sql .= " WHERE t.batch = '". $this->db->escape($batch) . "' AND t.fk_product = " . $product_id;
 		} else {
 			$sql .= ' WHERE t.rowid = ' . $id;
 		}
@@ -221,9 +221,9 @@ class Productlot extends CommonObject
 				$this->id = $obj->rowid;
 				$this->ref = $obj->rowid;
 				//$this->ref = $obj->fk_product.'_'.$obj->batch;
-				
+
 				$this->batch = $obj->batch;
-				
+
 				$this->entity = $obj->entity;
 				$this->fk_product = $obj->fk_product;
 				$this->eatby = $this->db->jdate($obj->eatby);
@@ -239,7 +239,7 @@ class Productlot extends CommonObject
 				require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 				$extrafields=new ExtraFields($this->db);
 				$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-				$this->fetch_optionals($this->id,$extralabels);				
+				$this->fetch_optionals($this->id,$extralabels);
 			}
 			$this->db->free($resql);
 
@@ -271,7 +271,7 @@ class Productlot extends CommonObject
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		// Clean parameters
-		
+
 		if (isset($this->entity)) {
 			 $this->entity = trim($this->entity);
 		}
@@ -437,8 +437,8 @@ class Productlot extends CommonObject
 			return - 1;
 		}
 	}
-	
-	
+
+
 	/**
 	 *	Return label of status of object
 	 *
@@ -449,7 +449,7 @@ class Productlot extends CommonObject
 	{
 	    return $this->LibStatut(0,$mode);
 	}
-	
+
 	/**
 	 *	Return label of a given status
 	 *
@@ -460,13 +460,13 @@ class Productlot extends CommonObject
 	function LibStatut($statut,$mode=0)
 	{
 	    global $langs;
-	
+
 	    //$langs->load('stocks');
 
 	    return '';
 	}
-	
-	
+
+
 	/**
 	 *  Return a link to the a lot card (with optionaly the picto)
 	 * 	Use this->id,this->lastname, this->firstname
@@ -498,7 +498,7 @@ class Productlot extends CommonObject
         {
             $label.= '<br><b>' . $langs->trans('SellByDate') . ':</b> ' . dol_print_date($this->sellby, 'day');
         }
-        
+
         $link = '<a href="'.DOL_URL_ROOT.'/product/stock/productlot_card.php?id='.$this->id.'"';
         $link.= ($notooltip?'':' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip'.($morecss?' '.$morecss:'').'"');
         $link.= '>';
@@ -512,9 +512,9 @@ class Productlot extends CommonObject
 		$result.= $link . $this->batch . $linkend;
 		return $result;
 	}
-	
-	
-	/** 
+
+
+	/**
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
@@ -523,7 +523,7 @@ class Productlot extends CommonObject
 	public function initAsSpecimen()
 	{
 		$this->id = 0;
-		
+
 		$this->entity = '';
 		$this->fk_product = '';
 		$this->batch = '';

From 6f82837b0f040990c376a4b2cad88002d1b989c3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Jun 2017 17:27:01 +0200
Subject: [PATCH 396/438] Fix GETPOST of lang_id

---
 htdocs/comm/propal/card.php                    | 16 ++++++++--------
 htdocs/comm/propal/class/propal.class.php      |  2 +-
 htdocs/commande/card.php                       | 16 ++++++++--------
 htdocs/compta/facture/card.php                 | 16 ++++++++--------
 htdocs/compta/facture/fiche-rec.php            | 10 +++++-----
 htdocs/compta/paiement/rapport.php             |  4 ++--
 htdocs/contrat/card.php                        |  6 +++---
 htdocs/core/actions_builddoc.inc.php           |  2 +-
 htdocs/core/actions_lineupdown.inc.php         |  4 ++--
 htdocs/core/actions_massactions.inc.php        |  2 +-
 htdocs/core/class/commonobject.class.php       |  2 +-
 htdocs/expedition/card.php                     |  6 +++---
 htdocs/expensereport/card.php                  | 18 +++++++++---------
 htdocs/fichinter/card.php                      | 16 ++++++++--------
 htdocs/fourn/commande/card.php                 | 14 +++++++-------
 htdocs/fourn/facture/card.php                  | 14 +++++++-------
 htdocs/fourn/facture/rapport.php               |  4 ++--
 htdocs/fourn/paiement/card.php                 |  2 +-
 htdocs/livraison/card.php                      |  4 ++--
 htdocs/product/document.php                    |  4 ++--
 htdocs/projet/card.php                         |  4 ++--
 htdocs/projet/tasks/task.php                   |  4 ++--
 .../canvas/actions_card_common.class.php       |  2 +-
 htdocs/societe/consumption.php                 |  2 +-
 htdocs/supplier_proposal/card.php              | 14 +++++++-------
 .../class/supplier_proposal.class.php          |  2 +-
 26 files changed, 95 insertions(+), 95 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 0c9d97fc299..4ee029ee8e8 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -210,7 +210,7 @@ if (empty($reshook))
 			$outputlangs = $langs;
 			if (! empty($conf->global->MAIN_MULTILANGS)) {
 				$outputlangs = new Translate("", $conf);
-				$newlang = (GETPOST('lang_id') ? GETPOST('lang_id') : $object->thirdparty->default_lang);
+				$newlang = (GETPOST('lang_id','aZ09') ? GETPOST('lang_id','aZ09') : $object->thirdparty->default_lang);
 				$outputlangs->setDefaultLang($newlang);
 			}
 			$ret = $object->fetch($id); // Reload to get new records
@@ -234,7 +234,7 @@ if (empty($reshook))
 			{
 				$outputlangs = $langs;
 				$newlang = '';
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
 				if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
 				if (! empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
@@ -558,7 +558,7 @@ if (empty($reshook))
 				    	{
 				    		$outputlangs = $langs;
 				    		$newlang = '';
-				    		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+				    		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
 				    		if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
 				    		if (! empty($newlang)) {
 				    			$outputlangs = new Translate("", $conf);
@@ -663,7 +663,7 @@ if (empty($reshook))
 			$outputlangs = $langs;
 			if (! empty($conf->global->MAIN_MULTILANGS)) {
 				$outputlangs = new Translate("", $conf);
-				$newlang = (GETPOST('lang_id') ? GETPOST('lang_id') : $object->thirdparty->default_lang);
+				$newlang = (GETPOST('lang_id','aZ09') ? GETPOST('lang_id','aZ09') : $object->thirdparty->default_lang);
 				$outputlangs->setDefaultLang($newlang);
 			}
 			$ret = $object->fetch($id); // Reload to get new records
@@ -833,8 +833,8 @@ if (empty($reshook))
 				if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
 					$outputlangs = $langs;
 					$newlang = '';
-					if (empty($newlang) && GETPOST('lang_id'))
-						$newlang = GETPOST('lang_id');
+					if (empty($newlang) && GETPOST('lang_id','aZ09'))
+						$newlang = GETPOST('lang_id','aZ09');
 					if (empty($newlang))
 						$newlang = $object->thirdparty->default_lang;
 					if (! empty($newlang)) {
@@ -920,7 +920,7 @@ if (empty($reshook))
 						$outputlangs = $langs;
 						if (! empty($conf->global->MAIN_MULTILANGS)) {
 							$outputlangs = new Translate("", $conf);
-							$newlang = (GETPOST('lang_id') ? GETPOST('lang_id') : $object->thirdparty->default_lang);
+							$newlang = (GETPOST('lang_id','aZ09') ? GETPOST('lang_id','aZ09') : $object->thirdparty->default_lang);
 							$outputlangs->setDefaultLang($newlang);
 						}
 						$ret = $object->fetch($id); // Reload to get new records
@@ -1065,7 +1065,7 @@ if (empty($reshook))
 					$outputlangs = $langs;
 					if (! empty($conf->global->MAIN_MULTILANGS)) {
 						$outputlangs = new Translate("", $conf);
-						$newlang = (GETPOST('lang_id') ? GETPOST('lang_id') : $object->thirdparty->default_lang);
+						$newlang = (GETPOST('lang_id','aZ09') ? GETPOST('lang_id','aZ09') : $object->thirdparty->default_lang);
 						$outputlangs->setDefaultLang($newlang);
 					}
 					$ret = $object->fetch($id); // Reload to get new records
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 11aa3c95b95..d7f2411f615 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -2305,7 +2305,7 @@ class Propal extends CommonObject
                	if (! empty($conf->global->MAIN_MULTILANGS))
                	{
                		$outputlangs = new Translate("",$conf);
-               		$newlang=(GETPOST('lang_id') ? GETPOST('lang_id') : $this->thirdparty->default_lang);
+               		$newlang=(GETPOST('lang_id','aZ09') ? GETPOST('lang_id','aZ09') : $this->thirdparty->default_lang);
                		$outputlangs->setDefaultLang($newlang);
                	}
                	//$ret=$object->fetch($id);    // Reload to get new records
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index a10de641ea1..826046db3ee 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -208,8 +208,8 @@ if (empty($reshook))
 			// Define output language
 			$outputlangs = $langs;
 			$newlang = '';
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id'))
-				$newlang = GETPOST('lang_id');
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09'))
+				$newlang = GETPOST('lang_id','aZ09');
 			if ($conf->global->MAIN_MULTILANGS && empty($newlang))
 				$newlang = $object->thirdparty->default_lang;
 			if (! empty($newlang)) {
@@ -801,8 +801,8 @@ if (empty($reshook))
 				if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
 					$outputlangs = $langs;
 					$newlang = '';
-					if (empty($newlang) && GETPOST('lang_id'))
-						$newlang = GETPOST('lang_id');
+					if (empty($newlang) && GETPOST('lang_id','aZ09'))
+						$newlang = GETPOST('lang_id','aZ09');
 					if (empty($newlang))
 						$newlang = $object->thirdparty->default_lang;
 					if (! empty($newlang)) {
@@ -1015,8 +1015,8 @@ if (empty($reshook))
 					// Define output language
 					$outputlangs = $langs;
 					$newlang = '';
-					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id'))
-						$newlang = GETPOST('lang_id');
+					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09'))
+						$newlang = GETPOST('lang_id','aZ09');
 					if ($conf->global->MAIN_MULTILANGS && empty($newlang))
 						$newlang = $object->thirdparty->default_lang;
 					if (! empty($newlang)) {
@@ -1102,7 +1102,7 @@ if (empty($reshook))
 				{
 					$outputlangs = $langs;
 					$newlang = '';
-					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
 					if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
 					if (! empty($newlang)) {
 						$outputlangs = new Translate("", $conf);
@@ -1155,7 +1155,7 @@ if (empty($reshook))
 				{
 					$outputlangs = $langs;
 					$newlang = '';
-					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
 					if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
 					if (! empty($newlang)) {
 						$outputlangs = new Translate("", $conf);
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 6c2ab5786b7..dd89ae944ef 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -464,7 +464,7 @@ if (empty($reshook))
 				{
 					$outputlangs = $langs;
 					$newlang = '';
-					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
 					if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
 					if (! empty($newlang)) {
 						$outputlangs = new Translate("", $conf);
@@ -550,7 +550,7 @@ if (empty($reshook))
 				{
 					$outputlangs = $langs;
 					$newlang = '';
-					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
 					if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
 					if (! empty($newlang)) {
 						$outputlangs = new Translate("", $conf);
@@ -1368,7 +1368,7 @@ if (empty($reshook))
 			{
 				$outputlangs = $langs;
 				$newlang = '';
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
 				if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
 				if (! empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
@@ -1583,8 +1583,8 @@ if (empty($reshook))
 				if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
 					$outputlangs = $langs;
 					$newlang = '';
-					if (empty($newlang) && GETPOST('lang_id'))
-						$newlang = GETPOST('lang_id');
+					if (empty($newlang) && GETPOST('lang_id','aZ09'))
+						$newlang = GETPOST('lang_id','aZ09');
 					if (empty($newlang))
 						$newlang = $object->thirdparty->default_lang;
 					if (! empty($newlang)) {
@@ -1653,7 +1653,7 @@ if (empty($reshook))
 					{
 						$outputlangs = $langs;
 						$newlang = '';
-						if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+						if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
 						if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
 						if (! empty($newlang)) {
 							$outputlangs = new Translate("", $conf);
@@ -1829,8 +1829,8 @@ if (empty($reshook))
 					// Define output language
 					$outputlangs = $langs;
 					$newlang = '';
-					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id'))
-						$newlang = GETPOST('lang_id');
+					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09'))
+						$newlang = GETPOST('lang_id','aZ09');
 					if ($conf->global->MAIN_MULTILANGS && empty($newlang))
 						$newlang = $object->thirdparty->default_lang;
 					if (! empty($newlang)) {
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 221167a485a..22306e498f2 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -545,8 +545,8 @@ if (empty($reshook))
     		{
     			$outputlangs = $langs;
     			$newlang = '';
-    			if (empty($newlang) && GETPOST('lang_id'))
-    				$newlang = GETPOST('lang_id');
+    			if (empty($newlang) && GETPOST('lang_id','aZ09'))
+    				$newlang = GETPOST('lang_id','aZ09');
     			if (empty($newlang))
     				$newlang = $object->thirdparty->default_lang;
     			if (! empty($newlang))
@@ -625,7 +625,7 @@ if (empty($reshook))
     			    // Define output language
     			    $outputlangs = $langs;
     			    $newlang = '';
-    			    if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+    			    if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
     			    if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
     			    if (! empty($newlang)) {
     				$outputlangs = new Translate("", $conf);
@@ -810,8 +810,8 @@ if (empty($reshook))
                         // Define output language
                         $outputlangs = $langs;
                         $newlang = '';
-                        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id'))
-                            $newlang = GETPOST('lang_id');
+                        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09'))
+                            $newlang = GETPOST('lang_id','aZ09');
                             if ($conf->global->MAIN_MULTILANGS && empty($newlang))
                                 $newlang = $object->thirdparty->default_lang;
                                 if (! empty($newlang)) {
diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php
index a185f0aba6e..3e6427f6ac2 100644
--- a/htdocs/compta/paiement/rapport.php
+++ b/htdocs/compta/paiement/rapport.php
@@ -56,10 +56,10 @@ if ($action == 'builddoc')
     $rap = new pdf_paiement($db);
 
     $outputlangs = $langs;
-    if (GETPOST('lang_id'))
+    if (GETPOST('lang_id','aZ09'))
     {
         $outputlangs = new Translate("",$conf);
-        $outputlangs->setDefaultLang(GETPOST('lang_id'));
+        $outputlangs->setDefaultLang(GETPOST('lang_id','aZ09'));
     }
 
     // We save charset_output to restore it because write_file can change it if needed for
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index b2ab3bf3cb8..f502e8023f3 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -312,7 +312,7 @@ if (empty($reshook))
 
 										$outputlangs = $langs;
 										$newlang='';
-										if (empty($newlang) && GETPOST('lang_id')) $newlang=GETPOST('lang_id');
+										if (empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
 										if (empty($newlang)) $newlang=$srcobject->thirdparty->default_lang;
 										if (! empty($newlang))
 										{
@@ -585,7 +585,7 @@ if (empty($reshook))
 				{
 					$outputlangs = $langs;
 					$newlang = '';
-					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
 					if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
 					if (! empty($newlang)) {
 						$outputlangs = new Translate("", $conf);
@@ -922,7 +922,7 @@ if (empty($reshook))
 		$outputlangs = $langs;
 		if (! empty($conf->global->MAIN_MULTILANGS)) {
 			$outputlangs = new Translate("", $conf);
-			$newlang = (GETPOST('lang_id') ? GETPOST('lang_id') : $object->thirdparty->default_lang);
+			$newlang = (GETPOST('lang_id','aZ09') ? GETPOST('lang_id','aZ09') : $object->thirdparty->default_lang);
 			$outputlangs->setDefaultLang($newlang);
 		}
 		$ret = $object->fetch($id); // Reload to get new records
diff --git a/htdocs/core/actions_builddoc.inc.php b/htdocs/core/actions_builddoc.inc.php
index 94f4229e0db..076a7a6a035 100644
--- a/htdocs/core/actions_builddoc.inc.php
+++ b/htdocs/core/actions_builddoc.inc.php
@@ -68,7 +68,7 @@ if ($action == 'builddoc' && $permissioncreate)
         $outputlangs = $langs;
         $newlang='';
 
-        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang=GETPOST('lang_id');
+        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
         if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->thirdparty->default_lang)) $newlang=$object->thirdparty->default_lang;  // for proposal, order, invoice, ...
         if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->default_lang)) $newlang=$object->default_lang;                  // for thirdparty
         if (! empty($newlang))
diff --git a/htdocs/core/actions_lineupdown.inc.php b/htdocs/core/actions_lineupdown.inc.php
index 825bdac1615..bcf251e0763 100644
--- a/htdocs/core/actions_lineupdown.inc.php
+++ b/htdocs/core/actions_lineupdown.inc.php
@@ -35,7 +35,7 @@ if ($action == 'up' && $permissiontoedit)
 	// Define output language
 	$outputlangs = $langs;
 	$newlang = '';
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
 	if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
 	if (! empty($newlang)) {
 		$outputlangs = new Translate("", $conf);
@@ -57,7 +57,7 @@ if ($action == 'down' && $permissiontoedit)
 	// Define output language
 	$outputlangs = $langs;
 	$newlang = '';
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
 	if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
 	if (! empty($newlang)) {
 		$outputlangs = new Translate("", $conf);
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 20b3d155a27..5313b79dc04 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -400,7 +400,7 @@ if (! $error && $massaction == "builddoc" && $permtoread && ! GETPOST('button_se
     // Define output language (Here it is not used because we do only merging existing PDF)
     $outputlangs = $langs;
     $newlang='';
-    if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang=GETPOST('lang_id');
+    if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
     if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->thirdparty->default_lang;
     if (! empty($newlang))
     {
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 3c902495118..1339512b3af 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3510,7 +3510,7 @@ abstract class CommonObject
 
 					$outputlangs = $langs;
 					$newlang='';
-					if (empty($newlang) && GETPOST('lang_id')) $newlang=GETPOST('lang_id');
+					if (empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
 					if (! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && empty($newlang)) $newlang=$this->thirdparty->default_lang;		// For language to language of customer
 					if (! empty($newlang))
 					{
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index b332667f681..bface3db915 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -452,7 +452,7 @@ if (empty($reshook))
 	    	{
 	    		$outputlangs = $langs;
 	    		$newlang = '';
-	    		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+	    		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
 	    		if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
 	    		if (! empty($newlang)) {
 	    			$outputlangs = new Translate("", $conf);
@@ -549,7 +549,7 @@ if (empty($reshook))
 	    // Define output language
 	    $outputlangs = $langs;
 	    $newlang='';
-	    if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang=GETPOST('lang_id','alpha');
+	    if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
 	    if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$shipment->thirdparty->default_lang;
 	    if (! empty($newlang))
 	    {
@@ -1767,7 +1767,7 @@ else if ($id || $ref)
 			$object->fetch_thirdparty();
 			$outputlangs = $langs;
 			$newlang='';
-			if (empty($newlang) && GETPOST('lang_id')) $newlang=GETPOST('lang_id','alpha');
+			if (empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
 			if (empty($newlang)) $newlang=$object->thirdparty->default_lang;
 			if (! empty($newlang))
 			{
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index c4aa6caccd8..e4e8fe8ea47 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -314,7 +314,7 @@ if (empty($reshook))
     		{
     			$outputlangs = $langs;
     			$newlang = '';
-    			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+    			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
     			if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
     			if (! empty($newlang)) {
     				$outputlangs = new Translate("", $conf);
@@ -425,7 +425,7 @@ if (empty($reshook))
     		{
     			$outputlangs = $langs;
     			$newlang = '';
-    			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+    			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
     			if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
     			if (! empty($newlang)) {
     				$outputlangs = new Translate("", $conf);
@@ -542,7 +542,7 @@ if (empty($reshook))
     		{
     			$outputlangs = $langs;
     			$newlang = '';
-    			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+    			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
     			if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
     			if (! empty($newlang)) {
     				$outputlangs = new Translate("", $conf);
@@ -665,7 +665,7 @@ if (empty($reshook))
     		{
     			$outputlangs = $langs;
     			$newlang = '';
-    			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+    			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
     			if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
     			if (! empty($newlang)) {
     				$outputlangs = new Translate("", $conf);
@@ -788,7 +788,7 @@ if (empty($reshook))
     			{
     				$outputlangs = $langs;
     				$newlang = '';
-    				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+    				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
     				if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
     				if (! empty($newlang)) {
     					$outputlangs = new Translate("", $conf);
@@ -910,7 +910,7 @@ if (empty($reshook))
     			{
     				$outputlangs = $langs;
     				$newlang = '';
-    				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+    				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
     				if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
     				if (! empty($newlang)) {
     					$outputlangs = new Translate("", $conf);
@@ -953,7 +953,7 @@ if (empty($reshook))
     		{
     			$outputlangs = $langs;
     			$newlang = '';
-    			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+    			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
     			if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
     			if (! empty($newlang)) {
     				$outputlangs = new Translate("", $conf);
@@ -1170,7 +1170,7 @@ if (empty($reshook))
     			{
     				$outputlangs = $langs;
     				$newlang = '';
-    				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+    				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
     				if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
     				if (! empty($newlang)) {
     					$outputlangs = new Translate("", $conf);
@@ -1236,7 +1236,7 @@ if (empty($reshook))
     				{
     					$outputlangs = $langs;
     					$newlang = '';
-    					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+    					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
     					if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
     					if (! empty($newlang)) {
     						$outputlangs = new Translate("", $conf);
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 272a15e6ab8..953b48a8adf 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -150,7 +150,7 @@ if (empty($reshook))
 				// Define output language
 				$outputlangs = $langs;
 				$newlang='';
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
 				if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->thirdparty->default_lang;
 				if (! empty($newlang))
 				{
@@ -179,7 +179,7 @@ if (empty($reshook))
 				// Define output language
 				$outputlangs = $langs;
 				$newlang='';
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
 				if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->thirdparty->default_lang;
 				if (! empty($newlang))
 				{
@@ -296,7 +296,7 @@ if (empty($reshook))
 										$prod->fetch($lines[$i]->fk_product);
 										$outputlangs = $langs;
 										$newlang='';
-										if (empty($newlang) && GETPOST('lang_id')) $newlang=GETPOST('lang_id');
+										if (empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
 										if (empty($newlang)) $newlang=$srcobject->client->default_lang;
 										if (! empty($newlang)) {
 											$outputlangs = new Translate("",$conf);
@@ -513,7 +513,7 @@ if (empty($reshook))
 			// Define output language
 			$outputlangs = $langs;
 			$newlang='';
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
 			if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->thirdparty->default_lang;
 			if (! empty($newlang))
 			{
@@ -625,7 +625,7 @@ if (empty($reshook))
 		// Define output language
 		$outputlangs = $langs;
 		$newlang='';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
 		if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->thirdparty->default_lang;
 		if (! empty($newlang))
 		{
@@ -660,7 +660,7 @@ if (empty($reshook))
 		// Define output language
 		$outputlangs = $langs;
 		$newlang='';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
 		if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->thirdparty->default_lang;
 		if (! empty($newlang))
 		{
@@ -681,7 +681,7 @@ if (empty($reshook))
 		// Define output language
 		$outputlangs = $langs;
 		$newlang='';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
 		if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->thirdparty->default_lang;
 		if (! empty($newlang))
 		{
@@ -701,7 +701,7 @@ if (empty($reshook))
 		// Define output language
 		$outputlangs = $langs;
 		$newlang='';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
 		if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->thirdparty->default_lang;
 		if (! empty($newlang))
 		{
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index c76a25caa70..bdd38ebc0b7 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -477,7 +477,7 @@ if (empty($reshook))
 	    	{
 	    		$outputlangs = $langs;
 	    		$newlang = '';
-	    		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+	    		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
 	    		if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
 	    		if (! empty($newlang)) {
 	    			$outputlangs = new Translate("", $conf);
@@ -628,7 +628,7 @@ if (empty($reshook))
 	    	{
 	    		$outputlangs = $langs;
 	    		$newlang = '';
-	    		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+	    		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
 	    		if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
 	    		if (! empty($newlang)) {
 	    			$outputlangs = new Translate("", $conf);
@@ -657,8 +657,8 @@ if (empty($reshook))
 			// Define output language
 			$outputlangs = $langs;
 			$newlang = '';
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id'))
-				$newlang = GETPOST('lang_id');
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09'))
+				$newlang = GETPOST('lang_id','aZ09');
 			if ($conf->global->MAIN_MULTILANGS && empty($newlang))
 				$newlang = $object->thirdparty->default_lang;
 			if (! empty($newlang)) {
@@ -696,7 +696,7 @@ if (empty($reshook))
 	    	{
 	    		$outputlangs = $langs;
 	    		$newlang = '';
-	    		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+	    		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
 	    		if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
 	    		if (! empty($newlang)) {
 	    			$outputlangs = new Translate("", $conf);
@@ -754,7 +754,7 @@ if (empty($reshook))
 	            if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 	                $outputlangs = $langs;
 	                $newlang = '';
-	                if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+	                if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
 	                if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
 	                if (! empty($newlang)) {
 	                    $outputlangs = new Translate("", $conf);
@@ -795,7 +795,7 @@ if (empty($reshook))
 	        {
 	            $outputlangs = $langs;
 	            $newlang = '';
-	            if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+	            if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
 	            if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
 	            if (! empty($newlang)) {
 	                $outputlangs = new Translate("", $conf);
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 956808b1fab..f0a0985a82c 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -198,7 +198,7 @@ if (empty($reshook))
 	            {
                     $outputlangs = $langs;
                     $newlang = '';
-                    if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+                    if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
                     if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
                     if (! empty($newlang)) {
                         $outputlangs = new Translate("", $conf);
@@ -239,8 +239,8 @@ if (empty($reshook))
 			// Define output language
 			/*$outputlangs = $langs;
 			$newlang = '';
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id'))
-				$newlang = GETPOST('lang_id');
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09'))
+				$newlang = GETPOST('lang_id','aZ09');
 			if ($conf->global->MAIN_MULTILANGS && empty($newlang))
 				$newlang = $object->thirdparty->default_lang;
 			if (! empty($newlang)) {
@@ -286,8 +286,8 @@ if (empty($reshook))
 		    // Define output language
 		    $outputlangs = $langs;
 		    $newlang = '';
-		    if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id'))
-		        $newlang = GETPOST('lang_id');
+		    if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09'))
+		        $newlang = GETPOST('lang_id','aZ09');
 		        if ($conf->global->MAIN_MULTILANGS && empty($newlang))
 		            $newlang = $object->thirdparty->default_lang;
 		            if (! empty($newlang)) {
@@ -1064,7 +1064,7 @@ if (empty($reshook))
 	    	{
 	    		$outputlangs = $langs;
 	    		$newlang = '';
-	    		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+	    		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
 	    		if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
 	    		if (! empty($newlang)) {
 	    			$outputlangs = new Translate("", $conf);
@@ -1146,7 +1146,7 @@ if (empty($reshook))
 	    	{
 	    		$outputlangs = $langs;
 	    		$newlang = '';
-	    		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+	    		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
 	    		if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
 	    		if (! empty($newlang)) {
 	    			$outputlangs = new Translate("", $conf);
diff --git a/htdocs/fourn/facture/rapport.php b/htdocs/fourn/facture/rapport.php
index f2bb499d652..d0a0c5f0aea 100644
--- a/htdocs/fourn/facture/rapport.php
+++ b/htdocs/fourn/facture/rapport.php
@@ -56,10 +56,10 @@ if ($action == 'builddoc')
     $rap = new pdf_paiement_fourn($db);
 
     $outputlangs = $langs;
-    if (GETPOST('lang_id'))
+    if (GETPOST('lang_id','aZ09'))
     {
         $outputlangs = new Translate("",$conf);
-        $outputlangs->setDefaultLang(GETPOST('lang_id'));
+        $outputlangs->setDefaultLang(GETPOST('lang_id','aZ09'));
     }
 
     // We save charset_output to restore it because write_file can change it if needed for
diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php
index 40037dce274..ee32ddcfb05 100644
--- a/htdocs/fourn/paiement/card.php
+++ b/htdocs/fourn/paiement/card.php
@@ -150,7 +150,7 @@ if ($action == 'builddoc')
 	if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
 
     $outputlangs = $langs;
-    $newlang=GETPOST('lang_id','alpha');
+    $newlang=GETPOST('lang_id','aZ09');
     if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->thirdparty->default_lang;
     if (! empty($newlang))
     {
diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php
index bf8dc3e9bed..02b126306f2 100644
--- a/htdocs/livraison/card.php
+++ b/htdocs/livraison/card.php
@@ -142,7 +142,7 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' &&
 	{
 		$outputlangs = $langs;
 		$newlang = '';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
 		if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
 		if (! empty($newlang)) {
 			$outputlangs = new Translate("", $conf);
@@ -259,7 +259,7 @@ if ($action == 'builddoc')	// En get ou en post
 	// Define output language
 	$outputlangs = $langs;
 	$newlang='';
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang=GETPOST('lang_id');
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
 	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->thirdparty->default_lang;
 	if (! empty($newlang))
 	{
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 72a76ea2448..53bbbfeeabb 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -125,7 +125,7 @@ if ($action=='filemerge')
 		$filetomerge_file_array = GETPOST('filetoadd');
 
 		if ($conf->global->MAIN_MULTILANGS) {
-			$lang_id = GETPOST('lang_id');
+			$lang_id = GETPOST('lang_id','aZ09');
 		}
 
 		// Delete all file already associated
@@ -245,7 +245,7 @@ if ($object->id)
     	$filetomerge = new Propalmergepdfproduct($db);
 
     	if ($conf->global->MAIN_MULTILANGS) {
-    		$lang_id = GETPOST('lang_id');
+    		$lang_id = GETPOST('lang_id','aZ09');
     		$result = $filetomerge->fetch_by_product($object->id, $lang_id);
     	} else {
     		$result = $filetomerge->fetch_by_product($object->id);
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 7b0b448ef59..b8528e9863c 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -339,10 +339,10 @@ if (empty($reshook))
 		if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
 
 	    $outputlangs = $langs;
-	    if (GETPOST('lang_id'))
+	    if (GETPOST('lang_id','aZ09'))
 	    {
 	        $outputlangs = new Translate("",$conf);
-	        $outputlangs->setDefaultLang(GETPOST('lang_id'));
+	        $outputlangs->setDefaultLang(GETPOST('lang_id','aZ09'));
 	    }
 	    $result= $object->generateDocument($object->modelpdf, $outputlangs);
 	    if ($result <= 0)
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index df89cac3e83..f85b5071de1 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -162,10 +162,10 @@ if ($action == 'builddoc' && $user->rights->projet->creer)
 	if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
 
 	$outputlangs = $langs;
-	if (GETPOST('lang_id'))
+	if (GETPOST('lang_id','aZ09'))
 	{
 		$outputlangs = new Translate("",$conf);
-		$outputlangs->setDefaultLang(GETPOST('lang_id'));
+		$outputlangs->setDefaultLang(GETPOST('lang_id','aZ09'));
 	}
 	$result= $object->generateDocument($object->modelpdf, $outputlangs);
 	if ($result <= 0)
diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php
index 689771ad223..452a9cc6a61 100644
--- a/htdocs/societe/canvas/actions_card_common.class.php
+++ b/htdocs/societe/canvas/actions_card_common.class.php
@@ -335,7 +335,7 @@ abstract class ActionsCardCommon
                 // Define output language
                 $outputlangs = $langs;
                 $newlang='';
-                if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang=GETPOST('lang_id');
+                if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
                 if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$this->object->default_lang;
                 if (! empty($newlang))
                 {
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 834131a86a8..d11a358f56c 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -457,7 +457,7 @@ if ($sql_select)
 
 				$outputlangs = $langs;
 				$newlang='';
-				if (empty($newlang) && GETPOST('lang_id')) $newlang=GETPOST('lang_id');
+				if (empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
 				if (empty($newlang)) $newlang=$object->default_lang;
 				if (! empty($newlang))
 				{
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index b4d93feb511..e5040b3150d 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -173,7 +173,7 @@ if (empty($reshook))
 			$outputlangs = $langs;
 			if (! empty($conf->global->MAIN_MULTILANGS)) {
 				$outputlangs = new Translate("", $conf);
-				$newlang = (GETPOST('lang_id') ? GETPOST('lang_id') : $object->thirdparty->default_lang);
+				$newlang = (GETPOST('lang_id','aZ09') ? GETPOST('lang_id','aZ09') : $object->thirdparty->default_lang);
 				$outputlangs->setDefaultLang($newlang);
 			}
 			$ret = $object->fetch($id); // Reload to get new records
@@ -200,7 +200,7 @@ if (empty($reshook))
 				{
 					$outputlangs = $langs;
 					$newlang = '';
-					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
 					if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
 					if (! empty($newlang)) {
 						$outputlangs = new Translate("", $conf);
@@ -401,7 +401,7 @@ if (empty($reshook))
 				    	{
 				    		$outputlangs = $langs;
 				    		$newlang = '';
-				    		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+				    		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
 				    		if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
 				    		if (! empty($newlang)) {
 				    			$outputlangs = new Translate("", $conf);
@@ -485,7 +485,7 @@ if (empty($reshook))
 			$outputlangs = $langs;
 			if (! empty($conf->global->MAIN_MULTILANGS)) {
 				$outputlangs = new Translate("", $conf);
-				$newlang = (GETPOST('lang_id') ? GETPOST('lang_id') : $object->thirdparty->default_lang);
+				$newlang = (GETPOST('lang_id','aZ09') ? GETPOST('lang_id','aZ09') : $object->thirdparty->default_lang);
 				$outputlangs->setDefaultLang($newlang);
 			}
 			$ret = $object->fetch($id); // Reload to get new records
@@ -693,7 +693,7 @@ if (empty($reshook))
 					{
 						$outputlangs = $langs;
 						$newlang = '';
-			    		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+			    		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
 	    				if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
 	    				if (! empty($newlang)) {
 							$outputlangs = new Translate("", $conf);
@@ -828,7 +828,7 @@ if (empty($reshook))
 					$outputlangs = $langs;
 					if (! empty($conf->global->MAIN_MULTILANGS)) {
 						$outputlangs = new Translate("", $conf);
-						$newlang = (GETPOST('lang_id') ? GETPOST('lang_id') : $object->thirdparty->default_lang);
+						$newlang = (GETPOST('lang_id','aZ09') ? GETPOST('lang_id','aZ09') : $object->thirdparty->default_lang);
 						$outputlangs->setDefaultLang($newlang);
 					}
 					$ret = $object->fetch($id); // Reload to get new records
@@ -884,7 +884,7 @@ if (empty($reshook))
 		$outputlangs = $langs;
 		if (! empty($conf->global->MAIN_MULTILANGS)) {
 			$outputlangs = new Translate("", $conf);
-			$newlang = (GETPOST('lang_id') ? GETPOST('lang_id') : $object->thirdparty->default_lang);
+			$newlang = (GETPOST('lang_id','aZ09') ? GETPOST('lang_id','aZ09') : $object->thirdparty->default_lang);
 			$outputlangs->setDefaultLang($newlang);
 		}
 		$ret = $object->fetch($id); // Reload to get new records
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index b14e4a40ff9..bf0d42b889a 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -1661,7 +1661,7 @@ class SupplierProposal extends CommonObject
                	if (! empty($conf->global->MAIN_MULTILANGS))
                	{
                		$outputlangs = new Translate("",$conf);
-               		$newlang=(GETPOST('lang_id') ? GETPOST('lang_id') : $this->thirdparty->default_lang);
+               		$newlang=(GETPOST('lang_id','aZ09') ? GETPOST('lang_id','aZ09') : $this->thirdparty->default_lang);
                		$outputlangs->setDefaultLang($newlang);
                	}
                	//$ret=$object->fetch($id);    // Reload to get new records

From adf281c4f32e0f78a4d5ace1af3b883b25178ca9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Jun 2017 17:42:07 +0200
Subject: [PATCH 397/438] Look and feel v6

---
 htdocs/product/stock/productlot_card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php
index e26dfdba905..77466ead2c8 100644
--- a/htdocs/product/stock/productlot_card.php
+++ b/htdocs/product/stock/productlot_card.php
@@ -309,7 +309,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     //print load_fiche_titre($langs->trans("Batch"));
 
     $head = productlot_prepare_head($object);
-	dol_fiche_head($head, 'card', $langs->trans("Batch"), 0, 'barcode');
+	dol_fiche_head($head, 'card', $langs->trans("Batch"), -1, 'barcode');
 
 
 	if ($action == 'delete') {

From 9c64ba6ad6f76725808262e5aa1d67c00c87a0e7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Jun 2017 17:52:50 +0200
Subject: [PATCH 398/438] Fix closing }

---
 htdocs/accountancy/journal/bankjournal.php | 171 +++++++++++----------
 1 file changed, 86 insertions(+), 85 deletions(-)

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index bf4c5a45f02..86931ed31c0 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -121,8 +121,8 @@ $sql .= " WHERE ba.fk_accountancy_journal=" . $id_journal;
 $sql .= ' AND ba.entity IN ('.getEntity('bank_account', 0).')';		// We don't share object for accountancy
 if ($date_start && $date_end)
 	$sql .= " AND b.dateo >= '" . $db->idate($date_start) . "' AND b.dateo <= '" . $db->idate($date_end) . "'";
-if ($in_bookkeeping == 'yes')    
-	$sql .= " AND (b.rowid NOT IN (SELECT fk_doc FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab  WHERE ab.doc_type='bank') )";	
+if ($in_bookkeeping == 'yes')
+	$sql .= " AND (b.rowid NOT IN (SELECT fk_doc FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab  WHERE ab.doc_type='bank') )";
 $sql .= " ORDER BY b.datev";
 
 $object = new Account($db);
@@ -484,9 +484,10 @@ if (! $error && $action == 'writebookkeeping') {
 						dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
 						$resultmid = $db->query($sqlmid);
 						if ($resultmid) {
-    					$objmid = $db->fetch_object($resultmid);
-    					$bookkeeping->label_compte = $objmid->labelc;
-    					$bookkeeping->doc_ref = $objmid->libelle ;
+        					$objmid = $db->fetch_object($resultmid);
+        					$bookkeeping->label_compte = $objmid->labelc;
+        					$bookkeeping->doc_ref = $objmid->libelle ;
+						}
 						$bookkeeping->subledger_account = '';
 						$bookkeeping->numero_compte = $k;
 					} else if ($tabtype[$key] == 'payment') {	// If payment is payment of customer invoice, we get ref of invoice
@@ -619,101 +620,101 @@ if ($action == 'export_csv') {
 	$companystatic = new Client($db);
 	$userstatic = new User($db);
 
-// Bank
-		foreach ( $tabpay as $key => $val ) {
-			$date = dol_print_date($db->jdate($val["date"]), 'day');
-			
-			$reflabel = $val["ref"];
-			if ($reflabel == '(SupplierInvoicePayment)') {
-				$reflabel = $langs->trans('Supplier');
-			}
-			if ($reflabel == '(CustomerInvoicePayment)') {
-				$reflabel = $langs->trans('Customer');
-			}
-			if ($reflabel == '(SocialContributionPayment)') {
-				$reflabel = $langs->trans('SocialContribution');
-			}
-			if ($reflabel == '(DonationPayment)') {
-				$reflabel = $langs->trans('Donation');
-			}
-			if ($reflabel == '(SubscriptionPayment)') {
-				$reflabel = $langs->trans('Subscription');
-			}
-			if ($reflabel == '(ExpenseReportPayment)') {
-				$reflabel = $langs->trans('Employee');
-			}
+    // Bank
+	foreach ( $tabpay as $key => $val ) {
+		$date = dol_print_date($db->jdate($val["date"]), 'day');
 
-			$companystatic->id = $tabcompany[$key]['id'];
-			$companystatic->name = $tabcompany[$key]['name'];
+		$reflabel = $val["ref"];
+		if ($reflabel == '(SupplierInvoicePayment)') {
+			$reflabel = $langs->trans('Supplier');
+		}
+		if ($reflabel == '(CustomerInvoicePayment)') {
+			$reflabel = $langs->trans('Customer');
+		}
+		if ($reflabel == '(SocialContributionPayment)') {
+			$reflabel = $langs->trans('SocialContribution');
+		}
+		if ($reflabel == '(DonationPayment)') {
+			$reflabel = $langs->trans('Donation');
+		}
+		if ($reflabel == '(SubscriptionPayment)') {
+			$reflabel = $langs->trans('Subscription');
+		}
+		if ($reflabel == '(ExpenseReportPayment)') {
+			$reflabel = $langs->trans('Employee');
+		}
 
-			// Bank
-			foreach ( $tabbq[$key] as $k => $mt ) {
-				print '"' . $journal . '"' . $sep;
-				print '"' . $date . '"' . $sep;
-				print '"' . $val["type_payment"] . '"' . $sep;
-				print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
-				print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
-				print "  " . $sep;
-				if ($companystatic->name == '') {
-					print '"' . $langs->trans('Bank') . " - " . utf8_decode($reflabel) . '"' . $sep;
-				} else {
-					print '"' . $langs->trans("Bank") . ' - ' . utf8_decode($companystatic->name) . '"' . $sep;
-				}
-				print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
-				print '"' . ($mt < 0 ? price(- $mt) : '') . '"';
-				print "\n";
-			}
+		$companystatic->id = $tabcompany[$key]['id'];
+		$companystatic->name = $tabcompany[$key]['name'];
 
-			// Third party
-			if (is_array($tabtp[$key])) {
-				foreach ( $tabtp[$key] as $k => $mt ) {
-					if ($mt) {
-						print '"' . $journal . '"' . $sep;
-						print '"' . $date . '"' . $sep;
-						print '"' . $val["type_payment"] . '"' . $sep;
-						print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
-						
-						if ($tabtype[$key] == 'payment_supplier') {
-						print '"' . $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER . '"' . $sep;
-						} else if($tabtype[$key] == 'payment') {
-						print '"' . $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER . '"' . $sep;
-						} else {
-						print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
-						}
-						
-						
-						
-						print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
-						if ($companystatic->name == '') {
-							print '"' . $langs->trans('ThirdParty') . " - " . utf8_decode($reflabel) . '"' . $sep;
-						} else {
-							print '"' . $langs->trans('ThirdParty') . " - " . utf8_decode($companystatic->name) . '"' . $sep;
-						}
-						print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
-						print '"' . ($mt >= 0 ? price($mt) : '') . '"';
-						print "\n";
-					}
-				}
+		// Bank
+		foreach ( $tabbq[$key] as $k => $mt ) {
+			print '"' . $journal . '"' . $sep;
+			print '"' . $date . '"' . $sep;
+			print '"' . $val["type_payment"] . '"' . $sep;
+			print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
+			print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
+			print "  " . $sep;
+			if ($companystatic->name == '') {
+				print '"' . $langs->trans('Bank') . " - " . utf8_decode($reflabel) . '"' . $sep;
 			} else {
-				foreach ( $tabbq[$key] as $k => $mt ) {
+				print '"' . $langs->trans("Bank") . ' - ' . utf8_decode($companystatic->name) . '"' . $sep;
+			}
+			print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
+			print '"' . ($mt < 0 ? price(- $mt) : '') . '"';
+			print "\n";
+		}
+
+		// Third party
+		if (is_array($tabtp[$key])) {
+			foreach ( $tabtp[$key] as $k => $mt ) {
+				if ($mt) {
 					print '"' . $journal . '"' . $sep;
 					print '"' . $date . '"' . $sep;
-					print '"' . $val["ref"] . '"' . $sep;
-					print '"' . length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) . '"' . $sep;
-					print '"' . length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) . '"' . $sep;
-					print "  " . $sep;
-					if ($companystatic->name == '') {
-						print '"' . $langs->trans("Bank") . ' - ' . utf8_decode($reflabel) . '"' . $sep;
+					print '"' . $val["type_payment"] . '"' . $sep;
+					print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
+
+					if ($tabtype[$key] == 'payment_supplier') {
+					print '"' . $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER . '"' . $sep;
+					} else if($tabtype[$key] == 'payment') {
+					print '"' . $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER . '"' . $sep;
 					} else {
-						print '"' . $langs->trans("Bank") . ' - ' . utf8_decode($companystatic->name) . '"' . $sep;
+					print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
+					}
+
+
+
+					print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
+					if ($companystatic->name == '') {
+						print '"' . $langs->trans('ThirdParty') . " - " . utf8_decode($reflabel) . '"' . $sep;
+					} else {
+						print '"' . $langs->trans('ThirdParty') . " - " . utf8_decode($companystatic->name) . '"' . $sep;
 					}
 					print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
 					print '"' . ($mt >= 0 ? price($mt) : '') . '"';
 					print "\n";
 				}
 			}
+		} else {
+			foreach ( $tabbq[$key] as $k => $mt ) {
+				print '"' . $journal . '"' . $sep;
+				print '"' . $date . '"' . $sep;
+				print '"' . $val["ref"] . '"' . $sep;
+				print '"' . length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) . '"' . $sep;
+				print '"' . length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) . '"' . $sep;
+				print "  " . $sep;
+				if ($companystatic->name == '') {
+					print '"' . $langs->trans("Bank") . ' - ' . utf8_decode($reflabel) . '"' . $sep;
+				} else {
+					print '"' . $langs->trans("Bank") . ' - ' . utf8_decode($companystatic->name) . '"' . $sep;
+				}
+				print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
+				print '"' . ($mt >= 0 ? price($mt) : '') . '"';
+				print "\n";
+			}
 		}
 	}
+}
 
 
 /*

From 5dd8d1c4ef0d471788f9815bd4cf44f22795e2d8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Jun 2017 17:56:45 +0200
Subject: [PATCH 399/438] Rename button to make clear for user that the export
 is not the real journal but a temporary situation.

---
 htdocs/accountancy/journal/bankjournal.php      |  2 +-
 htdocs/accountancy/journal/purchasesjournal.php |  6 +++---
 htdocs/accountancy/journal/sellsjournal.php     | 16 ++++++++--------
 htdocs/langs/en_US/accountancy.lang             |  1 +
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 86931ed31c0..10467294052 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -752,7 +752,7 @@ if (empty($action) || $action == 'view') {
 
 	print '<div class="tabsAction tabsActionNoBottom">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
-	print '<input type="button" class="butAction" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
+	print '<input type="button" class="butAction" value="' . $langs->trans("ExportDraftJournal") . '" onclick="launch_export();" />';
 	print '</div>';
 
 	// TODO Avoid using js. We can use a direct link with $param
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 06e681285b2..c3ed681308c 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -109,7 +109,7 @@ if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 }
 if ($date_start && $date_end)
 	$sql .= " AND f.datef >= '" . $db->idate($date_start) . "' AND f.datef <= '" . $db->idate($date_end) . "'";
-if ($in_bookkeeping == 'yes')    
+if ($in_bookkeeping == 'yes')
 	$sql .= " AND (f.rowid NOT IN (SELECT fk_doc FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab  WHERE ab.doc_type='supplier_invoice') )";
 $sql .= " ORDER BY f.datef";
 
@@ -467,7 +467,7 @@ if ($action == 'export_csv') {
 				print '"' . $journal_label . '"' ;
 				print "\n";
 			}
-			
+
 		}
 	}
 
@@ -513,7 +513,7 @@ if (empty($action) || $action == 'view') {
 	else {
 	    print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
 	}
-	print '<input type="button" class="butAction" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
+	print '<input type="button" class="butAction" value="' . $langs->trans("ExportDraftJournal") . '" onclick="launch_export();" />';
 	print '</div>';
 
 	print '
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 720e020f7c8..c77d9305d12 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -114,7 +114,7 @@ if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 $sql .= " AND fd.product_type IN (0,1)";
 if ($date_start && $date_end)
 	$sql .= " AND f.datef >= '" . $db->idate($date_start) . "' AND f.datef <= '" . $db->idate($date_end) . "'";
-if ($in_bookkeeping == 'yes')    
+if ($in_bookkeeping == 'yes')
 	$sql .= " AND (f.rowid NOT IN (SELECT fk_doc FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab  WHERE ab.doc_type='customer_invoice') )";
 $sql .= " ORDER BY f.datef";
 
@@ -408,7 +408,7 @@ if ($action == 'export_csv') {
 
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
 	$sell_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
-	
+
 
 	include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';
 
@@ -424,7 +424,7 @@ if ($action == 'export_csv') {
 			$invoicestatic->ref = $val["ref"];
 
 			$date = dol_print_date($val["date"], 'day');
-		
+
 			foreach ( $tabttc[$key] as $k => $mt ) {
 				print '"' . $key . '"' . $sep;
                 print '"' . $date . '"' . $sep;
@@ -445,7 +445,7 @@ if ($action == 'export_csv') {
 			foreach ( $tabht[$key] as $k => $mt ) {
 				$accountingaccount = new AccountingAccount($db);
 				$accountingaccount->fetch(null, $k, true);
-				
+
 
 				if ($mt) {
 					print '"' . $key . '"' . $sep;
@@ -466,9 +466,9 @@ if ($action == 'export_csv') {
 
 			// VAT
 			foreach ( $tabtva[$key] as $k => $mt ) {
-			
-			
-			
+
+
+
 				if ($mt) {
 					print '"' . $key . '"' . $sep;
                     print '"' . $date . '"' . $sep;
@@ -523,7 +523,7 @@ if (empty($action) || $action == 'view') {
 	else {
 	   print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
 	}
-	print '<input type="button" class="butAction" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
+	print '<input type="button" class="butAction" value="' . $langs->trans("ExportDraftJournal") . '" onclick="launch_export();" />';
 	print '</div>';
 
 	print '
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index f9ec68a1689..bcbac85c17d 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -221,6 +221,7 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use
 ## Export
 Exports=Exports
 Export=Export
+ExportDraftJournal=Export draft journal
 Modelcsv=Model of export
 OptionsDeactivatedForThisExportModel=For this export model, options are deactivated
 Selectmodelcsv=Select a model of export

From d186aed96cfcff171a936b7b1d8b424e82e3d108 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Jun 2017 18:23:27 +0200
Subject: [PATCH 400/438] Fix: date must be stored into a date field (error
 with pgsql). import_key is reserved for "import" process.

---
 htdocs/accountancy/class/bookkeeping.class.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 843e15a5dd7..51ef317e917 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -270,7 +270,7 @@ class BookKeeping extends CommonObject
 				$sql .= ", montant";
 				$sql .= ", sens";
 				$sql .= ", fk_user_author";
-				$sql .= ", import_key";
+				$sql .= ", date_creation";
 				$sql .= ", code_journal";
 				$sql .= ", journal_label";
 				$sql .= ", piece_num";
@@ -430,6 +430,11 @@ class BookKeeping extends CommonObject
 		if (empty($this->debit)) $this->debit = 0;
 		if (empty($this->credit)) $this->credit = 0;
 
+		$now = dol_now();
+		if (empty($this->date_create)) {
+		    $this->date_create = $now;
+		}
+
 		// Check parameters
 		// Put here code to add control on parameters values
 
@@ -451,7 +456,7 @@ class BookKeeping extends CommonObject
 		$sql .= 'montant,';
 		$sql .= 'sens,';
 		$sql .= 'fk_user_author,';
-		$sql .= 'import_key,';
+		$sql .= 'date_creation,';
 		$sql .= 'code_journal,';
 		$sql .= 'journal_label,';
 		$sql .= 'piece_num,';
@@ -473,7 +478,7 @@ class BookKeeping extends CommonObject
 		$sql .= ' ' . (! isset($this->montant) ? 'NULL' : $this->montant ). ',';
 		$sql .= ' ' . (! isset($this->sens) ? 'NULL' : "'" . $this->db->escape($this->sens) . "'") . ',';
 		$sql .= ' ' . $user->id . ',';
-		$sql .= ' ' . (! isset($this->import_key) ? 'NULL' : "'" . $this->db->escape($this->import_key) . "'") . ',';
+		$sql .= ' ' . "'" . $this->db->idate($this->date_create) . "',";
 		$sql .= ' ' . (empty($this->code_journal) ? 'NULL' : "'" . $this->db->escape($this->code_journal) . "'") . ',';
 		$sql .= ' ' . (empty($this->journal_label) ? 'NULL' : "'" . $this->db->escape($this->journal_label) . "'") . ',';
 		$sql .= ' ' . (empty($this->piece_num) ? 'NULL' : $this->db->escape($this->piece_num)).',';

From 2f9cc1c919e4ad73771016afb8c0c9824460cc85 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Jun 2017 18:35:10 +0200
Subject: [PATCH 401/438] Fix avoid errors with postgresql

---
 htdocs/install/step5.php | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/htdocs/install/step5.php b/htdocs/install/step5.php
index 78d29584a30..81700c14824 100644
--- a/htdocs/install/step5.php
+++ b/htdocs/install/step5.php
@@ -219,12 +219,22 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
 
             if ($success)
             {
+                // Insert MAIN_VERSION_FIRST_INSTALL in a dedicated transaction. So if it fails (when first install was already done), we can do other following requests.
                 $db->begin();
-
                 dolibarr_install_syslog('step5: set MAIN_VERSION_FIRST_INSTALL const to ' . $targetversion, LOG_DEBUG);
                 $resql=$db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) values(".$db->encrypt('MAIN_VERSION_FIRST_INSTALL',1).",".$db->encrypt($targetversion,1).",'chaine',0,'Dolibarr version when first install',0)");
-                //if (! $resql) dol_print_error($db,'Error in setup program');      // We ignore errors. Key may already exists
-                $conf->global->MAIN_VERSION_FIRST_INSTALL=$targetversion;
+                if ($resql)
+                {
+                    $conf->global->MAIN_VERSION_FIRST_INSTALL=$targetversion;
+                    $db->commit();
+                }
+                else
+                {
+                    //if (! $resql) dol_print_error($db,'Error in setup program');      // We ignore errors. Key may already exists
+                    $db->commit();
+                }
+
+                $db->begin();
 
                 dolibarr_install_syslog('step5: set MAIN_VERSION_LAST_INSTALL const to ' . $targetversion, LOG_DEBUG);
                 $resql=$db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_VERSION_LAST_INSTALL'");

From 7e6e0ee3a4dc99fa4af21265b09c71b7dcfb1548 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Jun 2017 20:02:46 +0200
Subject: [PATCH 402/438] Fix link to image of MD files

---
 htdocs/core/modules/DolibarrModules.class.php | 7 ++++++-
 htdocs/langs/en_US/modulebuilder.lang         | 3 ++-
 htdocs/modulebuilder/index.php                | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index f05b549fe18..09191609f00 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -652,7 +652,12 @@ class DolibarrModules           // Can not be abstract, because we need to insta
             if ((float) DOL_VERSION >= 6.0)
             {
                 @include_once DOL_DOCUMENT_ROOT.'/core/lib/parsemd.lib.php';
-                $content = dolMd2Html($content, 'parsedown', array('doc/'=>dol_buildpath(strtolower($this->name).'/doc/', 1)));
+                $content = dolMd2Html($content, 'parsedown',
+                    array(
+                        'doc/'=>dol_buildpath(strtolower($this->name).'/doc/', 1),
+                        'img/'=>dol_buildpath(strtolower($this->name).'/img/', 1),
+                        'images/'=>dol_buildpath(strtolower($this->name).'/imgages/', 1),
+                    ));
             }
             else
             {
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index fe636fd4f2d..1c3a7932263 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -33,4 +33,5 @@ ApiClassFile=File for PHP API class
 PageForList=PHP page for list of record
 PageForCreateEditView=PHP page to create/edit/view a record
 PathToModulePackage=Path to zip of module/application package
-SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
\ No newline at end of file
+SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
+PackageFileNotYetGenerated=Package file not yet generated
\ No newline at end of file
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 4e8f1c323ee..e0e9873337f 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -246,11 +246,11 @@ if ($dirins && $action == 'confirm_delete')
 
         if ($result > 0)
         {
-            setEventMessages($langs->trans("DirDeleted"), null);
+            setEventMessages($langs->trans("DirWasRemoved", $modulelowercase), null);
         }
         else
         {
-            setEventMessages($langs->trans("NothingDeleted"), null, 'warnings');
+            setEventMessages($langs->trans("PurgeNothingToDelete"), null, 'warnings');
         }
     }
 

From 22fabe5a3a7d3ef3613d7bc4a2a4e7210bf82bb2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Jun 2017 20:14:48 +0200
Subject: [PATCH 403/438] Copyright in modulebuilder

---
 htdocs/modulebuilder/index.php                |  6 +-
 htdocs/modulebuilder/template/admin/about.php |  3 +-
 htdocs/modulebuilder/template/admin/setup.php |  3 +-
 .../template/class/actions_mymodule.class.php |  3 +-
 .../template/class/api_myobject.class.php     | 69 ++++++++++---------
 .../template/core/boxes/mybox.php             |  3 +-
 .../core/modules/modMyModule.class.php        |  5 +-
 .../template/css/mymodule.css.php             |  3 +-
 .../modulebuilder/template/js/mymodule.js.php |  3 +-
 .../template/langs/en_US/mymodule.lang        |  3 +-
 .../template/langs/fr_FR/mymodule.lang        |  3 +-
 .../template/lib/mymodule.lib.php             |  3 +-
 .../template/sql/llx_myobject.key.sql         |  3 +-
 .../template/sql/llx_myobject.sql             |  3 +-
 .../template/sql/update_x.x.x-y.y.y.sql       |  3 +-
 15 files changed, 53 insertions(+), 63 deletions(-)

diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index e0e9873337f..caa99d4b089 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -51,6 +51,7 @@ $dirins = $tmp[0];
 
 $FILEFLAG='modulebuilder.txt';
 
+$now=dol_now();
 
 /*
  * Actions
@@ -106,7 +107,7 @@ if ($dirins && $action == 'initmodule' && $modulename)
     // Edit PHP files
     if (! $error)
     {
-	    $listofphpfilestoedit = dol_dir_list($destdir, 'files', 1, '\.(php|MD|js)$', '', 'fullname', SORT_ASC, 0, 1);
+	    $listofphpfilestoedit = dol_dir_list($destdir, 'files', 1, '\.(php|MD|js|sql|txt|xml|lang)$', '', 'fullname', SORT_ASC, 0, 1);
 	    foreach($listofphpfilestoedit as $phpfileval)
 	    {
 	        //var_dump($phpfileval['fullname']);
@@ -116,7 +117,8 @@ if ($dirins && $action == 'initmodule' && $modulename)
 	        	'MYMODULE'=>strtoupper($modulename),
 	        	'My module'=>$modulename,
 	        	'htdocs/modulebuilder/template/'=>'',
-	        );
+                '---Put here your own copyright and developer email---'=>dol_print_date($now,'%Y').' '.$user->getFullName($langs).($user->email?' <'.$user->email.'>':'')
+	    	);
 
 
 	        $result=dolReplaceInFile($phpfileval['fullname'], $arrayreplacement);
diff --git a/htdocs/modulebuilder/template/admin/about.php b/htdocs/modulebuilder/template/admin/about.php
index d73fa237b88..43194ad23e9 100644
--- a/htdocs/modulebuilder/template/admin/about.php
+++ b/htdocs/modulebuilder/template/admin/about.php
@@ -1,6 +1,5 @@
 <?php
-/* <one line to give the program's name and a brief idea of what it does.>
- * Copyright (C) <year>  <name of author>
+/* Copyright (C) ---Put here your own copyright and developer email---
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index 9e9dbdaf1ac..79d761b3297 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -1,6 +1,5 @@
 <?php
-/* <one line to give the program's name and a brief idea of what it does.>
- * Copyright (C) <year>  <name of author>
+/* Copyright (C) ---Put here your own copyright and developer email---
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/htdocs/modulebuilder/template/class/actions_mymodule.class.php b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
index c6ebcae40e8..b8b43f1359d 100644
--- a/htdocs/modulebuilder/template/class/actions_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
@@ -1,6 +1,5 @@
 <?php
-/* <one line to give the program's name and a brief idea of what it does.>
- * Copyright (C) <year>  <name of author>
+/* Copyright (C) ---Put here your own copyright and developer email---
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/htdocs/modulebuilder/template/class/api_myobject.class.php b/htdocs/modulebuilder/template/class/api_myobject.class.php
index 7f5ee413892..44e2dd2fcc4 100644
--- a/htdocs/modulebuilder/template/class/api_myobject.class.php
+++ b/htdocs/modulebuilder/template/class/api_myobject.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
+ * Copyright (C) ---Put here your own copyright and developer email---
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,18 +23,18 @@ use Luracast\Restler\RestException;
  * \ingroup mymodule
  * \brief   File for API management of myobject.
  */
- 
+
 /**
  * API class for mymodule myobject
  *
  * @smart-auto-routing false
- * @access protected 
+ * @access protected
  * @class  DolibarrApiAccess {@requires user,external}
  */
 class MyObjectApi extends DolibarrApi
 {
     /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object 
+     * @var array   $FIELDS     Mandatory fields, checked when create and update object
      */
     static $FIELDS = array(
         'name'
@@ -48,7 +49,7 @@ class MyObjectApi extends DolibarrApi
      * Constructor
      *
      * @url     GET myobject/
-     * 
+     *
      */
     function __construct()
     {
@@ -64,21 +65,21 @@ class MyObjectApi extends DolibarrApi
      *
      * @param 	int 	$id ID of myobject
      * @return 	array|mixed data without useless information
-	 * 
+	 *
      * @url	GET myobject/{id}
      * @throws 	RestException
      */
     function get($id)
-    {		
+    {
 		if(! DolibarrApiAccess::$user->rights->myobject->read) {
 			throw new RestException(401);
 		}
-			
+
         $result = $this->myobject->fetch($id);
         if( ! $result ) {
             throw new RestException(404, 'MyObject not found');
         }
-		
+
 		if( ! DolibarrApi::_checkAccessToResource('myobject',$this->myobject->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
@@ -88,9 +89,9 @@ class MyObjectApi extends DolibarrApi
 
     /**
      * List myobjects
-     * 
+     *
      * Get a list of myobjects
-     * 
+     *
      * @param int		$mode		Use this param to filter list
      * @param string	$sortfield	Sort field
      * @param string	$sortorder	Sort order
@@ -103,22 +104,22 @@ class MyObjectApi extends DolibarrApi
      */
     function index($mode, $sortfield = "t.rowid", $sortorder = 'ASC', $limit = 0, $page = 0, $sqlfilters = '') {
         global $db, $conf;
-        
+
         $obj_ret = array();
-        
+
         $socid = DolibarrApiAccess::$user->societe_id ? DolibarrApiAccess::$user->societe_id : '';
-            
+
         // If the internal user must only see his customers, force searching by him
         if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
 
         $sql = "SELECT s.rowid";
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
         $sql.= " FROM ".MAIN_DB_PREFIX."myobject as s";
-        
+
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
         $sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
         $sql.= " WHERE s.fk_stcomm = st.id";
-        
+
 		// Example of use $mode
         //if ($mode == 1) $sql.= " AND s.client IN (1, 3)";
         //if ($mode == 2) $sql.= " AND s.client IN (2, 3)";
@@ -175,13 +176,13 @@ class MyObjectApi extends DolibarrApi
         }
 		return $obj_ret;
     }
-    
+
     /**
      * Create myobject object
      *
      * @param array $request_data   Request datas
      * @return int  ID of myobject
-     * 
+     *
      * @url	POST myobject/
      */
     function post($request_data = NULL)
@@ -191,7 +192,7 @@ class MyObjectApi extends DolibarrApi
 		}
         // Check mandatory fields
         $result = $this->_validate($request_data);
-        
+
         foreach($request_data as $field => $value) {
             $this->myobject->$field = $value;
         }
@@ -205,9 +206,9 @@ class MyObjectApi extends DolibarrApi
      * Update myobject
      *
      * @param int   $id             Id of myobject to update
-     * @param array $request_data   Datas   
-     * @return int 
-     * 
+     * @param array $request_data   Datas
+     * @return int
+     *
      * @url	PUT myobject/{id}
      */
     function put($id, $request_data = NULL)
@@ -215,12 +216,12 @@ class MyObjectApi extends DolibarrApi
         if(! DolibarrApiAccess::$user->rights->myobject->create) {
 			throw new RestException(401);
 		}
-        
+
         $result = $this->myobject->fetch($id);
         if( ! $result ) {
             throw new RestException(404, 'MyObject not found');
         }
-		
+
 		if( ! DolibarrApi::_checkAccessToResource('myobject',$this->myobject->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
@@ -228,19 +229,19 @@ class MyObjectApi extends DolibarrApi
         foreach($request_data as $field => $value) {
             $this->myobject->$field = $value;
         }
-        
+
         if($this->myobject->update($id, DolibarrApiAccess::$user))
             return $this->get ($id);
-        
+
         return false;
     }
-    
+
     /**
      * Delete myobject
      *
      * @param   int     $id   MyObject ID
      * @return  array
-     * 
+     *
      * @url	DELETE myobject/{id}
      */
     function delete($id)
@@ -252,31 +253,31 @@ class MyObjectApi extends DolibarrApi
         if( ! $result ) {
             throw new RestException(404, 'MyObject not found');
         }
-		
+
 		if( ! DolibarrApi::_checkAccessToResource('myobject',$this->myobject->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
-        
+
         if( !$this->myobject->delete($id))
         {
             throw new RestException(500);
         }
-        
+
          return array(
             'success' => array(
                 'code' => 200,
                 'message' => 'MyObject deleted'
             )
         );
-        
+
     }
-    
+
     /**
      * Validate fields before create or update object
-     * 
+     *
      * @param array $data   Data to validate
      * @return array
-     * 
+     *
      * @throws RestException
      */
     function _validate($data)
diff --git a/htdocs/modulebuilder/template/core/boxes/mybox.php b/htdocs/modulebuilder/template/core/boxes/mybox.php
index 7200d07559a..a02d041130d 100644
--- a/htdocs/modulebuilder/template/core/boxes/mybox.php
+++ b/htdocs/modulebuilder/template/core/boxes/mybox.php
@@ -1,6 +1,5 @@
 <?php
-/* <one line to give the program's name and a brief idea of what it does.>
- * Copyright (C) <year>  <name of author>
+/* Copyright (C) ---Put here your own copyright and developer email---
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
index 60889bdf279..8b283d1d695 100644
--- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
+++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
@@ -1,7 +1,6 @@
 <?php
-/* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2016 Regis Houssin        <regis.houssin@capnetworks.com>
+/* Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/htdocs/modulebuilder/template/css/mymodule.css.php b/htdocs/modulebuilder/template/css/mymodule.css.php
index 3722fc1e06e..e010bbfe920 100644
--- a/htdocs/modulebuilder/template/css/mymodule.css.php
+++ b/htdocs/modulebuilder/template/css/mymodule.css.php
@@ -1,6 +1,5 @@
 <?php
-/* <one line to give the program's name and a brief idea of what it does.>
- * Copyright (C) <year>  <name of author>
+/* Copyright (C) ---Put here your own copyright and developer email---
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/htdocs/modulebuilder/template/js/mymodule.js.php b/htdocs/modulebuilder/template/js/mymodule.js.php
index 2d6a940c373..122b3978631 100644
--- a/htdocs/modulebuilder/template/js/mymodule.js.php
+++ b/htdocs/modulebuilder/template/js/mymodule.js.php
@@ -1,6 +1,5 @@
 <?php
-/* <one line to give the program's name and a brief idea of what it does.>
- * Copyright (C) <year>  <name of author>
+/* Copyright (C) ---Put here your own copyright and developer email---
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/htdocs/modulebuilder/template/langs/en_US/mymodule.lang b/htdocs/modulebuilder/template/langs/en_US/mymodule.lang
index c33f2453fc4..478d589a7e6 100644
--- a/htdocs/modulebuilder/template/langs/en_US/mymodule.lang
+++ b/htdocs/modulebuilder/template/langs/en_US/mymodule.lang
@@ -1,5 +1,4 @@
-# <one line to give the program's name and a brief idea of what it does.>
-# Copyright (C) <year>  <name of author>
+# Copyright (C) ---Put here your own copyright and developer email---
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/htdocs/modulebuilder/template/langs/fr_FR/mymodule.lang b/htdocs/modulebuilder/template/langs/fr_FR/mymodule.lang
index 06e7ba33885..c946ad6691c 100644
--- a/htdocs/modulebuilder/template/langs/fr_FR/mymodule.lang
+++ b/htdocs/modulebuilder/template/langs/fr_FR/mymodule.lang
@@ -1,5 +1,4 @@
-# <one line to give the program's name and a brief idea of what it does.>
-# Copyright (C) <year>  <name of author>
+# Copyright (C) ---Put here your own copyright and developer email---
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/htdocs/modulebuilder/template/lib/mymodule.lib.php b/htdocs/modulebuilder/template/lib/mymodule.lib.php
index ac4e0bf4a66..3c88bcdea67 100644
--- a/htdocs/modulebuilder/template/lib/mymodule.lib.php
+++ b/htdocs/modulebuilder/template/lib/mymodule.lib.php
@@ -1,6 +1,5 @@
 <?php
-/* <one line to give the program's name and a brief idea of what it does.>
- * Copyright (C) <year>  <name of author>
+/* Copyright (C) ---Put here your own copyright and developer email---
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/htdocs/modulebuilder/template/sql/llx_myobject.key.sql b/htdocs/modulebuilder/template/sql/llx_myobject.key.sql
index 9f1c8c20ea2..812a98090af 100644
--- a/htdocs/modulebuilder/template/sql/llx_myobject.key.sql
+++ b/htdocs/modulebuilder/template/sql/llx_myobject.key.sql
@@ -1,5 +1,4 @@
--- <one line to give the program's name and a brief idea of what it does.>
--- Copyright (C) <year>  <name of author>
+-- Copyright (C) ---Put here your own copyright and developer email---
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
diff --git a/htdocs/modulebuilder/template/sql/llx_myobject.sql b/htdocs/modulebuilder/template/sql/llx_myobject.sql
index edcd7a7c26d..8cba239766f 100644
--- a/htdocs/modulebuilder/template/sql/llx_myobject.sql
+++ b/htdocs/modulebuilder/template/sql/llx_myobject.sql
@@ -1,5 +1,4 @@
--- <one line to give the program's name and a brief idea of what it does.>
--- Copyright (C) <year>  <name of author>
+-- Copyright (C) ---Put here your own copyright and developer email---
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
diff --git a/htdocs/modulebuilder/template/sql/update_x.x.x-y.y.y.sql b/htdocs/modulebuilder/template/sql/update_x.x.x-y.y.y.sql
index 6d5bb8155b1..494de5a2b17 100644
--- a/htdocs/modulebuilder/template/sql/update_x.x.x-y.y.y.sql
+++ b/htdocs/modulebuilder/template/sql/update_x.x.x-y.y.y.sql
@@ -1,5 +1,4 @@
--- <one line to give the program's name and a brief idea of what it does.>
--- Copyright (C) <year>  <name of author>
+-- Copyright (C) ---Put here your own copyright and developer email---
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by

From 8182f5fb2a993be256572a6c3928055207d1e0f0 Mon Sep 17 00:00:00 2001
From: Darkjeff <jeff@jeffinfo.com>
Date: Wed, 28 Jun 2017 16:35:14 +0200
Subject: [PATCH 404/438] update journal and supplier lines

---
 htdocs/accountancy/journal/bankjournal.php    |   2 +-
 .../accountancy/journal/purchasesjournal.php  |   2 +-
 htdocs/accountancy/journal/sellsjournal.php   |   2 +-
 htdocs/accountancy/supplier/lines.php         | 177 +++++++++---------
 4 files changed, 96 insertions(+), 87 deletions(-)

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 10467294052..ed8d1d7501a 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -738,7 +738,7 @@ if (empty($action) || $action == 'view') {
 	$builddate = time();
 	//$description = $langs->trans("DescFinanceJournal") . '<br>';
 	$description.= $langs->trans("DescJournalOnlyBindedVisible").'<br>';
-	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
+	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1). ' -  ' .$langs->trans("AlreadyInGeneralLedger").' '. $form->selectyesno('in_bookkeeping',$in_bookkeeping,0);
 
 	$varlink = 'id_journal=' . $id_journal;
 
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index c3ed681308c..e023e14a817 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -489,7 +489,7 @@ if (empty($action) || $action == 'view') {
 		$description .= $langs->trans("DepositsAreIncluded");
 	}
 
-	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
+	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1). ' -  ' .$langs->trans("AlreadyInGeneralLedger").' '. $form->selectyesno('in_bookkeeping',$in_bookkeeping,0);
 
 	$varlink = 'id_journal=' . $id_journal;
 
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index c77d9305d12..edaf3a87f27 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -505,7 +505,7 @@ if (empty($action) || $action == 'view') {
 		$description .= $langs->trans("DepositsAreNotIncluded");
 	else
 		$description .= $langs->trans("DepositsAreIncluded");
-	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
+	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1). ' -  ' .$langs->trans("AlreadyInGeneralLedger").' '. $form->selectyesno('in_bookkeeping',$in_bookkeeping,0);
 
 	$varlink = 'id_journal=' . $id_journal;
 
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 9c7a72cb94c..319da0a46c5 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -1,10 +1,10 @@
 <?php
 /* Copyright (C) 2013-2016 Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2013-2017 Alexandre Spangaro	<aspangaro@zendsi.com>
- * Copyright (C) 2014-2015 Ari Elbaz (elarifr)	<github@accedinfo.com>
+ * Copyright (C) 2013-2016 Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2014-2015 Ari Elbaz (elarifr)	<github@accedinfo.com>  
  * Copyright (C) 2013-2016 Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2014      Juanjo Menent		<jmenent@2byte.es>
- *
+ * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
+ *   
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
@@ -27,7 +27,7 @@
 require '../../main.inc.php';
 
 // Class
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
@@ -44,7 +44,6 @@ $langs->load("productbatch");
 $account_parent = GETPOST('account_parent');
 $changeaccount = GETPOST('changeaccount');
 // Search Getpost
-$search_lineid = GETPOST('search_lineid', 'int');
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_invoice = GETPOST('search_invoice', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
@@ -54,7 +53,7 @@ $search_account = GETPOST('search_account', 'alpha');
 $search_vat = GETPOST('search_vat', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int'):(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit') ? GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page', 'int');
@@ -76,7 +75,7 @@ if ($user->societe_id > 0)
 if (! $user->rights->accounting->bind->write)
 	accessforbidden();
 
-$formaccounting = new FormAccounting($db);
+$formventilation = new FormVentilation($db);
 
 
 /*
@@ -86,7 +85,6 @@ $formaccounting = new FormAccounting($db);
 // Purge search criteria
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
 {
-    $search_lineid = '';
 	$search_ref = '';
 	$search_invoice = '';
 	$search_label = '';
@@ -94,17 +92,19 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
 	$search_amount = '';
 	$search_account = '';
 	$search_vat = '';
+	$search_country = '';
+	$search_tvaintra = '';
 }
 
 if (is_array($changeaccount) && count($changeaccount) > 0) {
 	$error = 0;
-
+	
 	$db->begin();
-
+	
 	$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det as l";
 	$sql1 .= " SET l.fk_code_ventilation=" . GETPOST('account_parent');
 	$sql1 .= ' WHERE l.rowid IN (' . implode(',', $changeaccount) . ')';
-
+	
 	dol_syslog('accountancy/supplier/lines.php::changeaccount sql= ' . $sql1);
 	$resql1 = $db->query($sql1);
 	if (! $resql1) {
@@ -149,45 +149,50 @@ print '<script type="text/javascript">
 /*
  * Supplier Invoice lines
  */
-$sql = "SELECT f.rowid as facid, f.ref as facnumber, f.ref_supplier, f.libelle as invoice_label, f.datef,";
-$sql.= " l.rowid, l.fk_product, l.description, l.total_ht , l.qty, l.tva_tx, aa.label, aa.account_number, ";
-$sql.= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type";
-$sql.= " FROM " . MAIN_DB_PREFIX . "facture_fourn as f";
-$sql.= " , " . MAIN_DB_PREFIX . "accounting_account as aa";
-$sql.= " , " . MAIN_DB_PREFIX . "facture_fourn_det as l";
-$sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = l.fk_product";
-$sql.= " WHERE f.rowid = l.fk_facture_fourn and f.fk_statut >= 1 AND l.fk_code_ventilation <> 0 ";
-$sql.= " AND aa.rowid = l.fk_code_ventilation";
-if ($search_lineid) {
-    $sql .= natural_search("l.rowid", $search_lineid, 1);
-}
+$sql = "SELECT f.ref as facnumber, f.rowid as facid, l.fk_product, l.description, l.total_ht , l.qty, l.rowid, l.tva_tx, aa.label, aa.account_number, ";
+$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, co.label as country, s.tva_intra";
+$sql .= " FROM " . MAIN_DB_PREFIX . "facture_fourn_det as l";
+$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = l.fk_product";
+$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = l.fk_code_ventilation";
+$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facture_fourn as f ON f.rowid = l.fk_facture_fourn";
+$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
+$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_country as co ON co.rowid = s.fk_pays ";
+$sql .= " WHERE l.fk_code_ventilation > 0 ";
+$sql .= " AND f.fk_statut > 0";
+
 if (strlen(trim($search_invoice))) {
-	$sql .= natural_search("f.ref", $search_invoice);
+	$sql .= " AND f.ref like '%" . $search_invoice . "%'";
 }
 if (strlen(trim($search_ref))) {
-	$sql .= natural_search("p.ref", $search_ref);
+	$sql .= " AND p.ref like '%" . $search_ref . "%'";
 }
 if (strlen(trim($search_label))) {
-	$sql .= natural_search("p.label", $search_label);
+	$sql .= " AND p.label like '%" . $search_label . "%'";
 }
 if (strlen(trim($search_desc))) {
-	$sql .= natural_search("l.description", $search_desc);
+	$sql .= " AND l.description like '%" . $search_desc . "%'";
 }
 if (strlen(trim($search_amount))) {
-	$sql .= natural_search("l.total_ht", $search_amount, 1);
+	$sql .= " AND l.total_ht like '%" . $search_amount . "%'";
 }
 if (strlen(trim($search_account))) {
-	$sql .= natural_search("aa.account_number", $search_account, 1);
+	$sql .= " AND aa.account_number like '%" . $search_account . "%'";
 }
 if (strlen(trim($search_vat))) {
-	$sql .= natural_search("l.tva_tx", $search_vat, 1);
+	$sql .= " AND (l.tva_tx like '" . $search_vat . "%')";
 }
-$sql .= " AND f.entity IN (" . getEntity('facture_fourn', 0) . ")";  // We don't share object for accountancy
+if (strlen(trim($search_country))) {
+	$sql .= " AND (co.label like'" . $search_country . "%')";
+}
+if (strlen(trim($search_tvaintra))) {
+	$sql .= " AND (s.tva_intra like'" . $search_tvaintra . "%')";
+}
+$sql .= " AND f.entity IN (" . getEntity("facture_fourn", 0) . ")";  // We don't share object for accountancy
 
 $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
-$nbtotalofrecords = '';
+$nbtotalofrecords = -1;
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
     $result = $db->query($sql);
@@ -202,7 +207,7 @@ $result = $db->query($sql);
 if ($result) {
 	$num_lines = $db->num_rows($result);
 	$i = 0;
-
+	
 	$param='';
 	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
@@ -221,8 +226,8 @@ if ($result) {
 	if ($search_country)
 		$param .= "&search_country=" . $search_country;
 	if ($search_tvaintra)
-		$param .= "&search_tvaintra=" . $search_tvaintra;
-
+		$param .= "&search_tvaintra=" . $search_tvaintra;	
+	
 	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">' . "\n";
 	print '<input type="hidden" name="action" value="ventil">';
 	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -230,38 +235,20 @@ if ($result) {
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-	print '<input type="hidden" name="page" value="'.$page.'">';
-
+		
 	print_barre_liste($langs->trans("InvoiceLinesDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
-
+	
 	print $langs->trans("DescVentilDoneSupplier") . '<br>';
-
+	
 	print '<br><div class="inline-block divButAction">' . $langs->trans("ChangeAccount") . '<br>';
-	print $formaccounting->select_account(GETPOST('account_parent'), 'account_parent', 1);
+	print $formventilation->select_account(GETPOST('account_parent'), 'account_parent', 1);
 	print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("ChangeBinding") . '" /></div>';
-
+	
 	$moreforfilter = '';
-
+	
     print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-
-	print '<tr class="liste_titre_filter">';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_lineid" value="' . dol_escape_htmltag($search_lineid) . '""></td>';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="' . dol_escape_htmltag($search_invoice) . '"></td>';
-	print '<td class="liste_titre"></td>';
-	print '<td class="liste_titre"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_ref" value="' . dol_escape_htmltag($search_ref) . '"></td>';
-	//print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="' . dol_escape_htmltag($search_label) . '"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_desc" value="' . dol_escape_htmltag($search_desc) . '"></td>';
-	print '<td class="liste_titre" align="right"><input type="text" class="right flat maxwidth50" name="search_amount" value="' . dol_escape_htmltag($search_amount) . '"></td>';
-	print '<td class="liste_titre" align="center"><input type="text" class="right flat maxwidth50" name="search_vat" placeholder="%" size="1" value="' . dol_escape_htmltag($search_vat) . '"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_account" value="' . dol_escape_htmltag($search_account) . '"></td>';
-    print '<td class="liste_titre" align="center">';
-    $searchpicto=$form->showFilterButtons();
-    print $searchpicto;
-    print '</td>';
-	print "</tr>\n";
-
+	
 	print '<tr class="liste_titre">';
 	print_liste_field_titre($langs->trans("LineId"), $_SERVER["PHP_SELF"], "l.rowid", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Invoice"), $_SERVER["PHP_SELF"], "f.ref", "", $param, '', $sortfield, $sortorder);
@@ -273,71 +260,93 @@ if ($result) {
 	print_liste_field_titre($langs->trans("Amount"), $_SERVER["PHP_SELF"], "l.total_ht", "", $param, 'align="right"', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("VATRate"), $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, 'align="center"', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Account"), $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder);
-    $checkpicto=$form->showCheckAddButtons();
-	print_liste_field_titre($checkpicto, '', '', '', '', 'align="center"');
+	print_liste_field_titre($langs->trans("Country"), $_SERVER["PHP_SELF"], "co.label", "", $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("VATIntra"), $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre('', '', '', '', '', 'align="center"');
 	print "</tr>\n";
-
+	
+	print '<tr class="liste_titre">';
+    print '<td class="liste_titre"></td>';
+	print '<td><input type="text" class="flat maxwidth50" name="search_invoice" value="' . dol_escape_htmltag($search_invoice) . '"></td>';
+	print '<td class="liste_titre"></td>';
+	print '<td class="liste_titre"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_ref" value="' . dol_escape_htmltag($search_ref) . '"></td>';
+	//print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="' . dol_escape_htmltag($search_label) . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_desc" value="' . dol_escape_htmltag($search_desc) . '"></td>';
+	print '<td class="liste_titre" align="right"><input type="text" class="flat maxwidth50" name="search_amount" value="' . dol_escape_htmltag($search_amount) . '"></td>';
+	print '<td class="liste_titre" align="center"><input type="text" class="flat maxwidth50" name="search_vat" size="1" value="' . dol_escape_htmltag($search_vat) . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_account" value="' . dol_escape_htmltag($search_account) . '"></td>';
+	print '<td class="liste_titre" align="center"><input type="text" class="flat" name="search_country" value="' . $search_country . '"></td>';
+	print '<td class="liste_titre" align="center"><input type="text" class="flat" name="search_tavintra" value="' . $search_tavintra . '"></td>';
+    print '<td class="liste_titre" align="right">';
+    $searchpitco=$form->showFilterAndCheckAddButtons(1);
+    print $searchpitco;
+    print '</td>';
+	print "</tr>\n";
+	
 	$facturefournisseur_static = new FactureFournisseur($db);
 	$product_static = new Product($db);
-
-	while ($i < min($num_lines, $limit)) {
+	
+	$var = True;
+	while ( $i < min($num_lines, $limit) ) {
 		$objp = $db->fetch_object($result);
-
+		$var = ! $var;
 		$codecompta = length_accountg($objp->account_number) . ' - ' . $objp->label;
-
+		
 		$facturefournisseur_static->ref = $objp->facnumber;
 		$facturefournisseur_static->id = $objp->facid;
-
+		
 		$product_static->ref = $objp->product_ref;
 		$product_static->id = $objp->product_id;
 		$product_static->type = $objp->type;
 		$product_static->label = $objp->product_label;
-
-		print '<tr class="oddeven">';
-
+		
+		print '<tr '. $bc[$var].'>';
+		
 		print '<td>' . $objp->rowid . '</td>';
-
+		
 		// Ref Invoice
 		print '<td>' . $facturefournisseur_static->getNomUrl(1) . '</td>';
-
+		
 		print '<td>';
 		print $objp->invoice_label;
 		print '</td>';
-
+		
 		print '<td align="center">' . dol_print_date($db->jdate($objp->datef), 'day') . '</td>';
-
+		
 		// Ref Product
 		print '<td>';
 		if ($product_static->id)
 			print $product_static->getNomUrl(1);
 	    if ($objp->product_label) print '<br>'.$objp->product_label;
 		print '</td>';
-
+		
 		print '<td>';
 		$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->description));
-		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION) ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
+		$trunclength = defined('ACCOUNTING_LENGTH_DESCRIPTION') ? ACCOUNTING_LENGTH_DESCRIPTION : 32;
 		print $form->textwithtooltip(dol_trunc($text,$trunclength), $objp->description);
 		print '</td>';
-
+		
 		print '<td align="right">' . price($objp->total_ht) . '</td>';
 		print '<td align="center">' . price($objp->tva_tx) . '</td>';
 		print '<td align="left">';
 		print $codecompta . ' <a href="./card.php?id=' . $objp->rowid . '">';
 		print img_edit();
 		print '</a></td>';
-
-		print '<td class="center"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="' . $objp->rowid . '"/></td>';
-
+		print '<td align="right">' . $objp->country .'</td>';
+		print '<td align="center">' . $objp->tva_intra . '</td>';
+		print '<td align="right"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="' . $objp->rowid . '"/></td>';
+		
 		print "</tr>";
 		$i ++;
 	}
     print "</table>";
     print "</div>";
-
+    
     if ($nbtotalofrecords > $limit) {
         print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, '', 0, '', '', $limit, 1);
     }
-
+    
     print '</form>';
 } else {
 	print $db->error();

From 97da70e5830f7664e8a156a42e49be8d2203f7d2 Mon Sep 17 00:00:00 2001
From: Darkjeff <jeff@jeffinfo.com>
Date: Wed, 28 Jun 2017 16:38:06 +0200
Subject: [PATCH 405/438] bug lines supplier

---
 htdocs/accountancy/supplier/lines.php | 158 ++++++++++++++------------
 1 file changed, 83 insertions(+), 75 deletions(-)

diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 319da0a46c5..398d12503ab 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -1,10 +1,10 @@
 <?php
 /* Copyright (C) 2013-2016 Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2013-2016 Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
- * Copyright (C) 2014-2015 Ari Elbaz (elarifr)	<github@accedinfo.com>  
+ * Copyright (C) 2013-2017 Alexandre Spangaro	<aspangaro@zendsi.com>
+ * Copyright (C) 2014-2015 Ari Elbaz (elarifr)	<github@accedinfo.com>
  * Copyright (C) 2013-2016 Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
- *   
+ * Copyright (C) 2014      Juanjo Menent		<jmenent@2byte.es>
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
@@ -27,7 +27,7 @@
 require '../../main.inc.php';
 
 // Class
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
@@ -44,6 +44,7 @@ $langs->load("productbatch");
 $account_parent = GETPOST('account_parent');
 $changeaccount = GETPOST('changeaccount');
 // Search Getpost
+$search_lineid = GETPOST('search_lineid', 'int');
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_invoice = GETPOST('search_invoice', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
@@ -51,9 +52,11 @@ $search_desc = GETPOST('search_desc', 'alpha');
 $search_amount = GETPOST('search_amount', 'alpha');
 $search_account = GETPOST('search_account', 'alpha');
 $search_vat = GETPOST('search_vat', 'alpha');
+$search_country = GETPOST('search_country', 'alpha');
+$search_tvaintra = GETPOST('search_tvaintra', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit') ? GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int'):(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page', 'int');
@@ -75,7 +78,7 @@ if ($user->societe_id > 0)
 if (! $user->rights->accounting->bind->write)
 	accessforbidden();
 
-$formventilation = new FormVentilation($db);
+$formaccounting = new FormAccounting($db);
 
 
 /*
@@ -85,6 +88,7 @@ $formventilation = new FormVentilation($db);
 // Purge search criteria
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
 {
+    $search_lineid = '';
 	$search_ref = '';
 	$search_invoice = '';
 	$search_label = '';
@@ -98,13 +102,13 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
 
 if (is_array($changeaccount) && count($changeaccount) > 0) {
 	$error = 0;
-	
+
 	$db->begin();
-	
+
 	$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det as l";
 	$sql1 .= " SET l.fk_code_ventilation=" . GETPOST('account_parent');
 	$sql1 .= ' WHERE l.rowid IN (' . implode(',', $changeaccount) . ')';
-	
+
 	dol_syslog('accountancy/supplier/lines.php::changeaccount sql= ' . $sql1);
 	$resql1 = $db->query($sql1);
 	if (! $resql1) {
@@ -149,37 +153,40 @@ print '<script type="text/javascript">
 /*
  * Supplier Invoice lines
  */
-$sql = "SELECT f.ref as facnumber, f.rowid as facid, l.fk_product, l.description, l.total_ht , l.qty, l.rowid, l.tva_tx, aa.label, aa.account_number, ";
-$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, co.label as country, s.tva_intra";
+$sql = "SELECT f.rowid as facid, f.ref as facnumber, f.ref_supplier, f.libelle as invoice_label, f.datef, f.fk_soc,";
+$sql.= " l.rowid, l.fk_product, l.description, l.total_ht , l.qty, l.tva_tx, aa.label, aa.account_number, ";
+$sql.= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, co.label as country, s.tva_intra";
 $sql .= " FROM " . MAIN_DB_PREFIX . "facture_fourn_det as l";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = l.fk_product";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = l.fk_code_ventilation";
 $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facture_fourn as f ON f.rowid = l.fk_facture_fourn";
 $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_country as co ON co.rowid = s.fk_pays ";
-$sql .= " WHERE l.fk_code_ventilation > 0 ";
-$sql .= " AND f.fk_statut > 0";
-
+$sql.= " WHERE f.rowid = l.fk_facture_fourn and f.fk_statut >= 1 AND l.fk_code_ventilation <> 0 ";
+$sql.= " AND aa.rowid = l.fk_code_ventilation";
+if ($search_lineid) {
+    $sql .= natural_search("l.rowid", $search_lineid, 1);
+}
 if (strlen(trim($search_invoice))) {
-	$sql .= " AND f.ref like '%" . $search_invoice . "%'";
+	$sql .= natural_search("f.ref", $search_invoice);
 }
 if (strlen(trim($search_ref))) {
-	$sql .= " AND p.ref like '%" . $search_ref . "%'";
+	$sql .= natural_search("p.ref", $search_ref);
 }
 if (strlen(trim($search_label))) {
-	$sql .= " AND p.label like '%" . $search_label . "%'";
+	$sql .= natural_search("p.label", $search_label);
 }
 if (strlen(trim($search_desc))) {
-	$sql .= " AND l.description like '%" . $search_desc . "%'";
+	$sql .= natural_search("l.description", $search_desc);
 }
 if (strlen(trim($search_amount))) {
-	$sql .= " AND l.total_ht like '%" . $search_amount . "%'";
+	$sql .= natural_search("l.total_ht", $search_amount, 1);
 }
 if (strlen(trim($search_account))) {
-	$sql .= " AND aa.account_number like '%" . $search_account . "%'";
+	$sql .= natural_search("aa.account_number", $search_account, 1);
 }
 if (strlen(trim($search_vat))) {
-	$sql .= " AND (l.tva_tx like '" . $search_vat . "%')";
+	$sql .= natural_search("l.tva_tx", $search_vat, 1);
 }
 if (strlen(trim($search_country))) {
 	$sql .= " AND (co.label like'" . $search_country . "%')";
@@ -187,12 +194,12 @@ if (strlen(trim($search_country))) {
 if (strlen(trim($search_tvaintra))) {
 	$sql .= " AND (s.tva_intra like'" . $search_tvaintra . "%')";
 }
-$sql .= " AND f.entity IN (" . getEntity("facture_fourn", 0) . ")";  // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity('facture_fourn', 0) . ")";  // We don't share object for accountancy
 
 $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
-$nbtotalofrecords = -1;
+$nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
     $result = $db->query($sql);
@@ -207,7 +214,7 @@ $result = $db->query($sql);
 if ($result) {
 	$num_lines = $db->num_rows($result);
 	$i = 0;
-	
+
 	$param='';
 	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
@@ -226,8 +233,8 @@ if ($result) {
 	if ($search_country)
 		$param .= "&search_country=" . $search_country;
 	if ($search_tvaintra)
-		$param .= "&search_tvaintra=" . $search_tvaintra;	
-	
+		$param .= "&search_tvaintra=" . $search_tvaintra;
+
 	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">' . "\n";
 	print '<input type="hidden" name="action" value="ventil">';
 	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -235,20 +242,40 @@ if ($result) {
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-		
+	print '<input type="hidden" name="page" value="'.$page.'">';
+
 	print_barre_liste($langs->trans("InvoiceLinesDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
-	
+
 	print $langs->trans("DescVentilDoneSupplier") . '<br>';
-	
+
 	print '<br><div class="inline-block divButAction">' . $langs->trans("ChangeAccount") . '<br>';
-	print $formventilation->select_account(GETPOST('account_parent'), 'account_parent', 1);
+	print $formaccounting->select_account(GETPOST('account_parent'), 'account_parent', 1);
 	print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("ChangeBinding") . '" /></div>';
-	
+
 	$moreforfilter = '';
-	
+
     print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-	
+
+	print '<tr class="liste_titre_filter">';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_lineid" value="' . dol_escape_htmltag($search_lineid) . '""></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="' . dol_escape_htmltag($search_invoice) . '"></td>';
+	print '<td class="liste_titre"></td>';
+	print '<td class="liste_titre"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_ref" value="' . dol_escape_htmltag($search_ref) . '"></td>';
+	//print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="' . dol_escape_htmltag($search_label) . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_desc" value="' . dol_escape_htmltag($search_desc) . '"></td>';
+	print '<td class="liste_titre" align="right"><input type="text" class="right flat maxwidth50" name="search_amount" value="' . dol_escape_htmltag($search_amount) . '"></td>';
+	print '<td class="liste_titre" align="center"><input type="text" class="right flat maxwidth50" name="search_vat" placeholder="%" size="1" value="' . dol_escape_htmltag($search_vat) . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_account" value="' . dol_escape_htmltag($search_account) . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_country" value="' . dol_escape_htmltag($search_country) . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_tavintra" value="' . dol_escape_htmltag($search_tavintra) . '"></td>';
+    print '<td class="liste_titre" align="center">';
+    $searchpicto=$form->showFilterButtons();
+    print $searchpicto;
+    print '</td>';
+	print "</tr>\n";
+
 	print '<tr class="liste_titre">';
 	print_liste_field_titre($langs->trans("LineId"), $_SERVER["PHP_SELF"], "l.rowid", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Invoice"), $_SERVER["PHP_SELF"], "f.ref", "", $param, '', $sortfield, $sortorder);
@@ -262,71 +289,52 @@ if ($result) {
 	print_liste_field_titre($langs->trans("Account"), $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Country"), $_SERVER["PHP_SELF"], "co.label", "", $param, 'align="center"', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("VATIntra"), $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, 'align="center"', $sortfield, $sortorder);
-	print_liste_field_titre('', '', '', '', '', 'align="center"');
+    $checkpicto=$form->showCheckAddButtons();
+	print_liste_field_titre($checkpicto, '', '', '', '', 'align="center"');
 	print "</tr>\n";
-	
-	print '<tr class="liste_titre">';
-    print '<td class="liste_titre"></td>';
-	print '<td><input type="text" class="flat maxwidth50" name="search_invoice" value="' . dol_escape_htmltag($search_invoice) . '"></td>';
-	print '<td class="liste_titre"></td>';
-	print '<td class="liste_titre"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_ref" value="' . dol_escape_htmltag($search_ref) . '"></td>';
-	//print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="' . dol_escape_htmltag($search_label) . '"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_desc" value="' . dol_escape_htmltag($search_desc) . '"></td>';
-	print '<td class="liste_titre" align="right"><input type="text" class="flat maxwidth50" name="search_amount" value="' . dol_escape_htmltag($search_amount) . '"></td>';
-	print '<td class="liste_titre" align="center"><input type="text" class="flat maxwidth50" name="search_vat" size="1" value="' . dol_escape_htmltag($search_vat) . '"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_account" value="' . dol_escape_htmltag($search_account) . '"></td>';
-	print '<td class="liste_titre" align="center"><input type="text" class="flat" name="search_country" value="' . $search_country . '"></td>';
-	print '<td class="liste_titre" align="center"><input type="text" class="flat" name="search_tavintra" value="' . $search_tavintra . '"></td>';
-    print '<td class="liste_titre" align="right">';
-    $searchpitco=$form->showFilterAndCheckAddButtons(1);
-    print $searchpitco;
-    print '</td>';
-	print "</tr>\n";
-	
+
 	$facturefournisseur_static = new FactureFournisseur($db);
 	$product_static = new Product($db);
-	
-	$var = True;
-	while ( $i < min($num_lines, $limit) ) {
+
+	while ($i < min($num_lines, $limit)) {
 		$objp = $db->fetch_object($result);
-		$var = ! $var;
+
 		$codecompta = length_accountg($objp->account_number) . ' - ' . $objp->label;
-		
+
 		$facturefournisseur_static->ref = $objp->facnumber;
 		$facturefournisseur_static->id = $objp->facid;
-		
+
 		$product_static->ref = $objp->product_ref;
 		$product_static->id = $objp->product_id;
 		$product_static->type = $objp->type;
 		$product_static->label = $objp->product_label;
-		
-		print '<tr '. $bc[$var].'>';
-		
+
+		print '<tr class="oddeven">';
+
 		print '<td>' . $objp->rowid . '</td>';
-		
+
 		// Ref Invoice
 		print '<td>' . $facturefournisseur_static->getNomUrl(1) . '</td>';
-		
+
 		print '<td>';
 		print $objp->invoice_label;
 		print '</td>';
-		
+
 		print '<td align="center">' . dol_print_date($db->jdate($objp->datef), 'day') . '</td>';
-		
+
 		// Ref Product
 		print '<td>';
 		if ($product_static->id)
 			print $product_static->getNomUrl(1);
 	    if ($objp->product_label) print '<br>'.$objp->product_label;
 		print '</td>';
-		
+
 		print '<td>';
 		$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->description));
-		$trunclength = defined('ACCOUNTING_LENGTH_DESCRIPTION') ? ACCOUNTING_LENGTH_DESCRIPTION : 32;
+		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION) ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
 		print $form->textwithtooltip(dol_trunc($text,$trunclength), $objp->description);
 		print '</td>';
-		
+
 		print '<td align="right">' . price($objp->total_ht) . '</td>';
 		print '<td align="center">' . price($objp->tva_tx) . '</td>';
 		print '<td align="left">';
@@ -335,18 +343,18 @@ if ($result) {
 		print '</a></td>';
 		print '<td align="right">' . $objp->country .'</td>';
 		print '<td align="center">' . $objp->tva_intra . '</td>';
-		print '<td align="right"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="' . $objp->rowid . '"/></td>';
-		
+		print '<td class="center"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="' . $objp->rowid . '"/></td>';
+
 		print "</tr>";
 		$i ++;
 	}
     print "</table>";
     print "</div>";
-    
+
     if ($nbtotalofrecords > $limit) {
         print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, '', 0, '', '', $limit, 1);
     }
-    
+
     print '</form>';
 } else {
 	print $db->error();

From ef5e38b0d315e011a079bb3ac7b518bbfa4b25d7 Mon Sep 17 00:00:00 2001
From: Darkjeff <jeff@jeffinfo.com>
Date: Wed, 28 Jun 2017 16:45:44 +0200
Subject: [PATCH 406/438] correct bug result

---
 .../class/accountancycategory.class.php       | 154 ++++++++++++++++++
 1 file changed, 154 insertions(+)

diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index db75947771e..7668756a046 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -429,4 +429,158 @@ class AccountancyCategory
 			return - 1;
 		}
 	}
+	
+	public function getCats() {
+		global $db, $langs, $user, $mysoc;
+
+		if (empty($mysoc->country_id) && empty($mysoc->country_code)) {
+			dol_print_error('', 'Call to select_accounting_account with mysoc country not yet defined');
+			exit();
+		}
+
+		if (! empty($mysoc->country_id)) {
+			$sql = "SELECT c.rowid, c.code, c.label, c.formula, c.position, c.category_type";
+			$sql .= " FROM " . MAIN_DB_PREFIX . "c_accounting_category as c";
+			$sql .= " WHERE c.active = 1 ";
+			$sql .= " AND c.fk_country = " . $mysoc->country_id;
+			$sql .= " ORDER BY c.position ASC";
+		} else {
+			$sql = "SELECT c.rowid, c.code, c.label, c.formula, c.position, c.category_type";
+			$sql .= " FROM " . MAIN_DB_PREFIX . "c_accounting_category as c, " . MAIN_DB_PREFIX . "c_country as co";
+			$sql .= " WHERE c.active = 1 AND c.fk_country = co.rowid";
+			$sql .= " AND co.code = '" . $mysoc->country_code . "'";
+			$sql .= " ORDER BY c.position ASC";
+		}
+
+		dol_syslog(__METHOD__ . " sql=" . $sql, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$i = 0;
+			$obj = '';
+			$num = $this->db->num_rows($resql);
+			$data = array ();
+			if ($num) {
+				while ( $i < $num ) {
+					$obj = $this->db->fetch_object($resql);
+					
+					$data[] = array (
+							'rowid' => $obj->rowid,
+							'code' => $obj->code,
+							'position' => $obj->position,
+							'label' => $obj->label,
+							'formula' => $obj->formula,
+							'category_type' => $obj->category_type
+					);
+					$i ++;
+				}
+			}
+			return $data;
+		} else {
+			$this->error = "Error " . $this->db->lasterror();
+			$this->errors[] = $this->error;
+			dol_syslog(__METHOD__ . " " . implode(',', $this->errors), LOG_ERR);
+
+			return - 1;
+		}
+	}
+	
+	
+	// calcule 
+	
+	const PATTERN = '/(?:\-?\d+(?:\.?\d+)?[\+\-\*\/])+\-?\d+(?:\.?\d+)?/';
+
+	const PARENTHESIS_DEPTH = 10;
+
+	public function calculate($input){
+		if(strpos($input, '+') != null || strpos($input, '-') != null || strpos($input, '/') != null || strpos($input, '*') != null){
+			//  Remove white spaces and invalid math chars
+			$input = str_replace(',', '.', $input);
+			$input = preg_replace('[^0-9\.\+\-\*\/\(\)]', '', $input);
+
+			//  Calculate each of the parenthesis from the top
+			$i = 0;
+			while(strpos($input, '(') || strpos($input, ')')){
+				$input = preg_replace_callback('/\(([^\(\)]+)\)/', 'self::callback', $input);
+
+				$i++;
+				if($i > self::PARENTHESIS_DEPTH){
+					break;
+				}
+			}
+
+			//  Calculate the result
+			if(preg_match(self::PATTERN, $input, $match)){
+				return $this->compute($match[0]);
+			}
+
+			return 0;
+		}
+
+		return $input;
+	}
+
+	private function compute($input){
+		$compute = create_function('', 'return '.$input.';');
+
+		return 0 + $compute();
+	}
+
+	private function callback($input){
+		if(is_numeric($input[1])){
+			return $input[1];
+		}
+		elseif(preg_match(self::PATTERN, $input[1], $match)){
+			return $this->compute($match[0]);
+		}
+
+		return 0;
+	}
+	
+	/**
+	 * get cpts of category
+	 *
+	 * @return array       Result in table
+	 */
+	public function getCptsCat($cat_id) {
+		global $mysoc;
+		$sql = "";
+
+		if (empty($mysoc->country_id) && empty($mysoc->country_code)) {
+			dol_print_error('', 'Call to select_accounting_account with mysoc country not yet defined');
+			exit();
+		}
+
+		$sql = "SELECT t.rowid, t.account_number, t.label as name_cpt";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as t";
+		$sql .= " WHERE t.fk_accounting_category = ".$cat_id;
+		$sql .= " ORDER BY t.account_number ";
+		
+		//echo $sql;
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$i = 0;
+			$obj = '';
+			$num = $this->db->num_rows($resql);
+			$data = array ();
+			if ($num) {
+				while ( $obj = $this->db->fetch_object($resql) ) {
+					$name_cat = $obj->name_cat;
+					$data[] = array (
+							'id' => $obj->rowid,
+							'account_number' => $obj->account_number,
+							'name_cpt' => $obj->name_cpt,
+					);
+					$i ++;
+				}
+			}
+			return $data;
+		} else {
+			$this->error = "Error " . $this->db->lasterror();
+			dol_syslog(__METHOD__ . " " . $this->error, LOG_ERR);
+
+			return -1;
+		}
+	}
+	
 }

From 0955b355e9805e7c8f4c9eb795bbadcb12069665 Mon Sep 17 00:00:00 2001
From: Darkjeff <jeff@jeffinfo.com>
Date: Wed, 28 Jun 2017 16:50:29 +0200
Subject: [PATCH 407/438] update result

---
 htdocs/accountancy/report/result.php | 258 +++++++++++++++------------
 1 file changed, 147 insertions(+), 111 deletions(-)

diff --git a/htdocs/accountancy/report/result.php b/htdocs/accountancy/report/result.php
index 801ba0a2007..175c9955498 100644
--- a/htdocs/accountancy/report/result.php
+++ b/htdocs/accountancy/report/result.php
@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2016		Jamal Elbaz			<jamelbaz@gmail.pro>
- * Copyright (C) 2016 		Alexandre Spangaro	<aspangaro@zendsi.com>
+/* Copyright (C) 2016/17		Jamal Elbaz			<jamelbaz@gmail.com>
+ * Copyright (C) 2016 		Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,6 +25,7 @@ require '../../main.inc.php';
 
 // Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountancycategory.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
@@ -35,12 +36,14 @@ $langs->load("accountancy");
 $langs->load("compta");
 
 $mesg = '';
-$action = GETPOST('action','aZ09');
+$action = GETPOST('action');
 $cat_id = GETPOST('account_category');
 $selectcpt = GETPOST('cpt_bk');
 $id = GETPOST('id', 'int');
 $rowid = GETPOST('rowid', 'int');
 $cancel = GETPOST('cancel');
+$simple_report = GETPOST('simple_report');
+
 
 // Filter
 $year = GETPOST('year','int');
@@ -77,7 +80,16 @@ $form = new Form($db);
 $textprevyear = '<a href="' . $_SERVER["PHP_SELF"] . '?year=' . ($year_current - 1) . '">' . img_previous() . '</a>';
 $textnextyear = '&nbsp;<a href="' . $_SERVER["PHP_SELF"] . '?year=' . ($year_current + 1) . '">' . img_next() . '</a>';
 
-print load_fiche_titre($langs->trans('ReportInOut'), $textprevyear . " " . $langs->trans("Year") . " " . $year_start . " " . $textnextyear, 'title_accountancy');
+	$nom = $langs->trans("ReportInOut");
+	$nomlink = '';
+	$periodlink = '';
+	$exportlink = '';
+	$builddate = time();
+	$description = '';
+	$period = $langs->trans("Detail").' '. $form->selectyesno('simple_report',$simple_report,0) . " " .$textprevyear . " " . $langs->trans("Year") . " " . $year_start . " " . $textnextyear ;
+report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array (
+			'action' => ''
+	));
 
 $moreforfilter='';
 
@@ -108,37 +120,97 @@ foreach($months as $k => $v){
 }
 print	'</tr>';
 
-$cats = $AccCat->getCatsCpts();
-if ($cats < 0) dol_print_error($db, $AccCat->error, $AccCat->errors);
 
-$catsCalcule = $AccCat->getCatsCal();
+
+//All categories
+$cats = $AccCat->getCats();
 if ($catsCalcule < 0) dol_print_error($db, $AccCat->error, $AccCat->errors);
 
 $j=1;
 $sommes = array();
 
-if (!empty($cats))
-{
-	foreach ($cats as $name_cat => $cpts)
-	{
+foreach($cats as $cat ){
+	if(!empty($cat['category_type'])){ // category calculed
+	
+		$formula = $cat['formula'];
+
 		print "<tr class='liste_titre'>";
-		print '<td colspan="17">' . $name_cat . '</td>';
+		print '<td colspan="2">' . $cat['label'] . '</td>';
+
+		$vars = array();
+
+		// Previous Fiscal year (N-1)
+		foreach($sommes as $code => $det){
+			$vars[$code] = $det['NP'];
+		}
+		
+		
+		$result = strtr($formula, $vars);
+		
+		
+		$r = $AccCat->calculate($result);
+		
+		print '<td align="right"><font color="blue">' . price($r) . '</td>';
+		$code = $cat['code']; // code categorie de calcule
+		$sommes[$code]['NP'] += $r;
+
+		// Current fiscal year (N)
+		if (is_array($sommes) && ! empty($sommes)){
+			foreach($sommes as $code => $det){
+				$vars[$code] = $det['N'];
+			}
+		}
+		
+		$result = strtr($formula, $vars);
+		
+		$r = $AccCat->calculate($result);
+		
+		print '<td align="right"><font color="blue">' . price($r) . '</td>';
+		$sommes[$code]['N'] += $r;
+
+		// Detail by month
+		foreach($months as $k => $v){
+			foreach($sommes as $code => $det){
+				$vars[$code] = $det['M'][$k];
+			}
+			$result = strtr($formula, $vars);
+			$r = $AccCat->calculate($result);
+			print '<td align="right"><font color="blue">' . price($r) . '</td>';
+			$sommes[$code]['M'][$k] += $r;
+		}
+
+		
 		print "</tr>\n";
-		$position = -1;
-		$code = -1;
+		
+		
+	}else{ // normal category
+		
+		$totCat = array();
+		$totCat['M'] = array();
+	
+		// get cpts of category
+		$cpts = $AccCat->getCptsCat($cat['rowid']);
+		
+		
+		print "<tr class='liste_titre'>";
+		print '<td colspan="2">' . $cat['label'] . '</td>';
+		
 		foreach($cpts as $i => $cpt){
+			$var = ! $var;
 
-			$position = $cpt['position'];
-			$code = $cpt['code'];
-
+			$code = $cat['code'];
+			
+			// N-1
 			$return = $AccCat->getResult($cpt['account_number'], 0, $year_current -1, $cpt['dc']);
+			
 			if ($return < 0) {
 				setEventMessages(null, $AccCat->errors, 'errors');
 				$resultNP=0;
 			} else {
 				$resultNP=$AccCat->sdc;
 			}
-
+			
+			//N
 			$return = $AccCat->getResult($cpt['account_number'], 0, $year_current, $cpt['dc']);
 			if ($return < 0) {
 				setEventMessages(null, $AccCat->errors, 'errors');
@@ -146,13 +218,64 @@ if (!empty($cats))
 			} else {
 				$resultN=$AccCat->sdc;
 			}
+			
+			$totCat['NP'] += $resultNP;
+			$totCat['N'] += $resultN;
+
+			foreach($months as $k => $v){
+				$return = $AccCat->getResult($cpt['account_number'], $k+1, $year_current, $cpt['dc']);
+				if ($return < 0) {
+					setEventMessages(null, $AccCat->errors, 'errors');
+					$resultM=0;
+				} else {
+					$resultM=$AccCat->sdc;
+				}
+				$totCat['M'][$k] += $resultM;
+				
+			}
+		}
+		
+		print '<td align="right">' . price($totCat['NP'])  . '</td>';
+		print '<td align="right">' . price($totCat['N']) . '</td>';
+		
+		foreach($totCat['M'] as $k => $v){
+			print '<td align="right">' . price($v) . '</td>';
+		}		
+		print "</tr>\n";
+		
+		foreach($cpts as $i => $cpt){
+			$var = ! $var;
+
+			$code = $cat['code'];
+			
+			// N-1
+			$return = $AccCat->getResult($cpt['account_number'], 0, $year_current -1, $cpt['dc']);
+			
+			if ($return < 0) {
+				setEventMessages(null, $AccCat->errors, 'errors');
+				$resultNP=0;
+			} else {
+				$resultNP=$AccCat->sdc;
+			}
+			
+			//N
+			$return = $AccCat->getResult($cpt['account_number'], 0, $year_current, $cpt['dc']);
+			if ($return < 0) {
+				setEventMessages(null, $AccCat->errors, 'errors');
+				$resultN=0;
+			} else {
+				$resultN=$AccCat->sdc;
+			}
+			
 			$sommes[$code]['NP'] += $resultNP;
 			$sommes[$code]['N'] += $resultN;
-			print '<tr class="oddeven">';
-			print '<td>' . $cpt['account_number'] . '</td>';
+			print '<tr'. $bc[$var].'>';
+			if ($simple_report == 'yes') {
+			print '<td>' . length_accountg($cpt['account_number']) . '</td>';
 			print '<td>' . $cpt['name_cpt'] . '</td>';
-			print '<td>' . price($resultNP)  . '</td>';
-			print '<td>' . price($resultN) . '</td>';
+			print '<td align="right">' . price($resultNP)  . '</td>';
+			print '<td align="right">' . price($resultN) . '</td>';
+			}
 
 			foreach($months as $k => $v){
 				$return = $AccCat->getResult($cpt['account_number'], $k+1, $year_current, $cpt['dc']);
@@ -163,102 +286,15 @@ if (!empty($cats))
 					$resultM=$AccCat->sdc;
 				}
 				$sommes[$code]['M'][$k] += $resultM;
+				if ($simple_report == 'yes') {
 				print '<td align="right">' . price($resultM) . '</td>';
-			}
-
-			print "</tr>\n";
-		}
-
-		// If it's a calculated catgory
-		$p = $position + 1;
-		if(array_key_exists($p, $catsCalcule)){
-			$formula = $catsCalcule[$p]['formula'];
-
-			print "<tr class='liste_titre'>";
-			print '<td colspan="2">' . $catsCalcule[$p]['label'] . '</td>';
-
-			$vars = array();
-
-			// Previous Fiscal year (N-1)
-			foreach($sommes as $code => $det){
-				$vars[$code] = $det['NP'];
-			}
-			$result = strtr($formula, $vars);
-			eval( '$result = (' . $result . ');' );
-			print '<td align="right">' . price($result) . '</td>';
-			$code = $catsCalcule[$p]['code']; // code categorie de calcule
-			$sommes[$code]['NP'] += $result;
-
-			// Current fiscal year (N)
-			foreach($sommes as $code => $det){
-				$vars[$code] = $det['N'];
-			}
-			$result = strtr($formula, $vars);
-			eval( '$result = (' . $result . ');' );
-			print '<td align="right">' . price($result) . '</td>';
-			$sommes[$code]['N'] += $result;
-
-			// Detail by month
-			foreach($months as $k => $v){
-				foreach($sommes as $code => $det){
-					$vars[$code] = $det['M'][$k];
 				}
-				$result = strtr($formula, $vars);
-				eval( '$result = (' . $result . ');' );
-				print '<td align="right">' . price($result) . '</td>';
-				$sommes[$code]['M'][$k] += $result;
 			}
 
-			//print '<td colspan="15">' . $catsCalcule[$p]['formula'] . '</td>';
 			print "</tr>\n";
-			unset($catsCalcule[$p]); // j'élimine la catégorie calculée après affichage
 		}
-		$j++;
-	}
-
-	// Others calculed category
-	foreach($catsCalcule as $p => $catc)
-	{
-		$formula = $catsCalcule[$p]['formula'];
-
-		print "<tr class='liste_titre'>";
-		print '<td colspan="2">' . $catsCalcule[$p]['label'] . '</td>';
-
-		$vars = array();
-
-		// Previous Fiscal year (N-1)
-		foreach($sommes as $code => $det){
-			$vars[$code] = $det['NP'];
-		}
-		$result = strtr($formula, $vars);
-		eval( '$result = (' . $result . ');' );
-		print '<td align="right">' . price($result) . '</td>';
-		$code = $catsCalcule[$p]['code']; // code categorie de calcule
-		$sommes[$code]['NP'] += $result;
-
-		// Current fiscal year (N)
-		foreach($sommes as $code => $det){
-			$vars[$code] = $det['N'];
-		}
-		$result = strtr($formula, $vars);
-		eval( '$result = (' . $result . ');' );
-		print '<td align="right">' . price($result) . '</td>';
-		$sommes[$code]['N'] += $result;
-
-		// Detail by month
-		foreach($months as $k => $v){
-			foreach($sommes as $code => $det){
-				$vars[$code] = $det['M'][$k];
-			}
-			$result = strtr($formula, $vars);
-			eval( '$result = (' . $result . ');' );
-			print '<td align="right">' . price($result) . '</td>';
-			$sommes[$code]['M'][$k] += $result;
-		}
-
-		//print '<td colspan="15">' . $catsCalcule[$p]['formula'] . '</td>';
-		print "</tr>\n";
 	}
+	
 }
 
 print "</table>";

From b6002bd1f82e0aeb2268b056d5fccfbc8974c630 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 28 Jun 2017 18:29:57 +0200
Subject: [PATCH 408/438] Fix bad link

---
 htdocs/comm/action/document.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index 30eeb2ffe8e..1e54db9d449 100644
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -124,7 +124,7 @@ if ($object->id > 0)
 	dol_fiche_head($head, 'documents', $langs->trans("Action"), -1, 'action');
 
 	$linkback = img_picto($langs->trans("BackToList"),'object_list','class="hideonsmartphone pictoactionview"');
-	$linkback.= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php">'.$langs->trans("BackToList").'</a>';
+	$linkback.= '<a href="'.DOL_URL_ROOT.'/comm/action/listactions.php">'.$langs->trans("BackToList").'</a>';
 
 	// Link to other agenda views
 	$out='';
@@ -137,7 +137,7 @@ if ($object->id > 0)
 	$out.='<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($object->datep,'%Y').'&month='.dol_print_date($object->datep,'%m').'&day='.dol_print_date($object->datep,'%d').'">'.$langs->trans("ViewWeek").'</a>';
 	$out.=img_picto($langs->trans("ViewDay"),'object_calendarday','class="hideonsmartphone pictoactionview"');
 	$out.='<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($object->datep,'%Y').'&month='.dol_print_date($object->datep,'%m').'&day='.dol_print_date($object->datep,'%d').'">'.$langs->trans("ViewDay").'</a>';
-	
+
 	$linkback.=$out;
 
 	$morehtmlref='<div class="refidno">';
@@ -161,13 +161,13 @@ if ($object->id > 0)
 	    }
 	}
 	$morehtmlref.='</div>';
-	
+
 	dol_banner_tab($object, 'id', $linkback, ($user->societe_id?0:1), 'id', 'ref', $morehtmlref);
-	
+
 	print '<div class="fichecenter">';
-	
+
 	print '<div class="underbanner clearboth"></div>';
-	
+
 	// Affichage fiche action en mode visu
 	print '<table class="border" width="100%">';
 
@@ -228,7 +228,7 @@ if ($object->id > 0)
 	print '<div class="assignedtouser">';
 	print $form->select_dolusers_forevent('view', 'assignedtouser', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
 	print '</div>';
-	if (in_array($user->id,array_keys($listofuserid))) 
+	if (in_array($user->id,array_keys($listofuserid)))
 	{
 		print '<div class="myavailability">';
 		print $langs->trans("MyAvailability").': '.(($object->userassigned[$user->id]['transparency'] > 0)?$langs->trans("Busy"):$langs->trans("Available"));	// We show nothing if event is assigned to nobody
@@ -237,7 +237,7 @@ if ($object->id > 0)
 	print '	</td></tr>';
 
 	print '</table>';
-	
+
 	print '<table class="border" width="100%">';
 
 	// Construit liste des fichiers
@@ -255,7 +255,7 @@ if ($object->id > 0)
 	print '</table>';
 
     print '</div>';
-	
+
     dol_fiche_end();
 
 

From 05318bb4ec66afba02b5e52ee78b21cad653f2ec Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 28 Jun 2017 19:02:09 +0200
Subject: [PATCH 409/438] More complete dol_string_nospecial

---
 htdocs/core/lib/functions.lib.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index c598e6be4dd..7164432223e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -746,7 +746,8 @@ function dol_string_unaccent($str)
 }
 
 /**
- *	Clean a string from all punctuation characters to use it as a ref or login
+ *	Clean a string from all punctuation characters to use it as a ref or login.
+ *  This is a more complete function than dol_sanitizeFileName.
  *
  *	@param	string	$str            	String to clean
  * 	@param	string	$newstr				String to replace forbidden chars with
@@ -757,7 +758,7 @@ function dol_string_unaccent($str)
  */
 function dol_string_nospecial($str,$newstr='_',$badcharstoreplace='')
 {
-	$forbidden_chars_to_replace=array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ",", ";", "=");
+	$forbidden_chars_to_replace=array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ",", ";", "=", '°');  // more complete than dol_sanitizeFileName
 	$forbidden_chars_to_remove=array();
 	if (is_array($badcharstoreplace)) $forbidden_chars_to_replace=$badcharstoreplace;
 	//$forbidden_chars_to_remove=array("(",")");

From b17937ce0d66e49750ae79a1fef00b7ae29a9c4b Mon Sep 17 00:00:00 2001
From: BENKE Charlene <charles.fr@benke.fr>
Date: Wed, 28 Jun 2017 21:29:01 +0200
Subject: [PATCH 410/438] Error fields and add date end on rapport pdf

percentage instead percent
---
 htdocs/core/modules/action/rapport.pdf.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/action/rapport.pdf.php b/htdocs/core/modules/action/rapport.pdf.php
index 65a80d97e5b..a2d9bbe05dc 100644
--- a/htdocs/core/modules/action/rapport.pdf.php
+++ b/htdocs/core/modules/action/rapport.pdf.php
@@ -229,7 +229,7 @@ class CommActionRapport
 				$obj = $this->db->fetch_object($resql);
 
 				$eventstatic->id=$obj->id;
-				$eventstatic->percentage=$obj->percentage;
+				$eventstatic->percentage=$obj->percent;
 				$eventstatic->fulldayevent=$obj->fulldayevent;
 				$eventstatic->punctual=$obj->punctual;
 
@@ -266,7 +266,14 @@ class CommActionRapport
 
 				// Date
 				$pdf->SetXY($this->marge_gauche, $y);
-				$pdf->MultiCell(22, $height, dol_print_date($this->db->jdate($obj->dp),"day")."\n".dol_print_date($this->db->jdate($obj->dp),"hour"), 0, 'L', 0);
+				$textdate = dol_print_date($this->db->jdate($obj->dp),"day")."\n".dol_print_date($this->db->jdate($obj->dp),"hour");
+				if ($obj->dp2) {
+					if (dol_print_date($this->db->jdate($obj->dp),"day") != dol_print_date($this->db->jdate($obj->dp2),"day"))
+						$textdate.= " -> ".dol_print_date($this->db->jdate($obj->dp2), "day")." - ".dol_print_date($this->db->jdate($obj->dp2), "hour");
+					else
+						$textdate.= " -> ".dol_print_date($this->db->jdate($obj->dp2), "hour");
+				}
+				$pdf->MultiCell(22, $height, $textdate, 0, 'L', 0);
 				$y0 = $pdf->GetY();
 
 				// Third party

From ab0a730d4a0b6395ca3dd7155f5f4ccbcc05d75a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 29 Jun 2017 02:54:56 +0200
Subject: [PATCH 411/438] Fix bad GETPOST on 'action'

---
 htdocs/accountancy/bookkeeping/card.php   | 2 +-
 htdocs/accountancy/report/result.php      | 2 +-
 htdocs/core/class/html.formmail.class.php | 2 +-
 htdocs/loan/createschedule.php            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 28b7b177860..9be65e7261a 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -37,7 +37,7 @@ $id = GETPOST('id', 'int');
 if ($user->societe_id > 0) {
 	accessforbidden();
 }
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 $mode = GETPOST('mode');
 $piece_num = GETPOST("piece_num");
 
diff --git a/htdocs/accountancy/report/result.php b/htdocs/accountancy/report/result.php
index 175c9955498..b8335e2d8f7 100644
--- a/htdocs/accountancy/report/result.php
+++ b/htdocs/accountancy/report/result.php
@@ -36,7 +36,7 @@ $langs->load("accountancy");
 $langs->load("compta");
 
 $mesg = '';
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 $cat_id = GETPOST('account_category');
 $selectcpt = GETPOST('cpt_bk');
 $id = GETPOST('id', 'int');
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index d6089ebdb54..c33b798c3a9 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -529,7 +529,7 @@ class FormMail extends Form
         				    $tmparray[$key]=dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
         				}
         				$withtoselected=GETPOST("receiver");     // Array of selected value
-        				if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action') == 'presend')
+        				if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action','aZ09') == 'presend')
         				{
         				    $withtoselected = array_keys($tmparray);
         				}
diff --git a/htdocs/loan/createschedule.php b/htdocs/loan/createschedule.php
index 596cc9fd536..70688461ae9 100644
--- a/htdocs/loan/createschedule.php
+++ b/htdocs/loan/createschedule.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/loan/class/loanschedule.class.php';
 global $user;
 
 $loanid = GETPOST('loanid', 'int');
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 
 $object = new Loan($db);
 $object->fetch($loanid);

From e8b33e3dbad394857eec43292b6cb4e8cc45759d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 29 Jun 2017 15:32:36 +0200
Subject: [PATCH 412/438] To provide solution to get thirdparty when name is
 not unique.

Conflicts:
	htdocs/societe/class/societe.class.php
---
 htdocs/societe/class/societe.class.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 8069f59c372..ce92103f927 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1002,21 +1002,22 @@ class Societe extends CommonObject
      *    @param	int		$rowid			Id of third party to load
      *    @param    string	$ref			Reference of third party, name (Warning, this can return several records)
      *    @param    string	$ref_ext       	External reference of third party (Warning, this information is a free field not provided by Dolibarr)
-     *    @param    string	$ref_int       	Internal reference of third party
+     *    @param    string	$ref_int       	Internal reference of third party (not used by dolibarr)
      *    @param    string	$idprof1		Prof id 1 of third party (Warning, this can return several records)
      *    @param    string	$idprof2		Prof id 2 of third party (Warning, this can return several records)
      *    @param    string	$idprof3		Prof id 3 of third party (Warning, this can return several records)
      *    @param    string	$idprof4		Prof id 4 of third party (Warning, this can return several records)
      *    @param    string	$idprof5		Prof id 5 of third party (Warning, this can return several records)
      *    @param    string	$idprof6		Prof id 6 of third party (Warning, this can return several records)
+     *    @param    string	$email   		Email (Warning, this can return several records)
      *    @return   int						>0 if OK, <0 if KO or if two records found for same ref or idprof, 0 if not found.
      */
-    function fetch($rowid, $ref='', $ref_ext='', $ref_int='', $idprof1='',$idprof2='',$idprof3='',$idprof4='',$idprof5='',$idprof6='')
+    function fetch($rowid, $ref='', $ref_ext='', $ref_int='', $idprof1='',$idprof2='',$idprof3='',$idprof4='',$idprof5='',$idprof6='', $email='')
     {
         global $langs;
         global $conf;
 
-        if (empty($rowid) && empty($ref) && empty($ref_ext) && empty($ref_int) && empty($idprof1) && empty($idprof2) && empty($idprof3) && empty($idprof4) && empty($idprof5) && empty($idprof6)) return -1;
+        if (empty($rowid) && empty($ref) && empty($ref_ext) && empty($ref_int) && empty($idprof1) && empty($idprof2) && empty($idprof3) && empty($idprof4) && empty($idprof5) && empty($idprof6) && empty($email)) return -1;
 
         $sql = 'SELECT s.rowid, s.nom as name, s.name_alias, s.entity, s.ref_ext, s.ref_int, s.address, s.datec as date_creation, s.prefix_comm';
         $sql .= ', s.status';
@@ -1060,6 +1061,7 @@ class Societe extends CommonObject
         else if ($idprof4) $sql .= " WHERE s.idprof4 = '".$this->db->escape($idprof4)."' AND s.entity IN (".getEntity($this->element, 1).")";
         else if ($idprof5) $sql .= " WHERE s.idprof5 = '".$this->db->escape($idprof5)."' AND s.entity IN (".getEntity($this->element, 1).")";
         else if ($idprof6) $sql .= " WHERE s.idprof6 = '".$this->db->escape($idprof6)."' AND s.entity IN (".getEntity($this->element, 1).")";
+        else if ($email)   $sql .= " WHERE email = '".$this->db->escape($email)."' AND s.entity IN (".getEntity($this->element, 1).")";
 
         $resql=$this->db->query($sql);
         if ($resql)

From f7ba3ddc078cf89ad4fc2d9bfbb67bf713db6aff Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 29 Jun 2017 15:59:46 +0200
Subject: [PATCH 413/438] Fix translation

---
 htdocs/langs/en_US/stocks.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 97ddedc3231..460665255b1 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -53,7 +53,7 @@ IndependantSubProductStock=Product stock and subproduct stock are independant
 QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
-OrderDispatch=Stock dispatching
+OrderDispatch=Goods Receptions
 RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
 RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
 DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation

From 727085f3ecf82a7e1cab5969b0f695ae5cfb0ef3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Jun 2017 19:01:49 +0200
Subject: [PATCH 414/438] Fix missing migration column zip

---
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 0867aba9c38..75a45f72142 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -46,6 +46,9 @@ ALTER TABLE llx_opensurvey_sondage ADD COLUMN allow_spy tinyint NOT NULL DEFAULT
 ALTER TABLE llx_opensurvey_sondage ADD COLUMN sujet TEXT;
 
 
+ALTER TABLE llx_socpeople MODIFY COLUMN zip varchar(25);
+
+
 ALTER TABLE llx_extrafields ADD COLUMN fieldcomputed text;
 ALTER TABLE llx_extrafields ADD COLUMN fielddefault varchar(255);
 

From 2b0b2096f6dbe20cd37c5ed0f9b6c289102e283f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Jun 2017 22:40:08 +0200
Subject: [PATCH 415/438] Fix test on mandatory field

---
 htdocs/contrat/card.php | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index f502e8023f3..c13571dd6cb 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1782,7 +1782,7 @@ else
             {
                 $dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
                 $dateactend   = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
-                $comment      = GETPOST('comment');
+                $comment      = GETPOST('comment','alpha');
                 $form->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment),$langs->trans("ActivateService"),$langs->trans("ConfirmActivateService",dol_print_date($dateactstart,"%A %d %B %Y")),"confirm_active", '', 0, 1);
                 print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
             }
@@ -1794,8 +1794,16 @@ else
             {
                 $dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
                 $dateactend   = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
-                $comment      = GETPOST('comment');
-                $form->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment), $langs->trans("CloseService"), $langs->trans("ConfirmCloseService",dol_print_date($dateactend,"%A %d %B %Y")), "confirm_closeline", '', 0, 1);
+                $comment      = GETPOST('comment','alpha');
+
+                if (empty($dateactend))
+                {
+                    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateEndReal")), null, 'errors');
+                }
+                else
+                {
+                    $form->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne','int')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment), $langs->trans("CloseService"), $langs->trans("ConfirmCloseService",dol_print_date($dateactend,"%A %d %B %Y")), "confirm_closeline", '', 0, 1);
+                }
                 print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
             }
 
@@ -1918,9 +1926,11 @@ else
                 /**
                  * Disable a contract line
                  */
-                print '<form name="closeline" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;ligne='.$object->lines[$cursorline-1]->id.'&amp;action=closeline" method="post">';
+                print '<!-- Form to disabled a line -->'."\n";
+                print '<form name="closeline" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;ligne='.$object->lines[$cursorline-1]->id.'" method="post">';
 
                 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                print '<input type="hidden" name="action" value="closeline">';
 
                 print '<table class="noborder tableforservicepart2 boxtablenobottom" width="100%">';
 
@@ -1957,7 +1967,7 @@ else
                 print '</td></tr>';
 
                 print '<tr '.$bc[false].'>';
-                print '<td class="nohover">'.$langs->trans("Comment").'</td><td class="nohover"><input size="70" type="text" class="flat" name="comment" value="'.GETPOST('comment').'"></td>';
+                print '<td class="nohover">'.$langs->trans("Comment").'</td><td class="nohover"><input size="70" type="text" class="flat" name="comment" value="'.dol_escape_htmltag(GETPOST('comment', 'alpha')).'"></td>';
                 print '<td class="nohover right">';
                 print '<input type="submit" class="button" name="close" value="'.$langs->trans("Unactivate").'"> &nbsp; ';
                 print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';

From 31fe8ebcee21bf261aa9b3ee8f8ede9e5b249df8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 1 Jul 2017 02:22:08 +0200
Subject: [PATCH 416/438] Debug v6

---
 htdocs/accountancy/admin/export.php           | 44 +++++++++----------
 htdocs/accountancy/bookkeeping/balance.php    | 13 +++---
 htdocs/accountancy/bookkeeping/list.php       | 20 ++++-----
 .../class/accountancyexport.class.php         |  9 ++--
 .../journal/expensereportsjournal.php         |  5 ++-
 .../accountancy/journal/purchasesjournal.php  |  2 +-
 htdocs/compta/salaries/document.php           |  2 +-
 htdocs/compta/salaries/index.php              | 29 +++++++-----
 htdocs/compta/salaries/info.php               |  4 +-
 htdocs/core/menus/init_menu_auguria.sql       |  2 +-
 htdocs/core/menus/standard/eldy.lib.php       |  9 ++--
 htdocs/langs/en_US/accountancy.lang           |  1 +
 12 files changed, 77 insertions(+), 63 deletions(-)

diff --git a/htdocs/accountancy/admin/export.php b/htdocs/accountancy/admin/export.php
index cdec35415fd..5ffcbfe92ba 100644
--- a/htdocs/accountancy/admin/export.php
+++ b/htdocs/accountancy/admin/export.php
@@ -47,7 +47,7 @@ $action = GETPOST('action', 'alpha');
 
 // Parameters ACCOUNTING_EXPORT_*
 $main_option = array (
-		'ACCOUNTING_EXPORT_PREFIX_SPEC' 
+		'ACCOUNTING_EXPORT_PREFIX_SPEC'
 );
 
 $model_option = array (
@@ -67,10 +67,10 @@ $model_option = array (
  */
 if ($action == 'update') {
 	$error = 0;
-	
+
 	$format = GETPOST('format', 'alpha');
 	$modelcsv = GETPOST('modelcsv', 'int');
-	
+
 	if (! empty($format)) {
 		if (! dolibarr_set_const($db, 'ACCOUNTING_EXPORT_FORMAT', $format, 'chaine', 0, '', $conf->entity)) {
 			$error ++;
@@ -78,7 +78,7 @@ if ($action == 'update') {
 	} else {
 		$error ++;
 	}
-	
+
 	if (! empty($modelcsv)) {
 		if (! dolibarr_set_const($db, 'ACCOUNTING_EXPORT_MODELCSV', $modelcsv, 'chaine', 0, '', $conf->entity)) {
 			$error ++;
@@ -89,23 +89,23 @@ if ($action == 'update') {
 	} else {
 		$error ++;
 	}
-	
+
 	foreach ( $main_option as $constname ) {
 		$constvalue = GETPOST($constname, 'alpha');
-		
+
 		if (! dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
 			$error ++;
 		}
 	}
-	
+
 	foreach ( $model_option as $constname ) {
 		$constvalue = GETPOST($constname, 'alpha');
-		
+
 		if (! dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
 			$error ++;
 		}
 	}
-	
+
 	if (! $error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -148,13 +148,13 @@ $var = ! $var;
 $num = count($main_option);
 if ($num) {
 	foreach ( $main_option as $key ) {
-		
+
 		print '<tr class="oddeven value">';
-		
+
 		// Param
 		$label = $langs->trans($key);
 		print '<td width="50%">' . $label . '</td>';
-		
+
 		// Value
 		print '<td>';
 		print '<input type="text" size="20" name="' . $key . '" value="' . $conf->global->$key . '">';
@@ -187,7 +187,7 @@ if (! $conf->use_javascript_ajax) {
 	print '<td>';
 	$listmodelcsv = AccountancyExport::getType();
 	print $form->selectarray("modelcsv", $listmodelcsv, $conf->global->ACCOUNTING_EXPORT_MODELCSV, 0);
-	
+
 	print '</td>';
 }
 print "</td></tr>";
@@ -205,12 +205,12 @@ if ($num2) {
 	print '<tr class="liste_titre">';
 	print '<td colspan="3">' . $langs->trans('OtherOptions') . '</td>';
 	print "</tr>\n";
-	
-	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV > 1)
+
+	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV > AccountancyExport::EXPORT_TYPE_NORMAL)
 	{
 		print '<tr><td colspan="2" bgcolor="red"><b>' . $langs->trans('OptionsDeactivatedForThisExportModel') . '</b></td></tr>';
 	}
-	
+
 	print '<tr class="oddeven">';
 	print '<td width="50%">' . $langs->trans("Selectformat") . '</td>';
 	if (! $conf->use_javascript_ajax) {
@@ -224,24 +224,24 @@ if ($num2) {
 	        'txt' => $langs->trans("txt")
 	    );
 	    print $form->selectarray("format", $listformat, $conf->global->ACCOUNTING_EXPORT_FORMAT, 0);
-	
+
 	    print '</td>';
 	}
 	print "</td></tr>";
-	
-	foreach ( $model_option as $key ) {		
+
+	foreach ( $model_option as $key ) {
 		print '<tr class="oddeven value">';
-		
+
 		// Param
 		$label = $langs->trans($key);
 		print '<td width="50%">' . $label . '</td>';
-		
+
 		// Value
 		print '<td>';
 		print '<input type="text" size="20" name="' . $key . '" value="' . $conf->global->$key . '">';
 		print '</td></tr>';
 	}
-	
+
 	print "</table>\n";
 }
 
diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index a32b739752a..55960776c6d 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -51,7 +51,7 @@ if ($search_accountancy_code_end == - 1) {
 	$search_accountancy_code_end = '';
 }
 
-if (GETPOST("button_export_csv_x") || GETPOST("button_export_csv")) {
+if (GETPOST("button_export_csv_x") || GETPOST("button_export_csv.x") || GETPOST("button_export_csv")) {
 	$action = 'export_csv';
 }
 
@@ -112,7 +112,10 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
  */
 
 if ($action == 'export_csv') {
+
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
+	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == AccountancyExport::EXPORT_TYPE_CEGID) $sep = ";";     // For CEGID, we force separator.
+
 	$journal = 'bookkepping';
 
 	include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';
@@ -122,11 +125,7 @@ if ($action == 'export_csv') {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 
-	foreach ( $object->lines as $line ) {
-
-		if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 2) {
-			$sep = ";";
-		}
+	foreach ($object->lines as $line) {
 		print length_accountg($line->numero_compte) . $sep;
 		print $line->debit . $sep;
 		print $line->credit . $sep;
@@ -157,7 +156,7 @@ else {
 
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
 
-	$button = '<input type="submit" name="button_export_csv" class="butAction" value="' . $langs->trans("Export") . '" />';
+	$button = '<input type="submit" name="button_export_csv" class="butAction" value="' . $langs->trans("Export") . ' ('.$conf->global->ACCOUNTING_EXPORT_FORMAT.')" />';
 	print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $options, $sortfield, $sortorder, '', $result, $result, 'title_accountancy', 0, $button);
 
 	$moreforfilter = '';
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 16d27df15fd..6f994eb1110 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -25,8 +25,7 @@
  * \brief 		List operation of book keeping
  */
 require '../../main.inc.php';
-
-// Class
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountancyexport.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
@@ -47,11 +46,11 @@ $search_date_start = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETP
 $search_date_end = dol_mktime(0, 0, 0, GETPOST('date_endmonth', 'int'), GETPOST('date_endday', 'int'), GETPOST('date_endyear', 'int'));
 $search_doc_date = dol_mktime(0, 0, 0, GETPOST('doc_datemonth', 'int'), GETPOST('doc_dateday', 'int'), GETPOST('doc_dateyear', 'int'));
 
-if (GETPOST("button_delmvt_x") || GETPOST("button_delmvt")) {
+if (GETPOST("button_delmvt_x") || GETPOST("button_delmvt.x") || GETPOST("button_delmvt")) {
 	$action = 'delbookkeepingyear';
 }
-if (GETPOST("button_export_csv_x") || GETPOST("button_export_csv")) {
-	$action = 'export_csv';
+if (GETPOST("button_export_file_x") || GETPOST("button_export_file.x") || GETPOST("button_export_file")) {
+	$action = 'export_file';
 }
 
 $search_accountancy_code = GETPOST("search_accountancy_code");
@@ -99,7 +98,7 @@ $formother = new FormOther($db);
 $form = new Form($db);
 
 
-if ($action != 'export_csv' && ! isset($_POST['begin']) && ! isset($_GET['begin']) && ! isset($_POST['formfilteraction']) && empty($page)) {
+if ($action != 'export_file' && ! isset($_POST['begin']) && ! isset($_GET['begin']) && ! isset($_POST['formfilteraction']) && empty($page)) {
     $search_date_start = dol_mktime(0, 0, 0, 1, 1, dol_print_date(dol_now(), '%Y'));
     $search_date_end = dol_mktime(0, 0, 0, 12, 31, dol_print_date(dol_now(), '%Y'));
 }
@@ -261,9 +260,8 @@ if ($action == 'delmouvconfirm') {
 	}
 }
 
-if ($action == 'export_csv') {
-
-    include DOL_DOCUMENT_ROOT . '/accountancy/class/accountancyexport.class.php';
+// Export into a file with format defined into setup
+if ($action == 'export_file') {
 
     $result = $object->fetchAll($sortorder, $sortfield, 0, 0, $filter);
 
@@ -356,9 +354,11 @@ print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
 
-$button = '<a class="butAction" name="button_export_csv" href="'.$_SERVER["PHP_SELF"].'?action=export_csv'.($param?'&'.$param:'').'">';
+$listofformat=AccountancyExport::getType();
+$button = '<a class="butAction" name="button_export_file" href="'.$_SERVER["PHP_SELF"].'?action=export_file'.($param?'&'.$param:'').'">';
 if (count($filter)) $button.= $langs->trans("ExportFilteredList");
 else $button.= $langs->trans("ExportList");
+$button.=' ('.$listofformat[$conf->global->ACCOUNTING_EXPORT_MODELCSV].')';
 $button.= '</a>';
 
 $groupby = ' <a class="nohover" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php"">' . $langs->trans("GroupByAccountAccounting") . '</a>';
diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index a3358337889..e9ad42858aa 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -32,14 +32,15 @@
  *
  * Manage the different format accountancy export
  */
+
 require_once DOL_DOCUMENT_ROOT . '/core/lib/functions.lib.php';
+
 class AccountancyExport
 {
 	/**
-	 *
-	 * @var Type of export
+	 * @var Type of export. Defined by $conf->global->ACCOUNTING_EXPORT_MODELCSV
 	 */
-	public static $EXPORT_TYPE_NORMAL = 1;
+	public static $EXPORT_TYPE_NORMAL = 1;     // Classic CSV
 	public static $EXPORT_TYPE_CEGID = 2;
 	public static $EXPORT_TYPE_COALA = 3;
 	public static $EXPORT_TYPE_BOB50 = 4;
@@ -81,7 +82,7 @@ class AccountancyExport
 	}
 
 	/**
-	 * Get all export type are available
+	 * Array wit all export type available (key + label)
 	 *
 	 * @return array of type
 	 */
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index 1a18e89792a..8d6f8ca4dcd 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -52,6 +52,7 @@ $date_startyear = GETPOST('date_startyear');
 $date_endmonth = GETPOST('date_endmonth');
 $date_endday = GETPOST('date_endday');
 $date_endyear = GETPOST('date_endyear');
+$in_bookkeeping = GETPOST('in_bookkeeping');
 
 $now = dol_now();
 
@@ -104,6 +105,8 @@ $sql .= " AND erd.fk_code_ventilation > 0";
 $sql .= " AND er.entity IN (" . getEntity('expensereport', 0) . ")";  // We don't share object for accountancy
 if ($date_start && $date_end)
 	$sql .= " AND er.date_debut >= '" . $db->idate($date_start) . "' AND er.date_debut <= '" . $db->idate($date_end) . "'";
+if ($in_bookkeeping == 'yes')
+    $sql .= " AND (er.rowid NOT IN (SELECT fk_doc FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab  WHERE ab.doc_type='expense_report') )";
 $sql .= " ORDER BY er.date_debut";
 
 dol_syslog('accountancy/journal/expensereportsjournal.php:: $sql=' . $sql);
@@ -466,7 +469,7 @@ if (empty($action) || $action == 'view') {
 	$builddate = time();
 	$description.= $langs->trans("DescJournalOnlyBindedVisible").'<br>';
 
-	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
+	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1). ' -  ' .$langs->trans("AlreadyInGeneralLedger").' '. $form->selectyesno('in_bookkeeping',$in_bookkeeping,0);
 
 	$varlink = 'id_journal=' . $id_journal;
 
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index e023e14a817..963ae4f19af 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -43,7 +43,7 @@ $langs->load("main");
 $langs->load("accountancy");
 
 $id_journal = GETPOST('id_journal', 'int');
-$action = GETPOST('action','alpha');
+$action = GETPOST('action','aZ09');
 
 $date_startmonth = GETPOST('date_startmonth');
 $date_startday = GETPOST('date_startday');
diff --git a/htdocs/compta/salaries/document.php b/htdocs/compta/salaries/document.php
index 678442453c6..03cef9c07e8 100644
--- a/htdocs/compta/salaries/document.php
+++ b/htdocs/compta/salaries/document.php
@@ -91,7 +91,7 @@ if ($object->id)
 
 	$head=salaries_prepare_head($object);
 
-	dol_fiche_head($head, 'documents',  $langs->trans("SalaryPayment"), 0, 'payment');
+	dol_fiche_head($head, 'documents',  $langs->trans("SalaryPayment"), -1, 'payment');
 
 	// Construit liste des fichiers
 	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php
index e87fc932c50..baf99182993 100644
--- a/htdocs/compta/salaries/index.php
+++ b/htdocs/compta/salaries/index.php
@@ -73,6 +73,12 @@ else
 	$typeid=$_REQUEST['typeid'];
 }
 
+
+
+/*
+ * Actions
+ */
+
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All test are required to be compatible with all browsers
 {
 	$search_ref="";
@@ -82,6 +88,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
     $typeid="";
 }
 
+
 /*
  * View
  */
@@ -151,23 +158,23 @@ if ($result)
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
     print '<input type="hidden" name="page" value="'.$page.'">';
-    
+
 	print_barre_liste($langs->trans("SalariesPayments"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num, $totalnboflines, 'title_accountancy.png', 0, '', '', $limit);
-	
+
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
 	print '<tr class="liste_titre_filter">';
 	// Ref
 	print '<td class="liste_titre" align="left">';
-	print '<input class="flat" type="text" size="3" name="search_ref" value="'.$search_ref.'">';
+	print '<input class="flat" type="text" size="3" name="search_ref" value="'.$db->escape($search_ref).'">';
 	print '</td>';
 	// Employee
 	print '<td class="liste_titre">';
-	print '<input class="flat" type="text" size="6" name="search_user" value="'.$search_user.'">';
+	print '<input class="flat" type="text" size="6" name="search_user" value="'.$db->escape($search_user).'">';
 	print '</td>';
 	// Label
-	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_label" value="'.$search_label.'"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_label" value="'.$db->escape($search_label).'"></td>';
 	// Date
 	print '<td class="liste_titre">&nbsp;</td>';
 	// Type
@@ -182,13 +189,13 @@ if ($result)
 	    print '</td>';
     }
 	// Amount
-	print '<td class="liste_titre" align="right"><input name="search_amount" class="flat" type="text" size="8" value="'.$search_amount.'"></td>';
+	print '<td class="liste_titre" align="right"><input name="search_amount" class="flat" type="text" size="8" value="'.$db->escape($search_amount).'"></td>';
 
     print '<td class="liste_titre" align="right">';
     $searchpicto=$form->showFilterAndCheckAddButtons(0);
     print $searchpicto;
     print '</td>';
-    
+
     print '<tr class="liste_titre">';
     print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"s.rowid","",$param,"",$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Employee"),$_SERVER["PHP_SELF"],"u.rowid","",$param,"",$sortfield,$sortorder);
@@ -199,13 +206,13 @@ if ($result)
     print_liste_field_titre($langs->trans("PayedByThisPayment"),$_SERVER["PHP_SELF"],"s.amount","",$param,'align="right"',$sortfield,$sortorder);
     print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
     print "</tr>\n";
-    
+
 	print "</tr>\n";
 
     while ($i < min($num,$limit))
     {
         $obj = $db->fetch_object($result);
-        
+
         print '<tr class="oddeven">';
 
         $userstatic->id=$obj->uid;
@@ -238,11 +245,11 @@ if ($result)
 	            $accountstatic->id=$obj->bid;
 	            $accountstatic->ref=$obj->bref;
 	            $accountstatic->number=$obj->bnumber;
-				
+
 				if (! empty($conf->accounting->enabled))
 				{
 					$accountstatic->account_number=$obj->account_number;
-					
+
 					$accountingjournal = new AccountingJournal($db);
 					$accountingjournal->fetch($obj->fk_accountancy_journal);
 
diff --git a/htdocs/compta/salaries/info.php b/htdocs/compta/salaries/info.php
index 05dc7835b68..ddb79845748 100644
--- a/htdocs/compta/salaries/info.php
+++ b/htdocs/compta/salaries/info.php
@@ -55,7 +55,7 @@ $object->info($id);
 
 $head = salaries_prepare_head($object);
 
-dol_fiche_head($head, 'info', $langs->trans("SalaryPayment"), 0, 'payment');
+dol_fiche_head($head, 'info', $langs->trans("SalaryPayment"), -1, 'payment');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/compta/salaries/index.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
 
@@ -72,6 +72,8 @@ dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0,
 print '<div class="fichecenter">';
 print '<div class="underbanner clearboth"></div>';
 
+print '<br>';
+
 print '<table width="100%"><tr><td>';
 dol_print_object_info($object);
 print '</td></tr></table>';
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 76d58132caf..7bf98cf6ec0 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -220,7 +220,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2458__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_default',       2451__+MAX_llx_menu__, '/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuDefaultAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 50, __ENTITY__);
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2459__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_vat',           2451__+MAX_llx_menu__, '/admin/dict.php?id=10&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuVatAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 60, __ENTITY__);
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2460__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_tax',           2451__+MAX_llx_menu__, '/admin/dict.php?id=7&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuTaxAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 70, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2461__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_expensereport', 2451__+MAX_llx_menu__, '/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuExpenseReportAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 80, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->expensereport->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2461__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_expensereport', 2451__+MAX_llx_menu__, '/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuExpenseReportAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 80, __ENTITY__);
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2462__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_product',       2451__+MAX_llx_menu__, '/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuProductsAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 90, __ENTITY__);
 	-- Accounting period
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin" && $conf->global->MAIN_FEATURES_LEVEL > 0', __HANDLER__, 'left', 2450__+MAX_llx_menu__,  'accountancy', 'accountancy_admin_period', 2451__+MAX_llx_menu__, '/accountancy/admin/fiscalyear.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'FiscalPeriod', 1, 'admin', '', '', 2, 80, __ENTITY__);
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index b479f02619c..5ec7bf66672 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1007,11 +1007,12 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 								$objp = $db->fetch_object($resql);
 
 								$nature='';
+
 								// Must match array $sourceList defined into journals_list.php
-								if ($objp->nature == 2) $nature="sells";
-								if ($objp->nature == 3) $nature="purchases";
-								if ($objp->nature == 4) $nature="bank";
-								if ($objp->nature == 5) $nature="expensereports";
+								if ($objp->nature == 2 && ! empty($conf->facture->enabled)) $nature="sells";
+								if ($objp->nature == 3 && ! empty($conf->fournisseur->enabled)) $nature="purchases";
+								if ($objp->nature == 4 && ! empty($conf->banque->enabled)) $nature="bank";
+								if ($objp->nature == 5 && ! empty($conf->expensereport->enabled)) $nature="expensereports";
 								if ($objp->nature == 1) $nature="various";
 								if ($objp->nature == 9) $nature="hasnew";
 
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index bcbac85c17d..b5f46207626 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -28,6 +28,7 @@ OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accoun
 OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
+AlreadyInGeneralLedger=Already journalized in ledgers
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:

From b7218c1bcd80b77370e26ba1815316c774e67b29 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 1 Jul 2017 02:35:12 +0200
Subject: [PATCH 417/438] Fix menu consistency

---
 htdocs/accountancy/admin/export.php        |  2 +-
 htdocs/accountancy/bookkeeping/balance.php |  2 +-
 htdocs/accountancy/report/result.php       | 80 +++++++++++-----------
 htdocs/core/menus/init_menu_auguria.sql    | 36 +++++-----
 htdocs/core/menus/standard/eldy.lib.php    |  6 +-
 htdocs/langs/en_US/accountancy.lang        |  1 +
 6 files changed, 64 insertions(+), 63 deletions(-)

diff --git a/htdocs/accountancy/admin/export.php b/htdocs/accountancy/admin/export.php
index 5ffcbfe92ba..7a209be45b1 100644
--- a/htdocs/accountancy/admin/export.php
+++ b/htdocs/accountancy/admin/export.php
@@ -206,7 +206,7 @@ if ($num2) {
 	print '<td colspan="3">' . $langs->trans('OtherOptions') . '</td>';
 	print "</tr>\n";
 
-	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV > AccountancyExport::EXPORT_TYPE_NORMAL)
+	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV > AccountancyExport::$EXPORT_TYPE_NORMAL)
 	{
 		print '<tr><td colspan="2" bgcolor="red"><b>' . $langs->trans('OptionsDeactivatedForThisExportModel') . '</b></td></tr>';
 	}
diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 55960776c6d..e742f4651cf 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -114,7 +114,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
 if ($action == 'export_csv') {
 
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
-	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == AccountancyExport::EXPORT_TYPE_CEGID) $sep = ";";     // For CEGID, we force separator.
+	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == AccountancyExport::$EXPORT_TYPE_CEGID) $sep = ";";     // For CEGID, we force separator.
 
 	$journal = 'bookkepping';
 
diff --git a/htdocs/accountancy/report/result.php b/htdocs/accountancy/report/result.php
index b8335e2d8f7..fad1fcd4b9b 100644
--- a/htdocs/accountancy/report/result.php
+++ b/htdocs/accountancy/report/result.php
@@ -80,16 +80,14 @@ $form = new Form($db);
 $textprevyear = '<a href="' . $_SERVER["PHP_SELF"] . '?year=' . ($year_current - 1) . '">' . img_previous() . '</a>';
 $textnextyear = '&nbsp;<a href="' . $_SERVER["PHP_SELF"] . '?year=' . ($year_current + 1) . '">' . img_next() . '</a>';
 
-	$nom = $langs->trans("ReportInOut");
-	$nomlink = '';
-	$periodlink = '';
-	$exportlink = '';
-	$builddate = time();
-	$description = '';
-	$period = $langs->trans("Detail").' '. $form->selectyesno('simple_report',$simple_report,0) . " " .$textprevyear . " " . $langs->trans("Year") . " " . $year_start . " " . $textnextyear ;
-report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array (
-			'action' => ''
-	));
+$nom = $langs->trans("ReportInOut").', '.$langs->trans("ByAccounts");
+$nomlink = '';
+$periodlink = '';
+$exportlink = '';
+$builddate = time();
+$description = '';
+$period = $langs->trans("Detail").' '. $form->selectyesno('simple_report',$simple_report,0) . " " .$textprevyear . " " . $langs->trans("Year") . " " . $year_start . " " . $textnextyear ;
+report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''));
 
 $moreforfilter='';
 
@@ -131,7 +129,7 @@ $sommes = array();
 
 foreach($cats as $cat ){
 	if(!empty($cat['category_type'])){ // category calculed
-	
+
 		$formula = $cat['formula'];
 
 		print "<tr class='liste_titre'>";
@@ -143,13 +141,13 @@ foreach($cats as $cat ){
 		foreach($sommes as $code => $det){
 			$vars[$code] = $det['NP'];
 		}
-		
-		
+
+
 		$result = strtr($formula, $vars);
-		
-		
+
+
 		$r = $AccCat->calculate($result);
-		
+
 		print '<td align="right"><font color="blue">' . price($r) . '</td>';
 		$code = $cat['code']; // code categorie de calcule
 		$sommes[$code]['NP'] += $r;
@@ -160,11 +158,11 @@ foreach($cats as $cat ){
 				$vars[$code] = $det['N'];
 			}
 		}
-		
+
 		$result = strtr($formula, $vars);
-		
+
 		$r = $AccCat->calculate($result);
-		
+
 		print '<td align="right"><font color="blue">' . price($r) . '</td>';
 		$sommes[$code]['N'] += $r;
 
@@ -179,37 +177,37 @@ foreach($cats as $cat ){
 			$sommes[$code]['M'][$k] += $r;
 		}
 
-		
+
 		print "</tr>\n";
-		
-		
+
+
 	}else{ // normal category
-		
+
 		$totCat = array();
 		$totCat['M'] = array();
-	
+
 		// get cpts of category
 		$cpts = $AccCat->getCptsCat($cat['rowid']);
-		
-		
+
+
 		print "<tr class='liste_titre'>";
 		print '<td colspan="2">' . $cat['label'] . '</td>';
-		
+
 		foreach($cpts as $i => $cpt){
 			$var = ! $var;
 
 			$code = $cat['code'];
-			
+
 			// N-1
 			$return = $AccCat->getResult($cpt['account_number'], 0, $year_current -1, $cpt['dc']);
-			
+
 			if ($return < 0) {
 				setEventMessages(null, $AccCat->errors, 'errors');
 				$resultNP=0;
 			} else {
 				$resultNP=$AccCat->sdc;
 			}
-			
+
 			//N
 			$return = $AccCat->getResult($cpt['account_number'], 0, $year_current, $cpt['dc']);
 			if ($return < 0) {
@@ -218,7 +216,7 @@ foreach($cats as $cat ){
 			} else {
 				$resultN=$AccCat->sdc;
 			}
-			
+
 			$totCat['NP'] += $resultNP;
 			$totCat['N'] += $resultN;
 
@@ -231,33 +229,33 @@ foreach($cats as $cat ){
 					$resultM=$AccCat->sdc;
 				}
 				$totCat['M'][$k] += $resultM;
-				
+
 			}
 		}
-		
+
 		print '<td align="right">' . price($totCat['NP'])  . '</td>';
 		print '<td align="right">' . price($totCat['N']) . '</td>';
-		
+
 		foreach($totCat['M'] as $k => $v){
 			print '<td align="right">' . price($v) . '</td>';
-		}		
+		}
 		print "</tr>\n";
-		
+
 		foreach($cpts as $i => $cpt){
 			$var = ! $var;
 
 			$code = $cat['code'];
-			
+
 			// N-1
 			$return = $AccCat->getResult($cpt['account_number'], 0, $year_current -1, $cpt['dc']);
-			
+
 			if ($return < 0) {
 				setEventMessages(null, $AccCat->errors, 'errors');
 				$resultNP=0;
 			} else {
 				$resultNP=$AccCat->sdc;
 			}
-			
+
 			//N
 			$return = $AccCat->getResult($cpt['account_number'], 0, $year_current, $cpt['dc']);
 			if ($return < 0) {
@@ -266,7 +264,7 @@ foreach($cats as $cat ){
 			} else {
 				$resultN=$AccCat->sdc;
 			}
-			
+
 			$sommes[$code]['NP'] += $resultNP;
 			$sommes[$code]['N'] += $resultN;
 			print '<tr'. $bc[$var].'>';
@@ -294,7 +292,7 @@ foreach($cats as $cat ){
 			print "</tr>\n";
 		}
 	}
-	
+
 }
 
 print "</table>";
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 7bf98cf6ec0..193c74d3ee3 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -235,30 +235,32 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->expensereport->enabled && $leftmenu=="dispatch_expensereport"', __HANDLER__, 'left', 2421__+MAX_llx_menu__, 'accountancy', '', 2420__+MAX_llx_menu__, '/accountancy/expensereport/list.php', 'ToDispatch', 2, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 6, __ENTITY__);
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->expensereport->enabled && $leftmenu=="dispatch_expensereport"', __HANDLER__, 'left', 2422__+MAX_llx_menu__, 'accountancy', '', 2420__+MAX_llx_menu__, '/accountancy/expensereport/lines.php', 'Dispatched', 2, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 7, __ENTITY__);
 	-- Journals
-	-- insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2420__+MAX_llx_menu__, 'accountancy', 'journal', 2400__+MAX_llx_menu__, '/accountancy/journal/index.php?leftmenu=journal', 'Journaux', 1, 'accountancy', '$user->rights->accounting->comptarapport->lire', '', 0, 7, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2705__+MAX_llx_menu__, 'accountancy', '', 2400__+MAX_llx_menu__, '', 'Journalization', 1, 'main', '$user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2707__+MAX_llx_menu__, 'accountancy', '', 2705__+MAX_llx_menu__, '/accountancy/journal/bankjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=3', 'BankJournal', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2708__+MAX_llx_menu__, 'accountancy', '', 2705__+MAX_llx_menu__, '/accountancy/journal/expensereportsjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=6', 'ExpenseReportJournal', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 2, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2709__+MAX_llx_menu__, 'accountancy', '', 2705__+MAX_llx_menu__, '/accountancy/journal/purchasesjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=2', 'PurchasesJournal', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 3, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2706__+MAX_llx_menu__, 'accountancy', '', 2705__+MAX_llx_menu__, '/accountancy/journal/sellsjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=1', 'SellsJournal', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 4, __ENTITY__);
 	-- General Ledger
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2430__+MAX_llx_menu__, 'accountancy', 'bookkeeping', 2400__+MAX_llx_menu__, '/accountancy/bookkeeping/list.php', 'Bookkeeping', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 15, __ENTITY__);
 	-- Balance
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2435__+MAX_llx_menu__, 'accountancy', 'balance', 2400__+MAX_llx_menu__, '/accountancy/bookkeeping/balance.php', 'AccountBalance', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 16, __ENTITY__);
 	-- Reports
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2440__+MAX_llx_menu__, 'accountancy', 'report', 2400__+MAX_llx_menu__, '/accountancy/report/result.php?leftmenu=ca&amp;mainmenu=accountancy', 'Reportings', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 17, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2441__+MAX_llx_menu__, 'accountancy', '', 2440__+MAX_llx_menu__, '/accountancy/report/result.php?leftmenu=ca', 'ReportInOut', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 18, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2442__+MAX_llx_menu__, 'accountancy', '', 2440__+MAX_llx_menu__, '/compta/resultat/index.php?leftmenu=ca', 'ByExpenseIncome', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 19, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2443__+MAX_llx_menu__, 'accountancy', '', 2440__+MAX_llx_menu__, '/compta/resultat/clientfourn.php?leftmenu=ca', 'ByCompanies', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 20, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2444__+MAX_llx_menu__, 'accountancy', '', 2440__+MAX_llx_menu__, '/compta/stats/index.php?leftmenu=ca', 'ReportTurnover', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 21, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2445__+MAX_llx_menu__, 'accountancy', '', 2440__+MAX_llx_menu__, '/compta/stats/casoc.php?leftmenu=ca', 'ByCompanies', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 22, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2446__+MAX_llx_menu__, 'accountancy', '', 2440__+MAX_llx_menu__, '/compta/stats/cabyuser.php?leftmenu=ca', 'ByUsers', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 23, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2447__+MAX_llx_menu__, 'accountancy', '', 2440__+MAX_llx_menu__, '/compta/stats/cabyprodserv.php?leftmenu=ca', 'ByProductsAndServices', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 24, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2440__+MAX_llx_menu__, 'accountancy', 'report', 2400__+MAX_llx_menu__, '/accountancy/report/result.php?mainmenu=accountancy&leftmenu=accountancy', 'Reportings', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 17, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy"', __HANDLER__, 'left', 2441__+MAX_llx_menu__, 'accountancy', '', 2440__+MAX_llx_menu__, '/compta/resultat/index.php?mainmenu=accountancy&leftmenu=accountancy', 'ReportInOut', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 19, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy"', __HANDLER__, 'left', 2442__+MAX_llx_menu__, 'accountancy', '', 2441__+MAX_llx_menu__, '/accountancy/report/result.php?mainmenu=accountancy&leftmenu=accountancy', 'ByAccounts', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 18, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy"', __HANDLER__, 'left', 2443__+MAX_llx_menu__, 'accountancy', '', 2441__+MAX_llx_menu__, '/compta/resultat/clientfourn.php?mainmenu=accountancy&leftmenu=accountancy', 'ByCompanies', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 20, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy"', __HANDLER__, 'left', 2444__+MAX_llx_menu__, 'accountancy', '', 2440__+MAX_llx_menu__, '/compta/stats/index.php?mainmenu=accountancy&leftmenu=accountancy', 'ReportTurnover', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 21, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy"', __HANDLER__, 'left', 2445__+MAX_llx_menu__, 'accountancy', '', 2444__+MAX_llx_menu__, '/compta/stats/casoc.php?mainmenu=accountancy&leftmenu=accountancy', 'ByCompanies', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 22, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy"', __HANDLER__, 'left', 2446__+MAX_llx_menu__, 'accountancy', '', 2444__+MAX_llx_menu__, '/compta/stats/cabyuser.php?mainmenu=accountancy&leftmenu=accountancy', 'ByUsers', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 23, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy"', __HANDLER__, 'left', 2447__+MAX_llx_menu__, 'accountancy', '', 2444__+MAX_llx_menu__, '/compta/stats/cabyprodserv.php?mainmenu=accountancy&leftmenu=accountancy', 'ByProductsAndServices', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 24, __ENTITY__);
 -- Rapports compta simple
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled', __HANDLER__, 'left', 2700__+MAX_llx_menu__, 'accountancy', 'ca', 6__+MAX_llx_menu__, '/compta/resultat/index.php?leftmenu=ca&amp;mainmenu=accountancy', 'Reportings', 0, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 11, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2701__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/resultat/index.php?leftmenu=ca', 'ReportInOut', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 0, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2702__+MAX_llx_menu__, 'accountancy', '', 2701__+MAX_llx_menu__, '/compta/resultat/clientfourn.php?leftmenu=ca', 'ByCompanies', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 0, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2703__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/stats/index.php?leftmenu=ca', 'ReportTurnover', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2704__+MAX_llx_menu__, 'accountancy', '', 2703__+MAX_llx_menu__, '/compta/stats/casoc.php?leftmenu=ca', 'ByCompanies', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 0, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2705__+MAX_llx_menu__, 'accountancy', '', 2703__+MAX_llx_menu__, '/compta/stats/cabyuser.php?leftmenu=ca', 'ByUsers', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2708__+MAX_llx_menu__, 'accountancy', '', 2703__+MAX_llx_menu__, '/compta/stats/cabyprodserv.php?leftmenu=ca', 'ByProductsAndServices', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2706__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/journal/sellsjournal.php?leftmenu=ca', 'SellsJournal', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2707__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/journal/purchasesjournal.php?leftmenu=ca', 'PurchasesJournal', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2711__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/resultat/index.php?leftmenu=ca', 'ReportInOut', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 0, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2712__+MAX_llx_menu__, 'accountancy', '', 2701__+MAX_llx_menu__, '/compta/resultat/clientfourn.php?leftmenu=ca', 'ByCompanies', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 0, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2713__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/stats/index.php?leftmenu=ca', 'ReportTurnover', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2714__+MAX_llx_menu__, 'accountancy', '', 2703__+MAX_llx_menu__, '/compta/stats/casoc.php?leftmenu=ca', 'ByCompanies', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 0, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2715__+MAX_llx_menu__, 'accountancy', '', 2703__+MAX_llx_menu__, '/compta/stats/cabyuser.php?leftmenu=ca', 'ByUsers', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2716__+MAX_llx_menu__, 'accountancy', '', 2703__+MAX_llx_menu__, '/compta/stats/cabyprodserv.php?leftmenu=ca', 'ByProductsAndServices', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
 -- Check deposit
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))', __HANDLER__, 'left', 1711__+MAX_llx_menu__, 'accountancy', 'checks', 14__+MAX_llx_menu__, '/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=bank', 'MenuChequeDeposits', 0, 'bills', '$user->rights->banque->lire', '', 2, 9, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))', __HANDLER__, 'left', 1712__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/card.php?leftmenu=checks&amp;action=new', 'NewCheckDeposit', 1, 'compta', '$user->rights->banque->lire', '', 2, 0, __ENTITY__);
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 5ec7bf66672..66bfdcbce87 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1024,7 +1024,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 
 								if ($nature)
 								{
-									if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid,dol_trunc($objp->label,25),2,$user->rights->accounting->comptarapport->lire);
+									if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid, dol_trunc($objp->label,25), 2, $user->rights->accounting->comptarapport->lire);
 								}
 								$i++;
 							}
@@ -1080,8 +1080,8 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/report/result.php?mainmenu=accountancy&amp;leftmenu=accountancy_report",$langs->trans("Reportings"),1,$user->rights->accounting->comptarapport->lire, '', $mainmenu, 'ca');
 
-				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/',$leftmenu)) $newmenu->add("/accountancy/report/result.php?leftmenu=accountancy_report",$langs->trans("ReportInOut"),2,$user->rights->accounting->comptarapport->lire);
-				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/',$leftmenu)) $newmenu->add("/compta/resultat/index.php?leftmenu=accountancy_report",$langs->trans("ByExpenseIncome"),3,$user->rights->accounting->comptarapport->lire);
+				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/',$leftmenu)) $newmenu->add("/compta/resultat/index.php?leftmenu=accountancy_report",$langs->trans("ReportInOut"),2,$user->rights->accounting->comptarapport->lire);
+				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/',$leftmenu)) $newmenu->add("/accountancy/report/result.php?leftmenu=accountancy_report",$langs->trans("ByAccounts"),3,$user->rights->accounting->comptarapport->lire);
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/',$leftmenu)) $newmenu->add("/compta/resultat/clientfourn.php?leftmenu=accountancy_report",$langs->trans("ByCompanies"),3,$user->rights->accounting->comptarapport->lire);
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/',$leftmenu)) $newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report",$langs->trans("ReportTurnover"),2,$user->rights->accounting->comptarapport->lire);
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/',$leftmenu)) $newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report",$langs->trans("ByCompanies"),3,$user->rights->accounting->comptarapport->lire);
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index b5f46207626..87555ef5158 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -143,6 +143,7 @@ NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
+ByAccounts=By accounts
 NotMatch=Not Set
 DeleteMvt=Delete Ledger lines
 DelYear=Year to delete

From 658fe93d8cb3d67d00ad856ccf82b2a6614aa163 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 1 Jul 2017 12:42:49 +0200
Subject: [PATCH 418/438] Fix menu editor (data not aligned)

---
 htdocs/admin/menus/index.php     | 42 ++++++++++++++-----------
 htdocs/core/lib/treeview.lib.php | 53 +++++++++++++++++++++++---------
 2 files changed, 63 insertions(+), 32 deletions(-)

diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php
index ed5f56954c0..5fb19b0b5ec 100644
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@@ -289,11 +289,11 @@ if ($conf->use_javascript_ajax)
 	  - la chaine a afficher
 	ie: data[]= array (index, index parent, chaine )
 	*/
-    
+
 	//il faut d'abord declarer un element racine de l'arbre
 
     $data[] = array('rowid'=>0,'fk_menu'=>-1,'title'=>"racine",'mainmenu'=>'','leftmenu'=>'','fk_mainmenu'=>'','fk_leftmenu'=>'');
-    
+
 	//puis tous les elements enfants
 
 	$sql = "SELECT m.rowid, m.titre, m.langs, m.mainmenu, m.leftmenu, m.fk_menu, m.fk_mainmenu, m.fk_leftmenu, m.module";
@@ -313,6 +313,7 @@ if ($conf->use_javascript_ajax)
 		{
 			if (! empty($menu['langs'])) $langs->load($menu['langs']);
 			$titre = $langs->trans($menu['titre']);
+
 			$data[] = array(
 				'rowid'=>$menu['rowid'],
 			    'module'=>$menu['module'],
@@ -329,28 +330,33 @@ if ($conf->use_javascript_ajax)
 						'<a href="edit.php?menu_handler='.$menu_handler_to_search.'&action=create&menuId='.$menu['rowid'].'">'.img_edit_add('default').'</a> '.
 						'<a href="index.php?menu_handler='.$menu_handler_to_search.'&action=delete&menuId='.$menu['rowid'].'">'.img_delete('default').'</a> '.
 						'&nbsp; &nbsp; &nbsp;'.
-						'<a href="index.php?menu_handler='.$menu_handler_to_search.'&action=up&menuId='.$menu['rowid'].'">'.img_picto("Monter","1uparrow").'</a><a href="index.php?menu_handler='.$menu_handler_to_search.'&action=down&menuId='.$menu['rowid'].'">'.img_picto("Descendre","1downarrow").'</a>'.
-						'</td></tr></table>'
+						'<a href="index.php?menu_handler='.$menu_handler_to_search.'&action=up&menuId='.$menu['rowid'].'">'.img_picto("Up","1uparrow").'</a><a href="index.php?menu_handler='.$menu_handler_to_search.'&action=down&menuId='.$menu['rowid'].'">'.img_picto("Down","1downarrow").'</a>'.
+						'</td></tr></table>',
+			    'buttons'=>'<a href="edit.php?menu_handler='.$menu_handler_to_search.'&action=edit&menuId='.$menu['rowid'].'">'.img_edit('default',0,'class="menuEdit" id="edit'.$menu['rowid'].'"').'</a> '.
+						'<a href="edit.php?menu_handler='.$menu_handler_to_search.'&action=create&menuId='.$menu['rowid'].'">'.img_edit_add('default').'</a> '.
+						'<a href="index.php?menu_handler='.$menu_handler_to_search.'&action=delete&menuId='.$menu['rowid'].'">'.img_delete('default').'</a> '.
+						'&nbsp; &nbsp; &nbsp;'.
+						'<a href="index.php?menu_handler='.$menu_handler_to_search.'&action=up&menuId='.$menu['rowid'].'">'.img_picto("Up","1uparrow").'</a><a href="index.php?menu_handler='.$menu_handler_to_search.'&action=down&menuId='.$menu['rowid'].'">'.img_picto("Down","1downarrow").'</a>'
 			);
 			$i++;
 		}
 	}
 
 	global $tree_recur_alreadyadded;       // This var was def into tree_recur
-	
+
 	// Appelle de la fonction recursive (ammorce)
 	// avec recherche depuis la racine.
 	//var_dump($data);
 	tree_recur($data, $data[0], 0, 'iddivjstree');  // $data[0] is virtual record 'racine'
-	
+
 
 	print '</td>';
-	
+
 	print '</tr>';
-	
+
 	print '</table>';
-	
-	
+
+
 	// Process remaining records (records that are not linked to root by any path)
     $remainingdata = array();
 	foreach($data as $datar)
@@ -358,30 +364,30 @@ if ($conf->use_javascript_ajax)
 	    if (empty($datar['rowid']) || $tree_recur_alreadyadded[$datar['rowid']]) continue;
 	    $remainingdata[] = $datar;
 	}
-	
+
 	if (count($remainingdata))
 	{
     	print '<table class="noborder centpercent">';
-    	
+
     	print '<tr class="liste_titre">';
     	print '<td>'.$langs->trans("NotTopTreeMenuPersonalized").'</td>';
     	print '<td align="right"></td>';
     	print '</tr>';
-    	
+
     	print '<tr>';
-    	print '<td colspan="2">';	
-    	
+    	print '<td colspan="2">';
+
     	foreach($remainingdata as $datar)
     	{
             $father = array('rowid'=>$datar['rowid'],'title'=>"???",'mainmenu'=>$datar['fk_mainmenu'],'leftmenu'=>$datar['fk_leftmenu'],'fk_mainmenu'=>'','fk_leftmenu'=>'');
     	    //print 'Start with rowid='.$datar['rowid'].' mainmenu='.$father ['mainmenu'].' leftmenu='.$father ['leftmenu'].'<br>'."\n";
     	    tree_recur($data, $father, 0, 'iddivjstree'.$datar['rowid'], 1, 1);
     	}
-    
+
     	print '</td>';
-    
+
     	print '</tr>';
-    
+
     	print '</table>';
 	}
 
diff --git a/htdocs/core/lib/treeview.lib.php b/htdocs/core/lib/treeview.lib.php
index db0fcd07fae..944520d04d5 100644
--- a/htdocs/core/lib/treeview.lib.php
+++ b/htdocs/core/lib/treeview.lib.php
@@ -110,15 +110,15 @@ function tree_showpad(&$fulltree,$key,$silent=0)
  *  @param  int	    $rang   		Level of element
  *  @param	string	$iddivjstree	Id to use for parent ul element
  *  @param  int     $donoresetalreadyloaded     Do not reset global array $donoresetalreadyloaded used to avoid to go down on an aleady processed record
- *  @param  int     $showfk         Show fk links to parent into label
+ *  @param  int     $showfk         1=show fk_links to parent into label  (used by menu editor only)
  *  @return	void
  */
 function tree_recur($tab, $pere, $rang, $iddivjstree='iddivjstree', $donoresetalreadyloaded=0, $showfk=0)
 {
     global $tree_recur_alreadyadded;
-    
+
     if ($rang == 0 && empty($donoresetalreadyloaded)) $tree_recur_alreadyadded=array();
-    
+
     if ($rang == 0)
 	{
 		// Test also done with jstree and dynatree (not able to have <a> inside label)
@@ -138,8 +138,8 @@ function tree_recur($tab, $pere, $rang, $iddivjstree='iddivjstree', $donoresetal
 
 		print '<ul id="'.$iddivjstree.'">';
 	}
-	
-	if ($rang > 50)	
+
+	if ($rang > 50)
 	{
 	    return;	// Protect against infinite loop. Max 50 depth
 	}
@@ -154,19 +154,31 @@ function tree_recur($tab, $pere, $rang, $iddivjstree='iddivjstree', $donoresetal
 		if ($tab[$x]['fk_menu'] != -1 && $tab[$x]['fk_menu'] == $pere['rowid'])
 		{
 		    //print 'rang='.$rang.'-x='.$x." rowid=".$tab[$x]['rowid']." tab[x]['fk_leftmenu'] = ".$tab[$x]['fk_leftmenu']." leftmenu pere = ".$pere['leftmenu']."<br>\n";
-			if (empty($ulprinted) && ! empty($pere['rowid'])) 
-			{ 
+			if (empty($ulprinted) && ! empty($pere['rowid']))
+			{
     		    if (! empty($tree_recur_alreadyadded[$tab[$x]['rowid']]))
     		    {
     		          dol_syslog('Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.', LOG_WARNING);
     		          continue;
     		    }
-    			    
+
                 print '<ul'.(empty($pere['rowid'])?' id="treeData"':'').'>'; $ulprinted++;
 			}
 			print "\n".'<li '.($tab[$x]['statut']?' class="liuseractive"':'class="liuserdisabled"').'>';
-			print $tab[$x]['entry'];
-			if ($showfk) print '&nbsp; (fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].')';
+			if ($showfk)
+			{
+			    print '<table class="nobordernopadding centpercent"><tr><td>';
+			    print '<strong> &nbsp; ';
+			    print $tab[$x]['title'];
+			    print '&nbsp; (fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].')';
+			    print '</td><td align="right">';
+			    print $tab[$x]['buttons'];
+			    print '</td></tr></table>';
+			}
+			else
+			{
+			    print $tab[$x]['entry'];
+			}
 			//print ' -> A '.$tab[$x]['rowid'].' mainmenu='.$tab[$x]['mainmenu'].' leftmenu='.$tab[$x]['leftmenu'].' fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].'<br>'."\n";
 		    $tree_recur_alreadyadded[$tab[$x]['rowid']]=($rang + 1);
 			// And now we search all its sons of lower level
@@ -176,7 +188,7 @@ function tree_recur($tab, $pere, $rang, $iddivjstree='iddivjstree', $donoresetal
 		elseif (! empty($tab[$x]['rowid']) && $tab[$x]['fk_menu'] == -1 && $tab[$x]['fk_mainmenu'] == $pere['mainmenu'] && $tab[$x]['fk_leftmenu'] == $pere['leftmenu'])
 		{
 		    //print 'rang='.$rang.'-x='.$x." rowid=".$tab[$x]['rowid']." tab[x]['fk_leftmenu'] = ".$tab[$x]['fk_leftmenu']." leftmenu pere = ".$pere['leftmenu']."<br>\n";
-		    if (empty($ulprinted) && ! empty($pere['rowid'])) 
+		    if (empty($ulprinted) && ! empty($pere['rowid']))
 		    {
 		        if (! empty($tree_recur_alreadyadded[$tab[$x]['rowid']]))
 		        {
@@ -184,12 +196,25 @@ function tree_recur($tab, $pere, $rang, $iddivjstree='iddivjstree', $donoresetal
 		            //print 'Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.';
                     continue;
 		        }
-		        
+
 		        print '<ul'.(empty($pere['rowid'])?' id="treeData"':'').'>'; $ulprinted++;
 		    }
 			print "\n".'<li '.($tab[$x]['statut']?' class="liuseractive"':'class="liuserdisabled"').'>';
-			print $tab[$x]['entry'];
-			if ($showfk) print '&nbsp; (fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].')';
+			if ($showfk)
+			{
+			    print '<table class="nobordernopadding centpercent"><tr><td>';
+			    print '<strong> &nbsp; <a href="edit.php?menu_handler='.$menu_handler_to_search.'&action=edit&menuId='.$menu['rowid'].'">';
+			    print $tab[$x]['title'];
+			    print '</a></strong>';
+			    print '&nbsp; (fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].')';
+			    print '</td><td align="right">';
+			    print $tab[$x]['buttons'];
+			    print '</td></tr></table>';
+			}
+			else
+			{
+			    print $tab[$x]['entry'];
+			}
 			//print ' -> B '.$tab[$x]['rowid'].' mainmenu='.$tab[$x]['mainmenu'].' leftmenu='.$tab[$x]['leftmenu'].' fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].'<br>'."\n";
 			$tree_recur_alreadyadded[$tab[$x]['rowid']]=($rang + 1);
 			// And now we search all its sons of lower level

From b186fa87590ac54664dba60f755c2aab5c98fac4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 1 Jul 2017 13:31:44 +0200
Subject: [PATCH 419/438] Fix pgsql compatibility

---
 htdocs/accountancy/customer/index.php      | 19 +++++------
 htdocs/accountancy/expensereport/index.php | 31 +++++++++---------
 htdocs/accountancy/supplier/index.php      | 38 ++++++++++------------
 3 files changed, 43 insertions(+), 45 deletions(-)

diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index 9af3d0d19d9..f1bea3bd4a1 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -23,7 +23,7 @@
 /**
  * \file htdocs/accountancy/customer/index.php
  * \ingroup Advanced accountancy
- * \brief Home customer ventilation
+ * \brief Home customer journalization page
  */
 
 require '../../main.inc.php';
@@ -58,7 +58,7 @@ if ($year == 0) {
 }
 
 // Validate History
-$action = GETPOST('action','alpha');
+$action = GETPOST('action','aZ09');
 
 
 
@@ -97,7 +97,7 @@ if ($action == 'validatehistory') {
 		$sql1 .= " AND fd.fk_code_ventilation = 0";
 	}
 
-	dol_syslog("htdocs/accountancy/customer/index.php sql=" . $sql, LOG_DEBUG);
+	dol_syslog('htdocs/accountancy/customer/index.php');
 
 	$resql1 = $db->query($sql1);
 	if (! $resql1) {
@@ -173,7 +173,7 @@ print $langs->trans("DescVentilCustomer") . '<br>';
 print $langs->trans("DescVentilMore", $langs->transnoentitiesnoconv("ValidateHistory"), $langs->transnoentitiesnoconv("ToBind")) . '<br>';
 print '<br>';
 //print '<div class="inline-block divButAction">';
-// TODO Remove this. Should be done into the repair.php script
+// TODO Remove this. Should be done always or into the repair.php script.
 if ($conf->global->MAIN_FEATURES_LEVEL > 1) print '<a class="butActionDelete" href="' . $_SERVER['PHP_SELF'] . '?year=' . $year_current . '&action=fixaccountancycode">' . $langs->trans("CleanFixHistory", $year_current) . '</a>';
 //print '</div>';
 
@@ -189,7 +189,7 @@ if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 }
 $sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")";	// We don't share object for accountancy
 
-dol_syslog("htdocs/accountancy/customer/index.php sql=" . $sql, LOG_DEBUG);
+dol_syslog('htdocs/accountancy/customer/index.php');
 $result = $db->query($sql);
 if ($result) {
 	$row = $db->fetch_row($result);
@@ -233,7 +233,7 @@ if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 }
 $sql .= " GROUP BY fd.fk_code_ventilation,aa.account_number,aa.label";
 
-dol_syslog("htdocs/accountancy/customer/index.php sql=" . $sql, LOG_DEBUG);
+dol_syslog('htdocs/accountancy/customer/index.php sql=' . $sql, LOG_DEBUG);
 $resql = $db->query($sql);
 if ($resql) {
 	$num = $db->num_rows($resql);
@@ -289,7 +289,7 @@ if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 $sql .= " AND aa.account_number IS NOT NULL";
 $sql .= " GROUP BY fd.fk_code_ventilation,aa.account_number,aa.label";
 
-dol_syslog("htdocs/accountancy/customer/index.php sql=" . $sql, LOG_DEBUG);
+dol_syslog('htdocs/accountancy/customer/index.php');
 $resql = $db->query($sql);
 if ($resql) {
 	$num = $db->num_rows($resql);
@@ -347,7 +347,6 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
 	dol_syslog('htdocs/accountancy/customer/index.php');
 	$resql = $db->query($sql);
 	if ($resql) {
-		$i = 0;
 		$num = $db->num_rows($resql);
 
 		while ($row = $db->fetch_row($resql)) {
@@ -357,7 +356,6 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
 			}
 			print '<td align="right"><b>' . price($row[13]) . '</b></td>';
 			print '</tr>';
-			$i ++;
 		}
 		$db->free($resql);
 	} else {
@@ -365,6 +363,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
 	}
 	print "</table>\n";
 
+	
 	if (! empty($conf->margin->enabled)) {
 		print "<br>\n";
 		print '<table class="noborder" width="100%">';
@@ -390,7 +389,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
 			$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
 		}
 
-		dol_syslog('htdocs/accountancy/customer/index.php:: $sql=' . $sql);
+		dol_syslog('htdocs/accountancy/customer/index.php');
 		$resql = $db->query($sql);
 		if ($resql) {
 			$num = $db->num_rows($resql);
diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
index fdbf4d1ce4b..b17aeedb4bd 100644
--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -69,7 +69,7 @@ if ($action == 'validatehistory') {
 
 	// First clean corrupted data
 	$sqlclean = "UPDATE " . MAIN_DB_PREFIX . "expensereport_det as erd";
-	$sqlclean .= " SET erd.fk_code_ventilation = 0";
+	$sqlclean .= " SET fk_code_ventilation = 0";
 	$sqlclean .= ' WHERE erd.fk_code_ventilation NOT IN ';
 	$sqlclean .= '	(SELECT accnt.rowid ';
 	$sqlclean .= '	FROM ' . MAIN_DB_PREFIX . 'accounting_account as accnt';
@@ -93,6 +93,8 @@ if ($action == 'validatehistory') {
 		$sql1 .= " AND erd.fk_code_ventilation = 0";
 	}
 
+	dol_syslog('htdocs/accountancy/expensereport/index.php');
+	
 	$resql1 = $db->query($sql1);
 	if (! $resql1) {
 		$error ++;
@@ -107,7 +109,7 @@ if ($action == 'validatehistory') {
 	$db->begin();
 
 	$sql1 = "UPDATE " . MAIN_DB_PREFIX . "expensereport_det as erd";
-	$sql1 .= " SET erd.fk_code_ventilation = 0";
+	$sql1 .= " SET fk_code_ventilation = 0";
 	$sql1 .= ' WHERE erd.fk_code_ventilation NOT IN ';
 	$sql1 .= '	(SELECT accnt.rowid ';
 	$sql1 .= '	FROM ' . MAIN_DB_PREFIX . 'accounting_account as accnt';
@@ -129,8 +131,9 @@ if ($action == 'validatehistory') {
 	$error = 0;
 	$db->begin();
 
+	// Now clean
 	$sql1 = "UPDATE " . MAIN_DB_PREFIX . "expensereport_det as erd";
-	$sql1.= " SET erd.fk_code_ventilation = 0";
+	$sql1.= " SET fk_code_ventilation = 0";
 	$sql1.= " WHERE erd.fk_expensereport IN ( SELECT er.rowid FROM " . MAIN_DB_PREFIX . "expensereport as er";
 	$sql1.= " WHERE er.date_debut >= '" . $db->idate(dol_get_first_day($year_current, 1, false)) . "'";
 	$sql1.= " AND er.date_debut <= '" . $db->idate(dol_get_last_day($year_current, 12, false)) . "'";
@@ -166,25 +169,25 @@ print $langs->trans("DescVentilExpenseReportMore", $langs->transnoentitiesnoconv
 print '<br>';
 
 //print '<div class="inline-block divButAction">';
-// TODO Remove this. Should be done always.
+// TODO Remove this. Should be done always or into the repair.php script.
 if ($conf->global->MAIN_FEATURES_LEVEL > 1) print '<a class="butActionDelete" href="' . $_SERVER['PHP_SELF'] . '?year=' . $year_current . '&action=fixaccountancycode">' . $langs->trans("CleanFixHistory", $year_current) . '</a>';
 //print '</div>';
 
 
-$buttonbind = '<a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?year=' . $year_current . '&action=validatehistory">' . $langs->trans("ValidateHistory") . '</a>';
-$buttonreset = '<a class="butActionDelete" href="' . $_SERVER['PHP_SELF'] . '?year=' . $year_current . '&action=cleanaccountancycode">' . $langs->trans("CleanHistory", $year_current) . '</a>';
 
 
 
 $y = $year_current;
 
-print '<br>';
+$buttonbind = '<a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?year=' . $year_current . '&action=validatehistory">' . $langs->trans("ValidateHistory") . '</a>';
+$buttonreset = '<a class="butActionDelete" href="' . $_SERVER['PHP_SELF'] . '?year=' . $year_current . '&action=cleanaccountancycode">' . $langs->trans("CleanHistory", $year_current) . '</a>';
+
 
 print_fiche_titre($langs->trans("OverviewOfAmountOfLinesNotBound"), $buttonbind, '');
 
 
 print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre"><td width="200" align="left">' . $langs->trans("Account") . '</td>';
+print '<tr class="liste_titre"><td width="200">' . $langs->trans("Account") . '</td>';
 print '<td width="200" align="left">' . $langs->trans("Label") . '</td>';
 for($i = 1; $i <= 12; $i ++) {
     print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . '</td>';
@@ -196,7 +199,7 @@ $sql .= "  " . $db->ifsql('aa.label IS NULL', "'".$langs->trans('NotMatch')."'",
 for($i = 1; $i <= 12; $i ++) {
     $sql .= "  SUM(" . $db->ifsql('MONTH(er.date_debut)=' . $i, 'erd.total_ht', '0') . ") AS month" . str_pad($i, 2, '0', STR_PAD_LEFT) . ",";
 }
-$sql .= " ROUND(SUM(erd.total_ht),2) as total";
+$sql .= " SUM(erd.total_ht) as total";
 $sql .= " FROM " . MAIN_DB_PREFIX . "expensereport_det as erd";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "expensereport as er ON er.rowid = erd.fk_expensereport";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = erd.fk_code_ventilation";
@@ -237,7 +240,7 @@ print_fiche_titre($langs->trans("OverviewOfAmountOfLinesBound"), $buttonreset, '
 
 
 print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre"><td width="200" align="left">' . $langs->trans("Account") . '</td>';
+print '<tr class="liste_titre"><td width="200">' . $langs->trans("Account") . '</td>';
 print '<td width="200" align="left">' . $langs->trans("Label") . '</td>';
 for($i = 1; $i <= 12; $i ++) {
     print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . '</td>';
@@ -260,7 +263,7 @@ $sql .= " AND er.entity IN (" . getEntity('expensereport', 0) . ")";     // We d
 $sql .= " AND aa.account_number IS NOT NULL";
 $sql .= " GROUP BY erd.fk_code_ventilation,aa.account_number,aa.label";
 
-dol_syslog('/accountancy/expensereport/index.php:: sql=' . $sql);
+dol_syslog('htdocs/accountancy/expensereport/index.php');
 $resql = $db->query($sql);
 if ($resql) {
     $num = $db->num_rows($resql);
@@ -304,7 +307,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
     for($i = 1; $i <= 12; $i ++) {
     	$sql .= " SUM(" . $db->ifsql('MONTH(er.date_create)=' . $i, 'erd.total_ht', '0') . ") AS month" . str_pad($i, 2, '0', STR_PAD_LEFT) . ",";
     }
-    $sql .= " ROUND(SUM(erd.total_ht),2) as total";
+    $sql .= " SUM(erd.total_ht) as total";
     $sql .= " FROM " . MAIN_DB_PREFIX . "expensereport_det as erd";
     $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "expensereport as er ON er.rowid = erd.fk_expensereport";
     $sql .= " WHERE er.date_debut >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
@@ -312,14 +315,12 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
     $sql .= " AND er.fk_statut > 0 ";
     $sql .= " AND er.entity IN (" . getEntity('expensereport', 0) . ")";     // We don't share object for accountancy
     
-    dol_syslog('/accountancy/expensereport/index.php:: sql=' . $sql);
+    dol_syslog('htdocs/accountancy/expensereport/index.php');
     $resql = $db->query($sql);
     if ($resql) {
     	$num = $db->num_rows($resql);
     
     	while ( $row = $db->fetch_row($resql)) {
-    
-    
     		print '<tr><td>' . $row[0] . '</td>';
     			for($i = 1; $i <= 12; $i ++) {
     			print '<td align="right">' . price($row[$i]) . '</td>';
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index fb5f28fc27d..f862feb5ba3 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -21,12 +21,13 @@
 /**
  * \file		htdocs/accountancy/supplier/index.php
  * \ingroup		Advanced accountancy
- * \brief		Home supplier ventilation
+ * \brief		Home supplier journalization page
  */
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
 
 // Langs
 $langs->load("compta");
@@ -55,7 +56,7 @@ if ($year == 0) {
 }
 
 // Validate History
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 
 /*
@@ -93,6 +94,8 @@ if ($action == 'validatehistory') {
 		$sql1 .= " AND fd.fk_code_ventilation = 0";
 	}
 
+	dol_syslog('htdocs/accountancy/supplier/index.php');
+
 	$resql1 = $db->query($sql1);
 	if (! $resql1) {
 		$error ++;
@@ -159,33 +162,28 @@ llxHeader('', $langs->trans("SuppliersVentilation"));
 $textprevyear = '<a href="' . $_SERVER["PHP_SELF"] . '?year=' . ($year_current - 1) . '">' . img_previous() . '</a>';
 $textnextyear = '&nbsp;<a href="' . $_SERVER["PHP_SELF"] . '?year=' . ($year_current + 1) . '">' . img_next() . '</a>';
 
-print load_fiche_titre($langs->trans("SuppliersVentilation") . "&nbsp;" . $textprevyear . "&nbsp;" . $langs->trans("Year") . "&nbsp;" . $year_start . "&nbsp;" . $textnextyear, '', 'title_accountancy');
+print load_fiche_titre($langs->trans("SuppliersVentilation") . " " . $textprevyear . "&nbsp;" . $langs->trans("Year") . "&nbsp;" . $year_start . "&nbsp;" . $textnextyear, '', 'title_accountancy');
 
 print $langs->trans("DescVentilSupplier") . '<br>';
 print $langs->trans("DescVentilMore", $langs->transnoentitiesnoconv("ValidateHistory"), $langs->transnoentitiesnoconv("ToBind")) . '<br>';
 print '<br>';
 
 //print '<div class="inline-block divButAction">';
-// TODO Remove this. Should be done always.
+// TODO Remove this. Should be done always or into the repair.php script.
 if ($conf->global->MAIN_FEATURES_LEVEL > 1) print '<a class="butActionDelete" href="' . $_SERVER['PHP_SELF'] . '?year=' . $year_current . '&action=fixaccountancycode">' . $langs->trans("CleanFixHistory", $year_current) . '</a>';
 //print '</div>';
 
+
+$y = $year_current;
+
 $buttonbind = '<a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?year=' . $year_current . '&action=validatehistory">' . $langs->trans("ValidateHistory") . '</a>';
 $buttonreset = '<a class="butActionDelete" href="' . $_SERVER['PHP_SELF'] . '?year=' . $year_current . '&action=cleanaccountancycode">' . $langs->trans("CleanHistory", $year_current) . '</a>';
 
 
-
-$y = $year_current;
-
-$var = true;
-
-
-print '<br>';
-
 print_fiche_titre($langs->trans("OverviewOfAmountOfLinesNotBound"), $buttonbind, '');
 
 print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre"><td width="200" align="left">' . $langs->trans("Account") . '</td>';
+print '<tr class="liste_titre"><td width="200">' . $langs->trans("Account") . '</td>';
 print '<td width="200" align="left">' . $langs->trans("Label") . '</td>';
 for($i = 1; $i <= 12; $i ++) {
 	print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . '</td>';
@@ -197,7 +195,7 @@ $sql .= "  " . $db->ifsql('aa.label IS NULL', "'".$langs->trans('NotMatch')."'",
 for($i = 1; $i <= 12; $i ++) {
 	$sql .= "  SUM(" . $db->ifsql('MONTH(ff.datef)=' . $i, 'ffd.total_ht', '0') . ") AS month" . str_pad($i, 2, '0', STR_PAD_LEFT) . ",";
 }
-$sql .= "  ROUND(SUM(ffd.total_ht),2) as total";
+$sql .= "  SUM(ffd.total_ht) as total";
 $sql .= " FROM " . MAIN_DB_PREFIX . "facture_fourn_det as ffd";
 $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "facture_fourn as ff ON ff.rowid = ffd.fk_facture_fourn";
 $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = ffd.fk_code_ventilation";
@@ -208,7 +206,7 @@ $sql .= " AND ff.entity IN (" . getEntity('facture_fourn', 0) . ")";     // We d
 $sql .= " AND aa.account_number IS NULL";
 $sql .= " GROUP BY ffd.fk_code_ventilation,aa.account_number,aa.label";
 
-dol_syslog('/accountancy/supplier/index.php:: sql=' . $sql);
+dol_syslog('htdocs/accountancy/supplier/index.php');
 $resql = $db->query($sql);
 if ($resql) {
 	$num = $db->num_rows($resql);
@@ -239,7 +237,7 @@ print '<br>';
 print_fiche_titre($langs->trans("OverviewOfAmountOfLinesBound"), $buttonreset, '');
 
 print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre"><td width="200" align="left">' . $langs->trans("Account") . '</td>';
+print '<tr class="liste_titre"><td width="200">' . $langs->trans("Account") . '</td>';
 print '<td width="200" align="left">' . $langs->trans("Label") . '</td>';
 for($i = 1; $i <= 12; $i ++) {
     print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . '</td>';
@@ -251,7 +249,7 @@ $sql .= "  " . $db->ifsql('aa.label IS NULL', "'".$langs->trans('NotMatch')."'",
 for($i = 1; $i <= 12; $i ++) {
     $sql .= "  SUM(" . $db->ifsql('MONTH(ff.datef)=' . $i, 'ffd.total_ht', '0') . ") AS month" . str_pad($i, 2, '0', STR_PAD_LEFT) . ",";
 }
-$sql .= "  ROUND(SUM(ffd.total_ht),2) as total";
+$sql .= "  SUM(ffd.total_ht) as total";
 $sql .= " FROM " . MAIN_DB_PREFIX . "facture_fourn_det as ffd";
 $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "facture_fourn as ff ON ff.rowid = ffd.fk_facture_fourn";
 $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = ffd.fk_code_ventilation";
@@ -262,7 +260,7 @@ $sql .= " AND ff.entity IN (" . getEntity('facture_fourn', 0) . ")";     // We d
 $sql .= " AND aa.account_number IS NOT NULL";
 $sql .= " GROUP BY ffd.fk_code_ventilation,aa.account_number,aa.label";
 
-dol_syslog('/accountancy/supplier/index.php:: sql=' . $sql);
+dol_syslog('htdocs/accountancy/supplier/index.php');
 $resql = $db->query($sql);
 if ($resql) {
     $num = $db->num_rows($resql);
@@ -306,7 +304,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
     for($i = 1; $i <= 12; $i ++) {
     	$sql .= "  SUM(" . $db->ifsql('MONTH(ff.datef)=' . $i, 'ffd.total_ht', '0') . ") AS month" . str_pad($i, 2, '0', STR_PAD_LEFT) . ",";
     }
-    $sql .= "  ROUND(SUM(ffd.total_ht),2) as total";
+    $sql .= "  SUM(ffd.total_ht) as total";
     $sql .= " FROM " . MAIN_DB_PREFIX . "facture_fourn_det as ffd";
     $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "facture_fourn as ff ON ff.rowid = ffd.fk_facture_fourn";
     $sql .= " WHERE ff.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
@@ -314,7 +312,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
     $sql .= "  AND ff.fk_statut > 0 ";
     $sql .= " AND ff.entity IN (" . getEntity('facture_fourn', 0) . ")";     // We don't share object for accountancy
 
-    dol_syslog('/accountancy/supplier/index.php:: sql=' . $sql);
+    dol_syslog('htdocs/accountancy/supplier/index.php');
     $resql = $db->query($sql);
     if ($resql) {
     	$num = $db->num_rows($resql);

From 8dda0afc0722ddceda7dea6bb5d9f46d73a4e4b9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 1 Jul 2017 14:18:09 +0200
Subject: [PATCH 420/438] Look and feel v6

---
 htdocs/comm/propal/card.php               |  2 +-
 htdocs/comm/propal/class/propal.class.php | 43 +++++++-----
 htdocs/comm/propal/contact.php            | 14 ++--
 htdocs/comm/propal/document.php           |  2 +-
 htdocs/comm/propal/info.php               |  4 +-
 htdocs/comm/propal/list.php               | 42 ++++++------
 htdocs/comm/propal/note.php               | 20 +++---
 htdocs/commande/card.php                  |  2 +-
 htdocs/commande/class/commande.class.php  | 37 ++++++----
 htdocs/commande/contact.php               | 14 ++--
 htdocs/commande/document.php              | 26 +++----
 htdocs/commande/info.php                  |  2 +-
 htdocs/commande/list.php                  | 82 +++++++++++------------
 htdocs/commande/note.php                  | 26 +++----
 htdocs/compta/stats/casoc.php             | 54 +++++++--------
 htdocs/loan/card.php                      |  9 +--
 htdocs/theme/eldy/style.css.php           |  4 +-
 htdocs/theme/md/style.css.php             |  4 +-
 18 files changed, 204 insertions(+), 183 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 4ee029ee8e8..4668c6a56a4 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1739,7 +1739,7 @@ if ($action == 'create')
 
 	// Proposal card
 
-	$linkback = '<a href="' . DOL_URL_ROOT . '/comm/propal/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+	$linkback = '<a href="' . DOL_URL_ROOT . '/comm/propal/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
 
 	$morehtmlref='<div class="refidno">';
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index d7f2411f615..a59fefc7a89 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -254,7 +254,7 @@ class Propal extends CommonObject
             $tva_npr = get_default_npr($mysoc,$this->thirdparty,$prod->id);
             if (empty($tva_tx)) $tva_npr=0;
             $vat_src_code = '';     // May be defined into tva_tx
-            
+
             $localtax1_tx = get_localtax($tva_tx,1,$mysoc,$this->thirdparty,$tva_npr);
             $localtax2_tx = get_localtax($tva_tx,2,$mysoc,$this->thirdparty,$tva_npr);
 
@@ -433,7 +433,7 @@ class Propal extends CommonObject
 
         // Check parameters
         if ($type < 0) return -1;
-      
+
         if ($this->statut == self::STATUS_DRAFT)
         {
             $this->db->begin();
@@ -1392,17 +1392,17 @@ class Propal extends CommonObject
             return -1;
         }
     }
-	
+
 	/**
 	 * Load array lines
-	 * 
+	 *
 	 * @param		int		$only_product	Return only physical products
 	 * @return		int						<0 if KO, >0 if OK
 	 */
 	function fetch_lines($only_product=0)
 	{
 		$this->lines=array();
-		
+
 		$sql = 'SELECT d.rowid, d.fk_propal, d.fk_parent_line, d.label as custom_label, d.description, d.price, d.vat_src_code, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.qty, d.fk_remise_except, d.remise_percent, d.subprice, d.fk_product,';
 		$sql.= ' d.info_bits, d.total_ht, d.total_tva, d.total_localtax1, d.total_localtax2, d.total_ttc, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht, d.special_code, d.rang, d.product_type,';
 		$sql.= ' d.fk_unit,';
@@ -1422,7 +1422,7 @@ class Propal extends CommonObject
 			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 			$num = $this->db->num_rows($result);
-			
+
 			$i = 0;
 			while ($i < $num)
 			{
@@ -1489,9 +1489,9 @@ class Propal extends CommonObject
 				//print "xx $i ".$this->lines[$i]->fk_product;
 				$i++;
 			}
-			
+
 			$this->db->free($result);
-			
+
 			return 1;
 		}
 		else
@@ -2779,7 +2779,7 @@ class Propal extends CommonObject
     function availability($availability_id, $notrigger=0)
     {
         global $user;
-        
+
         if ($this->statut >= self::STATUS_DRAFT)
         {
         	$error=0;
@@ -3277,13 +3277,14 @@ class Propal extends CommonObject
     /**
      *	Return clicable link of object (with eventually picto)
      *
-     *	@param      int		$withpicto		Add picto into link
-     *	@param      string	$option			Where point the link ('expedition', 'document', ...)
-     *	@param      string	$get_params    	Parametres added to url
-     *  @param	    int   	$notooltip		1=Disable tooltip
-     *	@return     string          		String with URL
+     *	@param      int		$withpicto		          Add picto into link
+     *	@param      string	$option			          Where point the link ('expedition', 'document', ...)
+     *	@param      string	$get_params    	          Parametres added to url
+     *  @param	    int   	$notooltip		          1=Disable tooltip
+     *  @param      int     $save_lastsearch_value    -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+     *	@return     string          		          String with URL
      */
-    function getNomUrl($withpicto=0,$option='', $get_params='', $notooltip=0)
+    function getNomUrl($withpicto=0, $option='', $get_params='', $notooltip=0, $save_lastsearch_value=-1)
     {
         global $langs, $conf, $user;
 
@@ -3318,6 +3319,14 @@ class Propal extends CommonObject
             if ($option == 'document') {
                 $url = DOL_URL_ROOT.'/comm/propal/document.php?id='.$this->id. $get_params;
             }
+
+            if ($option != 'nolink')
+            {
+                // Add param to save lastsearch_values or not
+                $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+                if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+                if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+            }
         }
 
         $linkclose='';
@@ -3352,9 +3361,9 @@ class Propal extends CommonObject
     function getLinesArray()
     {
         // TODO Duplicate with fetch_lines ? Wich one to keep ?
-        
+
         $this->lines = array();
-        
+
         $sql = 'SELECT pt.rowid, pt.label as custom_label, pt.description, pt.fk_product, pt.fk_remise_except,';
         $sql.= ' pt.qty, pt.vat_src_code, pt.tva_tx, pt.remise_percent, pt.subprice, pt.info_bits,';
         $sql.= ' pt.total_ht, pt.total_tva, pt.total_ttc, pt.fk_product_fournisseur_price as fk_fournprice, pt.buy_price_ht as pa_ht, pt.special_code, pt.localtax1_tx, pt.localtax2_tx,';
diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php
index 3e9e5a1205d..01e851769a7 100644
--- a/htdocs/comm/propal/contact.php
+++ b/htdocs/comm/propal/contact.php
@@ -155,10 +155,10 @@ if ($object->id > 0)
 
 
 	// Proposal card
-	
-	$linkback = '<a href="' . DOL_URL_ROOT . '/comm/propal/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
-	
-	
+
+	$linkback = '<a href="' . DOL_URL_ROOT . '/comm/propal/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+
+
 	$morehtmlref='<div class="refidno">';
 	// Ref customer
 	$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
@@ -199,12 +199,12 @@ if ($object->id > 0)
 	    }
 	}
 	$morehtmlref.='</div>';
-	
+
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
 
 	dol_fiche_end();
-	
-	
+
+
 	// Contacts lines (modules that overwrite templates must declare this into descriptor)
 	$dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
 	foreach($dirtpls as $reldir)
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index 0c68a292109..65b8eef5a66 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -103,7 +103,7 @@ if ($object->id > 0)
 
 	// Proposal card
 
-	$linkback = '<a href="' . DOL_URL_ROOT . '/comm/propal/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+	$linkback = '<a href="' . DOL_URL_ROOT . '/comm/propal/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
 
 	$morehtmlref='<div class="refidno">';
diff --git a/htdocs/comm/propal/info.php b/htdocs/comm/propal/info.php
index d8af8fb87a8..a94eeaa092c 100644
--- a/htdocs/comm/propal/info.php
+++ b/htdocs/comm/propal/info.php
@@ -66,7 +66,7 @@ $object->info($object->id);
 
 // Proposal card
 
-$linkback = '<a href="' . DOL_URL_ROOT . '/comm/propal/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+$linkback = '<a href="' . DOL_URL_ROOT . '/comm/propal/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
 
 $morehtmlref='<div class="refidno">';
@@ -122,6 +122,6 @@ dol_print_object_info($object);
 print '</div>';
 
 dol_fiche_end();
-	
+
 llxFooter();
 $db->close();
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 39ee93fd9cd..e9626a638b8 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -80,9 +80,9 @@ $object_statut=GETPOST('propal_statut');
 $sall=GETPOST('sall', 'alphanohtml');
 $mesg=(GETPOST("msg") ? GETPOST("msg") : GETPOST("mesg"));
 
-$day=GETPOST("day","int");
-$month=GETPOST("month","int");
-$year=GETPOST("year","int");
+$search_day=GETPOST("search_day","int");
+$search_month=GETPOST("search_month","int");
+$search_year=GETPOST("search_year","int");
 
 $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
@@ -197,9 +197,9 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
 	$search_type='';
 	$search_country='';
 	$search_type_thirdparty='';
-	$year='';
-    $month='';
-    $day='';
+	$search_year='';
+    $search_month='';
+    $search_day='';
 	$viewstatut='';
 	$object_statut='';
 	$toselect='';
@@ -295,18 +295,18 @@ if ($viewstatut != '' && $viewstatut != '-1')
 {
 	$sql.= ' AND p.fk_statut IN ('.$db->escape($viewstatut).')';
 }
-if ($month > 0)
+if ($search_month > 0)
 {
-    if ($year > 0 && empty($day))
-    $sql.= " AND p.datep BETWEEN '".$db->idate(dol_get_first_day($year,$month,false))."' AND '".$db->idate(dol_get_last_day($year,$month,false))."'";
-    else if ($year > 0 && ! empty($day))
-    $sql.= " AND p.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."'";
+    if ($search_year > 0 && empty($search_day))
+    $sql.= " AND p.datep BETWEEN '".$db->idate(dol_get_first_day($search_year,$search_month,false))."' AND '".$db->idate(dol_get_last_day($search_year,$search_month,false))."'";
+    else if ($search_year > 0 && ! empty($search_day))
+    $sql.= " AND p.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_month, $search_day, $search_year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_month, $search_day, $search_year))."'";
     else
-    $sql.= " AND date_format(p.datep, '%m') = '".$db->escape($month)."'";
+    $sql.= " AND date_format(p.datep, '%m') = '".$db->escape($search_month)."'";
 }
-else if ($year > 0)
+else if ($search_year > 0)
 {
-	$sql.= " AND p.datep BETWEEN '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
+	$sql.= " AND p.datep BETWEEN '".$db->idate(dol_get_first_day($search_year,1,false))."' AND '".$db->idate(dol_get_last_day($search_year,12,false))."'";
 }
 if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$db->escape($search_sale);
 if ($search_user > 0)
@@ -369,8 +369,8 @@ if ($resql)
     if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
 	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
 	if ($sall)				 $param.='&sall='.urlencode($sall);
-	if ($month)              $param.='&month='.urlencode($month);
-	if ($year)               $param.='&year='.urlencode($year);
+	if ($search_month)              $param.='&search_month='.urlencode($search_month);
+	if ($search_year)               $param.='&search_year='.urlencode($search_year);
     if ($search_ref)         $param.='&search_ref='.urlencode($search_ref);
     if ($search_refcustomer) $param.='&search_refcustomer='.urlencode($search_refcustomer);
     if ($search_societe)     $param.='&search_societe='.urlencode($search_societe);
@@ -613,11 +613,10 @@ if ($resql)
 	{
 	    print '<td class="liste_titre" colspan="1" align="center">';
     	//print $langs->trans('Month').': ';
-    	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.$day.'">';
-    	print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
+    	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_day" value="'.$search_day.'">';
+    	print '<input class="flat" type="text" size="1" maxlength="2" name="search_month" value="'.$search_month.'">';
     	//print '&nbsp;'.$langs->trans('Year').': ';
-    	$syear = $year;
-    	$formother->select_year($syear,'year',1, 20, 5);
+    	$formother->select_year($search_year,'search_year',1, 20, 5);
     	print '</td>';
 	}
 	// Date end
@@ -755,7 +754,6 @@ if ($resql)
 	{
 		$obj = $db->fetch_object($resql);
 
-
     	$objectstatic->id=$obj->rowid;
     	$objectstatic->ref=$obj->ref;
 
@@ -768,7 +766,7 @@ if ($resql)
     		print '<table class="nobordernopadding"><tr class="nocellnopadd">';
             // Picto + Ref
     		print '<td class="nobordernopadding nowrap">';
-    		print $objectstatic->getNomUrl(1);
+    		print $objectstatic->getNomUrl(1, '', '', 0, 1);
     		print '</td>';
             // Warning
             $warnornote='';
diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php
index ec1dac31c24..29fc43b0899 100644
--- a/htdocs/comm/propal/note.php
+++ b/htdocs/comm/propal/note.php
@@ -56,7 +56,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';	// Must be include,
 
 
 /*
- * View 
+ * View
  */
 
 llxHeader('',$langs->trans('Proposal'),'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos');
@@ -79,13 +79,13 @@ if ($id > 0 || ! empty($ref))
 			$cssclass='titlefield';
 			//if ($action == 'editnote_public') $cssclass='titlefieldcreate';
 			//if ($action == 'editnote_private') $cssclass='titlefieldcreate';
-				
-			
+
+
 			// Proposal card
-			
-			$linkback = '<a href="' . DOL_URL_ROOT . '/comm/propal/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
-			
-			
+
+			$linkback = '<a href="' . DOL_URL_ROOT . '/comm/propal/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+
+
 			$morehtmlref='<div class="refidno">';
 			// Ref customer
 			$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
@@ -126,17 +126,17 @@ if ($id > 0 || ! empty($ref))
 			    }
 			}
 			$morehtmlref.='</div>';
-			
+
 			dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 			print '<div class="fichecenter">';
 			print '<div class="underbanner clearboth"></div>';
-			
+
 			$cssclass="titlefield";
 			include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
 			print '</div>';
-			
+
 			dol_fiche_end();
 		}
 	}
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 826046db3ee..13fe07f78df 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1915,7 +1915,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 
 		// Order card
 
-		$linkback = '<a href="' . DOL_URL_ROOT . '/commande/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+		$linkback = '<a href="' . DOL_URL_ROOT . '/commande/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
 
 		$morehtmlref='<div class="refidno">';
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 93df2f1aa0b..0910fedcb9d 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -706,10 +706,10 @@ class Commande extends CommonOrder
 
         // Clean parameters
         $this->brouillon = 1;		// set command as draft
-		
+
 		// $date_commande is deprecated
         $date = ($this->date_commande ? $this->date_commande : $this->date);
-		
+
 		// Multicurrency (test on $this->multicurrency_tx because we sould take the default rate only if not using origin rate)
 		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $date);
 		else $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
@@ -1468,7 +1468,7 @@ class Commande extends CommonOrder
             $tva_npr = get_default_npr($mysoc,$this->thirdparty,$prod->id);
             if (empty($tva_tx)) $tva_npr=0;
             $vat_src_code = '';     // May be defined into tva_tx
-            
+
             $localtax1_tx=get_localtax($tva_tx,1,$this->thirdparty,$mysoc,$tva_npr);
             $localtax2_tx=get_localtax($tva_tx,2,$this->thirdparty,$mysoc,$tva_npr);
 
@@ -1798,7 +1798,7 @@ class Commande extends CommonOrder
                 $line->product_type     = $objp->product_type;
                 $line->qty              = $objp->qty;
 
-                $line->vat_src_code     = $objp->vat_src_code; 
+                $line->vat_src_code     = $objp->vat_src_code;
                 $line->tva_tx           = $objp->tva_tx;
 	            $line->localtax1_tx     = $objp->localtax1_tx;
                 $line->localtax2_tx     = $objp->localtax2_tx;
@@ -3106,7 +3106,7 @@ class Commande extends CommonOrder
         $error = 0;
 
         dol_syslog(get_class($this) . "::delete ".$this->id, LOG_DEBUG);
-        
+
         $this->db->begin();
 
         if (! $error && ! $notrigger)
@@ -3369,24 +3369,33 @@ class Commande extends CommonOrder
     /**
      *	Return clicable link of object (with eventually picto)
      *
-     *	@param      int			$withpicto      Add picto into link
-     *	@param      int			$option         Where point the link (0=> main card, 1,2 => shipment)
-     *	@param      int			$max          	Max length to show
-     *	@param      int			$short			???
-     *  @param	    int   	    $notooltip		1=Disable tooltip
-     *	@return     string          			String with URL
+     *	@param      int			$withpicto                Add picto into link
+     *	@param      int			$option                   Where point the link (0=> main card, 1,2 => shipment)
+     *	@param      int			$max          	          Max length to show
+     *	@param      int			$short			          ???
+     *  @param	    int   	    $notooltip		          1=Disable tooltip
+     *  @param      int         $save_lastsearch_value    -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+     *	@return     string          			          String with URL
      */
-    function getNomUrl($withpicto=0,$option=0,$max=0,$short=0,$notooltip=0)
+    function getNomUrl($withpicto=0, $option=0, $max=0, $short=0, $notooltip=0, $save_lastsearch_value=-1)
     {
         global $conf, $langs, $user;
 
         if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
-        
+
         $result='';
 
         if (! empty($conf->expedition->enabled) && ($option == 1 || $option == 2)) $url = DOL_URL_ROOT.'/expedition/shipment.php?id='.$this->id;
         else $url = DOL_URL_ROOT.'/commande/card.php?id='.$this->id;
 
+        if ($option !== 'nolink')
+        {
+            // Add param to save lastsearch_values or not
+            $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+            if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+            if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+        }
+
         if ($short) return $url;
 
         $picto = 'order';
@@ -3418,7 +3427,7 @@ class Commande extends CommonOrder
 		    $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
 		    $linkclose.=' class="classfortooltip"';
 		}
-		
+
         $linkstart = '<a href="'.$url.'"';
         $linkstart.=$linkclose.'>';
         $linkend='</a>';
diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php
index fe37a630c5d..0eb4ed2cd63 100644
--- a/htdocs/commande/contact.php
+++ b/htdocs/commande/contact.php
@@ -142,16 +142,16 @@ if ($id > 0 || ! empty($ref))
 	if ($object->fetch($id, $ref) > 0)
 	{
 	    $object->fetch_thirdparty();
-	    
+
 		$head = commande_prepare_head($object);
 		dol_fiche_head($head, 'contact', $langs->trans("CustomerOrder"), -1, 'order');
 
-		
+
 		// Order card
-		
-		$linkback = '<a href="' . DOL_URL_ROOT . '/commande/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
-		
-		
+
+		$linkback = '<a href="' . DOL_URL_ROOT . '/commande/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+
+
 		$morehtmlref='<div class="refidno">';
 		// Ref customer
 		$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
@@ -191,7 +191,7 @@ if ($id > 0 || ! empty($ref))
 	            }
 	        }
 	    }
-		$morehtmlref.='</div>';		
+		$morehtmlref.='</div>';
 
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
 
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index 0996907b245..7eea9c95877 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -101,12 +101,12 @@ if ($id > 0 || ! empty($ref))
 		{
 		    $totalsize+=$file['size'];
 		}
-		
+
 		// Order card
-		
-		$linkback = '<a href="' . DOL_URL_ROOT . '/commande/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
-		
-		
+
+		$linkback = '<a href="' . DOL_URL_ROOT . '/commande/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+
+
 		$morehtmlref='<div class="refidno">';
 		// Ref customer
 		$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
@@ -147,25 +147,25 @@ if ($id > 0 || ! empty($ref))
 		    }
 		}
 		$morehtmlref.='</div>';
-		
+
 		// Order card
-		
+
 		$linkback = '<a href="' . DOL_URL_ROOT . '/commande/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
-		
-		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);	
-		
+
+		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
 		print '<div class="fichecenter">';
 		print '<div class="underbanner clearboth"></div>';
-		
+
 		print '<table class="border" width="100%">';
 
 		print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
 		print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
 
 		print "</table>\n";
-		
+
 		print "</div>\n";
-		
+
 		print dol_fiche_end();
 
 		$modulepart = 'commande';
diff --git a/htdocs/commande/info.php b/htdocs/commande/info.php
index 02b631c4c8a..05adc9def54 100644
--- a/htdocs/commande/info.php
+++ b/htdocs/commande/info.php
@@ -65,7 +65,7 @@ dol_fiche_head($head, 'info', $langs->trans("CustomerOrder"), -1, 'order');
 
 // Order card
 
-$linkback = '<a href="' . DOL_URL_ROOT . '/commande/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+$linkback = '<a href="' . DOL_URL_ROOT . '/commande/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
 $morehtmlref='<div class="refidno">';
 // Ref customer
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 73fa9c5b66e..8ce3ba7cd04 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -51,12 +51,12 @@ $show_files=GETPOST('show_files','int');
 $confirm=GETPOST('confirm','alpha');
 $toselect = GETPOST('toselect', 'array');
 
-$orderyear=GETPOST("orderyear","int");
-$ordermonth=GETPOST("ordermonth","int");
-$orderday=GETPOST("orderday","int");
-$deliveryyear=GETPOST("deliveryyear","int");
-$deliverymonth=GETPOST("deliverymonth","int");
-$deliveryday=GETPOST("deliveryday","int");
+$search_orderyear=GETPOST("search_orderyear","int");
+$search_ordermonth=GETPOST("search_ordermonth","int");
+$search_orderday=GETPOST("search_orderday","int");
+$search_deliveryyear=GETPOST("search_deliveryyear","int");
+$search_deliverymonth=GETPOST("search_deliverymonth","int");
+$search_deliveryday=GETPOST("search_deliveryday","int");
 $search_product_category=GETPOST('search_product_category','int');
 $search_ref=GETPOST('search_ref','alpha')!=''?GETPOST('search_ref','alpha'):GETPOST('sref','alpha');
 $search_ref_customer=GETPOST('search_ref_customer','alpha');
@@ -180,12 +180,12 @@ if (empty($reshook))
         $search_total_ht='';
         $search_total_vat='';
         $search_total_ttc='';
-        $orderyear='';
-        $ordermonth='';
-    	$orderday='';
-    	$deliveryday='';
-    	$deliverymonth='';
-        $deliveryyear='';
+        $search_orderyear='';
+        $search_ordermonth='';
+    	$search_orderday='';
+    	$search_deliveryday='';
+    	$search_deliverymonth='';
+        $search_deliveryyear='';
         $viewstatut='';
         $billed='';
         $toselect='';
@@ -499,31 +499,31 @@ if ($viewstatut <> '')
 		$sql .= ' AND ((c.fk_statut IN (1,2)) OR (c.fk_statut = 3 AND c.facture = 0))'; // validated, in process or closed but not billed
 	}
 }
-if ($ordermonth > 0)
+if ($search_ordermonth > 0)
 {
-    if ($orderyear > 0 && empty($orderday))
-    $sql.= " AND c.date_commande BETWEEN '".$db->idate(dol_get_first_day($orderyear,$ordermonth,false))."' AND '".$db->idate(dol_get_last_day($orderyear,$ordermonth,false))."'";
-    else if ($orderyear > 0 && ! empty($orderday))
-    $sql.= " AND c.date_commande BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $ordermonth, $orderday, $orderyear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $ordermonth, $orderday, $orderyear))."'";
+    if ($search_orderyear > 0 && empty($search_orderday))
+    $sql.= " AND c.date_commande BETWEEN '".$db->idate(dol_get_first_day($search_orderyear,$search_ordermonth,false))."' AND '".$db->idate(dol_get_last_day($search_orderyear,$search_ordermonth,false))."'";
+    else if ($search_orderyear > 0 && ! empty($search_orderday))
+    $sql.= " AND c.date_commande BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_ordermonth, $search_orderday, $search_orderyear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_ordermonth, $search_orderday, $search_orderyear))."'";
     else
-    $sql.= " AND date_format(c.date_commande, '%m') = '".$ordermonth."'";
+    $sql.= " AND date_format(c.date_commande, '%m') = '".$search_ordermonth."'";
 }
-else if ($orderyear > 0)
+else if ($search_orderyear > 0)
 {
-    $sql.= " AND c.date_commande BETWEEN '".$db->idate(dol_get_first_day($orderyear,1,false))."' AND '".$db->idate(dol_get_last_day($orderyear,12,false))."'";
+    $sql.= " AND c.date_commande BETWEEN '".$db->idate(dol_get_first_day($search_orderyear,1,false))."' AND '".$db->idate(dol_get_last_day($search_orderyear,12,false))."'";
 }
-if ($deliverymonth > 0)
+if ($search_deliverymonth > 0)
 {
-    if ($deliveryyear > 0 && empty($deliveryday))
-    $sql.= " AND c.date_livraison BETWEEN '".$db->idate(dol_get_first_day($deliveryyear,$deliverymonth,false))."' AND '".$db->idate(dol_get_last_day($deliveryyear,$deliverymonth,false))."'";
-    else if ($deliveryyear > 0 && ! empty($deliveryday))
-    $sql.= " AND c.date_livraison BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $deliverymonth, $deliveryday, $deliveryyear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $deliverymonth, $deliveryday, $deliveryyear))."'";
+    if ($search_deliveryyear > 0 && empty($search_deliveryday))
+    $sql.= " AND c.date_livraison BETWEEN '".$db->idate(dol_get_first_day($search_deliveryyear,$search_deliverymonth,false))."' AND '".$db->idate(dol_get_last_day($search_deliveryyear,$search_deliverymonth,false))."'";
+    else if ($search_deliveryyear > 0 && ! empty($search_deliveryday))
+    $sql.= " AND c.date_livraison BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_deliverymonth, $search_deliveryday, $search_deliveryyear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_deliverymonth, $search_deliveryday, $search_deliveryyear))."'";
     else
-    $sql.= " AND date_format(c.date_livraison, '%m') = '".$deliverymonth."'";
+    $sql.= " AND date_format(c.date_livraison, '%m') = '".$search_deliverymonth."'";
 }
-else if ($deliveryyear > 0)
+else if ($search_deliveryyear > 0)
 {
-    $sql.= " AND c.date_livraison BETWEEN '".$db->idate(dol_get_first_day($deliveryyear,1,false))."' AND '".$db->idate(dol_get_last_day($deliveryyear,12,false))."'";
+    $sql.= " AND c.date_livraison BETWEEN '".$db->idate(dol_get_first_day($search_deliveryyear,1,false))."' AND '".$db->idate(dol_get_last_day($search_deliveryyear,12,false))."'";
 }
 if ($search_town)  $sql.= natural_search('s.town', $search_town);
 if ($search_zip)   $sql.= natural_search("s.zip",$search_zip);
@@ -605,12 +605,12 @@ if ($resql)
 	if ($sall)					$param.='&sall='.$sall;
 	if ($socid > 0)             $param.='&socid='.$socid;
 	if ($viewstatut != '')      $param.='&viewstatut='.$viewstatut;
-	if ($orderday)      		$param.='&orderday='.$orderday;
-	if ($ordermonth)      		$param.='&ordermonth='.$ordermonth;
-	if ($orderyear)       		$param.='&orderyear='.$orderyear;
-	if ($deliveryday)   		$param.='&deliveryday='.$deliveryday;
-	if ($deliverymonth)   		$param.='&deliverymonth='.$deliverymonth;
-	if ($deliveryyear)    		$param.='&deliveryyear='.$deliveryyear;
+	if ($search_orderday)      		$param.='&search_orderday='.$search_orderday;
+	if ($search_ordermonth)      		$param.='&search_ordermonth='.$search_ordermonth;
+	if ($search_orderyear)       		$param.='&search_orderyear='.$search_orderyear;
+	if ($search_deliveryday)   		$param.='&search_deliveryday='.$search_deliveryday;
+	if ($search_deliverymonth)   		$param.='&search_deliverymonth='.$search_deliverymonth;
+	if ($search_deliveryyear)    		$param.='&search_deliveryyear='.$search_deliveryyear;
 	if ($search_ref)      		$param.='&search_ref='.$search_ref;
 	if ($search_company)  		$param.='&search_company='.$search_company;
 	if ($search_ref_customer)	$param.='&search_ref_customer='.$search_ref_customer;
@@ -894,17 +894,17 @@ if ($resql)
 	if (! empty($arrayfields['c.date_commande']['checked']))
 	{
     	print '<td class="liste_titre" align="center">';
-        if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="orderday" value="'.$orderday.'">';
-        print '<input class="flat" type="text" size="1" maxlength="2" name="ordermonth" value="'.$ordermonth.'">';
-        $formother->select_year($orderyear?$orderyear:-1,'orderyear',1, 20, 5);
+        if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_orderday" value="'.$search_orderday.'">';
+        print '<input class="flat" type="text" size="1" maxlength="2" name="search_ordermonth" value="'.$search_ordermonth.'">';
+        $formother->select_year($search_orderyear?$search_orderyear:-1,'search_orderyear',1, 20, 5);
     	print '</td>';
 	}
 	if (! empty($arrayfields['c.date_delivery']['checked']))
 	{
     	print '<td class="liste_titre" align="center">';
-        if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="deliveryday" value="'.$deliveryday.'">';
-        print '<input class="flat" type="text" size="1" maxlength="2" name="deliverymonth" value="'.$deliverymonth.'">';
-        $formother->select_year($deliveryyear?$deliveryyear:-1,'deliveryyear',1, 20, 5);
+        if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_deliveryday" value="'.$search_deliveryday.'">';
+        print '<input class="flat" type="text" size="1" maxlength="2" name="search_deliverymonth" value="'.$search_deliverymonth.'">';
+        $formother->select_year($search_deliveryyear?$search_deliveryyear:-1,'search_deliveryyear',1, 20, 5);
     	print '</td>';
 	}
 	if (! empty($arrayfields['c.total_ht']['checked']))
@@ -1075,7 +1075,7 @@ if ($resql)
 
             print '<table class="nobordernopadding"><tr class="nocellnopadd">';
             print '<td class="nobordernopadding nowrap">';
-            print $generic_commande->getNomUrl(1,($viewstatut != 2?0:$obj->fk_statut));
+            print $generic_commande->getNomUrl(1, ($viewstatut != 2?0:$obj->fk_statut), 0, 0, 0, 1);
             print '</td>';
 
             // Show shippable Icon (create subloop, so may be slow)
diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php
index 79475c75917..0d42cc69611 100644
--- a/htdocs/commande/note.php
+++ b/htdocs/commande/note.php
@@ -72,16 +72,16 @@ $form = new Form($db);
 if ($id > 0 || ! empty($ref))
 {
 	$object->fetch_thirdparty();
-	
+
 	$head = commande_prepare_head($object);
-	
+
 	dol_fiche_head($head, 'note', $langs->trans("CustomerOrder"), -1, 'order');
 
 	// Order card
-	
-	$linkback = '<a href="' . DOL_URL_ROOT . '/commande/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
-	
-	
+
+	$linkback = '<a href="' . DOL_URL_ROOT . '/commande/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+
+
 	$morehtmlref='<div class="refidno">';
 	// Ref customer
 	$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
@@ -122,20 +122,20 @@ if ($id > 0 || ! empty($ref))
 	    }
 	}
 	$morehtmlref.='</div>';
-	
-	
+
+
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-	
-	
+
+
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
-	
-	
+
+
 	$cssclass="titlefield";
 	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
 	print '</div>';
-	
+
 	dol_fiche_end();
 }
 
diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index b9fcf6b7aa3..fdba026ac6f 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -201,7 +201,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	$sql = "SELECT DISTINCT s.rowid as socid, s.nom as name, s.zip, s.town, s.fk_pays,";
 	$sql.= " sum(f.total) as amount, sum(f.total_ttc) as amount_ttc";
 	$sql.= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s";
-	if ($selected_cat === -2)	// Without any category 
+	if ($selected_cat === -2)	// Without any category
 	{
 	    $sql.= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
 	}
@@ -219,7 +219,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	if ($date_start && $date_end) {
 	    $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
 	}
-	if ($selected_cat === -2)	// Without any category  
+	if ($selected_cat === -2)	// Without any category
 	{
 	    $sql.=" AND cs.fk_soc is null";
 	}
@@ -239,7 +239,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	$sql.= ", ".MAIN_DB_PREFIX."paiement_facture as pf";
 	$sql.= ", ".MAIN_DB_PREFIX."paiement as p";
 	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
-	if ($selected_cat === -2)	// Without any category 
+	if ($selected_cat === -2)	// Without any category
 	{
 	    $sql.= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
 	}
@@ -253,7 +253,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	if ($date_start && $date_end) {
 	    $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 	}
-	if ($selected_cat === -2)	// Without any category  
+	if ($selected_cat === -2)	// Without any category
 	{
 	    $sql.=" AND cs.fk_soc is null";
 	}
@@ -360,7 +360,28 @@ print '<td colspan="7" align="right">';
 print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'"  value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 print '</td>';
 print '</tr>';
-    // Array titles
+
+print '<tr class="liste_titre">';
+print '<td class="liste_titre" align="left">';
+print '<input class="flat" size="6" type="text" name="search_societe" value="'.$search_societe.'">';
+print '</td>';
+print '<td class="liste_titre" align="left">';
+print '<input class="flat" size="6" type="text" name="search_zip" value="'.$search_zip.'">';
+print '</td>';
+print '<td class="liste_titre" align="left">';
+print '<input class="flat" size="6" type="text" name="search_town" value="'.$search_town.'">';
+print '</td>';
+print '<td class="liste_titre" align="left">';
+print $form->select_country($search_country, 'search_country');
+//print '<input class="flat" size="6" type="text" name="search_country" value="'.$search_country.'">';
+print '</td>';
+print '<td class="liste_titre">&nbsp;</td>';
+print '<td class="liste_titre">&nbsp;</td>';
+print '<td class="liste_titre">&nbsp;</td>';
+print '<td class="liste_titre">&nbsp;</td>';
+print '</tr>';
+
+// Array titles
 print "<tr class='liste_titre'>";
 print_liste_field_titre(
 	$langs->trans("Company"),
@@ -442,27 +463,6 @@ print_liste_field_titre(
 	);
 print "</tr>\n";
 
-print '<tr class="liste_titre">';
-print '<td class="liste_titre" align="left">';
-print '<input class="flat" size="6" type="text" name="search_societe" value="'.$search_societe.'">';
-print '</td>';
-print '<td class="liste_titre" align="left">';
-print '<input class="flat" size="6" type="text" name="search_zip" value="'.$search_zip.'">';
-print '</td>';
-print '<td class="liste_titre" align="left">';
-print '<input class="flat" size="6" type="text" name="search_town" value="'.$search_town.'">';
-print '</td>';
-print '<td class="liste_titre" align="left">';
-print $form->select_country($search_country, 'search_country');
-//print '<input class="flat" size="6" type="text" name="search_country" value="'.$search_country.'">';
-print '</td>';
-print '<td class="liste_titre">&nbsp;</td>';
-print '<td class="liste_titre">&nbsp;</td>';
-print '<td class="liste_titre">&nbsp;</td>';
-print '<td class="liste_titre">&nbsp;</td>';
-print '</tr>';
-
-$var=true;
 
 if (count($amount)) {
 	$arrayforsort=$name;
@@ -517,7 +517,7 @@ if (count($amount)) {
 	}
 
 	foreach($arrayforsort as $key=>$value) {
-		
+
 		print '<tr class="oddeven">';
 
 		// Third party
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 557d48be680..29cea1eb019 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2014-2017	Alexandre Spangaro   <aspangaro@zendsi.com>
  * Copyright (C) 2015       Frederic France      <frederic.france@free.fr>
+ * Copyright (C) 2017       Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -335,7 +336,7 @@ if ($action == 'create')
 	if (! empty($conf->accounting->enabled))
 	{
 		// Accountancy_account_capital
-        print '<tr><td class="titlefieldcreate">'.$langs->trans("LoanAccountancyCapitalCode").'</td>';
+        print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("LoanAccountancyCapitalCode").'</td>';
         print '<td>';
 		print $formaccounting->select_account($object->accountancy_account_capital, 'accountancy_account_capital', 1, '', 0, 1);
         print '</td></tr>';
@@ -415,7 +416,7 @@ if ($id > 0)
             print '<input type="hidden" name="id" value="'.$id.'">';
 		}
 
-		dol_fiche_head($head, 'card', $langs->trans("Loan"), 0, 'bill');
+		dol_fiche_head($head, 'card', $langs->trans("Loan"), -1, 'bill');
 
 		print '<script type="text/javascript">' . "\n";
 		print '  	function popEcheancier() {' . "\n";
@@ -712,9 +713,9 @@ if ($id > 0)
 			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 			print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
 			print '</div>';
-		}
 
-		if ($action == 'edit') print "</form>\n";
+		    print '</form>';
+		}
 
 		/*
 		 *   Buttons actions
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index d7ba1f979b4..1136e1c1fc4 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -267,7 +267,9 @@ input.select2-input {
 	border-bottom:  solid 1px rgba(0,0,0,.2) !important;	/* required to avoid to lose bottom line when focus is lost on select2. */
 }
 
-.liste_titre input[name=monthvalid], .liste_titre input[name=search_smonth], .liste_titre input[name=search_emonth], .liste_titre input[name=smonth], .liste_titre input[name=month], .liste_titre select[name=month], .liste_titre input[name=month_lim] {
+.liste_titre input[name=monthvalid], .liste_titre input[name=search_ordermonth], .liste_titre input[name=search_deliverymonth],
+.liste_titre input[name=search_smonth], .liste_titre input[name=search_month], .liste_titre input[name=search_emonth], .liste_titre input[name=smonth], .liste_titre input[name=month], .liste_titre select[name=month],
+.liste_titre input[name=month_lim] {
 	margin-right: 4px;
 }
 input[type=submit] {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index a2c9b20c63b..978b093fc9d 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -282,7 +282,9 @@ textarea.cke_source:focus
 	box-shadow: none;
 }
 
-.liste_titre input[name=monthvalid], .liste_titre input[name=search_smonth], .liste_titre input[name=search_emonth], .liste_titre input[name=smonth], .liste_titre input[name=month], .liste_titre input[name=month_lim] {
+.liste_titre input[name=monthvalid], .liste_titre input[name=search_ordermonth], .liste_titre input[name=search_deliverymonth],
+.liste_titre input[name=search_smonth], .liste_titre input[name=search_month], .liste_titre input[name=search_emonth], .liste_titre input[name=smonth], .liste_titre input[name=month],
+.liste_titre input[name=month_lim] {
 	margin-right: 4px;
 }
 input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {

From 7ae52d843c3b7b1b5fa38124048eec34f4a03678 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 1 Jul 2017 14:18:09 +0200
Subject: [PATCH 421/438] Look and feel v6

---
 htdocs/comm/propal/card.php               |  2 +-
 htdocs/comm/propal/class/propal.class.php | 43 +++++++----
 htdocs/comm/propal/contact.php            | 14 ++--
 htdocs/comm/propal/document.php           |  2 +-
 htdocs/comm/propal/info.php               |  4 +-
 htdocs/comm/propal/list.php               | 42 +++++-----
 htdocs/comm/propal/note.php               | 20 ++---
 htdocs/commande/card.php                  |  2 +-
 htdocs/commande/class/commande.class.php  | 37 +++++----
 htdocs/commande/contact.php               | 14 ++--
 htdocs/commande/document.php              | 26 +++----
 htdocs/commande/info.php                  |  2 +-
 htdocs/commande/list.php                  | 82 ++++++++++----------
 htdocs/commande/note.php                  | 26 +++----
 htdocs/compta/stats/casoc.php             | 54 ++++++-------
 htdocs/loan/card.php                      |  9 ++-
 htdocs/societe/agenda.php                 | 24 +++---
 htdocs/societe/card.php                   |  2 +-
 htdocs/societe/commerciaux.php            |  2 +-
 htdocs/societe/consumption.php            |  2 +-
 htdocs/societe/document.php               | 10 +--
 htdocs/societe/note.php                   | 10 +--
 htdocs/societe/notify/card.php            | 54 ++++++-------
 htdocs/societe/project.php                | 16 ++--
 htdocs/societe/rib.php                    | 94 +++++++++++------------
 htdocs/societe/societecontact.php         | 14 ++--
 htdocs/theme/eldy/style.css.php           |  4 +-
 htdocs/theme/md/style.css.php             |  4 +-
 28 files changed, 318 insertions(+), 297 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 4ee029ee8e8..4668c6a56a4 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1739,7 +1739,7 @@ if ($action == 'create')
 
 	// Proposal card
 
-	$linkback = '<a href="' . DOL_URL_ROOT . '/comm/propal/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+	$linkback = '<a href="' . DOL_URL_ROOT . '/comm/propal/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
 
 	$morehtmlref='<div class="refidno">';
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index d7f2411f615..a59fefc7a89 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -254,7 +254,7 @@ class Propal extends CommonObject
             $tva_npr = get_default_npr($mysoc,$this->thirdparty,$prod->id);
             if (empty($tva_tx)) $tva_npr=0;
             $vat_src_code = '';     // May be defined into tva_tx
-            
+
             $localtax1_tx = get_localtax($tva_tx,1,$mysoc,$this->thirdparty,$tva_npr);
             $localtax2_tx = get_localtax($tva_tx,2,$mysoc,$this->thirdparty,$tva_npr);
 
@@ -433,7 +433,7 @@ class Propal extends CommonObject
 
         // Check parameters
         if ($type < 0) return -1;
-      
+
         if ($this->statut == self::STATUS_DRAFT)
         {
             $this->db->begin();
@@ -1392,17 +1392,17 @@ class Propal extends CommonObject
             return -1;
         }
     }
-	
+
 	/**
 	 * Load array lines
-	 * 
+	 *
 	 * @param		int		$only_product	Return only physical products
 	 * @return		int						<0 if KO, >0 if OK
 	 */
 	function fetch_lines($only_product=0)
 	{
 		$this->lines=array();
-		
+
 		$sql = 'SELECT d.rowid, d.fk_propal, d.fk_parent_line, d.label as custom_label, d.description, d.price, d.vat_src_code, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.qty, d.fk_remise_except, d.remise_percent, d.subprice, d.fk_product,';
 		$sql.= ' d.info_bits, d.total_ht, d.total_tva, d.total_localtax1, d.total_localtax2, d.total_ttc, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht, d.special_code, d.rang, d.product_type,';
 		$sql.= ' d.fk_unit,';
@@ -1422,7 +1422,7 @@ class Propal extends CommonObject
 			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 			$num = $this->db->num_rows($result);
-			
+
 			$i = 0;
 			while ($i < $num)
 			{
@@ -1489,9 +1489,9 @@ class Propal extends CommonObject
 				//print "xx $i ".$this->lines[$i]->fk_product;
 				$i++;
 			}
-			
+
 			$this->db->free($result);
-			
+
 			return 1;
 		}
 		else
@@ -2779,7 +2779,7 @@ class Propal extends CommonObject
     function availability($availability_id, $notrigger=0)
     {
         global $user;
-        
+
         if ($this->statut >= self::STATUS_DRAFT)
         {
         	$error=0;
@@ -3277,13 +3277,14 @@ class Propal extends CommonObject
     /**
      *	Return clicable link of object (with eventually picto)
      *
-     *	@param      int		$withpicto		Add picto into link
-     *	@param      string	$option			Where point the link ('expedition', 'document', ...)
-     *	@param      string	$get_params    	Parametres added to url
-     *  @param	    int   	$notooltip		1=Disable tooltip
-     *	@return     string          		String with URL
+     *	@param      int		$withpicto		          Add picto into link
+     *	@param      string	$option			          Where point the link ('expedition', 'document', ...)
+     *	@param      string	$get_params    	          Parametres added to url
+     *  @param	    int   	$notooltip		          1=Disable tooltip
+     *  @param      int     $save_lastsearch_value    -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+     *	@return     string          		          String with URL
      */
-    function getNomUrl($withpicto=0,$option='', $get_params='', $notooltip=0)
+    function getNomUrl($withpicto=0, $option='', $get_params='', $notooltip=0, $save_lastsearch_value=-1)
     {
         global $langs, $conf, $user;
 
@@ -3318,6 +3319,14 @@ class Propal extends CommonObject
             if ($option == 'document') {
                 $url = DOL_URL_ROOT.'/comm/propal/document.php?id='.$this->id. $get_params;
             }
+
+            if ($option != 'nolink')
+            {
+                // Add param to save lastsearch_values or not
+                $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+                if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+                if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+            }
         }
 
         $linkclose='';
@@ -3352,9 +3361,9 @@ class Propal extends CommonObject
     function getLinesArray()
     {
         // TODO Duplicate with fetch_lines ? Wich one to keep ?
-        
+
         $this->lines = array();
-        
+
         $sql = 'SELECT pt.rowid, pt.label as custom_label, pt.description, pt.fk_product, pt.fk_remise_except,';
         $sql.= ' pt.qty, pt.vat_src_code, pt.tva_tx, pt.remise_percent, pt.subprice, pt.info_bits,';
         $sql.= ' pt.total_ht, pt.total_tva, pt.total_ttc, pt.fk_product_fournisseur_price as fk_fournprice, pt.buy_price_ht as pa_ht, pt.special_code, pt.localtax1_tx, pt.localtax2_tx,';
diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php
index 3e9e5a1205d..01e851769a7 100644
--- a/htdocs/comm/propal/contact.php
+++ b/htdocs/comm/propal/contact.php
@@ -155,10 +155,10 @@ if ($object->id > 0)
 
 
 	// Proposal card
-	
-	$linkback = '<a href="' . DOL_URL_ROOT . '/comm/propal/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
-	
-	
+
+	$linkback = '<a href="' . DOL_URL_ROOT . '/comm/propal/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+
+
 	$morehtmlref='<div class="refidno">';
 	// Ref customer
 	$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
@@ -199,12 +199,12 @@ if ($object->id > 0)
 	    }
 	}
 	$morehtmlref.='</div>';
-	
+
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
 
 	dol_fiche_end();
-	
-	
+
+
 	// Contacts lines (modules that overwrite templates must declare this into descriptor)
 	$dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
 	foreach($dirtpls as $reldir)
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index 0c68a292109..65b8eef5a66 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -103,7 +103,7 @@ if ($object->id > 0)
 
 	// Proposal card
 
-	$linkback = '<a href="' . DOL_URL_ROOT . '/comm/propal/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+	$linkback = '<a href="' . DOL_URL_ROOT . '/comm/propal/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
 
 	$morehtmlref='<div class="refidno">';
diff --git a/htdocs/comm/propal/info.php b/htdocs/comm/propal/info.php
index d8af8fb87a8..a94eeaa092c 100644
--- a/htdocs/comm/propal/info.php
+++ b/htdocs/comm/propal/info.php
@@ -66,7 +66,7 @@ $object->info($object->id);
 
 // Proposal card
 
-$linkback = '<a href="' . DOL_URL_ROOT . '/comm/propal/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+$linkback = '<a href="' . DOL_URL_ROOT . '/comm/propal/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
 
 $morehtmlref='<div class="refidno">';
@@ -122,6 +122,6 @@ dol_print_object_info($object);
 print '</div>';
 
 dol_fiche_end();
-	
+
 llxFooter();
 $db->close();
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 39ee93fd9cd..e9626a638b8 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -80,9 +80,9 @@ $object_statut=GETPOST('propal_statut');
 $sall=GETPOST('sall', 'alphanohtml');
 $mesg=(GETPOST("msg") ? GETPOST("msg") : GETPOST("mesg"));
 
-$day=GETPOST("day","int");
-$month=GETPOST("month","int");
-$year=GETPOST("year","int");
+$search_day=GETPOST("search_day","int");
+$search_month=GETPOST("search_month","int");
+$search_year=GETPOST("search_year","int");
 
 $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
@@ -197,9 +197,9 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
 	$search_type='';
 	$search_country='';
 	$search_type_thirdparty='';
-	$year='';
-    $month='';
-    $day='';
+	$search_year='';
+    $search_month='';
+    $search_day='';
 	$viewstatut='';
 	$object_statut='';
 	$toselect='';
@@ -295,18 +295,18 @@ if ($viewstatut != '' && $viewstatut != '-1')
 {
 	$sql.= ' AND p.fk_statut IN ('.$db->escape($viewstatut).')';
 }
-if ($month > 0)
+if ($search_month > 0)
 {
-    if ($year > 0 && empty($day))
-    $sql.= " AND p.datep BETWEEN '".$db->idate(dol_get_first_day($year,$month,false))."' AND '".$db->idate(dol_get_last_day($year,$month,false))."'";
-    else if ($year > 0 && ! empty($day))
-    $sql.= " AND p.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."'";
+    if ($search_year > 0 && empty($search_day))
+    $sql.= " AND p.datep BETWEEN '".$db->idate(dol_get_first_day($search_year,$search_month,false))."' AND '".$db->idate(dol_get_last_day($search_year,$search_month,false))."'";
+    else if ($search_year > 0 && ! empty($search_day))
+    $sql.= " AND p.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_month, $search_day, $search_year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_month, $search_day, $search_year))."'";
     else
-    $sql.= " AND date_format(p.datep, '%m') = '".$db->escape($month)."'";
+    $sql.= " AND date_format(p.datep, '%m') = '".$db->escape($search_month)."'";
 }
-else if ($year > 0)
+else if ($search_year > 0)
 {
-	$sql.= " AND p.datep BETWEEN '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
+	$sql.= " AND p.datep BETWEEN '".$db->idate(dol_get_first_day($search_year,1,false))."' AND '".$db->idate(dol_get_last_day($search_year,12,false))."'";
 }
 if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$db->escape($search_sale);
 if ($search_user > 0)
@@ -369,8 +369,8 @@ if ($resql)
     if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
 	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
 	if ($sall)				 $param.='&sall='.urlencode($sall);
-	if ($month)              $param.='&month='.urlencode($month);
-	if ($year)               $param.='&year='.urlencode($year);
+	if ($search_month)              $param.='&search_month='.urlencode($search_month);
+	if ($search_year)               $param.='&search_year='.urlencode($search_year);
     if ($search_ref)         $param.='&search_ref='.urlencode($search_ref);
     if ($search_refcustomer) $param.='&search_refcustomer='.urlencode($search_refcustomer);
     if ($search_societe)     $param.='&search_societe='.urlencode($search_societe);
@@ -613,11 +613,10 @@ if ($resql)
 	{
 	    print '<td class="liste_titre" colspan="1" align="center">';
     	//print $langs->trans('Month').': ';
-    	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.$day.'">';
-    	print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
+    	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_day" value="'.$search_day.'">';
+    	print '<input class="flat" type="text" size="1" maxlength="2" name="search_month" value="'.$search_month.'">';
     	//print '&nbsp;'.$langs->trans('Year').': ';
-    	$syear = $year;
-    	$formother->select_year($syear,'year',1, 20, 5);
+    	$formother->select_year($search_year,'search_year',1, 20, 5);
     	print '</td>';
 	}
 	// Date end
@@ -755,7 +754,6 @@ if ($resql)
 	{
 		$obj = $db->fetch_object($resql);
 
-
     	$objectstatic->id=$obj->rowid;
     	$objectstatic->ref=$obj->ref;
 
@@ -768,7 +766,7 @@ if ($resql)
     		print '<table class="nobordernopadding"><tr class="nocellnopadd">';
             // Picto + Ref
     		print '<td class="nobordernopadding nowrap">';
-    		print $objectstatic->getNomUrl(1);
+    		print $objectstatic->getNomUrl(1, '', '', 0, 1);
     		print '</td>';
             // Warning
             $warnornote='';
diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php
index ec1dac31c24..29fc43b0899 100644
--- a/htdocs/comm/propal/note.php
+++ b/htdocs/comm/propal/note.php
@@ -56,7 +56,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';	// Must be include,
 
 
 /*
- * View 
+ * View
  */
 
 llxHeader('',$langs->trans('Proposal'),'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos');
@@ -79,13 +79,13 @@ if ($id > 0 || ! empty($ref))
 			$cssclass='titlefield';
 			//if ($action == 'editnote_public') $cssclass='titlefieldcreate';
 			//if ($action == 'editnote_private') $cssclass='titlefieldcreate';
-				
-			
+
+
 			// Proposal card
-			
-			$linkback = '<a href="' . DOL_URL_ROOT . '/comm/propal/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
-			
-			
+
+			$linkback = '<a href="' . DOL_URL_ROOT . '/comm/propal/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+
+
 			$morehtmlref='<div class="refidno">';
 			// Ref customer
 			$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
@@ -126,17 +126,17 @@ if ($id > 0 || ! empty($ref))
 			    }
 			}
 			$morehtmlref.='</div>';
-			
+
 			dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 			print '<div class="fichecenter">';
 			print '<div class="underbanner clearboth"></div>';
-			
+
 			$cssclass="titlefield";
 			include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
 			print '</div>';
-			
+
 			dol_fiche_end();
 		}
 	}
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 826046db3ee..13fe07f78df 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1915,7 +1915,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 
 		// Order card
 
-		$linkback = '<a href="' . DOL_URL_ROOT . '/commande/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+		$linkback = '<a href="' . DOL_URL_ROOT . '/commande/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
 
 		$morehtmlref='<div class="refidno">';
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 93df2f1aa0b..0910fedcb9d 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -706,10 +706,10 @@ class Commande extends CommonOrder
 
         // Clean parameters
         $this->brouillon = 1;		// set command as draft
-		
+
 		// $date_commande is deprecated
         $date = ($this->date_commande ? $this->date_commande : $this->date);
-		
+
 		// Multicurrency (test on $this->multicurrency_tx because we sould take the default rate only if not using origin rate)
 		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $date);
 		else $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
@@ -1468,7 +1468,7 @@ class Commande extends CommonOrder
             $tva_npr = get_default_npr($mysoc,$this->thirdparty,$prod->id);
             if (empty($tva_tx)) $tva_npr=0;
             $vat_src_code = '';     // May be defined into tva_tx
-            
+
             $localtax1_tx=get_localtax($tva_tx,1,$this->thirdparty,$mysoc,$tva_npr);
             $localtax2_tx=get_localtax($tva_tx,2,$this->thirdparty,$mysoc,$tva_npr);
 
@@ -1798,7 +1798,7 @@ class Commande extends CommonOrder
                 $line->product_type     = $objp->product_type;
                 $line->qty              = $objp->qty;
 
-                $line->vat_src_code     = $objp->vat_src_code; 
+                $line->vat_src_code     = $objp->vat_src_code;
                 $line->tva_tx           = $objp->tva_tx;
 	            $line->localtax1_tx     = $objp->localtax1_tx;
                 $line->localtax2_tx     = $objp->localtax2_tx;
@@ -3106,7 +3106,7 @@ class Commande extends CommonOrder
         $error = 0;
 
         dol_syslog(get_class($this) . "::delete ".$this->id, LOG_DEBUG);
-        
+
         $this->db->begin();
 
         if (! $error && ! $notrigger)
@@ -3369,24 +3369,33 @@ class Commande extends CommonOrder
     /**
      *	Return clicable link of object (with eventually picto)
      *
-     *	@param      int			$withpicto      Add picto into link
-     *	@param      int			$option         Where point the link (0=> main card, 1,2 => shipment)
-     *	@param      int			$max          	Max length to show
-     *	@param      int			$short			???
-     *  @param	    int   	    $notooltip		1=Disable tooltip
-     *	@return     string          			String with URL
+     *	@param      int			$withpicto                Add picto into link
+     *	@param      int			$option                   Where point the link (0=> main card, 1,2 => shipment)
+     *	@param      int			$max          	          Max length to show
+     *	@param      int			$short			          ???
+     *  @param	    int   	    $notooltip		          1=Disable tooltip
+     *  @param      int         $save_lastsearch_value    -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+     *	@return     string          			          String with URL
      */
-    function getNomUrl($withpicto=0,$option=0,$max=0,$short=0,$notooltip=0)
+    function getNomUrl($withpicto=0, $option=0, $max=0, $short=0, $notooltip=0, $save_lastsearch_value=-1)
     {
         global $conf, $langs, $user;
 
         if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
-        
+
         $result='';
 
         if (! empty($conf->expedition->enabled) && ($option == 1 || $option == 2)) $url = DOL_URL_ROOT.'/expedition/shipment.php?id='.$this->id;
         else $url = DOL_URL_ROOT.'/commande/card.php?id='.$this->id;
 
+        if ($option !== 'nolink')
+        {
+            // Add param to save lastsearch_values or not
+            $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+            if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+            if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+        }
+
         if ($short) return $url;
 
         $picto = 'order';
@@ -3418,7 +3427,7 @@ class Commande extends CommonOrder
 		    $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
 		    $linkclose.=' class="classfortooltip"';
 		}
-		
+
         $linkstart = '<a href="'.$url.'"';
         $linkstart.=$linkclose.'>';
         $linkend='</a>';
diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php
index fe37a630c5d..0eb4ed2cd63 100644
--- a/htdocs/commande/contact.php
+++ b/htdocs/commande/contact.php
@@ -142,16 +142,16 @@ if ($id > 0 || ! empty($ref))
 	if ($object->fetch($id, $ref) > 0)
 	{
 	    $object->fetch_thirdparty();
-	    
+
 		$head = commande_prepare_head($object);
 		dol_fiche_head($head, 'contact', $langs->trans("CustomerOrder"), -1, 'order');
 
-		
+
 		// Order card
-		
-		$linkback = '<a href="' . DOL_URL_ROOT . '/commande/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
-		
-		
+
+		$linkback = '<a href="' . DOL_URL_ROOT . '/commande/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+
+
 		$morehtmlref='<div class="refidno">';
 		// Ref customer
 		$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
@@ -191,7 +191,7 @@ if ($id > 0 || ! empty($ref))
 	            }
 	        }
 	    }
-		$morehtmlref.='</div>';		
+		$morehtmlref.='</div>';
 
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
 
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index 0996907b245..7eea9c95877 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -101,12 +101,12 @@ if ($id > 0 || ! empty($ref))
 		{
 		    $totalsize+=$file['size'];
 		}
-		
+
 		// Order card
-		
-		$linkback = '<a href="' . DOL_URL_ROOT . '/commande/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
-		
-		
+
+		$linkback = '<a href="' . DOL_URL_ROOT . '/commande/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+
+
 		$morehtmlref='<div class="refidno">';
 		// Ref customer
 		$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
@@ -147,25 +147,25 @@ if ($id > 0 || ! empty($ref))
 		    }
 		}
 		$morehtmlref.='</div>';
-		
+
 		// Order card
-		
+
 		$linkback = '<a href="' . DOL_URL_ROOT . '/commande/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
-		
-		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);	
-		
+
+		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
 		print '<div class="fichecenter">';
 		print '<div class="underbanner clearboth"></div>';
-		
+
 		print '<table class="border" width="100%">';
 
 		print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
 		print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
 
 		print "</table>\n";
-		
+
 		print "</div>\n";
-		
+
 		print dol_fiche_end();
 
 		$modulepart = 'commande';
diff --git a/htdocs/commande/info.php b/htdocs/commande/info.php
index 02b631c4c8a..05adc9def54 100644
--- a/htdocs/commande/info.php
+++ b/htdocs/commande/info.php
@@ -65,7 +65,7 @@ dol_fiche_head($head, 'info', $langs->trans("CustomerOrder"), -1, 'order');
 
 // Order card
 
-$linkback = '<a href="' . DOL_URL_ROOT . '/commande/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+$linkback = '<a href="' . DOL_URL_ROOT . '/commande/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
 $morehtmlref='<div class="refidno">';
 // Ref customer
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 73fa9c5b66e..8ce3ba7cd04 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -51,12 +51,12 @@ $show_files=GETPOST('show_files','int');
 $confirm=GETPOST('confirm','alpha');
 $toselect = GETPOST('toselect', 'array');
 
-$orderyear=GETPOST("orderyear","int");
-$ordermonth=GETPOST("ordermonth","int");
-$orderday=GETPOST("orderday","int");
-$deliveryyear=GETPOST("deliveryyear","int");
-$deliverymonth=GETPOST("deliverymonth","int");
-$deliveryday=GETPOST("deliveryday","int");
+$search_orderyear=GETPOST("search_orderyear","int");
+$search_ordermonth=GETPOST("search_ordermonth","int");
+$search_orderday=GETPOST("search_orderday","int");
+$search_deliveryyear=GETPOST("search_deliveryyear","int");
+$search_deliverymonth=GETPOST("search_deliverymonth","int");
+$search_deliveryday=GETPOST("search_deliveryday","int");
 $search_product_category=GETPOST('search_product_category','int');
 $search_ref=GETPOST('search_ref','alpha')!=''?GETPOST('search_ref','alpha'):GETPOST('sref','alpha');
 $search_ref_customer=GETPOST('search_ref_customer','alpha');
@@ -180,12 +180,12 @@ if (empty($reshook))
         $search_total_ht='';
         $search_total_vat='';
         $search_total_ttc='';
-        $orderyear='';
-        $ordermonth='';
-    	$orderday='';
-    	$deliveryday='';
-    	$deliverymonth='';
-        $deliveryyear='';
+        $search_orderyear='';
+        $search_ordermonth='';
+    	$search_orderday='';
+    	$search_deliveryday='';
+    	$search_deliverymonth='';
+        $search_deliveryyear='';
         $viewstatut='';
         $billed='';
         $toselect='';
@@ -499,31 +499,31 @@ if ($viewstatut <> '')
 		$sql .= ' AND ((c.fk_statut IN (1,2)) OR (c.fk_statut = 3 AND c.facture = 0))'; // validated, in process or closed but not billed
 	}
 }
-if ($ordermonth > 0)
+if ($search_ordermonth > 0)
 {
-    if ($orderyear > 0 && empty($orderday))
-    $sql.= " AND c.date_commande BETWEEN '".$db->idate(dol_get_first_day($orderyear,$ordermonth,false))."' AND '".$db->idate(dol_get_last_day($orderyear,$ordermonth,false))."'";
-    else if ($orderyear > 0 && ! empty($orderday))
-    $sql.= " AND c.date_commande BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $ordermonth, $orderday, $orderyear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $ordermonth, $orderday, $orderyear))."'";
+    if ($search_orderyear > 0 && empty($search_orderday))
+    $sql.= " AND c.date_commande BETWEEN '".$db->idate(dol_get_first_day($search_orderyear,$search_ordermonth,false))."' AND '".$db->idate(dol_get_last_day($search_orderyear,$search_ordermonth,false))."'";
+    else if ($search_orderyear > 0 && ! empty($search_orderday))
+    $sql.= " AND c.date_commande BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_ordermonth, $search_orderday, $search_orderyear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_ordermonth, $search_orderday, $search_orderyear))."'";
     else
-    $sql.= " AND date_format(c.date_commande, '%m') = '".$ordermonth."'";
+    $sql.= " AND date_format(c.date_commande, '%m') = '".$search_ordermonth."'";
 }
-else if ($orderyear > 0)
+else if ($search_orderyear > 0)
 {
-    $sql.= " AND c.date_commande BETWEEN '".$db->idate(dol_get_first_day($orderyear,1,false))."' AND '".$db->idate(dol_get_last_day($orderyear,12,false))."'";
+    $sql.= " AND c.date_commande BETWEEN '".$db->idate(dol_get_first_day($search_orderyear,1,false))."' AND '".$db->idate(dol_get_last_day($search_orderyear,12,false))."'";
 }
-if ($deliverymonth > 0)
+if ($search_deliverymonth > 0)
 {
-    if ($deliveryyear > 0 && empty($deliveryday))
-    $sql.= " AND c.date_livraison BETWEEN '".$db->idate(dol_get_first_day($deliveryyear,$deliverymonth,false))."' AND '".$db->idate(dol_get_last_day($deliveryyear,$deliverymonth,false))."'";
-    else if ($deliveryyear > 0 && ! empty($deliveryday))
-    $sql.= " AND c.date_livraison BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $deliverymonth, $deliveryday, $deliveryyear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $deliverymonth, $deliveryday, $deliveryyear))."'";
+    if ($search_deliveryyear > 0 && empty($search_deliveryday))
+    $sql.= " AND c.date_livraison BETWEEN '".$db->idate(dol_get_first_day($search_deliveryyear,$search_deliverymonth,false))."' AND '".$db->idate(dol_get_last_day($search_deliveryyear,$search_deliverymonth,false))."'";
+    else if ($search_deliveryyear > 0 && ! empty($search_deliveryday))
+    $sql.= " AND c.date_livraison BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_deliverymonth, $search_deliveryday, $search_deliveryyear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_deliverymonth, $search_deliveryday, $search_deliveryyear))."'";
     else
-    $sql.= " AND date_format(c.date_livraison, '%m') = '".$deliverymonth."'";
+    $sql.= " AND date_format(c.date_livraison, '%m') = '".$search_deliverymonth."'";
 }
-else if ($deliveryyear > 0)
+else if ($search_deliveryyear > 0)
 {
-    $sql.= " AND c.date_livraison BETWEEN '".$db->idate(dol_get_first_day($deliveryyear,1,false))."' AND '".$db->idate(dol_get_last_day($deliveryyear,12,false))."'";
+    $sql.= " AND c.date_livraison BETWEEN '".$db->idate(dol_get_first_day($search_deliveryyear,1,false))."' AND '".$db->idate(dol_get_last_day($search_deliveryyear,12,false))."'";
 }
 if ($search_town)  $sql.= natural_search('s.town', $search_town);
 if ($search_zip)   $sql.= natural_search("s.zip",$search_zip);
@@ -605,12 +605,12 @@ if ($resql)
 	if ($sall)					$param.='&sall='.$sall;
 	if ($socid > 0)             $param.='&socid='.$socid;
 	if ($viewstatut != '')      $param.='&viewstatut='.$viewstatut;
-	if ($orderday)      		$param.='&orderday='.$orderday;
-	if ($ordermonth)      		$param.='&ordermonth='.$ordermonth;
-	if ($orderyear)       		$param.='&orderyear='.$orderyear;
-	if ($deliveryday)   		$param.='&deliveryday='.$deliveryday;
-	if ($deliverymonth)   		$param.='&deliverymonth='.$deliverymonth;
-	if ($deliveryyear)    		$param.='&deliveryyear='.$deliveryyear;
+	if ($search_orderday)      		$param.='&search_orderday='.$search_orderday;
+	if ($search_ordermonth)      		$param.='&search_ordermonth='.$search_ordermonth;
+	if ($search_orderyear)       		$param.='&search_orderyear='.$search_orderyear;
+	if ($search_deliveryday)   		$param.='&search_deliveryday='.$search_deliveryday;
+	if ($search_deliverymonth)   		$param.='&search_deliverymonth='.$search_deliverymonth;
+	if ($search_deliveryyear)    		$param.='&search_deliveryyear='.$search_deliveryyear;
 	if ($search_ref)      		$param.='&search_ref='.$search_ref;
 	if ($search_company)  		$param.='&search_company='.$search_company;
 	if ($search_ref_customer)	$param.='&search_ref_customer='.$search_ref_customer;
@@ -894,17 +894,17 @@ if ($resql)
 	if (! empty($arrayfields['c.date_commande']['checked']))
 	{
     	print '<td class="liste_titre" align="center">';
-        if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="orderday" value="'.$orderday.'">';
-        print '<input class="flat" type="text" size="1" maxlength="2" name="ordermonth" value="'.$ordermonth.'">';
-        $formother->select_year($orderyear?$orderyear:-1,'orderyear',1, 20, 5);
+        if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_orderday" value="'.$search_orderday.'">';
+        print '<input class="flat" type="text" size="1" maxlength="2" name="search_ordermonth" value="'.$search_ordermonth.'">';
+        $formother->select_year($search_orderyear?$search_orderyear:-1,'search_orderyear',1, 20, 5);
     	print '</td>';
 	}
 	if (! empty($arrayfields['c.date_delivery']['checked']))
 	{
     	print '<td class="liste_titre" align="center">';
-        if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="deliveryday" value="'.$deliveryday.'">';
-        print '<input class="flat" type="text" size="1" maxlength="2" name="deliverymonth" value="'.$deliverymonth.'">';
-        $formother->select_year($deliveryyear?$deliveryyear:-1,'deliveryyear',1, 20, 5);
+        if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_deliveryday" value="'.$search_deliveryday.'">';
+        print '<input class="flat" type="text" size="1" maxlength="2" name="search_deliverymonth" value="'.$search_deliverymonth.'">';
+        $formother->select_year($search_deliveryyear?$search_deliveryyear:-1,'search_deliveryyear',1, 20, 5);
     	print '</td>';
 	}
 	if (! empty($arrayfields['c.total_ht']['checked']))
@@ -1075,7 +1075,7 @@ if ($resql)
 
             print '<table class="nobordernopadding"><tr class="nocellnopadd">';
             print '<td class="nobordernopadding nowrap">';
-            print $generic_commande->getNomUrl(1,($viewstatut != 2?0:$obj->fk_statut));
+            print $generic_commande->getNomUrl(1, ($viewstatut != 2?0:$obj->fk_statut), 0, 0, 0, 1);
             print '</td>';
 
             // Show shippable Icon (create subloop, so may be slow)
diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php
index 79475c75917..0d42cc69611 100644
--- a/htdocs/commande/note.php
+++ b/htdocs/commande/note.php
@@ -72,16 +72,16 @@ $form = new Form($db);
 if ($id > 0 || ! empty($ref))
 {
 	$object->fetch_thirdparty();
-	
+
 	$head = commande_prepare_head($object);
-	
+
 	dol_fiche_head($head, 'note', $langs->trans("CustomerOrder"), -1, 'order');
 
 	// Order card
-	
-	$linkback = '<a href="' . DOL_URL_ROOT . '/commande/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
-	
-	
+
+	$linkback = '<a href="' . DOL_URL_ROOT . '/commande/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+
+
 	$morehtmlref='<div class="refidno">';
 	// Ref customer
 	$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
@@ -122,20 +122,20 @@ if ($id > 0 || ! empty($ref))
 	    }
 	}
 	$morehtmlref.='</div>';
-	
-	
+
+
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-	
-	
+
+
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
-	
-	
+
+
 	$cssclass="titlefield";
 	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
 	print '</div>';
-	
+
 	dol_fiche_end();
 }
 
diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index b9fcf6b7aa3..fdba026ac6f 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -201,7 +201,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	$sql = "SELECT DISTINCT s.rowid as socid, s.nom as name, s.zip, s.town, s.fk_pays,";
 	$sql.= " sum(f.total) as amount, sum(f.total_ttc) as amount_ttc";
 	$sql.= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s";
-	if ($selected_cat === -2)	// Without any category 
+	if ($selected_cat === -2)	// Without any category
 	{
 	    $sql.= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
 	}
@@ -219,7 +219,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	if ($date_start && $date_end) {
 	    $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
 	}
-	if ($selected_cat === -2)	// Without any category  
+	if ($selected_cat === -2)	// Without any category
 	{
 	    $sql.=" AND cs.fk_soc is null";
 	}
@@ -239,7 +239,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	$sql.= ", ".MAIN_DB_PREFIX."paiement_facture as pf";
 	$sql.= ", ".MAIN_DB_PREFIX."paiement as p";
 	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
-	if ($selected_cat === -2)	// Without any category 
+	if ($selected_cat === -2)	// Without any category
 	{
 	    $sql.= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
 	}
@@ -253,7 +253,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	if ($date_start && $date_end) {
 	    $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 	}
-	if ($selected_cat === -2)	// Without any category  
+	if ($selected_cat === -2)	// Without any category
 	{
 	    $sql.=" AND cs.fk_soc is null";
 	}
@@ -360,7 +360,28 @@ print '<td colspan="7" align="right">';
 print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'"  value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 print '</td>';
 print '</tr>';
-    // Array titles
+
+print '<tr class="liste_titre">';
+print '<td class="liste_titre" align="left">';
+print '<input class="flat" size="6" type="text" name="search_societe" value="'.$search_societe.'">';
+print '</td>';
+print '<td class="liste_titre" align="left">';
+print '<input class="flat" size="6" type="text" name="search_zip" value="'.$search_zip.'">';
+print '</td>';
+print '<td class="liste_titre" align="left">';
+print '<input class="flat" size="6" type="text" name="search_town" value="'.$search_town.'">';
+print '</td>';
+print '<td class="liste_titre" align="left">';
+print $form->select_country($search_country, 'search_country');
+//print '<input class="flat" size="6" type="text" name="search_country" value="'.$search_country.'">';
+print '</td>';
+print '<td class="liste_titre">&nbsp;</td>';
+print '<td class="liste_titre">&nbsp;</td>';
+print '<td class="liste_titre">&nbsp;</td>';
+print '<td class="liste_titre">&nbsp;</td>';
+print '</tr>';
+
+// Array titles
 print "<tr class='liste_titre'>";
 print_liste_field_titre(
 	$langs->trans("Company"),
@@ -442,27 +463,6 @@ print_liste_field_titre(
 	);
 print "</tr>\n";
 
-print '<tr class="liste_titre">';
-print '<td class="liste_titre" align="left">';
-print '<input class="flat" size="6" type="text" name="search_societe" value="'.$search_societe.'">';
-print '</td>';
-print '<td class="liste_titre" align="left">';
-print '<input class="flat" size="6" type="text" name="search_zip" value="'.$search_zip.'">';
-print '</td>';
-print '<td class="liste_titre" align="left">';
-print '<input class="flat" size="6" type="text" name="search_town" value="'.$search_town.'">';
-print '</td>';
-print '<td class="liste_titre" align="left">';
-print $form->select_country($search_country, 'search_country');
-//print '<input class="flat" size="6" type="text" name="search_country" value="'.$search_country.'">';
-print '</td>';
-print '<td class="liste_titre">&nbsp;</td>';
-print '<td class="liste_titre">&nbsp;</td>';
-print '<td class="liste_titre">&nbsp;</td>';
-print '<td class="liste_titre">&nbsp;</td>';
-print '</tr>';
-
-$var=true;
 
 if (count($amount)) {
 	$arrayforsort=$name;
@@ -517,7 +517,7 @@ if (count($amount)) {
 	}
 
 	foreach($arrayforsort as $key=>$value) {
-		
+
 		print '<tr class="oddeven">';
 
 		// Third party
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 557d48be680..29cea1eb019 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2014-2017	Alexandre Spangaro   <aspangaro@zendsi.com>
  * Copyright (C) 2015       Frederic France      <frederic.france@free.fr>
+ * Copyright (C) 2017       Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -335,7 +336,7 @@ if ($action == 'create')
 	if (! empty($conf->accounting->enabled))
 	{
 		// Accountancy_account_capital
-        print '<tr><td class="titlefieldcreate">'.$langs->trans("LoanAccountancyCapitalCode").'</td>';
+        print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("LoanAccountancyCapitalCode").'</td>';
         print '<td>';
 		print $formaccounting->select_account($object->accountancy_account_capital, 'accountancy_account_capital', 1, '', 0, 1);
         print '</td></tr>';
@@ -415,7 +416,7 @@ if ($id > 0)
             print '<input type="hidden" name="id" value="'.$id.'">';
 		}
 
-		dol_fiche_head($head, 'card', $langs->trans("Loan"), 0, 'bill');
+		dol_fiche_head($head, 'card', $langs->trans("Loan"), -1, 'bill');
 
 		print '<script type="text/javascript">' . "\n";
 		print '  	function popEcheancier() {' . "\n";
@@ -712,9 +713,9 @@ if ($id > 0)
 			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 			print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
 			print '</div>';
-		}
 
-		if ($action == 'edit') print "</form>\n";
+		    print '</form>';
+		}
 
 		/*
 		 *   Buttons actions
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index 4d1ce4da9c7..c67fb1c4dc4 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -120,28 +120,28 @@ if ($socid > 0)
 
 	dol_fiche_head($head, 'agenda', $langs->trans("ThirdParty"), -1, 'company');
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
-	
+    $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+
     dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
-        
+
     print '<div class="fichecenter">';
-    
+
     print '<div class="underbanner clearboth"></div>';
-    
+
     $object->info($socid);
 	print dol_print_object_info($object, 1);
-	
+
 	print '</div>';
 
 	dol_fiche_end();
 
 
-	
+
 	// Actions buttons
-	
+
     $objthirdparty=$object;
     $objcon=new stdClass();
-	
+
     $out='';
     $permok=$user->rights->agenda->myactions->create;
     if ((! empty($objthirdparty->id) || ! empty($objcon->id)) && $permok)
@@ -154,7 +154,7 @@ if ($socid > 0)
     	//$out.="</a>";
 	}
 
-	
+
 	print '<div class="tabsAction">';
 
     if (! empty($conf->agenda->enabled))
@@ -177,9 +177,9 @@ if ($socid > 0)
         if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
         if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
 
-        
+
 		print load_fiche_titre($langs->trans("ActionsOnCompany"),'','');
-		
+
         // List of all actions
 		$filters=array();
         $filters['search_agenda_label']=$search_agenda_label;
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 46e6366bba1..7f12893984e 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -2000,7 +2000,7 @@ else
 
         dol_htmloutput_errors($error,$errors);
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
+        $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
         dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
 
diff --git a/htdocs/societe/commerciaux.php b/htdocs/societe/commerciaux.php
index e972aaa1091..d6add5eacd5 100644
--- a/htdocs/societe/commerciaux.php
+++ b/htdocs/societe/commerciaux.php
@@ -114,7 +114,7 @@ if (! empty($socid))
 
 	dol_fiche_head($head, 'salesrepresentative', $langs->trans("ThirdParty"), -1, 'company');
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
+    $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
     dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
 
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index d11a358f56c..d9cae2a4170 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -114,7 +114,7 @@ if (empty($socid))
 $head = societe_prepare_head($object);
 dol_fiche_head($head, 'consumption', $langs->trans("ThirdParty"), -1, 'company');
 
-$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
+$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
 
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index 78af32c652a..fbfd931b69b 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -109,12 +109,12 @@ if ($object->id)
 		$totalsize+=$file['size'];
 	}
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
-	
+    $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+
     dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
-        
+
     print '<div class="fichecenter">';
-    
+
     print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent">';
 
@@ -151,7 +151,7 @@ if ($object->id)
 	print '</table>';
 
 	print '</div>';
-	
+
 	dol_fiche_end();
 
 	$modulepart = 'societe';
diff --git a/htdocs/societe/note.php b/htdocs/societe/note.php
index bdba82f440e..0dbb20ebd00 100644
--- a/htdocs/societe/note.php
+++ b/htdocs/societe/note.php
@@ -73,16 +73,16 @@ if ($id > 0)
 
     dol_fiche_head($head, 'note', $langs->trans("ThirdParty"), -1, 'company');
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
-    
+    $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+
     dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
 
     $cssclass='titlefield';
     //if ($action == 'editnote_public') $cssclass='titlefieldcreate';
     //if ($action == 'editnote_private') $cssclass='titlefieldcreate';
-    
+
     print '<div class="fichecenter">';
-    
+
     print '<div class="underbanner clearboth"></div>';
     print '<table class="border centpercent">';
 
@@ -112,7 +112,7 @@ if ($id > 0)
     print "</table>";
 
     print '</div>';
-    
+
     //print '<br>';
 
     //print '<div class="underbanner clearboth"></div>';
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index 8487185ecd5..5cbbdba629b 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -89,18 +89,18 @@ if (empty($reshook))
     	    setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Action")), null, 'errors');
             $error++;
         }
-    
+
         if (! $error)
         {
             $db->begin();
-            
+
             $sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def";
             $sql .= " WHERE fk_soc=".$socid." AND fk_contact=".$contactid." AND fk_action=".$actionid;
             if ($db->query($sql))
             {
                 $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_soc, fk_contact, fk_action)";
                 $sql .= " VALUES ('".$db->idate($now)."',".$socid.",".$contactid.",".$actionid.")";
-    
+
                 if (! $db->query($sql))
                 {
                     $error++;
@@ -111,7 +111,7 @@ if (empty($reshook))
             {
                 dol_print_error($db);
             }
-    
+
             if (! $error)
             {
                 $db->commit();
@@ -122,7 +122,7 @@ if (empty($reshook))
             }
         }
     }
-    
+
     // Remove a notification
     if ($action == 'delete')
     {
@@ -156,12 +156,12 @@ if ($result > 0)
 
     dol_fiche_head($head, 'notify', $langs->trans("ThirdParty"), -1, 'company');
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
-    
+    $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+
     dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
-        
+
     print '<div class="fichecenter">';
-    
+
     print '<div class="underbanner clearboth"></div>';
     print '<table class="border centpercent">';
 
@@ -200,11 +200,11 @@ if ($result > 0)
     }
     print $nbofrecipientemails;
     print '</td></tr>';*/
-    
+
     print '</table>';
 
     print '</div>';
-    
+
     dol_fiche_end();
 
     print "\n";
@@ -214,10 +214,10 @@ if ($result > 0)
     print '<br>'.$langs->trans("NotificationsDescUser");
     print '<br>'.$langs->trans("NotificationsDescContact");
     print '<br>'.$langs->trans("NotificationsDescGlobal");
-    
+
     print '<br><br><br>'."\n";
-    
-    
+
+
     // Add notification form
     print load_fiche_titre($langs->trans("AddNewNotification"),'','');
 
@@ -273,11 +273,11 @@ if ($result > 0)
 
     print '</table>';
 
-    
+
     print '</form>';
     print '<br>';
 
-    
+
     // List of notifications enabled for contacts
     $sql = "SELECT n.rowid, n.type,";
     $sql.= " a.code, a.label,";
@@ -298,10 +298,10 @@ if ($result > 0)
     {
         dol_print_error($db);
     }
-    
+
     // List of active notifications
     print load_fiche_titre($langs->trans("ListOfActiveNotifications").' ('.$num.')','','');
-    
+
     // Line with titles
     print '<table width="100%" class="noborder">';
     print '<tr class="liste_titre">';
@@ -398,7 +398,7 @@ if ($result > 0)
 		print '<td align="right">'.$langs->trans("SeeModuleSetup", $langs->transnoentitiesnoconv("Module600Name")).'</td>';
 		print '</tr>';
     }*/
-    
+
     /*if ($user->admin)
     {
 	    $var = ! $var;
@@ -408,8 +408,8 @@ if ($result > 0)
     }*/
 
     print '</table>';
-    
-    
+
+
     print '<br><br>'."\n";
 
 
@@ -431,9 +431,9 @@ if ($result > 0)
         $result = $db->query($sql);
         $nbtotalofrecords = $db->num_rows($result);
     }
-    
+
     $sql.= $db->plimit($limit+1, $offset);
-    
+
     $resql=$db->query($sql);
     if ($resql)
     {
@@ -443,11 +443,11 @@ if ($result > 0)
     {
         dol_print_error($db);
     }
-    
+
     $param='&socid='.$object->id;
     if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
     if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-    
+
     print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -456,7 +456,7 @@ if ($result > 0)
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
     print '<input type="hidden" name="page" value="'.$page.'">';
     print '<input type="hidden" name="socid" value="'.$object->id.'">';
-    
+
     // List of active notifications
     print_barre_liste($langs->trans("ListOfNotificationsDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, '', '', $limit);
 
@@ -520,7 +520,7 @@ if ($result > 0)
     }
 
     print '</table>';
-    
+
     print '</form>';
 }
 else dol_print_error('','RecordNotFound');
diff --git a/htdocs/societe/project.php b/htdocs/societe/project.php
index df2deb9da0c..f4641a74938 100644
--- a/htdocs/societe/project.php
+++ b/htdocs/societe/project.php
@@ -81,12 +81,12 @@ if ($socid)
 
 	dol_fiche_head($head, 'project', $langs->trans("ThirdParty"), -1, 'company');
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
-	
+    $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+
     dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
-        
+
     print '<div class="fichecenter">';
-    
+
     print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent">';
 
@@ -119,7 +119,7 @@ if ($socid)
 
 	dol_fiche_end();
 
-	
+
     /*
      * Barre d'action
      */
@@ -139,11 +139,11 @@ if ($socid)
     }
 
     print '</div>';
-    
-	
+
+
     print '<br>';
 
-    
+
     // Projects list
     $result=show_projects($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id, 1);
 }
diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php
index cb5dffc3399..7385b466e34 100644
--- a/htdocs/societe/rib.php
+++ b/htdocs/societe/rib.php
@@ -88,7 +88,7 @@ if (empty($reshook))
         }
     }
 
-    
+
     if ($action == 'update' && ! $_POST["cancel"])
     {
     	// Modification
@@ -119,12 +119,12 @@ if (empty($reshook))
     			$error++;
     		}
     	}
-    
+
         $account->fetch($id);
         if (! $error)
         {
     	    $account->socid           = $object->id;
-    
+
     		$account->bank            = GETPOST('bank','alpha');
     		$account->label           = GETPOST('label','alpha');
     		$account->courant         = GETPOST('courant','alpha');
@@ -140,12 +140,12 @@ if (empty($reshook))
     		$account->owner_address   = GETPOST('owner_address','alpha');
     		$account->frstrecur       = GETPOST('frstrecur','alpha');
     		$account->rum             = GETPOST('rum','alpha');
-    		if (empty($account->rum)) 
+    		if (empty($account->rum))
     		{
     		    $account->rum = $prelevement->buildRumNumber($object->code_client, $account->datec, $account->id);
     		    $account->date_rum = dol_now();
     		}
-    		
+
     		$result = $account->update($user);
     		if (! $result)
     		{
@@ -158,18 +158,18 @@ if (empty($reshook))
     			{
     				$account->setAsDefault($id);	// This will make sure there is only one default rib
     			}
-    
+
     			$url=DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id;
     	        header('Location: '.$url);
     	        exit;
     		}
         }
     }
-    
+
     if ($action == 'add' && ! $_POST["cancel"])
     {
     	$error=0;
-    
+
     	if (! GETPOST('label'))
     	{
     		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
@@ -182,14 +182,14 @@ if (empty($reshook))
     		$action='create';
     		$error++;
     	}
-    
+
     	if (! $error)
     	{
     	    // Ajout
     	    $account = new CompanyBankAccount($db);
-    
+
     	    $account->socid           = $object->id;
-    
+
     	    $account->bank            = GETPOST('bank','alpha');
     		$account->label           = GETPOST('label','alpha');
     		$account->courant         = GETPOST('courant','alpha');
@@ -204,7 +204,7 @@ if (empty($reshook))
     		$account->proprio         = GETPOST('proprio','alpha');
     		$account->owner_address   = GETPOST('owner_address','alpha');
     		$account->frstrecur       = GETPOST('frstrecur');
-    
+
     		// This test can be done only once properties were set
     		if ($account->needIBAN() == 1)
     		{
@@ -221,7 +221,7 @@ if (empty($reshook))
     		        $error++;
     		    }
     		}
-    		
+
     		if (! $error)
     		{
     		    if (empty($account->rum))
@@ -229,7 +229,7 @@ if (empty($reshook))
     		        $account->rum = $prelevement->buildRumNumber($object->code_client, $account->datec, $account->id);
     		        $account->date_rum = dol_now();
     		    }
-    		    
+
     		    $result = $account->update($user);	// This will set the UMR number.
         	    // TODO Use create and include update into create method
         	    if (! $result)
@@ -246,7 +246,7 @@ if (empty($reshook))
     		}
     	}
     }
-    
+
     if ($action == 'setasdefault')
     {
         $account = new CompanyBankAccount($db);
@@ -262,7 +262,7 @@ if (empty($reshook))
     	    setEventMessages($db->lasterror, null, 'errors');
         }
     }
-    
+
     if ($action == 'confirm_delete' && $_GET['confirm'] == 'yes')
     {
     	$account = new CompanyBankAccount($db);
@@ -287,7 +287,7 @@ if (empty($reshook))
     }
 
     $savid=$id;
-    
+
     // Actions to build doc
     if ($action == 'builddocrib')
     {
@@ -352,7 +352,7 @@ if ($socid && $action != 'edit' && $action != "create")
         print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id."&ribid=".($ribid?$ribid:$id), $langs->trans("DeleteARib"), $langs->trans("ConfirmDeleteRib", $account->getRibLabel()), "confirm_delete", '', 0, 1);
     }
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
+    $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
     dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
 
@@ -361,7 +361,7 @@ if ($socid && $action != 'edit' && $action != "create")
 
     print '<div class="fichecenter">';
     print '<div class="underbanner clearboth"></div>';
-    
+
     print '<table class="border centpercent">';
 
     print '<tr><td class="titlefield">'.$langs->trans("LabelRIB").'</td>';
@@ -385,7 +385,7 @@ if ($socid && $action != 'edit' && $action != "create")
 			    } else {
 			        $content.= ' '.img_picto($langs->trans("ValueIsValid"),'info');
 			    }
-			}				
+			}
 		} elseif ($val == 'BankAccountNumberKey') {
 			$content = $account->cle_rib;
 		} elseif ($val == 'IBAN') {
@@ -429,7 +429,7 @@ if ($socid && $action != 'edit' && $action != "create")
     print '</div>';
 
 	print '<br>';
-	
+
     /*
      * List of bank accounts
      */
@@ -469,7 +469,7 @@ if ($socid && $action != 'edit' && $action != "create")
             print '<td>';
             $string='';
             foreach ($rib->getFieldsToShow() as $val) {
-            
+
                 if ($val == 'BankCode') {
                     $string .= $rib->code_banque.' ';
                 } elseif ($val == 'BankAccountNumber') {
@@ -491,8 +491,8 @@ if ($socid && $action != 'edit' && $action != "create")
 			    } else {
 			        $string.= ' '.img_picto($langs->trans("ValueIsValid"),'info');
 			    }
-			}				
-            
+			}
+
             print $string;
             print '</td>';
             // IBAN
@@ -536,13 +536,13 @@ if ($socid && $action != 'edit' && $action != "create")
                 print img_picto($langs->trans("Enabled"),'on');
             }
             print '</td>';
-            
+
             // Generate doc
             print '<td align="center">';
-             
+
             $buttonlabel = $langs->trans("BuildDoc");
             $forname='builddocrib'.$rib->id;
-             
+
             include_once DOL_DOCUMENT_ROOT.'/core/modules/bank/modules_bank.php';
             $modellist=ModeleBankAccountDoc::liste_modeles($db);
             $out = '';
@@ -553,7 +553,7 @@ if ($socid && $action != 'edit' && $action != "create")
                 $out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
                 $out.= '<input type="hidden" name="socid" value="'.$object->id.'">';
                 $out.= '<input type="hidden" name="companybankid" value="'.$rib->id.'">';
-    
+
                 if (is_array($modellist) && count($modellist) == 1)    // If there is only one element
                 {
                     $arraykeys=array_keys($modellist);
@@ -561,7 +561,7 @@ if ($socid && $action != 'edit' && $action != "create")
                 }
                 $out.= $form->selectarray('modelrib'.$rib->id, $modellist, $modelselected, $showempty, 0, 0, '', 0, 0, 0, '', 'minwidth100');
                 $out.= ajax_combobox('modelrib'.$rib->id);
-                 
+
                 // Language code (if multilang)
                 if ($conf->global->MAIN_MULTILANGS)
                 {
@@ -589,7 +589,7 @@ if ($socid && $action != 'edit' && $action != "create")
             }
             print $out;
             print '</td>';
-            
+
             // Edit/Delete
             print '<td align="right">';
             if ($user->rights->societe->creer)
@@ -605,7 +605,7 @@ if ($socid && $action != 'edit' && $action != "create")
            		print '</a>';
             }
         	print '</td>';
-        	
+
 	        print '</tr>';
         }
 
@@ -622,32 +622,32 @@ if ($socid && $action != 'edit' && $action != "create")
     }
 
     dol_fiche_end();
-    
-    
-    
+
+
+
     if ($socid && $action != 'edit' && $action != 'create')
     {
         /*
          * Barre d'actions
          */
         print '<div class="tabsAction">';
-    
+
         if ($user->rights->societe->creer)
         {
             print '<a class="butAction" href="rib.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("Add").'</a>';
         }
-    
+
         print '</div>';
     }
 
-    
+
 
 
     if (empty($conf->global->SOCIETE_DISABLE_BUILDDOC))
     {
         print '<div class="fichecenter"><div class="fichehalfleft">';
         print '<a name="builddoc"></a>'; // ancre
-    
+
         /*
          * Documents generes
          */
@@ -655,16 +655,16 @@ if ($socid && $action != 'edit' && $action != "create")
         $urlsource=$_SERVER["PHP_SELF"]."?socid=".$object->id;
         $genallowed=$user->rights->societe->creer;
         $delallowed=$user->rights->societe->supprimer;
-    
+
         $var=true;
-    
+
         print $formfile->showdocuments('company', $object->id, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 0, 0, 0, 28, 0, 'entity='.$object->entity, 0, '', $object->default_lang);
-    
+
         print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-    
-    
+
+
         print '</div></div></div>';
-    
+
         print '<br>';
     }
     /*
@@ -772,12 +772,12 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer)
     	// RUM
     	print '<tr><td class="titlefield">'.$langs->trans("RUM").'</td>';
     	print '<td><input size="30" type="text" name="rum" value="'.dol_escape_htmltag($account->rum).'"></td></tr>';
-    
+
     	print '<tr><td>'.$langs->trans("WithdrawMode").'</td><td>';
     	$tblArraychoice = array("FRST" => $langs->trans("FRST"), "RECUR" => $langs->trans("RECUR"));
     	print $form->selectarray("frstrecur", $tblArraychoice, dol_escape_htmltag(GETPOST('frstrecur')?GETPOST('frstrecur'):$account->frstrecur), 0);
     	print '</td></tr>';
-    
+
     	print '</table>';
     }
 
@@ -869,7 +869,7 @@ if ($socid && $action == 'create' && $user->rights->societe->creer)
     	// RUM
     	print '<tr><td class="titlefieldcreate">'.$langs->trans("RUM").'</td>';
     	print '<td>'.$langs->trans("RUMWillBeGenerated").'</td></tr>';
-    
+
     	print '<tr><td>'.$langs->trans("WithdrawMode").'</td><td>';
     	$tblArraychoice = array("FRST" => $langs->trans("FRST"), "RECUR" => $langs->trans("RECUR"));
     	print $form->selectarray("frstrecur", $tblArraychoice, (isset($_POST['frstrecur'])?GETPOST('frstrecur'):'FRST'), 0);
diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php
index b5ffc87517f..e640cabc93b 100644
--- a/htdocs/societe/societecontact.php
+++ b/htdocs/societe/societecontact.php
@@ -150,12 +150,12 @@ if ($id > 0 || ! empty($ref))
 		print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
-		
+        $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+
         dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
-            
+
     	print '<div class="fichecenter">';
-    
+
         print '<div class="underbanner clearboth"></div>';
 		print '<table class="border centpercent">';
 
@@ -187,9 +187,9 @@ if ($id > 0 || ! empty($ref))
 		    print '</td></tr>';
 		}
 		print '</table>';
-		
+
 		print '</div>';
-		
+
 		print '</form>';
 		print '<br>';
 
@@ -260,7 +260,7 @@ if ($id > 0 || ! empty($ref))
 
 						$companyname=$objp->company;
 
-						
+
 						print '<tr class="oddeven">';
 
 						// Ref
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index d7ba1f979b4..1136e1c1fc4 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -267,7 +267,9 @@ input.select2-input {
 	border-bottom:  solid 1px rgba(0,0,0,.2) !important;	/* required to avoid to lose bottom line when focus is lost on select2. */
 }
 
-.liste_titre input[name=monthvalid], .liste_titre input[name=search_smonth], .liste_titre input[name=search_emonth], .liste_titre input[name=smonth], .liste_titre input[name=month], .liste_titre select[name=month], .liste_titre input[name=month_lim] {
+.liste_titre input[name=monthvalid], .liste_titre input[name=search_ordermonth], .liste_titre input[name=search_deliverymonth],
+.liste_titre input[name=search_smonth], .liste_titre input[name=search_month], .liste_titre input[name=search_emonth], .liste_titre input[name=smonth], .liste_titre input[name=month], .liste_titre select[name=month],
+.liste_titre input[name=month_lim] {
 	margin-right: 4px;
 }
 input[type=submit] {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index a2c9b20c63b..978b093fc9d 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -282,7 +282,9 @@ textarea.cke_source:focus
 	box-shadow: none;
 }
 
-.liste_titre input[name=monthvalid], .liste_titre input[name=search_smonth], .liste_titre input[name=search_emonth], .liste_titre input[name=smonth], .liste_titre input[name=month], .liste_titre input[name=month_lim] {
+.liste_titre input[name=monthvalid], .liste_titre input[name=search_ordermonth], .liste_titre input[name=search_deliverymonth],
+.liste_titre input[name=search_smonth], .liste_titre input[name=search_month], .liste_titre input[name=search_emonth], .liste_titre input[name=smonth], .liste_titre input[name=month],
+.liste_titre input[name=month_lim] {
 	margin-right: 4px;
 }
 input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {

From c5aed0c3337dd603e0b4b0a4eb765f6685a395c3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 1 Jul 2017 14:25:46 +0200
Subject: [PATCH 422/438] Fix phpcs

---
 .../class/accountancycategory.class.php       | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index 7668756a046..66f72ea9bf6 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -429,7 +429,7 @@ class AccountancyCategory
 			return - 1;
 		}
 	}
-	
+
 	public function getCats() {
 		global $db, $langs, $user, $mysoc;
 
@@ -462,7 +462,7 @@ class AccountancyCategory
 			if ($num) {
 				while ( $i < $num ) {
 					$obj = $this->db->fetch_object($resql);
-					
+
 					$data[] = array (
 							'rowid' => $obj->rowid,
 							'code' => $obj->code,
@@ -483,10 +483,10 @@ class AccountancyCategory
 			return - 1;
 		}
 	}
-	
-	
-	// calcule 
-	
+
+
+	// calcule
+
 	const PATTERN = '/(?:\-?\d+(?:\.?\d+)?[\+\-\*\/])+\-?\d+(?:\.?\d+)?/';
 
 	const PARENTHESIS_DEPTH = 10;
@@ -535,11 +535,12 @@ class AccountancyCategory
 
 		return 0;
 	}
-	
+
 	/**
 	 * get cpts of category
 	 *
-	 * @return array       Result in table
+	 * @param  int     $cat_id     Category id
+	 * @return array               Result in table
 	 */
 	public function getCptsCat($cat_id) {
 		global $mysoc;
@@ -554,7 +555,7 @@ class AccountancyCategory
 		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as t";
 		$sql .= " WHERE t.fk_accounting_category = ".$cat_id;
 		$sql .= " ORDER BY t.account_number ";
-		
+
 		//echo $sql;
 
 		$resql = $this->db->query($sql);
@@ -582,5 +583,5 @@ class AccountancyCategory
 			return -1;
 		}
 	}
-	
+
 }

From 53708c138a3302f4c551559c30e77e65297058e1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 1 Jul 2017 16:52:28 +0200
Subject: [PATCH 423/438] Add option to be able to debug problem of apache lock
 page

---
 htdocs/core/modules/syslog/mod_syslog_file.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/core/modules/syslog/mod_syslog_file.php b/htdocs/core/modules/syslog/mod_syslog_file.php
index b059c63e003..34207496ea4 100644
--- a/htdocs/core/modules/syslog/mod_syslog_file.php
+++ b/htdocs/core/modules/syslog/mod_syslog_file.php
@@ -109,6 +109,11 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 	    if (empty($conf->global->SYSLOG_FILE)) $tmp=DOL_DATA_ROOT.'/dolibarr.log';
 	    else $tmp=str_replace('DOL_DATA_ROOT', DOL_DATA_ROOT, $conf->global->SYSLOG_FILE);
 
+	    if (! empty($conf->global->SYSLOG_FILE_ONEPERSESSION))
+	    {
+	        $suffixinfilename = '_'.session_name();
+	    }
+
 	    return $suffixinfilename?preg_replace('/\.log$/i', $suffixinfilename.'.log', $tmp):$tmp;
 	}
 

From 4f72bd35db8e5c67f730cd87a395c8395eee765f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 2 Jul 2017 13:18:23 +0200
Subject: [PATCH 424/438] Fix too much code into the NOREQUIREDB

---
 htdocs/main.inc.php                     | 13 +++++--
 htdocs/master.inc.php                   | 51 +++++++++++++------------
 htdocs/public/test/test_sessionlock.php | 36 +++++++++++++++++
 3 files changed, 71 insertions(+), 29 deletions(-)
 create mode 100644 htdocs/public/test/test_sessionlock.php

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 78f5d9d4f1e..b5f88def445 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -199,12 +199,17 @@ $sessiontimeout='DOLSESSTIMEOUT_'.$prefix;
 if (! empty($_COOKIE[$sessiontimeout])) ini_set('session.gc_maxlifetime',$_COOKIE[$sessiontimeout]);
 session_name($sessionname);
 session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
-session_start();
-if (ini_get('register_globals'))    // Deprecated in 5.3 and removed in 5.4. To solve bug in using $_SESSION
+// This create lock released until session_write_close() or end of page.
+// We need this lock as long as we read/write $_SESSION ['vars']. We can close released when finished.
+if (! defined('NOSESSION'))
 {
-    foreach ($_SESSION as $key=>$value)
+    session_start();
+    if (ini_get('register_globals'))    // Deprecated in 5.3 and removed in 5.4. To solve bug in using $_SESSION
     {
-        if (isset($GLOBALS[$key])) unset($GLOBALS[$key]);
+        foreach ($_SESSION as $key=>$value)
+        {
+            if (isset($GLOBALS[$key])) unset($GLOBALS[$key]);
+        }
     }
 }
 
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index ecb1c46478f..fc1c41895a4 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -142,33 +142,34 @@ if (! defined('NOREQUIREUSER'))
  * Load object $conf
  * After this, all parameters conf->global->CONSTANTS are loaded
  */
+
+// By default conf->entity is 1, but we change this if we ask another value.
+if (session_id() && ! empty($_SESSION["dol_entity"]))			// Entity inside an opened session
+{
+	$conf->entity = $_SESSION["dol_entity"];
+}
+else if (! empty($_ENV["dol_entity"]))							// Entity inside a CLI script
+{
+	$conf->entity = $_ENV["dol_entity"];
+}
+else if (isset($_POST["loginfunction"]) && GETPOST("entity"))	// Just after a login page
+{
+	$conf->entity = GETPOST("entity",'int');
+}
+else if (defined('DOLENTITY') && is_numeric(DOLENTITY))			// For public page with MultiCompany module
+{
+	$conf->entity = DOLENTITY;
+}
+else if (!empty($_COOKIE['DOLENTITY']))						    // For other application with MultiCompany module (TODO: We should remove this. entity to use should never be stored into client side)
+{
+	$conf->entity = $_COOKIE['DOLENTITY'];
+}
+
+// Sanitize entity
+if (! is_numeric($conf->entity)) $conf->entity=1;
+
 if (! defined('NOREQUIREDB'))
 {
-	// By default conf->entity is 1, but we change this if we ask another value.
-	if (session_id() && ! empty($_SESSION["dol_entity"]))			// Entity inside an opened session
-	{
-		$conf->entity = $_SESSION["dol_entity"];
-	}
-	else if (! empty($_ENV["dol_entity"]))							// Entity inside a CLI script
-	{
-		$conf->entity = $_ENV["dol_entity"];
-	}
-	else if (isset($_POST["loginfunction"]) && GETPOST("entity"))	// Just after a login page
-	{
-		$conf->entity = GETPOST("entity",'int');
-	}
-	else if (defined('DOLENTITY') && is_numeric(DOLENTITY))			// For public page with MultiCompany module
-	{
-		$conf->entity = DOLENTITY;
-	}
-	else if (!empty($_COOKIE['DOLENTITY']))						// For other application with MultiCompany module (TODO: We should remove this. entity to use should never be stored into client side)
-	{
-		$conf->entity = $_COOKIE['DOLENTITY'];
-	}
-
-	// Sanitize entity
-	if (! is_numeric($conf->entity)) $conf->entity=1;
-
 	//print "Will work with data into entity instance number '".$conf->entity."'";
 
 	// Here we read database (llx_const table) and define $conf->global->XXX var.
diff --git a/htdocs/public/test/test_sessionlock.php b/htdocs/public/test/test_sessionlock.php
new file mode 100644
index 00000000000..b0eb25d831e
--- /dev/null
+++ b/htdocs/public/test/test_sessionlock.php
@@ -0,0 +1,36 @@
+<?php
+
+if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
+if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
+if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
+if (! defined('NOSTYLECHECK'))   define('NOSTYLECHECK','1');		// Do not check style html tag into posted data
+if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');			// Do not check anti CSRF attack test
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');		// Do not check anti POST attack test
+if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');		// If there is no need to load and show top and left menu
+if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');		// If we don't need to load the html.form.class.php
+if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');       // Do not load ajax.lib.php library
+if (! defined("NOLOGIN"))        define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
+// If you don't need session management (can't be logged if no session used). You must also set
+// NOCSRFCHECK, NOTOKENRENEWAL, NOLOGIN,
+// Disable module with GETPOST('disablemodules') won't work. Variable 'dol_...' will not be set.
+// $_SESSION are then simple vars if sessions are not active.
+if (! defined("NOSESSION"))      define("NOSESSION",'1');
+
+define('REQUIRE_JQUERY_MULTISELECT','select2');
+
+print PHP_SESSION_DISABLED;
+print PHP_SESSION_NONE;
+print PHP_SESSION_ACTIVE;
+print '<br>';
+
+print session_status();
+require '../../main.inc.php';
+print session_status();
+print '<br>';
+
+//print 'a'.$_SESSION['disablemodules'].'b';
+
+print 'This page is visible. It means you are not locked.';
+
+//session_write_close();

From c56ea5025182355f7966625e65846907f471d508 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 2 Jul 2017 14:30:24 +0200
Subject: [PATCH 425/438] Currency symbol for peru is before value

---
 htdocs/core/lib/functions.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 7164432223e..7babff42118 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3767,7 +3767,7 @@ function price($amount, $form=0, $outlangs='', $trunc=1, $rounding=-1, $forcerou
 	{
 		if ($currency_code == 'auto') $currency_code=$conf->currency;
 
-		$listofcurrenciesbefore=array('USD','GBP','AUD','MXN');
+		$listofcurrenciesbefore=array('USD','GBP','AUD','MXN','PEN');
 		if (in_array($currency_code,$listofcurrenciesbefore)) $cursymbolbefore.=$outlangs->getCurrencySymbol($currency_code);
 		else
 		{

From b95dea3b5043355ef711f5fcf6a8cb17b2196605 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 2 Jul 2017 23:37:52 +0200
Subject: [PATCH 426/438] Fix missing ;

---
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 75a45f72142..5d1948f318f 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -501,7 +501,7 @@ CREATE TABLE llx_blockedlog_authority
 
 ALTER TABLE llx_blockedlog_authority ADD INDEX signature (signature);
 
--- VMYSQL4.1 INSERT IGNORE INTO llx_product_lot (entity, fk_product, batch, eatby, sellby, datec, fk_user_creat, fk_user_modif) SELECT DISTINCT e.entity, ps.fk_product, pb.batch, pb.eatby, pb.sellby, pb.tms, e.fk_user_author, e.fk_user_author from llx_product_batch as pb, llx_product_stock as ps, llx_entrepot as e WHERE pb.fk_product_stock = ps.rowid AND ps.fk_entrepot = e.rowid
+-- VMYSQL4.1 INSERT IGNORE INTO llx_product_lot (entity, fk_product, batch, eatby, sellby, datec, fk_user_creat, fk_user_modif) SELECT DISTINCT e.entity, ps.fk_product, pb.batch, pb.eatby, pb.sellby, pb.tms, e.fk_user_author, e.fk_user_author from llx_product_batch as pb, llx_product_stock as ps, llx_entrepot as e WHERE pb.fk_product_stock = ps.rowid AND ps.fk_entrepot = e.rowid;
 
 UPDATE llx_bank SET label= '(SupplierInvoicePayment)' WHERE label= 'Règlement fournisseur';
 UPDATE llx_bank SET label= '(CustomerInvoicePayment)' WHERE label= 'Règlement client';

From 565de9bc8d3d0a8e9d6e709147893a81795533aa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 2 Jul 2017 23:38:19 +0200
Subject: [PATCH 427/438] Debug module website

---
 htdocs/langs/en_US/website.lang             |   3 +-
 htdocs/public/test/test_sessionlock.php     |   3 +-
 htdocs/websites/class/websitepage.class.php |  12 +-
 htdocs/websites/index.php                   | 227 +++++++++++---------
 4 files changed, 130 insertions(+), 115 deletions(-)

diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index 03069d6f649..4482093b26d 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -25,4 +25,5 @@ RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
 SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
 PreviewSiteServedByWebServer=Preview %s in a new tab.<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=Preview %s in a new tab.<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 clicking on the other preview button.  
+PreviewSiteServedByDolibarr=Preview %s in a new tab.<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.  
+NoPageYet=No pages yet
\ No newline at end of file
diff --git a/htdocs/public/test/test_sessionlock.php b/htdocs/public/test/test_sessionlock.php
index b0eb25d831e..7df6cce4f28 100644
--- a/htdocs/public/test/test_sessionlock.php
+++ b/htdocs/public/test/test_sessionlock.php
@@ -12,9 +12,10 @@ if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');		// If we don't ne
 if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');       // Do not load ajax.lib.php library
 if (! defined("NOLOGIN"))        define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
 // If you don't need session management (can't be logged if no session used). You must also set
-// NOCSRFCHECK, NOTOKENRENEWAL, NOLOGIN,
+// NOCSRFCHECK, NOTOKENRENEWAL, NOLOGIN
 // Disable module with GETPOST('disablemodules') won't work. Variable 'dol_...' will not be set.
 // $_SESSION are then simple vars if sessions are not active.
+// TODO We can close session with session_write_close() as soon as we just need read access.
 if (! defined("NOSESSION"))      define("NOSESSION",'1');
 
 define('REQUIRE_JQUERY_MULTISELECT','select2');
diff --git a/htdocs/websites/class/websitepage.class.php b/htdocs/websites/class/websitepage.class.php
index c454a7d3502..99fd4d64603 100644
--- a/htdocs/websites/class/websitepage.class.php
+++ b/htdocs/websites/class/websitepage.class.php
@@ -193,7 +193,6 @@ class WebsitePage extends CommonObject
 
 		$sql = 'SELECT';
 		$sql .= ' t.rowid,';
-
 		$sql .= " t.fk_website,";
 		$sql .= " t.pageurl,";
 		$sql .= " t.title,";
@@ -203,7 +202,6 @@ class WebsitePage extends CommonObject
 		$sql .= " t.status,";
 		$sql .= " t.date_creation,";
 		$sql .= " t.tms as date_modification";
-
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
 		//$sql .= ' WHERE entity IN ('.getEntity('website').')';       // entity is on website level
 		$sql .= ' WHERE 1 = 1';
@@ -214,7 +212,7 @@ class WebsitePage extends CommonObject
 			$sql .= ' AND t.rowid = ' . $id;
 		}
         $sql .= $this->db->plimit(1);
-        
+
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$numrows = $this->db->num_rows($resql);
@@ -278,7 +276,7 @@ class WebsitePage extends CommonObject
 		$sql .= " t.date_creation,";
 		$sql .= " t.tms as date_modification";
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
-		$sql .= ' WHERE t.fk_website = '.$websiteid; 
+		$sql .= ' WHERE t.fk_website = '.$websiteid;
 		// Manage filter
 		$sqlwhere = array();
 		if (count($filter) > 0) {
@@ -399,9 +397,9 @@ class WebsitePage extends CommonObject
 		if ($this->old_object->pageurl != $this->pageurl)
 		{
 		      dol_syslog("The alias was changed, we must rename/recreate the page file into document");
-		      
+
 		}
-		
+
 		if (!$error && !$notrigger) {
 			// Uncomment this and change MYOBJECT to your own tag if you
 			// want this action calls a trigger.
@@ -628,7 +626,7 @@ class WebsitePage extends CommonObject
 		$this->id = 0;
 
 		$now=dol_now();
-		
+
 		$this->fk_website = '';
 		$this->pageurl = '';
 		$this->title = 'My Page';
diff --git a/htdocs/websites/index.php b/htdocs/websites/index.php
index 8138100ab77..183fa45298a 100644
--- a/htdocs/websites/index.php
+++ b/htdocs/websites/index.php
@@ -49,7 +49,7 @@ function llxHeader($head='', $title='', $help_url='', $target='', $disablejs=0,
     top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 
     print '<body id="mainbody">';
-    
+
     // top menu and left menu area
     if (empty($conf->dol_hide_topmenu))
     {
@@ -145,7 +145,7 @@ $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain
  */
 
 if (GETPOST('refreshsite')) $pageid=0;      // If we change the site, we reset the pageid.
-if (GETPOST('refreshpage')) $action='preview'; 
+if (GETPOST('refreshpage')) $action='preview';
 
 
 // Add page
@@ -160,10 +160,17 @@ if ($action == 'add')
     $objectpage->description = GETPOST('WEBSITE_DESCRIPTION');
     $objectpage->keywords = GETPOST('WEBSITE_KEYWORD');
 
-    if (empty($objectpage->title))
+    if (empty($objectpage->pageurl))
     {
         setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("WEBSITE_PAGENAME")), null, 'errors');
         $error++;
+        $action='create';
+    }
+    if (empty($objectpage->title))
+    {
+        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("WEBSITE_TITLE")), null, 'errors');
+        $error++;
+        $action='create';
     }
 
     if (! $error)
@@ -185,9 +192,12 @@ if ($action == 'add')
 	{
 		$db->rollback();
 	}
-	
-	$action = 'preview';
-	$id = $objectpage->id;
+
+	if (! $error)
+	{
+	   $action = 'preview';
+	   $id = $objectpage->id;
+	}
 }
 
 // Update page
@@ -212,7 +222,7 @@ if ($action == 'delete')
         {
             $db->commit();
             setEventMessages($langs->trans("PageDeleted", $objectpage->pageurl, $website), null, 'mesgs');
-            
+
             header("Location: ".$_SERVER["PHP_SELF"].'?website='.$website);
             exit;
         }
@@ -246,7 +256,7 @@ if ($action == 'updatecss')
         $error++;
        $db->rollback();
     }*/
-    
+
     $csscontent = '<!-- BEGIN DOLIBARR-WEBSITE-ADDED-HEADER -->'."\n";
     $csscontent.= '<!-- File generated to wrap the css file - DO NOT MODIFY - It is just a copy of database css content -->'."\n";
     $csscontent.= '<?php '."\n";
@@ -254,25 +264,25 @@ if ($action == 'updatecss')
     $csscontent.= "?>"."\n";
     $csscontent.= '<!-- END -->'."\n";
     $csscontent.= GETPOST('WEBSITE_CSS_INLINE');
-    
+
     dol_syslog("Save file css into ".$filecss);
-    
+
     dol_mkdir($pathofwebsite);
     $result = file_put_contents($filecss, $csscontent);
     if (! empty($conf->global->MAIN_UMASK))
         @chmod($filecss, octdec($conf->global->MAIN_UMASK));
-        
+
     if (! $result)
     {
         $error++;
         setEventMessages('Failed to write file '.$filecss, null, 'errors');
     }
-        
+
     if (! $error)
     {
         setEventMessages($langs->trans("Saved"), null, 'mesgs');
     }
-    
+
     $action='preview';
 }
 
@@ -289,11 +299,11 @@ if ($action == 'setashome')
         $error++;
         setEventMessages($objectpage->error, $objectpage->errors, 'errors');
     }
-    
+
     if (! $error)
     {
         $db->commit();
-        
+
         // Generate the index.php page to be the home page
         //-------------------------------------------------
         dol_mkdir($pathofwebsite);
@@ -306,10 +316,10 @@ if ($action == 'setashome')
         $result = file_put_contents($fileindex, $indexcontent);
         if (! empty($conf->global->MAIN_UMASK))
             @chmod($fileindex, octdec($conf->global->MAIN_UMASK));
-        
+
         if ($result) setEventMessages($langs->trans("Saved"), null, 'mesgs');
         else setEventMessages('Failed to write file '.$fileindex, null, 'errors');
-        
+
         $action='preview';
     }
     else
@@ -330,7 +340,7 @@ if ($action == 'updatemeta')
     if ($res > 0)
     {
         $objectpage->old_object = clone $objectpage;
-        
+
         $objectpage->pageurl = GETPOST('WEBSITE_PAGENAME');
         $objectpage->title = GETPOST('WEBSITE_TITLE');
         $objectpage->description = GETPOST('WEBSITE_DESCRIPTION');
@@ -353,11 +363,11 @@ if ($action == 'updatemeta')
 
             dol_mkdir($pathofwebsite);
 
-            
+
             // Now generate the master.inc.php page
             dol_syslog("We regenerate the master file");
             dol_delete_file($filemaster);
-            
+
             $mastercontent = '<?php'."\n";
             $mastercontent.= '// File generated to link to the master file - DO NOT MODIFY - It is just an include'."\n";
             $mastercontent.= "if (! defined('USEDOLIBARRSERVER')) require '".DOL_DOCUMENT_ROOT."/master.inc.php';\n";
@@ -365,17 +375,17 @@ if ($action == 'updatemeta')
             $result = file_put_contents($filemaster, $mastercontent);
             if (! empty($conf->global->MAIN_UMASK))
                 @chmod($filemaster, octdec($conf->global->MAIN_UMASK));
-            
+
             if (! $result) setEventMessages('Failed to write file '.$filemaster, null, 'errors');
-            
-            
+
+
             // Now generate the alias.php page
             if (! empty($fileoldalias))
             {
                 dol_syslog("We regenerate alias page new name=".$filealias.", old name=".$fileoldalias);
                 dol_delete_file($fileoldalias);
             }
-            
+
             $aliascontent = '<?php'."\n";
             $aliascontent.= '// File generated to wrap the page - DO NOT MODIFY - It is just an include'."\n";
             $aliascontent.= "include_once './page".$objectpage->id.".tpl.php';\n";
@@ -383,15 +393,15 @@ if ($action == 'updatemeta')
             $result = file_put_contents($filealias, $aliascontent);
             if (! empty($conf->global->MAIN_UMASK))
                 @chmod($filealias, octdec($conf->global->MAIN_UMASK));
-            
+
             if (! $result) setEventMessages('Failed to write file '.$filealias, null, 'errors');
 
 
             // Now create the .tpl file (duplicate code with actions updatecontent but we need this to save new header)
             dol_syslog("We regenerate the tpl page filetpl=".$filetpl);
-            
+
             dol_delete_file($filetpl);
-            
+
             $tplcontent ='';
             $tplcontent.= '<?php require "./master.inc.php"; ?>'."\n";
             $tplcontent.= '<html>'."\n";
@@ -407,7 +417,7 @@ if ($action == 'updatemeta')
             $tplcontent.= '<link rel="stylesheet" href="styles.css.php?website='.$website.'" type="text/css" />'."\n";
             $tplcontent.= '<title>'.dol_escape_htmltag($objectpage->title).'</title>'."\n";
             $tplcontent.= '</header>'."\n";
-            
+
             $tplcontent.= '<body>'."\n";
             $tplcontent.= $objectpage->content."\n";
             $tplcontent.= '</body>'."\n";
@@ -415,7 +425,7 @@ if ($action == 'updatemeta')
             $result = file_put_contents($filetpl, $tplcontent);
             if (! empty($conf->global->MAIN_UMASK))
                 @chmod($filetpl, octdec($conf->global->MAIN_UMASK));
-                 
+
             if ($result)
             {
                 setEventMessages($langs->trans("Saved"), null, 'mesgs');
@@ -423,7 +433,7 @@ if ($action == 'updatemeta')
                 //exit;
             }
             else setEventMessages('Failed to write file '.$filetpl, null, 'errors');
-            
+
             $action='preview';
         }
         else
@@ -447,55 +457,60 @@ if ($action == 'updatecontent' || GETPOST('refreshsite') || GETPOST('refreshpage
         $object->virtualhost = GETPOST('previewsite', 'alpha');
         $object->update($user);
     }*/
-    
+
     $objectpage->fk_website = $object->id;
 
-    if ($pageid > 0) 
+    if ($pageid > 0)
     {
         $res = $objectpage->fetch($pageid);
     }
-    else 
+    else
     {
-        $res = $objectpage->fetch($object->fk_default_home);
-        if (! $res > 0)
+        $res=0;
+        if ($object->fk_default_home > 0)
         {
-            $res = $objectpage->fetch(0, $object->fk_website);
+            $res = $objectpage->fetch($object->fk_default_home);
+        }
+        if (! ($res > 0))
+        {
+            $res = $objectpage->fetch(0, $object->id);
         }
     }
+
     if ($res > 0)
     {
         if ($action == 'updatecontent')
         {
             $db->begin();
-            
+
             $objectpage->content = GETPOST('PAGE_CONTENT');
-    
+
             // Clean data. We remove all the head section.
             $objectpage->content = preg_replace('/<head.*<\/head>/s', '', $objectpage->content);
             /* $objectpage->content = preg_replace('/<base\s+href=[\'"][^\'"]+[\'"]\s/?>/s', '', $objectpage->content); */
-            
+
             $res = $objectpage->update($user);
             if ($res < 0)
             {
                 $error++;
                 setEventMessages($objectpage->error, $objectpage->errors, 'errors');
             }
-    
+
         	if (! $error)
         	{
         		$db->commit();
-        	    
+
         		$filemaster=$pathofwebsite.'/master.inc.php';
         		//$fileoldalias=$pathofwebsite.'/'.$objectpage->old_object->pageurl.'.php';
         		$filealias=$pathofwebsite.'/'.$objectpage->pageurl.'.php';
-        		
+
         	    dol_mkdir($pathofwebsite);
-        		
-        		
+
+
         		// Now generate the master.inc.php page
         		dol_syslog("We regenerate the master file");
         		dol_delete_file($filemaster);
-        		
+
         		$mastercontent = '<?php'."\n";
         		$mastercontent.= '// File generated to link to the master file'."\n";
         		$mastercontent.= "if (! defined('USEDOLIBARRSERVER')) require '".DOL_DOCUMENT_ROOT."/master.inc.php';\n";
@@ -503,17 +518,17 @@ if ($action == 'updatecontent' || GETPOST('refreshsite') || GETPOST('refreshpage
         		$result = file_put_contents($filemaster, $mastercontent);
         		if (! empty($conf->global->MAIN_UMASK))
         		    @chmod($filemaster, octdec($conf->global->MAIN_UMASK));
-        		
+
     		    if (! $result) setEventMessages('Failed to write file '.$filemaster, null, 'errors');
-    		
-    		
+
+
     		    // Now generate the alias.php page
                 if (! empty($fileoldalias))
                 {
         		    dol_syslog("We regenerate alias page new name=".$filealias.", old name=".$fileoldalias);
         		    dol_delete_file($fileoldalias);
                 }
-                
+
     		    $aliascontent = '<?php'."\n";
     		    $aliascontent.= "// File generated to wrap the alias page - DO NOT MODIFY - It is just a copy of database page content\n";
     		    $aliascontent.= "include_once './page".$objectpage->id.".tpl.php';\n";
@@ -521,13 +536,13 @@ if ($action == 'updatecontent' || GETPOST('refreshsite') || GETPOST('refreshpage
     		    $result = file_put_contents($filealias, $aliascontent);
     		    if (! empty($conf->global->MAIN_UMASK))
     		        @chmod($filealias, octdec($conf->global->MAIN_UMASK));
-    		
+
                 if (! $result) setEventMessages('Failed to write file '.$filealias, null, 'errors');
-    		
-        		        
+
+
         	    // Now create the .tpl file with code to be able to make dynamic changes
         	    dol_delete_file($filetpl);
-    
+
                 $tplcontent ='';
                 $tplcontent.= "<?php // BEGIN PHP\n";
                 $tplcontent.= "if (! defined('USEDOLIBARRSERVER')) { require './master.inc.php'; } // Not already loaded"."\n";
@@ -546,29 +561,29 @@ if ($action == 'updatecontent' || GETPOST('refreshsite') || GETPOST('refreshpage
         	    $tplcontent.= '<link rel="stylesheet" href="styles.css.php?website='.$website.'" type="text/css" />'."\n";
         	    $tplcontent.= '<title>'.dol_escape_htmltag($objectpage->title).'</title>'."\n";
         	    $tplcontent.= '</header>'."\n";
-        	    	
+
         	    $tplcontent.= '<body>'."\n";
         	    $tplcontent.= $objectpage->content."\n";
         	    $tplcontent.= '</body>'."\n";
-        	    
+
         	    $tplcontent.= '<?php // BEGIN PHP'."\n";
         	    $tplcontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp);'."\n";
         	    $tplcontent.= "// END PHP ?>"."\n";
-        	    
-                //var_dump($filetpl);exit;	    
+
+                //var_dump($filetpl);exit;
         	    $result = file_put_contents($filetpl, $tplcontent);
         	    if (! empty($conf->global->MAIN_UMASK))
         	        @chmod($filetpl, octdec($conf->global->MAIN_UMASK));
-                     
+
         	    if ($result)
         	    {
         	        setEventMessages($langs->trans("Saved"), null, 'mesgs');
         	        header("Location: ".$_SERVER["PHP_SELF"].'?website='.$website.'&pageid='.$pageid);
        	            exit;
         	    }
-        	    else 
+        	    else
         	    {
-        	        setEventMessages('Failed to write file '.$filetpl, null, 'errors');    	        
+        	        setEventMessages('Failed to write file '.$filetpl, null, 'errors');
         	        header("Location: ".$_SERVER["PHP_SELF"].'?website='.$website.'&pageid='.$pageid);
        	            exit;
         	    }
@@ -586,7 +601,7 @@ if ($action == 'updatecontent' || GETPOST('refreshsite') || GETPOST('refreshpage
     }
     else
     {
-        dol_print_error($db, 'Page not found');
+        setEventMessages($langs->trans("NoPageYet"), null, 'warnings');
     }
 }
 
@@ -644,7 +659,7 @@ print '<div class="centpercent websitebar">';
 if (count($object->records) > 0)
 {
     // ***** Part for web sites
-    
+
     print '<div class="websiteselection hideonsmartphoneimp">';
     print $langs->trans("Website").': ';
     print '</div>';
@@ -678,20 +693,20 @@ if (count($object->records) > 0)
         $dataroot=DOL_DATA_ROOT.'/websites/'.$website;
         if (! empty($object->virtualhost)) $virtualurl=$object->virtualhost;
     }
-    
+
     if ($website && $action == 'preview')
     {
         $disabled='';
         if (empty($user->rights->websites->write)) $disabled=' disabled="disabled"';
-    
+
         print ' &nbsp; ';
-        
+
         //print '<input type="submit" class="button"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("MediaFiles")).'" name="editmedia">';
         print '<input type="submit" class="button"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditCss")).'" name="editcss">';
         print '<input type="submit" class="button"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditMenu")).'" name="editmenu">';
         print '<input type="submit"'.$disabled.' class="button" value="'.dol_escape_htmltag($langs->trans("AddPage")).'" name="create">';
     }
-    
+
     print '</div>';
 
     // Button for websites
@@ -705,7 +720,7 @@ if (count($object->records) > 0)
         $htmltext=$langs->trans("SetHereVirtualHost", $dataroot);
         print $form->textwithpicto('', $htmltext);
         print '</div>';
-        
+
         $urlext=$virtualurl;
         $urlint=$urlwithroot.'/public/websites/index.php?website='.$website;
         //if (! empty($object->virtualhost))
@@ -714,7 +729,7 @@ if (count($object->records) > 0)
             print $form->textwithpicto('', $langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $dataroot, $urlext?$urlext:$langs->trans("VirtualHostUrlNotDefined")), 1, 'preview_ext');
             print '</a>';
         //}
-        
+
         print '<a class="websitebuttonsitepreview" id="previewsite" href="'.$urlwithroot.'/public/websites/index.php?website='.$website.'" target="tab'.$website.'" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $urlint)).'">';
         print $form->textwithpicto('', $langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $urlint, $dataroot), 1, 'preview');
         print '</a>';
@@ -726,12 +741,12 @@ if (count($object->records) > 0)
         if (preg_match('/^create/',$action)) print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
         if (preg_match('/^edit/',$action)) print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
     }
-    
+
     print '</div>';
 
 
     // ***** Part for pages
-    
+
     if ($website)
     {
         print '</div>';
@@ -739,13 +754,13 @@ if (count($object->records) > 0)
         $array=$objectpage->fetchAll($object->id);
         if (! is_array($array) && $array < 0) dol_print_error('', $objectpage->error, $objectpage->errors);
         $atleastonepage=(is_array($array) && count($array) > 0);
-        
+
         print '<div class="centpercent websitebar"'.($style?' style="'.$style.'"':'').'">';
         print '<div class="websiteselection hideonsmartphoneimp">';
         print $langs->trans("Page").': ';
         print '</div>';
         print '<div class="websiteselection">';
-        
+
         if ($action != 'add')
         {
             $out='';
@@ -762,7 +777,7 @@ if (count($object->records) > 0)
                     }
                     $pageid=$homepageid?$homepageid:$firstpageid;   // We choose home page and if not defined yet, we take first page
                 }
-    
+
                 foreach($array as $key => $valpage)
                 {
                     $out.='<option value="'.$key.'"';
@@ -785,16 +800,16 @@ if (count($object->records) > 0)
 
         print '<input type="submit" class="button" name="refreshpage" value="'.$langs->trans("Load").'"'.($atleastonepage?'':' disabled="disabled"').'>';
         //print $form->selectarray('page', $array);
-        
+
         if ($action == 'preview')
         {
             $disabled='';
             if (empty($user->rights->websites->write)) $disabled=' disabled="disabled"';
-        
+
             if ($pageid > 0)
             {
                 print ' &nbsp; ';
-                
+
                 if ($object->fk_default_home > 0 && $pageid == $object->fk_default_home) print '<input type="submit" class="button" disabled="disabled" value="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'" name="setashome">';
                 else print '<input type="submit" class="button"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'" name="setashome">';
                 print '<input type="submit" class="button"'.$disabled.'  value="'.dol_escape_htmltag($langs->trans("EditPageMeta")).'" name="editmeta">';
@@ -804,7 +819,7 @@ if (count($object->records) > 0)
                 print '<input type="submit" class="buttonDelete" name="delete" value="'.$langs->trans("Delete").'"'.($atleastonepage?'':' disabled="disabled"').'>';
             }
         }
-        
+
         print '</div>';
         print '<div class="websiteselection">';
         print '</div>';
@@ -815,17 +830,17 @@ if (count($object->records) > 0)
         {
             $websitepage = new WebSitePage($db);
             $websitepage->fetch($pageid);
-            
+
             $realpage=$urlwithroot.'/public/websites/index.php?website='.$website.'&page='.$pageid;
             $pagealias = $websitepage->pageurl;
-            
+
             print '<div class="websiteinputurl">';
             print '<input type="text" id="previewpageurl" class="minwidth200imp" name="previewsite" value="'.$pagealias.'" disabled="disabled">';
             //print '<input type="submit" class="button" name="previewwebsite" target="tab'.$website.'" value="'.$langs->trans("ViewSiteInNewTab").'">';
             $htmltext=$langs->trans("WEBSITE_PAGENAME", $pagealias);
             print $form->textwithpicto('', $htmltext);
             print '</div>';
-            
+
             if (! empty($object->virtualhost))
             {
                 $urlext=$virtualurl.'/'.$pagealias.'.php';
@@ -839,12 +854,12 @@ if (count($object->records) > 0)
                 print $form->textwithpicto('', $langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $dataroot, $urlext?$urlext:$langs->trans("VirtualHostUrlNotDefined")), 1, 'preview_ext');
                 print '</a>';
             }
-            
+
             print '<a class="websitebuttonsitepreview" id="previewpage" href="'.$realpage.'&nocache='.dol_now().'" class="button" target="tab'.$website.'" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $realpage)).'">';
-            print $form->textwithpicto('', $langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $realpage, $dataroot), 1, 'preview'); 
+            print $form->textwithpicto('', $langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $realpage, $dataroot), 1, 'preview');
             print '</a>';       // View page in new Tab
             //print '<input type="submit" class="button" name="previewpage" target="tab'.$website.'"value="'.$langs->trans("ViewPageInNewTab").'">';
-            
+
             // TODO Add js to save alias like we save virtual host name and use dynamic virtual host for url of id=previewpageext
         }
         if (! in_array($action, array('editcss','editmenu','create')))
@@ -853,7 +868,7 @@ if (count($object->records) > 0)
             if (preg_match('/^create/',$action)) print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
             if (preg_match('/^edit/',$action)) print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
         }
-        
+
         print '</div>';
 
         if ($action == 'preview')
@@ -880,7 +895,7 @@ if (count($object->records) > 0)
                                 },
                                 context: document.body
                             });
-                    
+
                             jQuery("#previewsiteext").attr("href",newurl);
                             jQuery("#previewpageext").attr("href",newpage);
                         });
@@ -917,8 +932,8 @@ if ($action == 'editcss')
 
     $csscontent = @file_get_contents($filecss);
     // Clean the php css file to remove php code and get only css part
-    $csscontent = preg_replace('/<!-- BEGIN DOLIBARR.*END -->/s', '', $csscontent); 
-    
+    $csscontent = preg_replace('/<!-- BEGIN DOLIBARR.*END -->/s', '', $csscontent);
+
     dol_fiche_head();
 
     print '<!-- Edit CSS -->'."\n";
@@ -956,14 +971,14 @@ if ($action == 'editcss')
 if ($action == 'editmeta' || $action == 'create')
 {
     print '<div class="fiche">';
- 
+
     print '<br>';
-    
+
     dol_fiche_head();
-    
+
     print '<!-- Edit Meta -->'."\n";
     print '<table class="border" width="100%">';
-    
+
     if ($action != 'create')
     {
         print '<tr><td>';
@@ -986,7 +1001,7 @@ if ($action == 'editmeta' || $action == 'create')
     print '</td><td>';
     print '<input type="text" class="flat" size="96" name="WEBSITE_PAGENAME" value="'.$pageurl.'">';
     print '</td></tr>';
-    
+
     print '<tr><td>';
     print $langs->trans('WEBSITE_TITLE');
     print '</td><td>';
@@ -1031,15 +1046,15 @@ if ($action == 'editcontent')
     /*
      * Editing global variables not related to a specific theme
      */
-    
+
     $csscontent = @file_get_contents($filecss);
-    
+
     $contentforedit = '';
     /*$contentforedit.='<style scoped>'."\n";        // "scoped" means "apply to parent element only". Not yet supported by browsers
     $contentforedit.=$csscontent;
     $contentforedit.='</style>'."\n";*/
     $contentforedit .= $objectpage->content;
-    
+
     require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor=new DolEditor('PAGE_CONTENT',$contentforedit,'',500,'Full','',true,true,true,ROWS_5,'90%');
     $doleditor->Create(0, '', false);
@@ -1056,23 +1071,23 @@ if ($action == 'preview')
         $objectpage->fetch($pageid);
 
         $out = "\n".'<!-- Page content '.$filetpl.' : Div with (CSS + Page content from database) -->'."\n";
-        
+
         $out.='<div id="websitecontent" class="websitecontent">'."\n";
-        
+
         $csscontent = @file_get_contents($filecss);
-        
+
         $out.='<style scoped>'."\n";        // "scoped" means "apply to parent element only". Not yet supported by browsers
         $out.=$csscontent;
         $out.='</style>'."\n";
-        
+
         $out.=$objectpage->content."\n";
-        
+
         $out.='</div>';
-        
+
         $out.= "\n".'<!-- End page content '.$filetpl.' -->'."\n\n";
-        
+
         print $out;
-        
+
         /*file_put_contents($filetpl, $out);
         if (! empty($conf->global->MAIN_UMASK))
             @chmod($filetpl, octdec($conf->global->MAIN_UMASK));
@@ -1080,17 +1095,17 @@ if ($action == 'preview')
         // Output file on browser
         dol_syslog("index.php include $filetpl $filename content-type=$type");
         $original_file_osencoded=dol_osencode($filetpl);	// New file name encoded in OS encoding charset
-        
+
         // This test if file exists should be useless. We keep it to find bug more easily
         if (! file_exists($original_file_osencoded))
         {
             dol_print_error(0,$langs->trans("ErrorFileDoesNotExists",$original_file));
             exit;
         }
-        
+
         //include_once $original_file_osencoded;
         */
-        
+
         /*print '<iframe class="websiteiframenoborder centpercent" src="'.DOL_URL_ROOT.'/public/websites/index.php?website='.$website.'&pageid='.$pageid.'"/>';
         print '</iframe>';*/
     }

From efecb32ec98459e1810f61772bc72c8578841a59 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 Jul 2017 00:11:22 +0200
Subject: [PATCH 428/438] Fix migration

---
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 5d1948f318f..0b41cf739ef 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -25,7 +25,22 @@
 -- -- VMYSQL4.1 DELETE FROM llx_usergroup_user      WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
 
 
+ALTER TABLE llx_supplier_proposaldet CHANGE COLUMN fk_askpricesupplier fk_supplier_proposal integer NOT NULL;
+
+-- VMYSQL4.1 SET sql_mode = 'ALLOW_INVALID_DATES';
+-- VMYSQL4.1 update llx_adherent set datefin = NULL where DATE(STR_TO_DATE(datefin, '%Y-%m-%d')) IS NULL;
+-- VMYSQL4.1 SET sql_mode = 'NO_ZERO_DATE';
+-- VMYSQL4.1 update llx_adherent set datefin = NULL where DATE(STR_TO_DATE(datefin, '%Y-%m-%d')) IS NULL;
+
 -- VMYSQL4.1 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN tms timestamp DEFAULT '2001-01-01 00:00:00';
+-- VMYSQL4.1 ALTER TABLE llx_adherent MODIFY COLUMN datefin datetime NULL;
+
+-- To remove a default value for date that is not valid when field is not null
+-- VMYSQL4.1 ALTER TABLE llx_chargesociales MODIFY COLUMN date_ech datetime DEFAULT NULL;
+-- VMYSQL4.1 ALTER TABLE llx_chargesociales MODIFY COLUMN date_ech datetime NOT NULL;
+
+
+
 
 -- Clean corrupted values for tms
 -- VMYSQL4.1 SET sql_mode = 'ALLOW_INVALID_DATES';

From aa1351d48393915c0c5fb992b374e9962151e988 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 Jul 2017 01:10:09 +0200
Subject: [PATCH 429/438] Fix to be sure database is not created using utf8mb4
 (not yet supported)

---
 htdocs/core/db/mysqli.class.php                   | 10 ++++++++--
 htdocs/install/mysql/migration/repair.sql         | 11 ++++++++---
 .../mysql/tables/llx_product_attribute.key.sql    |  3 ++-
 htdocs/install/step1.php                          | 15 +++++++++++++--
 4 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index 24ed1425f6b..526d43de0ab 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -857,6 +857,7 @@ class DoliDBMysqli extends DoliDB
      *	Return charset used to store data in current database (same result than using SELECT default_character_set_name FROM information_schema.SCHEMATA WHERE schema_name = "databasename";)
      *
      *	@return		string		Charset
+     *  @see getDefaultCollationDatabase
      */
     function getDefaultCharacterSetDatabase()
     {
@@ -867,7 +868,9 @@ class DoliDBMysqli extends DoliDB
             return $this->forcecharset;
         }
         $liste=$this->fetch_array($resql);
-        return $liste['Value'];
+        $tmpval = $liste['Value'];
+
+        return $tmpval;
     }
 
     /**
@@ -900,6 +903,7 @@ class DoliDBMysqli extends DoliDB
      *	Return collation used in current database
      *
      *	@return		string		Collation value
+     *  @see getDefaultCharacterSetDatabase
      */
     function getDefaultCollationDatabase()
     {
@@ -910,7 +914,9 @@ class DoliDBMysqli extends DoliDB
             return $this->forcecollate;
         }
         $liste=$this->fetch_array($resql);
-        return $liste['Value'];
+        $tmpval = $liste['Value'];
+
+        return $tmpval;
     }
 
     /**
diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index f9ec23d4f69..95840f73cb8 100755
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -13,12 +13,17 @@
 -- flush privileges;
 
 
--- Requests to change character set and collation of a varchar column.
--- utf8 and utf8_unicode_ci is recommended (or even better utf8mb4 and utf8mb4_unicode_ci with mysql 5.5.3+)
+-- Request to change default pagecode + colation of database
+-- ALTER DATABASE name_of_database CHARACTER SET utf8 COLLATE utf8_unicode_ci;
 
+-- Request to change default pagecode + colation of table
+-- ALTER TABLE name_of_table CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+
+-- Request to change character set and collation of a varchar column.
+-- utf8 and utf8_unicode_ci is recommended (or even better utf8mb4 and utf8mb4_unicode_ci with mysql 5.5.3+)
 -- ALTER TABLE llx_accounting_account MODIFY account_number VARCHAR(20) CHARACTER SET utf8;
 -- ALTER TABLE llx_accounting_account MODIFY account_number VARCHAR(20) COLLATE utf8_unicode_ci;
--- You can check with 'show full columns from llx_accounting_account';
+-- You can check with 'show full columns from mytablename';
 
 
 
diff --git a/htdocs/install/mysql/tables/llx_product_attribute.key.sql b/htdocs/install/mysql/tables/llx_product_attribute.key.sql
index 28d687dbdda..f107a855e61 100644
--- a/htdocs/install/mysql/tables/llx_product_attribute.key.sql
+++ b/htdocs/install/mysql/tables/llx_product_attribute.key.sql
@@ -16,4 +16,5 @@
 --
 -- ============================================================================
 
-ALTER TABLE llx_product_attribute ADD CONSTRAINT unique_ref UNIQUE (ref);
\ No newline at end of file
+ALTER TABLE llx_product_attribute ADD UNIQUE INDEX uk_product_attribute_ref (ref);
+
diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php
index 9ad30fe5d7b..a0fdc22a015 100644
--- a/htdocs/install/step1.php
+++ b/htdocs/install/step1.php
@@ -312,8 +312,11 @@ if (! $error && $db->connected)
 // Define $defaultCharacterSet and $defaultDBSortingCollation
 if (! $error && $db->connected)
 {
-    if (!empty($db_create_database)) { // If we create database, we force default value
-    	$defaultCharacterSet=$db->forcecharset;
+    if (!empty($db_create_database))    // If we create database, we force default value
+    {
+        // Default values come from the database handler
+
+        $defaultCharacterSet=$db->forcecharset;
     	$defaultDBSortingCollation=$db->forcecollate;
     }
     else	// If already created, we take current value
@@ -322,6 +325,14 @@ if (! $error && $db->connected)
         $defaultDBSortingCollation=$db->getDefaultCollationDatabase();
     }
 
+    // Force to avoid utf8mb4 because index on field char 255 reach limit of 767 char for indexes (example with mysql 5.6.34 = mariadb 10.0.29)
+    // TODO Remove this when utf8mb4 is supported
+    if ($defaultCharacterSet == 'utf8mb4' || $defaultDBSortingCollation == 'utf8mb4_unicode_ci')
+    {
+        $defaultCharacterSet = 'utf8';
+        $defaultDBSortingCollation = 'utf8_unicode_ci';
+    }
+
     print '<input type="hidden" name="dolibarr_main_db_character_set" value="'.$defaultCharacterSet.'">';
     print '<input type="hidden" name="dolibarr_main_db_collation" value="'.$defaultDBSortingCollation.'">';
     $db_character_set=$defaultCharacterSet;

From d57fe35efc0327ff4b7b191e40a508b2cd1a65f3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 Jul 2017 01:36:04 +0200
Subject: [PATCH 430/438] Add option to fix corrupted database with bad
 pagecode

---
 htdocs/install/repair.php | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index 895d36d72f1..3cfbbda5d26 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -78,6 +78,7 @@ print 'Option clean_product_stock_batch (0 or \'test\' or \'confirmed\') is '.(G
 print 'Option set_empty_time_spent_amount (0 or \'test\' or \'confirmed\') is '.(GETPOST('set_empty_time_spent_amount','alpha')?GETPOST('set_empty_time_spent_amount','alpha'):'0').'<br>'."\n";
 print 'Option rebuild_product_thumbs (0 or \'test\' or \'confirmed\') is '.(GETPOST('rebuild_product_thumbs','alpha')?GETPOST('rebuild_product_thumbs','alpha'):'0').'<br>'."\n";
 print 'Option force_disable_of_modules_not_found (0 or \'test\' or \'confirmed\') is '.(GETPOST('force_disable_of_modules_not_found','alpha')?GETPOST('force_disable_of_modules_not_found','alpha'):'0').'<br>'."\n";
+print 'Option force_utf8_on_tables, for mysql/mariadb only(0 or \'test\' or \'confirmed\') is '.(GETPOST('force_utf8_on_tables','alpha')?GETPOST('force_utf8_on_tables','alpha'):'0').'<br>'."\n";
 print '<br>';
 
 print '<table cellspacing="0" cellpadding="1" border="0" width="100%">';
@@ -890,6 +891,35 @@ if ($ok && GETPOST('force_disable_of_modules_not_found','alpha'))
 
 
 
+// clean_old_module_entries: Clean data into const when files of module were removed without being
+// clean_linked_elements: Check and clean linked elements
+if ($ok && GETPOST('force_utf8_on_tables','alpha'))
+{
+    print '<tr><td colspan="2"><br>*** Force page code and collation with utf8 (for mysql/mariadb only)</td></tr>';
+
+    if ($db->type == "mysql")
+    {
+        $listoftables = $db->DDLListTables($db->database_name);
+
+        foreach($listoftables as $table)
+        {
+            print '<tr><td colspan="2">';
+            print $table;
+            $sql='ALTER TABLE '.$table.' CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci';
+            if (GETPOST('force_utf8_on_tables','alpha') == 'confirmed')
+            {
+                $db->query($sql);
+            }
+            print '</td></tr>';
+        }
+    }
+    else
+    {
+        print '<tr><td colspan="2">Not available with database type '.$db->type.'</td></tr>';
+    }
+}
+
+
 print '</table>';
 
 

From 8a96260892ae9b4f76026e8c065291c6ced85901 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 Jul 2017 01:57:28 +0200
Subject: [PATCH 431/438] Fix amount not filled into email confirmation

---
 htdocs/public/stripe/newpayment.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/stripe/newpayment.php b/htdocs/public/stripe/newpayment.php
index af0c880d3c8..962185b8397 100644
--- a/htdocs/public/stripe/newpayment.php
+++ b/htdocs/public/stripe/newpayment.php
@@ -297,7 +297,7 @@ if ($action == 'charge')
     }
 
 	$_SESSION["onlinetoken"] = $stripeToken;
-    $_SESSION["FinalPaymentAmt"] = $amount;
+    $_SESSION["Payment_Amount"] = $amount;
     $_SESSION["currencyCodeType"] = $currency;
     $_SESSION["paymentType"] = '';
     $_SESSION['ipaddress'] = $_SERVER['REMOTE_ADDR'];  // Payer ip

From db1d97c9ac8e8d3f39e7c63876dfc6779b335a5c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 Jul 2017 02:09:14 +0200
Subject: [PATCH 432/438] Fix bad value for ref of old contracts

---
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 0b41cf739ef..f418a5e6a1f 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -346,6 +346,8 @@ ALTER TABLE llx_product_fournisseur_price_log ADD COLUMN multicurrency_tx	     d
 ALTER TABLE llx_product_fournisseur_price_log ADD COLUMN multicurrency_price	 double(24,8) DEFAULT NULL;
 ALTER TABLE llx_product_fournisseur_price_log ADD COLUMN multicurrency_price_ttc double(24,8) DEFAULT NULL;
 
+UPDATE TABLE llx_contrat set ref = rowid where ref is null or ref = '';
+
 create table llx_payment_various
 (
   rowid                 integer AUTO_INCREMENT PRIMARY KEY,

From 9e26e6b0a3600b1172a01f31a0772e9f5b4bc7bf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 Jul 2017 02:09:14 +0200
Subject: [PATCH 433/438] Fix bad value for ref of old contracts

---
 htdocs/admin/websites.php                     | 51 +++++++++++-------
 htdocs/core/lib/pdf.lib.php                   |  2 +-
 htdocs/core/lib/website.lib.php               | 33 ++++++++----
 htdocs/core/modules/modWebsites.class.php     |  6 +--
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  2 +
 htdocs/langs/en_US/website.lang               |  3 +-
 htdocs/public/error-404.php                   |  2 +-
 htdocs/public/websites/index.php              | 52 +++++++++++++++----
 htdocs/public/websites/styles.css.php         | 21 +++++---
 htdocs/websites/index.php                     | 13 ++++-
 10 files changed, 132 insertions(+), 53 deletions(-)

diff --git a/htdocs/admin/websites.php b/htdocs/admin/websites.php
index 4dbd154096f..0336a2533c0 100644
--- a/htdocs/admin/websites.php
+++ b/htdocs/admin/websites.php
@@ -25,8 +25,10 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+require_once DOL_DOCUMENT_ROOT.'/websites/class/website.class.php';
 
 $langs->load("errors");
 $langs->load("admin");
@@ -35,7 +37,6 @@ $langs->load("website");
 
 $action=GETPOST('action','alpha')?GETPOST('action','alpha'):'view';
 $confirm=GETPOST('confirm','alpha');
-$id=GETPOST('id','int');
 $rowid=GETPOST('rowid','alpha');
 
 $id=1;
@@ -135,7 +136,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
             setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
         }
     }
-    
+
     // Si verif ok et action add, on ajoute la ligne
     if ($ok && GETPOST('actionadd'))
     {
@@ -185,7 +186,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
         if ($result)	// Add is ok
         {
             setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
-        	$_POST=array('id'=>$id);	// Clean $_POST array, we keep only
+        	unset($_POST);	// Clean $_POST array, we keep only
         }
         else
         {
@@ -204,6 +205,10 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
         if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
         else { $rowidcol="rowid"; }
 
+        $website=new Website($db);
+        $rowid=GETPOST('rowid','int');
+        $website->fetch($rowid);
+
         // Modify entry
         $sql = "UPDATE ".$tabname[$id]." SET ";
         // Modifie valeur des champs
@@ -229,7 +234,17 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
         dol_syslog("actionmodify", LOG_DEBUG);
         //print $sql;
         $resql = $db->query($sql);
-        if (! $resql)
+        if ($resql)
+        {
+            $newname = dol_sanitizeFileName(GETPOST('ref','aZ09'));
+            if ($newname != $website->ref)
+            {
+                $srcfile=DOL_DATA_ROOT.'/websites/'.$website->ref;
+                $destfile=DOL_DATA_ROOT.'/websites/'.$newname;
+                @rename($srcfile, $destfile);
+            }
+        }
+        else
         {
             setEventMessages($db->error(), null, 'errors');
         }
@@ -249,7 +264,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 
     $sql = "DELETE from ".MAIN_DB_PREFIX."website_pages WHERE fk_website ='".$rowid."'";
     $result = $db->query($sql);
-    
+
     $sql = "DELETE from ".MAIN_DB_PREFIX."website WHERE rowid ='".$rowid."'";
     $result = $db->query($sql);
     if (! $result)
@@ -321,7 +336,7 @@ print "<br>\n";
 // Confirmation de la suppression de la ligne
 if ($action == 'delete')
 {
-    print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&id='.$id, $langs->trans('DeleteWebsite'), $langs->trans('ConfirmDeleteWebsite'), 'confirm_delete','',0,1);
+    print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid, $langs->trans('DeleteWebsite'), $langs->trans('ConfirmDeleteWebsite'), 'confirm_delete','',0,1);
 }
 //var_dump($elementList);
 
@@ -355,7 +370,7 @@ if ($id)
 
     $fieldlist=explode(',',$tabfield[$id]);
 
-    print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
+    print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<table class="noborder" width="100%">';
 
@@ -388,9 +403,7 @@ if ($id)
              if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') $alabelisused=1;
         }
 
-        if ($id == 4) print '<td></td>';
         print '<td colspan="4">';
-        print '<input type="hidden" name="id" value="'.$id.'">';
         print '</td>';
         print '</tr>';
 
@@ -444,19 +457,19 @@ if ($id)
         if ($num)
         {
             print '<br>';
-            
-            print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
+
+            print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">';
             print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
             print '<input type="hidden" name="page" value="'.$page.'">';
             print '<input type="hidden" name="rowid" value="'.$rowid.'">';
-            
+
             print '<table class="noborder" width="100%">';
-        
+
             // There is several pages
             if ($num > $listlimit)
             {
                 print '<tr class="none"><td align="right" colspan="'.(3+count($fieldlist)).'">';
-                print_fleche_navigation($page, $_SERVER["PHP_SELF"], '&id='.$id, ($num > $listlimit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page+1).'</span></li>');
+                print_fleche_navigation($page, $_SERVER["PHP_SELF"], '', ($num > $listlimit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page+1).'</span></li>');
                 print '</td></tr>';
             }
 
@@ -486,11 +499,11 @@ if ($id)
                 // Affiche nom du champ
                 if ($showfield)
                 {
-                    print getTitleFieldOfList($valuetoshow,0,$_SERVER["PHP_SELF"],($sortable?$fieldlist[$field]:''),($page?'page='.$page.'&':'').'&id='.$id,"","align=".$align,$sortfield,$sortorder);
+                    print getTitleFieldOfList($valuetoshow,0,$_SERVER["PHP_SELF"],($sortable?$fieldlist[$field]:''),($page?'page='.$page.'&':''),"","align=".$align,$sortfield,$sortorder);
                 }
             }
 
-			print getTitleFieldOfList($langs->trans("Status"),0,$_SERVER["PHP_SELF"],"status",($page?'page='.$page.'&':'').'&id='.$id,"",'align="center"',$sortfield,$sortorder);
+			print getTitleFieldOfList($langs->trans("Status"),0,$_SERVER["PHP_SELF"],"status",($page?'page='.$page.'&':''),"",'align="center"',$sortfield,$sortorder);
             print getTitleFieldOfList('');
             print getTitleFieldOfList('');
             print '</tr>';
@@ -539,7 +552,7 @@ if ($id)
                     // Can an entry be erased or disabled ?
                     $iserasable=1;$isdisable=1;	// true by default
 
-                    $url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'&amp;code='.(! empty($obj->code)?urlencode($obj->code):'').'&amp;id='.$id.'&amp;';
+                    $url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'&amp;code='.(! empty($obj->code)?urlencode($obj->code):'').'&amp;';
 
                     // Active
                     print '<td align="center" class="nowrap">';
@@ -558,9 +571,9 @@ if ($id)
                 }
                 $i++;
             }
-            
+
             print '</table>';
-            
+
             print '</form>';
         }
     }
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index dedb169dc38..614379a2900 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -865,7 +865,7 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
 		// Make a change into HTML code to allow to include images from medias directory.
 		// <img alt="" src="/dolibarr_dev/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
 		// become
-		// <img alt="" src="'.DOL_DATA_ROOT.'/media/image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
+		// <img alt="" src="'.DOL_DATA_ROOT.'/medias/image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
 		$newfreetext=preg_replace('/(<img.*src=")[^\"]*viewimage\.php[^\"]*modulepart=medias[^\"]*file=([^\"]*)("[^\/]*\/>)/', '\1'.DOL_DATA_ROOT.'/medias/\2\3', $newfreetext);
 
 		$line.=$outputlangs->convToOutputCharset($newfreetext);
diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index ebbd261984e..37f01a0ffe3 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -31,21 +31,36 @@
 function dolWebsiteOutput($content)
 {
     global $db, $langs, $conf, $user;
+    global $dolibarr_main_url_root;
 
     dol_syslog("dolWebsiteOutput start");
-    
+
     if (! defined('USEDOLIBARRSERVER'))
     {
-        // Replace link of Dolibarr medias with direct link for virtual server
-        
-        
-        
-        
-        
+        // Define $urlwithroot
+        $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+        $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+        //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+
+        $symlinktomediaexists=1;
+
+		// Make a change into HTML code to allow to include images from medias directory correct with direct link for virtual server
+		// <img alt="" src="/dolibarr_dev/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
+		// become
+		// <img alt="" src="'.$urlwithroot.'/medias/image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
+        $nbrep=0;
+        if (! $symlinktomediaexists)
+        {
+            $content=preg_replace('/(<img.*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^\/]*\/>)/', '\1'.$urlwithroot.'/viewimage.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep);
+        }
+        else
+        {
+            $content=preg_replace('/(<img.*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^\/]*\/>)/', '\1medias/\4\5', $content, -1, $nbrep);
+        }
     }
-    
+
     dol_syslog("dolWebsiteOutput end");
-    
+
     print $content;
 }
 
diff --git a/htdocs/core/modules/modWebsites.class.php b/htdocs/core/modules/modWebsites.class.php
index 877c78b85eb..57abe371314 100644
--- a/htdocs/core/modules/modWebsites.class.php
+++ b/htdocs/core/modules/modWebsites.class.php
@@ -42,15 +42,15 @@ class modWebsites extends DolibarrModules
 
         $this->db = $db;
         $this->numero = 10000;
-        
+
 		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
 		// It is used to group modules in module setup page
         $this->family = "portal";
         $this->module_position = 50;
         // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
         $this->name = preg_replace('/^mod/i','',get_class($this));
-        $this->description = "Enable the public website with CMS features";
-        $this->version = 'development';                        // 'experimental' or 'dolibarr' or version
+        $this->description = "Enable to build and serve public websites with CMS features";
+        $this->version = 'experimental';                        // 'experimental' or 'dolibarr' or version
         // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
         $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
         // Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 0b41cf739ef..f418a5e6a1f 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -346,6 +346,8 @@ ALTER TABLE llx_product_fournisseur_price_log ADD COLUMN multicurrency_tx	     d
 ALTER TABLE llx_product_fournisseur_price_log ADD COLUMN multicurrency_price	 double(24,8) DEFAULT NULL;
 ALTER TABLE llx_product_fournisseur_price_log ADD COLUMN multicurrency_price_ttc double(24,8) DEFAULT NULL;
 
+UPDATE TABLE llx_contrat set ref = rowid where ref is null or ref = '';
+
 create table llx_payment_various
 (
   rowid                 integer AUTO_INCREMENT PRIMARY KEY,
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index 4482093b26d..dd6332b11a7 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -14,8 +14,9 @@ EditPageContent=Edit Content
 Website=Web site
 Webpage=Web page
 AddPage=Add page
+HomePage=Home Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
-RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
+RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 PageDeleted=Page '%s' of website %s deleted
 PageAdded=Page '%s' added
 ViewSiteInNewTab=View site in new tab
diff --git a/htdocs/public/error-404.php b/htdocs/public/error-404.php
index 951f29b7dde..36547d26704 100644
--- a/htdocs/public/error-404.php
+++ b/htdocs/public/error-404.php
@@ -18,7 +18,7 @@
     <h2>Error</h2>
 
     <br>
-    You requested a page that does not exists.
+    You requested a website or a page that does not exists.
 
     <br>
     <?php print isset($_SERVER["HTTP_REFERER"])?'You come from '.$_SERVER["HTTP_REFERER"].'.':''; ?>
diff --git a/htdocs/public/websites/index.php b/htdocs/public/websites/index.php
index 4c2eec0edc5..0bc85dce463 100644
--- a/htdocs/public/websites/index.php
+++ b/htdocs/public/websites/index.php
@@ -67,23 +67,51 @@ if (empty($pageid))
 {
     require_once DOL_DOCUMENT_ROOT.'/websites/class/website.class.php';
     require_once DOL_DOCUMENT_ROOT.'/websites/class/websitepage.class.php';
-    
+
     $object=new Website($db);
     $object->fetch(0, $website);
-    
-    $objectpage=new WebsitePage($db);
-    $array=$objectpage->fetchAll($object->id);
-    
-    if (count($array) > 0)
+    if (empty($object->id))
     {
-        $firstrep=reset($array);
-        $pageid=$firstrep->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 ($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");
     print $langs->trans("PreviewOfSiteNotYetAvailable");
+
+    include DOL_DOCUMENT_ROOT.'/public/error-404.php';
     exit;
 }
 
@@ -95,7 +123,7 @@ if ($pageid == 'css')   // No more used ?
     header('Content-type: text/css');
     // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
     //if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
-    //else 
+    //else
     header('Cache-Control: no-cache');
     $original_file=$dolibarr_main_data_root.'/websites/'.$website.'/styles.css.php';
 }
@@ -136,9 +164,13 @@ $original_file_osencoded=dol_osencode($original_file);	// New file name encoded
 // This test if file exists should be useless. We keep it to find bug more easily
 if (! file_exists($original_file_osencoded))
 {
+    // Return header 404
+    header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found", true, 404);
+
     $langs->load("website");
     print $langs->trans("RequestedPageHasNoContentYet", $pageid);
-    //dol_print_error(0,$langs->trans("ErrorFileDoesNotExists",$original_file));
+
+    include DOL_DOCUMENT_ROOT.'/public/error-404.php';
     exit;
 }
 
diff --git a/htdocs/public/websites/styles.css.php b/htdocs/public/websites/styles.css.php
index 5a736affc25..14014577cea 100644
--- a/htdocs/public/websites/styles.css.php
+++ b/htdocs/public/websites/styles.css.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2016-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,8 +18,7 @@
 /**
  *     	\file       htdocs/public/websites/styles.css.php
  *		\ingroup    website
- *		\brief      Page to output style page
- *		\author	    Laurent Destailleur
+ *		\brief      Page to output style page. Called with <link rel="stylesheet" href="styles.css.php?websiteid=123" type="text/css" />
  */
 
 define('NOTOKENRENEWAL',1); // Disables token renewal
@@ -48,6 +47,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 $error=0;
 $website=GETPOST('website', 'alpha');
+$websiteid=GETPOST('websiteid', 'int');
 $pageid=GETPOST('page', 'alpha')?GETPOST('page', 'alpha'):GETPOST('pageid', 'alpha');
 
 $accessallowed = 1;
@@ -67,13 +67,20 @@ if (empty($pageid))
 {
     require_once DOL_DOCUMENT_ROOT.'/websites/class/website.class.php';
     require_once DOL_DOCUMENT_ROOT.'/websites/class/websitepage.class.php';
-    
+
     $object=new Website($db);
-    $object->fetch(0, $website);
-    
+    if ($websiteid)
+    {
+        $object->fetch($websiteid);
+        $website=$object->ref;
+    }
+    else
+    {
+        $object->fetch(0, $website);
+    }
     $objectpage=new WebsitePage($db);
     $array=$objectpage->fetchAll($object->id);
-    
+
     if (count($array) > 0)
     {
         $firstrep=reset($array);
diff --git a/htdocs/websites/index.php b/htdocs/websites/index.php
index 183fa45298a..1a11ea2a4e1 100644
--- a/htdocs/websites/index.php
+++ b/htdocs/websites/index.php
@@ -414,7 +414,7 @@ if ($action == 'updatemeta')
             $tplcontent.= '<meta name="title" content="'.dol_escape_htmltag($objectpage->title).'" />'."\n";
             $tplcontent.= '<meta name="description" content="'.dol_escape_htmltag($objectpage->description).'" />'."\n";
             $tplcontent.= '<meta name="generator" content="'.DOL_APPLICATION_TITLE.'" />'."\n";
-            $tplcontent.= '<link rel="stylesheet" href="styles.css.php?website='.$website.'" type="text/css" />'."\n";
+            $tplcontent.= '<link rel="stylesheet" href="styles.css.php?websiteid='.$object->id.'" type="text/css" />'."\n";
             $tplcontent.= '<title>'.dol_escape_htmltag($objectpage->title).'</title>'."\n";
             $tplcontent.= '</header>'."\n";
 
@@ -452,6 +452,15 @@ if ($action == 'updatecontent' || GETPOST('refreshsite') || GETPOST('refreshpage
 {
     $object->fetch(0, $website);
 
+    // Check symlink to medias and restore it if ko
+    $pathtomedias=DOL_DATA_ROOT.'/medias';
+    $pathtomediasinwebsite=$pathofwebsite.'/medias';
+    if (! is_link(dol_osencode($pathtomediasinwebsite)))
+    {
+        dol_syslog("Create symlink for ".$pathtomedias." into name ".$pathtomediasinwebsite);
+        symlink($pathtomedias, $pathtomediasinwebsite);
+    }
+
     /*if (GETPOST('savevirtualhost') && $object->virtualhost != GETPOST('previewsite'))
     {
         $object->virtualhost = GETPOST('previewsite', 'alpha');
@@ -558,7 +567,7 @@ if ($action == 'updatecontent' || GETPOST('refreshsite') || GETPOST('refreshpage
         	    $tplcontent.= '<meta name="title" content="'.dol_escape_htmltag($objectpage->title).'" />'."\n";
         	    $tplcontent.= '<meta name="description" content="'.dol_escape_htmltag($objectpage->description).'" />'."\n";
         	    $tplcontent.= '<meta name="generator" content="'.DOL_APPLICATION_TITLE.'" />'."\n";
-        	    $tplcontent.= '<link rel="stylesheet" href="styles.css.php?website='.$website.'" type="text/css" />'."\n";
+        	    $tplcontent.= '<link rel="stylesheet" href="styles.css.php?websiteid='.$object->id.'" type="text/css" />'."\n";
         	    $tplcontent.= '<title>'.dol_escape_htmltag($objectpage->title).'</title>'."\n";
         	    $tplcontent.= '</header>'."\n";
 

From 8b91f4fb5ee537980ced85843a983ec98ccb4a9a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 Jul 2017 12:04:45 +0200
Subject: [PATCH 434/438] Debug module website

---
 htdocs/collab/index.php         | 62 ++++++++++++++++-----------------
 htdocs/langs/en_US/website.lang |  3 +-
 htdocs/websites/index.php       |  6 ++--
 3 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/htdocs/collab/index.php b/htdocs/collab/index.php
index ea7abde4151..7f08beff955 100644
--- a/htdocs/collab/index.php
+++ b/htdocs/collab/index.php
@@ -49,7 +49,7 @@ function llxHeader($head='', $title='', $help_url='', $target='', $disablejs=0,
     top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 
     print '<body id="mainbody">';
-    
+
     // top menu and left menu area
     if (empty($conf->dol_hide_topmenu))
     {
@@ -108,7 +108,7 @@ if (empty($action)) $action='preview';
  */
 
 if (GETPOST('refreshsite')) $pageid=0;      // If we change the site, we reset the pageid.
-if (GETPOST('refreshpage')) $action='preview'; 
+if (GETPOST('refreshpage')) $action='preview';
 
 
 // Add a collab page
@@ -146,7 +146,7 @@ if ($action == 'add')
 	{
 		$db->rollback();
 	}
-	
+
 	$action = 'preview';
 	$id = $objectpage->id;
 }
@@ -173,7 +173,7 @@ if ($action == 'delete')
         {
             $db->commit();
             setEventMessages($langs->trans("PageDeleted", $objectpage->pageurl, $website), null, 'mesgs');
-            
+
             header("Location: ".$_SERVER["PHP_SELF"].'?website='.$website);
             exit;
         }
@@ -218,7 +218,7 @@ print '<div class="centpercent websitebar">';
 if (count($object->records) > 0)
 {
     // ***** Part for web sites
-    
+
     print '<div class="websiteselection hideonsmartphoneimp">';
     print $langs->trans("Website").': ';
     print '</div>';
@@ -252,20 +252,20 @@ if (count($object->records) > 0)
         $dataroot=DOL_DATA_ROOT.'/websites/'.$website;
         if (! empty($object->virtualhost)) $virtualurl=$object->virtualhost;
     }
-    
+
     if ($website && $action == 'preview')
     {
         $disabled='';
         if (empty($user->rights->websites->write)) $disabled=' disabled="disabled"';
-    
+
         print ' &nbsp; ';
-        
+
         //print '<input type="submit" class="button"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("MediaFiles")).'" name="editmedia">';
         print '<input type="submit" class="button"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditCss")).'" name="editcss">';
         print '<input type="submit" class="button"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditMenu")).'" name="editmenu">';
         print '<input type="submit"'.$disabled.' class="button" value="'.dol_escape_htmltag($langs->trans("AddPage")).'" name="create">';
     }
-    
+
     print '</div>';
 
     // Button for websites
@@ -279,7 +279,7 @@ if (count($object->records) > 0)
         $htmltext=$langs->trans("SetHereVirtualHost", $dataroot);
         print $form->textwithpicto('', $htmltext);
         print '</div>';
-        
+
         $urlext=$virtualurl;
         $urlint=$urlwithroot.'/public/websites/index.php?website='.$website;
         //if (! empty($object->virtualhost))
@@ -288,7 +288,7 @@ if (count($object->records) > 0)
             print $form->textwithpicto('', $langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $dataroot, $urlext?$urlext:$langs->trans("VirtualHostUrlNotDefined")), 1, 'preview_ext');
             print '</a>';
         //}
-        
+
         print '<a class="websitebuttonsitepreview" id="previewsite" href="'.$urlwithroot.'/public/websites/index.php?website='.$website.'" target="tab'.$website.'" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $urlint)).'">';
         print $form->textwithpicto('', $langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $urlint, $dataroot), 1, 'preview');
         print '</a>';
@@ -300,12 +300,12 @@ if (count($object->records) > 0)
         if (preg_match('/^create/',$action)) print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
         if (preg_match('/^edit/',$action)) print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
     }
-    
+
     print '</div>';
 
 
     // ***** Part for pages
-    
+
     if ($website)
     {
         print '</div>';
@@ -313,13 +313,13 @@ if (count($object->records) > 0)
         $array=$objectpage->fetchAll($object->id);
         if (! is_array($array) && $array < 0) dol_print_error('', $objectpage->error, $objectpage->errors);
         $atleastonepage=(is_array($array) && count($array) > 0);
-        
+
         print '<div class="centpercent websitebar"'.($style?' style="'.$style.'"':'').'">';
         print '<div class="websiteselection hideonsmartphoneimp">';
         print $langs->trans("Page").': ';
         print '</div>';
         print '<div class="websiteselection">';
-        
+
         if ($action != 'add')
         {
             $out='';
@@ -336,7 +336,7 @@ if (count($object->records) > 0)
                     }
                     $pageid=$homepageid?$homepageid:$firstpageid;   // We choose home page and if not defined yet, we take first page
                 }
-    
+
                 foreach($array as $key => $valpage)
                 {
                     $out.='<option value="'.$key.'"';
@@ -359,16 +359,16 @@ if (count($object->records) > 0)
 
         print '<input type="submit" class="button" name="refreshpage" value="'.$langs->trans("Load").'"'.($atleastonepage?'':' disabled="disabled"').'>';
         //print $form->selectarray('page', $array);
-        
+
         if ($action == 'preview')
         {
             $disabled='';
             if (empty($user->rights->websites->write)) $disabled=' disabled="disabled"';
-        
+
             if ($pageid > 0)
             {
                 print ' &nbsp; ';
-                
+
                 if ($object->fk_default_home > 0 && $pageid == $object->fk_default_home) print '<input type="submit" class="button" disabled="disabled" value="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'" name="setashome">';
                 else print '<input type="submit" class="button"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'" name="setashome">';
                 print '<input type="submit" class="button"'.$disabled.'  value="'.dol_escape_htmltag($langs->trans("EditPageMeta")).'" name="editmeta">';
@@ -378,7 +378,7 @@ if (count($object->records) > 0)
                 print '<input type="submit" class="buttonDelete" name="delete" value="'.$langs->trans("Delete").'"'.($atleastonepage?'':' disabled="disabled"').'>';
             }
         }
-        
+
         print '</div>';
         print '<div class="websiteselection">';
         print '</div>';
@@ -389,17 +389,17 @@ if (count($object->records) > 0)
         {
             $websitepage = new WebSitePage($db);
             $websitepage->fetch($pageid);
-            
+
             $realpage=$urlwithroot.'/public/websites/index.php?website='.$website.'&page='.$pageid;
             $pagealias = $websitepage->pageurl;
-            
+
             print '<div class="websiteinputurl">';
             print '<input type="text" id="previewpageurl" class="minwidth200imp" name="previewsite" value="'.$pagealias.'" disabled="disabled">';
             //print '<input type="submit" class="button" name="previewwebsite" target="tab'.$website.'" value="'.$langs->trans("ViewSiteInNewTab").'">';
             $htmltext=$langs->trans("WEBSITE_PAGENAME", $pagealias);
             print $form->textwithpicto('', $htmltext);
             print '</div>';
-            
+
             if (! empty($object->virtualhost))
             {
                 $urlext=$virtualurl.'/'.$pagealias.'.php';
@@ -413,12 +413,12 @@ if (count($object->records) > 0)
                 print $form->textwithpicto('', $langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $dataroot, $urlext?$urlext:$langs->trans("VirtualHostUrlNotDefined")), 1, 'preview_ext');
                 print '</a>';
             }
-            
+
             print '<a class="websitebuttonsitepreview" id="previewpage" href="'.$realpage.'&nocache='.dol_now().'" class="button" target="tab'.$website.'" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $realpage)).'">';
-            print $form->textwithpicto('', $langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $realpage, $dataroot), 1, 'preview'); 
+            print $form->textwithpicto('', $langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $realpage, $dataroot), 1, 'preview');
             print '</a>';       // View page in new Tab
             //print '<input type="submit" class="button" name="previewpage" target="tab'.$website.'"value="'.$langs->trans("ViewPageInNewTab").'">';
-            
+
             // TODO Add js to save alias like we save virtual host name and use dynamic virtual host for url of id=previewpageext
         }
         if (! in_array($action, array('editcss','editmenu','create')))
@@ -427,7 +427,7 @@ if (count($object->records) > 0)
             if (preg_match('/^create/',$action)) print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
             if (preg_match('/^edit/',$action)) print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
         }
-        
+
         print '</div>';
 
         if ($action == 'preview')
@@ -454,7 +454,7 @@ if (count($object->records) > 0)
                                 },
                                 context: document.body
                             });
-                    
+
                             jQuery("#previewsiteext").attr("href",newurl);
                             jQuery("#previewpageext").attr("href",newpage);
                         });
@@ -483,15 +483,15 @@ if ($action == 'editcontent')
     /*
      * Editing global variables not related to a specific theme
      */
-    
+
     $csscontent = @file_get_contents($filecss);
-    
+
     $contentforedit = '';
     /*$contentforedit.='<style scoped>'."\n";        // "scoped" means "apply to parent element only". Not yet supported by browsers
     $contentforedit.=$csscontent;
     $contentforedit.='</style>'."\n";*/
     $contentforedit .= $objectpage->content;
-    
+
     require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor=new DolEditor('PAGE_CONTENT',$contentforedit,'',500,'Full','',true,true,true,ROWS_5,'90%');
     $doleditor->Create(0, '', false);
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index dd6332b11a7..abb7f7e56d3 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -6,6 +6,7 @@ ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its page
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS content
+PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is read from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.  
 MediaFiles=Media library
 EditCss=Edit Style/CSS
 EditMenu=Edit menu
@@ -24,7 +25,7 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
 PreviewSiteServedByWebServer=Preview %s in a new tab.<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=Preview %s in a new tab.<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.  
 NoPageYet=No pages yet
\ No newline at end of file
diff --git a/htdocs/websites/index.php b/htdocs/websites/index.php
index 1a11ea2a4e1..a5c2ae4e046 100644
--- a/htdocs/websites/index.php
+++ b/htdocs/websites/index.php
@@ -727,7 +727,7 @@ if (count($object->records) > 0)
         print '<input type="text" id="previewsiteurl" class="minwidth200imp" name="previewsite" placeholder="'.$langs->trans("http://myvirtualhost").'" value="'.$virtualurl.'">';
         //print '<input type="submit" class="button" name="previewwebsite" target="tab'.$website.'" value="'.$langs->trans("ViewSiteInNewTab").'">';
         $htmltext=$langs->trans("SetHereVirtualHost", $dataroot);
-        print $form->textwithpicto('', $htmltext);
+        print $form->textwithpicto('', $htmltext, 1, 'help', '', 0, 2, 'helpvirtualhost');
         print '</div>';
 
         $urlext=$virtualurl;
@@ -846,8 +846,8 @@ if (count($object->records) > 0)
             print '<div class="websiteinputurl">';
             print '<input type="text" id="previewpageurl" class="minwidth200imp" name="previewsite" value="'.$pagealias.'" disabled="disabled">';
             //print '<input type="submit" class="button" name="previewwebsite" target="tab'.$website.'" value="'.$langs->trans("ViewSiteInNewTab").'">';
-            $htmltext=$langs->trans("WEBSITE_PAGENAME", $pagealias);
-            print $form->textwithpicto('', $htmltext);
+            $htmltext=$langs->trans("PageNameAliasHelp", $langs->transnoentitiesnoconv("EditPageMeta"));
+            print $form->textwithpicto('', $htmltext, 1, 'help', '', 0, 2, 'helppagealias');
             print '</div>';
 
             if (! empty($object->virtualhost))

From cb1c461b69440755cd5241c02807c14f1318ebb7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 Jul 2017 12:28:52 +0200
Subject: [PATCH 435/438] Work on module builder

---
 htdocs/langs/en_US/modulebuilder.lang | 15 ++++++----
 htdocs/modulebuilder/index.php        | 43 ++++++++++++++++++++++++---
 2 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index 1c3a7932263..9eb910da360 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tools give you utilites to build or edit your own module (<a href="%s" target="_blank">More information here</a>).
+ModuleBuilderDesc=This tools must be used by experienced users or developers. It gives you utilities to build or edit your own module (Documentation for alternative <a href="%s" target="_blank">manual development is here</a>).
 EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...)
-ModuleBuilderDesc2=Path were modules are generated/edited (first alternative directory defined into %s): <strong>%s</strong>
+ModuleBuilderDesc2=Path where modules are generated/edited (first alternative directory defined into %s): <strong>%s</strong>
 ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong> (they are detected as editable when the file <strong>%s</strong> exists in root of module directory). 
 NewModule=New module
 NewObject=New object
@@ -11,17 +11,19 @@ ObjectKey=Object key
 ModuleInitialized=Module initialized
 FilesForObjectInitialized=Files for new object initialized
 ModuleBuilderDescdescription=Enter here all general information that describe your module
+ModuleBuilderDescspecifications=You can enter here a long text to describe the specifications of your module that is not already structured into other tabs. So you have on hand the rules to develop. Also this text content will be included into the generated documentation (see last tab).
 ModuleBuilderDescobjects=Define here the objects you want to manage with your module. A sql file, a page to list them, to create/edit/view a card and an API will be generated.
 ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
 ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with your module.
 ModuleBuilderDesctriggers=This is the view of triggers provided by your module. To include code executed when a triggered business event is launched, just edit this file with your IDE.
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
-ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module. Just click on button to build the module package file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All files of module will be definitly lost !
+ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All files of module but also structured data and documentation will be definitly lost !
 EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be definitly lost !
 DangerZone=Danger zone
-BuildPackage=Build package
+BuildPackage=Build package/documentation
+BuildDocumentation=Build documentation
 ModuleIsNotActive=This module was not activated yet (go into Home-Setup-Module to make it live)
 ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
 DescriptionLong=Long description
@@ -33,5 +35,6 @@ ApiClassFile=File for PHP API class
 PageForList=PHP page for list of record
 PageForCreateEditView=PHP page to create/edit/view a record
 PathToModulePackage=Path to zip of module/application package
+PathToModuleDocumentation=Path to file of module/application documentation
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
-PackageFileNotYetGenerated=Package file not yet generated
\ No newline at end of file
+FileNotYetGenerated=File not yet generated
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index caa99d4b089..8ea54b78454 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -579,6 +579,11 @@ elseif (! empty($module))
         $head2[$h][2] = 'description';
         $h++;
 
+        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=specifications&module='.$module;
+        $head2[$h][1] = $langs->trans("Specifications");
+        $head2[$h][2] = 'specifications';
+        $h++;
+
         $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=objects&module='.$module;
         $head2[$h][1] = $langs->trans("Objects");
         $head2[$h][2] = 'objects';
@@ -692,6 +697,13 @@ elseif (! empty($module))
         	print '</div>';
         }
 
+
+        if ($tab == 'specifications')
+        {
+            print $langs->trans("FeatureNotYetAvailable");
+
+        }
+
         if ($tab == 'objects')
         {
             $head3 = array();
@@ -849,7 +861,6 @@ elseif (! empty($module))
         {
     		print $langs->trans("FeatureNotYetAvailable");
 
-
         }
 
         if ($tab == 'permissions')
@@ -900,7 +911,7 @@ elseif (! empty($module))
 			print '</div>';
         }
 
-        if ($tab == 'widget')
+        if ($tab == 'widgets')
         {
     		print $langs->trans("FeatureNotYetAvailable");
 
@@ -947,17 +958,22 @@ elseif (! empty($module))
             {
                 $FILENAMEZIP="module_".$modulelowercase.'-'.$arrayversion[0].'.'.$arrayversion[1].($arrayversion[2]?".".$arrayversion[2]:"").".zip";
                 $outputfile = $conf->admin->dir_temp.'/'.$FILENAMEZIP;
+
+                $FILENAMEDOC="module_".$modulelowercase.'-'.$arrayversion[0].'.'.$arrayversion[1].($arrayversion[2]?".".$arrayversion[2]:"").".md";
+                $outputfiledoc = $conf->admin->dir_temp.'/'.$FILENAMEDOC;
             }
 
+            print '<br>';
+
             print '<span class="fa fa-file"></span> '. $langs->trans("PathToModulePackage") . ' : ';
-            if (! dol_is_file($outputfile)) print '<strong>'.$langs->trans("PackageFileNotYetGenerated").'</strong>';
+            if (! dol_is_file($outputfile)) print '<strong>'.$langs->trans("FileNotYetGenerated").'</strong>';
             else {
                 print '<strong>'.$outputfile.'</strong>';
                 print ' ('.$langs->trans("GeneratedOn").' '.dol_print_date(dol_filemtime($outputfile), 'dayhour').')';
             }
             print '</strong><br>';
 
-            print '<br><br>';
+            print '<br>';
 
         	print '<form name="generatepackage">';
         	print '<input type="hidden" name="action" value="generatepackage">';
@@ -965,6 +981,25 @@ elseif (! empty($module))
         	print '<input type="hidden" name="module" value="'.dol_escape_htmltag($module).'">';
         	print '<input type="submit" class="button" value="'.$langs->trans("BuildPackage").'">';
         	print '</form>';
+
+        	print '<br><br><br>';
+
+            print '<span class="fa fa-file"></span> '. $langs->trans("PathToModuleDocumentation") . ' : ';
+            if (! dol_is_file($outputfiledoc)) print '<strong>'.$langs->trans("FileNotYetGenerated").'</strong>';
+            else {
+                print '<strong>'.$outputfiledoc.'</strong>';
+                print ' ('.$langs->trans("GeneratedOn").' '.dol_print_date(dol_filemtime($outputfiledoc), 'dayhour').')';
+            }
+            print '</strong><br>';
+
+            print '<br>';
+
+            print '<form name="generatepackage">';
+        	print '<input type="hidden" name="action" value="generatedoc">';
+        	print '<input type="hidden" name="tab" value="'.dol_escape_htmltag($tab).'">';
+        	print '<input type="hidden" name="module" value="'.dol_escape_htmltag($module).'">';
+        	print '<input type="submit" class="button" value="'.$langs->trans("BuildDocumentation").'">';
+        	print '</form>';
         }
 
         dol_fiche_end();

From 0ee93fb00c011243c2db224a6d3e8119dd412aa0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 4 Jul 2017 10:29:38 +0200
Subject: [PATCH 436/438] Fix conflict between option login and logina and
 logint in agenda export

---
 htdocs/admin/agenda_xcal.php                  |  2 +-
 htdocs/comm/action/class/actioncomm.class.php | 64 +++++++++++--------
 htdocs/langs/en_US/agenda.lang                |  4 +-
 htdocs/public/agenda/agendaexport.php         | 22 +++----
 4 files changed, 52 insertions(+), 40 deletions(-)

diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php
index 1895eb5b15d..99742b19f57 100644
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -174,8 +174,8 @@ $message.='<br>';
 print $message;
 
 $message=$langs->trans("AgendaUrlOptions1",$user->login,$user->login).'<br>';
-//$message.=$langs->trans("AgendaUrlOptions2",$user->login,$user->login).'<br>';
 $message.=$langs->trans("AgendaUrlOptions3",$user->login,$user->login).'<br>';
+$message.=$langs->trans("AgendaUrlOptionsNotAdmin",$user->login,$user->login).'<br>';
 $message.=$langs->trans("AgendaUrlOptions4",$user->login,$user->login).'<br>';
 $message.=$langs->trans("AgendaUrlOptionsProject",$user->login,$user->login);
 
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 8243268574c..70b2acb86b7 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -38,7 +38,7 @@ class ActionComm extends CommonObject
     public $table_rowid = 'id';
     protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
     public $picto='action';
-    
+
     /**
      * Id of the event
      * @var int
@@ -168,7 +168,7 @@ class ActionComm extends CommonObject
     var $email_subject;
     var $errors_to;
 
-    
+
     /**
      *      Constructor
      *
@@ -444,7 +444,7 @@ class ActionComm extends CommonObject
 				$u->fetch($fuser);
 				$fuser = $u;
 			}
-			else 
+			else
 			{
 				$fuser = $user;
 			}
@@ -657,11 +657,11 @@ class ActionComm extends CommonObject
         	$this->error=$this->db->lasterror();
         	$error++;
         }
-        
+
         if (! $error) {
 	        $sql = "DELETE FROM ".MAIN_DB_PREFIX."actioncomm_resources";
 	        $sql.= " WHERE fk_actioncomm=".$this->id;
-	        
+
 	        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 	        $res=$this->db->query($sql);
 	        if ($res < 0) {
@@ -669,7 +669,7 @@ class ActionComm extends CommonObject
 	        	$error++;
 	        }
         }
-        
+
         // Removed extrafields
         if (! $error) {
         	$result=$this->deleteExtraFields();
@@ -1091,7 +1091,7 @@ class ActionComm extends CommonObject
             else if ($percent > 0 && $percent < 100) return $percent.'% '.img_picto($langs->trans('StatusActionInProcess').' - '.$percent.'%','statut3');
             else if ($percent >= 100) return img_picto($langs->trans('StatusActionDone'),'statut6');
         }
-        
+
         return '';
     }
 
@@ -1112,20 +1112,20 @@ class ActionComm extends CommonObject
 		global $conf, $langs, $user, $hookmanager;
 
 		if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
-		
+
 		$label = $this->label;
 		if (empty($label)) $label=$this->libelle;   // For backward compatibility
 
 		$result='';
-		
+
 		// Set label of typ
 		$labeltype = ($langs->transnoentities("Action".$this->type_code) != "Action".$this->type_code)?$langs->transnoentities("Action".$this->type_code):$this->type_label;
 		if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
 		{
 		    if ($this->type_code != 'AC_OTH_AUTO') $labeltype = $langs->trans('ActionAC_MANUAL');
 		}
-		
-		
+
+
 		$tooltip = '<u>' . $langs->trans('ShowAction'.$objp->code) . '</u>';
 		if (! empty($this->ref))
 			$tooltip .= '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
@@ -1137,7 +1137,7 @@ class ActionComm extends CommonObject
 			$tooltip .= '<br><b>' . $langs->trans('Location') . ':</b> ' . $this->location;
 
 		$linkclose='';
-		if (! empty($conf->global->AGENDA_USE_EVENT_TYPE) && $this->type_color) 
+		if (! empty($conf->global->AGENDA_USE_EVENT_TYPE) && $this->type_color)
 			$linkclose = ' style="background-color:#'.$this->type_color.'"';
 
 		if (empty($notooltip))
@@ -1149,7 +1149,7 @@ class ActionComm extends CommonObject
 		    }
 		    $linkclose.=' title="'.dol_escape_htmltag($tooltip, 1).'"';
 		    $linkclose.=' class="'.$classname.' classfortooltip"';
-		    
+
 		    if (! is_object($hookmanager))
 		    {
 		        include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
@@ -1161,17 +1161,17 @@ class ActionComm extends CommonObject
 		    $linkclose = ($hookmanager->resPrint ? $hookmanager->resPrint : $linkclose);
 		}
 		else $linkclose.=' class="'.$classname.'"';
-		
+
 		$url='';
-		if ($option=='birthday') 
+		if ($option=='birthday')
 			$url = DOL_URL_ROOT.'/contact/perso.php?id='.$this->id;
-		else 
+		else
 			$url = DOL_URL_ROOT.'/comm/action/card.php?id='.$this->id;
-		
+
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart.=$linkclose.'>';
 		$linkend='</a>';
-		
+
 		//print 'rrr'.$this->libelle.'-'.$withpicto;
 
         if ($withpicto == 2)
@@ -1279,7 +1279,7 @@ class ActionComm extends CommonObject
             $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on u.rowid = a.fk_user_author";	// Link to get author of event for export
             $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on s.rowid = a.fk_soc";
 			// We must filter on assignement table
-			if ($filters['logint'] || $filters['login']) $sql.=", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
+			if ($filters['logint']) $sql.=", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
 			$sql.= " WHERE a.fk_action=c.id";
             $sql.= " AND a.entity IN (".getEntity('agenda').")";
             foreach ($filters as $key => $value)
@@ -1291,20 +1291,34 @@ class ActionComm extends CommonObject
                 if ($key == 'idto')         $sql.=" AND a.id <= ".(is_numeric($value)?$value:0);
                 if ($key == 'project')      $sql.=" AND a.fk_project=".(is_numeric($value)?$value:0);
     	        // We must filter on assignement table
-				if ($key == 'logint' || $key == 'login') $sql.= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
+				if ($key == 'logint')       $sql.= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
                 if ($key == 'logina')
                 {
                     $logina=$value;
+                    $condition='=';
+                    if (preg_match('/^!/',$logina))
+                    {
+                        $logina=preg_replace('/^!/','',$logina);
+                        $condition='<>';
+                    }
                     $userforfilter=new User($this->db);
-                    $result=$userforfilter->fetch('',$value);
-                    $sql.= " AND a.fk_user_author = ".$userforfilter->id;
+                    $result=$userforfilter->fetch('',$logina);
+                    if ($result > 0) $sql.= " AND a.fk_user_author ".$condition." ".$userforfilter->id;
+                    elseif ($result < 0 || $condition == '=') $sql.= " AND a.fk_user_author = 0";
                 }
-                if ($key == 'logint' || $key == 'login')
+                if ($key == 'logint')
                 {
                     $logint=$value;
+                    $condition='=';
+                    if (preg_match('/^!/',$logint))
+                    {
+                        $logint=preg_replace('/^!/','',$logint);
+                        $condition='<>';
+                    }
                     $userforfilter=new User($this->db);
-                    $result=$userforfilter->fetch('',$value);
-                    $sql.= " AND ar.fk_element = ".$userforfilter->id;
+                    $result=$userforfilter->fetch('',$logint);
+                    if ($result > 0) $sql.= " AND ar.fk_element = ".$userforfilter->id;
+                    elseif ($result < 0 || $condition == '=') $sql.= " AND ar.fk_element = 0";
                 }
             }
             $sql.= " AND a.datep IS NOT NULL";		// To exclude corrupted events and avoid errors in lightning/sunbird import
diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index 9e7af7b0d06..4e2e2acf378 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -80,9 +80,9 @@ AgendaModelModule=Document templates for event
 DateActionStart=Start date
 DateActionEnd=End date
 AgendaUrlOptions1=You can also add following parameters to filter output:
-AgendaUrlOptions2=<b>login=%s</b> to restrict output to actions created by or assigned to user <b>%s</b>.
 AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
-AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b>.
+AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
+AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
 AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Show birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php
index b3886824485..81a67204fdb 100644
--- a/htdocs/public/agenda/agendaexport.php
+++ b/htdocs/public/agenda/agendaexport.php
@@ -65,19 +65,18 @@ if (! isset($conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY)) $conf->global->MAIN_A
 // Define format, type and filter
 $format='ical';
 $type='event';
-if (! empty($_GET["format"])) $format=$_GET["format"];
-if (! empty($_GET["type"]))   $type=$_GET["type"];
+if (GETPOST("format",'alpha')) $format=GETPOST("format",'apha');
+if (GETPOST("type",'apha'))   $type=GETPOST("type",'alpha');
 
 $filters=array();
-if (! empty($_GET["year"])) 	     $filters['year']=$_GET["year"];
-if (! empty($_GET["id"]))           $filters['id']=$_GET["id"];
-if (! empty($_GET["idfrom"]))       $filters['idfrom']=$_GET["idfrom"];
-if (! empty($_GET["idto"]))         $filters['idto']=$_GET["idto"];
-if (! empty($_GET["project"]))      $filters['project']=$_GET["project"];
-if (! empty($_GET["login"]))        $filters['login']=$_GET["login"];
-if (! empty($_GET["logina"]))       $filters['logina']=$_GET["logina"];
-if (! empty($_GET["logint"]))       $filters['logint']=$_GET["logint"];
-if (GETPOST("notolderthan")) $filters['notolderthan']=GETPOST("notolderthan","int");
+if (GETPOST("year",'int')) 	        $filters['year']=GETPOST("year",'int');
+if (GETPOST("id",'int'))            $filters['id']=GETPOST("id",'int');
+if (GETPOST("idfrom",'int'))        $filters['idfrom']=GETPOST("idfrom",'int');
+if (GETPOST("idto",'int'))          $filters['idto']=GETPOST("idto",'int');
+if (GETPOST("project",'apha'))      $filters['project']=GETPOST("project",'apha');
+if (GETPOST("logina",'apha'))       $filters['logina']=GETPOST("logina",'apha');
+if (GETPOST("logint",'apha'))       $filters['logint']=GETPOST("logint",'apha');
+if (GETPOST("notolderthan",'int'))  $filters['notolderthan']=GETPOST("notolderthan","int");
 else $filters['notolderthan']=$conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY;
 
 // Check config
@@ -115,7 +114,6 @@ foreach ($filters as $key => $value)
     if ($key == 'idfrom')          $filename.='-idfrom'.$value;
     if ($key == 'idto')            $filename.='-idto'.$value;
     if ($key == 'project')         $filename.='-project'.$value;
-    if ($key == 'login')	       $filename.='-login'.$value;
 	if ($key == 'logina')	       $filename.='-logina'.$value;	// Author
 	if ($key == 'logint')	       $filename.='-logint'.$value;	// Assigned to
 }

From 95cf36c43bd814a7aeee09a17b432a4d8c8d778c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 4 Jul 2017 10:55:53 +0200
Subject: [PATCH 437/438] Fix use the getUrl function instead of hard coded
 curl

---
 htdocs/categories/admin/categorie.php          |  3 ++-
 .../categories/admin/categorie_extrafields.php |  2 +-
 htdocs/langs/en_US/products.lang               |  8 +++++++-
 htdocs/product/admin/dynamic_prices.php        |  2 ++
 .../price_global_variable_updater.class.php    | 18 ++++++------------
 5 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/htdocs/categories/admin/categorie.php b/htdocs/categories/admin/categorie.php
index d16b081e6ae..55006a8b171 100644
--- a/htdocs/categories/admin/categorie.php
+++ b/htdocs/categories/admin/categorie.php
@@ -37,6 +37,7 @@ $action=GETPOST('action','aZ09');
 /*
  *	Actions
  */
+
 if (preg_match('/set_(.*)/',$action,$reg))
 {
     $code=$reg[1];
@@ -82,7 +83,7 @@ print load_fiche_titre($langs->trans("CategoriesSetup"),$linkback,'title_setup')
 
 $head=categoriesadmin_prepare_head();
 
-dol_fiche_head($head, 'setup', $langs->trans("Categories"), 0, 'category');
+dol_fiche_head($head, 'setup', $langs->trans("Categories"), -1, 'category');
 
 
 print '<table class="noborder" width="100%">';
diff --git a/htdocs/categories/admin/categorie_extrafields.php b/htdocs/categories/admin/categorie_extrafields.php
index 2bc9f205334..6291d2065c2 100644
--- a/htdocs/categories/admin/categorie_extrafields.php
+++ b/htdocs/categories/admin/categorie_extrafields.php
@@ -68,7 +68,7 @@ print load_fiche_titre($langs->trans("CategoriesSetup"),$linkback,'title_setup')
 
 $head = categoriesadmin_prepare_head();
 
-dol_fiche_head($head, 'attributes_categories', $langs->trans("Categories"), 0, 'category');
+dol_fiche_head($head, 'attributes_categories', $langs->trans("Categories"), -1, 'category');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index ae9cd743c8f..3c47b188972 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -247,12 +247,18 @@ ComposedProduct=Sub-product
 MinSupplierPrice=Minimum supplier price
 MinCustomerPrice=Minimum customer price
 DynamicPriceConfiguration=Dynamic price configuration
-DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able to use and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
 AddVariable=Add Variable
 AddUpdater=Add Updater
 GlobalVariables=Global variables
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=Format for request is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data", "to": "send"}}
 UpdateInterval=Update interval (minutes)
 LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
diff --git a/htdocs/product/admin/dynamic_prices.php b/htdocs/product/admin/dynamic_prices.php
index 24f1d64e30c..b044471e3e1 100644
--- a/htdocs/product/admin/dynamic_prices.php
+++ b/htdocs/product/admin/dynamic_prices.php
@@ -54,9 +54,11 @@ if ($action == 'edit_updater') {
     }
 }
 
+
 /*
  * Actions
  */
+
 if (!empty($action) && empty($cancel)) {
     //Global variable actions
     if ($action == 'create_variable' || $action == 'edit_variable') {
diff --git a/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php b/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
index 3c176f0530e..0948275ce2b 100644
--- a/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
+++ b/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
@@ -464,24 +464,18 @@ class PriceGlobalVariableUpdater
             }
             $result = "";
             if ($this->type == 0) {
-                //CURL client
-                $handle = curl_init();
-                curl_setopt_array($handle, array(
-                    CURLOPT_URL => $url,
-                    CURLOPT_RETURNTRANSFER => true,
-                    CURLOPT_TIMEOUT => 5,
-                    CURLOPT_POST => false,
-                    CURLOPT_HEADER => false,
-                ));
+                // Call JSON request
+                include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+                $tmpresult=getURLContent($url);
+                $code=$tmpresult['http_code'];
+                $result=$tmpresult['content'];
 
-                $result = curl_exec($handle);
-                $code = curl_getinfo($handle, CURLINFO_HTTP_CODE);
                 if (!isset($result)) {
                     $this->error = $langs->trans("ErrorGlobalVariableUpdater0", "empty response");
                     return -1;
                 }
                 if ($code !== 200) {
-                    $this->error = $langs->trans("ErrorGlobalVariableUpdater0", $code);
+                    $this->error = $langs->trans("ErrorGlobalVariableUpdater0", $code.' '.$tmpresult['curl_error_msg']);
                     return -1;
                 }
 

From 77f5952318a6fd58617dcd35d7c3ab44471ad271 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 4 Jul 2017 11:18:48 +0200
Subject: [PATCH 438/438] Fix pgsql compatibility

---
 htdocs/core/db/mysqli.class.php | 10 +++++-----
 htdocs/core/db/pgsql.class.php  |  7 +++++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index 526d43de0ab..4358e8695fe 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -735,13 +735,13 @@ class DoliDBMysqli extends DoliDB
     {
         // cles recherchees dans le tableau des descriptions (field_desc) : type,value,attribute,null,default,extra
         // ex. : $field_desc = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
-        $sql= "ALTER TABLE ".$table." ADD `".$field_name."` ";
+        $sql= "ALTER TABLE ".$table." ADD ".$field_name." ";
         $sql.= $field_desc['type'];
         if(preg_match("/^[^\s]/i",$field_desc['value']))
-        if (! in_array($field_desc['type'],array('date','datetime')))
-        {
-            $sql.= "(".$field_desc['value'].")";
-        }
+            if (! in_array($field_desc['type'],array('date','datetime')))
+            {
+                $sql.= "(".$field_desc['value'].")";
+            }
         if(preg_match("/^[^\s]/i",$field_desc['attribute']))
         $sql.= " ".$field_desc['attribute'];
         if(preg_match("/^[^\s]/i",$field_desc['null']))
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index 4aa56b367f3..d02ff4a1341 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -1048,8 +1048,11 @@ class DoliDBPgsql extends DoliDB
 		// ex. : $field_desc = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
 		$sql= "ALTER TABLE ".$table." ADD ".$field_name." ";
 		$sql .= $field_desc['type'];
-		if ($field_desc['type'] != 'int' && preg_match("/^[^\s]/i",$field_desc['value']))
-		$sql .= "(".$field_desc['value'].")";
+		if(preg_match("/^[^\s]/i",$field_desc['value']))
+		    if (! in_array($field_desc['type'],array('int','date','datetime')))
+		    {
+		        $sql.= "(".$field_desc['value'].")";
+		    }
 		if (preg_match("/^[^\s]/i",$field_desc['attribute']))
 		$sql .= " ".$field_desc['attribute'];
 		if (preg_match("/^[^\s]/i",$field_desc['null']))